1446 files changed, 43041 insertions, 35780 deletions

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/glibtop/mountlist.h
@@ -28,6 +28,7 @@ include/libgtop-2.0/glibtop/procsignal.h
 include/libgtop-2.0/glibtop/procstate.h
 include/libgtop-2.0/glibtop/proctime.h
 include/libgtop-2.0/glibtop/procuid.h
+include/libgtop-2.0/glibtop/procwd.h
 include/libgtop-2.0/glibtop/sem_limits.h
 include/libgtop-2.0/glibtop/shm_limits.h
 include/libgtop-2.0/glibtop/signal.h
@@ -54,7 +55,6 @@ libdata/pkgconfig/libgtop-2.0.pc
 %%DOCSDIR%%/libgtop-Command.html
 %%DOCSDIR%%/libgtop-GlibTop-Server.html
 %%DOCSDIR%%/libgtop-GlibTop.html
-%%DOCSDIR%%/libgtop-Inode-DB.html
 %%DOCSDIR%%/libgtop-Net-List.html
 %%DOCSDIR%%/libgtop-Net-Load.html
 %%DOCSDIR%%/libgtop-PPP.html
@@ -144,6 +144,7 @@ share/locale/nb/LC_MESSAGES/libgtop-2.0.mo
 share/locale/ne/LC_MESSAGES/libgtop-2.0.mo
 share/locale/nl/LC_MESSAGES/libgtop-2.0.mo
 share/locale/nn/LC_MESSAGES/libgtop-2.0.mo
+share/locale/oc/LC_MESSAGES/libgtop-2.0.mo
 share/locale/or/LC_MESSAGES/libgtop-2.0.mo
 share/locale/pa/LC_MESSAGES/libgtop-2.0.mo
 share/locale/pl/LC_MESSAGES/libgtop-2.0.mo
@@ -170,6 +171,7 @@ share/locale/zh_HK/LC_MESSAGES/libgtop-2.0.mo
 share/locale/zh_TW/LC_MESSAGES/libgtop-2.0.mo
 @dirrm include/libgtop-2.0/glibtop
 @dirrm include/libgtop-2.0
+@dirrm %%DOCSDIR%%
 @dirrmtry share/locale/zh_HK/LC_MESSAGES
 @dirrmtry share/locale/zh_HK
 @dirrmtry share/locale/xh/LC_MESSAGES
@@ -178,6 +180,8 @@ share/locale/zh_TW/LC_MESSAGES/libgtop-2.0.mo
 @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
@@ -190,4 +194,3 @@ share/locale/zh_TW/LC_MESSAGES/libgtop-2.0.mo
 @dirrmtry share/locale/dz
 @dirrmtry share/locale/bn_IN/LC_MESSAGES
 @dirrmtry share/locale/bn_IN
-@dirrm %%DOCSDIR%%
diff --git a/devel/liboobs/Makefile b/devel/liboobs/Makefile
index 3fc73084c7b9..b9f987d7cd72 100644
--- a/devel/liboobs/Makefile
+++ b/devel/liboobs/Makefile
@@ -3,11 +3,11 @@
 # Whom:			Michael Johnson <ahze@FreeBSD.org>
 #
 # $FreeBSD$
-#    $MCom: ports/devel/liboobs/Makefile,v 1.18 2007/03/12 12:34:37 ahze Exp $
+#   $MCom: ports/devel/liboobs/Makefile,v 1.23 2007/09/16 16:45:35 ahze Exp $
+#
 
 PORTNAME=	liboobs
-PORTVERSION=	2.18.1
-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/liboobs/distinfo b/devel/liboobs/distinfo
index 338513118ee0..de4bba60f2af 100644
--- a/devel/liboobs/distinfo
+++ b/devel/liboobs/distinfo
@@ -1,3 +1,3 @@
-MD5 (liboobs-2.18.1.tar.bz2) = 3462f6cf93d1c13b4cd7cb070e919c4a
-SHA256 (liboobs-2.18.1.tar.bz2) = c722c74c607d87879997646cdda9707d338de68cab3a865d282407dda6746de2
-SIZE (liboobs-2.18.1.tar.bz2) = 315332
+MD5 (liboobs-2.20.0.tar.bz2) = c0562e115af4777da471182b9d462b40
+SHA256 (liboobs-2.20.0.tar.bz2) = 45a3cd562ac6d0002dc5c5972e1b4ec7fe611fe7ed9d0d8da9dbaaffd1c04623
+SIZE (liboobs-2.20.0.tar.bz2) = 331456
diff --git a/devel/liboobs/files/patch-src_oobs-group.c b/devel/liboobs/files/patch-src_oobs-group.c
index d863f037fee5..6abd8b711ddc 100644
--- a/devel/liboobs/files/patch-src_oobs-group.c
+++ b/devel/liboobs/files/patch-src_oobs-group.c
@@ -1,5 +1,5 @@
---- src/oobs-group.c.orig	Fri Sep 15 18:41:04 2006
-+++ src/oobs-group.c	Tue Oct 31 23:12:40 2006
+--- oobs/oobs-group.c.orig	Fri Sep 15 18:41:04 2006
++++ oobs/oobs-group.c	Tue Oct 31 23:12:40 2006
 @@ -18,7 +18,12 @@
   * Authors: Carlos Garnacho Parro  <carlosg@gnome.org>
   */
diff --git a/devel/liboobs/files/patch-src_oobs-user.c b/devel/liboobs/files/patch-src_oobs-user.c
index d7037a28a738..e571a363fdb0 100644
--- a/devel/liboobs/files/patch-src_oobs-user.c
+++ b/devel/liboobs/files/patch-src_oobs-user.c
@@ -1,5 +1,5 @@
---- src/oobs-user.c.orig	Fri Sep 15 19:16:41 2006
-+++ src/oobs-user.c	Tue Oct 31 23:12:29 2006
+--- oobs/oobs-user.c.orig	Fri Sep 15 19:16:41 2006
++++ oobs/oobs-user.c	Tue Oct 31 23:12:29 2006
 @@ -18,6 +18,10 @@
   * Authors: Carlos Garnacho Parro  <carlosg@gnome.org>
   */
diff --git a/devel/liboobs/pkg-plist b/devel/liboobs/pkg-plist
index 35fe3dacaed8..a36b53d54b73 100644
--- a/devel/liboobs/pkg-plist
+++ b/devel/liboobs/pkg-plist
@@ -32,6 +32,31 @@ lib/liboobs-1.la
 lib/liboobs-1.so
 lib/liboobs-1.so.3
 libdata/pkgconfig/liboobs-1.pc
+%%DOCSDIR%%/OobsGroup.html
+%%DOCSDIR%%/OobsGroupsConfig.html
+%%DOCSDIR%%/OobsIface.html
+%%DOCSDIR%%/OobsIfaceEthernet.html
+%%DOCSDIR%%/OobsIfaceIRLan.html
+%%DOCSDIR%%/OobsIfaceISDN.html
+%%DOCSDIR%%/OobsIfaceModem.html
+%%DOCSDIR%%/OobsIfacePlip.html
+%%DOCSDIR%%/OobsIfaceWireless.html
+%%DOCSDIR%%/OobsIfacesConfig.html
+%%DOCSDIR%%/OobsList.html
+%%DOCSDIR%%/OobsNFSConfig.html
+%%DOCSDIR%%/OobsNTPConfig.html
+%%DOCSDIR%%/OobsObject.html
+%%DOCSDIR%%/OobsSMBConfig.html
+%%DOCSDIR%%/OobsService.html
+%%DOCSDIR%%/OobsServicesConfig.html
+%%DOCSDIR%%/OobsSession.html
+%%DOCSDIR%%/OobsShare.html
+%%DOCSDIR%%/OobsShareNFS.html
+%%DOCSDIR%%/OobsShareSMB.html
+%%DOCSDIR%%/OobsStaticHost.html
+%%DOCSDIR%%/OobsTimeConfig.html
+%%DOCSDIR%%/OobsUser.html
+%%DOCSDIR%%/OobsUsersConfig.html
 %%DOCSDIR%%/ch01.html
 %%DOCSDIR%%/ch02.html
 %%DOCSDIR%%/ch03.html
@@ -44,33 +69,8 @@ libdata/pkgconfig/liboobs-1.pc
 %%DOCSDIR%%/index.html
 %%DOCSDIR%%/index.sgml
 %%DOCSDIR%%/left.png
-%%DOCSDIR%%/liboobs-OobsGroup.html
-%%DOCSDIR%%/liboobs-OobsGroupsConfig.html
 %%DOCSDIR%%/liboobs-OobsHostsConfig.html
-%%DOCSDIR%%/liboobs-OobsIface.html
-%%DOCSDIR%%/liboobs-OobsIfaceEthernet.html
-%%DOCSDIR%%/liboobs-OobsIfaceIRLan.html
-%%DOCSDIR%%/liboobs-OobsIfaceISDN.html
-%%DOCSDIR%%/liboobs-OobsIfaceModem.html
-%%DOCSDIR%%/liboobs-OobsIfacePlip.html
-%%DOCSDIR%%/liboobs-OobsIfaceWireless.html
-%%DOCSDIR%%/liboobs-OobsIfacesConfig.html
-%%DOCSDIR%%/liboobs-OobsList.html
-%%DOCSDIR%%/liboobs-OobsNFSConfig.html
-%%DOCSDIR%%/liboobs-OobsNTPConfig.html
 %%DOCSDIR%%/liboobs-OobsNTPServer.html
-%%DOCSDIR%%/liboobs-OobsObject.html
-%%DOCSDIR%%/liboobs-OobsSMBConfig.html
-%%DOCSDIR%%/liboobs-OobsService.html
-%%DOCSDIR%%/liboobs-OobsServicesConfig.html
-%%DOCSDIR%%/liboobs-OobsSession.html
-%%DOCSDIR%%/liboobs-OobsShare.html
-%%DOCSDIR%%/liboobs-OobsShareNFS.html
-%%DOCSDIR%%/liboobs-OobsShareSMB.html
-%%DOCSDIR%%/liboobs-OobsStaticHost.html
-%%DOCSDIR%%/liboobs-OobsTimeConfig.html
-%%DOCSDIR%%/liboobs-OobsUser.html
-%%DOCSDIR%%/liboobs-OobsUsersConfig.html
 %%DOCSDIR%%/liboobs.devhelp
 %%DOCSDIR%%/liboobs.devhelp2
 %%DOCSDIR%%/right.png
diff --git a/devel/libunicode/Makefile b/devel/libunicode/Makefile
index 74ec2c6cd5c3..61405f074b42 100644
--- a/devel/libunicode/Makefile
+++ b/devel/libunicode/Makefile
@@ -3,11 +3,12 @@
 # Whom:					Ade Lovett <ade@FreeBSD.org>
 #
 # $FreeBSD$
-#    $MCom: ports/devel/libunicode/Makefile,v 1.2 2006/09/10 00:51:09 mezz Exp $
+#   $MCom: ports/devel/libunicode/Makefile,v 1.4 2007/09/10 05:27:38 mezz Exp $
+#
 
 PORTNAME=	libunicode
 PORTVERSION=	0.4
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/libunicode/0.4
@@ -21,8 +22,8 @@ USE_GMAKE=	yes
 USE_XLIB=	yes
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
-CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome \
-		--datadir=${PREFIX}/share/gnome
+CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share \
+		--datadir=${PREFIX}/share
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
diff --git a/devel/oaf/Makefile b/devel/oaf/Makefile
index 257f9d4f1425..61923ed8ef2e 100644
--- a/devel/oaf/Makefile
+++ b/devel/oaf/Makefile
@@ -3,12 +3,12 @@
 # Whom:					Ade Lovett <ade@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/devel/oaf/Makefile,v 1.2 2006/09/10 00:51:09 mezz Exp $
+#   $MCom: ports/devel/oaf/Makefile,v 1.5 2007/05/19 21:36:06 marcus Exp $
 #
 
 PORTNAME=	oaf
 PORTVERSION=	0.6.10
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/oaf/0.6
diff --git a/devel/oaf/files/patch-aa b/devel/oaf/files/patch-aa
index e0caa8a8ec2c..ebcf5703b8b4 100644
--- a/devel/oaf/files/patch-aa
+++ b/devel/oaf/files/patch-aa
@@ -11,4 +11,4 @@ $FreeBSD$
 +confexecdir = $(sysconfdir)
  confexec_DATA = oafConf.sh
  
- m4datadir = $(prefix)/share/aclocal
+ m4datadir = $(datadir)/aclocal
diff --git a/devel/oaf/files/patch-test_oaf-slay.in b/devel/oaf/files/patch-test_oaf-slay.in
deleted file mode 100644
index bd5f51b50cc0..000000000000
--- a/devel/oaf/files/patch-test_oaf-slay.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- test/oaf-slay.in.orig	Fri Oct 18 15:33:00 2002
-+++ test/oaf-slay.in	Fri Oct 18 15:33:12 2002
-@@ -51,7 +51,7 @@
- 
- # get OAF files
- #
--@oaf_dirs = ( "@prefix@/share/oaf" );
-+@oaf_dirs = ( "@datadir@/oaf" );
- foreach $dir (split(':', $ENV{'OAF_INFO_PATH'})) {
- 	if (-d $dir) {
- 		push @oaf_dirs, $dir;
diff --git a/devel/oaf/pkg-plist b/devel/oaf/pkg-plist
index b118520c8419..518eac48143b 100644
--- a/devel/oaf/pkg-plist
+++ b/devel/oaf/pkg-plist
@@ -26,10 +26,8 @@ lib/liboaf.la
 lib/liboaf.so
 lib/liboaf.so.0
 share/aclocal/oaf.m4
-share/gnome/idl/oaf-factory.idl
-share/gnome/idl/oaf.idl
-share/gnome/oaf/OAF_naming-service.oaf
-share/gnome/oaf/empty.oafinfo
+share/idl/oaf-factory.idl
+share/idl/oaf.idl
 share/locale/az/LC_MESSAGES/oaf.mo
 share/locale/bg/LC_MESSAGES/oaf.mo
 share/locale/da/LC_MESSAGES/oaf.mo
@@ -61,6 +59,8 @@ share/locale/tr/LC_MESSAGES/oaf.mo
 share/locale/uk/LC_MESSAGES/oaf.mo
 share/locale/zh_CN/LC_MESSAGES/oaf.mo
 share/locale/zh_TW/LC_MESSAGES/oaf.mo
+%%DATADIR%%/OAF_naming-service.oaf
+%%DATADIR%%/empty.oafinfo
 @dirrm include/liboaf
 @dirrm etc/oaf
 @unexec ps gx | grep '[0-9]:[0-9][0-9]\.[0-9][0-9] oafd --ac-activate' | awk '{print $1}' | xargs kill 2>/dev/null || true
diff --git a/devel/pharmacy/Makefile b/devel/pharmacy/Makefile
index 5b87ac6f78f1..e03d94bc9194 100644
--- a/devel/pharmacy/Makefile
+++ b/devel/pharmacy/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	pharmacy
 PORTVERSION=	0.3
+PORTREVISION=	2
 CATEGORIES=	devel gnome
 MASTER_SITES=	SF
 
@@ -26,8 +27,5 @@ pre-patch:
 		s|\(DATADIRNAME=\)lib|\1share|g ; \
 		s|USE_INCLUDED_LIBINTL=yes|#&|g ; \
 		s|\$$(top_builddir)/intl/libintl.a|-lintl|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/devel/pharmacy/pkg-plist b/devel/pharmacy/pkg-plist
index 326d642a2752..0c50c216d94a 100644
--- a/devel/pharmacy/pkg-plist
+++ b/devel/pharmacy/pkg-plist
@@ -11,7 +11,7 @@ share/gnome/help/pharmacy/C/topic.dat
 share/gnome/help/pharmacy/C/update.html
 share/gnome/help/pharmacy/C/using.html
 share/gnome/help/pharmacy/C/web.html
-share/gnome/pixmaps/pharmacy.png
+share/pixmaps/pharmacy.png
 share/locale/de/LC_MESSAGES/pharmacy.mo
 share/locale/fr/LC_MESSAGES/pharmacy.mo
 share/locale/it/LC_MESSAGES/pharmacy.mo
diff --git a/devel/preps-gui/Makefile b/devel/preps-gui/Makefile
index 553235f5654c..17124cbf9938 100644
--- a/devel/preps-gui/Makefile
+++ b/devel/preps-gui/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	preps
 PORTVERSION=	2.0.4
-PORTREVISION=	3
+PORTREVISION=	6
 CATEGORIES=	devel
 MASTER_SITES=	http://fresh.t-systems-sfr.com/unix/src/misc/
 PKGNAMESUFFIX=	-gui
@@ -34,7 +34,7 @@ CONFIGURE_ARGS+=	--with-pgsqldir=${LOCALBASE} \
 			--localstatedir=/var
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|@PACKAGE@/gnome/help|help|g' \
+	@${REINPLACE_CMD} -e 's|@PACKAGE@/gnome/help|gnome/help|g' \
 		${WRKSRC}/help/C/Makefile.in
 
 .include <bsd.port.mk>
diff --git a/devel/preps-gui/pkg-plist b/devel/preps-gui/pkg-plist
index d35c0dc66ee3..0d891f625fa4 100644
--- a/devel/preps-gui/pkg-plist
+++ b/devel/preps-gui/pkg-plist
@@ -22,11 +22,11 @@ share/gnome/help/preps/C/figures/statedit.png
 share/gnome/help/preps/C/figures/useredit.png
 share/gnome/help/preps/C/legal.xml
 share/gnome/help/preps/C/preps.xml
-share/gnome/omf/preps/preps-C.omf
-share/gnome/pixmaps/preps.png
-share/gnome/preps/preps_logo.xpm
-@dirrm share/gnome/preps
-@dirrm share/gnome/omf/preps
+share/omf/preps/preps-C.omf
+share/pixmaps/preps.png
+share/preps/preps_logo.xpm
+@dirrm share/preps
+@dirrm share/omf/preps
 @dirrm share/gnome/help/preps/C/figures
 @dirrm share/gnome/help/preps/C
 @dirrm share/gnome/help/preps
diff --git a/devel/py-gobject/Makefile b/devel/py-gobject/Makefile
index e97f1d2278cf..35e6da41631b 100644
--- a/devel/py-gobject/Makefile
+++ b/devel/py-gobject/Makefile
@@ -3,10 +3,10 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/devel/py-gobject/Makefile,v 1.17 2006/10/03 20:44:25 ahze Exp $
+#   $MCom: ports/devel/py-gobject/Makefile,v 1.21 2007/09/16 17:11:09 ahze Exp $
 
 PORTNAME=	gobject
-PORTVERSION=	2.12.3
+PORTVERSION=	2.14.0
 CATEGORIES=	devel python
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/pygobject/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/devel/py-gobject/distinfo b/devel/py-gobject/distinfo
index bf1940a45743..4b9ac6bbbbd0 100644
--- a/devel/py-gobject/distinfo
+++ b/devel/py-gobject/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/pygobject-2.12.3.tar.bz2) = 009986021225b7ea6e0ba848707785af
-SHA256 (gnome2/pygobject-2.12.3.tar.bz2) = efa81e0281668988b8cc2af9d0546befa4365662f1ebec37e0c7c863e969da41
-SIZE (gnome2/pygobject-2.12.3.tar.bz2) = 339088
+MD5 (gnome2/pygobject-2.14.0.tar.bz2) = de781a21f483c941a73009a9f68f150e
+SHA256 (gnome2/pygobject-2.14.0.tar.bz2) = 3a5919703f71c2d7059d02f03dc6566cbe86c6efb09a16730b7cdb4b0fbef9e8
+SIZE (gnome2/pygobject-2.14.0.tar.bz2) = 360630
diff --git a/devel/py-gobject/files/patch-docs_Makefile.in b/devel/py-gobject/files/patch-docs_Makefile.in
index 76edf5de1d78..39d35befb083 100644
--- a/devel/py-gobject/files/patch-docs_Makefile.in
+++ b/devel/py-gobject/files/patch-docs_Makefile.in
@@ -1,11 +1,11 @@
---- docs/Makefile.in.orig	Thu Aug 24 23:34:38 2006
-+++ docs/Makefile.in	Thu Aug 24 23:35:02 2006
-@@ -218,7 +218,7 @@ XSL_FILES = \
- 
- CSSdir = $(HTMLdir)
+--- docs/Makefile.in.orig	Sat May  5 01:25:03 2007
++++ docs/Makefile.in	Sat May  5 01:25:39 2007
+@@ -223,7 +223,7 @@ XSL_FILES = \
+ # fixxref cannot be included in XSL_FILES, because automake is touching it
+ # so the date is newer then the files in HTML_FILES
+ FIXXREF = xsl/fixxref.py
+-TARGET_DIR = $(datadir)/gtk-doc/html/pygobject
++TARGET_DIR = $(prefix)/share/doc/pygobject
+ CSSdir = $(TARGET_DIR)
  CSS_DATA = $(CSS_FILES)
--HTMLdir = $(datadir)/gtk-doc/html/pygobject
-+HTMLdir = $(prefix)/share/doc/pygobject
- HTML_DATA = $(HTML_FILES)
  XSLdir = $(datadir)/pygobject/xsl
- XSL_DATA = $(XSL_FILES)
diff --git a/devel/py-gobject/pkg-plist b/devel/py-gobject/pkg-plist
index b4eb7204d691..de86b146d3a4 100644
--- a/devel/py-gobject/pkg-plist
+++ b/devel/py-gobject/pkg-plist
@@ -7,9 +7,15 @@ include/pygtk-2.0/pygobject.h
 %%PYTHON_SITELIBDIR%%/gtk-2.0/gobject/__init__.pyo
 %%PYTHON_SITELIBDIR%%/gtk-2.0/gobject/_gobject.la
 %%PYTHON_SITELIBDIR%%/gtk-2.0/gobject/_gobject.so
+%%PYTHON_SITELIBDIR%%/gtk-2.0/gobject/constants.py
+%%PYTHON_SITELIBDIR%%/gtk-2.0/gobject/constants.pyc
+%%PYTHON_SITELIBDIR%%/gtk-2.0/gobject/constants.pyo
 %%PYTHON_SITELIBDIR%%/gtk-2.0/gobject/option.py
 %%PYTHON_SITELIBDIR%%/gtk-2.0/gobject/option.pyc
 %%PYTHON_SITELIBDIR%%/gtk-2.0/gobject/option.pyo
+%%PYTHON_SITELIBDIR%%/gtk-2.0/gobject/propertyhelper.py
+%%PYTHON_SITELIBDIR%%/gtk-2.0/gobject/propertyhelper.pyc
+%%PYTHON_SITELIBDIR%%/gtk-2.0/gobject/propertyhelper.pyo
 %%PYTHON_SITELIBDIR%%/pygtk.pth
 %%PYTHON_SITELIBDIR%%/pygtk.py
 %%PYTHON_SITELIBDIR%%/pygtk.pyc
diff --git a/devel/py-xdg/Makefile b/devel/py-xdg/Makefile
index 6916f59a00b8..648c257d0645 100644
--- a/devel/py-xdg/Makefile
+++ b/devel/py-xdg/Makefile
@@ -3,12 +3,12 @@
 # Whom:			michael johnson <ahze@ahze.net>
 #
 # $FreeBSD$
-#    $MCom: ports/devel/py-xdg/Makefile,v 1.2 2006/09/02 14:38:55 ahze Exp $
+#   $MCom: ports/devel/py-xdg/Makefile,v 1.4 2007/09/10 05:35:05 mezz Exp $
 #
 
 PORTNAME=	xdg
 PORTVERSION=	0.15
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel python
 MASTER_SITES=	http://www.freedesktop.org/~lanius/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -23,9 +23,7 @@ PYDISTUTILS_PKGNAME=	pyxdg
 
 post-patch:
 	@${REINPLACE_CMD} -e \
-		's|/etc|${LOCALBASE}/etc|g ; \
-		s|%%X11BASE%%|${X11BASE}|g ; \
-		s|%%LOCALBASE%%|${LOCALBASE}|g' \
+		's|/etc|${LOCALBASE}/etc|g ; s|%%LOCALBASE%%|${LOCALBASE}|g' \
 			${WRKSRC}/xdg/BaseDirectory.py \
 			${WRKSRC}/xdg/IconTheme.py
 
diff --git a/devel/py-xdg/files/patch-xdg::BaseDirectory.py b/devel/py-xdg/files/patch-xdg::BaseDirectory.py
index 47bd3f33a7ab..77f09b5289aa 100644
--- a/devel/py-xdg/files/patch-xdg::BaseDirectory.py
+++ b/devel/py-xdg/files/patch-xdg::BaseDirectory.py
@@ -5,7 +5,7 @@
  
  xdg_data_dirs = [xdg_data_home] + \
 -	os.environ.get('XDG_DATA_DIRS', '/usr/local/share:/usr/share').split(':')
-+	os.environ.get('XDG_DATA_DIRS', '%%LOCALBASE%%/share/gnome:%%LOCALBASE%%/share:/usr/share').split(':')
++	os.environ.get('XDG_DATA_DIRS', '%%LOCALBASE%%/share').split(':')
  
  xdg_config_home = os.environ.get('XDG_CONFIG_HOME',
  			os.path.join(_home, '.config'))
diff --git a/devel/py-xdg/files/patch-xdg::IconTheme.py b/devel/py-xdg/files/patch-xdg::IconTheme.py
index cc5714b82a78..c7af80928c98 100644
--- a/devel/py-xdg/files/patch-xdg::IconTheme.py
+++ b/devel/py-xdg/files/patch-xdg::IconTheme.py
@@ -1,14 +1,11 @@
---- xdg/IconTheme.py.orig	Sun Jun  5 14:20:19 2005
-+++ xdg/IconTheme.py	Sun Jun  5 14:21:07 2005
-@@ -215,7 +215,11 @@
+--- xdg/IconTheme.py.orig	2007-09-10 00:33:42.000000000 -0500
++++ xdg/IconTheme.py	2007-09-10 00:34:37.000000000 -0500
+@@ -215,7 +215,8 @@
  icondirs = []
  for basedir in xdg_data_dirs:
  	icondirs.append(os.path.join(basedir, "icons"))
 -icondirs.append("/usr/share/pixmaps")
-+icondirs.append("%%X11BASE%%/share/pixmaps")
 +icondirs.append("%%LOCALBASE%%/share/pixmaps")
-+icondirs.append("%%LOCALBASE%%/share/gnome/pixmaps")
-+icondirs.append("%%X11BASE%%/share/icons")
 +icondirs.append("%%LOCALBASE%%/share/icons")
  icondirs.append(os.path.expanduser("~/.icons"))
  
diff --git a/devel/regexxer/Makefile b/devel/regexxer/Makefile
index 0798863f0443..61d7305d2143 100644
--- a/devel/regexxer/Makefile
+++ b/devel/regexxer/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=		regexxer
 PORTVERSION=		0.9
-PORTREVISION=		1
+PORTREVISION=		2
 CATEGORIES=		devel textproc gnome
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/devel/regexxer/pkg-plist b/devel/regexxer/pkg-plist
index 502209bfa79e..6e25f28e935a 100644
--- a/devel/regexxer/pkg-plist
+++ b/devel/regexxer/pkg-plist
@@ -1,7 +1,7 @@
 bin/regexxer
-share/gnome/applications/regexxer.desktop
-share/gnome/regexxer/mainwindow.glade
-share/gnome/regexxer/prefdialog.glade
+share/applications/regexxer.desktop
+share/regexxer/mainwindow.glade
+share/regexxer/prefdialog.glade
 share/icons/hicolor/48x48/apps/regexxer.png
 share/locale/ar/LC_MESSAGES/regexxer.mo
 share/locale/bg/LC_MESSAGES/regexxer.mo
@@ -34,8 +34,9 @@ share/locale/vi/LC_MESSAGES/regexxer.mo
 share/locale/zh_CN/LC_MESSAGES/regexxer.mo
 share/locale/zh_HK/LC_MESSAGES/regexxer.mo
 share/locale/zh_TW/LC_MESSAGES/regexxer.mo
-@dirrm share/gnome/regexxer
+@dirrm share/regexxer
 @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/devel/ruby-glib2/Makefile b/devel/ruby-glib2/Makefile
index ab08208ff9b5..85163c4a46c4 100644
--- a/devel/ruby-glib2/Makefile
+++ b/devel/ruby-glib2/Makefile
@@ -3,7 +3,7 @@
 # Whom:			Akinori MUSHA aka knu <knu@idaemons.org>
 #
 # $FreeBSD$
-#   $MCom: ports/devel/ruby-glib2/Makefile,v 1.2 2005/10/17 07:05:39 mezz Exp $
+#   $MCom: ports/devel/ruby-glib2/Makefile,v 1.5 2007/10/05 05:06:39 mezz Exp $
 #
 
 PORTNAME=	glib2
diff --git a/devel/ruby-glib2/pkg-plist b/devel/ruby-glib2/pkg-plist
index da018cc99eb4..2e80be81b5eb 100644
--- a/devel/ruby-glib2/pkg-plist
+++ b/devel/ruby-glib2/pkg-plist
@@ -17,6 +17,7 @@
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/runner.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/shell.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/spawn.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/test_enum.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/test_glib2.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/test_iochannel.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/test_unicode.rb
diff --git a/devel/wininfo/Makefile b/devel/wininfo/Makefile
index 67b31868bbfe..7f0049053b29 100644
--- a/devel/wininfo/Makefile
+++ b/devel/wininfo/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=		wininfo
 PORTVERSION=		0.7
-PORTREVISION=	3
+PORTREVISION=		4
 CATEGORIES=		devel
 MASTER_SITES=		http://www.freedesktop.org/software/wininfo/
 
diff --git a/devel/wininfo/pkg-plist b/devel/wininfo/pkg-plist
index d71987b3de2c..be29d0b3b024 100644
--- a/devel/wininfo/pkg-plist
+++ b/devel/wininfo/pkg-plist
@@ -1,2 +1,3 @@
 bin/wininfo
-share/gnome/applications/xdg-wininfo.desktop
+share/applications/xdg-wininfo.desktop
+@dirrmtry share/applications
diff --git a/editors/abiword/Makefile b/editors/abiword/Makefile
index a015c1c6dae3..981c1e639bdc 100644
--- a/editors/abiword/Makefile
+++ b/editors/abiword/Makefile
@@ -3,12 +3,12 @@
 # Whom:                 Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/editors/abiword/Makefile,v 1.6 2006/09/30 04:39:56 ahze Exp $
+#   $MCom: ports/editors/abiword/Makefile,v 1.8 2007/07/24 04:25:21 mezz Exp $
 #
 
 PORTNAME=	abiword
 PORTVERSION=	2.4.6
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	editors
 MASTER_SITES=	http://www.abisource.com/downloads/%SUBDIR%/${PORTVERSION}/source/
 MASTER_SITE_SUBDIR=	abiword
@@ -110,9 +110,9 @@ post-install:
 	@${MKDIR} ${LOCALBASE}/libdata/bonobo/servers
 	@${INSTALL_DATA} ${WRKDIR}/abiword-${PORTVERSION}/abidistfiles/GNOME_AbiWord_Control_${ABIVERSION:S/./_/}.server \
 		${LOCALBASE}/libdata/bonobo/servers/
-	@${MKDIR} ${LOCALBASE}/share/gnome/gnome-2.0/ui
+	@${MKDIR} ${LOCALBASE}/share/gnome-2.0/ui
 	@${INSTALL_DATA} ${WRKDIR}/abiword-${PORTVERSION}/abidistfiles/abi-nautilus-view-file.xml \
-		${LOCALBASE}/share/gnome/gnome-2.0/ui/
+		${LOCALBASE}/share/gnome-2.0/ui/
 .endif
 	@-update-desktop-database
 
diff --git a/editors/abiword/pkg-plist b/editors/abiword/pkg-plist
index 05f78dc8074d..2a020dbec5c8 100644
--- a/editors/abiword/pkg-plist
+++ b/editors/abiword/pkg-plist
@@ -280,7 +280,7 @@ share/AbiSuite-%%ABIVERSION%%/templates/normal.awt-yi
 share/AbiSuite-%%ABIVERSION%%/templates/normal.awt-zh_CN
 share/AbiSuite-%%ABIVERSION%%/templates/normal.awt-zh_TW
 share/applications/abiword.desktop
-%%GNOME:%%share/gnome/gnome-2.0/ui/abi-nautilus-view-file.xml
+%%GNOME:%%share/gnome-2.0/ui/abi-nautilus-view-file.xml
 share/pixmaps/abiword_48.png
 @dirrmtry share/applications
 @dirrm share/AbiSuite-%%ABIVERSION%%/templates
diff --git a/editors/bless/Makefile b/editors/bless/Makefile
index a19f31710d06..31eefe4b6e27 100644
--- a/editors/bless/Makefile
+++ b/editors/bless/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	bless
 PORTVERSION=	0.5.0
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	editors
 MASTER_SITES=	http://download.gna.org/bless/
diff --git a/editors/bless/pkg-plist b/editors/bless/pkg-plist
index 61e290baf125..9b4f875d2253 100644
--- a/editors/bless/pkg-plist
+++ b/editors/bless/pkg-plist
@@ -62,10 +62,10 @@ lib/bless-0.5.0/bin/Bless.Buffers.dll
 %%PORTDOCS%%%%DOCSDIR%%/user/figures/bless_tab_close.png
 %%PORTDOCS%%%%DOCSDIR%%/user/index.html
 %%PORTDOCS%%%%DOCSDIR%%/user/legal.xml
-share/gnome/applications/bless.desktop
-share/gnome/omf/bless/bless-manual.omf
-share/gnome/pixmaps/bless-48x48.png
-@dirrm share/gnome/omf/bless
+share/applications/bless.desktop
+share/omf/bless/bless-manual.omf
+share/pixmaps/bless-48x48.png
+@dirrm share/omf/bless
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/user/figures
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/user
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/developer
@@ -73,3 +73,4 @@ share/gnome/pixmaps/bless-48x48.png
 @dirrm lib/bless-0.5.0/data
 @dirrm lib/bless-0.5.0/bin
 @dirrm lib/bless-0.5.0
+@dirrmtry share/applications
diff --git a/editors/conglomerate/Makefile b/editors/conglomerate/Makefile
index 88f8a09b641d..e352b946e091 100644
--- a/editors/conglomerate/Makefile
+++ b/editors/conglomerate/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	conglomerate
 PORTVERSION=	0.9.1
-PORTREVISION=	2
+PORTREVISION=	5
 CATEGORIES=	editors
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -28,8 +28,4 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 LIB_DEPENDS+=	enchant.1:${PORTSDIR}/textproc/enchant
 .endif
 
-post-install:
-	${MKDIR} ${PREFIX}/share/gnome/${PORTNAME}/help
-	${LN} -sf ${PREFIX}/share/gnome/help/${PORTNAME} ${PREFIX}/share/gnome/${PORTNAME}/help/${PORTNAME}
-
 .include <bsd.port.post.mk>
diff --git a/editors/conglomerate/pkg-plist b/editors/conglomerate/pkg-plist
index bb4b1e9235a4..c4f45fe6909d 100644
--- a/editors/conglomerate/pkg-plist
+++ b/editors/conglomerate/pkg-plist
@@ -1,172 +1,171 @@
 bin/conglomerate
 etc/gconf/schemas/conglomerate.schemas
-share/doc/conglomerate/class-hierarchy.html
-share/doc/conglomerate/class-overview.html
-share/doc/conglomerate/CongAttributeEditorCDATA.html
-share/doc/conglomerate/CongAttributeEditorENUMERATION.html
-share/doc/conglomerate/CongAttributeEditorLang.html
-share/doc/conglomerate/CongAttributeEditor.html
-share/doc/conglomerate/CongAttributeWrapperCheckButton.html
-share/doc/conglomerate/CongAttributeWrapperRadioButton.html
-share/doc/conglomerate/CongAttributeWrapper.html
-share/doc/conglomerate/CongCommandHistory.html
-share/doc/conglomerate/CongCommand.html
-share/doc/conglomerate/CongDocumentTraversal.html
-share/doc/conglomerate/CongDocument.html
-share/doc/conglomerate/CongEditorAreaBin.html
-share/doc/conglomerate/CongEditorAreaBorder.html
-share/doc/conglomerate/CongEditorAreaComposer.html
-share/doc/conglomerate/CongEditorAreaContainer.html
-share/doc/conglomerate/CongEditorAreaEntityDecl.html
-share/doc/conglomerate/CongEditorAreaEntityRef.html
-share/doc/conglomerate/CongEditorAreaExpander.html
-share/doc/conglomerate/CongEditorAreaLabelled.html
-share/doc/conglomerate/CongEditorAreaLine.html
-share/doc/conglomerate/CongEditorAreaListitem.html
-share/doc/conglomerate/CongEditorAreaParagraph.html
-share/doc/conglomerate/CongEditorAreaPixbuf.html
-share/doc/conglomerate/CongEditorAreaSpacer.html
-share/doc/conglomerate/CongEditorAreaSpanTag.html
-share/doc/conglomerate/CongEditorAreaStructuralTag.html
-share/doc/conglomerate/CongEditorAreaStructural.html
-share/doc/conglomerate/CongEditorAreaTextComment.html
-share/doc/conglomerate/CongEditorAreaTextFragment.html
-share/doc/conglomerate/CongEditorAreaText.html
-share/doc/conglomerate/CongEditorAreaUnderline.html
-share/doc/conglomerate/CongEditorAreaUnknownTag.html
-share/doc/conglomerate/CongEditorArea.html
-share/doc/conglomerate/CongEditorNodeElementListitem.html
-share/doc/conglomerate/CongEditorNodeElementParagraph.html
-share/doc/conglomerate/CongEditorNodeElement.html
-share/doc/conglomerate/CongEditorNode.html
-share/doc/conglomerate/CongEditorWidget3.html
-share/doc/conglomerate/conglomerate-CongApp.html
-share/doc/conglomerate/conglomerate-CongDispspecElement.html
-share/doc/conglomerate/conglomerate-CongDispspecRegistry.html
-share/doc/conglomerate/conglomerate-CongDispspec.html
-share/doc/conglomerate/conglomerate-CongEditorNodeComment.html
-share/doc/conglomerate/conglomerate-CongEditorNodeDocument.html
-share/doc/conglomerate/conglomerate-CongEditorNodeDtd.html
-share/doc/conglomerate/conglomerate-CongEditorNodeElementAdmonition.html
-share/doc/conglomerate/conglomerate-CongEditorNodeElementSpan.html
-share/doc/conglomerate/conglomerate-CongEditorNodeElementStructural.html
-share/doc/conglomerate/conglomerate-CongEditorNodeElementUnknown.html
-share/doc/conglomerate/conglomerate-CongEditorNodeEntityDecl.html
-share/doc/conglomerate/conglomerate-CongEditorNodeEntityRef.html
-share/doc/conglomerate/conglomerate-CongEditorNodeText.html
-share/doc/conglomerate/conglomerate-CongEditorNodeUnimplemented.html
-share/doc/conglomerate/conglomerate-CongLocation.html
-share/doc/conglomerate/conglomerate-CongObject.html
-share/doc/conglomerate/conglomerate-CongPluginManager.html
-share/doc/conglomerate/conglomerate-CongRange.html
-share/doc/conglomerate/conglomerate-CongSelection.html
-share/doc/conglomerate/conglomerate-CongServicePrintMethod.html
-share/doc/conglomerate/conglomerate-cong-dialog.html
-share/doc/conglomerate/conglomerate-cong-edit-find-and-replace.html
-share/doc/conglomerate/conglomerate-cong-eel.html
-share/doc/conglomerate/conglomerate-cong-eel-graphic-effects.html
-share/doc/conglomerate/conglomerate-cong-enum-mapping.html
-share/doc/conglomerate/conglomerate-cong-error-dialog.html
-share/doc/conglomerate/conglomerate-cong-fake-plugin-hooks.html
-share/doc/conglomerate/conglomerate-cong-file-selection.html
-share/doc/conglomerate/conglomerate-cong-font.html
-share/doc/conglomerate/conglomerate-cong-glade.html
-share/doc/conglomerate/conglomerate-cong-graph.html
-share/doc/conglomerate/conglomerate-cong-marshal.html
-share/doc/conglomerate/conglomerate-cong-overview-view.html
-share/doc/conglomerate/conglomerate-cong-parser-error.html
-share/doc/conglomerate/conglomerate-cong-primary-window.html
-share/doc/conglomerate/conglomerate-cong-progress-checklist.html
-share/doc/conglomerate/conglomerate-cong-text-cache.html
-share/doc/conglomerate/conglomerate-cong-tree-view.html
-share/doc/conglomerate/conglomerate-cong-ui-hooks.html
-share/doc/conglomerate/conglomerate-cong-vfs.html
-share/doc/conglomerate/conglomerate-cong-view.html
-share/doc/conglomerate/conglomerate-DTD-Handling.html
-share/doc/conglomerate/conglomerate-global.html
-share/doc/conglomerate/conglomerate-Utility-functions.html
-share/doc/conglomerate/conglomerate-XML-Nodes.html
-share/doc/conglomerate/CongModificationCursorChange.html
-share/doc/conglomerate/CongModificationSelectionChange.html
-share/doc/conglomerate/CongModificationSetDtdPtr.html
-share/doc/conglomerate/CongModification.html
-share/doc/conglomerate/CongNodeModificationAddAfter.html
-share/doc/conglomerate/CongNodeModificationAddBefore.html
-share/doc/conglomerate/CongNodeModificationMakeOrphan.html
-share/doc/conglomerate/CongNodeModificationRemoveAttribute.html
-share/doc/conglomerate/CongNodeModificationSetAttribute.html
-share/doc/conglomerate/CongNodeModificationSetParent.html
-share/doc/conglomerate/CongNodeModificationSetText.html
-share/doc/conglomerate/CongNodeModification.html
-share/doc/conglomerate/CongPlugin.html
-share/doc/conglomerate/CongServiceDocTool.html
-share/doc/conglomerate/CongServiceDocumentFactory.html
-share/doc/conglomerate/CongServiceEditorNodeFactory.html
-share/doc/conglomerate/CongServiceExporter.html
-share/doc/conglomerate/CongServiceImporter.html
-share/doc/conglomerate/CongServiceNodePropertyDialog.html
-share/doc/conglomerate/CongServiceNodeTool.html
-share/doc/conglomerate/CongServiceTool.html
-share/doc/conglomerate/CongService.html
-share/doc/conglomerate/CongTraversalNode.html
-share/doc/conglomerate/CongXPathExpression.html
-share/doc/conglomerate/ch01.html
-share/doc/conglomerate/ch02.html
-share/doc/conglomerate/editor.html
-share/doc/conglomerate/helper.html
-share/doc/conglomerate/index.html
-share/doc/conglomerate/index.sgml
-share/doc/conglomerate/ix01.html
-share/doc/conglomerate/misc.html
-share/doc/conglomerate/plugins.html
-share/doc/conglomerate/state.html
-share/doc/conglomerate/views.html
-share/doc/conglomerate/xml.html
-share/gnome/application-registry/conglomerate.applications
-share/gnome/applications/conglomerate.desktop
-share/gnome/conglomerate/css/docbook.css
-share/gnome/conglomerate/dispspecs/cnxml.xds
-share/gnome/conglomerate/dispspecs/dispspec.xds
-share/gnome/conglomerate/dispspecs/docbook.xds
-share/gnome/conglomerate/dispspecs/forrest-document.xds
-share/gnome/conglomerate/dispspecs/kernel-traffic-newsletter.xds
-share/gnome/conglomerate/dispspecs/opml.xds
-share/gnome/conglomerate/dispspecs/readme.xds
-share/gnome/conglomerate/dispspecs/relax-ng.xds
-share/gnome/conglomerate/dispspecs/release.xds
-share/gnome/conglomerate/dispspecs/teixlite.xds
-share/gnome/conglomerate/dispspecs/website-layout.xds
-share/gnome/conglomerate/dispspecs/website-webpage.xds
-share/gnome/conglomerate/dispspecs/xhtml1-strict.xds
-share/gnome/conglomerate/dispspecs/xsl.xds
-share/gnome/conglomerate/dtd/release.dtd
-share/gnome/conglomerate/dtd/xds.dtd
-share/gnome/conglomerate/examples/cnxml.xml
-share/gnome/conglomerate/examples/error-proposal.xml
-share/gnome/conglomerate/examples/file-roller.xml
-share/gnome/conglomerate/examples/i18n.xml
-share/gnome/conglomerate/examples/nmtoken.xml
-share/gnome/conglomerate/examples/readme.xml
-share/gnome/conglomerate/examples/test-docbook.xml
-share/gnome/conglomerate/examples/test-entities.xml
-share/gnome/conglomerate/examples/test-table.xml
-share/gnome/conglomerate/examples/test-table3.xml
-share/gnome/conglomerate/glade/cong-file-import.glade
-share/gnome/conglomerate/glade/cong-file-properties.glade
-share/gnome/conglomerate/glade/cong-find-replace.glade
-share/gnome/conglomerate/glade/cong-preferences.glade
-share/gnome/conglomerate/glade/custom-element.glade
-share/gnome/conglomerate/glade/docbook-common-properties.glade
-share/gnome/conglomerate/glade/docbook-orderedlist-properties.glade
-share/gnome/conglomerate/glade/docbook-ulink-properties.glade
-share/gnome/conglomerate/glade/plugin-arbitrary.glade
-share/gnome/conglomerate/glade/plugin-random.glade
-share/gnome/conglomerate/glade/string_selection_dialog.glade
-share/gnome/conglomerate/help/conglomerate
-share/gnome/conglomerate/stylesheets/selection-to-text.xsl
-share/gnome/conglomerate/templates/dispspec.xml
-share/gnome/conglomerate/templates/dispspec-template.xds
-share/gnome/conglomerate/templates/html.xml
+share/application-registry/conglomerate.applications
+share/applications/conglomerate.desktop
+%%DATADIR%%/css/docbook.css
+%%DATADIR%%/dispspecs/cnxml.xds
+%%DATADIR%%/dispspecs/dispspec.xds
+%%DATADIR%%/dispspecs/docbook.xds
+%%DATADIR%%/dispspecs/forrest-document.xds
+%%DATADIR%%/dispspecs/kernel-traffic-newsletter.xds
+%%DATADIR%%/dispspecs/opml.xds
+%%DATADIR%%/dispspecs/readme.xds
+%%DATADIR%%/dispspecs/relax-ng.xds
+%%DATADIR%%/dispspecs/release.xds
+%%DATADIR%%/dispspecs/teixlite.xds
+%%DATADIR%%/dispspecs/website-layout.xds
+%%DATADIR%%/dispspecs/website-webpage.xds
+%%DATADIR%%/dispspecs/xhtml1-strict.xds
+%%DATADIR%%/dispspecs/xsl.xds
+%%DATADIR%%/dtd/release.dtd
+%%DATADIR%%/dtd/xds.dtd
+%%DATADIR%%/examples/cnxml.xml
+%%DATADIR%%/examples/error-proposal.xml
+%%DATADIR%%/examples/file-roller.xml
+%%DATADIR%%/examples/i18n.xml
+%%DATADIR%%/examples/nmtoken.xml
+%%DATADIR%%/examples/readme.xml
+%%DATADIR%%/examples/test-docbook.xml
+%%DATADIR%%/examples/test-entities.xml
+%%DATADIR%%/examples/test-table.xml
+%%DATADIR%%/examples/test-table3.xml
+%%DATADIR%%/glade/cong-file-import.glade
+%%DATADIR%%/glade/cong-file-properties.glade
+%%DATADIR%%/glade/cong-find-replace.glade
+%%DATADIR%%/glade/cong-preferences.glade
+%%DATADIR%%/glade/custom-element.glade
+%%DATADIR%%/glade/docbook-common-properties.glade
+%%DATADIR%%/glade/docbook-orderedlist-properties.glade
+%%DATADIR%%/glade/docbook-ulink-properties.glade
+%%DATADIR%%/glade/plugin-arbitrary.glade
+%%DATADIR%%/glade/plugin-random.glade
+%%DATADIR%%/glade/string_selection_dialog.glade
+%%DATADIR%%/stylesheets/selection-to-text.xsl
+%%DATADIR%%/templates/dispspec-template.xds
+%%DATADIR%%/templates/dispspec.xml
+%%DATADIR%%/templates/html.xml
+%%DOCSDIR%%/CongAttributeEditor.html
+%%DOCSDIR%%/CongAttributeEditorCDATA.html
+%%DOCSDIR%%/CongAttributeEditorENUMERATION.html
+%%DOCSDIR%%/CongAttributeEditorLang.html
+%%DOCSDIR%%/CongAttributeWrapper.html
+%%DOCSDIR%%/CongAttributeWrapperCheckButton.html
+%%DOCSDIR%%/CongAttributeWrapperRadioButton.html
+%%DOCSDIR%%/CongCommand.html
+%%DOCSDIR%%/CongCommandHistory.html
+%%DOCSDIR%%/CongDocument.html
+%%DOCSDIR%%/CongDocumentTraversal.html
+%%DOCSDIR%%/CongEditorArea.html
+%%DOCSDIR%%/CongEditorAreaBin.html
+%%DOCSDIR%%/CongEditorAreaBorder.html
+%%DOCSDIR%%/CongEditorAreaComposer.html
+%%DOCSDIR%%/CongEditorAreaContainer.html
+%%DOCSDIR%%/CongEditorAreaEntityDecl.html
+%%DOCSDIR%%/CongEditorAreaEntityRef.html
+%%DOCSDIR%%/CongEditorAreaExpander.html
+%%DOCSDIR%%/CongEditorAreaLabelled.html
+%%DOCSDIR%%/CongEditorAreaLine.html
+%%DOCSDIR%%/CongEditorAreaListitem.html
+%%DOCSDIR%%/CongEditorAreaParagraph.html
+%%DOCSDIR%%/CongEditorAreaPixbuf.html
+%%DOCSDIR%%/CongEditorAreaSpacer.html
+%%DOCSDIR%%/CongEditorAreaSpanTag.html
+%%DOCSDIR%%/CongEditorAreaStructural.html
+%%DOCSDIR%%/CongEditorAreaStructuralTag.html
+%%DOCSDIR%%/CongEditorAreaText.html
+%%DOCSDIR%%/CongEditorAreaTextComment.html
+%%DOCSDIR%%/CongEditorAreaTextFragment.html
+%%DOCSDIR%%/CongEditorAreaUnderline.html
+%%DOCSDIR%%/CongEditorAreaUnknownTag.html
+%%DOCSDIR%%/CongEditorNode.html
+%%DOCSDIR%%/CongEditorNodeElement.html
+%%DOCSDIR%%/CongEditorNodeElementListitem.html
+%%DOCSDIR%%/CongEditorNodeElementParagraph.html
+%%DOCSDIR%%/CongEditorWidget3.html
+%%DOCSDIR%%/CongModification.html
+%%DOCSDIR%%/CongModificationCursorChange.html
+%%DOCSDIR%%/CongModificationSelectionChange.html
+%%DOCSDIR%%/CongModificationSetDtdPtr.html
+%%DOCSDIR%%/CongNodeModification.html
+%%DOCSDIR%%/CongNodeModificationAddAfter.html
+%%DOCSDIR%%/CongNodeModificationAddBefore.html
+%%DOCSDIR%%/CongNodeModificationMakeOrphan.html
+%%DOCSDIR%%/CongNodeModificationRemoveAttribute.html
+%%DOCSDIR%%/CongNodeModificationSetAttribute.html
+%%DOCSDIR%%/CongNodeModificationSetParent.html
+%%DOCSDIR%%/CongNodeModificationSetText.html
+%%DOCSDIR%%/CongPlugin.html
+%%DOCSDIR%%/CongService.html
+%%DOCSDIR%%/CongServiceDocTool.html
+%%DOCSDIR%%/CongServiceDocumentFactory.html
+%%DOCSDIR%%/CongServiceEditorNodeFactory.html
+%%DOCSDIR%%/CongServiceExporter.html
+%%DOCSDIR%%/CongServiceImporter.html
+%%DOCSDIR%%/CongServiceNodePropertyDialog.html
+%%DOCSDIR%%/CongServiceNodeTool.html
+%%DOCSDIR%%/CongServiceTool.html
+%%DOCSDIR%%/CongTraversalNode.html
+%%DOCSDIR%%/CongXPathExpression.html
+%%DOCSDIR%%/ch01.html
+%%DOCSDIR%%/ch02.html
+%%DOCSDIR%%/class-hierarchy.html
+%%DOCSDIR%%/class-overview.html
+%%DOCSDIR%%/conglomerate-CongApp.html
+%%DOCSDIR%%/conglomerate-CongDispspec.html
+%%DOCSDIR%%/conglomerate-CongDispspecElement.html
+%%DOCSDIR%%/conglomerate-CongDispspecRegistry.html
+%%DOCSDIR%%/conglomerate-CongEditorNodeComment.html
+%%DOCSDIR%%/conglomerate-CongEditorNodeDocument.html
+%%DOCSDIR%%/conglomerate-CongEditorNodeDtd.html
+%%DOCSDIR%%/conglomerate-CongEditorNodeElementAdmonition.html
+%%DOCSDIR%%/conglomerate-CongEditorNodeElementSpan.html
+%%DOCSDIR%%/conglomerate-CongEditorNodeElementStructural.html
+%%DOCSDIR%%/conglomerate-CongEditorNodeElementUnknown.html
+%%DOCSDIR%%/conglomerate-CongEditorNodeEntityDecl.html
+%%DOCSDIR%%/conglomerate-CongEditorNodeEntityRef.html
+%%DOCSDIR%%/conglomerate-CongEditorNodeText.html
+%%DOCSDIR%%/conglomerate-CongEditorNodeUnimplemented.html
+%%DOCSDIR%%/conglomerate-CongLocation.html
+%%DOCSDIR%%/conglomerate-CongObject.html
+%%DOCSDIR%%/conglomerate-CongPluginManager.html
+%%DOCSDIR%%/conglomerate-CongRange.html
+%%DOCSDIR%%/conglomerate-CongSelection.html
+%%DOCSDIR%%/conglomerate-CongServicePrintMethod.html
+%%DOCSDIR%%/conglomerate-DTD-Handling.html
+%%DOCSDIR%%/conglomerate-Utility-functions.html
+%%DOCSDIR%%/conglomerate-XML-Nodes.html
+%%DOCSDIR%%/conglomerate-cong-dialog.html
+%%DOCSDIR%%/conglomerate-cong-edit-find-and-replace.html
+%%DOCSDIR%%/conglomerate-cong-eel-graphic-effects.html
+%%DOCSDIR%%/conglomerate-cong-eel.html
+%%DOCSDIR%%/conglomerate-cong-enum-mapping.html
+%%DOCSDIR%%/conglomerate-cong-error-dialog.html
+%%DOCSDIR%%/conglomerate-cong-fake-plugin-hooks.html
+%%DOCSDIR%%/conglomerate-cong-file-selection.html
+%%DOCSDIR%%/conglomerate-cong-font.html
+%%DOCSDIR%%/conglomerate-cong-glade.html
+%%DOCSDIR%%/conglomerate-cong-graph.html
+%%DOCSDIR%%/conglomerate-cong-marshal.html
+%%DOCSDIR%%/conglomerate-cong-overview-view.html
+%%DOCSDIR%%/conglomerate-cong-parser-error.html
+%%DOCSDIR%%/conglomerate-cong-primary-window.html
+%%DOCSDIR%%/conglomerate-cong-progress-checklist.html
+%%DOCSDIR%%/conglomerate-cong-text-cache.html
+%%DOCSDIR%%/conglomerate-cong-tree-view.html
+%%DOCSDIR%%/conglomerate-cong-ui-hooks.html
+%%DOCSDIR%%/conglomerate-cong-vfs.html
+%%DOCSDIR%%/conglomerate-cong-view.html
+%%DOCSDIR%%/conglomerate-global.html
+%%DOCSDIR%%/editor.html
+%%DOCSDIR%%/helper.html
+%%DOCSDIR%%/index.html
+%%DOCSDIR%%/index.sgml
+%%DOCSDIR%%/ix01.html
+%%DOCSDIR%%/misc.html
+%%DOCSDIR%%/plugins.html
+%%DOCSDIR%%/state.html
+%%DOCSDIR%%/views.html
+%%DOCSDIR%%/xml.html
 share/gnome/help/conglomerate/C/cong_element_map_ref.xml
 share/gnome/help/conglomerate/C/conglomerate.xml
 share/gnome/help/conglomerate/C/conventions.xml
@@ -176,6 +175,7 @@ share/gnome/help/conglomerate/C/figures/caution.png
 share/gnome/help/conglomerate/C/figures/cong_create_new_file_wiz1.png
 share/gnome/help/conglomerate/C/figures/cong_create_new_file_wiz2.png
 share/gnome/help/conglomerate/C/figures/cong_dump_xds_dialog.png
+share/gnome/help/conglomerate/C/figures/cong_edit_xds_dialog.png
 share/gnome/help/conglomerate/C/figures/cong_editor_outlineview_overview.png
 share/gnome/help/conglomerate/C/figures/cong_editor_outlineview_popup_menu.png
 share/gnome/help/conglomerate/C/figures/cong_editor_outlineview_raw.png
@@ -187,7 +187,6 @@ share/gnome/help/conglomerate/C/figures/cong_editor_window_menubar.png
 share/gnome/help/conglomerate/C/figures/cong_editor_window_statusbar.png
 share/gnome/help/conglomerate/C/figures/cong_editor_window_titlebar.png
 share/gnome/help/conglomerate/C/figures/cong_editor_window_toolbar.png
-share/gnome/help/conglomerate/C/figures/cong_edit_xds_dialog.png
 share/gnome/help/conglomerate/C/figures/cong_export_file_dialog.png
 share/gnome/help/conglomerate/C/figures/cong_import_file_dialog.png
 share/gnome/help/conglomerate/C/figures/cong_inline_menu.png
@@ -226,47 +225,6 @@ share/gnome/help/conglomerate/C/notice_gpl.xml
 share/gnome/help/conglomerate/C/row_xml_lang_attrib.xml
 share/gnome/help/conglomerate/C/tbl_element_attrib.xml
 share/gnome/help/conglomerate/C/xds_dtd_def.xml
-share/gnome/mime-info/conglomerate.keys
-share/gnome/mime-info/conglomerate.mime
-share/gnome/omf/conglomerate/conglomerate-C.omf
-share/gnome/pixmaps/conglomerate-icon-16.png
-share/gnome/pixmaps/conglomerate/conglomerate-icon-32.png
-share/gnome/pixmaps/conglomerate/conglomerate-logo.png
-share/gnome/pixmaps/conglomerate/cong-address-16.png
-share/gnome/pixmaps/conglomerate/cong-answer-16.png
-share/gnome/pixmaps/conglomerate/cong-author-16.png
-share/gnome/pixmaps/conglomerate/cong-bibliography-16.png
-share/gnome/pixmaps/conglomerate/cong-bulleted-list-16.png
-share/gnome/pixmaps/conglomerate/cong-caution-48.png
-share/gnome/pixmaps/conglomerate/cong-comment-16.png
-share/gnome/pixmaps/conglomerate/cong-code-fragment-16.png
-share/gnome/pixmaps/conglomerate/cong-definition-list-16.png
-share/gnome/pixmaps/conglomerate/cong-docbook-article-16.png
-share/gnome/pixmaps/conglomerate/cong-docbook-book-16.png
-share/gnome/pixmaps/conglomerate/cong-docbook-set-16.png
-share/gnome/pixmaps/conglomerate/cong-editor-16.png
-share/gnome/pixmaps/conglomerate/cong-entry-16.png
-share/gnome/pixmaps/conglomerate/cong-faq-16.png
-share/gnome/pixmaps/conglomerate/cong-footnote-16.png
-share/gnome/pixmaps/conglomerate/cong-history-16.png
-share/gnome/pixmaps/conglomerate/cong-important-48.png
-share/gnome/pixmaps/conglomerate/cong-indexterm-16.png
-share/gnome/pixmaps/conglomerate/cong-list-item-16.png
-share/gnome/pixmaps/conglomerate/cong-list-16.png
-share/gnome/pixmaps/conglomerate/cong-metadata-16.png
-share/gnome/pixmaps/conglomerate/cong-name-16.png
-share/gnome/pixmaps/conglomerate/cong-note-48.png
-share/gnome/pixmaps/conglomerate/cong-numbered-list-16.png
-share/gnome/pixmaps/conglomerate/cong-paragraph-16.png
-share/gnome/pixmaps/conglomerate/cong-publisher-16.png
-share/gnome/pixmaps/conglomerate/cong-question-16.png
-share/gnome/pixmaps/conglomerate/cong-subsection-16.png
-share/gnome/pixmaps/conglomerate/cong-summary-16.png
-share/gnome/pixmaps/conglomerate/cong-tip-48.png
-share/gnome/pixmaps/conglomerate/cong-title-16.png
-share/gnome/pixmaps/conglomerate/cong-uncomment-16.png
-share/gnome/pixmaps/conglomerate/cong-warning-48.png
-share/gnome/pixmaps/conglomerate/cong-wrapper-16.png
 share/locale/az/LC_MESSAGES/conglomerate.mo
 share/locale/ca/LC_MESSAGES/conglomerate.mo
 share/locale/cs/LC_MESSAGES/conglomerate.mo
@@ -293,20 +251,59 @@ share/locale/sr@Latn/LC_MESSAGES/conglomerate.mo
 share/locale/sv/LC_MESSAGES/conglomerate.mo
 share/locale/uk/LC_MESSAGES/conglomerate.mo
 share/locale/zh_CN/LC_MESSAGES/conglomerate.mo
-@dirrmtry share/locale/rw/LC_MESSAGES
-@dirrmtry share/locale/rw
-@dirrm share/gnome/pixmaps/conglomerate
-@dirrm share/gnome/omf/conglomerate
+share/mime-info/conglomerate.keys
+share/mime-info/conglomerate.mime
+share/omf/conglomerate/conglomerate-C.omf
+share/pixmaps/conglomerate-icon-16.png
+share/pixmaps/conglomerate/cong-address-16.png
+share/pixmaps/conglomerate/cong-answer-16.png
+share/pixmaps/conglomerate/cong-author-16.png
+share/pixmaps/conglomerate/cong-bibliography-16.png
+share/pixmaps/conglomerate/cong-bulleted-list-16.png
+share/pixmaps/conglomerate/cong-caution-48.png
+share/pixmaps/conglomerate/cong-code-fragment-16.png
+share/pixmaps/conglomerate/cong-comment-16.png
+share/pixmaps/conglomerate/cong-definition-list-16.png
+share/pixmaps/conglomerate/cong-docbook-article-16.png
+share/pixmaps/conglomerate/cong-docbook-book-16.png
+share/pixmaps/conglomerate/cong-docbook-set-16.png
+share/pixmaps/conglomerate/cong-editor-16.png
+share/pixmaps/conglomerate/cong-entry-16.png
+share/pixmaps/conglomerate/cong-faq-16.png
+share/pixmaps/conglomerate/cong-footnote-16.png
+share/pixmaps/conglomerate/cong-history-16.png
+share/pixmaps/conglomerate/cong-important-48.png
+share/pixmaps/conglomerate/cong-indexterm-16.png
+share/pixmaps/conglomerate/cong-list-16.png
+share/pixmaps/conglomerate/cong-list-item-16.png
+share/pixmaps/conglomerate/cong-metadata-16.png
+share/pixmaps/conglomerate/cong-name-16.png
+share/pixmaps/conglomerate/cong-note-48.png
+share/pixmaps/conglomerate/cong-numbered-list-16.png
+share/pixmaps/conglomerate/cong-paragraph-16.png
+share/pixmaps/conglomerate/cong-publisher-16.png
+share/pixmaps/conglomerate/cong-question-16.png
+share/pixmaps/conglomerate/cong-subsection-16.png
+share/pixmaps/conglomerate/cong-summary-16.png
+share/pixmaps/conglomerate/cong-tip-48.png
+share/pixmaps/conglomerate/cong-title-16.png
+share/pixmaps/conglomerate/cong-uncomment-16.png
+share/pixmaps/conglomerate/cong-warning-48.png
+share/pixmaps/conglomerate/cong-wrapper-16.png
+share/pixmaps/conglomerate/conglomerate-icon-32.png
+share/pixmaps/conglomerate/conglomerate-logo.png
+@dirrm share/omf/conglomerate
+@dirrm share/pixmaps/conglomerate
 @dirrm share/gnome/help/conglomerate/C/figures
 @dirrm share/gnome/help/conglomerate/C
 @dirrm share/gnome/help/conglomerate
-@dirrm share/gnome/conglomerate/css
-@dirrm share/gnome/conglomerate/dispspecs
-@dirrm share/gnome/conglomerate/dtd
-@dirrm share/gnome/conglomerate/examples
-@dirrm share/gnome/conglomerate/glade
-@dirrm share/gnome/conglomerate/help
-@dirrm share/gnome/conglomerate/stylesheets
-@dirrm share/gnome/conglomerate/templates
-@dirrm share/gnome/conglomerate
-@dirrm share/doc/conglomerate
+@dirrm %%DOCSDIR%%
+@dirrm %%DATADIR%%/templates
+@dirrm %%DATADIR%%/stylesheets
+@dirrm %%DATADIR%%/glade
+@dirrm %%DATADIR%%/examples
+@dirrm %%DATADIR%%/dtd
+@dirrm %%DATADIR%%/dispspecs
+@dirrm %%DATADIR%%/css
+@dirrm %%DATADIR%%
+@dirrmtry share/applications
diff --git a/editors/dedit/Makefile b/editors/dedit/Makefile
index e7cd33edd9d9..f459e8b012d8 100644
--- a/editors/dedit/Makefile
+++ b/editors/dedit/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	dedit
 PORTVERSION=	0.6.2.3
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	editors gnome
 MASTER_SITES=	${MASTER_SITE_DEBIAN_POOL}
 DISTNAME=	${PORTNAME}_${PORTVERSION}
@@ -35,8 +35,7 @@ BROKEN=		Broken with gcc 4.2
 
 pre-patch:
 	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
-		's|\(\$$(datadir)/\)gnome/|\1|g ; \
-		 s|dedit.ja.1||'
+		's|dedit.ja.1||'
 
 post-install:
 	${INSTALL_MAN} ${WRKSRC}/doc/dedit.ja.1 ${MANPREFIX}/man/ja/man1/dedit.1
diff --git a/editors/gedit-plugins/Makefile b/editors/gedit-plugins/Makefile
index 757529260495..f3b9067d69f9 100644
--- a/editors/gedit-plugins/Makefile
+++ b/editors/gedit-plugins/Makefile
@@ -3,12 +3,11 @@
 # Whom:					Adam Weinberger <adamw@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/editors/gedit-plugins/Makefile,v 1.21 2007/02/20 21:09:47 marcus Exp $
+#   $MCom: ports/editors/gedit-plugins/Makefile,v 1.24 2007/09/30 17:15:47 mezz Exp $
 #
 
 PORTNAME=	gedit-plugins
-PORTVERSION=	2.18.0
-PORTREVISION=	1
+PORTVERSION=	2.20.0
 CATEGORIES=	editors gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -42,10 +41,10 @@ WITH_GNOME=	yes
 
 .include <bsd.port.pre.mk>
 
-.if ${HAVE_GNOME:Mpygnomedesktop}!="" && ${ARCH}!="sparc64"
+.if ${HAVE_GNOME:Mpygtksourceview}!="" && ${ARCH}!="sparc64"
 USE_PYTHON=	yes
 .include "${PORTSDIR}/Mk/bsd.python.mk"
-USE_GNOME+=	pygnomedesktop
+USE_GNOME+=	pygtksourceview
 BUILD_DEPENDS+=	${PYTHON_SITELIBDIR}/gtk-2.0/vtemodule.so:${PORTSDIR}/x11-toolkits/py-vte
 RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/gtk-2.0/vtemodule.so:${PORTSDIR}/x11-toolkits/py-vte
 CONFIGURE_ARGS+=--enable-python
diff --git a/editors/gedit-plugins/distinfo b/editors/gedit-plugins/distinfo
index d74b8a1ac51a..cecfe8cb1c1b 100644
--- a/editors/gedit-plugins/distinfo
+++ b/editors/gedit-plugins/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gedit-plugins-2.18.0.tar.bz2) = a2c3d02f90eab956f7e7df465d191f64
-SHA256 (gnome2/gedit-plugins-2.18.0.tar.bz2) = 744bad785d51741d5cd33ff09c32cddc28a5062102447be161a8091f63b7e095
-SIZE (gnome2/gedit-plugins-2.18.0.tar.bz2) = 562590
+MD5 (gnome2/gedit-plugins-2.20.0.tar.bz2) = ec5be3d10ca4da4b33effad207ef35e9
+SHA256 (gnome2/gedit-plugins-2.20.0.tar.bz2) = 35786e5969340f1028522bc4026cce20fcc62bfc69d9eb9ef094fbc745e4e884
+SIZE (gnome2/gedit-plugins-2.20.0.tar.bz2) = 555944
diff --git a/editors/gedit-plugins/pkg-plist b/editors/gedit-plugins/pkg-plist
index 7c10f9e54f3e..c6abbc83d0aa 100644
--- a/editors/gedit-plugins/pkg-plist
+++ b/editors/gedit-plugins/pkg-plist
@@ -71,6 +71,7 @@ share/locale/he/LC_MESSAGES/gedit-plugins.mo
 share/locale/hi/LC_MESSAGES/gedit-plugins.mo
 share/locale/hr/LC_MESSAGES/gedit-plugins.mo
 share/locale/hu/LC_MESSAGES/gedit-plugins.mo
+share/locale/it/LC_MESSAGES/gedit-plugins.mo
 share/locale/ja/LC_MESSAGES/gedit-plugins.mo
 share/locale/kn/LC_MESSAGES/gedit-plugins.mo
 share/locale/ko/LC_MESSAGES/gedit-plugins.mo
@@ -85,6 +86,7 @@ share/locale/ne/LC_MESSAGES/gedit-plugins.mo
 share/locale/nl/LC_MESSAGES/gedit-plugins.mo
 share/locale/nn/LC_MESSAGES/gedit-plugins.mo
 share/locale/no/LC_MESSAGES/gedit-plugins.mo
+share/locale/oc/LC_MESSAGES/gedit-plugins.mo
 share/locale/or/LC_MESSAGES/gedit-plugins.mo
 share/locale/pa/LC_MESSAGES/gedit-plugins.mo
 share/locale/pl/LC_MESSAGES/gedit-plugins.mo
@@ -113,5 +115,7 @@ share/locale/zh_TW/LC_MESSAGES/gedit-plugins.mo
 @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/editors/gedit/Makefile b/editors/gedit/Makefile
index 7a52ae6b44af..008cc868983f 100644
--- a/editors/gedit/Makefile
+++ b/editors/gedit/Makefile
@@ -3,11 +3,11 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/editors/gedit/Makefile,v 1.58 2007/03/11 17:00:31 marcus Exp $
+#   $MCom: ports/editors/gedit/Makefile,v 1.72 2007/10/18 17:08:10 mezz Exp $
 #
 
 PORTNAME=	gedit
-PORTVERSION=	2.18.2
+PORTVERSION=	2.20.3
 CATEGORIES=	editors gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -28,11 +28,11 @@ USE_LDCONFIG=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 USE_GNOME=	gnomeprefix gnomehack intlhack \
-		libgnomeprintui libgnomeui eel2 gtksourceview desktopfileutils
+		libgnomeprintui libgnomeui eel2 gtksourceview2 desktopfileutils
 WANT_GNOME=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
-PLIST_SUB=	VERSION="2.16"
+PLIST_SUB=	VERSION="2.20"
 
 MAN1=		gedit.1
 GCONF_SCHEMAS=	gedit.schemas gedit-file-browser.schemas
@@ -44,10 +44,10 @@ WITH_GNOME=	yes
 
 .include <bsd.port.pre.mk>
 
-.if ${HAVE_GNOME:Mpygnomedesktop}!=""
+.if ${HAVE_GNOME:Mpygtksourceview}!=""
 USE_PYTHON=	yes
 .include "${PORTSDIR}/Mk/bsd.python.mk"
-USE_GNOME+=	pygnomedesktop
+USE_GNOME+=	pygtksourceview
 CONFIGURE_ARGS+=--enable-python
 PLIST_SUB+=	PYTHON=""
 .else
diff --git a/editors/gedit/distinfo b/editors/gedit/distinfo
index b1363a5e697a..21ac4dc98f5c 100644
--- a/editors/gedit/distinfo
+++ b/editors/gedit/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gedit-2.18.2.tar.bz2) = 7e8bf29bd6bf0d17ceaf42d9bd5d94e6
-SHA256 (gnome2/gedit-2.18.2.tar.bz2) = 12e4c2e15c1449e92f9f6c7966f4e1829290d5af35b9ec0b9274d8f167a89f44
-SIZE (gnome2/gedit-2.18.2.tar.bz2) = 3454560
+MD5 (gnome2/gedit-2.20.3.tar.bz2) = afc7bb5327c0cba393af4b1f6fa096c1
+SHA256 (gnome2/gedit-2.20.3.tar.bz2) = d8159e6a3442a3bcf8dba5aab5b8d4b79faa5f2d14d9df9b43fa0e9186922df0
+SIZE (gnome2/gedit-2.20.3.tar.bz2) = 3812377
diff --git a/editors/gedit/pkg-plist b/editors/gedit/pkg-plist
index b77169ded8fd..31b00b2ab69f 100644
--- a/editors/gedit/pkg-plist
+++ b/editors/gedit/pkg-plist
@@ -15,8 +15,6 @@ include/gedit-%%VERSION%%/gedit/gedit-panel.h
 include/gedit-%%VERSION%%/gedit/gedit-plugin.h
 include/gedit-%%VERSION%%/gedit/gedit-prefs-manager-app.h
 include/gedit-%%VERSION%%/gedit/gedit-prefs-manager.h
-include/gedit-%%VERSION%%/gedit/gedit-print-job-preview.h
-include/gedit-%%VERSION%%/gedit/gedit-print.h
 include/gedit-%%VERSION%%/gedit/gedit-progress-message-area.h
 include/gedit-%%VERSION%%/gedit/gedit-statusbar.h
 include/gedit-%%VERSION%%/gedit/gedit-tab.h
@@ -59,8 +57,8 @@ lib/gedit-2/plugins/libfilebrowser.la
 lib/gedit-2/plugins/libfilebrowser.so
 lib/gedit-2/plugins/libindent.la
 lib/gedit-2/plugins/libindent.so
-%%PYTHON%%lib/gedit-2/plugins/libmodelines.la
-%%PYTHON%%lib/gedit-2/plugins/libmodelines.so
+lib/gedit-2/plugins/libmodelines.la
+lib/gedit-2/plugins/libmodelines.so
 lib/gedit-2/plugins/libsample.la
 lib/gedit-2/plugins/libsample.so
 lib/gedit-2/plugins/libsort.la
@@ -71,7 +69,7 @@ lib/gedit-2/plugins/libtaglist.la
 lib/gedit-2/plugins/libtaglist.so
 lib/gedit-2/plugins/libtime.la
 lib/gedit-2/plugins/libtime.so
-%%PYTHON%%lib/gedit-2/plugins/modelines.gedit-plugin
+lib/gedit-2/plugins/modelines.gedit-plugin
 %%PYTHON%%lib/gedit-2/plugins/pythonconsole.gedit-plugin
 %%PYTHON%%lib/gedit-2/plugins/pythonconsole/__init__.py
 %%PYTHON%%lib/gedit-2/plugins/pythonconsole/__init__.pyc
@@ -81,42 +79,55 @@ lib/gedit-2/plugins/libtime.so
 %%PYTHON%%lib/gedit-2/plugins/pythonconsole/console.pyo
 lib/gedit-2/plugins/sample.gedit-plugin
 %%PYTHON%%lib/gedit-2/plugins/snippets.gedit-plugin
+%%PYTHON%%lib/gedit-2/plugins/snippets/Document.py
+%%PYTHON%%lib/gedit-2/plugins/snippets/Document.pyc
+%%PYTHON%%lib/gedit-2/plugins/snippets/Document.pyo
 %%PYTHON%%lib/gedit-2/plugins/snippets/ElementTree.py
 %%PYTHON%%lib/gedit-2/plugins/snippets/ElementTree.pyc
 %%PYTHON%%lib/gedit-2/plugins/snippets/ElementTree.pyo
+%%PYTHON%%lib/gedit-2/plugins/snippets/Exporter.py
+%%PYTHON%%lib/gedit-2/plugins/snippets/Exporter.pyc
+%%PYTHON%%lib/gedit-2/plugins/snippets/Exporter.pyo
+%%PYTHON%%lib/gedit-2/plugins/snippets/Helper.py
+%%PYTHON%%lib/gedit-2/plugins/snippets/Helper.pyc
+%%PYTHON%%lib/gedit-2/plugins/snippets/Helper.pyo
+%%PYTHON%%lib/gedit-2/plugins/snippets/Importer.py
+%%PYTHON%%lib/gedit-2/plugins/snippets/Importer.pyc
+%%PYTHON%%lib/gedit-2/plugins/snippets/Importer.pyo
+%%PYTHON%%lib/gedit-2/plugins/snippets/Library.py
+%%PYTHON%%lib/gedit-2/plugins/snippets/Library.pyc
+%%PYTHON%%lib/gedit-2/plugins/snippets/Library.pyo
+%%PYTHON%%lib/gedit-2/plugins/snippets/Manager.py
+%%PYTHON%%lib/gedit-2/plugins/snippets/Manager.pyc
+%%PYTHON%%lib/gedit-2/plugins/snippets/Manager.pyo
+%%PYTHON%%lib/gedit-2/plugins/snippets/Parser.py
+%%PYTHON%%lib/gedit-2/plugins/snippets/Parser.pyc
+%%PYTHON%%lib/gedit-2/plugins/snippets/Parser.pyo
+%%PYTHON%%lib/gedit-2/plugins/snippets/Placeholder.py
+%%PYTHON%%lib/gedit-2/plugins/snippets/Placeholder.pyc
+%%PYTHON%%lib/gedit-2/plugins/snippets/Placeholder.pyo
 %%PYTHON%%lib/gedit-2/plugins/snippets/Snippet.py
 %%PYTHON%%lib/gedit-2/plugins/snippets/Snippet.pyc
 %%PYTHON%%lib/gedit-2/plugins/snippets/Snippet.pyo
 %%PYTHON%%lib/gedit-2/plugins/snippets/SnippetComplete.py
 %%PYTHON%%lib/gedit-2/plugins/snippets/SnippetComplete.pyc
 %%PYTHON%%lib/gedit-2/plugins/snippets/SnippetComplete.pyo
-%%PYTHON%%lib/gedit-2/plugins/snippets/SnippetController.py
-%%PYTHON%%lib/gedit-2/plugins/snippets/SnippetController.pyc
-%%PYTHON%%lib/gedit-2/plugins/snippets/SnippetController.pyo
-%%PYTHON%%lib/gedit-2/plugins/snippets/SnippetPlaceholders.py
-%%PYTHON%%lib/gedit-2/plugins/snippets/SnippetPlaceholders.pyc
-%%PYTHON%%lib/gedit-2/plugins/snippets/SnippetPlaceholders.pyo
-%%PYTHON%%lib/gedit-2/plugins/snippets/SnippetPluginInstance.py
-%%PYTHON%%lib/gedit-2/plugins/snippets/SnippetPluginInstance.pyc
-%%PYTHON%%lib/gedit-2/plugins/snippets/SnippetPluginInstance.pyo
-%%PYTHON%%lib/gedit-2/plugins/snippets/SnippetsDialog.py
-%%PYTHON%%lib/gedit-2/plugins/snippets/SnippetsDialog.pyc
-%%PYTHON%%lib/gedit-2/plugins/snippets/SnippetsDialog.pyo
-%%PYTHON%%lib/gedit-2/plugins/snippets/SnippetsLibrary.py
-%%PYTHON%%lib/gedit-2/plugins/snippets/SnippetsLibrary.pyc
-%%PYTHON%%lib/gedit-2/plugins/snippets/SnippetsLibrary.pyo
+%%PYTHON%%lib/gedit-2/plugins/snippets/SubstitutionParser.py
+%%PYTHON%%lib/gedit-2/plugins/snippets/SubstitutionParser.pyc
+%%PYTHON%%lib/gedit-2/plugins/snippets/SubstitutionParser.pyo
+%%PYTHON%%lib/gedit-2/plugins/snippets/WindowHelper.py
+%%PYTHON%%lib/gedit-2/plugins/snippets/WindowHelper.pyc
+%%PYTHON%%lib/gedit-2/plugins/snippets/WindowHelper.pyo
 %%PYTHON%%lib/gedit-2/plugins/snippets/__init__.py
 %%PYTHON%%lib/gedit-2/plugins/snippets/__init__.pyc
 %%PYTHON%%lib/gedit-2/plugins/snippets/__init__.pyo
-%%PYTHON%%lib/gedit-2/plugins/snippets/functions.py
-%%PYTHON%%lib/gedit-2/plugins/snippets/functions.pyc
-%%PYTHON%%lib/gedit-2/plugins/snippets/functions.pyo
 %%PYTHON%%lib/gedit-2/plugins/snippets/snippets.glade
 lib/gedit-2/plugins/sort.gedit-plugin
 lib/gedit-2/plugins/spell.gedit-plugin
 lib/gedit-2/plugins/taglist.gedit-plugin
 lib/gedit-2/plugins/time.gedit-plugin
 libdata/pkgconfig/gedit-%%VERSION%%.pc
+share/applications/gedit.desktop
 %%DOCSDIR%%/GeditApp.html
 %%DOCSDIR%%/GeditDocument.html
 %%DOCSDIR%%/GeditEncodingsOptionMenu.html
@@ -150,47 +161,48 @@ libdata/pkgconfig/gedit-%%VERSION%%.pc
 %%DOCSDIR%%/right.png
 %%DOCSDIR%%/style.css
 %%DOCSDIR%%/up.png
-share/gnome/applications/gedit.desktop
-share/gnome/gedit-2/glade/docinfo.glade2
-share/gnome/gedit-2/glade/gedit-encodings-dialog.glade
-share/gnome/gedit-2/glade/gedit-open-location-dialog.glade
-share/gnome/gedit-2/glade/gedit-page-setup-dialog.glade
-share/gnome/gedit-2/glade/gedit-preferences-dialog.glade
-share/gnome/gedit-2/glade/gedit-search-dialog.glade
-share/gnome/gedit-2/glade/languages-dialog.glade2
-share/gnome/gedit-2/glade/sort.glade2
-share/gnome/gedit-2/glade/spell-checker.glade2
-share/gnome/gedit-2/glade/time.glade2
-share/gnome/gedit-2/icons/gedit-plugin.png
-share/gnome/gedit-2/logo/gedit-logo.png
-share/gnome/gedit-2/plugins/filebrowser/gedit-file-browser-widget-ui.xml
-%%PYTHON%%share/gnome/gedit-2/plugins/snippets/c++.xml
-%%PYTHON%%share/gnome/gedit-2/plugins/snippets/c.xml
-%%PYTHON%%share/gnome/gedit-2/plugins/snippets/css.xml
-%%PYTHON%%share/gnome/gedit-2/plugins/snippets/docbook.xml
-%%PYTHON%%share/gnome/gedit-2/plugins/snippets/global.xml
-%%PYTHON%%share/gnome/gedit-2/plugins/snippets/haskell.xml
-%%PYTHON%%share/gnome/gedit-2/plugins/snippets/html.xml
-%%PYTHON%%share/gnome/gedit-2/plugins/snippets/idl.xml
-%%PYTHON%%share/gnome/gedit-2/plugins/snippets/java.xml
-%%PYTHON%%share/gnome/gedit-2/plugins/snippets/javascript.xml
-%%PYTHON%%share/gnome/gedit-2/plugins/snippets/latex.xml
-%%PYTHON%%share/gnome/gedit-2/plugins/snippets/perl.xml
-%%PYTHON%%share/gnome/gedit-2/plugins/snippets/php.xml
-%%PYTHON%%share/gnome/gedit-2/plugins/snippets/python.xml
-%%PYTHON%%share/gnome/gedit-2/plugins/snippets/ruby.xml
-%%PYTHON%%share/gnome/gedit-2/plugins/snippets/sh.xml
-%%PYTHON%%share/gnome/gedit-2/plugins/snippets/tcl.xml
-%%PYTHON%%share/gnome/gedit-2/plugins/snippets/xml.xml
-%%PYTHON%%share/gnome/gedit-2/plugins/tools/build
-%%PYTHON%%share/gnome/gedit-2/plugins/tools/open-terminal-here
-%%PYTHON%%share/gnome/gedit-2/plugins/tools/remove-trailing-spaces
-%%PYTHON%%share/gnome/gedit-2/plugins/tools/run-command
-share/gnome/gedit-2/taglist/HTML.tags.gz
-share/gnome/gedit-2/taglist/Latex.tags.gz
-share/gnome/gedit-2/taglist/XSLT.tags.gz
-share/gnome/gedit-2/taglist/XUL.tags.gz
-share/gnome/gedit-2/ui/gedit-ui.xml
+share/gedit-2/glade/docinfo.glade2
+share/gedit-2/glade/gedit-encodings-dialog.glade
+share/gedit-2/glade/gedit-open-location-dialog.glade
+share/gedit-2/glade/gedit-page-setup-dialog.glade
+share/gedit-2/glade/gedit-preferences-dialog.glade
+share/gedit-2/glade/gedit-search-dialog.glade
+share/gedit-2/glade/languages-dialog.glade2
+share/gedit-2/glade/sort.glade2
+share/gedit-2/glade/spell-checker.glade2
+share/gedit-2/glade/time.glade2
+share/gedit-2/icons/gedit-plugin.png
+share/gedit-2/logo/gedit-logo.png
+share/gedit-2/plugins/filebrowser/gedit-file-browser-widget-ui.xml
+%%PYTHON%%share/gedit-2/plugins/snippets/c++.xml
+%%PYTHON%%share/gedit-2/plugins/snippets/c.xml
+%%PYTHON%%share/gedit-2/plugins/snippets/css.xml
+%%PYTHON%%share/gedit-2/plugins/snippets/docbook.xml
+%%PYTHON%%share/gedit-2/plugins/snippets/global.xml
+%%PYTHON%%share/gedit-2/plugins/snippets/haskell.xml
+%%PYTHON%%share/gedit-2/plugins/snippets/html.xml
+%%PYTHON%%share/gedit-2/plugins/snippets/idl.xml
+%%PYTHON%%share/gedit-2/plugins/snippets/java.xml
+%%PYTHON%%share/gedit-2/plugins/snippets/javascript.xml
+%%PYTHON%%share/gedit-2/plugins/snippets/lang/snippets.lang
+%%PYTHON%%share/gedit-2/plugins/snippets/latex.xml
+%%PYTHON%%share/gedit-2/plugins/snippets/perl.xml
+%%PYTHON%%share/gedit-2/plugins/snippets/php.xml
+%%PYTHON%%share/gedit-2/plugins/snippets/python.xml
+%%PYTHON%%share/gedit-2/plugins/snippets/ruby.xml
+%%PYTHON%%share/gedit-2/plugins/snippets/sh.xml
+%%PYTHON%%share/gedit-2/plugins/snippets/snippets.xml
+%%PYTHON%%share/gedit-2/plugins/snippets/tcl.xml
+%%PYTHON%%share/gedit-2/plugins/snippets/xml.xml
+%%PYTHON%%share/gedit-2/plugins/tools/build
+%%PYTHON%%share/gedit-2/plugins/tools/open-terminal-here
+%%PYTHON%%share/gedit-2/plugins/tools/remove-trailing-spaces
+%%PYTHON%%share/gedit-2/plugins/tools/run-command
+share/gedit-2/taglist/HTML.tags.gz
+share/gedit-2/taglist/Latex.tags.gz
+share/gedit-2/taglist/XSLT.tags.gz
+share/gedit-2/taglist/XUL.tags.gz
+share/gedit-2/ui/gedit-ui.xml
 share/gnome/help/gedit/C/figures/gedit_format_bold.png
 share/gnome/help/gedit/C/figures/gedit_format_italic.png
 share/gnome/help/gedit/C/figures/gedit_format_strikethrough.png
@@ -235,6 +247,14 @@ share/gnome/help/gedit/fr/figures/gedit_recent_files_menu_icon.png
 share/gnome/help/gedit/fr/figures/gedit_window.png
 share/gnome/help/gedit/fr/gedit.xml
 share/gnome/help/gedit/fr/legal.xml
+share/gnome/help/gedit/hu/figures/gedit_format_bold.png
+share/gnome/help/gedit/hu/figures/gedit_format_italic.png
+share/gnome/help/gedit/hu/figures/gedit_format_strikethrough.png
+share/gnome/help/gedit/hu/figures/gedit_format_underline.png
+share/gnome/help/gedit/hu/figures/gedit_recent_files_menu_icon.png
+share/gnome/help/gedit/hu/figures/gedit_window.png
+share/gnome/help/gedit/hu/gedit.xml
+share/gnome/help/gedit/hu/legal.xml
 share/gnome/help/gedit/it/figures/gedit_format_bold.png
 share/gnome/help/gedit/it/figures/gedit_format_italic.png
 share/gnome/help/gedit/it/figures/gedit_format_strikethrough.png
@@ -251,10 +271,22 @@ share/gnome/help/gedit/ja/figures/gedit_recent_files_menu_icon.png
 share/gnome/help/gedit/ja/figures/gedit_window.png
 share/gnome/help/gedit/ja/gedit.xml
 share/gnome/help/gedit/ja/legal.xml
+share/gnome/help/gedit/ko/figures/gedit_format_bold.png
+share/gnome/help/gedit/ko/figures/gedit_format_italic.png
+share/gnome/help/gedit/ko/figures/gedit_format_strikethrough.png
+share/gnome/help/gedit/ko/figures/gedit_format_underline.png
 share/gnome/help/gedit/ko/figures/gedit_recent_files_menu_icon.png
 share/gnome/help/gedit/ko/figures/gedit_window.png
 share/gnome/help/gedit/ko/gedit.xml
 share/gnome/help/gedit/ko/legal.xml
+share/gnome/help/gedit/oc/figures/gedit_format_bold.png
+share/gnome/help/gedit/oc/figures/gedit_format_italic.png
+share/gnome/help/gedit/oc/figures/gedit_format_strikethrough.png
+share/gnome/help/gedit/oc/figures/gedit_format_underline.png
+share/gnome/help/gedit/oc/figures/gedit_recent_files_menu_icon.png
+share/gnome/help/gedit/oc/figures/gedit_window.png
+share/gnome/help/gedit/oc/gedit.xml
+share/gnome/help/gedit/oc/legal.xml
 share/gnome/help/gedit/ro/figures/gedit_window.png
 share/gnome/help/gedit/ro/gedit.xml
 share/gnome/help/gedit/ro/legal.xml
@@ -306,27 +338,12 @@ share/gnome/help/gedit/zh_TW/figures/gedit_recent_files_menu_icon.png
 share/gnome/help/gedit/zh_TW/figures/gedit_window.png
 share/gnome/help/gedit/zh_TW/gedit.xml
 share/gnome/help/gedit/zh_TW/legal.xml
-share/gnome/omf/gedit/gedit-C.omf
-share/gnome/omf/gedit/gedit-bg.omf
-share/gnome/omf/gedit/gedit-de.omf
-share/gnome/omf/gedit/gedit-es.omf
-share/gnome/omf/gedit/gedit-eu.omf
-share/gnome/omf/gedit/gedit-fr.omf
-share/gnome/omf/gedit/gedit-it.omf
-share/gnome/omf/gedit/gedit-ja.omf
-share/gnome/omf/gedit/gedit-ko.omf
-share/gnome/omf/gedit/gedit-ro.omf
-share/gnome/omf/gedit/gedit-ru.omf
-share/gnome/omf/gedit/gedit-sv.omf
-share/gnome/omf/gedit/gedit-uk.omf
-share/gnome/omf/gedit/gedit-zh_CN.omf
-share/gnome/omf/gedit/gedit-zh_HK.omf
-share/gnome/omf/gedit/gedit-zh_TW.omf
 share/locale/af/LC_MESSAGES/gedit.mo
 share/locale/am/LC_MESSAGES/gedit.mo
 share/locale/ar/LC_MESSAGES/gedit.mo
 share/locale/az/LC_MESSAGES/gedit.mo
 share/locale/be/LC_MESSAGES/gedit.mo
+share/locale/be@latin/LC_MESSAGES/gedit.mo
 share/locale/bg/LC_MESSAGES/gedit.mo
 share/locale/bn/LC_MESSAGES/gedit.mo
 share/locale/bn_IN/LC_MESSAGES/gedit.mo
@@ -404,7 +421,25 @@ share/locale/xh/LC_MESSAGES/gedit.mo
 share/locale/zh_CN/LC_MESSAGES/gedit.mo
 share/locale/zh_HK/LC_MESSAGES/gedit.mo
 share/locale/zh_TW/LC_MESSAGES/gedit.mo
-@dirrm share/gnome/omf/gedit
+share/omf/gedit/gedit-C.omf
+share/omf/gedit/gedit-bg.omf
+share/omf/gedit/gedit-de.omf
+share/omf/gedit/gedit-es.omf
+share/omf/gedit/gedit-eu.omf
+share/omf/gedit/gedit-fr.omf
+share/omf/gedit/gedit-hu.omf
+share/omf/gedit/gedit-it.omf
+share/omf/gedit/gedit-ja.omf
+share/omf/gedit/gedit-ko.omf
+share/omf/gedit/gedit-oc.omf
+share/omf/gedit/gedit-ro.omf
+share/omf/gedit/gedit-ru.omf
+share/omf/gedit/gedit-sv.omf
+share/omf/gedit/gedit-uk.omf
+share/omf/gedit/gedit-zh_CN.omf
+share/omf/gedit/gedit-zh_HK.omf
+share/omf/gedit/gedit-zh_TW.omf
+@dirrm share/omf/gedit
 @dirrm share/gnome/help/gedit/zh_TW/figures
 @dirrm share/gnome/help/gedit/zh_TW
 @dirrm share/gnome/help/gedit/zh_HK/figures
@@ -419,12 +454,16 @@ share/locale/zh_TW/LC_MESSAGES/gedit.mo
 @dirrm share/gnome/help/gedit/ru
 @dirrm share/gnome/help/gedit/ro/figures
 @dirrm share/gnome/help/gedit/ro
+@dirrm share/gnome/help/gedit/oc/figures
+@dirrm share/gnome/help/gedit/oc
 @dirrm share/gnome/help/gedit/ko/figures
 @dirrm share/gnome/help/gedit/ko
 @dirrm share/gnome/help/gedit/ja/figures
 @dirrm share/gnome/help/gedit/ja
 @dirrm share/gnome/help/gedit/it/figures
 @dirrm share/gnome/help/gedit/it
+@dirrm share/gnome/help/gedit/hu/figures
+@dirrm share/gnome/help/gedit/hu
 @dirrm share/gnome/help/gedit/fr/figures
 @dirrm share/gnome/help/gedit/fr
 @dirrm share/gnome/help/gedit/eu/figures
@@ -438,22 +477,23 @@ share/locale/zh_TW/LC_MESSAGES/gedit.mo
 @dirrm share/gnome/help/gedit/C/figures
 @dirrm share/gnome/help/gedit/C
 @dirrm share/gnome/help/gedit
-@dirrm share/gnome/gedit-2/ui
-@dirrm share/gnome/gedit-2/taglist
-%%PYTHON%%@dirrm share/gnome/gedit-2/plugins/tools
-%%PYTHON%%@dirrm share/gnome/gedit-2/plugins/snippets
-@dirrm share/gnome/gedit-2/plugins/filebrowser
-@dirrm share/gnome/gedit-2/plugins
-@dirrm share/gnome/gedit-2/logo
-@dirrm share/gnome/gedit-2/icons
-@dirrm share/gnome/gedit-2/glade
-@dirrm share/gnome/gedit-2
+@dirrm share/gedit-2/ui
+@dirrm share/gedit-2/taglist
+%%PYTHON%%@dirrm share/gedit-2/plugins/tools
+%%PYTHON%%@dirrm share/gedit-2/plugins/snippets/lang
+%%PYTHON%%@dirrm share/gedit-2/plugins/snippets
+@dirrm share/gedit-2/plugins/filebrowser
+@dirrm share/gedit-2/plugins
+@dirrm share/gedit-2/logo
+@dirrm share/gedit-2/icons
+@dirrm share/gedit-2/glade
+@dirrm share/gedit-2
 @dirrm %%DOCSDIR%%
 %%PYTHON%%@dirrm lib/gedit-2/plugins/snippets
 %%PYTHON%%@dirrm lib/gedit-2/plugins/pythonconsole
 %%PYTHON%%@dirrm lib/gedit-2/plugins/externaltools
-@dirrm lib/gedit-2/plugins
-@dirrm lib/gedit-2
+@dirrmtry lib/gedit-2/plugins
+@dirrmtry lib/gedit-2
 @dirrm include/gedit-%%VERSION%%/gedit
 @dirrm include/gedit-%%VERSION%%
 @exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
@@ -484,3 +524,6 @@ share/locale/zh_TW/LC_MESSAGES/gedit.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/editors/ghex/Makefile b/editors/ghex/Makefile
index 60029766113e..f9ccfa1c45e6 100644
--- a/editors/ghex/Makefile
+++ b/editors/ghex/Makefile
@@ -3,26 +3,27 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
+#   $MCom: ports/editors/ghex/Makefile,v 1.7 2007/10/11 04:06:59 mezz Exp $
 #
 
 PORTNAME=	ghex
-PORTVERSION=	2.8.2
+PORTVERSION=	2.20.0
 PORTREVISION=	1
 CATEGORIES=	editors gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/2.8
+MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GNOME 2 hex editor
 
 USE_BZIP2=	yes
-USE_X_PREFIX=	yes
+USE_XLIB=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomeprefix gnomehack intlhack gail libgnomeprintui libgnomeui
+USE_GNOME=	gnomeprefix gnomehack intlhack gail libgnomeprintui libgnomeui \
+		gnomedocutils
 USE_GETTEXT=	yes
 GNU_CONFIGURE=	yes
-INSTALLS_OMF=	yes
+INSTALLS_ICONS=	yes
 USE_LDCONFIG=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/editors/ghex/distinfo b/editors/ghex/distinfo
index 0eaf67d9d9eb..2c0d539686f2 100644
--- a/editors/ghex/distinfo
+++ b/editors/ghex/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/ghex-2.8.2.tar.bz2) = 1940a9f63b0d37604c6b489cda37fc19
-SHA256 (gnome2/ghex-2.8.2.tar.bz2) = 47142d1903ac8cf09d888a4a349e0a6ea671314354937b63a544b829e008861d
-SIZE (gnome2/ghex-2.8.2.tar.bz2) = 955164
+MD5 (gnome2/ghex-2.20.0.tar.bz2) = 7f76315b08f0d54d58540bae2f014394
+SHA256 (gnome2/ghex-2.20.0.tar.bz2) = 68863be37bc4f141f6a286e57d406a374b93d7036920ea7c73a64ae868147b10
+SIZE (gnome2/ghex-2.20.0.tar.bz2) = 1223113
diff --git a/editors/ghex/files/patch-app-docs.make b/editors/ghex/files/patch-app-docs.make
deleted file mode 100644
index cf9e1505241c..000000000000
--- a/editors/ghex/files/patch-app-docs.make
+++ /dev/null
@@ -1,6 +0,0 @@
---- app-docs.make.orig	Sun Mar  4 04:18:34 2001
-+++ app-docs.make	Sat Apr 14 08:55:37 2001
-@@ -1,2 +1,2 @@
--helpdir = $(datadir)/gnome/help/$(app)/$(lang)
-+helpdir = $(datadir)/help/$(app)/$(lang)
- help_DATA = \
diff --git a/editors/ghex/pkg-plist b/editors/ghex/pkg-plist
index 3a178b38f221..159af79639a1 100644
--- a/editors/ghex/pkg-plist
+++ b/editors/ghex/pkg-plist
@@ -6,64 +6,47 @@ lib/libgtkhex.la
 lib/libgtkhex.so
 lib/libgtkhex.so.0
 libdata/pkgconfig/gtkhex.pc
-share/gnome/applications/ghex.desktop
-share/gnome/gnome-2.0/ui/ghex-ui.xml
+share/applications/ghex.desktop
+share/gnome-2.0/ui/ghex-ui.xml
 share/gnome/help/ghex2/C/figures/ghex_window_empty.png
 share/gnome/help/ghex2/C/figures/ghex_window_open.png
 share/gnome/help/ghex2/C/ghex2.xml
 share/gnome/help/ghex2/C/legal.xml
-share/gnome/help/ghex2/C/topic.dat
 share/gnome/help/ghex2/de/figures/ghex_window_empty.png
 share/gnome/help/ghex2/de/figures/ghex_window_open.png
 share/gnome/help/ghex2/de/ghex2.xml
-share/gnome/help/ghex2/de/legal.xml
 share/gnome/help/ghex2/es/figures/ghex_window_empty.png
 share/gnome/help/ghex2/es/figures/ghex_window_open.png
 share/gnome/help/ghex2/es/ghex2.xml
-share/gnome/help/ghex2/es/legal.xml
-share/gnome/help/ghex2/es/topic.dat
 share/gnome/help/ghex2/fr/figures/ghex_window_empty.png
 share/gnome/help/ghex2/fr/figures/ghex_window_open.png
 share/gnome/help/ghex2/fr/ghex2.xml
-share/gnome/help/ghex2/fr/legal.xml
 share/gnome/help/ghex2/it/figures/ghex_window_empty.png
 share/gnome/help/ghex2/it/figures/ghex_window_open.png
 share/gnome/help/ghex2/it/ghex2.xml
-share/gnome/help/ghex2/it/legal.xml
 share/gnome/help/ghex2/ja/figures/ghex_window_empty.png
 share/gnome/help/ghex2/ja/figures/ghex_window_open.png
 share/gnome/help/ghex2/ja/ghex2.xml
-share/gnome/help/ghex2/ja/legal.xml
-share/gnome/help/ghex2/ja/topic.dat
 share/gnome/help/ghex2/ko/figures/ghex_window_empty.png
 share/gnome/help/ghex2/ko/figures/ghex_window_open.png
 share/gnome/help/ghex2/ko/ghex2.xml
-share/gnome/help/ghex2/ko/legal.xml
 share/gnome/help/ghex2/sv/figures/ghex_window_empty.png
 share/gnome/help/ghex2/sv/figures/ghex_window_open.png
 share/gnome/help/ghex2/sv/ghex2.xml
-share/gnome/help/ghex2/sv/legal.xml
-share/gnome/help/ghex2/sv/topic.dat
 share/gnome/help/ghex2/zh_CN/figures/ghex_window_empty.png
 share/gnome/help/ghex2/zh_CN/figures/ghex_window_open.png
 share/gnome/help/ghex2/zh_CN/ghex2.xml
-share/gnome/help/ghex2/zh_CN/legal.xml
 share/gnome/help/ghex2/zh_TW/figures/ghex_window_empty.png
 share/gnome/help/ghex2/zh_TW/figures/ghex_window_open.png
 share/gnome/help/ghex2/zh_TW/ghex2.xml
-share/gnome/help/ghex2/zh_TW/legal.xml
-share/gnome/omf/ghex/ghex-C.omf
-share/gnome/omf/ghex/ghex2-de.omf
-share/gnome/omf/ghex/ghex2-es.omf
-share/gnome/omf/ghex/ghex2-fr.omf
-share/gnome/omf/ghex/ghex2-it.omf
-share/gnome/omf/ghex/ghex2-ja.omf
-share/gnome/omf/ghex/ghex2-ko.omf
-share/gnome/omf/ghex/ghex2-sv.omf
-share/gnome/omf/ghex/ghex2-zh_CN.omf
-share/gnome/omf/ghex/ghex2-zh_TW.omf
-share/gnome/pixmaps/gnome-ghex.png
+share/icons/hicolor/16x16/apps/ghex.png
+share/icons/hicolor/22x22/apps/ghex.png
+share/icons/hicolor/24x24/apps/ghex.png
+share/icons/hicolor/32x32/apps/ghex.png
+share/icons/hicolor/48x48/apps/ghex.png
+share/icons/hicolor/scalable/apps/ghex.svg
 share/locale/am/LC_MESSAGES/ghex-2.0.mo
+share/locale/ar/LC_MESSAGES/ghex-2.0.mo
 share/locale/az/LC_MESSAGES/ghex-2.0.mo
 share/locale/be/LC_MESSAGES/ghex-2.0.mo
 share/locale/bg/LC_MESSAGES/ghex-2.0.mo
@@ -71,6 +54,7 @@ share/locale/ca/LC_MESSAGES/ghex-2.0.mo
 share/locale/cs/LC_MESSAGES/ghex-2.0.mo
 share/locale/da/LC_MESSAGES/ghex-2.0.mo
 share/locale/de/LC_MESSAGES/ghex-2.0.mo
+share/locale/dz/LC_MESSAGES/ghex-2.0.mo
 share/locale/el/LC_MESSAGES/ghex-2.0.mo
 share/locale/en_CA/LC_MESSAGES/ghex-2.0.mo
 share/locale/en_GB/LC_MESSAGES/ghex-2.0.mo
@@ -87,13 +71,15 @@ share/locale/id/LC_MESSAGES/ghex-2.0.mo
 share/locale/it/LC_MESSAGES/ghex-2.0.mo
 share/locale/ja/LC_MESSAGES/ghex-2.0.mo
 share/locale/ko/LC_MESSAGES/ghex-2.0.mo
+share/locale/lv/LC_MESSAGES/ghex-2.0.mo
+share/locale/mk/LC_MESSAGES/ghex-2.0.mo
 share/locale/ml/LC_MESSAGES/ghex-2.0.mo
 share/locale/ms/LC_MESSAGES/ghex-2.0.mo
 share/locale/nb/LC_MESSAGES/ghex-2.0.mo
 share/locale/ne/LC_MESSAGES/ghex-2.0.mo
 share/locale/nl/LC_MESSAGES/ghex-2.0.mo
 share/locale/nn/LC_MESSAGES/ghex-2.0.mo
-share/locale/no/LC_MESSAGES/ghex-2.0.mo
+share/locale/oc/LC_MESSAGES/ghex-2.0.mo
 share/locale/pa/LC_MESSAGES/ghex-2.0.mo
 share/locale/pl/LC_MESSAGES/ghex-2.0.mo
 share/locale/pt/LC_MESSAGES/ghex-2.0.mo
@@ -113,7 +99,6 @@ share/locale/vi/LC_MESSAGES/ghex-2.0.mo
 share/locale/wa/LC_MESSAGES/ghex-2.0.mo
 share/locale/zh_CN/LC_MESSAGES/ghex-2.0.mo
 share/locale/zh_TW/LC_MESSAGES/ghex-2.0.mo
-@dirrm share/gnome/omf/ghex
 @dirrm share/gnome/help/ghex2/zh_TW/figures
 @dirrm share/gnome/help/ghex2/zh_TW
 @dirrm share/gnome/help/ghex2/zh_CN/figures
@@ -136,3 +121,10 @@ share/locale/zh_TW/LC_MESSAGES/ghex-2.0.mo
 @dirrm share/gnome/help/ghex2/C
 @dirrm share/gnome/help/ghex2
 @dirrm include/gtkhex
+@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/editors/glimmer/Makefile b/editors/glimmer/Makefile
index bc357052a640..1c1c1bda6590 100644
--- a/editors/glimmer/Makefile
+++ b/editors/glimmer/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	glimmer
 PORTVERSION=	1.2.1
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	editors gnome python
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/editors/glimmer/files/patch-ab b/editors/glimmer/files/patch-ab
deleted file mode 100644
index 25d60da27721..000000000000
--- a/editors/glimmer/files/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/declarations.h	2000/09/23 17:26:18	1.1
-+++ src/declarations.h	2000/09/23 17:26:55
-@@ -48,8 +48,8 @@
- 
- #define MAX_FILES 30
- 
--#define PIXMAP_DIR (PREFIX "/share/pixmaps")
--#define LANG_DIR (PREFIX "/share/" PACKAGE "/languages")
-+#define PIXMAP_DIR (PREFIX "/share/gnome/pixmaps")
-+#define LANG_DIR (PREFIX "/share/gnome/" PACKAGE "/languages")
- 
- #define URL "http://glimmer.sourceforge.net"
- 
diff --git a/editors/glimmer/files/patch-ac b/editors/glimmer/files/patch-ac
deleted file mode 100644
index 4dc03f865ba9..000000000000
--- a/editors/glimmer/files/patch-ac
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- src/macro-language.c.orig	Thu Jan 10 19:53:09 2002
-+++ src/macro-language.c	Fri Jan 11 14:22:51 2002
-@@ -185,7 +185,7 @@
- {
-     gchar path[384];
- 
--    g_snprintf (path, sizeof (path), PREFIX "/share/" PACKAGE "/scripts");
-+    g_snprintf (path, sizeof (path), PREFIX "/share/gnome/" PACKAGE "/scripts");
-     build_menu_from_scripts_dir (path, "_Scripts/");
-     g_snprintf (path, sizeof (path), "%s/." PACKAGE "/scripts",
-                 g_get_home_dir ());
diff --git a/editors/glimmer/pkg-plist b/editors/glimmer/pkg-plist
index b0ea2c6e469f..c81ab7b219fd 100644
--- a/editors/glimmer/pkg-plist
+++ b/editors/glimmer/pkg-plist
@@ -1,52 +1,52 @@
 bin/glimmer
 bin/glimmerout
+%%DATADIR%%/docs/AUTHORS
+%%DATADIR%%/docs/COPYING
+%%DATADIR%%/docs/ChangeLog
+%%DATADIR%%/docs/NEWS
+%%DATADIR%%/docs/PROPS
+%%DATADIR%%/docs/README
+%%DATADIR%%/docs/TODO
+%%DATADIR%%/languages/ada.lang
+%%DATADIR%%/languages/asp.lang
+%%DATADIR%%/languages/bash.lang
+%%DATADIR%%/languages/c.lang
+%%DATADIR%%/languages/cpp.lang
+%%DATADIR%%/languages/dtml.lang
+%%DATADIR%%/languages/fortran.lang
+%%DATADIR%%/languages/html.lang
+%%DATADIR%%/languages/java.lang
+%%DATADIR%%/languages/js.lang
+%%DATADIR%%/languages/lang.lang
+%%DATADIR%%/languages/latex.lang
+%%DATADIR%%/languages/make.lang
+%%DATADIR%%/languages/ocaml.lang
+%%DATADIR%%/languages/oolong.lang
+%%DATADIR%%/languages/perl.lang
+%%DATADIR%%/languages/php.lang
+%%DATADIR%%/languages/po.lang
+%%DATADIR%%/languages/python.lang
+%%DATADIR%%/languages/ruby.lang
+%%DATADIR%%/languages/scheme.lang
+%%DATADIR%%/languages/sgml.lang
+%%DATADIR%%/languages/sql.lang
+%%DATADIR%%/languages/tcltk.lang
+%%DATADIR%%/languages/wml.lang
+%%DATADIR%%/languages/x86.lang
+%%DATADIR%%/languages/xhtml-trans.lang
+%%DATADIR%%/languages/xml.lang
+%%DATADIR%%/languages/z80.lang
+%%DATADIR%%/scripts/Bookmarks.py
+%%DATADIR%%/scripts/Delete_To_End.py
+%%DATADIR%%/scripts/Delete_To_Start.py
+%%DATADIR%%/scripts/FileSelector.py
+%%DATADIR%%/scripts/Global.py
+%%DATADIR%%/scripts/ISO2HTML.py
+%%DATADIR%%/scripts/Replace_Spaces.py
+%%DATADIR%%/scripts/Replace_Tabs.py
+%%DATADIR%%/scripts/To_Lower.py
+%%DATADIR%%/scripts/To_Upper.py
 share/gnome/apps/Development/glimmer.desktop
-share/gnome/glimmer/docs/AUTHORS
-share/gnome/glimmer/docs/COPYING
-share/gnome/glimmer/docs/ChangeLog
-share/gnome/glimmer/docs/NEWS
-share/gnome/glimmer/docs/PROPS
-share/gnome/glimmer/docs/README
-share/gnome/glimmer/docs/TODO
-share/gnome/glimmer/languages/ada.lang
-share/gnome/glimmer/languages/asp.lang
-share/gnome/glimmer/languages/bash.lang
-share/gnome/glimmer/languages/c.lang
-share/gnome/glimmer/languages/cpp.lang
-share/gnome/glimmer/languages/dtml.lang
-share/gnome/glimmer/languages/fortran.lang
-share/gnome/glimmer/languages/html.lang
-share/gnome/glimmer/languages/java.lang
-share/gnome/glimmer/languages/js.lang
-share/gnome/glimmer/languages/lang.lang
-share/gnome/glimmer/languages/latex.lang
-share/gnome/glimmer/languages/make.lang
-share/gnome/glimmer/languages/ocaml.lang
-share/gnome/glimmer/languages/oolong.lang
-share/gnome/glimmer/languages/perl.lang
-share/gnome/glimmer/languages/php.lang
-share/gnome/glimmer/languages/po.lang
-share/gnome/glimmer/languages/python.lang
-share/gnome/glimmer/languages/ruby.lang
-share/gnome/glimmer/languages/scheme.lang
-share/gnome/glimmer/languages/sgml.lang
-share/gnome/glimmer/languages/sql.lang
-share/gnome/glimmer/languages/tcltk.lang
-share/gnome/glimmer/languages/wml.lang
-share/gnome/glimmer/languages/x86.lang
-share/gnome/glimmer/languages/xhtml-trans.lang
-share/gnome/glimmer/languages/xml.lang
-share/gnome/glimmer/languages/z80.lang
-share/gnome/glimmer/scripts/Bookmarks.py
-share/gnome/glimmer/scripts/Delete_To_End.py
-share/gnome/glimmer/scripts/Delete_To_Start.py
-share/gnome/glimmer/scripts/FileSelector.py
-share/gnome/glimmer/scripts/Global.py
-share/gnome/glimmer/scripts/ISO2HTML.py
-share/gnome/glimmer/scripts/Replace_Spaces.py
-share/gnome/glimmer/scripts/Replace_Tabs.py
-share/gnome/glimmer/scripts/To_Lower.py
-share/gnome/glimmer/scripts/To_Upper.py
 share/gnome/help/glimmer/C/bugs.html
 share/gnome/help/glimmer/C/customize.html
 share/gnome/help/glimmer/C/faq.html
@@ -58,16 +58,16 @@ share/gnome/help/glimmer/C/preferences.html
 share/gnome/help/glimmer/C/properties.html
 share/gnome/help/glimmer/C/sessions.html
 share/gnome/help/glimmer/C/topic.dat
-share/gnome/pixmaps/glimmer-icon.png
-share/gnome/pixmaps/glimmer-splash.png
-share/gnome/pixmaps/glimmer-title.png
 share/locale/de/LC_MESSAGES/glimmer.mo
 share/locale/es/LC_MESSAGES/glimmer.mo
 share/locale/ja/LC_MESSAGES/glimmer.mo
 share/locale/sv/LC_MESSAGES/glimmer.mo
+share/pixmaps/glimmer-icon.png
+share/pixmaps/glimmer-splash.png
+share/pixmaps/glimmer-title.png
 @dirrm share/gnome/help/glimmer/C
 @dirrm share/gnome/help/glimmer
-@dirrm share/gnome/glimmer/scripts
-@dirrm share/gnome/glimmer/languages
-@dirrm share/gnome/glimmer/docs
-@dirrm share/gnome/glimmer
+@dirrm %%DATADIR%%/scripts
+@dirrm %%DATADIR%%/languages
+@dirrm %%DATADIR%%/docs
+@dirrm %%DATADIR%%
diff --git a/editors/gmanedit/Makefile b/editors/gmanedit/Makefile
index 4c2f73ac4427..5db734dde6e4 100644
--- a/editors/gmanedit/Makefile
+++ b/editors/gmanedit/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gmanedit
 PORTVERSION=	0.3.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	editors gnome
 MASTER_SITES=	http://gmanedit.sourceforge.net/files/ \
 		${MASTER_SITE_SOURCEFORGE}
@@ -28,9 +28,12 @@ ALL_TARGET=	clean all
 
 post-extract:
 	@${RM} -rf ${WRKSRC}/config.cache
+	@${FIND} ${WRKSRC} -name Makefile | ${XARGS} ${RM} -f
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
-		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
+		 s|DATADIRNAME=lib|DATADIRNAME=share|g ; \
+		 s|PACKAGE_PIXMAPS_DIR=".*/pixmaps|PACKAGE_PIXMAPS_DIR="${PREFIX}/share/pixmaps|g' \
+		 	${WRKSRC}/configure
 
 .include <bsd.port.mk>
diff --git a/editors/gmanedit/pkg-plist b/editors/gmanedit/pkg-plist
index 3e63d10b7b6c..1b81f32ab519 100644
--- a/editors/gmanedit/pkg-plist
+++ b/editors/gmanedit/pkg-plist
@@ -1,15 +1,15 @@
 bin/gmanedit
-share/gnome/pixmaps/gmanedit/arrow.xpm
-share/gnome/pixmaps/gmanedit/button.xpm
-share/gnome/pixmaps/gmanedit/exit.xpm
-share/gnome/pixmaps/gmanedit/gmanedit.png
-share/gnome/pixmaps/gmanedit/new.xpm
-share/gnome/pixmaps/gmanedit/no.xpm
-share/gnome/pixmaps/gmanedit/open.xpm
-share/gnome/pixmaps/gmanedit/save.xpm
-share/gnome/pixmaps/gmanedit/spinbutton.xpm
 share/locale/es/LC_MESSAGES/gmanedit.mo
 share/locale/gl/LC_MESSAGES/gmanedit.mo
 share/locale/ja/LC_MESSAGES/gmanedit.mo
 share/locale/ko/LC_MESSAGES/gmanedit.mo
-@dirrm share/gnome/pixmaps/gmanedit
+share/pixmaps/gmanedit/arrow.xpm
+share/pixmaps/gmanedit/button.xpm
+share/pixmaps/gmanedit/exit.xpm
+share/pixmaps/gmanedit/gmanedit.png
+share/pixmaps/gmanedit/new.xpm
+share/pixmaps/gmanedit/no.xpm
+share/pixmaps/gmanedit/open.xpm
+share/pixmaps/gmanedit/save.xpm
+share/pixmaps/gmanedit/spinbutton.xpm
+@dirrm share/pixmaps/gmanedit
diff --git a/editors/gnotepad+/Makefile b/editors/gnotepad+/Makefile
index 8b930089c51f..8398f0d4a76a 100644
--- a/editors/gnotepad+/Makefile
+++ b/editors/gnotepad+/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gnotepad+
 PORTVERSION=	1.3.3
-PORTREVISION=	3
+PORTREVISION=	5
 CATEGORIES=	editors www gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	gnotepad
@@ -25,7 +25,7 @@ USE_GETTEXT=	yes
 USE_X_PREFIX=	yes
 USE_XPM=	yes
 WANT_GNOME=	yes
-USE_GNOME=	gtk12
+USE_GNOME=	gnomeprefix gtk12
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
@@ -44,12 +44,10 @@ post-extract:
 .endif
 
 .if ${HAVE_GNOME:Mgnomelibs}!=""
-USE_GNOME=	gnomeprefix gnomelibs
+USE_GNOME+=	gnomelibs
 PKGNAMESUFFIX=	-gnome
-PLIST_SUB=	DATADIR="share/gnome"
 .else
 CONFIGURE_ARGS+=--disable-gnome
-PLIST_SUB=	DATADIR="share"
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/editors/gnotepad+/files/patch-aa b/editors/gnotepad+/files/patch-aa
index 048e275ef951..8a6d751bb623 100644
--- a/editors/gnotepad+/files/patch-aa
+++ b/editors/gnotepad+/files/patch-aa
@@ -6,7 +6,7 @@
  
 -Applicationsdir = $(datadir)/gnome/apps/Applications
 -Applications_DATA = gnotepad+.desktop gnotepad+.spec
-+@HAVE_GNOME_TRUE@Applicationsdir = $(datadir)/apps/Applications
++@HAVE_GNOME_TRUE@Applicationsdir = $(datadir)/gnome/apps/Applications
 +@HAVE_GNOME_TRUE@Applications_DATA = gnotepad+.desktop gnotepad+.spec
  
  SUBDIRS = docs po intl src
diff --git a/editors/gnotepad+/files/patch-ab b/editors/gnotepad+/files/patch-ab
deleted file mode 100644
index 6566ba43564b..000000000000
--- a/editors/gnotepad+/files/patch-ab
+++ /dev/null
@@ -1,11 +0,0 @@
---- docs/C/Makefile.in.orig	Wed May 17 10:17:47 2000
-+++ docs/C/Makefile.in	Wed May 17 10:18:09 2000
-@@ -65,7 +65,7 @@
- pkgdata_DATA =  	index-1.html			index-2.html			index-3.html			index-4.html			index-5.html			index.html			closedialog.png			doclist.png			doctabs.png			editmenu.png			fileinfo1.png			fileinfo2.png			find1.png			find2.png			find3.png			htmldoc.png			htmltag.png			htmltb1.png			htmltb2.png			htmlwin.png			mainoptions.png			maintb.png			mainwin.png			msgbar.png			msgbox.png			optionsmenu0.png		optionsmenu1.png		optionsmenu2.png		prefs_appearance.png		prefs_document.png		prefs_fonts.png			prefs_fontsel.png		prefs_htmltb.png		prefs_maintb.png		prefs_misc.png			prefs_srcctrl.png		prefs_window.png		printdialog.png			shellcmd.png			splashscreen.png		textarea.png			windowmenu.png			winlist.png			winnew.png			topic.dat
- 
- 
--gnp_helpdir = $(datadir)/gnome/help/gnotepad+/C
-+gnp_helpdir = $(datadir)/help/gnotepad+/C
- 
- EXTRA_DIST = $(pkgdata_DATA)
- 
diff --git a/editors/gnotepad+/pkg-plist b/editors/gnotepad+/pkg-plist
index 167dd00a9cac..8e6d6daa6304 100644
--- a/editors/gnotepad+/pkg-plist
+++ b/editors/gnotepad+/pkg-plist
@@ -1,146 +1,145 @@
 bin/gnp
 %%GNOME:%%share/gnome/apps/Applications/gnotepad+.desktop
 %%GNOME:%%share/gnome/apps/Applications/gnotepad+.spec
-%%DATADIR%%/gnotepad+/gnotepad+.glade
-%%DATADIR%%/gnotepad+/xpm/colsel.xpm
-%%DATADIR%%/gnotepad+/xpm/filesel.xpm
-%%DATADIR%%/gnotepad+/xpm/gnp48x48.xpm
-%%DATADIR%%/gnotepad+/xpm/tb_big.xpm
-%%DATADIR%%/gnotepad+/xpm/tb_blank.xpm
-%%DATADIR%%/gnotepad+/xpm/tb_bold.xpm
-%%DATADIR%%/gnotepad+/xpm/tb_cancel.xpm
-%%DATADIR%%/gnotepad+/xpm/tb_centjust.xpm
-%%DATADIR%%/gnotepad+/xpm/tb_comment.xpm
-%%DATADIR%%/gnotepad+/xpm/tb_copy.xpm
-%%DATADIR%%/gnotepad+/xpm/tb_cut.xpm
-%%DATADIR%%/gnotepad+/xpm/tb_edit.xpm
-%%DATADIR%%/gnotepad+/xpm/tb_emphasis.xpm
-%%DATADIR%%/gnotepad+/xpm/tb_exit.xpm
-%%DATADIR%%/gnotepad+/xpm/tb_find.xpm
-%%DATADIR%%/gnotepad+/xpm/tb_find_next.xpm
-%%DATADIR%%/gnotepad+/xpm/tb_fontm1.xpm
-%%DATADIR%%/gnotepad+/xpm/tb_fontp1.xpm
-%%DATADIR%%/gnotepad+/xpm/tb_form.xpm
-%%DATADIR%%/gnotepad+/xpm/tb_formoption.xpm
-%%DATADIR%%/gnotepad+/xpm/tb_formselect.xpm
-%%DATADIR%%/gnotepad+/xpm/tb_frame.xpm
-%%DATADIR%%/gnotepad+/xpm/tb_frame2.xpm
-%%DATADIR%%/gnotepad+/xpm/tb_framebase.xpm
-%%DATADIR%%/gnotepad+/xpm/tb_frameno.xpm
-%%DATADIR%%/gnotepad+/xpm/tb_frameset.xpm
-%%DATADIR%%/gnotepad+/xpm/tb_frameset2.xpm
-%%DATADIR%%/gnotepad+/xpm/tb_framewiz.xpm
-%%DATADIR%%/gnotepad+/xpm/tb_h1.xpm
-%%DATADIR%%/gnotepad+/xpm/tb_h2.xpm
-%%DATADIR%%/gnotepad+/xpm/tb_h3.xpm
-%%DATADIR%%/gnotepad+/xpm/tb_h4.xpm
-%%DATADIR%%/gnotepad+/xpm/tb_h5.xpm
-%%DATADIR%%/gnotepad+/xpm/tb_h6.xpm
-%%DATADIR%%/gnotepad+/xpm/tb_help.xpm
-%%DATADIR%%/gnotepad+/xpm/tb_image.xpm
-%%DATADIR%%/gnotepad+/xpm/tb_inputbutton.xpm
-%%DATADIR%%/gnotepad+/xpm/tb_inputcheckbox.xpm
-%%DATADIR%%/gnotepad+/xpm/tb_inputimage.xpm
-%%DATADIR%%/gnotepad+/xpm/tb_inputpass.xpm
-%%DATADIR%%/gnotepad+/xpm/tb_inputradio.xpm
-%%DATADIR%%/gnotepad+/xpm/tb_inputreset.xpm
-%%DATADIR%%/gnotepad+/xpm/tb_inputsubmit.xpm
-%%DATADIR%%/gnotepad+/xpm/tb_inputtext.xpm
-%%DATADIR%%/gnotepad+/xpm/tb_inputtextarea.xpm
-%%DATADIR%%/gnotepad+/xpm/tb_italic.xpm
-%%DATADIR%%/gnotepad+/xpm/tb_leftjust.xpm
-%%DATADIR%%/gnotepad+/xpm/tb_linebreak.xpm
-%%DATADIR%%/gnotepad+/xpm/tb_link.xpm
-%%DATADIR%%/gnotepad+/xpm/tb_listdd.xpm
-%%DATADIR%%/gnotepad+/xpm/tb_listdl.xpm
-%%DATADIR%%/gnotepad+/xpm/tb_listdt.xpm
-%%DATADIR%%/gnotepad+/xpm/tb_listitem.xpm
-%%DATADIR%%/gnotepad+/xpm/tb_menu.xpm
-%%DATADIR%%/gnotepad+/xpm/tb_new.xpm
-%%DATADIR%%/gnotepad+/xpm/tb_open.xpm
-%%DATADIR%%/gnotepad+/xpm/tb_ordered.xpm
-%%DATADIR%%/gnotepad+/xpm/tb_paragraph.xpm
-%%DATADIR%%/gnotepad+/xpm/tb_paste.xpm
-%%DATADIR%%/gnotepad+/xpm/tb_pre.xpm
-%%DATADIR%%/gnotepad+/xpm/tb_prefs.xpm
-%%DATADIR%%/gnotepad+/xpm/tb_print.xpm
-%%DATADIR%%/gnotepad+/xpm/tb_redo.xpm
-%%DATADIR%%/gnotepad+/xpm/tb_replace.xpm
-%%DATADIR%%/gnotepad+/xpm/tb_rightjust.xpm
-%%DATADIR%%/gnotepad+/xpm/tb_save.xpm
-%%DATADIR%%/gnotepad+/xpm/tb_separator.xpm
-%%DATADIR%%/gnotepad+/xpm/tb_small.xpm
-%%DATADIR%%/gnotepad+/xpm/tb_strikeout.xpm
-%%DATADIR%%/gnotepad+/xpm/tb_strong.xpm
-%%DATADIR%%/gnotepad+/xpm/tb_subscript.xpm
-%%DATADIR%%/gnotepad+/xpm/tb_superscript.xpm
-%%DATADIR%%/gnotepad+/xpm/tb_table.xpm
-%%DATADIR%%/gnotepad+/xpm/tb_table2.xpm
-%%DATADIR%%/gnotepad+/xpm/tb_tablewiz.xpm
-%%DATADIR%%/gnotepad+/xpm/tb_target.xpm
-%%DATADIR%%/gnotepad+/xpm/tb_td.xpm
-%%DATADIR%%/gnotepad+/xpm/tb_td2.xpm
-%%DATADIR%%/gnotepad+/xpm/tb_th.xpm
-%%DATADIR%%/gnotepad+/xpm/tb_th2.xpm
-%%DATADIR%%/gnotepad+/xpm/tb_title.xpm
-%%DATADIR%%/gnotepad+/xpm/tb_tr.xpm
-%%DATADIR%%/gnotepad+/xpm/tb_tr2.xpm
-%%DATADIR%%/gnotepad+/xpm/tb_typewriter.xpm
-%%DATADIR%%/gnotepad+/xpm/tb_underline.xpm
-%%DATADIR%%/gnotepad+/xpm/tb_undo.xpm
-%%DATADIR%%/gnotepad+/xpm/tb_unordered.xpm
-%%DATADIR%%/gnotepad+/xpm/tb_winclose.xpm
-%%DATADIR%%/gnotepad+/xpm/tb_winnew.xpm
-%%DATADIR%%/help/gnotepad+/C/closedialog.png
-%%DATADIR%%/help/gnotepad+/C/doclist.png
-%%DATADIR%%/help/gnotepad+/C/doctabs.png
-%%DATADIR%%/help/gnotepad+/C/editmenu.png
-%%DATADIR%%/help/gnotepad+/C/fileinfo1.png
-%%DATADIR%%/help/gnotepad+/C/fileinfo2.png
-%%DATADIR%%/help/gnotepad+/C/find1.png
-%%DATADIR%%/help/gnotepad+/C/find2.png
-%%DATADIR%%/help/gnotepad+/C/find3.png
-%%DATADIR%%/help/gnotepad+/C/htmldoc.png
-%%DATADIR%%/help/gnotepad+/C/htmltag.png
-%%DATADIR%%/help/gnotepad+/C/htmltb1.png
-%%DATADIR%%/help/gnotepad+/C/htmltb2.png
-%%DATADIR%%/help/gnotepad+/C/htmlwin.png
-%%DATADIR%%/help/gnotepad+/C/index-1.html
-%%DATADIR%%/help/gnotepad+/C/index-2.html
-%%DATADIR%%/help/gnotepad+/C/index-3.html
-%%DATADIR%%/help/gnotepad+/C/index-4.html
-%%DATADIR%%/help/gnotepad+/C/index-5.html
-%%DATADIR%%/help/gnotepad+/C/index.html
-%%DATADIR%%/help/gnotepad+/C/mainoptions.png
-%%DATADIR%%/help/gnotepad+/C/maintb.png
-%%DATADIR%%/help/gnotepad+/C/mainwin.png
-%%DATADIR%%/help/gnotepad+/C/msgbar.png
-%%DATADIR%%/help/gnotepad+/C/msgbox.png
-%%DATADIR%%/help/gnotepad+/C/optionsmenu0.png
-%%DATADIR%%/help/gnotepad+/C/optionsmenu1.png
-%%DATADIR%%/help/gnotepad+/C/optionsmenu2.png
-%%DATADIR%%/help/gnotepad+/C/prefs_appearance.png
-%%DATADIR%%/help/gnotepad+/C/prefs_document.png
-%%DATADIR%%/help/gnotepad+/C/prefs_fonts.png
-%%DATADIR%%/help/gnotepad+/C/prefs_fontsel.png
-%%DATADIR%%/help/gnotepad+/C/prefs_htmltb.png
-%%DATADIR%%/help/gnotepad+/C/prefs_maintb.png
-%%DATADIR%%/help/gnotepad+/C/prefs_misc.png
-%%DATADIR%%/help/gnotepad+/C/prefs_srcctrl.png
-%%DATADIR%%/help/gnotepad+/C/prefs_window.png
-%%DATADIR%%/help/gnotepad+/C/printdialog.png
-%%DATADIR%%/help/gnotepad+/C/shellcmd.png
-%%DATADIR%%/help/gnotepad+/C/splashscreen.png
-%%DATADIR%%/help/gnotepad+/C/textarea.png
-%%DATADIR%%/help/gnotepad+/C/topic.dat
-%%DATADIR%%/help/gnotepad+/C/windowmenu.png
-%%DATADIR%%/help/gnotepad+/C/winlist.png
-%%DATADIR%%/help/gnotepad+/C/winnew.png
+share/gnome/help/gnotepad+/C/closedialog.png
+share/gnome/help/gnotepad+/C/doclist.png
+share/gnome/help/gnotepad+/C/doctabs.png
+share/gnome/help/gnotepad+/C/editmenu.png
+share/gnome/help/gnotepad+/C/fileinfo1.png
+share/gnome/help/gnotepad+/C/fileinfo2.png
+share/gnome/help/gnotepad+/C/find1.png
+share/gnome/help/gnotepad+/C/find2.png
+share/gnome/help/gnotepad+/C/find3.png
+share/gnome/help/gnotepad+/C/htmldoc.png
+share/gnome/help/gnotepad+/C/htmltag.png
+share/gnome/help/gnotepad+/C/htmltb1.png
+share/gnome/help/gnotepad+/C/htmltb2.png
+share/gnome/help/gnotepad+/C/htmlwin.png
+share/gnome/help/gnotepad+/C/index-1.html
+share/gnome/help/gnotepad+/C/index-2.html
+share/gnome/help/gnotepad+/C/index-3.html
+share/gnome/help/gnotepad+/C/index-4.html
+share/gnome/help/gnotepad+/C/index-5.html
+share/gnome/help/gnotepad+/C/index.html
+share/gnome/help/gnotepad+/C/mainoptions.png
+share/gnome/help/gnotepad+/C/maintb.png
+share/gnome/help/gnotepad+/C/mainwin.png
+share/gnome/help/gnotepad+/C/msgbar.png
+share/gnome/help/gnotepad+/C/msgbox.png
+share/gnome/help/gnotepad+/C/optionsmenu0.png
+share/gnome/help/gnotepad+/C/optionsmenu1.png
+share/gnome/help/gnotepad+/C/optionsmenu2.png
+share/gnome/help/gnotepad+/C/prefs_appearance.png
+share/gnome/help/gnotepad+/C/prefs_document.png
+share/gnome/help/gnotepad+/C/prefs_fonts.png
+share/gnome/help/gnotepad+/C/prefs_fontsel.png
+share/gnome/help/gnotepad+/C/prefs_htmltb.png
+share/gnome/help/gnotepad+/C/prefs_maintb.png
+share/gnome/help/gnotepad+/C/prefs_misc.png
+share/gnome/help/gnotepad+/C/prefs_srcctrl.png
+share/gnome/help/gnotepad+/C/prefs_window.png
+share/gnome/help/gnotepad+/C/printdialog.png
+share/gnome/help/gnotepad+/C/shellcmd.png
+share/gnome/help/gnotepad+/C/splashscreen.png
+share/gnome/help/gnotepad+/C/textarea.png
+share/gnome/help/gnotepad+/C/topic.dat
+share/gnome/help/gnotepad+/C/windowmenu.png
+share/gnome/help/gnotepad+/C/winlist.png
+share/gnome/help/gnotepad+/C/winnew.png
+%%DATADIR%%/gnotepad+.glade
+%%DATADIR%%/xpm/colsel.xpm
+%%DATADIR%%/xpm/filesel.xpm
+%%DATADIR%%/xpm/gnp48x48.xpm
+%%DATADIR%%/xpm/tb_big.xpm
+%%DATADIR%%/xpm/tb_blank.xpm
+%%DATADIR%%/xpm/tb_bold.xpm
+%%DATADIR%%/xpm/tb_cancel.xpm
+%%DATADIR%%/xpm/tb_centjust.xpm
+%%DATADIR%%/xpm/tb_comment.xpm
+%%DATADIR%%/xpm/tb_copy.xpm
+%%DATADIR%%/xpm/tb_cut.xpm
+%%DATADIR%%/xpm/tb_edit.xpm
+%%DATADIR%%/xpm/tb_emphasis.xpm
+%%DATADIR%%/xpm/tb_exit.xpm
+%%DATADIR%%/xpm/tb_find.xpm
+%%DATADIR%%/xpm/tb_find_next.xpm
+%%DATADIR%%/xpm/tb_fontm1.xpm
+%%DATADIR%%/xpm/tb_fontp1.xpm
+%%DATADIR%%/xpm/tb_form.xpm
+%%DATADIR%%/xpm/tb_formoption.xpm
+%%DATADIR%%/xpm/tb_formselect.xpm
+%%DATADIR%%/xpm/tb_frame.xpm
+%%DATADIR%%/xpm/tb_frame2.xpm
+%%DATADIR%%/xpm/tb_framebase.xpm
+%%DATADIR%%/xpm/tb_frameno.xpm
+%%DATADIR%%/xpm/tb_frameset.xpm
+%%DATADIR%%/xpm/tb_frameset2.xpm
+%%DATADIR%%/xpm/tb_framewiz.xpm
+%%DATADIR%%/xpm/tb_h1.xpm
+%%DATADIR%%/xpm/tb_h2.xpm
+%%DATADIR%%/xpm/tb_h3.xpm
+%%DATADIR%%/xpm/tb_h4.xpm
+%%DATADIR%%/xpm/tb_h5.xpm
+%%DATADIR%%/xpm/tb_h6.xpm
+%%DATADIR%%/xpm/tb_help.xpm
+%%DATADIR%%/xpm/tb_image.xpm
+%%DATADIR%%/xpm/tb_inputbutton.xpm
+%%DATADIR%%/xpm/tb_inputcheckbox.xpm
+%%DATADIR%%/xpm/tb_inputimage.xpm
+%%DATADIR%%/xpm/tb_inputpass.xpm
+%%DATADIR%%/xpm/tb_inputradio.xpm
+%%DATADIR%%/xpm/tb_inputreset.xpm
+%%DATADIR%%/xpm/tb_inputsubmit.xpm
+%%DATADIR%%/xpm/tb_inputtext.xpm
+%%DATADIR%%/xpm/tb_inputtextarea.xpm
+%%DATADIR%%/xpm/tb_italic.xpm
+%%DATADIR%%/xpm/tb_leftjust.xpm
+%%DATADIR%%/xpm/tb_linebreak.xpm
+%%DATADIR%%/xpm/tb_link.xpm
+%%DATADIR%%/xpm/tb_listdd.xpm
+%%DATADIR%%/xpm/tb_listdl.xpm
+%%DATADIR%%/xpm/tb_listdt.xpm
+%%DATADIR%%/xpm/tb_listitem.xpm
+%%DATADIR%%/xpm/tb_menu.xpm
+%%DATADIR%%/xpm/tb_new.xpm
+%%DATADIR%%/xpm/tb_open.xpm
+%%DATADIR%%/xpm/tb_ordered.xpm
+%%DATADIR%%/xpm/tb_paragraph.xpm
+%%DATADIR%%/xpm/tb_paste.xpm
+%%DATADIR%%/xpm/tb_pre.xpm
+%%DATADIR%%/xpm/tb_prefs.xpm
+%%DATADIR%%/xpm/tb_print.xpm
+%%DATADIR%%/xpm/tb_redo.xpm
+%%DATADIR%%/xpm/tb_replace.xpm
+%%DATADIR%%/xpm/tb_rightjust.xpm
+%%DATADIR%%/xpm/tb_save.xpm
+%%DATADIR%%/xpm/tb_separator.xpm
+%%DATADIR%%/xpm/tb_small.xpm
+%%DATADIR%%/xpm/tb_strikeout.xpm
+%%DATADIR%%/xpm/tb_strong.xpm
+%%DATADIR%%/xpm/tb_subscript.xpm
+%%DATADIR%%/xpm/tb_superscript.xpm
+%%DATADIR%%/xpm/tb_table.xpm
+%%DATADIR%%/xpm/tb_table2.xpm
+%%DATADIR%%/xpm/tb_tablewiz.xpm
+%%DATADIR%%/xpm/tb_target.xpm
+%%DATADIR%%/xpm/tb_td.xpm
+%%DATADIR%%/xpm/tb_td2.xpm
+%%DATADIR%%/xpm/tb_th.xpm
+%%DATADIR%%/xpm/tb_th2.xpm
+%%DATADIR%%/xpm/tb_title.xpm
+%%DATADIR%%/xpm/tb_tr.xpm
+%%DATADIR%%/xpm/tb_tr2.xpm
+%%DATADIR%%/xpm/tb_typewriter.xpm
+%%DATADIR%%/xpm/tb_underline.xpm
+%%DATADIR%%/xpm/tb_undo.xpm
+%%DATADIR%%/xpm/tb_unordered.xpm
+%%DATADIR%%/xpm/tb_winclose.xpm
+%%DATADIR%%/xpm/tb_winnew.xpm
 share/locale/da/LC_MESSAGES/gnotepad+.mo
 share/locale/fr/LC_MESSAGES/gnotepad+.mo
 share/locale/ja/LC_MESSAGES/gnotepad+.mo
-@dirrm %%DATADIR%%/help/gnotepad+/C
-@dirrm %%DATADIR%%/help/gnotepad+
-%%NOGNOME:%%@dirrm %%DATADIR%%/help
-@dirrm %%DATADIR%%/gnotepad+/xpm
-@dirrm %%DATADIR%%/gnotepad+
+@dirrm %%DATADIR%%/xpm
+@dirrm %%DATADIR%%
+@dirrm share/gnome/help/gnotepad+/C
+@dirrm share/gnome/help/gnotepad+
diff --git a/editors/gphpedit/Makefile b/editors/gphpedit/Makefile
index d69955e65e4b..0685b6af907b 100644
--- a/editors/gphpedit/Makefile
+++ b/editors/gphpedit/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gphpedit
 PORTVERSION=	0.9.80
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	editors gnome
 MASTER_SITES=	http://www.gphpedit.org/download/store/ \
 		http://ftp.ceid.upatras.gr/pub/linux/gentoo/distfiles/ \
@@ -46,9 +46,9 @@ pre-everything::
 .endif
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|/usr/local/share|${PREFIX}/share/gnome|g' \
+	@${REINPLACE_CMD} -e 's|/usr/local/share|${PREFIX}/share|g' \
 		${WRKSRC}/src/main.h
-	@${REINPLACE_CMD} -e 's|/usr/share|${PREFIX}/share/gnome|g' \
+	@${REINPLACE_CMD} -e 's|/usr/share|${PREFIX}/share|g' \
 		${WRKSRC}/src/calltip.c ${WRKSRC}/src/main_window.c
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
 		${WRKSRC}/src/tab.c
diff --git a/editors/gphpedit/pkg-plist b/editors/gphpedit/pkg-plist
index bc6ece9e0db6..e76fe62e9d64 100644
--- a/editors/gphpedit/pkg-plist
+++ b/editors/gphpedit/pkg-plist
@@ -1,5 +1,6 @@
 bin/gphpedit
-share/gnome/applications/gphpedit.desktop
-share/gnome/gphpedit/php-gphpedit.api
-share/gnome/pixmaps/gphpedit.png
-@dirrm share/gnome/gphpedit
+share/applications/gphpedit.desktop
+share/gphpedit/php-gphpedit.api
+share/pixmaps/gphpedit.png
+@dirrm share/gphpedit
+@dirrmtry share/applications
diff --git a/editors/mlview/Makefile b/editors/mlview/Makefile
index d41b5771aedd..18a3f2aa80c8 100644
--- a/editors/mlview/Makefile
+++ b/editors/mlview/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mlview
 PORTVERSION=	0.8
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	editors gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION}
diff --git a/editors/mlview/files/patch-desktop.in b/editors/mlview/files/patch-desktop.in
index 433fe9aea52a..4dfbe32c7e1d 100644
--- a/editors/mlview/files/patch-desktop.in
+++ b/editors/mlview/files/patch-desktop.in
@@ -12,7 +12,7 @@
  Comment=A generic simple XML editor for GNOME
 -Icon=mlview-app-icon.xpm
 -TryExec=mlv
-+Icon=/usr/X11R6/share/gnome/pixmaps/mlview-app-icon.xpm
++Icon=mlview-app-icon.xpm
 +TryExec=mlview
  Exec=@MLVIEW_EXE@ %F
  Terminal=false
diff --git a/editors/mlview/pkg-plist b/editors/mlview/pkg-plist
index ccf12c2f10c0..070393de58d1 100644
--- a/editors/mlview/pkg-plist
+++ b/editors/mlview/pkg-plist
@@ -8,39 +8,39 @@ lib/libmlviewdbusclient.a
 lib/libmlviewdbusclient.la
 lib/libmlviewdbusclient.so.8
 lib/libmlviewdbusclient.so
-share/gnome/applications/mlview.desktop
-share/gnome/application-registry/mlview.applications
-share/gnome/mime-info/mlview.keys
-share/gnome/mlview/main-menu-bar.xml
-share/gnome/mlview/main-toolbar.xml
-share/gnome/mlview/mlview-css-picker.glade
-share/gnome/mlview/mlview-dtd-schema.png
-share/gnome/mlview/mlview-dtd-choice-dtd-not-resolved.glade
-share/gnome/mlview/mlview-dtd-choice.glade
-share/gnome/mlview/mlview-main-app-win.glade
-share/gnome/mlview/mlview-main-app-win2.glade
-share/gnome/mlview/mlview-new-document.glade
-share/gnome/mlview/mlview-node-editor.glade
-share/gnome/mlview/mlview-preferences.glade
-share/gnome/mlview/mlview-rng-schema.png
-share/gnome/mlview/mlview-schemas-window.glade
-share/gnome/mlview/mlview-search-box.glade
-share/gnome/mlview/mlview-search-node.glade
-share/gnome/mlview/mlview-uri-dialog.glade
-share/gnome/mlview/mlview-validation-report.glade
-share/gnome/mlview/mlview-xsd-schema.png
-share/gnome/mlview/source-view-edit-menu.xml
-share/gnome/mlview/tree-view-edit-menu.xml
-share/gnome/mlview/xml-comment-node.png
-share/gnome/mlview/xml-element-node-open.png
-share/gnome/mlview/xml-element-node.png
-share/gnome/mlview/xml-entity-ref-node.png
-share/gnome/mlview/xml-pi-node.png
-share/gnome/mlview/xml-root-open.png
-share/gnome/mlview/xml-root.png
-share/gnome/mlview/xml-text-node.png
-share/gnome/pixmaps/mlview-app-icon.png
-share/gnome/pixmaps/mlview-app-icon.xpm
+share/applications/mlview.desktop
+share/application-registry/mlview.applications
+share/mime-info/mlview.keys
+share/mlview/main-menu-bar.xml
+share/mlview/main-toolbar.xml
+share/mlview/mlview-css-picker.glade
+share/mlview/mlview-dtd-schema.png
+share/mlview/mlview-dtd-choice-dtd-not-resolved.glade
+share/mlview/mlview-dtd-choice.glade
+share/mlview/mlview-main-app-win.glade
+share/mlview/mlview-main-app-win2.glade
+share/mlview/mlview-new-document.glade
+share/mlview/mlview-node-editor.glade
+share/mlview/mlview-preferences.glade
+share/mlview/mlview-rng-schema.png
+share/mlview/mlview-schemas-window.glade
+share/mlview/mlview-search-box.glade
+share/mlview/mlview-search-node.glade
+share/mlview/mlview-uri-dialog.glade
+share/mlview/mlview-validation-report.glade
+share/mlview/mlview-xsd-schema.png
+share/mlview/source-view-edit-menu.xml
+share/mlview/tree-view-edit-menu.xml
+share/mlview/xml-comment-node.png
+share/mlview/xml-element-node-open.png
+share/mlview/xml-element-node.png
+share/mlview/xml-entity-ref-node.png
+share/mlview/xml-pi-node.png
+share/mlview/xml-root-open.png
+share/mlview/xml-root.png
+share/mlview/xml-text-node.png
+share/pixmaps/mlview-app-icon.png
+share/pixmaps/mlview-app-icon.xpm
 share/locale/az/LC_MESSAGES/mlview.mo
 share/locale/ca/LC_MESSAGES/mlview.mo
 share/locale/cs/LC_MESSAGES/mlview.mo
@@ -62,4 +62,5 @@ share/locale/ru/LC_MESSAGES/mlview.mo
 share/locale/sr/LC_MESSAGES/mlview.mo
 share/locale/sr@Latn/LC_MESSAGES/mlview.mo
 share/locale/sv/LC_MESSAGES/mlview.mo
-@dirrm share/gnome/mlview
+@dirrm share/mlview
+@dirrmtry share/applications
diff --git a/editors/morla/Makefile b/editors/morla/Makefile
index 41bbc3e5e07f..c38b8fcdd54b 100644
--- a/editors/morla/Makefile
+++ b/editors/morla/Makefile
@@ -7,7 +7,6 @@
 
 PORTNAME=	morla
 PORTVERSION=	0.13
-#PORTREVISION=	0
 CATEGORIES=	editors textproc
 MASTER_SITES=	http://www.morlardf.net/src/ \
 		http://nivi.interfree.it/distfiles/${PORTNAME}/${PORTVERSION}/
@@ -37,4 +36,8 @@ DESKTOP_ENTRIES="morla" \
 		"Application;WebDevelopment;" \
 		true
 
+post-patch:
+	@${REINPLACE_CMD} -e 's|-D.*_DISABLE_DEPRECATED||g' \
+		${WRKSRC}/configure
+
 .include <bsd.port.mk>
diff --git a/editors/scribes/Makefile b/editors/scribes/Makefile
index 30f410c6a55b..4689d80b8ccb 100644
--- a/editors/scribes/Makefile
+++ b/editors/scribes/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	scribes
 PORTVERSION=	0.3.2.8
+PORTREVISION=	1
 CATEGORIES=	editors
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -29,7 +30,4 @@ GCONF_SCHEMAS=	scribes.schemas
 INSTALLS_ICONS=	yes
 INSTALLS_OMF=	yes
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|(datadir)/icons|(prefix)/share/icons|' ${WRKSRC}/data/Makefile.in
-
 .include <bsd.port.mk>
diff --git a/editors/scribes/pkg-plist b/editors/scribes/pkg-plist
index 6cb2be5cd24d..b85c747ed9c9 100644
--- a/editors/scribes/pkg-plist
+++ b/editors/scribes/pkg-plist
@@ -179,7 +179,7 @@ share/locale/it/LC_MESSAGES/scribes.mo
 share/locale/nl/LC_MESSAGES/scribes.mo
 share/locale/pt_BR/LC_MESSAGES/scribes.mo
 share/locale/sv/LC_MESSAGES/scribes.mo
-share/gnome/applications/scribes.desktop
+share/applications/scribes.desktop
 share/gnome/help/scribes/C/figures/scribes_add_dialog.png
 share/gnome/help/scribes/C/figures/scribes_completion.png
 share/gnome/help/scribes/C/figures/scribes_document_switcher.png
@@ -191,733 +191,734 @@ share/gnome/help/scribes/C/figures/scribes_toolbar.png
 share/gnome/help/scribes/C/figures/scribes_window.png
 share/gnome/help/scribes/C/legal.xml
 share/gnome/help/scribes/C/scribes.xml
-share/gnome/omf/scribes/scribes-C.omf
-share/gnome/pixmaps/scribes.png
-share/gnome/scribes/ModificationDialog.glade
-share/gnome/scribes/bookmarks.png
-share/gnome/scribes/plugins/About/AboutDialog.py
-share/gnome/scribes/plugins/About/AboutDialog.pyo
-share/gnome/scribes/plugins/About/i18n.py
-share/gnome/scribes/plugins/About/i18n.pyo
-share/gnome/scribes/plugins/About/PopupMenuItem.py
-share/gnome/scribes/plugins/About/PopupMenuItem.pyo
-share/gnome/scribes/plugins/About/Trigger.py
-share/gnome/scribes/plugins/About/Trigger.pyo
-share/gnome/scribes/plugins/About/__init__.py
-share/gnome/scribes/plugins/About/__init__.pyo
-share/gnome/scribes/plugins/AutoReplaceGUI/AddButton.py
-share/gnome/scribes/plugins/AutoReplaceGUI/AddButton.pyo
-share/gnome/scribes/plugins/AutoReplaceGUI/EditButton.py
-share/gnome/scribes/plugins/AutoReplaceGUI/EditButton.pyo
-share/gnome/scribes/plugins/AutoReplaceGUI/i18n.py
-share/gnome/scribes/plugins/AutoReplaceGUI/i18n.pyo
-share/gnome/scribes/plugins/AutoReplaceGUI/Manager.py
-share/gnome/scribes/plugins/AutoReplaceGUI/Manager.pyo
-share/gnome/scribes/plugins/AutoReplaceGUI/MenuItem.py
-share/gnome/scribes/plugins/AutoReplaceGUI/MenuItem.pyo
-share/gnome/scribes/plugins/AutoReplaceGUI/RemoveButton.py
-share/gnome/scribes/plugins/AutoReplaceGUI/RemoveButton.pyo
-share/gnome/scribes/plugins/AutoReplaceGUI/Treeview.py
-share/gnome/scribes/plugins/AutoReplaceGUI/Treeview.pyo
-share/gnome/scribes/plugins/AutoReplaceGUI/Trigger.py
-share/gnome/scribes/plugins/AutoReplaceGUI/Trigger.pyo
-share/gnome/scribes/plugins/AutoReplaceGUI/Window.py
-share/gnome/scribes/plugins/AutoReplaceGUI/Window.pyo
-share/gnome/scribes/plugins/AutoReplaceGUI/__init__.py
-share/gnome/scribes/plugins/AutoReplaceGUI/__init__.pyo
-share/gnome/scribes/plugins/AutoReplace/Expander.py
-share/gnome/scribes/plugins/AutoReplace/Expander.pyo
-share/gnome/scribes/plugins/AutoReplace/i18n.py
-share/gnome/scribes/plugins/AutoReplace/i18n.pyo
-share/gnome/scribes/plugins/AutoReplace/Manager.py
-share/gnome/scribes/plugins/AutoReplace/Manager.pyo
-share/gnome/scribes/plugins/AutoReplace/Monitor.py
-share/gnome/scribes/plugins/AutoReplace/Monitor.pyo
-share/gnome/scribes/plugins/AutoReplace/__init__.py
-share/gnome/scribes/plugins/AutoReplace/__init__.pyo
-share/gnome/scribes/plugins/BookmarkBrowser/i18n.py
-share/gnome/scribes/plugins/BookmarkBrowser/i18n.pyo
-share/gnome/scribes/plugins/BookmarkBrowser/lines.py
-share/gnome/scribes/plugins/BookmarkBrowser/lines.pyo
-share/gnome/scribes/plugins/BookmarkBrowser/Manager.py
-share/gnome/scribes/plugins/BookmarkBrowser/Manager.pyo
-share/gnome/scribes/plugins/BookmarkBrowser/Treeview.py
-share/gnome/scribes/plugins/BookmarkBrowser/Treeview.pyo
-share/gnome/scribes/plugins/BookmarkBrowser/Trigger.py
-share/gnome/scribes/plugins/BookmarkBrowser/Trigger.pyo
-share/gnome/scribes/plugins/BookmarkBrowser/Window.py
-share/gnome/scribes/plugins/BookmarkBrowser/Window.pyo
-share/gnome/scribes/plugins/BookmarkBrowser/__init__.py
-share/gnome/scribes/plugins/BookmarkBrowser/__init__.pyo
-share/gnome/scribes/plugins/Bookmark/BookmarkMetadata.py
-share/gnome/scribes/plugins/Bookmark/BookmarkMetadata.pyo
-share/gnome/scribes/plugins/Bookmark/i18n.py
-share/gnome/scribes/plugins/Bookmark/i18n.pyo
-share/gnome/scribes/plugins/Bookmark/Manager.py
-share/gnome/scribes/plugins/Bookmark/Manager.pyo
-share/gnome/scribes/plugins/Bookmark/PopupMenuItem.py
-share/gnome/scribes/plugins/Bookmark/PopupMenuItem.pyo
-share/gnome/scribes/plugins/Bookmark/Trigger.py
-share/gnome/scribes/plugins/Bookmark/Trigger.pyo
-share/gnome/scribes/plugins/Bookmark/__init__.py
-share/gnome/scribes/plugins/Bookmark/__init__.pyo
-share/gnome/scribes/plugins/BracketCompletion/i18n.py
-share/gnome/scribes/plugins/BracketCompletion/i18n.pyo
-share/gnome/scribes/plugins/BracketCompletion/Manager.py
-share/gnome/scribes/plugins/BracketCompletion/Manager.pyo
-share/gnome/scribes/plugins/BracketCompletion/__init__.py
-share/gnome/scribes/plugins/BracketCompletion/__init__.pyo
-share/gnome/scribes/plugins/BracketSelection/i18n.py
-share/gnome/scribes/plugins/BracketSelection/i18n.pyo
-share/gnome/scribes/plugins/BracketSelection/Trigger.py
-share/gnome/scribes/plugins/BracketSelection/Trigger.pyo
-share/gnome/scribes/plugins/BracketSelection/__init__.py
-share/gnome/scribes/plugins/BracketSelection/__init__.pyo
-share/gnome/scribes/plugins/Case/case.py
-share/gnome/scribes/plugins/Case/case.pyo
-share/gnome/scribes/plugins/Case/i18n.py
-share/gnome/scribes/plugins/Case/i18n.pyo
-share/gnome/scribes/plugins/Case/PopupMenuItem.py
-share/gnome/scribes/plugins/Case/PopupMenuItem.pyo
-share/gnome/scribes/plugins/Case/Trigger.py
-share/gnome/scribes/plugins/Case/Trigger.pyo
-share/gnome/scribes/plugins/Case/__init__.py
-share/gnome/scribes/plugins/Case/__init__.pyo
-share/gnome/scribes/plugins/CloseWindow/Trigger.py
-share/gnome/scribes/plugins/CloseWindow/Trigger.pyo
-share/gnome/scribes/plugins/CloseWindow/__init__.py
-share/gnome/scribes/plugins/CloseWindow/__init__.pyo
-share/gnome/scribes/plugins/ColorEditor/BgColorButton.py
-share/gnome/scribes/plugins/ColorEditor/BgColorButton.pyo
-share/gnome/scribes/plugins/ColorEditor/BgSyntaxButton.py
-share/gnome/scribes/plugins/ColorEditor/BgSyntaxButton.pyo
-share/gnome/scribes/plugins/ColorEditor/BoldCheckButton.py
-share/gnome/scribes/plugins/ColorEditor/BoldCheckButton.pyo
-share/gnome/scribes/plugins/ColorEditor/FgColorButton.py
-share/gnome/scribes/plugins/ColorEditor/FgColorButton.pyo
-share/gnome/scribes/plugins/ColorEditor/FgSyntaxButton.py
-share/gnome/scribes/plugins/ColorEditor/FgSyntaxButton.pyo
-share/gnome/scribes/plugins/ColorEditor/ItalicCheckButton.py
-share/gnome/scribes/plugins/ColorEditor/ItalicCheckButton.pyo
-share/gnome/scribes/plugins/ColorEditor/i18n.py
-share/gnome/scribes/plugins/ColorEditor/i18n.pyo
-share/gnome/scribes/plugins/ColorEditor/Manager.py
-share/gnome/scribes/plugins/ColorEditor/Manager.pyo
-share/gnome/scribes/plugins/ColorEditor/MenuItem.py
-share/gnome/scribes/plugins/ColorEditor/MenuItem.pyo
-share/gnome/scribes/plugins/ColorEditor/ResetButton.py
-share/gnome/scribes/plugins/ColorEditor/ResetButton.pyo
-share/gnome/scribes/plugins/ColorEditor/ThemeCheckButton.py
-share/gnome/scribes/plugins/ColorEditor/ThemeCheckButton.pyo
-share/gnome/scribes/plugins/ColorEditor/TreeView.py
-share/gnome/scribes/plugins/ColorEditor/TreeView.pyo
-share/gnome/scribes/plugins/ColorEditor/Trigger.py
-share/gnome/scribes/plugins/ColorEditor/Trigger.pyo
-share/gnome/scribes/plugins/ColorEditor/UnderlineCheckButton.py
-share/gnome/scribes/plugins/ColorEditor/UnderlineCheckButton.pyo
-share/gnome/scribes/plugins/ColorEditor/Window.py
-share/gnome/scribes/plugins/ColorEditor/Window.pyo
-share/gnome/scribes/plugins/ColorEditor/__init__.py
-share/gnome/scribes/plugins/ColorEditor/__init__.pyo
-share/gnome/scribes/plugins/DocumentBrowser/i18n.py
-share/gnome/scribes/plugins/DocumentBrowser/i18n.pyo
-share/gnome/scribes/plugins/DocumentBrowser/lines.py
-share/gnome/scribes/plugins/DocumentBrowser/lines.pyo
-share/gnome/scribes/plugins/DocumentBrowser/Manager.py
-share/gnome/scribes/plugins/DocumentBrowser/Manager.pyo
-share/gnome/scribes/plugins/DocumentBrowser/Treeview.py
-share/gnome/scribes/plugins/DocumentBrowser/Treeview.pyo
-share/gnome/scribes/plugins/DocumentBrowser/Trigger.py
-share/gnome/scribes/plugins/DocumentBrowser/Trigger.pyo
-share/gnome/scribes/plugins/DocumentBrowser/Window.py
-share/gnome/scribes/plugins/DocumentBrowser/Window.pyo
-share/gnome/scribes/plugins/DocumentBrowser/__init__.py
-share/gnome/scribes/plugins/DocumentBrowser/__init__.pyo
-share/gnome/scribes/plugins/DocumentSwitcher/switcher.py
-share/gnome/scribes/plugins/DocumentSwitcher/switcher.pyo
-share/gnome/scribes/plugins/DocumentSwitcher/Trigger.py
-share/gnome/scribes/plugins/DocumentSwitcher/Trigger.pyo
-share/gnome/scribes/plugins/DocumentSwitcher/__init__.py
-share/gnome/scribes/plugins/DocumentSwitcher/__init__.pyo
-share/gnome/scribes/plugins/FindBar/CaseButton.py
-share/gnome/scribes/plugins/FindBar/CaseButton.pyo
-share/gnome/scribes/plugins/FindBar/EntryCompletion.py
-share/gnome/scribes/plugins/FindBar/EntryCompletion.pyo
-share/gnome/scribes/plugins/FindBar/Entry.py
-share/gnome/scribes/plugins/FindBar/Entry.pyo
-share/gnome/scribes/plugins/FindBar/i18n.py
-share/gnome/scribes/plugins/FindBar/i18n.pyo
-share/gnome/scribes/plugins/FindBar/Manager.py
-share/gnome/scribes/plugins/FindBar/Manager.pyo
-share/gnome/scribes/plugins/FindBar/NextButton.py
-share/gnome/scribes/plugins/FindBar/NextButton.pyo
-share/gnome/scribes/plugins/FindBar/PreviousButton.py
-share/gnome/scribes/plugins/FindBar/PreviousButton.pyo
-share/gnome/scribes/plugins/FindBar/SearchButton.py
-share/gnome/scribes/plugins/FindBar/SearchButton.pyo
-share/gnome/scribes/plugins/FindBar/StopButton.py
-share/gnome/scribes/plugins/FindBar/StopButton.pyo
-share/gnome/scribes/plugins/FindBar/Trigger.py
-share/gnome/scribes/plugins/FindBar/Trigger.pyo
-share/gnome/scribes/plugins/FindBar/WordButton.py
-share/gnome/scribes/plugins/FindBar/WordButton.pyo
-share/gnome/scribes/plugins/FindBar/__init__.py
-share/gnome/scribes/plugins/FindBar/__init__.pyo
-share/gnome/scribes/plugins/FullScreen/Trigger.py
-share/gnome/scribes/plugins/FullScreen/Trigger.pyo
-share/gnome/scribes/plugins/FullScreen/__init__.py
-share/gnome/scribes/plugins/FullScreen/__init__.pyo
-share/gnome/scribes/plugins/GotoBar/Bar.py
-share/gnome/scribes/plugins/GotoBar/Bar.pyo
-share/gnome/scribes/plugins/GotoBar/i18n.py
-share/gnome/scribes/plugins/GotoBar/i18n.pyo
-share/gnome/scribes/plugins/GotoBar/SpinButton.py
-share/gnome/scribes/plugins/GotoBar/SpinButton.pyo
-share/gnome/scribes/plugins/GotoBar/Trigger.py
-share/gnome/scribes/plugins/GotoBar/Trigger.pyo
-share/gnome/scribes/plugins/GotoBar/__init__.py
-share/gnome/scribes/plugins/GotoBar/__init__.pyo
-share/gnome/scribes/plugins/IncrementalBar/CaseButton.py
-share/gnome/scribes/plugins/IncrementalBar/CaseButton.pyo
-share/gnome/scribes/plugins/IncrementalBar/EntryCompletion.py
-share/gnome/scribes/plugins/IncrementalBar/EntryCompletion.pyo
-share/gnome/scribes/plugins/IncrementalBar/Entry.py
-share/gnome/scribes/plugins/IncrementalBar/Entry.pyo
-share/gnome/scribes/plugins/IncrementalBar/i18n.py
-share/gnome/scribes/plugins/IncrementalBar/i18n.pyo
-share/gnome/scribes/plugins/IncrementalBar/Manager.py
-share/gnome/scribes/plugins/IncrementalBar/Manager.pyo
-share/gnome/scribes/plugins/IncrementalBar/NextButton.py
-share/gnome/scribes/plugins/IncrementalBar/NextButton.pyo
-share/gnome/scribes/plugins/IncrementalBar/PreviousButton.py
-share/gnome/scribes/plugins/IncrementalBar/PreviousButton.pyo
-share/gnome/scribes/plugins/IncrementalBar/SearchButton.py
-share/gnome/scribes/plugins/IncrementalBar/SearchButton.pyo
-share/gnome/scribes/plugins/IncrementalBar/StopButton.py
-share/gnome/scribes/plugins/IncrementalBar/StopButton.pyo
-share/gnome/scribes/plugins/IncrementalBar/Trigger.py
-share/gnome/scribes/plugins/IncrementalBar/Trigger.pyo
-share/gnome/scribes/plugins/IncrementalBar/WordButton.py
-share/gnome/scribes/plugins/IncrementalBar/WordButton.pyo
-share/gnome/scribes/plugins/IncrementalBar/__init__.py
-share/gnome/scribes/plugins/IncrementalBar/__init__.pyo
-share/gnome/scribes/plugins/Indent/indent.py
-share/gnome/scribes/plugins/Indent/indent.pyo
-share/gnome/scribes/plugins/Indent/i18n.py
-share/gnome/scribes/plugins/Indent/i18n.pyo
-share/gnome/scribes/plugins/Indent/PopupMenuItem.py
-share/gnome/scribes/plugins/Indent/PopupMenuItem.pyo
-share/gnome/scribes/plugins/Indent/Trigger.py
-share/gnome/scribes/plugins/Indent/Trigger.pyo
-share/gnome/scribes/plugins/Indent/unindent.py
-share/gnome/scribes/plugins/Indent/unindent.pyo
-share/gnome/scribes/plugins/Indent/__init__.py
-share/gnome/scribes/plugins/Indent/__init__.pyo
-share/gnome/scribes/plugins/LexicalScopeHighlight/Highlight.py
-share/gnome/scribes/plugins/LexicalScopeHighlight/Highlight.pyo
-share/gnome/scribes/plugins/LexicalScopeHighlight/__init__.py
-share/gnome/scribes/plugins/LexicalScopeHighlight/__init__.pyo
-share/gnome/scribes/plugins/Lines/i18n.py
-share/gnome/scribes/plugins/Lines/i18n.pyo
-share/gnome/scribes/plugins/Lines/lines.py
-share/gnome/scribes/plugins/Lines/lines.pyo
-share/gnome/scribes/plugins/Lines/PopupMenuItem.py
-share/gnome/scribes/plugins/Lines/PopupMenuItem.pyo
-share/gnome/scribes/plugins/Lines/Trigger.py
-share/gnome/scribes/plugins/Lines/Trigger.pyo
-share/gnome/scribes/plugins/Lines/__init__.py
-share/gnome/scribes/plugins/Lines/__init__.pyo
-share/gnome/scribes/plugins/MatchingBracket/i18n.py
-share/gnome/scribes/plugins/MatchingBracket/i18n.pyo
-share/gnome/scribes/plugins/MatchingBracket/Trigger.py
-share/gnome/scribes/plugins/MatchingBracket/Trigger.pyo
-share/gnome/scribes/plugins/MatchingBracket/__init__.py
-share/gnome/scribes/plugins/MatchingBracket/__init__.pyo
-share/gnome/scribes/plugins/NewWindow/Trigger.py
-share/gnome/scribes/plugins/NewWindow/Trigger.pyo
-share/gnome/scribes/plugins/NewWindow/__init__.py
-share/gnome/scribes/plugins/NewWindow/__init__.pyo
-share/gnome/scribes/plugins/OpenDialog/Dialog.glade
-share/gnome/scribes/plugins/OpenDialog/Dialog.py
-share/gnome/scribes/plugins/OpenDialog/Dialog.pyo
-share/gnome/scribes/plugins/OpenDialog/i18n.py
-share/gnome/scribes/plugins/OpenDialog/i18n.pyo
-share/gnome/scribes/plugins/OpenDialog/Trigger.py
-share/gnome/scribes/plugins/OpenDialog/Trigger.pyo
-share/gnome/scribes/plugins/OpenDialog/__init__.py
-share/gnome/scribes/plugins/OpenDialog/__init__.pyo
-share/gnome/scribes/plugins/Paragraph/i18n.py
-share/gnome/scribes/plugins/Paragraph/i18n.pyc
-share/gnome/scribes/plugins/Paragraph/i18n.pyo
-share/gnome/scribes/plugins/Paragraph/Manager.py
-share/gnome/scribes/plugins/Paragraph/Manager.pyc
-share/gnome/scribes/plugins/Paragraph/Manager.pyo
-share/gnome/scribes/plugins/Paragraph/PopupMenuItem.py
-share/gnome/scribes/plugins/Paragraph/PopupMenuItem.pyc
-share/gnome/scribes/plugins/Paragraph/PopupMenuItem.pyo
-share/gnome/scribes/plugins/Paragraph/Trigger.py
-share/gnome/scribes/plugins/Paragraph/Trigger.pyc
-share/gnome/scribes/plugins/Paragraph/Trigger.pyo
-share/gnome/scribes/plugins/Paragraph/.__junk
-share/gnome/scribes/plugins/Paragraph/__init__.py
-share/gnome/scribes/plugins/Paragraph/__init__.pyc
-share/gnome/scribes/plugins/Paragraph/__init__.pyo
-share/gnome/scribes/plugins/PluginAbout.py
-share/gnome/scribes/plugins/PluginAbout.pyo
-share/gnome/scribes/plugins/PluginAutoReplaceGUI.py
-share/gnome/scribes/plugins/PluginAutoReplaceGUI.pyo
-share/gnome/scribes/plugins/PluginAutoReplace.py
-share/gnome/scribes/plugins/PluginAutoReplace.pyo
-share/gnome/scribes/plugins/PluginBookmarkBrowser.py
-share/gnome/scribes/plugins/PluginBookmarkBrowser.pyo
-share/gnome/scribes/plugins/PluginBookmark.py
-share/gnome/scribes/plugins/PluginBookmark.pyo
-share/gnome/scribes/plugins/PluginBracketCompletion.py
-share/gnome/scribes/plugins/PluginBracketCompletion.pyo
-share/gnome/scribes/plugins/PluginBracketSelection.py
-share/gnome/scribes/plugins/PluginBracketSelection.pyo
-share/gnome/scribes/plugins/PluginCase.py
-share/gnome/scribes/plugins/PluginCase.pyo
-share/gnome/scribes/plugins/PluginCloseWindow.py
-share/gnome/scribes/plugins/PluginCloseWindow.pyo
-share/gnome/scribes/plugins/PluginColorEditor.py
-share/gnome/scribes/plugins/PluginColorEditor.pyo
-share/gnome/scribes/plugins/PluginDocumentBrowser.py
-share/gnome/scribes/plugins/PluginDocumentBrowser.pyo
-share/gnome/scribes/plugins/PluginDocumentSwitcher.py
-share/gnome/scribes/plugins/PluginDocumentSwitcher.pyo
-share/gnome/scribes/plugins/PluginFindBar.py
-share/gnome/scribes/plugins/PluginFindBar.pyo
-share/gnome/scribes/plugins/PluginFullScreen.py
-share/gnome/scribes/plugins/PluginFullScreen.pyo
-share/gnome/scribes/plugins/PluginGotoBar.py
-share/gnome/scribes/plugins/PluginGotoBar.pyo
-share/gnome/scribes/plugins/PluginIncrementalBar.py
-share/gnome/scribes/plugins/PluginIncrementalBar.pyo
-share/gnome/scribes/plugins/PluginIndent.py
-share/gnome/scribes/plugins/PluginIndent.pyo
-share/gnome/scribes/plugins/PluginLexicalScopeHighlight.py
-share/gnome/scribes/plugins/PluginLexicalScopeHighlight.pyo
-share/gnome/scribes/plugins/PluginLines.py
-share/gnome/scribes/plugins/PluginLines.pyo
-share/gnome/scribes/plugins/PluginMatchingBracket.py
-share/gnome/scribes/plugins/PluginMatchingBracket.pyo
-share/gnome/scribes/plugins/PluginNewWindow.py
-share/gnome/scribes/plugins/PluginNewWindow.pyo
-share/gnome/scribes/plugins/PluginOpenDialog.py
-share/gnome/scribes/plugins/PluginOpenDialog.pyo
-share/gnome/scribes/plugins/PluginParagraph.py
-share/gnome/scribes/plugins/PluginParagraph.pyo
-share/gnome/scribes/plugins/PluginPreferences.py
-share/gnome/scribes/plugins/PluginPreferences.pyo
-share/gnome/scribes/plugins/PluginPrintDialog.py
-share/gnome/scribes/plugins/PluginPrintDialog.pyo
-share/gnome/scribes/plugins/PluginReadOnly.py
-share/gnome/scribes/plugins/PluginReadOnly.pyo
-share/gnome/scribes/plugins/PluginRecentMenu.py
-share/gnome/scribes/plugins/PluginRecentMenu.pyo
-share/gnome/scribes/plugins/PluginRemoteDialog.py
-share/gnome/scribes/plugins/PluginRemoteDialog.pyo
-share/gnome/scribes/plugins/PluginReplaceBar.py
-share/gnome/scribes/plugins/PluginReplaceBar.pyo
-share/gnome/scribes/plugins/PluginSaveDialog.py
-share/gnome/scribes/plugins/PluginSaveDialog.pyo
-share/gnome/scribes/plugins/PluginSaveFile.py
-share/gnome/scribes/plugins/PluginSaveFile.pyo
-share/gnome/scribes/plugins/PluginScrollNavigation.py
-share/gnome/scribes/plugins/PluginScrollNavigation.pyo
-share/gnome/scribes/plugins/PluginSearchPreviousNext.py
-share/gnome/scribes/plugins/PluginSearchPreviousNext.pyo
-share/gnome/scribes/plugins/PluginSearchReplace.py
-share/gnome/scribes/plugins/PluginSearchReplace.pyo
-share/gnome/scribes/plugins/PluginSelection.py
-share/gnome/scribes/plugins/PluginSelection.pyo
-share/gnome/scribes/plugins/PluginSpaces.py
-share/gnome/scribes/plugins/PluginSpaces.pyo
-share/gnome/scribes/plugins/PluginSpellCheck.py
-share/gnome/scribes/plugins/PluginSpellCheck.pyo
-share/gnome/scribes/plugins/PluginSyntaxColorSwitcher.py
-share/gnome/scribes/plugins/PluginSyntaxColorSwitcher.pyo
-share/gnome/scribes/plugins/PluginTemplateEditor.py
-share/gnome/scribes/plugins/PluginTemplateEditor.pyo
-share/gnome/scribes/plugins/PluginTemplates.py
-share/gnome/scribes/plugins/PluginTemplates.pyo
-share/gnome/scribes/plugins/PluginToolbarVisibility.py
-share/gnome/scribes/plugins/PluginToolbarVisibility.pyo
-share/gnome/scribes/plugins/PluginUndoRedo.py
-share/gnome/scribes/plugins/PluginUndoRedo.pyo
-share/gnome/scribes/plugins/PluginUserGuide.py
-share/gnome/scribes/plugins/PluginUserGuide.pyo
-share/gnome/scribes/plugins/PluginWordCompletionGUI.py
-share/gnome/scribes/plugins/PluginWordCompletionGUI.pyo
-share/gnome/scribes/plugins/PluginWordCompletion.py
-share/gnome/scribes/plugins/PluginWordCompletion.pyo
-share/gnome/scribes/plugins/Preferences/FontButton.py
-share/gnome/scribes/plugins/Preferences/FontButton.pyo
-share/gnome/scribes/plugins/Preferences/i18n.py
-share/gnome/scribes/plugins/Preferences/i18n.pyo
-share/gnome/scribes/plugins/Preferences/Manager.py
-share/gnome/scribes/plugins/Preferences/Manager.pyo
-share/gnome/scribes/plugins/Preferences/MarginCheckButton.py
-share/gnome/scribes/plugins/Preferences/MarginCheckButton.pyo
-share/gnome/scribes/plugins/Preferences/MarginSpinButton.py
-share/gnome/scribes/plugins/Preferences/MarginSpinButton.pyo
-share/gnome/scribes/plugins/Preferences/SpellCheckButton.py
-share/gnome/scribes/plugins/Preferences/SpellCheckButton.pyo
-share/gnome/scribes/plugins/Preferences/TabCheckButton.py
-share/gnome/scribes/plugins/Preferences/TabCheckButton.pyo
-share/gnome/scribes/plugins/Preferences/TabSpinButton.py
-share/gnome/scribes/plugins/Preferences/TabSpinButton.pyo
-share/gnome/scribes/plugins/Preferences/Trigger.py
-share/gnome/scribes/plugins/Preferences/Trigger.pyo
-share/gnome/scribes/plugins/Preferences/Window.py
-share/gnome/scribes/plugins/Preferences/Window.pyo
-share/gnome/scribes/plugins/Preferences/WrapCheckButton.py
-share/gnome/scribes/plugins/Preferences/WrapCheckButton.pyo
-share/gnome/scribes/plugins/Preferences/__init__.py
-share/gnome/scribes/plugins/Preferences/__init__.pyo
-share/gnome/scribes/plugins/PrintDialog/Dialog.py
-share/gnome/scribes/plugins/PrintDialog/Dialog.pyo
-share/gnome/scribes/plugins/PrintDialog/i18n.py
-share/gnome/scribes/plugins/PrintDialog/i18n.pyo
-share/gnome/scribes/plugins/PrintDialog/Job.py
-share/gnome/scribes/plugins/PrintDialog/Job.pyo
-share/gnome/scribes/plugins/PrintDialog/Preview.py
-share/gnome/scribes/plugins/PrintDialog/Preview.pyo
-share/gnome/scribes/plugins/PrintDialog/Trigger.py
-share/gnome/scribes/plugins/PrintDialog/Trigger.pyo
-share/gnome/scribes/plugins/PrintDialog/__init__.py
-share/gnome/scribes/plugins/PrintDialog/__init__.pyo
-share/gnome/scribes/plugins/ReadOnly/i18n.py
-share/gnome/scribes/plugins/ReadOnly/i18n.pyo
-share/gnome/scribes/plugins/ReadOnly/Trigger.py
-share/gnome/scribes/plugins/ReadOnly/Trigger.pyo
-share/gnome/scribes/plugins/ReadOnly/__init__.py
-share/gnome/scribes/plugins/ReadOnly/__init__.pyo
-share/gnome/scribes/plugins/RecentMenu/Trigger.py
-share/gnome/scribes/plugins/RecentMenu/Trigger.pyo
-share/gnome/scribes/plugins/RecentMenu/__init__.py
-share/gnome/scribes/plugins/RecentMenu/__init__.pyo
-share/gnome/scribes/plugins/RemoteDialog/comboboxentry.py
-share/gnome/scribes/plugins/RemoteDialog/comboboxentry.pyo
-share/gnome/scribes/plugins/RemoteDialog/Dialog.py
-share/gnome/scribes/plugins/RemoteDialog/Dialog.pyo
-share/gnome/scribes/plugins/RemoteDialog/i18n.py
-share/gnome/scribes/plugins/RemoteDialog/i18n.pyo
-share/gnome/scribes/plugins/RemoteDialog/Trigger.py
-share/gnome/scribes/plugins/RemoteDialog/Trigger.pyo
-share/gnome/scribes/plugins/RemoteDialog/__init__.py
-share/gnome/scribes/plugins/RemoteDialog/__init__.pyo
-share/gnome/scribes/plugins/ReplaceBar/CaseButton.py
-share/gnome/scribes/plugins/ReplaceBar/CaseButton.pyo
-share/gnome/scribes/plugins/ReplaceBar/EntryCompletion.py
-share/gnome/scribes/plugins/ReplaceBar/EntryCompletion.pyo
-share/gnome/scribes/plugins/ReplaceBar/Entry.py
-share/gnome/scribes/plugins/ReplaceBar/Entry.pyo
-share/gnome/scribes/plugins/ReplaceBar/IncrementalButton.py
-share/gnome/scribes/plugins/ReplaceBar/IncrementalButton.pyo
-share/gnome/scribes/plugins/ReplaceBar/i18n.py
-share/gnome/scribes/plugins/ReplaceBar/i18n.pyo
-share/gnome/scribes/plugins/ReplaceBar/Manager.py
-share/gnome/scribes/plugins/ReplaceBar/Manager.pyo
-share/gnome/scribes/plugins/ReplaceBar/NextButton.py
-share/gnome/scribes/plugins/ReplaceBar/NextButton.pyo
-share/gnome/scribes/plugins/ReplaceBar/PreviousButton.py
-share/gnome/scribes/plugins/ReplaceBar/PreviousButton.pyo
-share/gnome/scribes/plugins/ReplaceBar/ReplaceAllButton.py
-share/gnome/scribes/plugins/ReplaceBar/ReplaceAllButton.pyo
-share/gnome/scribes/plugins/ReplaceBar/ReplaceButton.py
-share/gnome/scribes/plugins/ReplaceBar/ReplaceButton.pyo
-share/gnome/scribes/plugins/ReplaceBar/ReplaceEntry.py
-share/gnome/scribes/plugins/ReplaceBar/ReplaceEntry.pyo
-share/gnome/scribes/plugins/ReplaceBar/ReplaceStopButton.py
-share/gnome/scribes/plugins/ReplaceBar/ReplaceStopButton.pyo
-share/gnome/scribes/plugins/ReplaceBar/SearchButton.py
-share/gnome/scribes/plugins/ReplaceBar/SearchButton.pyo
-share/gnome/scribes/plugins/ReplaceBar/StopButton.py
-share/gnome/scribes/plugins/ReplaceBar/StopButton.pyo
-share/gnome/scribes/plugins/ReplaceBar/Trigger.py
-share/gnome/scribes/plugins/ReplaceBar/Trigger.pyo
-share/gnome/scribes/plugins/ReplaceBar/WordButton.py
-share/gnome/scribes/plugins/ReplaceBar/WordButton.pyo
-share/gnome/scribes/plugins/ReplaceBar/__init__.py
-share/gnome/scribes/plugins/ReplaceBar/__init__.pyo
-share/gnome/scribes/plugins/SaveDialog/Dialog.glade
-share/gnome/scribes/plugins/SaveDialog/Dialog.py
-share/gnome/scribes/plugins/SaveDialog/Dialog.pyo
-share/gnome/scribes/plugins/SaveDialog/i18n.py
-share/gnome/scribes/plugins/SaveDialog/i18n.pyo
-share/gnome/scribes/plugins/SaveDialog/Rename.py
-share/gnome/scribes/plugins/SaveDialog/Rename.pyo
-share/gnome/scribes/plugins/SaveDialog/Trigger.py
-share/gnome/scribes/plugins/SaveDialog/Trigger.pyo
-share/gnome/scribes/plugins/SaveDialog/__init__.py
-share/gnome/scribes/plugins/SaveDialog/__init__.pyo
-share/gnome/scribes/plugins/SaveFile/i18n.py
-share/gnome/scribes/plugins/SaveFile/i18n.pyo
-share/gnome/scribes/plugins/SaveFile/Trigger.py
-share/gnome/scribes/plugins/SaveFile/Trigger.pyo
-share/gnome/scribes/plugins/SaveFile/__init__.py
-share/gnome/scribes/plugins/SaveFile/__init__.pyo
-share/gnome/scribes/plugins/ScrollNavigation/i18n.py
-share/gnome/scribes/plugins/ScrollNavigation/i18n.pyc
-share/gnome/scribes/plugins/ScrollNavigation/i18n.pyo
-share/gnome/scribes/plugins/ScrollNavigation/Manager.py
-share/gnome/scribes/plugins/ScrollNavigation/Manager.pyc
-share/gnome/scribes/plugins/ScrollNavigation/Manager.pyo
-share/gnome/scribes/plugins/ScrollNavigation/Trigger.py
-share/gnome/scribes/plugins/ScrollNavigation/Trigger.pyc
-share/gnome/scribes/plugins/ScrollNavigation/Trigger.pyo
-share/gnome/scribes/plugins/ScrollNavigation/.__junk
-share/gnome/scribes/plugins/ScrollNavigation/__init__.py
-share/gnome/scribes/plugins/ScrollNavigation/__init__.pyc
-share/gnome/scribes/plugins/ScrollNavigation/__init__.pyo
-share/gnome/scribes/plugins/SearchPreviousNext/i18n.py
-share/gnome/scribes/plugins/SearchPreviousNext/i18n.pyo
-share/gnome/scribes/plugins/SearchPreviousNext/Next.py
-share/gnome/scribes/plugins/SearchPreviousNext/Next.pyo
-share/gnome/scribes/plugins/SearchPreviousNext/Previous.py
-share/gnome/scribes/plugins/SearchPreviousNext/Previous.pyo
-share/gnome/scribes/plugins/SearchPreviousNext/searchnexttrigger.py
-share/gnome/scribes/plugins/SearchPreviousNext/searchnexttrigger.pyo
-share/gnome/scribes/plugins/SearchPreviousNext/searchnext.py
-share/gnome/scribes/plugins/SearchPreviousNext/searchnext.pyo
-share/gnome/scribes/plugins/SearchPreviousNext/searchprevioustrigger.py
-share/gnome/scribes/plugins/SearchPreviousNext/searchprevioustrigger.pyo
-share/gnome/scribes/plugins/SearchPreviousNext/searchprevious.py
-share/gnome/scribes/plugins/SearchPreviousNext/searchprevious.pyo
-share/gnome/scribes/plugins/SearchPreviousNext/Trigger.py
-share/gnome/scribes/plugins/SearchPreviousNext/Trigger.pyo
-share/gnome/scribes/plugins/SearchPreviousNext/__init__.py
-share/gnome/scribes/plugins/SearchPreviousNext/__init__.pyo
-share/gnome/scribes/plugins/SearchReplace/i18n.py
-share/gnome/scribes/plugins/SearchReplace/i18n.pyo
-share/gnome/scribes/plugins/SearchReplace/Manager.py
-share/gnome/scribes/plugins/SearchReplace/Manager.pyo
-share/gnome/scribes/plugins/SearchReplace/Trigger.py
-share/gnome/scribes/plugins/SearchReplace/Trigger.pyo
-share/gnome/scribes/plugins/SearchReplace/__init__.py
-share/gnome/scribes/plugins/SearchReplace/__init__.pyo
-share/gnome/scribes/plugins/Selection/i18n.py
-share/gnome/scribes/plugins/Selection/i18n.pyo
-share/gnome/scribes/plugins/Selection/lines.py
-share/gnome/scribes/plugins/Selection/lines.pyo
-share/gnome/scribes/plugins/Selection/Manager.py
-share/gnome/scribes/plugins/Selection/Manager.pyo
-share/gnome/scribes/plugins/Selection/paragraph.py
-share/gnome/scribes/plugins/Selection/paragraph.pyo
-share/gnome/scribes/plugins/Selection/PopupMenuItem.py
-share/gnome/scribes/plugins/Selection/PopupMenuItem.pyo
-share/gnome/scribes/plugins/Selection/sentence.py
-share/gnome/scribes/plugins/Selection/sentence.pyo
-share/gnome/scribes/plugins/Selection/Trigger.py
-share/gnome/scribes/plugins/Selection/Trigger.pyo
-share/gnome/scribes/plugins/Selection/word.py
-share/gnome/scribes/plugins/Selection/word.pyo
-share/gnome/scribes/plugins/Selection/__init__.py
-share/gnome/scribes/plugins/Selection/__init__.pyo
-share/gnome/scribes/plugins/Spaces/i18n.py
-share/gnome/scribes/plugins/Spaces/i18n.pyo
-share/gnome/scribes/plugins/Spaces/PopupMenuItem.py
-share/gnome/scribes/plugins/Spaces/PopupMenuItem.pyo
-share/gnome/scribes/plugins/Spaces/spaces.py
-share/gnome/scribes/plugins/Spaces/spaces.pyo
-share/gnome/scribes/plugins/Spaces/Trigger.py
-share/gnome/scribes/plugins/Spaces/Trigger.pyo
-share/gnome/scribes/plugins/Spaces/__init__.py
-share/gnome/scribes/plugins/Spaces/__init__.pyo
-share/gnome/scribes/plugins/SpellCheck/i18n.py
-share/gnome/scribes/plugins/SpellCheck/i18n.pyo
-share/gnome/scribes/plugins/SpellCheck/Trigger.py
-share/gnome/scribes/plugins/SpellCheck/Trigger.pyo
-share/gnome/scribes/plugins/SpellCheck/__init__.py
-share/gnome/scribes/plugins/SpellCheck/__init__.pyo
-share/gnome/scribes/plugins/SyntaxColorSwitcher/Exceptions.py
-share/gnome/scribes/plugins/SyntaxColorSwitcher/Exceptions.pyo
-share/gnome/scribes/plugins/SyntaxColorSwitcher/i18n.py
-share/gnome/scribes/plugins/SyntaxColorSwitcher/i18n.pyo
-share/gnome/scribes/plugins/SyntaxColorSwitcher/Manager.py
-share/gnome/scribes/plugins/SyntaxColorSwitcher/Manager.pyo
-share/gnome/scribes/plugins/SyntaxColorSwitcher/Metadata.py
-share/gnome/scribes/plugins/SyntaxColorSwitcher/Metadata.pyo
-share/gnome/scribes/plugins/SyntaxColorSwitcher/PopupMenuItem.py
-share/gnome/scribes/plugins/SyntaxColorSwitcher/PopupMenuItem.pyo
-share/gnome/scribes/plugins/SyntaxColorSwitcher/Syntax.py
-share/gnome/scribes/plugins/SyntaxColorSwitcher/Syntax.pyo
-share/gnome/scribes/plugins/SyntaxColorSwitcher/__init__.py
-share/gnome/scribes/plugins/SyntaxColorSwitcher/__init__.pyo
-share/gnome/scribes/plugins/TemplateEditor/AddButton.py
-share/gnome/scribes/plugins/TemplateEditor/AddButton.pyo
-share/gnome/scribes/plugins/TemplateEditor/AddDialog.py
-share/gnome/scribes/plugins/TemplateEditor/AddDialog.pyo
-share/gnome/scribes/plugins/TemplateEditor/DescriptionTreeView.py
-share/gnome/scribes/plugins/TemplateEditor/DescriptionTreeView.pyo
-share/gnome/scribes/plugins/TemplateEditor/EditButton.py
-share/gnome/scribes/plugins/TemplateEditor/EditButton.pyo
-share/gnome/scribes/plugins/TemplateEditor/EditDialog.py
-share/gnome/scribes/plugins/TemplateEditor/EditDialog.pyo
-share/gnome/scribes/plugins/TemplateEditor/Editor.py
-share/gnome/scribes/plugins/TemplateEditor/Editor.pyo
-share/gnome/scribes/plugins/TemplateEditor/Exceptions.py
-share/gnome/scribes/plugins/TemplateEditor/Exceptions.pyo
-share/gnome/scribes/plugins/TemplateEditor/ExportButton.py
-share/gnome/scribes/plugins/TemplateEditor/ExportButton.pyo
-share/gnome/scribes/plugins/TemplateEditor/ExportDialog.py
-share/gnome/scribes/plugins/TemplateEditor/ExportDialog.pyo
-share/gnome/scribes/plugins/TemplateEditor/HelpButton.py
-share/gnome/scribes/plugins/TemplateEditor/HelpButton.pyo
-share/gnome/scribes/plugins/TemplateEditor/ImportButton.py
-share/gnome/scribes/plugins/TemplateEditor/ImportButton.pyo
-share/gnome/scribes/plugins/TemplateEditor/ImportDialog.py
-share/gnome/scribes/plugins/TemplateEditor/ImportDialog.pyo
-share/gnome/scribes/plugins/TemplateEditor/ImportTemplate.py
-share/gnome/scribes/plugins/TemplateEditor/ImportTemplate.pyo
-share/gnome/scribes/plugins/TemplateEditor/i18n.py
-share/gnome/scribes/plugins/TemplateEditor/i18n.pyo
-share/gnome/scribes/plugins/TemplateEditor/LanguageTreeView.py
-share/gnome/scribes/plugins/TemplateEditor/LanguageTreeView.pyo
-share/gnome/scribes/plugins/TemplateEditor/LinkButton.py
-share/gnome/scribes/plugins/TemplateEditor/LinkButton.pyo
-share/gnome/scribes/plugins/TemplateEditor/Manager.py
-share/gnome/scribes/plugins/TemplateEditor/Manager.pyo
-share/gnome/scribes/plugins/TemplateEditor/MenuItem.py
-share/gnome/scribes/plugins/TemplateEditor/MenuItem.pyo
-share/gnome/scribes/plugins/TemplateEditor/Metadata.py
-share/gnome/scribes/plugins/TemplateEditor/Metadata.pyo
-share/gnome/scribes/plugins/TemplateEditor/NoImage.png
-share/gnome/scribes/plugins/TemplateEditor/Preview.py
-share/gnome/scribes/plugins/TemplateEditor/Preview.pyo
-share/gnome/scribes/plugins/TemplateEditor/ReadXMLTemplate.py
-share/gnome/scribes/plugins/TemplateEditor/ReadXMLTemplate.pyo
-share/gnome/scribes/plugins/TemplateEditor/RemoveButton.py
-share/gnome/scribes/plugins/TemplateEditor/RemoveButton.pyo
-share/gnome/scribes/plugins/TemplateEditor/Template.glade
-share/gnome/scribes/plugins/TemplateEditor/Trigger.py
-share/gnome/scribes/plugins/TemplateEditor/Trigger.pyo
-share/gnome/scribes/plugins/TemplateEditor/utils.py
-share/gnome/scribes/plugins/TemplateEditor/utils.pyo
-share/gnome/scribes/plugins/TemplateEditor/Window.py
-share/gnome/scribes/plugins/TemplateEditor/Window.pyo
-share/gnome/scribes/plugins/TemplateEditor/WriteXMLTemplate.py
-share/gnome/scribes/plugins/TemplateEditor/WriteXMLTemplate.pyo
-share/gnome/scribes/plugins/TemplateEditor/__init__.py
-share/gnome/scribes/plugins/TemplateEditor/__init__.pyo
-share/gnome/scribes/plugins/Templates/Factory.py
-share/gnome/scribes/plugins/Templates/Factory.pyo
-share/gnome/scribes/plugins/Templates/Highlighter.py
-share/gnome/scribes/plugins/Templates/Highlighter.pyo
-share/gnome/scribes/plugins/Templates/i18n.py
-share/gnome/scribes/plugins/Templates/i18n.pyo
-share/gnome/scribes/plugins/Templates/Loader.py
-share/gnome/scribes/plugins/Templates/Loader.pyo
-share/gnome/scribes/plugins/Templates/Manager.py
-share/gnome/scribes/plugins/Templates/Manager.pyo
-share/gnome/scribes/plugins/Templates/Metadata.py
-share/gnome/scribes/plugins/Templates/Metadata.pyo
-share/gnome/scribes/plugins/Templates/Monitor.py
-share/gnome/scribes/plugins/Templates/Monitor.pyo
-share/gnome/scribes/plugins/Templates/Processor.py
-share/gnome/scribes/plugins/Templates/Processor.pyo
-share/gnome/scribes/plugins/Templates/utils.py
-share/gnome/scribes/plugins/Templates/utils.pyo
-share/gnome/scribes/plugins/Templates/__init__.py
-share/gnome/scribes/plugins/Templates/__init__.pyo
-share/gnome/scribes/plugins/ToolbarVisibility/i18n.py
-share/gnome/scribes/plugins/ToolbarVisibility/i18n.pyo
-share/gnome/scribes/plugins/ToolbarVisibility/Trigger.py
-share/gnome/scribes/plugins/ToolbarVisibility/Trigger.pyo
-share/gnome/scribes/plugins/ToolbarVisibility/__init__.py
-share/gnome/scribes/plugins/ToolbarVisibility/__init__.pyo
-share/gnome/scribes/plugins/UndoRedo/i18n.py
-share/gnome/scribes/plugins/UndoRedo/i18n.pyo
-share/gnome/scribes/plugins/UndoRedo/Trigger.py
-share/gnome/scribes/plugins/UndoRedo/Trigger.pyo
-share/gnome/scribes/plugins/UndoRedo/__init__.py
-share/gnome/scribes/plugins/UndoRedo/__init__.pyo
-share/gnome/scribes/plugins/UserGuide/i18n.py
-share/gnome/scribes/plugins/UserGuide/i18n.pyo
-share/gnome/scribes/plugins/UserGuide/Trigger.py
-share/gnome/scribes/plugins/UserGuide/Trigger.pyo
-share/gnome/scribes/plugins/UserGuide/__init__.py
-share/gnome/scribes/plugins/UserGuide/__init__.pyo
-share/gnome/scribes/plugins/WordCompletionGUI/i18n.py
-share/gnome/scribes/plugins/WordCompletionGUI/i18n.pyo
-share/gnome/scribes/plugins/WordCompletionGUI/Manager.py
-share/gnome/scribes/plugins/WordCompletionGUI/Manager.pyo
-share/gnome/scribes/plugins/WordCompletionGUI/ScrollWin.py
-share/gnome/scribes/plugins/WordCompletionGUI/ScrollWin.pyo
-share/gnome/scribes/plugins/WordCompletionGUI/TreeView.py
-share/gnome/scribes/plugins/WordCompletionGUI/TreeView.pyo
-share/gnome/scribes/plugins/WordCompletionGUI/Window.py
-share/gnome/scribes/plugins/WordCompletionGUI/Window.pyo
-share/gnome/scribes/plugins/WordCompletionGUI/__init__.py
-share/gnome/scribes/plugins/WordCompletionGUI/__init__.pyo
-share/gnome/scribes/plugins/WordCompletion/DBusService.py
-share/gnome/scribes/plugins/WordCompletion/DBusService.pyo
-share/gnome/scribes/plugins/WordCompletion/Indexer.py
-share/gnome/scribes/plugins/WordCompletion/Indexer.pyo
-share/gnome/scribes/plugins/WordCompletion/Manager.py
-share/gnome/scribes/plugins/WordCompletion/Manager.pyo
-share/gnome/scribes/plugins/WordCompletion/Monitor.py
-share/gnome/scribes/plugins/WordCompletion/Monitor.pyo
-share/gnome/scribes/plugins/WordCompletion/Updater.py
-share/gnome/scribes/plugins/WordCompletion/Updater.pyo
-share/gnome/scribes/plugins/WordCompletion/__init__.py
-share/gnome/scribes/plugins/WordCompletion/__init__.pyo
-share/gnome/scribes/plugins/__init__.py
-share/gnome/scribes/plugins/__init__.pyo
-share/gnome/scribes/throbber-active.gif
-share/gnome/scribes/throbber-inactive.png
+share/omf/scribes/scribes-C.omf
+share/pixmaps/scribes.png
+share/scribes/ModificationDialog.glade
+share/scribes/bookmarks.png
+share/scribes/plugins/About/AboutDialog.py
+share/scribes/plugins/About/AboutDialog.pyo
+share/scribes/plugins/About/i18n.py
+share/scribes/plugins/About/i18n.pyo
+share/scribes/plugins/About/PopupMenuItem.py
+share/scribes/plugins/About/PopupMenuItem.pyo
+share/scribes/plugins/About/Trigger.py
+share/scribes/plugins/About/Trigger.pyo
+share/scribes/plugins/About/__init__.py
+share/scribes/plugins/About/__init__.pyo
+share/scribes/plugins/AutoReplaceGUI/AddButton.py
+share/scribes/plugins/AutoReplaceGUI/AddButton.pyo
+share/scribes/plugins/AutoReplaceGUI/EditButton.py
+share/scribes/plugins/AutoReplaceGUI/EditButton.pyo
+share/scribes/plugins/AutoReplaceGUI/i18n.py
+share/scribes/plugins/AutoReplaceGUI/i18n.pyo
+share/scribes/plugins/AutoReplaceGUI/Manager.py
+share/scribes/plugins/AutoReplaceGUI/Manager.pyo
+share/scribes/plugins/AutoReplaceGUI/MenuItem.py
+share/scribes/plugins/AutoReplaceGUI/MenuItem.pyo
+share/scribes/plugins/AutoReplaceGUI/RemoveButton.py
+share/scribes/plugins/AutoReplaceGUI/RemoveButton.pyo
+share/scribes/plugins/AutoReplaceGUI/Treeview.py
+share/scribes/plugins/AutoReplaceGUI/Treeview.pyo
+share/scribes/plugins/AutoReplaceGUI/Trigger.py
+share/scribes/plugins/AutoReplaceGUI/Trigger.pyo
+share/scribes/plugins/AutoReplaceGUI/Window.py
+share/scribes/plugins/AutoReplaceGUI/Window.pyo
+share/scribes/plugins/AutoReplaceGUI/__init__.py
+share/scribes/plugins/AutoReplaceGUI/__init__.pyo
+share/scribes/plugins/AutoReplace/Expander.py
+share/scribes/plugins/AutoReplace/Expander.pyo
+share/scribes/plugins/AutoReplace/i18n.py
+share/scribes/plugins/AutoReplace/i18n.pyo
+share/scribes/plugins/AutoReplace/Manager.py
+share/scribes/plugins/AutoReplace/Manager.pyo
+share/scribes/plugins/AutoReplace/Monitor.py
+share/scribes/plugins/AutoReplace/Monitor.pyo
+share/scribes/plugins/AutoReplace/__init__.py
+share/scribes/plugins/AutoReplace/__init__.pyo
+share/scribes/plugins/BookmarkBrowser/i18n.py
+share/scribes/plugins/BookmarkBrowser/i18n.pyo
+share/scribes/plugins/BookmarkBrowser/lines.py
+share/scribes/plugins/BookmarkBrowser/lines.pyo
+share/scribes/plugins/BookmarkBrowser/Manager.py
+share/scribes/plugins/BookmarkBrowser/Manager.pyo
+share/scribes/plugins/BookmarkBrowser/Treeview.py
+share/scribes/plugins/BookmarkBrowser/Treeview.pyo
+share/scribes/plugins/BookmarkBrowser/Trigger.py
+share/scribes/plugins/BookmarkBrowser/Trigger.pyo
+share/scribes/plugins/BookmarkBrowser/Window.py
+share/scribes/plugins/BookmarkBrowser/Window.pyo
+share/scribes/plugins/BookmarkBrowser/__init__.py
+share/scribes/plugins/BookmarkBrowser/__init__.pyo
+share/scribes/plugins/Bookmark/BookmarkMetadata.py
+share/scribes/plugins/Bookmark/BookmarkMetadata.pyo
+share/scribes/plugins/Bookmark/i18n.py
+share/scribes/plugins/Bookmark/i18n.pyo
+share/scribes/plugins/Bookmark/Manager.py
+share/scribes/plugins/Bookmark/Manager.pyo
+share/scribes/plugins/Bookmark/PopupMenuItem.py
+share/scribes/plugins/Bookmark/PopupMenuItem.pyo
+share/scribes/plugins/Bookmark/Trigger.py
+share/scribes/plugins/Bookmark/Trigger.pyo
+share/scribes/plugins/Bookmark/__init__.py
+share/scribes/plugins/Bookmark/__init__.pyo
+share/scribes/plugins/BracketCompletion/i18n.py
+share/scribes/plugins/BracketCompletion/i18n.pyo
+share/scribes/plugins/BracketCompletion/Manager.py
+share/scribes/plugins/BracketCompletion/Manager.pyo
+share/scribes/plugins/BracketCompletion/__init__.py
+share/scribes/plugins/BracketCompletion/__init__.pyo
+share/scribes/plugins/BracketSelection/i18n.py
+share/scribes/plugins/BracketSelection/i18n.pyo
+share/scribes/plugins/BracketSelection/Trigger.py
+share/scribes/plugins/BracketSelection/Trigger.pyo
+share/scribes/plugins/BracketSelection/__init__.py
+share/scribes/plugins/BracketSelection/__init__.pyo
+share/scribes/plugins/Case/case.py
+share/scribes/plugins/Case/case.pyo
+share/scribes/plugins/Case/i18n.py
+share/scribes/plugins/Case/i18n.pyo
+share/scribes/plugins/Case/PopupMenuItem.py
+share/scribes/plugins/Case/PopupMenuItem.pyo
+share/scribes/plugins/Case/Trigger.py
+share/scribes/plugins/Case/Trigger.pyo
+share/scribes/plugins/Case/__init__.py
+share/scribes/plugins/Case/__init__.pyo
+share/scribes/plugins/CloseWindow/Trigger.py
+share/scribes/plugins/CloseWindow/Trigger.pyo
+share/scribes/plugins/CloseWindow/__init__.py
+share/scribes/plugins/CloseWindow/__init__.pyo
+share/scribes/plugins/ColorEditor/BgColorButton.py
+share/scribes/plugins/ColorEditor/BgColorButton.pyo
+share/scribes/plugins/ColorEditor/BgSyntaxButton.py
+share/scribes/plugins/ColorEditor/BgSyntaxButton.pyo
+share/scribes/plugins/ColorEditor/BoldCheckButton.py
+share/scribes/plugins/ColorEditor/BoldCheckButton.pyo
+share/scribes/plugins/ColorEditor/FgColorButton.py
+share/scribes/plugins/ColorEditor/FgColorButton.pyo
+share/scribes/plugins/ColorEditor/FgSyntaxButton.py
+share/scribes/plugins/ColorEditor/FgSyntaxButton.pyo
+share/scribes/plugins/ColorEditor/ItalicCheckButton.py
+share/scribes/plugins/ColorEditor/ItalicCheckButton.pyo
+share/scribes/plugins/ColorEditor/i18n.py
+share/scribes/plugins/ColorEditor/i18n.pyo
+share/scribes/plugins/ColorEditor/Manager.py
+share/scribes/plugins/ColorEditor/Manager.pyo
+share/scribes/plugins/ColorEditor/MenuItem.py
+share/scribes/plugins/ColorEditor/MenuItem.pyo
+share/scribes/plugins/ColorEditor/ResetButton.py
+share/scribes/plugins/ColorEditor/ResetButton.pyo
+share/scribes/plugins/ColorEditor/ThemeCheckButton.py
+share/scribes/plugins/ColorEditor/ThemeCheckButton.pyo
+share/scribes/plugins/ColorEditor/TreeView.py
+share/scribes/plugins/ColorEditor/TreeView.pyo
+share/scribes/plugins/ColorEditor/Trigger.py
+share/scribes/plugins/ColorEditor/Trigger.pyo
+share/scribes/plugins/ColorEditor/UnderlineCheckButton.py
+share/scribes/plugins/ColorEditor/UnderlineCheckButton.pyo
+share/scribes/plugins/ColorEditor/Window.py
+share/scribes/plugins/ColorEditor/Window.pyo
+share/scribes/plugins/ColorEditor/__init__.py
+share/scribes/plugins/ColorEditor/__init__.pyo
+share/scribes/plugins/DocumentBrowser/i18n.py
+share/scribes/plugins/DocumentBrowser/i18n.pyo
+share/scribes/plugins/DocumentBrowser/lines.py
+share/scribes/plugins/DocumentBrowser/lines.pyo
+share/scribes/plugins/DocumentBrowser/Manager.py
+share/scribes/plugins/DocumentBrowser/Manager.pyo
+share/scribes/plugins/DocumentBrowser/Treeview.py
+share/scribes/plugins/DocumentBrowser/Treeview.pyo
+share/scribes/plugins/DocumentBrowser/Trigger.py
+share/scribes/plugins/DocumentBrowser/Trigger.pyo
+share/scribes/plugins/DocumentBrowser/Window.py
+share/scribes/plugins/DocumentBrowser/Window.pyo
+share/scribes/plugins/DocumentBrowser/__init__.py
+share/scribes/plugins/DocumentBrowser/__init__.pyo
+share/scribes/plugins/DocumentSwitcher/switcher.py
+share/scribes/plugins/DocumentSwitcher/switcher.pyo
+share/scribes/plugins/DocumentSwitcher/Trigger.py
+share/scribes/plugins/DocumentSwitcher/Trigger.pyo
+share/scribes/plugins/DocumentSwitcher/__init__.py
+share/scribes/plugins/DocumentSwitcher/__init__.pyo
+share/scribes/plugins/FindBar/CaseButton.py
+share/scribes/plugins/FindBar/CaseButton.pyo
+share/scribes/plugins/FindBar/EntryCompletion.py
+share/scribes/plugins/FindBar/EntryCompletion.pyo
+share/scribes/plugins/FindBar/Entry.py
+share/scribes/plugins/FindBar/Entry.pyo
+share/scribes/plugins/FindBar/i18n.py
+share/scribes/plugins/FindBar/i18n.pyo
+share/scribes/plugins/FindBar/Manager.py
+share/scribes/plugins/FindBar/Manager.pyo
+share/scribes/plugins/FindBar/NextButton.py
+share/scribes/plugins/FindBar/NextButton.pyo
+share/scribes/plugins/FindBar/PreviousButton.py
+share/scribes/plugins/FindBar/PreviousButton.pyo
+share/scribes/plugins/FindBar/SearchButton.py
+share/scribes/plugins/FindBar/SearchButton.pyo
+share/scribes/plugins/FindBar/StopButton.py
+share/scribes/plugins/FindBar/StopButton.pyo
+share/scribes/plugins/FindBar/Trigger.py
+share/scribes/plugins/FindBar/Trigger.pyo
+share/scribes/plugins/FindBar/WordButton.py
+share/scribes/plugins/FindBar/WordButton.pyo
+share/scribes/plugins/FindBar/__init__.py
+share/scribes/plugins/FindBar/__init__.pyo
+share/scribes/plugins/FullScreen/Trigger.py
+share/scribes/plugins/FullScreen/Trigger.pyo
+share/scribes/plugins/FullScreen/__init__.py
+share/scribes/plugins/FullScreen/__init__.pyo
+share/scribes/plugins/GotoBar/Bar.py
+share/scribes/plugins/GotoBar/Bar.pyo
+share/scribes/plugins/GotoBar/i18n.py
+share/scribes/plugins/GotoBar/i18n.pyo
+share/scribes/plugins/GotoBar/SpinButton.py
+share/scribes/plugins/GotoBar/SpinButton.pyo
+share/scribes/plugins/GotoBar/Trigger.py
+share/scribes/plugins/GotoBar/Trigger.pyo
+share/scribes/plugins/GotoBar/__init__.py
+share/scribes/plugins/GotoBar/__init__.pyo
+share/scribes/plugins/IncrementalBar/CaseButton.py
+share/scribes/plugins/IncrementalBar/CaseButton.pyo
+share/scribes/plugins/IncrementalBar/EntryCompletion.py
+share/scribes/plugins/IncrementalBar/EntryCompletion.pyo
+share/scribes/plugins/IncrementalBar/Entry.py
+share/scribes/plugins/IncrementalBar/Entry.pyo
+share/scribes/plugins/IncrementalBar/i18n.py
+share/scribes/plugins/IncrementalBar/i18n.pyo
+share/scribes/plugins/IncrementalBar/Manager.py
+share/scribes/plugins/IncrementalBar/Manager.pyo
+share/scribes/plugins/IncrementalBar/NextButton.py
+share/scribes/plugins/IncrementalBar/NextButton.pyo
+share/scribes/plugins/IncrementalBar/PreviousButton.py
+share/scribes/plugins/IncrementalBar/PreviousButton.pyo
+share/scribes/plugins/IncrementalBar/SearchButton.py
+share/scribes/plugins/IncrementalBar/SearchButton.pyo
+share/scribes/plugins/IncrementalBar/StopButton.py
+share/scribes/plugins/IncrementalBar/StopButton.pyo
+share/scribes/plugins/IncrementalBar/Trigger.py
+share/scribes/plugins/IncrementalBar/Trigger.pyo
+share/scribes/plugins/IncrementalBar/WordButton.py
+share/scribes/plugins/IncrementalBar/WordButton.pyo
+share/scribes/plugins/IncrementalBar/__init__.py
+share/scribes/plugins/IncrementalBar/__init__.pyo
+share/scribes/plugins/Indent/indent.py
+share/scribes/plugins/Indent/indent.pyo
+share/scribes/plugins/Indent/i18n.py
+share/scribes/plugins/Indent/i18n.pyo
+share/scribes/plugins/Indent/PopupMenuItem.py
+share/scribes/plugins/Indent/PopupMenuItem.pyo
+share/scribes/plugins/Indent/Trigger.py
+share/scribes/plugins/Indent/Trigger.pyo
+share/scribes/plugins/Indent/unindent.py
+share/scribes/plugins/Indent/unindent.pyo
+share/scribes/plugins/Indent/__init__.py
+share/scribes/plugins/Indent/__init__.pyo
+share/scribes/plugins/LexicalScopeHighlight/Highlight.py
+share/scribes/plugins/LexicalScopeHighlight/Highlight.pyo
+share/scribes/plugins/LexicalScopeHighlight/__init__.py
+share/scribes/plugins/LexicalScopeHighlight/__init__.pyo
+share/scribes/plugins/Lines/i18n.py
+share/scribes/plugins/Lines/i18n.pyo
+share/scribes/plugins/Lines/lines.py
+share/scribes/plugins/Lines/lines.pyo
+share/scribes/plugins/Lines/PopupMenuItem.py
+share/scribes/plugins/Lines/PopupMenuItem.pyo
+share/scribes/plugins/Lines/Trigger.py
+share/scribes/plugins/Lines/Trigger.pyo
+share/scribes/plugins/Lines/__init__.py
+share/scribes/plugins/Lines/__init__.pyo
+share/scribes/plugins/MatchingBracket/i18n.py
+share/scribes/plugins/MatchingBracket/i18n.pyo
+share/scribes/plugins/MatchingBracket/Trigger.py
+share/scribes/plugins/MatchingBracket/Trigger.pyo
+share/scribes/plugins/MatchingBracket/__init__.py
+share/scribes/plugins/MatchingBracket/__init__.pyo
+share/scribes/plugins/NewWindow/Trigger.py
+share/scribes/plugins/NewWindow/Trigger.pyo
+share/scribes/plugins/NewWindow/__init__.py
+share/scribes/plugins/NewWindow/__init__.pyo
+share/scribes/plugins/OpenDialog/Dialog.glade
+share/scribes/plugins/OpenDialog/Dialog.py
+share/scribes/plugins/OpenDialog/Dialog.pyo
+share/scribes/plugins/OpenDialog/i18n.py
+share/scribes/plugins/OpenDialog/i18n.pyo
+share/scribes/plugins/OpenDialog/Trigger.py
+share/scribes/plugins/OpenDialog/Trigger.pyo
+share/scribes/plugins/OpenDialog/__init__.py
+share/scribes/plugins/OpenDialog/__init__.pyo
+share/scribes/plugins/Paragraph/i18n.py
+share/scribes/plugins/Paragraph/i18n.pyc
+share/scribes/plugins/Paragraph/i18n.pyo
+share/scribes/plugins/Paragraph/Manager.py
+share/scribes/plugins/Paragraph/Manager.pyc
+share/scribes/plugins/Paragraph/Manager.pyo
+share/scribes/plugins/Paragraph/PopupMenuItem.py
+share/scribes/plugins/Paragraph/PopupMenuItem.pyc
+share/scribes/plugins/Paragraph/PopupMenuItem.pyo
+share/scribes/plugins/Paragraph/Trigger.py
+share/scribes/plugins/Paragraph/Trigger.pyc
+share/scribes/plugins/Paragraph/Trigger.pyo
+share/scribes/plugins/Paragraph/.__junk
+share/scribes/plugins/Paragraph/__init__.py
+share/scribes/plugins/Paragraph/__init__.pyc
+share/scribes/plugins/Paragraph/__init__.pyo
+share/scribes/plugins/PluginAbout.py
+share/scribes/plugins/PluginAbout.pyo
+share/scribes/plugins/PluginAutoReplaceGUI.py
+share/scribes/plugins/PluginAutoReplaceGUI.pyo
+share/scribes/plugins/PluginAutoReplace.py
+share/scribes/plugins/PluginAutoReplace.pyo
+share/scribes/plugins/PluginBookmarkBrowser.py
+share/scribes/plugins/PluginBookmarkBrowser.pyo
+share/scribes/plugins/PluginBookmark.py
+share/scribes/plugins/PluginBookmark.pyo
+share/scribes/plugins/PluginBracketCompletion.py
+share/scribes/plugins/PluginBracketCompletion.pyo
+share/scribes/plugins/PluginBracketSelection.py
+share/scribes/plugins/PluginBracketSelection.pyo
+share/scribes/plugins/PluginCase.py
+share/scribes/plugins/PluginCase.pyo
+share/scribes/plugins/PluginCloseWindow.py
+share/scribes/plugins/PluginCloseWindow.pyo
+share/scribes/plugins/PluginColorEditor.py
+share/scribes/plugins/PluginColorEditor.pyo
+share/scribes/plugins/PluginDocumentBrowser.py
+share/scribes/plugins/PluginDocumentBrowser.pyo
+share/scribes/plugins/PluginDocumentSwitcher.py
+share/scribes/plugins/PluginDocumentSwitcher.pyo
+share/scribes/plugins/PluginFindBar.py
+share/scribes/plugins/PluginFindBar.pyo
+share/scribes/plugins/PluginFullScreen.py
+share/scribes/plugins/PluginFullScreen.pyo
+share/scribes/plugins/PluginGotoBar.py
+share/scribes/plugins/PluginGotoBar.pyo
+share/scribes/plugins/PluginIncrementalBar.py
+share/scribes/plugins/PluginIncrementalBar.pyo
+share/scribes/plugins/PluginIndent.py
+share/scribes/plugins/PluginIndent.pyo
+share/scribes/plugins/PluginLexicalScopeHighlight.py
+share/scribes/plugins/PluginLexicalScopeHighlight.pyo
+share/scribes/plugins/PluginLines.py
+share/scribes/plugins/PluginLines.pyo
+share/scribes/plugins/PluginMatchingBracket.py
+share/scribes/plugins/PluginMatchingBracket.pyo
+share/scribes/plugins/PluginNewWindow.py
+share/scribes/plugins/PluginNewWindow.pyo
+share/scribes/plugins/PluginOpenDialog.py
+share/scribes/plugins/PluginOpenDialog.pyo
+share/scribes/plugins/PluginParagraph.py
+share/scribes/plugins/PluginParagraph.pyo
+share/scribes/plugins/PluginPreferences.py
+share/scribes/plugins/PluginPreferences.pyo
+share/scribes/plugins/PluginPrintDialog.py
+share/scribes/plugins/PluginPrintDialog.pyo
+share/scribes/plugins/PluginReadOnly.py
+share/scribes/plugins/PluginReadOnly.pyo
+share/scribes/plugins/PluginRecentMenu.py
+share/scribes/plugins/PluginRecentMenu.pyo
+share/scribes/plugins/PluginRemoteDialog.py
+share/scribes/plugins/PluginRemoteDialog.pyo
+share/scribes/plugins/PluginReplaceBar.py
+share/scribes/plugins/PluginReplaceBar.pyo
+share/scribes/plugins/PluginSaveDialog.py
+share/scribes/plugins/PluginSaveDialog.pyo
+share/scribes/plugins/PluginSaveFile.py
+share/scribes/plugins/PluginSaveFile.pyo
+share/scribes/plugins/PluginScrollNavigation.py
+share/scribes/plugins/PluginScrollNavigation.pyo
+share/scribes/plugins/PluginSearchPreviousNext.py
+share/scribes/plugins/PluginSearchPreviousNext.pyo
+share/scribes/plugins/PluginSearchReplace.py
+share/scribes/plugins/PluginSearchReplace.pyo
+share/scribes/plugins/PluginSelection.py
+share/scribes/plugins/PluginSelection.pyo
+share/scribes/plugins/PluginSpaces.py
+share/scribes/plugins/PluginSpaces.pyo
+share/scribes/plugins/PluginSpellCheck.py
+share/scribes/plugins/PluginSpellCheck.pyo
+share/scribes/plugins/PluginSyntaxColorSwitcher.py
+share/scribes/plugins/PluginSyntaxColorSwitcher.pyo
+share/scribes/plugins/PluginTemplateEditor.py
+share/scribes/plugins/PluginTemplateEditor.pyo
+share/scribes/plugins/PluginTemplates.py
+share/scribes/plugins/PluginTemplates.pyo
+share/scribes/plugins/PluginToolbarVisibility.py
+share/scribes/plugins/PluginToolbarVisibility.pyo
+share/scribes/plugins/PluginUndoRedo.py
+share/scribes/plugins/PluginUndoRedo.pyo
+share/scribes/plugins/PluginUserGuide.py
+share/scribes/plugins/PluginUserGuide.pyo
+share/scribes/plugins/PluginWordCompletionGUI.py
+share/scribes/plugins/PluginWordCompletionGUI.pyo
+share/scribes/plugins/PluginWordCompletion.py
+share/scribes/plugins/PluginWordCompletion.pyo
+share/scribes/plugins/Preferences/FontButton.py
+share/scribes/plugins/Preferences/FontButton.pyo
+share/scribes/plugins/Preferences/i18n.py
+share/scribes/plugins/Preferences/i18n.pyo
+share/scribes/plugins/Preferences/Manager.py
+share/scribes/plugins/Preferences/Manager.pyo
+share/scribes/plugins/Preferences/MarginCheckButton.py
+share/scribes/plugins/Preferences/MarginCheckButton.pyo
+share/scribes/plugins/Preferences/MarginSpinButton.py
+share/scribes/plugins/Preferences/MarginSpinButton.pyo
+share/scribes/plugins/Preferences/SpellCheckButton.py
+share/scribes/plugins/Preferences/SpellCheckButton.pyo
+share/scribes/plugins/Preferences/TabCheckButton.py
+share/scribes/plugins/Preferences/TabCheckButton.pyo
+share/scribes/plugins/Preferences/TabSpinButton.py
+share/scribes/plugins/Preferences/TabSpinButton.pyo
+share/scribes/plugins/Preferences/Trigger.py
+share/scribes/plugins/Preferences/Trigger.pyo
+share/scribes/plugins/Preferences/Window.py
+share/scribes/plugins/Preferences/Window.pyo
+share/scribes/plugins/Preferences/WrapCheckButton.py
+share/scribes/plugins/Preferences/WrapCheckButton.pyo
+share/scribes/plugins/Preferences/__init__.py
+share/scribes/plugins/Preferences/__init__.pyo
+share/scribes/plugins/PrintDialog/Dialog.py
+share/scribes/plugins/PrintDialog/Dialog.pyo
+share/scribes/plugins/PrintDialog/i18n.py
+share/scribes/plugins/PrintDialog/i18n.pyo
+share/scribes/plugins/PrintDialog/Job.py
+share/scribes/plugins/PrintDialog/Job.pyo
+share/scribes/plugins/PrintDialog/Preview.py
+share/scribes/plugins/PrintDialog/Preview.pyo
+share/scribes/plugins/PrintDialog/Trigger.py
+share/scribes/plugins/PrintDialog/Trigger.pyo
+share/scribes/plugins/PrintDialog/__init__.py
+share/scribes/plugins/PrintDialog/__init__.pyo
+share/scribes/plugins/ReadOnly/i18n.py
+share/scribes/plugins/ReadOnly/i18n.pyo
+share/scribes/plugins/ReadOnly/Trigger.py
+share/scribes/plugins/ReadOnly/Trigger.pyo
+share/scribes/plugins/ReadOnly/__init__.py
+share/scribes/plugins/ReadOnly/__init__.pyo
+share/scribes/plugins/RecentMenu/Trigger.py
+share/scribes/plugins/RecentMenu/Trigger.pyo
+share/scribes/plugins/RecentMenu/__init__.py
+share/scribes/plugins/RecentMenu/__init__.pyo
+share/scribes/plugins/RemoteDialog/comboboxentry.py
+share/scribes/plugins/RemoteDialog/comboboxentry.pyo
+share/scribes/plugins/RemoteDialog/Dialog.py
+share/scribes/plugins/RemoteDialog/Dialog.pyo
+share/scribes/plugins/RemoteDialog/i18n.py
+share/scribes/plugins/RemoteDialog/i18n.pyo
+share/scribes/plugins/RemoteDialog/Trigger.py
+share/scribes/plugins/RemoteDialog/Trigger.pyo
+share/scribes/plugins/RemoteDialog/__init__.py
+share/scribes/plugins/RemoteDialog/__init__.pyo
+share/scribes/plugins/ReplaceBar/CaseButton.py
+share/scribes/plugins/ReplaceBar/CaseButton.pyo
+share/scribes/plugins/ReplaceBar/EntryCompletion.py
+share/scribes/plugins/ReplaceBar/EntryCompletion.pyo
+share/scribes/plugins/ReplaceBar/Entry.py
+share/scribes/plugins/ReplaceBar/Entry.pyo
+share/scribes/plugins/ReplaceBar/IncrementalButton.py
+share/scribes/plugins/ReplaceBar/IncrementalButton.pyo
+share/scribes/plugins/ReplaceBar/i18n.py
+share/scribes/plugins/ReplaceBar/i18n.pyo
+share/scribes/plugins/ReplaceBar/Manager.py
+share/scribes/plugins/ReplaceBar/Manager.pyo
+share/scribes/plugins/ReplaceBar/NextButton.py
+share/scribes/plugins/ReplaceBar/NextButton.pyo
+share/scribes/plugins/ReplaceBar/PreviousButton.py
+share/scribes/plugins/ReplaceBar/PreviousButton.pyo
+share/scribes/plugins/ReplaceBar/ReplaceAllButton.py
+share/scribes/plugins/ReplaceBar/ReplaceAllButton.pyo
+share/scribes/plugins/ReplaceBar/ReplaceButton.py
+share/scribes/plugins/ReplaceBar/ReplaceButton.pyo
+share/scribes/plugins/ReplaceBar/ReplaceEntry.py
+share/scribes/plugins/ReplaceBar/ReplaceEntry.pyo
+share/scribes/plugins/ReplaceBar/ReplaceStopButton.py
+share/scribes/plugins/ReplaceBar/ReplaceStopButton.pyo
+share/scribes/plugins/ReplaceBar/SearchButton.py
+share/scribes/plugins/ReplaceBar/SearchButton.pyo
+share/scribes/plugins/ReplaceBar/StopButton.py
+share/scribes/plugins/ReplaceBar/StopButton.pyo
+share/scribes/plugins/ReplaceBar/Trigger.py
+share/scribes/plugins/ReplaceBar/Trigger.pyo
+share/scribes/plugins/ReplaceBar/WordButton.py
+share/scribes/plugins/ReplaceBar/WordButton.pyo
+share/scribes/plugins/ReplaceBar/__init__.py
+share/scribes/plugins/ReplaceBar/__init__.pyo
+share/scribes/plugins/SaveDialog/Dialog.glade
+share/scribes/plugins/SaveDialog/Dialog.py
+share/scribes/plugins/SaveDialog/Dialog.pyo
+share/scribes/plugins/SaveDialog/i18n.py
+share/scribes/plugins/SaveDialog/i18n.pyo
+share/scribes/plugins/SaveDialog/Rename.py
+share/scribes/plugins/SaveDialog/Rename.pyo
+share/scribes/plugins/SaveDialog/Trigger.py
+share/scribes/plugins/SaveDialog/Trigger.pyo
+share/scribes/plugins/SaveDialog/__init__.py
+share/scribes/plugins/SaveDialog/__init__.pyo
+share/scribes/plugins/SaveFile/i18n.py
+share/scribes/plugins/SaveFile/i18n.pyo
+share/scribes/plugins/SaveFile/Trigger.py
+share/scribes/plugins/SaveFile/Trigger.pyo
+share/scribes/plugins/SaveFile/__init__.py
+share/scribes/plugins/SaveFile/__init__.pyo
+share/scribes/plugins/ScrollNavigation/i18n.py
+share/scribes/plugins/ScrollNavigation/i18n.pyc
+share/scribes/plugins/ScrollNavigation/i18n.pyo
+share/scribes/plugins/ScrollNavigation/Manager.py
+share/scribes/plugins/ScrollNavigation/Manager.pyc
+share/scribes/plugins/ScrollNavigation/Manager.pyo
+share/scribes/plugins/ScrollNavigation/Trigger.py
+share/scribes/plugins/ScrollNavigation/Trigger.pyc
+share/scribes/plugins/ScrollNavigation/Trigger.pyo
+share/scribes/plugins/ScrollNavigation/.__junk
+share/scribes/plugins/ScrollNavigation/__init__.py
+share/scribes/plugins/ScrollNavigation/__init__.pyc
+share/scribes/plugins/ScrollNavigation/__init__.pyo
+share/scribes/plugins/SearchPreviousNext/i18n.py
+share/scribes/plugins/SearchPreviousNext/i18n.pyo
+share/scribes/plugins/SearchPreviousNext/Next.py
+share/scribes/plugins/SearchPreviousNext/Next.pyo
+share/scribes/plugins/SearchPreviousNext/Previous.py
+share/scribes/plugins/SearchPreviousNext/Previous.pyo
+share/scribes/plugins/SearchPreviousNext/searchnexttrigger.py
+share/scribes/plugins/SearchPreviousNext/searchnexttrigger.pyo
+share/scribes/plugins/SearchPreviousNext/searchnext.py
+share/scribes/plugins/SearchPreviousNext/searchnext.pyo
+share/scribes/plugins/SearchPreviousNext/searchprevioustrigger.py
+share/scribes/plugins/SearchPreviousNext/searchprevioustrigger.pyo
+share/scribes/plugins/SearchPreviousNext/searchprevious.py
+share/scribes/plugins/SearchPreviousNext/searchprevious.pyo
+share/scribes/plugins/SearchPreviousNext/Trigger.py
+share/scribes/plugins/SearchPreviousNext/Trigger.pyo
+share/scribes/plugins/SearchPreviousNext/__init__.py
+share/scribes/plugins/SearchPreviousNext/__init__.pyo
+share/scribes/plugins/SearchReplace/i18n.py
+share/scribes/plugins/SearchReplace/i18n.pyo
+share/scribes/plugins/SearchReplace/Manager.py
+share/scribes/plugins/SearchReplace/Manager.pyo
+share/scribes/plugins/SearchReplace/Trigger.py
+share/scribes/plugins/SearchReplace/Trigger.pyo
+share/scribes/plugins/SearchReplace/__init__.py
+share/scribes/plugins/SearchReplace/__init__.pyo
+share/scribes/plugins/Selection/i18n.py
+share/scribes/plugins/Selection/i18n.pyo
+share/scribes/plugins/Selection/lines.py
+share/scribes/plugins/Selection/lines.pyo
+share/scribes/plugins/Selection/Manager.py
+share/scribes/plugins/Selection/Manager.pyo
+share/scribes/plugins/Selection/paragraph.py
+share/scribes/plugins/Selection/paragraph.pyo
+share/scribes/plugins/Selection/PopupMenuItem.py
+share/scribes/plugins/Selection/PopupMenuItem.pyo
+share/scribes/plugins/Selection/sentence.py
+share/scribes/plugins/Selection/sentence.pyo
+share/scribes/plugins/Selection/Trigger.py
+share/scribes/plugins/Selection/Trigger.pyo
+share/scribes/plugins/Selection/word.py
+share/scribes/plugins/Selection/word.pyo
+share/scribes/plugins/Selection/__init__.py
+share/scribes/plugins/Selection/__init__.pyo
+share/scribes/plugins/Spaces/i18n.py
+share/scribes/plugins/Spaces/i18n.pyo
+share/scribes/plugins/Spaces/PopupMenuItem.py
+share/scribes/plugins/Spaces/PopupMenuItem.pyo
+share/scribes/plugins/Spaces/spaces.py
+share/scribes/plugins/Spaces/spaces.pyo
+share/scribes/plugins/Spaces/Trigger.py
+share/scribes/plugins/Spaces/Trigger.pyo
+share/scribes/plugins/Spaces/__init__.py
+share/scribes/plugins/Spaces/__init__.pyo
+share/scribes/plugins/SpellCheck/i18n.py
+share/scribes/plugins/SpellCheck/i18n.pyo
+share/scribes/plugins/SpellCheck/Trigger.py
+share/scribes/plugins/SpellCheck/Trigger.pyo
+share/scribes/plugins/SpellCheck/__init__.py
+share/scribes/plugins/SpellCheck/__init__.pyo
+share/scribes/plugins/SyntaxColorSwitcher/Exceptions.py
+share/scribes/plugins/SyntaxColorSwitcher/Exceptions.pyo
+share/scribes/plugins/SyntaxColorSwitcher/i18n.py
+share/scribes/plugins/SyntaxColorSwitcher/i18n.pyo
+share/scribes/plugins/SyntaxColorSwitcher/Manager.py
+share/scribes/plugins/SyntaxColorSwitcher/Manager.pyo
+share/scribes/plugins/SyntaxColorSwitcher/Metadata.py
+share/scribes/plugins/SyntaxColorSwitcher/Metadata.pyo
+share/scribes/plugins/SyntaxColorSwitcher/PopupMenuItem.py
+share/scribes/plugins/SyntaxColorSwitcher/PopupMenuItem.pyo
+share/scribes/plugins/SyntaxColorSwitcher/Syntax.py
+share/scribes/plugins/SyntaxColorSwitcher/Syntax.pyo
+share/scribes/plugins/SyntaxColorSwitcher/__init__.py
+share/scribes/plugins/SyntaxColorSwitcher/__init__.pyo
+share/scribes/plugins/TemplateEditor/AddButton.py
+share/scribes/plugins/TemplateEditor/AddButton.pyo
+share/scribes/plugins/TemplateEditor/AddDialog.py
+share/scribes/plugins/TemplateEditor/AddDialog.pyo
+share/scribes/plugins/TemplateEditor/DescriptionTreeView.py
+share/scribes/plugins/TemplateEditor/DescriptionTreeView.pyo
+share/scribes/plugins/TemplateEditor/EditButton.py
+share/scribes/plugins/TemplateEditor/EditButton.pyo
+share/scribes/plugins/TemplateEditor/EditDialog.py
+share/scribes/plugins/TemplateEditor/EditDialog.pyo
+share/scribes/plugins/TemplateEditor/Editor.py
+share/scribes/plugins/TemplateEditor/Editor.pyo
+share/scribes/plugins/TemplateEditor/Exceptions.py
+share/scribes/plugins/TemplateEditor/Exceptions.pyo
+share/scribes/plugins/TemplateEditor/ExportButton.py
+share/scribes/plugins/TemplateEditor/ExportButton.pyo
+share/scribes/plugins/TemplateEditor/ExportDialog.py
+share/scribes/plugins/TemplateEditor/ExportDialog.pyo
+share/scribes/plugins/TemplateEditor/HelpButton.py
+share/scribes/plugins/TemplateEditor/HelpButton.pyo
+share/scribes/plugins/TemplateEditor/ImportButton.py
+share/scribes/plugins/TemplateEditor/ImportButton.pyo
+share/scribes/plugins/TemplateEditor/ImportDialog.py
+share/scribes/plugins/TemplateEditor/ImportDialog.pyo
+share/scribes/plugins/TemplateEditor/ImportTemplate.py
+share/scribes/plugins/TemplateEditor/ImportTemplate.pyo
+share/scribes/plugins/TemplateEditor/i18n.py
+share/scribes/plugins/TemplateEditor/i18n.pyo
+share/scribes/plugins/TemplateEditor/LanguageTreeView.py
+share/scribes/plugins/TemplateEditor/LanguageTreeView.pyo
+share/scribes/plugins/TemplateEditor/LinkButton.py
+share/scribes/plugins/TemplateEditor/LinkButton.pyo
+share/scribes/plugins/TemplateEditor/Manager.py
+share/scribes/plugins/TemplateEditor/Manager.pyo
+share/scribes/plugins/TemplateEditor/MenuItem.py
+share/scribes/plugins/TemplateEditor/MenuItem.pyo
+share/scribes/plugins/TemplateEditor/Metadata.py
+share/scribes/plugins/TemplateEditor/Metadata.pyo
+share/scribes/plugins/TemplateEditor/NoImage.png
+share/scribes/plugins/TemplateEditor/Preview.py
+share/scribes/plugins/TemplateEditor/Preview.pyo
+share/scribes/plugins/TemplateEditor/ReadXMLTemplate.py
+share/scribes/plugins/TemplateEditor/ReadXMLTemplate.pyo
+share/scribes/plugins/TemplateEditor/RemoveButton.py
+share/scribes/plugins/TemplateEditor/RemoveButton.pyo
+share/scribes/plugins/TemplateEditor/Template.glade
+share/scribes/plugins/TemplateEditor/Trigger.py
+share/scribes/plugins/TemplateEditor/Trigger.pyo
+share/scribes/plugins/TemplateEditor/utils.py
+share/scribes/plugins/TemplateEditor/utils.pyo
+share/scribes/plugins/TemplateEditor/Window.py
+share/scribes/plugins/TemplateEditor/Window.pyo
+share/scribes/plugins/TemplateEditor/WriteXMLTemplate.py
+share/scribes/plugins/TemplateEditor/WriteXMLTemplate.pyo
+share/scribes/plugins/TemplateEditor/__init__.py
+share/scribes/plugins/TemplateEditor/__init__.pyo
+share/scribes/plugins/Templates/Factory.py
+share/scribes/plugins/Templates/Factory.pyo
+share/scribes/plugins/Templates/Highlighter.py
+share/scribes/plugins/Templates/Highlighter.pyo
+share/scribes/plugins/Templates/i18n.py
+share/scribes/plugins/Templates/i18n.pyo
+share/scribes/plugins/Templates/Loader.py
+share/scribes/plugins/Templates/Loader.pyo
+share/scribes/plugins/Templates/Manager.py
+share/scribes/plugins/Templates/Manager.pyo
+share/scribes/plugins/Templates/Metadata.py
+share/scribes/plugins/Templates/Metadata.pyo
+share/scribes/plugins/Templates/Monitor.py
+share/scribes/plugins/Templates/Monitor.pyo
+share/scribes/plugins/Templates/Processor.py
+share/scribes/plugins/Templates/Processor.pyo
+share/scribes/plugins/Templates/utils.py
+share/scribes/plugins/Templates/utils.pyo
+share/scribes/plugins/Templates/__init__.py
+share/scribes/plugins/Templates/__init__.pyo
+share/scribes/plugins/ToolbarVisibility/i18n.py
+share/scribes/plugins/ToolbarVisibility/i18n.pyo
+share/scribes/plugins/ToolbarVisibility/Trigger.py
+share/scribes/plugins/ToolbarVisibility/Trigger.pyo
+share/scribes/plugins/ToolbarVisibility/__init__.py
+share/scribes/plugins/ToolbarVisibility/__init__.pyo
+share/scribes/plugins/UndoRedo/i18n.py
+share/scribes/plugins/UndoRedo/i18n.pyo
+share/scribes/plugins/UndoRedo/Trigger.py
+share/scribes/plugins/UndoRedo/Trigger.pyo
+share/scribes/plugins/UndoRedo/__init__.py
+share/scribes/plugins/UndoRedo/__init__.pyo
+share/scribes/plugins/UserGuide/i18n.py
+share/scribes/plugins/UserGuide/i18n.pyo
+share/scribes/plugins/UserGuide/Trigger.py
+share/scribes/plugins/UserGuide/Trigger.pyo
+share/scribes/plugins/UserGuide/__init__.py
+share/scribes/plugins/UserGuide/__init__.pyo
+share/scribes/plugins/WordCompletionGUI/i18n.py
+share/scribes/plugins/WordCompletionGUI/i18n.pyo
+share/scribes/plugins/WordCompletionGUI/Manager.py
+share/scribes/plugins/WordCompletionGUI/Manager.pyo
+share/scribes/plugins/WordCompletionGUI/ScrollWin.py
+share/scribes/plugins/WordCompletionGUI/ScrollWin.pyo
+share/scribes/plugins/WordCompletionGUI/TreeView.py
+share/scribes/plugins/WordCompletionGUI/TreeView.pyo
+share/scribes/plugins/WordCompletionGUI/Window.py
+share/scribes/plugins/WordCompletionGUI/Window.pyo
+share/scribes/plugins/WordCompletionGUI/__init__.py
+share/scribes/plugins/WordCompletionGUI/__init__.pyo
+share/scribes/plugins/WordCompletion/DBusService.py
+share/scribes/plugins/WordCompletion/DBusService.pyo
+share/scribes/plugins/WordCompletion/Indexer.py
+share/scribes/plugins/WordCompletion/Indexer.pyo
+share/scribes/plugins/WordCompletion/Manager.py
+share/scribes/plugins/WordCompletion/Manager.pyo
+share/scribes/plugins/WordCompletion/Monitor.py
+share/scribes/plugins/WordCompletion/Monitor.pyo
+share/scribes/plugins/WordCompletion/Updater.py
+share/scribes/plugins/WordCompletion/Updater.pyo
+share/scribes/plugins/WordCompletion/__init__.py
+share/scribes/plugins/WordCompletion/__init__.pyo
+share/scribes/plugins/__init__.py
+share/scribes/plugins/__init__.pyo
+share/scribes/throbber-active.gif
+share/scribes/throbber-inactive.png
 share/icons/hicolor/48x48/apps/scribes.png
-@dirrm share/gnome/scribes/plugins/WordCompletionGUI
-@dirrm share/gnome/scribes/plugins/WordCompletion
-@dirrm share/gnome/scribes/plugins/UserGuide
-@dirrm share/gnome/scribes/plugins/UndoRedo
-@dirrm share/gnome/scribes/plugins/ToolbarVisibility
-@dirrm share/gnome/scribes/plugins/Templates
-@dirrm share/gnome/scribes/plugins/TemplateEditor
-@dirrm share/gnome/scribes/plugins/SyntaxColorSwitcher
-@dirrm share/gnome/scribes/plugins/SpellCheck
-@dirrm share/gnome/scribes/plugins/Spaces
-@dirrm share/gnome/scribes/plugins/Selection
-@dirrm share/gnome/scribes/plugins/SearchReplace
-@dirrm share/gnome/scribes/plugins/SearchPreviousNext
-@dirrm share/gnome/scribes/plugins/ScrollNavigation
-@dirrm share/gnome/scribes/plugins/SaveFile
-@dirrm share/gnome/scribes/plugins/SaveDialog
-@dirrm share/gnome/scribes/plugins/ReplaceBar
-@dirrm share/gnome/scribes/plugins/RemoteDialog
-@dirrm share/gnome/scribes/plugins/RecentMenu
-@dirrm share/gnome/scribes/plugins/ReadOnly
-@dirrm share/gnome/scribes/plugins/PrintDialog
-@dirrm share/gnome/scribes/plugins/Preferences
-@dirrm share/gnome/scribes/plugins/Paragraph
-@dirrm share/gnome/scribes/plugins/OpenDialog
-@dirrm share/gnome/scribes/plugins/NewWindow
-@dirrm share/gnome/scribes/plugins/MatchingBracket
-@dirrm share/gnome/scribes/plugins/Lines
-@dirrm share/gnome/scribes/plugins/LexicalScopeHighlight
-@dirrm share/gnome/scribes/plugins/Indent
-@dirrm share/gnome/scribes/plugins/IncrementalBar
-@dirrm share/gnome/scribes/plugins/GotoBar
-@dirrm share/gnome/scribes/plugins/FullScreen
-@dirrm share/gnome/scribes/plugins/FindBar
-@dirrm share/gnome/scribes/plugins/DocumentSwitcher
-@dirrm share/gnome/scribes/plugins/DocumentBrowser
-@dirrm share/gnome/scribes/plugins/ColorEditor
-@dirrm share/gnome/scribes/plugins/CloseWindow
-@dirrm share/gnome/scribes/plugins/Case
-@dirrm share/gnome/scribes/plugins/BracketSelection
-@dirrm share/gnome/scribes/plugins/BracketCompletion
-@dirrm share/gnome/scribes/plugins/BookmarkBrowser
-@dirrm share/gnome/scribes/plugins/Bookmark
-@dirrm share/gnome/scribes/plugins/AutoReplaceGUI
-@dirrm share/gnome/scribes/plugins/AutoReplace
-@dirrm share/gnome/scribes/plugins/About
-@dirrm share/gnome/scribes/plugins
-@dirrm share/gnome/scribes
-@dirrm share/gnome/omf/scribes
+@dirrm share/scribes/plugins/WordCompletionGUI
+@dirrm share/scribes/plugins/WordCompletion
+@dirrm share/scribes/plugins/UserGuide
+@dirrm share/scribes/plugins/UndoRedo
+@dirrm share/scribes/plugins/ToolbarVisibility
+@dirrm share/scribes/plugins/Templates
+@dirrm share/scribes/plugins/TemplateEditor
+@dirrm share/scribes/plugins/SyntaxColorSwitcher
+@dirrm share/scribes/plugins/SpellCheck
+@dirrm share/scribes/plugins/Spaces
+@dirrm share/scribes/plugins/Selection
+@dirrm share/scribes/plugins/SearchReplace
+@dirrm share/scribes/plugins/SearchPreviousNext
+@dirrm share/scribes/plugins/ScrollNavigation
+@dirrm share/scribes/plugins/SaveFile
+@dirrm share/scribes/plugins/SaveDialog
+@dirrm share/scribes/plugins/ReplaceBar
+@dirrm share/scribes/plugins/RemoteDialog
+@dirrm share/scribes/plugins/RecentMenu
+@dirrm share/scribes/plugins/ReadOnly
+@dirrm share/scribes/plugins/PrintDialog
+@dirrm share/scribes/plugins/Preferences
+@dirrm share/scribes/plugins/Paragraph
+@dirrm share/scribes/plugins/OpenDialog
+@dirrm share/scribes/plugins/NewWindow
+@dirrm share/scribes/plugins/MatchingBracket
+@dirrm share/scribes/plugins/Lines
+@dirrm share/scribes/plugins/LexicalScopeHighlight
+@dirrm share/scribes/plugins/Indent
+@dirrm share/scribes/plugins/IncrementalBar
+@dirrm share/scribes/plugins/GotoBar
+@dirrm share/scribes/plugins/FullScreen
+@dirrm share/scribes/plugins/FindBar
+@dirrm share/scribes/plugins/DocumentSwitcher
+@dirrm share/scribes/plugins/DocumentBrowser
+@dirrm share/scribes/plugins/ColorEditor
+@dirrm share/scribes/plugins/CloseWindow
+@dirrm share/scribes/plugins/Case
+@dirrm share/scribes/plugins/BracketSelection
+@dirrm share/scribes/plugins/BracketCompletion
+@dirrm share/scribes/plugins/BookmarkBrowser
+@dirrm share/scribes/plugins/Bookmark
+@dirrm share/scribes/plugins/AutoReplaceGUI
+@dirrm share/scribes/plugins/AutoReplace
+@dirrm share/scribes/plugins/About
+@dirrm share/scribes/plugins
+@dirrm share/scribes
+@dirrm share/omf/scribes
 @dirrm share/gnome/help/scribes/C/figures
 @dirrm share/gnome/help/scribes/C
 @dirrm share/gnome/help/scribes
 @dirrm %%PYTHON_SITELIBDIR%%/SCRIBES
+@dirrmtry share/applications
diff --git a/editors/winefish/Makefile b/editors/winefish/Makefile
index 2a3e373453e9..0792079f9777 100644
--- a/editors/winefish/Makefile
+++ b/editors/winefish/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	winefish
 DISTVERSION=	1.3.3
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	editors print
 MASTER_SITES=	http://download.berlios.de/winefish/ \
 		http://nivi.interfree.it/distfiles/winefish/
diff --git a/editors/winefish/pkg-plist b/editors/winefish/pkg-plist
index 15fded4286c6..2465880f1ecc 100644
--- a/editors/winefish/pkg-plist
+++ b/editors/winefish/pkg-plist
@@ -1,12 +1,12 @@
 @comment $FreeBSD$
 bin/winefish
-share/gnome/application-registry/winefish.applications
-share/gnome/applications/winefish.desktop
-share/gnome/applications/winefish-project.desktop
-share/gnome/mime-info/winefish.mime
-share/gnome/mime-info/winefish.keys
-share/gnome/pixmaps/gnome-application-winefish-project.png
-share/gnome/pixmaps/winefish-icon.png
+share/application-registry/winefish.applications
+share/applications/winefish.desktop
+share/applications/winefish-project.desktop
+share/mime-info/winefish.mime
+share/mime-info/winefish.keys
+share/pixmaps/gnome-application-winefish-project.png
+share/pixmaps/winefish-icon.png
 %%IFNLS%%share/locale/fr/LC_MESSAGES/winefish.mo
 %%IFNLS%%share/locale/it/LC_MESSAGES/winefish.mo
 %%IFNLS%%share/locale/vi/LC_MESSAGES/winefish.mo
@@ -31,3 +31,4 @@ share/mime/packages/winefish.xml
 @dirrm %%DATADIR%%
 @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/editors/xemacs/Makefile b/editors/xemacs/Makefile
index 9932bb29558f..dc45863968fc 100644
--- a/editors/xemacs/Makefile
+++ b/editors/xemacs/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xemacs
 PORTVERSION=	${XEMACS_VER}
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES+=	editors
 MASTER_SITES=	${MASTER_SITE_XEMACS}
 MASTER_SITE_SUBDIR=	xemacs-${XEMACS_REL}
@@ -164,7 +164,7 @@ post-install::
 .endfor
 .if !defined(WITHOUT_X11) && ${HAVE_GNOME:Mgnomehier}!=""
 	${INSTALL_DATA} ${WRKDIR}/xemacs.desktop \
-		${LOCALBASE}/share/gnome/applications
+		${LOCALBASE}/share/applications
 .endif
 # For some reason install no longer makes ${PREFIX}/lib/xemacs/site-lisp.
 # Do what PLIST does for pkg_add.
diff --git a/editors/xemacs/pkg-plist b/editors/xemacs/pkg-plist
index 8cdc2900abb2..ca5415d6f0c9 100644
--- a/editors/xemacs/pkg-plist
+++ b/editors/xemacs/pkg-plist
@@ -1206,7 +1206,7 @@ lib/xemacs-%%XEMACS_VER%%/lisp/x-win-sun.el
 lib/xemacs-%%XEMACS_VER%%/lisp/x-win-sun.elc
 lib/xemacs-%%XEMACS_VER%%/lisp/x-win-xfree86.el
 lib/xemacs-%%XEMACS_VER%%/lisp/x-win-xfree86.elc
-%%DESKTOP%%share/gnome/applications/xemacs.desktop
+%%DESKTOP%%share/applications/xemacs.desktop
 @dirrm lib/xemacs-%%XEMACS_VER%%/lisp/term
 @dirrm lib/xemacs-%%XEMACS_VER%%/lisp/mule
 @dirrm lib/xemacs-%%XEMACS_VER%%/lisp
@@ -1229,3 +1229,4 @@ lib/xemacs-%%XEMACS_VER%%/lisp/x-win-xfree86.elc
 @dirrmtry lib/xemacs/site-lisp
 @dirrmtry lib/xemacs/site-modules
 @dirrmtry lib/xemacs
+@dirrmtry share/applications
diff --git a/emulators/gsnes9x/Makefile b/emulators/gsnes9x/Makefile
index 97845226bad6..fb73fcc337f7 100644
--- a/emulators/gsnes9x/Makefile
+++ b/emulators/gsnes9x/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gsnes9x
 PORTVERSION=	3.12
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/emulators/gsnes9x/pkg-plist b/emulators/gsnes9x/pkg-plist
index b981b51adc52..68510a9501c5 100644
--- a/emulators/gsnes9x/pkg-plist
+++ b/emulators/gsnes9x/pkg-plist
@@ -26,10 +26,10 @@ share/gnome/help/GSnes9x/es/pop.png
 share/gnome/help/GSnes9x/es/system.png
 share/gnome/help/GSnes9x/es/tooltips.png
 share/gnome/help/GSnes9x/es/topic.dat
-share/gnome/pixmaps/gsnes9x-icon.png
-share/gnome/pixmaps/gsnesdefault.png
 share/locale/es/LC_MESSAGES/GSnes9x.mo
 share/locale/no/LC_MESSAGES/GSnes9x.mo
+share/pixmaps/gsnes9x-icon.png
+share/pixmaps/gsnesdefault.png
 @dirrm share/gnome/help/GSnes9x/es
 @dirrm share/gnome/help/GSnes9x/C
 @dirrm share/gnome/help/GSnes9x
diff --git a/emulators/gxmame/Makefile b/emulators/gxmame/Makefile
index 5147ef5ae5b4..851df8a953ef 100644
--- a/emulators/gxmame/Makefile
+++ b/emulators/gxmame/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gxmame
 DISTVERSION=	0.35beta2
-PORTREVISION=	5
+PORTREVISION=	6
 PORTEPOCH=	1
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
@@ -39,8 +39,6 @@ MAN6=		gxmame.6
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|CFLAGS="-Wall.*||' ${WRKSRC}/configure
-	@${REINPLACE_CMD} -e 's|$$(datadir)/doc|${PREFIX}/share/doc|' \
-		${WRKSRC}/Makefile.in ${WRKSRC}/html/Makefile.in
 	@${REINPLACE_CMD} -e 's|__GNUC___|__GNUC__|' ${WRKSRC}/src/common.h
 
 .include <bsd.port.mk>
diff --git a/emulators/gxmame/pkg-plist b/emulators/gxmame/pkg-plist
index 7fff5c9f41f8..0392417df669 100644
--- a/emulators/gxmame/pkg-plist
+++ b/emulators/gxmame/pkg-plist
@@ -1,5 +1,5 @@
 bin/gxmame
-share/gnome/applications/gxmame.desktop
+share/applications/gxmame.desktop
 %%NLS%%share/locale/de/LC_MESSAGES/gxmame.mo
 %%NLS%%share/locale/el/LC_MESSAGES/gxmame.mo
 %%NLS%%share/locale/es/LC_MESSAGES/gxmame.mo
@@ -9,11 +9,11 @@ share/gnome/applications/gxmame.desktop
 %%NLS%%share/locale/pl/LC_MESSAGES/gxmame.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/gxmame.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/gxmame.mo
-share/gnome/gxmame/gxmame.png
-share/gnome/gxmame/gxmame-general.png
-share/gnome/gxmame/gxmame-screen.png
-share/gnome/pixmaps/gxmame.png
-share/gnome/pixmaps/gxmame.xpm
+share/gxmame/gxmame.png
+share/gxmame/gxmame-general.png
+share/gxmame/gxmame-screen.png
+share/pixmaps/gxmame.png
+share/pixmaps/gxmame.xpm
 share/doc/gxmame/AUTHORS
 share/doc/gxmame/BUGS
 share/doc/gxmame/COPYING
@@ -30,8 +30,9 @@ share/doc/gxmame/html/gxmame-doc-5.html
 share/doc/gxmame/html/gxmame-doc-6.html
 share/doc/gxmame/html/gxmame-doc.html
 share/doc/gxmame/html/includes/gxmame.css
-@dirrm share/gnome/gxmame
+@dirrm share/gxmame
 @dirrm share/doc/gxmame/html/gui
 @dirrm share/doc/gxmame/html/includes
 @dirrm share/doc/gxmame/html
 @dirrm share/doc/gxmame
+@dirrmtry share/applications
diff --git a/emulators/raine/Makefile b/emulators/raine/Makefile
index 477a84c3501d..1d1fc0ef6d77 100644
--- a/emulators/raine/Makefile
+++ b/emulators/raine/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	raine
 PORTVERSION=	0.43.3
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	emulators games
 MASTER_SITES=	http://www.rainemu.com/html/archive/
 DISTNAME=	${PORTNAME}s-${PORTVERSION}
@@ -34,7 +34,7 @@ ONLY_FOR_ARCHS=	i386
 
 post-patch:
 	@${REINPLACE_CMD} -e "s, [$$]_mcpu,,g" ${WRKSRC}/detect-cpu
-	@${REINPLACE_CMD} -e "s,sdl-config,${SDL_CONFIG},g" -e "s,/usr/share/,/share/gnome/,g" \
+	@${REINPLACE_CMD} -e "s,sdl-config,${SDL_CONFIG},g" -e "s,/usr/share/,/share/,g" \
 		${WRKSRC}/makefile
 	@${REINPLACE_CMD} -e "s,/usr/share/games/raine,${DATADIR},g" \
 		${WRKSRC}/source/raine.c
diff --git a/emulators/raine/pkg-plist b/emulators/raine/pkg-plist
index c5e37ad57f63..c22062f7d57e 100644
--- a/emulators/raine/pkg-plist
+++ b/emulators/raine/pkg-plist
@@ -24,10 +24,11 @@ bin/raine
 %%DATADIR%%/languages/turkish.cfg
 %%DATADIR%%/languages/galego.cfg
 %%DATADIR%%/raine.dat
-share/gnome/applications/raine.desktop
-share/gnome/pixmaps/raine.png
+share/applications/raine.desktop
+share/pixmaps/raine.png
 @dirrmtry %%DATADIR%%/roms
 @dirrmtry %%DATADIR%%/emudx
 @dirrmtry %%DATADIR%%/artwork
 @dirrm %%DATADIR%%/languages
 @dirrmtry %%DATADIR%%
+@dirrmtry share/applications
diff --git a/emulators/tiemu2/Makefile b/emulators/tiemu2/Makefile
index 9bd0de1ef46d..74a29a21bbbc 100644
--- a/emulators/tiemu2/Makefile
+++ b/emulators/tiemu2/Makefile
@@ -30,10 +30,13 @@ MAN1=		tiemu.1
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 post-extract: .SILENT
-	${REINPLACE_CMD} -e 's,\*-\*-linux\*,\*-\*-freebsd\*,' \
-		${WRKSRC}/configure
+	${RM} ${WRKSRC}/src/Makefile
+	${REINPLACE_CMD} -e 's,\*-\*-linux\*,\*-\*-freebsd\*, ; \
+		s|-D.*_DISABLE_DEPRECATED||g' ${WRKSRC}/configure
 	${REINPLACE_CMD} -E 's,(install-data-am:).*$$,\1,' ${WRKSRC}/Makefile.in
 	${REINPLACE_CMD} -e 's,defined(__LINUX__),& || defined(__BSD__),' \
 		${WRKSRC}/src/gui/calc/pckeys.h ${WRKSRC}/src/misc/paths.h
+	${REINPLACE_CMD} -e 's|#define .*_DISABLE_DEPRECATED||g' \
+		${WRKSRC}/src/gui/comm.c
 
 .include <bsd.port.mk>
diff --git a/emulators/visualos/Makefile b/emulators/visualos/Makefile
index 862bdde20142..94801a23348e 100644
--- a/emulators/visualos/Makefile
+++ b/emulators/visualos/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	VisualOS
 PORTVERSION=	1.0.5
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	emulators gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME:L}
diff --git a/emulators/visualos/pkg-plist b/emulators/visualos/pkg-plist
index 3206824d3e4b..ae5883b206c7 100644
--- a/emulators/visualos/pkg-plist
+++ b/emulators/visualos/pkg-plist
@@ -1,8 +1,8 @@
 bin/VisualOS
-share/gnome/VisualOS/VisualOS.glade
-share/gnome/VisualOS/io_editor_disk.xpm
+share/VisualOS/VisualOS.glade
+share/VisualOS/io_editor_disk.xpm
 share/locale/cs/LC_MESSAGES/VisualOS.mo
 share/locale/es/LC_MESSAGES/VisualOS.mo
 share/locale/fr/LC_MESSAGES/VisualOS.mo
 share/locale/it/LC_MESSAGES/VisualOS.mo
-@dirrm share/gnome/VisualOS
+@dirrm share/VisualOS
diff --git a/finance/gnucash-docs/Makefile b/finance/gnucash-docs/Makefile
index c1d8436f9f25..0a93da583f35 100644
--- a/finance/gnucash-docs/Makefile
+++ b/finance/gnucash-docs/Makefile
@@ -3,10 +3,12 @@
 # Whom:                Glenn Johnson <glennpj@charter.net>
 #
 # $FreeBSD$
-#    $MCom: ports/finance/gnucash-docs/Makefile,v 1.3 2006/12/24 19:09:22 ahze Exp $
+#   $MCom: ports/finance/gnucash-docs/Makefile,v 1.7 2007/08/04 03:51:29 marcus Exp $
+#
 
 PORTNAME=	gnucash-docs
 PORTVERSION=	2.2.0
+PORTREVISION=	2
 CATEGORIES=	finance gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://www.gnucash.org/pub/gnucash/sources/stable/ \
@@ -17,9 +19,8 @@ MASTER_SITE_SUBDIR=	gnucash
 MAINTAINER=	ahze@FreeBSD.org
 COMMENT=	Documentation for gnucash
 
-BUILD_DEPENDS=	scrollkeeper-config:${PORTSDIR}/textproc/scrollkeeper
-RUN_DEPENDS=	scrollkeeper-config:${PORTSDIR}/textproc/scrollkeeper \
-		yelp:${PORTSDIR}/x11/yelp
+LIB_DEPENDS=	rarian.0:${PORTSDIR}/textproc/rarian
+RUN_DEPENDS=	yelp:${PORTSDIR}/x11/yelp
 
 INSTALLS_OMF=	yes
 USE_GMAKE=	yes
@@ -27,8 +28,4 @@ USE_GNOME=	libxml2 gnomehier
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include"
 
-post-patch:
-	@${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} \
-		${REINPLACE_CMD} -e 's| $$(datadir)/omf| ${PREFIX}/share/gnome/omf|'
-
 .include <bsd.port.mk>
diff --git a/finance/gnucash-docs/pkg-plist b/finance/gnucash-docs/pkg-plist
index 22905fd6b2fa..e7a729d2b60d 100644
--- a/finance/gnucash-docs/pkg-plist
+++ b/finance/gnucash-docs/pkg-plist
@@ -240,10 +240,10 @@ share/gnome/help/gnucash/de_DE/figures/up.png
 share/gnome/help/gnucash/de_DE/gnucash-help.xml
 share/gnome/help/gnucash/de_DE/legal.xml
 share/gnome/help/gnucash/de_DE/txf-categories.xml
-share/gnome/omf/gnucash-docs/gnucash-guide-C.omf
-share/gnome/omf/gnucash-docs/gnucash-help-C.omf
-share/gnome/omf/gnucash-docs/gnucash-help-de_DE.omf
-@dirrm share/gnome/omf/gnucash-docs
+share/omf/gnucash-docs/gnucash-guide-C.omf
+share/omf/gnucash-docs/gnucash-help-C.omf
+share/omf/gnucash-docs/gnucash-help-de_DE.omf
+@dirrm share/omf/gnucash-docs
 @dirrm share/gnome/help/gnucash/de_DE/figures
 @dirrm share/gnome/help/gnucash/de_DE
 @dirrm share/gnome/help/gnucash/C/figures
diff --git a/finance/gnucash/Makefile b/finance/gnucash/Makefile
index 95bbd8752a0c..253eb49a159d 100644
--- a/finance/gnucash/Makefile
+++ b/finance/gnucash/Makefile
@@ -3,11 +3,12 @@
 # Whom:				  David O'Brien (obrien@NUXI.com)
 #
 # $FreeBSD$
-#   $MCom: ports/finance/gnucash/Makefile,v 1.14 2007/03/13 05:58:37 marcus Exp $
+#   $MCom: ports/finance/gnucash/Makefile,v 1.22 2007/07/30 20:05:51 mezz Exp $
 #
 
 PORTNAME=	gnucash
 PORTVERSION=	2.2.0
+PORTREVISION=	1
 CATEGORIES=	finance gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://www.gnucash.org/pub/gnucash/sources/stable/
@@ -29,7 +30,7 @@ RUN_DEPENDS=	guile>=1.6.8_2:${PORTSDIR}/lang/guile \
 		${SITE_PERL}/Finance/Quote.pm:${PORTSDIR}/finance/p5-Finance-Quote \
 		${SITE_PERL}/HTML/TableExtract.pm:${PORTSDIR}/www/p5-HTML-TableExtract \
 		${SITE_PERL}/Finance/QuoteHist.pm:${PORTSDIR}/finance/p5-Finance-QuoteHist \
-		${LOCALBASE}/share/gnome/omf/gnucash-docs/gnucash-guide-C.omf:${PORTSDIR}/finance/gnucash-docs
+		${LOCALBASE}/share/omf/gnucash-docs/gnucash-guide-C.omf:${PORTSDIR}/finance/gnucash-docs
 
 OPTIONS=	AQBANKING	"AqBanking support (HBCI/OpenHBCI)"	off
 
@@ -46,8 +47,8 @@ USE_LDCONFIG=	yes
 CONFIGURE_ARGS=--with-glib-config=${GLIB_CONFIG} \
 		--enable-ofx \
 		--disable-error-on-warning
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
-		LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib -lintl"
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LIBS="-L${LOCALBASE}/lib -lintl"
 
 MAN1=		gnc-prices.1 gnucash.1
 INFO=		gnucash-design
@@ -80,10 +81,4 @@ CONFIGURE_ARGS+=--disable-hbci
 PLIST_SUB=	AQBANKING="@comment "
 .endif
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|$${datarootdir}/info|${PREFIX}/info|' \
-		${WRKSRC}/configure
-	@${REINPLACE_CMD} -e 's|$$(datadir)/aclocal|${PREFIX}/share/aclocal|' \
-		${WRKSRC}/Makefile.in
-
 .include <bsd.port.post.mk>
diff --git a/finance/gnucash/pkg-plist b/finance/gnucash/pkg-plist
index 69b99890dc6e..a4a34cf387ea 100644
--- a/finance/gnucash/pkg-plist
+++ b/finance/gnucash/pkg-plist
@@ -273,510 +273,510 @@ lib/libgnc-qof.so.1
 libexec/gnucash/overrides/gnucash-env
 libexec/gnucash/overrides/gnucash-make-guids
 libexec/gnucash/overrides/guile
-share/gnome/applications/gnucash.desktop
-share/gnome/gnucash/accounts/C/acctchrt_brokerage.gnucash-xea
-share/gnome/gnucash/accounts/C/acctchrt_business.gnucash-xea
-share/gnome/gnucash/accounts/C/acctchrt_carloan.gnucash-xea
-share/gnome/gnucash/accounts/C/acctchrt_cdmoneymkt.gnucash-xea
-share/gnome/gnucash/accounts/C/acctchrt_checkbook.gnucash-xea
-share/gnome/gnucash/accounts/C/acctchrt_childcare.gnucash-xea
-share/gnome/gnucash/accounts/C/acctchrt_common.gnucash-xea
-share/gnome/gnucash/accounts/C/acctchrt_eduloan.gnucash-xea
-share/gnome/gnucash/accounts/C/acctchrt_fixedassets.gnucash-xea
-share/gnome/gnucash/accounts/C/acctchrt_homeloan.gnucash-xea
-share/gnome/gnucash/accounts/C/acctchrt_homeown.gnucash-xea
-share/gnome/gnucash/accounts/C/acctchrt_otherloan.gnucash-xea
-share/gnome/gnucash/accounts/C/acctchrt_renter.gnucash-xea
-share/gnome/gnucash/accounts/C/acctchrt_retiremt.gnucash-xea
-share/gnome/gnucash/accounts/C/acctchrt_spouseinc.gnucash-xea
-share/gnome/gnucash/accounts/C/acctchrt_spouseretire.gnucash-xea
-share/gnome/gnucash/accounts/da/acctchrt_car.gnucash-xea
-share/gnome/gnucash/accounts/da/acctchrt_common.gnucash-xea
-share/gnome/gnucash/accounts/da/acctchrt_homeloan.gnucash-xea
-share/gnome/gnucash/accounts/da/acctchrt_homeown.gnucash-xea
-share/gnome/gnucash/accounts/de_AT/acctchrt_auto.gnucash-xea
-share/gnome/gnucash/accounts/de_AT/acctchrt_autoloan.gnucash-xea
-share/gnome/gnucash/accounts/de_AT/acctchrt_brokerage.gnucash-xea
-share/gnome/gnucash/accounts/de_AT/acctchrt_business.gnucash-xea
-share/gnome/gnucash/accounts/de_AT/acctchrt_common.gnucash-xea
-share/gnome/gnucash/accounts/de_AT/acctchrt_houseown.gnucash-xea
-share/gnome/gnucash/accounts/de_AT/acctchrt_investment.gnucash-xea
-share/gnome/gnucash/accounts/de_AT/acctchrt_kids.gnucash-xea
-share/gnome/gnucash/accounts/de_CH/acctchrt_brokerage.gnucash-xea
-share/gnome/gnucash/accounts/de_CH/acctchrt_chkmu.gnucash-xea
-share/gnome/gnucash/accounts/de_CH/acctchrt_common.gnucash-xea
-share/gnome/gnucash/accounts/de_CH/acctchrt_kids.gnucash-xea
-share/gnome/gnucash/accounts/de_CH/acctchrt_otherasset.gnucash-xea
-share/gnome/gnucash/accounts/de_CH/acctchrt_otherloan.gnucash-xea
-share/gnome/gnucash/accounts/de_DE/acctchrt_auto.gnucash-xea
-share/gnome/gnucash/accounts/de_DE/acctchrt_autoloan.gnucash-xea
-share/gnome/gnucash/accounts/de_DE/acctchrt_brokerage.gnucash-xea
-share/gnome/gnucash/accounts/de_DE/acctchrt_common.gnucash-xea
-share/gnome/gnucash/accounts/de_DE/acctchrt_houseown.gnucash-xea
-share/gnome/gnucash/accounts/de_DE/acctchrt_investment.gnucash-xea
-share/gnome/gnucash/accounts/de_DE/acctchrt_kids.gnucash-xea
-share/gnome/gnucash/accounts/de_DE/acctchrt_otherasset.gnucash-xea
-share/gnome/gnucash/accounts/de_DE/acctchrt_otherloan.gnucash-xea
-share/gnome/gnucash/accounts/de_DE/acctchrt_skr03.gnucash-xea
-share/gnome/gnucash/accounts/de_DE/acctchrt_skr04.gnucash-xea
-share/gnome/gnucash/accounts/de_DE/acctchrt_studium.gnucash-xea
-share/gnome/gnucash/accounts/el_GR/acctchrt_brokerage.gnucash-xea
-share/gnome/gnucash/accounts/el_GR/acctchrt_carloan.gnucash-xea
-share/gnome/gnucash/accounts/el_GR/acctchrt_common.gnucash-xea
-share/gnome/gnucash/accounts/en_GB/acctchrt_brokerage.gnucash-xea
-share/gnome/gnucash/accounts/en_GB/acctchrt_business.gnucash-xea
-share/gnome/gnucash/accounts/en_GB/acctchrt_carloan.gnucash-xea
-share/gnome/gnucash/accounts/en_GB/acctchrt_cdmoneymkt.gnucash-xea
-share/gnome/gnucash/accounts/en_GB/acctchrt_checkbook.gnucash-xea
-share/gnome/gnucash/accounts/en_GB/acctchrt_childcare.gnucash-xea
-share/gnome/gnucash/accounts/en_GB/acctchrt_common.gnucash-xea
-share/gnome/gnucash/accounts/en_GB/acctchrt_eduloan.gnucash-xea
-share/gnome/gnucash/accounts/en_GB/acctchrt_fixedassets.gnucash-xea
-share/gnome/gnucash/accounts/en_GB/acctchrt_homeloan.gnucash-xea
-share/gnome/gnucash/accounts/en_GB/acctchrt_homeown.gnucash-xea
-share/gnome/gnucash/accounts/en_GB/acctchrt_otherloan.gnucash-xea
-share/gnome/gnucash/accounts/en_GB/acctchrt_renter.gnucash-xea
-share/gnome/gnucash/accounts/en_GB/acctchrt_retiremt.gnucash-xea
-share/gnome/gnucash/accounts/en_GB/acctchrt_spouseinc.gnucash-xea
-share/gnome/gnucash/accounts/en_GB/acctchrt_spouseretire.gnucash-xea
-share/gnome/gnucash/accounts/en_GB/uk-vat.gnucash-xea
-share/gnome/gnucash/accounts/es_ES/acctchrt_brokerage.gnucash-xea
-share/gnome/gnucash/accounts/es_ES/acctchrt_carloan.gnucash-xea
-share/gnome/gnucash/accounts/es_ES/acctchrt_cdmoneymkt.gnucash-xea
-share/gnome/gnucash/accounts/es_ES/acctchrt_childcare.gnucash-xea
-share/gnome/gnucash/accounts/es_ES/acctchrt_common.gnucash-xea
-share/gnome/gnucash/accounts/es_ES/acctchrt_currency.gnucash-xea
-share/gnome/gnucash/accounts/es_ES/acctchrt_eduloan.gnucash-xea
-share/gnome/gnucash/accounts/es_ES/acctchrt_fixedassets.gnucash-xea
-share/gnome/gnucash/accounts/es_ES/acctchrt_homeloan.gnucash-xea
-share/gnome/gnucash/accounts/es_ES/acctchrt_homeown.gnucash-xea
-share/gnome/gnucash/accounts/es_ES/acctchrt_otherloan.gnucash-xea
-share/gnome/gnucash/accounts/es_ES/acctchrt_renter.gnucash-xea
-share/gnome/gnucash/accounts/es_ES/acctchrt_retiremt.gnucash-xea
-share/gnome/gnucash/accounts/es_ES/acctchrt_spouseinc.gnucash-xea
-share/gnome/gnucash/accounts/es_ES/acctchrt_spouseretire.gnucash-xea
-share/gnome/gnucash/accounts/fr_CA/acctchrt_actifsfixes.gnucash-xea
-share/gnome/gnucash/accounts/fr_CA/acctchrt_automobile.gnucash-xea
-share/gnome/gnucash/accounts/fr_CA/acctchrt_basecommune.gnucash-xea
-share/gnome/gnucash/accounts/fr_CA/acctchrt_cdmarchemon.gnucash-xea
-share/gnome/gnucash/accounts/fr_CA/acctchrt_chequier.gnucash-xea
-share/gnome/gnucash/accounts/fr_CA/acctchrt_conjointretraite.gnucash-xea
-share/gnome/gnucash/accounts/fr_CA/acctchrt_conjointrev.gnucash-xea
-share/gnome/gnucash/accounts/fr_CA/acctchrt_courtage.gnucash-xea
-share/gnome/gnucash/accounts/fr_CA/acctchrt_etudeemprunt.gnucash-xea
-share/gnome/gnucash/accounts/fr_CA/acctchrt_garderie.gnucash-xea
-share/gnome/gnucash/accounts/fr_CA/acctchrt_locataire.gnucash-xea
-share/gnome/gnucash/accounts/fr_CA/acctchrt_proprietaire.gnucash-xea
-share/gnome/gnucash/accounts/fr_CA/acctchrt_retraite.gnucash-xea
-share/gnome/gnucash/accounts/fr_CA/acctchrt_revenus.gnucash-xea
-share/gnome/gnucash/accounts/fr_CH/acctchrt_brokerage.gnucash-xea
-share/gnome/gnucash/accounts/fr_CH/acctchrt_business.gnucash-xea
-share/gnome/gnucash/accounts/fr_CH/acctchrt_carloan.gnucash-xea
-share/gnome/gnucash/accounts/fr_CH/acctchrt_cdmoneymkt.gnucash-xea
-share/gnome/gnucash/accounts/fr_CH/acctchrt_childcare.gnucash-xea
-share/gnome/gnucash/accounts/fr_CH/acctchrt_common.gnucash-xea
-share/gnome/gnucash/accounts/fr_CH/acctchrt_currency.gnucash-xea
-share/gnome/gnucash/accounts/fr_CH/acctchrt_eduloan.gnucash-xea
-share/gnome/gnucash/accounts/fr_CH/acctchrt_fixedassets.gnucash-xea
-share/gnome/gnucash/accounts/fr_CH/acctchrt_homeloan.gnucash-xea
-share/gnome/gnucash/accounts/fr_CH/acctchrt_homeown.gnucash-xea
-share/gnome/gnucash/accounts/fr_CH/acctchrt_otherloan.gnucash-xea
-share/gnome/gnucash/accounts/fr_CH/acctchrt_renter.gnucash-xea
-share/gnome/gnucash/accounts/fr_CH/acctchrt_retiremt.gnucash-xea
-share/gnome/gnucash/accounts/fr_CH/acctchrt_spouseinc.gnucash-xea
-share/gnome/gnucash/accounts/fr_CH/acctchrt_spouseretire.gnucash-xea
-share/gnome/gnucash/accounts/fr_FR/acctchrt_brokerage.gnucash-xea
-share/gnome/gnucash/accounts/fr_FR/acctchrt_business.gnucash-xea
-share/gnome/gnucash/accounts/fr_FR/acctchrt_carloan.gnucash-xea
-share/gnome/gnucash/accounts/fr_FR/acctchrt_cdmoneymkt.gnucash-xea
-share/gnome/gnucash/accounts/fr_FR/acctchrt_childcare.gnucash-xea
-share/gnome/gnucash/accounts/fr_FR/acctchrt_common.gnucash-xea
-share/gnome/gnucash/accounts/fr_FR/acctchrt_currency.gnucash-xea
-share/gnome/gnucash/accounts/fr_FR/acctchrt_eduloan.gnucash-xea
-share/gnome/gnucash/accounts/fr_FR/acctchrt_fixedassets.gnucash-xea
-share/gnome/gnucash/accounts/fr_FR/acctchrt_homeloan.gnucash-xea
-share/gnome/gnucash/accounts/fr_FR/acctchrt_homeown.gnucash-xea
-share/gnome/gnucash/accounts/fr_FR/acctchrt_otherloan.gnucash-xea
-share/gnome/gnucash/accounts/fr_FR/acctchrt_renter.gnucash-xea
-share/gnome/gnucash/accounts/fr_FR/acctchrt_retiremt.gnucash-xea
-share/gnome/gnucash/accounts/fr_FR/acctchrt_spouseinc.gnucash-xea
-share/gnome/gnucash/accounts/fr_FR/acctchrt_spouseretire.gnucash-xea
-share/gnome/gnucash/accounts/hu_HU/acctchrt_brokerage.gnucash-xea
-share/gnome/gnucash/accounts/hu_HU/acctchrt_business.gnucash-xea
-share/gnome/gnucash/accounts/hu_HU/acctchrt_carloan.gnucash-xea
-share/gnome/gnucash/accounts/hu_HU/acctchrt_cdmoneymkt.gnucash-xea
-share/gnome/gnucash/accounts/hu_HU/acctchrt_checkbook.gnucash-xea
-share/gnome/gnucash/accounts/hu_HU/acctchrt_childcare.gnucash-xea
-share/gnome/gnucash/accounts/hu_HU/acctchrt_common.gnucash-xea
-share/gnome/gnucash/accounts/hu_HU/acctchrt_eduloan.gnucash-xea
-share/gnome/gnucash/accounts/hu_HU/acctchrt_fixedassets.gnucash-xea
-share/gnome/gnucash/accounts/hu_HU/acctchrt_homeloan.gnucash-xea
-share/gnome/gnucash/accounts/hu_HU/acctchrt_homeown.gnucash-xea
-share/gnome/gnucash/accounts/hu_HU/acctchrt_otherloan.gnucash-xea
-share/gnome/gnucash/accounts/hu_HU/acctchrt_renter.gnucash-xea
-share/gnome/gnucash/accounts/hu_HU/acctchrt_retiremt.gnucash-xea
-share/gnome/gnucash/accounts/hu_HU/acctchrt_spouseinc.gnucash-xea
-share/gnome/gnucash/accounts/hu_HU/acctchrt_spouseretire.gnucash-xea
-share/gnome/gnucash/accounts/it/acctchrt_brokerage.gnucash-xea
-share/gnome/gnucash/accounts/it/acctchrt_carloan.gnucash-xea
-share/gnome/gnucash/accounts/it/acctchrt_checkbook.gnucash-xea
-share/gnome/gnucash/accounts/it/acctchrt_childcare.gnucash-xea
-share/gnome/gnucash/accounts/it/acctchrt_common.gnucash-xea
-share/gnome/gnucash/accounts/it/acctchrt_fixedassets.gnucash-xea
-share/gnome/gnucash/accounts/it/acctchrt_homeloan.gnucash-xea
-share/gnome/gnucash/accounts/it/acctchrt_homeown.gnucash-xea
-share/gnome/gnucash/accounts/it/acctchrt_otherloan.gnucash-xea
-share/gnome/gnucash/accounts/it/acctchrt_renter.gnucash-xea
-share/gnome/gnucash/accounts/it/acctchrt_retiremt.gnucash-xea
-share/gnome/gnucash/accounts/it/acctchrt_spouseinc.gnucash-xea
-share/gnome/gnucash/accounts/it/acctchrt_spouseretire.gnucash-xea
-share/gnome/gnucash/accounts/nb/acctchrt_brokerage.gnucash-xea
-share/gnome/gnucash/accounts/nb/acctchrt_business.gnucash-xea
-share/gnome/gnucash/accounts/nb/acctchrt_carloan.gnucash-xea
-share/gnome/gnucash/accounts/nb/acctchrt_cdmoneymkt.gnucash-xea
-share/gnome/gnucash/accounts/nb/acctchrt_checkbook.gnucash-xea
-share/gnome/gnucash/accounts/nb/acctchrt_childcare.gnucash-xea
-share/gnome/gnucash/accounts/nb/acctchrt_common.gnucash-xea
-share/gnome/gnucash/accounts/nb/acctchrt_eduloan.gnucash-xea
-share/gnome/gnucash/accounts/nb/acctchrt_fixedassets.gnucash-xea
-share/gnome/gnucash/accounts/nb/acctchrt_full.gnucash-xea
-share/gnome/gnucash/accounts/nb/acctchrt_homeloan.gnucash-xea
-share/gnome/gnucash/accounts/nb/acctchrt_homeown.gnucash-xea
-share/gnome/gnucash/accounts/nb/acctchrt_otherloan.gnucash-xea
-share/gnome/gnucash/accounts/nb/acctchrt_renter.gnucash-xea
-share/gnome/gnucash/accounts/nb/acctchrt_retiremt.gnucash-xea
-share/gnome/gnucash/accounts/nb/acctchrt_spouseinc.gnucash-xea
-share/gnome/gnucash/accounts/nb/acctchrt_spouseretire.gnucash-xea
-share/gnome/gnucash/accounts/pt_BR/acctchrt_brokerage.gnucash-xea
-share/gnome/gnucash/accounts/pt_BR/acctchrt_carloan.gnucash-xea
-share/gnome/gnucash/accounts/pt_BR/acctchrt_cdmoneymkt.gnucash-xea
-share/gnome/gnucash/accounts/pt_BR/acctchrt_childcare.gnucash-xea
-share/gnome/gnucash/accounts/pt_BR/acctchrt_common.gnucash-xea
-share/gnome/gnucash/accounts/pt_BR/acctchrt_currency.gnucash-xea
-share/gnome/gnucash/accounts/pt_BR/acctchrt_eduloan.gnucash-xea
-share/gnome/gnucash/accounts/pt_BR/acctchrt_fixedassets.gnucash-xea
-share/gnome/gnucash/accounts/pt_BR/acctchrt_homeloan.gnucash-xea
-share/gnome/gnucash/accounts/pt_BR/acctchrt_homeown.gnucash-xea
-share/gnome/gnucash/accounts/pt_BR/acctchrt_otherloan.gnucash-xea
-share/gnome/gnucash/accounts/pt_BR/acctchrt_renter.gnucash-xea
-share/gnome/gnucash/accounts/pt_BR/acctchrt_retiremt.gnucash-xea
-share/gnome/gnucash/accounts/pt_BR/acctchrt_spouseinc.gnucash-xea
-share/gnome/gnucash/accounts/pt_BR/acctchrt_spouseretire.gnucash-xea
-share/gnome/gnucash/accounts/pt_PT/acctchrt_brokerage.gnucash-xea
-share/gnome/gnucash/accounts/pt_PT/acctchrt_carloan.gnucash-xea
-share/gnome/gnucash/accounts/pt_PT/acctchrt_cdmoneymkt.gnucash-xea
-share/gnome/gnucash/accounts/pt_PT/acctchrt_childcare.gnucash-xea
-share/gnome/gnucash/accounts/pt_PT/acctchrt_common.gnucash-xea
-share/gnome/gnucash/accounts/pt_PT/acctchrt_eduloan.gnucash-xea
-share/gnome/gnucash/accounts/pt_PT/acctchrt_fixedassets.gnucash-xea
-share/gnome/gnucash/accounts/pt_PT/acctchrt_homeloan.gnucash-xea
-share/gnome/gnucash/accounts/pt_PT/acctchrt_homeown.gnucash-xea
-share/gnome/gnucash/accounts/pt_PT/acctchrt_otherloan.gnucash-xea
-share/gnome/gnucash/accounts/pt_PT/acctchrt_renter.gnucash-xea
-share/gnome/gnucash/accounts/pt_PT/acctchrt_retiremt.gnucash-xea
-share/gnome/gnucash/accounts/pt_PT/acctchrt_spouseinc.gnucash-xea
-share/gnome/gnucash/accounts/pt_PT/acctchrt_spouseretire.gnucash-xea
-share/gnome/gnucash/accounts/sk/acctchrt_brokerage.gnucash-xea
-share/gnome/gnucash/accounts/sk/acctchrt_carloan.gnucash-xea
-share/gnome/gnucash/accounts/sk/acctchrt_cdmoneymkt.gnucash-xea
-share/gnome/gnucash/accounts/sk/acctchrt_childcare.gnucash-xea
-share/gnome/gnucash/accounts/sk/acctchrt_common.gnucash-xea
-share/gnome/gnucash/accounts/sk/acctchrt_currency.gnucash-xea
-share/gnome/gnucash/accounts/sk/acctchrt_eduloan.gnucash-xea
-share/gnome/gnucash/accounts/sk/acctchrt_fixedassets.gnucash-xea
-share/gnome/gnucash/accounts/sk/acctchrt_homeloan.gnucash-xea
-share/gnome/gnucash/accounts/sk/acctchrt_homeown.gnucash-xea
-share/gnome/gnucash/accounts/sk/acctchrt_otherloan.gnucash-xea
-share/gnome/gnucash/accounts/sk/acctchrt_renter.gnucash-xea
-share/gnome/gnucash/accounts/sk/acctchrt_retiremt.gnucash-xea
-share/gnome/gnucash/accounts/sk/acctchrt_spouseinc.gnucash-xea
-share/gnome/gnucash/accounts/sk/acctchrt_spouseretire.gnucash-xea
-share/gnome/gnucash/accounts/tr_TR/acctchrt_TEKDUZ.gnucash-xea
-share/gnome/gnucash/accounts/tr_TR/acctchrt_brokerage.gnucash-xea
-share/gnome/gnucash/accounts/tr_TR/acctchrt_carloan.gnucash-xea
-share/gnome/gnucash/accounts/tr_TR/acctchrt_cdmoneymkt.gnucash-xea
-share/gnome/gnucash/accounts/tr_TR/acctchrt_checkbook.gnucash-xea
-share/gnome/gnucash/accounts/tr_TR/acctchrt_common.gnucash-xea
-share/gnome/gnucash/accounts/tr_TR/acctchrt_fixedassets.gnucash-xea
-share/gnome/gnucash/accounts/tr_TR/acctchrt_homeloan.gnucash-xea
-share/gnome/gnucash/checks/deluxe.chk
-share/gnome/gnucash/checks/quicken.chk
-share/gnome/gnucash/checks/quicken_wallet.chk
-share/gnome/gnucash/doc/AUTHORS
-share/gnome/gnucash/doc/COPYING
-share/gnome/gnucash/doc/ChangeLog
-share/gnome/gnucash/doc/ChangeLog.2003
-share/gnome/gnucash/doc/ChangeLog.2004
-share/gnome/gnucash/doc/ChangeLog.2005
-share/gnome/gnucash/doc/ChangeLog.2006
-share/gnome/gnucash/doc/DOCUMENTERS
-share/gnome/gnucash/doc/HACKING
-share/gnome/gnucash/doc/INSTALL
-share/gnome/gnucash/doc/LICENSE
-share/gnome/gnucash/doc/NEWS
-share/gnome/gnucash/doc/README
-share/gnome/gnucash/doc/README-de.win32-bin.txt
-share/gnome/gnucash/doc/README-fr.win32-bin.txt
-share/gnome/gnucash/doc/README.dependencies
-share/gnome/gnucash/doc/README.francais
-share/gnome/gnucash/doc/README.german
-share/gnome/gnucash/doc/README.patches
-share/gnome/gnucash/doc/README.win32-bin.txt
-share/gnome/gnucash/doc/examples/Money95bank_fr.qif
-share/gnome/gnucash/doc/examples/Money95invst_fr.qif
-share/gnome/gnucash/doc/examples/Money95mfunds_fr.qif
-share/gnome/gnucash/doc/examples/Money95stocks_fr.qif
-share/gnome/gnucash/doc/examples/README
-share/gnome/gnucash/doc/examples/abc-all.qif
-share/gnome/gnucash/doc/examples/abc.qif
-share/gnome/gnucash/doc/examples/bogus.qif
-share/gnome/gnucash/doc/examples/cbb-export.qif
-share/gnome/gnucash/doc/examples/currency.xac
-share/gnome/gnucash/doc/examples/currency_tree_xml.xac
-share/gnome/gnucash/doc/examples/every.qif
-share/gnome/gnucash/doc/examples/ms-money.qif
-share/gnome/gnucash/doc/examples/quicktest.qif
-share/gnome/gnucash/doc/examples/splitdemo.xac
-share/gnome/gnucash/doc/examples/swipe.qif
-share/gnome/gnucash/doc/examples/taxreport.xac
-share/gnome/gnucash/doc/examples/test.xac
-share/gnome/gnucash/doc/examples/test2.xac
-share/gnome/gnucash/doc/examples/test3.xac
-share/gnome/gnucash/doc/examples/test4.xac
-share/gnome/gnucash/doc/examples/trading.xac
-share/gnome/gnucash/doc/examples/trading2.xac
-share/gnome/gnucash/doc/examples/web.qif
-share/gnome/gnucash/doc/examples/xfer.xac
-share/gnome/gnucash/doc/guile-hackers.txt
-share/gnome/gnucash/doc/projects.html
-share/gnome/gnucash/glade/account.glade
-share/gnome/gnucash/glade/acctperiod.glade
-share/gnome/gnucash/glade/billterms.glade
-share/gnome/gnucash/glade/budget.glade
-share/gnome/gnucash/glade/businessprefs.glade
-share/gnome/gnucash/glade/chart-export.glade
-share/gnome/gnucash/glade/choose-owner.glade
-share/gnome/gnucash/glade/commodities.glade
-share/gnome/gnucash/glade/commodity.glade
-share/gnome/gnucash/glade/customer.glade
-share/gnome/gnucash/glade/date-close.glade
-share/gnome/gnucash/glade/dialog-query-list.glade
-share/gnome/gnucash/glade/dialog-reset-warnings.glade
-share/gnome/gnucash/glade/druid-gconf-setup.glade
-share/gnome/gnucash/glade/druid-gnc-xml-import.glade
-share/gnome/gnucash/glade/druid-provider-multifile.glade
-share/gnome/gnucash/glade/employee.glade
-share/gnome/gnucash/glade/exchange-dialog.glade
-share/gnome/gnucash/glade/fincalc.glade
-share/gnome/gnucash/glade/generic-import.glade
-share/gnome/gnucash/glade/gnc-date-format.glade
-share/gnome/gnucash/glade/gnc-gui-query.glade
-share/gnome/gnucash/glade/import-provider-format.glade
-share/gnome/gnucash/glade/invoice.glade
-share/gnome/gnucash/glade/job.glade
-share/gnome/gnucash/glade/lots.glade
-share/gnome/gnucash/glade/merge.glade
-share/gnome/gnucash/glade/newuser.glade
-share/gnome/gnucash/glade/order.glade
-share/gnome/gnucash/glade/payment.glade
-share/gnome/gnucash/glade/preferences.glade
-share/gnome/gnucash/glade/price.glade
-share/gnome/gnucash/glade/print.glade
-share/gnome/gnucash/glade/progress.glade
-share/gnome/gnucash/glade/qif.glade
-share/gnome/gnucash/glade/reconcile.glade
-share/gnome/gnucash/glade/register.glade
-share/gnome/gnucash/glade/report.glade
-share/gnome/gnucash/glade/sched-xact.glade
-share/gnome/gnucash/glade/search.glade
-share/gnome/gnucash/glade/stocks.glade
-share/gnome/gnucash/glade/tax-tables.glade
-share/gnome/gnucash/glade/tax.glade
-share/gnome/gnucash/glade/totd.glade
-share/gnome/gnucash/glade/transfer.glade
-share/gnome/gnucash/glade/userpass.glade
-share/gnome/gnucash/glade/vendor.glade
-share/gnome/gnucash/gnome
-share/gnome/gnucash/guile-modules/gnucash/app-utils.scm
-share/gnome/gnucash/guile-modules/gnucash/business-core.scm
-share/gnome/gnucash/guile-modules/gnucash/business-gnome.scm
-share/gnome/gnucash/guile-modules/gnucash/business-utils.scm
-share/gnome/gnucash/guile-modules/gnucash/core-utils.scm
-share/gnome/gnucash/guile-modules/gnucash/dialog-tax-table.scm
-share/gnome/gnucash/guile-modules/gnucash/engine.scm
-share/gnome/gnucash/guile-modules/gnucash/gnc-module.scm
-share/gnome/gnucash/guile-modules/gnucash/gnome-utils.scm
-share/gnome/gnucash/guile-modules/gnucash/import-export/qif-import.scm
-share/gnome/gnucash/guile-modules/gnucash/main.scm
-share/gnome/gnucash/guile-modules/gnucash/price-quotes.scm
-share/gnome/gnucash/guile-modules/gnucash/report/account-piecharts.scm
-share/gnome/gnucash/guile-modules/gnucash/report/account-summary.scm
-share/gnome/gnucash/guile-modules/gnucash/report/advanced-portfolio.scm
-share/gnome/gnucash/guile-modules/gnucash/report/aging.scm
-share/gnome/gnucash/guile-modules/gnucash/report/average-balance.scm
-share/gnome/gnucash/guile-modules/gnucash/report/balance-sheet.scm
-share/gnome/gnucash/guile-modules/gnucash/report/budget.scm
-share/gnome/gnucash/guile-modules/gnucash/report/business-reports.scm
-share/gnome/gnucash/guile-modules/gnucash/report/cash-flow.scm
-share/gnome/gnucash/guile-modules/gnucash/report/category-barchart.scm
-share/gnome/gnucash/guile-modules/gnucash/report/daily-reports.scm
-share/gnome/gnucash/guile-modules/gnucash/report/easy-invoice.scm
-share/gnome/gnucash/guile-modules/gnucash/report/equity-statement.scm
-share/gnome/gnucash/guile-modules/gnucash/report/fancy-invoice.scm
-share/gnome/gnucash/guile-modules/gnucash/report/general-journal.scm
-share/gnome/gnucash/guile-modules/gnucash/report/general-ledger.scm
-share/gnome/gnucash/guile-modules/gnucash/report/hello-world.scm
-share/gnome/gnucash/guile-modules/gnucash/report/income-statement.scm
-share/gnome/gnucash/guile-modules/gnucash/report/invoice.scm
-share/gnome/gnucash/guile-modules/gnucash/report/locale-specific/de_DE.scm
-share/gnome/gnucash/guile-modules/gnucash/report/locale-specific/us.scm
-share/gnome/gnucash/guile-modules/gnucash/report/net-barchart.scm
-share/gnome/gnucash/guile-modules/gnucash/report/owner-report.scm
-share/gnome/gnucash/guile-modules/gnucash/report/payables.scm
-share/gnome/gnucash/guile-modules/gnucash/report/portfolio.scm
-share/gnome/gnucash/guile-modules/gnucash/report/price-scatter.scm
-share/gnome/gnucash/guile-modules/gnucash/report/receivables.scm
-share/gnome/gnucash/guile-modules/gnucash/report/register.scm
-share/gnome/gnucash/guile-modules/gnucash/report/report-gnome.scm
-share/gnome/gnucash/guile-modules/gnucash/report/report-system.scm
-share/gnome/gnucash/guile-modules/gnucash/report/standard-reports.scm
-share/gnome/gnucash/guile-modules/gnucash/report/stylesheet-easy.scm
-share/gnome/gnucash/guile-modules/gnucash/report/stylesheet-fancy.scm
-share/gnome/gnucash/guile-modules/gnucash/report/stylesheet-plain.scm
-share/gnome/gnucash/guile-modules/gnucash/report/stylesheets.scm
-share/gnome/gnucash/guile-modules/gnucash/report/taxtxf-de_DE.scm
-share/gnome/gnucash/guile-modules/gnucash/report/taxtxf.scm
-share/gnome/gnucash/guile-modules/gnucash/report/transaction.scm
-share/gnome/gnucash/guile-modules/gnucash/report/trial-balance.scm
-share/gnome/gnucash/guile-modules/gnucash/report/utility-reports.scm
-share/gnome/gnucash/guile-modules/gnucash/report/view-column.scm
-share/gnome/gnucash/guile-modules/gnucash/report/welcome-to-gnucash.scm
-share/gnome/gnucash/guile-modules/gnucash/tax/de_DE.scm
-share/gnome/gnucash/guile-modules/gnucash/tax/us.scm
-share/gnome/gnucash/guile-modules/www/cgi.scm
-share/gnome/gnucash/guile-modules/www/http.scm
-share/gnome/gnucash/guile-modules/www/main.scm
-share/gnome/gnucash/guile-modules/www/url.scm
-share/gnome/gnucash/pixmaps/gnc-account-16.png
-share/gnome/gnucash/pixmaps/gnc-account-delete-16.png
-share/gnome/gnucash/pixmaps/gnc-account-delete.png
-share/gnome/gnucash/pixmaps/gnc-account-edit-16.png
-share/gnome/gnucash/pixmaps/gnc-account-edit.png
-share/gnome/gnucash/pixmaps/gnc-account-new-16.png
-share/gnome/gnucash/pixmaps/gnc-account-new.png
-share/gnome/gnucash/pixmaps/gnc-account-open-16.png
-share/gnome/gnucash/pixmaps/gnc-account-open.png
-share/gnome/gnucash/pixmaps/gnc-account.png
-share/gnome/gnucash/pixmaps/gnc-invoice-16.png
-share/gnome/gnucash/pixmaps/gnc-invoice-edit-16.png
-share/gnome/gnucash/pixmaps/gnc-invoice-edit.png
-share/gnome/gnucash/pixmaps/gnc-invoice-post-16.png
-share/gnome/gnucash/pixmaps/gnc-invoice-post.png
-share/gnome/gnucash/pixmaps/gnc-invoice-unpost-16.png
-share/gnome/gnucash/pixmaps/gnc-invoice-unpost.png
-share/gnome/gnucash/pixmaps/gnc-invoice.png
-share/gnome/gnucash/pixmaps/gnc-jumpto-16.png
-share/gnome/gnucash/pixmaps/gnc-jumpto.png
-share/gnome/gnucash/pixmaps/gnc-split-trans-16.png
-share/gnome/gnucash/pixmaps/gnc-split-trans.png
-share/gnome/gnucash/pixmaps/gnc-sx-new-16.png
-share/gnome/gnucash/pixmaps/gnc-sx-new.png
-share/gnome/gnucash/pixmaps/gnc-transfer-16.png
-share/gnome/gnucash/pixmaps/gnc-transfer.png
-share/gnome/gnucash/pixmaps/gnucash-icon-16x16.png
-share/gnome/gnucash/pixmaps/gnucash-icon-32x32.png
-share/gnome/gnucash/pixmaps/gnucash-icon-48x48.bmp
-share/gnome/gnucash/pixmaps/gnucash-icon-48x48.png
-share/gnome/gnucash/pixmaps/gnucash-icon.ico
-share/gnome/gnucash/pixmaps/gnucash_splash.png
-share/gnome/gnucash/pixmaps/stock_split_title.png
-share/gnome/gnucash/pixmaps/stock_split_watermark.png
-share/gnome/gnucash/scm/build-config.scm
-share/gnome/gnucash/scm/business-options.scm
-share/gnome/gnucash/scm/business-prefs.scm
-share/gnome/gnucash/scm/c-interface.scm
-share/gnome/gnucash/scm/command-line.scm
-share/gnome/gnucash/scm/commodity-table.scm
-share/gnome/gnucash/scm/commodity-utilities.scm
-share/gnome/gnucash/scm/config-var.scm
-share/gnome/gnucash/scm/date-utilities.scm
-share/gnome/gnucash/scm/doc.scm
-share/gnome/gnucash/scm/engine-interface.scm
-share/gnome/gnucash/scm/engine-utilities.scm
-share/gnome/gnucash/scm/fin.scm
-share/gnome/gnucash/scm/gnc-menu-extensions.scm
-share/gnome/gnucash/scm/gnc-numeric.scm
-share/gnome/gnucash/scm/gnumeric/gnumeric-utilities.scm
-share/gnome/gnucash/scm/gnumeric/table-utils.scm
-share/gnome/gnucash/scm/hooks.scm
-share/gnome/gnucash/scm/html-acct-table.scm
-share/gnome/gnucash/scm/html-barchart.scm
-share/gnome/gnucash/scm/html-document.scm
-share/gnome/gnucash/scm/html-piechart.scm
-share/gnome/gnucash/scm/html-scatter.scm
-share/gnome/gnucash/scm/html-style-info.scm
-share/gnome/gnucash/scm/html-style-sheet.scm
-share/gnome/gnucash/scm/html-table.scm
-share/gnome/gnucash/scm/html-text.scm
-share/gnome/gnucash/scm/html-utilities.scm
-share/gnome/gnucash/scm/main-window.scm
-share/gnome/gnucash/scm/options-utilities.scm
-share/gnome/gnucash/scm/options.scm
-share/gnome/gnucash/scm/prefs.scm
-share/gnome/gnucash/scm/qif-import/qif-dialog-utils.scm
-share/gnome/gnucash/scm/qif-import/qif-file.scm
-share/gnome/gnucash/scm/qif-import/qif-guess-map.scm
-share/gnome/gnucash/scm/qif-import/qif-import.scm
-share/gnome/gnucash/scm/qif-import/qif-merge-groups.scm
-share/gnome/gnucash/scm/qif-import/qif-objects.scm
-share/gnome/gnucash/scm/qif-import/qif-parse.scm
-share/gnome/gnucash/scm/qif-import/qif-to-gnc.scm
-share/gnome/gnucash/scm/qif-import/qif-utils.scm
-share/gnome/gnucash/scm/report-utilities.scm
-share/gnome/gnucash/scm/report.scm
-share/gnome/gnucash/scm/simple-obj.scm
-share/gnome/gnucash/scm/substring-search.scm
-share/gnome/gnucash/scm/txf-de_DE.scm
-share/gnome/gnucash/scm/txf-help-de_DE.scm
-share/gnome/gnucash/scm/txf-help.scm
-share/gnome/gnucash/scm/txf.scm
-share/gnome/gnucash/scm/xml-generator.scm
-share/gnome/gnucash/tip_of_the_day.list
-share/gnome/gnucash/ui/gnc-main-window-ui.xml
-share/gnome/gnucash/ui/gnc-plugin-account-tree-ui.xml
-share/gnome/gnucash/ui/gnc-plugin-basic-commands-ui.xml
-share/gnome/gnucash/ui/gnc-plugin-budget-ui.xml
-share/gnome/gnucash/ui/gnc-plugin-business-ui.xml
-share/gnome/gnucash/ui/gnc-plugin-file-history-ui.xml
-share/gnome/gnucash/ui/gnc-plugin-log-replay-ui.xml
-share/gnome/gnucash/ui/gnc-plugin-ofx-ui.xml
-share/gnome/gnucash/ui/gnc-plugin-page-account-tree-ui.xml
-share/gnome/gnucash/ui/gnc-plugin-page-budget-ui.xml
-share/gnome/gnucash/ui/gnc-plugin-page-invoice-ui.xml
-share/gnome/gnucash/ui/gnc-plugin-page-register-ui.xml
-share/gnome/gnucash/ui/gnc-plugin-page-report-ui.xml
-share/gnome/gnucash/ui/gnc-plugin-page-sx-list-ui.xml
-share/gnome/gnucash/ui/gnc-plugin-page-sxregister-ui.xml
-share/gnome/gnucash/ui/gnc-plugin-qif-import-ui.xml
-share/gnome/gnucash/ui/gnc-plugin-register-ui.xml
-share/gnome/gnucash/ui/gnc-plugin-stylesheets-ui.xml
-share/gnome/gnucash/ui/gnc-reconcile-window-ui.xml
-share/gnome/gnucash/ui/gnc-sxed-to-create-window-ui.xml
-share/gnome/gnucash/ui/gnc-sxed-window-ui-full.xml
-share/gnome/gnucash/ui/gnc-sxed-window-ui.xml
-share/gnome/gnucash/xml/qsf/pilot-qsf-GnuCashInvoice.xml
-share/gnome/gnucash/xml/qsf/pilot-qsf-gncCustomer.xml
-share/gnome/gnucash/xml/qsf/qsf-map.xsd.xml
-share/gnome/gnucash/xml/qsf/qsf-object.xsd.xml
-share/gnome/pixmaps/gnucash-icon-16x16.png
-share/gnome/pixmaps/gnucash-icon-32x32.png
-share/gnome/pixmaps/gnucash-icon-48x48.png
-share/gnome/xml/gnucash/xsl/README
-share/gnome/xml/gnucash/xsl/date-time.xsl
-share/gnome/xml/gnucash/xsl/gnucash-gnccustomer-vcard2.xsl
-share/gnome/xml/gnucash/xsl/gnucash-std.xsl
-share/gnome/xml/gnucash/xsl/string.xsl
-share/gnome/xml/gnucash/xsl/vcard-gnccustomer.pl
+share/applications/gnucash.desktop
+share/gnucash/accounts/C/acctchrt_brokerage.gnucash-xea
+share/gnucash/accounts/C/acctchrt_business.gnucash-xea
+share/gnucash/accounts/C/acctchrt_carloan.gnucash-xea
+share/gnucash/accounts/C/acctchrt_cdmoneymkt.gnucash-xea
+share/gnucash/accounts/C/acctchrt_checkbook.gnucash-xea
+share/gnucash/accounts/C/acctchrt_childcare.gnucash-xea
+share/gnucash/accounts/C/acctchrt_common.gnucash-xea
+share/gnucash/accounts/C/acctchrt_eduloan.gnucash-xea
+share/gnucash/accounts/C/acctchrt_fixedassets.gnucash-xea
+share/gnucash/accounts/C/acctchrt_homeloan.gnucash-xea
+share/gnucash/accounts/C/acctchrt_homeown.gnucash-xea
+share/gnucash/accounts/C/acctchrt_otherloan.gnucash-xea
+share/gnucash/accounts/C/acctchrt_renter.gnucash-xea
+share/gnucash/accounts/C/acctchrt_retiremt.gnucash-xea
+share/gnucash/accounts/C/acctchrt_spouseinc.gnucash-xea
+share/gnucash/accounts/C/acctchrt_spouseretire.gnucash-xea
+share/gnucash/accounts/da/acctchrt_car.gnucash-xea
+share/gnucash/accounts/da/acctchrt_common.gnucash-xea
+share/gnucash/accounts/da/acctchrt_homeloan.gnucash-xea
+share/gnucash/accounts/da/acctchrt_homeown.gnucash-xea
+share/gnucash/accounts/de_AT/acctchrt_auto.gnucash-xea
+share/gnucash/accounts/de_AT/acctchrt_autoloan.gnucash-xea
+share/gnucash/accounts/de_AT/acctchrt_brokerage.gnucash-xea
+share/gnucash/accounts/de_AT/acctchrt_business.gnucash-xea
+share/gnucash/accounts/de_AT/acctchrt_common.gnucash-xea
+share/gnucash/accounts/de_AT/acctchrt_houseown.gnucash-xea
+share/gnucash/accounts/de_AT/acctchrt_investment.gnucash-xea
+share/gnucash/accounts/de_AT/acctchrt_kids.gnucash-xea
+share/gnucash/accounts/de_CH/acctchrt_brokerage.gnucash-xea
+share/gnucash/accounts/de_CH/acctchrt_chkmu.gnucash-xea
+share/gnucash/accounts/de_CH/acctchrt_common.gnucash-xea
+share/gnucash/accounts/de_CH/acctchrt_kids.gnucash-xea
+share/gnucash/accounts/de_CH/acctchrt_otherasset.gnucash-xea
+share/gnucash/accounts/de_CH/acctchrt_otherloan.gnucash-xea
+share/gnucash/accounts/de_DE/acctchrt_auto.gnucash-xea
+share/gnucash/accounts/de_DE/acctchrt_autoloan.gnucash-xea
+share/gnucash/accounts/de_DE/acctchrt_brokerage.gnucash-xea
+share/gnucash/accounts/de_DE/acctchrt_common.gnucash-xea
+share/gnucash/accounts/de_DE/acctchrt_houseown.gnucash-xea
+share/gnucash/accounts/de_DE/acctchrt_investment.gnucash-xea
+share/gnucash/accounts/de_DE/acctchrt_kids.gnucash-xea
+share/gnucash/accounts/de_DE/acctchrt_otherasset.gnucash-xea
+share/gnucash/accounts/de_DE/acctchrt_otherloan.gnucash-xea
+share/gnucash/accounts/de_DE/acctchrt_skr03.gnucash-xea
+share/gnucash/accounts/de_DE/acctchrt_skr04.gnucash-xea
+share/gnucash/accounts/de_DE/acctchrt_studium.gnucash-xea
+share/gnucash/accounts/el_GR/acctchrt_brokerage.gnucash-xea
+share/gnucash/accounts/el_GR/acctchrt_carloan.gnucash-xea
+share/gnucash/accounts/el_GR/acctchrt_common.gnucash-xea
+share/gnucash/accounts/en_GB/acctchrt_brokerage.gnucash-xea
+share/gnucash/accounts/en_GB/acctchrt_business.gnucash-xea
+share/gnucash/accounts/en_GB/acctchrt_carloan.gnucash-xea
+share/gnucash/accounts/en_GB/acctchrt_cdmoneymkt.gnucash-xea
+share/gnucash/accounts/en_GB/acctchrt_checkbook.gnucash-xea
+share/gnucash/accounts/en_GB/acctchrt_childcare.gnucash-xea
+share/gnucash/accounts/en_GB/acctchrt_common.gnucash-xea
+share/gnucash/accounts/en_GB/acctchrt_eduloan.gnucash-xea
+share/gnucash/accounts/en_GB/acctchrt_fixedassets.gnucash-xea
+share/gnucash/accounts/en_GB/acctchrt_homeloan.gnucash-xea
+share/gnucash/accounts/en_GB/acctchrt_homeown.gnucash-xea
+share/gnucash/accounts/en_GB/acctchrt_otherloan.gnucash-xea
+share/gnucash/accounts/en_GB/acctchrt_renter.gnucash-xea
+share/gnucash/accounts/en_GB/acctchrt_retiremt.gnucash-xea
+share/gnucash/accounts/en_GB/acctchrt_spouseinc.gnucash-xea
+share/gnucash/accounts/en_GB/acctchrt_spouseretire.gnucash-xea
+share/gnucash/accounts/en_GB/uk-vat.gnucash-xea
+share/gnucash/accounts/es_ES/acctchrt_brokerage.gnucash-xea
+share/gnucash/accounts/es_ES/acctchrt_carloan.gnucash-xea
+share/gnucash/accounts/es_ES/acctchrt_cdmoneymkt.gnucash-xea
+share/gnucash/accounts/es_ES/acctchrt_childcare.gnucash-xea
+share/gnucash/accounts/es_ES/acctchrt_common.gnucash-xea
+share/gnucash/accounts/es_ES/acctchrt_currency.gnucash-xea
+share/gnucash/accounts/es_ES/acctchrt_eduloan.gnucash-xea
+share/gnucash/accounts/es_ES/acctchrt_fixedassets.gnucash-xea
+share/gnucash/accounts/es_ES/acctchrt_homeloan.gnucash-xea
+share/gnucash/accounts/es_ES/acctchrt_homeown.gnucash-xea
+share/gnucash/accounts/es_ES/acctchrt_otherloan.gnucash-xea
+share/gnucash/accounts/es_ES/acctchrt_renter.gnucash-xea
+share/gnucash/accounts/es_ES/acctchrt_retiremt.gnucash-xea
+share/gnucash/accounts/es_ES/acctchrt_spouseinc.gnucash-xea
+share/gnucash/accounts/es_ES/acctchrt_spouseretire.gnucash-xea
+share/gnucash/accounts/fr_CA/acctchrt_actifsfixes.gnucash-xea
+share/gnucash/accounts/fr_CA/acctchrt_automobile.gnucash-xea
+share/gnucash/accounts/fr_CA/acctchrt_basecommune.gnucash-xea
+share/gnucash/accounts/fr_CA/acctchrt_cdmarchemon.gnucash-xea
+share/gnucash/accounts/fr_CA/acctchrt_chequier.gnucash-xea
+share/gnucash/accounts/fr_CA/acctchrt_conjointretraite.gnucash-xea
+share/gnucash/accounts/fr_CA/acctchrt_conjointrev.gnucash-xea
+share/gnucash/accounts/fr_CA/acctchrt_courtage.gnucash-xea
+share/gnucash/accounts/fr_CA/acctchrt_etudeemprunt.gnucash-xea
+share/gnucash/accounts/fr_CA/acctchrt_garderie.gnucash-xea
+share/gnucash/accounts/fr_CA/acctchrt_locataire.gnucash-xea
+share/gnucash/accounts/fr_CA/acctchrt_proprietaire.gnucash-xea
+share/gnucash/accounts/fr_CA/acctchrt_retraite.gnucash-xea
+share/gnucash/accounts/fr_CA/acctchrt_revenus.gnucash-xea
+share/gnucash/accounts/fr_CH/acctchrt_brokerage.gnucash-xea
+share/gnucash/accounts/fr_CH/acctchrt_business.gnucash-xea
+share/gnucash/accounts/fr_CH/acctchrt_carloan.gnucash-xea
+share/gnucash/accounts/fr_CH/acctchrt_cdmoneymkt.gnucash-xea
+share/gnucash/accounts/fr_CH/acctchrt_childcare.gnucash-xea
+share/gnucash/accounts/fr_CH/acctchrt_common.gnucash-xea
+share/gnucash/accounts/fr_CH/acctchrt_currency.gnucash-xea
+share/gnucash/accounts/fr_CH/acctchrt_eduloan.gnucash-xea
+share/gnucash/accounts/fr_CH/acctchrt_fixedassets.gnucash-xea
+share/gnucash/accounts/fr_CH/acctchrt_homeloan.gnucash-xea
+share/gnucash/accounts/fr_CH/acctchrt_homeown.gnucash-xea
+share/gnucash/accounts/fr_CH/acctchrt_otherloan.gnucash-xea
+share/gnucash/accounts/fr_CH/acctchrt_renter.gnucash-xea
+share/gnucash/accounts/fr_CH/acctchrt_retiremt.gnucash-xea
+share/gnucash/accounts/fr_CH/acctchrt_spouseinc.gnucash-xea
+share/gnucash/accounts/fr_CH/acctchrt_spouseretire.gnucash-xea
+share/gnucash/accounts/fr_FR/acctchrt_brokerage.gnucash-xea
+share/gnucash/accounts/fr_FR/acctchrt_business.gnucash-xea
+share/gnucash/accounts/fr_FR/acctchrt_carloan.gnucash-xea
+share/gnucash/accounts/fr_FR/acctchrt_cdmoneymkt.gnucash-xea
+share/gnucash/accounts/fr_FR/acctchrt_childcare.gnucash-xea
+share/gnucash/accounts/fr_FR/acctchrt_common.gnucash-xea
+share/gnucash/accounts/fr_FR/acctchrt_currency.gnucash-xea
+share/gnucash/accounts/fr_FR/acctchrt_eduloan.gnucash-xea
+share/gnucash/accounts/fr_FR/acctchrt_fixedassets.gnucash-xea
+share/gnucash/accounts/fr_FR/acctchrt_homeloan.gnucash-xea
+share/gnucash/accounts/fr_FR/acctchrt_homeown.gnucash-xea
+share/gnucash/accounts/fr_FR/acctchrt_otherloan.gnucash-xea
+share/gnucash/accounts/fr_FR/acctchrt_renter.gnucash-xea
+share/gnucash/accounts/fr_FR/acctchrt_retiremt.gnucash-xea
+share/gnucash/accounts/fr_FR/acctchrt_spouseinc.gnucash-xea
+share/gnucash/accounts/fr_FR/acctchrt_spouseretire.gnucash-xea
+share/gnucash/accounts/hu_HU/acctchrt_brokerage.gnucash-xea
+share/gnucash/accounts/hu_HU/acctchrt_business.gnucash-xea
+share/gnucash/accounts/hu_HU/acctchrt_carloan.gnucash-xea
+share/gnucash/accounts/hu_HU/acctchrt_cdmoneymkt.gnucash-xea
+share/gnucash/accounts/hu_HU/acctchrt_checkbook.gnucash-xea
+share/gnucash/accounts/hu_HU/acctchrt_childcare.gnucash-xea
+share/gnucash/accounts/hu_HU/acctchrt_common.gnucash-xea
+share/gnucash/accounts/hu_HU/acctchrt_eduloan.gnucash-xea
+share/gnucash/accounts/hu_HU/acctchrt_fixedassets.gnucash-xea
+share/gnucash/accounts/hu_HU/acctchrt_homeloan.gnucash-xea
+share/gnucash/accounts/hu_HU/acctchrt_homeown.gnucash-xea
+share/gnucash/accounts/hu_HU/acctchrt_otherloan.gnucash-xea
+share/gnucash/accounts/hu_HU/acctchrt_renter.gnucash-xea
+share/gnucash/accounts/hu_HU/acctchrt_retiremt.gnucash-xea
+share/gnucash/accounts/hu_HU/acctchrt_spouseinc.gnucash-xea
+share/gnucash/accounts/hu_HU/acctchrt_spouseretire.gnucash-xea
+share/gnucash/accounts/it/acctchrt_brokerage.gnucash-xea
+share/gnucash/accounts/it/acctchrt_carloan.gnucash-xea
+share/gnucash/accounts/it/acctchrt_checkbook.gnucash-xea
+share/gnucash/accounts/it/acctchrt_childcare.gnucash-xea
+share/gnucash/accounts/it/acctchrt_common.gnucash-xea
+share/gnucash/accounts/it/acctchrt_fixedassets.gnucash-xea
+share/gnucash/accounts/it/acctchrt_homeloan.gnucash-xea
+share/gnucash/accounts/it/acctchrt_homeown.gnucash-xea
+share/gnucash/accounts/it/acctchrt_otherloan.gnucash-xea
+share/gnucash/accounts/it/acctchrt_renter.gnucash-xea
+share/gnucash/accounts/it/acctchrt_retiremt.gnucash-xea
+share/gnucash/accounts/it/acctchrt_spouseinc.gnucash-xea
+share/gnucash/accounts/it/acctchrt_spouseretire.gnucash-xea
+share/gnucash/accounts/nb/acctchrt_brokerage.gnucash-xea
+share/gnucash/accounts/nb/acctchrt_business.gnucash-xea
+share/gnucash/accounts/nb/acctchrt_carloan.gnucash-xea
+share/gnucash/accounts/nb/acctchrt_cdmoneymkt.gnucash-xea
+share/gnucash/accounts/nb/acctchrt_checkbook.gnucash-xea
+share/gnucash/accounts/nb/acctchrt_childcare.gnucash-xea
+share/gnucash/accounts/nb/acctchrt_common.gnucash-xea
+share/gnucash/accounts/nb/acctchrt_eduloan.gnucash-xea
+share/gnucash/accounts/nb/acctchrt_fixedassets.gnucash-xea
+share/gnucash/accounts/nb/acctchrt_full.gnucash-xea
+share/gnucash/accounts/nb/acctchrt_homeloan.gnucash-xea
+share/gnucash/accounts/nb/acctchrt_homeown.gnucash-xea
+share/gnucash/accounts/nb/acctchrt_otherloan.gnucash-xea
+share/gnucash/accounts/nb/acctchrt_renter.gnucash-xea
+share/gnucash/accounts/nb/acctchrt_retiremt.gnucash-xea
+share/gnucash/accounts/nb/acctchrt_spouseinc.gnucash-xea
+share/gnucash/accounts/nb/acctchrt_spouseretire.gnucash-xea
+share/gnucash/accounts/pt_BR/acctchrt_brokerage.gnucash-xea
+share/gnucash/accounts/pt_BR/acctchrt_carloan.gnucash-xea
+share/gnucash/accounts/pt_BR/acctchrt_cdmoneymkt.gnucash-xea
+share/gnucash/accounts/pt_BR/acctchrt_childcare.gnucash-xea
+share/gnucash/accounts/pt_BR/acctchrt_common.gnucash-xea
+share/gnucash/accounts/pt_BR/acctchrt_currency.gnucash-xea
+share/gnucash/accounts/pt_BR/acctchrt_eduloan.gnucash-xea
+share/gnucash/accounts/pt_BR/acctchrt_fixedassets.gnucash-xea
+share/gnucash/accounts/pt_BR/acctchrt_homeloan.gnucash-xea
+share/gnucash/accounts/pt_BR/acctchrt_homeown.gnucash-xea
+share/gnucash/accounts/pt_BR/acctchrt_otherloan.gnucash-xea
+share/gnucash/accounts/pt_BR/acctchrt_renter.gnucash-xea
+share/gnucash/accounts/pt_BR/acctchrt_retiremt.gnucash-xea
+share/gnucash/accounts/pt_BR/acctchrt_spouseinc.gnucash-xea
+share/gnucash/accounts/pt_BR/acctchrt_spouseretire.gnucash-xea
+share/gnucash/accounts/pt_PT/acctchrt_brokerage.gnucash-xea
+share/gnucash/accounts/pt_PT/acctchrt_carloan.gnucash-xea
+share/gnucash/accounts/pt_PT/acctchrt_cdmoneymkt.gnucash-xea
+share/gnucash/accounts/pt_PT/acctchrt_childcare.gnucash-xea
+share/gnucash/accounts/pt_PT/acctchrt_common.gnucash-xea
+share/gnucash/accounts/pt_PT/acctchrt_eduloan.gnucash-xea
+share/gnucash/accounts/pt_PT/acctchrt_fixedassets.gnucash-xea
+share/gnucash/accounts/pt_PT/acctchrt_homeloan.gnucash-xea
+share/gnucash/accounts/pt_PT/acctchrt_homeown.gnucash-xea
+share/gnucash/accounts/pt_PT/acctchrt_otherloan.gnucash-xea
+share/gnucash/accounts/pt_PT/acctchrt_renter.gnucash-xea
+share/gnucash/accounts/pt_PT/acctchrt_retiremt.gnucash-xea
+share/gnucash/accounts/pt_PT/acctchrt_spouseinc.gnucash-xea
+share/gnucash/accounts/pt_PT/acctchrt_spouseretire.gnucash-xea
+share/gnucash/accounts/sk/acctchrt_brokerage.gnucash-xea
+share/gnucash/accounts/sk/acctchrt_carloan.gnucash-xea
+share/gnucash/accounts/sk/acctchrt_cdmoneymkt.gnucash-xea
+share/gnucash/accounts/sk/acctchrt_childcare.gnucash-xea
+share/gnucash/accounts/sk/acctchrt_common.gnucash-xea
+share/gnucash/accounts/sk/acctchrt_currency.gnucash-xea
+share/gnucash/accounts/sk/acctchrt_eduloan.gnucash-xea
+share/gnucash/accounts/sk/acctchrt_fixedassets.gnucash-xea
+share/gnucash/accounts/sk/acctchrt_homeloan.gnucash-xea
+share/gnucash/accounts/sk/acctchrt_homeown.gnucash-xea
+share/gnucash/accounts/sk/acctchrt_otherloan.gnucash-xea
+share/gnucash/accounts/sk/acctchrt_renter.gnucash-xea
+share/gnucash/accounts/sk/acctchrt_retiremt.gnucash-xea
+share/gnucash/accounts/sk/acctchrt_spouseinc.gnucash-xea
+share/gnucash/accounts/sk/acctchrt_spouseretire.gnucash-xea
+share/gnucash/accounts/tr_TR/acctchrt_TEKDUZ.gnucash-xea
+share/gnucash/accounts/tr_TR/acctchrt_brokerage.gnucash-xea
+share/gnucash/accounts/tr_TR/acctchrt_carloan.gnucash-xea
+share/gnucash/accounts/tr_TR/acctchrt_cdmoneymkt.gnucash-xea
+share/gnucash/accounts/tr_TR/acctchrt_checkbook.gnucash-xea
+share/gnucash/accounts/tr_TR/acctchrt_common.gnucash-xea
+share/gnucash/accounts/tr_TR/acctchrt_fixedassets.gnucash-xea
+share/gnucash/accounts/tr_TR/acctchrt_homeloan.gnucash-xea
+share/gnucash/checks/deluxe.chk
+share/gnucash/checks/quicken.chk
+share/gnucash/checks/quicken_wallet.chk
+share/gnucash/doc/AUTHORS
+share/gnucash/doc/COPYING
+share/gnucash/doc/ChangeLog
+share/gnucash/doc/ChangeLog.2003
+share/gnucash/doc/ChangeLog.2004
+share/gnucash/doc/ChangeLog.2005
+share/gnucash/doc/ChangeLog.2006
+share/gnucash/doc/DOCUMENTERS
+share/gnucash/doc/HACKING
+share/gnucash/doc/INSTALL
+share/gnucash/doc/LICENSE
+share/gnucash/doc/NEWS
+share/gnucash/doc/README
+share/gnucash/doc/README-de.win32-bin.txt
+share/gnucash/doc/README-fr.win32-bin.txt
+share/gnucash/doc/README.dependencies
+share/gnucash/doc/README.francais
+share/gnucash/doc/README.german
+share/gnucash/doc/README.patches
+share/gnucash/doc/README.win32-bin.txt
+share/gnucash/doc/examples/Money95bank_fr.qif
+share/gnucash/doc/examples/Money95invst_fr.qif
+share/gnucash/doc/examples/Money95mfunds_fr.qif
+share/gnucash/doc/examples/Money95stocks_fr.qif
+share/gnucash/doc/examples/README
+share/gnucash/doc/examples/abc-all.qif
+share/gnucash/doc/examples/abc.qif
+share/gnucash/doc/examples/bogus.qif
+share/gnucash/doc/examples/cbb-export.qif
+share/gnucash/doc/examples/currency.xac
+share/gnucash/doc/examples/currency_tree_xml.xac
+share/gnucash/doc/examples/every.qif
+share/gnucash/doc/examples/ms-money.qif
+share/gnucash/doc/examples/quicktest.qif
+share/gnucash/doc/examples/splitdemo.xac
+share/gnucash/doc/examples/swipe.qif
+share/gnucash/doc/examples/taxreport.xac
+share/gnucash/doc/examples/test.xac
+share/gnucash/doc/examples/test2.xac
+share/gnucash/doc/examples/test3.xac
+share/gnucash/doc/examples/test4.xac
+share/gnucash/doc/examples/trading.xac
+share/gnucash/doc/examples/trading2.xac
+share/gnucash/doc/examples/web.qif
+share/gnucash/doc/examples/xfer.xac
+share/gnucash/doc/guile-hackers.txt
+share/gnucash/doc/projects.html
+share/gnucash/glade/account.glade
+share/gnucash/glade/acctperiod.glade
+share/gnucash/glade/billterms.glade
+share/gnucash/glade/budget.glade
+share/gnucash/glade/businessprefs.glade
+share/gnucash/glade/chart-export.glade
+share/gnucash/glade/choose-owner.glade
+share/gnucash/glade/commodities.glade
+share/gnucash/glade/commodity.glade
+share/gnucash/glade/customer.glade
+share/gnucash/glade/date-close.glade
+share/gnucash/glade/dialog-query-list.glade
+share/gnucash/glade/dialog-reset-warnings.glade
+share/gnucash/glade/druid-gconf-setup.glade
+share/gnucash/glade/druid-gnc-xml-import.glade
+share/gnucash/glade/druid-provider-multifile.glade
+share/gnucash/glade/employee.glade
+share/gnucash/glade/exchange-dialog.glade
+share/gnucash/glade/fincalc.glade
+share/gnucash/glade/generic-import.glade
+share/gnucash/glade/gnc-date-format.glade
+share/gnucash/glade/gnc-gui-query.glade
+share/gnucash/glade/import-provider-format.glade
+share/gnucash/glade/invoice.glade
+share/gnucash/glade/job.glade
+share/gnucash/glade/lots.glade
+share/gnucash/glade/merge.glade
+share/gnucash/glade/newuser.glade
+share/gnucash/glade/order.glade
+share/gnucash/glade/payment.glade
+share/gnucash/glade/preferences.glade
+share/gnucash/glade/price.glade
+share/gnucash/glade/print.glade
+share/gnucash/glade/progress.glade
+share/gnucash/glade/qif.glade
+share/gnucash/glade/reconcile.glade
+share/gnucash/glade/register.glade
+share/gnucash/glade/report.glade
+share/gnucash/glade/sched-xact.glade
+share/gnucash/glade/search.glade
+share/gnucash/glade/stocks.glade
+share/gnucash/glade/tax-tables.glade
+share/gnucash/glade/tax.glade
+share/gnucash/glade/totd.glade
+share/gnucash/glade/transfer.glade
+share/gnucash/glade/userpass.glade
+share/gnucash/glade/vendor.glade
+share/gnucash/gnome
+share/gnucash/guile-modules/gnucash/app-utils.scm
+share/gnucash/guile-modules/gnucash/business-core.scm
+share/gnucash/guile-modules/gnucash/business-gnome.scm
+share/gnucash/guile-modules/gnucash/business-utils.scm
+share/gnucash/guile-modules/gnucash/core-utils.scm
+share/gnucash/guile-modules/gnucash/dialog-tax-table.scm
+share/gnucash/guile-modules/gnucash/engine.scm
+share/gnucash/guile-modules/gnucash/gnc-module.scm
+share/gnucash/guile-modules/gnucash/gnome-utils.scm
+share/gnucash/guile-modules/gnucash/import-export/qif-import.scm
+share/gnucash/guile-modules/gnucash/main.scm
+share/gnucash/guile-modules/gnucash/price-quotes.scm
+share/gnucash/guile-modules/gnucash/report/account-piecharts.scm
+share/gnucash/guile-modules/gnucash/report/account-summary.scm
+share/gnucash/guile-modules/gnucash/report/advanced-portfolio.scm
+share/gnucash/guile-modules/gnucash/report/aging.scm
+share/gnucash/guile-modules/gnucash/report/average-balance.scm
+share/gnucash/guile-modules/gnucash/report/balance-sheet.scm
+share/gnucash/guile-modules/gnucash/report/budget.scm
+share/gnucash/guile-modules/gnucash/report/business-reports.scm
+share/gnucash/guile-modules/gnucash/report/cash-flow.scm
+share/gnucash/guile-modules/gnucash/report/category-barchart.scm
+share/gnucash/guile-modules/gnucash/report/daily-reports.scm
+share/gnucash/guile-modules/gnucash/report/easy-invoice.scm
+share/gnucash/guile-modules/gnucash/report/equity-statement.scm
+share/gnucash/guile-modules/gnucash/report/fancy-invoice.scm
+share/gnucash/guile-modules/gnucash/report/general-journal.scm
+share/gnucash/guile-modules/gnucash/report/general-ledger.scm
+share/gnucash/guile-modules/gnucash/report/hello-world.scm
+share/gnucash/guile-modules/gnucash/report/income-statement.scm
+share/gnucash/guile-modules/gnucash/report/invoice.scm
+share/gnucash/guile-modules/gnucash/report/locale-specific/de_DE.scm
+share/gnucash/guile-modules/gnucash/report/locale-specific/us.scm
+share/gnucash/guile-modules/gnucash/report/net-barchart.scm
+share/gnucash/guile-modules/gnucash/report/owner-report.scm
+share/gnucash/guile-modules/gnucash/report/payables.scm
+share/gnucash/guile-modules/gnucash/report/portfolio.scm
+share/gnucash/guile-modules/gnucash/report/price-scatter.scm
+share/gnucash/guile-modules/gnucash/report/receivables.scm
+share/gnucash/guile-modules/gnucash/report/register.scm
+share/gnucash/guile-modules/gnucash/report/report-gnome.scm
+share/gnucash/guile-modules/gnucash/report/report-system.scm
+share/gnucash/guile-modules/gnucash/report/standard-reports.scm
+share/gnucash/guile-modules/gnucash/report/stylesheet-easy.scm
+share/gnucash/guile-modules/gnucash/report/stylesheet-fancy.scm
+share/gnucash/guile-modules/gnucash/report/stylesheet-plain.scm
+share/gnucash/guile-modules/gnucash/report/stylesheets.scm
+share/gnucash/guile-modules/gnucash/report/taxtxf-de_DE.scm
+share/gnucash/guile-modules/gnucash/report/taxtxf.scm
+share/gnucash/guile-modules/gnucash/report/transaction.scm
+share/gnucash/guile-modules/gnucash/report/trial-balance.scm
+share/gnucash/guile-modules/gnucash/report/utility-reports.scm
+share/gnucash/guile-modules/gnucash/report/view-column.scm
+share/gnucash/guile-modules/gnucash/report/welcome-to-gnucash.scm
+share/gnucash/guile-modules/gnucash/tax/de_DE.scm
+share/gnucash/guile-modules/gnucash/tax/us.scm
+share/gnucash/guile-modules/www/cgi.scm
+share/gnucash/guile-modules/www/http.scm
+share/gnucash/guile-modules/www/main.scm
+share/gnucash/guile-modules/www/url.scm
+share/gnucash/pixmaps/gnc-account-16.png
+share/gnucash/pixmaps/gnc-account-delete-16.png
+share/gnucash/pixmaps/gnc-account-delete.png
+share/gnucash/pixmaps/gnc-account-edit-16.png
+share/gnucash/pixmaps/gnc-account-edit.png
+share/gnucash/pixmaps/gnc-account-new-16.png
+share/gnucash/pixmaps/gnc-account-new.png
+share/gnucash/pixmaps/gnc-account-open-16.png
+share/gnucash/pixmaps/gnc-account-open.png
+share/gnucash/pixmaps/gnc-account.png
+share/gnucash/pixmaps/gnc-invoice-16.png
+share/gnucash/pixmaps/gnc-invoice-edit-16.png
+share/gnucash/pixmaps/gnc-invoice-edit.png
+share/gnucash/pixmaps/gnc-invoice-post-16.png
+share/gnucash/pixmaps/gnc-invoice-post.png
+share/gnucash/pixmaps/gnc-invoice-unpost-16.png
+share/gnucash/pixmaps/gnc-invoice-unpost.png
+share/gnucash/pixmaps/gnc-invoice.png
+share/gnucash/pixmaps/gnc-jumpto-16.png
+share/gnucash/pixmaps/gnc-jumpto.png
+share/gnucash/pixmaps/gnc-split-trans-16.png
+share/gnucash/pixmaps/gnc-split-trans.png
+share/gnucash/pixmaps/gnc-sx-new-16.png
+share/gnucash/pixmaps/gnc-sx-new.png
+share/gnucash/pixmaps/gnc-transfer-16.png
+share/gnucash/pixmaps/gnc-transfer.png
+share/gnucash/pixmaps/gnucash-icon-16x16.png
+share/gnucash/pixmaps/gnucash-icon-32x32.png
+share/gnucash/pixmaps/gnucash-icon-48x48.bmp
+share/gnucash/pixmaps/gnucash-icon-48x48.png
+share/gnucash/pixmaps/gnucash-icon.ico
+share/gnucash/pixmaps/gnucash_splash.png
+share/gnucash/pixmaps/stock_split_title.png
+share/gnucash/pixmaps/stock_split_watermark.png
+share/gnucash/scm/build-config.scm
+share/gnucash/scm/business-options.scm
+share/gnucash/scm/business-prefs.scm
+share/gnucash/scm/c-interface.scm
+share/gnucash/scm/command-line.scm
+share/gnucash/scm/commodity-table.scm
+share/gnucash/scm/commodity-utilities.scm
+share/gnucash/scm/config-var.scm
+share/gnucash/scm/date-utilities.scm
+share/gnucash/scm/doc.scm
+share/gnucash/scm/engine-interface.scm
+share/gnucash/scm/engine-utilities.scm
+share/gnucash/scm/fin.scm
+share/gnucash/scm/gnc-menu-extensions.scm
+share/gnucash/scm/gnc-numeric.scm
+share/gnucash/scm/gnumeric/gnumeric-utilities.scm
+share/gnucash/scm/gnumeric/table-utils.scm
+share/gnucash/scm/hooks.scm
+share/gnucash/scm/html-acct-table.scm
+share/gnucash/scm/html-barchart.scm
+share/gnucash/scm/html-document.scm
+share/gnucash/scm/html-piechart.scm
+share/gnucash/scm/html-scatter.scm
+share/gnucash/scm/html-style-info.scm
+share/gnucash/scm/html-style-sheet.scm
+share/gnucash/scm/html-table.scm
+share/gnucash/scm/html-text.scm
+share/gnucash/scm/html-utilities.scm
+share/gnucash/scm/main-window.scm
+share/gnucash/scm/options-utilities.scm
+share/gnucash/scm/options.scm
+share/gnucash/scm/prefs.scm
+share/gnucash/scm/qif-import/qif-dialog-utils.scm
+share/gnucash/scm/qif-import/qif-file.scm
+share/gnucash/scm/qif-import/qif-guess-map.scm
+share/gnucash/scm/qif-import/qif-import.scm
+share/gnucash/scm/qif-import/qif-merge-groups.scm
+share/gnucash/scm/qif-import/qif-objects.scm
+share/gnucash/scm/qif-import/qif-parse.scm
+share/gnucash/scm/qif-import/qif-to-gnc.scm
+share/gnucash/scm/qif-import/qif-utils.scm
+share/gnucash/scm/report-utilities.scm
+share/gnucash/scm/report.scm
+share/gnucash/scm/simple-obj.scm
+share/gnucash/scm/substring-search.scm
+share/gnucash/scm/txf-de_DE.scm
+share/gnucash/scm/txf-help-de_DE.scm
+share/gnucash/scm/txf-help.scm
+share/gnucash/scm/txf.scm
+share/gnucash/scm/xml-generator.scm
+share/gnucash/tip_of_the_day.list
+share/gnucash/ui/gnc-main-window-ui.xml
+share/gnucash/ui/gnc-plugin-account-tree-ui.xml
+share/gnucash/ui/gnc-plugin-basic-commands-ui.xml
+share/gnucash/ui/gnc-plugin-budget-ui.xml
+share/gnucash/ui/gnc-plugin-business-ui.xml
+share/gnucash/ui/gnc-plugin-file-history-ui.xml
+share/gnucash/ui/gnc-plugin-log-replay-ui.xml
+share/gnucash/ui/gnc-plugin-ofx-ui.xml
+share/gnucash/ui/gnc-plugin-page-account-tree-ui.xml
+share/gnucash/ui/gnc-plugin-page-budget-ui.xml
+share/gnucash/ui/gnc-plugin-page-invoice-ui.xml
+share/gnucash/ui/gnc-plugin-page-register-ui.xml
+share/gnucash/ui/gnc-plugin-page-report-ui.xml
+share/gnucash/ui/gnc-plugin-page-sx-list-ui.xml
+share/gnucash/ui/gnc-plugin-page-sxregister-ui.xml
+share/gnucash/ui/gnc-plugin-qif-import-ui.xml
+share/gnucash/ui/gnc-plugin-register-ui.xml
+share/gnucash/ui/gnc-plugin-stylesheets-ui.xml
+share/gnucash/ui/gnc-reconcile-window-ui.xml
+share/gnucash/ui/gnc-sxed-to-create-window-ui.xml
+share/gnucash/ui/gnc-sxed-window-ui-full.xml
+share/gnucash/ui/gnc-sxed-window-ui.xml
+share/gnucash/xml/qsf/pilot-qsf-GnuCashInvoice.xml
+share/gnucash/xml/qsf/pilot-qsf-gncCustomer.xml
+share/gnucash/xml/qsf/qsf-map.xsd.xml
+share/gnucash/xml/qsf/qsf-object.xsd.xml
+share/pixmaps/gnucash-icon-16x16.png
+share/pixmaps/gnucash-icon-32x32.png
+share/pixmaps/gnucash-icon-48x48.png
+share/xml/gnucash/xsl/README
+share/xml/gnucash/xsl/date-time.xsl
+share/xml/gnucash/xsl/gnucash-gnccustomer-vcard2.xsl
+share/xml/gnucash/xsl/gnucash-std.xsl
+share/xml/gnucash/xsl/string.xsl
+share/xml/gnucash/xsl/vcard-gnccustomer.pl
 share/locale/ca/LC_MESSAGES/gnucash.mo
 share/locale/cs/LC_MESSAGES/gnucash.mo
 share/locale/da/LC_MESSAGES/gnucash.mo
@@ -810,50 +810,51 @@ share/locale/zh_TW/LC_MESSAGES/gnucash.mo
 @dirrmtry share/locale/rw
 @dirrmtry share/locale/es_NI/LC_MESSAGES
 @dirrmtry share/locale/es_NI
-@dirrm share/gnome/xml/gnucash/xsl
-@dirrm share/gnome/xml/gnucash
-@dirrmtry share/gnome/xml
-@dirrm share/gnome/gnucash/xml/qsf
-@dirrm share/gnome/gnucash/xml
-@dirrm share/gnome/gnucash/ui
-@dirrm share/gnome/gnucash/scm/qif-import
-@dirrm share/gnome/gnucash/scm/gnumeric
-@dirrm share/gnome/gnucash/scm
-@dirrm share/gnome/gnucash/pixmaps
-@dirrm share/gnome/gnucash/guile-modules/www
-@dirrm share/gnome/gnucash/guile-modules/srfi
-@dirrm share/gnome/gnucash/guile-modules/gnucash/tax
-@dirrm share/gnome/gnucash/guile-modules/gnucash/report/locale-specific
-@dirrm share/gnome/gnucash/guile-modules/gnucash/report
-@dirrm share/gnome/gnucash/guile-modules/gnucash/import-export
-@dirrm share/gnome/gnucash/guile-modules/gnucash
-@dirrm share/gnome/gnucash/guile-modules
-@dirrm share/gnome/gnucash/glade
-@dirrm share/gnome/gnucash/doc/examples
-@dirrm share/gnome/gnucash/doc
-@dirrm share/gnome/gnucash/checks
-@dirrm share/gnome/gnucash/accounts/tr_TR
-@dirrm share/gnome/gnucash/accounts/sk
-@dirrm share/gnome/gnucash/accounts/pt_PT
-@dirrm share/gnome/gnucash/accounts/pt_BR
-@dirrm share/gnome/gnucash/accounts/nb
-@dirrm share/gnome/gnucash/accounts/it
-@dirrm share/gnome/gnucash/accounts/hu_HU
-@dirrm share/gnome/gnucash/accounts/fr_FR
-@dirrm share/gnome/gnucash/accounts/fr_CH
-@dirrm share/gnome/gnucash/accounts/fr_CA
-@dirrm share/gnome/gnucash/accounts/es_ES
-@dirrm share/gnome/gnucash/accounts/en_GB
-@dirrm share/gnome/gnucash/accounts/el_GR
-@dirrm share/gnome/gnucash/accounts/de_DE
-@dirrm share/gnome/gnucash/accounts/de_CH
-@dirrm share/gnome/gnucash/accounts/de_AT
-@dirrm share/gnome/gnucash/accounts/da
-@dirrm share/gnome/gnucash/accounts/C
-@dirrm share/gnome/gnucash/accounts
-@dirrm share/gnome/gnucash
+@dirrm share/xml/gnucash/xsl
+@dirrm share/xml/gnucash
+@dirrmtry share/xml
+@dirrm share/gnucash/xml/qsf
+@dirrm share/gnucash/xml
+@dirrm share/gnucash/ui
+@dirrm share/gnucash/scm/qif-import
+@dirrm share/gnucash/scm/gnumeric
+@dirrm share/gnucash/scm
+@dirrm share/gnucash/pixmaps
+@dirrm share/gnucash/guile-modules/www
+@dirrm share/gnucash/guile-modules/srfi
+@dirrm share/gnucash/guile-modules/gnucash/tax
+@dirrm share/gnucash/guile-modules/gnucash/report/locale-specific
+@dirrm share/gnucash/guile-modules/gnucash/report
+@dirrm share/gnucash/guile-modules/gnucash/import-export
+@dirrm share/gnucash/guile-modules/gnucash
+@dirrm share/gnucash/guile-modules
+@dirrm share/gnucash/glade
+@dirrm share/gnucash/doc/examples
+@dirrm share/gnucash/doc
+@dirrm share/gnucash/checks
+@dirrm share/gnucash/accounts/tr_TR
+@dirrm share/gnucash/accounts/sk
+@dirrm share/gnucash/accounts/pt_PT
+@dirrm share/gnucash/accounts/pt_BR
+@dirrm share/gnucash/accounts/nb
+@dirrm share/gnucash/accounts/it
+@dirrm share/gnucash/accounts/hu_HU
+@dirrm share/gnucash/accounts/fr_FR
+@dirrm share/gnucash/accounts/fr_CH
+@dirrm share/gnucash/accounts/fr_CA
+@dirrm share/gnucash/accounts/es_ES
+@dirrm share/gnucash/accounts/en_GB
+@dirrm share/gnucash/accounts/el_GR
+@dirrm share/gnucash/accounts/de_DE
+@dirrm share/gnucash/accounts/de_CH
+@dirrm share/gnucash/accounts/de_AT
+@dirrm share/gnucash/accounts/da
+@dirrm share/gnucash/accounts/C
+@dirrm share/gnucash/accounts
+@dirrm share/gnucash
 @dirrm libexec/gnucash/overrides
 @dirrm libexec/gnucash
 @dirrm lib/gnucash
 @dirrm include/gnucash
 @dirrm etc/gnucash
+@dirrmtry share/applications
diff --git a/finance/homebank/Makefile b/finance/homebank/Makefile
index 5743e94487fd..a35a97ab82e9 100644
--- a/finance/homebank/Makefile
+++ b/finance/homebank/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	homebank
 PORTVERSION=	3.5
+PORTREVISION=	1
 CATEGORIES=	finance
 MASTER_SITES=	http://homebank.free.fr/public/
 
@@ -15,7 +16,7 @@ COMMENT=	Manage your personal accounts at home
 
 USE_XLIB=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gtk20 desktopfileutils
+USE_GNOME=	gnomeprefix gtk20 desktopfileutils
 WANT_GNOME=	yes
 USE_GETTEXT=	yes
 INSTALLS_ICONS=	yes
@@ -25,26 +26,6 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 
 DOCS=		AUTHORS COPYING ChangeLog NEWS README
 
-.include <bsd.port.pre.mk>
-
-.if ${HAVE_GNOME:Mgnomehier}!=""
-USE_GNOME+=	gnomehier
-PLIST_SUB+=	GNOME:=""
-GNOME_ENABLED=	yes
-.else
-PLIST_SUB+=	GNOME:="@comment "
-.endif
-
-post-patch:
-	@${REINPLACE_CMD} -e 's|[(]datadir[)]/application-registry|(prefix)/share/gnome/application-registry|g ; \
-		s|[(]datadir[)]/mime-info|(prefix)/share/gnome/mime-info|g' \
-			${WRKSRC}/mime/Makefile.in
-.ifndef (GNOME_ENABLED)
-	@${REINPLACE_CMD} -e 's|install-appDATA install|install|g ; \
-		s| install-mimeDATA||g' \
-			${WRKSRC}/mime/Makefile.in
-.endif
-
 post-install:
 .ifndef (NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
@@ -54,4 +35,4 @@ post-install:
 .endif
 	@-update-desktop-database
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/finance/homebank/pkg-plist b/finance/homebank/pkg-plist
index 4deffcec66f6..d32f7c51cbea 100644
--- a/finance/homebank/pkg-plist
+++ b/finance/homebank/pkg-plist
@@ -1,13 +1,11 @@
 bin/homebank
+share/application-registry/homebank.applications
 share/applications/homebank.desktop
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/COPYING
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
 %%PORTDOCS%%%%DOCSDIR%%/README
-%%GNOME:%%share/gnome/application-registry/homebank.applications
-%%GNOME:%%share/gnome/mime-info/homebank.keys
-%%GNOME:%%share/gnome/mime-info/homebank.mime
 %%DATADIR%%/help/02balance.html
 %%DATADIR%%/help/02concepts.html
 %%DATADIR%%/help/02intro.html
@@ -157,6 +155,8 @@ share/locale/nl/LC_MESSAGES/homebank.mo
 share/locale/pt_BR/LC_MESSAGES/homebank.mo
 share/locale/ru/LC_MESSAGES/homebank.mo
 share/locale/zh_CN/LC_MESSAGES/homebank.mo
+share/mime-info/homebank.keys
+share/mime-info/homebank.mime
 share/mime/packages/homebank.xml
 share/pixmaps/homebank.svg
 @dirrm %%DATADIR%%/images
@@ -164,8 +164,8 @@ share/pixmaps/homebank.svg
 @dirrm %%DATADIR%%/help
 @dirrm %%DATADIR%%
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrmtry share/applications
 @exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
 @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/applications
diff --git a/ftp/downloader/files/patch-fix_build_gtk-2.12 b/ftp/downloader/files/patch-fix_build_gtk-2.12
new file mode 100644
index 000000000000..c8db43c987fd
--- /dev/null
+++ b/ftp/downloader/files/patch-fix_build_gtk-2.12
@@ -0,0 +1,25 @@
+--- configure.orig	2007-10-10 14:56:20.000000000 -0500
++++ configure	2007-10-10 14:56:47.000000000 -0500
+@@ -18398,11 +18398,6 @@
+ 
+ 
+ cat >>confdefs.h <<\_ACEOF
+-#define GTK_DISABLE_DEPRECATED
+-_ACEOF
+-
+-
+-cat >>confdefs.h <<\_ACEOF
+ #define _FILE_OFFSET_BITS 64
+ _ACEOF
+ 
+--- main/face/list.cc.orig	2007-10-10 14:56:30.000000000 -0500
++++ main/face/list.cc	2007-10-10 14:56:51.000000000 -0500
+@@ -8,8 +8,6 @@
+  *	but WITHOUT ANY WARRANTY; without even the implied warranty of
+  *	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  */
+-#define GTK_DISABLE_DEPRECATED
+-
+ #include <stdio.h>
+ #include <gtk/gtk.h>
+ #include <gdk/gdkkeysyms.h>
diff --git a/ftp/gftp/Makefile b/ftp/gftp/Makefile
index 034619c6d723..43275c0bdbf9 100644
--- a/ftp/gftp/Makefile
+++ b/ftp/gftp/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gftp
 PORTVERSION=	2.0.18
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	ftp
 MASTER_SITES=	http://gftp.seul.org/ \
 		ftp://gftp.seul.org/pub/gftp/
@@ -67,10 +67,10 @@ PLIST_SUB+=	NLS="@comment "
 .if ${HAVE_GNOME:Mgnomelibs}!="" && !defined(WITH_GTK2)
 USE_GNOME+=	gnomeprefix gnomelibs
 PKGNAMESUFFIX+=	-gnome
-PLIST_SUB+=	DATADIR="share/gnome" MYGNOME=""
+PLIST_SUB+=	MYGNOME=""
 MAKE_ENV=	HAVE_GNOME=1
 .else
-PLIST_SUB+=	DATADIR="share" MYGNOME="@comment "
+PLIST_SUB+=	MYGNOME="@comment "
 .endif
 
 post-patch:
diff --git a/ftp/gftp/pkg-plist b/ftp/gftp/pkg-plist
index f22034846c97..855fb7959c0a 100644
--- a/ftp/gftp/pkg-plist
+++ b/ftp/gftp/pkg-plist
@@ -1,36 +1,35 @@
 bin/gftp
 %%NOX11:%%bin/gftp-gtk
 bin/gftp-text
-%%NOX11:%%%%MYGNOME%%share/gnome/applications/gftp.desktop
-%%NOX11:%%%%DATADIR%%/gftp/COPYING
-%%NOX11:%%%%DATADIR%%/gftp/bookmarks
-%%NOX11:%%%%DATADIR%%/gftp/connect.xpm
-%%NOX11:%%%%DATADIR%%/gftp/deb.xpm
-%%NOX11:%%%%DATADIR%%/gftp/down.xpm
-%%NOX11:%%%%DATADIR%%/gftp/diff.xpm
-%%NOX11:%%%%DATADIR%%/gftp/dir.xpm
-%%NOX11:%%%%DATADIR%%/gftp/doc.xpm
-%%NOX11:%%%%DATADIR%%/gftp/dotdot.xpm
-%%NOX11:%%%%DATADIR%%/gftp/exe.xpm
-%%NOX11:%%%%DATADIR%%/gftp/gftp.xpm
-%%NOX11:%%%%DATADIR%%/gftp/gftp-logo.xpm
-%%NOX11:%%%%DATADIR%%/gftp/gftp-mini-logo.xpm
-%%NOX11:%%%%DATADIR%%/gftp/gftprc
-%%NOX11:%%%%DATADIR%%/gftp/img.xpm
-%%NOX11:%%%%DATADIR%%/gftp/left.xpm
-%%NOX11:%%%%DATADIR%%/gftp/linkdir.xpm
-%%NOX11:%%%%DATADIR%%/gftp/linkfile.xpm
-%%NOX11:%%%%DATADIR%%/gftp/man.xpm
-%%NOX11:%%%%DATADIR%%/gftp/open_dir.xpm
-%%NOX11:%%%%DATADIR%%/gftp/right.xpm
-%%NOX11:%%%%DATADIR%%/gftp/rpm.xpm
-%%NOX11:%%%%DATADIR%%/gftp/sound.xpm
-%%NOX11:%%%%DATADIR%%/gftp/stop.xpm
-%%NOX11:%%%%DATADIR%%/gftp/tar.xpm
-%%NOX11:%%%%DATADIR%%/gftp/txt.xpm
-%%NOX11:%%%%DATADIR%%/gftp/up.xpm
-%%NOX11:%%%%DATADIR%%/gftp/world.xpm
-%%NOX11:%%%%MYGNOME%%share/gnome/pixmaps/gftp.png
+%%NOX11:%%%%MYGNOME%%share/applications/gftp.desktop
+%%NOX11:%%%%DATADIR%%/COPYING
+%%NOX11:%%%%DATADIR%%/bookmarks
+%%NOX11:%%%%DATADIR%%/connect.xpm
+%%NOX11:%%%%DATADIR%%/deb.xpm
+%%NOX11:%%%%DATADIR%%/diff.xpm
+%%NOX11:%%%%DATADIR%%/dir.xpm
+%%NOX11:%%%%DATADIR%%/doc.xpm
+%%NOX11:%%%%DATADIR%%/dotdot.xpm
+%%NOX11:%%%%DATADIR%%/down.xpm
+%%NOX11:%%%%DATADIR%%/exe.xpm
+%%NOX11:%%%%DATADIR%%/gftp-logo.xpm
+%%NOX11:%%%%DATADIR%%/gftp-mini-logo.xpm
+%%NOX11:%%%%DATADIR%%/gftp.xpm
+%%NOX11:%%%%DATADIR%%/gftprc
+%%NOX11:%%%%DATADIR%%/img.xpm
+%%NOX11:%%%%DATADIR%%/left.xpm
+%%NOX11:%%%%DATADIR%%/linkdir.xpm
+%%NOX11:%%%%DATADIR%%/linkfile.xpm
+%%NOX11:%%%%DATADIR%%/man.xpm
+%%NOX11:%%%%DATADIR%%/open_dir.xpm
+%%NOX11:%%%%DATADIR%%/right.xpm
+%%NOX11:%%%%DATADIR%%/rpm.xpm
+%%NOX11:%%%%DATADIR%%/sound.xpm
+%%NOX11:%%%%DATADIR%%/stop.xpm
+%%NOX11:%%%%DATADIR%%/tar.xpm
+%%NOX11:%%%%DATADIR%%/txt.xpm
+%%NOX11:%%%%DATADIR%%/up.xpm
+%%NOX11:%%%%DATADIR%%/world.xpm
 %%NLS%%share/locale/am/LC_MESSAGES/gftp.mo
 %%NLS%%share/locale/ar/LC_MESSAGES/gftp.mo
 %%NLS%%share/locale/az/LC_MESSAGES/gftp.mo
@@ -75,4 +74,6 @@ bin/gftp-text
 %%NLS%%share/locale/uk/LC_MESSAGES/gftp.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/gftp.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/gftp.mo
-%%NOX11:%%@dirrm %%DATADIR%%/gftp
+%%NOX11:%%%%MYGNOME%%share/pixmaps/gftp.png
+%%NOX11:%%@dirrm %%DATADIR%%
+@dirrmtry share/applications
diff --git a/ftp/junglemonkey/Makefile b/ftp/junglemonkey/Makefile
index d55540e7c361..7ec56346ca2b 100644
--- a/ftp/junglemonkey/Makefile
+++ b/ftp/junglemonkey/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	junglemonkey
 PORTVERSION=	0.1.11
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	ftp gnome
 MASTER_SITES=	http://www.gizmolabs.org/~dhelder/junglemonkey/src/
 DISTNAME=	jm-${PORTVERSION}
@@ -31,10 +31,6 @@ MAN1=		jm.1 jmlite.1 mtprendezvous.1
 
 pre-patch:
 	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
-		 s|/gnome/help/|/help/|g ; \
 		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
-	@${FIND} ${WRKSRC} -name "Makefile.in*" | ${XARGS} ${REINPLACE_CMD} -e \
-		's|\$$(datadir)/gnome/|\$$(datadir)/|g ; \
-		 s|\$$(datadir)/locale|\$$(prefix)/share/locale|g'
 
 .include <bsd.port.mk>
diff --git a/ftp/junglemonkey/pkg-plist b/ftp/junglemonkey/pkg-plist
index c465b7c1a8cd..0298828c11e8 100644
--- a/ftp/junglemonkey/pkg-plist
+++ b/ftp/junglemonkey/pkg-plist
@@ -19,16 +19,16 @@ share/gnome/help/jm/C/x534.html
 share/gnome/help/jm/C/x552.html
 share/gnome/help/jm/C/x557.html
 share/gnome/help/jm/C/x89.html
-share/gnome/jm/glade/jm-gnome.glade
-share/gnome/jm/glade/jm.glade
-share/gnome/jm/glade/master_popup.glade
-share/gnome/jm/glade/preferences_dialog.glade
-share/gnome/jm/glade/properties_dialog.glade
-share/gnome/pixmaps/jm-logo.png
+share/jm/glade/jm-gnome.glade
+share/jm/glade/jm.glade
+share/jm/glade/master_popup.glade
+share/jm/glade/preferences_dialog.glade
+share/jm/glade/properties_dialog.glade
+share/pixmaps/jm-logo.png
 share/locale/de/LC_MESSAGES/jm.mo
 share/locale/fr/LC_MESSAGES/jm.mo
 @dirrm share/gnome/help/jm/C/images
 @dirrm share/gnome/help/jm/C
 @dirrm share/gnome/help/jm
-@dirrm share/gnome/jm/glade
-@dirrm share/gnome/jm
+@dirrm share/jm/glade
+@dirrm share/jm
diff --git a/ftp/urlgfe/Makefile b/ftp/urlgfe/Makefile
index ece600a73b41..dcbc2a4d23ff 100644
--- a/ftp/urlgfe/Makefile
+++ b/ftp/urlgfe/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	urlgfe
 PORTVERSION=	0.7.1
-PORTREVISION?=	6
+PORTREVISION?=	7
 CATEGORIES=	ftp www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	urlget
@@ -51,7 +51,7 @@ post-patch:
 .if defined(WITH_GNOME)
 post-install:
 	@${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.desktop ${PREFIX}/share/gnome/apps/Internet/
-	@${INSTALL_DATA} ${WRKSRC}/pixmaps/${PORTNAME}-icon.png ${PREFIX}/share/gnome/pixmaps/
+	@${INSTALL_DATA} ${WRKSRC}/pixmaps/${PORTNAME}-icon.png ${PREFIX}/share/pixmaps/
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/ftp/urlgfe/pkg-plist b/ftp/urlgfe/pkg-plist
index 212b3114719d..52c72837248d 100644
--- a/ftp/urlgfe/pkg-plist
+++ b/ftp/urlgfe/pkg-plist
@@ -8,6 +8,6 @@ bin/urlgfe
 %%DOCSDIR%%/README
 %%DOCSDIR%%/TODO
 %%GNOME:%%share/gnome/apps/Internet/urlgfe.desktop
-%%GNOME:%%share/gnome/pixmaps/urlgfe-icon.png
+%%GNOME:%%share/pixmaps/urlgfe-icon.png
 share/locale/zh_TW/LC_MESSAGES/urlgfe.mo
 @dirrm %%DOCSDIR%%
diff --git a/games/atomix/Makefile b/games/atomix/Makefile
index 5f143535d39e..bb0a2eba6070 100644
--- a/games/atomix/Makefile
+++ b/games/atomix/Makefile
@@ -3,12 +3,12 @@
 # Whom:                Yukihiro Nakai <nakai@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/games/atomix/Makefile,v 1.9 2006/04/13 07:52:34 bland Exp $
+#   $MCom: ports/games/atomix/Makefile,v 1.14 2007/09/10 05:39:33 mezz Exp $
 #
 
 PORTNAME=	atomix
 PORTVERSION=	2.14.0
-PORTREVISION=	1
+PORTREVISION=	3
 CATEGORIES=	games gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/games/atomix/pkg-install b/games/atomix/pkg-install
index e4e48b646a60..5f11d613d1c2 100644
--- a/games/atomix/pkg-install
+++ b/games/atomix/pkg-install
@@ -1,13 +1,13 @@
 #!/bin/sh
 
 if [ "$2" = "POST-INSTALL" ]; then
-    mkdir -p ${PKG_PREFIX}/share/gnome/games
+    mkdir -p ${PKG_PREFIX}/share/games
     SCORES="atomix.scores"
     for i in ${SCORES}; do
-	if [ ! -f ${PKG_PREFIX}/share/gnome/games/${i} ]; then
-	    touch -f ${PKG_PREFIX}/share/gnome/games/${i}
-	    chown games:games ${PKG_PREFIX}/share/gnome/games/${i}
-	    chmod 0664 ${PKG_PREFIX}/share/gnome/games/${i}
+	if [ ! -f ${PKG_PREFIX}/share/games/${i} ]; then
+	    touch -f ${PKG_PREFIX}/share/games/${i}
+	    chown games:games ${PKG_PREFIX}/share/games/${i}
+	    chmod 0664 ${PKG_PREFIX}/share/games/${i}
 	fi
     done
 fi
diff --git a/games/atomix/pkg-plist b/games/atomix/pkg-plist
index c87bb9333919..738e8a4fbb31 100644
--- a/games/atomix/pkg-plist
+++ b/games/atomix/pkg-plist
@@ -1,74 +1,74 @@
 bin/atomix
-share/gnome/applications/atomix.desktop
-share/gnome/atomix/atomix-logo.png
-share/gnome/atomix/level/aceticacid.atomix.xml
-share/gnome/atomix/level/acetone.atomix.xml
-share/gnome/atomix/level/butanol.atomix.xml
-share/gnome/atomix/level/cyclobutane.atomix.xml
-share/gnome/atomix/level/dimethylether.atomix.xml
-share/gnome/atomix/level/ethanal.atomix.xml
-share/gnome/atomix/level/ethane.atomix.xml
-share/gnome/atomix/level/ethanol.atomix.xml
-share/gnome/atomix/level/ethylene.atomix.xml
-share/gnome/atomix/level/glycerin.atomix.xml
-share/gnome/atomix/level/lactic-acid.atomix.xml
-share/gnome/atomix/level/methanal.atomix.xml
-share/gnome/atomix/level/methane.atomix.xml
-share/gnome/atomix/level/methanol.atomix.xml
-share/gnome/atomix/level/propanal.atomix.xml
-share/gnome/atomix/level/propylene.atomix.xml
-share/gnome/atomix/level/pyran.atomix.xml
-share/gnome/atomix/level/sequence
-share/gnome/atomix/level/transbutylen.atomix.xml
-share/gnome/atomix/level/water.atomix.xml
-share/gnome/atomix/themes/default/arrow-bottom.png
-share/gnome/atomix/themes/default/arrow-left.png
-share/gnome/atomix/themes/default/arrow-right.png
-share/gnome/atomix/themes/default/arrow-top.png
-share/gnome/atomix/themes/default/atom-c.png
-share/gnome/atomix/themes/default/atom-f.png
-share/gnome/atomix/themes/default/atom-h.png
-share/gnome/atomix/themes/default/atom-n.png
-share/gnome/atomix/themes/default/atom-o.png
-share/gnome/atomix/themes/default/cursor.png
-share/gnome/atomix/themes/default/floor.png
-share/gnome/atomix/themes/default/link-bottom-double.png
-share/gnome/atomix/themes/default/link-bottom-left.png
-share/gnome/atomix/themes/default/link-bottom-right.png
-share/gnome/atomix/themes/default/link-bottom.png
-share/gnome/atomix/themes/default/link-left-double.png
-share/gnome/atomix/themes/default/link-left.png
-share/gnome/atomix/themes/default/link-right-double.png
-share/gnome/atomix/themes/default/link-right.png
-share/gnome/atomix/themes/default/link-top-double.png
-share/gnome/atomix/themes/default/link-top-left.png
-share/gnome/atomix/themes/default/link-top-right.png
-share/gnome/atomix/themes/default/link-top.png
-share/gnome/atomix/themes/default/shadow-bottom-right.png
-share/gnome/atomix/themes/default/shadow-left-top.png
-share/gnome/atomix/themes/default/shadow-left.png
-share/gnome/atomix/themes/default/shadow-top-left-both.png
-share/gnome/atomix/themes/default/shadow-top-left.png
-share/gnome/atomix/themes/default/shadow-top.png
-share/gnome/atomix/themes/default/theme
-share/gnome/atomix/themes/default/wall-bottom-left.png
-share/gnome/atomix/themes/default/wall-bottom-right.png
-share/gnome/atomix/themes/default/wall-horizontal-bottomx.png
-share/gnome/atomix/themes/default/wall-horizontal-left-end.png
-share/gnome/atomix/themes/default/wall-horizontal-right-end.png
-share/gnome/atomix/themes/default/wall-horizontal-topx.png
-share/gnome/atomix/themes/default/wall-horizontal.png
-share/gnome/atomix/themes/default/wall-single.png
-share/gnome/atomix/themes/default/wall-top-left.png
-share/gnome/atomix/themes/default/wall-top-right.png
-share/gnome/atomix/themes/default/wall-vertical-bottom-end.png
-share/gnome/atomix/themes/default/wall-vertical-leftx.png
-share/gnome/atomix/themes/default/wall-vertical-rightx.png
-share/gnome/atomix/themes/default/wall-vertical-top-end.png
-share/gnome/atomix/themes/default/wall-vertical.png
-@unexec [ -s %D/share/gnome/games/atomix.scores ] || rm -f %D/share/gnome/games/atomix.scores
-share/gnome/gnome-2.0/ui/atomix-ui.xml
-share/gnome/pixmaps/atomix-icon.png
+share/applications/atomix.desktop
+share/atomix/atomix-logo.png
+share/atomix/level/aceticacid.atomix.xml
+share/atomix/level/acetone.atomix.xml
+share/atomix/level/butanol.atomix.xml
+share/atomix/level/cyclobutane.atomix.xml
+share/atomix/level/dimethylether.atomix.xml
+share/atomix/level/ethanal.atomix.xml
+share/atomix/level/ethane.atomix.xml
+share/atomix/level/ethanol.atomix.xml
+share/atomix/level/ethylene.atomix.xml
+share/atomix/level/glycerin.atomix.xml
+share/atomix/level/lactic-acid.atomix.xml
+share/atomix/level/methanal.atomix.xml
+share/atomix/level/methane.atomix.xml
+share/atomix/level/methanol.atomix.xml
+share/atomix/level/propanal.atomix.xml
+share/atomix/level/propylene.atomix.xml
+share/atomix/level/pyran.atomix.xml
+share/atomix/level/sequence
+share/atomix/level/transbutylen.atomix.xml
+share/atomix/level/water.atomix.xml
+share/atomix/themes/default/arrow-bottom.png
+share/atomix/themes/default/arrow-left.png
+share/atomix/themes/default/arrow-right.png
+share/atomix/themes/default/arrow-top.png
+share/atomix/themes/default/atom-c.png
+share/atomix/themes/default/atom-f.png
+share/atomix/themes/default/atom-h.png
+share/atomix/themes/default/atom-n.png
+share/atomix/themes/default/atom-o.png
+share/atomix/themes/default/cursor.png
+share/atomix/themes/default/floor.png
+share/atomix/themes/default/link-bottom-double.png
+share/atomix/themes/default/link-bottom-left.png
+share/atomix/themes/default/link-bottom-right.png
+share/atomix/themes/default/link-bottom.png
+share/atomix/themes/default/link-left-double.png
+share/atomix/themes/default/link-left.png
+share/atomix/themes/default/link-right-double.png
+share/atomix/themes/default/link-right.png
+share/atomix/themes/default/link-top-double.png
+share/atomix/themes/default/link-top-left.png
+share/atomix/themes/default/link-top-right.png
+share/atomix/themes/default/link-top.png
+share/atomix/themes/default/shadow-bottom-right.png
+share/atomix/themes/default/shadow-left-top.png
+share/atomix/themes/default/shadow-left.png
+share/atomix/themes/default/shadow-top-left-both.png
+share/atomix/themes/default/shadow-top-left.png
+share/atomix/themes/default/shadow-top.png
+share/atomix/themes/default/theme
+share/atomix/themes/default/wall-bottom-left.png
+share/atomix/themes/default/wall-bottom-right.png
+share/atomix/themes/default/wall-horizontal-bottomx.png
+share/atomix/themes/default/wall-horizontal-left-end.png
+share/atomix/themes/default/wall-horizontal-right-end.png
+share/atomix/themes/default/wall-horizontal-topx.png
+share/atomix/themes/default/wall-horizontal.png
+share/atomix/themes/default/wall-single.png
+share/atomix/themes/default/wall-top-left.png
+share/atomix/themes/default/wall-top-right.png
+share/atomix/themes/default/wall-vertical-bottom-end.png
+share/atomix/themes/default/wall-vertical-leftx.png
+share/atomix/themes/default/wall-vertical-rightx.png
+share/atomix/themes/default/wall-vertical-top-end.png
+share/atomix/themes/default/wall-vertical.png
+@unexec [ -s %D/share/games/atomix.scores ] || rm -f %D/share/games/atomix.scores
+share/gnome-2.0/ui/atomix-ui.xml
+share/pixmaps/atomix-icon.png
 share/locale/am/LC_MESSAGES/atomix.mo
 share/locale/az/LC_MESSAGES/atomix.mo
 share/locale/be/LC_MESSAGES/atomix.mo
@@ -123,9 +123,10 @@ share/locale/wa/LC_MESSAGES/atomix.mo
 share/locale/zh_CN/LC_MESSAGES/atomix.mo
 share/locale/zh_HK/LC_MESSAGES/atomix.mo
 share/locale/zh_TW/LC_MESSAGES/atomix.mo
+@dirrm share/atomix/themes/default
+@dirrm share/atomix/themes
+@dirrm share/atomix/level
+@dirrm share/atomix
 @dirrmtry share/locale/zh_HK/LC_MESSAGES
 @dirrmtry share/locale/zh_HK
-@dirrm share/gnome/atomix/themes/default
-@dirrm share/gnome/atomix/themes
-@dirrm share/gnome/atomix/level
-@dirrm share/gnome/atomix
+@dirrmtry share/applications
diff --git a/games/bombermaze/Makefile b/games/bombermaze/Makefile
index 475b1a243d65..a5392718d29f 100644
--- a/games/bombermaze/Makefile
+++ b/games/bombermaze/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	bombermaze
 PORTVERSION=	0.6.6
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	games gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/games/bombermaze/files/patch-src::Makefile.in b/games/bombermaze/files/patch-src::Makefile.in
index 0d9a0d20d73c..52b297effa07 100644
--- a/games/bombermaze/files/patch-src::Makefile.in
+++ b/games/bombermaze/files/patch-src::Makefile.in
@@ -7,8 +7,8 @@ $FreeBSD$
  
  CPPFLAGS = -Wall
  
--INCLUDES = -I$(top_srcdir) -I$(includedir) $(GNOME_INCLUDEDIR) 	-DG_LOG_DOMAIN=\"$(PACKAGE)\" 	-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" 	-DPACKAGE_DATADIR=\"$(configdir)\" 	-I../intl -I$(top_srcdir)/intl
-+INCLUDES = -I$(top_srcdir) -I$(includedir) $(GDK_PIXBUF_CFLAGS) $(GNOME_INCLUDEDIR) 	-DG_LOG_DOMAIN=\"$(PACKAGE)\" 	-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" 	-DPACKAGE_DATADIR=\"$(configdir)\" 	-I../intl -I$(top_srcdir)/intl
+-INCLUDES = -I$(top_srcdir) -I$(includedir) $(GNOME_INCLUDEDIR) 	-DG_LOG_DOMAIN=\"$(PACKAGE)\" 	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" 	-DPACKAGE_DATADIR=\"$(configdir)\" 	-I../intl -I$(top_srcdir)/intl
++INCLUDES = -I$(top_srcdir) -I$(includedir) $(GDK_PIXBUF_CFLAGS) $(GNOME_INCLUDEDIR) 	-DG_LOG_DOMAIN=\"$(PACKAGE)\" 	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" 	-DPACKAGE_DATADIR=\"$(configdir)\" 	-I../intl -I$(top_srcdir)/intl
  
  
  bin_PROGRAMS = bombermaze
diff --git a/games/bombermaze/pkg-plist b/games/bombermaze/pkg-plist
index 328e7b28324a..d6c2bbd317d6 100644
--- a/games/bombermaze/pkg-plist
+++ b/games/bombermaze/pkg-plist
@@ -1,61 +1,60 @@
 bin/bombermaze
+%%DATADIR%%/maps/11x11
+%%DATADIR%%/maps/11x11_random
+%%DATADIR%%/maps/15x13
+%%DATADIR%%/maps/15x13_random
+%%DATADIR%%/maps/15x15
+%%DATADIR%%/maps/15x15_random
+%%DATADIR%%/pixmaps/title.png
+%%DATADIR%%/themes/default/README
+%%DATADIR%%/themes/default/bomb.png
+%%DATADIR%%/themes/default/brick.png
+%%DATADIR%%/themes/default/fire.png
+%%DATADIR%%/themes/default/floor.png
+%%DATADIR%%/themes/default/player1.png
+%%DATADIR%%/themes/default/player2.png
+%%DATADIR%%/themes/default/player3.png
+%%DATADIR%%/themes/default/player4.png
+%%DATADIR%%/themes/default/powerup.png
+%%DATADIR%%/themes/default/wall.png
+%%DATADIR%%/themes/gnomed/README
+%%DATADIR%%/themes/gnomed/bomb.png
+%%DATADIR%%/themes/gnomed/brick.png
+%%DATADIR%%/themes/gnomed/fire.png
+%%DATADIR%%/themes/gnomed/floor.png
+%%DATADIR%%/themes/gnomed/player1.png
+%%DATADIR%%/themes/gnomed/player2.png
+%%DATADIR%%/themes/gnomed/player3.png
+%%DATADIR%%/themes/gnomed/player4.png
+%%DATADIR%%/themes/gnomed/powerup.png
+%%DATADIR%%/themes/gnomed/wall.png
+%%DATADIR%%/themes/icons3d/README
+%%DATADIR%%/themes/icons3d/bomb.png
+%%DATADIR%%/themes/icons3d/brick.png
+%%DATADIR%%/themes/icons3d/fire.png
+%%DATADIR%%/themes/icons3d/floor.png
+%%DATADIR%%/themes/icons3d/player1.png
+%%DATADIR%%/themes/icons3d/player2.png
+%%DATADIR%%/themes/icons3d/player3.png
+%%DATADIR%%/themes/icons3d/player4.png
+%%DATADIR%%/themes/icons3d/powerup.png
+%%DATADIR%%/themes/icons3d/wall.png
+%%DATADIR%%/themes/space/README
+%%DATADIR%%/themes/space/bomb.png
+%%DATADIR%%/themes/space/brick.png
+%%DATADIR%%/themes/space/fire.png
+%%DATADIR%%/themes/space/floor.png
+%%DATADIR%%/themes/space/player1.png
+%%DATADIR%%/themes/space/player2.png
+%%DATADIR%%/themes/space/player3.png
+%%DATADIR%%/themes/space/player4.png
+%%DATADIR%%/themes/space/powerup.png
+%%DATADIR%%/themes/space/wall.png
 share/gnome/apps/Games/bombermaze.desktop
-share/gnome/bombermaze/maps/11x11
-share/gnome/bombermaze/maps/11x11_random
-share/gnome/bombermaze/maps/15x13
-share/gnome/bombermaze/maps/15x13_random
-share/gnome/bombermaze/maps/15x15
-share/gnome/bombermaze/maps/15x15_random
-share/gnome/bombermaze/pixmaps/title.png
-share/gnome/bombermaze/themes/default/README
-share/gnome/bombermaze/themes/default/bomb.png
-share/gnome/bombermaze/themes/default/brick.png
-share/gnome/bombermaze/themes/default/fire.png
-share/gnome/bombermaze/themes/default/floor.png
-share/gnome/bombermaze/themes/default/player1.png
-share/gnome/bombermaze/themes/default/player2.png
-share/gnome/bombermaze/themes/default/player3.png
-share/gnome/bombermaze/themes/default/player4.png
-share/gnome/bombermaze/themes/default/powerup.png
-share/gnome/bombermaze/themes/default/wall.png
-share/gnome/bombermaze/themes/gnomed/README
-share/gnome/bombermaze/themes/gnomed/bomb.png
-share/gnome/bombermaze/themes/gnomed/brick.png
-share/gnome/bombermaze/themes/gnomed/fire.png
-share/gnome/bombermaze/themes/gnomed/floor.png
-share/gnome/bombermaze/themes/gnomed/player1.png
-share/gnome/bombermaze/themes/gnomed/player2.png
-share/gnome/bombermaze/themes/gnomed/player3.png
-share/gnome/bombermaze/themes/gnomed/player4.png
-share/gnome/bombermaze/themes/gnomed/powerup.png
-share/gnome/bombermaze/themes/gnomed/wall.png
-share/gnome/bombermaze/themes/icons3d/README
-share/gnome/bombermaze/themes/icons3d/bomb.png
-share/gnome/bombermaze/themes/icons3d/brick.png
-share/gnome/bombermaze/themes/icons3d/fire.png
-share/gnome/bombermaze/themes/icons3d/floor.png
-share/gnome/bombermaze/themes/icons3d/player1.png
-share/gnome/bombermaze/themes/icons3d/player2.png
-share/gnome/bombermaze/themes/icons3d/player3.png
-share/gnome/bombermaze/themes/icons3d/player4.png
-share/gnome/bombermaze/themes/icons3d/powerup.png
-share/gnome/bombermaze/themes/icons3d/wall.png
-share/gnome/bombermaze/themes/space/README
-share/gnome/bombermaze/themes/space/bomb.png
-share/gnome/bombermaze/themes/space/brick.png
-share/gnome/bombermaze/themes/space/fire.png
-share/gnome/bombermaze/themes/space/floor.png
-share/gnome/bombermaze/themes/space/player1.png
-share/gnome/bombermaze/themes/space/player2.png
-share/gnome/bombermaze/themes/space/player3.png
-share/gnome/bombermaze/themes/space/player4.png
-share/gnome/bombermaze/themes/space/powerup.png
-share/gnome/bombermaze/themes/space/wall.png
 share/gnome/help/bombermaze/C/animation.html
 share/gnome/help/bombermaze/C/index.html
 share/gnome/help/bombermaze/C/numeric.html
 share/gnome/help/bombermaze/C/topic.dat
-share/gnome/pixmaps/bombermaze.png
 share/locale/da/LC_MESSAGES/bombermaze.mo
 share/locale/de/LC_MESSAGES/bombermaze.mo
 share/locale/es/LC_MESSAGES/bombermaze.mo
@@ -66,13 +65,14 @@ share/locale/no/LC_MESSAGES/bombermaze.mo
 share/locale/pt_BR/LC_MESSAGES/bombermaze.mo
 share/locale/ru/LC_MESSAGES/bombermaze.mo
 share/locale/uk/LC_MESSAGES/bombermaze.mo
+share/pixmaps/bombermaze.png
 @dirrm share/gnome/help/bombermaze/C
 @dirrm share/gnome/help/bombermaze
-@dirrm share/gnome/bombermaze/themes/space
-@dirrm share/gnome/bombermaze/themes/icons3d
-@dirrm share/gnome/bombermaze/themes/gnomed
-@dirrm share/gnome/bombermaze/themes/default
-@dirrm share/gnome/bombermaze/themes
-@dirrm share/gnome/bombermaze/pixmaps
-@dirrm share/gnome/bombermaze/maps
-@dirrm share/gnome/bombermaze
+@dirrm %%DATADIR%%/themes/space
+@dirrm %%DATADIR%%/themes/icons3d
+@dirrm %%DATADIR%%/themes/gnomed
+@dirrm %%DATADIR%%/themes/default
+@dirrm %%DATADIR%%/themes
+@dirrm %%DATADIR%%/pixmaps
+@dirrm %%DATADIR%%/maps
+@dirrm %%DATADIR%%
diff --git a/games/childsplay/Makefile b/games/childsplay/Makefile
index 67476ff281a2..cb746b2b3aa8 100644
--- a/games/childsplay/Makefile
+++ b/games/childsplay/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	childsplay
 PORTVERSION=	0.80.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	childsplay
diff --git a/games/childsplay/files/patch-INSTALL.sh b/games/childsplay/files/patch-INSTALL.sh
index bd7257572de2..53330f1d1e66 100644
--- a/games/childsplay/files/patch-INSTALL.sh
+++ b/games/childsplay/files/patch-INSTALL.sh
@@ -13,7 +13,7 @@
  EXECDIR=$PREFIX/bin
  LOCALEDIR=$PREFIX/share/locale
 -ASSETMLDIR=/usr/share/assetml
-+ASSETMLDIR=$PREFIX/share/gnome/assetml
++ASSETMLDIR=$PREFIX/share/assetml
  SCOREDIR=/var/games
  SCOREFILE=$SCOREDIR/childsplay.score
  DOCDIR=$PREFIX/share/doc/childsplay
diff --git a/games/childsplay/pkg-plist b/games/childsplay/pkg-plist
index a9bebfe0400e..a1e1ba07f314 100644
--- a/games/childsplay/pkg-plist
+++ b/games/childsplay/pkg-plist
@@ -66,59 +66,59 @@ share/locale/es/LC_MESSAGES/childsplay.mo
 share/locale/fr/LC_MESSAGES/childsplay.mo
 share/locale/it/LC_MESSAGES/childsplay.mo
 share/locale/nl/LC_MESSAGES/childsplay.mo
-share/gnome/assetml/childsplay/childsplay-images/po/Translation.raw
-share/gnome/assetml/childsplay/childsplay-images/bluebold.ttf
-share/gnome/assetml/childsplay/childsplay-images/OK_but.png
-share/gnome/assetml/childsplay/childsplay-images/question1.png
-share/gnome/assetml/childsplay/childsplay-images/bullpen3.ttf
-share/gnome/assetml/childsplay/childsplay-images/firework1.png
-share/gnome/assetml/childsplay/childsplay-images/firework2.png
-share/gnome/assetml/childsplay/childsplay-images/chpl-icon-48-flat.png
-share/gnome/assetml/childsplay/childsplay-images/cowsplash.png
-share/gnome/assetml/childsplay/childsplay-images/blue.jpg
-share/gnome/assetml/childsplay/childsplay-images/tux.png
-share/gnome/assetml/childsplay/childsplay-images/pointer.png
-share/gnome/assetml/childsplay/childsplay-images/arrow.png
-share/gnome/assetml/childsplay/childsplay-images/bluehigh.ttf
-share/gnome/assetml/childsplay/childsplay-images/cowsplash-load.png
-share/gnome/assetml/childsplay/childsplay-images/childsplay-images.assetml
-share/gnome/assetml/childsplay/childsplay-images/land.png
-share/gnome/assetml/childsplay/childsplay-images/MORE_but.png
-share/gnome/assetml/childsplay/childsplay-images/balloonsl.png
-share/gnome/assetml/childsplay/childsplay-images/balloonsr.png
-share/gnome/assetml/childsplay/childsplay-images/stop.png
-share/gnome/assetml/childsplay/childsplay-images/hscore.png
-share/gnome/assetml/childsplay/childsplay-images/chpl-icon-48.png
-share/gnome/assetml/childsplay/childsplay-images/chpl-icon-48.xpm
-share/gnome/assetml/childsplay/memory-136x136/po/es.po
-share/gnome/assetml/childsplay/memory-136x136/po/fr.po
-share/gnome/assetml/childsplay/memory-136x136/po/nl.po
-share/gnome/assetml/childsplay/memory-136x136/po/memory-136x136.pot
-share/gnome/assetml/childsplay/memory-136x136/tree.png
-share/gnome/assetml/childsplay/memory-136x136/plane.png
-share/gnome/assetml/childsplay/memory-136x136/apple.png
-share/gnome/assetml/childsplay/memory-136x136/bread.png
-share/gnome/assetml/childsplay/memory-136x136/dog.png
-share/gnome/assetml/childsplay/memory-136x136/bear.png
-share/gnome/assetml/childsplay/memory-136x136/fish.png
-share/gnome/assetml/childsplay/memory-136x136/monkey.png
-share/gnome/assetml/childsplay/memory-136x136/boat.png
-share/gnome/assetml/childsplay/memory-136x136/memory-136x136.assetml
-share/gnome/assetml/childsplay/memory-136x136/car.png
-share/gnome/assetml/childsplay/memory-136x136/grapes.png
-share/gnome/assetml/childsplay/memory-136x136/lion.png
-share/gnome/assetml/childsplay/childsplay-sounds/po/nl.po
-share/gnome/assetml/childsplay/childsplay-sounds/po/Translation.raw
-share/gnome/assetml/childsplay/childsplay-sounds/bummer.wav
-share/gnome/assetml/childsplay/childsplay-sounds/childsplay-sounds.assetml
-share/gnome/assetml/childsplay/childsplay-sounds/level_clear.wav
-share/gnome/assetml/childsplay/childsplay-sounds/rocket.wav
-share/gnome/assetml/childsplay/childsplay-sounds/wahoo.wav
-share/gnome/assetml/childsplay/childsplay-sounds/cows.ogg
-share/gnome/assetml/childsplay/childsplay-sounds/Winner2.ogg
-share/gnome/assetml/childsplay/childsplay-sounds/music1.ogg
-share/gnome/assetml/childsplay/childsplay-sounds/dealcard1.wav
-share/gnome/assetml/childsplay/childsplay-sounds/boom.wav
+share/assetml/childsplay/childsplay-images/po/Translation.raw
+share/assetml/childsplay/childsplay-images/bluebold.ttf
+share/assetml/childsplay/childsplay-images/OK_but.png
+share/assetml/childsplay/childsplay-images/question1.png
+share/assetml/childsplay/childsplay-images/bullpen3.ttf
+share/assetml/childsplay/childsplay-images/firework1.png
+share/assetml/childsplay/childsplay-images/firework2.png
+share/assetml/childsplay/childsplay-images/chpl-icon-48-flat.png
+share/assetml/childsplay/childsplay-images/cowsplash.png
+share/assetml/childsplay/childsplay-images/blue.jpg
+share/assetml/childsplay/childsplay-images/tux.png
+share/assetml/childsplay/childsplay-images/pointer.png
+share/assetml/childsplay/childsplay-images/arrow.png
+share/assetml/childsplay/childsplay-images/bluehigh.ttf
+share/assetml/childsplay/childsplay-images/cowsplash-load.png
+share/assetml/childsplay/childsplay-images/childsplay-images.assetml
+share/assetml/childsplay/childsplay-images/land.png
+share/assetml/childsplay/childsplay-images/MORE_but.png
+share/assetml/childsplay/childsplay-images/balloonsl.png
+share/assetml/childsplay/childsplay-images/balloonsr.png
+share/assetml/childsplay/childsplay-images/stop.png
+share/assetml/childsplay/childsplay-images/hscore.png
+share/assetml/childsplay/childsplay-images/chpl-icon-48.png
+share/assetml/childsplay/childsplay-images/chpl-icon-48.xpm
+share/assetml/childsplay/memory-136x136/po/es.po
+share/assetml/childsplay/memory-136x136/po/fr.po
+share/assetml/childsplay/memory-136x136/po/nl.po
+share/assetml/childsplay/memory-136x136/po/memory-136x136.pot
+share/assetml/childsplay/memory-136x136/tree.png
+share/assetml/childsplay/memory-136x136/plane.png
+share/assetml/childsplay/memory-136x136/apple.png
+share/assetml/childsplay/memory-136x136/bread.png
+share/assetml/childsplay/memory-136x136/dog.png
+share/assetml/childsplay/memory-136x136/bear.png
+share/assetml/childsplay/memory-136x136/fish.png
+share/assetml/childsplay/memory-136x136/monkey.png
+share/assetml/childsplay/memory-136x136/boat.png
+share/assetml/childsplay/memory-136x136/memory-136x136.assetml
+share/assetml/childsplay/memory-136x136/car.png
+share/assetml/childsplay/memory-136x136/grapes.png
+share/assetml/childsplay/memory-136x136/lion.png
+share/assetml/childsplay/childsplay-sounds/po/nl.po
+share/assetml/childsplay/childsplay-sounds/po/Translation.raw
+share/assetml/childsplay/childsplay-sounds/bummer.wav
+share/assetml/childsplay/childsplay-sounds/childsplay-sounds.assetml
+share/assetml/childsplay/childsplay-sounds/level_clear.wav
+share/assetml/childsplay/childsplay-sounds/rocket.wav
+share/assetml/childsplay/childsplay-sounds/wahoo.wav
+share/assetml/childsplay/childsplay-sounds/cows.ogg
+share/assetml/childsplay/childsplay-sounds/Winner2.ogg
+share/assetml/childsplay/childsplay-sounds/music1.ogg
+share/assetml/childsplay/childsplay-sounds/dealcard1.wav
+share/assetml/childsplay/childsplay-sounds/boom.wav
 share/childsplay/Data/bluebold.ttf
 share/childsplay/Data/bluehigh.ttf
 share/childsplay/Data/boom.wav
@@ -152,13 +152,13 @@ share/childsplay/lib/MemoryData/cardback.png
 @dirrm share/doc/childsplay/po/it
 @dirrm share/doc/childsplay/po
 @dirrm share/doc/childsplay
-@dirrm share/gnome/assetml/childsplay/childsplay-images/po
-@dirrm share/gnome/assetml/childsplay/childsplay-images
-@dirrm share/gnome/assetml/childsplay/memory-136x136/po
-@dirrm share/gnome/assetml/childsplay/memory-136x136
-@dirrm share/gnome/assetml/childsplay/childsplay-sounds/po
-@dirrm share/gnome/assetml/childsplay/childsplay-sounds
-@dirrm share/gnome/assetml/childsplay
+@dirrm share/assetml/childsplay/childsplay-images/po
+@dirrm share/assetml/childsplay/childsplay-images
+@dirrm share/assetml/childsplay/memory-136x136/po
+@dirrm share/assetml/childsplay/memory-136x136
+@dirrm share/assetml/childsplay/childsplay-sounds/po
+@dirrm share/assetml/childsplay/childsplay-sounds
+@dirrm share/assetml/childsplay
 @dirrm share/childsplay/Data/icons
 @dirrm share/childsplay/Data
 @dirrm share/childsplay/lib/ConfigData
diff --git a/games/childsplay_plugins/Makefile b/games/childsplay_plugins/Makefile
index d15e5438c6c8..502705a182aa 100644
--- a/games/childsplay_plugins/Makefile
+++ b/games/childsplay_plugins/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	childsplay_plugins
 PORTVERSION=	0.80.1.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	childsplay
diff --git a/games/childsplay_plugins/files/patch-install.sh b/games/childsplay_plugins/files/patch-install.sh
index 2252aa7e7971..a2c7253905dc 100644
--- a/games/childsplay_plugins/files/patch-install.sh
+++ b/games/childsplay_plugins/files/patch-install.sh
@@ -14,7 +14,7 @@ diff -U 4 -r -N ./install.sh.orig ./install.sh
  
  LOCALEDIR=$PREFIX/share/locale
 -ASSETMLDIR=/usr/share/assetml
-+ASSETMLDIR=$PREFIX/share/gnome/assetml
++ASSETMLDIR=$PREFIX/share/assetml
  PYTHON=`which python`
  SCOREDIR=/var/games
  DOCDIR=$PREFIX/share/doc/childsplay
diff --git a/games/childsplay_plugins/pkg-plist b/games/childsplay_plugins/pkg-plist
index 1b3305cebda7..53c7bcc28ab3 100644
--- a/games/childsplay_plugins/pkg-plist
+++ b/games/childsplay_plugins/pkg-plist
@@ -21,25 +21,25 @@ childsplay/lib/soundNpic.py
 childsplay/lib/soundNpic.pyc
 childsplay/lib/soundmemory.py
 childsplay/lib/soundmemory.pyc
-share/gnome/assetml/childsplay/sounds-misc/po/Translation.raw
-share/gnome/assetml/childsplay/sounds-misc/catmeow.ogg
-share/gnome/assetml/childsplay/sounds-misc/cow.ogg
-share/gnome/assetml/childsplay/sounds-misc/elephant.ogg
-share/gnome/assetml/childsplay/sounds-misc/frog.ogg
-share/gnome/assetml/childsplay/sounds-misc/lion.ogg
-share/gnome/assetml/childsplay/sounds-misc/passby.ogg
-share/gnome/assetml/childsplay/sounds-misc/phone1.ogg
-share/gnome/assetml/childsplay/sounds-misc/plane.ogg
-share/gnome/assetml/childsplay/sounds-misc/police.ogg
-share/gnome/assetml/childsplay/sounds-misc/rocket.ogg
-share/gnome/assetml/childsplay/sounds-misc/rooster.ogg
-share/gnome/assetml/childsplay/sounds-misc/sheep.ogg
-share/gnome/assetml/childsplay/sounds-misc/slideup.ogg
-share/gnome/assetml/childsplay/sounds-misc/smackzin.ogg
-share/gnome/assetml/childsplay/sounds-misc/sneeze3.ogg
-share/gnome/assetml/childsplay/sounds-misc/sounds-misc.assetml
-share/gnome/assetml/childsplay/sounds-misc/tomtom.ogg
-share/gnome/assetml/childsplay/sounds-misc/train.ogg
+share/assetml/childsplay/sounds-misc/po/Translation.raw
+share/assetml/childsplay/sounds-misc/catmeow.ogg
+share/assetml/childsplay/sounds-misc/cow.ogg
+share/assetml/childsplay/sounds-misc/elephant.ogg
+share/assetml/childsplay/sounds-misc/frog.ogg
+share/assetml/childsplay/sounds-misc/lion.ogg
+share/assetml/childsplay/sounds-misc/passby.ogg
+share/assetml/childsplay/sounds-misc/phone1.ogg
+share/assetml/childsplay/sounds-misc/plane.ogg
+share/assetml/childsplay/sounds-misc/police.ogg
+share/assetml/childsplay/sounds-misc/rocket.ogg
+share/assetml/childsplay/sounds-misc/rooster.ogg
+share/assetml/childsplay/sounds-misc/sheep.ogg
+share/assetml/childsplay/sounds-misc/slideup.ogg
+share/assetml/childsplay/sounds-misc/smackzin.ogg
+share/assetml/childsplay/sounds-misc/sneeze3.ogg
+share/assetml/childsplay/sounds-misc/sounds-misc.assetml
+share/assetml/childsplay/sounds-misc/tomtom.ogg
+share/assetml/childsplay/sounds-misc/train.ogg
 share/childsplay/Data/icons/billiard.icon.png
 share/childsplay/Data/icons/soundNpic.icon.png
 share/childsplay/Data/icons/pong.icon.png
@@ -214,8 +214,8 @@ share/childsplay/lib/SoundNpicData/Level1/rooster.ogg
 share/childsplay/lib/SoundNpicData/Level1/rooster.png
 share/childsplay/lib/SoundNpicData/Level1/sheep.ogg
 share/childsplay/lib/SoundNpicData/Level1/elephant.ogg
-@dirrm share/gnome/assetml/childsplay/sounds-misc/po
-@dirrm share/gnome/assetml/childsplay/sounds-misc
+@dirrm share/assetml/childsplay/sounds-misc/po
+@dirrm share/assetml/childsplay/sounds-misc
 @dirrm share/childsplay/Data/AlphabetSounds/en
 @dirrm share/childsplay/Data/AlphabetSounds
 @dirrm share/childsplay/lib/BilliardData
diff --git a/games/gcompris/Makefile b/games/gcompris/Makefile
index 94b807934ee9..e31a2076b3a2 100644
--- a/games/gcompris/Makefile
+++ b/games/gcompris/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gcompris
 DISTVERSION=	8.3.2-2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	gcompris
@@ -44,7 +44,7 @@ INFO=		gcompris
 
 .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
@@ -62,7 +62,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/games/gcompris/pkg-plist b/games/gcompris/pkg-plist
index aea9beda8d43..5b44f488d4f9 100644
--- a/games/gcompris/pkg-plist
+++ b/games/gcompris/pkg-plist
@@ -152,5875 +152,5875 @@ lib/gcompris/libwordsgame.so
 %%DATADIR%%/python/writing_tutor_missing_match.py
 %%DATADIR%%/python/writing_tutor_pattern_admin.py
 %%DATADIR%%/python/writing_tutor_template_match.py
-share/gnome/applications/gcompris-edit.desktop
-share/gnome/applications/gcompris.desktop
-share/gnome/gcompris/boards/DOCUMENTATIONS
-share/gnome/gcompris/boards/Makefile.in.bak
-share/gnome/gcompris/boards/README
-share/gnome/gcompris/boards/administration.xml
-share/gnome/gcompris/boards/advanced_colors.xml
-share/gnome/gcompris/boards/advanced_colors/Makefile.in.bak
-share/gnome/gcompris/boards/advanced_colors/advanced_colors1.jpg
-share/gnome/gcompris/boards/advanced_colors/advanced_colors2.jpg
-share/gnome/gcompris/boards/advanced_colors/advanced_colors3.jpg
-share/gnome/gcompris/boards/advanced_colors/advanced_colors4.jpg
-share/gnome/gcompris/boards/advanced_colors/advanced_colors5.jpg
-share/gnome/gcompris/boards/advanced_colors/advanced_colors6.jpg
-share/gnome/gcompris/boards/advanced_colors/advanced_colors7.jpg
-share/gnome/gcompris/boards/advanced_colors/advanced_colors8.jpg
-share/gnome/gcompris/boards/advanced_colors/advanced_colors9.jpg
-share/gnome/gcompris/boards/advanced_colors/advanced_colors_highlight.png
-share/gnome/gcompris/boards/advanced_colors/board1.xml
-share/gnome/gcompris/boards/advanced_colors/board2.xml
-share/gnome/gcompris/boards/advanced_colors/board3.xml
-share/gnome/gcompris/boards/advanced_colors/board4.xml
-share/gnome/gcompris/boards/advanced_colors/board5.xml
-share/gnome/gcompris/boards/advanced_colors/board6.xml
-share/gnome/gcompris/boards/advanced_colors/board7.xml
-share/gnome/gcompris/boards/advanced_colors/board8.xml
-share/gnome/gcompris/boards/advanced_colors/board9.xml
-share/gnome/gcompris/boards/algebra_by.xml
-share/gnome/gcompris/boards/algebra_group.xml
-share/gnome/gcompris/boards/algebra_guesscount.xml
-share/gnome/gcompris/boards/algebra_guesscount/1.png
-share/gnome/gcompris/boards/algebra_guesscount/10.png
-share/gnome/gcompris/boards/algebra_guesscount/100.png
-share/gnome/gcompris/boards/algebra_guesscount/2.png
-share/gnome/gcompris/boards/algebra_guesscount/25.png
-share/gnome/gcompris/boards/algebra_guesscount/3.png
-share/gnome/gcompris/boards/algebra_guesscount/4.png
-share/gnome/gcompris/boards/algebra_guesscount/5.png
-share/gnome/gcompris/boards/algebra_guesscount/50.png
-share/gnome/gcompris/boards/algebra_guesscount/6.png
-share/gnome/gcompris/boards/algebra_guesscount/7.png
-share/gnome/gcompris/boards/algebra_guesscount/8.png
-share/gnome/gcompris/boards/algebra_guesscount/9.png
-share/gnome/gcompris/boards/algebra_guesscount/button.png
-share/gnome/gcompris/boards/algebra_guesscount/by.png
-share/gnome/gcompris/boards/algebra_guesscount/div.png
-share/gnome/gcompris/boards/algebra_guesscount/equal.png
-share/gnome/gcompris/boards/algebra_guesscount/minus.png
-share/gnome/gcompris/boards/algebra_guesscount/plus.png
-share/gnome/gcompris/boards/algebra_minus.xml
-share/gnome/gcompris/boards/algebra_plus.xml
-share/gnome/gcompris/boards/algebramenu.xml
-share/gnome/gcompris/boards/algorithm.xml
-share/gnome/gcompris/boards/anim.xml
-share/gnome/gcompris/boards/anim/animation.js
-share/gnome/gcompris/boards/awele.xml
-share/gnome/gcompris/boards/awele/awele_frame.png
-share/gnome/gcompris/boards/awele/bouton1.png
-share/gnome/gcompris/boards/awele/bouton1_clic.png
-share/gnome/gcompris/boards/awele/bouton1_notify.png
-share/gnome/gcompris/boards/awele/bouton2.png
-share/gnome/gcompris/boards/awele/bouton2_clic.png
-share/gnome/gcompris/boards/awele/bouton2_notify.png
-share/gnome/gcompris/boards/awele/bouton3.png
-share/gnome/gcompris/boards/awele/bouton3_clic.png
-share/gnome/gcompris/boards/awele/bouton3_notify.png
-share/gnome/gcompris/boards/awele/bouton4.png
-share/gnome/gcompris/boards/awele/bouton4_clic.png
-share/gnome/gcompris/boards/awele/bouton4_notify.png
-share/gnome/gcompris/boards/awele/bouton5.png
-share/gnome/gcompris/boards/awele/bouton5_clic.png
-share/gnome/gcompris/boards/awele/bouton5_notify.png
-share/gnome/gcompris/boards/awele/bouton6.png
-share/gnome/gcompris/boards/awele/bouton6_clic.png
-share/gnome/gcompris/boards/awele/bouton6_notify.png
-share/gnome/gcompris/boards/awele/graine1.png
-share/gnome/gcompris/boards/awele/graine2.png
-share/gnome/gcompris/boards/awele/graine3.png
-share/gnome/gcompris/boards/awele/graine4.png
-share/gnome/gcompris/boards/awele/graine4bis.png
-share/gnome/gcompris/boards/babymatch.xml
-share/gnome/gcompris/boards/babymatch/Makefile.in.bak
-share/gnome/gcompris/boards/babymatch/bell.png
-share/gnome/gcompris/boards/babymatch/board1_0.xml
-share/gnome/gcompris/boards/babymatch/board2_0.xml
-share/gnome/gcompris/boards/babymatch/board3_0.xml
-share/gnome/gcompris/boards/babymatch/board4_0.xml
-share/gnome/gcompris/boards/babymatch/board5_0.xml
-share/gnome/gcompris/boards/babymatch/board6_0.xml
-share/gnome/gcompris/boards/babymatch/board7_0.xml
-share/gnome/gcompris/boards/babymatch/gramophone.png
-share/gnome/gcompris/boards/babymatch/lifebuoy.png
-share/gnome/gcompris/boards/babymatch/sun.png
-share/gnome/gcompris/boards/babymatch/umbrella.png
-share/gnome/gcompris/boards/babyshapes.xml
-share/gnome/gcompris/boards/babyshapes/Makefile.in.bak
-share/gnome/gcompris/boards/babyshapes/T_baby_bottle.png
-share/gnome/gcompris/boards/babyshapes/T_banana.png
-share/gnome/gcompris/boards/babyshapes/T_bread_slice.png
-share/gnome/gcompris/boards/babyshapes/T_butter.png
-share/gnome/gcompris/boards/babyshapes/T_chocolate.png
-share/gnome/gcompris/boards/babyshapes/T_chocolate_cake.png
-share/gnome/gcompris/boards/babyshapes/T_cookie.png
-share/gnome/gcompris/boards/babyshapes/T_french_croissant.png
-share/gnome/gcompris/boards/babyshapes/T_grapefruit.png
-share/gnome/gcompris/boards/babyshapes/T_marmelade.png
-share/gnome/gcompris/boards/babyshapes/T_milk_cup.png
-share/gnome/gcompris/boards/babyshapes/T_milk_shake.png
-share/gnome/gcompris/boards/babyshapes/T_orange.png
-share/gnome/gcompris/boards/babyshapes/T_pear.png
-share/gnome/gcompris/boards/babyshapes/T_round_cookie.png
-share/gnome/gcompris/boards/babyshapes/T_suggar_box.png
-share/gnome/gcompris/boards/babyshapes/T_yahourt.png
-share/gnome/gcompris/boards/babyshapes/board1_0.xml
-share/gnome/gcompris/boards/babyshapes/board2_0.xml
-share/gnome/gcompris/boards/babyshapes/board3_0.xml
-share/gnome/gcompris/boards/babyshapes/board4_0.xml
-share/gnome/gcompris/boards/babyshapes/board5_0.xml
-share/gnome/gcompris/boards/babyshapes/board6_0.xml
-share/gnome/gcompris/boards/babyshapes/board7_0.xml
-share/gnome/gcompris/boards/babyshapes/dog1/dog.png
-share/gnome/gcompris/boards/babyshapes/dog1/dog1.png
-share/gnome/gcompris/boards/babyshapes/dog1/dog2.png
-share/gnome/gcompris/boards/babyshapes/dog1/dog3.png
-share/gnome/gcompris/boards/babyshapes/dog2/dog.png
-share/gnome/gcompris/boards/babyshapes/dog2/dog1.png
-share/gnome/gcompris/boards/babyshapes/dog2/dog2.png
-share/gnome/gcompris/boards/babyshapes/dog2/dog3.png
-share/gnome/gcompris/boards/babyshapes/dog2/dog4.png
-share/gnome/gcompris/boards/babyshapes/dog2/dog5.png
-share/gnome/gcompris/boards/babyshapes/dog2/dog6.png
-share/gnome/gcompris/boards/babyshapes/dog3/dog.png
-share/gnome/gcompris/boards/babyshapes/dog3/dog1.png
-share/gnome/gcompris/boards/babyshapes/dog3/dog2.png
-share/gnome/gcompris/boards/babyshapes/dog3/dog3.png
-share/gnome/gcompris/boards/babyshapes/dog3/dog4.png
-share/gnome/gcompris/boards/babyshapes/dog3/dog5.png
-share/gnome/gcompris/boards/babyshapes/dog3/dog6.png
-share/gnome/gcompris/boards/ballcatch.xml
-share/gnome/gcompris/boards/bargame.xml
-share/gnome/gcompris/boards/bargame/blue_ball.png
-share/gnome/gcompris/boards/bargame/board.png
-share/gnome/gcompris/boards/bargame/case.png
-share/gnome/gcompris/boards/bargame/case_last.png
-share/gnome/gcompris/boards/bargame/green_ball.png
-share/gnome/gcompris/boards/bargame/mask.png
-share/gnome/gcompris/boards/bargame/mask_last.png
-share/gnome/gcompris/boards/bargame/ombre.png
-share/gnome/gcompris/boards/billard.xml
-share/gnome/gcompris/boards/canal_lock.xml
-share/gnome/gcompris/boards/canal_lock/canal_lock_bg.png
-share/gnome/gcompris/boards/cardimage/01_cat.png
-share/gnome/gcompris/boards/cardimage/02_pig.png
-share/gnome/gcompris/boards/cardimage/03_bear.png
-share/gnome/gcompris/boards/cardimage/04_hippopotamus.png
-share/gnome/gcompris/boards/cardimage/05_penguin.png
-share/gnome/gcompris/boards/cardimage/06_cow.png
-share/gnome/gcompris/boards/cardimage/07_sheep.png
-share/gnome/gcompris/boards/cardimage/08_turtle.png
-share/gnome/gcompris/boards/cardimage/09_panda.png
-share/gnome/gcompris/boards/cardimage/10_chicken.png
-share/gnome/gcompris/boards/cardimage/11_redbird.png
-share/gnome/gcompris/boards/cardimage/12_wolf.png
-share/gnome/gcompris/boards/cardimage/13_monkey.png
-share/gnome/gcompris/boards/cardimage/14_fox.png
-share/gnome/gcompris/boards/cardimage/15_bluebirds.png
-share/gnome/gcompris/boards/cardimage/16_elephant.png
-share/gnome/gcompris/boards/cardimage/17_lion.png
-share/gnome/gcompris/boards/cardimage/18_gnu.png
-share/gnome/gcompris/boards/cardimage/19_bluebaby.png
-share/gnome/gcompris/boards/cardimage/20_greenbaby.png
-share/gnome/gcompris/boards/cardimage/21_frog.png
-share/gnome/gcompris/boards/cardimage/README
-share/gnome/gcompris/boards/cardimage/backcard.png
-share/gnome/gcompris/boards/cardimage/emptycard.png
-share/gnome/gcompris/boards/chat.xml
-share/gnome/gcompris/boards/chess.xml
-share/gnome/gcompris/boards/chess/Bb.png
-share/gnome/gcompris/boards/chess/Bk.png
-share/gnome/gcompris/boards/chess/Bn.png
-share/gnome/gcompris/boards/chess/Bp.png
-share/gnome/gcompris/boards/chess/Bq.png
-share/gnome/gcompris/boards/chess/Br.png
-share/gnome/gcompris/boards/chess/COPYRIGHT
-share/gnome/gcompris/boards/chess/WB.png
-share/gnome/gcompris/boards/chess/WK.png
-share/gnome/gcompris/boards/chess/WN.png
-share/gnome/gcompris/boards/chess/WP.png
-share/gnome/gcompris/boards/chess/WQ.png
-share/gnome/gcompris/boards/chess/WR.png
-share/gnome/gcompris/boards/chess_computer.xml
-share/gnome/gcompris/boards/chess_movelearn.xml
-share/gnome/gcompris/boards/chess_partyend.xml
-share/gnome/gcompris/boards/chronos.xml
-share/gnome/gcompris/boards/chronos/Makefile.in.bak
-share/gnome/gcompris/boards/chronos/board1_0.xml
-share/gnome/gcompris/boards/chronos/board1_1.xml
-share/gnome/gcompris/boards/chronos/board1_2.xml
-share/gnome/gcompris/boards/chronos/board2_0.xml
-share/gnome/gcompris/boards/chronos/board3_0.xml
-share/gnome/gcompris/boards/chronos/board3_1.xml
-share/gnome/gcompris/boards/chronos/board3_2.xml
-share/gnome/gcompris/boards/chronos/board3_3.xml
-share/gnome/gcompris/boards/chronos/board3_4.xml
-share/gnome/gcompris/boards/chronos/board4_0.xml
-share/gnome/gcompris/boards/chronos/board4_1.xml
-share/gnome/gcompris/boards/chronos/board4_2.xml
-share/gnome/gcompris/boards/chronos/board4_3.xml
-share/gnome/gcompris/boards/chronos/images/1955ds19.png
-share/gnome/gcompris/boards/chronos/images/Eole.png
-share/gnome/gcompris/boards/chronos/images/README
-share/gnome/gcompris/boards/chronos/images/autumn.png
-share/gnome/gcompris/boards/chronos/images/bell_X1.png
-share/gnome/gcompris/boards/chronos/images/benz1885.png
-share/gnome/gcompris/boards/chronos/images/bleriot.png
-share/gnome/gcompris/boards/chronos/images/bolle1878.png
-share/gnome/gcompris/boards/chronos/images/celerifere.png
-share/gnome/gcompris/boards/chronos/images/chronos-tuxtree1.png
-share/gnome/gcompris/boards/chronos/images/chronos-tuxtree2.png
-share/gnome/gcompris/boards/chronos/images/chronos-tuxtree3.png
-share/gnome/gcompris/boards/chronos/images/chronos-tuxtree4.png
-share/gnome/gcompris/boards/chronos/images/fardier.png
-share/gnome/gcompris/boards/chronos/images/garden1.png
-share/gnome/gcompris/boards/chronos/images/garden2.png
-share/gnome/gcompris/boards/chronos/images/garden3.png
-share/gnome/gcompris/boards/chronos/images/garden4.png
-share/gnome/gcompris/boards/chronos/images/helico_cornu.png
-share/gnome/gcompris/boards/chronos/images/lancia1923.png
-share/gnome/gcompris/boards/chronos/images/lindbergh.png
-share/gnome/gcompris/boards/chronos/images/mongolfiere.png
-share/gnome/gcompris/boards/chronos/images/rafale.png
-share/gnome/gcompris/boards/chronos/images/renault1899.png
-share/gnome/gcompris/boards/chronos/images/spring.png
-share/gnome/gcompris/boards/chronos/images/st_rocket.png
-share/gnome/gcompris/boards/chronos/images/summer.png
-share/gnome/gcompris/boards/chronos/images/winter.png
-share/gnome/gcompris/boards/chronos/images/wright_flyer.png
-share/gnome/gcompris/boards/chronos/space/1.jpg
-share/gnome/gcompris/boards/chronos/space/2.jpg
-share/gnome/gcompris/boards/chronos/space/3.jpg
-share/gnome/gcompris/boards/chronos/space/4.jpg
-share/gnome/gcompris/boards/chronos/space/bg.jpg
-share/gnome/gcompris/boards/click_on_letter.xml
-share/gnome/gcompris/boards/clickanddraw.xml
-share/gnome/gcompris/boards/clickgame.xml
-share/gnome/gcompris/boards/clockgame.xml
-share/gnome/gcompris/boards/colors.xml
-share/gnome/gcompris/boards/colors/colors_bg.png
-share/gnome/gcompris/boards/colors/colors_highlight.png
-share/gnome/gcompris/boards/colors_group.xml
-share/gnome/gcompris/boards/computer.xml
-share/gnome/gcompris/boards/connect4-2players.xml
-share/gnome/gcompris/boards/connect4.xml
-share/gnome/gcompris/boards/connect4/back.png
-share/gnome/gcompris/boards/connect4/sablier.gif
-share/gnome/gcompris/boards/connect4/sablier.txt
-share/gnome/gcompris/boards/connect4/stone_1.png
-share/gnome/gcompris/boards/connect4/stone_2.png
-share/gnome/gcompris/boards/connect4/tux-teacher.png
-share/gnome/gcompris/boards/crane.xml
-share/gnome/gcompris/boards/crane/arrow_b.png
-share/gnome/gcompris/boards/crane/arrow_down.png
-share/gnome/gcompris/boards/crane/arrow_l.png
-share/gnome/gcompris/boards/crane/arrow_left.png
-share/gnome/gcompris/boards/crane/arrow_r.png
-share/gnome/gcompris/boards/crane/arrow_right.png
-share/gnome/gcompris/boards/crane/arrow_u.png
-share/gnome/gcompris/boards/crane/arrow_up.png
-share/gnome/gcompris/boards/crane/bulb.png
-share/gnome/gcompris/boards/crane/crane-bg.png
-share/gnome/gcompris/boards/crane/letter-a.png
-share/gnome/gcompris/boards/crane/letter-b.png
-share/gnome/gcompris/boards/crane/rectangle1.png
-share/gnome/gcompris/boards/crane/rectangle2.png
-share/gnome/gcompris/boards/crane/selected.png
-share/gnome/gcompris/boards/crane/square1.png
-share/gnome/gcompris/boards/crane/square2.png
-share/gnome/gcompris/boards/crane/triangle1.png
-share/gnome/gcompris/boards/crane/triangle2.png
-share/gnome/gcompris/boards/crane/tux.png
-share/gnome/gcompris/boards/crane/water_drop1.png
-share/gnome/gcompris/boards/crane/water_drop2.png
-share/gnome/gcompris/boards/crane/water_spot1.png
-share/gnome/gcompris/boards/crane/water_spot2.png
-share/gnome/gcompris/boards/dataset/misc.xml
-share/gnome/gcompris/boards/dataset/mrpotato.xml
-share/gnome/gcompris/boards/dataset/tuxpaint_pictures.xml
-share/gnome/gcompris/boards/dataset/user_pictures.xml
-share/gnome/gcompris/boards/discovery.xml
-share/gnome/gcompris/boards/doubleentry.xml
-share/gnome/gcompris/boards/doubleentry/Makefile.in.bak
-share/gnome/gcompris/boards/doubleentry/board1_0.xml
-share/gnome/gcompris/boards/doubleentry/board2_0.xml
-share/gnome/gcompris/boards/doubleentry/board3_0.xml
-share/gnome/gcompris/boards/doubleentry/circle-r0-g2.png
-share/gnome/gcompris/boards/doubleentry/circle-r0-g3.png
-share/gnome/gcompris/boards/doubleentry/circle-r0-g4.png
-share/gnome/gcompris/boards/doubleentry/circle-r2-g0.png
-share/gnome/gcompris/boards/doubleentry/circle-r2-g2.png
-share/gnome/gcompris/boards/doubleentry/circle-r2-g3.png
-share/gnome/gcompris/boards/doubleentry/circle-r2-g4.png
-share/gnome/gcompris/boards/doubleentry/circle-r3-g0.png
-share/gnome/gcompris/boards/doubleentry/circle-r3-g2.png
-share/gnome/gcompris/boards/doubleentry/circle-r3-g3.png
-share/gnome/gcompris/boards/doubleentry/circle-r3-g4.png
-share/gnome/gcompris/boards/doubleentry/circle-r4-g0.png
-share/gnome/gcompris/boards/doubleentry/circle-r4-g2.png
-share/gnome/gcompris/boards/doubleentry/circle-r4-g3.png
-share/gnome/gcompris/boards/doubleentry/circle-r4-g4.png
-share/gnome/gcompris/boards/doubleentry/d-entry_banane_1.png
-share/gnome/gcompris/boards/doubleentry/d-entry_banane_2.png
-share/gnome/gcompris/boards/doubleentry/d-entry_banane_3.png
-share/gnome/gcompris/boards/doubleentry/d-entry_galette_1.png
-share/gnome/gcompris/boards/doubleentry/d-entry_galette_2.png
-share/gnome/gcompris/boards/doubleentry/d-entry_galette_3.png
-share/gnome/gcompris/boards/doubleentry/d-entry_pomme_1.png
-share/gnome/gcompris/boards/doubleentry/d-entry_pomme_2.png
-share/gnome/gcompris/boards/doubleentry/d-entry_pomme_3.png
-share/gnome/gcompris/boards/doubleentry/doubleentry-bg.png
-share/gnome/gcompris/boards/draw.xml
-share/gnome/gcompris/boards/drawnumber.xml
-share/gnome/gcompris/boards/electric.xml
-share/gnome/gcompris/boards/electric/battery.png
-share/gnome/gcompris/boards/electric/battery_dead.png
-share/gnome/gcompris/boards/electric/battery_icon.png
-share/gnome/gcompris/boards/electric/bulb1.png
-share/gnome/gcompris/boards/electric/bulb10.png
-share/gnome/gcompris/boards/electric/bulb11.png
-share/gnome/gcompris/boards/electric/bulb2.png
-share/gnome/gcompris/boards/electric/bulb3.png
-share/gnome/gcompris/boards/electric/bulb4.png
-share/gnome/gcompris/boards/electric/bulb5.png
-share/gnome/gcompris/boards/electric/bulb6.png
-share/gnome/gcompris/boards/electric/bulb7.png
-share/gnome/gcompris/boards/electric/bulb8.png
-share/gnome/gcompris/boards/electric/bulb9.png
-share/gnome/gcompris/boards/electric/bulb_icon.png
-share/gnome/gcompris/boards/electric/connect.png
-share/gnome/gcompris/boards/electric/connect_icon.png
-share/gnome/gcompris/boards/electric/connect_spot.png
-share/gnome/gcompris/boards/electric/diod.png
-share/gnome/gcompris/boards/electric/diode.png
-share/gnome/gcompris/boards/electric/diode_icon.png
-share/gnome/gcompris/boards/electric/resistor.png
-share/gnome/gcompris/boards/electric/resistor_icon.png
-share/gnome/gcompris/boards/electric/resistor_track.png
-share/gnome/gcompris/boards/electric/resistor_track_icon.png
-share/gnome/gcompris/boards/electric/resistor_wiper.png
-share/gnome/gcompris/boards/electric/switch2_icon.png
-share/gnome/gcompris/boards/electric/switch2_off.png
-share/gnome/gcompris/boards/electric/switch2_on.png
-share/gnome/gcompris/boards/electric/switch_click.png
-share/gnome/gcompris/boards/electric/switch_icon.png
-share/gnome/gcompris/boards/electric/switch_off.png
-share/gnome/gcompris/boards/electric/switch_on.png
-share/gnome/gcompris/boards/enumerate.xml
-share/gnome/gcompris/boards/erase.xml
-share/gnome/gcompris/boards/erase_clic.xml
-share/gnome/gcompris/boards/experience.xml
-share/gnome/gcompris/boards/experimental.xml
-share/gnome/gcompris/boards/fifteen.xml
-share/gnome/gcompris/boards/fishes/QueenAngel_0.png
-share/gnome/gcompris/boards/fishes/QueenAngel_1.png
-share/gnome/gcompris/boards/fishes/blueking2_0.png
-share/gnome/gcompris/boards/fishes/blueking2_1.png
-share/gnome/gcompris/boards/fishes/butfish_0.png
-share/gnome/gcompris/boards/fishes/butfish_1.png
-share/gnome/gcompris/boards/fishes/cichlid1_0.png
-share/gnome/gcompris/boards/fishes/cichlid1_1.png
-share/gnome/gcompris/boards/fishes/cichlid4_0.png
-share/gnome/gcompris/boards/fishes/cichlid4_1.png
-share/gnome/gcompris/boards/fishes/collaris_0.png
-share/gnome/gcompris/boards/fishes/collaris_1.png
-share/gnome/gcompris/boards/fishes/discus2_0.png
-share/gnome/gcompris/boards/fishes/discus2_1.png
-share/gnome/gcompris/boards/fishes/discus3_0.png
-share/gnome/gcompris/boards/fishes/discus3_1.png
-share/gnome/gcompris/boards/fishes/eel_0.png
-share/gnome/gcompris/boards/fishes/eel_1.png
-share/gnome/gcompris/boards/fishes/f00_0.png
-share/gnome/gcompris/boards/fishes/f00_1.png
-share/gnome/gcompris/boards/fishes/f01_0.png
-share/gnome/gcompris/boards/fishes/f01_1.png
-share/gnome/gcompris/boards/fishes/f02_0.png
-share/gnome/gcompris/boards/fishes/f02_1.png
-share/gnome/gcompris/boards/fishes/f03_0.png
-share/gnome/gcompris/boards/fishes/f03_1.png
-share/gnome/gcompris/boards/fishes/f04_0.png
-share/gnome/gcompris/boards/fishes/f04_1.png
-share/gnome/gcompris/boards/fishes/f05_0.png
-share/gnome/gcompris/boards/fishes/f05_1.png
-share/gnome/gcompris/boards/fishes/f06_0.png
-share/gnome/gcompris/boards/fishes/f06_1.png
-share/gnome/gcompris/boards/fishes/f07_0.png
-share/gnome/gcompris/boards/fishes/f07_1.png
-share/gnome/gcompris/boards/fishes/f08_0.png
-share/gnome/gcompris/boards/fishes/f08_1.png
-share/gnome/gcompris/boards/fishes/f09_0.png
-share/gnome/gcompris/boards/fishes/f09_1.png
-share/gnome/gcompris/boards/fishes/f10_0.png
-share/gnome/gcompris/boards/fishes/f10_1.png
-share/gnome/gcompris/boards/fishes/f11_0.png
-share/gnome/gcompris/boards/fishes/f11_1.png
-share/gnome/gcompris/boards/fishes/f12_0.png
-share/gnome/gcompris/boards/fishes/f12_1.png
-share/gnome/gcompris/boards/fishes/f13_0.png
-share/gnome/gcompris/boards/fishes/f13_1.png
-share/gnome/gcompris/boards/fishes/manta_0.png
-share/gnome/gcompris/boards/fishes/manta_1.png
-share/gnome/gcompris/boards/fishes/newf1_0.png
-share/gnome/gcompris/boards/fishes/newf1_1.png
-share/gnome/gcompris/boards/fishes/shark1_0.png
-share/gnome/gcompris/boards/fishes/shark1_1.png
-share/gnome/gcompris/boards/fishes/six_barred_0.png
-share/gnome/gcompris/boards/fishes/six_barred_1.png
-share/gnome/gcompris/boards/fishes/teeth_0.png
-share/gnome/gcompris/boards/fishes/teeth_1.png
-share/gnome/gcompris/boards/fishes/teeth_2.png
-share/gnome/gcompris/boards/fishes/teeth_3.png
-share/gnome/gcompris/boards/fishes/teeth_4.png
-share/gnome/gcompris/boards/fishes/teeth_5.png
-share/gnome/gcompris/boards/fishes/teeth_6.png
-share/gnome/gcompris/boards/fishes/teeth_7.png
-share/gnome/gcompris/boards/flags/README
-share/gnome/gcompris/boards/flags/am.png
-share/gnome/gcompris/boards/flags/ar.png
-share/gnome/gcompris/boards/flags/ar_TN.png
-share/gnome/gcompris/boards/flags/at.png
-share/gnome/gcompris/boards/flags/az.png
-share/gnome/gcompris/boards/flags/be.png
-share/gnome/gcompris/boards/flags/bg.png
-share/gnome/gcompris/boards/flags/br.png
-share/gnome/gcompris/boards/flags/ca.png
-share/gnome/gcompris/boards/flags/ch.png
-share/gnome/gcompris/boards/flags/cs.png
-share/gnome/gcompris/boards/flags/cu.png
-share/gnome/gcompris/boards/flags/cz.png
-share/gnome/gcompris/boards/flags/da.png
-share/gnome/gcompris/boards/flags/de.png
-share/gnome/gcompris/boards/flags/dk.png
-share/gnome/gcompris/boards/flags/dz.png
-share/gnome/gcompris/boards/flags/ee.png
-share/gnome/gcompris/boards/flags/el.png
-share/gnome/gcompris/boards/flags/en.png
-share/gnome/gcompris/boards/flags/en_CA.png
-share/gnome/gcompris/boards/flags/en_GB.png
-share/gnome/gcompris/boards/flags/es.png
-share/gnome/gcompris/boards/flags/eu.png
-share/gnome/gcompris/boards/flags/fi.png
-share/gnome/gcompris/boards/flags/fr.png
-share/gnome/gcompris/boards/flags/ga.png
-share/gnome/gcompris/boards/flags/gr.png
-share/gnome/gcompris/boards/flags/gu.png
-share/gnome/gcompris/boards/flags/he.png
-share/gnome/gcompris/boards/flags/hi.png
-share/gnome/gcompris/boards/flags/hr.png
-share/gnome/gcompris/boards/flags/hu.png
-share/gnome/gcompris/boards/flags/id.png
-share/gnome/gcompris/boards/flags/il.png
-share/gnome/gcompris/boards/flags/is.png
-share/gnome/gcompris/boards/flags/it.png
-share/gnome/gcompris/boards/flags/ja.png
-share/gnome/gcompris/boards/flags/jp.png
-share/gnome/gcompris/boards/flags/ka.png
-share/gnome/gcompris/boards/flags/ko.png
-share/gnome/gcompris/boards/flags/lt.png
-share/gnome/gcompris/boards/flags/mk.png
-share/gnome/gcompris/boards/flags/ml.png
-share/gnome/gcompris/boards/flags/mr.png
-share/gnome/gcompris/boards/flags/ms.png
-share/gnome/gcompris/boards/flags/mx.png
-share/gnome/gcompris/boards/flags/nb.png
-share/gnome/gcompris/boards/flags/ne.png
-share/gnome/gcompris/boards/flags/nl.png
-share/gnome/gcompris/boards/flags/nn.png
-share/gnome/gcompris/boards/flags/oc.png
-share/gnome/gcompris/boards/flags/pa.png
-share/gnome/gcompris/boards/flags/pl.png
-share/gnome/gcompris/boards/flags/pt.png
-share/gnome/gcompris/boards/flags/pt_BR.png
-share/gnome/gcompris/boards/flags/qc.png
-share/gnome/gcompris/boards/flags/ro.png
-share/gnome/gcompris/boards/flags/ru.png
-share/gnome/gcompris/boards/flags/rw.png
-share/gnome/gcompris/boards/flags/se.png
-share/gnome/gcompris/boards/flags/si.png
-share/gnome/gcompris/boards/flags/sk.png
-share/gnome/gcompris/boards/flags/sl.png
-share/gnome/gcompris/boards/flags/so.png
-share/gnome/gcompris/boards/flags/sq.png
-share/gnome/gcompris/boards/flags/sr.png
-share/gnome/gcompris/boards/flags/sv.png
-share/gnome/gcompris/boards/flags/th.png
-share/gnome/gcompris/boards/flags/tr.png
-share/gnome/gcompris/boards/flags/uk.png
-share/gnome/gcompris/boards/flags/uy.png
-share/gnome/gcompris/boards/flags/vi.png
-share/gnome/gcompris/boards/flags/wa.png
-share/gnome/gcompris/boards/flags/yu.png
-share/gnome/gcompris/boards/flags/zh.png
-share/gnome/gcompris/boards/followline.xml
-share/gnome/gcompris/boards/fun.xml
-share/gnome/gcompris/boards/gcompris/Makefile.in.bak
-share/gnome/gcompris/boards/gcompris/README
-share/gnome/gcompris/boards/gcompris/bonus/README
-share/gnome/gcompris/boards/gcompris/bonus/flower_bad.png
-share/gnome/gcompris/boards/gcompris/bonus/flower_good.png
-share/gnome/gcompris/boards/gcompris/bonus/gnu_bad.png
-share/gnome/gcompris/boards/gcompris/bonus/gnu_good.png
-share/gnome/gcompris/boards/gcompris/bonus/lion_bad.png
-share/gnome/gcompris/boards/gcompris/bonus/lion_good.png
-share/gnome/gcompris/boards/gcompris/bonus/smiley_bad.png
-share/gnome/gcompris/boards/gcompris/bonus/smiley_good.png
-share/gnome/gcompris/boards/gcompris/bonus/tux_bad.png
-share/gnome/gcompris/boards/gcompris/bonus/tux_good.png
-share/gnome/gcompris/boards/gcompris/dice/gnome-dice0.png
-share/gnome/gcompris/boards/gcompris/dice/gnome-dice1.png
-share/gnome/gcompris/boards/gcompris/dice/gnome-dice2.png
-share/gnome/gcompris/boards/gcompris/dice/gnome-dice3.png
-share/gnome/gcompris/boards/gcompris/dice/gnome-dice4.png
-share/gnome/gcompris/boards/gcompris/dice/gnome-dice5.png
-share/gnome/gcompris/boards/gcompris/dice/gnome-dice6.png
-share/gnome/gcompris/boards/gcompris/dice/gnome-dice7.png
-share/gnome/gcompris/boards/gcompris/dice/gnome-dice8.png
-share/gnome/gcompris/boards/gcompris/dice/gnome-dice9.png
-share/gnome/gcompris/boards/gcompris/food/README
-share/gnome/gcompris/boards/gcompris/food/baby_bottle.png
-share/gnome/gcompris/boards/gcompris/food/banana.png
-share/gnome/gcompris/boards/gcompris/food/bread_slice.png
-share/gnome/gcompris/boards/gcompris/food/butter.png
-share/gnome/gcompris/boards/gcompris/food/chocolate.png
-share/gnome/gcompris/boards/gcompris/food/chocolate_cake.png
-share/gnome/gcompris/boards/gcompris/food/cookie.png
-share/gnome/gcompris/boards/gcompris/food/french_croissant.png
-share/gnome/gcompris/boards/gcompris/food/grapefruit.png
-share/gnome/gcompris/boards/gcompris/food/marmelade.png
-share/gnome/gcompris/boards/gcompris/food/milk_cup.png
-share/gnome/gcompris/boards/gcompris/food/milk_shake.png
-share/gnome/gcompris/boards/gcompris/food/orange.png
-share/gnome/gcompris/boards/gcompris/food/pear.png
-share/gnome/gcompris/boards/gcompris/food/round_cookie.png
-share/gnome/gcompris/boards/gcompris/food/suggar_box.png
-share/gnome/gcompris/boards/gcompris/food/yahourt.png
-share/gnome/gcompris/boards/gcompris/mime_type.xml
-share/gnome/gcompris/boards/gcompris/mimetypes/Makefile.in.bak
-share/gnome/gcompris/boards/gcompris/mimetypes/README
-share/gnome/gcompris/boards/gcompris/mimetypes/icons/gcompris+anim.png
-share/gnome/gcompris/boards/gcompris/mimetypes/icons/gcompris+draw.png
-share/gnome/gcompris/boards/gcompris/mimetypes/icons/svg+xml+javascript.png
-share/gnome/gcompris/boards/gcompris/mimetypes/icons/svg+xml.png
-share/gnome/gcompris/boards/gcompris/mimetypes/icons/wordprocessor+html.png
-share/gnome/gcompris/boards/gcompris/mimetypes/mime_type.xml
-share/gnome/gcompris/boards/gcompris/misc/README
-share/gnome/gcompris/boards/gcompris/misc/Tux_mute.png
-share/gnome/gcompris/boards/gcompris/misc/Tux_play.png
-share/gnome/gcompris/boards/gcompris/misc/apple.png
-share/gnome/gcompris/boards/gcompris/misc/bicycle.png
-share/gnome/gcompris/boards/gcompris/misc/bottle.png
-share/gnome/gcompris/boards/gcompris/misc/car.png
-share/gnome/gcompris/boards/gcompris/misc/carot.png
-share/gnome/gcompris/boards/gcompris/misc/castle.png
-share/gnome/gcompris/boards/gcompris/misc/cerise.png
-share/gnome/gcompris/boards/gcompris/misc/cloud.png
-share/gnome/gcompris/boards/gcompris/misc/cocotier.png
-share/gnome/gcompris/boards/gcompris/misc/crown.png
-share/gnome/gcompris/boards/gcompris/misc/door.png
-share/gnome/gcompris/boards/gcompris/misc/door1.png
-share/gnome/gcompris/boards/gcompris/misc/door2.png
-share/gnome/gcompris/boards/gcompris/misc/egg.png
-share/gnome/gcompris/boards/gcompris/misc/eggpot.png
-share/gnome/gcompris/boards/gcompris/misc/fishingboat.png
-share/gnome/gcompris/boards/gcompris/misc/flower.png
-share/gnome/gcompris/boards/gcompris/misc/flowerpot.png
-share/gnome/gcompris/boards/gcompris/misc/football.png
-share/gnome/gcompris/boards/gcompris/misc/fusee.png
-share/gnome/gcompris/boards/gcompris/misc/glass.png
-share/gnome/gcompris/boards/gcompris/misc/hand.png
-share/gnome/gcompris/boards/gcompris/misc/house.png
-share/gnome/gcompris/boards/gcompris/misc/lamp.png
-share/gnome/gcompris/boards/gcompris/misc/light.png
-share/gnome/gcompris/boards/gcompris/misc/lighthouse.png
-share/gnome/gcompris/boards/gcompris/misc/minitux.png
-share/gnome/gcompris/boards/gcompris/misc/minivan.png
-share/gnome/gcompris/boards/gcompris/misc/parachute.png
-share/gnome/gcompris/boards/gcompris/misc/peer.png
-share/gnome/gcompris/boards/gcompris/misc/pencil.png
-share/gnome/gcompris/boards/gcompris/misc/plane.png
-share/gnome/gcompris/boards/gcompris/misc/postcard.png
-share/gnome/gcompris/boards/gcompris/misc/postpoint.png
-share/gnome/gcompris/boards/gcompris/misc/rape.png
-share/gnome/gcompris/boards/gcompris/misc/raquette.png
-share/gnome/gcompris/boards/gcompris/misc/sailingboat.png
-share/gnome/gcompris/boards/gcompris/misc/sapin.png
-share/gnome/gcompris/boards/gcompris/misc/sea.png
-share/gnome/gcompris/boards/gcompris/misc/sofa.png
-share/gnome/gcompris/boards/gcompris/misc/star.png
-share/gnome/gcompris/boards/gcompris/misc/strawberry.png
-share/gnome/gcompris/boards/gcompris/misc/toomanyerrors.png
-share/gnome/gcompris/boards/gcompris/misc/tree.png
-share/gnome/gcompris/boards/gcompris/misc/truck.png
-share/gnome/gcompris/boards/gcompris/misc/tux.png
-share/gnome/gcompris/boards/gcompris/misc/tux_top_east.png
-share/gnome/gcompris/boards/gcompris/misc/tux_top_north.png
-share/gnome/gcompris/boards/gcompris/misc/tux_top_south.png
-share/gnome/gcompris/boards/gcompris/misc/tux_top_west.png
-share/gnome/gcompris/boards/gcompris/misc/tuxballoon.png
-share/gnome/gcompris/boards/gcompris/misc/tuxboat.png
-share/gnome/gcompris/boards/gcompris/misc/tuxhelico.png
-share/gnome/gcompris/boards/gcompris/misc/tuxloco.png
-share/gnome/gcompris/boards/gcompris/misc/tuxplane.png
-share/gnome/gcompris/boards/gcompris/misc/windflag0.png
-share/gnome/gcompris/boards/gcompris/misc/windflag4.png
-share/gnome/gcompris/boards/gcompris/misc/windflag5.png
-share/gnome/gcompris/boards/gcompris/timers/README
-share/gnome/gcompris/boards/gcompris/timers/clock1.png
-share/gnome/gcompris/boards/gcompris/timers/clock10.png
-share/gnome/gcompris/boards/gcompris/timers/clock2.png
-share/gnome/gcompris/boards/gcompris/timers/clock3.png
-share/gnome/gcompris/boards/gcompris/timers/clock4.png
-share/gnome/gcompris/boards/gcompris/timers/clock5.png
-share/gnome/gcompris/boards/gcompris/timers/clock6.png
-share/gnome/gcompris/boards/gcompris/timers/clock7.png
-share/gnome/gcompris/boards/gcompris/timers/clock8.png
-share/gnome/gcompris/boards/gcompris/timers/clock9.png
-share/gnome/gcompris/boards/gcompris/timers/sablier.gif
-share/gnome/gcompris/boards/gcompris/timers/sablier1.png
-share/gnome/gcompris/boards/gcompris/timers/sablier10.png
-share/gnome/gcompris/boards/gcompris/timers/sablier2.png
-share/gnome/gcompris/boards/gcompris/timers/sablier3.png
-share/gnome/gcompris/boards/gcompris/timers/sablier4.png
-share/gnome/gcompris/boards/gcompris/timers/sablier5.png
-share/gnome/gcompris/boards/gcompris/timers/sablier6.png
-share/gnome/gcompris/boards/gcompris/timers/sablier7.png
-share/gnome/gcompris/boards/gcompris/timers/sablier8.png
-share/gnome/gcompris/boards/gcompris/timers/sablier9.png
-share/gnome/gcompris/boards/geography.xml
-share/gnome/gcompris/boards/geography/Makefile.in.bak
-share/gnome/gcompris/boards/geography/africa/algeria.png
-share/gnome/gcompris/boards/geography/africa/all_south_africa.png
-share/gnome/gcompris/boards/geography/africa/angola.png
-share/gnome/gcompris/boards/geography/africa/benin.png
-share/gnome/gcompris/boards/geography/africa/botswana.png
-share/gnome/gcompris/boards/geography/africa/burkina_faso.png
-share/gnome/gcompris/boards/geography/africa/burundi.png
-share/gnome/gcompris/boards/geography/africa/cameroon.png
-share/gnome/gcompris/boards/geography/africa/central_african_republic.png
-share/gnome/gcompris/boards/geography/africa/chad.png
-share/gnome/gcompris/boards/geography/africa/democratic_republic_of_congo.png
-share/gnome/gcompris/boards/geography/africa/djibouti.png
-share/gnome/gcompris/boards/geography/africa/egypt.png
-share/gnome/gcompris/boards/geography/africa/equatorial_guinea.png
-share/gnome/gcompris/boards/geography/africa/eritrea.png
-share/gnome/gcompris/boards/geography/africa/ethiopia.png
-share/gnome/gcompris/boards/geography/africa/gabon.png
-share/gnome/gcompris/boards/geography/africa/ganbia.png
-share/gnome/gcompris/boards/geography/africa/ghana.png
-share/gnome/gcompris/boards/geography/africa/guinea.png
-share/gnome/gcompris/boards/geography/africa/guinea_bissau.png
-share/gnome/gcompris/boards/geography/africa/ivory_coast.png
-share/gnome/gcompris/boards/geography/africa/kenya.png
-share/gnome/gcompris/boards/geography/africa/lesotho.png
-share/gnome/gcompris/boards/geography/africa/liberia.png
-share/gnome/gcompris/boards/geography/africa/libya.png
-share/gnome/gcompris/boards/geography/africa/madagascar.png
-share/gnome/gcompris/boards/geography/africa/malawi.png
-share/gnome/gcompris/boards/geography/africa/mali.png
-share/gnome/gcompris/boards/geography/africa/mauritania.png
-share/gnome/gcompris/boards/geography/africa/moroco.png
-share/gnome/gcompris/boards/geography/africa/mozambique.png
-share/gnome/gcompris/boards/geography/africa/namibia.png
-share/gnome/gcompris/boards/geography/africa/niger.png
-share/gnome/gcompris/boards/geography/africa/nigeria.png
-share/gnome/gcompris/boards/geography/africa/north_africa.png
-share/gnome/gcompris/boards/geography/africa/republic_of_congo.png
-share/gnome/gcompris/boards/geography/africa/rwanda.png
-share/gnome/gcompris/boards/geography/africa/senegal.png
-share/gnome/gcompris/boards/geography/africa/sierra_leone.png
-share/gnome/gcompris/boards/geography/africa/somalia.png
-share/gnome/gcompris/boards/geography/africa/south_africa.png
-share/gnome/gcompris/boards/geography/africa/sudan.png
-share/gnome/gcompris/boards/geography/africa/swaziland.png
-share/gnome/gcompris/boards/geography/africa/tanzania.png
-share/gnome/gcompris/boards/geography/africa/togo.png
-share/gnome/gcompris/boards/geography/africa/tunisia.png
-share/gnome/gcompris/boards/geography/africa/uganda.png
-share/gnome/gcompris/boards/geography/africa/western_sahara.png
-share/gnome/gcompris/boards/geography/africa/zambia.png
-share/gnome/gcompris/boards/geography/africa/zimbabwe.png
-share/gnome/gcompris/boards/geography/afrique/africa.png
-share/gnome/gcompris/boards/geography/afrique/algeria.png
-share/gnome/gcompris/boards/geography/afrique/angola.png
-share/gnome/gcompris/boards/geography/afrique/benin.png
-share/gnome/gcompris/boards/geography/afrique/botswana.png
-share/gnome/gcompris/boards/geography/afrique/burkina.png
-share/gnome/gcompris/boards/geography/afrique/cameroon.png
-share/gnome/gcompris/boards/geography/afrique/chad.png
-share/gnome/gcompris/boards/geography/afrique/congo.png
-share/gnome/gcompris/boards/geography/afrique/egypt.png
-share/gnome/gcompris/boards/geography/afrique/eritrea.png
-share/gnome/gcompris/boards/geography/afrique/ethiopia.png
-share/gnome/gcompris/boards/geography/afrique/gabon.png
-share/gnome/gcompris/boards/geography/afrique/ghana.png
-share/gnome/gcompris/boards/geography/afrique/guinea.png
-share/gnome/gcompris/boards/geography/afrique/ivory_coast.png
-share/gnome/gcompris/boards/geography/afrique/kenya.png
-share/gnome/gcompris/boards/geography/afrique/liberia.png
-share/gnome/gcompris/boards/geography/afrique/libya.png
-share/gnome/gcompris/boards/geography/afrique/madagascar.png
-share/gnome/gcompris/boards/geography/afrique/malawi.png
-share/gnome/gcompris/boards/geography/afrique/mali.png
-share/gnome/gcompris/boards/geography/afrique/mauritania.png
-share/gnome/gcompris/boards/geography/afrique/moroco.png
-share/gnome/gcompris/boards/geography/afrique/mozambique.png
-share/gnome/gcompris/boards/geography/afrique/namibia.png
-share/gnome/gcompris/boards/geography/afrique/niger.png
-share/gnome/gcompris/boards/geography/afrique/nigeria.png
-share/gnome/gcompris/boards/geography/afrique/rep_centrafrique.png
-share/gnome/gcompris/boards/geography/afrique/rep_congo.png
-share/gnome/gcompris/boards/geography/afrique/senegal.png
-share/gnome/gcompris/boards/geography/afrique/somalia.png
-share/gnome/gcompris/boards/geography/afrique/soudan.png
-share/gnome/gcompris/boards/geography/afrique/south_africa.png
-share/gnome/gcompris/boards/geography/afrique/tanzania.png
-share/gnome/gcompris/boards/geography/afrique/togo.png
-share/gnome/gcompris/boards/geography/afrique/tunisia.png
-share/gnome/gcompris/boards/geography/afrique/uganda.png
-share/gnome/gcompris/boards/geography/afrique/zambia.png
-share/gnome/gcompris/boards/geography/afrique/zimbabwe.png
-share/gnome/gcompris/boards/geography/board1_0.xml
-share/gnome/gcompris/boards/geography/board2_0.xml
-share/gnome/gcompris/boards/geography/board2_1.xml
-share/gnome/gcompris/boards/geography/board3_0.xml
-share/gnome/gcompris/boards/geography/board3_1.xml
-share/gnome/gcompris/boards/geography/board4_0.xml
-share/gnome/gcompris/boards/geography/board4_1.xml
-share/gnome/gcompris/boards/geography/board4_2.xml
-share/gnome/gcompris/boards/geography/board5_0.xml
-share/gnome/gcompris/boards/geography/board5_1.xml
-share/gnome/gcompris/boards/geography/board5_2.xml
-share/gnome/gcompris/boards/geography/board6_0.xml
-share/gnome/gcompris/boards/geography/continents/africa.png
-share/gnome/gcompris/boards/geography/continents/america.png
-share/gnome/gcompris/boards/geography/continents/antartica.png
-share/gnome/gcompris/boards/geography/continents/asia.png
-share/gnome/gcompris/boards/geography/continents/back.png
-share/gnome/gcompris/boards/geography/continents/europa.png
-share/gnome/gcompris/boards/geography/continents/oceania.png
-share/gnome/gcompris/boards/geography/europe/albania.png
-share/gnome/gcompris/boards/geography/europe/austria.png
-share/gnome/gcompris/boards/geography/europe/belarus.png
-share/gnome/gcompris/boards/geography/europe/belgium.png
-share/gnome/gcompris/boards/geography/europe/bosnia_herzegovina.png
-share/gnome/gcompris/boards/geography/europe/bulgaria.png
-share/gnome/gcompris/boards/geography/europe/croatia.png
-share/gnome/gcompris/boards/geography/europe/cyprus.png
-share/gnome/gcompris/boards/geography/europe/czech.png
-share/gnome/gcompris/boards/geography/europe/denmark.png
-share/gnome/gcompris/boards/geography/europe/estonia.png
-share/gnome/gcompris/boards/geography/europe/europe.png
-share/gnome/gcompris/boards/geography/europe/finland.png
-share/gnome/gcompris/boards/geography/europe/france.png
-share/gnome/gcompris/boards/geography/europe/germany.png
-share/gnome/gcompris/boards/geography/europe/greece.png
-share/gnome/gcompris/boards/geography/europe/hungary.png
-share/gnome/gcompris/boards/geography/europe/iceland.png
-share/gnome/gcompris/boards/geography/europe/ireland.png
-share/gnome/gcompris/boards/geography/europe/italy.png
-share/gnome/gcompris/boards/geography/europe/latvia.png
-share/gnome/gcompris/boards/geography/europe/lithuania.png
-share/gnome/gcompris/boards/geography/europe/luxembourg.png
-share/gnome/gcompris/boards/geography/europe/macedonia.png
-share/gnome/gcompris/boards/geography/europe/moldova.png
-share/gnome/gcompris/boards/geography/europe/netherland.png
-share/gnome/gcompris/boards/geography/europe/norway.png
-share/gnome/gcompris/boards/geography/europe/poland.png
-share/gnome/gcompris/boards/geography/europe/portugal.png
-share/gnome/gcompris/boards/geography/europe/romania.png
-share/gnome/gcompris/boards/geography/europe/russia.png
-share/gnome/gcompris/boards/geography/europe/serbia_montenegro.png
-share/gnome/gcompris/boards/geography/europe/slovakia.png
-share/gnome/gcompris/boards/geography/europe/slovenia.png
-share/gnome/gcompris/boards/geography/europe/spain.png
-share/gnome/gcompris/boards/geography/europe/sweden.png
-share/gnome/gcompris/boards/geography/europe/switz.png
-share/gnome/gcompris/boards/geography/europe/turkey.png
-share/gnome/gcompris/boards/geography/europe/ukraine.png
-share/gnome/gcompris/boards/geography/europe/united_kingdom.png
-share/gnome/gcompris/boards/geography/northamerica/alaska.png
-share/gnome/gcompris/boards/geography/northamerica/bahamas.png
-share/gnome/gcompris/boards/geography/northamerica/canada.png
-share/gnome/gcompris/boards/geography/northamerica/cuba.png
-share/gnome/gcompris/boards/geography/northamerica/dominican_republic.png
-share/gnome/gcompris/boards/geography/northamerica/greenland.png
-share/gnome/gcompris/boards/geography/northamerica/haiti.png
-share/gnome/gcompris/boards/geography/northamerica/iceland.png
-share/gnome/gcompris/boards/geography/northamerica/jamaica.png
-share/gnome/gcompris/boards/geography/northamerica/mexico.png
-share/gnome/gcompris/boards/geography/northamerica/north_america.png
-share/gnome/gcompris/boards/geography/northamerica/usa-complete.png
-share/gnome/gcompris/boards/geography/northamerica/usa.png
-share/gnome/gcompris/boards/geography/southamerica/argentina.png
-share/gnome/gcompris/boards/geography/southamerica/bolivia.png
-share/gnome/gcompris/boards/geography/southamerica/brazil.png
-share/gnome/gcompris/boards/geography/southamerica/chile.png
-share/gnome/gcompris/boards/geography/southamerica/colombia.png
-share/gnome/gcompris/boards/geography/southamerica/ecuador.png
-share/gnome/gcompris/boards/geography/southamerica/french_guiana.png
-share/gnome/gcompris/boards/geography/southamerica/guyana.png
-share/gnome/gcompris/boards/geography/southamerica/panama.png
-share/gnome/gcompris/boards/geography/southamerica/paraguay.png
-share/gnome/gcompris/boards/geography/southamerica/peru.png
-share/gnome/gcompris/boards/geography/southamerica/south_america.png
-share/gnome/gcompris/boards/geography/southamerica/suriname.png
-share/gnome/gcompris/boards/geography/southamerica/uruguay.png
-share/gnome/gcompris/boards/geography/southamerica/venezuela.png
-share/gnome/gcompris/boards/geography_country.xml
-share/gnome/gcompris/boards/geography_country/Makefile.in.bak
-share/gnome/gcompris/boards/geography_country/argentina/argentina.png
-share/gnome/gcompris/boards/geography_country/argentina/buenos_aires.png
-share/gnome/gcompris/boards/geography_country/argentina/catamarca.png
-share/gnome/gcompris/boards/geography_country/argentina/chaco.png
-share/gnome/gcompris/boards/geography_country/argentina/chubut.png
-share/gnome/gcompris/boards/geography_country/argentina/cordoba.png
-share/gnome/gcompris/boards/geography_country/argentina/corrientes.png
-share/gnome/gcompris/boards/geography_country/argentina/entre_rios.png
-share/gnome/gcompris/boards/geography_country/argentina/formosa.png
-share/gnome/gcompris/boards/geography_country/argentina/jujuy.png
-share/gnome/gcompris/boards/geography_country/argentina/la_pampa.png
-share/gnome/gcompris/boards/geography_country/argentina/la_rioja.png
-share/gnome/gcompris/boards/geography_country/argentina/mendoza.png
-share/gnome/gcompris/boards/geography_country/argentina/misiones.png
-share/gnome/gcompris/boards/geography_country/argentina/neuquen.png
-share/gnome/gcompris/boards/geography_country/argentina/rio_negro.png
-share/gnome/gcompris/boards/geography_country/argentina/salta.png
-share/gnome/gcompris/boards/geography_country/argentina/san_juan.png
-share/gnome/gcompris/boards/geography_country/argentina/san_luis.png
-share/gnome/gcompris/boards/geography_country/argentina/santa_cruz.png
-share/gnome/gcompris/boards/geography_country/argentina/santa_fe.png
-share/gnome/gcompris/boards/geography_country/argentina/santiago_del_estero.png
-share/gnome/gcompris/boards/geography_country/argentina/tierra_del_fuego.png
-share/gnome/gcompris/boards/geography_country/argentina/tucuman.png
-share/gnome/gcompris/boards/geography_country/board1_0.xml
-share/gnome/gcompris/boards/geography_country/board2_0.xml
-share/gnome/gcompris/boards/geography_country/board3_0.xml
-share/gnome/gcompris/boards/geography_country/board4_0.xml
-share/gnome/gcompris/boards/geography_country/board5_0.xml
-share/gnome/gcompris/boards/geography_country/board5_1.xml
-share/gnome/gcompris/boards/geography_country/board5_2.xml
-share/gnome/gcompris/boards/geography_country/board6_0.xml
-share/gnome/gcompris/boards/geography_country/france_region/alsace.png
-share/gnome/gcompris/boards/geography_country/france_region/aquitaine.png
-share/gnome/gcompris/boards/geography_country/france_region/auvergne.png
-share/gnome/gcompris/boards/geography_country/france_region/basse-normandie.png
-share/gnome/gcompris/boards/geography_country/france_region/bourgogne.png
-share/gnome/gcompris/boards/geography_country/france_region/bretagne.png
-share/gnome/gcompris/boards/geography_country/france_region/centre.png
-share/gnome/gcompris/boards/geography_country/france_region/champagne-ardenne.png
-share/gnome/gcompris/boards/geography_country/france_region/corse.png
-share/gnome/gcompris/boards/geography_country/france_region/france-regions.png
-share/gnome/gcompris/boards/geography_country/france_region/franche-conte.png
-share/gnome/gcompris/boards/geography_country/france_region/haute-normandie.png
-share/gnome/gcompris/boards/geography_country/france_region/ile-de-france.png
-share/gnome/gcompris/boards/geography_country/france_region/languedoc-roussillon.png
-share/gnome/gcompris/boards/geography_country/france_region/limousin.png
-share/gnome/gcompris/boards/geography_country/france_region/lorraine.png
-share/gnome/gcompris/boards/geography_country/france_region/midi-pyrenees.png
-share/gnome/gcompris/boards/geography_country/france_region/nord-pas-de-calais.png
-share/gnome/gcompris/boards/geography_country/france_region/pays-de-la-loire.png
-share/gnome/gcompris/boards/geography_country/france_region/picardie.png
-share/gnome/gcompris/boards/geography_country/france_region/poitou-charentes.png
-share/gnome/gcompris/boards/geography_country/france_region/provence-alpes-cote_d_azur.png
-share/gnome/gcompris/boards/geography_country/france_region/rhone-alpes.png
-share/gnome/gcompris/boards/geography_country/germany_region/back.png
-share/gnome/gcompris/boards/geography_country/germany_region/baden-wuerttemberg.png
-share/gnome/gcompris/boards/geography_country/germany_region/bayern.png
-share/gnome/gcompris/boards/geography_country/germany_region/berlin.png
-share/gnome/gcompris/boards/geography_country/germany_region/brandenburg.png
-share/gnome/gcompris/boards/geography_country/germany_region/bremen.png
-share/gnome/gcompris/boards/geography_country/germany_region/hamburg.png
-share/gnome/gcompris/boards/geography_country/germany_region/hessen.png
-share/gnome/gcompris/boards/geography_country/germany_region/mecklenburg-vorpommern.png
-share/gnome/gcompris/boards/geography_country/germany_region/niedersachsen.png
-share/gnome/gcompris/boards/geography_country/germany_region/nordrhein-westfalen.png
-share/gnome/gcompris/boards/geography_country/germany_region/rheinland-pfalz.png
-share/gnome/gcompris/boards/geography_country/germany_region/saarland.png
-share/gnome/gcompris/boards/geography_country/germany_region/sachsen-anhalt.png
-share/gnome/gcompris/boards/geography_country/germany_region/sachsen.png
-share/gnome/gcompris/boards/geography_country/germany_region/schleswig_holstein.png
-share/gnome/gcompris/boards/geography_country/germany_region/target_baden-wuerttemberg.png
-share/gnome/gcompris/boards/geography_country/germany_region/target_bayern.png
-share/gnome/gcompris/boards/geography_country/germany_region/target_berlin.png
-share/gnome/gcompris/boards/geography_country/germany_region/target_brandenburg.png
-share/gnome/gcompris/boards/geography_country/germany_region/target_bremen.png
-share/gnome/gcompris/boards/geography_country/germany_region/target_hamburg.png
-share/gnome/gcompris/boards/geography_country/germany_region/target_hessen.png
-share/gnome/gcompris/boards/geography_country/germany_region/target_mecklenburg-vorpommern.png
-share/gnome/gcompris/boards/geography_country/germany_region/target_niedersachsen.png
-share/gnome/gcompris/boards/geography_country/germany_region/target_nordrhein-westfalen.png
-share/gnome/gcompris/boards/geography_country/germany_region/target_rheinland-pfalz.png
-share/gnome/gcompris/boards/geography_country/germany_region/target_saarland.png
-share/gnome/gcompris/boards/geography_country/germany_region/target_sachsen-anhalt.png
-share/gnome/gcompris/boards/geography_country/germany_region/target_sachsen.png
-share/gnome/gcompris/boards/geography_country/germany_region/target_schleswig_holstein.png
-share/gnome/gcompris/boards/geography_country/germany_region/target_thueringen.png
-share/gnome/gcompris/boards/geography_country/germany_region/thueringen.png
-share/gnome/gcompris/boards/geography_country/norway_counties/akershus.png
-share/gnome/gcompris/boards/geography_country/norway_counties/aust-agder.png
-share/gnome/gcompris/boards/geography_country/norway_counties/buskerud.png
-share/gnome/gcompris/boards/geography_country/norway_counties/finnmark.png
-share/gnome/gcompris/boards/geography_country/norway_counties/hedmark.png
-share/gnome/gcompris/boards/geography_country/norway_counties/hordaland.png
-share/gnome/gcompris/boards/geography_country/norway_counties/more-og-romsdal.png
-share/gnome/gcompris/boards/geography_country/norway_counties/nord-trondelag.png
-share/gnome/gcompris/boards/geography_country/norway_counties/nordland.png
-share/gnome/gcompris/boards/geography_country/norway_counties/norway.png
-share/gnome/gcompris/boards/geography_country/norway_counties/oppland.png
-share/gnome/gcompris/boards/geography_country/norway_counties/oslo.png
-share/gnome/gcompris/boards/geography_country/norway_counties/ostfold.png
-share/gnome/gcompris/boards/geography_country/norway_counties/rogaland.png
-share/gnome/gcompris/boards/geography_country/norway_counties/sogn-og-fjordane.png
-share/gnome/gcompris/boards/geography_country/norway_counties/sor-trondelag.png
-share/gnome/gcompris/boards/geography_country/norway_counties/target_akershus.png
-share/gnome/gcompris/boards/geography_country/norway_counties/target_aust-agder.png
-share/gnome/gcompris/boards/geography_country/norway_counties/target_buskerud.png
-share/gnome/gcompris/boards/geography_country/norway_counties/target_finnmark.png
-share/gnome/gcompris/boards/geography_country/norway_counties/target_hedmark.png
-share/gnome/gcompris/boards/geography_country/norway_counties/target_hordaland.png
-share/gnome/gcompris/boards/geography_country/norway_counties/target_more-og-romsdal.png
-share/gnome/gcompris/boards/geography_country/norway_counties/target_nord-trondelag.png
-share/gnome/gcompris/boards/geography_country/norway_counties/target_nordland.png
-share/gnome/gcompris/boards/geography_country/norway_counties/target_oppland.png
-share/gnome/gcompris/boards/geography_country/norway_counties/target_oslo.png
-share/gnome/gcompris/boards/geography_country/norway_counties/target_ostfold.png
-share/gnome/gcompris/boards/geography_country/norway_counties/target_rogaland.png
-share/gnome/gcompris/boards/geography_country/norway_counties/target_sogn-og-fjordane.png
-share/gnome/gcompris/boards/geography_country/norway_counties/target_sor-trondelag.png
-share/gnome/gcompris/boards/geography_country/norway_counties/target_telemark.png
-share/gnome/gcompris/boards/geography_country/norway_counties/target_troms.png
-share/gnome/gcompris/boards/geography_country/norway_counties/target_vest-agder.png
-share/gnome/gcompris/boards/geography_country/norway_counties/target_vestfold.png
-share/gnome/gcompris/boards/geography_country/norway_counties/telemark.png
-share/gnome/gcompris/boards/geography_country/norway_counties/troms.png
-share/gnome/gcompris/boards/geography_country/norway_counties/vest-agder.png
-share/gnome/gcompris/boards/geography_country/norway_counties/vestfold.png
-share/gnome/gcompris/boards/geography_country/poland_voivodship/dolnoslaskie.png
-share/gnome/gcompris/boards/geography_country/poland_voivodship/kujawsko-pomorskie.png
-share/gnome/gcompris/boards/geography_country/poland_voivodship/lodzkie.png
-share/gnome/gcompris/boards/geography_country/poland_voivodship/lubelskie.png
-share/gnome/gcompris/boards/geography_country/poland_voivodship/lubuskie.png
-share/gnome/gcompris/boards/geography_country/poland_voivodship/malopolskie.png
-share/gnome/gcompris/boards/geography_country/poland_voivodship/mazowieckie.png
-share/gnome/gcompris/boards/geography_country/poland_voivodship/opolskie.png
-share/gnome/gcompris/boards/geography_country/poland_voivodship/podkarpackie.png
-share/gnome/gcompris/boards/geography_country/poland_voivodship/podlaskie.png
-share/gnome/gcompris/boards/geography_country/poland_voivodship/poland.png
-share/gnome/gcompris/boards/geography_country/poland_voivodship/pomorskie.png
-share/gnome/gcompris/boards/geography_country/poland_voivodship/slaskie.png
-share/gnome/gcompris/boards/geography_country/poland_voivodship/swietokrzyskie.png
-share/gnome/gcompris/boards/geography_country/poland_voivodship/warminsko-mazurskie.png
-share/gnome/gcompris/boards/geography_country/poland_voivodship/wielkopolskie.png
-share/gnome/gcompris/boards/geography_country/poland_voivodship/zachodnio-pomorskie.png
-share/gnome/gcompris/boards/geography_country/turkey_district/adana.png
-share/gnome/gcompris/boards/geography_country/turkey_district/adiyaman.png
-share/gnome/gcompris/boards/geography_country/turkey_district/afyon.png
-share/gnome/gcompris/boards/geography_country/turkey_district/agri.png
-share/gnome/gcompris/boards/geography_country/turkey_district/aksaray.png
-share/gnome/gcompris/boards/geography_country/turkey_district/amasya.png
-share/gnome/gcompris/boards/geography_country/turkey_district/ankara.png
-share/gnome/gcompris/boards/geography_country/turkey_district/antalya.png
-share/gnome/gcompris/boards/geography_country/turkey_district/ardahan.png
-share/gnome/gcompris/boards/geography_country/turkey_district/artvin.png
-share/gnome/gcompris/boards/geography_country/turkey_district/aydin.png
-share/gnome/gcompris/boards/geography_country/turkey_district/balikesir.png
-share/gnome/gcompris/boards/geography_country/turkey_district/bartin.png
-share/gnome/gcompris/boards/geography_country/turkey_district/batman.png
-share/gnome/gcompris/boards/geography_country/turkey_district/bayburt.png
-share/gnome/gcompris/boards/geography_country/turkey_district/bilecik.png
-share/gnome/gcompris/boards/geography_country/turkey_district/bingol.png
-share/gnome/gcompris/boards/geography_country/turkey_district/bitlis.png
-share/gnome/gcompris/boards/geography_country/turkey_district/bolu.png
-share/gnome/gcompris/boards/geography_country/turkey_district/burdur.png
-share/gnome/gcompris/boards/geography_country/turkey_district/bursa.png
-share/gnome/gcompris/boards/geography_country/turkey_district/canakkale.png
-share/gnome/gcompris/boards/geography_country/turkey_district/cankiri.png
-share/gnome/gcompris/boards/geography_country/turkey_district/corum.png
-share/gnome/gcompris/boards/geography_country/turkey_district/denizli.png
-share/gnome/gcompris/boards/geography_country/turkey_district/diyarbakir.png
-share/gnome/gcompris/boards/geography_country/turkey_district/duzce.png
-share/gnome/gcompris/boards/geography_country/turkey_district/edirne.png
-share/gnome/gcompris/boards/geography_country/turkey_district/elazig.png
-share/gnome/gcompris/boards/geography_country/turkey_district/erzincan.png
-share/gnome/gcompris/boards/geography_country/turkey_district/erzurum.png
-share/gnome/gcompris/boards/geography_country/turkey_district/eskisehir.png
-share/gnome/gcompris/boards/geography_country/turkey_district/gaziantep.png
-share/gnome/gcompris/boards/geography_country/turkey_district/giresun.png
-share/gnome/gcompris/boards/geography_country/turkey_district/gumushane.png
-share/gnome/gcompris/boards/geography_country/turkey_district/hakkari.png
-share/gnome/gcompris/boards/geography_country/turkey_district/hatay.png
-share/gnome/gcompris/boards/geography_country/turkey_district/igdir.png
-share/gnome/gcompris/boards/geography_country/turkey_district/isparta.png
-share/gnome/gcompris/boards/geography_country/turkey_district/istanbul.png
-share/gnome/gcompris/boards/geography_country/turkey_district/izmir.png
-share/gnome/gcompris/boards/geography_country/turkey_district/kahramanmaras.png
-share/gnome/gcompris/boards/geography_country/turkey_district/karabuk.png
-share/gnome/gcompris/boards/geography_country/turkey_district/karaman.png
-share/gnome/gcompris/boards/geography_country/turkey_district/kars.png
-share/gnome/gcompris/boards/geography_country/turkey_district/kastamonu.png
-share/gnome/gcompris/boards/geography_country/turkey_district/kayseri.png
-share/gnome/gcompris/boards/geography_country/turkey_district/kilis.png
-share/gnome/gcompris/boards/geography_country/turkey_district/kirikkale.png
-share/gnome/gcompris/boards/geography_country/turkey_district/kirklareli.png
-share/gnome/gcompris/boards/geography_country/turkey_district/kirsehir.png
-share/gnome/gcompris/boards/geography_country/turkey_district/kocaeli.png
-share/gnome/gcompris/boards/geography_country/turkey_district/konya.png
-share/gnome/gcompris/boards/geography_country/turkey_district/kutahya.png
-share/gnome/gcompris/boards/geography_country/turkey_district/malatya.png
-share/gnome/gcompris/boards/geography_country/turkey_district/manisa.png
-share/gnome/gcompris/boards/geography_country/turkey_district/mardin.png
-share/gnome/gcompris/boards/geography_country/turkey_district/mersin.png
-share/gnome/gcompris/boards/geography_country/turkey_district/mugla.png
-share/gnome/gcompris/boards/geography_country/turkey_district/mus.png
-share/gnome/gcompris/boards/geography_country/turkey_district/nevsehir.png
-share/gnome/gcompris/boards/geography_country/turkey_district/nigde.png
-share/gnome/gcompris/boards/geography_country/turkey_district/ordu.png
-share/gnome/gcompris/boards/geography_country/turkey_district/osmaniye.png
-share/gnome/gcompris/boards/geography_country/turkey_district/rize.png
-share/gnome/gcompris/boards/geography_country/turkey_district/sakarya.png
-share/gnome/gcompris/boards/geography_country/turkey_district/samsun.png
-share/gnome/gcompris/boards/geography_country/turkey_district/sanliurfa.png
-share/gnome/gcompris/boards/geography_country/turkey_district/siirt.png
-share/gnome/gcompris/boards/geography_country/turkey_district/sinop.png
-share/gnome/gcompris/boards/geography_country/turkey_district/sirnak.png
-share/gnome/gcompris/boards/geography_country/turkey_district/sivas.png
-share/gnome/gcompris/boards/geography_country/turkey_district/tekirdag.png
-share/gnome/gcompris/boards/geography_country/turkey_district/tokat.png
-share/gnome/gcompris/boards/geography_country/turkey_district/trabzon.png
-share/gnome/gcompris/boards/geography_country/turkey_district/tunceli.png
-share/gnome/gcompris/boards/geography_country/turkey_district/turkey-east.png
-share/gnome/gcompris/boards/geography_country/turkey_district/turkey-west.png
-share/gnome/gcompris/boards/geography_country/turkey_district/turkey.png
-share/gnome/gcompris/boards/geography_country/turkey_district/usak.png
-share/gnome/gcompris/boards/geography_country/turkey_district/van.png
-share/gnome/gcompris/boards/geography_country/turkey_district/yalova.png
-share/gnome/gcompris/boards/geography_country/turkey_district/yozgat.png
-share/gnome/gcompris/boards/geography_country/turkey_district/zonguldak.png
-share/gnome/gcompris/boards/geometry.xml
-share/gnome/gcompris/boards/gletters.xml
-share/gnome/gcompris/boards/gnumch-equality.xml
-share/gnome/gcompris/boards/gnumch-factors.xml
-share/gnome/gcompris/boards/gnumch-inequality.xml
-share/gnome/gcompris/boards/gnumch-multiples.xml
-share/gnome/gcompris/boards/gnumch-primes.xml
-share/gnome/gcompris/boards/gnumch/diaper.gif
-share/gnome/gcompris/boards/gnumch/diaper.txt
-share/gnome/gcompris/boards/gnumch/diaper_eating.gif
-share/gnome/gcompris/boards/gnumch/diaper_walking.gif
-share/gnome/gcompris/boards/gnumch/eater.gif
-share/gnome/gcompris/boards/gnumch/eater.txt
-share/gnome/gcompris/boards/gnumch/eater_eating.gif
-share/gnome/gcompris/boards/gnumch/eater_walking.gif
-share/gnome/gcompris/boards/gnumch/fraidy.gif
-share/gnome/gcompris/boards/gnumch/fraidy.txt
-share/gnome/gcompris/boards/gnumch/fraidy_eating.gif
-share/gnome/gcompris/boards/gnumch/fraidy_walking.gif
-share/gnome/gcompris/boards/gnumch/muncher.gif
-share/gnome/gcompris/boards/gnumch/muncher.txt
-share/gnome/gcompris/boards/gnumch/muncher_eating.gif
-share/gnome/gcompris/boards/gnumch/muncher_walking.gif
-share/gnome/gcompris/boards/gnumch/reggie.gif
-share/gnome/gcompris/boards/gnumch/reggie.txt
-share/gnome/gcompris/boards/gnumch/reggie_eating.gif
-share/gnome/gcompris/boards/gnumch/reggie_walking.gif
-share/gnome/gcompris/boards/gnumch/smarty.gif
-share/gnome/gcompris/boards/gnumch/smarty.txt
-share/gnome/gcompris/boards/gnumch/smarty_eating.gif
-share/gnome/gcompris/boards/gnumch/smarty_walking.gif
-share/gnome/gcompris/boards/gnumchmenu.xml
-share/gnome/gcompris/boards/gtans/figures/alpha.figures
-share/gnome/gcompris/boards/gtans/figures/default.figures
-share/gnome/gcompris/boards/gtans/figures/misc.figures
-share/gnome/gcompris/boards/gtans/figures/similar.figures
-share/gnome/gcompris/boards/gtans/gtans_2x-rotate-left.png
-share/gnome/gcompris/boards/gtans/gtans_2x-rotate.png
-share/gnome/gcompris/boards/gtans/gtans_outline.png
-share/gnome/gcompris/boards/gtans/gtans_rotate-left.png
-share/gnome/gcompris/boards/gtans/gtans_rotate.png
-share/gnome/gcompris/boards/gtans/gtans_show.png
-share/gnome/gcompris/boards/gtans/pixmaps/gtans_brightburtwood.xpm
-share/gnome/gcompris/boards/gtans/pixmaps/gtans_brightwood.xpm
-share/gnome/gcompris/boards/gtans/pixmaps/gtans_burtwood.xpm
-share/gnome/gcompris/boards/gtans/pixmaps/gtans_paper.xpm
-share/gnome/gcompris/boards/gtans/pixmaps/gtans_puzzle.xpm
-share/gnome/gcompris/boards/gtans/pixmaps/gtans_recessed.xpm
-share/gnome/gcompris/boards/gtans/pixmaps/gtans_rope.xpm
-share/gnome/gcompris/boards/gtans/pixmaps/gtans_stones.xpm
-share/gnome/gcompris/boards/gtans/pixmaps/gtans_volcanic.xpm
-share/gnome/gcompris/boards/gtans/pixmaps/gtans_wood.xpm
-share/gnome/gcompris/boards/guessnumber.xml
-share/gnome/gcompris/boards/hanoi.xml
-share/gnome/gcompris/boards/hanoi_real.xml
-share/gnome/gcompris/boards/hexagon.xml
-share/gnome/gcompris/boards/imageid.xml
-share/gnome/gcompris/boards/imageid/Makefile.in.bak
-share/gnome/gcompris/boards/imageid/avion.png
-share/gnome/gcompris/boards/imageid/ballon.png
-share/gnome/gcompris/boards/imageid/banana.png
-share/gnome/gcompris/boards/imageid/bed.png
-share/gnome/gcompris/boards/imageid/board1.xml
-share/gnome/gcompris/boards/imageid/bottle.png
-share/gnome/gcompris/boards/imageid/cake.png
-share/gnome/gcompris/boards/imageid/car.png
-share/gnome/gcompris/boards/imageid/cartable.png
-share/gnome/gcompris/boards/imageid/chien.png
-share/gnome/gcompris/boards/imageid/fish.png
-share/gnome/gcompris/boards/imageid/maison.png
-share/gnome/gcompris/boards/imageid/pomme.png
-share/gnome/gcompris/boards/imagename.xml
-share/gnome/gcompris/boards/imagename/Makefile.in.bak
-share/gnome/gcompris/boards/imagename/board1_0.xml
-share/gnome/gcompris/boards/imagename/board2_0.xml
-share/gnome/gcompris/boards/imagename/board3_0.xml
-share/gnome/gcompris/boards/imagename/board4_0.xml
-share/gnome/gcompris/boards/imagename/board5_0.xml
-share/gnome/gcompris/boards/imagename/board6_0.xml
-share/gnome/gcompris/boards/images/README
-share/gnome/gcompris/boards/images/arrow.png
-share/gnome/gcompris/boards/images/circle.png
-share/gnome/gcompris/boards/images/disc1.png
-share/gnome/gcompris/boards/images/disc2.png
-share/gnome/gcompris/boards/images/disc3.png
-share/gnome/gcompris/boards/images/disc4.png
-share/gnome/gcompris/boards/images/disc_support.png
-share/gnome/gcompris/boards/images/dn_bear1.png
-share/gnome/gcompris/boards/images/dn_bear2.png
-share/gnome/gcompris/boards/images/dn_de1.png
-share/gnome/gcompris/boards/images/dn_de2.png
-share/gnome/gcompris/boards/images/dn_epouvantail1.png
-share/gnome/gcompris/boards/images/dn_epouvantail2.png
-share/gnome/gcompris/boards/images/dn_fond1.png
-share/gnome/gcompris/boards/images/dn_fou1.png
-share/gnome/gcompris/boards/images/dn_fou2.png
-share/gnome/gcompris/boards/images/dn_hibou1.png
-share/gnome/gcompris/boards/images/dn_hibou2.png
-share/gnome/gcompris/boards/images/dn_house1.png
-share/gnome/gcompris/boards/images/dn_house2.png
-share/gnome/gcompris/boards/images/dn_plane1.png
-share/gnome/gcompris/boards/images/dn_plane2.png
-share/gnome/gcompris/boards/images/dn_poisson1.png
-share/gnome/gcompris/boards/images/dn_poisson2.png
-share/gnome/gcompris/boards/images/dn_sapin1.png
-share/gnome/gcompris/boards/images/dn_sapin2.png
-share/gnome/gcompris/boards/images/enumerate_answer.png
-share/gnome/gcompris/boards/images/enumerate_answer_focus.png
-share/gnome/gcompris/boards/images/fifteen_frame.png
-share/gnome/gcompris/boards/images/mosaic_palette.png
-share/gnome/gcompris/boards/images/rectangle.png
-share/gnome/gcompris/boards/images/rhombus.png
-share/gnome/gcompris/boards/images/shift_key.png
-share/gnome/gcompris/boards/images/sponge.png
-share/gnome/gcompris/boards/images/star.png
-share/gnome/gcompris/boards/images/top_boat_green.png
-share/gnome/gcompris/boards/images/top_boat_green_tux.png
-share/gnome/gcompris/boards/images/top_boat_red.png
-share/gnome/gcompris/boards/images/transparent_square.png
-share/gnome/gcompris/boards/images/transparent_square2.png
-share/gnome/gcompris/boards/images/transparent_square_green.png
-share/gnome/gcompris/boards/images/transparent_square_yellow.png
-share/gnome/gcompris/boards/images/triangle.png
-share/gnome/gcompris/boards/images/tux-teacher.png
-share/gnome/gcompris/boards/images/tux.png
-share/gnome/gcompris/boards/images/tux_albert.png
-share/gnome/gcompris/boards/images/tux_graduate.png
-share/gnome/gcompris/boards/images/tux_teen.png
-share/gnome/gcompris/boards/images/wagon-green.png
-share/gnome/gcompris/boards/images/wagon-yellow.png
-share/gnome/gcompris/boards/images/water_drop.png
-share/gnome/gcompris/boards/images/water_spot.png
-share/gnome/gcompris/boards/keyboard.xml
-share/gnome/gcompris/boards/leftright.xml
-share/gnome/gcompris/boards/leftright/background.kpm
-share/gnome/gcompris/boards/leftright/leftright-select.png
-share/gnome/gcompris/boards/leftright/main_droite_dessus_0.png
-share/gnome/gcompris/boards/leftright/main_droite_dessus_180.png
-share/gnome/gcompris/boards/leftright/main_droite_dessus_270.png
-share/gnome/gcompris/boards/leftright/main_droite_dessus_90.png
-share/gnome/gcompris/boards/leftright/main_droite_paume_0.png
-share/gnome/gcompris/boards/leftright/main_droite_paume_180.png
-share/gnome/gcompris/boards/leftright/main_droite_paume_270.png
-share/gnome/gcompris/boards/leftright/main_droite_paume_90.png
-share/gnome/gcompris/boards/leftright/main_gauche_dessus_0.png
-share/gnome/gcompris/boards/leftright/main_gauche_dessus_180.png
-share/gnome/gcompris/boards/leftright/main_gauche_dessus_270.png
-share/gnome/gcompris/boards/leftright/main_gauche_dessus_90.png
-share/gnome/gcompris/boards/leftright/main_gauche_paume_0.png
-share/gnome/gcompris/boards/leftright/main_gauche_paume_180.png
-share/gnome/gcompris/boards/leftright/main_gauche_paume_270.png
-share/gnome/gcompris/boards/leftright/main_gauche_paume_90.png
-share/gnome/gcompris/boards/leftright/poing_droit_dessus_0.png
-share/gnome/gcompris/boards/leftright/poing_droit_dessus_180.png
-share/gnome/gcompris/boards/leftright/poing_droit_dessus_270.png
-share/gnome/gcompris/boards/leftright/poing_droit_dessus_90.png
-share/gnome/gcompris/boards/leftright/poing_droit_paume_0.png
-share/gnome/gcompris/boards/leftright/poing_droit_paume_180.png
-share/gnome/gcompris/boards/leftright/poing_droit_paume_270.png
-share/gnome/gcompris/boards/leftright/poing_droit_paume_90.png
-share/gnome/gcompris/boards/leftright/poing_gauche_dessus_0.png
-share/gnome/gcompris/boards/leftright/poing_gauche_dessus_180.png
-share/gnome/gcompris/boards/leftright/poing_gauche_dessus_270.png
-share/gnome/gcompris/boards/leftright/poing_gauche_dessus_90.png
-share/gnome/gcompris/boards/leftright/poing_gauche_paume_0.png
-share/gnome/gcompris/boards/leftright/poing_gauche_paume_180.png
-share/gnome/gcompris/boards/leftright/poing_gauche_paume_270.png
-share/gnome/gcompris/boards/leftright/poing_gauche_paume_90.png
-share/gnome/gcompris/boards/login.xml
-share/gnome/gcompris/boards/magic_hat/hat-point.png
-share/gnome/gcompris/boards/magic_hat/hat.png
-share/gnome/gcompris/boards/magic_hat/magic_hat_minus.png
-share/gnome/gcompris/boards/magic_hat/magic_hat_minus_bg.png
-share/gnome/gcompris/boards/magic_hat/magic_hat_plus.png
-share/gnome/gcompris/boards/magic_hat/magic_hat_plus_bg.png
-share/gnome/gcompris/boards/magic_hat/star-clear.png
-share/gnome/gcompris/boards/magic_hat/star1.png
-share/gnome/gcompris/boards/magic_hat/star2.png
-share/gnome/gcompris/boards/magic_hat/star3.png
-share/gnome/gcompris/boards/magic_hat_minus.xml
-share/gnome/gcompris/boards/magic_hat_plus.xml
-share/gnome/gcompris/boards/math.xml
-share/gnome/gcompris/boards/maze.xml
-share/gnome/gcompris/boards/maze2DRelative.xml
-share/gnome/gcompris/boards/maze3D.xml
-share/gnome/gcompris/boards/mazeInvisible.xml
-share/gnome/gcompris/boards/mazeMenu.xml
-share/gnome/gcompris/boards/melody.xml
-share/gnome/gcompris/boards/melody/guitar/background.jpg
-share/gnome/gcompris/boards/melody/guitar/background.png
-share/gnome/gcompris/boards/melody/guitar/cursor.png
-share/gnome/gcompris/boards/melody/guitar/son1.png
-share/gnome/gcompris/boards/melody/guitar/son2.png
-share/gnome/gcompris/boards/melody/guitar/son3.png
-share/gnome/gcompris/boards/melody/guitar/son4.png
-share/gnome/gcompris/boards/melody/switch.png
-share/gnome/gcompris/boards/melody/tachos/background.jpg
-share/gnome/gcompris/boards/melody/tachos/cursor.png
-share/gnome/gcompris/boards/melody/tachos/son1.png
-share/gnome/gcompris/boards/melody/tachos/son2.png
-share/gnome/gcompris/boards/melody/tachos/son3.png
-share/gnome/gcompris/boards/melody/tachos/son4.png
-share/gnome/gcompris/boards/melody/xylofon/background.png
-share/gnome/gcompris/boards/melody/xylofon/cursor.png
-share/gnome/gcompris/boards/melody/xylofon/son1.png
-share/gnome/gcompris/boards/melody/xylofon/son2.png
-share/gnome/gcompris/boards/melody/xylofon/son3.png
-share/gnome/gcompris/boards/melody/xylofon/son4.png
-share/gnome/gcompris/boards/memory.xml
-share/gnome/gcompris/boards/memory_add.xml
-share/gnome/gcompris/boards/memory_add_minus.xml
-share/gnome/gcompris/boards/memory_add_minus_mult_div.xml
-share/gnome/gcompris/boards/memory_add_minus_mult_div_tux.xml
-share/gnome/gcompris/boards/memory_add_minus_tux.xml
-share/gnome/gcompris/boards/memory_add_tux.xml
-share/gnome/gcompris/boards/memory_div.xml
-share/gnome/gcompris/boards/memory_div_tux.xml
-share/gnome/gcompris/boards/memory_group.xml
-share/gnome/gcompris/boards/memory_minus.xml
-share/gnome/gcompris/boards/memory_minus_tux.xml
-share/gnome/gcompris/boards/memory_mult.xml
-share/gnome/gcompris/boards/memory_mult_div.xml
-share/gnome/gcompris/boards/memory_mult_div_tux.xml
-share/gnome/gcompris/boards/memory_mult_tux.xml
-share/gnome/gcompris/boards/memory_op_group.xml
-share/gnome/gcompris/boards/memory_op_group_tux.xml
-share/gnome/gcompris/boards/memory_sound.xml
-share/gnome/gcompris/boards/memory_sound_tux.xml
-share/gnome/gcompris/boards/memory_tux.xml
-share/gnome/gcompris/boards/menu.xml
-share/gnome/gcompris/boards/miscelaneous.xml
-share/gnome/gcompris/boards/missing_letter.xml
-share/gnome/gcompris/boards/missing_letter/Makefile.in.bak
-share/gnome/gcompris/boards/missing_letter/board1.xml
-share/gnome/gcompris/boards/money.xml
-share/gnome/gcompris/boards/money/euro/c10c.png
-share/gnome/gcompris/boards/money/euro/c1c.png
-share/gnome/gcompris/boards/money/euro/c1e.png
-share/gnome/gcompris/boards/money/euro/c20c.png
-share/gnome/gcompris/boards/money/euro/c2c.png
-share/gnome/gcompris/boards/money/euro/c2e.png
-share/gnome/gcompris/boards/money/euro/c50c.png
-share/gnome/gcompris/boards/money/euro/c5c.png
-share/gnome/gcompris/boards/money/euro/p10e.png
-share/gnome/gcompris/boards/money/euro/p20e.png
-share/gnome/gcompris/boards/money/euro/p50e.png
-share/gnome/gcompris/boards/money/euro/p5e.jpg
-share/gnome/gcompris/boards/money/euro/p5e.png
-share/gnome/gcompris/boards/money_cents.xml
-share/gnome/gcompris/boards/mosaic.xml
-share/gnome/gcompris/boards/mouse.xml
-share/gnome/gcompris/boards/mrpatate/README
-share/gnome/gcompris/boards/mrpatate/barbe1.png
-share/gnome/gcompris/boards/mrpatate/barbe12.png
-share/gnome/gcompris/boards/mrpatate/body.png
-share/gnome/gcompris/boards/mrpatate/body2.png
-share/gnome/gcompris/boards/mrpatate/bouc1.png
-share/gnome/gcompris/boards/mrpatate/bouche1.png
-share/gnome/gcompris/boards/mrpatate/bouche2.png
-share/gnome/gcompris/boards/mrpatate/bouche3.png
-share/gnome/gcompris/boards/mrpatate/bouche4.png
-share/gnome/gcompris/boards/mrpatate/bouche9.png
-share/gnome/gcompris/boards/mrpatate/cheveux1.png
-share/gnome/gcompris/boards/mrpatate/cheveux2.png
-share/gnome/gcompris/boards/mrpatate/cheveux3.png
-share/gnome/gcompris/boards/mrpatate/cheveux4.png
-share/gnome/gcompris/boards/mrpatate/cheveux5.png
-share/gnome/gcompris/boards/mrpatate/cil1.png
-share/gnome/gcompris/boards/mrpatate/ear11.png
-share/gnome/gcompris/boards/mrpatate/ear12.png
-share/gnome/gcompris/boards/mrpatate/ear21.png
-share/gnome/gcompris/boards/mrpatate/ear22.png
-share/gnome/gcompris/boards/mrpatate/ear31.png
-share/gnome/gcompris/boards/mrpatate/ear32.png
-share/gnome/gcompris/boards/mrpatate/ear41.png
-share/gnome/gcompris/boards/mrpatate/ear42.png
-share/gnome/gcompris/boards/mrpatate/ear_jewell.png
-share/gnome/gcompris/boards/mrpatate/eye11.png
-share/gnome/gcompris/boards/mrpatate/eye12.png
-share/gnome/gcompris/boards/mrpatate/eye21.png
-share/gnome/gcompris/boards/mrpatate/eye22.png
-share/gnome/gcompris/boards/mrpatate/eye31.png
-share/gnome/gcompris/boards/mrpatate/eye32.png
-share/gnome/gcompris/boards/mrpatate/eye41.png
-share/gnome/gcompris/boards/mrpatate/eye42.png
-share/gnome/gcompris/boards/mrpatate/eye51.png
-share/gnome/gcompris/boards/mrpatate/eye52.png
-share/gnome/gcompris/boards/mrpatate/eye6.png
-share/gnome/gcompris/boards/mrpatate/eye7.png
-share/gnome/gcompris/boards/mrpatate/eye8.png
-share/gnome/gcompris/boards/mrpatate/eye9.png
-share/gnome/gcompris/boards/mrpatate/eyeball.png
-share/gnome/gcompris/boards/mrpatate/eyehair11.png
-share/gnome/gcompris/boards/mrpatate/eyehair12.png
-share/gnome/gcompris/boards/mrpatate/eyehair21.png
-share/gnome/gcompris/boards/mrpatate/eyehair22.png
-share/gnome/gcompris/boards/mrpatate/eyehair31.png
-share/gnome/gcompris/boards/mrpatate/eyehair32.png
-share/gnome/gcompris/boards/mrpatate/eyehair41.png
-share/gnome/gcompris/boards/mrpatate/eyehair42.png
-share/gnome/gcompris/boards/mrpatate/glasses1.png
-share/gnome/gcompris/boards/mrpatate/glasses2.png
-share/gnome/gcompris/boards/mrpatate/hair1.png
-share/gnome/gcompris/boards/mrpatate/hair2.png
-share/gnome/gcompris/boards/mrpatate/hair3.png
-share/gnome/gcompris/boards/mrpatate/hair4.png
-share/gnome/gcompris/boards/mrpatate/hair5.png
-share/gnome/gcompris/boards/mrpatate/hat.png
-share/gnome/gcompris/boards/mrpatate/hat1.png
-share/gnome/gcompris/boards/mrpatate/hat2.png
-share/gnome/gcompris/boards/mrpatate/hat3.png
-share/gnome/gcompris/boards/mrpatate/hat4.png
-share/gnome/gcompris/boards/mrpatate/jewelry1.png
-share/gnome/gcompris/boards/mrpatate/jewelry2.png
-share/gnome/gcompris/boards/mrpatate/jewelry3.png
-share/gnome/gcompris/boards/mrpatate/jewelry4.png
-share/gnome/gcompris/boards/mrpatate/larme.png
-share/gnome/gcompris/boards/mrpatate/lunette1.png
-share/gnome/gcompris/boards/mrpatate/lunette1_sun.png
-share/gnome/gcompris/boards/mrpatate/lunette_girl.png
-share/gnome/gcompris/boards/mrpatate/lunette_girl_sun.png
-share/gnome/gcompris/boards/mrpatate/mousta1.png
-share/gnome/gcompris/boards/mrpatate/moustache1.png
-share/gnome/gcompris/boards/mrpatate/moustache2.png
-share/gnome/gcompris/boards/mrpatate/moustache41.png
-share/gnome/gcompris/boards/mrpatate/moustache42.png
-share/gnome/gcompris/boards/mrpatate/moustaches31.png
-share/gnome/gcompris/boards/mrpatate/moustaches32.png
-share/gnome/gcompris/boards/mrpatate/mouth1.png
-share/gnome/gcompris/boards/mrpatate/mouth2.png
-share/gnome/gcompris/boards/mrpatate/mouth3.png
-share/gnome/gcompris/boards/mrpatate/mouth4.png
-share/gnome/gcompris/boards/mrpatate/mouth5.png
-share/gnome/gcompris/boards/mrpatate/mouth6.png
-share/gnome/gcompris/boards/mrpatate/mouth7.png
-share/gnome/gcompris/boards/mrpatate/mouth8.png
-share/gnome/gcompris/boards/mrpatate/mrpatate_icon.png
-share/gnome/gcompris/boards/mrpatate/nez1.png
-share/gnome/gcompris/boards/mrpatate/noeye.png
-share/gnome/gcompris/boards/mrpatate/noze1.png
-share/gnome/gcompris/boards/mrpatate/noze2.png
-share/gnome/gcompris/boards/mrpatate/noze3.png
-share/gnome/gcompris/boards/mrpatate/noze4.png
-share/gnome/gcompris/boards/mrpatate/oeuil1.png
-share/gnome/gcompris/boards/mrpatate/oeuil2.png
-share/gnome/gcompris/boards/mrpatate/oeuil3.png
-share/gnome/gcompris/boards/mrpatate/oeuil4.png
-share/gnome/gcompris/boards/mrpatate/sherif.png
-share/gnome/gcompris/boards/mrpatate/tie1.png
-share/gnome/gcompris/boards/mrpatate/tie2.png
-share/gnome/gcompris/boards/mrpatate/watch.png
-share/gnome/gcompris/boards/music/COPYRIGHT
-share/gnome/gcompris/boards/music/background/BachJSBrandenburgConcertNo2inFMajorBWV1047mvmt1.ogg
-share/gnome/gcompris/boards/music/background/BarDasImagens.ogg
-share/gnome/gcompris/boards/music/background/COPYRIGHT
-share/gnome/gcompris/boards/music/background/LRLaPause.ogg
-share/gnome/gcompris/boards/music/background/Mozart__WA_-_String_Quartet_No.2_in_D_Mvmt_3.ogg
-share/gnome/gcompris/boards/music/background/bontemp1.ogg
-share/gnome/gcompris/boards/music/background/glockenschmoutz.ogg
-share/gnome/gcompris/boards/music/background/vaudeville.ogg
-share/gnome/gcompris/boards/music/intro.ogg
-share/gnome/gcompris/boards/mypaint/brushes/b003.myb
-share/gnome/gcompris/boards/mypaint/brushes/b003_prev.png
-share/gnome/gcompris/boards/mypaint/brushes/b004.myb
-share/gnome/gcompris/boards/mypaint/brushes/b004_prev.png
-share/gnome/gcompris/boards/mypaint/brushes/b008.myb
-share/gnome/gcompris/boards/mypaint/brushes/b008_prev.png
-share/gnome/gcompris/boards/mypaint/brushes/b016.myb
-share/gnome/gcompris/boards/mypaint/brushes/b016_prev.png
-share/gnome/gcompris/boards/mypaint/brushes/basic.myb
-share/gnome/gcompris/boards/mypaint/brushes/basic_prev.png
-share/gnome/gcompris/boards/mypaint/brushes/blur.myb
-share/gnome/gcompris/boards/mypaint/brushes/blur_prev.png
-share/gnome/gcompris/boards/mypaint/brushes/bulk.myb
-share/gnome/gcompris/boards/mypaint/brushes/bulk_prev.png
-share/gnome/gcompris/boards/mypaint/brushes/charcoal.myb
-share/gnome/gcompris/boards/mypaint/brushes/charcoal_prev.png
-share/gnome/gcompris/boards/mypaint/brushes/ink.myb
-share/gnome/gcompris/boards/mypaint/brushes/ink_prev.png
-share/gnome/gcompris/boards/mypaint/brushes/loosedots.myb
-share/gnome/gcompris/boards/mypaint/brushes/loosedots_prev.png
-share/gnome/gcompris/boards/mypaint/brushes/o000.myb
-share/gnome/gcompris/boards/mypaint/brushes/o000_prev.png
-share/gnome/gcompris/boards/mypaint/brushes/o001.myb
-share/gnome/gcompris/boards/mypaint/brushes/o001_prev.png
-share/gnome/gcompris/boards/mypaint/brushes/o005.myb
-share/gnome/gcompris/boards/mypaint/brushes/o005_prev.png
-share/gnome/gcompris/boards/mypaint/brushes/o006.myb
-share/gnome/gcompris/boards/mypaint/brushes/o006_prev.png
-share/gnome/gcompris/boards/mypaint/brushes/o007.myb
-share/gnome/gcompris/boards/mypaint/brushes/o007_prev.png
-share/gnome/gcompris/boards/mypaint/brushes/o009.myb
-share/gnome/gcompris/boards/mypaint/brushes/o009_prev.png
-share/gnome/gcompris/boards/mypaint/brushes/o011.myb
-share/gnome/gcompris/boards/mypaint/brushes/o011_prev.png
-share/gnome/gcompris/boards/mypaint/brushes/o012.myb
-share/gnome/gcompris/boards/mypaint/brushes/o012_prev.png
-share/gnome/gcompris/boards/mypaint/brushes/o013.myb
-share/gnome/gcompris/boards/mypaint/brushes/o013_prev.png
-share/gnome/gcompris/boards/mypaint/brushes/o014.myb
-share/gnome/gcompris/boards/mypaint/brushes/o014_prev.png
-share/gnome/gcompris/boards/mypaint/brushes/o015.myb
-share/gnome/gcompris/boards/mypaint/brushes/o015_prev.png
-share/gnome/gcompris/boards/mypaint/brushes/o017.myb
-share/gnome/gcompris/boards/mypaint/brushes/o017_prev.png
-share/gnome/gcompris/boards/mypaint/brushes/o018.myb
-share/gnome/gcompris/boards/mypaint/brushes/o018_prev.png
-share/gnome/gcompris/boards/mypaint/brushes/o019.myb
-share/gnome/gcompris/boards/mypaint/brushes/o019_prev.png
-share/gnome/gcompris/boards/mypaint/brushes/o020.myb
-share/gnome/gcompris/boards/mypaint/brushes/o020_prev.png
-share/gnome/gcompris/boards/mypaint/brushes/o021.myb
-share/gnome/gcompris/boards/mypaint/brushes/o021_prev.png
-share/gnome/gcompris/boards/mypaint/brushes/o022.myb
-share/gnome/gcompris/boards/mypaint/brushes/o022_prev.png
-share/gnome/gcompris/boards/mypaint/brushes/o023.myb
-share/gnome/gcompris/boards/mypaint/brushes/o023_prev.png
-share/gnome/gcompris/boards/mypaint/brushes/o024.myb
-share/gnome/gcompris/boards/mypaint/brushes/o024_prev.png
-share/gnome/gcompris/boards/mypaint/brushes/o025.myb
-share/gnome/gcompris/boards/mypaint/brushes/o025_prev.png
-share/gnome/gcompris/boards/mypaint/brushes/o026.myb
-share/gnome/gcompris/boards/mypaint/brushes/o026_prev.png
-share/gnome/gcompris/boards/mypaint/brushes/o028.myb
-share/gnome/gcompris/boards/mypaint/brushes/o028_prev.png
-share/gnome/gcompris/boards/mypaint/brushes/o029.myb
-share/gnome/gcompris/boards/mypaint/brushes/o029_prev.png
-share/gnome/gcompris/boards/mypaint/brushes/o031.myb
-share/gnome/gcompris/boards/mypaint/brushes/o031_prev.png
-share/gnome/gcompris/boards/mypaint/brushes/o032.myb
-share/gnome/gcompris/boards/mypaint/brushes/o032_prev.png
-share/gnome/gcompris/boards/mypaint/brushes/o033.myb
-share/gnome/gcompris/boards/mypaint/brushes/o033_prev.png
-share/gnome/gcompris/boards/mypaint/brushes/o036.myb
-share/gnome/gcompris/boards/mypaint/brushes/o036_prev.png
-share/gnome/gcompris/boards/mypaint/brushes/o037.myb
-share/gnome/gcompris/boards/mypaint/brushes/o037_prev.png
-share/gnome/gcompris/boards/mypaint/brushes/o038.myb
-share/gnome/gcompris/boards/mypaint/brushes/o038_prev.png
-share/gnome/gcompris/boards/mypaint/brushes/o039.myb
-share/gnome/gcompris/boards/mypaint/brushes/o039_prev.png
-share/gnome/gcompris/boards/mypaint/brushes/o041.myb
-share/gnome/gcompris/boards/mypaint/brushes/o041_prev.png
-share/gnome/gcompris/boards/mypaint/brushes/o043.myb
-share/gnome/gcompris/boards/mypaint/brushes/o043_prev.png
-share/gnome/gcompris/boards/mypaint/brushes/o398.myb
-share/gnome/gcompris/boards/mypaint/brushes/o398_prev.png
-share/gnome/gcompris/boards/mypaint/brushes/o501.myb
-share/gnome/gcompris/boards/mypaint/brushes/o501_prev.png
-share/gnome/gcompris/boards/mypaint/brushes/o512.myb
-share/gnome/gcompris/boards/mypaint/brushes/o512_prev.png
-share/gnome/gcompris/boards/mypaint/brushes/o519.myb
-share/gnome/gcompris/boards/mypaint/brushes/o519_prev.png
-share/gnome/gcompris/boards/mypaint/brushes/o665.myb
-share/gnome/gcompris/boards/mypaint/brushes/o665_prev.png
-share/gnome/gcompris/boards/mypaint/brushes/o945.myb
-share/gnome/gcompris/boards/mypaint/brushes/o945_prev.png
-share/gnome/gcompris/boards/mypaint/brushes/old_b000.myb
-share/gnome/gcompris/boards/mypaint/brushes/old_b000_prev.png
-share/gnome/gcompris/boards/mypaint/brushes/old_b003.myb
-share/gnome/gcompris/boards/mypaint/brushes/old_b003_prev.png
-share/gnome/gcompris/boards/mypaint/brushes/old_b004.myb
-share/gnome/gcompris/boards/mypaint/brushes/old_b004_prev.png
-share/gnome/gcompris/boards/mypaint/brushes/old_b008.myb
-share/gnome/gcompris/boards/mypaint/brushes/old_b008_prev.png
-share/gnome/gcompris/boards/mypaint/brushes/old_b024.myb
-share/gnome/gcompris/boards/mypaint/brushes/old_b024_prev.png
-share/gnome/gcompris/boards/mypaint/brushes/order.conf
-share/gnome/gcompris/boards/mypaint/brushes/pencil.myb
-share/gnome/gcompris/boards/mypaint/brushes/pencil_prev.png
-share/gnome/gcompris/boards/mypaint/brushes/prev-template.xcf.gz
-share/gnome/gcompris/boards/mypaint/brushes/s000.myb
-share/gnome/gcompris/boards/mypaint/brushes/s000_prev.png
-share/gnome/gcompris/boards/mypaint/brushes/smudge.myb
-share/gnome/gcompris/boards/mypaint/brushes/smudge_prev.png
-share/gnome/gcompris/boards/numeration.xml
-share/gnome/gcompris/boards/opt/README
-share/gnome/gcompris/boards/opt/animals/bear001.jpg
-share/gnome/gcompris/boards/opt/animals/black-headed-gull.jpg
-share/gnome/gcompris/boards/opt/animals/butterfly.jpg
-share/gnome/gcompris/boards/opt/animals/cat1.jpg
-share/gnome/gcompris/boards/opt/animals/cat2.jpg
-share/gnome/gcompris/boards/opt/animals/cow.jpg
-share/gnome/gcompris/boards/opt/animals/donkey.jpg
-share/gnome/gcompris/boards/opt/animals/elephanteauxgc.jpg
-share/gnome/gcompris/boards/opt/animals/flamentrosegc.jpg
-share/gnome/gcompris/boards/opt/animals/girafegc.jpg
-share/gnome/gcompris/boards/opt/animals/horses.jpg
-share/gnome/gcompris/boards/opt/animals/horses2.jpg
-share/gnome/gcompris/boards/opt/animals/hypogc.jpg
-share/gnome/gcompris/boards/opt/animals/joybear001.jpg
-share/gnome/gcompris/boards/opt/animals/joybear002.jpg
-share/gnome/gcompris/boards/opt/animals/jumentmulassieregc.jpg
-share/gnome/gcompris/boards/opt/animals/maki1.jpg
-share/gnome/gcompris/boards/opt/animals/maki2.jpg
-share/gnome/gcompris/boards/opt/animals/maki3.jpg
-share/gnome/gcompris/boards/opt/animals/maki4.jpg
-share/gnome/gcompris/boards/opt/animals/maki5.jpg
-share/gnome/gcompris/boards/opt/animals/maki6.jpg
-share/gnome/gcompris/boards/opt/animals/malaybear002.jpg
-share/gnome/gcompris/boards/opt/animals/pigeon.jpg
-share/gnome/gcompris/boards/opt/animals/polabear011.jpg
-share/gnome/gcompris/boards/opt/animals/polarbear001.jpg
-share/gnome/gcompris/boards/opt/animals/poolbears001.jpg
-share/gnome/gcompris/boards/opt/animals/readme.txt
-share/gnome/gcompris/boards/opt/animals/rhinogc.jpg
-share/gnome/gcompris/boards/opt/animals/sheep_irish.jpg
-share/gnome/gcompris/boards/opt/animals/sheep_irish2.jpg
-share/gnome/gcompris/boards/opt/animals/singegc.jpg
-share/gnome/gcompris/boards/opt/animals/spectbear001.jpg
-share/gnome/gcompris/boards/opt/animals/squirrel.jpg
-share/gnome/gcompris/boards/opt/animals/tetegorillegc.jpg
-share/gnome/gcompris/boards/opt/animals/tiger1_by_Ralf_Schmode.jpg
-share/gnome/gcompris/boards/opt/animals/tigercub003.jpg
-share/gnome/gcompris/boards/opt/animals/tigerdrink001.jpg
-share/gnome/gcompris/boards/opt/animals/tigerplay001.jpg
-share/gnome/gcompris/boards/opt/baleine.png
-share/gnome/gcompris/boards/opt/beach1.png
-share/gnome/gcompris/boards/opt/beach2.png
-share/gnome/gcompris/boards/opt/beach3.png
-share/gnome/gcompris/boards/opt/beach4.png
-share/gnome/gcompris/boards/opt/cave.png
-share/gnome/gcompris/boards/opt/elephant_mer.png
-share/gnome/gcompris/boards/opt/enumerate_background.png
-share/gnome/gcompris/boards/opt/epaulard.png
-share/gnome/gcompris/boards/opt/followline.png
-share/gnome/gcompris/boards/opt/foot_background.png
-share/gnome/gcompris/boards/opt/gcompris_band.png
-share/gnome/gcompris/boards/opt/gtans_bg.png
-share/gnome/gcompris/boards/opt/imageid-bg.jpg
-share/gnome/gcompris/boards/opt/maze-bg.jpg
-share/gnome/gcompris/boards/opt/missingletter-bg.jpg
-share/gnome/gcompris/boards/opt/morse.png
-share/gnome/gcompris/boards/opt/mosaic_bg.png
-share/gnome/gcompris/boards/opt/narval.png
-share/gnome/gcompris/boards/opt/nur00523.jpg
-share/gnome/gcompris/boards/opt/nur03006.jpg
-share/gnome/gcompris/boards/opt/nur03010.jpg
-share/gnome/gcompris/boards/opt/nur03011.jpg
-share/gnome/gcompris/boards/opt/nur03013.jpg
-share/gnome/gcompris/boards/opt/nur03505.jpg
-share/gnome/gcompris/boards/opt/ourspolaire.png
-share/gnome/gcompris/boards/opt/phoque.png
-share/gnome/gcompris/boards/opt/railroad-bg.png
-share/gnome/gcompris/boards/opt/scenery2_background.png
-share/gnome/gcompris/boards/opt/scenery3_background.png
-share/gnome/gcompris/boards/opt/scenery4_background.png
-share/gnome/gcompris/boards/opt/scenery5_background.png
-share/gnome/gcompris/boards/opt/scenery6_background.png
-share/gnome/gcompris/boards/opt/scenery7_background.png
-share/gnome/gcompris/boards/opt/scenery_background.png
-share/gnome/gcompris/boards/opt/school_bg1.jpg
-share/gnome/gcompris/boards/opt/school_bg2.jpg
-share/gnome/gcompris/boards/opt/school_bg3.jpg
-share/gnome/gcompris/boards/opt/school_bg4.jpg
-share/gnome/gcompris/boards/opt/sea1.jpg
-share/gnome/gcompris/boards/opt/sea2.jpg
-share/gnome/gcompris/boards/opt/sea3.jpg
-share/gnome/gcompris/boards/opt/sea4.jpg
-share/gnome/gcompris/boards/opt/sea5.jpg
-share/gnome/gcompris/boards/opt/sea6.jpg
-share/gnome/gcompris/boards/opt/superbrain_background.jpg
-share/gnome/gcompris/boards/opt/tabepice.jpg
-share/gnome/gcompris/boards/opt/target_background.jpg
-share/gnome/gcompris/boards/oscar_and_friends.xml
-share/gnome/gcompris/boards/oscar_and_friends/scene1_0.png
-share/gnome/gcompris/boards/paintings.xml
-share/gnome/gcompris/boards/paintings/Makefile.in.bak
-share/gnome/gcompris/boards/paintings/README
-share/gnome/gcompris/boards/paintings/board1_0.xml
-share/gnome/gcompris/boards/paintings/board2_0.xml
-share/gnome/gcompris/boards/paintings/board3_0.xml
-share/gnome/gcompris/boards/paintings/board3_1.xml
-share/gnome/gcompris/boards/paintings/board4_0.xml
-share/gnome/gcompris/boards/paintings/board5_0.xml
-share/gnome/gcompris/boards/paintings/board6_0.xml
-share/gnome/gcompris/boards/paintings/kandinky.comp8/puzzle1.png
-share/gnome/gcompris/boards/paintings/kandinky.comp8/puzzle2.png
-share/gnome/gcompris/boards/paintings/kandinky.comp8/puzzle3.png
-share/gnome/gcompris/boards/paintings/kandinky.comp8/puzzle4.png
-share/gnome/gcompris/boards/paintings/kandinky.comp8/puzzle5.png
-share/gnome/gcompris/boards/paintings/kandinky.comp8/puzzle6.png
-share/gnome/gcompris/boards/paintings/kandinky.comp8/puzzle7.png
-share/gnome/gcompris/boards/paintings/kandinky.comp8/puzzle8.png
-share/gnome/gcompris/boards/paintings/level1/bazille_rampart_1.jpg
-share/gnome/gcompris/boards/paintings/level1/bazille_rampart_2.jpg
-share/gnome/gcompris/boards/paintings/level1/bazille_rampart_3.jpg
-share/gnome/gcompris/boards/paintings/level1/bazille_rampart_4.jpg
-share/gnome/gcompris/boards/paintings/level1/bazille_rampart_5.jpg
-share/gnome/gcompris/boards/paintings/level1/bazille_rampart_6.jpg
-share/gnome/gcompris/boards/paintings/level2/cassat_summertime_1.jpg
-share/gnome/gcompris/boards/paintings/level2/cassat_summertime_2.jpg
-share/gnome/gcompris/boards/paintings/level2/cassat_summertime_3.jpg
-share/gnome/gcompris/boards/paintings/level2/cassat_summertime_4.jpg
-share/gnome/gcompris/boards/paintings/level2/cassat_summertime_5.jpg
-share/gnome/gcompris/boards/paintings/level2/cassat_summertime_6.jpg
-share/gnome/gcompris/boards/paintings/level3/gogh_auvert_1.jpg
-share/gnome/gcompris/boards/paintings/level3/gogh_auvert_2.jpg
-share/gnome/gcompris/boards/paintings/level3/gogh_auvert_3.jpg
-share/gnome/gcompris/boards/paintings/level3/gogh_auvert_4.jpg
-share/gnome/gcompris/boards/paintings/level3/gogh_auvert_5.jpg
-share/gnome/gcompris/boards/paintings/level3/gogh_auvert_6.jpg
-share/gnome/gcompris/boards/paintings/level4/degas_class-dance_1.png
-share/gnome/gcompris/boards/paintings/level4/degas_class-dance_2.png
-share/gnome/gcompris/boards/paintings/level4/degas_class-dance_3.png
-share/gnome/gcompris/boards/paintings/level4/degas_class-dance_4.png
-share/gnome/gcompris/boards/paintings/level4/degas_class-dance_5.png
-share/gnome/gcompris/boards/paintings/level4/degas_class-dance_6.png
-share/gnome/gcompris/boards/paintings/level5/renoir-moulin_de_la_galette-1.png
-share/gnome/gcompris/boards/paintings/level5/renoir-moulin_de_la_galette-2.png
-share/gnome/gcompris/boards/paintings/level5/renoir-moulin_de_la_galette-3.png
-share/gnome/gcompris/boards/paintings/level5/renoir-moulin_de_la_galette-4.png
-share/gnome/gcompris/boards/paintings/level5/renoir-moulin_de_la_galette-5.png
-share/gnome/gcompris/boards/paintings/level5/renoir-moulin_de_la_galette-6.png
-share/gnome/gcompris/boards/paintings/level6/renoir-filles_piano-1.png
-share/gnome/gcompris/boards/paintings/level6/renoir-filles_piano-2.png
-share/gnome/gcompris/boards/paintings/level6/renoir-filles_piano-3.png
-share/gnome/gcompris/boards/paintings/level6/renoir-filles_piano-4.png
-share/gnome/gcompris/boards/paintings/level6/renoir-filles_piano-5.png
-share/gnome/gcompris/boards/paintings/level6/renoir-filles_piano-6.png
-share/gnome/gcompris/boards/paintings/level6/renoir-filles_piano-7.png
-share/gnome/gcompris/boards/paintings/level6/renoir-filles_piano-8.png
-share/gnome/gcompris/boards/paratrooper.xml
-share/gnome/gcompris/boards/planegame.xml
-share/gnome/gcompris/boards/puzzle.xml
-share/gnome/gcompris/boards/pythontest.xml
-share/gnome/gcompris/boards/railroad.xml
-share/gnome/gcompris/boards/railroad/loco1.png
-share/gnome/gcompris/boards/railroad/loco2.png
-share/gnome/gcompris/boards/railroad/loco3.png
-share/gnome/gcompris/boards/railroad/loco4.png
-share/gnome/gcompris/boards/railroad/loco5.png
-share/gnome/gcompris/boards/railroad/loco6.png
-share/gnome/gcompris/boards/railroad/loco7.png
-share/gnome/gcompris/boards/railroad/loco8.png
-share/gnome/gcompris/boards/railroad/loco9.png
-share/gnome/gcompris/boards/railroad/wagon1.png
-share/gnome/gcompris/boards/railroad/wagon10.png
-share/gnome/gcompris/boards/railroad/wagon11.png
-share/gnome/gcompris/boards/railroad/wagon12.png
-share/gnome/gcompris/boards/railroad/wagon13.png
-share/gnome/gcompris/boards/railroad/wagon14.png
-share/gnome/gcompris/boards/railroad/wagon2.png
-share/gnome/gcompris/boards/railroad/wagon3.png
-share/gnome/gcompris/boards/railroad/wagon4.png
-share/gnome/gcompris/boards/railroad/wagon5.png
-share/gnome/gcompris/boards/railroad/wagon6.png
-share/gnome/gcompris/boards/railroad/wagon7.png
-share/gnome/gcompris/boards/railroad/wagon8.png
-share/gnome/gcompris/boards/railroad/wagon9.png
-share/gnome/gcompris/boards/read_colors.xml
-share/gnome/gcompris/boards/read_colors/Makefile.in.bak
-share/gnome/gcompris/boards/read_colors/board1.xml
-share/gnome/gcompris/boards/read_colors/read_colors_background.png
-share/gnome/gcompris/boards/read_colors/read_colors_highlight.png
-share/gnome/gcompris/boards/reading.xml
-share/gnome/gcompris/boards/readingh.xml
-share/gnome/gcompris/boards/readingv.xml
-share/gnome/gcompris/boards/redraw.xml
-share/gnome/gcompris/boards/redraw_symmetrical.xml
-share/gnome/gcompris/boards/reversecount.xml
-share/gnome/gcompris/boards/reversecount/README
-share/gnome/gcompris/boards/reversecount/dice_area.png
-share/gnome/gcompris/boards/reversecount/iceblock.png
-share/gnome/gcompris/boards/scales/README
-share/gnome/gcompris/boards/scales/balance.png
-share/gnome/gcompris/boards/scales/bras.png
-share/gnome/gcompris/boards/scales/masse.png
-share/gnome/gcompris/boards/scales/masse1.png
-share/gnome/gcompris/boards/scales/masse10.png
-share/gnome/gcompris/boards/scales/masse2.png
-share/gnome/gcompris/boards/scales/masse3.png
-share/gnome/gcompris/boards/scales/masse4.png
-share/gnome/gcompris/boards/scales/masse5.png
-share/gnome/gcompris/boards/scales/masse6.png
-share/gnome/gcompris/boards/scales/masse7.png
-share/gnome/gcompris/boards/scales/masse8.png
-share/gnome/gcompris/boards/scales/masse9.png
-share/gnome/gcompris/boards/scales/plateau.png
-share/gnome/gcompris/boards/scalesboard.xml
-share/gnome/gcompris/boards/searace.xml
-share/gnome/gcompris/boards/searace1player.xml
-share/gnome/gcompris/boards/skins/README
-share/gnome/gcompris/boards/skins/babytoy/README
-share/gnome/gcompris/boards/skins/babytoy/about.png
-share/gnome/gcompris/boards/skins/babytoy/bad.png
-share/gnome/gcompris/boards/skins/babytoy/bar_bg.jpg
-share/gnome/gcompris/boards/skins/babytoy/button.png
-share/gnome/gcompris/boards/skins/babytoy/button_backward.png
-share/gnome/gcompris/boards/skins/babytoy/button_checked.png
-share/gnome/gcompris/boards/skins/babytoy/button_exit.png
-share/gnome/gcompris/boards/skins/babytoy/button_forward.png
-share/gnome/gcompris/boards/skins/babytoy/button_large.png
-share/gnome/gcompris/boards/skins/babytoy/button_large2.png
-share/gnome/gcompris/boards/skins/babytoy/button_large_selected.png
-share/gnome/gcompris/boards/skins/babytoy/button_redo.png
-share/gnome/gcompris/boards/skins/babytoy/button_reload.png
-share/gnome/gcompris/boards/skins/babytoy/button_selected.png
-share/gnome/gcompris/boards/skins/babytoy/button_unchecked.png
-share/gnome/gcompris/boards/skins/babytoy/button_up.png
-share/gnome/gcompris/boards/skins/babytoy/button_up_selected.png
-share/gnome/gcompris/boards/skins/babytoy/clockgame-bg.jpg
-share/gnome/gcompris/boards/skins/babytoy/config.png
-share/gnome/gcompris/boards/skins/babytoy/difficulty_star1.png
-share/gnome/gcompris/boards/skins/babytoy/difficulty_star2.png
-share/gnome/gcompris/boards/skins/babytoy/difficulty_star3.png
-share/gnome/gcompris/boards/skins/babytoy/difficulty_star4.png
-share/gnome/gcompris/boards/skins/babytoy/difficulty_star5.png
-share/gnome/gcompris/boards/skins/babytoy/difficulty_star6.png
-share/gnome/gcompris/boards/skins/babytoy/draw/color-selector.png
-share/gnome/gcompris/boards/skins/babytoy/draw/counter.png
-share/gnome/gcompris/boards/skins/babytoy/draw/down.png
-share/gnome/gcompris/boards/skins/babytoy/draw/tool-camera.png
-share/gnome/gcompris/boards/skins/babytoy/draw/tool-camera_on.png
-share/gnome/gcompris/boards/skins/babytoy/draw/tool-circle.png
-share/gnome/gcompris/boards/skins/babytoy/draw/tool-circle_on.png
-share/gnome/gcompris/boards/skins/babytoy/draw/tool-del.png
-share/gnome/gcompris/boards/skins/babytoy/draw/tool-del_on.png
-share/gnome/gcompris/boards/skins/babytoy/draw/tool-down.png
-share/gnome/gcompris/boards/skins/babytoy/draw/tool-down_on.png
-share/gnome/gcompris/boards/skins/babytoy/draw/tool-empty.png
-share/gnome/gcompris/boards/skins/babytoy/draw/tool-empty_on.png
-share/gnome/gcompris/boards/skins/babytoy/draw/tool-fill.png
-share/gnome/gcompris/boards/skins/babytoy/draw/tool-fill_on.png
-share/gnome/gcompris/boards/skins/babytoy/draw/tool-filledcircle.png
-share/gnome/gcompris/boards/skins/babytoy/draw/tool-filledcircle_on.png
-share/gnome/gcompris/boards/skins/babytoy/draw/tool-filledrectangle.png
-share/gnome/gcompris/boards/skins/babytoy/draw/tool-filledrectangle_on.png
-share/gnome/gcompris/boards/skins/babytoy/draw/tool-flip.png
-share/gnome/gcompris/boards/skins/babytoy/draw/tool-flip_on.png
-share/gnome/gcompris/boards/skins/babytoy/draw/tool-image.png
-share/gnome/gcompris/boards/skins/babytoy/draw/tool-image_on.png
-share/gnome/gcompris/boards/skins/babytoy/draw/tool-line.png
-share/gnome/gcompris/boards/skins/babytoy/draw/tool-line_on.png
-share/gnome/gcompris/boards/skins/babytoy/draw/tool-load.png
-share/gnome/gcompris/boards/skins/babytoy/draw/tool-movie.png
-share/gnome/gcompris/boards/skins/babytoy/draw/tool-movie_on.png
-share/gnome/gcompris/boards/skins/babytoy/draw/tool-rectangle.png
-share/gnome/gcompris/boards/skins/babytoy/draw/tool-rectangle_on.png
-share/gnome/gcompris/boards/skins/babytoy/draw/tool-rotation-ccw.png
-share/gnome/gcompris/boards/skins/babytoy/draw/tool-rotation-ccw_on.png
-share/gnome/gcompris/boards/skins/babytoy/draw/tool-rotation-cw.png
-share/gnome/gcompris/boards/skins/babytoy/draw/tool-rotation-cw_on.png
-share/gnome/gcompris/boards/skins/babytoy/draw/tool-save.png
-share/gnome/gcompris/boards/skins/babytoy/draw/tool-select.png
-share/gnome/gcompris/boards/skins/babytoy/draw/tool-select_on.png
-share/gnome/gcompris/boards/skins/babytoy/draw/tool-selector.png
-share/gnome/gcompris/boards/skins/babytoy/draw/tool-text.png
-share/gnome/gcompris/boards/skins/babytoy/draw/tool-text_on.png
-share/gnome/gcompris/boards/skins/babytoy/draw/tool-up.png
-share/gnome/gcompris/boards/skins/babytoy/draw/tool-up_on.png
-share/gnome/gcompris/boards/skins/babytoy/draw/up.png
-share/gnome/gcompris/boards/skins/babytoy/file_selector_bg.png
-share/gnome/gcompris/boards/skins/babytoy/gcompris-bg.jpg
-share/gnome/gcompris/boards/skins/babytoy/gcompris-init.jpg
-share/gnome/gcompris/boards/skins/babytoy/gcompris-menu2bg.png
-share/gnome/gcompris/boards/skins/babytoy/gcompris-shapebg.jpg
-share/gnome/gcompris/boards/skins/babytoy/gcompris-shapelabel.png
-share/gnome/gcompris/boards/skins/babytoy/help.png
-share/gnome/gcompris/boards/skins/babytoy/help_bg.png
-share/gnome/gcompris/boards/skins/babytoy/home.png
-share/gnome/gcompris/boards/skins/babytoy/leftright-bg.jpg
-share/gnome/gcompris/boards/skins/babytoy/level1.png
-share/gnome/gcompris/boards/skins/babytoy/level2.png
-share/gnome/gcompris/boards/skins/babytoy/level3.png
-share/gnome/gcompris/boards/skins/babytoy/level4.png
-share/gnome/gcompris/boards/skins/babytoy/level5.png
-share/gnome/gcompris/boards/skins/babytoy/level6.png
-share/gnome/gcompris/boards/skins/babytoy/level7.png
-share/gnome/gcompris/boards/skins/babytoy/level8.png
-share/gnome/gcompris/boards/skins/babytoy/level9.png
-share/gnome/gcompris/boards/skins/babytoy/maze-2d-bubble.png
-share/gnome/gcompris/boards/skins/babytoy/maze-3d-bubble.png
-share/gnome/gcompris/boards/skins/babytoy/ok.png
-share/gnome/gcompris/boards/skins/babytoy/repeat.png
-share/gnome/gcompris/boards/skins/babytoy/skin.xml
-share/gnome/gcompris/boards/skins/babytoy/traffic-bg.jpg
-share/gnome/gcompris/boards/skins/gartoon/README
-share/gnome/gcompris/boards/skins/gartoon/about.png
-share/gnome/gcompris/boards/skins/gartoon/bad.png
-share/gnome/gcompris/boards/skins/gartoon/bar_bg.jpg
-share/gnome/gcompris/boards/skins/gartoon/boardicons/README
-share/gnome/gcompris/boards/skins/gartoon/boardicons/advanced_colors.png
-share/gnome/gcompris/boards/skins/gartoon/boardicons/algebra_by.png
-share/gnome/gcompris/boards/skins/gartoon/boardicons/algebra_group.png
-share/gnome/gcompris/boards/skins/gartoon/boardicons/algebra_guesscount.png
-share/gnome/gcompris/boards/skins/gartoon/boardicons/algebra_minus.png
-share/gnome/gcompris/boards/skins/gartoon/boardicons/algebra_plus.png
-share/gnome/gcompris/boards/skins/gartoon/boardicons/algebramenu.png
-share/gnome/gcompris/boards/skins/gartoon/boardicons/algorithm.png
-share/gnome/gcompris/boards/skins/gartoon/boardicons/anim.png
-share/gnome/gcompris/boards/skins/gartoon/boardicons/awele.png
-share/gnome/gcompris/boards/skins/gartoon/boardicons/babymatch.png
-share/gnome/gcompris/boards/skins/gartoon/boardicons/babyshapes.png
-share/gnome/gcompris/boards/skins/gartoon/boardicons/ballcatch.png
-share/gnome/gcompris/boards/skins/gartoon/boardicons/bargame.png
-share/gnome/gcompris/boards/skins/gartoon/boardicons/bonnefemmeti-lu.png
-share/gnome/gcompris/boards/skins/gartoon/boardicons/book.png
-share/gnome/gcompris/boards/skins/gartoon/boardicons/canal_lock.png
-share/gnome/gcompris/boards/skins/gartoon/boardicons/chat.png
-share/gnome/gcompris/boards/skins/gartoon/boardicons/chess.png
-share/gnome/gcompris/boards/skins/gartoon/boardicons/chess_computer.png
-share/gnome/gcompris/boards/skins/gartoon/boardicons/chess_movelearn.png
-share/gnome/gcompris/boards/skins/gartoon/boardicons/chess_partyend.png
-share/gnome/gcompris/boards/skins/gartoon/boardicons/chronos.png
-share/gnome/gcompris/boards/skins/gartoon/boardicons/click_on_letter.png
-share/gnome/gcompris/boards/skins/gartoon/boardicons/clickanddraw.png
-share/gnome/gcompris/boards/skins/gartoon/boardicons/clickgame.png
-share/gnome/gcompris/boards/skins/gartoon/boardicons/clockgame.png
-share/gnome/gcompris/boards/skins/gartoon/boardicons/colors.png
-share/gnome/gcompris/boards/skins/gartoon/boardicons/computer.png
-share/gnome/gcompris/boards/skins/gartoon/boardicons/connect4.png
-share/gnome/gcompris/boards/skins/gartoon/boardicons/crane.png
-share/gnome/gcompris/boards/skins/gartoon/boardicons/discovery.png
-share/gnome/gcompris/boards/skins/gartoon/boardicons/doubleentry.png
-share/gnome/gcompris/boards/skins/gartoon/boardicons/draw.png
-share/gnome/gcompris/boards/skins/gartoon/boardicons/drawnumber.png
-share/gnome/gcompris/boards/skins/gartoon/boardicons/ear.png
-share/gnome/gcompris/boards/skins/gartoon/boardicons/electric.png
-share/gnome/gcompris/boards/skins/gartoon/boardicons/enumerate.png
-share/gnome/gcompris/boards/skins/gartoon/boardicons/erase.png
-share/gnome/gcompris/boards/skins/gartoon/boardicons/erase_clic.png
-share/gnome/gcompris/boards/skins/gartoon/boardicons/erase_double_clic.png
-share/gnome/gcompris/boards/skins/gartoon/boardicons/experience.png
-share/gnome/gcompris/boards/skins/gartoon/boardicons/eye_colors.png
-share/gnome/gcompris/boards/skins/gartoon/boardicons/fifteen.png
-share/gnome/gcompris/boards/skins/gartoon/boardicons/followline.png
-share/gnome/gcompris/boards/skins/gartoon/boardicons/foot.png
-share/gnome/gcompris/boards/skins/gartoon/boardicons/france_region.png
-share/gnome/gcompris/boards/skins/gartoon/boardicons/fun.png
-share/gnome/gcompris/boards/skins/gartoon/boardicons/geometry.png
-share/gnome/gcompris/boards/skins/gartoon/boardicons/gletters.png
-share/gnome/gcompris/boards/skins/gartoon/boardicons/globe.png
-share/gnome/gcompris/boards/skins/gartoon/boardicons/gnumch-equal.png
-share/gnome/gcompris/boards/skins/gartoon/boardicons/gnumch-factors.png
-share/gnome/gcompris/boards/skins/gartoon/boardicons/gnumch-inequal.png
-share/gnome/gcompris/boards/skins/gartoon/boardicons/gnumch-multiples.png
-share/gnome/gcompris/boards/skins/gartoon/boardicons/gnumch-primes.png
-share/gnome/gcompris/boards/skins/gartoon/boardicons/gnumch.png
-share/gnome/gcompris/boards/skins/gartoon/boardicons/guessnumber.png
-share/gnome/gcompris/boards/skins/gartoon/boardicons/hanoi.png
-share/gnome/gcompris/boards/skins/gartoon/boardicons/hanoi_real.png
-share/gnome/gcompris/boards/skins/gartoon/boardicons/helicogame.png
-share/gnome/gcompris/boards/skins/gartoon/boardicons/hexagon.png
-share/gnome/gcompris/boards/skins/gartoon/boardicons/imageid.png
-share/gnome/gcompris/boards/skins/gartoon/boardicons/imagename.png
-share/gnome/gcompris/boards/skins/gartoon/boardicons/keyboard.png
-share/gnome/gcompris/boards/skins/gartoon/boardicons/leftright.png
-share/gnome/gcompris/boards/skins/gartoon/boardicons/magic_hat_minus.png
-share/gnome/gcompris/boards/skins/gartoon/boardicons/magic_hat_plus.png
-share/gnome/gcompris/boards/skins/gartoon/boardicons/math.png
-share/gnome/gcompris/boards/skins/gartoon/boardicons/maze.png
-share/gnome/gcompris/boards/skins/gartoon/boardicons/maze3D.png
-share/gnome/gcompris/boards/skins/gartoon/boardicons/mazeInvisible.png
-share/gnome/gcompris/boards/skins/gartoon/boardicons/melody.png
-share/gnome/gcompris/boards/skins/gartoon/boardicons/mem_solo_all.png
-share/gnome/gcompris/boards/skins/gartoon/boardicons/mem_solo_calc.png
-share/gnome/gcompris/boards/skins/gartoon/boardicons/mem_solo_div.png
-share/gnome/gcompris/boards/skins/gartoon/boardicons/mem_solo_minus.png
-share/gnome/gcompris/boards/skins/gartoon/boardicons/mem_solo_mult.png
-share/gnome/gcompris/boards/skins/gartoon/boardicons/mem_solo_mult_div.png
-share/gnome/gcompris/boards/skins/gartoon/boardicons/mem_solo_plus.png
-share/gnome/gcompris/boards/skins/gartoon/boardicons/mem_solo_plus_minus.png
-share/gnome/gcompris/boards/skins/gartoon/boardicons/mem_tux_all.png
-share/gnome/gcompris/boards/skins/gartoon/boardicons/mem_tux_calc.png
-share/gnome/gcompris/boards/skins/gartoon/boardicons/mem_tux_div.png
-share/gnome/gcompris/boards/skins/gartoon/boardicons/mem_tux_minus.png
-share/gnome/gcompris/boards/skins/gartoon/boardicons/mem_tux_mult.png
-share/gnome/gcompris/boards/skins/gartoon/boardicons/mem_tux_mult_div.png
-share/gnome/gcompris/boards/skins/gartoon/boardicons/mem_tux_plus.png
-share/gnome/gcompris/boards/skins/gartoon/boardicons/mem_tux_plus_minus.png
-share/gnome/gcompris/boards/skins/gartoon/boardicons/memory.png
-share/gnome/gcompris/boards/skins/gartoon/boardicons/memory_elephant.png
-share/gnome/gcompris/boards/skins/gartoon/boardicons/memory_sound.png
-share/gnome/gcompris/boards/skins/gartoon/boardicons/memory_sound_tux.png
-share/gnome/gcompris/boards/skins/gartoon/boardicons/memory_tux.png
-share/gnome/gcompris/boards/skins/gartoon/boardicons/miscelaneous.png
-share/gnome/gcompris/boards/skins/gartoon/boardicons/missing_letter.png
-share/gnome/gcompris/boards/skins/gartoon/boardicons/money.png
-share/gnome/gcompris/boards/skins/gartoon/boardicons/money_cents.png
-share/gnome/gcompris/boards/skins/gartoon/boardicons/mosaic.png
-share/gnome/gcompris/boards/skins/gartoon/boardicons/mouse.png
-share/gnome/gcompris/boards/skins/gartoon/boardicons/numeration.png
-share/gnome/gcompris/boards/skins/gartoon/boardicons/puzzles.png
-share/gnome/gcompris/boards/skins/gartoon/boardicons/python.png
-share/gnome/gcompris/boards/skins/gartoon/boardicons/railroad.png
-share/gnome/gcompris/boards/skins/gartoon/boardicons/read_colors.png
-share/gnome/gcompris/boards/skins/gartoon/boardicons/read_colors2.png
-share/gnome/gcompris/boards/skins/gartoon/boardicons/reading.png
-share/gnome/gcompris/boards/skins/gartoon/boardicons/readingh.png
-share/gnome/gcompris/boards/skins/gartoon/boardicons/redraw.png
-share/gnome/gcompris/boards/skins/gartoon/boardicons/redraw_symmetry.png
-share/gnome/gcompris/boards/skins/gartoon/boardicons/reversecount.png
-share/gnome/gcompris/boards/skins/gartoon/boardicons/scalesicon.png
-share/gnome/gcompris/boards/skins/gartoon/boardicons/searace.png
-share/gnome/gcompris/boards/skins/gartoon/boardicons/searace1player.png
-share/gnome/gcompris/boards/skins/gartoon/boardicons/shapegame.png
-share/gnome/gcompris/boards/skins/gartoon/boardicons/smallnumbers.png
-share/gnome/gcompris/boards/skins/gartoon/boardicons/smallnumbers2.png
-share/gnome/gcompris/boards/skins/gartoon/boardicons/strategy.png
-share/gnome/gcompris/boards/skins/gartoon/boardicons/submarine.png
-share/gnome/gcompris/boards/skins/gartoon/boardicons/sudoku.png
-share/gnome/gcompris/boards/skins/gartoon/boardicons/superbrain.png
-share/gnome/gcompris/boards/skins/gartoon/boardicons/tangram.png
-share/gnome/gcompris/boards/skins/gartoon/boardicons/target.png
-share/gnome/gcompris/boards/skins/gartoon/boardicons/traffic.png
-share/gnome/gcompris/boards/skins/gartoon/boardicons/tuxpaint.png
-share/gnome/gcompris/boards/skins/gartoon/boardicons/tuxpara.png
-share/gnome/gcompris/boards/skins/gartoon/boardicons/warning.png
-share/gnome/gcompris/boards/skins/gartoon/boardicons/watercycle.png
-share/gnome/gcompris/boards/skins/gartoon/boardicons/wordprocessor.png
-share/gnome/gcompris/boards/skins/gartoon/boardicons/wordsgame.png
-share/gnome/gcompris/boards/skins/gartoon/boardicons/writing_tutor_image_match.png
-share/gnome/gcompris/boards/skins/gartoon/boardicons/writing_tutor_missing_match.png
-share/gnome/gcompris/boards/skins/gartoon/boardicons/writing_tutor_pattern_admin.png
-share/gnome/gcompris/boards/skins/gartoon/boardicons/writing_tutor_tablet.png
-share/gnome/gcompris/boards/skins/gartoon/boardicons/writing_tutor_template_match.png
-share/gnome/gcompris/boards/skins/gartoon/button.png
-share/gnome/gcompris/boards/skins/gartoon/button_backward.png
-share/gnome/gcompris/boards/skins/gartoon/button_checked.png
-share/gnome/gcompris/boards/skins/gartoon/button_exit.png
-share/gnome/gcompris/boards/skins/gartoon/button_forward.png
-share/gnome/gcompris/boards/skins/gartoon/button_large.png
-share/gnome/gcompris/boards/skins/gartoon/button_large2.png
-share/gnome/gcompris/boards/skins/gartoon/button_large_selected.png
-share/gnome/gcompris/boards/skins/gartoon/button_redo.png
-share/gnome/gcompris/boards/skins/gartoon/button_reload.png
-share/gnome/gcompris/boards/skins/gartoon/button_selected.png
-share/gnome/gcompris/boards/skins/gartoon/button_small.png
-share/gnome/gcompris/boards/skins/gartoon/button_small_selected.png
-share/gnome/gcompris/boards/skins/gartoon/button_unchecked.png
-share/gnome/gcompris/boards/skins/gartoon/button_up.png
-share/gnome/gcompris/boards/skins/gartoon/button_up_selected.png
-share/gnome/gcompris/boards/skins/gartoon/clockgame-bg.jpg
-share/gnome/gcompris/boards/skins/gartoon/config.png
-share/gnome/gcompris/boards/skins/gartoon/config_boards.png
-share/gnome/gcompris/boards/skins/gartoon/config_groups.png
-share/gnome/gcompris/boards/skins/gartoon/config_profiles.png
-share/gnome/gcompris/boards/skins/gartoon/config_reports.png
-share/gnome/gcompris/boards/skins/gartoon/config_users.png
-share/gnome/gcompris/boards/skins/gartoon/cursor_circle.png
-share/gnome/gcompris/boards/skins/gartoon/cursor_default.png
-share/gnome/gcompris/boards/skins/gartoon/cursor_del.png
-share/gnome/gcompris/boards/skins/gartoon/cursor_fill.png
-share/gnome/gcompris/boards/skins/gartoon/cursor_fillcircle.png
-share/gnome/gcompris/boards/skins/gartoon/cursor_fillrect.png
-share/gnome/gcompris/boards/skins/gartoon/cursor_line.png
-share/gnome/gcompris/boards/skins/gartoon/cursor_rect.png
-share/gnome/gcompris/boards/skins/gartoon/cursor_select.png
-share/gnome/gcompris/boards/skins/gartoon/dialogbox.png
-share/gnome/gcompris/boards/skins/gartoon/difficulty_star1.png
-share/gnome/gcompris/boards/skins/gartoon/difficulty_star2.png
-share/gnome/gcompris/boards/skins/gartoon/difficulty_star3.png
-share/gnome/gcompris/boards/skins/gartoon/difficulty_star4.png
-share/gnome/gcompris/boards/skins/gartoon/difficulty_star5.png
-share/gnome/gcompris/boards/skins/gartoon/difficulty_star6.png
-share/gnome/gcompris/boards/skins/gartoon/directory.png
-share/gnome/gcompris/boards/skins/gartoon/draw/camera.png
-share/gnome/gcompris/boards/skins/gartoon/draw/color-selector.png
-share/gnome/gcompris/boards/skins/gartoon/draw/counter.png
-share/gnome/gcompris/boards/skins/gartoon/draw/down.png
-share/gnome/gcompris/boards/skins/gartoon/draw/tool-camera.png
-share/gnome/gcompris/boards/skins/gartoon/draw/tool-camera_on.png
-share/gnome/gcompris/boards/skins/gartoon/draw/tool-circle.png
-share/gnome/gcompris/boards/skins/gartoon/draw/tool-circle_on.png
-share/gnome/gcompris/boards/skins/gartoon/draw/tool-del.png
-share/gnome/gcompris/boards/skins/gartoon/draw/tool-del_on.png
-share/gnome/gcompris/boards/skins/gartoon/draw/tool-down.png
-share/gnome/gcompris/boards/skins/gartoon/draw/tool-down_on.png
-share/gnome/gcompris/boards/skins/gartoon/draw/tool-empty.png
-share/gnome/gcompris/boards/skins/gartoon/draw/tool-empty_on.png
-share/gnome/gcompris/boards/skins/gartoon/draw/tool-fill.png
-share/gnome/gcompris/boards/skins/gartoon/draw/tool-fill_on.png
-share/gnome/gcompris/boards/skins/gartoon/draw/tool-filledcircle.png
-share/gnome/gcompris/boards/skins/gartoon/draw/tool-filledcircle_on.png
-share/gnome/gcompris/boards/skins/gartoon/draw/tool-filledrectangle.png
-share/gnome/gcompris/boards/skins/gartoon/draw/tool-filledrectangle_on.png
-share/gnome/gcompris/boards/skins/gartoon/draw/tool-flip.png
-share/gnome/gcompris/boards/skins/gartoon/draw/tool-flip_on.png
-share/gnome/gcompris/boards/skins/gartoon/draw/tool-image.png
-share/gnome/gcompris/boards/skins/gartoon/draw/tool-image_on.png
-share/gnome/gcompris/boards/skins/gartoon/draw/tool-line.png
-share/gnome/gcompris/boards/skins/gartoon/draw/tool-line_on.png
-share/gnome/gcompris/boards/skins/gartoon/draw/tool-load.png
-share/gnome/gcompris/boards/skins/gartoon/draw/tool-movie.png
-share/gnome/gcompris/boards/skins/gartoon/draw/tool-movie_on.png
-share/gnome/gcompris/boards/skins/gartoon/draw/tool-rectangle.png
-share/gnome/gcompris/boards/skins/gartoon/draw/tool-rectangle_on.png
-share/gnome/gcompris/boards/skins/gartoon/draw/tool-rotation-ccw.png
-share/gnome/gcompris/boards/skins/gartoon/draw/tool-rotation-ccw_on.png
-share/gnome/gcompris/boards/skins/gartoon/draw/tool-rotation-cw.png
-share/gnome/gcompris/boards/skins/gartoon/draw/tool-rotation-cw_on.png
-share/gnome/gcompris/boards/skins/gartoon/draw/tool-save.png
-share/gnome/gcompris/boards/skins/gartoon/draw/tool-select.png
-share/gnome/gcompris/boards/skins/gartoon/draw/tool-select_on.png
-share/gnome/gcompris/boards/skins/gartoon/draw/tool-selector.png
-share/gnome/gcompris/boards/skins/gartoon/draw/tool-text.png
-share/gnome/gcompris/boards/skins/gartoon/draw/tool-text_on.png
-share/gnome/gcompris/boards/skins/gartoon/draw/tool-up.png
-share/gnome/gcompris/boards/skins/gartoon/draw/tool-up_on.png
-share/gnome/gcompris/boards/skins/gartoon/draw/up.png
-share/gnome/gcompris/boards/skins/gartoon/file.png
-share/gnome/gcompris/boards/skins/gartoon/file_selector_bg.png
-share/gnome/gcompris/boards/skins/gartoon/fsflogo.png
-share/gnome/gcompris/boards/skins/gartoon/gcompris-about.png
-share/gnome/gcompris/boards/skins/gartoon/gcompris-bg.jpg
-share/gnome/gcompris/boards/skins/gartoon/gcompris-init.jpg
-share/gnome/gcompris/boards/skins/gartoon/gcompris-menu2bg.png
-share/gnome/gcompris/boards/skins/gartoon/gcompris-shapebg.jpg
-share/gnome/gcompris/boards/skins/gartoon/gcompris-shapelabel.png
-share/gnome/gcompris/boards/skins/gartoon/gcomprislogo.png
-share/gnome/gcompris/boards/skins/gartoon/help.png
-share/gnome/gcompris/boards/skins/gartoon/help_bg.png
-share/gnome/gcompris/boards/skins/gartoon/home.png
-share/gnome/gcompris/boards/skins/gartoon/images_selector_bg.png
-share/gnome/gcompris/boards/skins/gartoon/leftright-bg.jpg
-share/gnome/gcompris/boards/skins/gartoon/level1.png
-share/gnome/gcompris/boards/skins/gartoon/level2.png
-share/gnome/gcompris/boards/skins/gartoon/level3.png
-share/gnome/gcompris/boards/skins/gartoon/level4.png
-share/gnome/gcompris/boards/skins/gartoon/level5.png
-share/gnome/gcompris/boards/skins/gartoon/level6.png
-share/gnome/gcompris/boards/skins/gartoon/level7.png
-share/gnome/gcompris/boards/skins/gartoon/level8.png
-share/gnome/gcompris/boards/skins/gartoon/level9.png
-share/gnome/gcompris/boards/skins/gartoon/maze-2d-bubble.png
-share/gnome/gcompris/boards/skins/gartoon/maze-3d-bubble.png
-share/gnome/gcompris/boards/skins/gartoon/menuicon.png
-share/gnome/gcompris/boards/skins/gartoon/mini_bad.png
-share/gnome/gcompris/boards/skins/gartoon/money-bg.jpg
-share/gnome/gcompris/boards/skins/gartoon/money-bg.png
-share/gnome/gcompris/boards/skins/gartoon/ok.png
-share/gnome/gcompris/boards/skins/gartoon/reading-bg.jpg
-share/gnome/gcompris/boards/skins/gartoon/repeat.png
-share/gnome/gcompris/boards/skins/gartoon/skin.xml
-share/gnome/gcompris/boards/skins/gartoon/traffic-bg.jpg
-share/gnome/gcompris/boards/skins/gartoon/voice.png
-share/gnome/gcompris/boards/skins/gartoon/voice_bad.png
-share/gnome/gcompris/boards/smallnumbers.xml
-share/gnome/gcompris/boards/smallnumbers2.xml
-share/gnome/gcompris/boards/sound_group.xml
-share/gnome/gcompris/boards/sounds/HOWTO_ENCODE
-share/gnome/gcompris/boards/sounds/Harbor1.wav
-share/gnome/gcompris/boards/sounds/Harbor3.wav
-share/gnome/gcompris/boards/sounds/LuneRouge/COPYRIGHT
-share/gnome/gcompris/boards/sounds/LuneRouge/LRLaPause_short.ogg
-share/gnome/gcompris/boards/sounds/LuneRouge/Licence.txt
-share/gnome/gcompris/boards/sounds/LuneRouge/animaux/LRBark_1_by_Lionel_Allorge_cut.ogg
-share/gnome/gcompris/boards/sounds/LuneRouge/animaux/LRBark_3_by_Lionel_Allorge_cut.ogg
-share/gnome/gcompris/boards/sounds/LuneRouge/animaux/LRFrogsInPondDuringStormByLionelAllorgeCut.ogg
-share/gnome/gcompris/boards/sounds/LuneRouge/animaux/LRRain_in_garden_01_by_Lionel_Allorge_cut.ogg
-share/gnome/gcompris/boards/sounds/LuneRouge/engins/LRObject_falling_01_by_Lionel_Allorge.ogg
-share/gnome/gcompris/boards/sounds/LuneRouge/engins/LRObject_falling_02_by_Lionel_Allorge.ogg
-share/gnome/gcompris/boards/sounds/LuneRouge/engins/LRStartAndStopCarEngine1ByLionelAllorgeCut.ogg
-share/gnome/gcompris/boards/sounds/LuneRouge/engins/LRTrain_slowing_down_01_by_Lionel_Allorge_cut.ogg
-share/gnome/gcompris/boards/sounds/LuneRouge/humain/LRApplauses_1_by_Lionel_Allorge_cut.ogg
-share/gnome/gcompris/boards/sounds/LuneRouge/humain/LRHeart_beat_01_by_Lionel_Allorge.ogg
-share/gnome/gcompris/boards/sounds/LuneRouge/maison/LRDoor_Open_2_by_Lionel_Allorge.ogg
-share/gnome/gcompris/boards/sounds/LuneRouge/maison/LRRing_01_by_Lionel_Allorge.ogg
-share/gnome/gcompris/boards/sounds/LuneRouge/musique/LRBuddhist_gong_05_by_Lionel_Allorge.ogg
-share/gnome/gcompris/boards/sounds/LuneRouge/sf/LRWeird_1_by_Lionel_Allorge.ogg
-share/gnome/gcompris/boards/sounds/LuneRouge/sf/LRWeird_2_by_Lionel_Allorge.ogg
-share/gnome/gcompris/boards/sounds/LuneRouge/sf/LRWeird_3_by_Lionel_Allorge.ogg
-share/gnome/gcompris/boards/sounds/LuneRouge/sf/LRWeird_4_by_Lionel_Allorge.ogg
-share/gnome/gcompris/boards/sounds/LuneRouge/sf/LRWeird_5_by_Lionel_Allorge.ogg
-share/gnome/gcompris/boards/sounds/LuneRouge/sf/LRWeird_6_by_Lionel_Allorge.ogg
-share/gnome/gcompris/boards/sounds/LuneRouge/usine/LRFactory_noise_01_by_Lionel_Allorge.ogg
-share/gnome/gcompris/boards/sounds/LuneRouge/usine/LRFactory_noise_02_by_Lionel_Allorge.ogg
-share/gnome/gcompris/boards/sounds/LuneRouge/usine/LRFactory_noise_03_by_Lionel_Allorge.ogg
-share/gnome/gcompris/boards/sounds/LuneRouge/usine/LRFactory_noise_04_by_Lionel_Allorge.ogg
-share/gnome/gcompris/boards/sounds/LuneRouge/usine/LRFactory_noise_05_by_Lionel_Allorge.ogg
-share/gnome/gcompris/boards/sounds/LuneRouge/usine/LRFactory_noise_06_by_Lionel_Allorge.ogg
-share/gnome/gcompris/boards/sounds/LuneRouge/usine/LRFireballs_01_by_Lionel_Allorge.ogg
-share/gnome/gcompris/boards/sounds/LuneRouge/usine/LRHits_01_by_Lionel_Allorge.ogg
-share/gnome/gcompris/boards/sounds/README
-share/gnome/gcompris/boards/sounds/Water5.wav
-share/gnome/gcompris/boards/sounds/apert2.wav
-share/gnome/gcompris/boards/sounds/ar/README
-share/gnome/gcompris/boards/sounds/ar/alphabet/10.ogg
-share/gnome/gcompris/boards/sounds/ar/alphabet/U0030.ogg
-share/gnome/gcompris/boards/sounds/ar/alphabet/U0031.ogg
-share/gnome/gcompris/boards/sounds/ar/alphabet/U0032.ogg
-share/gnome/gcompris/boards/sounds/ar/alphabet/U0033.ogg
-share/gnome/gcompris/boards/sounds/ar/alphabet/U0034.ogg
-share/gnome/gcompris/boards/sounds/ar/alphabet/U0035.ogg
-share/gnome/gcompris/boards/sounds/ar/alphabet/U0036.ogg
-share/gnome/gcompris/boards/sounds/ar/alphabet/U0037.ogg
-share/gnome/gcompris/boards/sounds/ar/alphabet/U0038.ogg
-share/gnome/gcompris/boards/sounds/ar/alphabet/U0039.ogg
-share/gnome/gcompris/boards/sounds/ar/alphabet/U0623.ogg
-share/gnome/gcompris/boards/sounds/ar/alphabet/U0628.ogg
-share/gnome/gcompris/boards/sounds/ar/alphabet/U062A.ogg
-share/gnome/gcompris/boards/sounds/ar/alphabet/U062B.ogg
-share/gnome/gcompris/boards/sounds/ar/alphabet/U062C.ogg
-share/gnome/gcompris/boards/sounds/ar/alphabet/U062D.ogg
-share/gnome/gcompris/boards/sounds/ar/alphabet/U062E.ogg
-share/gnome/gcompris/boards/sounds/ar/alphabet/U062F.ogg
-share/gnome/gcompris/boards/sounds/ar/alphabet/U0630.ogg
-share/gnome/gcompris/boards/sounds/ar/alphabet/U0631.ogg
-share/gnome/gcompris/boards/sounds/ar/alphabet/U0632.ogg
-share/gnome/gcompris/boards/sounds/ar/alphabet/U0633.ogg
-share/gnome/gcompris/boards/sounds/ar/alphabet/U0634.ogg
-share/gnome/gcompris/boards/sounds/ar/alphabet/U0635.ogg
-share/gnome/gcompris/boards/sounds/ar/alphabet/U0636.ogg
-share/gnome/gcompris/boards/sounds/ar/alphabet/U0637.ogg
-share/gnome/gcompris/boards/sounds/ar/alphabet/U0638.ogg
-share/gnome/gcompris/boards/sounds/ar/alphabet/U0639.ogg
-share/gnome/gcompris/boards/sounds/ar/alphabet/U063A.ogg
-share/gnome/gcompris/boards/sounds/ar/alphabet/U0641.ogg
-share/gnome/gcompris/boards/sounds/ar/alphabet/U0642.ogg
-share/gnome/gcompris/boards/sounds/ar/alphabet/U0643.ogg
-share/gnome/gcompris/boards/sounds/ar/alphabet/U0644.ogg
-share/gnome/gcompris/boards/sounds/ar/alphabet/U0645.ogg
-share/gnome/gcompris/boards/sounds/ar/alphabet/U0646.ogg
-share/gnome/gcompris/boards/sounds/ar/alphabet/U0647.ogg
-share/gnome/gcompris/boards/sounds/ar/alphabet/U0648.ogg
-share/gnome/gcompris/boards/sounds/ar/alphabet/U064A.ogg
-share/gnome/gcompris/boards/sounds/ar/colors/black.ogg
-share/gnome/gcompris/boards/sounds/ar/colors/blue.ogg
-share/gnome/gcompris/boards/sounds/ar/colors/brown.ogg
-share/gnome/gcompris/boards/sounds/ar/colors/green.ogg
-share/gnome/gcompris/boards/sounds/ar/colors/grey.ogg
-share/gnome/gcompris/boards/sounds/ar/colors/orange.ogg
-share/gnome/gcompris/boards/sounds/ar/colors/pink.ogg
-share/gnome/gcompris/boards/sounds/ar/colors/purple.ogg
-share/gnome/gcompris/boards/sounds/ar/colors/red.ogg
-share/gnome/gcompris/boards/sounds/ar/colors/white.ogg
-share/gnome/gcompris/boards/sounds/ar/colors/yellow.ogg
-share/gnome/gcompris/boards/sounds/ar/geography/africa.ogg
-share/gnome/gcompris/boards/sounds/ar/geography/alaska.ogg
-share/gnome/gcompris/boards/sounds/ar/geography/albania.ogg
-share/gnome/gcompris/boards/sounds/ar/geography/america.ogg
-share/gnome/gcompris/boards/sounds/ar/geography/antartica.ogg
-share/gnome/gcompris/boards/sounds/ar/geography/argentina.ogg
-share/gnome/gcompris/boards/sounds/ar/geography/asia.ogg
-share/gnome/gcompris/boards/sounds/ar/geography/austria.ogg
-share/gnome/gcompris/boards/sounds/ar/geography/bahamas.ogg
-share/gnome/gcompris/boards/sounds/ar/geography/belarus.ogg
-share/gnome/gcompris/boards/sounds/ar/geography/belgium.ogg
-share/gnome/gcompris/boards/sounds/ar/geography/bolivia.ogg
-share/gnome/gcompris/boards/sounds/ar/geography/bosnia_herzegovina.ogg
-share/gnome/gcompris/boards/sounds/ar/geography/brazil.ogg
-share/gnome/gcompris/boards/sounds/ar/geography/bulgaria.ogg
-share/gnome/gcompris/boards/sounds/ar/geography/canada.ogg
-share/gnome/gcompris/boards/sounds/ar/geography/chile.ogg
-share/gnome/gcompris/boards/sounds/ar/geography/colombia.ogg
-share/gnome/gcompris/boards/sounds/ar/geography/costa_rica.ogg
-share/gnome/gcompris/boards/sounds/ar/geography/croatia.ogg
-share/gnome/gcompris/boards/sounds/ar/geography/cuba.ogg
-share/gnome/gcompris/boards/sounds/ar/geography/cyprus.ogg
-share/gnome/gcompris/boards/sounds/ar/geography/czech.ogg
-share/gnome/gcompris/boards/sounds/ar/geography/denmark.ogg
-share/gnome/gcompris/boards/sounds/ar/geography/dominican_republic.ogg
-share/gnome/gcompris/boards/sounds/ar/geography/ecuador.ogg
-share/gnome/gcompris/boards/sounds/ar/geography/estonia.ogg
-share/gnome/gcompris/boards/sounds/ar/geography/europe.ogg
-share/gnome/gcompris/boards/sounds/ar/geography/finland.ogg
-share/gnome/gcompris/boards/sounds/ar/geography/france.ogg
-share/gnome/gcompris/boards/sounds/ar/geography/french_guiana.ogg
-share/gnome/gcompris/boards/sounds/ar/geography/germany.ogg
-share/gnome/gcompris/boards/sounds/ar/geography/greece.ogg
-share/gnome/gcompris/boards/sounds/ar/geography/greenland.ogg
-share/gnome/gcompris/boards/sounds/ar/geography/guatemala.ogg
-share/gnome/gcompris/boards/sounds/ar/geography/guyana.ogg
-share/gnome/gcompris/boards/sounds/ar/geography/haiti.ogg
-share/gnome/gcompris/boards/sounds/ar/geography/honduras.ogg
-share/gnome/gcompris/boards/sounds/ar/geography/hungary.ogg
-share/gnome/gcompris/boards/sounds/ar/geography/iceland.ogg
-share/gnome/gcompris/boards/sounds/ar/geography/ireland.ogg
-share/gnome/gcompris/boards/sounds/ar/geography/italy.ogg
-share/gnome/gcompris/boards/sounds/ar/geography/jamaica.ogg
-share/gnome/gcompris/boards/sounds/ar/geography/latvia.ogg
-share/gnome/gcompris/boards/sounds/ar/geography/lithuania.ogg
-share/gnome/gcompris/boards/sounds/ar/geography/luxembourg.ogg
-share/gnome/gcompris/boards/sounds/ar/geography/macedonia.ogg
-share/gnome/gcompris/boards/sounds/ar/geography/mexico.ogg
-share/gnome/gcompris/boards/sounds/ar/geography/moldova.ogg
-share/gnome/gcompris/boards/sounds/ar/geography/netherland.ogg
-share/gnome/gcompris/boards/sounds/ar/geography/nicaragua.ogg
-share/gnome/gcompris/boards/sounds/ar/geography/norway.ogg
-share/gnome/gcompris/boards/sounds/ar/geography/oceania.ogg
-share/gnome/gcompris/boards/sounds/ar/geography/panama.ogg
-share/gnome/gcompris/boards/sounds/ar/geography/paraguay.ogg
-share/gnome/gcompris/boards/sounds/ar/geography/peru.ogg
-share/gnome/gcompris/boards/sounds/ar/geography/poland.ogg
-share/gnome/gcompris/boards/sounds/ar/geography/portugal.ogg
-share/gnome/gcompris/boards/sounds/ar/geography/romania.ogg
-share/gnome/gcompris/boards/sounds/ar/geography/russia.ogg
-share/gnome/gcompris/boards/sounds/ar/geography/salvador.ogg
-share/gnome/gcompris/boards/sounds/ar/geography/serbia_montenegro.ogg
-share/gnome/gcompris/boards/sounds/ar/geography/slovakia.ogg
-share/gnome/gcompris/boards/sounds/ar/geography/slovenia.ogg
-share/gnome/gcompris/boards/sounds/ar/geography/spain.ogg
-share/gnome/gcompris/boards/sounds/ar/geography/suriname.ogg
-share/gnome/gcompris/boards/sounds/ar/geography/sweden.ogg
-share/gnome/gcompris/boards/sounds/ar/geography/switz.ogg
-share/gnome/gcompris/boards/sounds/ar/geography/turkey.ogg
-share/gnome/gcompris/boards/sounds/ar/geography/ukraine.ogg
-share/gnome/gcompris/boards/sounds/ar/geography/united_kingdom.ogg
-share/gnome/gcompris/boards/sounds/ar/geography/uruguay.ogg
-share/gnome/gcompris/boards/sounds/ar/geography/usa.ogg
-share/gnome/gcompris/boards/sounds/ar/geography/venezuela.ogg
-share/gnome/gcompris/boards/sounds/ar/misc/about.ogg
-share/gnome/gcompris/boards/sounds/ar/misc/awesome.ogg
-share/gnome/gcompris/boards/sounds/ar/misc/back.ogg
-share/gnome/gcompris/boards/sounds/ar/misc/by.ogg
-share/gnome/gcompris/boards/sounds/ar/misc/check_answer.ogg
-share/gnome/gcompris/boards/sounds/ar/misc/click_on_letter.ogg
-share/gnome/gcompris/boards/sounds/ar/misc/congratulation.ogg
-share/gnome/gcompris/boards/sounds/ar/misc/equal.ogg
-share/gnome/gcompris/boards/sounds/ar/misc/fantastic.ogg
-share/gnome/gcompris/boards/sounds/ar/misc/good.ogg
-share/gnome/gcompris/boards/sounds/ar/misc/great.ogg
-share/gnome/gcompris/boards/sounds/ar/misc/help.ogg
-share/gnome/gcompris/boards/sounds/ar/misc/level.ogg
-share/gnome/gcompris/boards/sounds/ar/misc/minus.ogg
-share/gnome/gcompris/boards/sounds/ar/misc/ok.ogg
-share/gnome/gcompris/boards/sounds/ar/misc/outof.ogg
-share/gnome/gcompris/boards/sounds/ar/misc/perfect.ogg
-share/gnome/gcompris/boards/sounds/ar/misc/plus.ogg
-share/gnome/gcompris/boards/sounds/ar/misc/quit.ogg
-share/gnome/gcompris/boards/sounds/ar/misc/super.ogg
-share/gnome/gcompris/boards/sounds/ar/misc/waytogo.ogg
-share/gnome/gcompris/boards/sounds/ar/misc/welcome.ogg
-share/gnome/gcompris/boards/sounds/bleep.wav
-share/gnome/gcompris/boards/sounds/bonus.wav
-share/gnome/gcompris/boards/sounds/brick.wav
-share/gnome/gcompris/boards/sounds/bubble.wav
-share/gnome/gcompris/boards/sounds/chronos/space/1.ogg
-share/gnome/gcompris/boards/sounds/chronos/space/2.ogg
-share/gnome/gcompris/boards/sounds/chronos/space/3.ogg
-share/gnome/gcompris/boards/sounds/crash.wav
-share/gnome/gcompris/boards/sounds/cs/README
-share/gnome/gcompris/boards/sounds/cs/alphabet/10.ogg
-share/gnome/gcompris/boards/sounds/cs/alphabet/U0031.ogg
-share/gnome/gcompris/boards/sounds/cs/alphabet/U0032.ogg
-share/gnome/gcompris/boards/sounds/cs/alphabet/U0033.ogg
-share/gnome/gcompris/boards/sounds/cs/alphabet/U0034.ogg
-share/gnome/gcompris/boards/sounds/cs/alphabet/U0035.ogg
-share/gnome/gcompris/boards/sounds/cs/alphabet/U0036.ogg
-share/gnome/gcompris/boards/sounds/cs/alphabet/U0037.ogg
-share/gnome/gcompris/boards/sounds/cs/alphabet/U0038.ogg
-share/gnome/gcompris/boards/sounds/cs/alphabet/U0039.ogg
-share/gnome/gcompris/boards/sounds/cs/alphabet/U0061.ogg
-share/gnome/gcompris/boards/sounds/cs/alphabet/U0062.ogg
-share/gnome/gcompris/boards/sounds/cs/alphabet/U0063.ogg
-share/gnome/gcompris/boards/sounds/cs/alphabet/U0064.ogg
-share/gnome/gcompris/boards/sounds/cs/alphabet/U0065.ogg
-share/gnome/gcompris/boards/sounds/cs/alphabet/U0066.ogg
-share/gnome/gcompris/boards/sounds/cs/alphabet/U0067.ogg
-share/gnome/gcompris/boards/sounds/cs/alphabet/U0068.ogg
-share/gnome/gcompris/boards/sounds/cs/alphabet/U0069.ogg
-share/gnome/gcompris/boards/sounds/cs/alphabet/U006A.ogg
-share/gnome/gcompris/boards/sounds/cs/alphabet/U006B.ogg
-share/gnome/gcompris/boards/sounds/cs/alphabet/U006C.ogg
-share/gnome/gcompris/boards/sounds/cs/alphabet/U006D.ogg
-share/gnome/gcompris/boards/sounds/cs/alphabet/U006E.ogg
-share/gnome/gcompris/boards/sounds/cs/alphabet/U006F.ogg
-share/gnome/gcompris/boards/sounds/cs/alphabet/U0070.ogg
-share/gnome/gcompris/boards/sounds/cs/alphabet/U0071.ogg
-share/gnome/gcompris/boards/sounds/cs/alphabet/U0072.ogg
-share/gnome/gcompris/boards/sounds/cs/alphabet/U0073.ogg
-share/gnome/gcompris/boards/sounds/cs/alphabet/U0074.ogg
-share/gnome/gcompris/boards/sounds/cs/alphabet/U0075.ogg
-share/gnome/gcompris/boards/sounds/cs/alphabet/U0076.ogg
-share/gnome/gcompris/boards/sounds/cs/alphabet/U0077.ogg
-share/gnome/gcompris/boards/sounds/cs/alphabet/U0078.ogg
-share/gnome/gcompris/boards/sounds/cs/alphabet/U0079.ogg
-share/gnome/gcompris/boards/sounds/cs/alphabet/U007A.ogg
-share/gnome/gcompris/boards/sounds/cs/alphabet/U00E1.ogg
-share/gnome/gcompris/boards/sounds/cs/alphabet/U00E9.ogg
-share/gnome/gcompris/boards/sounds/cs/alphabet/U00ED.ogg
-share/gnome/gcompris/boards/sounds/cs/alphabet/U00F3.ogg
-share/gnome/gcompris/boards/sounds/cs/alphabet/U00FA.ogg
-share/gnome/gcompris/boards/sounds/cs/alphabet/U00FD.ogg
-share/gnome/gcompris/boards/sounds/cs/alphabet/U010D.ogg
-share/gnome/gcompris/boards/sounds/cs/alphabet/U010F.ogg
-share/gnome/gcompris/boards/sounds/cs/alphabet/U011B.ogg
-share/gnome/gcompris/boards/sounds/cs/alphabet/U0148.ogg
-share/gnome/gcompris/boards/sounds/cs/alphabet/U0159.ogg
-share/gnome/gcompris/boards/sounds/cs/alphabet/U0161.ogg
-share/gnome/gcompris/boards/sounds/cs/alphabet/U0165.ogg
-share/gnome/gcompris/boards/sounds/cs/alphabet/U016F.ogg
-share/gnome/gcompris/boards/sounds/cs/alphabet/U017E.ogg
-share/gnome/gcompris/boards/sounds/cs/colors/black.ogg
-share/gnome/gcompris/boards/sounds/cs/colors/blue.ogg
-share/gnome/gcompris/boards/sounds/cs/colors/brown.ogg
-share/gnome/gcompris/boards/sounds/cs/colors/green.ogg
-share/gnome/gcompris/boards/sounds/cs/colors/grey.ogg
-share/gnome/gcompris/boards/sounds/cs/colors/orange.ogg
-share/gnome/gcompris/boards/sounds/cs/colors/pink.ogg
-share/gnome/gcompris/boards/sounds/cs/colors/purple.ogg
-share/gnome/gcompris/boards/sounds/cs/colors/red.ogg
-share/gnome/gcompris/boards/sounds/cs/colors/white.ogg
-share/gnome/gcompris/boards/sounds/cs/colors/yellow.ogg
-share/gnome/gcompris/boards/sounds/cs/geography/alaska.ogg
-share/gnome/gcompris/boards/sounds/cs/geography/albania.ogg
-share/gnome/gcompris/boards/sounds/cs/geography/argentina.ogg
-share/gnome/gcompris/boards/sounds/cs/geography/austria.ogg
-share/gnome/gcompris/boards/sounds/cs/geography/bahamas.ogg
-share/gnome/gcompris/boards/sounds/cs/geography/belarus.ogg
-share/gnome/gcompris/boards/sounds/cs/geography/belgium.ogg
-share/gnome/gcompris/boards/sounds/cs/geography/bolivia.ogg
-share/gnome/gcompris/boards/sounds/cs/geography/bosnia_herzegovina.ogg
-share/gnome/gcompris/boards/sounds/cs/geography/brazil.ogg
-share/gnome/gcompris/boards/sounds/cs/geography/bulgaria.ogg
-share/gnome/gcompris/boards/sounds/cs/geography/canada.ogg
-share/gnome/gcompris/boards/sounds/cs/geography/chile.ogg
-share/gnome/gcompris/boards/sounds/cs/geography/colombia.ogg
-share/gnome/gcompris/boards/sounds/cs/geography/costa_rica.ogg
-share/gnome/gcompris/boards/sounds/cs/geography/croatia.ogg
-share/gnome/gcompris/boards/sounds/cs/geography/cuba.ogg
-share/gnome/gcompris/boards/sounds/cs/geography/cyprus.ogg
-share/gnome/gcompris/boards/sounds/cs/geography/czech.ogg
-share/gnome/gcompris/boards/sounds/cs/geography/denmark.ogg
-share/gnome/gcompris/boards/sounds/cs/geography/dominican_republic.ogg
-share/gnome/gcompris/boards/sounds/cs/geography/ecuador.ogg
-share/gnome/gcompris/boards/sounds/cs/geography/estonia.ogg
-share/gnome/gcompris/boards/sounds/cs/geography/finland.ogg
-share/gnome/gcompris/boards/sounds/cs/geography/france.ogg
-share/gnome/gcompris/boards/sounds/cs/geography/french_guiana.ogg
-share/gnome/gcompris/boards/sounds/cs/geography/germany.ogg
-share/gnome/gcompris/boards/sounds/cs/geography/greece.ogg
-share/gnome/gcompris/boards/sounds/cs/geography/greenland.ogg
-share/gnome/gcompris/boards/sounds/cs/geography/guatemala.ogg
-share/gnome/gcompris/boards/sounds/cs/geography/guyana.ogg
-share/gnome/gcompris/boards/sounds/cs/geography/haiti.ogg
-share/gnome/gcompris/boards/sounds/cs/geography/honduras.ogg
-share/gnome/gcompris/boards/sounds/cs/geography/hungary.ogg
-share/gnome/gcompris/boards/sounds/cs/geography/iceland.ogg
-share/gnome/gcompris/boards/sounds/cs/geography/ireland.ogg
-share/gnome/gcompris/boards/sounds/cs/geography/italy.ogg
-share/gnome/gcompris/boards/sounds/cs/geography/jamaica.ogg
-share/gnome/gcompris/boards/sounds/cs/geography/latvia.ogg
-share/gnome/gcompris/boards/sounds/cs/geography/lithuania.ogg
-share/gnome/gcompris/boards/sounds/cs/geography/luxembourg.ogg
-share/gnome/gcompris/boards/sounds/cs/geography/macedonia.ogg
-share/gnome/gcompris/boards/sounds/cs/geography/mexico.ogg
-share/gnome/gcompris/boards/sounds/cs/geography/moldova.ogg
-share/gnome/gcompris/boards/sounds/cs/geography/netherland.ogg
-share/gnome/gcompris/boards/sounds/cs/geography/nicaragua.ogg
-share/gnome/gcompris/boards/sounds/cs/geography/norway.ogg
-share/gnome/gcompris/boards/sounds/cs/geography/panama.ogg
-share/gnome/gcompris/boards/sounds/cs/geography/paraguay.ogg
-share/gnome/gcompris/boards/sounds/cs/geography/peru.ogg
-share/gnome/gcompris/boards/sounds/cs/geography/poland.ogg
-share/gnome/gcompris/boards/sounds/cs/geography/portugal.ogg
-share/gnome/gcompris/boards/sounds/cs/geography/romania.ogg
-share/gnome/gcompris/boards/sounds/cs/geography/russia.ogg
-share/gnome/gcompris/boards/sounds/cs/geography/salvador.ogg
-share/gnome/gcompris/boards/sounds/cs/geography/serbia_montenegro.ogg
-share/gnome/gcompris/boards/sounds/cs/geography/slovakia.ogg
-share/gnome/gcompris/boards/sounds/cs/geography/slovenia.ogg
-share/gnome/gcompris/boards/sounds/cs/geography/spain.ogg
-share/gnome/gcompris/boards/sounds/cs/geography/suriname.ogg
-share/gnome/gcompris/boards/sounds/cs/geography/sweden.ogg
-share/gnome/gcompris/boards/sounds/cs/geography/switz.ogg
-share/gnome/gcompris/boards/sounds/cs/geography/turkey.ogg
-share/gnome/gcompris/boards/sounds/cs/geography/ukraine.ogg
-share/gnome/gcompris/boards/sounds/cs/geography/united_kingdom.ogg
-share/gnome/gcompris/boards/sounds/cs/geography/uruguay.ogg
-share/gnome/gcompris/boards/sounds/cs/geography/usa.ogg
-share/gnome/gcompris/boards/sounds/cs/geography/venezuela.ogg
-share/gnome/gcompris/boards/sounds/cs/misc/awesome.ogg
-share/gnome/gcompris/boards/sounds/cs/misc/back.ogg
-share/gnome/gcompris/boards/sounds/cs/misc/by.ogg
-share/gnome/gcompris/boards/sounds/cs/misc/check_answer.ogg
-share/gnome/gcompris/boards/sounds/cs/misc/click_on_letter.ogg
-share/gnome/gcompris/boards/sounds/cs/misc/congratulation.ogg
-share/gnome/gcompris/boards/sounds/cs/misc/equal.ogg
-share/gnome/gcompris/boards/sounds/cs/misc/fantastic.ogg
-share/gnome/gcompris/boards/sounds/cs/misc/good.ogg
-share/gnome/gcompris/boards/sounds/cs/misc/great.ogg
-share/gnome/gcompris/boards/sounds/cs/misc/help.ogg
-share/gnome/gcompris/boards/sounds/cs/misc/level.ogg
-share/gnome/gcompris/boards/sounds/cs/misc/minus.ogg
-share/gnome/gcompris/boards/sounds/cs/misc/ok.ogg
-share/gnome/gcompris/boards/sounds/cs/misc/perfect.ogg
-share/gnome/gcompris/boards/sounds/cs/misc/plus.ogg
-share/gnome/gcompris/boards/sounds/cs/misc/quit.ogg
-share/gnome/gcompris/boards/sounds/cs/misc/super.ogg
-share/gnome/gcompris/boards/sounds/cs/misc/waytogo.ogg
-share/gnome/gcompris/boards/sounds/cs/misc/welcome.ogg
-share/gnome/gcompris/boards/sounds/da/alphabet/10.ogg
-share/gnome/gcompris/boards/sounds/da/alphabet/README
-share/gnome/gcompris/boards/sounds/da/alphabet/U0031.ogg
-share/gnome/gcompris/boards/sounds/da/alphabet/U0032.ogg
-share/gnome/gcompris/boards/sounds/da/alphabet/U0033.ogg
-share/gnome/gcompris/boards/sounds/da/alphabet/U0034.ogg
-share/gnome/gcompris/boards/sounds/da/alphabet/U0035.ogg
-share/gnome/gcompris/boards/sounds/da/alphabet/U0036.ogg
-share/gnome/gcompris/boards/sounds/da/alphabet/U0037.ogg
-share/gnome/gcompris/boards/sounds/da/alphabet/U0038.ogg
-share/gnome/gcompris/boards/sounds/da/alphabet/U0039.ogg
-share/gnome/gcompris/boards/sounds/da/alphabet/U0061.ogg
-share/gnome/gcompris/boards/sounds/da/alphabet/U0062.ogg
-share/gnome/gcompris/boards/sounds/da/alphabet/U0063.ogg
-share/gnome/gcompris/boards/sounds/da/alphabet/U0064.ogg
-share/gnome/gcompris/boards/sounds/da/alphabet/U0065.ogg
-share/gnome/gcompris/boards/sounds/da/alphabet/U0066.ogg
-share/gnome/gcompris/boards/sounds/da/alphabet/U0067.ogg
-share/gnome/gcompris/boards/sounds/da/alphabet/U0068.ogg
-share/gnome/gcompris/boards/sounds/da/alphabet/U0069.ogg
-share/gnome/gcompris/boards/sounds/da/alphabet/U006A.ogg
-share/gnome/gcompris/boards/sounds/da/alphabet/U006B.ogg
-share/gnome/gcompris/boards/sounds/da/alphabet/U006C.ogg
-share/gnome/gcompris/boards/sounds/da/alphabet/U006D.ogg
-share/gnome/gcompris/boards/sounds/da/alphabet/U006E.ogg
-share/gnome/gcompris/boards/sounds/da/alphabet/U006F.ogg
-share/gnome/gcompris/boards/sounds/da/alphabet/U0070.ogg
-share/gnome/gcompris/boards/sounds/da/alphabet/U0071.ogg
-share/gnome/gcompris/boards/sounds/da/alphabet/U0072.ogg
-share/gnome/gcompris/boards/sounds/da/alphabet/U0073.ogg
-share/gnome/gcompris/boards/sounds/da/alphabet/U0074.ogg
-share/gnome/gcompris/boards/sounds/da/alphabet/U0075.ogg
-share/gnome/gcompris/boards/sounds/da/alphabet/U0076.ogg
-share/gnome/gcompris/boards/sounds/da/alphabet/U0077.ogg
-share/gnome/gcompris/boards/sounds/da/alphabet/U0078.ogg
-share/gnome/gcompris/boards/sounds/da/alphabet/U0079.ogg
-share/gnome/gcompris/boards/sounds/da/alphabet/U007A.ogg
-share/gnome/gcompris/boards/sounds/da/alphabet/U00E5.ogg
-share/gnome/gcompris/boards/sounds/da/alphabet/U00E6.ogg
-share/gnome/gcompris/boards/sounds/da/alphabet/U00F8.ogg
-share/gnome/gcompris/boards/sounds/da/colors/README
-share/gnome/gcompris/boards/sounds/da/colors/black.ogg
-share/gnome/gcompris/boards/sounds/da/colors/blue.ogg
-share/gnome/gcompris/boards/sounds/da/colors/brown.ogg
-share/gnome/gcompris/boards/sounds/da/colors/green.ogg
-share/gnome/gcompris/boards/sounds/da/colors/grey.ogg
-share/gnome/gcompris/boards/sounds/da/colors/orange.ogg
-share/gnome/gcompris/boards/sounds/da/colors/pink.ogg
-share/gnome/gcompris/boards/sounds/da/colors/purple.ogg
-share/gnome/gcompris/boards/sounds/da/colors/red.ogg
-share/gnome/gcompris/boards/sounds/da/colors/white.ogg
-share/gnome/gcompris/boards/sounds/da/colors/yellow.ogg
-share/gnome/gcompris/boards/sounds/da/geography/README
-share/gnome/gcompris/boards/sounds/da/geography/alaska.ogg
-share/gnome/gcompris/boards/sounds/da/geography/albania.ogg
-share/gnome/gcompris/boards/sounds/da/geography/argentina.ogg
-share/gnome/gcompris/boards/sounds/da/geography/austria.ogg
-share/gnome/gcompris/boards/sounds/da/geography/bahamas.ogg
-share/gnome/gcompris/boards/sounds/da/geography/belarus.ogg
-share/gnome/gcompris/boards/sounds/da/geography/belgium.ogg
-share/gnome/gcompris/boards/sounds/da/geography/bolivia.ogg
-share/gnome/gcompris/boards/sounds/da/geography/bosnia_herzegovina.ogg
-share/gnome/gcompris/boards/sounds/da/geography/brazil.ogg
-share/gnome/gcompris/boards/sounds/da/geography/bulgaria.ogg
-share/gnome/gcompris/boards/sounds/da/geography/canada.ogg
-share/gnome/gcompris/boards/sounds/da/geography/chile.ogg
-share/gnome/gcompris/boards/sounds/da/geography/colombia.ogg
-share/gnome/gcompris/boards/sounds/da/geography/costa_rica.ogg
-share/gnome/gcompris/boards/sounds/da/geography/croatia.ogg
-share/gnome/gcompris/boards/sounds/da/geography/cuba.ogg
-share/gnome/gcompris/boards/sounds/da/geography/cyprus.ogg
-share/gnome/gcompris/boards/sounds/da/geography/czech.ogg
-share/gnome/gcompris/boards/sounds/da/geography/denmark.ogg
-share/gnome/gcompris/boards/sounds/da/geography/dominican_republic.ogg
-share/gnome/gcompris/boards/sounds/da/geography/ecuador.ogg
-share/gnome/gcompris/boards/sounds/da/geography/estonia.ogg
-share/gnome/gcompris/boards/sounds/da/geography/finland.ogg
-share/gnome/gcompris/boards/sounds/da/geography/france.ogg
-share/gnome/gcompris/boards/sounds/da/geography/french_guiana.ogg
-share/gnome/gcompris/boards/sounds/da/geography/germany.ogg
-share/gnome/gcompris/boards/sounds/da/geography/greece.ogg
-share/gnome/gcompris/boards/sounds/da/geography/greenland.ogg
-share/gnome/gcompris/boards/sounds/da/geography/guatemala.ogg
-share/gnome/gcompris/boards/sounds/da/geography/guyana.ogg
-share/gnome/gcompris/boards/sounds/da/geography/haiti.ogg
-share/gnome/gcompris/boards/sounds/da/geography/honduras.ogg
-share/gnome/gcompris/boards/sounds/da/geography/hungary.ogg
-share/gnome/gcompris/boards/sounds/da/geography/iceland.ogg
-share/gnome/gcompris/boards/sounds/da/geography/ireland.ogg
-share/gnome/gcompris/boards/sounds/da/geography/italy.ogg
-share/gnome/gcompris/boards/sounds/da/geography/jamaica.ogg
-share/gnome/gcompris/boards/sounds/da/geography/latvia.ogg
-share/gnome/gcompris/boards/sounds/da/geography/lithuania.ogg
-share/gnome/gcompris/boards/sounds/da/geography/luxembourg.ogg
-share/gnome/gcompris/boards/sounds/da/geography/macedonia.ogg
-share/gnome/gcompris/boards/sounds/da/geography/mexico.ogg
-share/gnome/gcompris/boards/sounds/da/geography/moldova.ogg
-share/gnome/gcompris/boards/sounds/da/geography/netherland.ogg
-share/gnome/gcompris/boards/sounds/da/geography/nicaragua.ogg
-share/gnome/gcompris/boards/sounds/da/geography/norway.ogg
-share/gnome/gcompris/boards/sounds/da/geography/panama.ogg
-share/gnome/gcompris/boards/sounds/da/geography/paraguay.ogg
-share/gnome/gcompris/boards/sounds/da/geography/peru.ogg
-share/gnome/gcompris/boards/sounds/da/geography/poland.ogg
-share/gnome/gcompris/boards/sounds/da/geography/portugal.ogg
-share/gnome/gcompris/boards/sounds/da/geography/romania.ogg
-share/gnome/gcompris/boards/sounds/da/geography/russia.ogg
-share/gnome/gcompris/boards/sounds/da/geography/salvador.ogg
-share/gnome/gcompris/boards/sounds/da/geography/serbia_montenegro.ogg
-share/gnome/gcompris/boards/sounds/da/geography/slovakia.ogg
-share/gnome/gcompris/boards/sounds/da/geography/slovenia.ogg
-share/gnome/gcompris/boards/sounds/da/geography/spain.ogg
-share/gnome/gcompris/boards/sounds/da/geography/suriname.ogg
-share/gnome/gcompris/boards/sounds/da/geography/sweden.ogg
-share/gnome/gcompris/boards/sounds/da/geography/switz.ogg
-share/gnome/gcompris/boards/sounds/da/geography/turkey.ogg
-share/gnome/gcompris/boards/sounds/da/geography/ukraine.ogg
-share/gnome/gcompris/boards/sounds/da/geography/united_kingdom.ogg
-share/gnome/gcompris/boards/sounds/da/geography/uruguay.ogg
-share/gnome/gcompris/boards/sounds/da/geography/usa.ogg
-share/gnome/gcompris/boards/sounds/da/geography/venezuela.ogg
-share/gnome/gcompris/boards/sounds/da/misc/README
-share/gnome/gcompris/boards/sounds/da/misc/awesome.ogg
-share/gnome/gcompris/boards/sounds/da/misc/back.ogg
-share/gnome/gcompris/boards/sounds/da/misc/by.ogg
-share/gnome/gcompris/boards/sounds/da/misc/click_on_letter.ogg
-share/gnome/gcompris/boards/sounds/da/misc/congratulation.ogg
-share/gnome/gcompris/boards/sounds/da/misc/equal.ogg
-share/gnome/gcompris/boards/sounds/da/misc/fantastic.ogg
-share/gnome/gcompris/boards/sounds/da/misc/good.ogg
-share/gnome/gcompris/boards/sounds/da/misc/great.ogg
-share/gnome/gcompris/boards/sounds/da/misc/help.ogg
-share/gnome/gcompris/boards/sounds/da/misc/level.ogg
-share/gnome/gcompris/boards/sounds/da/misc/minus.ogg
-share/gnome/gcompris/boards/sounds/da/misc/ok.ogg
-share/gnome/gcompris/boards/sounds/da/misc/outof.ogg
-share/gnome/gcompris/boards/sounds/da/misc/perfect.ogg
-share/gnome/gcompris/boards/sounds/da/misc/plus.ogg
-share/gnome/gcompris/boards/sounds/da/misc/quit.ogg
-share/gnome/gcompris/boards/sounds/da/misc/super.ogg
-share/gnome/gcompris/boards/sounds/da/misc/waytogo.ogg
-share/gnome/gcompris/boards/sounds/da/misc/welcome.ogg
-share/gnome/gcompris/boards/sounds/darken.wav
-share/gnome/gcompris/boards/sounds/de/alphabet/10.ogg
-share/gnome/gcompris/boards/sounds/de/alphabet/README
-share/gnome/gcompris/boards/sounds/de/alphabet/U0030.ogg
-share/gnome/gcompris/boards/sounds/de/alphabet/U0031.ogg
-share/gnome/gcompris/boards/sounds/de/alphabet/U0032.ogg
-share/gnome/gcompris/boards/sounds/de/alphabet/U0033.ogg
-share/gnome/gcompris/boards/sounds/de/alphabet/U0034.ogg
-share/gnome/gcompris/boards/sounds/de/alphabet/U0035.ogg
-share/gnome/gcompris/boards/sounds/de/alphabet/U0036.ogg
-share/gnome/gcompris/boards/sounds/de/alphabet/U0037.ogg
-share/gnome/gcompris/boards/sounds/de/alphabet/U0038.ogg
-share/gnome/gcompris/boards/sounds/de/alphabet/U0039.ogg
-share/gnome/gcompris/boards/sounds/de/alphabet/U0061.ogg
-share/gnome/gcompris/boards/sounds/de/alphabet/U0062.ogg
-share/gnome/gcompris/boards/sounds/de/alphabet/U0063.ogg
-share/gnome/gcompris/boards/sounds/de/alphabet/U0064.ogg
-share/gnome/gcompris/boards/sounds/de/alphabet/U0065.ogg
-share/gnome/gcompris/boards/sounds/de/alphabet/U0066.ogg
-share/gnome/gcompris/boards/sounds/de/alphabet/U0067.ogg
-share/gnome/gcompris/boards/sounds/de/alphabet/U0068.ogg
-share/gnome/gcompris/boards/sounds/de/alphabet/U0069.ogg
-share/gnome/gcompris/boards/sounds/de/alphabet/U006A.ogg
-share/gnome/gcompris/boards/sounds/de/alphabet/U006B.ogg
-share/gnome/gcompris/boards/sounds/de/alphabet/U006C.ogg
-share/gnome/gcompris/boards/sounds/de/alphabet/U006D.ogg
-share/gnome/gcompris/boards/sounds/de/alphabet/U006E.ogg
-share/gnome/gcompris/boards/sounds/de/alphabet/U006F.ogg
-share/gnome/gcompris/boards/sounds/de/alphabet/U0070.ogg
-share/gnome/gcompris/boards/sounds/de/alphabet/U0071.ogg
-share/gnome/gcompris/boards/sounds/de/alphabet/U0072.ogg
-share/gnome/gcompris/boards/sounds/de/alphabet/U0073.ogg
-share/gnome/gcompris/boards/sounds/de/alphabet/U0074.ogg
-share/gnome/gcompris/boards/sounds/de/alphabet/U0075.ogg
-share/gnome/gcompris/boards/sounds/de/alphabet/U0076.ogg
-share/gnome/gcompris/boards/sounds/de/alphabet/U0077.ogg
-share/gnome/gcompris/boards/sounds/de/alphabet/U0078.ogg
-share/gnome/gcompris/boards/sounds/de/alphabet/U0079.ogg
-share/gnome/gcompris/boards/sounds/de/alphabet/U007A.ogg
-share/gnome/gcompris/boards/sounds/de/colors/README
-share/gnome/gcompris/boards/sounds/de/colors/black.ogg
-share/gnome/gcompris/boards/sounds/de/colors/blue.ogg
-share/gnome/gcompris/boards/sounds/de/colors/brown.ogg
-share/gnome/gcompris/boards/sounds/de/colors/green.ogg
-share/gnome/gcompris/boards/sounds/de/colors/grey.ogg
-share/gnome/gcompris/boards/sounds/de/colors/orange.ogg
-share/gnome/gcompris/boards/sounds/de/colors/purple.ogg
-share/gnome/gcompris/boards/sounds/de/colors/red.ogg
-share/gnome/gcompris/boards/sounds/de/colors/white.ogg
-share/gnome/gcompris/boards/sounds/de/colors/yellow.ogg
-share/gnome/gcompris/boards/sounds/de/misc/README
-share/gnome/gcompris/boards/sounds/de/misc/back.ogg
-share/gnome/gcompris/boards/sounds/de/misc/by.ogg
-share/gnome/gcompris/boards/sounds/de/misc/click_on_letter.ogg
-share/gnome/gcompris/boards/sounds/de/misc/congratulation.ogg
-share/gnome/gcompris/boards/sounds/de/misc/equal.ogg
-share/gnome/gcompris/boards/sounds/de/misc/good.ogg
-share/gnome/gcompris/boards/sounds/de/misc/great.ogg
-share/gnome/gcompris/boards/sounds/de/misc/help.ogg
-share/gnome/gcompris/boards/sounds/de/misc/level.ogg
-share/gnome/gcompris/boards/sounds/de/misc/minus.ogg
-share/gnome/gcompris/boards/sounds/de/misc/ok.ogg
-share/gnome/gcompris/boards/sounds/de/misc/outof.ogg
-share/gnome/gcompris/boards/sounds/de/misc/plus.ogg
-share/gnome/gcompris/boards/sounds/de/misc/quit.ogg
-share/gnome/gcompris/boards/sounds/de/misc/super.ogg
-share/gnome/gcompris/boards/sounds/de/misc/welcome.ogg
-share/gnome/gcompris/boards/sounds/drip.wav
-share/gnome/gcompris/boards/sounds/eat.wav
-share/gnome/gcompris/boards/sounds/el/alphabet/10.ogg
-share/gnome/gcompris/boards/sounds/el/alphabet/README
-share/gnome/gcompris/boards/sounds/el/alphabet/U0030.ogg
-share/gnome/gcompris/boards/sounds/el/alphabet/U0031.ogg
-share/gnome/gcompris/boards/sounds/el/alphabet/U0032.ogg
-share/gnome/gcompris/boards/sounds/el/alphabet/U0033.ogg
-share/gnome/gcompris/boards/sounds/el/alphabet/U0034.ogg
-share/gnome/gcompris/boards/sounds/el/alphabet/U0035.ogg
-share/gnome/gcompris/boards/sounds/el/alphabet/U0036.ogg
-share/gnome/gcompris/boards/sounds/el/alphabet/U0037.ogg
-share/gnome/gcompris/boards/sounds/el/alphabet/U0038.ogg
-share/gnome/gcompris/boards/sounds/el/alphabet/U0039.ogg
-share/gnome/gcompris/boards/sounds/el/alphabet/U0391.ogg
-share/gnome/gcompris/boards/sounds/el/alphabet/U0392.ogg
-share/gnome/gcompris/boards/sounds/el/alphabet/U0393.ogg
-share/gnome/gcompris/boards/sounds/el/alphabet/U0394.ogg
-share/gnome/gcompris/boards/sounds/el/alphabet/U0395.ogg
-share/gnome/gcompris/boards/sounds/el/alphabet/U0396.ogg
-share/gnome/gcompris/boards/sounds/el/alphabet/U0397.ogg
-share/gnome/gcompris/boards/sounds/el/alphabet/U0398.ogg
-share/gnome/gcompris/boards/sounds/el/alphabet/U0399.ogg
-share/gnome/gcompris/boards/sounds/el/alphabet/U039A.ogg
-share/gnome/gcompris/boards/sounds/el/alphabet/U039B.ogg
-share/gnome/gcompris/boards/sounds/el/alphabet/U039C.ogg
-share/gnome/gcompris/boards/sounds/el/alphabet/U039D.ogg
-share/gnome/gcompris/boards/sounds/el/alphabet/U039E.ogg
-share/gnome/gcompris/boards/sounds/el/alphabet/U039F.ogg
-share/gnome/gcompris/boards/sounds/el/alphabet/U03A0.ogg
-share/gnome/gcompris/boards/sounds/el/alphabet/U03A1.ogg
-share/gnome/gcompris/boards/sounds/el/alphabet/U03A3.ogg
-share/gnome/gcompris/boards/sounds/el/alphabet/U03A4.ogg
-share/gnome/gcompris/boards/sounds/el/alphabet/U03A5.ogg
-share/gnome/gcompris/boards/sounds/el/alphabet/U03A6.ogg
-share/gnome/gcompris/boards/sounds/el/alphabet/U03A7.ogg
-share/gnome/gcompris/boards/sounds/el/alphabet/U03A8.ogg
-share/gnome/gcompris/boards/sounds/el/alphabet/U03A9.ogg
-share/gnome/gcompris/boards/sounds/el/alphabet/U03B1.ogg
-share/gnome/gcompris/boards/sounds/el/alphabet/U03B2.ogg
-share/gnome/gcompris/boards/sounds/el/alphabet/U03B3.ogg
-share/gnome/gcompris/boards/sounds/el/alphabet/U03B4.ogg
-share/gnome/gcompris/boards/sounds/el/alphabet/U03B5.ogg
-share/gnome/gcompris/boards/sounds/el/alphabet/U03B6.ogg
-share/gnome/gcompris/boards/sounds/el/alphabet/U03B7.ogg
-share/gnome/gcompris/boards/sounds/el/alphabet/U03B8.ogg
-share/gnome/gcompris/boards/sounds/el/alphabet/U03B9.ogg
-share/gnome/gcompris/boards/sounds/el/alphabet/U03BA.ogg
-share/gnome/gcompris/boards/sounds/el/alphabet/U03BB.ogg
-share/gnome/gcompris/boards/sounds/el/alphabet/U03BC.ogg
-share/gnome/gcompris/boards/sounds/el/alphabet/U03BD.ogg
-share/gnome/gcompris/boards/sounds/el/alphabet/U03BE.ogg
-share/gnome/gcompris/boards/sounds/el/alphabet/U03BF.ogg
-share/gnome/gcompris/boards/sounds/el/alphabet/U03C0.ogg
-share/gnome/gcompris/boards/sounds/el/alphabet/U03C1.ogg
-share/gnome/gcompris/boards/sounds/el/alphabet/U03C3.ogg
-share/gnome/gcompris/boards/sounds/el/alphabet/U03C4.ogg
-share/gnome/gcompris/boards/sounds/el/alphabet/U03C5.ogg
-share/gnome/gcompris/boards/sounds/el/alphabet/U03C6.ogg
-share/gnome/gcompris/boards/sounds/el/alphabet/U03C7.ogg
-share/gnome/gcompris/boards/sounds/el/alphabet/U03C8.ogg
-share/gnome/gcompris/boards/sounds/el/alphabet/U03C9.ogg
-share/gnome/gcompris/boards/sounds/el/colors/black.ogg
-share/gnome/gcompris/boards/sounds/el/colors/blue.ogg
-share/gnome/gcompris/boards/sounds/el/colors/brown.ogg
-share/gnome/gcompris/boards/sounds/el/colors/green.ogg
-share/gnome/gcompris/boards/sounds/el/colors/grey.ogg
-share/gnome/gcompris/boards/sounds/el/colors/orange.ogg
-share/gnome/gcompris/boards/sounds/el/colors/pink.ogg
-share/gnome/gcompris/boards/sounds/el/colors/purple.ogg
-share/gnome/gcompris/boards/sounds/el/colors/red.ogg
-share/gnome/gcompris/boards/sounds/el/colors/white.ogg
-share/gnome/gcompris/boards/sounds/el/colors/yellow.ogg
-share/gnome/gcompris/boards/sounds/el/geography/africa.ogg
-share/gnome/gcompris/boards/sounds/el/geography/alaska.ogg
-share/gnome/gcompris/boards/sounds/el/geography/albania.ogg
-share/gnome/gcompris/boards/sounds/el/geography/algeria.ogg
-share/gnome/gcompris/boards/sounds/el/geography/america.ogg
-share/gnome/gcompris/boards/sounds/el/geography/angola.ogg
-share/gnome/gcompris/boards/sounds/el/geography/antartica.ogg
-share/gnome/gcompris/boards/sounds/el/geography/argentina.ogg
-share/gnome/gcompris/boards/sounds/el/geography/asia.ogg
-share/gnome/gcompris/boards/sounds/el/geography/austria.ogg
-share/gnome/gcompris/boards/sounds/el/geography/bahamas.ogg
-share/gnome/gcompris/boards/sounds/el/geography/basse_normandie.ogg
-share/gnome/gcompris/boards/sounds/el/geography/belarus.ogg
-share/gnome/gcompris/boards/sounds/el/geography/belgium.ogg
-share/gnome/gcompris/boards/sounds/el/geography/benin.ogg
-share/gnome/gcompris/boards/sounds/el/geography/bolivia.ogg
-share/gnome/gcompris/boards/sounds/el/geography/bosnia_herzegovina.ogg
-share/gnome/gcompris/boards/sounds/el/geography/botswana.ogg
-share/gnome/gcompris/boards/sounds/el/geography/brazil.ogg
-share/gnome/gcompris/boards/sounds/el/geography/bulgaria.ogg
-share/gnome/gcompris/boards/sounds/el/geography/burkina.ogg
-share/gnome/gcompris/boards/sounds/el/geography/burundi.ogg
-share/gnome/gcompris/boards/sounds/el/geography/cameroon.ogg
-share/gnome/gcompris/boards/sounds/el/geography/canada.ogg
-share/gnome/gcompris/boards/sounds/el/geography/central_african_republic.ogg
-share/gnome/gcompris/boards/sounds/el/geography/chad.ogg
-share/gnome/gcompris/boards/sounds/el/geography/chile.ogg
-share/gnome/gcompris/boards/sounds/el/geography/colombia.ogg
-share/gnome/gcompris/boards/sounds/el/geography/congo.ogg
-share/gnome/gcompris/boards/sounds/el/geography/costa_rica.ogg
-share/gnome/gcompris/boards/sounds/el/geography/croatia.ogg
-share/gnome/gcompris/boards/sounds/el/geography/cuba.ogg
-share/gnome/gcompris/boards/sounds/el/geography/cyprus.ogg
-share/gnome/gcompris/boards/sounds/el/geography/czech.ogg
-share/gnome/gcompris/boards/sounds/el/geography/denmark.ogg
-share/gnome/gcompris/boards/sounds/el/geography/dijibouti.ogg
-share/gnome/gcompris/boards/sounds/el/geography/djibouti.ogg
-share/gnome/gcompris/boards/sounds/el/geography/dominican_republic.ogg
-share/gnome/gcompris/boards/sounds/el/geography/ecuador.ogg
-share/gnome/gcompris/boards/sounds/el/geography/egypt.ogg
-share/gnome/gcompris/boards/sounds/el/geography/equatorial_guinea.ogg
-share/gnome/gcompris/boards/sounds/el/geography/eritrea.ogg
-share/gnome/gcompris/boards/sounds/el/geography/estonia.ogg
-share/gnome/gcompris/boards/sounds/el/geography/ethiopia.ogg
-share/gnome/gcompris/boards/sounds/el/geography/europe.ogg
-share/gnome/gcompris/boards/sounds/el/geography/finland.ogg
-share/gnome/gcompris/boards/sounds/el/geography/france.ogg
-share/gnome/gcompris/boards/sounds/el/geography/french_guiana.ogg
-share/gnome/gcompris/boards/sounds/el/geography/gabon.ogg
-share/gnome/gcompris/boards/sounds/el/geography/gambia.ogg
-share/gnome/gcompris/boards/sounds/el/geography/germany.ogg
-share/gnome/gcompris/boards/sounds/el/geography/ghana.ogg
-share/gnome/gcompris/boards/sounds/el/geography/greece.ogg
-share/gnome/gcompris/boards/sounds/el/geography/greenland.ogg
-share/gnome/gcompris/boards/sounds/el/geography/guatemala.ogg
-share/gnome/gcompris/boards/sounds/el/geography/guinea.ogg
-share/gnome/gcompris/boards/sounds/el/geography/guinea_bissau.ogg
-share/gnome/gcompris/boards/sounds/el/geography/guyana.ogg
-share/gnome/gcompris/boards/sounds/el/geography/haiti.ogg
-share/gnome/gcompris/boards/sounds/el/geography/honduras.ogg
-share/gnome/gcompris/boards/sounds/el/geography/hungary.ogg
-share/gnome/gcompris/boards/sounds/el/geography/iceland.ogg
-share/gnome/gcompris/boards/sounds/el/geography/ireland.ogg
-share/gnome/gcompris/boards/sounds/el/geography/italy.ogg
-share/gnome/gcompris/boards/sounds/el/geography/ivory_coast.ogg
-share/gnome/gcompris/boards/sounds/el/geography/jamaica.ogg
-share/gnome/gcompris/boards/sounds/el/geography/kenya.ogg
-share/gnome/gcompris/boards/sounds/el/geography/latvia.ogg
-share/gnome/gcompris/boards/sounds/el/geography/lesotho.ogg
-share/gnome/gcompris/boards/sounds/el/geography/liberia.ogg
-share/gnome/gcompris/boards/sounds/el/geography/libya.ogg
-share/gnome/gcompris/boards/sounds/el/geography/lithuania.ogg
-share/gnome/gcompris/boards/sounds/el/geography/luxembourg.ogg
-share/gnome/gcompris/boards/sounds/el/geography/macedonia.ogg
-share/gnome/gcompris/boards/sounds/el/geography/madagascar.ogg
-share/gnome/gcompris/boards/sounds/el/geography/malawi.ogg
-share/gnome/gcompris/boards/sounds/el/geography/mali.ogg
-share/gnome/gcompris/boards/sounds/el/geography/mauritania.ogg
-share/gnome/gcompris/boards/sounds/el/geography/mexico.ogg
-share/gnome/gcompris/boards/sounds/el/geography/moldavia.ogg
-share/gnome/gcompris/boards/sounds/el/geography/moldova.ogg
-share/gnome/gcompris/boards/sounds/el/geography/moroco.ogg
-share/gnome/gcompris/boards/sounds/el/geography/mozambique.ogg
-share/gnome/gcompris/boards/sounds/el/geography/nambia.ogg
-share/gnome/gcompris/boards/sounds/el/geography/namibia.ogg
-share/gnome/gcompris/boards/sounds/el/geography/netherland.ogg
-share/gnome/gcompris/boards/sounds/el/geography/nicaragua.ogg
-share/gnome/gcompris/boards/sounds/el/geography/niger.ogg
-share/gnome/gcompris/boards/sounds/el/geography/nigeria.ogg
-share/gnome/gcompris/boards/sounds/el/geography/north_america.ogg
-share/gnome/gcompris/boards/sounds/el/geography/norway.ogg
-share/gnome/gcompris/boards/sounds/el/geography/oceania.ogg
-share/gnome/gcompris/boards/sounds/el/geography/panama.ogg
-share/gnome/gcompris/boards/sounds/el/geography/paraguay.ogg
-share/gnome/gcompris/boards/sounds/el/geography/peru.ogg
-share/gnome/gcompris/boards/sounds/el/geography/poland.ogg
-share/gnome/gcompris/boards/sounds/el/geography/portugal.ogg
-share/gnome/gcompris/boards/sounds/el/geography/republic_of_congo.ogg
-share/gnome/gcompris/boards/sounds/el/geography/romania.ogg
-share/gnome/gcompris/boards/sounds/el/geography/russia.ogg
-share/gnome/gcompris/boards/sounds/el/geography/rwanda.ogg
-share/gnome/gcompris/boards/sounds/el/geography/salvador.ogg
-share/gnome/gcompris/boards/sounds/el/geography/senegal.ogg
-share/gnome/gcompris/boards/sounds/el/geography/serbia_montenegro.ogg
-share/gnome/gcompris/boards/sounds/el/geography/sierra_leone.ogg
-share/gnome/gcompris/boards/sounds/el/geography/slovakia.ogg
-share/gnome/gcompris/boards/sounds/el/geography/slovenia.ogg
-share/gnome/gcompris/boards/sounds/el/geography/somalia.ogg
-share/gnome/gcompris/boards/sounds/el/geography/soudan.ogg
-share/gnome/gcompris/boards/sounds/el/geography/south_africa.ogg
-share/gnome/gcompris/boards/sounds/el/geography/south_america.ogg
-share/gnome/gcompris/boards/sounds/el/geography/spain.ogg
-share/gnome/gcompris/boards/sounds/el/geography/suriname.ogg
-share/gnome/gcompris/boards/sounds/el/geography/swaziland.ogg
-share/gnome/gcompris/boards/sounds/el/geography/sweden.ogg
-share/gnome/gcompris/boards/sounds/el/geography/switz.ogg
-share/gnome/gcompris/boards/sounds/el/geography/tanzania.ogg
-share/gnome/gcompris/boards/sounds/el/geography/togo.ogg
-share/gnome/gcompris/boards/sounds/el/geography/tunisia.ogg
-share/gnome/gcompris/boards/sounds/el/geography/turkey.ogg
-share/gnome/gcompris/boards/sounds/el/geography/uganda.ogg
-share/gnome/gcompris/boards/sounds/el/geography/ukraine.ogg
-share/gnome/gcompris/boards/sounds/el/geography/united_kingdom.ogg
-share/gnome/gcompris/boards/sounds/el/geography/uruguay.ogg
-share/gnome/gcompris/boards/sounds/el/geography/usa.ogg
-share/gnome/gcompris/boards/sounds/el/geography/venezuela.ogg
-share/gnome/gcompris/boards/sounds/el/geography/zambia.ogg
-share/gnome/gcompris/boards/sounds/el/geography/zimbabwe.ogg
-share/gnome/gcompris/boards/sounds/el/misc/about.ogg
-share/gnome/gcompris/boards/sounds/el/misc/awesome.ogg
-share/gnome/gcompris/boards/sounds/el/misc/back.ogg
-share/gnome/gcompris/boards/sounds/el/misc/by.ogg
-share/gnome/gcompris/boards/sounds/el/misc/check_answer.ogg
-share/gnome/gcompris/boards/sounds/el/misc/click_on_letter.ogg
-share/gnome/gcompris/boards/sounds/el/misc/configuration.ogg
-share/gnome/gcompris/boards/sounds/el/misc/congratulations.ogg
-share/gnome/gcompris/boards/sounds/el/misc/equal.ogg
-share/gnome/gcompris/boards/sounds/el/misc/fantastic.ogg
-share/gnome/gcompris/boards/sounds/el/misc/good.ogg
-share/gnome/gcompris/boards/sounds/el/misc/great.ogg
-share/gnome/gcompris/boards/sounds/el/misc/help.ogg
-share/gnome/gcompris/boards/sounds/el/misc/level.ogg
-share/gnome/gcompris/boards/sounds/el/misc/minus.ogg
-share/gnome/gcompris/boards/sounds/el/misc/ok.ogg
-share/gnome/gcompris/boards/sounds/el/misc/outof.ogg
-share/gnome/gcompris/boards/sounds/el/misc/perfect.ogg
-share/gnome/gcompris/boards/sounds/el/misc/plus.ogg
-share/gnome/gcompris/boards/sounds/el/misc/quit.ogg
-share/gnome/gcompris/boards/sounds/el/misc/super.ogg
-share/gnome/gcompris/boards/sounds/el/misc/waytogo.ogg
-share/gnome/gcompris/boards/sounds/el/misc/welcome.ogg
-share/gnome/gcompris/boards/sounds/en/alphabet/10.ogg
-share/gnome/gcompris/boards/sounds/en/alphabet/README
-share/gnome/gcompris/boards/sounds/en/alphabet/U0030.ogg
-share/gnome/gcompris/boards/sounds/en/alphabet/U0031.ogg
-share/gnome/gcompris/boards/sounds/en/alphabet/U0032.ogg
-share/gnome/gcompris/boards/sounds/en/alphabet/U0033.ogg
-share/gnome/gcompris/boards/sounds/en/alphabet/U0034.ogg
-share/gnome/gcompris/boards/sounds/en/alphabet/U0035.ogg
-share/gnome/gcompris/boards/sounds/en/alphabet/U0036.ogg
-share/gnome/gcompris/boards/sounds/en/alphabet/U0037.ogg
-share/gnome/gcompris/boards/sounds/en/alphabet/U0038.ogg
-share/gnome/gcompris/boards/sounds/en/alphabet/U0039.ogg
-share/gnome/gcompris/boards/sounds/en/alphabet/U0061.ogg
-share/gnome/gcompris/boards/sounds/en/alphabet/U0062.ogg
-share/gnome/gcompris/boards/sounds/en/alphabet/U0063.ogg
-share/gnome/gcompris/boards/sounds/en/alphabet/U0064.ogg
-share/gnome/gcompris/boards/sounds/en/alphabet/U0065.ogg
-share/gnome/gcompris/boards/sounds/en/alphabet/U0066.ogg
-share/gnome/gcompris/boards/sounds/en/alphabet/U0067.ogg
-share/gnome/gcompris/boards/sounds/en/alphabet/U0068.ogg
-share/gnome/gcompris/boards/sounds/en/alphabet/U0069.ogg
-share/gnome/gcompris/boards/sounds/en/alphabet/U006A.ogg
-share/gnome/gcompris/boards/sounds/en/alphabet/U006B.ogg
-share/gnome/gcompris/boards/sounds/en/alphabet/U006C.ogg
-share/gnome/gcompris/boards/sounds/en/alphabet/U006D.ogg
-share/gnome/gcompris/boards/sounds/en/alphabet/U006E.ogg
-share/gnome/gcompris/boards/sounds/en/alphabet/U006F.ogg
-share/gnome/gcompris/boards/sounds/en/alphabet/U0070.ogg
-share/gnome/gcompris/boards/sounds/en/alphabet/U0071.ogg
-share/gnome/gcompris/boards/sounds/en/alphabet/U0072.ogg
-share/gnome/gcompris/boards/sounds/en/alphabet/U0073.ogg
-share/gnome/gcompris/boards/sounds/en/alphabet/U0074.ogg
-share/gnome/gcompris/boards/sounds/en/alphabet/U0075.ogg
-share/gnome/gcompris/boards/sounds/en/alphabet/U0076.ogg
-share/gnome/gcompris/boards/sounds/en/alphabet/U0077.ogg
-share/gnome/gcompris/boards/sounds/en/alphabet/U0078.ogg
-share/gnome/gcompris/boards/sounds/en/alphabet/U0079.ogg
-share/gnome/gcompris/boards/sounds/en/alphabet/U007A.ogg
-share/gnome/gcompris/boards/sounds/en/colors/README
-share/gnome/gcompris/boards/sounds/en/colors/black.ogg
-share/gnome/gcompris/boards/sounds/en/colors/blue.ogg
-share/gnome/gcompris/boards/sounds/en/colors/brown.ogg
-share/gnome/gcompris/boards/sounds/en/colors/green.ogg
-share/gnome/gcompris/boards/sounds/en/colors/grey.ogg
-share/gnome/gcompris/boards/sounds/en/colors/orange.ogg
-share/gnome/gcompris/boards/sounds/en/colors/pink.ogg
-share/gnome/gcompris/boards/sounds/en/colors/purple.ogg
-share/gnome/gcompris/boards/sounds/en/colors/red.ogg
-share/gnome/gcompris/boards/sounds/en/colors/white.ogg
-share/gnome/gcompris/boards/sounds/en/colors/yellow.ogg
-share/gnome/gcompris/boards/sounds/en/geography/README
-share/gnome/gcompris/boards/sounds/en/geography/alaska.ogg
-share/gnome/gcompris/boards/sounds/en/geography/albania.ogg
-share/gnome/gcompris/boards/sounds/en/geography/argentina.ogg
-share/gnome/gcompris/boards/sounds/en/geography/austria.ogg
-share/gnome/gcompris/boards/sounds/en/geography/bahamas.ogg
-share/gnome/gcompris/boards/sounds/en/geography/belarus.ogg
-share/gnome/gcompris/boards/sounds/en/geography/belgium.ogg
-share/gnome/gcompris/boards/sounds/en/geography/bolivia.ogg
-share/gnome/gcompris/boards/sounds/en/geography/bosnia_herzegovina.ogg
-share/gnome/gcompris/boards/sounds/en/geography/brazil.ogg
-share/gnome/gcompris/boards/sounds/en/geography/bulgaria.ogg
-share/gnome/gcompris/boards/sounds/en/geography/canada.ogg
-share/gnome/gcompris/boards/sounds/en/geography/chile.ogg
-share/gnome/gcompris/boards/sounds/en/geography/colombia.ogg
-share/gnome/gcompris/boards/sounds/en/geography/costa_rica.ogg
-share/gnome/gcompris/boards/sounds/en/geography/croatia.ogg
-share/gnome/gcompris/boards/sounds/en/geography/cuba.ogg
-share/gnome/gcompris/boards/sounds/en/geography/cyprus.ogg
-share/gnome/gcompris/boards/sounds/en/geography/czech.ogg
-share/gnome/gcompris/boards/sounds/en/geography/denmark.ogg
-share/gnome/gcompris/boards/sounds/en/geography/dominican_republic.ogg
-share/gnome/gcompris/boards/sounds/en/geography/ecuador.ogg
-share/gnome/gcompris/boards/sounds/en/geography/estonia.ogg
-share/gnome/gcompris/boards/sounds/en/geography/france.ogg
-share/gnome/gcompris/boards/sounds/en/geography/french_guiana.ogg
-share/gnome/gcompris/boards/sounds/en/geography/germany.ogg
-share/gnome/gcompris/boards/sounds/en/geography/greece.ogg
-share/gnome/gcompris/boards/sounds/en/geography/greenland.ogg
-share/gnome/gcompris/boards/sounds/en/geography/guatemala.ogg
-share/gnome/gcompris/boards/sounds/en/geography/guyana.ogg
-share/gnome/gcompris/boards/sounds/en/geography/haiti.ogg
-share/gnome/gcompris/boards/sounds/en/geography/honduras.ogg
-share/gnome/gcompris/boards/sounds/en/geography/hungary.ogg
-share/gnome/gcompris/boards/sounds/en/geography/iceland.ogg
-share/gnome/gcompris/boards/sounds/en/geography/ireland.ogg
-share/gnome/gcompris/boards/sounds/en/geography/italy.ogg
-share/gnome/gcompris/boards/sounds/en/geography/jamaica.ogg
-share/gnome/gcompris/boards/sounds/en/geography/latvia.ogg
-share/gnome/gcompris/boards/sounds/en/geography/lithuania.ogg
-share/gnome/gcompris/boards/sounds/en/geography/luxembourg.ogg
-share/gnome/gcompris/boards/sounds/en/geography/macedonia.ogg
-share/gnome/gcompris/boards/sounds/en/geography/mexico.ogg
-share/gnome/gcompris/boards/sounds/en/geography/moldova.ogg
-share/gnome/gcompris/boards/sounds/en/geography/netherland.ogg
-share/gnome/gcompris/boards/sounds/en/geography/nicaragua.ogg
-share/gnome/gcompris/boards/sounds/en/geography/norway.ogg
-share/gnome/gcompris/boards/sounds/en/geography/panama.ogg
-share/gnome/gcompris/boards/sounds/en/geography/paraguay.ogg
-share/gnome/gcompris/boards/sounds/en/geography/peru.ogg
-share/gnome/gcompris/boards/sounds/en/geography/poland.ogg
-share/gnome/gcompris/boards/sounds/en/geography/portugal.ogg
-share/gnome/gcompris/boards/sounds/en/geography/romania.ogg
-share/gnome/gcompris/boards/sounds/en/geography/russia.ogg
-share/gnome/gcompris/boards/sounds/en/geography/salvador.ogg
-share/gnome/gcompris/boards/sounds/en/geography/serbia_montenegro.ogg
-share/gnome/gcompris/boards/sounds/en/geography/slovakia.ogg
-share/gnome/gcompris/boards/sounds/en/geography/slovenia.ogg
-share/gnome/gcompris/boards/sounds/en/geography/spain.ogg
-share/gnome/gcompris/boards/sounds/en/geography/suriname.ogg
-share/gnome/gcompris/boards/sounds/en/geography/sweden.ogg
-share/gnome/gcompris/boards/sounds/en/geography/switz.ogg
-share/gnome/gcompris/boards/sounds/en/geography/turkey.ogg
-share/gnome/gcompris/boards/sounds/en/geography/ukraine.ogg
-share/gnome/gcompris/boards/sounds/en/geography/united_kingdom.ogg
-share/gnome/gcompris/boards/sounds/en/geography/uruguay.ogg
-share/gnome/gcompris/boards/sounds/en/geography/usa.ogg
-share/gnome/gcompris/boards/sounds/en/geography/venezuela.ogg
-share/gnome/gcompris/boards/sounds/en/misc/README
-share/gnome/gcompris/boards/sounds/en/misc/awesome.ogg
-share/gnome/gcompris/boards/sounds/en/misc/back.ogg
-share/gnome/gcompris/boards/sounds/en/misc/by.ogg
-share/gnome/gcompris/boards/sounds/en/misc/check_answer.ogg
-share/gnome/gcompris/boards/sounds/en/misc/click_on_letter.ogg
-share/gnome/gcompris/boards/sounds/en/misc/congratulation.ogg
-share/gnome/gcompris/boards/sounds/en/misc/equal.ogg
-share/gnome/gcompris/boards/sounds/en/misc/fantastic.ogg
-share/gnome/gcompris/boards/sounds/en/misc/good.ogg
-share/gnome/gcompris/boards/sounds/en/misc/great.ogg
-share/gnome/gcompris/boards/sounds/en/misc/help.ogg
-share/gnome/gcompris/boards/sounds/en/misc/level.ogg
-share/gnome/gcompris/boards/sounds/en/misc/minus.ogg
-share/gnome/gcompris/boards/sounds/en/misc/ok.ogg
-share/gnome/gcompris/boards/sounds/en/misc/outof.ogg
-share/gnome/gcompris/boards/sounds/en/misc/perfect.ogg
-share/gnome/gcompris/boards/sounds/en/misc/plus.ogg
-share/gnome/gcompris/boards/sounds/en/misc/quit.ogg
-share/gnome/gcompris/boards/sounds/en/misc/super.ogg
-share/gnome/gcompris/boards/sounds/en/misc/waytogo.ogg
-share/gnome/gcompris/boards/sounds/en/misc/welcome.ogg
-share/gnome/gcompris/boards/sounds/eraser1.wav
-share/gnome/gcompris/boards/sounds/eraser2.wav
-share/gnome/gcompris/boards/sounds/es/alphabet/10.ogg
-share/gnome/gcompris/boards/sounds/es/alphabet/README
-share/gnome/gcompris/boards/sounds/es/alphabet/U0030.ogg
-share/gnome/gcompris/boards/sounds/es/alphabet/U0031.ogg
-share/gnome/gcompris/boards/sounds/es/alphabet/U0032.ogg
-share/gnome/gcompris/boards/sounds/es/alphabet/U0033.ogg
-share/gnome/gcompris/boards/sounds/es/alphabet/U0034.ogg
-share/gnome/gcompris/boards/sounds/es/alphabet/U0035.ogg
-share/gnome/gcompris/boards/sounds/es/alphabet/U0036.ogg
-share/gnome/gcompris/boards/sounds/es/alphabet/U0037.ogg
-share/gnome/gcompris/boards/sounds/es/alphabet/U0038.ogg
-share/gnome/gcompris/boards/sounds/es/alphabet/U0039.ogg
-share/gnome/gcompris/boards/sounds/es/alphabet/U0061.ogg
-share/gnome/gcompris/boards/sounds/es/alphabet/U0062.ogg
-share/gnome/gcompris/boards/sounds/es/alphabet/U0063.ogg
-share/gnome/gcompris/boards/sounds/es/alphabet/U0064.ogg
-share/gnome/gcompris/boards/sounds/es/alphabet/U0065.ogg
-share/gnome/gcompris/boards/sounds/es/alphabet/U0066.ogg
-share/gnome/gcompris/boards/sounds/es/alphabet/U0067.ogg
-share/gnome/gcompris/boards/sounds/es/alphabet/U0068.ogg
-share/gnome/gcompris/boards/sounds/es/alphabet/U0069.ogg
-share/gnome/gcompris/boards/sounds/es/alphabet/U006A.ogg
-share/gnome/gcompris/boards/sounds/es/alphabet/U006B.ogg
-share/gnome/gcompris/boards/sounds/es/alphabet/U006C.ogg
-share/gnome/gcompris/boards/sounds/es/alphabet/U006D.ogg
-share/gnome/gcompris/boards/sounds/es/alphabet/U006E.ogg
-share/gnome/gcompris/boards/sounds/es/alphabet/U006F.ogg
-share/gnome/gcompris/boards/sounds/es/alphabet/U0070.ogg
-share/gnome/gcompris/boards/sounds/es/alphabet/U0071.ogg
-share/gnome/gcompris/boards/sounds/es/alphabet/U0072.ogg
-share/gnome/gcompris/boards/sounds/es/alphabet/U0073.ogg
-share/gnome/gcompris/boards/sounds/es/alphabet/U0074.ogg
-share/gnome/gcompris/boards/sounds/es/alphabet/U0075.ogg
-share/gnome/gcompris/boards/sounds/es/alphabet/U0076.ogg
-share/gnome/gcompris/boards/sounds/es/alphabet/U0077.ogg
-share/gnome/gcompris/boards/sounds/es/alphabet/U0078.ogg
-share/gnome/gcompris/boards/sounds/es/alphabet/U0079.ogg
-share/gnome/gcompris/boards/sounds/es/alphabet/U007A.ogg
-share/gnome/gcompris/boards/sounds/es/colors/README
-share/gnome/gcompris/boards/sounds/es/colors/black.ogg
-share/gnome/gcompris/boards/sounds/es/colors/blue.ogg
-share/gnome/gcompris/boards/sounds/es/colors/brown.ogg
-share/gnome/gcompris/boards/sounds/es/colors/green.ogg
-share/gnome/gcompris/boards/sounds/es/colors/grey.ogg
-share/gnome/gcompris/boards/sounds/es/colors/orange.ogg
-share/gnome/gcompris/boards/sounds/es/colors/purple.ogg
-share/gnome/gcompris/boards/sounds/es/colors/red.ogg
-share/gnome/gcompris/boards/sounds/es/colors/white.ogg
-share/gnome/gcompris/boards/sounds/es/colors/yellow.ogg
-share/gnome/gcompris/boards/sounds/es/geography/README
-share/gnome/gcompris/boards/sounds/es/geography/alaska.ogg
-share/gnome/gcompris/boards/sounds/es/geography/albania.ogg
-share/gnome/gcompris/boards/sounds/es/geography/argentina.ogg
-share/gnome/gcompris/boards/sounds/es/geography/austria.ogg
-share/gnome/gcompris/boards/sounds/es/geography/bahamas.ogg
-share/gnome/gcompris/boards/sounds/es/geography/belarus.ogg
-share/gnome/gcompris/boards/sounds/es/geography/belgium.ogg
-share/gnome/gcompris/boards/sounds/es/geography/bolivia.ogg
-share/gnome/gcompris/boards/sounds/es/geography/bosnia_herzegovina.ogg
-share/gnome/gcompris/boards/sounds/es/geography/brazil.ogg
-share/gnome/gcompris/boards/sounds/es/geography/bulgaria.ogg
-share/gnome/gcompris/boards/sounds/es/geography/canada.ogg
-share/gnome/gcompris/boards/sounds/es/geography/chile.ogg
-share/gnome/gcompris/boards/sounds/es/geography/colombia.ogg
-share/gnome/gcompris/boards/sounds/es/geography/costa_rica.ogg
-share/gnome/gcompris/boards/sounds/es/geography/croatia.ogg
-share/gnome/gcompris/boards/sounds/es/geography/cuba.ogg
-share/gnome/gcompris/boards/sounds/es/geography/cyprus.ogg
-share/gnome/gcompris/boards/sounds/es/geography/czech.ogg
-share/gnome/gcompris/boards/sounds/es/geography/denmark.ogg
-share/gnome/gcompris/boards/sounds/es/geography/dominican_republic.ogg
-share/gnome/gcompris/boards/sounds/es/geography/ecuador.ogg
-share/gnome/gcompris/boards/sounds/es/geography/estonia.ogg
-share/gnome/gcompris/boards/sounds/es/geography/finland.ogg
-share/gnome/gcompris/boards/sounds/es/geography/france.ogg
-share/gnome/gcompris/boards/sounds/es/geography/french_guiana.ogg
-share/gnome/gcompris/boards/sounds/es/geography/germany.ogg
-share/gnome/gcompris/boards/sounds/es/geography/greece.ogg
-share/gnome/gcompris/boards/sounds/es/geography/greenland.ogg
-share/gnome/gcompris/boards/sounds/es/geography/guatemala.ogg
-share/gnome/gcompris/boards/sounds/es/geography/guyana.ogg
-share/gnome/gcompris/boards/sounds/es/geography/haiti.ogg
-share/gnome/gcompris/boards/sounds/es/geography/honduras.ogg
-share/gnome/gcompris/boards/sounds/es/geography/hungary.ogg
-share/gnome/gcompris/boards/sounds/es/geography/iceland.ogg
-share/gnome/gcompris/boards/sounds/es/geography/ireland.ogg
-share/gnome/gcompris/boards/sounds/es/geography/italy.ogg
-share/gnome/gcompris/boards/sounds/es/geography/jamaica.ogg
-share/gnome/gcompris/boards/sounds/es/geography/latvia.ogg
-share/gnome/gcompris/boards/sounds/es/geography/lithuania.ogg
-share/gnome/gcompris/boards/sounds/es/geography/luxembourg.ogg
-share/gnome/gcompris/boards/sounds/es/geography/macedonia.ogg
-share/gnome/gcompris/boards/sounds/es/geography/mexico.ogg
-share/gnome/gcompris/boards/sounds/es/geography/moldova.ogg
-share/gnome/gcompris/boards/sounds/es/geography/netherland.ogg
-share/gnome/gcompris/boards/sounds/es/geography/nicaragua.ogg
-share/gnome/gcompris/boards/sounds/es/geography/norway.ogg
-share/gnome/gcompris/boards/sounds/es/geography/panama.ogg
-share/gnome/gcompris/boards/sounds/es/geography/paraguay.ogg
-share/gnome/gcompris/boards/sounds/es/geography/peru.ogg
-share/gnome/gcompris/boards/sounds/es/geography/poland.ogg
-share/gnome/gcompris/boards/sounds/es/geography/portugal.ogg
-share/gnome/gcompris/boards/sounds/es/geography/romania.ogg
-share/gnome/gcompris/boards/sounds/es/geography/russia.ogg
-share/gnome/gcompris/boards/sounds/es/geography/salvador.ogg
-share/gnome/gcompris/boards/sounds/es/geography/serbia_montenegro.ogg
-share/gnome/gcompris/boards/sounds/es/geography/slovakia.ogg
-share/gnome/gcompris/boards/sounds/es/geography/slovenia.ogg
-share/gnome/gcompris/boards/sounds/es/geography/spain.ogg
-share/gnome/gcompris/boards/sounds/es/geography/suriname.ogg
-share/gnome/gcompris/boards/sounds/es/geography/sweden.ogg
-share/gnome/gcompris/boards/sounds/es/geography/switz.ogg
-share/gnome/gcompris/boards/sounds/es/geography/turkey.ogg
-share/gnome/gcompris/boards/sounds/es/geography/ukraine.ogg
-share/gnome/gcompris/boards/sounds/es/geography/united_kingdom.ogg
-share/gnome/gcompris/boards/sounds/es/geography/uruguay.ogg
-share/gnome/gcompris/boards/sounds/es/geography/usa.ogg
-share/gnome/gcompris/boards/sounds/es/geography/venezuela.ogg
-share/gnome/gcompris/boards/sounds/es/misc/README
-share/gnome/gcompris/boards/sounds/es/misc/back.ogg
-share/gnome/gcompris/boards/sounds/es/misc/by.ogg
-share/gnome/gcompris/boards/sounds/es/misc/click_on_letter.ogg
-share/gnome/gcompris/boards/sounds/es/misc/congratulation.ogg
-share/gnome/gcompris/boards/sounds/es/misc/equal.ogg
-share/gnome/gcompris/boards/sounds/es/misc/good.ogg
-share/gnome/gcompris/boards/sounds/es/misc/great.ogg
-share/gnome/gcompris/boards/sounds/es/misc/help.ogg
-share/gnome/gcompris/boards/sounds/es/misc/level.ogg
-share/gnome/gcompris/boards/sounds/es/misc/minus.ogg
-share/gnome/gcompris/boards/sounds/es/misc/ok.ogg
-share/gnome/gcompris/boards/sounds/es/misc/outof.ogg
-share/gnome/gcompris/boards/sounds/es/misc/plus.ogg
-share/gnome/gcompris/boards/sounds/es/misc/quit.ogg
-share/gnome/gcompris/boards/sounds/es/misc/super.ogg
-share/gnome/gcompris/boards/sounds/es/misc/welcome.ogg
-share/gnome/gcompris/boards/sounds/eu/alphabet/10.ogg
-share/gnome/gcompris/boards/sounds/eu/alphabet/README
-share/gnome/gcompris/boards/sounds/eu/alphabet/U0030.ogg
-share/gnome/gcompris/boards/sounds/eu/alphabet/U0031.ogg
-share/gnome/gcompris/boards/sounds/eu/alphabet/U0032.ogg
-share/gnome/gcompris/boards/sounds/eu/alphabet/U0033.ogg
-share/gnome/gcompris/boards/sounds/eu/alphabet/U0034.ogg
-share/gnome/gcompris/boards/sounds/eu/alphabet/U0035.ogg
-share/gnome/gcompris/boards/sounds/eu/alphabet/U0036.ogg
-share/gnome/gcompris/boards/sounds/eu/alphabet/U0037.ogg
-share/gnome/gcompris/boards/sounds/eu/alphabet/U0038.ogg
-share/gnome/gcompris/boards/sounds/eu/alphabet/U0039.ogg
-share/gnome/gcompris/boards/sounds/eu/alphabet/U0061.ogg
-share/gnome/gcompris/boards/sounds/eu/alphabet/U0062.ogg
-share/gnome/gcompris/boards/sounds/eu/alphabet/U0063.ogg
-share/gnome/gcompris/boards/sounds/eu/alphabet/U0064.ogg
-share/gnome/gcompris/boards/sounds/eu/alphabet/U0065.ogg
-share/gnome/gcompris/boards/sounds/eu/alphabet/U0066.ogg
-share/gnome/gcompris/boards/sounds/eu/alphabet/U0067.ogg
-share/gnome/gcompris/boards/sounds/eu/alphabet/U0068.ogg
-share/gnome/gcompris/boards/sounds/eu/alphabet/U0069.ogg
-share/gnome/gcompris/boards/sounds/eu/alphabet/U006A.ogg
-share/gnome/gcompris/boards/sounds/eu/alphabet/U006B.ogg
-share/gnome/gcompris/boards/sounds/eu/alphabet/U006C.ogg
-share/gnome/gcompris/boards/sounds/eu/alphabet/U006D.ogg
-share/gnome/gcompris/boards/sounds/eu/alphabet/U006E.ogg
-share/gnome/gcompris/boards/sounds/eu/alphabet/U006F.ogg
-share/gnome/gcompris/boards/sounds/eu/alphabet/U0070.ogg
-share/gnome/gcompris/boards/sounds/eu/alphabet/U0071.ogg
-share/gnome/gcompris/boards/sounds/eu/alphabet/U0072.ogg
-share/gnome/gcompris/boards/sounds/eu/alphabet/U0073.ogg
-share/gnome/gcompris/boards/sounds/eu/alphabet/U0074.ogg
-share/gnome/gcompris/boards/sounds/eu/alphabet/U0075.ogg
-share/gnome/gcompris/boards/sounds/eu/alphabet/U0076.ogg
-share/gnome/gcompris/boards/sounds/eu/alphabet/U0077.ogg
-share/gnome/gcompris/boards/sounds/eu/alphabet/U0078.ogg
-share/gnome/gcompris/boards/sounds/eu/alphabet/U0079.ogg
-share/gnome/gcompris/boards/sounds/eu/alphabet/U007A.ogg
-share/gnome/gcompris/boards/sounds/eu/colors/README
-share/gnome/gcompris/boards/sounds/eu/colors/black.ogg
-share/gnome/gcompris/boards/sounds/eu/colors/blue.ogg
-share/gnome/gcompris/boards/sounds/eu/colors/brown.ogg
-share/gnome/gcompris/boards/sounds/eu/colors/green.ogg
-share/gnome/gcompris/boards/sounds/eu/colors/grey.ogg
-share/gnome/gcompris/boards/sounds/eu/colors/orange.ogg
-share/gnome/gcompris/boards/sounds/eu/colors/pink.ogg
-share/gnome/gcompris/boards/sounds/eu/colors/purple.ogg
-share/gnome/gcompris/boards/sounds/eu/colors/red.ogg
-share/gnome/gcompris/boards/sounds/eu/colors/white.ogg
-share/gnome/gcompris/boards/sounds/eu/colors/yellow.ogg
-share/gnome/gcompris/boards/sounds/eu/geography/README
-share/gnome/gcompris/boards/sounds/eu/geography/alaska.ogg
-share/gnome/gcompris/boards/sounds/eu/geography/albania.ogg
-share/gnome/gcompris/boards/sounds/eu/geography/argentina.ogg
-share/gnome/gcompris/boards/sounds/eu/geography/austria.ogg
-share/gnome/gcompris/boards/sounds/eu/geography/bahamas.ogg
-share/gnome/gcompris/boards/sounds/eu/geography/belarus.ogg
-share/gnome/gcompris/boards/sounds/eu/geography/belgium.ogg
-share/gnome/gcompris/boards/sounds/eu/geography/bolivia.ogg
-share/gnome/gcompris/boards/sounds/eu/geography/bosnia_herzegovina.ogg
-share/gnome/gcompris/boards/sounds/eu/geography/brazil.ogg
-share/gnome/gcompris/boards/sounds/eu/geography/bulgaria.ogg
-share/gnome/gcompris/boards/sounds/eu/geography/canada.ogg
-share/gnome/gcompris/boards/sounds/eu/geography/chile.ogg
-share/gnome/gcompris/boards/sounds/eu/geography/colombia.ogg
-share/gnome/gcompris/boards/sounds/eu/geography/costa_rica.ogg
-share/gnome/gcompris/boards/sounds/eu/geography/croatia.ogg
-share/gnome/gcompris/boards/sounds/eu/geography/cuba.ogg
-share/gnome/gcompris/boards/sounds/eu/geography/cyprus.ogg
-share/gnome/gcompris/boards/sounds/eu/geography/czech.ogg
-share/gnome/gcompris/boards/sounds/eu/geography/denmark.ogg
-share/gnome/gcompris/boards/sounds/eu/geography/dominican_republic.ogg
-share/gnome/gcompris/boards/sounds/eu/geography/ecuador.ogg
-share/gnome/gcompris/boards/sounds/eu/geography/estonia.ogg
-share/gnome/gcompris/boards/sounds/eu/geography/finland.ogg
-share/gnome/gcompris/boards/sounds/eu/geography/france.ogg
-share/gnome/gcompris/boards/sounds/eu/geography/french_guiana.ogg
-share/gnome/gcompris/boards/sounds/eu/geography/germany.ogg
-share/gnome/gcompris/boards/sounds/eu/geography/greece.ogg
-share/gnome/gcompris/boards/sounds/eu/geography/greenland.ogg
-share/gnome/gcompris/boards/sounds/eu/geography/guatemala.ogg
-share/gnome/gcompris/boards/sounds/eu/geography/guyana.ogg
-share/gnome/gcompris/boards/sounds/eu/geography/haiti.ogg
-share/gnome/gcompris/boards/sounds/eu/geography/honduras.ogg
-share/gnome/gcompris/boards/sounds/eu/geography/hungary.ogg
-share/gnome/gcompris/boards/sounds/eu/geography/iceland.ogg
-share/gnome/gcompris/boards/sounds/eu/geography/ireland.ogg
-share/gnome/gcompris/boards/sounds/eu/geography/italy.ogg
-share/gnome/gcompris/boards/sounds/eu/geography/jamaica.ogg
-share/gnome/gcompris/boards/sounds/eu/geography/latvia.ogg
-share/gnome/gcompris/boards/sounds/eu/geography/lithuania.ogg
-share/gnome/gcompris/boards/sounds/eu/geography/luxembourg.ogg
-share/gnome/gcompris/boards/sounds/eu/geography/macedonia.ogg
-share/gnome/gcompris/boards/sounds/eu/geography/mexico.ogg
-share/gnome/gcompris/boards/sounds/eu/geography/moldova.ogg
-share/gnome/gcompris/boards/sounds/eu/geography/netherland.ogg
-share/gnome/gcompris/boards/sounds/eu/geography/nicaragua.ogg
-share/gnome/gcompris/boards/sounds/eu/geography/norway.ogg
-share/gnome/gcompris/boards/sounds/eu/geography/panama.ogg
-share/gnome/gcompris/boards/sounds/eu/geography/paraguay.ogg
-share/gnome/gcompris/boards/sounds/eu/geography/peru.ogg
-share/gnome/gcompris/boards/sounds/eu/geography/poland.ogg
-share/gnome/gcompris/boards/sounds/eu/geography/portugal.ogg
-share/gnome/gcompris/boards/sounds/eu/geography/romania.ogg
-share/gnome/gcompris/boards/sounds/eu/geography/russia.ogg
-share/gnome/gcompris/boards/sounds/eu/geography/salvador.ogg
-share/gnome/gcompris/boards/sounds/eu/geography/serbia_montenegro.ogg
-share/gnome/gcompris/boards/sounds/eu/geography/slovakia.ogg
-share/gnome/gcompris/boards/sounds/eu/geography/slovenia.ogg
-share/gnome/gcompris/boards/sounds/eu/geography/spain.ogg
-share/gnome/gcompris/boards/sounds/eu/geography/suriname.ogg
-share/gnome/gcompris/boards/sounds/eu/geography/sweden.ogg
-share/gnome/gcompris/boards/sounds/eu/geography/switz.ogg
-share/gnome/gcompris/boards/sounds/eu/geography/turkey.ogg
-share/gnome/gcompris/boards/sounds/eu/geography/ukraine.ogg
-share/gnome/gcompris/boards/sounds/eu/geography/united_kingdom.ogg
-share/gnome/gcompris/boards/sounds/eu/geography/uruguay.ogg
-share/gnome/gcompris/boards/sounds/eu/geography/usa.ogg
-share/gnome/gcompris/boards/sounds/eu/geography/venezuela.ogg
-share/gnome/gcompris/boards/sounds/eu/misc/README
-share/gnome/gcompris/boards/sounds/eu/misc/awesome.ogg
-share/gnome/gcompris/boards/sounds/eu/misc/back.ogg
-share/gnome/gcompris/boards/sounds/eu/misc/by.ogg
-share/gnome/gcompris/boards/sounds/eu/misc/click_on_letter.ogg
-share/gnome/gcompris/boards/sounds/eu/misc/congratulation.ogg
-share/gnome/gcompris/boards/sounds/eu/misc/equal.ogg
-share/gnome/gcompris/boards/sounds/eu/misc/fantastic.ogg
-share/gnome/gcompris/boards/sounds/eu/misc/good.ogg
-share/gnome/gcompris/boards/sounds/eu/misc/great.ogg
-share/gnome/gcompris/boards/sounds/eu/misc/help.ogg
-share/gnome/gcompris/boards/sounds/eu/misc/level.ogg
-share/gnome/gcompris/boards/sounds/eu/misc/minus.ogg
-share/gnome/gcompris/boards/sounds/eu/misc/ok.ogg
-share/gnome/gcompris/boards/sounds/eu/misc/outof.ogg
-share/gnome/gcompris/boards/sounds/eu/misc/perfect.ogg
-share/gnome/gcompris/boards/sounds/eu/misc/plus.ogg
-share/gnome/gcompris/boards/sounds/eu/misc/quit.ogg
-share/gnome/gcompris/boards/sounds/eu/misc/super.ogg
-share/gnome/gcompris/boards/sounds/eu/misc/waytogo.ogg
-share/gnome/gcompris/boards/sounds/eu/misc/welcome.ogg
-share/gnome/gcompris/boards/sounds/fi/alphabet/10.ogg
-share/gnome/gcompris/boards/sounds/fi/alphabet/README
-share/gnome/gcompris/boards/sounds/fi/alphabet/U0030.ogg
-share/gnome/gcompris/boards/sounds/fi/alphabet/U0031.ogg
-share/gnome/gcompris/boards/sounds/fi/alphabet/U0032.ogg
-share/gnome/gcompris/boards/sounds/fi/alphabet/U0033.ogg
-share/gnome/gcompris/boards/sounds/fi/alphabet/U0034.ogg
-share/gnome/gcompris/boards/sounds/fi/alphabet/U0035.ogg
-share/gnome/gcompris/boards/sounds/fi/alphabet/U0036.ogg
-share/gnome/gcompris/boards/sounds/fi/alphabet/U0037.ogg
-share/gnome/gcompris/boards/sounds/fi/alphabet/U0038.ogg
-share/gnome/gcompris/boards/sounds/fi/alphabet/U0039.ogg
-share/gnome/gcompris/boards/sounds/fi/alphabet/U0061.ogg
-share/gnome/gcompris/boards/sounds/fi/alphabet/U0062.ogg
-share/gnome/gcompris/boards/sounds/fi/alphabet/U0063.ogg
-share/gnome/gcompris/boards/sounds/fi/alphabet/U0064.ogg
-share/gnome/gcompris/boards/sounds/fi/alphabet/U0065.ogg
-share/gnome/gcompris/boards/sounds/fi/alphabet/U0066.ogg
-share/gnome/gcompris/boards/sounds/fi/alphabet/U0067.ogg
-share/gnome/gcompris/boards/sounds/fi/alphabet/U0068.ogg
-share/gnome/gcompris/boards/sounds/fi/alphabet/U0069.ogg
-share/gnome/gcompris/boards/sounds/fi/alphabet/U006A.ogg
-share/gnome/gcompris/boards/sounds/fi/alphabet/U006B.ogg
-share/gnome/gcompris/boards/sounds/fi/alphabet/U006C.ogg
-share/gnome/gcompris/boards/sounds/fi/alphabet/U006D.ogg
-share/gnome/gcompris/boards/sounds/fi/alphabet/U006E.ogg
-share/gnome/gcompris/boards/sounds/fi/alphabet/U006F.ogg
-share/gnome/gcompris/boards/sounds/fi/alphabet/U0070.ogg
-share/gnome/gcompris/boards/sounds/fi/alphabet/U0071.ogg
-share/gnome/gcompris/boards/sounds/fi/alphabet/U0072.ogg
-share/gnome/gcompris/boards/sounds/fi/alphabet/U0073.ogg
-share/gnome/gcompris/boards/sounds/fi/alphabet/U0074.ogg
-share/gnome/gcompris/boards/sounds/fi/alphabet/U0075.ogg
-share/gnome/gcompris/boards/sounds/fi/alphabet/U0076.ogg
-share/gnome/gcompris/boards/sounds/fi/alphabet/U0077.ogg
-share/gnome/gcompris/boards/sounds/fi/alphabet/U0078.ogg
-share/gnome/gcompris/boards/sounds/fi/alphabet/U0079.ogg
-share/gnome/gcompris/boards/sounds/fi/alphabet/U007A.ogg
-share/gnome/gcompris/boards/sounds/fi/alphabet/U00E4.ogg
-share/gnome/gcompris/boards/sounds/fi/alphabet/U00E5.ogg
-share/gnome/gcompris/boards/sounds/fi/alphabet/U00F6.ogg
-share/gnome/gcompris/boards/sounds/fi/colors/README
-share/gnome/gcompris/boards/sounds/fi/colors/black.ogg
-share/gnome/gcompris/boards/sounds/fi/colors/blue.ogg
-share/gnome/gcompris/boards/sounds/fi/colors/brown.ogg
-share/gnome/gcompris/boards/sounds/fi/colors/green.ogg
-share/gnome/gcompris/boards/sounds/fi/colors/grey.ogg
-share/gnome/gcompris/boards/sounds/fi/colors/orange.ogg
-share/gnome/gcompris/boards/sounds/fi/colors/pink.ogg
-share/gnome/gcompris/boards/sounds/fi/colors/purple.ogg
-share/gnome/gcompris/boards/sounds/fi/colors/red.ogg
-share/gnome/gcompris/boards/sounds/fi/colors/white.ogg
-share/gnome/gcompris/boards/sounds/fi/colors/yellow.ogg
-share/gnome/gcompris/boards/sounds/fi/geography/README
-share/gnome/gcompris/boards/sounds/fi/geography/alaska.ogg
-share/gnome/gcompris/boards/sounds/fi/geography/albania.ogg
-share/gnome/gcompris/boards/sounds/fi/geography/argentina.ogg
-share/gnome/gcompris/boards/sounds/fi/geography/austria.ogg
-share/gnome/gcompris/boards/sounds/fi/geography/bahamas.ogg
-share/gnome/gcompris/boards/sounds/fi/geography/belarus.ogg
-share/gnome/gcompris/boards/sounds/fi/geography/belgium.ogg
-share/gnome/gcompris/boards/sounds/fi/geography/bolivia.ogg
-share/gnome/gcompris/boards/sounds/fi/geography/bosnia_herzegovina.ogg
-share/gnome/gcompris/boards/sounds/fi/geography/brazil.ogg
-share/gnome/gcompris/boards/sounds/fi/geography/bulgaria.ogg
-share/gnome/gcompris/boards/sounds/fi/geography/canada.ogg
-share/gnome/gcompris/boards/sounds/fi/geography/chile.ogg
-share/gnome/gcompris/boards/sounds/fi/geography/colombia.ogg
-share/gnome/gcompris/boards/sounds/fi/geography/costa_rica.ogg
-share/gnome/gcompris/boards/sounds/fi/geography/croatia.ogg
-share/gnome/gcompris/boards/sounds/fi/geography/cuba.ogg
-share/gnome/gcompris/boards/sounds/fi/geography/cyprus.ogg
-share/gnome/gcompris/boards/sounds/fi/geography/czech.ogg
-share/gnome/gcompris/boards/sounds/fi/geography/denmark.ogg
-share/gnome/gcompris/boards/sounds/fi/geography/dominican_republic.ogg
-share/gnome/gcompris/boards/sounds/fi/geography/ecuador.ogg
-share/gnome/gcompris/boards/sounds/fi/geography/estonia.ogg
-share/gnome/gcompris/boards/sounds/fi/geography/finland.ogg
-share/gnome/gcompris/boards/sounds/fi/geography/france.ogg
-share/gnome/gcompris/boards/sounds/fi/geography/french_guiana.ogg
-share/gnome/gcompris/boards/sounds/fi/geography/germany.ogg
-share/gnome/gcompris/boards/sounds/fi/geography/greece.ogg
-share/gnome/gcompris/boards/sounds/fi/geography/greenland.ogg
-share/gnome/gcompris/boards/sounds/fi/geography/guatemala.ogg
-share/gnome/gcompris/boards/sounds/fi/geography/guyana.ogg
-share/gnome/gcompris/boards/sounds/fi/geography/haiti.ogg
-share/gnome/gcompris/boards/sounds/fi/geography/honduras.ogg
-share/gnome/gcompris/boards/sounds/fi/geography/hungary.ogg
-share/gnome/gcompris/boards/sounds/fi/geography/iceland.ogg
-share/gnome/gcompris/boards/sounds/fi/geography/ireland.ogg
-share/gnome/gcompris/boards/sounds/fi/geography/italy.ogg
-share/gnome/gcompris/boards/sounds/fi/geography/jamaica.ogg
-share/gnome/gcompris/boards/sounds/fi/geography/latvia.ogg
-share/gnome/gcompris/boards/sounds/fi/geography/lithuania.ogg
-share/gnome/gcompris/boards/sounds/fi/geography/luxembourg.ogg
-share/gnome/gcompris/boards/sounds/fi/geography/macedonia.ogg
-share/gnome/gcompris/boards/sounds/fi/geography/mexico.ogg
-share/gnome/gcompris/boards/sounds/fi/geography/moldova.ogg
-share/gnome/gcompris/boards/sounds/fi/geography/netherland.ogg
-share/gnome/gcompris/boards/sounds/fi/geography/nicaragua.ogg
-share/gnome/gcompris/boards/sounds/fi/geography/norway.ogg
-share/gnome/gcompris/boards/sounds/fi/geography/panama.ogg
-share/gnome/gcompris/boards/sounds/fi/geography/paraguay.ogg
-share/gnome/gcompris/boards/sounds/fi/geography/peru.ogg
-share/gnome/gcompris/boards/sounds/fi/geography/poland.ogg
-share/gnome/gcompris/boards/sounds/fi/geography/portugal.ogg
-share/gnome/gcompris/boards/sounds/fi/geography/romania.ogg
-share/gnome/gcompris/boards/sounds/fi/geography/russia.ogg
-share/gnome/gcompris/boards/sounds/fi/geography/salvador.ogg
-share/gnome/gcompris/boards/sounds/fi/geography/serbia_montenegro.ogg
-share/gnome/gcompris/boards/sounds/fi/geography/slovakia.ogg
-share/gnome/gcompris/boards/sounds/fi/geography/slovenia.ogg
-share/gnome/gcompris/boards/sounds/fi/geography/spain.ogg
-share/gnome/gcompris/boards/sounds/fi/geography/suriname.ogg
-share/gnome/gcompris/boards/sounds/fi/geography/sweden.ogg
-share/gnome/gcompris/boards/sounds/fi/geography/switz.ogg
-share/gnome/gcompris/boards/sounds/fi/geography/turkey.ogg
-share/gnome/gcompris/boards/sounds/fi/geography/ukraine.ogg
-share/gnome/gcompris/boards/sounds/fi/geography/united_kingdom.ogg
-share/gnome/gcompris/boards/sounds/fi/geography/uruguay.ogg
-share/gnome/gcompris/boards/sounds/fi/geography/usa.ogg
-share/gnome/gcompris/boards/sounds/fi/geography/venezuela.ogg
-share/gnome/gcompris/boards/sounds/fi/misc/README
-share/gnome/gcompris/boards/sounds/fi/misc/awesome.ogg
-share/gnome/gcompris/boards/sounds/fi/misc/back.ogg
-share/gnome/gcompris/boards/sounds/fi/misc/by.ogg
-share/gnome/gcompris/boards/sounds/fi/misc/check_answer.ogg
-share/gnome/gcompris/boards/sounds/fi/misc/click_on_letter.ogg
-share/gnome/gcompris/boards/sounds/fi/misc/congratulation.ogg
-share/gnome/gcompris/boards/sounds/fi/misc/equal.ogg
-share/gnome/gcompris/boards/sounds/fi/misc/fantastic.ogg
-share/gnome/gcompris/boards/sounds/fi/misc/good.ogg
-share/gnome/gcompris/boards/sounds/fi/misc/great.ogg
-share/gnome/gcompris/boards/sounds/fi/misc/help.ogg
-share/gnome/gcompris/boards/sounds/fi/misc/level.ogg
-share/gnome/gcompris/boards/sounds/fi/misc/minus.ogg
-share/gnome/gcompris/boards/sounds/fi/misc/ok.ogg
-share/gnome/gcompris/boards/sounds/fi/misc/outof.ogg
-share/gnome/gcompris/boards/sounds/fi/misc/perfect.ogg
-share/gnome/gcompris/boards/sounds/fi/misc/plus.ogg
-share/gnome/gcompris/boards/sounds/fi/misc/quit.ogg
-share/gnome/gcompris/boards/sounds/fi/misc/super.ogg
-share/gnome/gcompris/boards/sounds/fi/misc/waytogo.ogg
-share/gnome/gcompris/boards/sounds/fi/misc/welcome.ogg
-share/gnome/gcompris/boards/sounds/flip.wav
-share/gnome/gcompris/boards/sounds/fr/alphabet/10.ogg
-share/gnome/gcompris/boards/sounds/fr/alphabet/README
-share/gnome/gcompris/boards/sounds/fr/alphabet/U0030.ogg
-share/gnome/gcompris/boards/sounds/fr/alphabet/U0031.ogg
-share/gnome/gcompris/boards/sounds/fr/alphabet/U0032.ogg
-share/gnome/gcompris/boards/sounds/fr/alphabet/U0033.ogg
-share/gnome/gcompris/boards/sounds/fr/alphabet/U0034.ogg
-share/gnome/gcompris/boards/sounds/fr/alphabet/U0035.ogg
-share/gnome/gcompris/boards/sounds/fr/alphabet/U0036.ogg
-share/gnome/gcompris/boards/sounds/fr/alphabet/U0037.ogg
-share/gnome/gcompris/boards/sounds/fr/alphabet/U0038.ogg
-share/gnome/gcompris/boards/sounds/fr/alphabet/U0039.ogg
-share/gnome/gcompris/boards/sounds/fr/alphabet/U0061.ogg
-share/gnome/gcompris/boards/sounds/fr/alphabet/U0062.ogg
-share/gnome/gcompris/boards/sounds/fr/alphabet/U0063.ogg
-share/gnome/gcompris/boards/sounds/fr/alphabet/U0064.ogg
-share/gnome/gcompris/boards/sounds/fr/alphabet/U0065.ogg
-share/gnome/gcompris/boards/sounds/fr/alphabet/U0066.ogg
-share/gnome/gcompris/boards/sounds/fr/alphabet/U0067.ogg
-share/gnome/gcompris/boards/sounds/fr/alphabet/U0068.ogg
-share/gnome/gcompris/boards/sounds/fr/alphabet/U0069.ogg
-share/gnome/gcompris/boards/sounds/fr/alphabet/U006A.ogg
-share/gnome/gcompris/boards/sounds/fr/alphabet/U006B.ogg
-share/gnome/gcompris/boards/sounds/fr/alphabet/U006C.ogg
-share/gnome/gcompris/boards/sounds/fr/alphabet/U006D.ogg
-share/gnome/gcompris/boards/sounds/fr/alphabet/U006E.ogg
-share/gnome/gcompris/boards/sounds/fr/alphabet/U006F.ogg
-share/gnome/gcompris/boards/sounds/fr/alphabet/U0070.ogg
-share/gnome/gcompris/boards/sounds/fr/alphabet/U0071.ogg
-share/gnome/gcompris/boards/sounds/fr/alphabet/U0072.ogg
-share/gnome/gcompris/boards/sounds/fr/alphabet/U0073.ogg
-share/gnome/gcompris/boards/sounds/fr/alphabet/U0074.ogg
-share/gnome/gcompris/boards/sounds/fr/alphabet/U0075.ogg
-share/gnome/gcompris/boards/sounds/fr/alphabet/U0076.ogg
-share/gnome/gcompris/boards/sounds/fr/alphabet/U0077.ogg
-share/gnome/gcompris/boards/sounds/fr/alphabet/U0078.ogg
-share/gnome/gcompris/boards/sounds/fr/alphabet/U0079.ogg
-share/gnome/gcompris/boards/sounds/fr/alphabet/U007A.ogg
-share/gnome/gcompris/boards/sounds/fr/colors/README
-share/gnome/gcompris/boards/sounds/fr/colors/black.ogg
-share/gnome/gcompris/boards/sounds/fr/colors/blue.ogg
-share/gnome/gcompris/boards/sounds/fr/colors/brown.ogg
-share/gnome/gcompris/boards/sounds/fr/colors/green.ogg
-share/gnome/gcompris/boards/sounds/fr/colors/grey.ogg
-share/gnome/gcompris/boards/sounds/fr/colors/orange.ogg
-share/gnome/gcompris/boards/sounds/fr/colors/pink.ogg
-share/gnome/gcompris/boards/sounds/fr/colors/purple.ogg
-share/gnome/gcompris/boards/sounds/fr/colors/red.ogg
-share/gnome/gcompris/boards/sounds/fr/colors/white.ogg
-share/gnome/gcompris/boards/sounds/fr/colors/yellow.ogg
-share/gnome/gcompris/boards/sounds/fr/france_region/README
-share/gnome/gcompris/boards/sounds/fr/france_region/alsace.ogg
-share/gnome/gcompris/boards/sounds/fr/france_region/aquitaine.ogg
-share/gnome/gcompris/boards/sounds/fr/france_region/auvergne.ogg
-share/gnome/gcompris/boards/sounds/fr/france_region/basse-normandie.ogg
-share/gnome/gcompris/boards/sounds/fr/france_region/bourgogne.ogg
-share/gnome/gcompris/boards/sounds/fr/france_region/bretagne.ogg
-share/gnome/gcompris/boards/sounds/fr/france_region/centre.ogg
-share/gnome/gcompris/boards/sounds/fr/france_region/champagne-ardenne.ogg
-share/gnome/gcompris/boards/sounds/fr/france_region/corse.ogg
-share/gnome/gcompris/boards/sounds/fr/france_region/franche-conte.ogg
-share/gnome/gcompris/boards/sounds/fr/france_region/haute-normandie.ogg
-share/gnome/gcompris/boards/sounds/fr/france_region/ile-de-france.ogg
-share/gnome/gcompris/boards/sounds/fr/france_region/languedoc-roussillon.ogg
-share/gnome/gcompris/boards/sounds/fr/france_region/limousin.ogg
-share/gnome/gcompris/boards/sounds/fr/france_region/lorraine.ogg
-share/gnome/gcompris/boards/sounds/fr/france_region/midi-pyrenees.ogg
-share/gnome/gcompris/boards/sounds/fr/france_region/nord-pas-de-calais.ogg
-share/gnome/gcompris/boards/sounds/fr/france_region/pays-de-la-loire.ogg
-share/gnome/gcompris/boards/sounds/fr/france_region/picardie.ogg
-share/gnome/gcompris/boards/sounds/fr/france_region/poitou-charentes.ogg
-share/gnome/gcompris/boards/sounds/fr/france_region/provence-alpes-cote_d_azur.ogg
-share/gnome/gcompris/boards/sounds/fr/france_region/rhone-alpes.ogg
-share/gnome/gcompris/boards/sounds/fr/geography/COPYRIGHT
-share/gnome/gcompris/boards/sounds/fr/geography/README
-share/gnome/gcompris/boards/sounds/fr/geography/africa.ogg
-share/gnome/gcompris/boards/sounds/fr/geography/alaska.ogg
-share/gnome/gcompris/boards/sounds/fr/geography/albania.ogg
-share/gnome/gcompris/boards/sounds/fr/geography/america.ogg
-share/gnome/gcompris/boards/sounds/fr/geography/antartica.ogg
-share/gnome/gcompris/boards/sounds/fr/geography/argentina.ogg
-share/gnome/gcompris/boards/sounds/fr/geography/asia.ogg
-share/gnome/gcompris/boards/sounds/fr/geography/austria.ogg
-share/gnome/gcompris/boards/sounds/fr/geography/bahamas.ogg
-share/gnome/gcompris/boards/sounds/fr/geography/belarus.ogg
-share/gnome/gcompris/boards/sounds/fr/geography/belgium.ogg
-share/gnome/gcompris/boards/sounds/fr/geography/bolivia.ogg
-share/gnome/gcompris/boards/sounds/fr/geography/bosnia_herzegovina.ogg
-share/gnome/gcompris/boards/sounds/fr/geography/brazil.ogg
-share/gnome/gcompris/boards/sounds/fr/geography/bulgaria.ogg
-share/gnome/gcompris/boards/sounds/fr/geography/canada.ogg
-share/gnome/gcompris/boards/sounds/fr/geography/chile.ogg
-share/gnome/gcompris/boards/sounds/fr/geography/colombia.ogg
-share/gnome/gcompris/boards/sounds/fr/geography/costa_rica.ogg
-share/gnome/gcompris/boards/sounds/fr/geography/croatia.ogg
-share/gnome/gcompris/boards/sounds/fr/geography/cuba.ogg
-share/gnome/gcompris/boards/sounds/fr/geography/cyprus.ogg
-share/gnome/gcompris/boards/sounds/fr/geography/czech.ogg
-share/gnome/gcompris/boards/sounds/fr/geography/denmark.ogg
-share/gnome/gcompris/boards/sounds/fr/geography/dominican_republic.ogg
-share/gnome/gcompris/boards/sounds/fr/geography/ecuador.ogg
-share/gnome/gcompris/boards/sounds/fr/geography/estonia.ogg
-share/gnome/gcompris/boards/sounds/fr/geography/europe.ogg
-share/gnome/gcompris/boards/sounds/fr/geography/finland.ogg
-share/gnome/gcompris/boards/sounds/fr/geography/france.ogg
-share/gnome/gcompris/boards/sounds/fr/geography/french_guiana.ogg
-share/gnome/gcompris/boards/sounds/fr/geography/germany.ogg
-share/gnome/gcompris/boards/sounds/fr/geography/greece.ogg
-share/gnome/gcompris/boards/sounds/fr/geography/greenland.ogg
-share/gnome/gcompris/boards/sounds/fr/geography/guatemala.ogg
-share/gnome/gcompris/boards/sounds/fr/geography/guyana.ogg
-share/gnome/gcompris/boards/sounds/fr/geography/haiti.ogg
-share/gnome/gcompris/boards/sounds/fr/geography/honduras.ogg
-share/gnome/gcompris/boards/sounds/fr/geography/hungary.ogg
-share/gnome/gcompris/boards/sounds/fr/geography/iceland.ogg
-share/gnome/gcompris/boards/sounds/fr/geography/ireland.ogg
-share/gnome/gcompris/boards/sounds/fr/geography/italy.ogg
-share/gnome/gcompris/boards/sounds/fr/geography/jamaica.ogg
-share/gnome/gcompris/boards/sounds/fr/geography/latvia.ogg
-share/gnome/gcompris/boards/sounds/fr/geography/lithuania.ogg
-share/gnome/gcompris/boards/sounds/fr/geography/luxembourg.ogg
-share/gnome/gcompris/boards/sounds/fr/geography/macedonia.ogg
-share/gnome/gcompris/boards/sounds/fr/geography/mexico.ogg
-share/gnome/gcompris/boards/sounds/fr/geography/moldova.ogg
-share/gnome/gcompris/boards/sounds/fr/geography/netherland.ogg
-share/gnome/gcompris/boards/sounds/fr/geography/nicaragua.ogg
-share/gnome/gcompris/boards/sounds/fr/geography/norway.ogg
-share/gnome/gcompris/boards/sounds/fr/geography/oceania.ogg
-share/gnome/gcompris/boards/sounds/fr/geography/panama.ogg
-share/gnome/gcompris/boards/sounds/fr/geography/paraguay.ogg
-share/gnome/gcompris/boards/sounds/fr/geography/peru.ogg
-share/gnome/gcompris/boards/sounds/fr/geography/poland.ogg
-share/gnome/gcompris/boards/sounds/fr/geography/portugal.ogg
-share/gnome/gcompris/boards/sounds/fr/geography/romania.ogg
-share/gnome/gcompris/boards/sounds/fr/geography/russia.ogg
-share/gnome/gcompris/boards/sounds/fr/geography/salvador.ogg
-share/gnome/gcompris/boards/sounds/fr/geography/serbia_montenegro.ogg
-share/gnome/gcompris/boards/sounds/fr/geography/slovakia.ogg
-share/gnome/gcompris/boards/sounds/fr/geography/slovenia.ogg
-share/gnome/gcompris/boards/sounds/fr/geography/spain.ogg
-share/gnome/gcompris/boards/sounds/fr/geography/suriname.ogg
-share/gnome/gcompris/boards/sounds/fr/geography/sweden.ogg
-share/gnome/gcompris/boards/sounds/fr/geography/switz.ogg
-share/gnome/gcompris/boards/sounds/fr/geography/turkey.ogg
-share/gnome/gcompris/boards/sounds/fr/geography/ukraine.ogg
-share/gnome/gcompris/boards/sounds/fr/geography/united_kingdom.ogg
-share/gnome/gcompris/boards/sounds/fr/geography/uruguay.ogg
-share/gnome/gcompris/boards/sounds/fr/geography/usa.ogg
-share/gnome/gcompris/boards/sounds/fr/geography/venezuela.ogg
-share/gnome/gcompris/boards/sounds/fr/misc/README
-share/gnome/gcompris/boards/sounds/fr/misc/about.ogg
-share/gnome/gcompris/boards/sounds/fr/misc/awesome.ogg
-share/gnome/gcompris/boards/sounds/fr/misc/back.ogg
-share/gnome/gcompris/boards/sounds/fr/misc/by.ogg
-share/gnome/gcompris/boards/sounds/fr/misc/check_answer.ogg
-share/gnome/gcompris/boards/sounds/fr/misc/click_on_letter.ogg
-share/gnome/gcompris/boards/sounds/fr/misc/configuration.ogg
-share/gnome/gcompris/boards/sounds/fr/misc/congratulation.ogg
-share/gnome/gcompris/boards/sounds/fr/misc/equal.ogg
-share/gnome/gcompris/boards/sounds/fr/misc/fantastic.ogg
-share/gnome/gcompris/boards/sounds/fr/misc/good.ogg
-share/gnome/gcompris/boards/sounds/fr/misc/great.ogg
-share/gnome/gcompris/boards/sounds/fr/misc/help.ogg
-share/gnome/gcompris/boards/sounds/fr/misc/level.ogg
-share/gnome/gcompris/boards/sounds/fr/misc/minus.ogg
-share/gnome/gcompris/boards/sounds/fr/misc/ok.ogg
-share/gnome/gcompris/boards/sounds/fr/misc/outof.ogg
-share/gnome/gcompris/boards/sounds/fr/misc/perfect.ogg
-share/gnome/gcompris/boards/sounds/fr/misc/plus.ogg
-share/gnome/gcompris/boards/sounds/fr/misc/quit.ogg
-share/gnome/gcompris/boards/sounds/fr/misc/super.ogg
-share/gnome/gcompris/boards/sounds/fr/misc/waytogo.ogg
-share/gnome/gcompris/boards/sounds/fr/misc/welcome.ogg
-share/gnome/gcompris/boards/sounds/gobble.wav
-share/gnome/gcompris/boards/sounds/grow.wav
-share/gnome/gcompris/boards/sounds/hi/alphabet/10.ogg
-share/gnome/gcompris/boards/sounds/hi/alphabet/U0030.ogg
-share/gnome/gcompris/boards/sounds/hi/alphabet/U0031.ogg
-share/gnome/gcompris/boards/sounds/hi/alphabet/U0032.ogg
-share/gnome/gcompris/boards/sounds/hi/alphabet/U0033.ogg
-share/gnome/gcompris/boards/sounds/hi/alphabet/U0034.ogg
-share/gnome/gcompris/boards/sounds/hi/alphabet/U0035.ogg
-share/gnome/gcompris/boards/sounds/hi/alphabet/U0036.ogg
-share/gnome/gcompris/boards/sounds/hi/alphabet/U0037.ogg
-share/gnome/gcompris/boards/sounds/hi/alphabet/U0038.ogg
-share/gnome/gcompris/boards/sounds/hi/alphabet/U0039.ogg
-share/gnome/gcompris/boards/sounds/hi/alphabet/U0061.ogg
-share/gnome/gcompris/boards/sounds/hi/alphabet/U0062.ogg
-share/gnome/gcompris/boards/sounds/hi/alphabet/U0063.ogg
-share/gnome/gcompris/boards/sounds/hi/alphabet/U0064.ogg
-share/gnome/gcompris/boards/sounds/hi/alphabet/U0065.ogg
-share/gnome/gcompris/boards/sounds/hi/alphabet/U0066.ogg
-share/gnome/gcompris/boards/sounds/hi/alphabet/U0067.ogg
-share/gnome/gcompris/boards/sounds/hi/alphabet/U0068.ogg
-share/gnome/gcompris/boards/sounds/hi/alphabet/U0069.ogg
-share/gnome/gcompris/boards/sounds/hi/alphabet/U006A.ogg
-share/gnome/gcompris/boards/sounds/hi/alphabet/U006B.ogg
-share/gnome/gcompris/boards/sounds/hi/alphabet/U006C.ogg
-share/gnome/gcompris/boards/sounds/hi/alphabet/U006D.ogg
-share/gnome/gcompris/boards/sounds/hi/alphabet/U006E.ogg
-share/gnome/gcompris/boards/sounds/hi/alphabet/U006F.ogg
-share/gnome/gcompris/boards/sounds/hi/alphabet/U0070.ogg
-share/gnome/gcompris/boards/sounds/hi/alphabet/U0071.ogg
-share/gnome/gcompris/boards/sounds/hi/alphabet/U0072.ogg
-share/gnome/gcompris/boards/sounds/hi/alphabet/U0073.ogg
-share/gnome/gcompris/boards/sounds/hi/alphabet/U0074.ogg
-share/gnome/gcompris/boards/sounds/hi/alphabet/U0075.ogg
-share/gnome/gcompris/boards/sounds/hi/alphabet/U0076.ogg
-share/gnome/gcompris/boards/sounds/hi/alphabet/U0077.ogg
-share/gnome/gcompris/boards/sounds/hi/alphabet/U0078.ogg
-share/gnome/gcompris/boards/sounds/hi/alphabet/U0079.ogg
-share/gnome/gcompris/boards/sounds/hi/alphabet/U007A.ogg
-share/gnome/gcompris/boards/sounds/hi/colors/black.ogg
-share/gnome/gcompris/boards/sounds/hi/colors/blue.ogg
-share/gnome/gcompris/boards/sounds/hi/colors/brown.ogg
-share/gnome/gcompris/boards/sounds/hi/colors/green.ogg
-share/gnome/gcompris/boards/sounds/hi/colors/grey.ogg
-share/gnome/gcompris/boards/sounds/hi/colors/orange.ogg
-share/gnome/gcompris/boards/sounds/hi/colors/pink.ogg
-share/gnome/gcompris/boards/sounds/hi/colors/purple.ogg
-share/gnome/gcompris/boards/sounds/hi/colors/red.ogg
-share/gnome/gcompris/boards/sounds/hi/colors/white.ogg
-share/gnome/gcompris/boards/sounds/hi/colors/yellow.ogg
-share/gnome/gcompris/boards/sounds/hi/geography/africa.ogg
-share/gnome/gcompris/boards/sounds/hi/geography/alaska.ogg
-share/gnome/gcompris/boards/sounds/hi/geography/albania.ogg
-share/gnome/gcompris/boards/sounds/hi/geography/algeria.ogg
-share/gnome/gcompris/boards/sounds/hi/geography/america.ogg
-share/gnome/gcompris/boards/sounds/hi/geography/angola.ogg
-share/gnome/gcompris/boards/sounds/hi/geography/antartica.ogg
-share/gnome/gcompris/boards/sounds/hi/geography/argentina.ogg
-share/gnome/gcompris/boards/sounds/hi/geography/asia.ogg
-share/gnome/gcompris/boards/sounds/hi/geography/austria.ogg
-share/gnome/gcompris/boards/sounds/hi/geography/bahamas.ogg
-share/gnome/gcompris/boards/sounds/hi/geography/basse_normandie.ogg
-share/gnome/gcompris/boards/sounds/hi/geography/belarus.ogg
-share/gnome/gcompris/boards/sounds/hi/geography/belgium.ogg
-share/gnome/gcompris/boards/sounds/hi/geography/benin.ogg
-share/gnome/gcompris/boards/sounds/hi/geography/bolivia.ogg
-share/gnome/gcompris/boards/sounds/hi/geography/bosnia_herzegovina.ogg
-share/gnome/gcompris/boards/sounds/hi/geography/botswana.ogg
-share/gnome/gcompris/boards/sounds/hi/geography/brazil.ogg
-share/gnome/gcompris/boards/sounds/hi/geography/bulgaria.ogg
-share/gnome/gcompris/boards/sounds/hi/geography/burkina.ogg
-share/gnome/gcompris/boards/sounds/hi/geography/burundi.ogg
-share/gnome/gcompris/boards/sounds/hi/geography/cameroon.ogg
-share/gnome/gcompris/boards/sounds/hi/geography/canada.ogg
-share/gnome/gcompris/boards/sounds/hi/geography/central_african_republic.ogg
-share/gnome/gcompris/boards/sounds/hi/geography/chad.ogg
-share/gnome/gcompris/boards/sounds/hi/geography/chile.ogg
-share/gnome/gcompris/boards/sounds/hi/geography/colombia.ogg
-share/gnome/gcompris/boards/sounds/hi/geography/congo.ogg
-share/gnome/gcompris/boards/sounds/hi/geography/costa_rica.ogg
-share/gnome/gcompris/boards/sounds/hi/geography/croatia.ogg
-share/gnome/gcompris/boards/sounds/hi/geography/cuba.ogg
-share/gnome/gcompris/boards/sounds/hi/geography/cyprus.ogg
-share/gnome/gcompris/boards/sounds/hi/geography/czech.ogg
-share/gnome/gcompris/boards/sounds/hi/geography/denmark.ogg
-share/gnome/gcompris/boards/sounds/hi/geography/dijibouti.ogg
-share/gnome/gcompris/boards/sounds/hi/geography/dominican_republic.ogg
-share/gnome/gcompris/boards/sounds/hi/geography/ecuador.ogg
-share/gnome/gcompris/boards/sounds/hi/geography/egypt.ogg
-share/gnome/gcompris/boards/sounds/hi/geography/equatorial_guinea.ogg
-share/gnome/gcompris/boards/sounds/hi/geography/eritrea.ogg
-share/gnome/gcompris/boards/sounds/hi/geography/estonia.ogg
-share/gnome/gcompris/boards/sounds/hi/geography/ethiopia.ogg
-share/gnome/gcompris/boards/sounds/hi/geography/europe.ogg
-share/gnome/gcompris/boards/sounds/hi/geography/finland.ogg
-share/gnome/gcompris/boards/sounds/hi/geography/france.ogg
-share/gnome/gcompris/boards/sounds/hi/geography/french_guiana.ogg
-share/gnome/gcompris/boards/sounds/hi/geography/gabon.ogg
-share/gnome/gcompris/boards/sounds/hi/geography/gambia.ogg
-share/gnome/gcompris/boards/sounds/hi/geography/germany.ogg
-share/gnome/gcompris/boards/sounds/hi/geography/ghana.ogg
-share/gnome/gcompris/boards/sounds/hi/geography/greece.ogg
-share/gnome/gcompris/boards/sounds/hi/geography/greenland.ogg
-share/gnome/gcompris/boards/sounds/hi/geography/guatemala.ogg
-share/gnome/gcompris/boards/sounds/hi/geography/guinea.ogg
-share/gnome/gcompris/boards/sounds/hi/geography/guinea_bissau.ogg
-share/gnome/gcompris/boards/sounds/hi/geography/guyana.ogg
-share/gnome/gcompris/boards/sounds/hi/geography/haiti.ogg
-share/gnome/gcompris/boards/sounds/hi/geography/honduras.ogg
-share/gnome/gcompris/boards/sounds/hi/geography/hungary.ogg
-share/gnome/gcompris/boards/sounds/hi/geography/iceland.ogg
-share/gnome/gcompris/boards/sounds/hi/geography/ireland.ogg
-share/gnome/gcompris/boards/sounds/hi/geography/italy.ogg
-share/gnome/gcompris/boards/sounds/hi/geography/ivory_coast.ogg
-share/gnome/gcompris/boards/sounds/hi/geography/jamaica.ogg
-share/gnome/gcompris/boards/sounds/hi/geography/kenya.ogg
-share/gnome/gcompris/boards/sounds/hi/geography/latvia.ogg
-share/gnome/gcompris/boards/sounds/hi/geography/lesotho.ogg
-share/gnome/gcompris/boards/sounds/hi/geography/liberia.ogg
-share/gnome/gcompris/boards/sounds/hi/geography/libya.ogg
-share/gnome/gcompris/boards/sounds/hi/geography/lithuania.ogg
-share/gnome/gcompris/boards/sounds/hi/geography/luxembourg.ogg
-share/gnome/gcompris/boards/sounds/hi/geography/macedonia.ogg
-share/gnome/gcompris/boards/sounds/hi/geography/madagascar.ogg
-share/gnome/gcompris/boards/sounds/hi/geography/malawi.ogg
-share/gnome/gcompris/boards/sounds/hi/geography/mali.ogg
-share/gnome/gcompris/boards/sounds/hi/geography/mauritania.ogg
-share/gnome/gcompris/boards/sounds/hi/geography/mexico.ogg
-share/gnome/gcompris/boards/sounds/hi/geography/moldova.ogg
-share/gnome/gcompris/boards/sounds/hi/geography/moroco.ogg
-share/gnome/gcompris/boards/sounds/hi/geography/mozambique.ogg
-share/gnome/gcompris/boards/sounds/hi/geography/nambia.ogg
-share/gnome/gcompris/boards/sounds/hi/geography/netherland.ogg
-share/gnome/gcompris/boards/sounds/hi/geography/nicaragua.ogg
-share/gnome/gcompris/boards/sounds/hi/geography/niger.ogg
-share/gnome/gcompris/boards/sounds/hi/geography/nigeria.ogg
-share/gnome/gcompris/boards/sounds/hi/geography/north_america.ogg
-share/gnome/gcompris/boards/sounds/hi/geography/norway.ogg
-share/gnome/gcompris/boards/sounds/hi/geography/oceania.ogg
-share/gnome/gcompris/boards/sounds/hi/geography/panama.ogg
-share/gnome/gcompris/boards/sounds/hi/geography/paraguay.ogg
-share/gnome/gcompris/boards/sounds/hi/geography/peru.ogg
-share/gnome/gcompris/boards/sounds/hi/geography/poland.ogg
-share/gnome/gcompris/boards/sounds/hi/geography/portugal.ogg
-share/gnome/gcompris/boards/sounds/hi/geography/republic_of_congo.ogg
-share/gnome/gcompris/boards/sounds/hi/geography/romania.ogg
-share/gnome/gcompris/boards/sounds/hi/geography/russia.ogg
-share/gnome/gcompris/boards/sounds/hi/geography/rwanda.ogg
-share/gnome/gcompris/boards/sounds/hi/geography/salvador.ogg
-share/gnome/gcompris/boards/sounds/hi/geography/senegal.ogg
-share/gnome/gcompris/boards/sounds/hi/geography/serbia_montenegro.ogg
-share/gnome/gcompris/boards/sounds/hi/geography/sierra_leone.ogg
-share/gnome/gcompris/boards/sounds/hi/geography/slovakia.ogg
-share/gnome/gcompris/boards/sounds/hi/geography/slovenia.ogg
-share/gnome/gcompris/boards/sounds/hi/geography/somalia.ogg
-share/gnome/gcompris/boards/sounds/hi/geography/soudan.ogg
-share/gnome/gcompris/boards/sounds/hi/geography/south_africa.ogg
-share/gnome/gcompris/boards/sounds/hi/geography/south_america.ogg
-share/gnome/gcompris/boards/sounds/hi/geography/spain.ogg
-share/gnome/gcompris/boards/sounds/hi/geography/suriname.ogg
-share/gnome/gcompris/boards/sounds/hi/geography/swaziland.ogg
-share/gnome/gcompris/boards/sounds/hi/geography/sweden.ogg
-share/gnome/gcompris/boards/sounds/hi/geography/switz.ogg
-share/gnome/gcompris/boards/sounds/hi/geography/tanzania.ogg
-share/gnome/gcompris/boards/sounds/hi/geography/togo.ogg
-share/gnome/gcompris/boards/sounds/hi/geography/tunisia.ogg
-share/gnome/gcompris/boards/sounds/hi/geography/turkey.ogg
-share/gnome/gcompris/boards/sounds/hi/geography/uganda.ogg
-share/gnome/gcompris/boards/sounds/hi/geography/ukraine.ogg
-share/gnome/gcompris/boards/sounds/hi/geography/united_kingdom.ogg
-share/gnome/gcompris/boards/sounds/hi/geography/uruguay.ogg
-share/gnome/gcompris/boards/sounds/hi/geography/usa.ogg
-share/gnome/gcompris/boards/sounds/hi/geography/venezuela.ogg
-share/gnome/gcompris/boards/sounds/hi/geography/zambia.ogg
-share/gnome/gcompris/boards/sounds/hi/geography/zimbabwe.ogg
-share/gnome/gcompris/boards/sounds/hi/misc/about.ogg
-share/gnome/gcompris/boards/sounds/hi/misc/awesome.ogg
-share/gnome/gcompris/boards/sounds/hi/misc/back.ogg
-share/gnome/gcompris/boards/sounds/hi/misc/by.ogg
-share/gnome/gcompris/boards/sounds/hi/misc/check_answer.ogg
-share/gnome/gcompris/boards/sounds/hi/misc/click_on_letter.ogg
-share/gnome/gcompris/boards/sounds/hi/misc/configuration.ogg
-share/gnome/gcompris/boards/sounds/hi/misc/congratulation.ogg
-share/gnome/gcompris/boards/sounds/hi/misc/equal.ogg
-share/gnome/gcompris/boards/sounds/hi/misc/fantastic.ogg
-share/gnome/gcompris/boards/sounds/hi/misc/good.ogg
-share/gnome/gcompris/boards/sounds/hi/misc/great.ogg
-share/gnome/gcompris/boards/sounds/hi/misc/help.ogg
-share/gnome/gcompris/boards/sounds/hi/misc/level.ogg
-share/gnome/gcompris/boards/sounds/hi/misc/minus.ogg
-share/gnome/gcompris/boards/sounds/hi/misc/ok.ogg
-share/gnome/gcompris/boards/sounds/hi/misc/outof.ogg
-share/gnome/gcompris/boards/sounds/hi/misc/perfect.ogg
-share/gnome/gcompris/boards/sounds/hi/misc/plus.ogg
-share/gnome/gcompris/boards/sounds/hi/misc/quit.ogg
-share/gnome/gcompris/boards/sounds/hi/misc/super.ogg
-share/gnome/gcompris/boards/sounds/hi/misc/waytogo.ogg
-share/gnome/gcompris/boards/sounds/hi/misc/welcome.ogg
-share/gnome/gcompris/boards/sounds/hu/alphabet/10.ogg
-share/gnome/gcompris/boards/sounds/hu/alphabet/README
-share/gnome/gcompris/boards/sounds/hu/alphabet/U0031.ogg
-share/gnome/gcompris/boards/sounds/hu/alphabet/U0032.ogg
-share/gnome/gcompris/boards/sounds/hu/alphabet/U0033.ogg
-share/gnome/gcompris/boards/sounds/hu/alphabet/U0034.ogg
-share/gnome/gcompris/boards/sounds/hu/alphabet/U0035.ogg
-share/gnome/gcompris/boards/sounds/hu/alphabet/U0036.ogg
-share/gnome/gcompris/boards/sounds/hu/alphabet/U0037.ogg
-share/gnome/gcompris/boards/sounds/hu/alphabet/U0038.ogg
-share/gnome/gcompris/boards/sounds/hu/alphabet/U0039.ogg
-share/gnome/gcompris/boards/sounds/hu/colors/README
-share/gnome/gcompris/boards/sounds/hu/colors/black.ogg
-share/gnome/gcompris/boards/sounds/hu/colors/blue.ogg
-share/gnome/gcompris/boards/sounds/hu/colors/brown.ogg
-share/gnome/gcompris/boards/sounds/hu/colors/green.ogg
-share/gnome/gcompris/boards/sounds/hu/colors/grey.ogg
-share/gnome/gcompris/boards/sounds/hu/colors/orange.ogg
-share/gnome/gcompris/boards/sounds/hu/colors/pink.ogg
-share/gnome/gcompris/boards/sounds/hu/colors/purple.ogg
-share/gnome/gcompris/boards/sounds/hu/colors/red.ogg
-share/gnome/gcompris/boards/sounds/hu/colors/white.ogg
-share/gnome/gcompris/boards/sounds/hu/colors/yellow.ogg
-share/gnome/gcompris/boards/sounds/hu/geography/README
-share/gnome/gcompris/boards/sounds/hu/geography/alaska.ogg
-share/gnome/gcompris/boards/sounds/hu/geography/albania.ogg
-share/gnome/gcompris/boards/sounds/hu/geography/argentina.ogg
-share/gnome/gcompris/boards/sounds/hu/geography/austria.ogg
-share/gnome/gcompris/boards/sounds/hu/geography/bahamas.ogg
-share/gnome/gcompris/boards/sounds/hu/geography/belarus.ogg
-share/gnome/gcompris/boards/sounds/hu/geography/belgium.ogg
-share/gnome/gcompris/boards/sounds/hu/geography/bolivia.ogg
-share/gnome/gcompris/boards/sounds/hu/geography/bosnia_herzegovina.ogg
-share/gnome/gcompris/boards/sounds/hu/geography/brazil.ogg
-share/gnome/gcompris/boards/sounds/hu/geography/bulgaria.ogg
-share/gnome/gcompris/boards/sounds/hu/geography/canada.ogg
-share/gnome/gcompris/boards/sounds/hu/geography/chile.ogg
-share/gnome/gcompris/boards/sounds/hu/geography/colombia.ogg
-share/gnome/gcompris/boards/sounds/hu/geography/costa_rica.ogg
-share/gnome/gcompris/boards/sounds/hu/geography/croatia.ogg
-share/gnome/gcompris/boards/sounds/hu/geography/cuba.ogg
-share/gnome/gcompris/boards/sounds/hu/geography/cyprus.ogg
-share/gnome/gcompris/boards/sounds/hu/geography/czech.ogg
-share/gnome/gcompris/boards/sounds/hu/geography/denmark.ogg
-share/gnome/gcompris/boards/sounds/hu/geography/dominican_republic.ogg
-share/gnome/gcompris/boards/sounds/hu/geography/ecuador.ogg
-share/gnome/gcompris/boards/sounds/hu/geography/estonia.ogg
-share/gnome/gcompris/boards/sounds/hu/geography/finland.ogg
-share/gnome/gcompris/boards/sounds/hu/geography/france.ogg
-share/gnome/gcompris/boards/sounds/hu/geography/french_guiana.ogg
-share/gnome/gcompris/boards/sounds/hu/geography/germany.ogg
-share/gnome/gcompris/boards/sounds/hu/geography/greece.ogg
-share/gnome/gcompris/boards/sounds/hu/geography/greenland.ogg
-share/gnome/gcompris/boards/sounds/hu/geography/guatemala.ogg
-share/gnome/gcompris/boards/sounds/hu/geography/guyana.ogg
-share/gnome/gcompris/boards/sounds/hu/geography/haiti.ogg
-share/gnome/gcompris/boards/sounds/hu/geography/honduras.ogg
-share/gnome/gcompris/boards/sounds/hu/geography/hungary.ogg
-share/gnome/gcompris/boards/sounds/hu/geography/iceland.ogg
-share/gnome/gcompris/boards/sounds/hu/geography/ireland.ogg
-share/gnome/gcompris/boards/sounds/hu/geography/italy.ogg
-share/gnome/gcompris/boards/sounds/hu/geography/jamaica.ogg
-share/gnome/gcompris/boards/sounds/hu/geography/latvia.ogg
-share/gnome/gcompris/boards/sounds/hu/geography/lithuania.ogg
-share/gnome/gcompris/boards/sounds/hu/geography/luxembourg.ogg
-share/gnome/gcompris/boards/sounds/hu/geography/macedonia.ogg
-share/gnome/gcompris/boards/sounds/hu/geography/mexico.ogg
-share/gnome/gcompris/boards/sounds/hu/geography/moldova.ogg
-share/gnome/gcompris/boards/sounds/hu/geography/netherland.ogg
-share/gnome/gcompris/boards/sounds/hu/geography/nicaragua.ogg
-share/gnome/gcompris/boards/sounds/hu/geography/norway.ogg
-share/gnome/gcompris/boards/sounds/hu/geography/panama.ogg
-share/gnome/gcompris/boards/sounds/hu/geography/paraguay.ogg
-share/gnome/gcompris/boards/sounds/hu/geography/peru.ogg
-share/gnome/gcompris/boards/sounds/hu/geography/poland.ogg
-share/gnome/gcompris/boards/sounds/hu/geography/portugal.ogg
-share/gnome/gcompris/boards/sounds/hu/geography/romania.ogg
-share/gnome/gcompris/boards/sounds/hu/geography/russia.ogg
-share/gnome/gcompris/boards/sounds/hu/geography/salvador.ogg
-share/gnome/gcompris/boards/sounds/hu/geography/serbia_montenegro.ogg
-share/gnome/gcompris/boards/sounds/hu/geography/slovakia.ogg
-share/gnome/gcompris/boards/sounds/hu/geography/slovenia.ogg
-share/gnome/gcompris/boards/sounds/hu/geography/spain.ogg
-share/gnome/gcompris/boards/sounds/hu/geography/suriname.ogg
-share/gnome/gcompris/boards/sounds/hu/geography/sweden.ogg
-share/gnome/gcompris/boards/sounds/hu/geography/switz.ogg
-share/gnome/gcompris/boards/sounds/hu/geography/turkey.ogg
-share/gnome/gcompris/boards/sounds/hu/geography/ukraine.ogg
-share/gnome/gcompris/boards/sounds/hu/geography/united_kingdom.ogg
-share/gnome/gcompris/boards/sounds/hu/geography/uruguay.ogg
-share/gnome/gcompris/boards/sounds/hu/geography/usa.ogg
-share/gnome/gcompris/boards/sounds/hu/geography/venezuela.ogg
-share/gnome/gcompris/boards/sounds/hu/misc/README
-share/gnome/gcompris/boards/sounds/hu/misc/awesome.ogg
-share/gnome/gcompris/boards/sounds/hu/misc/back.ogg
-share/gnome/gcompris/boards/sounds/hu/misc/click_on_letter.ogg
-share/gnome/gcompris/boards/sounds/hu/misc/congratulation.ogg
-share/gnome/gcompris/boards/sounds/hu/misc/fantastic.ogg
-share/gnome/gcompris/boards/sounds/hu/misc/good.ogg
-share/gnome/gcompris/boards/sounds/hu/misc/great.ogg
-share/gnome/gcompris/boards/sounds/hu/misc/help.ogg
-share/gnome/gcompris/boards/sounds/hu/misc/ok.ogg
-share/gnome/gcompris/boards/sounds/hu/misc/perfect.ogg
-share/gnome/gcompris/boards/sounds/hu/misc/quit.ogg
-share/gnome/gcompris/boards/sounds/hu/misc/super.ogg
-share/gnome/gcompris/boards/sounds/hu/misc/welcome.ogg
-share/gnome/gcompris/boards/sounds/id/alphabet/10.ogg
-share/gnome/gcompris/boards/sounds/id/alphabet/README
-share/gnome/gcompris/boards/sounds/id/alphabet/U0030.ogg
-share/gnome/gcompris/boards/sounds/id/alphabet/U0031.ogg
-share/gnome/gcompris/boards/sounds/id/alphabet/U0032.ogg
-share/gnome/gcompris/boards/sounds/id/alphabet/U0033.ogg
-share/gnome/gcompris/boards/sounds/id/alphabet/U0034.ogg
-share/gnome/gcompris/boards/sounds/id/alphabet/U0035.ogg
-share/gnome/gcompris/boards/sounds/id/alphabet/U0036.ogg
-share/gnome/gcompris/boards/sounds/id/alphabet/U0037.ogg
-share/gnome/gcompris/boards/sounds/id/alphabet/U0038.ogg
-share/gnome/gcompris/boards/sounds/id/alphabet/U0039.ogg
-share/gnome/gcompris/boards/sounds/id/alphabet/U0061.ogg
-share/gnome/gcompris/boards/sounds/id/alphabet/U0062.ogg
-share/gnome/gcompris/boards/sounds/id/alphabet/U0063.ogg
-share/gnome/gcompris/boards/sounds/id/alphabet/U0064.ogg
-share/gnome/gcompris/boards/sounds/id/alphabet/U0065.ogg
-share/gnome/gcompris/boards/sounds/id/alphabet/U0066.ogg
-share/gnome/gcompris/boards/sounds/id/alphabet/U0067.ogg
-share/gnome/gcompris/boards/sounds/id/alphabet/U0068.ogg
-share/gnome/gcompris/boards/sounds/id/alphabet/U0069.ogg
-share/gnome/gcompris/boards/sounds/id/alphabet/U006A.ogg
-share/gnome/gcompris/boards/sounds/id/alphabet/U006B.ogg
-share/gnome/gcompris/boards/sounds/id/alphabet/U006C.ogg
-share/gnome/gcompris/boards/sounds/id/alphabet/U006D.ogg
-share/gnome/gcompris/boards/sounds/id/alphabet/U006E.ogg
-share/gnome/gcompris/boards/sounds/id/alphabet/U006F.ogg
-share/gnome/gcompris/boards/sounds/id/alphabet/U0070.ogg
-share/gnome/gcompris/boards/sounds/id/alphabet/U0071.ogg
-share/gnome/gcompris/boards/sounds/id/alphabet/U0072.ogg
-share/gnome/gcompris/boards/sounds/id/alphabet/U0073.ogg
-share/gnome/gcompris/boards/sounds/id/alphabet/U0074.ogg
-share/gnome/gcompris/boards/sounds/id/alphabet/U0075.ogg
-share/gnome/gcompris/boards/sounds/id/alphabet/U0076.ogg
-share/gnome/gcompris/boards/sounds/id/alphabet/U0077.ogg
-share/gnome/gcompris/boards/sounds/id/alphabet/U0078.ogg
-share/gnome/gcompris/boards/sounds/id/alphabet/U0079.ogg
-share/gnome/gcompris/boards/sounds/id/alphabet/U007A.ogg
-share/gnome/gcompris/boards/sounds/id/colors/README
-share/gnome/gcompris/boards/sounds/id/colors/black.ogg
-share/gnome/gcompris/boards/sounds/id/colors/blue.ogg
-share/gnome/gcompris/boards/sounds/id/colors/brown.ogg
-share/gnome/gcompris/boards/sounds/id/colors/green.ogg
-share/gnome/gcompris/boards/sounds/id/colors/grey.ogg
-share/gnome/gcompris/boards/sounds/id/colors/orange.ogg
-share/gnome/gcompris/boards/sounds/id/colors/pink.ogg
-share/gnome/gcompris/boards/sounds/id/colors/purple.ogg
-share/gnome/gcompris/boards/sounds/id/colors/red.ogg
-share/gnome/gcompris/boards/sounds/id/colors/white.ogg
-share/gnome/gcompris/boards/sounds/id/colors/yellow.ogg
-share/gnome/gcompris/boards/sounds/id/misc/README
-share/gnome/gcompris/boards/sounds/id/misc/about.ogg
-share/gnome/gcompris/boards/sounds/id/misc/awesome.ogg
-share/gnome/gcompris/boards/sounds/id/misc/back.ogg
-share/gnome/gcompris/boards/sounds/id/misc/by.ogg
-share/gnome/gcompris/boards/sounds/id/misc/check_answer.ogg
-share/gnome/gcompris/boards/sounds/id/misc/click_on_letter.ogg
-share/gnome/gcompris/boards/sounds/id/misc/configuration.ogg
-share/gnome/gcompris/boards/sounds/id/misc/congratulation.ogg
-share/gnome/gcompris/boards/sounds/id/misc/equal.ogg
-share/gnome/gcompris/boards/sounds/id/misc/fantastic.ogg
-share/gnome/gcompris/boards/sounds/id/misc/good.ogg
-share/gnome/gcompris/boards/sounds/id/misc/great.ogg
-share/gnome/gcompris/boards/sounds/id/misc/help.ogg
-share/gnome/gcompris/boards/sounds/id/misc/level.ogg
-share/gnome/gcompris/boards/sounds/id/misc/minus.ogg
-share/gnome/gcompris/boards/sounds/id/misc/ok.ogg
-share/gnome/gcompris/boards/sounds/id/misc/outof.ogg
-share/gnome/gcompris/boards/sounds/id/misc/perfect.ogg
-share/gnome/gcompris/boards/sounds/id/misc/plus.ogg
-share/gnome/gcompris/boards/sounds/id/misc/quit.ogg
-share/gnome/gcompris/boards/sounds/id/misc/super.ogg
-share/gnome/gcompris/boards/sounds/id/misc/waytogo.ogg
-share/gnome/gcompris/boards/sounds/id/misc/welcome.ogg
-share/gnome/gcompris/boards/sounds/it/alphabet/10.ogg
-share/gnome/gcompris/boards/sounds/it/alphabet/README
-share/gnome/gcompris/boards/sounds/it/alphabet/U0031.ogg
-share/gnome/gcompris/boards/sounds/it/alphabet/U0032.ogg
-share/gnome/gcompris/boards/sounds/it/alphabet/U0033.ogg
-share/gnome/gcompris/boards/sounds/it/alphabet/U0034.ogg
-share/gnome/gcompris/boards/sounds/it/alphabet/U0035.ogg
-share/gnome/gcompris/boards/sounds/it/alphabet/U0036.ogg
-share/gnome/gcompris/boards/sounds/it/alphabet/U0037.ogg
-share/gnome/gcompris/boards/sounds/it/alphabet/U0038.ogg
-share/gnome/gcompris/boards/sounds/it/alphabet/U0039.ogg
-share/gnome/gcompris/boards/sounds/it/alphabet/U0061.ogg
-share/gnome/gcompris/boards/sounds/it/alphabet/U0062.ogg
-share/gnome/gcompris/boards/sounds/it/alphabet/U0063.ogg
-share/gnome/gcompris/boards/sounds/it/alphabet/U0064.ogg
-share/gnome/gcompris/boards/sounds/it/alphabet/U0065.ogg
-share/gnome/gcompris/boards/sounds/it/alphabet/U0066.ogg
-share/gnome/gcompris/boards/sounds/it/alphabet/U0067.ogg
-share/gnome/gcompris/boards/sounds/it/alphabet/U0068.ogg
-share/gnome/gcompris/boards/sounds/it/alphabet/U0069.ogg
-share/gnome/gcompris/boards/sounds/it/alphabet/U006A.ogg
-share/gnome/gcompris/boards/sounds/it/alphabet/U006B.ogg
-share/gnome/gcompris/boards/sounds/it/alphabet/U006C.ogg
-share/gnome/gcompris/boards/sounds/it/alphabet/U006D.ogg
-share/gnome/gcompris/boards/sounds/it/alphabet/U006E.ogg
-share/gnome/gcompris/boards/sounds/it/alphabet/U006F.ogg
-share/gnome/gcompris/boards/sounds/it/alphabet/U0070.ogg
-share/gnome/gcompris/boards/sounds/it/alphabet/U0071.ogg
-share/gnome/gcompris/boards/sounds/it/alphabet/U0072.ogg
-share/gnome/gcompris/boards/sounds/it/alphabet/U0073.ogg
-share/gnome/gcompris/boards/sounds/it/alphabet/U0074.ogg
-share/gnome/gcompris/boards/sounds/it/alphabet/U0075.ogg
-share/gnome/gcompris/boards/sounds/it/alphabet/U0076.ogg
-share/gnome/gcompris/boards/sounds/it/alphabet/U0077.ogg
-share/gnome/gcompris/boards/sounds/it/alphabet/U0078.ogg
-share/gnome/gcompris/boards/sounds/it/alphabet/U0079.ogg
-share/gnome/gcompris/boards/sounds/it/alphabet/U007A.ogg
-share/gnome/gcompris/boards/sounds/it/colors/README
-share/gnome/gcompris/boards/sounds/it/colors/black.ogg
-share/gnome/gcompris/boards/sounds/it/colors/blue.ogg
-share/gnome/gcompris/boards/sounds/it/colors/brown.ogg
-share/gnome/gcompris/boards/sounds/it/colors/green.ogg
-share/gnome/gcompris/boards/sounds/it/colors/grey.ogg
-share/gnome/gcompris/boards/sounds/it/colors/orange.ogg
-share/gnome/gcompris/boards/sounds/it/colors/pink.ogg
-share/gnome/gcompris/boards/sounds/it/colors/purple.ogg
-share/gnome/gcompris/boards/sounds/it/colors/red.ogg
-share/gnome/gcompris/boards/sounds/it/colors/white.ogg
-share/gnome/gcompris/boards/sounds/it/colors/yellow.ogg
-share/gnome/gcompris/boards/sounds/it/geography/README
-share/gnome/gcompris/boards/sounds/it/geography/alaska.ogg
-share/gnome/gcompris/boards/sounds/it/geography/albania.ogg
-share/gnome/gcompris/boards/sounds/it/geography/argentina.ogg
-share/gnome/gcompris/boards/sounds/it/geography/austria.ogg
-share/gnome/gcompris/boards/sounds/it/geography/bahamas.ogg
-share/gnome/gcompris/boards/sounds/it/geography/belarus.ogg
-share/gnome/gcompris/boards/sounds/it/geography/belgium.ogg
-share/gnome/gcompris/boards/sounds/it/geography/bolivia.ogg
-share/gnome/gcompris/boards/sounds/it/geography/bosnia_herzegovina.ogg
-share/gnome/gcompris/boards/sounds/it/geography/brazil.ogg
-share/gnome/gcompris/boards/sounds/it/geography/bulgaria.ogg
-share/gnome/gcompris/boards/sounds/it/geography/canada.ogg
-share/gnome/gcompris/boards/sounds/it/geography/chile.ogg
-share/gnome/gcompris/boards/sounds/it/geography/colombia.ogg
-share/gnome/gcompris/boards/sounds/it/geography/costa_rica.ogg
-share/gnome/gcompris/boards/sounds/it/geography/croatia.ogg
-share/gnome/gcompris/boards/sounds/it/geography/cuba.ogg
-share/gnome/gcompris/boards/sounds/it/geography/cyprus.ogg
-share/gnome/gcompris/boards/sounds/it/geography/czech.ogg
-share/gnome/gcompris/boards/sounds/it/geography/denmark.ogg
-share/gnome/gcompris/boards/sounds/it/geography/dominican_republic.ogg
-share/gnome/gcompris/boards/sounds/it/geography/ecuador.ogg
-share/gnome/gcompris/boards/sounds/it/geography/estonia.ogg
-share/gnome/gcompris/boards/sounds/it/geography/finland.ogg
-share/gnome/gcompris/boards/sounds/it/geography/french_guiana.ogg
-share/gnome/gcompris/boards/sounds/it/geography/greece.ogg
-share/gnome/gcompris/boards/sounds/it/geography/greenland.ogg
-share/gnome/gcompris/boards/sounds/it/geography/guatemala.ogg
-share/gnome/gcompris/boards/sounds/it/geography/guyana.ogg
-share/gnome/gcompris/boards/sounds/it/geography/haiti.ogg
-share/gnome/gcompris/boards/sounds/it/geography/honduras.ogg
-share/gnome/gcompris/boards/sounds/it/geography/hungary.ogg
-share/gnome/gcompris/boards/sounds/it/geography/iceland.ogg
-share/gnome/gcompris/boards/sounds/it/geography/ireland.ogg
-share/gnome/gcompris/boards/sounds/it/geography/italy.ogg
-share/gnome/gcompris/boards/sounds/it/geography/jamaica.ogg
-share/gnome/gcompris/boards/sounds/it/geography/latvia.ogg
-share/gnome/gcompris/boards/sounds/it/geography/lithuania.ogg
-share/gnome/gcompris/boards/sounds/it/geography/luxembourg.ogg
-share/gnome/gcompris/boards/sounds/it/geography/macedonia.ogg
-share/gnome/gcompris/boards/sounds/it/geography/mexico.ogg
-share/gnome/gcompris/boards/sounds/it/geography/moldova.ogg
-share/gnome/gcompris/boards/sounds/it/geography/netherland.ogg
-share/gnome/gcompris/boards/sounds/it/geography/nicaragua.ogg
-share/gnome/gcompris/boards/sounds/it/geography/norway.ogg
-share/gnome/gcompris/boards/sounds/it/geography/panama.ogg
-share/gnome/gcompris/boards/sounds/it/geography/paraguay.ogg
-share/gnome/gcompris/boards/sounds/it/geography/peru.ogg
-share/gnome/gcompris/boards/sounds/it/geography/poland.ogg
-share/gnome/gcompris/boards/sounds/it/geography/portugal.ogg
-share/gnome/gcompris/boards/sounds/it/geography/romania.ogg
-share/gnome/gcompris/boards/sounds/it/geography/russia.ogg
-share/gnome/gcompris/boards/sounds/it/geography/salvador.ogg
-share/gnome/gcompris/boards/sounds/it/geography/serbia_montenegro.ogg
-share/gnome/gcompris/boards/sounds/it/geography/slovakia.ogg
-share/gnome/gcompris/boards/sounds/it/geography/slovenia.ogg
-share/gnome/gcompris/boards/sounds/it/geography/spain.ogg
-share/gnome/gcompris/boards/sounds/it/geography/suriname.ogg
-share/gnome/gcompris/boards/sounds/it/geography/sweden.ogg
-share/gnome/gcompris/boards/sounds/it/geography/switz.ogg
-share/gnome/gcompris/boards/sounds/it/geography/turkey.ogg
-share/gnome/gcompris/boards/sounds/it/geography/ukraine.ogg
-share/gnome/gcompris/boards/sounds/it/geography/united_kingdom.ogg
-share/gnome/gcompris/boards/sounds/it/geography/uruguay.ogg
-share/gnome/gcompris/boards/sounds/it/geography/usa.ogg
-share/gnome/gcompris/boards/sounds/it/geography/venezuela.ogg
-share/gnome/gcompris/boards/sounds/it/misc/README
-share/gnome/gcompris/boards/sounds/it/misc/back.ogg
-share/gnome/gcompris/boards/sounds/it/misc/by.ogg
-share/gnome/gcompris/boards/sounds/it/misc/click_on_letter.ogg
-share/gnome/gcompris/boards/sounds/it/misc/congratulation.ogg
-share/gnome/gcompris/boards/sounds/it/misc/equal.ogg
-share/gnome/gcompris/boards/sounds/it/misc/good.ogg
-share/gnome/gcompris/boards/sounds/it/misc/great.ogg
-share/gnome/gcompris/boards/sounds/it/misc/help.ogg
-share/gnome/gcompris/boards/sounds/it/misc/level.ogg
-share/gnome/gcompris/boards/sounds/it/misc/minus.ogg
-share/gnome/gcompris/boards/sounds/it/misc/ok.ogg
-share/gnome/gcompris/boards/sounds/it/misc/outof.ogg
-share/gnome/gcompris/boards/sounds/it/misc/plus.ogg
-share/gnome/gcompris/boards/sounds/it/misc/quit.ogg
-share/gnome/gcompris/boards/sounds/it/misc/super.ogg
-share/gnome/gcompris/boards/sounds/it/misc/welcome.ogg
-share/gnome/gcompris/boards/sounds/level.wav
-share/gnome/gcompris/boards/sounds/line_end.wav
-share/gnome/gcompris/boards/sounds/melody/guitar/melody.wav
-share/gnome/gcompris/boards/sounds/melody/guitar/son1.wav
-share/gnome/gcompris/boards/sounds/melody/guitar/son2.wav
-share/gnome/gcompris/boards/sounds/melody/guitar/son3.wav
-share/gnome/gcompris/boards/sounds/melody/guitar/son4.wav
-share/gnome/gcompris/boards/sounds/melody/tachos/melody.wav
-share/gnome/gcompris/boards/sounds/melody/tachos/son1.wav
-share/gnome/gcompris/boards/sounds/melody/tachos/son2.wav
-share/gnome/gcompris/boards/sounds/melody/tachos/son3.wav
-share/gnome/gcompris/boards/sounds/melody/tachos/son4.wav
-share/gnome/gcompris/boards/sounds/melody/xylofon/melody.wav
-share/gnome/gcompris/boards/sounds/melody/xylofon/son1.wav
-share/gnome/gcompris/boards/sounds/melody/xylofon/son2.wav
-share/gnome/gcompris/boards/sounds/melody/xylofon/son3.wav
-share/gnome/gcompris/boards/sounds/melody/xylofon/son4.wav
-share/gnome/gcompris/boards/sounds/memory/plick.ogg
-share/gnome/gcompris/boards/sounds/memory/tick.ogg
-share/gnome/gcompris/boards/sounds/memory/tri.ogg
-share/gnome/gcompris/boards/sounds/mr/alphabet/10.ogg
-share/gnome/gcompris/boards/sounds/mr/alphabet/U0030.ogg
-share/gnome/gcompris/boards/sounds/mr/alphabet/U0031.ogg
-share/gnome/gcompris/boards/sounds/mr/alphabet/U0032.ogg
-share/gnome/gcompris/boards/sounds/mr/alphabet/U0033.ogg
-share/gnome/gcompris/boards/sounds/mr/alphabet/U0034.ogg
-share/gnome/gcompris/boards/sounds/mr/alphabet/U0035.ogg
-share/gnome/gcompris/boards/sounds/mr/alphabet/U0036.ogg
-share/gnome/gcompris/boards/sounds/mr/alphabet/U0037.ogg
-share/gnome/gcompris/boards/sounds/mr/alphabet/U0038.ogg
-share/gnome/gcompris/boards/sounds/mr/alphabet/U0039.ogg
-share/gnome/gcompris/boards/sounds/mr/alphabet/U0061.ogg
-share/gnome/gcompris/boards/sounds/mr/alphabet/U0062.ogg
-share/gnome/gcompris/boards/sounds/mr/alphabet/U0063.ogg
-share/gnome/gcompris/boards/sounds/mr/alphabet/U0064.ogg
-share/gnome/gcompris/boards/sounds/mr/alphabet/U0065.ogg
-share/gnome/gcompris/boards/sounds/mr/alphabet/U0066.ogg
-share/gnome/gcompris/boards/sounds/mr/alphabet/U0067.ogg
-share/gnome/gcompris/boards/sounds/mr/alphabet/U0068.ogg
-share/gnome/gcompris/boards/sounds/mr/alphabet/U0069.ogg
-share/gnome/gcompris/boards/sounds/mr/alphabet/U006A.ogg
-share/gnome/gcompris/boards/sounds/mr/alphabet/U006B.ogg
-share/gnome/gcompris/boards/sounds/mr/alphabet/U006C.ogg
-share/gnome/gcompris/boards/sounds/mr/alphabet/U006D.ogg
-share/gnome/gcompris/boards/sounds/mr/alphabet/U006E.ogg
-share/gnome/gcompris/boards/sounds/mr/alphabet/U006F.ogg
-share/gnome/gcompris/boards/sounds/mr/alphabet/U0070.ogg
-share/gnome/gcompris/boards/sounds/mr/alphabet/U0071.ogg
-share/gnome/gcompris/boards/sounds/mr/alphabet/U0072.ogg
-share/gnome/gcompris/boards/sounds/mr/alphabet/U0073.ogg
-share/gnome/gcompris/boards/sounds/mr/alphabet/U0074.ogg
-share/gnome/gcompris/boards/sounds/mr/alphabet/U0075.ogg
-share/gnome/gcompris/boards/sounds/mr/alphabet/U0076.ogg
-share/gnome/gcompris/boards/sounds/mr/alphabet/U0077.ogg
-share/gnome/gcompris/boards/sounds/mr/alphabet/U0078.ogg
-share/gnome/gcompris/boards/sounds/mr/alphabet/U0079.ogg
-share/gnome/gcompris/boards/sounds/mr/alphabet/U007A.ogg
-share/gnome/gcompris/boards/sounds/mr/colors/black.ogg
-share/gnome/gcompris/boards/sounds/mr/colors/blue.ogg
-share/gnome/gcompris/boards/sounds/mr/colors/brown.ogg
-share/gnome/gcompris/boards/sounds/mr/colors/green.ogg
-share/gnome/gcompris/boards/sounds/mr/colors/grey.ogg
-share/gnome/gcompris/boards/sounds/mr/colors/orange.ogg
-share/gnome/gcompris/boards/sounds/mr/colors/pink.ogg
-share/gnome/gcompris/boards/sounds/mr/colors/purple.ogg
-share/gnome/gcompris/boards/sounds/mr/colors/red.ogg
-share/gnome/gcompris/boards/sounds/mr/colors/white.ogg
-share/gnome/gcompris/boards/sounds/mr/colors/yellow.ogg
-share/gnome/gcompris/boards/sounds/mr/geography/africa.ogg
-share/gnome/gcompris/boards/sounds/mr/geography/alaska.ogg
-share/gnome/gcompris/boards/sounds/mr/geography/albania.ogg
-share/gnome/gcompris/boards/sounds/mr/geography/algeria.ogg
-share/gnome/gcompris/boards/sounds/mr/geography/america.ogg
-share/gnome/gcompris/boards/sounds/mr/geography/angola.ogg
-share/gnome/gcompris/boards/sounds/mr/geography/antartica.ogg
-share/gnome/gcompris/boards/sounds/mr/geography/argentina.ogg
-share/gnome/gcompris/boards/sounds/mr/geography/asia.ogg
-share/gnome/gcompris/boards/sounds/mr/geography/austria.ogg
-share/gnome/gcompris/boards/sounds/mr/geography/bahamas.ogg
-share/gnome/gcompris/boards/sounds/mr/geography/belarus.ogg
-share/gnome/gcompris/boards/sounds/mr/geography/belgium.ogg
-share/gnome/gcompris/boards/sounds/mr/geography/benin.ogg
-share/gnome/gcompris/boards/sounds/mr/geography/bolivia.ogg
-share/gnome/gcompris/boards/sounds/mr/geography/bosnia_herzegovina.ogg
-share/gnome/gcompris/boards/sounds/mr/geography/botswana.ogg
-share/gnome/gcompris/boards/sounds/mr/geography/brazil.ogg
-share/gnome/gcompris/boards/sounds/mr/geography/bulgaria.ogg
-share/gnome/gcompris/boards/sounds/mr/geography/burkina.ogg
-share/gnome/gcompris/boards/sounds/mr/geography/burundi.ogg
-share/gnome/gcompris/boards/sounds/mr/geography/cameroon.ogg
-share/gnome/gcompris/boards/sounds/mr/geography/canada.ogg
-share/gnome/gcompris/boards/sounds/mr/geography/central_african_republic.ogg
-share/gnome/gcompris/boards/sounds/mr/geography/chad.ogg
-share/gnome/gcompris/boards/sounds/mr/geography/chile.ogg
-share/gnome/gcompris/boards/sounds/mr/geography/colombia.ogg
-share/gnome/gcompris/boards/sounds/mr/geography/congo.ogg
-share/gnome/gcompris/boards/sounds/mr/geography/costa_rica.ogg
-share/gnome/gcompris/boards/sounds/mr/geography/croatia.ogg
-share/gnome/gcompris/boards/sounds/mr/geography/cuba.ogg
-share/gnome/gcompris/boards/sounds/mr/geography/cyprus.ogg
-share/gnome/gcompris/boards/sounds/mr/geography/czech.ogg
-share/gnome/gcompris/boards/sounds/mr/geography/denmark.ogg
-share/gnome/gcompris/boards/sounds/mr/geography/djibouti.ogg
-share/gnome/gcompris/boards/sounds/mr/geography/dominican_republic.ogg
-share/gnome/gcompris/boards/sounds/mr/geography/ecuador.ogg
-share/gnome/gcompris/boards/sounds/mr/geography/egypt.ogg
-share/gnome/gcompris/boards/sounds/mr/geography/equatorial_guinea.ogg
-share/gnome/gcompris/boards/sounds/mr/geography/eritrea.ogg
-share/gnome/gcompris/boards/sounds/mr/geography/estonia.ogg
-share/gnome/gcompris/boards/sounds/mr/geography/ethiopia.ogg
-share/gnome/gcompris/boards/sounds/mr/geography/europe.ogg
-share/gnome/gcompris/boards/sounds/mr/geography/finland.ogg
-share/gnome/gcompris/boards/sounds/mr/geography/france.ogg
-share/gnome/gcompris/boards/sounds/mr/geography/french_guiana.ogg
-share/gnome/gcompris/boards/sounds/mr/geography/gabon.ogg
-share/gnome/gcompris/boards/sounds/mr/geography/gambia.ogg
-share/gnome/gcompris/boards/sounds/mr/geography/germany.ogg
-share/gnome/gcompris/boards/sounds/mr/geography/ghana.ogg
-share/gnome/gcompris/boards/sounds/mr/geography/greece.ogg
-share/gnome/gcompris/boards/sounds/mr/geography/greenland.ogg
-share/gnome/gcompris/boards/sounds/mr/geography/guatemala.ogg
-share/gnome/gcompris/boards/sounds/mr/geography/guinea.ogg
-share/gnome/gcompris/boards/sounds/mr/geography/guinea_bissau.ogg
-share/gnome/gcompris/boards/sounds/mr/geography/guyana.ogg
-share/gnome/gcompris/boards/sounds/mr/geography/haiti.ogg
-share/gnome/gcompris/boards/sounds/mr/geography/honduras.ogg
-share/gnome/gcompris/boards/sounds/mr/geography/hungary.ogg
-share/gnome/gcompris/boards/sounds/mr/geography/iceland.ogg
-share/gnome/gcompris/boards/sounds/mr/geography/ireland.ogg
-share/gnome/gcompris/boards/sounds/mr/geography/italy.ogg
-share/gnome/gcompris/boards/sounds/mr/geography/ivory_coast.ogg
-share/gnome/gcompris/boards/sounds/mr/geography/jamaica.ogg
-share/gnome/gcompris/boards/sounds/mr/geography/kenya.ogg
-share/gnome/gcompris/boards/sounds/mr/geography/latvia.ogg
-share/gnome/gcompris/boards/sounds/mr/geography/lesotho.ogg
-share/gnome/gcompris/boards/sounds/mr/geography/liberia.ogg
-share/gnome/gcompris/boards/sounds/mr/geography/libya.ogg
-share/gnome/gcompris/boards/sounds/mr/geography/lithuania.ogg
-share/gnome/gcompris/boards/sounds/mr/geography/luxembourg.ogg
-share/gnome/gcompris/boards/sounds/mr/geography/macedonia.ogg
-share/gnome/gcompris/boards/sounds/mr/geography/madagascar.ogg
-share/gnome/gcompris/boards/sounds/mr/geography/malawi.ogg
-share/gnome/gcompris/boards/sounds/mr/geography/mali.ogg
-share/gnome/gcompris/boards/sounds/mr/geography/mauritania.ogg
-share/gnome/gcompris/boards/sounds/mr/geography/mexico.ogg
-share/gnome/gcompris/boards/sounds/mr/geography/moldova.ogg
-share/gnome/gcompris/boards/sounds/mr/geography/moroco.ogg
-share/gnome/gcompris/boards/sounds/mr/geography/mozambique.ogg
-share/gnome/gcompris/boards/sounds/mr/geography/namibia.ogg
-share/gnome/gcompris/boards/sounds/mr/geography/netherland.ogg
-share/gnome/gcompris/boards/sounds/mr/geography/nicaragua.ogg
-share/gnome/gcompris/boards/sounds/mr/geography/niger.ogg
-share/gnome/gcompris/boards/sounds/mr/geography/nigeria.ogg
-share/gnome/gcompris/boards/sounds/mr/geography/north_america.ogg
-share/gnome/gcompris/boards/sounds/mr/geography/norway.ogg
-share/gnome/gcompris/boards/sounds/mr/geography/oceania.ogg
-share/gnome/gcompris/boards/sounds/mr/geography/panama.ogg
-share/gnome/gcompris/boards/sounds/mr/geography/paraguay.ogg
-share/gnome/gcompris/boards/sounds/mr/geography/peru.ogg
-share/gnome/gcompris/boards/sounds/mr/geography/poland.ogg
-share/gnome/gcompris/boards/sounds/mr/geography/portugal.ogg
-share/gnome/gcompris/boards/sounds/mr/geography/republic_of_congo.ogg
-share/gnome/gcompris/boards/sounds/mr/geography/romania.ogg
-share/gnome/gcompris/boards/sounds/mr/geography/russia.ogg
-share/gnome/gcompris/boards/sounds/mr/geography/rwanda.ogg
-share/gnome/gcompris/boards/sounds/mr/geography/salvador.ogg
-share/gnome/gcompris/boards/sounds/mr/geography/senegal.ogg
-share/gnome/gcompris/boards/sounds/mr/geography/serbia_montenegro.ogg
-share/gnome/gcompris/boards/sounds/mr/geography/sierra_leone.ogg
-share/gnome/gcompris/boards/sounds/mr/geography/slovakia.ogg
-share/gnome/gcompris/boards/sounds/mr/geography/slovenia.ogg
-share/gnome/gcompris/boards/sounds/mr/geography/somalia.ogg
-share/gnome/gcompris/boards/sounds/mr/geography/soudan.ogg
-share/gnome/gcompris/boards/sounds/mr/geography/south_africa.ogg
-share/gnome/gcompris/boards/sounds/mr/geography/south_america.ogg
-share/gnome/gcompris/boards/sounds/mr/geography/spain.ogg
-share/gnome/gcompris/boards/sounds/mr/geography/suriname.ogg
-share/gnome/gcompris/boards/sounds/mr/geography/swaziland.ogg
-share/gnome/gcompris/boards/sounds/mr/geography/sweden.ogg
-share/gnome/gcompris/boards/sounds/mr/geography/switz.ogg
-share/gnome/gcompris/boards/sounds/mr/geography/tanzania.ogg
-share/gnome/gcompris/boards/sounds/mr/geography/togo.ogg
-share/gnome/gcompris/boards/sounds/mr/geography/tunisia.ogg
-share/gnome/gcompris/boards/sounds/mr/geography/turkey.ogg
-share/gnome/gcompris/boards/sounds/mr/geography/uganda.ogg
-share/gnome/gcompris/boards/sounds/mr/geography/ukraine.ogg
-share/gnome/gcompris/boards/sounds/mr/geography/united_kingdom.ogg
-share/gnome/gcompris/boards/sounds/mr/geography/uruguay.ogg
-share/gnome/gcompris/boards/sounds/mr/geography/usa.ogg
-share/gnome/gcompris/boards/sounds/mr/geography/venezuela.ogg
-share/gnome/gcompris/boards/sounds/mr/geography/zambia.ogg
-share/gnome/gcompris/boards/sounds/mr/geography/zimbabwe.ogg
-share/gnome/gcompris/boards/sounds/mr/misc/about.ogg
-share/gnome/gcompris/boards/sounds/mr/misc/awesome.ogg
-share/gnome/gcompris/boards/sounds/mr/misc/back.ogg
-share/gnome/gcompris/boards/sounds/mr/misc/by.ogg
-share/gnome/gcompris/boards/sounds/mr/misc/check_answer.ogg
-share/gnome/gcompris/boards/sounds/mr/misc/click_on_letter.ogg
-share/gnome/gcompris/boards/sounds/mr/misc/configuration.ogg
-share/gnome/gcompris/boards/sounds/mr/misc/congratulation.ogg
-share/gnome/gcompris/boards/sounds/mr/misc/equal.ogg
-share/gnome/gcompris/boards/sounds/mr/misc/fantastic.ogg
-share/gnome/gcompris/boards/sounds/mr/misc/good.ogg
-share/gnome/gcompris/boards/sounds/mr/misc/great.ogg
-share/gnome/gcompris/boards/sounds/mr/misc/help.ogg
-share/gnome/gcompris/boards/sounds/mr/misc/level.ogg
-share/gnome/gcompris/boards/sounds/mr/misc/minus.ogg
-share/gnome/gcompris/boards/sounds/mr/misc/ok.ogg
-share/gnome/gcompris/boards/sounds/mr/misc/outof.ogg
-share/gnome/gcompris/boards/sounds/mr/misc/perfect.ogg
-share/gnome/gcompris/boards/sounds/mr/misc/plus.ogg
-share/gnome/gcompris/boards/sounds/mr/misc/quit.ogg
-share/gnome/gcompris/boards/sounds/mr/misc/super.ogg
-share/gnome/gcompris/boards/sounds/mr/misc/waytogo.ogg
-share/gnome/gcompris/boards/sounds/mr/misc/welcome.ogg
-share/gnome/gcompris/boards/sounds/nb/alphabet/10.ogg
-share/gnome/gcompris/boards/sounds/nb/alphabet/README
-share/gnome/gcompris/boards/sounds/nb/alphabet/U0030.ogg
-share/gnome/gcompris/boards/sounds/nb/alphabet/U0031.ogg
-share/gnome/gcompris/boards/sounds/nb/alphabet/U0032.ogg
-share/gnome/gcompris/boards/sounds/nb/alphabet/U0033.ogg
-share/gnome/gcompris/boards/sounds/nb/alphabet/U0034.ogg
-share/gnome/gcompris/boards/sounds/nb/alphabet/U0035.ogg
-share/gnome/gcompris/boards/sounds/nb/alphabet/U0036.ogg
-share/gnome/gcompris/boards/sounds/nb/alphabet/U0037.ogg
-share/gnome/gcompris/boards/sounds/nb/alphabet/U0038.ogg
-share/gnome/gcompris/boards/sounds/nb/alphabet/U0039.ogg
-share/gnome/gcompris/boards/sounds/nb/alphabet/U0061.ogg
-share/gnome/gcompris/boards/sounds/nb/alphabet/U0062.ogg
-share/gnome/gcompris/boards/sounds/nb/alphabet/U0063.ogg
-share/gnome/gcompris/boards/sounds/nb/alphabet/U0064.ogg
-share/gnome/gcompris/boards/sounds/nb/alphabet/U0065.ogg
-share/gnome/gcompris/boards/sounds/nb/alphabet/U0066.ogg
-share/gnome/gcompris/boards/sounds/nb/alphabet/U0067.ogg
-share/gnome/gcompris/boards/sounds/nb/alphabet/U0068.ogg
-share/gnome/gcompris/boards/sounds/nb/alphabet/U0069.ogg
-share/gnome/gcompris/boards/sounds/nb/alphabet/U006A.ogg
-share/gnome/gcompris/boards/sounds/nb/alphabet/U006B.ogg
-share/gnome/gcompris/boards/sounds/nb/alphabet/U006C.ogg
-share/gnome/gcompris/boards/sounds/nb/alphabet/U006D.ogg
-share/gnome/gcompris/boards/sounds/nb/alphabet/U006E.ogg
-share/gnome/gcompris/boards/sounds/nb/alphabet/U006F.ogg
-share/gnome/gcompris/boards/sounds/nb/alphabet/U0070.ogg
-share/gnome/gcompris/boards/sounds/nb/alphabet/U0071.ogg
-share/gnome/gcompris/boards/sounds/nb/alphabet/U0072.ogg
-share/gnome/gcompris/boards/sounds/nb/alphabet/U0073.ogg
-share/gnome/gcompris/boards/sounds/nb/alphabet/U0074.ogg
-share/gnome/gcompris/boards/sounds/nb/alphabet/U0075.ogg
-share/gnome/gcompris/boards/sounds/nb/alphabet/U0076.ogg
-share/gnome/gcompris/boards/sounds/nb/alphabet/U0077.ogg
-share/gnome/gcompris/boards/sounds/nb/alphabet/U0078.ogg
-share/gnome/gcompris/boards/sounds/nb/alphabet/U0079.ogg
-share/gnome/gcompris/boards/sounds/nb/alphabet/U007A.ogg
-share/gnome/gcompris/boards/sounds/nb/alphabet/U00E5.ogg
-share/gnome/gcompris/boards/sounds/nb/alphabet/U00E6.ogg
-share/gnome/gcompris/boards/sounds/nb/alphabet/U00F8.ogg
-share/gnome/gcompris/boards/sounds/nb/colors/README
-share/gnome/gcompris/boards/sounds/nb/colors/black.ogg
-share/gnome/gcompris/boards/sounds/nb/colors/blue.ogg
-share/gnome/gcompris/boards/sounds/nb/colors/brown.ogg
-share/gnome/gcompris/boards/sounds/nb/colors/green.ogg
-share/gnome/gcompris/boards/sounds/nb/colors/grey.ogg
-share/gnome/gcompris/boards/sounds/nb/colors/orange.ogg
-share/gnome/gcompris/boards/sounds/nb/colors/pink.ogg
-share/gnome/gcompris/boards/sounds/nb/colors/purple.ogg
-share/gnome/gcompris/boards/sounds/nb/colors/red.ogg
-share/gnome/gcompris/boards/sounds/nb/colors/white.ogg
-share/gnome/gcompris/boards/sounds/nb/colors/yellow.ogg
-share/gnome/gcompris/boards/sounds/nb/geography/README
-share/gnome/gcompris/boards/sounds/nb/geography/africa.ogg
-share/gnome/gcompris/boards/sounds/nb/geography/alaska.ogg
-share/gnome/gcompris/boards/sounds/nb/geography/albania.ogg
-share/gnome/gcompris/boards/sounds/nb/geography/america.ogg
-share/gnome/gcompris/boards/sounds/nb/geography/angola.ogg
-share/gnome/gcompris/boards/sounds/nb/geography/argentina.ogg
-share/gnome/gcompris/boards/sounds/nb/geography/asia.ogg
-share/gnome/gcompris/boards/sounds/nb/geography/austria.ogg
-share/gnome/gcompris/boards/sounds/nb/geography/bahamas.ogg
-share/gnome/gcompris/boards/sounds/nb/geography/belarus.ogg
-share/gnome/gcompris/boards/sounds/nb/geography/belgium.ogg
-share/gnome/gcompris/boards/sounds/nb/geography/benin.ogg
-share/gnome/gcompris/boards/sounds/nb/geography/bolivia.ogg
-share/gnome/gcompris/boards/sounds/nb/geography/bosnia_herzegovina.ogg
-share/gnome/gcompris/boards/sounds/nb/geography/botswana.ogg
-share/gnome/gcompris/boards/sounds/nb/geography/brazil.ogg
-share/gnome/gcompris/boards/sounds/nb/geography/bulgaria.ogg
-share/gnome/gcompris/boards/sounds/nb/geography/burundi.ogg
-share/gnome/gcompris/boards/sounds/nb/geography/cameroon.ogg
-share/gnome/gcompris/boards/sounds/nb/geography/canada.ogg
-share/gnome/gcompris/boards/sounds/nb/geography/chile.ogg
-share/gnome/gcompris/boards/sounds/nb/geography/colombia.ogg
-share/gnome/gcompris/boards/sounds/nb/geography/congo.ogg
-share/gnome/gcompris/boards/sounds/nb/geography/costa_rica.ogg
-share/gnome/gcompris/boards/sounds/nb/geography/croatia.ogg
-share/gnome/gcompris/boards/sounds/nb/geography/cuba.ogg
-share/gnome/gcompris/boards/sounds/nb/geography/cyprus.ogg
-share/gnome/gcompris/boards/sounds/nb/geography/czech.ogg
-share/gnome/gcompris/boards/sounds/nb/geography/denmark.ogg
-share/gnome/gcompris/boards/sounds/nb/geography/dominican_republic.ogg
-share/gnome/gcompris/boards/sounds/nb/geography/ecuador.ogg
-share/gnome/gcompris/boards/sounds/nb/geography/egypt.ogg
-share/gnome/gcompris/boards/sounds/nb/geography/equatorial_guinea.ogg
-share/gnome/gcompris/boards/sounds/nb/geography/eritrea.ogg
-share/gnome/gcompris/boards/sounds/nb/geography/estonia.ogg
-share/gnome/gcompris/boards/sounds/nb/geography/europe.ogg
-share/gnome/gcompris/boards/sounds/nb/geography/finland.ogg
-share/gnome/gcompris/boards/sounds/nb/geography/france.ogg
-share/gnome/gcompris/boards/sounds/nb/geography/french_guiana.ogg
-share/gnome/gcompris/boards/sounds/nb/geography/gabon.ogg
-share/gnome/gcompris/boards/sounds/nb/geography/gambia.ogg
-share/gnome/gcompris/boards/sounds/nb/geography/germany.ogg
-share/gnome/gcompris/boards/sounds/nb/geography/ghana.ogg
-share/gnome/gcompris/boards/sounds/nb/geography/greece.ogg
-share/gnome/gcompris/boards/sounds/nb/geography/greenland.ogg
-share/gnome/gcompris/boards/sounds/nb/geography/guatemala.ogg
-share/gnome/gcompris/boards/sounds/nb/geography/guinea.ogg
-share/gnome/gcompris/boards/sounds/nb/geography/haiti.ogg
-share/gnome/gcompris/boards/sounds/nb/geography/honduras.ogg
-share/gnome/gcompris/boards/sounds/nb/geography/hungary.ogg
-share/gnome/gcompris/boards/sounds/nb/geography/iceland.ogg
-share/gnome/gcompris/boards/sounds/nb/geography/ireland.ogg
-share/gnome/gcompris/boards/sounds/nb/geography/italy.ogg
-share/gnome/gcompris/boards/sounds/nb/geography/ivory_coast.ogg
-share/gnome/gcompris/boards/sounds/nb/geography/jamaica.ogg
-share/gnome/gcompris/boards/sounds/nb/geography/kenya.ogg
-share/gnome/gcompris/boards/sounds/nb/geography/latvia.ogg
-share/gnome/gcompris/boards/sounds/nb/geography/lesotho.ogg
-share/gnome/gcompris/boards/sounds/nb/geography/liberia.ogg
-share/gnome/gcompris/boards/sounds/nb/geography/lithuania.ogg
-share/gnome/gcompris/boards/sounds/nb/geography/luxembourg.ogg
-share/gnome/gcompris/boards/sounds/nb/geography/macedonia.ogg
-share/gnome/gcompris/boards/sounds/nb/geography/madagascar.ogg
-share/gnome/gcompris/boards/sounds/nb/geography/mali.ogg
-share/gnome/gcompris/boards/sounds/nb/geography/mauritania.ogg
-share/gnome/gcompris/boards/sounds/nb/geography/mexico.ogg
-share/gnome/gcompris/boards/sounds/nb/geography/moldova.ogg
-share/gnome/gcompris/boards/sounds/nb/geography/moroco.ogg
-share/gnome/gcompris/boards/sounds/nb/geography/mozambique.ogg
-share/gnome/gcompris/boards/sounds/nb/geography/namibia.ogg
-share/gnome/gcompris/boards/sounds/nb/geography/netherland.ogg
-share/gnome/gcompris/boards/sounds/nb/geography/nicaragua.ogg
-share/gnome/gcompris/boards/sounds/nb/geography/niger.ogg
-share/gnome/gcompris/boards/sounds/nb/geography/nigeria.ogg
-share/gnome/gcompris/boards/sounds/nb/geography/north_america.ogg
-share/gnome/gcompris/boards/sounds/nb/geography/norway.ogg
-share/gnome/gcompris/boards/sounds/nb/geography/panama.ogg
-share/gnome/gcompris/boards/sounds/nb/geography/paraguay.ogg
-share/gnome/gcompris/boards/sounds/nb/geography/peru.ogg
-share/gnome/gcompris/boards/sounds/nb/geography/poland.ogg
-share/gnome/gcompris/boards/sounds/nb/geography/portugal.ogg
-share/gnome/gcompris/boards/sounds/nb/geography/romania.ogg
-share/gnome/gcompris/boards/sounds/nb/geography/russia.ogg
-share/gnome/gcompris/boards/sounds/nb/geography/rwanda.ogg
-share/gnome/gcompris/boards/sounds/nb/geography/salvador.ogg
-share/gnome/gcompris/boards/sounds/nb/geography/senegal.ogg
-share/gnome/gcompris/boards/sounds/nb/geography/serbia_montenegro.ogg
-share/gnome/gcompris/boards/sounds/nb/geography/slovakia.ogg
-share/gnome/gcompris/boards/sounds/nb/geography/slovenia.ogg
-share/gnome/gcompris/boards/sounds/nb/geography/somalia.ogg
-share/gnome/gcompris/boards/sounds/nb/geography/soudan.ogg
-share/gnome/gcompris/boards/sounds/nb/geography/south_africa.ogg
-share/gnome/gcompris/boards/sounds/nb/geography/south_america.ogg
-share/gnome/gcompris/boards/sounds/nb/geography/spain.ogg
-share/gnome/gcompris/boards/sounds/nb/geography/suriname.ogg
-share/gnome/gcompris/boards/sounds/nb/geography/swaziland.ogg
-share/gnome/gcompris/boards/sounds/nb/geography/sweden.ogg
-share/gnome/gcompris/boards/sounds/nb/geography/switz.ogg
-share/gnome/gcompris/boards/sounds/nb/geography/togo.ogg
-share/gnome/gcompris/boards/sounds/nb/geography/turkey.ogg
-share/gnome/gcompris/boards/sounds/nb/geography/uganda.ogg
-share/gnome/gcompris/boards/sounds/nb/geography/ukraine.ogg
-share/gnome/gcompris/boards/sounds/nb/geography/united_kingdom.ogg
-share/gnome/gcompris/boards/sounds/nb/geography/uruguay.ogg
-share/gnome/gcompris/boards/sounds/nb/geography/usa.ogg
-share/gnome/gcompris/boards/sounds/nb/geography/venezuela.ogg
-share/gnome/gcompris/boards/sounds/nb/geography/zambia.ogg
-share/gnome/gcompris/boards/sounds/nb/geography/zimbabwe.ogg
-share/gnome/gcompris/boards/sounds/nb/misc/README
-share/gnome/gcompris/boards/sounds/nb/misc/about.ogg
-share/gnome/gcompris/boards/sounds/nb/misc/awesome.ogg
-share/gnome/gcompris/boards/sounds/nb/misc/back.ogg
-share/gnome/gcompris/boards/sounds/nb/misc/by.ogg
-share/gnome/gcompris/boards/sounds/nb/misc/check_answer.ogg
-share/gnome/gcompris/boards/sounds/nb/misc/click_on_letter.ogg
-share/gnome/gcompris/boards/sounds/nb/misc/configuration.ogg
-share/gnome/gcompris/boards/sounds/nb/misc/congratulation.ogg
-share/gnome/gcompris/boards/sounds/nb/misc/equal.ogg
-share/gnome/gcompris/boards/sounds/nb/misc/fantastic.ogg
-share/gnome/gcompris/boards/sounds/nb/misc/good.ogg
-share/gnome/gcompris/boards/sounds/nb/misc/great.ogg
-share/gnome/gcompris/boards/sounds/nb/misc/help.ogg
-share/gnome/gcompris/boards/sounds/nb/misc/level.ogg
-share/gnome/gcompris/boards/sounds/nb/misc/minus.ogg
-share/gnome/gcompris/boards/sounds/nb/misc/ok.ogg
-share/gnome/gcompris/boards/sounds/nb/misc/outof.ogg
-share/gnome/gcompris/boards/sounds/nb/misc/perfect.ogg
-share/gnome/gcompris/boards/sounds/nb/misc/plus.ogg
-share/gnome/gcompris/boards/sounds/nb/misc/quit.ogg
-share/gnome/gcompris/boards/sounds/nb/misc/super.ogg
-share/gnome/gcompris/boards/sounds/nb/misc/waytogo.ogg
-share/gnome/gcompris/boards/sounds/nb/misc/welcome.ogg
-share/gnome/gcompris/boards/sounds/nl/alphabet/10.ogg
-share/gnome/gcompris/boards/sounds/nl/alphabet/README
-share/gnome/gcompris/boards/sounds/nl/alphabet/U0030.ogg
-share/gnome/gcompris/boards/sounds/nl/alphabet/U0031.ogg
-share/gnome/gcompris/boards/sounds/nl/alphabet/U0032.ogg
-share/gnome/gcompris/boards/sounds/nl/alphabet/U0033.ogg
-share/gnome/gcompris/boards/sounds/nl/alphabet/U0034.ogg
-share/gnome/gcompris/boards/sounds/nl/alphabet/U0035.ogg
-share/gnome/gcompris/boards/sounds/nl/alphabet/U0036.ogg
-share/gnome/gcompris/boards/sounds/nl/alphabet/U0037.ogg
-share/gnome/gcompris/boards/sounds/nl/alphabet/U0038.ogg
-share/gnome/gcompris/boards/sounds/nl/alphabet/U0039.ogg
-share/gnome/gcompris/boards/sounds/nl/alphabet/U0061.ogg
-share/gnome/gcompris/boards/sounds/nl/alphabet/U0062.ogg
-share/gnome/gcompris/boards/sounds/nl/alphabet/U0063.ogg
-share/gnome/gcompris/boards/sounds/nl/alphabet/U0064.ogg
-share/gnome/gcompris/boards/sounds/nl/alphabet/U0065.ogg
-share/gnome/gcompris/boards/sounds/nl/alphabet/U0066.ogg
-share/gnome/gcompris/boards/sounds/nl/alphabet/U0067.ogg
-share/gnome/gcompris/boards/sounds/nl/alphabet/U0068.ogg
-share/gnome/gcompris/boards/sounds/nl/alphabet/U0069.ogg
-share/gnome/gcompris/boards/sounds/nl/alphabet/U006A.ogg
-share/gnome/gcompris/boards/sounds/nl/alphabet/U006B.ogg
-share/gnome/gcompris/boards/sounds/nl/alphabet/U006C.ogg
-share/gnome/gcompris/boards/sounds/nl/alphabet/U006D.ogg
-share/gnome/gcompris/boards/sounds/nl/alphabet/U006E.ogg
-share/gnome/gcompris/boards/sounds/nl/alphabet/U006F.ogg
-share/gnome/gcompris/boards/sounds/nl/alphabet/U0070.ogg
-share/gnome/gcompris/boards/sounds/nl/alphabet/U0071.ogg
-share/gnome/gcompris/boards/sounds/nl/alphabet/U0072.ogg
-share/gnome/gcompris/boards/sounds/nl/alphabet/U0073.ogg
-share/gnome/gcompris/boards/sounds/nl/alphabet/U0074.ogg
-share/gnome/gcompris/boards/sounds/nl/alphabet/U0075.ogg
-share/gnome/gcompris/boards/sounds/nl/alphabet/U0076.ogg
-share/gnome/gcompris/boards/sounds/nl/alphabet/U0077.ogg
-share/gnome/gcompris/boards/sounds/nl/alphabet/U0078.ogg
-share/gnome/gcompris/boards/sounds/nl/alphabet/U0079.ogg
-share/gnome/gcompris/boards/sounds/nl/alphabet/U007A.ogg
-share/gnome/gcompris/boards/sounds/nl/colors/README
-share/gnome/gcompris/boards/sounds/nl/colors/black.ogg
-share/gnome/gcompris/boards/sounds/nl/colors/blue.ogg
-share/gnome/gcompris/boards/sounds/nl/colors/brown.ogg
-share/gnome/gcompris/boards/sounds/nl/colors/green.ogg
-share/gnome/gcompris/boards/sounds/nl/colors/grey.ogg
-share/gnome/gcompris/boards/sounds/nl/colors/orange.ogg
-share/gnome/gcompris/boards/sounds/nl/colors/pink.ogg
-share/gnome/gcompris/boards/sounds/nl/colors/purple.ogg
-share/gnome/gcompris/boards/sounds/nl/colors/red.ogg
-share/gnome/gcompris/boards/sounds/nl/colors/white.ogg
-share/gnome/gcompris/boards/sounds/nl/colors/yellow.ogg
-share/gnome/gcompris/boards/sounds/nl/geography/README
-share/gnome/gcompris/boards/sounds/nl/geography/alaska.ogg
-share/gnome/gcompris/boards/sounds/nl/geography/albania.ogg
-share/gnome/gcompris/boards/sounds/nl/geography/argentina.ogg
-share/gnome/gcompris/boards/sounds/nl/geography/austria.ogg
-share/gnome/gcompris/boards/sounds/nl/geography/bahamas.ogg
-share/gnome/gcompris/boards/sounds/nl/geography/belarus.ogg
-share/gnome/gcompris/boards/sounds/nl/geography/belgium.ogg
-share/gnome/gcompris/boards/sounds/nl/geography/bolivia.ogg
-share/gnome/gcompris/boards/sounds/nl/geography/bosnia_herzegovina.ogg
-share/gnome/gcompris/boards/sounds/nl/geography/brazil.ogg
-share/gnome/gcompris/boards/sounds/nl/geography/bulgaria.ogg
-share/gnome/gcompris/boards/sounds/nl/geography/canada.ogg
-share/gnome/gcompris/boards/sounds/nl/geography/chile.ogg
-share/gnome/gcompris/boards/sounds/nl/geography/colombia.ogg
-share/gnome/gcompris/boards/sounds/nl/geography/costa_rica.ogg
-share/gnome/gcompris/boards/sounds/nl/geography/croatia.ogg
-share/gnome/gcompris/boards/sounds/nl/geography/cuba.ogg
-share/gnome/gcompris/boards/sounds/nl/geography/cyprus.ogg
-share/gnome/gcompris/boards/sounds/nl/geography/czech.ogg
-share/gnome/gcompris/boards/sounds/nl/geography/denmark.ogg
-share/gnome/gcompris/boards/sounds/nl/geography/dominican_republic.ogg
-share/gnome/gcompris/boards/sounds/nl/geography/ecuador.ogg
-share/gnome/gcompris/boards/sounds/nl/geography/estonia.ogg
-share/gnome/gcompris/boards/sounds/nl/geography/finland.ogg
-share/gnome/gcompris/boards/sounds/nl/geography/france.ogg
-share/gnome/gcompris/boards/sounds/nl/geography/french_guiana.ogg
-share/gnome/gcompris/boards/sounds/nl/geography/germany.ogg
-share/gnome/gcompris/boards/sounds/nl/geography/greece.ogg
-share/gnome/gcompris/boards/sounds/nl/geography/greenland.ogg
-share/gnome/gcompris/boards/sounds/nl/geography/guatemala.ogg
-share/gnome/gcompris/boards/sounds/nl/geography/guyana.ogg
-share/gnome/gcompris/boards/sounds/nl/geography/haiti.ogg
-share/gnome/gcompris/boards/sounds/nl/geography/honduras.ogg
-share/gnome/gcompris/boards/sounds/nl/geography/hungary.ogg
-share/gnome/gcompris/boards/sounds/nl/geography/iceland.ogg
-share/gnome/gcompris/boards/sounds/nl/geography/ireland.ogg
-share/gnome/gcompris/boards/sounds/nl/geography/italy.ogg
-share/gnome/gcompris/boards/sounds/nl/geography/jamaica.ogg
-share/gnome/gcompris/boards/sounds/nl/geography/latvia.ogg
-share/gnome/gcompris/boards/sounds/nl/geography/lithuania.ogg
-share/gnome/gcompris/boards/sounds/nl/geography/luxembourg.ogg
-share/gnome/gcompris/boards/sounds/nl/geography/macedonia.ogg
-share/gnome/gcompris/boards/sounds/nl/geography/mexico.ogg
-share/gnome/gcompris/boards/sounds/nl/geography/moldova.ogg
-share/gnome/gcompris/boards/sounds/nl/geography/netherland.ogg
-share/gnome/gcompris/boards/sounds/nl/geography/nicaragua.ogg
-share/gnome/gcompris/boards/sounds/nl/geography/norway.ogg
-share/gnome/gcompris/boards/sounds/nl/geography/panama.ogg
-share/gnome/gcompris/boards/sounds/nl/geography/paraguay.ogg
-share/gnome/gcompris/boards/sounds/nl/geography/peru.ogg
-share/gnome/gcompris/boards/sounds/nl/geography/poland.ogg
-share/gnome/gcompris/boards/sounds/nl/geography/portugal.ogg
-share/gnome/gcompris/boards/sounds/nl/geography/romania.ogg
-share/gnome/gcompris/boards/sounds/nl/geography/russia.ogg
-share/gnome/gcompris/boards/sounds/nl/geography/salvador.ogg
-share/gnome/gcompris/boards/sounds/nl/geography/serbia_montenegro.ogg
-share/gnome/gcompris/boards/sounds/nl/geography/slovakia.ogg
-share/gnome/gcompris/boards/sounds/nl/geography/slovenia.ogg
-share/gnome/gcompris/boards/sounds/nl/geography/spain.ogg
-share/gnome/gcompris/boards/sounds/nl/geography/suriname.ogg
-share/gnome/gcompris/boards/sounds/nl/geography/sweden.ogg
-share/gnome/gcompris/boards/sounds/nl/geography/switz.ogg
-share/gnome/gcompris/boards/sounds/nl/geography/turkey.ogg
-share/gnome/gcompris/boards/sounds/nl/geography/ukraine.ogg
-share/gnome/gcompris/boards/sounds/nl/geography/united_kingdom.ogg
-share/gnome/gcompris/boards/sounds/nl/geography/uruguay.ogg
-share/gnome/gcompris/boards/sounds/nl/geography/usa.ogg
-share/gnome/gcompris/boards/sounds/nl/geography/venezuela.ogg
-share/gnome/gcompris/boards/sounds/nl/misc/README
-share/gnome/gcompris/boards/sounds/nl/misc/awesome.ogg
-share/gnome/gcompris/boards/sounds/nl/misc/back.ogg
-share/gnome/gcompris/boards/sounds/nl/misc/by.ogg
-share/gnome/gcompris/boards/sounds/nl/misc/check_answer.ogg
-share/gnome/gcompris/boards/sounds/nl/misc/click_on_letter.ogg
-share/gnome/gcompris/boards/sounds/nl/misc/congratulation.ogg
-share/gnome/gcompris/boards/sounds/nl/misc/equal.ogg
-share/gnome/gcompris/boards/sounds/nl/misc/fantastic.ogg
-share/gnome/gcompris/boards/sounds/nl/misc/good.ogg
-share/gnome/gcompris/boards/sounds/nl/misc/great.ogg
-share/gnome/gcompris/boards/sounds/nl/misc/help.ogg
-share/gnome/gcompris/boards/sounds/nl/misc/level.ogg
-share/gnome/gcompris/boards/sounds/nl/misc/minus.ogg
-share/gnome/gcompris/boards/sounds/nl/misc/ok.ogg
-share/gnome/gcompris/boards/sounds/nl/misc/outof.ogg
-share/gnome/gcompris/boards/sounds/nl/misc/perfect.ogg
-share/gnome/gcompris/boards/sounds/nl/misc/plus.ogg
-share/gnome/gcompris/boards/sounds/nl/misc/quit.ogg
-share/gnome/gcompris/boards/sounds/nl/misc/super.ogg
-share/gnome/gcompris/boards/sounds/nl/misc/waytogo.ogg
-share/gnome/gcompris/boards/sounds/nl/misc/welcome.ogg
-share/gnome/gcompris/boards/sounds/paint1.wav
-share/gnome/gcompris/boards/sounds/prompt.wav
-share/gnome/gcompris/boards/sounds/pt/alphabet/10.ogg
-share/gnome/gcompris/boards/sounds/pt/alphabet/README
-share/gnome/gcompris/boards/sounds/pt/alphabet/U0030.ogg
-share/gnome/gcompris/boards/sounds/pt/alphabet/U0031.ogg
-share/gnome/gcompris/boards/sounds/pt/alphabet/U0032.ogg
-share/gnome/gcompris/boards/sounds/pt/alphabet/U0033.ogg
-share/gnome/gcompris/boards/sounds/pt/alphabet/U0034.ogg
-share/gnome/gcompris/boards/sounds/pt/alphabet/U0035.ogg
-share/gnome/gcompris/boards/sounds/pt/alphabet/U0036.ogg
-share/gnome/gcompris/boards/sounds/pt/alphabet/U0037.ogg
-share/gnome/gcompris/boards/sounds/pt/alphabet/U0038.ogg
-share/gnome/gcompris/boards/sounds/pt/alphabet/U0039.ogg
-share/gnome/gcompris/boards/sounds/pt/alphabet/U0061.ogg
-share/gnome/gcompris/boards/sounds/pt/alphabet/U0062.ogg
-share/gnome/gcompris/boards/sounds/pt/alphabet/U0063.ogg
-share/gnome/gcompris/boards/sounds/pt/alphabet/U0064.ogg
-share/gnome/gcompris/boards/sounds/pt/alphabet/U0065.ogg
-share/gnome/gcompris/boards/sounds/pt/alphabet/U0066.ogg
-share/gnome/gcompris/boards/sounds/pt/alphabet/U0067.ogg
-share/gnome/gcompris/boards/sounds/pt/alphabet/U0068.ogg
-share/gnome/gcompris/boards/sounds/pt/alphabet/U0069.ogg
-share/gnome/gcompris/boards/sounds/pt/alphabet/U006A.ogg
-share/gnome/gcompris/boards/sounds/pt/alphabet/U006B.ogg
-share/gnome/gcompris/boards/sounds/pt/alphabet/U006C.ogg
-share/gnome/gcompris/boards/sounds/pt/alphabet/U006D.ogg
-share/gnome/gcompris/boards/sounds/pt/alphabet/U006E.ogg
-share/gnome/gcompris/boards/sounds/pt/alphabet/U006F.ogg
-share/gnome/gcompris/boards/sounds/pt/alphabet/U0070.ogg
-share/gnome/gcompris/boards/sounds/pt/alphabet/U0071.ogg
-share/gnome/gcompris/boards/sounds/pt/alphabet/U0072.ogg
-share/gnome/gcompris/boards/sounds/pt/alphabet/U0073.ogg
-share/gnome/gcompris/boards/sounds/pt/alphabet/U0074.ogg
-share/gnome/gcompris/boards/sounds/pt/alphabet/U0075.ogg
-share/gnome/gcompris/boards/sounds/pt/alphabet/U0076.ogg
-share/gnome/gcompris/boards/sounds/pt/alphabet/U0077.ogg
-share/gnome/gcompris/boards/sounds/pt/alphabet/U0078.ogg
-share/gnome/gcompris/boards/sounds/pt/alphabet/U0079.ogg
-share/gnome/gcompris/boards/sounds/pt/alphabet/U007A.ogg
-share/gnome/gcompris/boards/sounds/pt/colors/README
-share/gnome/gcompris/boards/sounds/pt/colors/black.ogg
-share/gnome/gcompris/boards/sounds/pt/colors/blue.ogg
-share/gnome/gcompris/boards/sounds/pt/colors/brown.ogg
-share/gnome/gcompris/boards/sounds/pt/colors/green.ogg
-share/gnome/gcompris/boards/sounds/pt/colors/grey.ogg
-share/gnome/gcompris/boards/sounds/pt/colors/orange.ogg
-share/gnome/gcompris/boards/sounds/pt/colors/pink.ogg
-share/gnome/gcompris/boards/sounds/pt/colors/purple.ogg
-share/gnome/gcompris/boards/sounds/pt/colors/red.ogg
-share/gnome/gcompris/boards/sounds/pt/colors/white.ogg
-share/gnome/gcompris/boards/sounds/pt/colors/yellow.ogg
-share/gnome/gcompris/boards/sounds/pt/geography/README
-share/gnome/gcompris/boards/sounds/pt/geography/africa.ogg
-share/gnome/gcompris/boards/sounds/pt/geography/alaska.ogg
-share/gnome/gcompris/boards/sounds/pt/geography/albania.ogg
-share/gnome/gcompris/boards/sounds/pt/geography/america.ogg
-share/gnome/gcompris/boards/sounds/pt/geography/antartica.ogg
-share/gnome/gcompris/boards/sounds/pt/geography/argentina.ogg
-share/gnome/gcompris/boards/sounds/pt/geography/asia.ogg
-share/gnome/gcompris/boards/sounds/pt/geography/austria.ogg
-share/gnome/gcompris/boards/sounds/pt/geography/bahamas.ogg
-share/gnome/gcompris/boards/sounds/pt/geography/belarus.ogg
-share/gnome/gcompris/boards/sounds/pt/geography/belgium.ogg
-share/gnome/gcompris/boards/sounds/pt/geography/bolivia.ogg
-share/gnome/gcompris/boards/sounds/pt/geography/bosnia_herzegovina.ogg
-share/gnome/gcompris/boards/sounds/pt/geography/brazil.ogg
-share/gnome/gcompris/boards/sounds/pt/geography/bulgaria.ogg
-share/gnome/gcompris/boards/sounds/pt/geography/canada.ogg
-share/gnome/gcompris/boards/sounds/pt/geography/chile.ogg
-share/gnome/gcompris/boards/sounds/pt/geography/colombia.ogg
-share/gnome/gcompris/boards/sounds/pt/geography/costa_rica.ogg
-share/gnome/gcompris/boards/sounds/pt/geography/croatia.ogg
-share/gnome/gcompris/boards/sounds/pt/geography/cuba.ogg
-share/gnome/gcompris/boards/sounds/pt/geography/cyprus.ogg
-share/gnome/gcompris/boards/sounds/pt/geography/czech.ogg
-share/gnome/gcompris/boards/sounds/pt/geography/denmark.ogg
-share/gnome/gcompris/boards/sounds/pt/geography/dominican_republic.ogg
-share/gnome/gcompris/boards/sounds/pt/geography/ecuador.ogg
-share/gnome/gcompris/boards/sounds/pt/geography/estonia.ogg
-share/gnome/gcompris/boards/sounds/pt/geography/europe.ogg
-share/gnome/gcompris/boards/sounds/pt/geography/finland.ogg
-share/gnome/gcompris/boards/sounds/pt/geography/france.ogg
-share/gnome/gcompris/boards/sounds/pt/geography/french_guiana.ogg
-share/gnome/gcompris/boards/sounds/pt/geography/germany.ogg
-share/gnome/gcompris/boards/sounds/pt/geography/greece.ogg
-share/gnome/gcompris/boards/sounds/pt/geography/greenland.ogg
-share/gnome/gcompris/boards/sounds/pt/geography/guatemala.ogg
-share/gnome/gcompris/boards/sounds/pt/geography/guyana.ogg
-share/gnome/gcompris/boards/sounds/pt/geography/haiti.ogg
-share/gnome/gcompris/boards/sounds/pt/geography/honduras.ogg
-share/gnome/gcompris/boards/sounds/pt/geography/hungary.ogg
-share/gnome/gcompris/boards/sounds/pt/geography/iceland.ogg
-share/gnome/gcompris/boards/sounds/pt/geography/ireland.ogg
-share/gnome/gcompris/boards/sounds/pt/geography/italy.ogg
-share/gnome/gcompris/boards/sounds/pt/geography/jamaica.ogg
-share/gnome/gcompris/boards/sounds/pt/geography/latvia.ogg
-share/gnome/gcompris/boards/sounds/pt/geography/lithuania.ogg
-share/gnome/gcompris/boards/sounds/pt/geography/luxembourg.ogg
-share/gnome/gcompris/boards/sounds/pt/geography/macedonia.ogg
-share/gnome/gcompris/boards/sounds/pt/geography/mexico.ogg
-share/gnome/gcompris/boards/sounds/pt/geography/moldova.ogg
-share/gnome/gcompris/boards/sounds/pt/geography/netherland.ogg
-share/gnome/gcompris/boards/sounds/pt/geography/nicaragua.ogg
-share/gnome/gcompris/boards/sounds/pt/geography/norway.ogg
-share/gnome/gcompris/boards/sounds/pt/geography/oceania.ogg
-share/gnome/gcompris/boards/sounds/pt/geography/panama.ogg
-share/gnome/gcompris/boards/sounds/pt/geography/paraguay.ogg
-share/gnome/gcompris/boards/sounds/pt/geography/peru.ogg
-share/gnome/gcompris/boards/sounds/pt/geography/poland.ogg
-share/gnome/gcompris/boards/sounds/pt/geography/portugal.ogg
-share/gnome/gcompris/boards/sounds/pt/geography/romania.ogg
-share/gnome/gcompris/boards/sounds/pt/geography/russia.ogg
-share/gnome/gcompris/boards/sounds/pt/geography/salvador.ogg
-share/gnome/gcompris/boards/sounds/pt/geography/serbia_montenegro.ogg
-share/gnome/gcompris/boards/sounds/pt/geography/slovakia.ogg
-share/gnome/gcompris/boards/sounds/pt/geography/slovenia.ogg
-share/gnome/gcompris/boards/sounds/pt/geography/spain.ogg
-share/gnome/gcompris/boards/sounds/pt/geography/suriname.ogg
-share/gnome/gcompris/boards/sounds/pt/geography/sweden.ogg
-share/gnome/gcompris/boards/sounds/pt/geography/switz.ogg
-share/gnome/gcompris/boards/sounds/pt/geography/turkey.ogg
-share/gnome/gcompris/boards/sounds/pt/geography/ukraine.ogg
-share/gnome/gcompris/boards/sounds/pt/geography/united_kingdom.ogg
-share/gnome/gcompris/boards/sounds/pt/geography/uruguay.ogg
-share/gnome/gcompris/boards/sounds/pt/geography/usa.ogg
-share/gnome/gcompris/boards/sounds/pt/geography/venezuela.ogg
-share/gnome/gcompris/boards/sounds/pt/misc/README
-share/gnome/gcompris/boards/sounds/pt/misc/about.ogg
-share/gnome/gcompris/boards/sounds/pt/misc/awesome.ogg
-share/gnome/gcompris/boards/sounds/pt/misc/back.ogg
-share/gnome/gcompris/boards/sounds/pt/misc/by.ogg
-share/gnome/gcompris/boards/sounds/pt/misc/click_on_letter.ogg
-share/gnome/gcompris/boards/sounds/pt/misc/configuration.ogg
-share/gnome/gcompris/boards/sounds/pt/misc/congratulation.ogg
-share/gnome/gcompris/boards/sounds/pt/misc/equal.ogg
-share/gnome/gcompris/boards/sounds/pt/misc/fantastic.ogg
-share/gnome/gcompris/boards/sounds/pt/misc/good.ogg
-share/gnome/gcompris/boards/sounds/pt/misc/great.ogg
-share/gnome/gcompris/boards/sounds/pt/misc/help.ogg
-share/gnome/gcompris/boards/sounds/pt/misc/level.ogg
-share/gnome/gcompris/boards/sounds/pt/misc/minus.ogg
-share/gnome/gcompris/boards/sounds/pt/misc/ok.ogg
-share/gnome/gcompris/boards/sounds/pt/misc/outof.ogg
-share/gnome/gcompris/boards/sounds/pt/misc/perfect.ogg
-share/gnome/gcompris/boards/sounds/pt/misc/plus.ogg
-share/gnome/gcompris/boards/sounds/pt/misc/quit.ogg
-share/gnome/gcompris/boards/sounds/pt/misc/super.ogg
-share/gnome/gcompris/boards/sounds/pt/misc/waytogo.ogg
-share/gnome/gcompris/boards/sounds/pt/misc/welcome.ogg
-share/gnome/gcompris/boards/sounds/pt_BR/README
-share/gnome/gcompris/boards/sounds/pt_BR/alphabet/10.ogg
-share/gnome/gcompris/boards/sounds/pt_BR/alphabet/U0031.ogg
-share/gnome/gcompris/boards/sounds/pt_BR/alphabet/U0032.ogg
-share/gnome/gcompris/boards/sounds/pt_BR/alphabet/U0033.ogg
-share/gnome/gcompris/boards/sounds/pt_BR/alphabet/U0034.ogg
-share/gnome/gcompris/boards/sounds/pt_BR/alphabet/U0035.ogg
-share/gnome/gcompris/boards/sounds/pt_BR/alphabet/U0036.ogg
-share/gnome/gcompris/boards/sounds/pt_BR/alphabet/U0037.ogg
-share/gnome/gcompris/boards/sounds/pt_BR/alphabet/U0038.ogg
-share/gnome/gcompris/boards/sounds/pt_BR/alphabet/U0039.ogg
-share/gnome/gcompris/boards/sounds/pt_BR/alphabet/U0061.ogg
-share/gnome/gcompris/boards/sounds/pt_BR/alphabet/U0062.ogg
-share/gnome/gcompris/boards/sounds/pt_BR/alphabet/U0063.ogg
-share/gnome/gcompris/boards/sounds/pt_BR/alphabet/U0064.ogg
-share/gnome/gcompris/boards/sounds/pt_BR/alphabet/U0065.ogg
-share/gnome/gcompris/boards/sounds/pt_BR/alphabet/U0066.ogg
-share/gnome/gcompris/boards/sounds/pt_BR/alphabet/U0067.ogg
-share/gnome/gcompris/boards/sounds/pt_BR/alphabet/U0068.ogg
-share/gnome/gcompris/boards/sounds/pt_BR/alphabet/U0069.ogg
-share/gnome/gcompris/boards/sounds/pt_BR/alphabet/U006A.ogg
-share/gnome/gcompris/boards/sounds/pt_BR/alphabet/U006B.ogg
-share/gnome/gcompris/boards/sounds/pt_BR/alphabet/U006C.ogg
-share/gnome/gcompris/boards/sounds/pt_BR/alphabet/U006D.ogg
-share/gnome/gcompris/boards/sounds/pt_BR/alphabet/U006E.ogg
-share/gnome/gcompris/boards/sounds/pt_BR/alphabet/U006F.ogg
-share/gnome/gcompris/boards/sounds/pt_BR/alphabet/U006H.ogg
-share/gnome/gcompris/boards/sounds/pt_BR/alphabet/U0070.ogg
-share/gnome/gcompris/boards/sounds/pt_BR/alphabet/U0071.ogg
-share/gnome/gcompris/boards/sounds/pt_BR/alphabet/U0072.ogg
-share/gnome/gcompris/boards/sounds/pt_BR/alphabet/U0073.ogg
-share/gnome/gcompris/boards/sounds/pt_BR/alphabet/U0074.ogg
-share/gnome/gcompris/boards/sounds/pt_BR/alphabet/U0075.ogg
-share/gnome/gcompris/boards/sounds/pt_BR/alphabet/U0076.ogg
-share/gnome/gcompris/boards/sounds/pt_BR/alphabet/U0077.ogg
-share/gnome/gcompris/boards/sounds/pt_BR/alphabet/U0078.ogg
-share/gnome/gcompris/boards/sounds/pt_BR/alphabet/U0079.ogg
-share/gnome/gcompris/boards/sounds/pt_BR/alphabet/U007A.ogg
-share/gnome/gcompris/boards/sounds/pt_BR/colors/black.ogg
-share/gnome/gcompris/boards/sounds/pt_BR/colors/blue.ogg
-share/gnome/gcompris/boards/sounds/pt_BR/colors/brown.ogg
-share/gnome/gcompris/boards/sounds/pt_BR/colors/green.ogg
-share/gnome/gcompris/boards/sounds/pt_BR/colors/grey.ogg
-share/gnome/gcompris/boards/sounds/pt_BR/colors/orange.ogg
-share/gnome/gcompris/boards/sounds/pt_BR/colors/purple.ogg
-share/gnome/gcompris/boards/sounds/pt_BR/colors/red.ogg
-share/gnome/gcompris/boards/sounds/pt_BR/colors/white.ogg
-share/gnome/gcompris/boards/sounds/pt_BR/colors/yellow.ogg
-share/gnome/gcompris/boards/sounds/pt_BR/geography/africa.ogg
-share/gnome/gcompris/boards/sounds/pt_BR/geography/alaska.ogg
-share/gnome/gcompris/boards/sounds/pt_BR/geography/albania.ogg
-share/gnome/gcompris/boards/sounds/pt_BR/geography/america.ogg
-share/gnome/gcompris/boards/sounds/pt_BR/geography/antartica.ogg
-share/gnome/gcompris/boards/sounds/pt_BR/geography/argentina.ogg
-share/gnome/gcompris/boards/sounds/pt_BR/geography/asia.ogg
-share/gnome/gcompris/boards/sounds/pt_BR/geography/austria.ogg
-share/gnome/gcompris/boards/sounds/pt_BR/geography/bahamas.ogg
-share/gnome/gcompris/boards/sounds/pt_BR/geography/belarus.ogg
-share/gnome/gcompris/boards/sounds/pt_BR/geography/belgium.ogg
-share/gnome/gcompris/boards/sounds/pt_BR/geography/bolivia.ogg
-share/gnome/gcompris/boards/sounds/pt_BR/geography/bosnia_herzegovina.ogg
-share/gnome/gcompris/boards/sounds/pt_BR/geography/brazil.ogg
-share/gnome/gcompris/boards/sounds/pt_BR/geography/bulgaria.ogg
-share/gnome/gcompris/boards/sounds/pt_BR/geography/canada.ogg
-share/gnome/gcompris/boards/sounds/pt_BR/geography/chile.ogg
-share/gnome/gcompris/boards/sounds/pt_BR/geography/colombia.ogg
-share/gnome/gcompris/boards/sounds/pt_BR/geography/costa_rica.ogg
-share/gnome/gcompris/boards/sounds/pt_BR/geography/croatia.ogg
-share/gnome/gcompris/boards/sounds/pt_BR/geography/cuba.ogg
-share/gnome/gcompris/boards/sounds/pt_BR/geography/cyprus.ogg
-share/gnome/gcompris/boards/sounds/pt_BR/geography/czech.ogg
-share/gnome/gcompris/boards/sounds/pt_BR/geography/denmark.ogg
-share/gnome/gcompris/boards/sounds/pt_BR/geography/dominican_republic.ogg
-share/gnome/gcompris/boards/sounds/pt_BR/geography/ecuador.ogg
-share/gnome/gcompris/boards/sounds/pt_BR/geography/estonia.ogg
-share/gnome/gcompris/boards/sounds/pt_BR/geography/europe.ogg
-share/gnome/gcompris/boards/sounds/pt_BR/geography/finland.ogg
-share/gnome/gcompris/boards/sounds/pt_BR/geography/france.ogg
-share/gnome/gcompris/boards/sounds/pt_BR/geography/french_guiana.ogg
-share/gnome/gcompris/boards/sounds/pt_BR/geography/germany.ogg
-share/gnome/gcompris/boards/sounds/pt_BR/geography/greece.ogg
-share/gnome/gcompris/boards/sounds/pt_BR/geography/greenland.ogg
-share/gnome/gcompris/boards/sounds/pt_BR/geography/guatemala.ogg
-share/gnome/gcompris/boards/sounds/pt_BR/geography/guyana.ogg
-share/gnome/gcompris/boards/sounds/pt_BR/geography/haiti.ogg
-share/gnome/gcompris/boards/sounds/pt_BR/geography/honduras.ogg
-share/gnome/gcompris/boards/sounds/pt_BR/geography/hungary.ogg
-share/gnome/gcompris/boards/sounds/pt_BR/geography/iceland.ogg
-share/gnome/gcompris/boards/sounds/pt_BR/geography/ireland.ogg
-share/gnome/gcompris/boards/sounds/pt_BR/geography/italy.ogg
-share/gnome/gcompris/boards/sounds/pt_BR/geography/jamaica.ogg
-share/gnome/gcompris/boards/sounds/pt_BR/geography/latvia.ogg
-share/gnome/gcompris/boards/sounds/pt_BR/geography/lithuania.ogg
-share/gnome/gcompris/boards/sounds/pt_BR/geography/luxembourg.ogg
-share/gnome/gcompris/boards/sounds/pt_BR/geography/macedonia.ogg
-share/gnome/gcompris/boards/sounds/pt_BR/geography/mexico.ogg
-share/gnome/gcompris/boards/sounds/pt_BR/geography/moldova.ogg
-share/gnome/gcompris/boards/sounds/pt_BR/geography/netherland.ogg
-share/gnome/gcompris/boards/sounds/pt_BR/geography/nicaragua.ogg
-share/gnome/gcompris/boards/sounds/pt_BR/geography/norway.ogg
-share/gnome/gcompris/boards/sounds/pt_BR/geography/oceania.ogg
-share/gnome/gcompris/boards/sounds/pt_BR/geography/panama.ogg
-share/gnome/gcompris/boards/sounds/pt_BR/geography/paraguay.ogg
-share/gnome/gcompris/boards/sounds/pt_BR/geography/peru.ogg
-share/gnome/gcompris/boards/sounds/pt_BR/geography/poland.ogg
-share/gnome/gcompris/boards/sounds/pt_BR/geography/portugal.ogg
-share/gnome/gcompris/boards/sounds/pt_BR/geography/romania.ogg
-share/gnome/gcompris/boards/sounds/pt_BR/geography/russia.ogg
-share/gnome/gcompris/boards/sounds/pt_BR/geography/salvador.ogg
-share/gnome/gcompris/boards/sounds/pt_BR/geography/serbia_montenegro.ogg
-share/gnome/gcompris/boards/sounds/pt_BR/geography/slovakia.ogg
-share/gnome/gcompris/boards/sounds/pt_BR/geography/slovenia.ogg
-share/gnome/gcompris/boards/sounds/pt_BR/geography/spain.ogg
-share/gnome/gcompris/boards/sounds/pt_BR/geography/suriname.ogg
-share/gnome/gcompris/boards/sounds/pt_BR/geography/sweden.ogg
-share/gnome/gcompris/boards/sounds/pt_BR/geography/switz.ogg
-share/gnome/gcompris/boards/sounds/pt_BR/geography/turkey.ogg
-share/gnome/gcompris/boards/sounds/pt_BR/geography/ukraine.ogg
-share/gnome/gcompris/boards/sounds/pt_BR/geography/united_kingdom.ogg
-share/gnome/gcompris/boards/sounds/pt_BR/geography/uruguay.ogg
-share/gnome/gcompris/boards/sounds/pt_BR/geography/usa.ogg
-share/gnome/gcompris/boards/sounds/pt_BR/geography/venezuela.ogg
-share/gnome/gcompris/boards/sounds/pt_BR/misc/about.ogg
-share/gnome/gcompris/boards/sounds/pt_BR/misc/back.ogg
-share/gnome/gcompris/boards/sounds/pt_BR/misc/by.ogg
-share/gnome/gcompris/boards/sounds/pt_BR/misc/click_on_letter.ogg
-share/gnome/gcompris/boards/sounds/pt_BR/misc/configuration.ogg
-share/gnome/gcompris/boards/sounds/pt_BR/misc/congratulation.ogg
-share/gnome/gcompris/boards/sounds/pt_BR/misc/equal.ogg
-share/gnome/gcompris/boards/sounds/pt_BR/misc/good.ogg
-share/gnome/gcompris/boards/sounds/pt_BR/misc/great.ogg
-share/gnome/gcompris/boards/sounds/pt_BR/misc/help.ogg
-share/gnome/gcompris/boards/sounds/pt_BR/misc/level.ogg
-share/gnome/gcompris/boards/sounds/pt_BR/misc/minus.ogg
-share/gnome/gcompris/boards/sounds/pt_BR/misc/ok.ogg
-share/gnome/gcompris/boards/sounds/pt_BR/misc/outof.ogg
-share/gnome/gcompris/boards/sounds/pt_BR/misc/plus.ogg
-share/gnome/gcompris/boards/sounds/pt_BR/misc/quit.ogg
-share/gnome/gcompris/boards/sounds/pt_BR/misc/super.ogg
-share/gnome/gcompris/boards/sounds/pt_BR/misc/welcome.ogg
-share/gnome/gcompris/boards/sounds/receive.wav
-share/gnome/gcompris/boards/sounds/ru/alphabet/10.ogg
-share/gnome/gcompris/boards/sounds/ru/alphabet/README
-share/gnome/gcompris/boards/sounds/ru/alphabet/U0031.ogg
-share/gnome/gcompris/boards/sounds/ru/alphabet/U0032.ogg
-share/gnome/gcompris/boards/sounds/ru/alphabet/U0033.ogg
-share/gnome/gcompris/boards/sounds/ru/alphabet/U0034.ogg
-share/gnome/gcompris/boards/sounds/ru/alphabet/U0035.ogg
-share/gnome/gcompris/boards/sounds/ru/alphabet/U0036.ogg
-share/gnome/gcompris/boards/sounds/ru/alphabet/U0037.ogg
-share/gnome/gcompris/boards/sounds/ru/alphabet/U0038.ogg
-share/gnome/gcompris/boards/sounds/ru/alphabet/U0039.ogg
-share/gnome/gcompris/boards/sounds/ru/alphabet/U0061.ogg
-share/gnome/gcompris/boards/sounds/ru/alphabet/U0062.ogg
-share/gnome/gcompris/boards/sounds/ru/alphabet/U0063.ogg
-share/gnome/gcompris/boards/sounds/ru/alphabet/U0064.ogg
-share/gnome/gcompris/boards/sounds/ru/alphabet/U0065.ogg
-share/gnome/gcompris/boards/sounds/ru/alphabet/U0066.ogg
-share/gnome/gcompris/boards/sounds/ru/alphabet/U0067.ogg
-share/gnome/gcompris/boards/sounds/ru/alphabet/U0068.ogg
-share/gnome/gcompris/boards/sounds/ru/alphabet/U0069.ogg
-share/gnome/gcompris/boards/sounds/ru/alphabet/U006A.ogg
-share/gnome/gcompris/boards/sounds/ru/alphabet/U006B.ogg
-share/gnome/gcompris/boards/sounds/ru/alphabet/U006C.ogg
-share/gnome/gcompris/boards/sounds/ru/alphabet/U006D.ogg
-share/gnome/gcompris/boards/sounds/ru/alphabet/U006E.ogg
-share/gnome/gcompris/boards/sounds/ru/alphabet/U006F.ogg
-share/gnome/gcompris/boards/sounds/ru/alphabet/U0070.ogg
-share/gnome/gcompris/boards/sounds/ru/alphabet/U0071.ogg
-share/gnome/gcompris/boards/sounds/ru/alphabet/U0072.ogg
-share/gnome/gcompris/boards/sounds/ru/alphabet/U0073.ogg
-share/gnome/gcompris/boards/sounds/ru/alphabet/U0074.ogg
-share/gnome/gcompris/boards/sounds/ru/alphabet/U0075.ogg
-share/gnome/gcompris/boards/sounds/ru/alphabet/U0076.ogg
-share/gnome/gcompris/boards/sounds/ru/alphabet/U0077.ogg
-share/gnome/gcompris/boards/sounds/ru/alphabet/U0078.ogg
-share/gnome/gcompris/boards/sounds/ru/alphabet/U0079.ogg
-share/gnome/gcompris/boards/sounds/ru/alphabet/U007A.ogg
-share/gnome/gcompris/boards/sounds/ru/alphabet/U0430.ogg
-share/gnome/gcompris/boards/sounds/ru/alphabet/U0431.ogg
-share/gnome/gcompris/boards/sounds/ru/alphabet/U0432.ogg
-share/gnome/gcompris/boards/sounds/ru/alphabet/U0433.ogg
-share/gnome/gcompris/boards/sounds/ru/alphabet/U0434.ogg
-share/gnome/gcompris/boards/sounds/ru/alphabet/U0435.ogg
-share/gnome/gcompris/boards/sounds/ru/alphabet/U0436.ogg
-share/gnome/gcompris/boards/sounds/ru/alphabet/U0437.ogg
-share/gnome/gcompris/boards/sounds/ru/alphabet/U0438.ogg
-share/gnome/gcompris/boards/sounds/ru/alphabet/U0439.ogg
-share/gnome/gcompris/boards/sounds/ru/alphabet/U043A.ogg
-share/gnome/gcompris/boards/sounds/ru/alphabet/U043B.ogg
-share/gnome/gcompris/boards/sounds/ru/alphabet/U043C.ogg
-share/gnome/gcompris/boards/sounds/ru/alphabet/U043D.ogg
-share/gnome/gcompris/boards/sounds/ru/alphabet/U043E.ogg
-share/gnome/gcompris/boards/sounds/ru/alphabet/U043F.ogg
-share/gnome/gcompris/boards/sounds/ru/alphabet/U0440.ogg
-share/gnome/gcompris/boards/sounds/ru/alphabet/U0441.ogg
-share/gnome/gcompris/boards/sounds/ru/alphabet/U0442.ogg
-share/gnome/gcompris/boards/sounds/ru/alphabet/U0443.ogg
-share/gnome/gcompris/boards/sounds/ru/alphabet/U0444.ogg
-share/gnome/gcompris/boards/sounds/ru/alphabet/U0445.ogg
-share/gnome/gcompris/boards/sounds/ru/alphabet/U0446.ogg
-share/gnome/gcompris/boards/sounds/ru/alphabet/U0447.ogg
-share/gnome/gcompris/boards/sounds/ru/alphabet/U0448.ogg
-share/gnome/gcompris/boards/sounds/ru/alphabet/U0449.ogg
-share/gnome/gcompris/boards/sounds/ru/alphabet/U044A.ogg
-share/gnome/gcompris/boards/sounds/ru/alphabet/U044B.ogg
-share/gnome/gcompris/boards/sounds/ru/alphabet/U044C.ogg
-share/gnome/gcompris/boards/sounds/ru/alphabet/U044D.ogg
-share/gnome/gcompris/boards/sounds/ru/alphabet/U044E.ogg
-share/gnome/gcompris/boards/sounds/ru/alphabet/U044F.ogg
-share/gnome/gcompris/boards/sounds/ru/alphabet/U0451.ogg
-share/gnome/gcompris/boards/sounds/ru/colors/README
-share/gnome/gcompris/boards/sounds/ru/colors/black.ogg
-share/gnome/gcompris/boards/sounds/ru/colors/blue.ogg
-share/gnome/gcompris/boards/sounds/ru/colors/brown.ogg
-share/gnome/gcompris/boards/sounds/ru/colors/green.ogg
-share/gnome/gcompris/boards/sounds/ru/colors/grey.ogg
-share/gnome/gcompris/boards/sounds/ru/colors/orange.ogg
-share/gnome/gcompris/boards/sounds/ru/colors/pink.ogg
-share/gnome/gcompris/boards/sounds/ru/colors/purple.ogg
-share/gnome/gcompris/boards/sounds/ru/colors/red.ogg
-share/gnome/gcompris/boards/sounds/ru/colors/white.ogg
-share/gnome/gcompris/boards/sounds/ru/colors/yellow.ogg
-share/gnome/gcompris/boards/sounds/ru/geography/README
-share/gnome/gcompris/boards/sounds/ru/geography/alaska.ogg
-share/gnome/gcompris/boards/sounds/ru/geography/albania.ogg
-share/gnome/gcompris/boards/sounds/ru/geography/argentina.ogg
-share/gnome/gcompris/boards/sounds/ru/geography/austria.ogg
-share/gnome/gcompris/boards/sounds/ru/geography/bahamas.ogg
-share/gnome/gcompris/boards/sounds/ru/geography/belarus.ogg
-share/gnome/gcompris/boards/sounds/ru/geography/belgium.ogg
-share/gnome/gcompris/boards/sounds/ru/geography/bolivia.ogg
-share/gnome/gcompris/boards/sounds/ru/geography/bosnia_herzegovina.ogg
-share/gnome/gcompris/boards/sounds/ru/geography/brazil.ogg
-share/gnome/gcompris/boards/sounds/ru/geography/bulgaria.ogg
-share/gnome/gcompris/boards/sounds/ru/geography/canada.ogg
-share/gnome/gcompris/boards/sounds/ru/geography/chile.ogg
-share/gnome/gcompris/boards/sounds/ru/geography/colombia.ogg
-share/gnome/gcompris/boards/sounds/ru/geography/costa_rica.ogg
-share/gnome/gcompris/boards/sounds/ru/geography/croatia.ogg
-share/gnome/gcompris/boards/sounds/ru/geography/cuba.ogg
-share/gnome/gcompris/boards/sounds/ru/geography/cyprus.ogg
-share/gnome/gcompris/boards/sounds/ru/geography/czech.ogg
-share/gnome/gcompris/boards/sounds/ru/geography/denmark.ogg
-share/gnome/gcompris/boards/sounds/ru/geography/dominican_republic.ogg
-share/gnome/gcompris/boards/sounds/ru/geography/ecuador.ogg
-share/gnome/gcompris/boards/sounds/ru/geography/estonia.ogg
-share/gnome/gcompris/boards/sounds/ru/geography/finland.ogg
-share/gnome/gcompris/boards/sounds/ru/geography/france.ogg
-share/gnome/gcompris/boards/sounds/ru/geography/french_guiana.ogg
-share/gnome/gcompris/boards/sounds/ru/geography/germany.ogg
-share/gnome/gcompris/boards/sounds/ru/geography/greece.ogg
-share/gnome/gcompris/boards/sounds/ru/geography/greenland.ogg
-share/gnome/gcompris/boards/sounds/ru/geography/guatemala.ogg
-share/gnome/gcompris/boards/sounds/ru/geography/guyana.ogg
-share/gnome/gcompris/boards/sounds/ru/geography/haiti.ogg
-share/gnome/gcompris/boards/sounds/ru/geography/honduras.ogg
-share/gnome/gcompris/boards/sounds/ru/geography/hungary.ogg
-share/gnome/gcompris/boards/sounds/ru/geography/iceland.ogg
-share/gnome/gcompris/boards/sounds/ru/geography/ireland.ogg
-share/gnome/gcompris/boards/sounds/ru/geography/italy.ogg
-share/gnome/gcompris/boards/sounds/ru/geography/jamaica.ogg
-share/gnome/gcompris/boards/sounds/ru/geography/latvia.ogg
-share/gnome/gcompris/boards/sounds/ru/geography/lithuania.ogg
-share/gnome/gcompris/boards/sounds/ru/geography/luxembourg.ogg
-share/gnome/gcompris/boards/sounds/ru/geography/macedonia.ogg
-share/gnome/gcompris/boards/sounds/ru/geography/mexico.ogg
-share/gnome/gcompris/boards/sounds/ru/geography/moldova.ogg
-share/gnome/gcompris/boards/sounds/ru/geography/netherland.ogg
-share/gnome/gcompris/boards/sounds/ru/geography/nicaragua.ogg
-share/gnome/gcompris/boards/sounds/ru/geography/norway.ogg
-share/gnome/gcompris/boards/sounds/ru/geography/panama.ogg
-share/gnome/gcompris/boards/sounds/ru/geography/paraguay.ogg
-share/gnome/gcompris/boards/sounds/ru/geography/peru.ogg
-share/gnome/gcompris/boards/sounds/ru/geography/poland.ogg
-share/gnome/gcompris/boards/sounds/ru/geography/portugal.ogg
-share/gnome/gcompris/boards/sounds/ru/geography/romania.ogg
-share/gnome/gcompris/boards/sounds/ru/geography/russia.ogg
-share/gnome/gcompris/boards/sounds/ru/geography/salvador.ogg
-share/gnome/gcompris/boards/sounds/ru/geography/serbia_montenegro.ogg
-share/gnome/gcompris/boards/sounds/ru/geography/slovakia.ogg
-share/gnome/gcompris/boards/sounds/ru/geography/slovenia.ogg
-share/gnome/gcompris/boards/sounds/ru/geography/spain.ogg
-share/gnome/gcompris/boards/sounds/ru/geography/suriname.ogg
-share/gnome/gcompris/boards/sounds/ru/geography/sweden.ogg
-share/gnome/gcompris/boards/sounds/ru/geography/switz.ogg
-share/gnome/gcompris/boards/sounds/ru/geography/turkey.ogg
-share/gnome/gcompris/boards/sounds/ru/geography/ukraine.ogg
-share/gnome/gcompris/boards/sounds/ru/geography/united_kingdom.ogg
-share/gnome/gcompris/boards/sounds/ru/geography/uruguay.ogg
-share/gnome/gcompris/boards/sounds/ru/geography/usa.ogg
-share/gnome/gcompris/boards/sounds/ru/geography/venezuela.ogg
-share/gnome/gcompris/boards/sounds/ru/misc/README
-share/gnome/gcompris/boards/sounds/ru/misc/about.ogg
-share/gnome/gcompris/boards/sounds/ru/misc/back.ogg
-share/gnome/gcompris/boards/sounds/ru/misc/by.ogg
-share/gnome/gcompris/boards/sounds/ru/misc/click_on_letter.ogg
-share/gnome/gcompris/boards/sounds/ru/misc/configuration.ogg
-share/gnome/gcompris/boards/sounds/ru/misc/congratulation.ogg
-share/gnome/gcompris/boards/sounds/ru/misc/equal.ogg
-share/gnome/gcompris/boards/sounds/ru/misc/good.ogg
-share/gnome/gcompris/boards/sounds/ru/misc/great.ogg
-share/gnome/gcompris/boards/sounds/ru/misc/help.ogg
-share/gnome/gcompris/boards/sounds/ru/misc/level.ogg
-share/gnome/gcompris/boards/sounds/ru/misc/minus.ogg
-share/gnome/gcompris/boards/sounds/ru/misc/ok.ogg
-share/gnome/gcompris/boards/sounds/ru/misc/outof.ogg
-share/gnome/gcompris/boards/sounds/ru/misc/plus.ogg
-share/gnome/gcompris/boards/sounds/ru/misc/quit.ogg
-share/gnome/gcompris/boards/sounds/ru/misc/super.ogg
-share/gnome/gcompris/boards/sounds/ru/misc/welcome.ogg
-share/gnome/gcompris/boards/sounds/scroll.wav
-share/gnome/gcompris/boards/sounds/smudge.wav
-share/gnome/gcompris/boards/sounds/so/alphabet/10.ogg
-share/gnome/gcompris/boards/sounds/so/alphabet/README
-share/gnome/gcompris/boards/sounds/so/alphabet/U0030.ogg
-share/gnome/gcompris/boards/sounds/so/alphabet/U0031.ogg
-share/gnome/gcompris/boards/sounds/so/alphabet/U0032.ogg
-share/gnome/gcompris/boards/sounds/so/alphabet/U0033.ogg
-share/gnome/gcompris/boards/sounds/so/alphabet/U0034.ogg
-share/gnome/gcompris/boards/sounds/so/alphabet/U0035.ogg
-share/gnome/gcompris/boards/sounds/so/alphabet/U0036.ogg
-share/gnome/gcompris/boards/sounds/so/alphabet/U0037.ogg
-share/gnome/gcompris/boards/sounds/so/alphabet/U0038.ogg
-share/gnome/gcompris/boards/sounds/so/alphabet/U0039.ogg
-share/gnome/gcompris/boards/sounds/so/alphabet/U0061.ogg
-share/gnome/gcompris/boards/sounds/so/alphabet/U0062.ogg
-share/gnome/gcompris/boards/sounds/so/alphabet/U0063.ogg
-share/gnome/gcompris/boards/sounds/so/alphabet/U0064.ogg
-share/gnome/gcompris/boards/sounds/so/alphabet/U0065.ogg
-share/gnome/gcompris/boards/sounds/so/alphabet/U0066.ogg
-share/gnome/gcompris/boards/sounds/so/alphabet/U0067.ogg
-share/gnome/gcompris/boards/sounds/so/alphabet/U0068.ogg
-share/gnome/gcompris/boards/sounds/so/alphabet/U0069.ogg
-share/gnome/gcompris/boards/sounds/so/alphabet/U006A.ogg
-share/gnome/gcompris/boards/sounds/so/alphabet/U006B.ogg
-share/gnome/gcompris/boards/sounds/so/alphabet/U006C.ogg
-share/gnome/gcompris/boards/sounds/so/alphabet/U006D.ogg
-share/gnome/gcompris/boards/sounds/so/alphabet/U006E.ogg
-share/gnome/gcompris/boards/sounds/so/alphabet/U006F.ogg
-share/gnome/gcompris/boards/sounds/so/alphabet/U0070.ogg
-share/gnome/gcompris/boards/sounds/so/alphabet/U0071.ogg
-share/gnome/gcompris/boards/sounds/so/alphabet/U0072.ogg
-share/gnome/gcompris/boards/sounds/so/alphabet/U0073.ogg
-share/gnome/gcompris/boards/sounds/so/alphabet/U0074.ogg
-share/gnome/gcompris/boards/sounds/so/alphabet/U0075.ogg
-share/gnome/gcompris/boards/sounds/so/alphabet/U0076.ogg
-share/gnome/gcompris/boards/sounds/so/alphabet/U0077.ogg
-share/gnome/gcompris/boards/sounds/so/alphabet/U0078.ogg
-share/gnome/gcompris/boards/sounds/so/alphabet/U0079.ogg
-share/gnome/gcompris/boards/sounds/so/alphabet/U007A.ogg
-share/gnome/gcompris/boards/sounds/so/colors/README
-share/gnome/gcompris/boards/sounds/so/colors/black.ogg
-share/gnome/gcompris/boards/sounds/so/colors/blue.ogg
-share/gnome/gcompris/boards/sounds/so/colors/brown.ogg
-share/gnome/gcompris/boards/sounds/so/colors/green.ogg
-share/gnome/gcompris/boards/sounds/so/colors/grey.ogg
-share/gnome/gcompris/boards/sounds/so/colors/orange.ogg
-share/gnome/gcompris/boards/sounds/so/colors/pink.ogg
-share/gnome/gcompris/boards/sounds/so/colors/purple.ogg
-share/gnome/gcompris/boards/sounds/so/colors/red.ogg
-share/gnome/gcompris/boards/sounds/so/colors/white.ogg
-share/gnome/gcompris/boards/sounds/so/colors/yellow.ogg
-share/gnome/gcompris/boards/sounds/so/geography/README
-share/gnome/gcompris/boards/sounds/so/geography/alaska.ogg
-share/gnome/gcompris/boards/sounds/so/geography/albania.ogg
-share/gnome/gcompris/boards/sounds/so/geography/argentina.ogg
-share/gnome/gcompris/boards/sounds/so/geography/austria.ogg
-share/gnome/gcompris/boards/sounds/so/geography/bahamas.ogg
-share/gnome/gcompris/boards/sounds/so/geography/belarus.ogg
-share/gnome/gcompris/boards/sounds/so/geography/belgium.ogg
-share/gnome/gcompris/boards/sounds/so/geography/bolivia.ogg
-share/gnome/gcompris/boards/sounds/so/geography/bosnia_herzegovina.ogg
-share/gnome/gcompris/boards/sounds/so/geography/brazil.ogg
-share/gnome/gcompris/boards/sounds/so/geography/bulgaria.ogg
-share/gnome/gcompris/boards/sounds/so/geography/canada.ogg
-share/gnome/gcompris/boards/sounds/so/geography/chile.ogg
-share/gnome/gcompris/boards/sounds/so/geography/colombia.ogg
-share/gnome/gcompris/boards/sounds/so/geography/costa_rica.ogg
-share/gnome/gcompris/boards/sounds/so/geography/croatia.ogg
-share/gnome/gcompris/boards/sounds/so/geography/cuba.ogg
-share/gnome/gcompris/boards/sounds/so/geography/cyprus.ogg
-share/gnome/gcompris/boards/sounds/so/geography/czech.ogg
-share/gnome/gcompris/boards/sounds/so/geography/denmark.ogg
-share/gnome/gcompris/boards/sounds/so/geography/dominican_republic.ogg
-share/gnome/gcompris/boards/sounds/so/geography/ecuador.ogg
-share/gnome/gcompris/boards/sounds/so/geography/estonia.ogg
-share/gnome/gcompris/boards/sounds/so/geography/finland.ogg
-share/gnome/gcompris/boards/sounds/so/geography/france.ogg
-share/gnome/gcompris/boards/sounds/so/geography/french_guiana.ogg
-share/gnome/gcompris/boards/sounds/so/geography/germany.ogg
-share/gnome/gcompris/boards/sounds/so/geography/greece.ogg
-share/gnome/gcompris/boards/sounds/so/geography/greenland.ogg
-share/gnome/gcompris/boards/sounds/so/geography/guatemala.ogg
-share/gnome/gcompris/boards/sounds/so/geography/guyana.ogg
-share/gnome/gcompris/boards/sounds/so/geography/haiti.ogg
-share/gnome/gcompris/boards/sounds/so/geography/honduras.ogg
-share/gnome/gcompris/boards/sounds/so/geography/hungary.ogg
-share/gnome/gcompris/boards/sounds/so/geography/iceland.ogg
-share/gnome/gcompris/boards/sounds/so/geography/ireland.ogg
-share/gnome/gcompris/boards/sounds/so/geography/italy.ogg
-share/gnome/gcompris/boards/sounds/so/geography/jamaica.ogg
-share/gnome/gcompris/boards/sounds/so/geography/latvia.ogg
-share/gnome/gcompris/boards/sounds/so/geography/lithuania.ogg
-share/gnome/gcompris/boards/sounds/so/geography/luxembourg.ogg
-share/gnome/gcompris/boards/sounds/so/geography/macedonia.ogg
-share/gnome/gcompris/boards/sounds/so/geography/mexico.ogg
-share/gnome/gcompris/boards/sounds/so/geography/moldova.ogg
-share/gnome/gcompris/boards/sounds/so/geography/netherland.ogg
-share/gnome/gcompris/boards/sounds/so/geography/nicaragua.ogg
-share/gnome/gcompris/boards/sounds/so/geography/norway.ogg
-share/gnome/gcompris/boards/sounds/so/geography/panama.ogg
-share/gnome/gcompris/boards/sounds/so/geography/paraguay.ogg
-share/gnome/gcompris/boards/sounds/so/geography/peru.ogg
-share/gnome/gcompris/boards/sounds/so/geography/poland.ogg
-share/gnome/gcompris/boards/sounds/so/geography/portugal.ogg
-share/gnome/gcompris/boards/sounds/so/geography/romania.ogg
-share/gnome/gcompris/boards/sounds/so/geography/russia.ogg
-share/gnome/gcompris/boards/sounds/so/geography/salvador.ogg
-share/gnome/gcompris/boards/sounds/so/geography/serbia_montenegro.ogg
-share/gnome/gcompris/boards/sounds/so/geography/slovakia.ogg
-share/gnome/gcompris/boards/sounds/so/geography/slovenia.ogg
-share/gnome/gcompris/boards/sounds/so/geography/spain.ogg
-share/gnome/gcompris/boards/sounds/so/geography/suriname.ogg
-share/gnome/gcompris/boards/sounds/so/geography/sweden.ogg
-share/gnome/gcompris/boards/sounds/so/geography/switz.ogg
-share/gnome/gcompris/boards/sounds/so/geography/turkey.ogg
-share/gnome/gcompris/boards/sounds/so/geography/ukraine.ogg
-share/gnome/gcompris/boards/sounds/so/geography/united_kingdom.ogg
-share/gnome/gcompris/boards/sounds/so/geography/uruguay.ogg
-share/gnome/gcompris/boards/sounds/so/geography/usa.ogg
-share/gnome/gcompris/boards/sounds/so/geography/venezuela.ogg
-share/gnome/gcompris/boards/sounds/so/misc/README
-share/gnome/gcompris/boards/sounds/so/misc/awesome.ogg
-share/gnome/gcompris/boards/sounds/so/misc/back.ogg
-share/gnome/gcompris/boards/sounds/so/misc/by.ogg
-share/gnome/gcompris/boards/sounds/so/misc/check_answer.ogg
-share/gnome/gcompris/boards/sounds/so/misc/click_on_letter.ogg
-share/gnome/gcompris/boards/sounds/so/misc/congratulation.ogg
-share/gnome/gcompris/boards/sounds/so/misc/equal.ogg
-share/gnome/gcompris/boards/sounds/so/misc/fantastic.ogg
-share/gnome/gcompris/boards/sounds/so/misc/good.ogg
-share/gnome/gcompris/boards/sounds/so/misc/great.ogg
-share/gnome/gcompris/boards/sounds/so/misc/help.ogg
-share/gnome/gcompris/boards/sounds/so/misc/level.ogg
-share/gnome/gcompris/boards/sounds/so/misc/minus.ogg
-share/gnome/gcompris/boards/sounds/so/misc/ok.ogg
-share/gnome/gcompris/boards/sounds/so/misc/outof.ogg
-share/gnome/gcompris/boards/sounds/so/misc/perfect.ogg
-share/gnome/gcompris/boards/sounds/so/misc/plus.ogg
-share/gnome/gcompris/boards/sounds/so/misc/quit.ogg
-share/gnome/gcompris/boards/sounds/so/misc/super.ogg
-share/gnome/gcompris/boards/sounds/so/misc/waytogo.ogg
-share/gnome/gcompris/boards/sounds/so/misc/welcome.ogg
-share/gnome/gcompris/boards/sounds/sr/alphabet/10.ogg
-share/gnome/gcompris/boards/sounds/sr/alphabet/U0030.ogg
-share/gnome/gcompris/boards/sounds/sr/alphabet/U0031.ogg
-share/gnome/gcompris/boards/sounds/sr/alphabet/U0032.ogg
-share/gnome/gcompris/boards/sounds/sr/alphabet/U0033.ogg
-share/gnome/gcompris/boards/sounds/sr/alphabet/U0034.ogg
-share/gnome/gcompris/boards/sounds/sr/alphabet/U0035.ogg
-share/gnome/gcompris/boards/sounds/sr/alphabet/U0036.ogg
-share/gnome/gcompris/boards/sounds/sr/alphabet/U0037.ogg
-share/gnome/gcompris/boards/sounds/sr/alphabet/U0038.ogg
-share/gnome/gcompris/boards/sounds/sr/alphabet/U0039.ogg
-share/gnome/gcompris/boards/sounds/sr/alphabet/U0061.ogg
-share/gnome/gcompris/boards/sounds/sr/alphabet/U0062.ogg
-share/gnome/gcompris/boards/sounds/sr/alphabet/U0063.ogg
-share/gnome/gcompris/boards/sounds/sr/alphabet/U0064.ogg
-share/gnome/gcompris/boards/sounds/sr/alphabet/U0065.ogg
-share/gnome/gcompris/boards/sounds/sr/alphabet/U0066.ogg
-share/gnome/gcompris/boards/sounds/sr/alphabet/U0067.ogg
-share/gnome/gcompris/boards/sounds/sr/alphabet/U0068.ogg
-share/gnome/gcompris/boards/sounds/sr/alphabet/U0069.ogg
-share/gnome/gcompris/boards/sounds/sr/alphabet/U006A.ogg
-share/gnome/gcompris/boards/sounds/sr/alphabet/U006B.ogg
-share/gnome/gcompris/boards/sounds/sr/alphabet/U006C.ogg
-share/gnome/gcompris/boards/sounds/sr/alphabet/U006D.ogg
-share/gnome/gcompris/boards/sounds/sr/alphabet/U006E.ogg
-share/gnome/gcompris/boards/sounds/sr/alphabet/U006F.ogg
-share/gnome/gcompris/boards/sounds/sr/alphabet/U0070.ogg
-share/gnome/gcompris/boards/sounds/sr/alphabet/U0071.ogg
-share/gnome/gcompris/boards/sounds/sr/alphabet/U0072.ogg
-share/gnome/gcompris/boards/sounds/sr/alphabet/U0073.ogg
-share/gnome/gcompris/boards/sounds/sr/alphabet/U0074.ogg
-share/gnome/gcompris/boards/sounds/sr/alphabet/U0075.ogg
-share/gnome/gcompris/boards/sounds/sr/alphabet/U0076.ogg
-share/gnome/gcompris/boards/sounds/sr/alphabet/U0077.ogg
-share/gnome/gcompris/boards/sounds/sr/alphabet/U0078.ogg
-share/gnome/gcompris/boards/sounds/sr/alphabet/U0079.ogg
-share/gnome/gcompris/boards/sounds/sr/alphabet/U007A.ogg
-share/gnome/gcompris/boards/sounds/sr/alphabet/cc.ogg
-share/gnome/gcompris/boards/sounds/sr/alphabet/ch.ogg
-share/gnome/gcompris/boards/sounds/sr/alphabet/dj.ogg
-share/gnome/gcompris/boards/sounds/sr/alphabet/dz.ogg
-share/gnome/gcompris/boards/sounds/sr/alphabet/lj.ogg
-share/gnome/gcompris/boards/sounds/sr/alphabet/nj.ogg
-share/gnome/gcompris/boards/sounds/sr/alphabet/readme
-share/gnome/gcompris/boards/sounds/sr/alphabet/sh.ogg
-share/gnome/gcompris/boards/sounds/sr/alphabet/zh.ogg
-share/gnome/gcompris/boards/sounds/sr/colors/black.ogg
-share/gnome/gcompris/boards/sounds/sr/colors/blue.ogg
-share/gnome/gcompris/boards/sounds/sr/colors/brown.ogg
-share/gnome/gcompris/boards/sounds/sr/colors/green.ogg
-share/gnome/gcompris/boards/sounds/sr/colors/grey.ogg
-share/gnome/gcompris/boards/sounds/sr/colors/orange.ogg
-share/gnome/gcompris/boards/sounds/sr/colors/pink.ogg
-share/gnome/gcompris/boards/sounds/sr/colors/purple.ogg
-share/gnome/gcompris/boards/sounds/sr/colors/readme
-share/gnome/gcompris/boards/sounds/sr/colors/red.ogg
-share/gnome/gcompris/boards/sounds/sr/colors/white.ogg
-share/gnome/gcompris/boards/sounds/sr/colors/yellow.ogg
-share/gnome/gcompris/boards/sounds/sr/geography/alaska.ogg
-share/gnome/gcompris/boards/sounds/sr/geography/albania.ogg
-share/gnome/gcompris/boards/sounds/sr/geography/argentina.ogg
-share/gnome/gcompris/boards/sounds/sr/geography/austria.ogg
-share/gnome/gcompris/boards/sounds/sr/geography/bahamas.ogg
-share/gnome/gcompris/boards/sounds/sr/geography/belarus.ogg
-share/gnome/gcompris/boards/sounds/sr/geography/belgium.ogg
-share/gnome/gcompris/boards/sounds/sr/geography/bolivia.ogg
-share/gnome/gcompris/boards/sounds/sr/geography/bosnia_herzegovina.ogg
-share/gnome/gcompris/boards/sounds/sr/geography/brazil.ogg
-share/gnome/gcompris/boards/sounds/sr/geography/bulgaria.ogg
-share/gnome/gcompris/boards/sounds/sr/geography/canada.ogg
-share/gnome/gcompris/boards/sounds/sr/geography/chile.ogg
-share/gnome/gcompris/boards/sounds/sr/geography/colombia.ogg
-share/gnome/gcompris/boards/sounds/sr/geography/costa_rica.ogg
-share/gnome/gcompris/boards/sounds/sr/geography/croatia.ogg
-share/gnome/gcompris/boards/sounds/sr/geography/cuba.ogg
-share/gnome/gcompris/boards/sounds/sr/geography/cyprus.ogg
-share/gnome/gcompris/boards/sounds/sr/geography/czech.ogg
-share/gnome/gcompris/boards/sounds/sr/geography/denmark.ogg
-share/gnome/gcompris/boards/sounds/sr/geography/dominican_republic.ogg
-share/gnome/gcompris/boards/sounds/sr/geography/ecuador.ogg
-share/gnome/gcompris/boards/sounds/sr/geography/estonia.ogg
-share/gnome/gcompris/boards/sounds/sr/geography/finland.ogg
-share/gnome/gcompris/boards/sounds/sr/geography/france.ogg
-share/gnome/gcompris/boards/sounds/sr/geography/french_guiana.ogg
-share/gnome/gcompris/boards/sounds/sr/geography/germany.ogg
-share/gnome/gcompris/boards/sounds/sr/geography/greece.ogg
-share/gnome/gcompris/boards/sounds/sr/geography/greenland.ogg
-share/gnome/gcompris/boards/sounds/sr/geography/guatemala.ogg
-share/gnome/gcompris/boards/sounds/sr/geography/guyana.ogg
-share/gnome/gcompris/boards/sounds/sr/geography/haiti.ogg
-share/gnome/gcompris/boards/sounds/sr/geography/honduras.ogg
-share/gnome/gcompris/boards/sounds/sr/geography/hungary.ogg
-share/gnome/gcompris/boards/sounds/sr/geography/iceland.ogg
-share/gnome/gcompris/boards/sounds/sr/geography/ireland.ogg
-share/gnome/gcompris/boards/sounds/sr/geography/italy.ogg
-share/gnome/gcompris/boards/sounds/sr/geography/jamaica.ogg
-share/gnome/gcompris/boards/sounds/sr/geography/latvia.ogg
-share/gnome/gcompris/boards/sounds/sr/geography/lithuania.ogg
-share/gnome/gcompris/boards/sounds/sr/geography/luxembourg.ogg
-share/gnome/gcompris/boards/sounds/sr/geography/macedonia.ogg
-share/gnome/gcompris/boards/sounds/sr/geography/mexico.ogg
-share/gnome/gcompris/boards/sounds/sr/geography/moldova.ogg
-share/gnome/gcompris/boards/sounds/sr/geography/montenegro.ogg
-share/gnome/gcompris/boards/sounds/sr/geography/netherland.ogg
-share/gnome/gcompris/boards/sounds/sr/geography/nicaragua.ogg
-share/gnome/gcompris/boards/sounds/sr/geography/norway.ogg
-share/gnome/gcompris/boards/sounds/sr/geography/panama.ogg
-share/gnome/gcompris/boards/sounds/sr/geography/paraguay.ogg
-share/gnome/gcompris/boards/sounds/sr/geography/peru.ogg
-share/gnome/gcompris/boards/sounds/sr/geography/poland.ogg
-share/gnome/gcompris/boards/sounds/sr/geography/portugal.ogg
-share/gnome/gcompris/boards/sounds/sr/geography/readme
-share/gnome/gcompris/boards/sounds/sr/geography/romania.ogg
-share/gnome/gcompris/boards/sounds/sr/geography/russia.ogg
-share/gnome/gcompris/boards/sounds/sr/geography/salvador.ogg
-share/gnome/gcompris/boards/sounds/sr/geography/serbia.ogg
-share/gnome/gcompris/boards/sounds/sr/geography/serbia_montenegro.ogg
-share/gnome/gcompris/boards/sounds/sr/geography/slovakia.ogg
-share/gnome/gcompris/boards/sounds/sr/geography/slovenia.ogg
-share/gnome/gcompris/boards/sounds/sr/geography/spain.ogg
-share/gnome/gcompris/boards/sounds/sr/geography/suriname.ogg
-share/gnome/gcompris/boards/sounds/sr/geography/sweden.ogg
-share/gnome/gcompris/boards/sounds/sr/geography/switz.ogg
-share/gnome/gcompris/boards/sounds/sr/geography/turkey.ogg
-share/gnome/gcompris/boards/sounds/sr/geography/ukraine.ogg
-share/gnome/gcompris/boards/sounds/sr/geography/united_kingdom.ogg
-share/gnome/gcompris/boards/sounds/sr/geography/uruguay.ogg
-share/gnome/gcompris/boards/sounds/sr/geography/usa.ogg
-share/gnome/gcompris/boards/sounds/sr/geography/venezuela.ogg
-share/gnome/gcompris/boards/sounds/sr/misc/awesome.ogg
-share/gnome/gcompris/boards/sounds/sr/misc/back.ogg
-share/gnome/gcompris/boards/sounds/sr/misc/by.ogg
-share/gnome/gcompris/boards/sounds/sr/misc/check_answer.ogg
-share/gnome/gcompris/boards/sounds/sr/misc/click_on_letter.ogg
-share/gnome/gcompris/boards/sounds/sr/misc/congratulation.ogg
-share/gnome/gcompris/boards/sounds/sr/misc/equal.ogg
-share/gnome/gcompris/boards/sounds/sr/misc/fantastic.ogg
-share/gnome/gcompris/boards/sounds/sr/misc/good.ogg
-share/gnome/gcompris/boards/sounds/sr/misc/great.ogg
-share/gnome/gcompris/boards/sounds/sr/misc/help.ogg
-share/gnome/gcompris/boards/sounds/sr/misc/level.ogg
-share/gnome/gcompris/boards/sounds/sr/misc/minus.ogg
-share/gnome/gcompris/boards/sounds/sr/misc/ok.ogg
-share/gnome/gcompris/boards/sounds/sr/misc/outof.ogg
-share/gnome/gcompris/boards/sounds/sr/misc/perfect.ogg
-share/gnome/gcompris/boards/sounds/sr/misc/plus.ogg
-share/gnome/gcompris/boards/sounds/sr/misc/quit.ogg
-share/gnome/gcompris/boards/sounds/sr/misc/readme
-share/gnome/gcompris/boards/sounds/sr/misc/super.ogg
-share/gnome/gcompris/boards/sounds/sr/misc/waytogo.ogg
-share/gnome/gcompris/boards/sounds/sr/misc/welcome.ogg
-share/gnome/gcompris/boards/sounds/sv/alphabet/10.ogg
-share/gnome/gcompris/boards/sounds/sv/alphabet/README
-share/gnome/gcompris/boards/sounds/sv/alphabet/U0030.ogg
-share/gnome/gcompris/boards/sounds/sv/alphabet/U0031.ogg
-share/gnome/gcompris/boards/sounds/sv/alphabet/U0032.ogg
-share/gnome/gcompris/boards/sounds/sv/alphabet/U0033.ogg
-share/gnome/gcompris/boards/sounds/sv/alphabet/U0034.ogg
-share/gnome/gcompris/boards/sounds/sv/alphabet/U0035.ogg
-share/gnome/gcompris/boards/sounds/sv/alphabet/U0036.ogg
-share/gnome/gcompris/boards/sounds/sv/alphabet/U0037.ogg
-share/gnome/gcompris/boards/sounds/sv/alphabet/U0038.ogg
-share/gnome/gcompris/boards/sounds/sv/alphabet/U0039.ogg
-share/gnome/gcompris/boards/sounds/sv/alphabet/U0061.ogg
-share/gnome/gcompris/boards/sounds/sv/alphabet/U0062.ogg
-share/gnome/gcompris/boards/sounds/sv/alphabet/U0063.ogg
-share/gnome/gcompris/boards/sounds/sv/alphabet/U0064.ogg
-share/gnome/gcompris/boards/sounds/sv/alphabet/U0065.ogg
-share/gnome/gcompris/boards/sounds/sv/alphabet/U0066.ogg
-share/gnome/gcompris/boards/sounds/sv/alphabet/U0067.ogg
-share/gnome/gcompris/boards/sounds/sv/alphabet/U0068.ogg
-share/gnome/gcompris/boards/sounds/sv/alphabet/U0069.ogg
-share/gnome/gcompris/boards/sounds/sv/alphabet/U006A.ogg
-share/gnome/gcompris/boards/sounds/sv/alphabet/U006B.ogg
-share/gnome/gcompris/boards/sounds/sv/alphabet/U006C.ogg
-share/gnome/gcompris/boards/sounds/sv/alphabet/U006D.ogg
-share/gnome/gcompris/boards/sounds/sv/alphabet/U006E.ogg
-share/gnome/gcompris/boards/sounds/sv/alphabet/U006F.ogg
-share/gnome/gcompris/boards/sounds/sv/alphabet/U0070.ogg
-share/gnome/gcompris/boards/sounds/sv/alphabet/U0071.ogg
-share/gnome/gcompris/boards/sounds/sv/alphabet/U0072.ogg
-share/gnome/gcompris/boards/sounds/sv/alphabet/U0073.ogg
-share/gnome/gcompris/boards/sounds/sv/alphabet/U0074.ogg
-share/gnome/gcompris/boards/sounds/sv/alphabet/U0075.ogg
-share/gnome/gcompris/boards/sounds/sv/alphabet/U0076.ogg
-share/gnome/gcompris/boards/sounds/sv/alphabet/U0078.ogg
-share/gnome/gcompris/boards/sounds/sv/alphabet/U0079.ogg
-share/gnome/gcompris/boards/sounds/sv/alphabet/U007A.ogg
-share/gnome/gcompris/boards/sounds/sv/alphabet/U00E4.ogg
-share/gnome/gcompris/boards/sounds/sv/alphabet/U00E5.ogg
-share/gnome/gcompris/boards/sounds/sv/alphabet/U00F6.ogg
-share/gnome/gcompris/boards/sounds/sv/colors/README
-share/gnome/gcompris/boards/sounds/sv/colors/black.ogg
-share/gnome/gcompris/boards/sounds/sv/colors/blue.ogg
-share/gnome/gcompris/boards/sounds/sv/colors/brown.ogg
-share/gnome/gcompris/boards/sounds/sv/colors/green.ogg
-share/gnome/gcompris/boards/sounds/sv/colors/grey.ogg
-share/gnome/gcompris/boards/sounds/sv/colors/orange.ogg
-share/gnome/gcompris/boards/sounds/sv/colors/pink.ogg
-share/gnome/gcompris/boards/sounds/sv/colors/purple.ogg
-share/gnome/gcompris/boards/sounds/sv/colors/red.ogg
-share/gnome/gcompris/boards/sounds/sv/colors/white.ogg
-share/gnome/gcompris/boards/sounds/sv/colors/yellow.ogg
-share/gnome/gcompris/boards/sounds/sv/geography/README
-share/gnome/gcompris/boards/sounds/sv/geography/africa.ogg
-share/gnome/gcompris/boards/sounds/sv/geography/alaska.ogg
-share/gnome/gcompris/boards/sounds/sv/geography/albania.ogg
-share/gnome/gcompris/boards/sounds/sv/geography/america.ogg
-share/gnome/gcompris/boards/sounds/sv/geography/antartica.ogg
-share/gnome/gcompris/boards/sounds/sv/geography/argentina.ogg
-share/gnome/gcompris/boards/sounds/sv/geography/asia.ogg
-share/gnome/gcompris/boards/sounds/sv/geography/austria.ogg
-share/gnome/gcompris/boards/sounds/sv/geography/bahamas.ogg
-share/gnome/gcompris/boards/sounds/sv/geography/belarus.ogg
-share/gnome/gcompris/boards/sounds/sv/geography/belgium.ogg
-share/gnome/gcompris/boards/sounds/sv/geography/bolivia.ogg
-share/gnome/gcompris/boards/sounds/sv/geography/bosnia_herzegovina.ogg
-share/gnome/gcompris/boards/sounds/sv/geography/brazil.ogg
-share/gnome/gcompris/boards/sounds/sv/geography/bulgaria.ogg
-share/gnome/gcompris/boards/sounds/sv/geography/canada.ogg
-share/gnome/gcompris/boards/sounds/sv/geography/chile.ogg
-share/gnome/gcompris/boards/sounds/sv/geography/colombia.ogg
-share/gnome/gcompris/boards/sounds/sv/geography/costa_rica.ogg
-share/gnome/gcompris/boards/sounds/sv/geography/croatia.ogg
-share/gnome/gcompris/boards/sounds/sv/geography/cuba.ogg
-share/gnome/gcompris/boards/sounds/sv/geography/cyprus.ogg
-share/gnome/gcompris/boards/sounds/sv/geography/czech.ogg
-share/gnome/gcompris/boards/sounds/sv/geography/denmark.ogg
-share/gnome/gcompris/boards/sounds/sv/geography/dominican_republic.ogg
-share/gnome/gcompris/boards/sounds/sv/geography/ecuador.ogg
-share/gnome/gcompris/boards/sounds/sv/geography/estonia.ogg
-share/gnome/gcompris/boards/sounds/sv/geography/europe.ogg
-share/gnome/gcompris/boards/sounds/sv/geography/finland.ogg
-share/gnome/gcompris/boards/sounds/sv/geography/france.ogg
-share/gnome/gcompris/boards/sounds/sv/geography/french_guiana.ogg
-share/gnome/gcompris/boards/sounds/sv/geography/germany.ogg
-share/gnome/gcompris/boards/sounds/sv/geography/greece.ogg
-share/gnome/gcompris/boards/sounds/sv/geography/greenland.ogg
-share/gnome/gcompris/boards/sounds/sv/geography/guatemala.ogg
-share/gnome/gcompris/boards/sounds/sv/geography/guyana.ogg
-share/gnome/gcompris/boards/sounds/sv/geography/haiti.ogg
-share/gnome/gcompris/boards/sounds/sv/geography/honduras.ogg
-share/gnome/gcompris/boards/sounds/sv/geography/hungary.ogg
-share/gnome/gcompris/boards/sounds/sv/geography/iceland.ogg
-share/gnome/gcompris/boards/sounds/sv/geography/ireland.ogg
-share/gnome/gcompris/boards/sounds/sv/geography/italy.ogg
-share/gnome/gcompris/boards/sounds/sv/geography/jamaica.ogg
-share/gnome/gcompris/boards/sounds/sv/geography/latvia.ogg
-share/gnome/gcompris/boards/sounds/sv/geography/lithuania.ogg
-share/gnome/gcompris/boards/sounds/sv/geography/luxembourg.ogg
-share/gnome/gcompris/boards/sounds/sv/geography/macedonia.ogg
-share/gnome/gcompris/boards/sounds/sv/geography/mexico.ogg
-share/gnome/gcompris/boards/sounds/sv/geography/moldova.ogg
-share/gnome/gcompris/boards/sounds/sv/geography/netherland.ogg
-share/gnome/gcompris/boards/sounds/sv/geography/nicaragua.ogg
-share/gnome/gcompris/boards/sounds/sv/geography/norway.ogg
-share/gnome/gcompris/boards/sounds/sv/geography/oceania.ogg
-share/gnome/gcompris/boards/sounds/sv/geography/panama.ogg
-share/gnome/gcompris/boards/sounds/sv/geography/paraguay.ogg
-share/gnome/gcompris/boards/sounds/sv/geography/peru.ogg
-share/gnome/gcompris/boards/sounds/sv/geography/poland.ogg
-share/gnome/gcompris/boards/sounds/sv/geography/portugal.ogg
-share/gnome/gcompris/boards/sounds/sv/geography/romania.ogg
-share/gnome/gcompris/boards/sounds/sv/geography/russia.ogg
-share/gnome/gcompris/boards/sounds/sv/geography/salvador.ogg
-share/gnome/gcompris/boards/sounds/sv/geography/serbia_montenegro.ogg
-share/gnome/gcompris/boards/sounds/sv/geography/slovakia.ogg
-share/gnome/gcompris/boards/sounds/sv/geography/slovenia.ogg
-share/gnome/gcompris/boards/sounds/sv/geography/spain.ogg
-share/gnome/gcompris/boards/sounds/sv/geography/suriname.ogg
-share/gnome/gcompris/boards/sounds/sv/geography/sweden.ogg
-share/gnome/gcompris/boards/sounds/sv/geography/switz.ogg
-share/gnome/gcompris/boards/sounds/sv/geography/turkey.ogg
-share/gnome/gcompris/boards/sounds/sv/geography/ukraine.ogg
-share/gnome/gcompris/boards/sounds/sv/geography/united_kingdom.ogg
-share/gnome/gcompris/boards/sounds/sv/geography/uruguay.ogg
-share/gnome/gcompris/boards/sounds/sv/geography/usa.ogg
-share/gnome/gcompris/boards/sounds/sv/geography/venezuela.ogg
-share/gnome/gcompris/boards/sounds/sv/misc/README
-share/gnome/gcompris/boards/sounds/sv/misc/about.ogg
-share/gnome/gcompris/boards/sounds/sv/misc/awesome.ogg
-share/gnome/gcompris/boards/sounds/sv/misc/back.ogg
-share/gnome/gcompris/boards/sounds/sv/misc/by.ogg
-share/gnome/gcompris/boards/sounds/sv/misc/click_on_letter.ogg
-share/gnome/gcompris/boards/sounds/sv/misc/configuration.ogg
-share/gnome/gcompris/boards/sounds/sv/misc/congratulation.ogg
-share/gnome/gcompris/boards/sounds/sv/misc/equal.ogg
-share/gnome/gcompris/boards/sounds/sv/misc/fantastic.ogg
-share/gnome/gcompris/boards/sounds/sv/misc/good.ogg
-share/gnome/gcompris/boards/sounds/sv/misc/great.ogg
-share/gnome/gcompris/boards/sounds/sv/misc/help.ogg
-share/gnome/gcompris/boards/sounds/sv/misc/level.ogg
-share/gnome/gcompris/boards/sounds/sv/misc/minus.ogg
-share/gnome/gcompris/boards/sounds/sv/misc/ok.ogg
-share/gnome/gcompris/boards/sounds/sv/misc/outof.ogg
-share/gnome/gcompris/boards/sounds/sv/misc/perfect.ogg
-share/gnome/gcompris/boards/sounds/sv/misc/plus.ogg
-share/gnome/gcompris/boards/sounds/sv/misc/quit.ogg
-share/gnome/gcompris/boards/sounds/sv/misc/super.ogg
-share/gnome/gcompris/boards/sounds/sv/misc/waytogo.ogg
-share/gnome/gcompris/boards/sounds/sv/misc/welcome.ogg
-share/gnome/gcompris/boards/sounds/tr/alphabet/10.ogg
-share/gnome/gcompris/boards/sounds/tr/alphabet/U0030.ogg
-share/gnome/gcompris/boards/sounds/tr/alphabet/U0031.ogg
-share/gnome/gcompris/boards/sounds/tr/alphabet/U0032.ogg
-share/gnome/gcompris/boards/sounds/tr/alphabet/U0033.ogg
-share/gnome/gcompris/boards/sounds/tr/alphabet/U0034.ogg
-share/gnome/gcompris/boards/sounds/tr/alphabet/U0035.ogg
-share/gnome/gcompris/boards/sounds/tr/alphabet/U0036.ogg
-share/gnome/gcompris/boards/sounds/tr/alphabet/U0037.ogg
-share/gnome/gcompris/boards/sounds/tr/alphabet/U0038.ogg
-share/gnome/gcompris/boards/sounds/tr/alphabet/U0039.ogg
-share/gnome/gcompris/boards/sounds/tr/alphabet/U0061.ogg
-share/gnome/gcompris/boards/sounds/tr/alphabet/U0062.ogg
-share/gnome/gcompris/boards/sounds/tr/alphabet/U0063.ogg
-share/gnome/gcompris/boards/sounds/tr/alphabet/U0064.ogg
-share/gnome/gcompris/boards/sounds/tr/alphabet/U0065.ogg
-share/gnome/gcompris/boards/sounds/tr/alphabet/U0066.ogg
-share/gnome/gcompris/boards/sounds/tr/alphabet/U0067.ogg
-share/gnome/gcompris/boards/sounds/tr/alphabet/U0068.ogg
-share/gnome/gcompris/boards/sounds/tr/alphabet/U0069.ogg
-share/gnome/gcompris/boards/sounds/tr/alphabet/U006A.ogg
-share/gnome/gcompris/boards/sounds/tr/alphabet/U006B.ogg
-share/gnome/gcompris/boards/sounds/tr/alphabet/U006C.ogg
-share/gnome/gcompris/boards/sounds/tr/alphabet/U006D.ogg
-share/gnome/gcompris/boards/sounds/tr/alphabet/U006E.ogg
-share/gnome/gcompris/boards/sounds/tr/alphabet/U006F.ogg
-share/gnome/gcompris/boards/sounds/tr/alphabet/U0070.ogg
-share/gnome/gcompris/boards/sounds/tr/alphabet/U0071.ogg
-share/gnome/gcompris/boards/sounds/tr/alphabet/U0072.ogg
-share/gnome/gcompris/boards/sounds/tr/alphabet/U0073.ogg
-share/gnome/gcompris/boards/sounds/tr/alphabet/U0074.ogg
-share/gnome/gcompris/boards/sounds/tr/alphabet/U0075.ogg
-share/gnome/gcompris/boards/sounds/tr/alphabet/U0076.ogg
-share/gnome/gcompris/boards/sounds/tr/alphabet/U0077.ogg
-share/gnome/gcompris/boards/sounds/tr/alphabet/U0078.ogg
-share/gnome/gcompris/boards/sounds/tr/alphabet/U0079.ogg
-share/gnome/gcompris/boards/sounds/tr/alphabet/U007A.ogg
-share/gnome/gcompris/boards/sounds/tr/colors/black.ogg
-share/gnome/gcompris/boards/sounds/tr/colors/blue.ogg
-share/gnome/gcompris/boards/sounds/tr/colors/brown.ogg
-share/gnome/gcompris/boards/sounds/tr/colors/green.ogg
-share/gnome/gcompris/boards/sounds/tr/colors/grey.ogg
-share/gnome/gcompris/boards/sounds/tr/colors/orange.ogg
-share/gnome/gcompris/boards/sounds/tr/colors/pink.ogg
-share/gnome/gcompris/boards/sounds/tr/colors/purple.ogg
-share/gnome/gcompris/boards/sounds/tr/colors/red.ogg
-share/gnome/gcompris/boards/sounds/tr/colors/white.ogg
-share/gnome/gcompris/boards/sounds/tr/colors/yellow.ogg
-share/gnome/gcompris/boards/sounds/tr/geography/africa.ogg
-share/gnome/gcompris/boards/sounds/tr/geography/alaska.ogg
-share/gnome/gcompris/boards/sounds/tr/geography/albania.ogg
-share/gnome/gcompris/boards/sounds/tr/geography/algeria.ogg
-share/gnome/gcompris/boards/sounds/tr/geography/america.ogg
-share/gnome/gcompris/boards/sounds/tr/geography/angola.ogg
-share/gnome/gcompris/boards/sounds/tr/geography/antartica.ogg
-share/gnome/gcompris/boards/sounds/tr/geography/argentina.ogg
-share/gnome/gcompris/boards/sounds/tr/geography/asia.ogg
-share/gnome/gcompris/boards/sounds/tr/geography/austria.ogg
-share/gnome/gcompris/boards/sounds/tr/geography/bahamas.ogg
-share/gnome/gcompris/boards/sounds/tr/geography/belarus.ogg
-share/gnome/gcompris/boards/sounds/tr/geography/belgium.ogg
-share/gnome/gcompris/boards/sounds/tr/geography/benin.ogg
-share/gnome/gcompris/boards/sounds/tr/geography/bolivia.ogg
-share/gnome/gcompris/boards/sounds/tr/geography/bosnia_herzegovina.ogg
-share/gnome/gcompris/boards/sounds/tr/geography/botswana.ogg
-share/gnome/gcompris/boards/sounds/tr/geography/brazil.ogg
-share/gnome/gcompris/boards/sounds/tr/geography/bulgaria.ogg
-share/gnome/gcompris/boards/sounds/tr/geography/burkina.ogg
-share/gnome/gcompris/boards/sounds/tr/geography/burundi.ogg
-share/gnome/gcompris/boards/sounds/tr/geography/cameroon.ogg
-share/gnome/gcompris/boards/sounds/tr/geography/canada.ogg
-share/gnome/gcompris/boards/sounds/tr/geography/central_african_republic.ogg
-share/gnome/gcompris/boards/sounds/tr/geography/chad.ogg
-share/gnome/gcompris/boards/sounds/tr/geography/chile.ogg
-share/gnome/gcompris/boards/sounds/tr/geography/colombia.ogg
-share/gnome/gcompris/boards/sounds/tr/geography/congo.ogg
-share/gnome/gcompris/boards/sounds/tr/geography/costa_rica.ogg
-share/gnome/gcompris/boards/sounds/tr/geography/croatia.ogg
-share/gnome/gcompris/boards/sounds/tr/geography/cuba.ogg
-share/gnome/gcompris/boards/sounds/tr/geography/cyprus.ogg
-share/gnome/gcompris/boards/sounds/tr/geography/czech.ogg
-share/gnome/gcompris/boards/sounds/tr/geography/denmark.ogg
-share/gnome/gcompris/boards/sounds/tr/geography/djibouti.ogg
-share/gnome/gcompris/boards/sounds/tr/geography/dominican_republic.ogg
-share/gnome/gcompris/boards/sounds/tr/geography/ecuador.ogg
-share/gnome/gcompris/boards/sounds/tr/geography/egypt.ogg
-share/gnome/gcompris/boards/sounds/tr/geography/equatorial_guinea.ogg
-share/gnome/gcompris/boards/sounds/tr/geography/eritrea.ogg
-share/gnome/gcompris/boards/sounds/tr/geography/estonia.ogg
-share/gnome/gcompris/boards/sounds/tr/geography/ethiopia.ogg
-share/gnome/gcompris/boards/sounds/tr/geography/europe.ogg
-share/gnome/gcompris/boards/sounds/tr/geography/finland.ogg
-share/gnome/gcompris/boards/sounds/tr/geography/france.ogg
-share/gnome/gcompris/boards/sounds/tr/geography/french_guiana.ogg
-share/gnome/gcompris/boards/sounds/tr/geography/gabon.ogg
-share/gnome/gcompris/boards/sounds/tr/geography/gambia.ogg
-share/gnome/gcompris/boards/sounds/tr/geography/germany.ogg
-share/gnome/gcompris/boards/sounds/tr/geography/ghana.ogg
-share/gnome/gcompris/boards/sounds/tr/geography/greece.ogg
-share/gnome/gcompris/boards/sounds/tr/geography/greenland.ogg
-share/gnome/gcompris/boards/sounds/tr/geography/guatemala.ogg
-share/gnome/gcompris/boards/sounds/tr/geography/guinea.ogg
-share/gnome/gcompris/boards/sounds/tr/geography/guinea_bissau.ogg
-share/gnome/gcompris/boards/sounds/tr/geography/guyana.ogg
-share/gnome/gcompris/boards/sounds/tr/geography/haiti.ogg
-share/gnome/gcompris/boards/sounds/tr/geography/honduras.ogg
-share/gnome/gcompris/boards/sounds/tr/geography/hungary.ogg
-share/gnome/gcompris/boards/sounds/tr/geography/iceland.ogg
-share/gnome/gcompris/boards/sounds/tr/geography/ireland.ogg
-share/gnome/gcompris/boards/sounds/tr/geography/italy.ogg
-share/gnome/gcompris/boards/sounds/tr/geography/ivory_coast.ogg
-share/gnome/gcompris/boards/sounds/tr/geography/jamaica.ogg
-share/gnome/gcompris/boards/sounds/tr/geography/kenya.ogg
-share/gnome/gcompris/boards/sounds/tr/geography/latvia.ogg
-share/gnome/gcompris/boards/sounds/tr/geography/lesotho.ogg
-share/gnome/gcompris/boards/sounds/tr/geography/liberia.ogg
-share/gnome/gcompris/boards/sounds/tr/geography/libya.ogg
-share/gnome/gcompris/boards/sounds/tr/geography/lithuania.ogg
-share/gnome/gcompris/boards/sounds/tr/geography/luxembourg.ogg
-share/gnome/gcompris/boards/sounds/tr/geography/macedonia.ogg
-share/gnome/gcompris/boards/sounds/tr/geography/madagascar.ogg
-share/gnome/gcompris/boards/sounds/tr/geography/malawi.ogg
-share/gnome/gcompris/boards/sounds/tr/geography/mali.ogg
-share/gnome/gcompris/boards/sounds/tr/geography/mauritania.ogg
-share/gnome/gcompris/boards/sounds/tr/geography/mexico.ogg
-share/gnome/gcompris/boards/sounds/tr/geography/moldova.ogg
-share/gnome/gcompris/boards/sounds/tr/geography/moroco.ogg
-share/gnome/gcompris/boards/sounds/tr/geography/mozambique.ogg
-share/gnome/gcompris/boards/sounds/tr/geography/namibia.ogg
-share/gnome/gcompris/boards/sounds/tr/geography/netherland.ogg
-share/gnome/gcompris/boards/sounds/tr/geography/nicaragua.ogg
-share/gnome/gcompris/boards/sounds/tr/geography/niger.ogg
-share/gnome/gcompris/boards/sounds/tr/geography/nigeria.ogg
-share/gnome/gcompris/boards/sounds/tr/geography/north_america.ogg
-share/gnome/gcompris/boards/sounds/tr/geography/norway.ogg
-share/gnome/gcompris/boards/sounds/tr/geography/oceania.ogg
-share/gnome/gcompris/boards/sounds/tr/geography/panama.ogg
-share/gnome/gcompris/boards/sounds/tr/geography/paraguay.ogg
-share/gnome/gcompris/boards/sounds/tr/geography/peru.ogg
-share/gnome/gcompris/boards/sounds/tr/geography/poland.ogg
-share/gnome/gcompris/boards/sounds/tr/geography/portugal.ogg
-share/gnome/gcompris/boards/sounds/tr/geography/republic_of_congo.ogg
-share/gnome/gcompris/boards/sounds/tr/geography/romania.ogg
-share/gnome/gcompris/boards/sounds/tr/geography/russia.ogg
-share/gnome/gcompris/boards/sounds/tr/geography/rwanda.ogg
-share/gnome/gcompris/boards/sounds/tr/geography/salvador.ogg
-share/gnome/gcompris/boards/sounds/tr/geography/senegal.ogg
-share/gnome/gcompris/boards/sounds/tr/geography/serbia_montenegro.ogg
-share/gnome/gcompris/boards/sounds/tr/geography/sierra_leone.ogg
-share/gnome/gcompris/boards/sounds/tr/geography/slovakia.ogg
-share/gnome/gcompris/boards/sounds/tr/geography/slovenia.ogg
-share/gnome/gcompris/boards/sounds/tr/geography/somalia.ogg
-share/gnome/gcompris/boards/sounds/tr/geography/soudan.ogg
-share/gnome/gcompris/boards/sounds/tr/geography/south_africa.ogg
-share/gnome/gcompris/boards/sounds/tr/geography/south_america.ogg
-share/gnome/gcompris/boards/sounds/tr/geography/spain.ogg
-share/gnome/gcompris/boards/sounds/tr/geography/suriname.ogg
-share/gnome/gcompris/boards/sounds/tr/geography/swaziland.ogg
-share/gnome/gcompris/boards/sounds/tr/geography/sweden.ogg
-share/gnome/gcompris/boards/sounds/tr/geography/switz.ogg
-share/gnome/gcompris/boards/sounds/tr/geography/tanzania.ogg
-share/gnome/gcompris/boards/sounds/tr/geography/togo.ogg
-share/gnome/gcompris/boards/sounds/tr/geography/tunisia.ogg
-share/gnome/gcompris/boards/sounds/tr/geography/turkey.ogg
-share/gnome/gcompris/boards/sounds/tr/geography/uganda.ogg
-share/gnome/gcompris/boards/sounds/tr/geography/ukraine.ogg
-share/gnome/gcompris/boards/sounds/tr/geography/united_kingdom.ogg
-share/gnome/gcompris/boards/sounds/tr/geography/uruguay.ogg
-share/gnome/gcompris/boards/sounds/tr/geography/usa.ogg
-share/gnome/gcompris/boards/sounds/tr/geography/venezuela.ogg
-share/gnome/gcompris/boards/sounds/tr/geography/zambia.ogg
-share/gnome/gcompris/boards/sounds/tr/geography/zimbabwe.ogg
-share/gnome/gcompris/boards/sounds/tr/misc/about.ogg
-share/gnome/gcompris/boards/sounds/tr/misc/awesome.ogg
-share/gnome/gcompris/boards/sounds/tr/misc/back.ogg
-share/gnome/gcompris/boards/sounds/tr/misc/by.ogg
-share/gnome/gcompris/boards/sounds/tr/misc/check_answer.ogg
-share/gnome/gcompris/boards/sounds/tr/misc/click_on_letter.ogg
-share/gnome/gcompris/boards/sounds/tr/misc/configuration.ogg
-share/gnome/gcompris/boards/sounds/tr/misc/congratulation.ogg
-share/gnome/gcompris/boards/sounds/tr/misc/equal.ogg
-share/gnome/gcompris/boards/sounds/tr/misc/fantastic.ogg
-share/gnome/gcompris/boards/sounds/tr/misc/good.ogg
-share/gnome/gcompris/boards/sounds/tr/misc/great.ogg
-share/gnome/gcompris/boards/sounds/tr/misc/help.ogg
-share/gnome/gcompris/boards/sounds/tr/misc/level.ogg
-share/gnome/gcompris/boards/sounds/tr/misc/minus.ogg
-share/gnome/gcompris/boards/sounds/tr/misc/ok.ogg
-share/gnome/gcompris/boards/sounds/tr/misc/outof.ogg
-share/gnome/gcompris/boards/sounds/tr/misc/perfect.ogg
-share/gnome/gcompris/boards/sounds/tr/misc/plus.ogg
-share/gnome/gcompris/boards/sounds/tr/misc/quit.ogg
-share/gnome/gcompris/boards/sounds/tr/misc/super.ogg
-share/gnome/gcompris/boards/sounds/tr/misc/waytogo.ogg
-share/gnome/gcompris/boards/sounds/tr/misc/welcome.ogg
-share/gnome/gcompris/boards/sounds/train.wav
-share/gnome/gcompris/boards/sounds/tuxok.wav
-share/gnome/gcompris/boards/sounds/youcannot.wav
-share/gnome/gcompris/boards/strategy.xml
-share/gnome/gcompris/boards/submarine.xml
-share/gnome/gcompris/boards/submarine/README
-share/gnome/gcompris/boards/submarine/alert_submarine.png
-share/gnome/gcompris/boards/submarine/asw_frigate.png
-share/gnome/gcompris/boards/submarine/bubbling.png
-share/gnome/gcompris/boards/submarine/down.png
-share/gnome/gcompris/boards/submarine/manette.png
-share/gnome/gcompris/boards/submarine/rudder.png
-share/gnome/gcompris/boards/submarine/sub_bg.jpg
-share/gnome/gcompris/boards/submarine/sub_schema.png
-share/gnome/gcompris/boards/submarine/submarine-broken.png
-share/gnome/gcompris/boards/submarine/submarine.png
-share/gnome/gcompris/boards/submarine/up.png
-share/gnome/gcompris/boards/submarine/vanne.png
-share/gnome/gcompris/boards/submarine/whale.png
-share/gnome/gcompris/boards/submarine/whale_hit.png
-share/gnome/gcompris/boards/sudoku.xml
-share/gnome/gcompris/boards/superbrain.xml
-share/gnome/gcompris/boards/tangram.xml
-share/gnome/gcompris/boards/target.xml
-share/gnome/gcompris/boards/target/boardicon.png
-share/gnome/gcompris/boards/traffic.xml
-share/gnome/gcompris/boards/tuxpaint.xml
-share/gnome/gcompris/boards/watercycle.xml
-share/gnome/gcompris/boards/watercycle/README
-share/gnome/gcompris/boards/watercycle/background.png
-share/gnome/gcompris/boards/watercycle/badwater.png
-share/gnome/gcompris/boards/watercycle/badwater_off.png
-share/gnome/gcompris/boards/watercycle/cleanwater.png
-share/gnome/gcompris/boards/watercycle/cleanwater_off.png
-share/gnome/gcompris/boards/watercycle/fishingboat.gif
-share/gnome/gcompris/boards/watercycle/fishingboat.png
-share/gnome/gcompris/boards/watercycle/fishingboat_tux.png
-share/gnome/gcompris/boards/watercycle/pumpwater.png
-share/gnome/gcompris/boards/watercycle/pumpwater_off.png
-share/gnome/gcompris/boards/watercycle/rain.png
-share/gnome/gcompris/boards/watercycle/riverempty.png
-share/gnome/gcompris/boards/watercycle/riverfull.png
-share/gnome/gcompris/boards/watercycle/shower.png
-share/gnome/gcompris/boards/watercycle/shower_off.png
-share/gnome/gcompris/boards/watercycle/shower_on.png
-share/gnome/gcompris/boards/watercycle/showerwater.png
-share/gnome/gcompris/boards/watercycle/snow.png
-share/gnome/gcompris/boards/watercycle/sun.png
-share/gnome/gcompris/boards/watercycle/tuxboat.txt
-share/gnome/gcompris/boards/watercycle/vapor.png
-share/gnome/gcompris/boards/watercycle/watercleaning.png
-share/gnome/gcompris/boards/watercycle/waterpump.png
-share/gnome/gcompris/boards/wordprocessor.xml
-share/gnome/gcompris/boards/wordsgame.xml
-share/gnome/gcompris/boards/wordsgame/README
-share/gnome/gcompris/boards/wordsgame/default-ar.xml
-share/gnome/gcompris/boards/wordsgame/default-ar_TN.xml
-share/gnome/gcompris/boards/wordsgame/default-bg.xml
-share/gnome/gcompris/boards/wordsgame/default-da.xml
-share/gnome/gcompris/boards/wordsgame/default-de.xml
-share/gnome/gcompris/boards/wordsgame/default-el.xml
-share/gnome/gcompris/boards/wordsgame/default-en.xml
-share/gnome/gcompris/boards/wordsgame/default-es.xml
-share/gnome/gcompris/boards/wordsgame/default-eu.xml
-share/gnome/gcompris/boards/wordsgame/default-fi.xml
-share/gnome/gcompris/boards/wordsgame/default-fr.xml
-share/gnome/gcompris/boards/wordsgame/default-hu.xml
-share/gnome/gcompris/boards/wordsgame/default-id.xml
-share/gnome/gcompris/boards/wordsgame/default-it.xml
-share/gnome/gcompris/boards/wordsgame/default-lt.xml
-share/gnome/gcompris/boards/wordsgame/default-nb.xml
-share/gnome/gcompris/boards/wordsgame/default-nl.xml
-share/gnome/gcompris/boards/wordsgame/default-nn.xml
-share/gnome/gcompris/boards/wordsgame/default-pt.xml
-share/gnome/gcompris/boards/wordsgame/default-pt_BR.xml
-share/gnome/gcompris/boards/wordsgame/default-ro.xml
-share/gnome/gcompris/boards/wordsgame/default-ru.xml
-share/gnome/gcompris/boards/wordsgame/default-sk.xml
-share/gnome/gcompris/boards/wordsgame/default-sl.xml
-share/gnome/gcompris/boards/wordsgame/default-sv.xml
-share/gnome/gcompris/boards/wordsgame/default-tr.xml
-share/gnome/gcompris/boards/writing_tutor.xml
-share/gnome/gcompris/boards/writing_tutor/anim_pen.gif
-share/gnome/gcompris/boards/writing_tutor/anim_pen.txt
-share/gnome/gcompris/boards/writing_tutor/drop.png
-share/gnome/gcompris/boards/writing_tutor/image_match/@kruh.png
-share/gnome/gcompris/boards/writing_tutor/image_match/@obdlznik.png
-share/gnome/gcompris/boards/writing_tutor/image_match/@stvorec.png
-share/gnome/gcompris/boards/writing_tutor/image_match/@trojuholnik.png
-share/gnome/gcompris/boards/writing_tutor/image_match/a.png
-share/gnome/gcompris/boards/writing_tutor/image_match/b.png
-share/gnome/gcompris/boards/writing_tutor/image_match/c.png
-share/gnome/gcompris/boards/writing_tutor/image_match/d.png
-share/gnome/gcompris/boards/writing_tutor/image_match/g.png
-share/gnome/gcompris/boards/writing_tutor/image_match/h.png
-share/gnome/gcompris/boards/writing_tutor/image_match/j.png
-share/gnome/gcompris/boards/writing_tutor/image_match/l.png
-share/gnome/gcompris/boards/writing_tutor/image_match/m.png
-share/gnome/gcompris/boards/writing_tutor/image_match/r.png
-share/gnome/gcompris/boards/writing_tutor/image_match/s.png
-share/gnome/gcompris/boards/writing_tutor/image_match/t.png
-share/gnome/gcompris/boards/writing_tutor/image_match/z.png
-share/gnome/gcompris/boards/writing_tutor/notepad.png
-share/gnome/gcompris/boards/writing_tutor/pattern_admin_bg.png
-share/gnome/gcompris/boards/writing_tutor/tablet_active.png
-share/gnome/gcompris/boards/writing_tutor/tablet_inactive.png
-share/gnome/gcompris/boards/writing_tutor/wood_oak.png
-share/gnome/gcompris/boards/writing_tutor/wood_pine.png
-share/gnome/gcompris/boards/writing_tutor_image_match.xml
-share/gnome/gcompris/boards/writing_tutor_missing_match.xml
-share/gnome/gcompris/boards/writing_tutor_pattern_admin.xml
-share/gnome/gcompris/boards/writing_tutor_template_match.xml
+share/applications/gcompris-edit.desktop
+share/applications/gcompris.desktop
+%%DATADIR%%/boards/DOCUMENTATIONS
+%%DATADIR%%/boards/Makefile.in.bak
+%%DATADIR%%/boards/README
+%%DATADIR%%/boards/administration.xml
+%%DATADIR%%/boards/advanced_colors.xml
+%%DATADIR%%/boards/advanced_colors/Makefile.in.bak
+%%DATADIR%%/boards/advanced_colors/advanced_colors1.jpg
+%%DATADIR%%/boards/advanced_colors/advanced_colors2.jpg
+%%DATADIR%%/boards/advanced_colors/advanced_colors3.jpg
+%%DATADIR%%/boards/advanced_colors/advanced_colors4.jpg
+%%DATADIR%%/boards/advanced_colors/advanced_colors5.jpg
+%%DATADIR%%/boards/advanced_colors/advanced_colors6.jpg
+%%DATADIR%%/boards/advanced_colors/advanced_colors7.jpg
+%%DATADIR%%/boards/advanced_colors/advanced_colors8.jpg
+%%DATADIR%%/boards/advanced_colors/advanced_colors9.jpg
+%%DATADIR%%/boards/advanced_colors/advanced_colors_highlight.png
+%%DATADIR%%/boards/advanced_colors/board1.xml
+%%DATADIR%%/boards/advanced_colors/board2.xml
+%%DATADIR%%/boards/advanced_colors/board3.xml
+%%DATADIR%%/boards/advanced_colors/board4.xml
+%%DATADIR%%/boards/advanced_colors/board5.xml
+%%DATADIR%%/boards/advanced_colors/board6.xml
+%%DATADIR%%/boards/advanced_colors/board7.xml
+%%DATADIR%%/boards/advanced_colors/board8.xml
+%%DATADIR%%/boards/advanced_colors/board9.xml
+%%DATADIR%%/boards/algebra_by.xml
+%%DATADIR%%/boards/algebra_group.xml
+%%DATADIR%%/boards/algebra_guesscount.xml
+%%DATADIR%%/boards/algebra_guesscount/1.png
+%%DATADIR%%/boards/algebra_guesscount/10.png
+%%DATADIR%%/boards/algebra_guesscount/100.png
+%%DATADIR%%/boards/algebra_guesscount/2.png
+%%DATADIR%%/boards/algebra_guesscount/25.png
+%%DATADIR%%/boards/algebra_guesscount/3.png
+%%DATADIR%%/boards/algebra_guesscount/4.png
+%%DATADIR%%/boards/algebra_guesscount/5.png
+%%DATADIR%%/boards/algebra_guesscount/50.png
+%%DATADIR%%/boards/algebra_guesscount/6.png
+%%DATADIR%%/boards/algebra_guesscount/7.png
+%%DATADIR%%/boards/algebra_guesscount/8.png
+%%DATADIR%%/boards/algebra_guesscount/9.png
+%%DATADIR%%/boards/algebra_guesscount/button.png
+%%DATADIR%%/boards/algebra_guesscount/by.png
+%%DATADIR%%/boards/algebra_guesscount/div.png
+%%DATADIR%%/boards/algebra_guesscount/equal.png
+%%DATADIR%%/boards/algebra_guesscount/minus.png
+%%DATADIR%%/boards/algebra_guesscount/plus.png
+%%DATADIR%%/boards/algebra_minus.xml
+%%DATADIR%%/boards/algebra_plus.xml
+%%DATADIR%%/boards/algebramenu.xml
+%%DATADIR%%/boards/algorithm.xml
+%%DATADIR%%/boards/anim.xml
+%%DATADIR%%/boards/anim/animation.js
+%%DATADIR%%/boards/awele.xml
+%%DATADIR%%/boards/awele/awele_frame.png
+%%DATADIR%%/boards/awele/bouton1.png
+%%DATADIR%%/boards/awele/bouton1_clic.png
+%%DATADIR%%/boards/awele/bouton1_notify.png
+%%DATADIR%%/boards/awele/bouton2.png
+%%DATADIR%%/boards/awele/bouton2_clic.png
+%%DATADIR%%/boards/awele/bouton2_notify.png
+%%DATADIR%%/boards/awele/bouton3.png
+%%DATADIR%%/boards/awele/bouton3_clic.png
+%%DATADIR%%/boards/awele/bouton3_notify.png
+%%DATADIR%%/boards/awele/bouton4.png
+%%DATADIR%%/boards/awele/bouton4_clic.png
+%%DATADIR%%/boards/awele/bouton4_notify.png
+%%DATADIR%%/boards/awele/bouton5.png
+%%DATADIR%%/boards/awele/bouton5_clic.png
+%%DATADIR%%/boards/awele/bouton5_notify.png
+%%DATADIR%%/boards/awele/bouton6.png
+%%DATADIR%%/boards/awele/bouton6_clic.png
+%%DATADIR%%/boards/awele/bouton6_notify.png
+%%DATADIR%%/boards/awele/graine1.png
+%%DATADIR%%/boards/awele/graine2.png
+%%DATADIR%%/boards/awele/graine3.png
+%%DATADIR%%/boards/awele/graine4.png
+%%DATADIR%%/boards/awele/graine4bis.png
+%%DATADIR%%/boards/babymatch.xml
+%%DATADIR%%/boards/babymatch/Makefile.in.bak
+%%DATADIR%%/boards/babymatch/bell.png
+%%DATADIR%%/boards/babymatch/board1_0.xml
+%%DATADIR%%/boards/babymatch/board2_0.xml
+%%DATADIR%%/boards/babymatch/board3_0.xml
+%%DATADIR%%/boards/babymatch/board4_0.xml
+%%DATADIR%%/boards/babymatch/board5_0.xml
+%%DATADIR%%/boards/babymatch/board6_0.xml
+%%DATADIR%%/boards/babymatch/board7_0.xml
+%%DATADIR%%/boards/babymatch/gramophone.png
+%%DATADIR%%/boards/babymatch/lifebuoy.png
+%%DATADIR%%/boards/babymatch/sun.png
+%%DATADIR%%/boards/babymatch/umbrella.png
+%%DATADIR%%/boards/babyshapes.xml
+%%DATADIR%%/boards/babyshapes/Makefile.in.bak
+%%DATADIR%%/boards/babyshapes/T_baby_bottle.png
+%%DATADIR%%/boards/babyshapes/T_banana.png
+%%DATADIR%%/boards/babyshapes/T_bread_slice.png
+%%DATADIR%%/boards/babyshapes/T_butter.png
+%%DATADIR%%/boards/babyshapes/T_chocolate.png
+%%DATADIR%%/boards/babyshapes/T_chocolate_cake.png
+%%DATADIR%%/boards/babyshapes/T_cookie.png
+%%DATADIR%%/boards/babyshapes/T_french_croissant.png
+%%DATADIR%%/boards/babyshapes/T_grapefruit.png
+%%DATADIR%%/boards/babyshapes/T_marmelade.png
+%%DATADIR%%/boards/babyshapes/T_milk_cup.png
+%%DATADIR%%/boards/babyshapes/T_milk_shake.png
+%%DATADIR%%/boards/babyshapes/T_orange.png
+%%DATADIR%%/boards/babyshapes/T_pear.png
+%%DATADIR%%/boards/babyshapes/T_round_cookie.png
+%%DATADIR%%/boards/babyshapes/T_suggar_box.png
+%%DATADIR%%/boards/babyshapes/T_yahourt.png
+%%DATADIR%%/boards/babyshapes/board1_0.xml
+%%DATADIR%%/boards/babyshapes/board2_0.xml
+%%DATADIR%%/boards/babyshapes/board3_0.xml
+%%DATADIR%%/boards/babyshapes/board4_0.xml
+%%DATADIR%%/boards/babyshapes/board5_0.xml
+%%DATADIR%%/boards/babyshapes/board6_0.xml
+%%DATADIR%%/boards/babyshapes/board7_0.xml
+%%DATADIR%%/boards/babyshapes/dog1/dog.png
+%%DATADIR%%/boards/babyshapes/dog1/dog1.png
+%%DATADIR%%/boards/babyshapes/dog1/dog2.png
+%%DATADIR%%/boards/babyshapes/dog1/dog3.png
+%%DATADIR%%/boards/babyshapes/dog2/dog.png
+%%DATADIR%%/boards/babyshapes/dog2/dog1.png
+%%DATADIR%%/boards/babyshapes/dog2/dog2.png
+%%DATADIR%%/boards/babyshapes/dog2/dog3.png
+%%DATADIR%%/boards/babyshapes/dog2/dog4.png
+%%DATADIR%%/boards/babyshapes/dog2/dog5.png
+%%DATADIR%%/boards/babyshapes/dog2/dog6.png
+%%DATADIR%%/boards/babyshapes/dog3/dog.png
+%%DATADIR%%/boards/babyshapes/dog3/dog1.png
+%%DATADIR%%/boards/babyshapes/dog3/dog2.png
+%%DATADIR%%/boards/babyshapes/dog3/dog3.png
+%%DATADIR%%/boards/babyshapes/dog3/dog4.png
+%%DATADIR%%/boards/babyshapes/dog3/dog5.png
+%%DATADIR%%/boards/babyshapes/dog3/dog6.png
+%%DATADIR%%/boards/ballcatch.xml
+%%DATADIR%%/boards/bargame.xml
+%%DATADIR%%/boards/bargame/blue_ball.png
+%%DATADIR%%/boards/bargame/board.png
+%%DATADIR%%/boards/bargame/case.png
+%%DATADIR%%/boards/bargame/case_last.png
+%%DATADIR%%/boards/bargame/green_ball.png
+%%DATADIR%%/boards/bargame/mask.png
+%%DATADIR%%/boards/bargame/mask_last.png
+%%DATADIR%%/boards/bargame/ombre.png
+%%DATADIR%%/boards/billard.xml
+%%DATADIR%%/boards/canal_lock.xml
+%%DATADIR%%/boards/canal_lock/canal_lock_bg.png
+%%DATADIR%%/boards/cardimage/01_cat.png
+%%DATADIR%%/boards/cardimage/02_pig.png
+%%DATADIR%%/boards/cardimage/03_bear.png
+%%DATADIR%%/boards/cardimage/04_hippopotamus.png
+%%DATADIR%%/boards/cardimage/05_penguin.png
+%%DATADIR%%/boards/cardimage/06_cow.png
+%%DATADIR%%/boards/cardimage/07_sheep.png
+%%DATADIR%%/boards/cardimage/08_turtle.png
+%%DATADIR%%/boards/cardimage/09_panda.png
+%%DATADIR%%/boards/cardimage/10_chicken.png
+%%DATADIR%%/boards/cardimage/11_redbird.png
+%%DATADIR%%/boards/cardimage/12_wolf.png
+%%DATADIR%%/boards/cardimage/13_monkey.png
+%%DATADIR%%/boards/cardimage/14_fox.png
+%%DATADIR%%/boards/cardimage/15_bluebirds.png
+%%DATADIR%%/boards/cardimage/16_elephant.png
+%%DATADIR%%/boards/cardimage/17_lion.png
+%%DATADIR%%/boards/cardimage/18_gnu.png
+%%DATADIR%%/boards/cardimage/19_bluebaby.png
+%%DATADIR%%/boards/cardimage/20_greenbaby.png
+%%DATADIR%%/boards/cardimage/21_frog.png
+%%DATADIR%%/boards/cardimage/README
+%%DATADIR%%/boards/cardimage/backcard.png
+%%DATADIR%%/boards/cardimage/emptycard.png
+%%DATADIR%%/boards/chat.xml
+%%DATADIR%%/boards/chess.xml
+%%DATADIR%%/boards/chess/Bb.png
+%%DATADIR%%/boards/chess/Bk.png
+%%DATADIR%%/boards/chess/Bn.png
+%%DATADIR%%/boards/chess/Bp.png
+%%DATADIR%%/boards/chess/Bq.png
+%%DATADIR%%/boards/chess/Br.png
+%%DATADIR%%/boards/chess/COPYRIGHT
+%%DATADIR%%/boards/chess/WB.png
+%%DATADIR%%/boards/chess/WK.png
+%%DATADIR%%/boards/chess/WN.png
+%%DATADIR%%/boards/chess/WP.png
+%%DATADIR%%/boards/chess/WQ.png
+%%DATADIR%%/boards/chess/WR.png
+%%DATADIR%%/boards/chess_computer.xml
+%%DATADIR%%/boards/chess_movelearn.xml
+%%DATADIR%%/boards/chess_partyend.xml
+%%DATADIR%%/boards/chronos.xml
+%%DATADIR%%/boards/chronos/Makefile.in.bak
+%%DATADIR%%/boards/chronos/board1_0.xml
+%%DATADIR%%/boards/chronos/board1_1.xml
+%%DATADIR%%/boards/chronos/board1_2.xml
+%%DATADIR%%/boards/chronos/board2_0.xml
+%%DATADIR%%/boards/chronos/board3_0.xml
+%%DATADIR%%/boards/chronos/board3_1.xml
+%%DATADIR%%/boards/chronos/board3_2.xml
+%%DATADIR%%/boards/chronos/board3_3.xml
+%%DATADIR%%/boards/chronos/board3_4.xml
+%%DATADIR%%/boards/chronos/board4_0.xml
+%%DATADIR%%/boards/chronos/board4_1.xml
+%%DATADIR%%/boards/chronos/board4_2.xml
+%%DATADIR%%/boards/chronos/board4_3.xml
+%%DATADIR%%/boards/chronos/images/1955ds19.png
+%%DATADIR%%/boards/chronos/images/Eole.png
+%%DATADIR%%/boards/chronos/images/README
+%%DATADIR%%/boards/chronos/images/autumn.png
+%%DATADIR%%/boards/chronos/images/bell_X1.png
+%%DATADIR%%/boards/chronos/images/benz1885.png
+%%DATADIR%%/boards/chronos/images/bleriot.png
+%%DATADIR%%/boards/chronos/images/bolle1878.png
+%%DATADIR%%/boards/chronos/images/celerifere.png
+%%DATADIR%%/boards/chronos/images/chronos-tuxtree1.png
+%%DATADIR%%/boards/chronos/images/chronos-tuxtree2.png
+%%DATADIR%%/boards/chronos/images/chronos-tuxtree3.png
+%%DATADIR%%/boards/chronos/images/chronos-tuxtree4.png
+%%DATADIR%%/boards/chronos/images/fardier.png
+%%DATADIR%%/boards/chronos/images/garden1.png
+%%DATADIR%%/boards/chronos/images/garden2.png
+%%DATADIR%%/boards/chronos/images/garden3.png
+%%DATADIR%%/boards/chronos/images/garden4.png
+%%DATADIR%%/boards/chronos/images/helico_cornu.png
+%%DATADIR%%/boards/chronos/images/lancia1923.png
+%%DATADIR%%/boards/chronos/images/lindbergh.png
+%%DATADIR%%/boards/chronos/images/mongolfiere.png
+%%DATADIR%%/boards/chronos/images/rafale.png
+%%DATADIR%%/boards/chronos/images/renault1899.png
+%%DATADIR%%/boards/chronos/images/spring.png
+%%DATADIR%%/boards/chronos/images/st_rocket.png
+%%DATADIR%%/boards/chronos/images/summer.png
+%%DATADIR%%/boards/chronos/images/winter.png
+%%DATADIR%%/boards/chronos/images/wright_flyer.png
+%%DATADIR%%/boards/chronos/space/1.jpg
+%%DATADIR%%/boards/chronos/space/2.jpg
+%%DATADIR%%/boards/chronos/space/3.jpg
+%%DATADIR%%/boards/chronos/space/4.jpg
+%%DATADIR%%/boards/chronos/space/bg.jpg
+%%DATADIR%%/boards/click_on_letter.xml
+%%DATADIR%%/boards/clickanddraw.xml
+%%DATADIR%%/boards/clickgame.xml
+%%DATADIR%%/boards/clockgame.xml
+%%DATADIR%%/boards/colors.xml
+%%DATADIR%%/boards/colors/colors_bg.png
+%%DATADIR%%/boards/colors/colors_highlight.png
+%%DATADIR%%/boards/colors_group.xml
+%%DATADIR%%/boards/computer.xml
+%%DATADIR%%/boards/connect4-2players.xml
+%%DATADIR%%/boards/connect4.xml
+%%DATADIR%%/boards/connect4/back.png
+%%DATADIR%%/boards/connect4/sablier.gif
+%%DATADIR%%/boards/connect4/sablier.txt
+%%DATADIR%%/boards/connect4/stone_1.png
+%%DATADIR%%/boards/connect4/stone_2.png
+%%DATADIR%%/boards/connect4/tux-teacher.png
+%%DATADIR%%/boards/crane.xml
+%%DATADIR%%/boards/crane/arrow_b.png
+%%DATADIR%%/boards/crane/arrow_down.png
+%%DATADIR%%/boards/crane/arrow_l.png
+%%DATADIR%%/boards/crane/arrow_left.png
+%%DATADIR%%/boards/crane/arrow_r.png
+%%DATADIR%%/boards/crane/arrow_right.png
+%%DATADIR%%/boards/crane/arrow_u.png
+%%DATADIR%%/boards/crane/arrow_up.png
+%%DATADIR%%/boards/crane/bulb.png
+%%DATADIR%%/boards/crane/crane-bg.png
+%%DATADIR%%/boards/crane/letter-a.png
+%%DATADIR%%/boards/crane/letter-b.png
+%%DATADIR%%/boards/crane/rectangle1.png
+%%DATADIR%%/boards/crane/rectangle2.png
+%%DATADIR%%/boards/crane/selected.png
+%%DATADIR%%/boards/crane/square1.png
+%%DATADIR%%/boards/crane/square2.png
+%%DATADIR%%/boards/crane/triangle1.png
+%%DATADIR%%/boards/crane/triangle2.png
+%%DATADIR%%/boards/crane/tux.png
+%%DATADIR%%/boards/crane/water_drop1.png
+%%DATADIR%%/boards/crane/water_drop2.png
+%%DATADIR%%/boards/crane/water_spot1.png
+%%DATADIR%%/boards/crane/water_spot2.png
+%%DATADIR%%/boards/dataset/misc.xml
+%%DATADIR%%/boards/dataset/mrpotato.xml
+%%DATADIR%%/boards/dataset/tuxpaint_pictures.xml
+%%DATADIR%%/boards/dataset/user_pictures.xml
+%%DATADIR%%/boards/discovery.xml
+%%DATADIR%%/boards/doubleentry.xml
+%%DATADIR%%/boards/doubleentry/Makefile.in.bak
+%%DATADIR%%/boards/doubleentry/board1_0.xml
+%%DATADIR%%/boards/doubleentry/board2_0.xml
+%%DATADIR%%/boards/doubleentry/board3_0.xml
+%%DATADIR%%/boards/doubleentry/circle-r0-g2.png
+%%DATADIR%%/boards/doubleentry/circle-r0-g3.png
+%%DATADIR%%/boards/doubleentry/circle-r0-g4.png
+%%DATADIR%%/boards/doubleentry/circle-r2-g0.png
+%%DATADIR%%/boards/doubleentry/circle-r2-g2.png
+%%DATADIR%%/boards/doubleentry/circle-r2-g3.png
+%%DATADIR%%/boards/doubleentry/circle-r2-g4.png
+%%DATADIR%%/boards/doubleentry/circle-r3-g0.png
+%%DATADIR%%/boards/doubleentry/circle-r3-g2.png
+%%DATADIR%%/boards/doubleentry/circle-r3-g3.png
+%%DATADIR%%/boards/doubleentry/circle-r3-g4.png
+%%DATADIR%%/boards/doubleentry/circle-r4-g0.png
+%%DATADIR%%/boards/doubleentry/circle-r4-g2.png
+%%DATADIR%%/boards/doubleentry/circle-r4-g3.png
+%%DATADIR%%/boards/doubleentry/circle-r4-g4.png
+%%DATADIR%%/boards/doubleentry/d-entry_banane_1.png
+%%DATADIR%%/boards/doubleentry/d-entry_banane_2.png
+%%DATADIR%%/boards/doubleentry/d-entry_banane_3.png
+%%DATADIR%%/boards/doubleentry/d-entry_galette_1.png
+%%DATADIR%%/boards/doubleentry/d-entry_galette_2.png
+%%DATADIR%%/boards/doubleentry/d-entry_galette_3.png
+%%DATADIR%%/boards/doubleentry/d-entry_pomme_1.png
+%%DATADIR%%/boards/doubleentry/d-entry_pomme_2.png
+%%DATADIR%%/boards/doubleentry/d-entry_pomme_3.png
+%%DATADIR%%/boards/doubleentry/doubleentry-bg.png
+%%DATADIR%%/boards/draw.xml
+%%DATADIR%%/boards/drawnumber.xml
+%%DATADIR%%/boards/electric.xml
+%%DATADIR%%/boards/electric/battery.png
+%%DATADIR%%/boards/electric/battery_dead.png
+%%DATADIR%%/boards/electric/battery_icon.png
+%%DATADIR%%/boards/electric/bulb1.png
+%%DATADIR%%/boards/electric/bulb10.png
+%%DATADIR%%/boards/electric/bulb11.png
+%%DATADIR%%/boards/electric/bulb2.png
+%%DATADIR%%/boards/electric/bulb3.png
+%%DATADIR%%/boards/electric/bulb4.png
+%%DATADIR%%/boards/electric/bulb5.png
+%%DATADIR%%/boards/electric/bulb6.png
+%%DATADIR%%/boards/electric/bulb7.png
+%%DATADIR%%/boards/electric/bulb8.png
+%%DATADIR%%/boards/electric/bulb9.png
+%%DATADIR%%/boards/electric/bulb_icon.png
+%%DATADIR%%/boards/electric/connect.png
+%%DATADIR%%/boards/electric/connect_icon.png
+%%DATADIR%%/boards/electric/connect_spot.png
+%%DATADIR%%/boards/electric/diod.png
+%%DATADIR%%/boards/electric/diode.png
+%%DATADIR%%/boards/electric/diode_icon.png
+%%DATADIR%%/boards/electric/resistor.png
+%%DATADIR%%/boards/electric/resistor_icon.png
+%%DATADIR%%/boards/electric/resistor_track.png
+%%DATADIR%%/boards/electric/resistor_track_icon.png
+%%DATADIR%%/boards/electric/resistor_wiper.png
+%%DATADIR%%/boards/electric/switch2_icon.png
+%%DATADIR%%/boards/electric/switch2_off.png
+%%DATADIR%%/boards/electric/switch2_on.png
+%%DATADIR%%/boards/electric/switch_click.png
+%%DATADIR%%/boards/electric/switch_icon.png
+%%DATADIR%%/boards/electric/switch_off.png
+%%DATADIR%%/boards/electric/switch_on.png
+%%DATADIR%%/boards/enumerate.xml
+%%DATADIR%%/boards/erase.xml
+%%DATADIR%%/boards/erase_clic.xml
+%%DATADIR%%/boards/experience.xml
+%%DATADIR%%/boards/experimental.xml
+%%DATADIR%%/boards/fifteen.xml
+%%DATADIR%%/boards/fishes/QueenAngel_0.png
+%%DATADIR%%/boards/fishes/QueenAngel_1.png
+%%DATADIR%%/boards/fishes/blueking2_0.png
+%%DATADIR%%/boards/fishes/blueking2_1.png
+%%DATADIR%%/boards/fishes/butfish_0.png
+%%DATADIR%%/boards/fishes/butfish_1.png
+%%DATADIR%%/boards/fishes/cichlid1_0.png
+%%DATADIR%%/boards/fishes/cichlid1_1.png
+%%DATADIR%%/boards/fishes/cichlid4_0.png
+%%DATADIR%%/boards/fishes/cichlid4_1.png
+%%DATADIR%%/boards/fishes/collaris_0.png
+%%DATADIR%%/boards/fishes/collaris_1.png
+%%DATADIR%%/boards/fishes/discus2_0.png
+%%DATADIR%%/boards/fishes/discus2_1.png
+%%DATADIR%%/boards/fishes/discus3_0.png
+%%DATADIR%%/boards/fishes/discus3_1.png
+%%DATADIR%%/boards/fishes/eel_0.png
+%%DATADIR%%/boards/fishes/eel_1.png
+%%DATADIR%%/boards/fishes/f00_0.png
+%%DATADIR%%/boards/fishes/f00_1.png
+%%DATADIR%%/boards/fishes/f01_0.png
+%%DATADIR%%/boards/fishes/f01_1.png
+%%DATADIR%%/boards/fishes/f02_0.png
+%%DATADIR%%/boards/fishes/f02_1.png
+%%DATADIR%%/boards/fishes/f03_0.png
+%%DATADIR%%/boards/fishes/f03_1.png
+%%DATADIR%%/boards/fishes/f04_0.png
+%%DATADIR%%/boards/fishes/f04_1.png
+%%DATADIR%%/boards/fishes/f05_0.png
+%%DATADIR%%/boards/fishes/f05_1.png
+%%DATADIR%%/boards/fishes/f06_0.png
+%%DATADIR%%/boards/fishes/f06_1.png
+%%DATADIR%%/boards/fishes/f07_0.png
+%%DATADIR%%/boards/fishes/f07_1.png
+%%DATADIR%%/boards/fishes/f08_0.png
+%%DATADIR%%/boards/fishes/f08_1.png
+%%DATADIR%%/boards/fishes/f09_0.png
+%%DATADIR%%/boards/fishes/f09_1.png
+%%DATADIR%%/boards/fishes/f10_0.png
+%%DATADIR%%/boards/fishes/f10_1.png
+%%DATADIR%%/boards/fishes/f11_0.png
+%%DATADIR%%/boards/fishes/f11_1.png
+%%DATADIR%%/boards/fishes/f12_0.png
+%%DATADIR%%/boards/fishes/f12_1.png
+%%DATADIR%%/boards/fishes/f13_0.png
+%%DATADIR%%/boards/fishes/f13_1.png
+%%DATADIR%%/boards/fishes/manta_0.png
+%%DATADIR%%/boards/fishes/manta_1.png
+%%DATADIR%%/boards/fishes/newf1_0.png
+%%DATADIR%%/boards/fishes/newf1_1.png
+%%DATADIR%%/boards/fishes/shark1_0.png
+%%DATADIR%%/boards/fishes/shark1_1.png
+%%DATADIR%%/boards/fishes/six_barred_0.png
+%%DATADIR%%/boards/fishes/six_barred_1.png
+%%DATADIR%%/boards/fishes/teeth_0.png
+%%DATADIR%%/boards/fishes/teeth_1.png
+%%DATADIR%%/boards/fishes/teeth_2.png
+%%DATADIR%%/boards/fishes/teeth_3.png
+%%DATADIR%%/boards/fishes/teeth_4.png
+%%DATADIR%%/boards/fishes/teeth_5.png
+%%DATADIR%%/boards/fishes/teeth_6.png
+%%DATADIR%%/boards/fishes/teeth_7.png
+%%DATADIR%%/boards/flags/README
+%%DATADIR%%/boards/flags/am.png
+%%DATADIR%%/boards/flags/ar.png
+%%DATADIR%%/boards/flags/ar_TN.png
+%%DATADIR%%/boards/flags/at.png
+%%DATADIR%%/boards/flags/az.png
+%%DATADIR%%/boards/flags/be.png
+%%DATADIR%%/boards/flags/bg.png
+%%DATADIR%%/boards/flags/br.png
+%%DATADIR%%/boards/flags/ca.png
+%%DATADIR%%/boards/flags/ch.png
+%%DATADIR%%/boards/flags/cs.png
+%%DATADIR%%/boards/flags/cu.png
+%%DATADIR%%/boards/flags/cz.png
+%%DATADIR%%/boards/flags/da.png
+%%DATADIR%%/boards/flags/de.png
+%%DATADIR%%/boards/flags/dk.png
+%%DATADIR%%/boards/flags/dz.png
+%%DATADIR%%/boards/flags/ee.png
+%%DATADIR%%/boards/flags/el.png
+%%DATADIR%%/boards/flags/en.png
+%%DATADIR%%/boards/flags/en_CA.png
+%%DATADIR%%/boards/flags/en_GB.png
+%%DATADIR%%/boards/flags/es.png
+%%DATADIR%%/boards/flags/eu.png
+%%DATADIR%%/boards/flags/fi.png
+%%DATADIR%%/boards/flags/fr.png
+%%DATADIR%%/boards/flags/ga.png
+%%DATADIR%%/boards/flags/gr.png
+%%DATADIR%%/boards/flags/gu.png
+%%DATADIR%%/boards/flags/he.png
+%%DATADIR%%/boards/flags/hi.png
+%%DATADIR%%/boards/flags/hr.png
+%%DATADIR%%/boards/flags/hu.png
+%%DATADIR%%/boards/flags/id.png
+%%DATADIR%%/boards/flags/il.png
+%%DATADIR%%/boards/flags/is.png
+%%DATADIR%%/boards/flags/it.png
+%%DATADIR%%/boards/flags/ja.png
+%%DATADIR%%/boards/flags/jp.png
+%%DATADIR%%/boards/flags/ka.png
+%%DATADIR%%/boards/flags/ko.png
+%%DATADIR%%/boards/flags/lt.png
+%%DATADIR%%/boards/flags/mk.png
+%%DATADIR%%/boards/flags/ml.png
+%%DATADIR%%/boards/flags/mr.png
+%%DATADIR%%/boards/flags/ms.png
+%%DATADIR%%/boards/flags/mx.png
+%%DATADIR%%/boards/flags/nb.png
+%%DATADIR%%/boards/flags/ne.png
+%%DATADIR%%/boards/flags/nl.png
+%%DATADIR%%/boards/flags/nn.png
+%%DATADIR%%/boards/flags/oc.png
+%%DATADIR%%/boards/flags/pa.png
+%%DATADIR%%/boards/flags/pl.png
+%%DATADIR%%/boards/flags/pt.png
+%%DATADIR%%/boards/flags/pt_BR.png
+%%DATADIR%%/boards/flags/qc.png
+%%DATADIR%%/boards/flags/ro.png
+%%DATADIR%%/boards/flags/ru.png
+%%DATADIR%%/boards/flags/rw.png
+%%DATADIR%%/boards/flags/se.png
+%%DATADIR%%/boards/flags/si.png
+%%DATADIR%%/boards/flags/sk.png
+%%DATADIR%%/boards/flags/sl.png
+%%DATADIR%%/boards/flags/so.png
+%%DATADIR%%/boards/flags/sq.png
+%%DATADIR%%/boards/flags/sr.png
+%%DATADIR%%/boards/flags/sv.png
+%%DATADIR%%/boards/flags/th.png
+%%DATADIR%%/boards/flags/tr.png
+%%DATADIR%%/boards/flags/uk.png
+%%DATADIR%%/boards/flags/uy.png
+%%DATADIR%%/boards/flags/vi.png
+%%DATADIR%%/boards/flags/wa.png
+%%DATADIR%%/boards/flags/yu.png
+%%DATADIR%%/boards/flags/zh.png
+%%DATADIR%%/boards/followline.xml
+%%DATADIR%%/boards/fun.xml
+%%DATADIR%%/boards/gcompris/Makefile.in.bak
+%%DATADIR%%/boards/gcompris/README
+%%DATADIR%%/boards/gcompris/bonus/README
+%%DATADIR%%/boards/gcompris/bonus/flower_bad.png
+%%DATADIR%%/boards/gcompris/bonus/flower_good.png
+%%DATADIR%%/boards/gcompris/bonus/gnu_bad.png
+%%DATADIR%%/boards/gcompris/bonus/gnu_good.png
+%%DATADIR%%/boards/gcompris/bonus/lion_bad.png
+%%DATADIR%%/boards/gcompris/bonus/lion_good.png
+%%DATADIR%%/boards/gcompris/bonus/smiley_bad.png
+%%DATADIR%%/boards/gcompris/bonus/smiley_good.png
+%%DATADIR%%/boards/gcompris/bonus/tux_bad.png
+%%DATADIR%%/boards/gcompris/bonus/tux_good.png
+%%DATADIR%%/boards/gcompris/dice/gnome-dice0.png
+%%DATADIR%%/boards/gcompris/dice/gnome-dice1.png
+%%DATADIR%%/boards/gcompris/dice/gnome-dice2.png
+%%DATADIR%%/boards/gcompris/dice/gnome-dice3.png
+%%DATADIR%%/boards/gcompris/dice/gnome-dice4.png
+%%DATADIR%%/boards/gcompris/dice/gnome-dice5.png
+%%DATADIR%%/boards/gcompris/dice/gnome-dice6.png
+%%DATADIR%%/boards/gcompris/dice/gnome-dice7.png
+%%DATADIR%%/boards/gcompris/dice/gnome-dice8.png
+%%DATADIR%%/boards/gcompris/dice/gnome-dice9.png
+%%DATADIR%%/boards/gcompris/food/README
+%%DATADIR%%/boards/gcompris/food/baby_bottle.png
+%%DATADIR%%/boards/gcompris/food/banana.png
+%%DATADIR%%/boards/gcompris/food/bread_slice.png
+%%DATADIR%%/boards/gcompris/food/butter.png
+%%DATADIR%%/boards/gcompris/food/chocolate.png
+%%DATADIR%%/boards/gcompris/food/chocolate_cake.png
+%%DATADIR%%/boards/gcompris/food/cookie.png
+%%DATADIR%%/boards/gcompris/food/french_croissant.png
+%%DATADIR%%/boards/gcompris/food/grapefruit.png
+%%DATADIR%%/boards/gcompris/food/marmelade.png
+%%DATADIR%%/boards/gcompris/food/milk_cup.png
+%%DATADIR%%/boards/gcompris/food/milk_shake.png
+%%DATADIR%%/boards/gcompris/food/orange.png
+%%DATADIR%%/boards/gcompris/food/pear.png
+%%DATADIR%%/boards/gcompris/food/round_cookie.png
+%%DATADIR%%/boards/gcompris/food/suggar_box.png
+%%DATADIR%%/boards/gcompris/food/yahourt.png
+%%DATADIR%%/boards/gcompris/mime_type.xml
+%%DATADIR%%/boards/gcompris/mimetypes/Makefile.in.bak
+%%DATADIR%%/boards/gcompris/mimetypes/README
+%%DATADIR%%/boards/gcompris/mimetypes/icons/gcompris+anim.png
+%%DATADIR%%/boards/gcompris/mimetypes/icons/gcompris+draw.png
+%%DATADIR%%/boards/gcompris/mimetypes/icons/svg+xml+javascript.png
+%%DATADIR%%/boards/gcompris/mimetypes/icons/svg+xml.png
+%%DATADIR%%/boards/gcompris/mimetypes/icons/wordprocessor+html.png
+%%DATADIR%%/boards/gcompris/mimetypes/mime_type.xml
+%%DATADIR%%/boards/gcompris/misc/README
+%%DATADIR%%/boards/gcompris/misc/Tux_mute.png
+%%DATADIR%%/boards/gcompris/misc/Tux_play.png
+%%DATADIR%%/boards/gcompris/misc/apple.png
+%%DATADIR%%/boards/gcompris/misc/bicycle.png
+%%DATADIR%%/boards/gcompris/misc/bottle.png
+%%DATADIR%%/boards/gcompris/misc/car.png
+%%DATADIR%%/boards/gcompris/misc/carot.png
+%%DATADIR%%/boards/gcompris/misc/castle.png
+%%DATADIR%%/boards/gcompris/misc/cerise.png
+%%DATADIR%%/boards/gcompris/misc/cloud.png
+%%DATADIR%%/boards/gcompris/misc/cocotier.png
+%%DATADIR%%/boards/gcompris/misc/crown.png
+%%DATADIR%%/boards/gcompris/misc/door.png
+%%DATADIR%%/boards/gcompris/misc/door1.png
+%%DATADIR%%/boards/gcompris/misc/door2.png
+%%DATADIR%%/boards/gcompris/misc/egg.png
+%%DATADIR%%/boards/gcompris/misc/eggpot.png
+%%DATADIR%%/boards/gcompris/misc/fishingboat.png
+%%DATADIR%%/boards/gcompris/misc/flower.png
+%%DATADIR%%/boards/gcompris/misc/flowerpot.png
+%%DATADIR%%/boards/gcompris/misc/football.png
+%%DATADIR%%/boards/gcompris/misc/fusee.png
+%%DATADIR%%/boards/gcompris/misc/glass.png
+%%DATADIR%%/boards/gcompris/misc/hand.png
+%%DATADIR%%/boards/gcompris/misc/house.png
+%%DATADIR%%/boards/gcompris/misc/lamp.png
+%%DATADIR%%/boards/gcompris/misc/light.png
+%%DATADIR%%/boards/gcompris/misc/lighthouse.png
+%%DATADIR%%/boards/gcompris/misc/minitux.png
+%%DATADIR%%/boards/gcompris/misc/minivan.png
+%%DATADIR%%/boards/gcompris/misc/parachute.png
+%%DATADIR%%/boards/gcompris/misc/peer.png
+%%DATADIR%%/boards/gcompris/misc/pencil.png
+%%DATADIR%%/boards/gcompris/misc/plane.png
+%%DATADIR%%/boards/gcompris/misc/postcard.png
+%%DATADIR%%/boards/gcompris/misc/postpoint.png
+%%DATADIR%%/boards/gcompris/misc/rape.png
+%%DATADIR%%/boards/gcompris/misc/raquette.png
+%%DATADIR%%/boards/gcompris/misc/sailingboat.png
+%%DATADIR%%/boards/gcompris/misc/sapin.png
+%%DATADIR%%/boards/gcompris/misc/sea.png
+%%DATADIR%%/boards/gcompris/misc/sofa.png
+%%DATADIR%%/boards/gcompris/misc/star.png
+%%DATADIR%%/boards/gcompris/misc/strawberry.png
+%%DATADIR%%/boards/gcompris/misc/toomanyerrors.png
+%%DATADIR%%/boards/gcompris/misc/tree.png
+%%DATADIR%%/boards/gcompris/misc/truck.png
+%%DATADIR%%/boards/gcompris/misc/tux.png
+%%DATADIR%%/boards/gcompris/misc/tux_top_east.png
+%%DATADIR%%/boards/gcompris/misc/tux_top_north.png
+%%DATADIR%%/boards/gcompris/misc/tux_top_south.png
+%%DATADIR%%/boards/gcompris/misc/tux_top_west.png
+%%DATADIR%%/boards/gcompris/misc/tuxballoon.png
+%%DATADIR%%/boards/gcompris/misc/tuxboat.png
+%%DATADIR%%/boards/gcompris/misc/tuxhelico.png
+%%DATADIR%%/boards/gcompris/misc/tuxloco.png
+%%DATADIR%%/boards/gcompris/misc/tuxplane.png
+%%DATADIR%%/boards/gcompris/misc/windflag0.png
+%%DATADIR%%/boards/gcompris/misc/windflag4.png
+%%DATADIR%%/boards/gcompris/misc/windflag5.png
+%%DATADIR%%/boards/gcompris/timers/README
+%%DATADIR%%/boards/gcompris/timers/clock1.png
+%%DATADIR%%/boards/gcompris/timers/clock10.png
+%%DATADIR%%/boards/gcompris/timers/clock2.png
+%%DATADIR%%/boards/gcompris/timers/clock3.png
+%%DATADIR%%/boards/gcompris/timers/clock4.png
+%%DATADIR%%/boards/gcompris/timers/clock5.png
+%%DATADIR%%/boards/gcompris/timers/clock6.png
+%%DATADIR%%/boards/gcompris/timers/clock7.png
+%%DATADIR%%/boards/gcompris/timers/clock8.png
+%%DATADIR%%/boards/gcompris/timers/clock9.png
+%%DATADIR%%/boards/gcompris/timers/sablier.gif
+%%DATADIR%%/boards/gcompris/timers/sablier1.png
+%%DATADIR%%/boards/gcompris/timers/sablier10.png
+%%DATADIR%%/boards/gcompris/timers/sablier2.png
+%%DATADIR%%/boards/gcompris/timers/sablier3.png
+%%DATADIR%%/boards/gcompris/timers/sablier4.png
+%%DATADIR%%/boards/gcompris/timers/sablier5.png
+%%DATADIR%%/boards/gcompris/timers/sablier6.png
+%%DATADIR%%/boards/gcompris/timers/sablier7.png
+%%DATADIR%%/boards/gcompris/timers/sablier8.png
+%%DATADIR%%/boards/gcompris/timers/sablier9.png
+%%DATADIR%%/boards/geography.xml
+%%DATADIR%%/boards/geography/Makefile.in.bak
+%%DATADIR%%/boards/geography/africa/algeria.png
+%%DATADIR%%/boards/geography/africa/all_south_africa.png
+%%DATADIR%%/boards/geography/africa/angola.png
+%%DATADIR%%/boards/geography/africa/benin.png
+%%DATADIR%%/boards/geography/africa/botswana.png
+%%DATADIR%%/boards/geography/africa/burkina_faso.png
+%%DATADIR%%/boards/geography/africa/burundi.png
+%%DATADIR%%/boards/geography/africa/cameroon.png
+%%DATADIR%%/boards/geography/africa/central_african_republic.png
+%%DATADIR%%/boards/geography/africa/chad.png
+%%DATADIR%%/boards/geography/africa/democratic_republic_of_congo.png
+%%DATADIR%%/boards/geography/africa/djibouti.png
+%%DATADIR%%/boards/geography/africa/egypt.png
+%%DATADIR%%/boards/geography/africa/equatorial_guinea.png
+%%DATADIR%%/boards/geography/africa/eritrea.png
+%%DATADIR%%/boards/geography/africa/ethiopia.png
+%%DATADIR%%/boards/geography/africa/gabon.png
+%%DATADIR%%/boards/geography/africa/ganbia.png
+%%DATADIR%%/boards/geography/africa/ghana.png
+%%DATADIR%%/boards/geography/africa/guinea.png
+%%DATADIR%%/boards/geography/africa/guinea_bissau.png
+%%DATADIR%%/boards/geography/africa/ivory_coast.png
+%%DATADIR%%/boards/geography/africa/kenya.png
+%%DATADIR%%/boards/geography/africa/lesotho.png
+%%DATADIR%%/boards/geography/africa/liberia.png
+%%DATADIR%%/boards/geography/africa/libya.png
+%%DATADIR%%/boards/geography/africa/madagascar.png
+%%DATADIR%%/boards/geography/africa/malawi.png
+%%DATADIR%%/boards/geography/africa/mali.png
+%%DATADIR%%/boards/geography/africa/mauritania.png
+%%DATADIR%%/boards/geography/africa/moroco.png
+%%DATADIR%%/boards/geography/africa/mozambique.png
+%%DATADIR%%/boards/geography/africa/namibia.png
+%%DATADIR%%/boards/geography/africa/niger.png
+%%DATADIR%%/boards/geography/africa/nigeria.png
+%%DATADIR%%/boards/geography/africa/north_africa.png
+%%DATADIR%%/boards/geography/africa/republic_of_congo.png
+%%DATADIR%%/boards/geography/africa/rwanda.png
+%%DATADIR%%/boards/geography/africa/senegal.png
+%%DATADIR%%/boards/geography/africa/sierra_leone.png
+%%DATADIR%%/boards/geography/africa/somalia.png
+%%DATADIR%%/boards/geography/africa/south_africa.png
+%%DATADIR%%/boards/geography/africa/sudan.png
+%%DATADIR%%/boards/geography/africa/swaziland.png
+%%DATADIR%%/boards/geography/africa/tanzania.png
+%%DATADIR%%/boards/geography/africa/togo.png
+%%DATADIR%%/boards/geography/africa/tunisia.png
+%%DATADIR%%/boards/geography/africa/uganda.png
+%%DATADIR%%/boards/geography/africa/western_sahara.png
+%%DATADIR%%/boards/geography/africa/zambia.png
+%%DATADIR%%/boards/geography/africa/zimbabwe.png
+%%DATADIR%%/boards/geography/afrique/africa.png
+%%DATADIR%%/boards/geography/afrique/algeria.png
+%%DATADIR%%/boards/geography/afrique/angola.png
+%%DATADIR%%/boards/geography/afrique/benin.png
+%%DATADIR%%/boards/geography/afrique/botswana.png
+%%DATADIR%%/boards/geography/afrique/burkina.png
+%%DATADIR%%/boards/geography/afrique/cameroon.png
+%%DATADIR%%/boards/geography/afrique/chad.png
+%%DATADIR%%/boards/geography/afrique/congo.png
+%%DATADIR%%/boards/geography/afrique/egypt.png
+%%DATADIR%%/boards/geography/afrique/eritrea.png
+%%DATADIR%%/boards/geography/afrique/ethiopia.png
+%%DATADIR%%/boards/geography/afrique/gabon.png
+%%DATADIR%%/boards/geography/afrique/ghana.png
+%%DATADIR%%/boards/geography/afrique/guinea.png
+%%DATADIR%%/boards/geography/afrique/ivory_coast.png
+%%DATADIR%%/boards/geography/afrique/kenya.png
+%%DATADIR%%/boards/geography/afrique/liberia.png
+%%DATADIR%%/boards/geography/afrique/libya.png
+%%DATADIR%%/boards/geography/afrique/madagascar.png
+%%DATADIR%%/boards/geography/afrique/malawi.png
+%%DATADIR%%/boards/geography/afrique/mali.png
+%%DATADIR%%/boards/geography/afrique/mauritania.png
+%%DATADIR%%/boards/geography/afrique/moroco.png
+%%DATADIR%%/boards/geography/afrique/mozambique.png
+%%DATADIR%%/boards/geography/afrique/namibia.png
+%%DATADIR%%/boards/geography/afrique/niger.png
+%%DATADIR%%/boards/geography/afrique/nigeria.png
+%%DATADIR%%/boards/geography/afrique/rep_centrafrique.png
+%%DATADIR%%/boards/geography/afrique/rep_congo.png
+%%DATADIR%%/boards/geography/afrique/senegal.png
+%%DATADIR%%/boards/geography/afrique/somalia.png
+%%DATADIR%%/boards/geography/afrique/soudan.png
+%%DATADIR%%/boards/geography/afrique/south_africa.png
+%%DATADIR%%/boards/geography/afrique/tanzania.png
+%%DATADIR%%/boards/geography/afrique/togo.png
+%%DATADIR%%/boards/geography/afrique/tunisia.png
+%%DATADIR%%/boards/geography/afrique/uganda.png
+%%DATADIR%%/boards/geography/afrique/zambia.png
+%%DATADIR%%/boards/geography/afrique/zimbabwe.png
+%%DATADIR%%/boards/geography/board1_0.xml
+%%DATADIR%%/boards/geography/board2_0.xml
+%%DATADIR%%/boards/geography/board2_1.xml
+%%DATADIR%%/boards/geography/board3_0.xml
+%%DATADIR%%/boards/geography/board3_1.xml
+%%DATADIR%%/boards/geography/board4_0.xml
+%%DATADIR%%/boards/geography/board4_1.xml
+%%DATADIR%%/boards/geography/board4_2.xml
+%%DATADIR%%/boards/geography/board5_0.xml
+%%DATADIR%%/boards/geography/board5_1.xml
+%%DATADIR%%/boards/geography/board5_2.xml
+%%DATADIR%%/boards/geography/board6_0.xml
+%%DATADIR%%/boards/geography/continents/africa.png
+%%DATADIR%%/boards/geography/continents/america.png
+%%DATADIR%%/boards/geography/continents/antartica.png
+%%DATADIR%%/boards/geography/continents/asia.png
+%%DATADIR%%/boards/geography/continents/back.png
+%%DATADIR%%/boards/geography/continents/europa.png
+%%DATADIR%%/boards/geography/continents/oceania.png
+%%DATADIR%%/boards/geography/europe/albania.png
+%%DATADIR%%/boards/geography/europe/austria.png
+%%DATADIR%%/boards/geography/europe/belarus.png
+%%DATADIR%%/boards/geography/europe/belgium.png
+%%DATADIR%%/boards/geography/europe/bosnia_herzegovina.png
+%%DATADIR%%/boards/geography/europe/bulgaria.png
+%%DATADIR%%/boards/geography/europe/croatia.png
+%%DATADIR%%/boards/geography/europe/cyprus.png
+%%DATADIR%%/boards/geography/europe/czech.png
+%%DATADIR%%/boards/geography/europe/denmark.png
+%%DATADIR%%/boards/geography/europe/estonia.png
+%%DATADIR%%/boards/geography/europe/europe.png
+%%DATADIR%%/boards/geography/europe/finland.png
+%%DATADIR%%/boards/geography/europe/france.png
+%%DATADIR%%/boards/geography/europe/germany.png
+%%DATADIR%%/boards/geography/europe/greece.png
+%%DATADIR%%/boards/geography/europe/hungary.png
+%%DATADIR%%/boards/geography/europe/iceland.png
+%%DATADIR%%/boards/geography/europe/ireland.png
+%%DATADIR%%/boards/geography/europe/italy.png
+%%DATADIR%%/boards/geography/europe/latvia.png
+%%DATADIR%%/boards/geography/europe/lithuania.png
+%%DATADIR%%/boards/geography/europe/luxembourg.png
+%%DATADIR%%/boards/geography/europe/macedonia.png
+%%DATADIR%%/boards/geography/europe/moldova.png
+%%DATADIR%%/boards/geography/europe/netherland.png
+%%DATADIR%%/boards/geography/europe/norway.png
+%%DATADIR%%/boards/geography/europe/poland.png
+%%DATADIR%%/boards/geography/europe/portugal.png
+%%DATADIR%%/boards/geography/europe/romania.png
+%%DATADIR%%/boards/geography/europe/russia.png
+%%DATADIR%%/boards/geography/europe/serbia_montenegro.png
+%%DATADIR%%/boards/geography/europe/slovakia.png
+%%DATADIR%%/boards/geography/europe/slovenia.png
+%%DATADIR%%/boards/geography/europe/spain.png
+%%DATADIR%%/boards/geography/europe/sweden.png
+%%DATADIR%%/boards/geography/europe/switz.png
+%%DATADIR%%/boards/geography/europe/turkey.png
+%%DATADIR%%/boards/geography/europe/ukraine.png
+%%DATADIR%%/boards/geography/europe/united_kingdom.png
+%%DATADIR%%/boards/geography/northamerica/alaska.png
+%%DATADIR%%/boards/geography/northamerica/bahamas.png
+%%DATADIR%%/boards/geography/northamerica/canada.png
+%%DATADIR%%/boards/geography/northamerica/cuba.png
+%%DATADIR%%/boards/geography/northamerica/dominican_republic.png
+%%DATADIR%%/boards/geography/northamerica/greenland.png
+%%DATADIR%%/boards/geography/northamerica/haiti.png
+%%DATADIR%%/boards/geography/northamerica/iceland.png
+%%DATADIR%%/boards/geography/northamerica/jamaica.png
+%%DATADIR%%/boards/geography/northamerica/mexico.png
+%%DATADIR%%/boards/geography/northamerica/north_america.png
+%%DATADIR%%/boards/geography/northamerica/usa-complete.png
+%%DATADIR%%/boards/geography/northamerica/usa.png
+%%DATADIR%%/boards/geography/southamerica/argentina.png
+%%DATADIR%%/boards/geography/southamerica/bolivia.png
+%%DATADIR%%/boards/geography/southamerica/brazil.png
+%%DATADIR%%/boards/geography/southamerica/chile.png
+%%DATADIR%%/boards/geography/southamerica/colombia.png
+%%DATADIR%%/boards/geography/southamerica/ecuador.png
+%%DATADIR%%/boards/geography/southamerica/french_guiana.png
+%%DATADIR%%/boards/geography/southamerica/guyana.png
+%%DATADIR%%/boards/geography/southamerica/panama.png
+%%DATADIR%%/boards/geography/southamerica/paraguay.png
+%%DATADIR%%/boards/geography/southamerica/peru.png
+%%DATADIR%%/boards/geography/southamerica/south_america.png
+%%DATADIR%%/boards/geography/southamerica/suriname.png
+%%DATADIR%%/boards/geography/southamerica/uruguay.png
+%%DATADIR%%/boards/geography/southamerica/venezuela.png
+%%DATADIR%%/boards/geography_country.xml
+%%DATADIR%%/boards/geography_country/Makefile.in.bak
+%%DATADIR%%/boards/geography_country/argentina/argentina.png
+%%DATADIR%%/boards/geography_country/argentina/buenos_aires.png
+%%DATADIR%%/boards/geography_country/argentina/catamarca.png
+%%DATADIR%%/boards/geography_country/argentina/chaco.png
+%%DATADIR%%/boards/geography_country/argentina/chubut.png
+%%DATADIR%%/boards/geography_country/argentina/cordoba.png
+%%DATADIR%%/boards/geography_country/argentina/corrientes.png
+%%DATADIR%%/boards/geography_country/argentina/entre_rios.png
+%%DATADIR%%/boards/geography_country/argentina/formosa.png
+%%DATADIR%%/boards/geography_country/argentina/jujuy.png
+%%DATADIR%%/boards/geography_country/argentina/la_pampa.png
+%%DATADIR%%/boards/geography_country/argentina/la_rioja.png
+%%DATADIR%%/boards/geography_country/argentina/mendoza.png
+%%DATADIR%%/boards/geography_country/argentina/misiones.png
+%%DATADIR%%/boards/geography_country/argentina/neuquen.png
+%%DATADIR%%/boards/geography_country/argentina/rio_negro.png
+%%DATADIR%%/boards/geography_country/argentina/salta.png
+%%DATADIR%%/boards/geography_country/argentina/san_juan.png
+%%DATADIR%%/boards/geography_country/argentina/san_luis.png
+%%DATADIR%%/boards/geography_country/argentina/santa_cruz.png
+%%DATADIR%%/boards/geography_country/argentina/santa_fe.png
+%%DATADIR%%/boards/geography_country/argentina/santiago_del_estero.png
+%%DATADIR%%/boards/geography_country/argentina/tierra_del_fuego.png
+%%DATADIR%%/boards/geography_country/argentina/tucuman.png
+%%DATADIR%%/boards/geography_country/board1_0.xml
+%%DATADIR%%/boards/geography_country/board2_0.xml
+%%DATADIR%%/boards/geography_country/board3_0.xml
+%%DATADIR%%/boards/geography_country/board4_0.xml
+%%DATADIR%%/boards/geography_country/board5_0.xml
+%%DATADIR%%/boards/geography_country/board5_1.xml
+%%DATADIR%%/boards/geography_country/board5_2.xml
+%%DATADIR%%/boards/geography_country/board6_0.xml
+%%DATADIR%%/boards/geography_country/france_region/alsace.png
+%%DATADIR%%/boards/geography_country/france_region/aquitaine.png
+%%DATADIR%%/boards/geography_country/france_region/auvergne.png
+%%DATADIR%%/boards/geography_country/france_region/basse-normandie.png
+%%DATADIR%%/boards/geography_country/france_region/bourgogne.png
+%%DATADIR%%/boards/geography_country/france_region/bretagne.png
+%%DATADIR%%/boards/geography_country/france_region/centre.png
+%%DATADIR%%/boards/geography_country/france_region/champagne-ardenne.png
+%%DATADIR%%/boards/geography_country/france_region/corse.png
+%%DATADIR%%/boards/geography_country/france_region/france-regions.png
+%%DATADIR%%/boards/geography_country/france_region/franche-conte.png
+%%DATADIR%%/boards/geography_country/france_region/haute-normandie.png
+%%DATADIR%%/boards/geography_country/france_region/ile-de-france.png
+%%DATADIR%%/boards/geography_country/france_region/languedoc-roussillon.png
+%%DATADIR%%/boards/geography_country/france_region/limousin.png
+%%DATADIR%%/boards/geography_country/france_region/lorraine.png
+%%DATADIR%%/boards/geography_country/france_region/midi-pyrenees.png
+%%DATADIR%%/boards/geography_country/france_region/nord-pas-de-calais.png
+%%DATADIR%%/boards/geography_country/france_region/pays-de-la-loire.png
+%%DATADIR%%/boards/geography_country/france_region/picardie.png
+%%DATADIR%%/boards/geography_country/france_region/poitou-charentes.png
+%%DATADIR%%/boards/geography_country/france_region/provence-alpes-cote_d_azur.png
+%%DATADIR%%/boards/geography_country/france_region/rhone-alpes.png
+%%DATADIR%%/boards/geography_country/germany_region/back.png
+%%DATADIR%%/boards/geography_country/germany_region/baden-wuerttemberg.png
+%%DATADIR%%/boards/geography_country/germany_region/bayern.png
+%%DATADIR%%/boards/geography_country/germany_region/berlin.png
+%%DATADIR%%/boards/geography_country/germany_region/brandenburg.png
+%%DATADIR%%/boards/geography_country/germany_region/bremen.png
+%%DATADIR%%/boards/geography_country/germany_region/hamburg.png
+%%DATADIR%%/boards/geography_country/germany_region/hessen.png
+%%DATADIR%%/boards/geography_country/germany_region/mecklenburg-vorpommern.png
+%%DATADIR%%/boards/geography_country/germany_region/niedersachsen.png
+%%DATADIR%%/boards/geography_country/germany_region/nordrhein-westfalen.png
+%%DATADIR%%/boards/geography_country/germany_region/rheinland-pfalz.png
+%%DATADIR%%/boards/geography_country/germany_region/saarland.png
+%%DATADIR%%/boards/geography_country/germany_region/sachsen-anhalt.png
+%%DATADIR%%/boards/geography_country/germany_region/sachsen.png
+%%DATADIR%%/boards/geography_country/germany_region/schleswig_holstein.png
+%%DATADIR%%/boards/geography_country/germany_region/target_baden-wuerttemberg.png
+%%DATADIR%%/boards/geography_country/germany_region/target_bayern.png
+%%DATADIR%%/boards/geography_country/germany_region/target_berlin.png
+%%DATADIR%%/boards/geography_country/germany_region/target_brandenburg.png
+%%DATADIR%%/boards/geography_country/germany_region/target_bremen.png
+%%DATADIR%%/boards/geography_country/germany_region/target_hamburg.png
+%%DATADIR%%/boards/geography_country/germany_region/target_hessen.png
+%%DATADIR%%/boards/geography_country/germany_region/target_mecklenburg-vorpommern.png
+%%DATADIR%%/boards/geography_country/germany_region/target_niedersachsen.png
+%%DATADIR%%/boards/geography_country/germany_region/target_nordrhein-westfalen.png
+%%DATADIR%%/boards/geography_country/germany_region/target_rheinland-pfalz.png
+%%DATADIR%%/boards/geography_country/germany_region/target_saarland.png
+%%DATADIR%%/boards/geography_country/germany_region/target_sachsen-anhalt.png
+%%DATADIR%%/boards/geography_country/germany_region/target_sachsen.png
+%%DATADIR%%/boards/geography_country/germany_region/target_schleswig_holstein.png
+%%DATADIR%%/boards/geography_country/germany_region/target_thueringen.png
+%%DATADIR%%/boards/geography_country/germany_region/thueringen.png
+%%DATADIR%%/boards/geography_country/norway_counties/akershus.png
+%%DATADIR%%/boards/geography_country/norway_counties/aust-agder.png
+%%DATADIR%%/boards/geography_country/norway_counties/buskerud.png
+%%DATADIR%%/boards/geography_country/norway_counties/finnmark.png
+%%DATADIR%%/boards/geography_country/norway_counties/hedmark.png
+%%DATADIR%%/boards/geography_country/norway_counties/hordaland.png
+%%DATADIR%%/boards/geography_country/norway_counties/more-og-romsdal.png
+%%DATADIR%%/boards/geography_country/norway_counties/nord-trondelag.png
+%%DATADIR%%/boards/geography_country/norway_counties/nordland.png
+%%DATADIR%%/boards/geography_country/norway_counties/norway.png
+%%DATADIR%%/boards/geography_country/norway_counties/oppland.png
+%%DATADIR%%/boards/geography_country/norway_counties/oslo.png
+%%DATADIR%%/boards/geography_country/norway_counties/ostfold.png
+%%DATADIR%%/boards/geography_country/norway_counties/rogaland.png
+%%DATADIR%%/boards/geography_country/norway_counties/sogn-og-fjordane.png
+%%DATADIR%%/boards/geography_country/norway_counties/sor-trondelag.png
+%%DATADIR%%/boards/geography_country/norway_counties/target_akershus.png
+%%DATADIR%%/boards/geography_country/norway_counties/target_aust-agder.png
+%%DATADIR%%/boards/geography_country/norway_counties/target_buskerud.png
+%%DATADIR%%/boards/geography_country/norway_counties/target_finnmark.png
+%%DATADIR%%/boards/geography_country/norway_counties/target_hedmark.png
+%%DATADIR%%/boards/geography_country/norway_counties/target_hordaland.png
+%%DATADIR%%/boards/geography_country/norway_counties/target_more-og-romsdal.png
+%%DATADIR%%/boards/geography_country/norway_counties/target_nord-trondelag.png
+%%DATADIR%%/boards/geography_country/norway_counties/target_nordland.png
+%%DATADIR%%/boards/geography_country/norway_counties/target_oppland.png
+%%DATADIR%%/boards/geography_country/norway_counties/target_oslo.png
+%%DATADIR%%/boards/geography_country/norway_counties/target_ostfold.png
+%%DATADIR%%/boards/geography_country/norway_counties/target_rogaland.png
+%%DATADIR%%/boards/geography_country/norway_counties/target_sogn-og-fjordane.png
+%%DATADIR%%/boards/geography_country/norway_counties/target_sor-trondelag.png
+%%DATADIR%%/boards/geography_country/norway_counties/target_telemark.png
+%%DATADIR%%/boards/geography_country/norway_counties/target_troms.png
+%%DATADIR%%/boards/geography_country/norway_counties/target_vest-agder.png
+%%DATADIR%%/boards/geography_country/norway_counties/target_vestfold.png
+%%DATADIR%%/boards/geography_country/norway_counties/telemark.png
+%%DATADIR%%/boards/geography_country/norway_counties/troms.png
+%%DATADIR%%/boards/geography_country/norway_counties/vest-agder.png
+%%DATADIR%%/boards/geography_country/norway_counties/vestfold.png
+%%DATADIR%%/boards/geography_country/poland_voivodship/dolnoslaskie.png
+%%DATADIR%%/boards/geography_country/poland_voivodship/kujawsko-pomorskie.png
+%%DATADIR%%/boards/geography_country/poland_voivodship/lodzkie.png
+%%DATADIR%%/boards/geography_country/poland_voivodship/lubelskie.png
+%%DATADIR%%/boards/geography_country/poland_voivodship/lubuskie.png
+%%DATADIR%%/boards/geography_country/poland_voivodship/malopolskie.png
+%%DATADIR%%/boards/geography_country/poland_voivodship/mazowieckie.png
+%%DATADIR%%/boards/geography_country/poland_voivodship/opolskie.png
+%%DATADIR%%/boards/geography_country/poland_voivodship/podkarpackie.png
+%%DATADIR%%/boards/geography_country/poland_voivodship/podlaskie.png
+%%DATADIR%%/boards/geography_country/poland_voivodship/poland.png
+%%DATADIR%%/boards/geography_country/poland_voivodship/pomorskie.png
+%%DATADIR%%/boards/geography_country/poland_voivodship/slaskie.png
+%%DATADIR%%/boards/geography_country/poland_voivodship/swietokrzyskie.png
+%%DATADIR%%/boards/geography_country/poland_voivodship/warminsko-mazurskie.png
+%%DATADIR%%/boards/geography_country/poland_voivodship/wielkopolskie.png
+%%DATADIR%%/boards/geography_country/poland_voivodship/zachodnio-pomorskie.png
+%%DATADIR%%/boards/geography_country/turkey_district/adana.png
+%%DATADIR%%/boards/geography_country/turkey_district/adiyaman.png
+%%DATADIR%%/boards/geography_country/turkey_district/afyon.png
+%%DATADIR%%/boards/geography_country/turkey_district/agri.png
+%%DATADIR%%/boards/geography_country/turkey_district/aksaray.png
+%%DATADIR%%/boards/geography_country/turkey_district/amasya.png
+%%DATADIR%%/boards/geography_country/turkey_district/ankara.png
+%%DATADIR%%/boards/geography_country/turkey_district/antalya.png
+%%DATADIR%%/boards/geography_country/turkey_district/ardahan.png
+%%DATADIR%%/boards/geography_country/turkey_district/artvin.png
+%%DATADIR%%/boards/geography_country/turkey_district/aydin.png
+%%DATADIR%%/boards/geography_country/turkey_district/balikesir.png
+%%DATADIR%%/boards/geography_country/turkey_district/bartin.png
+%%DATADIR%%/boards/geography_country/turkey_district/batman.png
+%%DATADIR%%/boards/geography_country/turkey_district/bayburt.png
+%%DATADIR%%/boards/geography_country/turkey_district/bilecik.png
+%%DATADIR%%/boards/geography_country/turkey_district/bingol.png
+%%DATADIR%%/boards/geography_country/turkey_district/bitlis.png
+%%DATADIR%%/boards/geography_country/turkey_district/bolu.png
+%%DATADIR%%/boards/geography_country/turkey_district/burdur.png
+%%DATADIR%%/boards/geography_country/turkey_district/bursa.png
+%%DATADIR%%/boards/geography_country/turkey_district/canakkale.png
+%%DATADIR%%/boards/geography_country/turkey_district/cankiri.png
+%%DATADIR%%/boards/geography_country/turkey_district/corum.png
+%%DATADIR%%/boards/geography_country/turkey_district/denizli.png
+%%DATADIR%%/boards/geography_country/turkey_district/diyarbakir.png
+%%DATADIR%%/boards/geography_country/turkey_district/duzce.png
+%%DATADIR%%/boards/geography_country/turkey_district/edirne.png
+%%DATADIR%%/boards/geography_country/turkey_district/elazig.png
+%%DATADIR%%/boards/geography_country/turkey_district/erzincan.png
+%%DATADIR%%/boards/geography_country/turkey_district/erzurum.png
+%%DATADIR%%/boards/geography_country/turkey_district/eskisehir.png
+%%DATADIR%%/boards/geography_country/turkey_district/gaziantep.png
+%%DATADIR%%/boards/geography_country/turkey_district/giresun.png
+%%DATADIR%%/boards/geography_country/turkey_district/gumushane.png
+%%DATADIR%%/boards/geography_country/turkey_district/hakkari.png
+%%DATADIR%%/boards/geography_country/turkey_district/hatay.png
+%%DATADIR%%/boards/geography_country/turkey_district/igdir.png
+%%DATADIR%%/boards/geography_country/turkey_district/isparta.png
+%%DATADIR%%/boards/geography_country/turkey_district/istanbul.png
+%%DATADIR%%/boards/geography_country/turkey_district/izmir.png
+%%DATADIR%%/boards/geography_country/turkey_district/kahramanmaras.png
+%%DATADIR%%/boards/geography_country/turkey_district/karabuk.png
+%%DATADIR%%/boards/geography_country/turkey_district/karaman.png
+%%DATADIR%%/boards/geography_country/turkey_district/kars.png
+%%DATADIR%%/boards/geography_country/turkey_district/kastamonu.png
+%%DATADIR%%/boards/geography_country/turkey_district/kayseri.png
+%%DATADIR%%/boards/geography_country/turkey_district/kilis.png
+%%DATADIR%%/boards/geography_country/turkey_district/kirikkale.png
+%%DATADIR%%/boards/geography_country/turkey_district/kirklareli.png
+%%DATADIR%%/boards/geography_country/turkey_district/kirsehir.png
+%%DATADIR%%/boards/geography_country/turkey_district/kocaeli.png
+%%DATADIR%%/boards/geography_country/turkey_district/konya.png
+%%DATADIR%%/boards/geography_country/turkey_district/kutahya.png
+%%DATADIR%%/boards/geography_country/turkey_district/malatya.png
+%%DATADIR%%/boards/geography_country/turkey_district/manisa.png
+%%DATADIR%%/boards/geography_country/turkey_district/mardin.png
+%%DATADIR%%/boards/geography_country/turkey_district/mersin.png
+%%DATADIR%%/boards/geography_country/turkey_district/mugla.png
+%%DATADIR%%/boards/geography_country/turkey_district/mus.png
+%%DATADIR%%/boards/geography_country/turkey_district/nevsehir.png
+%%DATADIR%%/boards/geography_country/turkey_district/nigde.png
+%%DATADIR%%/boards/geography_country/turkey_district/ordu.png
+%%DATADIR%%/boards/geography_country/turkey_district/osmaniye.png
+%%DATADIR%%/boards/geography_country/turkey_district/rize.png
+%%DATADIR%%/boards/geography_country/turkey_district/sakarya.png
+%%DATADIR%%/boards/geography_country/turkey_district/samsun.png
+%%DATADIR%%/boards/geography_country/turkey_district/sanliurfa.png
+%%DATADIR%%/boards/geography_country/turkey_district/siirt.png
+%%DATADIR%%/boards/geography_country/turkey_district/sinop.png
+%%DATADIR%%/boards/geography_country/turkey_district/sirnak.png
+%%DATADIR%%/boards/geography_country/turkey_district/sivas.png
+%%DATADIR%%/boards/geography_country/turkey_district/tekirdag.png
+%%DATADIR%%/boards/geography_country/turkey_district/tokat.png
+%%DATADIR%%/boards/geography_country/turkey_district/trabzon.png
+%%DATADIR%%/boards/geography_country/turkey_district/tunceli.png
+%%DATADIR%%/boards/geography_country/turkey_district/turkey-east.png
+%%DATADIR%%/boards/geography_country/turkey_district/turkey-west.png
+%%DATADIR%%/boards/geography_country/turkey_district/turkey.png
+%%DATADIR%%/boards/geography_country/turkey_district/usak.png
+%%DATADIR%%/boards/geography_country/turkey_district/van.png
+%%DATADIR%%/boards/geography_country/turkey_district/yalova.png
+%%DATADIR%%/boards/geography_country/turkey_district/yozgat.png
+%%DATADIR%%/boards/geography_country/turkey_district/zonguldak.png
+%%DATADIR%%/boards/geometry.xml
+%%DATADIR%%/boards/gletters.xml
+%%DATADIR%%/boards/gnumch-equality.xml
+%%DATADIR%%/boards/gnumch-factors.xml
+%%DATADIR%%/boards/gnumch-inequality.xml
+%%DATADIR%%/boards/gnumch-multiples.xml
+%%DATADIR%%/boards/gnumch-primes.xml
+%%DATADIR%%/boards/gnumch/diaper.gif
+%%DATADIR%%/boards/gnumch/diaper.txt
+%%DATADIR%%/boards/gnumch/diaper_eating.gif
+%%DATADIR%%/boards/gnumch/diaper_walking.gif
+%%DATADIR%%/boards/gnumch/eater.gif
+%%DATADIR%%/boards/gnumch/eater.txt
+%%DATADIR%%/boards/gnumch/eater_eating.gif
+%%DATADIR%%/boards/gnumch/eater_walking.gif
+%%DATADIR%%/boards/gnumch/fraidy.gif
+%%DATADIR%%/boards/gnumch/fraidy.txt
+%%DATADIR%%/boards/gnumch/fraidy_eating.gif
+%%DATADIR%%/boards/gnumch/fraidy_walking.gif
+%%DATADIR%%/boards/gnumch/muncher.gif
+%%DATADIR%%/boards/gnumch/muncher.txt
+%%DATADIR%%/boards/gnumch/muncher_eating.gif
+%%DATADIR%%/boards/gnumch/muncher_walking.gif
+%%DATADIR%%/boards/gnumch/reggie.gif
+%%DATADIR%%/boards/gnumch/reggie.txt
+%%DATADIR%%/boards/gnumch/reggie_eating.gif
+%%DATADIR%%/boards/gnumch/reggie_walking.gif
+%%DATADIR%%/boards/gnumch/smarty.gif
+%%DATADIR%%/boards/gnumch/smarty.txt
+%%DATADIR%%/boards/gnumch/smarty_eating.gif
+%%DATADIR%%/boards/gnumch/smarty_walking.gif
+%%DATADIR%%/boards/gnumchmenu.xml
+%%DATADIR%%/boards/gtans/figures/alpha.figures
+%%DATADIR%%/boards/gtans/figures/default.figures
+%%DATADIR%%/boards/gtans/figures/misc.figures
+%%DATADIR%%/boards/gtans/figures/similar.figures
+%%DATADIR%%/boards/gtans/gtans_2x-rotate-left.png
+%%DATADIR%%/boards/gtans/gtans_2x-rotate.png
+%%DATADIR%%/boards/gtans/gtans_outline.png
+%%DATADIR%%/boards/gtans/gtans_rotate-left.png
+%%DATADIR%%/boards/gtans/gtans_rotate.png
+%%DATADIR%%/boards/gtans/gtans_show.png
+%%DATADIR%%/boards/gtans/pixmaps/gtans_brightburtwood.xpm
+%%DATADIR%%/boards/gtans/pixmaps/gtans_brightwood.xpm
+%%DATADIR%%/boards/gtans/pixmaps/gtans_burtwood.xpm
+%%DATADIR%%/boards/gtans/pixmaps/gtans_paper.xpm
+%%DATADIR%%/boards/gtans/pixmaps/gtans_puzzle.xpm
+%%DATADIR%%/boards/gtans/pixmaps/gtans_recessed.xpm
+%%DATADIR%%/boards/gtans/pixmaps/gtans_rope.xpm
+%%DATADIR%%/boards/gtans/pixmaps/gtans_stones.xpm
+%%DATADIR%%/boards/gtans/pixmaps/gtans_volcanic.xpm
+%%DATADIR%%/boards/gtans/pixmaps/gtans_wood.xpm
+%%DATADIR%%/boards/guessnumber.xml
+%%DATADIR%%/boards/hanoi.xml
+%%DATADIR%%/boards/hanoi_real.xml
+%%DATADIR%%/boards/hexagon.xml
+%%DATADIR%%/boards/imageid.xml
+%%DATADIR%%/boards/imageid/Makefile.in.bak
+%%DATADIR%%/boards/imageid/avion.png
+%%DATADIR%%/boards/imageid/ballon.png
+%%DATADIR%%/boards/imageid/banana.png
+%%DATADIR%%/boards/imageid/bed.png
+%%DATADIR%%/boards/imageid/board1.xml
+%%DATADIR%%/boards/imageid/bottle.png
+%%DATADIR%%/boards/imageid/cake.png
+%%DATADIR%%/boards/imageid/car.png
+%%DATADIR%%/boards/imageid/cartable.png
+%%DATADIR%%/boards/imageid/chien.png
+%%DATADIR%%/boards/imageid/fish.png
+%%DATADIR%%/boards/imageid/maison.png
+%%DATADIR%%/boards/imageid/pomme.png
+%%DATADIR%%/boards/imagename.xml
+%%DATADIR%%/boards/imagename/Makefile.in.bak
+%%DATADIR%%/boards/imagename/board1_0.xml
+%%DATADIR%%/boards/imagename/board2_0.xml
+%%DATADIR%%/boards/imagename/board3_0.xml
+%%DATADIR%%/boards/imagename/board4_0.xml
+%%DATADIR%%/boards/imagename/board5_0.xml
+%%DATADIR%%/boards/imagename/board6_0.xml
+%%DATADIR%%/boards/images/README
+%%DATADIR%%/boards/images/arrow.png
+%%DATADIR%%/boards/images/circle.png
+%%DATADIR%%/boards/images/disc1.png
+%%DATADIR%%/boards/images/disc2.png
+%%DATADIR%%/boards/images/disc3.png
+%%DATADIR%%/boards/images/disc4.png
+%%DATADIR%%/boards/images/disc_support.png
+%%DATADIR%%/boards/images/dn_bear1.png
+%%DATADIR%%/boards/images/dn_bear2.png
+%%DATADIR%%/boards/images/dn_de1.png
+%%DATADIR%%/boards/images/dn_de2.png
+%%DATADIR%%/boards/images/dn_epouvantail1.png
+%%DATADIR%%/boards/images/dn_epouvantail2.png
+%%DATADIR%%/boards/images/dn_fond1.png
+%%DATADIR%%/boards/images/dn_fou1.png
+%%DATADIR%%/boards/images/dn_fou2.png
+%%DATADIR%%/boards/images/dn_hibou1.png
+%%DATADIR%%/boards/images/dn_hibou2.png
+%%DATADIR%%/boards/images/dn_house1.png
+%%DATADIR%%/boards/images/dn_house2.png
+%%DATADIR%%/boards/images/dn_plane1.png
+%%DATADIR%%/boards/images/dn_plane2.png
+%%DATADIR%%/boards/images/dn_poisson1.png
+%%DATADIR%%/boards/images/dn_poisson2.png
+%%DATADIR%%/boards/images/dn_sapin1.png
+%%DATADIR%%/boards/images/dn_sapin2.png
+%%DATADIR%%/boards/images/enumerate_answer.png
+%%DATADIR%%/boards/images/enumerate_answer_focus.png
+%%DATADIR%%/boards/images/fifteen_frame.png
+%%DATADIR%%/boards/images/mosaic_palette.png
+%%DATADIR%%/boards/images/rectangle.png
+%%DATADIR%%/boards/images/rhombus.png
+%%DATADIR%%/boards/images/shift_key.png
+%%DATADIR%%/boards/images/sponge.png
+%%DATADIR%%/boards/images/star.png
+%%DATADIR%%/boards/images/top_boat_green.png
+%%DATADIR%%/boards/images/top_boat_green_tux.png
+%%DATADIR%%/boards/images/top_boat_red.png
+%%DATADIR%%/boards/images/transparent_square.png
+%%DATADIR%%/boards/images/transparent_square2.png
+%%DATADIR%%/boards/images/transparent_square_green.png
+%%DATADIR%%/boards/images/transparent_square_yellow.png
+%%DATADIR%%/boards/images/triangle.png
+%%DATADIR%%/boards/images/tux-teacher.png
+%%DATADIR%%/boards/images/tux.png
+%%DATADIR%%/boards/images/tux_albert.png
+%%DATADIR%%/boards/images/tux_graduate.png
+%%DATADIR%%/boards/images/tux_teen.png
+%%DATADIR%%/boards/images/wagon-green.png
+%%DATADIR%%/boards/images/wagon-yellow.png
+%%DATADIR%%/boards/images/water_drop.png
+%%DATADIR%%/boards/images/water_spot.png
+%%DATADIR%%/boards/keyboard.xml
+%%DATADIR%%/boards/leftright.xml
+%%DATADIR%%/boards/leftright/background.kpm
+%%DATADIR%%/boards/leftright/leftright-select.png
+%%DATADIR%%/boards/leftright/main_droite_dessus_0.png
+%%DATADIR%%/boards/leftright/main_droite_dessus_180.png
+%%DATADIR%%/boards/leftright/main_droite_dessus_270.png
+%%DATADIR%%/boards/leftright/main_droite_dessus_90.png
+%%DATADIR%%/boards/leftright/main_droite_paume_0.png
+%%DATADIR%%/boards/leftright/main_droite_paume_180.png
+%%DATADIR%%/boards/leftright/main_droite_paume_270.png
+%%DATADIR%%/boards/leftright/main_droite_paume_90.png
+%%DATADIR%%/boards/leftright/main_gauche_dessus_0.png
+%%DATADIR%%/boards/leftright/main_gauche_dessus_180.png
+%%DATADIR%%/boards/leftright/main_gauche_dessus_270.png
+%%DATADIR%%/boards/leftright/main_gauche_dessus_90.png
+%%DATADIR%%/boards/leftright/main_gauche_paume_0.png
+%%DATADIR%%/boards/leftright/main_gauche_paume_180.png
+%%DATADIR%%/boards/leftright/main_gauche_paume_270.png
+%%DATADIR%%/boards/leftright/main_gauche_paume_90.png
+%%DATADIR%%/boards/leftright/poing_droit_dessus_0.png
+%%DATADIR%%/boards/leftright/poing_droit_dessus_180.png
+%%DATADIR%%/boards/leftright/poing_droit_dessus_270.png
+%%DATADIR%%/boards/leftright/poing_droit_dessus_90.png
+%%DATADIR%%/boards/leftright/poing_droit_paume_0.png
+%%DATADIR%%/boards/leftright/poing_droit_paume_180.png
+%%DATADIR%%/boards/leftright/poing_droit_paume_270.png
+%%DATADIR%%/boards/leftright/poing_droit_paume_90.png
+%%DATADIR%%/boards/leftright/poing_gauche_dessus_0.png
+%%DATADIR%%/boards/leftright/poing_gauche_dessus_180.png
+%%DATADIR%%/boards/leftright/poing_gauche_dessus_270.png
+%%DATADIR%%/boards/leftright/poing_gauche_dessus_90.png
+%%DATADIR%%/boards/leftright/poing_gauche_paume_0.png
+%%DATADIR%%/boards/leftright/poing_gauche_paume_180.png
+%%DATADIR%%/boards/leftright/poing_gauche_paume_270.png
+%%DATADIR%%/boards/leftright/poing_gauche_paume_90.png
+%%DATADIR%%/boards/login.xml
+%%DATADIR%%/boards/magic_hat/hat-point.png
+%%DATADIR%%/boards/magic_hat/hat.png
+%%DATADIR%%/boards/magic_hat/magic_hat_minus.png
+%%DATADIR%%/boards/magic_hat/magic_hat_minus_bg.png
+%%DATADIR%%/boards/magic_hat/magic_hat_plus.png
+%%DATADIR%%/boards/magic_hat/magic_hat_plus_bg.png
+%%DATADIR%%/boards/magic_hat/star-clear.png
+%%DATADIR%%/boards/magic_hat/star1.png
+%%DATADIR%%/boards/magic_hat/star2.png
+%%DATADIR%%/boards/magic_hat/star3.png
+%%DATADIR%%/boards/magic_hat_minus.xml
+%%DATADIR%%/boards/magic_hat_plus.xml
+%%DATADIR%%/boards/math.xml
+%%DATADIR%%/boards/maze.xml
+%%DATADIR%%/boards/maze2DRelative.xml
+%%DATADIR%%/boards/maze3D.xml
+%%DATADIR%%/boards/mazeInvisible.xml
+%%DATADIR%%/boards/mazeMenu.xml
+%%DATADIR%%/boards/melody.xml
+%%DATADIR%%/boards/melody/guitar/background.jpg
+%%DATADIR%%/boards/melody/guitar/background.png
+%%DATADIR%%/boards/melody/guitar/cursor.png
+%%DATADIR%%/boards/melody/guitar/son1.png
+%%DATADIR%%/boards/melody/guitar/son2.png
+%%DATADIR%%/boards/melody/guitar/son3.png
+%%DATADIR%%/boards/melody/guitar/son4.png
+%%DATADIR%%/boards/melody/switch.png
+%%DATADIR%%/boards/melody/tachos/background.jpg
+%%DATADIR%%/boards/melody/tachos/cursor.png
+%%DATADIR%%/boards/melody/tachos/son1.png
+%%DATADIR%%/boards/melody/tachos/son2.png
+%%DATADIR%%/boards/melody/tachos/son3.png
+%%DATADIR%%/boards/melody/tachos/son4.png
+%%DATADIR%%/boards/melody/xylofon/background.png
+%%DATADIR%%/boards/melody/xylofon/cursor.png
+%%DATADIR%%/boards/melody/xylofon/son1.png
+%%DATADIR%%/boards/melody/xylofon/son2.png
+%%DATADIR%%/boards/melody/xylofon/son3.png
+%%DATADIR%%/boards/melody/xylofon/son4.png
+%%DATADIR%%/boards/memory.xml
+%%DATADIR%%/boards/memory_add.xml
+%%DATADIR%%/boards/memory_add_minus.xml
+%%DATADIR%%/boards/memory_add_minus_mult_div.xml
+%%DATADIR%%/boards/memory_add_minus_mult_div_tux.xml
+%%DATADIR%%/boards/memory_add_minus_tux.xml
+%%DATADIR%%/boards/memory_add_tux.xml
+%%DATADIR%%/boards/memory_div.xml
+%%DATADIR%%/boards/memory_div_tux.xml
+%%DATADIR%%/boards/memory_group.xml
+%%DATADIR%%/boards/memory_minus.xml
+%%DATADIR%%/boards/memory_minus_tux.xml
+%%DATADIR%%/boards/memory_mult.xml
+%%DATADIR%%/boards/memory_mult_div.xml
+%%DATADIR%%/boards/memory_mult_div_tux.xml
+%%DATADIR%%/boards/memory_mult_tux.xml
+%%DATADIR%%/boards/memory_op_group.xml
+%%DATADIR%%/boards/memory_op_group_tux.xml
+%%DATADIR%%/boards/memory_sound.xml
+%%DATADIR%%/boards/memory_sound_tux.xml
+%%DATADIR%%/boards/memory_tux.xml
+%%DATADIR%%/boards/menu.xml
+%%DATADIR%%/boards/miscelaneous.xml
+%%DATADIR%%/boards/missing_letter.xml
+%%DATADIR%%/boards/missing_letter/Makefile.in.bak
+%%DATADIR%%/boards/missing_letter/board1.xml
+%%DATADIR%%/boards/money.xml
+%%DATADIR%%/boards/money/euro/c10c.png
+%%DATADIR%%/boards/money/euro/c1c.png
+%%DATADIR%%/boards/money/euro/c1e.png
+%%DATADIR%%/boards/money/euro/c20c.png
+%%DATADIR%%/boards/money/euro/c2c.png
+%%DATADIR%%/boards/money/euro/c2e.png
+%%DATADIR%%/boards/money/euro/c50c.png
+%%DATADIR%%/boards/money/euro/c5c.png
+%%DATADIR%%/boards/money/euro/p10e.png
+%%DATADIR%%/boards/money/euro/p20e.png
+%%DATADIR%%/boards/money/euro/p50e.png
+%%DATADIR%%/boards/money/euro/p5e.jpg
+%%DATADIR%%/boards/money/euro/p5e.png
+%%DATADIR%%/boards/money_cents.xml
+%%DATADIR%%/boards/mosaic.xml
+%%DATADIR%%/boards/mouse.xml
+%%DATADIR%%/boards/mrpatate/README
+%%DATADIR%%/boards/mrpatate/barbe1.png
+%%DATADIR%%/boards/mrpatate/barbe12.png
+%%DATADIR%%/boards/mrpatate/body.png
+%%DATADIR%%/boards/mrpatate/body2.png
+%%DATADIR%%/boards/mrpatate/bouc1.png
+%%DATADIR%%/boards/mrpatate/bouche1.png
+%%DATADIR%%/boards/mrpatate/bouche2.png
+%%DATADIR%%/boards/mrpatate/bouche3.png
+%%DATADIR%%/boards/mrpatate/bouche4.png
+%%DATADIR%%/boards/mrpatate/bouche9.png
+%%DATADIR%%/boards/mrpatate/cheveux1.png
+%%DATADIR%%/boards/mrpatate/cheveux2.png
+%%DATADIR%%/boards/mrpatate/cheveux3.png
+%%DATADIR%%/boards/mrpatate/cheveux4.png
+%%DATADIR%%/boards/mrpatate/cheveux5.png
+%%DATADIR%%/boards/mrpatate/cil1.png
+%%DATADIR%%/boards/mrpatate/ear11.png
+%%DATADIR%%/boards/mrpatate/ear12.png
+%%DATADIR%%/boards/mrpatate/ear21.png
+%%DATADIR%%/boards/mrpatate/ear22.png
+%%DATADIR%%/boards/mrpatate/ear31.png
+%%DATADIR%%/boards/mrpatate/ear32.png
+%%DATADIR%%/boards/mrpatate/ear41.png
+%%DATADIR%%/boards/mrpatate/ear42.png
+%%DATADIR%%/boards/mrpatate/ear_jewell.png
+%%DATADIR%%/boards/mrpatate/eye11.png
+%%DATADIR%%/boards/mrpatate/eye12.png
+%%DATADIR%%/boards/mrpatate/eye21.png
+%%DATADIR%%/boards/mrpatate/eye22.png
+%%DATADIR%%/boards/mrpatate/eye31.png
+%%DATADIR%%/boards/mrpatate/eye32.png
+%%DATADIR%%/boards/mrpatate/eye41.png
+%%DATADIR%%/boards/mrpatate/eye42.png
+%%DATADIR%%/boards/mrpatate/eye51.png
+%%DATADIR%%/boards/mrpatate/eye52.png
+%%DATADIR%%/boards/mrpatate/eye6.png
+%%DATADIR%%/boards/mrpatate/eye7.png
+%%DATADIR%%/boards/mrpatate/eye8.png
+%%DATADIR%%/boards/mrpatate/eye9.png
+%%DATADIR%%/boards/mrpatate/eyeball.png
+%%DATADIR%%/boards/mrpatate/eyehair11.png
+%%DATADIR%%/boards/mrpatate/eyehair12.png
+%%DATADIR%%/boards/mrpatate/eyehair21.png
+%%DATADIR%%/boards/mrpatate/eyehair22.png
+%%DATADIR%%/boards/mrpatate/eyehair31.png
+%%DATADIR%%/boards/mrpatate/eyehair32.png
+%%DATADIR%%/boards/mrpatate/eyehair41.png
+%%DATADIR%%/boards/mrpatate/eyehair42.png
+%%DATADIR%%/boards/mrpatate/glasses1.png
+%%DATADIR%%/boards/mrpatate/glasses2.png
+%%DATADIR%%/boards/mrpatate/hair1.png
+%%DATADIR%%/boards/mrpatate/hair2.png
+%%DATADIR%%/boards/mrpatate/hair3.png
+%%DATADIR%%/boards/mrpatate/hair4.png
+%%DATADIR%%/boards/mrpatate/hair5.png
+%%DATADIR%%/boards/mrpatate/hat.png
+%%DATADIR%%/boards/mrpatate/hat1.png
+%%DATADIR%%/boards/mrpatate/hat2.png
+%%DATADIR%%/boards/mrpatate/hat3.png
+%%DATADIR%%/boards/mrpatate/hat4.png
+%%DATADIR%%/boards/mrpatate/jewelry1.png
+%%DATADIR%%/boards/mrpatate/jewelry2.png
+%%DATADIR%%/boards/mrpatate/jewelry3.png
+%%DATADIR%%/boards/mrpatate/jewelry4.png
+%%DATADIR%%/boards/mrpatate/larme.png
+%%DATADIR%%/boards/mrpatate/lunette1.png
+%%DATADIR%%/boards/mrpatate/lunette1_sun.png
+%%DATADIR%%/boards/mrpatate/lunette_girl.png
+%%DATADIR%%/boards/mrpatate/lunette_girl_sun.png
+%%DATADIR%%/boards/mrpatate/mousta1.png
+%%DATADIR%%/boards/mrpatate/moustache1.png
+%%DATADIR%%/boards/mrpatate/moustache2.png
+%%DATADIR%%/boards/mrpatate/moustache41.png
+%%DATADIR%%/boards/mrpatate/moustache42.png
+%%DATADIR%%/boards/mrpatate/moustaches31.png
+%%DATADIR%%/boards/mrpatate/moustaches32.png
+%%DATADIR%%/boards/mrpatate/mouth1.png
+%%DATADIR%%/boards/mrpatate/mouth2.png
+%%DATADIR%%/boards/mrpatate/mouth3.png
+%%DATADIR%%/boards/mrpatate/mouth4.png
+%%DATADIR%%/boards/mrpatate/mouth5.png
+%%DATADIR%%/boards/mrpatate/mouth6.png
+%%DATADIR%%/boards/mrpatate/mouth7.png
+%%DATADIR%%/boards/mrpatate/mouth8.png
+%%DATADIR%%/boards/mrpatate/mrpatate_icon.png
+%%DATADIR%%/boards/mrpatate/nez1.png
+%%DATADIR%%/boards/mrpatate/noeye.png
+%%DATADIR%%/boards/mrpatate/noze1.png
+%%DATADIR%%/boards/mrpatate/noze2.png
+%%DATADIR%%/boards/mrpatate/noze3.png
+%%DATADIR%%/boards/mrpatate/noze4.png
+%%DATADIR%%/boards/mrpatate/oeuil1.png
+%%DATADIR%%/boards/mrpatate/oeuil2.png
+%%DATADIR%%/boards/mrpatate/oeuil3.png
+%%DATADIR%%/boards/mrpatate/oeuil4.png
+%%DATADIR%%/boards/mrpatate/sherif.png
+%%DATADIR%%/boards/mrpatate/tie1.png
+%%DATADIR%%/boards/mrpatate/tie2.png
+%%DATADIR%%/boards/mrpatate/watch.png
+%%DATADIR%%/boards/music/COPYRIGHT
+%%DATADIR%%/boards/music/background/BachJSBrandenburgConcertNo2inFMajorBWV1047mvmt1.ogg
+%%DATADIR%%/boards/music/background/BarDasImagens.ogg
+%%DATADIR%%/boards/music/background/COPYRIGHT
+%%DATADIR%%/boards/music/background/LRLaPause.ogg
+%%DATADIR%%/boards/music/background/Mozart__WA_-_String_Quartet_No.2_in_D_Mvmt_3.ogg
+%%DATADIR%%/boards/music/background/bontemp1.ogg
+%%DATADIR%%/boards/music/background/glockenschmoutz.ogg
+%%DATADIR%%/boards/music/background/vaudeville.ogg
+%%DATADIR%%/boards/music/intro.ogg
+%%DATADIR%%/boards/mypaint/brushes/b003.myb
+%%DATADIR%%/boards/mypaint/brushes/b003_prev.png
+%%DATADIR%%/boards/mypaint/brushes/b004.myb
+%%DATADIR%%/boards/mypaint/brushes/b004_prev.png
+%%DATADIR%%/boards/mypaint/brushes/b008.myb
+%%DATADIR%%/boards/mypaint/brushes/b008_prev.png
+%%DATADIR%%/boards/mypaint/brushes/b016.myb
+%%DATADIR%%/boards/mypaint/brushes/b016_prev.png
+%%DATADIR%%/boards/mypaint/brushes/basic.myb
+%%DATADIR%%/boards/mypaint/brushes/basic_prev.png
+%%DATADIR%%/boards/mypaint/brushes/blur.myb
+%%DATADIR%%/boards/mypaint/brushes/blur_prev.png
+%%DATADIR%%/boards/mypaint/brushes/bulk.myb
+%%DATADIR%%/boards/mypaint/brushes/bulk_prev.png
+%%DATADIR%%/boards/mypaint/brushes/charcoal.myb
+%%DATADIR%%/boards/mypaint/brushes/charcoal_prev.png
+%%DATADIR%%/boards/mypaint/brushes/ink.myb
+%%DATADIR%%/boards/mypaint/brushes/ink_prev.png
+%%DATADIR%%/boards/mypaint/brushes/loosedots.myb
+%%DATADIR%%/boards/mypaint/brushes/loosedots_prev.png
+%%DATADIR%%/boards/mypaint/brushes/o000.myb
+%%DATADIR%%/boards/mypaint/brushes/o000_prev.png
+%%DATADIR%%/boards/mypaint/brushes/o001.myb
+%%DATADIR%%/boards/mypaint/brushes/o001_prev.png
+%%DATADIR%%/boards/mypaint/brushes/o005.myb
+%%DATADIR%%/boards/mypaint/brushes/o005_prev.png
+%%DATADIR%%/boards/mypaint/brushes/o006.myb
+%%DATADIR%%/boards/mypaint/brushes/o006_prev.png
+%%DATADIR%%/boards/mypaint/brushes/o007.myb
+%%DATADIR%%/boards/mypaint/brushes/o007_prev.png
+%%DATADIR%%/boards/mypaint/brushes/o009.myb
+%%DATADIR%%/boards/mypaint/brushes/o009_prev.png
+%%DATADIR%%/boards/mypaint/brushes/o011.myb
+%%DATADIR%%/boards/mypaint/brushes/o011_prev.png
+%%DATADIR%%/boards/mypaint/brushes/o012.myb
+%%DATADIR%%/boards/mypaint/brushes/o012_prev.png
+%%DATADIR%%/boards/mypaint/brushes/o013.myb
+%%DATADIR%%/boards/mypaint/brushes/o013_prev.png
+%%DATADIR%%/boards/mypaint/brushes/o014.myb
+%%DATADIR%%/boards/mypaint/brushes/o014_prev.png
+%%DATADIR%%/boards/mypaint/brushes/o015.myb
+%%DATADIR%%/boards/mypaint/brushes/o015_prev.png
+%%DATADIR%%/boards/mypaint/brushes/o017.myb
+%%DATADIR%%/boards/mypaint/brushes/o017_prev.png
+%%DATADIR%%/boards/mypaint/brushes/o018.myb
+%%DATADIR%%/boards/mypaint/brushes/o018_prev.png
+%%DATADIR%%/boards/mypaint/brushes/o019.myb
+%%DATADIR%%/boards/mypaint/brushes/o019_prev.png
+%%DATADIR%%/boards/mypaint/brushes/o020.myb
+%%DATADIR%%/boards/mypaint/brushes/o020_prev.png
+%%DATADIR%%/boards/mypaint/brushes/o021.myb
+%%DATADIR%%/boards/mypaint/brushes/o021_prev.png
+%%DATADIR%%/boards/mypaint/brushes/o022.myb
+%%DATADIR%%/boards/mypaint/brushes/o022_prev.png
+%%DATADIR%%/boards/mypaint/brushes/o023.myb
+%%DATADIR%%/boards/mypaint/brushes/o023_prev.png
+%%DATADIR%%/boards/mypaint/brushes/o024.myb
+%%DATADIR%%/boards/mypaint/brushes/o024_prev.png
+%%DATADIR%%/boards/mypaint/brushes/o025.myb
+%%DATADIR%%/boards/mypaint/brushes/o025_prev.png
+%%DATADIR%%/boards/mypaint/brushes/o026.myb
+%%DATADIR%%/boards/mypaint/brushes/o026_prev.png
+%%DATADIR%%/boards/mypaint/brushes/o028.myb
+%%DATADIR%%/boards/mypaint/brushes/o028_prev.png
+%%DATADIR%%/boards/mypaint/brushes/o029.myb
+%%DATADIR%%/boards/mypaint/brushes/o029_prev.png
+%%DATADIR%%/boards/mypaint/brushes/o031.myb
+%%DATADIR%%/boards/mypaint/brushes/o031_prev.png
+%%DATADIR%%/boards/mypaint/brushes/o032.myb
+%%DATADIR%%/boards/mypaint/brushes/o032_prev.png
+%%DATADIR%%/boards/mypaint/brushes/o033.myb
+%%DATADIR%%/boards/mypaint/brushes/o033_prev.png
+%%DATADIR%%/boards/mypaint/brushes/o036.myb
+%%DATADIR%%/boards/mypaint/brushes/o036_prev.png
+%%DATADIR%%/boards/mypaint/brushes/o037.myb
+%%DATADIR%%/boards/mypaint/brushes/o037_prev.png
+%%DATADIR%%/boards/mypaint/brushes/o038.myb
+%%DATADIR%%/boards/mypaint/brushes/o038_prev.png
+%%DATADIR%%/boards/mypaint/brushes/o039.myb
+%%DATADIR%%/boards/mypaint/brushes/o039_prev.png
+%%DATADIR%%/boards/mypaint/brushes/o041.myb
+%%DATADIR%%/boards/mypaint/brushes/o041_prev.png
+%%DATADIR%%/boards/mypaint/brushes/o043.myb
+%%DATADIR%%/boards/mypaint/brushes/o043_prev.png
+%%DATADIR%%/boards/mypaint/brushes/o398.myb
+%%DATADIR%%/boards/mypaint/brushes/o398_prev.png
+%%DATADIR%%/boards/mypaint/brushes/o501.myb
+%%DATADIR%%/boards/mypaint/brushes/o501_prev.png
+%%DATADIR%%/boards/mypaint/brushes/o512.myb
+%%DATADIR%%/boards/mypaint/brushes/o512_prev.png
+%%DATADIR%%/boards/mypaint/brushes/o519.myb
+%%DATADIR%%/boards/mypaint/brushes/o519_prev.png
+%%DATADIR%%/boards/mypaint/brushes/o665.myb
+%%DATADIR%%/boards/mypaint/brushes/o665_prev.png
+%%DATADIR%%/boards/mypaint/brushes/o945.myb
+%%DATADIR%%/boards/mypaint/brushes/o945_prev.png
+%%DATADIR%%/boards/mypaint/brushes/old_b000.myb
+%%DATADIR%%/boards/mypaint/brushes/old_b000_prev.png
+%%DATADIR%%/boards/mypaint/brushes/old_b003.myb
+%%DATADIR%%/boards/mypaint/brushes/old_b003_prev.png
+%%DATADIR%%/boards/mypaint/brushes/old_b004.myb
+%%DATADIR%%/boards/mypaint/brushes/old_b004_prev.png
+%%DATADIR%%/boards/mypaint/brushes/old_b008.myb
+%%DATADIR%%/boards/mypaint/brushes/old_b008_prev.png
+%%DATADIR%%/boards/mypaint/brushes/old_b024.myb
+%%DATADIR%%/boards/mypaint/brushes/old_b024_prev.png
+%%DATADIR%%/boards/mypaint/brushes/order.conf
+%%DATADIR%%/boards/mypaint/brushes/pencil.myb
+%%DATADIR%%/boards/mypaint/brushes/pencil_prev.png
+%%DATADIR%%/boards/mypaint/brushes/prev-template.xcf.gz
+%%DATADIR%%/boards/mypaint/brushes/s000.myb
+%%DATADIR%%/boards/mypaint/brushes/s000_prev.png
+%%DATADIR%%/boards/mypaint/brushes/smudge.myb
+%%DATADIR%%/boards/mypaint/brushes/smudge_prev.png
+%%DATADIR%%/boards/numeration.xml
+%%DATADIR%%/boards/opt/README
+%%DATADIR%%/boards/opt/animals/bear001.jpg
+%%DATADIR%%/boards/opt/animals/black-headed-gull.jpg
+%%DATADIR%%/boards/opt/animals/butterfly.jpg
+%%DATADIR%%/boards/opt/animals/cat1.jpg
+%%DATADIR%%/boards/opt/animals/cat2.jpg
+%%DATADIR%%/boards/opt/animals/cow.jpg
+%%DATADIR%%/boards/opt/animals/donkey.jpg
+%%DATADIR%%/boards/opt/animals/elephanteauxgc.jpg
+%%DATADIR%%/boards/opt/animals/flamentrosegc.jpg
+%%DATADIR%%/boards/opt/animals/girafegc.jpg
+%%DATADIR%%/boards/opt/animals/horses.jpg
+%%DATADIR%%/boards/opt/animals/horses2.jpg
+%%DATADIR%%/boards/opt/animals/hypogc.jpg
+%%DATADIR%%/boards/opt/animals/joybear001.jpg
+%%DATADIR%%/boards/opt/animals/joybear002.jpg
+%%DATADIR%%/boards/opt/animals/jumentmulassieregc.jpg
+%%DATADIR%%/boards/opt/animals/maki1.jpg
+%%DATADIR%%/boards/opt/animals/maki2.jpg
+%%DATADIR%%/boards/opt/animals/maki3.jpg
+%%DATADIR%%/boards/opt/animals/maki4.jpg
+%%DATADIR%%/boards/opt/animals/maki5.jpg
+%%DATADIR%%/boards/opt/animals/maki6.jpg
+%%DATADIR%%/boards/opt/animals/malaybear002.jpg
+%%DATADIR%%/boards/opt/animals/pigeon.jpg
+%%DATADIR%%/boards/opt/animals/polabear011.jpg
+%%DATADIR%%/boards/opt/animals/polarbear001.jpg
+%%DATADIR%%/boards/opt/animals/poolbears001.jpg
+%%DATADIR%%/boards/opt/animals/readme.txt
+%%DATADIR%%/boards/opt/animals/rhinogc.jpg
+%%DATADIR%%/boards/opt/animals/sheep_irish.jpg
+%%DATADIR%%/boards/opt/animals/sheep_irish2.jpg
+%%DATADIR%%/boards/opt/animals/singegc.jpg
+%%DATADIR%%/boards/opt/animals/spectbear001.jpg
+%%DATADIR%%/boards/opt/animals/squirrel.jpg
+%%DATADIR%%/boards/opt/animals/tetegorillegc.jpg
+%%DATADIR%%/boards/opt/animals/tiger1_by_Ralf_Schmode.jpg
+%%DATADIR%%/boards/opt/animals/tigercub003.jpg
+%%DATADIR%%/boards/opt/animals/tigerdrink001.jpg
+%%DATADIR%%/boards/opt/animals/tigerplay001.jpg
+%%DATADIR%%/boards/opt/baleine.png
+%%DATADIR%%/boards/opt/beach1.png
+%%DATADIR%%/boards/opt/beach2.png
+%%DATADIR%%/boards/opt/beach3.png
+%%DATADIR%%/boards/opt/beach4.png
+%%DATADIR%%/boards/opt/cave.png
+%%DATADIR%%/boards/opt/elephant_mer.png
+%%DATADIR%%/boards/opt/enumerate_background.png
+%%DATADIR%%/boards/opt/epaulard.png
+%%DATADIR%%/boards/opt/followline.png
+%%DATADIR%%/boards/opt/foot_background.png
+%%DATADIR%%/boards/opt/gcompris_band.png
+%%DATADIR%%/boards/opt/gtans_bg.png
+%%DATADIR%%/boards/opt/imageid-bg.jpg
+%%DATADIR%%/boards/opt/maze-bg.jpg
+%%DATADIR%%/boards/opt/missingletter-bg.jpg
+%%DATADIR%%/boards/opt/morse.png
+%%DATADIR%%/boards/opt/mosaic_bg.png
+%%DATADIR%%/boards/opt/narval.png
+%%DATADIR%%/boards/opt/nur00523.jpg
+%%DATADIR%%/boards/opt/nur03006.jpg
+%%DATADIR%%/boards/opt/nur03010.jpg
+%%DATADIR%%/boards/opt/nur03011.jpg
+%%DATADIR%%/boards/opt/nur03013.jpg
+%%DATADIR%%/boards/opt/nur03505.jpg
+%%DATADIR%%/boards/opt/ourspolaire.png
+%%DATADIR%%/boards/opt/phoque.png
+%%DATADIR%%/boards/opt/railroad-bg.png
+%%DATADIR%%/boards/opt/scenery2_background.png
+%%DATADIR%%/boards/opt/scenery3_background.png
+%%DATADIR%%/boards/opt/scenery4_background.png
+%%DATADIR%%/boards/opt/scenery5_background.png
+%%DATADIR%%/boards/opt/scenery6_background.png
+%%DATADIR%%/boards/opt/scenery7_background.png
+%%DATADIR%%/boards/opt/scenery_background.png
+%%DATADIR%%/boards/opt/school_bg1.jpg
+%%DATADIR%%/boards/opt/school_bg2.jpg
+%%DATADIR%%/boards/opt/school_bg3.jpg
+%%DATADIR%%/boards/opt/school_bg4.jpg
+%%DATADIR%%/boards/opt/sea1.jpg
+%%DATADIR%%/boards/opt/sea2.jpg
+%%DATADIR%%/boards/opt/sea3.jpg
+%%DATADIR%%/boards/opt/sea4.jpg
+%%DATADIR%%/boards/opt/sea5.jpg
+%%DATADIR%%/boards/opt/sea6.jpg
+%%DATADIR%%/boards/opt/superbrain_background.jpg
+%%DATADIR%%/boards/opt/tabepice.jpg
+%%DATADIR%%/boards/opt/target_background.jpg
+%%DATADIR%%/boards/oscar_and_friends.xml
+%%DATADIR%%/boards/oscar_and_friends/scene1_0.png
+%%DATADIR%%/boards/paintings.xml
+%%DATADIR%%/boards/paintings/Makefile.in.bak
+%%DATADIR%%/boards/paintings/README
+%%DATADIR%%/boards/paintings/board1_0.xml
+%%DATADIR%%/boards/paintings/board2_0.xml
+%%DATADIR%%/boards/paintings/board3_0.xml
+%%DATADIR%%/boards/paintings/board3_1.xml
+%%DATADIR%%/boards/paintings/board4_0.xml
+%%DATADIR%%/boards/paintings/board5_0.xml
+%%DATADIR%%/boards/paintings/board6_0.xml
+%%DATADIR%%/boards/paintings/kandinky.comp8/puzzle1.png
+%%DATADIR%%/boards/paintings/kandinky.comp8/puzzle2.png
+%%DATADIR%%/boards/paintings/kandinky.comp8/puzzle3.png
+%%DATADIR%%/boards/paintings/kandinky.comp8/puzzle4.png
+%%DATADIR%%/boards/paintings/kandinky.comp8/puzzle5.png
+%%DATADIR%%/boards/paintings/kandinky.comp8/puzzle6.png
+%%DATADIR%%/boards/paintings/kandinky.comp8/puzzle7.png
+%%DATADIR%%/boards/paintings/kandinky.comp8/puzzle8.png
+%%DATADIR%%/boards/paintings/level1/bazille_rampart_1.jpg
+%%DATADIR%%/boards/paintings/level1/bazille_rampart_2.jpg
+%%DATADIR%%/boards/paintings/level1/bazille_rampart_3.jpg
+%%DATADIR%%/boards/paintings/level1/bazille_rampart_4.jpg
+%%DATADIR%%/boards/paintings/level1/bazille_rampart_5.jpg
+%%DATADIR%%/boards/paintings/level1/bazille_rampart_6.jpg
+%%DATADIR%%/boards/paintings/level2/cassat_summertime_1.jpg
+%%DATADIR%%/boards/paintings/level2/cassat_summertime_2.jpg
+%%DATADIR%%/boards/paintings/level2/cassat_summertime_3.jpg
+%%DATADIR%%/boards/paintings/level2/cassat_summertime_4.jpg
+%%DATADIR%%/boards/paintings/level2/cassat_summertime_5.jpg
+%%DATADIR%%/boards/paintings/level2/cassat_summertime_6.jpg
+%%DATADIR%%/boards/paintings/level3/gogh_auvert_1.jpg
+%%DATADIR%%/boards/paintings/level3/gogh_auvert_2.jpg
+%%DATADIR%%/boards/paintings/level3/gogh_auvert_3.jpg
+%%DATADIR%%/boards/paintings/level3/gogh_auvert_4.jpg
+%%DATADIR%%/boards/paintings/level3/gogh_auvert_5.jpg
+%%DATADIR%%/boards/paintings/level3/gogh_auvert_6.jpg
+%%DATADIR%%/boards/paintings/level4/degas_class-dance_1.png
+%%DATADIR%%/boards/paintings/level4/degas_class-dance_2.png
+%%DATADIR%%/boards/paintings/level4/degas_class-dance_3.png
+%%DATADIR%%/boards/paintings/level4/degas_class-dance_4.png
+%%DATADIR%%/boards/paintings/level4/degas_class-dance_5.png
+%%DATADIR%%/boards/paintings/level4/degas_class-dance_6.png
+%%DATADIR%%/boards/paintings/level5/renoir-moulin_de_la_galette-1.png
+%%DATADIR%%/boards/paintings/level5/renoir-moulin_de_la_galette-2.png
+%%DATADIR%%/boards/paintings/level5/renoir-moulin_de_la_galette-3.png
+%%DATADIR%%/boards/paintings/level5/renoir-moulin_de_la_galette-4.png
+%%DATADIR%%/boards/paintings/level5/renoir-moulin_de_la_galette-5.png
+%%DATADIR%%/boards/paintings/level5/renoir-moulin_de_la_galette-6.png
+%%DATADIR%%/boards/paintings/level6/renoir-filles_piano-1.png
+%%DATADIR%%/boards/paintings/level6/renoir-filles_piano-2.png
+%%DATADIR%%/boards/paintings/level6/renoir-filles_piano-3.png
+%%DATADIR%%/boards/paintings/level6/renoir-filles_piano-4.png
+%%DATADIR%%/boards/paintings/level6/renoir-filles_piano-5.png
+%%DATADIR%%/boards/paintings/level6/renoir-filles_piano-6.png
+%%DATADIR%%/boards/paintings/level6/renoir-filles_piano-7.png
+%%DATADIR%%/boards/paintings/level6/renoir-filles_piano-8.png
+%%DATADIR%%/boards/paratrooper.xml
+%%DATADIR%%/boards/planegame.xml
+%%DATADIR%%/boards/puzzle.xml
+%%DATADIR%%/boards/pythontest.xml
+%%DATADIR%%/boards/railroad.xml
+%%DATADIR%%/boards/railroad/loco1.png
+%%DATADIR%%/boards/railroad/loco2.png
+%%DATADIR%%/boards/railroad/loco3.png
+%%DATADIR%%/boards/railroad/loco4.png
+%%DATADIR%%/boards/railroad/loco5.png
+%%DATADIR%%/boards/railroad/loco6.png
+%%DATADIR%%/boards/railroad/loco7.png
+%%DATADIR%%/boards/railroad/loco8.png
+%%DATADIR%%/boards/railroad/loco9.png
+%%DATADIR%%/boards/railroad/wagon1.png
+%%DATADIR%%/boards/railroad/wagon10.png
+%%DATADIR%%/boards/railroad/wagon11.png
+%%DATADIR%%/boards/railroad/wagon12.png
+%%DATADIR%%/boards/railroad/wagon13.png
+%%DATADIR%%/boards/railroad/wagon14.png
+%%DATADIR%%/boards/railroad/wagon2.png
+%%DATADIR%%/boards/railroad/wagon3.png
+%%DATADIR%%/boards/railroad/wagon4.png
+%%DATADIR%%/boards/railroad/wagon5.png
+%%DATADIR%%/boards/railroad/wagon6.png
+%%DATADIR%%/boards/railroad/wagon7.png
+%%DATADIR%%/boards/railroad/wagon8.png
+%%DATADIR%%/boards/railroad/wagon9.png
+%%DATADIR%%/boards/read_colors.xml
+%%DATADIR%%/boards/read_colors/Makefile.in.bak
+%%DATADIR%%/boards/read_colors/board1.xml
+%%DATADIR%%/boards/read_colors/read_colors_background.png
+%%DATADIR%%/boards/read_colors/read_colors_highlight.png
+%%DATADIR%%/boards/reading.xml
+%%DATADIR%%/boards/readingh.xml
+%%DATADIR%%/boards/readingv.xml
+%%DATADIR%%/boards/redraw.xml
+%%DATADIR%%/boards/redraw_symmetrical.xml
+%%DATADIR%%/boards/reversecount.xml
+%%DATADIR%%/boards/reversecount/README
+%%DATADIR%%/boards/reversecount/dice_area.png
+%%DATADIR%%/boards/reversecount/iceblock.png
+%%DATADIR%%/boards/scales/README
+%%DATADIR%%/boards/scales/balance.png
+%%DATADIR%%/boards/scales/bras.png
+%%DATADIR%%/boards/scales/masse.png
+%%DATADIR%%/boards/scales/masse1.png
+%%DATADIR%%/boards/scales/masse10.png
+%%DATADIR%%/boards/scales/masse2.png
+%%DATADIR%%/boards/scales/masse3.png
+%%DATADIR%%/boards/scales/masse4.png
+%%DATADIR%%/boards/scales/masse5.png
+%%DATADIR%%/boards/scales/masse6.png
+%%DATADIR%%/boards/scales/masse7.png
+%%DATADIR%%/boards/scales/masse8.png
+%%DATADIR%%/boards/scales/masse9.png
+%%DATADIR%%/boards/scales/plateau.png
+%%DATADIR%%/boards/scalesboard.xml
+%%DATADIR%%/boards/searace.xml
+%%DATADIR%%/boards/searace1player.xml
+%%DATADIR%%/boards/skins/README
+%%DATADIR%%/boards/skins/babytoy/README
+%%DATADIR%%/boards/skins/babytoy/about.png
+%%DATADIR%%/boards/skins/babytoy/bad.png
+%%DATADIR%%/boards/skins/babytoy/bar_bg.jpg
+%%DATADIR%%/boards/skins/babytoy/button.png
+%%DATADIR%%/boards/skins/babytoy/button_backward.png
+%%DATADIR%%/boards/skins/babytoy/button_checked.png
+%%DATADIR%%/boards/skins/babytoy/button_exit.png
+%%DATADIR%%/boards/skins/babytoy/button_forward.png
+%%DATADIR%%/boards/skins/babytoy/button_large.png
+%%DATADIR%%/boards/skins/babytoy/button_large2.png
+%%DATADIR%%/boards/skins/babytoy/button_large_selected.png
+%%DATADIR%%/boards/skins/babytoy/button_redo.png
+%%DATADIR%%/boards/skins/babytoy/button_reload.png
+%%DATADIR%%/boards/skins/babytoy/button_selected.png
+%%DATADIR%%/boards/skins/babytoy/button_unchecked.png
+%%DATADIR%%/boards/skins/babytoy/button_up.png
+%%DATADIR%%/boards/skins/babytoy/button_up_selected.png
+%%DATADIR%%/boards/skins/babytoy/clockgame-bg.jpg
+%%DATADIR%%/boards/skins/babytoy/config.png
+%%DATADIR%%/boards/skins/babytoy/difficulty_star1.png
+%%DATADIR%%/boards/skins/babytoy/difficulty_star2.png
+%%DATADIR%%/boards/skins/babytoy/difficulty_star3.png
+%%DATADIR%%/boards/skins/babytoy/difficulty_star4.png
+%%DATADIR%%/boards/skins/babytoy/difficulty_star5.png
+%%DATADIR%%/boards/skins/babytoy/difficulty_star6.png
+%%DATADIR%%/boards/skins/babytoy/draw/color-selector.png
+%%DATADIR%%/boards/skins/babytoy/draw/counter.png
+%%DATADIR%%/boards/skins/babytoy/draw/down.png
+%%DATADIR%%/boards/skins/babytoy/draw/tool-camera.png
+%%DATADIR%%/boards/skins/babytoy/draw/tool-camera_on.png
+%%DATADIR%%/boards/skins/babytoy/draw/tool-circle.png
+%%DATADIR%%/boards/skins/babytoy/draw/tool-circle_on.png
+%%DATADIR%%/boards/skins/babytoy/draw/tool-del.png
+%%DATADIR%%/boards/skins/babytoy/draw/tool-del_on.png
+%%DATADIR%%/boards/skins/babytoy/draw/tool-down.png
+%%DATADIR%%/boards/skins/babytoy/draw/tool-down_on.png
+%%DATADIR%%/boards/skins/babytoy/draw/tool-empty.png
+%%DATADIR%%/boards/skins/babytoy/draw/tool-empty_on.png
+%%DATADIR%%/boards/skins/babytoy/draw/tool-fill.png
+%%DATADIR%%/boards/skins/babytoy/draw/tool-fill_on.png
+%%DATADIR%%/boards/skins/babytoy/draw/tool-filledcircle.png
+%%DATADIR%%/boards/skins/babytoy/draw/tool-filledcircle_on.png
+%%DATADIR%%/boards/skins/babytoy/draw/tool-filledrectangle.png
+%%DATADIR%%/boards/skins/babytoy/draw/tool-filledrectangle_on.png
+%%DATADIR%%/boards/skins/babytoy/draw/tool-flip.png
+%%DATADIR%%/boards/skins/babytoy/draw/tool-flip_on.png
+%%DATADIR%%/boards/skins/babytoy/draw/tool-image.png
+%%DATADIR%%/boards/skins/babytoy/draw/tool-image_on.png
+%%DATADIR%%/boards/skins/babytoy/draw/tool-line.png
+%%DATADIR%%/boards/skins/babytoy/draw/tool-line_on.png
+%%DATADIR%%/boards/skins/babytoy/draw/tool-load.png
+%%DATADIR%%/boards/skins/babytoy/draw/tool-movie.png
+%%DATADIR%%/boards/skins/babytoy/draw/tool-movie_on.png
+%%DATADIR%%/boards/skins/babytoy/draw/tool-rectangle.png
+%%DATADIR%%/boards/skins/babytoy/draw/tool-rectangle_on.png
+%%DATADIR%%/boards/skins/babytoy/draw/tool-rotation-ccw.png
+%%DATADIR%%/boards/skins/babytoy/draw/tool-rotation-ccw_on.png
+%%DATADIR%%/boards/skins/babytoy/draw/tool-rotation-cw.png
+%%DATADIR%%/boards/skins/babytoy/draw/tool-rotation-cw_on.png
+%%DATADIR%%/boards/skins/babytoy/draw/tool-save.png
+%%DATADIR%%/boards/skins/babytoy/draw/tool-select.png
+%%DATADIR%%/boards/skins/babytoy/draw/tool-select_on.png
+%%DATADIR%%/boards/skins/babytoy/draw/tool-selector.png
+%%DATADIR%%/boards/skins/babytoy/draw/tool-text.png
+%%DATADIR%%/boards/skins/babytoy/draw/tool-text_on.png
+%%DATADIR%%/boards/skins/babytoy/draw/tool-up.png
+%%DATADIR%%/boards/skins/babytoy/draw/tool-up_on.png
+%%DATADIR%%/boards/skins/babytoy/draw/up.png
+%%DATADIR%%/boards/skins/babytoy/file_selector_bg.png
+%%DATADIR%%/boards/skins/babytoy/gcompris-bg.jpg
+%%DATADIR%%/boards/skins/babytoy/gcompris-init.jpg
+%%DATADIR%%/boards/skins/babytoy/gcompris-menu2bg.png
+%%DATADIR%%/boards/skins/babytoy/gcompris-shapebg.jpg
+%%DATADIR%%/boards/skins/babytoy/gcompris-shapelabel.png
+%%DATADIR%%/boards/skins/babytoy/help.png
+%%DATADIR%%/boards/skins/babytoy/help_bg.png
+%%DATADIR%%/boards/skins/babytoy/home.png
+%%DATADIR%%/boards/skins/babytoy/leftright-bg.jpg
+%%DATADIR%%/boards/skins/babytoy/level1.png
+%%DATADIR%%/boards/skins/babytoy/level2.png
+%%DATADIR%%/boards/skins/babytoy/level3.png
+%%DATADIR%%/boards/skins/babytoy/level4.png
+%%DATADIR%%/boards/skins/babytoy/level5.png
+%%DATADIR%%/boards/skins/babytoy/level6.png
+%%DATADIR%%/boards/skins/babytoy/level7.png
+%%DATADIR%%/boards/skins/babytoy/level8.png
+%%DATADIR%%/boards/skins/babytoy/level9.png
+%%DATADIR%%/boards/skins/babytoy/maze-2d-bubble.png
+%%DATADIR%%/boards/skins/babytoy/maze-3d-bubble.png
+%%DATADIR%%/boards/skins/babytoy/ok.png
+%%DATADIR%%/boards/skins/babytoy/repeat.png
+%%DATADIR%%/boards/skins/babytoy/skin.xml
+%%DATADIR%%/boards/skins/babytoy/traffic-bg.jpg
+%%DATADIR%%/boards/skins/gartoon/README
+%%DATADIR%%/boards/skins/gartoon/about.png
+%%DATADIR%%/boards/skins/gartoon/bad.png
+%%DATADIR%%/boards/skins/gartoon/bar_bg.jpg
+%%DATADIR%%/boards/skins/gartoon/boardicons/README
+%%DATADIR%%/boards/skins/gartoon/boardicons/advanced_colors.png
+%%DATADIR%%/boards/skins/gartoon/boardicons/algebra_by.png
+%%DATADIR%%/boards/skins/gartoon/boardicons/algebra_group.png
+%%DATADIR%%/boards/skins/gartoon/boardicons/algebra_guesscount.png
+%%DATADIR%%/boards/skins/gartoon/boardicons/algebra_minus.png
+%%DATADIR%%/boards/skins/gartoon/boardicons/algebra_plus.png
+%%DATADIR%%/boards/skins/gartoon/boardicons/algebramenu.png
+%%DATADIR%%/boards/skins/gartoon/boardicons/algorithm.png
+%%DATADIR%%/boards/skins/gartoon/boardicons/anim.png
+%%DATADIR%%/boards/skins/gartoon/boardicons/awele.png
+%%DATADIR%%/boards/skins/gartoon/boardicons/babymatch.png
+%%DATADIR%%/boards/skins/gartoon/boardicons/babyshapes.png
+%%DATADIR%%/boards/skins/gartoon/boardicons/ballcatch.png
+%%DATADIR%%/boards/skins/gartoon/boardicons/bargame.png
+%%DATADIR%%/boards/skins/gartoon/boardicons/bonnefemmeti-lu.png
+%%DATADIR%%/boards/skins/gartoon/boardicons/book.png
+%%DATADIR%%/boards/skins/gartoon/boardicons/canal_lock.png
+%%DATADIR%%/boards/skins/gartoon/boardicons/chat.png
+%%DATADIR%%/boards/skins/gartoon/boardicons/chess.png
+%%DATADIR%%/boards/skins/gartoon/boardicons/chess_computer.png
+%%DATADIR%%/boards/skins/gartoon/boardicons/chess_movelearn.png
+%%DATADIR%%/boards/skins/gartoon/boardicons/chess_partyend.png
+%%DATADIR%%/boards/skins/gartoon/boardicons/chronos.png
+%%DATADIR%%/boards/skins/gartoon/boardicons/click_on_letter.png
+%%DATADIR%%/boards/skins/gartoon/boardicons/clickanddraw.png
+%%DATADIR%%/boards/skins/gartoon/boardicons/clickgame.png
+%%DATADIR%%/boards/skins/gartoon/boardicons/clockgame.png
+%%DATADIR%%/boards/skins/gartoon/boardicons/colors.png
+%%DATADIR%%/boards/skins/gartoon/boardicons/computer.png
+%%DATADIR%%/boards/skins/gartoon/boardicons/connect4.png
+%%DATADIR%%/boards/skins/gartoon/boardicons/crane.png
+%%DATADIR%%/boards/skins/gartoon/boardicons/discovery.png
+%%DATADIR%%/boards/skins/gartoon/boardicons/doubleentry.png
+%%DATADIR%%/boards/skins/gartoon/boardicons/draw.png
+%%DATADIR%%/boards/skins/gartoon/boardicons/drawnumber.png
+%%DATADIR%%/boards/skins/gartoon/boardicons/ear.png
+%%DATADIR%%/boards/skins/gartoon/boardicons/electric.png
+%%DATADIR%%/boards/skins/gartoon/boardicons/enumerate.png
+%%DATADIR%%/boards/skins/gartoon/boardicons/erase.png
+%%DATADIR%%/boards/skins/gartoon/boardicons/erase_clic.png
+%%DATADIR%%/boards/skins/gartoon/boardicons/erase_double_clic.png
+%%DATADIR%%/boards/skins/gartoon/boardicons/experience.png
+%%DATADIR%%/boards/skins/gartoon/boardicons/eye_colors.png
+%%DATADIR%%/boards/skins/gartoon/boardicons/fifteen.png
+%%DATADIR%%/boards/skins/gartoon/boardicons/followline.png
+%%DATADIR%%/boards/skins/gartoon/boardicons/foot.png
+%%DATADIR%%/boards/skins/gartoon/boardicons/france_region.png
+%%DATADIR%%/boards/skins/gartoon/boardicons/fun.png
+%%DATADIR%%/boards/skins/gartoon/boardicons/geometry.png
+%%DATADIR%%/boards/skins/gartoon/boardicons/gletters.png
+%%DATADIR%%/boards/skins/gartoon/boardicons/globe.png
+%%DATADIR%%/boards/skins/gartoon/boardicons/gnumch-equal.png
+%%DATADIR%%/boards/skins/gartoon/boardicons/gnumch-factors.png
+%%DATADIR%%/boards/skins/gartoon/boardicons/gnumch-inequal.png
+%%DATADIR%%/boards/skins/gartoon/boardicons/gnumch-multiples.png
+%%DATADIR%%/boards/skins/gartoon/boardicons/gnumch-primes.png
+%%DATADIR%%/boards/skins/gartoon/boardicons/gnumch.png
+%%DATADIR%%/boards/skins/gartoon/boardicons/guessnumber.png
+%%DATADIR%%/boards/skins/gartoon/boardicons/hanoi.png
+%%DATADIR%%/boards/skins/gartoon/boardicons/hanoi_real.png
+%%DATADIR%%/boards/skins/gartoon/boardicons/helicogame.png
+%%DATADIR%%/boards/skins/gartoon/boardicons/hexagon.png
+%%DATADIR%%/boards/skins/gartoon/boardicons/imageid.png
+%%DATADIR%%/boards/skins/gartoon/boardicons/imagename.png
+%%DATADIR%%/boards/skins/gartoon/boardicons/keyboard.png
+%%DATADIR%%/boards/skins/gartoon/boardicons/leftright.png
+%%DATADIR%%/boards/skins/gartoon/boardicons/magic_hat_minus.png
+%%DATADIR%%/boards/skins/gartoon/boardicons/magic_hat_plus.png
+%%DATADIR%%/boards/skins/gartoon/boardicons/math.png
+%%DATADIR%%/boards/skins/gartoon/boardicons/maze.png
+%%DATADIR%%/boards/skins/gartoon/boardicons/maze3D.png
+%%DATADIR%%/boards/skins/gartoon/boardicons/mazeInvisible.png
+%%DATADIR%%/boards/skins/gartoon/boardicons/melody.png
+%%DATADIR%%/boards/skins/gartoon/boardicons/mem_solo_all.png
+%%DATADIR%%/boards/skins/gartoon/boardicons/mem_solo_calc.png
+%%DATADIR%%/boards/skins/gartoon/boardicons/mem_solo_div.png
+%%DATADIR%%/boards/skins/gartoon/boardicons/mem_solo_minus.png
+%%DATADIR%%/boards/skins/gartoon/boardicons/mem_solo_mult.png
+%%DATADIR%%/boards/skins/gartoon/boardicons/mem_solo_mult_div.png
+%%DATADIR%%/boards/skins/gartoon/boardicons/mem_solo_plus.png
+%%DATADIR%%/boards/skins/gartoon/boardicons/mem_solo_plus_minus.png
+%%DATADIR%%/boards/skins/gartoon/boardicons/mem_tux_all.png
+%%DATADIR%%/boards/skins/gartoon/boardicons/mem_tux_calc.png
+%%DATADIR%%/boards/skins/gartoon/boardicons/mem_tux_div.png
+%%DATADIR%%/boards/skins/gartoon/boardicons/mem_tux_minus.png
+%%DATADIR%%/boards/skins/gartoon/boardicons/mem_tux_mult.png
+%%DATADIR%%/boards/skins/gartoon/boardicons/mem_tux_mult_div.png
+%%DATADIR%%/boards/skins/gartoon/boardicons/mem_tux_plus.png
+%%DATADIR%%/boards/skins/gartoon/boardicons/mem_tux_plus_minus.png
+%%DATADIR%%/boards/skins/gartoon/boardicons/memory.png
+%%DATADIR%%/boards/skins/gartoon/boardicons/memory_elephant.png
+%%DATADIR%%/boards/skins/gartoon/boardicons/memory_sound.png
+%%DATADIR%%/boards/skins/gartoon/boardicons/memory_sound_tux.png
+%%DATADIR%%/boards/skins/gartoon/boardicons/memory_tux.png
+%%DATADIR%%/boards/skins/gartoon/boardicons/miscelaneous.png
+%%DATADIR%%/boards/skins/gartoon/boardicons/missing_letter.png
+%%DATADIR%%/boards/skins/gartoon/boardicons/money.png
+%%DATADIR%%/boards/skins/gartoon/boardicons/money_cents.png
+%%DATADIR%%/boards/skins/gartoon/boardicons/mosaic.png
+%%DATADIR%%/boards/skins/gartoon/boardicons/mouse.png
+%%DATADIR%%/boards/skins/gartoon/boardicons/numeration.png
+%%DATADIR%%/boards/skins/gartoon/boardicons/puzzles.png
+%%DATADIR%%/boards/skins/gartoon/boardicons/python.png
+%%DATADIR%%/boards/skins/gartoon/boardicons/railroad.png
+%%DATADIR%%/boards/skins/gartoon/boardicons/read_colors.png
+%%DATADIR%%/boards/skins/gartoon/boardicons/read_colors2.png
+%%DATADIR%%/boards/skins/gartoon/boardicons/reading.png
+%%DATADIR%%/boards/skins/gartoon/boardicons/readingh.png
+%%DATADIR%%/boards/skins/gartoon/boardicons/redraw.png
+%%DATADIR%%/boards/skins/gartoon/boardicons/redraw_symmetry.png
+%%DATADIR%%/boards/skins/gartoon/boardicons/reversecount.png
+%%DATADIR%%/boards/skins/gartoon/boardicons/scalesicon.png
+%%DATADIR%%/boards/skins/gartoon/boardicons/searace.png
+%%DATADIR%%/boards/skins/gartoon/boardicons/searace1player.png
+%%DATADIR%%/boards/skins/gartoon/boardicons/shapegame.png
+%%DATADIR%%/boards/skins/gartoon/boardicons/smallnumbers.png
+%%DATADIR%%/boards/skins/gartoon/boardicons/smallnumbers2.png
+%%DATADIR%%/boards/skins/gartoon/boardicons/strategy.png
+%%DATADIR%%/boards/skins/gartoon/boardicons/submarine.png
+%%DATADIR%%/boards/skins/gartoon/boardicons/sudoku.png
+%%DATADIR%%/boards/skins/gartoon/boardicons/superbrain.png
+%%DATADIR%%/boards/skins/gartoon/boardicons/tangram.png
+%%DATADIR%%/boards/skins/gartoon/boardicons/target.png
+%%DATADIR%%/boards/skins/gartoon/boardicons/traffic.png
+%%DATADIR%%/boards/skins/gartoon/boardicons/tuxpaint.png
+%%DATADIR%%/boards/skins/gartoon/boardicons/tuxpara.png
+%%DATADIR%%/boards/skins/gartoon/boardicons/warning.png
+%%DATADIR%%/boards/skins/gartoon/boardicons/watercycle.png
+%%DATADIR%%/boards/skins/gartoon/boardicons/wordprocessor.png
+%%DATADIR%%/boards/skins/gartoon/boardicons/wordsgame.png
+%%DATADIR%%/boards/skins/gartoon/boardicons/writing_tutor_image_match.png
+%%DATADIR%%/boards/skins/gartoon/boardicons/writing_tutor_missing_match.png
+%%DATADIR%%/boards/skins/gartoon/boardicons/writing_tutor_pattern_admin.png
+%%DATADIR%%/boards/skins/gartoon/boardicons/writing_tutor_tablet.png
+%%DATADIR%%/boards/skins/gartoon/boardicons/writing_tutor_template_match.png
+%%DATADIR%%/boards/skins/gartoon/button.png
+%%DATADIR%%/boards/skins/gartoon/button_backward.png
+%%DATADIR%%/boards/skins/gartoon/button_checked.png
+%%DATADIR%%/boards/skins/gartoon/button_exit.png
+%%DATADIR%%/boards/skins/gartoon/button_forward.png
+%%DATADIR%%/boards/skins/gartoon/button_large.png
+%%DATADIR%%/boards/skins/gartoon/button_large2.png
+%%DATADIR%%/boards/skins/gartoon/button_large_selected.png
+%%DATADIR%%/boards/skins/gartoon/button_redo.png
+%%DATADIR%%/boards/skins/gartoon/button_reload.png
+%%DATADIR%%/boards/skins/gartoon/button_selected.png
+%%DATADIR%%/boards/skins/gartoon/button_small.png
+%%DATADIR%%/boards/skins/gartoon/button_small_selected.png
+%%DATADIR%%/boards/skins/gartoon/button_unchecked.png
+%%DATADIR%%/boards/skins/gartoon/button_up.png
+%%DATADIR%%/boards/skins/gartoon/button_up_selected.png
+%%DATADIR%%/boards/skins/gartoon/clockgame-bg.jpg
+%%DATADIR%%/boards/skins/gartoon/config.png
+%%DATADIR%%/boards/skins/gartoon/config_boards.png
+%%DATADIR%%/boards/skins/gartoon/config_groups.png
+%%DATADIR%%/boards/skins/gartoon/config_profiles.png
+%%DATADIR%%/boards/skins/gartoon/config_reports.png
+%%DATADIR%%/boards/skins/gartoon/config_users.png
+%%DATADIR%%/boards/skins/gartoon/cursor_circle.png
+%%DATADIR%%/boards/skins/gartoon/cursor_default.png
+%%DATADIR%%/boards/skins/gartoon/cursor_del.png
+%%DATADIR%%/boards/skins/gartoon/cursor_fill.png
+%%DATADIR%%/boards/skins/gartoon/cursor_fillcircle.png
+%%DATADIR%%/boards/skins/gartoon/cursor_fillrect.png
+%%DATADIR%%/boards/skins/gartoon/cursor_line.png
+%%DATADIR%%/boards/skins/gartoon/cursor_rect.png
+%%DATADIR%%/boards/skins/gartoon/cursor_select.png
+%%DATADIR%%/boards/skins/gartoon/dialogbox.png
+%%DATADIR%%/boards/skins/gartoon/difficulty_star1.png
+%%DATADIR%%/boards/skins/gartoon/difficulty_star2.png
+%%DATADIR%%/boards/skins/gartoon/difficulty_star3.png
+%%DATADIR%%/boards/skins/gartoon/difficulty_star4.png
+%%DATADIR%%/boards/skins/gartoon/difficulty_star5.png
+%%DATADIR%%/boards/skins/gartoon/difficulty_star6.png
+%%DATADIR%%/boards/skins/gartoon/directory.png
+%%DATADIR%%/boards/skins/gartoon/draw/camera.png
+%%DATADIR%%/boards/skins/gartoon/draw/color-selector.png
+%%DATADIR%%/boards/skins/gartoon/draw/counter.png
+%%DATADIR%%/boards/skins/gartoon/draw/down.png
+%%DATADIR%%/boards/skins/gartoon/draw/tool-camera.png
+%%DATADIR%%/boards/skins/gartoon/draw/tool-camera_on.png
+%%DATADIR%%/boards/skins/gartoon/draw/tool-circle.png
+%%DATADIR%%/boards/skins/gartoon/draw/tool-circle_on.png
+%%DATADIR%%/boards/skins/gartoon/draw/tool-del.png
+%%DATADIR%%/boards/skins/gartoon/draw/tool-del_on.png
+%%DATADIR%%/boards/skins/gartoon/draw/tool-down.png
+%%DATADIR%%/boards/skins/gartoon/draw/tool-down_on.png
+%%DATADIR%%/boards/skins/gartoon/draw/tool-empty.png
+%%DATADIR%%/boards/skins/gartoon/draw/tool-empty_on.png
+%%DATADIR%%/boards/skins/gartoon/draw/tool-fill.png
+%%DATADIR%%/boards/skins/gartoon/draw/tool-fill_on.png
+%%DATADIR%%/boards/skins/gartoon/draw/tool-filledcircle.png
+%%DATADIR%%/boards/skins/gartoon/draw/tool-filledcircle_on.png
+%%DATADIR%%/boards/skins/gartoon/draw/tool-filledrectangle.png
+%%DATADIR%%/boards/skins/gartoon/draw/tool-filledrectangle_on.png
+%%DATADIR%%/boards/skins/gartoon/draw/tool-flip.png
+%%DATADIR%%/boards/skins/gartoon/draw/tool-flip_on.png
+%%DATADIR%%/boards/skins/gartoon/draw/tool-image.png
+%%DATADIR%%/boards/skins/gartoon/draw/tool-image_on.png
+%%DATADIR%%/boards/skins/gartoon/draw/tool-line.png
+%%DATADIR%%/boards/skins/gartoon/draw/tool-line_on.png
+%%DATADIR%%/boards/skins/gartoon/draw/tool-load.png
+%%DATADIR%%/boards/skins/gartoon/draw/tool-movie.png
+%%DATADIR%%/boards/skins/gartoon/draw/tool-movie_on.png
+%%DATADIR%%/boards/skins/gartoon/draw/tool-rectangle.png
+%%DATADIR%%/boards/skins/gartoon/draw/tool-rectangle_on.png
+%%DATADIR%%/boards/skins/gartoon/draw/tool-rotation-ccw.png
+%%DATADIR%%/boards/skins/gartoon/draw/tool-rotation-ccw_on.png
+%%DATADIR%%/boards/skins/gartoon/draw/tool-rotation-cw.png
+%%DATADIR%%/boards/skins/gartoon/draw/tool-rotation-cw_on.png
+%%DATADIR%%/boards/skins/gartoon/draw/tool-save.png
+%%DATADIR%%/boards/skins/gartoon/draw/tool-select.png
+%%DATADIR%%/boards/skins/gartoon/draw/tool-select_on.png
+%%DATADIR%%/boards/skins/gartoon/draw/tool-selector.png
+%%DATADIR%%/boards/skins/gartoon/draw/tool-text.png
+%%DATADIR%%/boards/skins/gartoon/draw/tool-text_on.png
+%%DATADIR%%/boards/skins/gartoon/draw/tool-up.png
+%%DATADIR%%/boards/skins/gartoon/draw/tool-up_on.png
+%%DATADIR%%/boards/skins/gartoon/draw/up.png
+%%DATADIR%%/boards/skins/gartoon/file.png
+%%DATADIR%%/boards/skins/gartoon/file_selector_bg.png
+%%DATADIR%%/boards/skins/gartoon/fsflogo.png
+%%DATADIR%%/boards/skins/gartoon/gcompris-about.png
+%%DATADIR%%/boards/skins/gartoon/gcompris-bg.jpg
+%%DATADIR%%/boards/skins/gartoon/gcompris-init.jpg
+%%DATADIR%%/boards/skins/gartoon/gcompris-menu2bg.png
+%%DATADIR%%/boards/skins/gartoon/gcompris-shapebg.jpg
+%%DATADIR%%/boards/skins/gartoon/gcompris-shapelabel.png
+%%DATADIR%%/boards/skins/gartoon/gcomprislogo.png
+%%DATADIR%%/boards/skins/gartoon/help.png
+%%DATADIR%%/boards/skins/gartoon/help_bg.png
+%%DATADIR%%/boards/skins/gartoon/home.png
+%%DATADIR%%/boards/skins/gartoon/images_selector_bg.png
+%%DATADIR%%/boards/skins/gartoon/leftright-bg.jpg
+%%DATADIR%%/boards/skins/gartoon/level1.png
+%%DATADIR%%/boards/skins/gartoon/level2.png
+%%DATADIR%%/boards/skins/gartoon/level3.png
+%%DATADIR%%/boards/skins/gartoon/level4.png
+%%DATADIR%%/boards/skins/gartoon/level5.png
+%%DATADIR%%/boards/skins/gartoon/level6.png
+%%DATADIR%%/boards/skins/gartoon/level7.png
+%%DATADIR%%/boards/skins/gartoon/level8.png
+%%DATADIR%%/boards/skins/gartoon/level9.png
+%%DATADIR%%/boards/skins/gartoon/maze-2d-bubble.png
+%%DATADIR%%/boards/skins/gartoon/maze-3d-bubble.png
+%%DATADIR%%/boards/skins/gartoon/menuicon.png
+%%DATADIR%%/boards/skins/gartoon/mini_bad.png
+%%DATADIR%%/boards/skins/gartoon/money-bg.jpg
+%%DATADIR%%/boards/skins/gartoon/money-bg.png
+%%DATADIR%%/boards/skins/gartoon/ok.png
+%%DATADIR%%/boards/skins/gartoon/reading-bg.jpg
+%%DATADIR%%/boards/skins/gartoon/repeat.png
+%%DATADIR%%/boards/skins/gartoon/skin.xml
+%%DATADIR%%/boards/skins/gartoon/traffic-bg.jpg
+%%DATADIR%%/boards/skins/gartoon/voice.png
+%%DATADIR%%/boards/skins/gartoon/voice_bad.png
+%%DATADIR%%/boards/smallnumbers.xml
+%%DATADIR%%/boards/smallnumbers2.xml
+%%DATADIR%%/boards/sound_group.xml
+%%DATADIR%%/boards/sounds/HOWTO_ENCODE
+%%DATADIR%%/boards/sounds/Harbor1.wav
+%%DATADIR%%/boards/sounds/Harbor3.wav
+%%DATADIR%%/boards/sounds/LuneRouge/COPYRIGHT
+%%DATADIR%%/boards/sounds/LuneRouge/LRLaPause_short.ogg
+%%DATADIR%%/boards/sounds/LuneRouge/Licence.txt
+%%DATADIR%%/boards/sounds/LuneRouge/animaux/LRBark_1_by_Lionel_Allorge_cut.ogg
+%%DATADIR%%/boards/sounds/LuneRouge/animaux/LRBark_3_by_Lionel_Allorge_cut.ogg
+%%DATADIR%%/boards/sounds/LuneRouge/animaux/LRFrogsInPondDuringStormByLionelAllorgeCut.ogg
+%%DATADIR%%/boards/sounds/LuneRouge/animaux/LRRain_in_garden_01_by_Lionel_Allorge_cut.ogg
+%%DATADIR%%/boards/sounds/LuneRouge/engins/LRObject_falling_01_by_Lionel_Allorge.ogg
+%%DATADIR%%/boards/sounds/LuneRouge/engins/LRObject_falling_02_by_Lionel_Allorge.ogg
+%%DATADIR%%/boards/sounds/LuneRouge/engins/LRStartAndStopCarEngine1ByLionelAllorgeCut.ogg
+%%DATADIR%%/boards/sounds/LuneRouge/engins/LRTrain_slowing_down_01_by_Lionel_Allorge_cut.ogg
+%%DATADIR%%/boards/sounds/LuneRouge/humain/LRApplauses_1_by_Lionel_Allorge_cut.ogg
+%%DATADIR%%/boards/sounds/LuneRouge/humain/LRHeart_beat_01_by_Lionel_Allorge.ogg
+%%DATADIR%%/boards/sounds/LuneRouge/maison/LRDoor_Open_2_by_Lionel_Allorge.ogg
+%%DATADIR%%/boards/sounds/LuneRouge/maison/LRRing_01_by_Lionel_Allorge.ogg
+%%DATADIR%%/boards/sounds/LuneRouge/musique/LRBuddhist_gong_05_by_Lionel_Allorge.ogg
+%%DATADIR%%/boards/sounds/LuneRouge/sf/LRWeird_1_by_Lionel_Allorge.ogg
+%%DATADIR%%/boards/sounds/LuneRouge/sf/LRWeird_2_by_Lionel_Allorge.ogg
+%%DATADIR%%/boards/sounds/LuneRouge/sf/LRWeird_3_by_Lionel_Allorge.ogg
+%%DATADIR%%/boards/sounds/LuneRouge/sf/LRWeird_4_by_Lionel_Allorge.ogg
+%%DATADIR%%/boards/sounds/LuneRouge/sf/LRWeird_5_by_Lionel_Allorge.ogg
+%%DATADIR%%/boards/sounds/LuneRouge/sf/LRWeird_6_by_Lionel_Allorge.ogg
+%%DATADIR%%/boards/sounds/LuneRouge/usine/LRFactory_noise_01_by_Lionel_Allorge.ogg
+%%DATADIR%%/boards/sounds/LuneRouge/usine/LRFactory_noise_02_by_Lionel_Allorge.ogg
+%%DATADIR%%/boards/sounds/LuneRouge/usine/LRFactory_noise_03_by_Lionel_Allorge.ogg
+%%DATADIR%%/boards/sounds/LuneRouge/usine/LRFactory_noise_04_by_Lionel_Allorge.ogg
+%%DATADIR%%/boards/sounds/LuneRouge/usine/LRFactory_noise_05_by_Lionel_Allorge.ogg
+%%DATADIR%%/boards/sounds/LuneRouge/usine/LRFactory_noise_06_by_Lionel_Allorge.ogg
+%%DATADIR%%/boards/sounds/LuneRouge/usine/LRFireballs_01_by_Lionel_Allorge.ogg
+%%DATADIR%%/boards/sounds/LuneRouge/usine/LRHits_01_by_Lionel_Allorge.ogg
+%%DATADIR%%/boards/sounds/README
+%%DATADIR%%/boards/sounds/Water5.wav
+%%DATADIR%%/boards/sounds/apert2.wav
+%%DATADIR%%/boards/sounds/ar/README
+%%DATADIR%%/boards/sounds/ar/alphabet/10.ogg
+%%DATADIR%%/boards/sounds/ar/alphabet/U0030.ogg
+%%DATADIR%%/boards/sounds/ar/alphabet/U0031.ogg
+%%DATADIR%%/boards/sounds/ar/alphabet/U0032.ogg
+%%DATADIR%%/boards/sounds/ar/alphabet/U0033.ogg
+%%DATADIR%%/boards/sounds/ar/alphabet/U0034.ogg
+%%DATADIR%%/boards/sounds/ar/alphabet/U0035.ogg
+%%DATADIR%%/boards/sounds/ar/alphabet/U0036.ogg
+%%DATADIR%%/boards/sounds/ar/alphabet/U0037.ogg
+%%DATADIR%%/boards/sounds/ar/alphabet/U0038.ogg
+%%DATADIR%%/boards/sounds/ar/alphabet/U0039.ogg
+%%DATADIR%%/boards/sounds/ar/alphabet/U0623.ogg
+%%DATADIR%%/boards/sounds/ar/alphabet/U0628.ogg
+%%DATADIR%%/boards/sounds/ar/alphabet/U062A.ogg
+%%DATADIR%%/boards/sounds/ar/alphabet/U062B.ogg
+%%DATADIR%%/boards/sounds/ar/alphabet/U062C.ogg
+%%DATADIR%%/boards/sounds/ar/alphabet/U062D.ogg
+%%DATADIR%%/boards/sounds/ar/alphabet/U062E.ogg
+%%DATADIR%%/boards/sounds/ar/alphabet/U062F.ogg
+%%DATADIR%%/boards/sounds/ar/alphabet/U0630.ogg
+%%DATADIR%%/boards/sounds/ar/alphabet/U0631.ogg
+%%DATADIR%%/boards/sounds/ar/alphabet/U0632.ogg
+%%DATADIR%%/boards/sounds/ar/alphabet/U0633.ogg
+%%DATADIR%%/boards/sounds/ar/alphabet/U0634.ogg
+%%DATADIR%%/boards/sounds/ar/alphabet/U0635.ogg
+%%DATADIR%%/boards/sounds/ar/alphabet/U0636.ogg
+%%DATADIR%%/boards/sounds/ar/alphabet/U0637.ogg
+%%DATADIR%%/boards/sounds/ar/alphabet/U0638.ogg
+%%DATADIR%%/boards/sounds/ar/alphabet/U0639.ogg
+%%DATADIR%%/boards/sounds/ar/alphabet/U063A.ogg
+%%DATADIR%%/boards/sounds/ar/alphabet/U0641.ogg
+%%DATADIR%%/boards/sounds/ar/alphabet/U0642.ogg
+%%DATADIR%%/boards/sounds/ar/alphabet/U0643.ogg
+%%DATADIR%%/boards/sounds/ar/alphabet/U0644.ogg
+%%DATADIR%%/boards/sounds/ar/alphabet/U0645.ogg
+%%DATADIR%%/boards/sounds/ar/alphabet/U0646.ogg
+%%DATADIR%%/boards/sounds/ar/alphabet/U0647.ogg
+%%DATADIR%%/boards/sounds/ar/alphabet/U0648.ogg
+%%DATADIR%%/boards/sounds/ar/alphabet/U064A.ogg
+%%DATADIR%%/boards/sounds/ar/colors/black.ogg
+%%DATADIR%%/boards/sounds/ar/colors/blue.ogg
+%%DATADIR%%/boards/sounds/ar/colors/brown.ogg
+%%DATADIR%%/boards/sounds/ar/colors/green.ogg
+%%DATADIR%%/boards/sounds/ar/colors/grey.ogg
+%%DATADIR%%/boards/sounds/ar/colors/orange.ogg
+%%DATADIR%%/boards/sounds/ar/colors/pink.ogg
+%%DATADIR%%/boards/sounds/ar/colors/purple.ogg
+%%DATADIR%%/boards/sounds/ar/colors/red.ogg
+%%DATADIR%%/boards/sounds/ar/colors/white.ogg
+%%DATADIR%%/boards/sounds/ar/colors/yellow.ogg
+%%DATADIR%%/boards/sounds/ar/geography/africa.ogg
+%%DATADIR%%/boards/sounds/ar/geography/alaska.ogg
+%%DATADIR%%/boards/sounds/ar/geography/albania.ogg
+%%DATADIR%%/boards/sounds/ar/geography/america.ogg
+%%DATADIR%%/boards/sounds/ar/geography/antartica.ogg
+%%DATADIR%%/boards/sounds/ar/geography/argentina.ogg
+%%DATADIR%%/boards/sounds/ar/geography/asia.ogg
+%%DATADIR%%/boards/sounds/ar/geography/austria.ogg
+%%DATADIR%%/boards/sounds/ar/geography/bahamas.ogg
+%%DATADIR%%/boards/sounds/ar/geography/belarus.ogg
+%%DATADIR%%/boards/sounds/ar/geography/belgium.ogg
+%%DATADIR%%/boards/sounds/ar/geography/bolivia.ogg
+%%DATADIR%%/boards/sounds/ar/geography/bosnia_herzegovina.ogg
+%%DATADIR%%/boards/sounds/ar/geography/brazil.ogg
+%%DATADIR%%/boards/sounds/ar/geography/bulgaria.ogg
+%%DATADIR%%/boards/sounds/ar/geography/canada.ogg
+%%DATADIR%%/boards/sounds/ar/geography/chile.ogg
+%%DATADIR%%/boards/sounds/ar/geography/colombia.ogg
+%%DATADIR%%/boards/sounds/ar/geography/costa_rica.ogg
+%%DATADIR%%/boards/sounds/ar/geography/croatia.ogg
+%%DATADIR%%/boards/sounds/ar/geography/cuba.ogg
+%%DATADIR%%/boards/sounds/ar/geography/cyprus.ogg
+%%DATADIR%%/boards/sounds/ar/geography/czech.ogg
+%%DATADIR%%/boards/sounds/ar/geography/denmark.ogg
+%%DATADIR%%/boards/sounds/ar/geography/dominican_republic.ogg
+%%DATADIR%%/boards/sounds/ar/geography/ecuador.ogg
+%%DATADIR%%/boards/sounds/ar/geography/estonia.ogg
+%%DATADIR%%/boards/sounds/ar/geography/europe.ogg
+%%DATADIR%%/boards/sounds/ar/geography/finland.ogg
+%%DATADIR%%/boards/sounds/ar/geography/france.ogg
+%%DATADIR%%/boards/sounds/ar/geography/french_guiana.ogg
+%%DATADIR%%/boards/sounds/ar/geography/germany.ogg
+%%DATADIR%%/boards/sounds/ar/geography/greece.ogg
+%%DATADIR%%/boards/sounds/ar/geography/greenland.ogg
+%%DATADIR%%/boards/sounds/ar/geography/guatemala.ogg
+%%DATADIR%%/boards/sounds/ar/geography/guyana.ogg
+%%DATADIR%%/boards/sounds/ar/geography/haiti.ogg
+%%DATADIR%%/boards/sounds/ar/geography/honduras.ogg
+%%DATADIR%%/boards/sounds/ar/geography/hungary.ogg
+%%DATADIR%%/boards/sounds/ar/geography/iceland.ogg
+%%DATADIR%%/boards/sounds/ar/geography/ireland.ogg
+%%DATADIR%%/boards/sounds/ar/geography/italy.ogg
+%%DATADIR%%/boards/sounds/ar/geography/jamaica.ogg
+%%DATADIR%%/boards/sounds/ar/geography/latvia.ogg
+%%DATADIR%%/boards/sounds/ar/geography/lithuania.ogg
+%%DATADIR%%/boards/sounds/ar/geography/luxembourg.ogg
+%%DATADIR%%/boards/sounds/ar/geography/macedonia.ogg
+%%DATADIR%%/boards/sounds/ar/geography/mexico.ogg
+%%DATADIR%%/boards/sounds/ar/geography/moldova.ogg
+%%DATADIR%%/boards/sounds/ar/geography/netherland.ogg
+%%DATADIR%%/boards/sounds/ar/geography/nicaragua.ogg
+%%DATADIR%%/boards/sounds/ar/geography/norway.ogg
+%%DATADIR%%/boards/sounds/ar/geography/oceania.ogg
+%%DATADIR%%/boards/sounds/ar/geography/panama.ogg
+%%DATADIR%%/boards/sounds/ar/geography/paraguay.ogg
+%%DATADIR%%/boards/sounds/ar/geography/peru.ogg
+%%DATADIR%%/boards/sounds/ar/geography/poland.ogg
+%%DATADIR%%/boards/sounds/ar/geography/portugal.ogg
+%%DATADIR%%/boards/sounds/ar/geography/romania.ogg
+%%DATADIR%%/boards/sounds/ar/geography/russia.ogg
+%%DATADIR%%/boards/sounds/ar/geography/salvador.ogg
+%%DATADIR%%/boards/sounds/ar/geography/serbia_montenegro.ogg
+%%DATADIR%%/boards/sounds/ar/geography/slovakia.ogg
+%%DATADIR%%/boards/sounds/ar/geography/slovenia.ogg
+%%DATADIR%%/boards/sounds/ar/geography/spain.ogg
+%%DATADIR%%/boards/sounds/ar/geography/suriname.ogg
+%%DATADIR%%/boards/sounds/ar/geography/sweden.ogg
+%%DATADIR%%/boards/sounds/ar/geography/switz.ogg
+%%DATADIR%%/boards/sounds/ar/geography/turkey.ogg
+%%DATADIR%%/boards/sounds/ar/geography/ukraine.ogg
+%%DATADIR%%/boards/sounds/ar/geography/united_kingdom.ogg
+%%DATADIR%%/boards/sounds/ar/geography/uruguay.ogg
+%%DATADIR%%/boards/sounds/ar/geography/usa.ogg
+%%DATADIR%%/boards/sounds/ar/geography/venezuela.ogg
+%%DATADIR%%/boards/sounds/ar/misc/about.ogg
+%%DATADIR%%/boards/sounds/ar/misc/awesome.ogg
+%%DATADIR%%/boards/sounds/ar/misc/back.ogg
+%%DATADIR%%/boards/sounds/ar/misc/by.ogg
+%%DATADIR%%/boards/sounds/ar/misc/check_answer.ogg
+%%DATADIR%%/boards/sounds/ar/misc/click_on_letter.ogg
+%%DATADIR%%/boards/sounds/ar/misc/congratulation.ogg
+%%DATADIR%%/boards/sounds/ar/misc/equal.ogg
+%%DATADIR%%/boards/sounds/ar/misc/fantastic.ogg
+%%DATADIR%%/boards/sounds/ar/misc/good.ogg
+%%DATADIR%%/boards/sounds/ar/misc/great.ogg
+%%DATADIR%%/boards/sounds/ar/misc/help.ogg
+%%DATADIR%%/boards/sounds/ar/misc/level.ogg
+%%DATADIR%%/boards/sounds/ar/misc/minus.ogg
+%%DATADIR%%/boards/sounds/ar/misc/ok.ogg
+%%DATADIR%%/boards/sounds/ar/misc/outof.ogg
+%%DATADIR%%/boards/sounds/ar/misc/perfect.ogg
+%%DATADIR%%/boards/sounds/ar/misc/plus.ogg
+%%DATADIR%%/boards/sounds/ar/misc/quit.ogg
+%%DATADIR%%/boards/sounds/ar/misc/super.ogg
+%%DATADIR%%/boards/sounds/ar/misc/waytogo.ogg
+%%DATADIR%%/boards/sounds/ar/misc/welcome.ogg
+%%DATADIR%%/boards/sounds/bleep.wav
+%%DATADIR%%/boards/sounds/bonus.wav
+%%DATADIR%%/boards/sounds/brick.wav
+%%DATADIR%%/boards/sounds/bubble.wav
+%%DATADIR%%/boards/sounds/chronos/space/1.ogg
+%%DATADIR%%/boards/sounds/chronos/space/2.ogg
+%%DATADIR%%/boards/sounds/chronos/space/3.ogg
+%%DATADIR%%/boards/sounds/crash.wav
+%%DATADIR%%/boards/sounds/cs/README
+%%DATADIR%%/boards/sounds/cs/alphabet/10.ogg
+%%DATADIR%%/boards/sounds/cs/alphabet/U0031.ogg
+%%DATADIR%%/boards/sounds/cs/alphabet/U0032.ogg
+%%DATADIR%%/boards/sounds/cs/alphabet/U0033.ogg
+%%DATADIR%%/boards/sounds/cs/alphabet/U0034.ogg
+%%DATADIR%%/boards/sounds/cs/alphabet/U0035.ogg
+%%DATADIR%%/boards/sounds/cs/alphabet/U0036.ogg
+%%DATADIR%%/boards/sounds/cs/alphabet/U0037.ogg
+%%DATADIR%%/boards/sounds/cs/alphabet/U0038.ogg
+%%DATADIR%%/boards/sounds/cs/alphabet/U0039.ogg
+%%DATADIR%%/boards/sounds/cs/alphabet/U0061.ogg
+%%DATADIR%%/boards/sounds/cs/alphabet/U0062.ogg
+%%DATADIR%%/boards/sounds/cs/alphabet/U0063.ogg
+%%DATADIR%%/boards/sounds/cs/alphabet/U0064.ogg
+%%DATADIR%%/boards/sounds/cs/alphabet/U0065.ogg
+%%DATADIR%%/boards/sounds/cs/alphabet/U0066.ogg
+%%DATADIR%%/boards/sounds/cs/alphabet/U0067.ogg
+%%DATADIR%%/boards/sounds/cs/alphabet/U0068.ogg
+%%DATADIR%%/boards/sounds/cs/alphabet/U0069.ogg
+%%DATADIR%%/boards/sounds/cs/alphabet/U006A.ogg
+%%DATADIR%%/boards/sounds/cs/alphabet/U006B.ogg
+%%DATADIR%%/boards/sounds/cs/alphabet/U006C.ogg
+%%DATADIR%%/boards/sounds/cs/alphabet/U006D.ogg
+%%DATADIR%%/boards/sounds/cs/alphabet/U006E.ogg
+%%DATADIR%%/boards/sounds/cs/alphabet/U006F.ogg
+%%DATADIR%%/boards/sounds/cs/alphabet/U0070.ogg
+%%DATADIR%%/boards/sounds/cs/alphabet/U0071.ogg
+%%DATADIR%%/boards/sounds/cs/alphabet/U0072.ogg
+%%DATADIR%%/boards/sounds/cs/alphabet/U0073.ogg
+%%DATADIR%%/boards/sounds/cs/alphabet/U0074.ogg
+%%DATADIR%%/boards/sounds/cs/alphabet/U0075.ogg
+%%DATADIR%%/boards/sounds/cs/alphabet/U0076.ogg
+%%DATADIR%%/boards/sounds/cs/alphabet/U0077.ogg
+%%DATADIR%%/boards/sounds/cs/alphabet/U0078.ogg
+%%DATADIR%%/boards/sounds/cs/alphabet/U0079.ogg
+%%DATADIR%%/boards/sounds/cs/alphabet/U007A.ogg
+%%DATADIR%%/boards/sounds/cs/alphabet/U00E1.ogg
+%%DATADIR%%/boards/sounds/cs/alphabet/U00E9.ogg
+%%DATADIR%%/boards/sounds/cs/alphabet/U00ED.ogg
+%%DATADIR%%/boards/sounds/cs/alphabet/U00F3.ogg
+%%DATADIR%%/boards/sounds/cs/alphabet/U00FA.ogg
+%%DATADIR%%/boards/sounds/cs/alphabet/U00FD.ogg
+%%DATADIR%%/boards/sounds/cs/alphabet/U010D.ogg
+%%DATADIR%%/boards/sounds/cs/alphabet/U010F.ogg
+%%DATADIR%%/boards/sounds/cs/alphabet/U011B.ogg
+%%DATADIR%%/boards/sounds/cs/alphabet/U0148.ogg
+%%DATADIR%%/boards/sounds/cs/alphabet/U0159.ogg
+%%DATADIR%%/boards/sounds/cs/alphabet/U0161.ogg
+%%DATADIR%%/boards/sounds/cs/alphabet/U0165.ogg
+%%DATADIR%%/boards/sounds/cs/alphabet/U016F.ogg
+%%DATADIR%%/boards/sounds/cs/alphabet/U017E.ogg
+%%DATADIR%%/boards/sounds/cs/colors/black.ogg
+%%DATADIR%%/boards/sounds/cs/colors/blue.ogg
+%%DATADIR%%/boards/sounds/cs/colors/brown.ogg
+%%DATADIR%%/boards/sounds/cs/colors/green.ogg
+%%DATADIR%%/boards/sounds/cs/colors/grey.ogg
+%%DATADIR%%/boards/sounds/cs/colors/orange.ogg
+%%DATADIR%%/boards/sounds/cs/colors/pink.ogg
+%%DATADIR%%/boards/sounds/cs/colors/purple.ogg
+%%DATADIR%%/boards/sounds/cs/colors/red.ogg
+%%DATADIR%%/boards/sounds/cs/colors/white.ogg
+%%DATADIR%%/boards/sounds/cs/colors/yellow.ogg
+%%DATADIR%%/boards/sounds/cs/geography/alaska.ogg
+%%DATADIR%%/boards/sounds/cs/geography/albania.ogg
+%%DATADIR%%/boards/sounds/cs/geography/argentina.ogg
+%%DATADIR%%/boards/sounds/cs/geography/austria.ogg
+%%DATADIR%%/boards/sounds/cs/geography/bahamas.ogg
+%%DATADIR%%/boards/sounds/cs/geography/belarus.ogg
+%%DATADIR%%/boards/sounds/cs/geography/belgium.ogg
+%%DATADIR%%/boards/sounds/cs/geography/bolivia.ogg
+%%DATADIR%%/boards/sounds/cs/geography/bosnia_herzegovina.ogg
+%%DATADIR%%/boards/sounds/cs/geography/brazil.ogg
+%%DATADIR%%/boards/sounds/cs/geography/bulgaria.ogg
+%%DATADIR%%/boards/sounds/cs/geography/canada.ogg
+%%DATADIR%%/boards/sounds/cs/geography/chile.ogg
+%%DATADIR%%/boards/sounds/cs/geography/colombia.ogg
+%%DATADIR%%/boards/sounds/cs/geography/costa_rica.ogg
+%%DATADIR%%/boards/sounds/cs/geography/croatia.ogg
+%%DATADIR%%/boards/sounds/cs/geography/cuba.ogg
+%%DATADIR%%/boards/sounds/cs/geography/cyprus.ogg
+%%DATADIR%%/boards/sounds/cs/geography/czech.ogg
+%%DATADIR%%/boards/sounds/cs/geography/denmark.ogg
+%%DATADIR%%/boards/sounds/cs/geography/dominican_republic.ogg
+%%DATADIR%%/boards/sounds/cs/geography/ecuador.ogg
+%%DATADIR%%/boards/sounds/cs/geography/estonia.ogg
+%%DATADIR%%/boards/sounds/cs/geography/finland.ogg
+%%DATADIR%%/boards/sounds/cs/geography/france.ogg
+%%DATADIR%%/boards/sounds/cs/geography/french_guiana.ogg
+%%DATADIR%%/boards/sounds/cs/geography/germany.ogg
+%%DATADIR%%/boards/sounds/cs/geography/greece.ogg
+%%DATADIR%%/boards/sounds/cs/geography/greenland.ogg
+%%DATADIR%%/boards/sounds/cs/geography/guatemala.ogg
+%%DATADIR%%/boards/sounds/cs/geography/guyana.ogg
+%%DATADIR%%/boards/sounds/cs/geography/haiti.ogg
+%%DATADIR%%/boards/sounds/cs/geography/honduras.ogg
+%%DATADIR%%/boards/sounds/cs/geography/hungary.ogg
+%%DATADIR%%/boards/sounds/cs/geography/iceland.ogg
+%%DATADIR%%/boards/sounds/cs/geography/ireland.ogg
+%%DATADIR%%/boards/sounds/cs/geography/italy.ogg
+%%DATADIR%%/boards/sounds/cs/geography/jamaica.ogg
+%%DATADIR%%/boards/sounds/cs/geography/latvia.ogg
+%%DATADIR%%/boards/sounds/cs/geography/lithuania.ogg
+%%DATADIR%%/boards/sounds/cs/geography/luxembourg.ogg
+%%DATADIR%%/boards/sounds/cs/geography/macedonia.ogg
+%%DATADIR%%/boards/sounds/cs/geography/mexico.ogg
+%%DATADIR%%/boards/sounds/cs/geography/moldova.ogg
+%%DATADIR%%/boards/sounds/cs/geography/netherland.ogg
+%%DATADIR%%/boards/sounds/cs/geography/nicaragua.ogg
+%%DATADIR%%/boards/sounds/cs/geography/norway.ogg
+%%DATADIR%%/boards/sounds/cs/geography/panama.ogg
+%%DATADIR%%/boards/sounds/cs/geography/paraguay.ogg
+%%DATADIR%%/boards/sounds/cs/geography/peru.ogg
+%%DATADIR%%/boards/sounds/cs/geography/poland.ogg
+%%DATADIR%%/boards/sounds/cs/geography/portugal.ogg
+%%DATADIR%%/boards/sounds/cs/geography/romania.ogg
+%%DATADIR%%/boards/sounds/cs/geography/russia.ogg
+%%DATADIR%%/boards/sounds/cs/geography/salvador.ogg
+%%DATADIR%%/boards/sounds/cs/geography/serbia_montenegro.ogg
+%%DATADIR%%/boards/sounds/cs/geography/slovakia.ogg
+%%DATADIR%%/boards/sounds/cs/geography/slovenia.ogg
+%%DATADIR%%/boards/sounds/cs/geography/spain.ogg
+%%DATADIR%%/boards/sounds/cs/geography/suriname.ogg
+%%DATADIR%%/boards/sounds/cs/geography/sweden.ogg
+%%DATADIR%%/boards/sounds/cs/geography/switz.ogg
+%%DATADIR%%/boards/sounds/cs/geography/turkey.ogg
+%%DATADIR%%/boards/sounds/cs/geography/ukraine.ogg
+%%DATADIR%%/boards/sounds/cs/geography/united_kingdom.ogg
+%%DATADIR%%/boards/sounds/cs/geography/uruguay.ogg
+%%DATADIR%%/boards/sounds/cs/geography/usa.ogg
+%%DATADIR%%/boards/sounds/cs/geography/venezuela.ogg
+%%DATADIR%%/boards/sounds/cs/misc/awesome.ogg
+%%DATADIR%%/boards/sounds/cs/misc/back.ogg
+%%DATADIR%%/boards/sounds/cs/misc/by.ogg
+%%DATADIR%%/boards/sounds/cs/misc/check_answer.ogg
+%%DATADIR%%/boards/sounds/cs/misc/click_on_letter.ogg
+%%DATADIR%%/boards/sounds/cs/misc/congratulation.ogg
+%%DATADIR%%/boards/sounds/cs/misc/equal.ogg
+%%DATADIR%%/boards/sounds/cs/misc/fantastic.ogg
+%%DATADIR%%/boards/sounds/cs/misc/good.ogg
+%%DATADIR%%/boards/sounds/cs/misc/great.ogg
+%%DATADIR%%/boards/sounds/cs/misc/help.ogg
+%%DATADIR%%/boards/sounds/cs/misc/level.ogg
+%%DATADIR%%/boards/sounds/cs/misc/minus.ogg
+%%DATADIR%%/boards/sounds/cs/misc/ok.ogg
+%%DATADIR%%/boards/sounds/cs/misc/perfect.ogg
+%%DATADIR%%/boards/sounds/cs/misc/plus.ogg
+%%DATADIR%%/boards/sounds/cs/misc/quit.ogg
+%%DATADIR%%/boards/sounds/cs/misc/super.ogg
+%%DATADIR%%/boards/sounds/cs/misc/waytogo.ogg
+%%DATADIR%%/boards/sounds/cs/misc/welcome.ogg
+%%DATADIR%%/boards/sounds/da/alphabet/10.ogg
+%%DATADIR%%/boards/sounds/da/alphabet/README
+%%DATADIR%%/boards/sounds/da/alphabet/U0031.ogg
+%%DATADIR%%/boards/sounds/da/alphabet/U0032.ogg
+%%DATADIR%%/boards/sounds/da/alphabet/U0033.ogg
+%%DATADIR%%/boards/sounds/da/alphabet/U0034.ogg
+%%DATADIR%%/boards/sounds/da/alphabet/U0035.ogg
+%%DATADIR%%/boards/sounds/da/alphabet/U0036.ogg
+%%DATADIR%%/boards/sounds/da/alphabet/U0037.ogg
+%%DATADIR%%/boards/sounds/da/alphabet/U0038.ogg
+%%DATADIR%%/boards/sounds/da/alphabet/U0039.ogg
+%%DATADIR%%/boards/sounds/da/alphabet/U0061.ogg
+%%DATADIR%%/boards/sounds/da/alphabet/U0062.ogg
+%%DATADIR%%/boards/sounds/da/alphabet/U0063.ogg
+%%DATADIR%%/boards/sounds/da/alphabet/U0064.ogg
+%%DATADIR%%/boards/sounds/da/alphabet/U0065.ogg
+%%DATADIR%%/boards/sounds/da/alphabet/U0066.ogg
+%%DATADIR%%/boards/sounds/da/alphabet/U0067.ogg
+%%DATADIR%%/boards/sounds/da/alphabet/U0068.ogg
+%%DATADIR%%/boards/sounds/da/alphabet/U0069.ogg
+%%DATADIR%%/boards/sounds/da/alphabet/U006A.ogg
+%%DATADIR%%/boards/sounds/da/alphabet/U006B.ogg
+%%DATADIR%%/boards/sounds/da/alphabet/U006C.ogg
+%%DATADIR%%/boards/sounds/da/alphabet/U006D.ogg
+%%DATADIR%%/boards/sounds/da/alphabet/U006E.ogg
+%%DATADIR%%/boards/sounds/da/alphabet/U006F.ogg
+%%DATADIR%%/boards/sounds/da/alphabet/U0070.ogg
+%%DATADIR%%/boards/sounds/da/alphabet/U0071.ogg
+%%DATADIR%%/boards/sounds/da/alphabet/U0072.ogg
+%%DATADIR%%/boards/sounds/da/alphabet/U0073.ogg
+%%DATADIR%%/boards/sounds/da/alphabet/U0074.ogg
+%%DATADIR%%/boards/sounds/da/alphabet/U0075.ogg
+%%DATADIR%%/boards/sounds/da/alphabet/U0076.ogg
+%%DATADIR%%/boards/sounds/da/alphabet/U0077.ogg
+%%DATADIR%%/boards/sounds/da/alphabet/U0078.ogg
+%%DATADIR%%/boards/sounds/da/alphabet/U0079.ogg
+%%DATADIR%%/boards/sounds/da/alphabet/U007A.ogg
+%%DATADIR%%/boards/sounds/da/alphabet/U00E5.ogg
+%%DATADIR%%/boards/sounds/da/alphabet/U00E6.ogg
+%%DATADIR%%/boards/sounds/da/alphabet/U00F8.ogg
+%%DATADIR%%/boards/sounds/da/colors/README
+%%DATADIR%%/boards/sounds/da/colors/black.ogg
+%%DATADIR%%/boards/sounds/da/colors/blue.ogg
+%%DATADIR%%/boards/sounds/da/colors/brown.ogg
+%%DATADIR%%/boards/sounds/da/colors/green.ogg
+%%DATADIR%%/boards/sounds/da/colors/grey.ogg
+%%DATADIR%%/boards/sounds/da/colors/orange.ogg
+%%DATADIR%%/boards/sounds/da/colors/pink.ogg
+%%DATADIR%%/boards/sounds/da/colors/purple.ogg
+%%DATADIR%%/boards/sounds/da/colors/red.ogg
+%%DATADIR%%/boards/sounds/da/colors/white.ogg
+%%DATADIR%%/boards/sounds/da/colors/yellow.ogg
+%%DATADIR%%/boards/sounds/da/geography/README
+%%DATADIR%%/boards/sounds/da/geography/alaska.ogg
+%%DATADIR%%/boards/sounds/da/geography/albania.ogg
+%%DATADIR%%/boards/sounds/da/geography/argentina.ogg
+%%DATADIR%%/boards/sounds/da/geography/austria.ogg
+%%DATADIR%%/boards/sounds/da/geography/bahamas.ogg
+%%DATADIR%%/boards/sounds/da/geography/belarus.ogg
+%%DATADIR%%/boards/sounds/da/geography/belgium.ogg
+%%DATADIR%%/boards/sounds/da/geography/bolivia.ogg
+%%DATADIR%%/boards/sounds/da/geography/bosnia_herzegovina.ogg
+%%DATADIR%%/boards/sounds/da/geography/brazil.ogg
+%%DATADIR%%/boards/sounds/da/geography/bulgaria.ogg
+%%DATADIR%%/boards/sounds/da/geography/canada.ogg
+%%DATADIR%%/boards/sounds/da/geography/chile.ogg
+%%DATADIR%%/boards/sounds/da/geography/colombia.ogg
+%%DATADIR%%/boards/sounds/da/geography/costa_rica.ogg
+%%DATADIR%%/boards/sounds/da/geography/croatia.ogg
+%%DATADIR%%/boards/sounds/da/geography/cuba.ogg
+%%DATADIR%%/boards/sounds/da/geography/cyprus.ogg
+%%DATADIR%%/boards/sounds/da/geography/czech.ogg
+%%DATADIR%%/boards/sounds/da/geography/denmark.ogg
+%%DATADIR%%/boards/sounds/da/geography/dominican_republic.ogg
+%%DATADIR%%/boards/sounds/da/geography/ecuador.ogg
+%%DATADIR%%/boards/sounds/da/geography/estonia.ogg
+%%DATADIR%%/boards/sounds/da/geography/finland.ogg
+%%DATADIR%%/boards/sounds/da/geography/france.ogg
+%%DATADIR%%/boards/sounds/da/geography/french_guiana.ogg
+%%DATADIR%%/boards/sounds/da/geography/germany.ogg
+%%DATADIR%%/boards/sounds/da/geography/greece.ogg
+%%DATADIR%%/boards/sounds/da/geography/greenland.ogg
+%%DATADIR%%/boards/sounds/da/geography/guatemala.ogg
+%%DATADIR%%/boards/sounds/da/geography/guyana.ogg
+%%DATADIR%%/boards/sounds/da/geography/haiti.ogg
+%%DATADIR%%/boards/sounds/da/geography/honduras.ogg
+%%DATADIR%%/boards/sounds/da/geography/hungary.ogg
+%%DATADIR%%/boards/sounds/da/geography/iceland.ogg
+%%DATADIR%%/boards/sounds/da/geography/ireland.ogg
+%%DATADIR%%/boards/sounds/da/geography/italy.ogg
+%%DATADIR%%/boards/sounds/da/geography/jamaica.ogg
+%%DATADIR%%/boards/sounds/da/geography/latvia.ogg
+%%DATADIR%%/boards/sounds/da/geography/lithuania.ogg
+%%DATADIR%%/boards/sounds/da/geography/luxembourg.ogg
+%%DATADIR%%/boards/sounds/da/geography/macedonia.ogg
+%%DATADIR%%/boards/sounds/da/geography/mexico.ogg
+%%DATADIR%%/boards/sounds/da/geography/moldova.ogg
+%%DATADIR%%/boards/sounds/da/geography/netherland.ogg
+%%DATADIR%%/boards/sounds/da/geography/nicaragua.ogg
+%%DATADIR%%/boards/sounds/da/geography/norway.ogg
+%%DATADIR%%/boards/sounds/da/geography/panama.ogg
+%%DATADIR%%/boards/sounds/da/geography/paraguay.ogg
+%%DATADIR%%/boards/sounds/da/geography/peru.ogg
+%%DATADIR%%/boards/sounds/da/geography/poland.ogg
+%%DATADIR%%/boards/sounds/da/geography/portugal.ogg
+%%DATADIR%%/boards/sounds/da/geography/romania.ogg
+%%DATADIR%%/boards/sounds/da/geography/russia.ogg
+%%DATADIR%%/boards/sounds/da/geography/salvador.ogg
+%%DATADIR%%/boards/sounds/da/geography/serbia_montenegro.ogg
+%%DATADIR%%/boards/sounds/da/geography/slovakia.ogg
+%%DATADIR%%/boards/sounds/da/geography/slovenia.ogg
+%%DATADIR%%/boards/sounds/da/geography/spain.ogg
+%%DATADIR%%/boards/sounds/da/geography/suriname.ogg
+%%DATADIR%%/boards/sounds/da/geography/sweden.ogg
+%%DATADIR%%/boards/sounds/da/geography/switz.ogg
+%%DATADIR%%/boards/sounds/da/geography/turkey.ogg
+%%DATADIR%%/boards/sounds/da/geography/ukraine.ogg
+%%DATADIR%%/boards/sounds/da/geography/united_kingdom.ogg
+%%DATADIR%%/boards/sounds/da/geography/uruguay.ogg
+%%DATADIR%%/boards/sounds/da/geography/usa.ogg
+%%DATADIR%%/boards/sounds/da/geography/venezuela.ogg
+%%DATADIR%%/boards/sounds/da/misc/README
+%%DATADIR%%/boards/sounds/da/misc/awesome.ogg
+%%DATADIR%%/boards/sounds/da/misc/back.ogg
+%%DATADIR%%/boards/sounds/da/misc/by.ogg
+%%DATADIR%%/boards/sounds/da/misc/click_on_letter.ogg
+%%DATADIR%%/boards/sounds/da/misc/congratulation.ogg
+%%DATADIR%%/boards/sounds/da/misc/equal.ogg
+%%DATADIR%%/boards/sounds/da/misc/fantastic.ogg
+%%DATADIR%%/boards/sounds/da/misc/good.ogg
+%%DATADIR%%/boards/sounds/da/misc/great.ogg
+%%DATADIR%%/boards/sounds/da/misc/help.ogg
+%%DATADIR%%/boards/sounds/da/misc/level.ogg
+%%DATADIR%%/boards/sounds/da/misc/minus.ogg
+%%DATADIR%%/boards/sounds/da/misc/ok.ogg
+%%DATADIR%%/boards/sounds/da/misc/outof.ogg
+%%DATADIR%%/boards/sounds/da/misc/perfect.ogg
+%%DATADIR%%/boards/sounds/da/misc/plus.ogg
+%%DATADIR%%/boards/sounds/da/misc/quit.ogg
+%%DATADIR%%/boards/sounds/da/misc/super.ogg
+%%DATADIR%%/boards/sounds/da/misc/waytogo.ogg
+%%DATADIR%%/boards/sounds/da/misc/welcome.ogg
+%%DATADIR%%/boards/sounds/darken.wav
+%%DATADIR%%/boards/sounds/de/alphabet/10.ogg
+%%DATADIR%%/boards/sounds/de/alphabet/README
+%%DATADIR%%/boards/sounds/de/alphabet/U0030.ogg
+%%DATADIR%%/boards/sounds/de/alphabet/U0031.ogg
+%%DATADIR%%/boards/sounds/de/alphabet/U0032.ogg
+%%DATADIR%%/boards/sounds/de/alphabet/U0033.ogg
+%%DATADIR%%/boards/sounds/de/alphabet/U0034.ogg
+%%DATADIR%%/boards/sounds/de/alphabet/U0035.ogg
+%%DATADIR%%/boards/sounds/de/alphabet/U0036.ogg
+%%DATADIR%%/boards/sounds/de/alphabet/U0037.ogg
+%%DATADIR%%/boards/sounds/de/alphabet/U0038.ogg
+%%DATADIR%%/boards/sounds/de/alphabet/U0039.ogg
+%%DATADIR%%/boards/sounds/de/alphabet/U0061.ogg
+%%DATADIR%%/boards/sounds/de/alphabet/U0062.ogg
+%%DATADIR%%/boards/sounds/de/alphabet/U0063.ogg
+%%DATADIR%%/boards/sounds/de/alphabet/U0064.ogg
+%%DATADIR%%/boards/sounds/de/alphabet/U0065.ogg
+%%DATADIR%%/boards/sounds/de/alphabet/U0066.ogg
+%%DATADIR%%/boards/sounds/de/alphabet/U0067.ogg
+%%DATADIR%%/boards/sounds/de/alphabet/U0068.ogg
+%%DATADIR%%/boards/sounds/de/alphabet/U0069.ogg
+%%DATADIR%%/boards/sounds/de/alphabet/U006A.ogg
+%%DATADIR%%/boards/sounds/de/alphabet/U006B.ogg
+%%DATADIR%%/boards/sounds/de/alphabet/U006C.ogg
+%%DATADIR%%/boards/sounds/de/alphabet/U006D.ogg
+%%DATADIR%%/boards/sounds/de/alphabet/U006E.ogg
+%%DATADIR%%/boards/sounds/de/alphabet/U006F.ogg
+%%DATADIR%%/boards/sounds/de/alphabet/U0070.ogg
+%%DATADIR%%/boards/sounds/de/alphabet/U0071.ogg
+%%DATADIR%%/boards/sounds/de/alphabet/U0072.ogg
+%%DATADIR%%/boards/sounds/de/alphabet/U0073.ogg
+%%DATADIR%%/boards/sounds/de/alphabet/U0074.ogg
+%%DATADIR%%/boards/sounds/de/alphabet/U0075.ogg
+%%DATADIR%%/boards/sounds/de/alphabet/U0076.ogg
+%%DATADIR%%/boards/sounds/de/alphabet/U0077.ogg
+%%DATADIR%%/boards/sounds/de/alphabet/U0078.ogg
+%%DATADIR%%/boards/sounds/de/alphabet/U0079.ogg
+%%DATADIR%%/boards/sounds/de/alphabet/U007A.ogg
+%%DATADIR%%/boards/sounds/de/colors/README
+%%DATADIR%%/boards/sounds/de/colors/black.ogg
+%%DATADIR%%/boards/sounds/de/colors/blue.ogg
+%%DATADIR%%/boards/sounds/de/colors/brown.ogg
+%%DATADIR%%/boards/sounds/de/colors/green.ogg
+%%DATADIR%%/boards/sounds/de/colors/grey.ogg
+%%DATADIR%%/boards/sounds/de/colors/orange.ogg
+%%DATADIR%%/boards/sounds/de/colors/purple.ogg
+%%DATADIR%%/boards/sounds/de/colors/red.ogg
+%%DATADIR%%/boards/sounds/de/colors/white.ogg
+%%DATADIR%%/boards/sounds/de/colors/yellow.ogg
+%%DATADIR%%/boards/sounds/de/misc/README
+%%DATADIR%%/boards/sounds/de/misc/back.ogg
+%%DATADIR%%/boards/sounds/de/misc/by.ogg
+%%DATADIR%%/boards/sounds/de/misc/click_on_letter.ogg
+%%DATADIR%%/boards/sounds/de/misc/congratulation.ogg
+%%DATADIR%%/boards/sounds/de/misc/equal.ogg
+%%DATADIR%%/boards/sounds/de/misc/good.ogg
+%%DATADIR%%/boards/sounds/de/misc/great.ogg
+%%DATADIR%%/boards/sounds/de/misc/help.ogg
+%%DATADIR%%/boards/sounds/de/misc/level.ogg
+%%DATADIR%%/boards/sounds/de/misc/minus.ogg
+%%DATADIR%%/boards/sounds/de/misc/ok.ogg
+%%DATADIR%%/boards/sounds/de/misc/outof.ogg
+%%DATADIR%%/boards/sounds/de/misc/plus.ogg
+%%DATADIR%%/boards/sounds/de/misc/quit.ogg
+%%DATADIR%%/boards/sounds/de/misc/super.ogg
+%%DATADIR%%/boards/sounds/de/misc/welcome.ogg
+%%DATADIR%%/boards/sounds/drip.wav
+%%DATADIR%%/boards/sounds/eat.wav
+%%DATADIR%%/boards/sounds/el/alphabet/10.ogg
+%%DATADIR%%/boards/sounds/el/alphabet/README
+%%DATADIR%%/boards/sounds/el/alphabet/U0030.ogg
+%%DATADIR%%/boards/sounds/el/alphabet/U0031.ogg
+%%DATADIR%%/boards/sounds/el/alphabet/U0032.ogg
+%%DATADIR%%/boards/sounds/el/alphabet/U0033.ogg
+%%DATADIR%%/boards/sounds/el/alphabet/U0034.ogg
+%%DATADIR%%/boards/sounds/el/alphabet/U0035.ogg
+%%DATADIR%%/boards/sounds/el/alphabet/U0036.ogg
+%%DATADIR%%/boards/sounds/el/alphabet/U0037.ogg
+%%DATADIR%%/boards/sounds/el/alphabet/U0038.ogg
+%%DATADIR%%/boards/sounds/el/alphabet/U0039.ogg
+%%DATADIR%%/boards/sounds/el/alphabet/U0391.ogg
+%%DATADIR%%/boards/sounds/el/alphabet/U0392.ogg
+%%DATADIR%%/boards/sounds/el/alphabet/U0393.ogg
+%%DATADIR%%/boards/sounds/el/alphabet/U0394.ogg
+%%DATADIR%%/boards/sounds/el/alphabet/U0395.ogg
+%%DATADIR%%/boards/sounds/el/alphabet/U0396.ogg
+%%DATADIR%%/boards/sounds/el/alphabet/U0397.ogg
+%%DATADIR%%/boards/sounds/el/alphabet/U0398.ogg
+%%DATADIR%%/boards/sounds/el/alphabet/U0399.ogg
+%%DATADIR%%/boards/sounds/el/alphabet/U039A.ogg
+%%DATADIR%%/boards/sounds/el/alphabet/U039B.ogg
+%%DATADIR%%/boards/sounds/el/alphabet/U039C.ogg
+%%DATADIR%%/boards/sounds/el/alphabet/U039D.ogg
+%%DATADIR%%/boards/sounds/el/alphabet/U039E.ogg
+%%DATADIR%%/boards/sounds/el/alphabet/U039F.ogg
+%%DATADIR%%/boards/sounds/el/alphabet/U03A0.ogg
+%%DATADIR%%/boards/sounds/el/alphabet/U03A1.ogg
+%%DATADIR%%/boards/sounds/el/alphabet/U03A3.ogg
+%%DATADIR%%/boards/sounds/el/alphabet/U03A4.ogg
+%%DATADIR%%/boards/sounds/el/alphabet/U03A5.ogg
+%%DATADIR%%/boards/sounds/el/alphabet/U03A6.ogg
+%%DATADIR%%/boards/sounds/el/alphabet/U03A7.ogg
+%%DATADIR%%/boards/sounds/el/alphabet/U03A8.ogg
+%%DATADIR%%/boards/sounds/el/alphabet/U03A9.ogg
+%%DATADIR%%/boards/sounds/el/alphabet/U03B1.ogg
+%%DATADIR%%/boards/sounds/el/alphabet/U03B2.ogg
+%%DATADIR%%/boards/sounds/el/alphabet/U03B3.ogg
+%%DATADIR%%/boards/sounds/el/alphabet/U03B4.ogg
+%%DATADIR%%/boards/sounds/el/alphabet/U03B5.ogg
+%%DATADIR%%/boards/sounds/el/alphabet/U03B6.ogg
+%%DATADIR%%/boards/sounds/el/alphabet/U03B7.ogg
+%%DATADIR%%/boards/sounds/el/alphabet/U03B8.ogg
+%%DATADIR%%/boards/sounds/el/alphabet/U03B9.ogg
+%%DATADIR%%/boards/sounds/el/alphabet/U03BA.ogg
+%%DATADIR%%/boards/sounds/el/alphabet/U03BB.ogg
+%%DATADIR%%/boards/sounds/el/alphabet/U03BC.ogg
+%%DATADIR%%/boards/sounds/el/alphabet/U03BD.ogg
+%%DATADIR%%/boards/sounds/el/alphabet/U03BE.ogg
+%%DATADIR%%/boards/sounds/el/alphabet/U03BF.ogg
+%%DATADIR%%/boards/sounds/el/alphabet/U03C0.ogg
+%%DATADIR%%/boards/sounds/el/alphabet/U03C1.ogg
+%%DATADIR%%/boards/sounds/el/alphabet/U03C3.ogg
+%%DATADIR%%/boards/sounds/el/alphabet/U03C4.ogg
+%%DATADIR%%/boards/sounds/el/alphabet/U03C5.ogg
+%%DATADIR%%/boards/sounds/el/alphabet/U03C6.ogg
+%%DATADIR%%/boards/sounds/el/alphabet/U03C7.ogg
+%%DATADIR%%/boards/sounds/el/alphabet/U03C8.ogg
+%%DATADIR%%/boards/sounds/el/alphabet/U03C9.ogg
+%%DATADIR%%/boards/sounds/el/colors/black.ogg
+%%DATADIR%%/boards/sounds/el/colors/blue.ogg
+%%DATADIR%%/boards/sounds/el/colors/brown.ogg
+%%DATADIR%%/boards/sounds/el/colors/green.ogg
+%%DATADIR%%/boards/sounds/el/colors/grey.ogg
+%%DATADIR%%/boards/sounds/el/colors/orange.ogg
+%%DATADIR%%/boards/sounds/el/colors/pink.ogg
+%%DATADIR%%/boards/sounds/el/colors/purple.ogg
+%%DATADIR%%/boards/sounds/el/colors/red.ogg
+%%DATADIR%%/boards/sounds/el/colors/white.ogg
+%%DATADIR%%/boards/sounds/el/colors/yellow.ogg
+%%DATADIR%%/boards/sounds/el/geography/africa.ogg
+%%DATADIR%%/boards/sounds/el/geography/alaska.ogg
+%%DATADIR%%/boards/sounds/el/geography/albania.ogg
+%%DATADIR%%/boards/sounds/el/geography/algeria.ogg
+%%DATADIR%%/boards/sounds/el/geography/america.ogg
+%%DATADIR%%/boards/sounds/el/geography/angola.ogg
+%%DATADIR%%/boards/sounds/el/geography/antartica.ogg
+%%DATADIR%%/boards/sounds/el/geography/argentina.ogg
+%%DATADIR%%/boards/sounds/el/geography/asia.ogg
+%%DATADIR%%/boards/sounds/el/geography/austria.ogg
+%%DATADIR%%/boards/sounds/el/geography/bahamas.ogg
+%%DATADIR%%/boards/sounds/el/geography/basse_normandie.ogg
+%%DATADIR%%/boards/sounds/el/geography/belarus.ogg
+%%DATADIR%%/boards/sounds/el/geography/belgium.ogg
+%%DATADIR%%/boards/sounds/el/geography/benin.ogg
+%%DATADIR%%/boards/sounds/el/geography/bolivia.ogg
+%%DATADIR%%/boards/sounds/el/geography/bosnia_herzegovina.ogg
+%%DATADIR%%/boards/sounds/el/geography/botswana.ogg
+%%DATADIR%%/boards/sounds/el/geography/brazil.ogg
+%%DATADIR%%/boards/sounds/el/geography/bulgaria.ogg
+%%DATADIR%%/boards/sounds/el/geography/burkina.ogg
+%%DATADIR%%/boards/sounds/el/geography/burundi.ogg
+%%DATADIR%%/boards/sounds/el/geography/cameroon.ogg
+%%DATADIR%%/boards/sounds/el/geography/canada.ogg
+%%DATADIR%%/boards/sounds/el/geography/central_african_republic.ogg
+%%DATADIR%%/boards/sounds/el/geography/chad.ogg
+%%DATADIR%%/boards/sounds/el/geography/chile.ogg
+%%DATADIR%%/boards/sounds/el/geography/colombia.ogg
+%%DATADIR%%/boards/sounds/el/geography/congo.ogg
+%%DATADIR%%/boards/sounds/el/geography/costa_rica.ogg
+%%DATADIR%%/boards/sounds/el/geography/croatia.ogg
+%%DATADIR%%/boards/sounds/el/geography/cuba.ogg
+%%DATADIR%%/boards/sounds/el/geography/cyprus.ogg
+%%DATADIR%%/boards/sounds/el/geography/czech.ogg
+%%DATADIR%%/boards/sounds/el/geography/denmark.ogg
+%%DATADIR%%/boards/sounds/el/geography/dijibouti.ogg
+%%DATADIR%%/boards/sounds/el/geography/djibouti.ogg
+%%DATADIR%%/boards/sounds/el/geography/dominican_republic.ogg
+%%DATADIR%%/boards/sounds/el/geography/ecuador.ogg
+%%DATADIR%%/boards/sounds/el/geography/egypt.ogg
+%%DATADIR%%/boards/sounds/el/geography/equatorial_guinea.ogg
+%%DATADIR%%/boards/sounds/el/geography/eritrea.ogg
+%%DATADIR%%/boards/sounds/el/geography/estonia.ogg
+%%DATADIR%%/boards/sounds/el/geography/ethiopia.ogg
+%%DATADIR%%/boards/sounds/el/geography/europe.ogg
+%%DATADIR%%/boards/sounds/el/geography/finland.ogg
+%%DATADIR%%/boards/sounds/el/geography/france.ogg
+%%DATADIR%%/boards/sounds/el/geography/french_guiana.ogg
+%%DATADIR%%/boards/sounds/el/geography/gabon.ogg
+%%DATADIR%%/boards/sounds/el/geography/gambia.ogg
+%%DATADIR%%/boards/sounds/el/geography/germany.ogg
+%%DATADIR%%/boards/sounds/el/geography/ghana.ogg
+%%DATADIR%%/boards/sounds/el/geography/greece.ogg
+%%DATADIR%%/boards/sounds/el/geography/greenland.ogg
+%%DATADIR%%/boards/sounds/el/geography/guatemala.ogg
+%%DATADIR%%/boards/sounds/el/geography/guinea.ogg
+%%DATADIR%%/boards/sounds/el/geography/guinea_bissau.ogg
+%%DATADIR%%/boards/sounds/el/geography/guyana.ogg
+%%DATADIR%%/boards/sounds/el/geography/haiti.ogg
+%%DATADIR%%/boards/sounds/el/geography/honduras.ogg
+%%DATADIR%%/boards/sounds/el/geography/hungary.ogg
+%%DATADIR%%/boards/sounds/el/geography/iceland.ogg
+%%DATADIR%%/boards/sounds/el/geography/ireland.ogg
+%%DATADIR%%/boards/sounds/el/geography/italy.ogg
+%%DATADIR%%/boards/sounds/el/geography/ivory_coast.ogg
+%%DATADIR%%/boards/sounds/el/geography/jamaica.ogg
+%%DATADIR%%/boards/sounds/el/geography/kenya.ogg
+%%DATADIR%%/boards/sounds/el/geography/latvia.ogg
+%%DATADIR%%/boards/sounds/el/geography/lesotho.ogg
+%%DATADIR%%/boards/sounds/el/geography/liberia.ogg
+%%DATADIR%%/boards/sounds/el/geography/libya.ogg
+%%DATADIR%%/boards/sounds/el/geography/lithuania.ogg
+%%DATADIR%%/boards/sounds/el/geography/luxembourg.ogg
+%%DATADIR%%/boards/sounds/el/geography/macedonia.ogg
+%%DATADIR%%/boards/sounds/el/geography/madagascar.ogg
+%%DATADIR%%/boards/sounds/el/geography/malawi.ogg
+%%DATADIR%%/boards/sounds/el/geography/mali.ogg
+%%DATADIR%%/boards/sounds/el/geography/mauritania.ogg
+%%DATADIR%%/boards/sounds/el/geography/mexico.ogg
+%%DATADIR%%/boards/sounds/el/geography/moldavia.ogg
+%%DATADIR%%/boards/sounds/el/geography/moldova.ogg
+%%DATADIR%%/boards/sounds/el/geography/moroco.ogg
+%%DATADIR%%/boards/sounds/el/geography/mozambique.ogg
+%%DATADIR%%/boards/sounds/el/geography/nambia.ogg
+%%DATADIR%%/boards/sounds/el/geography/namibia.ogg
+%%DATADIR%%/boards/sounds/el/geography/netherland.ogg
+%%DATADIR%%/boards/sounds/el/geography/nicaragua.ogg
+%%DATADIR%%/boards/sounds/el/geography/niger.ogg
+%%DATADIR%%/boards/sounds/el/geography/nigeria.ogg
+%%DATADIR%%/boards/sounds/el/geography/north_america.ogg
+%%DATADIR%%/boards/sounds/el/geography/norway.ogg
+%%DATADIR%%/boards/sounds/el/geography/oceania.ogg
+%%DATADIR%%/boards/sounds/el/geography/panama.ogg
+%%DATADIR%%/boards/sounds/el/geography/paraguay.ogg
+%%DATADIR%%/boards/sounds/el/geography/peru.ogg
+%%DATADIR%%/boards/sounds/el/geography/poland.ogg
+%%DATADIR%%/boards/sounds/el/geography/portugal.ogg
+%%DATADIR%%/boards/sounds/el/geography/republic_of_congo.ogg
+%%DATADIR%%/boards/sounds/el/geography/romania.ogg
+%%DATADIR%%/boards/sounds/el/geography/russia.ogg
+%%DATADIR%%/boards/sounds/el/geography/rwanda.ogg
+%%DATADIR%%/boards/sounds/el/geography/salvador.ogg
+%%DATADIR%%/boards/sounds/el/geography/senegal.ogg
+%%DATADIR%%/boards/sounds/el/geography/serbia_montenegro.ogg
+%%DATADIR%%/boards/sounds/el/geography/sierra_leone.ogg
+%%DATADIR%%/boards/sounds/el/geography/slovakia.ogg
+%%DATADIR%%/boards/sounds/el/geography/slovenia.ogg
+%%DATADIR%%/boards/sounds/el/geography/somalia.ogg
+%%DATADIR%%/boards/sounds/el/geography/soudan.ogg
+%%DATADIR%%/boards/sounds/el/geography/south_africa.ogg
+%%DATADIR%%/boards/sounds/el/geography/south_america.ogg
+%%DATADIR%%/boards/sounds/el/geography/spain.ogg
+%%DATADIR%%/boards/sounds/el/geography/suriname.ogg
+%%DATADIR%%/boards/sounds/el/geography/swaziland.ogg
+%%DATADIR%%/boards/sounds/el/geography/sweden.ogg
+%%DATADIR%%/boards/sounds/el/geography/switz.ogg
+%%DATADIR%%/boards/sounds/el/geography/tanzania.ogg
+%%DATADIR%%/boards/sounds/el/geography/togo.ogg
+%%DATADIR%%/boards/sounds/el/geography/tunisia.ogg
+%%DATADIR%%/boards/sounds/el/geography/turkey.ogg
+%%DATADIR%%/boards/sounds/el/geography/uganda.ogg
+%%DATADIR%%/boards/sounds/el/geography/ukraine.ogg
+%%DATADIR%%/boards/sounds/el/geography/united_kingdom.ogg
+%%DATADIR%%/boards/sounds/el/geography/uruguay.ogg
+%%DATADIR%%/boards/sounds/el/geography/usa.ogg
+%%DATADIR%%/boards/sounds/el/geography/venezuela.ogg
+%%DATADIR%%/boards/sounds/el/geography/zambia.ogg
+%%DATADIR%%/boards/sounds/el/geography/zimbabwe.ogg
+%%DATADIR%%/boards/sounds/el/misc/about.ogg
+%%DATADIR%%/boards/sounds/el/misc/awesome.ogg
+%%DATADIR%%/boards/sounds/el/misc/back.ogg
+%%DATADIR%%/boards/sounds/el/misc/by.ogg
+%%DATADIR%%/boards/sounds/el/misc/check_answer.ogg
+%%DATADIR%%/boards/sounds/el/misc/click_on_letter.ogg
+%%DATADIR%%/boards/sounds/el/misc/configuration.ogg
+%%DATADIR%%/boards/sounds/el/misc/congratulations.ogg
+%%DATADIR%%/boards/sounds/el/misc/equal.ogg
+%%DATADIR%%/boards/sounds/el/misc/fantastic.ogg
+%%DATADIR%%/boards/sounds/el/misc/good.ogg
+%%DATADIR%%/boards/sounds/el/misc/great.ogg
+%%DATADIR%%/boards/sounds/el/misc/help.ogg
+%%DATADIR%%/boards/sounds/el/misc/level.ogg
+%%DATADIR%%/boards/sounds/el/misc/minus.ogg
+%%DATADIR%%/boards/sounds/el/misc/ok.ogg
+%%DATADIR%%/boards/sounds/el/misc/outof.ogg
+%%DATADIR%%/boards/sounds/el/misc/perfect.ogg
+%%DATADIR%%/boards/sounds/el/misc/plus.ogg
+%%DATADIR%%/boards/sounds/el/misc/quit.ogg
+%%DATADIR%%/boards/sounds/el/misc/super.ogg
+%%DATADIR%%/boards/sounds/el/misc/waytogo.ogg
+%%DATADIR%%/boards/sounds/el/misc/welcome.ogg
+%%DATADIR%%/boards/sounds/en/alphabet/10.ogg
+%%DATADIR%%/boards/sounds/en/alphabet/README
+%%DATADIR%%/boards/sounds/en/alphabet/U0030.ogg
+%%DATADIR%%/boards/sounds/en/alphabet/U0031.ogg
+%%DATADIR%%/boards/sounds/en/alphabet/U0032.ogg
+%%DATADIR%%/boards/sounds/en/alphabet/U0033.ogg
+%%DATADIR%%/boards/sounds/en/alphabet/U0034.ogg
+%%DATADIR%%/boards/sounds/en/alphabet/U0035.ogg
+%%DATADIR%%/boards/sounds/en/alphabet/U0036.ogg
+%%DATADIR%%/boards/sounds/en/alphabet/U0037.ogg
+%%DATADIR%%/boards/sounds/en/alphabet/U0038.ogg
+%%DATADIR%%/boards/sounds/en/alphabet/U0039.ogg
+%%DATADIR%%/boards/sounds/en/alphabet/U0061.ogg
+%%DATADIR%%/boards/sounds/en/alphabet/U0062.ogg
+%%DATADIR%%/boards/sounds/en/alphabet/U0063.ogg
+%%DATADIR%%/boards/sounds/en/alphabet/U0064.ogg
+%%DATADIR%%/boards/sounds/en/alphabet/U0065.ogg
+%%DATADIR%%/boards/sounds/en/alphabet/U0066.ogg
+%%DATADIR%%/boards/sounds/en/alphabet/U0067.ogg
+%%DATADIR%%/boards/sounds/en/alphabet/U0068.ogg
+%%DATADIR%%/boards/sounds/en/alphabet/U0069.ogg
+%%DATADIR%%/boards/sounds/en/alphabet/U006A.ogg
+%%DATADIR%%/boards/sounds/en/alphabet/U006B.ogg
+%%DATADIR%%/boards/sounds/en/alphabet/U006C.ogg
+%%DATADIR%%/boards/sounds/en/alphabet/U006D.ogg
+%%DATADIR%%/boards/sounds/en/alphabet/U006E.ogg
+%%DATADIR%%/boards/sounds/en/alphabet/U006F.ogg
+%%DATADIR%%/boards/sounds/en/alphabet/U0070.ogg
+%%DATADIR%%/boards/sounds/en/alphabet/U0071.ogg
+%%DATADIR%%/boards/sounds/en/alphabet/U0072.ogg
+%%DATADIR%%/boards/sounds/en/alphabet/U0073.ogg
+%%DATADIR%%/boards/sounds/en/alphabet/U0074.ogg
+%%DATADIR%%/boards/sounds/en/alphabet/U0075.ogg
+%%DATADIR%%/boards/sounds/en/alphabet/U0076.ogg
+%%DATADIR%%/boards/sounds/en/alphabet/U0077.ogg
+%%DATADIR%%/boards/sounds/en/alphabet/U0078.ogg
+%%DATADIR%%/boards/sounds/en/alphabet/U0079.ogg
+%%DATADIR%%/boards/sounds/en/alphabet/U007A.ogg
+%%DATADIR%%/boards/sounds/en/colors/README
+%%DATADIR%%/boards/sounds/en/colors/black.ogg
+%%DATADIR%%/boards/sounds/en/colors/blue.ogg
+%%DATADIR%%/boards/sounds/en/colors/brown.ogg
+%%DATADIR%%/boards/sounds/en/colors/green.ogg
+%%DATADIR%%/boards/sounds/en/colors/grey.ogg
+%%DATADIR%%/boards/sounds/en/colors/orange.ogg
+%%DATADIR%%/boards/sounds/en/colors/pink.ogg
+%%DATADIR%%/boards/sounds/en/colors/purple.ogg
+%%DATADIR%%/boards/sounds/en/colors/red.ogg
+%%DATADIR%%/boards/sounds/en/colors/white.ogg
+%%DATADIR%%/boards/sounds/en/colors/yellow.ogg
+%%DATADIR%%/boards/sounds/en/geography/README
+%%DATADIR%%/boards/sounds/en/geography/alaska.ogg
+%%DATADIR%%/boards/sounds/en/geography/albania.ogg
+%%DATADIR%%/boards/sounds/en/geography/argentina.ogg
+%%DATADIR%%/boards/sounds/en/geography/austria.ogg
+%%DATADIR%%/boards/sounds/en/geography/bahamas.ogg
+%%DATADIR%%/boards/sounds/en/geography/belarus.ogg
+%%DATADIR%%/boards/sounds/en/geography/belgium.ogg
+%%DATADIR%%/boards/sounds/en/geography/bolivia.ogg
+%%DATADIR%%/boards/sounds/en/geography/bosnia_herzegovina.ogg
+%%DATADIR%%/boards/sounds/en/geography/brazil.ogg
+%%DATADIR%%/boards/sounds/en/geography/bulgaria.ogg
+%%DATADIR%%/boards/sounds/en/geography/canada.ogg
+%%DATADIR%%/boards/sounds/en/geography/chile.ogg
+%%DATADIR%%/boards/sounds/en/geography/colombia.ogg
+%%DATADIR%%/boards/sounds/en/geography/costa_rica.ogg
+%%DATADIR%%/boards/sounds/en/geography/croatia.ogg
+%%DATADIR%%/boards/sounds/en/geography/cuba.ogg
+%%DATADIR%%/boards/sounds/en/geography/cyprus.ogg
+%%DATADIR%%/boards/sounds/en/geography/czech.ogg
+%%DATADIR%%/boards/sounds/en/geography/denmark.ogg
+%%DATADIR%%/boards/sounds/en/geography/dominican_republic.ogg
+%%DATADIR%%/boards/sounds/en/geography/ecuador.ogg
+%%DATADIR%%/boards/sounds/en/geography/estonia.ogg
+%%DATADIR%%/boards/sounds/en/geography/france.ogg
+%%DATADIR%%/boards/sounds/en/geography/french_guiana.ogg
+%%DATADIR%%/boards/sounds/en/geography/germany.ogg
+%%DATADIR%%/boards/sounds/en/geography/greece.ogg
+%%DATADIR%%/boards/sounds/en/geography/greenland.ogg
+%%DATADIR%%/boards/sounds/en/geography/guatemala.ogg
+%%DATADIR%%/boards/sounds/en/geography/guyana.ogg
+%%DATADIR%%/boards/sounds/en/geography/haiti.ogg
+%%DATADIR%%/boards/sounds/en/geography/honduras.ogg
+%%DATADIR%%/boards/sounds/en/geography/hungary.ogg
+%%DATADIR%%/boards/sounds/en/geography/iceland.ogg
+%%DATADIR%%/boards/sounds/en/geography/ireland.ogg
+%%DATADIR%%/boards/sounds/en/geography/italy.ogg
+%%DATADIR%%/boards/sounds/en/geography/jamaica.ogg
+%%DATADIR%%/boards/sounds/en/geography/latvia.ogg
+%%DATADIR%%/boards/sounds/en/geography/lithuania.ogg
+%%DATADIR%%/boards/sounds/en/geography/luxembourg.ogg
+%%DATADIR%%/boards/sounds/en/geography/macedonia.ogg
+%%DATADIR%%/boards/sounds/en/geography/mexico.ogg
+%%DATADIR%%/boards/sounds/en/geography/moldova.ogg
+%%DATADIR%%/boards/sounds/en/geography/netherland.ogg
+%%DATADIR%%/boards/sounds/en/geography/nicaragua.ogg
+%%DATADIR%%/boards/sounds/en/geography/norway.ogg
+%%DATADIR%%/boards/sounds/en/geography/panama.ogg
+%%DATADIR%%/boards/sounds/en/geography/paraguay.ogg
+%%DATADIR%%/boards/sounds/en/geography/peru.ogg
+%%DATADIR%%/boards/sounds/en/geography/poland.ogg
+%%DATADIR%%/boards/sounds/en/geography/portugal.ogg
+%%DATADIR%%/boards/sounds/en/geography/romania.ogg
+%%DATADIR%%/boards/sounds/en/geography/russia.ogg
+%%DATADIR%%/boards/sounds/en/geography/salvador.ogg
+%%DATADIR%%/boards/sounds/en/geography/serbia_montenegro.ogg
+%%DATADIR%%/boards/sounds/en/geography/slovakia.ogg
+%%DATADIR%%/boards/sounds/en/geography/slovenia.ogg
+%%DATADIR%%/boards/sounds/en/geography/spain.ogg
+%%DATADIR%%/boards/sounds/en/geography/suriname.ogg
+%%DATADIR%%/boards/sounds/en/geography/sweden.ogg
+%%DATADIR%%/boards/sounds/en/geography/switz.ogg
+%%DATADIR%%/boards/sounds/en/geography/turkey.ogg
+%%DATADIR%%/boards/sounds/en/geography/ukraine.ogg
+%%DATADIR%%/boards/sounds/en/geography/united_kingdom.ogg
+%%DATADIR%%/boards/sounds/en/geography/uruguay.ogg
+%%DATADIR%%/boards/sounds/en/geography/usa.ogg
+%%DATADIR%%/boards/sounds/en/geography/venezuela.ogg
+%%DATADIR%%/boards/sounds/en/misc/README
+%%DATADIR%%/boards/sounds/en/misc/awesome.ogg
+%%DATADIR%%/boards/sounds/en/misc/back.ogg
+%%DATADIR%%/boards/sounds/en/misc/by.ogg
+%%DATADIR%%/boards/sounds/en/misc/check_answer.ogg
+%%DATADIR%%/boards/sounds/en/misc/click_on_letter.ogg
+%%DATADIR%%/boards/sounds/en/misc/congratulation.ogg
+%%DATADIR%%/boards/sounds/en/misc/equal.ogg
+%%DATADIR%%/boards/sounds/en/misc/fantastic.ogg
+%%DATADIR%%/boards/sounds/en/misc/good.ogg
+%%DATADIR%%/boards/sounds/en/misc/great.ogg
+%%DATADIR%%/boards/sounds/en/misc/help.ogg
+%%DATADIR%%/boards/sounds/en/misc/level.ogg
+%%DATADIR%%/boards/sounds/en/misc/minus.ogg
+%%DATADIR%%/boards/sounds/en/misc/ok.ogg
+%%DATADIR%%/boards/sounds/en/misc/outof.ogg
+%%DATADIR%%/boards/sounds/en/misc/perfect.ogg
+%%DATADIR%%/boards/sounds/en/misc/plus.ogg
+%%DATADIR%%/boards/sounds/en/misc/quit.ogg
+%%DATADIR%%/boards/sounds/en/misc/super.ogg
+%%DATADIR%%/boards/sounds/en/misc/waytogo.ogg
+%%DATADIR%%/boards/sounds/en/misc/welcome.ogg
+%%DATADIR%%/boards/sounds/eraser1.wav
+%%DATADIR%%/boards/sounds/eraser2.wav
+%%DATADIR%%/boards/sounds/es/alphabet/10.ogg
+%%DATADIR%%/boards/sounds/es/alphabet/README
+%%DATADIR%%/boards/sounds/es/alphabet/U0030.ogg
+%%DATADIR%%/boards/sounds/es/alphabet/U0031.ogg
+%%DATADIR%%/boards/sounds/es/alphabet/U0032.ogg
+%%DATADIR%%/boards/sounds/es/alphabet/U0033.ogg
+%%DATADIR%%/boards/sounds/es/alphabet/U0034.ogg
+%%DATADIR%%/boards/sounds/es/alphabet/U0035.ogg
+%%DATADIR%%/boards/sounds/es/alphabet/U0036.ogg
+%%DATADIR%%/boards/sounds/es/alphabet/U0037.ogg
+%%DATADIR%%/boards/sounds/es/alphabet/U0038.ogg
+%%DATADIR%%/boards/sounds/es/alphabet/U0039.ogg
+%%DATADIR%%/boards/sounds/es/alphabet/U0061.ogg
+%%DATADIR%%/boards/sounds/es/alphabet/U0062.ogg
+%%DATADIR%%/boards/sounds/es/alphabet/U0063.ogg
+%%DATADIR%%/boards/sounds/es/alphabet/U0064.ogg
+%%DATADIR%%/boards/sounds/es/alphabet/U0065.ogg
+%%DATADIR%%/boards/sounds/es/alphabet/U0066.ogg
+%%DATADIR%%/boards/sounds/es/alphabet/U0067.ogg
+%%DATADIR%%/boards/sounds/es/alphabet/U0068.ogg
+%%DATADIR%%/boards/sounds/es/alphabet/U0069.ogg
+%%DATADIR%%/boards/sounds/es/alphabet/U006A.ogg
+%%DATADIR%%/boards/sounds/es/alphabet/U006B.ogg
+%%DATADIR%%/boards/sounds/es/alphabet/U006C.ogg
+%%DATADIR%%/boards/sounds/es/alphabet/U006D.ogg
+%%DATADIR%%/boards/sounds/es/alphabet/U006E.ogg
+%%DATADIR%%/boards/sounds/es/alphabet/U006F.ogg
+%%DATADIR%%/boards/sounds/es/alphabet/U0070.ogg
+%%DATADIR%%/boards/sounds/es/alphabet/U0071.ogg
+%%DATADIR%%/boards/sounds/es/alphabet/U0072.ogg
+%%DATADIR%%/boards/sounds/es/alphabet/U0073.ogg
+%%DATADIR%%/boards/sounds/es/alphabet/U0074.ogg
+%%DATADIR%%/boards/sounds/es/alphabet/U0075.ogg
+%%DATADIR%%/boards/sounds/es/alphabet/U0076.ogg
+%%DATADIR%%/boards/sounds/es/alphabet/U0077.ogg
+%%DATADIR%%/boards/sounds/es/alphabet/U0078.ogg
+%%DATADIR%%/boards/sounds/es/alphabet/U0079.ogg
+%%DATADIR%%/boards/sounds/es/alphabet/U007A.ogg
+%%DATADIR%%/boards/sounds/es/colors/README
+%%DATADIR%%/boards/sounds/es/colors/black.ogg
+%%DATADIR%%/boards/sounds/es/colors/blue.ogg
+%%DATADIR%%/boards/sounds/es/colors/brown.ogg
+%%DATADIR%%/boards/sounds/es/colors/green.ogg
+%%DATADIR%%/boards/sounds/es/colors/grey.ogg
+%%DATADIR%%/boards/sounds/es/colors/orange.ogg
+%%DATADIR%%/boards/sounds/es/colors/purple.ogg
+%%DATADIR%%/boards/sounds/es/colors/red.ogg
+%%DATADIR%%/boards/sounds/es/colors/white.ogg
+%%DATADIR%%/boards/sounds/es/colors/yellow.ogg
+%%DATADIR%%/boards/sounds/es/geography/README
+%%DATADIR%%/boards/sounds/es/geography/alaska.ogg
+%%DATADIR%%/boards/sounds/es/geography/albania.ogg
+%%DATADIR%%/boards/sounds/es/geography/argentina.ogg
+%%DATADIR%%/boards/sounds/es/geography/austria.ogg
+%%DATADIR%%/boards/sounds/es/geography/bahamas.ogg
+%%DATADIR%%/boards/sounds/es/geography/belarus.ogg
+%%DATADIR%%/boards/sounds/es/geography/belgium.ogg
+%%DATADIR%%/boards/sounds/es/geography/bolivia.ogg
+%%DATADIR%%/boards/sounds/es/geography/bosnia_herzegovina.ogg
+%%DATADIR%%/boards/sounds/es/geography/brazil.ogg
+%%DATADIR%%/boards/sounds/es/geography/bulgaria.ogg
+%%DATADIR%%/boards/sounds/es/geography/canada.ogg
+%%DATADIR%%/boards/sounds/es/geography/chile.ogg
+%%DATADIR%%/boards/sounds/es/geography/colombia.ogg
+%%DATADIR%%/boards/sounds/es/geography/costa_rica.ogg
+%%DATADIR%%/boards/sounds/es/geography/croatia.ogg
+%%DATADIR%%/boards/sounds/es/geography/cuba.ogg
+%%DATADIR%%/boards/sounds/es/geography/cyprus.ogg
+%%DATADIR%%/boards/sounds/es/geography/czech.ogg
+%%DATADIR%%/boards/sounds/es/geography/denmark.ogg
+%%DATADIR%%/boards/sounds/es/geography/dominican_republic.ogg
+%%DATADIR%%/boards/sounds/es/geography/ecuador.ogg
+%%DATADIR%%/boards/sounds/es/geography/estonia.ogg
+%%DATADIR%%/boards/sounds/es/geography/finland.ogg
+%%DATADIR%%/boards/sounds/es/geography/france.ogg
+%%DATADIR%%/boards/sounds/es/geography/french_guiana.ogg
+%%DATADIR%%/boards/sounds/es/geography/germany.ogg
+%%DATADIR%%/boards/sounds/es/geography/greece.ogg
+%%DATADIR%%/boards/sounds/es/geography/greenland.ogg
+%%DATADIR%%/boards/sounds/es/geography/guatemala.ogg
+%%DATADIR%%/boards/sounds/es/geography/guyana.ogg
+%%DATADIR%%/boards/sounds/es/geography/haiti.ogg
+%%DATADIR%%/boards/sounds/es/geography/honduras.ogg
+%%DATADIR%%/boards/sounds/es/geography/hungary.ogg
+%%DATADIR%%/boards/sounds/es/geography/iceland.ogg
+%%DATADIR%%/boards/sounds/es/geography/ireland.ogg
+%%DATADIR%%/boards/sounds/es/geography/italy.ogg
+%%DATADIR%%/boards/sounds/es/geography/jamaica.ogg
+%%DATADIR%%/boards/sounds/es/geography/latvia.ogg
+%%DATADIR%%/boards/sounds/es/geography/lithuania.ogg
+%%DATADIR%%/boards/sounds/es/geography/luxembourg.ogg
+%%DATADIR%%/boards/sounds/es/geography/macedonia.ogg
+%%DATADIR%%/boards/sounds/es/geography/mexico.ogg
+%%DATADIR%%/boards/sounds/es/geography/moldova.ogg
+%%DATADIR%%/boards/sounds/es/geography/netherland.ogg
+%%DATADIR%%/boards/sounds/es/geography/nicaragua.ogg
+%%DATADIR%%/boards/sounds/es/geography/norway.ogg
+%%DATADIR%%/boards/sounds/es/geography/panama.ogg
+%%DATADIR%%/boards/sounds/es/geography/paraguay.ogg
+%%DATADIR%%/boards/sounds/es/geography/peru.ogg
+%%DATADIR%%/boards/sounds/es/geography/poland.ogg
+%%DATADIR%%/boards/sounds/es/geography/portugal.ogg
+%%DATADIR%%/boards/sounds/es/geography/romania.ogg
+%%DATADIR%%/boards/sounds/es/geography/russia.ogg
+%%DATADIR%%/boards/sounds/es/geography/salvador.ogg
+%%DATADIR%%/boards/sounds/es/geography/serbia_montenegro.ogg
+%%DATADIR%%/boards/sounds/es/geography/slovakia.ogg
+%%DATADIR%%/boards/sounds/es/geography/slovenia.ogg
+%%DATADIR%%/boards/sounds/es/geography/spain.ogg
+%%DATADIR%%/boards/sounds/es/geography/suriname.ogg
+%%DATADIR%%/boards/sounds/es/geography/sweden.ogg
+%%DATADIR%%/boards/sounds/es/geography/switz.ogg
+%%DATADIR%%/boards/sounds/es/geography/turkey.ogg
+%%DATADIR%%/boards/sounds/es/geography/ukraine.ogg
+%%DATADIR%%/boards/sounds/es/geography/united_kingdom.ogg
+%%DATADIR%%/boards/sounds/es/geography/uruguay.ogg
+%%DATADIR%%/boards/sounds/es/geography/usa.ogg
+%%DATADIR%%/boards/sounds/es/geography/venezuela.ogg
+%%DATADIR%%/boards/sounds/es/misc/README
+%%DATADIR%%/boards/sounds/es/misc/back.ogg
+%%DATADIR%%/boards/sounds/es/misc/by.ogg
+%%DATADIR%%/boards/sounds/es/misc/click_on_letter.ogg
+%%DATADIR%%/boards/sounds/es/misc/congratulation.ogg
+%%DATADIR%%/boards/sounds/es/misc/equal.ogg
+%%DATADIR%%/boards/sounds/es/misc/good.ogg
+%%DATADIR%%/boards/sounds/es/misc/great.ogg
+%%DATADIR%%/boards/sounds/es/misc/help.ogg
+%%DATADIR%%/boards/sounds/es/misc/level.ogg
+%%DATADIR%%/boards/sounds/es/misc/minus.ogg
+%%DATADIR%%/boards/sounds/es/misc/ok.ogg
+%%DATADIR%%/boards/sounds/es/misc/outof.ogg
+%%DATADIR%%/boards/sounds/es/misc/plus.ogg
+%%DATADIR%%/boards/sounds/es/misc/quit.ogg
+%%DATADIR%%/boards/sounds/es/misc/super.ogg
+%%DATADIR%%/boards/sounds/es/misc/welcome.ogg
+%%DATADIR%%/boards/sounds/eu/alphabet/10.ogg
+%%DATADIR%%/boards/sounds/eu/alphabet/README
+%%DATADIR%%/boards/sounds/eu/alphabet/U0030.ogg
+%%DATADIR%%/boards/sounds/eu/alphabet/U0031.ogg
+%%DATADIR%%/boards/sounds/eu/alphabet/U0032.ogg
+%%DATADIR%%/boards/sounds/eu/alphabet/U0033.ogg
+%%DATADIR%%/boards/sounds/eu/alphabet/U0034.ogg
+%%DATADIR%%/boards/sounds/eu/alphabet/U0035.ogg
+%%DATADIR%%/boards/sounds/eu/alphabet/U0036.ogg
+%%DATADIR%%/boards/sounds/eu/alphabet/U0037.ogg
+%%DATADIR%%/boards/sounds/eu/alphabet/U0038.ogg
+%%DATADIR%%/boards/sounds/eu/alphabet/U0039.ogg
+%%DATADIR%%/boards/sounds/eu/alphabet/U0061.ogg
+%%DATADIR%%/boards/sounds/eu/alphabet/U0062.ogg
+%%DATADIR%%/boards/sounds/eu/alphabet/U0063.ogg
+%%DATADIR%%/boards/sounds/eu/alphabet/U0064.ogg
+%%DATADIR%%/boards/sounds/eu/alphabet/U0065.ogg
+%%DATADIR%%/boards/sounds/eu/alphabet/U0066.ogg
+%%DATADIR%%/boards/sounds/eu/alphabet/U0067.ogg
+%%DATADIR%%/boards/sounds/eu/alphabet/U0068.ogg
+%%DATADIR%%/boards/sounds/eu/alphabet/U0069.ogg
+%%DATADIR%%/boards/sounds/eu/alphabet/U006A.ogg
+%%DATADIR%%/boards/sounds/eu/alphabet/U006B.ogg
+%%DATADIR%%/boards/sounds/eu/alphabet/U006C.ogg
+%%DATADIR%%/boards/sounds/eu/alphabet/U006D.ogg
+%%DATADIR%%/boards/sounds/eu/alphabet/U006E.ogg
+%%DATADIR%%/boards/sounds/eu/alphabet/U006F.ogg
+%%DATADIR%%/boards/sounds/eu/alphabet/U0070.ogg
+%%DATADIR%%/boards/sounds/eu/alphabet/U0071.ogg
+%%DATADIR%%/boards/sounds/eu/alphabet/U0072.ogg
+%%DATADIR%%/boards/sounds/eu/alphabet/U0073.ogg
+%%DATADIR%%/boards/sounds/eu/alphabet/U0074.ogg
+%%DATADIR%%/boards/sounds/eu/alphabet/U0075.ogg
+%%DATADIR%%/boards/sounds/eu/alphabet/U0076.ogg
+%%DATADIR%%/boards/sounds/eu/alphabet/U0077.ogg
+%%DATADIR%%/boards/sounds/eu/alphabet/U0078.ogg
+%%DATADIR%%/boards/sounds/eu/alphabet/U0079.ogg
+%%DATADIR%%/boards/sounds/eu/alphabet/U007A.ogg
+%%DATADIR%%/boards/sounds/eu/colors/README
+%%DATADIR%%/boards/sounds/eu/colors/black.ogg
+%%DATADIR%%/boards/sounds/eu/colors/blue.ogg
+%%DATADIR%%/boards/sounds/eu/colors/brown.ogg
+%%DATADIR%%/boards/sounds/eu/colors/green.ogg
+%%DATADIR%%/boards/sounds/eu/colors/grey.ogg
+%%DATADIR%%/boards/sounds/eu/colors/orange.ogg
+%%DATADIR%%/boards/sounds/eu/colors/pink.ogg
+%%DATADIR%%/boards/sounds/eu/colors/purple.ogg
+%%DATADIR%%/boards/sounds/eu/colors/red.ogg
+%%DATADIR%%/boards/sounds/eu/colors/white.ogg
+%%DATADIR%%/boards/sounds/eu/colors/yellow.ogg
+%%DATADIR%%/boards/sounds/eu/geography/README
+%%DATADIR%%/boards/sounds/eu/geography/alaska.ogg
+%%DATADIR%%/boards/sounds/eu/geography/albania.ogg
+%%DATADIR%%/boards/sounds/eu/geography/argentina.ogg
+%%DATADIR%%/boards/sounds/eu/geography/austria.ogg
+%%DATADIR%%/boards/sounds/eu/geography/bahamas.ogg
+%%DATADIR%%/boards/sounds/eu/geography/belarus.ogg
+%%DATADIR%%/boards/sounds/eu/geography/belgium.ogg
+%%DATADIR%%/boards/sounds/eu/geography/bolivia.ogg
+%%DATADIR%%/boards/sounds/eu/geography/bosnia_herzegovina.ogg
+%%DATADIR%%/boards/sounds/eu/geography/brazil.ogg
+%%DATADIR%%/boards/sounds/eu/geography/bulgaria.ogg
+%%DATADIR%%/boards/sounds/eu/geography/canada.ogg
+%%DATADIR%%/boards/sounds/eu/geography/chile.ogg
+%%DATADIR%%/boards/sounds/eu/geography/colombia.ogg
+%%DATADIR%%/boards/sounds/eu/geography/costa_rica.ogg
+%%DATADIR%%/boards/sounds/eu/geography/croatia.ogg
+%%DATADIR%%/boards/sounds/eu/geography/cuba.ogg
+%%DATADIR%%/boards/sounds/eu/geography/cyprus.ogg
+%%DATADIR%%/boards/sounds/eu/geography/czech.ogg
+%%DATADIR%%/boards/sounds/eu/geography/denmark.ogg
+%%DATADIR%%/boards/sounds/eu/geography/dominican_republic.ogg
+%%DATADIR%%/boards/sounds/eu/geography/ecuador.ogg
+%%DATADIR%%/boards/sounds/eu/geography/estonia.ogg
+%%DATADIR%%/boards/sounds/eu/geography/finland.ogg
+%%DATADIR%%/boards/sounds/eu/geography/france.ogg
+%%DATADIR%%/boards/sounds/eu/geography/french_guiana.ogg
+%%DATADIR%%/boards/sounds/eu/geography/germany.ogg
+%%DATADIR%%/boards/sounds/eu/geography/greece.ogg
+%%DATADIR%%/boards/sounds/eu/geography/greenland.ogg
+%%DATADIR%%/boards/sounds/eu/geography/guatemala.ogg
+%%DATADIR%%/boards/sounds/eu/geography/guyana.ogg
+%%DATADIR%%/boards/sounds/eu/geography/haiti.ogg
+%%DATADIR%%/boards/sounds/eu/geography/honduras.ogg
+%%DATADIR%%/boards/sounds/eu/geography/hungary.ogg
+%%DATADIR%%/boards/sounds/eu/geography/iceland.ogg
+%%DATADIR%%/boards/sounds/eu/geography/ireland.ogg
+%%DATADIR%%/boards/sounds/eu/geography/italy.ogg
+%%DATADIR%%/boards/sounds/eu/geography/jamaica.ogg
+%%DATADIR%%/boards/sounds/eu/geography/latvia.ogg
+%%DATADIR%%/boards/sounds/eu/geography/lithuania.ogg
+%%DATADIR%%/boards/sounds/eu/geography/luxembourg.ogg
+%%DATADIR%%/boards/sounds/eu/geography/macedonia.ogg
+%%DATADIR%%/boards/sounds/eu/geography/mexico.ogg
+%%DATADIR%%/boards/sounds/eu/geography/moldova.ogg
+%%DATADIR%%/boards/sounds/eu/geography/netherland.ogg
+%%DATADIR%%/boards/sounds/eu/geography/nicaragua.ogg
+%%DATADIR%%/boards/sounds/eu/geography/norway.ogg
+%%DATADIR%%/boards/sounds/eu/geography/panama.ogg
+%%DATADIR%%/boards/sounds/eu/geography/paraguay.ogg
+%%DATADIR%%/boards/sounds/eu/geography/peru.ogg
+%%DATADIR%%/boards/sounds/eu/geography/poland.ogg
+%%DATADIR%%/boards/sounds/eu/geography/portugal.ogg
+%%DATADIR%%/boards/sounds/eu/geography/romania.ogg
+%%DATADIR%%/boards/sounds/eu/geography/russia.ogg
+%%DATADIR%%/boards/sounds/eu/geography/salvador.ogg
+%%DATADIR%%/boards/sounds/eu/geography/serbia_montenegro.ogg
+%%DATADIR%%/boards/sounds/eu/geography/slovakia.ogg
+%%DATADIR%%/boards/sounds/eu/geography/slovenia.ogg
+%%DATADIR%%/boards/sounds/eu/geography/spain.ogg
+%%DATADIR%%/boards/sounds/eu/geography/suriname.ogg
+%%DATADIR%%/boards/sounds/eu/geography/sweden.ogg
+%%DATADIR%%/boards/sounds/eu/geography/switz.ogg
+%%DATADIR%%/boards/sounds/eu/geography/turkey.ogg
+%%DATADIR%%/boards/sounds/eu/geography/ukraine.ogg
+%%DATADIR%%/boards/sounds/eu/geography/united_kingdom.ogg
+%%DATADIR%%/boards/sounds/eu/geography/uruguay.ogg
+%%DATADIR%%/boards/sounds/eu/geography/usa.ogg
+%%DATADIR%%/boards/sounds/eu/geography/venezuela.ogg
+%%DATADIR%%/boards/sounds/eu/misc/README
+%%DATADIR%%/boards/sounds/eu/misc/awesome.ogg
+%%DATADIR%%/boards/sounds/eu/misc/back.ogg
+%%DATADIR%%/boards/sounds/eu/misc/by.ogg
+%%DATADIR%%/boards/sounds/eu/misc/click_on_letter.ogg
+%%DATADIR%%/boards/sounds/eu/misc/congratulation.ogg
+%%DATADIR%%/boards/sounds/eu/misc/equal.ogg
+%%DATADIR%%/boards/sounds/eu/misc/fantastic.ogg
+%%DATADIR%%/boards/sounds/eu/misc/good.ogg
+%%DATADIR%%/boards/sounds/eu/misc/great.ogg
+%%DATADIR%%/boards/sounds/eu/misc/help.ogg
+%%DATADIR%%/boards/sounds/eu/misc/level.ogg
+%%DATADIR%%/boards/sounds/eu/misc/minus.ogg
+%%DATADIR%%/boards/sounds/eu/misc/ok.ogg
+%%DATADIR%%/boards/sounds/eu/misc/outof.ogg
+%%DATADIR%%/boards/sounds/eu/misc/perfect.ogg
+%%DATADIR%%/boards/sounds/eu/misc/plus.ogg
+%%DATADIR%%/boards/sounds/eu/misc/quit.ogg
+%%DATADIR%%/boards/sounds/eu/misc/super.ogg
+%%DATADIR%%/boards/sounds/eu/misc/waytogo.ogg
+%%DATADIR%%/boards/sounds/eu/misc/welcome.ogg
+%%DATADIR%%/boards/sounds/fi/alphabet/10.ogg
+%%DATADIR%%/boards/sounds/fi/alphabet/README
+%%DATADIR%%/boards/sounds/fi/alphabet/U0030.ogg
+%%DATADIR%%/boards/sounds/fi/alphabet/U0031.ogg
+%%DATADIR%%/boards/sounds/fi/alphabet/U0032.ogg
+%%DATADIR%%/boards/sounds/fi/alphabet/U0033.ogg
+%%DATADIR%%/boards/sounds/fi/alphabet/U0034.ogg
+%%DATADIR%%/boards/sounds/fi/alphabet/U0035.ogg
+%%DATADIR%%/boards/sounds/fi/alphabet/U0036.ogg
+%%DATADIR%%/boards/sounds/fi/alphabet/U0037.ogg
+%%DATADIR%%/boards/sounds/fi/alphabet/U0038.ogg
+%%DATADIR%%/boards/sounds/fi/alphabet/U0039.ogg
+%%DATADIR%%/boards/sounds/fi/alphabet/U0061.ogg
+%%DATADIR%%/boards/sounds/fi/alphabet/U0062.ogg
+%%DATADIR%%/boards/sounds/fi/alphabet/U0063.ogg
+%%DATADIR%%/boards/sounds/fi/alphabet/U0064.ogg
+%%DATADIR%%/boards/sounds/fi/alphabet/U0065.ogg
+%%DATADIR%%/boards/sounds/fi/alphabet/U0066.ogg
+%%DATADIR%%/boards/sounds/fi/alphabet/U0067.ogg
+%%DATADIR%%/boards/sounds/fi/alphabet/U0068.ogg
+%%DATADIR%%/boards/sounds/fi/alphabet/U0069.ogg
+%%DATADIR%%/boards/sounds/fi/alphabet/U006A.ogg
+%%DATADIR%%/boards/sounds/fi/alphabet/U006B.ogg
+%%DATADIR%%/boards/sounds/fi/alphabet/U006C.ogg
+%%DATADIR%%/boards/sounds/fi/alphabet/U006D.ogg
+%%DATADIR%%/boards/sounds/fi/alphabet/U006E.ogg
+%%DATADIR%%/boards/sounds/fi/alphabet/U006F.ogg
+%%DATADIR%%/boards/sounds/fi/alphabet/U0070.ogg
+%%DATADIR%%/boards/sounds/fi/alphabet/U0071.ogg
+%%DATADIR%%/boards/sounds/fi/alphabet/U0072.ogg
+%%DATADIR%%/boards/sounds/fi/alphabet/U0073.ogg
+%%DATADIR%%/boards/sounds/fi/alphabet/U0074.ogg
+%%DATADIR%%/boards/sounds/fi/alphabet/U0075.ogg
+%%DATADIR%%/boards/sounds/fi/alphabet/U0076.ogg
+%%DATADIR%%/boards/sounds/fi/alphabet/U0077.ogg
+%%DATADIR%%/boards/sounds/fi/alphabet/U0078.ogg
+%%DATADIR%%/boards/sounds/fi/alphabet/U0079.ogg
+%%DATADIR%%/boards/sounds/fi/alphabet/U007A.ogg
+%%DATADIR%%/boards/sounds/fi/alphabet/U00E4.ogg
+%%DATADIR%%/boards/sounds/fi/alphabet/U00E5.ogg
+%%DATADIR%%/boards/sounds/fi/alphabet/U00F6.ogg
+%%DATADIR%%/boards/sounds/fi/colors/README
+%%DATADIR%%/boards/sounds/fi/colors/black.ogg
+%%DATADIR%%/boards/sounds/fi/colors/blue.ogg
+%%DATADIR%%/boards/sounds/fi/colors/brown.ogg
+%%DATADIR%%/boards/sounds/fi/colors/green.ogg
+%%DATADIR%%/boards/sounds/fi/colors/grey.ogg
+%%DATADIR%%/boards/sounds/fi/colors/orange.ogg
+%%DATADIR%%/boards/sounds/fi/colors/pink.ogg
+%%DATADIR%%/boards/sounds/fi/colors/purple.ogg
+%%DATADIR%%/boards/sounds/fi/colors/red.ogg
+%%DATADIR%%/boards/sounds/fi/colors/white.ogg
+%%DATADIR%%/boards/sounds/fi/colors/yellow.ogg
+%%DATADIR%%/boards/sounds/fi/geography/README
+%%DATADIR%%/boards/sounds/fi/geography/alaska.ogg
+%%DATADIR%%/boards/sounds/fi/geography/albania.ogg
+%%DATADIR%%/boards/sounds/fi/geography/argentina.ogg
+%%DATADIR%%/boards/sounds/fi/geography/austria.ogg
+%%DATADIR%%/boards/sounds/fi/geography/bahamas.ogg
+%%DATADIR%%/boards/sounds/fi/geography/belarus.ogg
+%%DATADIR%%/boards/sounds/fi/geography/belgium.ogg
+%%DATADIR%%/boards/sounds/fi/geography/bolivia.ogg
+%%DATADIR%%/boards/sounds/fi/geography/bosnia_herzegovina.ogg
+%%DATADIR%%/boards/sounds/fi/geography/brazil.ogg
+%%DATADIR%%/boards/sounds/fi/geography/bulgaria.ogg
+%%DATADIR%%/boards/sounds/fi/geography/canada.ogg
+%%DATADIR%%/boards/sounds/fi/geography/chile.ogg
+%%DATADIR%%/boards/sounds/fi/geography/colombia.ogg
+%%DATADIR%%/boards/sounds/fi/geography/costa_rica.ogg
+%%DATADIR%%/boards/sounds/fi/geography/croatia.ogg
+%%DATADIR%%/boards/sounds/fi/geography/cuba.ogg
+%%DATADIR%%/boards/sounds/fi/geography/cyprus.ogg
+%%DATADIR%%/boards/sounds/fi/geography/czech.ogg
+%%DATADIR%%/boards/sounds/fi/geography/denmark.ogg
+%%DATADIR%%/boards/sounds/fi/geography/dominican_republic.ogg
+%%DATADIR%%/boards/sounds/fi/geography/ecuador.ogg
+%%DATADIR%%/boards/sounds/fi/geography/estonia.ogg
+%%DATADIR%%/boards/sounds/fi/geography/finland.ogg
+%%DATADIR%%/boards/sounds/fi/geography/france.ogg
+%%DATADIR%%/boards/sounds/fi/geography/french_guiana.ogg
+%%DATADIR%%/boards/sounds/fi/geography/germany.ogg
+%%DATADIR%%/boards/sounds/fi/geography/greece.ogg
+%%DATADIR%%/boards/sounds/fi/geography/greenland.ogg
+%%DATADIR%%/boards/sounds/fi/geography/guatemala.ogg
+%%DATADIR%%/boards/sounds/fi/geography/guyana.ogg
+%%DATADIR%%/boards/sounds/fi/geography/haiti.ogg
+%%DATADIR%%/boards/sounds/fi/geography/honduras.ogg
+%%DATADIR%%/boards/sounds/fi/geography/hungary.ogg
+%%DATADIR%%/boards/sounds/fi/geography/iceland.ogg
+%%DATADIR%%/boards/sounds/fi/geography/ireland.ogg
+%%DATADIR%%/boards/sounds/fi/geography/italy.ogg
+%%DATADIR%%/boards/sounds/fi/geography/jamaica.ogg
+%%DATADIR%%/boards/sounds/fi/geography/latvia.ogg
+%%DATADIR%%/boards/sounds/fi/geography/lithuania.ogg
+%%DATADIR%%/boards/sounds/fi/geography/luxembourg.ogg
+%%DATADIR%%/boards/sounds/fi/geography/macedonia.ogg
+%%DATADIR%%/boards/sounds/fi/geography/mexico.ogg
+%%DATADIR%%/boards/sounds/fi/geography/moldova.ogg
+%%DATADIR%%/boards/sounds/fi/geography/netherland.ogg
+%%DATADIR%%/boards/sounds/fi/geography/nicaragua.ogg
+%%DATADIR%%/boards/sounds/fi/geography/norway.ogg
+%%DATADIR%%/boards/sounds/fi/geography/panama.ogg
+%%DATADIR%%/boards/sounds/fi/geography/paraguay.ogg
+%%DATADIR%%/boards/sounds/fi/geography/peru.ogg
+%%DATADIR%%/boards/sounds/fi/geography/poland.ogg
+%%DATADIR%%/boards/sounds/fi/geography/portugal.ogg
+%%DATADIR%%/boards/sounds/fi/geography/romania.ogg
+%%DATADIR%%/boards/sounds/fi/geography/russia.ogg
+%%DATADIR%%/boards/sounds/fi/geography/salvador.ogg
+%%DATADIR%%/boards/sounds/fi/geography/serbia_montenegro.ogg
+%%DATADIR%%/boards/sounds/fi/geography/slovakia.ogg
+%%DATADIR%%/boards/sounds/fi/geography/slovenia.ogg
+%%DATADIR%%/boards/sounds/fi/geography/spain.ogg
+%%DATADIR%%/boards/sounds/fi/geography/suriname.ogg
+%%DATADIR%%/boards/sounds/fi/geography/sweden.ogg
+%%DATADIR%%/boards/sounds/fi/geography/switz.ogg
+%%DATADIR%%/boards/sounds/fi/geography/turkey.ogg
+%%DATADIR%%/boards/sounds/fi/geography/ukraine.ogg
+%%DATADIR%%/boards/sounds/fi/geography/united_kingdom.ogg
+%%DATADIR%%/boards/sounds/fi/geography/uruguay.ogg
+%%DATADIR%%/boards/sounds/fi/geography/usa.ogg
+%%DATADIR%%/boards/sounds/fi/geography/venezuela.ogg
+%%DATADIR%%/boards/sounds/fi/misc/README
+%%DATADIR%%/boards/sounds/fi/misc/awesome.ogg
+%%DATADIR%%/boards/sounds/fi/misc/back.ogg
+%%DATADIR%%/boards/sounds/fi/misc/by.ogg
+%%DATADIR%%/boards/sounds/fi/misc/check_answer.ogg
+%%DATADIR%%/boards/sounds/fi/misc/click_on_letter.ogg
+%%DATADIR%%/boards/sounds/fi/misc/congratulation.ogg
+%%DATADIR%%/boards/sounds/fi/misc/equal.ogg
+%%DATADIR%%/boards/sounds/fi/misc/fantastic.ogg
+%%DATADIR%%/boards/sounds/fi/misc/good.ogg
+%%DATADIR%%/boards/sounds/fi/misc/great.ogg
+%%DATADIR%%/boards/sounds/fi/misc/help.ogg
+%%DATADIR%%/boards/sounds/fi/misc/level.ogg
+%%DATADIR%%/boards/sounds/fi/misc/minus.ogg
+%%DATADIR%%/boards/sounds/fi/misc/ok.ogg
+%%DATADIR%%/boards/sounds/fi/misc/outof.ogg
+%%DATADIR%%/boards/sounds/fi/misc/perfect.ogg
+%%DATADIR%%/boards/sounds/fi/misc/plus.ogg
+%%DATADIR%%/boards/sounds/fi/misc/quit.ogg
+%%DATADIR%%/boards/sounds/fi/misc/super.ogg
+%%DATADIR%%/boards/sounds/fi/misc/waytogo.ogg
+%%DATADIR%%/boards/sounds/fi/misc/welcome.ogg
+%%DATADIR%%/boards/sounds/flip.wav
+%%DATADIR%%/boards/sounds/fr/alphabet/10.ogg
+%%DATADIR%%/boards/sounds/fr/alphabet/README
+%%DATADIR%%/boards/sounds/fr/alphabet/U0030.ogg
+%%DATADIR%%/boards/sounds/fr/alphabet/U0031.ogg
+%%DATADIR%%/boards/sounds/fr/alphabet/U0032.ogg
+%%DATADIR%%/boards/sounds/fr/alphabet/U0033.ogg
+%%DATADIR%%/boards/sounds/fr/alphabet/U0034.ogg
+%%DATADIR%%/boards/sounds/fr/alphabet/U0035.ogg
+%%DATADIR%%/boards/sounds/fr/alphabet/U0036.ogg
+%%DATADIR%%/boards/sounds/fr/alphabet/U0037.ogg
+%%DATADIR%%/boards/sounds/fr/alphabet/U0038.ogg
+%%DATADIR%%/boards/sounds/fr/alphabet/U0039.ogg
+%%DATADIR%%/boards/sounds/fr/alphabet/U0061.ogg
+%%DATADIR%%/boards/sounds/fr/alphabet/U0062.ogg
+%%DATADIR%%/boards/sounds/fr/alphabet/U0063.ogg
+%%DATADIR%%/boards/sounds/fr/alphabet/U0064.ogg
+%%DATADIR%%/boards/sounds/fr/alphabet/U0065.ogg
+%%DATADIR%%/boards/sounds/fr/alphabet/U0066.ogg
+%%DATADIR%%/boards/sounds/fr/alphabet/U0067.ogg
+%%DATADIR%%/boards/sounds/fr/alphabet/U0068.ogg
+%%DATADIR%%/boards/sounds/fr/alphabet/U0069.ogg
+%%DATADIR%%/boards/sounds/fr/alphabet/U006A.ogg
+%%DATADIR%%/boards/sounds/fr/alphabet/U006B.ogg
+%%DATADIR%%/boards/sounds/fr/alphabet/U006C.ogg
+%%DATADIR%%/boards/sounds/fr/alphabet/U006D.ogg
+%%DATADIR%%/boards/sounds/fr/alphabet/U006E.ogg
+%%DATADIR%%/boards/sounds/fr/alphabet/U006F.ogg
+%%DATADIR%%/boards/sounds/fr/alphabet/U0070.ogg
+%%DATADIR%%/boards/sounds/fr/alphabet/U0071.ogg
+%%DATADIR%%/boards/sounds/fr/alphabet/U0072.ogg
+%%DATADIR%%/boards/sounds/fr/alphabet/U0073.ogg
+%%DATADIR%%/boards/sounds/fr/alphabet/U0074.ogg
+%%DATADIR%%/boards/sounds/fr/alphabet/U0075.ogg
+%%DATADIR%%/boards/sounds/fr/alphabet/U0076.ogg
+%%DATADIR%%/boards/sounds/fr/alphabet/U0077.ogg
+%%DATADIR%%/boards/sounds/fr/alphabet/U0078.ogg
+%%DATADIR%%/boards/sounds/fr/alphabet/U0079.ogg
+%%DATADIR%%/boards/sounds/fr/alphabet/U007A.ogg
+%%DATADIR%%/boards/sounds/fr/colors/README
+%%DATADIR%%/boards/sounds/fr/colors/black.ogg
+%%DATADIR%%/boards/sounds/fr/colors/blue.ogg
+%%DATADIR%%/boards/sounds/fr/colors/brown.ogg
+%%DATADIR%%/boards/sounds/fr/colors/green.ogg
+%%DATADIR%%/boards/sounds/fr/colors/grey.ogg
+%%DATADIR%%/boards/sounds/fr/colors/orange.ogg
+%%DATADIR%%/boards/sounds/fr/colors/pink.ogg
+%%DATADIR%%/boards/sounds/fr/colors/purple.ogg
+%%DATADIR%%/boards/sounds/fr/colors/red.ogg
+%%DATADIR%%/boards/sounds/fr/colors/white.ogg
+%%DATADIR%%/boards/sounds/fr/colors/yellow.ogg
+%%DATADIR%%/boards/sounds/fr/france_region/README
+%%DATADIR%%/boards/sounds/fr/france_region/alsace.ogg
+%%DATADIR%%/boards/sounds/fr/france_region/aquitaine.ogg
+%%DATADIR%%/boards/sounds/fr/france_region/auvergne.ogg
+%%DATADIR%%/boards/sounds/fr/france_region/basse-normandie.ogg
+%%DATADIR%%/boards/sounds/fr/france_region/bourgogne.ogg
+%%DATADIR%%/boards/sounds/fr/france_region/bretagne.ogg
+%%DATADIR%%/boards/sounds/fr/france_region/centre.ogg
+%%DATADIR%%/boards/sounds/fr/france_region/champagne-ardenne.ogg
+%%DATADIR%%/boards/sounds/fr/france_region/corse.ogg
+%%DATADIR%%/boards/sounds/fr/france_region/franche-conte.ogg
+%%DATADIR%%/boards/sounds/fr/france_region/haute-normandie.ogg
+%%DATADIR%%/boards/sounds/fr/france_region/ile-de-france.ogg
+%%DATADIR%%/boards/sounds/fr/france_region/languedoc-roussillon.ogg
+%%DATADIR%%/boards/sounds/fr/france_region/limousin.ogg
+%%DATADIR%%/boards/sounds/fr/france_region/lorraine.ogg
+%%DATADIR%%/boards/sounds/fr/france_region/midi-pyrenees.ogg
+%%DATADIR%%/boards/sounds/fr/france_region/nord-pas-de-calais.ogg
+%%DATADIR%%/boards/sounds/fr/france_region/pays-de-la-loire.ogg
+%%DATADIR%%/boards/sounds/fr/france_region/picardie.ogg
+%%DATADIR%%/boards/sounds/fr/france_region/poitou-charentes.ogg
+%%DATADIR%%/boards/sounds/fr/france_region/provence-alpes-cote_d_azur.ogg
+%%DATADIR%%/boards/sounds/fr/france_region/rhone-alpes.ogg
+%%DATADIR%%/boards/sounds/fr/geography/COPYRIGHT
+%%DATADIR%%/boards/sounds/fr/geography/README
+%%DATADIR%%/boards/sounds/fr/geography/africa.ogg
+%%DATADIR%%/boards/sounds/fr/geography/alaska.ogg
+%%DATADIR%%/boards/sounds/fr/geography/albania.ogg
+%%DATADIR%%/boards/sounds/fr/geography/america.ogg
+%%DATADIR%%/boards/sounds/fr/geography/antartica.ogg
+%%DATADIR%%/boards/sounds/fr/geography/argentina.ogg
+%%DATADIR%%/boards/sounds/fr/geography/asia.ogg
+%%DATADIR%%/boards/sounds/fr/geography/austria.ogg
+%%DATADIR%%/boards/sounds/fr/geography/bahamas.ogg
+%%DATADIR%%/boards/sounds/fr/geography/belarus.ogg
+%%DATADIR%%/boards/sounds/fr/geography/belgium.ogg
+%%DATADIR%%/boards/sounds/fr/geography/bolivia.ogg
+%%DATADIR%%/boards/sounds/fr/geography/bosnia_herzegovina.ogg
+%%DATADIR%%/boards/sounds/fr/geography/brazil.ogg
+%%DATADIR%%/boards/sounds/fr/geography/bulgaria.ogg
+%%DATADIR%%/boards/sounds/fr/geography/canada.ogg
+%%DATADIR%%/boards/sounds/fr/geography/chile.ogg
+%%DATADIR%%/boards/sounds/fr/geography/colombia.ogg
+%%DATADIR%%/boards/sounds/fr/geography/costa_rica.ogg
+%%DATADIR%%/boards/sounds/fr/geography/croatia.ogg
+%%DATADIR%%/boards/sounds/fr/geography/cuba.ogg
+%%DATADIR%%/boards/sounds/fr/geography/cyprus.ogg
+%%DATADIR%%/boards/sounds/fr/geography/czech.ogg
+%%DATADIR%%/boards/sounds/fr/geography/denmark.ogg
+%%DATADIR%%/boards/sounds/fr/geography/dominican_republic.ogg
+%%DATADIR%%/boards/sounds/fr/geography/ecuador.ogg
+%%DATADIR%%/boards/sounds/fr/geography/estonia.ogg
+%%DATADIR%%/boards/sounds/fr/geography/europe.ogg
+%%DATADIR%%/boards/sounds/fr/geography/finland.ogg
+%%DATADIR%%/boards/sounds/fr/geography/france.ogg
+%%DATADIR%%/boards/sounds/fr/geography/french_guiana.ogg
+%%DATADIR%%/boards/sounds/fr/geography/germany.ogg
+%%DATADIR%%/boards/sounds/fr/geography/greece.ogg
+%%DATADIR%%/boards/sounds/fr/geography/greenland.ogg
+%%DATADIR%%/boards/sounds/fr/geography/guatemala.ogg
+%%DATADIR%%/boards/sounds/fr/geography/guyana.ogg
+%%DATADIR%%/boards/sounds/fr/geography/haiti.ogg
+%%DATADIR%%/boards/sounds/fr/geography/honduras.ogg
+%%DATADIR%%/boards/sounds/fr/geography/hungary.ogg
+%%DATADIR%%/boards/sounds/fr/geography/iceland.ogg
+%%DATADIR%%/boards/sounds/fr/geography/ireland.ogg
+%%DATADIR%%/boards/sounds/fr/geography/italy.ogg
+%%DATADIR%%/boards/sounds/fr/geography/jamaica.ogg
+%%DATADIR%%/boards/sounds/fr/geography/latvia.ogg
+%%DATADIR%%/boards/sounds/fr/geography/lithuania.ogg
+%%DATADIR%%/boards/sounds/fr/geography/luxembourg.ogg
+%%DATADIR%%/boards/sounds/fr/geography/macedonia.ogg
+%%DATADIR%%/boards/sounds/fr/geography/mexico.ogg
+%%DATADIR%%/boards/sounds/fr/geography/moldova.ogg
+%%DATADIR%%/boards/sounds/fr/geography/netherland.ogg
+%%DATADIR%%/boards/sounds/fr/geography/nicaragua.ogg
+%%DATADIR%%/boards/sounds/fr/geography/norway.ogg
+%%DATADIR%%/boards/sounds/fr/geography/oceania.ogg
+%%DATADIR%%/boards/sounds/fr/geography/panama.ogg
+%%DATADIR%%/boards/sounds/fr/geography/paraguay.ogg
+%%DATADIR%%/boards/sounds/fr/geography/peru.ogg
+%%DATADIR%%/boards/sounds/fr/geography/poland.ogg
+%%DATADIR%%/boards/sounds/fr/geography/portugal.ogg
+%%DATADIR%%/boards/sounds/fr/geography/romania.ogg
+%%DATADIR%%/boards/sounds/fr/geography/russia.ogg
+%%DATADIR%%/boards/sounds/fr/geography/salvador.ogg
+%%DATADIR%%/boards/sounds/fr/geography/serbia_montenegro.ogg
+%%DATADIR%%/boards/sounds/fr/geography/slovakia.ogg
+%%DATADIR%%/boards/sounds/fr/geography/slovenia.ogg
+%%DATADIR%%/boards/sounds/fr/geography/spain.ogg
+%%DATADIR%%/boards/sounds/fr/geography/suriname.ogg
+%%DATADIR%%/boards/sounds/fr/geography/sweden.ogg
+%%DATADIR%%/boards/sounds/fr/geography/switz.ogg
+%%DATADIR%%/boards/sounds/fr/geography/turkey.ogg
+%%DATADIR%%/boards/sounds/fr/geography/ukraine.ogg
+%%DATADIR%%/boards/sounds/fr/geography/united_kingdom.ogg
+%%DATADIR%%/boards/sounds/fr/geography/uruguay.ogg
+%%DATADIR%%/boards/sounds/fr/geography/usa.ogg
+%%DATADIR%%/boards/sounds/fr/geography/venezuela.ogg
+%%DATADIR%%/boards/sounds/fr/misc/README
+%%DATADIR%%/boards/sounds/fr/misc/about.ogg
+%%DATADIR%%/boards/sounds/fr/misc/awesome.ogg
+%%DATADIR%%/boards/sounds/fr/misc/back.ogg
+%%DATADIR%%/boards/sounds/fr/misc/by.ogg
+%%DATADIR%%/boards/sounds/fr/misc/check_answer.ogg
+%%DATADIR%%/boards/sounds/fr/misc/click_on_letter.ogg
+%%DATADIR%%/boards/sounds/fr/misc/configuration.ogg
+%%DATADIR%%/boards/sounds/fr/misc/congratulation.ogg
+%%DATADIR%%/boards/sounds/fr/misc/equal.ogg
+%%DATADIR%%/boards/sounds/fr/misc/fantastic.ogg
+%%DATADIR%%/boards/sounds/fr/misc/good.ogg
+%%DATADIR%%/boards/sounds/fr/misc/great.ogg
+%%DATADIR%%/boards/sounds/fr/misc/help.ogg
+%%DATADIR%%/boards/sounds/fr/misc/level.ogg
+%%DATADIR%%/boards/sounds/fr/misc/minus.ogg
+%%DATADIR%%/boards/sounds/fr/misc/ok.ogg
+%%DATADIR%%/boards/sounds/fr/misc/outof.ogg
+%%DATADIR%%/boards/sounds/fr/misc/perfect.ogg
+%%DATADIR%%/boards/sounds/fr/misc/plus.ogg
+%%DATADIR%%/boards/sounds/fr/misc/quit.ogg
+%%DATADIR%%/boards/sounds/fr/misc/super.ogg
+%%DATADIR%%/boards/sounds/fr/misc/waytogo.ogg
+%%DATADIR%%/boards/sounds/fr/misc/welcome.ogg
+%%DATADIR%%/boards/sounds/gobble.wav
+%%DATADIR%%/boards/sounds/grow.wav
+%%DATADIR%%/boards/sounds/hi/alphabet/10.ogg
+%%DATADIR%%/boards/sounds/hi/alphabet/U0030.ogg
+%%DATADIR%%/boards/sounds/hi/alphabet/U0031.ogg
+%%DATADIR%%/boards/sounds/hi/alphabet/U0032.ogg
+%%DATADIR%%/boards/sounds/hi/alphabet/U0033.ogg
+%%DATADIR%%/boards/sounds/hi/alphabet/U0034.ogg
+%%DATADIR%%/boards/sounds/hi/alphabet/U0035.ogg
+%%DATADIR%%/boards/sounds/hi/alphabet/U0036.ogg
+%%DATADIR%%/boards/sounds/hi/alphabet/U0037.ogg
+%%DATADIR%%/boards/sounds/hi/alphabet/U0038.ogg
+%%DATADIR%%/boards/sounds/hi/alphabet/U0039.ogg
+%%DATADIR%%/boards/sounds/hi/alphabet/U0061.ogg
+%%DATADIR%%/boards/sounds/hi/alphabet/U0062.ogg
+%%DATADIR%%/boards/sounds/hi/alphabet/U0063.ogg
+%%DATADIR%%/boards/sounds/hi/alphabet/U0064.ogg
+%%DATADIR%%/boards/sounds/hi/alphabet/U0065.ogg
+%%DATADIR%%/boards/sounds/hi/alphabet/U0066.ogg
+%%DATADIR%%/boards/sounds/hi/alphabet/U0067.ogg
+%%DATADIR%%/boards/sounds/hi/alphabet/U0068.ogg
+%%DATADIR%%/boards/sounds/hi/alphabet/U0069.ogg
+%%DATADIR%%/boards/sounds/hi/alphabet/U006A.ogg
+%%DATADIR%%/boards/sounds/hi/alphabet/U006B.ogg
+%%DATADIR%%/boards/sounds/hi/alphabet/U006C.ogg
+%%DATADIR%%/boards/sounds/hi/alphabet/U006D.ogg
+%%DATADIR%%/boards/sounds/hi/alphabet/U006E.ogg
+%%DATADIR%%/boards/sounds/hi/alphabet/U006F.ogg
+%%DATADIR%%/boards/sounds/hi/alphabet/U0070.ogg
+%%DATADIR%%/boards/sounds/hi/alphabet/U0071.ogg
+%%DATADIR%%/boards/sounds/hi/alphabet/U0072.ogg
+%%DATADIR%%/boards/sounds/hi/alphabet/U0073.ogg
+%%DATADIR%%/boards/sounds/hi/alphabet/U0074.ogg
+%%DATADIR%%/boards/sounds/hi/alphabet/U0075.ogg
+%%DATADIR%%/boards/sounds/hi/alphabet/U0076.ogg
+%%DATADIR%%/boards/sounds/hi/alphabet/U0077.ogg
+%%DATADIR%%/boards/sounds/hi/alphabet/U0078.ogg
+%%DATADIR%%/boards/sounds/hi/alphabet/U0079.ogg
+%%DATADIR%%/boards/sounds/hi/alphabet/U007A.ogg
+%%DATADIR%%/boards/sounds/hi/colors/black.ogg
+%%DATADIR%%/boards/sounds/hi/colors/blue.ogg
+%%DATADIR%%/boards/sounds/hi/colors/brown.ogg
+%%DATADIR%%/boards/sounds/hi/colors/green.ogg
+%%DATADIR%%/boards/sounds/hi/colors/grey.ogg
+%%DATADIR%%/boards/sounds/hi/colors/orange.ogg
+%%DATADIR%%/boards/sounds/hi/colors/pink.ogg
+%%DATADIR%%/boards/sounds/hi/colors/purple.ogg
+%%DATADIR%%/boards/sounds/hi/colors/red.ogg
+%%DATADIR%%/boards/sounds/hi/colors/white.ogg
+%%DATADIR%%/boards/sounds/hi/colors/yellow.ogg
+%%DATADIR%%/boards/sounds/hi/geography/africa.ogg
+%%DATADIR%%/boards/sounds/hi/geography/alaska.ogg
+%%DATADIR%%/boards/sounds/hi/geography/albania.ogg
+%%DATADIR%%/boards/sounds/hi/geography/algeria.ogg
+%%DATADIR%%/boards/sounds/hi/geography/america.ogg
+%%DATADIR%%/boards/sounds/hi/geography/angola.ogg
+%%DATADIR%%/boards/sounds/hi/geography/antartica.ogg
+%%DATADIR%%/boards/sounds/hi/geography/argentina.ogg
+%%DATADIR%%/boards/sounds/hi/geography/asia.ogg
+%%DATADIR%%/boards/sounds/hi/geography/austria.ogg
+%%DATADIR%%/boards/sounds/hi/geography/bahamas.ogg
+%%DATADIR%%/boards/sounds/hi/geography/basse_normandie.ogg
+%%DATADIR%%/boards/sounds/hi/geography/belarus.ogg
+%%DATADIR%%/boards/sounds/hi/geography/belgium.ogg
+%%DATADIR%%/boards/sounds/hi/geography/benin.ogg
+%%DATADIR%%/boards/sounds/hi/geography/bolivia.ogg
+%%DATADIR%%/boards/sounds/hi/geography/bosnia_herzegovina.ogg
+%%DATADIR%%/boards/sounds/hi/geography/botswana.ogg
+%%DATADIR%%/boards/sounds/hi/geography/brazil.ogg
+%%DATADIR%%/boards/sounds/hi/geography/bulgaria.ogg
+%%DATADIR%%/boards/sounds/hi/geography/burkina.ogg
+%%DATADIR%%/boards/sounds/hi/geography/burundi.ogg
+%%DATADIR%%/boards/sounds/hi/geography/cameroon.ogg
+%%DATADIR%%/boards/sounds/hi/geography/canada.ogg
+%%DATADIR%%/boards/sounds/hi/geography/central_african_republic.ogg
+%%DATADIR%%/boards/sounds/hi/geography/chad.ogg
+%%DATADIR%%/boards/sounds/hi/geography/chile.ogg
+%%DATADIR%%/boards/sounds/hi/geography/colombia.ogg
+%%DATADIR%%/boards/sounds/hi/geography/congo.ogg
+%%DATADIR%%/boards/sounds/hi/geography/costa_rica.ogg
+%%DATADIR%%/boards/sounds/hi/geography/croatia.ogg
+%%DATADIR%%/boards/sounds/hi/geography/cuba.ogg
+%%DATADIR%%/boards/sounds/hi/geography/cyprus.ogg
+%%DATADIR%%/boards/sounds/hi/geography/czech.ogg
+%%DATADIR%%/boards/sounds/hi/geography/denmark.ogg
+%%DATADIR%%/boards/sounds/hi/geography/dijibouti.ogg
+%%DATADIR%%/boards/sounds/hi/geography/dominican_republic.ogg
+%%DATADIR%%/boards/sounds/hi/geography/ecuador.ogg
+%%DATADIR%%/boards/sounds/hi/geography/egypt.ogg
+%%DATADIR%%/boards/sounds/hi/geography/equatorial_guinea.ogg
+%%DATADIR%%/boards/sounds/hi/geography/eritrea.ogg
+%%DATADIR%%/boards/sounds/hi/geography/estonia.ogg
+%%DATADIR%%/boards/sounds/hi/geography/ethiopia.ogg
+%%DATADIR%%/boards/sounds/hi/geography/europe.ogg
+%%DATADIR%%/boards/sounds/hi/geography/finland.ogg
+%%DATADIR%%/boards/sounds/hi/geography/france.ogg
+%%DATADIR%%/boards/sounds/hi/geography/french_guiana.ogg
+%%DATADIR%%/boards/sounds/hi/geography/gabon.ogg
+%%DATADIR%%/boards/sounds/hi/geography/gambia.ogg
+%%DATADIR%%/boards/sounds/hi/geography/germany.ogg
+%%DATADIR%%/boards/sounds/hi/geography/ghana.ogg
+%%DATADIR%%/boards/sounds/hi/geography/greece.ogg
+%%DATADIR%%/boards/sounds/hi/geography/greenland.ogg
+%%DATADIR%%/boards/sounds/hi/geography/guatemala.ogg
+%%DATADIR%%/boards/sounds/hi/geography/guinea.ogg
+%%DATADIR%%/boards/sounds/hi/geography/guinea_bissau.ogg
+%%DATADIR%%/boards/sounds/hi/geography/guyana.ogg
+%%DATADIR%%/boards/sounds/hi/geography/haiti.ogg
+%%DATADIR%%/boards/sounds/hi/geography/honduras.ogg
+%%DATADIR%%/boards/sounds/hi/geography/hungary.ogg
+%%DATADIR%%/boards/sounds/hi/geography/iceland.ogg
+%%DATADIR%%/boards/sounds/hi/geography/ireland.ogg
+%%DATADIR%%/boards/sounds/hi/geography/italy.ogg
+%%DATADIR%%/boards/sounds/hi/geography/ivory_coast.ogg
+%%DATADIR%%/boards/sounds/hi/geography/jamaica.ogg
+%%DATADIR%%/boards/sounds/hi/geography/kenya.ogg
+%%DATADIR%%/boards/sounds/hi/geography/latvia.ogg
+%%DATADIR%%/boards/sounds/hi/geography/lesotho.ogg
+%%DATADIR%%/boards/sounds/hi/geography/liberia.ogg
+%%DATADIR%%/boards/sounds/hi/geography/libya.ogg
+%%DATADIR%%/boards/sounds/hi/geography/lithuania.ogg
+%%DATADIR%%/boards/sounds/hi/geography/luxembourg.ogg
+%%DATADIR%%/boards/sounds/hi/geography/macedonia.ogg
+%%DATADIR%%/boards/sounds/hi/geography/madagascar.ogg
+%%DATADIR%%/boards/sounds/hi/geography/malawi.ogg
+%%DATADIR%%/boards/sounds/hi/geography/mali.ogg
+%%DATADIR%%/boards/sounds/hi/geography/mauritania.ogg
+%%DATADIR%%/boards/sounds/hi/geography/mexico.ogg
+%%DATADIR%%/boards/sounds/hi/geography/moldova.ogg
+%%DATADIR%%/boards/sounds/hi/geography/moroco.ogg
+%%DATADIR%%/boards/sounds/hi/geography/mozambique.ogg
+%%DATADIR%%/boards/sounds/hi/geography/nambia.ogg
+%%DATADIR%%/boards/sounds/hi/geography/netherland.ogg
+%%DATADIR%%/boards/sounds/hi/geography/nicaragua.ogg
+%%DATADIR%%/boards/sounds/hi/geography/niger.ogg
+%%DATADIR%%/boards/sounds/hi/geography/nigeria.ogg
+%%DATADIR%%/boards/sounds/hi/geography/north_america.ogg
+%%DATADIR%%/boards/sounds/hi/geography/norway.ogg
+%%DATADIR%%/boards/sounds/hi/geography/oceania.ogg
+%%DATADIR%%/boards/sounds/hi/geography/panama.ogg
+%%DATADIR%%/boards/sounds/hi/geography/paraguay.ogg
+%%DATADIR%%/boards/sounds/hi/geography/peru.ogg
+%%DATADIR%%/boards/sounds/hi/geography/poland.ogg
+%%DATADIR%%/boards/sounds/hi/geography/portugal.ogg
+%%DATADIR%%/boards/sounds/hi/geography/republic_of_congo.ogg
+%%DATADIR%%/boards/sounds/hi/geography/romania.ogg
+%%DATADIR%%/boards/sounds/hi/geography/russia.ogg
+%%DATADIR%%/boards/sounds/hi/geography/rwanda.ogg
+%%DATADIR%%/boards/sounds/hi/geography/salvador.ogg
+%%DATADIR%%/boards/sounds/hi/geography/senegal.ogg
+%%DATADIR%%/boards/sounds/hi/geography/serbia_montenegro.ogg
+%%DATADIR%%/boards/sounds/hi/geography/sierra_leone.ogg
+%%DATADIR%%/boards/sounds/hi/geography/slovakia.ogg
+%%DATADIR%%/boards/sounds/hi/geography/slovenia.ogg
+%%DATADIR%%/boards/sounds/hi/geography/somalia.ogg
+%%DATADIR%%/boards/sounds/hi/geography/soudan.ogg
+%%DATADIR%%/boards/sounds/hi/geography/south_africa.ogg
+%%DATADIR%%/boards/sounds/hi/geography/south_america.ogg
+%%DATADIR%%/boards/sounds/hi/geography/spain.ogg
+%%DATADIR%%/boards/sounds/hi/geography/suriname.ogg
+%%DATADIR%%/boards/sounds/hi/geography/swaziland.ogg
+%%DATADIR%%/boards/sounds/hi/geography/sweden.ogg
+%%DATADIR%%/boards/sounds/hi/geography/switz.ogg
+%%DATADIR%%/boards/sounds/hi/geography/tanzania.ogg
+%%DATADIR%%/boards/sounds/hi/geography/togo.ogg
+%%DATADIR%%/boards/sounds/hi/geography/tunisia.ogg
+%%DATADIR%%/boards/sounds/hi/geography/turkey.ogg
+%%DATADIR%%/boards/sounds/hi/geography/uganda.ogg
+%%DATADIR%%/boards/sounds/hi/geography/ukraine.ogg
+%%DATADIR%%/boards/sounds/hi/geography/united_kingdom.ogg
+%%DATADIR%%/boards/sounds/hi/geography/uruguay.ogg
+%%DATADIR%%/boards/sounds/hi/geography/usa.ogg
+%%DATADIR%%/boards/sounds/hi/geography/venezuela.ogg
+%%DATADIR%%/boards/sounds/hi/geography/zambia.ogg
+%%DATADIR%%/boards/sounds/hi/geography/zimbabwe.ogg
+%%DATADIR%%/boards/sounds/hi/misc/about.ogg
+%%DATADIR%%/boards/sounds/hi/misc/awesome.ogg
+%%DATADIR%%/boards/sounds/hi/misc/back.ogg
+%%DATADIR%%/boards/sounds/hi/misc/by.ogg
+%%DATADIR%%/boards/sounds/hi/misc/check_answer.ogg
+%%DATADIR%%/boards/sounds/hi/misc/click_on_letter.ogg
+%%DATADIR%%/boards/sounds/hi/misc/configuration.ogg
+%%DATADIR%%/boards/sounds/hi/misc/congratulation.ogg
+%%DATADIR%%/boards/sounds/hi/misc/equal.ogg
+%%DATADIR%%/boards/sounds/hi/misc/fantastic.ogg
+%%DATADIR%%/boards/sounds/hi/misc/good.ogg
+%%DATADIR%%/boards/sounds/hi/misc/great.ogg
+%%DATADIR%%/boards/sounds/hi/misc/help.ogg
+%%DATADIR%%/boards/sounds/hi/misc/level.ogg
+%%DATADIR%%/boards/sounds/hi/misc/minus.ogg
+%%DATADIR%%/boards/sounds/hi/misc/ok.ogg
+%%DATADIR%%/boards/sounds/hi/misc/outof.ogg
+%%DATADIR%%/boards/sounds/hi/misc/perfect.ogg
+%%DATADIR%%/boards/sounds/hi/misc/plus.ogg
+%%DATADIR%%/boards/sounds/hi/misc/quit.ogg
+%%DATADIR%%/boards/sounds/hi/misc/super.ogg
+%%DATADIR%%/boards/sounds/hi/misc/waytogo.ogg
+%%DATADIR%%/boards/sounds/hi/misc/welcome.ogg
+%%DATADIR%%/boards/sounds/hu/alphabet/10.ogg
+%%DATADIR%%/boards/sounds/hu/alphabet/README
+%%DATADIR%%/boards/sounds/hu/alphabet/U0031.ogg
+%%DATADIR%%/boards/sounds/hu/alphabet/U0032.ogg
+%%DATADIR%%/boards/sounds/hu/alphabet/U0033.ogg
+%%DATADIR%%/boards/sounds/hu/alphabet/U0034.ogg
+%%DATADIR%%/boards/sounds/hu/alphabet/U0035.ogg
+%%DATADIR%%/boards/sounds/hu/alphabet/U0036.ogg
+%%DATADIR%%/boards/sounds/hu/alphabet/U0037.ogg
+%%DATADIR%%/boards/sounds/hu/alphabet/U0038.ogg
+%%DATADIR%%/boards/sounds/hu/alphabet/U0039.ogg
+%%DATADIR%%/boards/sounds/hu/colors/README
+%%DATADIR%%/boards/sounds/hu/colors/black.ogg
+%%DATADIR%%/boards/sounds/hu/colors/blue.ogg
+%%DATADIR%%/boards/sounds/hu/colors/brown.ogg
+%%DATADIR%%/boards/sounds/hu/colors/green.ogg
+%%DATADIR%%/boards/sounds/hu/colors/grey.ogg
+%%DATADIR%%/boards/sounds/hu/colors/orange.ogg
+%%DATADIR%%/boards/sounds/hu/colors/pink.ogg
+%%DATADIR%%/boards/sounds/hu/colors/purple.ogg
+%%DATADIR%%/boards/sounds/hu/colors/red.ogg
+%%DATADIR%%/boards/sounds/hu/colors/white.ogg
+%%DATADIR%%/boards/sounds/hu/colors/yellow.ogg
+%%DATADIR%%/boards/sounds/hu/geography/README
+%%DATADIR%%/boards/sounds/hu/geography/alaska.ogg
+%%DATADIR%%/boards/sounds/hu/geography/albania.ogg
+%%DATADIR%%/boards/sounds/hu/geography/argentina.ogg
+%%DATADIR%%/boards/sounds/hu/geography/austria.ogg
+%%DATADIR%%/boards/sounds/hu/geography/bahamas.ogg
+%%DATADIR%%/boards/sounds/hu/geography/belarus.ogg
+%%DATADIR%%/boards/sounds/hu/geography/belgium.ogg
+%%DATADIR%%/boards/sounds/hu/geography/bolivia.ogg
+%%DATADIR%%/boards/sounds/hu/geography/bosnia_herzegovina.ogg
+%%DATADIR%%/boards/sounds/hu/geography/brazil.ogg
+%%DATADIR%%/boards/sounds/hu/geography/bulgaria.ogg
+%%DATADIR%%/boards/sounds/hu/geography/canada.ogg
+%%DATADIR%%/boards/sounds/hu/geography/chile.ogg
+%%DATADIR%%/boards/sounds/hu/geography/colombia.ogg
+%%DATADIR%%/boards/sounds/hu/geography/costa_rica.ogg
+%%DATADIR%%/boards/sounds/hu/geography/croatia.ogg
+%%DATADIR%%/boards/sounds/hu/geography/cuba.ogg
+%%DATADIR%%/boards/sounds/hu/geography/cyprus.ogg
+%%DATADIR%%/boards/sounds/hu/geography/czech.ogg
+%%DATADIR%%/boards/sounds/hu/geography/denmark.ogg
+%%DATADIR%%/boards/sounds/hu/geography/dominican_republic.ogg
+%%DATADIR%%/boards/sounds/hu/geography/ecuador.ogg
+%%DATADIR%%/boards/sounds/hu/geography/estonia.ogg
+%%DATADIR%%/boards/sounds/hu/geography/finland.ogg
+%%DATADIR%%/boards/sounds/hu/geography/france.ogg
+%%DATADIR%%/boards/sounds/hu/geography/french_guiana.ogg
+%%DATADIR%%/boards/sounds/hu/geography/germany.ogg
+%%DATADIR%%/boards/sounds/hu/geography/greece.ogg
+%%DATADIR%%/boards/sounds/hu/geography/greenland.ogg
+%%DATADIR%%/boards/sounds/hu/geography/guatemala.ogg
+%%DATADIR%%/boards/sounds/hu/geography/guyana.ogg
+%%DATADIR%%/boards/sounds/hu/geography/haiti.ogg
+%%DATADIR%%/boards/sounds/hu/geography/honduras.ogg
+%%DATADIR%%/boards/sounds/hu/geography/hungary.ogg
+%%DATADIR%%/boards/sounds/hu/geography/iceland.ogg
+%%DATADIR%%/boards/sounds/hu/geography/ireland.ogg
+%%DATADIR%%/boards/sounds/hu/geography/italy.ogg
+%%DATADIR%%/boards/sounds/hu/geography/jamaica.ogg
+%%DATADIR%%/boards/sounds/hu/geography/latvia.ogg
+%%DATADIR%%/boards/sounds/hu/geography/lithuania.ogg
+%%DATADIR%%/boards/sounds/hu/geography/luxembourg.ogg
+%%DATADIR%%/boards/sounds/hu/geography/macedonia.ogg
+%%DATADIR%%/boards/sounds/hu/geography/mexico.ogg
+%%DATADIR%%/boards/sounds/hu/geography/moldova.ogg
+%%DATADIR%%/boards/sounds/hu/geography/netherland.ogg
+%%DATADIR%%/boards/sounds/hu/geography/nicaragua.ogg
+%%DATADIR%%/boards/sounds/hu/geography/norway.ogg
+%%DATADIR%%/boards/sounds/hu/geography/panama.ogg
+%%DATADIR%%/boards/sounds/hu/geography/paraguay.ogg
+%%DATADIR%%/boards/sounds/hu/geography/peru.ogg
+%%DATADIR%%/boards/sounds/hu/geography/poland.ogg
+%%DATADIR%%/boards/sounds/hu/geography/portugal.ogg
+%%DATADIR%%/boards/sounds/hu/geography/romania.ogg
+%%DATADIR%%/boards/sounds/hu/geography/russia.ogg
+%%DATADIR%%/boards/sounds/hu/geography/salvador.ogg
+%%DATADIR%%/boards/sounds/hu/geography/serbia_montenegro.ogg
+%%DATADIR%%/boards/sounds/hu/geography/slovakia.ogg
+%%DATADIR%%/boards/sounds/hu/geography/slovenia.ogg
+%%DATADIR%%/boards/sounds/hu/geography/spain.ogg
+%%DATADIR%%/boards/sounds/hu/geography/suriname.ogg
+%%DATADIR%%/boards/sounds/hu/geography/sweden.ogg
+%%DATADIR%%/boards/sounds/hu/geography/switz.ogg
+%%DATADIR%%/boards/sounds/hu/geography/turkey.ogg
+%%DATADIR%%/boards/sounds/hu/geography/ukraine.ogg
+%%DATADIR%%/boards/sounds/hu/geography/united_kingdom.ogg
+%%DATADIR%%/boards/sounds/hu/geography/uruguay.ogg
+%%DATADIR%%/boards/sounds/hu/geography/usa.ogg
+%%DATADIR%%/boards/sounds/hu/geography/venezuela.ogg
+%%DATADIR%%/boards/sounds/hu/misc/README
+%%DATADIR%%/boards/sounds/hu/misc/awesome.ogg
+%%DATADIR%%/boards/sounds/hu/misc/back.ogg
+%%DATADIR%%/boards/sounds/hu/misc/click_on_letter.ogg
+%%DATADIR%%/boards/sounds/hu/misc/congratulation.ogg
+%%DATADIR%%/boards/sounds/hu/misc/fantastic.ogg
+%%DATADIR%%/boards/sounds/hu/misc/good.ogg
+%%DATADIR%%/boards/sounds/hu/misc/great.ogg
+%%DATADIR%%/boards/sounds/hu/misc/help.ogg
+%%DATADIR%%/boards/sounds/hu/misc/ok.ogg
+%%DATADIR%%/boards/sounds/hu/misc/perfect.ogg
+%%DATADIR%%/boards/sounds/hu/misc/quit.ogg
+%%DATADIR%%/boards/sounds/hu/misc/super.ogg
+%%DATADIR%%/boards/sounds/hu/misc/welcome.ogg
+%%DATADIR%%/boards/sounds/id/alphabet/10.ogg
+%%DATADIR%%/boards/sounds/id/alphabet/README
+%%DATADIR%%/boards/sounds/id/alphabet/U0030.ogg
+%%DATADIR%%/boards/sounds/id/alphabet/U0031.ogg
+%%DATADIR%%/boards/sounds/id/alphabet/U0032.ogg
+%%DATADIR%%/boards/sounds/id/alphabet/U0033.ogg
+%%DATADIR%%/boards/sounds/id/alphabet/U0034.ogg
+%%DATADIR%%/boards/sounds/id/alphabet/U0035.ogg
+%%DATADIR%%/boards/sounds/id/alphabet/U0036.ogg
+%%DATADIR%%/boards/sounds/id/alphabet/U0037.ogg
+%%DATADIR%%/boards/sounds/id/alphabet/U0038.ogg
+%%DATADIR%%/boards/sounds/id/alphabet/U0039.ogg
+%%DATADIR%%/boards/sounds/id/alphabet/U0061.ogg
+%%DATADIR%%/boards/sounds/id/alphabet/U0062.ogg
+%%DATADIR%%/boards/sounds/id/alphabet/U0063.ogg
+%%DATADIR%%/boards/sounds/id/alphabet/U0064.ogg
+%%DATADIR%%/boards/sounds/id/alphabet/U0065.ogg
+%%DATADIR%%/boards/sounds/id/alphabet/U0066.ogg
+%%DATADIR%%/boards/sounds/id/alphabet/U0067.ogg
+%%DATADIR%%/boards/sounds/id/alphabet/U0068.ogg
+%%DATADIR%%/boards/sounds/id/alphabet/U0069.ogg
+%%DATADIR%%/boards/sounds/id/alphabet/U006A.ogg
+%%DATADIR%%/boards/sounds/id/alphabet/U006B.ogg
+%%DATADIR%%/boards/sounds/id/alphabet/U006C.ogg
+%%DATADIR%%/boards/sounds/id/alphabet/U006D.ogg
+%%DATADIR%%/boards/sounds/id/alphabet/U006E.ogg
+%%DATADIR%%/boards/sounds/id/alphabet/U006F.ogg
+%%DATADIR%%/boards/sounds/id/alphabet/U0070.ogg
+%%DATADIR%%/boards/sounds/id/alphabet/U0071.ogg
+%%DATADIR%%/boards/sounds/id/alphabet/U0072.ogg
+%%DATADIR%%/boards/sounds/id/alphabet/U0073.ogg
+%%DATADIR%%/boards/sounds/id/alphabet/U0074.ogg
+%%DATADIR%%/boards/sounds/id/alphabet/U0075.ogg
+%%DATADIR%%/boards/sounds/id/alphabet/U0076.ogg
+%%DATADIR%%/boards/sounds/id/alphabet/U0077.ogg
+%%DATADIR%%/boards/sounds/id/alphabet/U0078.ogg
+%%DATADIR%%/boards/sounds/id/alphabet/U0079.ogg
+%%DATADIR%%/boards/sounds/id/alphabet/U007A.ogg
+%%DATADIR%%/boards/sounds/id/colors/README
+%%DATADIR%%/boards/sounds/id/colors/black.ogg
+%%DATADIR%%/boards/sounds/id/colors/blue.ogg
+%%DATADIR%%/boards/sounds/id/colors/brown.ogg
+%%DATADIR%%/boards/sounds/id/colors/green.ogg
+%%DATADIR%%/boards/sounds/id/colors/grey.ogg
+%%DATADIR%%/boards/sounds/id/colors/orange.ogg
+%%DATADIR%%/boards/sounds/id/colors/pink.ogg
+%%DATADIR%%/boards/sounds/id/colors/purple.ogg
+%%DATADIR%%/boards/sounds/id/colors/red.ogg
+%%DATADIR%%/boards/sounds/id/colors/white.ogg
+%%DATADIR%%/boards/sounds/id/colors/yellow.ogg
+%%DATADIR%%/boards/sounds/id/misc/README
+%%DATADIR%%/boards/sounds/id/misc/about.ogg
+%%DATADIR%%/boards/sounds/id/misc/awesome.ogg
+%%DATADIR%%/boards/sounds/id/misc/back.ogg
+%%DATADIR%%/boards/sounds/id/misc/by.ogg
+%%DATADIR%%/boards/sounds/id/misc/check_answer.ogg
+%%DATADIR%%/boards/sounds/id/misc/click_on_letter.ogg
+%%DATADIR%%/boards/sounds/id/misc/configuration.ogg
+%%DATADIR%%/boards/sounds/id/misc/congratulation.ogg
+%%DATADIR%%/boards/sounds/id/misc/equal.ogg
+%%DATADIR%%/boards/sounds/id/misc/fantastic.ogg
+%%DATADIR%%/boards/sounds/id/misc/good.ogg
+%%DATADIR%%/boards/sounds/id/misc/great.ogg
+%%DATADIR%%/boards/sounds/id/misc/help.ogg
+%%DATADIR%%/boards/sounds/id/misc/level.ogg
+%%DATADIR%%/boards/sounds/id/misc/minus.ogg
+%%DATADIR%%/boards/sounds/id/misc/ok.ogg
+%%DATADIR%%/boards/sounds/id/misc/outof.ogg
+%%DATADIR%%/boards/sounds/id/misc/perfect.ogg
+%%DATADIR%%/boards/sounds/id/misc/plus.ogg
+%%DATADIR%%/boards/sounds/id/misc/quit.ogg
+%%DATADIR%%/boards/sounds/id/misc/super.ogg
+%%DATADIR%%/boards/sounds/id/misc/waytogo.ogg
+%%DATADIR%%/boards/sounds/id/misc/welcome.ogg
+%%DATADIR%%/boards/sounds/it/alphabet/10.ogg
+%%DATADIR%%/boards/sounds/it/alphabet/README
+%%DATADIR%%/boards/sounds/it/alphabet/U0031.ogg
+%%DATADIR%%/boards/sounds/it/alphabet/U0032.ogg
+%%DATADIR%%/boards/sounds/it/alphabet/U0033.ogg
+%%DATADIR%%/boards/sounds/it/alphabet/U0034.ogg
+%%DATADIR%%/boards/sounds/it/alphabet/U0035.ogg
+%%DATADIR%%/boards/sounds/it/alphabet/U0036.ogg
+%%DATADIR%%/boards/sounds/it/alphabet/U0037.ogg
+%%DATADIR%%/boards/sounds/it/alphabet/U0038.ogg
+%%DATADIR%%/boards/sounds/it/alphabet/U0039.ogg
+%%DATADIR%%/boards/sounds/it/alphabet/U0061.ogg
+%%DATADIR%%/boards/sounds/it/alphabet/U0062.ogg
+%%DATADIR%%/boards/sounds/it/alphabet/U0063.ogg
+%%DATADIR%%/boards/sounds/it/alphabet/U0064.ogg
+%%DATADIR%%/boards/sounds/it/alphabet/U0065.ogg
+%%DATADIR%%/boards/sounds/it/alphabet/U0066.ogg
+%%DATADIR%%/boards/sounds/it/alphabet/U0067.ogg
+%%DATADIR%%/boards/sounds/it/alphabet/U0068.ogg
+%%DATADIR%%/boards/sounds/it/alphabet/U0069.ogg
+%%DATADIR%%/boards/sounds/it/alphabet/U006A.ogg
+%%DATADIR%%/boards/sounds/it/alphabet/U006B.ogg
+%%DATADIR%%/boards/sounds/it/alphabet/U006C.ogg
+%%DATADIR%%/boards/sounds/it/alphabet/U006D.ogg
+%%DATADIR%%/boards/sounds/it/alphabet/U006E.ogg
+%%DATADIR%%/boards/sounds/it/alphabet/U006F.ogg
+%%DATADIR%%/boards/sounds/it/alphabet/U0070.ogg
+%%DATADIR%%/boards/sounds/it/alphabet/U0071.ogg
+%%DATADIR%%/boards/sounds/it/alphabet/U0072.ogg
+%%DATADIR%%/boards/sounds/it/alphabet/U0073.ogg
+%%DATADIR%%/boards/sounds/it/alphabet/U0074.ogg
+%%DATADIR%%/boards/sounds/it/alphabet/U0075.ogg
+%%DATADIR%%/boards/sounds/it/alphabet/U0076.ogg
+%%DATADIR%%/boards/sounds/it/alphabet/U0077.ogg
+%%DATADIR%%/boards/sounds/it/alphabet/U0078.ogg
+%%DATADIR%%/boards/sounds/it/alphabet/U0079.ogg
+%%DATADIR%%/boards/sounds/it/alphabet/U007A.ogg
+%%DATADIR%%/boards/sounds/it/colors/README
+%%DATADIR%%/boards/sounds/it/colors/black.ogg
+%%DATADIR%%/boards/sounds/it/colors/blue.ogg
+%%DATADIR%%/boards/sounds/it/colors/brown.ogg
+%%DATADIR%%/boards/sounds/it/colors/green.ogg
+%%DATADIR%%/boards/sounds/it/colors/grey.ogg
+%%DATADIR%%/boards/sounds/it/colors/orange.ogg
+%%DATADIR%%/boards/sounds/it/colors/pink.ogg
+%%DATADIR%%/boards/sounds/it/colors/purple.ogg
+%%DATADIR%%/boards/sounds/it/colors/red.ogg
+%%DATADIR%%/boards/sounds/it/colors/white.ogg
+%%DATADIR%%/boards/sounds/it/colors/yellow.ogg
+%%DATADIR%%/boards/sounds/it/geography/README
+%%DATADIR%%/boards/sounds/it/geography/alaska.ogg
+%%DATADIR%%/boards/sounds/it/geography/albania.ogg
+%%DATADIR%%/boards/sounds/it/geography/argentina.ogg
+%%DATADIR%%/boards/sounds/it/geography/austria.ogg
+%%DATADIR%%/boards/sounds/it/geography/bahamas.ogg
+%%DATADIR%%/boards/sounds/it/geography/belarus.ogg
+%%DATADIR%%/boards/sounds/it/geography/belgium.ogg
+%%DATADIR%%/boards/sounds/it/geography/bolivia.ogg
+%%DATADIR%%/boards/sounds/it/geography/bosnia_herzegovina.ogg
+%%DATADIR%%/boards/sounds/it/geography/brazil.ogg
+%%DATADIR%%/boards/sounds/it/geography/bulgaria.ogg
+%%DATADIR%%/boards/sounds/it/geography/canada.ogg
+%%DATADIR%%/boards/sounds/it/geography/chile.ogg
+%%DATADIR%%/boards/sounds/it/geography/colombia.ogg
+%%DATADIR%%/boards/sounds/it/geography/costa_rica.ogg
+%%DATADIR%%/boards/sounds/it/geography/croatia.ogg
+%%DATADIR%%/boards/sounds/it/geography/cuba.ogg
+%%DATADIR%%/boards/sounds/it/geography/cyprus.ogg
+%%DATADIR%%/boards/sounds/it/geography/czech.ogg
+%%DATADIR%%/boards/sounds/it/geography/denmark.ogg
+%%DATADIR%%/boards/sounds/it/geography/dominican_republic.ogg
+%%DATADIR%%/boards/sounds/it/geography/ecuador.ogg
+%%DATADIR%%/boards/sounds/it/geography/estonia.ogg
+%%DATADIR%%/boards/sounds/it/geography/finland.ogg
+%%DATADIR%%/boards/sounds/it/geography/french_guiana.ogg
+%%DATADIR%%/boards/sounds/it/geography/greece.ogg
+%%DATADIR%%/boards/sounds/it/geography/greenland.ogg
+%%DATADIR%%/boards/sounds/it/geography/guatemala.ogg
+%%DATADIR%%/boards/sounds/it/geography/guyana.ogg
+%%DATADIR%%/boards/sounds/it/geography/haiti.ogg
+%%DATADIR%%/boards/sounds/it/geography/honduras.ogg
+%%DATADIR%%/boards/sounds/it/geography/hungary.ogg
+%%DATADIR%%/boards/sounds/it/geography/iceland.ogg
+%%DATADIR%%/boards/sounds/it/geography/ireland.ogg
+%%DATADIR%%/boards/sounds/it/geography/italy.ogg
+%%DATADIR%%/boards/sounds/it/geography/jamaica.ogg
+%%DATADIR%%/boards/sounds/it/geography/latvia.ogg
+%%DATADIR%%/boards/sounds/it/geography/lithuania.ogg
+%%DATADIR%%/boards/sounds/it/geography/luxembourg.ogg
+%%DATADIR%%/boards/sounds/it/geography/macedonia.ogg
+%%DATADIR%%/boards/sounds/it/geography/mexico.ogg
+%%DATADIR%%/boards/sounds/it/geography/moldova.ogg
+%%DATADIR%%/boards/sounds/it/geography/netherland.ogg
+%%DATADIR%%/boards/sounds/it/geography/nicaragua.ogg
+%%DATADIR%%/boards/sounds/it/geography/norway.ogg
+%%DATADIR%%/boards/sounds/it/geography/panama.ogg
+%%DATADIR%%/boards/sounds/it/geography/paraguay.ogg
+%%DATADIR%%/boards/sounds/it/geography/peru.ogg
+%%DATADIR%%/boards/sounds/it/geography/poland.ogg
+%%DATADIR%%/boards/sounds/it/geography/portugal.ogg
+%%DATADIR%%/boards/sounds/it/geography/romania.ogg
+%%DATADIR%%/boards/sounds/it/geography/russia.ogg
+%%DATADIR%%/boards/sounds/it/geography/salvador.ogg
+%%DATADIR%%/boards/sounds/it/geography/serbia_montenegro.ogg
+%%DATADIR%%/boards/sounds/it/geography/slovakia.ogg
+%%DATADIR%%/boards/sounds/it/geography/slovenia.ogg
+%%DATADIR%%/boards/sounds/it/geography/spain.ogg
+%%DATADIR%%/boards/sounds/it/geography/suriname.ogg
+%%DATADIR%%/boards/sounds/it/geography/sweden.ogg
+%%DATADIR%%/boards/sounds/it/geography/switz.ogg
+%%DATADIR%%/boards/sounds/it/geography/turkey.ogg
+%%DATADIR%%/boards/sounds/it/geography/ukraine.ogg
+%%DATADIR%%/boards/sounds/it/geography/united_kingdom.ogg
+%%DATADIR%%/boards/sounds/it/geography/uruguay.ogg
+%%DATADIR%%/boards/sounds/it/geography/usa.ogg
+%%DATADIR%%/boards/sounds/it/geography/venezuela.ogg
+%%DATADIR%%/boards/sounds/it/misc/README
+%%DATADIR%%/boards/sounds/it/misc/back.ogg
+%%DATADIR%%/boards/sounds/it/misc/by.ogg
+%%DATADIR%%/boards/sounds/it/misc/click_on_letter.ogg
+%%DATADIR%%/boards/sounds/it/misc/congratulation.ogg
+%%DATADIR%%/boards/sounds/it/misc/equal.ogg
+%%DATADIR%%/boards/sounds/it/misc/good.ogg
+%%DATADIR%%/boards/sounds/it/misc/great.ogg
+%%DATADIR%%/boards/sounds/it/misc/help.ogg
+%%DATADIR%%/boards/sounds/it/misc/level.ogg
+%%DATADIR%%/boards/sounds/it/misc/minus.ogg
+%%DATADIR%%/boards/sounds/it/misc/ok.ogg
+%%DATADIR%%/boards/sounds/it/misc/outof.ogg
+%%DATADIR%%/boards/sounds/it/misc/plus.ogg
+%%DATADIR%%/boards/sounds/it/misc/quit.ogg
+%%DATADIR%%/boards/sounds/it/misc/super.ogg
+%%DATADIR%%/boards/sounds/it/misc/welcome.ogg
+%%DATADIR%%/boards/sounds/level.wav
+%%DATADIR%%/boards/sounds/line_end.wav
+%%DATADIR%%/boards/sounds/melody/guitar/melody.wav
+%%DATADIR%%/boards/sounds/melody/guitar/son1.wav
+%%DATADIR%%/boards/sounds/melody/guitar/son2.wav
+%%DATADIR%%/boards/sounds/melody/guitar/son3.wav
+%%DATADIR%%/boards/sounds/melody/guitar/son4.wav
+%%DATADIR%%/boards/sounds/melody/tachos/melody.wav
+%%DATADIR%%/boards/sounds/melody/tachos/son1.wav
+%%DATADIR%%/boards/sounds/melody/tachos/son2.wav
+%%DATADIR%%/boards/sounds/melody/tachos/son3.wav
+%%DATADIR%%/boards/sounds/melody/tachos/son4.wav
+%%DATADIR%%/boards/sounds/melody/xylofon/melody.wav
+%%DATADIR%%/boards/sounds/melody/xylofon/son1.wav
+%%DATADIR%%/boards/sounds/melody/xylofon/son2.wav
+%%DATADIR%%/boards/sounds/melody/xylofon/son3.wav
+%%DATADIR%%/boards/sounds/melody/xylofon/son4.wav
+%%DATADIR%%/boards/sounds/memory/plick.ogg
+%%DATADIR%%/boards/sounds/memory/tick.ogg
+%%DATADIR%%/boards/sounds/memory/tri.ogg
+%%DATADIR%%/boards/sounds/mr/alphabet/10.ogg
+%%DATADIR%%/boards/sounds/mr/alphabet/U0030.ogg
+%%DATADIR%%/boards/sounds/mr/alphabet/U0031.ogg
+%%DATADIR%%/boards/sounds/mr/alphabet/U0032.ogg
+%%DATADIR%%/boards/sounds/mr/alphabet/U0033.ogg
+%%DATADIR%%/boards/sounds/mr/alphabet/U0034.ogg
+%%DATADIR%%/boards/sounds/mr/alphabet/U0035.ogg
+%%DATADIR%%/boards/sounds/mr/alphabet/U0036.ogg
+%%DATADIR%%/boards/sounds/mr/alphabet/U0037.ogg
+%%DATADIR%%/boards/sounds/mr/alphabet/U0038.ogg
+%%DATADIR%%/boards/sounds/mr/alphabet/U0039.ogg
+%%DATADIR%%/boards/sounds/mr/alphabet/U0061.ogg
+%%DATADIR%%/boards/sounds/mr/alphabet/U0062.ogg
+%%DATADIR%%/boards/sounds/mr/alphabet/U0063.ogg
+%%DATADIR%%/boards/sounds/mr/alphabet/U0064.ogg
+%%DATADIR%%/boards/sounds/mr/alphabet/U0065.ogg
+%%DATADIR%%/boards/sounds/mr/alphabet/U0066.ogg
+%%DATADIR%%/boards/sounds/mr/alphabet/U0067.ogg
+%%DATADIR%%/boards/sounds/mr/alphabet/U0068.ogg
+%%DATADIR%%/boards/sounds/mr/alphabet/U0069.ogg
+%%DATADIR%%/boards/sounds/mr/alphabet/U006A.ogg
+%%DATADIR%%/boards/sounds/mr/alphabet/U006B.ogg
+%%DATADIR%%/boards/sounds/mr/alphabet/U006C.ogg
+%%DATADIR%%/boards/sounds/mr/alphabet/U006D.ogg
+%%DATADIR%%/boards/sounds/mr/alphabet/U006E.ogg
+%%DATADIR%%/boards/sounds/mr/alphabet/U006F.ogg
+%%DATADIR%%/boards/sounds/mr/alphabet/U0070.ogg
+%%DATADIR%%/boards/sounds/mr/alphabet/U0071.ogg
+%%DATADIR%%/boards/sounds/mr/alphabet/U0072.ogg
+%%DATADIR%%/boards/sounds/mr/alphabet/U0073.ogg
+%%DATADIR%%/boards/sounds/mr/alphabet/U0074.ogg
+%%DATADIR%%/boards/sounds/mr/alphabet/U0075.ogg
+%%DATADIR%%/boards/sounds/mr/alphabet/U0076.ogg
+%%DATADIR%%/boards/sounds/mr/alphabet/U0077.ogg
+%%DATADIR%%/boards/sounds/mr/alphabet/U0078.ogg
+%%DATADIR%%/boards/sounds/mr/alphabet/U0079.ogg
+%%DATADIR%%/boards/sounds/mr/alphabet/U007A.ogg
+%%DATADIR%%/boards/sounds/mr/colors/black.ogg
+%%DATADIR%%/boards/sounds/mr/colors/blue.ogg
+%%DATADIR%%/boards/sounds/mr/colors/brown.ogg
+%%DATADIR%%/boards/sounds/mr/colors/green.ogg
+%%DATADIR%%/boards/sounds/mr/colors/grey.ogg
+%%DATADIR%%/boards/sounds/mr/colors/orange.ogg
+%%DATADIR%%/boards/sounds/mr/colors/pink.ogg
+%%DATADIR%%/boards/sounds/mr/colors/purple.ogg
+%%DATADIR%%/boards/sounds/mr/colors/red.ogg
+%%DATADIR%%/boards/sounds/mr/colors/white.ogg
+%%DATADIR%%/boards/sounds/mr/colors/yellow.ogg
+%%DATADIR%%/boards/sounds/mr/geography/africa.ogg
+%%DATADIR%%/boards/sounds/mr/geography/alaska.ogg
+%%DATADIR%%/boards/sounds/mr/geography/albania.ogg
+%%DATADIR%%/boards/sounds/mr/geography/algeria.ogg
+%%DATADIR%%/boards/sounds/mr/geography/america.ogg
+%%DATADIR%%/boards/sounds/mr/geography/angola.ogg
+%%DATADIR%%/boards/sounds/mr/geography/antartica.ogg
+%%DATADIR%%/boards/sounds/mr/geography/argentina.ogg
+%%DATADIR%%/boards/sounds/mr/geography/asia.ogg
+%%DATADIR%%/boards/sounds/mr/geography/austria.ogg
+%%DATADIR%%/boards/sounds/mr/geography/bahamas.ogg
+%%DATADIR%%/boards/sounds/mr/geography/belarus.ogg
+%%DATADIR%%/boards/sounds/mr/geography/belgium.ogg
+%%DATADIR%%/boards/sounds/mr/geography/benin.ogg
+%%DATADIR%%/boards/sounds/mr/geography/bolivia.ogg
+%%DATADIR%%/boards/sounds/mr/geography/bosnia_herzegovina.ogg
+%%DATADIR%%/boards/sounds/mr/geography/botswana.ogg
+%%DATADIR%%/boards/sounds/mr/geography/brazil.ogg
+%%DATADIR%%/boards/sounds/mr/geography/bulgaria.ogg
+%%DATADIR%%/boards/sounds/mr/geography/burkina.ogg
+%%DATADIR%%/boards/sounds/mr/geography/burundi.ogg
+%%DATADIR%%/boards/sounds/mr/geography/cameroon.ogg
+%%DATADIR%%/boards/sounds/mr/geography/canada.ogg
+%%DATADIR%%/boards/sounds/mr/geography/central_african_republic.ogg
+%%DATADIR%%/boards/sounds/mr/geography/chad.ogg
+%%DATADIR%%/boards/sounds/mr/geography/chile.ogg
+%%DATADIR%%/boards/sounds/mr/geography/colombia.ogg
+%%DATADIR%%/boards/sounds/mr/geography/congo.ogg
+%%DATADIR%%/boards/sounds/mr/geography/costa_rica.ogg
+%%DATADIR%%/boards/sounds/mr/geography/croatia.ogg
+%%DATADIR%%/boards/sounds/mr/geography/cuba.ogg
+%%DATADIR%%/boards/sounds/mr/geography/cyprus.ogg
+%%DATADIR%%/boards/sounds/mr/geography/czech.ogg
+%%DATADIR%%/boards/sounds/mr/geography/denmark.ogg
+%%DATADIR%%/boards/sounds/mr/geography/djibouti.ogg
+%%DATADIR%%/boards/sounds/mr/geography/dominican_republic.ogg
+%%DATADIR%%/boards/sounds/mr/geography/ecuador.ogg
+%%DATADIR%%/boards/sounds/mr/geography/egypt.ogg
+%%DATADIR%%/boards/sounds/mr/geography/equatorial_guinea.ogg
+%%DATADIR%%/boards/sounds/mr/geography/eritrea.ogg
+%%DATADIR%%/boards/sounds/mr/geography/estonia.ogg
+%%DATADIR%%/boards/sounds/mr/geography/ethiopia.ogg
+%%DATADIR%%/boards/sounds/mr/geography/europe.ogg
+%%DATADIR%%/boards/sounds/mr/geography/finland.ogg
+%%DATADIR%%/boards/sounds/mr/geography/france.ogg
+%%DATADIR%%/boards/sounds/mr/geography/french_guiana.ogg
+%%DATADIR%%/boards/sounds/mr/geography/gabon.ogg
+%%DATADIR%%/boards/sounds/mr/geography/gambia.ogg
+%%DATADIR%%/boards/sounds/mr/geography/germany.ogg
+%%DATADIR%%/boards/sounds/mr/geography/ghana.ogg
+%%DATADIR%%/boards/sounds/mr/geography/greece.ogg
+%%DATADIR%%/boards/sounds/mr/geography/greenland.ogg
+%%DATADIR%%/boards/sounds/mr/geography/guatemala.ogg
+%%DATADIR%%/boards/sounds/mr/geography/guinea.ogg
+%%DATADIR%%/boards/sounds/mr/geography/guinea_bissau.ogg
+%%DATADIR%%/boards/sounds/mr/geography/guyana.ogg
+%%DATADIR%%/boards/sounds/mr/geography/haiti.ogg
+%%DATADIR%%/boards/sounds/mr/geography/honduras.ogg
+%%DATADIR%%/boards/sounds/mr/geography/hungary.ogg
+%%DATADIR%%/boards/sounds/mr/geography/iceland.ogg
+%%DATADIR%%/boards/sounds/mr/geography/ireland.ogg
+%%DATADIR%%/boards/sounds/mr/geography/italy.ogg
+%%DATADIR%%/boards/sounds/mr/geography/ivory_coast.ogg
+%%DATADIR%%/boards/sounds/mr/geography/jamaica.ogg
+%%DATADIR%%/boards/sounds/mr/geography/kenya.ogg
+%%DATADIR%%/boards/sounds/mr/geography/latvia.ogg
+%%DATADIR%%/boards/sounds/mr/geography/lesotho.ogg
+%%DATADIR%%/boards/sounds/mr/geography/liberia.ogg
+%%DATADIR%%/boards/sounds/mr/geography/libya.ogg
+%%DATADIR%%/boards/sounds/mr/geography/lithuania.ogg
+%%DATADIR%%/boards/sounds/mr/geography/luxembourg.ogg
+%%DATADIR%%/boards/sounds/mr/geography/macedonia.ogg
+%%DATADIR%%/boards/sounds/mr/geography/madagascar.ogg
+%%DATADIR%%/boards/sounds/mr/geography/malawi.ogg
+%%DATADIR%%/boards/sounds/mr/geography/mali.ogg
+%%DATADIR%%/boards/sounds/mr/geography/mauritania.ogg
+%%DATADIR%%/boards/sounds/mr/geography/mexico.ogg
+%%DATADIR%%/boards/sounds/mr/geography/moldova.ogg
+%%DATADIR%%/boards/sounds/mr/geography/moroco.ogg
+%%DATADIR%%/boards/sounds/mr/geography/mozambique.ogg
+%%DATADIR%%/boards/sounds/mr/geography/namibia.ogg
+%%DATADIR%%/boards/sounds/mr/geography/netherland.ogg
+%%DATADIR%%/boards/sounds/mr/geography/nicaragua.ogg
+%%DATADIR%%/boards/sounds/mr/geography/niger.ogg
+%%DATADIR%%/boards/sounds/mr/geography/nigeria.ogg
+%%DATADIR%%/boards/sounds/mr/geography/north_america.ogg
+%%DATADIR%%/boards/sounds/mr/geography/norway.ogg
+%%DATADIR%%/boards/sounds/mr/geography/oceania.ogg
+%%DATADIR%%/boards/sounds/mr/geography/panama.ogg
+%%DATADIR%%/boards/sounds/mr/geography/paraguay.ogg
+%%DATADIR%%/boards/sounds/mr/geography/peru.ogg
+%%DATADIR%%/boards/sounds/mr/geography/poland.ogg
+%%DATADIR%%/boards/sounds/mr/geography/portugal.ogg
+%%DATADIR%%/boards/sounds/mr/geography/republic_of_congo.ogg
+%%DATADIR%%/boards/sounds/mr/geography/romania.ogg
+%%DATADIR%%/boards/sounds/mr/geography/russia.ogg
+%%DATADIR%%/boards/sounds/mr/geography/rwanda.ogg
+%%DATADIR%%/boards/sounds/mr/geography/salvador.ogg
+%%DATADIR%%/boards/sounds/mr/geography/senegal.ogg
+%%DATADIR%%/boards/sounds/mr/geography/serbia_montenegro.ogg
+%%DATADIR%%/boards/sounds/mr/geography/sierra_leone.ogg
+%%DATADIR%%/boards/sounds/mr/geography/slovakia.ogg
+%%DATADIR%%/boards/sounds/mr/geography/slovenia.ogg
+%%DATADIR%%/boards/sounds/mr/geography/somalia.ogg
+%%DATADIR%%/boards/sounds/mr/geography/soudan.ogg
+%%DATADIR%%/boards/sounds/mr/geography/south_africa.ogg
+%%DATADIR%%/boards/sounds/mr/geography/south_america.ogg
+%%DATADIR%%/boards/sounds/mr/geography/spain.ogg
+%%DATADIR%%/boards/sounds/mr/geography/suriname.ogg
+%%DATADIR%%/boards/sounds/mr/geography/swaziland.ogg
+%%DATADIR%%/boards/sounds/mr/geography/sweden.ogg
+%%DATADIR%%/boards/sounds/mr/geography/switz.ogg
+%%DATADIR%%/boards/sounds/mr/geography/tanzania.ogg
+%%DATADIR%%/boards/sounds/mr/geography/togo.ogg
+%%DATADIR%%/boards/sounds/mr/geography/tunisia.ogg
+%%DATADIR%%/boards/sounds/mr/geography/turkey.ogg
+%%DATADIR%%/boards/sounds/mr/geography/uganda.ogg
+%%DATADIR%%/boards/sounds/mr/geography/ukraine.ogg
+%%DATADIR%%/boards/sounds/mr/geography/united_kingdom.ogg
+%%DATADIR%%/boards/sounds/mr/geography/uruguay.ogg
+%%DATADIR%%/boards/sounds/mr/geography/usa.ogg
+%%DATADIR%%/boards/sounds/mr/geography/venezuela.ogg
+%%DATADIR%%/boards/sounds/mr/geography/zambia.ogg
+%%DATADIR%%/boards/sounds/mr/geography/zimbabwe.ogg
+%%DATADIR%%/boards/sounds/mr/misc/about.ogg
+%%DATADIR%%/boards/sounds/mr/misc/awesome.ogg
+%%DATADIR%%/boards/sounds/mr/misc/back.ogg
+%%DATADIR%%/boards/sounds/mr/misc/by.ogg
+%%DATADIR%%/boards/sounds/mr/misc/check_answer.ogg
+%%DATADIR%%/boards/sounds/mr/misc/click_on_letter.ogg
+%%DATADIR%%/boards/sounds/mr/misc/configuration.ogg
+%%DATADIR%%/boards/sounds/mr/misc/congratulation.ogg
+%%DATADIR%%/boards/sounds/mr/misc/equal.ogg
+%%DATADIR%%/boards/sounds/mr/misc/fantastic.ogg
+%%DATADIR%%/boards/sounds/mr/misc/good.ogg
+%%DATADIR%%/boards/sounds/mr/misc/great.ogg
+%%DATADIR%%/boards/sounds/mr/misc/help.ogg
+%%DATADIR%%/boards/sounds/mr/misc/level.ogg
+%%DATADIR%%/boards/sounds/mr/misc/minus.ogg
+%%DATADIR%%/boards/sounds/mr/misc/ok.ogg
+%%DATADIR%%/boards/sounds/mr/misc/outof.ogg
+%%DATADIR%%/boards/sounds/mr/misc/perfect.ogg
+%%DATADIR%%/boards/sounds/mr/misc/plus.ogg
+%%DATADIR%%/boards/sounds/mr/misc/quit.ogg
+%%DATADIR%%/boards/sounds/mr/misc/super.ogg
+%%DATADIR%%/boards/sounds/mr/misc/waytogo.ogg
+%%DATADIR%%/boards/sounds/mr/misc/welcome.ogg
+%%DATADIR%%/boards/sounds/nb/alphabet/10.ogg
+%%DATADIR%%/boards/sounds/nb/alphabet/README
+%%DATADIR%%/boards/sounds/nb/alphabet/U0030.ogg
+%%DATADIR%%/boards/sounds/nb/alphabet/U0031.ogg
+%%DATADIR%%/boards/sounds/nb/alphabet/U0032.ogg
+%%DATADIR%%/boards/sounds/nb/alphabet/U0033.ogg
+%%DATADIR%%/boards/sounds/nb/alphabet/U0034.ogg
+%%DATADIR%%/boards/sounds/nb/alphabet/U0035.ogg
+%%DATADIR%%/boards/sounds/nb/alphabet/U0036.ogg
+%%DATADIR%%/boards/sounds/nb/alphabet/U0037.ogg
+%%DATADIR%%/boards/sounds/nb/alphabet/U0038.ogg
+%%DATADIR%%/boards/sounds/nb/alphabet/U0039.ogg
+%%DATADIR%%/boards/sounds/nb/alphabet/U0061.ogg
+%%DATADIR%%/boards/sounds/nb/alphabet/U0062.ogg
+%%DATADIR%%/boards/sounds/nb/alphabet/U0063.ogg
+%%DATADIR%%/boards/sounds/nb/alphabet/U0064.ogg
+%%DATADIR%%/boards/sounds/nb/alphabet/U0065.ogg
+%%DATADIR%%/boards/sounds/nb/alphabet/U0066.ogg
+%%DATADIR%%/boards/sounds/nb/alphabet/U0067.ogg
+%%DATADIR%%/boards/sounds/nb/alphabet/U0068.ogg
+%%DATADIR%%/boards/sounds/nb/alphabet/U0069.ogg
+%%DATADIR%%/boards/sounds/nb/alphabet/U006A.ogg
+%%DATADIR%%/boards/sounds/nb/alphabet/U006B.ogg
+%%DATADIR%%/boards/sounds/nb/alphabet/U006C.ogg
+%%DATADIR%%/boards/sounds/nb/alphabet/U006D.ogg
+%%DATADIR%%/boards/sounds/nb/alphabet/U006E.ogg
+%%DATADIR%%/boards/sounds/nb/alphabet/U006F.ogg
+%%DATADIR%%/boards/sounds/nb/alphabet/U0070.ogg
+%%DATADIR%%/boards/sounds/nb/alphabet/U0071.ogg
+%%DATADIR%%/boards/sounds/nb/alphabet/U0072.ogg
+%%DATADIR%%/boards/sounds/nb/alphabet/U0073.ogg
+%%DATADIR%%/boards/sounds/nb/alphabet/U0074.ogg
+%%DATADIR%%/boards/sounds/nb/alphabet/U0075.ogg
+%%DATADIR%%/boards/sounds/nb/alphabet/U0076.ogg
+%%DATADIR%%/boards/sounds/nb/alphabet/U0077.ogg
+%%DATADIR%%/boards/sounds/nb/alphabet/U0078.ogg
+%%DATADIR%%/boards/sounds/nb/alphabet/U0079.ogg
+%%DATADIR%%/boards/sounds/nb/alphabet/U007A.ogg
+%%DATADIR%%/boards/sounds/nb/alphabet/U00E5.ogg
+%%DATADIR%%/boards/sounds/nb/alphabet/U00E6.ogg
+%%DATADIR%%/boards/sounds/nb/alphabet/U00F8.ogg
+%%DATADIR%%/boards/sounds/nb/colors/README
+%%DATADIR%%/boards/sounds/nb/colors/black.ogg
+%%DATADIR%%/boards/sounds/nb/colors/blue.ogg
+%%DATADIR%%/boards/sounds/nb/colors/brown.ogg
+%%DATADIR%%/boards/sounds/nb/colors/green.ogg
+%%DATADIR%%/boards/sounds/nb/colors/grey.ogg
+%%DATADIR%%/boards/sounds/nb/colors/orange.ogg
+%%DATADIR%%/boards/sounds/nb/colors/pink.ogg
+%%DATADIR%%/boards/sounds/nb/colors/purple.ogg
+%%DATADIR%%/boards/sounds/nb/colors/red.ogg
+%%DATADIR%%/boards/sounds/nb/colors/white.ogg
+%%DATADIR%%/boards/sounds/nb/colors/yellow.ogg
+%%DATADIR%%/boards/sounds/nb/geography/README
+%%DATADIR%%/boards/sounds/nb/geography/africa.ogg
+%%DATADIR%%/boards/sounds/nb/geography/alaska.ogg
+%%DATADIR%%/boards/sounds/nb/geography/albania.ogg
+%%DATADIR%%/boards/sounds/nb/geography/america.ogg
+%%DATADIR%%/boards/sounds/nb/geography/angola.ogg
+%%DATADIR%%/boards/sounds/nb/geography/argentina.ogg
+%%DATADIR%%/boards/sounds/nb/geography/asia.ogg
+%%DATADIR%%/boards/sounds/nb/geography/austria.ogg
+%%DATADIR%%/boards/sounds/nb/geography/bahamas.ogg
+%%DATADIR%%/boards/sounds/nb/geography/belarus.ogg
+%%DATADIR%%/boards/sounds/nb/geography/belgium.ogg
+%%DATADIR%%/boards/sounds/nb/geography/benin.ogg
+%%DATADIR%%/boards/sounds/nb/geography/bolivia.ogg
+%%DATADIR%%/boards/sounds/nb/geography/bosnia_herzegovina.ogg
+%%DATADIR%%/boards/sounds/nb/geography/botswana.ogg
+%%DATADIR%%/boards/sounds/nb/geography/brazil.ogg
+%%DATADIR%%/boards/sounds/nb/geography/bulgaria.ogg
+%%DATADIR%%/boards/sounds/nb/geography/burundi.ogg
+%%DATADIR%%/boards/sounds/nb/geography/cameroon.ogg
+%%DATADIR%%/boards/sounds/nb/geography/canada.ogg
+%%DATADIR%%/boards/sounds/nb/geography/chile.ogg
+%%DATADIR%%/boards/sounds/nb/geography/colombia.ogg
+%%DATADIR%%/boards/sounds/nb/geography/congo.ogg
+%%DATADIR%%/boards/sounds/nb/geography/costa_rica.ogg
+%%DATADIR%%/boards/sounds/nb/geography/croatia.ogg
+%%DATADIR%%/boards/sounds/nb/geography/cuba.ogg
+%%DATADIR%%/boards/sounds/nb/geography/cyprus.ogg
+%%DATADIR%%/boards/sounds/nb/geography/czech.ogg
+%%DATADIR%%/boards/sounds/nb/geography/denmark.ogg
+%%DATADIR%%/boards/sounds/nb/geography/dominican_republic.ogg
+%%DATADIR%%/boards/sounds/nb/geography/ecuador.ogg
+%%DATADIR%%/boards/sounds/nb/geography/egypt.ogg
+%%DATADIR%%/boards/sounds/nb/geography/equatorial_guinea.ogg
+%%DATADIR%%/boards/sounds/nb/geography/eritrea.ogg
+%%DATADIR%%/boards/sounds/nb/geography/estonia.ogg
+%%DATADIR%%/boards/sounds/nb/geography/europe.ogg
+%%DATADIR%%/boards/sounds/nb/geography/finland.ogg
+%%DATADIR%%/boards/sounds/nb/geography/france.ogg
+%%DATADIR%%/boards/sounds/nb/geography/french_guiana.ogg
+%%DATADIR%%/boards/sounds/nb/geography/gabon.ogg
+%%DATADIR%%/boards/sounds/nb/geography/gambia.ogg
+%%DATADIR%%/boards/sounds/nb/geography/germany.ogg
+%%DATADIR%%/boards/sounds/nb/geography/ghana.ogg
+%%DATADIR%%/boards/sounds/nb/geography/greece.ogg
+%%DATADIR%%/boards/sounds/nb/geography/greenland.ogg
+%%DATADIR%%/boards/sounds/nb/geography/guatemala.ogg
+%%DATADIR%%/boards/sounds/nb/geography/guinea.ogg
+%%DATADIR%%/boards/sounds/nb/geography/haiti.ogg
+%%DATADIR%%/boards/sounds/nb/geography/honduras.ogg
+%%DATADIR%%/boards/sounds/nb/geography/hungary.ogg
+%%DATADIR%%/boards/sounds/nb/geography/iceland.ogg
+%%DATADIR%%/boards/sounds/nb/geography/ireland.ogg
+%%DATADIR%%/boards/sounds/nb/geography/italy.ogg
+%%DATADIR%%/boards/sounds/nb/geography/ivory_coast.ogg
+%%DATADIR%%/boards/sounds/nb/geography/jamaica.ogg
+%%DATADIR%%/boards/sounds/nb/geography/kenya.ogg
+%%DATADIR%%/boards/sounds/nb/geography/latvia.ogg
+%%DATADIR%%/boards/sounds/nb/geography/lesotho.ogg
+%%DATADIR%%/boards/sounds/nb/geography/liberia.ogg
+%%DATADIR%%/boards/sounds/nb/geography/lithuania.ogg
+%%DATADIR%%/boards/sounds/nb/geography/luxembourg.ogg
+%%DATADIR%%/boards/sounds/nb/geography/macedonia.ogg
+%%DATADIR%%/boards/sounds/nb/geography/madagascar.ogg
+%%DATADIR%%/boards/sounds/nb/geography/mali.ogg
+%%DATADIR%%/boards/sounds/nb/geography/mauritania.ogg
+%%DATADIR%%/boards/sounds/nb/geography/mexico.ogg
+%%DATADIR%%/boards/sounds/nb/geography/moldova.ogg
+%%DATADIR%%/boards/sounds/nb/geography/moroco.ogg
+%%DATADIR%%/boards/sounds/nb/geography/mozambique.ogg
+%%DATADIR%%/boards/sounds/nb/geography/namibia.ogg
+%%DATADIR%%/boards/sounds/nb/geography/netherland.ogg
+%%DATADIR%%/boards/sounds/nb/geography/nicaragua.ogg
+%%DATADIR%%/boards/sounds/nb/geography/niger.ogg
+%%DATADIR%%/boards/sounds/nb/geography/nigeria.ogg
+%%DATADIR%%/boards/sounds/nb/geography/north_america.ogg
+%%DATADIR%%/boards/sounds/nb/geography/norway.ogg
+%%DATADIR%%/boards/sounds/nb/geography/panama.ogg
+%%DATADIR%%/boards/sounds/nb/geography/paraguay.ogg
+%%DATADIR%%/boards/sounds/nb/geography/peru.ogg
+%%DATADIR%%/boards/sounds/nb/geography/poland.ogg
+%%DATADIR%%/boards/sounds/nb/geography/portugal.ogg
+%%DATADIR%%/boards/sounds/nb/geography/romania.ogg
+%%DATADIR%%/boards/sounds/nb/geography/russia.ogg
+%%DATADIR%%/boards/sounds/nb/geography/rwanda.ogg
+%%DATADIR%%/boards/sounds/nb/geography/salvador.ogg
+%%DATADIR%%/boards/sounds/nb/geography/senegal.ogg
+%%DATADIR%%/boards/sounds/nb/geography/serbia_montenegro.ogg
+%%DATADIR%%/boards/sounds/nb/geography/slovakia.ogg
+%%DATADIR%%/boards/sounds/nb/geography/slovenia.ogg
+%%DATADIR%%/boards/sounds/nb/geography/somalia.ogg
+%%DATADIR%%/boards/sounds/nb/geography/soudan.ogg
+%%DATADIR%%/boards/sounds/nb/geography/south_africa.ogg
+%%DATADIR%%/boards/sounds/nb/geography/south_america.ogg
+%%DATADIR%%/boards/sounds/nb/geography/spain.ogg
+%%DATADIR%%/boards/sounds/nb/geography/suriname.ogg
+%%DATADIR%%/boards/sounds/nb/geography/swaziland.ogg
+%%DATADIR%%/boards/sounds/nb/geography/sweden.ogg
+%%DATADIR%%/boards/sounds/nb/geography/switz.ogg
+%%DATADIR%%/boards/sounds/nb/geography/togo.ogg
+%%DATADIR%%/boards/sounds/nb/geography/turkey.ogg
+%%DATADIR%%/boards/sounds/nb/geography/uganda.ogg
+%%DATADIR%%/boards/sounds/nb/geography/ukraine.ogg
+%%DATADIR%%/boards/sounds/nb/geography/united_kingdom.ogg
+%%DATADIR%%/boards/sounds/nb/geography/uruguay.ogg
+%%DATADIR%%/boards/sounds/nb/geography/usa.ogg
+%%DATADIR%%/boards/sounds/nb/geography/venezuela.ogg
+%%DATADIR%%/boards/sounds/nb/geography/zambia.ogg
+%%DATADIR%%/boards/sounds/nb/geography/zimbabwe.ogg
+%%DATADIR%%/boards/sounds/nb/misc/README
+%%DATADIR%%/boards/sounds/nb/misc/about.ogg
+%%DATADIR%%/boards/sounds/nb/misc/awesome.ogg
+%%DATADIR%%/boards/sounds/nb/misc/back.ogg
+%%DATADIR%%/boards/sounds/nb/misc/by.ogg
+%%DATADIR%%/boards/sounds/nb/misc/check_answer.ogg
+%%DATADIR%%/boards/sounds/nb/misc/click_on_letter.ogg
+%%DATADIR%%/boards/sounds/nb/misc/configuration.ogg
+%%DATADIR%%/boards/sounds/nb/misc/congratulation.ogg
+%%DATADIR%%/boards/sounds/nb/misc/equal.ogg
+%%DATADIR%%/boards/sounds/nb/misc/fantastic.ogg
+%%DATADIR%%/boards/sounds/nb/misc/good.ogg
+%%DATADIR%%/boards/sounds/nb/misc/great.ogg
+%%DATADIR%%/boards/sounds/nb/misc/help.ogg
+%%DATADIR%%/boards/sounds/nb/misc/level.ogg
+%%DATADIR%%/boards/sounds/nb/misc/minus.ogg
+%%DATADIR%%/boards/sounds/nb/misc/ok.ogg
+%%DATADIR%%/boards/sounds/nb/misc/outof.ogg
+%%DATADIR%%/boards/sounds/nb/misc/perfect.ogg
+%%DATADIR%%/boards/sounds/nb/misc/plus.ogg
+%%DATADIR%%/boards/sounds/nb/misc/quit.ogg
+%%DATADIR%%/boards/sounds/nb/misc/super.ogg
+%%DATADIR%%/boards/sounds/nb/misc/waytogo.ogg
+%%DATADIR%%/boards/sounds/nb/misc/welcome.ogg
+%%DATADIR%%/boards/sounds/nl/alphabet/10.ogg
+%%DATADIR%%/boards/sounds/nl/alphabet/README
+%%DATADIR%%/boards/sounds/nl/alphabet/U0030.ogg
+%%DATADIR%%/boards/sounds/nl/alphabet/U0031.ogg
+%%DATADIR%%/boards/sounds/nl/alphabet/U0032.ogg
+%%DATADIR%%/boards/sounds/nl/alphabet/U0033.ogg
+%%DATADIR%%/boards/sounds/nl/alphabet/U0034.ogg
+%%DATADIR%%/boards/sounds/nl/alphabet/U0035.ogg
+%%DATADIR%%/boards/sounds/nl/alphabet/U0036.ogg
+%%DATADIR%%/boards/sounds/nl/alphabet/U0037.ogg
+%%DATADIR%%/boards/sounds/nl/alphabet/U0038.ogg
+%%DATADIR%%/boards/sounds/nl/alphabet/U0039.ogg
+%%DATADIR%%/boards/sounds/nl/alphabet/U0061.ogg
+%%DATADIR%%/boards/sounds/nl/alphabet/U0062.ogg
+%%DATADIR%%/boards/sounds/nl/alphabet/U0063.ogg
+%%DATADIR%%/boards/sounds/nl/alphabet/U0064.ogg
+%%DATADIR%%/boards/sounds/nl/alphabet/U0065.ogg
+%%DATADIR%%/boards/sounds/nl/alphabet/U0066.ogg
+%%DATADIR%%/boards/sounds/nl/alphabet/U0067.ogg
+%%DATADIR%%/boards/sounds/nl/alphabet/U0068.ogg
+%%DATADIR%%/boards/sounds/nl/alphabet/U0069.ogg
+%%DATADIR%%/boards/sounds/nl/alphabet/U006A.ogg
+%%DATADIR%%/boards/sounds/nl/alphabet/U006B.ogg
+%%DATADIR%%/boards/sounds/nl/alphabet/U006C.ogg
+%%DATADIR%%/boards/sounds/nl/alphabet/U006D.ogg
+%%DATADIR%%/boards/sounds/nl/alphabet/U006E.ogg
+%%DATADIR%%/boards/sounds/nl/alphabet/U006F.ogg
+%%DATADIR%%/boards/sounds/nl/alphabet/U0070.ogg
+%%DATADIR%%/boards/sounds/nl/alphabet/U0071.ogg
+%%DATADIR%%/boards/sounds/nl/alphabet/U0072.ogg
+%%DATADIR%%/boards/sounds/nl/alphabet/U0073.ogg
+%%DATADIR%%/boards/sounds/nl/alphabet/U0074.ogg
+%%DATADIR%%/boards/sounds/nl/alphabet/U0075.ogg
+%%DATADIR%%/boards/sounds/nl/alphabet/U0076.ogg
+%%DATADIR%%/boards/sounds/nl/alphabet/U0077.ogg
+%%DATADIR%%/boards/sounds/nl/alphabet/U0078.ogg
+%%DATADIR%%/boards/sounds/nl/alphabet/U0079.ogg
+%%DATADIR%%/boards/sounds/nl/alphabet/U007A.ogg
+%%DATADIR%%/boards/sounds/nl/colors/README
+%%DATADIR%%/boards/sounds/nl/colors/black.ogg
+%%DATADIR%%/boards/sounds/nl/colors/blue.ogg
+%%DATADIR%%/boards/sounds/nl/colors/brown.ogg
+%%DATADIR%%/boards/sounds/nl/colors/green.ogg
+%%DATADIR%%/boards/sounds/nl/colors/grey.ogg
+%%DATADIR%%/boards/sounds/nl/colors/orange.ogg
+%%DATADIR%%/boards/sounds/nl/colors/pink.ogg
+%%DATADIR%%/boards/sounds/nl/colors/purple.ogg
+%%DATADIR%%/boards/sounds/nl/colors/red.ogg
+%%DATADIR%%/boards/sounds/nl/colors/white.ogg
+%%DATADIR%%/boards/sounds/nl/colors/yellow.ogg
+%%DATADIR%%/boards/sounds/nl/geography/README
+%%DATADIR%%/boards/sounds/nl/geography/alaska.ogg
+%%DATADIR%%/boards/sounds/nl/geography/albania.ogg
+%%DATADIR%%/boards/sounds/nl/geography/argentina.ogg
+%%DATADIR%%/boards/sounds/nl/geography/austria.ogg
+%%DATADIR%%/boards/sounds/nl/geography/bahamas.ogg
+%%DATADIR%%/boards/sounds/nl/geography/belarus.ogg
+%%DATADIR%%/boards/sounds/nl/geography/belgium.ogg
+%%DATADIR%%/boards/sounds/nl/geography/bolivia.ogg
+%%DATADIR%%/boards/sounds/nl/geography/bosnia_herzegovina.ogg
+%%DATADIR%%/boards/sounds/nl/geography/brazil.ogg
+%%DATADIR%%/boards/sounds/nl/geography/bulgaria.ogg
+%%DATADIR%%/boards/sounds/nl/geography/canada.ogg
+%%DATADIR%%/boards/sounds/nl/geography/chile.ogg
+%%DATADIR%%/boards/sounds/nl/geography/colombia.ogg
+%%DATADIR%%/boards/sounds/nl/geography/costa_rica.ogg
+%%DATADIR%%/boards/sounds/nl/geography/croatia.ogg
+%%DATADIR%%/boards/sounds/nl/geography/cuba.ogg
+%%DATADIR%%/boards/sounds/nl/geography/cyprus.ogg
+%%DATADIR%%/boards/sounds/nl/geography/czech.ogg
+%%DATADIR%%/boards/sounds/nl/geography/denmark.ogg
+%%DATADIR%%/boards/sounds/nl/geography/dominican_republic.ogg
+%%DATADIR%%/boards/sounds/nl/geography/ecuador.ogg
+%%DATADIR%%/boards/sounds/nl/geography/estonia.ogg
+%%DATADIR%%/boards/sounds/nl/geography/finland.ogg
+%%DATADIR%%/boards/sounds/nl/geography/france.ogg
+%%DATADIR%%/boards/sounds/nl/geography/french_guiana.ogg
+%%DATADIR%%/boards/sounds/nl/geography/germany.ogg
+%%DATADIR%%/boards/sounds/nl/geography/greece.ogg
+%%DATADIR%%/boards/sounds/nl/geography/greenland.ogg
+%%DATADIR%%/boards/sounds/nl/geography/guatemala.ogg
+%%DATADIR%%/boards/sounds/nl/geography/guyana.ogg
+%%DATADIR%%/boards/sounds/nl/geography/haiti.ogg
+%%DATADIR%%/boards/sounds/nl/geography/honduras.ogg
+%%DATADIR%%/boards/sounds/nl/geography/hungary.ogg
+%%DATADIR%%/boards/sounds/nl/geography/iceland.ogg
+%%DATADIR%%/boards/sounds/nl/geography/ireland.ogg
+%%DATADIR%%/boards/sounds/nl/geography/italy.ogg
+%%DATADIR%%/boards/sounds/nl/geography/jamaica.ogg
+%%DATADIR%%/boards/sounds/nl/geography/latvia.ogg
+%%DATADIR%%/boards/sounds/nl/geography/lithuania.ogg
+%%DATADIR%%/boards/sounds/nl/geography/luxembourg.ogg
+%%DATADIR%%/boards/sounds/nl/geography/macedonia.ogg
+%%DATADIR%%/boards/sounds/nl/geography/mexico.ogg
+%%DATADIR%%/boards/sounds/nl/geography/moldova.ogg
+%%DATADIR%%/boards/sounds/nl/geography/netherland.ogg
+%%DATADIR%%/boards/sounds/nl/geography/nicaragua.ogg
+%%DATADIR%%/boards/sounds/nl/geography/norway.ogg
+%%DATADIR%%/boards/sounds/nl/geography/panama.ogg
+%%DATADIR%%/boards/sounds/nl/geography/paraguay.ogg
+%%DATADIR%%/boards/sounds/nl/geography/peru.ogg
+%%DATADIR%%/boards/sounds/nl/geography/poland.ogg
+%%DATADIR%%/boards/sounds/nl/geography/portugal.ogg
+%%DATADIR%%/boards/sounds/nl/geography/romania.ogg
+%%DATADIR%%/boards/sounds/nl/geography/russia.ogg
+%%DATADIR%%/boards/sounds/nl/geography/salvador.ogg
+%%DATADIR%%/boards/sounds/nl/geography/serbia_montenegro.ogg
+%%DATADIR%%/boards/sounds/nl/geography/slovakia.ogg
+%%DATADIR%%/boards/sounds/nl/geography/slovenia.ogg
+%%DATADIR%%/boards/sounds/nl/geography/spain.ogg
+%%DATADIR%%/boards/sounds/nl/geography/suriname.ogg
+%%DATADIR%%/boards/sounds/nl/geography/sweden.ogg
+%%DATADIR%%/boards/sounds/nl/geography/switz.ogg
+%%DATADIR%%/boards/sounds/nl/geography/turkey.ogg
+%%DATADIR%%/boards/sounds/nl/geography/ukraine.ogg
+%%DATADIR%%/boards/sounds/nl/geography/united_kingdom.ogg
+%%DATADIR%%/boards/sounds/nl/geography/uruguay.ogg
+%%DATADIR%%/boards/sounds/nl/geography/usa.ogg
+%%DATADIR%%/boards/sounds/nl/geography/venezuela.ogg
+%%DATADIR%%/boards/sounds/nl/misc/README
+%%DATADIR%%/boards/sounds/nl/misc/awesome.ogg
+%%DATADIR%%/boards/sounds/nl/misc/back.ogg
+%%DATADIR%%/boards/sounds/nl/misc/by.ogg
+%%DATADIR%%/boards/sounds/nl/misc/check_answer.ogg
+%%DATADIR%%/boards/sounds/nl/misc/click_on_letter.ogg
+%%DATADIR%%/boards/sounds/nl/misc/congratulation.ogg
+%%DATADIR%%/boards/sounds/nl/misc/equal.ogg
+%%DATADIR%%/boards/sounds/nl/misc/fantastic.ogg
+%%DATADIR%%/boards/sounds/nl/misc/good.ogg
+%%DATADIR%%/boards/sounds/nl/misc/great.ogg
+%%DATADIR%%/boards/sounds/nl/misc/help.ogg
+%%DATADIR%%/boards/sounds/nl/misc/level.ogg
+%%DATADIR%%/boards/sounds/nl/misc/minus.ogg
+%%DATADIR%%/boards/sounds/nl/misc/ok.ogg
+%%DATADIR%%/boards/sounds/nl/misc/outof.ogg
+%%DATADIR%%/boards/sounds/nl/misc/perfect.ogg
+%%DATADIR%%/boards/sounds/nl/misc/plus.ogg
+%%DATADIR%%/boards/sounds/nl/misc/quit.ogg
+%%DATADIR%%/boards/sounds/nl/misc/super.ogg
+%%DATADIR%%/boards/sounds/nl/misc/waytogo.ogg
+%%DATADIR%%/boards/sounds/nl/misc/welcome.ogg
+%%DATADIR%%/boards/sounds/paint1.wav
+%%DATADIR%%/boards/sounds/prompt.wav
+%%DATADIR%%/boards/sounds/pt/alphabet/10.ogg
+%%DATADIR%%/boards/sounds/pt/alphabet/README
+%%DATADIR%%/boards/sounds/pt/alphabet/U0030.ogg
+%%DATADIR%%/boards/sounds/pt/alphabet/U0031.ogg
+%%DATADIR%%/boards/sounds/pt/alphabet/U0032.ogg
+%%DATADIR%%/boards/sounds/pt/alphabet/U0033.ogg
+%%DATADIR%%/boards/sounds/pt/alphabet/U0034.ogg
+%%DATADIR%%/boards/sounds/pt/alphabet/U0035.ogg
+%%DATADIR%%/boards/sounds/pt/alphabet/U0036.ogg
+%%DATADIR%%/boards/sounds/pt/alphabet/U0037.ogg
+%%DATADIR%%/boards/sounds/pt/alphabet/U0038.ogg
+%%DATADIR%%/boards/sounds/pt/alphabet/U0039.ogg
+%%DATADIR%%/boards/sounds/pt/alphabet/U0061.ogg
+%%DATADIR%%/boards/sounds/pt/alphabet/U0062.ogg
+%%DATADIR%%/boards/sounds/pt/alphabet/U0063.ogg
+%%DATADIR%%/boards/sounds/pt/alphabet/U0064.ogg
+%%DATADIR%%/boards/sounds/pt/alphabet/U0065.ogg
+%%DATADIR%%/boards/sounds/pt/alphabet/U0066.ogg
+%%DATADIR%%/boards/sounds/pt/alphabet/U0067.ogg
+%%DATADIR%%/boards/sounds/pt/alphabet/U0068.ogg
+%%DATADIR%%/boards/sounds/pt/alphabet/U0069.ogg
+%%DATADIR%%/boards/sounds/pt/alphabet/U006A.ogg
+%%DATADIR%%/boards/sounds/pt/alphabet/U006B.ogg
+%%DATADIR%%/boards/sounds/pt/alphabet/U006C.ogg
+%%DATADIR%%/boards/sounds/pt/alphabet/U006D.ogg
+%%DATADIR%%/boards/sounds/pt/alphabet/U006E.ogg
+%%DATADIR%%/boards/sounds/pt/alphabet/U006F.ogg
+%%DATADIR%%/boards/sounds/pt/alphabet/U0070.ogg
+%%DATADIR%%/boards/sounds/pt/alphabet/U0071.ogg
+%%DATADIR%%/boards/sounds/pt/alphabet/U0072.ogg
+%%DATADIR%%/boards/sounds/pt/alphabet/U0073.ogg
+%%DATADIR%%/boards/sounds/pt/alphabet/U0074.ogg
+%%DATADIR%%/boards/sounds/pt/alphabet/U0075.ogg
+%%DATADIR%%/boards/sounds/pt/alphabet/U0076.ogg
+%%DATADIR%%/boards/sounds/pt/alphabet/U0077.ogg
+%%DATADIR%%/boards/sounds/pt/alphabet/U0078.ogg
+%%DATADIR%%/boards/sounds/pt/alphabet/U0079.ogg
+%%DATADIR%%/boards/sounds/pt/alphabet/U007A.ogg
+%%DATADIR%%/boards/sounds/pt/colors/README
+%%DATADIR%%/boards/sounds/pt/colors/black.ogg
+%%DATADIR%%/boards/sounds/pt/colors/blue.ogg
+%%DATADIR%%/boards/sounds/pt/colors/brown.ogg
+%%DATADIR%%/boards/sounds/pt/colors/green.ogg
+%%DATADIR%%/boards/sounds/pt/colors/grey.ogg
+%%DATADIR%%/boards/sounds/pt/colors/orange.ogg
+%%DATADIR%%/boards/sounds/pt/colors/pink.ogg
+%%DATADIR%%/boards/sounds/pt/colors/purple.ogg
+%%DATADIR%%/boards/sounds/pt/colors/red.ogg
+%%DATADIR%%/boards/sounds/pt/colors/white.ogg
+%%DATADIR%%/boards/sounds/pt/colors/yellow.ogg
+%%DATADIR%%/boards/sounds/pt/geography/README
+%%DATADIR%%/boards/sounds/pt/geography/africa.ogg
+%%DATADIR%%/boards/sounds/pt/geography/alaska.ogg
+%%DATADIR%%/boards/sounds/pt/geography/albania.ogg
+%%DATADIR%%/boards/sounds/pt/geography/america.ogg
+%%DATADIR%%/boards/sounds/pt/geography/antartica.ogg
+%%DATADIR%%/boards/sounds/pt/geography/argentina.ogg
+%%DATADIR%%/boards/sounds/pt/geography/asia.ogg
+%%DATADIR%%/boards/sounds/pt/geography/austria.ogg
+%%DATADIR%%/boards/sounds/pt/geography/bahamas.ogg
+%%DATADIR%%/boards/sounds/pt/geography/belarus.ogg
+%%DATADIR%%/boards/sounds/pt/geography/belgium.ogg
+%%DATADIR%%/boards/sounds/pt/geography/bolivia.ogg
+%%DATADIR%%/boards/sounds/pt/geography/bosnia_herzegovina.ogg
+%%DATADIR%%/boards/sounds/pt/geography/brazil.ogg
+%%DATADIR%%/boards/sounds/pt/geography/bulgaria.ogg
+%%DATADIR%%/boards/sounds/pt/geography/canada.ogg
+%%DATADIR%%/boards/sounds/pt/geography/chile.ogg
+%%DATADIR%%/boards/sounds/pt/geography/colombia.ogg
+%%DATADIR%%/boards/sounds/pt/geography/costa_rica.ogg
+%%DATADIR%%/boards/sounds/pt/geography/croatia.ogg
+%%DATADIR%%/boards/sounds/pt/geography/cuba.ogg
+%%DATADIR%%/boards/sounds/pt/geography/cyprus.ogg
+%%DATADIR%%/boards/sounds/pt/geography/czech.ogg
+%%DATADIR%%/boards/sounds/pt/geography/denmark.ogg
+%%DATADIR%%/boards/sounds/pt/geography/dominican_republic.ogg
+%%DATADIR%%/boards/sounds/pt/geography/ecuador.ogg
+%%DATADIR%%/boards/sounds/pt/geography/estonia.ogg
+%%DATADIR%%/boards/sounds/pt/geography/europe.ogg
+%%DATADIR%%/boards/sounds/pt/geography/finland.ogg
+%%DATADIR%%/boards/sounds/pt/geography/france.ogg
+%%DATADIR%%/boards/sounds/pt/geography/french_guiana.ogg
+%%DATADIR%%/boards/sounds/pt/geography/germany.ogg
+%%DATADIR%%/boards/sounds/pt/geography/greece.ogg
+%%DATADIR%%/boards/sounds/pt/geography/greenland.ogg
+%%DATADIR%%/boards/sounds/pt/geography/guatemala.ogg
+%%DATADIR%%/boards/sounds/pt/geography/guyana.ogg
+%%DATADIR%%/boards/sounds/pt/geography/haiti.ogg
+%%DATADIR%%/boards/sounds/pt/geography/honduras.ogg
+%%DATADIR%%/boards/sounds/pt/geography/hungary.ogg
+%%DATADIR%%/boards/sounds/pt/geography/iceland.ogg
+%%DATADIR%%/boards/sounds/pt/geography/ireland.ogg
+%%DATADIR%%/boards/sounds/pt/geography/italy.ogg
+%%DATADIR%%/boards/sounds/pt/geography/jamaica.ogg
+%%DATADIR%%/boards/sounds/pt/geography/latvia.ogg
+%%DATADIR%%/boards/sounds/pt/geography/lithuania.ogg
+%%DATADIR%%/boards/sounds/pt/geography/luxembourg.ogg
+%%DATADIR%%/boards/sounds/pt/geography/macedonia.ogg
+%%DATADIR%%/boards/sounds/pt/geography/mexico.ogg
+%%DATADIR%%/boards/sounds/pt/geography/moldova.ogg
+%%DATADIR%%/boards/sounds/pt/geography/netherland.ogg
+%%DATADIR%%/boards/sounds/pt/geography/nicaragua.ogg
+%%DATADIR%%/boards/sounds/pt/geography/norway.ogg
+%%DATADIR%%/boards/sounds/pt/geography/oceania.ogg
+%%DATADIR%%/boards/sounds/pt/geography/panama.ogg
+%%DATADIR%%/boards/sounds/pt/geography/paraguay.ogg
+%%DATADIR%%/boards/sounds/pt/geography/peru.ogg
+%%DATADIR%%/boards/sounds/pt/geography/poland.ogg
+%%DATADIR%%/boards/sounds/pt/geography/portugal.ogg
+%%DATADIR%%/boards/sounds/pt/geography/romania.ogg
+%%DATADIR%%/boards/sounds/pt/geography/russia.ogg
+%%DATADIR%%/boards/sounds/pt/geography/salvador.ogg
+%%DATADIR%%/boards/sounds/pt/geography/serbia_montenegro.ogg
+%%DATADIR%%/boards/sounds/pt/geography/slovakia.ogg
+%%DATADIR%%/boards/sounds/pt/geography/slovenia.ogg
+%%DATADIR%%/boards/sounds/pt/geography/spain.ogg
+%%DATADIR%%/boards/sounds/pt/geography/suriname.ogg
+%%DATADIR%%/boards/sounds/pt/geography/sweden.ogg
+%%DATADIR%%/boards/sounds/pt/geography/switz.ogg
+%%DATADIR%%/boards/sounds/pt/geography/turkey.ogg
+%%DATADIR%%/boards/sounds/pt/geography/ukraine.ogg
+%%DATADIR%%/boards/sounds/pt/geography/united_kingdom.ogg
+%%DATADIR%%/boards/sounds/pt/geography/uruguay.ogg
+%%DATADIR%%/boards/sounds/pt/geography/usa.ogg
+%%DATADIR%%/boards/sounds/pt/geography/venezuela.ogg
+%%DATADIR%%/boards/sounds/pt/misc/README
+%%DATADIR%%/boards/sounds/pt/misc/about.ogg
+%%DATADIR%%/boards/sounds/pt/misc/awesome.ogg
+%%DATADIR%%/boards/sounds/pt/misc/back.ogg
+%%DATADIR%%/boards/sounds/pt/misc/by.ogg
+%%DATADIR%%/boards/sounds/pt/misc/click_on_letter.ogg
+%%DATADIR%%/boards/sounds/pt/misc/configuration.ogg
+%%DATADIR%%/boards/sounds/pt/misc/congratulation.ogg
+%%DATADIR%%/boards/sounds/pt/misc/equal.ogg
+%%DATADIR%%/boards/sounds/pt/misc/fantastic.ogg
+%%DATADIR%%/boards/sounds/pt/misc/good.ogg
+%%DATADIR%%/boards/sounds/pt/misc/great.ogg
+%%DATADIR%%/boards/sounds/pt/misc/help.ogg
+%%DATADIR%%/boards/sounds/pt/misc/level.ogg
+%%DATADIR%%/boards/sounds/pt/misc/minus.ogg
+%%DATADIR%%/boards/sounds/pt/misc/ok.ogg
+%%DATADIR%%/boards/sounds/pt/misc/outof.ogg
+%%DATADIR%%/boards/sounds/pt/misc/perfect.ogg
+%%DATADIR%%/boards/sounds/pt/misc/plus.ogg
+%%DATADIR%%/boards/sounds/pt/misc/quit.ogg
+%%DATADIR%%/boards/sounds/pt/misc/super.ogg
+%%DATADIR%%/boards/sounds/pt/misc/waytogo.ogg
+%%DATADIR%%/boards/sounds/pt/misc/welcome.ogg
+%%DATADIR%%/boards/sounds/pt_BR/README
+%%DATADIR%%/boards/sounds/pt_BR/alphabet/10.ogg
+%%DATADIR%%/boards/sounds/pt_BR/alphabet/U0031.ogg
+%%DATADIR%%/boards/sounds/pt_BR/alphabet/U0032.ogg
+%%DATADIR%%/boards/sounds/pt_BR/alphabet/U0033.ogg
+%%DATADIR%%/boards/sounds/pt_BR/alphabet/U0034.ogg
+%%DATADIR%%/boards/sounds/pt_BR/alphabet/U0035.ogg
+%%DATADIR%%/boards/sounds/pt_BR/alphabet/U0036.ogg
+%%DATADIR%%/boards/sounds/pt_BR/alphabet/U0037.ogg
+%%DATADIR%%/boards/sounds/pt_BR/alphabet/U0038.ogg
+%%DATADIR%%/boards/sounds/pt_BR/alphabet/U0039.ogg
+%%DATADIR%%/boards/sounds/pt_BR/alphabet/U0061.ogg
+%%DATADIR%%/boards/sounds/pt_BR/alphabet/U0062.ogg
+%%DATADIR%%/boards/sounds/pt_BR/alphabet/U0063.ogg
+%%DATADIR%%/boards/sounds/pt_BR/alphabet/U0064.ogg
+%%DATADIR%%/boards/sounds/pt_BR/alphabet/U0065.ogg
+%%DATADIR%%/boards/sounds/pt_BR/alphabet/U0066.ogg
+%%DATADIR%%/boards/sounds/pt_BR/alphabet/U0067.ogg
+%%DATADIR%%/boards/sounds/pt_BR/alphabet/U0068.ogg
+%%DATADIR%%/boards/sounds/pt_BR/alphabet/U0069.ogg
+%%DATADIR%%/boards/sounds/pt_BR/alphabet/U006A.ogg
+%%DATADIR%%/boards/sounds/pt_BR/alphabet/U006B.ogg
+%%DATADIR%%/boards/sounds/pt_BR/alphabet/U006C.ogg
+%%DATADIR%%/boards/sounds/pt_BR/alphabet/U006D.ogg
+%%DATADIR%%/boards/sounds/pt_BR/alphabet/U006E.ogg
+%%DATADIR%%/boards/sounds/pt_BR/alphabet/U006F.ogg
+%%DATADIR%%/boards/sounds/pt_BR/alphabet/U006H.ogg
+%%DATADIR%%/boards/sounds/pt_BR/alphabet/U0070.ogg
+%%DATADIR%%/boards/sounds/pt_BR/alphabet/U0071.ogg
+%%DATADIR%%/boards/sounds/pt_BR/alphabet/U0072.ogg
+%%DATADIR%%/boards/sounds/pt_BR/alphabet/U0073.ogg
+%%DATADIR%%/boards/sounds/pt_BR/alphabet/U0074.ogg
+%%DATADIR%%/boards/sounds/pt_BR/alphabet/U0075.ogg
+%%DATADIR%%/boards/sounds/pt_BR/alphabet/U0076.ogg
+%%DATADIR%%/boards/sounds/pt_BR/alphabet/U0077.ogg
+%%DATADIR%%/boards/sounds/pt_BR/alphabet/U0078.ogg
+%%DATADIR%%/boards/sounds/pt_BR/alphabet/U0079.ogg
+%%DATADIR%%/boards/sounds/pt_BR/alphabet/U007A.ogg
+%%DATADIR%%/boards/sounds/pt_BR/colors/black.ogg
+%%DATADIR%%/boards/sounds/pt_BR/colors/blue.ogg
+%%DATADIR%%/boards/sounds/pt_BR/colors/brown.ogg
+%%DATADIR%%/boards/sounds/pt_BR/colors/green.ogg
+%%DATADIR%%/boards/sounds/pt_BR/colors/grey.ogg
+%%DATADIR%%/boards/sounds/pt_BR/colors/orange.ogg
+%%DATADIR%%/boards/sounds/pt_BR/colors/purple.ogg
+%%DATADIR%%/boards/sounds/pt_BR/colors/red.ogg
+%%DATADIR%%/boards/sounds/pt_BR/colors/white.ogg
+%%DATADIR%%/boards/sounds/pt_BR/colors/yellow.ogg
+%%DATADIR%%/boards/sounds/pt_BR/geography/africa.ogg
+%%DATADIR%%/boards/sounds/pt_BR/geography/alaska.ogg
+%%DATADIR%%/boards/sounds/pt_BR/geography/albania.ogg
+%%DATADIR%%/boards/sounds/pt_BR/geography/america.ogg
+%%DATADIR%%/boards/sounds/pt_BR/geography/antartica.ogg
+%%DATADIR%%/boards/sounds/pt_BR/geography/argentina.ogg
+%%DATADIR%%/boards/sounds/pt_BR/geography/asia.ogg
+%%DATADIR%%/boards/sounds/pt_BR/geography/austria.ogg
+%%DATADIR%%/boards/sounds/pt_BR/geography/bahamas.ogg
+%%DATADIR%%/boards/sounds/pt_BR/geography/belarus.ogg
+%%DATADIR%%/boards/sounds/pt_BR/geography/belgium.ogg
+%%DATADIR%%/boards/sounds/pt_BR/geography/bolivia.ogg
+%%DATADIR%%/boards/sounds/pt_BR/geography/bosnia_herzegovina.ogg
+%%DATADIR%%/boards/sounds/pt_BR/geography/brazil.ogg
+%%DATADIR%%/boards/sounds/pt_BR/geography/bulgaria.ogg
+%%DATADIR%%/boards/sounds/pt_BR/geography/canada.ogg
+%%DATADIR%%/boards/sounds/pt_BR/geography/chile.ogg
+%%DATADIR%%/boards/sounds/pt_BR/geography/colombia.ogg
+%%DATADIR%%/boards/sounds/pt_BR/geography/costa_rica.ogg
+%%DATADIR%%/boards/sounds/pt_BR/geography/croatia.ogg
+%%DATADIR%%/boards/sounds/pt_BR/geography/cuba.ogg
+%%DATADIR%%/boards/sounds/pt_BR/geography/cyprus.ogg
+%%DATADIR%%/boards/sounds/pt_BR/geography/czech.ogg
+%%DATADIR%%/boards/sounds/pt_BR/geography/denmark.ogg
+%%DATADIR%%/boards/sounds/pt_BR/geography/dominican_republic.ogg
+%%DATADIR%%/boards/sounds/pt_BR/geography/ecuador.ogg
+%%DATADIR%%/boards/sounds/pt_BR/geography/estonia.ogg
+%%DATADIR%%/boards/sounds/pt_BR/geography/europe.ogg
+%%DATADIR%%/boards/sounds/pt_BR/geography/finland.ogg
+%%DATADIR%%/boards/sounds/pt_BR/geography/france.ogg
+%%DATADIR%%/boards/sounds/pt_BR/geography/french_guiana.ogg
+%%DATADIR%%/boards/sounds/pt_BR/geography/germany.ogg
+%%DATADIR%%/boards/sounds/pt_BR/geography/greece.ogg
+%%DATADIR%%/boards/sounds/pt_BR/geography/greenland.ogg
+%%DATADIR%%/boards/sounds/pt_BR/geography/guatemala.ogg
+%%DATADIR%%/boards/sounds/pt_BR/geography/guyana.ogg
+%%DATADIR%%/boards/sounds/pt_BR/geography/haiti.ogg
+%%DATADIR%%/boards/sounds/pt_BR/geography/honduras.ogg
+%%DATADIR%%/boards/sounds/pt_BR/geography/hungary.ogg
+%%DATADIR%%/boards/sounds/pt_BR/geography/iceland.ogg
+%%DATADIR%%/boards/sounds/pt_BR/geography/ireland.ogg
+%%DATADIR%%/boards/sounds/pt_BR/geography/italy.ogg
+%%DATADIR%%/boards/sounds/pt_BR/geography/jamaica.ogg
+%%DATADIR%%/boards/sounds/pt_BR/geography/latvia.ogg
+%%DATADIR%%/boards/sounds/pt_BR/geography/lithuania.ogg
+%%DATADIR%%/boards/sounds/pt_BR/geography/luxembourg.ogg
+%%DATADIR%%/boards/sounds/pt_BR/geography/macedonia.ogg
+%%DATADIR%%/boards/sounds/pt_BR/geography/mexico.ogg
+%%DATADIR%%/boards/sounds/pt_BR/geography/moldova.ogg
+%%DATADIR%%/boards/sounds/pt_BR/geography/netherland.ogg
+%%DATADIR%%/boards/sounds/pt_BR/geography/nicaragua.ogg
+%%DATADIR%%/boards/sounds/pt_BR/geography/norway.ogg
+%%DATADIR%%/boards/sounds/pt_BR/geography/oceania.ogg
+%%DATADIR%%/boards/sounds/pt_BR/geography/panama.ogg
+%%DATADIR%%/boards/sounds/pt_BR/geography/paraguay.ogg
+%%DATADIR%%/boards/sounds/pt_BR/geography/peru.ogg
+%%DATADIR%%/boards/sounds/pt_BR/geography/poland.ogg
+%%DATADIR%%/boards/sounds/pt_BR/geography/portugal.ogg
+%%DATADIR%%/boards/sounds/pt_BR/geography/romania.ogg
+%%DATADIR%%/boards/sounds/pt_BR/geography/russia.ogg
+%%DATADIR%%/boards/sounds/pt_BR/geography/salvador.ogg
+%%DATADIR%%/boards/sounds/pt_BR/geography/serbia_montenegro.ogg
+%%DATADIR%%/boards/sounds/pt_BR/geography/slovakia.ogg
+%%DATADIR%%/boards/sounds/pt_BR/geography/slovenia.ogg
+%%DATADIR%%/boards/sounds/pt_BR/geography/spain.ogg
+%%DATADIR%%/boards/sounds/pt_BR/geography/suriname.ogg
+%%DATADIR%%/boards/sounds/pt_BR/geography/sweden.ogg
+%%DATADIR%%/boards/sounds/pt_BR/geography/switz.ogg
+%%DATADIR%%/boards/sounds/pt_BR/geography/turkey.ogg
+%%DATADIR%%/boards/sounds/pt_BR/geography/ukraine.ogg
+%%DATADIR%%/boards/sounds/pt_BR/geography/united_kingdom.ogg
+%%DATADIR%%/boards/sounds/pt_BR/geography/uruguay.ogg
+%%DATADIR%%/boards/sounds/pt_BR/geography/usa.ogg
+%%DATADIR%%/boards/sounds/pt_BR/geography/venezuela.ogg
+%%DATADIR%%/boards/sounds/pt_BR/misc/about.ogg
+%%DATADIR%%/boards/sounds/pt_BR/misc/back.ogg
+%%DATADIR%%/boards/sounds/pt_BR/misc/by.ogg
+%%DATADIR%%/boards/sounds/pt_BR/misc/click_on_letter.ogg
+%%DATADIR%%/boards/sounds/pt_BR/misc/configuration.ogg
+%%DATADIR%%/boards/sounds/pt_BR/misc/congratulation.ogg
+%%DATADIR%%/boards/sounds/pt_BR/misc/equal.ogg
+%%DATADIR%%/boards/sounds/pt_BR/misc/good.ogg
+%%DATADIR%%/boards/sounds/pt_BR/misc/great.ogg
+%%DATADIR%%/boards/sounds/pt_BR/misc/help.ogg
+%%DATADIR%%/boards/sounds/pt_BR/misc/level.ogg
+%%DATADIR%%/boards/sounds/pt_BR/misc/minus.ogg
+%%DATADIR%%/boards/sounds/pt_BR/misc/ok.ogg
+%%DATADIR%%/boards/sounds/pt_BR/misc/outof.ogg
+%%DATADIR%%/boards/sounds/pt_BR/misc/plus.ogg
+%%DATADIR%%/boards/sounds/pt_BR/misc/quit.ogg
+%%DATADIR%%/boards/sounds/pt_BR/misc/super.ogg
+%%DATADIR%%/boards/sounds/pt_BR/misc/welcome.ogg
+%%DATADIR%%/boards/sounds/receive.wav
+%%DATADIR%%/boards/sounds/ru/alphabet/10.ogg
+%%DATADIR%%/boards/sounds/ru/alphabet/README
+%%DATADIR%%/boards/sounds/ru/alphabet/U0031.ogg
+%%DATADIR%%/boards/sounds/ru/alphabet/U0032.ogg
+%%DATADIR%%/boards/sounds/ru/alphabet/U0033.ogg
+%%DATADIR%%/boards/sounds/ru/alphabet/U0034.ogg
+%%DATADIR%%/boards/sounds/ru/alphabet/U0035.ogg
+%%DATADIR%%/boards/sounds/ru/alphabet/U0036.ogg
+%%DATADIR%%/boards/sounds/ru/alphabet/U0037.ogg
+%%DATADIR%%/boards/sounds/ru/alphabet/U0038.ogg
+%%DATADIR%%/boards/sounds/ru/alphabet/U0039.ogg
+%%DATADIR%%/boards/sounds/ru/alphabet/U0061.ogg
+%%DATADIR%%/boards/sounds/ru/alphabet/U0062.ogg
+%%DATADIR%%/boards/sounds/ru/alphabet/U0063.ogg
+%%DATADIR%%/boards/sounds/ru/alphabet/U0064.ogg
+%%DATADIR%%/boards/sounds/ru/alphabet/U0065.ogg
+%%DATADIR%%/boards/sounds/ru/alphabet/U0066.ogg
+%%DATADIR%%/boards/sounds/ru/alphabet/U0067.ogg
+%%DATADIR%%/boards/sounds/ru/alphabet/U0068.ogg
+%%DATADIR%%/boards/sounds/ru/alphabet/U0069.ogg
+%%DATADIR%%/boards/sounds/ru/alphabet/U006A.ogg
+%%DATADIR%%/boards/sounds/ru/alphabet/U006B.ogg
+%%DATADIR%%/boards/sounds/ru/alphabet/U006C.ogg
+%%DATADIR%%/boards/sounds/ru/alphabet/U006D.ogg
+%%DATADIR%%/boards/sounds/ru/alphabet/U006E.ogg
+%%DATADIR%%/boards/sounds/ru/alphabet/U006F.ogg
+%%DATADIR%%/boards/sounds/ru/alphabet/U0070.ogg
+%%DATADIR%%/boards/sounds/ru/alphabet/U0071.ogg
+%%DATADIR%%/boards/sounds/ru/alphabet/U0072.ogg
+%%DATADIR%%/boards/sounds/ru/alphabet/U0073.ogg
+%%DATADIR%%/boards/sounds/ru/alphabet/U0074.ogg
+%%DATADIR%%/boards/sounds/ru/alphabet/U0075.ogg
+%%DATADIR%%/boards/sounds/ru/alphabet/U0076.ogg
+%%DATADIR%%/boards/sounds/ru/alphabet/U0077.ogg
+%%DATADIR%%/boards/sounds/ru/alphabet/U0078.ogg
+%%DATADIR%%/boards/sounds/ru/alphabet/U0079.ogg
+%%DATADIR%%/boards/sounds/ru/alphabet/U007A.ogg
+%%DATADIR%%/boards/sounds/ru/alphabet/U0430.ogg
+%%DATADIR%%/boards/sounds/ru/alphabet/U0431.ogg
+%%DATADIR%%/boards/sounds/ru/alphabet/U0432.ogg
+%%DATADIR%%/boards/sounds/ru/alphabet/U0433.ogg
+%%DATADIR%%/boards/sounds/ru/alphabet/U0434.ogg
+%%DATADIR%%/boards/sounds/ru/alphabet/U0435.ogg
+%%DATADIR%%/boards/sounds/ru/alphabet/U0436.ogg
+%%DATADIR%%/boards/sounds/ru/alphabet/U0437.ogg
+%%DATADIR%%/boards/sounds/ru/alphabet/U0438.ogg
+%%DATADIR%%/boards/sounds/ru/alphabet/U0439.ogg
+%%DATADIR%%/boards/sounds/ru/alphabet/U043A.ogg
+%%DATADIR%%/boards/sounds/ru/alphabet/U043B.ogg
+%%DATADIR%%/boards/sounds/ru/alphabet/U043C.ogg
+%%DATADIR%%/boards/sounds/ru/alphabet/U043D.ogg
+%%DATADIR%%/boards/sounds/ru/alphabet/U043E.ogg
+%%DATADIR%%/boards/sounds/ru/alphabet/U043F.ogg
+%%DATADIR%%/boards/sounds/ru/alphabet/U0440.ogg
+%%DATADIR%%/boards/sounds/ru/alphabet/U0441.ogg
+%%DATADIR%%/boards/sounds/ru/alphabet/U0442.ogg
+%%DATADIR%%/boards/sounds/ru/alphabet/U0443.ogg
+%%DATADIR%%/boards/sounds/ru/alphabet/U0444.ogg
+%%DATADIR%%/boards/sounds/ru/alphabet/U0445.ogg
+%%DATADIR%%/boards/sounds/ru/alphabet/U0446.ogg
+%%DATADIR%%/boards/sounds/ru/alphabet/U0447.ogg
+%%DATADIR%%/boards/sounds/ru/alphabet/U0448.ogg
+%%DATADIR%%/boards/sounds/ru/alphabet/U0449.ogg
+%%DATADIR%%/boards/sounds/ru/alphabet/U044A.ogg
+%%DATADIR%%/boards/sounds/ru/alphabet/U044B.ogg
+%%DATADIR%%/boards/sounds/ru/alphabet/U044C.ogg
+%%DATADIR%%/boards/sounds/ru/alphabet/U044D.ogg
+%%DATADIR%%/boards/sounds/ru/alphabet/U044E.ogg
+%%DATADIR%%/boards/sounds/ru/alphabet/U044F.ogg
+%%DATADIR%%/boards/sounds/ru/alphabet/U0451.ogg
+%%DATADIR%%/boards/sounds/ru/colors/README
+%%DATADIR%%/boards/sounds/ru/colors/black.ogg
+%%DATADIR%%/boards/sounds/ru/colors/blue.ogg
+%%DATADIR%%/boards/sounds/ru/colors/brown.ogg
+%%DATADIR%%/boards/sounds/ru/colors/green.ogg
+%%DATADIR%%/boards/sounds/ru/colors/grey.ogg
+%%DATADIR%%/boards/sounds/ru/colors/orange.ogg
+%%DATADIR%%/boards/sounds/ru/colors/pink.ogg
+%%DATADIR%%/boards/sounds/ru/colors/purple.ogg
+%%DATADIR%%/boards/sounds/ru/colors/red.ogg
+%%DATADIR%%/boards/sounds/ru/colors/white.ogg
+%%DATADIR%%/boards/sounds/ru/colors/yellow.ogg
+%%DATADIR%%/boards/sounds/ru/geography/README
+%%DATADIR%%/boards/sounds/ru/geography/alaska.ogg
+%%DATADIR%%/boards/sounds/ru/geography/albania.ogg
+%%DATADIR%%/boards/sounds/ru/geography/argentina.ogg
+%%DATADIR%%/boards/sounds/ru/geography/austria.ogg
+%%DATADIR%%/boards/sounds/ru/geography/bahamas.ogg
+%%DATADIR%%/boards/sounds/ru/geography/belarus.ogg
+%%DATADIR%%/boards/sounds/ru/geography/belgium.ogg
+%%DATADIR%%/boards/sounds/ru/geography/bolivia.ogg
+%%DATADIR%%/boards/sounds/ru/geography/bosnia_herzegovina.ogg
+%%DATADIR%%/boards/sounds/ru/geography/brazil.ogg
+%%DATADIR%%/boards/sounds/ru/geography/bulgaria.ogg
+%%DATADIR%%/boards/sounds/ru/geography/canada.ogg
+%%DATADIR%%/boards/sounds/ru/geography/chile.ogg
+%%DATADIR%%/boards/sounds/ru/geography/colombia.ogg
+%%DATADIR%%/boards/sounds/ru/geography/costa_rica.ogg
+%%DATADIR%%/boards/sounds/ru/geography/croatia.ogg
+%%DATADIR%%/boards/sounds/ru/geography/cuba.ogg
+%%DATADIR%%/boards/sounds/ru/geography/cyprus.ogg
+%%DATADIR%%/boards/sounds/ru/geography/czech.ogg
+%%DATADIR%%/boards/sounds/ru/geography/denmark.ogg
+%%DATADIR%%/boards/sounds/ru/geography/dominican_republic.ogg
+%%DATADIR%%/boards/sounds/ru/geography/ecuador.ogg
+%%DATADIR%%/boards/sounds/ru/geography/estonia.ogg
+%%DATADIR%%/boards/sounds/ru/geography/finland.ogg
+%%DATADIR%%/boards/sounds/ru/geography/france.ogg
+%%DATADIR%%/boards/sounds/ru/geography/french_guiana.ogg
+%%DATADIR%%/boards/sounds/ru/geography/germany.ogg
+%%DATADIR%%/boards/sounds/ru/geography/greece.ogg
+%%DATADIR%%/boards/sounds/ru/geography/greenland.ogg
+%%DATADIR%%/boards/sounds/ru/geography/guatemala.ogg
+%%DATADIR%%/boards/sounds/ru/geography/guyana.ogg
+%%DATADIR%%/boards/sounds/ru/geography/haiti.ogg
+%%DATADIR%%/boards/sounds/ru/geography/honduras.ogg
+%%DATADIR%%/boards/sounds/ru/geography/hungary.ogg
+%%DATADIR%%/boards/sounds/ru/geography/iceland.ogg
+%%DATADIR%%/boards/sounds/ru/geography/ireland.ogg
+%%DATADIR%%/boards/sounds/ru/geography/italy.ogg
+%%DATADIR%%/boards/sounds/ru/geography/jamaica.ogg
+%%DATADIR%%/boards/sounds/ru/geography/latvia.ogg
+%%DATADIR%%/boards/sounds/ru/geography/lithuania.ogg
+%%DATADIR%%/boards/sounds/ru/geography/luxembourg.ogg
+%%DATADIR%%/boards/sounds/ru/geography/macedonia.ogg
+%%DATADIR%%/boards/sounds/ru/geography/mexico.ogg
+%%DATADIR%%/boards/sounds/ru/geography/moldova.ogg
+%%DATADIR%%/boards/sounds/ru/geography/netherland.ogg
+%%DATADIR%%/boards/sounds/ru/geography/nicaragua.ogg
+%%DATADIR%%/boards/sounds/ru/geography/norway.ogg
+%%DATADIR%%/boards/sounds/ru/geography/panama.ogg
+%%DATADIR%%/boards/sounds/ru/geography/paraguay.ogg
+%%DATADIR%%/boards/sounds/ru/geography/peru.ogg
+%%DATADIR%%/boards/sounds/ru/geography/poland.ogg
+%%DATADIR%%/boards/sounds/ru/geography/portugal.ogg
+%%DATADIR%%/boards/sounds/ru/geography/romania.ogg
+%%DATADIR%%/boards/sounds/ru/geography/russia.ogg
+%%DATADIR%%/boards/sounds/ru/geography/salvador.ogg
+%%DATADIR%%/boards/sounds/ru/geography/serbia_montenegro.ogg
+%%DATADIR%%/boards/sounds/ru/geography/slovakia.ogg
+%%DATADIR%%/boards/sounds/ru/geography/slovenia.ogg
+%%DATADIR%%/boards/sounds/ru/geography/spain.ogg
+%%DATADIR%%/boards/sounds/ru/geography/suriname.ogg
+%%DATADIR%%/boards/sounds/ru/geography/sweden.ogg
+%%DATADIR%%/boards/sounds/ru/geography/switz.ogg
+%%DATADIR%%/boards/sounds/ru/geography/turkey.ogg
+%%DATADIR%%/boards/sounds/ru/geography/ukraine.ogg
+%%DATADIR%%/boards/sounds/ru/geography/united_kingdom.ogg
+%%DATADIR%%/boards/sounds/ru/geography/uruguay.ogg
+%%DATADIR%%/boards/sounds/ru/geography/usa.ogg
+%%DATADIR%%/boards/sounds/ru/geography/venezuela.ogg
+%%DATADIR%%/boards/sounds/ru/misc/README
+%%DATADIR%%/boards/sounds/ru/misc/about.ogg
+%%DATADIR%%/boards/sounds/ru/misc/back.ogg
+%%DATADIR%%/boards/sounds/ru/misc/by.ogg
+%%DATADIR%%/boards/sounds/ru/misc/click_on_letter.ogg
+%%DATADIR%%/boards/sounds/ru/misc/configuration.ogg
+%%DATADIR%%/boards/sounds/ru/misc/congratulation.ogg
+%%DATADIR%%/boards/sounds/ru/misc/equal.ogg
+%%DATADIR%%/boards/sounds/ru/misc/good.ogg
+%%DATADIR%%/boards/sounds/ru/misc/great.ogg
+%%DATADIR%%/boards/sounds/ru/misc/help.ogg
+%%DATADIR%%/boards/sounds/ru/misc/level.ogg
+%%DATADIR%%/boards/sounds/ru/misc/minus.ogg
+%%DATADIR%%/boards/sounds/ru/misc/ok.ogg
+%%DATADIR%%/boards/sounds/ru/misc/outof.ogg
+%%DATADIR%%/boards/sounds/ru/misc/plus.ogg
+%%DATADIR%%/boards/sounds/ru/misc/quit.ogg
+%%DATADIR%%/boards/sounds/ru/misc/super.ogg
+%%DATADIR%%/boards/sounds/ru/misc/welcome.ogg
+%%DATADIR%%/boards/sounds/scroll.wav
+%%DATADIR%%/boards/sounds/smudge.wav
+%%DATADIR%%/boards/sounds/so/alphabet/10.ogg
+%%DATADIR%%/boards/sounds/so/alphabet/README
+%%DATADIR%%/boards/sounds/so/alphabet/U0030.ogg
+%%DATADIR%%/boards/sounds/so/alphabet/U0031.ogg
+%%DATADIR%%/boards/sounds/so/alphabet/U0032.ogg
+%%DATADIR%%/boards/sounds/so/alphabet/U0033.ogg
+%%DATADIR%%/boards/sounds/so/alphabet/U0034.ogg
+%%DATADIR%%/boards/sounds/so/alphabet/U0035.ogg
+%%DATADIR%%/boards/sounds/so/alphabet/U0036.ogg
+%%DATADIR%%/boards/sounds/so/alphabet/U0037.ogg
+%%DATADIR%%/boards/sounds/so/alphabet/U0038.ogg
+%%DATADIR%%/boards/sounds/so/alphabet/U0039.ogg
+%%DATADIR%%/boards/sounds/so/alphabet/U0061.ogg
+%%DATADIR%%/boards/sounds/so/alphabet/U0062.ogg
+%%DATADIR%%/boards/sounds/so/alphabet/U0063.ogg
+%%DATADIR%%/boards/sounds/so/alphabet/U0064.ogg
+%%DATADIR%%/boards/sounds/so/alphabet/U0065.ogg
+%%DATADIR%%/boards/sounds/so/alphabet/U0066.ogg
+%%DATADIR%%/boards/sounds/so/alphabet/U0067.ogg
+%%DATADIR%%/boards/sounds/so/alphabet/U0068.ogg
+%%DATADIR%%/boards/sounds/so/alphabet/U0069.ogg
+%%DATADIR%%/boards/sounds/so/alphabet/U006A.ogg
+%%DATADIR%%/boards/sounds/so/alphabet/U006B.ogg
+%%DATADIR%%/boards/sounds/so/alphabet/U006C.ogg
+%%DATADIR%%/boards/sounds/so/alphabet/U006D.ogg
+%%DATADIR%%/boards/sounds/so/alphabet/U006E.ogg
+%%DATADIR%%/boards/sounds/so/alphabet/U006F.ogg
+%%DATADIR%%/boards/sounds/so/alphabet/U0070.ogg
+%%DATADIR%%/boards/sounds/so/alphabet/U0071.ogg
+%%DATADIR%%/boards/sounds/so/alphabet/U0072.ogg
+%%DATADIR%%/boards/sounds/so/alphabet/U0073.ogg
+%%DATADIR%%/boards/sounds/so/alphabet/U0074.ogg
+%%DATADIR%%/boards/sounds/so/alphabet/U0075.ogg
+%%DATADIR%%/boards/sounds/so/alphabet/U0076.ogg
+%%DATADIR%%/boards/sounds/so/alphabet/U0077.ogg
+%%DATADIR%%/boards/sounds/so/alphabet/U0078.ogg
+%%DATADIR%%/boards/sounds/so/alphabet/U0079.ogg
+%%DATADIR%%/boards/sounds/so/alphabet/U007A.ogg
+%%DATADIR%%/boards/sounds/so/colors/README
+%%DATADIR%%/boards/sounds/so/colors/black.ogg
+%%DATADIR%%/boards/sounds/so/colors/blue.ogg
+%%DATADIR%%/boards/sounds/so/colors/brown.ogg
+%%DATADIR%%/boards/sounds/so/colors/green.ogg
+%%DATADIR%%/boards/sounds/so/colors/grey.ogg
+%%DATADIR%%/boards/sounds/so/colors/orange.ogg
+%%DATADIR%%/boards/sounds/so/colors/pink.ogg
+%%DATADIR%%/boards/sounds/so/colors/purple.ogg
+%%DATADIR%%/boards/sounds/so/colors/red.ogg
+%%DATADIR%%/boards/sounds/so/colors/white.ogg
+%%DATADIR%%/boards/sounds/so/colors/yellow.ogg
+%%DATADIR%%/boards/sounds/so/geography/README
+%%DATADIR%%/boards/sounds/so/geography/alaska.ogg
+%%DATADIR%%/boards/sounds/so/geography/albania.ogg
+%%DATADIR%%/boards/sounds/so/geography/argentina.ogg
+%%DATADIR%%/boards/sounds/so/geography/austria.ogg
+%%DATADIR%%/boards/sounds/so/geography/bahamas.ogg
+%%DATADIR%%/boards/sounds/so/geography/belarus.ogg
+%%DATADIR%%/boards/sounds/so/geography/belgium.ogg
+%%DATADIR%%/boards/sounds/so/geography/bolivia.ogg
+%%DATADIR%%/boards/sounds/so/geography/bosnia_herzegovina.ogg
+%%DATADIR%%/boards/sounds/so/geography/brazil.ogg
+%%DATADIR%%/boards/sounds/so/geography/bulgaria.ogg
+%%DATADIR%%/boards/sounds/so/geography/canada.ogg
+%%DATADIR%%/boards/sounds/so/geography/chile.ogg
+%%DATADIR%%/boards/sounds/so/geography/colombia.ogg
+%%DATADIR%%/boards/sounds/so/geography/costa_rica.ogg
+%%DATADIR%%/boards/sounds/so/geography/croatia.ogg
+%%DATADIR%%/boards/sounds/so/geography/cuba.ogg
+%%DATADIR%%/boards/sounds/so/geography/cyprus.ogg
+%%DATADIR%%/boards/sounds/so/geography/czech.ogg
+%%DATADIR%%/boards/sounds/so/geography/denmark.ogg
+%%DATADIR%%/boards/sounds/so/geography/dominican_republic.ogg
+%%DATADIR%%/boards/sounds/so/geography/ecuador.ogg
+%%DATADIR%%/boards/sounds/so/geography/estonia.ogg
+%%DATADIR%%/boards/sounds/so/geography/finland.ogg
+%%DATADIR%%/boards/sounds/so/geography/france.ogg
+%%DATADIR%%/boards/sounds/so/geography/french_guiana.ogg
+%%DATADIR%%/boards/sounds/so/geography/germany.ogg
+%%DATADIR%%/boards/sounds/so/geography/greece.ogg
+%%DATADIR%%/boards/sounds/so/geography/greenland.ogg
+%%DATADIR%%/boards/sounds/so/geography/guatemala.ogg
+%%DATADIR%%/boards/sounds/so/geography/guyana.ogg
+%%DATADIR%%/boards/sounds/so/geography/haiti.ogg
+%%DATADIR%%/boards/sounds/so/geography/honduras.ogg
+%%DATADIR%%/boards/sounds/so/geography/hungary.ogg
+%%DATADIR%%/boards/sounds/so/geography/iceland.ogg
+%%DATADIR%%/boards/sounds/so/geography/ireland.ogg
+%%DATADIR%%/boards/sounds/so/geography/italy.ogg
+%%DATADIR%%/boards/sounds/so/geography/jamaica.ogg
+%%DATADIR%%/boards/sounds/so/geography/latvia.ogg
+%%DATADIR%%/boards/sounds/so/geography/lithuania.ogg
+%%DATADIR%%/boards/sounds/so/geography/luxembourg.ogg
+%%DATADIR%%/boards/sounds/so/geography/macedonia.ogg
+%%DATADIR%%/boards/sounds/so/geography/mexico.ogg
+%%DATADIR%%/boards/sounds/so/geography/moldova.ogg
+%%DATADIR%%/boards/sounds/so/geography/netherland.ogg
+%%DATADIR%%/boards/sounds/so/geography/nicaragua.ogg
+%%DATADIR%%/boards/sounds/so/geography/norway.ogg
+%%DATADIR%%/boards/sounds/so/geography/panama.ogg
+%%DATADIR%%/boards/sounds/so/geography/paraguay.ogg
+%%DATADIR%%/boards/sounds/so/geography/peru.ogg
+%%DATADIR%%/boards/sounds/so/geography/poland.ogg
+%%DATADIR%%/boards/sounds/so/geography/portugal.ogg
+%%DATADIR%%/boards/sounds/so/geography/romania.ogg
+%%DATADIR%%/boards/sounds/so/geography/russia.ogg
+%%DATADIR%%/boards/sounds/so/geography/salvador.ogg
+%%DATADIR%%/boards/sounds/so/geography/serbia_montenegro.ogg
+%%DATADIR%%/boards/sounds/so/geography/slovakia.ogg
+%%DATADIR%%/boards/sounds/so/geography/slovenia.ogg
+%%DATADIR%%/boards/sounds/so/geography/spain.ogg
+%%DATADIR%%/boards/sounds/so/geography/suriname.ogg
+%%DATADIR%%/boards/sounds/so/geography/sweden.ogg
+%%DATADIR%%/boards/sounds/so/geography/switz.ogg
+%%DATADIR%%/boards/sounds/so/geography/turkey.ogg
+%%DATADIR%%/boards/sounds/so/geography/ukraine.ogg
+%%DATADIR%%/boards/sounds/so/geography/united_kingdom.ogg
+%%DATADIR%%/boards/sounds/so/geography/uruguay.ogg
+%%DATADIR%%/boards/sounds/so/geography/usa.ogg
+%%DATADIR%%/boards/sounds/so/geography/venezuela.ogg
+%%DATADIR%%/boards/sounds/so/misc/README
+%%DATADIR%%/boards/sounds/so/misc/awesome.ogg
+%%DATADIR%%/boards/sounds/so/misc/back.ogg
+%%DATADIR%%/boards/sounds/so/misc/by.ogg
+%%DATADIR%%/boards/sounds/so/misc/check_answer.ogg
+%%DATADIR%%/boards/sounds/so/misc/click_on_letter.ogg
+%%DATADIR%%/boards/sounds/so/misc/congratulation.ogg
+%%DATADIR%%/boards/sounds/so/misc/equal.ogg
+%%DATADIR%%/boards/sounds/so/misc/fantastic.ogg
+%%DATADIR%%/boards/sounds/so/misc/good.ogg
+%%DATADIR%%/boards/sounds/so/misc/great.ogg
+%%DATADIR%%/boards/sounds/so/misc/help.ogg
+%%DATADIR%%/boards/sounds/so/misc/level.ogg
+%%DATADIR%%/boards/sounds/so/misc/minus.ogg
+%%DATADIR%%/boards/sounds/so/misc/ok.ogg
+%%DATADIR%%/boards/sounds/so/misc/outof.ogg
+%%DATADIR%%/boards/sounds/so/misc/perfect.ogg
+%%DATADIR%%/boards/sounds/so/misc/plus.ogg
+%%DATADIR%%/boards/sounds/so/misc/quit.ogg
+%%DATADIR%%/boards/sounds/so/misc/super.ogg
+%%DATADIR%%/boards/sounds/so/misc/waytogo.ogg
+%%DATADIR%%/boards/sounds/so/misc/welcome.ogg
+%%DATADIR%%/boards/sounds/sr/alphabet/10.ogg
+%%DATADIR%%/boards/sounds/sr/alphabet/U0030.ogg
+%%DATADIR%%/boards/sounds/sr/alphabet/U0031.ogg
+%%DATADIR%%/boards/sounds/sr/alphabet/U0032.ogg
+%%DATADIR%%/boards/sounds/sr/alphabet/U0033.ogg
+%%DATADIR%%/boards/sounds/sr/alphabet/U0034.ogg
+%%DATADIR%%/boards/sounds/sr/alphabet/U0035.ogg
+%%DATADIR%%/boards/sounds/sr/alphabet/U0036.ogg
+%%DATADIR%%/boards/sounds/sr/alphabet/U0037.ogg
+%%DATADIR%%/boards/sounds/sr/alphabet/U0038.ogg
+%%DATADIR%%/boards/sounds/sr/alphabet/U0039.ogg
+%%DATADIR%%/boards/sounds/sr/alphabet/U0061.ogg
+%%DATADIR%%/boards/sounds/sr/alphabet/U0062.ogg
+%%DATADIR%%/boards/sounds/sr/alphabet/U0063.ogg
+%%DATADIR%%/boards/sounds/sr/alphabet/U0064.ogg
+%%DATADIR%%/boards/sounds/sr/alphabet/U0065.ogg
+%%DATADIR%%/boards/sounds/sr/alphabet/U0066.ogg
+%%DATADIR%%/boards/sounds/sr/alphabet/U0067.ogg
+%%DATADIR%%/boards/sounds/sr/alphabet/U0068.ogg
+%%DATADIR%%/boards/sounds/sr/alphabet/U0069.ogg
+%%DATADIR%%/boards/sounds/sr/alphabet/U006A.ogg
+%%DATADIR%%/boards/sounds/sr/alphabet/U006B.ogg
+%%DATADIR%%/boards/sounds/sr/alphabet/U006C.ogg
+%%DATADIR%%/boards/sounds/sr/alphabet/U006D.ogg
+%%DATADIR%%/boards/sounds/sr/alphabet/U006E.ogg
+%%DATADIR%%/boards/sounds/sr/alphabet/U006F.ogg
+%%DATADIR%%/boards/sounds/sr/alphabet/U0070.ogg
+%%DATADIR%%/boards/sounds/sr/alphabet/U0071.ogg
+%%DATADIR%%/boards/sounds/sr/alphabet/U0072.ogg
+%%DATADIR%%/boards/sounds/sr/alphabet/U0073.ogg
+%%DATADIR%%/boards/sounds/sr/alphabet/U0074.ogg
+%%DATADIR%%/boards/sounds/sr/alphabet/U0075.ogg
+%%DATADIR%%/boards/sounds/sr/alphabet/U0076.ogg
+%%DATADIR%%/boards/sounds/sr/alphabet/U0077.ogg
+%%DATADIR%%/boards/sounds/sr/alphabet/U0078.ogg
+%%DATADIR%%/boards/sounds/sr/alphabet/U0079.ogg
+%%DATADIR%%/boards/sounds/sr/alphabet/U007A.ogg
+%%DATADIR%%/boards/sounds/sr/alphabet/cc.ogg
+%%DATADIR%%/boards/sounds/sr/alphabet/ch.ogg
+%%DATADIR%%/boards/sounds/sr/alphabet/dj.ogg
+%%DATADIR%%/boards/sounds/sr/alphabet/dz.ogg
+%%DATADIR%%/boards/sounds/sr/alphabet/lj.ogg
+%%DATADIR%%/boards/sounds/sr/alphabet/nj.ogg
+%%DATADIR%%/boards/sounds/sr/alphabet/readme
+%%DATADIR%%/boards/sounds/sr/alphabet/sh.ogg
+%%DATADIR%%/boards/sounds/sr/alphabet/zh.ogg
+%%DATADIR%%/boards/sounds/sr/colors/black.ogg
+%%DATADIR%%/boards/sounds/sr/colors/blue.ogg
+%%DATADIR%%/boards/sounds/sr/colors/brown.ogg
+%%DATADIR%%/boards/sounds/sr/colors/green.ogg
+%%DATADIR%%/boards/sounds/sr/colors/grey.ogg
+%%DATADIR%%/boards/sounds/sr/colors/orange.ogg
+%%DATADIR%%/boards/sounds/sr/colors/pink.ogg
+%%DATADIR%%/boards/sounds/sr/colors/purple.ogg
+%%DATADIR%%/boards/sounds/sr/colors/readme
+%%DATADIR%%/boards/sounds/sr/colors/red.ogg
+%%DATADIR%%/boards/sounds/sr/colors/white.ogg
+%%DATADIR%%/boards/sounds/sr/colors/yellow.ogg
+%%DATADIR%%/boards/sounds/sr/geography/alaska.ogg
+%%DATADIR%%/boards/sounds/sr/geography/albania.ogg
+%%DATADIR%%/boards/sounds/sr/geography/argentina.ogg
+%%DATADIR%%/boards/sounds/sr/geography/austria.ogg
+%%DATADIR%%/boards/sounds/sr/geography/bahamas.ogg
+%%DATADIR%%/boards/sounds/sr/geography/belarus.ogg
+%%DATADIR%%/boards/sounds/sr/geography/belgium.ogg
+%%DATADIR%%/boards/sounds/sr/geography/bolivia.ogg
+%%DATADIR%%/boards/sounds/sr/geography/bosnia_herzegovina.ogg
+%%DATADIR%%/boards/sounds/sr/geography/brazil.ogg
+%%DATADIR%%/boards/sounds/sr/geography/bulgaria.ogg
+%%DATADIR%%/boards/sounds/sr/geography/canada.ogg
+%%DATADIR%%/boards/sounds/sr/geography/chile.ogg
+%%DATADIR%%/boards/sounds/sr/geography/colombia.ogg
+%%DATADIR%%/boards/sounds/sr/geography/costa_rica.ogg
+%%DATADIR%%/boards/sounds/sr/geography/croatia.ogg
+%%DATADIR%%/boards/sounds/sr/geography/cuba.ogg
+%%DATADIR%%/boards/sounds/sr/geography/cyprus.ogg
+%%DATADIR%%/boards/sounds/sr/geography/czech.ogg
+%%DATADIR%%/boards/sounds/sr/geography/denmark.ogg
+%%DATADIR%%/boards/sounds/sr/geography/dominican_republic.ogg
+%%DATADIR%%/boards/sounds/sr/geography/ecuador.ogg
+%%DATADIR%%/boards/sounds/sr/geography/estonia.ogg
+%%DATADIR%%/boards/sounds/sr/geography/finland.ogg
+%%DATADIR%%/boards/sounds/sr/geography/france.ogg
+%%DATADIR%%/boards/sounds/sr/geography/french_guiana.ogg
+%%DATADIR%%/boards/sounds/sr/geography/germany.ogg
+%%DATADIR%%/boards/sounds/sr/geography/greece.ogg
+%%DATADIR%%/boards/sounds/sr/geography/greenland.ogg
+%%DATADIR%%/boards/sounds/sr/geography/guatemala.ogg
+%%DATADIR%%/boards/sounds/sr/geography/guyana.ogg
+%%DATADIR%%/boards/sounds/sr/geography/haiti.ogg
+%%DATADIR%%/boards/sounds/sr/geography/honduras.ogg
+%%DATADIR%%/boards/sounds/sr/geography/hungary.ogg
+%%DATADIR%%/boards/sounds/sr/geography/iceland.ogg
+%%DATADIR%%/boards/sounds/sr/geography/ireland.ogg
+%%DATADIR%%/boards/sounds/sr/geography/italy.ogg
+%%DATADIR%%/boards/sounds/sr/geography/jamaica.ogg
+%%DATADIR%%/boards/sounds/sr/geography/latvia.ogg
+%%DATADIR%%/boards/sounds/sr/geography/lithuania.ogg
+%%DATADIR%%/boards/sounds/sr/geography/luxembourg.ogg
+%%DATADIR%%/boards/sounds/sr/geography/macedonia.ogg
+%%DATADIR%%/boards/sounds/sr/geography/mexico.ogg
+%%DATADIR%%/boards/sounds/sr/geography/moldova.ogg
+%%DATADIR%%/boards/sounds/sr/geography/montenegro.ogg
+%%DATADIR%%/boards/sounds/sr/geography/netherland.ogg
+%%DATADIR%%/boards/sounds/sr/geography/nicaragua.ogg
+%%DATADIR%%/boards/sounds/sr/geography/norway.ogg
+%%DATADIR%%/boards/sounds/sr/geography/panama.ogg
+%%DATADIR%%/boards/sounds/sr/geography/paraguay.ogg
+%%DATADIR%%/boards/sounds/sr/geography/peru.ogg
+%%DATADIR%%/boards/sounds/sr/geography/poland.ogg
+%%DATADIR%%/boards/sounds/sr/geography/portugal.ogg
+%%DATADIR%%/boards/sounds/sr/geography/readme
+%%DATADIR%%/boards/sounds/sr/geography/romania.ogg
+%%DATADIR%%/boards/sounds/sr/geography/russia.ogg
+%%DATADIR%%/boards/sounds/sr/geography/salvador.ogg
+%%DATADIR%%/boards/sounds/sr/geography/serbia.ogg
+%%DATADIR%%/boards/sounds/sr/geography/serbia_montenegro.ogg
+%%DATADIR%%/boards/sounds/sr/geography/slovakia.ogg
+%%DATADIR%%/boards/sounds/sr/geography/slovenia.ogg
+%%DATADIR%%/boards/sounds/sr/geography/spain.ogg
+%%DATADIR%%/boards/sounds/sr/geography/suriname.ogg
+%%DATADIR%%/boards/sounds/sr/geography/sweden.ogg
+%%DATADIR%%/boards/sounds/sr/geography/switz.ogg
+%%DATADIR%%/boards/sounds/sr/geography/turkey.ogg
+%%DATADIR%%/boards/sounds/sr/geography/ukraine.ogg
+%%DATADIR%%/boards/sounds/sr/geography/united_kingdom.ogg
+%%DATADIR%%/boards/sounds/sr/geography/uruguay.ogg
+%%DATADIR%%/boards/sounds/sr/geography/usa.ogg
+%%DATADIR%%/boards/sounds/sr/geography/venezuela.ogg
+%%DATADIR%%/boards/sounds/sr/misc/awesome.ogg
+%%DATADIR%%/boards/sounds/sr/misc/back.ogg
+%%DATADIR%%/boards/sounds/sr/misc/by.ogg
+%%DATADIR%%/boards/sounds/sr/misc/check_answer.ogg
+%%DATADIR%%/boards/sounds/sr/misc/click_on_letter.ogg
+%%DATADIR%%/boards/sounds/sr/misc/congratulation.ogg
+%%DATADIR%%/boards/sounds/sr/misc/equal.ogg
+%%DATADIR%%/boards/sounds/sr/misc/fantastic.ogg
+%%DATADIR%%/boards/sounds/sr/misc/good.ogg
+%%DATADIR%%/boards/sounds/sr/misc/great.ogg
+%%DATADIR%%/boards/sounds/sr/misc/help.ogg
+%%DATADIR%%/boards/sounds/sr/misc/level.ogg
+%%DATADIR%%/boards/sounds/sr/misc/minus.ogg
+%%DATADIR%%/boards/sounds/sr/misc/ok.ogg
+%%DATADIR%%/boards/sounds/sr/misc/outof.ogg
+%%DATADIR%%/boards/sounds/sr/misc/perfect.ogg
+%%DATADIR%%/boards/sounds/sr/misc/plus.ogg
+%%DATADIR%%/boards/sounds/sr/misc/quit.ogg
+%%DATADIR%%/boards/sounds/sr/misc/readme
+%%DATADIR%%/boards/sounds/sr/misc/super.ogg
+%%DATADIR%%/boards/sounds/sr/misc/waytogo.ogg
+%%DATADIR%%/boards/sounds/sr/misc/welcome.ogg
+%%DATADIR%%/boards/sounds/sv/alphabet/10.ogg
+%%DATADIR%%/boards/sounds/sv/alphabet/README
+%%DATADIR%%/boards/sounds/sv/alphabet/U0030.ogg
+%%DATADIR%%/boards/sounds/sv/alphabet/U0031.ogg
+%%DATADIR%%/boards/sounds/sv/alphabet/U0032.ogg
+%%DATADIR%%/boards/sounds/sv/alphabet/U0033.ogg
+%%DATADIR%%/boards/sounds/sv/alphabet/U0034.ogg
+%%DATADIR%%/boards/sounds/sv/alphabet/U0035.ogg
+%%DATADIR%%/boards/sounds/sv/alphabet/U0036.ogg
+%%DATADIR%%/boards/sounds/sv/alphabet/U0037.ogg
+%%DATADIR%%/boards/sounds/sv/alphabet/U0038.ogg
+%%DATADIR%%/boards/sounds/sv/alphabet/U0039.ogg
+%%DATADIR%%/boards/sounds/sv/alphabet/U0061.ogg
+%%DATADIR%%/boards/sounds/sv/alphabet/U0062.ogg
+%%DATADIR%%/boards/sounds/sv/alphabet/U0063.ogg
+%%DATADIR%%/boards/sounds/sv/alphabet/U0064.ogg
+%%DATADIR%%/boards/sounds/sv/alphabet/U0065.ogg
+%%DATADIR%%/boards/sounds/sv/alphabet/U0066.ogg
+%%DATADIR%%/boards/sounds/sv/alphabet/U0067.ogg
+%%DATADIR%%/boards/sounds/sv/alphabet/U0068.ogg
+%%DATADIR%%/boards/sounds/sv/alphabet/U0069.ogg
+%%DATADIR%%/boards/sounds/sv/alphabet/U006A.ogg
+%%DATADIR%%/boards/sounds/sv/alphabet/U006B.ogg
+%%DATADIR%%/boards/sounds/sv/alphabet/U006C.ogg
+%%DATADIR%%/boards/sounds/sv/alphabet/U006D.ogg
+%%DATADIR%%/boards/sounds/sv/alphabet/U006E.ogg
+%%DATADIR%%/boards/sounds/sv/alphabet/U006F.ogg
+%%DATADIR%%/boards/sounds/sv/alphabet/U0070.ogg
+%%DATADIR%%/boards/sounds/sv/alphabet/U0071.ogg
+%%DATADIR%%/boards/sounds/sv/alphabet/U0072.ogg
+%%DATADIR%%/boards/sounds/sv/alphabet/U0073.ogg
+%%DATADIR%%/boards/sounds/sv/alphabet/U0074.ogg
+%%DATADIR%%/boards/sounds/sv/alphabet/U0075.ogg
+%%DATADIR%%/boards/sounds/sv/alphabet/U0076.ogg
+%%DATADIR%%/boards/sounds/sv/alphabet/U0078.ogg
+%%DATADIR%%/boards/sounds/sv/alphabet/U0079.ogg
+%%DATADIR%%/boards/sounds/sv/alphabet/U007A.ogg
+%%DATADIR%%/boards/sounds/sv/alphabet/U00E4.ogg
+%%DATADIR%%/boards/sounds/sv/alphabet/U00E5.ogg
+%%DATADIR%%/boards/sounds/sv/alphabet/U00F6.ogg
+%%DATADIR%%/boards/sounds/sv/colors/README
+%%DATADIR%%/boards/sounds/sv/colors/black.ogg
+%%DATADIR%%/boards/sounds/sv/colors/blue.ogg
+%%DATADIR%%/boards/sounds/sv/colors/brown.ogg
+%%DATADIR%%/boards/sounds/sv/colors/green.ogg
+%%DATADIR%%/boards/sounds/sv/colors/grey.ogg
+%%DATADIR%%/boards/sounds/sv/colors/orange.ogg
+%%DATADIR%%/boards/sounds/sv/colors/pink.ogg
+%%DATADIR%%/boards/sounds/sv/colors/purple.ogg
+%%DATADIR%%/boards/sounds/sv/colors/red.ogg
+%%DATADIR%%/boards/sounds/sv/colors/white.ogg
+%%DATADIR%%/boards/sounds/sv/colors/yellow.ogg
+%%DATADIR%%/boards/sounds/sv/geography/README
+%%DATADIR%%/boards/sounds/sv/geography/africa.ogg
+%%DATADIR%%/boards/sounds/sv/geography/alaska.ogg
+%%DATADIR%%/boards/sounds/sv/geography/albania.ogg
+%%DATADIR%%/boards/sounds/sv/geography/america.ogg
+%%DATADIR%%/boards/sounds/sv/geography/antartica.ogg
+%%DATADIR%%/boards/sounds/sv/geography/argentina.ogg
+%%DATADIR%%/boards/sounds/sv/geography/asia.ogg
+%%DATADIR%%/boards/sounds/sv/geography/austria.ogg
+%%DATADIR%%/boards/sounds/sv/geography/bahamas.ogg
+%%DATADIR%%/boards/sounds/sv/geography/belarus.ogg
+%%DATADIR%%/boards/sounds/sv/geography/belgium.ogg
+%%DATADIR%%/boards/sounds/sv/geography/bolivia.ogg
+%%DATADIR%%/boards/sounds/sv/geography/bosnia_herzegovina.ogg
+%%DATADIR%%/boards/sounds/sv/geography/brazil.ogg
+%%DATADIR%%/boards/sounds/sv/geography/bulgaria.ogg
+%%DATADIR%%/boards/sounds/sv/geography/canada.ogg
+%%DATADIR%%/boards/sounds/sv/geography/chile.ogg
+%%DATADIR%%/boards/sounds/sv/geography/colombia.ogg
+%%DATADIR%%/boards/sounds/sv/geography/costa_rica.ogg
+%%DATADIR%%/boards/sounds/sv/geography/croatia.ogg
+%%DATADIR%%/boards/sounds/sv/geography/cuba.ogg
+%%DATADIR%%/boards/sounds/sv/geography/cyprus.ogg
+%%DATADIR%%/boards/sounds/sv/geography/czech.ogg
+%%DATADIR%%/boards/sounds/sv/geography/denmark.ogg
+%%DATADIR%%/boards/sounds/sv/geography/dominican_republic.ogg
+%%DATADIR%%/boards/sounds/sv/geography/ecuador.ogg
+%%DATADIR%%/boards/sounds/sv/geography/estonia.ogg
+%%DATADIR%%/boards/sounds/sv/geography/europe.ogg
+%%DATADIR%%/boards/sounds/sv/geography/finland.ogg
+%%DATADIR%%/boards/sounds/sv/geography/france.ogg
+%%DATADIR%%/boards/sounds/sv/geography/french_guiana.ogg
+%%DATADIR%%/boards/sounds/sv/geography/germany.ogg
+%%DATADIR%%/boards/sounds/sv/geography/greece.ogg
+%%DATADIR%%/boards/sounds/sv/geography/greenland.ogg
+%%DATADIR%%/boards/sounds/sv/geography/guatemala.ogg
+%%DATADIR%%/boards/sounds/sv/geography/guyana.ogg
+%%DATADIR%%/boards/sounds/sv/geography/haiti.ogg
+%%DATADIR%%/boards/sounds/sv/geography/honduras.ogg
+%%DATADIR%%/boards/sounds/sv/geography/hungary.ogg
+%%DATADIR%%/boards/sounds/sv/geography/iceland.ogg
+%%DATADIR%%/boards/sounds/sv/geography/ireland.ogg
+%%DATADIR%%/boards/sounds/sv/geography/italy.ogg
+%%DATADIR%%/boards/sounds/sv/geography/jamaica.ogg
+%%DATADIR%%/boards/sounds/sv/geography/latvia.ogg
+%%DATADIR%%/boards/sounds/sv/geography/lithuania.ogg
+%%DATADIR%%/boards/sounds/sv/geography/luxembourg.ogg
+%%DATADIR%%/boards/sounds/sv/geography/macedonia.ogg
+%%DATADIR%%/boards/sounds/sv/geography/mexico.ogg
+%%DATADIR%%/boards/sounds/sv/geography/moldova.ogg
+%%DATADIR%%/boards/sounds/sv/geography/netherland.ogg
+%%DATADIR%%/boards/sounds/sv/geography/nicaragua.ogg
+%%DATADIR%%/boards/sounds/sv/geography/norway.ogg
+%%DATADIR%%/boards/sounds/sv/geography/oceania.ogg
+%%DATADIR%%/boards/sounds/sv/geography/panama.ogg
+%%DATADIR%%/boards/sounds/sv/geography/paraguay.ogg
+%%DATADIR%%/boards/sounds/sv/geography/peru.ogg
+%%DATADIR%%/boards/sounds/sv/geography/poland.ogg
+%%DATADIR%%/boards/sounds/sv/geography/portugal.ogg
+%%DATADIR%%/boards/sounds/sv/geography/romania.ogg
+%%DATADIR%%/boards/sounds/sv/geography/russia.ogg
+%%DATADIR%%/boards/sounds/sv/geography/salvador.ogg
+%%DATADIR%%/boards/sounds/sv/geography/serbia_montenegro.ogg
+%%DATADIR%%/boards/sounds/sv/geography/slovakia.ogg
+%%DATADIR%%/boards/sounds/sv/geography/slovenia.ogg
+%%DATADIR%%/boards/sounds/sv/geography/spain.ogg
+%%DATADIR%%/boards/sounds/sv/geography/suriname.ogg
+%%DATADIR%%/boards/sounds/sv/geography/sweden.ogg
+%%DATADIR%%/boards/sounds/sv/geography/switz.ogg
+%%DATADIR%%/boards/sounds/sv/geography/turkey.ogg
+%%DATADIR%%/boards/sounds/sv/geography/ukraine.ogg
+%%DATADIR%%/boards/sounds/sv/geography/united_kingdom.ogg
+%%DATADIR%%/boards/sounds/sv/geography/uruguay.ogg
+%%DATADIR%%/boards/sounds/sv/geography/usa.ogg
+%%DATADIR%%/boards/sounds/sv/geography/venezuela.ogg
+%%DATADIR%%/boards/sounds/sv/misc/README
+%%DATADIR%%/boards/sounds/sv/misc/about.ogg
+%%DATADIR%%/boards/sounds/sv/misc/awesome.ogg
+%%DATADIR%%/boards/sounds/sv/misc/back.ogg
+%%DATADIR%%/boards/sounds/sv/misc/by.ogg
+%%DATADIR%%/boards/sounds/sv/misc/click_on_letter.ogg
+%%DATADIR%%/boards/sounds/sv/misc/configuration.ogg
+%%DATADIR%%/boards/sounds/sv/misc/congratulation.ogg
+%%DATADIR%%/boards/sounds/sv/misc/equal.ogg
+%%DATADIR%%/boards/sounds/sv/misc/fantastic.ogg
+%%DATADIR%%/boards/sounds/sv/misc/good.ogg
+%%DATADIR%%/boards/sounds/sv/misc/great.ogg
+%%DATADIR%%/boards/sounds/sv/misc/help.ogg
+%%DATADIR%%/boards/sounds/sv/misc/level.ogg
+%%DATADIR%%/boards/sounds/sv/misc/minus.ogg
+%%DATADIR%%/boards/sounds/sv/misc/ok.ogg
+%%DATADIR%%/boards/sounds/sv/misc/outof.ogg
+%%DATADIR%%/boards/sounds/sv/misc/perfect.ogg
+%%DATADIR%%/boards/sounds/sv/misc/plus.ogg
+%%DATADIR%%/boards/sounds/sv/misc/quit.ogg
+%%DATADIR%%/boards/sounds/sv/misc/super.ogg
+%%DATADIR%%/boards/sounds/sv/misc/waytogo.ogg
+%%DATADIR%%/boards/sounds/sv/misc/welcome.ogg
+%%DATADIR%%/boards/sounds/tr/alphabet/10.ogg
+%%DATADIR%%/boards/sounds/tr/alphabet/U0030.ogg
+%%DATADIR%%/boards/sounds/tr/alphabet/U0031.ogg
+%%DATADIR%%/boards/sounds/tr/alphabet/U0032.ogg
+%%DATADIR%%/boards/sounds/tr/alphabet/U0033.ogg
+%%DATADIR%%/boards/sounds/tr/alphabet/U0034.ogg
+%%DATADIR%%/boards/sounds/tr/alphabet/U0035.ogg
+%%DATADIR%%/boards/sounds/tr/alphabet/U0036.ogg
+%%DATADIR%%/boards/sounds/tr/alphabet/U0037.ogg
+%%DATADIR%%/boards/sounds/tr/alphabet/U0038.ogg
+%%DATADIR%%/boards/sounds/tr/alphabet/U0039.ogg
+%%DATADIR%%/boards/sounds/tr/alphabet/U0061.ogg
+%%DATADIR%%/boards/sounds/tr/alphabet/U0062.ogg
+%%DATADIR%%/boards/sounds/tr/alphabet/U0063.ogg
+%%DATADIR%%/boards/sounds/tr/alphabet/U0064.ogg
+%%DATADIR%%/boards/sounds/tr/alphabet/U0065.ogg
+%%DATADIR%%/boards/sounds/tr/alphabet/U0066.ogg
+%%DATADIR%%/boards/sounds/tr/alphabet/U0067.ogg
+%%DATADIR%%/boards/sounds/tr/alphabet/U0068.ogg
+%%DATADIR%%/boards/sounds/tr/alphabet/U0069.ogg
+%%DATADIR%%/boards/sounds/tr/alphabet/U006A.ogg
+%%DATADIR%%/boards/sounds/tr/alphabet/U006B.ogg
+%%DATADIR%%/boards/sounds/tr/alphabet/U006C.ogg
+%%DATADIR%%/boards/sounds/tr/alphabet/U006D.ogg
+%%DATADIR%%/boards/sounds/tr/alphabet/U006E.ogg
+%%DATADIR%%/boards/sounds/tr/alphabet/U006F.ogg
+%%DATADIR%%/boards/sounds/tr/alphabet/U0070.ogg
+%%DATADIR%%/boards/sounds/tr/alphabet/U0071.ogg
+%%DATADIR%%/boards/sounds/tr/alphabet/U0072.ogg
+%%DATADIR%%/boards/sounds/tr/alphabet/U0073.ogg
+%%DATADIR%%/boards/sounds/tr/alphabet/U0074.ogg
+%%DATADIR%%/boards/sounds/tr/alphabet/U0075.ogg
+%%DATADIR%%/boards/sounds/tr/alphabet/U0076.ogg
+%%DATADIR%%/boards/sounds/tr/alphabet/U0077.ogg
+%%DATADIR%%/boards/sounds/tr/alphabet/U0078.ogg
+%%DATADIR%%/boards/sounds/tr/alphabet/U0079.ogg
+%%DATADIR%%/boards/sounds/tr/alphabet/U007A.ogg
+%%DATADIR%%/boards/sounds/tr/colors/black.ogg
+%%DATADIR%%/boards/sounds/tr/colors/blue.ogg
+%%DATADIR%%/boards/sounds/tr/colors/brown.ogg
+%%DATADIR%%/boards/sounds/tr/colors/green.ogg
+%%DATADIR%%/boards/sounds/tr/colors/grey.ogg
+%%DATADIR%%/boards/sounds/tr/colors/orange.ogg
+%%DATADIR%%/boards/sounds/tr/colors/pink.ogg
+%%DATADIR%%/boards/sounds/tr/colors/purple.ogg
+%%DATADIR%%/boards/sounds/tr/colors/red.ogg
+%%DATADIR%%/boards/sounds/tr/colors/white.ogg
+%%DATADIR%%/boards/sounds/tr/colors/yellow.ogg
+%%DATADIR%%/boards/sounds/tr/geography/africa.ogg
+%%DATADIR%%/boards/sounds/tr/geography/alaska.ogg
+%%DATADIR%%/boards/sounds/tr/geography/albania.ogg
+%%DATADIR%%/boards/sounds/tr/geography/algeria.ogg
+%%DATADIR%%/boards/sounds/tr/geography/america.ogg
+%%DATADIR%%/boards/sounds/tr/geography/angola.ogg
+%%DATADIR%%/boards/sounds/tr/geography/antartica.ogg
+%%DATADIR%%/boards/sounds/tr/geography/argentina.ogg
+%%DATADIR%%/boards/sounds/tr/geography/asia.ogg
+%%DATADIR%%/boards/sounds/tr/geography/austria.ogg
+%%DATADIR%%/boards/sounds/tr/geography/bahamas.ogg
+%%DATADIR%%/boards/sounds/tr/geography/belarus.ogg
+%%DATADIR%%/boards/sounds/tr/geography/belgium.ogg
+%%DATADIR%%/boards/sounds/tr/geography/benin.ogg
+%%DATADIR%%/boards/sounds/tr/geography/bolivia.ogg
+%%DATADIR%%/boards/sounds/tr/geography/bosnia_herzegovina.ogg
+%%DATADIR%%/boards/sounds/tr/geography/botswana.ogg
+%%DATADIR%%/boards/sounds/tr/geography/brazil.ogg
+%%DATADIR%%/boards/sounds/tr/geography/bulgaria.ogg
+%%DATADIR%%/boards/sounds/tr/geography/burkina.ogg
+%%DATADIR%%/boards/sounds/tr/geography/burundi.ogg
+%%DATADIR%%/boards/sounds/tr/geography/cameroon.ogg
+%%DATADIR%%/boards/sounds/tr/geography/canada.ogg
+%%DATADIR%%/boards/sounds/tr/geography/central_african_republic.ogg
+%%DATADIR%%/boards/sounds/tr/geography/chad.ogg
+%%DATADIR%%/boards/sounds/tr/geography/chile.ogg
+%%DATADIR%%/boards/sounds/tr/geography/colombia.ogg
+%%DATADIR%%/boards/sounds/tr/geography/congo.ogg
+%%DATADIR%%/boards/sounds/tr/geography/costa_rica.ogg
+%%DATADIR%%/boards/sounds/tr/geography/croatia.ogg
+%%DATADIR%%/boards/sounds/tr/geography/cuba.ogg
+%%DATADIR%%/boards/sounds/tr/geography/cyprus.ogg
+%%DATADIR%%/boards/sounds/tr/geography/czech.ogg
+%%DATADIR%%/boards/sounds/tr/geography/denmark.ogg
+%%DATADIR%%/boards/sounds/tr/geography/djibouti.ogg
+%%DATADIR%%/boards/sounds/tr/geography/dominican_republic.ogg
+%%DATADIR%%/boards/sounds/tr/geography/ecuador.ogg
+%%DATADIR%%/boards/sounds/tr/geography/egypt.ogg
+%%DATADIR%%/boards/sounds/tr/geography/equatorial_guinea.ogg
+%%DATADIR%%/boards/sounds/tr/geography/eritrea.ogg
+%%DATADIR%%/boards/sounds/tr/geography/estonia.ogg
+%%DATADIR%%/boards/sounds/tr/geography/ethiopia.ogg
+%%DATADIR%%/boards/sounds/tr/geography/europe.ogg
+%%DATADIR%%/boards/sounds/tr/geography/finland.ogg
+%%DATADIR%%/boards/sounds/tr/geography/france.ogg
+%%DATADIR%%/boards/sounds/tr/geography/french_guiana.ogg
+%%DATADIR%%/boards/sounds/tr/geography/gabon.ogg
+%%DATADIR%%/boards/sounds/tr/geography/gambia.ogg
+%%DATADIR%%/boards/sounds/tr/geography/germany.ogg
+%%DATADIR%%/boards/sounds/tr/geography/ghana.ogg
+%%DATADIR%%/boards/sounds/tr/geography/greece.ogg
+%%DATADIR%%/boards/sounds/tr/geography/greenland.ogg
+%%DATADIR%%/boards/sounds/tr/geography/guatemala.ogg
+%%DATADIR%%/boards/sounds/tr/geography/guinea.ogg
+%%DATADIR%%/boards/sounds/tr/geography/guinea_bissau.ogg
+%%DATADIR%%/boards/sounds/tr/geography/guyana.ogg
+%%DATADIR%%/boards/sounds/tr/geography/haiti.ogg
+%%DATADIR%%/boards/sounds/tr/geography/honduras.ogg
+%%DATADIR%%/boards/sounds/tr/geography/hungary.ogg
+%%DATADIR%%/boards/sounds/tr/geography/iceland.ogg
+%%DATADIR%%/boards/sounds/tr/geography/ireland.ogg
+%%DATADIR%%/boards/sounds/tr/geography/italy.ogg
+%%DATADIR%%/boards/sounds/tr/geography/ivory_coast.ogg
+%%DATADIR%%/boards/sounds/tr/geography/jamaica.ogg
+%%DATADIR%%/boards/sounds/tr/geography/kenya.ogg
+%%DATADIR%%/boards/sounds/tr/geography/latvia.ogg
+%%DATADIR%%/boards/sounds/tr/geography/lesotho.ogg
+%%DATADIR%%/boards/sounds/tr/geography/liberia.ogg
+%%DATADIR%%/boards/sounds/tr/geography/libya.ogg
+%%DATADIR%%/boards/sounds/tr/geography/lithuania.ogg
+%%DATADIR%%/boards/sounds/tr/geography/luxembourg.ogg
+%%DATADIR%%/boards/sounds/tr/geography/macedonia.ogg
+%%DATADIR%%/boards/sounds/tr/geography/madagascar.ogg
+%%DATADIR%%/boards/sounds/tr/geography/malawi.ogg
+%%DATADIR%%/boards/sounds/tr/geography/mali.ogg
+%%DATADIR%%/boards/sounds/tr/geography/mauritania.ogg
+%%DATADIR%%/boards/sounds/tr/geography/mexico.ogg
+%%DATADIR%%/boards/sounds/tr/geography/moldova.ogg
+%%DATADIR%%/boards/sounds/tr/geography/moroco.ogg
+%%DATADIR%%/boards/sounds/tr/geography/mozambique.ogg
+%%DATADIR%%/boards/sounds/tr/geography/namibia.ogg
+%%DATADIR%%/boards/sounds/tr/geography/netherland.ogg
+%%DATADIR%%/boards/sounds/tr/geography/nicaragua.ogg
+%%DATADIR%%/boards/sounds/tr/geography/niger.ogg
+%%DATADIR%%/boards/sounds/tr/geography/nigeria.ogg
+%%DATADIR%%/boards/sounds/tr/geography/north_america.ogg
+%%DATADIR%%/boards/sounds/tr/geography/norway.ogg
+%%DATADIR%%/boards/sounds/tr/geography/oceania.ogg
+%%DATADIR%%/boards/sounds/tr/geography/panama.ogg
+%%DATADIR%%/boards/sounds/tr/geography/paraguay.ogg
+%%DATADIR%%/boards/sounds/tr/geography/peru.ogg
+%%DATADIR%%/boards/sounds/tr/geography/poland.ogg
+%%DATADIR%%/boards/sounds/tr/geography/portugal.ogg
+%%DATADIR%%/boards/sounds/tr/geography/republic_of_congo.ogg
+%%DATADIR%%/boards/sounds/tr/geography/romania.ogg
+%%DATADIR%%/boards/sounds/tr/geography/russia.ogg
+%%DATADIR%%/boards/sounds/tr/geography/rwanda.ogg
+%%DATADIR%%/boards/sounds/tr/geography/salvador.ogg
+%%DATADIR%%/boards/sounds/tr/geography/senegal.ogg
+%%DATADIR%%/boards/sounds/tr/geography/serbia_montenegro.ogg
+%%DATADIR%%/boards/sounds/tr/geography/sierra_leone.ogg
+%%DATADIR%%/boards/sounds/tr/geography/slovakia.ogg
+%%DATADIR%%/boards/sounds/tr/geography/slovenia.ogg
+%%DATADIR%%/boards/sounds/tr/geography/somalia.ogg
+%%DATADIR%%/boards/sounds/tr/geography/soudan.ogg
+%%DATADIR%%/boards/sounds/tr/geography/south_africa.ogg
+%%DATADIR%%/boards/sounds/tr/geography/south_america.ogg
+%%DATADIR%%/boards/sounds/tr/geography/spain.ogg
+%%DATADIR%%/boards/sounds/tr/geography/suriname.ogg
+%%DATADIR%%/boards/sounds/tr/geography/swaziland.ogg
+%%DATADIR%%/boards/sounds/tr/geography/sweden.ogg
+%%DATADIR%%/boards/sounds/tr/geography/switz.ogg
+%%DATADIR%%/boards/sounds/tr/geography/tanzania.ogg
+%%DATADIR%%/boards/sounds/tr/geography/togo.ogg
+%%DATADIR%%/boards/sounds/tr/geography/tunisia.ogg
+%%DATADIR%%/boards/sounds/tr/geography/turkey.ogg
+%%DATADIR%%/boards/sounds/tr/geography/uganda.ogg
+%%DATADIR%%/boards/sounds/tr/geography/ukraine.ogg
+%%DATADIR%%/boards/sounds/tr/geography/united_kingdom.ogg
+%%DATADIR%%/boards/sounds/tr/geography/uruguay.ogg
+%%DATADIR%%/boards/sounds/tr/geography/usa.ogg
+%%DATADIR%%/boards/sounds/tr/geography/venezuela.ogg
+%%DATADIR%%/boards/sounds/tr/geography/zambia.ogg
+%%DATADIR%%/boards/sounds/tr/geography/zimbabwe.ogg
+%%DATADIR%%/boards/sounds/tr/misc/about.ogg
+%%DATADIR%%/boards/sounds/tr/misc/awesome.ogg
+%%DATADIR%%/boards/sounds/tr/misc/back.ogg
+%%DATADIR%%/boards/sounds/tr/misc/by.ogg
+%%DATADIR%%/boards/sounds/tr/misc/check_answer.ogg
+%%DATADIR%%/boards/sounds/tr/misc/click_on_letter.ogg
+%%DATADIR%%/boards/sounds/tr/misc/configuration.ogg
+%%DATADIR%%/boards/sounds/tr/misc/congratulation.ogg
+%%DATADIR%%/boards/sounds/tr/misc/equal.ogg
+%%DATADIR%%/boards/sounds/tr/misc/fantastic.ogg
+%%DATADIR%%/boards/sounds/tr/misc/good.ogg
+%%DATADIR%%/boards/sounds/tr/misc/great.ogg
+%%DATADIR%%/boards/sounds/tr/misc/help.ogg
+%%DATADIR%%/boards/sounds/tr/misc/level.ogg
+%%DATADIR%%/boards/sounds/tr/misc/minus.ogg
+%%DATADIR%%/boards/sounds/tr/misc/ok.ogg
+%%DATADIR%%/boards/sounds/tr/misc/outof.ogg
+%%DATADIR%%/boards/sounds/tr/misc/perfect.ogg
+%%DATADIR%%/boards/sounds/tr/misc/plus.ogg
+%%DATADIR%%/boards/sounds/tr/misc/quit.ogg
+%%DATADIR%%/boards/sounds/tr/misc/super.ogg
+%%DATADIR%%/boards/sounds/tr/misc/waytogo.ogg
+%%DATADIR%%/boards/sounds/tr/misc/welcome.ogg
+%%DATADIR%%/boards/sounds/train.wav
+%%DATADIR%%/boards/sounds/tuxok.wav
+%%DATADIR%%/boards/sounds/youcannot.wav
+%%DATADIR%%/boards/strategy.xml
+%%DATADIR%%/boards/submarine.xml
+%%DATADIR%%/boards/submarine/README
+%%DATADIR%%/boards/submarine/alert_submarine.png
+%%DATADIR%%/boards/submarine/asw_frigate.png
+%%DATADIR%%/boards/submarine/bubbling.png
+%%DATADIR%%/boards/submarine/down.png
+%%DATADIR%%/boards/submarine/manette.png
+%%DATADIR%%/boards/submarine/rudder.png
+%%DATADIR%%/boards/submarine/sub_bg.jpg
+%%DATADIR%%/boards/submarine/sub_schema.png
+%%DATADIR%%/boards/submarine/submarine-broken.png
+%%DATADIR%%/boards/submarine/submarine.png
+%%DATADIR%%/boards/submarine/up.png
+%%DATADIR%%/boards/submarine/vanne.png
+%%DATADIR%%/boards/submarine/whale.png
+%%DATADIR%%/boards/submarine/whale_hit.png
+%%DATADIR%%/boards/sudoku.xml
+%%DATADIR%%/boards/superbrain.xml
+%%DATADIR%%/boards/tangram.xml
+%%DATADIR%%/boards/target.xml
+%%DATADIR%%/boards/target/boardicon.png
+%%DATADIR%%/boards/traffic.xml
+%%DATADIR%%/boards/tuxpaint.xml
+%%DATADIR%%/boards/watercycle.xml
+%%DATADIR%%/boards/watercycle/README
+%%DATADIR%%/boards/watercycle/background.png
+%%DATADIR%%/boards/watercycle/badwater.png
+%%DATADIR%%/boards/watercycle/badwater_off.png
+%%DATADIR%%/boards/watercycle/cleanwater.png
+%%DATADIR%%/boards/watercycle/cleanwater_off.png
+%%DATADIR%%/boards/watercycle/fishingboat.gif
+%%DATADIR%%/boards/watercycle/fishingboat.png
+%%DATADIR%%/boards/watercycle/fishingboat_tux.png
+%%DATADIR%%/boards/watercycle/pumpwater.png
+%%DATADIR%%/boards/watercycle/pumpwater_off.png
+%%DATADIR%%/boards/watercycle/rain.png
+%%DATADIR%%/boards/watercycle/riverempty.png
+%%DATADIR%%/boards/watercycle/riverfull.png
+%%DATADIR%%/boards/watercycle/shower.png
+%%DATADIR%%/boards/watercycle/shower_off.png
+%%DATADIR%%/boards/watercycle/shower_on.png
+%%DATADIR%%/boards/watercycle/showerwater.png
+%%DATADIR%%/boards/watercycle/snow.png
+%%DATADIR%%/boards/watercycle/sun.png
+%%DATADIR%%/boards/watercycle/tuxboat.txt
+%%DATADIR%%/boards/watercycle/vapor.png
+%%DATADIR%%/boards/watercycle/watercleaning.png
+%%DATADIR%%/boards/watercycle/waterpump.png
+%%DATADIR%%/boards/wordprocessor.xml
+%%DATADIR%%/boards/wordsgame.xml
+%%DATADIR%%/boards/wordsgame/README
+%%DATADIR%%/boards/wordsgame/default-ar.xml
+%%DATADIR%%/boards/wordsgame/default-ar_TN.xml
+%%DATADIR%%/boards/wordsgame/default-bg.xml
+%%DATADIR%%/boards/wordsgame/default-da.xml
+%%DATADIR%%/boards/wordsgame/default-de.xml
+%%DATADIR%%/boards/wordsgame/default-el.xml
+%%DATADIR%%/boards/wordsgame/default-en.xml
+%%DATADIR%%/boards/wordsgame/default-es.xml
+%%DATADIR%%/boards/wordsgame/default-eu.xml
+%%DATADIR%%/boards/wordsgame/default-fi.xml
+%%DATADIR%%/boards/wordsgame/default-fr.xml
+%%DATADIR%%/boards/wordsgame/default-hu.xml
+%%DATADIR%%/boards/wordsgame/default-id.xml
+%%DATADIR%%/boards/wordsgame/default-it.xml
+%%DATADIR%%/boards/wordsgame/default-lt.xml
+%%DATADIR%%/boards/wordsgame/default-nb.xml
+%%DATADIR%%/boards/wordsgame/default-nl.xml
+%%DATADIR%%/boards/wordsgame/default-nn.xml
+%%DATADIR%%/boards/wordsgame/default-pt.xml
+%%DATADIR%%/boards/wordsgame/default-pt_BR.xml
+%%DATADIR%%/boards/wordsgame/default-ro.xml
+%%DATADIR%%/boards/wordsgame/default-ru.xml
+%%DATADIR%%/boards/wordsgame/default-sk.xml
+%%DATADIR%%/boards/wordsgame/default-sl.xml
+%%DATADIR%%/boards/wordsgame/default-sv.xml
+%%DATADIR%%/boards/wordsgame/default-tr.xml
+%%DATADIR%%/boards/writing_tutor.xml
+%%DATADIR%%/boards/writing_tutor/anim_pen.gif
+%%DATADIR%%/boards/writing_tutor/anim_pen.txt
+%%DATADIR%%/boards/writing_tutor/drop.png
+%%DATADIR%%/boards/writing_tutor/image_match/@kruh.png
+%%DATADIR%%/boards/writing_tutor/image_match/@obdlznik.png
+%%DATADIR%%/boards/writing_tutor/image_match/@stvorec.png
+%%DATADIR%%/boards/writing_tutor/image_match/@trojuholnik.png
+%%DATADIR%%/boards/writing_tutor/image_match/a.png
+%%DATADIR%%/boards/writing_tutor/image_match/b.png
+%%DATADIR%%/boards/writing_tutor/image_match/c.png
+%%DATADIR%%/boards/writing_tutor/image_match/d.png
+%%DATADIR%%/boards/writing_tutor/image_match/g.png
+%%DATADIR%%/boards/writing_tutor/image_match/h.png
+%%DATADIR%%/boards/writing_tutor/image_match/j.png
+%%DATADIR%%/boards/writing_tutor/image_match/l.png
+%%DATADIR%%/boards/writing_tutor/image_match/m.png
+%%DATADIR%%/boards/writing_tutor/image_match/r.png
+%%DATADIR%%/boards/writing_tutor/image_match/s.png
+%%DATADIR%%/boards/writing_tutor/image_match/t.png
+%%DATADIR%%/boards/writing_tutor/image_match/z.png
+%%DATADIR%%/boards/writing_tutor/notepad.png
+%%DATADIR%%/boards/writing_tutor/pattern_admin_bg.png
+%%DATADIR%%/boards/writing_tutor/tablet_active.png
+%%DATADIR%%/boards/writing_tutor/tablet_inactive.png
+%%DATADIR%%/boards/writing_tutor/wood_oak.png
+%%DATADIR%%/boards/writing_tutor/wood_pine.png
+%%DATADIR%%/boards/writing_tutor_image_match.xml
+%%DATADIR%%/boards/writing_tutor_missing_match.xml
+%%DATADIR%%/boards/writing_tutor_pattern_admin.xml
+%%DATADIR%%/boards/writing_tutor_template_match.xml
 share/gnome/help/gcompris/eu/gcompris.html
 share/gnome/help/gcompris/eu/overview.jpg
 share/gnome/help/gcompris/eu/topic.dat
 share/gnome/help/gcompris/fr/gcompris.html
 share/gnome/help/gcompris/fr/overview.jpg
 share/gnome/help/gcompris/fr/topic.dat
-share/gnome/pixmaps/gcompris-edit.png
-share/gnome/pixmaps/gcompris.png
+share/pixmaps/gcompris-edit.png
+share/pixmaps/gcompris.png
 share/locale/am/LC_MESSAGES/gcompris.mo
 share/locale/ar/LC_MESSAGES/gcompris.mo
 share/locale/ar_TN/LC_MESSAGES/gcompris.mo
@@ -6082,252 +6082,239 @@ share/locale/vi/LC_MESSAGES/gcompris.mo
 share/locale/wa/LC_MESSAGES/gcompris.mo
 share/locale/zh_CN/LC_MESSAGES/gcompris.mo
 share/locale/zh_TW/LC_MESSAGES/gcompris.mo
-@dirrm share/locale/so/LC_MESSAGES
-@dirrm share/locale/so
-@dirrm share/locale/rw/LC_MESSAGES
-@dirrm share/locale/rw
-@dirrm share/locale/oc/LC_MESSAGES
-@dirrm share/locale/oc
-@dirrm share/locale/mr/LC_MESSAGES
-@dirrm share/locale/mr
-@dirrm share/locale/dz/LC_MESSAGES
-@dirrm share/locale/dz
-@dirrm share/locale/ar_TN/LC_MESSAGES
-@dirrm share/locale/ar_TN
 @dirrm share/gnome/help/gcompris/fr
 @dirrm share/gnome/help/gcompris/eu
 @dirrm share/gnome/help/gcompris
-@dirrm share/gnome/gcompris/boards/writing_tutor/image_match
-@dirrm share/gnome/gcompris/boards/writing_tutor
-@dirrm share/gnome/gcompris/boards/wordsgame
-@dirrm share/gnome/gcompris/boards/watercycle
-@dirrm share/gnome/gcompris/boards/target
-@dirrm share/gnome/gcompris/boards/submarine
-@dirrm share/gnome/gcompris/boards/sounds/tr/misc
-@dirrm share/gnome/gcompris/boards/sounds/tr/geography
-@dirrm share/gnome/gcompris/boards/sounds/tr/colors
-@dirrm share/gnome/gcompris/boards/sounds/tr/alphabet
-@dirrm share/gnome/gcompris/boards/sounds/tr
-@dirrm share/gnome/gcompris/boards/sounds/sv/misc
-@dirrm share/gnome/gcompris/boards/sounds/sv/geography
-@dirrm share/gnome/gcompris/boards/sounds/sv/colors
-@dirrm share/gnome/gcompris/boards/sounds/sv/alphabet
-@dirrm share/gnome/gcompris/boards/sounds/sv
-@dirrm share/gnome/gcompris/boards/sounds/sr/misc
-@dirrm share/gnome/gcompris/boards/sounds/sr/geography
-@dirrm share/gnome/gcompris/boards/sounds/sr/colors
-@dirrm share/gnome/gcompris/boards/sounds/sr/alphabet
-@dirrm share/gnome/gcompris/boards/sounds/sr
-@dirrm share/gnome/gcompris/boards/sounds/so/misc
-@dirrm share/gnome/gcompris/boards/sounds/so/geography
-@dirrm share/gnome/gcompris/boards/sounds/so/colors
-@dirrm share/gnome/gcompris/boards/sounds/so/alphabet
-@dirrm share/gnome/gcompris/boards/sounds/so
-@dirrm share/gnome/gcompris/boards/sounds/ru/misc
-@dirrm share/gnome/gcompris/boards/sounds/ru/geography
-@dirrm share/gnome/gcompris/boards/sounds/ru/colors
-@dirrm share/gnome/gcompris/boards/sounds/ru/alphabet
-@dirrm share/gnome/gcompris/boards/sounds/ru
-@dirrm share/gnome/gcompris/boards/sounds/pt_BR/misc
-@dirrm share/gnome/gcompris/boards/sounds/pt_BR/geography
-@dirrm share/gnome/gcompris/boards/sounds/pt_BR/colors
-@dirrm share/gnome/gcompris/boards/sounds/pt_BR/alphabet
-@dirrm share/gnome/gcompris/boards/sounds/pt_BR
-@dirrm share/gnome/gcompris/boards/sounds/pt/misc
-@dirrm share/gnome/gcompris/boards/sounds/pt/geography
-@dirrm share/gnome/gcompris/boards/sounds/pt/colors
-@dirrm share/gnome/gcompris/boards/sounds/pt/alphabet
-@dirrm share/gnome/gcompris/boards/sounds/pt
-@dirrm share/gnome/gcompris/boards/sounds/nl/misc
-@dirrm share/gnome/gcompris/boards/sounds/nl/geography
-@dirrm share/gnome/gcompris/boards/sounds/nl/colors
-@dirrm share/gnome/gcompris/boards/sounds/nl/alphabet
-@dirrm share/gnome/gcompris/boards/sounds/nl
-@dirrm share/gnome/gcompris/boards/sounds/nb/misc
-@dirrm share/gnome/gcompris/boards/sounds/nb/geography
-@dirrm share/gnome/gcompris/boards/sounds/nb/colors
-@dirrm share/gnome/gcompris/boards/sounds/nb/alphabet
-@dirrm share/gnome/gcompris/boards/sounds/nb
-@dirrm share/gnome/gcompris/boards/sounds/mr/misc
-@dirrm share/gnome/gcompris/boards/sounds/mr/geography
-@dirrm share/gnome/gcompris/boards/sounds/mr/colors
-@dirrm share/gnome/gcompris/boards/sounds/mr/alphabet
-@dirrm share/gnome/gcompris/boards/sounds/mr
-@dirrm share/gnome/gcompris/boards/sounds/memory
-@dirrm share/gnome/gcompris/boards/sounds/melody/xylofon
-@dirrm share/gnome/gcompris/boards/sounds/melody/tachos
-@dirrm share/gnome/gcompris/boards/sounds/melody/guitar
-@dirrm share/gnome/gcompris/boards/sounds/melody
-@dirrm share/gnome/gcompris/boards/sounds/it/misc
-@dirrm share/gnome/gcompris/boards/sounds/it/geography
-@dirrm share/gnome/gcompris/boards/sounds/it/colors
-@dirrm share/gnome/gcompris/boards/sounds/it/alphabet
-@dirrm share/gnome/gcompris/boards/sounds/it
-@dirrm share/gnome/gcompris/boards/sounds/id/misc
-@dirrm share/gnome/gcompris/boards/sounds/id/colors
-@dirrm share/gnome/gcompris/boards/sounds/id/alphabet
-@dirrm share/gnome/gcompris/boards/sounds/id
-@dirrm share/gnome/gcompris/boards/sounds/hu/misc
-@dirrm share/gnome/gcompris/boards/sounds/hu/geography
-@dirrm share/gnome/gcompris/boards/sounds/hu/colors
-@dirrm share/gnome/gcompris/boards/sounds/hu/alphabet
-@dirrm share/gnome/gcompris/boards/sounds/hu
-@dirrm share/gnome/gcompris/boards/sounds/hi/misc
-@dirrm share/gnome/gcompris/boards/sounds/hi/geography
-@dirrm share/gnome/gcompris/boards/sounds/hi/colors
-@dirrm share/gnome/gcompris/boards/sounds/hi/alphabet
-@dirrm share/gnome/gcompris/boards/sounds/hi
-@dirrm share/gnome/gcompris/boards/sounds/fr/misc
-@dirrm share/gnome/gcompris/boards/sounds/fr/geography
-@dirrm share/gnome/gcompris/boards/sounds/fr/france_region
-@dirrm share/gnome/gcompris/boards/sounds/fr/colors
-@dirrm share/gnome/gcompris/boards/sounds/fr/alphabet
-@dirrm share/gnome/gcompris/boards/sounds/fr
-@dirrm share/gnome/gcompris/boards/sounds/fi/misc
-@dirrm share/gnome/gcompris/boards/sounds/fi/geography
-@dirrm share/gnome/gcompris/boards/sounds/fi/colors
-@dirrm share/gnome/gcompris/boards/sounds/fi/alphabet
-@dirrm share/gnome/gcompris/boards/sounds/fi
-@dirrm share/gnome/gcompris/boards/sounds/eu/misc
-@dirrm share/gnome/gcompris/boards/sounds/eu/geography
-@dirrm share/gnome/gcompris/boards/sounds/eu/colors
-@dirrm share/gnome/gcompris/boards/sounds/eu/alphabet
-@dirrm share/gnome/gcompris/boards/sounds/eu
-@dirrm share/gnome/gcompris/boards/sounds/es/misc
-@dirrm share/gnome/gcompris/boards/sounds/es/geography
-@dirrm share/gnome/gcompris/boards/sounds/es/colors
-@dirrm share/gnome/gcompris/boards/sounds/es/alphabet
-@dirrm share/gnome/gcompris/boards/sounds/es
-@dirrm share/gnome/gcompris/boards/sounds/en/misc
-@dirrm share/gnome/gcompris/boards/sounds/en/geography
-@dirrm share/gnome/gcompris/boards/sounds/en/colors
-@dirrm share/gnome/gcompris/boards/sounds/en/alphabet
-@dirrm share/gnome/gcompris/boards/sounds/en
-@dirrm share/gnome/gcompris/boards/sounds/el/misc
-@dirrm share/gnome/gcompris/boards/sounds/el/geography
-@dirrm share/gnome/gcompris/boards/sounds/el/colors
-@dirrm share/gnome/gcompris/boards/sounds/el/alphabet
-@dirrm share/gnome/gcompris/boards/sounds/el
-@dirrm share/gnome/gcompris/boards/sounds/de/misc
-@dirrm share/gnome/gcompris/boards/sounds/de/colors
-@dirrm share/gnome/gcompris/boards/sounds/de/alphabet
-@dirrm share/gnome/gcompris/boards/sounds/de
-@dirrm share/gnome/gcompris/boards/sounds/da/misc
-@dirrm share/gnome/gcompris/boards/sounds/da/geography
-@dirrm share/gnome/gcompris/boards/sounds/da/colors
-@dirrm share/gnome/gcompris/boards/sounds/da/alphabet
-@dirrm share/gnome/gcompris/boards/sounds/da
-@dirrm share/gnome/gcompris/boards/sounds/cs/misc
-@dirrm share/gnome/gcompris/boards/sounds/cs/geography
-@dirrm share/gnome/gcompris/boards/sounds/cs/colors
-@dirrm share/gnome/gcompris/boards/sounds/cs/alphabet
-@dirrm share/gnome/gcompris/boards/sounds/cs
-@dirrm share/gnome/gcompris/boards/sounds/chronos/space
-@dirrm share/gnome/gcompris/boards/sounds/chronos
-@dirrm share/gnome/gcompris/boards/sounds/ar/misc
-@dirrm share/gnome/gcompris/boards/sounds/ar/geography
-@dirrm share/gnome/gcompris/boards/sounds/ar/colors
-@dirrm share/gnome/gcompris/boards/sounds/ar/alphabet
-@dirrm share/gnome/gcompris/boards/sounds/ar
-@dirrm share/gnome/gcompris/boards/sounds/LuneRouge/usine
-@dirrm share/gnome/gcompris/boards/sounds/LuneRouge/sf
-@dirrm share/gnome/gcompris/boards/sounds/LuneRouge/musique
-@dirrm share/gnome/gcompris/boards/sounds/LuneRouge/maison
-@dirrm share/gnome/gcompris/boards/sounds/LuneRouge/humain
-@dirrm share/gnome/gcompris/boards/sounds/LuneRouge/engins
-@dirrm share/gnome/gcompris/boards/sounds/LuneRouge/animaux
-@dirrm share/gnome/gcompris/boards/sounds/LuneRouge
-@dirrm share/gnome/gcompris/boards/sounds
-@dirrm share/gnome/gcompris/boards/skins/gartoon/draw
-@dirrm share/gnome/gcompris/boards/skins/gartoon/boardicons
-@dirrm share/gnome/gcompris/boards/skins/gartoon
-@dirrm share/gnome/gcompris/boards/skins/babytoy/draw
-@dirrm share/gnome/gcompris/boards/skins/babytoy
-@dirrm share/gnome/gcompris/boards/skins
-@dirrm share/gnome/gcompris/boards/scales
-@dirrm share/gnome/gcompris/boards/reversecount
-@dirrm share/gnome/gcompris/boards/read_colors
-@dirrm share/gnome/gcompris/boards/railroad
-@dirrm share/gnome/gcompris/boards/paintings/level6
-@dirrm share/gnome/gcompris/boards/paintings/level5
-@dirrm share/gnome/gcompris/boards/paintings/level4
-@dirrm share/gnome/gcompris/boards/paintings/level3
-@dirrm share/gnome/gcompris/boards/paintings/level2
-@dirrm share/gnome/gcompris/boards/paintings/level1
-@dirrm share/gnome/gcompris/boards/paintings/kandinky.comp8
-@dirrm share/gnome/gcompris/boards/paintings
-@dirrm share/gnome/gcompris/boards/oscar_and_friends
-@dirrm share/gnome/gcompris/boards/opt/animals
-@dirrm share/gnome/gcompris/boards/opt
-@dirrm share/gnome/gcompris/boards/mypaint/brushes
-@dirrm share/gnome/gcompris/boards/mypaint
-@dirrm share/gnome/gcompris/boards/music/background
-@dirrm share/gnome/gcompris/boards/music
-@dirrm share/gnome/gcompris/boards/mrpatate
-@dirrm share/gnome/gcompris/boards/money/euro
-@dirrm share/gnome/gcompris/boards/money
-@dirrm share/gnome/gcompris/boards/missing_letter
-@dirrm share/gnome/gcompris/boards/melody/xylofon
-@dirrm share/gnome/gcompris/boards/melody/tachos
-@dirrm share/gnome/gcompris/boards/melody/guitar
-@dirrm share/gnome/gcompris/boards/melody
-@dirrm share/gnome/gcompris/boards/magic_hat
-@dirrm share/gnome/gcompris/boards/leftright
-@dirrm share/gnome/gcompris/boards/images
-@dirrm share/gnome/gcompris/boards/imagename
-@dirrm share/gnome/gcompris/boards/imageid
-@dirrm share/gnome/gcompris/boards/gtans/pixmaps
-@dirrm share/gnome/gcompris/boards/gtans/figures
-@dirrm share/gnome/gcompris/boards/gtans
-@dirrm share/gnome/gcompris/boards/gnumch
-@dirrm share/gnome/gcompris/boards/geography_country/turkey_district
-@dirrm share/gnome/gcompris/boards/geography_country/poland_voivodship
-@dirrm share/gnome/gcompris/boards/geography_country/norway_counties
-@dirrm share/gnome/gcompris/boards/geography_country/germany_region
-@dirrm share/gnome/gcompris/boards/geography_country/france_region
-@dirrm share/gnome/gcompris/boards/geography_country/argentina
-@dirrm share/gnome/gcompris/boards/geography_country
-@dirrm share/gnome/gcompris/boards/geography/southamerica
-@dirrm share/gnome/gcompris/boards/geography/northamerica
-@dirrm share/gnome/gcompris/boards/geography/europe
-@dirrm share/gnome/gcompris/boards/geography/continents
-@dirrm share/gnome/gcompris/boards/geography/afrique
-@dirrm share/gnome/gcompris/boards/geography/africa
-@dirrm share/gnome/gcompris/boards/geography
-@dirrm share/gnome/gcompris/boards/gcompris/timers
-@dirrm share/gnome/gcompris/boards/gcompris/misc
-@dirrm share/gnome/gcompris/boards/gcompris/mimetypes/icons
-@dirrm share/gnome/gcompris/boards/gcompris/mimetypes
-@dirrm share/gnome/gcompris/boards/gcompris/food
-@dirrm share/gnome/gcompris/boards/gcompris/dice
-@dirrm share/gnome/gcompris/boards/gcompris/bonus
-@dirrm share/gnome/gcompris/boards/gcompris
-@dirrm share/gnome/gcompris/boards/flags
-@dirrm share/gnome/gcompris/boards/fishes
-@dirrm share/gnome/gcompris/boards/electric
-@dirrm share/gnome/gcompris/boards/doubleentry
-@dirrm share/gnome/gcompris/boards/dataset
-@dirrm share/gnome/gcompris/boards/crane
-@dirrm share/gnome/gcompris/boards/connect4
-@dirrm share/gnome/gcompris/boards/colors
-@dirrm share/gnome/gcompris/boards/chronos/space
-@dirrm share/gnome/gcompris/boards/chronos/images
-@dirrm share/gnome/gcompris/boards/chronos
-@dirrm share/gnome/gcompris/boards/chess
-@dirrm share/gnome/gcompris/boards/cardimage
-@dirrm share/gnome/gcompris/boards/canal_lock
-@dirrm share/gnome/gcompris/boards/bargame
-@dirrm share/gnome/gcompris/boards/babyshapes/dog3
-@dirrm share/gnome/gcompris/boards/babyshapes/dog2
-@dirrm share/gnome/gcompris/boards/babyshapes/dog1
-@dirrm share/gnome/gcompris/boards/babyshapes
-@dirrm share/gnome/gcompris/boards/babymatch
-@dirrm share/gnome/gcompris/boards/awele
-@dirrm share/gnome/gcompris/boards/anim
-@dirrm share/gnome/gcompris/boards/algebra_guesscount
-@dirrm share/gnome/gcompris/boards/advanced_colors
-@dirrm share/gnome/gcompris/boards
-@dirrm share/gnome/gcompris
+@dirrm %%DATADIR%%/boards/writing_tutor/image_match
+@dirrm %%DATADIR%%/boards/writing_tutor
+@dirrm %%DATADIR%%/boards/wordsgame
+@dirrm %%DATADIR%%/boards/watercycle
+@dirrm %%DATADIR%%/boards/target
+@dirrm %%DATADIR%%/boards/submarine
+@dirrm %%DATADIR%%/boards/sounds/tr/misc
+@dirrm %%DATADIR%%/boards/sounds/tr/geography
+@dirrm %%DATADIR%%/boards/sounds/tr/colors
+@dirrm %%DATADIR%%/boards/sounds/tr/alphabet
+@dirrm %%DATADIR%%/boards/sounds/tr
+@dirrm %%DATADIR%%/boards/sounds/sv/misc
+@dirrm %%DATADIR%%/boards/sounds/sv/geography
+@dirrm %%DATADIR%%/boards/sounds/sv/colors
+@dirrm %%DATADIR%%/boards/sounds/sv/alphabet
+@dirrm %%DATADIR%%/boards/sounds/sv
+@dirrm %%DATADIR%%/boards/sounds/sr/misc
+@dirrm %%DATADIR%%/boards/sounds/sr/geography
+@dirrm %%DATADIR%%/boards/sounds/sr/colors
+@dirrm %%DATADIR%%/boards/sounds/sr/alphabet
+@dirrm %%DATADIR%%/boards/sounds/sr
+@dirrm %%DATADIR%%/boards/sounds/so/misc
+@dirrm %%DATADIR%%/boards/sounds/so/geography
+@dirrm %%DATADIR%%/boards/sounds/so/colors
+@dirrm %%DATADIR%%/boards/sounds/so/alphabet
+@dirrm %%DATADIR%%/boards/sounds/so
+@dirrm %%DATADIR%%/boards/sounds/ru/misc
+@dirrm %%DATADIR%%/boards/sounds/ru/geography
+@dirrm %%DATADIR%%/boards/sounds/ru/colors
+@dirrm %%DATADIR%%/boards/sounds/ru/alphabet
+@dirrm %%DATADIR%%/boards/sounds/ru
+@dirrm %%DATADIR%%/boards/sounds/pt_BR/misc
+@dirrm %%DATADIR%%/boards/sounds/pt_BR/geography
+@dirrm %%DATADIR%%/boards/sounds/pt_BR/colors
+@dirrm %%DATADIR%%/boards/sounds/pt_BR/alphabet
+@dirrm %%DATADIR%%/boards/sounds/pt_BR
+@dirrm %%DATADIR%%/boards/sounds/pt/misc
+@dirrm %%DATADIR%%/boards/sounds/pt/geography
+@dirrm %%DATADIR%%/boards/sounds/pt/colors
+@dirrm %%DATADIR%%/boards/sounds/pt/alphabet
+@dirrm %%DATADIR%%/boards/sounds/pt
+@dirrm %%DATADIR%%/boards/sounds/nl/misc
+@dirrm %%DATADIR%%/boards/sounds/nl/geography
+@dirrm %%DATADIR%%/boards/sounds/nl/colors
+@dirrm %%DATADIR%%/boards/sounds/nl/alphabet
+@dirrm %%DATADIR%%/boards/sounds/nl
+@dirrm %%DATADIR%%/boards/sounds/nb/misc
+@dirrm %%DATADIR%%/boards/sounds/nb/geography
+@dirrm %%DATADIR%%/boards/sounds/nb/colors
+@dirrm %%DATADIR%%/boards/sounds/nb/alphabet
+@dirrm %%DATADIR%%/boards/sounds/nb
+@dirrm %%DATADIR%%/boards/sounds/mr/misc
+@dirrm %%DATADIR%%/boards/sounds/mr/geography
+@dirrm %%DATADIR%%/boards/sounds/mr/colors
+@dirrm %%DATADIR%%/boards/sounds/mr/alphabet
+@dirrm %%DATADIR%%/boards/sounds/mr
+@dirrm %%DATADIR%%/boards/sounds/memory
+@dirrm %%DATADIR%%/boards/sounds/melody/xylofon
+@dirrm %%DATADIR%%/boards/sounds/melody/tachos
+@dirrm %%DATADIR%%/boards/sounds/melody/guitar
+@dirrm %%DATADIR%%/boards/sounds/melody
+@dirrm %%DATADIR%%/boards/sounds/it/misc
+@dirrm %%DATADIR%%/boards/sounds/it/geography
+@dirrm %%DATADIR%%/boards/sounds/it/colors
+@dirrm %%DATADIR%%/boards/sounds/it/alphabet
+@dirrm %%DATADIR%%/boards/sounds/it
+@dirrm %%DATADIR%%/boards/sounds/id/misc
+@dirrm %%DATADIR%%/boards/sounds/id/colors
+@dirrm %%DATADIR%%/boards/sounds/id/alphabet
+@dirrm %%DATADIR%%/boards/sounds/id
+@dirrm %%DATADIR%%/boards/sounds/hu/misc
+@dirrm %%DATADIR%%/boards/sounds/hu/geography
+@dirrm %%DATADIR%%/boards/sounds/hu/colors
+@dirrm %%DATADIR%%/boards/sounds/hu/alphabet
+@dirrm %%DATADIR%%/boards/sounds/hu
+@dirrm %%DATADIR%%/boards/sounds/hi/misc
+@dirrm %%DATADIR%%/boards/sounds/hi/geography
+@dirrm %%DATADIR%%/boards/sounds/hi/colors
+@dirrm %%DATADIR%%/boards/sounds/hi/alphabet
+@dirrm %%DATADIR%%/boards/sounds/hi
+@dirrm %%DATADIR%%/boards/sounds/fr/misc
+@dirrm %%DATADIR%%/boards/sounds/fr/geography
+@dirrm %%DATADIR%%/boards/sounds/fr/france_region
+@dirrm %%DATADIR%%/boards/sounds/fr/colors
+@dirrm %%DATADIR%%/boards/sounds/fr/alphabet
+@dirrm %%DATADIR%%/boards/sounds/fr
+@dirrm %%DATADIR%%/boards/sounds/fi/misc
+@dirrm %%DATADIR%%/boards/sounds/fi/geography
+@dirrm %%DATADIR%%/boards/sounds/fi/colors
+@dirrm %%DATADIR%%/boards/sounds/fi/alphabet
+@dirrm %%DATADIR%%/boards/sounds/fi
+@dirrm %%DATADIR%%/boards/sounds/eu/misc
+@dirrm %%DATADIR%%/boards/sounds/eu/geography
+@dirrm %%DATADIR%%/boards/sounds/eu/colors
+@dirrm %%DATADIR%%/boards/sounds/eu/alphabet
+@dirrm %%DATADIR%%/boards/sounds/eu
+@dirrm %%DATADIR%%/boards/sounds/es/misc
+@dirrm %%DATADIR%%/boards/sounds/es/geography
+@dirrm %%DATADIR%%/boards/sounds/es/colors
+@dirrm %%DATADIR%%/boards/sounds/es/alphabet
+@dirrm %%DATADIR%%/boards/sounds/es
+@dirrm %%DATADIR%%/boards/sounds/en/misc
+@dirrm %%DATADIR%%/boards/sounds/en/geography
+@dirrm %%DATADIR%%/boards/sounds/en/colors
+@dirrm %%DATADIR%%/boards/sounds/en/alphabet
+@dirrm %%DATADIR%%/boards/sounds/en
+@dirrm %%DATADIR%%/boards/sounds/el/misc
+@dirrm %%DATADIR%%/boards/sounds/el/geography
+@dirrm %%DATADIR%%/boards/sounds/el/colors
+@dirrm %%DATADIR%%/boards/sounds/el/alphabet
+@dirrm %%DATADIR%%/boards/sounds/el
+@dirrm %%DATADIR%%/boards/sounds/de/misc
+@dirrm %%DATADIR%%/boards/sounds/de/colors
+@dirrm %%DATADIR%%/boards/sounds/de/alphabet
+@dirrm %%DATADIR%%/boards/sounds/de
+@dirrm %%DATADIR%%/boards/sounds/da/misc
+@dirrm %%DATADIR%%/boards/sounds/da/geography
+@dirrm %%DATADIR%%/boards/sounds/da/colors
+@dirrm %%DATADIR%%/boards/sounds/da/alphabet
+@dirrm %%DATADIR%%/boards/sounds/da
+@dirrm %%DATADIR%%/boards/sounds/cs/misc
+@dirrm %%DATADIR%%/boards/sounds/cs/geography
+@dirrm %%DATADIR%%/boards/sounds/cs/colors
+@dirrm %%DATADIR%%/boards/sounds/cs/alphabet
+@dirrm %%DATADIR%%/boards/sounds/cs
+@dirrm %%DATADIR%%/boards/sounds/chronos/space
+@dirrm %%DATADIR%%/boards/sounds/chronos
+@dirrm %%DATADIR%%/boards/sounds/ar/misc
+@dirrm %%DATADIR%%/boards/sounds/ar/geography
+@dirrm %%DATADIR%%/boards/sounds/ar/colors
+@dirrm %%DATADIR%%/boards/sounds/ar/alphabet
+@dirrm %%DATADIR%%/boards/sounds/ar
+@dirrm %%DATADIR%%/boards/sounds/LuneRouge/usine
+@dirrm %%DATADIR%%/boards/sounds/LuneRouge/sf
+@dirrm %%DATADIR%%/boards/sounds/LuneRouge/musique
+@dirrm %%DATADIR%%/boards/sounds/LuneRouge/maison
+@dirrm %%DATADIR%%/boards/sounds/LuneRouge/humain
+@dirrm %%DATADIR%%/boards/sounds/LuneRouge/engins
+@dirrm %%DATADIR%%/boards/sounds/LuneRouge/animaux
+@dirrm %%DATADIR%%/boards/sounds/LuneRouge
+@dirrm %%DATADIR%%/boards/sounds
+@dirrm %%DATADIR%%/boards/skins/gartoon/draw
+@dirrm %%DATADIR%%/boards/skins/gartoon/boardicons
+@dirrm %%DATADIR%%/boards/skins/gartoon
+@dirrm %%DATADIR%%/boards/skins/babytoy/draw
+@dirrm %%DATADIR%%/boards/skins/babytoy
+@dirrm %%DATADIR%%/boards/skins
+@dirrm %%DATADIR%%/boards/scales
+@dirrm %%DATADIR%%/boards/reversecount
+@dirrm %%DATADIR%%/boards/read_colors
+@dirrm %%DATADIR%%/boards/railroad
+@dirrm %%DATADIR%%/boards/paintings/level6
+@dirrm %%DATADIR%%/boards/paintings/level5
+@dirrm %%DATADIR%%/boards/paintings/level4
+@dirrm %%DATADIR%%/boards/paintings/level3
+@dirrm %%DATADIR%%/boards/paintings/level2
+@dirrm %%DATADIR%%/boards/paintings/level1
+@dirrm %%DATADIR%%/boards/paintings/kandinky.comp8
+@dirrm %%DATADIR%%/boards/paintings
+@dirrm %%DATADIR%%/boards/oscar_and_friends
+@dirrm %%DATADIR%%/boards/opt/animals
+@dirrm %%DATADIR%%/boards/opt
+@dirrm %%DATADIR%%/boards/mypaint/brushes
+@dirrm %%DATADIR%%/boards/mypaint
+@dirrm %%DATADIR%%/boards/music/background
+@dirrm %%DATADIR%%/boards/music
+@dirrm %%DATADIR%%/boards/mrpatate
+@dirrm %%DATADIR%%/boards/money/euro
+@dirrm %%DATADIR%%/boards/money
+@dirrm %%DATADIR%%/boards/missing_letter
+@dirrm %%DATADIR%%/boards/melody/xylofon
+@dirrm %%DATADIR%%/boards/melody/tachos
+@dirrm %%DATADIR%%/boards/melody/guitar
+@dirrm %%DATADIR%%/boards/melody
+@dirrm %%DATADIR%%/boards/magic_hat
+@dirrm %%DATADIR%%/boards/leftright
+@dirrm %%DATADIR%%/boards/images
+@dirrm %%DATADIR%%/boards/imagename
+@dirrm %%DATADIR%%/boards/imageid
+@dirrm %%DATADIR%%/boards/gtans/pixmaps
+@dirrm %%DATADIR%%/boards/gtans/figures
+@dirrm %%DATADIR%%/boards/gtans
+@dirrm %%DATADIR%%/boards/gnumch
+@dirrm %%DATADIR%%/boards/geography_country/turkey_district
+@dirrm %%DATADIR%%/boards/geography_country/poland_voivodship
+@dirrm %%DATADIR%%/boards/geography_country/norway_counties
+@dirrm %%DATADIR%%/boards/geography_country/germany_region
+@dirrm %%DATADIR%%/boards/geography_country/france_region
+@dirrm %%DATADIR%%/boards/geography_country/argentina
+@dirrm %%DATADIR%%/boards/geography_country
+@dirrm %%DATADIR%%/boards/geography/southamerica
+@dirrm %%DATADIR%%/boards/geography/northamerica
+@dirrm %%DATADIR%%/boards/geography/europe
+@dirrm %%DATADIR%%/boards/geography/continents
+@dirrm %%DATADIR%%/boards/geography/afrique
+@dirrm %%DATADIR%%/boards/geography/africa
+@dirrm %%DATADIR%%/boards/geography
+@dirrm %%DATADIR%%/boards/gcompris/timers
+@dirrm %%DATADIR%%/boards/gcompris/misc
+@dirrm %%DATADIR%%/boards/gcompris/mimetypes/icons
+@dirrm %%DATADIR%%/boards/gcompris/mimetypes
+@dirrm %%DATADIR%%/boards/gcompris/food
+@dirrm %%DATADIR%%/boards/gcompris/dice
+@dirrm %%DATADIR%%/boards/gcompris/bonus
+@dirrm %%DATADIR%%/boards/gcompris
+@dirrm %%DATADIR%%/boards/flags
+@dirrm %%DATADIR%%/boards/fishes
+@dirrm %%DATADIR%%/boards/electric
+@dirrm %%DATADIR%%/boards/doubleentry
+@dirrm %%DATADIR%%/boards/dataset
+@dirrm %%DATADIR%%/boards/crane
+@dirrm %%DATADIR%%/boards/connect4
+@dirrm %%DATADIR%%/boards/colors
+@dirrm %%DATADIR%%/boards/chronos/space
+@dirrm %%DATADIR%%/boards/chronos/images
+@dirrm %%DATADIR%%/boards/chronos
+@dirrm %%DATADIR%%/boards/chess
+@dirrm %%DATADIR%%/boards/cardimage
+@dirrm %%DATADIR%%/boards/canal_lock
+@dirrm %%DATADIR%%/boards/bargame
+@dirrm %%DATADIR%%/boards/babyshapes/dog3
+@dirrm %%DATADIR%%/boards/babyshapes/dog2
+@dirrm %%DATADIR%%/boards/babyshapes/dog1
+@dirrm %%DATADIR%%/boards/babyshapes
+@dirrm %%DATADIR%%/boards/babymatch
+@dirrm %%DATADIR%%/boards/awele
+@dirrm %%DATADIR%%/boards/anim
+@dirrm %%DATADIR%%/boards/algebra_guesscount
+@dirrm %%DATADIR%%/boards/advanced_colors
+@dirrm %%DATADIR%%/boards
 @dirrm %%DATADIR%%/python/gcompris/utils
 @dirrm %%DATADIR%%/python/gcompris/timer
 @dirrm %%DATADIR%%/python/gcompris/sound
@@ -6343,3 +6330,16 @@ share/locale/zh_TW/LC_MESSAGES/gcompris.mo
 @dirrm %%DATADIR%%/python
 @dirrm %%DATADIR%%
 @dirrm lib/gcompris
+@dirrmtry share/locale/so/LC_MESSAGES
+@dirrmtry share/locale/so
+@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/ar_TN/LC_MESSAGES
+@dirrmtry share/locale/ar_TN
+@dirrmtry share/applications
diff --git a/games/gdado/Makefile b/games/gdado/Makefile
index 7070814b6c5a..2dad2e96e5b2 100644
--- a/games/gdado/Makefile
+++ b/games/gdado/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gdado
 PORTVERSION=	2.2
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	SF
 
diff --git a/games/gdado/pkg-plist b/games/gdado/pkg-plist
index fc40f4ea4786..cfe57e66112d 100644
--- a/games/gdado/pkg-plist
+++ b/games/gdado/pkg-plist
@@ -1,15 +1,15 @@
 bin/gdado
 share/applications/gdado.desktop
-share/gnome/pixmaps/gdado/dados.xpm
-share/gnome/pixmaps/gdado/gdado.png
-share/gnome/pixmaps/gdado/gnome-calc3.xpm
-share/gnome/pixmaps/gdado/menu_sides_10.xpm
-share/gnome/pixmaps/gdado/menu_sides_100.xpm
-share/gnome/pixmaps/gdado/menu_sides_12.xpm
-share/gnome/pixmaps/gdado/menu_sides_20.xpm
-share/gnome/pixmaps/gdado/menu_sides_3.xpm
-share/gnome/pixmaps/gdado/menu_sides_4.xpm
-share/gnome/pixmaps/gdado/menu_sides_6.xpm
-share/gnome/pixmaps/gdado/menu_sides_8.xpm
-@dirrm share/gnome/pixmaps/gdado
+share/pixmaps/gdado/dados.xpm
+share/pixmaps/gdado/gdado.png
+share/pixmaps/gdado/gnome-calc3.xpm
+share/pixmaps/gdado/menu_sides_10.xpm
+share/pixmaps/gdado/menu_sides_100.xpm
+share/pixmaps/gdado/menu_sides_12.xpm
+share/pixmaps/gdado/menu_sides_20.xpm
+share/pixmaps/gdado/menu_sides_3.xpm
+share/pixmaps/gdado/menu_sides_4.xpm
+share/pixmaps/gdado/menu_sides_6.xpm
+share/pixmaps/gdado/menu_sides_8.xpm
+@dirrm share/pixmaps/gdado
 @dirrmtry share/applications
diff --git a/games/glife/Makefile b/games/glife/Makefile
index 0f375bc2a028..46f6c010d06f 100644
--- a/games/glife/Makefile
+++ b/games/glife/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	glife
 PORTVERSION=	0.2.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	games gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/games/glife/pkg-plist b/games/glife/pkg-plist
index 5c8f62468909..8c569f768c9e 100644
--- a/games/glife/pkg-plist
+++ b/games/glife/pkg-plist
@@ -1,6 +1,6 @@
 bin/glife
 share/gnome/apps/Games/glife.desktop
-share/gnome/glife/glife.glade
+share/glife/glife.glade
 share/gnome/help/glife/C/appearance.html
 share/gnome/help/glife/C/docbook.css
 share/gnome/help/glife/C/glife-attributes.html
@@ -17,4 +17,4 @@ share/gnome/help/glife/C/topic.dat
 share/locale/ru/LC_MESSAGES/gLife.mo
 @dirrm share/gnome/help/glife/C
 @dirrm share/gnome/help/glife
-@dirrm share/gnome/glife
+@dirrm share/glife
diff --git a/games/gnmm/Makefile b/games/gnmm/Makefile
index 506010c27eac..775208580242 100644
--- a/games/gnmm/Makefile
+++ b/games/gnmm/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gnmm
 PORTVERSION=	0.1.2
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	games gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/games/gnmm/pkg-plist b/games/gnmm/pkg-plist
index 539d1e8707f8..0b6d89a2e5c4 100644
--- a/games/gnmm/pkg-plist
+++ b/games/gnmm/pkg-plist
@@ -1,7 +1,7 @@
 bin/gnmm
 share/gnome/apps/Games/gnmm.desktop
-share/gnome/pixmaps/gnmm-logo.png
-share/gnome/pixmaps/gnmm/board.png
-share/gnome/pixmaps/gnmm/pieces.png
 share/locale/de/LC_MESSAGES/gnmm.mo
-@dirrm share/gnome/pixmaps/gnmm
+share/pixmaps/gnmm-logo.png
+share/pixmaps/gnmm/board.png
+share/pixmaps/gnmm/pieces.png
+@dirrm share/pixmaps/gnmm
diff --git a/games/gno3dtet/Makefile b/games/gno3dtet/Makefile
index 42255b33c9d4..6160023f4c66 100644
--- a/games/gno3dtet/Makefile
+++ b/games/gno3dtet/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gno3dtet
 PORTVERSION=	1.96.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games gnome
 MASTER_SITES=	http://eseb.net/ftp/gno3dtet/
 EXTRACT_SUFX=	.tgz
@@ -36,10 +36,6 @@ post-extract:
 post-patch:
 	@${REINPLACE_CMD} -e '/LIBTOOL/d ; \
 		 s|gnome-games|gno3dtet|g' ${WRKSRC}/configure.in
-	@${REINPLACE_CMD} -e 's|/gnome/help/|/help/|g' \
-		${WRKSRC}/xmldocs.make
-	@${REINPLACE_CMD} -e 's|/gnome/help/|/help/|g ; \
-		 s|datadir)/locale|prefix)/share/locale|g' ${WRKSRC}/src/Makefile.am
 
 pre-configure:
 	@${INSTALL_SCRIPT} ${AUTOMAKE_DIR}/mkinstalldirs ${WRKSRC}
@@ -47,7 +43,7 @@ pre-configure:
 post-install:
 	${CHOWN} root:games ${PREFIX}/bin/gno3dtet
 	${CHMOD} 2555 ${PREFIX}/bin/gno3dtet
-	${CHOWN} root:games ${PREFIX}/share/gnome/games/gno3dtet.hof
-	${CHMOD} 664 ${PREFIX}/share/gnome/games/gno3dtet.hof
+	${CHOWN} root:games ${PREFIX}/share/games/gno3dtet.hof
+	${CHMOD} 664 ${PREFIX}/share/games/gno3dtet.hof
 
 .include <bsd.port.mk>
diff --git a/games/gno3dtet/pkg-plist b/games/gno3dtet/pkg-plist
index f30fe4b054c7..28adeb419a82 100644
--- a/games/gno3dtet/pkg-plist
+++ b/games/gno3dtet/pkg-plist
@@ -1,22 +1,23 @@
 bin/gno3dtet
-share/gnome/applications/gno3dtet.desktop
-share/gnome/games/gno3dtet.hof
+share/applications/gno3dtet.desktop
+share/games/gno3dtet.hof
 share/gnome/help/gno3dtet/C/gno3dtet.xml
 share/gnome/help/gno3dtet/C/legal.xml
-share/gnome/omf/gno3dtet/gno3dtet-C.omf
-share/gnome/pixmaps/gno3dtet.png
-share/gnome/sounds/gno3dtet/danger.wav
-share/gnome/sounds/gno3dtet/fall.wav
-share/gnome/sounds/gno3dtet/hof.wav
-share/gnome/sounds/gno3dtet/land.wav
-share/gnome/sounds/gno3dtet/layer.wav
-share/gnome/sounds/gno3dtet/level.wav
-share/gnome/sounds/gno3dtet/new.wav
-share/gnome/sounds/gno3dtet/pause.wav
-share/gnome/sounds/gno3dtet/score.wav
-share/gnome/sounds/gno3dtet/screwd.wav
+share/omf/gno3dtet/gno3dtet-C.omf
+share/pixmaps/gno3dtet.png
+share/sounds/gno3dtet/danger.wav
+share/sounds/gno3dtet/fall.wav
+share/sounds/gno3dtet/hof.wav
+share/sounds/gno3dtet/land.wav
+share/sounds/gno3dtet/layer.wav
+share/sounds/gno3dtet/level.wav
+share/sounds/gno3dtet/new.wav
+share/sounds/gno3dtet/pause.wav
+share/sounds/gno3dtet/score.wav
+share/sounds/gno3dtet/screwd.wav
 share/locale/fr/LC_MESSAGES/gno3dtet.mo
-@dirrm share/gnome/sounds/gno3dtet
-@dirrm share/gnome/omf/gno3dtet
+@dirrm share/sounds/gno3dtet
+@dirrm share/omf/gno3dtet
 @dirrm share/gnome/help/gno3dtet/C
 @dirrm share/gnome/help/gno3dtet
+@dirrmtry share/applications
diff --git a/games/gnome-games-extra-data/Makefile b/games/gnome-games-extra-data/Makefile
index b4ff2be40fbf..d418b4539510 100644
--- a/games/gnome-games-extra-data/Makefile
+++ b/games/gnome-games-extra-data/Makefile
@@ -3,12 +3,11 @@
 # Whom:					Adam Weinberger <adamw@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/games/gnome-games-extra-data/Makefile,v 1.13 2007/02/16 18:14:25 mezz Exp $
+#   $MCom: ports/games/gnome-games-extra-data/Makefile,v 1.19 2007/09/18 14:04:11 ahze Exp $
 #
 
 PORTNAME=	gnome-games-extra-data
-PORTVERSION=	2.18.0
-PORTREVISION=	1
+PORTVERSION=	2.20.0
 CATEGORIES=	games gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-games-extra-data/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/games/gnome-games-extra-data/distinfo b/games/gnome-games-extra-data/distinfo
index 949e90d1e541..fece2e632dfd 100644
--- a/games/gnome-games-extra-data/distinfo
+++ b/games/gnome-games-extra-data/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-games-extra-data-2.18.0.tar.bz2) = fead9557f3414c807fd7e8338f645e3c
-SHA256 (gnome2/gnome-games-extra-data-2.18.0.tar.bz2) = aaca58bcd283d360296fecc69e6d885e6fd9d038b87a0de36cc1949507db3e35
-SIZE (gnome2/gnome-games-extra-data-2.18.0.tar.bz2) = 3722192
+MD5 (gnome2/gnome-games-extra-data-2.20.0.tar.bz2) = adecbe76d2f45f6471b8bf0f6943f6ca
+SHA256 (gnome2/gnome-games-extra-data-2.20.0.tar.bz2) = 97f7536c638dcbf0d654333ba0abcaa63464d65d89116ef9a2f67d2de319d96f
+SIZE (gnome2/gnome-games-extra-data-2.20.0.tar.bz2) = 4183853
diff --git a/games/gnome-games-extra-data/pkg-plist b/games/gnome-games-extra-data/pkg-plist
index e2c0230c51cb..91db72595163 100644
--- a/games/gnome-games-extra-data/pkg-plist
+++ b/games/gnome-games-extra-data/pkg-plist
@@ -1,33 +1,34 @@
-share/gnome/gnome-games/same-gnome/themes/2.10/blink.png
-share/gnome/gnome-games/same-gnome/themes/2.10/glass.png
-share/gnome/gnome-games/same-gnome/themes/2.10/marbles.png
-share/gnome/gnome-games/same-gnome/themes/2.10/matrix.png
-share/gnome/gnome-games/same-gnome/themes/2.10/rotate.svg
-share/gnome/pixmaps/glines/classic.png
-share/gnome/pixmaps/glines/dots.png
-share/gnome/pixmaps/glines/gumball.png
-share/gnome/pixmaps/glines/pulse.png
-share/gnome/pixmaps/gnobots2/cows.png
-share/gnome/pixmaps/gnobots2/eggs.png
-share/gnome/pixmaps/gnobots2/mice.png
-share/gnome/pixmaps/gnome-games-common/cards/bellot.svg
-share/gnome/pixmaps/gnome-games-common/cards/dondorf.svg
-share/gnome/pixmaps/gnome-games-common/cards/ornamental.svg
-share/gnome/pixmaps/gnome-games-common/cards/paris.svg
-share/gnome/pixmaps/gnometris/5blocks-tig.png
-share/gnome/pixmaps/gnometris/5blocks-tim.png
-share/gnome/pixmaps/gnometris/5blocks.png
-share/gnome/pixmaps/gnometris/7blocks.png
-share/gnome/pixmaps/gnometris/7stones-gn.png
-share/gnome/pixmaps/gnometris/7stones2-gn.png
-share/gnome/pixmaps/iagno/blend.png
-share/gnome/pixmaps/iagno/flipblend.png
-share/gnome/pixmaps/iagno/metal.png
-share/gnome/pixmaps/iagno/metal2.png
-share/gnome/pixmaps/iagno/shrink.png
-share/gnome/pixmaps/iagno/sunmoon.png
-share/gnome/pixmaps/mahjongg/default.png
-share/gnome/pixmaps/mahjongg/default2.png
-share/gnome/pixmaps/mahjongg/greek-letters.png
-share/gnome/pixmaps/mahjongg/maya.png
-share/gnome/pixmaps/mahjongg/seta.png
+share/gnome-games/same-gnome/themes/2.10/blink.png
+share/gnome-games/same-gnome/themes/2.10/glass.png
+share/gnome-games/same-gnome/themes/2.10/marbles.png
+share/gnome-games/same-gnome/themes/2.10/matrix.png
+share/gnome-games/same-gnome/themes/2.10/rotate.svg
+share/gnome-games-common/cards/anglo.svg
+share/gnome-games-common/cards/bellot.svg
+share/gnome-games-common/cards/dondorf.svg
+share/gnome-games-common/cards/ornamental.svg
+share/gnome-games-common/cards/paris.svg
+share/pixmaps/glines/classic.png
+share/pixmaps/glines/dots.png
+share/pixmaps/glines/gumball.png
+share/pixmaps/glines/pulse.png
+share/pixmaps/gnobots2/cows.png
+share/pixmaps/gnobots2/eggs.png
+share/pixmaps/gnobots2/mice.png
+share/pixmaps/gnometris/5blocks-tig.png
+share/pixmaps/gnometris/5blocks-tim.png
+share/pixmaps/gnometris/5blocks.png
+share/pixmaps/gnometris/7blocks.png
+share/pixmaps/gnometris/7stones-gn.png
+share/pixmaps/gnometris/7stones2-gn.png
+share/pixmaps/iagno/blend.png
+share/pixmaps/iagno/flipblend.png
+share/pixmaps/iagno/metal.png
+share/pixmaps/iagno/metal2.png
+share/pixmaps/iagno/shrink.png
+share/pixmaps/iagno/sunmoon.png
+share/pixmaps/mahjongg/default.png
+share/pixmaps/mahjongg/default2.png
+share/pixmaps/mahjongg/greek-letters.png
+share/pixmaps/mahjongg/maya.png
+share/pixmaps/mahjongg/seta.png
diff --git a/games/gnome-games/Makefile b/games/gnome-games/Makefile
index 7bf15f1f2677..e9bf68302810 100644
--- a/games/gnome-games/Makefile
+++ b/games/gnome-games/Makefile
@@ -3,11 +3,11 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/games/gnome-games/Makefile,v 1.139 2007/03/13 17:05:22 mezz Exp $
+#   $MCom: ports/games/gnome-games/Makefile,v 1.159 2007/10/16 03:43:45 mezz Exp $
 #
 
 PORTNAME=	gnome-games
-PORTVERSION=	2.18.2.1
+PORTVERSION=	2.20.1
 CATEGORIES=	games gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -27,6 +27,7 @@ USE_XLIB=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack intlhack libgnomeui \
 		librsvg2 desktopfileutils pygnomedesktop gnomedocutils
+USE_GSTREAMER=	vorbis ogg
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
@@ -35,8 +36,7 @@ GCONF_SCHEMAS=	aisleriot.schemas blackjack.schemas glchess.schemas \
 		glines.schemas gnect.schemas gnibbles.schemas \
 		gnobots2.schemas gnometris.schemas gnomine.schemas \
 		gnotravex.schemas gnotski.schemas gtali.schemas \
-		iagno.schemas libgnomegames.schemas mahjongg.schemas \
-		same-gnome.schemas
+		iagno.schemas mahjongg.schemas same-gnome.schemas
 
 CONFLICTS=	sol-1.0.* glchess-[0-9]* gnomesudoku-[0-9]*
 
@@ -47,15 +47,9 @@ LIB_DEPENDS+=	avahi-client:${PORTSDIR}/net/avahi
 .endif
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|share|share/gnome|g ; \
-	    	s|/usr/local|${PREFIX}|g' \
+	@${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|g' \
 	    	${WRKSRC}/gnome-sudoku/src/lib/defaults.py.in \
 		${WRKSRC}/glchess/src/lib/defaults.py.in
-	@${REINPLACE_CMD} -e 's|/usr/share|${PREFIX}/share/gnome|' \
-		${WRKSRC}/gnome-sudoku/src/gnome-sudoku \
-		${WRKSRC}/glchess/src/glchess \
-		${WRKSRC}/gnome-sudoku/src/lib/dialog_swallower.py \
-		${WRKSRC}/gnome-sudoku/src/lib/game_selector.py
 
 post-install:
 	@-update-desktop-database
diff --git a/games/gnome-games/distinfo b/games/gnome-games/distinfo
index 962f30e4650b..7caae5d56058 100644
--- a/games/gnome-games/distinfo
+++ b/games/gnome-games/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-games-2.18.2.1.tar.bz2) = c3434a724cd72a536ba48d9187f10697
-SHA256 (gnome2/gnome-games-2.18.2.1.tar.bz2) = 9d2d6427322e1096c1f71a54ef97f56ab532bc657fdef716d6136db02da46675
-SIZE (gnome2/gnome-games-2.18.2.1.tar.bz2) = 7568456
+MD5 (gnome2/gnome-games-2.20.1.tar.bz2) = b860b7815c8af1df12fa234dfef4d203
+SHA256 (gnome2/gnome-games-2.20.1.tar.bz2) = af1e34ef29850a29371dff562f9345fb8bcdc754c10beec606aa9ff39b03fb5c
+SIZE (gnome2/gnome-games-2.20.1.tar.bz2) = 11701199
diff --git a/games/gnome-games/files/patch-gnobots2_properties.c b/games/gnome-games/files/patch-gnobots2_properties.c
new file mode 100644
index 000000000000..6a5a72646898
--- /dev/null
+++ b/games/gnome-games/files/patch-gnobots2_properties.c
@@ -0,0 +1,10 @@
+--- gnobots2/properties.c.orig	2007-09-07 15:39:29.000000000 -0500
++++ gnobots2/properties.c	2007-09-07 15:41:56.000000000 -0500
+@@ -116,6 +116,7 @@
+ static void defkey_cb (GtkWidget *, gpointer);
+ static void fill_typemenu (GtkWidget *);
+ static void conf_set_background_color (GdkColor * c);
++static void load_keys (void);
+ /**********************************************************************/
+ 
+ 
diff --git a/games/gnome-games/pkg-install b/games/gnome-games/pkg-install
index 129581f1db70..71ccbbf109ed 100644
--- a/games/gnome-games/pkg-install
+++ b/games/gnome-games/pkg-install
@@ -4,20 +4,20 @@ PATH=/bin:/usr/bin:/usr/sbin
 
 case $2 in
 POST-INSTALL)
-    mkdir -p ${PKG_PREFIX}/share/gnome/games
+    mkdir -p ${PKG_PREFIX}/share/games
     SCORES="glines.Large.scores glines.Medium.scores glines.Small.scores gnibbles.1.0.scores gnibbles.1.1.scores gnibbles.2.0.scores gnibbles.2.1.scores gnibbles.3.0.scores gnibbles.3.1.scores gnibbles.4.0.scores gnibbles.4.1.scores gnobots2.classic_robots-safe.scores gnobots2.classic_robots-super-safe.scores gnobots2.classic_robots.scores gnobots2.nightmare-safe.scores gnobots2.nightmare-super-safe.scores gnobots2.nightmare.scores gnobots2.robots2-safe.scores gnobots2.robots2-super-safe.scores gnobots2.robots2.scores gnobots2.robots2_easy-safe.scores gnobots2.robots2_easy-super-safe.scores gnobots2.robots2_easy.scores gnobots2.robots_with_safe_teleport-safe.scores gnobots2.robots_with_safe_teleport-super-safe.scores gnobots2.robots_with_safe_teleport.scores gnometris.scores gnomine.Custom.scores gnomine.Large.scores gnomine.Medium.scores gnomine.Small.scores gnotravex.2x2.scores gnotravex.3x3.scores gnotravex.4x4.scores gnotravex.5x5.scores gnotravex.6x6.scores gnotski.1.scores gnotski.10.scores gnotski.11.scores gnotski.12.scores gnotski.13.scores gnotski.14.scores gnotski.15.scores gnotski.16.scores gnotski.17.scores gnotski.18.scores gnotski.19.scores gnotski.2.scores gnotski.20.scores gnotski.21.scores gnotski.22.scores gnotski.23.scores gnotski.24.scores gnotski.25.scores gnotski.26.scores gnotski.27.scores gnotski.28.scores gnotski.29.scores gnotski.3.scores gnotski.30.scores gnotski.31.scores gnotski.32.scores gnotski.33.scores gnotski.34.scores gnotski.35.scores gnotski.36.scores gnotski.37.scores gnotski.4.scores gnotski.5.scores gnotski.6.scores gnotski.7.scores gnotski.8.scores gnotski.9.scores gtali.Colors.scores gtali.Regular.scores mahjongg.bridges.scores mahjongg.cloud.scores mahjongg.confounding.scores mahjongg.difficult.scores mahjongg.dragon.scores mahjongg.easy.scores mahjongg.pyramid.scores mahjongg.tictactoe.scores mahjongg.ziggurat.scores same-gnome.Large.scores same-gnome.Medium.scores same-gnome.Small.scores"
     for i in ${SCORES}; do
-	if [ ! -f ${PKG_PREFIX}/share/gnome/games/${i} ]; then
-	    touch -f ${PKG_PREFIX}/share/gnome/games/${i}
-	    chown games:games ${PKG_PREFIX}/share/gnome/games/${i}
-	    chmod 0666 ${PKG_PREFIX}/share/gnome/games/${i}
+	if [ ! -f ${PKG_PREFIX}/share/games/${i} ]; then
+	    touch -f ${PKG_PREFIX}/share/games/${i}
+	    chown games:games ${PKG_PREFIX}/share/games/${i}
+	    chmod 0666 ${PKG_PREFIX}/share/games/${i}
 	fi
     done
-    if [ -f ${PKG_PREFIX}/share/gnome/games/same-gnome.scores ]; then
-	mv -f ${PKG_PREFIX}/share/gnome/games/same-gnome.scores \
-		${PKG_PREFIX}/share/gnome/games/same-gnome.Small.scores
-	ln -sf ${PKG_PREFIX}/share/gnome/games/same-gnome.Small.scores \
-		${PKG_PREFIX}/share/gnome/games/same-gnome.scores
+    if [ -f ${PKG_PREFIX}/share/games/same-gnome.scores ]; then
+	mv -f ${PKG_PREFIX}/share/games/same-gnome.scores \
+		${PKG_PREFIX}/share/games/same-gnome.Small.scores
+	ln -sf ${PKG_PREFIX}/share/games/same-gnome.Small.scores \
+		${PKG_PREFIX}/share/games/same-gnome.scores
     fi
     ;;
 esac
diff --git a/games/gnome-games/pkg-plist b/games/gnome-games/pkg-plist
index 727e84f0a6f8..bdc670314d1d 100644
--- a/games/gnome-games/pkg-plist
+++ b/games/gnome-games/pkg-plist
@@ -15,9 +15,7 @@ bin/iagno
 bin/mahjongg
 bin/same-gnome
 bin/sol
-etc/sound/events/gnibbles.soundlist
-etc/sound/events/gnobots2.soundlist
-etc/sound/events/iagno.soundlist
+lib/gnome-games/gnome-games-render-cards
 %%PYTHON_SITELIBDIR%%/glchess/__init__.py
 %%PYTHON_SITELIBDIR%%/glchess/__init__.pyc
 %%PYTHON_SITELIBDIR%%/glchess/__init__.pyo
@@ -30,6 +28,9 @@ etc/sound/events/iagno.soundlist
 %%PYTHON_SITELIBDIR%%/glchess/chess/__init__.py
 %%PYTHON_SITELIBDIR%%/glchess/chess/__init__.pyc
 %%PYTHON_SITELIBDIR%%/glchess/chess/__init__.pyo
+%%PYTHON_SITELIBDIR%%/glchess/chess/bitboard.py
+%%PYTHON_SITELIBDIR%%/glchess/chess/bitboard.pyc
+%%PYTHON_SITELIBDIR%%/glchess/chess/bitboard.pyo
 %%PYTHON_SITELIBDIR%%/glchess/chess/board.py
 %%PYTHON_SITELIBDIR%%/glchess/chess/board.pyc
 %%PYTHON_SITELIBDIR%%/glchess/chess/board.pyo
@@ -57,6 +58,9 @@ etc/sound/events/iagno.soundlist
 %%PYTHON_SITELIBDIR%%/glchess/gtkui/__init__.py
 %%PYTHON_SITELIBDIR%%/glchess/gtkui/__init__.pyc
 %%PYTHON_SITELIBDIR%%/glchess/gtkui/__init__.pyo
+%%PYTHON_SITELIBDIR%%/glchess/gtkui/chessview.py
+%%PYTHON_SITELIBDIR%%/glchess/gtkui/chessview.pyc
+%%PYTHON_SITELIBDIR%%/glchess/gtkui/chessview.pyo
 %%PYTHON_SITELIBDIR%%/glchess/gtkui/dialogs.py
 %%PYTHON_SITELIBDIR%%/glchess/gtkui/dialogs.pyc
 %%PYTHON_SITELIBDIR%%/glchess/gtkui/dialogs.pyo
@@ -66,15 +70,6 @@ etc/sound/events/iagno.soundlist
 %%PYTHON_SITELIBDIR%%/glchess/main.py
 %%PYTHON_SITELIBDIR%%/glchess/main.pyc
 %%PYTHON_SITELIBDIR%%/glchess/main.pyo
-%%PYTHON_SITELIBDIR%%/glchess/network/__init__.py
-%%PYTHON_SITELIBDIR%%/glchess/network/__init__.pyc
-%%PYTHON_SITELIBDIR%%/glchess/network/__init__.pyo
-%%PYTHON_SITELIBDIR%%/glchess/network/announce.py
-%%PYTHON_SITELIBDIR%%/glchess/network/announce.pyc
-%%PYTHON_SITELIBDIR%%/glchess/network/announce.pyo
-%%PYTHON_SITELIBDIR%%/glchess/network/protocol.py
-%%PYTHON_SITELIBDIR%%/glchess/network/protocol.pyc
-%%PYTHON_SITELIBDIR%%/glchess/network/protocol.pyo
 %%PYTHON_SITELIBDIR%%/glchess/scene/__init__.py
 %%PYTHON_SITELIBDIR%%/glchess/scene/__init__.pyc
 %%PYTHON_SITELIBDIR%%/glchess/scene/__init__.pyo
@@ -177,177 +172,294 @@ etc/sound/events/iagno.soundlist
 %%PYTHON_SITELIBDIR%%/gnome_sudoku/timer.py
 %%PYTHON_SITELIBDIR%%/gnome_sudoku/timer.pyc
 %%PYTHON_SITELIBDIR%%/gnome_sudoku/timer.pyo
-share/gnome/applications/blackjack.desktop
-share/gnome/applications/freecell.desktop
-share/gnome/applications/glchess.desktop
-share/gnome/applications/glines.desktop
-share/gnome/applications/gnect.desktop
-share/gnome/applications/gnibbles.desktop
-share/gnome/applications/gnobots2.desktop
-share/gnome/applications/gnome-sudoku.desktop
-share/gnome/applications/gnometris.desktop
-share/gnome/applications/gnomine.desktop
-share/gnome/applications/gnotravex.desktop
-share/gnome/applications/gnotski.desktop
-share/gnome/applications/gtali.desktop
-share/gnome/applications/iagno.desktop
-share/gnome/applications/mahjongg.desktop
-share/gnome/applications/same-gnome.desktop
-share/gnome/applications/sol.desktop
-share/gnome/blackjack/Ameristar.rules
-share/gnome/blackjack/Atlantic_City.rules
-share/gnome/blackjack/Vegas_Downtown.rules
-share/gnome/blackjack/Vegas_Strip.rules
-@unexec [ -s %D/share/gnome/games/glines.Large.scores ] || rm -f %D/share/gnome/games/glines.Large.scores
-@unexec [ -s %D/share/gnome/games/glines.Medium.scores ] || rm -f %D/share/gnome/games/glines.Medium.scores
-@unexec [ -s %D/share/gnome/games/glines.Small.scores ] || rm -f %D/share/gnome/games/glines.Small.scores
-@unexec [ -s %D/share/gnome/games/gnibbles.1.0.scores ] || rm -f %D/share/gnome/games/gnibbles.1.0.scores
-@unexec [ -s %D/share/gnome/games/gnibbles.1.1.scores ] || rm -f %D/share/gnome/games/gnibbles.1.1.scores
-@unexec [ -s %D/share/gnome/games/gnibbles.2.0.scores ] || rm -f %D/share/gnome/games/gnibbles.2.0.scores
-@unexec [ -s %D/share/gnome/games/gnibbles.2.1.scores ] || rm -f %D/share/gnome/games/gnibbles.2.1.scores
-@unexec [ -s %D/share/gnome/games/gnibbles.3.0.scores ] || rm -f %D/share/gnome/games/gnibbles.3.0.scores
-@unexec [ -s %D/share/gnome/games/gnibbles.3.1.scores ] || rm -f %D/share/gnome/games/gnibbles.3.1.scores
-@unexec [ -s %D/share/gnome/games/gnibbles.4.0.scores ] || rm -f %D/share/gnome/games/gnibbles.4.0.scores
-@unexec [ -s %D/share/gnome/games/gnibbles.4.1.scores ] || rm -f %D/share/gnome/games/gnibbles.4.1.scores
-@unexec [ -s %D/share/gnome/games/gnobots2.classic_robots-safe.scores ] || rm -f %D/share/gnome/games/gnobots2.classic_robots-safe.scores
-@unexec [ -s %D/share/gnome/games/gnobots2.classic_robots-super-safe.scores ] || rm -f %D/share/gnome/games/gnobots2.classic_robots-super-safe.scores
-@unexec [ -s %D/share/gnome/games/gnobots2.classic_robots.scores ] || rm -f %D/share/gnome/games/gnobots2.classic_robots.scores
-@unexec [ -s %D/share/gnome/games/gnobots2.nightmare-safe.scores ] || rm -f %D/share/gnome/games/gnobots2.nightmare-safe.scores
-@unexec [ -s %D/share/gnome/games/gnobots2.nightmare-super-safe.scores ] || rm -f %D/share/gnome/games/gnobots2.nightmare-super-safe.scores
-@unexec [ -s %D/share/gnome/games/gnobots2.nightmare.scores ] || rm -f %D/share/gnome/games/gnobots2.nightmare.scores
-@unexec [ -s %D/share/gnome/games/gnobots2.robots2-safe.scores ] || rm -f %D/share/gnome/games/gnobots2.robots2-safe.scores
-@unexec [ -s %D/share/gnome/games/gnobots2.robots2-super-safe.scores ] || rm -f %D/share/gnome/games/gnobots2.robots2-super-safe.scores
-@unexec [ -s %D/share/gnome/games/gnobots2.robots2.scores ] || rm -f %D/share/gnome/games/gnobots2.robots2.scores
-@unexec [ -s %D/share/gnome/games/gnobots2.robots2_easy-safe.scores ] || rm -f %D/share/gnome/games/gnobots2.robots2_easy-safe.scores
-@unexec [ -s %D/share/gnome/games/gnobots2.robots2_easy-super-safe.scores ] || rm -f %D/share/gnome/games/gnobots2.robots2_easy-super-safe.scores
-@unexec [ -s %D/share/gnome/games/gnobots2.robots2_easy.scores ] || rm -f %D/share/gnome/games/gnobots2.robots2_easy.scores
-@unexec [ -s %D/share/gnome/games/gnobots2.robots_with_safe_teleport-safe.scores ] || rm -f %D/share/gnome/games/gnobots2.robots_with_safe_teleport-safe.scores
-@unexec [ -s %D/share/gnome/games/gnobots2.robots_with_safe_teleport-super-safe.scores ] || rm -f %D/share/gnome/games/gnobots2.robots_with_safe_teleport-super-safe.scores
-@unexec [ -s %D/share/gnome/games/gnobots2.robots_with_safe_teleport.scores ] || rm -f %D/share/gnome/games/gnobots2.robots_with_safe_teleport.scores
-@unexec [ -s %D/share/gnome/games/gnometris.scores ] || rm -f %D/share/gnome/games/gnometris.scores
-@unexec [ -s %D/share/gnome/games/gnomine.Custom.scores ] || rm -f %D/share/gnome/games/gnomine.Custom.scores
-@unexec [ -s %D/share/gnome/games/gnomine.Large.scores ] || rm -f %D/share/gnome/games/gnomine.Large.scores
-@unexec [ -s %D/share/gnome/games/gnomine.Medium.scores ] || rm -f %D/share/gnome/games/gnomine.Medium.scores
-@unexec [ -s %D/share/gnome/games/gnomine.Small.scores ] || rm -f %D/share/gnome/games/gnomine.Small.scores
-@unexec [ -s %D/share/gnome/games/gnotravex.2x2.scores ] || rm -f %D/share/gnome/games/gnotravex.2x2.scores
-@unexec [ -s %D/share/gnome/games/gnotravex.3x3.scores ] || rm -f %D/share/gnome/games/gnotravex.3x3.scores
-@unexec [ -s %D/share/gnome/games/gnotravex.4x4.scores ] || rm -f %D/share/gnome/games/gnotravex.4x4.scores
-@unexec [ -s %D/share/gnome/games/gnotravex.5x5.scores ] || rm -f %D/share/gnome/games/gnotravex.5x5.scores
-@unexec [ -s %D/share/gnome/games/gnotravex.6x6.scores ] || rm -f %D/share/gnome/games/gnotravex.6x6.scores
-@unexec [ -s %D/share/gnome/games/gnotski.1.scores ] || rm -f %D/share/gnome/games/gnotski.1.scores
-@unexec [ -s %D/share/gnome/games/gnotski.10.scores ] || rm -f %D/share/gnome/games/gnotski.10.scores
-@unexec [ -s %D/share/gnome/games/gnotski.11.scores ] || rm -f %D/share/gnome/games/gnotski.11.scores
-@unexec [ -s %D/share/gnome/games/gnotski.12.scores ] || rm -f %D/share/gnome/games/gnotski.12.scores
-@unexec [ -s %D/share/gnome/games/gnotski.13.scores ] || rm -f %D/share/gnome/games/gnotski.13.scores
-@unexec [ -s %D/share/gnome/games/gnotski.14.scores ] || rm -f %D/share/gnome/games/gnotski.14.scores
-@unexec [ -s %D/share/gnome/games/gnotski.15.scores ] || rm -f %D/share/gnome/games/gnotski.15.scores
-@unexec [ -s %D/share/gnome/games/gnotski.16.scores ] || rm -f %D/share/gnome/games/gnotski.16.scores
-@unexec [ -s %D/share/gnome/games/gnotski.17.scores ] || rm -f %D/share/gnome/games/gnotski.17.scores
-@unexec [ -s %D/share/gnome/games/gnotski.18.scores ] || rm -f %D/share/gnome/games/gnotski.18.scores
-@unexec [ -s %D/share/gnome/games/gnotski.19.scores ] || rm -f %D/share/gnome/games/gnotski.19.scores
-@unexec [ -s %D/share/gnome/games/gnotski.2.scores ] || rm -f %D/share/gnome/games/gnotski.2.scores
-@unexec [ -s %D/share/gnome/games/gnotski.20.scores ] || rm -f %D/share/gnome/games/gnotski.20.scores
-@unexec [ -s %D/share/gnome/games/gnotski.21.scores ] || rm -f %D/share/gnome/games/gnotski.21.scores
-@unexec [ -s %D/share/gnome/games/gnotski.22.scores ] || rm -f %D/share/gnome/games/gnotski.22.scores
-@unexec [ -s %D/share/gnome/games/gnotski.23.scores ] || rm -f %D/share/gnome/games/gnotski.23.scores
-@unexec [ -s %D/share/gnome/games/gnotski.24.scores ] || rm -f %D/share/gnome/games/gnotski.24.scores
-@unexec [ -s %D/share/gnome/games/gnotski.25.scores ] || rm -f %D/share/gnome/games/gnotski.25.scores
-@unexec [ -s %D/share/gnome/games/gnotski.26.scores ] || rm -f %D/share/gnome/games/gnotski.26.scores
-@unexec [ -s %D/share/gnome/games/gnotski.27.scores ] || rm -f %D/share/gnome/games/gnotski.27.scores
-@unexec [ -s %D/share/gnome/games/gnotski.28.scores ] || rm -f %D/share/gnome/games/gnotski.28.scores
-@unexec [ -s %D/share/gnome/games/gnotski.29.scores ] || rm -f %D/share/gnome/games/gnotski.29.scores
-@unexec [ -s %D/share/gnome/games/gnotski.3.scores ] || rm -f %D/share/gnome/games/gnotski.3.scores
-@unexec [ -s %D/share/gnome/games/gnotski.30.scores ] || rm -f %D/share/gnome/games/gnotski.30.scores
-@unexec [ -s %D/share/gnome/games/gnotski.31.scores ] || rm -f %D/share/gnome/games/gnotski.31.scores
-@unexec [ -s %D/share/gnome/games/gnotski.32.scores ] || rm -f %D/share/gnome/games/gnotski.32.scores
-@unexec [ -s %D/share/gnome/games/gnotski.33.scores ] || rm -f %D/share/gnome/games/gnotski.33.scores
-@unexec [ -s %D/share/gnome/games/gnotski.34.scores ] || rm -f %D/share/gnome/games/gnotski.34.scores
-@unexec [ -s %D/share/gnome/games/gnotski.35.scores ] || rm -f %D/share/gnome/games/gnotski.35.scores
-@unexec [ -s %D/share/gnome/games/gnotski.36.scores ] || rm -f %D/share/gnome/games/gnotski.36.scores
-@unexec [ -s %D/share/gnome/games/gnotski.37.scores ] || rm -f %D/share/gnome/games/gnotski.37.scores
-@unexec [ -s %D/share/gnome/games/gnotski.4.scores ] || rm -f %D/share/gnome/games/gnotski.4.scores
-@unexec [ -s %D/share/gnome/games/gnotski.5.scores ] || rm -f %D/share/gnome/games/gnotski.5.scores
-@unexec [ -s %D/share/gnome/games/gnotski.6.scores ] || rm -f %D/share/gnome/games/gnotski.6.scores
-@unexec [ -s %D/share/gnome/games/gnotski.7.scores ] || rm -f %D/share/gnome/games/gnotski.7.scores
-@unexec [ -s %D/share/gnome/games/gnotski.8.scores ] || rm -f %D/share/gnome/games/gnotski.8.scores
-@unexec [ -s %D/share/gnome/games/gnotski.9.scores ] || rm -f %D/share/gnome/games/gnotski.9.scores
-@unexec [ -s %D/share/gnome/games/gtali.Colors.scores ] || rm -f %D/share/gnome/games/gtali.Colors.scores
-@unexec [ -s %D/share/gnome/games/gtali.Regular.scores ] || rm -f %D/share/gnome/games/gtali.Regular.scores
-@unexec [ -s %D/share/gnome/games/mahjongg.bridges.scores ] || rm -f %D/share/gnome/games/mahjongg.bridges.scores
-@unexec [ -s %D/share/gnome/games/mahjongg.cloud.scores ] || rm -f %D/share/gnome/games/mahjongg.cloud.scores
-@unexec [ -s %D/share/gnome/games/mahjongg.confounding.scores ] || rm -f %D/share/gnome/games/mahjongg.confounding.scores
-@unexec [ -s %D/share/gnome/games/mahjongg.difficult.scores ] || rm -f %D/share/gnome/games/mahjongg.difficult.scores
-@unexec [ -s %D/share/gnome/games/mahjongg.dragon.scores ] || rm -f %D/share/gnome/games/mahjongg.dragon.scores
-@unexec [ -s %D/share/gnome/games/mahjongg.easy.scores ] || rm -f %D/share/gnome/games/mahjongg.easy.scores
-@unexec [ -s %D/share/gnome/games/mahjongg.pyramid.scores ] || rm -f %D/share/gnome/games/mahjongg.pyramid.scores
-@unexec [ -s %D/share/gnome/games/mahjongg.tictactoe.scores ] || rm -f %D/share/gnome/games/mahjongg.tictactoe.scores
-@unexec [ -s %D/share/gnome/games/mahjongg.ziggurat.scores ] || rm -f %D/share/gnome/games/mahjongg.ziggurat.scores
-@unexec [ -s %D/share/gnome/games/same-gnome.Large.scores ] || rm -f %D/share/gnome/games/same-gnome.Large.scores
-@unexec [ -s %D/share/gnome/games/same-gnome.Medium.scores ] || rm -f %D/share/gnome/games/same-gnome.Medium.scores
-@unexec [ -s %D/share/gnome/games/same-gnome.Small.scores ] || rm -f %D/share/gnome/games/same-gnome.Small.scores
-@unexec [ -L %D/share/gnome/games/same-gnome.scores ] || rm -f %D/share/gnome/games/same-gnome.scores
-share/gnome/ggz/gnome-games/about_bg.png
-share/gnome/ggz/gnome-games/ggz_gtk_admin.svg
-share/gnome/ggz/gnome-games/ggz_gtk_bot.svg
-share/gnome/ggz/gnome-games/ggz_gtk_guest.svg
-share/gnome/ggz/gnome-games/ggz_gtk_lag0.svg
-share/gnome/ggz/gnome-games/ggz_gtk_lag1.svg
-share/gnome/ggz/gnome-games/ggz_gtk_lag2.svg
-share/gnome/ggz/gnome-games/ggz_gtk_lag3.svg
-share/gnome/ggz/gnome-games/ggz_gtk_lag4.svg
-share/gnome/ggz/gnome-games/ggz_gtk_lag5.svg
-share/gnome/ggz/gnome-games/ggz_gtk_registered.svg
-share/gnome/glchess/ai.glade
-share/gnome/glchess/ai.xml
-share/gnome/glchess/chess_view.glade
-share/gnome/glchess/error_dialog.glade
-share/gnome/glchess/glchess.glade
-share/gnome/glchess/glchess.svg
-share/gnome/glchess/load_game.glade
-share/gnome/glchess/new_game.glade
-share/gnome/glchess/save_game.glade
-share/gnome/gnect/white_ob.cn4.gz
-share/gnome/gnibbles/level001.gnl
-share/gnome/gnibbles/level002.gnl
-share/gnome/gnibbles/level003.gnl
-share/gnome/gnibbles/level004.gnl
-share/gnome/gnibbles/level005.gnl
-share/gnome/gnibbles/level006.gnl
-share/gnome/gnibbles/level007.gnl
-share/gnome/gnibbles/level008.gnl
-share/gnome/gnibbles/level009.gnl
-share/gnome/gnibbles/level010.gnl
-share/gnome/gnibbles/level011.gnl
-share/gnome/gnibbles/level012.gnl
-share/gnome/gnibbles/level013.gnl
-share/gnome/gnibbles/level014.gnl
-share/gnome/gnibbles/level015.gnl
-share/gnome/gnibbles/level016.gnl
-share/gnome/gnibbles/level017.gnl
-share/gnome/gnibbles/level018.gnl
-share/gnome/gnibbles/level019.gnl
-share/gnome/gnibbles/level020.gnl
-share/gnome/gnibbles/level021.gnl
-share/gnome/gnibbles/level022.gnl
-share/gnome/gnibbles/level023.gnl
-share/gnome/gnibbles/level024.gnl
-share/gnome/gnibbles/level025.gnl
-share/gnome/gnibbles/level026.gnl
-share/gnome/gnobots2/classic_robots.cfg
-share/gnome/gnobots2/nightmare.cfg
-share/gnome/gnobots2/robots2.cfg
-share/gnome/gnobots2/robots2_easy.cfg
-share/gnome/gnobots2/robots_with_safe_teleport.cfg
-share/gnome/gnome-games/mahjongg/maps/mahjongg.map
-share/gnome/gnome-games/same-gnome/themes/2.10/planets.png
-share/gnome/gnome-games/same-gnome/themes/2.10/stones.png
-share/gnome/gnome-sudoku/high_scores.glade
-share/gnome/gnome-sudoku/new_game.glade
-share/gnome/gnome-sudoku/open_game.glade
-share/gnome/gnome-sudoku/print_games.glade
-share/gnome/gnome-sudoku/puzzle_generator.glade
-share/gnome/gnome-sudoku/starter_puzzles
-share/gnome/gnome-sudoku/tracker.glade
+share/applications/blackjack.desktop
+share/applications/freecell.desktop
+share/applications/glchess.desktop
+share/applications/glines.desktop
+share/applications/gnect.desktop
+share/applications/gnibbles.desktop
+share/applications/gnobots2.desktop
+share/applications/gnome-sudoku.desktop
+share/applications/gnometris.desktop
+share/applications/gnomine.desktop
+share/applications/gnotravex.desktop
+share/applications/gnotski.desktop
+share/applications/gtali.desktop
+share/applications/iagno.desktop
+share/applications/mahjongg.desktop
+share/applications/same-gnome.desktop
+share/applications/sol.desktop
+@unexec [ -s %D/share/games/glines.Large.scores ] || rm -f %D/share/games/glines.Large.scores
+@unexec [ -s %D/share/games/glines.Medium.scores ] || rm -f %D/share/games/glines.Medium.scores
+@unexec [ -s %D/share/games/glines.Small.scores ] || rm -f %D/share/games/glines.Small.scores
+@unexec [ -s %D/share/games/gnibbles.1.0.scores ] || rm -f %D/share/games/gnibbles.1.0.scores
+@unexec [ -s %D/share/games/gnibbles.1.1.scores ] || rm -f %D/share/games/gnibbles.1.1.scores
+@unexec [ -s %D/share/games/gnibbles.2.0.scores ] || rm -f %D/share/games/gnibbles.2.0.scores
+@unexec [ -s %D/share/games/gnibbles.2.1.scores ] || rm -f %D/share/games/gnibbles.2.1.scores
+@unexec [ -s %D/share/games/gnibbles.3.0.scores ] || rm -f %D/share/games/gnibbles.3.0.scores
+@unexec [ -s %D/share/games/gnibbles.3.1.scores ] || rm -f %D/share/games/gnibbles.3.1.scores
+@unexec [ -s %D/share/games/gnibbles.4.0.scores ] || rm -f %D/share/games/gnibbles.4.0.scores
+@unexec [ -s %D/share/games/gnibbles.4.1.scores ] || rm -f %D/share/games/gnibbles.4.1.scores
+@unexec [ -s %D/share/games/gnobots2.classic_robots-safe.scores ] || rm -f %D/share/games/gnobots2.classic_robots-safe.scores
+@unexec [ -s %D/share/games/gnobots2.classic_robots-super-safe.scores ] || rm -f %D/share/games/gnobots2.classic_robots-super-safe.scores
+@unexec [ -s %D/share/games/gnobots2.classic_robots.scores ] || rm -f %D/share/games/gnobots2.classic_robots.scores
+@unexec [ -s %D/share/games/gnobots2.nightmare-safe.scores ] || rm -f %D/share/games/gnobots2.nightmare-safe.scores
+@unexec [ -s %D/share/games/gnobots2.nightmare-super-safe.scores ] || rm -f %D/share/games/gnobots2.nightmare-super-safe.scores
+@unexec [ -s %D/share/games/gnobots2.nightmare.scores ] || rm -f %D/share/games/gnobots2.nightmare.scores
+@unexec [ -s %D/share/games/gnobots2.robots2-safe.scores ] || rm -f %D/share/games/gnobots2.robots2-safe.scores
+@unexec [ -s %D/share/games/gnobots2.robots2-super-safe.scores ] || rm -f %D/share/games/gnobots2.robots2-super-safe.scores
+@unexec [ -s %D/share/games/gnobots2.robots2.scores ] || rm -f %D/share/games/gnobots2.robots2.scores
+@unexec [ -s %D/share/games/gnobots2.robots2_easy-safe.scores ] || rm -f %D/share/games/gnobots2.robots2_easy-safe.scores
+@unexec [ -s %D/share/games/gnobots2.robots2_easy-super-safe.scores ] || rm -f %D/share/games/gnobots2.robots2_easy-super-safe.scores
+@unexec [ -s %D/share/games/gnobots2.robots2_easy.scores ] || rm -f %D/share/games/gnobots2.robots2_easy.scores
+@unexec [ -s %D/share/games/gnobots2.robots_with_safe_teleport-safe.scores ] || rm -f %D/share/games/gnobots2.robots_with_safe_teleport-safe.scores
+@unexec [ -s %D/share/games/gnobots2.robots_with_safe_teleport-super-safe.scores ] || rm -f %D/share/games/gnobots2.robots_with_safe_teleport-super-safe.scores
+@unexec [ -s %D/share/games/gnobots2.robots_with_safe_teleport.scores ] || rm -f %D/share/games/gnobots2.robots_with_safe_teleport.scores
+@unexec [ -s %D/share/games/gnometris.scores ] || rm -f %D/share/games/gnometris.scores
+@unexec [ -s %D/share/games/gnomine.Custom.scores ] || rm -f %D/share/games/gnomine.Custom.scores
+@unexec [ -s %D/share/games/gnomine.Large.scores ] || rm -f %D/share/games/gnomine.Large.scores
+@unexec [ -s %D/share/games/gnomine.Medium.scores ] || rm -f %D/share/games/gnomine.Medium.scores
+@unexec [ -s %D/share/games/gnomine.Small.scores ] || rm -f %D/share/games/gnomine.Small.scores
+@unexec [ -s %D/share/games/gnotravex.2x2.scores ] || rm -f %D/share/games/gnotravex.2x2.scores
+@unexec [ -s %D/share/games/gnotravex.3x3.scores ] || rm -f %D/share/games/gnotravex.3x3.scores
+@unexec [ -s %D/share/games/gnotravex.4x4.scores ] || rm -f %D/share/games/gnotravex.4x4.scores
+@unexec [ -s %D/share/games/gnotravex.5x5.scores ] || rm -f %D/share/games/gnotravex.5x5.scores
+@unexec [ -s %D/share/games/gnotravex.6x6.scores ] || rm -f %D/share/games/gnotravex.6x6.scores
+@unexec [ -s %D/share/games/gnotski.1.scores ] || rm -f %D/share/games/gnotski.1.scores
+@unexec [ -s %D/share/games/gnotski.10.scores ] || rm -f %D/share/games/gnotski.10.scores
+@unexec [ -s %D/share/games/gnotski.11.scores ] || rm -f %D/share/games/gnotski.11.scores
+@unexec [ -s %D/share/games/gnotski.12.scores ] || rm -f %D/share/games/gnotski.12.scores
+@unexec [ -s %D/share/games/gnotski.13.scores ] || rm -f %D/share/games/gnotski.13.scores
+@unexec [ -s %D/share/games/gnotski.14.scores ] || rm -f %D/share/games/gnotski.14.scores
+@unexec [ -s %D/share/games/gnotski.15.scores ] || rm -f %D/share/games/gnotski.15.scores
+@unexec [ -s %D/share/games/gnotski.16.scores ] || rm -f %D/share/games/gnotski.16.scores
+@unexec [ -s %D/share/games/gnotski.17.scores ] || rm -f %D/share/games/gnotski.17.scores
+@unexec [ -s %D/share/games/gnotski.18.scores ] || rm -f %D/share/games/gnotski.18.scores
+@unexec [ -s %D/share/games/gnotski.19.scores ] || rm -f %D/share/games/gnotski.19.scores
+@unexec [ -s %D/share/games/gnotski.2.scores ] || rm -f %D/share/games/gnotski.2.scores
+@unexec [ -s %D/share/games/gnotski.20.scores ] || rm -f %D/share/games/gnotski.20.scores
+@unexec [ -s %D/share/games/gnotski.21.scores ] || rm -f %D/share/games/gnotski.21.scores
+@unexec [ -s %D/share/games/gnotski.22.scores ] || rm -f %D/share/games/gnotski.22.scores
+@unexec [ -s %D/share/games/gnotski.23.scores ] || rm -f %D/share/games/gnotski.23.scores
+@unexec [ -s %D/share/games/gnotski.24.scores ] || rm -f %D/share/games/gnotski.24.scores
+@unexec [ -s %D/share/games/gnotski.25.scores ] || rm -f %D/share/games/gnotski.25.scores
+@unexec [ -s %D/share/games/gnotski.26.scores ] || rm -f %D/share/games/gnotski.26.scores
+@unexec [ -s %D/share/games/gnotski.27.scores ] || rm -f %D/share/games/gnotski.27.scores
+@unexec [ -s %D/share/games/gnotski.28.scores ] || rm -f %D/share/games/gnotski.28.scores
+@unexec [ -s %D/share/games/gnotski.29.scores ] || rm -f %D/share/games/gnotski.29.scores
+@unexec [ -s %D/share/games/gnotski.3.scores ] || rm -f %D/share/games/gnotski.3.scores
+@unexec [ -s %D/share/games/gnotski.30.scores ] || rm -f %D/share/games/gnotski.30.scores
+@unexec [ -s %D/share/games/gnotski.31.scores ] || rm -f %D/share/games/gnotski.31.scores
+@unexec [ -s %D/share/games/gnotski.32.scores ] || rm -f %D/share/games/gnotski.32.scores
+@unexec [ -s %D/share/games/gnotski.33.scores ] || rm -f %D/share/games/gnotski.33.scores
+@unexec [ -s %D/share/games/gnotski.34.scores ] || rm -f %D/share/games/gnotski.34.scores
+@unexec [ -s %D/share/games/gnotski.35.scores ] || rm -f %D/share/games/gnotski.35.scores
+@unexec [ -s %D/share/games/gnotski.36.scores ] || rm -f %D/share/games/gnotski.36.scores
+@unexec [ -s %D/share/games/gnotski.37.scores ] || rm -f %D/share/games/gnotski.37.scores
+@unexec [ -s %D/share/games/gnotski.4.scores ] || rm -f %D/share/games/gnotski.4.scores
+@unexec [ -s %D/share/games/gnotski.5.scores ] || rm -f %D/share/games/gnotski.5.scores
+@unexec [ -s %D/share/games/gnotski.6.scores ] || rm -f %D/share/games/gnotski.6.scores
+@unexec [ -s %D/share/games/gnotski.7.scores ] || rm -f %D/share/games/gnotski.7.scores
+@unexec [ -s %D/share/games/gnotski.8.scores ] || rm -f %D/share/games/gnotski.8.scores
+@unexec [ -s %D/share/games/gnotski.9.scores ] || rm -f %D/share/games/gnotski.9.scores
+@unexec [ -s %D/share/games/gtali.Colors.scores ] || rm -f %D/share/games/gtali.Colors.scores
+@unexec [ -s %D/share/games/gtali.Regular.scores ] || rm -f %D/share/games/gtali.Regular.scores
+@unexec [ -s %D/share/games/mahjongg.bridges.scores ] || rm -f %D/share/games/mahjongg.bridges.scores
+@unexec [ -s %D/share/games/mahjongg.cloud.scores ] || rm -f %D/share/games/mahjongg.cloud.scores
+@unexec [ -s %D/share/games/mahjongg.confounding.scores ] || rm -f %D/share/games/mahjongg.confounding.scores
+@unexec [ -s %D/share/games/mahjongg.difficult.scores ] || rm -f %D/share/games/mahjongg.difficult.scores
+@unexec [ -s %D/share/games/mahjongg.dragon.scores ] || rm -f %D/share/games/mahjongg.dragon.scores
+@unexec [ -s %D/share/games/mahjongg.easy.scores ] || rm -f %D/share/games/mahjongg.easy.scores
+@unexec [ -s %D/share/games/mahjongg.pyramid.scores ] || rm -f %D/share/games/mahjongg.pyramid.scores
+@unexec [ -s %D/share/games/mahjongg.tictactoe.scores ] || rm -f %D/share/games/mahjongg.tictactoe.scores
+@unexec [ -s %D/share/games/mahjongg.ziggurat.scores ] || rm -f %D/share/games/mahjongg.ziggurat.scores
+@unexec [ -s %D/share/games/same-gnome.Large.scores ] || rm -f %D/share/games/same-gnome.Large.scores
+@unexec [ -s %D/share/games/same-gnome.Medium.scores ] || rm -f %D/share/games/same-gnome.Medium.scores
+@unexec [ -s %D/share/games/same-gnome.Small.scores ] || rm -f %D/share/games/same-gnome.Small.scores
+@unexec [ -L %D/share/games/same-gnome.scores ] || rm -f %D/share/games/same-gnome.scores
+share/ggz/gnome-games/about_bg.png
+share/ggz/gnome-games/ggz_gtk_admin.svg
+share/ggz/gnome-games/ggz_gtk_bot.svg
+share/ggz/gnome-games/ggz_gtk_guest.svg
+share/ggz/gnome-games/ggz_gtk_lag0.svg
+share/ggz/gnome-games/ggz_gtk_lag1.svg
+share/ggz/gnome-games/ggz_gtk_lag2.svg
+share/ggz/gnome-games/ggz_gtk_lag3.svg
+share/ggz/gnome-games/ggz_gtk_lag4.svg
+share/ggz/gnome-games/ggz_gtk_lag5.svg
+share/ggz/gnome-games/ggz_gtk_registered.svg
+share/glchess/ai.glade
+share/glchess/ai.xml
+share/glchess/chess_view.glade
+share/glchess/glchess.glade
+share/glchess/load_game.glade
+share/glchess/new_game.glade
+share/glchess/save_game.glade
+share/gnect/white_ob.cn4.gz
+share/gnibbles/level001.gnl
+share/gnibbles/level002.gnl
+share/gnibbles/level003.gnl
+share/gnibbles/level004.gnl
+share/gnibbles/level005.gnl
+share/gnibbles/level006.gnl
+share/gnibbles/level007.gnl
+share/gnibbles/level008.gnl
+share/gnibbles/level009.gnl
+share/gnibbles/level010.gnl
+share/gnibbles/level011.gnl
+share/gnibbles/level012.gnl
+share/gnibbles/level013.gnl
+share/gnibbles/level014.gnl
+share/gnibbles/level015.gnl
+share/gnibbles/level016.gnl
+share/gnibbles/level017.gnl
+share/gnibbles/level018.gnl
+share/gnibbles/level019.gnl
+share/gnibbles/level020.gnl
+share/gnibbles/level021.gnl
+share/gnibbles/level022.gnl
+share/gnibbles/level023.gnl
+share/gnibbles/level024.gnl
+share/gnibbles/level025.gnl
+share/gnibbles/level026.gnl
+share/gnobots2/classic_robots.cfg
+share/gnobots2/nightmare.cfg
+share/gnobots2/robots2.cfg
+share/gnobots2/robots2_easy.cfg
+share/gnobots2/robots_with_safe_teleport.cfg
+share/gnome-games-common/cards/bonded.svg
+share/gnome-games-common/icons/rteleport.png
+share/gnome-games-common/icons/teleport.png
+%%DATADIR%%/aisleriot/games/agnes.scm
+%%DATADIR%%/aisleriot/games/athena.scm
+%%DATADIR%%/aisleriot/games/auld_lang_syne.scm
+%%DATADIR%%/aisleriot/games/aunt_mary.scm
+%%DATADIR%%/aisleriot/games/backbone.scm
+%%DATADIR%%/aisleriot/games/bakers_dozen.scm
+%%DATADIR%%/aisleriot/games/bakers_game.scm
+%%DATADIR%%/aisleriot/games/beleaguered_castle.scm
+%%DATADIR%%/aisleriot/games/block_ten.scm
+%%DATADIR%%/aisleriot/games/bristol.scm
+%%DATADIR%%/aisleriot/games/camelot.scm
+%%DATADIR%%/aisleriot/games/canfield.scm
+%%DATADIR%%/aisleriot/games/carpet.scm
+%%DATADIR%%/aisleriot/games/chessboard.scm
+%%DATADIR%%/aisleriot/games/clock.scm
+%%DATADIR%%/aisleriot/games/cover.scm
+%%DATADIR%%/aisleriot/games/cruel.scm
+%%DATADIR%%/aisleriot/games/diamond_mine.scm
+%%DATADIR%%/aisleriot/games/doublets.scm
+%%DATADIR%%/aisleriot/games/eagle_wing.scm
+%%DATADIR%%/aisleriot/games/easthaven.scm
+%%DATADIR%%/aisleriot/games/eight_off.scm
+%%DATADIR%%/aisleriot/games/elevator.scm
+%%DATADIR%%/aisleriot/games/escalator.scm
+%%DATADIR%%/aisleriot/games/first_law.scm
+%%DATADIR%%/aisleriot/games/fortress.scm
+%%DATADIR%%/aisleriot/games/fortunes.scm
+%%DATADIR%%/aisleriot/games/fourteen.scm
+%%DATADIR%%/aisleriot/games/freecell.scm
+%%DATADIR%%/aisleriot/games/gaps.scm
+%%DATADIR%%/aisleriot/games/gay_gordons.scm
+%%DATADIR%%/aisleriot/games/glenwood.scm
+%%DATADIR%%/aisleriot/games/golf.scm
+%%DATADIR%%/aisleriot/games/gypsy.scm
+%%DATADIR%%/aisleriot/games/helsinki.scm
+%%DATADIR%%/aisleriot/games/hopscotch.scm
+%%DATADIR%%/aisleriot/games/isabel.scm
+%%DATADIR%%/aisleriot/games/jamestown.scm
+%%DATADIR%%/aisleriot/games/jumbo.scm
+%%DATADIR%%/aisleriot/games/kansas.scm
+%%DATADIR%%/aisleriot/games/king_albert.scm
+%%DATADIR%%/aisleriot/games/kings_audience.scm
+%%DATADIR%%/aisleriot/games/klondike.scm
+%%DATADIR%%/aisleriot/games/labyrinth.scm
+%%DATADIR%%/aisleriot/games/lady_jane.scm
+%%DATADIR%%/aisleriot/games/maze.scm
+%%DATADIR%%/aisleriot/games/monte_carlo.scm
+%%DATADIR%%/aisleriot/games/napoleons_tomb.scm
+%%DATADIR%%/aisleriot/games/neighbor.scm
+%%DATADIR%%/aisleriot/games/odessa.scm
+%%DATADIR%%/aisleriot/games/osmosis.scm
+%%DATADIR%%/aisleriot/games/peek.scm
+%%DATADIR%%/aisleriot/games/pileon.scm
+%%DATADIR%%/aisleriot/games/plait.scm
+%%DATADIR%%/aisleriot/games/poker.scm
+%%DATADIR%%/aisleriot/games/quatorze.scm
+%%DATADIR%%/aisleriot/games/royal_east.scm
+%%DATADIR%%/aisleriot/games/saratoga.scm
+%%DATADIR%%/aisleriot/games/scorpion.scm
+%%DATADIR%%/aisleriot/games/scuffle.scm
+%%DATADIR%%/aisleriot/games/seahaven.scm
+%%DATADIR%%/aisleriot/games/sir_tommy.scm
+%%DATADIR%%/aisleriot/games/sol.scm
+%%DATADIR%%/aisleriot/games/spider.scm
+%%DATADIR%%/aisleriot/games/spider_three_decks.scm
+%%DATADIR%%/aisleriot/games/spiderette.scm
+%%DATADIR%%/aisleriot/games/straight_up.scm
+%%DATADIR%%/aisleriot/games/streets_and_alleys.scm
+%%DATADIR%%/aisleriot/games/ten_across.scm
+%%DATADIR%%/aisleriot/games/thieves.scm
+%%DATADIR%%/aisleriot/games/thirteen.scm
+%%DATADIR%%/aisleriot/games/thumb_and_pouch.scm
+%%DATADIR%%/aisleriot/games/treize.scm
+%%DATADIR%%/aisleriot/games/triple_peaks.scm
+%%DATADIR%%/aisleriot/games/union_square.scm
+%%DATADIR%%/aisleriot/games/valentine.scm
+%%DATADIR%%/aisleriot/games/westhaven.scm
+%%DATADIR%%/aisleriot/games/whitehead.scm
+%%DATADIR%%/aisleriot/games/will_o_the_wisp.scm
+%%DATADIR%%/aisleriot/games/yield.scm
+%%DATADIR%%/aisleriot/games/yukon.scm
+%%DATADIR%%/aisleriot/games/zebra.scm
+%%DATADIR%%/blackjack/pixmaps/baize.png
+%%DATADIR%%/blackjack/pixmaps/blackjack-splash.png
+%%DATADIR%%/blackjack/pixmaps/chip-1.svg
+%%DATADIR%%/blackjack/pixmaps/chip-100.svg
+%%DATADIR%%/blackjack/pixmaps/chip-25.svg
+%%DATADIR%%/blackjack/pixmaps/chip-5.svg
+%%DATADIR%%/blackjack/pixmaps/white-outline.svg
+%%DATADIR%%/blackjack/rules/Ameristar.rules
+%%DATADIR%%/blackjack/rules/Atlantic_City.rules
+%%DATADIR%%/blackjack/rules/Vegas_Downtown.rules
+%%DATADIR%%/blackjack/rules/Vegas_Strip.rules
+%%DATADIR%%/gnotski/gnotski.svg
+%%DATADIR%%/mahjongg/maps/mahjongg.map
+%%DATADIR%%/pixmaps/baize.png
+%%DATADIR%%/pixmaps/slot.svg
+%%DATADIR%%/same-gnome/themes/2.10/planets.png
+%%DATADIR%%/same-gnome/themes/2.10/stones.png
+%%DATADIR%%/sounds/appear.ogg
+%%DATADIR%%/sounds/bad.ogg
+%%DATADIR%%/sounds/bonus.ogg
+%%DATADIR%%/sounds/click.ogg
+%%DATADIR%%/sounds/crash.ogg
+%%DATADIR%%/sounds/die.ogg
+%%DATADIR%%/sounds/flip-piece.ogg
+%%DATADIR%%/sounds/gameover.ogg
+%%DATADIR%%/sounds/gnometris.ogg
+%%DATADIR%%/sounds/gobble.ogg
+%%DATADIR%%/sounds/land.ogg
+%%DATADIR%%/sounds/laughter.ogg
+%%DATADIR%%/sounds/life.ogg
+%%DATADIR%%/sounds/lines1.ogg
+%%DATADIR%%/sounds/lines2.ogg
+%%DATADIR%%/sounds/lines3.ogg
+%%DATADIR%%/sounds/pop.ogg
+%%DATADIR%%/sounds/reverse.ogg
+%%DATADIR%%/sounds/slide.ogg
+%%DATADIR%%/sounds/splat.ogg
+%%DATADIR%%/sounds/teleport.ogg
+%%DATADIR%%/sounds/turn.ogg
+%%DATADIR%%/sounds/victory.ogg
+%%DATADIR%%/sounds/yahoo.ogg
+share/gnome-sudoku/high_scores.glade
+share/gnome-sudoku/new_game.glade
+share/gnome-sudoku/open_game.glade
+share/gnome-sudoku/print_games.glade
+share/gnome-sudoku/puzzle_generator.glade
+share/gnome-sudoku/starter_puzzles
+share/gnome-sudoku/tracker.glade
 share/gnome/help/aisleriot/C/agnes.xml
 share/gnome/help/aisleriot/C/aisleriot.xml
 share/gnome/help/aisleriot/C/athena.xml
@@ -400,6 +512,7 @@ share/gnome/help/aisleriot/C/lady_jane.xml
 share/gnome/help/aisleriot/C/legal.xml
 share/gnome/help/aisleriot/C/maze.xml
 share/gnome/help/aisleriot/C/monte_carlo.xml
+share/gnome/help/aisleriot/C/napoleons_tomb.xml
 share/gnome/help/aisleriot/C/neighbor.xml
 share/gnome/help/aisleriot/C/odessa.xml
 share/gnome/help/aisleriot/C/osmosis.xml
@@ -415,6 +528,7 @@ share/gnome/help/aisleriot/C/scuffle.xml
 share/gnome/help/aisleriot/C/seahaven.xml
 share/gnome/help/aisleriot/C/sir_tommy.xml
 share/gnome/help/aisleriot/C/spider.xml
+share/gnome/help/aisleriot/C/spider_three_decks.xml
 share/gnome/help/aisleriot/C/spiderette.xml
 share/gnome/help/aisleriot/C/straight_up.xml
 share/gnome/help/aisleriot/C/streets_and_alleys.xml
@@ -432,100 +546,40 @@ share/gnome/help/aisleriot/C/will_o_the_wisp.xml
 share/gnome/help/aisleriot/C/yield.xml
 share/gnome/help/aisleriot/C/yukon.xml
 share/gnome/help/aisleriot/C/zebra.xml
-share/gnome/help/aisleriot/fr/agnes.xml
+share/gnome/help/aisleriot/es/aisleriot.xml
+share/gnome/help/aisleriot/es/figures/camelot-goal.png
+share/gnome/help/aisleriot/es/figures/clock-rules.png
 share/gnome/help/aisleriot/fr/aisleriot.xml
-share/gnome/help/aisleriot/fr/athena.xml
-share/gnome/help/aisleriot/fr/auld_lang_syne.xml
-share/gnome/help/aisleriot/fr/aunt_mary.xml
-share/gnome/help/aisleriot/fr/backbone.xml
-share/gnome/help/aisleriot/fr/bakers_dozen.xml
-share/gnome/help/aisleriot/fr/bakers_game.xml
-share/gnome/help/aisleriot/fr/beleaguered_castle.xml
-share/gnome/help/aisleriot/fr/block_ten.xml
-share/gnome/help/aisleriot/fr/bristol.xml
-share/gnome/help/aisleriot/fr/camelot.xml
-share/gnome/help/aisleriot/fr/canfield.xml
-share/gnome/help/aisleriot/fr/carpet.xml
-share/gnome/help/aisleriot/fr/chessboard.xml
-share/gnome/help/aisleriot/fr/clock.xml
-share/gnome/help/aisleriot/fr/cover.xml
-share/gnome/help/aisleriot/fr/cruel.xml
-share/gnome/help/aisleriot/fr/definitions.xml
-share/gnome/help/aisleriot/fr/diamond_mine.xml
-share/gnome/help/aisleriot/fr/doublets.xml
-share/gnome/help/aisleriot/fr/eagle-wing.xml
-share/gnome/help/aisleriot/fr/easthaven.xml
-share/gnome/help/aisleriot/fr/eight_off.xml
-share/gnome/help/aisleriot/fr/elevator.xml
-share/gnome/help/aisleriot/fr/escalator.xml
 share/gnome/help/aisleriot/fr/figures/camelot-goal.png
 share/gnome/help/aisleriot/fr/figures/clock-rules.png
-share/gnome/help/aisleriot/fr/first_law.xml
-share/gnome/help/aisleriot/fr/fortress.xml
-share/gnome/help/aisleriot/fr/fortunes.xml
-share/gnome/help/aisleriot/fr/fourteen.xml
-share/gnome/help/aisleriot/fr/freecell.xml
-share/gnome/help/aisleriot/fr/gaps.xml
-share/gnome/help/aisleriot/fr/gay_gordons.xml
-share/gnome/help/aisleriot/fr/glenwood.xml
-share/gnome/help/aisleriot/fr/golf.xml
-share/gnome/help/aisleriot/fr/gypsy.xml
-share/gnome/help/aisleriot/fr/helsinki.xml
-share/gnome/help/aisleriot/fr/hopscotch.xml
-share/gnome/help/aisleriot/fr/isabel.xml
-share/gnome/help/aisleriot/fr/jamestown.xml
-share/gnome/help/aisleriot/fr/jumbo.xml
-share/gnome/help/aisleriot/fr/kansas.xml
-share/gnome/help/aisleriot/fr/king_albert.xml
-share/gnome/help/aisleriot/fr/kings_audience.xml
-share/gnome/help/aisleriot/fr/klondike.xml
-share/gnome/help/aisleriot/fr/labyrinth.xml
-share/gnome/help/aisleriot/fr/lady_jane.xml
-share/gnome/help/aisleriot/fr/legal.xml
-share/gnome/help/aisleriot/fr/maze.xml
-share/gnome/help/aisleriot/fr/monte_carlo.xml
-share/gnome/help/aisleriot/fr/neighbor.xml
-share/gnome/help/aisleriot/fr/odessa.xml
-share/gnome/help/aisleriot/fr/osmosis.xml
-share/gnome/help/aisleriot/fr/peek.xml
-share/gnome/help/aisleriot/fr/pileon.xml
-share/gnome/help/aisleriot/fr/plait.xml
-share/gnome/help/aisleriot/fr/poker.xml
-share/gnome/help/aisleriot/fr/quatorze.xml
-share/gnome/help/aisleriot/fr/royal_east.xml
-share/gnome/help/aisleriot/fr/saratoga.xml
-share/gnome/help/aisleriot/fr/scorpion.xml
-share/gnome/help/aisleriot/fr/scuffle.xml
-share/gnome/help/aisleriot/fr/seahaven.xml
-share/gnome/help/aisleriot/fr/sir_tommy.xml
-share/gnome/help/aisleriot/fr/spider.xml
-share/gnome/help/aisleriot/fr/spider_one_suit.xml
-share/gnome/help/aisleriot/fr/spider_two_suit.xml
-share/gnome/help/aisleriot/fr/spiderette.xml
-share/gnome/help/aisleriot/fr/straight_up.xml
-share/gnome/help/aisleriot/fr/streets_and_alleys.xml
-share/gnome/help/aisleriot/fr/ten_across.xml
-share/gnome/help/aisleriot/fr/thieves.xml
-share/gnome/help/aisleriot/fr/thirteen.xml
-share/gnome/help/aisleriot/fr/thumb_and_pouch.xml
-share/gnome/help/aisleriot/fr/treize.xml
-share/gnome/help/aisleriot/fr/triple_peaks.xml
-share/gnome/help/aisleriot/fr/union_square.xml
-share/gnome/help/aisleriot/fr/valentine.xml
-share/gnome/help/aisleriot/fr/westhaven.xml
-share/gnome/help/aisleriot/fr/whitehead.xml
-share/gnome/help/aisleriot/fr/will_o_the_wisp.xml
-share/gnome/help/aisleriot/fr/yield.xml
-share/gnome/help/aisleriot/fr/yukon.xml
-share/gnome/help/aisleriot/fr/zebra.xml
+share/gnome/help/aisleriot/oc/aisleriot.xml
+share/gnome/help/aisleriot/oc/figures/camelot-goal.png
+share/gnome/help/aisleriot/oc/figures/clock-rules.png
+share/gnome/help/aisleriot/sv/aisleriot.xml
+share/gnome/help/aisleriot/sv/figures/camelot-goal.png
+share/gnome/help/aisleriot/sv/figures/clock-rules.png
 share/gnome/help/blackjack/C/blackjack.xml
 share/gnome/help/blackjack/C/figures/blackjack_start_window.png
 share/gnome/help/blackjack/C/figures/blackjack_win_window.png
 share/gnome/help/blackjack/C/legal.xml
+share/gnome/help/blackjack/es/blackjack.xml
+share/gnome/help/blackjack/es/figures/blackjack_start_window.png
+share/gnome/help/blackjack/es/figures/blackjack_win_window.png
+share/gnome/help/blackjack/fr/blackjack.xml
+share/gnome/help/blackjack/fr/figures/blackjack_start_window.png
+share/gnome/help/blackjack/fr/figures/blackjack_win_window.png
+share/gnome/help/blackjack/oc/blackjack.xml
+share/gnome/help/blackjack/oc/figures/blackjack_start_window.png
+share/gnome/help/blackjack/oc/figures/blackjack_win_window.png
+share/gnome/help/blackjack/sv/blackjack.xml
+share/gnome/help/blackjack/sv/figures/blackjack_start_window.png
+share/gnome/help/blackjack/sv/figures/blackjack_win_window.png
 share/gnome/help/glchess/C/glchess.xml
 share/gnome/help/glchess/C/legal.xml
 share/gnome/help/glchess/es/glchess.xml
 share/gnome/help/glchess/fr/glchess.xml
+share/gnome/help/glchess/oc/glchess.xml
+share/gnome/help/glchess/pt_BR/glchess.xml
 share/gnome/help/glchess/sv/glchess.xml
 share/gnome/help/glines/C/figures/glines-gameover.png
 share/gnome/help/glines/C/figures/glines-startgame.png
@@ -544,6 +598,10 @@ share/gnome/help/glines/fr/figures/glines-gameover.png
 share/gnome/help/glines/fr/figures/glines-startgame.png
 share/gnome/help/glines/fr/figures/preferences.png
 share/gnome/help/glines/fr/glines.xml
+share/gnome/help/glines/oc/figures/glines-gameover.png
+share/gnome/help/glines/oc/figures/glines-startgame.png
+share/gnome/help/glines/oc/figures/preferences.png
+share/gnome/help/glines/oc/glines.xml
 share/gnome/help/glines/ru/figures/glines-gameover.png
 share/gnome/help/glines/ru/figures/glines-startgame.png
 share/gnome/help/glines/ru/figures/preferences.png
@@ -552,37 +610,92 @@ share/gnome/help/glines/sv/figures/glines-gameover.png
 share/gnome/help/glines/sv/figures/glines-startgame.png
 share/gnome/help/glines/sv/figures/preferences.png
 share/gnome/help/glines/sv/glines.xml
+share/gnome/help/gnect/C/figures/connect.png
 share/gnome/help/gnect/C/figures/mainwindow.png
+share/gnome/help/gnect/C/figures/tables.png
 share/gnome/help/gnect/C/figures/tileset.png
 share/gnome/help/gnect/C/gnect.xml
 share/gnome/help/gnect/C/legal.xml
+share/gnome/help/gnect/C/network-games.xml
+share/gnome/help/gnect/en_GB/figures/connect.png
 share/gnome/help/gnect/en_GB/figures/mainwindow.png
+share/gnome/help/gnect/en_GB/figures/tables.png
 share/gnome/help/gnect/en_GB/figures/tileset.png
 share/gnome/help/gnect/en_GB/gnect.xml
+share/gnome/help/gnect/es/figures/connect.png
 share/gnome/help/gnect/es/figures/mainwindow.png
+share/gnome/help/gnect/es/figures/tables.png
 share/gnome/help/gnect/es/figures/tileset.png
 share/gnome/help/gnect/es/gnect.xml
+share/gnome/help/gnect/fr/figures/connect.png
 share/gnome/help/gnect/fr/figures/mainwindow.png
+share/gnome/help/gnect/fr/figures/tables.png
 share/gnome/help/gnect/fr/figures/tileset.png
 share/gnome/help/gnect/fr/gnect.xml
+share/gnome/help/gnect/oc/figures/connect.png
+share/gnome/help/gnect/oc/figures/mainwindow.png
+share/gnome/help/gnect/oc/figures/tables.png
+share/gnome/help/gnect/oc/figures/tileset.png
+share/gnome/help/gnect/oc/gnect.xml
+share/gnome/help/gnect/sv/figures/connect.png
 share/gnome/help/gnect/sv/figures/mainwindow.png
+share/gnome/help/gnect/sv/figures/tables.png
 share/gnome/help/gnect/sv/figures/tileset.png
 share/gnome/help/gnect/sv/gnect.xml
+share/gnome/help/gnibbles/C/figures/connect.png
 share/gnome/help/gnibbles/C/figures/game.png
 share/gnome/help/gnibbles/C/figures/intro.png
 share/gnome/help/gnibbles/C/figures/playing.png
+share/gnome/help/gnibbles/C/figures/tables.png
 share/gnome/help/gnibbles/C/figures/worm_op.png
 share/gnome/help/gnibbles/C/gnibbles.xml
 share/gnome/help/gnibbles/C/legal.xml
+share/gnome/help/gnibbles/C/network-games.xml
+share/gnome/help/gnibbles/es/figures/connect.png
+share/gnome/help/gnibbles/es/figures/game.png
+share/gnome/help/gnibbles/es/figures/intro.png
+share/gnome/help/gnibbles/es/figures/playing.png
+share/gnome/help/gnibbles/es/figures/tables.png
+share/gnome/help/gnibbles/es/figures/worm_op.png
+share/gnome/help/gnibbles/es/gnibbles.xml
+share/gnome/help/gnibbles/fr/figures/connect.png
+share/gnome/help/gnibbles/fr/figures/game.png
+share/gnome/help/gnibbles/fr/figures/intro.png
+share/gnome/help/gnibbles/fr/figures/playing.png
+share/gnome/help/gnibbles/fr/figures/tables.png
+share/gnome/help/gnibbles/fr/figures/worm_op.png
+share/gnome/help/gnibbles/fr/gnibbles.xml
+share/gnome/help/gnibbles/oc/figures/connect.png
+share/gnome/help/gnibbles/oc/figures/game.png
+share/gnome/help/gnibbles/oc/figures/intro.png
+share/gnome/help/gnibbles/oc/figures/playing.png
+share/gnome/help/gnibbles/oc/figures/tables.png
+share/gnome/help/gnibbles/oc/figures/worm_op.png
+share/gnome/help/gnibbles/oc/gnibbles.xml
+share/gnome/help/gnibbles/sv/figures/connect.png
+share/gnome/help/gnibbles/sv/figures/game.png
+share/gnome/help/gnibbles/sv/figures/intro.png
+share/gnome/help/gnibbles/sv/figures/playing.png
+share/gnome/help/gnibbles/sv/figures/tables.png
+share/gnome/help/gnibbles/sv/figures/worm_op.png
+share/gnome/help/gnibbles/sv/gnibbles.xml
 share/gnome/help/gnobots2/C/figures/gnobots2-main.png
 share/gnome/help/gnobots2/C/gnobots2.xml
 share/gnome/help/gnobots2/C/legal.xml
 share/gnome/help/gnobots2/da/gnobots2.xml
 share/gnome/help/gnobots2/da/legal.xml
+share/gnome/help/gnobots2/de/figures/gnobots2-main.png
+share/gnome/help/gnobots2/de/gnobots2.xml
+share/gnome/help/gnobots2/es/figures/gnobots2-main.png
 share/gnome/help/gnobots2/es/gnobots2.xml
-share/gnome/help/gnobots2/es/legal.xml
+share/gnome/help/gnobots2/fr/figures/gnobots2-main.png
+share/gnome/help/gnobots2/fr/gnobots2.xml
 share/gnome/help/gnobots2/it/gnobots2.xml
 share/gnome/help/gnobots2/it/legal.xml
+share/gnome/help/gnobots2/oc/figures/gnobots2-main.png
+share/gnome/help/gnobots2/oc/gnobots2.xml
+share/gnome/help/gnobots2/sv/figures/gnobots2-main.png
+share/gnome/help/gnobots2/sv/gnobots2.xml
 share/gnome/help/gnome-sudoku/C/figures/Print_Sudokus.png
 share/gnome/help/gnome-sudoku/C/figures/always_show_hint.png
 share/gnome/help/gnome-sudoku/C/figures/error_highlighting.png
@@ -590,8 +703,37 @@ share/gnome/help/gnome-sudoku/C/figures/highlighting.png
 share/gnome/help/gnome-sudoku/C/figures/hints.png
 share/gnome/help/gnome-sudoku/C/gnome-sudoku.xml
 share/gnome/help/gnome-sudoku/C/legal.xml
+share/gnome/help/gnome-sudoku/es/figures/Print_Sudokus.png
+share/gnome/help/gnome-sudoku/es/figures/always_show_hint.png
+share/gnome/help/gnome-sudoku/es/figures/error_highlighting.png
+share/gnome/help/gnome-sudoku/es/figures/highlighting.png
+share/gnome/help/gnome-sudoku/es/figures/hints.png
+share/gnome/help/gnome-sudoku/es/gnome-sudoku.xml
+share/gnome/help/gnome-sudoku/fr/figures/Print_Sudokus.png
+share/gnome/help/gnome-sudoku/fr/figures/always_show_hint.png
+share/gnome/help/gnome-sudoku/fr/figures/error_highlighting.png
+share/gnome/help/gnome-sudoku/fr/figures/highlighting.png
+share/gnome/help/gnome-sudoku/fr/figures/hints.png
+share/gnome/help/gnome-sudoku/fr/gnome-sudoku.xml
+share/gnome/help/gnome-sudoku/oc/figures/Print_Sudokus.png
+share/gnome/help/gnome-sudoku/oc/figures/always_show_hint.png
+share/gnome/help/gnome-sudoku/oc/figures/error_highlighting.png
+share/gnome/help/gnome-sudoku/oc/figures/highlighting.png
+share/gnome/help/gnome-sudoku/oc/figures/hints.png
+share/gnome/help/gnome-sudoku/oc/gnome-sudoku.xml
+share/gnome/help/gnome-sudoku/sv/figures/Print_Sudokus.png
+share/gnome/help/gnome-sudoku/sv/figures/always_show_hint.png
+share/gnome/help/gnome-sudoku/sv/figures/error_highlighting.png
+share/gnome/help/gnome-sudoku/sv/figures/highlighting.png
+share/gnome/help/gnome-sudoku/sv/figures/hints.png
+share/gnome/help/gnome-sudoku/sv/gnome-sudoku.xml
 share/gnome/help/gnometris/C/gnometris.xml
 share/gnome/help/gnometris/C/legal.xml
+share/gnome/help/gnometris/el/gnometris.xml
+share/gnome/help/gnometris/es/gnometris.xml
+share/gnome/help/gnometris/fr/gnometris.xml
+share/gnome/help/gnometris/oc/gnometris.xml
+share/gnome/help/gnometris/sv/gnometris.xml
 share/gnome/help/gnomine/C/figures/easy-hints-1.png
 share/gnome/help/gnomine/C/figures/easy-hints-2.png
 share/gnome/help/gnomine/C/figures/easy-hints-3.png
@@ -607,33 +749,200 @@ share/gnome/help/gnomine/C/figures/preferences.png
 share/gnome/help/gnomine/C/figures/statusbar.png
 share/gnome/help/gnomine/C/gnomine.xml
 share/gnome/help/gnomine/C/legal.xml
+share/gnome/help/gnomine/de/figures/easy-hints-1.png
+share/gnome/help/gnomine/de/figures/easy-hints-2.png
+share/gnome/help/gnomine/de/figures/easy-hints-3.png
+share/gnome/help/gnomine/de/figures/faces.png
+share/gnome/help/gnomine/de/figures/flags.png
+share/gnome/help/gnomine/de/figures/hard-hints-1.png
+share/gnome/help/gnomine/de/figures/hard-hints-2.png
+share/gnome/help/gnomine/de/figures/hard-hints-3.png
+share/gnome/help/gnomine/de/figures/highscores.png
+share/gnome/help/gnomine/de/figures/imnotsureflagscheckbox.png
+share/gnome/help/gnomine/de/figures/main-window.png
+share/gnome/help/gnomine/de/figures/preferences.png
+share/gnome/help/gnomine/de/figures/statusbar.png
+share/gnome/help/gnomine/de/gnomine.xml
+share/gnome/help/gnomine/es/figures/easy-hints-1.png
+share/gnome/help/gnomine/es/figures/easy-hints-2.png
+share/gnome/help/gnomine/es/figures/easy-hints-3.png
+share/gnome/help/gnomine/es/figures/faces.png
+share/gnome/help/gnomine/es/figures/flags.png
+share/gnome/help/gnomine/es/figures/hard-hints-1.png
+share/gnome/help/gnomine/es/figures/hard-hints-2.png
+share/gnome/help/gnomine/es/figures/hard-hints-3.png
+share/gnome/help/gnomine/es/figures/highscores.png
+share/gnome/help/gnomine/es/figures/imnotsureflagscheckbox.png
+share/gnome/help/gnomine/es/figures/main-window.png
+share/gnome/help/gnomine/es/figures/preferences.png
+share/gnome/help/gnomine/es/figures/statusbar.png
+share/gnome/help/gnomine/es/gnomine.xml
+share/gnome/help/gnomine/fr/figures/easy-hints-1.png
+share/gnome/help/gnomine/fr/figures/easy-hints-2.png
+share/gnome/help/gnomine/fr/figures/easy-hints-3.png
+share/gnome/help/gnomine/fr/figures/faces.png
+share/gnome/help/gnomine/fr/figures/flags.png
+share/gnome/help/gnomine/fr/figures/hard-hints-1.png
+share/gnome/help/gnomine/fr/figures/hard-hints-2.png
+share/gnome/help/gnomine/fr/figures/hard-hints-3.png
+share/gnome/help/gnomine/fr/figures/highscores.png
+share/gnome/help/gnomine/fr/figures/imnotsureflagscheckbox.png
+share/gnome/help/gnomine/fr/figures/main-window.png
+share/gnome/help/gnomine/fr/figures/preferences.png
+share/gnome/help/gnomine/fr/figures/statusbar.png
+share/gnome/help/gnomine/fr/gnomine.xml
+share/gnome/help/gnomine/oc/figures/easy-hints-1.png
+share/gnome/help/gnomine/oc/figures/easy-hints-2.png
+share/gnome/help/gnomine/oc/figures/easy-hints-3.png
+share/gnome/help/gnomine/oc/figures/faces.png
+share/gnome/help/gnomine/oc/figures/flags.png
+share/gnome/help/gnomine/oc/figures/hard-hints-1.png
+share/gnome/help/gnomine/oc/figures/hard-hints-2.png
+share/gnome/help/gnomine/oc/figures/hard-hints-3.png
+share/gnome/help/gnomine/oc/figures/highscores.png
+share/gnome/help/gnomine/oc/figures/imnotsureflagscheckbox.png
+share/gnome/help/gnomine/oc/figures/main-window.png
+share/gnome/help/gnomine/oc/figures/preferences.png
+share/gnome/help/gnomine/oc/figures/statusbar.png
+share/gnome/help/gnomine/oc/gnomine.xml
+share/gnome/help/gnomine/sv/figures/easy-hints-1.png
+share/gnome/help/gnomine/sv/figures/easy-hints-2.png
+share/gnome/help/gnomine/sv/figures/easy-hints-3.png
+share/gnome/help/gnomine/sv/figures/faces.png
+share/gnome/help/gnomine/sv/figures/flags.png
+share/gnome/help/gnomine/sv/figures/hard-hints-1.png
+share/gnome/help/gnomine/sv/figures/hard-hints-2.png
+share/gnome/help/gnomine/sv/figures/hard-hints-3.png
+share/gnome/help/gnomine/sv/figures/highscores.png
+share/gnome/help/gnomine/sv/figures/imnotsureflagscheckbox.png
+share/gnome/help/gnomine/sv/figures/main-window.png
+share/gnome/help/gnomine/sv/figures/preferences.png
+share/gnome/help/gnomine/sv/figures/statusbar.png
+share/gnome/help/gnomine/sv/gnomine.xml
 share/gnome/help/gnotravex/C/figures/gnotravex_game.png
 share/gnome/help/gnotravex/C/figures/gnotravex_mainwindow.png
 share/gnome/help/gnotravex/C/gnotravex.xml
 share/gnome/help/gnotravex/C/legal.xml
+share/gnome/help/gnotravex/de/figures/gnotravex_game.png
+share/gnome/help/gnotravex/de/figures/gnotravex_mainwindow.png
+share/gnome/help/gnotravex/de/gnotravex.xml
+share/gnome/help/gnotravex/el/figures/gnotravex_game.png
+share/gnome/help/gnotravex/el/figures/gnotravex_mainwindow.png
+share/gnome/help/gnotravex/el/gnotravex.xml
+share/gnome/help/gnotravex/es/figures/gnotravex_game.png
+share/gnome/help/gnotravex/es/figures/gnotravex_mainwindow.png
+share/gnome/help/gnotravex/es/gnotravex.xml
+share/gnome/help/gnotravex/fr/figures/gnotravex_game.png
+share/gnome/help/gnotravex/fr/figures/gnotravex_mainwindow.png
+share/gnome/help/gnotravex/fr/gnotravex.xml
+share/gnome/help/gnotravex/oc/figures/gnotravex_game.png
+share/gnome/help/gnotravex/oc/figures/gnotravex_mainwindow.png
+share/gnome/help/gnotravex/oc/gnotravex.xml
+share/gnome/help/gnotravex/sv/figures/gnotravex_game.png
+share/gnome/help/gnotravex/sv/figures/gnotravex_mainwindow.png
+share/gnome/help/gnotravex/sv/gnotravex.xml
 share/gnome/help/gnotski/C/figures/gnotski_start_window.png
 share/gnome/help/gnotski/C/figures/gnotski_win.png
 share/gnome/help/gnotski/C/gnotski.xml
 share/gnome/help/gnotski/C/legal.xml
+share/gnome/help/gnotski/es/figures/gnotski_start_window.png
+share/gnome/help/gnotski/es/figures/gnotski_win.png
+share/gnome/help/gnotski/es/gnotski.xml
+share/gnome/help/gnotski/fr/figures/gnotski_start_window.png
+share/gnome/help/gnotski/fr/figures/gnotski_win.png
+share/gnome/help/gnotski/fr/gnotski.xml
+share/gnome/help/gnotski/oc/figures/gnotski_start_window.png
+share/gnome/help/gnotski/oc/figures/gnotski_win.png
+share/gnome/help/gnotski/oc/gnotski.xml
+share/gnome/help/gnotski/sv/figures/gnotski_start_window.png
+share/gnome/help/gnotski/sv/figures/gnotski_win.png
+share/gnome/help/gnotski/sv/gnotski.xml
 share/gnome/help/gtali/C/figures/mainwindow.png
 share/gnome/help/gtali/C/figures/preferences.png
 share/gnome/help/gtali/C/gtali.xml
 share/gnome/help/gtali/C/legal.xml
 share/gnome/help/gtali/da/gtali.xml
 share/gnome/help/gtali/da/legal.xml
+share/gnome/help/gtali/es/figures/mainwindow.png
+share/gnome/help/gtali/es/figures/preferences.png
+share/gnome/help/gtali/es/gtali.xml
+share/gnome/help/gtali/fr/figures/mainwindow.png
+share/gnome/help/gtali/fr/figures/preferences.png
+share/gnome/help/gtali/fr/gtali.xml
+share/gnome/help/gtali/oc/figures/mainwindow.png
+share/gnome/help/gtali/oc/figures/preferences.png
+share/gnome/help/gtali/oc/gtali.xml
+share/gnome/help/gtali/sv/figures/mainwindow.png
+share/gnome/help/gtali/sv/figures/preferences.png
+share/gnome/help/gtali/sv/gtali.xml
 share/gnome/help/iagno/C/figures/ANIMATION.png
 share/gnome/help/iagno/C/figures/BLOCK.png
 share/gnome/help/iagno/C/figures/FIRST.png
 share/gnome/help/iagno/C/figures/PLAYER.png
 share/gnome/help/iagno/C/figures/START.png
+share/gnome/help/iagno/C/figures/connect.png
+share/gnome/help/iagno/C/figures/tables.png
 share/gnome/help/iagno/C/iagno.xml
 share/gnome/help/iagno/C/legal.xml
+share/gnome/help/iagno/C/network-games.xml
+share/gnome/help/iagno/es/figures/ANIMATION.png
+share/gnome/help/iagno/es/figures/BLOCK.png
+share/gnome/help/iagno/es/figures/FIRST.png
+share/gnome/help/iagno/es/figures/PLAYER.png
+share/gnome/help/iagno/es/figures/START.png
+share/gnome/help/iagno/es/figures/connect.png
+share/gnome/help/iagno/es/figures/tables.png
+share/gnome/help/iagno/es/iagno.xml
+share/gnome/help/iagno/fr/figures/ANIMATION.png
+share/gnome/help/iagno/fr/figures/BLOCK.png
+share/gnome/help/iagno/fr/figures/FIRST.png
+share/gnome/help/iagno/fr/figures/PLAYER.png
+share/gnome/help/iagno/fr/figures/START.png
+share/gnome/help/iagno/fr/figures/connect.png
+share/gnome/help/iagno/fr/figures/tables.png
+share/gnome/help/iagno/fr/iagno.xml
+share/gnome/help/iagno/oc/figures/ANIMATION.png
+share/gnome/help/iagno/oc/figures/BLOCK.png
+share/gnome/help/iagno/oc/figures/FIRST.png
+share/gnome/help/iagno/oc/figures/PLAYER.png
+share/gnome/help/iagno/oc/figures/START.png
+share/gnome/help/iagno/oc/figures/connect.png
+share/gnome/help/iagno/oc/figures/tables.png
+share/gnome/help/iagno/oc/iagno.xml
+share/gnome/help/iagno/sv/figures/ANIMATION.png
+share/gnome/help/iagno/sv/figures/BLOCK.png
+share/gnome/help/iagno/sv/figures/FIRST.png
+share/gnome/help/iagno/sv/figures/PLAYER.png
+share/gnome/help/iagno/sv/figures/START.png
+share/gnome/help/iagno/sv/figures/connect.png
+share/gnome/help/iagno/sv/figures/tables.png
+share/gnome/help/iagno/sv/iagno.xml
 share/gnome/help/mahjongg/C/figures/mahjongg.png
 share/gnome/help/mahjongg/C/figures/no-move.png
 share/gnome/help/mahjongg/C/figures/preferences.png
 share/gnome/help/mahjongg/C/figures/toolbar.png
 share/gnome/help/mahjongg/C/legal.xml
 share/gnome/help/mahjongg/C/mahjongg.xml
+share/gnome/help/mahjongg/es/figures/mahjongg.png
+share/gnome/help/mahjongg/es/figures/no-move.png
+share/gnome/help/mahjongg/es/figures/preferences.png
+share/gnome/help/mahjongg/es/figures/toolbar.png
+share/gnome/help/mahjongg/es/mahjongg.xml
+share/gnome/help/mahjongg/fr/figures/mahjongg.png
+share/gnome/help/mahjongg/fr/figures/no-move.png
+share/gnome/help/mahjongg/fr/figures/preferences.png
+share/gnome/help/mahjongg/fr/figures/toolbar.png
+share/gnome/help/mahjongg/fr/mahjongg.xml
+share/gnome/help/mahjongg/oc/figures/mahjongg.png
+share/gnome/help/mahjongg/oc/figures/no-move.png
+share/gnome/help/mahjongg/oc/figures/preferences.png
+share/gnome/help/mahjongg/oc/figures/toolbar.png
+share/gnome/help/mahjongg/oc/mahjongg.xml
+share/gnome/help/mahjongg/sv/figures/mahjongg.png
+share/gnome/help/mahjongg/sv/figures/no-move.png
+share/gnome/help/mahjongg/sv/figures/preferences.png
+share/gnome/help/mahjongg/sv/figures/toolbar.png
+share/gnome/help/mahjongg/sv/mahjongg.xml
 share/gnome/help/same-gnome/C/figures/play.png
 share/gnome/help/same-gnome/C/figures/start-up.png
 share/gnome/help/same-gnome/C/legal.xml
@@ -647,283 +956,117 @@ share/gnome/help/same-gnome/es/same-gnome.xml
 share/gnome/help/same-gnome/fr/figures/play.png
 share/gnome/help/same-gnome/fr/figures/start-up.png
 share/gnome/help/same-gnome/fr/same-gnome.xml
+share/gnome/help/same-gnome/oc/figures/play.png
+share/gnome/help/same-gnome/oc/figures/start-up.png
+share/gnome/help/same-gnome/oc/same-gnome.xml
 share/gnome/help/same-gnome/ru/figures/play.png
 share/gnome/help/same-gnome/ru/figures/start-up.png
 share/gnome/help/same-gnome/ru/same-gnome.xml
 share/gnome/help/same-gnome/sv/figures/play.png
 share/gnome/help/same-gnome/sv/figures/start-up.png
 share/gnome/help/same-gnome/sv/same-gnome.xml
-share/gnome/omf/glchess/glchess-C.omf
-share/gnome/omf/glchess/glchess-es.omf
-share/gnome/omf/glchess/glchess-fr.omf
-share/gnome/omf/glchess/glchess-sv.omf
-share/gnome/omf/glines/glines-C.omf
-share/gnome/omf/glines/glines-en_GB.omf
-share/gnome/omf/glines/glines-es.omf
-share/gnome/omf/glines/glines-fr.omf
-share/gnome/omf/glines/glines-ru.omf
-share/gnome/omf/glines/glines-sv.omf
-share/gnome/omf/gnect/gnect-C.omf
-share/gnome/omf/gnect/gnect-en_GB.omf
-share/gnome/omf/gnect/gnect-es.omf
-share/gnome/omf/gnect/gnect-fr.omf
-share/gnome/omf/gnect/gnect-sv.omf
-share/gnome/omf/gnome-games/aisleriot-C.omf
-share/gnome/omf/gnome-games/aisleriot-fr.omf
-share/gnome/omf/gnome-games/blackjack-C.omf
-share/gnome/omf/gnome-games/gnibbles-C.omf
-share/gnome/omf/gnome-games/gnobots2-C.omf
-share/gnome/omf/gnome-games/gnobots2-da.omf
-share/gnome/omf/gnome-games/gnobots2-es.omf
-share/gnome/omf/gnome-games/gnobots2-it.omf
-share/gnome/omf/gnome-games/gnometris-C.omf
-share/gnome/omf/gnome-games/gnomine-C.omf
-share/gnome/omf/gnome-games/gnotravex-C.omf
-share/gnome/omf/gnome-games/gnotski-C.omf
-share/gnome/omf/gnome-games/gtali-C.omf
-share/gnome/omf/gnome-games/gtali-da.omf
-share/gnome/omf/gnome-games/iagno-C.omf
-share/gnome/omf/gnome-games/mahjongg-C.omf
-share/gnome/omf/same-gnome/same-gnome-C.omf
-share/gnome/omf/same-gnome/same-gnome-en_GB.omf
-share/gnome/omf/same-gnome/same-gnome-es.omf
-share/gnome/omf/same-gnome/same-gnome-fr.omf
-share/gnome/omf/same-gnome/same-gnome-ru.omf
-share/gnome/omf/same-gnome/same-gnome-sv.omf
-share/gnome/pixmaps/blackjack/baize.png
-share/gnome/pixmaps/blackjack/blackjack-splash.png
-share/gnome/pixmaps/blackjack/chip-1.svg
-share/gnome/pixmaps/blackjack/chip-100.svg
-share/gnome/pixmaps/blackjack/chip-25.svg
-share/gnome/pixmaps/blackjack/chip-5.svg
-share/gnome/pixmaps/cards/baize.png
-share/gnome/pixmaps/cards/slot.svg
-share/gnome/pixmaps/cards/slots/white-outline.svg
-share/gnome/pixmaps/glchess.svg
-share/gnome/pixmaps/glchess/board.png
-share/gnome/pixmaps/glchess/piece.png
-share/gnome/pixmaps/glines/balls.svg
-share/gnome/pixmaps/glines/shapes.svg
-share/gnome/pixmaps/gnect/bg_grotty.jpg
-share/gnome/pixmaps/gnect/bg_nightfall.jpg
-share/gnome/pixmaps/gnect/bg_toplight.png
-share/gnome/pixmaps/gnect/tileset_50x50_catseyes.png
-share/gnome/pixmaps/gnect/tileset_50x50_glassy.png
-share/gnome/pixmaps/gnect/tileset_50x50_hcinverse.svg
-share/gnome/pixmaps/gnect/tileset_50x50_hcontrast.svg
-share/gnome/pixmaps/gnect/tileset_50x50_square.png
-share/gnome/pixmaps/gnect/tileset_50x50_sunspot.svg
-share/gnome/pixmaps/gnibbles/blank.svg
-share/gnome/pixmaps/gnibbles/bonus1.svg
-share/gnome/pixmaps/gnibbles/bonus2.svg
-share/gnome/pixmaps/gnibbles/bonus3.svg
-share/gnome/pixmaps/gnibbles/bonus4.svg
-share/gnome/pixmaps/gnibbles/bonus5.svg
-share/gnome/pixmaps/gnibbles/diamond.svg
-share/gnome/pixmaps/gnibbles/gnibbles-logo.svg
-share/gnome/pixmaps/gnibbles/life.svg
-share/gnome/pixmaps/gnibbles/questionmark.svg
-share/gnome/pixmaps/gnibbles/snake-blue.svg
-share/gnome/pixmaps/gnibbles/snake-cyan.svg
-share/gnome/pixmaps/gnibbles/snake-green.svg
-share/gnome/pixmaps/gnibbles/snake-grey.svg
-share/gnome/pixmaps/gnibbles/snake-magenta.svg
-share/gnome/pixmaps/gnibbles/snake-red.svg
-share/gnome/pixmaps/gnibbles/snake-yellow.svg
-share/gnome/pixmaps/gnibbles/wall-corner-bottom-left.svg
-share/gnome/pixmaps/gnibbles/wall-corner-bottom-right.svg
-share/gnome/pixmaps/gnibbles/wall-corner-top-left.svg
-share/gnome/pixmaps/gnibbles/wall-corner-top-right.svg
-share/gnome/pixmaps/gnibbles/wall-cross.svg
-share/gnome/pixmaps/gnibbles/wall-empty.svg
-share/gnome/pixmaps/gnibbles/wall-straight-side.svg
-share/gnome/pixmaps/gnibbles/wall-straight-up.svg
-share/gnome/pixmaps/gnibbles/wall-tee-down.svg
-share/gnome/pixmaps/gnibbles/wall-tee-left.svg
-share/gnome/pixmaps/gnibbles/wall-tee-right.svg
-share/gnome/pixmaps/gnibbles/wall-tee-up.svg
-share/gnome/pixmaps/gnobots2/aieee.png
-share/gnome/pixmaps/gnobots2/boo.svg
-share/gnome/pixmaps/gnobots2/gnomes.png
-share/gnome/pixmaps/gnobots2/robots.svg
-share/gnome/pixmaps/gnobots2/splat.png
-share/gnome/pixmaps/gnobots2/ufo.svg
-share/gnome/pixmaps/gnobots2/yahoo.png
-share/gnome/pixmaps/gnome-games-common/cards/bonded.svg
-share/gnome/pixmaps/gnome-games-common/icons/rteleport.png
-share/gnome/pixmaps/gnome-games-common/icons/teleport.png
-share/gnome/pixmaps/gnome-sudoku/footprints.png
-share/gnome/pixmaps/gnometris/7blocks-gw.png
-share/gnome/pixmaps/gnometris/7blocks-tig.png
-share/gnome/pixmaps/gnomine/bang.svg
-share/gnome/pixmaps/gnomine/face-cool.png
-share/gnome/pixmaps/gnomine/face-sad.png
-share/gnome/pixmaps/gnomine/face-smile.png
-share/gnome/pixmaps/gnomine/face-win.png
-share/gnome/pixmaps/gnomine/face-worried.png
-share/gnome/pixmaps/gnomine/flag-question.svg
-share/gnome/pixmaps/gnomine/flag.svg
-share/gnome/pixmaps/gnomine/mine.svg
-share/gnome/pixmaps/gnomine/warning.svg
-share/gnome/pixmaps/gnotravex/baize.png
-share/gnome/pixmaps/gnotski.svg
-share/gnome/pixmaps/gtali/gnome-dice-1.svg
-share/gnome/pixmaps/gtali/gnome-dice-2.svg
-share/gnome/pixmaps/gtali/gnome-dice-3.svg
-share/gnome/pixmaps/gtali/gnome-dice-4.svg
-share/gnome/pixmaps/gtali/gnome-dice-5.svg
-share/gnome/pixmaps/gtali/gnome-dice-6.svg
-share/gnome/pixmaps/gtali/gnome-dice-none.svg
-share/gnome/pixmaps/gtali/kismet-none.svg
-share/gnome/pixmaps/gtali/kismet1.svg
-share/gnome/pixmaps/gtali/kismet2.svg
-share/gnome/pixmaps/gtali/kismet3.svg
-share/gnome/pixmaps/gtali/kismet4.svg
-share/gnome/pixmaps/gtali/kismet5.svg
-share/gnome/pixmaps/gtali/kismet6.svg
-share/gnome/pixmaps/iagno/classic.png
-share/gnome/pixmaps/iagno/woodtrim.png
-share/gnome/pixmaps/mahjongg/postmodern.svg
-share/gnome/pixmaps/mahjongg/smooth.png
-share/gnome/pixmaps/sudoku.png
-share/gnome/sol-games/agnes.scm
-share/gnome/sol-games/athena.scm
-share/gnome/sol-games/auld_lang_syne.scm
-share/gnome/sol-games/aunt_mary.scm
-share/gnome/sol-games/backbone.scm
-share/gnome/sol-games/bakers_dozen.scm
-share/gnome/sol-games/bakers_game.scm
-share/gnome/sol-games/beleaguered_castle.scm
-share/gnome/sol-games/block_ten.scm
-share/gnome/sol-games/bristol.scm
-share/gnome/sol-games/camelot.scm
-share/gnome/sol-games/canfield.scm
-share/gnome/sol-games/carpet.scm
-share/gnome/sol-games/chessboard.scm
-share/gnome/sol-games/clock.scm
-share/gnome/sol-games/cover.scm
-share/gnome/sol-games/cruel.scm
-share/gnome/sol-games/diamond_mine.scm
-share/gnome/sol-games/doublets.scm
-share/gnome/sol-games/eagle_wing.scm
-share/gnome/sol-games/easthaven.scm
-share/gnome/sol-games/eight_off.scm
-share/gnome/sol-games/elevator.scm
-share/gnome/sol-games/escalator.scm
-share/gnome/sol-games/first_law.scm
-share/gnome/sol-games/fortress.scm
-share/gnome/sol-games/fortunes.scm
-share/gnome/sol-games/fourteen.scm
-share/gnome/sol-games/freecell.scm
-share/gnome/sol-games/gaps.scm
-share/gnome/sol-games/gay_gordons.scm
-share/gnome/sol-games/glade/statistics.glade
-share/gnome/sol-games/glenwood.scm
-share/gnome/sol-games/golf.scm
-share/gnome/sol-games/gypsy.scm
-share/gnome/sol-games/helsinki.scm
-share/gnome/sol-games/hopscotch.scm
-share/gnome/sol-games/isabel.scm
-share/gnome/sol-games/jamestown.scm
-share/gnome/sol-games/jumbo.scm
-share/gnome/sol-games/kansas.scm
-share/gnome/sol-games/king_albert.scm
-share/gnome/sol-games/kings_audience.scm
-share/gnome/sol-games/klondike.scm
-share/gnome/sol-games/labyrinth.scm
-share/gnome/sol-games/lady_jane.scm
-share/gnome/sol-games/maze.scm
-share/gnome/sol-games/monte_carlo.scm
-share/gnome/sol-games/neighbor.scm
-share/gnome/sol-games/odessa.scm
-share/gnome/sol-games/osmosis.scm
-share/gnome/sol-games/peek.scm
-share/gnome/sol-games/pileon.scm
-share/gnome/sol-games/plait.scm
-share/gnome/sol-games/poker.scm
-share/gnome/sol-games/quatorze.scm
-share/gnome/sol-games/royal_east.scm
-share/gnome/sol-games/saratoga.scm
-share/gnome/sol-games/scorpion.scm
-share/gnome/sol-games/scuffle.scm
-share/gnome/sol-games/seahaven.scm
-share/gnome/sol-games/sir_tommy.scm
-share/gnome/sol-games/sol.scm
-share/gnome/sol-games/spider.scm
-share/gnome/sol-games/spiderette.scm
-share/gnome/sol-games/straight_up.scm
-share/gnome/sol-games/streets_and_alleys.scm
-share/gnome/sol-games/ten_across.scm
-share/gnome/sol-games/thieves.scm
-share/gnome/sol-games/thirteen.scm
-share/gnome/sol-games/thumb_and_pouch.scm
-share/gnome/sol-games/treize.scm
-share/gnome/sol-games/triple_peaks.scm
-share/gnome/sol-games/union_square.scm
-share/gnome/sol-games/valentine.scm
-share/gnome/sol-games/westhaven.scm
-share/gnome/sol-games/whitehead.scm
-share/gnome/sol-games/will_o_the_wisp.scm
-share/gnome/sol-games/yield.scm
-share/gnome/sol-games/yukon.scm
-share/gnome/sol-games/zebra.scm
-share/gnome/sounds/gnibbles/appear.wav
-share/gnome/sounds/gnibbles/bonus.wav
-share/gnome/sounds/gnibbles/crash.wav
-share/gnome/sounds/gnibbles/gobble.wav
-share/gnome/sounds/gnibbles/laughter.wav
-share/gnome/sounds/gnibbles/life.wav
-share/gnome/sounds/gnibbles/pop.wav
-share/gnome/sounds/gnibbles/reverse.wav
-share/gnome/sounds/gnibbles/teleport.wav
-share/gnome/sounds/gnobots2/bad.wav
-share/gnome/sounds/gnobots2/die.wav
-share/gnome/sounds/gnobots2/splat.wav
-share/gnome/sounds/gnobots2/teleport.wav
-share/gnome/sounds/gnobots2/victory.wav
-share/gnome/sounds/gnobots2/yahoo.wav
-share/gnome/sounds/gnometris/gameover.wav
-share/gnome/sounds/gnometris/gnometris.wav
-share/gnome/sounds/gnometris/land.wav
-share/gnome/sounds/gnometris/lines1.wav
-share/gnome/sounds/gnometris/lines2.wav
-share/gnome/sounds/gnometris/lines3.wav
-share/gnome/sounds/gnometris/slide.wav
-share/gnome/sounds/gnometris/turn.wav
-share/gnome/sounds/iagno/flip-piece.wav
-share/gnome/sounds/iagno/gameover.wav
-share/icons/hicolor/16x16/apps/gnome-gnomine.png
+share/icons/hicolor/16x16/apps/gnome-aisleriot.png
+share/icons/hicolor/16x16/apps/gnome-blackjack.png
+share/icons/hicolor/16x16/apps/gnome-freecell.png
+share/icons/hicolor/16x16/apps/gnome-glchess.png
+share/icons/hicolor/16x16/apps/gnome-glines.png
+share/icons/hicolor/16x16/apps/gnome-gnect.png
+share/icons/hicolor/16x16/apps/gnome-gnibbles.png
+share/icons/hicolor/16x16/apps/gnome-gnometris.png
 share/icons/hicolor/16x16/apps/gnome-iagno.png
-share/icons/hicolor/16x16/apps/gnome-nibbles.png
+share/icons/hicolor/16x16/apps/gnome-klotski.png
+share/icons/hicolor/16x16/apps/gnome-mahjongg.png
+share/icons/hicolor/16x16/apps/gnome-mines.png
+share/icons/hicolor/16x16/apps/gnome-robots.png
+share/icons/hicolor/16x16/apps/gnome-samegnome.png
+share/icons/hicolor/16x16/apps/gnome-sudoku.png
 share/icons/hicolor/16x16/apps/gnome-tali.png
-share/icons/hicolor/22x22/apps/gnome-gnomine.png
+share/icons/hicolor/16x16/apps/gnome-tetravex.png
+share/icons/hicolor/22x22/apps/gnome-aisleriot.png
+share/icons/hicolor/22x22/apps/gnome-blackjack.png
+share/icons/hicolor/22x22/apps/gnome-freecell.png
+share/icons/hicolor/22x22/apps/gnome-glchess.png
+share/icons/hicolor/22x22/apps/gnome-glines.png
+share/icons/hicolor/22x22/apps/gnome-gnect.png
+share/icons/hicolor/22x22/apps/gnome-gnibbles.png
+share/icons/hicolor/22x22/apps/gnome-gnometris.png
 share/icons/hicolor/22x22/apps/gnome-iagno.png
-share/icons/hicolor/22x22/apps/gnome-nibbles.png
+share/icons/hicolor/22x22/apps/gnome-klotski.png
+share/icons/hicolor/22x22/apps/gnome-mahjongg.png
+share/icons/hicolor/22x22/apps/gnome-mines.png
+share/icons/hicolor/22x22/apps/gnome-robots.png
+share/icons/hicolor/22x22/apps/gnome-samegnome.png
+share/icons/hicolor/22x22/apps/gnome-sudoku.png
 share/icons/hicolor/22x22/apps/gnome-tali.png
-share/icons/hicolor/32x32/apps/gnome-gnomine.png
+share/icons/hicolor/22x22/apps/gnome-tetravex.png
+share/icons/hicolor/24x24/apps/gnome-aisleriot.png
+share/icons/hicolor/24x24/apps/gnome-blackjack.png
+share/icons/hicolor/24x24/apps/gnome-freecell.png
+share/icons/hicolor/24x24/apps/gnome-glchess.png
+share/icons/hicolor/24x24/apps/gnome-glines.png
+share/icons/hicolor/24x24/apps/gnome-gnect.png
+share/icons/hicolor/24x24/apps/gnome-gnibbles.png
+share/icons/hicolor/24x24/apps/gnome-gnometris.png
+share/icons/hicolor/24x24/apps/gnome-iagno.png
+share/icons/hicolor/24x24/apps/gnome-klotski.png
+share/icons/hicolor/24x24/apps/gnome-mahjongg.png
+share/icons/hicolor/24x24/apps/gnome-mines.png
+share/icons/hicolor/24x24/apps/gnome-robots.png
+share/icons/hicolor/24x24/apps/gnome-samegnome.png
+share/icons/hicolor/24x24/apps/gnome-sudoku.png
+share/icons/hicolor/24x24/apps/gnome-tali.png
+share/icons/hicolor/24x24/apps/gnome-tetravex.png
+share/icons/hicolor/32x32/apps/gnome-aisleriot.png
+share/icons/hicolor/32x32/apps/gnome-blackjack.png
+share/icons/hicolor/32x32/apps/gnome-freecell.png
+share/icons/hicolor/32x32/apps/gnome-glchess.png
+share/icons/hicolor/32x32/apps/gnome-glines.png
+share/icons/hicolor/32x32/apps/gnome-gnect.png
+share/icons/hicolor/32x32/apps/gnome-gnibbles.png
+share/icons/hicolor/32x32/apps/gnome-gnometris.png
 share/icons/hicolor/32x32/apps/gnome-iagno.png
-share/icons/hicolor/32x32/apps/gnome-nibbles.png
+share/icons/hicolor/32x32/apps/gnome-klotski.png
+share/icons/hicolor/32x32/apps/gnome-mahjongg.png
+share/icons/hicolor/32x32/apps/gnome-mines.png
+share/icons/hicolor/32x32/apps/gnome-robots.png
+share/icons/hicolor/32x32/apps/gnome-samegnome.png
+share/icons/hicolor/32x32/apps/gnome-sudoku.png
 share/icons/hicolor/32x32/apps/gnome-tali.png
+share/icons/hicolor/32x32/apps/gnome-tetravex.png
 share/icons/hicolor/48x48/apps/gnome-aisleriot.png
 share/icons/hicolor/48x48/apps/gnome-blackjack.png
-share/icons/hicolor/48x48/apps/gnome-five-or-more.png
-share/icons/hicolor/48x48/apps/gnome-four-in-a-row.png
 share/icons/hicolor/48x48/apps/gnome-freecell.png
+share/icons/hicolor/48x48/apps/gnome-glchess.png
+share/icons/hicolor/48x48/apps/gnome-glines.png
+share/icons/hicolor/48x48/apps/gnome-gnect.png
+share/icons/hicolor/48x48/apps/gnome-gnibbles.png
 share/icons/hicolor/48x48/apps/gnome-gnometris.png
-share/icons/hicolor/48x48/apps/gnome-gnomine.png
 share/icons/hicolor/48x48/apps/gnome-iagno.png
 share/icons/hicolor/48x48/apps/gnome-klotski.png
 share/icons/hicolor/48x48/apps/gnome-mahjongg.png
-share/icons/hicolor/48x48/apps/gnome-nibbles.png
+share/icons/hicolor/48x48/apps/gnome-mines.png
 share/icons/hicolor/48x48/apps/gnome-robots.png
-share/icons/hicolor/48x48/apps/gnome-same-gnome.png
+share/icons/hicolor/48x48/apps/gnome-samegnome.png
+share/icons/hicolor/48x48/apps/gnome-sudoku.png
 share/icons/hicolor/48x48/apps/gnome-tali.png
 share/icons/hicolor/48x48/apps/gnome-tetravex.png
-share/icons/hicolor/scalable/apps/gnome-gnomine.svg
+share/icons/hicolor/scalable/apps/gnome-aisleriot.svg
+share/icons/hicolor/scalable/apps/gnome-blackjack.svg
+share/icons/hicolor/scalable/apps/gnome-freecell.svg
+share/icons/hicolor/scalable/apps/gnome-glchess.svg
+share/icons/hicolor/scalable/apps/gnome-glines.svg
+share/icons/hicolor/scalable/apps/gnome-gnect.svg
+share/icons/hicolor/scalable/apps/gnome-gnibbles.svg
+share/icons/hicolor/scalable/apps/gnome-gnometris.svg
 share/icons/hicolor/scalable/apps/gnome-iagno.svg
-share/icons/hicolor/scalable/apps/gnome-nibbles.svg
+share/icons/hicolor/scalable/apps/gnome-klotski.svg
+share/icons/hicolor/scalable/apps/gnome-mines.svg
 share/icons/hicolor/scalable/apps/gnome-robots.svg
+share/icons/hicolor/scalable/apps/gnome-samegnome.svg
+share/icons/hicolor/scalable/apps/gnome-sudoku.svg
 share/icons/hicolor/scalable/apps/gnome-tali.svg
+share/icons/hicolor/scalable/apps/gnome-tetravex.svg
+share/locale/af/LC_MESSAGES/gnome-games.mo
 share/locale/am/LC_MESSAGES/gnome-games.mo
 share/locale/ar/LC_MESSAGES/gnome-games.mo
 share/locale/az/LC_MESSAGES/gnome-games.mo
@@ -971,6 +1114,7 @@ share/locale/nb/LC_MESSAGES/gnome-games.mo
 share/locale/ne/LC_MESSAGES/gnome-games.mo
 share/locale/nl/LC_MESSAGES/gnome-games.mo
 share/locale/nn/LC_MESSAGES/gnome-games.mo
+share/locale/oc/LC_MESSAGES/gnome-games.mo
 share/locale/or/LC_MESSAGES/gnome-games.mo
 share/locale/pa/LC_MESSAGES/gnome-games.mo
 share/locale/pl/LC_MESSAGES/gnome-games.mo
@@ -979,6 +1123,7 @@ share/locale/pt_BR/LC_MESSAGES/gnome-games.mo
 share/locale/ro/LC_MESSAGES/gnome-games.mo
 share/locale/ru/LC_MESSAGES/gnome-games.mo
 share/locale/rw/LC_MESSAGES/gnome-games.mo
+share/locale/si/LC_MESSAGES/gnome-games.mo
 share/locale/sk/LC_MESSAGES/gnome-games.mo
 share/locale/sl/LC_MESSAGES/gnome-games.mo
 share/locale/sq/LC_MESSAGES/gnome-games.mo
@@ -986,6 +1131,7 @@ share/locale/sr/LC_MESSAGES/gnome-games.mo
 share/locale/sr@Latn/LC_MESSAGES/gnome-games.mo
 share/locale/sv/LC_MESSAGES/gnome-games.mo
 share/locale/ta/LC_MESSAGES/gnome-games.mo
+share/locale/te/LC_MESSAGES/gnome-games.mo
 share/locale/th/LC_MESSAGES/gnome-games.mo
 share/locale/tr/LC_MESSAGES/gnome-games.mo
 share/locale/uk/LC_MESSAGES/gnome-games.mo
@@ -995,39 +1141,217 @@ share/locale/xh/LC_MESSAGES/gnome-games.mo
 share/locale/zh_CN/LC_MESSAGES/gnome-games.mo
 share/locale/zh_HK/LC_MESSAGES/gnome-games.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-games.mo
-@dirrm share/gnome/sounds/iagno
-@dirrm share/gnome/sounds/gnometris
-@dirrm share/gnome/sounds/gnobots2
-@dirrm share/gnome/sounds/gnibbles
-@dirrm share/gnome/sol-games/glade
-@dirrm share/gnome/sol-games
-@dirrm share/gnome/pixmaps/mahjongg
-@dirrm share/gnome/pixmaps/iagno
-@dirrm share/gnome/pixmaps/gtali
-@dirrm share/gnome/pixmaps/gnotravex
-@dirrm share/gnome/pixmaps/gnomine
-@dirrm share/gnome/pixmaps/gnometris
-@dirrm share/gnome/pixmaps/gnome-sudoku
-@dirrm share/gnome/pixmaps/gnome-games-common/icons
-@dirrm share/gnome/pixmaps/gnome-games-common/cards
-@dirrm share/gnome/pixmaps/gnome-games-common
-@dirrm share/gnome/pixmaps/gnobots2
-@dirrm share/gnome/pixmaps/gnibbles
-@dirrm share/gnome/pixmaps/gnect
-@dirrm share/gnome/pixmaps/glines
-@dirrm share/gnome/pixmaps/glchess
-@dirrm share/gnome/pixmaps/cards/slots
-@dirrm share/gnome/pixmaps/cards
-@dirrm share/gnome/pixmaps/blackjack
-@dirrm share/gnome/omf/same-gnome
-@dirrm share/gnome/omf/gnome-games
-@dirrm share/gnome/omf/gnect
-@dirrm share/gnome/omf/glines
-@dirrm share/gnome/omf/glchess
+share/omf/aisleriot/aisleriot-C.omf
+share/omf/aisleriot/aisleriot-es.omf
+share/omf/aisleriot/aisleriot-fr.omf
+share/omf/aisleriot/aisleriot-oc.omf
+share/omf/aisleriot/aisleriot-sv.omf
+share/omf/blackjack/blackjack-C.omf
+share/omf/blackjack/blackjack-es.omf
+share/omf/blackjack/blackjack-fr.omf
+share/omf/blackjack/blackjack-oc.omf
+share/omf/blackjack/blackjack-sv.omf
+share/omf/glchess/glchess-C.omf
+share/omf/glchess/glchess-es.omf
+share/omf/glchess/glchess-fr.omf
+share/omf/glchess/glchess-oc.omf
+share/omf/glchess/glchess-pt_BR.omf
+share/omf/glchess/glchess-sv.omf
+share/omf/glines/glines-C.omf
+share/omf/glines/glines-en_GB.omf
+share/omf/glines/glines-es.omf
+share/omf/glines/glines-fr.omf
+share/omf/glines/glines-oc.omf
+share/omf/glines/glines-ru.omf
+share/omf/glines/glines-sv.omf
+share/omf/gnect/gnect-C.omf
+share/omf/gnect/gnect-en_GB.omf
+share/omf/gnect/gnect-es.omf
+share/omf/gnect/gnect-fr.omf
+share/omf/gnect/gnect-oc.omf
+share/omf/gnect/gnect-sv.omf
+share/omf/gnibbles/gnibbles-C.omf
+share/omf/gnibbles/gnibbles-es.omf
+share/omf/gnibbles/gnibbles-fr.omf
+share/omf/gnibbles/gnibbles-oc.omf
+share/omf/gnibbles/gnibbles-sv.omf
+share/omf/gnobots2/gnobots2-C.omf
+share/omf/gnobots2/gnobots2-de.omf
+share/omf/gnobots2/gnobots2-es.omf
+share/omf/gnobots2/gnobots2-fr.omf
+share/omf/gnobots2/gnobots2-oc.omf
+share/omf/gnobots2/gnobots2-sv.omf
+share/omf/gnome-games/gnobots2-da.omf
+share/omf/gnome-games/gnobots2-it.omf
+share/omf/gnome-games/gtali-da.omf
+share/omf/gnome-sudoku/gnome-sudoku-C.omf
+share/omf/gnome-sudoku/gnome-sudoku-es.omf
+share/omf/gnome-sudoku/gnome-sudoku-fr.omf
+share/omf/gnome-sudoku/gnome-sudoku-oc.omf
+share/omf/gnome-sudoku/gnome-sudoku-sv.omf
+share/omf/gnometris/gnometris-C.omf
+share/omf/gnometris/gnometris-el.omf
+share/omf/gnometris/gnometris-es.omf
+share/omf/gnometris/gnometris-fr.omf
+share/omf/gnometris/gnometris-oc.omf
+share/omf/gnometris/gnometris-sv.omf
+share/omf/gnomine/gnomine-C.omf
+share/omf/gnomine/gnomine-de.omf
+share/omf/gnomine/gnomine-es.omf
+share/omf/gnomine/gnomine-fr.omf
+share/omf/gnomine/gnomine-oc.omf
+share/omf/gnomine/gnomine-sv.omf
+share/omf/gnotravex/gnotravex-C.omf
+share/omf/gnotravex/gnotravex-de.omf
+share/omf/gnotravex/gnotravex-el.omf
+share/omf/gnotravex/gnotravex-es.omf
+share/omf/gnotravex/gnotravex-fr.omf
+share/omf/gnotravex/gnotravex-oc.omf
+share/omf/gnotravex/gnotravex-sv.omf
+share/omf/gnotski/gnotski-C.omf
+share/omf/gnotski/gnotski-es.omf
+share/omf/gnotski/gnotski-fr.omf
+share/omf/gnotski/gnotski-oc.omf
+share/omf/gnotski/gnotski-sv.omf
+share/omf/gtali/gtali-C.omf
+share/omf/gtali/gtali-es.omf
+share/omf/gtali/gtali-fr.omf
+share/omf/gtali/gtali-oc.omf
+share/omf/gtali/gtali-sv.omf
+share/omf/iagno/iagno-C.omf
+share/omf/iagno/iagno-es.omf
+share/omf/iagno/iagno-fr.omf
+share/omf/iagno/iagno-oc.omf
+share/omf/iagno/iagno-sv.omf
+share/omf/mahjongg/mahjongg-C.omf
+share/omf/mahjongg/mahjongg-es.omf
+share/omf/mahjongg/mahjongg-fr.omf
+share/omf/mahjongg/mahjongg-oc.omf
+share/omf/mahjongg/mahjongg-sv.omf
+share/omf/same-gnome/same-gnome-C.omf
+share/omf/same-gnome/same-gnome-en_GB.omf
+share/omf/same-gnome/same-gnome-es.omf
+share/omf/same-gnome/same-gnome-fr.omf
+share/omf/same-gnome/same-gnome-oc.omf
+share/omf/same-gnome/same-gnome-ru.omf
+share/omf/same-gnome/same-gnome-sv.omf
+share/pixmaps/glchess/board.png
+share/pixmaps/glchess/piece.png
+share/pixmaps/glines/balls.svg
+share/pixmaps/glines/shapes.svg
+share/pixmaps/gnect/bg_grotty.jpg
+share/pixmaps/gnect/bg_nightfall.jpg
+share/pixmaps/gnect/bg_toplight.png
+share/pixmaps/gnect/tileset_50x50_catseyes.png
+share/pixmaps/gnect/tileset_50x50_glassy.png
+share/pixmaps/gnect/tileset_50x50_hcinverse.svg
+share/pixmaps/gnect/tileset_50x50_hcontrast.svg
+share/pixmaps/gnect/tileset_50x50_square.png
+share/pixmaps/gnect/tileset_50x50_sunspot.svg
+share/pixmaps/gnibbles/blank.svg
+share/pixmaps/gnibbles/bonus1.svg
+share/pixmaps/gnibbles/bonus2.svg
+share/pixmaps/gnibbles/bonus3.svg
+share/pixmaps/gnibbles/bonus4.svg
+share/pixmaps/gnibbles/bonus5.svg
+share/pixmaps/gnibbles/diamond.svg
+share/pixmaps/gnibbles/gnibbles-logo.svg
+share/pixmaps/gnibbles/life.svg
+share/pixmaps/gnibbles/questionmark.svg
+share/pixmaps/gnibbles/snake-blue.svg
+share/pixmaps/gnibbles/snake-cyan.svg
+share/pixmaps/gnibbles/snake-green.svg
+share/pixmaps/gnibbles/snake-grey.svg
+share/pixmaps/gnibbles/snake-magenta.svg
+share/pixmaps/gnibbles/snake-red.svg
+share/pixmaps/gnibbles/snake-yellow.svg
+share/pixmaps/gnibbles/wall-corner-bottom-left.svg
+share/pixmaps/gnibbles/wall-corner-bottom-right.svg
+share/pixmaps/gnibbles/wall-corner-top-left.svg
+share/pixmaps/gnibbles/wall-corner-top-right.svg
+share/pixmaps/gnibbles/wall-cross.svg
+share/pixmaps/gnibbles/wall-empty.svg
+share/pixmaps/gnibbles/wall-straight-side.svg
+share/pixmaps/gnibbles/wall-straight-up.svg
+share/pixmaps/gnibbles/wall-tee-down.svg
+share/pixmaps/gnibbles/wall-tee-left.svg
+share/pixmaps/gnibbles/wall-tee-right.svg
+share/pixmaps/gnibbles/wall-tee-up.svg
+share/pixmaps/gnobots2/aieee.png
+share/pixmaps/gnobots2/boo.svg
+share/pixmaps/gnobots2/gnomes.png
+share/pixmaps/gnobots2/robots.svg
+share/pixmaps/gnobots2/splat.png
+share/pixmaps/gnobots2/ufo.svg
+share/pixmaps/gnobots2/yahoo.png
+share/pixmaps/gnome-sudoku/footprints.png
+share/pixmaps/gnometris/7blocks-gw.png
+share/pixmaps/gnometris/7blocks-tig.png
+share/pixmaps/gnometris/gnometris.svg
+share/pixmaps/gnomine/bang.svg
+share/pixmaps/gnomine/face-cool.png
+share/pixmaps/gnomine/face-sad.png
+share/pixmaps/gnomine/face-smile.png
+share/pixmaps/gnomine/face-win.png
+share/pixmaps/gnomine/face-worried.png
+share/pixmaps/gnomine/flag-question.svg
+share/pixmaps/gnomine/flag.svg
+share/pixmaps/gnomine/mine.svg
+share/pixmaps/gnomine/warning.svg
+share/pixmaps/gnotravex/baize.png
+share/pixmaps/gtali/gnome-dice-1.svg
+share/pixmaps/gtali/gnome-dice-2.svg
+share/pixmaps/gtali/gnome-dice-3.svg
+share/pixmaps/gtali/gnome-dice-4.svg
+share/pixmaps/gtali/gnome-dice-5.svg
+share/pixmaps/gtali/gnome-dice-6.svg
+share/pixmaps/gtali/gnome-dice-none.svg
+share/pixmaps/gtali/kismet-none.svg
+share/pixmaps/gtali/kismet1.svg
+share/pixmaps/gtali/kismet2.svg
+share/pixmaps/gtali/kismet3.svg
+share/pixmaps/gtali/kismet4.svg
+share/pixmaps/gtali/kismet5.svg
+share/pixmaps/gtali/kismet6.svg
+share/pixmaps/iagno/classic.png
+share/pixmaps/iagno/woodtrim.png
+share/pixmaps/mahjongg/postmodern.svg
+share/pixmaps/mahjongg/smooth.png
+@dirrm share/pixmaps/mahjongg
+@dirrm share/pixmaps/iagno
+@dirrm share/pixmaps/gtali
+@dirrm share/pixmaps/gnotravex
+@dirrm share/pixmaps/gnomine
+@dirrm share/pixmaps/gnometris
+@dirrm share/pixmaps/gnome-sudoku
+@dirrm share/pixmaps/gnobots2
+@dirrm share/pixmaps/gnibbles
+@dirrm share/pixmaps/gnect
+@dirrm share/pixmaps/glines
+@dirrm share/pixmaps/glchess
+@dirrm share/omf/same-gnome
+@dirrm share/omf/mahjongg
+@dirrm share/omf/iagno
+@dirrm share/omf/gtali
+@dirrm share/omf/gnotski
+@dirrm share/omf/gnotravex
+@dirrm share/omf/gnomine
+@dirrm share/omf/gnometris
+@dirrm share/omf/gnome-sudoku
+@dirrm share/omf/gnome-games
+@dirrm share/omf/gnobots2
+@dirrm share/omf/gnibbles
+@dirrm share/omf/gnect
+@dirrm share/omf/glines
+@dirrm share/omf/glchess
+@dirrm share/omf/blackjack
+@dirrm share/omf/aisleriot
 @dirrm share/gnome/help/same-gnome/sv/figures
 @dirrm share/gnome/help/same-gnome/sv
 @dirrm share/gnome/help/same-gnome/ru/figures
 @dirrm share/gnome/help/same-gnome/ru
+@dirrm share/gnome/help/same-gnome/oc/figures
+@dirrm share/gnome/help/same-gnome/oc
 @dirrm share/gnome/help/same-gnome/fr/figures
 @dirrm share/gnome/help/same-gnome/fr
 @dirrm share/gnome/help/same-gnome/es/figures
@@ -1037,41 +1361,127 @@ share/locale/zh_TW/LC_MESSAGES/gnome-games.mo
 @dirrm share/gnome/help/same-gnome/C/figures
 @dirrm share/gnome/help/same-gnome/C
 @dirrm share/gnome/help/same-gnome
+@dirrm share/gnome/help/mahjongg/sv/figures
+@dirrm share/gnome/help/mahjongg/sv
+@dirrm share/gnome/help/mahjongg/oc/figures
+@dirrm share/gnome/help/mahjongg/oc
+@dirrm share/gnome/help/mahjongg/fr/figures
+@dirrm share/gnome/help/mahjongg/fr
+@dirrm share/gnome/help/mahjongg/es/figures
+@dirrm share/gnome/help/mahjongg/es
 @dirrm share/gnome/help/mahjongg/C/figures
 @dirrm share/gnome/help/mahjongg/C
 @dirrm share/gnome/help/mahjongg
+@dirrm share/gnome/help/iagno/sv/figures
+@dirrm share/gnome/help/iagno/sv
+@dirrm share/gnome/help/iagno/oc/figures
+@dirrm share/gnome/help/iagno/oc
+@dirrm share/gnome/help/iagno/fr/figures
+@dirrm share/gnome/help/iagno/fr
+@dirrm share/gnome/help/iagno/es/figures
+@dirrm share/gnome/help/iagno/es
 @dirrm share/gnome/help/iagno/C/figures
 @dirrm share/gnome/help/iagno/C
 @dirrm share/gnome/help/iagno
+@dirrm share/gnome/help/gtali/sv/figures
+@dirrm share/gnome/help/gtali/sv
+@dirrm share/gnome/help/gtali/oc/figures
+@dirrm share/gnome/help/gtali/oc
+@dirrm share/gnome/help/gtali/fr/figures
+@dirrm share/gnome/help/gtali/fr
+@dirrm share/gnome/help/gtali/es/figures
+@dirrm share/gnome/help/gtali/es
 @dirrm share/gnome/help/gtali/da
 @dirrm share/gnome/help/gtali/C/figures
 @dirrm share/gnome/help/gtali/C
 @dirrm share/gnome/help/gtali
+@dirrm share/gnome/help/gnotski/sv/figures
+@dirrm share/gnome/help/gnotski/sv
+@dirrm share/gnome/help/gnotski/oc/figures
+@dirrm share/gnome/help/gnotski/oc
+@dirrm share/gnome/help/gnotski/fr/figures
+@dirrm share/gnome/help/gnotski/fr
+@dirrm share/gnome/help/gnotski/es/figures
+@dirrm share/gnome/help/gnotski/es
 @dirrm share/gnome/help/gnotski/C/figures
 @dirrm share/gnome/help/gnotski/C
 @dirrm share/gnome/help/gnotski
+@dirrm share/gnome/help/gnotravex/sv/figures
+@dirrm share/gnome/help/gnotravex/sv
+@dirrm share/gnome/help/gnotravex/oc/figures
+@dirrm share/gnome/help/gnotravex/oc
+@dirrm share/gnome/help/gnotravex/fr/figures
+@dirrm share/gnome/help/gnotravex/fr
+@dirrm share/gnome/help/gnotravex/es/figures
+@dirrm share/gnome/help/gnotravex/es
+@dirrm share/gnome/help/gnotravex/el/figures
+@dirrm share/gnome/help/gnotravex/el
+@dirrm share/gnome/help/gnotravex/de/figures
+@dirrm share/gnome/help/gnotravex/de
 @dirrm share/gnome/help/gnotravex/C/figures
 @dirrm share/gnome/help/gnotravex/C
 @dirrm share/gnome/help/gnotravex
+@dirrm share/gnome/help/gnomine/sv/figures
+@dirrm share/gnome/help/gnomine/sv
+@dirrm share/gnome/help/gnomine/oc/figures
+@dirrm share/gnome/help/gnomine/oc
+@dirrm share/gnome/help/gnomine/fr/figures
+@dirrm share/gnome/help/gnomine/fr
+@dirrm share/gnome/help/gnomine/es/figures
+@dirrm share/gnome/help/gnomine/es
+@dirrm share/gnome/help/gnomine/de/figures
+@dirrm share/gnome/help/gnomine/de
 @dirrm share/gnome/help/gnomine/C/figures
 @dirrm share/gnome/help/gnomine/C
 @dirrm share/gnome/help/gnomine
+@dirrm share/gnome/help/gnometris/sv
+@dirrm share/gnome/help/gnometris/oc
+@dirrm share/gnome/help/gnometris/fr
+@dirrm share/gnome/help/gnometris/es
+@dirrm share/gnome/help/gnometris/el
 @dirrm share/gnome/help/gnometris/C
 @dirrm share/gnome/help/gnometris
+@dirrm share/gnome/help/gnome-sudoku/sv/figures
+@dirrm share/gnome/help/gnome-sudoku/sv
+@dirrm share/gnome/help/gnome-sudoku/oc/figures
+@dirrm share/gnome/help/gnome-sudoku/oc
+@dirrm share/gnome/help/gnome-sudoku/fr/figures
+@dirrm share/gnome/help/gnome-sudoku/fr
+@dirrm share/gnome/help/gnome-sudoku/es/figures
+@dirrm share/gnome/help/gnome-sudoku/es
 @dirrm share/gnome/help/gnome-sudoku/C/figures
 @dirrm share/gnome/help/gnome-sudoku/C
 @dirrm share/gnome/help/gnome-sudoku
+@dirrm share/gnome/help/gnobots2/sv/figures
+@dirrm share/gnome/help/gnobots2/sv
+@dirrm share/gnome/help/gnobots2/oc/figures
+@dirrm share/gnome/help/gnobots2/oc
 @dirrm share/gnome/help/gnobots2/it
+@dirrm share/gnome/help/gnobots2/fr/figures
+@dirrm share/gnome/help/gnobots2/fr
+@dirrm share/gnome/help/gnobots2/es/figures
 @dirrm share/gnome/help/gnobots2/es
+@dirrm share/gnome/help/gnobots2/de/figures
+@dirrm share/gnome/help/gnobots2/de
 @dirrm share/gnome/help/gnobots2/da
 @dirrm share/gnome/help/gnobots2/C/figures
 @dirrm share/gnome/help/gnobots2/C
 @dirrm share/gnome/help/gnobots2
+@dirrm share/gnome/help/gnibbles/sv/figures
+@dirrm share/gnome/help/gnibbles/sv
+@dirrm share/gnome/help/gnibbles/oc/figures
+@dirrm share/gnome/help/gnibbles/oc
+@dirrm share/gnome/help/gnibbles/fr/figures
+@dirrm share/gnome/help/gnibbles/fr
+@dirrm share/gnome/help/gnibbles/es/figures
+@dirrm share/gnome/help/gnibbles/es
 @dirrm share/gnome/help/gnibbles/C/figures
 @dirrm share/gnome/help/gnibbles/C
 @dirrm share/gnome/help/gnibbles
 @dirrm share/gnome/help/gnect/sv/figures
 @dirrm share/gnome/help/gnect/sv
+@dirrm share/gnome/help/gnect/oc/figures
+@dirrm share/gnome/help/gnect/oc
 @dirrm share/gnome/help/gnect/fr/figures
 @dirrm share/gnome/help/gnect/fr
 @dirrm share/gnome/help/gnect/es/figures
@@ -1085,6 +1495,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-games.mo
 @dirrm share/gnome/help/glines/sv
 @dirrm share/gnome/help/glines/ru/figures
 @dirrm share/gnome/help/glines/ru
+@dirrm share/gnome/help/glines/oc/figures
+@dirrm share/gnome/help/glines/oc
 @dirrm share/gnome/help/glines/fr/figures
 @dirrm share/gnome/help/glines/fr
 @dirrm share/gnome/help/glines/es/figures
@@ -1095,50 +1507,82 @@ share/locale/zh_TW/LC_MESSAGES/gnome-games.mo
 @dirrm share/gnome/help/glines/C
 @dirrm share/gnome/help/glines
 @dirrm share/gnome/help/glchess/sv
+@dirrm share/gnome/help/glchess/pt_BR
+@dirrm share/gnome/help/glchess/oc
 @dirrm share/gnome/help/glchess/fr
 @dirrm share/gnome/help/glchess/es
 @dirrm share/gnome/help/glchess/C
 @dirrm share/gnome/help/glchess
+@dirrm share/gnome/help/blackjack/sv/figures
+@dirrm share/gnome/help/blackjack/sv
+@dirrm share/gnome/help/blackjack/oc/figures
+@dirrm share/gnome/help/blackjack/oc
+@dirrm share/gnome/help/blackjack/fr/figures
+@dirrm share/gnome/help/blackjack/fr
+@dirrm share/gnome/help/blackjack/es/figures
+@dirrm share/gnome/help/blackjack/es
 @dirrm share/gnome/help/blackjack/C/figures
 @dirrm share/gnome/help/blackjack/C
 @dirrm share/gnome/help/blackjack
+@dirrm share/gnome/help/aisleriot/sv/figures
+@dirrm share/gnome/help/aisleriot/sv
+@dirrm share/gnome/help/aisleriot/oc/figures
+@dirrm share/gnome/help/aisleriot/oc
 @dirrm share/gnome/help/aisleriot/fr/figures
 @dirrm share/gnome/help/aisleriot/fr
+@dirrm share/gnome/help/aisleriot/es/figures
+@dirrm share/gnome/help/aisleriot/es
 @dirrm share/gnome/help/aisleriot/C/figures
 @dirrm share/gnome/help/aisleriot/C
 @dirrm share/gnome/help/aisleriot
-@dirrm share/gnome/gnome-sudoku
-@dirrm share/gnome/gnome-games/same-gnome/themes/2.10
-@dirrm share/gnome/gnome-games/same-gnome/themes
-@dirrm share/gnome/gnome-games/same-gnome
-@dirrm share/gnome/gnome-games/mahjongg/maps
-@dirrm share/gnome/gnome-games/mahjongg
-@dirrm share/gnome/gnome-games
-@dirrm share/gnome/gnobots2
-@dirrm share/gnome/gnibbles
-@dirrm share/gnome/gnect
-@dirrm share/gnome/glchess
-@dirrm share/gnome/ggz/gnome-games
-@dirrm share/gnome/ggz
-@dirrm share/gnome/blackjack
+@dirrm share/gnome-sudoku
+@dirrm %%DATADIR%%/sounds
+@dirrm %%DATADIR%%/same-gnome/themes/2.10
+@dirrm %%DATADIR%%/same-gnome/themes
+@dirrm %%DATADIR%%/same-gnome
+@dirrm %%DATADIR%%/pixmaps
+@dirrm %%DATADIR%%/mahjongg/maps
+@dirrm %%DATADIR%%/mahjongg
+@dirrm %%DATADIR%%/gnotski
+@dirrm %%DATADIR%%/blackjack/rules
+@dirrm %%DATADIR%%/blackjack/pixmaps
+@dirrm %%DATADIR%%/blackjack
+@dirrm %%DATADIR%%/aisleriot/games
+@dirrm %%DATADIR%%/aisleriot
+@dirrm share/gnome-games-common/icons
+@dirrm share/gnome-games-common/cards
+@dirrm share/gnome-games-common
+@dirrm %%DATADIR%%
+@dirrm share/gnobots2
+@dirrm share/gnibbles
+@dirrm share/gnect
+@dirrm share/glchess
+@dirrmtry share/ggz/gnome-games
+@dirrmtry share/ggz
 @dirrm %%PYTHON_SITELIBDIR%%/gnome_sudoku/gtk_goodies
 @dirrm %%PYTHON_SITELIBDIR%%/gnome_sudoku
 @dirrm %%PYTHON_SITELIBDIR%%/glchess/ui
 @dirrm %%PYTHON_SITELIBDIR%%/glchess/scene/opengl
 @dirrm %%PYTHON_SITELIBDIR%%/glchess/scene/cairo
 @dirrm %%PYTHON_SITELIBDIR%%/glchess/scene
-@dirrm %%PYTHON_SITELIBDIR%%/glchess/network
 @dirrm %%PYTHON_SITELIBDIR%%/glchess/gtkui
 @dirrm %%PYTHON_SITELIBDIR%%/glchess/chess
 @dirrm %%PYTHON_SITELIBDIR%%/glchess
+@dirrm lib/gnome-games
 @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/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/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
@@ -1147,3 +1591,4 @@ share/locale/zh_TW/LC_MESSAGES/gnome-games.mo
 @dirrmtry share/locale/dz
 @dirrmtry share/locale/bn_IN/LC_MESSAGES
 @dirrmtry share/locale/bn_IN
+@dirrmtry share/applications
diff --git a/games/gnomeattacks/Makefile b/games/gnomeattacks/Makefile
index 041d3327b786..05856f74d44e 100644
--- a/games/gnomeattacks/Makefile
+++ b/games/gnomeattacks/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gnomeattacks
 PORTVERSION=	0.3
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	games gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/games/gnomeattacks/pkg-plist b/games/gnomeattacks/pkg-plist
index f87d32350355..85ab12e16e66 100644
--- a/games/gnomeattacks/pkg-plist
+++ b/games/gnomeattacks/pkg-plist
@@ -1,32 +1,32 @@
 bin/gnomeattacks
-share/gnome/pixmaps/gnomeattacks/bullet.png
-share/gnome/pixmaps/gnomeattacks/dead_ship.png
-share/gnome/pixmaps/gnomeattacks/hiscore.png
-share/gnome/pixmaps/gnomeattacks/instructions.png
-share/gnome/pixmaps/gnomeattacks/London/level_1_bg.png
-share/gnome/pixmaps/gnomeattacks/London/level_1_fg.png
-share/gnome/pixmaps/gnomeattacks/London/level_1_heights.txt
-share/gnome/pixmaps/gnomeattacks/London/level_2_bg.png
-share/gnome/pixmaps/gnomeattacks/London/level_2_fg.png
-share/gnome/pixmaps/gnomeattacks/London/level_2_heights.txt
-share/gnome/pixmaps/gnomeattacks/London/level_3_bg.png
-share/gnome/pixmaps/gnomeattacks/London/level_3_fg.png
-share/gnome/pixmaps/gnomeattacks/London/level_3_heights.txt
-share/gnome/pixmaps/gnomeattacks/London/level_4_bg.png
-share/gnome/pixmaps/gnomeattacks/London/level_4_fg.png
-share/gnome/pixmaps/gnomeattacks/London/level_4_heights.txt
-share/gnome/pixmaps/gnomeattacks/London/level_5_bg.png
-share/gnome/pixmaps/gnomeattacks/London/level_5_fg.png
-share/gnome/pixmaps/gnomeattacks/London/level_5_heights.txt
-share/gnome/pixmaps/gnomeattacks/London/level_6_bg.png
-share/gnome/pixmaps/gnomeattacks/London/level_6_fg.png
-share/gnome/pixmaps/gnomeattacks/London/level_6_heights.txt
-share/gnome/pixmaps/gnomeattacks/Original/level_1_bg.png
-share/gnome/pixmaps/gnomeattacks/Original/level_1_fg.png
-share/gnome/pixmaps/gnomeattacks/Original/level_2_bg.png
-share/gnome/pixmaps/gnomeattacks/Original/level_2_fg.png
-share/gnome/pixmaps/gnomeattacks/ship.png
-share/gnome/pixmaps/gnomeattacks/title.png
-@dirrm share/gnome/pixmaps/gnomeattacks/Original
-@dirrm share/gnome/pixmaps/gnomeattacks/London
-@dirrm share/gnome/pixmaps/gnomeattacks
+share/pixmaps/gnomeattacks/bullet.png
+share/pixmaps/gnomeattacks/dead_ship.png
+share/pixmaps/gnomeattacks/hiscore.png
+share/pixmaps/gnomeattacks/instructions.png
+share/pixmaps/gnomeattacks/London/level_1_bg.png
+share/pixmaps/gnomeattacks/London/level_1_fg.png
+share/pixmaps/gnomeattacks/London/level_1_heights.txt
+share/pixmaps/gnomeattacks/London/level_2_bg.png
+share/pixmaps/gnomeattacks/London/level_2_fg.png
+share/pixmaps/gnomeattacks/London/level_2_heights.txt
+share/pixmaps/gnomeattacks/London/level_3_bg.png
+share/pixmaps/gnomeattacks/London/level_3_fg.png
+share/pixmaps/gnomeattacks/London/level_3_heights.txt
+share/pixmaps/gnomeattacks/London/level_4_bg.png
+share/pixmaps/gnomeattacks/London/level_4_fg.png
+share/pixmaps/gnomeattacks/London/level_4_heights.txt
+share/pixmaps/gnomeattacks/London/level_5_bg.png
+share/pixmaps/gnomeattacks/London/level_5_fg.png
+share/pixmaps/gnomeattacks/London/level_5_heights.txt
+share/pixmaps/gnomeattacks/London/level_6_bg.png
+share/pixmaps/gnomeattacks/London/level_6_fg.png
+share/pixmaps/gnomeattacks/London/level_6_heights.txt
+share/pixmaps/gnomeattacks/Original/level_1_bg.png
+share/pixmaps/gnomeattacks/Original/level_1_fg.png
+share/pixmaps/gnomeattacks/Original/level_2_bg.png
+share/pixmaps/gnomeattacks/Original/level_2_fg.png
+share/pixmaps/gnomeattacks/ship.png
+share/pixmaps/gnomeattacks/title.png
+@dirrm share/pixmaps/gnomeattacks/Original
+@dirrm share/pixmaps/gnomeattacks/London
+@dirrm share/pixmaps/gnomeattacks
diff --git a/games/gnomebreakout/Makefile b/games/gnomebreakout/Makefile
index 9c9649156c68..5b94b6cac758 100644
--- a/games/gnomebreakout/Makefile
+++ b/games/gnomebreakout/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gnomebreakout
 PORTVERSION=	0.5.3
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	games gnome
 MASTER_SITES=	http://www.users.on.net/~mipearson/
 DISTNAME=	gnome-breakout-${PORTVERSION}
diff --git a/games/gnomebreakout/pkg-plist b/games/gnomebreakout/pkg-plist
index d65943985f0c..341e5a8c4e42 100644
--- a/games/gnomebreakout/pkg-plist
+++ b/games/gnomebreakout/pkg-plist
@@ -1,76 +1,76 @@
 bin/gnome-breakout
 share/gnome/apps/Games/gnome-breakout.desktop
-share/gnome/games/gnome-breakout.scores
-share/gnome/gnome-breakout/levels/alcaron.gbl
-share/gnome/gnome-breakout/levels/mdutour.gbl
-share/gnome/gnome-breakout/levels/mmack.gbl
-share/gnome/gnome-breakout/pixmaps/ball.default.0.png
-share/gnome/gnome-breakout/pixmaps/bat.default.0.png
-share/gnome/gnome-breakout/pixmaps/bat.laser.0.png
-share/gnome/gnome-breakout/pixmaps/bat.wide.0.png
-share/gnome/gnome-breakout/pixmaps/block.default.0.png
-share/gnome/gnome-breakout/pixmaps/block.default.die.0.png
-share/gnome/gnome-breakout/pixmaps/block.default.die.1.png
-share/gnome/gnome-breakout/pixmaps/block.default.die.10.png
-share/gnome/gnome-breakout/pixmaps/block.default.die.11.png
-share/gnome/gnome-breakout/pixmaps/block.default.die.12.png
-share/gnome/gnome-breakout/pixmaps/block.default.die.13.png
-share/gnome/gnome-breakout/pixmaps/block.default.die.2.png
-share/gnome/gnome-breakout/pixmaps/block.default.die.3.png
-share/gnome/gnome-breakout/pixmaps/block.default.die.4.png
-share/gnome/gnome-breakout/pixmaps/block.default.die.5.png
-share/gnome/gnome-breakout/pixmaps/block.default.die.6.png
-share/gnome/gnome-breakout/pixmaps/block.default.die.7.png
-share/gnome/gnome-breakout/pixmaps/block.default.die.8.png
-share/gnome/gnome-breakout/pixmaps/block.default.die.9.png
-share/gnome/gnome-breakout/pixmaps/block.explode.0.png
-share/gnome/gnome-breakout/pixmaps/block.explode.die.0.png
-share/gnome/gnome-breakout/pixmaps/block.explode.die.1.png
-share/gnome/gnome-breakout/pixmaps/block.explode.die.2.png
-share/gnome/gnome-breakout/pixmaps/block.explode.die.3.png
-share/gnome/gnome-breakout/pixmaps/block.explode.die.4.png
-share/gnome/gnome-breakout/pixmaps/block.explode.die.5.png
-share/gnome/gnome-breakout/pixmaps/block.explode.die.6.png
-share/gnome/gnome-breakout/pixmaps/block.explode.die.7.png
-share/gnome/gnome-breakout/pixmaps/block.invincible.0.png
-share/gnome/gnome-breakout/pixmaps/block.strong.1.0.png
-share/gnome/gnome-breakout/pixmaps/block.strong.1.die.0.png
-share/gnome/gnome-breakout/pixmaps/block.strong.1.die.1.png
-share/gnome/gnome-breakout/pixmaps/block.strong.1.die.2.png
-share/gnome/gnome-breakout/pixmaps/block.strong.1.die.3.png
-share/gnome/gnome-breakout/pixmaps/block.strong.1.die.4.png
-share/gnome/gnome-breakout/pixmaps/block.strong.1.die.5.png
-share/gnome/gnome-breakout/pixmaps/block.strong.1.die.6.png
-share/gnome/gnome-breakout/pixmaps/block.strong.2.0.png
-share/gnome/gnome-breakout/pixmaps/block.strong.2.die.0.png
-share/gnome/gnome-breakout/pixmaps/block.strong.2.die.1.png
-share/gnome/gnome-breakout/pixmaps/block.strong.2.die.2.png
-share/gnome/gnome-breakout/pixmaps/block.strong.2.die.3.png
-share/gnome/gnome-breakout/pixmaps/block.strong.2.die.4.png
-share/gnome/gnome-breakout/pixmaps/block.strong.2.die.5.png
-share/gnome/gnome-breakout/pixmaps/block.strong.2.die.6.png
-share/gnome/gnome-breakout/pixmaps/block.strong.3.0.png
-share/gnome/gnome-breakout/pixmaps/block.strong.3.die.0.png
-share/gnome/gnome-breakout/pixmaps/block.strong.3.die.1.png
-share/gnome/gnome-breakout/pixmaps/block.strong.3.die.2.png
-share/gnome/gnome-breakout/pixmaps/block.strong.3.die.3.png
-share/gnome/gnome-breakout/pixmaps/block.strong.3.die.4.png
-share/gnome/gnome-breakout/pixmaps/block.strong.3.die.5.png
-share/gnome/gnome-breakout/pixmaps/block.strong.3.die.6.png
-share/gnome/gnome-breakout/pixmaps/laser.0.png
-share/gnome/gnome-breakout/pixmaps/powerup.laser.0.png
-share/gnome/gnome-breakout/pixmaps/powerup.newball.0.png
-share/gnome/gnome-breakout/pixmaps/powerup.newlife.0.png
-share/gnome/gnome-breakout/pixmaps/powerup.nextlevel.0.png
-share/gnome/gnome-breakout/pixmaps/powerup.score500.0.png
-share/gnome/gnome-breakout/pixmaps/powerup.slow.0.png
-share/gnome/gnome-breakout/pixmaps/powerup.widebat.0.png
-share/gnome/gnome-breakout/pixmaps/title.png
-share/gnome/pixmaps/gnome-breakout.png
+share/games/gnome-breakout.scores
+share/gnome-breakout/levels/alcaron.gbl
+share/gnome-breakout/levels/mdutour.gbl
+share/gnome-breakout/levels/mmack.gbl
+share/gnome-breakout/pixmaps/ball.default.0.png
+share/gnome-breakout/pixmaps/bat.default.0.png
+share/gnome-breakout/pixmaps/bat.laser.0.png
+share/gnome-breakout/pixmaps/bat.wide.0.png
+share/gnome-breakout/pixmaps/block.default.0.png
+share/gnome-breakout/pixmaps/block.default.die.0.png
+share/gnome-breakout/pixmaps/block.default.die.1.png
+share/gnome-breakout/pixmaps/block.default.die.10.png
+share/gnome-breakout/pixmaps/block.default.die.11.png
+share/gnome-breakout/pixmaps/block.default.die.12.png
+share/gnome-breakout/pixmaps/block.default.die.13.png
+share/gnome-breakout/pixmaps/block.default.die.2.png
+share/gnome-breakout/pixmaps/block.default.die.3.png
+share/gnome-breakout/pixmaps/block.default.die.4.png
+share/gnome-breakout/pixmaps/block.default.die.5.png
+share/gnome-breakout/pixmaps/block.default.die.6.png
+share/gnome-breakout/pixmaps/block.default.die.7.png
+share/gnome-breakout/pixmaps/block.default.die.8.png
+share/gnome-breakout/pixmaps/block.default.die.9.png
+share/gnome-breakout/pixmaps/block.explode.0.png
+share/gnome-breakout/pixmaps/block.explode.die.0.png
+share/gnome-breakout/pixmaps/block.explode.die.1.png
+share/gnome-breakout/pixmaps/block.explode.die.2.png
+share/gnome-breakout/pixmaps/block.explode.die.3.png
+share/gnome-breakout/pixmaps/block.explode.die.4.png
+share/gnome-breakout/pixmaps/block.explode.die.5.png
+share/gnome-breakout/pixmaps/block.explode.die.6.png
+share/gnome-breakout/pixmaps/block.explode.die.7.png
+share/gnome-breakout/pixmaps/block.invincible.0.png
+share/gnome-breakout/pixmaps/block.strong.1.0.png
+share/gnome-breakout/pixmaps/block.strong.1.die.0.png
+share/gnome-breakout/pixmaps/block.strong.1.die.1.png
+share/gnome-breakout/pixmaps/block.strong.1.die.2.png
+share/gnome-breakout/pixmaps/block.strong.1.die.3.png
+share/gnome-breakout/pixmaps/block.strong.1.die.4.png
+share/gnome-breakout/pixmaps/block.strong.1.die.5.png
+share/gnome-breakout/pixmaps/block.strong.1.die.6.png
+share/gnome-breakout/pixmaps/block.strong.2.0.png
+share/gnome-breakout/pixmaps/block.strong.2.die.0.png
+share/gnome-breakout/pixmaps/block.strong.2.die.1.png
+share/gnome-breakout/pixmaps/block.strong.2.die.2.png
+share/gnome-breakout/pixmaps/block.strong.2.die.3.png
+share/gnome-breakout/pixmaps/block.strong.2.die.4.png
+share/gnome-breakout/pixmaps/block.strong.2.die.5.png
+share/gnome-breakout/pixmaps/block.strong.2.die.6.png
+share/gnome-breakout/pixmaps/block.strong.3.0.png
+share/gnome-breakout/pixmaps/block.strong.3.die.0.png
+share/gnome-breakout/pixmaps/block.strong.3.die.1.png
+share/gnome-breakout/pixmaps/block.strong.3.die.2.png
+share/gnome-breakout/pixmaps/block.strong.3.die.3.png
+share/gnome-breakout/pixmaps/block.strong.3.die.4.png
+share/gnome-breakout/pixmaps/block.strong.3.die.5.png
+share/gnome-breakout/pixmaps/block.strong.3.die.6.png
+share/gnome-breakout/pixmaps/laser.0.png
+share/gnome-breakout/pixmaps/powerup.laser.0.png
+share/gnome-breakout/pixmaps/powerup.newball.0.png
+share/gnome-breakout/pixmaps/powerup.newlife.0.png
+share/gnome-breakout/pixmaps/powerup.nextlevel.0.png
+share/gnome-breakout/pixmaps/powerup.score500.0.png
+share/gnome-breakout/pixmaps/powerup.slow.0.png
+share/gnome-breakout/pixmaps/powerup.widebat.0.png
+share/gnome-breakout/pixmaps/title.png
+share/pixmaps/gnome-breakout.png
 share/locale/de/LC_MESSAGES/gnome-breakout.mo
 share/locale/ru/LC_MESSAGES/gnome-breakout.mo
 share/locale/sv/LC_MESSAGES/gnome-breakout.mo
 share/locale/tr/LC_MESSAGES/gnome-breakout.mo
-@dirrm share/gnome/gnome-breakout/pixmaps
-@dirrm share/gnome/gnome-breakout/levels
-@dirrm share/gnome/gnome-breakout
+@dirrm share/gnome-breakout/pixmaps
+@dirrm share/gnome-breakout/levels
+@dirrm share/gnome-breakout
diff --git a/games/gnomechess/Makefile b/games/gnomechess/Makefile
index bb408ab115a1..87a8c7cf2ae1 100644
--- a/games/gnomechess/Makefile
+++ b/games/gnomechess/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gnomechess
 PORTVERSION=	0.3.3
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	games gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-chess/0.3
diff --git a/games/gnomechess/pkg-plist b/games/gnomechess/pkg-plist
index a2b6620b3a3f..96b08ef5607c 100644
--- a/games/gnomechess/pkg-plist
+++ b/games/gnomechess/pkg-plist
@@ -1,10 +1,10 @@
 bin/gnome-chess
 share/gnome/apps/Games/gnome-chess.desktop
-share/gnome/gnome-chess/glade/level.glade
-share/gnome/gnome-chess/glade/login.glade
-share/gnome/gnome-chess/glade/pgn.glade
-share/gnome/gnome-chess/glade/prefs.glade
-share/gnome/gnome-chess/glade/promotion.glade
+share/gnome-chess/glade/level.glade
+share/gnome-chess/glade/login.glade
+share/gnome-chess/glade/pgn.glade
+share/gnome-chess/glade/prefs.glade
+share/gnome-chess/glade/promotion.glade
 share/gnome/help/gnome-chess-manual/C/docbook.css
 share/gnome/help/gnome-chess-manual/C/fdl-appendix.sgml
 share/gnome/help/gnome-chess-manual/C/figures/main.png
@@ -25,26 +25,26 @@ share/gnome/help/gnome-chess-manual/C/stylesheet-images/toc-plus.gif
 share/gnome/help/gnome-chess-manual/C/stylesheet-images/up.gif
 share/gnome/help/gnome-chess-manual/C/stylesheet-images/warning.gif
 share/gnome/help/gnome-chess-manual/C/usage.html
-share/gnome/mime-info/gnome-chess.keys
-share/gnome/mime-info/gnome-chess.mime
-share/gnome/omf/gnome-chess/gnome-chess-manual-C.omf
-share/gnome/pixmaps/gnome-chess.png
-share/gnome/pixmaps/gnome-chess/B.png
-share/gnome/pixmaps/gnome-chess/K.png
-share/gnome/pixmaps/gnome-chess/N.png
-share/gnome/pixmaps/gnome-chess/P.png
-share/gnome/pixmaps/gnome-chess/Q.png
-share/gnome/pixmaps/gnome-chess/R.png
-share/gnome/pixmaps/gnome-chess/b.png
-share/gnome/pixmaps/gnome-chess/end.png
-share/gnome/pixmaps/gnome-chess/k.png
-share/gnome/pixmaps/gnome-chess/n.png
-share/gnome/pixmaps/gnome-chess/next.png
-share/gnome/pixmaps/gnome-chess/p.png
-share/gnome/pixmaps/gnome-chess/prev.png
-share/gnome/pixmaps/gnome-chess/q.png
-share/gnome/pixmaps/gnome-chess/r.png
-share/gnome/pixmaps/gnome-chess/start.png
+share/mime-info/gnome-chess.keys
+share/mime-info/gnome-chess.mime
+share/omf/gnome-chess/gnome-chess-manual-C.omf
+share/pixmaps/gnome-chess.png
+share/pixmaps/gnome-chess/B.png
+share/pixmaps/gnome-chess/K.png
+share/pixmaps/gnome-chess/N.png
+share/pixmaps/gnome-chess/P.png
+share/pixmaps/gnome-chess/Q.png
+share/pixmaps/gnome-chess/R.png
+share/pixmaps/gnome-chess/b.png
+share/pixmaps/gnome-chess/end.png
+share/pixmaps/gnome-chess/k.png
+share/pixmaps/gnome-chess/n.png
+share/pixmaps/gnome-chess/next.png
+share/pixmaps/gnome-chess/p.png
+share/pixmaps/gnome-chess/prev.png
+share/pixmaps/gnome-chess/q.png
+share/pixmaps/gnome-chess/r.png
+share/pixmaps/gnome-chess/start.png
 share/locale/az/LC_MESSAGES/gnome-chess.mo
 share/locale/ca/LC_MESSAGES/gnome-chess.mo
 share/locale/da/LC_MESSAGES/gnome-chess.mo
@@ -68,11 +68,11 @@ share/locale/sv/LC_MESSAGES/gnome-chess.mo
 share/locale/tr/LC_MESSAGES/gnome-chess.mo
 share/locale/uk/LC_MESSAGES/gnome-chess.mo
 share/locale/zh_TW.Big5/LC_MESSAGES/gnome-chess.mo
-@dirrm share/gnome/pixmaps/gnome-chess
-@dirrm share/gnome/omf/gnome-chess
+@dirrm share/pixmaps/gnome-chess
+@dirrm share/omf/gnome-chess
 @dirrm share/gnome/help/gnome-chess-manual/C/stylesheet-images
 @dirrm share/gnome/help/gnome-chess-manual/C/figures
 @dirrm share/gnome/help/gnome-chess-manual/C
 @dirrm share/gnome/help/gnome-chess-manual
-@dirrm share/gnome/gnome-chess/glade
-@dirrm share/gnome/gnome-chess
+@dirrm share/gnome-chess/glade
+@dirrm share/gnome-chess
diff --git a/games/gnomekiss/Makefile b/games/gnomekiss/Makefile
index b1f683b6c76f..187b5c0ba0ec 100644
--- a/games/gnomekiss/Makefile
+++ b/games/gnomekiss/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gnomekiss
 PORTVERSION=	2.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games gnome
 MASTER_SITES=	http://devel.tlrmx.org/kiss/source/
 
diff --git a/games/gnomekiss/pkg-plist b/games/gnomekiss/pkg-plist
index 15ca534c4e52..3399c79058e7 100644
--- a/games/gnomekiss/pkg-plist
+++ b/games/gnomekiss/pkg-plist
@@ -1,8 +1,9 @@
 bin/gnomekiss
-share/gnome/pixmaps/gnomekiss/besito_sinfondo.png
-share/gnome/pixmaps/gnomekiss/gnome-kiss.png
-share/gnome/applications/gnomekiss.desktop
+share/pixmaps/gnomekiss/besito_sinfondo.png
+share/pixmaps/gnomekiss/gnome-kiss.png
+share/applications/gnomekiss.desktop
 share/locale/en_GB/LC_MESSAGES/gnomekiss.mo
 share/locale/es/LC_MESSAGES/gnomekiss.mo
 share/locale/es_ES/LC_MESSAGES/gnomekiss.mo
-@dirrm share/gnome/pixmaps/gnomekiss
+@dirrm share/pixmaps/gnomekiss
+@dirrmtry share/applications
diff --git a/games/gnomememoryblocks/Makefile b/games/gnomememoryblocks/Makefile
index 5f47a2e9fa51..03981b28cda4 100644
--- a/games/gnomememoryblocks/Makefile
+++ b/games/gnomememoryblocks/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gnomememoryblocks
 PORTVERSION=	0.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	games gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	gnome-memblocks
diff --git a/games/gnomememoryblocks/files/patch-src::Makefile.in b/games/gnomememoryblocks/files/patch-src::Makefile.in
index 7455fa88a0a9..6fc81924b4c8 100644
--- a/games/gnomememoryblocks/files/patch-src::Makefile.in
+++ b/games/gnomememoryblocks/files/patch-src::Makefile.in
@@ -7,8 +7,8 @@ $FreeBSD$
  
  SUBDIRS = animation-engines
  
--INCLUDES = -I$(top_srcdir) -I$(includedir) $(GNOME_INCLUDEDIR)            -DG_LOG_DOMAIN=\"GnomeMemBlocks\" -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\"           -I../intl -I$(srcdir) $(GDK_PIXBUF_CFLAGS)
-+INCLUDES = $(GDK_PIXBUF_INCS) -I$(top_srcdir) -I$(includedir) $(GNOME_INCLUDEDIR)            -DG_LOG_DOMAIN=\"GnomeMemBlocks\" -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\"           -I../intl -I$(srcdir) $(GDK_PIXBUF_CFLAGS)
+-INCLUDES = -I$(top_srcdir) -I$(includedir) $(GNOME_INCLUDEDIR)            -DG_LOG_DOMAIN=\"GnomeMemBlocks\" -DGNOMELOCALEDIR=\""$(datadir)/locale"\"           -I../intl -I$(srcdir) $(GDK_PIXBUF_CFLAGS)
++INCLUDES = $(GDK_PIXBUF_INCS) -I$(top_srcdir) -I$(includedir) $(GNOME_INCLUDEDIR)            -DG_LOG_DOMAIN=\"GnomeMemBlocks\" -DGNOMELOCALEDIR=\""$(datadir)/locale"\"           -I../intl -I$(srcdir) $(GDK_PIXBUF_CFLAGS)
  
  
  bin_PROGRAMS = gnome-memblocks
diff --git a/games/gnomememoryblocks/pkg-plist b/games/gnomememoryblocks/pkg-plist
index 246aa40e1203..a7866f6fc21e 100644
--- a/games/gnomememoryblocks/pkg-plist
+++ b/games/gnomememoryblocks/pkg-plist
@@ -6,43 +6,43 @@ lib/gnome-memblocks/libscaling.so
 lib/gnome-memblocks/libsliding.a
 lib/gnome-memblocks/libsliding.la
 lib/gnome-memblocks/libsliding.so
+share/games/gnome-memblocks.default.scores
 share/gnome/apps/Games/gnome-memblocks.desktop
-share/gnome/games/gnome-memblocks.default.scores
 share/gnome/help/gnome-memblocks/C/index.html
 share/gnome/help/gnome-memblocks/C/topic.dat
-share/gnome/pixmaps/gnome-memblocks-logo.png
-share/gnome/pixmaps/gnome-memblocks.png
-share/gnome/pixmaps/gnome-memblocks/default/1.png
-share/gnome/pixmaps/gnome-memblocks/default/10.png
-share/gnome/pixmaps/gnome-memblocks/default/11.png
-share/gnome/pixmaps/gnome-memblocks/default/12.png
-share/gnome/pixmaps/gnome-memblocks/default/13.png
-share/gnome/pixmaps/gnome-memblocks/default/14.png
-share/gnome/pixmaps/gnome-memblocks/default/15.png
-share/gnome/pixmaps/gnome-memblocks/default/16.png
-share/gnome/pixmaps/gnome-memblocks/default/17.png
-share/gnome/pixmaps/gnome-memblocks/default/18.png
-share/gnome/pixmaps/gnome-memblocks/default/2.png
-share/gnome/pixmaps/gnome-memblocks/default/3.png
-share/gnome/pixmaps/gnome-memblocks/default/4.png
-share/gnome/pixmaps/gnome-memblocks/default/5.png
-share/gnome/pixmaps/gnome-memblocks/default/6.png
-share/gnome/pixmaps/gnome-memblocks/default/7.png
-share/gnome/pixmaps/gnome-memblocks/default/8.png
-share/gnome/pixmaps/gnome-memblocks/default/9.png
-share/gnome/pixmaps/gnome-memblocks/default/background.jpg
-share/gnome/sounds/gnome-memblocks/flip01.wav
-share/gnome/sounds/gnome-memblocks/flip02.wav
-share/gnome/sounds/gnome-memblocks/flip03.wav
-share/gnome/sounds/gnome-memblocks/flip04.wav
-share/gnome/sounds/gnome-memblocks/flip05.wav
-share/gnome/sounds/gnome-memblocks/flip06.wav
-share/gnome/sounds/gnome-memblocks/flip07.wav
 share/locale/it/LC_MESSAGES/gnome-memblocks.mo
 share/locale/pt_BR/LC_MESSAGES/gnome-memblocks.mo
-@dirrm share/gnome/sounds/gnome-memblocks
-@dirrm share/gnome/pixmaps/gnome-memblocks/default
-@dirrm share/gnome/pixmaps/gnome-memblocks
+share/pixmaps/gnome-memblocks-logo.png
+share/pixmaps/gnome-memblocks.png
+share/pixmaps/gnome-memblocks/default/1.png
+share/pixmaps/gnome-memblocks/default/10.png
+share/pixmaps/gnome-memblocks/default/11.png
+share/pixmaps/gnome-memblocks/default/12.png
+share/pixmaps/gnome-memblocks/default/13.png
+share/pixmaps/gnome-memblocks/default/14.png
+share/pixmaps/gnome-memblocks/default/15.png
+share/pixmaps/gnome-memblocks/default/16.png
+share/pixmaps/gnome-memblocks/default/17.png
+share/pixmaps/gnome-memblocks/default/18.png
+share/pixmaps/gnome-memblocks/default/2.png
+share/pixmaps/gnome-memblocks/default/3.png
+share/pixmaps/gnome-memblocks/default/4.png
+share/pixmaps/gnome-memblocks/default/5.png
+share/pixmaps/gnome-memblocks/default/6.png
+share/pixmaps/gnome-memblocks/default/7.png
+share/pixmaps/gnome-memblocks/default/8.png
+share/pixmaps/gnome-memblocks/default/9.png
+share/pixmaps/gnome-memblocks/default/background.jpg
+share/sounds/gnome-memblocks/flip01.wav
+share/sounds/gnome-memblocks/flip02.wav
+share/sounds/gnome-memblocks/flip03.wav
+share/sounds/gnome-memblocks/flip04.wav
+share/sounds/gnome-memblocks/flip05.wav
+share/sounds/gnome-memblocks/flip06.wav
+share/sounds/gnome-memblocks/flip07.wav
+@dirrm share/sounds/gnome-memblocks
+@dirrm share/pixmaps/gnome-memblocks/default
+@dirrm share/pixmaps/gnome-memblocks
 @dirrm share/gnome/help/gnome-memblocks/C
 @dirrm share/gnome/help/gnome-memblocks
 @dirrm lib/gnome-memblocks
diff --git a/games/gnomermind/Makefile b/games/gnomermind/Makefile
index 7f7cc249df76..0f941b4c48e1 100644
--- a/games/gnomermind/Makefile
+++ b/games/gnomermind/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gnomermind
 PORTVERSION=	1.0.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	games gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/games/gnomermind/pkg-plist b/games/gnomermind/pkg-plist
index 2e96711fd4e3..2a6c01ab64c6 100644
--- a/games/gnomermind/pkg-plist
+++ b/games/gnomermind/pkg-plist
@@ -6,150 +6,150 @@ bin/gnomermind
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/TODO
 share/gnome/apps/Games/gnomermind.desktop
-share/gnome/gnomermind/themes/Classic/ABOUT
-share/gnome/gnomermind/themes/Classic/b.png
-share/gnome/gnomermind/themes/Classic/bl.png
-share/gnome/gnomermind/themes/Classic/br.png
-share/gnome/gnomermind/themes/Classic/l.png
-share/gnome/gnomermind/themes/Classic/mpin0.png
-share/gnome/gnomermind/themes/Classic/mpin1.png
-share/gnome/gnomermind/themes/Classic/mpin2.png
-share/gnome/gnomermind/themes/Classic/mpin3.png
-share/gnome/gnomermind/themes/Classic/mpin4.png
-share/gnome/gnomermind/themes/Classic/mpin5.png
-share/gnome/gnomermind/themes/Classic/mstt.png
-share/gnome/gnomermind/themes/Classic/mtok.png
-share/gnome/gnomermind/themes/Classic/pin0.png
-share/gnome/gnomermind/themes/Classic/pin1.png
-share/gnome/gnomermind/themes/Classic/pin2.png
-share/gnome/gnomermind/themes/Classic/r.png
-share/gnome/gnomermind/themes/Classic/stt0.png
-share/gnome/gnomermind/themes/Classic/stt1.png
-share/gnome/gnomermind/themes/Classic/stt2.png
-share/gnome/gnomermind/themes/Classic/stt3.png
-share/gnome/gnomermind/themes/Classic/tile.png
-share/gnome/gnomermind/themes/Classic/tok0.png
-share/gnome/gnomermind/themes/Classic/tok1.png
-share/gnome/gnomermind/themes/Classic/tok2.png
-share/gnome/gnomermind/themes/Classic/tok3.png
-share/gnome/gnomermind/themes/Classic/tok4.png
-share/gnome/gnomermind/themes/Classic/tok5.png
-share/gnome/gnomermind/themes/Classic/tok6.png
-share/gnome/gnomermind/themes/Classic/tok7.png
-share/gnome/gnomermind/themes/Classic/tok8.png
-share/gnome/gnomermind/themes/Classic/tok9.png
-share/gnome/gnomermind/themes/Classic/tokh.png
-share/gnome/gnomermind/themes/Classic/u.png
-share/gnome/gnomermind/themes/Classic/ul.png
-share/gnome/gnomermind/themes/Classic/ur.png
-share/gnome/gnomermind/themes/Pingus/ABOUT
-share/gnome/gnomermind/themes/Pingus/b.png
-share/gnome/gnomermind/themes/Pingus/bl.png
-share/gnome/gnomermind/themes/Pingus/br.png
-share/gnome/gnomermind/themes/Pingus/l.png
-share/gnome/gnomermind/themes/Pingus/mpin0.png
-share/gnome/gnomermind/themes/Pingus/mpin1.png
-share/gnome/gnomermind/themes/Pingus/mpin2.png
-share/gnome/gnomermind/themes/Pingus/mpin3.png
-share/gnome/gnomermind/themes/Pingus/mpin4.png
-share/gnome/gnomermind/themes/Pingus/mpin5.png
-share/gnome/gnomermind/themes/Pingus/mstt.png
-share/gnome/gnomermind/themes/Pingus/mtok.png
-share/gnome/gnomermind/themes/Pingus/pin0.png
-share/gnome/gnomermind/themes/Pingus/pin1.png
-share/gnome/gnomermind/themes/Pingus/pin2.png
-share/gnome/gnomermind/themes/Pingus/r.png
-share/gnome/gnomermind/themes/Pingus/stt0.png
-share/gnome/gnomermind/themes/Pingus/stt1.png
-share/gnome/gnomermind/themes/Pingus/stt2.png
-share/gnome/gnomermind/themes/Pingus/stt3.png
-share/gnome/gnomermind/themes/Pingus/tile.png
-share/gnome/gnomermind/themes/Pingus/tok0.png
-share/gnome/gnomermind/themes/Pingus/tok1.png
-share/gnome/gnomermind/themes/Pingus/tok2.png
-share/gnome/gnomermind/themes/Pingus/tok3.png
-share/gnome/gnomermind/themes/Pingus/tok4.png
-share/gnome/gnomermind/themes/Pingus/tok5.png
-share/gnome/gnomermind/themes/Pingus/tok6.png
-share/gnome/gnomermind/themes/Pingus/tok7.png
-share/gnome/gnomermind/themes/Pingus/tok8.png
-share/gnome/gnomermind/themes/Pingus/tok9.png
-share/gnome/gnomermind/themes/Pingus/tokh.png
-share/gnome/gnomermind/themes/Pingus/u.png
-share/gnome/gnomermind/themes/Pingus/ul.png
-share/gnome/gnomermind/themes/Pingus/ur.png
-share/gnome/gnomermind/themes/QMM/ABOUT
-share/gnome/gnomermind/themes/QMM/b.png
-share/gnome/gnomermind/themes/QMM/bl.png
-share/gnome/gnomermind/themes/QMM/br.png
-share/gnome/gnomermind/themes/QMM/l.png
-share/gnome/gnomermind/themes/QMM/mpin0.png
-share/gnome/gnomermind/themes/QMM/mpin1.png
-share/gnome/gnomermind/themes/QMM/mpin2.png
-share/gnome/gnomermind/themes/QMM/mpin3.png
-share/gnome/gnomermind/themes/QMM/mpin4.png
-share/gnome/gnomermind/themes/QMM/mpin5.png
-share/gnome/gnomermind/themes/QMM/mstt.png
-share/gnome/gnomermind/themes/QMM/mtok.png
-share/gnome/gnomermind/themes/QMM/pin0.png
-share/gnome/gnomermind/themes/QMM/pin1.png
-share/gnome/gnomermind/themes/QMM/pin2.png
-share/gnome/gnomermind/themes/QMM/r.png
-share/gnome/gnomermind/themes/QMM/stt0.png
-share/gnome/gnomermind/themes/QMM/stt1.png
-share/gnome/gnomermind/themes/QMM/stt2.png
-share/gnome/gnomermind/themes/QMM/stt3.png
-share/gnome/gnomermind/themes/QMM/tile.png
-share/gnome/gnomermind/themes/QMM/tok0.png
-share/gnome/gnomermind/themes/QMM/tok1.png
-share/gnome/gnomermind/themes/QMM/tok2.png
-share/gnome/gnomermind/themes/QMM/tok3.png
-share/gnome/gnomermind/themes/QMM/tok4.png
-share/gnome/gnomermind/themes/QMM/tok5.png
-share/gnome/gnomermind/themes/QMM/tok6.png
-share/gnome/gnomermind/themes/QMM/tok7.png
-share/gnome/gnomermind/themes/QMM/tok8.png
-share/gnome/gnomermind/themes/QMM/tok9.png
-share/gnome/gnomermind/themes/QMM/tokh.png
-share/gnome/gnomermind/themes/QMM/u.png
-share/gnome/gnomermind/themes/QMM/ul.png
-share/gnome/gnomermind/themes/QMM/ur.png
-share/gnome/gnomermind/themes/Scribble/ABOUT
-share/gnome/gnomermind/themes/Scribble/b.png
-share/gnome/gnomermind/themes/Scribble/bl.png
-share/gnome/gnomermind/themes/Scribble/br.png
-share/gnome/gnomermind/themes/Scribble/l.png
-share/gnome/gnomermind/themes/Scribble/mpin0.png
-share/gnome/gnomermind/themes/Scribble/mpin1.png
-share/gnome/gnomermind/themes/Scribble/mpin2.png
-share/gnome/gnomermind/themes/Scribble/mpin3.png
-share/gnome/gnomermind/themes/Scribble/mpin4.png
-share/gnome/gnomermind/themes/Scribble/mpin5.png
-share/gnome/gnomermind/themes/Scribble/mstt.png
-share/gnome/gnomermind/themes/Scribble/mtok.png
-share/gnome/gnomermind/themes/Scribble/pin0.png
-share/gnome/gnomermind/themes/Scribble/pin1.png
-share/gnome/gnomermind/themes/Scribble/pin2.png
-share/gnome/gnomermind/themes/Scribble/r.png
-share/gnome/gnomermind/themes/Scribble/stt0.png
-share/gnome/gnomermind/themes/Scribble/stt1.png
-share/gnome/gnomermind/themes/Scribble/stt2.png
-share/gnome/gnomermind/themes/Scribble/stt3.png
-share/gnome/gnomermind/themes/Scribble/tile.png
-share/gnome/gnomermind/themes/Scribble/tok0.png
-share/gnome/gnomermind/themes/Scribble/tok1.png
-share/gnome/gnomermind/themes/Scribble/tok2.png
-share/gnome/gnomermind/themes/Scribble/tok3.png
-share/gnome/gnomermind/themes/Scribble/tok4.png
-share/gnome/gnomermind/themes/Scribble/tok5.png
-share/gnome/gnomermind/themes/Scribble/tok6.png
-share/gnome/gnomermind/themes/Scribble/tok7.png
-share/gnome/gnomermind/themes/Scribble/tok8.png
-share/gnome/gnomermind/themes/Scribble/tok9.png
-share/gnome/gnomermind/themes/Scribble/tokh.png
-share/gnome/gnomermind/themes/Scribble/u.png
-share/gnome/gnomermind/themes/Scribble/ul.png
-share/gnome/gnomermind/themes/Scribble/ur.png
+%%DATADIR%%/themes/Classic/ABOUT
+%%DATADIR%%/themes/Classic/b.png
+%%DATADIR%%/themes/Classic/bl.png
+%%DATADIR%%/themes/Classic/br.png
+%%DATADIR%%/themes/Classic/l.png
+%%DATADIR%%/themes/Classic/mpin0.png
+%%DATADIR%%/themes/Classic/mpin1.png
+%%DATADIR%%/themes/Classic/mpin2.png
+%%DATADIR%%/themes/Classic/mpin3.png
+%%DATADIR%%/themes/Classic/mpin4.png
+%%DATADIR%%/themes/Classic/mpin5.png
+%%DATADIR%%/themes/Classic/mstt.png
+%%DATADIR%%/themes/Classic/mtok.png
+%%DATADIR%%/themes/Classic/pin0.png
+%%DATADIR%%/themes/Classic/pin1.png
+%%DATADIR%%/themes/Classic/pin2.png
+%%DATADIR%%/themes/Classic/r.png
+%%DATADIR%%/themes/Classic/stt0.png
+%%DATADIR%%/themes/Classic/stt1.png
+%%DATADIR%%/themes/Classic/stt2.png
+%%DATADIR%%/themes/Classic/stt3.png
+%%DATADIR%%/themes/Classic/tile.png
+%%DATADIR%%/themes/Classic/tok0.png
+%%DATADIR%%/themes/Classic/tok1.png
+%%DATADIR%%/themes/Classic/tok2.png
+%%DATADIR%%/themes/Classic/tok3.png
+%%DATADIR%%/themes/Classic/tok4.png
+%%DATADIR%%/themes/Classic/tok5.png
+%%DATADIR%%/themes/Classic/tok6.png
+%%DATADIR%%/themes/Classic/tok7.png
+%%DATADIR%%/themes/Classic/tok8.png
+%%DATADIR%%/themes/Classic/tok9.png
+%%DATADIR%%/themes/Classic/tokh.png
+%%DATADIR%%/themes/Classic/u.png
+%%DATADIR%%/themes/Classic/ul.png
+%%DATADIR%%/themes/Classic/ur.png
+%%DATADIR%%/themes/Pingus/ABOUT
+%%DATADIR%%/themes/Pingus/b.png
+%%DATADIR%%/themes/Pingus/bl.png
+%%DATADIR%%/themes/Pingus/br.png
+%%DATADIR%%/themes/Pingus/l.png
+%%DATADIR%%/themes/Pingus/mpin0.png
+%%DATADIR%%/themes/Pingus/mpin1.png
+%%DATADIR%%/themes/Pingus/mpin2.png
+%%DATADIR%%/themes/Pingus/mpin3.png
+%%DATADIR%%/themes/Pingus/mpin4.png
+%%DATADIR%%/themes/Pingus/mpin5.png
+%%DATADIR%%/themes/Pingus/mstt.png
+%%DATADIR%%/themes/Pingus/mtok.png
+%%DATADIR%%/themes/Pingus/pin0.png
+%%DATADIR%%/themes/Pingus/pin1.png
+%%DATADIR%%/themes/Pingus/pin2.png
+%%DATADIR%%/themes/Pingus/r.png
+%%DATADIR%%/themes/Pingus/stt0.png
+%%DATADIR%%/themes/Pingus/stt1.png
+%%DATADIR%%/themes/Pingus/stt2.png
+%%DATADIR%%/themes/Pingus/stt3.png
+%%DATADIR%%/themes/Pingus/tile.png
+%%DATADIR%%/themes/Pingus/tok0.png
+%%DATADIR%%/themes/Pingus/tok1.png
+%%DATADIR%%/themes/Pingus/tok2.png
+%%DATADIR%%/themes/Pingus/tok3.png
+%%DATADIR%%/themes/Pingus/tok4.png
+%%DATADIR%%/themes/Pingus/tok5.png
+%%DATADIR%%/themes/Pingus/tok6.png
+%%DATADIR%%/themes/Pingus/tok7.png
+%%DATADIR%%/themes/Pingus/tok8.png
+%%DATADIR%%/themes/Pingus/tok9.png
+%%DATADIR%%/themes/Pingus/tokh.png
+%%DATADIR%%/themes/Pingus/u.png
+%%DATADIR%%/themes/Pingus/ul.png
+%%DATADIR%%/themes/Pingus/ur.png
+%%DATADIR%%/themes/QMM/ABOUT
+%%DATADIR%%/themes/QMM/b.png
+%%DATADIR%%/themes/QMM/bl.png
+%%DATADIR%%/themes/QMM/br.png
+%%DATADIR%%/themes/QMM/l.png
+%%DATADIR%%/themes/QMM/mpin0.png
+%%DATADIR%%/themes/QMM/mpin1.png
+%%DATADIR%%/themes/QMM/mpin2.png
+%%DATADIR%%/themes/QMM/mpin3.png
+%%DATADIR%%/themes/QMM/mpin4.png
+%%DATADIR%%/themes/QMM/mpin5.png
+%%DATADIR%%/themes/QMM/mstt.png
+%%DATADIR%%/themes/QMM/mtok.png
+%%DATADIR%%/themes/QMM/pin0.png
+%%DATADIR%%/themes/QMM/pin1.png
+%%DATADIR%%/themes/QMM/pin2.png
+%%DATADIR%%/themes/QMM/r.png
+%%DATADIR%%/themes/QMM/stt0.png
+%%DATADIR%%/themes/QMM/stt1.png
+%%DATADIR%%/themes/QMM/stt2.png
+%%DATADIR%%/themes/QMM/stt3.png
+%%DATADIR%%/themes/QMM/tile.png
+%%DATADIR%%/themes/QMM/tok0.png
+%%DATADIR%%/themes/QMM/tok1.png
+%%DATADIR%%/themes/QMM/tok2.png
+%%DATADIR%%/themes/QMM/tok3.png
+%%DATADIR%%/themes/QMM/tok4.png
+%%DATADIR%%/themes/QMM/tok5.png
+%%DATADIR%%/themes/QMM/tok6.png
+%%DATADIR%%/themes/QMM/tok7.png
+%%DATADIR%%/themes/QMM/tok8.png
+%%DATADIR%%/themes/QMM/tok9.png
+%%DATADIR%%/themes/QMM/tokh.png
+%%DATADIR%%/themes/QMM/u.png
+%%DATADIR%%/themes/QMM/ul.png
+%%DATADIR%%/themes/QMM/ur.png
+%%DATADIR%%/themes/Scribble/ABOUT
+%%DATADIR%%/themes/Scribble/b.png
+%%DATADIR%%/themes/Scribble/bl.png
+%%DATADIR%%/themes/Scribble/br.png
+%%DATADIR%%/themes/Scribble/l.png
+%%DATADIR%%/themes/Scribble/mpin0.png
+%%DATADIR%%/themes/Scribble/mpin1.png
+%%DATADIR%%/themes/Scribble/mpin2.png
+%%DATADIR%%/themes/Scribble/mpin3.png
+%%DATADIR%%/themes/Scribble/mpin4.png
+%%DATADIR%%/themes/Scribble/mpin5.png
+%%DATADIR%%/themes/Scribble/mstt.png
+%%DATADIR%%/themes/Scribble/mtok.png
+%%DATADIR%%/themes/Scribble/pin0.png
+%%DATADIR%%/themes/Scribble/pin1.png
+%%DATADIR%%/themes/Scribble/pin2.png
+%%DATADIR%%/themes/Scribble/r.png
+%%DATADIR%%/themes/Scribble/stt0.png
+%%DATADIR%%/themes/Scribble/stt1.png
+%%DATADIR%%/themes/Scribble/stt2.png
+%%DATADIR%%/themes/Scribble/stt3.png
+%%DATADIR%%/themes/Scribble/tile.png
+%%DATADIR%%/themes/Scribble/tok0.png
+%%DATADIR%%/themes/Scribble/tok1.png
+%%DATADIR%%/themes/Scribble/tok2.png
+%%DATADIR%%/themes/Scribble/tok3.png
+%%DATADIR%%/themes/Scribble/tok4.png
+%%DATADIR%%/themes/Scribble/tok5.png
+%%DATADIR%%/themes/Scribble/tok6.png
+%%DATADIR%%/themes/Scribble/tok7.png
+%%DATADIR%%/themes/Scribble/tok8.png
+%%DATADIR%%/themes/Scribble/tok9.png
+%%DATADIR%%/themes/Scribble/tokh.png
+%%DATADIR%%/themes/Scribble/u.png
+%%DATADIR%%/themes/Scribble/ul.png
+%%DATADIR%%/themes/Scribble/ur.png
 share/gnome/help/gnomermind/C/authors.html
 share/gnome/help/gnomermind/C/bugs.html
 share/gnome/help/gnomermind/C/docbook.css
@@ -173,13 +173,13 @@ share/gnome/help/gnomermind/C/topic.dat
 share/gnome/help/gnomermind/C/usage.html
 share/gnome/help/gnomermind/C/x167.html
 share/gnome/help/gnomermind/C/x394.html
-share/gnome/pixmaps/gnomermind.png
-share/gnome/sounds/gnomermind/gm-fail.wav
-share/gnome/sounds/gnomermind/gm-guess.wav
-share/gnome/sounds/gnomermind/gm-pickup.wav
-share/gnome/sounds/gnomermind/gm-putdown.wav
-share/gnome/sounds/gnomermind/gm-reset.wav
-share/gnome/sounds/gnomermind/gm-success.wav
+share/pixmaps/gnomermind.png
+share/sounds/gnomermind/gm-fail.wav
+share/sounds/gnomermind/gm-guess.wav
+share/sounds/gnomermind/gm-pickup.wav
+share/sounds/gnomermind/gm-putdown.wav
+share/sounds/gnomermind/gm-reset.wav
+share/sounds/gnomermind/gm-success.wav
 share/locale/de/LC_MESSAGES/gnomermind.mo
 share/locale/es/LC_MESSAGES/gnomermind.mo
 share/locale/fr/LC_MESSAGES/gnomermind.mo
@@ -192,14 +192,14 @@ share/locale/sk/LC_MESSAGES/gnomermind.mo
 share/locale/sv/LC_MESSAGES/gnomermind.mo
 share/locale/tr/LC_MESSAGES/gnomermind.mo
 share/locale/zh_TW/LC_MESSAGES/gnomermind.mo
-@dirrm share/gnome/sounds/gnomermind
+@dirrm share/sounds/gnomermind
 @dirrm share/gnome/help/gnomermind/C/stylesheet-images
 @dirrm share/gnome/help/gnomermind/C
 @dirrm share/gnome/help/gnomermind
-@dirrm share/gnome/gnomermind/themes/Scribble
-@dirrm share/gnome/gnomermind/themes/QMM
-@dirrm share/gnome/gnomermind/themes/Pingus
-@dirrm share/gnome/gnomermind/themes/Classic
-@dirrm share/gnome/gnomermind/themes
-@dirrm share/gnome/gnomermind
+@dirrm %%DATADIR%%/themes/Scribble
+@dirrm %%DATADIR%%/themes/QMM
+@dirrm %%DATADIR%%/themes/Pingus
+@dirrm %%DATADIR%%/themes/Classic
+@dirrm %%DATADIR%%/themes
+@dirrm %%DATADIR%%
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/games/gretools/Makefile b/games/gretools/Makefile
index 63de768cdce9..9fa431ab5bcf 100644
--- a/games/gretools/Makefile
+++ b/games/gretools/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gretools
 PORTVERSION=	1.2.4
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	games gnome
 MASTER_SITES=	http://www.cs.utexas.edu/~arvindn/gretools/%SUBDIR%/
 MASTER_SITE_SUBDIR=	${PORTVERSION:R}
@@ -27,7 +27,6 @@ post-patch:
 		 s|@prefix@/share/|@datadir@/|g' ${WRKSRC}/gretools.in
 	@${REINPLACE_CMD} -e 's|gtk\.TRUE|True|g ; \
 		 s|gtk\.FALSE|False|g ; \
-		 s|"/share/"|"/share/gnome/"|g ; \
 		 s|gtk\.idle_add|gobject\.idle_add|g' ${WRKSRC}/gretools.py
 
 .include <bsd.port.mk>
diff --git a/games/gretools/pkg-plist b/games/gretools/pkg-plist
index a619a50743c0..59e888a42a54 100644
--- a/games/gretools/pkg-plist
+++ b/games/gretools/pkg-plist
@@ -3,21 +3,22 @@ bin/gretools
 %%PYTHON_SITELIBDIR%%/gretools/gretools.py
 %%PYTHON_SITELIBDIR%%/gretools/gretools.pyc
 %%PYTHON_SITELIBDIR%%/gretools/gretools.pyo
-share/gnome/applications/gretools.desktop
-share/gnome/gretools/glade/gretools.glade
-share/gnome/gretools/lists/default.wl
+share/applications/gretools.desktop
+share/gretools/glade/gretools.glade
+share/gretools/lists/default.wl
 share/gnome/help/gretools/C/figures/gretools_start_window.png
 share/gnome/help/gretools/C/gretools.xml
 share/gnome/help/gretools/C/legal.xml
-share/gnome/omf/gretools/gretools-C.omf
-share/gnome/pixmaps/gretools.png
-@dirrm share/gnome/omf/gretools
+share/omf/gretools/gretools-C.omf
+share/pixmaps/gretools.png
+@dirrm share/omf/gretools
 @dirrm share/gnome/help/gretools/C/figures
 @dirrm share/gnome/help/gretools/C
 @dirrm share/gnome/help/gretools
-@dirrm share/gnome/gretools/lists
-@dirrm share/gnome/gretools/glade
-@dirrm share/gnome/gretools
+@dirrm share/gretools/lists
+@dirrm share/gretools/glade
+@dirrm share/gretools
 @dirrm %%PYTHON_SITELIBDIR%%/gretools
 @dirrmtry %%PYTHON_SITELIBDIR%%
 @dirrmtry %%PYTHON_LIBDIR%%
+@dirrmtry share/applications
diff --git a/games/grhino/Makefile b/games/grhino/Makefile
index 6588b16e7fa9..4a08ea8086a8 100644
--- a/games/grhino/Makefile
+++ b/games/grhino/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	grhino
 PORTVERSION=	0.16.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	rhino
diff --git a/games/grhino/files/patch-Makefile.in b/games/grhino/files/patch-Makefile.in
deleted file mode 100644
index 726a1abc7fe0..000000000000
--- a/games/grhino/files/patch-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in.orig	Sun Nov 26 02:07:41 2006
-+++ Makefile.in	Sat Dec 16 22:49:11 2006
-@@ -44,7 +44,7 @@
- etcdir		= @sysconfdir@
- datadir		= @datadir@
- localedir	= @datadir@/locale
--helpdir		= @datadir@/gnome/help/grhino
-+helpdir		= @datadir@/help/grhino
- omfdir		= @datadir@/omf/grhino
- icon_dir	= @datadir@/pixmaps
- 
diff --git a/games/grhino/pkg-plist b/games/grhino/pkg-plist
index 4e15417aee91..c99d22e0a736 100644
--- a/games/grhino/pkg-plist
+++ b/games/grhino/pkg-plist
@@ -1,30 +1,30 @@
 bin/grhino
 bin/gtp-rhino
-share/gnome/grhino-%%VERSION%%/pattern/row1.bin
-share/gnome/grhino-%%VERSION%%/pattern/row2.bin
-share/gnome/grhino-%%VERSION%%/pattern/row3.bin
-share/gnome/grhino-%%VERSION%%/pattern/row4.bin
-share/gnome/grhino-%%VERSION%%/pattern/diag1.bin
-share/gnome/grhino-%%VERSION%%/pattern/diag2.bin
-share/gnome/grhino-%%VERSION%%/pattern/diag3.bin
-share/gnome/grhino-%%VERSION%%/pattern/diag4.bin
-share/gnome/grhino-%%VERSION%%/pattern/diag5.bin
-share/gnome/grhino-%%VERSION%%/pattern/corner5x2.bin
-share/gnome/grhino-%%VERSION%%/book/book.bin
-share/gnome/grhino-%%VERSION%%/theme/small/black.xpm
-share/gnome/grhino-%%VERSION%%/theme/small/black_last.xpm
-share/gnome/grhino-%%VERSION%%/theme/small/bottom.xpm
-share/gnome/grhino-%%VERSION%%/theme/small/empty.xpm
-share/gnome/grhino-%%VERSION%%/theme/small/highlight_black.xpm
-share/gnome/grhino-%%VERSION%%/theme/small/highlight_empty.xpm
-share/gnome/grhino-%%VERSION%%/theme/small/highlight_white.xpm
-share/gnome/grhino-%%VERSION%%/theme/small/hint_black.xpm
-share/gnome/grhino-%%VERSION%%/theme/small/hint_white.xpm
-share/gnome/grhino-%%VERSION%%/theme/small/left.xpm
-share/gnome/grhino-%%VERSION%%/theme/small/right.xpm
-share/gnome/grhino-%%VERSION%%/theme/small/top.xpm
-share/gnome/grhino-%%VERSION%%/theme/small/white.xpm
-share/gnome/grhino-%%VERSION%%/theme/small/white_last.xpm
+share/grhino-%%VERSION%%/pattern/row1.bin
+share/grhino-%%VERSION%%/pattern/row2.bin
+share/grhino-%%VERSION%%/pattern/row3.bin
+share/grhino-%%VERSION%%/pattern/row4.bin
+share/grhino-%%VERSION%%/pattern/diag1.bin
+share/grhino-%%VERSION%%/pattern/diag2.bin
+share/grhino-%%VERSION%%/pattern/diag3.bin
+share/grhino-%%VERSION%%/pattern/diag4.bin
+share/grhino-%%VERSION%%/pattern/diag5.bin
+share/grhino-%%VERSION%%/pattern/corner5x2.bin
+share/grhino-%%VERSION%%/book/book.bin
+share/grhino-%%VERSION%%/theme/small/black.xpm
+share/grhino-%%VERSION%%/theme/small/black_last.xpm
+share/grhino-%%VERSION%%/theme/small/bottom.xpm
+share/grhino-%%VERSION%%/theme/small/empty.xpm
+share/grhino-%%VERSION%%/theme/small/highlight_black.xpm
+share/grhino-%%VERSION%%/theme/small/highlight_empty.xpm
+share/grhino-%%VERSION%%/theme/small/highlight_white.xpm
+share/grhino-%%VERSION%%/theme/small/hint_black.xpm
+share/grhino-%%VERSION%%/theme/small/hint_white.xpm
+share/grhino-%%VERSION%%/theme/small/left.xpm
+share/grhino-%%VERSION%%/theme/small/right.xpm
+share/grhino-%%VERSION%%/theme/small/top.xpm
+share/grhino-%%VERSION%%/theme/small/white.xpm
+share/grhino-%%VERSION%%/theme/small/white_last.xpm
 share/gnome/help/grhino/C/grhino.xml
 share/gnome/help/grhino/C/legal.xml
 share/gnome/help/grhino/C/figures/gamelist.png
@@ -35,15 +35,15 @@ share/gnome/help/grhino/C/figures/prefs-ai.png
 share/gnome/help/grhino/C/figures/prefs-board.png
 share/gnome/help/grhino/C/figures/prefs-theme.png
 share/gnome/help/grhino/C/figures/toolbar-edit.png
-share/gnome/omf/grhino/grhino-C.omf
-share/gnome/pixmaps/grhino.png
+share/omf/grhino/grhino-C.omf
+share/pixmaps/grhino.png
 share/locale/en_GB/LC_MESSAGES/grhino.mo
-@dirrm share/gnome/omf/grhino
+@dirrm share/omf/grhino
 @dirrm share/gnome/help/grhino/C/figures
 @dirrm share/gnome/help/grhino/C
 @dirrm share/gnome/help/grhino
-@dirrm share/gnome/grhino-%%VERSION%%/theme/small
-@dirrm share/gnome/grhino-%%VERSION%%/theme
-@dirrm share/gnome/grhino-%%VERSION%%/book
-@dirrm share/gnome/grhino-%%VERSION%%/pattern
-@dirrm share/gnome/grhino-%%VERSION%%
+@dirrm share/grhino-%%VERSION%%/theme/small
+@dirrm share/grhino-%%VERSION%%/theme
+@dirrm share/grhino-%%VERSION%%/book
+@dirrm share/grhino-%%VERSION%%/pattern
+@dirrm share/grhino-%%VERSION%%
diff --git a/games/gtetrinet/Makefile b/games/gtetrinet/Makefile
index ddcad623123f..9525f08f4227 100644
--- a/games/gtetrinet/Makefile
+++ b/games/gtetrinet/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	gtetrinet
 PORTVERSION=	0.7.11
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games gnome ipv6
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:R}
diff --git a/games/gtetrinet/pkg-plist b/games/gtetrinet/pkg-plist
index 2d6b6766ecfa..a7050679c289 100644
--- a/games/gtetrinet/pkg-plist
+++ b/games/gtetrinet/pkg-plist
@@ -1,12 +1,12 @@
 bin/gtetrinet
-share/gnome/applications/gtetrinet.desktop
-share/gnome/gtetrinet/themes/default/blocks.png
-share/gnome/gtetrinet/themes/default/theme.cfg
-share/gnome/gtetrinet/themes/small/blocks.png
-share/gnome/gtetrinet/themes/small/theme.cfg
-share/gnome/pixmaps/gtetrinet/alone.png
-share/gnome/pixmaps/gtetrinet/team.png
-share/gnome/pixmaps/gtetrinet.png
+share/applications/gtetrinet.desktop
+share/gtetrinet/themes/default/blocks.png
+share/gtetrinet/themes/default/theme.cfg
+share/gtetrinet/themes/small/blocks.png
+share/gtetrinet/themes/small/theme.cfg
+share/pixmaps/gtetrinet/alone.png
+share/pixmaps/gtetrinet/team.png
+share/pixmaps/gtetrinet.png
 share/locale/am/LC_MESSAGES/gtetrinet.mo
 share/locale/az/LC_MESSAGES/gtetrinet.mo
 share/locale/bg/LC_MESSAGES/gtetrinet.mo
@@ -46,8 +46,9 @@ share/locale/vi/LC_MESSAGES/gtetrinet.mo
 share/locale/zh_CN/LC_MESSAGES/gtetrinet.mo
 share/locale/zh_HK/LC_MESSAGES/gtetrinet.mo
 share/locale/zh_TW/LC_MESSAGES/gtetrinet.mo
-@dirrm share/gnome/gtetrinet/themes/small
-@dirrm share/gnome/gtetrinet/themes/default
-@dirrm share/gnome/gtetrinet/themes
-@dirrm share/gnome/gtetrinet
-@dirrm share/gnome/pixmaps/gtetrinet
+@dirrm share/gtetrinet/themes/small
+@dirrm share/gtetrinet/themes/default
+@dirrm share/gtetrinet/themes
+@dirrm share/gtetrinet
+@dirrm share/pixmaps/gtetrinet
+@dirrmtry share/applications
diff --git a/games/gtktetcolor/Makefile b/games/gtktetcolor/Makefile
index 8548d16407f1..e231c900129d 100644
--- a/games/gtktetcolor/Makefile
+++ b/games/gtktetcolor/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gtktetcolor
 PORTVERSION=	0.6.4
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	games gnome
 MASTER_SITES=	${MASTER_SITE_SUNSITE} \
 		http://www.dvgu.ru/ifit/~panov/gtktetcolor/
diff --git a/games/gtktetcolor/pkg-plist b/games/gtktetcolor/pkg-plist
index ed9814386e5e..855130b0dfe1 100644
--- a/games/gtktetcolor/pkg-plist
+++ b/games/gtktetcolor/pkg-plist
@@ -1,12 +1,13 @@
 bin/gtktetcolor
 etc/sound/events/gtktetcolor.soundlist
-share/gnome/applications/gtktetcolor.desktop
-share/gnome/games/gtktetcolor.scores
-share/gnome/pixmaps/gtktetcolor.xpm
-share/gnome/sounds/gtktetcolor/bonus.wav
-share/gnome/sounds/gtktetcolor/gameover.wav
-share/gnome/sounds/gtktetcolor/linerem.wav
+share/applications/gtktetcolor.desktop
+share/games/gtktetcolor.scores
+share/pixmaps/gtktetcolor.xpm
+share/sounds/gtktetcolor/bonus.wav
+share/sounds/gtktetcolor/gameover.wav
+share/sounds/gtktetcolor/linerem.wav
 share/locale/de/LC_MESSAGES/gtktetcolor.mo
 share/locale/fr/LC_MESSAGES/gtktetcolor.mo
 share/locale/ru/LC_MESSAGES/gtktetcolor.mo
-@dirrm share/gnome/sounds/gtktetcolor
+@dirrm share/sounds/gtktetcolor
+@dirrmtry share/applications
diff --git a/games/gturing/Makefile b/games/gturing/Makefile
index a644bf2e1927..54faa4b82891 100644
--- a/games/gturing/Makefile
+++ b/games/gturing/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gturing
 PORTVERSION=	0.1.1
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	games gnome
 MASTER_SITES=	ftp://ftp.gnome.org/pub/gnome/sources/gturing/0.1/
 
diff --git a/games/gturing/files/patch-Makefile.in b/games/gturing/files/patch-Makefile.in
index 255d4a6a5933..ce64ab59fdba 100644
--- a/games/gturing/files/patch-Makefile.in
+++ b/games/gturing/files/patch-Makefile.in
@@ -4,7 +4,7 @@
  
  SUBDIRS = pixmaps tapes po src help
  
--desktopdir = $(datadir)/apps/Applications
+-desktopdir = $(datadir)/gnome/apps/Applications
 +desktopdir = $(datadir)/applications
  desktop_in_files = gturing.desktop.in
  desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
diff --git a/games/gturing/pkg-plist b/games/gturing/pkg-plist
index d7c149ba67b4..22fab6acd585 100644
--- a/games/gturing/pkg-plist
+++ b/games/gturing/pkg-plist
@@ -19,16 +19,16 @@ bin/gturing
 %%EXAMPLESDIR%%/dec2bin_shift.tur
 %%EXAMPLESDIR%%/sort.tur
 %%EXAMPLESDIR%%/subst.tur
-share/gnome/applications/gturing.desktop
+share/applications/gturing.desktop
 share/gnome/help/gturing/C/figures/mainwin.png
 share/gnome/help/gturing/C/gturing.xml
 share/gnome/help/gturing/C/legal.xml
-share/gnome/omf/gturing/gturing-C.omf
-share/gnome/pixmaps/gnome-gturing.png
-share/gnome/pixmaps/play.xpm
-share/gnome/pixmaps/power.xpm
-share/gnome/pixmaps/step.xpm
-share/gnome/pixmaps/stop.xpm
+share/omf/gturing/gturing-C.omf
+share/pixmaps/gnome-gturing.png
+share/pixmaps/play.xpm
+share/pixmaps/power.xpm
+share/pixmaps/step.xpm
+share/pixmaps/stop.xpm
 share/locale/az/LC_MESSAGES/gturing-2.0.mo
 share/locale/cs/LC_MESSAGES/gturing-2.0.mo
 share/locale/da/LC_MESSAGES/gturing-2.0.mo
@@ -61,9 +61,10 @@ share/locale/vi/LC_MESSAGES/gturing-2.0.mo
 share/locale/wa/LC_MESSAGES/gturing-2.0.mo
 share/locale/zh_CN/LC_MESSAGES/gturing-2.0.mo
 share/locale/zh_TW/LC_MESSAGES/gturing-2.0.mo
-@dirrm share/gnome/omf/gturing
+@dirrm share/omf/gturing
 @dirrm share/gnome/help/gturing/C/figures
 @dirrm share/gnome/help/gturing/C
 @dirrm share/gnome/help/gturing
 @dirrm %%EXAMPLESDIR%%
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrmtry share/applications
diff --git a/games/gweled/Makefile b/games/gweled/Makefile
index 04b3728bc6cc..4eb3d7fb8846 100644
--- a/games/gweled/Makefile
+++ b/games/gweled/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gweled
 PORTVERSION=	0.7
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	games gnome
 MASTER_SITES=	http://sebdelestaing.free.fr/gweled/Release/
 
@@ -22,7 +22,7 @@ USE_GNOME=	gnomeprefix gnomehack gnomehier libgnomeui librsvg2
 GNU_CONFIGURE=	yes
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|/var/games|${PREFIX}/share/gnome/games|' \
+	@${REINPLACE_CMD} -e 's|/var/games|${PREFIX}/share/games|' \
 		${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|$${MKDIRPROG-mkdir}|mkdir -p|' \
 		${WRKSRC}/install-sh
diff --git a/games/gweled/pkg-install b/games/gweled/pkg-install
index 04fcca9ba5f7..8c40e3417f50 100644
--- a/games/gweled/pkg-install
+++ b/games/gweled/pkg-install
@@ -1,13 +1,13 @@
 #!/bin/sh
 
 if [ "$2" = "POST-INSTALL" ]; then
-    mkdir -p ${PKG_PREFIX}/share/gnome/games
+    mkdir -p ${PKG_PREFIX}/share/games
     SCORES="gweled.easy.scores gweled.timed.scores"
     for i in ${SCORES}; do
-	if [ ! -f ${PKG_PREFIX}/share/gnome/games/${i} ]; then
-	    touch -f ${PKG_PREFIX}/share/gnome/games/${i}
-	    chown games:games ${PKG_PREFIX}/share/gnome/games/${i}
-	    chmod 0664 ${PKG_PREFIX}/share/gnome/games/${i}
+	if [ ! -f ${PKG_PREFIX}/share/games/${i} ]; then
+	    touch -f ${PKG_PREFIX}/share/games/${i}
+	    chown games:games ${PKG_PREFIX}/share/games/${i}
+	    chmod 0664 ${PKG_PREFIX}/share/games/${i}
 	fi
     done
 fi
diff --git a/games/gweled/pkg-plist b/games/gweled/pkg-plist
index d508a53e6d80..2e31b62b3a7f 100644
--- a/games/gweled/pkg-plist
+++ b/games/gweled/pkg-plist
@@ -1,26 +1,27 @@
 bin/gweled
-share/gnome/applications/gweled.desktop
-@unexec [ -s %D/share/gnome/games/gweled.easy.scores ] || rm -f %D/share/gnome/games/gweled.easy.scores
-@unexec [ -s %D/share/gnome/games/gweled.timed.scores ] || rm -f %D/share/gnome/games/gweled.timed.scores
-share/gnome/gweled/gweled.glade
-share/gnome/gweled/gweled_icon.png
-share/gnome/gweled/gweled_logo.png
-share/gnome/pixmaps/gweled.png
-share/gnome/pixmaps/gweled/cursor.svg
-share/gnome/pixmaps/gweled/font_24_20.png
-share/gnome/pixmaps/gweled/font_48_40.png
-share/gnome/pixmaps/gweled/gem01.svg
-share/gnome/pixmaps/gweled/gem02.svg
-share/gnome/pixmaps/gweled/gem03.svg
-share/gnome/pixmaps/gweled/gem04.svg
-share/gnome/pixmaps/gweled/gem05.svg
-share/gnome/pixmaps/gweled/gem06.svg
-share/gnome/pixmaps/gweled/gem07.svg
-share/gnome/pixmaps/gweled/tile_even.svg
-share/gnome/pixmaps/gweled/tile_odd.svg
-share/gnome/sounds/gweled/autonom.s3m
-share/gnome/sounds/gweled/click.wav
-share/gnome/sounds/gweled/swap.wav
-@dirrm share/gnome/sounds/gweled
-@dirrm share/gnome/pixmaps/gweled
-@dirrm share/gnome/gweled
+share/applications/gweled.desktop
+@unexec [ -s %D/share/games/gweled.easy.scores ] || rm -f %D/share/games/gweled.easy.scores
+@unexec [ -s %D/share/games/gweled.timed.scores ] || rm -f %D/share/games/gweled.timed.scores
+share/gweled/gweled.glade
+share/gweled/gweled_icon.png
+share/gweled/gweled_logo.png
+share/pixmaps/gweled.png
+share/pixmaps/gweled/cursor.svg
+share/pixmaps/gweled/font_24_20.png
+share/pixmaps/gweled/font_48_40.png
+share/pixmaps/gweled/gem01.svg
+share/pixmaps/gweled/gem02.svg
+share/pixmaps/gweled/gem03.svg
+share/pixmaps/gweled/gem04.svg
+share/pixmaps/gweled/gem05.svg
+share/pixmaps/gweled/gem06.svg
+share/pixmaps/gweled/gem07.svg
+share/pixmaps/gweled/tile_even.svg
+share/pixmaps/gweled/tile_odd.svg
+share/sounds/gweled/autonom.s3m
+share/sounds/gweled/click.wav
+share/sounds/gweled/swap.wav
+@dirrm share/sounds/gweled
+@dirrm share/pixmaps/gweled
+@dirrm share/gweled
+@dirrmtry share/applications
diff --git a/games/monkeybubble/Makefile b/games/monkeybubble/Makefile
index 429cbafc1cd0..9399ca422cfc 100644
--- a/games/monkeybubble/Makefile
+++ b/games/monkeybubble/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	monkeybubble
 PORTVERSION=	0.4.0
+PORTREVISION=	1
 CATEGORIES=	games gnome
 MASTER_SITES=	http://home.gna.org/monkeybubble/downloads/
 DISTNAME=	monkey-bubble-${PORTVERSION}
diff --git a/games/monkeybubble/pkg-plist b/games/monkeybubble/pkg-plist
index 9846b965f0e5..9b24c1cac61b 100644
--- a/games/monkeybubble/pkg-plist
+++ b/games/monkeybubble/pkg-plist
@@ -1,153 +1,153 @@
 bin/monkey-bubble
 bin/monkey-srv
-share/gnome/applications/monkey-bubble.desktop
+share/applications/monkey-bubble.desktop
 share/gnome/help/monkey-bubble/C/monkey-bubble.xml
 share/gnome/help/monkey-bubble/fr/monkey-bubble.xml
-share/gnome/monkey-bubble/gfx/banana.svg
-share/gnome/monkey-bubble/gfx/bubbles/bubble_01.svg
-share/gnome/monkey-bubble/gfx/bubbles/bubble_02.svg
-share/gnome/monkey-bubble/gfx/bubbles/bubble_03.svg
-share/gnome/monkey-bubble/gfx/bubbles/bubble_04.svg
-share/gnome/monkey-bubble/gfx/bubbles/bubble_05.svg
-share/gnome/monkey-bubble/gfx/bubbles/bubble_06.svg
-share/gnome/monkey-bubble/gfx/bubbles/bubble_07.svg
-share/gnome/monkey-bubble/gfx/bubbles/bubble_08.svg
-share/gnome/monkey-bubble/gfx/bubbles/little_bubble_01.svg
-share/gnome/monkey-bubble/gfx/bubbles/little_bubble_02.svg
-share/gnome/monkey-bubble/gfx/bubbles/little_bubble_03.svg
-share/gnome/monkey-bubble/gfx/bubbles/little_bubble_04.svg
-share/gnome/monkey-bubble/gfx/bubbles/little_bubble_05.svg
-share/gnome/monkey-bubble/gfx/bubbles/little_bubble_06.svg
-share/gnome/monkey-bubble/gfx/bubbles/little_bubble_07.svg
-share/gnome/monkey-bubble/gfx/bubbles/little_bubble_08.svg
-share/gnome/monkey-bubble/gfx/frozen-bubble/back_hiscores.png
-share/gnome/monkey-bubble/gfx/harm.svg
-share/gnome/monkey-bubble/gfx/harm_down.svg
-share/gnome/monkey-bubble/gfx/harm_shoot.svg
-share/gnome/monkey-bubble/gfx/harm_up.svg
-share/gnome/monkey-bubble/gfx/hurry_up.svg
-share/gnome/monkey-bubble/gfx/layout_1_player.svg
-share/gnome/monkey-bubble/gfx/layout_2_players.svg
-share/gnome/monkey-bubble/gfx/layout_network_player.svg
-share/gnome/monkey-bubble/gfx/left_monkey.svg
-share/gnome/monkey-bubble/gfx/looser.svg
-share/gnome/monkey-bubble/gfx/lost.svg
-share/gnome/monkey-bubble/gfx/monkey.png
-share/gnome/monkey-bubble/gfx/number/0.svg
-share/gnome/monkey-bubble/gfx/number/1.svg
-share/gnome/monkey-bubble/gfx/number/2.svg
-share/gnome/monkey-bubble/gfx/number/3.svg
-share/gnome/monkey-bubble/gfx/number/4.svg
-share/gnome/monkey-bubble/gfx/number/5.svg
-share/gnome/monkey-bubble/gfx/number/6.svg
-share/gnome/monkey-bubble/gfx/number/7.svg
-share/gnome/monkey-bubble/gfx/number/8.svg
-share/gnome/monkey-bubble/gfx/number/9.svg
-share/gnome/monkey-bubble/gfx/pane.svg
-share/gnome/monkey-bubble/gfx/pause.svg
-share/gnome/monkey-bubble/gfx/right_monkey.svg
-share/gnome/monkey-bubble/gfx/snake/snake.svg
-share/gnome/monkey-bubble/gfx/snake/snake_-0.svg
-share/gnome/monkey-bubble/gfx/snake/snake_-1.svg
-share/gnome/monkey-bubble/gfx/snake/snake_-10.svg
-share/gnome/monkey-bubble/gfx/snake/snake_-11.svg
-share/gnome/monkey-bubble/gfx/snake/snake_-12.svg
-share/gnome/monkey-bubble/gfx/snake/snake_-13.svg
-share/gnome/monkey-bubble/gfx/snake/snake_-14.svg
-share/gnome/monkey-bubble/gfx/snake/snake_-15.svg
-share/gnome/monkey-bubble/gfx/snake/snake_-16.svg
-share/gnome/monkey-bubble/gfx/snake/snake_-17.svg
-share/gnome/monkey-bubble/gfx/snake/snake_-18.svg
-share/gnome/monkey-bubble/gfx/snake/snake_-19.svg
-share/gnome/monkey-bubble/gfx/snake/snake_-2.svg
-share/gnome/monkey-bubble/gfx/snake/snake_-20.svg
-share/gnome/monkey-bubble/gfx/snake/snake_-21.svg
-share/gnome/monkey-bubble/gfx/snake/snake_-22.svg
-share/gnome/monkey-bubble/gfx/snake/snake_-23.svg
-share/gnome/monkey-bubble/gfx/snake/snake_-24.svg
-share/gnome/monkey-bubble/gfx/snake/snake_-25.svg
-share/gnome/monkey-bubble/gfx/snake/snake_-26.svg
-share/gnome/monkey-bubble/gfx/snake/snake_-27.svg
-share/gnome/monkey-bubble/gfx/snake/snake_-28.svg
-share/gnome/monkey-bubble/gfx/snake/snake_-29.svg
-share/gnome/monkey-bubble/gfx/snake/snake_-3.svg
-share/gnome/monkey-bubble/gfx/snake/snake_-30.svg
-share/gnome/monkey-bubble/gfx/snake/snake_-31.svg
-share/gnome/monkey-bubble/gfx/snake/snake_-32.svg
-share/gnome/monkey-bubble/gfx/snake/snake_-33.svg
-share/gnome/monkey-bubble/gfx/snake/snake_-34.svg
-share/gnome/monkey-bubble/gfx/snake/snake_-35.svg
-share/gnome/monkey-bubble/gfx/snake/snake_-36.svg
-share/gnome/monkey-bubble/gfx/snake/snake_-37.svg
-share/gnome/monkey-bubble/gfx/snake/snake_-38.svg
-share/gnome/monkey-bubble/gfx/snake/snake_-39.svg
-share/gnome/monkey-bubble/gfx/snake/snake_-4.svg
-share/gnome/monkey-bubble/gfx/snake/snake_-40.svg
-share/gnome/monkey-bubble/gfx/snake/snake_-5.svg
-share/gnome/monkey-bubble/gfx/snake/snake_-6.svg
-share/gnome/monkey-bubble/gfx/snake/snake_-7.svg
-share/gnome/monkey-bubble/gfx/snake/snake_-8.svg
-share/gnome/monkey-bubble/gfx/snake/snake_-9.svg
-share/gnome/monkey-bubble/gfx/snake/snake_0.svg
-share/gnome/monkey-bubble/gfx/snake/snake_1.svg
-share/gnome/monkey-bubble/gfx/snake/snake_10.svg
-share/gnome/monkey-bubble/gfx/snake/snake_11.svg
-share/gnome/monkey-bubble/gfx/snake/snake_12.svg
-share/gnome/monkey-bubble/gfx/snake/snake_13.svg
-share/gnome/monkey-bubble/gfx/snake/snake_14.svg
-share/gnome/monkey-bubble/gfx/snake/snake_15.svg
-share/gnome/monkey-bubble/gfx/snake/snake_16.svg
-share/gnome/monkey-bubble/gfx/snake/snake_17.svg
-share/gnome/monkey-bubble/gfx/snake/snake_18.svg
-share/gnome/monkey-bubble/gfx/snake/snake_19.svg
-share/gnome/monkey-bubble/gfx/snake/snake_2.svg
-share/gnome/monkey-bubble/gfx/snake/snake_20.svg
-share/gnome/monkey-bubble/gfx/snake/snake_21.svg
-share/gnome/monkey-bubble/gfx/snake/snake_22.svg
-share/gnome/monkey-bubble/gfx/snake/snake_23.svg
-share/gnome/monkey-bubble/gfx/snake/snake_24.svg
-share/gnome/monkey-bubble/gfx/snake/snake_25.svg
-share/gnome/monkey-bubble/gfx/snake/snake_26.svg
-share/gnome/monkey-bubble/gfx/snake/snake_27.svg
-share/gnome/monkey-bubble/gfx/snake/snake_28.svg
-share/gnome/monkey-bubble/gfx/snake/snake_29.svg
-share/gnome/monkey-bubble/gfx/snake/snake_3.svg
-share/gnome/monkey-bubble/gfx/snake/snake_30.svg
-share/gnome/monkey-bubble/gfx/snake/snake_31.svg
-share/gnome/monkey-bubble/gfx/snake/snake_32.svg
-share/gnome/monkey-bubble/gfx/snake/snake_33.svg
-share/gnome/monkey-bubble/gfx/snake/snake_34.svg
-share/gnome/monkey-bubble/gfx/snake/snake_35.svg
-share/gnome/monkey-bubble/gfx/snake/snake_36.svg
-share/gnome/monkey-bubble/gfx/snake/snake_37.svg
-share/gnome/monkey-bubble/gfx/snake/snake_38.svg
-share/gnome/monkey-bubble/gfx/snake/snake_39.svg
-share/gnome/monkey-bubble/gfx/snake/snake_4.svg
-share/gnome/monkey-bubble/gfx/snake/snake_40.svg
-share/gnome/monkey-bubble/gfx/snake/snake_5.svg
-share/gnome/monkey-bubble/gfx/snake/snake_6.svg
-share/gnome/monkey-bubble/gfx/snake/snake_7.svg
-share/gnome/monkey-bubble/gfx/snake/snake_8.svg
-share/gnome/monkey-bubble/gfx/snake/snake_9.svg
-share/gnome/monkey-bubble/gfx/snake-body.svg
-share/gnome/monkey-bubble/gfx/splash.svg
-share/gnome/monkey-bubble/gfx/star.svg
-share/gnome/monkey-bubble/gfx/tomato.svg
-share/gnome/monkey-bubble/gfx/win.svg
-share/gnome/monkey-bubble/glade/keybinding.glade
-share/gnome/monkey-bubble/glade/monkey-bubble.glade
-share/gnome/monkey-bubble/glade/netgame.glade
-share/gnome/monkey-bubble/glade/netserver.glade
-share/gnome/monkey-bubble/levels
-share/gnome/monkey-bubble/sounds/destroy_group.wav
-share/gnome/monkey-bubble/sounds/game.ogg
-share/gnome/monkey-bubble/sounds/launch.wav
-share/gnome/monkey-bubble/sounds/rebound.wav
-share/gnome/monkey-bubble/sounds/splash.ogg
-share/gnome/monkey-bubble/sounds/stick.wav
-share/gnome/omf/monkey-bubble/monkey-bubble-C.omf
-share/gnome/omf/monkey-bubble/monkey-bubble-fr.omf
-share/gnome/pixmaps/monkey-bubble-icon.png
+share/monkey-bubble/gfx/banana.svg
+share/monkey-bubble/gfx/bubbles/bubble_01.svg
+share/monkey-bubble/gfx/bubbles/bubble_02.svg
+share/monkey-bubble/gfx/bubbles/bubble_03.svg
+share/monkey-bubble/gfx/bubbles/bubble_04.svg
+share/monkey-bubble/gfx/bubbles/bubble_05.svg
+share/monkey-bubble/gfx/bubbles/bubble_06.svg
+share/monkey-bubble/gfx/bubbles/bubble_07.svg
+share/monkey-bubble/gfx/bubbles/bubble_08.svg
+share/monkey-bubble/gfx/bubbles/little_bubble_01.svg
+share/monkey-bubble/gfx/bubbles/little_bubble_02.svg
+share/monkey-bubble/gfx/bubbles/little_bubble_03.svg
+share/monkey-bubble/gfx/bubbles/little_bubble_04.svg
+share/monkey-bubble/gfx/bubbles/little_bubble_05.svg
+share/monkey-bubble/gfx/bubbles/little_bubble_06.svg
+share/monkey-bubble/gfx/bubbles/little_bubble_07.svg
+share/monkey-bubble/gfx/bubbles/little_bubble_08.svg
+share/monkey-bubble/gfx/frozen-bubble/back_hiscores.png
+share/monkey-bubble/gfx/harm.svg
+share/monkey-bubble/gfx/harm_down.svg
+share/monkey-bubble/gfx/harm_shoot.svg
+share/monkey-bubble/gfx/harm_up.svg
+share/monkey-bubble/gfx/hurry_up.svg
+share/monkey-bubble/gfx/layout_1_player.svg
+share/monkey-bubble/gfx/layout_2_players.svg
+share/monkey-bubble/gfx/layout_network_player.svg
+share/monkey-bubble/gfx/left_monkey.svg
+share/monkey-bubble/gfx/looser.svg
+share/monkey-bubble/gfx/lost.svg
+share/monkey-bubble/gfx/monkey.png
+share/monkey-bubble/gfx/number/0.svg
+share/monkey-bubble/gfx/number/1.svg
+share/monkey-bubble/gfx/number/2.svg
+share/monkey-bubble/gfx/number/3.svg
+share/monkey-bubble/gfx/number/4.svg
+share/monkey-bubble/gfx/number/5.svg
+share/monkey-bubble/gfx/number/6.svg
+share/monkey-bubble/gfx/number/7.svg
+share/monkey-bubble/gfx/number/8.svg
+share/monkey-bubble/gfx/number/9.svg
+share/monkey-bubble/gfx/pane.svg
+share/monkey-bubble/gfx/pause.svg
+share/monkey-bubble/gfx/right_monkey.svg
+share/monkey-bubble/gfx/snake/snake.svg
+share/monkey-bubble/gfx/snake/snake_-0.svg
+share/monkey-bubble/gfx/snake/snake_-1.svg
+share/monkey-bubble/gfx/snake/snake_-10.svg
+share/monkey-bubble/gfx/snake/snake_-11.svg
+share/monkey-bubble/gfx/snake/snake_-12.svg
+share/monkey-bubble/gfx/snake/snake_-13.svg
+share/monkey-bubble/gfx/snake/snake_-14.svg
+share/monkey-bubble/gfx/snake/snake_-15.svg
+share/monkey-bubble/gfx/snake/snake_-16.svg
+share/monkey-bubble/gfx/snake/snake_-17.svg
+share/monkey-bubble/gfx/snake/snake_-18.svg
+share/monkey-bubble/gfx/snake/snake_-19.svg
+share/monkey-bubble/gfx/snake/snake_-2.svg
+share/monkey-bubble/gfx/snake/snake_-20.svg
+share/monkey-bubble/gfx/snake/snake_-21.svg
+share/monkey-bubble/gfx/snake/snake_-22.svg
+share/monkey-bubble/gfx/snake/snake_-23.svg
+share/monkey-bubble/gfx/snake/snake_-24.svg
+share/monkey-bubble/gfx/snake/snake_-25.svg
+share/monkey-bubble/gfx/snake/snake_-26.svg
+share/monkey-bubble/gfx/snake/snake_-27.svg
+share/monkey-bubble/gfx/snake/snake_-28.svg
+share/monkey-bubble/gfx/snake/snake_-29.svg
+share/monkey-bubble/gfx/snake/snake_-3.svg
+share/monkey-bubble/gfx/snake/snake_-30.svg
+share/monkey-bubble/gfx/snake/snake_-31.svg
+share/monkey-bubble/gfx/snake/snake_-32.svg
+share/monkey-bubble/gfx/snake/snake_-33.svg
+share/monkey-bubble/gfx/snake/snake_-34.svg
+share/monkey-bubble/gfx/snake/snake_-35.svg
+share/monkey-bubble/gfx/snake/snake_-36.svg
+share/monkey-bubble/gfx/snake/snake_-37.svg
+share/monkey-bubble/gfx/snake/snake_-38.svg
+share/monkey-bubble/gfx/snake/snake_-39.svg
+share/monkey-bubble/gfx/snake/snake_-4.svg
+share/monkey-bubble/gfx/snake/snake_-40.svg
+share/monkey-bubble/gfx/snake/snake_-5.svg
+share/monkey-bubble/gfx/snake/snake_-6.svg
+share/monkey-bubble/gfx/snake/snake_-7.svg
+share/monkey-bubble/gfx/snake/snake_-8.svg
+share/monkey-bubble/gfx/snake/snake_-9.svg
+share/monkey-bubble/gfx/snake/snake_0.svg
+share/monkey-bubble/gfx/snake/snake_1.svg
+share/monkey-bubble/gfx/snake/snake_10.svg
+share/monkey-bubble/gfx/snake/snake_11.svg
+share/monkey-bubble/gfx/snake/snake_12.svg
+share/monkey-bubble/gfx/snake/snake_13.svg
+share/monkey-bubble/gfx/snake/snake_14.svg
+share/monkey-bubble/gfx/snake/snake_15.svg
+share/monkey-bubble/gfx/snake/snake_16.svg
+share/monkey-bubble/gfx/snake/snake_17.svg
+share/monkey-bubble/gfx/snake/snake_18.svg
+share/monkey-bubble/gfx/snake/snake_19.svg
+share/monkey-bubble/gfx/snake/snake_2.svg
+share/monkey-bubble/gfx/snake/snake_20.svg
+share/monkey-bubble/gfx/snake/snake_21.svg
+share/monkey-bubble/gfx/snake/snake_22.svg
+share/monkey-bubble/gfx/snake/snake_23.svg
+share/monkey-bubble/gfx/snake/snake_24.svg
+share/monkey-bubble/gfx/snake/snake_25.svg
+share/monkey-bubble/gfx/snake/snake_26.svg
+share/monkey-bubble/gfx/snake/snake_27.svg
+share/monkey-bubble/gfx/snake/snake_28.svg
+share/monkey-bubble/gfx/snake/snake_29.svg
+share/monkey-bubble/gfx/snake/snake_3.svg
+share/monkey-bubble/gfx/snake/snake_30.svg
+share/monkey-bubble/gfx/snake/snake_31.svg
+share/monkey-bubble/gfx/snake/snake_32.svg
+share/monkey-bubble/gfx/snake/snake_33.svg
+share/monkey-bubble/gfx/snake/snake_34.svg
+share/monkey-bubble/gfx/snake/snake_35.svg
+share/monkey-bubble/gfx/snake/snake_36.svg
+share/monkey-bubble/gfx/snake/snake_37.svg
+share/monkey-bubble/gfx/snake/snake_38.svg
+share/monkey-bubble/gfx/snake/snake_39.svg
+share/monkey-bubble/gfx/snake/snake_4.svg
+share/monkey-bubble/gfx/snake/snake_40.svg
+share/monkey-bubble/gfx/snake/snake_5.svg
+share/monkey-bubble/gfx/snake/snake_6.svg
+share/monkey-bubble/gfx/snake/snake_7.svg
+share/monkey-bubble/gfx/snake/snake_8.svg
+share/monkey-bubble/gfx/snake/snake_9.svg
+share/monkey-bubble/gfx/snake-body.svg
+share/monkey-bubble/gfx/splash.svg
+share/monkey-bubble/gfx/star.svg
+share/monkey-bubble/gfx/tomato.svg
+share/monkey-bubble/gfx/win.svg
+share/monkey-bubble/glade/keybinding.glade
+share/monkey-bubble/glade/monkey-bubble.glade
+share/monkey-bubble/glade/netgame.glade
+share/monkey-bubble/glade/netserver.glade
+share/monkey-bubble/levels
+share/monkey-bubble/sounds/destroy_group.wav
+share/monkey-bubble/sounds/game.ogg
+share/monkey-bubble/sounds/launch.wav
+share/monkey-bubble/sounds/rebound.wav
+share/monkey-bubble/sounds/splash.ogg
+share/monkey-bubble/sounds/stick.wav
+share/omf/monkey-bubble/monkey-bubble-C.omf
+share/omf/monkey-bubble/monkey-bubble-fr.omf
+share/pixmaps/monkey-bubble-icon.png
 share/locale/bg/LC_MESSAGES/monkey-bubble.mo
 share/locale/cs/LC_MESSAGES/monkey-bubble.mo
 share/locale/de/LC_MESSAGES/monkey-bubble.mo
@@ -176,15 +176,16 @@ share/locale/uk/LC_MESSAGES/monkey-bubble.mo
 share/locale/vi/LC_MESSAGES/monkey-bubble.mo
 share/locale/zh_CN/LC_MESSAGES/monkey-bubble.mo
 share/locale/zh_TW/LC_MESSAGES/monkey-bubble.mo
-@dirrm share/gnome/omf/monkey-bubble
-@dirrm share/gnome/monkey-bubble/sounds
-@dirrm share/gnome/monkey-bubble/glade
-@dirrm share/gnome/monkey-bubble/gfx/snake
-@dirrm share/gnome/monkey-bubble/gfx/number
-@dirrm share/gnome/monkey-bubble/gfx/frozen-bubble
-@dirrm share/gnome/monkey-bubble/gfx/bubbles
-@dirrm share/gnome/monkey-bubble/gfx
-@dirrm share/gnome/monkey-bubble
+@dirrm share/omf/monkey-bubble
+@dirrm share/monkey-bubble/sounds
+@dirrm share/monkey-bubble/glade
+@dirrm share/monkey-bubble/gfx/snake
+@dirrm share/monkey-bubble/gfx/number
+@dirrm share/monkey-bubble/gfx/frozen-bubble
+@dirrm share/monkey-bubble/gfx/bubbles
+@dirrm share/monkey-bubble/gfx
+@dirrm share/monkey-bubble
 @dirrm share/gnome/help/monkey-bubble/fr
 @dirrm share/gnome/help/monkey-bubble/C
 @dirrm share/gnome/help/monkey-bubble
+@dirrmtry share/applications
diff --git a/games/monster-masher/Makefile b/games/monster-masher/Makefile
index 5791951a1f8c..2b3206ff99a1 100644
--- a/games/monster-masher/Makefile
+++ b/games/monster-masher/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	monster
 PORTVERSION=	1.7
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games gnome
 MASTER_SITES=	http://www.cs.aau.dk/~olau/monster-masher/source/
 PKGNAMESUFFIX=	-masher
diff --git a/games/monster-masher/pkg-plist b/games/monster-masher/pkg-plist
index f7d96ff6b6dc..6dbdb0ecea1b 100644
--- a/games/monster-masher/pkg-plist
+++ b/games/monster-masher/pkg-plist
@@ -1,100 +1,100 @@
 bin/monster-masher
-share/gnome/applications/monster-masher.desktop
-share/gnome/monster-masher/glade/ui.glade
-share/gnome/monster-masher/pixmaps/block-24.png
-share/gnome/monster-masher/pixmaps/block-32.png
-share/gnome/monster-masher/pixmaps/egg-layer-egg-24.png
-share/gnome/monster-masher/pixmaps/egg-layer-egg-32.png
-share/gnome/monster-masher/pixmaps/egg-layer-gore-24.png
-share/gnome/monster-masher/pixmaps/egg-layer-gore-32.png
-share/gnome/monster-masher/pixmaps/egg-layer-monster-24.png
-share/gnome/monster-masher/pixmaps/egg-layer-monster-32.png
-share/gnome/monster-masher/pixmaps/footprint-down-leftmost.png
-share/gnome/monster-masher/pixmaps/footprint-down-rightmost.png
-share/gnome/monster-masher/pixmaps/footprint-left-down-leftmost.png
-share/gnome/monster-masher/pixmaps/footprint-left-down-rightmost.png
-share/gnome/monster-masher/pixmaps/footprint-left-leftmost.png
-share/gnome/monster-masher/pixmaps/footprint-left-rightmost.png
-share/gnome/monster-masher/pixmaps/footprint-left-up-leftmost.png
-share/gnome/monster-masher/pixmaps/footprint-left-up-rightmost.png
-share/gnome/monster-masher/pixmaps/footprint-right-down-leftmost.png
-share/gnome/monster-masher/pixmaps/footprint-right-down-rightmost.png
-share/gnome/monster-masher/pixmaps/footprint-right-leftmost.png
-share/gnome/monster-masher/pixmaps/footprint-right-rightmost.png
-share/gnome/monster-masher/pixmaps/footprint-right-up-leftmost.png
-share/gnome/monster-masher/pixmaps/footprint-right-up-rightmost.png
-share/gnome/monster-masher/pixmaps/footprint-up-leftmost.png
-share/gnome/monster-masher/pixmaps/footprint-up-rightmost.png
-share/gnome/monster-masher/pixmaps/freeze-box-24.png
-share/gnome/monster-masher/pixmaps/freeze-box-32.png
-share/gnome/monster-masher/pixmaps/hard-egg-24.png
-share/gnome/monster-masher/pixmaps/hard-egg-32.png
-share/gnome/monster-masher/pixmaps/hard-gore-24.png
-share/gnome/monster-masher/pixmaps/hard-gore-32.png
-share/gnome/monster-masher/pixmaps/hard-monster-24.png
-share/gnome/monster-masher/pixmaps/hard-monster-32.png
-share/gnome/monster-masher/pixmaps/hero-down-24.png
-share/gnome/monster-masher/pixmaps/hero-down-32.png
-share/gnome/monster-masher/pixmaps/hero-gore-24.png
-share/gnome/monster-masher/pixmaps/hero-gore-32.png
-share/gnome/monster-masher/pixmaps/hero-left-24.png
-share/gnome/monster-masher/pixmaps/hero-left-32.png
-share/gnome/monster-masher/pixmaps/hero-left-down-24.png
-share/gnome/monster-masher/pixmaps/hero-left-down-32.png
-share/gnome/monster-masher/pixmaps/hero-left-up-24.png
-share/gnome/monster-masher/pixmaps/hero-left-up-32.png
-share/gnome/monster-masher/pixmaps/hero-right-24.png
-share/gnome/monster-masher/pixmaps/hero-right-32.png
-share/gnome/monster-masher/pixmaps/hero-right-down-24.png
-share/gnome/monster-masher/pixmaps/hero-right-down-32.png
-share/gnome/monster-masher/pixmaps/hero-right-up-24.png
-share/gnome/monster-masher/pixmaps/hero-right-up-32.png
-share/gnome/monster-masher/pixmaps/hero-up-24.png
-share/gnome/monster-masher/pixmaps/hero-up-32.png
-share/gnome/monster-masher/pixmaps/invisible-hero-down-24.png
-share/gnome/monster-masher/pixmaps/invisible-hero-down-32.png
-share/gnome/monster-masher/pixmaps/invisible-hero-left-24.png
-share/gnome/monster-masher/pixmaps/invisible-hero-left-32.png
-share/gnome/monster-masher/pixmaps/invisible-hero-left-down-24.png
-share/gnome/monster-masher/pixmaps/invisible-hero-left-down-32.png
-share/gnome/monster-masher/pixmaps/invisible-hero-left-up-24.png
-share/gnome/monster-masher/pixmaps/invisible-hero-left-up-32.png
-share/gnome/monster-masher/pixmaps/invisible-hero-right-24.png
-share/gnome/monster-masher/pixmaps/invisible-hero-right-32.png
-share/gnome/monster-masher/pixmaps/invisible-hero-right-down-24.png
-share/gnome/monster-masher/pixmaps/invisible-hero-right-down-32.png
-share/gnome/monster-masher/pixmaps/invisible-hero-right-up-24.png
-share/gnome/monster-masher/pixmaps/invisible-hero-right-up-32.png
-share/gnome/monster-masher/pixmaps/invisible-hero-up-24.png
-share/gnome/monster-masher/pixmaps/invisible-hero-up-32.png
-share/gnome/monster-masher/pixmaps/levitation-24.png
-share/gnome/monster-masher/pixmaps/levitation-32.png
-share/gnome/monster-masher/pixmaps/monster-wall-24.png
-share/gnome/monster-masher/pixmaps/monster-wall-32.png
-share/gnome/monster-masher/pixmaps/plain-egg-24.png
-share/gnome/monster-masher/pixmaps/plain-egg-32.png
-share/gnome/monster-masher/pixmaps/plain-gore-24.png
-share/gnome/monster-masher/pixmaps/plain-gore-32.png
-share/gnome/monster-masher/pixmaps/plain-monster-24.png
-share/gnome/monster-masher/pixmaps/plain-monster-32.png
-share/gnome/monster-masher/pixmaps/power-up-explode-24.png
-share/gnome/monster-masher/pixmaps/power-up-explode-32.png
-share/gnome/monster-masher/pixmaps/power-up-freeze-24.png
-share/gnome/monster-masher/pixmaps/power-up-freeze-32.png
-share/gnome/monster-masher/pixmaps/power-up-invisibility-24.png
-share/gnome/monster-masher/pixmaps/power-up-invisibility-32.png
-share/gnome/monster-masher/pixmaps/seeker-egg-24.png
-share/gnome/monster-masher/pixmaps/seeker-egg-32.png
-share/gnome/monster-masher/pixmaps/seeker-gore-24.png
-share/gnome/monster-masher/pixmaps/seeker-gore-32.png
-share/gnome/monster-masher/pixmaps/seeker-monster-24.png
-share/gnome/monster-masher/pixmaps/seeker-monster-32.png
-share/gnome/monster-masher/pixmaps/splash.jpg
-share/gnome/monster-masher/pixmaps/wall-24.png
-share/gnome/monster-masher/pixmaps/wall-32.png
-share/gnome/monster-masher/sounds/clinck.wav
-share/gnome/monster-masher/sounds/splat.wav
-share/gnome/pixmaps/monster-masher.png
+share/applications/monster-masher.desktop
+share/monster-masher/glade/ui.glade
+share/monster-masher/pixmaps/block-24.png
+share/monster-masher/pixmaps/block-32.png
+share/monster-masher/pixmaps/egg-layer-egg-24.png
+share/monster-masher/pixmaps/egg-layer-egg-32.png
+share/monster-masher/pixmaps/egg-layer-gore-24.png
+share/monster-masher/pixmaps/egg-layer-gore-32.png
+share/monster-masher/pixmaps/egg-layer-monster-24.png
+share/monster-masher/pixmaps/egg-layer-monster-32.png
+share/monster-masher/pixmaps/footprint-down-leftmost.png
+share/monster-masher/pixmaps/footprint-down-rightmost.png
+share/monster-masher/pixmaps/footprint-left-down-leftmost.png
+share/monster-masher/pixmaps/footprint-left-down-rightmost.png
+share/monster-masher/pixmaps/footprint-left-leftmost.png
+share/monster-masher/pixmaps/footprint-left-rightmost.png
+share/monster-masher/pixmaps/footprint-left-up-leftmost.png
+share/monster-masher/pixmaps/footprint-left-up-rightmost.png
+share/monster-masher/pixmaps/footprint-right-down-leftmost.png
+share/monster-masher/pixmaps/footprint-right-down-rightmost.png
+share/monster-masher/pixmaps/footprint-right-leftmost.png
+share/monster-masher/pixmaps/footprint-right-rightmost.png
+share/monster-masher/pixmaps/footprint-right-up-leftmost.png
+share/monster-masher/pixmaps/footprint-right-up-rightmost.png
+share/monster-masher/pixmaps/footprint-up-leftmost.png
+share/monster-masher/pixmaps/footprint-up-rightmost.png
+share/monster-masher/pixmaps/freeze-box-24.png
+share/monster-masher/pixmaps/freeze-box-32.png
+share/monster-masher/pixmaps/hard-egg-24.png
+share/monster-masher/pixmaps/hard-egg-32.png
+share/monster-masher/pixmaps/hard-gore-24.png
+share/monster-masher/pixmaps/hard-gore-32.png
+share/monster-masher/pixmaps/hard-monster-24.png
+share/monster-masher/pixmaps/hard-monster-32.png
+share/monster-masher/pixmaps/hero-down-24.png
+share/monster-masher/pixmaps/hero-down-32.png
+share/monster-masher/pixmaps/hero-gore-24.png
+share/monster-masher/pixmaps/hero-gore-32.png
+share/monster-masher/pixmaps/hero-left-24.png
+share/monster-masher/pixmaps/hero-left-32.png
+share/monster-masher/pixmaps/hero-left-down-24.png
+share/monster-masher/pixmaps/hero-left-down-32.png
+share/monster-masher/pixmaps/hero-left-up-24.png
+share/monster-masher/pixmaps/hero-left-up-32.png
+share/monster-masher/pixmaps/hero-right-24.png
+share/monster-masher/pixmaps/hero-right-32.png
+share/monster-masher/pixmaps/hero-right-down-24.png
+share/monster-masher/pixmaps/hero-right-down-32.png
+share/monster-masher/pixmaps/hero-right-up-24.png
+share/monster-masher/pixmaps/hero-right-up-32.png
+share/monster-masher/pixmaps/hero-up-24.png
+share/monster-masher/pixmaps/hero-up-32.png
+share/monster-masher/pixmaps/invisible-hero-down-24.png
+share/monster-masher/pixmaps/invisible-hero-down-32.png
+share/monster-masher/pixmaps/invisible-hero-left-24.png
+share/monster-masher/pixmaps/invisible-hero-left-32.png
+share/monster-masher/pixmaps/invisible-hero-left-down-24.png
+share/monster-masher/pixmaps/invisible-hero-left-down-32.png
+share/monster-masher/pixmaps/invisible-hero-left-up-24.png
+share/monster-masher/pixmaps/invisible-hero-left-up-32.png
+share/monster-masher/pixmaps/invisible-hero-right-24.png
+share/monster-masher/pixmaps/invisible-hero-right-32.png
+share/monster-masher/pixmaps/invisible-hero-right-down-24.png
+share/monster-masher/pixmaps/invisible-hero-right-down-32.png
+share/monster-masher/pixmaps/invisible-hero-right-up-24.png
+share/monster-masher/pixmaps/invisible-hero-right-up-32.png
+share/monster-masher/pixmaps/invisible-hero-up-24.png
+share/monster-masher/pixmaps/invisible-hero-up-32.png
+share/monster-masher/pixmaps/levitation-24.png
+share/monster-masher/pixmaps/levitation-32.png
+share/monster-masher/pixmaps/monster-wall-24.png
+share/monster-masher/pixmaps/monster-wall-32.png
+share/monster-masher/pixmaps/plain-egg-24.png
+share/monster-masher/pixmaps/plain-egg-32.png
+share/monster-masher/pixmaps/plain-gore-24.png
+share/monster-masher/pixmaps/plain-gore-32.png
+share/monster-masher/pixmaps/plain-monster-24.png
+share/monster-masher/pixmaps/plain-monster-32.png
+share/monster-masher/pixmaps/power-up-explode-24.png
+share/monster-masher/pixmaps/power-up-explode-32.png
+share/monster-masher/pixmaps/power-up-freeze-24.png
+share/monster-masher/pixmaps/power-up-freeze-32.png
+share/monster-masher/pixmaps/power-up-invisibility-24.png
+share/monster-masher/pixmaps/power-up-invisibility-32.png
+share/monster-masher/pixmaps/seeker-egg-24.png
+share/monster-masher/pixmaps/seeker-egg-32.png
+share/monster-masher/pixmaps/seeker-gore-24.png
+share/monster-masher/pixmaps/seeker-gore-32.png
+share/monster-masher/pixmaps/seeker-monster-24.png
+share/monster-masher/pixmaps/seeker-monster-32.png
+share/monster-masher/pixmaps/splash.jpg
+share/monster-masher/pixmaps/wall-24.png
+share/monster-masher/pixmaps/wall-32.png
+share/monster-masher/sounds/clinck.wav
+share/monster-masher/sounds/splat.wav
+share/pixmaps/monster-masher.png
 share/locale/az/LC_MESSAGES/monster-masher.mo
 share/locale/cs/LC_MESSAGES/monster-masher.mo
 share/locale/cy/LC_MESSAGES/monster-masher.mo
@@ -119,7 +119,8 @@ share/locale/sr@Latn/LC_MESSAGES/monster-masher.mo
 share/locale/sv/LC_MESSAGES/monster-masher.mo
 share/locale/tr/LC_MESSAGES/monster-masher.mo
 share/locale/zh_TW/LC_MESSAGES/monster-masher.mo
-@dirrm share/gnome/monster-masher/glade
-@dirrm share/gnome/monster-masher/pixmaps
-@dirrm share/gnome/monster-masher/sounds
-@dirrm share/gnome/monster-masher
+@dirrm share/monster-masher/glade
+@dirrm share/monster-masher/pixmaps
+@dirrm share/monster-masher/sounds
+@dirrm share/monster-masher
+@dirrmtry share/applications
diff --git a/games/pioneers/Makefile b/games/pioneers/Makefile
index 395b4d189aa7..090521e84651 100644
--- a/games/pioneers/Makefile
+++ b/games/pioneers/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	pioneers
 PORTVERSION=	0.11.3
+PORTREVISION=	1
 CATEGORIES=	games gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
 MASTER_SITE_SUBDIR=	pio
diff --git a/games/pioneers/files/patch-configure b/games/pioneers/files/patch-configure
deleted file mode 100644
index 3bd1d99d7ee9..000000000000
--- a/games/pioneers/files/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig	Tue Apr  3 10:19:57 2007
-+++ configure	Tue Apr  3 10:21:33 2007
-@@ -24450,7 +24450,7 @@
- 	pioneers_datadir=$datadir
- 	pioneers_themedir=$datadir/games/pioneers/themes
- 	pioneers_themedir_embed=$pioneers_themedir
--	pioneers_localedir=$datadir/locale
-+	pioneers_localedir=$prefix/share/locale
- fi
- 
- 
diff --git a/games/pioneers/pkg-plist b/games/pioneers/pkg-plist
index be590e684869..a315101e172a 100644
--- a/games/pioneers/pkg-plist
+++ b/games/pioneers/pkg-plist
@@ -4,87 +4,87 @@ bin/pioneers-meta-server
 bin/pioneers-server-console
 bin/pioneers-server-gtk
 bin/pioneersai
-share/gnome/applications/pioneers-editor.desktop
-share/gnome/applications/pioneers-server.desktop
-share/gnome/applications/pioneers.desktop
-share/gnome/games/pioneers/5-6-player.game
-share/gnome/games/pioneers/Another_swimming_pool_in_the_wall.game
-share/gnome/games/pioneers/Cube.game
-share/gnome/games/pioneers/Evil_square.game
-share/gnome/games/pioneers/GuerreDe100ans.game
-share/gnome/games/pioneers/Mini_another_swimming_pool_in_the_wall.game
-share/gnome/games/pioneers/archipel_gold.game
-share/gnome/games/pioneers/canyon.game
-share/gnome/games/pioneers/coeur.game
-share/gnome/games/pioneers/computer_names
-share/gnome/games/pioneers/conquest+ports.game
-share/gnome/games/pioneers/conquest.game
-share/gnome/games/pioneers/crane_island.game
-share/gnome/games/pioneers/default.game
-share/gnome/games/pioneers/four-islands.game
-share/gnome/games/pioneers/henjes.game
-share/gnome/games/pioneers/iles.game
-share/gnome/games/pioneers/lobby.game
-share/gnome/games/pioneers/lorindol.game
-share/gnome/games/pioneers/pond.game
-share/gnome/games/pioneers/seafarers-gold.game
-share/gnome/games/pioneers/seafarers.game
-share/gnome/games/pioneers/small.game
-share/gnome/games/pioneers/square.game
-share/gnome/games/pioneers/star.game
-share/gnome/games/pioneers/themes/FreeCIV-like/board.png
-share/gnome/games/pioneers/themes/FreeCIV-like/desert.png
-share/gnome/games/pioneers/themes/FreeCIV-like/field.png
-share/gnome/games/pioneers/themes/FreeCIV-like/forest.png
-share/gnome/games/pioneers/themes/FreeCIV-like/hill.png
-share/gnome/games/pioneers/themes/FreeCIV-like/mountain.png
-share/gnome/games/pioneers/themes/FreeCIV-like/pasture.png
-share/gnome/games/pioneers/themes/FreeCIV-like/sea.png
-share/gnome/games/pioneers/themes/FreeCIV-like/theme.cfg
-share/gnome/games/pioneers/themes/Iceland/desert.png
-share/gnome/games/pioneers/themes/Iceland/field_grain.png
-share/gnome/games/pioneers/themes/Iceland/forest_lumber.png
-share/gnome/games/pioneers/themes/Iceland/gold.png
-share/gnome/games/pioneers/themes/Iceland/hill_brick.png
-share/gnome/games/pioneers/themes/Iceland/mountain_ore.png
-share/gnome/games/pioneers/themes/Iceland/pasture_wool.png
-share/gnome/games/pioneers/themes/Iceland/theme.cfg
-share/gnome/games/pioneers/themes/Tiny/board.png
-share/gnome/games/pioneers/themes/Tiny/brick-lorindol.png
-share/gnome/games/pioneers/themes/Tiny/brick-port.png
-share/gnome/games/pioneers/themes/Tiny/desert-lorindol.png
-share/gnome/games/pioneers/themes/Tiny/gold-lorindol.png
-share/gnome/games/pioneers/themes/Tiny/grain-lorindol.png
-share/gnome/games/pioneers/themes/Tiny/grain-port.png
-share/gnome/games/pioneers/themes/Tiny/lumber-lorindol.png
-share/gnome/games/pioneers/themes/Tiny/lumber-port.png
-share/gnome/games/pioneers/themes/Tiny/ore-lorindol.png
-share/gnome/games/pioneers/themes/Tiny/ore-port.png
-share/gnome/games/pioneers/themes/Tiny/sea-lorindol.png
-share/gnome/games/pioneers/themes/Tiny/theme.cfg
-share/gnome/games/pioneers/themes/Tiny/wool-lorindol.png
-share/gnome/games/pioneers/themes/Tiny/wool-port.png
-share/gnome/games/pioneers/themes/Wesnoth-like/board.png
-share/gnome/games/pioneers/themes/Wesnoth-like/desert.png
-share/gnome/games/pioneers/themes/Wesnoth-like/field.png
-share/gnome/games/pioneers/themes/Wesnoth-like/forest.png
-share/gnome/games/pioneers/themes/Wesnoth-like/gold.png
-share/gnome/games/pioneers/themes/Wesnoth-like/hill.png
-share/gnome/games/pioneers/themes/Wesnoth-like/mountain.png
-share/gnome/games/pioneers/themes/Wesnoth-like/pasture.png
-share/gnome/games/pioneers/themes/Wesnoth-like/sea.png
-share/gnome/games/pioneers/themes/Wesnoth-like/theme.cfg
-share/gnome/games/pioneers/themes/board.png
-share/gnome/games/pioneers/themes/desert.png
-share/gnome/games/pioneers/themes/field.png
-share/gnome/games/pioneers/themes/forest.png
-share/gnome/games/pioneers/themes/gold.png
-share/gnome/games/pioneers/themes/hill.png
-share/gnome/games/pioneers/themes/mountain.png
-share/gnome/games/pioneers/themes/pasture.png
-share/gnome/games/pioneers/themes/plain.png
-share/gnome/games/pioneers/themes/sea.png
-share/gnome/games/pioneers/x.game
+share/applications/pioneers-editor.desktop
+share/applications/pioneers-server.desktop
+share/applications/pioneers.desktop
+share/games/pioneers/5-6-player.game
+share/games/pioneers/Another_swimming_pool_in_the_wall.game
+share/games/pioneers/Cube.game
+share/games/pioneers/Evil_square.game
+share/games/pioneers/GuerreDe100ans.game
+share/games/pioneers/Mini_another_swimming_pool_in_the_wall.game
+share/games/pioneers/archipel_gold.game
+share/games/pioneers/canyon.game
+share/games/pioneers/coeur.game
+share/games/pioneers/computer_names
+share/games/pioneers/conquest+ports.game
+share/games/pioneers/conquest.game
+share/games/pioneers/crane_island.game
+share/games/pioneers/default.game
+share/games/pioneers/four-islands.game
+share/games/pioneers/henjes.game
+share/games/pioneers/iles.game
+share/games/pioneers/lobby.game
+share/games/pioneers/lorindol.game
+share/games/pioneers/pond.game
+share/games/pioneers/seafarers-gold.game
+share/games/pioneers/seafarers.game
+share/games/pioneers/small.game
+share/games/pioneers/square.game
+share/games/pioneers/star.game
+share/games/pioneers/themes/FreeCIV-like/board.png
+share/games/pioneers/themes/FreeCIV-like/desert.png
+share/games/pioneers/themes/FreeCIV-like/field.png
+share/games/pioneers/themes/FreeCIV-like/forest.png
+share/games/pioneers/themes/FreeCIV-like/hill.png
+share/games/pioneers/themes/FreeCIV-like/mountain.png
+share/games/pioneers/themes/FreeCIV-like/pasture.png
+share/games/pioneers/themes/FreeCIV-like/sea.png
+share/games/pioneers/themes/FreeCIV-like/theme.cfg
+share/games/pioneers/themes/Iceland/desert.png
+share/games/pioneers/themes/Iceland/field_grain.png
+share/games/pioneers/themes/Iceland/forest_lumber.png
+share/games/pioneers/themes/Iceland/gold.png
+share/games/pioneers/themes/Iceland/hill_brick.png
+share/games/pioneers/themes/Iceland/mountain_ore.png
+share/games/pioneers/themes/Iceland/pasture_wool.png
+share/games/pioneers/themes/Iceland/theme.cfg
+share/games/pioneers/themes/Tiny/board.png
+share/games/pioneers/themes/Tiny/brick-lorindol.png
+share/games/pioneers/themes/Tiny/brick-port.png
+share/games/pioneers/themes/Tiny/desert-lorindol.png
+share/games/pioneers/themes/Tiny/gold-lorindol.png
+share/games/pioneers/themes/Tiny/grain-lorindol.png
+share/games/pioneers/themes/Tiny/grain-port.png
+share/games/pioneers/themes/Tiny/lumber-lorindol.png
+share/games/pioneers/themes/Tiny/lumber-port.png
+share/games/pioneers/themes/Tiny/ore-lorindol.png
+share/games/pioneers/themes/Tiny/ore-port.png
+share/games/pioneers/themes/Tiny/sea-lorindol.png
+share/games/pioneers/themes/Tiny/theme.cfg
+share/games/pioneers/themes/Tiny/wool-lorindol.png
+share/games/pioneers/themes/Tiny/wool-port.png
+share/games/pioneers/themes/Wesnoth-like/board.png
+share/games/pioneers/themes/Wesnoth-like/desert.png
+share/games/pioneers/themes/Wesnoth-like/field.png
+share/games/pioneers/themes/Wesnoth-like/forest.png
+share/games/pioneers/themes/Wesnoth-like/gold.png
+share/games/pioneers/themes/Wesnoth-like/hill.png
+share/games/pioneers/themes/Wesnoth-like/mountain.png
+share/games/pioneers/themes/Wesnoth-like/pasture.png
+share/games/pioneers/themes/Wesnoth-like/sea.png
+share/games/pioneers/themes/Wesnoth-like/theme.cfg
+share/games/pioneers/themes/board.png
+share/games/pioneers/themes/desert.png
+share/games/pioneers/themes/field.png
+share/games/pioneers/themes/forest.png
+share/games/pioneers/themes/gold.png
+share/games/pioneers/themes/hill.png
+share/games/pioneers/themes/mountain.png
+share/games/pioneers/themes/pasture.png
+share/games/pioneers/themes/plain.png
+share/games/pioneers/themes/sea.png
+share/games/pioneers/x.game
 share/gnome/help/pioneers/C/images/actions.png
 share/gnome/help/pioneers/C/images/brick.png
 share/gnome/help/pioneers/C/images/chat.png
@@ -124,36 +124,36 @@ share/gnome/help/pioneers/C/images/trade.png
 share/gnome/help/pioneers/C/images/wool.png
 share/gnome/help/pioneers/C/legal.xml
 share/gnome/help/pioneers/C/pioneers.xml
-share/gnome/omf/pioneers/pioneers-C.omf
-share/gnome/pixmaps/pioneers-editor.png
-share/gnome/pixmaps/pioneers-server.png
-share/gnome/pixmaps/pioneers.png
-share/gnome/pixmaps/pioneers/brick.png
-share/gnome/pixmaps/pioneers/bridge.png
-share/gnome/pixmaps/pioneers/city.png
-share/gnome/pixmaps/pioneers/city_wall.png
-share/gnome/pixmaps/pioneers/develop.png
-share/gnome/pixmaps/pioneers/dice.png
-share/gnome/pixmaps/pioneers/finish.png
-share/gnome/pixmaps/pioneers/grain.png
-share/gnome/pixmaps/pioneers/lumber.png
-share/gnome/pixmaps/pioneers/ore.png
-share/gnome/pixmaps/pioneers/road.png
-share/gnome/pixmaps/pioneers/settlement.png
-share/gnome/pixmaps/pioneers/ship.png
-share/gnome/pixmaps/pioneers/ship_move.png
-share/gnome/pixmaps/pioneers/splash.png
-share/gnome/pixmaps/pioneers/style-ai.png
-share/gnome/pixmaps/pioneers/style-human-1.png
-share/gnome/pixmaps/pioneers/style-human-2.png
-share/gnome/pixmaps/pioneers/style-human-3.png
-share/gnome/pixmaps/pioneers/style-human-4.png
-share/gnome/pixmaps/pioneers/style-human-5.png
-share/gnome/pixmaps/pioneers/style-human-6.png
-share/gnome/pixmaps/pioneers/style-human-7.png
-share/gnome/pixmaps/pioneers/style-human.png
-share/gnome/pixmaps/pioneers/trade.png
-share/gnome/pixmaps/pioneers/wool.png
+share/omf/pioneers/pioneers-C.omf
+share/pixmaps/pioneers-editor.png
+share/pixmaps/pioneers-server.png
+share/pixmaps/pioneers.png
+share/pixmaps/pioneers/brick.png
+share/pixmaps/pioneers/bridge.png
+share/pixmaps/pioneers/city.png
+share/pixmaps/pioneers/city_wall.png
+share/pixmaps/pioneers/develop.png
+share/pixmaps/pioneers/dice.png
+share/pixmaps/pioneers/finish.png
+share/pixmaps/pioneers/grain.png
+share/pixmaps/pioneers/lumber.png
+share/pixmaps/pioneers/ore.png
+share/pixmaps/pioneers/road.png
+share/pixmaps/pioneers/settlement.png
+share/pixmaps/pioneers/ship.png
+share/pixmaps/pioneers/ship_move.png
+share/pixmaps/pioneers/splash.png
+share/pixmaps/pioneers/style-ai.png
+share/pixmaps/pioneers/style-human-1.png
+share/pixmaps/pioneers/style-human-2.png
+share/pixmaps/pioneers/style-human-3.png
+share/pixmaps/pioneers/style-human-4.png
+share/pixmaps/pioneers/style-human-5.png
+share/pixmaps/pioneers/style-human-6.png
+share/pixmaps/pioneers/style-human-7.png
+share/pixmaps/pioneers/style-human.png
+share/pixmaps/pioneers/trade.png
+share/pixmaps/pioneers/wool.png
 share/locale/af/LC_MESSAGES/pioneers.mo
 share/locale/de/LC_MESSAGES/pioneers.mo
 share/locale/es/LC_MESSAGES/pioneers.mo
@@ -163,14 +163,15 @@ share/locale/it/LC_MESSAGES/pioneers.mo
 share/locale/ja/LC_MESSAGES/pioneers.mo
 share/locale/nl/LC_MESSAGES/pioneers.mo
 share/locale/sv/LC_MESSAGES/pioneers.mo
-@dirrm share/gnome/games/pioneers/themes/FreeCIV-like
-@dirrm share/gnome/games/pioneers/themes/Iceland
-@dirrm share/gnome/games/pioneers/themes/Tiny
-@dirrm share/gnome/games/pioneers/themes/Wesnoth-like
-@dirrm share/gnome/games/pioneers/themes
-@dirrm share/gnome/games/pioneers
+@dirrm share/games/pioneers/themes/FreeCIV-like
+@dirrm share/games/pioneers/themes/Iceland
+@dirrm share/games/pioneers/themes/Tiny
+@dirrm share/games/pioneers/themes/Wesnoth-like
+@dirrm share/games/pioneers/themes
+@dirrm share/games/pioneers
 @dirrm share/gnome/help/pioneers/C/images
 @dirrm share/gnome/help/pioneers/C
 @dirrm share/gnome/help/pioneers
-@dirrm share/gnome/omf/pioneers
-@dirrm share/gnome/pixmaps/pioneers
+@dirrm share/omf/pioneers
+@dirrm share/pixmaps/pioneers
+@dirrmtry share/applications
diff --git a/games/teg/Makefile b/games/teg/Makefile
index 23dd8687c03c..a98f0b80e4ea 100644
--- a/games/teg/Makefile
+++ b/games/teg/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	teg
 PORTVERSION=	0.11.2
+PORTREVISION=	1
 CATEGORIES=	games gnome
 MASTER_SITES=	SF
 
@@ -27,7 +28,5 @@ post-patch:
 		's| LIST_NEXT| TEG_LIST_NEXT|g'
 	@${REINPLACE_CMD} -e '/^SUBDIRS/s|pl||g' \
 		${WRKSRC}/docs/gnome-help/Makefile.in
-	@${REINPLACE_CMD} -e '/^docdir/s|/gnome/help/|/help/|g' \
-		${WRKSRC}/docs/gnome-help/sgmldocs.make
 
 .include <bsd.port.mk>
diff --git a/games/teg/pkg-plist b/games/teg/pkg-plist
index 57adf0cf15d4..e346c2c4165c 100644
--- a/games/teg/pkg-plist
+++ b/games/teg/pkg-plist
@@ -10,222 +10,222 @@ share/gnome/help/teg/C/figures/server.jpg
 share/gnome/help/teg/C/figures/toolbar_start.jpg
 share/gnome/help/teg/C/teg.sgml
 share/gnome/help/teg/C/topic.dat
-share/gnome/pixmaps/teg_icono.png
-share/gnome/pixmaps/teg_pix/color_player_black.png
-share/gnome/pixmaps/teg_pix/color_player_blue.png
-share/gnome/pixmaps/teg_pix/color_player_green.png
-share/gnome/pixmaps/teg_pix/color_player_pink.png
-share/gnome/pixmaps/teg_pix/color_player_red.png
-share/gnome/pixmaps/teg_pix/color_player_yellow.png
-share/gnome/pixmaps/teg_pix/disc_black.png
-share/gnome/pixmaps/teg_pix/disc_blue.png
-share/gnome/pixmaps/teg_pix/disc_green.png
-share/gnome/pixmaps/teg_pix/disc_grey.png
-share/gnome/pixmaps/teg_pix/disc_over.png
-share/gnome/pixmaps/teg_pix/disc_pink.png
-share/gnome/pixmaps/teg_pix/disc_red.png
-share/gnome/pixmaps/teg_pix/disc_yellow.png
-share/gnome/pixmaps/teg_pix/objetivo.png
-share/gnome/pixmaps/teg_pix/teg_icono.png
-share/gnome/pixmaps/teg_pix/teg_icono.xpm
-share/gnome/pixmaps/teg_pix/themes/draco/10.png
-share/gnome/pixmaps/teg_pix/themes/draco/13.png
-share/gnome/pixmaps/teg_pix/themes/draco/14.png
-share/gnome/pixmaps/teg_pix/themes/draco/15.png
-share/gnome/pixmaps/teg_pix/themes/draco/16.png
-share/gnome/pixmaps/teg_pix/themes/draco/17.png
-share/gnome/pixmaps/teg_pix/themes/draco/18.png
-share/gnome/pixmaps/teg_pix/themes/draco/19.png
-share/gnome/pixmaps/teg_pix/themes/draco/20.png
-share/gnome/pixmaps/teg_pix/themes/draco/21.png
-share/gnome/pixmaps/teg_pix/themes/draco/22.png
-share/gnome/pixmaps/teg_pix/themes/draco/23.png
-share/gnome/pixmaps/teg_pix/themes/draco/24.png
-share/gnome/pixmaps/teg_pix/themes/draco/25.png
-share/gnome/pixmaps/teg_pix/themes/draco/26.png
-share/gnome/pixmaps/teg_pix/themes/draco/28.png
-share/gnome/pixmaps/teg_pix/themes/draco/29.png
-share/gnome/pixmaps/teg_pix/themes/draco/30.png
-share/gnome/pixmaps/teg_pix/themes/draco/31.png
-share/gnome/pixmaps/teg_pix/themes/draco/32.png
-share/gnome/pixmaps/teg_pix/themes/draco/33.png
-share/gnome/pixmaps/teg_pix/themes/draco/34.png
-share/gnome/pixmaps/teg_pix/themes/draco/35.png
-share/gnome/pixmaps/teg_pix/themes/draco/36.png
-share/gnome/pixmaps/teg_pix/themes/draco/37.png
-share/gnome/pixmaps/teg_pix/themes/draco/38.png
-share/gnome/pixmaps/teg_pix/themes/draco/39.png
-share/gnome/pixmaps/teg_pix/themes/draco/40.png
-share/gnome/pixmaps/teg_pix/themes/draco/41.png
-share/gnome/pixmaps/teg_pix/themes/draco/42.png
-share/gnome/pixmaps/teg_pix/themes/draco/43.png
-share/gnome/pixmaps/teg_pix/themes/draco/44.png
-share/gnome/pixmaps/teg_pix/themes/draco/45.png
-share/gnome/pixmaps/teg_pix/themes/draco/46.png
-share/gnome/pixmaps/teg_pix/themes/draco/47.png
-share/gnome/pixmaps/teg_pix/themes/draco/48.png
-share/gnome/pixmaps/teg_pix/themes/draco/49.png
-share/gnome/pixmaps/teg_pix/themes/draco/50.png
-share/gnome/pixmaps/teg_pix/themes/draco/51.png
-share/gnome/pixmaps/teg_pix/themes/draco/52.png
-share/gnome/pixmaps/teg_pix/themes/draco/53.png
-share/gnome/pixmaps/teg_pix/themes/draco/54.png
-share/gnome/pixmaps/teg_pix/themes/draco/55.png
-share/gnome/pixmaps/teg_pix/themes/draco/56.png
-share/gnome/pixmaps/teg_pix/themes/draco/57.png
-share/gnome/pixmaps/teg_pix/themes/draco/58.png
-share/gnome/pixmaps/teg_pix/themes/draco/59.png
-share/gnome/pixmaps/teg_pix/themes/draco/60.png
-share/gnome/pixmaps/teg_pix/themes/draco/8.png
-share/gnome/pixmaps/teg_pix/themes/draco/9.png
-share/gnome/pixmaps/teg_pix/themes/draco/board.jpg
-share/gnome/pixmaps/teg_pix/themes/draco/dice-1.png
-share/gnome/pixmaps/teg_pix/themes/draco/dice-2.png
-share/gnome/pixmaps/teg_pix/themes/draco/dice-3.png
-share/gnome/pixmaps/teg_pix/themes/draco/dice-4.png
-share/gnome/pixmaps/teg_pix/themes/draco/dice-5.png
-share/gnome/pixmaps/teg_pix/themes/draco/dice-6.png
-share/gnome/pixmaps/teg_pix/themes/draco/infobar.png
-share/gnome/pixmaps/teg_pix/themes/draco/mini_shot.png
-share/gnome/pixmaps/teg_pix/themes/draco/tar_cannon.png
-share/gnome/pixmaps/teg_pix/themes/draco/tar_horse.png
-share/gnome/pixmaps/teg_pix/themes/draco/tar_infantry.png
-share/gnome/pixmaps/teg_pix/themes/draco/tar_jocker.png
-share/gnome/pixmaps/teg_pix/themes/draco/teg_theme.xml
-share/gnome/pixmaps/teg_pix/themes/draco/wizard_black.png
-share/gnome/pixmaps/teg_pix/themes/draco/wizard_blue.png
-share/gnome/pixmaps/teg_pix/themes/draco/wizard_green.png
-share/gnome/pixmaps/teg_pix/themes/draco/wizard_pink.png
-share/gnome/pixmaps/teg_pix/themes/draco/wizard_red.png
-share/gnome/pixmaps/teg_pix/themes/draco/wizard_yellow.png
-share/gnome/pixmaps/teg_pix/themes/m2/Africa-Egipto
-share/gnome/pixmaps/teg_pix/themes/m2/Africa-Etiopia
-share/gnome/pixmaps/teg_pix/themes/m2/Africa-Madagascar
-share/gnome/pixmaps/teg_pix/themes/m2/Africa-Sahara
-share/gnome/pixmaps/teg_pix/themes/m2/Africa-Sudafrica
-share/gnome/pixmaps/teg_pix/themes/m2/Africa-Zaire
-share/gnome/pixmaps/teg_pix/themes/m2/America-Alaska
-share/gnome/pixmaps/teg_pix/themes/m2/America-California
-share/gnome/pixmaps/teg_pix/themes/m2/America-Canada
-share/gnome/pixmaps/teg_pix/themes/m2/America-Groenlandia
-share/gnome/pixmaps/teg_pix/themes/m2/America-Labrador
-share/gnome/pixmaps/teg_pix/themes/m2/America-Mexico
-share/gnome/pixmaps/teg_pix/themes/m2/America-Nuevayork
-share/gnome/pixmaps/teg_pix/themes/m2/America-Oregon
-share/gnome/pixmaps/teg_pix/themes/m2/America-Terranova
-share/gnome/pixmaps/teg_pix/themes/m2/America-Yukon
-share/gnome/pixmaps/teg_pix/themes/m2/Asia-Arabia
-share/gnome/pixmaps/teg_pix/themes/m2/Asia-Aral
-share/gnome/pixmaps/teg_pix/themes/m2/Asia-China
-share/gnome/pixmaps/teg_pix/themes/m2/Asia-Gobi
-share/gnome/pixmaps/teg_pix/themes/m2/Asia-India
-share/gnome/pixmaps/teg_pix/themes/m2/Asia-Iran
-share/gnome/pixmaps/teg_pix/themes/m2/Asia-Israel
-share/gnome/pixmaps/teg_pix/themes/m2/Asia-Japon
-share/gnome/pixmaps/teg_pix/themes/m2/Asia-Katchatka
-share/gnome/pixmaps/teg_pix/themes/m2/Asia-Malaysia
-share/gnome/pixmaps/teg_pix/themes/m2/Asia-Mongolia
-share/gnome/pixmaps/teg_pix/themes/m2/Asia-Siberia
-share/gnome/pixmaps/teg_pix/themes/m2/Asia-Taimir
-share/gnome/pixmaps/teg_pix/themes/m2/Asia-Tartaria
-share/gnome/pixmaps/teg_pix/themes/m2/Asia-Turquia
-share/gnome/pixmaps/teg_pix/themes/m2/Australia-Australia
-share/gnome/pixmaps/teg_pix/themes/m2/Australia-Borneo
-share/gnome/pixmaps/teg_pix/themes/m2/Australia-Java
-share/gnome/pixmaps/teg_pix/themes/m2/Australia-Sumatra
-share/gnome/pixmaps/teg_pix/themes/m2/Europe-Alemania
-share/gnome/pixmaps/teg_pix/themes/m2/Europe-Espania
-share/gnome/pixmaps/teg_pix/themes/m2/Europe-Francia
-share/gnome/pixmaps/teg_pix/themes/m2/Europe-Grand_Bretania
-share/gnome/pixmaps/teg_pix/themes/m2/Europe-Islandia
-share/gnome/pixmaps/teg_pix/themes/m2/Europe-Italia
-share/gnome/pixmaps/teg_pix/themes/m2/Europe-Polonia
-share/gnome/pixmaps/teg_pix/themes/m2/Europe-Rusia
-share/gnome/pixmaps/teg_pix/themes/m2/Europe-Suecia
-share/gnome/pixmaps/teg_pix/themes/m2/Southamerica-Argentinia
-share/gnome/pixmaps/teg_pix/themes/m2/Southamerica-Brasil
-share/gnome/pixmaps/teg_pix/themes/m2/Southamerica-Chile
-share/gnome/pixmaps/teg_pix/themes/m2/Southamerica-Colombia
-share/gnome/pixmaps/teg_pix/themes/m2/Southamerica-Peru
-share/gnome/pixmaps/teg_pix/themes/m2/Southamerica-Uruguay
-share/gnome/pixmaps/teg_pix/themes/m2/board.jpg
-share/gnome/pixmaps/teg_pix/themes/m2/dice-1.png
-share/gnome/pixmaps/teg_pix/themes/m2/dice-2.png
-share/gnome/pixmaps/teg_pix/themes/m2/dice-3.png
-share/gnome/pixmaps/teg_pix/themes/m2/dice-4.png
-share/gnome/pixmaps/teg_pix/themes/m2/dice-5.png
-share/gnome/pixmaps/teg_pix/themes/m2/dice-6.png
-share/gnome/pixmaps/teg_pix/themes/m2/infobar.png
-share/gnome/pixmaps/teg_pix/themes/m2/mini_shot.png
-share/gnome/pixmaps/teg_pix/themes/m2/tar_cannon.png
-share/gnome/pixmaps/teg_pix/themes/m2/tar_horse.png
-share/gnome/pixmaps/teg_pix/themes/m2/tar_infantry.png
-share/gnome/pixmaps/teg_pix/themes/m2/tar_jocker.png
-share/gnome/pixmaps/teg_pix/themes/m2/teg_theme.xml
-share/gnome/pixmaps/teg_pix/themes/sentimental/Africa-Egipto
-share/gnome/pixmaps/teg_pix/themes/sentimental/Africa-Etiopia
-share/gnome/pixmaps/teg_pix/themes/sentimental/Africa-Madagascar
-share/gnome/pixmaps/teg_pix/themes/sentimental/Africa-Sahara
-share/gnome/pixmaps/teg_pix/themes/sentimental/Africa-Sudafrica
-share/gnome/pixmaps/teg_pix/themes/sentimental/Africa-Zaire
-share/gnome/pixmaps/teg_pix/themes/sentimental/America-Alaska
-share/gnome/pixmaps/teg_pix/themes/sentimental/America-California
-share/gnome/pixmaps/teg_pix/themes/sentimental/America-Canada
-share/gnome/pixmaps/teg_pix/themes/sentimental/America-Groenlandia
-share/gnome/pixmaps/teg_pix/themes/sentimental/America-Labrador
-share/gnome/pixmaps/teg_pix/themes/sentimental/America-Mexico
-share/gnome/pixmaps/teg_pix/themes/sentimental/America-Nuevayork
-share/gnome/pixmaps/teg_pix/themes/sentimental/America-Oregon
-share/gnome/pixmaps/teg_pix/themes/sentimental/America-Terranova
-share/gnome/pixmaps/teg_pix/themes/sentimental/America-Yukon
-share/gnome/pixmaps/teg_pix/themes/sentimental/Asia-Arabia
-share/gnome/pixmaps/teg_pix/themes/sentimental/Asia-Aral
-share/gnome/pixmaps/teg_pix/themes/sentimental/Asia-China
-share/gnome/pixmaps/teg_pix/themes/sentimental/Asia-Gobi
-share/gnome/pixmaps/teg_pix/themes/sentimental/Asia-India
-share/gnome/pixmaps/teg_pix/themes/sentimental/Asia-Israel
-share/gnome/pixmaps/teg_pix/themes/sentimental/Asia-Malaysia
-share/gnome/pixmaps/teg_pix/themes/sentimental/Asia-Mongolia
-share/gnome/pixmaps/teg_pix/themes/sentimental/Asia-Siberia
-share/gnome/pixmaps/teg_pix/themes/sentimental/Asia-Taimir
-share/gnome/pixmaps/teg_pix/themes/sentimental/Asia-Tartaria
-share/gnome/pixmaps/teg_pix/themes/sentimental/Asia-Turquia
-share/gnome/pixmaps/teg_pix/themes/sentimental/Asia-iran
-share/gnome/pixmaps/teg_pix/themes/sentimental/Asia-japon
-share/gnome/pixmaps/teg_pix/themes/sentimental/Asia-katchatka
-share/gnome/pixmaps/teg_pix/themes/sentimental/Australia-Australia
-share/gnome/pixmaps/teg_pix/themes/sentimental/Australia-Sumatra
-share/gnome/pixmaps/teg_pix/themes/sentimental/Australia_Borneo
-share/gnome/pixmaps/teg_pix/themes/sentimental/Australia_Java
-share/gnome/pixmaps/teg_pix/themes/sentimental/Europe-Alemania
-share/gnome/pixmaps/teg_pix/themes/sentimental/Europe-Espania
-share/gnome/pixmaps/teg_pix/themes/sentimental/Europe-Francia
-share/gnome/pixmaps/teg_pix/themes/sentimental/Europe-Grand_Bretania
-share/gnome/pixmaps/teg_pix/themes/sentimental/Europe-Islandia
-share/gnome/pixmaps/teg_pix/themes/sentimental/Europe-Italia
-share/gnome/pixmaps/teg_pix/themes/sentimental/Europe-Polonia
-share/gnome/pixmaps/teg_pix/themes/sentimental/Europe-Rusia
-share/gnome/pixmaps/teg_pix/themes/sentimental/Europe-Suecia
-share/gnome/pixmaps/teg_pix/themes/sentimental/Infobar.png
-share/gnome/pixmaps/teg_pix/themes/sentimental/Southamerica-Argentinia
-share/gnome/pixmaps/teg_pix/themes/sentimental/Southamerica-Brasil
-share/gnome/pixmaps/teg_pix/themes/sentimental/Southamerica-Chile
-share/gnome/pixmaps/teg_pix/themes/sentimental/Southamerica-Colombia
-share/gnome/pixmaps/teg_pix/themes/sentimental/Southamerica-Peru
-share/gnome/pixmaps/teg_pix/themes/sentimental/Southamerica-Uruguay
-share/gnome/pixmaps/teg_pix/themes/sentimental/board.jpg
-share/gnome/pixmaps/teg_pix/themes/sentimental/cannon.png
-share/gnome/pixmaps/teg_pix/themes/sentimental/dice-1.png
-share/gnome/pixmaps/teg_pix/themes/sentimental/dice-2.png
-share/gnome/pixmaps/teg_pix/themes/sentimental/dice-3.png
-share/gnome/pixmaps/teg_pix/themes/sentimental/dice-4.png
-share/gnome/pixmaps/teg_pix/themes/sentimental/dice-5.png
-share/gnome/pixmaps/teg_pix/themes/sentimental/dice-6.png
-share/gnome/pixmaps/teg_pix/themes/sentimental/horse.png
-share/gnome/pixmaps/teg_pix/themes/sentimental/infantry.png
-share/gnome/pixmaps/teg_pix/themes/sentimental/jocker.png
-share/gnome/pixmaps/teg_pix/themes/sentimental/mini_shot.png
-share/gnome/pixmaps/teg_pix/themes/sentimental/teg_theme.xml
+share/pixmaps/teg_icono.png
+share/pixmaps/teg_pix/color_player_black.png
+share/pixmaps/teg_pix/color_player_blue.png
+share/pixmaps/teg_pix/color_player_green.png
+share/pixmaps/teg_pix/color_player_pink.png
+share/pixmaps/teg_pix/color_player_red.png
+share/pixmaps/teg_pix/color_player_yellow.png
+share/pixmaps/teg_pix/disc_black.png
+share/pixmaps/teg_pix/disc_blue.png
+share/pixmaps/teg_pix/disc_green.png
+share/pixmaps/teg_pix/disc_grey.png
+share/pixmaps/teg_pix/disc_over.png
+share/pixmaps/teg_pix/disc_pink.png
+share/pixmaps/teg_pix/disc_red.png
+share/pixmaps/teg_pix/disc_yellow.png
+share/pixmaps/teg_pix/objetivo.png
+share/pixmaps/teg_pix/teg_icono.png
+share/pixmaps/teg_pix/teg_icono.xpm
+share/pixmaps/teg_pix/themes/draco/10.png
+share/pixmaps/teg_pix/themes/draco/13.png
+share/pixmaps/teg_pix/themes/draco/14.png
+share/pixmaps/teg_pix/themes/draco/15.png
+share/pixmaps/teg_pix/themes/draco/16.png
+share/pixmaps/teg_pix/themes/draco/17.png
+share/pixmaps/teg_pix/themes/draco/18.png
+share/pixmaps/teg_pix/themes/draco/19.png
+share/pixmaps/teg_pix/themes/draco/20.png
+share/pixmaps/teg_pix/themes/draco/21.png
+share/pixmaps/teg_pix/themes/draco/22.png
+share/pixmaps/teg_pix/themes/draco/23.png
+share/pixmaps/teg_pix/themes/draco/24.png
+share/pixmaps/teg_pix/themes/draco/25.png
+share/pixmaps/teg_pix/themes/draco/26.png
+share/pixmaps/teg_pix/themes/draco/28.png
+share/pixmaps/teg_pix/themes/draco/29.png
+share/pixmaps/teg_pix/themes/draco/30.png
+share/pixmaps/teg_pix/themes/draco/31.png
+share/pixmaps/teg_pix/themes/draco/32.png
+share/pixmaps/teg_pix/themes/draco/33.png
+share/pixmaps/teg_pix/themes/draco/34.png
+share/pixmaps/teg_pix/themes/draco/35.png
+share/pixmaps/teg_pix/themes/draco/36.png
+share/pixmaps/teg_pix/themes/draco/37.png
+share/pixmaps/teg_pix/themes/draco/38.png
+share/pixmaps/teg_pix/themes/draco/39.png
+share/pixmaps/teg_pix/themes/draco/40.png
+share/pixmaps/teg_pix/themes/draco/41.png
+share/pixmaps/teg_pix/themes/draco/42.png
+share/pixmaps/teg_pix/themes/draco/43.png
+share/pixmaps/teg_pix/themes/draco/44.png
+share/pixmaps/teg_pix/themes/draco/45.png
+share/pixmaps/teg_pix/themes/draco/46.png
+share/pixmaps/teg_pix/themes/draco/47.png
+share/pixmaps/teg_pix/themes/draco/48.png
+share/pixmaps/teg_pix/themes/draco/49.png
+share/pixmaps/teg_pix/themes/draco/50.png
+share/pixmaps/teg_pix/themes/draco/51.png
+share/pixmaps/teg_pix/themes/draco/52.png
+share/pixmaps/teg_pix/themes/draco/53.png
+share/pixmaps/teg_pix/themes/draco/54.png
+share/pixmaps/teg_pix/themes/draco/55.png
+share/pixmaps/teg_pix/themes/draco/56.png
+share/pixmaps/teg_pix/themes/draco/57.png
+share/pixmaps/teg_pix/themes/draco/58.png
+share/pixmaps/teg_pix/themes/draco/59.png
+share/pixmaps/teg_pix/themes/draco/60.png
+share/pixmaps/teg_pix/themes/draco/8.png
+share/pixmaps/teg_pix/themes/draco/9.png
+share/pixmaps/teg_pix/themes/draco/board.jpg
+share/pixmaps/teg_pix/themes/draco/dice-1.png
+share/pixmaps/teg_pix/themes/draco/dice-2.png
+share/pixmaps/teg_pix/themes/draco/dice-3.png
+share/pixmaps/teg_pix/themes/draco/dice-4.png
+share/pixmaps/teg_pix/themes/draco/dice-5.png
+share/pixmaps/teg_pix/themes/draco/dice-6.png
+share/pixmaps/teg_pix/themes/draco/infobar.png
+share/pixmaps/teg_pix/themes/draco/mini_shot.png
+share/pixmaps/teg_pix/themes/draco/tar_cannon.png
+share/pixmaps/teg_pix/themes/draco/tar_horse.png
+share/pixmaps/teg_pix/themes/draco/tar_infantry.png
+share/pixmaps/teg_pix/themes/draco/tar_jocker.png
+share/pixmaps/teg_pix/themes/draco/teg_theme.xml
+share/pixmaps/teg_pix/themes/draco/wizard_black.png
+share/pixmaps/teg_pix/themes/draco/wizard_blue.png
+share/pixmaps/teg_pix/themes/draco/wizard_green.png
+share/pixmaps/teg_pix/themes/draco/wizard_pink.png
+share/pixmaps/teg_pix/themes/draco/wizard_red.png
+share/pixmaps/teg_pix/themes/draco/wizard_yellow.png
+share/pixmaps/teg_pix/themes/m2/Africa-Egipto
+share/pixmaps/teg_pix/themes/m2/Africa-Etiopia
+share/pixmaps/teg_pix/themes/m2/Africa-Madagascar
+share/pixmaps/teg_pix/themes/m2/Africa-Sahara
+share/pixmaps/teg_pix/themes/m2/Africa-Sudafrica
+share/pixmaps/teg_pix/themes/m2/Africa-Zaire
+share/pixmaps/teg_pix/themes/m2/America-Alaska
+share/pixmaps/teg_pix/themes/m2/America-California
+share/pixmaps/teg_pix/themes/m2/America-Canada
+share/pixmaps/teg_pix/themes/m2/America-Groenlandia
+share/pixmaps/teg_pix/themes/m2/America-Labrador
+share/pixmaps/teg_pix/themes/m2/America-Mexico
+share/pixmaps/teg_pix/themes/m2/America-Nuevayork
+share/pixmaps/teg_pix/themes/m2/America-Oregon
+share/pixmaps/teg_pix/themes/m2/America-Terranova
+share/pixmaps/teg_pix/themes/m2/America-Yukon
+share/pixmaps/teg_pix/themes/m2/Asia-Arabia
+share/pixmaps/teg_pix/themes/m2/Asia-Aral
+share/pixmaps/teg_pix/themes/m2/Asia-China
+share/pixmaps/teg_pix/themes/m2/Asia-Gobi
+share/pixmaps/teg_pix/themes/m2/Asia-India
+share/pixmaps/teg_pix/themes/m2/Asia-Iran
+share/pixmaps/teg_pix/themes/m2/Asia-Israel
+share/pixmaps/teg_pix/themes/m2/Asia-Japon
+share/pixmaps/teg_pix/themes/m2/Asia-Katchatka
+share/pixmaps/teg_pix/themes/m2/Asia-Malaysia
+share/pixmaps/teg_pix/themes/m2/Asia-Mongolia
+share/pixmaps/teg_pix/themes/m2/Asia-Siberia
+share/pixmaps/teg_pix/themes/m2/Asia-Taimir
+share/pixmaps/teg_pix/themes/m2/Asia-Tartaria
+share/pixmaps/teg_pix/themes/m2/Asia-Turquia
+share/pixmaps/teg_pix/themes/m2/Australia-Australia
+share/pixmaps/teg_pix/themes/m2/Australia-Borneo
+share/pixmaps/teg_pix/themes/m2/Australia-Java
+share/pixmaps/teg_pix/themes/m2/Australia-Sumatra
+share/pixmaps/teg_pix/themes/m2/Europe-Alemania
+share/pixmaps/teg_pix/themes/m2/Europe-Espania
+share/pixmaps/teg_pix/themes/m2/Europe-Francia
+share/pixmaps/teg_pix/themes/m2/Europe-Grand_Bretania
+share/pixmaps/teg_pix/themes/m2/Europe-Islandia
+share/pixmaps/teg_pix/themes/m2/Europe-Italia
+share/pixmaps/teg_pix/themes/m2/Europe-Polonia
+share/pixmaps/teg_pix/themes/m2/Europe-Rusia
+share/pixmaps/teg_pix/themes/m2/Europe-Suecia
+share/pixmaps/teg_pix/themes/m2/Southamerica-Argentinia
+share/pixmaps/teg_pix/themes/m2/Southamerica-Brasil
+share/pixmaps/teg_pix/themes/m2/Southamerica-Chile
+share/pixmaps/teg_pix/themes/m2/Southamerica-Colombia
+share/pixmaps/teg_pix/themes/m2/Southamerica-Peru
+share/pixmaps/teg_pix/themes/m2/Southamerica-Uruguay
+share/pixmaps/teg_pix/themes/m2/board.jpg
+share/pixmaps/teg_pix/themes/m2/dice-1.png
+share/pixmaps/teg_pix/themes/m2/dice-2.png
+share/pixmaps/teg_pix/themes/m2/dice-3.png
+share/pixmaps/teg_pix/themes/m2/dice-4.png
+share/pixmaps/teg_pix/themes/m2/dice-5.png
+share/pixmaps/teg_pix/themes/m2/dice-6.png
+share/pixmaps/teg_pix/themes/m2/infobar.png
+share/pixmaps/teg_pix/themes/m2/mini_shot.png
+share/pixmaps/teg_pix/themes/m2/tar_cannon.png
+share/pixmaps/teg_pix/themes/m2/tar_horse.png
+share/pixmaps/teg_pix/themes/m2/tar_infantry.png
+share/pixmaps/teg_pix/themes/m2/tar_jocker.png
+share/pixmaps/teg_pix/themes/m2/teg_theme.xml
+share/pixmaps/teg_pix/themes/sentimental/Africa-Egipto
+share/pixmaps/teg_pix/themes/sentimental/Africa-Etiopia
+share/pixmaps/teg_pix/themes/sentimental/Africa-Madagascar
+share/pixmaps/teg_pix/themes/sentimental/Africa-Sahara
+share/pixmaps/teg_pix/themes/sentimental/Africa-Sudafrica
+share/pixmaps/teg_pix/themes/sentimental/Africa-Zaire
+share/pixmaps/teg_pix/themes/sentimental/America-Alaska
+share/pixmaps/teg_pix/themes/sentimental/America-California
+share/pixmaps/teg_pix/themes/sentimental/America-Canada
+share/pixmaps/teg_pix/themes/sentimental/America-Groenlandia
+share/pixmaps/teg_pix/themes/sentimental/America-Labrador
+share/pixmaps/teg_pix/themes/sentimental/America-Mexico
+share/pixmaps/teg_pix/themes/sentimental/America-Nuevayork
+share/pixmaps/teg_pix/themes/sentimental/America-Oregon
+share/pixmaps/teg_pix/themes/sentimental/America-Terranova
+share/pixmaps/teg_pix/themes/sentimental/America-Yukon
+share/pixmaps/teg_pix/themes/sentimental/Asia-Arabia
+share/pixmaps/teg_pix/themes/sentimental/Asia-Aral
+share/pixmaps/teg_pix/themes/sentimental/Asia-China
+share/pixmaps/teg_pix/themes/sentimental/Asia-Gobi
+share/pixmaps/teg_pix/themes/sentimental/Asia-India
+share/pixmaps/teg_pix/themes/sentimental/Asia-Israel
+share/pixmaps/teg_pix/themes/sentimental/Asia-Malaysia
+share/pixmaps/teg_pix/themes/sentimental/Asia-Mongolia
+share/pixmaps/teg_pix/themes/sentimental/Asia-Siberia
+share/pixmaps/teg_pix/themes/sentimental/Asia-Taimir
+share/pixmaps/teg_pix/themes/sentimental/Asia-Tartaria
+share/pixmaps/teg_pix/themes/sentimental/Asia-Turquia
+share/pixmaps/teg_pix/themes/sentimental/Asia-iran
+share/pixmaps/teg_pix/themes/sentimental/Asia-japon
+share/pixmaps/teg_pix/themes/sentimental/Asia-katchatka
+share/pixmaps/teg_pix/themes/sentimental/Australia-Australia
+share/pixmaps/teg_pix/themes/sentimental/Australia-Sumatra
+share/pixmaps/teg_pix/themes/sentimental/Australia_Borneo
+share/pixmaps/teg_pix/themes/sentimental/Australia_Java
+share/pixmaps/teg_pix/themes/sentimental/Europe-Alemania
+share/pixmaps/teg_pix/themes/sentimental/Europe-Espania
+share/pixmaps/teg_pix/themes/sentimental/Europe-Francia
+share/pixmaps/teg_pix/themes/sentimental/Europe-Grand_Bretania
+share/pixmaps/teg_pix/themes/sentimental/Europe-Islandia
+share/pixmaps/teg_pix/themes/sentimental/Europe-Italia
+share/pixmaps/teg_pix/themes/sentimental/Europe-Polonia
+share/pixmaps/teg_pix/themes/sentimental/Europe-Rusia
+share/pixmaps/teg_pix/themes/sentimental/Europe-Suecia
+share/pixmaps/teg_pix/themes/sentimental/Infobar.png
+share/pixmaps/teg_pix/themes/sentimental/Southamerica-Argentinia
+share/pixmaps/teg_pix/themes/sentimental/Southamerica-Brasil
+share/pixmaps/teg_pix/themes/sentimental/Southamerica-Chile
+share/pixmaps/teg_pix/themes/sentimental/Southamerica-Colombia
+share/pixmaps/teg_pix/themes/sentimental/Southamerica-Peru
+share/pixmaps/teg_pix/themes/sentimental/Southamerica-Uruguay
+share/pixmaps/teg_pix/themes/sentimental/board.jpg
+share/pixmaps/teg_pix/themes/sentimental/cannon.png
+share/pixmaps/teg_pix/themes/sentimental/dice-1.png
+share/pixmaps/teg_pix/themes/sentimental/dice-2.png
+share/pixmaps/teg_pix/themes/sentimental/dice-3.png
+share/pixmaps/teg_pix/themes/sentimental/dice-4.png
+share/pixmaps/teg_pix/themes/sentimental/dice-5.png
+share/pixmaps/teg_pix/themes/sentimental/dice-6.png
+share/pixmaps/teg_pix/themes/sentimental/horse.png
+share/pixmaps/teg_pix/themes/sentimental/infantry.png
+share/pixmaps/teg_pix/themes/sentimental/jocker.png
+share/pixmaps/teg_pix/themes/sentimental/mini_shot.png
+share/pixmaps/teg_pix/themes/sentimental/teg_theme.xml
 share/locale/de/LC_MESSAGES/teg.mo
 share/locale/es/LC_MESSAGES/teg.mo
 share/locale/fr/LC_MESSAGES/teg.mo
@@ -235,11 +235,11 @@ share/locale/it/LC_MESSAGES/teg.mo
 share/locale/pl/LC_MESSAGES/teg.mo
 share/locale/pt/LC_MESSAGES/teg.mo
 share/locale/pt_BR/LC_MESSAGES/teg.mo
-@dirrm share/gnome/pixmaps/teg_pix/themes/sentimental
-@dirrm share/gnome/pixmaps/teg_pix/themes/m2
-@dirrm share/gnome/pixmaps/teg_pix/themes/draco
-@dirrm share/gnome/pixmaps/teg_pix/themes
-@dirrm share/gnome/pixmaps/teg_pix
+@dirrm share/pixmaps/teg_pix/themes/sentimental
+@dirrm share/pixmaps/teg_pix/themes/m2
+@dirrm share/pixmaps/teg_pix/themes/draco
+@dirrm share/pixmaps/teg_pix/themes
+@dirrm share/pixmaps/teg_pix
 @dirrm share/gnome/help/teg/C/stylesheet-images
 @dirrm share/gnome/help/teg/C/figures
 @dirrm share/gnome/help/teg/C
diff --git a/games/wesnoth-devel/Makefile b/games/wesnoth-devel/Makefile
index 35a263e318ff..a2915a655c4e 100644
--- a/games/wesnoth-devel/Makefile
+++ b/games/wesnoth-devel/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	wesnoth
 PORTVERSION=	1.2.6
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://www.wesnoth.org/files/
@@ -112,8 +113,7 @@ pre-everything::
 .endif
 
 post-configure:
-	@${REINPLACE_CMD} -e 's|[$$][{]datarootdir[}]/applications|${LOCALBASE}/share/gnome/applications|; \
-		s|[$$][{]datarootdir[}]/icons|${LOCALBASE}/share/gnome/pixmaps|' \
+	@${REINPLACE_CMD} -e 's|[$$][{]datarootdir[}]/icons|${LOCALBASE}/share/pixmaps|' \
 			${WRKSRC}/icons/Makefile
 
 .include <bsd.port.post.mk>
diff --git a/games/wesnoth-devel/pkg-plist b/games/wesnoth-devel/pkg-plist
index 151a95fe3fb5..a356461c7d09 100644
--- a/games/wesnoth-devel/pkg-plist
+++ b/games/wesnoth-devel/pkg-plist
@@ -6012,8 +6012,8 @@ share/locale/zh_CN/LC_MESSAGES/wesnoth.mo
 @dirrmtry man/sv/man6
 @dirrmtry man/sv
 %%GNOME:%%@cwd %%LOCALBASE%%
-%%GNOME:%%share/gnome/applications/wesnoth.desktop
-%%GNOME:%%share/gnome/pixmaps/wesnoth-icon.png
+%%GNOME:%%share/applications/wesnoth.desktop
+%%GNOME:%%share/pixmaps/wesnoth-icon.png
 %%KDE:%%@cwd %%LOCALBASE%%
 %%KDE:%%share/applnk/Games/TacticStrategy/wesnoth.desktop
 %%KDE:%%share/icons/wesnoth-icon.png
@@ -6028,3 +6028,4 @@ share/locale/zh_CN/LC_MESSAGES/wesnoth.mo
 @dirrmtry share/locale/nb_NO
 @dirrmtry share/locale/tl/LC_MESSAGES
 @dirrmtry share/locale/tl
+@dirrmtry share/applications
diff --git a/games/wesnoth/Makefile b/games/wesnoth/Makefile
index 35a263e318ff..a2915a655c4e 100644
--- a/games/wesnoth/Makefile
+++ b/games/wesnoth/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	wesnoth
 PORTVERSION=	1.2.6
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://www.wesnoth.org/files/
@@ -112,8 +113,7 @@ pre-everything::
 .endif
 
 post-configure:
-	@${REINPLACE_CMD} -e 's|[$$][{]datarootdir[}]/applications|${LOCALBASE}/share/gnome/applications|; \
-		s|[$$][{]datarootdir[}]/icons|${LOCALBASE}/share/gnome/pixmaps|' \
+	@${REINPLACE_CMD} -e 's|[$$][{]datarootdir[}]/icons|${LOCALBASE}/share/pixmaps|' \
 			${WRKSRC}/icons/Makefile
 
 .include <bsd.port.post.mk>
diff --git a/games/wesnoth/pkg-plist b/games/wesnoth/pkg-plist
index 151a95fe3fb5..a356461c7d09 100644
--- a/games/wesnoth/pkg-plist
+++ b/games/wesnoth/pkg-plist
@@ -6012,8 +6012,8 @@ share/locale/zh_CN/LC_MESSAGES/wesnoth.mo
 @dirrmtry man/sv/man6
 @dirrmtry man/sv
 %%GNOME:%%@cwd %%LOCALBASE%%
-%%GNOME:%%share/gnome/applications/wesnoth.desktop
-%%GNOME:%%share/gnome/pixmaps/wesnoth-icon.png
+%%GNOME:%%share/applications/wesnoth.desktop
+%%GNOME:%%share/pixmaps/wesnoth-icon.png
 %%KDE:%%@cwd %%LOCALBASE%%
 %%KDE:%%share/applnk/Games/TacticStrategy/wesnoth.desktop
 %%KDE:%%share/icons/wesnoth-icon.png
@@ -6028,3 +6028,4 @@ share/locale/zh_CN/LC_MESSAGES/wesnoth.mo
 @dirrmtry share/locale/nb_NO
 @dirrmtry share/locale/tl/LC_MESSAGES
 @dirrmtry share/locale/tl
+@dirrmtry share/applications
diff --git a/games/xpuyopuyo/Makefile b/games/xpuyopuyo/Makefile
index 2af14e396360..d44e8aa41a49 100644
--- a/games/xpuyopuyo/Makefile
+++ b/games/xpuyopuyo/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xpuyopuyo
 PORTVERSION=	0.9.8
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	games
 MASTER_SITES=	http://chaos2.org/xpuyopuyo/
 
@@ -37,10 +37,8 @@ CONFIGURE_ARGS+=--with-libmikmod-prefix=${LOCALBASE}
 .if ${HAVE_GNOME:Mgnomelibs}!=""
 USE_GNOME+=	gnomelibs gnomehack
 PKGNAMESUFFIX=	-gnome
-PLIST_SUB+=	DATADIR="share/gnome"
 .else
 CONFIGURE_ARGS+=	--without-gnome
-PLIST_SUB+=	DATADIR="share"
 .endif
 
 .if defined(WITH_ROTATE_FIXED)
diff --git a/games/xpuyopuyo/files/patch-ac b/games/xpuyopuyo/files/patch-ac
deleted file mode 100644
index 673c154369a3..000000000000
--- a/games/xpuyopuyo/files/patch-ac
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.in.orig	Mon Jun 26 00:35:33 2000
-+++ configure.in	Sun Oct  1 13:56:50 2000
-@@ -145,7 +145,7 @@
-    GNOME_PIXMAPS=""
- else
-    GNOME=1
--   GNOME_DESKTOP=`$GNOME_CONFIG --datadir`/gnome/apps/Games/
-+   GNOME_DESKTOP=`$GNOME_CONFIG --datadir`/apps/Games/
-    GNOME_PIXMAPS=`$GNOME_CONFIG --datadir`/pixmaps/
-    echo "GNOME features enabled"
-    echo "GNOME desktop directory:  $GNOME_DESKTOP"
diff --git a/games/xpuyopuyo/pkg-plist b/games/xpuyopuyo/pkg-plist
index 53a13348050d..5f9d26a2b00f 100644
--- a/games/xpuyopuyo/pkg-plist
+++ b/games/xpuyopuyo/pkg-plist
@@ -1,220 +1,220 @@
 bin/xpuyopuyo
 %%GNOME:%%share/gnome/apps/Games/xpuyopuyo.desktop
-%%GNOME:%%share/gnome/pixmaps/xpuyopuyo.xpm
-%%DATADIR%%/xpuyopuyo/copying.txt
-%%DATADIR%%/xpuyopuyo/sounds/game.xm
-%%DATADIR%%/xpuyopuyo/sounds/gameover.xm
-%%DATADIR%%/xpuyopuyo/sounds/prelude.xm
-%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_0.xpm
-%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_0j.xpm
-%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_1.xpm
-%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_1j.xpm
-%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_2.xpm
-%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_2j.xpm
-%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_3.xpm
-%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_3j.xpm
-%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_4.xpm
-%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_4j.xpm
-%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_5.xpm
-%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_5j.xpm
-%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_clear.xpm
-%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_clearb.xpm
-%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_expl.xpm
-%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_gameover.xpm
-%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_ind.xpm
-%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_num0.xpm
-%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_num1.xpm
-%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_num2.xpm
-%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_num3.xpm
-%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_num4.xpm
-%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_num5.xpm
-%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_num6.xpm
-%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_num7.xpm
-%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_num8.xpm
-%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_num9.xpm
-%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_rock.xpm
-%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_rockbig.xpm
-%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_rockdemon.xpm
-%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_side.xpm
-%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_tile_bottom1.xpm
-%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_tile_bottom2.xpm
-%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_tile_bottom3.xpm
-%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_tile_left.xpm
-%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_tile_leftbottom.xpm
-%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_tile_lefttop.xpm
-%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_tile_ltrans.xpm
-%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_tile_right.xpm
-%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_tile_rightbottom.xpm
-%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_tile_righttop.xpm
-%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_tile_rtrans.xpm
-%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_tile_top.xpm
-%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_title.xpm
-%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_top.xpm
-%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_trans.xpm
-%%DATADIR%%/xpuyopuyo/themes/default/img_0.xpm
-%%DATADIR%%/xpuyopuyo/themes/default/img_0j.xpm
-%%DATADIR%%/xpuyopuyo/themes/default/img_1.xpm
-%%DATADIR%%/xpuyopuyo/themes/default/img_1j.xpm
-%%DATADIR%%/xpuyopuyo/themes/default/img_2.xpm
-%%DATADIR%%/xpuyopuyo/themes/default/img_2j.xpm
-%%DATADIR%%/xpuyopuyo/themes/default/img_3.xpm
-%%DATADIR%%/xpuyopuyo/themes/default/img_3j.xpm
-%%DATADIR%%/xpuyopuyo/themes/default/img_4.xpm
-%%DATADIR%%/xpuyopuyo/themes/default/img_4j.xpm
-%%DATADIR%%/xpuyopuyo/themes/default/img_5.xpm
-%%DATADIR%%/xpuyopuyo/themes/default/img_5j.xpm
-%%DATADIR%%/xpuyopuyo/themes/default/img_clear.xpm
-%%DATADIR%%/xpuyopuyo/themes/default/img_clearb.xpm
-%%DATADIR%%/xpuyopuyo/themes/default/img_expl.xpm
-%%DATADIR%%/xpuyopuyo/themes/default/img_gameover.xpm
-%%DATADIR%%/xpuyopuyo/themes/default/img_ind.xpm
-%%DATADIR%%/xpuyopuyo/themes/default/img_num0.xpm
-%%DATADIR%%/xpuyopuyo/themes/default/img_num1.xpm
-%%DATADIR%%/xpuyopuyo/themes/default/img_num2.xpm
-%%DATADIR%%/xpuyopuyo/themes/default/img_num3.xpm
-%%DATADIR%%/xpuyopuyo/themes/default/img_num4.xpm
-%%DATADIR%%/xpuyopuyo/themes/default/img_num5.xpm
-%%DATADIR%%/xpuyopuyo/themes/default/img_num6.xpm
-%%DATADIR%%/xpuyopuyo/themes/default/img_num7.xpm
-%%DATADIR%%/xpuyopuyo/themes/default/img_num8.xpm
-%%DATADIR%%/xpuyopuyo/themes/default/img_num9.xpm
-%%DATADIR%%/xpuyopuyo/themes/default/img_paused.xpm
-%%DATADIR%%/xpuyopuyo/themes/default/img_rock.xpm
-%%DATADIR%%/xpuyopuyo/themes/default/img_rockbig.xpm
-%%DATADIR%%/xpuyopuyo/themes/default/img_rockdemon.xpm
-%%DATADIR%%/xpuyopuyo/themes/default/img_side.xpm
-%%DATADIR%%/xpuyopuyo/themes/default/img_tile_bottom1.xpm
-%%DATADIR%%/xpuyopuyo/themes/default/img_tile_bottom2.xpm
-%%DATADIR%%/xpuyopuyo/themes/default/img_tile_bottom3.xpm
-%%DATADIR%%/xpuyopuyo/themes/default/img_tile_left.xpm
-%%DATADIR%%/xpuyopuyo/themes/default/img_tile_leftbottom.xpm
-%%DATADIR%%/xpuyopuyo/themes/default/img_tile_lefttop.xpm
-%%DATADIR%%/xpuyopuyo/themes/default/img_tile_ltrans.xpm
-%%DATADIR%%/xpuyopuyo/themes/default/img_tile_right.xpm
-%%DATADIR%%/xpuyopuyo/themes/default/img_tile_rightbottom.xpm
-%%DATADIR%%/xpuyopuyo/themes/default/img_tile_righttop.xpm
-%%DATADIR%%/xpuyopuyo/themes/default/img_tile_rtrans.xpm
-%%DATADIR%%/xpuyopuyo/themes/default/img_tile_top.xpm
-%%DATADIR%%/xpuyopuyo/themes/default/img_title.xpm
-%%DATADIR%%/xpuyopuyo/themes/default/img_top.xpm
-%%DATADIR%%/xpuyopuyo/themes/default/img_trans.xpm
-%%DATADIR%%/xpuyopuyo/themes/fabo/img_0.xpm
-%%DATADIR%%/xpuyopuyo/themes/fabo/img_0j.xpm
-%%DATADIR%%/xpuyopuyo/themes/fabo/img_1.xpm
-%%DATADIR%%/xpuyopuyo/themes/fabo/img_1j.xpm
-%%DATADIR%%/xpuyopuyo/themes/fabo/img_2.xpm
-%%DATADIR%%/xpuyopuyo/themes/fabo/img_2j.xpm
-%%DATADIR%%/xpuyopuyo/themes/fabo/img_3.xpm
-%%DATADIR%%/xpuyopuyo/themes/fabo/img_3j.xpm
-%%DATADIR%%/xpuyopuyo/themes/fabo/img_4.xpm
-%%DATADIR%%/xpuyopuyo/themes/fabo/img_4j.xpm
-%%DATADIR%%/xpuyopuyo/themes/fabo/img_5.xpm
-%%DATADIR%%/xpuyopuyo/themes/fabo/img_5j.xpm
-%%DATADIR%%/xpuyopuyo/themes/fabo/img_clear.xpm
-%%DATADIR%%/xpuyopuyo/themes/fabo/img_clearb.xpm
-%%DATADIR%%/xpuyopuyo/themes/fabo/img_expl.xpm
-%%DATADIR%%/xpuyopuyo/themes/fabo/img_gameover.xpm
-%%DATADIR%%/xpuyopuyo/themes/fabo/img_ind.xpm
-%%DATADIR%%/xpuyopuyo/themes/fabo/img_num0.xpm
-%%DATADIR%%/xpuyopuyo/themes/fabo/img_num1.xpm
-%%DATADIR%%/xpuyopuyo/themes/fabo/img_num2.xpm
-%%DATADIR%%/xpuyopuyo/themes/fabo/img_num3.xpm
-%%DATADIR%%/xpuyopuyo/themes/fabo/img_num4.xpm
-%%DATADIR%%/xpuyopuyo/themes/fabo/img_num5.xpm
-%%DATADIR%%/xpuyopuyo/themes/fabo/img_num6.xpm
-%%DATADIR%%/xpuyopuyo/themes/fabo/img_num7.xpm
-%%DATADIR%%/xpuyopuyo/themes/fabo/img_num8.xpm
-%%DATADIR%%/xpuyopuyo/themes/fabo/img_num9.xpm
-%%DATADIR%%/xpuyopuyo/themes/fabo/img_paused.xpm
-%%DATADIR%%/xpuyopuyo/themes/fabo/img_rock.xpm
-%%DATADIR%%/xpuyopuyo/themes/fabo/img_rockbig.xpm
-%%DATADIR%%/xpuyopuyo/themes/fabo/img_rockdemon.xpm
-%%DATADIR%%/xpuyopuyo/themes/fabo/img_side.xpm
-%%DATADIR%%/xpuyopuyo/themes/fabo/img_tile_bottom1.xpm
-%%DATADIR%%/xpuyopuyo/themes/fabo/img_tile_bottom2.xpm
-%%DATADIR%%/xpuyopuyo/themes/fabo/img_tile_bottom3.xpm
-%%DATADIR%%/xpuyopuyo/themes/fabo/img_tile_left.xpm
-%%DATADIR%%/xpuyopuyo/themes/fabo/img_tile_leftbottom.xpm
-%%DATADIR%%/xpuyopuyo/themes/fabo/img_tile_lefttop.xpm
-%%DATADIR%%/xpuyopuyo/themes/fabo/img_tile_ltrans.xpm
-%%DATADIR%%/xpuyopuyo/themes/fabo/img_tile_right.xpm
-%%DATADIR%%/xpuyopuyo/themes/fabo/img_tile_rightbottom.xpm
-%%DATADIR%%/xpuyopuyo/themes/fabo/img_tile_righttop.xpm
-%%DATADIR%%/xpuyopuyo/themes/fabo/img_tile_rtrans.xpm
-%%DATADIR%%/xpuyopuyo/themes/fabo/img_tile_top.xpm
-%%DATADIR%%/xpuyopuyo/themes/fabo/img_title.xpm
-%%DATADIR%%/xpuyopuyo/themes/fabo/img_top.xpm
-%%DATADIR%%/xpuyopuyo/themes/fabo/img_trans.xpm
-%%DATADIR%%/xpuyopuyo/themes/smileys/img_0.xpm
-%%DATADIR%%/xpuyopuyo/themes/smileys/img_0j.xpm
-%%DATADIR%%/xpuyopuyo/themes/smileys/img_1.xpm
-%%DATADIR%%/xpuyopuyo/themes/smileys/img_1j.xpm
-%%DATADIR%%/xpuyopuyo/themes/smileys/img_2.xpm
-%%DATADIR%%/xpuyopuyo/themes/smileys/img_2j.xpm
-%%DATADIR%%/xpuyopuyo/themes/smileys/img_3.xpm
-%%DATADIR%%/xpuyopuyo/themes/smileys/img_3j.xpm
-%%DATADIR%%/xpuyopuyo/themes/smileys/img_4.xpm
-%%DATADIR%%/xpuyopuyo/themes/smileys/img_4j.xpm
-%%DATADIR%%/xpuyopuyo/themes/smileys/img_5.xpm
-%%DATADIR%%/xpuyopuyo/themes/smileys/img_5j.xpm
-%%DATADIR%%/xpuyopuyo/themes/smileys/img_expl.xpm
-%%DATADIR%%/xpuyopuyo/themes/smileys/img_ind.xpm
-%%DATADIR%%/xpuyopuyo/themes/smileys/img_rock.xpm
-%%DATADIR%%/xpuyopuyo/themes/smileys/img_rockbig.xpm
-%%DATADIR%%/xpuyopuyo/themes/smileys/img_rockdemon.xpm
-%%DATADIR%%/xpuyopuyo/themes/spheres/img_0.xpm
-%%DATADIR%%/xpuyopuyo/themes/spheres/img_0j.xpm
-%%DATADIR%%/xpuyopuyo/themes/spheres/img_1.xpm
-%%DATADIR%%/xpuyopuyo/themes/spheres/img_1j.xpm
-%%DATADIR%%/xpuyopuyo/themes/spheres/img_2.xpm
-%%DATADIR%%/xpuyopuyo/themes/spheres/img_2j.xpm
-%%DATADIR%%/xpuyopuyo/themes/spheres/img_3.xpm
-%%DATADIR%%/xpuyopuyo/themes/spheres/img_3j.xpm
-%%DATADIR%%/xpuyopuyo/themes/spheres/img_4.xpm
-%%DATADIR%%/xpuyopuyo/themes/spheres/img_4j.xpm
-%%DATADIR%%/xpuyopuyo/themes/spheres/img_5.xpm
-%%DATADIR%%/xpuyopuyo/themes/spheres/img_5j.xpm
-%%DATADIR%%/xpuyopuyo/themes/spheres/img_clear.xpm
-%%DATADIR%%/xpuyopuyo/themes/spheres/img_clearb.xpm
-%%DATADIR%%/xpuyopuyo/themes/spheres/img_expl.xpm
-%%DATADIR%%/xpuyopuyo/themes/spheres/img_gameover.xpm
-%%DATADIR%%/xpuyopuyo/themes/spheres/img_ind.xpm
-%%DATADIR%%/xpuyopuyo/themes/spheres/img_num0.xpm
-%%DATADIR%%/xpuyopuyo/themes/spheres/img_num1.xpm
-%%DATADIR%%/xpuyopuyo/themes/spheres/img_num2.xpm
-%%DATADIR%%/xpuyopuyo/themes/spheres/img_num3.xpm
-%%DATADIR%%/xpuyopuyo/themes/spheres/img_num4.xpm
-%%DATADIR%%/xpuyopuyo/themes/spheres/img_num5.xpm
-%%DATADIR%%/xpuyopuyo/themes/spheres/img_num6.xpm
-%%DATADIR%%/xpuyopuyo/themes/spheres/img_num7.xpm
-%%DATADIR%%/xpuyopuyo/themes/spheres/img_num8.xpm
-%%DATADIR%%/xpuyopuyo/themes/spheres/img_num9.xpm
-%%DATADIR%%/xpuyopuyo/themes/spheres/img_paused.xpm
-%%DATADIR%%/xpuyopuyo/themes/spheres/img_rock.xpm
-%%DATADIR%%/xpuyopuyo/themes/spheres/img_rockbig.xpm
-%%DATADIR%%/xpuyopuyo/themes/spheres/img_rockdemon.xpm
-%%DATADIR%%/xpuyopuyo/themes/spheres/img_side.xpm
-%%DATADIR%%/xpuyopuyo/themes/spheres/img_tile_bottom1.xpm
-%%DATADIR%%/xpuyopuyo/themes/spheres/img_tile_bottom2.xpm
-%%DATADIR%%/xpuyopuyo/themes/spheres/img_tile_bottom3.xpm
-%%DATADIR%%/xpuyopuyo/themes/spheres/img_tile_left.xpm
-%%DATADIR%%/xpuyopuyo/themes/spheres/img_tile_leftbottom.xpm
-%%DATADIR%%/xpuyopuyo/themes/spheres/img_tile_lefttop.xpm
-%%DATADIR%%/xpuyopuyo/themes/spheres/img_tile_ltrans.xpm
-%%DATADIR%%/xpuyopuyo/themes/spheres/img_tile_right.xpm
-%%DATADIR%%/xpuyopuyo/themes/spheres/img_tile_rightbottom.xpm
-%%DATADIR%%/xpuyopuyo/themes/spheres/img_tile_righttop.xpm
-%%DATADIR%%/xpuyopuyo/themes/spheres/img_tile_rtrans.xpm
-%%DATADIR%%/xpuyopuyo/themes/spheres/img_tile_top.xpm
-%%DATADIR%%/xpuyopuyo/themes/spheres/img_title.xpm
-%%DATADIR%%/xpuyopuyo/themes/spheres/img_top.xpm
-%%DATADIR%%/xpuyopuyo/themes/spheres/img_trans.xpm
-%%DATADIR%%/xpuyopuyo/xpuyopuyo.txt
-@dirrm %%DATADIR%%/xpuyopuyo/themes/spheres
-@dirrm %%DATADIR%%/xpuyopuyo/themes/smileys
-@dirrm %%DATADIR%%/xpuyopuyo/themes/fabo
-@dirrm %%DATADIR%%/xpuyopuyo/themes/default
-@dirrm %%DATADIR%%/xpuyopuyo/themes/3dRokz
-@dirrm %%DATADIR%%/xpuyopuyo/themes
-@dirrm %%DATADIR%%/xpuyopuyo/sounds
-@dirrm %%DATADIR%%/xpuyopuyo
+%%GNOME:%%share/pixmaps/xpuyopuyo.xpm
+%%DATADIR%%/copying.txt
+%%DATADIR%%/sounds/game.xm
+%%DATADIR%%/sounds/gameover.xm
+%%DATADIR%%/sounds/prelude.xm
+%%DATADIR%%/themes/3dRokz/img_0.xpm
+%%DATADIR%%/themes/3dRokz/img_0j.xpm
+%%DATADIR%%/themes/3dRokz/img_1.xpm
+%%DATADIR%%/themes/3dRokz/img_1j.xpm
+%%DATADIR%%/themes/3dRokz/img_2.xpm
+%%DATADIR%%/themes/3dRokz/img_2j.xpm
+%%DATADIR%%/themes/3dRokz/img_3.xpm
+%%DATADIR%%/themes/3dRokz/img_3j.xpm
+%%DATADIR%%/themes/3dRokz/img_4.xpm
+%%DATADIR%%/themes/3dRokz/img_4j.xpm
+%%DATADIR%%/themes/3dRokz/img_5.xpm
+%%DATADIR%%/themes/3dRokz/img_5j.xpm
+%%DATADIR%%/themes/3dRokz/img_clear.xpm
+%%DATADIR%%/themes/3dRokz/img_clearb.xpm
+%%DATADIR%%/themes/3dRokz/img_expl.xpm
+%%DATADIR%%/themes/3dRokz/img_gameover.xpm
+%%DATADIR%%/themes/3dRokz/img_ind.xpm
+%%DATADIR%%/themes/3dRokz/img_num0.xpm
+%%DATADIR%%/themes/3dRokz/img_num1.xpm
+%%DATADIR%%/themes/3dRokz/img_num2.xpm
+%%DATADIR%%/themes/3dRokz/img_num3.xpm
+%%DATADIR%%/themes/3dRokz/img_num4.xpm
+%%DATADIR%%/themes/3dRokz/img_num5.xpm
+%%DATADIR%%/themes/3dRokz/img_num6.xpm
+%%DATADIR%%/themes/3dRokz/img_num7.xpm
+%%DATADIR%%/themes/3dRokz/img_num8.xpm
+%%DATADIR%%/themes/3dRokz/img_num9.xpm
+%%DATADIR%%/themes/3dRokz/img_rock.xpm
+%%DATADIR%%/themes/3dRokz/img_rockbig.xpm
+%%DATADIR%%/themes/3dRokz/img_rockdemon.xpm
+%%DATADIR%%/themes/3dRokz/img_side.xpm
+%%DATADIR%%/themes/3dRokz/img_tile_bottom1.xpm
+%%DATADIR%%/themes/3dRokz/img_tile_bottom2.xpm
+%%DATADIR%%/themes/3dRokz/img_tile_bottom3.xpm
+%%DATADIR%%/themes/3dRokz/img_tile_left.xpm
+%%DATADIR%%/themes/3dRokz/img_tile_leftbottom.xpm
+%%DATADIR%%/themes/3dRokz/img_tile_lefttop.xpm
+%%DATADIR%%/themes/3dRokz/img_tile_ltrans.xpm
+%%DATADIR%%/themes/3dRokz/img_tile_right.xpm
+%%DATADIR%%/themes/3dRokz/img_tile_rightbottom.xpm
+%%DATADIR%%/themes/3dRokz/img_tile_righttop.xpm
+%%DATADIR%%/themes/3dRokz/img_tile_rtrans.xpm
+%%DATADIR%%/themes/3dRokz/img_tile_top.xpm
+%%DATADIR%%/themes/3dRokz/img_title.xpm
+%%DATADIR%%/themes/3dRokz/img_top.xpm
+%%DATADIR%%/themes/3dRokz/img_trans.xpm
+%%DATADIR%%/themes/default/img_0.xpm
+%%DATADIR%%/themes/default/img_0j.xpm
+%%DATADIR%%/themes/default/img_1.xpm
+%%DATADIR%%/themes/default/img_1j.xpm
+%%DATADIR%%/themes/default/img_2.xpm
+%%DATADIR%%/themes/default/img_2j.xpm
+%%DATADIR%%/themes/default/img_3.xpm
+%%DATADIR%%/themes/default/img_3j.xpm
+%%DATADIR%%/themes/default/img_4.xpm
+%%DATADIR%%/themes/default/img_4j.xpm
+%%DATADIR%%/themes/default/img_5.xpm
+%%DATADIR%%/themes/default/img_5j.xpm
+%%DATADIR%%/themes/default/img_clear.xpm
+%%DATADIR%%/themes/default/img_clearb.xpm
+%%DATADIR%%/themes/default/img_expl.xpm
+%%DATADIR%%/themes/default/img_gameover.xpm
+%%DATADIR%%/themes/default/img_ind.xpm
+%%DATADIR%%/themes/default/img_num0.xpm
+%%DATADIR%%/themes/default/img_num1.xpm
+%%DATADIR%%/themes/default/img_num2.xpm
+%%DATADIR%%/themes/default/img_num3.xpm
+%%DATADIR%%/themes/default/img_num4.xpm
+%%DATADIR%%/themes/default/img_num5.xpm
+%%DATADIR%%/themes/default/img_num6.xpm
+%%DATADIR%%/themes/default/img_num7.xpm
+%%DATADIR%%/themes/default/img_num8.xpm
+%%DATADIR%%/themes/default/img_num9.xpm
+%%DATADIR%%/themes/default/img_paused.xpm
+%%DATADIR%%/themes/default/img_rock.xpm
+%%DATADIR%%/themes/default/img_rockbig.xpm
+%%DATADIR%%/themes/default/img_rockdemon.xpm
+%%DATADIR%%/themes/default/img_side.xpm
+%%DATADIR%%/themes/default/img_tile_bottom1.xpm
+%%DATADIR%%/themes/default/img_tile_bottom2.xpm
+%%DATADIR%%/themes/default/img_tile_bottom3.xpm
+%%DATADIR%%/themes/default/img_tile_left.xpm
+%%DATADIR%%/themes/default/img_tile_leftbottom.xpm
+%%DATADIR%%/themes/default/img_tile_lefttop.xpm
+%%DATADIR%%/themes/default/img_tile_ltrans.xpm
+%%DATADIR%%/themes/default/img_tile_right.xpm
+%%DATADIR%%/themes/default/img_tile_rightbottom.xpm
+%%DATADIR%%/themes/default/img_tile_righttop.xpm
+%%DATADIR%%/themes/default/img_tile_rtrans.xpm
+%%DATADIR%%/themes/default/img_tile_top.xpm
+%%DATADIR%%/themes/default/img_title.xpm
+%%DATADIR%%/themes/default/img_top.xpm
+%%DATADIR%%/themes/default/img_trans.xpm
+%%DATADIR%%/themes/fabo/img_0.xpm
+%%DATADIR%%/themes/fabo/img_0j.xpm
+%%DATADIR%%/themes/fabo/img_1.xpm
+%%DATADIR%%/themes/fabo/img_1j.xpm
+%%DATADIR%%/themes/fabo/img_2.xpm
+%%DATADIR%%/themes/fabo/img_2j.xpm
+%%DATADIR%%/themes/fabo/img_3.xpm
+%%DATADIR%%/themes/fabo/img_3j.xpm
+%%DATADIR%%/themes/fabo/img_4.xpm
+%%DATADIR%%/themes/fabo/img_4j.xpm
+%%DATADIR%%/themes/fabo/img_5.xpm
+%%DATADIR%%/themes/fabo/img_5j.xpm
+%%DATADIR%%/themes/fabo/img_clear.xpm
+%%DATADIR%%/themes/fabo/img_clearb.xpm
+%%DATADIR%%/themes/fabo/img_expl.xpm
+%%DATADIR%%/themes/fabo/img_gameover.xpm
+%%DATADIR%%/themes/fabo/img_ind.xpm
+%%DATADIR%%/themes/fabo/img_num0.xpm
+%%DATADIR%%/themes/fabo/img_num1.xpm
+%%DATADIR%%/themes/fabo/img_num2.xpm
+%%DATADIR%%/themes/fabo/img_num3.xpm
+%%DATADIR%%/themes/fabo/img_num4.xpm
+%%DATADIR%%/themes/fabo/img_num5.xpm
+%%DATADIR%%/themes/fabo/img_num6.xpm
+%%DATADIR%%/themes/fabo/img_num7.xpm
+%%DATADIR%%/themes/fabo/img_num8.xpm
+%%DATADIR%%/themes/fabo/img_num9.xpm
+%%DATADIR%%/themes/fabo/img_paused.xpm
+%%DATADIR%%/themes/fabo/img_rock.xpm
+%%DATADIR%%/themes/fabo/img_rockbig.xpm
+%%DATADIR%%/themes/fabo/img_rockdemon.xpm
+%%DATADIR%%/themes/fabo/img_side.xpm
+%%DATADIR%%/themes/fabo/img_tile_bottom1.xpm
+%%DATADIR%%/themes/fabo/img_tile_bottom2.xpm
+%%DATADIR%%/themes/fabo/img_tile_bottom3.xpm
+%%DATADIR%%/themes/fabo/img_tile_left.xpm
+%%DATADIR%%/themes/fabo/img_tile_leftbottom.xpm
+%%DATADIR%%/themes/fabo/img_tile_lefttop.xpm
+%%DATADIR%%/themes/fabo/img_tile_ltrans.xpm
+%%DATADIR%%/themes/fabo/img_tile_right.xpm
+%%DATADIR%%/themes/fabo/img_tile_rightbottom.xpm
+%%DATADIR%%/themes/fabo/img_tile_righttop.xpm
+%%DATADIR%%/themes/fabo/img_tile_rtrans.xpm
+%%DATADIR%%/themes/fabo/img_tile_top.xpm
+%%DATADIR%%/themes/fabo/img_title.xpm
+%%DATADIR%%/themes/fabo/img_top.xpm
+%%DATADIR%%/themes/fabo/img_trans.xpm
+%%DATADIR%%/themes/smileys/img_0.xpm
+%%DATADIR%%/themes/smileys/img_0j.xpm
+%%DATADIR%%/themes/smileys/img_1.xpm
+%%DATADIR%%/themes/smileys/img_1j.xpm
+%%DATADIR%%/themes/smileys/img_2.xpm
+%%DATADIR%%/themes/smileys/img_2j.xpm
+%%DATADIR%%/themes/smileys/img_3.xpm
+%%DATADIR%%/themes/smileys/img_3j.xpm
+%%DATADIR%%/themes/smileys/img_4.xpm
+%%DATADIR%%/themes/smileys/img_4j.xpm
+%%DATADIR%%/themes/smileys/img_5.xpm
+%%DATADIR%%/themes/smileys/img_5j.xpm
+%%DATADIR%%/themes/smileys/img_expl.xpm
+%%DATADIR%%/themes/smileys/img_ind.xpm
+%%DATADIR%%/themes/smileys/img_rock.xpm
+%%DATADIR%%/themes/smileys/img_rockbig.xpm
+%%DATADIR%%/themes/smileys/img_rockdemon.xpm
+%%DATADIR%%/themes/spheres/img_0.xpm
+%%DATADIR%%/themes/spheres/img_0j.xpm
+%%DATADIR%%/themes/spheres/img_1.xpm
+%%DATADIR%%/themes/spheres/img_1j.xpm
+%%DATADIR%%/themes/spheres/img_2.xpm
+%%DATADIR%%/themes/spheres/img_2j.xpm
+%%DATADIR%%/themes/spheres/img_3.xpm
+%%DATADIR%%/themes/spheres/img_3j.xpm
+%%DATADIR%%/themes/spheres/img_4.xpm
+%%DATADIR%%/themes/spheres/img_4j.xpm
+%%DATADIR%%/themes/spheres/img_5.xpm
+%%DATADIR%%/themes/spheres/img_5j.xpm
+%%DATADIR%%/themes/spheres/img_clear.xpm
+%%DATADIR%%/themes/spheres/img_clearb.xpm
+%%DATADIR%%/themes/spheres/img_expl.xpm
+%%DATADIR%%/themes/spheres/img_gameover.xpm
+%%DATADIR%%/themes/spheres/img_ind.xpm
+%%DATADIR%%/themes/spheres/img_num0.xpm
+%%DATADIR%%/themes/spheres/img_num1.xpm
+%%DATADIR%%/themes/spheres/img_num2.xpm
+%%DATADIR%%/themes/spheres/img_num3.xpm
+%%DATADIR%%/themes/spheres/img_num4.xpm
+%%DATADIR%%/themes/spheres/img_num5.xpm
+%%DATADIR%%/themes/spheres/img_num6.xpm
+%%DATADIR%%/themes/spheres/img_num7.xpm
+%%DATADIR%%/themes/spheres/img_num8.xpm
+%%DATADIR%%/themes/spheres/img_num9.xpm
+%%DATADIR%%/themes/spheres/img_paused.xpm
+%%DATADIR%%/themes/spheres/img_rock.xpm
+%%DATADIR%%/themes/spheres/img_rockbig.xpm
+%%DATADIR%%/themes/spheres/img_rockdemon.xpm
+%%DATADIR%%/themes/spheres/img_side.xpm
+%%DATADIR%%/themes/spheres/img_tile_bottom1.xpm
+%%DATADIR%%/themes/spheres/img_tile_bottom2.xpm
+%%DATADIR%%/themes/spheres/img_tile_bottom3.xpm
+%%DATADIR%%/themes/spheres/img_tile_left.xpm
+%%DATADIR%%/themes/spheres/img_tile_leftbottom.xpm
+%%DATADIR%%/themes/spheres/img_tile_lefttop.xpm
+%%DATADIR%%/themes/spheres/img_tile_ltrans.xpm
+%%DATADIR%%/themes/spheres/img_tile_right.xpm
+%%DATADIR%%/themes/spheres/img_tile_rightbottom.xpm
+%%DATADIR%%/themes/spheres/img_tile_righttop.xpm
+%%DATADIR%%/themes/spheres/img_tile_rtrans.xpm
+%%DATADIR%%/themes/spheres/img_tile_top.xpm
+%%DATADIR%%/themes/spheres/img_title.xpm
+%%DATADIR%%/themes/spheres/img_top.xpm
+%%DATADIR%%/themes/spheres/img_trans.xpm
+%%DATADIR%%/xpuyopuyo.txt
+@dirrm %%DATADIR%%/themes/spheres
+@dirrm %%DATADIR%%/themes/smileys
+@dirrm %%DATADIR%%/themes/fabo
+@dirrm %%DATADIR%%/themes/default
+@dirrm %%DATADIR%%/themes/3dRokz
+@dirrm %%DATADIR%%/themes
+@dirrm %%DATADIR%%/sounds
+@dirrm %%DATADIR%%
diff --git a/games/xscorch/Makefile b/games/xscorch/Makefile
index 5c3006b1c285..fe94fbf8012f 100644
--- a/games/xscorch/Makefile
+++ b/games/xscorch/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xscorch
 PORTVERSION=	0.2.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games
 MASTER_SITES=	http://chaos2.org/xscorch/ \
 		http://mirror.dok.org/xscorch/
@@ -33,10 +33,8 @@ NOMANCOMPRESS=	yes
 .if ${HAVE_GNOME:Mgnomelibs}!=""
 USE_GNOME+=	gnomeprefix gnomelibs
 PKGNAMESUFFIX=	-gnome
-PLIST_SUB+=	GNOME="gnome"
 .else
 CONFIGURE_ARGS+=	--without-gnome
-PLIST_SUB+=	GNOME=""
 .endif
 
 post-patch:
diff --git a/games/xscorch/pkg-plist b/games/xscorch/pkg-plist
index 9f0bd34dfe1c..d8002a0b2b42 100644
--- a/games/xscorch/pkg-plist
+++ b/games/xscorch/pkg-plist
@@ -1,14 +1,14 @@
 bin/xscorch
 bin/xscorch-server
-share/%%GNOME%%/xscorch/accessories.def
-share/%%GNOME%%/xscorch/copying.txt
-share/%%GNOME%%/xscorch/images/xscorch-icon.xpm
-share/%%GNOME%%/xscorch/images/xscorch-logo.xpm
-share/%%GNOME%%/xscorch/profiles.def
-share/%%GNOME%%/xscorch/scorings.def
-share/%%GNOME%%/xscorch/sounds/README
-share/%%GNOME%%/xscorch/weapons.def
-share/%%GNOME%%/xscorch/xscorch.txt
-@dirrm share/%%GNOME%%/xscorch/sounds
-@dirrm share/%%GNOME%%/xscorch/images
-@dirrm share/%%GNOME%%/xscorch
+share/xscorch/accessories.def
+share/xscorch/copying.txt
+share/xscorch/images/xscorch-icon.xpm
+share/xscorch/images/xscorch-logo.xpm
+share/xscorch/profiles.def
+share/xscorch/scorings.def
+share/xscorch/sounds/README
+share/xscorch/weapons.def
+share/xscorch/xscorch.txt
+@dirrm share/xscorch/sounds
+@dirrm share/xscorch/images
+@dirrm share/xscorch
diff --git a/graphics/agave/Makefile b/graphics/agave/Makefile
index 147fb75663a3..0677d4450f2f 100644
--- a/graphics/agave/Makefile
+++ b/graphics/agave/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	agave
 PORTVERSION=	0.4.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics gnome
 MASTER_SITES=	http://download.gna.org/colorscheme/releases/
 
diff --git a/graphics/agave/pkg-plist b/graphics/agave/pkg-plist
index 78739bd59847..006094a7d222 100644
--- a/graphics/agave/pkg-plist
+++ b/graphics/agave/pkg-plist
@@ -1,21 +1,21 @@
 bin/agave
-share/gnome/applications/agave.desktop
-share/gnome/agave/palettes/Gnome-Palette.gpl
-share/gnome/agave/palettes/Tango-Palette.gpl
-share/gnome/agave/palettes/Visibone.gpl
-share/gnome/agave/palettes/Web.gpl
-share/gnome/agave/pixmaps/darken.png
-share/gnome/agave/pixmaps/desaturate.png
-share/gnome/agave/pixmaps/lighten.png
-share/gnome/agave/pixmaps/saturate.png
-share/gnome/agave/ui/agave.glade
-share/gnome/agave/ui/agave.ui
-share/gnome/agave/ui/bookmarkspopup.ui
+share/applications/agave.desktop
+share/agave/palettes/Gnome-Palette.gpl
+share/agave/palettes/Tango-Palette.gpl
+share/agave/palettes/Visibone.gpl
+share/agave/palettes/Web.gpl
+share/agave/pixmaps/darken.png
+share/agave/pixmaps/desaturate.png
+share/agave/pixmaps/lighten.png
+share/agave/pixmaps/saturate.png
+share/agave/ui/agave.glade
+share/agave/ui/agave.ui
+share/agave/ui/bookmarkspopup.ui
 share/gnome/help/agave/C/agave.xml
 share/gnome/help/agave/C/figures/gtk-color-selector.png
 share/gnome/help/agave/C/figures/main-window.png
 share/gnome/help/agave/C/legal.xml
-share/gnome/omf/agave/agave-C.omf
+share/omf/agave/agave-C.omf
 share/icons/hicolor/48x48/apps/agave-icon.png
 share/icons/hicolor/scalable/apps/agave-icon.svg
 share/locale/bg/LC_MESSAGES/agave.mo
@@ -29,11 +29,12 @@ share/locale/pt_BR/LC_MESSAGES/agave.mo
 share/locale/ru/LC_MESSAGES/agave.mo
 share/locale/sv/LC_MESSAGES/agave.mo
 share/locale/zh_TW/LC_MESSAGES/agave.mo
-@dirrm share/gnome/omf/agave
+@dirrm share/omf/agave
 @dirrm share/gnome/help/agave/C/figures
 @dirrm share/gnome/help/agave/C
 @dirrm share/gnome/help/agave
-@dirrm share/gnome/agave/ui
-@dirrm share/gnome/agave/pixmaps
-@dirrm share/gnome/agave/palettes
-@dirrm share/gnome/agave
+@dirrm share/agave/ui
+@dirrm share/agave/pixmaps
+@dirrm share/agave/palettes
+@dirrm share/agave
+@dirrmtry share/applications
diff --git a/graphics/cairo/Makefile b/graphics/cairo/Makefile
index 28f8ac235366..5e042882f5ea 100644
--- a/graphics/cairo/Makefile
+++ b/graphics/cairo/Makefile
@@ -3,12 +3,12 @@
 # Whom:			Michael Johnson <ahze@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/graphics/cairo/Makefile,v 1.56 2007/03/06 13:39:18 ahze Exp $
+#   $MCom: ports/graphics/cairo/Makefile,v 1.59 2007/09/09 22:45:26 mezz Exp $
 #
 
 PORTNAME=	cairo
 PORTVERSION=	1.4.10
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES=	graphics
 MASTER_SITES=	http://cairographics.org/releases/
 #MASTER_SITES=	http://cairographics.org/snapshots/
@@ -32,6 +32,14 @@ USE_LDCONFIG=	yes
 CONFIGURE_ENV=	CPPFLAGS="${PTHREAD_CFLAGS} -I${X11BASE}/include" \
 		LDFLAGS="${PTHREAD_LIBS}"
 
+.if defined(WITHOUT_X11)
+CONFIGURE_ARGS+=--disable-xlib
+PLIST_SUB+=	X11="@comment "
+.else
+USE_XORG+=	xrender
+PLIST_SUB+=	X11=""
+.endif
+
 OPTIONS+=	GLITZ "Enable Glitz OpenGL Support" Off
 
 .include <bsd.port.pre.mk>
@@ -45,14 +53,6 @@ CONFIGURE_ARGS+=	--disable-glitz
 PLIST_SUB+=	GLITZ="@comment "
 .endif
 
-.if defined(WITHOUT_X11)
-CONFIGURE_ARGS+=--disable-xlib
-PLIST_SUB+=	X11="@comment "
-.else
-USE_XLIB=	yes
-PLIST_SUB+=	X11=""
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|' \
 		${WRKSRC}/test/Makefile.in
diff --git a/graphics/dia/Makefile b/graphics/dia/Makefile
index e5e1dab67ed0..c63fb10bdfcc 100644
--- a/graphics/dia/Makefile
+++ b/graphics/dia/Makefile
@@ -3,11 +3,12 @@
 # Whom:                saper@system.pl
 #
 # $FreeBSD$
+#   $MCom: ports/graphics/dia/Makefile,v 1.16 2007/10/11 02:49:12 mezz Exp $
 #
 
 PORTNAME=	dia
 DISTVERSION=	0.96.1
-PORTREVISION=	1
+PORTREVISION=	3
 PORTEPOCH=	1
 CATEGORIES=	graphics gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
@@ -49,9 +50,15 @@ PLIST_SUB=	PYTHON:="@comment "
 USE_GNOME+=		libgnomeui
 CONFIGURE_ARGS+=	--enable-gnome --enable-bonobo
 PKGNAMESUFFIX=		-gnome
-.else
+GNOME_ENABLED=		yes
+.endif
 
 post-patch:
+	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \
+		${WRKSRC}/lib/intl.c
+	@${REINPLACE_CMD} -e 's|[(]pkgdatadir[)]/help|(datadir)/gnome/help/dia|g' \
+		${WRKSRC}/doc/Makefile.in
+.ifndef (GNOME_ENABLED)
 	@${FIND} ${WRKSRC} -name Makefile.in | \
 		${XARGS} ${REINPLACE_CMD} -e \
 		's,\(^GTK_LIBS.*\),\1 ${PTHREAD_LIBS}, ; \
@@ -64,7 +71,7 @@ pre-configure:
 		${WRKSRC}/configure
 
 post-install:
-	@${INSTALL_DATA} ${WRKSRC}/dia.xpm ${PREFIX}/share/gnome/dia/
+	@${INSTALL_DATA} ${WRKSRC}/dia.xpm ${PREFIX}/share/dia/
 	@-update-desktop-database
 
 .include <bsd.port.post.mk>
diff --git a/graphics/dia/files/patch-ad b/graphics/dia/files/patch-ad
index 4c8240597995..5dd3b4efb4d5 100644
--- a/graphics/dia/files/patch-ad
+++ b/graphics/dia/files/patch-ad
@@ -9,15 +9,6 @@
  
  pkg_failed=no
  echo "$as_me:$LINENO: checking for PANGOFT2" >&5
-@@ -20835,7 +20835,7 @@ _ACEOF
- 
- 
- cat >>confdefs.h <<_ACEOF
--#define GNOME_ICONDIR "${prefix}/share/pixmaps"
-+#define GNOME_ICONDIR "${datadir}/pixmaps"
- _ACEOF
- 
-     have_gnome=true
 @@ -20989,7 +20989,7 @@ if test "${with_gnomeprint+set}" = set; 
  else
    with_gnomeprint=no
diff --git a/graphics/dia/files/patch-doc_Makefile.in b/graphics/dia/files/patch-doc_Makefile.in
deleted file mode 100644
index 7fa6b84a5358..000000000000
--- a/graphics/dia/files/patch-doc_Makefile.in
+++ /dev/null
@@ -1,12 +0,0 @@
---- doc/Makefile.in.orig	Thu Aug 19 23:46:25 2004
-+++ doc/Makefile.in	Thu Aug 19 23:48:00 2004
-@@ -257,8 +257,7 @@
- 	shape.dtd \
- 	sheet.dtd
- 
--@HAVE_GNOME_FALSE@helpdir = $(pkgdatadir)/help
--@HAVE_GNOME_TRUE@helpdir = $(datadir)/help/dia
-+helpdir = $(datadir)/help/dia
- all: all-recursive
- 
- .SUFFIXES:
diff --git a/graphics/dia/files/patch-lib_intl.c b/graphics/dia/files/patch-lib_intl.c
deleted file mode 100644
index 5449af46de43..000000000000
--- a/graphics/dia/files/patch-lib_intl.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- lib/intl.c.orig	Mon Mar 17 14:06:02 2003
-+++ lib/intl.c	Mon Mar 17 14:07:10 2003
-@@ -65,6 +65,7 @@
-     read_aliases ("/usr/share/locale/locale.alias");
-     read_aliases ("/usr/local/share/locale/locale.alias");
-     read_aliases ("/usr/lib/X11/locale/locale.alias");
-+    read_aliases ("/usr/X11R6/lib/X11/locale/locale.alias");
-     read_aliases ("/usr/openwin/lib/locale/locale.alias");
-   }
-   while((p=g_hash_table_lookup(alias_table,lang)) && strcmp(p, lang))
diff --git a/graphics/dia/pkg-plist b/graphics/dia/pkg-plist
index 6c68401802d4..a90d61dcc0f8 100644
--- a/graphics/dia/pkg-plist
+++ b/graphics/dia/pkg-plist
@@ -63,1620 +63,1620 @@ lib/dia/libxfig_filter.la
 lib/dia/libxfig_filter.so
 lib/dia/libxslt_filter.la
 lib/dia/libxslt_filter.so
-share/gnome/applications/dia.desktop
-share/gnome/dia/dia.xpm
-share/gnome/dia/dia_logo.png
-%%PYTHON:%%share/gnome/dia/python-startup.py
-%%PYTHON:%%share/gnome/dia/python/aobjects.py
-%%PYTHON:%%share/gnome/dia/python/codegen.py
-%%PYTHON:%%share/gnome/dia/python/diasvg.py
-%%PYTHON:%%share/gnome/dia/python/diasvg_import.py
-%%PYTHON:%%share/gnome/dia/python/dot.py
-%%PYTHON:%%share/gnome/dia/python/doxrev.py
-%%PYTHON:%%share/gnome/dia/python/group_props.py
-%%PYTHON:%%share/gnome/dia/python/gtkcons.py
-%%PYTHON:%%share/gnome/dia/python/otypes.py
-%%PYTHON:%%share/gnome/dia/python/pydiadoc.py
-%%PYTHON:%%share/gnome/dia/python/scascale.py
-%%PYTHON:%%share/gnome/dia/python/select_by.py
-share/gnome/dia/shapes/Assorted/arrow-chevron.png
-share/gnome/dia/shapes/Assorted/arrow-chevron.shape
-share/gnome/dia/shapes/Assorted/arrow-down.png
-share/gnome/dia/shapes/Assorted/arrow-down.shape
-share/gnome/dia/shapes/Assorted/arrow-left-notched.png
-share/gnome/dia/shapes/Assorted/arrow-left-notched.shape
-share/gnome/dia/shapes/Assorted/arrow-left-right-up.png
-share/gnome/dia/shapes/Assorted/arrow-left-right-up.shape
-share/gnome/dia/shapes/Assorted/arrow-left-right.png
-share/gnome/dia/shapes/Assorted/arrow-left-right.shape
-share/gnome/dia/shapes/Assorted/arrow-left-up.png
-share/gnome/dia/shapes/Assorted/arrow-left-up.shape
-share/gnome/dia/shapes/Assorted/arrow-left.png
-share/gnome/dia/shapes/Assorted/arrow-left.shape
-share/gnome/dia/shapes/Assorted/arrow-pentagon.png
-share/gnome/dia/shapes/Assorted/arrow-pentagon.shape
-share/gnome/dia/shapes/Assorted/arrow-quad.png
-share/gnome/dia/shapes/Assorted/arrow-quad.shape
-share/gnome/dia/shapes/Assorted/arrow-right-notched.png
-share/gnome/dia/shapes/Assorted/arrow-right-notched.shape
-share/gnome/dia/shapes/Assorted/arrow-right.png
-share/gnome/dia/shapes/Assorted/arrow-right.shape
-share/gnome/dia/shapes/Assorted/arrow-turn-up.png
-share/gnome/dia/shapes/Assorted/arrow-turn-up.shape
-share/gnome/dia/shapes/Assorted/arrow-up-down-left.png
-share/gnome/dia/shapes/Assorted/arrow-up-down-left.shape
-share/gnome/dia/shapes/Assorted/arrow-up-down.png
-share/gnome/dia/shapes/Assorted/arrow-up-down.shape
-share/gnome/dia/shapes/Assorted/arrow-up.png
-share/gnome/dia/shapes/Assorted/arrow-up.shape
-share/gnome/dia/shapes/Assorted/circle-quarter.png
-share/gnome/dia/shapes/Assorted/circle-quarter.shape
-share/gnome/dia/shapes/Assorted/circle.png
-share/gnome/dia/shapes/Assorted/circle.shape
-share/gnome/dia/shapes/Assorted/cross-maltese.png
-share/gnome/dia/shapes/Assorted/cross-maltese.shape
-share/gnome/dia/shapes/Assorted/cross-swiss.png
-share/gnome/dia/shapes/Assorted/cross-swiss.shape
-share/gnome/dia/shapes/Assorted/diamond.png
-share/gnome/dia/shapes/Assorted/diamond.shape
-share/gnome/dia/shapes/Assorted/heart.png
-share/gnome/dia/shapes/Assorted/heart.shape
-share/gnome/dia/shapes/Assorted/heptagon.png
-share/gnome/dia/shapes/Assorted/heptagon.shape
-share/gnome/dia/shapes/Assorted/hexagon.png
-share/gnome/dia/shapes/Assorted/hexagon.shape
-share/gnome/dia/shapes/Assorted/moon-quarter.png
-share/gnome/dia/shapes/Assorted/moon-quarter.shape
-share/gnome/dia/shapes/Assorted/octagon.png
-share/gnome/dia/shapes/Assorted/octagon.shape
-share/gnome/dia/shapes/Assorted/parallelogram-horizontal.png
-share/gnome/dia/shapes/Assorted/parallelogram-horizontal.shape
-share/gnome/dia/shapes/Assorted/parallelogram-vertical.png
-share/gnome/dia/shapes/Assorted/parallelogram-vertical.shape
-share/gnome/dia/shapes/Assorted/pentagon.png
-share/gnome/dia/shapes/Assorted/pentagon.shape
-share/gnome/dia/shapes/Assorted/square.png
-share/gnome/dia/shapes/Assorted/square.shape
-share/gnome/dia/shapes/Assorted/star4.png
-share/gnome/dia/shapes/Assorted/star4.shape
-share/gnome/dia/shapes/Assorted/star4curved.png
-share/gnome/dia/shapes/Assorted/star4curved.shape
-share/gnome/dia/shapes/Assorted/star5.png
-share/gnome/dia/shapes/Assorted/star5.shape
-share/gnome/dia/shapes/Assorted/star6.png
-share/gnome/dia/shapes/Assorted/star6.shape
-share/gnome/dia/shapes/Assorted/star7.png
-share/gnome/dia/shapes/Assorted/star7.shape
-share/gnome/dia/shapes/Assorted/star8.png
-share/gnome/dia/shapes/Assorted/star8.shape
-share/gnome/dia/shapes/Assorted/star8curved.png
-share/gnome/dia/shapes/Assorted/star8curved.shape
-share/gnome/dia/shapes/Assorted/star8sharp.png
-share/gnome/dia/shapes/Assorted/star8sharp.shape
-share/gnome/dia/shapes/Assorted/sun.png
-share/gnome/dia/shapes/Assorted/sun.shape
-share/gnome/dia/shapes/Assorted/trapezoid.png
-share/gnome/dia/shapes/Assorted/trapezoid.shape
-share/gnome/dia/shapes/Assorted/triangle-isoceles.png
-share/gnome/dia/shapes/Assorted/triangle-isoceles.shape
-share/gnome/dia/shapes/Assorted/triangle-rightangle.png
-share/gnome/dia/shapes/Assorted/triangle-rightangle.shape
-share/gnome/dia/shapes/BPMN/Activity-Looping.png
-share/gnome/dia/shapes/BPMN/Activity-Looping.shape
-share/gnome/dia/shapes/BPMN/Ad-Hoc-Collapsed-Sub-Process.png
-share/gnome/dia/shapes/BPMN/Ad-Hoc-Collapsed-Sub-Process.shape
-share/gnome/dia/shapes/BPMN/Collapsed-Sub-Process.png
-share/gnome/dia/shapes/BPMN/Collapsed-Sub-Process.shape
-share/gnome/dia/shapes/BPMN/Compensation-Collapsed-Sub-Process.png
-share/gnome/dia/shapes/BPMN/Compensation-Collapsed-Sub-Process.shape
-share/gnome/dia/shapes/BPMN/Compensation.png
-share/gnome/dia/shapes/BPMN/Compensation.shape
-share/gnome/dia/shapes/BPMN/Data-Object.png
-share/gnome/dia/shapes/BPMN/Data-Object.shape
-share/gnome/dia/shapes/BPMN/End-Event-Cancel.png
-share/gnome/dia/shapes/BPMN/End-Event-Cancel.shape
-share/gnome/dia/shapes/BPMN/End-Event-Compensation.png
-share/gnome/dia/shapes/BPMN/End-Event-Compensation.shape
-share/gnome/dia/shapes/BPMN/End-Event-Error.png
-share/gnome/dia/shapes/BPMN/End-Event-Error.shape
-share/gnome/dia/shapes/BPMN/End-Event-Link.png
-share/gnome/dia/shapes/BPMN/End-Event-Link.shape
-share/gnome/dia/shapes/BPMN/End-Event-Message.png
-share/gnome/dia/shapes/BPMN/End-Event-Message.shape
-share/gnome/dia/shapes/BPMN/End-Event-Multiple.png
-share/gnome/dia/shapes/BPMN/End-Event-Multiple.shape
-share/gnome/dia/shapes/BPMN/End-Event-Terminate.png
-share/gnome/dia/shapes/BPMN/End-Event-Terminate.shape
-share/gnome/dia/shapes/BPMN/End-Event.png
-share/gnome/dia/shapes/BPMN/End-Event.shape
-share/gnome/dia/shapes/BPMN/Gateway-Complex.png
-share/gnome/dia/shapes/BPMN/Gateway-Complex.shape
-share/gnome/dia/shapes/BPMN/Gateway-Exclusive-XOR-Data-Based.png
-share/gnome/dia/shapes/BPMN/Gateway-Exclusive-XOR-Data-Based.shape
-share/gnome/dia/shapes/BPMN/Gateway-Exclusive-XOR-Event-Based.png
-share/gnome/dia/shapes/BPMN/Gateway-Exclusive-XOR-Event-Based.shape
-share/gnome/dia/shapes/BPMN/Gateway-Inclusive-OR.png
-share/gnome/dia/shapes/BPMN/Gateway-Inclusive-OR.shape
-share/gnome/dia/shapes/BPMN/Gateway-Parallel-AND.png
-share/gnome/dia/shapes/BPMN/Gateway-Parallel-AND.shape
-share/gnome/dia/shapes/BPMN/Gateway.png
-share/gnome/dia/shapes/BPMN/Gateway.shape
-share/gnome/dia/shapes/BPMN/Group.png
-share/gnome/dia/shapes/BPMN/Group.shape
-share/gnome/dia/shapes/BPMN/Intermediate-Event-Cancel.png
-share/gnome/dia/shapes/BPMN/Intermediate-Event-Cancel.shape
-share/gnome/dia/shapes/BPMN/Intermediate-Event-Compensation.png
-share/gnome/dia/shapes/BPMN/Intermediate-Event-Compensation.shape
-share/gnome/dia/shapes/BPMN/Intermediate-Event-Error.png
-share/gnome/dia/shapes/BPMN/Intermediate-Event-Error.shape
-share/gnome/dia/shapes/BPMN/Intermediate-Event-Link.png
-share/gnome/dia/shapes/BPMN/Intermediate-Event-Link.shape
-share/gnome/dia/shapes/BPMN/Intermediate-Event-Message.png
-share/gnome/dia/shapes/BPMN/Intermediate-Event-Message.shape
-share/gnome/dia/shapes/BPMN/Intermediate-Event-Multiple.png
-share/gnome/dia/shapes/BPMN/Intermediate-Event-Multiple.shape
-share/gnome/dia/shapes/BPMN/Intermediate-Event-Rule.png
-share/gnome/dia/shapes/BPMN/Intermediate-Event-Rule.shape
-share/gnome/dia/shapes/BPMN/Intermediate-Event-Timer.png
-share/gnome/dia/shapes/BPMN/Intermediate-Event-Timer.shape
-share/gnome/dia/shapes/BPMN/Intermediate-Event.png
-share/gnome/dia/shapes/BPMN/Intermediate-Event.shape
-share/gnome/dia/shapes/BPMN/Looping-Collapsed-Sub-Process.png
-share/gnome/dia/shapes/BPMN/Looping-Collapsed-Sub-Process.shape
-share/gnome/dia/shapes/BPMN/Multiple-Instance-Collapsed-Sub-Process.png
-share/gnome/dia/shapes/BPMN/Multiple-Instance-Collapsed-Sub-Process.shape
-share/gnome/dia/shapes/BPMN/Multiple-Instance-Task.png
-share/gnome/dia/shapes/BPMN/Multiple-Instance-Task.shape
-share/gnome/dia/shapes/BPMN/Start-Event-Link.png
-share/gnome/dia/shapes/BPMN/Start-Event-Link.shape
-share/gnome/dia/shapes/BPMN/Start-Event-Message.png
-share/gnome/dia/shapes/BPMN/Start-Event-Message.shape
-share/gnome/dia/shapes/BPMN/Start-Event-Multiple.png
-share/gnome/dia/shapes/BPMN/Start-Event-Multiple.shape
-share/gnome/dia/shapes/BPMN/Start-Event-Rule.png
-share/gnome/dia/shapes/BPMN/Start-Event-Rule.shape
-share/gnome/dia/shapes/BPMN/Start-Event-Timer.png
-share/gnome/dia/shapes/BPMN/Start-Event-Timer.shape
-share/gnome/dia/shapes/BPMN/Start-Event.png
-share/gnome/dia/shapes/BPMN/Start-Event.shape
-share/gnome/dia/shapes/BPMN/Task.png
-share/gnome/dia/shapes/BPMN/Task.shape
-share/gnome/dia/shapes/BPMN/Text-Annotation.png
-share/gnome/dia/shapes/BPMN/Text-Annotation.shape
-share/gnome/dia/shapes/BPMN/Transaction.png
-share/gnome/dia/shapes/BPMN/Transaction.shape
-share/gnome/dia/shapes/ChemEng/ACgen.png
-share/gnome/dia/shapes/ChemEng/ACgen.shape
-share/gnome/dia/shapes/ChemEng/SaT-fixedtube.png
-share/gnome/dia/shapes/ChemEng/SaT-fixedtube.shape
-share/gnome/dia/shapes/ChemEng/SaT-floatinghead.png
-share/gnome/dia/shapes/ChemEng/SaT-floatinghead.shape
-share/gnome/dia/shapes/ChemEng/aircooler.png
-share/gnome/dia/shapes/ChemEng/aircooler.shape
-share/gnome/dia/shapes/ChemEng/airforced.png
-share/gnome/dia/shapes/ChemEng/airforced.shape
-share/gnome/dia/shapes/ChemEng/airinduced.png
-share/gnome/dia/shapes/ChemEng/airinduced.shape
-share/gnome/dia/shapes/ChemEng/autoclave.png
-share/gnome/dia/shapes/ChemEng/autoclave.shape
-share/gnome/dia/shapes/ChemEng/bigtraycol.png
-share/gnome/dia/shapes/ChemEng/bigtraycol.shape
-share/gnome/dia/shapes/ChemEng/centrifuge.png
-share/gnome/dia/shapes/ChemEng/centrifuge.shape
-share/gnome/dia/shapes/ChemEng/coil.png
-share/gnome/dia/shapes/ChemEng/coil.shape
-share/gnome/dia/shapes/ChemEng/coilv.png
-share/gnome/dia/shapes/ChemEng/coilv.shape
-share/gnome/dia/shapes/ChemEng/compr.png
-share/gnome/dia/shapes/ChemEng/compr.shape
-share/gnome/dia/shapes/ChemEng/coveredtank.png
-share/gnome/dia/shapes/ChemEng/coveredtank.shape
-share/gnome/dia/shapes/ChemEng/cyclone.png
-share/gnome/dia/shapes/ChemEng/cyclone.shape
-share/gnome/dia/shapes/ChemEng/displa.png
-share/gnome/dia/shapes/ChemEng/displa.shape
-share/gnome/dia/shapes/ChemEng/doublepipe.png
-share/gnome/dia/shapes/ChemEng/doublepipe.shape
-share/gnome/dia/shapes/ChemEng/ejector.png
-share/gnome/dia/shapes/ChemEng/ejector.shape
-share/gnome/dia/shapes/ChemEng/fan.png
-share/gnome/dia/shapes/ChemEng/fan.shape
-share/gnome/dia/shapes/ChemEng/filter.png
-share/gnome/dia/shapes/ChemEng/filter.shape
-share/gnome/dia/shapes/ChemEng/fixedroof.png
-share/gnome/dia/shapes/ChemEng/fixedroof.shape
-share/gnome/dia/shapes/ChemEng/floatingroof.png
-share/gnome/dia/shapes/ChemEng/floatingroof.shape
-share/gnome/dia/shapes/ChemEng/flowfan.png
-share/gnome/dia/shapes/ChemEng/flowfan.shape
-share/gnome/dia/shapes/ChemEng/fluidcont.png
-share/gnome/dia/shapes/ChemEng/fluidcont.shape
-share/gnome/dia/shapes/ChemEng/furnace.png
-share/gnome/dia/shapes/ChemEng/furnace.shape
-share/gnome/dia/shapes/ChemEng/gasholder.png
-share/gnome/dia/shapes/ChemEng/gasholder.shape
-share/gnome/dia/shapes/ChemEng/hx.png
-share/gnome/dia/shapes/ChemEng/hx.shape
-share/gnome/dia/shapes/ChemEng/hxv.png
-share/gnome/dia/shapes/ChemEng/hxv.shape
-share/gnome/dia/shapes/ChemEng/kettle.png
-share/gnome/dia/shapes/ChemEng/kettle.shape
-share/gnome/dia/shapes/ChemEng/knockout.png
-share/gnome/dia/shapes/ChemEng/knockout.shape
-share/gnome/dia/shapes/ChemEng/measure.png
-share/gnome/dia/shapes/ChemEng/measure.shape
-share/gnome/dia/shapes/ChemEng/mixer.png
-share/gnome/dia/shapes/ChemEng/mixer.shape
-share/gnome/dia/shapes/ChemEng/plate.png
-share/gnome/dia/shapes/ChemEng/plate.shape
-share/gnome/dia/shapes/ChemEng/pneum.png
-share/gnome/dia/shapes/ChemEng/pneum.shape
-share/gnome/dia/shapes/ChemEng/pneumv.png
-share/gnome/dia/shapes/ChemEng/pneumv.shape
-share/gnome/dia/shapes/ChemEng/pnuemv.png
-share/gnome/dia/shapes/ChemEng/pnuemv.shape
-share/gnome/dia/shapes/ChemEng/pump.png
-share/gnome/dia/shapes/ChemEng/pump.shape
-share/gnome/dia/shapes/ChemEng/reactor.png
-share/gnome/dia/shapes/ChemEng/reactor.shape
-share/gnome/dia/shapes/ChemEng/recipr.png
-share/gnome/dia/shapes/ChemEng/recipr.shape
-share/gnome/dia/shapes/ChemEng/regval.png
-share/gnome/dia/shapes/ChemEng/regval.shape
-share/gnome/dia/shapes/ChemEng/regvalv.png
-share/gnome/dia/shapes/ChemEng/regvalv.shape
-share/gnome/dia/shapes/ChemEng/sealedtank.png
-share/gnome/dia/shapes/ChemEng/sealedtank.shape
-share/gnome/dia/shapes/ChemEng/settling.png
-share/gnome/dia/shapes/ChemEng/settling.shape
-share/gnome/dia/shapes/ChemEng/spray.png
-share/gnome/dia/shapes/ChemEng/spray.shape
-share/gnome/dia/shapes/ChemEng/spraydrier.png
-share/gnome/dia/shapes/ChemEng/spraydrier.shape
-share/gnome/dia/shapes/ChemEng/storagesphere.png
-share/gnome/dia/shapes/ChemEng/storagesphere.shape
-share/gnome/dia/shapes/ChemEng/tank.png
-share/gnome/dia/shapes/ChemEng/tank.shape
-share/gnome/dia/shapes/ChemEng/traycol.png
-share/gnome/dia/shapes/ChemEng/traycol.shape
-share/gnome/dia/shapes/ChemEng/val.png
-share/gnome/dia/shapes/ChemEng/val.shape
-share/gnome/dia/shapes/ChemEng/valv.png
-share/gnome/dia/shapes/ChemEng/valv.shape
-share/gnome/dia/shapes/ChemEng/vessel.png
-share/gnome/dia/shapes/ChemEng/vessel.shape
-share/gnome/dia/shapes/ChemEng/wcool.png
-share/gnome/dia/shapes/ChemEng/wcool.shape
-share/gnome/dia/shapes/ChemEng/wcoolv.png
-share/gnome/dia/shapes/ChemEng/wcoolv.shape
-share/gnome/dia/shapes/Circuit/ground.png
-share/gnome/dia/shapes/Circuit/ground.shape
-share/gnome/dia/shapes/Circuit/hcapacitor.png
-share/gnome/dia/shapes/Circuit/hcapacitor.shape
-share/gnome/dia/shapes/Circuit/hdiode.png
-share/gnome/dia/shapes/Circuit/hdiode.shape
-share/gnome/dia/shapes/Circuit/hfuse_de.png
-share/gnome/dia/shapes/Circuit/hfuse_de.shape
-share/gnome/dia/shapes/Circuit/hinductor.png
-share/gnome/dia/shapes/Circuit/hinductor.shape
-share/gnome/dia/shapes/Circuit/hinductor_de.png
-share/gnome/dia/shapes/Circuit/hinductor_de.shape
-share/gnome/dia/shapes/Circuit/hjumper.png
-share/gnome/dia/shapes/Circuit/hjumper.shape
-share/gnome/dia/shapes/Circuit/hled_de.png
-share/gnome/dia/shapes/Circuit/hled_de.shape
-share/gnome/dia/shapes/Circuit/hpowersource_de.png
-share/gnome/dia/shapes/Circuit/hpowersource_de.shape
-share/gnome/dia/shapes/Circuit/hresistor.png
-share/gnome/dia/shapes/Circuit/hresistor.shape
-share/gnome/dia/shapes/Circuit/hresistor_de.png
-share/gnome/dia/shapes/Circuit/hresistor_de.shape
-share/gnome/dia/shapes/Circuit/hzener.png
-share/gnome/dia/shapes/Circuit/hzener.shape
-share/gnome/dia/shapes/Circuit/lamp_de.png
-share/gnome/dia/shapes/Circuit/lamp_de.shape
-share/gnome/dia/shapes/Circuit/microphone_de.png
-share/gnome/dia/shapes/Circuit/microphone_de.shape
-share/gnome/dia/shapes/Circuit/nmos_de.png
-share/gnome/dia/shapes/Circuit/nmos_de.shape
-share/gnome/dia/shapes/Circuit/npn.png
-share/gnome/dia/shapes/Circuit/npn.shape
-share/gnome/dia/shapes/Circuit/opamp.png
-share/gnome/dia/shapes/Circuit/opamp.shape
-share/gnome/dia/shapes/Circuit/pmos_de.png
-share/gnome/dia/shapes/Circuit/pmos_de.shape
-share/gnome/dia/shapes/Circuit/pnp.png
-share/gnome/dia/shapes/Circuit/pnp.shape
-share/gnome/dia/shapes/Circuit/speaker_de.png
-share/gnome/dia/shapes/Circuit/speaker_de.shape
-share/gnome/dia/shapes/Circuit/vcapacitor.png
-share/gnome/dia/shapes/Circuit/vcapacitor.shape
-share/gnome/dia/shapes/Circuit/vdiode.png
-share/gnome/dia/shapes/Circuit/vdiode.shape
-share/gnome/dia/shapes/Circuit/vfuse_de.png
-share/gnome/dia/shapes/Circuit/vfuse_de.shape
-share/gnome/dia/shapes/Circuit/vinductor.png
-share/gnome/dia/shapes/Circuit/vinductor.shape
-share/gnome/dia/shapes/Circuit/vinductor_de.png
-share/gnome/dia/shapes/Circuit/vinductor_de.shape
-share/gnome/dia/shapes/Circuit/vled_de.png
-share/gnome/dia/shapes/Circuit/vled_de.shape
-share/gnome/dia/shapes/Circuit/vpowersource_de.png
-share/gnome/dia/shapes/Circuit/vpowersource_de.shape
-share/gnome/dia/shapes/Circuit/vresistor.png
-share/gnome/dia/shapes/Circuit/vresistor.shape
-share/gnome/dia/shapes/Circuit/vresistor_de.png
-share/gnome/dia/shapes/Circuit/vresistor_de.shape
-share/gnome/dia/shapes/Circuit/vzener.png
-share/gnome/dia/shapes/Circuit/vzener.shape
-share/gnome/dia/shapes/Cisco/1000.png
-share/gnome/dia/shapes/Cisco/1000.shape
-share/gnome/dia/shapes/Cisco/100baset_hub.png
-share/gnome/dia/shapes/Cisco/100baset_hub.shape
-share/gnome/dia/shapes/Cisco/10700.png
-share/gnome/dia/shapes/Cisco/10700.shape
-share/gnome/dia/shapes/Cisco/15200.png
-share/gnome/dia/shapes/Cisco/15200.shape
-share/gnome/dia/shapes/Cisco/15800.png
-share/gnome/dia/shapes/Cisco/15800.shape
-share/gnome/dia/shapes/Cisco/3174.png
-share/gnome/dia/shapes/Cisco/3174.shape
-share/gnome/dia/shapes/Cisco/3x74.png
-share/gnome/dia/shapes/Cisco/3x74.shape
-share/gnome/dia/shapes/Cisco/5000.png
-share/gnome/dia/shapes/Cisco/5000.shape
-share/gnome/dia/shapes/Cisco/5002.png
-share/gnome/dia/shapes/Cisco/5002.shape
-share/gnome/dia/shapes/Cisco/5500.png
-share/gnome/dia/shapes/Cisco/5500.shape
-share/gnome/dia/shapes/Cisco/6701.png
-share/gnome/dia/shapes/Cisco/6701.shape
-share/gnome/dia/shapes/Cisco/6705.png
-share/gnome/dia/shapes/Cisco/6705.shape
-share/gnome/dia/shapes/Cisco/6732.png
-share/gnome/dia/shapes/Cisco/6732.shape
-share/gnome/dia/shapes/Cisco/7500ars.png
-share/gnome/dia/shapes/Cisco/7500ars.shape
-share/gnome/dia/shapes/Cisco/7505.png
-share/gnome/dia/shapes/Cisco/7505.shape
-share/gnome/dia/shapes/Cisco/7507.png
-share/gnome/dia/shapes/Cisco/7507.shape
-share/gnome/dia/shapes/Cisco/access_gateway.png
-share/gnome/dia/shapes/Cisco/access_gateway.shape
-share/gnome/dia/shapes/Cisco/access_server.png
-share/gnome/dia/shapes/Cisco/access_server.shape
-share/gnome/dia/shapes/Cisco/accesspoint.png
-share/gnome/dia/shapes/Cisco/accesspoint.shape
-share/gnome/dia/shapes/Cisco/adm.png
-share/gnome/dia/shapes/Cisco/adm.shape
-share/gnome/dia/shapes/Cisco/androgynous_person.png
-share/gnome/dia/shapes/Cisco/androgynous_person.shape
-share/gnome/dia/shapes/Cisco/antenna.png
-share/gnome/dia/shapes/Cisco/antenna.shape
-share/gnome/dia/shapes/Cisco/asic.png
-share/gnome/dia/shapes/Cisco/asic.shape
-share/gnome/dia/shapes/Cisco/ata.png
-share/gnome/dia/shapes/Cisco/ata.shape
-share/gnome/dia/shapes/Cisco/atm3800.png
-share/gnome/dia/shapes/Cisco/atm3800.shape
-share/gnome/dia/shapes/Cisco/atm_fast_gigabit_etherswitch.png
-share/gnome/dia/shapes/Cisco/atm_fast_gigabit_etherswitch.shape
-share/gnome/dia/shapes/Cisco/atm_router.shape
-share/gnome/dia/shapes/Cisco/atm_switch.png
-share/gnome/dia/shapes/Cisco/atm_switch.shape
-share/gnome/dia/shapes/Cisco/atm_tag_switch_router.png
-share/gnome/dia/shapes/Cisco/atm_tag_switch_router.shape
-share/gnome/dia/shapes/Cisco/automatic_protection_switching.png
-share/gnome/dia/shapes/Cisco/automatic_protection_switching.shape
-share/gnome/dia/shapes/Cisco/bbfw.png
-share/gnome/dia/shapes/Cisco/bbfw.shape
-share/gnome/dia/shapes/Cisco/bbfw_media.png
-share/gnome/dia/shapes/Cisco/bbfw_media.shape
-share/gnome/dia/shapes/Cisco/bbs.png
-share/gnome/dia/shapes/Cisco/bbs.shape
-share/gnome/dia/shapes/Cisco/bbsm.png
-share/gnome/dia/shapes/Cisco/bbsm.shape
-share/gnome/dia/shapes/Cisco/branch_office.png
-share/gnome/dia/shapes/Cisco/branch_office.shape
-share/gnome/dia/shapes/Cisco/branch_office_blue.png
-share/gnome/dia/shapes/Cisco/branch_office_blue.shape
-share/gnome/dia/shapes/Cisco/branch_office_subdued.png
-share/gnome/dia/shapes/Cisco/branch_office_subdued.shape
-share/gnome/dia/shapes/Cisco/breakout_box.png
-share/gnome/dia/shapes/Cisco/breakout_box.shape
-share/gnome/dia/shapes/Cisco/bridge.png
-share/gnome/dia/shapes/Cisco/bridge.shape
-share/gnome/dia/shapes/Cisco/broadband_router.png
-share/gnome/dia/shapes/Cisco/broadband_router.shape
-share/gnome/dia/shapes/Cisco/bts10200.png
-share/gnome/dia/shapes/Cisco/bts10200.shape
-share/gnome/dia/shapes/Cisco/ca.png
-share/gnome/dia/shapes/Cisco/ca.shape
-share/gnome/dia/shapes/Cisco/cable_modem.png
-share/gnome/dia/shapes/Cisco/cable_modem.shape
-share/gnome/dia/shapes/Cisco/callmanager.png
-share/gnome/dia/shapes/Cisco/callmanager.shape
-share/gnome/dia/shapes/Cisco/car.png
-share/gnome/dia/shapes/Cisco/car.shape
-share/gnome/dia/shapes/Cisco/carrier_routing_system.png
-share/gnome/dia/shapes/Cisco/carrier_routing_system.shape
-share/gnome/dia/shapes/Cisco/catalyst_access_gateway.png
-share/gnome/dia/shapes/Cisco/catalyst_access_gateway.shape
-share/gnome/dia/shapes/Cisco/cddi_fddi_concentrator.png
-share/gnome/dia/shapes/Cisco/cddi_fddi_concentrator.shape
-share/gnome/dia/shapes/Cisco/cdm.png
-share/gnome/dia/shapes/Cisco/cdm.shape
-share/gnome/dia/shapes/Cisco/cellular_phone.png
-share/gnome/dia/shapes/Cisco/cellular_phone.shape
-share/gnome/dia/shapes/Cisco/centri_firewall.png
-share/gnome/dia/shapes/Cisco/centri_firewall.shape
-share/gnome/dia/shapes/Cisco/channelized_pipe.png
-share/gnome/dia/shapes/Cisco/channelized_pipe.shape
-share/gnome/dia/shapes/Cisco/cisco_hub.png
-share/gnome/dia/shapes/Cisco/cisco_hub.shape
-share/gnome/dia/shapes/Cisco/ciscosecurity.png
-share/gnome/dia/shapes/Cisco/ciscosecurity.shape
-share/gnome/dia/shapes/Cisco/ciscoworks.png
-share/gnome/dia/shapes/Cisco/ciscoworks.shape
-share/gnome/dia/shapes/Cisco/ciscoworks_man.png
-share/gnome/dia/shapes/Cisco/ciscoworks_man.shape
-share/gnome/dia/shapes/Cisco/class45_switch.png
-share/gnome/dia/shapes/Cisco/class45_switch.shape
-share/gnome/dia/shapes/Cisco/cloud.png
-share/gnome/dia/shapes/Cisco/cloud.shape
-share/gnome/dia/shapes/Cisco/cloud_dark.png
-share/gnome/dia/shapes/Cisco/cloud_dark.shape
-share/gnome/dia/shapes/Cisco/cloud_gold.png
-share/gnome/dia/shapes/Cisco/cloud_gold.shape
-share/gnome/dia/shapes/Cisco/cloud_white.png
-share/gnome/dia/shapes/Cisco/cloud_white.shape
-share/gnome/dia/shapes/Cisco/communications_server.png
-share/gnome/dia/shapes/Cisco/communications_server.shape
-share/gnome/dia/shapes/Cisco/concatenated_payload.png
-share/gnome/dia/shapes/Cisco/concatenated_payload.shape
-share/gnome/dia/shapes/Cisco/content_engine.png
-share/gnome/dia/shapes/Cisco/content_engine.shape
-share/gnome/dia/shapes/Cisco/content_router.png
-share/gnome/dia/shapes/Cisco/content_router.shape
-share/gnome/dia/shapes/Cisco/content_service_module.png
-share/gnome/dia/shapes/Cisco/content_service_module.shape
-share/gnome/dia/shapes/Cisco/content_switch.png
-share/gnome/dia/shapes/Cisco/content_switch.shape
-share/gnome/dia/shapes/Cisco/csm-s.png
-share/gnome/dia/shapes/Cisco/csm-s.shape
-share/gnome/dia/shapes/Cisco/css1100.png
-share/gnome/dia/shapes/Cisco/css1100.shape
-share/gnome/dia/shapes/Cisco/csu_dsu.png
-share/gnome/dia/shapes/Cisco/csu_dsu.shape
-share/gnome/dia/shapes/Cisco/cte.png
-share/gnome/dia/shapes/Cisco/cte.shape
-share/gnome/dia/shapes/Cisco/data_center_switch.png
-share/gnome/dia/shapes/Cisco/data_center_switch.shape
-share/gnome/dia/shapes/Cisco/data_center_switch_reversed.png
-share/gnome/dia/shapes/Cisco/data_center_switch_reversed.shape
-share/gnome/dia/shapes/Cisco/data_switch_processor.png
-share/gnome/dia/shapes/Cisco/data_switch_processor.shape
-share/gnome/dia/shapes/Cisco/detector.png
-share/gnome/dia/shapes/Cisco/detector.shape
-share/gnome/dia/shapes/Cisco/digital_cross-connect.png
-share/gnome/dia/shapes/Cisco/digital_cross-connect.shape
-share/gnome/dia/shapes/Cisco/director_fcis.png
-share/gnome/dia/shapes/Cisco/director_fcis.shape
-share/gnome/dia/shapes/Cisco/directory_server.png
-share/gnome/dia/shapes/Cisco/directory_server.shape
-share/gnome/dia/shapes/Cisco/disk_subsystem.png
-share/gnome/dia/shapes/Cisco/disk_subsystem.shape
-share/gnome/dia/shapes/Cisco/diskette.png
-share/gnome/dia/shapes/Cisco/diskette.shape
-share/gnome/dia/shapes/Cisco/distributed_director.png
-share/gnome/dia/shapes/Cisco/distributed_director.shape
-share/gnome/dia/shapes/Cisco/dot_dot.png
-share/gnome/dia/shapes/Cisco/dot_dot.shape
-share/gnome/dia/shapes/Cisco/dpt.png
-share/gnome/dia/shapes/Cisco/dpt.shape
-share/gnome/dia/shapes/Cisco/dslam.png
-share/gnome/dia/shapes/Cisco/dslam.shape
-share/gnome/dia/shapes/Cisco/dual_mode_accesspoint.png
-share/gnome/dia/shapes/Cisco/dual_mode_accesspoint.shape
-share/gnome/dia/shapes/Cisco/dwdm_filter.png
-share/gnome/dia/shapes/Cisco/dwdm_filter.shape
-share/gnome/dia/shapes/Cisco/edge_label_switch_router.png
-share/gnome/dia/shapes/Cisco/edge_label_switch_router_with_netflow.png
-share/gnome/dia/shapes/Cisco/edge_label_switch_router_with_netflow.shape
-share/gnome/dia/shapes/Cisco/end_office.png
-share/gnome/dia/shapes/Cisco/end_office.shape
-share/gnome/dia/shapes/Cisco/etherclient.png
-share/gnome/dia/shapes/Cisco/etherclient.shape
-share/gnome/dia/shapes/Cisco/fax.png
-share/gnome/dia/shapes/Cisco/fax.shape
-share/gnome/dia/shapes/Cisco/fc_storage.png
-share/gnome/dia/shapes/Cisco/fc_storage.shape
-share/gnome/dia/shapes/Cisco/fddi_ring.png
-share/gnome/dia/shapes/Cisco/fddi_ring.shape
-share/gnome/dia/shapes/Cisco/file_cabinet.png
-share/gnome/dia/shapes/Cisco/file_cabinet.shape
-share/gnome/dia/shapes/Cisco/file_engine.png
-share/gnome/dia/shapes/Cisco/file_engine.shape
-share/gnome/dia/shapes/Cisco/file_server.png
-share/gnome/dia/shapes/Cisco/file_server.shape
-share/gnome/dia/shapes/Cisco/firewall.png
-share/gnome/dia/shapes/Cisco/firewall.shape
-share/gnome/dia/shapes/Cisco/firewall_horizontal.png
-share/gnome/dia/shapes/Cisco/firewall_horizontal.shape
-share/gnome/dia/shapes/Cisco/firewall_subdued.png
-share/gnome/dia/shapes/Cisco/firewall_subdued.shape
-share/gnome/dia/shapes/Cisco/front_end_processor.png
-share/gnome/dia/shapes/Cisco/front_end_processor.shape
-share/gnome/dia/shapes/Cisco/fwsm.png
-share/gnome/dia/shapes/Cisco/fwsm.shape
-share/gnome/dia/shapes/Cisco/general_appliance.png
-share/gnome/dia/shapes/Cisco/general_appliance.shape
-share/gnome/dia/shapes/Cisco/generic_building.png
-share/gnome/dia/shapes/Cisco/generic_building.shape
-share/gnome/dia/shapes/Cisco/generic_building_blue.png
-share/gnome/dia/shapes/Cisco/generic_building_blue.shape
-share/gnome/dia/shapes/Cisco/generic_building_subdued.png
-share/gnome/dia/shapes/Cisco/generic_building_subdued.shape
-share/gnome/dia/shapes/Cisco/generic_gateway.png
-share/gnome/dia/shapes/Cisco/generic_gateway.shape
-share/gnome/dia/shapes/Cisco/generic_processor.png
-share/gnome/dia/shapes/Cisco/generic_processor.shape
-share/gnome/dia/shapes/Cisco/generic_softswitch.png
-share/gnome/dia/shapes/Cisco/generic_softswitch.shape
-share/gnome/dia/shapes/Cisco/gigabit_switch_router_atm_tag.png
-share/gnome/dia/shapes/Cisco/gigabit_switch_router_atm_tag.shape
-share/gnome/dia/shapes/Cisco/government_building.png
-share/gnome/dia/shapes/Cisco/government_building.shape
-share/gnome/dia/shapes/Cisco/guard.png
-share/gnome/dia/shapes/Cisco/guard.shape
-share/gnome/dia/shapes/Cisco/h323.png
-share/gnome/dia/shapes/Cisco/h323.shape
-share/gnome/dia/shapes/Cisco/handheld.png
-share/gnome/dia/shapes/Cisco/handheld.shape
-share/gnome/dia/shapes/Cisco/headphones.png
-share/gnome/dia/shapes/Cisco/headphones.shape
-share/gnome/dia/shapes/Cisco/home_office.png
-share/gnome/dia/shapes/Cisco/home_office.shape
-share/gnome/dia/shapes/Cisco/hootphone.png
-share/gnome/dia/shapes/Cisco/hootphone.shape
-share/gnome/dia/shapes/Cisco/host.png
-share/gnome/dia/shapes/Cisco/host.shape
-share/gnome/dia/shapes/Cisco/house.png
-share/gnome/dia/shapes/Cisco/house.shape
-share/gnome/dia/shapes/Cisco/house_blue.png
-share/gnome/dia/shapes/Cisco/house_blue.shape
-share/gnome/dia/shapes/Cisco/hp_mini.png
-share/gnome/dia/shapes/Cisco/hp_mini.shape
-share/gnome/dia/shapes/Cisco/hub.png
-share/gnome/dia/shapes/Cisco/hub.shape
-share/gnome/dia/shapes/Cisco/hub_subdued.png
-share/gnome/dia/shapes/Cisco/hub_subdued.shape
-share/gnome/dia/shapes/Cisco/iad_router.png
-share/gnome/dia/shapes/Cisco/iad_router.shape
-share/gnome/dia/shapes/Cisco/ibm_mainframe.png
-share/gnome/dia/shapes/Cisco/ibm_mainframe.shape
-share/gnome/dia/shapes/Cisco/ibm_mainframe_with_fep.png
-share/gnome/dia/shapes/Cisco/ibm_mainframe_with_fep.shape
-share/gnome/dia/shapes/Cisco/ibm_mini.png
-share/gnome/dia/shapes/Cisco/ibm_mini.shape
-share/gnome/dia/shapes/Cisco/ibm_tower.png
-share/gnome/dia/shapes/Cisco/ibm_tower.shape
-share/gnome/dia/shapes/Cisco/icm.png
-share/gnome/dia/shapes/Cisco/icm.shape
-share/gnome/dia/shapes/Cisco/ics.png
-share/gnome/dia/shapes/Cisco/ics.shape
-share/gnome/dia/shapes/Cisco/intelliswitch_stack.png
-share/gnome/dia/shapes/Cisco/intelliswitch_stack.shape
-share/gnome/dia/shapes/Cisco/ios_firewall.png
-share/gnome/dia/shapes/Cisco/ios_firewall.shape
-share/gnome/dia/shapes/Cisco/ios_slb.png
-share/gnome/dia/shapes/Cisco/ios_slb.shape
-share/gnome/dia/shapes/Cisco/ip.png
-share/gnome/dia/shapes/Cisco/ip.shape
-share/gnome/dia/shapes/Cisco/ip_dsl.png
-share/gnome/dia/shapes/Cisco/ip_dsl.shape
-share/gnome/dia/shapes/Cisco/ip_old-style.png
-share/gnome/dia/shapes/Cisco/ip_old-style.shape
-share/gnome/dia/shapes/Cisco/ip_phone.png
-share/gnome/dia/shapes/Cisco/ip_phone.shape
-share/gnome/dia/shapes/Cisco/ip_softphone.png
-share/gnome/dia/shapes/Cisco/ip_softphone.shape
-share/gnome/dia/shapes/Cisco/ip_telephony_router.png
-share/gnome/dia/shapes/Cisco/ip_telephony_router.shape
-share/gnome/dia/shapes/Cisco/ip_transport_concentrator.png
-share/gnome/dia/shapes/Cisco/ip_transport_concentrator.shape
-share/gnome/dia/shapes/Cisco/iptv_broadcast_server.png
-share/gnome/dia/shapes/Cisco/iptv_broadcast_server.shape
-share/gnome/dia/shapes/Cisco/iptv_content_manager.png
-share/gnome/dia/shapes/Cisco/iptv_content_manager.shape
-share/gnome/dia/shapes/Cisco/iscsi_switch.png
-share/gnome/dia/shapes/Cisco/iscsi_switch.shape
-share/gnome/dia/shapes/Cisco/isdn_switch.png
-share/gnome/dia/shapes/Cisco/isdn_switch.shape
-share/gnome/dia/shapes/Cisco/itp.png
-share/gnome/dia/shapes/Cisco/itp.shape
-share/gnome/dia/shapes/Cisco/jbod.png
-share/gnome/dia/shapes/Cisco/jbod.shape
-share/gnome/dia/shapes/Cisco/key.png
-share/gnome/dia/shapes/Cisco/key.shape
-share/gnome/dia/shapes/Cisco/label_switch_router.png
-share/gnome/dia/shapes/Cisco/label_switch_router.shape
-share/gnome/dia/shapes/Cisco/lan2lan_switch.png
-share/gnome/dia/shapes/Cisco/lan2lan_switch.shape
-share/gnome/dia/shapes/Cisco/lan_to_lan.png
-share/gnome/dia/shapes/Cisco/lan_to_lan.shape
-share/gnome/dia/shapes/Cisco/laptop.png
-share/gnome/dia/shapes/Cisco/laptop.shape
-share/gnome/dia/shapes/Cisco/layer3_switch.png
-share/gnome/dia/shapes/Cisco/layer3_switch.shape
-share/gnome/dia/shapes/Cisco/layer_2_remote_switch.png
-share/gnome/dia/shapes/Cisco/layer_2_remote_switch.shape
-share/gnome/dia/shapes/Cisco/lightweight_ap.png
-share/gnome/dia/shapes/Cisco/lightweight_ap.shape
-share/gnome/dia/shapes/Cisco/localdirector.png
-share/gnome/dia/shapes/Cisco/localdirector.shape
-share/gnome/dia/shapes/Cisco/location_server.png
-share/gnome/dia/shapes/Cisco/location_server.shape
-share/gnome/dia/shapes/Cisco/lock.png
-share/gnome/dia/shapes/Cisco/lock.shape
-share/gnome/dia/shapes/Cisco/lock_and_key.png
-share/gnome/dia/shapes/Cisco/lock_and_key.shape
-share/gnome/dia/shapes/Cisco/longreach_cpe.png
-share/gnome/dia/shapes/Cisco/longreach_cpe.shape
-share/gnome/dia/shapes/Cisco/mac_woman.png
-share/gnome/dia/shapes/Cisco/mac_woman.shape
-share/gnome/dia/shapes/Cisco/mac_woman_right.png
-share/gnome/dia/shapes/Cisco/mac_woman_right.shape
-share/gnome/dia/shapes/Cisco/macintosh.png
-share/gnome/dia/shapes/Cisco/macintosh.shape
-share/gnome/dia/shapes/Cisco/man.png
-share/gnome/dia/shapes/Cisco/man.shape
-share/gnome/dia/shapes/Cisco/man_blue.png
-share/gnome/dia/shapes/Cisco/man_blue.shape
-share/gnome/dia/shapes/Cisco/man_gold.png
-share/gnome/dia/shapes/Cisco/man_gold.shape
-share/gnome/dia/shapes/Cisco/man_red.png
-share/gnome/dia/shapes/Cisco/man_red.shape
-share/gnome/dia/shapes/Cisco/man_woman.png
-share/gnome/dia/shapes/Cisco/man_woman.shape
-share/gnome/dia/shapes/Cisco/mas_gateway.png
-share/gnome/dia/shapes/Cisco/mas_gateway.shape
-share/gnome/dia/shapes/Cisco/mau.png
-share/gnome/dia/shapes/Cisco/mau.shape
-share/gnome/dia/shapes/Cisco/mcu.png
-share/gnome/dia/shapes/Cisco/mcu.shape
-share/gnome/dia/shapes/Cisco/mdu.png
-share/gnome/dia/shapes/Cisco/mdu.shape
-share/gnome/dia/shapes/Cisco/me1100.png
-share/gnome/dia/shapes/Cisco/me1100.shape
-share/gnome/dia/shapes/Cisco/medium_building.png
-share/gnome/dia/shapes/Cisco/medium_building.shape
-share/gnome/dia/shapes/Cisco/medium_building_blue.png
-share/gnome/dia/shapes/Cisco/medium_building_blue.shape
-share/gnome/dia/shapes/Cisco/medium_building_subdued.png
-share/gnome/dia/shapes/Cisco/medium_building_subdued.shape
-share/gnome/dia/shapes/Cisco/metro1500.png
-share/gnome/dia/shapes/Cisco/metro1500.shape
-share/gnome/dia/shapes/Cisco/mgx8220.png
-share/gnome/dia/shapes/Cisco/mgx8220.shape
-share/gnome/dia/shapes/Cisco/mgx8240.png
-share/gnome/dia/shapes/Cisco/mgx8240.shape
-share/gnome/dia/shapes/Cisco/mgx8260.png
-share/gnome/dia/shapes/Cisco/mgx8260.shape
-share/gnome/dia/shapes/Cisco/mgx_8000_series_voice_gateway.png
-share/gnome/dia/shapes/Cisco/mgx_8000_series_voice_gateway.shape
-share/gnome/dia/shapes/Cisco/microphone.png
-share/gnome/dia/shapes/Cisco/microphone.shape
-share/gnome/dia/shapes/Cisco/microwebserver.png
-share/gnome/dia/shapes/Cisco/microwebserver.shape
-share/gnome/dia/shapes/Cisco/mini_vax.png
-share/gnome/dia/shapes/Cisco/mini_vax.shape
-share/gnome/dia/shapes/Cisco/mobile_access_ip_phone.png
-share/gnome/dia/shapes/Cisco/mobile_access_ip_phone.shape
-share/gnome/dia/shapes/Cisco/mobile_access_router.png
-share/gnome/dia/shapes/Cisco/mobile_access_router.shape
-share/gnome/dia/shapes/Cisco/modem.png
-share/gnome/dia/shapes/Cisco/modem.shape
-share/gnome/dia/shapes/Cisco/moh_server.png
-share/gnome/dia/shapes/Cisco/moh_server.shape
-share/gnome/dia/shapes/Cisco/monitor.png
-share/gnome/dia/shapes/Cisco/monitor.shape
-share/gnome/dia/shapes/Cisco/multi-fabric_server_switch.png
-share/gnome/dia/shapes/Cisco/multi-fabric_server_switch.shape
-share/gnome/dia/shapes/Cisco/multilayer_remote_switch.png
-share/gnome/dia/shapes/Cisco/multilayer_remote_switch.shape
-share/gnome/dia/shapes/Cisco/multilayer_switch.png
-share/gnome/dia/shapes/Cisco/multilayer_switch.shape
-share/gnome/dia/shapes/Cisco/multilayer_switch_with_silicon.png
-share/gnome/dia/shapes/Cisco/multilayer_switch_with_silicon.shape
-share/gnome/dia/shapes/Cisco/multilayer_switch_with_silicon_subdued.png
-share/gnome/dia/shapes/Cisco/multilayer_switch_with_silicon_subdued.shape
-share/gnome/dia/shapes/Cisco/multiswitch_device.png
-share/gnome/dia/shapes/Cisco/multiswitch_device.shape
-share/gnome/dia/shapes/Cisco/mux.png
-share/gnome/dia/shapes/Cisco/mux.shape
-share/gnome/dia/shapes/Cisco/nat.png
-share/gnome/dia/shapes/Cisco/nat.shape
-share/gnome/dia/shapes/Cisco/netflow_router.png
-share/gnome/dia/shapes/Cisco/netflow_router.shape
-share/gnome/dia/shapes/Cisco/netranger.png
-share/gnome/dia/shapes/Cisco/netranger.shape
-share/gnome/dia/shapes/Cisco/netsonar.png
-share/gnome/dia/shapes/Cisco/netsonar.shape
-share/gnome/dia/shapes/Cisco/network_management.png
-share/gnome/dia/shapes/Cisco/network_management.shape
-share/gnome/dia/shapes/Cisco/newton.png
-share/gnome/dia/shapes/Cisco/newton.shape
-share/gnome/dia/shapes/Cisco/octel.png
-share/gnome/dia/shapes/Cisco/octel.shape
-share/gnome/dia/shapes/Cisco/ons15104.png
-share/gnome/dia/shapes/Cisco/ons15104.shape
-share/gnome/dia/shapes/Cisco/ons15540.png
-share/gnome/dia/shapes/Cisco/ons15540.shape
-share/gnome/dia/shapes/Cisco/optical_amplifier.png
-share/gnome/dia/shapes/Cisco/optical_amplifier.shape
-share/gnome/dia/shapes/Cisco/optical_cross-connect.png
-share/gnome/dia/shapes/Cisco/optical_cross-connect.shape
-share/gnome/dia/shapes/Cisco/optical_fiber.png
-share/gnome/dia/shapes/Cisco/optical_fiber.shape
-share/gnome/dia/shapes/Cisco/optical_services_router.png
-share/gnome/dia/shapes/Cisco/optical_services_router.shape
-share/gnome/dia/shapes/Cisco/optical_transport.png
-share/gnome/dia/shapes/Cisco/optical_transport.shape
-share/gnome/dia/shapes/Cisco/pad.png
-share/gnome/dia/shapes/Cisco/pad.shape
-share/gnome/dia/shapes/Cisco/pager.png
-share/gnome/dia/shapes/Cisco/pager.shape
-share/gnome/dia/shapes/Cisco/pbx.png
-share/gnome/dia/shapes/Cisco/pbx.shape
-share/gnome/dia/shapes/Cisco/pbx_switch.png
-share/gnome/dia/shapes/Cisco/pbx_switch.shape
-share/gnome/dia/shapes/Cisco/pc.png
-share/gnome/dia/shapes/Cisco/pc.shape
-share/gnome/dia/shapes/Cisco/pc_adapter_card.png
-share/gnome/dia/shapes/Cisco/pc_adapter_card.shape
-share/gnome/dia/shapes/Cisco/pc_card.png
-share/gnome/dia/shapes/Cisco/pc_card.shape
-share/gnome/dia/shapes/Cisco/pc_man.png
-share/gnome/dia/shapes/Cisco/pc_man.shape
-share/gnome/dia/shapes/Cisco/pc_man_left.png
-share/gnome/dia/shapes/Cisco/pc_man_left.shape
-share/gnome/dia/shapes/Cisco/pc_router_card.png
-share/gnome/dia/shapes/Cisco/pc_router_card.shape
-share/gnome/dia/shapes/Cisco/pc_software.png
-share/gnome/dia/shapes/Cisco/pc_software.shape
-share/gnome/dia/shapes/Cisco/pc_video.png
-share/gnome/dia/shapes/Cisco/pc_video.shape
-share/gnome/dia/shapes/Cisco/pc_with_router-based_software.png
-share/gnome/dia/shapes/Cisco/pc_with_router-based_software.shape
-share/gnome/dia/shapes/Cisco/pda.png
-share/gnome/dia/shapes/Cisco/pda.shape
-share/gnome/dia/shapes/Cisco/phone.png
-share/gnome/dia/shapes/Cisco/phone.shape
-share/gnome/dia/shapes/Cisco/phone_2.png
-share/gnome/dia/shapes/Cisco/phone_2.shape
-share/gnome/dia/shapes/Cisco/phone_appliance.png
-share/gnome/dia/shapes/Cisco/phone_appliance.shape
-share/gnome/dia/shapes/Cisco/phone_ethernet.png
-share/gnome/dia/shapes/Cisco/phone_ethernet.shape
-share/gnome/dia/shapes/Cisco/phone_fax.png
-share/gnome/dia/shapes/Cisco/phone_fax.shape
-share/gnome/dia/shapes/Cisco/phone_feature.png
-share/gnome/dia/shapes/Cisco/phone_feature.shape
-share/gnome/dia/shapes/Cisco/pix_firewall.png
-share/gnome/dia/shapes/Cisco/pix_firewall.shape
-share/gnome/dia/shapes/Cisco/pix_firewall_left.png
-share/gnome/dia/shapes/Cisco/pix_firewall_left.shape
-share/gnome/dia/shapes/Cisco/printer.png
-share/gnome/dia/shapes/Cisco/printer.shape
-share/gnome/dia/shapes/Cisco/programmable_switch.png
-share/gnome/dia/shapes/Cisco/programmable_switch.shape
-share/gnome/dia/shapes/Cisco/protocol_translator.png
-share/gnome/dia/shapes/Cisco/protocol_translator.shape
-share/gnome/dia/shapes/Cisco/pxf.png
-share/gnome/dia/shapes/Cisco/pxf.shape
-share/gnome/dia/shapes/Cisco/radio_tower.png
-share/gnome/dia/shapes/Cisco/radio_tower.shape
-share/gnome/dia/shapes/Cisco/ratemux.png
-share/gnome/dia/shapes/Cisco/ratemux.shape
-share/gnome/dia/shapes/Cisco/relational_database.png
-share/gnome/dia/shapes/Cisco/relational_database.shape
-share/gnome/dia/shapes/Cisco/repeater.png
-share/gnome/dia/shapes/Cisco/repeater.shape
-share/gnome/dia/shapes/Cisco/route_switch_processor.png
-share/gnome/dia/shapes/Cisco/route_switch_processor.shape
-share/gnome/dia/shapes/Cisco/route_switch_processor_with_si.png
-share/gnome/dia/shapes/Cisco/route_switch_processor_with_si.shape
-share/gnome/dia/shapes/Cisco/router.png
-share/gnome/dia/shapes/Cisco/router.shape
-share/gnome/dia/shapes/Cisco/router_in_building.png
-share/gnome/dia/shapes/Cisco/router_in_building.shape
-share/gnome/dia/shapes/Cisco/router_subdued.png
-share/gnome/dia/shapes/Cisco/router_subdued.shape
-share/gnome/dia/shapes/Cisco/router_with_firewall.png
-share/gnome/dia/shapes/Cisco/router_with_firewall.shape
-share/gnome/dia/shapes/Cisco/router_with_silicon_switch.png
-share/gnome/dia/shapes/Cisco/router_with_silicon_switch.shape
-share/gnome/dia/shapes/Cisco/rps.png
-share/gnome/dia/shapes/Cisco/rps.shape
-share/gnome/dia/shapes/Cisco/running_man.png
-share/gnome/dia/shapes/Cisco/running_man.shape
-share/gnome/dia/shapes/Cisco/running_man_subdued.png
-share/gnome/dia/shapes/Cisco/running_man_subdued.shape
-share/gnome/dia/shapes/Cisco/running_woman.png
-share/gnome/dia/shapes/Cisco/running_woman.shape
-share/gnome/dia/shapes/Cisco/satellite.png
-share/gnome/dia/shapes/Cisco/satellite.shape
-share/gnome/dia/shapes/Cisco/satellite_dish.png
-share/gnome/dia/shapes/Cisco/satellite_dish.shape
-share/gnome/dia/shapes/Cisco/sc2200.png
-share/gnome/dia/shapes/Cisco/sc2200.shape
-share/gnome/dia/shapes/Cisco/sc2200_vsc3000_host.png
-share/gnome/dia/shapes/Cisco/sc2200_vsc3000_host.shape
-share/gnome/dia/shapes/Cisco/scanner.png
-share/gnome/dia/shapes/Cisco/scanner.shape
-share/gnome/dia/shapes/Cisco/security_appliance.png
-share/gnome/dia/shapes/Cisco/security_appliance.shape
-share/gnome/dia/shapes/Cisco/server_switch.png
-share/gnome/dia/shapes/Cisco/server_switch.shape
-share/gnome/dia/shapes/Cisco/server_with_pc_router.png
-share/gnome/dia/shapes/Cisco/server_with_pc_router.shape
-share/gnome/dia/shapes/Cisco/service_control.png
-share/gnome/dia/shapes/Cisco/service_control.shape
-share/gnome/dia/shapes/Cisco/sip_proxy_server.png
-share/gnome/dia/shapes/Cisco/sip_proxy_server.shape
-share/gnome/dia/shapes/Cisco/sitting_woman.png
-share/gnome/dia/shapes/Cisco/sitting_woman.shape
-share/gnome/dia/shapes/Cisco/small_business.png
-share/gnome/dia/shapes/Cisco/small_business.shape
-share/gnome/dia/shapes/Cisco/small_hub.png
-share/gnome/dia/shapes/Cisco/small_hub.shape
-share/gnome/dia/shapes/Cisco/softphone.png
-share/gnome/dia/shapes/Cisco/softphone.shape
-share/gnome/dia/shapes/Cisco/software-based_router_on_file_server.png
-share/gnome/dia/shapes/Cisco/software-based_router_on_file_server.shape
-share/gnome/dia/shapes/Cisco/sonet_mux.png
-share/gnome/dia/shapes/Cisco/sonet_mux.shape
-share/gnome/dia/shapes/Cisco/speaker.png
-share/gnome/dia/shapes/Cisco/speaker.shape
-share/gnome/dia/shapes/Cisco/ssl_terminator.png
-share/gnome/dia/shapes/Cisco/ssl_terminator.shape
-share/gnome/dia/shapes/Cisco/standing_man.png
-share/gnome/dia/shapes/Cisco/standing_man.shape
-share/gnome/dia/shapes/Cisco/stb.png
-share/gnome/dia/shapes/Cisco/stb.shape
-share/gnome/dia/shapes/Cisco/storage_array.png
-share/gnome/dia/shapes/Cisco/storage_array.shape
-share/gnome/dia/shapes/Cisco/storage_router.png
-share/gnome/dia/shapes/Cisco/storage_router.shape
-share/gnome/dia/shapes/Cisco/storage_solution_engine.png
-share/gnome/dia/shapes/Cisco/storage_solution_engine.shape
-share/gnome/dia/shapes/Cisco/stp.png
-share/gnome/dia/shapes/Cisco/stp.shape
-share/gnome/dia/shapes/Cisco/sun_workstation.png
-share/gnome/dia/shapes/Cisco/sun_workstation.shape
-share/gnome/dia/shapes/Cisco/supercomputer.png
-share/gnome/dia/shapes/Cisco/supercomputer.shape
-share/gnome/dia/shapes/Cisco/svx.png
-share/gnome/dia/shapes/Cisco/svx.shape
-share/gnome/dia/shapes/Cisco/switch_processor.png
-share/gnome/dia/shapes/Cisco/switch_processor.shape
-share/gnome/dia/shapes/Cisco/system_controller.png
-share/gnome/dia/shapes/Cisco/system_controller.shape
-share/gnome/dia/shapes/Cisco/tablet.png
-share/gnome/dia/shapes/Cisco/tablet.shape
-share/gnome/dia/shapes/Cisco/tape_array.png
-share/gnome/dia/shapes/Cisco/tape_array.shape
-share/gnome/dia/shapes/Cisco/tdm_router.png
-share/gnome/dia/shapes/Cisco/tdm_router.shape
-share/gnome/dia/shapes/Cisco/telecommuter.png
-share/gnome/dia/shapes/Cisco/telecommuter.shape
-share/gnome/dia/shapes/Cisco/telecommuter_house.png
-share/gnome/dia/shapes/Cisco/telecommuter_house.shape
-share/gnome/dia/shapes/Cisco/telecommuter_house_router.png
-share/gnome/dia/shapes/Cisco/telecommuter_house_router.shape
-share/gnome/dia/shapes/Cisco/telecommuter_house_subdued.png
-share/gnome/dia/shapes/Cisco/telecommuter_house_subdued.shape
-share/gnome/dia/shapes/Cisco/terminal.png
-share/gnome/dia/shapes/Cisco/terminal.shape
-share/gnome/dia/shapes/Cisco/terminal_server.png
-share/gnome/dia/shapes/Cisco/terminal_server.shape
-share/gnome/dia/shapes/Cisco/tokenring.png
-share/gnome/dia/shapes/Cisco/tokenring.shape
-share/gnome/dia/shapes/Cisco/transpath.png
-share/gnome/dia/shapes/Cisco/transpath.shape
-share/gnome/dia/shapes/Cisco/truck.png
-share/gnome/dia/shapes/Cisco/truck.shape
-share/gnome/dia/shapes/Cisco/turret.png
-share/gnome/dia/shapes/Cisco/turret.shape
-share/gnome/dia/shapes/Cisco/tv.png
-share/gnome/dia/shapes/Cisco/tv.shape
-share/gnome/dia/shapes/Cisco/ubr910_cable_dsu.png
-share/gnome/dia/shapes/Cisco/ubr910_cable_dsu.shape
-share/gnome/dia/shapes/Cisco/umg_series.png
-share/gnome/dia/shapes/Cisco/umg_series.shape
-share/gnome/dia/shapes/Cisco/unity_express.png
-share/gnome/dia/shapes/Cisco/unity_express.shape
-share/gnome/dia/shapes/Cisco/unity_server.png
-share/gnome/dia/shapes/Cisco/unity_server.shape
-share/gnome/dia/shapes/Cisco/universal_gateway.png
-share/gnome/dia/shapes/Cisco/universal_gateway.shape
-share/gnome/dia/shapes/Cisco/university.png
-share/gnome/dia/shapes/Cisco/university.shape
-share/gnome/dia/shapes/Cisco/ups.png
-share/gnome/dia/shapes/Cisco/ups.shape
-share/gnome/dia/shapes/Cisco/video_camera.png
-share/gnome/dia/shapes/Cisco/video_camera.shape
-share/gnome/dia/shapes/Cisco/video_camera_right.png
-share/gnome/dia/shapes/Cisco/video_camera_right.shape
-share/gnome/dia/shapes/Cisco/vip.png
-share/gnome/dia/shapes/Cisco/vip.shape
-share/gnome/dia/shapes/Cisco/virtual_layer_switch.png
-share/gnome/dia/shapes/Cisco/virtual_layer_switch.shape
-share/gnome/dia/shapes/Cisco/vn2900.png
-share/gnome/dia/shapes/Cisco/vn2900.shape
-share/gnome/dia/shapes/Cisco/vn5900.png
-share/gnome/dia/shapes/Cisco/vn5900.shape
-share/gnome/dia/shapes/Cisco/vn5902.png
-share/gnome/dia/shapes/Cisco/vn5902.shape
-share/gnome/dia/shapes/Cisco/voice-enabled_access_server.png
-share/gnome/dia/shapes/Cisco/voice-enabled_access_server.shape
-share/gnome/dia/shapes/Cisco/voice-enabled_atm_switch.png
-share/gnome/dia/shapes/Cisco/voice-enabled_atm_switch.shape
-share/gnome/dia/shapes/Cisco/voice-enabled_router.png
-share/gnome/dia/shapes/Cisco/voice-enabled_router.shape
-share/gnome/dia/shapes/Cisco/voice_switch2.png
-share/gnome/dia/shapes/Cisco/voice_switch2.shape
-share/gnome/dia/shapes/Cisco/vpn_concentrator.png
-share/gnome/dia/shapes/Cisco/vpn_concentrator.shape
-share/gnome/dia/shapes/Cisco/vpn_gateway.png
-share/gnome/dia/shapes/Cisco/vpn_gateway.shape
-share/gnome/dia/shapes/Cisco/vsc3000.png
-share/gnome/dia/shapes/Cisco/vsc3000.shape
-share/gnome/dia/shapes/Cisco/wan.png
-share/gnome/dia/shapes/Cisco/wan.shape
-share/gnome/dia/shapes/Cisco/wavelength_router.png
-share/gnome/dia/shapes/Cisco/wavelength_router.shape
-share/gnome/dia/shapes/Cisco/wdm.png
-share/gnome/dia/shapes/Cisco/wdm.shape
-share/gnome/dia/shapes/Cisco/web_browser.png
-share/gnome/dia/shapes/Cisco/web_browser.shape
-share/gnome/dia/shapes/Cisco/web_cluster.png
-share/gnome/dia/shapes/Cisco/web_cluster.shape
-share/gnome/dia/shapes/Cisco/wi-fi_tag.png
-share/gnome/dia/shapes/Cisco/wi-fi_tag.shape
-share/gnome/dia/shapes/Cisco/wireless.png
-share/gnome/dia/shapes/Cisco/wireless.shape
-share/gnome/dia/shapes/Cisco/wireless_bridge.png
-share/gnome/dia/shapes/Cisco/wireless_bridge.shape
-share/gnome/dia/shapes/Cisco/wireless_connectivity.png
-share/gnome/dia/shapes/Cisco/wireless_connectivity.shape
-share/gnome/dia/shapes/Cisco/wireless_location_appliance.png
-share/gnome/dia/shapes/Cisco/wireless_location_appliance.shape
-share/gnome/dia/shapes/Cisco/wireless_router.png
-share/gnome/dia/shapes/Cisco/wireless_router.shape
-share/gnome/dia/shapes/Cisco/wireless_transport.png
-share/gnome/dia/shapes/Cisco/wireless_transport.shape
-share/gnome/dia/shapes/Cisco/wlan_controller.png
-share/gnome/dia/shapes/Cisco/wlan_controller.shape
-share/gnome/dia/shapes/Cisco/woman.png
-share/gnome/dia/shapes/Cisco/woman.shape
-share/gnome/dia/shapes/Cisco/woman_blue.png
-share/gnome/dia/shapes/Cisco/woman_blue.shape
-share/gnome/dia/shapes/Cisco/woman_gold.png
-share/gnome/dia/shapes/Cisco/woman_gold.shape
-share/gnome/dia/shapes/Cisco/woman_red.png
-share/gnome/dia/shapes/Cisco/woman_red.shape
-share/gnome/dia/shapes/Cisco/workgroup_director.png
-share/gnome/dia/shapes/Cisco/workgroup_director.shape
-share/gnome/dia/shapes/Cisco/workgroup_fcis.png
-share/gnome/dia/shapes/Cisco/workgroup_fcis.shape
-share/gnome/dia/shapes/Cisco/workgroup_switch.png
-share/gnome/dia/shapes/Cisco/workgroup_switch.shape
-share/gnome/dia/shapes/Cisco/workgroup_switch_subdued.png
-share/gnome/dia/shapes/Cisco/workgroup_switch_subdued.shape
-share/gnome/dia/shapes/Cisco/workgroup_switch_voice-enabled.png
-share/gnome/dia/shapes/Cisco/workgroup_switch_voice-enabled.shape
-share/gnome/dia/shapes/Cisco/workstation.png
-share/gnome/dia/shapes/Cisco/workstation.shape
-share/gnome/dia/shapes/Cisco/www_server.png
-share/gnome/dia/shapes/Cisco/www_server.shape
-share/gnome/dia/shapes/Civil/bvrest.png
-share/gnome/dia/shapes/Civil/bvrest.shape
-share/gnome/dia/shapes/Civil/civil_aerator.png
-share/gnome/dia/shapes/Civil/civil_aerator.shape
-share/gnome/dia/shapes/Civil/civil_arrow_right.png
-share/gnome/dia/shapes/Civil/civil_arrow_right.shape
-share/gnome/dia/shapes/Civil/civil_arrow_up.png
-share/gnome/dia/shapes/Civil/civil_arrow_up.shape
-share/gnome/dia/shapes/Civil/civil_backflow_preventer.png
-share/gnome/dia/shapes/Civil/civil_backflow_preventer.shape
-share/gnome/dia/shapes/Civil/civil_basin.png
-share/gnome/dia/shapes/Civil/civil_basin.shape
-share/gnome/dia/shapes/Civil/civil_container.png
-share/gnome/dia/shapes/Civil/civil_container.shape
-share/gnome/dia/shapes/Civil/civil_final-settling_basin.png
-share/gnome/dia/shapes/Civil/civil_final-settling_basin.shape
-share/gnome/dia/shapes/Civil/civil_frequency_converter.png
-share/gnome/dia/shapes/Civil/civil_frequency_converter.shape
-share/gnome/dia/shapes/Civil/civil_gas_bottle.png
-share/gnome/dia/shapes/Civil/civil_gas_bottle.shape
-share/gnome/dia/shapes/Civil/civil_horizontal_limiting_line.png
-share/gnome/dia/shapes/Civil/civil_horizontal_limiting_line.shape
-share/gnome/dia/shapes/Civil/civil_horizontal_valve.png
-share/gnome/dia/shapes/Civil/civil_horizontal_valve.shape
-share/gnome/dia/shapes/Civil/civil_motor.png
-share/gnome/dia/shapes/Civil/civil_motor.shape
-share/gnome/dia/shapes/Civil/civil_preliminary_clarification_tank.png
-share/gnome/dia/shapes/Civil/civil_preliminary_clarification_tank.shape
-share/gnome/dia/shapes/Civil/civil_rotor.png
-share/gnome/dia/shapes/Civil/civil_rotor.shape
-share/gnome/dia/shapes/Civil/civil_soil.png
-share/gnome/dia/shapes/Civil/civil_soil.shape
-share/gnome/dia/shapes/Civil/civil_vertical_limiting_line.png
-share/gnome/dia/shapes/Civil/civil_vertical_limiting_line.shape
-share/gnome/dia/shapes/Civil/civil_vertical_propeller.png
-share/gnome/dia/shapes/Civil/civil_vertical_propeller.shape
-share/gnome/dia/shapes/Civil/hcompressor.png
-share/gnome/dia/shapes/Civil/hcompressor.shape
-share/gnome/dia/shapes/Civil/hpump.png
-share/gnome/dia/shapes/Civil/hpump.shape
-share/gnome/dia/shapes/Civil/hrest.png
-share/gnome/dia/shapes/Civil/hrest.shape
-share/gnome/dia/shapes/Civil/line.png
-share/gnome/dia/shapes/Civil/line.shape
-share/gnome/dia/shapes/Civil/vcompressor.png
-share/gnome/dia/shapes/Civil/vcompressor.shape
-share/gnome/dia/shapes/Civil/vpump.png
-share/gnome/dia/shapes/Civil/vpump.shape
-share/gnome/dia/shapes/Civil/vrest.png
-share/gnome/dia/shapes/Civil/vrest.shape
-share/gnome/dia/shapes/Civil/water_level.png
-share/gnome/dia/shapes/Civil/water_level.shape
-share/gnome/dia/shapes/Contact/c_if.png
-share/gnome/dia/shapes/Contact/c_if.shape
-share/gnome/dia/shapes/Contact/c_ifnot.png
-share/gnome/dia/shapes/Contact/c_ifnot.shape
-share/gnome/dia/shapes/Contact/c_lamp.png
-share/gnome/dia/shapes/Contact/c_lamp.shape
-share/gnome/dia/shapes/Contact/c_relay.png
-share/gnome/dia/shapes/Contact/c_relay.shape
-share/gnome/dia/shapes/Contact/l_if.png
-share/gnome/dia/shapes/Contact/l_if.shape
-share/gnome/dia/shapes/Contact/l_ifnot.png
-share/gnome/dia/shapes/Contact/l_ifnot.shape
-share/gnome/dia/shapes/Contact/l_out.png
-share/gnome/dia/shapes/Contact/l_out.shape
-share/gnome/dia/shapes/Contact/l_outj.png
-share/gnome/dia/shapes/Contact/l_outj.shape
-share/gnome/dia/shapes/Contact/l_outnot.png
-share/gnome/dia/shapes/Contact/l_outnot.shape
-share/gnome/dia/shapes/Contact/l_outr.png
-share/gnome/dia/shapes/Contact/l_outr.shape
-share/gnome/dia/shapes/Contact/l_outrcep.png
-share/gnome/dia/shapes/Contact/l_outrcep.shape
-share/gnome/dia/shapes/Contact/l_outs.png
-share/gnome/dia/shapes/Contact/l_outs.shape
-share/gnome/dia/shapes/Contact/l_sout.png
-share/gnome/dia/shapes/Contact/l_sout.shape
-share/gnome/dia/shapes/Contact/l_soutnot.png
-share/gnome/dia/shapes/Contact/l_soutnot.shape
-share/gnome/dia/shapes/Contact/l_soutr.png
-share/gnome/dia/shapes/Contact/l_soutr.shape
-share/gnome/dia/shapes/Contact/l_souts.png
-share/gnome/dia/shapes/Contact/l_souts.shape
-share/gnome/dia/shapes/Cybernetics/b-integrator.png
-share/gnome/dia/shapes/Cybernetics/b-integrator.shape
-share/gnome/dia/shapes/Cybernetics/b-minus.png
-share/gnome/dia/shapes/Cybernetics/b-minus.shape
-share/gnome/dia/shapes/Cybernetics/b-sens.png
-share/gnome/dia/shapes/Cybernetics/b-sens.shape
-share/gnome/dia/shapes/Cybernetics/delta-t.png
-share/gnome/dia/shapes/Cybernetics/delta-t.shape
-share/gnome/dia/shapes/Cybernetics/empty-func.png
-share/gnome/dia/shapes/Cybernetics/empty-func.shape
-share/gnome/dia/shapes/Cybernetics/factor-0to-1.png
-share/gnome/dia/shapes/Cybernetics/factor-0to-1.shape
-share/gnome/dia/shapes/Cybernetics/factor-0to1.png
-share/gnome/dia/shapes/Cybernetics/factor-0to1.shape
-share/gnome/dia/shapes/Cybernetics/factor-greater1.png
-share/gnome/dia/shapes/Cybernetics/factor-greater1.shape
-share/gnome/dia/shapes/Cybernetics/factor-smaller-1.png
-share/gnome/dia/shapes/Cybernetics/factor-smaller-1.shape
-share/gnome/dia/shapes/Cybernetics/full-wave-rectifier.png
-share/gnome/dia/shapes/Cybernetics/full-wave-rectifier.shape
-share/gnome/dia/shapes/Cybernetics/half-wave-rectifier.png
-share/gnome/dia/shapes/Cybernetics/half-wave-rectifier.shape
-share/gnome/dia/shapes/Cybernetics/hpf.png
-share/gnome/dia/shapes/Cybernetics/hpf.shape
-share/gnome/dia/shapes/Cybernetics/l-integrator.png
-share/gnome/dia/shapes/Cybernetics/l-integrator.shape
-share/gnome/dia/shapes/Cybernetics/l-minus.png
-share/gnome/dia/shapes/Cybernetics/l-minus.shape
-share/gnome/dia/shapes/Cybernetics/l-sens.png
-share/gnome/dia/shapes/Cybernetics/l-sens.shape
-share/gnome/dia/shapes/Cybernetics/lpf.png
-share/gnome/dia/shapes/Cybernetics/lpf.shape
-share/gnome/dia/shapes/Cybernetics/negative-shift.png
-share/gnome/dia/shapes/Cybernetics/negative-shift.shape
-share/gnome/dia/shapes/Cybernetics/positive-shift.png
-share/gnome/dia/shapes/Cybernetics/positive-shift.shape
-share/gnome/dia/shapes/Cybernetics/product.png
-share/gnome/dia/shapes/Cybernetics/product.shape
-share/gnome/dia/shapes/Cybernetics/r-integrator.png
-share/gnome/dia/shapes/Cybernetics/r-integrator.shape
-share/gnome/dia/shapes/Cybernetics/r-minus.png
-share/gnome/dia/shapes/Cybernetics/r-minus.shape
-share/gnome/dia/shapes/Cybernetics/r-sens.png
-share/gnome/dia/shapes/Cybernetics/r-sens.shape
-share/gnome/dia/shapes/Cybernetics/relay.png
-share/gnome/dia/shapes/Cybernetics/relay.shape
-share/gnome/dia/shapes/Cybernetics/saturation.png
-share/gnome/dia/shapes/Cybernetics/saturation.shape
-share/gnome/dia/shapes/Cybernetics/sigmoid.png
-share/gnome/dia/shapes/Cybernetics/sigmoid.shape
-share/gnome/dia/shapes/Cybernetics/sine.png
-share/gnome/dia/shapes/Cybernetics/sine.shape
-share/gnome/dia/shapes/Cybernetics/sum.png
-share/gnome/dia/shapes/Cybernetics/sum.shape
-share/gnome/dia/shapes/Cybernetics/t-integrator.png
-share/gnome/dia/shapes/Cybernetics/t-integrator.shape
-share/gnome/dia/shapes/Cybernetics/t-minus.png
-share/gnome/dia/shapes/Cybernetics/t-minus.shape
-share/gnome/dia/shapes/Cybernetics/t-sens.png
-share/gnome/dia/shapes/Cybernetics/t-sens.shape
-share/gnome/dia/shapes/Electric/cnx.png
-share/gnome/dia/shapes/Electric/cnx.shape
-share/gnome/dia/shapes/Electric/command.png
-share/gnome/dia/shapes/Electric/command.shape
-share/gnome/dia/shapes/Electric/contact_f.png
-share/gnome/dia/shapes/Electric/contact_f.shape
-share/gnome/dia/shapes/Electric/contact_o.png
-share/gnome/dia/shapes/Electric/contact_o.shape
-share/gnome/dia/shapes/Electric/intpos_f.png
-share/gnome/dia/shapes/Electric/intpos_f.shape
-share/gnome/dia/shapes/Electric/intpos_o.png
-share/gnome/dia/shapes/Electric/intpos_o.shape
-share/gnome/dia/shapes/Electric/lamp.png
-share/gnome/dia/shapes/Electric/lamp.shape
-share/gnome/dia/shapes/Electric/relay.png
-share/gnome/dia/shapes/Electric/relay.shape
-share/gnome/dia/shapes/Electric/vcommand.png
-share/gnome/dia/shapes/Electric/vcommand.shape
-share/gnome/dia/shapes/Electric/vcontact_f.png
-share/gnome/dia/shapes/Electric/vcontact_f.shape
-share/gnome/dia/shapes/Electric/vcontact_o.png
-share/gnome/dia/shapes/Electric/vcontact_o.shape
-share/gnome/dia/shapes/Electric/vintpos_f.png
-share/gnome/dia/shapes/Electric/vintpos_f.shape
-share/gnome/dia/shapes/Electric/vintpos_o.png
-share/gnome/dia/shapes/Electric/vintpos_o.shape
-share/gnome/dia/shapes/Electric/vlamp.png
-share/gnome/dia/shapes/Electric/vlamp.shape
-share/gnome/dia/shapes/Electric/vrelay.png
-share/gnome/dia/shapes/Electric/vrelay.shape
-share/gnome/dia/shapes/Flowchart/collate.png
-share/gnome/dia/shapes/Flowchart/collate.shape
-share/gnome/dia/shapes/Flowchart/datasource.png
-share/gnome/dia/shapes/Flowchart/datasource.shape
-share/gnome/dia/shapes/Flowchart/delay.png
-share/gnome/dia/shapes/Flowchart/delay.shape
-share/gnome/dia/shapes/Flowchart/display.png
-share/gnome/dia/shapes/Flowchart/display.shape
-share/gnome/dia/shapes/Flowchart/document.png
-share/gnome/dia/shapes/Flowchart/document.shape
-share/gnome/dia/shapes/Flowchart/extract.png
-share/gnome/dia/shapes/Flowchart/extract.shape
-share/gnome/dia/shapes/Flowchart/intstorage.png
-share/gnome/dia/shapes/Flowchart/intstorage.shape
-share/gnome/dia/shapes/Flowchart/magdisk.png
-share/gnome/dia/shapes/Flowchart/magdisk.shape
-share/gnome/dia/shapes/Flowchart/magdrum.png
-share/gnome/dia/shapes/Flowchart/magdrum.shape
-share/gnome/dia/shapes/Flowchart/magtape.png
-share/gnome/dia/shapes/Flowchart/magtape.shape
-share/gnome/dia/shapes/Flowchart/manualinput.png
-share/gnome/dia/shapes/Flowchart/manualinput.shape
-share/gnome/dia/shapes/Flowchart/manualop.png
-share/gnome/dia/shapes/Flowchart/manualop.shape
-share/gnome/dia/shapes/Flowchart/merge.png
-share/gnome/dia/shapes/Flowchart/merge.shape
-share/gnome/dia/shapes/Flowchart/offlinestore.png
-share/gnome/dia/shapes/Flowchart/offlinestore.shape
-share/gnome/dia/shapes/Flowchart/offpageconn.png
-share/gnome/dia/shapes/Flowchart/offpageconn.shape
-share/gnome/dia/shapes/Flowchart/or.png
-share/gnome/dia/shapes/Flowchart/or.shape
-share/gnome/dia/shapes/Flowchart/predefdproc.png
-share/gnome/dia/shapes/Flowchart/predefdproc.shape
-share/gnome/dia/shapes/Flowchart/preparation.png
-share/gnome/dia/shapes/Flowchart/preparation.shape
-share/gnome/dia/shapes/Flowchart/punchedcard.png
-share/gnome/dia/shapes/Flowchart/punchedcard.shape
-share/gnome/dia/shapes/Flowchart/punchedtape.png
-share/gnome/dia/shapes/Flowchart/punchedtape.shape
-share/gnome/dia/shapes/Flowchart/sort.png
-share/gnome/dia/shapes/Flowchart/sort.shape
-share/gnome/dia/shapes/Flowchart/sumjunction.png
-share/gnome/dia/shapes/Flowchart/sumjunction.shape
-share/gnome/dia/shapes/Flowchart/terminal.png
-share/gnome/dia/shapes/Flowchart/terminal.shape
-share/gnome/dia/shapes/Flowchart/transaction.png
-share/gnome/dia/shapes/Flowchart/transaction.shape
-share/gnome/dia/shapes/Flowchart/transmittape.png
-share/gnome/dia/shapes/Flowchart/transmittape.shape
-share/gnome/dia/shapes/Gane_and_Sarson/alt-entity.png
-share/gnome/dia/shapes/Gane_and_Sarson/alt-entity.shape
-share/gnome/dia/shapes/Gane_and_Sarson/data_store.png
-share/gnome/dia/shapes/Gane_and_Sarson/data_store.shape
-share/gnome/dia/shapes/Gane_and_Sarson/entity.png
-share/gnome/dia/shapes/Gane_and_Sarson/entity.shape
-share/gnome/dia/shapes/Gane_and_Sarson/process.png
-share/gnome/dia/shapes/Gane_and_Sarson/process.shape
-share/gnome/dia/shapes/Logic/and.png
-share/gnome/dia/shapes/Logic/and.shape
-share/gnome/dia/shapes/Logic/buffer.png
-share/gnome/dia/shapes/Logic/buffer.shape
-share/gnome/dia/shapes/Logic/connector.png
-share/gnome/dia/shapes/Logic/connector.shape
-share/gnome/dia/shapes/Logic/inverter.png
-share/gnome/dia/shapes/Logic/inverter.shape
-share/gnome/dia/shapes/Logic/nand.png
-share/gnome/dia/shapes/Logic/nand.shape
-share/gnome/dia/shapes/Logic/nor.png
-share/gnome/dia/shapes/Logic/nor.shape
-share/gnome/dia/shapes/Logic/not.png
-share/gnome/dia/shapes/Logic/not.shape
-share/gnome/dia/shapes/Logic/or.png
-share/gnome/dia/shapes/Logic/or.shape
-share/gnome/dia/shapes/Logic/xor.png
-share/gnome/dia/shapes/Logic/xor.shape
-share/gnome/dia/shapes/MSE/demultiplexer.png
-share/gnome/dia/shapes/MSE/demultiplexer.shape
-share/gnome/dia/shapes/MSE/large_extension_node.png
-share/gnome/dia/shapes/MSE/large_extension_node.shape
-share/gnome/dia/shapes/MSE/multiplexer.png
-share/gnome/dia/shapes/MSE/multiplexer.shape
-share/gnome/dia/shapes/MSE/node_center.png
-share/gnome/dia/shapes/MSE/node_center.shape
-share/gnome/dia/shapes/MSE/small_extension_node.png
-share/gnome/dia/shapes/MSE/small_extension_node.shape
-share/gnome/dia/shapes/MSE/tacsat.png
-share/gnome/dia/shapes/MSE/tacsat.shape
-share/gnome/dia/shapes/Map/Isometric/Block1.png
-share/gnome/dia/shapes/Map/Isometric/Block1.shape
-share/gnome/dia/shapes/Map/Isometric/Block2.png
-share/gnome/dia/shapes/Map/Isometric/Block2.shape
-share/gnome/dia/shapes/Map/Isometric/Block3.png
-share/gnome/dia/shapes/Map/Isometric/Block3.shape
-share/gnome/dia/shapes/Map/Isometric/Block4.png
-share/gnome/dia/shapes/Map/Isometric/Block4.shape
-share/gnome/dia/shapes/Map/Isometric/Block5.png
-share/gnome/dia/shapes/Map/Isometric/Block5.shape
-share/gnome/dia/shapes/Map/Isometric/Block6.png
-share/gnome/dia/shapes/Map/Isometric/Block6.shape
-share/gnome/dia/shapes/Map/Isometric/Block7.png
-share/gnome/dia/shapes/Map/Isometric/Block7.shape
-share/gnome/dia/shapes/Map/Isometric/Car1.png
-share/gnome/dia/shapes/Map/Isometric/Car1.shape
-share/gnome/dia/shapes/Map/Isometric/Car2.png
-share/gnome/dia/shapes/Map/Isometric/Car2.shape
-share/gnome/dia/shapes/Map/Isometric/Corner1.png
-share/gnome/dia/shapes/Map/Isometric/Corner1.shape
-share/gnome/dia/shapes/Map/Isometric/Corner2.png
-share/gnome/dia/shapes/Map/Isometric/Corner2.shape
-share/gnome/dia/shapes/Map/Isometric/Crossroads.png
-share/gnome/dia/shapes/Map/Isometric/Crossroads.shape
-share/gnome/dia/shapes/Map/Isometric/Elevated.png
-share/gnome/dia/shapes/Map/Isometric/Elevated.shape
-share/gnome/dia/shapes/Map/Isometric/Factory.png
-share/gnome/dia/shapes/Map/Isometric/Factory.shape
-share/gnome/dia/shapes/Map/Isometric/FootBridge.png
-share/gnome/dia/shapes/Map/Isometric/FootBridge.shape
-share/gnome/dia/shapes/Map/Isometric/OneWay.png
-share/gnome/dia/shapes/Map/Isometric/OneWay.shape
-share/gnome/dia/shapes/Map/Isometric/RedCar.png
-share/gnome/dia/shapes/Map/Isometric/RedCar.shape
-share/gnome/dia/shapes/Map/Isometric/River.png
-share/gnome/dia/shapes/Map/Isometric/River.shape
-share/gnome/dia/shapes/Map/Isometric/Road1.png
-share/gnome/dia/shapes/Map/Isometric/Road1.shape
-share/gnome/dia/shapes/Map/Isometric/Roof1.png
-share/gnome/dia/shapes/Map/Isometric/Roof1.shape
-share/gnome/dia/shapes/Map/Isometric/StraightRoad1.png
-share/gnome/dia/shapes/Map/Isometric/StraightRoad1.shape
-share/gnome/dia/shapes/Map/Isometric/T-Junction.png
-share/gnome/dia/shapes/Map/Isometric/T-Junction.shape
-share/gnome/dia/shapes/Map/Isometric/Train1.png
-share/gnome/dia/shapes/Map/Isometric/Train1.shape
-share/gnome/dia/shapes/Map/Isometric/Train2.png
-share/gnome/dia/shapes/Map/Isometric/Train2.shape
-share/gnome/dia/shapes/Map/Isometric/Tree1.png
-share/gnome/dia/shapes/Map/Isometric/Tree1.shape
-share/gnome/dia/shapes/Misc/file.png
-share/gnome/dia/shapes/Misc/file.shape
-share/gnome/dia/shapes/Misc/folder.png
-share/gnome/dia/shapes/Misc/folder.shape
-share/gnome/dia/shapes/Network/antenna.png
-share/gnome/dia/shapes/Network/antenna.shape
-share/gnome/dia/shapes/Network/computer.png
-share/gnome/dia/shapes/Network/computer.shape
-share/gnome/dia/shapes/Network/dat_external.png
-share/gnome/dia/shapes/Network/dat_external.shape
-share/gnome/dia/shapes/Network/digitizing_board.png
-share/gnome/dia/shapes/Network/digitizing_board.shape
-share/gnome/dia/shapes/Network/disc.png
-share/gnome/dia/shapes/Network/disc.shape
-share/gnome/dia/shapes/Network/diskette.png
-share/gnome/dia/shapes/Network/diskette.shape
-share/gnome/dia/shapes/Network/firewall.png
-share/gnome/dia/shapes/Network/firewall.shape
-share/gnome/dia/shapes/Network/flash.png
-share/gnome/dia/shapes/Network/flash.shape
-share/gnome/dia/shapes/Network/genmonitor.png
-share/gnome/dia/shapes/Network/genmonitor.shape
-share/gnome/dia/shapes/Network/hub.png
-share/gnome/dia/shapes/Network/hub.shape
-share/gnome/dia/shapes/Network/mobile_phone.png
-share/gnome/dia/shapes/Network/mobile_phone.shape
-share/gnome/dia/shapes/Network/modem.png
-share/gnome/dia/shapes/Network/modem.shape
-share/gnome/dia/shapes/Network/modularswitch.png
-share/gnome/dia/shapes/Network/modularswitch.shape
-share/gnome/dia/shapes/Network/monitor.png
-share/gnome/dia/shapes/Network/monitor.shape
-share/gnome/dia/shapes/Network/nwcloud.png
-share/gnome/dia/shapes/Network/nwcloud.shape
-share/gnome/dia/shapes/Network/patch-panel.png
-share/gnome/dia/shapes/Network/patch-panel.shape
-share/gnome/dia/shapes/Network/pc_bigtower.png
-share/gnome/dia/shapes/Network/pc_bigtower.shape
-share/gnome/dia/shapes/Network/pc_desktop.png
-share/gnome/dia/shapes/Network/pc_desktop.shape
-share/gnome/dia/shapes/Network/pc_miditower.png
-share/gnome/dia/shapes/Network/pc_miditower.shape
-share/gnome/dia/shapes/Network/pc_minitower.png
-share/gnome/dia/shapes/Network/pc_minitower.shape
-share/gnome/dia/shapes/Network/plotter.png
-share/gnome/dia/shapes/Network/plotter.shape
-share/gnome/dia/shapes/Network/printer.png
-share/gnome/dia/shapes/Network/printer.shape
-share/gnome/dia/shapes/Network/rj45plug.png
-share/gnome/dia/shapes/Network/rj45plug.shape
-share/gnome/dia/shapes/Network/router-symbol.png
-share/gnome/dia/shapes/Network/router-symbol.shape
-share/gnome/dia/shapes/Network/sceadplug.png
-share/gnome/dia/shapes/Network/sceadplug.shape
-share/gnome/dia/shapes/Network/speaker.png
-share/gnome/dia/shapes/Network/speaker.shape
-share/gnome/dia/shapes/Network/speaker_amp.png
-share/gnome/dia/shapes/Network/speaker_amp.shape
-share/gnome/dia/shapes/Network/switch-atm-symbol.png
-share/gnome/dia/shapes/Network/switch-atm-symbol.shape
-share/gnome/dia/shapes/Network/switch-symbol.png
-share/gnome/dia/shapes/Network/switch-symbol.shape
-share/gnome/dia/shapes/Network/telephone.png
-share/gnome/dia/shapes/Network/telephone.shape
-share/gnome/dia/shapes/Network/workstation.png
-share/gnome/dia/shapes/Network/workstation.shape
-share/gnome/dia/shapes/Network/zip-disk.png
-share/gnome/dia/shapes/Network/zip-disk.shape
-share/gnome/dia/shapes/Pneumatic/cnx.png
-share/gnome/dia/shapes/Pneumatic/cnx.shape
-share/gnome/dia/shapes/Pneumatic/comelec1.png
-share/gnome/dia/shapes/Pneumatic/comelec1.shape
-share/gnome/dia/shapes/Pneumatic/comelec2.png
-share/gnome/dia/shapes/Pneumatic/comelec2.shape
-share/gnome/dia/shapes/Pneumatic/commusc.png
-share/gnome/dia/shapes/Pneumatic/commusc.shape
-share/gnome/dia/shapes/Pneumatic/compb.png
-share/gnome/dia/shapes/Pneumatic/compb.shape
-share/gnome/dia/shapes/Pneumatic/compilh.png
-share/gnome/dia/shapes/Pneumatic/compilh.shape
-share/gnome/dia/shapes/Pneumatic/compilp.png
-share/gnome/dia/shapes/Pneumatic/compilp.shape
-share/gnome/dia/shapes/Pneumatic/compush.png
-share/gnome/dia/shapes/Pneumatic/compush.shape
-share/gnome/dia/shapes/Pneumatic/comspr.png
-share/gnome/dia/shapes/Pneumatic/comspr.shape
-share/gnome/dia/shapes/Pneumatic/dejack.png
-share/gnome/dia/shapes/Pneumatic/dejack.shape
-share/gnome/dia/shapes/Pneumatic/dist22.png
-share/gnome/dia/shapes/Pneumatic/dist22.shape
-share/gnome/dia/shapes/Pneumatic/dist32.png
-share/gnome/dia/shapes/Pneumatic/dist32.shape
-share/gnome/dia/shapes/Pneumatic/dist42.png
-share/gnome/dia/shapes/Pneumatic/dist42.shape
-share/gnome/dia/shapes/Pneumatic/dist52.png
-share/gnome/dia/shapes/Pneumatic/dist52.shape
-share/gnome/dia/shapes/Pneumatic/drain.png
-share/gnome/dia/shapes/Pneumatic/drain.shape
-share/gnome/dia/shapes/Pneumatic/press.png
-share/gnome/dia/shapes/Pneumatic/press.shape
-share/gnome/dia/shapes/Pneumatic/presshy.png
-share/gnome/dia/shapes/Pneumatic/presshy.shape
-share/gnome/dia/shapes/Pneumatic/presspn.png
-share/gnome/dia/shapes/Pneumatic/presspn.shape
-share/gnome/dia/shapes/Pneumatic/seijack.png
-share/gnome/dia/shapes/Pneumatic/seijack.shape
-share/gnome/dia/shapes/Pneumatic/seojack.png
-share/gnome/dia/shapes/Pneumatic/seojack.shape
-share/gnome/dia/shapes/RDP/arc.png
-share/gnome/dia/shapes/RDP/arc_inhibiteur.png
-share/gnome/dia/shapes/RDP/place.png
-share/gnome/dia/shapes/RDP/place.shape
-share/gnome/dia/shapes/RDP/place_marquee.png
-share/gnome/dia/shapes/RDP/place_marquee.shape
-share/gnome/dia/shapes/RDP/t_transition.png
-share/gnome/dia/shapes/RDP/t_transition.shape
-share/gnome/dia/shapes/RDP/transition.png
-share/gnome/dia/shapes/RDP/transition.shape
-share/gnome/dia/shapes/SDL/block.png
-share/gnome/dia/shapes/SDL/block.shape
-share/gnome/dia/shapes/SDL/comment.png
-share/gnome/dia/shapes/SDL/comment.shape
-share/gnome/dia/shapes/SDL/decision.png
-share/gnome/dia/shapes/SDL/decision.shape
-share/gnome/dia/shapes/SDL/function.png
-share/gnome/dia/shapes/SDL/function.shape
-share/gnome/dia/shapes/SDL/header.png
-share/gnome/dia/shapes/SDL/header.shape
-share/gnome/dia/shapes/SDL/inout.png
-share/gnome/dia/shapes/SDL/inout.shape
-share/gnome/dia/shapes/SDL/macro.png
-share/gnome/dia/shapes/SDL/macro.shape
-share/gnome/dia/shapes/SDL/note.png
-share/gnome/dia/shapes/SDL/note.shape
-share/gnome/dia/shapes/SDL/process.png
-share/gnome/dia/shapes/SDL/process.shape
-share/gnome/dia/shapes/SDL/receive.png
-share/gnome/dia/shapes/SDL/receive.shape
-share/gnome/dia/shapes/SDL/return.png
-share/gnome/dia/shapes/SDL/return.shape
-share/gnome/dia/shapes/SDL/save.png
-share/gnome/dia/shapes/SDL/save.shape
-share/gnome/dia/shapes/SDL/send.png
-share/gnome/dia/shapes/SDL/send.shape
-share/gnome/dia/shapes/SDL/service.png
-share/gnome/dia/shapes/SDL/service.shape
-share/gnome/dia/shapes/SDL/state.png
-share/gnome/dia/shapes/SDL/state.shape
-share/gnome/dia/shapes/SDL/stop.png
-share/gnome/dia/shapes/SDL/stop.shape
-share/gnome/dia/shapes/SDL/task.png
-share/gnome/dia/shapes/SDL/task.shape
-share/gnome/dia/shapes/jigsaw/part_iiii.png
-share/gnome/dia/shapes/jigsaw/part_iiii.shape
-share/gnome/dia/shapes/jigsaw/part_iiio.png
-share/gnome/dia/shapes/jigsaw/part_iiio.shape
-share/gnome/dia/shapes/jigsaw/part_iioi.png
-share/gnome/dia/shapes/jigsaw/part_iioi.shape
-share/gnome/dia/shapes/jigsaw/part_iioo.png
-share/gnome/dia/shapes/jigsaw/part_iioo.shape
-share/gnome/dia/shapes/jigsaw/part_ioii.png
-share/gnome/dia/shapes/jigsaw/part_ioii.shape
-share/gnome/dia/shapes/jigsaw/part_ioio.png
-share/gnome/dia/shapes/jigsaw/part_ioio.shape
-share/gnome/dia/shapes/jigsaw/part_iooi.png
-share/gnome/dia/shapes/jigsaw/part_iooi.shape
-share/gnome/dia/shapes/jigsaw/part_iooo.png
-share/gnome/dia/shapes/jigsaw/part_iooo.shape
-share/gnome/dia/shapes/jigsaw/part_oiii.png
-share/gnome/dia/shapes/jigsaw/part_oiii.shape
-share/gnome/dia/shapes/jigsaw/part_oiio.png
-share/gnome/dia/shapes/jigsaw/part_oiio.shape
-share/gnome/dia/shapes/jigsaw/part_oioi.png
-share/gnome/dia/shapes/jigsaw/part_oioi.shape
-share/gnome/dia/shapes/jigsaw/part_oioo.png
-share/gnome/dia/shapes/jigsaw/part_oioo.shape
-share/gnome/dia/shapes/jigsaw/part_ooii.png
-share/gnome/dia/shapes/jigsaw/part_ooii.shape
-share/gnome/dia/shapes/jigsaw/part_ooio.png
-share/gnome/dia/shapes/jigsaw/part_ooio.shape
-share/gnome/dia/shapes/jigsaw/part_oooi.png
-share/gnome/dia/shapes/jigsaw/part_oooi.shape
-share/gnome/dia/shapes/jigsaw/part_oooo.png
-share/gnome/dia/shapes/jigsaw/part_oooo.shape
-share/gnome/dia/shapes/sybase/client.png
-share/gnome/dia/shapes/sybase/client.shape
-share/gnome/dia/shapes/sybase/dataserver.png
-share/gnome/dia/shapes/sybase/dataserver.shape
-share/gnome/dia/shapes/sybase/ltm.png
-share/gnome/dia/shapes/sybase/ltm.shape
-share/gnome/dia/shapes/sybase/repserver.png
-share/gnome/dia/shapes/sybase/repserver.shape
-share/gnome/dia/shapes/sybase/rsm.png
-share/gnome/dia/shapes/sybase/rsm.shape
-share/gnome/dia/shapes/sybase/stableq.png
-share/gnome/dia/shapes/sybase/stableq.shape
-share/gnome/dia/sheets/AADL.sheet
-share/gnome/dia/sheets/Assorted.sheet
-share/gnome/dia/sheets/BPMN.sheet
-share/gnome/dia/sheets/ChemEng.sheet
-share/gnome/dia/sheets/Circuit.sheet
-share/gnome/dia/sheets/Contact.sheet
-share/gnome/dia/sheets/Cybernetics.sheet
-share/gnome/dia/sheets/ER.sheet
-share/gnome/dia/sheets/ER/weakentity.png
-share/gnome/dia/sheets/Electric.sheet
-share/gnome/dia/sheets/FS.sheet
-share/gnome/dia/sheets/Flowchart.sheet
-share/gnome/dia/sheets/GRAFCET.sheet
-share/gnome/dia/sheets/GRAFCET/etapei.png
-share/gnome/dia/sheets/GRAFCET/etapemc.png
-share/gnome/dia/sheets/GRAFCET/etapeme.png
-share/gnome/dia/sheets/GRAFCET/etapems.png
-share/gnome/dia/sheets/GRAFCET/etapesp.png
-share/gnome/dia/sheets/GRAFCET/vergent_and.png
-share/gnome/dia/sheets/Gane_and_Sarson.sheet
-share/gnome/dia/sheets/IsometricMap.sheet
-share/gnome/dia/sheets/Istar.sheet
-share/gnome/dia/sheets/Istar/agent.png
-share/gnome/dia/sheets/Istar/decomposition.png
-share/gnome/dia/sheets/Istar/dependency.png
-share/gnome/dia/sheets/Istar/goal.png
-share/gnome/dia/sheets/Istar/means_ends.png
-share/gnome/dia/sheets/Istar/neg_contrib.png
-share/gnome/dia/sheets/Istar/pos_contrib.png
-share/gnome/dia/sheets/Istar/position.png
-share/gnome/dia/sheets/Istar/role.png
-share/gnome/dia/sheets/Istar/task.png
-share/gnome/dia/sheets/Jackson.sheet
-share/gnome/dia/sheets/Jackson/designed_domain.png
-share/gnome/dia/sheets/Jackson/machine_domain.png
-share/gnome/dia/sheets/Jackson/req_phen.png
-share/gnome/dia/sheets/KAOS.sheet
-share/gnome/dia/sheets/KAOS/and-complete-ref.png
-share/gnome/dia/sheets/KAOS/and-ref.png
-share/gnome/dia/sheets/KAOS/assumption.png
-share/gnome/dia/sheets/KAOS/capable-of.png
-share/gnome/dia/sheets/KAOS/conflicts.png
-share/gnome/dia/sheets/KAOS/controls.png
-share/gnome/dia/sheets/KAOS/input.png
-share/gnome/dia/sheets/KAOS/monitors.png
-share/gnome/dia/sheets/KAOS/obstacle.png
-share/gnome/dia/sheets/KAOS/obstructs.png
-share/gnome/dia/sheets/KAOS/op-ref.png
-share/gnome/dia/sheets/KAOS/or-complete-ref.png
-share/gnome/dia/sheets/KAOS/or-ref.png
-share/gnome/dia/sheets/KAOS/output.png
-share/gnome/dia/sheets/KAOS/performs.png
-share/gnome/dia/sheets/KAOS/requirement.png
-share/gnome/dia/sheets/KAOS/responsibility.png
-share/gnome/dia/sheets/KAOS/softgoal.png
-share/gnome/dia/sheets/Logic.sheet
-share/gnome/dia/sheets/MSE.sheet
-share/gnome/dia/sheets/Misc.sheet
-share/gnome/dia/sheets/Pneumatic.sheet
-share/gnome/dia/sheets/SADT.sheet
-share/gnome/dia/sheets/SDL.sheet
-share/gnome/dia/sheets/UML.sheet
-share/gnome/dia/sheets/UML/aggregation.png
-share/gnome/dia/sheets/UML/eventsink.png
-share/gnome/dia/sheets/UML/eventsource.png
-share/gnome/dia/sheets/UML/receptacle.png
-share/gnome/dia/sheets/UML/umlclass_template.png
-share/gnome/dia/sheets/chronogram.sheet
-share/gnome/dia/sheets/ciscocomputer.sheet
-share/gnome/dia/sheets/ciscohub.sheet
-share/gnome/dia/sheets/ciscomisc.sheet
-share/gnome/dia/sheets/cisconetwork.sheet
-share/gnome/dia/sheets/ciscotelephony.sheet
-share/gnome/dia/sheets/civil.sheet
-share/gnome/dia/sheets/jigsaw.sheet
-share/gnome/dia/sheets/network.sheet
-share/gnome/dia/sheets/sybase.sheet
-share/gnome/dia/ui/display-ui.xml
-share/gnome/dia/ui/popup-ui.xml
-share/gnome/dia/ui/toolbox-ui.xml
-share/gnome/dia/xslt/dia-uml.xsl
-share/gnome/dia/xslt/dia-uml2c++.xsl
-share/gnome/dia/xslt/dia-uml2componentlist.xsl
-share/gnome/dia/xslt/dia-uml2idl.xsl
-share/gnome/dia/xslt/dia-uml2java.xsl
-share/gnome/dia/xslt/dia-uml2owl.xsl
-share/gnome/dia/xslt/dia-uml2python.xsl
-share/gnome/dia/xslt/stylesheets.xml
+share/applications/dia.desktop
+share/dia/dia.xpm
+share/dia/dia_logo.png
+%%PYTHON:%%share/dia/python-startup.py
+%%PYTHON:%%share/dia/python/aobjects.py
+%%PYTHON:%%share/dia/python/codegen.py
+%%PYTHON:%%share/dia/python/diasvg.py
+%%PYTHON:%%share/dia/python/diasvg_import.py
+%%PYTHON:%%share/dia/python/dot.py
+%%PYTHON:%%share/dia/python/doxrev.py
+%%PYTHON:%%share/dia/python/group_props.py
+%%PYTHON:%%share/dia/python/gtkcons.py
+%%PYTHON:%%share/dia/python/otypes.py
+%%PYTHON:%%share/dia/python/pydiadoc.py
+%%PYTHON:%%share/dia/python/scascale.py
+%%PYTHON:%%share/dia/python/select_by.py
+share/dia/shapes/Assorted/arrow-chevron.png
+share/dia/shapes/Assorted/arrow-chevron.shape
+share/dia/shapes/Assorted/arrow-down.png
+share/dia/shapes/Assorted/arrow-down.shape
+share/dia/shapes/Assorted/arrow-left-notched.png
+share/dia/shapes/Assorted/arrow-left-notched.shape
+share/dia/shapes/Assorted/arrow-left-right-up.png
+share/dia/shapes/Assorted/arrow-left-right-up.shape
+share/dia/shapes/Assorted/arrow-left-right.png
+share/dia/shapes/Assorted/arrow-left-right.shape
+share/dia/shapes/Assorted/arrow-left-up.png
+share/dia/shapes/Assorted/arrow-left-up.shape
+share/dia/shapes/Assorted/arrow-left.png
+share/dia/shapes/Assorted/arrow-left.shape
+share/dia/shapes/Assorted/arrow-pentagon.png
+share/dia/shapes/Assorted/arrow-pentagon.shape
+share/dia/shapes/Assorted/arrow-quad.png
+share/dia/shapes/Assorted/arrow-quad.shape
+share/dia/shapes/Assorted/arrow-right-notched.png
+share/dia/shapes/Assorted/arrow-right-notched.shape
+share/dia/shapes/Assorted/arrow-right.png
+share/dia/shapes/Assorted/arrow-right.shape
+share/dia/shapes/Assorted/arrow-turn-up.png
+share/dia/shapes/Assorted/arrow-turn-up.shape
+share/dia/shapes/Assorted/arrow-up-down-left.png
+share/dia/shapes/Assorted/arrow-up-down-left.shape
+share/dia/shapes/Assorted/arrow-up-down.png
+share/dia/shapes/Assorted/arrow-up-down.shape
+share/dia/shapes/Assorted/arrow-up.png
+share/dia/shapes/Assorted/arrow-up.shape
+share/dia/shapes/Assorted/circle-quarter.png
+share/dia/shapes/Assorted/circle-quarter.shape
+share/dia/shapes/Assorted/circle.png
+share/dia/shapes/Assorted/circle.shape
+share/dia/shapes/Assorted/cross-maltese.png
+share/dia/shapes/Assorted/cross-maltese.shape
+share/dia/shapes/Assorted/cross-swiss.png
+share/dia/shapes/Assorted/cross-swiss.shape
+share/dia/shapes/Assorted/diamond.png
+share/dia/shapes/Assorted/diamond.shape
+share/dia/shapes/Assorted/heart.png
+share/dia/shapes/Assorted/heart.shape
+share/dia/shapes/Assorted/heptagon.png
+share/dia/shapes/Assorted/heptagon.shape
+share/dia/shapes/Assorted/hexagon.png
+share/dia/shapes/Assorted/hexagon.shape
+share/dia/shapes/Assorted/moon-quarter.png
+share/dia/shapes/Assorted/moon-quarter.shape
+share/dia/shapes/Assorted/octagon.png
+share/dia/shapes/Assorted/octagon.shape
+share/dia/shapes/Assorted/parallelogram-horizontal.png
+share/dia/shapes/Assorted/parallelogram-horizontal.shape
+share/dia/shapes/Assorted/parallelogram-vertical.png
+share/dia/shapes/Assorted/parallelogram-vertical.shape
+share/dia/shapes/Assorted/pentagon.png
+share/dia/shapes/Assorted/pentagon.shape
+share/dia/shapes/Assorted/square.png
+share/dia/shapes/Assorted/square.shape
+share/dia/shapes/Assorted/star4.png
+share/dia/shapes/Assorted/star4.shape
+share/dia/shapes/Assorted/star4curved.png
+share/dia/shapes/Assorted/star4curved.shape
+share/dia/shapes/Assorted/star5.png
+share/dia/shapes/Assorted/star5.shape
+share/dia/shapes/Assorted/star6.png
+share/dia/shapes/Assorted/star6.shape
+share/dia/shapes/Assorted/star7.png
+share/dia/shapes/Assorted/star7.shape
+share/dia/shapes/Assorted/star8.png
+share/dia/shapes/Assorted/star8.shape
+share/dia/shapes/Assorted/star8curved.png
+share/dia/shapes/Assorted/star8curved.shape
+share/dia/shapes/Assorted/star8sharp.png
+share/dia/shapes/Assorted/star8sharp.shape
+share/dia/shapes/Assorted/sun.png
+share/dia/shapes/Assorted/sun.shape
+share/dia/shapes/Assorted/trapezoid.png
+share/dia/shapes/Assorted/trapezoid.shape
+share/dia/shapes/Assorted/triangle-isoceles.png
+share/dia/shapes/Assorted/triangle-isoceles.shape
+share/dia/shapes/Assorted/triangle-rightangle.png
+share/dia/shapes/Assorted/triangle-rightangle.shape
+share/dia/shapes/BPMN/Activity-Looping.png
+share/dia/shapes/BPMN/Activity-Looping.shape
+share/dia/shapes/BPMN/Ad-Hoc-Collapsed-Sub-Process.png
+share/dia/shapes/BPMN/Ad-Hoc-Collapsed-Sub-Process.shape
+share/dia/shapes/BPMN/Collapsed-Sub-Process.png
+share/dia/shapes/BPMN/Collapsed-Sub-Process.shape
+share/dia/shapes/BPMN/Compensation-Collapsed-Sub-Process.png
+share/dia/shapes/BPMN/Compensation-Collapsed-Sub-Process.shape
+share/dia/shapes/BPMN/Compensation.png
+share/dia/shapes/BPMN/Compensation.shape
+share/dia/shapes/BPMN/Data-Object.png
+share/dia/shapes/BPMN/Data-Object.shape
+share/dia/shapes/BPMN/End-Event-Cancel.png
+share/dia/shapes/BPMN/End-Event-Cancel.shape
+share/dia/shapes/BPMN/End-Event-Compensation.png
+share/dia/shapes/BPMN/End-Event-Compensation.shape
+share/dia/shapes/BPMN/End-Event-Error.png
+share/dia/shapes/BPMN/End-Event-Error.shape
+share/dia/shapes/BPMN/End-Event-Link.png
+share/dia/shapes/BPMN/End-Event-Link.shape
+share/dia/shapes/BPMN/End-Event-Message.png
+share/dia/shapes/BPMN/End-Event-Message.shape
+share/dia/shapes/BPMN/End-Event-Multiple.png
+share/dia/shapes/BPMN/End-Event-Multiple.shape
+share/dia/shapes/BPMN/End-Event-Terminate.png
+share/dia/shapes/BPMN/End-Event-Terminate.shape
+share/dia/shapes/BPMN/End-Event.png
+share/dia/shapes/BPMN/End-Event.shape
+share/dia/shapes/BPMN/Gateway-Complex.png
+share/dia/shapes/BPMN/Gateway-Complex.shape
+share/dia/shapes/BPMN/Gateway-Exclusive-XOR-Data-Based.png
+share/dia/shapes/BPMN/Gateway-Exclusive-XOR-Data-Based.shape
+share/dia/shapes/BPMN/Gateway-Exclusive-XOR-Event-Based.png
+share/dia/shapes/BPMN/Gateway-Exclusive-XOR-Event-Based.shape
+share/dia/shapes/BPMN/Gateway-Inclusive-OR.png
+share/dia/shapes/BPMN/Gateway-Inclusive-OR.shape
+share/dia/shapes/BPMN/Gateway-Parallel-AND.png
+share/dia/shapes/BPMN/Gateway-Parallel-AND.shape
+share/dia/shapes/BPMN/Gateway.png
+share/dia/shapes/BPMN/Gateway.shape
+share/dia/shapes/BPMN/Group.png
+share/dia/shapes/BPMN/Group.shape
+share/dia/shapes/BPMN/Intermediate-Event-Cancel.png
+share/dia/shapes/BPMN/Intermediate-Event-Cancel.shape
+share/dia/shapes/BPMN/Intermediate-Event-Compensation.png
+share/dia/shapes/BPMN/Intermediate-Event-Compensation.shape
+share/dia/shapes/BPMN/Intermediate-Event-Error.png
+share/dia/shapes/BPMN/Intermediate-Event-Error.shape
+share/dia/shapes/BPMN/Intermediate-Event-Link.png
+share/dia/shapes/BPMN/Intermediate-Event-Link.shape
+share/dia/shapes/BPMN/Intermediate-Event-Message.png
+share/dia/shapes/BPMN/Intermediate-Event-Message.shape
+share/dia/shapes/BPMN/Intermediate-Event-Multiple.png
+share/dia/shapes/BPMN/Intermediate-Event-Multiple.shape
+share/dia/shapes/BPMN/Intermediate-Event-Rule.png
+share/dia/shapes/BPMN/Intermediate-Event-Rule.shape
+share/dia/shapes/BPMN/Intermediate-Event-Timer.png
+share/dia/shapes/BPMN/Intermediate-Event-Timer.shape
+share/dia/shapes/BPMN/Intermediate-Event.png
+share/dia/shapes/BPMN/Intermediate-Event.shape
+share/dia/shapes/BPMN/Looping-Collapsed-Sub-Process.png
+share/dia/shapes/BPMN/Looping-Collapsed-Sub-Process.shape
+share/dia/shapes/BPMN/Multiple-Instance-Collapsed-Sub-Process.png
+share/dia/shapes/BPMN/Multiple-Instance-Collapsed-Sub-Process.shape
+share/dia/shapes/BPMN/Multiple-Instance-Task.png
+share/dia/shapes/BPMN/Multiple-Instance-Task.shape
+share/dia/shapes/BPMN/Start-Event-Link.png
+share/dia/shapes/BPMN/Start-Event-Link.shape
+share/dia/shapes/BPMN/Start-Event-Message.png
+share/dia/shapes/BPMN/Start-Event-Message.shape
+share/dia/shapes/BPMN/Start-Event-Multiple.png
+share/dia/shapes/BPMN/Start-Event-Multiple.shape
+share/dia/shapes/BPMN/Start-Event-Rule.png
+share/dia/shapes/BPMN/Start-Event-Rule.shape
+share/dia/shapes/BPMN/Start-Event-Timer.png
+share/dia/shapes/BPMN/Start-Event-Timer.shape
+share/dia/shapes/BPMN/Start-Event.png
+share/dia/shapes/BPMN/Start-Event.shape
+share/dia/shapes/BPMN/Task.png
+share/dia/shapes/BPMN/Task.shape
+share/dia/shapes/BPMN/Text-Annotation.png
+share/dia/shapes/BPMN/Text-Annotation.shape
+share/dia/shapes/BPMN/Transaction.png
+share/dia/shapes/BPMN/Transaction.shape
+share/dia/shapes/ChemEng/ACgen.png
+share/dia/shapes/ChemEng/ACgen.shape
+share/dia/shapes/ChemEng/SaT-fixedtube.png
+share/dia/shapes/ChemEng/SaT-fixedtube.shape
+share/dia/shapes/ChemEng/SaT-floatinghead.png
+share/dia/shapes/ChemEng/SaT-floatinghead.shape
+share/dia/shapes/ChemEng/aircooler.png
+share/dia/shapes/ChemEng/aircooler.shape
+share/dia/shapes/ChemEng/airforced.png
+share/dia/shapes/ChemEng/airforced.shape
+share/dia/shapes/ChemEng/airinduced.png
+share/dia/shapes/ChemEng/airinduced.shape
+share/dia/shapes/ChemEng/autoclave.png
+share/dia/shapes/ChemEng/autoclave.shape
+share/dia/shapes/ChemEng/bigtraycol.png
+share/dia/shapes/ChemEng/bigtraycol.shape
+share/dia/shapes/ChemEng/centrifuge.png
+share/dia/shapes/ChemEng/centrifuge.shape
+share/dia/shapes/ChemEng/coil.png
+share/dia/shapes/ChemEng/coil.shape
+share/dia/shapes/ChemEng/coilv.png
+share/dia/shapes/ChemEng/coilv.shape
+share/dia/shapes/ChemEng/compr.png
+share/dia/shapes/ChemEng/compr.shape
+share/dia/shapes/ChemEng/coveredtank.png
+share/dia/shapes/ChemEng/coveredtank.shape
+share/dia/shapes/ChemEng/cyclone.png
+share/dia/shapes/ChemEng/cyclone.shape
+share/dia/shapes/ChemEng/displa.png
+share/dia/shapes/ChemEng/displa.shape
+share/dia/shapes/ChemEng/doublepipe.png
+share/dia/shapes/ChemEng/doublepipe.shape
+share/dia/shapes/ChemEng/ejector.png
+share/dia/shapes/ChemEng/ejector.shape
+share/dia/shapes/ChemEng/fan.png
+share/dia/shapes/ChemEng/fan.shape
+share/dia/shapes/ChemEng/filter.png
+share/dia/shapes/ChemEng/filter.shape
+share/dia/shapes/ChemEng/fixedroof.png
+share/dia/shapes/ChemEng/fixedroof.shape
+share/dia/shapes/ChemEng/floatingroof.png
+share/dia/shapes/ChemEng/floatingroof.shape
+share/dia/shapes/ChemEng/flowfan.png
+share/dia/shapes/ChemEng/flowfan.shape
+share/dia/shapes/ChemEng/fluidcont.png
+share/dia/shapes/ChemEng/fluidcont.shape
+share/dia/shapes/ChemEng/furnace.png
+share/dia/shapes/ChemEng/furnace.shape
+share/dia/shapes/ChemEng/gasholder.png
+share/dia/shapes/ChemEng/gasholder.shape
+share/dia/shapes/ChemEng/hx.png
+share/dia/shapes/ChemEng/hx.shape
+share/dia/shapes/ChemEng/hxv.png
+share/dia/shapes/ChemEng/hxv.shape
+share/dia/shapes/ChemEng/kettle.png
+share/dia/shapes/ChemEng/kettle.shape
+share/dia/shapes/ChemEng/knockout.png
+share/dia/shapes/ChemEng/knockout.shape
+share/dia/shapes/ChemEng/measure.png
+share/dia/shapes/ChemEng/measure.shape
+share/dia/shapes/ChemEng/mixer.png
+share/dia/shapes/ChemEng/mixer.shape
+share/dia/shapes/ChemEng/plate.png
+share/dia/shapes/ChemEng/plate.shape
+share/dia/shapes/ChemEng/pneum.png
+share/dia/shapes/ChemEng/pneum.shape
+share/dia/shapes/ChemEng/pneumv.png
+share/dia/shapes/ChemEng/pneumv.shape
+share/dia/shapes/ChemEng/pnuemv.png
+share/dia/shapes/ChemEng/pnuemv.shape
+share/dia/shapes/ChemEng/pump.png
+share/dia/shapes/ChemEng/pump.shape
+share/dia/shapes/ChemEng/reactor.png
+share/dia/shapes/ChemEng/reactor.shape
+share/dia/shapes/ChemEng/recipr.png
+share/dia/shapes/ChemEng/recipr.shape
+share/dia/shapes/ChemEng/regval.png
+share/dia/shapes/ChemEng/regval.shape
+share/dia/shapes/ChemEng/regvalv.png
+share/dia/shapes/ChemEng/regvalv.shape
+share/dia/shapes/ChemEng/sealedtank.png
+share/dia/shapes/ChemEng/sealedtank.shape
+share/dia/shapes/ChemEng/settling.png
+share/dia/shapes/ChemEng/settling.shape
+share/dia/shapes/ChemEng/spray.png
+share/dia/shapes/ChemEng/spray.shape
+share/dia/shapes/ChemEng/spraydrier.png
+share/dia/shapes/ChemEng/spraydrier.shape
+share/dia/shapes/ChemEng/storagesphere.png
+share/dia/shapes/ChemEng/storagesphere.shape
+share/dia/shapes/ChemEng/tank.png
+share/dia/shapes/ChemEng/tank.shape
+share/dia/shapes/ChemEng/traycol.png
+share/dia/shapes/ChemEng/traycol.shape
+share/dia/shapes/ChemEng/val.png
+share/dia/shapes/ChemEng/val.shape
+share/dia/shapes/ChemEng/valv.png
+share/dia/shapes/ChemEng/valv.shape
+share/dia/shapes/ChemEng/vessel.png
+share/dia/shapes/ChemEng/vessel.shape
+share/dia/shapes/ChemEng/wcool.png
+share/dia/shapes/ChemEng/wcool.shape
+share/dia/shapes/ChemEng/wcoolv.png
+share/dia/shapes/ChemEng/wcoolv.shape
+share/dia/shapes/Circuit/ground.png
+share/dia/shapes/Circuit/ground.shape
+share/dia/shapes/Circuit/hcapacitor.png
+share/dia/shapes/Circuit/hcapacitor.shape
+share/dia/shapes/Circuit/hdiode.png
+share/dia/shapes/Circuit/hdiode.shape
+share/dia/shapes/Circuit/hfuse_de.png
+share/dia/shapes/Circuit/hfuse_de.shape
+share/dia/shapes/Circuit/hinductor.png
+share/dia/shapes/Circuit/hinductor.shape
+share/dia/shapes/Circuit/hinductor_de.png
+share/dia/shapes/Circuit/hinductor_de.shape
+share/dia/shapes/Circuit/hjumper.png
+share/dia/shapes/Circuit/hjumper.shape
+share/dia/shapes/Circuit/hled_de.png
+share/dia/shapes/Circuit/hled_de.shape
+share/dia/shapes/Circuit/hpowersource_de.png
+share/dia/shapes/Circuit/hpowersource_de.shape
+share/dia/shapes/Circuit/hresistor.png
+share/dia/shapes/Circuit/hresistor.shape
+share/dia/shapes/Circuit/hresistor_de.png
+share/dia/shapes/Circuit/hresistor_de.shape
+share/dia/shapes/Circuit/hzener.png
+share/dia/shapes/Circuit/hzener.shape
+share/dia/shapes/Circuit/lamp_de.png
+share/dia/shapes/Circuit/lamp_de.shape
+share/dia/shapes/Circuit/microphone_de.png
+share/dia/shapes/Circuit/microphone_de.shape
+share/dia/shapes/Circuit/nmos_de.png
+share/dia/shapes/Circuit/nmos_de.shape
+share/dia/shapes/Circuit/npn.png
+share/dia/shapes/Circuit/npn.shape
+share/dia/shapes/Circuit/opamp.png
+share/dia/shapes/Circuit/opamp.shape
+share/dia/shapes/Circuit/pmos_de.png
+share/dia/shapes/Circuit/pmos_de.shape
+share/dia/shapes/Circuit/pnp.png
+share/dia/shapes/Circuit/pnp.shape
+share/dia/shapes/Circuit/speaker_de.png
+share/dia/shapes/Circuit/speaker_de.shape
+share/dia/shapes/Circuit/vcapacitor.png
+share/dia/shapes/Circuit/vcapacitor.shape
+share/dia/shapes/Circuit/vdiode.png
+share/dia/shapes/Circuit/vdiode.shape
+share/dia/shapes/Circuit/vfuse_de.png
+share/dia/shapes/Circuit/vfuse_de.shape
+share/dia/shapes/Circuit/vinductor.png
+share/dia/shapes/Circuit/vinductor.shape
+share/dia/shapes/Circuit/vinductor_de.png
+share/dia/shapes/Circuit/vinductor_de.shape
+share/dia/shapes/Circuit/vled_de.png
+share/dia/shapes/Circuit/vled_de.shape
+share/dia/shapes/Circuit/vpowersource_de.png
+share/dia/shapes/Circuit/vpowersource_de.shape
+share/dia/shapes/Circuit/vresistor.png
+share/dia/shapes/Circuit/vresistor.shape
+share/dia/shapes/Circuit/vresistor_de.png
+share/dia/shapes/Circuit/vresistor_de.shape
+share/dia/shapes/Circuit/vzener.png
+share/dia/shapes/Circuit/vzener.shape
+share/dia/shapes/Cisco/1000.png
+share/dia/shapes/Cisco/1000.shape
+share/dia/shapes/Cisco/100baset_hub.png
+share/dia/shapes/Cisco/100baset_hub.shape
+share/dia/shapes/Cisco/10700.png
+share/dia/shapes/Cisco/10700.shape
+share/dia/shapes/Cisco/15200.png
+share/dia/shapes/Cisco/15200.shape
+share/dia/shapes/Cisco/15800.png
+share/dia/shapes/Cisco/15800.shape
+share/dia/shapes/Cisco/3174.png
+share/dia/shapes/Cisco/3174.shape
+share/dia/shapes/Cisco/3x74.png
+share/dia/shapes/Cisco/3x74.shape
+share/dia/shapes/Cisco/5000.png
+share/dia/shapes/Cisco/5000.shape
+share/dia/shapes/Cisco/5002.png
+share/dia/shapes/Cisco/5002.shape
+share/dia/shapes/Cisco/5500.png
+share/dia/shapes/Cisco/5500.shape
+share/dia/shapes/Cisco/6701.png
+share/dia/shapes/Cisco/6701.shape
+share/dia/shapes/Cisco/6705.png
+share/dia/shapes/Cisco/6705.shape
+share/dia/shapes/Cisco/6732.png
+share/dia/shapes/Cisco/6732.shape
+share/dia/shapes/Cisco/7500ars.png
+share/dia/shapes/Cisco/7500ars.shape
+share/dia/shapes/Cisco/7505.png
+share/dia/shapes/Cisco/7505.shape
+share/dia/shapes/Cisco/7507.png
+share/dia/shapes/Cisco/7507.shape
+share/dia/shapes/Cisco/access_gateway.png
+share/dia/shapes/Cisco/access_gateway.shape
+share/dia/shapes/Cisco/access_server.png
+share/dia/shapes/Cisco/access_server.shape
+share/dia/shapes/Cisco/accesspoint.png
+share/dia/shapes/Cisco/accesspoint.shape
+share/dia/shapes/Cisco/adm.png
+share/dia/shapes/Cisco/adm.shape
+share/dia/shapes/Cisco/androgynous_person.png
+share/dia/shapes/Cisco/androgynous_person.shape
+share/dia/shapes/Cisco/antenna.png
+share/dia/shapes/Cisco/antenna.shape
+share/dia/shapes/Cisco/asic.png
+share/dia/shapes/Cisco/asic.shape
+share/dia/shapes/Cisco/ata.png
+share/dia/shapes/Cisco/ata.shape
+share/dia/shapes/Cisco/atm3800.png
+share/dia/shapes/Cisco/atm3800.shape
+share/dia/shapes/Cisco/atm_fast_gigabit_etherswitch.png
+share/dia/shapes/Cisco/atm_fast_gigabit_etherswitch.shape
+share/dia/shapes/Cisco/atm_router.shape
+share/dia/shapes/Cisco/atm_switch.png
+share/dia/shapes/Cisco/atm_switch.shape
+share/dia/shapes/Cisco/atm_tag_switch_router.png
+share/dia/shapes/Cisco/atm_tag_switch_router.shape
+share/dia/shapes/Cisco/automatic_protection_switching.png
+share/dia/shapes/Cisco/automatic_protection_switching.shape
+share/dia/shapes/Cisco/bbfw.png
+share/dia/shapes/Cisco/bbfw.shape
+share/dia/shapes/Cisco/bbfw_media.png
+share/dia/shapes/Cisco/bbfw_media.shape
+share/dia/shapes/Cisco/bbs.png
+share/dia/shapes/Cisco/bbs.shape
+share/dia/shapes/Cisco/bbsm.png
+share/dia/shapes/Cisco/bbsm.shape
+share/dia/shapes/Cisco/branch_office.png
+share/dia/shapes/Cisco/branch_office.shape
+share/dia/shapes/Cisco/branch_office_blue.png
+share/dia/shapes/Cisco/branch_office_blue.shape
+share/dia/shapes/Cisco/branch_office_subdued.png
+share/dia/shapes/Cisco/branch_office_subdued.shape
+share/dia/shapes/Cisco/breakout_box.png
+share/dia/shapes/Cisco/breakout_box.shape
+share/dia/shapes/Cisco/bridge.png
+share/dia/shapes/Cisco/bridge.shape
+share/dia/shapes/Cisco/broadband_router.png
+share/dia/shapes/Cisco/broadband_router.shape
+share/dia/shapes/Cisco/bts10200.png
+share/dia/shapes/Cisco/bts10200.shape
+share/dia/shapes/Cisco/ca.png
+share/dia/shapes/Cisco/ca.shape
+share/dia/shapes/Cisco/cable_modem.png
+share/dia/shapes/Cisco/cable_modem.shape
+share/dia/shapes/Cisco/callmanager.png
+share/dia/shapes/Cisco/callmanager.shape
+share/dia/shapes/Cisco/car.png
+share/dia/shapes/Cisco/car.shape
+share/dia/shapes/Cisco/carrier_routing_system.png
+share/dia/shapes/Cisco/carrier_routing_system.shape
+share/dia/shapes/Cisco/catalyst_access_gateway.png
+share/dia/shapes/Cisco/catalyst_access_gateway.shape
+share/dia/shapes/Cisco/cddi_fddi_concentrator.png
+share/dia/shapes/Cisco/cddi_fddi_concentrator.shape
+share/dia/shapes/Cisco/cdm.png
+share/dia/shapes/Cisco/cdm.shape
+share/dia/shapes/Cisco/cellular_phone.png
+share/dia/shapes/Cisco/cellular_phone.shape
+share/dia/shapes/Cisco/centri_firewall.png
+share/dia/shapes/Cisco/centri_firewall.shape
+share/dia/shapes/Cisco/channelized_pipe.png
+share/dia/shapes/Cisco/channelized_pipe.shape
+share/dia/shapes/Cisco/cisco_hub.png
+share/dia/shapes/Cisco/cisco_hub.shape
+share/dia/shapes/Cisco/ciscosecurity.png
+share/dia/shapes/Cisco/ciscosecurity.shape
+share/dia/shapes/Cisco/ciscoworks.png
+share/dia/shapes/Cisco/ciscoworks.shape
+share/dia/shapes/Cisco/ciscoworks_man.png
+share/dia/shapes/Cisco/ciscoworks_man.shape
+share/dia/shapes/Cisco/class45_switch.png
+share/dia/shapes/Cisco/class45_switch.shape
+share/dia/shapes/Cisco/cloud.png
+share/dia/shapes/Cisco/cloud.shape
+share/dia/shapes/Cisco/cloud_dark.png
+share/dia/shapes/Cisco/cloud_dark.shape
+share/dia/shapes/Cisco/cloud_gold.png
+share/dia/shapes/Cisco/cloud_gold.shape
+share/dia/shapes/Cisco/cloud_white.png
+share/dia/shapes/Cisco/cloud_white.shape
+share/dia/shapes/Cisco/communications_server.png
+share/dia/shapes/Cisco/communications_server.shape
+share/dia/shapes/Cisco/concatenated_payload.png
+share/dia/shapes/Cisco/concatenated_payload.shape
+share/dia/shapes/Cisco/content_engine.png
+share/dia/shapes/Cisco/content_engine.shape
+share/dia/shapes/Cisco/content_router.png
+share/dia/shapes/Cisco/content_router.shape
+share/dia/shapes/Cisco/content_service_module.png
+share/dia/shapes/Cisco/content_service_module.shape
+share/dia/shapes/Cisco/content_switch.png
+share/dia/shapes/Cisco/content_switch.shape
+share/dia/shapes/Cisco/csm-s.png
+share/dia/shapes/Cisco/csm-s.shape
+share/dia/shapes/Cisco/css1100.png
+share/dia/shapes/Cisco/css1100.shape
+share/dia/shapes/Cisco/csu_dsu.png
+share/dia/shapes/Cisco/csu_dsu.shape
+share/dia/shapes/Cisco/cte.png
+share/dia/shapes/Cisco/cte.shape
+share/dia/shapes/Cisco/data_center_switch.png
+share/dia/shapes/Cisco/data_center_switch.shape
+share/dia/shapes/Cisco/data_center_switch_reversed.png
+share/dia/shapes/Cisco/data_center_switch_reversed.shape
+share/dia/shapes/Cisco/data_switch_processor.png
+share/dia/shapes/Cisco/data_switch_processor.shape
+share/dia/shapes/Cisco/detector.png
+share/dia/shapes/Cisco/detector.shape
+share/dia/shapes/Cisco/digital_cross-connect.png
+share/dia/shapes/Cisco/digital_cross-connect.shape
+share/dia/shapes/Cisco/director_fcis.png
+share/dia/shapes/Cisco/director_fcis.shape
+share/dia/shapes/Cisco/directory_server.png
+share/dia/shapes/Cisco/directory_server.shape
+share/dia/shapes/Cisco/disk_subsystem.png
+share/dia/shapes/Cisco/disk_subsystem.shape
+share/dia/shapes/Cisco/diskette.png
+share/dia/shapes/Cisco/diskette.shape
+share/dia/shapes/Cisco/distributed_director.png
+share/dia/shapes/Cisco/distributed_director.shape
+share/dia/shapes/Cisco/dot_dot.png
+share/dia/shapes/Cisco/dot_dot.shape
+share/dia/shapes/Cisco/dpt.png
+share/dia/shapes/Cisco/dpt.shape
+share/dia/shapes/Cisco/dslam.png
+share/dia/shapes/Cisco/dslam.shape
+share/dia/shapes/Cisco/dual_mode_accesspoint.png
+share/dia/shapes/Cisco/dual_mode_accesspoint.shape
+share/dia/shapes/Cisco/dwdm_filter.png
+share/dia/shapes/Cisco/dwdm_filter.shape
+share/dia/shapes/Cisco/edge_label_switch_router.png
+share/dia/shapes/Cisco/edge_label_switch_router_with_netflow.png
+share/dia/shapes/Cisco/edge_label_switch_router_with_netflow.shape
+share/dia/shapes/Cisco/end_office.png
+share/dia/shapes/Cisco/end_office.shape
+share/dia/shapes/Cisco/etherclient.png
+share/dia/shapes/Cisco/etherclient.shape
+share/dia/shapes/Cisco/fax.png
+share/dia/shapes/Cisco/fax.shape
+share/dia/shapes/Cisco/fc_storage.png
+share/dia/shapes/Cisco/fc_storage.shape
+share/dia/shapes/Cisco/fddi_ring.png
+share/dia/shapes/Cisco/fddi_ring.shape
+share/dia/shapes/Cisco/file_cabinet.png
+share/dia/shapes/Cisco/file_cabinet.shape
+share/dia/shapes/Cisco/file_engine.png
+share/dia/shapes/Cisco/file_engine.shape
+share/dia/shapes/Cisco/file_server.png
+share/dia/shapes/Cisco/file_server.shape
+share/dia/shapes/Cisco/firewall.png
+share/dia/shapes/Cisco/firewall.shape
+share/dia/shapes/Cisco/firewall_horizontal.png
+share/dia/shapes/Cisco/firewall_horizontal.shape
+share/dia/shapes/Cisco/firewall_subdued.png
+share/dia/shapes/Cisco/firewall_subdued.shape
+share/dia/shapes/Cisco/front_end_processor.png
+share/dia/shapes/Cisco/front_end_processor.shape
+share/dia/shapes/Cisco/fwsm.png
+share/dia/shapes/Cisco/fwsm.shape
+share/dia/shapes/Cisco/general_appliance.png
+share/dia/shapes/Cisco/general_appliance.shape
+share/dia/shapes/Cisco/generic_building.png
+share/dia/shapes/Cisco/generic_building.shape
+share/dia/shapes/Cisco/generic_building_blue.png
+share/dia/shapes/Cisco/generic_building_blue.shape
+share/dia/shapes/Cisco/generic_building_subdued.png
+share/dia/shapes/Cisco/generic_building_subdued.shape
+share/dia/shapes/Cisco/generic_gateway.png
+share/dia/shapes/Cisco/generic_gateway.shape
+share/dia/shapes/Cisco/generic_processor.png
+share/dia/shapes/Cisco/generic_processor.shape
+share/dia/shapes/Cisco/generic_softswitch.png
+share/dia/shapes/Cisco/generic_softswitch.shape
+share/dia/shapes/Cisco/gigabit_switch_router_atm_tag.png
+share/dia/shapes/Cisco/gigabit_switch_router_atm_tag.shape
+share/dia/shapes/Cisco/government_building.png
+share/dia/shapes/Cisco/government_building.shape
+share/dia/shapes/Cisco/guard.png
+share/dia/shapes/Cisco/guard.shape
+share/dia/shapes/Cisco/h323.png
+share/dia/shapes/Cisco/h323.shape
+share/dia/shapes/Cisco/handheld.png
+share/dia/shapes/Cisco/handheld.shape
+share/dia/shapes/Cisco/headphones.png
+share/dia/shapes/Cisco/headphones.shape
+share/dia/shapes/Cisco/home_office.png
+share/dia/shapes/Cisco/home_office.shape
+share/dia/shapes/Cisco/hootphone.png
+share/dia/shapes/Cisco/hootphone.shape
+share/dia/shapes/Cisco/host.png
+share/dia/shapes/Cisco/host.shape
+share/dia/shapes/Cisco/house.png
+share/dia/shapes/Cisco/house.shape
+share/dia/shapes/Cisco/house_blue.png
+share/dia/shapes/Cisco/house_blue.shape
+share/dia/shapes/Cisco/hp_mini.png
+share/dia/shapes/Cisco/hp_mini.shape
+share/dia/shapes/Cisco/hub.png
+share/dia/shapes/Cisco/hub.shape
+share/dia/shapes/Cisco/hub_subdued.png
+share/dia/shapes/Cisco/hub_subdued.shape
+share/dia/shapes/Cisco/iad_router.png
+share/dia/shapes/Cisco/iad_router.shape
+share/dia/shapes/Cisco/ibm_mainframe.png
+share/dia/shapes/Cisco/ibm_mainframe.shape
+share/dia/shapes/Cisco/ibm_mainframe_with_fep.png
+share/dia/shapes/Cisco/ibm_mainframe_with_fep.shape
+share/dia/shapes/Cisco/ibm_mini.png
+share/dia/shapes/Cisco/ibm_mini.shape
+share/dia/shapes/Cisco/ibm_tower.png
+share/dia/shapes/Cisco/ibm_tower.shape
+share/dia/shapes/Cisco/icm.png
+share/dia/shapes/Cisco/icm.shape
+share/dia/shapes/Cisco/ics.png
+share/dia/shapes/Cisco/ics.shape
+share/dia/shapes/Cisco/intelliswitch_stack.png
+share/dia/shapes/Cisco/intelliswitch_stack.shape
+share/dia/shapes/Cisco/ios_firewall.png
+share/dia/shapes/Cisco/ios_firewall.shape
+share/dia/shapes/Cisco/ios_slb.png
+share/dia/shapes/Cisco/ios_slb.shape
+share/dia/shapes/Cisco/ip.png
+share/dia/shapes/Cisco/ip.shape
+share/dia/shapes/Cisco/ip_dsl.png
+share/dia/shapes/Cisco/ip_dsl.shape
+share/dia/shapes/Cisco/ip_old-style.png
+share/dia/shapes/Cisco/ip_old-style.shape
+share/dia/shapes/Cisco/ip_phone.png
+share/dia/shapes/Cisco/ip_phone.shape
+share/dia/shapes/Cisco/ip_softphone.png
+share/dia/shapes/Cisco/ip_softphone.shape
+share/dia/shapes/Cisco/ip_telephony_router.png
+share/dia/shapes/Cisco/ip_telephony_router.shape
+share/dia/shapes/Cisco/ip_transport_concentrator.png
+share/dia/shapes/Cisco/ip_transport_concentrator.shape
+share/dia/shapes/Cisco/iptv_broadcast_server.png
+share/dia/shapes/Cisco/iptv_broadcast_server.shape
+share/dia/shapes/Cisco/iptv_content_manager.png
+share/dia/shapes/Cisco/iptv_content_manager.shape
+share/dia/shapes/Cisco/iscsi_switch.png
+share/dia/shapes/Cisco/iscsi_switch.shape
+share/dia/shapes/Cisco/isdn_switch.png
+share/dia/shapes/Cisco/isdn_switch.shape
+share/dia/shapes/Cisco/itp.png
+share/dia/shapes/Cisco/itp.shape
+share/dia/shapes/Cisco/jbod.png
+share/dia/shapes/Cisco/jbod.shape
+share/dia/shapes/Cisco/key.png
+share/dia/shapes/Cisco/key.shape
+share/dia/shapes/Cisco/label_switch_router.png
+share/dia/shapes/Cisco/label_switch_router.shape
+share/dia/shapes/Cisco/lan2lan_switch.png
+share/dia/shapes/Cisco/lan2lan_switch.shape
+share/dia/shapes/Cisco/lan_to_lan.png
+share/dia/shapes/Cisco/lan_to_lan.shape
+share/dia/shapes/Cisco/laptop.png
+share/dia/shapes/Cisco/laptop.shape
+share/dia/shapes/Cisco/layer3_switch.png
+share/dia/shapes/Cisco/layer3_switch.shape
+share/dia/shapes/Cisco/layer_2_remote_switch.png
+share/dia/shapes/Cisco/layer_2_remote_switch.shape
+share/dia/shapes/Cisco/lightweight_ap.png
+share/dia/shapes/Cisco/lightweight_ap.shape
+share/dia/shapes/Cisco/localdirector.png
+share/dia/shapes/Cisco/localdirector.shape
+share/dia/shapes/Cisco/location_server.png
+share/dia/shapes/Cisco/location_server.shape
+share/dia/shapes/Cisco/lock.png
+share/dia/shapes/Cisco/lock.shape
+share/dia/shapes/Cisco/lock_and_key.png
+share/dia/shapes/Cisco/lock_and_key.shape
+share/dia/shapes/Cisco/longreach_cpe.png
+share/dia/shapes/Cisco/longreach_cpe.shape
+share/dia/shapes/Cisco/mac_woman.png
+share/dia/shapes/Cisco/mac_woman.shape
+share/dia/shapes/Cisco/mac_woman_right.png
+share/dia/shapes/Cisco/mac_woman_right.shape
+share/dia/shapes/Cisco/macintosh.png
+share/dia/shapes/Cisco/macintosh.shape
+share/dia/shapes/Cisco/man.png
+share/dia/shapes/Cisco/man.shape
+share/dia/shapes/Cisco/man_blue.png
+share/dia/shapes/Cisco/man_blue.shape
+share/dia/shapes/Cisco/man_gold.png
+share/dia/shapes/Cisco/man_gold.shape
+share/dia/shapes/Cisco/man_red.png
+share/dia/shapes/Cisco/man_red.shape
+share/dia/shapes/Cisco/man_woman.png
+share/dia/shapes/Cisco/man_woman.shape
+share/dia/shapes/Cisco/mas_gateway.png
+share/dia/shapes/Cisco/mas_gateway.shape
+share/dia/shapes/Cisco/mau.png
+share/dia/shapes/Cisco/mau.shape
+share/dia/shapes/Cisco/mcu.png
+share/dia/shapes/Cisco/mcu.shape
+share/dia/shapes/Cisco/mdu.png
+share/dia/shapes/Cisco/mdu.shape
+share/dia/shapes/Cisco/me1100.png
+share/dia/shapes/Cisco/me1100.shape
+share/dia/shapes/Cisco/medium_building.png
+share/dia/shapes/Cisco/medium_building.shape
+share/dia/shapes/Cisco/medium_building_blue.png
+share/dia/shapes/Cisco/medium_building_blue.shape
+share/dia/shapes/Cisco/medium_building_subdued.png
+share/dia/shapes/Cisco/medium_building_subdued.shape
+share/dia/shapes/Cisco/metro1500.png
+share/dia/shapes/Cisco/metro1500.shape
+share/dia/shapes/Cisco/mgx8220.png
+share/dia/shapes/Cisco/mgx8220.shape
+share/dia/shapes/Cisco/mgx8240.png
+share/dia/shapes/Cisco/mgx8240.shape
+share/dia/shapes/Cisco/mgx8260.png
+share/dia/shapes/Cisco/mgx8260.shape
+share/dia/shapes/Cisco/mgx_8000_series_voice_gateway.png
+share/dia/shapes/Cisco/mgx_8000_series_voice_gateway.shape
+share/dia/shapes/Cisco/microphone.png
+share/dia/shapes/Cisco/microphone.shape
+share/dia/shapes/Cisco/microwebserver.png
+share/dia/shapes/Cisco/microwebserver.shape
+share/dia/shapes/Cisco/mini_vax.png
+share/dia/shapes/Cisco/mini_vax.shape
+share/dia/shapes/Cisco/mobile_access_ip_phone.png
+share/dia/shapes/Cisco/mobile_access_ip_phone.shape
+share/dia/shapes/Cisco/mobile_access_router.png
+share/dia/shapes/Cisco/mobile_access_router.shape
+share/dia/shapes/Cisco/modem.png
+share/dia/shapes/Cisco/modem.shape
+share/dia/shapes/Cisco/moh_server.png
+share/dia/shapes/Cisco/moh_server.shape
+share/dia/shapes/Cisco/monitor.png
+share/dia/shapes/Cisco/monitor.shape
+share/dia/shapes/Cisco/multi-fabric_server_switch.png
+share/dia/shapes/Cisco/multi-fabric_server_switch.shape
+share/dia/shapes/Cisco/multilayer_remote_switch.png
+share/dia/shapes/Cisco/multilayer_remote_switch.shape
+share/dia/shapes/Cisco/multilayer_switch.png
+share/dia/shapes/Cisco/multilayer_switch.shape
+share/dia/shapes/Cisco/multilayer_switch_with_silicon.png
+share/dia/shapes/Cisco/multilayer_switch_with_silicon.shape
+share/dia/shapes/Cisco/multilayer_switch_with_silicon_subdued.png
+share/dia/shapes/Cisco/multilayer_switch_with_silicon_subdued.shape
+share/dia/shapes/Cisco/multiswitch_device.png
+share/dia/shapes/Cisco/multiswitch_device.shape
+share/dia/shapes/Cisco/mux.png
+share/dia/shapes/Cisco/mux.shape
+share/dia/shapes/Cisco/nat.png
+share/dia/shapes/Cisco/nat.shape
+share/dia/shapes/Cisco/netflow_router.png
+share/dia/shapes/Cisco/netflow_router.shape
+share/dia/shapes/Cisco/netranger.png
+share/dia/shapes/Cisco/netranger.shape
+share/dia/shapes/Cisco/netsonar.png
+share/dia/shapes/Cisco/netsonar.shape
+share/dia/shapes/Cisco/network_management.png
+share/dia/shapes/Cisco/network_management.shape
+share/dia/shapes/Cisco/newton.png
+share/dia/shapes/Cisco/newton.shape
+share/dia/shapes/Cisco/octel.png
+share/dia/shapes/Cisco/octel.shape
+share/dia/shapes/Cisco/ons15104.png
+share/dia/shapes/Cisco/ons15104.shape
+share/dia/shapes/Cisco/ons15540.png
+share/dia/shapes/Cisco/ons15540.shape
+share/dia/shapes/Cisco/optical_amplifier.png
+share/dia/shapes/Cisco/optical_amplifier.shape
+share/dia/shapes/Cisco/optical_cross-connect.png
+share/dia/shapes/Cisco/optical_cross-connect.shape
+share/dia/shapes/Cisco/optical_fiber.png
+share/dia/shapes/Cisco/optical_fiber.shape
+share/dia/shapes/Cisco/optical_services_router.png
+share/dia/shapes/Cisco/optical_services_router.shape
+share/dia/shapes/Cisco/optical_transport.png
+share/dia/shapes/Cisco/optical_transport.shape
+share/dia/shapes/Cisco/pad.png
+share/dia/shapes/Cisco/pad.shape
+share/dia/shapes/Cisco/pager.png
+share/dia/shapes/Cisco/pager.shape
+share/dia/shapes/Cisco/pbx.png
+share/dia/shapes/Cisco/pbx.shape
+share/dia/shapes/Cisco/pbx_switch.png
+share/dia/shapes/Cisco/pbx_switch.shape
+share/dia/shapes/Cisco/pc.png
+share/dia/shapes/Cisco/pc.shape
+share/dia/shapes/Cisco/pc_adapter_card.png
+share/dia/shapes/Cisco/pc_adapter_card.shape
+share/dia/shapes/Cisco/pc_card.png
+share/dia/shapes/Cisco/pc_card.shape
+share/dia/shapes/Cisco/pc_man.png
+share/dia/shapes/Cisco/pc_man.shape
+share/dia/shapes/Cisco/pc_man_left.png
+share/dia/shapes/Cisco/pc_man_left.shape
+share/dia/shapes/Cisco/pc_router_card.png
+share/dia/shapes/Cisco/pc_router_card.shape
+share/dia/shapes/Cisco/pc_software.png
+share/dia/shapes/Cisco/pc_software.shape
+share/dia/shapes/Cisco/pc_video.png
+share/dia/shapes/Cisco/pc_video.shape
+share/dia/shapes/Cisco/pc_with_router-based_software.png
+share/dia/shapes/Cisco/pc_with_router-based_software.shape
+share/dia/shapes/Cisco/pda.png
+share/dia/shapes/Cisco/pda.shape
+share/dia/shapes/Cisco/phone.png
+share/dia/shapes/Cisco/phone.shape
+share/dia/shapes/Cisco/phone_2.png
+share/dia/shapes/Cisco/phone_2.shape
+share/dia/shapes/Cisco/phone_appliance.png
+share/dia/shapes/Cisco/phone_appliance.shape
+share/dia/shapes/Cisco/phone_ethernet.png
+share/dia/shapes/Cisco/phone_ethernet.shape
+share/dia/shapes/Cisco/phone_fax.png
+share/dia/shapes/Cisco/phone_fax.shape
+share/dia/shapes/Cisco/phone_feature.png
+share/dia/shapes/Cisco/phone_feature.shape
+share/dia/shapes/Cisco/pix_firewall.png
+share/dia/shapes/Cisco/pix_firewall.shape
+share/dia/shapes/Cisco/pix_firewall_left.png
+share/dia/shapes/Cisco/pix_firewall_left.shape
+share/dia/shapes/Cisco/printer.png
+share/dia/shapes/Cisco/printer.shape
+share/dia/shapes/Cisco/programmable_switch.png
+share/dia/shapes/Cisco/programmable_switch.shape
+share/dia/shapes/Cisco/protocol_translator.png
+share/dia/shapes/Cisco/protocol_translator.shape
+share/dia/shapes/Cisco/pxf.png
+share/dia/shapes/Cisco/pxf.shape
+share/dia/shapes/Cisco/radio_tower.png
+share/dia/shapes/Cisco/radio_tower.shape
+share/dia/shapes/Cisco/ratemux.png
+share/dia/shapes/Cisco/ratemux.shape
+share/dia/shapes/Cisco/relational_database.png
+share/dia/shapes/Cisco/relational_database.shape
+share/dia/shapes/Cisco/repeater.png
+share/dia/shapes/Cisco/repeater.shape
+share/dia/shapes/Cisco/route_switch_processor.png
+share/dia/shapes/Cisco/route_switch_processor.shape
+share/dia/shapes/Cisco/route_switch_processor_with_si.png
+share/dia/shapes/Cisco/route_switch_processor_with_si.shape
+share/dia/shapes/Cisco/router.png
+share/dia/shapes/Cisco/router.shape
+share/dia/shapes/Cisco/router_in_building.png
+share/dia/shapes/Cisco/router_in_building.shape
+share/dia/shapes/Cisco/router_subdued.png
+share/dia/shapes/Cisco/router_subdued.shape
+share/dia/shapes/Cisco/router_with_firewall.png
+share/dia/shapes/Cisco/router_with_firewall.shape
+share/dia/shapes/Cisco/router_with_silicon_switch.png
+share/dia/shapes/Cisco/router_with_silicon_switch.shape
+share/dia/shapes/Cisco/rps.png
+share/dia/shapes/Cisco/rps.shape
+share/dia/shapes/Cisco/running_man.png
+share/dia/shapes/Cisco/running_man.shape
+share/dia/shapes/Cisco/running_man_subdued.png
+share/dia/shapes/Cisco/running_man_subdued.shape
+share/dia/shapes/Cisco/running_woman.png
+share/dia/shapes/Cisco/running_woman.shape
+share/dia/shapes/Cisco/satellite.png
+share/dia/shapes/Cisco/satellite.shape
+share/dia/shapes/Cisco/satellite_dish.png
+share/dia/shapes/Cisco/satellite_dish.shape
+share/dia/shapes/Cisco/sc2200.png
+share/dia/shapes/Cisco/sc2200.shape
+share/dia/shapes/Cisco/sc2200_vsc3000_host.png
+share/dia/shapes/Cisco/sc2200_vsc3000_host.shape
+share/dia/shapes/Cisco/scanner.png
+share/dia/shapes/Cisco/scanner.shape
+share/dia/shapes/Cisco/security_appliance.png
+share/dia/shapes/Cisco/security_appliance.shape
+share/dia/shapes/Cisco/server_switch.png
+share/dia/shapes/Cisco/server_switch.shape
+share/dia/shapes/Cisco/server_with_pc_router.png
+share/dia/shapes/Cisco/server_with_pc_router.shape
+share/dia/shapes/Cisco/service_control.png
+share/dia/shapes/Cisco/service_control.shape
+share/dia/shapes/Cisco/sip_proxy_server.png
+share/dia/shapes/Cisco/sip_proxy_server.shape
+share/dia/shapes/Cisco/sitting_woman.png
+share/dia/shapes/Cisco/sitting_woman.shape
+share/dia/shapes/Cisco/small_business.png
+share/dia/shapes/Cisco/small_business.shape
+share/dia/shapes/Cisco/small_hub.png
+share/dia/shapes/Cisco/small_hub.shape
+share/dia/shapes/Cisco/softphone.png
+share/dia/shapes/Cisco/softphone.shape
+share/dia/shapes/Cisco/software-based_router_on_file_server.png
+share/dia/shapes/Cisco/software-based_router_on_file_server.shape
+share/dia/shapes/Cisco/sonet_mux.png
+share/dia/shapes/Cisco/sonet_mux.shape
+share/dia/shapes/Cisco/speaker.png
+share/dia/shapes/Cisco/speaker.shape
+share/dia/shapes/Cisco/ssl_terminator.png
+share/dia/shapes/Cisco/ssl_terminator.shape
+share/dia/shapes/Cisco/standing_man.png
+share/dia/shapes/Cisco/standing_man.shape
+share/dia/shapes/Cisco/stb.png
+share/dia/shapes/Cisco/stb.shape
+share/dia/shapes/Cisco/storage_array.png
+share/dia/shapes/Cisco/storage_array.shape
+share/dia/shapes/Cisco/storage_router.png
+share/dia/shapes/Cisco/storage_router.shape
+share/dia/shapes/Cisco/storage_solution_engine.png
+share/dia/shapes/Cisco/storage_solution_engine.shape
+share/dia/shapes/Cisco/stp.png
+share/dia/shapes/Cisco/stp.shape
+share/dia/shapes/Cisco/sun_workstation.png
+share/dia/shapes/Cisco/sun_workstation.shape
+share/dia/shapes/Cisco/supercomputer.png
+share/dia/shapes/Cisco/supercomputer.shape
+share/dia/shapes/Cisco/svx.png
+share/dia/shapes/Cisco/svx.shape
+share/dia/shapes/Cisco/switch_processor.png
+share/dia/shapes/Cisco/switch_processor.shape
+share/dia/shapes/Cisco/system_controller.png
+share/dia/shapes/Cisco/system_controller.shape
+share/dia/shapes/Cisco/tablet.png
+share/dia/shapes/Cisco/tablet.shape
+share/dia/shapes/Cisco/tape_array.png
+share/dia/shapes/Cisco/tape_array.shape
+share/dia/shapes/Cisco/tdm_router.png
+share/dia/shapes/Cisco/tdm_router.shape
+share/dia/shapes/Cisco/telecommuter.png
+share/dia/shapes/Cisco/telecommuter.shape
+share/dia/shapes/Cisco/telecommuter_house.png
+share/dia/shapes/Cisco/telecommuter_house.shape
+share/dia/shapes/Cisco/telecommuter_house_router.png
+share/dia/shapes/Cisco/telecommuter_house_router.shape
+share/dia/shapes/Cisco/telecommuter_house_subdued.png
+share/dia/shapes/Cisco/telecommuter_house_subdued.shape
+share/dia/shapes/Cisco/terminal.png
+share/dia/shapes/Cisco/terminal.shape
+share/dia/shapes/Cisco/terminal_server.png
+share/dia/shapes/Cisco/terminal_server.shape
+share/dia/shapes/Cisco/tokenring.png
+share/dia/shapes/Cisco/tokenring.shape
+share/dia/shapes/Cisco/transpath.png
+share/dia/shapes/Cisco/transpath.shape
+share/dia/shapes/Cisco/truck.png
+share/dia/shapes/Cisco/truck.shape
+share/dia/shapes/Cisco/turret.png
+share/dia/shapes/Cisco/turret.shape
+share/dia/shapes/Cisco/tv.png
+share/dia/shapes/Cisco/tv.shape
+share/dia/shapes/Cisco/ubr910_cable_dsu.png
+share/dia/shapes/Cisco/ubr910_cable_dsu.shape
+share/dia/shapes/Cisco/umg_series.png
+share/dia/shapes/Cisco/umg_series.shape
+share/dia/shapes/Cisco/unity_express.png
+share/dia/shapes/Cisco/unity_express.shape
+share/dia/shapes/Cisco/unity_server.png
+share/dia/shapes/Cisco/unity_server.shape
+share/dia/shapes/Cisco/universal_gateway.png
+share/dia/shapes/Cisco/universal_gateway.shape
+share/dia/shapes/Cisco/university.png
+share/dia/shapes/Cisco/university.shape
+share/dia/shapes/Cisco/ups.png
+share/dia/shapes/Cisco/ups.shape
+share/dia/shapes/Cisco/video_camera.png
+share/dia/shapes/Cisco/video_camera.shape
+share/dia/shapes/Cisco/video_camera_right.png
+share/dia/shapes/Cisco/video_camera_right.shape
+share/dia/shapes/Cisco/vip.png
+share/dia/shapes/Cisco/vip.shape
+share/dia/shapes/Cisco/virtual_layer_switch.png
+share/dia/shapes/Cisco/virtual_layer_switch.shape
+share/dia/shapes/Cisco/vn2900.png
+share/dia/shapes/Cisco/vn2900.shape
+share/dia/shapes/Cisco/vn5900.png
+share/dia/shapes/Cisco/vn5900.shape
+share/dia/shapes/Cisco/vn5902.png
+share/dia/shapes/Cisco/vn5902.shape
+share/dia/shapes/Cisco/voice-enabled_access_server.png
+share/dia/shapes/Cisco/voice-enabled_access_server.shape
+share/dia/shapes/Cisco/voice-enabled_atm_switch.png
+share/dia/shapes/Cisco/voice-enabled_atm_switch.shape
+share/dia/shapes/Cisco/voice-enabled_router.png
+share/dia/shapes/Cisco/voice-enabled_router.shape
+share/dia/shapes/Cisco/voice_switch2.png
+share/dia/shapes/Cisco/voice_switch2.shape
+share/dia/shapes/Cisco/vpn_concentrator.png
+share/dia/shapes/Cisco/vpn_concentrator.shape
+share/dia/shapes/Cisco/vpn_gateway.png
+share/dia/shapes/Cisco/vpn_gateway.shape
+share/dia/shapes/Cisco/vsc3000.png
+share/dia/shapes/Cisco/vsc3000.shape
+share/dia/shapes/Cisco/wan.png
+share/dia/shapes/Cisco/wan.shape
+share/dia/shapes/Cisco/wavelength_router.png
+share/dia/shapes/Cisco/wavelength_router.shape
+share/dia/shapes/Cisco/wdm.png
+share/dia/shapes/Cisco/wdm.shape
+share/dia/shapes/Cisco/web_browser.png
+share/dia/shapes/Cisco/web_browser.shape
+share/dia/shapes/Cisco/web_cluster.png
+share/dia/shapes/Cisco/web_cluster.shape
+share/dia/shapes/Cisco/wi-fi_tag.png
+share/dia/shapes/Cisco/wi-fi_tag.shape
+share/dia/shapes/Cisco/wireless.png
+share/dia/shapes/Cisco/wireless.shape
+share/dia/shapes/Cisco/wireless_bridge.png
+share/dia/shapes/Cisco/wireless_bridge.shape
+share/dia/shapes/Cisco/wireless_connectivity.png
+share/dia/shapes/Cisco/wireless_connectivity.shape
+share/dia/shapes/Cisco/wireless_location_appliance.png
+share/dia/shapes/Cisco/wireless_location_appliance.shape
+share/dia/shapes/Cisco/wireless_router.png
+share/dia/shapes/Cisco/wireless_router.shape
+share/dia/shapes/Cisco/wireless_transport.png
+share/dia/shapes/Cisco/wireless_transport.shape
+share/dia/shapes/Cisco/wlan_controller.png
+share/dia/shapes/Cisco/wlan_controller.shape
+share/dia/shapes/Cisco/woman.png
+share/dia/shapes/Cisco/woman.shape
+share/dia/shapes/Cisco/woman_blue.png
+share/dia/shapes/Cisco/woman_blue.shape
+share/dia/shapes/Cisco/woman_gold.png
+share/dia/shapes/Cisco/woman_gold.shape
+share/dia/shapes/Cisco/woman_red.png
+share/dia/shapes/Cisco/woman_red.shape
+share/dia/shapes/Cisco/workgroup_director.png
+share/dia/shapes/Cisco/workgroup_director.shape
+share/dia/shapes/Cisco/workgroup_fcis.png
+share/dia/shapes/Cisco/workgroup_fcis.shape
+share/dia/shapes/Cisco/workgroup_switch.png
+share/dia/shapes/Cisco/workgroup_switch.shape
+share/dia/shapes/Cisco/workgroup_switch_subdued.png
+share/dia/shapes/Cisco/workgroup_switch_subdued.shape
+share/dia/shapes/Cisco/workgroup_switch_voice-enabled.png
+share/dia/shapes/Cisco/workgroup_switch_voice-enabled.shape
+share/dia/shapes/Cisco/workstation.png
+share/dia/shapes/Cisco/workstation.shape
+share/dia/shapes/Cisco/www_server.png
+share/dia/shapes/Cisco/www_server.shape
+share/dia/shapes/Civil/bvrest.png
+share/dia/shapes/Civil/bvrest.shape
+share/dia/shapes/Civil/civil_aerator.png
+share/dia/shapes/Civil/civil_aerator.shape
+share/dia/shapes/Civil/civil_arrow_right.png
+share/dia/shapes/Civil/civil_arrow_right.shape
+share/dia/shapes/Civil/civil_arrow_up.png
+share/dia/shapes/Civil/civil_arrow_up.shape
+share/dia/shapes/Civil/civil_backflow_preventer.png
+share/dia/shapes/Civil/civil_backflow_preventer.shape
+share/dia/shapes/Civil/civil_basin.png
+share/dia/shapes/Civil/civil_basin.shape
+share/dia/shapes/Civil/civil_container.png
+share/dia/shapes/Civil/civil_container.shape
+share/dia/shapes/Civil/civil_final-settling_basin.png
+share/dia/shapes/Civil/civil_final-settling_basin.shape
+share/dia/shapes/Civil/civil_frequency_converter.png
+share/dia/shapes/Civil/civil_frequency_converter.shape
+share/dia/shapes/Civil/civil_gas_bottle.png
+share/dia/shapes/Civil/civil_gas_bottle.shape
+share/dia/shapes/Civil/civil_horizontal_limiting_line.png
+share/dia/shapes/Civil/civil_horizontal_limiting_line.shape
+share/dia/shapes/Civil/civil_horizontal_valve.png
+share/dia/shapes/Civil/civil_horizontal_valve.shape
+share/dia/shapes/Civil/civil_motor.png
+share/dia/shapes/Civil/civil_motor.shape
+share/dia/shapes/Civil/civil_preliminary_clarification_tank.png
+share/dia/shapes/Civil/civil_preliminary_clarification_tank.shape
+share/dia/shapes/Civil/civil_rotor.png
+share/dia/shapes/Civil/civil_rotor.shape
+share/dia/shapes/Civil/civil_soil.png
+share/dia/shapes/Civil/civil_soil.shape
+share/dia/shapes/Civil/civil_vertical_limiting_line.png
+share/dia/shapes/Civil/civil_vertical_limiting_line.shape
+share/dia/shapes/Civil/civil_vertical_propeller.png
+share/dia/shapes/Civil/civil_vertical_propeller.shape
+share/dia/shapes/Civil/hcompressor.png
+share/dia/shapes/Civil/hcompressor.shape
+share/dia/shapes/Civil/hpump.png
+share/dia/shapes/Civil/hpump.shape
+share/dia/shapes/Civil/hrest.png
+share/dia/shapes/Civil/hrest.shape
+share/dia/shapes/Civil/line.png
+share/dia/shapes/Civil/line.shape
+share/dia/shapes/Civil/vcompressor.png
+share/dia/shapes/Civil/vcompressor.shape
+share/dia/shapes/Civil/vpump.png
+share/dia/shapes/Civil/vpump.shape
+share/dia/shapes/Civil/vrest.png
+share/dia/shapes/Civil/vrest.shape
+share/dia/shapes/Civil/water_level.png
+share/dia/shapes/Civil/water_level.shape
+share/dia/shapes/Contact/c_if.png
+share/dia/shapes/Contact/c_if.shape
+share/dia/shapes/Contact/c_ifnot.png
+share/dia/shapes/Contact/c_ifnot.shape
+share/dia/shapes/Contact/c_lamp.png
+share/dia/shapes/Contact/c_lamp.shape
+share/dia/shapes/Contact/c_relay.png
+share/dia/shapes/Contact/c_relay.shape
+share/dia/shapes/Contact/l_if.png
+share/dia/shapes/Contact/l_if.shape
+share/dia/shapes/Contact/l_ifnot.png
+share/dia/shapes/Contact/l_ifnot.shape
+share/dia/shapes/Contact/l_out.png
+share/dia/shapes/Contact/l_out.shape
+share/dia/shapes/Contact/l_outj.png
+share/dia/shapes/Contact/l_outj.shape
+share/dia/shapes/Contact/l_outnot.png
+share/dia/shapes/Contact/l_outnot.shape
+share/dia/shapes/Contact/l_outr.png
+share/dia/shapes/Contact/l_outr.shape
+share/dia/shapes/Contact/l_outrcep.png
+share/dia/shapes/Contact/l_outrcep.shape
+share/dia/shapes/Contact/l_outs.png
+share/dia/shapes/Contact/l_outs.shape
+share/dia/shapes/Contact/l_sout.png
+share/dia/shapes/Contact/l_sout.shape
+share/dia/shapes/Contact/l_soutnot.png
+share/dia/shapes/Contact/l_soutnot.shape
+share/dia/shapes/Contact/l_soutr.png
+share/dia/shapes/Contact/l_soutr.shape
+share/dia/shapes/Contact/l_souts.png
+share/dia/shapes/Contact/l_souts.shape
+share/dia/shapes/Cybernetics/b-integrator.png
+share/dia/shapes/Cybernetics/b-integrator.shape
+share/dia/shapes/Cybernetics/b-minus.png
+share/dia/shapes/Cybernetics/b-minus.shape
+share/dia/shapes/Cybernetics/b-sens.png
+share/dia/shapes/Cybernetics/b-sens.shape
+share/dia/shapes/Cybernetics/delta-t.png
+share/dia/shapes/Cybernetics/delta-t.shape
+share/dia/shapes/Cybernetics/empty-func.png
+share/dia/shapes/Cybernetics/empty-func.shape
+share/dia/shapes/Cybernetics/factor-0to-1.png
+share/dia/shapes/Cybernetics/factor-0to-1.shape
+share/dia/shapes/Cybernetics/factor-0to1.png
+share/dia/shapes/Cybernetics/factor-0to1.shape
+share/dia/shapes/Cybernetics/factor-greater1.png
+share/dia/shapes/Cybernetics/factor-greater1.shape
+share/dia/shapes/Cybernetics/factor-smaller-1.png
+share/dia/shapes/Cybernetics/factor-smaller-1.shape
+share/dia/shapes/Cybernetics/full-wave-rectifier.png
+share/dia/shapes/Cybernetics/full-wave-rectifier.shape
+share/dia/shapes/Cybernetics/half-wave-rectifier.png
+share/dia/shapes/Cybernetics/half-wave-rectifier.shape
+share/dia/shapes/Cybernetics/hpf.png
+share/dia/shapes/Cybernetics/hpf.shape
+share/dia/shapes/Cybernetics/l-integrator.png
+share/dia/shapes/Cybernetics/l-integrator.shape
+share/dia/shapes/Cybernetics/l-minus.png
+share/dia/shapes/Cybernetics/l-minus.shape
+share/dia/shapes/Cybernetics/l-sens.png
+share/dia/shapes/Cybernetics/l-sens.shape
+share/dia/shapes/Cybernetics/lpf.png
+share/dia/shapes/Cybernetics/lpf.shape
+share/dia/shapes/Cybernetics/negative-shift.png
+share/dia/shapes/Cybernetics/negative-shift.shape
+share/dia/shapes/Cybernetics/positive-shift.png
+share/dia/shapes/Cybernetics/positive-shift.shape
+share/dia/shapes/Cybernetics/product.png
+share/dia/shapes/Cybernetics/product.shape
+share/dia/shapes/Cybernetics/r-integrator.png
+share/dia/shapes/Cybernetics/r-integrator.shape
+share/dia/shapes/Cybernetics/r-minus.png
+share/dia/shapes/Cybernetics/r-minus.shape
+share/dia/shapes/Cybernetics/r-sens.png
+share/dia/shapes/Cybernetics/r-sens.shape
+share/dia/shapes/Cybernetics/relay.png
+share/dia/shapes/Cybernetics/relay.shape
+share/dia/shapes/Cybernetics/saturation.png
+share/dia/shapes/Cybernetics/saturation.shape
+share/dia/shapes/Cybernetics/sigmoid.png
+share/dia/shapes/Cybernetics/sigmoid.shape
+share/dia/shapes/Cybernetics/sine.png
+share/dia/shapes/Cybernetics/sine.shape
+share/dia/shapes/Cybernetics/sum.png
+share/dia/shapes/Cybernetics/sum.shape
+share/dia/shapes/Cybernetics/t-integrator.png
+share/dia/shapes/Cybernetics/t-integrator.shape
+share/dia/shapes/Cybernetics/t-minus.png
+share/dia/shapes/Cybernetics/t-minus.shape
+share/dia/shapes/Cybernetics/t-sens.png
+share/dia/shapes/Cybernetics/t-sens.shape
+share/dia/shapes/Electric/cnx.png
+share/dia/shapes/Electric/cnx.shape
+share/dia/shapes/Electric/command.png
+share/dia/shapes/Electric/command.shape
+share/dia/shapes/Electric/contact_f.png
+share/dia/shapes/Electric/contact_f.shape
+share/dia/shapes/Electric/contact_o.png
+share/dia/shapes/Electric/contact_o.shape
+share/dia/shapes/Electric/intpos_f.png
+share/dia/shapes/Electric/intpos_f.shape
+share/dia/shapes/Electric/intpos_o.png
+share/dia/shapes/Electric/intpos_o.shape
+share/dia/shapes/Electric/lamp.png
+share/dia/shapes/Electric/lamp.shape
+share/dia/shapes/Electric/relay.png
+share/dia/shapes/Electric/relay.shape
+share/dia/shapes/Electric/vcommand.png
+share/dia/shapes/Electric/vcommand.shape
+share/dia/shapes/Electric/vcontact_f.png
+share/dia/shapes/Electric/vcontact_f.shape
+share/dia/shapes/Electric/vcontact_o.png
+share/dia/shapes/Electric/vcontact_o.shape
+share/dia/shapes/Electric/vintpos_f.png
+share/dia/shapes/Electric/vintpos_f.shape
+share/dia/shapes/Electric/vintpos_o.png
+share/dia/shapes/Electric/vintpos_o.shape
+share/dia/shapes/Electric/vlamp.png
+share/dia/shapes/Electric/vlamp.shape
+share/dia/shapes/Electric/vrelay.png
+share/dia/shapes/Electric/vrelay.shape
+share/dia/shapes/Flowchart/collate.png
+share/dia/shapes/Flowchart/collate.shape
+share/dia/shapes/Flowchart/datasource.png
+share/dia/shapes/Flowchart/datasource.shape
+share/dia/shapes/Flowchart/delay.png
+share/dia/shapes/Flowchart/delay.shape
+share/dia/shapes/Flowchart/display.png
+share/dia/shapes/Flowchart/display.shape
+share/dia/shapes/Flowchart/document.png
+share/dia/shapes/Flowchart/document.shape
+share/dia/shapes/Flowchart/extract.png
+share/dia/shapes/Flowchart/extract.shape
+share/dia/shapes/Flowchart/intstorage.png
+share/dia/shapes/Flowchart/intstorage.shape
+share/dia/shapes/Flowchart/magdisk.png
+share/dia/shapes/Flowchart/magdisk.shape
+share/dia/shapes/Flowchart/magdrum.png
+share/dia/shapes/Flowchart/magdrum.shape
+share/dia/shapes/Flowchart/magtape.png
+share/dia/shapes/Flowchart/magtape.shape
+share/dia/shapes/Flowchart/manualinput.png
+share/dia/shapes/Flowchart/manualinput.shape
+share/dia/shapes/Flowchart/manualop.png
+share/dia/shapes/Flowchart/manualop.shape
+share/dia/shapes/Flowchart/merge.png
+share/dia/shapes/Flowchart/merge.shape
+share/dia/shapes/Flowchart/offlinestore.png
+share/dia/shapes/Flowchart/offlinestore.shape
+share/dia/shapes/Flowchart/offpageconn.png
+share/dia/shapes/Flowchart/offpageconn.shape
+share/dia/shapes/Flowchart/or.png
+share/dia/shapes/Flowchart/or.shape
+share/dia/shapes/Flowchart/predefdproc.png
+share/dia/shapes/Flowchart/predefdproc.shape
+share/dia/shapes/Flowchart/preparation.png
+share/dia/shapes/Flowchart/preparation.shape
+share/dia/shapes/Flowchart/punchedcard.png
+share/dia/shapes/Flowchart/punchedcard.shape
+share/dia/shapes/Flowchart/punchedtape.png
+share/dia/shapes/Flowchart/punchedtape.shape
+share/dia/shapes/Flowchart/sort.png
+share/dia/shapes/Flowchart/sort.shape
+share/dia/shapes/Flowchart/sumjunction.png
+share/dia/shapes/Flowchart/sumjunction.shape
+share/dia/shapes/Flowchart/terminal.png
+share/dia/shapes/Flowchart/terminal.shape
+share/dia/shapes/Flowchart/transaction.png
+share/dia/shapes/Flowchart/transaction.shape
+share/dia/shapes/Flowchart/transmittape.png
+share/dia/shapes/Flowchart/transmittape.shape
+share/dia/shapes/Gane_and_Sarson/alt-entity.png
+share/dia/shapes/Gane_and_Sarson/alt-entity.shape
+share/dia/shapes/Gane_and_Sarson/data_store.png
+share/dia/shapes/Gane_and_Sarson/data_store.shape
+share/dia/shapes/Gane_and_Sarson/entity.png
+share/dia/shapes/Gane_and_Sarson/entity.shape
+share/dia/shapes/Gane_and_Sarson/process.png
+share/dia/shapes/Gane_and_Sarson/process.shape
+share/dia/shapes/Logic/and.png
+share/dia/shapes/Logic/and.shape
+share/dia/shapes/Logic/buffer.png
+share/dia/shapes/Logic/buffer.shape
+share/dia/shapes/Logic/connector.png
+share/dia/shapes/Logic/connector.shape
+share/dia/shapes/Logic/inverter.png
+share/dia/shapes/Logic/inverter.shape
+share/dia/shapes/Logic/nand.png
+share/dia/shapes/Logic/nand.shape
+share/dia/shapes/Logic/nor.png
+share/dia/shapes/Logic/nor.shape
+share/dia/shapes/Logic/not.png
+share/dia/shapes/Logic/not.shape
+share/dia/shapes/Logic/or.png
+share/dia/shapes/Logic/or.shape
+share/dia/shapes/Logic/xor.png
+share/dia/shapes/Logic/xor.shape
+share/dia/shapes/MSE/demultiplexer.png
+share/dia/shapes/MSE/demultiplexer.shape
+share/dia/shapes/MSE/large_extension_node.png
+share/dia/shapes/MSE/large_extension_node.shape
+share/dia/shapes/MSE/multiplexer.png
+share/dia/shapes/MSE/multiplexer.shape
+share/dia/shapes/MSE/node_center.png
+share/dia/shapes/MSE/node_center.shape
+share/dia/shapes/MSE/small_extension_node.png
+share/dia/shapes/MSE/small_extension_node.shape
+share/dia/shapes/MSE/tacsat.png
+share/dia/shapes/MSE/tacsat.shape
+share/dia/shapes/Map/Isometric/Block1.png
+share/dia/shapes/Map/Isometric/Block1.shape
+share/dia/shapes/Map/Isometric/Block2.png
+share/dia/shapes/Map/Isometric/Block2.shape
+share/dia/shapes/Map/Isometric/Block3.png
+share/dia/shapes/Map/Isometric/Block3.shape
+share/dia/shapes/Map/Isometric/Block4.png
+share/dia/shapes/Map/Isometric/Block4.shape
+share/dia/shapes/Map/Isometric/Block5.png
+share/dia/shapes/Map/Isometric/Block5.shape
+share/dia/shapes/Map/Isometric/Block6.png
+share/dia/shapes/Map/Isometric/Block6.shape
+share/dia/shapes/Map/Isometric/Block7.png
+share/dia/shapes/Map/Isometric/Block7.shape
+share/dia/shapes/Map/Isometric/Car1.png
+share/dia/shapes/Map/Isometric/Car1.shape
+share/dia/shapes/Map/Isometric/Car2.png
+share/dia/shapes/Map/Isometric/Car2.shape
+share/dia/shapes/Map/Isometric/Corner1.png
+share/dia/shapes/Map/Isometric/Corner1.shape
+share/dia/shapes/Map/Isometric/Corner2.png
+share/dia/shapes/Map/Isometric/Corner2.shape
+share/dia/shapes/Map/Isometric/Crossroads.png
+share/dia/shapes/Map/Isometric/Crossroads.shape
+share/dia/shapes/Map/Isometric/Elevated.png
+share/dia/shapes/Map/Isometric/Elevated.shape
+share/dia/shapes/Map/Isometric/Factory.png
+share/dia/shapes/Map/Isometric/Factory.shape
+share/dia/shapes/Map/Isometric/FootBridge.png
+share/dia/shapes/Map/Isometric/FootBridge.shape
+share/dia/shapes/Map/Isometric/OneWay.png
+share/dia/shapes/Map/Isometric/OneWay.shape
+share/dia/shapes/Map/Isometric/RedCar.png
+share/dia/shapes/Map/Isometric/RedCar.shape
+share/dia/shapes/Map/Isometric/River.png
+share/dia/shapes/Map/Isometric/River.shape
+share/dia/shapes/Map/Isometric/Road1.png
+share/dia/shapes/Map/Isometric/Road1.shape
+share/dia/shapes/Map/Isometric/Roof1.png
+share/dia/shapes/Map/Isometric/Roof1.shape
+share/dia/shapes/Map/Isometric/StraightRoad1.png
+share/dia/shapes/Map/Isometric/StraightRoad1.shape
+share/dia/shapes/Map/Isometric/T-Junction.png
+share/dia/shapes/Map/Isometric/T-Junction.shape
+share/dia/shapes/Map/Isometric/Train1.png
+share/dia/shapes/Map/Isometric/Train1.shape
+share/dia/shapes/Map/Isometric/Train2.png
+share/dia/shapes/Map/Isometric/Train2.shape
+share/dia/shapes/Map/Isometric/Tree1.png
+share/dia/shapes/Map/Isometric/Tree1.shape
+share/dia/shapes/Misc/file.png
+share/dia/shapes/Misc/file.shape
+share/dia/shapes/Misc/folder.png
+share/dia/shapes/Misc/folder.shape
+share/dia/shapes/Network/antenna.png
+share/dia/shapes/Network/antenna.shape
+share/dia/shapes/Network/computer.png
+share/dia/shapes/Network/computer.shape
+share/dia/shapes/Network/dat_external.png
+share/dia/shapes/Network/dat_external.shape
+share/dia/shapes/Network/digitizing_board.png
+share/dia/shapes/Network/digitizing_board.shape
+share/dia/shapes/Network/disc.png
+share/dia/shapes/Network/disc.shape
+share/dia/shapes/Network/diskette.png
+share/dia/shapes/Network/diskette.shape
+share/dia/shapes/Network/firewall.png
+share/dia/shapes/Network/firewall.shape
+share/dia/shapes/Network/flash.png
+share/dia/shapes/Network/flash.shape
+share/dia/shapes/Network/genmonitor.png
+share/dia/shapes/Network/genmonitor.shape
+share/dia/shapes/Network/hub.png
+share/dia/shapes/Network/hub.shape
+share/dia/shapes/Network/mobile_phone.png
+share/dia/shapes/Network/mobile_phone.shape
+share/dia/shapes/Network/modem.png
+share/dia/shapes/Network/modem.shape
+share/dia/shapes/Network/modularswitch.png
+share/dia/shapes/Network/modularswitch.shape
+share/dia/shapes/Network/monitor.png
+share/dia/shapes/Network/monitor.shape
+share/dia/shapes/Network/nwcloud.png
+share/dia/shapes/Network/nwcloud.shape
+share/dia/shapes/Network/patch-panel.png
+share/dia/shapes/Network/patch-panel.shape
+share/dia/shapes/Network/pc_bigtower.png
+share/dia/shapes/Network/pc_bigtower.shape
+share/dia/shapes/Network/pc_desktop.png
+share/dia/shapes/Network/pc_desktop.shape
+share/dia/shapes/Network/pc_miditower.png
+share/dia/shapes/Network/pc_miditower.shape
+share/dia/shapes/Network/pc_minitower.png
+share/dia/shapes/Network/pc_minitower.shape
+share/dia/shapes/Network/plotter.png
+share/dia/shapes/Network/plotter.shape
+share/dia/shapes/Network/printer.png
+share/dia/shapes/Network/printer.shape
+share/dia/shapes/Network/rj45plug.png
+share/dia/shapes/Network/rj45plug.shape
+share/dia/shapes/Network/router-symbol.png
+share/dia/shapes/Network/router-symbol.shape
+share/dia/shapes/Network/sceadplug.png
+share/dia/shapes/Network/sceadplug.shape
+share/dia/shapes/Network/speaker.png
+share/dia/shapes/Network/speaker.shape
+share/dia/shapes/Network/speaker_amp.png
+share/dia/shapes/Network/speaker_amp.shape
+share/dia/shapes/Network/switch-atm-symbol.png
+share/dia/shapes/Network/switch-atm-symbol.shape
+share/dia/shapes/Network/switch-symbol.png
+share/dia/shapes/Network/switch-symbol.shape
+share/dia/shapes/Network/telephone.png
+share/dia/shapes/Network/telephone.shape
+share/dia/shapes/Network/workstation.png
+share/dia/shapes/Network/workstation.shape
+share/dia/shapes/Network/zip-disk.png
+share/dia/shapes/Network/zip-disk.shape
+share/dia/shapes/Pneumatic/cnx.png
+share/dia/shapes/Pneumatic/cnx.shape
+share/dia/shapes/Pneumatic/comelec1.png
+share/dia/shapes/Pneumatic/comelec1.shape
+share/dia/shapes/Pneumatic/comelec2.png
+share/dia/shapes/Pneumatic/comelec2.shape
+share/dia/shapes/Pneumatic/commusc.png
+share/dia/shapes/Pneumatic/commusc.shape
+share/dia/shapes/Pneumatic/compb.png
+share/dia/shapes/Pneumatic/compb.shape
+share/dia/shapes/Pneumatic/compilh.png
+share/dia/shapes/Pneumatic/compilh.shape
+share/dia/shapes/Pneumatic/compilp.png
+share/dia/shapes/Pneumatic/compilp.shape
+share/dia/shapes/Pneumatic/compush.png
+share/dia/shapes/Pneumatic/compush.shape
+share/dia/shapes/Pneumatic/comspr.png
+share/dia/shapes/Pneumatic/comspr.shape
+share/dia/shapes/Pneumatic/dejack.png
+share/dia/shapes/Pneumatic/dejack.shape
+share/dia/shapes/Pneumatic/dist22.png
+share/dia/shapes/Pneumatic/dist22.shape
+share/dia/shapes/Pneumatic/dist32.png
+share/dia/shapes/Pneumatic/dist32.shape
+share/dia/shapes/Pneumatic/dist42.png
+share/dia/shapes/Pneumatic/dist42.shape
+share/dia/shapes/Pneumatic/dist52.png
+share/dia/shapes/Pneumatic/dist52.shape
+share/dia/shapes/Pneumatic/drain.png
+share/dia/shapes/Pneumatic/drain.shape
+share/dia/shapes/Pneumatic/press.png
+share/dia/shapes/Pneumatic/press.shape
+share/dia/shapes/Pneumatic/presshy.png
+share/dia/shapes/Pneumatic/presshy.shape
+share/dia/shapes/Pneumatic/presspn.png
+share/dia/shapes/Pneumatic/presspn.shape
+share/dia/shapes/Pneumatic/seijack.png
+share/dia/shapes/Pneumatic/seijack.shape
+share/dia/shapes/Pneumatic/seojack.png
+share/dia/shapes/Pneumatic/seojack.shape
+share/dia/shapes/RDP/arc.png
+share/dia/shapes/RDP/arc_inhibiteur.png
+share/dia/shapes/RDP/place.png
+share/dia/shapes/RDP/place.shape
+share/dia/shapes/RDP/place_marquee.png
+share/dia/shapes/RDP/place_marquee.shape
+share/dia/shapes/RDP/t_transition.png
+share/dia/shapes/RDP/t_transition.shape
+share/dia/shapes/RDP/transition.png
+share/dia/shapes/RDP/transition.shape
+share/dia/shapes/SDL/block.png
+share/dia/shapes/SDL/block.shape
+share/dia/shapes/SDL/comment.png
+share/dia/shapes/SDL/comment.shape
+share/dia/shapes/SDL/decision.png
+share/dia/shapes/SDL/decision.shape
+share/dia/shapes/SDL/function.png
+share/dia/shapes/SDL/function.shape
+share/dia/shapes/SDL/header.png
+share/dia/shapes/SDL/header.shape
+share/dia/shapes/SDL/inout.png
+share/dia/shapes/SDL/inout.shape
+share/dia/shapes/SDL/macro.png
+share/dia/shapes/SDL/macro.shape
+share/dia/shapes/SDL/note.png
+share/dia/shapes/SDL/note.shape
+share/dia/shapes/SDL/process.png
+share/dia/shapes/SDL/process.shape
+share/dia/shapes/SDL/receive.png
+share/dia/shapes/SDL/receive.shape
+share/dia/shapes/SDL/return.png
+share/dia/shapes/SDL/return.shape
+share/dia/shapes/SDL/save.png
+share/dia/shapes/SDL/save.shape
+share/dia/shapes/SDL/send.png
+share/dia/shapes/SDL/send.shape
+share/dia/shapes/SDL/service.png
+share/dia/shapes/SDL/service.shape
+share/dia/shapes/SDL/state.png
+share/dia/shapes/SDL/state.shape
+share/dia/shapes/SDL/stop.png
+share/dia/shapes/SDL/stop.shape
+share/dia/shapes/SDL/task.png
+share/dia/shapes/SDL/task.shape
+share/dia/shapes/jigsaw/part_iiii.png
+share/dia/shapes/jigsaw/part_iiii.shape
+share/dia/shapes/jigsaw/part_iiio.png
+share/dia/shapes/jigsaw/part_iiio.shape
+share/dia/shapes/jigsaw/part_iioi.png
+share/dia/shapes/jigsaw/part_iioi.shape
+share/dia/shapes/jigsaw/part_iioo.png
+share/dia/shapes/jigsaw/part_iioo.shape
+share/dia/shapes/jigsaw/part_ioii.png
+share/dia/shapes/jigsaw/part_ioii.shape
+share/dia/shapes/jigsaw/part_ioio.png
+share/dia/shapes/jigsaw/part_ioio.shape
+share/dia/shapes/jigsaw/part_iooi.png
+share/dia/shapes/jigsaw/part_iooi.shape
+share/dia/shapes/jigsaw/part_iooo.png
+share/dia/shapes/jigsaw/part_iooo.shape
+share/dia/shapes/jigsaw/part_oiii.png
+share/dia/shapes/jigsaw/part_oiii.shape
+share/dia/shapes/jigsaw/part_oiio.png
+share/dia/shapes/jigsaw/part_oiio.shape
+share/dia/shapes/jigsaw/part_oioi.png
+share/dia/shapes/jigsaw/part_oioi.shape
+share/dia/shapes/jigsaw/part_oioo.png
+share/dia/shapes/jigsaw/part_oioo.shape
+share/dia/shapes/jigsaw/part_ooii.png
+share/dia/shapes/jigsaw/part_ooii.shape
+share/dia/shapes/jigsaw/part_ooio.png
+share/dia/shapes/jigsaw/part_ooio.shape
+share/dia/shapes/jigsaw/part_oooi.png
+share/dia/shapes/jigsaw/part_oooi.shape
+share/dia/shapes/jigsaw/part_oooo.png
+share/dia/shapes/jigsaw/part_oooo.shape
+share/dia/shapes/sybase/client.png
+share/dia/shapes/sybase/client.shape
+share/dia/shapes/sybase/dataserver.png
+share/dia/shapes/sybase/dataserver.shape
+share/dia/shapes/sybase/ltm.png
+share/dia/shapes/sybase/ltm.shape
+share/dia/shapes/sybase/repserver.png
+share/dia/shapes/sybase/repserver.shape
+share/dia/shapes/sybase/rsm.png
+share/dia/shapes/sybase/rsm.shape
+share/dia/shapes/sybase/stableq.png
+share/dia/shapes/sybase/stableq.shape
+share/dia/sheets/AADL.sheet
+share/dia/sheets/Assorted.sheet
+share/dia/sheets/BPMN.sheet
+share/dia/sheets/ChemEng.sheet
+share/dia/sheets/Circuit.sheet
+share/dia/sheets/Contact.sheet
+share/dia/sheets/Cybernetics.sheet
+share/dia/sheets/ER.sheet
+share/dia/sheets/ER/weakentity.png
+share/dia/sheets/Electric.sheet
+share/dia/sheets/FS.sheet
+share/dia/sheets/Flowchart.sheet
+share/dia/sheets/GRAFCET.sheet
+share/dia/sheets/GRAFCET/etapei.png
+share/dia/sheets/GRAFCET/etapemc.png
+share/dia/sheets/GRAFCET/etapeme.png
+share/dia/sheets/GRAFCET/etapems.png
+share/dia/sheets/GRAFCET/etapesp.png
+share/dia/sheets/GRAFCET/vergent_and.png
+share/dia/sheets/Gane_and_Sarson.sheet
+share/dia/sheets/IsometricMap.sheet
+share/dia/sheets/Istar.sheet
+share/dia/sheets/Istar/agent.png
+share/dia/sheets/Istar/decomposition.png
+share/dia/sheets/Istar/dependency.png
+share/dia/sheets/Istar/goal.png
+share/dia/sheets/Istar/means_ends.png
+share/dia/sheets/Istar/neg_contrib.png
+share/dia/sheets/Istar/pos_contrib.png
+share/dia/sheets/Istar/position.png
+share/dia/sheets/Istar/role.png
+share/dia/sheets/Istar/task.png
+share/dia/sheets/Jackson.sheet
+share/dia/sheets/Jackson/designed_domain.png
+share/dia/sheets/Jackson/machine_domain.png
+share/dia/sheets/Jackson/req_phen.png
+share/dia/sheets/KAOS.sheet
+share/dia/sheets/KAOS/and-complete-ref.png
+share/dia/sheets/KAOS/and-ref.png
+share/dia/sheets/KAOS/assumption.png
+share/dia/sheets/KAOS/capable-of.png
+share/dia/sheets/KAOS/conflicts.png
+share/dia/sheets/KAOS/controls.png
+share/dia/sheets/KAOS/input.png
+share/dia/sheets/KAOS/monitors.png
+share/dia/sheets/KAOS/obstacle.png
+share/dia/sheets/KAOS/obstructs.png
+share/dia/sheets/KAOS/op-ref.png
+share/dia/sheets/KAOS/or-complete-ref.png
+share/dia/sheets/KAOS/or-ref.png
+share/dia/sheets/KAOS/output.png
+share/dia/sheets/KAOS/performs.png
+share/dia/sheets/KAOS/requirement.png
+share/dia/sheets/KAOS/responsibility.png
+share/dia/sheets/KAOS/softgoal.png
+share/dia/sheets/Logic.sheet
+share/dia/sheets/MSE.sheet
+share/dia/sheets/Misc.sheet
+share/dia/sheets/Pneumatic.sheet
+share/dia/sheets/SADT.sheet
+share/dia/sheets/SDL.sheet
+share/dia/sheets/UML.sheet
+share/dia/sheets/UML/aggregation.png
+share/dia/sheets/UML/eventsink.png
+share/dia/sheets/UML/eventsource.png
+share/dia/sheets/UML/receptacle.png
+share/dia/sheets/UML/umlclass_template.png
+share/dia/sheets/chronogram.sheet
+share/dia/sheets/ciscocomputer.sheet
+share/dia/sheets/ciscohub.sheet
+share/dia/sheets/ciscomisc.sheet
+share/dia/sheets/cisconetwork.sheet
+share/dia/sheets/ciscotelephony.sheet
+share/dia/sheets/civil.sheet
+share/dia/sheets/jigsaw.sheet
+share/dia/sheets/network.sheet
+share/dia/sheets/sybase.sheet
+share/dia/ui/display-ui.xml
+share/dia/ui/popup-ui.xml
+share/dia/ui/toolbox-ui.xml
+share/dia/xslt/dia-uml.xsl
+share/dia/xslt/dia-uml2c++.xsl
+share/dia/xslt/dia-uml2componentlist.xsl
+share/dia/xslt/dia-uml2idl.xsl
+share/dia/xslt/dia-uml2java.xsl
+share/dia/xslt/dia-uml2owl.xsl
+share/dia/xslt/dia-uml2python.xsl
+share/dia/xslt/stylesheets.xml
 share/gnome/help/dia/C
 share/gnome/help/dia/en/authors.xml
 share/gnome/help/dia/en/dia.xml
@@ -1705,10 +1705,10 @@ share/gnome/help/dia/pl/dia.xml
 share/gnome/help/dia/pl/graphics/greendots.png
 share/gnome/help/dia/pl/graphics/home_network.png
 share/gnome/help/dia/pl/graphics/line_props.png
-share/gnome/mime-info/dia.keys
-share/gnome/mime-info/dia.mime
-share/gnome/pixmaps/dia-diagram.png
-share/gnome/pixmaps/dia_gnome_icon.png
+share/mime-info/dia.keys
+share/mime-info/dia.mime
+share/pixmaps/dia-diagram.png
+share/pixmaps/dia_gnome_icon.png
 share/locale/am/LC_MESSAGES/dia.mo
 share/locale/ar/LC_MESSAGES/dia.mo
 share/locale/az/LC_MESSAGES/dia.mo
@@ -1764,9 +1764,7 @@ share/locale/uk/LC_MESSAGES/dia.mo
 share/locale/vi/LC_MESSAGES/dia.mo
 share/locale/zh_CN/LC_MESSAGES/dia.mo
 share/locale/zh_TW/LC_MESSAGES/dia.mo
-@dirrmtry share/locale/rw/LC_MESSAGES
-@dirrmtry share/locale/rw
-@dirrm share/gnome/omf/dia
+@dirrm share/omf/dia
 @dirrm share/gnome/help/dia/pl/graphics
 @dirrm share/gnome/help/dia/pl
 @dirrm share/gnome/help/dia/eu/graphics
@@ -1774,40 +1772,43 @@ share/locale/zh_TW/LC_MESSAGES/dia.mo
 @dirrm share/gnome/help/dia/en/graphics
 @dirrm share/gnome/help/dia/en
 @dirrm share/gnome/help/dia
-@dirrm share/gnome/dia/xslt
-@dirrm share/gnome/dia/ui
-@dirrm share/gnome/dia/sheets/UML
-@dirrm share/gnome/dia/sheets/KAOS
-@dirrm share/gnome/dia/sheets/Jackson
-@dirrm share/gnome/dia/sheets/Istar
-@dirrm share/gnome/dia/sheets/GRAFCET
-@dirrm share/gnome/dia/sheets/ER
-@dirrm share/gnome/dia/sheets
-@dirrm share/gnome/dia/shapes/sybase
-@dirrm share/gnome/dia/shapes/jigsaw
-@dirrm share/gnome/dia/shapes/SDL
-@dirrm share/gnome/dia/shapes/RDP
-@dirrm share/gnome/dia/shapes/Pneumatic
-@dirrm share/gnome/dia/shapes/Network
-@dirrm share/gnome/dia/shapes/Misc
-@dirrm share/gnome/dia/shapes/Map/Isometric
-@dirrm share/gnome/dia/shapes/Map
-@dirrm share/gnome/dia/shapes/MSE
-@dirrm share/gnome/dia/shapes/Logic
-@dirrm share/gnome/dia/shapes/Gane_and_Sarson
-@dirrm share/gnome/dia/shapes/Flowchart
-@dirrm share/gnome/dia/shapes/Electric
-@dirrm share/gnome/dia/shapes/Cybernetics
-@dirrm share/gnome/dia/shapes/Contact
-@dirrm share/gnome/dia/shapes/Civil
-@dirrm share/gnome/dia/shapes/Cisco
-@dirrm share/gnome/dia/shapes/Circuit
-@dirrm share/gnome/dia/shapes/ChemEng
-@dirrm share/gnome/dia/shapes/BPMN
-@dirrm share/gnome/dia/shapes/Assorted
-@dirrm share/gnome/dia/shapes
-%%PYTHON:%%@dirrm share/gnome/dia/python
-@dirrm share/gnome/dia
+@dirrm share/dia/xslt
+@dirrm share/dia/ui
+@dirrm share/dia/sheets/UML
+@dirrm share/dia/sheets/KAOS
+@dirrm share/dia/sheets/Jackson
+@dirrm share/dia/sheets/Istar
+@dirrm share/dia/sheets/GRAFCET
+@dirrm share/dia/sheets/ER
+@dirrm share/dia/sheets
+@dirrm share/dia/shapes/sybase
+@dirrm share/dia/shapes/jigsaw
+@dirrm share/dia/shapes/SDL
+@dirrm share/dia/shapes/RDP
+@dirrm share/dia/shapes/Pneumatic
+@dirrm share/dia/shapes/Network
+@dirrm share/dia/shapes/Misc
+@dirrm share/dia/shapes/Map/Isometric
+@dirrm share/dia/shapes/Map
+@dirrm share/dia/shapes/MSE
+@dirrm share/dia/shapes/Logic
+@dirrm share/dia/shapes/Gane_and_Sarson
+@dirrm share/dia/shapes/Flowchart
+@dirrm share/dia/shapes/Electric
+@dirrm share/dia/shapes/Cybernetics
+@dirrm share/dia/shapes/Contact
+@dirrm share/dia/shapes/Civil
+@dirrm share/dia/shapes/Cisco
+@dirrm share/dia/shapes/Circuit
+@dirrm share/dia/shapes/ChemEng
+@dirrm share/dia/shapes/BPMN
+@dirrm share/dia/shapes/Assorted
+@dirrm share/dia/shapes
+%%PYTHON:%%@dirrm share/dia/python
+@dirrm share/dia
 @dirrm lib/dia
 @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/applications
diff --git a/graphics/electriceyes/Makefile b/graphics/electriceyes/Makefile
index 88d338199d0b..c3e63ec9f9a5 100644
--- a/graphics/electriceyes/Makefile
+++ b/graphics/electriceyes/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	electriceyes
 PORTVERSION=	0.3.12
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	graphics gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/ee/0.3
diff --git a/graphics/electriceyes/pkg-plist b/graphics/electriceyes/pkg-plist
index 6aa0c619dc5f..b44c7ac3ae9a 100644
--- a/graphics/electriceyes/pkg-plist
+++ b/graphics/electriceyes/pkg-plist
@@ -2,8 +2,6 @@ bin/ElectricEyes
 share/gnome/apps/Graphics/ee.desktop
 share/gnome/help/ee/C/ee.jpg
 share/gnome/help/ee/C/index.html
-share/gnome/mime-info/ee.keys
-share/gnome/pixmaps/gnome-ee.png
 share/locale/ca/LC_MESSAGES/ee.mo
 share/locale/da/LC_MESSAGES/ee.mo
 share/locale/de/LC_MESSAGES/ee.mo
@@ -31,5 +29,7 @@ share/locale/tr/LC_MESSAGES/ee.mo
 share/locale/uk/LC_MESSAGES/ee.mo
 share/locale/zh_CN.GB2312/LC_MESSAGES/ee.mo
 share/locale/zh_TW.Big5/LC_MESSAGES/ee.mo
+share/mime-info/ee.keys
+share/pixmaps/gnome-ee.png
 @dirrm share/gnome/help/ee/C
 @dirrm share/gnome/help/ee
diff --git a/graphics/eog/Makefile b/graphics/eog/Makefile
index a77f8eac4b3a..daf138ec4666 100644
--- a/graphics/eog/Makefile
+++ b/graphics/eog/Makefile
@@ -3,11 +3,11 @@
 # Whom:			Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/graphics/eog/Makefile,v 1.51 2007/03/13 00:48:55 mezz Exp $
+#   $MCom: ports/graphics/eog/Makefile,v 1.66 2007/10/16 03:03:24 mezz Exp $
 #
 
 PORTNAME=	eog
-PORTVERSION=	2.18.2
+PORTVERSION=	2.20.1
 CATEGORIES=	graphics gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -38,6 +38,13 @@ GCONF_SCHEMAS=	eog.schemas
 LIB_DEPENDS+=	exif.12:${PORTSDIR}/graphics/libexif
 .endif
 
+.if ${HAVE_GNOME:Mpygnome2}!=""
+USE_GNOME+=	pygnome2
+CONFIGURE_ARGS+=--enable-python
+.else
+CONFIGURE_ARGS+=--disable-python
+.endif
+
 post-install:
 	@-update-desktop-database > /dev/null
 
diff --git a/graphics/eog/distinfo b/graphics/eog/distinfo
index 12b404106cbc..81a4c4762b4f 100644
--- a/graphics/eog/distinfo
+++ b/graphics/eog/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/eog-2.18.2.tar.bz2) = 7e5fc342201ea00404008258c19b4461
-SHA256 (gnome2/eog-2.18.2.tar.bz2) = e2bbf8671263b69c2ca4ca7824b58e29b7b12c9e18e0524538621e71bb7d6486
-SIZE (gnome2/eog-2.18.2.tar.bz2) = 1244477
+MD5 (gnome2/eog-2.20.1.tar.bz2) = 5024d75bf7d6159da970d41f5dbfcff7
+SHA256 (gnome2/eog-2.20.1.tar.bz2) = fa9562e8b38a39d1896ee7dc331751a0bff0d8e77319413364734b4132d6bbc2
+SIZE (gnome2/eog-2.20.1.tar.bz2) = 1655837
diff --git a/graphics/eog/pkg-plist b/graphics/eog/pkg-plist
index d79420aa9437..b9793a1261b7 100644
--- a/graphics/eog/pkg-plist
+++ b/graphics/eog/pkg-plist
@@ -1,7 +1,41 @@
 bin/eog
-share/gnome/applications/eog.desktop
-share/gnome/eog/eog-gtk-ui.xml
-share/gnome/eog/glade/eog.glade
+include/eog-2.20/eog/eog-application.h
+include/eog-2.20/eog/eog-debug.h
+include/eog-2.20/eog/eog-dialog.h
+include/eog-2.20/eog/eog-error-message-area.h
+include/eog-2.20/eog/eog-file-chooser.h
+include/eog-2.20/eog/eog-image-save-info.h
+include/eog-2.20/eog/eog-image.h
+include/eog-2.20/eog/eog-job-queue.h
+include/eog-2.20/eog/eog-jobs.h
+include/eog-2.20/eog/eog-list-store.h
+include/eog-2.20/eog/eog-message-area.h
+include/eog-2.20/eog/eog-plugin.h
+include/eog-2.20/eog/eog-properties-dialog.h
+include/eog-2.20/eog/eog-scroll-view.h
+include/eog-2.20/eog/eog-sidebar.h
+include/eog-2.20/eog/eog-statusbar.h
+include/eog-2.20/eog/eog-thumb-nav.h
+include/eog-2.20/eog/eog-thumb-view.h
+include/eog-2.20/eog/eog-thumbnail.h
+include/eog-2.20/eog/eog-transform.h
+include/eog-2.20/eog/eog-window.h
+libdata/pkgconfig/eog.pc
+share/applications/eog.desktop
+%%DATADIR%%/eog-toolbar.xml
+%%DATADIR%%/eog-ui.xml
+%%DATADIR%%/eog.glade
+%%DATADIR%%/gtkrc
+%%DATADIR%%/icons/hicolor/16x16/actions/eog-image-collection.png
+%%DATADIR%%/icons/hicolor/16x16/actions/eog-plugin.png
+%%DATADIR%%/icons/hicolor/22x22/actions/eog-image-collection.png
+%%DATADIR%%/icons/hicolor/22x22/actions/eog-plugin.png
+%%DATADIR%%/icons/hicolor/24x24/actions/eog-image-collection.png
+%%DATADIR%%/icons/hicolor/32x32/actions/eog-image-collection.png
+%%DATADIR%%/icons/hicolor/32x32/actions/eog-plugin.png
+%%DATADIR%%/icons/hicolor/scalable/actions/eog-image-collection.svg
+%%DATADIR%%/icons/hicolor/scalable/actions/eog-plugin.svg
+%%DATADIR%%/pixmaps/thumbnail-frame.png
 share/gnome/help/eog/C/eog.xml
 share/gnome/help/eog/C/figures/eog_save_as_window.png
 share/gnome/help/eog/C/figures/eog_start_window.png
@@ -22,14 +56,17 @@ share/gnome/help/eog/fr/eog.xml
 share/gnome/help/eog/fr/figures/eog_save_as_window.png
 share/gnome/help/eog/fr/figures/eog_start_window.png
 share/gnome/help/eog/it/eog.xml
+share/gnome/help/eog/it/figures/eog_save_as_window.png
 share/gnome/help/eog/it/figures/eog_start_window.png
-share/gnome/help/eog/it/legal.xml
 share/gnome/help/eog/ja/eog.xml
 share/gnome/help/eog/ja/figures/eog_start_window.png
 share/gnome/help/eog/ja/legal.xml
 share/gnome/help/eog/ko/eog.xml
+share/gnome/help/eog/ko/figures/eog_save_as_window.png
 share/gnome/help/eog/ko/figures/eog_start_window.png
-share/gnome/help/eog/ko/legal.xml
+share/gnome/help/eog/oc/eog.xml
+share/gnome/help/eog/oc/figures/eog_save_as_window.png
+share/gnome/help/eog/oc/figures/eog_start_window.png
 share/gnome/help/eog/pa/eog.xml
 share/gnome/help/eog/pa/figures/eog_save_as_window.png
 share/gnome/help/eog/pa/figures/eog_start_window.png
@@ -51,23 +88,6 @@ share/gnome/help/eog/zh_CN/legal.xml
 share/gnome/help/eog/zh_TW/eog.xml
 share/gnome/help/eog/zh_TW/figures/eog_start_window.png
 share/gnome/help/eog/zh_TW/legal.xml
-share/gnome/omf/eog/eog-C.omf
-share/gnome/omf/eog/eog-de.omf
-share/gnome/omf/eog/eog-en_GB.omf
-share/gnome/omf/eog/eog-es.omf
-share/gnome/omf/eog/eog-eu.omf
-share/gnome/omf/eog/eog-fr.omf
-share/gnome/omf/eog/eog-it.omf
-share/gnome/omf/eog/eog-ja.omf
-share/gnome/omf/eog/eog-ko.omf
-share/gnome/omf/eog/eog-pa.omf
-share/gnome/omf/eog/eog-pt_BR.omf
-share/gnome/omf/eog/eog-ru.omf
-share/gnome/omf/eog/eog-sv.omf
-share/gnome/omf/eog/eog-uk.omf
-share/gnome/omf/eog/eog-zh_CN.omf
-share/gnome/omf/eog/eog-zh_TW.omf
-share/gnome/pixmaps/gnome-eog.png
 share/icons/hicolor/16x16/apps/eog.png
 share/icons/hicolor/22x22/apps/eog.png
 share/icons/hicolor/24x24/apps/eog.png
@@ -78,6 +98,7 @@ share/locale/am/LC_MESSAGES/eog.mo
 share/locale/ar/LC_MESSAGES/eog.mo
 share/locale/az/LC_MESSAGES/eog.mo
 share/locale/be/LC_MESSAGES/eog.mo
+share/locale/be@latin/LC_MESSAGES/eog.mo
 share/locale/bg/LC_MESSAGES/eog.mo
 share/locale/bn/LC_MESSAGES/eog.mo
 share/locale/bn_IN/LC_MESSAGES/eog.mo
@@ -133,6 +154,7 @@ share/locale/pt_BR/LC_MESSAGES/eog.mo
 share/locale/ro/LC_MESSAGES/eog.mo
 share/locale/ru/LC_MESSAGES/eog.mo
 share/locale/rw/LC_MESSAGES/eog.mo
+share/locale/si/LC_MESSAGES/eog.mo
 share/locale/sk/LC_MESSAGES/eog.mo
 share/locale/sl/LC_MESSAGES/eog.mo
 share/locale/sq/LC_MESSAGES/eog.mo
@@ -140,6 +162,7 @@ share/locale/sr/LC_MESSAGES/eog.mo
 share/locale/sr@Latn/LC_MESSAGES/eog.mo
 share/locale/sv/LC_MESSAGES/eog.mo
 share/locale/ta/LC_MESSAGES/eog.mo
+share/locale/te/LC_MESSAGES/eog.mo
 share/locale/th/LC_MESSAGES/eog.mo
 share/locale/tk/LC_MESSAGES/eog.mo
 share/locale/tr/LC_MESSAGES/eog.mo
@@ -152,7 +175,24 @@ share/locale/zh_CN/LC_MESSAGES/eog.mo
 share/locale/zh_HK/LC_MESSAGES/eog.mo
 share/locale/zh_TW/LC_MESSAGES/eog.mo
 share/locale/zu/LC_MESSAGES/eog.mo
-@dirrm share/gnome/omf/eog
+share/omf/eog/eog-C.omf
+share/omf/eog/eog-de.omf
+share/omf/eog/eog-en_GB.omf
+share/omf/eog/eog-es.omf
+share/omf/eog/eog-eu.omf
+share/omf/eog/eog-fr.omf
+share/omf/eog/eog-it.omf
+share/omf/eog/eog-ja.omf
+share/omf/eog/eog-ko.omf
+share/omf/eog/eog-oc.omf
+share/omf/eog/eog-pa.omf
+share/omf/eog/eog-pt_BR.omf
+share/omf/eog/eog-ru.omf
+share/omf/eog/eog-sv.omf
+share/omf/eog/eog-uk.omf
+share/omf/eog/eog-zh_CN.omf
+share/omf/eog/eog-zh_TW.omf
+@dirrm share/omf/eog
 @dirrm share/gnome/help/eog/zh_TW/figures
 @dirrm share/gnome/help/eog/zh_TW
 @dirrm share/gnome/help/eog/zh_CN/figures
@@ -167,6 +207,8 @@ share/locale/zu/LC_MESSAGES/eog.mo
 @dirrm share/gnome/help/eog/pt_BR
 @dirrm share/gnome/help/eog/pa/figures
 @dirrm share/gnome/help/eog/pa
+@dirrm share/gnome/help/eog/oc/figures
+@dirrm share/gnome/help/eog/oc
 @dirrm share/gnome/help/eog/ko/figures
 @dirrm share/gnome/help/eog/ko
 @dirrm share/gnome/help/eog/ja/figures
@@ -186,8 +228,22 @@ share/locale/zu/LC_MESSAGES/eog.mo
 @dirrm share/gnome/help/eog/C/figures
 @dirrm share/gnome/help/eog/C
 @dirrm share/gnome/help/eog
-@dirrm share/gnome/eog/glade
-@dirrm share/gnome/eog
+@dirrm %%DATADIR%%/pixmaps
+@dirrm %%DATADIR%%/icons/hicolor/scalable/actions
+@dirrm %%DATADIR%%/icons/hicolor/scalable
+@dirrm %%DATADIR%%/icons/hicolor/32x32/actions
+@dirrm %%DATADIR%%/icons/hicolor/32x32
+@dirrm %%DATADIR%%/icons/hicolor/24x24/actions
+@dirrm %%DATADIR%%/icons/hicolor/24x24
+@dirrm %%DATADIR%%/icons/hicolor/22x22/actions
+@dirrm %%DATADIR%%/icons/hicolor/22x22
+@dirrm %%DATADIR%%/icons/hicolor/16x16/actions
+@dirrm %%DATADIR%%/icons/hicolor/16x16
+@dirrm %%DATADIR%%/icons/hicolor
+@dirrm %%DATADIR%%/icons
+@dirrm %%DATADIR%%
+@dirrm include/eog-2.20/eog
+@dirrm include/eog-2.20
 @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/zu/LC_MESSAGES
@@ -198,6 +254,10 @@ share/locale/zu/LC_MESSAGES/eog.mo
 @dirrmtry share/locale/xh
 @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
@@ -212,3 +272,6 @@ share/locale/zu/LC_MESSAGES/eog.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/graphics/evince/Makefile b/graphics/evince/Makefile
index 104f95515e60..8394cc0c93f5 100644
--- a/graphics/evince/Makefile
+++ b/graphics/evince/Makefile
@@ -3,12 +3,11 @@
 # Whom:					Adam Weinberger <adamw@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/graphics/evince/Makefile,v 1.64 2007/03/13 12:00:09 ahze Exp $
+#   $MCom: ports/graphics/evince/Makefile,v 1.81 2007/10/16 03:16:14 mezz Exp $
 #
 
 PORTNAME=	evince
-PORTVERSION=	0.8.3
-PORTREVISION=	2
+PORTVERSION=	2.20.1
 CATEGORIES=	graphics print gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -29,8 +28,8 @@ USE_GHOSTSCRIPT=yes
 INSTALLS_OMF=	yes
 USE_GNOME=	gnomehack intlhack gnomeprefix libgnomeui libgnomeprintui \
 		desktopfileutils gnomedocutils
-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=	evince.schemas evince-thumbnailer.schemas \
 		evince-thumbnailer-ps.schemas
@@ -79,7 +78,7 @@ CONFIGURE_ARGS+=	--enable-impress
 CONFIGURE_ARGS+=	--disable-impress
 .endif
 
-.if exists(${X11BASE}/bin/djview)
+.if exists(${LOCALBASE}/bin/djview)
 DJVU_DIR?=	# empty
 .else
 DJVU_DIR?=	-nox11
@@ -106,9 +105,8 @@ RUN_DEPENDS+=	unrar:${PORTSDIR}/archivers/unrar \
 .endif
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|execinfo.h|#|g ; s|[$$]POPPLER_VERSION|9|g ; \
-		s| poppler-glib <= [$$]POPPLER_MAX_REQUIRED||g' \
-			${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's|execinfo.h|#|g' \
+		${WRKSRC}/configure
 
 post-install:
 	@-update-desktop-database
diff --git a/graphics/evince/distinfo b/graphics/evince/distinfo
index 5401d88284e7..a08810fb8ba7 100644
--- a/graphics/evince/distinfo
+++ b/graphics/evince/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/evince-0.8.3.tar.bz2) = 0603d3f3f5648c88f10f75c89807c3d1
-SHA256 (gnome2/evince-0.8.3.tar.bz2) = 2b02cacecbcde7d2849e2b40239d7cdae3e0f8e117c529249ac5d327e605baac
-SIZE (gnome2/evince-0.8.3.tar.bz2) = 1515083
+MD5 (gnome2/evince-2.20.1.tar.bz2) = c0f3e4d5279ef3d08cc46b752e230c01
+SHA256 (gnome2/evince-2.20.1.tar.bz2) = 9435c67974b59979b8d84224ed63128cd428fc9bb746f6b333c400619c7f182e
+SIZE (gnome2/evince-2.20.1.tar.bz2) = 1613601
diff --git a/graphics/evince/files/patch-backend_pdf_ev-poppler.cc b/graphics/evince/files/patch-backend_pdf_ev-poppler.cc
deleted file mode 100644
index b0b698b531fd..000000000000
--- a/graphics/evince/files/patch-backend_pdf_ev-poppler.cc
+++ /dev/null
@@ -1,38 +0,0 @@
---- backend/pdf/ev-poppler.cc.orig	2007-09-11 02:17:19.000000000 -0400
-+++ backend/pdf/ev-poppler.cc	2007-09-11 02:22:10.000000000 -0400
-@@ -654,7 +654,7 @@ pdf_document_get_text (EvDocument *docum
- 	r.x2 = rect->x2;
- 	r.y2 = height - rect->y1;
- 
--	text = poppler_page_get_text (poppler_page, &r);
-+	text = poppler_page_get_text (poppler_page, POPPLER_SELECTION_GLYPH, &r);
- 
- 	g_object_unref (poppler_page);
- 
-@@ -1636,7 +1636,7 @@ pdf_selection_render_selection (EvSelect
- 						 rc->scale, rc->rotation, *pixbuf,
- 						 (PopplerRectangle *)points,
- 						 (PopplerRectangle *)old_points,
--						 POPPLER_SELECTION_NORMAL,
-+						 POPPLER_SELECTION_GLYPH,
- 						 text,
- 						 base);
- #endif
-@@ -1655,7 +1655,7 @@ pdf_selection_get_selection_region (EvSe
- 
- 	set_rc_data (pdf_document, rc);
- 
--	retval = poppler_page_get_selection_region ((PopplerPage *)rc->data, rc->scale, (PopplerRectangle *) points);
-+	retval = poppler_page_get_selection_region ((PopplerPage *)rc->data, rc->scale, POPPLER_SELECTION_GLYPH, (PopplerRectangle *) points);
- 
- 	return retval;
- }
-@@ -1676,7 +1676,7 @@ pdf_selection_get_selection_map (EvSelec
- 	points.x1 = 0.0;
- 	points.y1 = 0.0;
- 	poppler_page_get_size (poppler_page, &(points.x2), &(points.y2));
--	retval = poppler_page_get_selection_region (poppler_page, 1.0, &points);
-+	retval = poppler_page_get_selection_region (poppler_page, 1.0, POPPLER_SELECTION_GLYPH, &points);
- 	g_object_unref (poppler_page);
- 
- 	return retval;
diff --git a/graphics/evince/files/patch-backend_ps_ps-interpreter.c b/graphics/evince/files/patch-backend_ps_ps-interpreter.c
deleted file mode 100644
index 9cd98bbefae7..000000000000
--- a/graphics/evince/files/patch-backend_ps_ps-interpreter.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- backend/ps/ps-interpreter.c.orig	Tue Mar 13 07:00:12 2007
-+++ backend/ps/ps-interpreter.c	Tue Mar 13 07:00:21 2007
-@@ -29,6 +29,7 @@
- #include <string.h>
- #include <stdlib.h>
- #include <sys/wait.h>
-+#include <signal.h>
- #include <errno.h>
- 
- #include "ps-interpreter.h"
diff --git a/graphics/evince/files/patch-configure b/graphics/evince/files/patch-configure
index dc2323992061..9ca1314d6329 100644
--- a/graphics/evince/files/patch-configure
+++ b/graphics/evince/files/patch-configure
@@ -1,6 +1,15 @@
---- configure.orig	Mon Dec 18 18:05:50 2006
-+++ configure	Mon Dec 18 18:06:30 2006
-@@ -25315,7 +25315,7 @@ else
+--- configure.orig	2007-08-27 23:27:26.000000000 -0400
++++ configure	2007-08-27 23:29:35.000000000 -0400
+@@ -25411,7 +25411,7 @@ fi
+ 
+ 
+ 
+-for ac_header in execinfo.h
++for ac_header in #
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ if eval "test \"\${$as_ac_Header+set}\" = set"; then
+@@ -26204,7 +26204,7 @@ else
  echo "${ECHO_T}yes" >&6
  	enable_cairo_pdf=yes
  fi
@@ -9,3 +18,12 @@
  
  cat >>confdefs.h <<\_ACEOF
  #define HAVE_CAIRO_PDF 1
+@@ -26283,7 +26283,7 @@ else
+ echo "${ECHO_T}yes" >&6
+ 	enable_cairo_ps=yes
+ fi
+-	    if test x$enable_cairo_ps == xyes; then
++	    if test x$enable_cairo_ps = xyes; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+ #define HAVE_CAIRO_PS 1
diff --git a/graphics/evince/pkg-plist b/graphics/evince/pkg-plist
index 281910505951..2014c40f8274 100644
--- a/graphics/evince/pkg-plist
+++ b/graphics/evince/pkg-plist
@@ -3,6 +3,7 @@ bin/evince-thumbnailer
 %%NAUTILUS%%lib/nautilus/extensions-1.0/libevince-properties-page.a
 %%NAUTILUS%%lib/nautilus/extensions-1.0/libevince-properties-page.la
 %%NAUTILUS%%lib/nautilus/extensions-1.0/libevince-properties-page.so
+share/applications/evince.desktop
 %%DOCSDIR%%/EvAttachment.html
 %%DOCSDIR%%/EvJobPrint.html
 %%DOCSDIR%%/EvNavigationAction.html
@@ -65,25 +66,30 @@ bin/evince-thumbnailer
 %%DOCSDIR%%/right.png
 %%DOCSDIR%%/style.css
 %%DOCSDIR%%/up.png
-share/gnome/applications/evince.desktop
-share/gnome/evince/evince-password.glade
-share/gnome/evince/evince-preview-toolbar.xml
-share/gnome/evince/evince-properties.glade
-share/gnome/evince/evince-toolbar.xml
-share/gnome/evince/evince-ui.xml
-share/gnome/evince/hand-open.png
-share/gnome/evince/icons/hicolor/16x16/actions/view-page-continuous.png
-share/gnome/evince/icons/hicolor/16x16/actions/view-page-facing.png
-share/gnome/evince/icons/hicolor/16x16/actions/zoom-fit-page.png
-share/gnome/evince/icons/hicolor/16x16/actions/zoom-fit-width.png
-share/gnome/evince/icons/hicolor/22x22/actions/view-page-continuous.png
-share/gnome/evince/icons/hicolor/22x22/actions/view-page-facing.png
-share/gnome/evince/icons/hicolor/22x22/actions/zoom-fit-page.png
-share/gnome/evince/icons/hicolor/22x22/actions/zoom-fit-width.png
-share/gnome/evince/icons/hicolor/24x24/actions/view-page-continuous.png
-share/gnome/evince/icons/hicolor/24x24/actions/view-page-facing.png
-share/gnome/evince/icons/hicolor/24x24/actions/zoom-fit-page.png
-share/gnome/evince/icons/hicolor/24x24/actions/zoom-fit-width.png
+%%DATADIR%%/evince-password.glade
+%%DATADIR%%/evince-properties.glade
+%%DATADIR%%/evince-toolbar.xml
+%%DATADIR%%/evince-ui.xml
+%%DATADIR%%/hand-open.png
+%%DATADIR%%/icons/hicolor/16x16/actions/view-page-continuous.png
+%%DATADIR%%/icons/hicolor/16x16/actions/view-page-facing.png
+%%DATADIR%%/icons/hicolor/16x16/actions/zoom-fit-page.png
+%%DATADIR%%/icons/hicolor/16x16/actions/zoom-fit-width.png
+%%DATADIR%%/icons/hicolor/16x16/actions/zoom.png
+%%DATADIR%%/icons/hicolor/22x22/actions/view-page-continuous.png
+%%DATADIR%%/icons/hicolor/22x22/actions/view-page-facing.png
+%%DATADIR%%/icons/hicolor/22x22/actions/zoom-fit-page.png
+%%DATADIR%%/icons/hicolor/22x22/actions/zoom-fit-width.png
+%%DATADIR%%/icons/hicolor/22x22/actions/zoom.png
+%%DATADIR%%/icons/hicolor/24x24/actions/view-page-continuous.png
+%%DATADIR%%/icons/hicolor/24x24/actions/view-page-facing.png
+%%DATADIR%%/icons/hicolor/24x24/actions/zoom-fit-page.png
+%%DATADIR%%/icons/hicolor/24x24/actions/zoom-fit-width.png
+%%DATADIR%%/icons/hicolor/24x24/actions/zoom.png
+%%DATADIR%%/icons/hicolor/32x32/actions/view-page-continuous.png
+%%DATADIR%%/icons/hicolor/32x32/actions/view-page-facing.png
+%%DATADIR%%/icons/hicolor/48x48/actions/view-page-continuous.png
+%%DATADIR%%/icons/hicolor/48x48/actions/view-page-facing.png
 share/gnome/help/evince/C/evince.xml
 share/gnome/help/evince/C/figures/evince_start_window.png
 share/gnome/help/evince/C/legal.xml
@@ -103,8 +109,14 @@ share/gnome/help/evince/fr/evince.xml
 share/gnome/help/evince/fr/figures/evince_start_window.png
 share/gnome/help/evince/it/evince.xml
 share/gnome/help/evince/it/figures/evince_start_window.png
+share/gnome/help/evince/ja/evince.xml
+share/gnome/help/evince/ja/figures/evince_start_window.png
 share/gnome/help/evince/nl/evince.xml
 share/gnome/help/evince/nl/figures/evince_start_window.png
+share/gnome/help/evince/oc/evince.xml
+share/gnome/help/evince/oc/figures/evince_start_window.png
+share/gnome/help/evince/pt_BR/evince.xml
+share/gnome/help/evince/pt_BR/figures/evince_start_window.png
 share/gnome/help/evince/ru/evince.xml
 share/gnome/help/evince/ru/figures/evince_start_window.png
 share/gnome/help/evince/sr/evince.xml
@@ -113,20 +125,6 @@ share/gnome/help/evince/sv/evince.xml
 share/gnome/help/evince/sv/figures/evince_start_window.png
 share/gnome/help/evince/uk/evince.xml
 share/gnome/help/evince/uk/figures/evince_start_window.png
-share/gnome/omf/evince/evince-C.omf
-share/gnome/omf/evince/evince-bg.omf
-share/gnome/omf/evince/evince-ca.omf
-share/gnome/omf/evince/evince-el.omf
-share/gnome/omf/evince/evince-en_GB.omf
-share/gnome/omf/evince/evince-es.omf
-share/gnome/omf/evince/evince-fi.omf
-share/gnome/omf/evince/evince-fr.omf
-share/gnome/omf/evince/evince-it.omf
-share/gnome/omf/evince/evince-nl.omf
-share/gnome/omf/evince/evince-ru.omf
-share/gnome/omf/evince/evince-sr.omf
-share/gnome/omf/evince/evince-sv.omf
-share/gnome/omf/evince/evince-uk.omf
 share/icons/hicolor/16x16/apps/evince.png
 share/icons/hicolor/22x22/apps/evince.png
 share/icons/hicolor/24x24/apps/evince.png
@@ -134,6 +132,7 @@ share/icons/hicolor/48x48/apps/evince.png
 share/icons/hicolor/scalable/apps/evince.svg
 share/locale/ar/LC_MESSAGES/evince.mo
 share/locale/be/LC_MESSAGES/evince.mo
+share/locale/be@latin/LC_MESSAGES/evince.mo
 share/locale/bg/LC_MESSAGES/evince.mo
 share/locale/bn/LC_MESSAGES/evince.mo
 share/locale/bn_IN/LC_MESSAGES/evince.mo
@@ -190,6 +189,7 @@ share/locale/sr/LC_MESSAGES/evince.mo
 share/locale/sr@Latn/LC_MESSAGES/evince.mo
 share/locale/sv/LC_MESSAGES/evince.mo
 share/locale/ta/LC_MESSAGES/evince.mo
+share/locale/te/LC_MESSAGES/evince.mo
 share/locale/th/LC_MESSAGES/evince.mo
 share/locale/tr/LC_MESSAGES/evince.mo
 share/locale/uk/LC_MESSAGES/evince.mo
@@ -198,23 +198,24 @@ share/locale/wa/LC_MESSAGES/evince.mo
 share/locale/zh_CN/LC_MESSAGES/evince.mo
 share/locale/zh_HK/LC_MESSAGES/evince.mo
 share/locale/zh_TW/LC_MESSAGES/evince.mo
-@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/mr/LC_MESSAGES
-@dirrmtry share/locale/mr
-@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
-@dirrm share/gnome/omf/evince
+share/omf/evince/evince-C.omf
+share/omf/evince/evince-bg.omf
+share/omf/evince/evince-ca.omf
+share/omf/evince/evince-el.omf
+share/omf/evince/evince-en_GB.omf
+share/omf/evince/evince-es.omf
+share/omf/evince/evince-fi.omf
+share/omf/evince/evince-fr.omf
+share/omf/evince/evince-it.omf
+share/omf/evince/evince-ja.omf
+share/omf/evince/evince-nl.omf
+share/omf/evince/evince-oc.omf
+share/omf/evince/evince-pt_BR.omf
+share/omf/evince/evince-ru.omf
+share/omf/evince/evince-sr.omf
+share/omf/evince/evince-sv.omf
+share/omf/evince/evince-uk.omf
+@dirrm share/omf/evince
 @dirrm share/gnome/help/evince/uk/figures
 @dirrm share/gnome/help/evince/uk
 @dirrm share/gnome/help/evince/sv/figures
@@ -223,8 +224,14 @@ share/locale/zh_TW/LC_MESSAGES/evince.mo
 @dirrm share/gnome/help/evince/sr
 @dirrm share/gnome/help/evince/ru/figures
 @dirrm share/gnome/help/evince/ru
+@dirrm share/gnome/help/evince/pt_BR/figures
+@dirrm share/gnome/help/evince/pt_BR
+@dirrm share/gnome/help/evince/oc/figures
+@dirrm share/gnome/help/evince/oc
 @dirrm share/gnome/help/evince/nl/figures
 @dirrm share/gnome/help/evince/nl
+@dirrm share/gnome/help/evince/ja/figures
+@dirrm share/gnome/help/evince/ja
 @dirrm share/gnome/help/evince/it/figures
 @dirrm share/gnome/help/evince/it
 @dirrm share/gnome/help/evince/fr/figures
@@ -244,15 +251,40 @@ share/locale/zh_TW/LC_MESSAGES/evince.mo
 @dirrm share/gnome/help/evince/C/figures
 @dirrm share/gnome/help/evince/C
 @dirrm share/gnome/help/evince
-@dirrm share/gnome/evince/icons/hicolor/24x24/actions
-@dirrm share/gnome/evince/icons/hicolor/24x24
-@dirrm share/gnome/evince/icons/hicolor/22x22/actions
-@dirrm share/gnome/evince/icons/hicolor/22x22
-@dirrm share/gnome/evince/icons/hicolor/16x16/actions
-@dirrm share/gnome/evince/icons/hicolor/16x16
-@dirrm share/gnome/evince/icons/hicolor
-@dirrm share/gnome/evince/icons
-@dirrm share/gnome/evince
+@dirrm %%DATADIR%%/icons/hicolor/48x48/actions
+@dirrm %%DATADIR%%/icons/hicolor/48x48
+@dirrm %%DATADIR%%/icons/hicolor/32x32/actions
+@dirrm %%DATADIR%%/icons/hicolor/32x32
+@dirrm %%DATADIR%%/icons/hicolor/24x24/actions
+@dirrm %%DATADIR%%/icons/hicolor/24x24
+@dirrm %%DATADIR%%/icons/hicolor/22x22/actions
+@dirrm %%DATADIR%%/icons/hicolor/22x22
+@dirrm %%DATADIR%%/icons/hicolor/16x16/actions
+@dirrm %%DATADIR%%/icons/hicolor/16x16
+@dirrm %%DATADIR%%/icons/hicolor
+@dirrm %%DATADIR%%/icons
+@dirrm %%DATADIR%%
 @dirrm %%DOCSDIR%%
 @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/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
+@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/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
+@dirrmtry share/locale/be@latin/LC_MESSAGES
+@dirrmtry share/locale/be@latin
+@dirrmtry share/applications
diff --git a/graphics/f-spot/Makefile b/graphics/f-spot/Makefile
index 8975d285d730..9174d3b8f456 100644
--- a/graphics/f-spot/Makefile
+++ b/graphics/f-spot/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	f-spot
 PORTVERSION=	0.4.0
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	graphics gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
diff --git a/graphics/f-spot/pkg-plist b/graphics/f-spot/pkg-plist
index 0af4f1b20716..67aaa01634e8 100644
--- a/graphics/f-spot/pkg-plist
+++ b/graphics/f-spot/pkg-plist
@@ -41,8 +41,8 @@ lib/f-spot/extensions/DefaultExporters.addin.xml
 libdata/pkgconfig/f-spot.pc
 libexec/gnome-screensaver/f-spot-screensaver
 share/gnome-screensaver/themes/f-spot-screensaver.desktop
-share/gnome/applications/f-spot-view.desktop
-share/gnome/applications/f-spot.desktop
+share/applications/f-spot-view.desktop
+share/applications/f-spot.desktop
 share/gnome/help/f-spot/C/f-spot.xml
 share/gnome/help/f-spot/C/figures/f-spot-adjust-colors.png
 share/gnome/help/f-spot/C/figures/f-spot-autocolor.png
@@ -120,13 +120,13 @@ share/gnome/help/f-spot/sv/figures/f-spot-sepia.png
 share/gnome/help/f-spot/sv/figures/f-spot-slideshow.png
 share/gnome/help/f-spot/sv/figures/f-spot-soft-focus.png
 share/gnome/help/f-spot/sv/figures/f-spot-straighten.png
-share/gnome/omf/f-spot/f-spot-C.omf
-share/gnome/omf/f-spot/f-spot-da.omf
-share/gnome/omf/f-spot/f-spot-es.omf
-share/gnome/omf/f-spot/f-spot-fr.omf
-share/gnome/omf/f-spot/f-spot-it.omf
-share/gnome/omf/f-spot/f-spot-pt_BR.omf
-share/gnome/omf/f-spot/f-spot-sv.omf
+share/omf/f-spot/f-spot-C.omf
+share/omf/f-spot/f-spot-da.omf
+share/omf/f-spot/f-spot-es.omf
+share/omf/f-spot/f-spot-fr.omf
+share/omf/f-spot/f-spot-it.omf
+share/omf/f-spot/f-spot-pt_BR.omf
+share/omf/f-spot/f-spot-sv.omf
 share/icons/hicolor/16x16/apps/f-spot.png
 share/icons/hicolor/16x16/apps/f-spot.svg
 share/icons/hicolor/22x22/apps/f-spot.png
@@ -179,7 +179,7 @@ share/locale/zh_TW/LC_MESSAGES/f-spot.mo
 @dirrmtry share/locale/rw
 @dirrmtry share/locale/dz/LC_MESSAGES
 @dirrmtry share/locale/dz
-@dirrm share/gnome/omf/f-spot
+@dirrm share/omf/f-spot
 @dirrm share/gnome/help/f-spot/sv/figures
 @dirrm share/gnome/help/f-spot/sv
 @dirrm share/gnome/help/f-spot/pt_BR/figures
@@ -200,3 +200,4 @@ share/locale/zh_TW/LC_MESSAGES/f-spot.mo
 @dirrmtry libexec/gnome-screensaver
 @dirrm lib/f-spot/extensions
 @dirrm lib/f-spot
+@dirrmtry share/applications
diff --git a/graphics/frontline/Makefile b/graphics/frontline/Makefile
index 4ea11d77cbe9..4252f8096359 100644
--- a/graphics/frontline/Makefile
+++ b/graphics/frontline/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	frontline
 PORTVERSION=	0.5.4
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	graphics gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	autotrace
diff --git a/graphics/frontline/pkg-plist b/graphics/frontline/pkg-plist
index 77a84535afb7..c821c87fbd8c 100644
--- a/graphics/frontline/pkg-plist
+++ b/graphics/frontline/pkg-plist
@@ -15,10 +15,10 @@ lib/libgundo.a
 libdata/pkgconfig/frontline.pc
 share/aclocal/frontline.m4
 share/gnome/apps/Graphics/frontline.desktop
-share/gnome/mime-info/frontline.keys
-share/gnome/mime-info/frontline.mime
-share/gnome/pixmaps/fl-splash.png
-share/gnome/pixmaps/frontline.png
+share/mime-info/frontline.keys
+share/mime-info/frontline.mime
+share/pixmaps/fl-splash.png
+share/pixmaps/frontline.png
 share/locale/ja/LC_MESSAGES/frontline.mo
 @dirrm include/gundo
 @dirrm include/frontline
diff --git a/graphics/gcolor2/Makefile b/graphics/gcolor2/Makefile
index b9c5c7b3a439..ea865c490dcc 100644
--- a/graphics/gcolor2/Makefile
+++ b/graphics/gcolor2/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gcolor2
 PORTVERSION=	0.4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -24,6 +24,7 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 SUB_FILES=	gcolor2.desktop
 
 post-install:
-	${INSTALL_DATA} ${WRKDIR}/gcolor2.desktop ${PREFIX}/share/gnome/applications
+	${MKDIR} ${PREFIX}/share/applications
+	${INSTALL_DATA} ${WRKDIR}/gcolor2.desktop ${PREFIX}/share/applications
 
 .include <bsd.port.mk>
diff --git a/graphics/gcolor2/files/gcolor2.desktop.in b/graphics/gcolor2/files/gcolor2.desktop.in
index 6713fbea05c3..bb8fa254dee2 100644
--- a/graphics/gcolor2/files/gcolor2.desktop.in
+++ b/graphics/gcolor2/files/gcolor2.desktop.in
@@ -7,7 +7,7 @@ Comment=Choose colors from palette or screen
 Comment[es]=Elige y proba colores de la gama de colores o la pantalla
 Comment[pl]=Wybiera kolory z palety lub ekranu
 Exec=gcolor2
-Icon=%%PREFIX%%/share/gnome/pixmaps/gcolor2/icon.png
+Icon=%%PREFIX%%/share/pixmaps/gcolor2/icon.png
 Terminal=false
 Type=Application
 Categories=GNOME;Application;Graphics;
diff --git a/graphics/gcolor2/pkg-plist b/graphics/gcolor2/pkg-plist
index e565e47d39d0..0e07f647d3e5 100644
--- a/graphics/gcolor2/pkg-plist
+++ b/graphics/gcolor2/pkg-plist
@@ -1,5 +1,6 @@
 bin/gcolor2
-share/gnome/applications/gcolor2.desktop
-share/gnome/pixmaps/gcolor2/about_icon.png
-share/gnome/pixmaps/gcolor2/icon.png
-@dirrm share/gnome/pixmaps/gcolor2
+share/applications/gcolor2.desktop
+share/pixmaps/gcolor2/about_icon.png
+share/pixmaps/gcolor2/icon.png
+@dirrm share/pixmaps/gcolor2
+@dirrmtry share/applications
diff --git a/graphics/gimp-app/Makefile b/graphics/gimp-app/Makefile
index bb41cf991806..1283336e45fd 100644
--- a/graphics/gimp-app/Makefile
+++ b/graphics/gimp-app/Makefile
@@ -3,12 +3,14 @@
 # Whom:                 erich@FreeBSD.org
 #
 # $FreeBSD$
-#    $MCom: ports/graphics/gimp-app/Makefile,v 1.12 2007/03/30 18:22:45 ahze Exp $
+#   $MCom: ports/graphics/gimp-app/Makefile,v 1.18 2007/10/24 21:22:00 ahze Exp $
+#
 
 PORTNAME=	gimp-app
-PORTVERSION=	2.2.17
-PORTEPOCH=	1
-CATEGORIES=	graphics gnome
+DISTVERSION=	2.4.0
+PORTREVISION?=	0
+PORTEPOCH?=	1
+CATEGORIES?=	graphics gnome
 MASTER_SITES=	ftp://ftp.gimp.org/pub/%SUBDIR%/ \
 		http://gimp.mirrors.hoobly.com/%SUBDIR%/ \
 		http://ftp.gwdg.de/pub/misc/grafik/gimp/%SUBDIR%/ \
@@ -17,68 +19,70 @@ MASTER_SITES=	ftp://ftp.gimp.org/pub/%SUBDIR%/ \
 		http://www.mirrorservice.org/sites/ftp.gimp.org/pub/%SUBDIR%/ \
 		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,graphics/%SUBDIR%,}
 MASTER_SITE_SUBDIR=	gimp/v${PORTVERSION:R}
-DISTNAME=	gimp-${PORTVERSION}
+DISTNAME=	gimp-${DISTVERSION}
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	A GNU Image Manipulation Program
 
-LIB_DEPENDS=	wmf.2:${PORTSDIR}/graphics/libwmf \
+LIB_DEPENDS=	exif.12:${PORTSDIR}/graphics/libexif \
+		wmf.2:${PORTSDIR}/graphics/libwmf \
+		poppler-glib.2:${PORTSDIR}/graphics/poppler-gtk \
 		aa.1:${PORTSDIR}/graphics/aalib \
-		exif.12:${PORTSDIR}/graphics/libexif \
 		mng.1:${PORTSDIR}/graphics/libmng \
 		png.5:${PORTSDIR}/graphics/png \
 		jpeg.9:${PORTSDIR}/graphics/jpeg \
-		tiff.4:${PORTSDIR}/graphics/tiff
-
-CONFLICTS=	gimp-1.* gimpshop-[0-9]* gimp-app-devel-[0-9]*
-
-SHLIBVER?=	200
+		tiff.4:${PORTSDIR}/graphics/tiff \
+		lcms.1:${PORTSDIR}/graphics/lcms
 
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_XPM=	yes
 USE_GMAKE=	yes
-GNU_CONFIGURE=	yes
-USE_GNOME=	gnomehack intltool intlhack gtk20 libartlgpl2
-WANT_GNOME=	yes
-USE_GETTEXT=	yes
+USE_AUTOTOOLS=	libtool:15
+USE_GNOME=	gnomehack intltool intlhack gtk20 libartlgpl2 ltverhack desktopfileutils
 USE_LDCONFIG=	yes
-PLIST_SUB=	SHLIBVER="${SHLIBVER}"
-CONFIGURE_ARGS=	--disable-perl \
+INSTALLS_ICONS=	yes
+LIBTOOLFLAGS=	--disable-ltlibs --release-ignore
+CONFIGURE_ARGS?=--disable-perl \
 		--with-html-dir=${PREFIX}/share/doc/gimp \
-		--docdir=${PREFIX}/share/doc/gimp \
 		--disable-gtk-doc \
-		--enable-static \
-		--disable-print
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
-
-MAN1=	gimp.1 gimp-2.2.1 gimp-remote.1 gimp-remote-2.2.1 gimptool-2.0.1
-MAN5=	gimprc.5 gimprc-2.2.5
-
-OPTIONS=	DEBUG "debugging" off \
-		PYTHON "Python-Fu support" off \
-		RSVG "SVG format support" on \
-		HTML_HELP_BROWSER "GIMP help browser" on \
-		MP "multiple processor support" off
+		--without-print \
+		--disable-python \
+		--with-desktop-dir=${PREFIX}/share \
+		--docdir=${PREFIX}/share/doc/gimp \
+		--enable-default-binary
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib" \
+		GIMP_THREAD_LIBS=${PTHREAD_LIBS}
+
+.if !defined(GIMP_SLAVE)
+OPTIONS?=	DEBUG "debugging" off \
+		DBUS "D-BUS support" on \
+		GNOMEVFS "Use GNOME VFS for the URI plug-in" on \
+		HELPBROWSER "internal help browser" on \
+		MP "multiple processor support" off \
+		RSVG "SVG format support" on
+.endif
 
 .include <bsd.port.pre.mk>
 
-.if defined(WITH_DEBUG)
-CONFIGURE_ARGS+=	--enable-debug
-.endif
+.if defined(GIMP_SLAVE)
+PKG_CONFIG?=	${LOCALBASE}/bin/pkg-config
+GIMP_LIBS=	`${PKG_CONFIG} --libs gimp-2.0`
+GIMP_THUMB_LIBS=`${PKG_CONFIG} --libs gimpthumb-2.0`
+GIMP_UI_LIBS=	`${PKG_CONFIG} --libs gimpui-2.0`
+
+LIB_DEPENDS+=	gimp-2.0.0:${PORTSDIR}/graphics/gimp-app
 
-.if defined(WITH_PYTHON)
-USE_PYTHON=		yes
-# we need to manually include this, because USE_PYTHON is defined
-# after including bsd.port.pre.mk
-.include "${PORTSDIR}/Mk/bsd.python.mk"
-USE_GNOME+=		pygtk2
-CONFIGURE_ARGS+=	--enable-python
-PLIST_SUB+=		PYTHON:=""
 .else
-CONFIGURE_ARGS+=	--disable-python
-PLIST_SUB+=		PYTHON:="@comment "
-.endif
+
+MAN1+=	gimp-2.4.1 gimp-remote-2.4.1 gimptool-2.0.1
+MAN5+=	gimprc-2.4.5
+MLINKS=	gimp-2.4.1 gimp.1 \
+	gimp-2.4.1 gimp-console-2.4.1 \
+	gimp-console-2.4.1 gimp-console.1 \
+	gimp-remote-2.4.1 gimp-remote.1 \
+	gimprc-2.4.5 gimprc.5
 
 .if defined(WITHOUT_RSVG)
 CONFIGURE_ARGS+=	--without-librsvg
@@ -88,33 +92,62 @@ USE_GNOME+=		librsvg2
 PLIST_SUB+=		SVG=""
 .endif
 
+.if defined(WITH_DEBUG)
+CONFIGURE_ARGS+=	--enable-debug
+.endif
+
 .if defined(WITH_MP)
 CONFIGURE_ARGS+=	--enable-mp
+.else
+CONFIGURE_ARGS+=	--disable-mp
 .endif
 
-.if ${HAVE_GNOME:Mgnomepanel}!=""
-USE_GNOME+=		gnomepanel desktopfileutils
-CONFIGURE_ARGS+=	--with-desktop-dir=${LOCALBASE}/share/gnome
-CONFIGURE_ENV+=		GIMP_THREAD_LIBS=${PTHREAD_LIBS}
-PLIST_SUB+=		GNOMEPANEL:=""
-GNOME_ENABLED=		yes
+.if ${HAVE_GNOME:Mgnomehier}!="" || defined(WITH_GNOME)
+USE_GNOME+=		desktopfileutils gnomehier
+PLIST_SUB+=		GNOME=""
 .else
-PLIST_SUB+=		GNOMEPANEL:="@comment "
-CONFIGURE_ENV+=		GIMP_THREAD_LIBS=${PTHREAD_LIBS}
+PLIST_SUB+=		GNOME="@comment "
 .endif
 
-.if defined(WITH_HTML_HELP_BROWSER)
+.if defined(WITH_HELPBROWSER)
 USE_GNOME+=		libgtkhtml
-PLIST_SUB+=		HELPBROWSER:=""
+CONFIGURE_ARGS+=	--with-gtkhtml2
+PLIST_SUB+=		HELPBROWSER=""
 .else
-PLIST_SUB+=		HELPBROWSER:="@comment "
-post-patch:
-	@${REINPLACE_CMD} -e 's|\(have_gtkhtml2=\)yes|\1no|' ${WRKSRC}/configure
+CONFIGURE_ARGS+=	--without-gtkhtml2
+PLIST_SUB+=		HELPBROWSER="@comment "
 .endif
 
-.if defined(GNOME_ENABLED)
+.if defined(WITH_DBUS)
+LIB_DEPENDS+=		dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
+CONFIGURE_ARGS+=	--with-dbus
+.else
+CONFIGURE_ARGS+=	--without-dbus
+.endif
+
+.if defined(WITH_GNOMEVFS) || ${HAVE_GNOME:Mgnomevfs2}!=""
+LIB_DEPENDS+=	gnome-keyring.0:${PORTSDIR}/security/gnome-keyring
+USE_GNOME+=	gnomevfs2
+.endif
+
+.endif
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|%%GIMP_LIBS%%|${GIMP_LIBS}|; \
+		s|%%GIMP_THUMB_LIBS%%|${GIMP_THUMB_LIBS}|; \
+		s|%%GIMP_UI_LIBS%%|${GIMP_UI_LIBS}|' \
+			${WRKSRC}/plug-ins/pygimp/Makefile.in
+	@${REINPLACE_CMD} -e 's|"libpng"|"libpng12"|' \
+		${WRKSRC}/configure
+
 post-install:
-	@-update-desktop-database
+.if !defined(GIMP_SLAVE)
+.if ${HAVE_GNOME:Mgnomehier}!="" || defined(WITH_GNOME)
+	${MKDIR} ${PREFIX}/share/mime-info ${PREFIX}/share/application-registry
+	${INSTALL_DATA} ${WRKSRC}/desktop/gimp.applications ${PREFIX}/share/application-registry
+	${INSTALL_DATA} ${WRKSRC}/desktop/gimp.keys ${PREFIX}/share/mime-info
 .endif
+.endif
+	@-update-desktop-database
 
 .include <bsd.port.post.mk>
diff --git a/graphics/gimp-app/distinfo b/graphics/gimp-app/distinfo
index ae0dda79b2b5..2f4cdf59f741 100644
--- a/graphics/gimp-app/distinfo
+++ b/graphics/gimp-app/distinfo
@@ -1,3 +1,3 @@
-MD5 (gimp-2.2.17.tar.bz2) = 4f509ed4a605452d88e04045ff388d58
-SHA256 (gimp-2.2.17.tar.bz2) = 8a4d3b28b3a11ea7564df09c8990d1c90bc3dd713b1dde0737e08603854b01b4
-SIZE (gimp-2.2.17.tar.bz2) = 13102077
+MD5 (gimp-2.4.0.tar.bz2) = 35fecf14cd5237065aef624b93030d5e
+SHA256 (gimp-2.4.0.tar.bz2) = ddeafb632050bba9163416c4a18c4cb8706b922c0fa99a0c216176584826a9dc
+SIZE (gimp-2.4.0.tar.bz2) = 17617876
diff --git a/graphics/gimp-app/files/patch-aa b/graphics/gimp-app/files/patch-aa
deleted file mode 100644
index 411ac92c931b..000000000000
--- a/graphics/gimp-app/files/patch-aa
+++ /dev/null
@@ -1,20 +0,0 @@
---- app/main.c.orig	Sun Oct  5 09:16:02 2003
-+++ app/main.c	Mon Oct  6 12:14:34 2003
-@@ -23,6 +23,7 @@
- #include <signal.h>
- #include <string.h>
- #include <sys/types.h>
-+#include <floatingpoint.h>
- 
- #ifdef HAVE_SYS_WAIT_H
- #include <sys/wait.h>
-@@ -113,6 +114,9 @@
-   /* Initialize variables */
- 
-   full_prog_name = argv[0];
-+
-+  /* Ignore floating point exceptions */
-+  fpsetmask(0);
- 
-   /* Initialize i18n support */
- 
diff --git a/graphics/gimp-app/files/patch-configure b/graphics/gimp-app/files/patch-configure
index da42f67f8ca6..1a89a1cc26f4 100644
--- a/graphics/gimp-app/files/patch-configure
+++ b/graphics/gimp-app/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	Sun Mar  6 15:30:12 2005
-+++ configure	Sun Mar  6 15:33:57 2005
-@@ -25925,6 +25925,7 @@
+--- configure.orig	Thu Nov 23 15:16:53 2006
++++ configure	Sun Dec 31 19:29:32 2006
+@@ -29404,6 +29404,7 @@
      if test "x$enable_gtktest" = "xyes" ; then
        ac_save_CFLAGS="$CFLAGS"
        ac_save_LIBS="$LIBS"
@@ -8,9 +8,9 @@
        CFLAGS="$CFLAGS $GTK_CFLAGS"
        LIBS="$GTK_LIBS $LIBS"
        rm -f conf.gtktest
-@@ -33865,9 +33866,9 @@
+@@ -38514,9 +38515,9 @@
  fi
- fi;
+ 
  
 -gimpdatadir="$datadir/$PACKAGE/2.0"
 -gimpplugindir="$libdir/$PACKAGE/2.0"
@@ -19,5 +19,5 @@
 +gimpplugindir="$libexecdir/$PACKAGE/2.2"
 +gimpsysconfdir="$sysconfdir/$PACKAGE/2.2"
  
- localedir='${prefix}/${DATADIRNAME}/locale'
+ 
  
diff --git a/graphics/gimp-app/files/patch-desktop_Makefile.in b/graphics/gimp-app/files/patch-desktop_Makefile.in
new file mode 100644
index 000000000000..62da49282658
--- /dev/null
+++ b/graphics/gimp-app/files/patch-desktop_Makefile.in
@@ -0,0 +1,33 @@
+--- desktop/Makefile.in.orig	Mon Jan  1 02:31:10 2007
++++ desktop/Makefile.in	Mon Jan  1 02:33:44 2007
+@@ -65,8 +65,7 @@
+ 	"$(DESTDIR)$(icons16dir)" "$(DESTDIR)$(icons22dir)" \
+ 	"$(DESTDIR)$(icons24dir)" "$(DESTDIR)$(icons32dir)" \
+ 	"$(DESTDIR)$(icons48dir)" "$(DESTDIR)$(icons64dir)" \
+-	"$(DESTDIR)$(iconsscalabledir)" "$(DESTDIR)$(mimeinfodir)" \
+-	"$(DESTDIR)$(registrydir)"
++	"$(DESTDIR)$(iconsscalabledir)"
+ applicationsDATA_INSTALL = $(INSTALL_DATA)
+ icons16DATA_INSTALL = $(INSTALL_DATA)
+ icons22DATA_INSTALL = $(INSTALL_DATA)
+@@ -79,8 +78,7 @@
+ registryDATA_INSTALL = $(INSTALL_DATA)
+ DATA = $(applications_DATA) $(icons16_DATA) $(icons22_DATA) \
+ 	$(icons24_DATA) $(icons32_DATA) $(icons48_DATA) \
+-	$(icons64_DATA) $(iconsscalable_DATA) $(mimeinfo_DATA) \
+-	$(registry_DATA)
++	$(icons64_DATA) $(iconsscalable_DATA)
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ AA = @AA@
+ ACLOCAL = @ACLOCAL@
+@@ -445,10 +443,6 @@
+ desktop_files = $(desktop_in_files:.desktop.in.in=.desktop)
+ @DESKTOP_DATADIR_TRUE@applicationsdir = $(DESKTOP_DATADIR)/applications
+ @DESKTOP_DATADIR_TRUE@applications_DATA = $(desktop_files)
+-@DESKTOP_DATADIR_TRUE@mimeinfodir = $(DESKTOP_DATADIR)/mime-info
+-@DESKTOP_DATADIR_TRUE@mimeinfo_DATA = gimp.keys
+-@DESKTOP_DATADIR_TRUE@registrydir = $(DESKTOP_DATADIR)/application-registry
+-@DESKTOP_DATADIR_TRUE@registry_DATA = gimp.applications
+ @DESKTOP_DATADIR_TRUE@icons16dir = $(DESKTOP_DATADIR)/icons/hicolor/16x16/apps
+ @DESKTOP_DATADIR_TRUE@icons16_DATA = 16x16/gimp.png
+ @DESKTOP_DATADIR_TRUE@icons22dir = $(DESKTOP_DATADIR)/icons/hicolor/22x22/apps
diff --git a/graphics/gimp-app/files/patch-am b/graphics/gimp-app/files/patch-libgimp_gimp.c
index 45c58cbe59fe..a1bb86bbfda6 100644
--- a/graphics/gimp-app/files/patch-am
+++ b/graphics/gimp-app/files/patch-libgimp_gimp.c
@@ -1,6 +1,6 @@
---- libgimp/gimp.c.orig	Fri May 12 12:37:27 2000
-+++ libgimp/gimp.c	Thu May 18 16:42:21 2000
-@@ -26,6 +26,7 @@
+--- libgimp/gimp.c.orig	Fri Sep  1 06:14:32 2006
++++ libgimp/gimp.c	Sun Dec 31 15:56:37 2006
+@@ -29,6 +29,7 @@
  #include <stdlib.h>
  #include <string.h>
  #include <sys/types.h>
@@ -8,12 +8,13 @@
  
  #ifdef HAVE_SYS_TIME_H
  #include <sys/time.h>
-@@ -211,6 +212,9 @@
-     }
+@@ -291,6 +292,9 @@
+   gimp_env_init (TRUE);
  
    progname = argv[0];
 +
 +  /* Ignore floating point exceptions */
 +  fpsetmask(0);
  
-   g_set_prgname (g_basename (progname));
+   basename = g_path_get_basename (progname);
+ 
diff --git a/graphics/gimp-app/files/patch-plug-ins_common_url.c b/graphics/gimp-app/files/patch-plug-ins_common_url.c
deleted file mode 100644
index bceff6df101c..000000000000
--- a/graphics/gimp-app/files/patch-plug-ins_common_url.c
+++ /dev/null
@@ -1,17 +0,0 @@
---- plug-ins/common/url.c.orig	Wed Dec 28 13:56:48 2005
-+++ plug-ins/common/url.c	Wed Dec 28 13:58:33 2005
-@@ -186,10 +186,10 @@
-       putenv ("LANG=C");
- #endif
- 
--      execlp ("wget",
--              "wget", "-v", "-e", "server-response=off", "-T", TIMEOUT,
--              filename, "-O", tmpname, NULL);
--      g_message ("exec() failed: wget: %s", g_strerror (errno));
-+      execlp ("fetch",
-+              "fetch", "-T", TIMEOUT,
-+              filename, "-p", "-o", tmpname, NULL);
-+      g_message ("exec() failed: fetch: %s", g_strerror (errno));
-       g_free (tmpname);
-       _exit (127);
-     }
diff --git a/graphics/gimp-app/files/patch-plug-ins_print_print.c b/graphics/gimp-app/files/patch-plug-ins_print_print.c
deleted file mode 100644
index 36f4bf7148cf..000000000000
--- a/graphics/gimp-app/files/patch-plug-ins_print_print.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- plug-ins/print/print.c.orig	Tue Dec 26 07:43:54 2000
-+++ plug-ins/print/print.c	Tue Dec 26 07:44:07 2000
-@@ -1417,7 +1417,7 @@
- 
-     if (i < (sizeof(lpcs) / sizeof(lpcs[0])))
-     {
--      strcat(command, " status < /dev/null");
-+      strcat(command, " status all < /dev/null");
-       type = PRINTERS_LPC;
-     }
-     else
diff --git a/graphics/gimp-app/files/patch-plug-ins_pygimp_Makefile.in b/graphics/gimp-app/files/patch-plug-ins_pygimp_Makefile.in
new file mode 100644
index 000000000000..efc3a8b311fe
--- /dev/null
+++ b/graphics/gimp-app/files/patch-plug-ins_pygimp_Makefile.in
@@ -0,0 +1,97 @@
+--- plug-ins/pygimp/Makefile.in.orig	Sun Dec 31 22:19:08 2006
++++ plug-ins/pygimp/Makefile.in	Sun Dec 31 22:22:17 2006
+@@ -64,10 +64,9 @@
+ 	"$(DESTDIR)$(pygimpdir)"
+ pygimpLTLIBRARIES_INSTALL = $(INSTALL)
+ LTLIBRARIES = $(pygimp_LTLIBRARIES)
+-am__DEPENDENCIES_1 =  \
+-	$(top_builddir)/libgimp/libgimp-$(GIMP_API_VERSION).la
+-am__DEPENDENCIES_2 = $(top_builddir)/libgimpcolor/libgimpcolor-$(GIMP_API_VERSION).la
+-am__DEPENDENCIES_3 = $(top_builddir)/libgimpbase/libgimpbase-$(GIMP_API_VERSION).la
++am__DEPENDENCIES_1 = 
++am__DEPENDENCIES_2 = 
++am__DEPENDENCIES_3 = 
+ am__DEPENDENCIES_4 =
+ _gimpenums_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+ 	$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) \
+@@ -75,11 +74,10 @@
+ 	$(am__DEPENDENCIES_4)
+ am__gimpenums_la_OBJECTS = gimpenumsmodule.lo
+ _gimpenums_la_OBJECTS = $(am__gimpenums_la_OBJECTS)
+-am__DEPENDENCIES_5 =  \
+-	$(top_builddir)/libgimp/libgimpui-$(GIMP_API_VERSION).la
+-am__DEPENDENCIES_6 = $(top_builddir)/libgimpwidgets/libgimpwidgets-$(GIMP_API_VERSION).la
+-am__DEPENDENCIES_7 = $(top_builddir)/libgimpconfig/libgimpconfig-$(GIMP_API_VERSION).la
+-am__DEPENDENCIES_8 = $(top_builddir)/libgimpmath/libgimpmath-$(GIMP_API_VERSION).la
++am__DEPENDENCIES_5 =
++am__DEPENDENCIES_6 = 
++am__DEPENDENCIES_7 = 
++am__DEPENDENCIES_8 = 
+ _gimpui_la_DEPENDENCIES = $(am__DEPENDENCIES_5) $(am__DEPENDENCIES_6) \
+ 	$(am__DEPENDENCIES_7) $(am__DEPENDENCIES_8) \
+ 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) \
+@@ -99,7 +97,7 @@
+ 	$(am__DEPENDENCIES_4) $(am__DEPENDENCIES_4)
+ am_gimpcolor_la_OBJECTS = gimpcolormodule.lo pygimp-colors.lo
+ gimpcolor_la_OBJECTS = $(am_gimpcolor_la_OBJECTS)
+-am__DEPENDENCIES_9 = $(top_builddir)/libgimpthumb/libgimpthumb-$(GIMP_API_VERSION).la
++am__DEPENDENCIES_9 = 
+ gimpthumb_la_DEPENDENCIES = $(am__DEPENDENCIES_9) \
+ 	$(am__DEPENDENCIES_4) $(am__DEPENDENCIES_4)
+ am_gimpthumb_la_OBJECTS = gimpthumbmodule.lo gimpthumb.lo
+@@ -531,9 +529,7 @@
+ 	-export-symbols-regex initgimp
+ 
+ gimp_la_LIBADD = \
+-	$(libgimp)		\
+-	$(libgimpcolor)		\
+-	$(libgimpbase)		\
++	%%GIMP_LIBS%%		\
+ 	$(GLIB_LIBS)		\
+ 	$(PYLINK_LIBS)		\
+ 	$(RT_LIBS)
+@@ -545,9 +541,7 @@
+ 	-export-symbols-regex init_gimpenums
+ 
+ _gimpenums_la_LIBADD = \
+-	$(libgimp)		\
+-	$(libgimpcolor)		\
+-	$(libgimpbase)		\
++	%%GIMP_LIBS%%		\
+ 	$(GLIB_LIBS)		\
+ 	$(PYLINK_LIBS)		\
+ 	$(RT_LIBS)
+@@ -562,7 +556,7 @@
+ 	-export-symbols-regex initgimpcolor
+ 
+ gimpcolor_la_LIBADD = \
+-	$(libgimpcolor)		\
++	%%GIMP_LIBS%%		\
+ 	$(GLIB_LIBS)		\
+ 	$(PYLINK_LIBS)
+ 
+@@ -574,13 +568,8 @@
+ 	-export-symbols-regex init_gimpui
+ 
+ _gimpui_la_LIBADD = \
+-	$(libgimpui)		\
+-	$(libgimpwidgets)	\
+-	$(libgimpconfig)	\
+-	$(libgimpmath)		\
+-	$(libgimp)		\
+-	$(libgimpcolor)		\
+-	$(libgimpbase)		\
++	%%GIMP_LIBS%%		\
++	%%GIMP_UI_LIBS%%	\
+ 	$(GTK_LIBS)		\
+ 	$(PYLINK_LIBS)		\
+ 	$(RT_LIBS)		\
+@@ -594,7 +583,7 @@
+ 	-export-symbols-regex initgimpthumb
+ 
+ gimpthumb_la_LIBADD = \
+-	$(libgimpthumb)		\
++	%%GIMP_THUMB_LIBS%%	\
+ 	$(GDK_PIXBUF_LIBS)	\
+ 	$(PYLINK_LIBS)
+ 
diff --git a/graphics/gimp-app/pkg-plist b/graphics/gimp-app/pkg-plist
index 7c55b5c7667f..aa4888347220 100644
--- a/graphics/gimp-app/pkg-plist
+++ b/graphics/gimp-app/pkg-plist
@@ -1,11 +1,14 @@
 bin/gimp
-bin/gimp-2.2
+bin/gimp-2.4
+bin/gimp-console
+bin/gimp-console-2.4
 bin/gimp-remote
-bin/gimp-remote-2.2
+bin/gimp-remote-2.4
 bin/gimptool-2.0
 etc/gimp/2.2/controllerrc
 etc/gimp/2.2/gimprc
 etc/gimp/2.2/gtkrc
+etc/gimp/2.2/menurc
 etc/gimp/2.2/ps-menurc
 etc/gimp/2.2/sessionrc
 etc/gimp/2.2/templaterc
@@ -19,6 +22,8 @@ include/gimp-2.0/libgimp/gimpbrushes_pdb.h
 include/gimp-2.0/libgimp/gimpbrushmenu.h
 include/gimp-2.0/libgimp/gimpbrushselect.h
 include/gimp-2.0/libgimp/gimpbrushselect_pdb.h
+include/gimp-2.0/libgimp/gimpbrushselectbutton.h
+include/gimp-2.0/libgimp/gimpbuffer_pdb.h
 include/gimp-2.0/libgimp/gimpchannel.h
 include/gimp-2.0/libgimp/gimpchannel_pdb.h
 include/gimp-2.0/libgimp/gimpcolor_pdb.h
@@ -28,7 +33,6 @@ include/gimp-2.0/libgimp/gimpconvert_pdb.h
 include/gimp-2.0/libgimp/gimpdisplay_pdb.h
 include/gimp-2.0/libgimp/gimpdrawable.h
 include/gimp-2.0/libgimp/gimpdrawable_pdb.h
-include/gimp-2.0/libgimp/gimpdrawablecombobox.h
 include/gimp-2.0/libgimp/gimpdrawablepreview.h
 include/gimp-2.0/libgimp/gimpdrawabletransform_pdb.h
 include/gimp-2.0/libgimp/gimpedit_pdb.h
@@ -40,6 +44,8 @@ include/gimp-2.0/libgimp/gimpfontmenu.h
 include/gimp-2.0/libgimp/gimpfonts_pdb.h
 include/gimp-2.0/libgimp/gimpfontselect.h
 include/gimp-2.0/libgimp/gimpfontselect_pdb.h
+include/gimp-2.0/libgimp/gimpfontselectbutton.h
+include/gimp-2.0/libgimp/gimpgimprc.h
 include/gimp-2.0/libgimp/gimpgimprc_pdb.h
 include/gimp-2.0/libgimp/gimpgradient_pdb.h
 include/gimp-2.0/libgimp/gimpgradientmenu.h
@@ -47,11 +53,14 @@ include/gimp-2.0/libgimp/gimpgradients.h
 include/gimp-2.0/libgimp/gimpgradients_pdb.h
 include/gimp-2.0/libgimp/gimpgradientselect.h
 include/gimp-2.0/libgimp/gimpgradientselect_pdb.h
+include/gimp-2.0/libgimp/gimpgradientselectbutton.h
+include/gimp-2.0/libgimp/gimpgrid_pdb.h
 include/gimp-2.0/libgimp/gimpguides_pdb.h
 include/gimp-2.0/libgimp/gimphelp_pdb.h
 include/gimp-2.0/libgimp/gimpimage.h
 include/gimp-2.0/libgimp/gimpimage_pdb.h
 include/gimp-2.0/libgimp/gimpimagecombobox.h
+include/gimp-2.0/libgimp/gimpitemcombobox.h
 include/gimp-2.0/libgimp/gimplayer.h
 include/gimp-2.0/libgimp/gimplayer_pdb.h
 include/gimp-2.0/libgimp/gimpmenu.h
@@ -65,6 +74,7 @@ include/gimp-2.0/libgimp/gimppalettes.h
 include/gimp-2.0/libgimp/gimppalettes_pdb.h
 include/gimp-2.0/libgimp/gimppaletteselect.h
 include/gimp-2.0/libgimp/gimppaletteselect_pdb.h
+include/gimp-2.0/libgimp/gimppaletteselectbutton.h
 include/gimp-2.0/libgimp/gimpparasite_pdb.h
 include/gimp-2.0/libgimp/gimppaths_pdb.h
 include/gimp-2.0/libgimp/gimppattern_pdb.h
@@ -73,17 +83,21 @@ include/gimp-2.0/libgimp/gimppatterns.h
 include/gimp-2.0/libgimp/gimppatterns_pdb.h
 include/gimp-2.0/libgimp/gimppatternselect.h
 include/gimp-2.0/libgimp/gimppatternselect_pdb.h
+include/gimp-2.0/libgimp/gimppatternselectbutton.h
 include/gimp-2.0/libgimp/gimppixbuf.h
 include/gimp-2.0/libgimp/gimppixelfetcher.h
 include/gimp-2.0/libgimp/gimppixelrgn.h
 include/gimp-2.0/libgimp/gimpplugin.h
 include/gimp-2.0/libgimp/gimpplugin_pdb.h
+include/gimp-2.0/libgimp/gimpprocbrowserdialog.h
 include/gimp-2.0/libgimp/gimpproceduraldb.h
 include/gimp-2.0/libgimp/gimpproceduraldb_pdb.h
+include/gimp-2.0/libgimp/gimpprocview.h
 include/gimp-2.0/libgimp/gimpprogress.h
 include/gimp-2.0/libgimp/gimpprogress_pdb.h
 include/gimp-2.0/libgimp/gimpprogressbar.h
 include/gimp-2.0/libgimp/gimpregioniterator.h
+include/gimp-2.0/libgimp/gimpselectbutton.h
 include/gimp-2.0/libgimp/gimpselection.h
 include/gimp-2.0/libgimp/gimpselection_pdb.h
 include/gimp-2.0/libgimp/gimpselectiontools_pdb.h
@@ -95,16 +109,21 @@ include/gimp-2.0/libgimp/gimpui.h
 include/gimp-2.0/libgimp/gimpuitypes.h
 include/gimp-2.0/libgimp/gimpundo_pdb.h
 include/gimp-2.0/libgimp/gimpunit_pdb.h
+include/gimp-2.0/libgimp/gimpvectors_pdb.h
+include/gimp-2.0/libgimp/gimpzoompreview.h
 include/gimp-2.0/libgimpbase/gimpbase.h
 include/gimp-2.0/libgimpbase/gimpbaseenums.h
 include/gimp-2.0/libgimpbase/gimpbasetypes.h
 include/gimp-2.0/libgimpbase/gimpchecks.h
+include/gimp-2.0/libgimpbase/gimpcpuaccel.h
 include/gimp-2.0/libgimpbase/gimpdatafiles.h
 include/gimp-2.0/libgimpbase/gimpenv.h
 include/gimp-2.0/libgimpbase/gimplimits.h
 include/gimp-2.0/libgimpbase/gimpmemsize.h
+include/gimp-2.0/libgimpbase/gimpparam.h
 include/gimp-2.0/libgimpbase/gimpparasite.h
 include/gimp-2.0/libgimpbase/gimpparasiteio.h
+include/gimp-2.0/libgimpbase/gimprectangle.h
 include/gimp-2.0/libgimpbase/gimpsignal.h
 include/gimp-2.0/libgimpbase/gimpunit.h
 include/gimp-2.0/libgimpbase/gimputils.h
@@ -113,10 +132,25 @@ include/gimp-2.0/libgimpcolor/gimpadaptivesupersample.h
 include/gimp-2.0/libgimpcolor/gimpbilinear.h
 include/gimp-2.0/libgimpcolor/gimpcmyk.h
 include/gimp-2.0/libgimpcolor/gimpcolor.h
+include/gimp-2.0/libgimpcolor/gimpcolormanaged.h
 include/gimp-2.0/libgimpcolor/gimpcolorspace.h
 include/gimp-2.0/libgimpcolor/gimpcolortypes.h
+include/gimp-2.0/libgimpcolor/gimphsl.h
 include/gimp-2.0/libgimpcolor/gimphsv.h
 include/gimp-2.0/libgimpcolor/gimprgb.h
+include/gimp-2.0/libgimpconfig/gimpcolorconfig-enums.h
+include/gimp-2.0/libgimpconfig/gimpcolorconfig.h
+include/gimp-2.0/libgimpconfig/gimpconfig-deserialize.h
+include/gimp-2.0/libgimpconfig/gimpconfig-error.h
+include/gimp-2.0/libgimpconfig/gimpconfig-iface.h
+include/gimp-2.0/libgimpconfig/gimpconfig-params.h
+include/gimp-2.0/libgimpconfig/gimpconfig-path.h
+include/gimp-2.0/libgimpconfig/gimpconfig-serialize.h
+include/gimp-2.0/libgimpconfig/gimpconfig-utils.h
+include/gimp-2.0/libgimpconfig/gimpconfig.h
+include/gimp-2.0/libgimpconfig/gimpconfigtypes.h
+include/gimp-2.0/libgimpconfig/gimpconfigwriter.h
+include/gimp-2.0/libgimpconfig/gimpscanner.h
 include/gimp-2.0/libgimpmath/gimpmath.h
 include/gimp-2.0/libgimpmath/gimpmathtypes.h
 include/gimp-2.0/libgimpmath/gimpmatrix.h
@@ -131,6 +165,7 @@ include/gimp-2.0/libgimpthumb/gimpthumb-types.h
 include/gimp-2.0/libgimpthumb/gimpthumb-utils.h
 include/gimp-2.0/libgimpthumb/gimpthumb.h
 include/gimp-2.0/libgimpthumb/gimpthumbnail.h
+include/gimp-2.0/libgimpwidgets/gimpbrowser.h
 include/gimp-2.0/libgimpwidgets/gimpbutton.h
 include/gimp-2.0/libgimpwidgets/gimpcellrenderercolor.h
 include/gimp-2.0/libgimpwidgets/gimpcellrenderertoggle.h
@@ -141,6 +176,8 @@ include/gimp-2.0/libgimpwidgets/gimpcolordisplay.h
 include/gimp-2.0/libgimpwidgets/gimpcolordisplaystack.h
 include/gimp-2.0/libgimpwidgets/gimpcolorhexentry.h
 include/gimp-2.0/libgimpwidgets/gimpcolornotebook.h
+include/gimp-2.0/libgimpwidgets/gimpcolorprofilecombobox.h
+include/gimp-2.0/libgimpwidgets/gimpcolorprofilestore.h
 include/gimp-2.0/libgimpwidgets/gimpcolorscale.h
 include/gimp-2.0/libgimpwidgets/gimpcolorscales.h
 include/gimp-2.0/libgimpwidgets/gimpcolorselect.h
@@ -148,29 +185,78 @@ include/gimp-2.0/libgimpwidgets/gimpcolorselection.h
 include/gimp-2.0/libgimpwidgets/gimpcolorselector.h
 include/gimp-2.0/libgimpwidgets/gimpcontroller.h
 include/gimp-2.0/libgimpwidgets/gimpdialog.h
+include/gimp-2.0/libgimpwidgets/gimpenumcombobox.h
+include/gimp-2.0/libgimpwidgets/gimpenumlabel.h
+include/gimp-2.0/libgimpwidgets/gimpenumstore.h
+include/gimp-2.0/libgimpwidgets/gimpenumwidgets.h
 include/gimp-2.0/libgimpwidgets/gimpfileentry.h
 include/gimp-2.0/libgimpwidgets/gimpframe.h
 include/gimp-2.0/libgimpwidgets/gimphelpui.h
+include/gimp-2.0/libgimpwidgets/gimphintbox.h
 include/gimp-2.0/libgimpwidgets/gimpintcombobox.h
 include/gimp-2.0/libgimpwidgets/gimpintstore.h
 include/gimp-2.0/libgimpwidgets/gimpmemsizeentry.h
+include/gimp-2.0/libgimpwidgets/gimpnumberpairentry.h
 include/gimp-2.0/libgimpwidgets/gimpoffsetarea.h
 include/gimp-2.0/libgimpwidgets/gimpoldwidgets.h
+include/gimp-2.0/libgimpwidgets/gimppageselector.h
 include/gimp-2.0/libgimpwidgets/gimppatheditor.h
 include/gimp-2.0/libgimpwidgets/gimppickbutton.h
 include/gimp-2.0/libgimpwidgets/gimppixmap.h
 include/gimp-2.0/libgimpwidgets/gimppreview.h
 include/gimp-2.0/libgimpwidgets/gimppreviewarea.h
+include/gimp-2.0/libgimpwidgets/gimppropwidgets.h
 include/gimp-2.0/libgimpwidgets/gimpquerybox.h
 include/gimp-2.0/libgimpwidgets/gimpscrolledpreview.h
 include/gimp-2.0/libgimpwidgets/gimpsizeentry.h
 include/gimp-2.0/libgimpwidgets/gimpstock.h
+include/gimp-2.0/libgimpwidgets/gimpstringcombobox.h
 include/gimp-2.0/libgimpwidgets/gimpunitmenu.h
 include/gimp-2.0/libgimpwidgets/gimpwidgets.h
+include/gimp-2.0/libgimpwidgets/gimpwidgetsenums.h
 include/gimp-2.0/libgimpwidgets/gimpwidgetstypes.h
+include/gimp-2.0/libgimpwidgets/gimpzoommodel.h
+lib/libgimp-2.0.a
+lib/libgimp-2.0.la
+lib/libgimp-2.0.so
+lib/libgimp-2.0.so.0
+lib/libgimpbase-2.0.a
+lib/libgimpbase-2.0.la
+lib/libgimpbase-2.0.so
+lib/libgimpbase-2.0.so.0
+lib/libgimpcolor-2.0.a
+lib/libgimpcolor-2.0.la
+lib/libgimpcolor-2.0.so
+lib/libgimpcolor-2.0.so.0
+lib/libgimpconfig-2.0.a
+lib/libgimpconfig-2.0.la
+lib/libgimpconfig-2.0.so
+lib/libgimpconfig-2.0.so.0
+lib/libgimpmath-2.0.a
+lib/libgimpmath-2.0.la
+lib/libgimpmath-2.0.so
+lib/libgimpmath-2.0.so.0
+lib/libgimpmodule-2.0.a
+lib/libgimpmodule-2.0.la
+lib/libgimpmodule-2.0.so
+lib/libgimpmodule-2.0.so.0
+lib/libgimpthumb-2.0.a
+lib/libgimpthumb-2.0.la
+lib/libgimpthumb-2.0.so
+lib/libgimpthumb-2.0.so.0
+lib/libgimpui-2.0.a
+lib/libgimpui-2.0.la
+lib/libgimpui-2.0.so
+lib/libgimpui-2.0.so.0
+lib/libgimpwidgets-2.0.a
+lib/libgimpwidgets-2.0.la
+lib/libgimpwidgets-2.0.so
+lib/libgimpwidgets-2.0.so.0
+libdata/pkgconfig/gimp-2.0.pc
+libdata/pkgconfig/gimpthumb-2.0.pc
+libdata/pkgconfig/gimpui-2.0.pc
 libexec/gimp/2.2/environ/default.env
-%%PYTHON:%%libexec/gimp/2.2/environ/pygimp.env
-%%PYTHON:%%libexec/gimp/2.2/python/pygimp-logo.png
+libexec/gimp/2.2/interpreters/default.interp
 libexec/gimp/2.2/modules/libcdisplay_colorblind.a
 libexec/gimp/2.2/modules/libcdisplay_colorblind.la
 libexec/gimp/2.2/modules/libcdisplay_colorblind.so
@@ -180,6 +266,9 @@ libexec/gimp/2.2/modules/libcdisplay_gamma.so
 libexec/gimp/2.2/modules/libcdisplay_highcontrast.a
 libexec/gimp/2.2/modules/libcdisplay_highcontrast.la
 libexec/gimp/2.2/modules/libcdisplay_highcontrast.so
+libexec/gimp/2.2/modules/libcdisplay_lcms.a
+libexec/gimp/2.2/modules/libcdisplay_lcms.la
+libexec/gimp/2.2/modules/libcdisplay_lcms.so
 libexec/gimp/2.2/modules/libcdisplay_proof.a
 libexec/gimp/2.2/modules/libcdisplay_proof.la
 libexec/gimp/2.2/modules/libcdisplay_proof.so
@@ -205,6 +294,7 @@ libexec/gimp/2.2/plug-ins/aa
 libexec/gimp/2.2/plug-ins/align_layers
 libexec/gimp/2.2/plug-ins/animationplay
 libexec/gimp/2.2/plug-ins/animoptimize
+libexec/gimp/2.2/plug-ins/antialias
 libexec/gimp/2.2/plug-ins/apply_lens
 libexec/gimp/2.2/plug-ins/autocrop
 libexec/gimp/2.2/plug-ins/autostretch_hsv
@@ -218,10 +308,9 @@ libexec/gimp/2.2/plug-ins/cartoon
 libexec/gimp/2.2/plug-ins/ccanalyze
 libexec/gimp/2.2/plug-ins/channel_mixer
 libexec/gimp/2.2/plug-ins/checkerboard
-%%PYTHON:%%libexec/gimp/2.2/plug-ins/clothify.py
 libexec/gimp/2.2/plug-ins/color_enhance
 libexec/gimp/2.2/plug-ins/colorify
-%%PYTHON:%%libexec/gimp/2.2/plug-ins/colorxhtml.py
+libexec/gimp/2.2/plug-ins/colormap-remap
 libexec/gimp/2.2/plug-ins/colortoalpha
 libexec/gimp/2.2/plug-ins/compose
 libexec/gimp/2.2/plug-ins/compressor
@@ -232,6 +321,7 @@ libexec/gimp/2.2/plug-ins/curve_bend
 libexec/gimp/2.2/plug-ins/decompose
 libexec/gimp/2.2/plug-ins/deinterlace
 libexec/gimp/2.2/plug-ins/depthmerge
+libexec/gimp/2.2/plug-ins/desktop-link
 libexec/gimp/2.2/plug-ins/despeckle
 libexec/gimp/2.2/plug-ins/destripe
 libexec/gimp/2.2/plug-ins/dicom
@@ -247,7 +337,6 @@ libexec/gimp/2.2/plug-ins/film
 libexec/gimp/2.2/plug-ins/fits
 libexec/gimp/2.2/plug-ins/flame
 libexec/gimp/2.2/plug-ins/flarefx
-%%PYTHON:%%libexec/gimp/2.2/plug-ins/foggify.py
 libexec/gimp/2.2/plug-ins/fp
 libexec/gimp/2.2/plug-ins/fractaltrace
 libexec/gimp/2.2/plug-ins/gauss
@@ -257,22 +346,20 @@ libexec/gimp/2.2/plug-ins/gee_zoom
 libexec/gimp/2.2/plug-ins/gfig
 libexec/gimp/2.2/plug-ins/gflare
 libexec/gimp/2.2/plug-ins/gfli
-libexec/gimp/2.2/plug-ins/gif
-libexec/gimp/2.2/plug-ins/gifload
+libexec/gimp/2.2/plug-ins/gif-load
+libexec/gimp/2.2/plug-ins/gif-save
 libexec/gimp/2.2/plug-ins/gih
-%%PYTHON:%%libexec/gimp/2.2/plug-ins/gimpcons.py
 libexec/gimp/2.2/plug-ins/gimpressionist
 libexec/gimp/2.2/plug-ins/glasstile
 libexec/gimp/2.2/plug-ins/glob
 libexec/gimp/2.2/plug-ins/gqbist
 libexec/gimp/2.2/plug-ins/gradmap
 libexec/gimp/2.2/plug-ins/grid
-%%PYTHON:%%libexec/gimp/2.2/plug-ins/gtkcons.py
 libexec/gimp/2.2/plug-ins/gtm
 libexec/gimp/2.2/plug-ins/guillotine
 libexec/gimp/2.2/plug-ins/header
 libexec/gimp/2.2/plug-ins/help
-%%HELPBROWSER:%%libexec/gimp/2.2/plug-ins/helpbrowser
+%%HELPBROWSER%%libexec/gimp/2.2/plug-ins/helpbrowser
 libexec/gimp/2.2/plug-ins/hot
 libexec/gimp/2.2/plug-ins/ifscompose
 libexec/gimp/2.2/plug-ins/illusion
@@ -281,12 +368,15 @@ libexec/gimp/2.2/plug-ins/iwarp
 libexec/gimp/2.2/plug-ins/jigsaw
 libexec/gimp/2.2/plug-ins/jpeg
 libexec/gimp/2.2/plug-ins/laplace
+libexec/gimp/2.2/plug-ins/lcms
+libexec/gimp/2.2/plug-ins/lens
 libexec/gimp/2.2/plug-ins/lic
 libexec/gimp/2.2/plug-ins/mail
 libexec/gimp/2.2/plug-ins/mapcolor
 libexec/gimp/2.2/plug-ins/max_rgb
 libexec/gimp/2.2/plug-ins/maze
 libexec/gimp/2.2/plug-ins/mblur
+libexec/gimp/2.2/plug-ins/metadata
 libexec/gimp/2.2/plug-ins/mng
 libexec/gimp/2.2/plug-ins/mosaic
 libexec/gimp/2.2/plug-ins/neon
@@ -300,7 +390,6 @@ libexec/gimp/2.2/plug-ins/pagecurl
 libexec/gimp/2.2/plug-ins/papertile
 libexec/gimp/2.2/plug-ins/pat
 libexec/gimp/2.2/plug-ins/pcx
-%%PYTHON:%%libexec/gimp/2.2/plug-ins/pdbbrowse.py
 libexec/gimp/2.2/plug-ins/photocopy
 libexec/gimp/2.2/plug-ins/pix
 libexec/gimp/2.2/plug-ins/pixelize
@@ -309,15 +398,16 @@ libexec/gimp/2.2/plug-ins/plugin-browser
 libexec/gimp/2.2/plug-ins/png
 libexec/gimp/2.2/plug-ins/pnm
 libexec/gimp/2.2/plug-ins/polar
+libexec/gimp/2.2/plug-ins/poppler
 libexec/gimp/2.2/plug-ins/postscript
 libexec/gimp/2.2/plug-ins/procedure-browser
-libexec/gimp/2.2/plug-ins/psd
-libexec/gimp/2.2/plug-ins/psd_save
+libexec/gimp/2.2/plug-ins/psd-load
+libexec/gimp/2.2/plug-ins/psd-save
 libexec/gimp/2.2/plug-ins/psp
-%%PYTHON:%%libexec/gimp/2.2/plug-ins/py-slice.py
 libexec/gimp/2.2/plug-ins/randomize
 libexec/gimp/2.2/plug-ins/raw
 libexec/gimp/2.2/plug-ins/rcm
+libexec/gimp/2.2/plug-ins/redeye
 libexec/gimp/2.2/plug-ins/retinex
 libexec/gimp/2.2/plug-ins/ripple
 libexec/gimp/2.2/plug-ins/rotate
@@ -325,7 +415,6 @@ libexec/gimp/2.2/plug-ins/sample_colorize
 libexec/gimp/2.2/plug-ins/scatter_hsv
 libexec/gimp/2.2/plug-ins/screenshot
 libexec/gimp/2.2/plug-ins/script-fu
-%%PYTHON:%%libexec/gimp/2.2/plug-ins/shadow_bevel.py
 libexec/gimp/2.2/plug-ins/sel2path
 libexec/gimp/2.2/plug-ins/sel_gauss
 libexec/gimp/2.2/plug-ins/semiflatten
@@ -342,23 +431,23 @@ libexec/gimp/2.2/plug-ins/spheredesigner
 libexec/gimp/2.2/plug-ins/spread
 libexec/gimp/2.2/plug-ins/struc
 libexec/gimp/2.2/plug-ins/sunras
-%%SVG%%libexec/gimp/2.2/plug-ins/svg
+libexec/gimp/2.2/plug-ins/svg
 libexec/gimp/2.2/plug-ins/tga
 libexec/gimp/2.2/plug-ins/threshold_alpha
-libexec/gimp/2.2/plug-ins/tiff
+libexec/gimp/2.2/plug-ins/tiff-load
+libexec/gimp/2.2/plug-ins/tiff-save
 libexec/gimp/2.2/plug-ins/tile
 libexec/gimp/2.2/plug-ins/tileit
 libexec/gimp/2.2/plug-ins/tiler
 libexec/gimp/2.2/plug-ins/uniteditor
 libexec/gimp/2.2/plug-ins/unsharp
-libexec/gimp/2.2/plug-ins/url
+libexec/gimp/2.2/plug-ins/uri
 libexec/gimp/2.2/plug-ins/video
 libexec/gimp/2.2/plug-ins/vinvert
 libexec/gimp/2.2/plug-ins/vpropagate
 libexec/gimp/2.2/plug-ins/warp
 libexec/gimp/2.2/plug-ins/waves
 libexec/gimp/2.2/plug-ins/webbrowser
-%%PYTHON:%%libexec/gimp/2.2/plug-ins/whirlpinch.py
 libexec/gimp/2.2/plug-ins/whirlpinch
 libexec/gimp/2.2/plug-ins/wind
 libexec/gimp/2.2/plug-ins/winicon
@@ -368,71 +457,25 @@ libexec/gimp/2.2/plug-ins/xjt
 libexec/gimp/2.2/plug-ins/xpm
 libexec/gimp/2.2/plug-ins/xwd
 libexec/gimp/2.2/plug-ins/zealouscrop
-%%PYTHON:%%libexec/gimp/2.2/python/gimpenums.py
-%%PYTHON:%%libexec/gimp/2.2/python/gimpenums.pyc
-%%PYTHON:%%libexec/gimp/2.2/python/gimpenums.pyo
-%%PYTHON:%%libexec/gimp/2.2/python/gimpfu.py
-%%PYTHON:%%libexec/gimp/2.2/python/gimpfu.pyc
-%%PYTHON:%%libexec/gimp/2.2/python/gimpfu.pyo
-%%PYTHON:%%libexec/gimp/2.2/python/gimpmodule.a
-%%PYTHON:%%libexec/gimp/2.2/python/gimpmodule.la
-%%PYTHON:%%libexec/gimp/2.2/python/gimpmodule.so
-%%PYTHON:%%libexec/gimp/2.2/python/gimpplugin.py
-%%PYTHON:%%libexec/gimp/2.2/python/gimpplugin.pyc
-%%PYTHON:%%libexec/gimp/2.2/python/gimpplugin.pyo
-%%PYTHON:%%libexec/gimp/2.2/python/gimpprocbrowsermodule.a
-%%PYTHON:%%libexec/gimp/2.2/python/gimpprocbrowsermodule.la
-%%PYTHON:%%libexec/gimp/2.2/python/gimpprocbrowsermodule.so
-%%PYTHON:%%libexec/gimp/2.2/python/gimpshelf.py
-%%PYTHON:%%libexec/gimp/2.2/python/gimpshelf.pyc
-%%PYTHON:%%libexec/gimp/2.2/python/gimpshelf.pyo
-%%PYTHON:%%libexec/gimp/2.2/python/gimpui.py
-%%PYTHON:%%libexec/gimp/2.2/python/gimpui.pyc
-%%PYTHON:%%libexec/gimp/2.2/python/gimpui.pyo
-lib/libgimp-2.0.a
-lib/libgimp-2.0.la
-lib/libgimp-2.0.so
-lib/libgimp-2.0.so.%%SHLIBVER%%
-lib/libgimpbase-2.0.a
-lib/libgimpbase-2.0.la
-lib/libgimpbase-2.0.so
-lib/libgimpbase-2.0.so.%%SHLIBVER%%
-lib/libgimpcolor-2.0.a
-lib/libgimpcolor-2.0.la
-lib/libgimpcolor-2.0.so
-lib/libgimpcolor-2.0.so.%%SHLIBVER%%
-lib/libgimpmath-2.0.a
-lib/libgimpmath-2.0.la
-lib/libgimpmath-2.0.so
-lib/libgimpmath-2.0.so.%%SHLIBVER%%
-lib/libgimpmodule-2.0.a
-lib/libgimpmodule-2.0.la
-lib/libgimpmodule-2.0.so
-lib/libgimpmodule-2.0.so.%%SHLIBVER%%
-lib/libgimpthumb-2.0.a
-lib/libgimpthumb-2.0.la
-lib/libgimpthumb-2.0.so
-lib/libgimpthumb-2.0.so.%%SHLIBVER%%
-lib/libgimpui-2.0.a
-lib/libgimpui-2.0.la
-lib/libgimpui-2.0.so
-lib/libgimpui-2.0.so.%%SHLIBVER%%
-lib/libgimpwidgets-2.0.a
-lib/libgimpwidgets-2.0.la
-lib/libgimpwidgets-2.0.so
-lib/libgimpwidgets-2.0.so.%%SHLIBVER%%
-libdata/pkgconfig/gimp-2.0.pc
-libdata/pkgconfig/gimpthumb-2.0.pc
-libdata/pkgconfig/gimpui-2.0.pc
 share/aclocal/gimp-2.0.m4
+share/applications/gimp.desktop
 share/doc/gimp/libgimp/GimpAspectPreview.html
+share/doc/gimp/libgimp/GimpBrushSelectButton.html
 share/doc/gimp/libgimp/GimpDrawablePreview.html
+share/doc/gimp/libgimp/GimpFontSelectButton.html
+share/doc/gimp/libgimp/GimpGradientSelectButton.html
+share/doc/gimp/libgimp/GimpImageComboBox.html
+share/doc/gimp/libgimp/GimpPaletteSelectButton.html
+share/doc/gimp/libgimp/GimpPatternSelectButton.html
+share/doc/gimp/libgimp/GimpProcBrowserDialog.html
 share/doc/gimp/libgimp/GimpProgressBar.html
-share/doc/gimp/libgimp/gimpdefinitions.html
+share/doc/gimp/libgimp/GimpSelectButton.html
+share/doc/gimp/libgimp/GimpZoomPreview.html
 share/doc/gimp/libgimp/home.png
 share/doc/gimp/libgimp/index.html
 share/doc/gimp/libgimp/index.sgml
 share/doc/gimp/libgimp/left.png
+share/doc/gimp/libgimp/libgimp-GimpItemComboBox.html
 share/doc/gimp/libgimp/libgimp-data.html
 share/doc/gimp/libgimp/libgimp-general.html
 share/doc/gimp/libgimp/libgimp-gimp.html
@@ -440,13 +483,13 @@ share/doc/gimp/libgimp/libgimp-gimpbrush.html
 share/doc/gimp/libgimp/libgimp-gimpbrushes.html
 share/doc/gimp/libgimp/libgimp-gimpbrushmenu.html
 share/doc/gimp/libgimp/libgimp-gimpbrushselect.html
+share/doc/gimp/libgimp/libgimp-gimpbuffer.html
 share/doc/gimp/libgimp/libgimp-gimpchannel.html
 share/doc/gimp/libgimp/libgimp-gimpcolor.html
 share/doc/gimp/libgimp/libgimp-gimpcontext.html
 share/doc/gimp/libgimp/libgimp-gimpconvert.html
 share/doc/gimp/libgimp/libgimp-gimpdisplay.html
 share/doc/gimp/libgimp/libgimp-gimpdrawable.html
-share/doc/gimp/libgimp/libgimp-gimpdrawablecombobox.html
 share/doc/gimp/libgimp/libgimp-gimpdrawabletransform.html
 share/doc/gimp/libgimp/libgimp-gimpedit.html
 share/doc/gimp/libgimp/libgimp-gimpenums.html
@@ -461,10 +504,10 @@ share/doc/gimp/libgimp/libgimp-gimpgradient.html
 share/doc/gimp/libgimp/libgimp-gimpgradientmenu.html
 share/doc/gimp/libgimp/libgimp-gimpgradients.html
 share/doc/gimp/libgimp/libgimp-gimpgradientselect.html
+share/doc/gimp/libgimp/libgimp-gimpgrid.html
 share/doc/gimp/libgimp/libgimp-gimpguides.html
 share/doc/gimp/libgimp/libgimp-gimphelp.html
 share/doc/gimp/libgimp/libgimp-gimpimage.html
-share/doc/gimp/libgimp/libgimp-gimpimagecombobox.html
 share/doc/gimp/libgimp/libgimp-gimplayer.html
 share/doc/gimp/libgimp/libgimp-gimpmenu.html
 share/doc/gimp/libgimp/libgimp-gimpmessage.html
@@ -482,6 +525,7 @@ share/doc/gimp/libgimp/libgimp-gimppixelfetcher.html
 share/doc/gimp/libgimp/libgimp-gimppixelrgn.html
 share/doc/gimp/libgimp/libgimp-gimpplugin.html
 share/doc/gimp/libgimp/libgimp-gimpproceduraldb.html
+share/doc/gimp/libgimp/libgimp-gimpprocview.html
 share/doc/gimp/libgimp/libgimp-gimpprogress.html
 share/doc/gimp/libgimp/libgimp-gimpregioniterator.html
 share/doc/gimp/libgimp/libgimp-gimpselection.html
@@ -490,7 +534,12 @@ share/doc/gimp/libgimp/libgimp-gimptile.html
 share/doc/gimp/libgimp/libgimp-gimptools.html
 share/doc/gimp/libgimp/libgimp-gimpui.html
 share/doc/gimp/libgimp/libgimp-gimpundo.html
+share/doc/gimp/libgimp/libgimp-gimpvectors.html
 share/doc/gimp/libgimp/libgimp-image.html
+share/doc/gimp/libgimp/libgimp-index-deprecated.html
+share/doc/gimp/libgimp/libgimp-index-new-in-2-2.html
+share/doc/gimp/libgimp/libgimp-index-new-in-2-4.html
+share/doc/gimp/libgimp/libgimp-index.html
 share/doc/gimp/libgimp/libgimp-selectors.html
 share/doc/gimp/libgimp/libgimp.devhelp
 share/doc/gimp/libgimp/libgimp.devhelp2
@@ -507,18 +556,23 @@ share/doc/gimp/libgimpbase/left.png
 share/doc/gimp/libgimpbase/libgimpbase-gimpbaseenums.html
 share/doc/gimp/libgimpbase/libgimpbase-gimpbasetypes.html
 share/doc/gimp/libgimpbase/libgimpbase-gimpchecks.html
+share/doc/gimp/libgimpbase/libgimpbase-gimpcpuaccel.html
 share/doc/gimp/libgimpbase/libgimpbase-gimpdatafiles.html
 share/doc/gimp/libgimpbase/libgimpbase-gimpenv.html
 share/doc/gimp/libgimpbase/libgimpbase-gimplimits.html
 share/doc/gimp/libgimpbase/libgimpbase-gimpmemsize.html
+share/doc/gimp/libgimpbase/libgimpbase-gimpparam.html
 share/doc/gimp/libgimpbase/libgimpbase-gimpparasite.html
 share/doc/gimp/libgimpbase/libgimpbase-gimpparasiteio.html
-share/doc/gimp/libgimpbase/libgimpbase-gimpprotocol.html
+share/doc/gimp/libgimpbase/libgimpbase-gimprectangle.html
 share/doc/gimp/libgimpbase/libgimpbase-gimpsignal.html
 share/doc/gimp/libgimpbase/libgimpbase-gimpunit.html
 share/doc/gimp/libgimpbase/libgimpbase-gimputils.html
 share/doc/gimp/libgimpbase/libgimpbase-gimpversion.html
-share/doc/gimp/libgimpbase/libgimpbase-gimpwire.html
+share/doc/gimp/libgimpbase/libgimpbase-index-deprecated.html
+share/doc/gimp/libgimpbase/libgimpbase-index-new-in-2-2.html
+share/doc/gimp/libgimpbase/libgimpbase-index-new-in-2-4.html
+share/doc/gimp/libgimpbase/libgimpbase-index.html
 share/doc/gimp/libgimpbase/libgimpbase.devhelp
 share/doc/gimp/libgimpbase/libgimpbase.devhelp2
 share/doc/gimp/libgimpbase/libgimpbase.html
@@ -529,31 +583,64 @@ share/doc/gimp/libgimpcolor/home.png
 share/doc/gimp/libgimpcolor/index.html
 share/doc/gimp/libgimpcolor/index.sgml
 share/doc/gimp/libgimpcolor/left.png
-share/doc/gimp/libgimpcolor/style.css
 share/doc/gimp/libgimpcolor/libgimpcolor-GimpAdaptiveSupersample.html
 share/doc/gimp/libgimpcolor/libgimpcolor-GimpBilinear.html
 share/doc/gimp/libgimpcolor/libgimpcolor-GimpCMYK.html
+share/doc/gimp/libgimpcolor/libgimpcolor-GimpColorManaged.html
 share/doc/gimp/libgimpcolor/libgimpcolor-GimpColorSpace.html
 share/doc/gimp/libgimpcolor/libgimpcolor-GimpHSV.html
 share/doc/gimp/libgimpcolor/libgimpcolor-GimpRGB.html
+share/doc/gimp/libgimpcolor/libgimpcolor-index-deprecated.html
+share/doc/gimp/libgimpcolor/libgimpcolor-index-new-in-2-2.html
+share/doc/gimp/libgimpcolor/libgimpcolor-index-new-in-2-4.html
+share/doc/gimp/libgimpcolor/libgimpcolor-index.html
 share/doc/gimp/libgimpcolor/libgimpcolor.devhelp
 share/doc/gimp/libgimpcolor/libgimpcolor.devhelp2
 share/doc/gimp/libgimpcolor/libgimpcolor.html
 share/doc/gimp/libgimpcolor/right.png
+share/doc/gimp/libgimpcolor/style.css
 share/doc/gimp/libgimpcolor/up.png
+share/doc/gimp/libgimpconfig/GimpColorConfig.html
+share/doc/gimp/libgimpconfig/home.png
+share/doc/gimp/libgimpconfig/index.html
+share/doc/gimp/libgimpconfig/index.sgml
+share/doc/gimp/libgimpconfig/left.png
+share/doc/gimp/libgimpconfig/libgimpconfig-GimpConfig.html
+share/doc/gimp/libgimpconfig/libgimpconfig-GimpConfigError.html
+share/doc/gimp/libgimpconfig/libgimpconfig-GimpConfigWriter.html
+share/doc/gimp/libgimpconfig/libgimpconfig-GimpScanner.html
+share/doc/gimp/libgimpconfig/libgimpconfig-gimpconfig-deserialize.html
+share/doc/gimp/libgimpconfig/libgimpconfig-gimpconfig-params.html
+share/doc/gimp/libgimpconfig/libgimpconfig-gimpconfig-path.html
+share/doc/gimp/libgimpconfig/libgimpconfig-gimpconfig-serialize.html
+share/doc/gimp/libgimpconfig/libgimpconfig-gimpconfig-utils.html
+share/doc/gimp/libgimpconfig/libgimpconfig-hierarchy.html
+share/doc/gimp/libgimpconfig/libgimpconfig-index-deprecated.html
+share/doc/gimp/libgimpconfig/libgimpconfig-index-new-in-2-4.html
+share/doc/gimp/libgimpconfig/libgimpconfig-index.html
+share/doc/gimp/libgimpconfig/libgimpconfig.devhelp
+share/doc/gimp/libgimpconfig/libgimpconfig.devhelp2
+share/doc/gimp/libgimpconfig/libgimpconfig.html
+share/doc/gimp/libgimpconfig/right.png
+share/doc/gimp/libgimpconfig/style.css
+share/doc/gimp/libgimpconfig/up.png
 share/doc/gimp/libgimpmath/home.png
 share/doc/gimp/libgimpmath/index.html
 share/doc/gimp/libgimpmath/index.sgml
 share/doc/gimp/libgimpmath/left.png
-share/doc/gimp/libgimpmath/style.css
 share/doc/gimp/libgimpmath/libgimpmath-GimpMD5.html
 share/doc/gimp/libgimpmath/libgimpmath-GimpMath.html
 share/doc/gimp/libgimpmath/libgimpmath-GimpMatrix.html
 share/doc/gimp/libgimpmath/libgimpmath-GimpVector.html
+share/doc/gimp/libgimpmath/libgimpmath-index-deprecated.html
+share/doc/gimp/libgimpmath/libgimpmath-index-new-in-2-2.html
+share/doc/gimp/libgimpmath/libgimpmath-index-new-in-2-4.html
+share/doc/gimp/libgimpmath/libgimpmath-index.html
 share/doc/gimp/libgimpmath/libgimpmath.devhelp
 share/doc/gimp/libgimpmath/libgimpmath.devhelp2
 share/doc/gimp/libgimpmath/libgimpmath.html
 share/doc/gimp/libgimpmath/right.png
+share/doc/gimp/libgimpmath/style.css
 share/doc/gimp/libgimpmath/up.png
 share/doc/gimp/libgimpmodule/GimpModule.html
 share/doc/gimp/libgimpmodule/GimpModuleDB.html
@@ -561,11 +648,15 @@ share/doc/gimp/libgimpmodule/home.png
 share/doc/gimp/libgimpmodule/index.html
 share/doc/gimp/libgimpmodule/index.sgml
 share/doc/gimp/libgimpmodule/left.png
-share/doc/gimp/libgimpmodule/style.css
+share/doc/gimp/libgimpmodule/libgimpmodule-index-deprecated.html
+share/doc/gimp/libgimpmodule/libgimpmodule-index-new-in-2-2.html
+share/doc/gimp/libgimpmodule/libgimpmodule-index-new-in-2-4.html
+share/doc/gimp/libgimpmodule/libgimpmodule-index.html
 share/doc/gimp/libgimpmodule/libgimpmodule.devhelp
 share/doc/gimp/libgimpmodule/libgimpmodule.devhelp2
 share/doc/gimp/libgimpmodule/libgimpmodule.html
 share/doc/gimp/libgimpmodule/right.png
+share/doc/gimp/libgimpmodule/style.css
 share/doc/gimp/libgimpmodule/up.png
 share/doc/gimp/libgimpthumb/GimpThumbnail.html
 share/doc/gimp/libgimpthumb/home.png
@@ -575,12 +666,17 @@ share/doc/gimp/libgimpthumb/left.png
 share/doc/gimp/libgimpthumb/libgimpthumb-gimpthumb-enums.html
 share/doc/gimp/libgimpthumb/libgimpthumb-gimpthumb-error.html
 share/doc/gimp/libgimpthumb/libgimpthumb-gimpthumb-utils.html
+share/doc/gimp/libgimpthumb/libgimpthumb-index-deprecated.html
+share/doc/gimp/libgimpthumb/libgimpthumb-index-new-in-2-2.html
+share/doc/gimp/libgimpthumb/libgimpthumb-index-new-in-2-4.html
+share/doc/gimp/libgimpthumb/libgimpthumb-index.html
 share/doc/gimp/libgimpthumb/libgimpthumb.devhelp
 share/doc/gimp/libgimpthumb/libgimpthumb.devhelp2
 share/doc/gimp/libgimpthumb/libgimpthumb.html
 share/doc/gimp/libgimpthumb/right.png
 share/doc/gimp/libgimpthumb/style.css
 share/doc/gimp/libgimpthumb/up.png
+share/doc/gimp/libgimpwidgets/GimpBrowser.html
 share/doc/gimp/libgimpwidgets/GimpButton.html
 share/doc/gimp/libgimpwidgets/GimpCellRendererColor.html
 share/doc/gimp/libgimpwidgets/GimpCellRendererToggle.html
@@ -591,6 +687,8 @@ share/doc/gimp/libgimpwidgets/GimpColorDisplay.html
 share/doc/gimp/libgimpwidgets/GimpColorDisplayStack.html
 share/doc/gimp/libgimpwidgets/GimpColorHexEntry.html
 share/doc/gimp/libgimpwidgets/GimpColorNotebook.html
+share/doc/gimp/libgimpwidgets/GimpColorProfileComboBox.html
+share/doc/gimp/libgimpwidgets/GimpColorProfileStore.html
 share/doc/gimp/libgimpwidgets/GimpColorScale.html
 share/doc/gimp/libgimpwidgets/GimpColorScales.html
 share/doc/gimp/libgimpwidgets/GimpColorSelect.html
@@ -598,26 +696,61 @@ share/doc/gimp/libgimpwidgets/GimpColorSelection.html
 share/doc/gimp/libgimpwidgets/GimpColorSelector.html
 share/doc/gimp/libgimpwidgets/GimpController.html
 share/doc/gimp/libgimpwidgets/GimpDialog.html
+share/doc/gimp/libgimpwidgets/GimpEnumComboBox.html
+share/doc/gimp/libgimpwidgets/GimpEnumLabel.html
+share/doc/gimp/libgimpwidgets/GimpEnumStore.html
 share/doc/gimp/libgimpwidgets/GimpFileEntry.html
 share/doc/gimp/libgimpwidgets/GimpFrame.html
 share/doc/gimp/libgimpwidgets/GimpIntComboBox.html
 share/doc/gimp/libgimpwidgets/GimpIntStore.html
 share/doc/gimp/libgimpwidgets/GimpMemsizeEntry.html
+share/doc/gimp/libgimpwidgets/GimpNumberPairEntry.html
 share/doc/gimp/libgimpwidgets/GimpOffsetArea.html
+share/doc/gimp/libgimpwidgets/GimpPageSelector.html
 share/doc/gimp/libgimpwidgets/GimpPathEditor.html
 share/doc/gimp/libgimpwidgets/GimpPickButton.html
 share/doc/gimp/libgimpwidgets/GimpPixmap.html
 share/doc/gimp/libgimpwidgets/GimpPreview.html
 share/doc/gimp/libgimpwidgets/GimpPreviewArea.html
+share/doc/gimp/libgimpwidgets/GimpScrolledPreview.html
 share/doc/gimp/libgimpwidgets/GimpSizeEntry.html
+share/doc/gimp/libgimpwidgets/GimpStringComboBox.html
 share/doc/gimp/libgimpwidgets/GimpUnitMenu.html
+share/doc/gimp/libgimpwidgets/GimpZoomModel.html
+share/doc/gimp/libgimpwidgets/gimp-browser.png
+share/doc/gimp/libgimpwidgets/gimp-button.png
+share/doc/gimp/libgimpwidgets/gimp-chain-button.png
+share/doc/gimp/libgimpwidgets/gimp-color-area.png
+share/doc/gimp/libgimpwidgets/gimp-color-button.png
+share/doc/gimp/libgimpwidgets/gimp-color-hex-entry.png
+share/doc/gimp/libgimpwidgets/gimp-color-profile-combo-box.png
+share/doc/gimp/libgimpwidgets/gimp-color-scale.png
+share/doc/gimp/libgimpwidgets/gimp-color-selection.png
+share/doc/gimp/libgimpwidgets/gimp-dialog.png
+share/doc/gimp/libgimpwidgets/gimp-enum-combo-box.png
+share/doc/gimp/libgimpwidgets/gimp-enum-label.png
+share/doc/gimp/libgimpwidgets/gimp-file-entry.png
+share/doc/gimp/libgimpwidgets/gimp-frame.png
+share/doc/gimp/libgimpwidgets/gimp-hint-box.png
+share/doc/gimp/libgimpwidgets/gimp-int-combo-box.png
+share/doc/gimp/libgimpwidgets/gimp-memsize-entry.png
+share/doc/gimp/libgimpwidgets/gimp-number-pair-entry.png
+share/doc/gimp/libgimpwidgets/gimp-offset-area.png
+share/doc/gimp/libgimpwidgets/gimp-page-selector.png
+share/doc/gimp/libgimpwidgets/gimp-path-editor.png
+share/doc/gimp/libgimpwidgets/gimp-pick-button.png
+share/doc/gimp/libgimpwidgets/gimp-preview-area.png
+share/doc/gimp/libgimpwidgets/gimp-string-combo-box.png
+share/doc/gimp/libgimpwidgets/gimp-unit-menu.png
 share/doc/gimp/libgimpwidgets/home.png
 share/doc/gimp/libgimpwidgets/index.html
 share/doc/gimp/libgimpwidgets/index.sgml
 share/doc/gimp/libgimpwidgets/left.png
+share/doc/gimp/libgimpwidgets/libgimpwidgets-GimpEnumWidgets.html
 share/doc/gimp/libgimpwidgets/libgimpwidgets-GimpHelpUI.html
+share/doc/gimp/libgimpwidgets/libgimpwidgets-GimpHintBox.html
+share/doc/gimp/libgimpwidgets/libgimpwidgets-GimpPropWidgets.html
 share/doc/gimp/libgimpwidgets/libgimpwidgets-GimpQueryBox.html
-share/doc/gimp/libgimpwidgets/libgimpwidgets-GimpScrolledPreview.html
 share/doc/gimp/libgimpwidgets/libgimpwidgets-GimpStock.html
 share/doc/gimp/libgimpwidgets/libgimpwidgets-GimpWidgets.html
 share/doc/gimp/libgimpwidgets/libgimpwidgets-cell-renderers.html
@@ -625,8 +758,13 @@ share/doc/gimp/libgimpwidgets/libgimpwidgets-colordisplay.html
 share/doc/gimp/libgimpwidgets/libgimpwidgets-colorselector.html
 share/doc/gimp/libgimpwidgets/libgimpwidgets-controller.html
 share/doc/gimp/libgimpwidgets/libgimpwidgets-deprecated.html
+share/doc/gimp/libgimpwidgets/libgimpwidgets-gallery.html
 share/doc/gimp/libgimpwidgets/libgimpwidgets-gimpoldwidgets.html
 share/doc/gimp/libgimpwidgets/libgimpwidgets-hierarchy.html
+share/doc/gimp/libgimpwidgets/libgimpwidgets-index-deprecated.html
+share/doc/gimp/libgimpwidgets/libgimpwidgets-index-new-in-2-2.html
+share/doc/gimp/libgimpwidgets/libgimpwidgets-index-new-in-2-4.html
+share/doc/gimp/libgimpwidgets/libgimpwidgets-index.html
 share/doc/gimp/libgimpwidgets/libgimpwidgets-utils.html
 share/doc/gimp/libgimpwidgets/libgimpwidgets-widgets.html
 share/doc/gimp/libgimpwidgets/libgimpwidgets.devhelp
@@ -675,9 +813,23 @@ share/doc/gimp/libgimpwidgets/stock-color-picker-black-18.png
 share/doc/gimp/libgimpwidgets/stock-color-picker-gray-18.png
 share/doc/gimp/libgimpwidgets/stock-color-picker-white-18.png
 share/doc/gimp/libgimpwidgets/stock-color-triangle-16.png
+share/doc/gimp/libgimpwidgets/stock-colormap-16.png
+share/doc/gimp/libgimpwidgets/stock-colormap-24.png
+share/doc/gimp/libgimpwidgets/stock-controller-16.png
+share/doc/gimp/libgimpwidgets/stock-controller-24.png
+share/doc/gimp/libgimpwidgets/stock-controller-keyboard-16.png
+share/doc/gimp/libgimpwidgets/stock-controller-keyboard-24.png
+share/doc/gimp/libgimpwidgets/stock-controller-linux-input-16.png
+share/doc/gimp/libgimpwidgets/stock-controller-linux-input-24.png
+share/doc/gimp/libgimpwidgets/stock-controller-midi-16.png
+share/doc/gimp/libgimpwidgets/stock-controller-midi-24.png
+share/doc/gimp/libgimpwidgets/stock-controller-wheel-16.png
+share/doc/gimp/libgimpwidgets/stock-controller-wheel-24.png
 share/doc/gimp/libgimpwidgets/stock-convert-grayscale-16.png
 share/doc/gimp/libgimpwidgets/stock-convert-indexed-16.png
 share/doc/gimp/libgimpwidgets/stock-convert-rgb-16.png
+share/doc/gimp/libgimpwidgets/stock-cursor-16.png
+share/doc/gimp/libgimpwidgets/stock-cursor-24.png
 share/doc/gimp/libgimpwidgets/stock-curve-free-16.png
 share/doc/gimp/libgimpwidgets/stock-curve-smooth-16.png
 share/doc/gimp/libgimpwidgets/stock-default-colors-12.png
@@ -685,6 +837,16 @@ share/doc/gimp/libgimpwidgets/stock-device-status-16.png
 share/doc/gimp/libgimpwidgets/stock-device-status-24.png
 share/doc/gimp/libgimpwidgets/stock-display-filter-16.png
 share/doc/gimp/libgimpwidgets/stock-display-filter-24.png
+share/doc/gimp/libgimpwidgets/stock-display-filter-colorblind-16.png
+share/doc/gimp/libgimpwidgets/stock-display-filter-colorblind-24.png
+share/doc/gimp/libgimpwidgets/stock-display-filter-contrast-16.png
+share/doc/gimp/libgimpwidgets/stock-display-filter-contrast-24.png
+share/doc/gimp/libgimpwidgets/stock-display-filter-gamma-16.png
+share/doc/gimp/libgimpwidgets/stock-display-filter-gamma-24.png
+share/doc/gimp/libgimpwidgets/stock-display-filter-lcms-16.png
+share/doc/gimp/libgimpwidgets/stock-display-filter-lcms-24.png
+share/doc/gimp/libgimpwidgets/stock-display-filter-proof-16.png
+share/doc/gimp/libgimpwidgets/stock-display-filter-proof-24.png
 share/doc/gimp/libgimpwidgets/stock-duplicate-16.png
 share/doc/gimp/libgimpwidgets/stock-edit-16.png
 share/doc/gimp/libgimpwidgets/stock-error-64.png
@@ -717,6 +879,7 @@ share/doc/gimp/libgimpwidgets/stock-gravity-south-east-24.png
 share/doc/gimp/libgimpwidgets/stock-gravity-south-west-24.png
 share/doc/gimp/libgimpwidgets/stock-gravity-west-24.png
 share/doc/gimp/libgimpwidgets/stock-grid-16.png
+share/doc/gimp/libgimpwidgets/stock-hcenter-24.png
 share/doc/gimp/libgimpwidgets/stock-hchain-24.png
 share/doc/gimp/libgimpwidgets/stock-hchain-broken-24.png
 share/doc/gimp/libgimpwidgets/stock-histogram-16.png
@@ -729,8 +892,6 @@ share/doc/gimp/libgimpwidgets/stock-image-32.png
 share/doc/gimp/libgimpwidgets/stock-image-48.png
 share/doc/gimp/libgimpwidgets/stock-images-16.png
 share/doc/gimp/libgimpwidgets/stock-images-24.png
-share/doc/gimp/libgimpwidgets/stock-indexed-palette-16.png
-share/doc/gimp/libgimpwidgets/stock-indexed-palette-24.png
 share/doc/gimp/libgimpwidgets/stock-info-16.png
 share/doc/gimp/libgimpwidgets/stock-info-24.png
 share/doc/gimp/libgimpwidgets/stock-info-64.png
@@ -739,6 +900,7 @@ share/doc/gimp/libgimpwidgets/stock-join-bevel-16.png
 share/doc/gimp/libgimpwidgets/stock-join-miter-16.png
 share/doc/gimp/libgimpwidgets/stock-join-round-16.png
 share/doc/gimp/libgimpwidgets/stock-landscape-16.png
+share/doc/gimp/libgimpwidgets/stock-landscape-22.png
 share/doc/gimp/libgimpwidgets/stock-layer-16.png
 share/doc/gimp/libgimpwidgets/stock-layer-24.png
 share/doc/gimp/libgimpwidgets/stock-layer-32.png
@@ -770,17 +932,20 @@ share/doc/gimp/libgimpwidgets/stock-paths-16.png
 share/doc/gimp/libgimpwidgets/stock-paths-22.png
 share/doc/gimp/libgimpwidgets/stock-plugin-16.png
 share/doc/gimp/libgimpwidgets/stock-portrait-16.png
+share/doc/gimp/libgimpwidgets/stock-portrait-22.png
 share/doc/gimp/libgimpwidgets/stock-print-resolution-16.png
 share/doc/gimp/libgimpwidgets/stock-print-resolution-24.png
-share/doc/gimp/libgimpwidgets/stock-qmask-off-16.png
-share/doc/gimp/libgimpwidgets/stock-qmask-on-16.png
 share/doc/gimp/libgimpwidgets/stock-question-64.png
+share/doc/gimp/libgimpwidgets/stock-quick-mask-off-12.png
+share/doc/gimp/libgimpwidgets/stock-quick-mask-on-12.png
 share/doc/gimp/libgimpwidgets/stock-reset-16.png
 share/doc/gimp/libgimpwidgets/stock-reshow-filter-16.png
 share/doc/gimp/libgimpwidgets/stock-resize-16.png
 share/doc/gimp/libgimpwidgets/stock-rotate-180-16.png
 share/doc/gimp/libgimpwidgets/stock-rotate-270-16.png
 share/doc/gimp/libgimpwidgets/stock-rotate-90-16.png
+share/doc/gimp/libgimpwidgets/stock-sample-point-16.png
+share/doc/gimp/libgimpwidgets/stock-sample-point-24.png
 share/doc/gimp/libgimpwidgets/stock-scale-16.png
 share/doc/gimp/libgimpwidgets/stock-selection-16.png
 share/doc/gimp/libgimpwidgets/stock-selection-add-16.png
@@ -812,6 +977,8 @@ share/doc/gimp/libgimpwidgets/stock-toilet-paper-16.png
 share/doc/gimp/libgimpwidgets/stock-toilet-paper-24.png
 share/doc/gimp/libgimpwidgets/stock-tool-airbrush-16.png
 share/doc/gimp/libgimpwidgets/stock-tool-airbrush-22.png
+share/doc/gimp/libgimpwidgets/stock-tool-align-16.png
+share/doc/gimp/libgimpwidgets/stock-tool-align-22.png
 share/doc/gimp/libgimpwidgets/stock-tool-blend-16.png
 share/doc/gimp/libgimpwidgets/stock-tool-blend-22.png
 share/doc/gimp/libgimpwidgets/stock-tool-blur-16.png
@@ -842,10 +1009,14 @@ share/doc/gimp/libgimpwidgets/stock-tool-eraser-16.png
 share/doc/gimp/libgimpwidgets/stock-tool-eraser-22.png
 share/doc/gimp/libgimpwidgets/stock-tool-flip-16.png
 share/doc/gimp/libgimpwidgets/stock-tool-flip-22.png
+share/doc/gimp/libgimpwidgets/stock-tool-foreground-select-16.png
+share/doc/gimp/libgimpwidgets/stock-tool-foreground-select-22.png
 share/doc/gimp/libgimpwidgets/stock-tool-free-select-16.png
 share/doc/gimp/libgimpwidgets/stock-tool-free-select-22.png
 share/doc/gimp/libgimpwidgets/stock-tool-fuzzy-select-16.png
 share/doc/gimp/libgimpwidgets/stock-tool-fuzzy-select-22.png
+share/doc/gimp/libgimpwidgets/stock-tool-heal-16.png
+share/doc/gimp/libgimpwidgets/stock-tool-heal-22.png
 share/doc/gimp/libgimpwidgets/stock-tool-hue-saturation-16.png
 share/doc/gimp/libgimpwidgets/stock-tool-hue-saturation-22.png
 share/doc/gimp/libgimpwidgets/stock-tool-ink-16.png
@@ -868,6 +1039,8 @@ share/doc/gimp/libgimpwidgets/stock-tool-pencil-16.png
 share/doc/gimp/libgimpwidgets/stock-tool-pencil-22.png
 share/doc/gimp/libgimpwidgets/stock-tool-perspective-16.png
 share/doc/gimp/libgimpwidgets/stock-tool-perspective-22.png
+share/doc/gimp/libgimpwidgets/stock-tool-perspective-clone-16.png
+share/doc/gimp/libgimpwidgets/stock-tool-perspective-clone-22.png
 share/doc/gimp/libgimpwidgets/stock-tool-posterize-16.png
 share/doc/gimp/libgimpwidgets/stock-tool-posterize-22.png
 share/doc/gimp/libgimpwidgets/stock-tool-rect-select-16.png
@@ -892,6 +1065,7 @@ share/doc/gimp/libgimpwidgets/stock-transparency-16.png
 share/doc/gimp/libgimpwidgets/stock-transparency-24.png
 share/doc/gimp/libgimpwidgets/stock-undo-history-16.png
 share/doc/gimp/libgimpwidgets/stock-undo-history-24.png
+share/doc/gimp/libgimpwidgets/stock-vcenter-24.png
 share/doc/gimp/libgimpwidgets/stock-vchain-24.png
 share/doc/gimp/libgimpwidgets/stock-vchain-broken-24.png
 share/doc/gimp/libgimpwidgets/stock-video-16.png
@@ -902,7 +1076,7 @@ share/doc/gimp/libgimpwidgets/stock-warning-64.png
 share/doc/gimp/libgimpwidgets/stock-web-16.png
 share/doc/gimp/libgimpwidgets/stock-web-24.png
 share/doc/gimp/libgimpwidgets/stock-wilber-16.png
-share/doc/gimp/libgimpwidgets/stock-wilber-32.png
+share/doc/gimp/libgimpwidgets/stock-wilber-22.png
 share/doc/gimp/libgimpwidgets/stock-wilber-48.png
 share/doc/gimp/libgimpwidgets/stock-wilber-64.png
 share/doc/gimp/libgimpwidgets/stock-wilber-eek-64.png
@@ -911,39 +1085,39 @@ share/doc/gimp/libgimpwidgets/style.css
 share/doc/gimp/libgimpwidgets/up.png
 share/gimp/brushes/10x10square.gbr
 share/gimp/brushes/10x10squareBlur.gbr
-share/gimp/brushes/11circle.gbr
-share/gimp/brushes/11fcircle.gbr
-share/gimp/brushes/13circle.gbr
-share/gimp/brushes/13fcircle.gbr
-share/gimp/brushes/15circle.gbr
-share/gimp/brushes/15fcircle.gbr
-share/gimp/brushes/17circle.gbr
-share/gimp/brushes/17fcircle.gbr
-share/gimp/brushes/19circle.gbr
-share/gimp/brushes/19fcircle.gbr
-share/gimp/brushes/1circle.gbr
 share/gimp/brushes/20x20square.gbr
 share/gimp/brushes/20x20squareBlur.gbr
-share/gimp/brushes/3circle.gbr
-share/gimp/brushes/3fcircle.gbr
-share/gimp/brushes/5circle.gbr
-share/gimp/brushes/5fcircle.gbr
 share/gimp/brushes/5x5square.gbr
 share/gimp/brushes/5x5squareBlur.gbr
-share/gimp/brushes/7circle.gbr
-share/gimp/brushes/7fcircle.gbr
-share/gimp/brushes/9circle.gbr
-share/gimp/brushes/9fcircle.gbr
-share/gimp/brushes/DStar11.gbr
-share/gimp/brushes/DStar17.gbr
-share/gimp/brushes/DStar25.gbr
+share/gimp/brushes/Calligraphic-Brush-0.vbr
+share/gimp/brushes/Calligraphic-Brush-1.vbr
+share/gimp/brushes/Calligraphic-Brush-2.vbr
+share/gimp/brushes/Calligraphic-Brush-3.vbr
+share/gimp/brushes/Circle-1.vbr
+share/gimp/brushes/Circle-3.vbr
+share/gimp/brushes/Circle-5.vbr
+share/gimp/brushes/Circle-7.vbr
+share/gimp/brushes/Circle-9.vbr
+share/gimp/brushes/Circle-11.vbr
+share/gimp/brushes/Circle-13.vbr
+share/gimp/brushes/Circle-15.vbr
+share/gimp/brushes/Circle-17.vbr
+share/gimp/brushes/Circle-19.vbr
+share/gimp/brushes/Circle-Fuzzy-3.vbr
+share/gimp/brushes/Circle-Fuzzy-5.vbr
+share/gimp/brushes/Circle-Fuzzy-7.vbr
+share/gimp/brushes/Circle-Fuzzy-9.vbr
+share/gimp/brushes/Circle-Fuzzy-11.vbr
+share/gimp/brushes/Circle-Fuzzy-13.vbr
+share/gimp/brushes/Circle-Fuzzy-15.vbr
+share/gimp/brushes/Circle-Fuzzy-17.vbr
+share/gimp/brushes/Circle-Fuzzy-19.vbr
+share/gimp/brushes/Diagonal-Star-11.vbr
+share/gimp/brushes/Diagonal-Star-17.vbr
+share/gimp/brushes/Diagonal-Star-25.vbr
 share/gimp/brushes/SketchBrush-16.gih
 share/gimp/brushes/SketchBrush-32.gih
 share/gimp/brushes/SketchBrush-64.gih
-share/gimp/brushes/callig1.gbr
-share/gimp/brushes/callig2.gbr
-share/gimp/brushes/callig3.gbr
-share/gimp/brushes/callig4.gbr
 share/gimp/brushes/confetti.gbr
 share/gimp/brushes/confetti.gih
 share/gimp/brushes/dunes.gbr
@@ -954,9 +1128,7 @@ share/gimp/brushes/galaxy_small.gbr
 share/gimp/brushes/hsparks.gih
 share/gimp/brushes/pepper.gbr
 share/gimp/brushes/pixel.gbr
-share/gimp/brushes/thegimp.gbr
 share/gimp/brushes/vine.gih
-share/gimp/brushes/xcf.gbr
 @exec mkdir -p %D/share/gimp/fonts
 share/gimp/fractalexplorer/Asteroid_Field
 share/gimp/fractalexplorer/Bar_Code_Label
@@ -1180,16 +1352,14 @@ share/gimp/gradients/Wood_1.ggr
 share/gimp/gradients/Wood_2.ggr
 share/gimp/gradients/Yellow_Contrast.ggr
 share/gimp/gradients/Yellow_Orange.ggr
-share/gimp/images/gimp-splash.png
 share/gimp/images/gimp-logo.png
-share/gimp/images/wilber-devel-icon.png
-share/gimp/images/wilber-icon.png
-share/gimp/images/wilber-tips.png
-share/gimp/images/wilber-wizard.png
+share/gimp/images/gimp-splash.png
+share/gimp/menus/brush-editor-menu.xml
 share/gimp/menus/brushes-menu.xml
 share/gimp/menus/buffers-menu.xml
 share/gimp/menus/channels-menu.xml
-share/gimp/menus/colormap-editor-menu.xml
+share/gimp/menus/colormap-menu.xml
+share/gimp/menus/cursor-info-menu.xml
 share/gimp/menus/dockable-menu.xml
 share/gimp/menus/documents-menu.xml
 share/gimp/menus/error-console-menu.xml
@@ -1202,21 +1372,16 @@ share/gimp/menus/layers-menu.xml
 share/gimp/menus/palette-editor-menu.xml
 share/gimp/menus/palettes-menu.xml
 share/gimp/menus/patterns-menu.xml
-share/gimp/menus/qmask-menu.xml
-share/gimp/menus/selection-editor-menu.xml
+share/gimp/menus/quick-mask-menu.xml
+share/gimp/menus/sample-points-menu.xml
+share/gimp/menus/selection-menu.xml
 share/gimp/menus/templates-menu.xml
 share/gimp/menus/text-editor-toolbar.xml
 share/gimp/menus/tool-options-menu.xml
 share/gimp/menus/toolbox-menu.xml
 share/gimp/menus/tools-menu.xml
+share/gimp/menus/undo-menu.xml
 share/gimp/menus/vectors-menu.xml
-share/gimp/misc/gimp.applications
-share/gimp/misc/gimp.desktop
-share/gimp/misc/gimp.keys
-%%GNOMEPANEL:%%share/gnome/application-registry/gimp-2.2.applications
-%%GNOMEPANEL:%%share/gnome/applications/gimp-2.2.desktop
-%%GNOMEPANEL:%%@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
-%%GNOMEPANEL:%%share/gnome/mime-info/gimp-2.2.keys
 share/gimp/palettes/Bears.gpl
 share/gimp/palettes/Bgold.gpl
 share/gimp/palettes/Blues.gpl
@@ -1250,6 +1415,7 @@ share/gimp/palettes/Plasma.gpl
 share/gimp/palettes/Reds.gpl
 share/gimp/palettes/Reds_And_Purples.gpl
 share/gimp/palettes/Royal.gpl
+share/gimp/palettes/Tango.gpl
 share/gimp/palettes/Topographic.gpl
 share/gimp/palettes/Visibone.gpl
 share/gimp/palettes/Visibone_2.gpl
@@ -1350,10 +1516,10 @@ share/gimp/scripts/comic-logo.scm
 share/gimp/scripts/coolmetal-logo.scm
 share/gimp/scripts/copy-visible.scm
 share/gimp/scripts/crystal-logo.scm
+share/gimp/scripts/difference-clouds.scm
 share/gimp/scripts/distress-selection.scm
 share/gimp/scripts/drop-shadow.scm
 share/gimp/scripts/erase-rows.scm
-share/gimp/scripts/fade-outline.scm
 share/gimp/scripts/flatland.scm
 share/gimp/scripts/font-map.scm
 share/gimp/scripts/frosty-logo.scm
@@ -1371,7 +1537,6 @@ share/gimp/scripts/guides-new.scm
 share/gimp/scripts/guides-remove-all.scm
 share/gimp/scripts/hsv-graph.scm
 share/gimp/scripts/i26-gunya2.scm
-share/gimp/scripts/image-structure.scm
 share/gimp/scripts/images/beavis.jpg
 share/gimp/scripts/images/texture.jpg
 share/gimp/scripts/images/texture1.jpg
@@ -1384,13 +1549,19 @@ share/gimp/scripts/mkbrush.scm
 share/gimp/scripts/neon-logo.scm
 share/gimp/scripts/news-text.scm
 share/gimp/scripts/old-photo.scm
+share/gimp/scripts/paste-as-brush.scm
+share/gimp/scripts/paste-as-pattern.scm
 share/gimp/scripts/perspective-shadow.scm
 share/gimp/scripts/predator.scm
 share/gimp/scripts/pupi-button.scm
 share/gimp/scripts/rendermap.scm
+share/gimp/scripts/reverse-layers.scm
 share/gimp/scripts/ripply-anim.scm
 share/gimp/scripts/round-corners.scm
+share/gimp/scripts/script-fu-compat.init
+share/gimp/scripts/script-fu-set-cmap.scm
 share/gimp/scripts/script-fu-util.scm
+share/gimp/scripts/script-fu.init
 share/gimp/scripts/select-to-brush.scm
 share/gimp/scripts/select-to-image.scm
 share/gimp/scripts/select-to-pattern.scm
@@ -1417,486 +1588,410 @@ share/gimp/scripts/weave.scm
 share/gimp/scripts/web-browser.scm
 share/gimp/scripts/xach-effect.scm
 share/gimp/themes/Default/gtkrc
-share/gimp/themes/Default/imagerc
+share/gimp/themes/Default/images/preferences/color-management-22.png
+share/gimp/themes/Default/images/preferences/color-management.png
+share/gimp/themes/Default/images/preferences/controllers-22.png
 share/gimp/themes/Default/images/preferences/controllers.png
 share/gimp/themes/Default/images/preferences/default-comment.png
+share/gimp/themes/Default/images/preferences/default-grid-22.png
 share/gimp/themes/Default/images/preferences/default-grid.png
+share/gimp/themes/Default/images/preferences/display-22.png
 share/gimp/themes/Default/images/preferences/display.png
+share/gimp/themes/Default/images/preferences/environment-22.png
 share/gimp/themes/Default/images/preferences/environment.png
+share/gimp/themes/Default/images/preferences/folders-22.png
+share/gimp/themes/Default/images/preferences/folders-brushes-22.png
 share/gimp/themes/Default/images/preferences/folders-brushes.png
+share/gimp/themes/Default/images/preferences/folders-environ-22.png
 share/gimp/themes/Default/images/preferences/folders-environ.png
+share/gimp/themes/Default/images/preferences/folders-fonts-22.png
 share/gimp/themes/Default/images/preferences/folders-fonts.png
+share/gimp/themes/Default/images/preferences/folders-gradients-22.png
 share/gimp/themes/Default/images/preferences/folders-gradients.png
+share/gimp/themes/Default/images/preferences/folders-interp-22.png
+share/gimp/themes/Default/images/preferences/folders-interp.png
+share/gimp/themes/Default/images/preferences/folders-modules-22.png
 share/gimp/themes/Default/images/preferences/folders-modules.png
 share/gimp/themes/Default/images/preferences/folders-palettes.png
+share/gimp/themes/Default/images/preferences/folders-palettes-22.png
+share/gimp/themes/Default/images/preferences/folders-patterns-22.png
 share/gimp/themes/Default/images/preferences/folders-patterns.png
+share/gimp/themes/Default/images/preferences/folders-plug-ins-22.png
 share/gimp/themes/Default/images/preferences/folders-plug-ins.png
+share/gimp/themes/Default/images/preferences/folders-scripts-22.png
 share/gimp/themes/Default/images/preferences/folders-scripts.png
 share/gimp/themes/Default/images/preferences/folders-themes.png
+share/gimp/themes/Default/images/preferences/folders-themes-22.png
+share/gimp/themes/Default/images/preferences/folders-tool-plug-ins-22.png
 share/gimp/themes/Default/images/preferences/folders-tool-plug-ins.png
+share/gimp/themes/Default/images/preferences/folders-tools-22.png
 share/gimp/themes/Default/images/preferences/folders.png
+share/gimp/themes/Default/images/preferences/help-system-22.png
 share/gimp/themes/Default/images/preferences/help-system.png
+share/gimp/themes/Default/images/preferences/image-title-22.png
 share/gimp/themes/Default/images/preferences/image-title.png
+share/gimp/themes/Default/images/preferences/image-windows-22.png
 share/gimp/themes/Default/images/preferences/image-windows.png
+share/gimp/themes/Default/images/preferences/input-devices-22.png
 share/gimp/themes/Default/images/preferences/input-devices.png
+share/gimp/themes/Default/images/preferences/interface-22.png
 share/gimp/themes/Default/images/preferences/interface.png
-share/gimp/themes/Default/images/preferences/monitor.png
+share/gimp/themes/Default/images/preferences/new-image-22.png
 share/gimp/themes/Default/images/preferences/new-image.png
+share/gimp/themes/Default/images/preferences/session-22.png
 share/gimp/themes/Default/images/preferences/session.png
+share/gimp/themes/Default/images/preferences/theme-22.png
 share/gimp/themes/Default/images/preferences/theme.png
+share/gimp/themes/Default/images/preferences/tool-options-22.png
 share/gimp/themes/Default/images/preferences/tool-options.png
+share/gimp/themes/Default/images/preferences/toolbox-22.png
 share/gimp/themes/Default/images/preferences/toolbox.png
+share/gimp/themes/Default/images/preferences/window-management-22.png
 share/gimp/themes/Default/images/preferences/window-management.png
-share/gimp/themes/Default/images/stock-anchor-16.png
-share/gimp/themes/Default/images/stock-cap-butt-16.png
-share/gimp/themes/Default/images/stock-cap-round-16.png
-share/gimp/themes/Default/images/stock-cap-square-16.png
-share/gimp/themes/Default/images/stock-center-16.png
-share/gimp/themes/Default/images/stock-center-24.png
-share/gimp/themes/Default/images/stock-channel-16.png
-share/gimp/themes/Default/images/stock-channel-24.png
-share/gimp/themes/Default/images/stock-channel-32.png
-share/gimp/themes/Default/images/stock-channel-48.png
-share/gimp/themes/Default/images/stock-channel-alpha-16.png
-share/gimp/themes/Default/images/stock-channel-alpha-24.png
-share/gimp/themes/Default/images/stock-channel-alpha-32.png
-share/gimp/themes/Default/images/stock-channel-alpha-48.png
-share/gimp/themes/Default/images/stock-channel-blue-16.png
-share/gimp/themes/Default/images/stock-channel-blue-24.png
-share/gimp/themes/Default/images/stock-channel-blue-32.png
-share/gimp/themes/Default/images/stock-channel-blue-48.png
-share/gimp/themes/Default/images/stock-channel-gray-16.png
-share/gimp/themes/Default/images/stock-channel-gray-24.png
-share/gimp/themes/Default/images/stock-channel-gray-32.png
-share/gimp/themes/Default/images/stock-channel-gray-48.png
-share/gimp/themes/Default/images/stock-channel-green-16.png
-share/gimp/themes/Default/images/stock-channel-green-24.png
-share/gimp/themes/Default/images/stock-channel-green-32.png
-share/gimp/themes/Default/images/stock-channel-green-48.png
-share/gimp/themes/Default/images/stock-channel-indexed-16.png
-share/gimp/themes/Default/images/stock-channel-indexed-24.png
-share/gimp/themes/Default/images/stock-channel-indexed-32.png
-share/gimp/themes/Default/images/stock-channel-indexed-48.png
-share/gimp/themes/Default/images/stock-channel-red-16.png
-share/gimp/themes/Default/images/stock-channel-red-24.png
-share/gimp/themes/Default/images/stock-channel-red-32.png
-share/gimp/themes/Default/images/stock-channel-red-48.png
-share/gimp/themes/Default/images/stock-channels-16.png
-share/gimp/themes/Default/images/stock-channels-24.png
-share/gimp/themes/Default/images/stock-char-picker-22.png
-share/gimp/themes/Default/images/stock-close-12.png
-share/gimp/themes/Default/images/stock-color-pick-from-screen-16.png
-share/gimp/themes/Default/images/stock-color-picker-black-18.png
-share/gimp/themes/Default/images/stock-color-picker-gray-18.png
-share/gimp/themes/Default/images/stock-color-picker-white-18.png
-share/gimp/themes/Default/images/stock-color-triangle-16.png
-share/gimp/themes/Default/images/stock-convert-grayscale-16.png
-share/gimp/themes/Default/images/stock-convert-indexed-16.png
-share/gimp/themes/Default/images/stock-convert-rgb-16.png
-share/gimp/themes/Default/images/stock-curve-free-16.png
-share/gimp/themes/Default/images/stock-curve-smooth-16.png
-share/gimp/themes/Default/images/stock-default-colors-12.png
-share/gimp/themes/Default/images/stock-device-status-16.png
-share/gimp/themes/Default/images/stock-device-status-24.png
-share/gimp/themes/Default/images/stock-display-filter-16.png
-share/gimp/themes/Default/images/stock-display-filter-24.png
-share/gimp/themes/Default/images/stock-duplicate-16.png
-share/gimp/themes/Default/images/stock-edit-16.png
 share/gimp/themes/Default/images/stock-error-64.png
-share/gimp/themes/Default/images/stock-eye-12.png
-share/gimp/themes/Default/images/stock-eye-20.png
-share/gimp/themes/Default/images/stock-flip-horizontal-16.png
-share/gimp/themes/Default/images/stock-flip-vertical-16.png
-share/gimp/themes/Default/images/stock-floating-selection-16.png
-share/gimp/themes/Default/images/stock-floating-selection-24.png
-share/gimp/themes/Default/images/stock-floating-selection-32.png
-share/gimp/themes/Default/images/stock-floating-selection-48.png
-share/gimp/themes/Default/images/stock-frame-64.png
-share/gimp/themes/Default/images/stock-gradient-bilinear-16.png
-share/gimp/themes/Default/images/stock-gradient-conical-asymmetric-16.png
-share/gimp/themes/Default/images/stock-gradient-conical-symmetric-16.png
-share/gimp/themes/Default/images/stock-gradient-linear-16.png
-share/gimp/themes/Default/images/stock-gradient-radial-16.png
-share/gimp/themes/Default/images/stock-gradient-shapeburst-angular-16.png
-share/gimp/themes/Default/images/stock-gradient-shapeburst-dimpled-16.png
-share/gimp/themes/Default/images/stock-gradient-shapeburst-spherical-16.png
-share/gimp/themes/Default/images/stock-gradient-spiral-anticlockwise-16.png
-share/gimp/themes/Default/images/stock-gradient-spiral-clockwise-16.png
-share/gimp/themes/Default/images/stock-gradient-square-16.png
-share/gimp/themes/Default/images/stock-gravity-east-24.png
-share/gimp/themes/Default/images/stock-gravity-north-24.png
-share/gimp/themes/Default/images/stock-gravity-north-east-24.png
-share/gimp/themes/Default/images/stock-gravity-north-west-24.png
-share/gimp/themes/Default/images/stock-gravity-south-24.png
-share/gimp/themes/Default/images/stock-gravity-south-east-24.png
-share/gimp/themes/Default/images/stock-gravity-south-west-24.png
-share/gimp/themes/Default/images/stock-gravity-west-24.png
-share/gimp/themes/Default/images/stock-grid-16.png
-share/gimp/themes/Default/images/stock-hchain-24.png
-share/gimp/themes/Default/images/stock-hchain-broken-24.png
-share/gimp/themes/Default/images/stock-histogram-16.png
-share/gimp/themes/Default/images/stock-histogram-22.png
-share/gimp/themes/Default/images/stock-histogram-linear-16.png
-share/gimp/themes/Default/images/stock-histogram-logarithmic-16.png
-share/gimp/themes/Default/images/stock-image-16.png
-share/gimp/themes/Default/images/stock-image-24.png
-share/gimp/themes/Default/images/stock-image-32.png
-share/gimp/themes/Default/images/stock-image-48.png
-share/gimp/themes/Default/images/stock-images-16.png
-share/gimp/themes/Default/images/stock-images-24.png
-share/gimp/themes/Default/images/stock-indexed-palette-16.png
-share/gimp/themes/Default/images/stock-indexed-palette-24.png
-share/gimp/themes/Default/images/stock-info-16.png
-share/gimp/themes/Default/images/stock-info-24.png
 share/gimp/themes/Default/images/stock-info-64.png
-share/gimp/themes/Default/images/stock-invert-16.png
-share/gimp/themes/Default/images/stock-join-bevel-16.png
-share/gimp/themes/Default/images/stock-join-miter-16.png
-share/gimp/themes/Default/images/stock-join-round-16.png
-share/gimp/themes/Default/images/stock-landscape-16.png
-share/gimp/themes/Default/images/stock-layer-16.png
-share/gimp/themes/Default/images/stock-layer-24.png
-share/gimp/themes/Default/images/stock-layer-32.png
-share/gimp/themes/Default/images/stock-layer-48.png
-share/gimp/themes/Default/images/stock-layer-mask-16.png
-share/gimp/themes/Default/images/stock-layer-mask-24.png
-share/gimp/themes/Default/images/stock-layer-mask-32.png
-share/gimp/themes/Default/images/stock-layer-mask-48.png
-share/gimp/themes/Default/images/stock-layer-to-imagesize-16.png
-share/gimp/themes/Default/images/stock-layers-16.png
-share/gimp/themes/Default/images/stock-layers-24.png
-share/gimp/themes/Default/images/stock-letter-spacing-22.png
-share/gimp/themes/Default/images/stock-line-spacing-22.png
-share/gimp/themes/Default/images/stock-linked-12.png
-share/gimp/themes/Default/images/stock-linked-20.png
-share/gimp/themes/Default/images/stock-list-16.png
-share/gimp/themes/Default/images/stock-menu-left-12.png
-share/gimp/themes/Default/images/stock-menu-right-12.png
-share/gimp/themes/Default/images/stock-merge-down-16.png
-share/gimp/themes/Default/images/stock-move-to-screen-16.png
-share/gimp/themes/Default/images/stock-move-to-screen-24.png
-share/gimp/themes/Default/images/stock-navigation-16.png
-share/gimp/themes/Default/images/stock-paste-as-new-16.png
-share/gimp/themes/Default/images/stock-paste-into-16.png
-share/gimp/themes/Default/images/stock-path-16.png
-share/gimp/themes/Default/images/stock-path-22.png
-share/gimp/themes/Default/images/stock-path-stroke-16.png
-share/gimp/themes/Default/images/stock-paths-16.png
-share/gimp/themes/Default/images/stock-paths-22.png
-share/gimp/themes/Default/images/stock-plugin-16.png
-share/gimp/themes/Default/images/stock-portrait-16.png
-share/gimp/themes/Default/images/stock-print-resolution-16.png
-share/gimp/themes/Default/images/stock-print-resolution-24.png
-share/gimp/themes/Default/images/stock-qmask-off-16.png
-share/gimp/themes/Default/images/stock-qmask-on-16.png
 share/gimp/themes/Default/images/stock-question-64.png
-share/gimp/themes/Default/images/stock-reset-16.png
-share/gimp/themes/Default/images/stock-reshow-filter-16.png
-share/gimp/themes/Default/images/stock-resize-16.png
-share/gimp/themes/Default/images/stock-rotate-180-16.png
-share/gimp/themes/Default/images/stock-rotate-270-16.png
-share/gimp/themes/Default/images/stock-rotate-90-16.png
-share/gimp/themes/Default/images/stock-scale-16.png
-share/gimp/themes/Default/images/stock-selection-16.png
-share/gimp/themes/Default/images/stock-selection-add-16.png
-share/gimp/themes/Default/images/stock-selection-all-16.png
-share/gimp/themes/Default/images/stock-selection-border-16.png
-share/gimp/themes/Default/images/stock-selection-grow-16.png
-share/gimp/themes/Default/images/stock-selection-intersect-16.png
-share/gimp/themes/Default/images/stock-selection-none-16.png
-share/gimp/themes/Default/images/stock-selection-replace-16.png
-share/gimp/themes/Default/images/stock-selection-shrink-16.png
-share/gimp/themes/Default/images/stock-selection-stroke-16.png
-share/gimp/themes/Default/images/stock-selection-subtract-16.png
-share/gimp/themes/Default/images/stock-selection-to-channel-16.png
-share/gimp/themes/Default/images/stock-selection-to-path-16.png
-share/gimp/themes/Default/images/stock-shape-circle-16.png
-share/gimp/themes/Default/images/stock-shape-diamond-16.png
-share/gimp/themes/Default/images/stock-shape-square-16.png
-share/gimp/themes/Default/images/stock-swap-colors-12.png
-share/gimp/themes/Default/images/stock-template-16.png
-share/gimp/themes/Default/images/stock-template-24.png
-share/gimp/themes/Default/images/stock-text-dir-ltr-24.png
-share/gimp/themes/Default/images/stock-text-dir-rtl-24.png
-share/gimp/themes/Default/images/stock-text-layer-16.png
-share/gimp/themes/Default/images/stock-text-layer-24.png
-share/gimp/themes/Default/images/stock-text-layer-32.png
-share/gimp/themes/Default/images/stock-text-layer-48.png
-share/gimp/themes/Default/images/stock-texture-64.png
-share/gimp/themes/Default/images/stock-toilet-paper-16.png
-share/gimp/themes/Default/images/stock-toilet-paper-24.png
-share/gimp/themes/Default/images/stock-tool-airbrush-16.png
-share/gimp/themes/Default/images/stock-tool-airbrush-22.png
-share/gimp/themes/Default/images/stock-tool-blend-16.png
-share/gimp/themes/Default/images/stock-tool-blend-22.png
-share/gimp/themes/Default/images/stock-tool-blur-16.png
-share/gimp/themes/Default/images/stock-tool-blur-22.png
-share/gimp/themes/Default/images/stock-tool-brightness-contrast-16.png
-share/gimp/themes/Default/images/stock-tool-brightness-contrast-22.png
-share/gimp/themes/Default/images/stock-tool-bucket-fill-16.png
-share/gimp/themes/Default/images/stock-tool-bucket-fill-22.png
-share/gimp/themes/Default/images/stock-tool-by-color-select-16.png
-share/gimp/themes/Default/images/stock-tool-by-color-select-22.png
-share/gimp/themes/Default/images/stock-tool-clone-16.png
-share/gimp/themes/Default/images/stock-tool-clone-22.png
-share/gimp/themes/Default/images/stock-tool-color-balance-16.png
-share/gimp/themes/Default/images/stock-tool-color-balance-22.png
-share/gimp/themes/Default/images/stock-tool-color-picker-16.png
-share/gimp/themes/Default/images/stock-tool-color-picker-22.png
-share/gimp/themes/Default/images/stock-tool-colorize-16.png
-share/gimp/themes/Default/images/stock-tool-colorize-22.png
-share/gimp/themes/Default/images/stock-tool-crop-16.png
-share/gimp/themes/Default/images/stock-tool-crop-22.png
-share/gimp/themes/Default/images/stock-tool-curves-16.png
-share/gimp/themes/Default/images/stock-tool-curves-22.png
-share/gimp/themes/Default/images/stock-tool-dodge-16.png
-share/gimp/themes/Default/images/stock-tool-dodge-22.png
-share/gimp/themes/Default/images/stock-tool-ellipse-select-16.png
-share/gimp/themes/Default/images/stock-tool-ellipse-select-22.png
-share/gimp/themes/Default/images/stock-tool-eraser-16.png
-share/gimp/themes/Default/images/stock-tool-eraser-22.png
-share/gimp/themes/Default/images/stock-tool-flip-16.png
-share/gimp/themes/Default/images/stock-tool-flip-22.png
-share/gimp/themes/Default/images/stock-tool-free-select-16.png
-share/gimp/themes/Default/images/stock-tool-free-select-22.png
-share/gimp/themes/Default/images/stock-tool-fuzzy-select-16.png
-share/gimp/themes/Default/images/stock-tool-fuzzy-select-22.png
-share/gimp/themes/Default/images/stock-tool-hue-saturation-16.png
-share/gimp/themes/Default/images/stock-tool-hue-saturation-22.png
-share/gimp/themes/Default/images/stock-tool-ink-16.png
-share/gimp/themes/Default/images/stock-tool-ink-22.png
-share/gimp/themes/Default/images/stock-tool-iscissors-16.png
-share/gimp/themes/Default/images/stock-tool-iscissors-22.png
-share/gimp/themes/Default/images/stock-tool-levels-16.png
-share/gimp/themes/Default/images/stock-tool-levels-22.png
-share/gimp/themes/Default/images/stock-tool-measure-16.png
-share/gimp/themes/Default/images/stock-tool-measure-22.png
-share/gimp/themes/Default/images/stock-tool-move-16.png
-share/gimp/themes/Default/images/stock-tool-move-22.png
-share/gimp/themes/Default/images/stock-tool-options-16.png
-share/gimp/themes/Default/images/stock-tool-options-24.png
-share/gimp/themes/Default/images/stock-tool-paintbrush-16.png
-share/gimp/themes/Default/images/stock-tool-paintbrush-22.png
-share/gimp/themes/Default/images/stock-tool-path-16.png
-share/gimp/themes/Default/images/stock-tool-path-22.png
-share/gimp/themes/Default/images/stock-tool-pencil-16.png
-share/gimp/themes/Default/images/stock-tool-pencil-22.png
-share/gimp/themes/Default/images/stock-tool-perspective-16.png
-share/gimp/themes/Default/images/stock-tool-perspective-22.png
-share/gimp/themes/Default/images/stock-tool-posterize-16.png
-share/gimp/themes/Default/images/stock-tool-posterize-22.png
-share/gimp/themes/Default/images/stock-tool-rect-select-16.png
-share/gimp/themes/Default/images/stock-tool-rect-select-22.png
-share/gimp/themes/Default/images/stock-tool-rotate-16.png
-share/gimp/themes/Default/images/stock-tool-rotate-22.png
-share/gimp/themes/Default/images/stock-tool-scale-16.png
-share/gimp/themes/Default/images/stock-tool-scale-22.png
-share/gimp/themes/Default/images/stock-tool-shear-16.png
-share/gimp/themes/Default/images/stock-tool-shear-22.png
-share/gimp/themes/Default/images/stock-tool-smudge-16.png
-share/gimp/themes/Default/images/stock-tool-smudge-22.png
-share/gimp/themes/Default/images/stock-tool-text-16.png
-share/gimp/themes/Default/images/stock-tool-text-22.png
-share/gimp/themes/Default/images/stock-tool-threshold-16.png
-share/gimp/themes/Default/images/stock-tool-threshold-22.png
-share/gimp/themes/Default/images/stock-tool-zoom-16.png
-share/gimp/themes/Default/images/stock-tool-zoom-22.png
-share/gimp/themes/Default/images/stock-tools-16.png
-share/gimp/themes/Default/images/stock-tools-24.png
-share/gimp/themes/Default/images/stock-transparency-16.png
-share/gimp/themes/Default/images/stock-transparency-24.png
-share/gimp/themes/Default/images/stock-undo-history-16.png
-share/gimp/themes/Default/images/stock-undo-history-24.png
-share/gimp/themes/Default/images/stock-vchain-24.png
-share/gimp/themes/Default/images/stock-vchain-broken-24.png
-share/gimp/themes/Default/images/stock-video-16.png
-share/gimp/themes/Default/images/stock-video-24.png
-share/gimp/themes/Default/images/stock-warning-16.png
-share/gimp/themes/Default/images/stock-warning-24.png
 share/gimp/themes/Default/images/stock-warning-64.png
-share/gimp/themes/Default/images/stock-web-16.png
-share/gimp/themes/Default/images/stock-web-24.png
-share/gimp/themes/Default/images/stock-wilber-16.png
-share/gimp/themes/Default/images/stock-wilber-64.png
-share/gimp/themes/Default/images/stock-wilber-eek-64.png
-share/gimp/themes/Default/images/stock-zoom-follow-window-12.png
 share/gimp/themes/Small/gtkrc
 share/gimp/tips/gimp-tips.xml
+%%GNOME%%share/application-registry/gimp.applications
+%%GNOME%%share/mime-info/gimp.keys
+share/icons/hicolor/16x16/apps/gimp.png
+share/icons/hicolor/22x22/apps/gimp.png
+share/icons/hicolor/24x24/apps/gimp.png
+share/icons/hicolor/32x32/apps/gimp.png
+share/icons/hicolor/48x48/apps/gimp.png
+share/icons/hicolor/64x64/apps/gimp.png
+share/icons/hicolor/scalable/apps/gimp.svg
+share/locale/ar/LC_MESSAGES/gimp20-libgimp.mo
+share/locale/ar/LC_MESSAGES/gimp20-python.mo
+share/locale/ar/LC_MESSAGES/gimp20-script-fu.mo
+share/locale/ar/LC_MESSAGES/gimp20-std-plug-ins.mo
+share/locale/ar/LC_MESSAGES/gimp20-tips.mo
+share/locale/ar/LC_MESSAGES/gimp20.mo
 share/locale/bg/LC_MESSAGES/gimp20-libgimp.mo
-share/locale/bg/LC_MESSAGES/gimp20-std-plug-ins.mo
+share/locale/bg/LC_MESSAGES/gimp20-python.mo
 share/locale/bg/LC_MESSAGES/gimp20-script-fu.mo
+share/locale/bg/LC_MESSAGES/gimp20-std-plug-ins.mo
+share/locale/bg/LC_MESSAGES/gimp20-tips.mo
 share/locale/bg/LC_MESSAGES/gimp20.mo
 share/locale/ca/LC_MESSAGES/gimp20-libgimp.mo
+share/locale/ca/LC_MESSAGES/gimp20-python.mo
 share/locale/ca/LC_MESSAGES/gimp20-script-fu.mo
 share/locale/ca/LC_MESSAGES/gimp20-std-plug-ins.mo
+share/locale/ca/LC_MESSAGES/gimp20-tips.mo
 share/locale/ca/LC_MESSAGES/gimp20.mo
 share/locale/cs/LC_MESSAGES/gimp20-libgimp.mo
+share/locale/cs/LC_MESSAGES/gimp20-python.mo
 share/locale/cs/LC_MESSAGES/gimp20-script-fu.mo
 share/locale/cs/LC_MESSAGES/gimp20-std-plug-ins.mo
+share/locale/cs/LC_MESSAGES/gimp20-tips.mo
 share/locale/cs/LC_MESSAGES/gimp20.mo
 share/locale/da/LC_MESSAGES/gimp20-libgimp.mo
+share/locale/da/LC_MESSAGES/gimp20-python.mo
 share/locale/da/LC_MESSAGES/gimp20-script-fu.mo
 share/locale/da/LC_MESSAGES/gimp20-std-plug-ins.mo
+share/locale/da/LC_MESSAGES/gimp20-tips.mo
 share/locale/da/LC_MESSAGES/gimp20.mo
 share/locale/de/LC_MESSAGES/gimp20-libgimp.mo
+share/locale/de/LC_MESSAGES/gimp20-python.mo
 share/locale/de/LC_MESSAGES/gimp20-script-fu.mo
 share/locale/de/LC_MESSAGES/gimp20-std-plug-ins.mo
+share/locale/de/LC_MESSAGES/gimp20-tips.mo
 share/locale/de/LC_MESSAGES/gimp20.mo
+share/locale/dz/LC_MESSAGES/gimp20-libgimp.mo
+share/locale/dz/LC_MESSAGES/gimp20-python.mo
+share/locale/dz/LC_MESSAGES/gimp20-script-fu.mo
+share/locale/dz/LC_MESSAGES/gimp20-std-plug-ins.mo
+share/locale/dz/LC_MESSAGES/gimp20-tips.mo
+share/locale/dz/LC_MESSAGES/gimp20.mo
 share/locale/el/LC_MESSAGES/gimp20-libgimp.mo
+share/locale/el/LC_MESSAGES/gimp20-python.mo
 share/locale/el/LC_MESSAGES/gimp20-script-fu.mo
 share/locale/el/LC_MESSAGES/gimp20-std-plug-ins.mo
+share/locale/el/LC_MESSAGES/gimp20-tips.mo
 share/locale/el/LC_MESSAGES/gimp20.mo
 share/locale/en_CA/LC_MESSAGES/gimp20-libgimp.mo
+share/locale/en_CA/LC_MESSAGES/gimp20-python.mo
 share/locale/en_CA/LC_MESSAGES/gimp20-script-fu.mo
 share/locale/en_CA/LC_MESSAGES/gimp20-std-plug-ins.mo
+share/locale/en_CA/LC_MESSAGES/gimp20-tips.mo
 share/locale/en_CA/LC_MESSAGES/gimp20.mo
 share/locale/en_GB/LC_MESSAGES/gimp20-libgimp.mo
+share/locale/en_GB/LC_MESSAGES/gimp20-python.mo
 share/locale/en_GB/LC_MESSAGES/gimp20-script-fu.mo
 share/locale/en_GB/LC_MESSAGES/gimp20-std-plug-ins.mo
+share/locale/en_GB/LC_MESSAGES/gimp20-tips.mo
 share/locale/en_GB/LC_MESSAGES/gimp20.mo
+share/locale/eo/LC_MESSAGES/gimp20-libgimp.mo
+share/locale/eo/LC_MESSAGES/gimp20-python.mo
+share/locale/eo/LC_MESSAGES/gimp20-script-fu.mo
+share/locale/eo/LC_MESSAGES/gimp20-std-plug-ins.mo
+share/locale/eo/LC_MESSAGES/gimp20-tips.mo
+share/locale/eo/LC_MESSAGES/gimp20.mo
 share/locale/es/LC_MESSAGES/gimp20-libgimp.mo
+share/locale/es/LC_MESSAGES/gimp20-python.mo
 share/locale/es/LC_MESSAGES/gimp20-script-fu.mo
 share/locale/es/LC_MESSAGES/gimp20-std-plug-ins.mo
+share/locale/es/LC_MESSAGES/gimp20-tips.mo
 share/locale/es/LC_MESSAGES/gimp20.mo
+share/locale/et/LC_MESSAGES/gimp20-libgimp.mo
+share/locale/et/LC_MESSAGES/gimp20-python.mo
+share/locale/et/LC_MESSAGES/gimp20-script-fu.mo
+share/locale/et/LC_MESSAGES/gimp20-std-plug-ins.mo
+share/locale/et/LC_MESSAGES/gimp20-tips.mo
+share/locale/et/LC_MESSAGES/gimp20.mo
 share/locale/eu/LC_MESSAGES/gimp20-libgimp.mo
+share/locale/eu/LC_MESSAGES/gimp20-python.mo
 share/locale/eu/LC_MESSAGES/gimp20-script-fu.mo
 share/locale/eu/LC_MESSAGES/gimp20-std-plug-ins.mo
+share/locale/eu/LC_MESSAGES/gimp20-tips.mo
 share/locale/eu/LC_MESSAGES/gimp20.mo
 share/locale/fa/LC_MESSAGES/gimp20-libgimp.mo
+share/locale/fa/LC_MESSAGES/gimp20-python.mo
 share/locale/fa/LC_MESSAGES/gimp20-script-fu.mo
 share/locale/fa/LC_MESSAGES/gimp20-std-plug-ins.mo
+share/locale/fa/LC_MESSAGES/gimp20-tips.mo
 share/locale/fa/LC_MESSAGES/gimp20.mo
 share/locale/fi/LC_MESSAGES/gimp20-libgimp.mo
+share/locale/fi/LC_MESSAGES/gimp20-python.mo
 share/locale/fi/LC_MESSAGES/gimp20-script-fu.mo
 share/locale/fi/LC_MESSAGES/gimp20-std-plug-ins.mo
+share/locale/fi/LC_MESSAGES/gimp20-tips.mo
 share/locale/fi/LC_MESSAGES/gimp20.mo
 share/locale/fr/LC_MESSAGES/gimp20-libgimp.mo
+share/locale/fr/LC_MESSAGES/gimp20-python.mo
 share/locale/fr/LC_MESSAGES/gimp20-script-fu.mo
 share/locale/fr/LC_MESSAGES/gimp20-std-plug-ins.mo
+share/locale/fr/LC_MESSAGES/gimp20-tips.mo
 share/locale/fr/LC_MESSAGES/gimp20.mo
 share/locale/ga/LC_MESSAGES/gimp20-libgimp.mo
+share/locale/ga/LC_MESSAGES/gimp20-python.mo
 share/locale/ga/LC_MESSAGES/gimp20-script-fu.mo
 share/locale/ga/LC_MESSAGES/gimp20-std-plug-ins.mo
+share/locale/ga/LC_MESSAGES/gimp20-tips.mo
 share/locale/ga/LC_MESSAGES/gimp20.mo
 share/locale/gl/LC_MESSAGES/gimp20-libgimp.mo
+share/locale/gl/LC_MESSAGES/gimp20-python.mo
 share/locale/gl/LC_MESSAGES/gimp20-script-fu.mo
 share/locale/gl/LC_MESSAGES/gimp20-std-plug-ins.mo
+share/locale/gl/LC_MESSAGES/gimp20-tips.mo
 share/locale/gl/LC_MESSAGES/gimp20.mo
+share/locale/gu/LC_MESSAGES/gimp20-libgimp.mo
+share/locale/gu/LC_MESSAGES/gimp20-python.mo
+share/locale/gu/LC_MESSAGES/gimp20-script-fu.mo
+share/locale/gu/LC_MESSAGES/gimp20-std-plug-ins.mo
+share/locale/gu/LC_MESSAGES/gimp20-tips.mo
+share/locale/gu/LC_MESSAGES/gimp20.mo
 share/locale/he/LC_MESSAGES/gimp20-libgimp.mo
+share/locale/he/LC_MESSAGES/gimp20-python.mo
 share/locale/he/LC_MESSAGES/gimp20-script-fu.mo
 share/locale/he/LC_MESSAGES/gimp20-std-plug-ins.mo
+share/locale/he/LC_MESSAGES/gimp20-tips.mo
 share/locale/he/LC_MESSAGES/gimp20.mo
 share/locale/hr/LC_MESSAGES/gimp20-libgimp.mo
+share/locale/hr/LC_MESSAGES/gimp20-python.mo
 share/locale/hr/LC_MESSAGES/gimp20-script-fu.mo
 share/locale/hr/LC_MESSAGES/gimp20-std-plug-ins.mo
+share/locale/hr/LC_MESSAGES/gimp20-tips.mo
 share/locale/hr/LC_MESSAGES/gimp20.mo
 share/locale/hu/LC_MESSAGES/gimp20-libgimp.mo
+share/locale/hu/LC_MESSAGES/gimp20-python.mo
 share/locale/hu/LC_MESSAGES/gimp20-script-fu.mo
 share/locale/hu/LC_MESSAGES/gimp20-std-plug-ins.mo
+share/locale/hu/LC_MESSAGES/gimp20-tips.mo
 share/locale/hu/LC_MESSAGES/gimp20.mo
 share/locale/id/LC_MESSAGES/gimp20-libgimp.mo
+share/locale/id/LC_MESSAGES/gimp20-python.mo
 share/locale/id/LC_MESSAGES/gimp20-script-fu.mo
 share/locale/id/LC_MESSAGES/gimp20-std-plug-ins.mo
+share/locale/id/LC_MESSAGES/gimp20-tips.mo
 share/locale/id/LC_MESSAGES/gimp20.mo
 share/locale/it/LC_MESSAGES/gimp20-libgimp.mo
+share/locale/it/LC_MESSAGES/gimp20-python.mo
 share/locale/it/LC_MESSAGES/gimp20-script-fu.mo
 share/locale/it/LC_MESSAGES/gimp20-std-plug-ins.mo
+share/locale/it/LC_MESSAGES/gimp20-tips.mo
 share/locale/it/LC_MESSAGES/gimp20.mo
 share/locale/ja/LC_MESSAGES/gimp20-libgimp.mo
+share/locale/ja/LC_MESSAGES/gimp20-python.mo
 share/locale/ja/LC_MESSAGES/gimp20-script-fu.mo
 share/locale/ja/LC_MESSAGES/gimp20-std-plug-ins.mo
+share/locale/ja/LC_MESSAGES/gimp20-tips.mo
 share/locale/ja/LC_MESSAGES/gimp20.mo
+share/locale/km/LC_MESSAGES/gimp20.mo
+share/locale/km/LC_MESSAGES/gimp20-libgimp.mo
+share/locale/km/LC_MESSAGES/gimp20-std-plug-ins.mo
+share/locale/km/LC_MESSAGES/gimp20-python.mo
+share/locale/km/LC_MESSAGES/gimp20-script-fu.mo
+share/locale/km/LC_MESSAGES/gimp20-tips.mo
 share/locale/ko/LC_MESSAGES/gimp20-libgimp.mo
+share/locale/ko/LC_MESSAGES/gimp20-python.mo
 share/locale/ko/LC_MESSAGES/gimp20-script-fu.mo
 share/locale/ko/LC_MESSAGES/gimp20-std-plug-ins.mo
+share/locale/ko/LC_MESSAGES/gimp20-tips.mo
 share/locale/ko/LC_MESSAGES/gimp20.mo
 share/locale/lt/LC_MESSAGES/gimp20-libgimp.mo
+share/locale/lt/LC_MESSAGES/gimp20-python.mo
 share/locale/lt/LC_MESSAGES/gimp20-script-fu.mo
 share/locale/lt/LC_MESSAGES/gimp20-std-plug-ins.mo
+share/locale/lt/LC_MESSAGES/gimp20-tips.mo
 share/locale/lt/LC_MESSAGES/gimp20.mo
 share/locale/mk/LC_MESSAGES/gimp20-libgimp.mo
+share/locale/mk/LC_MESSAGES/gimp20-python.mo
 share/locale/mk/LC_MESSAGES/gimp20-script-fu.mo
 share/locale/mk/LC_MESSAGES/gimp20-std-plug-ins.mo
+share/locale/mk/LC_MESSAGES/gimp20-tips.mo
 share/locale/mk/LC_MESSAGES/gimp20.mo
 share/locale/ms/LC_MESSAGES/gimp20-libgimp.mo
+share/locale/ms/LC_MESSAGES/gimp20-python.mo
 share/locale/ms/LC_MESSAGES/gimp20-script-fu.mo
 share/locale/ms/LC_MESSAGES/gimp20-std-plug-ins.mo
+share/locale/ms/LC_MESSAGES/gimp20-tips.mo
 share/locale/ms/LC_MESSAGES/gimp20.mo
 share/locale/nb/LC_MESSAGES/gimp20-libgimp.mo
+share/locale/nb/LC_MESSAGES/gimp20-python.mo
 share/locale/nb/LC_MESSAGES/gimp20-script-fu.mo
 share/locale/nb/LC_MESSAGES/gimp20-std-plug-ins.mo
+share/locale/nb/LC_MESSAGES/gimp20-tips.mo
 share/locale/nb/LC_MESSAGES/gimp20.mo
+share/locale/ne/LC_MESSAGES/gimp20-libgimp.mo
+share/locale/ne/LC_MESSAGES/gimp20-python.mo
+share/locale/ne/LC_MESSAGES/gimp20-script-fu.mo
+share/locale/ne/LC_MESSAGES/gimp20-std-plug-ins.mo
+share/locale/ne/LC_MESSAGES/gimp20-tips.mo
+share/locale/ne/LC_MESSAGES/gimp20.mo
 share/locale/nl/LC_MESSAGES/gimp20-libgimp.mo
+share/locale/nl/LC_MESSAGES/gimp20-python.mo
 share/locale/nl/LC_MESSAGES/gimp20-script-fu.mo
 share/locale/nl/LC_MESSAGES/gimp20-std-plug-ins.mo
+share/locale/nl/LC_MESSAGES/gimp20-tips.mo
 share/locale/nl/LC_MESSAGES/gimp20.mo
 share/locale/oc/LC_MESSAGES/gimp20-libgimp.mo
+share/locale/oc/LC_MESSAGES/gimp20-python.mo
 share/locale/oc/LC_MESSAGES/gimp20-script-fu.mo
 share/locale/oc/LC_MESSAGES/gimp20-std-plug-ins.mo
+share/locale/oc/LC_MESSAGES/gimp20-tips.mo
 share/locale/oc/LC_MESSAGES/gimp20.mo
 share/locale/pa/LC_MESSAGES/gimp20-libgimp.mo
+share/locale/pa/LC_MESSAGES/gimp20-python.mo
 share/locale/pa/LC_MESSAGES/gimp20-script-fu.mo
 share/locale/pa/LC_MESSAGES/gimp20-std-plug-ins.mo
+share/locale/pa/LC_MESSAGES/gimp20-tips.mo
 share/locale/pa/LC_MESSAGES/gimp20.mo
 share/locale/pl/LC_MESSAGES/gimp20-libgimp.mo
+share/locale/pl/LC_MESSAGES/gimp20-python.mo
 share/locale/pl/LC_MESSAGES/gimp20-script-fu.mo
 share/locale/pl/LC_MESSAGES/gimp20-std-plug-ins.mo
+share/locale/pl/LC_MESSAGES/gimp20-tips.mo
 share/locale/pl/LC_MESSAGES/gimp20.mo
 share/locale/pt/LC_MESSAGES/gimp20-libgimp.mo
+share/locale/pt/LC_MESSAGES/gimp20-python.mo
 share/locale/pt/LC_MESSAGES/gimp20-script-fu.mo
 share/locale/pt/LC_MESSAGES/gimp20-std-plug-ins.mo
+share/locale/pt/LC_MESSAGES/gimp20-tips.mo
 share/locale/pt/LC_MESSAGES/gimp20.mo
 share/locale/pt_BR/LC_MESSAGES/gimp20-libgimp.mo
+share/locale/pt_BR/LC_MESSAGES/gimp20-python.mo
 share/locale/pt_BR/LC_MESSAGES/gimp20-script-fu.mo
 share/locale/pt_BR/LC_MESSAGES/gimp20-std-plug-ins.mo
+share/locale/pt_BR/LC_MESSAGES/gimp20-tips.mo
 share/locale/pt_BR/LC_MESSAGES/gimp20.mo
 share/locale/ro/LC_MESSAGES/gimp20-libgimp.mo
+share/locale/ro/LC_MESSAGES/gimp20-python.mo
 share/locale/ro/LC_MESSAGES/gimp20-script-fu.mo
 share/locale/ro/LC_MESSAGES/gimp20-std-plug-ins.mo
+share/locale/ro/LC_MESSAGES/gimp20-tips.mo
 share/locale/ro/LC_MESSAGES/gimp20.mo
 share/locale/ru/LC_MESSAGES/gimp20-libgimp.mo
+share/locale/ru/LC_MESSAGES/gimp20-python.mo
 share/locale/ru/LC_MESSAGES/gimp20-script-fu.mo
 share/locale/ru/LC_MESSAGES/gimp20-std-plug-ins.mo
+share/locale/ru/LC_MESSAGES/gimp20-tips.mo
 share/locale/ru/LC_MESSAGES/gimp20.mo
+share/locale/rw/LC_MESSAGES/gimp20-libgimp.mo
+share/locale/rw/LC_MESSAGES/gimp20-python.mo
+share/locale/rw/LC_MESSAGES/gimp20-script-fu.mo
+share/locale/rw/LC_MESSAGES/gimp20-std-plug-ins.mo
+share/locale/rw/LC_MESSAGES/gimp20-tips.mo
+share/locale/rw/LC_MESSAGES/gimp20.mo
 share/locale/sk/LC_MESSAGES/gimp20-libgimp.mo
+share/locale/sk/LC_MESSAGES/gimp20-python.mo
 share/locale/sk/LC_MESSAGES/gimp20-script-fu.mo
 share/locale/sk/LC_MESSAGES/gimp20-std-plug-ins.mo
+share/locale/sk/LC_MESSAGES/gimp20-tips.mo
 share/locale/sk/LC_MESSAGES/gimp20.mo
+share/locale/sl/LC_MESSAGES/gimp20-libgimp.mo
+share/locale/sl/LC_MESSAGES/gimp20-python.mo
+share/locale/sl/LC_MESSAGES/gimp20-script-fu.mo
+share/locale/sl/LC_MESSAGES/gimp20-std-plug-ins.mo
+share/locale/sl/LC_MESSAGES/gimp20-tips.mo
+share/locale/sl/LC_MESSAGES/gimp20.mo
 share/locale/sr/LC_MESSAGES/gimp20-libgimp.mo
+share/locale/sr/LC_MESSAGES/gimp20-python.mo
 share/locale/sr/LC_MESSAGES/gimp20-script-fu.mo
 share/locale/sr/LC_MESSAGES/gimp20-std-plug-ins.mo
+share/locale/sr/LC_MESSAGES/gimp20-tips.mo
 share/locale/sr/LC_MESSAGES/gimp20.mo
 share/locale/sr@Latn/LC_MESSAGES/gimp20-libgimp.mo
+share/locale/sr@Latn/LC_MESSAGES/gimp20-python.mo
 share/locale/sr@Latn/LC_MESSAGES/gimp20-script-fu.mo
 share/locale/sr@Latn/LC_MESSAGES/gimp20-std-plug-ins.mo
+share/locale/sr@Latn/LC_MESSAGES/gimp20-tips.mo
 share/locale/sr@Latn/LC_MESSAGES/gimp20.mo
 share/locale/sv/LC_MESSAGES/gimp20-libgimp.mo
+share/locale/sv/LC_MESSAGES/gimp20-python.mo
 share/locale/sv/LC_MESSAGES/gimp20-script-fu.mo
 share/locale/sv/LC_MESSAGES/gimp20-std-plug-ins.mo
+share/locale/sv/LC_MESSAGES/gimp20-tips.mo
 share/locale/sv/LC_MESSAGES/gimp20.mo
 share/locale/tr/LC_MESSAGES/gimp20-libgimp.mo
+share/locale/tr/LC_MESSAGES/gimp20-python.mo
 share/locale/tr/LC_MESSAGES/gimp20-script-fu.mo
 share/locale/tr/LC_MESSAGES/gimp20-std-plug-ins.mo
+share/locale/tr/LC_MESSAGES/gimp20-tips.mo
 share/locale/tr/LC_MESSAGES/gimp20.mo
+share/locale/tt/LC_MESSAGES/gimp20-libgimp.mo
+share/locale/tt/LC_MESSAGES/gimp20-python.mo
+share/locale/tt/LC_MESSAGES/gimp20-script-fu.mo
+share/locale/tt/LC_MESSAGES/gimp20-std-plug-ins.mo
+share/locale/tt/LC_MESSAGES/gimp20-tips.mo
+share/locale/tt/LC_MESSAGES/gimp20.mo
 share/locale/uk/LC_MESSAGES/gimp20-libgimp.mo
+share/locale/uk/LC_MESSAGES/gimp20-python.mo
 share/locale/uk/LC_MESSAGES/gimp20-script-fu.mo
 share/locale/uk/LC_MESSAGES/gimp20-std-plug-ins.mo
+share/locale/uk/LC_MESSAGES/gimp20-tips.mo
 share/locale/uk/LC_MESSAGES/gimp20.mo
 share/locale/vi/LC_MESSAGES/gimp20-libgimp.mo
+share/locale/vi/LC_MESSAGES/gimp20-python.mo
 share/locale/vi/LC_MESSAGES/gimp20-script-fu.mo
 share/locale/vi/LC_MESSAGES/gimp20-std-plug-ins.mo
+share/locale/vi/LC_MESSAGES/gimp20-tips.mo
 share/locale/vi/LC_MESSAGES/gimp20.mo
+share/locale/xh/LC_MESSAGES/gimp20-libgimp.mo
+share/locale/xh/LC_MESSAGES/gimp20-python.mo
+share/locale/xh/LC_MESSAGES/gimp20-script-fu.mo
+share/locale/xh/LC_MESSAGES/gimp20-std-plug-ins.mo
+share/locale/xh/LC_MESSAGES/gimp20-tips.mo
+share/locale/xh/LC_MESSAGES/gimp20.mo
 share/locale/yi/LC_MESSAGES/gimp20-libgimp.mo
+share/locale/yi/LC_MESSAGES/gimp20-python.mo
 share/locale/yi/LC_MESSAGES/gimp20-script-fu.mo
 share/locale/yi/LC_MESSAGES/gimp20-std-plug-ins.mo
+share/locale/yi/LC_MESSAGES/gimp20-tips.mo
 share/locale/yi/LC_MESSAGES/gimp20.mo
 share/locale/zh_CN/LC_MESSAGES/gimp20-libgimp.mo
+share/locale/zh_CN/LC_MESSAGES/gimp20-python.mo
 share/locale/zh_CN/LC_MESSAGES/gimp20-script-fu.mo
 share/locale/zh_CN/LC_MESSAGES/gimp20-std-plug-ins.mo
+share/locale/zh_CN/LC_MESSAGES/gimp20-tips.mo
 share/locale/zh_CN/LC_MESSAGES/gimp20.mo
 share/locale/zh_TW/LC_MESSAGES/gimp20-libgimp.mo
+share/locale/zh_TW/LC_MESSAGES/gimp20-python.mo
 share/locale/zh_TW/LC_MESSAGES/gimp20-script-fu.mo
 share/locale/zh_TW/LC_MESSAGES/gimp20-std-plug-ins.mo
+share/locale/zh_TW/LC_MESSAGES/gimp20-tips.mo
 share/locale/zh_TW/LC_MESSAGES/gimp20.mo
 @dirrm share/gimp/tips
 @dirrm share/gimp/themes/Small
@@ -1908,7 +2003,6 @@ share/locale/zh_TW/LC_MESSAGES/gimp20.mo
 @dirrm share/gimp/scripts
 @dirrm share/gimp/patterns
 @dirrm share/gimp/palettes
-@dirrm share/gimp/misc
 @dirrm share/gimp/menus
 @dirrm share/gimp/images
 @dirrm share/gimp/gradients
@@ -1926,13 +2020,15 @@ share/locale/zh_TW/LC_MESSAGES/gimp20.mo
 @dirrm share/doc/gimp/libgimpthumb
 @dirrm share/doc/gimp/libgimpmodule
 @dirrm share/doc/gimp/libgimpmath
+@dirrm share/doc/gimp/libgimpconfig
 @dirrm share/doc/gimp/libgimpcolor
 @dirrm share/doc/gimp/libgimpbase
 @dirrm share/doc/gimp/libgimp
 @dirrm share/doc/gimp
+@dirrmtry share/applications
 @dirrm libexec/gimp/2.2/plug-ins
-%%PYTHON:%%@dirrm libexec/gimp/2.2/python
 @dirrm libexec/gimp/2.2/modules
+@dirrm libexec/gimp/2.2/interpreters
 @dirrm libexec/gimp/2.2/environ
 @dirrm libexec/gimp/2.2
 @dirrm libexec/gimp
@@ -1940,40 +2036,28 @@ share/locale/zh_TW/LC_MESSAGES/gimp20.mo
 @dirrm include/gimp-2.0/libgimpthumb
 @dirrm include/gimp-2.0/libgimpmodule
 @dirrm include/gimp-2.0/libgimpmath
+@dirrm include/gimp-2.0/libgimpconfig
 @dirrm include/gimp-2.0/libgimpcolor
 @dirrm include/gimp-2.0/libgimpbase
 @dirrm include/gimp-2.0/libgimp
 @dirrm include/gimp-2.0
 @dirrm etc/gimp/2.2
 @dirrm etc/gimp
-%%GNOMEPANEL:%%@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
-@dirrmtry share/locale/zh_TW/LC_MESSAGES
-@dirrmtry share/locale/zh_TW
-@dirrmtry share/locale/zh_CN/LC_MESSAGES
-@dirrmtry share/locale/zh_CN
+@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/uk/LC_MESSAGES
-@dirrmtry share/locale/uk
-@dirrmtry share/locale/sr/LC_MESSAGES
-@dirrmtry share/locale/sr
-@dirrmtry share/locale/sk/LC_MESSAGES
-@dirrmtry share/locale/sk
-@dirrmtry share/locale/ro/LC_MESSAGES
-@dirrmtry share/locale/ro
-@dirrmtry share/locale/pt/LC_MESSAGES
-@dirrmtry share/locale/pt
-@dirrmtry share/locale/pl/LC_MESSAGES
-@dirrmtry share/locale/pl
-@dirrmtry share/locale/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
-@dirrmtry share/locale/gl/LC_MESSAGES
-@dirrmtry share/locale/gl
-@dirrmtry share/locale/fi/LC_MESSAGES
-@dirrmtry share/locale/fi
-@dirrmtry share/locale/el/LC_MESSAGES
-@dirrmtry share/locale/el
-@dirrmtry share/locale/cs/LC_MESSAGES
-@dirrmtry share/locale/cs
-@dirrmtry share/locale/ca/LC_MESSAGES
-@dirrmtry share/locale/ca
+@dirrmtry share/locale/xh/LC_MESSAGES
+@dirrmtry share/locale/xh
+@dirrmtry share/locale/tt/LC_MESSAGES
+@dirrmtry share/locale/tt
+@dirrmtry share/locale/sl/LC_MESSAGES
+@dirrmtry share/locale/sl
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
+@dirrmtry share/locale/oc/LC_MESSAGES
+@dirrmtry share/locale/oc
+@dirrmtry share/locale/km/LC_MESSAGES
+@dirrmtry share/locale/km
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz
diff --git a/graphics/gimp/Makefile b/graphics/gimp/Makefile
index c575aab39d8c..4990083842c8 100644
--- a/graphics/gimp/Makefile
+++ b/graphics/gimp/Makefile
@@ -3,11 +3,11 @@
 # Whom:                 erich@FreeBSD.org
 #
 # $FreeBSD$
-#   $MCom: ports/graphics/gimp/Makefile,v 1.9 2007/04/04 14:54:04 ahze Exp $
+#   $MCom: ports/graphics/gimp/Makefile,v 1.12 2007/10/24 21:31:11 ahze Exp $
 #
 
 PORTNAME=	gimp
-PORTVERSION?=	2.2.17
+DISTVERSION?=	2.4.0
 PORTEPOCH?=	2
 CATEGORIES=	graphics gnome
 MASTER_SITES?=	# empty
@@ -17,9 +17,10 @@ EXTRACT_ONLY?=	# empty
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	The "meta-port" for The Gimp
 
-RUN_DEPENDS=	gimp-2.2:${PORTSDIR}/graphics/gimp-app
+RUN_DEPENDS=	gimp-2.4:${PORTSDIR}/graphics/gimp-app
 
-OPTIONS=	PRINT "Gutenprint (gimp-print) plugin" On \
+OPTIONS=	PYTHON "Python-fu support" Off \
+		PRINT "Gutenprint (gimp-print) plugin" On \
 		HELP "Install Gimp-Help (50+MB distfile)" Off
 
 NO_BUILD=	yes
@@ -30,12 +31,12 @@ NO_BUILD=	yes
 RUN_DEPENDS+=	gimp-help>0:${PORTSDIR}/graphics/gimp-help
 .endif
 
-#.if defined(WITH_PYTHON)
-#RUN_DEPENDS+=	${LOCALBASE}/libexec/gimp/2.2/environ/pygimp.env:${PORTSDIR}/graphics/py-gimp
-#.endif
+.if defined(WITH_PYTHON)
+RUN_DEPENDS+=	${LOCALBASE}/libexec/gimp/2.2/environ/pygimp.env:${PORTSDIR}/graphics/py-gimp
+.endif
 
 .if !defined(WITHOUT_PRINT)
-RUN_DEPENDS+=	${LOCALBASE}/libexec/gimp/2.2/plug-ins/print:${PORTSDIR}/print/gimp-gutenprint
+RUN_DEPENDS+=	${LOCALBASE}/libexec/gimp/2.2/plug-ins/gutenprint:${PORTSDIR}/print/gimp-gutenprint
 .endif
 
 do-install:	# empty
diff --git a/graphics/gimpshop/Makefile b/graphics/gimpshop/Makefile
index b2ca7ec194ce..9cb82437766e 100644
--- a/graphics/gimpshop/Makefile
+++ b/graphics/gimpshop/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gimpshop
 PORTVERSION=	2.2.11
-PORTREVISION=	6
+PORTREVISION=	8
 CATEGORIES=	graphics gnome
 MASTER_SITES=	http://www.plasticbugs.com/blogimg/ \
 		http://freebsd.powered.net/distfiles/
@@ -33,7 +33,8 @@ USE_XPM=	yes
 USE_GMAKE=	yes
 USE_GETTEXT=	yes
 GNU_CONFIGURE=	yes
-USE_GNOME=	gnomehack intltool intlhack gtk20 libartlgpl2 librsvg2
+USE_GNOME=	gnomehack intltool intlhack gtk20 libartlgpl2 librsvg2 \
+		desktopfileutils
 WANT_GNOME=	yes
 INSTALLS_SHLIB=	yes
 PLIST_SUB=	SHLIBVER="${SHLIBVER}"
@@ -41,7 +42,8 @@ CONFIGURE_ARGS=	--disable-perl \
 		--with-html-dir=${DOCSDIR} \
 		--disable-gtk-doc \
 		--enable-static \
-		--disable-print
+		--disable-print \
+		--with-desktop-dir=${LOCALBASE}/share
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
 
@@ -79,8 +81,7 @@ CONFIGURE_ARGS+=	--enable-mp
 .endif
 
 .if ${HAVE_GNOME:Mgnomepanel}!=""
-USE_GNOME+=		gnomepanel desktopfileutils
-CONFIGURE_ARGS+=	--with-desktop-dir=${LOCALBASE}/share/gnome
+USE_GNOME+=		gnomepanel
 CONFIGURE_ENV+=		GIMP_THREAD_LIBS=${PTHREAD_LIBS}
 PLIST_SUB+=		GNOMEPANEL:=""
 GNOME_ENABLED=		yes
diff --git a/graphics/gimpshop/pkg-plist b/graphics/gimpshop/pkg-plist
index fe101f895dd7..f5de9d7a8a28 100644
--- a/graphics/gimpshop/pkg-plist
+++ b/graphics/gimpshop/pkg-plist
@@ -1207,10 +1207,10 @@ share/gimp/menus/vectors-menu.xml
 share/gimp/misc/gimp.applications
 share/gimp/misc/gimp.desktop
 share/gimp/misc/gimp.keys
-%%GNOMEPANEL:%%share/gnome/application-registry/gimp-2.2.applications
-%%GNOMEPANEL:%%share/gnome/applications/gimp-2.2.desktop
-%%GNOMEPANEL:%%@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
-%%GNOMEPANEL:%%share/gnome/mime-info/gimp-2.2.keys
+share/application-registry/gimp-2.2.applications
+share/applications/gimp-2.2.desktop
+@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
+share/mime-info/gimp-2.2.keys
 share/gimp/palettes/Bears.gpl
 share/gimp/palettes/Bgold.gpl
 share/gimp/palettes/Blues.gpl
@@ -1936,6 +1936,7 @@ share/locale/zh_TW/LC_MESSAGES/gimp20.mo
 @dirrm include/gimp-2.0
 @dirrmtry etc/gimp/2.2
 @dirrmtry etc/gimp
-%%GNOMEPANEL:%%@unexec %%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/applications
diff --git a/graphics/giram/Makefile b/graphics/giram/Makefile
index 130ea68bc45e..9796579c95f1 100644
--- a/graphics/giram/Makefile
+++ b/graphics/giram/Makefile
@@ -46,6 +46,8 @@ MAN1=		giram.1
 
 post-patch:
 	@${REINPLACE_CMD} -e '36s,static ,,' ${WRKSRC}/src/tools/tool_disc.c
+	@${REINPLACE_CMD} -e 's|-D.*_DISABLE_DEPRECATED||g' \
+		${WRKSRC}/configure
 
 post-install:
 .if !defined(NOPORTDOCS)
diff --git a/graphics/gliv/Makefile b/graphics/gliv/Makefile
index 56bdc06adddb..9a05698ea8b9 100644
--- a/graphics/gliv/Makefile
+++ b/graphics/gliv/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gliv
 PORTVERSION=	1.9.6
-PORTREVISION=	1
+PORTREVISION=	3
 CATEGORIES=	graphics
 MASTER_SITES=	http://guichaz.free.fr/gliv/files/
 
@@ -35,9 +35,10 @@ CPPFLAGS=	-I${LOCALBASE}/include
 LDFLAGS=	-L${LOCALBASE}/lib
 
 post-install:
+	${MKDIR} ${PREFIX}/share/applications
 	${INSTALL_DATA} ${WRKSRC}/gliv.desktop \
-		${PREFIX}/share/gnome/applications
+		${PREFIX}/share/applications
 	${INSTALL_DATA} ${WRKSRC}/gliv.png \
-		${PREFIX}/share/gnome/pixmaps
+		${PREFIX}/share/pixmaps
 
 .include <bsd.port.mk>
diff --git a/graphics/gliv/pkg-plist b/graphics/gliv/pkg-plist
index cd8aada0f0ea..b82fc2fd02c4 100644
--- a/graphics/gliv/pkg-plist
+++ b/graphics/gliv/pkg-plist
@@ -1,6 +1,6 @@
 bin/gliv
-share/gnome/applications/gliv.desktop
-share/gnome/pixmaps/gliv.png
+share/applications/gliv.desktop
+share/pixmaps/gliv.png
 share/locale/bg/LC_MESSAGES/gliv.mo
 share/locale/de/LC_MESSAGES/gliv.mo
 share/locale/fr/LC_MESSAGES/gliv.mo
@@ -21,3 +21,4 @@ share/locale/vi/LC_MESSAGES/gliv.mo
 @dirrmtry man/de
 @dirrmtry share/locale/rw/LC_MESSAGES
 @dirrmtry share/locale/rw
+@dirrmtry share/applications
diff --git a/graphics/gnomeiconedit/Makefile b/graphics/gnomeiconedit/Makefile
index fa1c147970d1..991cd436c123 100644
--- a/graphics/gnomeiconedit/Makefile
+++ b/graphics/gnomeiconedit/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gnomeiconedit
 PORTVERSION=	1.2.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	graphics gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	giconedit
diff --git a/graphics/gnomeiconedit/files/patch-aa b/graphics/gnomeiconedit/files/patch-aa
index bfc7352c9474..e5375dbc46b9 100644
--- a/graphics/gnomeiconedit/files/patch-aa
+++ b/graphics/gnomeiconedit/files/patch-aa
@@ -1,5 +1,3 @@
-$NetBSD$
-
 --- src/menus.c.orig	Thu Jun 22 19:31:59 2000
 +++ src/menus.c
 @@ -36,7 +36,6 @@
diff --git a/graphics/gnomeiconedit/files/patch-src::Makefile.in b/graphics/gnomeiconedit/files/patch-src::Makefile.in
index 98b99558f1b5..888dc4e4093c 100644
--- a/graphics/gnomeiconedit/files/patch-src::Makefile.in
+++ b/graphics/gnomeiconedit/files/patch-src::Makefile.in
@@ -7,8 +7,8 @@ $FreeBSD$
  
  bin_PROGRAMS = gnome-iconedit $(COMPONENT)
  
--INCLUDES =   -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\"  -DGNOMEDATADIR=\""$(datadir)"\"  -I$(includedir)  -I$(top_srcdir)  -I$(top_srcdir)/src/widgets  $(GNOME_INCLUDEDIR)
-+INCLUDES =   $(GDK_PIXBUF_CFLAGS) -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\"  -DGNOMEDATADIR=\""$(datadir)"\"  -I$(includedir)  -I$(top_srcdir)  -I$(top_srcdir)/src/widgets  $(GNOME_INCLUDEDIR)
+-INCLUDES =   -DGNOMELOCALEDIR=\""$(datadir)/locale"\"  -DGNOMEDATADIR=\""$(datadir)"\"  -I$(includedir)  -I$(top_srcdir)  -I$(top_srcdir)/src/widgets  $(GNOME_INCLUDEDIR)
++INCLUDES =   $(GDK_PIXBUF_CFLAGS) -DGNOMELOCALEDIR=\""$(datadir)/locale"\"  -DGNOMEDATADIR=\""$(datadir)"\"  -I$(includedir)  -I$(top_srcdir)  -I$(top_srcdir)/src/widgets  $(GNOME_INCLUDEDIR)
  
  
  CORBA_GENERATED =  	Iconedit.h			Iconedit-stubs.c		Iconedit-skels.c		Iconedit-common.c	
diff --git a/graphics/gnomeiconedit/pkg-plist b/graphics/gnomeiconedit/pkg-plist
index e05764d0b20f..8683782713d9 100644
--- a/graphics/gnomeiconedit/pkg-plist
+++ b/graphics/gnomeiconedit/pkg-plist
@@ -2,23 +2,23 @@ bin/gnome-iconedit
 etc/CORBA/servers/gnome-iconedit.gnorba
 share/gnome/apps/Graphics/gnome-iconedit.desktop
 share/gnome/help/gnome-iconedit/C/topic.dat
-share/gnome/idl/Iconedit.idl
-share/gnome/oaf/gnome-iconedit.oafinfo
-share/gnome/pixmaps/gnome-iconedit/cheques.png
-share/gnome/pixmaps/gnome-iconedit/dropper.png
-share/gnome/pixmaps/gnome-iconedit/empty-circle.png
-share/gnome/pixmaps/gnome-iconedit/empty-square.png
-share/gnome/pixmaps/gnome-iconedit/fill.png
-share/gnome/pixmaps/gnome-iconedit/filled-circle.png
-share/gnome/pixmaps/gnome-iconedit/filled-square.png
-share/gnome/pixmaps/gnome-iconedit/gnome-iconedit.png
-share/gnome/pixmaps/gnome-iconedit/gnome-tasklist.png
-share/gnome/pixmaps/gnome-iconedit/gridlines.png
-share/gnome/pixmaps/gnome-iconedit/line.png
-share/gnome/pixmaps/gnome-iconedit/paint.png
-share/gnome/pixmaps/gnome-iconedit/palette-edit.png
-share/gnome/pixmaps/gnome-iconedit/roller.png
-share/gnome/pixmaps/gnome-iconedit/selector.png
+share/idl/Iconedit.idl
+share/oaf/gnome-iconedit.oafinfo
+share/pixmaps/gnome-iconedit/cheques.png
+share/pixmaps/gnome-iconedit/dropper.png
+share/pixmaps/gnome-iconedit/empty-circle.png
+share/pixmaps/gnome-iconedit/empty-square.png
+share/pixmaps/gnome-iconedit/fill.png
+share/pixmaps/gnome-iconedit/filled-circle.png
+share/pixmaps/gnome-iconedit/filled-square.png
+share/pixmaps/gnome-iconedit/gnome-iconedit.png
+share/pixmaps/gnome-iconedit/gnome-tasklist.png
+share/pixmaps/gnome-iconedit/gridlines.png
+share/pixmaps/gnome-iconedit/line.png
+share/pixmaps/gnome-iconedit/paint.png
+share/pixmaps/gnome-iconedit/palette-edit.png
+share/pixmaps/gnome-iconedit/roller.png
+share/pixmaps/gnome-iconedit/selector.png
 share/locale/de/LC_MESSAGES/gnome-iconedit.mo
 share/locale/en_GB/LC_MESSAGES/gnome-iconedit.mo
 share/locale/fr/LC_MESSAGES/gnome-iconedit.mo
@@ -27,6 +27,6 @@ share/locale/ru/LC_MESSAGES/gnome-iconedit.mo
 share/locale/sv/LC_MESSAGES/gnome-iconedit.mo
 share/locale/tr/LC_MESSAGES/gnome-iconedit.mo
 share/locale/wa/LC_MESSAGES/gnome-iconedit.mo
-@dirrm share/gnome/pixmaps/gnome-iconedit
+@dirrm share/pixmaps/gnome-iconedit
 @dirrm share/gnome/help/gnome-iconedit/C
 @dirrm share/gnome/help/gnome-iconedit
diff --git a/graphics/gqview-devel/Makefile b/graphics/gqview-devel/Makefile
index 91b850c726da..6927934144c9 100644
--- a/graphics/gqview-devel/Makefile
+++ b/graphics/gqview-devel/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gqview
 PORTVERSION=	2.1.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -37,8 +37,8 @@ post-patch:
 post-install:
 	${MKDIR} ${PREFIX}/share/gnome/apps/Graphics
 	${INSTALL_DATA} ${WRKSRC}/gqview.desktop ${PREFIX}/share/gnome/apps/Graphics
-	${MKDIR} ${PREFIX}/share/gnome/pixmaps
-	${INSTALL_DATA} ${WRKSRC}/gqview.png ${PREFIX}/share/gnome/pixmaps
+	${MKDIR} ${PREFIX}/share/pixmaps
+	${INSTALL_DATA} ${WRKSRC}/gqview.png ${PREFIX}/share/pixmaps
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
diff --git a/graphics/gqview-devel/pkg-plist b/graphics/gqview-devel/pkg-plist
index 27ab1178d725..86ee5e2caaab 100644
--- a/graphics/gqview-devel/pkg-plist
+++ b/graphics/gqview-devel/pkg-plist
@@ -80,6 +80,6 @@ share/locale/vi/LC_MESSAGES/gqview.mo
 share/locale/zh_CN.GB2312/LC_MESSAGES/gqview.mo
 share/locale/zh_TW/LC_MESSAGES/gqview.mo
 share/gnome/apps/Graphics/gqview.desktop
-share/gnome/pixmaps/gqview.png
+share/pixmaps/gqview.png
 @dirrm %%DOCSDIR%%/html
 @dirrm %%DOCSDIR%%
diff --git a/graphics/gqview/Makefile b/graphics/gqview/Makefile
index 5db5dddad63d..e2d8e4d42b7b 100644
--- a/graphics/gqview/Makefile
+++ b/graphics/gqview/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gqview
 PORTVERSION=	2.0.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -47,7 +47,7 @@ post-patch:
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/gqview.desktop ${PREFIX}/share/gnome/apps/Graphics
-	${INSTALL_DATA} ${WRKSRC}/gqview.png ${PREFIX}/share/gnome/pixmaps
+	${INSTALL_DATA} ${WRKSRC}/gqview.png ${PREFIX}/share/pixmaps
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
diff --git a/graphics/gqview/pkg-plist b/graphics/gqview/pkg-plist
index 50182a6b6829..2ad19f880edb 100644
--- a/graphics/gqview/pkg-plist
+++ b/graphics/gqview/pkg-plist
@@ -33,4 +33,4 @@ bin/gqview
 %%NLS%%share/locale/zh_CN.GB2312/LC_MESSAGES/gqview.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/gqview.mo
 share/gnome/apps/Graphics/gqview.desktop
-share/gnome/pixmaps/gqview.png
+share/pixmaps/gqview.png
diff --git a/graphics/gthumb/Makefile b/graphics/gthumb/Makefile
index dc69b2161a64..6b1a394e3102 100644
--- a/graphics/gthumb/Makefile
+++ b/graphics/gthumb/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gthumb
 PORTVERSION=	2.10.6
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.10
diff --git a/graphics/gthumb/pkg-plist b/graphics/gthumb/pkg-plist
index f0564e496e5a..a2d6e3ccb80c 100644
--- a/graphics/gthumb/pkg-plist
+++ b/graphics/gthumb/pkg-plist
@@ -21,91 +21,91 @@ lib/libgthumb.a
 lib/libgthumb.la
 lib/libgthumb.so
 libdata/bonobo/servers/GNOME_GThumb.server
-share/gnome/applications/gthumb.desktop
-share/gnome/gthumb/albumthemes/BestFit/back.png
-share/gnome/gthumb/albumthemes/BestFit/BestFit.css
-share/gnome/gthumb/albumthemes/BestFit/BestFit.js
-share/gnome/gthumb/albumthemes/BestFit/image.gthtml
-share/gnome/gthumb/albumthemes/BestFit/index.gthtml
-share/gnome/gthumb/albumthemes/BestFit/index.js
-share/gnome/gthumb/albumthemes/BestFit/lib.js
-share/gnome/gthumb/albumthemes/BestFit/next.png
-share/gnome/gthumb/albumthemes/BestFit/preview.png
-share/gnome/gthumb/albumthemes/BestFit/prev.png
-share/gnome/gthumb/albumthemes/BestFit/thumbnail.gthtml
-share/gnome/gthumb/albumthemes/Classic/1.gif
-share/gnome/gthumb/albumthemes/Classic/back.png
-share/gnome/gthumb/albumthemes/Classic/background.gif
-share/gnome/gthumb/albumthemes/Classic/bot.png
-share/gnome/gthumb/albumthemes/Classic/image.gthtml
-share/gnome/gthumb/albumthemes/Classic/index.gthtml
-share/gnome/gthumb/albumthemes/Classic/layout.css
-share/gnome/gthumb/albumthemes/Classic/left.png
-share/gnome/gthumb/albumthemes/Classic/next.png
-share/gnome/gthumb/albumthemes/Classic/prev.png
-share/gnome/gthumb/albumthemes/Classic/preview.png
-share/gnome/gthumb/albumthemes/Classic/right.png
-share/gnome/gthumb/albumthemes/Classic/style.css
-share/gnome/gthumb/albumthemes/Classic/thumbnail.gthtml
-share/gnome/gthumb/albumthemes/Classic/top.png
-share/gnome/gthumb/albumthemes/ClassicClips/1.gif
-share/gnome/gthumb/albumthemes/ClassicClips/back.png
-share/gnome/gthumb/albumthemes/ClassicClips/background.gif
-share/gnome/gthumb/albumthemes/ClassicClips/bot.png
-share/gnome/gthumb/albumthemes/ClassicClips/image.gthtml
-share/gnome/gthumb/albumthemes/ClassicClips/index.gthtml
-share/gnome/gthumb/albumthemes/ClassicClips/layout.css
-share/gnome/gthumb/albumthemes/ClassicClips/left.png
-share/gnome/gthumb/albumthemes/ClassicClips/next.png
-share/gnome/gthumb/albumthemes/ClassicClips/prev.png
-share/gnome/gthumb/albumthemes/ClassicClips/preview.png
-share/gnome/gthumb/albumthemes/ClassicClips/right.png
-share/gnome/gthumb/albumthemes/ClassicClips/style.css
-share/gnome/gthumb/albumthemes/ClassicClips/thumbnail.gthtml
-share/gnome/gthumb/albumthemes/ClassicClips/top.png
-share/gnome/gthumb/albumthemes/Flicker/image.gthtml
-share/gnome/gthumb/albumthemes/Flicker/index.gthtml
-share/gnome/gthumb/albumthemes/Flicker/layout.css
-share/gnome/gthumb/albumthemes/Flicker/preview.png
-share/gnome/gthumb/albumthemes/Flicker/style.css
-share/gnome/gthumb/albumthemes/Flicker/thumbnail.gthtml
-share/gnome/gthumb/albumthemes/NeatRound/1.gif
-share/gnome/gthumb/albumthemes/NeatRound/back.png
-share/gnome/gthumb/albumthemes/NeatRound/background.gif
-share/gnome/gthumb/albumthemes/NeatRound/bot.png
-share/gnome/gthumb/albumthemes/NeatRound/image.gthtml
-share/gnome/gthumb/albumthemes/NeatRound/index.gthtml
-share/gnome/gthumb/albumthemes/NeatRound/layout.css
-share/gnome/gthumb/albumthemes/NeatRound/left.png
-share/gnome/gthumb/albumthemes/NeatRound/next.png
-share/gnome/gthumb/albumthemes/NeatRound/prev.png
-share/gnome/gthumb/albumthemes/NeatRound/preview.png
-share/gnome/gthumb/albumthemes/NeatRound/right.png
-share/gnome/gthumb/albumthemes/NeatRound/style.css
-share/gnome/gthumb/albumthemes/NeatRound/thumbnail.gthtml
-share/gnome/gthumb/albumthemes/NeatRound/top.png
-share/gnome/gthumb/albumthemes/Wiki/image.gthtml
-share/gnome/gthumb/albumthemes/Wiki/index.gthtml
-share/gnome/gthumb/albumthemes/Wiki/layout.css
-share/gnome/gthumb/albumthemes/Wiki/preview.png
-share/gnome/gthumb/albumthemes/Wiki/style.css
-share/gnome/gthumb/albumthemes/Wiki/thumbnail.gthtml
-share/gnome/gthumb/glade/ftp-client-48.png
-share/gnome/gthumb/glade/gphoto-48.png
-share/gnome/gthumb/glade/gthumb.glade
-share/gnome/gthumb/glade/gthumb_camera.glade
-share/gnome/gthumb/glade/gthumb_comments.glade
-share/gnome/gthumb/glade/gthumb_convert.glade
-share/gnome/gthumb/glade/gthumb_crop.glade
-share/gnome/gthumb/glade/gthumb_edit.glade
-share/gnome/gthumb/glade/gthumb_png_exporter.glade
-share/gnome/gthumb/glade/gthumb_preferences.glade
-share/gnome/gthumb/glade/gthumb_print.glade
-share/gnome/gthumb/glade/gthumb_redeye.glade
-share/gnome/gthumb/glade/gthumb_search.glade
-share/gnome/gthumb/glade/gthumb_tools.glade
-share/gnome/gthumb/glade/gthumb_web_exporter.glade
-share/gnome/gthumb/glade/volume-mute.png
+share/applications/gthumb.desktop
+share/gthumb/albumthemes/BestFit/back.png
+share/gthumb/albumthemes/BestFit/BestFit.css
+share/gthumb/albumthemes/BestFit/BestFit.js
+share/gthumb/albumthemes/BestFit/image.gthtml
+share/gthumb/albumthemes/BestFit/index.gthtml
+share/gthumb/albumthemes/BestFit/index.js
+share/gthumb/albumthemes/BestFit/lib.js
+share/gthumb/albumthemes/BestFit/next.png
+share/gthumb/albumthemes/BestFit/preview.png
+share/gthumb/albumthemes/BestFit/prev.png
+share/gthumb/albumthemes/BestFit/thumbnail.gthtml
+share/gthumb/albumthemes/Classic/1.gif
+share/gthumb/albumthemes/Classic/back.png
+share/gthumb/albumthemes/Classic/background.gif
+share/gthumb/albumthemes/Classic/bot.png
+share/gthumb/albumthemes/Classic/image.gthtml
+share/gthumb/albumthemes/Classic/index.gthtml
+share/gthumb/albumthemes/Classic/layout.css
+share/gthumb/albumthemes/Classic/left.png
+share/gthumb/albumthemes/Classic/next.png
+share/gthumb/albumthemes/Classic/prev.png
+share/gthumb/albumthemes/Classic/preview.png
+share/gthumb/albumthemes/Classic/right.png
+share/gthumb/albumthemes/Classic/style.css
+share/gthumb/albumthemes/Classic/thumbnail.gthtml
+share/gthumb/albumthemes/Classic/top.png
+share/gthumb/albumthemes/ClassicClips/1.gif
+share/gthumb/albumthemes/ClassicClips/back.png
+share/gthumb/albumthemes/ClassicClips/background.gif
+share/gthumb/albumthemes/ClassicClips/bot.png
+share/gthumb/albumthemes/ClassicClips/image.gthtml
+share/gthumb/albumthemes/ClassicClips/index.gthtml
+share/gthumb/albumthemes/ClassicClips/layout.css
+share/gthumb/albumthemes/ClassicClips/left.png
+share/gthumb/albumthemes/ClassicClips/next.png
+share/gthumb/albumthemes/ClassicClips/prev.png
+share/gthumb/albumthemes/ClassicClips/preview.png
+share/gthumb/albumthemes/ClassicClips/right.png
+share/gthumb/albumthemes/ClassicClips/style.css
+share/gthumb/albumthemes/ClassicClips/thumbnail.gthtml
+share/gthumb/albumthemes/ClassicClips/top.png
+share/gthumb/albumthemes/Flicker/image.gthtml
+share/gthumb/albumthemes/Flicker/index.gthtml
+share/gthumb/albumthemes/Flicker/layout.css
+share/gthumb/albumthemes/Flicker/preview.png
+share/gthumb/albumthemes/Flicker/style.css
+share/gthumb/albumthemes/Flicker/thumbnail.gthtml
+share/gthumb/albumthemes/NeatRound/1.gif
+share/gthumb/albumthemes/NeatRound/back.png
+share/gthumb/albumthemes/NeatRound/background.gif
+share/gthumb/albumthemes/NeatRound/bot.png
+share/gthumb/albumthemes/NeatRound/image.gthtml
+share/gthumb/albumthemes/NeatRound/index.gthtml
+share/gthumb/albumthemes/NeatRound/layout.css
+share/gthumb/albumthemes/NeatRound/left.png
+share/gthumb/albumthemes/NeatRound/next.png
+share/gthumb/albumthemes/NeatRound/prev.png
+share/gthumb/albumthemes/NeatRound/preview.png
+share/gthumb/albumthemes/NeatRound/right.png
+share/gthumb/albumthemes/NeatRound/style.css
+share/gthumb/albumthemes/NeatRound/thumbnail.gthtml
+share/gthumb/albumthemes/NeatRound/top.png
+share/gthumb/albumthemes/Wiki/image.gthtml
+share/gthumb/albumthemes/Wiki/index.gthtml
+share/gthumb/albumthemes/Wiki/layout.css
+share/gthumb/albumthemes/Wiki/preview.png
+share/gthumb/albumthemes/Wiki/style.css
+share/gthumb/albumthemes/Wiki/thumbnail.gthtml
+share/gthumb/glade/ftp-client-48.png
+share/gthumb/glade/gphoto-48.png
+share/gthumb/glade/gthumb.glade
+share/gthumb/glade/gthumb_camera.glade
+share/gthumb/glade/gthumb_comments.glade
+share/gthumb/glade/gthumb_convert.glade
+share/gthumb/glade/gthumb_crop.glade
+share/gthumb/glade/gthumb_edit.glade
+share/gthumb/glade/gthumb_png_exporter.glade
+share/gthumb/glade/gthumb_preferences.glade
+share/gthumb/glade/gthumb_print.glade
+share/gthumb/glade/gthumb_redeye.glade
+share/gthumb/glade/gthumb_search.glade
+share/gthumb/glade/gthumb_tools.glade
+share/gthumb/glade/gthumb_web_exporter.glade
+share/gthumb/glade/volume-mute.png
 share/gnome/help/gthumb/C/figures/comment.png
 share/gnome/help/gthumb/C/figures/main-win.png
 share/gnome/help/gthumb/C/figures/nav-button.png
@@ -122,9 +122,9 @@ share/gnome/help/gthumb/sv/figures/main-win.png
 share/gnome/help/gthumb/sv/figures/nav-button.png
 share/gnome/help/gthumb/sv/figures/preferences.png
 share/gnome/help/gthumb/sv/gthumb.xml
-share/gnome/omf/gthumb/gthumb-C.omf
-share/gnome/omf/gthumb/gthumb-es.omf
-share/gnome/omf/gthumb/gthumb-sv.omf
+share/omf/gthumb/gthumb-C.omf
+share/omf/gthumb/gthumb-es.omf
+share/omf/gthumb/gthumb-sv.omf
 share/icons/hicolor/48x48/apps/gthumb.png
 share/locale/am/LC_MESSAGES/gthumb.mo
 share/locale/ar/LC_MESSAGES/gthumb.mo
@@ -183,7 +183,7 @@ share/locale/xh/LC_MESSAGES/gthumb.mo
 share/locale/zh_CN/LC_MESSAGES/gthumb.mo
 share/locale/zh_HK/LC_MESSAGES/gthumb.mo
 share/locale/zh_TW/LC_MESSAGES/gthumb.mo
-@dirrm share/gnome/omf/gthumb
+@dirrm share/omf/gthumb
 @dirrm share/gnome/help/gthumb/sv/figures
 @dirrm share/gnome/help/gthumb/sv
 @dirrm share/gnome/help/gthumb/es/figures
@@ -191,14 +191,15 @@ share/locale/zh_TW/LC_MESSAGES/gthumb.mo
 @dirrm share/gnome/help/gthumb/C/figures
 @dirrm share/gnome/help/gthumb/C
 @dirrm share/gnome/help/gthumb
-@dirrm share/gnome/gthumb/glade
-@dirrm share/gnome/gthumb/albumthemes/Wiki
-@dirrm share/gnome/gthumb/albumthemes/NeatRound
-@dirrm share/gnome/gthumb/albumthemes/Flicker
-@dirrm share/gnome/gthumb/albumthemes/ClassicClips
-@dirrm share/gnome/gthumb/albumthemes/Classic
-@dirrm share/gnome/gthumb/albumthemes/BestFit
-@dirrm share/gnome/gthumb/albumthemes
-@dirrm share/gnome/gthumb
+@dirrm share/gthumb/glade
+@dirrm share/gthumb/albumthemes/Wiki
+@dirrm share/gthumb/albumthemes/NeatRound
+@dirrm share/gthumb/albumthemes/Flicker
+@dirrm share/gthumb/albumthemes/ClassicClips
+@dirrm share/gthumb/albumthemes/Classic
+@dirrm share/gthumb/albumthemes/BestFit
+@dirrm share/gthumb/albumthemes
+@dirrm share/gthumb
 @dirrm lib/gthumb/modules
 @dirrm lib/gthumb
+@dirrmtry share/applications
diff --git a/graphics/gtkam/Makefile b/graphics/gtkam/Makefile
index 7e71664909f3..c8b4c51e1555 100644
--- a/graphics/gtkam/Makefile
+++ b/graphics/gtkam/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gtkam
 PORTVERSION=	0.1.14
-PORTREVISION=	1
+PORTREVISION=	3
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	gphoto
@@ -46,7 +46,6 @@ PKGNAMESUFFIX=	-gnome
 USE_GNOME+=	gnomeprefix libgnomeui
 INSTALLS_OMF=	yes
 MAKE_ENV+=	GNOME_SUBDIRS="help omf-install"
-DATADIR=	${PREFIX}/share/gnome/${PORTNAME}
 .else
 CONFIGURE_ARGS+=	--without-bonobo --without-gnome
 MAKE_ENV+=	GNOME_SUBDIRS=""
@@ -68,10 +67,11 @@ post-patch:
 		 s|$$(libdir)/gimp/|$$(libexecdir)/gimp/|g'
 
 post-install:
+	${MKDIR} ${PREFIX}/share/applications
 	${INSTALL_DATA} ${WRKSRC}/gtkam.desktop \
-		${PREFIX}/share/gnome/applications
+		${PREFIX}/share/applications
 	${INSTALL_DATA} ${WRKSRC}/gtkam.png \
-		${PREFIX}/share/gnome/pixmaps
+		${PREFIX}/share/pixmaps
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 .for file in AUTHORS NEWS README
diff --git a/graphics/gtkam/pkg-plist b/graphics/gtkam/pkg-plist
index 65e033494582..083fb47fbe83 100644
--- a/graphics/gtkam/pkg-plist
+++ b/graphics/gtkam/pkg-plist
@@ -3,7 +3,7 @@ bin/gtkam
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
 %%PORTDOCS%%%%DOCSDIR%%/README
-share/gnome/applications/gtkam.desktop
+share/applications/gtkam.desktop
 %%GNOME:%%share/gnome/help/gtkam/C/figures/gtkam_add_camera_enhanced_window.png
 %%GNOME:%%share/gnome/help/gtkam/C/figures/gtkam_add_camera_window.png
 %%GNOME:%%share/gnome/help/gtkam/C/figures/gtkam_fileinfo.png
@@ -22,9 +22,9 @@ share/gnome/applications/gtkam.desktop
 %%GNOME:%%share/gnome/help/gtkam/ru/figures/gtkam_start_window.png
 %%GNOME:%%share/gnome/help/gtkam/ru/gtkam.xml
 %%GNOME:%%share/gnome/help/gtkam/ru/legal.xml
-%%GNOME:%%share/gnome/omf/gtkam/gtkam-C.omf
-%%GNOME:%%share/gnome/omf/gtkam/gtkam-ru.omf
-share/gnome/pixmaps/gtkam.png
+%%GNOME:%%share/omf/gtkam/gtkam-C.omf
+%%GNOME:%%share/omf/gtkam/gtkam-ru.omf
+share/pixmaps/gtkam.png
 %%DATADIR%%/images/gtkam-audio.png
 %%DATADIR%%/images/gtkam-camera.png
 %%DATADIR%%/images/gtkam-folder-camera.png
@@ -56,10 +56,11 @@ share/locale/uk/LC_MESSAGES/gtkam.mo
 @dirrm %%DATADIR%%/pixmaps
 @dirrm %%DATADIR%%/images
 @dirrm %%DATADIR%%
-%%GNOME:%%@dirrm share/gnome/omf/gtkam
+%%GNOME:%%@dirrm share/omf/gtkam
 %%GNOME:%%@dirrm share/gnome/help/gtkam/ru/figures
 %%GNOME:%%@dirrm share/gnome/help/gtkam/ru
 %%GNOME:%%@dirrm share/gnome/help/gtkam/C/figures
 %%GNOME:%%@dirrm share/gnome/help/gtkam/C
 %%GNOME:%%@dirrm share/gnome/help/gtkam
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrmtry share/applications
diff --git a/graphics/jumpgis/Makefile b/graphics/jumpgis/Makefile
index a8aa90ab45f2..7e2b76162e28 100644
--- a/graphics/jumpgis/Makefile
+++ b/graphics/jumpgis/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	jumpgis
 PORTVERSION=	1.1.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	graphics java geography
 MASTER_SITES=	http://www.jump-project.org/downloads/jump/:main \
 		http://people.tecnik93.com/~sam/ports/:extra
@@ -63,8 +63,8 @@ do-install:
 
 .if ${HAVE_GNOME:Mgnomelibs}!=""
 	@${ECHO_MSG} "---> Installing GNOME application links"
-	${INSTALL_DATA} ${DISTDIR}/jump.desktop ${LOCALBASE}/share/gnome/applications/
-	${INSTALL_DATA} ${DISTDIR}/jump.png ${LOCALBASE}/share/gnome/pixmaps/
+	${INSTALL_DATA} ${DISTDIR}/jump.desktop ${LOCALBASE}/share/applications/
+	${INSTALL_DATA} ${DISTDIR}/jump.png ${LOCALBASE}/share/pixmaps/
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/graphics/jumpgis/pkg-plist b/graphics/jumpgis/pkg-plist
index d753d8493ea9..ebce4101284f 100644
--- a/graphics/jumpgis/pkg-plist
+++ b/graphics/jumpgis/pkg-plist
@@ -7,9 +7,10 @@ jumpgis/lib/jump-1.1.2.jar
 jumpgis/lib/junit.jar
 jumpgis/lib/xercesImpl.jar
 jumpgis/lib/xml-apis.jar
-%%GNOMELINKS%%share/gnome/applications/jump.desktop
-%%GNOMELINKS%%share/gnome/pixmaps/jump.png
+%%GNOMELINKS%%share/applications/jump.desktop
+%%GNOMELINKS%%share/pixmaps/jump.png
 @exec mkdir -p %D/jumpgis/lib/ext
 @dirrm jumpgis/lib/ext
 @dirrm jumpgis/lib
 @dirrm jumpgis
+@dirrmtry share/applications
diff --git a/graphics/libexif-gtk/Makefile b/graphics/libexif-gtk/Makefile
index f13f68d0f9ae..8ad942f1c973 100644
--- a/graphics/libexif-gtk/Makefile
+++ b/graphics/libexif-gtk/Makefile
@@ -23,4 +23,8 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 USE_LDCONFIG=	yes
 
+post-patch:
+	@${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} ${REINPLACE_CMD} -e \
+		's|-D.*_DISABLE_DEPRECATED||g'
+
 .include <bsd.port.mk>
diff --git a/graphics/libgnomecanvas/Makefile b/graphics/libgnomecanvas/Makefile
index 798250f3e228..190ae5dce649 100644
--- a/graphics/libgnomecanvas/Makefile
+++ b/graphics/libgnomecanvas/Makefile
@@ -3,11 +3,12 @@
 # Whom:					Maxim Sobolev <sobomax@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/graphics/libgnomecanvas/Makefile,v 1.60 2006/09/10 00:51:11 mezz Exp $
+#   $MCom: ports/graphics/libgnomecanvas/Makefile,v 1.70 2007/10/20 18:32:13 mezz Exp $
+#
 
 PORTNAME=	libgnomecanvas
-PORTVERSION=	2.14.0
-PORTREVISION?=	3
+PORTVERSION=	2.20.1.1
+PORTREVISION?=	0
 CATEGORIES=	graphics gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -25,7 +26,7 @@ USE_GETTEXT=	yes
 USE_XLIB=	yes
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool:15
-USE_GNOME=	gnomehack libglade2 libartlgpl2 ltverhack referencehack
+USE_GNOME=	gnomehack libglade2 libartlgpl2 ltverhack referencehack gail
 CONFIGURE_ARGS=	--with-html-dir=${PREFIX}/share/doc \
 		--disable-gtk-doc
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/graphics/libgnomecanvas/distinfo b/graphics/libgnomecanvas/distinfo
index cd3d87c1d1d5..ed7f2ccdb2a7 100644
--- a/graphics/libgnomecanvas/distinfo
+++ b/graphics/libgnomecanvas/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/libgnomecanvas-2.14.0.tar.bz2) = 516c46fb4a1401b05cfef58c350fbd3d
-SHA256 (gnome2/libgnomecanvas-2.14.0.tar.bz2) = 5ceadd704327c2967868b3c0c81b5e600e1c6fd4f8efcbaaf89f9b18aa8bb5cf
-SIZE (gnome2/libgnomecanvas-2.14.0.tar.bz2) = 612330
+MD5 (gnome2/libgnomecanvas-2.20.1.1.tar.bz2) = 948ed771d2957d24a0c9a414e9581055
+SHA256 (gnome2/libgnomecanvas-2.20.1.1.tar.bz2) = 70f906d52d98b7b45e95fd59ef10f06579b75ee9e70e67edabd30a4f6e5d6fe3
+SIZE (gnome2/libgnomecanvas-2.20.1.1.tar.bz2) = 583565
diff --git a/graphics/libgnomecanvas/pkg-plist b/graphics/libgnomecanvas/pkg-plist
index 3a0c4850d202..aa4944b3dc1d 100644
--- a/graphics/libgnomecanvas/pkg-plist
+++ b/graphics/libgnomecanvas/pkg-plist
@@ -27,12 +27,14 @@ share/locale/az/LC_MESSAGES/libgnomecanvas-2.0.mo
 share/locale/be/LC_MESSAGES/libgnomecanvas-2.0.mo
 share/locale/bg/LC_MESSAGES/libgnomecanvas-2.0.mo
 share/locale/bn/LC_MESSAGES/libgnomecanvas-2.0.mo
+share/locale/bn_IN/LC_MESSAGES/libgnomecanvas-2.0.mo
 share/locale/bs/LC_MESSAGES/libgnomecanvas-2.0.mo
 share/locale/ca/LC_MESSAGES/libgnomecanvas-2.0.mo
 share/locale/cs/LC_MESSAGES/libgnomecanvas-2.0.mo
 share/locale/cy/LC_MESSAGES/libgnomecanvas-2.0.mo
 share/locale/da/LC_MESSAGES/libgnomecanvas-2.0.mo
 share/locale/de/LC_MESSAGES/libgnomecanvas-2.0.mo
+share/locale/dz/LC_MESSAGES/libgnomecanvas-2.0.mo
 share/locale/el/LC_MESSAGES/libgnomecanvas-2.0.mo
 share/locale/en_CA/LC_MESSAGES/libgnomecanvas-2.0.mo
 share/locale/en_GB/LC_MESSAGES/libgnomecanvas-2.0.mo
@@ -54,12 +56,14 @@ share/locale/id/LC_MESSAGES/libgnomecanvas-2.0.mo
 share/locale/is/LC_MESSAGES/libgnomecanvas-2.0.mo
 share/locale/it/LC_MESSAGES/libgnomecanvas-2.0.mo
 share/locale/ja/LC_MESSAGES/libgnomecanvas-2.0.mo
+share/locale/ka/LC_MESSAGES/libgnomecanvas-2.0.mo
 share/locale/kn/LC_MESSAGES/libgnomecanvas-2.0.mo
 share/locale/ko/LC_MESSAGES/libgnomecanvas-2.0.mo
 share/locale/ku/LC_MESSAGES/libgnomecanvas-2.0.mo
 share/locale/li/LC_MESSAGES/libgnomecanvas-2.0.mo
 share/locale/lt/LC_MESSAGES/libgnomecanvas-2.0.mo
 share/locale/lv/LC_MESSAGES/libgnomecanvas-2.0.mo
+share/locale/mg/LC_MESSAGES/libgnomecanvas-2.0.mo
 share/locale/mk/LC_MESSAGES/libgnomecanvas-2.0.mo
 share/locale/ml/LC_MESSAGES/libgnomecanvas-2.0.mo
 share/locale/mn/LC_MESSAGES/libgnomecanvas-2.0.mo
@@ -68,7 +72,8 @@ share/locale/nb/LC_MESSAGES/libgnomecanvas-2.0.mo
 share/locale/ne/LC_MESSAGES/libgnomecanvas-2.0.mo
 share/locale/nl/LC_MESSAGES/libgnomecanvas-2.0.mo
 share/locale/nn/LC_MESSAGES/libgnomecanvas-2.0.mo
-share/locale/no/LC_MESSAGES/libgnomecanvas-2.0.mo
+share/locale/oc/LC_MESSAGES/libgnomecanvas-2.0.mo
+share/locale/or/LC_MESSAGES/libgnomecanvas-2.0.mo
 share/locale/pa/LC_MESSAGES/libgnomecanvas-2.0.mo
 share/locale/pl/LC_MESSAGES/libgnomecanvas-2.0.mo
 share/locale/pt/LC_MESSAGES/libgnomecanvas-2.0.mo
@@ -84,6 +89,7 @@ share/locale/sr@Latn/LC_MESSAGES/libgnomecanvas-2.0.mo
 share/locale/sr@ije/LC_MESSAGES/libgnomecanvas-2.0.mo
 share/locale/sv/LC_MESSAGES/libgnomecanvas-2.0.mo
 share/locale/ta/LC_MESSAGES/libgnomecanvas-2.0.mo
+share/locale/th/LC_MESSAGES/libgnomecanvas-2.0.mo
 share/locale/tr/LC_MESSAGES/libgnomecanvas-2.0.mo
 share/locale/tt/LC_MESSAGES/libgnomecanvas-2.0.mo
 share/locale/uk/LC_MESSAGES/libgnomecanvas-2.0.mo
@@ -108,7 +114,15 @@ share/locale/zh_TW/LC_MESSAGES/libgnomecanvas-2.0.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/dz/LC_MESSAGES
+@dirrmtry share/locale/dz
+@dirrmtry share/locale/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN
 @dirrmtry share/locale/ang/LC_MESSAGES
 @dirrmtry share/locale/ang
diff --git a/graphics/libgnomecanvasmm26/Makefile b/graphics/libgnomecanvasmm26/Makefile
index af3d3ac22eb9..2712f78f730e 100644
--- a/graphics/libgnomecanvasmm26/Makefile
+++ b/graphics/libgnomecanvasmm26/Makefile
@@ -3,12 +3,11 @@
 # Whom:                 Alexander Nedotsukov <bland@mail.ru>
 #
 # $FreeBSD$
-#   $MCom: ports/graphics/libgnomecanvasmm26/Makefile,v 1.14 2006/08/21 15:32:21 ahze Exp $
+#   $MCom: ports/graphics/libgnomecanvasmm26/Makefile,v 1.16 2007/09/17 16:42:56 marcus Exp $
 #
 
 PORTNAME=	libgnomecanvasmm
-PORTVERSION=	2.16.0
-PORTREVISION=	1
+PORTVERSION=	2.20.0
 CATEGORIES=	graphics gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/graphics/libgnomecanvasmm26/distinfo b/graphics/libgnomecanvasmm26/distinfo
index 87806eef911c..9bb8e0f2a27b 100644
--- a/graphics/libgnomecanvasmm26/distinfo
+++ b/graphics/libgnomecanvasmm26/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/libgnomecanvasmm-2.16.0.tar.bz2) = fe54d7f437d03044f863672d6dd38e9f
-SHA256 (gnome2/libgnomecanvasmm-2.16.0.tar.bz2) = 5f3297cb1b047bc5a02044f54847fbcd7d0044461fc5f28ee351d2d4f6b91ed7
-SIZE (gnome2/libgnomecanvasmm-2.16.0.tar.bz2) = 333980
+MD5 (gnome2/libgnomecanvasmm-2.20.0.tar.bz2) = 2a7cdcfd093db49c41e455e7b744e1c2
+SHA256 (gnome2/libgnomecanvasmm-2.20.0.tar.bz2) = 4fd42d16d286dad698724e800c968921e3a4784fd5b1d3a6a5e4f7f88e714b08
+SIZE (gnome2/libgnomecanvasmm-2.20.0.tar.bz2) = 321375
diff --git a/graphics/librsvg2/Makefile b/graphics/librsvg2/Makefile
index dbac195143fd..e0f655ab63d8 100644
--- a/graphics/librsvg2/Makefile
+++ b/graphics/librsvg2/Makefile
@@ -3,11 +3,12 @@
 # Whom:                 		Ade Lovett <ade@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/graphics/librsvg2/Makefile,v 1.109 2006/10/02 04:52:51 bland Exp $
+#   $MCom: ports/graphics/librsvg2/Makefile,v 1.117 2007/08/29 20:04:44 mezz Exp $
 #
 
 PORTNAME=	librsvg2
 PORTVERSION=	2.18.2
+PORTREVISION=	1
 CATEGORIES=	graphics gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/graphics/librsvg2/pkg-plist b/graphics/librsvg2/pkg-plist
index ceeb03c21173..e437b5ef6ca9 100644
--- a/graphics/librsvg2/pkg-plist
+++ b/graphics/librsvg2/pkg-plist
@@ -36,7 +36,7 @@ share/doc/rsvg/rsvg.devhelp2
 share/doc/rsvg/rsvg.html
 share/doc/rsvg/style.css
 share/doc/rsvg/up.png
-share/gnome/pixmaps/svg-viewer.svg
+share/pixmaps/svg-viewer.svg
 @dirrm share/doc/rsvg
 @dirrm include/librsvg-2/librsvg
 @dirrm include/librsvg-2
diff --git a/graphics/pornview/Makefile b/graphics/pornview/Makefile
index 33570b909b5a..31fbe8219dc1 100644
--- a/graphics/pornview/Makefile
+++ b/graphics/pornview/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	pornview
 PORTVERSION=	0.2.0.p.1
-PORTREVISION=	12
+PORTREVISION=	14
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -41,7 +41,7 @@ PLIST_SUB+=	WITH_NLS=""
 post-patch:
 	@${REINPLACE_CMD} -e \
 		's|INCLUDED_LIBINTL=yes|INCLUDED_LIBINTL=no|g ; \
-		 s|\\[$$][{]top_builddir[}]/intl/libintl.a|-lintl|g ; \
-		 s|[{]datadir[}]/locale|{prefix}/share/locale|g' ${WRKSRC}/configure
+		 s|\\[$$][{]top_builddir[}]/intl/libintl.a|-lintl|g' \
+		 	${WRKSRC}/configure
 
 .include <bsd.port.mk>
diff --git a/graphics/pornview/pkg-plist b/graphics/pornview/pkg-plist
index 1f53c2f61395..0fcc32adda5e 100644
--- a/graphics/pornview/pkg-plist
+++ b/graphics/pornview/pkg-plist
@@ -1,8 +1,8 @@
 bin/pornview
 share/gnome/apps/Graphics/pornview.desktop
-share/gnome/pixmaps/pornview.png
+share/pixmaps/pornview.png
 %%WITH_NLS%%share/locale/fr/LC_MESSAGES/pornview.mo
 %%WITH_NLS%%share/locale/pl/LC_MESSAGES/pornview.mo
-share/gnome/pornview/scripts/helloworld
-@dirrm share/gnome/pornview/scripts
-@dirrm share/gnome/pornview
+share/pornview/scripts/helloworld
+@dirrm share/pornview/scripts
+@dirrm share/pornview
diff --git a/graphics/py-gimp/Makefile b/graphics/py-gimp/Makefile
index d199f827eac3..1a9ac3561b2c 100644
--- a/graphics/py-gimp/Makefile
+++ b/graphics/py-gimp/Makefile
@@ -3,7 +3,7 @@
 # Whom:			Michael Johnson <ahze@FreeBSD.org>
 #
 # $FreeBSD$
-#    $MCom: ports/graphics/py-gimp/Makefile,v 1.2 2007/01/01 22:40:46 ahze Exp $
+#    $MCom: ports/graphics/py-gimp/Makefile,v 1.4 2007/10/24 21:22:00 ahze Exp $
 
 PORTEPOCH=	0
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -22,6 +22,6 @@ PLIST=	${.CURDIR}/pkg-plist
 BUILD_WRKSRC=	${WRKSRC}/plug-ins/pygimp
 INSTALL_WRKSRC=	${WRKSRC}/plug-ins/pygimp
 
-MASTERDIR=	${.CURDIR}/../../graphics/gimp-app-devel
+MASTERDIR=	${.CURDIR}/../../graphics/gimp-app
 
 .include "${MASTERDIR}/Makefile"
diff --git a/graphics/ruby-libart2/Makefile b/graphics/ruby-libart2/Makefile
index a63fc411e0f1..7938838a66af 100644
--- a/graphics/ruby-libart2/Makefile
+++ b/graphics/ruby-libart2/Makefile
@@ -3,11 +3,12 @@
 # Whom:			Akinori MUSHA aka knu <knu@idaemons.org>
 #
 # $FreeBSD$
-#   $MCom: ports/graphics/ruby-libart2/Makefile,v 1.2 2005/10/17 07:05:41 mezz Exp $
+#   $MCom: ports/graphics/ruby-libart2/Makefile,v 1.4 2007/10/09 23:12:07 mezz Exp $
 #
 
 PORTNAME=	libart2
 PORTVERSION=	${RUBY_GNOME_PORTVERSION}
+PORTREVISION=	1
 CATEGORIES=	graphics ruby
 MASTER_SITES=	${RUBY_GNOME_MASTER_SITES}
 MASTER_SITE_SUBDIR=	${RUBY_GNOME_MASTER_SITE_SUBDIR}
diff --git a/graphics/ruby-libart2/pkg-plist b/graphics/ruby-libart2/pkg-plist
index 2cb05136cddf..a2e2adefe5a0 100644
--- a/graphics/ruby-libart2/pkg-plist
+++ b/graphics/ruby-libart2/pkg-plist
@@ -1,3 +1,4 @@
+%%RUBY_SITELIBDIR%%/libart2.rb
 %%RUBY_SITEARCHLIBDIR%%/libart2.so
 %%RUBY_SITEARCHLIBDIR%%/rbart.h
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/COPYING.LIB
diff --git a/graphics/sodipodi/Makefile b/graphics/sodipodi/Makefile
index ba6d40f2b2dd..df5965fcbfb7 100644
--- a/graphics/sodipodi/Makefile
+++ b/graphics/sodipodi/Makefile
@@ -3,11 +3,11 @@
 # Whom:                Yukihiro Nakai <nakai@FreeBSD.org>
 #
 # $FreeBSD$
-#
+#    $MCom: ports/graphics/sodipodi/Makefile,v 1.3 2007/05/30 03:21:43 mezz Exp $
 
 PORTNAME=	sodipodi
 PORTVERSION=	0.34
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	graphics gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -24,8 +24,8 @@ USE_GETTEXT=	yes
 USE_AUTOTOOLS=	libtool:15
 CONFIGURE_ARGS=	--without-gnome-print \
 		--with-popt
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/freetype2 -I${X11BASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/freetype2" \
+		LDFLAGS="-L${LOCALBASE}/lib"
 
 MAN1=		sodipodi.1
 
diff --git a/graphics/sodipodi/pkg-plist b/graphics/sodipodi/pkg-plist
index 8725308647d9..c2e1e2af1e4e 100644
--- a/graphics/sodipodi/pkg-plist
+++ b/graphics/sodipodi/pkg-plist
@@ -3,187 +3,187 @@ lib/sodipodi/extensions/ill2svg.pl
 lib/sodipodi/modules/libxmleditor.a
 lib/sodipodi/modules/libxmleditor.la
 lib/sodipodi/modules/libxmleditor.so
-share/gnome/applications/sodipodi.desktop
+share/applications/sodipodi.desktop
 @exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
-share/gnome/pixmaps/sodipodi.png
-share/gnome/sodipodi/about.svg
-share/gnome/sodipodi/add.xpm
-share/gnome/sodipodi/add_xml_element_node.xpm
-share/gnome/sodipodi/add_xml_text_node.xpm
-share/gnome/sodipodi/al_bottom_in.xpm
-share/gnome/sodipodi/al_bottom_out.xpm
-share/gnome/sodipodi/al_center_hor.xpm
-share/gnome/sodipodi/al_center_ver.xpm
-share/gnome/sodipodi/al_left_in.xpm
-share/gnome/sodipodi/al_left_out.xpm
-share/gnome/sodipodi/al_right_in.xpm
-share/gnome/sodipodi/al_right_out.xpm
-share/gnome/sodipodi/al_top_in.xpm
-share/gnome/sodipodi/al_top_out.xpm
-share/gnome/sodipodi/align_bc.xpm
-share/gnome/sodipodi/align_bl.xpm
-share/gnome/sodipodi/align_br.xpm
-share/gnome/sodipodi/align_cc.xpm
-share/gnome/sodipodi/align_cl.xpm
-share/gnome/sodipodi/align_cr.xpm
-share/gnome/sodipodi/align_tc.xpm
-share/gnome/sodipodi/align_tl.xpm
-share/gnome/sodipodi/align_tr.xpm
-share/gnome/sodipodi/angle_180.xpm
-share/gnome/sodipodi/angle_270.xpm
-share/gnome/sodipodi/angle_90.xpm
-share/gnome/sodipodi/angle_any.xpm
-share/gnome/sodipodi/arrows_hor.xpm
-share/gnome/sodipodi/arrows_ver.xpm
-share/gnome/sodipodi/cap_butt.xpm
-share/gnome/sodipodi/cap_round.xpm
-share/gnome/sodipodi/cap_square.xpm
-share/gnome/sodipodi/clear.xpm
-share/gnome/sodipodi/create_new.xpm
-share/gnome/sodipodi/curve.xpm
-share/gnome/sodipodi/cusp.xpm
-share/gnome/sodipodi/del.xpm
-share/gnome/sodipodi/delete_xml_attribute.xpm
-share/gnome/sodipodi/delete_xml_node.xpm
-share/gnome/sodipodi/dimension_hor.xpm
-share/gnome/sodipodi/dimension_ver.xpm
-share/gnome/sodipodi/div.xpm
-share/gnome/sodipodi/draw_arc.xpm
-share/gnome/sodipodi/draw_dynahand.xpm
-share/gnome/sodipodi/draw_freehand.xpm
-share/gnome/sodipodi/draw_node.xpm
-share/gnome/sodipodi/draw_pen.xpm
-share/gnome/sodipodi/draw_rect.xpm
-share/gnome/sodipodi/draw_select.xpm
-share/gnome/sodipodi/draw_spiral.xpm
-share/gnome/sodipodi/draw_star.xpm
-share/gnome/sodipodi/draw_text.xpm
-share/gnome/sodipodi/draw_zoom.xpm
-share/gnome/sodipodi/dt_active.xpm
-share/gnome/sodipodi/dt_inactive.xpm
-share/gnome/sodipodi/duplicate.xpm
-share/gnome/sodipodi/duplicate_xml_node.xpm
-share/gnome/sodipodi/edge_down.xpm
-share/gnome/sodipodi/edge_up.xpm
-share/gnome/sodipodi/edit_copy.xpm
-share/gnome/sodipodi/edit_cut.xpm
-share/gnome/sodipodi/edit_delete.xpm
-share/gnome/sodipodi/edit_duplicate.xpm
-share/gnome/sodipodi/edit_paste.xpm
-share/gnome/sodipodi/edit_redo.xpm
-share/gnome/sodipodi/edit_undo.xpm
-share/gnome/sodipodi/ellipse.xpm
-share/gnome/sodipodi/file_export.xpm
-share/gnome/sodipodi/file_import.xpm
-share/gnome/sodipodi/file_new.xpm
-share/gnome/sodipodi/file_open.xpm
-share/gnome/sodipodi/file_print.xpm
-share/gnome/sodipodi/file_print_direct.xpm
-share/gnome/sodipodi/file_print_preview.xpm
-share/gnome/sodipodi/file_save.xpm
-share/gnome/sodipodi/file_save_as.xpm
-share/gnome/sodipodi/fill.xpm
-share/gnome/sodipodi/fill_fractal.xpm
-share/gnome/sodipodi/fill_gradient.xpm
-share/gnome/sodipodi/fill_none.xpm
-share/gnome/sodipodi/fill_pattern.xpm
-share/gnome/sodipodi/fill_radial.xpm
-share/gnome/sodipodi/fill_solid.xpm
-share/gnome/sodipodi/flip_hor.xpm
-share/gnome/sodipodi/flip_ver.xpm
-share/gnome/sodipodi/font.xpm
-share/gnome/sodipodi/forward.xpm
-share/gnome/sodipodi/freehand.xpm
-share/gnome/sodipodi/guide_dialog.png
-share/gnome/sodipodi/icons.svg
-share/gnome/sodipodi/join.xpm
-share/gnome/sodipodi/join_bevel.xpm
-share/gnome/sodipodi/join_miter.xpm
-share/gnome/sodipodi/join_round.xpm
-share/gnome/sodipodi/line.xpm
-share/gnome/sodipodi/line_dashed.xpm
-share/gnome/sodipodi/line_doubled.xpm
-share/gnome/sodipodi/line_full.xpm
-share/gnome/sodipodi/lock_aspect_no.xpm
-share/gnome/sodipodi/lock_aspect_yes.xpm
-share/gnome/sodipodi/move.xpm
-share/gnome/sodipodi/node.xpm
-share/gnome/sodipodi/node_break.xpm
-share/gnome/sodipodi/node_curve.xpm
-share/gnome/sodipodi/node_cusp.xpm
-share/gnome/sodipodi/node_delete.xpm
-share/gnome/sodipodi/node_insert.xpm
-share/gnome/sodipodi/node_join.xpm
-share/gnome/sodipodi/node_line.xpm
-share/gnome/sodipodi/node_smooth.xpm
-share/gnome/sodipodi/node_symetric.xpm
-share/gnome/sodipodi/object_align.xpm
-share/gnome/sodipodi/object_fill.xpm
-share/gnome/sodipodi/object_flip_hor.xpm
-share/gnome/sodipodi/object_flip_ver.xpm
-share/gnome/sodipodi/object_font.xpm
-share/gnome/sodipodi/object_layout.xpm
-share/gnome/sodipodi/object_reset.xpm
-share/gnome/sodipodi/object_rotate.xpm
-share/gnome/sodipodi/object_stroke.xpm
-share/gnome/sodipodi/object_tocurve.xpm
-share/gnome/sodipodi/object_trans.xpm
-share/gnome/sodipodi/origin.xpm
-share/gnome/sodipodi/properties_fill.xpm
-share/gnome/sodipodi/properties_layout.xpm
-share/gnome/sodipodi/properties_stroke.xpm
-share/gnome/sodipodi/quit_nope.xpm
-share/gnome/sodipodi/quit_yep.xpm
-share/gnome/sodipodi/rect.xpm
-share/gnome/sodipodi/reread.xpm
-share/gnome/sodipodi/rotate.xpm
-share/gnome/sodipodi/rotate_left.xpm
-share/gnome/sodipodi/rotate_right.xpm
-share/gnome/sodipodi/scale.xpm
-share/gnome/sodipodi/scale_hor.xpm
-share/gnome/sodipodi/scale_ver.xpm
-share/gnome/sodipodi/select.xpm
-share/gnome/sodipodi/selection_bot.xpm
-share/gnome/sodipodi/selection_break.xpm
-share/gnome/sodipodi/selection_combine.xpm
-share/gnome/sodipodi/selection_down.xpm
-share/gnome/sodipodi/selection_group.xpm
-share/gnome/sodipodi/selection_intersection.xpm
-share/gnome/sodipodi/selection_subtraction.xpm
-share/gnome/sodipodi/selection_top.xpm
-share/gnome/sodipodi/selection_ungroup.xpm
-share/gnome/sodipodi/selection_union.xpm
-share/gnome/sodipodi/selection_up.xpm
-share/gnome/sodipodi/seperate_tool.xpm
-share/gnome/sodipodi/set.xpm
-share/gnome/sodipodi/skew.xpm
-share/gnome/sodipodi/skew_hor.xpm
-share/gnome/sodipodi/skew_ver.xpm
-share/gnome/sodipodi/smooth.xpm
-share/gnome/sodipodi/stroke.xpm
-share/gnome/sodipodi/sym.xpm
-share/gnome/sodipodi/text.xpm
-share/gnome/sodipodi/toback.xpm
-share/gnome/sodipodi/tofront.xpm
-share/gnome/sodipodi/toolbox_draw.xpm
-share/gnome/sodipodi/toolbox_edit.xpm
-share/gnome/sodipodi/toolbox_file.xpm
-share/gnome/sodipodi/toolbox_node.xpm
-share/gnome/sodipodi/toolbox_object.xpm
-share/gnome/sodipodi/toolbox_select.xpm
-share/gnome/sodipodi/toolbox_zoom.xpm
-share/gnome/sodipodi/unknown.xpm
-share/gnome/sodipodi/writing_mode_lr.xpm
-share/gnome/sodipodi/writing_mode_tb.xpm
-share/gnome/sodipodi/zoom.xpm
-share/gnome/sodipodi/zoom_1_to_1.xpm
-share/gnome/sodipodi/zoom_1_to_2.xpm
-share/gnome/sodipodi/zoom_2_to_1.xpm
-share/gnome/sodipodi/zoom_draw.xpm
-share/gnome/sodipodi/zoom_in.xpm
-share/gnome/sodipodi/zoom_out.xpm
-share/gnome/sodipodi/zoom_page.xpm
-share/gnome/sodipodi/zoom_select.xpm
+share/pixmaps/sodipodi.png
+share/sodipodi/about.svg
+share/sodipodi/add.xpm
+share/sodipodi/add_xml_element_node.xpm
+share/sodipodi/add_xml_text_node.xpm
+share/sodipodi/al_bottom_in.xpm
+share/sodipodi/al_bottom_out.xpm
+share/sodipodi/al_center_hor.xpm
+share/sodipodi/al_center_ver.xpm
+share/sodipodi/al_left_in.xpm
+share/sodipodi/al_left_out.xpm
+share/sodipodi/al_right_in.xpm
+share/sodipodi/al_right_out.xpm
+share/sodipodi/al_top_in.xpm
+share/sodipodi/al_top_out.xpm
+share/sodipodi/align_bc.xpm
+share/sodipodi/align_bl.xpm
+share/sodipodi/align_br.xpm
+share/sodipodi/align_cc.xpm
+share/sodipodi/align_cl.xpm
+share/sodipodi/align_cr.xpm
+share/sodipodi/align_tc.xpm
+share/sodipodi/align_tl.xpm
+share/sodipodi/align_tr.xpm
+share/sodipodi/angle_180.xpm
+share/sodipodi/angle_270.xpm
+share/sodipodi/angle_90.xpm
+share/sodipodi/angle_any.xpm
+share/sodipodi/arrows_hor.xpm
+share/sodipodi/arrows_ver.xpm
+share/sodipodi/cap_butt.xpm
+share/sodipodi/cap_round.xpm
+share/sodipodi/cap_square.xpm
+share/sodipodi/clear.xpm
+share/sodipodi/create_new.xpm
+share/sodipodi/curve.xpm
+share/sodipodi/cusp.xpm
+share/sodipodi/del.xpm
+share/sodipodi/delete_xml_attribute.xpm
+share/sodipodi/delete_xml_node.xpm
+share/sodipodi/dimension_hor.xpm
+share/sodipodi/dimension_ver.xpm
+share/sodipodi/div.xpm
+share/sodipodi/draw_arc.xpm
+share/sodipodi/draw_dynahand.xpm
+share/sodipodi/draw_freehand.xpm
+share/sodipodi/draw_node.xpm
+share/sodipodi/draw_pen.xpm
+share/sodipodi/draw_rect.xpm
+share/sodipodi/draw_select.xpm
+share/sodipodi/draw_spiral.xpm
+share/sodipodi/draw_star.xpm
+share/sodipodi/draw_text.xpm
+share/sodipodi/draw_zoom.xpm
+share/sodipodi/dt_active.xpm
+share/sodipodi/dt_inactive.xpm
+share/sodipodi/duplicate.xpm
+share/sodipodi/duplicate_xml_node.xpm
+share/sodipodi/edge_down.xpm
+share/sodipodi/edge_up.xpm
+share/sodipodi/edit_copy.xpm
+share/sodipodi/edit_cut.xpm
+share/sodipodi/edit_delete.xpm
+share/sodipodi/edit_duplicate.xpm
+share/sodipodi/edit_paste.xpm
+share/sodipodi/edit_redo.xpm
+share/sodipodi/edit_undo.xpm
+share/sodipodi/ellipse.xpm
+share/sodipodi/file_export.xpm
+share/sodipodi/file_import.xpm
+share/sodipodi/file_new.xpm
+share/sodipodi/file_open.xpm
+share/sodipodi/file_print.xpm
+share/sodipodi/file_print_direct.xpm
+share/sodipodi/file_print_preview.xpm
+share/sodipodi/file_save.xpm
+share/sodipodi/file_save_as.xpm
+share/sodipodi/fill.xpm
+share/sodipodi/fill_fractal.xpm
+share/sodipodi/fill_gradient.xpm
+share/sodipodi/fill_none.xpm
+share/sodipodi/fill_pattern.xpm
+share/sodipodi/fill_radial.xpm
+share/sodipodi/fill_solid.xpm
+share/sodipodi/flip_hor.xpm
+share/sodipodi/flip_ver.xpm
+share/sodipodi/font.xpm
+share/sodipodi/forward.xpm
+share/sodipodi/freehand.xpm
+share/sodipodi/guide_dialog.png
+share/sodipodi/icons.svg
+share/sodipodi/join.xpm
+share/sodipodi/join_bevel.xpm
+share/sodipodi/join_miter.xpm
+share/sodipodi/join_round.xpm
+share/sodipodi/line.xpm
+share/sodipodi/line_dashed.xpm
+share/sodipodi/line_doubled.xpm
+share/sodipodi/line_full.xpm
+share/sodipodi/lock_aspect_no.xpm
+share/sodipodi/lock_aspect_yes.xpm
+share/sodipodi/move.xpm
+share/sodipodi/node.xpm
+share/sodipodi/node_break.xpm
+share/sodipodi/node_curve.xpm
+share/sodipodi/node_cusp.xpm
+share/sodipodi/node_delete.xpm
+share/sodipodi/node_insert.xpm
+share/sodipodi/node_join.xpm
+share/sodipodi/node_line.xpm
+share/sodipodi/node_smooth.xpm
+share/sodipodi/node_symetric.xpm
+share/sodipodi/object_align.xpm
+share/sodipodi/object_fill.xpm
+share/sodipodi/object_flip_hor.xpm
+share/sodipodi/object_flip_ver.xpm
+share/sodipodi/object_font.xpm
+share/sodipodi/object_layout.xpm
+share/sodipodi/object_reset.xpm
+share/sodipodi/object_rotate.xpm
+share/sodipodi/object_stroke.xpm
+share/sodipodi/object_tocurve.xpm
+share/sodipodi/object_trans.xpm
+share/sodipodi/origin.xpm
+share/sodipodi/properties_fill.xpm
+share/sodipodi/properties_layout.xpm
+share/sodipodi/properties_stroke.xpm
+share/sodipodi/quit_nope.xpm
+share/sodipodi/quit_yep.xpm
+share/sodipodi/rect.xpm
+share/sodipodi/reread.xpm
+share/sodipodi/rotate.xpm
+share/sodipodi/rotate_left.xpm
+share/sodipodi/rotate_right.xpm
+share/sodipodi/scale.xpm
+share/sodipodi/scale_hor.xpm
+share/sodipodi/scale_ver.xpm
+share/sodipodi/select.xpm
+share/sodipodi/selection_bot.xpm
+share/sodipodi/selection_break.xpm
+share/sodipodi/selection_combine.xpm
+share/sodipodi/selection_down.xpm
+share/sodipodi/selection_group.xpm
+share/sodipodi/selection_intersection.xpm
+share/sodipodi/selection_subtraction.xpm
+share/sodipodi/selection_top.xpm
+share/sodipodi/selection_ungroup.xpm
+share/sodipodi/selection_union.xpm
+share/sodipodi/selection_up.xpm
+share/sodipodi/seperate_tool.xpm
+share/sodipodi/set.xpm
+share/sodipodi/skew.xpm
+share/sodipodi/skew_hor.xpm
+share/sodipodi/skew_ver.xpm
+share/sodipodi/smooth.xpm
+share/sodipodi/stroke.xpm
+share/sodipodi/sym.xpm
+share/sodipodi/text.xpm
+share/sodipodi/toback.xpm
+share/sodipodi/tofront.xpm
+share/sodipodi/toolbox_draw.xpm
+share/sodipodi/toolbox_edit.xpm
+share/sodipodi/toolbox_file.xpm
+share/sodipodi/toolbox_node.xpm
+share/sodipodi/toolbox_object.xpm
+share/sodipodi/toolbox_select.xpm
+share/sodipodi/toolbox_zoom.xpm
+share/sodipodi/unknown.xpm
+share/sodipodi/writing_mode_lr.xpm
+share/sodipodi/writing_mode_tb.xpm
+share/sodipodi/zoom.xpm
+share/sodipodi/zoom_1_to_1.xpm
+share/sodipodi/zoom_1_to_2.xpm
+share/sodipodi/zoom_2_to_1.xpm
+share/sodipodi/zoom_draw.xpm
+share/sodipodi/zoom_in.xpm
+share/sodipodi/zoom_out.xpm
+share/sodipodi/zoom_page.xpm
+share/sodipodi/zoom_select.xpm
 share/locale/am/LC_MESSAGES/sodipodi.mo
 share/locale/az/LC_MESSAGES/sodipodi.mo
 share/locale/be/LC_MESSAGES/sodipodi.mo
@@ -218,8 +218,9 @@ share/locale/sv/LC_MESSAGES/sodipodi.mo
 share/locale/tr/LC_MESSAGES/sodipodi.mo
 share/locale/uk/LC_MESSAGES/sodipodi.mo
 share/locale/zh_CN/LC_MESSAGES/sodipodi.mo
-@dirrm share/gnome/sodipodi
+@dirrm share/sodipodi
 @dirrm lib/sodipodi/modules
 @dirrm lib/sodipodi/extensions
 @dirrm lib/sodipodi
 @unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
+@dirrmtry share/applications
diff --git a/graphics/truevision/Makefile b/graphics/truevision/Makefile
index 39cb8ba0ac54..b188b92da539 100644
--- a/graphics/truevision/Makefile
+++ b/graphics/truevision/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	truevision
 PORTVERSION=	0.5.5.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -43,9 +43,7 @@ post-patch:
 		 s|-I/usr/local/include/gtkglext-1.0/||g ; \
 		 s|-I/usr/lib/gtkglext-1.0/include/||g ; \
 		 s|-I/usr/local/lib/gtkglext-1.0/include/||g ; \
-		 s|-I/usr/local/include ||g ; \
-		 s|=share$$|=share/gnome|g ; \
-		 s|=share/pixmap|=share/gnome/pixmap|g' ${WRKSRC}/configure
+		 s|-I/usr/local/include ||g' ${WRKSRC}/configure
 	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
 		's|-I/usr/include||g ; \
 		 s|-I/usr/local/include||g ; \
@@ -54,8 +52,6 @@ post-patch:
 		 s|-L/usr/local/lib||g ; \
 		 s|-L/usr/X11R6/lib||g ; \
 		 s|-O2||g ; \
-		 s|share/application|share/gnome/application|g ; \
-		 s|share/mime-info|share/gnome/mime-info|g ; \
 		 s|^truevisiondoc|#truevisiondoc|g'
 
 .include <bsd.port.mk>
diff --git a/graphics/truevision/pkg-plist b/graphics/truevision/pkg-plist
index aa4c75aea6e1..5332d430dfe2 100644
--- a/graphics/truevision/pkg-plist
+++ b/graphics/truevision/pkg-plist
@@ -1,7 +1,7 @@
 bin/truevision
 lib/libftgltv.a
-share/gnome/applications/truevision.desktop
-share/gnome/application-registry/truevision.applications
+share/applications/truevision.desktop
+share/application-registry/truevision.applications
 share/gnome/help/truevision/C/athmospherics.xml
 share/gnome/help/truevision/C/camera.xml
 share/gnome/help/truevision/C/figures/interface_editor.png
@@ -51,95 +51,96 @@ share/gnome/help/truevision/C/interface_toolbar.xml
 share/gnome/help/truevision/C/legal.xml
 share/gnome/help/truevision/C/truevision.xml
 share/gnome/help/truevision/C/welcome.xml
-share/gnome/mime-info/truevision.keys
-share/gnome/mime-info/truevision.mime
-share/gnome/pixmaps/truevision/create_icon.png
-share/gnome/pixmaps/truevision/gnome-mime-application-x-truevision.png
-share/gnome/pixmaps/truevision/gnome-truevision.png
-share/gnome/pixmaps/truevision/lock.xpm
-share/gnome/pixmaps/truevision/mapedit_cursor.xpm
-share/gnome/pixmaps/truevision/move_icon.png
-share/gnome/pixmaps/truevision/nopreview.xpm
-share/gnome/pixmaps/truevision/object_bkgd.xpm
-share/gnome/pixmaps/truevision/object_blob.xpm
-share/gnome/pixmaps/truevision/object_box.xpm
-share/gnome/pixmaps/truevision/object_camera.xpm
-share/gnome/pixmaps/truevision/object_cone.xpm
-share/gnome/pixmaps/truevision/object_csg.xpm
-share/gnome/pixmaps/truevision/object_cylinder.xpm
-share/gnome/pixmaps/truevision/object_default.xpm
-share/gnome/pixmaps/truevision/object_default2.xpm
-share/gnome/pixmaps/truevision/object_diff.xpm
-share/gnome/pixmaps/truevision/object_disc.xpm
-share/gnome/pixmaps/truevision/object_fog.xpm
-share/gnome/pixmaps/truevision/object_hf.xpm
-share/gnome/pixmaps/truevision/object_inter.xpm
-share/gnome/pixmaps/truevision/object_lathe.xpm
-share/gnome/pixmaps/truevision/object_light.xpm
-share/gnome/pixmaps/truevision/object_link.xpm
-share/gnome/pixmaps/truevision/object_merge.xpm
-share/gnome/pixmaps/truevision/object_plane.xpm
-share/gnome/pixmaps/truevision/object_prism.xpm
-share/gnome/pixmaps/truevision/object_sphere.xpm
-share/gnome/pixmaps/truevision/object_superellipsoid.xpm
-share/gnome/pixmaps/truevision/object_text.xpm
-share/gnome/pixmaps/truevision/object_torus.xpm
-share/gnome/pixmaps/truevision/object_union.xpm
-share/gnome/pixmaps/truevision/object_visible.xpm
-share/gnome/pixmaps/truevision/page_detach.png
-share/gnome/pixmaps/truevision/render.xpm
-share/gnome/pixmaps/truevision/rotate_icon.png
-share/gnome/pixmaps/truevision/scale_icon.png
-share/gnome/pixmaps/truevision/select_icon.png
-share/gnome/pixmaps/truevision/splash.png
-share/gnome/pixmaps/truevision/trackball_icon.png
-share/gnome/pixmaps/truevision/uscale_icon.png
-share/gnome/pixmaps/truevision/view_maximize.png
-share/gnome/pixmaps/truevision/view_menu.png
-share/gnome/pixmaps/truevision/view_restore.png
-share/gnome/pixmaps/truevision/view_rolldown.png
-share/gnome/pixmaps/truevision/view_rollup.png
-share/gnome/pixmaps/truevision/warning.xpm
-share/gnome/truevision/materials/Effects/Fire1.tvm
-share/gnome/truevision/materials/Effects/water.tvm
-share/gnome/truevision/materials/Metals/Brass/Brass1A.tvm
-share/gnome/truevision/materials/Metals/Brass/Brass1B.tvm
-share/gnome/truevision/materials/Metals/Brass/Brass1C.tvm
-share/gnome/truevision/materials/Metals/Brass/Brass1D.tvm
-share/gnome/truevision/materials/Metals/Copper/Copper_1A.tvm
-share/gnome/truevision/materials/Metals/Copper/Copper_1B.tvm
-share/gnome/truevision/materials/Metals/Copper/Copper_1C.tvm
-share/gnome/truevision/materials/Metals/Gold/Gold_1A.tvm
-share/gnome/truevision/materials/Metals/Gold/Gold_1B.tvm
-share/gnome/truevision/materials/Metals/Gold/Gold_1C.tvm
-share/gnome/truevision/materials/Skies/Cloud1.tvm
-share/gnome/truevision/materials/Stones/Marble1.tvm
-share/gnome/truevision/materials/Stones/granite3.tvm
-share/gnome/truevision/materials/Woods/Golden_Oak.tvm
-share/gnome/truevision/materials/Woods/Soft_Pine.tvm
-share/gnome/truevision/python/plug-ins/about_python.py
-share/gnome/truevision/python/plug-ins/starfield.py
-share/gnome/truevision/python/tv_classes.py
+share/mime-info/truevision.keys
+share/mime-info/truevision.mime
+share/pixmaps/truevision/create_icon.png
+share/pixmaps/truevision/gnome-mime-application-x-truevision.png
+share/pixmaps/truevision/gnome-truevision.png
+share/pixmaps/truevision/lock.xpm
+share/pixmaps/truevision/mapedit_cursor.xpm
+share/pixmaps/truevision/move_icon.png
+share/pixmaps/truevision/nopreview.xpm
+share/pixmaps/truevision/object_bkgd.xpm
+share/pixmaps/truevision/object_blob.xpm
+share/pixmaps/truevision/object_box.xpm
+share/pixmaps/truevision/object_camera.xpm
+share/pixmaps/truevision/object_cone.xpm
+share/pixmaps/truevision/object_csg.xpm
+share/pixmaps/truevision/object_cylinder.xpm
+share/pixmaps/truevision/object_default.xpm
+share/pixmaps/truevision/object_default2.xpm
+share/pixmaps/truevision/object_diff.xpm
+share/pixmaps/truevision/object_disc.xpm
+share/pixmaps/truevision/object_fog.xpm
+share/pixmaps/truevision/object_hf.xpm
+share/pixmaps/truevision/object_inter.xpm
+share/pixmaps/truevision/object_lathe.xpm
+share/pixmaps/truevision/object_light.xpm
+share/pixmaps/truevision/object_link.xpm
+share/pixmaps/truevision/object_merge.xpm
+share/pixmaps/truevision/object_plane.xpm
+share/pixmaps/truevision/object_prism.xpm
+share/pixmaps/truevision/object_sphere.xpm
+share/pixmaps/truevision/object_superellipsoid.xpm
+share/pixmaps/truevision/object_text.xpm
+share/pixmaps/truevision/object_torus.xpm
+share/pixmaps/truevision/object_union.xpm
+share/pixmaps/truevision/object_visible.xpm
+share/pixmaps/truevision/page_detach.png
+share/pixmaps/truevision/render.xpm
+share/pixmaps/truevision/rotate_icon.png
+share/pixmaps/truevision/scale_icon.png
+share/pixmaps/truevision/select_icon.png
+share/pixmaps/truevision/splash.png
+share/pixmaps/truevision/trackball_icon.png
+share/pixmaps/truevision/uscale_icon.png
+share/pixmaps/truevision/view_maximize.png
+share/pixmaps/truevision/view_menu.png
+share/pixmaps/truevision/view_restore.png
+share/pixmaps/truevision/view_rolldown.png
+share/pixmaps/truevision/view_rollup.png
+share/pixmaps/truevision/warning.xpm
+share/truevision/materials/Effects/Fire1.tvm
+share/truevision/materials/Effects/water.tvm
+share/truevision/materials/Metals/Brass/Brass1A.tvm
+share/truevision/materials/Metals/Brass/Brass1B.tvm
+share/truevision/materials/Metals/Brass/Brass1C.tvm
+share/truevision/materials/Metals/Brass/Brass1D.tvm
+share/truevision/materials/Metals/Copper/Copper_1A.tvm
+share/truevision/materials/Metals/Copper/Copper_1B.tvm
+share/truevision/materials/Metals/Copper/Copper_1C.tvm
+share/truevision/materials/Metals/Gold/Gold_1A.tvm
+share/truevision/materials/Metals/Gold/Gold_1B.tvm
+share/truevision/materials/Metals/Gold/Gold_1C.tvm
+share/truevision/materials/Skies/Cloud1.tvm
+share/truevision/materials/Stones/Marble1.tvm
+share/truevision/materials/Stones/granite3.tvm
+share/truevision/materials/Woods/Golden_Oak.tvm
+share/truevision/materials/Woods/Soft_Pine.tvm
+share/truevision/python/plug-ins/about_python.py
+share/truevision/python/plug-ins/starfield.py
+share/truevision/python/tv_classes.py
 share/locale/de/LC_MESSAGES/truevision.mo
 share/locale/fr/LC_MESSAGES/truevision.mo
 share/locale/ru/LC_MESSAGES/truevision.mo
 share/mime/packages/truevision.xml
-@dirrm share/gnome/truevision/python/plug-ins
-@dirrm share/gnome/truevision/python
-@dirrm share/gnome/truevision/materials/Woods
-@dirrm share/gnome/truevision/materials/Stones
-@dirrm share/gnome/truevision/materials/Skies
-@dirrm share/gnome/truevision/materials/Metals/Gold
-@dirrm share/gnome/truevision/materials/Metals/Copper
-@dirrm share/gnome/truevision/materials/Metals/Brass
-@dirrm share/gnome/truevision/materials/Metals
-@dirrm share/gnome/truevision/materials/Glass
-@dirrm share/gnome/truevision/materials/Effects
-@dirrm share/gnome/truevision/materials
-@dirrm share/gnome/truevision
-@dirrm share/gnome/pixmaps/truevision
+@dirrm share/truevision/python/plug-ins
+@dirrm share/truevision/python
+@dirrm share/truevision/materials/Woods
+@dirrm share/truevision/materials/Stones
+@dirrm share/truevision/materials/Skies
+@dirrm share/truevision/materials/Metals/Gold
+@dirrm share/truevision/materials/Metals/Copper
+@dirrm share/truevision/materials/Metals/Brass
+@dirrm share/truevision/materials/Metals
+@dirrm share/truevision/materials/Glass
+@dirrm share/truevision/materials/Effects
+@dirrm share/truevision/materials
+@dirrm share/truevision
+@dirrm share/pixmaps/truevision
 @dirrm share/gnome/help/truevision/C/figures
 @dirrm share/gnome/help/truevision/C
 @dirrm share/gnome/help/truevision
 @exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
 @unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
+@dirrmtry share/applications
diff --git a/irc/gdesklets-irc/Makefile b/irc/gdesklets-irc/Makefile
index a1e7d25fd503..a5ca098b5a25 100644
--- a/irc/gdesklets-irc/Makefile
+++ b/irc/gdesklets-irc/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	irc
 PORTVERSION=	1.2
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	irc gnome deskutils
 MASTER_SITES=	http://gdesklets.gnomedesktop.org/files/
 PKGNAMEPREFIX=	gdesklets-
@@ -22,7 +22,7 @@ USE_PYTHON=	yes
 USE_XLIB=	yes
 
 NAME=		irc
-DATADIR=	${PREFIX}/share/gnome/gdesklets
+DATADIR=	${PREFIX}/share/gdesklets
 LANG=		ko
 PKGMESSAGE=	${WRKDIR}/pkg-message
 WRKSRC=		${WRKDIR}/${NAME}
diff --git a/irc/gdesklets-irc/pkg-message b/irc/gdesklets-irc/pkg-message
index 11381c1167cd..b629d1ef3ea7 100644
--- a/irc/gdesklets-irc/pkg-message
+++ b/irc/gdesklets-irc/pkg-message
@@ -1,11 +1,11 @@
 ##
 To view the installed applets:
 
-	ls %%PREFIX%%/share/gnome/gdesklets/Displays
+	ls %%PREFIX%%/share/gdesklets/Displays
 
 To use this applet:
 
-	gdesklets open %%PREFIX%%/share/gnome/gdesklets/Displays/%%NAME%%/%%NAME%%.display
+	gdesklets open %%PREFIX%%/share/gdesklets/Displays/%%NAME%%/%%NAME%%.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/irc/lostirc/Makefile b/irc/lostirc/Makefile
index 52533097cf36..bfde407c8386 100644
--- a/irc/lostirc/Makefile
+++ b/irc/lostirc/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	lostirc
 PORTVERSION=	0.4.6
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	irc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://demian.dyndns.org/src/
diff --git a/irc/lostirc/pkg-plist b/irc/lostirc/pkg-plist
index 91c83b2a892b..495ef7bf7799 100644
--- a/irc/lostirc/pkg-plist
+++ b/irc/lostirc/pkg-plist
@@ -4,8 +4,9 @@ bin/lostirc
 %%PORTDOCS%%%%DOCSDIR%%/INSTALL
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/TODO
-share/gnome/applications/lostirc.desktop
-share/gnome/pixmaps/lostirc.png
+share/applications/lostirc.desktop
+share/pixmaps/lostirc.png
 share/locale/da/LC_MESSAGES/lostirc.mo
 share/locale/fr/LC_MESSAGES/lostirc.mo
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrmtry share/applications
diff --git a/irc/xchat-gnome/Makefile b/irc/xchat-gnome/Makefile
index a741c7741ddc..cc10cfa9423d 100644
--- a/irc/xchat-gnome/Makefile
+++ b/irc/xchat-gnome/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xchat
 PORTVERSION=	0.15
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	irc gnome ipv6
 MASTER_SITES=	http://releases.navi.cx/xchat-gnome/
 PKGNAMESUFFIX=	-gnome
diff --git a/irc/xchat-gnome/pkg-plist b/irc/xchat-gnome/pkg-plist
index 581d9256fb0a..c6969c452844 100644
--- a/irc/xchat-gnome/pkg-plist
+++ b/irc/xchat-gnome/pkg-plist
@@ -27,21 +27,21 @@ lib/xchat-gnome/plugins/urlscraper.a
 lib/xchat-gnome/plugins/urlscraper.la
 lib/xchat-gnome/plugins/urlscraper.so
 %%DBUS%%share/dbus-1/services/org.gnome.Xchat.service
-share/gnome/applications/xchat-gnome.desktop
+share/applications/xchat-gnome.desktop
 share/gnome/help/xchat-gnome/C/figures/xchat-gnome_main_window.png
 share/gnome/help/xchat-gnome/C/legal.xml
 share/gnome/help/xchat-gnome/C/xchat-gnome.xml
-share/gnome/omf/xchat-gnome/xchat-gnome-C.omf
-share/gnome/xchat-gnome/channel-list.glade
-share/gnome/xchat-gnome/connect-dialog.glade
-share/gnome/xchat-gnome/dcc-window.glade
-share/gnome/xchat-gnome/irc-network-editor.glade
-share/gnome/xchat-gnome/message.wav
-share/gnome/xchat-gnome/preferences-dialog.glade
-share/gnome/xchat-gnome/setup-dialog.glade
-share/gnome/xchat-gnome/topic-change.glade
-share/gnome/xchat-gnome/xchat-gnome-ui.xml
-share/gnome/xchat-gnome/xchat-gnome.glade
+share/omf/xchat-gnome/xchat-gnome-C.omf
+share/xchat-gnome/channel-list.glade
+share/xchat-gnome/connect-dialog.glade
+share/xchat-gnome/dcc-window.glade
+share/xchat-gnome/irc-network-editor.glade
+share/xchat-gnome/message.wav
+share/xchat-gnome/preferences-dialog.glade
+share/xchat-gnome/setup-dialog.glade
+share/xchat-gnome/topic-change.glade
+share/xchat-gnome/xchat-gnome-ui.xml
+share/xchat-gnome/xchat-gnome.glade
 share/icons/hicolor/128x128/apps/xchat-gnome.png
 share/icons/hicolor/16x16/apps/xchat-gnome-dcc.png
 share/icons/hicolor/16x16/apps/xchat-gnome-message-data.png
@@ -112,8 +112,8 @@ share/locale/wa/LC_MESSAGES/xchat-gnome.mo
 share/locale/zh_CN/LC_MESSAGES/xchat-gnome.mo
 share/locale/zh_HK/LC_MESSAGES/xchat-gnome.mo
 share/locale/zh_TW/LC_MESSAGES/xchat-gnome.mo
-@dirrm share/gnome/xchat-gnome
-@dirrm share/gnome/omf/xchat-gnome
+@dirrm share/xchat-gnome
+@dirrm share/omf/xchat-gnome
 @dirrm share/gnome/help/xchat-gnome/C/figures
 @dirrm share/gnome/help/xchat-gnome/C
 @dirrm share/gnome/help/xchat-gnome
@@ -129,3 +129,4 @@ share/locale/zh_TW/LC_MESSAGES/xchat-gnome.mo
 @dirrmtry share/locale/ku
 @dirrmtry share/locale/jbo/LC_MESSAGES
 @dirrmtry share/locale/jbo
+@dirrmtry share/applications
diff --git a/irc/xchat1/Makefile b/irc/xchat1/Makefile
index 40d4eddec4f1..05597b5cc929 100644
--- a/irc/xchat1/Makefile
+++ b/irc/xchat1/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=		xchat
 PORTVERSION=		1.8.11
-PORTREVISION=		8
+PORTREVISION=		9
 CATEGORIES+=		irc gnome ipv6
 MASTER_SITES=		http://xchat.org/files/source/1.8/ \
 			http://xchat.linuxpower.org/files/source/1.8/
@@ -66,7 +66,7 @@ CONFIGURE_ARGS+=	--enable-gdk-pixbuf
 USE_GNOME=		imlib
 CONFIGURE_ARGS+=	--enable-gnome --enable-panel --enable-gdk-pixbuf \
 			--enable-zvt
-MAKE_ARGS=		icondir="${PREFIX}/share/gnome/pixmaps" \
+MAKE_ARGS=		icondir="${PREFIX}/share/pixmaps" \
 			utildir="${PREFIX}/share/gnome/apps/Internet"
 .else
 CONFIGURE_ARGS+=	--disable-gnome --disable-zvt
diff --git a/irc/xchat1/pkg-plist b/irc/xchat1/pkg-plist
index feeacf15b1e9..54af6d2ffe03 100644
--- a/irc/xchat1/pkg-plist
+++ b/irc/xchat1/pkg-plist
@@ -16,7 +16,7 @@ bin/xchat-text
 %%PORTDOCS%%share/doc/xchat/xchat.html
 %%PORTDOCS%%share/doc/xchat/xchat.sgml
 %%GNOME:%%share/gnome/apps/Internet/xchat.desktop
-%%GNOME:%%share/gnome/pixmaps/xchat.png
+%%GNOME:%%share/pixmaps/xchat.png
 %%PORTDOCS%%@dirrm share/doc/xchat
 share/locale/ca/LC_MESSAGES/xchat.mo
 share/locale/cs/LC_MESSAGES/xchat.mo
diff --git a/japanese/ebview-gtk2/Makefile b/japanese/ebview-gtk2/Makefile
index 8c2d3ca4932e..c6a70bd02c3b 100644
--- a/japanese/ebview-gtk2/Makefile
+++ b/japanese/ebview-gtk2/Makefile
@@ -33,6 +33,8 @@ SUB_FILES=	ebview.desktop
 post-patch:
 	@${REINPLACE_CMD} -e \
 		's|-pthread|${PTHREAD_LIBS:S/"//g}|g' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's|#define GTK_DISABLE_DEPRECATED 1||g' \
+		${WRKSRC}/src/ebview.c
 
 post-install:
 	${MKDIR} ${PREFIX}/share/applications
diff --git a/japanese/im-ja/Makefile b/japanese/im-ja/Makefile
index c0ebf2476e96..ab00a04a871e 100644
--- a/japanese/im-ja/Makefile
+++ b/japanese/im-ja/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	im-ja
 PORTVERSION=	1.5
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	japanese x11-toolkits
 MASTER_SITES=	http://im-ja.sourceforge.net/
 
diff --git a/japanese/im-ja/files/patch-configure b/japanese/im-ja/files/patch-configure
deleted file mode 100644
index 951243475473..000000000000
--- a/japanese/im-ja/files/patch-configure
+++ /dev/null
@@ -1,36 +0,0 @@
-*** configure.orig	Mon Apr 12 09:41:56 2004
---- configure	Mon Apr 12 09:42:55 2004
-***************
-*** 14905,14911 ****
-  #define IM_JA_BINDIR "$IM_JA_BINDIR"
-  _ACEOF
-  
-! IM_JA_DATADIR="$im_ja_prefix/share/im-ja"
-  
-  cat >>confdefs.h <<_ACEOF
-  #define IM_JA_DATADIR "$IM_JA_DATADIR"
---- 14906,14912 ----
-  #define IM_JA_BINDIR "$IM_JA_BINDIR"
-  _ACEOF
-  
-! IM_JA_DATADIR="$im_ja_prefix/share/gnome/im-ja"
-  
-  cat >>confdefs.h <<_ACEOF
-  #define IM_JA_DATADIR "$IM_JA_DATADIR"
-***************
-*** 14918,14924 ****
-  _ACEOF
-  
-  
-! PIXMAPDIR="$im_ja_prefix/share/pixmaps"
-  
-  cat >>confdefs.h <<_ACEOF
-  #define PIXMAPDIR "$PIXMAPDIR"
---- 14919,14925 ----
-  _ACEOF
-  
-  
-! PIXMAPDIR="$im_ja_prefix/share/gnome/pixmaps"
-  
-  cat >>confdefs.h <<_ACEOF
-  #define PIXMAPDIR "$PIXMAPDIR"
diff --git a/japanese/im-ja/pkg-plist b/japanese/im-ja/pkg-plist
index 9d1b44174217..9110c82b5afe 100644
--- a/japanese/im-ja/pkg-plist
+++ b/japanese/im-ja/pkg-plist
@@ -6,43 +6,44 @@ lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-ja.so
 %%GNOMEPANEL%%libexec/im-ja/im-ja-applet
 libexec/im-ja/im-ja-helper
 libexec/im-ja/kpengine
-share/gnome/applications/im-ja.desktop
-%%GNOMEPANEL%%share/gnome/gnome-2.0/ui/GNOME_ImJaApplet.xml
-share/gnome/im-ja/01.unistrok
-share/gnome/im-ja/02.unistrok
-share/gnome/im-ja/03.unistrok
-share/gnome/im-ja/04.unistrok
-share/gnome/im-ja/05.unistrok
-share/gnome/im-ja/06.unistrok
-share/gnome/im-ja/07.unistrok
-share/gnome/im-ja/08.unistrok
-share/gnome/im-ja/09.unistrok
-share/gnome/im-ja/10.unistrok
-share/gnome/im-ja/11.unistrok
-share/gnome/im-ja/12.unistrok
-share/gnome/im-ja/13.unistrok
-share/gnome/im-ja/14.unistrok
-share/gnome/im-ja/15.unistrok
-share/gnome/im-ja/16.unistrok
-share/gnome/im-ja/17.unistrok
-share/gnome/im-ja/18.unistrok
-share/gnome/im-ja/19.unistrok
-share/gnome/im-ja/20.unistrok
-share/gnome/im-ja/21.unistrok
-share/gnome/im-ja/22.unistrok
-share/gnome/im-ja/23.unistrok
-share/gnome/im-ja/im-ja-conf.glade
-share/gnome/im-ja/im-ja-doc.html
-share/gnome/im-ja/im-ja-symbols.txt
-share/gnome/im-ja/radkfile.utf8
-share/gnome/pixmaps/im-ja-about.jpg
-share/gnome/pixmaps/im-ja-capplet.png
+share/applications/im-ja.desktop
+%%GNOMEPANEL%%share/gnome-2.0/ui/GNOME_ImJaApplet.xml
+share/im-ja/01.unistrok
+share/im-ja/02.unistrok
+share/im-ja/03.unistrok
+share/im-ja/04.unistrok
+share/im-ja/05.unistrok
+share/im-ja/06.unistrok
+share/im-ja/07.unistrok
+share/im-ja/08.unistrok
+share/im-ja/09.unistrok
+share/im-ja/10.unistrok
+share/im-ja/11.unistrok
+share/im-ja/12.unistrok
+share/im-ja/13.unistrok
+share/im-ja/14.unistrok
+share/im-ja/15.unistrok
+share/im-ja/16.unistrok
+share/im-ja/17.unistrok
+share/im-ja/18.unistrok
+share/im-ja/19.unistrok
+share/im-ja/20.unistrok
+share/im-ja/21.unistrok
+share/im-ja/22.unistrok
+share/im-ja/23.unistrok
+share/im-ja/im-ja-conf.glade
+share/im-ja/im-ja-doc.html
+share/im-ja/im-ja-symbols.txt
+share/im-ja/radkfile.utf8
+share/pixmaps/im-ja-about.jpg
+share/pixmaps/im-ja-capplet.png
 share/locale/ca/LC_MESSAGES/im-ja.mo
 share/locale/de/LC_MESSAGES/im-ja.mo
 share/locale/es/LC_MESSAGES/im-ja.mo
 share/locale/hu/LC_MESSAGES/im-ja.mo
 share/locale/ja/LC_MESSAGES/im-ja.mo
-@dirrm share/gnome/im-ja
+@dirrm share/im-ja
 @dirrm libexec/im-ja
 @exec if [ -f %D/bin/gtk-query-immodules-2.0 ]; then %D/bin/gtk-query-immodules-2.0 > %D/etc/gtk-2.0/gtk.immodules; fi
 @unexec if [ -f %D/bin/gtk-query-immodules-2.0 ]; then %D/bin/gtk-query-immodules-2.0 > %D/etc/gtk-2.0/gtk.immodules; fi
+@dirrmtry share/applications
diff --git a/japanese/ochusha/Makefile b/japanese/ochusha/Makefile
index 27ca4a918e21..b843c4002468 100644
--- a/japanese/ochusha/Makefile
+++ b/japanese/ochusha/Makefile
@@ -33,6 +33,10 @@ DESKTOP_ENTRIES="ochusha" "A GUI BBS browser for 2ch.net" \
 ACLOCAL_ARGS=	-I "${ACLOCAL_DIR}" -I ${LOCALBASE}/share/aclocal
 AUTOMAKE_ARGS=	-c -a
 
+post-patch:
+	@${FIND} ${WRKSRC} -name Makefile.* | ${XARGS} ${REINPLACE_CMD} -e \
+		's|-D.*_DISABLE_DEPRECATED||g'
+
 pre-configure:
 	@echo "===>  Regenerating ${WRKSRC}/libmodifiedgtk2/Makefile.in"
 	@${RM} ${WRKSRC}/libmodifiedgtk2/aclocal.m4
diff --git a/japanese/ochusha/Makefile.bak b/japanese/ochusha/Makefile.bak
deleted file mode 100644
index 95dbbdda2eb6..000000000000
--- a/japanese/ochusha/Makefile.bak
+++ /dev/null
@@ -1,46 +0,0 @@
-# New ports collection makefile for:   ochusha
-# Date created:     15 April 2006
-# Whom:             sgr
-#
-# $FreeBSD$
-#
-
-PORTNAME=	ochusha
-PORTVERSION=	0.5.8.2
-PORTREVISION=	4
-CATEGORIES=	japanese
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_JP}
-MASTER_SITE_SUBDIR=		ochusha/16560
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	A GUI BBS browser for 2ch.net
-
-MAN1=		ochusha.1
-MANCOMPRESSED=	no
-
-USE_X_PREFIX=	yes
-USE_BZIP2=	yes
-USE_GNOME=	pkgconfig glib20 gtk20 libxml2
-GNU_CONFIGURE=	yes
-USE_LDCONFIG=	yes
-USE_AUTOTOOLS=	automake:110 autoconf:261 aclocal:110 libtool:15
-
-DESKTOP_ENTRIES="ochusha" "A GUI BBS browser for 2ch.net" \
-		"${X11BASE}/share/ochusha/ochusha32.xpm" \
-		"Ochusha" "Application;Network;" \
-		false
-
-ACLOCAL_ARGS=	-I "${ACLOCAL_DIR}" -I ${LOCALBASE}/share/aclocal
-AUTOMAKE_ARGS=	-c -a
-#CONFIGURE_ARGS+=	--mandir=${PREFIX}/man
-
-pre-configure:
-	@echo "===>  Regenerating ${WRKSRC}/libmodifiedgtk2/Makefile.in"
-	@${RM} ${WRKSRC}/libmodifiedgtk2/aclocal.m4
-	@${RM} ${WRKSRC}/libmodifiedgtk2/Makefile.in
-	@(cd ${WRKSRC}/libmodifiedgtk2/ && \
-	${SETENV} ${AUTOTOOLS_ENV} ${ACLOCAL} && \
-	${SETENV} ${AUTOTOOLS_ENV} ${AUTOMAKE} && \
-	${SETENV} ${AUTOTOOLS_ENV} ${AUTOCONF})
-
-.include <bsd.port.mk>
diff --git a/japanese/scim-tomoe/Makefile b/japanese/scim-tomoe/Makefile
index fdcb0c0aeb79..2f4659ffc0a8 100644
--- a/japanese/scim-tomoe/Makefile
+++ b/japanese/scim-tomoe/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	scim-tomoe
 PORTVERSION=	0.6.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	japanese
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=tomoe
@@ -19,7 +19,7 @@ BUILD_DEPENDS=	scim:${PORTSDIR}/textproc/scim
 LIB_DEPENDS=	tomoe.1:${PORTSDIR}/japanese/tomoe \
 		tomoe-gtk.1:${PORTSDIR}/japanese/libtomoe-gtk
 
-USE_GNOME=	lthack
+USE_GNOME=	lthack intlhack
 USE_XLIB=	yes
 USE_GETTEXT=	yes
 USE_ICONV=	yes
diff --git a/japanese/stardict-dict-ja/Makefile b/japanese/stardict-dict-ja/Makefile
index 479bfd404399..e771586c0d15 100644
--- a/japanese/stardict-dict-ja/Makefile
+++ b/japanese/stardict-dict-ja/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	stardict2-dict-ja
 PORTVERSION=	2.4.2
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	japanese textproc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	stardict
@@ -23,8 +23,8 @@ NO_BUILD=	yes
 USE_BZIP2=	yes
 
 do-install:
-		${MKDIR} ${PREFIX}/share/gnome/stardict/dic/
-		${INSTALL_DATA} ${WRKDIR}/stardict-jmdict-en-ja-${PORTVERSION}/* ${PREFIX}/share/gnome/stardict/dic/
-		${INSTALL_DATA} ${WRKDIR}/stardict-jmdict-ja-en-${PORTVERSION}/* ${PREFIX}/share/gnome/stardict/dic/
+		${MKDIR} ${PREFIX}/share/stardict/dic/
+		${INSTALL_DATA} ${WRKDIR}/stardict-jmdict-en-ja-${PORTVERSION}/* ${PREFIX}/share/stardict/dic/
+		${INSTALL_DATA} ${WRKDIR}/stardict-jmdict-ja-en-${PORTVERSION}/* ${PREFIX}/share/stardict/dic/
 
 .include <bsd.port.mk>
diff --git a/japanese/stardict-dict-ja/pkg-plist b/japanese/stardict-dict-ja/pkg-plist
index 3d4a873d4438..2a36f21f51c3 100644
--- a/japanese/stardict-dict-ja/pkg-plist
+++ b/japanese/stardict-dict-ja/pkg-plist
@@ -1,7 +1,7 @@
-share/gnome/stardict/dic/jmdict-en-ja.dict.dz
-share/gnome/stardict/dic/jmdict-en-ja.idx
-share/gnome/stardict/dic/jmdict-en-ja.ifo
-share/gnome/stardict/dic/jmdict-ja-en.dict.dz
-share/gnome/stardict/dic/jmdict-ja-en.idx
-share/gnome/stardict/dic/jmdict-ja-en.ifo
-@dirrmtry share/gnome/stardict/dic
+share/stardict/dic/jmdict-en-ja.dict.dz
+share/stardict/dic/jmdict-en-ja.idx
+share/stardict/dic/jmdict-en-ja.ifo
+share/stardict/dic/jmdict-ja-en.dict.dz
+share/stardict/dic/jmdict-ja-en.idx
+share/stardict/dic/jmdict-ja-en.ifo
+@dirrmtry share/stardict/dic
diff --git a/japanese/stardict2-dict-ja/Makefile b/japanese/stardict2-dict-ja/Makefile
index 479bfd404399..e771586c0d15 100644
--- a/japanese/stardict2-dict-ja/Makefile
+++ b/japanese/stardict2-dict-ja/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	stardict2-dict-ja
 PORTVERSION=	2.4.2
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	japanese textproc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	stardict
@@ -23,8 +23,8 @@ NO_BUILD=	yes
 USE_BZIP2=	yes
 
 do-install:
-		${MKDIR} ${PREFIX}/share/gnome/stardict/dic/
-		${INSTALL_DATA} ${WRKDIR}/stardict-jmdict-en-ja-${PORTVERSION}/* ${PREFIX}/share/gnome/stardict/dic/
-		${INSTALL_DATA} ${WRKDIR}/stardict-jmdict-ja-en-${PORTVERSION}/* ${PREFIX}/share/gnome/stardict/dic/
+		${MKDIR} ${PREFIX}/share/stardict/dic/
+		${INSTALL_DATA} ${WRKDIR}/stardict-jmdict-en-ja-${PORTVERSION}/* ${PREFIX}/share/stardict/dic/
+		${INSTALL_DATA} ${WRKDIR}/stardict-jmdict-ja-en-${PORTVERSION}/* ${PREFIX}/share/stardict/dic/
 
 .include <bsd.port.mk>
diff --git a/japanese/stardict2-dict-ja/pkg-plist b/japanese/stardict2-dict-ja/pkg-plist
index 3d4a873d4438..2a36f21f51c3 100644
--- a/japanese/stardict2-dict-ja/pkg-plist
+++ b/japanese/stardict2-dict-ja/pkg-plist
@@ -1,7 +1,7 @@
-share/gnome/stardict/dic/jmdict-en-ja.dict.dz
-share/gnome/stardict/dic/jmdict-en-ja.idx
-share/gnome/stardict/dic/jmdict-en-ja.ifo
-share/gnome/stardict/dic/jmdict-ja-en.dict.dz
-share/gnome/stardict/dic/jmdict-ja-en.idx
-share/gnome/stardict/dic/jmdict-ja-en.ifo
-@dirrmtry share/gnome/stardict/dic
+share/stardict/dic/jmdict-en-ja.dict.dz
+share/stardict/dic/jmdict-en-ja.idx
+share/stardict/dic/jmdict-en-ja.ifo
+share/stardict/dic/jmdict-ja-en.dict.dz
+share/stardict/dic/jmdict-ja-en.idx
+share/stardict/dic/jmdict-ja-en.ifo
+@dirrmtry share/stardict/dic
diff --git a/korean/nabi/Makefile b/korean/nabi/Makefile
index 418a63bdac90..45011b7db872 100644
--- a/korean/nabi/Makefile
+++ b/korean/nabi/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	nabi
 PORTVERSION=	0.15
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	korean gnome
 MASTER_SITES=	http://kldp.net/frs/download.php/1651/
 
diff --git a/korean/nabi/pkg-plist b/korean/nabi/pkg-plist
index 6acce5dfcafc..2c8289ad23e1 100644
--- a/korean/nabi/pkg-plist
+++ b/korean/nabi/pkg-plist
@@ -1,54 +1,54 @@
 bin/nabi
-share/gnome/nabi/candidate/nabi.txt
-share/gnome/nabi/compose/default
-share/gnome/nabi/compose/full
-share/gnome/nabi/keyboard/2qwerty
-share/gnome/nabi/keyboard/32qwerty
-share/gnome/nabi/keyboard/39qwerty
-share/gnome/nabi/keyboard/3fqwerty
-share/gnome/nabi/keyboard/3sqwerty
-share/gnome/nabi/nabi-about.png
-share/gnome/nabi/nabi.png
-share/gnome/nabi/nabi.svg
-share/gnome/nabi/themes/KingSejong/README
-share/gnome/nabi/themes/KingSejong/english.png
-share/gnome/nabi/themes/KingSejong/hangul.png
-share/gnome/nabi/themes/KingSejong/none.png
-share/gnome/nabi/themes/MSWindows/english.png
-share/gnome/nabi/themes/MSWindows/hangul.png
-share/gnome/nabi/themes/MSWindows/none.png
-share/gnome/nabi/themes/MSWindowsXP/english.png
-share/gnome/nabi/themes/MSWindowsXP/hangul.png
-share/gnome/nabi/themes/MSWindowsXP/none.png
-share/gnome/nabi/themes/Mac/README
-share/gnome/nabi/themes/Mac/english.png
-share/gnome/nabi/themes/Mac/hangul.png
-share/gnome/nabi/themes/Mac/none.png
-share/gnome/nabi/themes/Onion/README
-share/gnome/nabi/themes/Onion/english.png
-share/gnome/nabi/themes/Onion/hangul.png
-share/gnome/nabi/themes/Onion/none.png
-share/gnome/nabi/themes/SimplyRed/english.png
-share/gnome/nabi/themes/SimplyRed/hangul.png
-share/gnome/nabi/themes/SimplyRed/none.png
-share/gnome/nabi/themes/Tux/english.png
-share/gnome/nabi/themes/Tux/hangul.png
-share/gnome/nabi/themes/Tux/none.png
-share/gnome/nabi/themes/keyboard/README
-share/gnome/nabi/themes/keyboard/english.png
-share/gnome/nabi/themes/keyboard/hangul.png
-share/gnome/nabi/themes/keyboard/none.png
+share/nabi/candidate/nabi.txt
+share/nabi/compose/default
+share/nabi/compose/full
+share/nabi/keyboard/2qwerty
+share/nabi/keyboard/32qwerty
+share/nabi/keyboard/39qwerty
+share/nabi/keyboard/3fqwerty
+share/nabi/keyboard/3sqwerty
+share/nabi/nabi-about.png
+share/nabi/nabi.png
+share/nabi/nabi.svg
+share/nabi/themes/KingSejong/README
+share/nabi/themes/KingSejong/english.png
+share/nabi/themes/KingSejong/hangul.png
+share/nabi/themes/KingSejong/none.png
+share/nabi/themes/MSWindows/english.png
+share/nabi/themes/MSWindows/hangul.png
+share/nabi/themes/MSWindows/none.png
+share/nabi/themes/MSWindowsXP/english.png
+share/nabi/themes/MSWindowsXP/hangul.png
+share/nabi/themes/MSWindowsXP/none.png
+share/nabi/themes/Mac/README
+share/nabi/themes/Mac/english.png
+share/nabi/themes/Mac/hangul.png
+share/nabi/themes/Mac/none.png
+share/nabi/themes/Onion/README
+share/nabi/themes/Onion/english.png
+share/nabi/themes/Onion/hangul.png
+share/nabi/themes/Onion/none.png
+share/nabi/themes/SimplyRed/english.png
+share/nabi/themes/SimplyRed/hangul.png
+share/nabi/themes/SimplyRed/none.png
+share/nabi/themes/Tux/english.png
+share/nabi/themes/Tux/hangul.png
+share/nabi/themes/Tux/none.png
+share/nabi/themes/keyboard/README
+share/nabi/themes/keyboard/english.png
+share/nabi/themes/keyboard/hangul.png
+share/nabi/themes/keyboard/none.png
 share/locale/ko/LC_MESSAGES/nabi.mo
-@dirrm share/gnome/nabi/themes/KingSejong
-@dirrm share/gnome/nabi/themes/MSWindows
-@dirrm share/gnome/nabi/themes/MSWindowsXP
-@dirrm share/gnome/nabi/themes/Mac
-@dirrm share/gnome/nabi/themes/Onion
-@dirrm share/gnome/nabi/themes/SimplyRed
-@dirrm share/gnome/nabi/themes/Tux
-@dirrm share/gnome/nabi/themes/keyboard
-@dirrm share/gnome/nabi/candidate
-@dirrm share/gnome/nabi/compose
-@dirrm share/gnome/nabi/keyboard
-@dirrm share/gnome/nabi/themes
-@dirrm share/gnome/nabi
+@dirrm share/nabi/themes/KingSejong
+@dirrm share/nabi/themes/MSWindows
+@dirrm share/nabi/themes/MSWindowsXP
+@dirrm share/nabi/themes/Mac
+@dirrm share/nabi/themes/Onion
+@dirrm share/nabi/themes/SimplyRed
+@dirrm share/nabi/themes/Tux
+@dirrm share/nabi/themes/keyboard
+@dirrm share/nabi/candidate
+@dirrm share/nabi/compose
+@dirrm share/nabi/keyboard
+@dirrm share/nabi/themes
+@dirrm share/nabi
diff --git a/korean/stardict2-dict-kr/Makefile b/korean/stardict2-dict-kr/Makefile
index e28a13a1910f..0e338ea547ae 100644
--- a/korean/stardict2-dict-kr/Makefile
+++ b/korean/stardict2-dict-kr/Makefile
@@ -1,11 +1,13 @@
 # Ports collection makefile for:	stardict-dict-korean
 # Date created:				20 May 2007
 # Whom:					Yinghong Liu <relaxbsd@gmail.com>
+#
 # $FreeBSD$
 #
 
 PORTNAME=	stardict2-dict-kr
 PORTVERSION=	2.4.2
+PORTREVISION=	1
 CATEGORIES=	korean textproc
 MASTER_SITES=	SF
 MASTER_SITE_SUBDIR=	stardict
@@ -21,7 +23,7 @@ USE_BZIP2=	yes
 
 LATEST_LINK=	${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}
 
-DICTDIR=	share/gnome/stardict/dic
+DICTDIR=	share/stardict/dic
 
 DICTIONARIES=	GPL_korean-russian-dic Hanja_KoreanHanzi_Dic KoreanAnimalMedicalDic \
 		KoreanDic KoreanEnglishDic KoreanLawDic KoreanMedicalDic quick_eng-kor
diff --git a/lang/mdk/Makefile b/lang/mdk/Makefile
index a0342cdcef21..88a39f5a9d53 100644
--- a/lang/mdk/Makefile
+++ b/lang/mdk/Makefile
@@ -32,4 +32,8 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
 
 INFO=		mdk
 
+post-patch:
+	@${REINPLACE_CMD} -e 's|-D.*_DISABLE_DEPRECATED||g' \
+		${WRKSRC}/configure
+
 .include <bsd.port.mk>
diff --git a/lang/vala/Makefile b/lang/vala/Makefile
index 86688ad12f01..e176ef413086 100644
--- a/lang/vala/Makefile
+++ b/lang/vala/Makefile
@@ -3,11 +3,12 @@
 # Whom:			Michael Johnson <ahze@FreeBSD.org>
 #
 # $FreeBSD$
-#    $MCom: ports/lang/vala/Makefile,v 1.1 2007/07/09 12:48:15 ahze Exp $
+#   $MCom: ports/lang/vala/Makefile,v 1.11 2007/10/22 21:01:35 ahze Exp $
+#
 
 PORTNAME=	vala
-PORTVERSION=	0.1.3
-PORTREVISION=	1
+PORTVERSION=	0.1.4
+PORTREVISION=	3
 CATEGORIES=	lang gnome
 MASTER_SITES=	GNOME
 
@@ -16,8 +17,9 @@ COMMENT=	Programming language and compiler that converts Vala code into C code
 
 LIB_DEPENDS=	enchant.1:${PORTSDIR}/textproc/enchant
 
+OPTIONS=	VAPIGEN "Enable VAPI generator" Off
 USE_BZIP2=	yes
-USE_GNOME=	glib20 gnomeprefix
+USE_GNOME=	glib20 gnomeprefix libxslt
 GNU_CONFIGURE=	yes
 USE_GETTEXT=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}" LDFLAGS="-L${LOCALBASE}/lib"
@@ -25,7 +27,20 @@ USE_BISON=	build
 MAN1=		valac.1
 USE_LDCONFIG=	yes
 
+.include <bsd.port.pre.mk>
+
+.if defined(WITH_VAIPGEN)
+CONFIGURE_ARGS+=	--enable-vapigen
+BUILD_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/XML/LibXML.pm:${PORTSDIR}/textproc/p5-XML-LibXML
+RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/XML/LibXML.pm:${PORTSDIR}/textproc/p5-XML-LibXML
+PLIST_SUB+=	VAPIGEN=""
+.else
+CONFIGURE_ARGS+=	--disable-vapigen
+PLIST_SUB+=	VAPIGEN="@comment "
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|$$(libdir)/pkgconfig|$$(prefix)/libdata/pkgconfig|' \
 		${WRKSRC}/Makefile.in
-.include <bsd.port.mk>
+
+.include <bsd.port.post.mk>
diff --git a/lang/vala/distinfo b/lang/vala/distinfo
index b5a650b98cbb..40d70a630ae1 100644
--- a/lang/vala/distinfo
+++ b/lang/vala/distinfo
@@ -1,3 +1,3 @@
-MD5 (vala-0.1.3.tar.bz2) = d6552982b10582d0b01c3d612fb098b2
-SHA256 (vala-0.1.3.tar.bz2) = 02e6228dc689f67641d3739ee4e1559a8b90f9f9f2911a43cdc04f82cfd0bda5
-SIZE (vala-0.1.3.tar.bz2) = 905848
+MD5 (vala-0.1.4.tar.bz2) = f914a5d7d3a92d1cb6af69fb4bb98002
+SHA256 (vala-0.1.4.tar.bz2) = 3267e5b720abaff8faea7c2236500bd770d6c2b073e8bfe2ba84e58d51cf1bb1
+SIZE (vala-0.1.4.tar.bz2) = 955518
diff --git a/lang/vala/pkg-plist b/lang/vala/pkg-plist
index 47308463db53..4e2d7439cc99 100644
--- a/lang/vala/pkg-plist
+++ b/lang/vala/pkg-plist
@@ -1,4 +1,7 @@
+%%VAPIGEN%%bin/gidlgen
 bin/valac
+%%VAPIGEN%%bin/vapicheck
+%%VAPIGEN%%bin/vapigen
 include/vala-1.0/ccode/valaccodeassignment.h
 include/vala-1.0/ccode/valaccodebinaryexpression.h
 include/vala-1.0/ccode/valaccodeblock.h
@@ -60,18 +63,22 @@ include/vala-1.0/gee/readonlylist.h
 include/vala-1.0/gee/readonlymap.h
 include/vala-1.0/gee/readonlyset.h
 include/vala-1.0/gee/set.h
+include/vala-1.0/gobject/valaccodearraycreationexpressionbinding.h
+include/vala-1.0/gobject/valaccodeassignmentbinding.h
+include/vala-1.0/gobject/valaccodebinding.h
 include/vala-1.0/gobject/valaccodecompiler.h
+include/vala-1.0/gobject/valaccodeelementaccessbinding.h
+include/vala-1.0/gobject/valaccodeexpressionbinding.h
+include/vala-1.0/gobject/valaccodegenerator.h
+include/vala-1.0/gobject/valaccodegeneratorclass.h
+include/vala-1.0/gobject/valaccodegeneratorinterface.h
+include/vala-1.0/gobject/valaccodegeneratorinvocationexpression.h
+include/vala-1.0/gobject/valaccodegeneratormemberaccess.h
+include/vala-1.0/gobject/valaccodegeneratormethod.h
+include/vala-1.0/gobject/valaccodegeneratorsignal.h
+include/vala-1.0/gobject/valaccodegeneratorsourcefile.h
+include/vala-1.0/gobject/valaccodegeneratorstruct.h
 include/vala-1.0/gobject/valaclassregisterfunction.h
-include/vala-1.0/gobject/valacodegenerator.h
-include/vala-1.0/gobject/valacodegeneratorassignment.h
-include/vala-1.0/gobject/valacodegeneratorclass.h
-include/vala-1.0/gobject/valacodegeneratorinterface.h
-include/vala-1.0/gobject/valacodegeneratorinvocationexpression.h
-include/vala-1.0/gobject/valacodegeneratormemberaccess.h
-include/vala-1.0/gobject/valacodegeneratormethod.h
-include/vala-1.0/gobject/valacodegeneratorsignal.h
-include/vala-1.0/gobject/valacodegeneratorsourcefile.h
-include/vala-1.0/gobject/valacodegeneratorstruct.h
 include/vala-1.0/gobject/valadbusbindingprovider.h
 include/vala-1.0/gobject/valadbusmethod.h
 include/vala-1.0/gobject/valadbussignal.h
@@ -98,7 +105,9 @@ include/vala-1.0/vala/valacastexpression.h
 include/vala-1.0/vala/valacatchclause.h
 include/vala-1.0/vala/valacharacterliteral.h
 include/vala-1.0/vala/valaclass.h
+include/vala-1.0/vala/valacodebinding.h
 include/vala-1.0/vala/valacodecontext.h
+include/vala-1.0/vala/valacodegenerator.h
 include/vala-1.0/vala/valacodenode.h
 include/vala-1.0/vala/valacodevisitor.h
 include/vala-1.0/vala/valaconditionalexpression.h
@@ -136,6 +145,7 @@ include/vala-1.0/vala/valalockable.h
 include/vala-1.0/vala/valalockstatement.h
 include/vala-1.0/vala/valamember.h
 include/vala-1.0/vala/valamemberaccess.h
+include/vala-1.0/vala/valamemberinitializer.h
 include/vala-1.0/vala/valamemorymanager.h
 include/vala-1.0/vala/valamethod.h
 include/vala-1.0/vala/valanamedargument.h
@@ -181,53 +191,70 @@ include/vala-1.0/vala/valawhilestatement.h
 lib/libvala.la
 lib/libvala.so
 lib/libvala.so.0
+%%VAPIGEN%%lib/vala/gapi2xml.pl
+%%VAPIGEN%%lib/vala/gapi_pp.pl
 libdata/pkgconfig/vala-1.0.pc
-share/gnome/vala/vapi/atk.vala
-share/gnome/vala/vapi/cairo.vala
-share/gnome/vala/vapi/curses.vala
-share/gnome/vala/vapi/dbus-glib-1.vala
-share/gnome/vala/vapi/enchant.vala
-share/gnome/vala/vapi/gconf-2.0.vala
-share/gnome/vala/vapi/gdk-2.0.deps
-share/gnome/vala/vapi/gdk-2.0.vala
-share/gnome/vala/vapi/gio-standalone.vala
-share/gnome/vala/vapi/glib-2.0.vala
-share/gnome/vala/vapi/gnome-desktop-2.0.vala
-share/gnome/vala/vapi/gnome-vfs-2.0.vala
-share/gnome/vala/vapi/gstreamer-0.10.vala
-share/gnome/vala/vapi/gtk+-2.0.deps
-share/gnome/vala/vapi/gtk+-2.0.vala
-share/gnome/vala/vapi/gtkmozembed.deps
-share/gnome/vala/vapi/gtkmozembed.vala
-share/gnome/vala/vapi/gtksourceview-2.0.deps
-share/gnome/vala/vapi/gtksourceview-2.0.vala
-share/gnome/vala/vapi/hal.deps
-share/gnome/vala/vapi/hal.vala
-share/gnome/vala/vapi/hildon-1.deps
-share/gnome/vala/vapi/hildon-1.vala
-share/gnome/vala/vapi/libglade-2.0.deps
-share/gnome/vala/vapi/libglade-2.0.vala
-share/gnome/vala/vapi/libgnome-2.0.vala
-share/gnome/vala/vapi/libgnomeui-2.0.deps
-share/gnome/vala/vapi/libgnomeui-2.0.vala
-share/gnome/vala/vapi/libnotify.deps
-share/gnome/vala/vapi/libnotify.vala
-share/gnome/vala/vapi/libpanelapplet-2.0.deps
-share/gnome/vala/vapi/libpanelapplet-2.0.vala
-share/gnome/vala/vapi/libsoup-2.2.vala
-share/gnome/vala/vapi/libwnck-1.0.vala
-share/gnome/vala/vapi/libxml-2.0.vala
-share/gnome/vala/vapi/pango.deps
-share/gnome/vala/vapi/pango.vala
-share/gnome/vala/vapi/poppler-glib.deps
-share/gnome/vala/vapi/poppler-glib.vala
-share/gnome/vala/vapi/sqlite3.vala
-share/gnome/vala/vapi/vala-1.0.vala
-share/gnome/vala/vapi/vte.deps
-share/gnome/vala/vapi/vte.vala
-share/gnome/vala/vapi/zlib.vala
-@dirrm share/gnome/vala/vapi
-@dirrm share/gnome/vala
+share/devhelp/books/vala/classes.html
+share/devhelp/books/vala/default.css
+share/devhelp/books/vala/delegates.html
+share/devhelp/books/vala/enums.html
+share/devhelp/books/vala/expressions.html
+share/devhelp/books/vala/index.html
+share/devhelp/books/vala/interfaces.html
+share/devhelp/books/vala/namespaces.html
+share/devhelp/books/vala/overview.html
+share/devhelp/books/vala/statements.html
+share/devhelp/books/vala/structs.html
+share/devhelp/books/vala/types.html
+share/devhelp/books/vala/vala.devhelp2
+%%DATADIR%%/vapi/atk.vapi
+%%DATADIR%%/vapi/cairo.vapi
+%%DATADIR%%/vapi/curses.vapi
+%%DATADIR%%/vapi/dbus-glib-1.vapi
+%%DATADIR%%/vapi/enchant.vapi
+%%DATADIR%%/vapi/gconf-2.0.vapi
+%%DATADIR%%/vapi/gdk-2.0.deps
+%%DATADIR%%/vapi/gdk-2.0.vapi
+%%DATADIR%%/vapi/gio-2.0.vapi
+%%DATADIR%%/vapi/glib-2.0.vapi
+%%DATADIR%%/vapi/gnome-desktop-2.0.vapi
+%%DATADIR%%/vapi/gnome-vfs-2.0.vapi
+%%DATADIR%%/vapi/gstreamer-0.10.vapi
+%%DATADIR%%/vapi/gtk+-2.0.deps
+%%DATADIR%%/vapi/gtk+-2.0.vapi
+%%DATADIR%%/vapi/gtkmozembed.deps
+%%DATADIR%%/vapi/gtkmozembed.vapi
+%%DATADIR%%/vapi/gtksourceview-2.0.deps
+%%DATADIR%%/vapi/gtksourceview-2.0.vapi
+%%DATADIR%%/vapi/hal.deps
+%%DATADIR%%/vapi/hal.vapi
+%%DATADIR%%/vapi/hildon-1.deps
+%%DATADIR%%/vapi/hildon-1.vapi
+%%DATADIR%%/vapi/libglade-2.0.deps
+%%DATADIR%%/vapi/libglade-2.0.vapi
+%%DATADIR%%/vapi/libgnome-2.0.vapi
+%%DATADIR%%/vapi/libgnomeui-2.0.deps
+%%DATADIR%%/vapi/libgnomeui-2.0.vapi
+%%DATADIR%%/vapi/libnotify.deps
+%%DATADIR%%/vapi/libnotify.vapi
+%%DATADIR%%/vapi/libpanelapplet-2.0.deps
+%%DATADIR%%/vapi/libpanelapplet-2.0.vapi
+%%DATADIR%%/vapi/libsoup-2.2.vapi
+%%DATADIR%%/vapi/libwnck-1.0.vapi
+%%DATADIR%%/vapi/libxml-2.0.vapi
+%%DATADIR%%/vapi/pango.deps
+%%DATADIR%%/vapi/pango.vapi
+%%DATADIR%%/vapi/poppler-glib.deps
+%%DATADIR%%/vapi/poppler-glib.vapi
+%%DATADIR%%/vapi/sqlite3.vapi
+%%DATADIR%%/vapi/vala-1.0.vapi
+%%DATADIR%%/vapi/vte.deps
+%%DATADIR%%/vapi/vte.vapi
+%%DATADIR%%/vapi/zlib.vapi
+@dirrm share/devhelp/books/vala
+@dirrmtry share/devhelp/books
+@dirrmtry share/devhelp
+%%VAPIGEN%%@dirrm lib/vala
 @dirrm include/vala-1.0/vala
 @dirrm include/vala-1.0/gobject
 @dirrm include/vala-1.0/gee
diff --git a/mail/balsa/Makefile b/mail/balsa/Makefile
index ba79f5f2766e..735134a18588 100644
--- a/mail/balsa/Makefile
+++ b/mail/balsa/Makefile
@@ -3,11 +3,12 @@
 # Whom:					Glenn Johnson <gljohns@bellsouth.net>
 #
 # $FreeBSD$
-#   $MCom: ports/mail/balsa/Makefile,v 1.10 2007/03/14 17:45:39 marcus Exp $
+#   $MCom: ports/mail/balsa/Makefile,v 1.19 2007/10/11 04:42:18 mezz Exp $
 #
 
 PORTNAME=	balsa
 PORTVERSION=	2.3.17
+PORTREVISION=	2
 CATEGORIES=	mail gnome
 MASTER_SITES=	http://www.theochem.kth.se/~pawsa/balsa/
 DISTNAME=	balsa-${PORTVERSION}
@@ -92,9 +93,7 @@ post-patch:
 	@${REINPLACE_CMD} -E \
 		-e 's|^(HICOLOR_ICON_DIR)[^/]+/|\1=${PREFIX}/|' \
 		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
-
-post-install:
-	@${LOCALBASE}/bin/gtk-update-icon-cache -f -q --ignore-theme-index \
-		${PREFIX}/share/gnome/balsa/hicolor
+	@${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} ${REINPLACE_CMD} -e \
+		's|-D.*_DISABLE_DEPRECATED_SOURCE||g ; s|-D.*_DISABLE_DEPRECATED||g'
 
 .include <bsd.port.post.mk>
diff --git a/mail/balsa/files/patch-doc_xmldocs.make b/mail/balsa/files/patch-doc_xmldocs.make
deleted file mode 100644
index 9379b0d60628..000000000000
--- a/mail/balsa/files/patch-doc_xmldocs.make
+++ /dev/null
@@ -1,11 +0,0 @@
---- doc/xmldocs.make.orig	Wed Sep 18 07:12:20 2002
-+++ doc/xmldocs.make	Tue Oct 29 12:20:37 2002
-@@ -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/mail/balsa/files/patch-src_main.c b/mail/balsa/files/patch-src_main.c
deleted file mode 100644
index 044e51dd98db..000000000000
--- a/mail/balsa/files/patch-src_main.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/main.c.orig	Sun Jan 18 06:39:47 2004
-+++ src/main.c	Sun Jan 18 21:38:15 2004
-@@ -233,7 +233,7 @@
-     gnome_program_init(PACKAGE, VERSION, LIBGNOMEUI_MODULE, argc, argv,
-                        GNOME_PARAM_POPT_TABLE, options,
-                        GNOME_PARAM_APP_PREFIX, BALSA_STD_PREFIX,
--                       GNOME_PARAM_APP_DATADIR, BALSA_STD_PREFIX "/share",
-+                       GNOME_PARAM_APP_DATADIR, BALSA_STD_PREFIX "/share/gnome",
- 		       GNOME_PARAM_HUMAN_READABLE_NAME, _("The Balsa E-Mail Client"),
-                        NULL);
- 
diff --git a/mail/balsa/pkg-plist b/mail/balsa/pkg-plist
index d5bd143b29ac..949aea6c86e3 100644
--- a/mail/balsa/pkg-plist
+++ b/mail/balsa/pkg-plist
@@ -2,53 +2,52 @@ bin/balsa
 bin/balsa-ab
 etc/sound/events/balsa.soundlist
 libdata/bonobo/servers/GNOME_Balsa.server
-share/gnome/applications/balsa.desktop
-share/gnome/balsa/hicolor/16x16/apps/balsa-encrypted.png
-share/gnome/balsa/hicolor/16x16/apps/balsa-mark-all.png
-share/gnome/balsa/hicolor/16x16/apps/balsa-mbox-draft.png
-share/gnome/balsa/hicolor/16x16/apps/balsa-mbox-sent.png
-share/gnome/balsa/hicolor/16x16/apps/balsa-mbox-tray-empty.png
-share/gnome/balsa/hicolor/16x16/apps/balsa-mbox-tray-full.png
-share/gnome/balsa/hicolor/16x16/apps/balsa-next-flagged.png
-share/gnome/balsa/hicolor/16x16/apps/balsa-next-part.png
-share/gnome/balsa/hicolor/16x16/apps/balsa-next-unread.png
-share/gnome/balsa/hicolor/16x16/apps/balsa-next.png
-share/gnome/balsa/hicolor/16x16/apps/balsa-postpone.png
-share/gnome/balsa/hicolor/16x16/apps/balsa-previous-part.png
-share/gnome/balsa/hicolor/16x16/apps/balsa-previous.png
-share/gnome/balsa/hicolor/16x16/apps/balsa-reply-all.png
-share/gnome/balsa/hicolor/16x16/apps/balsa-signature-bad.png
-share/gnome/balsa/hicolor/16x16/apps/balsa-signature-good.png
-share/gnome/balsa/hicolor/16x16/apps/balsa-signature-notrust.png
-share/gnome/balsa/hicolor/16x16/apps/balsa-signature-unknown.png
-share/gnome/balsa/hicolor/22x22
-share/gnome/balsa/hicolor/24x24/apps/balsa-crypt-check.png
-share/gnome/balsa/hicolor/24x24/apps/balsa-encrypt.png
-share/gnome/balsa/hicolor/24x24/apps/balsa-encrypted.png
-share/gnome/balsa/hicolor/24x24/apps/balsa-mark-all.png
-share/gnome/balsa/hicolor/24x24/apps/balsa-marked-new.png
-share/gnome/balsa/hicolor/24x24/apps/balsa-next-flagged.png
-share/gnome/balsa/hicolor/24x24/apps/balsa-next-part.png
-share/gnome/balsa/hicolor/24x24/apps/balsa-next-unread.png
-share/gnome/balsa/hicolor/24x24/apps/balsa-next.png
-share/gnome/balsa/hicolor/24x24/apps/balsa-postpone.png
-share/gnome/balsa/hicolor/24x24/apps/balsa-preview.png
-share/gnome/balsa/hicolor/24x24/apps/balsa-previous-part.png
-share/gnome/balsa/hicolor/24x24/apps/balsa-previous.png
-share/gnome/balsa/hicolor/24x24/apps/balsa-reply-all.png
-share/gnome/balsa/hicolor/24x24/apps/balsa-sign.png
-share/gnome/balsa/hicolor/24x24/apps/balsa-signature-bad.png
-share/gnome/balsa/hicolor/24x24/apps/balsa-signature-good.png
-share/gnome/balsa/hicolor/24x24/apps/balsa-signature-notrust.png
-share/gnome/balsa/hicolor/24x24/apps/balsa-signature-unknown.png
-share/gnome/balsa/hicolor/24x24/apps/balsa-trash-empty.png
-share/gnome/balsa/hicolor/icon-theme.cache
-share/gnome/balsa/pixmaps/attachment.png
-share/gnome/balsa/pixmaps/balsa-logo.png
-share/gnome/balsa/pixmaps/balsa-top.png
-share/gnome/balsa/pixmaps/balsa-watermark.png
-share/gnome/balsa/pixmaps/balsa_icon.png
-share/gnome/balsa/pixmaps/balsa_logo.png
+share/applications/balsa.desktop
+share/balsa/hicolor/16x16/apps/balsa-encrypted.png
+share/balsa/hicolor/16x16/apps/balsa-mark-all.png
+share/balsa/hicolor/16x16/apps/balsa-mbox-draft.png
+share/balsa/hicolor/16x16/apps/balsa-mbox-sent.png
+share/balsa/hicolor/16x16/apps/balsa-mbox-tray-empty.png
+share/balsa/hicolor/16x16/apps/balsa-mbox-tray-full.png
+share/balsa/hicolor/16x16/apps/balsa-next-flagged.png
+share/balsa/hicolor/16x16/apps/balsa-next-part.png
+share/balsa/hicolor/16x16/apps/balsa-next-unread.png
+share/balsa/hicolor/16x16/apps/balsa-next.png
+share/balsa/hicolor/16x16/apps/balsa-postpone.png
+share/balsa/hicolor/16x16/apps/balsa-previous-part.png
+share/balsa/hicolor/16x16/apps/balsa-previous.png
+share/balsa/hicolor/16x16/apps/balsa-reply-all.png
+share/balsa/hicolor/16x16/apps/balsa-signature-bad.png
+share/balsa/hicolor/16x16/apps/balsa-signature-good.png
+share/balsa/hicolor/16x16/apps/balsa-signature-notrust.png
+share/balsa/hicolor/16x16/apps/balsa-signature-unknown.png
+share/balsa/hicolor/22x22
+share/balsa/hicolor/24x24/apps/balsa-crypt-check.png
+share/balsa/hicolor/24x24/apps/balsa-encrypt.png
+share/balsa/hicolor/24x24/apps/balsa-encrypted.png
+share/balsa/hicolor/24x24/apps/balsa-mark-all.png
+share/balsa/hicolor/24x24/apps/balsa-marked-new.png
+share/balsa/hicolor/24x24/apps/balsa-next-flagged.png
+share/balsa/hicolor/24x24/apps/balsa-next-part.png
+share/balsa/hicolor/24x24/apps/balsa-next-unread.png
+share/balsa/hicolor/24x24/apps/balsa-next.png
+share/balsa/hicolor/24x24/apps/balsa-postpone.png
+share/balsa/hicolor/24x24/apps/balsa-preview.png
+share/balsa/hicolor/24x24/apps/balsa-previous-part.png
+share/balsa/hicolor/24x24/apps/balsa-previous.png
+share/balsa/hicolor/24x24/apps/balsa-reply-all.png
+share/balsa/hicolor/24x24/apps/balsa-sign.png
+share/balsa/hicolor/24x24/apps/balsa-signature-bad.png
+share/balsa/hicolor/24x24/apps/balsa-signature-good.png
+share/balsa/hicolor/24x24/apps/balsa-signature-notrust.png
+share/balsa/hicolor/24x24/apps/balsa-signature-unknown.png
+share/balsa/hicolor/24x24/apps/balsa-trash-empty.png
+share/balsa/pixmaps/attachment.png
+share/balsa/pixmaps/balsa-logo.png
+share/balsa/pixmaps/balsa-top.png
+share/balsa/pixmaps/balsa-watermark.png
+share/balsa/pixmaps/balsa_icon.png
+share/balsa/pixmaps/balsa_logo.png
 share/gnome/help/balsa/C/balsa.xml
 share/gnome/help/balsa/C/fdl-appendix.xml
 share/gnome/help/balsa/C/figures/address-book-ldap.png
@@ -69,11 +68,11 @@ share/gnome/help/balsa/C/figures/newmsg-window-toolbar.png
 share/gnome/help/balsa/C/figures/newmsg-window.png
 share/gnome/help/balsa/C/figures/preferences-window.png
 share/gnome/help/balsa/C/figures/spell-check.png
-share/gnome/idl/Balsa.idl
-share/gnome/omf/balsa/balsa-C.omf
-share/gnome/pixmaps/gnome-balsa2.png
-share/gnome/sounds/balsa/newmail.wav
-share/gnome/sounds/balsa/startup.wav
+share/idl/Balsa.idl
+share/omf/balsa/balsa-C.omf
+share/pixmaps/gnome-balsa2.png
+share/sounds/balsa/newmail.wav
+share/sounds/balsa/startup.wav
 share/icons/hicolor/48x48/mimetypes/gnome-mime-application-pgp-signature.png
 share/icons/hicolor/48x48/mimetypes/gnome-mime-application-pkcs7-mime.png
 share/icons/hicolor/48x48/mimetypes/gnome-mime-application-pkcs7-signature.png
@@ -139,19 +138,19 @@ share/locale/wa/LC_MESSAGES/balsa.mo
 share/locale/zh_CN/LC_MESSAGES/balsa.mo
 share/locale/zh_HK/LC_MESSAGES/balsa.mo
 share/locale/zh_TW/LC_MESSAGES/balsa.mo
-@dirrm share/gnome/sounds/balsa
-@dirrm share/gnome/omf/balsa
+@dirrm share/sounds/balsa
+@dirrm share/omf/balsa
 %%GTKICON%%@dirrmtry share/icons/hicolor/48x48/mimetypes
 @dirrm share/gnome/help/balsa/C/figures
 @dirrm share/gnome/help/balsa/C
 @dirrm share/gnome/help/balsa
-@dirrm share/gnome/balsa/pixmaps
-@dirrm share/gnome/balsa/hicolor/24x24/apps
-@dirrm share/gnome/balsa/hicolor/24x24
-@dirrm share/gnome/balsa/hicolor/16x16/apps
-@dirrm share/gnome/balsa/hicolor/16x16
-@dirrm share/gnome/balsa/hicolor
-@dirrm share/gnome/balsa
+@dirrm share/balsa/pixmaps
+@dirrm share/balsa/hicolor/24x24/apps
+@dirrm share/balsa/hicolor/24x24
+@dirrm share/balsa/hicolor/16x16/apps
+@dirrm share/balsa/hicolor/16x16
+@dirrm share/balsa/hicolor
+@dirrm share/balsa
 @dirrmtry share/locale/zh_HK/LC_MESSAGES
 @dirrmtry share/locale/zh_HK
 @dirrmtry share/locale/rw/LC_MESSAGES
@@ -160,3 +159,4 @@ share/locale/zh_TW/LC_MESSAGES/balsa.mo
 @dirrmtry share/locale/oc
 @dirrmtry share/locale/dz/LC_MESSAGES
 @dirrmtry share/locale/dz
+@dirrmtry share/applications
diff --git a/mail/contact-lookup-applet/Makefile b/mail/contact-lookup-applet/Makefile
index 5ee6bc281aa2..c71e6b0cf64c 100644
--- a/mail/contact-lookup-applet/Makefile
+++ b/mail/contact-lookup-applet/Makefile
@@ -3,11 +3,12 @@
 # Whom:					kwm@rainbow-runner.nl
 #
 # $FreeBSD$
-#    $MCom: ports/mail/contact-lookup-applet/Makefile,v 1.13 2006/09/30 23:58:38 ahze Exp $
+#   $MCom: ports/mail/contact-lookup-applet/Makefile,v 1.15 2007/07/29 22:17:31 mezz Exp $
+#
 
 PORTNAME=	contact
 PORTVERSION=	0.14
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	mail gnome
 MASTER_SITES=	http://www.burtonini.com/computing/
 PKGNAMESUFFIX=	-lookup-applet
diff --git a/mail/contact-lookup-applet/pkg-plist b/mail/contact-lookup-applet/pkg-plist
index d84b9f061bed..f3dce63b1fd1 100644
--- a/mail/contact-lookup-applet/pkg-plist
+++ b/mail/contact-lookup-applet/pkg-plist
@@ -1,7 +1,7 @@
 libdata/bonobo/servers/GNOME_ContactLookupApplet.server
 libexec/contact-lookup-applet
-share/gnome/lookup-applet/GNOME_ContactLookupApplet.xml
-share/gnome/lookup-applet/contact-lookup-applet.glade
+share/lookup-applet/GNOME_ContactLookupApplet.xml
+share/lookup-applet/contact-lookup-applet.glade
 share/locale/bg/LC_MESSAGES/contact-lookup-applet.mo
 share/locale/ca/LC_MESSAGES/contact-lookup-applet.mo
 share/locale/cs/LC_MESSAGES/contact-lookup-applet.mo
@@ -30,7 +30,7 @@ share/locale/uk/LC_MESSAGES/contact-lookup-applet.mo
 share/locale/vi/LC_MESSAGES/contact-lookup-applet.mo
 share/locale/xh/LC_MESSAGES/contact-lookup-applet.mo
 share/locale/zh_CN/LC_MESSAGES/contact-lookup-applet.mo
-@dirrm share/gnome/lookup-applet
+@dirrm share/lookup-applet
 @dirrmtry share/locale/xh/LC_MESSAGES
 @dirrmtry share/locale/xh
 @dirrmtry share/locale/rw/LC_MESSAGES
diff --git a/mail/evolution-exchange/Makefile b/mail/evolution-exchange/Makefile
index cf08e7a82a07..e8fe3adcfc21 100644
--- a/mail/evolution-exchange/Makefile
+++ b/mail/evolution-exchange/Makefile
@@ -3,11 +3,11 @@
 # Whom:					Adam Weinberger, based off kiesel's ximian-exchange port
 #
 # $FreeBSD$
-#   $MCom: ports/mail/evolution-exchange/Makefile,v 1.83 2007/03/13 16:03:50 marcus Exp $
+#   $MCom: ports/mail/evolution-exchange/Makefile,v 1.99 2007/10/15 20:59:13 mezz Exp $
 #
 
 PORTNAME=	evolution-exchange
-PORTVERSION=	2.10.3
+PORTVERSION=	2.12.1
 CATEGORIES=	mail gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}${PKGNAMESUFFIX}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -16,8 +16,8 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Evolution plugin to connect to Microsoft Exchange servers
 
-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_BZIP2=	yes
 USE_GETTEXT=	yes
@@ -34,8 +34,8 @@ CONFIGURE_ARGS=	--with-openldap=${LOCALBASE} \
 		--disable-compile-warnings \
 		--with-libdb=${LOCALBASE}
 
-EVO_VERSION=	2.10
-VERSION=	2.10
+EVO_VERSION=	2.12
+VERSION=	2.12
 PLIST_SUB=	VERSION=${VERSION} EVO_VERSION=${EVO_VERSION} \
 		EDS_VERSION="1.2" OLDDOCSDIR="share/doc/ximian-connector"
 
@@ -43,8 +43,7 @@ GCONF_SCHEMAS=	apps_exchange_addressbook-${VERSION}.schemas
 
 .include <bsd.port.pre.mk>
 
-.if !defined(NO_KERBEROS) && \
-	exists(/usr/lib/libkrb5.so)
+.if !defined(NO_KERBEROS) && exists(/usr/lib/libkrb5.so)
 CONFIGURE_ARGS+=	--with-krb5=/usr
 .else
 LIB_DEPENDS+=		krb5:${PORTSDIR}/security/heimdal
@@ -64,9 +63,7 @@ IGNORE=	does not build with ${LOCALBASE}/include/mapi.h exists in system, run pk
 .endif
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|EVOLUTION_API_VERSION=2.8|EVOLUTION_API_VERSION=2.10| ; \
-	    	s|EDS_BASE_VERSION=1.8|EDS_BASE_VERSION=1.10| ; \
-		s|-ldb|-l${BDB_LIB_NAME}|g' \
+	@${REINPLACE_CMD} -e 's|-ldb|-l${BDB_LIB_NAME}|g' \
 		${WRKSRC}/configure
 
 .include <bsd.port.post.mk>
diff --git a/mail/evolution-exchange/distinfo b/mail/evolution-exchange/distinfo
index 85c6ebe115ac..dcba0957bf15 100644
--- a/mail/evolution-exchange/distinfo
+++ b/mail/evolution-exchange/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/evolution-exchange-2.10.3.tar.bz2) = 4e2024c1af8fdef1b9f4764632171711
-SHA256 (gnome2/evolution-exchange-2.10.3.tar.bz2) = 281950cce0bc3e21dd7df30bad2bcc9f52413936ba3aaa324ccab069ee494016
-SIZE (gnome2/evolution-exchange-2.10.3.tar.bz2) = 1046362
+MD5 (gnome2/evolution-exchange-2.12.1.tar.bz2) = 7130d53d0b10e3475bbd1c2af1e35810
+SHA256 (gnome2/evolution-exchange-2.12.1.tar.bz2) = 41987e1e23a5bd08d2a2bf4c147ecc7448c174616c3d874565afde55533f0008
+SIZE (gnome2/evolution-exchange-2.12.1.tar.bz2) = 1063241
diff --git a/mail/evolution-exchange/pkg-plist b/mail/evolution-exchange/pkg-plist
index 697e9261deea..7ee15d2a4bdb 100644
--- a/mail/evolution-exchange/pkg-plist
+++ b/mail/evolution-exchange/pkg-plist
@@ -63,18 +63,18 @@ libexec/evolution/%%EVO_VERSION%%/evolution-exchange-storage
 %%OLDDOCSDIR%%/ximian-connector.devhelp
 %%OLDDOCSDIR%%/ximian-connector.devhelp2
 %%OLDDOCSDIR%%/ximian-connnector-booking.html
-share/gnome/evolution-exchange/%%VERSION%%/glade/exchange-autoconfig-wizard.glade
-share/gnome/evolution-exchange/%%VERSION%%/glade/exchange-change-password.glade
-share/gnome/evolution-exchange/%%VERSION%%/glade/exchange-delegates.glade
-share/gnome/evolution-exchange/%%VERSION%%/glade/exchange-folder-tree.glade
-share/gnome/evolution-exchange/%%VERSION%%/glade/exchange-oof.glade
-share/gnome/evolution-exchange/%%VERSION%%/glade/exchange-passwd-expiry.glade
-share/gnome/evolution-exchange/%%VERSION%%/glade/exchange-permissions-dialog.glade
-share/gnome/evolution-exchange/%%VERSION%%/images/connector-mini.png
-share/gnome/evolution-exchange/%%VERSION%%/images/connector.png
-share/gnome/evolution-exchange/%%VERSION%%/images/exchange-delegates-48.png
-share/gnome/evolution-exchange/%%VERSION%%/images/exchange-oof-48.png
-share/gnome/evolution-exchange/%%VERSION%%/ui/ximian-connector.xml
+%%DATADIR%%/%%VERSION%%/glade/exchange-autoconfig-wizard.glade
+%%DATADIR%%/%%VERSION%%/glade/exchange-change-password.glade
+%%DATADIR%%/%%VERSION%%/glade/exchange-delegates.glade
+%%DATADIR%%/%%VERSION%%/glade/exchange-folder-tree.glade
+%%DATADIR%%/%%VERSION%%/glade/exchange-oof.glade
+%%DATADIR%%/%%VERSION%%/glade/exchange-passwd-expiry.glade
+%%DATADIR%%/%%VERSION%%/glade/exchange-permissions-dialog.glade
+%%DATADIR%%/%%VERSION%%/images/connector-mini.png
+%%DATADIR%%/%%VERSION%%/images/connector.png
+%%DATADIR%%/%%VERSION%%/images/exchange-delegates-48.png
+%%DATADIR%%/%%VERSION%%/images/exchange-oof-48.png
+%%DATADIR%%/%%VERSION%%/ui/ximian-connector.xml
 share/locale/ar/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
 share/locale/az/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
 share/locale/bg/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
@@ -115,6 +115,7 @@ share/locale/nb/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
 share/locale/ne/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
 share/locale/nl/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
 share/locale/nn/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
+share/locale/oc/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
 share/locale/or/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
 share/locale/pa/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
 share/locale/pl/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
@@ -138,11 +139,11 @@ share/locale/xh/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
 share/locale/zh_CN/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
 share/locale/zh_HK/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
 share/locale/zh_TW/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
-@dirrm share/gnome/evolution-exchange/%%VERSION%%/ui
-@dirrm share/gnome/evolution-exchange/%%VERSION%%/images
-@dirrm share/gnome/evolution-exchange/%%VERSION%%/glade
-@dirrm share/gnome/evolution-exchange/%%VERSION%%
-@dirrm share/gnome/evolution-exchange
+@dirrm %%DATADIR%%/%%VERSION%%/ui
+@dirrm %%DATADIR%%/%%VERSION%%/images
+@dirrm %%DATADIR%%/%%VERSION%%/glade
+@dirrm %%DATADIR%%/%%VERSION%%
+@dirrm %%DATADIR%%
 @dirrm %%OLDDOCSDIR%%
 @dirrmtry share/locale/zh_HK/LC_MESSAGES
 @dirrmtry share/locale/zh_HK
@@ -150,6 +151,8 @@ share/locale/zh_TW/LC_MESSAGES/evolution-exchange-%%VERSION%%.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/ku/LC_MESSAGES
 @dirrmtry share/locale/ku
 @dirrmtry share/locale/dz/LC_MESSAGES
diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile
index 8b5fdf54b067..079b911870d3 100644
--- a/mail/evolution/Makefile
+++ b/mail/evolution/Makefile
@@ -3,11 +3,11 @@
 # Whom:					Ade Lovett <ade@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/mail/evolution/Makefile,v 1.134 2007/03/13 05:41:38 marcus Exp $
+#   $MCom: ports/mail/evolution/Makefile,v 1.153 2007/10/17 21:36:11 mezz Exp $
 #
 
 PORTNAME=	evolution
-PORTVERSION=	2.10.3
+PORTVERSION=	2.12.1
 PORTREVISION=	1
 CATEGORIES=	mail gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
@@ -38,15 +38,17 @@ CONFIGURE_ARGS=	--enable-nss=yes \
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
-GCONF_SCHEMAS=	apps_evolution_addressbook-${EVO_VERSION}.schemas \
-		apps_evolution_calendar-${EVO_VERSION}.schemas \
-		apps-evolution-mail-prompts-checkdefault-${EVO_VERSION}.schemas \
-		apps_evolution_shell-${EVO_VERSION}.schemas \
-		evolution-mail-${EVO_VERSION}.schemas
+GCONF_SCHEMAS=	apps-evolution-mail-notification.schemas \
+		apps-evolution-mail-prompts-checkdefault.schemas \
+		apps_evolution_addressbook.schemas \
+		apps_evolution_calendar.schemas \
+		apps_evolution_shell.schemas \
+		apps-evolution-attachment-reminder.schemas \
+		evolution-mail.schemas
 
-EVO_VERSION=	2.10
+EVO_VERSION=	2.12
 PLIST_SUB=	VERSION=${EVO_VERSION} \
-		PORTVERSION=2.10
+		PORTVERSION=2.12
 
 OPTIONS=	PILOT "Enable Palm Pilot sync support" off \
 		LDAP "Enable LDAP support" on \
@@ -92,8 +94,7 @@ PLIST_SUB+=	DBUS=""
 PLIST_SUB+=	DBUS="@comment "
 .endif
 
-.if !defined(NO_KERBEROS) && \
-	exists(/usr/lib/libkrb5.so)
+.if !defined(NO_KERBEROS) && exists(/usr/lib/libkrb5.so)
 CONFIGURE_ARGS+=	--with-krb5=/usr
 .else
 LIB_DEPENDS+=		krb5:${PORTSDIR}/security/heimdal
@@ -107,13 +108,12 @@ CONFIGURE_ARGS+=	--with-krb5=${LOCALBASE}
 post-patch:
 	@${REINPLACE_CMD} -e '/^plugins_standard_always/s/audio-inline//' \
 	    	${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's|stdlib.n|stdlib.h|' \
+	    	${WRKSRC}/iconv-detect.c
 
 post-install: install-ldconfig-file
 	${MKDIR} ${PREFIX}/include/evolution-${EVO_VERSION}/composer
 	${INSTALL_DATA} ${WRKSRC}/composer/e-msg*.h ${PREFIX}/include/evolution-${EVO_VERSION}/composer
 	${INSTALL_DATA} ${WRKSRC}/composer/Editor.h ${PREFIX}/include/evolution-${EVO_VERSION}/composer
-	@${LN} -sf ${PREFIX}/bin/evolution-${EVO_VERSION} \
-		${PREFIX}/bin/evolution
-	-@update-desktop-database
 
 .include <bsd.port.post.mk>
diff --git a/mail/evolution/distinfo b/mail/evolution/distinfo
index ca99f789451e..f158833739b1 100644
--- a/mail/evolution/distinfo
+++ b/mail/evolution/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/evolution-2.10.3.tar.bz2) = 09cc60b037849b3c9b34961eb7da217f
-SHA256 (gnome2/evolution-2.10.3.tar.bz2) = 8a26b982a6af83ffa72a33e8d9b890c278d28a86765098006c65060eb021a16f
-SIZE (gnome2/evolution-2.10.3.tar.bz2) = 26041499
+MD5 (gnome2/evolution-2.12.1.tar.bz2) = 392623efa9b79ede17ce90512f2c3c0a
+SHA256 (gnome2/evolution-2.12.1.tar.bz2) = 8d75c95a4419ecd0b46cddb7a7481fa4f23997f258084ed74f9f3fb9f7c36959
+SIZE (gnome2/evolution-2.12.1.tar.bz2) = 25905418
diff --git a/mail/evolution/files/patch-aa b/mail/evolution/files/patch-aa
index 9adc9c36e145..30b05efea0a9 100644
--- a/mail/evolution/files/patch-aa
+++ b/mail/evolution/files/patch-aa
@@ -1,6 +1,6 @@
---- configure.orig	Wed Apr 11 20:01:06 2007
-+++ configure	Thu Apr 12 01:10:01 2007
-@@ -24916,6 +24916,15 @@ case "$host" in
+--- configure.orig	Tue Jun 19 00:18:59 2007
++++ configure	Tue Jun 19 00:25:55 2007
+@@ -24959,6 +24959,15 @@ case "$host" in
      SOFTOKN3_LIB=''
      HAL_REQUIREMENT=''
      ;;
@@ -16,7 +16,7 @@
  *)  os_win32=no
      NO_UNDEFINED=''
      SOEXT='.so'
-@@ -26594,6 +26604,7 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -26433,6 +26442,7 @@ cat >>conftest.$ac_ext <<_ACEOF
  		#include <sys/socket.h>
  		#include <netinet/in.h>
  		#include <netdb.h>
@@ -24,16 +24,16 @@
  
  		#define BUFSIZE (sizeof(struct hostent)+10)
  
-@@ -30819,7 +30830,7 @@ if test "x${with_krb5}" != "xno"; then
+@@ -30930,7 +30940,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
-@@ -37148,7 +37159,7 @@ componentdir="$privlibdir/components"
+@@ -37393,7 +37403,7 @@ componentdir="$privlibdir/components"
  idldir='${datadir}'/idl/evolution-$BASE_VERSION
  
  
diff --git a/mail/evolution/files/patch-fix-maildir b/mail/evolution/files/patch-fix-maildir
deleted file mode 100644
index 6bf3fe7468cd..000000000000
--- a/mail/evolution/files/patch-fix-maildir
+++ /dev/null
@@ -1,111 +0,0 @@
-Index: mail/ChangeLog
-===================================================================
---- mail/ChangeLog	(revision 33704)
-+++ mail/ChangeLog	(working copy)
-@@ -1,3 +1,11 @@
-+2007-06-18  Milan Crha  <mcrha@redhat.com>
-+
-+	** Fix for bug #352346
-+
-+	* em-migrate.c (em_update_accounts_2_11), (em_migrate):
-+	Added function to change "spool" to "spooldir" for those
-+	spools which points on directories.
-+
- 2007-06-18  Srinivasa Ragavan  <sragavan@novell.com>
- 	
-         ** Fix for bug #448223 from Gilles Dartiguelongue
-Index: mail/mail-config.glade
-===================================================================
---- mail/mail-config.glade	(revision 33704)
-+++ mail/mail-config.glade	(working copy)
-@@ -1354,7 +1354,6 @@
- 				  <property name="right_attach">2</property>
- 				  <property name="top_attach">2</property>
- 				  <property name="bottom_attach">3</property>
--				  <property name="x_options">fill</property>
- 				  <property name="y_options"></property>
- 				</packing>
- 			      </child>
-Index: mail/em-account-editor.c
-===================================================================
---- mail/em-account-editor.c	(revision 33704)
-+++ mail/em-account-editor.c	(working copy)
-@@ -1665,9 +1665,19 @@
- 	}
- 	if (url->user)
- 		gtk_entry_set_text(service->username, url->user);
--	if (service->pathentry && url->path)
--		gtk_file_chooser_set_filename (GTK_FILE_CHOOSER (service->pathentry), url->path);
-+	if (service->pathentry) {
-+		GtkFileChooserAction action = GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER;
- 
-+		if (service->provider && (service->provider->url_flags & CAMEL_URL_NEED_PATH_DIR) == 0)
-+			action = GTK_FILE_CHOOSER_ACTION_OPEN;
-+
-+		if (action != gtk_file_chooser_get_action (GTK_FILE_CHOOSER (service->pathentry)))
-+			gtk_file_chooser_set_action (GTK_FILE_CHOOSER (service->pathentry), action);
-+
-+		if (url->path)
-+			gtk_file_chooser_set_filename (GTK_FILE_CHOOSER (service->pathentry), url->path);
-+	}
-+
- 	tmp = camel_url_get_param(url, "use_ssl");
- 	if (tmp == NULL)
- 		tmp = "never";
-Index: mail/em-migrate.c
-===================================================================
---- mail/em-migrate.c	(revision 33704)
-+++ mail/em-migrate.c	(working copy)
-@@ -2639,6 +2639,41 @@
- 	return 0;
- }
- 
-+static void
-+em_update_accounts_2_11 (void)
-+{
-+	EAccountList *accounts;
-+	EIterator *iter;
-+	gboolean changed = FALSE;
-+
-+	if (!(accounts = mail_config_get_accounts ()))
-+		return;
-+
-+	iter = e_list_get_iterator ((EList *) accounts);
-+	while (e_iterator_is_valid (iter)) {
-+		EAccount *account = (EAccount *) e_iterator_get (iter);
-+
-+		if (g_str_has_prefix (account->source->url, "spool://")) {
-+			struct stat st;
-+
-+			if (stat(account->source->url + 8, &st) != -1 && S_ISDIR(st.st_mode)) {
-+				char *str = g_strdup_printf ("spooldir://%s", account->source->url + 8);
-+
-+				g_free (account->source->url);
-+				account->source->url = str;
-+				changed = TRUE;
-+			}
-+		}
-+
-+		e_iterator_next (iter);
-+	}
-+
-+	g_object_unref (iter);
-+
-+	if (changed)
-+		mail_config_save_accounts ();
-+}
-+
- #endif
- 
- static int
-@@ -2777,6 +2812,10 @@
- 		
- 		g_free (path);
- 	}
-+
-+	if (major < 2 || (major == 2 && minor <= 11)) {
-+		em_update_accounts_2_11 ();
-+	}
- #endif	/* !G_OS_WIN32 */
- 	return 0;
- }
diff --git a/mail/evolution/files/patch-mail_em-utils.h b/mail/evolution/files/patch-mail_em-utils.h
new file mode 100644
index 000000000000..b3e7b9ffbe25
--- /dev/null
+++ b/mail/evolution/files/patch-mail_em-utils.h
@@ -0,0 +1,10 @@
+--- mail/em-utils.h.orig	Tue Aug  3 16:59:46 2004
++++ mail/em-utils.h	Tue Aug  3 17:00:04 2004
+@@ -23,6 +23,7 @@
+ #ifndef __EM_UTILS_H__
+ #define __EM_UTILS_H__
+ 
++#include <sys/types.h>
+ #include <glib.h>
+ 
+ #ifdef __cplusplus
diff --git a/mail/evolution/pkg-plist b/mail/evolution/pkg-plist
index 5d64d5777b4b..621b2f04861c 100644
--- a/mail/evolution/pkg-plist
+++ b/mail/evolution/pkg-plist
@@ -1,5 +1,4 @@
 bin/evolution
-bin/evolution-%%VERSION%%
 include/evolution-%%VERSION%%/addressbook/gui/widgets/eab-config.h
 include/evolution-%%VERSION%%/addressbook/gui/widgets/eab-menu.h
 include/evolution-%%VERSION%%/addressbook/gui/widgets/eab-popup.h
@@ -23,7 +22,6 @@ include/evolution-%%VERSION%%/e-util/e-error.h
 include/evolution-%%VERSION%%/e-util/e-event.h
 include/evolution-%%VERSION%%/e-util/e-folder-map.h
 include/evolution-%%VERSION%%/e-util/e-fsutils.h
-include/evolution-%%VERSION%%/e-util/e-gtk-utils.h
 include/evolution-%%VERSION%%/e-util/e-gui-utils.h
 include/evolution-%%VERSION%%/e-util/e-html-utils.h
 include/evolution-%%VERSION%%/e-util/e-icon-factory.h
@@ -103,7 +101,6 @@ include/evolution-%%VERSION%%/misc/e-cell-date-edit.h
 include/evolution-%%VERSION%%/misc/e-cell-percent.h
 include/evolution-%%VERSION%%/misc/e-cell-renderer-combo.h
 include/evolution-%%VERSION%%/misc/e-charset-picker.h
-include/evolution-%%VERSION%%/misc/e-clipped-label.h
 include/evolution-%%VERSION%%/misc/e-colors.h
 include/evolution-%%VERSION%%/misc/e-combo-button.h
 include/evolution-%%VERSION%%/misc/e-combo-cell-editable.h
@@ -129,12 +126,12 @@ include/evolution-%%VERSION%%/misc/e-selection-model-array.h
 include/evolution-%%VERSION%%/misc/e-selection-model-simple.h
 include/evolution-%%VERSION%%/misc/e-selection-model.h
 include/evolution-%%VERSION%%/misc/e-send-options.h
+include/evolution-%%VERSION%%/misc/e-spinner.c
+include/evolution-%%VERSION%%/misc/e-spinner.h
 include/evolution-%%VERSION%%/misc/e-task-bar.h
 include/evolution-%%VERSION%%/misc/e-task-widget.h
 include/evolution-%%VERSION%%/misc/e-unicode.h
 include/evolution-%%VERSION%%/misc/e-url-entry.h
-include/evolution-%%VERSION%%/misc/gal-combo-box.h
-include/evolution-%%VERSION%%/misc/gal-combo-text.h
 include/evolution-%%VERSION%%/shell/Evolution.h
 include/evolution-%%VERSION%%/shell/e-component-view.h
 include/evolution-%%VERSION%%/shell/e-shell-utils.h
@@ -298,10 +295,13 @@ lib/evolution/%%VERSION%%/libfilter.so.0
 lib/evolution/%%VERSION%%/libmenus.la
 lib/evolution/%%VERSION%%/libmenus.so
 lib/evolution/%%VERSION%%/libmenus.so.0
+lib/evolution/%%VERSION%%/plugins/attachment-reminder.glade
 lib/evolution/%%VERSION%%/plugins/libmail-account-disable.la
 lib/evolution/%%VERSION%%/plugins/libmail-account-disable.so
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-addressbook-file.la
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-addressbook-file.so
+lib/evolution/%%VERSION%%/plugins/liborg-gnome-backup-restore.la
+lib/evolution/%%VERSION%%/plugins/liborg-gnome-backup-restore.so
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-calendar-file.la
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-calendar-file.so
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-calendar-http.la
@@ -314,6 +314,8 @@ lib/evolution/%%VERSION%%/plugins/liborg-gnome-default-mailer.la
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-default-mailer.so
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-default-source.la
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-default-source.so
+lib/evolution/%%VERSION%%/plugins/liborg-gnome-evolution-attachment-reminder.la
+lib/evolution/%%VERSION%%/plugins/liborg-gnome-evolution-attachment-reminder.so
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-evolution-bbdb.la
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-evolution-bbdb.so
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-evolution-caldav.la
@@ -326,6 +328,8 @@ lib/evolution/%%VERSION%%/plugins/liborg-gnome-evolution-startup-wizard.la
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-evolution-startup-wizard.so
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-exchange-operations.la
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-exchange-operations.so
+lib/evolution/%%VERSION%%/plugins/liborg-gnome-face.la
+lib/evolution/%%VERSION%%/plugins/liborg-gnome-face.so
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-groupwise-features.la
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-groupwise-features.so
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-gw-account-setup.la
@@ -334,6 +338,8 @@ lib/evolution/%%VERSION%%/plugins/liborg-gnome-imap-features.la
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-imap-features.so
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-itip-formatter.la
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-itip-formatter.so
+lib/evolution/%%VERSION%%/plugins/liborg-gnome-mail-notification.la
+lib/evolution/%%VERSION%%/plugins/liborg-gnome-mail-notification.so
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-mail-to-task.la
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-mail-to-task.so
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-mailing-list-actions.la
@@ -361,6 +367,8 @@ lib/evolution/%%VERSION%%/plugins/liborg-gnome-select-one-source.so
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-subject-thread.la
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-subject-thread.so
 lib/evolution/%%VERSION%%/plugins/org-gnome-addressbook-file.eplug
+lib/evolution/%%VERSION%%/plugins/org-gnome-backup-restore.eplug
+lib/evolution/%%VERSION%%/plugins/org-gnome-backup-restore.xml
 lib/evolution/%%VERSION%%/plugins/org-gnome-calendar-file.eplug
 lib/evolution/%%VERSION%%/plugins/org-gnome-calendar-http.eplug
 lib/evolution/%%VERSION%%/plugins/org-gnome-calendar-weather.eplug
@@ -368,6 +376,7 @@ lib/evolution/%%VERSION%%/plugins/org-gnome-compose-send-options.xml
 lib/evolution/%%VERSION%%/plugins/org-gnome-copy-tool.eplug
 lib/evolution/%%VERSION%%/plugins/org-gnome-default-mailer.eplug
 lib/evolution/%%VERSION%%/plugins/org-gnome-default-source.eplug
+lib/evolution/%%VERSION%%/plugins/org-gnome-evolution-attachment-reminder.eplug
 lib/evolution/%%VERSION%%/plugins/org-gnome-evolution-bbdb.eplug
 lib/evolution/%%VERSION%%/plugins/org-gnome-evolution-caldav.eplug
 lib/evolution/%%VERSION%%/plugins/org-gnome-evolution-hula-account-setup.eplug
@@ -377,6 +386,8 @@ lib/evolution/%%VERSION%%/plugins/org-gnome-exchange-ab-subscription.xml
 lib/evolution/%%VERSION%%/plugins/org-gnome-exchange-cal-subscription.xml
 lib/evolution/%%VERSION%%/plugins/org-gnome-exchange-operations.eplug
 lib/evolution/%%VERSION%%/plugins/org-gnome-exchange-tasks-subscription.xml
+lib/evolution/%%VERSION%%/plugins/org-gnome-face-ui.xml
+lib/evolution/%%VERSION%%/plugins/org-gnome-face.eplug
 lib/evolution/%%VERSION%%/plugins/org-gnome-folder-permissions.xml
 lib/evolution/%%VERSION%%/plugins/org-gnome-folder-subscription.xml
 lib/evolution/%%VERSION%%/plugins/org-gnome-groupwise-features.eplug
@@ -384,6 +395,7 @@ lib/evolution/%%VERSION%%/plugins/org-gnome-gw-account-setup.eplug
 lib/evolution/%%VERSION%%/plugins/org-gnome-imap-features.eplug
 lib/evolution/%%VERSION%%/plugins/org-gnome-itip-formatter.eplug
 lib/evolution/%%VERSION%%/plugins/org-gnome-mail-account-disable.eplug
+lib/evolution/%%VERSION%%/plugins/org-gnome-mail-notification.eplug
 lib/evolution/%%VERSION%%/plugins/org-gnome-mail-to-task.eplug
 lib/evolution/%%VERSION%%/plugins/org-gnome-mail-to-task.xml
 lib/evolution/%%VERSION%%/plugins/org-gnome-mailing-list-actions.eplug
@@ -402,176 +414,188 @@ lib/evolution/%%VERSION%%/plugins/org-gnome-sa-junk-plugin.eplug
 lib/evolution/%%VERSION%%/plugins/org-gnome-save-calendar.eplug
 lib/evolution/%%VERSION%%/plugins/org-gnome-select-one-source.eplug
 lib/evolution/%%VERSION%%/plugins/org-gnome-subject-thread.eplug
-lib/evolution/%%VERSION%%/plugins/publish-calendar.glade
-libdata/bonobo/servers/GNOME_Evolution_Addressbook_%%VERSION%%.server
-libdata/bonobo/servers/GNOME_Evolution_Calendar_%%VERSION%%.server
-libdata/bonobo/servers/GNOME_Evolution_Calendar_AlarmNotify_%%VERSION%%.server
-libdata/bonobo/servers/GNOME_Evolution_Mail_%%VERSION%%.server
-libdata/bonobo/servers/GNOME_Evolution_Shell_%%VERSION%%.server
-libdata/pkgconfig/evolution-plugin-%%VERSION%%.pc
-libdata/pkgconfig/evolution-shell-%%VERSION%%.pc
+libdata/bonobo/servers/GNOME_Evolution_Addressbook.server
+libdata/bonobo/servers/GNOME_Evolution_Calendar.server
+libdata/bonobo/servers/GNOME_Evolution_Calendar_AlarmNotify.server
+libdata/bonobo/servers/GNOME_Evolution_Mail.server
+libdata/bonobo/servers/GNOME_Evolution_Shell.server
+libdata/pkgconfig/evolution-plugin.pc
+libdata/pkgconfig/evolution-shell.pc
 libexec/evolution/%%VERSION%%/csv2vcard
 libexec/evolution/%%VERSION%%/evolution-addressbook-clean
 libexec/evolution/%%VERSION%%/evolution-addressbook-export
 libexec/evolution/%%VERSION%%/evolution-alarm-notify
+libexec/evolution/%%VERSION%%/evolution-backup
 libexec/evolution/%%VERSION%%/killev
-share/gnome/applications/evolution.desktop
-share/gnome/evolution/%%VERSION%%/addresstypes.xml
-share/gnome/evolution/%%VERSION%%/default/C/mail/local/Inbox
-share/gnome/evolution/%%VERSION%%/default/de/mail/local/Inbox
-share/gnome/evolution/%%VERSION%%/default/es/mail/local/Inbox
-share/gnome/evolution/%%VERSION%%/default/fi/mail/local/Inbox
-share/gnome/evolution/%%VERSION%%/default/fr/mail/local/Inbox
-share/gnome/evolution/%%VERSION%%/default/ja/mail/local/Inbox
-share/gnome/evolution/%%VERSION%%/default/lt/mail/local/Inbox
-share/gnome/evolution/%%VERSION%%/default/mk/mail/local/Inbox
-share/gnome/evolution/%%VERSION%%/default/nl/mail/local/Inbox
-share/gnome/evolution/%%VERSION%%/default/pt/mail/local/Inbox
-share/gnome/evolution/%%VERSION%%/default/zh_CN/mail/local/Inbox
-share/gnome/evolution/%%VERSION%%/ecps/medbook.ecps
-share/gnome/evolution/%%VERSION%%/ecps/phonelist.ecps
-share/gnome/evolution/%%VERSION%%/ecps/smallbook.ecps
-share/gnome/evolution/%%VERSION%%/errors/addressbook.error
-share/gnome/evolution/%%VERSION%%/errors/calendar.error
-share/gnome/evolution/%%VERSION%%/errors/e-system.error
-share/gnome/evolution/%%VERSION%%/errors/filter.error
-share/gnome/evolution/%%VERSION%%/errors/mail-composer.error
-share/gnome/evolution/%%VERSION%%/errors/mail.error
-share/gnome/evolution/%%VERSION%%/errors/org-gnome-default-mailer.error
-share/gnome/evolution/%%VERSION%%/errors/org-gnome-exchange-operations.error
-share/gnome/evolution/%%VERSION%%/errors/org-gnome-itip-formatter.error
-share/gnome/evolution/%%VERSION%%/errors/org-gnome-mail-retract-errors.xml
-share/gnome/evolution/%%VERSION%%/errors/org-gnome-mailing-list-actions.error
-share/gnome/evolution/%%VERSION%%/errors/org-gnome-proxy-errors.xml
-share/gnome/evolution/%%VERSION%%/errors/org-gnome-proxy-login-errors.xml
-share/gnome/evolution/%%VERSION%%/errors/org-gnome-shared-folder.errors.xml
-share/gnome/evolution/%%VERSION%%/errors/shell.error
-share/gnome/evolution/%%VERSION%%/etspec/e-addressbook-view.etspec
-share/gnome/evolution/%%VERSION%%/etspec/e-cal-list-view.etspec
-share/gnome/evolution/%%VERSION%%/etspec/e-calendar-table.etspec
-share/gnome/evolution/%%VERSION%%/etspec/e-contact-list-editor.etspec
-share/gnome/evolution/%%VERSION%%/etspec/e-meeting-time-sel.etspec
-share/gnome/evolution/%%VERSION%%/etspec/e-memo-table.etspec
-share/gnome/evolution/%%VERSION%%/etspec/message-list.etspec
-share/gnome/evolution/%%VERSION%%/filtertypes.xml
-share/gnome/evolution/%%VERSION%%/glade/alarm-dialog.glade
-share/gnome/evolution/%%VERSION%%/glade/alarm-list-dialog.glade
-share/gnome/evolution/%%VERSION%%/glade/alarm-notify.glade
-share/gnome/evolution/%%VERSION%%/glade/cal-prefs-dialog.glade
-share/gnome/evolution/%%VERSION%%/glade/contact-editor.glade
-share/gnome/evolution/%%VERSION%%/glade/contact-list-editor.glade
-share/gnome/evolution/%%VERSION%%/glade/e-active-connection-dialog.glade
-share/gnome/evolution/%%VERSION%%/glade/e-attachment.glade
-share/gnome/evolution/%%VERSION%%/glade/e-contact-print.glade
-share/gnome/evolution/%%VERSION%%/glade/e-delegate-dialog.glade
-share/gnome/evolution/%%VERSION%%/glade/e-foreign-folder-dialog.glade
-share/gnome/evolution/%%VERSION%%/glade/e-itip-control.glade
-share/gnome/evolution/%%VERSION%%/glade/e-send-options.glade
-share/gnome/evolution/%%VERSION%%/glade/e-table-config-no-group.glade
-share/gnome/evolution/%%VERSION%%/glade/e-table-config.glade
-share/gnome/evolution/%%VERSION%%/glade/e-table-field-chooser.glade
-share/gnome/evolution/%%VERSION%%/glade/e-timezone-dialog.glade
-share/gnome/evolution/%%VERSION%%/glade/eab-contact-commit-duplicate-detected.glade
-share/gnome/evolution/%%VERSION%%/glade/eab-contact-duplicate-detected.glade
-share/gnome/evolution/%%VERSION%%/glade/event-page.glade
-share/gnome/evolution/%%VERSION%%/glade/exchange-change-password.glade
-share/gnome/evolution/%%VERSION%%/glade/exchange-delegates.glade
-share/gnome/evolution/%%VERSION%%/glade/exchange-folder-tree.glade
-share/gnome/evolution/%%VERSION%%/glade/exchange-oof.glade
-share/gnome/evolution/%%VERSION%%/glade/exchange-passwd-expiry.glade
-share/gnome/evolution/%%VERSION%%/glade/exchange-permissions-dialog.glade
-share/gnome/evolution/%%VERSION%%/glade/exchange-send-options.glade
-share/gnome/evolution/%%VERSION%%/glade/filter.glade
-share/gnome/evolution/%%VERSION%%/glade/fulladdr.glade
-share/gnome/evolution/%%VERSION%%/glade/fullname.glade
-share/gnome/evolution/%%VERSION%%/glade/gal-categories.glade
-share/gnome/evolution/%%VERSION%%/glade/gal-define-views.glade
-share/gnome/evolution/%%VERSION%%/glade/gal-view-instance-save-as-dialog.glade
-share/gnome/evolution/%%VERSION%%/glade/gal-view-new-dialog.glade
-share/gnome/evolution/%%VERSION%%/glade/goto-dialog.glade
-share/gnome/evolution/%%VERSION%%/glade/im.glade
-share/gnome/evolution/%%VERSION%%/glade/imap-headers.glade
-share/gnome/evolution/%%VERSION%%/glade/import.glade
-share/gnome/evolution/%%VERSION%%/glade/junk-settings.glade
-share/gnome/evolution/%%VERSION%%/glade/ldap-config.glade
-share/gnome/evolution/%%VERSION%%/glade/mail-config.glade
-share/gnome/evolution/%%VERSION%%/glade/mail-dialogs.glade
-share/gnome/evolution/%%VERSION%%/glade/meeting-page.glade
-share/gnome/evolution/%%VERSION%%/glade/memo-page.glade
-share/gnome/evolution/%%VERSION%%/glade/properties.glade
-share/gnome/evolution/%%VERSION%%/glade/proxy-add-dialog.glade
-share/gnome/evolution/%%VERSION%%/glade/proxy-listing.glade
-share/gnome/evolution/%%VERSION%%/glade/proxy-login-dialog.glade
-share/gnome/evolution/%%VERSION%%/glade/recurrence-page.glade
-share/gnome/evolution/%%VERSION%%/glade/schedule-page.glade
-share/gnome/evolution/%%VERSION%%/glade/smime-ui.glade
-share/gnome/evolution/%%VERSION%%/glade/task-details-page.glade
-share/gnome/evolution/%%VERSION%%/glade/task-page.glade
-share/gnome/evolution/%%VERSION%%/help/quickref/C/quickref.pdf
-share/gnome/evolution/%%VERSION%%/help/quickref/de/quickref.pdf
-share/gnome/evolution/%%VERSION%%/help/quickref/es/quickref.pdf
-share/gnome/evolution/%%VERSION%%/help/quickref/sv/quickref.pdf
-share/gnome/evolution/%%VERSION%%/images/evolution-contacts-mini.png
-share/gnome/evolution/%%VERSION%%/images/minus.png
-share/gnome/evolution/%%VERSION%%/images/offline.png
-share/gnome/evolution/%%VERSION%%/images/online.png
-share/gnome/evolution/%%VERSION%%/images/plus.png
-share/gnome/evolution/%%VERSION%%/images/query-free-busy.png
-share/gnome/evolution/%%VERSION%%/images/world_map-960.png
-share/gnome/evolution/%%VERSION%%/searchtypes.xml
-share/gnome/evolution/%%VERSION%%/ui/evolution-addressbook.xml
-share/gnome/evolution/%%VERSION%%/ui/evolution-calendar.xml
-share/gnome/evolution/%%VERSION%%/ui/evolution-composer-entries.xml
-share/gnome/evolution/%%VERSION%%/ui/evolution-editor.xml
-share/gnome/evolution/%%VERSION%%/ui/evolution-event-editor.xml
-share/gnome/evolution/%%VERSION%%/ui/evolution-mail-global.xml
-share/gnome/evolution/%%VERSION%%/ui/evolution-mail-list.xml
-share/gnome/evolution/%%VERSION%%/ui/evolution-mail-message.xml
-share/gnome/evolution/%%VERSION%%/ui/evolution-mail-messagedisplay.xml
-share/gnome/evolution/%%VERSION%%/ui/evolution-memo-editor.xml
-share/gnome/evolution/%%VERSION%%/ui/evolution-memos.xml
-share/gnome/evolution/%%VERSION%%/ui/evolution-message-composer.xml
-share/gnome/evolution/%%VERSION%%/ui/evolution-signature-editor.xml
-share/gnome/evolution/%%VERSION%%/ui/evolution-subscribe.xml
-share/gnome/evolution/%%VERSION%%/ui/evolution-task-editor.xml
-share/gnome/evolution/%%VERSION%%/ui/evolution-tasks.xml
-share/gnome/evolution/%%VERSION%%/ui/evolution.xml
-share/gnome/evolution/%%VERSION%%/vfoldertypes.xml
-share/gnome/evolution/%%VERSION%%/views/addressbook/Address_Cards.galview
-share/gnome/evolution/%%VERSION%%/views/addressbook/By_Company.galview
-share/gnome/evolution/%%VERSION%%/views/addressbook/Phone_List.galview
-share/gnome/evolution/%%VERSION%%/views/addressbook/galview.xml
-share/gnome/evolution/%%VERSION%%/views/calendar/List_View.galview
-share/gnome/evolution/%%VERSION%%/views/calendar/galview.xml
-share/gnome/evolution/%%VERSION%%/views/mail/As_Sent_Folder.galview
-share/gnome/evolution/%%VERSION%%/views/mail/By_Follow_Up_Flag.galview
-share/gnome/evolution/%%VERSION%%/views/mail/By_Sender.galview
-share/gnome/evolution/%%VERSION%%/views/mail/By_Status.galview
-share/gnome/evolution/%%VERSION%%/views/mail/By_Subject.galview
-share/gnome/evolution/%%VERSION%%/views/mail/Messages.galview
-share/gnome/evolution/%%VERSION%%/views/mail/Wide_View_Normal.galview
-share/gnome/evolution/%%VERSION%%/views/mail/Wide_View_Sent.galview
-share/gnome/evolution/%%VERSION%%/views/mail/galview.xml
-share/gnome/evolution/%%VERSION%%/views/memos/Memos.galview
-share/gnome/evolution/%%VERSION%%/views/memos/galview.xml
-share/gnome/evolution/%%VERSION%%/views/tasks/Tasks.galview
-share/gnome/evolution/%%VERSION%%/views/tasks/With_DueDate.galview
-share/gnome/evolution/%%VERSION%%/views/tasks/With_Status.galview
-share/gnome/evolution/%%VERSION%%/views/tasks/galview.xml
-share/gnome/evolution/%%VERSION%%/weather/category_weather_cloudy_16.png
-share/gnome/evolution/%%VERSION%%/weather/category_weather_fog_16.png
-share/gnome/evolution/%%VERSION%%/weather/category_weather_partly_cloudy_16.png
-share/gnome/evolution/%%VERSION%%/weather/category_weather_rain_16.png
-share/gnome/evolution/%%VERSION%%/weather/category_weather_snow_16.png
-share/gnome/evolution/%%VERSION%%/weather/category_weather_sun_16.png
-share/gnome/evolution/%%VERSION%%/weather/category_weather_tstorm_16.png
-%%PILOT:%%share/gnome/gnome-pilot/conduits/e-address-%%VERSION%%.conduit
-%%PILOT:%%share/gnome/gnome-pilot/conduits/e-calendar-%%VERSION%%.conduit
-%%PILOT:%%share/gnome/gnome-pilot/conduits/e-memo-%%VERSION%%.conduit
-%%PILOT:%%share/gnome/gnome-pilot/conduits/e-todo-%%VERSION%%.conduit
+share/applications/evolution.desktop
+%%DATADIR%%/%%VERSION%%/addresstypes.xml
+%%DATADIR%%/%%VERSION%%/caltypes.xml
+%%DATADIR%%/%%VERSION%%/default/C/mail/local/Inbox
+%%DATADIR%%/%%VERSION%%/default/de/mail/local/Inbox
+%%DATADIR%%/%%VERSION%%/default/es/mail/local/Inbox
+%%DATADIR%%/%%VERSION%%/default/fi/mail/local/Inbox
+%%DATADIR%%/%%VERSION%%/default/fr/mail/local/Inbox
+%%DATADIR%%/%%VERSION%%/default/ja/mail/local/Inbox
+%%DATADIR%%/%%VERSION%%/default/lt/mail/local/Inbox
+%%DATADIR%%/%%VERSION%%/default/mk/mail/local/Inbox
+%%DATADIR%%/%%VERSION%%/default/nl/mail/local/Inbox
+%%DATADIR%%/%%VERSION%%/default/pl/mail/local/Inbox
+%%DATADIR%%/%%VERSION%%/default/pt/mail/local/Inbox
+%%DATADIR%%/%%VERSION%%/default/sv/mail/local/Inbox
+%%DATADIR%%/%%VERSION%%/default/zh_CN/mail/local/Inbox
+%%DATADIR%%/%%VERSION%%/ecps/medbook.ecps
+%%DATADIR%%/%%VERSION%%/ecps/phonelist.ecps
+%%DATADIR%%/%%VERSION%%/ecps/smallbook.ecps
+%%DATADIR%%/%%VERSION%%/errors/addressbook.error
+%%DATADIR%%/%%VERSION%%/errors/calendar.error
+%%DATADIR%%/%%VERSION%%/errors/e-system.error
+%%DATADIR%%/%%VERSION%%/errors/filter.error
+%%DATADIR%%/%%VERSION%%/errors/mail-composer.error
+%%DATADIR%%/%%VERSION%%/errors/mail.error
+%%DATADIR%%/%%VERSION%%/errors/org-gnome-attachment-reminder.error
+%%DATADIR%%/%%VERSION%%/errors/org-gnome-backup-restore.error
+%%DATADIR%%/%%VERSION%%/errors/org-gnome-default-mailer.error
+%%DATADIR%%/%%VERSION%%/errors/org-gnome-exchange-operations.error
+%%DATADIR%%/%%VERSION%%/errors/org-gnome-face.errors.xml
+%%DATADIR%%/%%VERSION%%/errors/org-gnome-itip-formatter.error
+%%DATADIR%%/%%VERSION%%/errors/org-gnome-mail-retract-errors.xml
+%%DATADIR%%/%%VERSION%%/errors/org-gnome-mailing-list-actions.error
+%%DATADIR%%/%%VERSION%%/errors/org-gnome-proxy-errors.xml
+%%DATADIR%%/%%VERSION%%/errors/org-gnome-proxy-login-errors.xml
+%%DATADIR%%/%%VERSION%%/errors/org-gnome-shared-folder.errors.xml
+%%DATADIR%%/%%VERSION%%/errors/shell.error
+%%DATADIR%%/%%VERSION%%/etspec/e-addressbook-view.etspec
+%%DATADIR%%/%%VERSION%%/etspec/e-cal-list-view.etspec
+%%DATADIR%%/%%VERSION%%/etspec/e-calendar-table.etspec
+%%DATADIR%%/%%VERSION%%/etspec/e-contact-list-editor.etspec
+%%DATADIR%%/%%VERSION%%/etspec/e-meeting-time-sel.etspec
+%%DATADIR%%/%%VERSION%%/etspec/e-memo-table.etspec
+%%DATADIR%%/%%VERSION%%/etspec/message-list.etspec
+%%DATADIR%%/%%VERSION%%/filtertypes.xml
+%%DATADIR%%/%%VERSION%%/glade/alarm-dialog.glade
+%%DATADIR%%/%%VERSION%%/glade/alarm-list-dialog.glade
+%%DATADIR%%/%%VERSION%%/glade/alarm-notify.glade
+%%DATADIR%%/%%VERSION%%/glade/cal-prefs-dialog.glade
+%%DATADIR%%/%%VERSION%%/glade/contact-editor.glade
+%%DATADIR%%/%%VERSION%%/glade/contact-list-editor.glade
+%%DATADIR%%/%%VERSION%%/glade/e-active-connection-dialog.glade
+%%DATADIR%%/%%VERSION%%/glade/e-attachment.glade
+%%DATADIR%%/%%VERSION%%/glade/e-contact-print.glade
+%%DATADIR%%/%%VERSION%%/glade/e-delegate-dialog.glade
+%%DATADIR%%/%%VERSION%%/glade/e-foreign-folder-dialog.glade
+%%DATADIR%%/%%VERSION%%/glade/e-itip-control.glade
+%%DATADIR%%/%%VERSION%%/glade/e-send-options.glade
+%%DATADIR%%/%%VERSION%%/glade/e-table-config-no-group.glade
+%%DATADIR%%/%%VERSION%%/glade/e-table-config.glade
+%%DATADIR%%/%%VERSION%%/glade/e-table-field-chooser.glade
+%%DATADIR%%/%%VERSION%%/glade/e-timezone-dialog.glade
+%%DATADIR%%/%%VERSION%%/glade/eab-contact-commit-duplicate-detected.glade
+%%DATADIR%%/%%VERSION%%/glade/eab-contact-duplicate-detected.glade
+%%DATADIR%%/%%VERSION%%/glade/event-page.glade
+%%DATADIR%%/%%VERSION%%/glade/exchange-change-password.glade
+%%DATADIR%%/%%VERSION%%/glade/exchange-delegates.glade
+%%DATADIR%%/%%VERSION%%/glade/exchange-folder-tree.glade
+%%DATADIR%%/%%VERSION%%/glade/exchange-oof.glade
+%%DATADIR%%/%%VERSION%%/glade/exchange-passwd-expiry.glade
+%%DATADIR%%/%%VERSION%%/glade/exchange-permissions-dialog.glade
+%%DATADIR%%/%%VERSION%%/glade/exchange-send-options.glade
+%%DATADIR%%/%%VERSION%%/glade/filter.glade
+%%DATADIR%%/%%VERSION%%/glade/fulladdr.glade
+%%DATADIR%%/%%VERSION%%/glade/fullname.glade
+%%DATADIR%%/%%VERSION%%/glade/gal-categories.glade
+%%DATADIR%%/%%VERSION%%/glade/gal-define-views.glade
+%%DATADIR%%/%%VERSION%%/glade/gal-view-instance-save-as-dialog.glade
+%%DATADIR%%/%%VERSION%%/glade/gal-view-new-dialog.glade
+%%DATADIR%%/%%VERSION%%/glade/goto-dialog.glade
+%%DATADIR%%/%%VERSION%%/glade/im.glade
+%%DATADIR%%/%%VERSION%%/glade/imap-headers.glade
+%%DATADIR%%/%%VERSION%%/glade/import.glade
+%%DATADIR%%/%%VERSION%%/glade/junk-settings.glade
+%%DATADIR%%/%%VERSION%%/glade/ldap-config.glade
+%%DATADIR%%/%%VERSION%%/glade/mail-config.glade
+%%DATADIR%%/%%VERSION%%/glade/mail-dialogs.glade
+%%DATADIR%%/%%VERSION%%/glade/meeting-page.glade
+%%DATADIR%%/%%VERSION%%/glade/memo-page.glade
+%%DATADIR%%/%%VERSION%%/glade/properties.glade
+%%DATADIR%%/%%VERSION%%/glade/proxy-add-dialog.glade
+%%DATADIR%%/%%VERSION%%/glade/proxy-listing.glade
+%%DATADIR%%/%%VERSION%%/glade/proxy-login-dialog.glade
+%%DATADIR%%/%%VERSION%%/glade/publish-calendar.glade
+%%DATADIR%%/%%VERSION%%/glade/recurrence-page.glade
+%%DATADIR%%/%%VERSION%%/glade/schedule-page.glade
+%%DATADIR%%/%%VERSION%%/glade/smime-ui.glade
+%%DATADIR%%/%%VERSION%%/glade/task-details-page.glade
+%%DATADIR%%/%%VERSION%%/glade/task-page.glade
+%%DATADIR%%/%%VERSION%%/help/quickref/C/quickref.pdf
+%%DATADIR%%/%%VERSION%%/help/quickref/de/quickref.pdf
+%%DATADIR%%/%%VERSION%%/help/quickref/es/quickref.pdf
+%%DATADIR%%/%%VERSION%%/help/quickref/fr/quickref.pdf
+%%DATADIR%%/%%VERSION%%/help/quickref/it/quickref.pdf
+%%DATADIR%%/%%VERSION%%/help/quickref/pl/quickref.pdf
+%%DATADIR%%/%%VERSION%%/help/quickref/pt/quickref.pdf
+%%DATADIR%%/%%VERSION%%/help/quickref/sq/quickref.pdf
+%%DATADIR%%/%%VERSION%%/help/quickref/sv/quickref.pdf
+%%DATADIR%%/%%VERSION%%/images/evolution-contacts-mini.png
+%%DATADIR%%/%%VERSION%%/images/minus.png
+%%DATADIR%%/%%VERSION%%/images/offline.png
+%%DATADIR%%/%%VERSION%%/images/online.png
+%%DATADIR%%/%%VERSION%%/images/plus.png
+%%DATADIR%%/%%VERSION%%/images/query-free-busy.png
+%%DATADIR%%/%%VERSION%%/images/world_map-960.png
+%%DATADIR%%/%%VERSION%%/memotypes.xml
+%%DATADIR%%/%%VERSION%%/searchtypes.xml
+%%DATADIR%%/%%VERSION%%/tasktypes.xml
+%%DATADIR%%/%%VERSION%%/ui/evolution-addressbook.xml
+%%DATADIR%%/%%VERSION%%/ui/evolution-calendar.xml
+%%DATADIR%%/%%VERSION%%/ui/evolution-composer-entries.xml
+%%DATADIR%%/%%VERSION%%/ui/evolution-editor.xml
+%%DATADIR%%/%%VERSION%%/ui/evolution-event-editor.xml
+%%DATADIR%%/%%VERSION%%/ui/evolution-mail-global.xml
+%%DATADIR%%/%%VERSION%%/ui/evolution-mail-list.xml
+%%DATADIR%%/%%VERSION%%/ui/evolution-mail-message.xml
+%%DATADIR%%/%%VERSION%%/ui/evolution-mail-messagedisplay.xml
+%%DATADIR%%/%%VERSION%%/ui/evolution-memo-editor.xml
+%%DATADIR%%/%%VERSION%%/ui/evolution-memos.xml
+%%DATADIR%%/%%VERSION%%/ui/evolution-message-composer.xml
+%%DATADIR%%/%%VERSION%%/ui/evolution-signature-editor.xml
+%%DATADIR%%/%%VERSION%%/ui/evolution-subscribe.xml
+%%DATADIR%%/%%VERSION%%/ui/evolution-task-editor.xml
+%%DATADIR%%/%%VERSION%%/ui/evolution-tasks.xml
+%%DATADIR%%/%%VERSION%%/ui/evolution.xml
+%%DATADIR%%/%%VERSION%%/vfoldertypes.xml
+%%DATADIR%%/%%VERSION%%/views/addressbook/Address_Cards.galview
+%%DATADIR%%/%%VERSION%%/views/addressbook/By_Company.galview
+%%DATADIR%%/%%VERSION%%/views/addressbook/Phone_List.galview
+%%DATADIR%%/%%VERSION%%/views/addressbook/galview.xml
+%%DATADIR%%/%%VERSION%%/views/calendar/List_View.galview
+%%DATADIR%%/%%VERSION%%/views/calendar/galview.xml
+%%DATADIR%%/%%VERSION%%/views/mail/As_Sent_Folder.galview
+%%DATADIR%%/%%VERSION%%/views/mail/By_Follow_Up_Flag.galview
+%%DATADIR%%/%%VERSION%%/views/mail/By_Sender.galview
+%%DATADIR%%/%%VERSION%%/views/mail/By_Status.galview
+%%DATADIR%%/%%VERSION%%/views/mail/By_Subject.galview
+%%DATADIR%%/%%VERSION%%/views/mail/Messages.galview
+%%DATADIR%%/%%VERSION%%/views/mail/Wide_View_Normal.galview
+%%DATADIR%%/%%VERSION%%/views/mail/Wide_View_Sent.galview
+%%DATADIR%%/%%VERSION%%/views/mail/galview.xml
+%%DATADIR%%/%%VERSION%%/views/memos/Memos.galview
+%%DATADIR%%/%%VERSION%%/views/memos/galview.xml
+%%DATADIR%%/%%VERSION%%/views/tasks/Tasks.galview
+%%DATADIR%%/%%VERSION%%/views/tasks/With_DueDate.galview
+%%DATADIR%%/%%VERSION%%/views/tasks/With_Status.galview
+%%DATADIR%%/%%VERSION%%/views/tasks/galview.xml
+%%DATADIR%%/%%VERSION%%/weather/category_weather_cloudy_16.png
+%%DATADIR%%/%%VERSION%%/weather/category_weather_fog_16.png
+%%DATADIR%%/%%VERSION%%/weather/category_weather_partly_cloudy_16.png
+%%DATADIR%%/%%VERSION%%/weather/category_weather_rain_16.png
+%%DATADIR%%/%%VERSION%%/weather/category_weather_snow_16.png
+%%DATADIR%%/%%VERSION%%/weather/category_weather_sun_16.png
+%%DATADIR%%/%%VERSION%%/weather/category_weather_tstorm_16.png
 share/gnome/help/evolution/C/evolution.xml
 share/gnome/help/evolution/C/figures/Screenshot-Free-Busy.png
 share/gnome/help/evolution/C/figures/account_editor_a.png
+share/gnome/help/evolution/C/figures/addrs_book_a.png
+share/gnome/help/evolution/C/figures/attach_reminder_a.png.png
 share/gnome/help/evolution/C/figures/calendar.png
 share/gnome/help/evolution/C/figures/categories_a.png
 share/gnome/help/evolution/C/figures/collap_head_a.png
@@ -586,10 +610,19 @@ share/gnome/help/evolution/C/figures/evo_account_info_a.png
 share/gnome/help/evolution/C/figures/evo_add_rule_a.png
 share/gnome/help/evolution/C/figures/evo_adv_search_a.png
 share/gnome/help/evolution/C/figures/evo_allday_a.png
+share/gnome/help/evolution/C/figures/evo_attachreminder_plugin.png
+share/gnome/help/evolution/C/figures/evo_backup.png
+share/gnome/help/evolution/C/figures/evo_backup_prgsbar.png
+share/gnome/help/evolution/C/figures/evo_backup_warning.png
+share/gnome/help/evolution/C/figures/evo_blink.png
 share/gnome/help/evolution/C/figures/evo_cal_a.png
+share/gnome/help/evolution/C/figures/evo_cal_advsearch.png
 share/gnome/help/evolution/C/figures/evo_cal_callout_a.png
+share/gnome/help/evolution/C/figures/evo_cal_prop_a.png
 share/gnome/help/evolution/C/figures/evo_calender_appointmnt.png
+share/gnome/help/evolution/C/figures/evo_calstatus_a.png
 share/gnome/help/evolution/C/figures/evo_contacteditor_a.png
+share/gnome/help/evolution/C/figures/evo_delegate_permission_a.png
 share/gnome/help/evolution/C/figures/evo_edit_rule_a.png
 share/gnome/help/evolution/C/figures/evo_edit_search.png
 share/gnome/help/evolution/C/figures/evo_email_a.png
@@ -597,20 +630,25 @@ share/gnome/help/evolution/C/figures/evo_flag_follow_up_a.png
 share/gnome/help/evolution/C/figures/evo_gwreceive_a.png
 share/gnome/help/evolution/C/figures/evo_gwreceiveedit_a.png
 share/gnome/help/evolution/C/figures/evo_gwreceiveoptedit_a.png
+share/gnome/help/evolution/C/figures/evo_gwstatustrack.png
 share/gnome/help/evolution/C/figures/evo_identity_a.png
 share/gnome/help/evolution/C/figures/evo_identityedit_a.png
 share/gnome/help/evolution/C/figures/evo_imapheader_a.png
 share/gnome/help/evolution/C/figures/evo_imapreceive_a.png
 share/gnome/help/evolution/C/figures/evo_import_asst_a.png
+share/gnome/help/evolution/C/figures/evo_junk_a.png
 share/gnome/help/evolution/C/figures/evo_mail_a.png
 share/gnome/help/evolution/C/figures/evo_mail_callout_a.png
+share/gnome/help/evolution/C/figures/evo_mail_notifier.png
 share/gnome/help/evolution/C/figures/evo_maildirreceive_a.png
 share/gnome/help/evolution/C/figures/evo_mboxreceive_a.png
 share/gnome/help/evolution/C/figures/evo_memo_a.png
 share/gnome/help/evolution/C/figures/evo_mereceive_a.png
 share/gnome/help/evolution/C/figures/evo_message_filters_a.png
 share/gnome/help/evolution/C/figures/evo_mhreceive_a.png
+share/gnome/help/evolution/C/figures/evo_newmail.png
 share/gnome/help/evolution/C/figures/evo_newmess_a.png
+share/gnome/help/evolution/C/figures/evo_offline.png
 share/gnome/help/evolution/C/figures/evo_popreceive_a.png
 share/gnome/help/evolution/C/figures/evo_proxyadd_a.png
 share/gnome/help/evolution/C/figures/evo_receive_setup2_a.png
@@ -657,6 +695,7 @@ share/gnome/help/evolution/C/figures/plus.png
 share/gnome/help/evolution/C/figures/proxy-cal.png
 share/gnome/help/evolution/C/figures/proxy-login.png
 share/gnome/help/evolution/C/figures/quick_add_a.png
+share/gnome/help/evolution/C/figures/quick_reference.png
 share/gnome/help/evolution/C/figures/replymsg.png
 share/gnome/help/evolution/C/figures/schedule.png
 share/gnome/help/evolution/C/figures/stock_search.png
@@ -667,6 +706,8 @@ share/gnome/help/evolution/C/figures/vfolder-createrule-fig.png
 share/gnome/help/evolution/de/evolution.xml
 share/gnome/help/evolution/de/figures/Screenshot-Free-Busy.png
 share/gnome/help/evolution/de/figures/account_editor_a.png
+share/gnome/help/evolution/de/figures/addrs_book_a.png
+share/gnome/help/evolution/de/figures/attach_reminder_a.png.png
 share/gnome/help/evolution/de/figures/calendar.png
 share/gnome/help/evolution/de/figures/categories_a.png
 share/gnome/help/evolution/de/figures/collap_head_a.png
@@ -681,10 +722,19 @@ share/gnome/help/evolution/de/figures/evo_account_info_a.png
 share/gnome/help/evolution/de/figures/evo_add_rule_a.png
 share/gnome/help/evolution/de/figures/evo_adv_search_a.png
 share/gnome/help/evolution/de/figures/evo_allday_a.png
+share/gnome/help/evolution/de/figures/evo_attachreminder_plugin.png
+share/gnome/help/evolution/de/figures/evo_backup.png
+share/gnome/help/evolution/de/figures/evo_backup_prgsbar.png
+share/gnome/help/evolution/de/figures/evo_backup_warning.png
+share/gnome/help/evolution/de/figures/evo_blink.png
 share/gnome/help/evolution/de/figures/evo_cal_a.png
+share/gnome/help/evolution/de/figures/evo_cal_advsearch.png
 share/gnome/help/evolution/de/figures/evo_cal_callout_a.png
+share/gnome/help/evolution/de/figures/evo_cal_prop_a.png
 share/gnome/help/evolution/de/figures/evo_calender_appointmnt.png
+share/gnome/help/evolution/de/figures/evo_calstatus_a.png
 share/gnome/help/evolution/de/figures/evo_contacteditor_a.png
+share/gnome/help/evolution/de/figures/evo_delegate_permission_a.png
 share/gnome/help/evolution/de/figures/evo_edit_rule_a.png
 share/gnome/help/evolution/de/figures/evo_edit_search.png
 share/gnome/help/evolution/de/figures/evo_email_a.png
@@ -692,20 +742,25 @@ share/gnome/help/evolution/de/figures/evo_flag_follow_up_a.png
 share/gnome/help/evolution/de/figures/evo_gwreceive_a.png
 share/gnome/help/evolution/de/figures/evo_gwreceiveedit_a.png
 share/gnome/help/evolution/de/figures/evo_gwreceiveoptedit_a.png
+share/gnome/help/evolution/de/figures/evo_gwstatustrack.png
 share/gnome/help/evolution/de/figures/evo_identity_a.png
 share/gnome/help/evolution/de/figures/evo_identityedit_a.png
 share/gnome/help/evolution/de/figures/evo_imapheader_a.png
 share/gnome/help/evolution/de/figures/evo_imapreceive_a.png
 share/gnome/help/evolution/de/figures/evo_import_asst_a.png
+share/gnome/help/evolution/de/figures/evo_junk_a.png
 share/gnome/help/evolution/de/figures/evo_mail_a.png
 share/gnome/help/evolution/de/figures/evo_mail_callout_a.png
+share/gnome/help/evolution/de/figures/evo_mail_notifier.png
 share/gnome/help/evolution/de/figures/evo_maildirreceive_a.png
 share/gnome/help/evolution/de/figures/evo_mboxreceive_a.png
 share/gnome/help/evolution/de/figures/evo_memo_a.png
 share/gnome/help/evolution/de/figures/evo_mereceive_a.png
 share/gnome/help/evolution/de/figures/evo_message_filters_a.png
 share/gnome/help/evolution/de/figures/evo_mhreceive_a.png
+share/gnome/help/evolution/de/figures/evo_newmail.png
 share/gnome/help/evolution/de/figures/evo_newmess_a.png
+share/gnome/help/evolution/de/figures/evo_offline.png
 share/gnome/help/evolution/de/figures/evo_popreceive_a.png
 share/gnome/help/evolution/de/figures/evo_proxyadd_a.png
 share/gnome/help/evolution/de/figures/evo_receive_setup2_a.png
@@ -752,6 +807,7 @@ share/gnome/help/evolution/de/figures/plus.png
 share/gnome/help/evolution/de/figures/proxy-cal.png
 share/gnome/help/evolution/de/figures/proxy-login.png
 share/gnome/help/evolution/de/figures/quick_add_a.png
+share/gnome/help/evolution/de/figures/quick_reference.png
 share/gnome/help/evolution/de/figures/replymsg.png
 share/gnome/help/evolution/de/figures/schedule.png
 share/gnome/help/evolution/de/figures/stock_search.png
@@ -759,9 +815,123 @@ share/gnome/help/evolution/de/figures/sub-others-folder.png
 share/gnome/help/evolution/de/figures/sub-pub-fold.png
 share/gnome/help/evolution/de/figures/ver_view_a.png
 share/gnome/help/evolution/de/figures/vfolder-createrule-fig.png
+share/gnome/help/evolution/el/evolution.xml
+share/gnome/help/evolution/el/figures/Screenshot-Free-Busy.png
+share/gnome/help/evolution/el/figures/account_editor_a.png
+share/gnome/help/evolution/el/figures/addrs_book_a.png
+share/gnome/help/evolution/el/figures/attach_reminder_a.png.png
+share/gnome/help/evolution/el/figures/calendar.png
+share/gnome/help/evolution/el/figures/categories_a.png
+share/gnome/help/evolution/el/figures/collap_head_a.png
+share/gnome/help/evolution/el/figures/config-cal.png
+share/gnome/help/evolution/el/figures/config-mail.png
+share/gnome/help/evolution/el/figures/contact-editor.png
+share/gnome/help/evolution/el/figures/contact.png
+share/gnome/help/evolution/el/figures/contacts_mainwindow_a.png
+share/gnome/help/evolution/el/figures/delgt-add.png
+share/gnome/help/evolution/el/figures/evo_account_editor_a.png
+share/gnome/help/evolution/el/figures/evo_account_info_a.png
+share/gnome/help/evolution/el/figures/evo_add_rule_a.png
+share/gnome/help/evolution/el/figures/evo_adv_search_a.png
+share/gnome/help/evolution/el/figures/evo_allday_a.png
+share/gnome/help/evolution/el/figures/evo_attachreminder_plugin.png
+share/gnome/help/evolution/el/figures/evo_backup.png
+share/gnome/help/evolution/el/figures/evo_backup_prgsbar.png
+share/gnome/help/evolution/el/figures/evo_backup_warning.png
+share/gnome/help/evolution/el/figures/evo_blink.png
+share/gnome/help/evolution/el/figures/evo_cal_a.png
+share/gnome/help/evolution/el/figures/evo_cal_advsearch.png
+share/gnome/help/evolution/el/figures/evo_cal_callout_a.png
+share/gnome/help/evolution/el/figures/evo_cal_prop_a.png
+share/gnome/help/evolution/el/figures/evo_calender_appointmnt.png
+share/gnome/help/evolution/el/figures/evo_calstatus_a.png
+share/gnome/help/evolution/el/figures/evo_contacteditor_a.png
+share/gnome/help/evolution/el/figures/evo_delegate_permission_a.png
+share/gnome/help/evolution/el/figures/evo_edit_rule_a.png
+share/gnome/help/evolution/el/figures/evo_edit_search.png
+share/gnome/help/evolution/el/figures/evo_email_a.png
+share/gnome/help/evolution/el/figures/evo_flag_follow_up_a.png
+share/gnome/help/evolution/el/figures/evo_gwreceive_a.png
+share/gnome/help/evolution/el/figures/evo_gwreceiveedit_a.png
+share/gnome/help/evolution/el/figures/evo_gwreceiveoptedit_a.png
+share/gnome/help/evolution/el/figures/evo_gwstatustrack.png
+share/gnome/help/evolution/el/figures/evo_identity_a.png
+share/gnome/help/evolution/el/figures/evo_identityedit_a.png
+share/gnome/help/evolution/el/figures/evo_imapheader_a.png
+share/gnome/help/evolution/el/figures/evo_imapreceive_a.png
+share/gnome/help/evolution/el/figures/evo_import_asst_a.png
+share/gnome/help/evolution/el/figures/evo_junk_a.png
+share/gnome/help/evolution/el/figures/evo_mail_a.png
+share/gnome/help/evolution/el/figures/evo_mail_callout_a.png
+share/gnome/help/evolution/el/figures/evo_mail_notifier.png
+share/gnome/help/evolution/el/figures/evo_maildirreceive_a.png
+share/gnome/help/evolution/el/figures/evo_mboxreceive_a.png
+share/gnome/help/evolution/el/figures/evo_memo_a.png
+share/gnome/help/evolution/el/figures/evo_mereceive_a.png
+share/gnome/help/evolution/el/figures/evo_message_filters_a.png
+share/gnome/help/evolution/el/figures/evo_mhreceive_a.png
+share/gnome/help/evolution/el/figures/evo_newmail.png
+share/gnome/help/evolution/el/figures/evo_newmess_a.png
+share/gnome/help/evolution/el/figures/evo_offline.png
+share/gnome/help/evolution/el/figures/evo_popreceive_a.png
+share/gnome/help/evolution/el/figures/evo_proxyadd_a.png
+share/gnome/help/evolution/el/figures/evo_receive_setup2_a.png
+share/gnome/help/evolution/el/figures/evo_receive_setup_a.png
+share/gnome/help/evolution/el/figures/evo_rmdrnotes_a.png
+share/gnome/help/evolution/el/figures/evo_rule_a.png
+share/gnome/help/evolution/el/figures/evo_select_add_folder.png
+share/gnome/help/evolution/el/figures/evo_select_folder.png
+share/gnome/help/evolution/el/figures/evo_send_option_a.png
+share/gnome/help/evolution/el/figures/evo_send_setup_a.png
+share/gnome/help/evolution/el/figures/evo_sendstatus_a.png
+share/gnome/help/evolution/el/figures/evo_shd_memo_a.png
+share/gnome/help/evolution/el/figures/evo_timezone_a.png
+share/gnome/help/evolution/el/figures/evo_usereceive_a.png
+share/gnome/help/evolution/el/figures/exchange-delegation.png
+share/gnome/help/evolution/el/figures/exchange-identity.png
+share/gnome/help/evolution/el/figures/exchange-receive-options.png
+share/gnome/help/evolution/el/figures/exchange-receive.png
+share/gnome/help/evolution/el/figures/exchg-identity.png
+share/gnome/help/evolution/el/figures/exchng-identity.png
+share/gnome/help/evolution/el/figures/exchng-rec-mail.png
+share/gnome/help/evolution/el/figures/exchng-rec-mails.png
+share/gnome/help/evolution/el/figures/exchng-rec-option.png
+share/gnome/help/evolution/el/figures/exchng-rec-options.png
+share/gnome/help/evolution/el/figures/exchng-settings.png
+share/gnome/help/evolution/el/figures/filter-new-fig.png
+share/gnome/help/evolution/el/figures/free_busy.png
+share/gnome/help/evolution/el/figures/full-1.png
+share/gnome/help/evolution/el/figures/full-2.png
+share/gnome/help/evolution/el/figures/full-3.png
+share/gnome/help/evolution/el/figures/full-4.png
+share/gnome/help/evolution/el/figures/full-5.png
+share/gnome/help/evolution/el/figures/full-6.png
+share/gnome/help/evolution/el/figures/full-7.png
+share/gnome/help/evolution/el/figures/mail-druid-pic.png
+share/gnome/help/evolution/el/figures/mail-inbox.png
+share/gnome/help/evolution/el/figures/mail-threaded.png
+share/gnome/help/evolution/el/figures/mail_mainwindow_a.png
+share/gnome/help/evolution/el/figures/mailer_preferences.png
+share/gnome/help/evolution/el/figures/mainwindow-pic.png
+share/gnome/help/evolution/el/figures/minus.png
+share/gnome/help/evolution/el/figures/newmsg.png
+share/gnome/help/evolution/el/figures/plus.png
+share/gnome/help/evolution/el/figures/proxy-cal.png
+share/gnome/help/evolution/el/figures/proxy-login.png
+share/gnome/help/evolution/el/figures/quick_add_a.png
+share/gnome/help/evolution/el/figures/quick_reference.png
+share/gnome/help/evolution/el/figures/replymsg.png
+share/gnome/help/evolution/el/figures/schedule.png
+share/gnome/help/evolution/el/figures/stock_search.png
+share/gnome/help/evolution/el/figures/sub-others-folder.png
+share/gnome/help/evolution/el/figures/sub-pub-fold.png
+share/gnome/help/evolution/el/figures/ver_view_a.png
+share/gnome/help/evolution/el/figures/vfolder-createrule-fig.png
 share/gnome/help/evolution/en_GB/evolution.xml
 share/gnome/help/evolution/en_GB/figures/Screenshot-Free-Busy.png
 share/gnome/help/evolution/en_GB/figures/account_editor_a.png
+share/gnome/help/evolution/en_GB/figures/addrs_book_a.png
+share/gnome/help/evolution/en_GB/figures/attach_reminder_a.png.png
 share/gnome/help/evolution/en_GB/figures/calendar.png
 share/gnome/help/evolution/en_GB/figures/categories_a.png
 share/gnome/help/evolution/en_GB/figures/collap_head_a.png
@@ -776,10 +946,19 @@ share/gnome/help/evolution/en_GB/figures/evo_account_info_a.png
 share/gnome/help/evolution/en_GB/figures/evo_add_rule_a.png
 share/gnome/help/evolution/en_GB/figures/evo_adv_search_a.png
 share/gnome/help/evolution/en_GB/figures/evo_allday_a.png
+share/gnome/help/evolution/en_GB/figures/evo_attachreminder_plugin.png
+share/gnome/help/evolution/en_GB/figures/evo_backup.png
+share/gnome/help/evolution/en_GB/figures/evo_backup_prgsbar.png
+share/gnome/help/evolution/en_GB/figures/evo_backup_warning.png
+share/gnome/help/evolution/en_GB/figures/evo_blink.png
 share/gnome/help/evolution/en_GB/figures/evo_cal_a.png
+share/gnome/help/evolution/en_GB/figures/evo_cal_advsearch.png
 share/gnome/help/evolution/en_GB/figures/evo_cal_callout_a.png
+share/gnome/help/evolution/en_GB/figures/evo_cal_prop_a.png
 share/gnome/help/evolution/en_GB/figures/evo_calender_appointmnt.png
+share/gnome/help/evolution/en_GB/figures/evo_calstatus_a.png
 share/gnome/help/evolution/en_GB/figures/evo_contacteditor_a.png
+share/gnome/help/evolution/en_GB/figures/evo_delegate_permission_a.png
 share/gnome/help/evolution/en_GB/figures/evo_edit_rule_a.png
 share/gnome/help/evolution/en_GB/figures/evo_edit_search.png
 share/gnome/help/evolution/en_GB/figures/evo_email_a.png
@@ -787,20 +966,25 @@ share/gnome/help/evolution/en_GB/figures/evo_flag_follow_up_a.png
 share/gnome/help/evolution/en_GB/figures/evo_gwreceive_a.png
 share/gnome/help/evolution/en_GB/figures/evo_gwreceiveedit_a.png
 share/gnome/help/evolution/en_GB/figures/evo_gwreceiveoptedit_a.png
+share/gnome/help/evolution/en_GB/figures/evo_gwstatustrack.png
 share/gnome/help/evolution/en_GB/figures/evo_identity_a.png
 share/gnome/help/evolution/en_GB/figures/evo_identityedit_a.png
 share/gnome/help/evolution/en_GB/figures/evo_imapheader_a.png
 share/gnome/help/evolution/en_GB/figures/evo_imapreceive_a.png
 share/gnome/help/evolution/en_GB/figures/evo_import_asst_a.png
+share/gnome/help/evolution/en_GB/figures/evo_junk_a.png
 share/gnome/help/evolution/en_GB/figures/evo_mail_a.png
 share/gnome/help/evolution/en_GB/figures/evo_mail_callout_a.png
+share/gnome/help/evolution/en_GB/figures/evo_mail_notifier.png
 share/gnome/help/evolution/en_GB/figures/evo_maildirreceive_a.png
 share/gnome/help/evolution/en_GB/figures/evo_mboxreceive_a.png
 share/gnome/help/evolution/en_GB/figures/evo_memo_a.png
 share/gnome/help/evolution/en_GB/figures/evo_mereceive_a.png
 share/gnome/help/evolution/en_GB/figures/evo_message_filters_a.png
 share/gnome/help/evolution/en_GB/figures/evo_mhreceive_a.png
+share/gnome/help/evolution/en_GB/figures/evo_newmail.png
 share/gnome/help/evolution/en_GB/figures/evo_newmess_a.png
+share/gnome/help/evolution/en_GB/figures/evo_offline.png
 share/gnome/help/evolution/en_GB/figures/evo_popreceive_a.png
 share/gnome/help/evolution/en_GB/figures/evo_proxyadd_a.png
 share/gnome/help/evolution/en_GB/figures/evo_receive_setup2_a.png
@@ -847,6 +1031,7 @@ share/gnome/help/evolution/en_GB/figures/plus.png
 share/gnome/help/evolution/en_GB/figures/proxy-cal.png
 share/gnome/help/evolution/en_GB/figures/proxy-login.png
 share/gnome/help/evolution/en_GB/figures/quick_add_a.png
+share/gnome/help/evolution/en_GB/figures/quick_reference.png
 share/gnome/help/evolution/en_GB/figures/replymsg.png
 share/gnome/help/evolution/en_GB/figures/schedule.png
 share/gnome/help/evolution/en_GB/figures/stock_search.png
@@ -857,6 +1042,8 @@ share/gnome/help/evolution/en_GB/figures/vfolder-createrule-fig.png
 share/gnome/help/evolution/es/evolution.xml
 share/gnome/help/evolution/es/figures/Screenshot-Free-Busy.png
 share/gnome/help/evolution/es/figures/account_editor_a.png
+share/gnome/help/evolution/es/figures/addrs_book_a.png
+share/gnome/help/evolution/es/figures/attach_reminder_a.png.png
 share/gnome/help/evolution/es/figures/calendar.png
 share/gnome/help/evolution/es/figures/categories_a.png
 share/gnome/help/evolution/es/figures/collap_head_a.png
@@ -871,10 +1058,19 @@ share/gnome/help/evolution/es/figures/evo_account_info_a.png
 share/gnome/help/evolution/es/figures/evo_add_rule_a.png
 share/gnome/help/evolution/es/figures/evo_adv_search_a.png
 share/gnome/help/evolution/es/figures/evo_allday_a.png
+share/gnome/help/evolution/es/figures/evo_attachreminder_plugin.png
+share/gnome/help/evolution/es/figures/evo_backup.png
+share/gnome/help/evolution/es/figures/evo_backup_prgsbar.png
+share/gnome/help/evolution/es/figures/evo_backup_warning.png
+share/gnome/help/evolution/es/figures/evo_blink.png
 share/gnome/help/evolution/es/figures/evo_cal_a.png
+share/gnome/help/evolution/es/figures/evo_cal_advsearch.png
 share/gnome/help/evolution/es/figures/evo_cal_callout_a.png
+share/gnome/help/evolution/es/figures/evo_cal_prop_a.png
 share/gnome/help/evolution/es/figures/evo_calender_appointmnt.png
+share/gnome/help/evolution/es/figures/evo_calstatus_a.png
 share/gnome/help/evolution/es/figures/evo_contacteditor_a.png
+share/gnome/help/evolution/es/figures/evo_delegate_permission_a.png
 share/gnome/help/evolution/es/figures/evo_edit_rule_a.png
 share/gnome/help/evolution/es/figures/evo_edit_search.png
 share/gnome/help/evolution/es/figures/evo_email_a.png
@@ -882,20 +1078,25 @@ share/gnome/help/evolution/es/figures/evo_flag_follow_up_a.png
 share/gnome/help/evolution/es/figures/evo_gwreceive_a.png
 share/gnome/help/evolution/es/figures/evo_gwreceiveedit_a.png
 share/gnome/help/evolution/es/figures/evo_gwreceiveoptedit_a.png
+share/gnome/help/evolution/es/figures/evo_gwstatustrack.png
 share/gnome/help/evolution/es/figures/evo_identity_a.png
 share/gnome/help/evolution/es/figures/evo_identityedit_a.png
 share/gnome/help/evolution/es/figures/evo_imapheader_a.png
 share/gnome/help/evolution/es/figures/evo_imapreceive_a.png
 share/gnome/help/evolution/es/figures/evo_import_asst_a.png
+share/gnome/help/evolution/es/figures/evo_junk_a.png
 share/gnome/help/evolution/es/figures/evo_mail_a.png
 share/gnome/help/evolution/es/figures/evo_mail_callout_a.png
+share/gnome/help/evolution/es/figures/evo_mail_notifier.png
 share/gnome/help/evolution/es/figures/evo_maildirreceive_a.png
 share/gnome/help/evolution/es/figures/evo_mboxreceive_a.png
 share/gnome/help/evolution/es/figures/evo_memo_a.png
 share/gnome/help/evolution/es/figures/evo_mereceive_a.png
 share/gnome/help/evolution/es/figures/evo_message_filters_a.png
 share/gnome/help/evolution/es/figures/evo_mhreceive_a.png
+share/gnome/help/evolution/es/figures/evo_newmail.png
 share/gnome/help/evolution/es/figures/evo_newmess_a.png
+share/gnome/help/evolution/es/figures/evo_offline.png
 share/gnome/help/evolution/es/figures/evo_popreceive_a.png
 share/gnome/help/evolution/es/figures/evo_proxyadd_a.png
 share/gnome/help/evolution/es/figures/evo_receive_setup2_a.png
@@ -942,6 +1143,7 @@ share/gnome/help/evolution/es/figures/plus.png
 share/gnome/help/evolution/es/figures/proxy-cal.png
 share/gnome/help/evolution/es/figures/proxy-login.png
 share/gnome/help/evolution/es/figures/quick_add_a.png
+share/gnome/help/evolution/es/figures/quick_reference.png
 share/gnome/help/evolution/es/figures/replymsg.png
 share/gnome/help/evolution/es/figures/schedule.png
 share/gnome/help/evolution/es/figures/stock_search.png
@@ -952,6 +1154,8 @@ share/gnome/help/evolution/es/figures/vfolder-createrule-fig.png
 share/gnome/help/evolution/fr/evolution.xml
 share/gnome/help/evolution/fr/figures/Screenshot-Free-Busy.png
 share/gnome/help/evolution/fr/figures/account_editor_a.png
+share/gnome/help/evolution/fr/figures/addrs_book_a.png
+share/gnome/help/evolution/fr/figures/attach_reminder_a.png.png
 share/gnome/help/evolution/fr/figures/calendar.png
 share/gnome/help/evolution/fr/figures/categories_a.png
 share/gnome/help/evolution/fr/figures/collap_head_a.png
@@ -966,10 +1170,19 @@ share/gnome/help/evolution/fr/figures/evo_account_info_a.png
 share/gnome/help/evolution/fr/figures/evo_add_rule_a.png
 share/gnome/help/evolution/fr/figures/evo_adv_search_a.png
 share/gnome/help/evolution/fr/figures/evo_allday_a.png
+share/gnome/help/evolution/fr/figures/evo_attachreminder_plugin.png
+share/gnome/help/evolution/fr/figures/evo_backup.png
+share/gnome/help/evolution/fr/figures/evo_backup_prgsbar.png
+share/gnome/help/evolution/fr/figures/evo_backup_warning.png
+share/gnome/help/evolution/fr/figures/evo_blink.png
 share/gnome/help/evolution/fr/figures/evo_cal_a.png
+share/gnome/help/evolution/fr/figures/evo_cal_advsearch.png
 share/gnome/help/evolution/fr/figures/evo_cal_callout_a.png
+share/gnome/help/evolution/fr/figures/evo_cal_prop_a.png
 share/gnome/help/evolution/fr/figures/evo_calender_appointmnt.png
+share/gnome/help/evolution/fr/figures/evo_calstatus_a.png
 share/gnome/help/evolution/fr/figures/evo_contacteditor_a.png
+share/gnome/help/evolution/fr/figures/evo_delegate_permission_a.png
 share/gnome/help/evolution/fr/figures/evo_edit_rule_a.png
 share/gnome/help/evolution/fr/figures/evo_edit_search.png
 share/gnome/help/evolution/fr/figures/evo_email_a.png
@@ -977,20 +1190,25 @@ share/gnome/help/evolution/fr/figures/evo_flag_follow_up_a.png
 share/gnome/help/evolution/fr/figures/evo_gwreceive_a.png
 share/gnome/help/evolution/fr/figures/evo_gwreceiveedit_a.png
 share/gnome/help/evolution/fr/figures/evo_gwreceiveoptedit_a.png
+share/gnome/help/evolution/fr/figures/evo_gwstatustrack.png
 share/gnome/help/evolution/fr/figures/evo_identity_a.png
 share/gnome/help/evolution/fr/figures/evo_identityedit_a.png
 share/gnome/help/evolution/fr/figures/evo_imapheader_a.png
 share/gnome/help/evolution/fr/figures/evo_imapreceive_a.png
 share/gnome/help/evolution/fr/figures/evo_import_asst_a.png
+share/gnome/help/evolution/fr/figures/evo_junk_a.png
 share/gnome/help/evolution/fr/figures/evo_mail_a.png
 share/gnome/help/evolution/fr/figures/evo_mail_callout_a.png
+share/gnome/help/evolution/fr/figures/evo_mail_notifier.png
 share/gnome/help/evolution/fr/figures/evo_maildirreceive_a.png
 share/gnome/help/evolution/fr/figures/evo_mboxreceive_a.png
 share/gnome/help/evolution/fr/figures/evo_memo_a.png
 share/gnome/help/evolution/fr/figures/evo_mereceive_a.png
 share/gnome/help/evolution/fr/figures/evo_message_filters_a.png
 share/gnome/help/evolution/fr/figures/evo_mhreceive_a.png
+share/gnome/help/evolution/fr/figures/evo_newmail.png
 share/gnome/help/evolution/fr/figures/evo_newmess_a.png
+share/gnome/help/evolution/fr/figures/evo_offline.png
 share/gnome/help/evolution/fr/figures/evo_popreceive_a.png
 share/gnome/help/evolution/fr/figures/evo_proxyadd_a.png
 share/gnome/help/evolution/fr/figures/evo_receive_setup2_a.png
@@ -1037,6 +1255,7 @@ share/gnome/help/evolution/fr/figures/plus.png
 share/gnome/help/evolution/fr/figures/proxy-cal.png
 share/gnome/help/evolution/fr/figures/proxy-login.png
 share/gnome/help/evolution/fr/figures/quick_add_a.png
+share/gnome/help/evolution/fr/figures/quick_reference.png
 share/gnome/help/evolution/fr/figures/replymsg.png
 share/gnome/help/evolution/fr/figures/schedule.png
 share/gnome/help/evolution/fr/figures/stock_search.png
@@ -1044,9 +1263,123 @@ share/gnome/help/evolution/fr/figures/sub-others-folder.png
 share/gnome/help/evolution/fr/figures/sub-pub-fold.png
 share/gnome/help/evolution/fr/figures/ver_view_a.png
 share/gnome/help/evolution/fr/figures/vfolder-createrule-fig.png
+share/gnome/help/evolution/oc/evolution.xml
+share/gnome/help/evolution/oc/figures/Screenshot-Free-Busy.png
+share/gnome/help/evolution/oc/figures/account_editor_a.png
+share/gnome/help/evolution/oc/figures/addrs_book_a.png
+share/gnome/help/evolution/oc/figures/attach_reminder_a.png.png
+share/gnome/help/evolution/oc/figures/calendar.png
+share/gnome/help/evolution/oc/figures/categories_a.png
+share/gnome/help/evolution/oc/figures/collap_head_a.png
+share/gnome/help/evolution/oc/figures/config-cal.png
+share/gnome/help/evolution/oc/figures/config-mail.png
+share/gnome/help/evolution/oc/figures/contact-editor.png
+share/gnome/help/evolution/oc/figures/contact.png
+share/gnome/help/evolution/oc/figures/contacts_mainwindow_a.png
+share/gnome/help/evolution/oc/figures/delgt-add.png
+share/gnome/help/evolution/oc/figures/evo_account_editor_a.png
+share/gnome/help/evolution/oc/figures/evo_account_info_a.png
+share/gnome/help/evolution/oc/figures/evo_add_rule_a.png
+share/gnome/help/evolution/oc/figures/evo_adv_search_a.png
+share/gnome/help/evolution/oc/figures/evo_allday_a.png
+share/gnome/help/evolution/oc/figures/evo_attachreminder_plugin.png
+share/gnome/help/evolution/oc/figures/evo_backup.png
+share/gnome/help/evolution/oc/figures/evo_backup_prgsbar.png
+share/gnome/help/evolution/oc/figures/evo_backup_warning.png
+share/gnome/help/evolution/oc/figures/evo_blink.png
+share/gnome/help/evolution/oc/figures/evo_cal_a.png
+share/gnome/help/evolution/oc/figures/evo_cal_advsearch.png
+share/gnome/help/evolution/oc/figures/evo_cal_callout_a.png
+share/gnome/help/evolution/oc/figures/evo_cal_prop_a.png
+share/gnome/help/evolution/oc/figures/evo_calender_appointmnt.png
+share/gnome/help/evolution/oc/figures/evo_calstatus_a.png
+share/gnome/help/evolution/oc/figures/evo_contacteditor_a.png
+share/gnome/help/evolution/oc/figures/evo_delegate_permission_a.png
+share/gnome/help/evolution/oc/figures/evo_edit_rule_a.png
+share/gnome/help/evolution/oc/figures/evo_edit_search.png
+share/gnome/help/evolution/oc/figures/evo_email_a.png
+share/gnome/help/evolution/oc/figures/evo_flag_follow_up_a.png
+share/gnome/help/evolution/oc/figures/evo_gwreceive_a.png
+share/gnome/help/evolution/oc/figures/evo_gwreceiveedit_a.png
+share/gnome/help/evolution/oc/figures/evo_gwreceiveoptedit_a.png
+share/gnome/help/evolution/oc/figures/evo_gwstatustrack.png
+share/gnome/help/evolution/oc/figures/evo_identity_a.png
+share/gnome/help/evolution/oc/figures/evo_identityedit_a.png
+share/gnome/help/evolution/oc/figures/evo_imapheader_a.png
+share/gnome/help/evolution/oc/figures/evo_imapreceive_a.png
+share/gnome/help/evolution/oc/figures/evo_import_asst_a.png
+share/gnome/help/evolution/oc/figures/evo_junk_a.png
+share/gnome/help/evolution/oc/figures/evo_mail_a.png
+share/gnome/help/evolution/oc/figures/evo_mail_callout_a.png
+share/gnome/help/evolution/oc/figures/evo_mail_notifier.png
+share/gnome/help/evolution/oc/figures/evo_maildirreceive_a.png
+share/gnome/help/evolution/oc/figures/evo_mboxreceive_a.png
+share/gnome/help/evolution/oc/figures/evo_memo_a.png
+share/gnome/help/evolution/oc/figures/evo_mereceive_a.png
+share/gnome/help/evolution/oc/figures/evo_message_filters_a.png
+share/gnome/help/evolution/oc/figures/evo_mhreceive_a.png
+share/gnome/help/evolution/oc/figures/evo_newmail.png
+share/gnome/help/evolution/oc/figures/evo_newmess_a.png
+share/gnome/help/evolution/oc/figures/evo_offline.png
+share/gnome/help/evolution/oc/figures/evo_popreceive_a.png
+share/gnome/help/evolution/oc/figures/evo_proxyadd_a.png
+share/gnome/help/evolution/oc/figures/evo_receive_setup2_a.png
+share/gnome/help/evolution/oc/figures/evo_receive_setup_a.png
+share/gnome/help/evolution/oc/figures/evo_rmdrnotes_a.png
+share/gnome/help/evolution/oc/figures/evo_rule_a.png
+share/gnome/help/evolution/oc/figures/evo_select_add_folder.png
+share/gnome/help/evolution/oc/figures/evo_select_folder.png
+share/gnome/help/evolution/oc/figures/evo_send_option_a.png
+share/gnome/help/evolution/oc/figures/evo_send_setup_a.png
+share/gnome/help/evolution/oc/figures/evo_sendstatus_a.png
+share/gnome/help/evolution/oc/figures/evo_shd_memo_a.png
+share/gnome/help/evolution/oc/figures/evo_timezone_a.png
+share/gnome/help/evolution/oc/figures/evo_usereceive_a.png
+share/gnome/help/evolution/oc/figures/exchange-delegation.png
+share/gnome/help/evolution/oc/figures/exchange-identity.png
+share/gnome/help/evolution/oc/figures/exchange-receive-options.png
+share/gnome/help/evolution/oc/figures/exchange-receive.png
+share/gnome/help/evolution/oc/figures/exchg-identity.png
+share/gnome/help/evolution/oc/figures/exchng-identity.png
+share/gnome/help/evolution/oc/figures/exchng-rec-mail.png
+share/gnome/help/evolution/oc/figures/exchng-rec-mails.png
+share/gnome/help/evolution/oc/figures/exchng-rec-option.png
+share/gnome/help/evolution/oc/figures/exchng-rec-options.png
+share/gnome/help/evolution/oc/figures/exchng-settings.png
+share/gnome/help/evolution/oc/figures/filter-new-fig.png
+share/gnome/help/evolution/oc/figures/free_busy.png
+share/gnome/help/evolution/oc/figures/full-1.png
+share/gnome/help/evolution/oc/figures/full-2.png
+share/gnome/help/evolution/oc/figures/full-3.png
+share/gnome/help/evolution/oc/figures/full-4.png
+share/gnome/help/evolution/oc/figures/full-5.png
+share/gnome/help/evolution/oc/figures/full-6.png
+share/gnome/help/evolution/oc/figures/full-7.png
+share/gnome/help/evolution/oc/figures/mail-druid-pic.png
+share/gnome/help/evolution/oc/figures/mail-inbox.png
+share/gnome/help/evolution/oc/figures/mail-threaded.png
+share/gnome/help/evolution/oc/figures/mail_mainwindow_a.png
+share/gnome/help/evolution/oc/figures/mailer_preferences.png
+share/gnome/help/evolution/oc/figures/mainwindow-pic.png
+share/gnome/help/evolution/oc/figures/minus.png
+share/gnome/help/evolution/oc/figures/newmsg.png
+share/gnome/help/evolution/oc/figures/plus.png
+share/gnome/help/evolution/oc/figures/proxy-cal.png
+share/gnome/help/evolution/oc/figures/proxy-login.png
+share/gnome/help/evolution/oc/figures/quick_add_a.png
+share/gnome/help/evolution/oc/figures/quick_reference.png
+share/gnome/help/evolution/oc/figures/replymsg.png
+share/gnome/help/evolution/oc/figures/schedule.png
+share/gnome/help/evolution/oc/figures/stock_search.png
+share/gnome/help/evolution/oc/figures/sub-others-folder.png
+share/gnome/help/evolution/oc/figures/sub-pub-fold.png
+share/gnome/help/evolution/oc/figures/ver_view_a.png
+share/gnome/help/evolution/oc/figures/vfolder-createrule-fig.png
 share/gnome/help/evolution/ru/evolution.xml
 share/gnome/help/evolution/ru/figures/Screenshot-Free-Busy.png
 share/gnome/help/evolution/ru/figures/account_editor_a.png
+share/gnome/help/evolution/ru/figures/addrs_book_a.png
+share/gnome/help/evolution/ru/figures/attach_reminder_a.png.png
 share/gnome/help/evolution/ru/figures/calendar.png
 share/gnome/help/evolution/ru/figures/categories_a.png
 share/gnome/help/evolution/ru/figures/collap_head_a.png
@@ -1061,10 +1394,19 @@ share/gnome/help/evolution/ru/figures/evo_account_info_a.png
 share/gnome/help/evolution/ru/figures/evo_add_rule_a.png
 share/gnome/help/evolution/ru/figures/evo_adv_search_a.png
 share/gnome/help/evolution/ru/figures/evo_allday_a.png
+share/gnome/help/evolution/ru/figures/evo_attachreminder_plugin.png
+share/gnome/help/evolution/ru/figures/evo_backup.png
+share/gnome/help/evolution/ru/figures/evo_backup_prgsbar.png
+share/gnome/help/evolution/ru/figures/evo_backup_warning.png
+share/gnome/help/evolution/ru/figures/evo_blink.png
 share/gnome/help/evolution/ru/figures/evo_cal_a.png
+share/gnome/help/evolution/ru/figures/evo_cal_advsearch.png
 share/gnome/help/evolution/ru/figures/evo_cal_callout_a.png
+share/gnome/help/evolution/ru/figures/evo_cal_prop_a.png
 share/gnome/help/evolution/ru/figures/evo_calender_appointmnt.png
+share/gnome/help/evolution/ru/figures/evo_calstatus_a.png
 share/gnome/help/evolution/ru/figures/evo_contacteditor_a.png
+share/gnome/help/evolution/ru/figures/evo_delegate_permission_a.png
 share/gnome/help/evolution/ru/figures/evo_edit_rule_a.png
 share/gnome/help/evolution/ru/figures/evo_edit_search.png
 share/gnome/help/evolution/ru/figures/evo_email_a.png
@@ -1072,20 +1414,25 @@ share/gnome/help/evolution/ru/figures/evo_flag_follow_up_a.png
 share/gnome/help/evolution/ru/figures/evo_gwreceive_a.png
 share/gnome/help/evolution/ru/figures/evo_gwreceiveedit_a.png
 share/gnome/help/evolution/ru/figures/evo_gwreceiveoptedit_a.png
+share/gnome/help/evolution/ru/figures/evo_gwstatustrack.png
 share/gnome/help/evolution/ru/figures/evo_identity_a.png
 share/gnome/help/evolution/ru/figures/evo_identityedit_a.png
 share/gnome/help/evolution/ru/figures/evo_imapheader_a.png
 share/gnome/help/evolution/ru/figures/evo_imapreceive_a.png
 share/gnome/help/evolution/ru/figures/evo_import_asst_a.png
+share/gnome/help/evolution/ru/figures/evo_junk_a.png
 share/gnome/help/evolution/ru/figures/evo_mail_a.png
 share/gnome/help/evolution/ru/figures/evo_mail_callout_a.png
+share/gnome/help/evolution/ru/figures/evo_mail_notifier.png
 share/gnome/help/evolution/ru/figures/evo_maildirreceive_a.png
 share/gnome/help/evolution/ru/figures/evo_mboxreceive_a.png
 share/gnome/help/evolution/ru/figures/evo_memo_a.png
 share/gnome/help/evolution/ru/figures/evo_mereceive_a.png
 share/gnome/help/evolution/ru/figures/evo_message_filters_a.png
 share/gnome/help/evolution/ru/figures/evo_mhreceive_a.png
+share/gnome/help/evolution/ru/figures/evo_newmail.png
 share/gnome/help/evolution/ru/figures/evo_newmess_a.png
+share/gnome/help/evolution/ru/figures/evo_offline.png
 share/gnome/help/evolution/ru/figures/evo_popreceive_a.png
 share/gnome/help/evolution/ru/figures/evo_proxyadd_a.png
 share/gnome/help/evolution/ru/figures/evo_receive_setup2_a.png
@@ -1132,6 +1479,7 @@ share/gnome/help/evolution/ru/figures/plus.png
 share/gnome/help/evolution/ru/figures/proxy-cal.png
 share/gnome/help/evolution/ru/figures/proxy-login.png
 share/gnome/help/evolution/ru/figures/quick_add_a.png
+share/gnome/help/evolution/ru/figures/quick_reference.png
 share/gnome/help/evolution/ru/figures/replymsg.png
 share/gnome/help/evolution/ru/figures/schedule.png
 share/gnome/help/evolution/ru/figures/stock_search.png
@@ -1142,6 +1490,8 @@ share/gnome/help/evolution/ru/figures/vfolder-createrule-fig.png
 share/gnome/help/evolution/sv/evolution.xml
 share/gnome/help/evolution/sv/figures/Screenshot-Free-Busy.png
 share/gnome/help/evolution/sv/figures/account_editor_a.png
+share/gnome/help/evolution/sv/figures/addrs_book_a.png
+share/gnome/help/evolution/sv/figures/attach_reminder_a.png.png
 share/gnome/help/evolution/sv/figures/calendar.png
 share/gnome/help/evolution/sv/figures/categories_a.png
 share/gnome/help/evolution/sv/figures/collap_head_a.png
@@ -1156,10 +1506,19 @@ share/gnome/help/evolution/sv/figures/evo_account_info_a.png
 share/gnome/help/evolution/sv/figures/evo_add_rule_a.png
 share/gnome/help/evolution/sv/figures/evo_adv_search_a.png
 share/gnome/help/evolution/sv/figures/evo_allday_a.png
+share/gnome/help/evolution/sv/figures/evo_attachreminder_plugin.png
+share/gnome/help/evolution/sv/figures/evo_backup.png
+share/gnome/help/evolution/sv/figures/evo_backup_prgsbar.png
+share/gnome/help/evolution/sv/figures/evo_backup_warning.png
+share/gnome/help/evolution/sv/figures/evo_blink.png
 share/gnome/help/evolution/sv/figures/evo_cal_a.png
+share/gnome/help/evolution/sv/figures/evo_cal_advsearch.png
 share/gnome/help/evolution/sv/figures/evo_cal_callout_a.png
+share/gnome/help/evolution/sv/figures/evo_cal_prop_a.png
 share/gnome/help/evolution/sv/figures/evo_calender_appointmnt.png
+share/gnome/help/evolution/sv/figures/evo_calstatus_a.png
 share/gnome/help/evolution/sv/figures/evo_contacteditor_a.png
+share/gnome/help/evolution/sv/figures/evo_delegate_permission_a.png
 share/gnome/help/evolution/sv/figures/evo_edit_rule_a.png
 share/gnome/help/evolution/sv/figures/evo_edit_search.png
 share/gnome/help/evolution/sv/figures/evo_email_a.png
@@ -1167,20 +1526,25 @@ share/gnome/help/evolution/sv/figures/evo_flag_follow_up_a.png
 share/gnome/help/evolution/sv/figures/evo_gwreceive_a.png
 share/gnome/help/evolution/sv/figures/evo_gwreceiveedit_a.png
 share/gnome/help/evolution/sv/figures/evo_gwreceiveoptedit_a.png
+share/gnome/help/evolution/sv/figures/evo_gwstatustrack.png
 share/gnome/help/evolution/sv/figures/evo_identity_a.png
 share/gnome/help/evolution/sv/figures/evo_identityedit_a.png
 share/gnome/help/evolution/sv/figures/evo_imapheader_a.png
 share/gnome/help/evolution/sv/figures/evo_imapreceive_a.png
 share/gnome/help/evolution/sv/figures/evo_import_asst_a.png
+share/gnome/help/evolution/sv/figures/evo_junk_a.png
 share/gnome/help/evolution/sv/figures/evo_mail_a.png
 share/gnome/help/evolution/sv/figures/evo_mail_callout_a.png
+share/gnome/help/evolution/sv/figures/evo_mail_notifier.png
 share/gnome/help/evolution/sv/figures/evo_maildirreceive_a.png
 share/gnome/help/evolution/sv/figures/evo_mboxreceive_a.png
 share/gnome/help/evolution/sv/figures/evo_memo_a.png
 share/gnome/help/evolution/sv/figures/evo_mereceive_a.png
 share/gnome/help/evolution/sv/figures/evo_message_filters_a.png
 share/gnome/help/evolution/sv/figures/evo_mhreceive_a.png
+share/gnome/help/evolution/sv/figures/evo_newmail.png
 share/gnome/help/evolution/sv/figures/evo_newmess_a.png
+share/gnome/help/evolution/sv/figures/evo_offline.png
 share/gnome/help/evolution/sv/figures/evo_popreceive_a.png
 share/gnome/help/evolution/sv/figures/evo_proxyadd_a.png
 share/gnome/help/evolution/sv/figures/evo_receive_setup2_a.png
@@ -1227,6 +1591,7 @@ share/gnome/help/evolution/sv/figures/plus.png
 share/gnome/help/evolution/sv/figures/proxy-cal.png
 share/gnome/help/evolution/sv/figures/proxy-login.png
 share/gnome/help/evolution/sv/figures/quick_add_a.png
+share/gnome/help/evolution/sv/figures/quick_reference.png
 share/gnome/help/evolution/sv/figures/replymsg.png
 share/gnome/help/evolution/sv/figures/schedule.png
 share/gnome/help/evolution/sv/figures/stock_search.png
@@ -1234,30 +1599,28 @@ share/gnome/help/evolution/sv/figures/sub-others-folder.png
 share/gnome/help/evolution/sv/figures/sub-pub-fold.png
 share/gnome/help/evolution/sv/figures/ver_view_a.png
 share/gnome/help/evolution/sv/figures/vfolder-createrule-fig.png
-share/gnome/idl/evolution-%%VERSION%%/Composer.idl
-share/gnome/idl/evolution-%%VERSION%%/Evolution-Component.idl
-share/gnome/idl/evolution-%%VERSION%%/Evolution-Composer.idl
-share/gnome/idl/evolution-%%VERSION%%/Evolution-ConfigControl.idl
-share/gnome/idl/evolution-%%VERSION%%/Evolution-Mail.idl
-share/gnome/idl/evolution-%%VERSION%%/Evolution-Shell.idl
-share/gnome/idl/evolution-%%VERSION%%/Evolution.idl
-share/gnome/idl/evolution-%%VERSION%%/evolution-calendar.idl
-share/gnome/mime-info/evolution.keys
-share/gnome/mime-info/evolution.mime
-share/gnome/omf/evolution/evolution-C.omf
-share/gnome/omf/evolution/evolution-de.omf
-share/gnome/omf/evolution/evolution-en_GB.omf
-share/gnome/omf/evolution/evolution-es.omf
-share/gnome/omf/evolution/evolution-fr.omf
-share/gnome/omf/evolution/evolution-ru.omf
-share/gnome/omf/evolution/evolution-sv.omf
 share/icons/hicolor/16x16/apps/evolution.png
 share/icons/hicolor/22x22/apps/evolution.png
 share/icons/hicolor/24x24/apps/evolution.png
 share/icons/hicolor/32x32/apps/evolution.png
+share/icons/hicolor/48x48/apps/preferences-autocompletion.png
+share/icons/hicolor/48x48/apps/preferences-calendar-and-tasks.png
+share/icons/hicolor/48x48/apps/preferences-certificates.png
+share/icons/hicolor/48x48/apps/preferences-composer.png
+share/icons/hicolor/48x48/apps/preferences-mail-accounts.png
+share/icons/hicolor/48x48/apps/preferences-mail.png
 share/icons/hicolor/scalable/apps/evolution.svg
+share/idl/evolution-%%VERSION%%/Composer.idl
+share/idl/evolution-%%VERSION%%/Evolution-Component.idl
+share/idl/evolution-%%VERSION%%/Evolution-Composer.idl
+share/idl/evolution-%%VERSION%%/Evolution-ConfigControl.idl
+share/idl/evolution-%%VERSION%%/Evolution-Mail.idl
+share/idl/evolution-%%VERSION%%/Evolution-Shell.idl
+share/idl/evolution-%%VERSION%%/Evolution.idl
+share/idl/evolution-%%VERSION%%/evolution-calendar.idl
 share/locale/am/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/ar/LC_MESSAGES/evolution-%%VERSION%%.mo
+share/locale/as/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/az/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/be/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/bg/LC_MESSAGES/evolution-%%VERSION%%.mo
@@ -1314,6 +1677,7 @@ share/locale/pt_BR/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/ro/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/ru/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/rw/LC_MESSAGES/evolution-%%VERSION%%.mo
+share/locale/si/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/sk/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/sl/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/sq/LC_MESSAGES/evolution-%%VERSION%%.mo
@@ -1331,78 +1695,104 @@ share/locale/xh/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/zh_CN/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/zh_HK/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/zh_TW/LC_MESSAGES/evolution-%%VERSION%%.mo
-@dirrm share/gnome/omf/evolution
-@dirrm share/gnome/idl/evolution-%%VERSION%%
+share/mime-info/evolution.keys
+share/mime-info/evolution.mime
+share/omf/evolution/evolution-C.omf
+share/omf/evolution/evolution-de.omf
+share/omf/evolution/evolution-el.omf
+share/omf/evolution/evolution-en_GB.omf
+share/omf/evolution/evolution-es.omf
+share/omf/evolution/evolution-fr.omf
+share/omf/evolution/evolution-oc.omf
+share/omf/evolution/evolution-ru.omf
+share/omf/evolution/evolution-sv.omf
+@dirrm share/omf/evolution
+@dirrm share/idl/evolution-%%VERSION%%
 @dirrm share/gnome/help/evolution/sv/figures
 @dirrm share/gnome/help/evolution/sv
 @dirrm share/gnome/help/evolution/ru/figures
 @dirrm share/gnome/help/evolution/ru
+@dirrm share/gnome/help/evolution/oc/figures
+@dirrm share/gnome/help/evolution/oc
 @dirrm share/gnome/help/evolution/fr/figures
 @dirrm share/gnome/help/evolution/fr
 @dirrm share/gnome/help/evolution/es/figures
 @dirrm share/gnome/help/evolution/es
 @dirrm share/gnome/help/evolution/en_GB/figures
 @dirrm share/gnome/help/evolution/en_GB
+@dirrm share/gnome/help/evolution/el/figures
+@dirrm share/gnome/help/evolution/el
 @dirrm share/gnome/help/evolution/de/figures
 @dirrm share/gnome/help/evolution/de
 @dirrm share/gnome/help/evolution/C/figures
 @dirrm share/gnome/help/evolution/C
 @dirrm share/gnome/help/evolution
-@dirrm share/gnome/evolution/%%VERSION%%/weather
-@dirrm share/gnome/evolution/%%VERSION%%/views/tasks
-@dirrm share/gnome/evolution/%%VERSION%%/views/memos
-@dirrm share/gnome/evolution/%%VERSION%%/views/mail
-@dirrm share/gnome/evolution/%%VERSION%%/views/calendar
-@dirrm share/gnome/evolution/%%VERSION%%/views/addressbook
-@dirrm share/gnome/evolution/%%VERSION%%/views
-@dirrm share/gnome/evolution/%%VERSION%%/ui
-@dirrm share/gnome/evolution/%%VERSION%%/images
-@dirrm share/gnome/evolution/%%VERSION%%/help/quickref/sv
-@dirrm share/gnome/evolution/%%VERSION%%/help/quickref/es
-@dirrm share/gnome/evolution/%%VERSION%%/help/quickref/de
-@dirrm share/gnome/evolution/%%VERSION%%/help/quickref/C
-@dirrm share/gnome/evolution/%%VERSION%%/help/quickref
-@dirrm share/gnome/evolution/%%VERSION%%/help
-@dirrm share/gnome/evolution/%%VERSION%%/glade
-@dirrm share/gnome/evolution/%%VERSION%%/etspec
-@dirrm share/gnome/evolution/%%VERSION%%/errors
-@dirrm share/gnome/evolution/%%VERSION%%/ecps
-@dirrm share/gnome/evolution/%%VERSION%%/default/zh_CN/mail/local
-@dirrm share/gnome/evolution/%%VERSION%%/default/zh_CN/mail
-@dirrm share/gnome/evolution/%%VERSION%%/default/zh_CN
-@dirrm share/gnome/evolution/%%VERSION%%/default/pt/mail/local
-@dirrm share/gnome/evolution/%%VERSION%%/default/pt/mail
-@dirrm share/gnome/evolution/%%VERSION%%/default/pt
-@dirrm share/gnome/evolution/%%VERSION%%/default/nl/mail/local
-@dirrm share/gnome/evolution/%%VERSION%%/default/nl/mail
-@dirrm share/gnome/evolution/%%VERSION%%/default/nl
-@dirrm share/gnome/evolution/%%VERSION%%/default/mk/mail/local
-@dirrm share/gnome/evolution/%%VERSION%%/default/mk/mail
-@dirrm share/gnome/evolution/%%VERSION%%/default/mk
-@dirrm share/gnome/evolution/%%VERSION%%/default/lt/mail/local
-@dirrm share/gnome/evolution/%%VERSION%%/default/lt/mail
-@dirrm share/gnome/evolution/%%VERSION%%/default/lt
-@dirrm share/gnome/evolution/%%VERSION%%/default/ja/mail/local
-@dirrm share/gnome/evolution/%%VERSION%%/default/ja/mail
-@dirrm share/gnome/evolution/%%VERSION%%/default/ja
-@dirrm share/gnome/evolution/%%VERSION%%/default/fr/mail/local
-@dirrm share/gnome/evolution/%%VERSION%%/default/fr/mail
-@dirrm share/gnome/evolution/%%VERSION%%/default/fr
-@dirrm share/gnome/evolution/%%VERSION%%/default/fi/mail/local
-@dirrm share/gnome/evolution/%%VERSION%%/default/fi/mail
-@dirrm share/gnome/evolution/%%VERSION%%/default/fi
-@dirrm share/gnome/evolution/%%VERSION%%/default/es/mail/local
-@dirrm share/gnome/evolution/%%VERSION%%/default/es/mail
-@dirrm share/gnome/evolution/%%VERSION%%/default/es
-@dirrm share/gnome/evolution/%%VERSION%%/default/de/mail/local
-@dirrm share/gnome/evolution/%%VERSION%%/default/de/mail
-@dirrm share/gnome/evolution/%%VERSION%%/default/de
-@dirrm share/gnome/evolution/%%VERSION%%/default/C/mail/local
-@dirrm share/gnome/evolution/%%VERSION%%/default/C/mail
-@dirrm share/gnome/evolution/%%VERSION%%/default/C
-@dirrm share/gnome/evolution/%%VERSION%%/default
-@dirrm share/gnome/evolution/%%VERSION%%
-@dirrm share/gnome/evolution
+@dirrm %%DATADIR%%/%%VERSION%%/weather
+@dirrm %%DATADIR%%/%%VERSION%%/views/tasks
+@dirrm %%DATADIR%%/%%VERSION%%/views/memos
+@dirrm %%DATADIR%%/%%VERSION%%/views/mail
+@dirrm %%DATADIR%%/%%VERSION%%/views/calendar
+@dirrm %%DATADIR%%/%%VERSION%%/views/addressbook
+@dirrm %%DATADIR%%/%%VERSION%%/views
+@dirrm %%DATADIR%%/%%VERSION%%/ui
+@dirrm %%DATADIR%%/%%VERSION%%/images
+@dirrm %%DATADIR%%/%%VERSION%%/help/quickref/sv
+@dirrm %%DATADIR%%/%%VERSION%%/help/quickref/sq
+@dirrm %%DATADIR%%/%%VERSION%%/help/quickref/pt
+@dirrm %%DATADIR%%/%%VERSION%%/help/quickref/pl
+@dirrm %%DATADIR%%/%%VERSION%%/help/quickref/it
+@dirrm %%DATADIR%%/%%VERSION%%/help/quickref/fr
+@dirrm %%DATADIR%%/%%VERSION%%/help/quickref/es
+@dirrm %%DATADIR%%/%%VERSION%%/help/quickref/de
+@dirrm %%DATADIR%%/%%VERSION%%/help/quickref/C
+@dirrm %%DATADIR%%/%%VERSION%%/help/quickref
+@dirrm %%DATADIR%%/%%VERSION%%/help
+@dirrm %%DATADIR%%/%%VERSION%%/glade
+@dirrm %%DATADIR%%/%%VERSION%%/etspec
+@dirrm %%DATADIR%%/%%VERSION%%/errors
+@dirrm %%DATADIR%%/%%VERSION%%/ecps
+@dirrm %%DATADIR%%/%%VERSION%%/default/zh_CN/mail/local
+@dirrm %%DATADIR%%/%%VERSION%%/default/zh_CN/mail
+@dirrm %%DATADIR%%/%%VERSION%%/default/zh_CN
+@dirrm %%DATADIR%%/%%VERSION%%/default/sv/mail/local
+@dirrm %%DATADIR%%/%%VERSION%%/default/sv/mail
+@dirrm %%DATADIR%%/%%VERSION%%/default/sv
+@dirrm %%DATADIR%%/%%VERSION%%/default/pt/mail/local
+@dirrm %%DATADIR%%/%%VERSION%%/default/pt/mail
+@dirrm %%DATADIR%%/%%VERSION%%/default/pt
+@dirrm %%DATADIR%%/%%VERSION%%/default/pl/mail/local
+@dirrm %%DATADIR%%/%%VERSION%%/default/pl/mail
+@dirrm %%DATADIR%%/%%VERSION%%/default/pl
+@dirrm %%DATADIR%%/%%VERSION%%/default/nl/mail/local
+@dirrm %%DATADIR%%/%%VERSION%%/default/nl/mail
+@dirrm %%DATADIR%%/%%VERSION%%/default/nl
+@dirrm %%DATADIR%%/%%VERSION%%/default/mk/mail/local
+@dirrm %%DATADIR%%/%%VERSION%%/default/mk/mail
+@dirrm %%DATADIR%%/%%VERSION%%/default/mk
+@dirrm %%DATADIR%%/%%VERSION%%/default/lt/mail/local
+@dirrm %%DATADIR%%/%%VERSION%%/default/lt/mail
+@dirrm %%DATADIR%%/%%VERSION%%/default/lt
+@dirrm %%DATADIR%%/%%VERSION%%/default/ja/mail/local
+@dirrm %%DATADIR%%/%%VERSION%%/default/ja/mail
+@dirrm %%DATADIR%%/%%VERSION%%/default/ja
+@dirrm %%DATADIR%%/%%VERSION%%/default/fr/mail/local
+@dirrm %%DATADIR%%/%%VERSION%%/default/fr/mail
+@dirrm %%DATADIR%%/%%VERSION%%/default/fr
+@dirrm %%DATADIR%%/%%VERSION%%/default/fi/mail/local
+@dirrm %%DATADIR%%/%%VERSION%%/default/fi/mail
+@dirrm %%DATADIR%%/%%VERSION%%/default/fi
+@dirrm %%DATADIR%%/%%VERSION%%/default/es/mail/local
+@dirrm %%DATADIR%%/%%VERSION%%/default/es/mail
+@dirrm %%DATADIR%%/%%VERSION%%/default/es
+@dirrm %%DATADIR%%/%%VERSION%%/default/de/mail/local
+@dirrm %%DATADIR%%/%%VERSION%%/default/de/mail
+@dirrm %%DATADIR%%/%%VERSION%%/default/de
+@dirrm %%DATADIR%%/%%VERSION%%/default/C/mail/local
+@dirrm %%DATADIR%%/%%VERSION%%/default/C/mail
+@dirrm %%DATADIR%%/%%VERSION%%/default/C
+@dirrm %%DATADIR%%/%%VERSION%%/default
+@dirrm %%DATADIR%%/%%VERSION%%
+@dirrm %%DATADIR%%
 @dirrm libexec/evolution/%%VERSION%%
 @dirrm libexec/evolution
 @dirrm lib/evolution/%%VERSION%%/plugins
@@ -1431,6 +1821,8 @@ share/locale/zh_TW/LC_MESSAGES/evolution-%%VERSION%%.mo
 @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
@@ -1443,3 +1835,6 @@ share/locale/zh_TW/LC_MESSAGES/evolution-%%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
+@dirrmtry share/applications
diff --git a/mail/gnubiff/Makefile b/mail/gnubiff/Makefile
index 155452b11db2..408e0e0c6c3a 100644
--- a/mail/gnubiff/Makefile
+++ b/mail/gnubiff/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gnubiff
 PORTVERSION=	2.2.6
+PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -51,12 +52,10 @@ WANT_GNOME=	yes
 .if ${HAVE_GNOME:Mgnomepanel}!=""
 USE_GNOME+=		gnomepanel gconf2 gnomeprefix gnomehack
 PKGNAMESUFFIX+=		-gnome
-PLIST_SUB+=		SHAREDIR="share/gnome"
 PLIST_SUB+=		BONOBODIR="libdata/bonobo"
 PLIST_SUB+=		WITH_GNOME=""
 .else
 CONFIGURE_ARGS+=	--disable-gnome
-PLIST_SUB+=		SHAREDIR="share"
 PLIST_SUB+=		BONOBODIR="lib/bonobo"
 PLIST_SUB+=		WITH_GNOME="@comment "
 .endif
diff --git a/mail/gnubiff/pkg-plist b/mail/gnubiff/pkg-plist
index 952565ac59bc..f934eabaac77 100644
--- a/mail/gnubiff/pkg-plist
+++ b/mail/gnubiff/pkg-plist
@@ -14,28 +14,28 @@ bin/gnubiff
 %%NLS%%share/locale/rw/LC_MESSAGES/gnubiff.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/gnubiff.mo
 %%NLS%%share/locale/vi/LC_MESSAGES/gnubiff.mo
-%%SHAREDIR%%/gnubiff/applet-gtk.glade
-%%SHAREDIR%%/gnubiff/authentication.glade
-%%SHAREDIR%%/gnubiff/certificate.glade
-%%SHAREDIR%%/gnubiff/coin.wav
-%%SHAREDIR%%/gnubiff/envelopes.png
-%%SHAREDIR%%/gnubiff/gnubiff.png
-%%SHAREDIR%%/gnubiff/mail.wav
-%%SHAREDIR%%/gnubiff/popup.glade
-%%SHAREDIR%%/gnubiff/preferences.glade
-%%SHAREDIR%%/gnubiff/properties.glade
-%%SHAREDIR%%/gnubiff/tux-awake.png
-%%SHAREDIR%%/gnubiff/tux-big.png
-%%SHAREDIR%%/gnubiff/tux-jump(64x64).png
-%%SHAREDIR%%/gnubiff/tux-sleep(64x64).png
-%%SHAREDIR%%/gnubiff/tux-sleep.png
-%%SHAREDIR%%/pixmaps/gnubiff.png
+share/gnubiff/applet-gtk.glade
+share/gnubiff/authentication.glade
+share/gnubiff/certificate.glade
+share/gnubiff/coin.wav
+share/gnubiff/envelopes.png
+share/gnubiff/gnubiff.png
+share/gnubiff/mail.wav
+share/gnubiff/popup.glade
+share/gnubiff/preferences.glade
+share/gnubiff/properties.glade
+share/gnubiff/tux-awake.png
+share/gnubiff/tux-big.png
+share/gnubiff/tux-jump(64x64).png
+share/gnubiff/tux-sleep(64x64).png
+share/gnubiff/tux-sleep.png
+share/pixmaps/gnubiff.png
 %%WITH_GNOME%%%%BONOBODIR%%/servers/GNOME_gnubiffApplet.server
-%%WITH_GNOME%%%%SHAREDIR%%/gnome-2.0/ui/GNOME_gnubiffApplet.xml
+%%WITH_GNOME%%share/gnome-2.0/ui/GNOME_gnubiffApplet.xml
 @dirrmtry %%BONOBODIR%%/servers
 @dirrmtry %%BONOBODIR%%
-@dirrmtry %%SHAREDIR%%/gnome-2.0/ui
-@dirrmtry %%SHAREDIR%%/gnome-2.0
+@dirrmtry share/gnome-2.0/ui
+@dirrmtry share/gnome-2.0
 %%NLS%%@dirrmtry share/locale/fr_CA/LC_MESSAGES
 %%NLS%%@dirrmtry share/locale/fr_CA
-@dirrm %%SHAREDIR%%/gnubiff
+@dirrm share/gnubiff
diff --git a/mail/mail-notification/Makefile b/mail/mail-notification/Makefile
index 13f08bdfb4db..553606a4760a 100644
--- a/mail/mail-notification/Makefile
+++ b/mail/mail-notification/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mail-notification
 DISTVERSION=	4.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	mail ipv6
 MASTER_SITES=	${MASTER_SITE_SAVANNAH}
 MASTER_SITE_SUBDIR=	mailnotify
diff --git a/mail/mail-notification/pkg-plist b/mail/mail-notification/pkg-plist
index f8656893f675..fc5cfa7cac38 100644
--- a/mail/mail-notification/pkg-plist
+++ b/mail/mail-notification/pkg-plist
@@ -2,7 +2,7 @@ bin/mail-notification
 etc/xdg/autostart/mail-notification.desktop
 libdata/bonobo/servers/GNOME_MailNotification.server
 %%EVOLUTION%%libdata/bonobo/servers/GNOME_MailNotification_Evolution.server
-share/gnome/applications/mail-notification-properties.desktop
+share/applications/mail-notification-properties.desktop
 share/gnome/help/mail-notification/C/documentation-license.xml
 share/gnome/help/mail-notification/C/figures/mail.png
 share/gnome/help/mail-notification/C/figures/mailbox-emblem-error.png
@@ -10,11 +10,11 @@ share/gnome/help/mail-notification/C/figures/mailbox-emblem-polled.png
 share/gnome/help/mail-notification/C/figures/mailbox-emblem-unknown.png
 share/gnome/help/mail-notification/C/mail-notification.xml
 share/gnome/help/mail-notification/C/software-license.xml
-%%GMAIL%%share/gnome/mail-notification/ui/gmail.png
-share/gnome/mail-notification/ui/logo.png
-share/gnome/mail-notification/ui/mailbox-properties-dialog.glade
-share/gnome/mail-notification/ui/properties-dialog.glade
-share/gnome/omf/mail-notification/mail-notification-C.omf
+%%GMAIL%%share/mail-notification/ui/gmail.png
+share/mail-notification/ui/logo.png
+share/mail-notification/ui/mailbox-properties-dialog.glade
+share/mail-notification/ui/properties-dialog.glade
+share/omf/mail-notification/mail-notification-C.omf
 share/icons/hicolor/16x16/apps/mail-notification.png
 share/icons/hicolor/22x22/apps/mail-notification.png
 share/icons/hicolor/24x24/apps/mail-notification.png
@@ -39,10 +39,11 @@ share/locale/sv/LC_MESSAGES/mail-notification.mo
 %%EVOLUTION%%lib/evolution/%%EVO_VERSION%%/plugins/liborg-gnome-mail-notification.la
 %%EVOLUTION%%lib/evolution/%%EVO_VERSION%%/plugins/liborg-gnome-mail-notification.so
 %%EVOLUTION%%lib/evolution/%%EVO_VERSION%%/plugins/org-gnome-mail-notification.eplug
-@dirrm share/gnome/omf/mail-notification
-@dirrm share/gnome/mail-notification/ui
-@dirrm share/gnome/mail-notification
+@dirrm share/omf/mail-notification
+@dirrm share/mail-notification/ui
+@dirrm share/mail-notification
 @dirrm share/gnome/help/mail-notification/C/figures
 @dirrm share/gnome/help/mail-notification/C
 @dirrm share/gnome/help/mail-notification
 @dirrmtry etc/xdg/autostart
+@dirrmtry share/applications
diff --git a/mail/mboxcheck-applet/Makefile b/mail/mboxcheck-applet/Makefile
index 9f514af50bdf..d996da232df1 100644
--- a/mail/mboxcheck-applet/Makefile
+++ b/mail/mboxcheck-applet/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	mboxcheck-applet
 PORTVERSION=	0.3
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	mail
 MASTER_SITES=	http://perso.orange.fr/seb128/fichiers/
 
@@ -21,14 +21,14 @@ NO_BUILD=	yes
 
 do-patch:
 	@${REINPLACE_CMD} 's|/usr/bin/python|${PYTHON_CMD}|' ${WRKSRC}/*.py
-	@${REINPLACE_CMD} 's|/usr/share/pixmaps/|${LOCALBASE}/share/gnome/pixmaps/|' ${WRKSRC}/mboxcheck.py
+	@${REINPLACE_CMD} 's|/usr/share/pixmaps/|${LOCALBASE}/share/pixmaps/|' ${WRKSRC}/mboxcheck.py
 	@${REINPLACE_CMD} 's|/usr/lib/gnome-panel/mboxcheck|${LOCALBASE}/libexec/mboxcheck.py|' ${WRKSRC}/GNOME_MboxCheck.server
 	@${REINPLACE_CMD} 's|mbox.png|mboxcheck.png|' ${WRKSRC}/GNOME_MboxCheck.server
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/mboxcheck.py ${LOCALBASE}/libexec
 	${INSTALL_SCRIPT} ${WRKSRC}/configmbox.py ${LOCALBASE}/libexec
-	${INSTALL_DATA} ${WRKSRC}/mboxcheck.png ${LOCALBASE}/share/gnome/pixmaps
+	${INSTALL_DATA} ${WRKSRC}/mboxcheck.png ${LOCALBASE}/share/pixmaps
 	${INSTALL_DATA} ${WRKSRC}/GNOME_MboxCheck.server ${LOCALBASE}/libdata/bonobo/servers
 
 .include <bsd.port.mk>
diff --git a/mail/mboxcheck-applet/pkg-plist b/mail/mboxcheck-applet/pkg-plist
index 5a8f4a097705..a3b2c7c3c547 100644
--- a/mail/mboxcheck-applet/pkg-plist
+++ b/mail/mboxcheck-applet/pkg-plist
@@ -1,4 +1,4 @@
 libdata/bonobo/servers/GNOME_MboxCheck.server
 libexec/mboxcheck.py
 libexec/configmbox.py
-share/gnome/pixmaps/mboxcheck.png
+share/pixmaps/mboxcheck.png
diff --git a/mail/mmc/Makefile b/mail/mmc/Makefile
index bc1af6b2ca37..ab752be2f045 100644
--- a/mail/mmc/Makefile
+++ b/mail/mmc/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mmc
 PORTVERSION=	0.5
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	mail gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/mail/mmc/pkg-plist b/mail/mmc/pkg-plist
index 9754fe544799..3222bdebb7b5 100644
--- a/mail/mmc/pkg-plist
+++ b/mail/mmc/pkg-plist
@@ -1,4 +1,4 @@
 bin/mmc
 share/gnome/apps/Internet/mmc.desktop
-share/gnome/pixmaps/mmc-logo.png
 share/locale/de/LC_MESSAGES/mmc.mo
+share/pixmaps/mmc-logo.png
diff --git a/mail/pmail/Makefile b/mail/pmail/Makefile
index 8199bfd88de3..f5b3ef1ca703 100644
--- a/mail/pmail/Makefile
+++ b/mail/pmail/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	pmail
 PORTVERSION=	0.5.3
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	mail python gnome
 MASTER_SITES=	# previous mastersites disappeared in 2001 and 2002
 
diff --git a/mail/pmail/pkg-plist b/mail/pmail/pkg-plist
index c1e42fe7968b..71f0dca9f63d 100644
--- a/mail/pmail/pkg-plist
+++ b/mail/pmail/pkg-plist
@@ -1,157 +1,157 @@
 bin/pmail
-share/gnome/pmail/Base.py
-share/gnome/pmail/Base.pyc
-share/gnome/pmail/Base.pyo
-share/gnome/pmail/MessageList.py
-share/gnome/pmail/MessageList.pyc
-share/gnome/pmail/MessageList.pyo
-share/gnome/pmail/MimeWriter.py
-share/gnome/pmail/MimeWriter.pyc
-share/gnome/pmail/MimeWriter.pyo
-share/gnome/pmail/PmailGtkXmHTML.py
-share/gnome/pmail/PmailGtkXmHTML.pyc
-share/gnome/pmail/PmailGtkXmHTML.pyo
-share/gnome/pmail/_pmailextensionsmodule.so
-share/gnome/pmail/config/Config.py
-share/gnome/pmail/config/Config.pyc
-share/gnome/pmail/config/Config.pyo
-share/gnome/pmail/config/__init__.py
-share/gnome/pmail/config/__init__.pyc
-share/gnome/pmail/config/__init__.pyo
-share/gnome/pmail/config/paths.py
-share/gnome/pmail/config/paths.pyc
-share/gnome/pmail/config/paths.pyo
-share/gnome/pmail/dumpconfig.py
-share/gnome/pmail/dumpconfig.pyc
-share/gnome/pmail/dumpconfig.pyo
-share/gnome/pmail/gtkf/Compose.py
-share/gnome/pmail/gtkf/Compose.pyc
-share/gnome/pmail/gtkf/Compose.pyo
-share/gnome/pmail/gtkf/FrontEnd.py
-share/gnome/pmail/gtkf/FrontEnd.pyc
-share/gnome/pmail/gtkf/FrontEnd.pyo
-share/gnome/pmail/gtkf/GladeWindow.py
-share/gnome/pmail/gtkf/GladeWindow.pyc
-share/gnome/pmail/gtkf/GladeWindow.pyo
-share/gnome/pmail/gtkf/MainWindow.py
-share/gnome/pmail/gtkf/MainWindow.pyc
-share/gnome/pmail/gtkf/MainWindow.pyo
-share/gnome/pmail/gtkf/MessageList.py
-share/gnome/pmail/gtkf/MessageList.pyc
-share/gnome/pmail/gtkf/MessageList.pyo
-share/gnome/pmail/gtkf/MozillaMsgWindow.py
-share/gnome/pmail/gtkf/MozillaMsgWindow.pyc
-share/gnome/pmail/gtkf/MozillaMsgWindow.pyo
-share/gnome/pmail/gtkf/MsgWindow.py
-share/gnome/pmail/gtkf/MsgWindow.pyc
-share/gnome/pmail/gtkf/MsgWindow.pyo
-share/gnome/pmail/gtkf/Preferences.py
-share/gnome/pmail/gtkf/Preferences.pyc
-share/gnome/pmail/gtkf/Preferences.pyo
-share/gnome/pmail/gtkf/ProgressBar.py
-share/gnome/pmail/gtkf/ProgressBar.pyc
-share/gnome/pmail/gtkf/ProgressBar.pyo
-share/gnome/pmail/gtkf/SMessageWindow.py
-share/gnome/pmail/gtkf/SMessageWindow.pyc
-share/gnome/pmail/gtkf/SMessageWindow.pyo
-share/gnome/pmail/gtkf/SearchMessages.py
-share/gnome/pmail/gtkf/SearchMessages.pyc
-share/gnome/pmail/gtkf/SearchMessages.pyo
-share/gnome/pmail/gtkf/Spell.py
-share/gnome/pmail/gtkf/Spell.pyc
-share/gnome/pmail/gtkf/Spell.pyo
-share/gnome/pmail/gtkf/TextMsgWindow.py
-share/gnome/pmail/gtkf/TextMsgWindow.pyc
-share/gnome/pmail/gtkf/TextMsgWindow.pyo
-share/gnome/pmail/gtkf/TreeWindow.py
-share/gnome/pmail/gtkf/TreeWindow.pyc
-share/gnome/pmail/gtkf/TreeWindow.pyo
-share/gnome/pmail/gtkf/XmHTMLMsgWindow.py
-share/gnome/pmail/gtkf/XmHTMLMsgWindow.pyc
-share/gnome/pmail/gtkf/XmHTMLMsgWindow.pyo
-share/gnome/pmail/gtkf/__init__.py
-share/gnome/pmail/gtkf/__init__.pyc
-share/gnome/pmail/gtkf/__init__.pyo
-share/gnome/pmail/gtkf/all.glade
-share/gnome/pmail/gtkf/gnomeapp.glade
-share/gnome/pmail/gtkf/gutil.py
-share/gnome/pmail/gtkf/gutil.pyc
-share/gnome/pmail/gtkf/gutil.pyo
-share/gnome/pmail/gtkf/mygnome.py
-share/gnome/pmail/gtkf/mygnome.pyc
-share/gnome/pmail/gtkf/mygnome.pyo
-share/gnome/pmail/gtkf/update.py
-share/gnome/pmail/gtkf/update.pyc
-share/gnome/pmail/gtkf/update.pyo
-share/gnome/pmail/imaplib.py
-share/gnome/pmail/imaplib.pyc
-share/gnome/pmail/imaplib.pyo
-share/gnome/pmail/mail/IMAP.py
-share/gnome/pmail/mail/IMAP.pyc
-share/gnome/pmail/mail/IMAP.pyo
-share/gnome/pmail/mail/MH.py
-share/gnome/pmail/mail/MH.pyc
-share/gnome/pmail/mail/MH.pyo
-share/gnome/pmail/mail/Mailbox.py
-share/gnome/pmail/mail/Mailbox.pyc
-share/gnome/pmail/mail/Mailbox.pyo
-share/gnome/pmail/mail/Message.py
-share/gnome/pmail/mail/Message.pyc
-share/gnome/pmail/mail/Message.pyo
-share/gnome/pmail/mail/NewMessage.py
-share/gnome/pmail/mail/NewMessage.pyc
-share/gnome/pmail/mail/NewMessage.pyo
-share/gnome/pmail/mail/POP.py
-share/gnome/pmail/mail/POP.pyc
-share/gnome/pmail/mail/POP.pyo
-share/gnome/pmail/mail/Plugin.py
-share/gnome/pmail/mail/Plugin.pyc
-share/gnome/pmail/mail/Plugin.pyo
-share/gnome/pmail/mail/SearchCriteria.py
-share/gnome/pmail/mail/SearchCriteria.pyc
-share/gnome/pmail/mail/SearchCriteria.pyo
-share/gnome/pmail/mail/Source.py
-share/gnome/pmail/mail/Source.pyc
-share/gnome/pmail/mail/Source.pyo
-share/gnome/pmail/mail/SpoolFile.py
-share/gnome/pmail/mail/SpoolFile.pyc
-share/gnome/pmail/mail/SpoolFile.pyo
-share/gnome/pmail/mail/__init__.py
-share/gnome/pmail/mail/__init__.pyc
-share/gnome/pmail/mail/__init__.pyo
-share/gnome/pmail/mail/config_hooks.py
-share/gnome/pmail/mail/config_hooks.pyc
-share/gnome/pmail/mail/config_hooks.pyo
-share/gnome/pmail/mail/pmailmailbox.py
-share/gnome/pmail/mail/pmailmailbox.pyc
-share/gnome/pmail/mail/pmailmailbox.pyo
-share/gnome/pmail/mail/util.py
-share/gnome/pmail/mail/util.pyc
-share/gnome/pmail/mail/util.pyo
-share/gnome/pmail/main.py
-share/gnome/pmail/main.pyc
-share/gnome/pmail/main.pyo
-share/gnome/pmail/plugins/Filters.py
-share/gnome/pmail/plugins/Filters.pyc
-share/gnome/pmail/plugins/Filters.pyo
-share/gnome/pmail/plugins/HtmlViewer.py
-share/gnome/pmail/plugins/HtmlViewer.pyc
-share/gnome/pmail/plugins/HtmlViewer.pyo
-share/gnome/pmail/plugins/__init__.py
-share/gnome/pmail/plugins/__init__.pyc
-share/gnome/pmail/plugins/__init__.pyo
-share/gnome/pmail/plugins/filters.glade
-share/gnome/pmail/plugins/myf.py
-share/gnome/pmail/plugins/myf.pyc
-share/gnome/pmail/plugins/myf.pyo
-share/gnome/pmail/pmailmimify.py
-share/gnome/pmail/pmailmimify.pyc
-share/gnome/pmail/pmailmimify.pyo
-share/gnome/pmail/posixfile.py
-share/gnome/pmail/posixfile.pyc
-share/gnome/pmail/posixfile.pyo
-@dirrm share/gnome/pmail/plugins
-@dirrm share/gnome/pmail/mail
-@dirrm share/gnome/pmail/gtkf
-@dirrm share/gnome/pmail/config
-@dirrm share/gnome/pmail
+share/pmail/Base.py
+share/pmail/Base.pyc
+share/pmail/Base.pyo
+share/pmail/MessageList.py
+share/pmail/MessageList.pyc
+share/pmail/MessageList.pyo
+share/pmail/MimeWriter.py
+share/pmail/MimeWriter.pyc
+share/pmail/MimeWriter.pyo
+share/pmail/PmailGtkXmHTML.py
+share/pmail/PmailGtkXmHTML.pyc
+share/pmail/PmailGtkXmHTML.pyo
+share/pmail/_pmailextensionsmodule.so
+share/pmail/config/Config.py
+share/pmail/config/Config.pyc
+share/pmail/config/Config.pyo
+share/pmail/config/__init__.py
+share/pmail/config/__init__.pyc
+share/pmail/config/__init__.pyo
+share/pmail/config/paths.py
+share/pmail/config/paths.pyc
+share/pmail/config/paths.pyo
+share/pmail/dumpconfig.py
+share/pmail/dumpconfig.pyc
+share/pmail/dumpconfig.pyo
+share/pmail/gtkf/Compose.py
+share/pmail/gtkf/Compose.pyc
+share/pmail/gtkf/Compose.pyo
+share/pmail/gtkf/FrontEnd.py
+share/pmail/gtkf/FrontEnd.pyc
+share/pmail/gtkf/FrontEnd.pyo
+share/pmail/gtkf/GladeWindow.py
+share/pmail/gtkf/GladeWindow.pyc
+share/pmail/gtkf/GladeWindow.pyo
+share/pmail/gtkf/MainWindow.py
+share/pmail/gtkf/MainWindow.pyc
+share/pmail/gtkf/MainWindow.pyo
+share/pmail/gtkf/MessageList.py
+share/pmail/gtkf/MessageList.pyc
+share/pmail/gtkf/MessageList.pyo
+share/pmail/gtkf/MozillaMsgWindow.py
+share/pmail/gtkf/MozillaMsgWindow.pyc
+share/pmail/gtkf/MozillaMsgWindow.pyo
+share/pmail/gtkf/MsgWindow.py
+share/pmail/gtkf/MsgWindow.pyc
+share/pmail/gtkf/MsgWindow.pyo
+share/pmail/gtkf/Preferences.py
+share/pmail/gtkf/Preferences.pyc
+share/pmail/gtkf/Preferences.pyo
+share/pmail/gtkf/ProgressBar.py
+share/pmail/gtkf/ProgressBar.pyc
+share/pmail/gtkf/ProgressBar.pyo
+share/pmail/gtkf/SMessageWindow.py
+share/pmail/gtkf/SMessageWindow.pyc
+share/pmail/gtkf/SMessageWindow.pyo
+share/pmail/gtkf/SearchMessages.py
+share/pmail/gtkf/SearchMessages.pyc
+share/pmail/gtkf/SearchMessages.pyo
+share/pmail/gtkf/Spell.py
+share/pmail/gtkf/Spell.pyc
+share/pmail/gtkf/Spell.pyo
+share/pmail/gtkf/TextMsgWindow.py
+share/pmail/gtkf/TextMsgWindow.pyc
+share/pmail/gtkf/TextMsgWindow.pyo
+share/pmail/gtkf/TreeWindow.py
+share/pmail/gtkf/TreeWindow.pyc
+share/pmail/gtkf/TreeWindow.pyo
+share/pmail/gtkf/XmHTMLMsgWindow.py
+share/pmail/gtkf/XmHTMLMsgWindow.pyc
+share/pmail/gtkf/XmHTMLMsgWindow.pyo
+share/pmail/gtkf/__init__.py
+share/pmail/gtkf/__init__.pyc
+share/pmail/gtkf/__init__.pyo
+share/pmail/gtkf/all.glade
+share/pmail/gtkf/gnomeapp.glade
+share/pmail/gtkf/gutil.py
+share/pmail/gtkf/gutil.pyc
+share/pmail/gtkf/gutil.pyo
+share/pmail/gtkf/mygnome.py
+share/pmail/gtkf/mygnome.pyc
+share/pmail/gtkf/mygnome.pyo
+share/pmail/gtkf/update.py
+share/pmail/gtkf/update.pyc
+share/pmail/gtkf/update.pyo
+share/pmail/imaplib.py
+share/pmail/imaplib.pyc
+share/pmail/imaplib.pyo
+share/pmail/mail/IMAP.py
+share/pmail/mail/IMAP.pyc
+share/pmail/mail/IMAP.pyo
+share/pmail/mail/MH.py
+share/pmail/mail/MH.pyc
+share/pmail/mail/MH.pyo
+share/pmail/mail/Mailbox.py
+share/pmail/mail/Mailbox.pyc
+share/pmail/mail/Mailbox.pyo
+share/pmail/mail/Message.py
+share/pmail/mail/Message.pyc
+share/pmail/mail/Message.pyo
+share/pmail/mail/NewMessage.py
+share/pmail/mail/NewMessage.pyc
+share/pmail/mail/NewMessage.pyo
+share/pmail/mail/POP.py
+share/pmail/mail/POP.pyc
+share/pmail/mail/POP.pyo
+share/pmail/mail/Plugin.py
+share/pmail/mail/Plugin.pyc
+share/pmail/mail/Plugin.pyo
+share/pmail/mail/SearchCriteria.py
+share/pmail/mail/SearchCriteria.pyc
+share/pmail/mail/SearchCriteria.pyo
+share/pmail/mail/Source.py
+share/pmail/mail/Source.pyc
+share/pmail/mail/Source.pyo
+share/pmail/mail/SpoolFile.py
+share/pmail/mail/SpoolFile.pyc
+share/pmail/mail/SpoolFile.pyo
+share/pmail/mail/__init__.py
+share/pmail/mail/__init__.pyc
+share/pmail/mail/__init__.pyo
+share/pmail/mail/config_hooks.py
+share/pmail/mail/config_hooks.pyc
+share/pmail/mail/config_hooks.pyo
+share/pmail/mail/pmailmailbox.py
+share/pmail/mail/pmailmailbox.pyc
+share/pmail/mail/pmailmailbox.pyo
+share/pmail/mail/util.py
+share/pmail/mail/util.pyc
+share/pmail/mail/util.pyo
+share/pmail/main.py
+share/pmail/main.pyc
+share/pmail/main.pyo
+share/pmail/plugins/Filters.py
+share/pmail/plugins/Filters.pyc
+share/pmail/plugins/Filters.pyo
+share/pmail/plugins/HtmlViewer.py
+share/pmail/plugins/HtmlViewer.pyc
+share/pmail/plugins/HtmlViewer.pyo
+share/pmail/plugins/__init__.py
+share/pmail/plugins/__init__.pyc
+share/pmail/plugins/__init__.pyo
+share/pmail/plugins/filters.glade
+share/pmail/plugins/myf.py
+share/pmail/plugins/myf.pyc
+share/pmail/plugins/myf.pyo
+share/pmail/pmailmimify.py
+share/pmail/pmailmimify.pyc
+share/pmail/pmailmimify.pyo
+share/pmail/posixfile.py
+share/pmail/posixfile.pyc
+share/pmail/posixfile.pyo
+@dirrm share/pmail/plugins
+@dirrm share/pmail/mail
+@dirrm share/pmail/gtkf
+@dirrm share/pmail/config
+@dirrm share/pmail
diff --git a/math/drgeo/Makefile b/math/drgeo/Makefile
index 31d31043d52e..e0c0313b1601 100644
--- a/math/drgeo/Makefile
+++ b/math/drgeo/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	drgeo
 PORTVERSION=	1.1.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	math
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	ofset
diff --git a/math/drgeo/pkg-plist b/math/drgeo/pkg-plist
index ad409886016a..b7415ee86012 100644
--- a/math/drgeo/pkg-plist
+++ b/math/drgeo/pkg-plist
@@ -1,178 +1,178 @@
 bin/drgeo
 bin/tm_drgeo
-share/gnome/applications/drgeo.desktop
-share/gnome/drgeo/encode/latin1.ps
-share/gnome/drgeo/examples/figures/accel.big5.fgeo
-share/gnome/drgeo/examples/figures/accel.fgeo
-share/gnome/drgeo/examples/figures/angle-inscrit.fgeo
-share/gnome/drgeo/examples/figures/baballe.fgeo
-share/gnome/drgeo/examples/figures/braik_conic.fgeo
-share/gnome/drgeo/examples/figures/cercle-inscrit.fgeo
-share/gnome/drgeo/examples/figures/circle-locus.fgeo
-share/gnome/drgeo/examples/figures/conics.fgeo
-share/gnome/drgeo/examples/figures/duality.fgeo
-share/gnome/drgeo/examples/figures/euler-line.fgeo
-share/gnome/drgeo/examples/figures/fonctions_associees.fgeo
-share/gnome/drgeo/examples/figures/lens.fgeo
-share/gnome/drgeo/examples/figures/light6.fgeo
-share/gnome/drgeo/examples/figures/mercedes.fgeo
-share/gnome/drgeo/examples/figures/moyenne-prop.fgeo
-share/gnome/drgeo/examples/figures/orthocenter-locus.fgeo
-share/gnome/drgeo/examples/figures/orthocentre-symetique.fgeo
-share/gnome/drgeo/examples/figures/parallelogramme.fgeo
-share/gnome/drgeo/examples/figures/partage-segment.fgeo
-share/gnome/drgeo/examples/figures/polygon-7.fgeo
-share/gnome/drgeo/examples/figures/polygons.fgeo
-share/gnome/drgeo/examples/figures/problem1.fgeo
-share/gnome/drgeo/examples/figures/refraction.fgeo
-share/gnome/drgeo/examples/figures/saliera.fgeo
-share/gnome/drgeo/examples/figures/signed-distance.fgeo
-share/gnome/drgeo/examples/figures/sinusoide.fgeo
-share/gnome/drgeo/examples/figures/slope.fgeo
-share/gnome/drgeo/examples/figures/steiner_conic.fgeo
-share/gnome/drgeo/examples/figures/symmetry-axe-2.fgeo
-share/gnome/drgeo/examples/figures/symmetry-center.fgeo
-share/gnome/drgeo/examples/figures/triangle-scale.fgeo
-share/gnome/drgeo/examples/figures/triangle_rectangle1.fgeo
-share/gnome/drgeo/examples/figures/triangles-homothetiques.fgeo
-share/gnome/drgeo/examples/figures/trigo1.fgeo
-share/gnome/drgeo/examples/figures/varignon.fgeo
-share/gnome/drgeo/examples/figures/wheel.fgeo
-share/gnome/drgeo/examples/macros/bissectrice.mgeo
-share/gnome/drgeo/examples/macros/centre1.mgeo
-share/gnome/drgeo/examples/macros/orthocentre.mgeo
-share/gnome/drgeo/examples/macros/pentagone.mgeo
-share/gnome/drgeo/examples/macros/polygon-7.mgeo
-share/gnome/drgeo/examples/macros/segment.mgeo
-share/gnome/drgeo/examples/scheme/baravelle.scm
-share/gnome/drgeo/examples/scheme/baum.scm
-share/gnome/drgeo/examples/scheme/figure.scm
-share/gnome/drgeo/examples/scheme/fractale.scm
-share/gnome/drgeo/examples/scheme/koch.scm
-share/gnome/drgeo/examples/scheme/pappo.scm
-share/gnome/drgeo/examples/scheme/polygon.scm
-share/gnome/drgeo/examples/scheme/polygon2.scm
-share/gnome/drgeo/examples/scheme/premier.scm
-share/gnome/drgeo/examples/scheme/spiral.scm
-share/gnome/drgeo/examples/scheme/square.scm
-share/gnome/drgeo/examples/scheme/steiner.scm
-share/gnome/drgeo/examples/scheme/tilings.scm
-share/gnome/drgeo/glade/angle.png
-share/gnome/drgeo/glade/angle.xpm
-share/gnome/drgeo/glade/axial_symetry.png
-share/gnome/drgeo/glade/axial_symetry.xpm
-share/gnome/drgeo/glade/build_macro.png
-share/gnome/drgeo/glade/build_macro.xpm
-share/gnome/drgeo/glade/central_symetry.png
-share/gnome/drgeo/glade/central_symetry.xpm
-share/gnome/drgeo/glade/circle.png
-share/gnome/drgeo/glade/circle.xpm
-share/gnome/drgeo/glade/circle_arc.png
-share/gnome/drgeo/glade/circle_arc.xpm
-share/gnome/drgeo/glade/color-black.xpm
-share/gnome/drgeo/glade/color-blue.xpm
-share/gnome/drgeo/glade/color-bordeaux.xpm
-share/gnome/drgeo/glade/color-dark-blue.xpm
-share/gnome/drgeo/glade/color-dark-green.xpm
-share/gnome/drgeo/glade/color-dark-grey.xpm
-share/gnome/drgeo/glade/color-green.xpm
-share/gnome/drgeo/glade/color-grey.xpm
-share/gnome/drgeo/glade/color-orange.xpm
-share/gnome/drgeo/glade/color-red.xpm
-share/gnome/drgeo/glade/color-white.xpm
-share/gnome/drgeo/glade/color-yellow.xpm
-share/gnome/drgeo/glade/coordinates.png
-share/gnome/drgeo/glade/coordinates.xpm
-share/gnome/drgeo/glade/cross.xpm
-share/gnome/drgeo/glade/dashline.xpm
-share/gnome/drgeo/glade/distance.png
-share/gnome/drgeo/glade/distance.xpm
-share/gnome/drgeo/glade/drgenius2.glade
-share/gnome/drgeo/glade/drgenius_new_figure.xpm
-share/gnome/drgeo/glade/drgeo.png
-share/gnome/drgeo/glade/drgeo2.glade
-share/gnome/drgeo/glade/drgeoMDI.glade
-share/gnome/drgeo/glade/eraser.png
-share/gnome/drgeo/glade/eraser.xpm
-share/gnome/drgeo/glade/free_point.png
-share/gnome/drgeo/glade/free_point.xpm
-share/gnome/drgeo/glade/grid.png
-share/gnome/drgeo/glade/half_line.png
-share/gnome/drgeo/glade/half_line.xpm
-share/gnome/drgeo/glade/homothetie.png
-share/gnome/drgeo/glade/homothetie.xpm
-share/gnome/drgeo/glade/intersection_point.png
-share/gnome/drgeo/glade/intersection_point.xpm
-share/gnome/drgeo/glade/largeline.xpm
-share/gnome/drgeo/glade/line.png
-share/gnome/drgeo/glade/line.xpm
-share/gnome/drgeo/glade/line_menu.png
-share/gnome/drgeo/glade/line_menu.xpm
-share/gnome/drgeo/glade/load.xpm
-share/gnome/drgeo/glade/locus.png
-share/gnome/drgeo/glade/macro_menu.png
-share/gnome/drgeo/glade/macro_menu.xpm
-share/gnome/drgeo/glade/middle.png
-share/gnome/drgeo/glade/middle.xpm
-share/gnome/drgeo/glade/move.png
-share/gnome/drgeo/glade/move.xpm
-share/gnome/drgeo/glade/new_figure.xpm
-share/gnome/drgeo/glade/normalline.xpm
-share/gnome/drgeo/glade/numeric_menu.png
-share/gnome/drgeo/glade/numeric_menu.xpm
-share/gnome/drgeo/glade/parallel.png
-share/gnome/drgeo/glade/parallel.xpm
-share/gnome/drgeo/glade/perpendicular.png
-share/gnome/drgeo/glade/perpendicular.xpm
-share/gnome/drgeo/glade/point_coordinate.png
-share/gnome/drgeo/glade/point_coordinate.xpm
-share/gnome/drgeo/glade/point_menu.png
-share/gnome/drgeo/glade/point_menu.xpm
-share/gnome/drgeo/glade/polygon.png
-share/gnome/drgeo/glade/polygon.xpm
-share/gnome/drgeo/glade/preferences.xpm
-share/gnome/drgeo/glade/property.png
-share/gnome/drgeo/glade/property.xpm
-share/gnome/drgeo/glade/quit.xpm
-share/gnome/drgeo/glade/rename.png
-share/gnome/drgeo/glade/rotation.png
-share/gnome/drgeo/glade/rotation.xpm
-share/gnome/drgeo/glade/round-empty.xpm
-share/gnome/drgeo/glade/round.xpm
-share/gnome/drgeo/glade/run_macro.png
-share/gnome/drgeo/glade/run_macro.xpm
-share/gnome/drgeo/glade/save.xpm
-share/gnome/drgeo/glade/script.png
-share/gnome/drgeo/glade/script.xpm
-share/gnome/drgeo/glade/segment.png
-share/gnome/drgeo/glade/segment.xpm
-share/gnome/drgeo/glade/square-empty.xpm
-share/gnome/drgeo/glade/square.xpm
-share/gnome/drgeo/glade/styles.png
-share/gnome/drgeo/glade/styles.xpm
-share/gnome/drgeo/glade/tools_menu.png
-share/gnome/drgeo/glade/tools_menu.xpm
-share/gnome/drgeo/glade/transformation_menu.png
-share/gnome/drgeo/glade/transformation_menu.xpm
-share/gnome/drgeo/glade/translation.png
-share/gnome/drgeo/glade/translation.xpm
-share/gnome/drgeo/glade/triangle.xpm
-share/gnome/drgeo/glade/vectrex.png
-share/gnome/drgeo/glade/vectrex.xpm
-share/gnome/drgeo/glade/widget-script.png
-share/gnome/drgeo/glade/widget-script.xpm
-share/gnome/drgeo/scm/drgeo_config.scm
-share/gnome/drgeo/scm/drgeo_scm_interface.scm
-share/gnome/drgeo/scm/drgeo_scm_interface_constant.scm
-share/gnome/drgeo/scm/drgeo_scm_interface_constant_es.scm
-share/gnome/drgeo/scm/drgeo_scm_interface_constant_fr.scm
-share/gnome/drgeo/scm/drgeo_scm_interface_constant_nl.scm
-share/gnome/drgeo/scm/drgeo_scm_interface_constant_sr.scm
-share/gnome/drgeo/scm/preferences.scm
-share/gnome/pixmaps/drgeo-book.png
-share/gnome/pixmaps/drgeo-file.png
-share/gnome/pixmaps/ofset-logo.png
-share/gnome/texmacs/TeXmacs/plugins/drgeo/progs/init-drgeo.scm
+share/applications/drgeo.desktop
+share/drgeo/encode/latin1.ps
+share/drgeo/examples/figures/accel.big5.fgeo
+share/drgeo/examples/figures/accel.fgeo
+share/drgeo/examples/figures/angle-inscrit.fgeo
+share/drgeo/examples/figures/baballe.fgeo
+share/drgeo/examples/figures/braik_conic.fgeo
+share/drgeo/examples/figures/cercle-inscrit.fgeo
+share/drgeo/examples/figures/circle-locus.fgeo
+share/drgeo/examples/figures/conics.fgeo
+share/drgeo/examples/figures/duality.fgeo
+share/drgeo/examples/figures/euler-line.fgeo
+share/drgeo/examples/figures/fonctions_associees.fgeo
+share/drgeo/examples/figures/lens.fgeo
+share/drgeo/examples/figures/light6.fgeo
+share/drgeo/examples/figures/mercedes.fgeo
+share/drgeo/examples/figures/moyenne-prop.fgeo
+share/drgeo/examples/figures/orthocenter-locus.fgeo
+share/drgeo/examples/figures/orthocentre-symetique.fgeo
+share/drgeo/examples/figures/parallelogramme.fgeo
+share/drgeo/examples/figures/partage-segment.fgeo
+share/drgeo/examples/figures/polygon-7.fgeo
+share/drgeo/examples/figures/polygons.fgeo
+share/drgeo/examples/figures/problem1.fgeo
+share/drgeo/examples/figures/refraction.fgeo
+share/drgeo/examples/figures/saliera.fgeo
+share/drgeo/examples/figures/signed-distance.fgeo
+share/drgeo/examples/figures/sinusoide.fgeo
+share/drgeo/examples/figures/slope.fgeo
+share/drgeo/examples/figures/steiner_conic.fgeo
+share/drgeo/examples/figures/symmetry-axe-2.fgeo
+share/drgeo/examples/figures/symmetry-center.fgeo
+share/drgeo/examples/figures/triangle-scale.fgeo
+share/drgeo/examples/figures/triangle_rectangle1.fgeo
+share/drgeo/examples/figures/triangles-homothetiques.fgeo
+share/drgeo/examples/figures/trigo1.fgeo
+share/drgeo/examples/figures/varignon.fgeo
+share/drgeo/examples/figures/wheel.fgeo
+share/drgeo/examples/macros/bissectrice.mgeo
+share/drgeo/examples/macros/centre1.mgeo
+share/drgeo/examples/macros/orthocentre.mgeo
+share/drgeo/examples/macros/pentagone.mgeo
+share/drgeo/examples/macros/polygon-7.mgeo
+share/drgeo/examples/macros/segment.mgeo
+share/drgeo/examples/scheme/baravelle.scm
+share/drgeo/examples/scheme/baum.scm
+share/drgeo/examples/scheme/figure.scm
+share/drgeo/examples/scheme/fractale.scm
+share/drgeo/examples/scheme/koch.scm
+share/drgeo/examples/scheme/pappo.scm
+share/drgeo/examples/scheme/polygon.scm
+share/drgeo/examples/scheme/polygon2.scm
+share/drgeo/examples/scheme/premier.scm
+share/drgeo/examples/scheme/spiral.scm
+share/drgeo/examples/scheme/square.scm
+share/drgeo/examples/scheme/steiner.scm
+share/drgeo/examples/scheme/tilings.scm
+share/drgeo/glade/angle.png
+share/drgeo/glade/angle.xpm
+share/drgeo/glade/axial_symetry.png
+share/drgeo/glade/axial_symetry.xpm
+share/drgeo/glade/build_macro.png
+share/drgeo/glade/build_macro.xpm
+share/drgeo/glade/central_symetry.png
+share/drgeo/glade/central_symetry.xpm
+share/drgeo/glade/circle.png
+share/drgeo/glade/circle.xpm
+share/drgeo/glade/circle_arc.png
+share/drgeo/glade/circle_arc.xpm
+share/drgeo/glade/color-black.xpm
+share/drgeo/glade/color-blue.xpm
+share/drgeo/glade/color-bordeaux.xpm
+share/drgeo/glade/color-dark-blue.xpm
+share/drgeo/glade/color-dark-green.xpm
+share/drgeo/glade/color-dark-grey.xpm
+share/drgeo/glade/color-green.xpm
+share/drgeo/glade/color-grey.xpm
+share/drgeo/glade/color-orange.xpm
+share/drgeo/glade/color-red.xpm
+share/drgeo/glade/color-white.xpm
+share/drgeo/glade/color-yellow.xpm
+share/drgeo/glade/coordinates.png
+share/drgeo/glade/coordinates.xpm
+share/drgeo/glade/cross.xpm
+share/drgeo/glade/dashline.xpm
+share/drgeo/glade/distance.png
+share/drgeo/glade/distance.xpm
+share/drgeo/glade/drgenius2.glade
+share/drgeo/glade/drgenius_new_figure.xpm
+share/drgeo/glade/drgeo.png
+share/drgeo/glade/drgeo2.glade
+share/drgeo/glade/drgeoMDI.glade
+share/drgeo/glade/eraser.png
+share/drgeo/glade/eraser.xpm
+share/drgeo/glade/free_point.png
+share/drgeo/glade/free_point.xpm
+share/drgeo/glade/grid.png
+share/drgeo/glade/half_line.png
+share/drgeo/glade/half_line.xpm
+share/drgeo/glade/homothetie.png
+share/drgeo/glade/homothetie.xpm
+share/drgeo/glade/intersection_point.png
+share/drgeo/glade/intersection_point.xpm
+share/drgeo/glade/largeline.xpm
+share/drgeo/glade/line.png
+share/drgeo/glade/line.xpm
+share/drgeo/glade/line_menu.png
+share/drgeo/glade/line_menu.xpm
+share/drgeo/glade/load.xpm
+share/drgeo/glade/locus.png
+share/drgeo/glade/macro_menu.png
+share/drgeo/glade/macro_menu.xpm
+share/drgeo/glade/middle.png
+share/drgeo/glade/middle.xpm
+share/drgeo/glade/move.png
+share/drgeo/glade/move.xpm
+share/drgeo/glade/new_figure.xpm
+share/drgeo/glade/normalline.xpm
+share/drgeo/glade/numeric_menu.png
+share/drgeo/glade/numeric_menu.xpm
+share/drgeo/glade/parallel.png
+share/drgeo/glade/parallel.xpm
+share/drgeo/glade/perpendicular.png
+share/drgeo/glade/perpendicular.xpm
+share/drgeo/glade/point_coordinate.png
+share/drgeo/glade/point_coordinate.xpm
+share/drgeo/glade/point_menu.png
+share/drgeo/glade/point_menu.xpm
+share/drgeo/glade/polygon.png
+share/drgeo/glade/polygon.xpm
+share/drgeo/glade/preferences.xpm
+share/drgeo/glade/property.png
+share/drgeo/glade/property.xpm
+share/drgeo/glade/quit.xpm
+share/drgeo/glade/rename.png
+share/drgeo/glade/rotation.png
+share/drgeo/glade/rotation.xpm
+share/drgeo/glade/round-empty.xpm
+share/drgeo/glade/round.xpm
+share/drgeo/glade/run_macro.png
+share/drgeo/glade/run_macro.xpm
+share/drgeo/glade/save.xpm
+share/drgeo/glade/script.png
+share/drgeo/glade/script.xpm
+share/drgeo/glade/segment.png
+share/drgeo/glade/segment.xpm
+share/drgeo/glade/square-empty.xpm
+share/drgeo/glade/square.xpm
+share/drgeo/glade/styles.png
+share/drgeo/glade/styles.xpm
+share/drgeo/glade/tools_menu.png
+share/drgeo/glade/tools_menu.xpm
+share/drgeo/glade/transformation_menu.png
+share/drgeo/glade/transformation_menu.xpm
+share/drgeo/glade/translation.png
+share/drgeo/glade/translation.xpm
+share/drgeo/glade/triangle.xpm
+share/drgeo/glade/vectrex.png
+share/drgeo/glade/vectrex.xpm
+share/drgeo/glade/widget-script.png
+share/drgeo/glade/widget-script.xpm
+share/drgeo/scm/drgeo_config.scm
+share/drgeo/scm/drgeo_scm_interface.scm
+share/drgeo/scm/drgeo_scm_interface_constant.scm
+share/drgeo/scm/drgeo_scm_interface_constant_es.scm
+share/drgeo/scm/drgeo_scm_interface_constant_fr.scm
+share/drgeo/scm/drgeo_scm_interface_constant_nl.scm
+share/drgeo/scm/drgeo_scm_interface_constant_sr.scm
+share/drgeo/scm/preferences.scm
+share/pixmaps/drgeo-book.png
+share/pixmaps/drgeo-file.png
+share/pixmaps/ofset-logo.png
+share/texmacs/TeXmacs/plugins/drgeo/progs/init-drgeo.scm
 share/locale/az/LC_MESSAGES/drgeo.mo
 share/locale/ca/LC_MESSAGES/drgeo.mo
 share/locale/cs/LC_MESSAGES/drgeo.mo
@@ -211,20 +211,21 @@ share/locale/sv/LC_MESSAGES/drgeo.mo
 share/locale/uk/LC_MESSAGES/drgeo.mo
 share/locale/zh_CN/LC_MESSAGES/drgeo.mo
 share/locale/zh_TW/LC_MESSAGES/drgeo.mo
-@dirrmtry share/gnome/texmacs/TeXmacs/plugins/drgeo/progs
-@dirrmtry share/gnome/texmacs/TeXmacs/plugins/drgeo
-@dirrmtry share/gnome/texmacs/TeXmacs/plugins
-@dirrmtry share/gnome/texmacs/TeXmacs
-@dirrmtry share/gnome/texmacs
-@dirrm share/gnome/drgeo/scm
-@dirrm share/gnome/drgeo/glade
-@dirrm share/gnome/drgeo/examples/scheme
-@dirrm share/gnome/drgeo/examples/macros
-@dirrm share/gnome/drgeo/examples/figures
-@dirrm share/gnome/drgeo/examples
-@dirrm share/gnome/drgeo/encode
-@dirrm share/gnome/drgeo
+@dirrmtry share/texmacs/TeXmacs/plugins/drgeo/progs
+@dirrmtry share/texmacs/TeXmacs/plugins/drgeo
+@dirrmtry share/texmacs/TeXmacs/plugins
+@dirrmtry share/texmacs/TeXmacs
+@dirrmtry share/texmacs
+@dirrm share/drgeo/scm
+@dirrm share/drgeo/glade
+@dirrm share/drgeo/examples/scheme
+@dirrm share/drgeo/examples/macros
+@dirrm share/drgeo/examples/figures
+@dirrm share/drgeo/examples
+@dirrm share/drgeo/encode
+@dirrm share/drgeo
 @dirrmtry share/locale/mr/LC_MESSAGES
 @dirrmtry share/locale/mr
 @dirrmtry share/locale/rw/LC_MESSAGES
 @dirrmtry share/locale/rw
+@dirrmtry share/applications
diff --git a/math/gcalctool/Makefile b/math/gcalctool/Makefile
index cedf6d0deb9c..d96b2299ae54 100644
--- a/math/gcalctool/Makefile
+++ b/math/gcalctool/Makefile
@@ -3,12 +3,12 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/math/gcalctool/Makefile,v 1.65 2007/03/12 19:02:22 mezz Exp $
+#   $MCom: ports/math/gcalctool/Makefile,v 1.82 2007/10/17 21:36:12 mezz Exp $
 #
 
 PORTNAME=	gcalctool
-PORTVERSION=	5.9.14
-PORTREVISION=	2
+PORTVERSION=	5.20.2
+PORTREVISION=	1
 PORTEPOCH=	2
 CATEGORIES=	math gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
@@ -25,7 +25,7 @@ USE_GETTEXT=	yes
 USE_XLIB=	yes
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool:15
-USE_GNOME=	gnomeprefix gnomehack intlhack libgnomeui gnomedocutils
+USE_GNOME=	gnomeprefix gnomehack intlhack gconf2 gnomedocutils
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
diff --git a/math/gcalctool/distinfo b/math/gcalctool/distinfo
index c5063e9ddd58..215b552f6d76 100644
--- a/math/gcalctool/distinfo
+++ b/math/gcalctool/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gcalctool-5.9.14.tar.bz2) = dd51bc2fa9e53a3b6d7b3264e1059296
-SHA256 (gnome2/gcalctool-5.9.14.tar.bz2) = f94a63f6860bfd3d868d8419de2a9d709381eeb44d8535565629525dbc9729c5
-SIZE (gnome2/gcalctool-5.9.14.tar.bz2) = 1189518
+MD5 (gnome2/gcalctool-5.20.2.tar.bz2) = bcde10b8029d3a513183e8aac9506c1f
+SHA256 (gnome2/gcalctool-5.20.2.tar.bz2) = b871c8b7fa2c4afa78b6a1708cffe04ae389ee20ff34e5fb2ddb4b78071edacd
+SIZE (gnome2/gcalctool-5.20.2.tar.bz2) = 1343757
diff --git a/math/gcalctool/pkg-plist b/math/gcalctool/pkg-plist
index 34d2f4c3c8c8..c0964e2f6542 100644
--- a/math/gcalctool/pkg-plist
+++ b/math/gcalctool/pkg-plist
@@ -1,6 +1,6 @@
 bin/gcalctool
 bin/gnome-calculator
-share/gnome/applications/gcalctool.desktop
+share/applications/gcalctool.desktop
 share/gnome/help/gcalctool/C/figures/gcalctool_basic_window.png
 share/gnome/help/gcalctool/C/figures/gcalctool_financial_window.png
 share/gnome/help/gcalctool/C/figures/gcalctool_menu_symbol.png
@@ -19,7 +19,6 @@ share/gnome/help/gcalctool/de/figures/gcalctool_financial_window.png
 share/gnome/help/gcalctool/de/figures/gcalctool_menu_symbol.png
 share/gnome/help/gcalctool/de/figures/gcalctool_scientific_window.png
 share/gnome/help/gcalctool/de/gcalctool.xml
-share/gnome/help/gcalctool/de/legal.xml
 share/gnome/help/gcalctool/es/figures/gcalctool_basic_window.png
 share/gnome/help/gcalctool/es/figures/gcalctool_financial_window.png
 share/gnome/help/gcalctool/es/figures/gcalctool_menu_symbol.png
@@ -47,7 +46,16 @@ share/gnome/help/gcalctool/ko/figures/gcalctool_financial_window.png
 share/gnome/help/gcalctool/ko/figures/gcalctool_menu_symbol.png
 share/gnome/help/gcalctool/ko/figures/gcalctool_scientific_window.png
 share/gnome/help/gcalctool/ko/gcalctool.xml
-share/gnome/help/gcalctool/ko/legal.xml
+share/gnome/help/gcalctool/oc/figures/gcalctool_basic_window.png
+share/gnome/help/gcalctool/oc/figures/gcalctool_financial_window.png
+share/gnome/help/gcalctool/oc/figures/gcalctool_menu_symbol.png
+share/gnome/help/gcalctool/oc/figures/gcalctool_scientific_window.png
+share/gnome/help/gcalctool/oc/gcalctool.xml
+share/gnome/help/gcalctool/pt_BR/figures/gcalctool_basic_window.png
+share/gnome/help/gcalctool/pt_BR/figures/gcalctool_financial_window.png
+share/gnome/help/gcalctool/pt_BR/figures/gcalctool_menu_symbol.png
+share/gnome/help/gcalctool/pt_BR/figures/gcalctool_scientific_window.png
+share/gnome/help/gcalctool/pt_BR/gcalctool.xml
 share/gnome/help/gcalctool/sv/figures/gcalctool_basic_window.png
 share/gnome/help/gcalctool/sv/figures/gcalctool_financial_window.png
 share/gnome/help/gcalctool/sv/figures/gcalctool_menu_symbol.png
@@ -71,18 +79,6 @@ share/gnome/help/gcalctool/zh_TW/figures/gcalctool_menu_symbol.png
 share/gnome/help/gcalctool/zh_TW/figures/gcalctool_scientific_window.png
 share/gnome/help/gcalctool/zh_TW/gcalctool.xml
 share/gnome/help/gcalctool/zh_TW/legal.xml
-share/gnome/omf/gcalctool/gcalctool-C.omf
-share/gnome/omf/gcalctool/gcalctool-bg.omf
-share/gnome/omf/gcalctool/gcalctool-de.omf
-share/gnome/omf/gcalctool/gcalctool-es.omf
-share/gnome/omf/gcalctool/gcalctool-fr.omf
-share/gnome/omf/gcalctool/gcalctool-it.omf
-share/gnome/omf/gcalctool/gcalctool-ja.omf
-share/gnome/omf/gcalctool/gcalctool-ko.omf
-share/gnome/omf/gcalctool/gcalctool-sv.omf
-share/gnome/omf/gcalctool/gcalctool-zh_CN.omf
-share/gnome/omf/gcalctool/gcalctool-zh_HK.omf
-share/gnome/omf/gcalctool/gcalctool-zh_TW.omf
 share/locale/am/LC_MESSAGES/gcalctool.mo
 share/locale/ar/LC_MESSAGES/gcalctool.mo
 share/locale/az/LC_MESSAGES/gcalctool.mo
@@ -131,6 +127,7 @@ share/locale/ms/LC_MESSAGES/gcalctool.mo
 share/locale/nb/LC_MESSAGES/gcalctool.mo
 share/locale/ne/LC_MESSAGES/gcalctool.mo
 share/locale/nl/LC_MESSAGES/gcalctool.mo
+share/locale/oc/LC_MESSAGES/gcalctool.mo
 share/locale/or/LC_MESSAGES/gcalctool.mo
 share/locale/pa/LC_MESSAGES/gcalctool.mo
 share/locale/pl/LC_MESSAGES/gcalctool.mo
@@ -139,6 +136,7 @@ share/locale/pt_BR/LC_MESSAGES/gcalctool.mo
 share/locale/ro/LC_MESSAGES/gcalctool.mo
 share/locale/ru/LC_MESSAGES/gcalctool.mo
 share/locale/rw/LC_MESSAGES/gcalctool.mo
+share/locale/si/LC_MESSAGES/gcalctool.mo
 share/locale/sk/LC_MESSAGES/gcalctool.mo
 share/locale/sl/LC_MESSAGES/gcalctool.mo
 share/locale/sq/LC_MESSAGES/gcalctool.mo
@@ -156,7 +154,21 @@ share/locale/xh/LC_MESSAGES/gcalctool.mo
 share/locale/zh_CN/LC_MESSAGES/gcalctool.mo
 share/locale/zh_HK/LC_MESSAGES/gcalctool.mo
 share/locale/zh_TW/LC_MESSAGES/gcalctool.mo
-@dirrm share/gnome/omf/gcalctool
+share/omf/gcalctool/gcalctool-C.omf
+share/omf/gcalctool/gcalctool-bg.omf
+share/omf/gcalctool/gcalctool-de.omf
+share/omf/gcalctool/gcalctool-es.omf
+share/omf/gcalctool/gcalctool-fr.omf
+share/omf/gcalctool/gcalctool-it.omf
+share/omf/gcalctool/gcalctool-ja.omf
+share/omf/gcalctool/gcalctool-ko.omf
+share/omf/gcalctool/gcalctool-oc.omf
+share/omf/gcalctool/gcalctool-pt_BR.omf
+share/omf/gcalctool/gcalctool-sv.omf
+share/omf/gcalctool/gcalctool-zh_CN.omf
+share/omf/gcalctool/gcalctool-zh_HK.omf
+share/omf/gcalctool/gcalctool-zh_TW.omf
+@dirrm share/omf/gcalctool
 @dirrm share/gnome/help/gcalctool/zh_TW/figures
 @dirrm share/gnome/help/gcalctool/zh_TW
 @dirrm share/gnome/help/gcalctool/zh_HK/figures
@@ -165,6 +177,10 @@ share/locale/zh_TW/LC_MESSAGES/gcalctool.mo
 @dirrm share/gnome/help/gcalctool/zh_CN
 @dirrm share/gnome/help/gcalctool/sv/figures
 @dirrm share/gnome/help/gcalctool/sv
+@dirrm share/gnome/help/gcalctool/pt_BR/figures
+@dirrm share/gnome/help/gcalctool/pt_BR
+@dirrm share/gnome/help/gcalctool/oc/figures
+@dirrm share/gnome/help/gcalctool/oc
 @dirrm share/gnome/help/gcalctool/ko/figures
 @dirrm share/gnome/help/gcalctool/ko
 @dirrm share/gnome/help/gcalctool/ja/figures
@@ -188,8 +204,12 @@ share/locale/zh_TW/LC_MESSAGES/gcalctool.mo
 @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/mr/LC_MESSAGES
 @dirrmtry share/locale/mr
 @dirrmtry share/locale/mg/LC_MESSAGES
@@ -202,3 +222,4 @@ share/locale/zh_TW/LC_MESSAGES/gcalctool.mo
 @dirrmtry share/locale/dz
 @dirrmtry share/locale/bn_IN/LC_MESSAGES
 @dirrmtry share/locale/bn_IN
+@dirrmtry share/applications
diff --git a/math/gnumeric/Makefile b/math/gnumeric/Makefile
index 2e3aa9d1c96f..8a3c727f2e0b 100644
--- a/math/gnumeric/Makefile
+++ b/math/gnumeric/Makefile
@@ -3,11 +3,12 @@
 # Whom:					Yukihiro Nakai <Nakai@technologist.com>
 #
 # $FreeBSD$
-#   $MCom: ports/math/gnumeric/Makefile,v 1.28 2007/03/06 17:06:53 marcus Exp $
+#   $MCom: ports/math/gnumeric/Makefile,v 1.39 2007/09/16 21:42:03 marcus Exp $
 #
 
 PORTNAME=	gnumeric
 PORTVERSION=	1.7.12
+PORTREVISION=	1
 CATEGORIES=	math gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:R}
@@ -59,10 +60,10 @@ post-patch:
 	@${RM} -f ${WRKSRC}/GNOME_Gnumeric.server.in
 
 post-install:
-	${INSTALL_DATA} ${WRKSRC}/gnumeric.desktop ${PREFIX}/share/gnome/applications
-	${INSTALL_DATA} ${WRKSRC}/gnumeric.mime ${PREFIX}/share/gnome/mime-info
+	${INSTALL_DATA} ${WRKSRC}/gnumeric.desktop ${PREFIX}/share/applications
+	${INSTALL_DATA} ${WRKSRC}/gnumeric.mime ${PREFIX}/share/mime-info
 	@-update-desktop-database
-.for dir in share/gnome lib
+.for dir in share lib
 	@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${PREFIX}/${dir}/gnumeric
 .endfor
 
diff --git a/math/gnumeric/pkg-plist b/math/gnumeric/pkg-plist
index b563007e093f..4017e0434c2f 100644
--- a/math/gnumeric/pkg-plist
+++ b/math/gnumeric/pkg-plist
@@ -252,108 +252,108 @@ lib/libspreadsheet.la
 lib/libspreadsheet.so
 libdata/pkgconfig/libspreadsheet-1.7.pc
 @exec update-desktop-database > /dev/null || /usr/bin/true
-share/gnome/applications/gnumeric.desktop
-share/gnome/gnumeric/%%VERSION%%/GNOME_Gnumeric-gtk.xml
-share/gnome/gnumeric/%%VERSION%%/autoformat-templates/3D/.category
-share/gnome/gnumeric/%%VERSION%%/autoformat-templates/3D/autoformat.3D.button.xml
-share/gnome/gnumeric/%%VERSION%%/autoformat-templates/3D/autoformat.3D.list.xml
-share/gnome/gnumeric/%%VERSION%%/autoformat-templates/Classical/.category
-share/gnome/gnumeric/%%VERSION%%/autoformat-templates/Classical/autoformat.Classical.cool.xml
-share/gnome/gnumeric/%%VERSION%%/autoformat-templates/Classical/autoformat.Classical.simple.xml
-share/gnome/gnumeric/%%VERSION%%/autoformat-templates/Classical/autoformat.Classical.trendy.xml
-share/gnome/gnumeric/%%VERSION%%/autoformat-templates/Colourful/.category
-share/gnome/gnumeric/%%VERSION%%/autoformat-templates/Colourful/autoformat.Colourful.banana.xml
-share/gnome/gnumeric/%%VERSION%%/autoformat-templates/Colourful/autoformat.Colourful.black.xml
-share/gnome/gnumeric/%%VERSION%%/autoformat-templates/Colourful/autoformat.Colourful.blue.xml
-share/gnome/gnumeric/%%VERSION%%/autoformat-templates/Colourful/autoformat.Colourful.orange.xml
-share/gnome/gnumeric/%%VERSION%%/autoformat-templates/Colourful/autoformat.Colourful.vanilla.xml
-share/gnome/gnumeric/%%VERSION%%/autoformat-templates/Financial/.category
-share/gnome/gnumeric/%%VERSION%%/autoformat-templates/Financial/autoformat.Financial.basic.xml
-share/gnome/gnumeric/%%VERSION%%/autoformat-templates/Financial/autoformat.Financial.desert.xml
-share/gnome/gnumeric/%%VERSION%%/autoformat-templates/Financial/autoformat.Financial.ice.xml
-share/gnome/gnumeric/%%VERSION%%/autoformat-templates/Financial/autoformat.Financial.modern.xml
-share/gnome/gnumeric/%%VERSION%%/autoformat-templates/Financial/autoformat.Financial.purple.xml
-share/gnome/gnumeric/%%VERSION%%/autoformat-templates/General/.category
-share/gnome/gnumeric/%%VERSION%%/autoformat-templates/General/autoformat.General.advanced.xml
-share/gnome/gnumeric/%%VERSION%%/autoformat-templates/General/autoformat.General.basic.xml
-share/gnome/gnumeric/%%VERSION%%/autoformat-templates/General/autoformat.General.empty.xml
-share/gnome/gnumeric/%%VERSION%%/autoformat-templates/General/autoformat.General.table.xml
-share/gnome/gnumeric/%%VERSION%%/autoformat-templates/List/.category
-share/gnome/gnumeric/%%VERSION%%/autoformat-templates/List/autoformat.List.basic.xml
-share/gnome/gnumeric/%%VERSION%%/autoformat-templates/List/autoformat.List.green.xml
-share/gnome/gnumeric/%%VERSION%%/autoformat-templates/List/autoformat.List.lila.xml
-share/gnome/gnumeric/%%VERSION%%/autoformat-templates/List/autoformat.List.simple.xml
-share/gnome/gnumeric/%%VERSION%%/glade/advanced-filter.glade
-share/gnome/gnumeric/%%VERSION%%/glade/anova-one.glade
-share/gnome/gnumeric/%%VERSION%%/glade/anova-two.glade
-share/gnome/gnumeric/%%VERSION%%/glade/autocorrect.glade
-share/gnome/gnumeric/%%VERSION%%/glade/autofilter-expression.glade
-share/gnome/gnumeric/%%VERSION%%/glade/autofilter-top10.glade
-share/gnome/gnumeric/%%VERSION%%/glade/autoformat.glade
-share/gnome/gnumeric/%%VERSION%%/glade/autosave.glade
-share/gnome/gnumeric/%%VERSION%%/glade/cell-comment.glade
-share/gnome/gnumeric/%%VERSION%%/glade/cell-format.glade
-share/gnome/gnumeric/%%VERSION%%/glade/cell-sort.glade
-share/gnome/gnumeric/%%VERSION%%/glade/col-width.glade
-share/gnome/gnumeric/%%VERSION%%/glade/colrow.glade
-share/gnome/gnumeric/%%VERSION%%/glade/consolidate.glade
-share/gnome/gnumeric/%%VERSION%%/glade/correlation.glade
-share/gnome/gnumeric/%%VERSION%%/glade/covariance.glade
-share/gnome/gnumeric/%%VERSION%%/glade/dao.glade
-share/gnome/gnumeric/%%VERSION%%/glade/data-table.glade
-share/gnome/gnumeric/%%VERSION%%/glade/define-name.glade
-share/gnome/gnumeric/%%VERSION%%/glade/delete-cells.glade
-share/gnome/gnumeric/%%VERSION%%/glade/descriptive-stats.glade
-share/gnome/gnumeric/%%VERSION%%/glade/dialog-stf-export.glade
-share/gnome/gnumeric/%%VERSION%%/glade/dialog-stf.glade
-share/gnome/gnumeric/%%VERSION%%/glade/dialog-zoom.glade
-share/gnome/gnumeric/%%VERSION%%/glade/doc-meta-data.glade
-share/gnome/gnumeric/%%VERSION%%/glade/exp-smoothing.glade
-share/gnome/gnumeric/%%VERSION%%/glade/fill-series.glade
-share/gnome/gnumeric/%%VERSION%%/glade/font-sel.glade
-share/gnome/gnumeric/%%VERSION%%/glade/formula-guru.glade
-share/gnome/gnumeric/%%VERSION%%/glade/fourier-analysis.glade
-share/gnome/gnumeric/%%VERSION%%/glade/function-select.glade
-share/gnome/gnumeric/%%VERSION%%/glade/goalseek.glade
-share/gnome/gnumeric/%%VERSION%%/glade/goto.glade
-share/gnome/gnumeric/%%VERSION%%/glade/hf-config.glade
-share/gnome/gnumeric/%%VERSION%%/glade/histogram.glade
-share/gnome/gnumeric/%%VERSION%%/glade/hyperlink.glade
-share/gnome/gnumeric/%%VERSION%%/glade/insert-cells.glade
-share/gnome/gnumeric/%%VERSION%%/glade/mean-tests.glade
-share/gnome/gnumeric/%%VERSION%%/glade/merge.glade
-share/gnome/gnumeric/%%VERSION%%/glade/moving-averages.glade
-share/gnome/gnumeric/%%VERSION%%/glade/paste-names.glade
-share/gnome/gnumeric/%%VERSION%%/glade/pivottable.glade
-share/gnome/gnumeric/%%VERSION%%/glade/plugin-manager.glade
-share/gnome/gnumeric/%%VERSION%%/glade/preferences.glade
-share/gnome/gnumeric/%%VERSION%%/glade/print.glade
-share/gnome/gnumeric/%%VERSION%%/glade/random-generation.glade
-share/gnome/gnumeric/%%VERSION%%/glade/rank.glade
-share/gnome/gnumeric/%%VERSION%%/glade/regression.glade
-share/gnome/gnumeric/%%VERSION%%/glade/row-height.glade
-share/gnome/gnumeric/%%VERSION%%/glade/sampling.glade
-share/gnome/gnumeric/%%VERSION%%/glade/scenario-add.glade
-share/gnome/gnumeric/%%VERSION%%/glade/scenario-manager.glade
-share/gnome/gnumeric/%%VERSION%%/glade/search-replace.glade
-share/gnome/gnumeric/%%VERSION%%/glade/search.glade
-share/gnome/gnumeric/%%VERSION%%/glade/sheet-order.glade
-share/gnome/gnumeric/%%VERSION%%/glade/shuffle.glade
-share/gnome/gnumeric/%%VERSION%%/glade/simulation.glade
-share/gnome/gnumeric/%%VERSION%%/glade/so-checkbox.glade
-share/gnome/gnumeric/%%VERSION%%/glade/so-frame.glade
-share/gnome/gnumeric/%%VERSION%%/glade/so-list.glade
-share/gnome/gnumeric/%%VERSION%%/glade/so-scrollbar.glade
-share/gnome/gnumeric/%%VERSION%%/glade/solver.glade
-share/gnome/gnumeric/%%VERSION%%/glade/tabulate.glade
-share/gnome/gnumeric/%%VERSION%%/glade/variance-tests.glade
-share/gnome/gnumeric/%%VERSION%%/glade/view.glade
-share/gnome/gnumeric/%%VERSION%%/glade/workbook-attr.glade
-share/gnome/gnumeric/%%VERSION%%/idl/GNOME_Gnumeric.idl
-share/gnome/gnumeric/%%VERSION%%/templates/invoice.gnumeric
-share/gnome/gnumeric/%%VERSION%%/templates/loan.gnumeric
-share/gnome/gnumeric/%%VERSION%%/templates/mileage.gnumeric
-share/gnome/gnumeric/%%VERSION%%/templates/purchase_order.gnumeric
+share/applications/gnumeric.desktop
+share/gnumeric/%%VERSION%%/GNOME_Gnumeric-gtk.xml
+share/gnumeric/%%VERSION%%/autoformat-templates/3D/.category
+share/gnumeric/%%VERSION%%/autoformat-templates/3D/autoformat.3D.button.xml
+share/gnumeric/%%VERSION%%/autoformat-templates/3D/autoformat.3D.list.xml
+share/gnumeric/%%VERSION%%/autoformat-templates/Classical/.category
+share/gnumeric/%%VERSION%%/autoformat-templates/Classical/autoformat.Classical.cool.xml
+share/gnumeric/%%VERSION%%/autoformat-templates/Classical/autoformat.Classical.simple.xml
+share/gnumeric/%%VERSION%%/autoformat-templates/Classical/autoformat.Classical.trendy.xml
+share/gnumeric/%%VERSION%%/autoformat-templates/Colourful/.category
+share/gnumeric/%%VERSION%%/autoformat-templates/Colourful/autoformat.Colourful.banana.xml
+share/gnumeric/%%VERSION%%/autoformat-templates/Colourful/autoformat.Colourful.black.xml
+share/gnumeric/%%VERSION%%/autoformat-templates/Colourful/autoformat.Colourful.blue.xml
+share/gnumeric/%%VERSION%%/autoformat-templates/Colourful/autoformat.Colourful.orange.xml
+share/gnumeric/%%VERSION%%/autoformat-templates/Colourful/autoformat.Colourful.vanilla.xml
+share/gnumeric/%%VERSION%%/autoformat-templates/Financial/.category
+share/gnumeric/%%VERSION%%/autoformat-templates/Financial/autoformat.Financial.basic.xml
+share/gnumeric/%%VERSION%%/autoformat-templates/Financial/autoformat.Financial.desert.xml
+share/gnumeric/%%VERSION%%/autoformat-templates/Financial/autoformat.Financial.ice.xml
+share/gnumeric/%%VERSION%%/autoformat-templates/Financial/autoformat.Financial.modern.xml
+share/gnumeric/%%VERSION%%/autoformat-templates/Financial/autoformat.Financial.purple.xml
+share/gnumeric/%%VERSION%%/autoformat-templates/General/.category
+share/gnumeric/%%VERSION%%/autoformat-templates/General/autoformat.General.advanced.xml
+share/gnumeric/%%VERSION%%/autoformat-templates/General/autoformat.General.basic.xml
+share/gnumeric/%%VERSION%%/autoformat-templates/General/autoformat.General.empty.xml
+share/gnumeric/%%VERSION%%/autoformat-templates/General/autoformat.General.table.xml
+share/gnumeric/%%VERSION%%/autoformat-templates/List/.category
+share/gnumeric/%%VERSION%%/autoformat-templates/List/autoformat.List.basic.xml
+share/gnumeric/%%VERSION%%/autoformat-templates/List/autoformat.List.green.xml
+share/gnumeric/%%VERSION%%/autoformat-templates/List/autoformat.List.lila.xml
+share/gnumeric/%%VERSION%%/autoformat-templates/List/autoformat.List.simple.xml
+share/gnumeric/%%VERSION%%/glade/advanced-filter.glade
+share/gnumeric/%%VERSION%%/glade/anova-one.glade
+share/gnumeric/%%VERSION%%/glade/anova-two.glade
+share/gnumeric/%%VERSION%%/glade/autocorrect.glade
+share/gnumeric/%%VERSION%%/glade/autofilter-expression.glade
+share/gnumeric/%%VERSION%%/glade/autofilter-top10.glade
+share/gnumeric/%%VERSION%%/glade/autoformat.glade
+share/gnumeric/%%VERSION%%/glade/autosave.glade
+share/gnumeric/%%VERSION%%/glade/cell-comment.glade
+share/gnumeric/%%VERSION%%/glade/cell-format.glade
+share/gnumeric/%%VERSION%%/glade/cell-sort.glade
+share/gnumeric/%%VERSION%%/glade/col-width.glade
+share/gnumeric/%%VERSION%%/glade/colrow.glade
+share/gnumeric/%%VERSION%%/glade/consolidate.glade
+share/gnumeric/%%VERSION%%/glade/correlation.glade
+share/gnumeric/%%VERSION%%/glade/covariance.glade
+share/gnumeric/%%VERSION%%/glade/dao.glade
+share/gnumeric/%%VERSION%%/glade/data-table.glade
+share/gnumeric/%%VERSION%%/glade/define-name.glade
+share/gnumeric/%%VERSION%%/glade/delete-cells.glade
+share/gnumeric/%%VERSION%%/glade/descriptive-stats.glade
+share/gnumeric/%%VERSION%%/glade/dialog-stf-export.glade
+share/gnumeric/%%VERSION%%/glade/dialog-stf.glade
+share/gnumeric/%%VERSION%%/glade/dialog-zoom.glade
+share/gnumeric/%%VERSION%%/glade/doc-meta-data.glade
+share/gnumeric/%%VERSION%%/glade/exp-smoothing.glade
+share/gnumeric/%%VERSION%%/glade/fill-series.glade
+share/gnumeric/%%VERSION%%/glade/font-sel.glade
+share/gnumeric/%%VERSION%%/glade/formula-guru.glade
+share/gnumeric/%%VERSION%%/glade/fourier-analysis.glade
+share/gnumeric/%%VERSION%%/glade/function-select.glade
+share/gnumeric/%%VERSION%%/glade/goalseek.glade
+share/gnumeric/%%VERSION%%/glade/goto.glade
+share/gnumeric/%%VERSION%%/glade/hf-config.glade
+share/gnumeric/%%VERSION%%/glade/histogram.glade
+share/gnumeric/%%VERSION%%/glade/hyperlink.glade
+share/gnumeric/%%VERSION%%/glade/insert-cells.glade
+share/gnumeric/%%VERSION%%/glade/mean-tests.glade
+share/gnumeric/%%VERSION%%/glade/merge.glade
+share/gnumeric/%%VERSION%%/glade/moving-averages.glade
+share/gnumeric/%%VERSION%%/glade/paste-names.glade
+share/gnumeric/%%VERSION%%/glade/pivottable.glade
+share/gnumeric/%%VERSION%%/glade/plugin-manager.glade
+share/gnumeric/%%VERSION%%/glade/preferences.glade
+share/gnumeric/%%VERSION%%/glade/print.glade
+share/gnumeric/%%VERSION%%/glade/random-generation.glade
+share/gnumeric/%%VERSION%%/glade/rank.glade
+share/gnumeric/%%VERSION%%/glade/regression.glade
+share/gnumeric/%%VERSION%%/glade/row-height.glade
+share/gnumeric/%%VERSION%%/glade/sampling.glade
+share/gnumeric/%%VERSION%%/glade/scenario-add.glade
+share/gnumeric/%%VERSION%%/glade/scenario-manager.glade
+share/gnumeric/%%VERSION%%/glade/search-replace.glade
+share/gnumeric/%%VERSION%%/glade/search.glade
+share/gnumeric/%%VERSION%%/glade/sheet-order.glade
+share/gnumeric/%%VERSION%%/glade/shuffle.glade
+share/gnumeric/%%VERSION%%/glade/simulation.glade
+share/gnumeric/%%VERSION%%/glade/so-checkbox.glade
+share/gnumeric/%%VERSION%%/glade/so-frame.glade
+share/gnumeric/%%VERSION%%/glade/so-list.glade
+share/gnumeric/%%VERSION%%/glade/so-scrollbar.glade
+share/gnumeric/%%VERSION%%/glade/solver.glade
+share/gnumeric/%%VERSION%%/glade/tabulate.glade
+share/gnumeric/%%VERSION%%/glade/variance-tests.glade
+share/gnumeric/%%VERSION%%/glade/view.glade
+share/gnumeric/%%VERSION%%/glade/workbook-attr.glade
+share/gnumeric/%%VERSION%%/idl/GNOME_Gnumeric.idl
+share/gnumeric/%%VERSION%%/templates/invoice.gnumeric
+share/gnumeric/%%VERSION%%/templates/loan.gnumeric
+share/gnumeric/%%VERSION%%/templates/mileage.gnumeric
+share/gnumeric/%%VERSION%%/templates/purchase_order.gnumeric
 share/gnome/help/gnumeric/C/about-authors.xml
 share/gnome/help/gnumeric/C/about-history.xml
 share/gnome/help/gnumeric/C/about-license.xml
@@ -755,28 +755,28 @@ share/gnome/help/gnumeric/C/quick-start.xml
 share/gnome/help/gnumeric/C/welcome.xml
 share/gnome/help/gnumeric/C/workbooks.xml
 share/gnome/help/gnumeric/C/worksheets.xml
-share/gnome/mime-info/gnumeric.mime
-share/gnome/omf/gnumeric/gnumeric-C.omf
-share/gnome/pixmaps/gnome-application-vnd.lotus-1-2-3.png
-share/gnome/pixmaps/gnome-application-x-applix-spreadsheet.png
-share/gnome/pixmaps/gnome-application-x-generic-spreadsheet.png
-share/gnome/pixmaps/gnome-application-x-gnumeric.png
-share/gnome/pixmaps/gnome-application-x-xls.png
-share/gnome/pixmaps/gnome-gnumeric.png
-share/gnome/pixmaps/gnumeric/down-right.png
-share/gnome/pixmaps/gnumeric/gnome-application-vnd.lotus-1-2-3.png
-share/gnome/pixmaps/gnumeric/gnome-application-x-applix-spreadsheet.png
-share/gnome/pixmaps/gnumeric/gnome-application-x-generic-spreadsheet.png
-share/gnome/pixmaps/gnumeric/gnome-application-x-gnumeric.png
-share/gnome/pixmaps/gnumeric/gnome-application-x-xls.png
-share/gnome/pixmaps/gnumeric/gnome-gnumeric.png
-share/gnome/pixmaps/gnumeric/gnumeric-about.png
-share/gnome/pixmaps/gnumeric/orient-horizontal.png
-share/gnome/pixmaps/gnumeric/orient-vertical.png
-share/gnome/pixmaps/gnumeric/right-down.png
-share/gnome/pixmaps/gnumeric/stf-druid.png
-share/gnome/pixmaps/gnumeric/win32-gnumeric.ico
-share/gnome/pixmaps/win32-gnumeric.ico
+share/mime-info/gnumeric.mime
+share/omf/gnumeric/gnumeric-C.omf
+share/pixmaps/gnome-application-vnd.lotus-1-2-3.png
+share/pixmaps/gnome-application-x-applix-spreadsheet.png
+share/pixmaps/gnome-application-x-generic-spreadsheet.png
+share/pixmaps/gnome-application-x-gnumeric.png
+share/pixmaps/gnome-application-x-xls.png
+share/pixmaps/gnome-gnumeric.png
+share/pixmaps/gnumeric/down-right.png
+share/pixmaps/gnumeric/gnome-application-vnd.lotus-1-2-3.png
+share/pixmaps/gnumeric/gnome-application-x-applix-spreadsheet.png
+share/pixmaps/gnumeric/gnome-application-x-generic-spreadsheet.png
+share/pixmaps/gnumeric/gnome-application-x-gnumeric.png
+share/pixmaps/gnumeric/gnome-application-x-xls.png
+share/pixmaps/gnumeric/gnome-gnumeric.png
+share/pixmaps/gnumeric/gnumeric-about.png
+share/pixmaps/gnumeric/orient-horizontal.png
+share/pixmaps/gnumeric/orient-vertical.png
+share/pixmaps/gnumeric/right-down.png
+share/pixmaps/gnumeric/stf-druid.png
+share/pixmaps/gnumeric/win32-gnumeric.ico
+share/pixmaps/win32-gnumeric.ico
 share/locale/am/LC_MESSAGES/gnumeric-functions.mo
 share/locale/am/LC_MESSAGES/gnumeric.mo
 share/locale/ar/LC_MESSAGES/gnumeric-functions.mo
@@ -879,23 +879,23 @@ share/locale/zh_CN/LC_MESSAGES/gnumeric-functions.mo
 share/locale/zh_CN/LC_MESSAGES/gnumeric.mo
 share/locale/zh_TW/LC_MESSAGES/gnumeric-functions.mo
 share/locale/zh_TW/LC_MESSAGES/gnumeric.mo
-@dirrm share/gnome/pixmaps/gnumeric
-@dirrm share/gnome/omf/gnumeric
+@dirrm share/pixmaps/gnumeric
+@dirrm share/omf/gnumeric
 @dirrm share/gnome/help/gnumeric/C/figures
 @dirrm share/gnome/help/gnumeric/C
 @dirrm share/gnome/help/gnumeric
-@dirrm share/gnome/gnumeric/%%VERSION%%/templates
-@dirrm share/gnome/gnumeric/%%VERSION%%/idl
-@dirrm share/gnome/gnumeric/%%VERSION%%/glade
-@dirrm share/gnome/gnumeric/%%VERSION%%/autoformat-templates/List
-@dirrm share/gnome/gnumeric/%%VERSION%%/autoformat-templates/General
-@dirrm share/gnome/gnumeric/%%VERSION%%/autoformat-templates/Financial
-@dirrm share/gnome/gnumeric/%%VERSION%%/autoformat-templates/Colourful
-@dirrm share/gnome/gnumeric/%%VERSION%%/autoformat-templates/Classical
-@dirrm share/gnome/gnumeric/%%VERSION%%/autoformat-templates/3D
-@dirrm share/gnome/gnumeric/%%VERSION%%/autoformat-templates
-@dirrm share/gnome/gnumeric/%%VERSION%%
-@dirrm share/gnome/gnumeric
+@dirrm share/gnumeric/%%VERSION%%/templates
+@dirrm share/gnumeric/%%VERSION%%/idl
+@dirrm share/gnumeric/%%VERSION%%/glade
+@dirrm share/gnumeric/%%VERSION%%/autoformat-templates/List
+@dirrm share/gnumeric/%%VERSION%%/autoformat-templates/General
+@dirrm share/gnumeric/%%VERSION%%/autoformat-templates/Financial
+@dirrm share/gnumeric/%%VERSION%%/autoformat-templates/Colourful
+@dirrm share/gnumeric/%%VERSION%%/autoformat-templates/Classical
+@dirrm share/gnumeric/%%VERSION%%/autoformat-templates/3D
+@dirrm share/gnumeric/%%VERSION%%/autoformat-templates
+@dirrm share/gnumeric/%%VERSION%%
+@dirrm share/gnumeric
 @dirrm lib/gnumeric/%%VERSION%%/plugins/xbase
 @dirrm lib/gnumeric/%%VERSION%%/plugins/uihello
 @dirrm lib/gnumeric/%%VERSION%%/plugins/sylk
@@ -950,3 +950,4 @@ share/locale/zh_TW/LC_MESSAGES/gnumeric.mo
 @dirrmtry share/locale/mr
 @dirrmtry share/locale/dz/LC_MESSAGES
 @dirrmtry share/locale/dz
+@dirrmtry share/applications
diff --git a/math/gretl/Makefile b/math/gretl/Makefile
index c6b9e1be41d3..c36ad83fcf25 100644
--- a/math/gretl/Makefile
+++ b/math/gretl/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gretl
 PORTVERSION=	1.6.5
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	math finance
 MASTER_SITES=	SF
 
@@ -49,7 +49,6 @@ BROKEN=		math/lapack appears to be broken on alpha
 PKGNAMESUFFIX=	-gnome
 USE_GNOME+=	gnomeprefix gtksourceview libgnomeui
 GCONF_SCHEMAS=	gretl.schemas
-DATADIR=	${PREFIX}/share/gnome/${PORTNAME}
 .else
 CONFIGURE_ARGS+=	--without-gnome --without-gtksourceview
 .endif
diff --git a/math/gretl/files/patch-gui2::omf-install::Makefile.in b/math/gretl/files/patch-gui2::omf-install::Makefile.in
index c365f12bc2c0..c5cfa1532451 100644
--- a/math/gretl/files/patch-gui2::omf-install::Makefile.in
+++ b/math/gretl/files/patch-gui2::omf-install::Makefile.in
@@ -14,7 +14,7 @@
  
 -docdir = $(gnome_prefix)/share/gnome/help/gretl/C
 -omfdir = $(gnome_prefix)/share/omf/gretl
-+docdir = $(datadir)/help/gretl/C
++docdir = $(gnome_prefix)/share/gnome/help/gretl/C
 +omfdir = $(datadir)/omf/gretl
  
  gretl-C.omf: gretl-C.omf.in
diff --git a/math/gretl/files/patch-po::Makefile.in.in b/math/gretl/files/patch-po::Makefile.in.in
deleted file mode 100644
index 53fa2d5ede09..000000000000
--- a/math/gretl/files/patch-po::Makefile.in.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- po/Makefile.in.in.orig	Fri May 24 05:03:49 2002
-+++ po/Makefile.in.in	Mon Oct 21 08:10:04 2002
-@@ -21,7 +21,7 @@
- prefix = @prefix@
- exec_prefix = @exec_prefix@
- datadir = @datadir@
--localedir = $(datadir)/locale
-+localedir = $(prefix)/share/locale
- gettextsrcdir = $(datadir)/gettext/po
- 
- INSTALL = @INSTALL@
diff --git a/math/gretl/pkg-plist b/math/gretl/pkg-plist
index 29d406f2ee05..7ccc034ae345 100644
--- a/math/gretl/pkg-plist
+++ b/math/gretl/pkg-plist
@@ -155,7 +155,7 @@ lib/libgretl-1.0.la
 lib/libgretl-1.0.so
 lib/libgretl-1.0.so.0
 libdata/pkgconfig/gretl.pc
-%%GNOME:%%share/gnome/applications/gretl.desktop
+%%GNOME:%%share/applications/gretl.desktop
 %%DATADIR%%/COPYING
 %%DATADIR%%/data/data10-1.gdt
 %%DATADIR%%/data/data10-2.gdt
@@ -470,14 +470,14 @@ libdata/pkgconfig/gretl.pc
 %%DATADIR%%/scripts/ps_descriptions
 %%DATADIR%%/scripts/testinp
 %%DATADIR%%/scripts/wg_ps_descriptions
-%%GNOME:%%share/gnome/gtksourceview-1.0/language-specs/gnuplot.lang
-%%GNOME:%%share/gnome/gtksourceview-1.0/language-specs/gretl.lang
-%%GNOME:%%share/gnome/mime-info/gretl.keys
-%%GNOME:%%share/gnome/mime-info/gretl.mime
-%%GNOME:%%share/gnome/pixmaps/gnome-application-x-gretldata.png
-%%GNOME:%%share/gnome/pixmaps/gnome-application-x-gretlsession.png
-%%GNOME:%%share/gnome/pixmaps/gretl-logo.xpm
-%%GNOME:%%share/gnome/pixmaps/gretl.xpm
+%%GNOME:%%share/gtksourceview-1.0/language-specs/gnuplot.lang
+%%GNOME:%%share/gtksourceview-1.0/language-specs/gretl.lang
+%%GNOME:%%share/mime-info/gretl.keys
+%%GNOME:%%share/mime-info/gretl.mime
+%%GNOME:%%share/pixmaps/gnome-application-x-gretldata.png
+%%GNOME:%%share/pixmaps/gnome-application-x-gretlsession.png
+%%GNOME:%%share/pixmaps/gretl-logo.xpm
+%%GNOME:%%share/pixmaps/gretl.xpm
 share/locale/de/LC_MESSAGES/gretl.mo
 share/locale/es/LC_MESSAGES/gretl.mo
 share/locale/eu/LC_MESSAGES/gretl.mo
@@ -507,3 +507,4 @@ share/locale/tr/LC_MESSAGES/gretl.mo
 @dirrm include/gretl
 @dirrmtry share/locale/rw/LC_MESSAGES
 @dirrmtry share/locale/rw
+@dirrmtry share/applications
diff --git a/math/guppi/Makefile b/math/guppi/Makefile
index 62c1f86705e4..5b172bbe9c1c 100644
--- a/math/guppi/Makefile
+++ b/math/guppi/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	guppi
 PORTVERSION=	0.40.3
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	math gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/Guppi/0.40
diff --git a/math/guppi/pkg-plist b/math/guppi/pkg-plist
index a69ce37d6014..b01f3cbfb0c1 100644
--- a/math/guppi/pkg-plist
+++ b/math/guppi/pkg-plist
@@ -174,94 +174,14 @@ lib/libguppi.so.16
 lib/libguppitank.so
 lib/libguppitank.so.16
 share/aclocal/libguppi.m4
-share/gnome/guppi/glade/guppi-gnumeric-format-guru.glade
-share/gnome/guppi/glade/view-properties.glade
-share/gnome/guppi/scripts/guppi-gnumeric-plots.xml
 share/gnome/help/guppi/C/c20.html
 share/gnome/help/guppi/C/docbook.css
 share/gnome/help/guppi/C/guppi.html
 share/gnome/help/guppi/C/ln14.html
 share/gnome/help/guppi/C/topic.dat
-share/gnome/oaf/GNOME_Guppi_Gnumeric.oaf
-share/gnome/pixmaps/gnome-guppi.png
-share/gnome/pixmaps/guppi/area.xpm
-share/gnome/pixmaps/guppi/bar.xpm
-share/gnome/pixmaps/guppi/basic-home.png
-share/gnome/pixmaps/guppi/basic-move.png
-share/gnome/pixmaps/guppi/basic-reframe.png
-share/gnome/pixmaps/guppi/basic-zoom.png
-share/gnome/pixmaps/guppi/bubble.xpm
-share/gnome/pixmaps/guppi/chart_bar_1_1.png
-share/gnome/pixmaps/guppi/chart_bar_1_2.png
-share/gnome/pixmaps/guppi/chart_bar_1_3.png
-share/gnome/pixmaps/guppi/chart_bar_2_1.png
-share/gnome/pixmaps/guppi/chart_bar_2_2.png
-share/gnome/pixmaps/guppi/chart_bar_2_3.png
-share/gnome/pixmaps/guppi/chart_bubble_1_1.png
-share/gnome/pixmaps/guppi/chart_column_1_1.png
-share/gnome/pixmaps/guppi/chart_column_1_2.png
-share/gnome/pixmaps/guppi/chart_column_1_3.png
-share/gnome/pixmaps/guppi/chart_column_2_1.png
-share/gnome/pixmaps/guppi/chart_column_2_2.png
-share/gnome/pixmaps/guppi/chart_column_2_3.png
-share/gnome/pixmaps/guppi/chart_column_3_1.png
-share/gnome/pixmaps/guppi/chart_cone_1_1.png
-share/gnome/pixmaps/guppi/chart_cone_1_2.png
-share/gnome/pixmaps/guppi/chart_cone_1_3.png
-share/gnome/pixmaps/guppi/chart_cone_2_1.png
-share/gnome/pixmaps/guppi/chart_cone_2_2.png
-share/gnome/pixmaps/guppi/chart_cone_2_3.png
-share/gnome/pixmaps/guppi/chart_cone_3_1.png
-share/gnome/pixmaps/guppi/chart_cylinder_1_1.png
-share/gnome/pixmaps/guppi/chart_cylinder_1_2.png
-share/gnome/pixmaps/guppi/chart_cylinder_1_3.png
-share/gnome/pixmaps/guppi/chart_cylinder_2_1.png
-share/gnome/pixmaps/guppi/chart_cylinder_2_2.png
-share/gnome/pixmaps/guppi/chart_cylinder_2_3.png
-share/gnome/pixmaps/guppi/chart_cylinder_3_1.png
-share/gnome/pixmaps/guppi/chart_line_1_1.png
-share/gnome/pixmaps/guppi/chart_line_1_2.png
-share/gnome/pixmaps/guppi/chart_line_1_3.png
-share/gnome/pixmaps/guppi/chart_line_2_1.png
-share/gnome/pixmaps/guppi/chart_line_2_2.png
-share/gnome/pixmaps/guppi/chart_line_2_3.png
-share/gnome/pixmaps/guppi/chart_line_3_1.png
-share/gnome/pixmaps/guppi/chart_pie_1_1.png
-share/gnome/pixmaps/guppi/chart_pie_1_2.png
-share/gnome/pixmaps/guppi/chart_pie_1_3.png
-share/gnome/pixmaps/guppi/chart_pie_2_1.png
-share/gnome/pixmaps/guppi/chart_pie_2_2.png
-share/gnome/pixmaps/guppi/chart_pie_2_3.png
-share/gnome/pixmaps/guppi/chart_pyramid_1_1.png
-share/gnome/pixmaps/guppi/chart_pyramid_1_2.png
-share/gnome/pixmaps/guppi/chart_pyramid_1_3.png
-share/gnome/pixmaps/guppi/chart_pyramid_2_1.png
-share/gnome/pixmaps/guppi/chart_pyramid_2_2.png
-share/gnome/pixmaps/guppi/chart_pyramid_2_3.png
-share/gnome/pixmaps/guppi/chart_pyramid_3_1.png
-share/gnome/pixmaps/guppi/chart_scatter_1_1.png
-share/gnome/pixmaps/guppi/chart_scatter_2_1.png
-share/gnome/pixmaps/guppi/chart_scatter_2_2.png
-share/gnome/pixmaps/guppi/chart_scatter_3_1.png
-share/gnome/pixmaps/guppi/chart_scatter_3_2.png
-share/gnome/pixmaps/guppi/chart_stock_1_1.png
-share/gnome/pixmaps/guppi/chart_stock_1_2.png
-share/gnome/pixmaps/guppi/chart_stock_2_1.png
-share/gnome/pixmaps/guppi/chart_stock_2_2.png
-share/gnome/pixmaps/guppi/column.xpm
-share/gnome/pixmaps/guppi/doughnut.xpm
-share/gnome/pixmaps/guppi/fill-best.png
-share/gnome/pixmaps/guppi/fill-horiz.png
-share/gnome/pixmaps/guppi/fill-vert.png
-share/gnome/pixmaps/guppi/guppi-splash.png
-share/gnome/pixmaps/guppi/linegraph.xpm
-share/gnome/pixmaps/guppi/lock.png
-share/gnome/pixmaps/guppi/pie.xpm
-share/gnome/pixmaps/guppi/radar.xpm
-share/gnome/pixmaps/guppi/resize-to-win.png
-share/gnome/pixmaps/guppi/scatter.xpm
-share/gnome/pixmaps/guppi/stock.xpm
-share/gnome/pixmaps/guppi/surface.xpm
+%%DATADIR%%/glade/guppi-gnumeric-format-guru.glade
+%%DATADIR%%/glade/view-properties.glade
+%%DATADIR%%/scripts/guppi-gnumeric-plots.xml
 share/locale/az/LC_MESSAGES/Guppi.mo
 share/locale/da/LC_MESSAGES/Guppi.mo
 share/locale/de/LC_MESSAGES/Guppi.mo
@@ -281,13 +201,93 @@ share/locale/sv/LC_MESSAGES/Guppi.mo
 share/locale/tr/LC_MESSAGES/Guppi.mo
 share/locale/uk/LC_MESSAGES/Guppi.mo
 share/locale/zh_CN/LC_MESSAGES/Guppi.mo
-@dirrm share/gnome/pixmaps/guppi
+share/oaf/GNOME_Guppi_Gnumeric.oaf
+share/pixmaps/gnome-guppi.png
+share/pixmaps/guppi/area.xpm
+share/pixmaps/guppi/bar.xpm
+share/pixmaps/guppi/basic-home.png
+share/pixmaps/guppi/basic-move.png
+share/pixmaps/guppi/basic-reframe.png
+share/pixmaps/guppi/basic-zoom.png
+share/pixmaps/guppi/bubble.xpm
+share/pixmaps/guppi/chart_bar_1_1.png
+share/pixmaps/guppi/chart_bar_1_2.png
+share/pixmaps/guppi/chart_bar_1_3.png
+share/pixmaps/guppi/chart_bar_2_1.png
+share/pixmaps/guppi/chart_bar_2_2.png
+share/pixmaps/guppi/chart_bar_2_3.png
+share/pixmaps/guppi/chart_bubble_1_1.png
+share/pixmaps/guppi/chart_column_1_1.png
+share/pixmaps/guppi/chart_column_1_2.png
+share/pixmaps/guppi/chart_column_1_3.png
+share/pixmaps/guppi/chart_column_2_1.png
+share/pixmaps/guppi/chart_column_2_2.png
+share/pixmaps/guppi/chart_column_2_3.png
+share/pixmaps/guppi/chart_column_3_1.png
+share/pixmaps/guppi/chart_cone_1_1.png
+share/pixmaps/guppi/chart_cone_1_2.png
+share/pixmaps/guppi/chart_cone_1_3.png
+share/pixmaps/guppi/chart_cone_2_1.png
+share/pixmaps/guppi/chart_cone_2_2.png
+share/pixmaps/guppi/chart_cone_2_3.png
+share/pixmaps/guppi/chart_cone_3_1.png
+share/pixmaps/guppi/chart_cylinder_1_1.png
+share/pixmaps/guppi/chart_cylinder_1_2.png
+share/pixmaps/guppi/chart_cylinder_1_3.png
+share/pixmaps/guppi/chart_cylinder_2_1.png
+share/pixmaps/guppi/chart_cylinder_2_2.png
+share/pixmaps/guppi/chart_cylinder_2_3.png
+share/pixmaps/guppi/chart_cylinder_3_1.png
+share/pixmaps/guppi/chart_line_1_1.png
+share/pixmaps/guppi/chart_line_1_2.png
+share/pixmaps/guppi/chart_line_1_3.png
+share/pixmaps/guppi/chart_line_2_1.png
+share/pixmaps/guppi/chart_line_2_2.png
+share/pixmaps/guppi/chart_line_2_3.png
+share/pixmaps/guppi/chart_line_3_1.png
+share/pixmaps/guppi/chart_pie_1_1.png
+share/pixmaps/guppi/chart_pie_1_2.png
+share/pixmaps/guppi/chart_pie_1_3.png
+share/pixmaps/guppi/chart_pie_2_1.png
+share/pixmaps/guppi/chart_pie_2_2.png
+share/pixmaps/guppi/chart_pie_2_3.png
+share/pixmaps/guppi/chart_pyramid_1_1.png
+share/pixmaps/guppi/chart_pyramid_1_2.png
+share/pixmaps/guppi/chart_pyramid_1_3.png
+share/pixmaps/guppi/chart_pyramid_2_1.png
+share/pixmaps/guppi/chart_pyramid_2_2.png
+share/pixmaps/guppi/chart_pyramid_2_3.png
+share/pixmaps/guppi/chart_pyramid_3_1.png
+share/pixmaps/guppi/chart_scatter_1_1.png
+share/pixmaps/guppi/chart_scatter_2_1.png
+share/pixmaps/guppi/chart_scatter_2_2.png
+share/pixmaps/guppi/chart_scatter_3_1.png
+share/pixmaps/guppi/chart_scatter_3_2.png
+share/pixmaps/guppi/chart_stock_1_1.png
+share/pixmaps/guppi/chart_stock_1_2.png
+share/pixmaps/guppi/chart_stock_2_1.png
+share/pixmaps/guppi/chart_stock_2_2.png
+share/pixmaps/guppi/column.xpm
+share/pixmaps/guppi/doughnut.xpm
+share/pixmaps/guppi/fill-best.png
+share/pixmaps/guppi/fill-horiz.png
+share/pixmaps/guppi/fill-vert.png
+share/pixmaps/guppi/guppi-splash.png
+share/pixmaps/guppi/linegraph.xpm
+share/pixmaps/guppi/lock.png
+share/pixmaps/guppi/pie.xpm
+share/pixmaps/guppi/radar.xpm
+share/pixmaps/guppi/resize-to-win.png
+share/pixmaps/guppi/scatter.xpm
+share/pixmaps/guppi/stock.xpm
+share/pixmaps/guppi/surface.xpm
+@dirrm share/pixmaps/guppi
+@dirrm %%DATADIR%%/scripts
+@dirrm %%DATADIR%%/glade
+@dirrm %%DATADIR%%
 @dirrm share/gnome/help/guppi/C/images
 @dirrm share/gnome/help/guppi/C
 @dirrm share/gnome/help/guppi
-@dirrm share/gnome/guppi/scripts
-@dirrm share/gnome/guppi/glade
-@dirrm share/gnome/guppi
 @dirrm lib/guppi/plug-ins/%%VERSION%%/plot/xybox
 @dirrm lib/guppi/plug-ins/%%VERSION%%/plot/text
 @dirrm lib/guppi/plug-ins/%%VERSION%%/plot/scatter
diff --git a/math/proofgeneral/Makefile b/math/proofgeneral/Makefile
index 6d91c0373f74..7edca40e8921 100644
--- a/math/proofgeneral/Makefile
+++ b/math/proofgeneral/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	proofgeneral
 PORTVERSION=	3.6
-PORTREVISION=	3
+PORTREVISION=	6
 CATEGORIES=	math elisp
 MASTER_SITES=	http://proofgeneral.inf.ed.ac.uk/releases/
 DISTNAME=	ProofGeneral-3.6pre061107
diff --git a/math/proofgeneral/files/patch-Makefile b/math/proofgeneral/files/patch-Makefile
index 2de740aac490..94175219e19c 100644
--- a/math/proofgeneral/files/patch-Makefile
+++ b/math/proofgeneral/files/patch-Makefile
@@ -77,18 +77,18 @@
 +	  ${BSD_INSTALL_DATA} etc/desktop/icons/48x48/proofgeneral.png ${DESKTOP}/icons/hicolor/48x48; \
 +	fi
 +
-+	if [ -d ${DESKTOP}/gnome ]; then \
-+	  ${BSD_INSTALL_DATA} etc/desktop/icons/48x48/proofgeneral.png ${DESKTOP}/gnome/pixmaps; \
-+	  ${BSD_INSTALL_DATA} etc/desktop/proofgeneral.desktop ${DESKTOP}/gnome/applications; \
-+	  ${BSD_INSTALL_DATA} etc/desktop/mime-info/proofgeneral.mime ${DESKTOP}/gnome/mime-info; \
-+	  ${BSD_INSTALL_DATA} etc/desktop/mime-info/proofgeneral.keys ${DESKTOP}/gnome/mime-info; \
++	if [ -d ${DESKTOP} ]; then \
++	  ${BSD_INSTALL_DATA} etc/desktop/icons/48x48/proofgeneral.png ${DESKTOP}/pixmaps; \
++	  ${BSD_INSTALL_DATA} etc/desktop/proofgeneral.desktop ${DESKTOP}/applications; \
++	  ${BSD_INSTALL_DATA} etc/desktop/mime-info/proofgeneral.mime ${DESKTOP}/mime-info; \
++	  ${BSD_INSTALL_DATA} etc/desktop/mime-info/proofgeneral.keys ${DESKTOP}/mime-info; \
 +	fi
 +
  # backwards compatibility with old linuxes
 -	mkdir -p ${DESKTOP}/application-registry
 -	cp etc/desktop/application-registry/proofgeneral.applications ${DESKTOP}/application-registry
-+	mkdir -p ${DESKTOP}/gnome/application-registry
-+	cp etc/desktop/application-registry/proofgeneral.applications ${DESKTOP}/gnome/application-registry
++	mkdir -p ${DESKTOP}/application-registry
++	cp etc/desktop/application-registry/proofgeneral.applications ${DESKTOP}/application-registry
  
  # NB: .el files are not strictly necessary, but we package/install them
  # for the time being to help with debugging, or for users to recompile.
diff --git a/math/proofgeneral/pkg-plist b/math/proofgeneral/pkg-plist
index 8cdc907e872e..9ed9b231f670 100644
--- a/math/proofgeneral/pkg-plist
+++ b/math/proofgeneral/pkg-plist
@@ -418,11 +418,11 @@ bin/isartags
 %%EMACS_SITE_LISPDIR%%/proofgeneral/x-symbol/info/x-symbol.info
 %%EMACS_SITE_LISPDIR%%/proofgeneral/x-symbol/README.x-symbol-for-ProofGeneral
 %%EMACS_SITE_LISPDIR%%/site-start.d/pg-init.el
-share/gnome/application-registry/proofgeneral.applications
-share/gnome/applications/proofgeneral.desktop
-share/gnome/mime-info/proofgeneral.keys
-share/gnome/mime-info/proofgeneral.mime
-share/gnome/pixmaps/proofgeneral.png
+share/application-registry/proofgeneral.applications
+share/applications/proofgeneral.desktop
+share/mime-info/proofgeneral.keys
+share/mime-info/proofgeneral.mime
+share/pixmaps/proofgeneral.png
 share/icons/hicolor/16x16/proofgeneral.png
 share/icons/hicolor/32x32/proofgeneral.png
 share/icons/hicolor/48x48/proofgeneral.png
@@ -548,3 +548,4 @@ share/icons/hicolor/48x48/proofgeneral.png
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/ProofGeneral
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/PG-adapting
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrmtry share/applications
diff --git a/math/qalculate/Makefile b/math/qalculate/Makefile
index 19fc8bb09400..a383f5a41fb1 100644
--- a/math/qalculate/Makefile
+++ b/math/qalculate/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	qalculate
 PORTVERSION=	0.9.6
+PORTREVISION=	1
 CATEGORIES=	math
 MASTER_SITES=	SF
 DISTNAME=	${PORTNAME}-gtk-${PORTVERSION}
diff --git a/math/qalculate/pkg-plist b/math/qalculate/pkg-plist
index 936d357abd48..b7f21dd77a3b 100644
--- a/math/qalculate/pkg-plist
+++ b/math/qalculate/pkg-plist
@@ -1,6 +1,6 @@
 bin/qalculate
 bin/qalculate-gtk
-share/gnome/applications/qalculate-gtk.desktop
+share/applications/qalculate-gtk.desktop
 share/gnome/help/qalculate-gtk/C/appendixa.xml
 share/gnome/help/qalculate-gtk/C/appendixb.xml
 share/gnome/help/qalculate-gtk/C/appendixc.xml
@@ -30,38 +30,39 @@ share/gnome/help/qalculate-gtk/C/figures/unit-manager.png
 share/gnome/help/qalculate-gtk/C/figures/variable-manager.png
 share/gnome/help/qalculate-gtk/C/legal.xml
 share/gnome/help/qalculate-gtk/C/qalculate-gtk.xml
-share/gnome/omf/qalculate-gtk/qalculate-gtk-C.omf
-share/gnome/pixmaps/qalculate.png
-share/gnome/qalculate-gtk/glade/about.glade
-share/gnome/qalculate-gtk/glade/argumentrules.glade
-share/gnome/qalculate-gtk/glade/csvexport.glade
-share/gnome/qalculate-gtk/glade/csvimport.glade
-share/gnome/qalculate-gtk/glade/datasetedit.glade
-share/gnome/qalculate-gtk/glade/datasets.glade
-share/gnome/qalculate-gtk/glade/decimals.glade
-share/gnome/qalculate-gtk/glade/functionedit.glade
-share/gnome/qalculate-gtk/glade/functions.glade
-share/gnome/qalculate-gtk/glade/main.glade
-share/gnome/qalculate-gtk/glade/matrix.glade
-share/gnome/qalculate-gtk/glade/matrixedit.glade
-share/gnome/qalculate-gtk/glade/namesedit.glade
-share/gnome/qalculate-gtk/glade/nbases.glade
-share/gnome/qalculate-gtk/glade/periodictable.glade
-share/gnome/qalculate-gtk/glade/plot.glade
-share/gnome/qalculate-gtk/glade/precision.glade
-share/gnome/qalculate-gtk/glade/preferences.glade
-share/gnome/qalculate-gtk/glade/setbase.glade
-share/gnome/qalculate-gtk/glade/unit.glade
-share/gnome/qalculate-gtk/glade/unitedit.glade
-share/gnome/qalculate-gtk/glade/units.glade
-share/gnome/qalculate-gtk/glade/unknownedit.glade
-share/gnome/qalculate-gtk/glade/variableedit.glade
-share/gnome/qalculate-gtk/glade/variables.glade
+share/omf/qalculate-gtk/qalculate-gtk-C.omf
+share/pixmaps/qalculate.png
+share/qalculate-gtk/glade/about.glade
+share/qalculate-gtk/glade/argumentrules.glade
+share/qalculate-gtk/glade/csvexport.glade
+share/qalculate-gtk/glade/csvimport.glade
+share/qalculate-gtk/glade/datasetedit.glade
+share/qalculate-gtk/glade/datasets.glade
+share/qalculate-gtk/glade/decimals.glade
+share/qalculate-gtk/glade/functionedit.glade
+share/qalculate-gtk/glade/functions.glade
+share/qalculate-gtk/glade/main.glade
+share/qalculate-gtk/glade/matrix.glade
+share/qalculate-gtk/glade/matrixedit.glade
+share/qalculate-gtk/glade/namesedit.glade
+share/qalculate-gtk/glade/nbases.glade
+share/qalculate-gtk/glade/periodictable.glade
+share/qalculate-gtk/glade/plot.glade
+share/qalculate-gtk/glade/precision.glade
+share/qalculate-gtk/glade/preferences.glade
+share/qalculate-gtk/glade/setbase.glade
+share/qalculate-gtk/glade/unit.glade
+share/qalculate-gtk/glade/unitedit.glade
+share/qalculate-gtk/glade/units.glade
+share/qalculate-gtk/glade/unknownedit.glade
+share/qalculate-gtk/glade/variableedit.glade
+share/qalculate-gtk/glade/variables.glade
 share/locale/nl/LC_MESSAGES/qalculate-gtk.mo
 share/locale/sv/LC_MESSAGES/qalculate-gtk.mo
-@dirrm share/gnome/qalculate-gtk/glade
-@dirrm share/gnome/qalculate-gtk
-@dirrm share/gnome/omf/qalculate-gtk
+@dirrm share/qalculate-gtk/glade
+@dirrm share/qalculate-gtk
+@dirrm share/omf/qalculate-gtk
 @dirrm share/gnome/help/qalculate-gtk/C/figures
 @dirrm share/gnome/help/qalculate-gtk/C
 @dirrm share/gnome/help/qalculate-gtk
+@dirrmtry share/applications
diff --git a/math/scigraphica/Makefile b/math/scigraphica/Makefile
index 4f97f2da6949..9d8c69aad7cf 100644
--- a/math/scigraphica/Makefile
+++ b/math/scigraphica/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	scigraphica
 PORTVERSION=	0.8.0
-PORTREVISION=	3
+PORTREVISION=	5
 CATEGORIES=	math gnome
 MASTER_SITES=	http://scigraphica.sourceforge.net/src/ \
 		${MASTER_SITE_SOURCEFORGE} \
@@ -37,12 +37,9 @@ MAKE_ENV=	PTHREAD_LIBS="${PTHREAD_LIBS}"
 pre-patch:
 	@${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
 		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
-	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${PERL} -pi -e \
-		's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \
-		 s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g'
 
 post-install:
-	@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${PREFIX}/share/gnome/scigraphica
-	@${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py ${PREFIX}/share/gnome/scigraphica
+	@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${PREFIX}/share/scigraphica
+	@${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py ${PREFIX}/share/scigraphica
 
 .include <bsd.port.post.mk>
diff --git a/math/scigraphica/files/patch-src::sg_project_menu.c b/math/scigraphica/files/patch-src::sg_project_menu.c
deleted file mode 100644
index f6401d2dafcd..000000000000
--- a/math/scigraphica/files/patch-src::sg_project_menu.c
+++ /dev/null
@@ -1,17 +0,0 @@
-
-$FreeBSD$
-
---- src/sg_project_menu.c	2001/07/04 14:27:49	1.1
-+++ src/sg_project_menu.c	2001/07/04 14:28:27
-@@ -554,9 +554,9 @@
-  }
- 
-  if ( getenv("SG_ROOT") )
--    g_snprintf(path, 250, "%s/share/scigraphica/examples/%s", getenv("SG_ROOT"), (gchar*)data);
-+    g_snprintf(path, 250, "%s/share/gnome/scigraphica/examples/%s", getenv("SG_ROOT"), (gchar*)data);
-  else
--    g_snprintf(path, 250, SG_ROOT "/share/scigraphica/examples/%s", (gchar*)data);
-+    g_snprintf(path, 250, SG_ROOT "/share/gnome/scigraphica/examples/%s", (gchar*)data);
- 
-  sg_project_close();
-  sg_project_new();
diff --git a/math/scigraphica/pkg-plist b/math/scigraphica/pkg-plist
index 5219f9091b72..24ac6877b27d 100644
--- a/math/scigraphica/pkg-plist
+++ b/math/scigraphica/pkg-plist
@@ -8,200 +8,200 @@ share/gnome/help/scigraphica/C/Modules.html
 share/gnome/help/scigraphica/C/Tutorial.html
 share/gnome/help/scigraphica/C/UserGuide.html
 share/gnome/help/scigraphica/C/topic.dat
-share/gnome/pixmaps/scigraphica/2d_small.xpm
-share/gnome/pixmaps/scigraphica/3d_small.xpm
-share/gnome/pixmaps/scigraphica/about_small.xpm
-share/gnome/pixmaps/scigraphica/add_column.xpm
-share/gnome/pixmaps/scigraphica/arrange.xpm
-share/gnome/pixmaps/scigraphica/arrow.xpm
-share/gnome/pixmaps/scigraphica/arrow2.xpm
-share/gnome/pixmaps/scigraphica/arrow_down.xpm
-share/gnome/pixmaps/scigraphica/arrow_left.xpm
-share/gnome/pixmaps/scigraphica/arrow_right.xpm
-share/gnome/pixmaps/scigraphica/arrow_up.xpm
-share/gnome/pixmaps/scigraphica/as.xpm
-share/gnome/pixmaps/scigraphica/autoscale.xpm
-share/gnome/pixmaps/scigraphica/bold.xpm
-share/gnome/pixmaps/scigraphica/book_small.xpm
-share/gnome/pixmaps/scigraphica/bullet.xpm
-share/gnome/pixmaps/scigraphica/button_ok.xpm
-share/gnome/pixmaps/scigraphica/color.xpm
-share/gnome/pixmaps/scigraphica/control.xpm
-share/gnome/pixmaps/scigraphica/copy.xpm
-share/gnome/pixmaps/scigraphica/cut.xpm
-share/gnome/pixmaps/scigraphica/dennied.xpm
-share/gnome/pixmaps/scigraphica/empty.xpm
-share/gnome/pixmaps/scigraphica/error.xpm
-share/gnome/pixmaps/scigraphica/exec_small.xpm
-share/gnome/pixmaps/scigraphica/exit_small.xpm
-share/gnome/pixmaps/scigraphica/eye.xpm
-share/gnome/pixmaps/scigraphica/fit5.xpm
-share/gnome/pixmaps/scigraphica/fit_page.xpm
-share/gnome/pixmaps/scigraphica/fitpage.xpm
-share/gnome/pixmaps/scigraphica/folder.xpm
-share/gnome/pixmaps/scigraphica/font.xpm
-share/gnome/pixmaps/scigraphica/function_small.xpm
-share/gnome/pixmaps/scigraphica/g_2dlayer.xpm
-share/gnome/pixmaps/scigraphica/g_3dcontour.xpm
-share/gnome/pixmaps/scigraphica/g_3dlayer.xpm
-share/gnome/pixmaps/scigraphica/g_bars.xpm
-share/gnome/pixmaps/scigraphica/g_boxes.xpm
-share/gnome/pixmaps/scigraphica/g_bubbles.xpm
-share/gnome/pixmaps/scigraphica/g_bubbles3d.xpm
-share/gnome/pixmaps/scigraphica/g_colors.xpm
-share/gnome/pixmaps/scigraphica/g_colors3d.xpm
-share/gnome/pixmaps/scigraphica/g_contour.xpm
-share/gnome/pixmaps/scigraphica/g_csurface.xpm
-share/gnome/pixmaps/scigraphica/g_density.xpm
-share/gnome/pixmaps/scigraphica/g_flux3d.xpm
-share/gnome/pixmaps/scigraphica/g_function.xpm
-share/gnome/pixmaps/scigraphica/g_hbars.xpm
-share/gnome/pixmaps/scigraphica/g_hbox.xpm
-share/gnome/pixmaps/scigraphica/g_impulses.xpm
-share/gnome/pixmaps/scigraphica/g_lines.xpm
-share/gnome/pixmaps/scigraphica/g_lpoints.xpm
-share/gnome/pixmaps/scigraphica/g_python.xpm
-share/gnome/pixmaps/scigraphica/g_scatter.xpm
-share/gnome/pixmaps/scigraphica/g_scatter3d.xpm
-share/gnome/pixmaps/scigraphica/g_surface.xpm
-share/gnome/pixmaps/scigraphica/g_vectors.xpm
-share/gnome/pixmaps/scigraphica/italic.xpm
-share/gnome/pixmaps/scigraphica/layer.xpm
-share/gnome/pixmaps/scigraphica/layer_control.xpm
-share/gnome/pixmaps/scigraphica/logo.xpm
-share/gnome/pixmaps/scigraphica/markers.xpm
-share/gnome/pixmaps/scigraphica/matrix_icon.xpm
-share/gnome/pixmaps/scigraphica/new.xpm
-share/gnome/pixmaps/scigraphica/new_2d.xpm
-share/gnome/pixmaps/scigraphica/new_2d_small.xpm
-share/gnome/pixmaps/scigraphica/new_3d.xpm
-share/gnome/pixmaps/scigraphica/new_3d_small.xpm
-share/gnome/pixmaps/scigraphica/new_function.xpm
-share/gnome/pixmaps/scigraphica/new_plot.xpm
-share/gnome/pixmaps/scigraphica/new_polar.xpm
-share/gnome/pixmaps/scigraphica/new_polar_small.xpm
-share/gnome/pixmaps/scigraphica/new_sheet.xpm
-share/gnome/pixmaps/scigraphica/new_small.xpm
-share/gnome/pixmaps/scigraphica/open.xpm
-share/gnome/pixmaps/scigraphica/open_small.xpm
-share/gnome/pixmaps/scigraphica/paint.xpm
-share/gnome/pixmaps/scigraphica/paste.xpm
-share/gnome/pixmaps/scigraphica/pixmaps.h
-share/gnome/pixmaps/scigraphica/plot_icon.xpm
-share/gnome/pixmaps/scigraphica/plot_icon2.xpm
-share/gnome/pixmaps/scigraphica/plot_small.xpm
-share/gnome/pixmaps/scigraphica/point.xpm
-share/gnome/pixmaps/scigraphica/pointers.xpm
-share/gnome/pixmaps/scigraphica/polar_small.xpm
-share/gnome/pixmaps/scigraphica/preferences_small.xpm
-share/gnome/pixmaps/scigraphica/print.xpm
-share/gnome/pixmaps/scigraphica/python_small.xpm
-share/gnome/pixmaps/scigraphica/reload.xpm
-share/gnome/pixmaps/scigraphica/reset.xpm
-share/gnome/pixmaps/scigraphica/rotate_x.xpm
-share/gnome/pixmaps/scigraphica/rotate_y.xpm
-share/gnome/pixmaps/scigraphica/rotate_z.xpm
-share/gnome/pixmaps/scigraphica/save.xpm
-share/gnome/pixmaps/scigraphica/save_as.xpm
-share/gnome/pixmaps/scigraphica/save_as_small.xpm
-share/gnome/pixmaps/scigraphica/save_small.xpm
-share/gnome/pixmaps/scigraphica/set_column.xpm
-share/gnome/pixmaps/scigraphica/sg.xpm
-share/gnome/pixmaps/scigraphica/sg_icon.xpm
-share/gnome/pixmaps/scigraphica/sg_small.xpm
-share/gnome/pixmaps/scigraphica/sheet_icon.xpm
-share/gnome/pixmaps/scigraphica/sheet_icon2.xpm
-share/gnome/pixmaps/scigraphica/sheet_small.xpm
-share/gnome/pixmaps/scigraphica/sorry.xpm
-share/gnome/pixmaps/scigraphica/stock_button_apply.xpm
-share/gnome/pixmaps/scigraphica/stock_button_cancel.xpm
-share/gnome/pixmaps/scigraphica/stock_button_close.xpm
-share/gnome/pixmaps/scigraphica/stock_button_no.xpm
-share/gnome/pixmaps/scigraphica/stock_button_ok.xpm
-share/gnome/pixmaps/scigraphica/stock_button_yes.xpm
-share/gnome/pixmaps/scigraphica/stock_down_arrow.xpm
-share/gnome/pixmaps/scigraphica/stock_font.xpm
-share/gnome/pixmaps/scigraphica/stock_help.xpm
-share/gnome/pixmaps/scigraphica/stock_left_arrow.xpm
-share/gnome/pixmaps/scigraphica/stock_open.xpm
-share/gnome/pixmaps/scigraphica/stock_pixmaps.h
-share/gnome/pixmaps/scigraphica/stock_right_arrow.xpm
-share/gnome/pixmaps/scigraphica/stock_up_arrow.xpm
-share/gnome/pixmaps/scigraphica/symbol_circle.xpm
-share/gnome/pixmaps/scigraphica/symbol_cross.xpm
-share/gnome/pixmaps/scigraphica/symbol_diamond.xpm
-share/gnome/pixmaps/scigraphica/symbol_dntriangle.xpm
-share/gnome/pixmaps/scigraphica/symbol_dot.xpm
-share/gnome/pixmaps/scigraphica/symbol_impulse.xpm
-share/gnome/pixmaps/scigraphica/symbol_ltriangle.xpm
-share/gnome/pixmaps/scigraphica/symbol_none.xpm
-share/gnome/pixmaps/scigraphica/symbol_plus.xpm
-share/gnome/pixmaps/scigraphica/symbol_rtriangle.xpm
-share/gnome/pixmaps/scigraphica/symbol_square.xpm
-share/gnome/pixmaps/scigraphica/symbol_star.xpm
-share/gnome/pixmaps/scigraphica/symbol_uptriangle.xpm
-share/gnome/pixmaps/scigraphica/target.xpm
-share/gnome/pixmaps/scigraphica/text.xpm
-share/gnome/pixmaps/scigraphica/tools.xpm
-share/gnome/pixmaps/scigraphica/warning.xpm
-share/gnome/pixmaps/scigraphica/zoom.xpm
-share/gnome/pixmaps/scigraphica/zoom_minus.xpm
-share/gnome/pixmaps/scigraphica/zoom_plus.xpm
-share/gnome/pixmaps/scigraphica/zoomin.xpm
-share/gnome/pixmaps/scigraphica/zoomout.xpm
-share/gnome/pixmaps/sg_icon.xpm
-share/gnome/scigraphica/examples/3d.sg
-share/gnome/scigraphica/examples/image.sg
-share/gnome/scigraphica/examples/matrix.sg
-share/gnome/scigraphica/examples/multicolumn.sg
-share/gnome/scigraphica/examples/polar.sg
-share/gnome/scigraphica/examples/py_example1.py
-share/gnome/scigraphica/examples/py_example1.pyc
-share/gnome/scigraphica/examples/py_example1.pyo
-share/gnome/scigraphica/examples/py_example2.py
-share/gnome/scigraphica/examples/py_example2.pyc
-share/gnome/scigraphica/examples/py_example2.pyo
-share/gnome/scigraphica/examples/simpletest.sg
-share/gnome/scigraphica/examples/test.dat
-share/gnome/scigraphica/examples/ticks.sg
-share/gnome/scigraphica/examples/trigonometric.sg
-share/gnome/scigraphica/examples/vectors.sg
-share/gnome/scigraphica/python/FitWizard.py
-share/gnome/scigraphica/python/FitWizard.pyc
-share/gnome/scigraphica/python/FitWizard.pyo
-share/gnome/scigraphica/python/SimpleStats.py
-share/gnome/scigraphica/python/SimpleStats.pyc
-share/gnome/scigraphica/python/SimpleStats.pyo
-share/gnome/scigraphica/python/clarens.py
-share/gnome/scigraphica/python/clarens.pyc
-share/gnome/scigraphica/python/clarens.pyo
-share/gnome/scigraphica/python/clarens_histograms.py
-share/gnome/scigraphica/python/clarens_histograms.pyc
-share/gnome/scigraphica/python/clarens_histograms.pyo
-share/gnome/scigraphica/python/gtkLeastSquares.py
-share/gnome/scigraphica/python/gtkLeastSquares.pyc
-share/gnome/scigraphica/python/gtkLeastSquares.pyo
-share/gnome/scigraphica/python/pstat.py
-share/gnome/scigraphica/python/pstat.pyc
-share/gnome/scigraphica/python/pstat.pyo
-share/gnome/scigraphica/python/pysga.py
-share/gnome/scigraphica/python/pysga.pyc
-share/gnome/scigraphica/python/pysga.pyo
-share/gnome/scigraphica/python/sgagtk.py
-share/gnome/scigraphica/python/sgagtk.pyc
-share/gnome/scigraphica/python/sgagtk.pyo
-share/gnome/scigraphica/python/stats.py
-share/gnome/scigraphica/python/stats.pyc
-share/gnome/scigraphica/python/stats.pyo
-share/gnome/scigraphica/python/test_plugin.py
-share/gnome/scigraphica/python/test_plugin.pyc
-share/gnome/scigraphica/python/test_plugin.pyo
-share/gnome/scigraphica/python/unpickler.py
-share/gnome/scigraphica/python/unpickler.pyc
-share/gnome/scigraphica/python/unpickler.pyo
-@dirrm share/gnome/scigraphica/python
-@dirrm share/gnome/scigraphica/examples
-@dirrm share/gnome/scigraphica
-@dirrm share/gnome/pixmaps/scigraphica
+share/pixmaps/scigraphica/2d_small.xpm
+share/pixmaps/scigraphica/3d_small.xpm
+share/pixmaps/scigraphica/about_small.xpm
+share/pixmaps/scigraphica/add_column.xpm
+share/pixmaps/scigraphica/arrange.xpm
+share/pixmaps/scigraphica/arrow.xpm
+share/pixmaps/scigraphica/arrow2.xpm
+share/pixmaps/scigraphica/arrow_down.xpm
+share/pixmaps/scigraphica/arrow_left.xpm
+share/pixmaps/scigraphica/arrow_right.xpm
+share/pixmaps/scigraphica/arrow_up.xpm
+share/pixmaps/scigraphica/as.xpm
+share/pixmaps/scigraphica/autoscale.xpm
+share/pixmaps/scigraphica/bold.xpm
+share/pixmaps/scigraphica/book_small.xpm
+share/pixmaps/scigraphica/bullet.xpm
+share/pixmaps/scigraphica/button_ok.xpm
+share/pixmaps/scigraphica/color.xpm
+share/pixmaps/scigraphica/control.xpm
+share/pixmaps/scigraphica/copy.xpm
+share/pixmaps/scigraphica/cut.xpm
+share/pixmaps/scigraphica/dennied.xpm
+share/pixmaps/scigraphica/empty.xpm
+share/pixmaps/scigraphica/error.xpm
+share/pixmaps/scigraphica/exec_small.xpm
+share/pixmaps/scigraphica/exit_small.xpm
+share/pixmaps/scigraphica/eye.xpm
+share/pixmaps/scigraphica/fit5.xpm
+share/pixmaps/scigraphica/fit_page.xpm
+share/pixmaps/scigraphica/fitpage.xpm
+share/pixmaps/scigraphica/folder.xpm
+share/pixmaps/scigraphica/font.xpm
+share/pixmaps/scigraphica/function_small.xpm
+share/pixmaps/scigraphica/g_2dlayer.xpm
+share/pixmaps/scigraphica/g_3dcontour.xpm
+share/pixmaps/scigraphica/g_3dlayer.xpm
+share/pixmaps/scigraphica/g_bars.xpm
+share/pixmaps/scigraphica/g_boxes.xpm
+share/pixmaps/scigraphica/g_bubbles.xpm
+share/pixmaps/scigraphica/g_bubbles3d.xpm
+share/pixmaps/scigraphica/g_colors.xpm
+share/pixmaps/scigraphica/g_colors3d.xpm
+share/pixmaps/scigraphica/g_contour.xpm
+share/pixmaps/scigraphica/g_csurface.xpm
+share/pixmaps/scigraphica/g_density.xpm
+share/pixmaps/scigraphica/g_flux3d.xpm
+share/pixmaps/scigraphica/g_function.xpm
+share/pixmaps/scigraphica/g_hbars.xpm
+share/pixmaps/scigraphica/g_hbox.xpm
+share/pixmaps/scigraphica/g_impulses.xpm
+share/pixmaps/scigraphica/g_lines.xpm
+share/pixmaps/scigraphica/g_lpoints.xpm
+share/pixmaps/scigraphica/g_python.xpm
+share/pixmaps/scigraphica/g_scatter.xpm
+share/pixmaps/scigraphica/g_scatter3d.xpm
+share/pixmaps/scigraphica/g_surface.xpm
+share/pixmaps/scigraphica/g_vectors.xpm
+share/pixmaps/scigraphica/italic.xpm
+share/pixmaps/scigraphica/layer.xpm
+share/pixmaps/scigraphica/layer_control.xpm
+share/pixmaps/scigraphica/logo.xpm
+share/pixmaps/scigraphica/markers.xpm
+share/pixmaps/scigraphica/matrix_icon.xpm
+share/pixmaps/scigraphica/new.xpm
+share/pixmaps/scigraphica/new_2d.xpm
+share/pixmaps/scigraphica/new_2d_small.xpm
+share/pixmaps/scigraphica/new_3d.xpm
+share/pixmaps/scigraphica/new_3d_small.xpm
+share/pixmaps/scigraphica/new_function.xpm
+share/pixmaps/scigraphica/new_plot.xpm
+share/pixmaps/scigraphica/new_polar.xpm
+share/pixmaps/scigraphica/new_polar_small.xpm
+share/pixmaps/scigraphica/new_sheet.xpm
+share/pixmaps/scigraphica/new_small.xpm
+share/pixmaps/scigraphica/open.xpm
+share/pixmaps/scigraphica/open_small.xpm
+share/pixmaps/scigraphica/paint.xpm
+share/pixmaps/scigraphica/paste.xpm
+share/pixmaps/scigraphica/pixmaps.h
+share/pixmaps/scigraphica/plot_icon.xpm
+share/pixmaps/scigraphica/plot_icon2.xpm
+share/pixmaps/scigraphica/plot_small.xpm
+share/pixmaps/scigraphica/point.xpm
+share/pixmaps/scigraphica/pointers.xpm
+share/pixmaps/scigraphica/polar_small.xpm
+share/pixmaps/scigraphica/preferences_small.xpm
+share/pixmaps/scigraphica/print.xpm
+share/pixmaps/scigraphica/python_small.xpm
+share/pixmaps/scigraphica/reload.xpm
+share/pixmaps/scigraphica/reset.xpm
+share/pixmaps/scigraphica/rotate_x.xpm
+share/pixmaps/scigraphica/rotate_y.xpm
+share/pixmaps/scigraphica/rotate_z.xpm
+share/pixmaps/scigraphica/save.xpm
+share/pixmaps/scigraphica/save_as.xpm
+share/pixmaps/scigraphica/save_as_small.xpm
+share/pixmaps/scigraphica/save_small.xpm
+share/pixmaps/scigraphica/set_column.xpm
+share/pixmaps/scigraphica/sg.xpm
+share/pixmaps/scigraphica/sg_icon.xpm
+share/pixmaps/scigraphica/sg_small.xpm
+share/pixmaps/scigraphica/sheet_icon.xpm
+share/pixmaps/scigraphica/sheet_icon2.xpm
+share/pixmaps/scigraphica/sheet_small.xpm
+share/pixmaps/scigraphica/sorry.xpm
+share/pixmaps/scigraphica/stock_button_apply.xpm
+share/pixmaps/scigraphica/stock_button_cancel.xpm
+share/pixmaps/scigraphica/stock_button_close.xpm
+share/pixmaps/scigraphica/stock_button_no.xpm
+share/pixmaps/scigraphica/stock_button_ok.xpm
+share/pixmaps/scigraphica/stock_button_yes.xpm
+share/pixmaps/scigraphica/stock_down_arrow.xpm
+share/pixmaps/scigraphica/stock_font.xpm
+share/pixmaps/scigraphica/stock_help.xpm
+share/pixmaps/scigraphica/stock_left_arrow.xpm
+share/pixmaps/scigraphica/stock_open.xpm
+share/pixmaps/scigraphica/stock_pixmaps.h
+share/pixmaps/scigraphica/stock_right_arrow.xpm
+share/pixmaps/scigraphica/stock_up_arrow.xpm
+share/pixmaps/scigraphica/symbol_circle.xpm
+share/pixmaps/scigraphica/symbol_cross.xpm
+share/pixmaps/scigraphica/symbol_diamond.xpm
+share/pixmaps/scigraphica/symbol_dntriangle.xpm
+share/pixmaps/scigraphica/symbol_dot.xpm
+share/pixmaps/scigraphica/symbol_impulse.xpm
+share/pixmaps/scigraphica/symbol_ltriangle.xpm
+share/pixmaps/scigraphica/symbol_none.xpm
+share/pixmaps/scigraphica/symbol_plus.xpm
+share/pixmaps/scigraphica/symbol_rtriangle.xpm
+share/pixmaps/scigraphica/symbol_square.xpm
+share/pixmaps/scigraphica/symbol_star.xpm
+share/pixmaps/scigraphica/symbol_uptriangle.xpm
+share/pixmaps/scigraphica/target.xpm
+share/pixmaps/scigraphica/text.xpm
+share/pixmaps/scigraphica/tools.xpm
+share/pixmaps/scigraphica/warning.xpm
+share/pixmaps/scigraphica/zoom.xpm
+share/pixmaps/scigraphica/zoom_minus.xpm
+share/pixmaps/scigraphica/zoom_plus.xpm
+share/pixmaps/scigraphica/zoomin.xpm
+share/pixmaps/scigraphica/zoomout.xpm
+share/pixmaps/sg_icon.xpm
+share/scigraphica/examples/3d.sg
+share/scigraphica/examples/image.sg
+share/scigraphica/examples/matrix.sg
+share/scigraphica/examples/multicolumn.sg
+share/scigraphica/examples/polar.sg
+share/scigraphica/examples/py_example1.py
+share/scigraphica/examples/py_example1.pyc
+share/scigraphica/examples/py_example1.pyo
+share/scigraphica/examples/py_example2.py
+share/scigraphica/examples/py_example2.pyc
+share/scigraphica/examples/py_example2.pyo
+share/scigraphica/examples/simpletest.sg
+share/scigraphica/examples/test.dat
+share/scigraphica/examples/ticks.sg
+share/scigraphica/examples/trigonometric.sg
+share/scigraphica/examples/vectors.sg
+share/scigraphica/python/FitWizard.py
+share/scigraphica/python/FitWizard.pyc
+share/scigraphica/python/FitWizard.pyo
+share/scigraphica/python/SimpleStats.py
+share/scigraphica/python/SimpleStats.pyc
+share/scigraphica/python/SimpleStats.pyo
+share/scigraphica/python/clarens.py
+share/scigraphica/python/clarens.pyc
+share/scigraphica/python/clarens.pyo
+share/scigraphica/python/clarens_histograms.py
+share/scigraphica/python/clarens_histograms.pyc
+share/scigraphica/python/clarens_histograms.pyo
+share/scigraphica/python/gtkLeastSquares.py
+share/scigraphica/python/gtkLeastSquares.pyc
+share/scigraphica/python/gtkLeastSquares.pyo
+share/scigraphica/python/pstat.py
+share/scigraphica/python/pstat.pyc
+share/scigraphica/python/pstat.pyo
+share/scigraphica/python/pysga.py
+share/scigraphica/python/pysga.pyc
+share/scigraphica/python/pysga.pyo
+share/scigraphica/python/sgagtk.py
+share/scigraphica/python/sgagtk.pyc
+share/scigraphica/python/sgagtk.pyo
+share/scigraphica/python/stats.py
+share/scigraphica/python/stats.pyc
+share/scigraphica/python/stats.pyo
+share/scigraphica/python/test_plugin.py
+share/scigraphica/python/test_plugin.pyc
+share/scigraphica/python/test_plugin.pyo
+share/scigraphica/python/unpickler.py
+share/scigraphica/python/unpickler.pyc
+share/scigraphica/python/unpickler.pyo
+@dirrm share/scigraphica/python
+@dirrm share/scigraphica/examples
+@dirrm share/scigraphica
+@dirrm share/pixmaps/scigraphica
 @dirrm share/gnome/help/scigraphica/C
 @dirrm share/gnome/help/scigraphica
diff --git a/misc/Makefile b/misc/Makefile
index 3e3629e481a8..0531f01ae055 100644
--- a/misc/Makefile
+++ b/misc/Makefile
@@ -121,10 +121,12 @@
     SUBDIR += gkx86info
     SUBDIR += gkx86info2
     SUBDIR += gman
+    SUBDIR += gnome-devel-docs
     SUBDIR += gnome-icon-theme
     SUBDIR += gnome-mime-data
     SUBDIR += gnome-osd
     SUBDIR += gnome-user-docs
+    SUBDIR += gnome2-reference
     SUBDIR += gnomehier
     SUBDIR += gnomesword
     SUBDIR += gnu-watch
diff --git a/misc/gnome-devel-docs/Makefile b/misc/gnome-devel-docs/Makefile
new file mode 100644
index 000000000000..997a6b4b2c0f
--- /dev/null
+++ b/misc/gnome-devel-docs/Makefile
@@ -0,0 +1,25 @@
+# New ports collection makefile for:	gnome-devel-docs
+# Date created:		2007-09-18
+# Whom:			Michael Johnson <ahze@FreeBSD.org>
+#
+# $FreeBSD$
+#    $MCom: ports/misc/gnome-devel-docs/Makefile,v 1.1 2007/09/18 15:23:15 ahze Exp $
+
+PORTNAME=	gnome-devel-docs
+PORTVERSION=	2.20.0
+CATEGORIES=	misc gnome
+MASTER_SITES=	GNOME
+DIST_SUBDIR=	gnome2
+
+MAINTAINER=	ahze@FreeBSD.org
+COMMENT=	Documents targeted for GNOME developers
+
+BUILD_DEPENDS=	gnome-doc-prepare:${PORTSDIR}/textproc/gnome-doc-utils
+RUN_DEPENDS=	gnome-doc-prepare:${PORTSDIR}/textproc/gnome-doc-utils
+
+USE_BZIP2=	yes
+GNU_CONFIGURE=	yes
+USE_GMAKE=	yes
+INSTALLS_OMF=	yes
+
+.include <bsd.port.mk>
diff --git a/misc/gnome-devel-docs/distinfo b/misc/gnome-devel-docs/distinfo
new file mode 100644
index 000000000000..b8d1c3b1a78c
--- /dev/null
+++ b/misc/gnome-devel-docs/distinfo
@@ -0,0 +1,3 @@
+MD5 (gnome2/gnome-devel-docs-2.20.0.tar.bz2) = 64d6e3594b2c6422ea8d17b78f501020
+SHA256 (gnome2/gnome-devel-docs-2.20.0.tar.bz2) = 0d966471c8199350df7d3ecc712cde7efd9c52d8d4d31c87060bc5d70c5448ff
+SIZE (gnome2/gnome-devel-docs-2.20.0.tar.bz2) = 2373648
diff --git a/misc/gnome-devel-docs/pkg-descr b/misc/gnome-devel-docs/pkg-descr
new file mode 100644
index 000000000000..141383ea37ec
--- /dev/null
+++ b/misc/gnome-devel-docs/pkg-descr
@@ -0,0 +1 @@
+Documents targeted for GNOME developers
diff --git a/misc/gnome-devel-docs/pkg-plist b/misc/gnome-devel-docs/pkg-plist
new file mode 100644
index 000000000000..3f2151d25f3f
--- /dev/null
+++ b/misc/gnome-devel-docs/pkg-plist
@@ -0,0 +1,387 @@
+share/gnome/help/gdp-handbook/C/builddocs.xml
+share/gnome/help/gdp-handbook/C/callout_procedure.xml
+share/gnome/help/gdp-handbook/C/contexthelp.xml
+share/gnome/help/gdp-handbook/C/conventions.xml
+share/gnome/help/gdp-handbook/C/crossreferencing.xml
+share/gnome/help/gdp-handbook/C/docbook.xml
+share/gnome/help/gdp-handbook/C/docsystem.xml
+share/gnome/help/gdp-handbook/C/finish.xml
+share/gnome/help/gdp-handbook/C/gdp-handbook.xml
+share/gnome/help/gdp-handbook/C/getstarted.xml
+share/gnome/help/gdp-handbook/C/introduction.xml
+share/gnome/help/gdp-handbook/C/legal.xml
+share/gnome/help/gdp-handbook/C/manuals.xml
+share/gnome/help/gdp-handbook/C/resources.xml
+share/gnome/help/gdp-handbook/C/screenshot_procedure.xml
+share/gnome/help/gdp-handbook/C/sectids.xml
+share/gnome/help/gdp-handbook/C/teamwork.xml
+share/gnome/help/gdp-style-guide/C/Authorlist.xml
+share/gnome/help/gdp-style-guide/C/accessibility.xml
+share/gnome/help/gdp-style-guide/C/figures/applet_popup_menu.png
+share/gnome/help/gdp-style-guide/C/figures/arrow_button1.png
+share/gnome/help/gdp-style-guide/C/figures/arrow_button2.png
+share/gnome/help/gdp-style-guide/C/figures/callout_notflow.png
+share/gnome/help/gdp-style-guide/C/figures/check_box.png
+share/gnome/help/gdp-style-guide/C/figures/color_selector_button.png
+share/gnome/help/gdp-style-guide/C/figures/color_wheel1.png
+share/gnome/help/gdp-style-guide/C/figures/color_wheel2.png
+share/gnome/help/gdp-style-guide/C/figures/column_heading.png
+share/gnome/help/gdp-style-guide/C/figures/command_button.png
+share/gnome/help/gdp-style-guide/C/figures/desktop_background_menu.png
+share/gnome/help/gdp-style-guide/C/figures/desktop_elements.png
+share/gnome/help/gdp-style-guide/C/figures/dropdown_combination_box.png
+share/gnome/help/gdp-style-guide/C/figures/dropdown_list_box.png
+share/gnome/help/gdp-style-guide/C/figures/dropdown_section1.png
+share/gnome/help/gdp-style-guide/C/figures/dropdown_section2.png
+share/gnome/help/gdp-style-guide/C/figures/field.png
+share/gnome/help/gdp-style-guide/C/figures/font_selector_button.png
+share/gnome/help/gdp-style-guide/C/figures/footprint_icon.png
+share/gnome/help/gdp-style-guide/C/figures/gnome_menu.png
+share/gnome/help/gdp-style-guide/C/figures/group_box.png
+share/gnome/help/gdp-style-guide/C/figures/icon_selector_button1.png
+share/gnome/help/gdp-style-guide/C/figures/icon_selector_button2.png
+share/gnome/help/gdp-style-guide/C/figures/launcher_popup_menu.png
+share/gnome/help/gdp-style-guide/C/figures/list_box.png
+share/gnome/help/gdp-style-guide/C/figures/panel_elements.png
+share/gnome/help/gdp-style-guide/C/figures/panel_object_popup_menu.png
+share/gnome/help/gdp-style-guide/C/figures/panel_popup_menu.png
+share/gnome/help/gdp-style-guide/C/figures/radio_button.png
+share/gnome/help/gdp-style-guide/C/figures/sample_anno_panel.png
+share/gnome/help/gdp-style-guide/C/figures/scrollbar.png
+share/gnome/help/gdp-style-guide/C/figures/slider.png
+share/gnome/help/gdp-style-guide/C/figures/spin_box.png
+share/gnome/help/gdp-style-guide/C/figures/tabbed_section.png
+share/gnome/help/gdp-style-guide/C/figures/table.png
+share/gnome/help/gdp-style-guide/C/figures/tabs.png
+share/gnome/help/gdp-style-guide/C/figures/text_box.png
+share/gnome/help/gdp-style-guide/C/figures/toggle_button.png
+share/gnome/help/gdp-style-guide/C/figures/toolbar_button.png
+share/gnome/help/gdp-style-guide/C/figures/window_elements.png
+share/gnome/help/gdp-style-guide/C/figures/window_frame_button.png
+share/gnome/help/gdp-style-guide/C/figures/window_list_button.png
+share/gnome/help/gdp-style-guide/C/figures/window_menu.png
+share/gnome/help/gdp-style-guide/C/figures/window_panes.png
+share/gnome/help/gdp-style-guide/C/figures/window_titlebar_elements.png
+share/gnome/help/gdp-style-guide/C/fundamentals.xml
+share/gnome/help/gdp-style-guide/C/gdp-style-guide.xml
+share/gnome/help/gdp-style-guide/C/grammar_usage.xml
+share/gnome/help/gdp-style-guide/C/gui.xml
+share/gnome/help/gdp-style-guide/C/improving.xml
+share/gnome/help/gdp-style-guide/C/indexing.xml
+share/gnome/help/gdp-style-guide/C/infoblocks.xml
+share/gnome/help/gdp-style-guide/C/infodesign.xml
+share/gnome/help/gdp-style-guide/C/language.xml
+share/gnome/help/gdp-style-guide/C/legal.xml
+share/gnome/help/gdp-style-guide/C/legal_issues.xml
+share/gnome/help/gdp-style-guide/C/locale.xml
+share/gnome/help/gdp-style-guide/C/preface.xml
+share/gnome/help/gdp-style-guide/C/screenshot.xml
+share/gnome/help/gdp-style-guide/C/units.xml
+share/gnome/help/gdp-style-guide/C/usability.xml
+share/gnome/help/gdp-style-guide/C/wordlist.xml
+share/gnome/help/hig-book/C/hig-book.xml
+share/gnome/help/hig-book/C/hig-ch-bibliography.xml
+share/gnome/help/hig-book/C/hig-ch-checks.xml
+share/gnome/help/hig-book/C/hig-ch-controls.xml
+share/gnome/help/hig-book/C/hig-ch-credits.xml
+share/gnome/help/hig-book/C/hig-ch-desktop.xml
+share/gnome/help/hig-book/C/hig-ch-feedback.xml
+share/gnome/help/hig-book/C/hig-ch-icons-new.xml
+share/gnome/help/hig-book/C/hig-ch-icons.xml
+share/gnome/help/hig-book/C/hig-ch-input.xml
+share/gnome/help/hig-book/C/hig-ch-intro.xml
+share/gnome/help/hig-book/C/hig-ch-language.xml
+share/gnome/help/hig-book/C/hig-ch-layout.xml
+share/gnome/help/hig-book/C/hig-ch-menus.xml
+share/gnome/help/hig-book/C/hig-ch-principles.xml
+share/gnome/help/hig-book/C/hig-ch-toolbars.xml
+share/gnome/help/hig-book/C/hig-ch-windows.xml
+share/gnome/help/hig-book/C/images/EvoToolbar.png
+share/gnome/help/hig-book/C/images/GtkToolbar.png
+share/gnome/help/hig-book/C/images/GtkToolbar_browserdefault.png
+share/gnome/help/hig-book/C/images/GtkToolbar_gedit.png
+share/gnome/help/hig-book/C/images/GtkToolbar_productivitydefault.png
+share/gnome/help/hig-book/C/images/abiword-icon.png
+share/gnome/help/hig-book/C/images/action-icon.png
+share/gnome/help/hig-book/C/images/alert-button-order.png
+share/gnome/help/hig-book/C/images/alert-spacing.png
+share/gnome/help/hig-book/C/images/alert-text.png
+share/gnome/help/hig-book/C/images/application-edit-menu.png
+share/gnome/help/hig-book/C/images/application-icons.png
+share/gnome/help/hig-book/C/images/application-menubar.png
+share/gnome/help/hig-book/C/images/applications-menu.png
+share/gnome/help/hig-book/C/images/assistant-first-page.png
+share/gnome/help/hig-book/C/images/assistant-middle-page.png
+share/gnome/help/hig-book/C/images/authentication-alert.png
+share/gnome/help/hig-book/C/images/browser-toolbar.png
+share/gnome/help/hig-book/C/images/busy-pointers.png
+share/gnome/help/hig-book/C/images/caution.png
+share/gnome/help/hig-book/C/images/checkbox-menu.png
+share/gnome/help/hig-book/C/images/checkbox_label.png
+share/gnome/help/hig-book/C/images/checklist-window-done.png
+share/gnome/help/hig-book/C/images/checklist-window-in-progress.png
+share/gnome/help/hig-book/C/images/checklist-window-start.png
+share/gnome/help/hig-book/C/images/colour_and_arrows.png
+share/gnome/help/hig-book/C/images/colour_only.png
+share/gnome/help/hig-book/C/images/command-menu.png
+share/gnome/help/hig-book/C/images/confirmation-alert.png
+share/gnome/help/hig-book/C/images/controls-buttons.png
+share/gnome/help/hig-book/C/images/controls-check-box-ambiguous.png
+share/gnome/help/hig-book/C/images/controls-check-boxes-mixed.png
+share/gnome/help/hig-book/C/images/controls-check-boxes.png
+share/gnome/help/hig-book/C/images/controls-combo.png
+share/gnome/help/hig-book/C/images/controls-frames.png
+share/gnome/help/hig-book/C/images/controls-list-checkbox.png
+share/gnome/help/hig-book/C/images/controls-list.png
+share/gnome/help/hig-book/C/images/controls-locked.png
+share/gnome/help/hig-book/C/images/controls-notebook-list.png
+share/gnome/help/hig-book/C/images/controls-notebook-tabs.png
+share/gnome/help/hig-book/C/images/controls-notebook.png
+share/gnome/help/hig-book/C/images/controls-old-frames.png
+share/gnome/help/hig-book/C/images/controls-option-menu.png
+share/gnome/help/hig-book/C/images/controls-radio-button-mixed.png
+share/gnome/help/hig-book/C/images/controls-radio-buttons.png
+share/gnome/help/hig-book/C/images/controls-sensitivity.png
+share/gnome/help/hig-book/C/images/controls-slider-spinbox.png
+share/gnome/help/hig-book/C/images/controls-slider.png
+share/gnome/help/hig-book/C/images/controls-spin-box.png
+share/gnome/help/hig-book/C/images/controls-status-bar-interactive.png
+share/gnome/help/hig-book/C/images/controls-status-bar.png
+share/gnome/help/hig-book/C/images/controls-text-choose.png
+share/gnome/help/hig-book/C/images/controls-text-prompt.png
+share/gnome/help/hig-book/C/images/controls-text.png
+share/gnome/help/hig-book/C/images/controls-toggle-button-mixed.png
+share/gnome/help/hig-book/C/images/controls-toggle-buttons.png
+share/gnome/help/hig-book/C/images/controls-tree-checkbox.png
+share/gnome/help/hig-book/C/images/controls-tree.png
+share/gnome/help/hig-book/C/images/depend1.png
+share/gnome/help/hig-book/C/images/depend1a.png
+share/gnome/help/hig-book/C/images/depend2.png
+share/gnome/help/hig-book/C/images/depend2a.png
+share/gnome/help/hig-book/C/images/depend3.png
+share/gnome/help/hig-book/C/images/df.png
+share/gnome/help/hig-book/C/images/dragcursor-augmented.png
+share/gnome/help/hig-book/C/images/dragcursor-copy.png
+share/gnome/help/hig-book/C/images/dragcursor-link.png
+share/gnome/help/hig-book/C/images/dragcursor-move.png
+share/gnome/help/hig-book/C/images/dragcursor-nodrop.png
+share/gnome/help/hig-book/C/images/dragcursor-rmb.png
+share/gnome/help/hig-book/C/images/earthDeutan.png
+share/gnome/help/hig-book/C/images/earthNorm.png
+share/gnome/help/hig-book/C/images/earthTritan.png
+share/gnome/help/hig-book/C/images/error-alert.png
+share/gnome/help/hig-book/C/images/evolution-icon.png
+share/gnome/help/hig-book/C/images/explicit-apply.png
+share/gnome/help/hig-book/C/images/file-menu.png
+share/gnome/help/hig-book/C/images/floppy-dissected.png
+share/gnome/help/hig-book/C/images/fontsel-icon.png
+share/gnome/help/hig-book/C/images/fontsel-suggestion.png
+share/gnome/help/hig-book/C/images/gdiskfree-menu.png
+share/gnome/help/hig-book/C/images/gdiskfree.png
+share/gnome/help/hig-book/C/images/gedit-icon.png
+share/gnome/help/hig-book/C/images/generic-bookmarks-menu.png
+share/gnome/help/hig-book/C/images/generic-browser-go-menu.png
+share/gnome/help/hig-book/C/images/generic-document-go-menu.png
+share/gnome/help/hig-book/C/images/generic-format-menu.png
+share/gnome/help/hig-book/C/images/generic-help-menu.png
+share/gnome/help/hig-book/C/images/generic-insert-menu.png
+share/gnome/help/hig-book/C/images/generic-view-menu.png
+share/gnome/help/hig-book/C/images/generic-windows-menu.png
+share/gnome/help/hig-book/C/images/gide-icon.png
+share/gnome/help/hig-book/C/images/glyph-icon.png
+share/gnome/help/hig-book/C/images/gnome-http-url.png
+share/gnome/help/hig-book/C/images/gnome-package.png
+share/gnome/help/hig-book/C/images/gnome-text-x-readme.png
+share/gnome/help/hig-book/C/images/gnumeric-icon.png
+share/gnome/help/hig-book/C/images/highcontrast-book-blur.png
+share/gnome/help/hig-book/C/images/highcontrast-book.png
+share/gnome/help/hig-book/C/images/highcontrast-cdrom-blur.png
+share/gnome/help/hig-book/C/images/highcontrast-cdrom.png
+share/gnome/help/hig-book/C/images/highcontrast-copy-blur.png
+share/gnome/help/hig-book/C/images/highcontrast-copy.png
+share/gnome/help/hig-book/C/images/highcontrast-metaphors.png
+share/gnome/help/hig-book/C/images/icon-design-process-1.png
+share/gnome/help/hig-book/C/images/icon-design-process-10.png
+share/gnome/help/hig-book/C/images/icon-design-process-11.png
+share/gnome/help/hig-book/C/images/icon-design-process-12.png
+share/gnome/help/hig-book/C/images/icon-design-process-2.png
+share/gnome/help/hig-book/C/images/icon-design-process-3.png
+share/gnome/help/hig-book/C/images/icon-design-process-4.png
+share/gnome/help/hig-book/C/images/icon-design-process-5.png
+share/gnome/help/hig-book/C/images/icon-design-process-6.png
+share/gnome/help/hig-book/C/images/icon-design-process-7.png
+share/gnome/help/hig-book/C/images/icon-design-process-8.png
+share/gnome/help/hig-book/C/images/icon-design-process-9.png
+share/gnome/help/hig-book/C/images/icon-style-aqua.png
+share/gnome/help/hig-book/C/images/icon-style-gnome.png
+share/gnome/help/hig-book/C/images/icon-style-java.png
+share/gnome/help/hig-book/C/images/icon_perspective_shelf.png
+share/gnome/help/hig-book/C/images/icon_perspective_table.png
+share/gnome/help/hig-book/C/images/icons_labels.png
+share/gnome/help/hig-book/C/images/important.png
+share/gnome/help/hig-book/C/images/information-alert.png
+share/gnome/help/hig-book/C/images/installer-icon.png
+share/gnome/help/hig-book/C/images/label_above.png
+share/gnome/help/hig-book/C/images/label_below.png
+share/gnome/help/hig-book/C/images/label_left.png
+share/gnome/help/hig-book/C/images/label_right.png
+share/gnome/help/hig-book/C/images/large_icon_label.png
+share/gnome/help/hig-book/C/images/layout1.png
+share/gnome/help/hig-book/C/images/layout2.png
+share/gnome/help/hig-book/C/images/layout_callouts.png
+share/gnome/help/hig-book/C/images/levels-lowcontrast.png
+share/gnome/help/hig-book/C/images/list_control_label.png
+share/gnome/help/hig-book/C/images/log-icon.png
+share/gnome/help/hig-book/C/images/manual-alert-spacing.png
+share/gnome/help/hig-book/C/images/manual-button-ordering.png
+share/gnome/help/hig-book/C/images/mdi.png
+share/gnome/help/hig-book/C/images/menu-icons.png
+share/gnome/help/hig-book/C/images/mnemonics_and_shortcuts.png
+share/gnome/help/hig-book/C/images/nautilus-icon.png
+share/gnome/help/hig-book/C/images/note.png
+share/gnome/help/hig-book/C/images/object-icon.png
+share/gnome/help/hig-book/C/images/object-icons.png
+share/gnome/help/hig-book/C/images/object-menu.png
+share/gnome/help/hig-book/C/images/object-menubar.png
+share/gnome/help/hig-book/C/images/other_labels.png
+share/gnome/help/hig-book/C/images/palette-1.png
+share/gnome/help/hig-book/C/images/palette-10.png
+share/gnome/help/hig-book/C/images/palette-11.png
+share/gnome/help/hig-book/C/images/palette-12.png
+share/gnome/help/hig-book/C/images/palette-13.png
+share/gnome/help/hig-book/C/images/palette-14.png
+share/gnome/help/hig-book/C/images/palette-15.png
+share/gnome/help/hig-book/C/images/palette-16.png
+share/gnome/help/hig-book/C/images/palette-17.png
+share/gnome/help/hig-book/C/images/palette-18.png
+share/gnome/help/hig-book/C/images/palette-19.png
+share/gnome/help/hig-book/C/images/palette-2.png
+share/gnome/help/hig-book/C/images/palette-20.png
+share/gnome/help/hig-book/C/images/palette-21.png
+share/gnome/help/hig-book/C/images/palette-22.png
+share/gnome/help/hig-book/C/images/palette-23.png
+share/gnome/help/hig-book/C/images/palette-24.png
+share/gnome/help/hig-book/C/images/palette-25.png
+share/gnome/help/hig-book/C/images/palette-26.png
+share/gnome/help/hig-book/C/images/palette-27.png
+share/gnome/help/hig-book/C/images/palette-28.png
+share/gnome/help/hig-book/C/images/palette-29.png
+share/gnome/help/hig-book/C/images/palette-3.png
+share/gnome/help/hig-book/C/images/palette-30.png
+share/gnome/help/hig-book/C/images/palette-31.png
+share/gnome/help/hig-book/C/images/palette-32.png
+share/gnome/help/hig-book/C/images/palette-4.png
+share/gnome/help/hig-book/C/images/palette-5.png
+share/gnome/help/hig-book/C/images/palette-6.png
+share/gnome/help/hig-book/C/images/palette-7.png
+share/gnome/help/hig-book/C/images/palette-8.png
+share/gnome/help/hig-book/C/images/palette-9.png
+share/gnome/help/hig-book/C/images/pointingdevices.png
+share/gnome/help/hig-book/C/images/popup-menu.png
+share/gnome/help/hig-book/C/images/preferences-window.png
+share/gnome/help/hig-book/C/images/primary-window.png
+share/gnome/help/hig-book/C/images/progress-checklist-with-bar.png
+share/gnome/help/hig-book/C/images/progress-checklist.png
+share/gnome/help/hig-book/C/images/progress-indeterminate.png
+share/gnome/help/hig-book/C/images/progress-proportion.png
+share/gnome/help/hig-book/C/images/progress-time.png
+share/gnome/help/hig-book/C/images/progress-typical-time.png
+share/gnome/help/hig-book/C/images/progress-window-copy.png
+share/gnome/help/hig-book/C/images/progress-window.png
+share/gnome/help/hig-book/C/images/property-window.png
+share/gnome/help/hig-book/C/images/quit1.png
+share/gnome/help/hig-book/C/images/quit2.png
+share/gnome/help/hig-book/C/images/radio_button_label.png
+share/gnome/help/hig-book/C/images/radiobutton-menu.png
+share/gnome/help/hig-book/C/images/rubberband.png
+share/gnome/help/hig-book/C/images/rubberband_dia.png
+share/gnome/help/hig-book/C/images/save1.png
+share/gnome/help/hig-book/C/images/save2.png
+share/gnome/help/hig-book/C/images/save_alert.png
+share/gnome/help/hig-book/C/images/sdi.png
+share/gnome/help/hig-book/C/images/shutdown-icon.png
+share/gnome/help/hig-book/C/images/size-48x48.png
+share/gnome/help/hig-book/C/images/small_icon_label.png
+share/gnome/help/hig-book/C/images/sodipodi-icon.png
+share/gnome/help/hig-book/C/images/softwareupdateicon.png
+share/gnome/help/hig-book/C/images/stock_save.png
+share/gnome/help/hig-book/C/images/submenu.png
+share/gnome/help/hig-book/C/images/tabbed-dialog-box.png
+share/gnome/help/hig-book/C/images/textbox_label.png
+share/gnome/help/hig-book/C/images/tip.png
+share/gnome/help/hig-book/C/images/toolbar-icons.png
+share/gnome/help/hig-book/C/images/toolbar-silhouette.png
+share/gnome/help/hig-book/C/images/toolbox-small.png
+share/gnome/help/hig-book/C/images/toolbox.png
+share/gnome/help/hig-book/C/images/underline-icon.png
+share/gnome/help/hig-book/C/images/view-toolbar.png
+share/gnome/help/hig-book/C/images/warning.png
+share/gnome/help/hig-book/C/images/window-title.png
+share/gnome/help/hig-book/C/images/ximian-palette.png
+share/gnome/help/integration-guide/C/integration-guide.xml
+share/gnome/help/platform-overview/C/apx-modules.xml
+share/gnome/help/platform-overview/C/bindings.xml
+share/gnome/help/platform-overview/C/core-tech.xml
+share/gnome/help/platform-overview/C/desktop-tech.xml
+share/gnome/help/platform-overview/C/figures/graphics.png
+share/gnome/help/platform-overview/C/figures/i18n.png
+share/gnome/help/platform-overview/C/figures/pango.png
+share/gnome/help/platform-overview/C/intro.xml
+share/gnome/help/platform-overview/C/ipc-network.xml
+share/gnome/help/platform-overview/C/legal-fdl.xml
+share/gnome/help/platform-overview/C/platform-overview.xml
+share/gnome/help/platform-overview/C/platform.xml
+share/gnome/help/platform-overview/es/apx-modules.xml
+share/gnome/help/platform-overview/es/bindings.xml
+share/gnome/help/platform-overview/es/core-tech.xml
+share/gnome/help/platform-overview/es/desktop-tech.xml
+share/gnome/help/platform-overview/es/figures/graphics.png
+share/gnome/help/platform-overview/es/figures/i18n.png
+share/gnome/help/platform-overview/es/figures/pango.png
+share/gnome/help/platform-overview/es/intro.xml
+share/gnome/help/platform-overview/es/ipc-network.xml
+share/gnome/help/platform-overview/es/legal-fdl.xml
+share/gnome/help/platform-overview/es/platform-overview.xml
+share/gnome/help/platform-overview/es/platform.xml
+share/gnome/help/platform-overview/it/apx-modules.xml
+share/gnome/help/platform-overview/it/bindings.xml
+share/gnome/help/platform-overview/it/core-tech.xml
+share/gnome/help/platform-overview/it/desktop-tech.xml
+share/gnome/help/platform-overview/it/figures/graphics.png
+share/gnome/help/platform-overview/it/figures/i18n.png
+share/gnome/help/platform-overview/it/figures/pango.png
+share/gnome/help/platform-overview/it/intro.xml
+share/gnome/help/platform-overview/it/ipc-network.xml
+share/gnome/help/platform-overview/it/legal-fdl.xml
+share/gnome/help/platform-overview/it/platform-overview.xml
+share/gnome/help/platform-overview/it/platform.xml
+share/omf/gdp-handbook/gdp-handbook-C.omf
+share/omf/gdp-style-guide/gdp-style-guide-C.omf
+share/omf/hig-book/hig-book-C.omf
+share/omf/integration-guide/integration-guide-C.omf
+share/omf/platform-overview/platform-overview-C.omf
+share/omf/platform-overview/platform-overview-es.omf
+share/omf/platform-overview/platform-overview-it.omf
+@dirrm share/omf/platform-overview
+@dirrm share/omf/integration-guide
+@dirrm share/omf/hig-book
+@dirrm share/omf/gdp-style-guide
+@dirrm share/omf/gdp-handbook
+@dirrm share/omf
+@dirrm share/gnome/help/platform-overview/it/figures
+@dirrm share/gnome/help/platform-overview/it
+@dirrm share/gnome/help/platform-overview/es/figures
+@dirrm share/gnome/help/platform-overview/es
+@dirrm share/gnome/help/platform-overview/C/figures
+@dirrm share/gnome/help/platform-overview/C
+@dirrm share/gnome/help/platform-overview
+@dirrm share/gnome/help/integration-guide/C
+@dirrm share/gnome/help/integration-guide
+@dirrm share/gnome/help/hig-book/C/images
+@dirrm share/gnome/help/hig-book/C
+@dirrm share/gnome/help/hig-book
+@dirrm share/gnome/help/gdp-style-guide/C/figures
+@dirrm share/gnome/help/gdp-style-guide/C
+@dirrm share/gnome/help/gdp-style-guide
+@dirrm share/gnome/help/gdp-handbook/C
+@dirrm share/gnome/help/gdp-handbook
diff --git a/misc/gnome-icon-theme/Makefile b/misc/gnome-icon-theme/Makefile
index c8e38bae8b91..9bb144679bd3 100644
--- a/misc/gnome-icon-theme/Makefile
+++ b/misc/gnome-icon-theme/Makefile
@@ -3,12 +3,11 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/misc/gnome-icon-theme/Makefile,v 1.99 2007/03/12 23:58:09 marcus Exp $
+#   $MCom: ports/misc/gnome-icon-theme/Makefile,v 1.107 2007/09/18 02:01:24 ahze Exp $
 #
 
 PORTNAME=	gnome-icon-theme
-PORTVERSION=	2.18.0
-PORTREVISION=	1
+PORTVERSION=	2.20.0
 CATEGORIES=	misc gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -18,7 +17,7 @@ MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	A collection of icons for the GNOME 2 desktop
 
 BUILD_DEPENDS=	${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme \
-		icon-naming-utils>=0.8.0:${PORTSDIR}/x11-themes/icon-naming-utils
+		icon-naming-utils>=0.8.1:${PORTSDIR}/x11-themes/icon-naming-utils
 RUN_DEPENDS=	${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme
 
 USE_BZIP2=	yes
diff --git a/misc/gnome-icon-theme/distinfo b/misc/gnome-icon-theme/distinfo
index 7c64ad2e2001..150d02fc7b51 100644
--- a/misc/gnome-icon-theme/distinfo
+++ b/misc/gnome-icon-theme/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-icon-theme-2.18.0.tar.bz2) = 0b9aa12c473e0be61dc324b059c106e3
-SHA256 (gnome2/gnome-icon-theme-2.18.0.tar.bz2) = 52177c009549b23924a091c6bc494a44343429f836fb19a3645b98ac3fd6306e
-SIZE (gnome2/gnome-icon-theme-2.18.0.tar.bz2) = 2734653
+MD5 (gnome2/gnome-icon-theme-2.20.0.tar.bz2) = 56857a6d5f26c236b48fcf6760549d1b
+SHA256 (gnome2/gnome-icon-theme-2.20.0.tar.bz2) = 3c911a7a35f6633bde3cc29bb6134e67dfec05dc13f5d6f03c04c6fa08448663
+SIZE (gnome2/gnome-icon-theme-2.20.0.tar.bz2) = 3470014
diff --git a/misc/gnome-icon-theme/pkg-plist b/misc/gnome-icon-theme/pkg-plist
index 4d2fef94a506..4d93cd0b101b 100644
--- a/misc/gnome-icon-theme/pkg-plist
+++ b/misc/gnome-icon-theme/pkg-plist
@@ -12,14 +12,18 @@ share/icons/gnome/16x16/actions/bottom.png
 share/icons/gnome/16x16/actions/centrejust.png
 share/icons/gnome/16x16/actions/contact-new.png
 share/icons/gnome/16x16/actions/document-new.png
+share/icons/gnome/16x16/actions/document-open-recent.png
 share/icons/gnome/16x16/actions/document-open.png
+share/icons/gnome/16x16/actions/document-page-setup.png
 share/icons/gnome/16x16/actions/document-print-preview.png
 share/icons/gnome/16x16/actions/document-print.png
 share/icons/gnome/16x16/actions/document-properties.png
 share/icons/gnome/16x16/actions/document-revert.png
 share/icons/gnome/16x16/actions/document-save-as.png
 share/icons/gnome/16x16/actions/document-save.png
+share/icons/gnome/16x16/actions/document-send.png
 share/icons/gnome/16x16/actions/down.png
+share/icons/gnome/16x16/actions/edit-clear.png
 share/icons/gnome/16x16/actions/edit-copy.png
 share/icons/gnome/16x16/actions/edit-cut.png
 share/icons/gnome/16x16/actions/edit-delete.png
@@ -29,6 +33,7 @@ share/icons/gnome/16x16/actions/edit-paste.png
 share/icons/gnome/16x16/actions/edit-redo.png
 share/icons/gnome/16x16/actions/edit-select-all.png
 share/icons/gnome/16x16/actions/edit-undo.png
+share/icons/gnome/16x16/actions/editclear.png
 share/icons/gnome/16x16/actions/editcopy.png
 share/icons/gnome/16x16/actions/editcut.png
 share/icons/gnome/16x16/actions/editdelete.png
@@ -52,21 +57,27 @@ share/icons/gnome/16x16/actions/format-justify-fill.png
 share/icons/gnome/16x16/actions/format-justify-left.png
 share/icons/gnome/16x16/actions/format-justify-right.png
 share/icons/gnome/16x16/actions/format-text-bold.png
+share/icons/gnome/16x16/actions/format-text-direction-ltr.png
+share/icons/gnome/16x16/actions/format-text-direction-rtl.png
 share/icons/gnome/16x16/actions/format-text-italic.png
 share/icons/gnome/16x16/actions/format-text-strikethrough.png
 share/icons/gnome/16x16/actions/format-text-underline.png
 share/icons/gnome/16x16/actions/forward.png
 share/icons/gnome/16x16/actions/gnome-lockscreen.png
+share/icons/gnome/16x16/actions/gnome-logout.png
 share/icons/gnome/16x16/actions/gnome-run.png
+share/icons/gnome/16x16/actions/gnome-searchtool.png
 share/icons/gnome/16x16/actions/gnome-stock-mail-fwd.png
 share/icons/gnome/16x16/actions/gnome-stock-mail-new.png
 share/icons/gnome/16x16/actions/gnome-stock-mail-rpl.png
+share/icons/gnome/16x16/actions/gnome-stock-mail-snd.png
 share/icons/gnome/16x16/actions/gnome-stock-text-indent.png
 share/icons/gnome/16x16/actions/gnome-stock-text-unindent.png
 share/icons/gnome/16x16/actions/go-bottom.png
 share/icons/gnome/16x16/actions/go-down.png
 share/icons/gnome/16x16/actions/go-first.png
 share/icons/gnome/16x16/actions/go-home.png
+share/icons/gnome/16x16/actions/go-jump.png
 share/icons/gnome/16x16/actions/go-last.png
 share/icons/gnome/16x16/actions/go-next.png
 share/icons/gnome/16x16/actions/go-previous.png
@@ -75,6 +86,7 @@ share/icons/gnome/16x16/actions/go-up.png
 share/icons/gnome/16x16/actions/gohome.png
 share/icons/gnome/16x16/actions/gtk-add.png
 share/icons/gnome/16x16/actions/gtk-bold.png
+share/icons/gnome/16x16/actions/gtk-clear.png
 share/icons/gnome/16x16/actions/gtk-close.png
 share/icons/gnome/16x16/actions/gtk-copy.png
 share/icons/gnome/16x16/actions/gtk-cut.png
@@ -98,6 +110,8 @@ share/icons/gnome/16x16/actions/gtk-goto-top.png
 share/icons/gnome/16x16/actions/gtk-home.png
 share/icons/gnome/16x16/actions/gtk-indent.png
 share/icons/gnome/16x16/actions/gtk-italic.png
+share/icons/gnome/16x16/actions/gtk-jump-to-ltr.png
+share/icons/gnome/16x16/actions/gtk-jump-to-rtl.png
 share/icons/gnome/16x16/actions/gtk-justify-center.png
 share/icons/gnome/16x16/actions/gtk-justify-fill.png
 share/icons/gnome/16x16/actions/gtk-justify-left.png
@@ -139,26 +153,35 @@ share/icons/gnome/16x16/actions/gtk-zoom-100.png
 share/icons/gnome/16x16/actions/gtk-zoom-fit.png
 share/icons/gnome/16x16/actions/gtk-zoom-in.png
 share/icons/gnome/16x16/actions/gtk-zoom-out.png
+share/icons/gnome/16x16/actions/help-about.png
+share/icons/gnome/16x16/actions/help-contents.png
 share/icons/gnome/16x16/actions/help-faq.png
 share/icons/gnome/16x16/actions/insert-image.png
 share/icons/gnome/16x16/actions/insert-link.png
+share/icons/gnome/16x16/actions/insert-object.png
 share/icons/gnome/16x16/actions/insert-text.png
+share/icons/gnome/16x16/actions/kfind.png
 share/icons/gnome/16x16/actions/kfm_home.png
 share/icons/gnome/16x16/actions/leftjust.png
 share/icons/gnome/16x16/actions/list-add.png
 share/icons/gnome/16x16/actions/list-remove.png
 share/icons/gnome/16x16/actions/lock.png
 share/icons/gnome/16x16/actions/mail-forward.png
+share/icons/gnome/16x16/actions/mail-mark-important.png
 share/icons/gnome/16x16/actions/mail-mark-junk.png
-share/icons/gnome/16x16/actions/mail-mark-not-junk.png
+share/icons/gnome/16x16/actions/mail-mark-notjunk.png
+share/icons/gnome/16x16/actions/mail-mark-read.png
+share/icons/gnome/16x16/actions/mail-mark-unread.png
 share/icons/gnome/16x16/actions/mail-message-new.png
 share/icons/gnome/16x16/actions/mail-reply-all.png
 share/icons/gnome/16x16/actions/mail-reply-sender.png
 share/icons/gnome/16x16/actions/mail-send-receive.png
+share/icons/gnome/16x16/actions/mail-send.png
 share/icons/gnome/16x16/actions/mail_forward.png
 share/icons/gnome/16x16/actions/mail_new.png
 share/icons/gnome/16x16/actions/mail_reply.png
 share/icons/gnome/16x16/actions/mail_replyall.png
+share/icons/gnome/16x16/actions/mail_send.png
 share/icons/gnome/16x16/actions/mail_spam.png
 share/icons/gnome/16x16/actions/media-eject.png
 share/icons/gnome/16x16/actions/media-playback-pause.png
@@ -193,6 +216,7 @@ share/icons/gnome/16x16/actions/reload_all_tabs.png
 share/icons/gnome/16x16/actions/reload_page.png
 share/icons/gnome/16x16/actions/remove.png
 share/icons/gnome/16x16/actions/rightjust.png
+share/icons/gnome/16x16/actions/search.png
 share/icons/gnome/16x16/actions/start.png
 share/icons/gnome/16x16/actions/stock_add-bookmark.png
 share/icons/gnome/16x16/actions/stock_bottom.png
@@ -211,9 +235,12 @@ share/icons/gnome/16x16/actions/stock_leave-fullscreen.png
 share/icons/gnome/16x16/actions/stock_left.png
 share/icons/gnome/16x16/actions/stock_mail-compose.png
 share/icons/gnome/16x16/actions/stock_mail-forward.png
+share/icons/gnome/16x16/actions/stock_mail-open.png
 share/icons/gnome/16x16/actions/stock_mail-reply-to-all.png
 share/icons/gnome/16x16/actions/stock_mail-reply.png
 share/icons/gnome/16x16/actions/stock_mail-send-receive.png
+share/icons/gnome/16x16/actions/stock_mail-send.png
+share/icons/gnome/16x16/actions/stock_mail-unread.png
 share/icons/gnome/16x16/actions/stock_media-fwd.png
 share/icons/gnome/16x16/actions/stock_media-next.png
 share/icons/gnome/16x16/actions/stock_media-pause.png
@@ -229,7 +256,6 @@ share/icons/gnome/16x16/actions/stock_new-dir.png
 share/icons/gnome/16x16/actions/stock_new-tab.png
 share/icons/gnome/16x16/actions/stock_new-text.png
 share/icons/gnome/16x16/actions/stock_new-window.png
-share/icons/gnome/16x16/actions/stock_not-spam.png
 share/icons/gnome/16x16/actions/stock_paste.png
 share/icons/gnome/16x16/actions/stock_print-preview.png
 share/icons/gnome/16x16/actions/stock_print.png
@@ -263,13 +289,16 @@ share/icons/gnome/16x16/actions/stock_zoom-out.png
 share/icons/gnome/16x16/actions/stock_zoom-page.png
 share/icons/gnome/16x16/actions/stop.png
 share/icons/gnome/16x16/actions/system-lock-screen.png
+share/icons/gnome/16x16/actions/system-log-out.png
 share/icons/gnome/16x16/actions/system-run.png
+share/icons/gnome/16x16/actions/system-search.png
 share/icons/gnome/16x16/actions/tab-new.png
 share/icons/gnome/16x16/actions/tab_new.png
 share/icons/gnome/16x16/actions/text_bold.png
 share/icons/gnome/16x16/actions/text_italic.png
 share/icons/gnome/16x16/actions/text_strike.png
 share/icons/gnome/16x16/actions/text_under.png
+share/icons/gnome/16x16/actions/tools-check-spelling.png
 share/icons/gnome/16x16/actions/top.png
 share/icons/gnome/16x16/actions/undo.png
 share/icons/gnome/16x16/actions/up.png
@@ -300,6 +329,7 @@ share/icons/gnome/16x16/animations/process-working.png
 share/icons/gnome/16x16/apps/access.png
 share/icons/gnome/16x16/apps/accessibility-directory.png
 share/icons/gnome/16x16/apps/accessories-calculator.png
+share/icons/gnome/16x16/apps/accessories-character-map.png
 share/icons/gnome/16x16/apps/accessories-dictionary.png
 share/icons/gnome/16x16/apps/accessories-text-editor.png
 share/icons/gnome/16x16/apps/applets-screenshooter.png
@@ -312,8 +342,8 @@ share/icons/gnome/16x16/apps/config-users.png
 share/icons/gnome/16x16/apps/file-manager.png
 share/icons/gnome/16x16/apps/fonts.png
 share/icons/gnome/16x16/apps/gnome-calculator.png
+share/icons/gnome/16x16/apps/gnome-character-map.png
 share/icons/gnome/16x16/apps/gnome-help.png
-share/icons/gnome/16x16/apps/gnome-logout.png
 share/icons/gnome/16x16/apps/gnome-mixer.png
 share/icons/gnome/16x16/apps/gnome-monitor.png
 share/icons/gnome/16x16/apps/gnome-remote-desktop.png
@@ -327,6 +357,7 @@ share/icons/gnome/16x16/apps/gnome-shutdown.png
 share/icons/gnome/16x16/apps/gnome-terminal.png
 share/icons/gnome/16x16/apps/gnome-window-manager.png
 share/icons/gnome/16x16/apps/gtk-help.png
+share/icons/gnome/16x16/apps/gucharmap.png
 share/icons/gnome/16x16/apps/help-browser.png
 share/icons/gnome/16x16/apps/help.png
 share/icons/gnome/16x16/apps/im-aim.png
@@ -336,8 +367,8 @@ share/icons/gnome/16x16/apps/im-msn.png
 share/icons/gnome/16x16/apps/im-nov.png
 share/icons/gnome/16x16/apps/im-yahoo.png
 share/icons/gnome/16x16/apps/im.png
-share/icons/gnome/16x16/apps/image-viewer.png
 share/icons/gnome/16x16/apps/kcalc.png
+share/icons/gnome/16x16/apps/kcharselect.png
 share/icons/gnome/16x16/apps/kcmkwm.png
 share/icons/gnome/16x16/apps/kcmsound.png
 share/icons/gnome/16x16/apps/kedit.png
@@ -373,9 +404,11 @@ share/icons/gnome/16x16/apps/susehelpcenter.png
 share/icons/gnome/16x16/apps/system-config-users.png
 share/icons/gnome/16x16/apps/system-file-manager.png
 share/icons/gnome/16x16/apps/system-software-installer.png
+share/icons/gnome/16x16/apps/system-software-update.png
 share/icons/gnome/16x16/apps/system-users.png
 share/icons/gnome/16x16/apps/terminal.png
 share/icons/gnome/16x16/apps/text-editor.png
+share/icons/gnome/16x16/apps/update-manager.png
 share/icons/gnome/16x16/apps/user-info.png
 share/icons/gnome/16x16/apps/utilities-system-monitor.png
 share/icons/gnome/16x16/apps/utilities-terminal.png
@@ -388,8 +421,10 @@ share/icons/gnome/16x16/apps/xfce4-backdrop.png
 share/icons/gnome/16x16/apps/xfce4-mixer.png
 share/icons/gnome/16x16/apps/xfwm4.png
 share/icons/gnome/16x16/apps/xscreensaver.png
+share/icons/gnome/16x16/apps/zen-icon.png
 share/icons/gnome/16x16/categories/applications-accessories.png
 share/icons/gnome/16x16/categories/applications-development.png
+share/icons/gnome/16x16/categories/applications-engineering.png
 share/icons/gnome/16x16/categories/applications-games.png
 share/icons/gnome/16x16/categories/applications-graphics.png
 share/icons/gnome/16x16/categories/applications-internet.png
@@ -398,6 +433,7 @@ share/icons/gnome/16x16/categories/applications-office.png
 share/icons/gnome/16x16/categories/applications-other.png
 share/icons/gnome/16x16/categories/applications-science.png
 share/icons/gnome/16x16/categories/applications-system.png
+share/icons/gnome/16x16/categories/applications-utilities.png
 share/icons/gnome/16x16/categories/gnome-applications.png
 share/icons/gnome/16x16/categories/gnome-control-center.png
 share/icons/gnome/16x16/categories/gnome-devel.png
@@ -409,6 +445,7 @@ share/icons/gnome/16x16/categories/gnome-settings.png
 share/icons/gnome/16x16/categories/gnome-system.png
 share/icons/gnome/16x16/categories/gnome-util.png
 share/icons/gnome/16x16/categories/gtk-preferences.png
+share/icons/gnome/16x16/categories/input_devices_settings.png
 share/icons/gnome/16x16/categories/kcontrol.png
 share/icons/gnome/16x16/categories/package_development.png
 share/icons/gnome/16x16/categories/package_games.png
@@ -419,7 +456,11 @@ share/icons/gnome/16x16/categories/package_office.png
 share/icons/gnome/16x16/categories/package_settings.png
 share/icons/gnome/16x16/categories/package_system.png
 share/icons/gnome/16x16/categories/package_utilities.png
+share/icons/gnome/16x16/categories/preferences-desktop-peripherals.png
+share/icons/gnome/16x16/categories/preferences-desktop-personal.png
 share/icons/gnome/16x16/categories/preferences-desktop.png
+share/icons/gnome/16x16/categories/preferences-other.png
+share/icons/gnome/16x16/categories/preferences-system-network.png
 share/icons/gnome/16x16/categories/preferences-system.png
 share/icons/gnome/16x16/categories/redhat-accessories.png
 share/icons/gnome/16x16/categories/redhat-games.png
@@ -432,6 +473,7 @@ share/icons/gnome/16x16/categories/redhat-sound_video.png
 share/icons/gnome/16x16/categories/redhat-system_settings.png
 share/icons/gnome/16x16/categories/redhat-system_tools.png
 share/icons/gnome/16x16/categories/stock_internet.png
+share/icons/gnome/16x16/categories/system-help.png
 share/icons/gnome/16x16/categories/xfce-games.png
 share/icons/gnome/16x16/categories/xfce-graphics.png
 share/icons/gnome/16x16/categories/xfce-internet.png
@@ -441,9 +483,11 @@ share/icons/gnome/16x16/categories/xfce-system-settings.png
 share/icons/gnome/16x16/categories/xfce-utils.png
 share/icons/gnome/16x16/categories/xfce4-settings.png
 share/icons/gnome/16x16/devices/3floppy_unmount.png
+share/icons/gnome/16x16/devices/audio-card.png
 share/icons/gnome/16x16/devices/audio-input-microphone.png
 share/icons/gnome/16x16/devices/battery.png
 share/icons/gnome/16x16/devices/camera-photo.png
+share/icons/gnome/16x16/devices/camera-video.png
 share/icons/gnome/16x16/devices/camera-web.png
 share/icons/gnome/16x16/devices/camera.png
 share/icons/gnome/16x16/devices/camera_unmount.png
@@ -487,6 +531,7 @@ share/icons/gnome/16x16/devices/gnome-dev-removable-1394.png
 share/icons/gnome/16x16/devices/gnome-dev-removable-usb.png
 share/icons/gnome/16x16/devices/gnome-dev-removable.png
 share/icons/gnome/16x16/devices/gnome-dev-wavelan.png
+share/icons/gnome/16x16/devices/gnome-dev-zipdisk.png
 share/icons/gnome/16x16/devices/gnome-fs-client.png
 share/icons/gnome/16x16/devices/gnome-modem.png
 share/icons/gnome/16x16/devices/gnome-stock-mic.png
@@ -495,10 +540,12 @@ share/icons/gnome/16x16/devices/gtk-floppy.png
 share/icons/gnome/16x16/devices/gtk-harddisk.png
 share/icons/gnome/16x16/devices/harddrive.png
 share/icons/gnome/16x16/devices/hdd_unmount.png
+share/icons/gnome/16x16/devices/input-gaming.png
 share/icons/gnome/16x16/devices/input-keyboard.png
 share/icons/gnome/16x16/devices/input-mouse.png
 share/icons/gnome/16x16/devices/input-tablet.png
 share/icons/gnome/16x16/devices/ipod_mount.png
+share/icons/gnome/16x16/devices/joystick.png
 share/icons/gnome/16x16/devices/keyboard.png
 share/icons/gnome/16x16/devices/kjobviewer.png
 share/icons/gnome/16x16/devices/kxkb.png
@@ -507,15 +554,19 @@ share/icons/gnome/16x16/devices/media-flash.png
 share/icons/gnome/16x16/devices/media-floppy.png
 share/icons/gnome/16x16/devices/media-optical.png
 share/icons/gnome/16x16/devices/media-tape.png
+share/icons/gnome/16x16/devices/media-zip.png
 share/icons/gnome/16x16/devices/modem.png
 share/icons/gnome/16x16/devices/mouse.png
 share/icons/gnome/16x16/devices/multimedia-player.png
 share/icons/gnome/16x16/devices/network-wired.png
 share/icons/gnome/16x16/devices/network-wireless.png
+share/icons/gnome/16x16/devices/pda.png
+share/icons/gnome/16x16/devices/phone.png
 share/icons/gnome/16x16/devices/printer-remote.png
 share/icons/gnome/16x16/devices/printer.png
 share/icons/gnome/16x16/devices/printer1.png
 share/icons/gnome/16x16/devices/printmgr.png
+share/icons/gnome/16x16/devices/scanner.png
 share/icons/gnome/16x16/devices/stock_mic.png
 share/icons/gnome/16x16/devices/stock_printers.png
 share/icons/gnome/16x16/devices/system-floppy.png
@@ -528,16 +579,43 @@ share/icons/gnome/16x16/devices/xfce4-keyboard.png
 share/icons/gnome/16x16/devices/xfce4-mouse.png
 share/icons/gnome/16x16/devices/yast_HD.png
 share/icons/gnome/16x16/devices/yast_idetude.png
+share/icons/gnome/16x16/devices/yast_joystick.png
 share/icons/gnome/16x16/devices/yast_mouse.png
 share/icons/gnome/16x16/devices/yast_printer.png
+share/icons/gnome/16x16/devices/yast_soundcard.png
 share/icons/gnome/16x16/emblems/emblem-default.png
+share/icons/gnome/16x16/emblems/emblem-documents.png
+share/icons/gnome/16x16/emblems/emblem-downloads.png
 share/icons/gnome/16x16/emblems/emblem-favorite.png
+share/icons/gnome/16x16/emblems/emblem-generic.png
 share/icons/gnome/16x16/emblems/emblem-important.png
+share/icons/gnome/16x16/emblems/emblem-mail.png
 share/icons/gnome/16x16/emblems/emblem-new.png
 share/icons/gnome/16x16/emblems/emblem-package.png
+share/icons/gnome/16x16/emblems/emblem-photos.png
+share/icons/gnome/16x16/emblems/emblem-readonly.png
+share/icons/gnome/16x16/emblems/emblem-shared.png
 share/icons/gnome/16x16/emblems/emblem-symbolic-link.png
+share/icons/gnome/16x16/emblems/emblem-system.png
+share/icons/gnome/16x16/emblems/emblem-unreadable.png
+share/icons/gnome/16x16/emblems/emblem-urgent.png
 share/icons/gnome/16x16/emblems/emblem-web.png
 share/icons/gnome/16x16/emblems/stock_mail-priority-high.png
+share/icons/gnome/16x16/emotes/face-angel.png
+share/icons/gnome/16x16/emotes/face-cool.png
+share/icons/gnome/16x16/emotes/face-crying.png
+share/icons/gnome/16x16/emotes/face-devilish.png
+share/icons/gnome/16x16/emotes/face-embarrassed.png
+share/icons/gnome/16x16/emotes/face-kiss.png
+share/icons/gnome/16x16/emotes/face-monkey.png
+share/icons/gnome/16x16/emotes/face-plain.png
+share/icons/gnome/16x16/emotes/face-raspberry.png
+share/icons/gnome/16x16/emotes/face-sad.png
+share/icons/gnome/16x16/emotes/face-smile-big.png
+share/icons/gnome/16x16/emotes/face-smile.png
+share/icons/gnome/16x16/emotes/face-smirk.png
+share/icons/gnome/16x16/emotes/face-surprise.png
+share/icons/gnome/16x16/emotes/face-wink.png
 share/icons/gnome/16x16/filesystems/gnome-fs-bookmark-missing.png
 share/icons/gnome/16x16/filesystems/gnome-fs-bookmark.png
 share/icons/gnome/16x16/mimetypes/application-certificate.png
@@ -694,9 +772,11 @@ share/icons/gnome/16x16/places/distributor-logo.png
 share/icons/gnome/16x16/places/emptytrash.png
 share/icons/gnome/16x16/places/folder-remote.png
 share/icons/gnome/16x16/places/folder-saved-search.png
+share/icons/gnome/16x16/places/folder.icon
 share/icons/gnome/16x16/places/folder.png
 share/icons/gnome/16x16/places/folder_home.png
 share/icons/gnome/16x16/places/gnome-fs-desktop.png
+share/icons/gnome/16x16/places/gnome-fs-directory.icon
 share/icons/gnome/16x16/places/gnome-fs-directory.png
 share/icons/gnome/16x16/places/gnome-fs-ftp.png
 share/icons/gnome/16x16/places/gnome-fs-home.png
@@ -722,6 +802,7 @@ share/icons/gnome/16x16/places/novell-button.png
 share/icons/gnome/16x16/places/redhat-network-server.png
 share/icons/gnome/16x16/places/server.png
 share/icons/gnome/16x16/places/start-here.png
+share/icons/gnome/16x16/places/stock_folder.icon
 share/icons/gnome/16x16/places/stock_folder.png
 share/icons/gnome/16x16/places/trashcan_empty.png
 share/icons/gnome/16x16/places/user-desktop.png
@@ -734,11 +815,15 @@ share/icons/gnome/16x16/status/audio-volume-high.png
 share/icons/gnome/16x16/status/audio-volume-low.png
 share/icons/gnome/16x16/status/audio-volume-medium.png
 share/icons/gnome/16x16/status/audio-volume-muted.png
+share/icons/gnome/16x16/status/battery-caution.png
+share/icons/gnome/16x16/status/battery-low.png
 share/icons/gnome/16x16/status/connect_creating.png
 share/icons/gnome/16x16/status/connect_established.png
 share/icons/gnome/16x16/status/connect_no.png
 share/icons/gnome/16x16/status/dialog-error.png
 share/icons/gnome/16x16/status/dialog-information.png
+share/icons/gnome/16x16/status/dialog-password.png
+share/icons/gnome/16x16/status/dialog-question.png
 share/icons/gnome/16x16/status/dialog-warning.png
 share/icons/gnome/16x16/status/edittrash.png
 share/icons/gnome/16x16/status/error.png
@@ -758,13 +843,20 @@ share/icons/gnome/16x16/status/gnome-netstatus-rx.png
 share/icons/gnome/16x16/status/gnome-netstatus-tx.png
 share/icons/gnome/16x16/status/gnome-netstatus-txrx.png
 share/icons/gnome/16x16/status/gnome-stock-trash-full.png
+share/icons/gnome/16x16/status/gtk-dialog-authentication.png
 share/icons/gnome/16x16/status/gtk-dialog-error.png
 share/icons/gnome/16x16/status/gtk-dialog-info.png
+share/icons/gnome/16x16/status/gtk-dialog-question.png
 share/icons/gnome/16x16/status/gtk-dialog-warning.png
+share/icons/gnome/16x16/status/gtk-missing-image.png
 share/icons/gnome/16x16/status/image-loading.png
+share/icons/gnome/16x16/status/image-missing.png
 share/icons/gnome/16x16/status/important.png
 share/icons/gnome/16x16/status/info.png
 share/icons/gnome/16x16/status/mail-attachment.png
+share/icons/gnome/16x16/status/mail-read.png
+share/icons/gnome/16x16/status/mail-replied.png
+share/icons/gnome/16x16/status/mail-unread.png
 share/icons/gnome/16x16/status/media-playlist-repeat.png
 share/icons/gnome/16x16/status/media-playlist-shuffle.png
 share/icons/gnome/16x16/status/messagebox_critical.png
@@ -782,11 +874,22 @@ share/icons/gnome/16x16/status/nm-device-wired.png
 share/icons/gnome/16x16/status/nm-device-wireless.png
 share/icons/gnome/16x16/status/nm-no-connection.png
 share/icons/gnome/16x16/status/printer-error.png
+share/icons/gnome/16x16/status/printer-printing.png
+share/icons/gnome/16x16/status/security-high.png
+share/icons/gnome/16x16/status/security-low.png
+share/icons/gnome/16x16/status/security-medium.png
+share/icons/gnome/16x16/status/software-update-available.png
+share/icons/gnome/16x16/status/software-update-urgent.png
 share/icons/gnome/16x16/status/stock_appointment-reminder-excl.png
 share/icons/gnome/16x16/status/stock_appointment-reminder.png
 share/icons/gnome/16x16/status/stock_dialog-error.png
 share/icons/gnome/16x16/status/stock_dialog-info.png
+share/icons/gnome/16x16/status/stock_dialog-question.png
 share/icons/gnome/16x16/status/stock_dialog-warning.png
+share/icons/gnome/16x16/status/stock_lock-broken.png
+share/icons/gnome/16x16/status/stock_lock-ok.png
+share/icons/gnome/16x16/status/stock_lock-open.png
+share/icons/gnome/16x16/status/stock_lock.png
 share/icons/gnome/16x16/status/stock_open.png
 share/icons/gnome/16x16/status/stock_repeat.png
 share/icons/gnome/16x16/status/stock_shuffle.png
@@ -807,6 +910,8 @@ share/icons/gnome/16x16/status/stock_weather-snow.png
 share/icons/gnome/16x16/status/stock_weather-storm.png
 share/icons/gnome/16x16/status/stock_weather-sunny.png
 share/icons/gnome/16x16/status/sunny.png
+share/icons/gnome/16x16/status/task-due.png
+share/icons/gnome/16x16/status/task-past-due.png
 share/icons/gnome/16x16/status/trashcan_full.png
 share/icons/gnome/16x16/status/user-trash-full.png
 share/icons/gnome/16x16/status/weather-clear-night.png
@@ -927,7 +1032,6 @@ share/icons/gnome/16x16/stock/data/stock_sort-row-ascending.png
 share/icons/gnome/16x16/stock/data/stock_standard-filter.png
 share/icons/gnome/16x16/stock/data/stock_sum.png
 share/icons/gnome/16x16/stock/data/stock_update-data.png
-share/icons/gnome/16x16/stock/document/stock_attach.png
 share/icons/gnome/16x16/stock/document/stock_certificate.png
 share/icons/gnome/16x16/stock/document/stock_new-drawing.png
 share/icons/gnome/16x16/stock/document/stock_new-formula.png
@@ -952,31 +1056,16 @@ share/icons/gnome/16x16/stock/document/stock_task-recurring.png
 share/icons/gnome/16x16/stock/document/stock_task.png
 share/icons/gnome/16x16/stock/document/stock_todo.png
 share/icons/gnome/16x16/stock/document/stock_view-html-source.png
-share/icons/gnome/16x16/stock/emoticons/stock_smiley-1.png
-share/icons/gnome/16x16/stock/emoticons/stock_smiley-10.png
-share/icons/gnome/16x16/stock/emoticons/stock_smiley-11.png
-share/icons/gnome/16x16/stock/emoticons/stock_smiley-12.png
-share/icons/gnome/16x16/stock/emoticons/stock_smiley-13.png
 share/icons/gnome/16x16/stock/emoticons/stock_smiley-14.png
-share/icons/gnome/16x16/stock/emoticons/stock_smiley-15.png
 share/icons/gnome/16x16/stock/emoticons/stock_smiley-16.png
 share/icons/gnome/16x16/stock/emoticons/stock_smiley-17.png
-share/icons/gnome/16x16/stock/emoticons/stock_smiley-18.png
 share/icons/gnome/16x16/stock/emoticons/stock_smiley-19.png
-share/icons/gnome/16x16/stock/emoticons/stock_smiley-2.png
 share/icons/gnome/16x16/stock/emoticons/stock_smiley-20.png
 share/icons/gnome/16x16/stock/emoticons/stock_smiley-21.png
-share/icons/gnome/16x16/stock/emoticons/stock_smiley-22.png
 share/icons/gnome/16x16/stock/emoticons/stock_smiley-23.png
 share/icons/gnome/16x16/stock/emoticons/stock_smiley-24.png
 share/icons/gnome/16x16/stock/emoticons/stock_smiley-25.png
 share/icons/gnome/16x16/stock/emoticons/stock_smiley-26.png
-share/icons/gnome/16x16/stock/emoticons/stock_smiley-3.png
-share/icons/gnome/16x16/stock/emoticons/stock_smiley-4.png
-share/icons/gnome/16x16/stock/emoticons/stock_smiley-5.png
-share/icons/gnome/16x16/stock/emoticons/stock_smiley-6.png
-share/icons/gnome/16x16/stock/emoticons/stock_smiley-7.png
-share/icons/gnome/16x16/stock/emoticons/stock_smiley-8.png
 share/icons/gnome/16x16/stock/emoticons/stock_smiley-9.png
 share/icons/gnome/16x16/stock/form/stock_form-activation-order.png
 share/icons/gnome/16x16/stock/form/stock_form-add-field.png
@@ -1030,7 +1119,6 @@ share/icons/gnome/16x16/stock/generic/stock_briefcase.png
 share/icons/gnome/16x16/stock/generic/stock_calc-accept.png
 share/icons/gnome/16x16/stock/generic/stock_calc-cancel.png
 share/icons/gnome/16x16/stock/generic/stock_calendar-and-tasks.png
-share/icons/gnome/16x16/stock/generic/stock_cell-phone.png
 share/icons/gnome/16x16/stock/generic/stock_check-filled.png
 share/icons/gnome/16x16/stock/generic/stock_color.png
 share/icons/gnome/16x16/stock/generic/stock_default-folder.png
@@ -1312,12 +1400,9 @@ share/icons/gnome/16x16/stock/navigation/stock_previous.png
 share/icons/gnome/16x16/stock/navigation/stock_right-with-subpoints.png
 share/icons/gnome/16x16/stock/navigation/stock_undo-history.png
 share/icons/gnome/16x16/stock/navigation/stock_up-with-subpoints.png
-share/icons/gnome/16x16/stock/navigation/stock_zoom-1.png
-share/icons/gnome/16x16/stock/navigation/stock_zoom-in.png
 share/icons/gnome/16x16/stock/navigation/stock_zoom-next.png
 share/icons/gnome/16x16/stock/navigation/stock_zoom-object.png
 share/icons/gnome/16x16/stock/navigation/stock_zoom-optimal.png
-share/icons/gnome/16x16/stock/navigation/stock_zoom-out.png
 share/icons/gnome/16x16/stock/navigation/stock_zoom-page-width.png
 share/icons/gnome/16x16/stock/navigation/stock_zoom-page.png
 share/icons/gnome/16x16/stock/navigation/stock_zoom-previous.png
@@ -1620,14 +1705,18 @@ share/icons/gnome/22x22/actions/bottom.png
 share/icons/gnome/22x22/actions/centrejust.png
 share/icons/gnome/22x22/actions/contact-new.png
 share/icons/gnome/22x22/actions/document-new.png
+share/icons/gnome/22x22/actions/document-open-recent.png
 share/icons/gnome/22x22/actions/document-open.png
+share/icons/gnome/22x22/actions/document-page-setup.png
 share/icons/gnome/22x22/actions/document-print-preview.png
 share/icons/gnome/22x22/actions/document-print.png
 share/icons/gnome/22x22/actions/document-properties.png
 share/icons/gnome/22x22/actions/document-revert.png
 share/icons/gnome/22x22/actions/document-save-as.png
 share/icons/gnome/22x22/actions/document-save.png
+share/icons/gnome/22x22/actions/document-send.png
 share/icons/gnome/22x22/actions/down.png
+share/icons/gnome/22x22/actions/edit-clear.png
 share/icons/gnome/22x22/actions/edit-copy.png
 share/icons/gnome/22x22/actions/edit-cut.png
 share/icons/gnome/22x22/actions/edit-delete.png
@@ -1637,6 +1726,7 @@ share/icons/gnome/22x22/actions/edit-paste.png
 share/icons/gnome/22x22/actions/edit-redo.png
 share/icons/gnome/22x22/actions/edit-select-all.png
 share/icons/gnome/22x22/actions/edit-undo.png
+share/icons/gnome/22x22/actions/editclear.png
 share/icons/gnome/22x22/actions/editcopy.png
 share/icons/gnome/22x22/actions/editcut.png
 share/icons/gnome/22x22/actions/editdelete.png
@@ -1660,21 +1750,27 @@ share/icons/gnome/22x22/actions/format-justify-fill.png
 share/icons/gnome/22x22/actions/format-justify-left.png
 share/icons/gnome/22x22/actions/format-justify-right.png
 share/icons/gnome/22x22/actions/format-text-bold.png
+share/icons/gnome/22x22/actions/format-text-direction-ltr.png
+share/icons/gnome/22x22/actions/format-text-direction-rtl.png
 share/icons/gnome/22x22/actions/format-text-italic.png
 share/icons/gnome/22x22/actions/format-text-strikethrough.png
 share/icons/gnome/22x22/actions/format-text-underline.png
 share/icons/gnome/22x22/actions/forward.png
 share/icons/gnome/22x22/actions/gnome-lockscreen.png
+share/icons/gnome/22x22/actions/gnome-logout.png
 share/icons/gnome/22x22/actions/gnome-run.png
+share/icons/gnome/22x22/actions/gnome-searchtool.png
 share/icons/gnome/22x22/actions/gnome-stock-mail-fwd.png
 share/icons/gnome/22x22/actions/gnome-stock-mail-new.png
 share/icons/gnome/22x22/actions/gnome-stock-mail-rpl.png
+share/icons/gnome/22x22/actions/gnome-stock-mail-snd.png
 share/icons/gnome/22x22/actions/gnome-stock-text-indent.png
 share/icons/gnome/22x22/actions/gnome-stock-text-unindent.png
 share/icons/gnome/22x22/actions/go-bottom.png
 share/icons/gnome/22x22/actions/go-down.png
 share/icons/gnome/22x22/actions/go-first.png
 share/icons/gnome/22x22/actions/go-home.png
+share/icons/gnome/22x22/actions/go-jump.png
 share/icons/gnome/22x22/actions/go-last.png
 share/icons/gnome/22x22/actions/go-next.png
 share/icons/gnome/22x22/actions/go-previous.png
@@ -1683,6 +1779,7 @@ share/icons/gnome/22x22/actions/go-up.png
 share/icons/gnome/22x22/actions/gohome.png
 share/icons/gnome/22x22/actions/gtk-add.png
 share/icons/gnome/22x22/actions/gtk-bold.png
+share/icons/gnome/22x22/actions/gtk-clear.png
 share/icons/gnome/22x22/actions/gtk-close.png
 share/icons/gnome/22x22/actions/gtk-copy.png
 share/icons/gnome/22x22/actions/gtk-cut.png
@@ -1706,6 +1803,8 @@ share/icons/gnome/22x22/actions/gtk-goto-top.png
 share/icons/gnome/22x22/actions/gtk-home.png
 share/icons/gnome/22x22/actions/gtk-indent.png
 share/icons/gnome/22x22/actions/gtk-italic.png
+share/icons/gnome/22x22/actions/gtk-jump-to-ltr.png
+share/icons/gnome/22x22/actions/gtk-jump-to-rtl.png
 share/icons/gnome/22x22/actions/gtk-justify-center.png
 share/icons/gnome/22x22/actions/gtk-justify-fill.png
 share/icons/gnome/22x22/actions/gtk-justify-left.png
@@ -1747,26 +1846,35 @@ share/icons/gnome/22x22/actions/gtk-zoom-100.png
 share/icons/gnome/22x22/actions/gtk-zoom-fit.png
 share/icons/gnome/22x22/actions/gtk-zoom-in.png
 share/icons/gnome/22x22/actions/gtk-zoom-out.png
+share/icons/gnome/22x22/actions/help-about.png
+share/icons/gnome/22x22/actions/help-contents.png
 share/icons/gnome/22x22/actions/help-faq.png
 share/icons/gnome/22x22/actions/insert-image.png
 share/icons/gnome/22x22/actions/insert-link.png
+share/icons/gnome/22x22/actions/insert-object.png
 share/icons/gnome/22x22/actions/insert-text.png
+share/icons/gnome/22x22/actions/kfind.png
 share/icons/gnome/22x22/actions/kfm_home.png
 share/icons/gnome/22x22/actions/leftjust.png
 share/icons/gnome/22x22/actions/list-add.png
 share/icons/gnome/22x22/actions/list-remove.png
 share/icons/gnome/22x22/actions/lock.png
 share/icons/gnome/22x22/actions/mail-forward.png
+share/icons/gnome/22x22/actions/mail-mark-important.png
 share/icons/gnome/22x22/actions/mail-mark-junk.png
-share/icons/gnome/22x22/actions/mail-mark-not-junk.png
+share/icons/gnome/22x22/actions/mail-mark-notjunk.png
+share/icons/gnome/22x22/actions/mail-mark-read.png
+share/icons/gnome/22x22/actions/mail-mark-unread.png
 share/icons/gnome/22x22/actions/mail-message-new.png
 share/icons/gnome/22x22/actions/mail-reply-all.png
 share/icons/gnome/22x22/actions/mail-reply-sender.png
 share/icons/gnome/22x22/actions/mail-send-receive.png
+share/icons/gnome/22x22/actions/mail-send.png
 share/icons/gnome/22x22/actions/mail_forward.png
 share/icons/gnome/22x22/actions/mail_new.png
 share/icons/gnome/22x22/actions/mail_reply.png
 share/icons/gnome/22x22/actions/mail_replyall.png
+share/icons/gnome/22x22/actions/mail_send.png
 share/icons/gnome/22x22/actions/mail_spam.png
 share/icons/gnome/22x22/actions/media-eject.png
 share/icons/gnome/22x22/actions/media-playback-pause.png
@@ -1801,6 +1909,7 @@ share/icons/gnome/22x22/actions/reload_all_tabs.png
 share/icons/gnome/22x22/actions/reload_page.png
 share/icons/gnome/22x22/actions/remove.png
 share/icons/gnome/22x22/actions/rightjust.png
+share/icons/gnome/22x22/actions/search.png
 share/icons/gnome/22x22/actions/start.png
 share/icons/gnome/22x22/actions/stock_add-bookmark.png
 share/icons/gnome/22x22/actions/stock_bottom.png
@@ -1819,9 +1928,12 @@ share/icons/gnome/22x22/actions/stock_leave-fullscreen.png
 share/icons/gnome/22x22/actions/stock_left.png
 share/icons/gnome/22x22/actions/stock_mail-compose.png
 share/icons/gnome/22x22/actions/stock_mail-forward.png
+share/icons/gnome/22x22/actions/stock_mail-open.png
 share/icons/gnome/22x22/actions/stock_mail-reply-to-all.png
 share/icons/gnome/22x22/actions/stock_mail-reply.png
 share/icons/gnome/22x22/actions/stock_mail-send-receive.png
+share/icons/gnome/22x22/actions/stock_mail-send.png
+share/icons/gnome/22x22/actions/stock_mail-unread.png
 share/icons/gnome/22x22/actions/stock_media-fwd.png
 share/icons/gnome/22x22/actions/stock_media-next.png
 share/icons/gnome/22x22/actions/stock_media-pause.png
@@ -1837,7 +1949,6 @@ share/icons/gnome/22x22/actions/stock_new-dir.png
 share/icons/gnome/22x22/actions/stock_new-tab.png
 share/icons/gnome/22x22/actions/stock_new-text.png
 share/icons/gnome/22x22/actions/stock_new-window.png
-share/icons/gnome/22x22/actions/stock_not-spam.png
 share/icons/gnome/22x22/actions/stock_paste.png
 share/icons/gnome/22x22/actions/stock_print-preview.png
 share/icons/gnome/22x22/actions/stock_print.png
@@ -1871,13 +1982,16 @@ share/icons/gnome/22x22/actions/stock_zoom-out.png
 share/icons/gnome/22x22/actions/stock_zoom-page.png
 share/icons/gnome/22x22/actions/stop.png
 share/icons/gnome/22x22/actions/system-lock-screen.png
+share/icons/gnome/22x22/actions/system-log-out.png
 share/icons/gnome/22x22/actions/system-run.png
+share/icons/gnome/22x22/actions/system-search.png
 share/icons/gnome/22x22/actions/tab-new.png
 share/icons/gnome/22x22/actions/tab_new.png
 share/icons/gnome/22x22/actions/text_bold.png
 share/icons/gnome/22x22/actions/text_italic.png
 share/icons/gnome/22x22/actions/text_strike.png
 share/icons/gnome/22x22/actions/text_under.png
+share/icons/gnome/22x22/actions/tools-check-spelling.png
 share/icons/gnome/22x22/actions/top.png
 share/icons/gnome/22x22/actions/undo.png
 share/icons/gnome/22x22/actions/up.png
@@ -1908,6 +2022,7 @@ share/icons/gnome/22x22/animations/process-working.png
 share/icons/gnome/22x22/apps/access.png
 share/icons/gnome/22x22/apps/accessibility-directory.png
 share/icons/gnome/22x22/apps/accessories-calculator.png
+share/icons/gnome/22x22/apps/accessories-character-map.png
 share/icons/gnome/22x22/apps/accessories-dictionary.png
 share/icons/gnome/22x22/apps/accessories-text-editor.png
 share/icons/gnome/22x22/apps/applets-screenshooter.png
@@ -1920,6 +2035,7 @@ share/icons/gnome/22x22/apps/config-users.png
 share/icons/gnome/22x22/apps/file-manager.png
 share/icons/gnome/22x22/apps/fonts.png
 share/icons/gnome/22x22/apps/gnome-calculator.png
+share/icons/gnome/22x22/apps/gnome-character-map.png
 share/icons/gnome/22x22/apps/gnome-help.png
 share/icons/gnome/22x22/apps/gnome-mixer.png
 share/icons/gnome/22x22/apps/gnome-monitor.png
@@ -1934,6 +2050,7 @@ share/icons/gnome/22x22/apps/gnome-shutdown.png
 share/icons/gnome/22x22/apps/gnome-terminal.png
 share/icons/gnome/22x22/apps/gnome-window-manager.png
 share/icons/gnome/22x22/apps/gtk-help.png
+share/icons/gnome/22x22/apps/gucharmap.png
 share/icons/gnome/22x22/apps/help-browser.png
 share/icons/gnome/22x22/apps/help.png
 share/icons/gnome/22x22/apps/im-aim.png
@@ -1943,6 +2060,7 @@ share/icons/gnome/22x22/apps/im-msn.png
 share/icons/gnome/22x22/apps/im-nov.png
 share/icons/gnome/22x22/apps/im-yahoo.png
 share/icons/gnome/22x22/apps/kcalc.png
+share/icons/gnome/22x22/apps/kcharselect.png
 share/icons/gnome/22x22/apps/kcmkwm.png
 share/icons/gnome/22x22/apps/kcmsound.png
 share/icons/gnome/22x22/apps/kedit.png
@@ -1978,9 +2096,11 @@ share/icons/gnome/22x22/apps/susehelpcenter.png
 share/icons/gnome/22x22/apps/system-config-users.png
 share/icons/gnome/22x22/apps/system-file-manager.png
 share/icons/gnome/22x22/apps/system-software-installer.png
+share/icons/gnome/22x22/apps/system-software-update.png
 share/icons/gnome/22x22/apps/system-users.png
 share/icons/gnome/22x22/apps/terminal.png
 share/icons/gnome/22x22/apps/text-editor.png
+share/icons/gnome/22x22/apps/update-manager.png
 share/icons/gnome/22x22/apps/user-info.png
 share/icons/gnome/22x22/apps/utilities-system-monitor.png
 share/icons/gnome/22x22/apps/utilities-terminal.png
@@ -1993,8 +2113,10 @@ share/icons/gnome/22x22/apps/xfce4-backdrop.png
 share/icons/gnome/22x22/apps/xfce4-mixer.png
 share/icons/gnome/22x22/apps/xfwm4.png
 share/icons/gnome/22x22/apps/xscreensaver.png
+share/icons/gnome/22x22/apps/zen-icon.png
 share/icons/gnome/22x22/categories/applications-accessories.png
 share/icons/gnome/22x22/categories/applications-development.png
+share/icons/gnome/22x22/categories/applications-engineering.png
 share/icons/gnome/22x22/categories/applications-games.png
 share/icons/gnome/22x22/categories/applications-graphics.png
 share/icons/gnome/22x22/categories/applications-internet.png
@@ -2003,6 +2125,7 @@ share/icons/gnome/22x22/categories/applications-office.png
 share/icons/gnome/22x22/categories/applications-other.png
 share/icons/gnome/22x22/categories/applications-science.png
 share/icons/gnome/22x22/categories/applications-system.png
+share/icons/gnome/22x22/categories/applications-utilities.png
 share/icons/gnome/22x22/categories/gnome-applications.png
 share/icons/gnome/22x22/categories/gnome-control-center.png
 share/icons/gnome/22x22/categories/gnome-devel.png
@@ -2014,6 +2137,7 @@ share/icons/gnome/22x22/categories/gnome-settings.png
 share/icons/gnome/22x22/categories/gnome-system.png
 share/icons/gnome/22x22/categories/gnome-util.png
 share/icons/gnome/22x22/categories/gtk-preferences.png
+share/icons/gnome/22x22/categories/input_devices_settings.png
 share/icons/gnome/22x22/categories/kcontrol.png
 share/icons/gnome/22x22/categories/package_development.png
 share/icons/gnome/22x22/categories/package_games.png
@@ -2024,7 +2148,11 @@ share/icons/gnome/22x22/categories/package_office.png
 share/icons/gnome/22x22/categories/package_settings.png
 share/icons/gnome/22x22/categories/package_system.png
 share/icons/gnome/22x22/categories/package_utilities.png
+share/icons/gnome/22x22/categories/preferences-desktop-peripherals.png
+share/icons/gnome/22x22/categories/preferences-desktop-personal.png
 share/icons/gnome/22x22/categories/preferences-desktop.png
+share/icons/gnome/22x22/categories/preferences-other.png
+share/icons/gnome/22x22/categories/preferences-system-network.png
 share/icons/gnome/22x22/categories/preferences-system.png
 share/icons/gnome/22x22/categories/redhat-accessories.png
 share/icons/gnome/22x22/categories/redhat-games.png
@@ -2037,6 +2165,7 @@ share/icons/gnome/22x22/categories/redhat-sound_video.png
 share/icons/gnome/22x22/categories/redhat-system_settings.png
 share/icons/gnome/22x22/categories/redhat-system_tools.png
 share/icons/gnome/22x22/categories/stock_internet.png
+share/icons/gnome/22x22/categories/system-help.png
 share/icons/gnome/22x22/categories/xfce-games.png
 share/icons/gnome/22x22/categories/xfce-graphics.png
 share/icons/gnome/22x22/categories/xfce-internet.png
@@ -2046,9 +2175,11 @@ share/icons/gnome/22x22/categories/xfce-system-settings.png
 share/icons/gnome/22x22/categories/xfce-utils.png
 share/icons/gnome/22x22/categories/xfce4-settings.png
 share/icons/gnome/22x22/devices/3floppy_unmount.png
+share/icons/gnome/22x22/devices/audio-card.png
 share/icons/gnome/22x22/devices/audio-input-microphone.png
 share/icons/gnome/22x22/devices/battery.png
 share/icons/gnome/22x22/devices/camera-photo.png
+share/icons/gnome/22x22/devices/camera-video.png
 share/icons/gnome/22x22/devices/camera-web.png
 share/icons/gnome/22x22/devices/camera.png
 share/icons/gnome/22x22/devices/camera_unmount.png
@@ -2092,6 +2223,7 @@ share/icons/gnome/22x22/devices/gnome-dev-removable-1394.png
 share/icons/gnome/22x22/devices/gnome-dev-removable-usb.png
 share/icons/gnome/22x22/devices/gnome-dev-removable.png
 share/icons/gnome/22x22/devices/gnome-dev-wavelan.png
+share/icons/gnome/22x22/devices/gnome-dev-zipdisk.png
 share/icons/gnome/22x22/devices/gnome-fs-client.png
 share/icons/gnome/22x22/devices/gnome-modem.png
 share/icons/gnome/22x22/devices/gnome-stock-mic.png
@@ -2100,10 +2232,12 @@ share/icons/gnome/22x22/devices/gtk-floppy.png
 share/icons/gnome/22x22/devices/gtk-harddisk.png
 share/icons/gnome/22x22/devices/harddrive.png
 share/icons/gnome/22x22/devices/hdd_unmount.png
+share/icons/gnome/22x22/devices/input-gaming.png
 share/icons/gnome/22x22/devices/input-keyboard.png
 share/icons/gnome/22x22/devices/input-mouse.png
 share/icons/gnome/22x22/devices/input-tablet.png
 share/icons/gnome/22x22/devices/ipod_mount.png
+share/icons/gnome/22x22/devices/joystick.png
 share/icons/gnome/22x22/devices/keyboard.png
 share/icons/gnome/22x22/devices/kjobviewer.png
 share/icons/gnome/22x22/devices/kxkb.png
@@ -2112,15 +2246,19 @@ share/icons/gnome/22x22/devices/media-flash.png
 share/icons/gnome/22x22/devices/media-floppy.png
 share/icons/gnome/22x22/devices/media-optical.png
 share/icons/gnome/22x22/devices/media-tape.png
+share/icons/gnome/22x22/devices/media-zip.png
 share/icons/gnome/22x22/devices/modem.png
 share/icons/gnome/22x22/devices/mouse.png
 share/icons/gnome/22x22/devices/multimedia-player.png
 share/icons/gnome/22x22/devices/network-wired.png
 share/icons/gnome/22x22/devices/network-wireless.png
+share/icons/gnome/22x22/devices/pda.png
+share/icons/gnome/22x22/devices/phone.png
 share/icons/gnome/22x22/devices/printer-remote.png
 share/icons/gnome/22x22/devices/printer.png
 share/icons/gnome/22x22/devices/printer1.png
 share/icons/gnome/22x22/devices/printmgr.png
+share/icons/gnome/22x22/devices/scanner.png
 share/icons/gnome/22x22/devices/stock_mic.png
 share/icons/gnome/22x22/devices/stock_printers.png
 share/icons/gnome/22x22/devices/system-floppy.png
@@ -2133,16 +2271,43 @@ share/icons/gnome/22x22/devices/xfce4-keyboard.png
 share/icons/gnome/22x22/devices/xfce4-mouse.png
 share/icons/gnome/22x22/devices/yast_HD.png
 share/icons/gnome/22x22/devices/yast_idetude.png
+share/icons/gnome/22x22/devices/yast_joystick.png
 share/icons/gnome/22x22/devices/yast_mouse.png
 share/icons/gnome/22x22/devices/yast_printer.png
+share/icons/gnome/22x22/devices/yast_soundcard.png
 share/icons/gnome/22x22/emblems/emblem-default.png
+share/icons/gnome/22x22/emblems/emblem-documents.png
+share/icons/gnome/22x22/emblems/emblem-downloads.png
 share/icons/gnome/22x22/emblems/emblem-favorite.png
+share/icons/gnome/22x22/emblems/emblem-generic.png
 share/icons/gnome/22x22/emblems/emblem-important.png
+share/icons/gnome/22x22/emblems/emblem-mail.png
 share/icons/gnome/22x22/emblems/emblem-new.png
 share/icons/gnome/22x22/emblems/emblem-package.png
+share/icons/gnome/22x22/emblems/emblem-photos.png
+share/icons/gnome/22x22/emblems/emblem-readonly.png
+share/icons/gnome/22x22/emblems/emblem-shared.png
 share/icons/gnome/22x22/emblems/emblem-symbolic-link.png
+share/icons/gnome/22x22/emblems/emblem-system.png
+share/icons/gnome/22x22/emblems/emblem-unreadable.png
+share/icons/gnome/22x22/emblems/emblem-urgent.png
 share/icons/gnome/22x22/emblems/emblem-web.png
 share/icons/gnome/22x22/emblems/stock_mail-priority-high.png
+share/icons/gnome/22x22/emotes/face-angel.png
+share/icons/gnome/22x22/emotes/face-cool.png
+share/icons/gnome/22x22/emotes/face-crying.png
+share/icons/gnome/22x22/emotes/face-devilish.png
+share/icons/gnome/22x22/emotes/face-embarrassed.png
+share/icons/gnome/22x22/emotes/face-kiss.png
+share/icons/gnome/22x22/emotes/face-monkey.png
+share/icons/gnome/22x22/emotes/face-plain.png
+share/icons/gnome/22x22/emotes/face-raspberry.png
+share/icons/gnome/22x22/emotes/face-sad.png
+share/icons/gnome/22x22/emotes/face-smile-big.png
+share/icons/gnome/22x22/emotes/face-smile.png
+share/icons/gnome/22x22/emotes/face-smirk.png
+share/icons/gnome/22x22/emotes/face-surprise.png
+share/icons/gnome/22x22/emotes/face-wink.png
 share/icons/gnome/22x22/mimetypes/application-certificate.png
 share/icons/gnome/22x22/mimetypes/application-x-executable.png
 share/icons/gnome/22x22/mimetypes/ascii.png
@@ -2340,11 +2505,15 @@ share/icons/gnome/22x22/status/audio-volume-high.png
 share/icons/gnome/22x22/status/audio-volume-low.png
 share/icons/gnome/22x22/status/audio-volume-medium.png
 share/icons/gnome/22x22/status/audio-volume-muted.png
+share/icons/gnome/22x22/status/battery-caution.png
+share/icons/gnome/22x22/status/battery-low.png
 share/icons/gnome/22x22/status/connect_creating.png
 share/icons/gnome/22x22/status/connect_established.png
 share/icons/gnome/22x22/status/connect_no.png
 share/icons/gnome/22x22/status/dialog-error.png
 share/icons/gnome/22x22/status/dialog-information.png
+share/icons/gnome/22x22/status/dialog-password.png
+share/icons/gnome/22x22/status/dialog-question.png
 share/icons/gnome/22x22/status/dialog-warning.png
 share/icons/gnome/22x22/status/edittrash.png
 share/icons/gnome/22x22/status/error.png
@@ -2364,13 +2533,20 @@ share/icons/gnome/22x22/status/gnome-netstatus-rx.png
 share/icons/gnome/22x22/status/gnome-netstatus-tx.png
 share/icons/gnome/22x22/status/gnome-netstatus-txrx.png
 share/icons/gnome/22x22/status/gnome-stock-trash-full.png
+share/icons/gnome/22x22/status/gtk-dialog-authentication.png
 share/icons/gnome/22x22/status/gtk-dialog-error.png
 share/icons/gnome/22x22/status/gtk-dialog-info.png
+share/icons/gnome/22x22/status/gtk-dialog-question.png
 share/icons/gnome/22x22/status/gtk-dialog-warning.png
+share/icons/gnome/22x22/status/gtk-missing-image.png
 share/icons/gnome/22x22/status/image-loading.png
+share/icons/gnome/22x22/status/image-missing.png
 share/icons/gnome/22x22/status/important.png
 share/icons/gnome/22x22/status/info.png
 share/icons/gnome/22x22/status/mail-attachment.png
+share/icons/gnome/22x22/status/mail-read.png
+share/icons/gnome/22x22/status/mail-replied.png
+share/icons/gnome/22x22/status/mail-unread.png
 share/icons/gnome/22x22/status/media-playlist-repeat.png
 share/icons/gnome/22x22/status/media-playlist-shuffle.png
 share/icons/gnome/22x22/status/messagebox_critical.png
@@ -2388,11 +2564,22 @@ share/icons/gnome/22x22/status/nm-device-wired.png
 share/icons/gnome/22x22/status/nm-device-wireless.png
 share/icons/gnome/22x22/status/nm-no-connection.png
 share/icons/gnome/22x22/status/printer-error.png
+share/icons/gnome/22x22/status/printer-printing.png
+share/icons/gnome/22x22/status/security-high.png
+share/icons/gnome/22x22/status/security-low.png
+share/icons/gnome/22x22/status/security-medium.png
+share/icons/gnome/22x22/status/software-update-available.png
+share/icons/gnome/22x22/status/software-update-urgent.png
 share/icons/gnome/22x22/status/stock_appointment-reminder-excl.png
 share/icons/gnome/22x22/status/stock_appointment-reminder.png
 share/icons/gnome/22x22/status/stock_dialog-error.png
 share/icons/gnome/22x22/status/stock_dialog-info.png
+share/icons/gnome/22x22/status/stock_dialog-question.png
 share/icons/gnome/22x22/status/stock_dialog-warning.png
+share/icons/gnome/22x22/status/stock_lock-broken.png
+share/icons/gnome/22x22/status/stock_lock-ok.png
+share/icons/gnome/22x22/status/stock_lock-open.png
+share/icons/gnome/22x22/status/stock_lock.png
 share/icons/gnome/22x22/status/stock_open.png
 share/icons/gnome/22x22/status/stock_repeat.png
 share/icons/gnome/22x22/status/stock_shuffle.png
@@ -2405,6 +2592,7 @@ share/icons/gnome/22x22/status/stock_volume-mute.png
 share/icons/gnome/22x22/status/stock_volume.png
 share/icons/gnome/22x22/status/stock_weather-cloudy.png
 share/icons/gnome/22x22/status/stock_weather-few-clouds.png
+share/icons/gnome/22x22/status/stock_weather-fog.png
 share/icons/gnome/22x22/status/stock_weather-night-clear.png
 share/icons/gnome/22x22/status/stock_weather-night-few-clouds.png
 share/icons/gnome/22x22/status/stock_weather-showers.png
@@ -2412,12 +2600,15 @@ share/icons/gnome/22x22/status/stock_weather-snow.png
 share/icons/gnome/22x22/status/stock_weather-storm.png
 share/icons/gnome/22x22/status/stock_weather-sunny.png
 share/icons/gnome/22x22/status/sunny.png
+share/icons/gnome/22x22/status/task-due.png
+share/icons/gnome/22x22/status/task-past-due.png
 share/icons/gnome/22x22/status/trashcan_full.png
 share/icons/gnome/22x22/status/user-trash-full.png
 share/icons/gnome/22x22/status/weather-clear-night.png
 share/icons/gnome/22x22/status/weather-clear.png
 share/icons/gnome/22x22/status/weather-few-clouds-night.png
 share/icons/gnome/22x22/status/weather-few-clouds.png
+share/icons/gnome/22x22/status/weather-fog.png
 share/icons/gnome/22x22/status/weather-overcast.png
 share/icons/gnome/22x22/status/weather-severe-alert.png
 share/icons/gnome/22x22/status/weather-showers-scattered.png
@@ -2438,14 +2629,18 @@ share/icons/gnome/24x24/actions/bottom.png
 share/icons/gnome/24x24/actions/centrejust.png
 share/icons/gnome/24x24/actions/contact-new.png
 share/icons/gnome/24x24/actions/document-new.png
+share/icons/gnome/24x24/actions/document-open-recent.png
 share/icons/gnome/24x24/actions/document-open.png
+share/icons/gnome/24x24/actions/document-page-setup.png
 share/icons/gnome/24x24/actions/document-print-preview.png
 share/icons/gnome/24x24/actions/document-print.png
 share/icons/gnome/24x24/actions/document-properties.png
 share/icons/gnome/24x24/actions/document-revert.png
 share/icons/gnome/24x24/actions/document-save-as.png
 share/icons/gnome/24x24/actions/document-save.png
+share/icons/gnome/24x24/actions/document-send.png
 share/icons/gnome/24x24/actions/down.png
+share/icons/gnome/24x24/actions/edit-clear.png
 share/icons/gnome/24x24/actions/edit-copy.png
 share/icons/gnome/24x24/actions/edit-cut.png
 share/icons/gnome/24x24/actions/edit-delete.png
@@ -2455,6 +2650,7 @@ share/icons/gnome/24x24/actions/edit-paste.png
 share/icons/gnome/24x24/actions/edit-redo.png
 share/icons/gnome/24x24/actions/edit-select-all.png
 share/icons/gnome/24x24/actions/edit-undo.png
+share/icons/gnome/24x24/actions/editclear.png
 share/icons/gnome/24x24/actions/editcopy.png
 share/icons/gnome/24x24/actions/editcut.png
 share/icons/gnome/24x24/actions/editdelete.png
@@ -2478,21 +2674,27 @@ share/icons/gnome/24x24/actions/format-justify-fill.png
 share/icons/gnome/24x24/actions/format-justify-left.png
 share/icons/gnome/24x24/actions/format-justify-right.png
 share/icons/gnome/24x24/actions/format-text-bold.png
+share/icons/gnome/24x24/actions/format-text-direction-ltr.png
+share/icons/gnome/24x24/actions/format-text-direction-rtl.png
 share/icons/gnome/24x24/actions/format-text-italic.png
 share/icons/gnome/24x24/actions/format-text-strikethrough.png
 share/icons/gnome/24x24/actions/format-text-underline.png
 share/icons/gnome/24x24/actions/forward.png
 share/icons/gnome/24x24/actions/gnome-lockscreen.png
+share/icons/gnome/24x24/actions/gnome-logout.png
 share/icons/gnome/24x24/actions/gnome-run.png
+share/icons/gnome/24x24/actions/gnome-searchtool.png
 share/icons/gnome/24x24/actions/gnome-stock-mail-fwd.png
 share/icons/gnome/24x24/actions/gnome-stock-mail-new.png
 share/icons/gnome/24x24/actions/gnome-stock-mail-rpl.png
+share/icons/gnome/24x24/actions/gnome-stock-mail-snd.png
 share/icons/gnome/24x24/actions/gnome-stock-text-indent.png
 share/icons/gnome/24x24/actions/gnome-stock-text-unindent.png
 share/icons/gnome/24x24/actions/go-bottom.png
 share/icons/gnome/24x24/actions/go-down.png
 share/icons/gnome/24x24/actions/go-first.png
 share/icons/gnome/24x24/actions/go-home.png
+share/icons/gnome/24x24/actions/go-jump.png
 share/icons/gnome/24x24/actions/go-last.png
 share/icons/gnome/24x24/actions/go-next.png
 share/icons/gnome/24x24/actions/go-previous.png
@@ -2501,6 +2703,7 @@ share/icons/gnome/24x24/actions/go-up.png
 share/icons/gnome/24x24/actions/gohome.png
 share/icons/gnome/24x24/actions/gtk-add.png
 share/icons/gnome/24x24/actions/gtk-bold.png
+share/icons/gnome/24x24/actions/gtk-clear.png
 share/icons/gnome/24x24/actions/gtk-close.png
 share/icons/gnome/24x24/actions/gtk-copy.png
 share/icons/gnome/24x24/actions/gtk-cut.png
@@ -2524,6 +2727,8 @@ share/icons/gnome/24x24/actions/gtk-goto-top.png
 share/icons/gnome/24x24/actions/gtk-home.png
 share/icons/gnome/24x24/actions/gtk-indent.png
 share/icons/gnome/24x24/actions/gtk-italic.png
+share/icons/gnome/24x24/actions/gtk-jump-to-ltr.png
+share/icons/gnome/24x24/actions/gtk-jump-to-rtl.png
 share/icons/gnome/24x24/actions/gtk-justify-center.png
 share/icons/gnome/24x24/actions/gtk-justify-fill.png
 share/icons/gnome/24x24/actions/gtk-justify-left.png
@@ -2565,26 +2770,35 @@ share/icons/gnome/24x24/actions/gtk-zoom-100.png
 share/icons/gnome/24x24/actions/gtk-zoom-fit.png
 share/icons/gnome/24x24/actions/gtk-zoom-in.png
 share/icons/gnome/24x24/actions/gtk-zoom-out.png
+share/icons/gnome/24x24/actions/help-about.png
+share/icons/gnome/24x24/actions/help-contents.png
 share/icons/gnome/24x24/actions/help-faq.png
 share/icons/gnome/24x24/actions/insert-image.png
 share/icons/gnome/24x24/actions/insert-link.png
+share/icons/gnome/24x24/actions/insert-object.png
 share/icons/gnome/24x24/actions/insert-text.png
+share/icons/gnome/24x24/actions/kfind.png
 share/icons/gnome/24x24/actions/kfm_home.png
 share/icons/gnome/24x24/actions/leftjust.png
 share/icons/gnome/24x24/actions/list-add.png
 share/icons/gnome/24x24/actions/list-remove.png
 share/icons/gnome/24x24/actions/lock.png
 share/icons/gnome/24x24/actions/mail-forward.png
+share/icons/gnome/24x24/actions/mail-mark-important.png
 share/icons/gnome/24x24/actions/mail-mark-junk.png
-share/icons/gnome/24x24/actions/mail-mark-not-junk.png
+share/icons/gnome/24x24/actions/mail-mark-notjunk.png
+share/icons/gnome/24x24/actions/mail-mark-read.png
+share/icons/gnome/24x24/actions/mail-mark-unread.png
 share/icons/gnome/24x24/actions/mail-message-new.png
 share/icons/gnome/24x24/actions/mail-reply-all.png
 share/icons/gnome/24x24/actions/mail-reply-sender.png
 share/icons/gnome/24x24/actions/mail-send-receive.png
+share/icons/gnome/24x24/actions/mail-send.png
 share/icons/gnome/24x24/actions/mail_forward.png
 share/icons/gnome/24x24/actions/mail_new.png
 share/icons/gnome/24x24/actions/mail_reply.png
 share/icons/gnome/24x24/actions/mail_replyall.png
+share/icons/gnome/24x24/actions/mail_send.png
 share/icons/gnome/24x24/actions/mail_spam.png
 share/icons/gnome/24x24/actions/media-eject.png
 share/icons/gnome/24x24/actions/media-playback-pause.png
@@ -2619,6 +2833,7 @@ share/icons/gnome/24x24/actions/reload_all_tabs.png
 share/icons/gnome/24x24/actions/reload_page.png
 share/icons/gnome/24x24/actions/remove.png
 share/icons/gnome/24x24/actions/rightjust.png
+share/icons/gnome/24x24/actions/search.png
 share/icons/gnome/24x24/actions/start.png
 share/icons/gnome/24x24/actions/stock_add-bookmark.png
 share/icons/gnome/24x24/actions/stock_bottom.png
@@ -2637,9 +2852,12 @@ share/icons/gnome/24x24/actions/stock_leave-fullscreen.png
 share/icons/gnome/24x24/actions/stock_left.png
 share/icons/gnome/24x24/actions/stock_mail-compose.png
 share/icons/gnome/24x24/actions/stock_mail-forward.png
+share/icons/gnome/24x24/actions/stock_mail-open.png
 share/icons/gnome/24x24/actions/stock_mail-reply-to-all.png
 share/icons/gnome/24x24/actions/stock_mail-reply.png
 share/icons/gnome/24x24/actions/stock_mail-send-receive.png
+share/icons/gnome/24x24/actions/stock_mail-send.png
+share/icons/gnome/24x24/actions/stock_mail-unread.png
 share/icons/gnome/24x24/actions/stock_media-fwd.png
 share/icons/gnome/24x24/actions/stock_media-next.png
 share/icons/gnome/24x24/actions/stock_media-pause.png
@@ -2655,7 +2873,6 @@ share/icons/gnome/24x24/actions/stock_new-dir.png
 share/icons/gnome/24x24/actions/stock_new-tab.png
 share/icons/gnome/24x24/actions/stock_new-text.png
 share/icons/gnome/24x24/actions/stock_new-window.png
-share/icons/gnome/24x24/actions/stock_not-spam.png
 share/icons/gnome/24x24/actions/stock_paste.png
 share/icons/gnome/24x24/actions/stock_print-preview.png
 share/icons/gnome/24x24/actions/stock_print.png
@@ -2689,13 +2906,16 @@ share/icons/gnome/24x24/actions/stock_zoom-out.png
 share/icons/gnome/24x24/actions/stock_zoom-page.png
 share/icons/gnome/24x24/actions/stop.png
 share/icons/gnome/24x24/actions/system-lock-screen.png
+share/icons/gnome/24x24/actions/system-log-out.png
 share/icons/gnome/24x24/actions/system-run.png
+share/icons/gnome/24x24/actions/system-search.png
 share/icons/gnome/24x24/actions/tab-new.png
 share/icons/gnome/24x24/actions/tab_new.png
 share/icons/gnome/24x24/actions/text_bold.png
 share/icons/gnome/24x24/actions/text_italic.png
 share/icons/gnome/24x24/actions/text_strike.png
 share/icons/gnome/24x24/actions/text_under.png
+share/icons/gnome/24x24/actions/tools-check-spelling.png
 share/icons/gnome/24x24/actions/top.png
 share/icons/gnome/24x24/actions/undo.png
 share/icons/gnome/24x24/actions/up.png
@@ -2726,6 +2946,7 @@ share/icons/gnome/24x24/animations/process-working.png
 share/icons/gnome/24x24/apps/access.png
 share/icons/gnome/24x24/apps/accessibility-directory.png
 share/icons/gnome/24x24/apps/accessories-calculator.png
+share/icons/gnome/24x24/apps/accessories-character-map.png
 share/icons/gnome/24x24/apps/accessories-dictionary.png
 share/icons/gnome/24x24/apps/accessories-text-editor.png
 share/icons/gnome/24x24/apps/administration.png
@@ -2749,19 +2970,18 @@ share/icons/gnome/24x24/apps/gdm.png
 share/icons/gnome/24x24/apps/gnome-amusements.png
 share/icons/gnome/24x24/apps/gnome-audio.png
 share/icons/gnome/24x24/apps/gnome-calculator.png
+share/icons/gnome/24x24/apps/gnome-character-map.png
 share/icons/gnome/24x24/apps/gnome-cpu.png
 share/icons/gnome/24x24/apps/gnome-desktop-config.png
 share/icons/gnome/24x24/apps/gnome-eyes.png
 share/icons/gnome/24x24/apps/gnome-favorites.png
 share/icons/gnome/24x24/apps/gnome-finance.png
 share/icons/gnome/24x24/apps/gnome-help.png
-share/icons/gnome/24x24/apps/gnome-logout.png
 share/icons/gnome/24x24/apps/gnome-mini-commander.png
 share/icons/gnome/24x24/apps/gnome-mixer.png
 share/icons/gnome/24x24/apps/gnome-monitor.png
 share/icons/gnome/24x24/apps/gnome-networktool.png
 share/icons/gnome/24x24/apps/gnome-remote-desktop.png
-share/icons/gnome/24x24/apps/gnome-searchtool.png
 share/icons/gnome/24x24/apps/gnome-settings-accessibility-technologies.png
 share/icons/gnome/24x24/apps/gnome-settings-background.png
 share/icons/gnome/24x24/apps/gnome-settings-font.png
@@ -2775,6 +2995,7 @@ share/icons/gnome/24x24/apps/gnome-terminal.png
 share/icons/gnome/24x24/apps/gnome-unknown.png
 share/icons/gnome/24x24/apps/gnome-window-manager.png
 share/icons/gnome/24x24/apps/gtk-help.png
+share/icons/gnome/24x24/apps/gucharmap.png
 share/icons/gnome/24x24/apps/help-browser.png
 share/icons/gnome/24x24/apps/help.png
 share/icons/gnome/24x24/apps/im-aim.png
@@ -2783,8 +3004,8 @@ share/icons/gnome/24x24/apps/im-jabber.png
 share/icons/gnome/24x24/apps/im-msn.png
 share/icons/gnome/24x24/apps/im-nov.png
 share/icons/gnome/24x24/apps/im-yahoo.png
-share/icons/gnome/24x24/apps/image-viewer.png
 share/icons/gnome/24x24/apps/kcalc.png
+share/icons/gnome/24x24/apps/kcharselect.png
 share/icons/gnome/24x24/apps/kcmkwm.png
 share/icons/gnome/24x24/apps/kcmsound.png
 share/icons/gnome/24x24/apps/kedit.png
@@ -2832,9 +3053,11 @@ share/icons/gnome/24x24/apps/susehelpcenter.png
 share/icons/gnome/24x24/apps/system-config-users.png
 share/icons/gnome/24x24/apps/system-file-manager.png
 share/icons/gnome/24x24/apps/system-software-installer.png
+share/icons/gnome/24x24/apps/system-software-update.png
 share/icons/gnome/24x24/apps/system-users.png
 share/icons/gnome/24x24/apps/terminal.png
 share/icons/gnome/24x24/apps/text-editor.png
+share/icons/gnome/24x24/apps/update-manager.png
 share/icons/gnome/24x24/apps/user-info.png
 share/icons/gnome/24x24/apps/utilities-system-monitor.png
 share/icons/gnome/24x24/apps/utilities-terminal.png
@@ -2847,8 +3070,10 @@ share/icons/gnome/24x24/apps/xfce4-backdrop.png
 share/icons/gnome/24x24/apps/xfce4-mixer.png
 share/icons/gnome/24x24/apps/xfwm4.png
 share/icons/gnome/24x24/apps/xscreensaver.png
+share/icons/gnome/24x24/apps/zen-icon.png
 share/icons/gnome/24x24/categories/applications-accessories.png
 share/icons/gnome/24x24/categories/applications-development.png
+share/icons/gnome/24x24/categories/applications-engineering.png
 share/icons/gnome/24x24/categories/applications-games.png
 share/icons/gnome/24x24/categories/applications-graphics.png
 share/icons/gnome/24x24/categories/applications-internet.png
@@ -2857,6 +3082,7 @@ share/icons/gnome/24x24/categories/applications-office.png
 share/icons/gnome/24x24/categories/applications-other.png
 share/icons/gnome/24x24/categories/applications-science.png
 share/icons/gnome/24x24/categories/applications-system.png
+share/icons/gnome/24x24/categories/applications-utilities.png
 share/icons/gnome/24x24/categories/gnome-applications.png
 share/icons/gnome/24x24/categories/gnome-control-center.png
 share/icons/gnome/24x24/categories/gnome-devel.png
@@ -2868,6 +3094,7 @@ share/icons/gnome/24x24/categories/gnome-settings.png
 share/icons/gnome/24x24/categories/gnome-system.png
 share/icons/gnome/24x24/categories/gnome-util.png
 share/icons/gnome/24x24/categories/gtk-preferences.png
+share/icons/gnome/24x24/categories/input_devices_settings.png
 share/icons/gnome/24x24/categories/kcontrol.png
 share/icons/gnome/24x24/categories/package_development.png
 share/icons/gnome/24x24/categories/package_games.png
@@ -2878,7 +3105,11 @@ share/icons/gnome/24x24/categories/package_office.png
 share/icons/gnome/24x24/categories/package_settings.png
 share/icons/gnome/24x24/categories/package_system.png
 share/icons/gnome/24x24/categories/package_utilities.png
+share/icons/gnome/24x24/categories/preferences-desktop-peripherals.png
+share/icons/gnome/24x24/categories/preferences-desktop-personal.png
 share/icons/gnome/24x24/categories/preferences-desktop.png
+share/icons/gnome/24x24/categories/preferences-other.png
+share/icons/gnome/24x24/categories/preferences-system-network.png
 share/icons/gnome/24x24/categories/preferences-system.png
 share/icons/gnome/24x24/categories/redhat-accessories.png
 share/icons/gnome/24x24/categories/redhat-games.png
@@ -2891,6 +3122,7 @@ share/icons/gnome/24x24/categories/redhat-sound_video.png
 share/icons/gnome/24x24/categories/redhat-system_settings.png
 share/icons/gnome/24x24/categories/redhat-system_tools.png
 share/icons/gnome/24x24/categories/stock_internet.png
+share/icons/gnome/24x24/categories/system-help.png
 share/icons/gnome/24x24/categories/xfce-games.png
 share/icons/gnome/24x24/categories/xfce-graphics.png
 share/icons/gnome/24x24/categories/xfce-internet.png
@@ -2900,9 +3132,11 @@ share/icons/gnome/24x24/categories/xfce-system-settings.png
 share/icons/gnome/24x24/categories/xfce-utils.png
 share/icons/gnome/24x24/categories/xfce4-settings.png
 share/icons/gnome/24x24/devices/3floppy_unmount.png
+share/icons/gnome/24x24/devices/audio-card.png
 share/icons/gnome/24x24/devices/audio-input-microphone.png
 share/icons/gnome/24x24/devices/battery.png
 share/icons/gnome/24x24/devices/camera-photo.png
+share/icons/gnome/24x24/devices/camera-video.png
 share/icons/gnome/24x24/devices/camera-web.png
 share/icons/gnome/24x24/devices/camera.png
 share/icons/gnome/24x24/devices/camera_unmount.png
@@ -2946,6 +3180,7 @@ share/icons/gnome/24x24/devices/gnome-dev-removable-1394.png
 share/icons/gnome/24x24/devices/gnome-dev-removable-usb.png
 share/icons/gnome/24x24/devices/gnome-dev-removable.png
 share/icons/gnome/24x24/devices/gnome-dev-wavelan.png
+share/icons/gnome/24x24/devices/gnome-dev-zipdisk.png
 share/icons/gnome/24x24/devices/gnome-fs-client.png
 share/icons/gnome/24x24/devices/gnome-modem.png
 share/icons/gnome/24x24/devices/gnome-stock-mic.png
@@ -2954,10 +3189,12 @@ share/icons/gnome/24x24/devices/gtk-floppy.png
 share/icons/gnome/24x24/devices/gtk-harddisk.png
 share/icons/gnome/24x24/devices/harddrive.png
 share/icons/gnome/24x24/devices/hdd_unmount.png
+share/icons/gnome/24x24/devices/input-gaming.png
 share/icons/gnome/24x24/devices/input-keyboard.png
 share/icons/gnome/24x24/devices/input-mouse.png
 share/icons/gnome/24x24/devices/input-tablet.png
 share/icons/gnome/24x24/devices/ipod_mount.png
+share/icons/gnome/24x24/devices/joystick.png
 share/icons/gnome/24x24/devices/keyboard.png
 share/icons/gnome/24x24/devices/kjobviewer.png
 share/icons/gnome/24x24/devices/kxkb.png
@@ -2966,15 +3203,19 @@ share/icons/gnome/24x24/devices/media-flash.png
 share/icons/gnome/24x24/devices/media-floppy.png
 share/icons/gnome/24x24/devices/media-optical.png
 share/icons/gnome/24x24/devices/media-tape.png
+share/icons/gnome/24x24/devices/media-zip.png
 share/icons/gnome/24x24/devices/modem.png
 share/icons/gnome/24x24/devices/mouse.png
 share/icons/gnome/24x24/devices/multimedia-player.png
 share/icons/gnome/24x24/devices/network-wired.png
 share/icons/gnome/24x24/devices/network-wireless.png
+share/icons/gnome/24x24/devices/pda.png
+share/icons/gnome/24x24/devices/phone.png
 share/icons/gnome/24x24/devices/printer-remote.png
 share/icons/gnome/24x24/devices/printer.png
 share/icons/gnome/24x24/devices/printer1.png
 share/icons/gnome/24x24/devices/printmgr.png
+share/icons/gnome/24x24/devices/scanner.png
 share/icons/gnome/24x24/devices/stock_mic.png
 share/icons/gnome/24x24/devices/stock_printers.png
 share/icons/gnome/24x24/devices/system-floppy.png
@@ -2987,16 +3228,43 @@ share/icons/gnome/24x24/devices/xfce4-keyboard.png
 share/icons/gnome/24x24/devices/xfce4-mouse.png
 share/icons/gnome/24x24/devices/yast_HD.png
 share/icons/gnome/24x24/devices/yast_idetude.png
+share/icons/gnome/24x24/devices/yast_joystick.png
 share/icons/gnome/24x24/devices/yast_mouse.png
 share/icons/gnome/24x24/devices/yast_printer.png
+share/icons/gnome/24x24/devices/yast_soundcard.png
 share/icons/gnome/24x24/emblems/emblem-default.png
+share/icons/gnome/24x24/emblems/emblem-documents.png
+share/icons/gnome/24x24/emblems/emblem-downloads.png
 share/icons/gnome/24x24/emblems/emblem-favorite.png
+share/icons/gnome/24x24/emblems/emblem-generic.png
 share/icons/gnome/24x24/emblems/emblem-important.png
+share/icons/gnome/24x24/emblems/emblem-mail.png
 share/icons/gnome/24x24/emblems/emblem-new.png
 share/icons/gnome/24x24/emblems/emblem-package.png
+share/icons/gnome/24x24/emblems/emblem-photos.png
+share/icons/gnome/24x24/emblems/emblem-readonly.png
+share/icons/gnome/24x24/emblems/emblem-shared.png
 share/icons/gnome/24x24/emblems/emblem-symbolic-link.png
+share/icons/gnome/24x24/emblems/emblem-system.png
+share/icons/gnome/24x24/emblems/emblem-unreadable.png
+share/icons/gnome/24x24/emblems/emblem-urgent.png
 share/icons/gnome/24x24/emblems/emblem-web.png
 share/icons/gnome/24x24/emblems/stock_mail-priority-high.png
+share/icons/gnome/24x24/emotes/face-angel.png
+share/icons/gnome/24x24/emotes/face-cool.png
+share/icons/gnome/24x24/emotes/face-crying.png
+share/icons/gnome/24x24/emotes/face-devilish.png
+share/icons/gnome/24x24/emotes/face-embarrassed.png
+share/icons/gnome/24x24/emotes/face-kiss.png
+share/icons/gnome/24x24/emotes/face-monkey.png
+share/icons/gnome/24x24/emotes/face-plain.png
+share/icons/gnome/24x24/emotes/face-raspberry.png
+share/icons/gnome/24x24/emotes/face-sad.png
+share/icons/gnome/24x24/emotes/face-smile-big.png
+share/icons/gnome/24x24/emotes/face-smile.png
+share/icons/gnome/24x24/emotes/face-smirk.png
+share/icons/gnome/24x24/emotes/face-surprise.png
+share/icons/gnome/24x24/emotes/face-wink.png
 share/icons/gnome/24x24/filesystems/gnome-fs-bookmark-missing.png
 share/icons/gnome/24x24/filesystems/gnome-fs-bookmark.png
 share/icons/gnome/24x24/mimetypes/application-certificate.png
@@ -3196,11 +3464,15 @@ share/icons/gnome/24x24/status/audio-volume-high.png
 share/icons/gnome/24x24/status/audio-volume-low.png
 share/icons/gnome/24x24/status/audio-volume-medium.png
 share/icons/gnome/24x24/status/audio-volume-muted.png
+share/icons/gnome/24x24/status/battery-caution.png
+share/icons/gnome/24x24/status/battery-low.png
 share/icons/gnome/24x24/status/connect_creating.png
 share/icons/gnome/24x24/status/connect_established.png
 share/icons/gnome/24x24/status/connect_no.png
 share/icons/gnome/24x24/status/dialog-error.png
 share/icons/gnome/24x24/status/dialog-information.png
+share/icons/gnome/24x24/status/dialog-password.png
+share/icons/gnome/24x24/status/dialog-question.png
 share/icons/gnome/24x24/status/dialog-warning.png
 share/icons/gnome/24x24/status/edittrash.png
 share/icons/gnome/24x24/status/error.png
@@ -3224,12 +3496,20 @@ share/icons/gnome/24x24/status/gnome-netstatus-rx.png
 share/icons/gnome/24x24/status/gnome-netstatus-tx.png
 share/icons/gnome/24x24/status/gnome-netstatus-txrx.png
 share/icons/gnome/24x24/status/gnome-stock-trash-full.png
+share/icons/gnome/24x24/status/gtk-dialog-authentication.png
 share/icons/gnome/24x24/status/gtk-dialog-error.png
 share/icons/gnome/24x24/status/gtk-dialog-info.png
+share/icons/gnome/24x24/status/gtk-dialog-question.png
 share/icons/gnome/24x24/status/gtk-dialog-warning.png
+share/icons/gnome/24x24/status/gtk-missing-image.png
 share/icons/gnome/24x24/status/image-loading.png
+share/icons/gnome/24x24/status/image-missing.png
 share/icons/gnome/24x24/status/important.png
 share/icons/gnome/24x24/status/info.png
+share/icons/gnome/24x24/status/mail-attachment.png
+share/icons/gnome/24x24/status/mail-read.png
+share/icons/gnome/24x24/status/mail-replied.png
+share/icons/gnome/24x24/status/mail-unread.png
 share/icons/gnome/24x24/status/media-playlist-repeat.png
 share/icons/gnome/24x24/status/media-playlist-shuffle.png
 share/icons/gnome/24x24/status/messagebox_critical.png
@@ -3247,11 +3527,22 @@ share/icons/gnome/24x24/status/nm-device-wired.png
 share/icons/gnome/24x24/status/nm-device-wireless.png
 share/icons/gnome/24x24/status/nm-no-connection.png
 share/icons/gnome/24x24/status/printer-error.png
+share/icons/gnome/24x24/status/printer-printing.png
+share/icons/gnome/24x24/status/security-high.png
+share/icons/gnome/24x24/status/security-low.png
+share/icons/gnome/24x24/status/security-medium.png
+share/icons/gnome/24x24/status/software-update-available.png
+share/icons/gnome/24x24/status/software-update-urgent.png
 share/icons/gnome/24x24/status/stock_appointment-reminder-excl.png
 share/icons/gnome/24x24/status/stock_appointment-reminder.png
 share/icons/gnome/24x24/status/stock_dialog-error.png
 share/icons/gnome/24x24/status/stock_dialog-info.png
+share/icons/gnome/24x24/status/stock_dialog-question.png
 share/icons/gnome/24x24/status/stock_dialog-warning.png
+share/icons/gnome/24x24/status/stock_lock-broken.png
+share/icons/gnome/24x24/status/stock_lock-ok.png
+share/icons/gnome/24x24/status/stock_lock-open.png
+share/icons/gnome/24x24/status/stock_lock.png
 share/icons/gnome/24x24/status/stock_open.png
 share/icons/gnome/24x24/status/stock_repeat.png
 share/icons/gnome/24x24/status/stock_shuffle.png
@@ -3264,6 +3555,7 @@ share/icons/gnome/24x24/status/stock_volume-mute.png
 share/icons/gnome/24x24/status/stock_volume.png
 share/icons/gnome/24x24/status/stock_weather-cloudy.png
 share/icons/gnome/24x24/status/stock_weather-few-clouds.png
+share/icons/gnome/24x24/status/stock_weather-fog.png
 share/icons/gnome/24x24/status/stock_weather-night-clear.png
 share/icons/gnome/24x24/status/stock_weather-night-few-clouds.png
 share/icons/gnome/24x24/status/stock_weather-showers.png
@@ -3271,12 +3563,15 @@ share/icons/gnome/24x24/status/stock_weather-snow.png
 share/icons/gnome/24x24/status/stock_weather-storm.png
 share/icons/gnome/24x24/status/stock_weather-sunny.png
 share/icons/gnome/24x24/status/sunny.png
+share/icons/gnome/24x24/status/task-due.png
+share/icons/gnome/24x24/status/task-past-due.png
 share/icons/gnome/24x24/status/trashcan_full.png
 share/icons/gnome/24x24/status/user-trash-full.png
 share/icons/gnome/24x24/status/weather-clear-night.png
 share/icons/gnome/24x24/status/weather-clear.png
 share/icons/gnome/24x24/status/weather-few-clouds-night.png
 share/icons/gnome/24x24/status/weather-few-clouds.png
+share/icons/gnome/24x24/status/weather-fog.png
 share/icons/gnome/24x24/status/weather-overcast.png
 share/icons/gnome/24x24/status/weather-severe-alert.png
 share/icons/gnome/24x24/status/weather-showers-scattered.png
@@ -3367,7 +3662,6 @@ share/icons/gnome/24x24/stock/data/stock_sort-row-ascending.png
 share/icons/gnome/24x24/stock/data/stock_standard-filter.png
 share/icons/gnome/24x24/stock/data/stock_sum.png
 share/icons/gnome/24x24/stock/data/stock_update-data.png
-share/icons/gnome/24x24/stock/document/stock_attach.png
 share/icons/gnome/24x24/stock/document/stock_certificate.png
 share/icons/gnome/24x24/stock/document/stock_new-drawing.png
 share/icons/gnome/24x24/stock/document/stock_new-formula.png
@@ -3448,7 +3742,6 @@ share/icons/gnome/24x24/stock/generic/stock_calendar-view-month.png
 share/icons/gnome/24x24/stock/generic/stock_calendar-view-week.png
 share/icons/gnome/24x24/stock/generic/stock_calendar-view-work-week.png
 share/icons/gnome/24x24/stock/generic/stock_calendar-view-year.png
-share/icons/gnome/24x24/stock/generic/stock_cell-phone.png
 share/icons/gnome/24x24/stock/generic/stock_color.png
 share/icons/gnome/24x24/stock/generic/stock_edit.png
 share/icons/gnome/24x24/stock/generic/stock_equals.png
@@ -3663,12 +3956,9 @@ share/icons/gnome/24x24/stock/navigation/stock_previous.png
 share/icons/gnome/24x24/stock/navigation/stock_right-with-subpoints.png
 share/icons/gnome/24x24/stock/navigation/stock_undo-history.png
 share/icons/gnome/24x24/stock/navigation/stock_up-with-subpoints.png
-share/icons/gnome/24x24/stock/navigation/stock_zoom-1.png
-share/icons/gnome/24x24/stock/navigation/stock_zoom-in.png
 share/icons/gnome/24x24/stock/navigation/stock_zoom-next.png
 share/icons/gnome/24x24/stock/navigation/stock_zoom-object.png
 share/icons/gnome/24x24/stock/navigation/stock_zoom-optimal.png
-share/icons/gnome/24x24/stock/navigation/stock_zoom-out.png
 share/icons/gnome/24x24/stock/navigation/stock_zoom-page-width.png
 share/icons/gnome/24x24/stock/navigation/stock_zoom-page.png
 share/icons/gnome/24x24/stock/navigation/stock_zoom-previous.png
@@ -3908,6 +4198,9 @@ share/icons/gnome/24x24/stock/text/stock_wrap-optimal.png
 share/icons/gnome/24x24/stock/text/stock_wrap-right.png
 share/icons/gnome/32x32/actions/add.png
 share/icons/gnome/32x32/actions/address-book-new.png
+share/icons/gnome/32x32/actions/application-exit.png
+share/icons/gnome/32x32/actions/appointment-new.png
+share/icons/gnome/32x32/actions/appointment.png
 share/icons/gnome/32x32/actions/back.png
 share/icons/gnome/32x32/actions/bookmark-new.png
 share/icons/gnome/32x32/actions/bookmark_add.png
@@ -3916,37 +4209,72 @@ share/icons/gnome/32x32/actions/bottom.png
 share/icons/gnome/32x32/actions/centrejust.png
 share/icons/gnome/32x32/actions/contact-new.png
 share/icons/gnome/32x32/actions/document-new.png
+share/icons/gnome/32x32/actions/document-open-recent.png
 share/icons/gnome/32x32/actions/document-open.png
+share/icons/gnome/32x32/actions/document-page-setup.png
+share/icons/gnome/32x32/actions/document-print-preview.png
+share/icons/gnome/32x32/actions/document-print.png
 share/icons/gnome/32x32/actions/document-properties.png
 share/icons/gnome/32x32/actions/document-revert.png
 share/icons/gnome/32x32/actions/document-save-as.png
 share/icons/gnome/32x32/actions/document-save.png
+share/icons/gnome/32x32/actions/document-send.png
 share/icons/gnome/32x32/actions/down.png
+share/icons/gnome/32x32/actions/edit-clear.png
+share/icons/gnome/32x32/actions/edit-copy.png
 share/icons/gnome/32x32/actions/edit-cut.png
+share/icons/gnome/32x32/actions/edit-delete.png
+share/icons/gnome/32x32/actions/edit-find-replace.png
+share/icons/gnome/32x32/actions/edit-find.png
 share/icons/gnome/32x32/actions/edit-paste.png
 share/icons/gnome/32x32/actions/edit-redo.png
 share/icons/gnome/32x32/actions/edit-select-all.png
 share/icons/gnome/32x32/actions/edit-undo.png
+share/icons/gnome/32x32/actions/editclear.png
+share/icons/gnome/32x32/actions/editcopy.png
 share/icons/gnome/32x32/actions/editcut.png
+share/icons/gnome/32x32/actions/editdelete.png
 share/icons/gnome/32x32/actions/editpaste.png
+share/icons/gnome/32x32/actions/exit.png
+share/icons/gnome/32x32/actions/filefind.png
 share/icons/gnome/32x32/actions/filenew.png
 share/icons/gnome/32x32/actions/fileopen.png
+share/icons/gnome/32x32/actions/fileprint.png
+share/icons/gnome/32x32/actions/filequickprint.png
 share/icons/gnome/32x32/actions/filesave.png
 share/icons/gnome/32x32/actions/filesaveas.png
+share/icons/gnome/32x32/actions/find.png
 share/icons/gnome/32x32/actions/finish.png
 share/icons/gnome/32x32/actions/folder-new.png
 share/icons/gnome/32x32/actions/folder_new.png
+share/icons/gnome/32x32/actions/format-indent-less.png
+share/icons/gnome/32x32/actions/format-indent-more.png
 share/icons/gnome/32x32/actions/format-justify-center.png
 share/icons/gnome/32x32/actions/format-justify-fill.png
 share/icons/gnome/32x32/actions/format-justify-left.png
 share/icons/gnome/32x32/actions/format-justify-right.png
+share/icons/gnome/32x32/actions/format-text-bold.png
+share/icons/gnome/32x32/actions/format-text-direction-ltr.png
+share/icons/gnome/32x32/actions/format-text-direction-rtl.png
+share/icons/gnome/32x32/actions/format-text-italic.png
+share/icons/gnome/32x32/actions/format-text-strikethrough.png
+share/icons/gnome/32x32/actions/format-text-underline.png
 share/icons/gnome/32x32/actions/forward.png
 share/icons/gnome/32x32/actions/gnome-lockscreen.png
+share/icons/gnome/32x32/actions/gnome-logout.png
 share/icons/gnome/32x32/actions/gnome-run.png
+share/icons/gnome/32x32/actions/gnome-searchtool.png
+share/icons/gnome/32x32/actions/gnome-stock-mail-fwd.png
+share/icons/gnome/32x32/actions/gnome-stock-mail-new.png
+share/icons/gnome/32x32/actions/gnome-stock-mail-rpl.png
+share/icons/gnome/32x32/actions/gnome-stock-mail-snd.png
+share/icons/gnome/32x32/actions/gnome-stock-text-indent.png
+share/icons/gnome/32x32/actions/gnome-stock-text-unindent.png
 share/icons/gnome/32x32/actions/go-bottom.png
 share/icons/gnome/32x32/actions/go-down.png
 share/icons/gnome/32x32/actions/go-first.png
 share/icons/gnome/32x32/actions/go-home.png
+share/icons/gnome/32x32/actions/go-jump.png
 share/icons/gnome/32x32/actions/go-last.png
 share/icons/gnome/32x32/actions/go-next.png
 share/icons/gnome/32x32/actions/go-previous.png
@@ -3954,7 +4282,14 @@ share/icons/gnome/32x32/actions/go-top.png
 share/icons/gnome/32x32/actions/go-up.png
 share/icons/gnome/32x32/actions/gohome.png
 share/icons/gnome/32x32/actions/gtk-add.png
+share/icons/gnome/32x32/actions/gtk-bold.png
+share/icons/gnome/32x32/actions/gtk-clear.png
+share/icons/gnome/32x32/actions/gtk-close.png
+share/icons/gnome/32x32/actions/gtk-copy.png
 share/icons/gnome/32x32/actions/gtk-cut.png
+share/icons/gnome/32x32/actions/gtk-delete.png
+share/icons/gnome/32x32/actions/gtk-find-and-replace.png
+share/icons/gnome/32x32/actions/gtk-find.png
 share/icons/gnome/32x32/actions/gtk-fullscreen.png
 share/icons/gnome/32x32/actions/gtk-go-back-ltr.png
 share/icons/gnome/32x32/actions/gtk-go-back-rtl.png
@@ -3969,16 +4304,36 @@ share/icons/gnome/32x32/actions/gtk-goto-last-ltr.png
 share/icons/gnome/32x32/actions/gtk-goto-last-rtl.png
 share/icons/gnome/32x32/actions/gtk-goto-top.png
 share/icons/gnome/32x32/actions/gtk-home.png
+share/icons/gnome/32x32/actions/gtk-indent.png
+share/icons/gnome/32x32/actions/gtk-italic.png
+share/icons/gnome/32x32/actions/gtk-jump-to-ltr.png
+share/icons/gnome/32x32/actions/gtk-jump-to-rtl.png
 share/icons/gnome/32x32/actions/gtk-justify-center.png
 share/icons/gnome/32x32/actions/gtk-justify-fill.png
 share/icons/gnome/32x32/actions/gtk-justify-left.png
 share/icons/gnome/32x32/actions/gtk-justify-right.png
 share/icons/gnome/32x32/actions/gtk-leave-fullscreen.png
+share/icons/gnome/32x32/actions/gtk-media-forward-ltr.png
+share/icons/gnome/32x32/actions/gtk-media-forward-rtl.png
+share/icons/gnome/32x32/actions/gtk-media-next-ltr.png
+share/icons/gnome/32x32/actions/gtk-media-next-rtl.png
+share/icons/gnome/32x32/actions/gtk-media-pause.png
+share/icons/gnome/32x32/actions/gtk-media-play-ltr.png
+share/icons/gnome/32x32/actions/gtk-media-previous-ltr.png
+share/icons/gnome/32x32/actions/gtk-media-previous-rtl.png
+share/icons/gnome/32x32/actions/gtk-media-record.png
+share/icons/gnome/32x32/actions/gtk-media-rewind-ltr.png
+share/icons/gnome/32x32/actions/gtk-media-rewind-rtl.png
+share/icons/gnome/32x32/actions/gtk-media-stop.png
 share/icons/gnome/32x32/actions/gtk-new.png
 share/icons/gnome/32x32/actions/gtk-open.png
 share/icons/gnome/32x32/actions/gtk-paste.png
+share/icons/gnome/32x32/actions/gtk-print-preview.png
+share/icons/gnome/32x32/actions/gtk-print.png
 share/icons/gnome/32x32/actions/gtk-properties.png
+share/icons/gnome/32x32/actions/gtk-quit.png
 share/icons/gnome/32x32/actions/gtk-redo-ltr.png
+share/icons/gnome/32x32/actions/gtk-refresh.png
 share/icons/gnome/32x32/actions/gtk-remove.png
 share/icons/gnome/32x32/actions/gtk-save-as.png
 share/icons/gnome/32x32/actions/gtk-save.png
@@ -3986,32 +4341,82 @@ share/icons/gnome/32x32/actions/gtk-select-all.png
 share/icons/gnome/32x32/actions/gtk-sort-ascending.png
 share/icons/gnome/32x32/actions/gtk-sort-descending.png
 share/icons/gnome/32x32/actions/gtk-stop.png
+share/icons/gnome/32x32/actions/gtk-strikethrough.png
+share/icons/gnome/32x32/actions/gtk-underline.png
 share/icons/gnome/32x32/actions/gtk-undo-ltr.png
+share/icons/gnome/32x32/actions/gtk-unindent.png
 share/icons/gnome/32x32/actions/gtk-zoom-100.png
 share/icons/gnome/32x32/actions/gtk-zoom-fit.png
 share/icons/gnome/32x32/actions/gtk-zoom-in.png
 share/icons/gnome/32x32/actions/gtk-zoom-out.png
+share/icons/gnome/32x32/actions/help-about.png
+share/icons/gnome/32x32/actions/help-contents.png
 share/icons/gnome/32x32/actions/help-faq.png
+share/icons/gnome/32x32/actions/insert-image.png
+share/icons/gnome/32x32/actions/insert-link.png
+share/icons/gnome/32x32/actions/insert-object.png
+share/icons/gnome/32x32/actions/insert-text.png
+share/icons/gnome/32x32/actions/kfind.png
 share/icons/gnome/32x32/actions/kfm_home.png
 share/icons/gnome/32x32/actions/leftjust.png
 share/icons/gnome/32x32/actions/list-add.png
 share/icons/gnome/32x32/actions/list-remove.png
 share/icons/gnome/32x32/actions/lock.png
+share/icons/gnome/32x32/actions/mail-forward.png
+share/icons/gnome/32x32/actions/mail-mark-important.png
+share/icons/gnome/32x32/actions/mail-mark-read.png
+share/icons/gnome/32x32/actions/mail-mark-unread.png
+share/icons/gnome/32x32/actions/mail-message-new.png
+share/icons/gnome/32x32/actions/mail-reply-all.png
+share/icons/gnome/32x32/actions/mail-reply-sender.png
+share/icons/gnome/32x32/actions/mail-send-receive.png
+share/icons/gnome/32x32/actions/mail-send.png
+share/icons/gnome/32x32/actions/mail_forward.png
+share/icons/gnome/32x32/actions/mail_new.png
+share/icons/gnome/32x32/actions/mail_reply.png
+share/icons/gnome/32x32/actions/mail_replyall.png
+share/icons/gnome/32x32/actions/mail_send.png
 share/icons/gnome/32x32/actions/media-eject.png
+share/icons/gnome/32x32/actions/media-playback-pause.png
+share/icons/gnome/32x32/actions/media-playback-start.png
+share/icons/gnome/32x32/actions/media-playback-stop.png
+share/icons/gnome/32x32/actions/media-record.png
+share/icons/gnome/32x32/actions/media-seek-backward.png
+share/icons/gnome/32x32/actions/media-seek-forward.png
+share/icons/gnome/32x32/actions/media-skip-backward.png
+share/icons/gnome/32x32/actions/media-skip-forward.png
 share/icons/gnome/32x32/actions/next.png
+share/icons/gnome/32x32/actions/object-flip-horizontal.png
+share/icons/gnome/32x32/actions/object-flip-vertical.png
 share/icons/gnome/32x32/actions/object-rotate-left.png
 share/icons/gnome/32x32/actions/object-rotate-right.png
 share/icons/gnome/32x32/actions/player_eject.png
+share/icons/gnome/32x32/actions/player_end.png
+share/icons/gnome/32x32/actions/player_fwd.png
+share/icons/gnome/32x32/actions/player_pause.png
+share/icons/gnome/32x32/actions/player_play.png
+share/icons/gnome/32x32/actions/player_record.png
+share/icons/gnome/32x32/actions/player_rew.png
+share/icons/gnome/32x32/actions/player_start.png
+share/icons/gnome/32x32/actions/player_stop.png
 share/icons/gnome/32x32/actions/previous.png
 share/icons/gnome/32x32/actions/process-stop.png
 share/icons/gnome/32x32/actions/redhat-home.png
 share/icons/gnome/32x32/actions/redo.png
+share/icons/gnome/32x32/actions/reload.png
+share/icons/gnome/32x32/actions/reload3.png
+share/icons/gnome/32x32/actions/reload_all_tabs.png
+share/icons/gnome/32x32/actions/reload_page.png
 share/icons/gnome/32x32/actions/remove.png
 share/icons/gnome/32x32/actions/rightjust.png
+share/icons/gnome/32x32/actions/search.png
 share/icons/gnome/32x32/actions/start.png
 share/icons/gnome/32x32/actions/stock_add-bookmark.png
 share/icons/gnome/32x32/actions/stock_bottom.png
+share/icons/gnome/32x32/actions/stock_close.png
+share/icons/gnome/32x32/actions/stock_copy.png
 share/icons/gnome/32x32/actions/stock_cut.png
+share/icons/gnome/32x32/actions/stock_delete.png
 share/icons/gnome/32x32/actions/stock_down.png
 share/icons/gnome/32x32/actions/stock_file-properites.png
 share/icons/gnome/32x32/actions/stock_first.png
@@ -4021,23 +4426,51 @@ share/icons/gnome/32x32/actions/stock_home.png
 share/icons/gnome/32x32/actions/stock_last.png
 share/icons/gnome/32x32/actions/stock_leave-fullscreen.png
 share/icons/gnome/32x32/actions/stock_left.png
+share/icons/gnome/32x32/actions/stock_mail-compose.png
+share/icons/gnome/32x32/actions/stock_mail-forward.png
+share/icons/gnome/32x32/actions/stock_mail-open.png
+share/icons/gnome/32x32/actions/stock_mail-reply-to-all.png
+share/icons/gnome/32x32/actions/stock_mail-reply.png
+share/icons/gnome/32x32/actions/stock_mail-send-receive.png
+share/icons/gnome/32x32/actions/stock_mail-send.png
+share/icons/gnome/32x32/actions/stock_mail-unread.png
+share/icons/gnome/32x32/actions/stock_media-fwd.png
+share/icons/gnome/32x32/actions/stock_media-next.png
+share/icons/gnome/32x32/actions/stock_media-pause.png
+share/icons/gnome/32x32/actions/stock_media-play.png
+share/icons/gnome/32x32/actions/stock_media-prev.png
+share/icons/gnome/32x32/actions/stock_media-rec.png
+share/icons/gnome/32x32/actions/stock_media-rew.png
+share/icons/gnome/32x32/actions/stock_media-stop.png
 share/icons/gnome/32x32/actions/stock_new-address-book.png
+share/icons/gnome/32x32/actions/stock_new-appointment.png
 share/icons/gnome/32x32/actions/stock_new-bcard.png
 share/icons/gnome/32x32/actions/stock_new-dir.png
 share/icons/gnome/32x32/actions/stock_new-text.png
 share/icons/gnome/32x32/actions/stock_new-window.png
 share/icons/gnome/32x32/actions/stock_paste.png
+share/icons/gnome/32x32/actions/stock_print-preview.png
+share/icons/gnome/32x32/actions/stock_print.png
 share/icons/gnome/32x32/actions/stock_properties.png
 share/icons/gnome/32x32/actions/stock_redo.png
+share/icons/gnome/32x32/actions/stock_refresh.png
 share/icons/gnome/32x32/actions/stock_right.png
 share/icons/gnome/32x32/actions/stock_save-as.png
 share/icons/gnome/32x32/actions/stock_save.png
+share/icons/gnome/32x32/actions/stock_search-and-replace.png
+share/icons/gnome/32x32/actions/stock_search.png
 share/icons/gnome/32x32/actions/stock_select-all.png
 share/icons/gnome/32x32/actions/stock_stop.png
+share/icons/gnome/32x32/actions/stock_text-strikethrough.png
+share/icons/gnome/32x32/actions/stock_text_bold.png
 share/icons/gnome/32x32/actions/stock_text_center.png
+share/icons/gnome/32x32/actions/stock_text_indent.png
+share/icons/gnome/32x32/actions/stock_text_italic.png
 share/icons/gnome/32x32/actions/stock_text_justify.png
 share/icons/gnome/32x32/actions/stock_text_left.png
 share/icons/gnome/32x32/actions/stock_text_right.png
+share/icons/gnome/32x32/actions/stock_text_underlined.png
+share/icons/gnome/32x32/actions/stock_text_unindent.png
 share/icons/gnome/32x32/actions/stock_top.png
 share/icons/gnome/32x32/actions/stock_undo.png
 share/icons/gnome/32x32/actions/stock_up.png
@@ -4047,11 +4480,19 @@ share/icons/gnome/32x32/actions/stock_zoom-out.png
 share/icons/gnome/32x32/actions/stock_zoom-page.png
 share/icons/gnome/32x32/actions/stop.png
 share/icons/gnome/32x32/actions/system-lock-screen.png
+share/icons/gnome/32x32/actions/system-log-out.png
 share/icons/gnome/32x32/actions/system-run.png
+share/icons/gnome/32x32/actions/system-search.png
+share/icons/gnome/32x32/actions/text_bold.png
+share/icons/gnome/32x32/actions/text_italic.png
+share/icons/gnome/32x32/actions/text_strike.png
+share/icons/gnome/32x32/actions/text_under.png
+share/icons/gnome/32x32/actions/tools-check-spelling.png
 share/icons/gnome/32x32/actions/top.png
 share/icons/gnome/32x32/actions/undo.png
 share/icons/gnome/32x32/actions/up.png
 share/icons/gnome/32x32/actions/view-fullscreen.png
+share/icons/gnome/32x32/actions/view-refresh.png
 share/icons/gnome/32x32/actions/view-restore.png
 share/icons/gnome/32x32/actions/view-sort-ascending.png
 share/icons/gnome/32x32/actions/view-sort-descending.png
@@ -4059,10 +4500,12 @@ share/icons/gnome/32x32/actions/viewmag+.png
 share/icons/gnome/32x32/actions/viewmag-.png
 share/icons/gnome/32x32/actions/viewmag1.png
 share/icons/gnome/32x32/actions/viewmagfit.png
+share/icons/gnome/32x32/actions/window-close.png
 share/icons/gnome/32x32/actions/window-new.png
 share/icons/gnome/32x32/actions/window_fullscreen.png
 share/icons/gnome/32x32/actions/window_new.png
 share/icons/gnome/32x32/actions/window_nofullscreen.png
+share/icons/gnome/32x32/actions/xfce-system-exit.png
 share/icons/gnome/32x32/actions/xfce-system-lock.png
 share/icons/gnome/32x32/actions/zoom-best-fit.png
 share/icons/gnome/32x32/actions/zoom-in.png
@@ -4075,7 +4518,10 @@ share/icons/gnome/32x32/animations/process-working.png
 share/icons/gnome/32x32/apps/access.png
 share/icons/gnome/32x32/apps/accessibility-directory.png
 share/icons/gnome/32x32/apps/accessories-calculator.png
+share/icons/gnome/32x32/apps/accessories-character-map.png
+share/icons/gnome/32x32/apps/accessories-dictionary.png
 share/icons/gnome/32x32/apps/accessories-text-editor.png
+share/icons/gnome/32x32/apps/arts.png
 share/icons/gnome/32x32/apps/background.png
 share/icons/gnome/32x32/apps/calc.png
 share/icons/gnome/32x32/apps/config-language.png
@@ -4083,7 +4529,9 @@ share/icons/gnome/32x32/apps/config-users.png
 share/icons/gnome/32x32/apps/file-manager.png
 share/icons/gnome/32x32/apps/fonts.png
 share/icons/gnome/32x32/apps/gnome-calculator.png
+share/icons/gnome/32x32/apps/gnome-character-map.png
 share/icons/gnome/32x32/apps/gnome-help.png
+share/icons/gnome/32x32/apps/gnome-mixer.png
 share/icons/gnome/32x32/apps/gnome-monitor.png
 share/icons/gnome/32x32/apps/gnome-remote-desktop.png
 share/icons/gnome/32x32/apps/gnome-settings-accessibility-technologies.png
@@ -4095,10 +4543,13 @@ share/icons/gnome/32x32/apps/gnome-settings-ui-behavior.png
 share/icons/gnome/32x32/apps/gnome-terminal.png
 share/icons/gnome/32x32/apps/gnome-window-manager.png
 share/icons/gnome/32x32/apps/gtk-help.png
+share/icons/gnome/32x32/apps/gucharmap.png
 share/icons/gnome/32x32/apps/help-browser.png
 share/icons/gnome/32x32/apps/help.png
 share/icons/gnome/32x32/apps/kcalc.png
+share/icons/gnome/32x32/apps/kcharselect.png
 share/icons/gnome/32x32/apps/kcmkwm.png
+share/icons/gnome/32x32/apps/kcmsound.png
 share/icons/gnome/32x32/apps/kedit.png
 share/icons/gnome/32x32/apps/key_bindings.png
 share/icons/gnome/32x32/apps/kfm.png
@@ -4111,6 +4562,8 @@ share/icons/gnome/32x32/apps/kuser.png
 share/icons/gnome/32x32/apps/kwin.png
 share/icons/gnome/32x32/apps/locale.png
 share/icons/gnome/32x32/apps/logviewer.png
+share/icons/gnome/32x32/apps/multimedia-volume-control.png
+share/icons/gnome/32x32/apps/multimedia.png
 share/icons/gnome/32x32/apps/openterm.png
 share/icons/gnome/32x32/apps/preferences-desktop-accessibility.png
 share/icons/gnome/32x32/apps/preferences-desktop-font.png
@@ -4130,20 +4583,26 @@ share/icons/gnome/32x32/apps/susehelpcenter.png
 share/icons/gnome/32x32/apps/system-config-users.png
 share/icons/gnome/32x32/apps/system-file-manager.png
 share/icons/gnome/32x32/apps/system-software-installer.png
+share/icons/gnome/32x32/apps/system-software-update.png
 share/icons/gnome/32x32/apps/system-users.png
 share/icons/gnome/32x32/apps/terminal.png
 share/icons/gnome/32x32/apps/text-editor.png
+share/icons/gnome/32x32/apps/update-manager.png
 share/icons/gnome/32x32/apps/user-info.png
 share/icons/gnome/32x32/apps/utilities-system-monitor.png
 share/icons/gnome/32x32/apps/utilities-terminal.png
+share/icons/gnome/32x32/apps/volume-knob.png
 share/icons/gnome/32x32/apps/wallpaper.png
 share/icons/gnome/32x32/apps/xfce-filemanager.png
 share/icons/gnome/32x32/apps/xfce-terminal.png
 share/icons/gnome/32x32/apps/xfce4-backdrop.png
+share/icons/gnome/32x32/apps/xfce4-mixer.png
 share/icons/gnome/32x32/apps/xfwm4.png
 share/icons/gnome/32x32/apps/xscreensaver.png
+share/icons/gnome/32x32/apps/zen-icon.png
 share/icons/gnome/32x32/categories/applications-accessories.png
 share/icons/gnome/32x32/categories/applications-development.png
+share/icons/gnome/32x32/categories/applications-engineering.png
 share/icons/gnome/32x32/categories/applications-games.png
 share/icons/gnome/32x32/categories/applications-graphics.png
 share/icons/gnome/32x32/categories/applications-internet.png
@@ -4152,6 +4611,7 @@ share/icons/gnome/32x32/categories/applications-office.png
 share/icons/gnome/32x32/categories/applications-other.png
 share/icons/gnome/32x32/categories/applications-science.png
 share/icons/gnome/32x32/categories/applications-system.png
+share/icons/gnome/32x32/categories/applications-utilities.png
 share/icons/gnome/32x32/categories/gnome-applications.png
 share/icons/gnome/32x32/categories/gnome-control-center.png
 share/icons/gnome/32x32/categories/gnome-devel.png
@@ -4163,6 +4623,7 @@ share/icons/gnome/32x32/categories/gnome-settings.png
 share/icons/gnome/32x32/categories/gnome-system.png
 share/icons/gnome/32x32/categories/gnome-util.png
 share/icons/gnome/32x32/categories/gtk-preferences.png
+share/icons/gnome/32x32/categories/input_devices_settings.png
 share/icons/gnome/32x32/categories/kcontrol.png
 share/icons/gnome/32x32/categories/package_development.png
 share/icons/gnome/32x32/categories/package_games.png
@@ -4173,7 +4634,11 @@ share/icons/gnome/32x32/categories/package_office.png
 share/icons/gnome/32x32/categories/package_settings.png
 share/icons/gnome/32x32/categories/package_system.png
 share/icons/gnome/32x32/categories/package_utilities.png
+share/icons/gnome/32x32/categories/preferences-desktop-peripherals.png
+share/icons/gnome/32x32/categories/preferences-desktop-personal.png
 share/icons/gnome/32x32/categories/preferences-desktop.png
+share/icons/gnome/32x32/categories/preferences-other.png
+share/icons/gnome/32x32/categories/preferences-system-network.png
 share/icons/gnome/32x32/categories/preferences-system.png
 share/icons/gnome/32x32/categories/redhat-accessories.png
 share/icons/gnome/32x32/categories/redhat-games.png
@@ -4186,18 +4651,21 @@ share/icons/gnome/32x32/categories/redhat-sound_video.png
 share/icons/gnome/32x32/categories/redhat-system_settings.png
 share/icons/gnome/32x32/categories/redhat-system_tools.png
 share/icons/gnome/32x32/categories/stock_internet.png
+share/icons/gnome/32x32/categories/system-help.png
 share/icons/gnome/32x32/categories/xfce-games.png
 share/icons/gnome/32x32/categories/xfce-graphics.png
 share/icons/gnome/32x32/categories/xfce-internet.png
 share/icons/gnome/32x32/categories/xfce-multimedia.png
 share/icons/gnome/32x32/categories/xfce-office.png
-share/icons/gnome/32x32/categories/xfce4-settings.png
 share/icons/gnome/32x32/categories/xfce-system-settings.png
 share/icons/gnome/32x32/categories/xfce-utils.png
+share/icons/gnome/32x32/categories/xfce4-settings.png
 share/icons/gnome/32x32/devices/3floppy_unmount.png
+share/icons/gnome/32x32/devices/audio-card.png
 share/icons/gnome/32x32/devices/audio-input-microphone.png
 share/icons/gnome/32x32/devices/battery.png
 share/icons/gnome/32x32/devices/camera-photo.png
+share/icons/gnome/32x32/devices/camera-video.png
 share/icons/gnome/32x32/devices/camera-web.png
 share/icons/gnome/32x32/devices/camera.png
 share/icons/gnome/32x32/devices/camera_unmount.png
@@ -4223,6 +4691,7 @@ share/icons/gnome/32x32/devices/gnome-dev-disc-dvdram.png
 share/icons/gnome/32x32/devices/gnome-dev-disc-dvdrom.png
 share/icons/gnome/32x32/devices/gnome-dev-disc-dvdrw.png
 share/icons/gnome/32x32/devices/gnome-dev-dvd.png
+share/icons/gnome/32x32/devices/gnome-dev-ethernet.png
 share/icons/gnome/32x32/devices/gnome-dev-floppy.png
 share/icons/gnome/32x32/devices/gnome-dev-harddisk-1394.png
 share/icons/gnome/32x32/devices/gnome-dev-harddisk-usb.png
@@ -4239,6 +4708,8 @@ share/icons/gnome/32x32/devices/gnome-dev-printer.png
 share/icons/gnome/32x32/devices/gnome-dev-removable-1394.png
 share/icons/gnome/32x32/devices/gnome-dev-removable-usb.png
 share/icons/gnome/32x32/devices/gnome-dev-removable.png
+share/icons/gnome/32x32/devices/gnome-dev-wavelan.png
+share/icons/gnome/32x32/devices/gnome-dev-zipdisk.png
 share/icons/gnome/32x32/devices/gnome-fs-client.png
 share/icons/gnome/32x32/devices/gnome-modem.png
 share/icons/gnome/32x32/devices/gnome-stock-mic.png
@@ -4247,10 +4718,12 @@ share/icons/gnome/32x32/devices/gtk-floppy.png
 share/icons/gnome/32x32/devices/gtk-harddisk.png
 share/icons/gnome/32x32/devices/harddrive.png
 share/icons/gnome/32x32/devices/hdd_unmount.png
+share/icons/gnome/32x32/devices/input-gaming.png
 share/icons/gnome/32x32/devices/input-keyboard.png
 share/icons/gnome/32x32/devices/input-mouse.png
 share/icons/gnome/32x32/devices/input-tablet.png
 share/icons/gnome/32x32/devices/ipod_mount.png
+share/icons/gnome/32x32/devices/joystick.png
 share/icons/gnome/32x32/devices/keyboard.png
 share/icons/gnome/32x32/devices/kjobviewer.png
 share/icons/gnome/32x32/devices/kxkb.png
@@ -4259,13 +4732,19 @@ share/icons/gnome/32x32/devices/media-flash.png
 share/icons/gnome/32x32/devices/media-floppy.png
 share/icons/gnome/32x32/devices/media-optical.png
 share/icons/gnome/32x32/devices/media-tape.png
+share/icons/gnome/32x32/devices/media-zip.png
 share/icons/gnome/32x32/devices/modem.png
 share/icons/gnome/32x32/devices/mouse.png
 share/icons/gnome/32x32/devices/multimedia-player.png
+share/icons/gnome/32x32/devices/network-wired.png
+share/icons/gnome/32x32/devices/network-wireless.png
+share/icons/gnome/32x32/devices/pda.png
+share/icons/gnome/32x32/devices/phone.png
 share/icons/gnome/32x32/devices/printer-remote.png
 share/icons/gnome/32x32/devices/printer.png
 share/icons/gnome/32x32/devices/printer1.png
 share/icons/gnome/32x32/devices/printmgr.png
+share/icons/gnome/32x32/devices/scanner.png
 share/icons/gnome/32x32/devices/stock_mic.png
 share/icons/gnome/32x32/devices/stock_printers.png
 share/icons/gnome/32x32/devices/system-floppy.png
@@ -4278,16 +4757,43 @@ share/icons/gnome/32x32/devices/xfce4-keyboard.png
 share/icons/gnome/32x32/devices/xfce4-mouse.png
 share/icons/gnome/32x32/devices/yast_HD.png
 share/icons/gnome/32x32/devices/yast_idetude.png
+share/icons/gnome/32x32/devices/yast_joystick.png
 share/icons/gnome/32x32/devices/yast_mouse.png
 share/icons/gnome/32x32/devices/yast_printer.png
+share/icons/gnome/32x32/devices/yast_soundcard.png
 share/icons/gnome/32x32/emblems/emblem-default.png
+share/icons/gnome/32x32/emblems/emblem-documents.png
+share/icons/gnome/32x32/emblems/emblem-downloads.png
 share/icons/gnome/32x32/emblems/emblem-favorite.png
+share/icons/gnome/32x32/emblems/emblem-generic.png
 share/icons/gnome/32x32/emblems/emblem-important.png
+share/icons/gnome/32x32/emblems/emblem-mail.png
 share/icons/gnome/32x32/emblems/emblem-new.png
 share/icons/gnome/32x32/emblems/emblem-package.png
+share/icons/gnome/32x32/emblems/emblem-photos.png
+share/icons/gnome/32x32/emblems/emblem-readonly.png
+share/icons/gnome/32x32/emblems/emblem-shared.png
 share/icons/gnome/32x32/emblems/emblem-symbolic-link.png
+share/icons/gnome/32x32/emblems/emblem-system.png
+share/icons/gnome/32x32/emblems/emblem-unreadable.png
+share/icons/gnome/32x32/emblems/emblem-urgent.png
 share/icons/gnome/32x32/emblems/emblem-web.png
 share/icons/gnome/32x32/emblems/stock_mail-priority-high.png
+share/icons/gnome/32x32/emotes/face-angel.png
+share/icons/gnome/32x32/emotes/face-cool.png
+share/icons/gnome/32x32/emotes/face-crying.png
+share/icons/gnome/32x32/emotes/face-devilish.png
+share/icons/gnome/32x32/emotes/face-embarrassed.png
+share/icons/gnome/32x32/emotes/face-kiss.png
+share/icons/gnome/32x32/emotes/face-monkey.png
+share/icons/gnome/32x32/emotes/face-plain.png
+share/icons/gnome/32x32/emotes/face-raspberry.png
+share/icons/gnome/32x32/emotes/face-sad.png
+share/icons/gnome/32x32/emotes/face-smile-big.png
+share/icons/gnome/32x32/emotes/face-smile.png
+share/icons/gnome/32x32/emotes/face-smirk.png
+share/icons/gnome/32x32/emotes/face-surprise.png
+share/icons/gnome/32x32/emotes/face-wink.png
 share/icons/gnome/32x32/mimetypes/application-certificate.png
 share/icons/gnome/32x32/mimetypes/application-x-executable.png
 share/icons/gnome/32x32/mimetypes/ascii.png
@@ -4442,9 +4948,11 @@ share/icons/gnome/32x32/places/distributor-logo.png
 share/icons/gnome/32x32/places/emptytrash.png
 share/icons/gnome/32x32/places/folder-remote.png
 share/icons/gnome/32x32/places/folder-saved-search.png
+share/icons/gnome/32x32/places/folder.icon
 share/icons/gnome/32x32/places/folder.png
 share/icons/gnome/32x32/places/folder_home.png
 share/icons/gnome/32x32/places/gnome-fs-desktop.png
+share/icons/gnome/32x32/places/gnome-fs-directory.icon
 share/icons/gnome/32x32/places/gnome-fs-directory.png
 share/icons/gnome/32x32/places/gnome-fs-ftp.png
 share/icons/gnome/32x32/places/gnome-fs-home.png
@@ -4470,17 +4978,28 @@ share/icons/gnome/32x32/places/novell-button.png
 share/icons/gnome/32x32/places/redhat-network-server.png
 share/icons/gnome/32x32/places/server.png
 share/icons/gnome/32x32/places/start-here.png
+share/icons/gnome/32x32/places/stock_folder.icon
 share/icons/gnome/32x32/places/stock_folder.png
 share/icons/gnome/32x32/places/trashcan_empty.png
 share/icons/gnome/32x32/places/user-desktop.png
 share/icons/gnome/32x32/places/user-home.png
 share/icons/gnome/32x32/places/user-trash.png
 share/icons/gnome/32x32/places/xfce-trash_empty.png
+share/icons/gnome/32x32/status/appointment-missed.png
+share/icons/gnome/32x32/status/appointment-soon.png
+share/icons/gnome/32x32/status/audio-volume-high.png
+share/icons/gnome/32x32/status/audio-volume-low.png
+share/icons/gnome/32x32/status/audio-volume-medium.png
+share/icons/gnome/32x32/status/audio-volume-muted.png
+share/icons/gnome/32x32/status/battery-caution.png
+share/icons/gnome/32x32/status/battery-low.png
 share/icons/gnome/32x32/status/connect_creating.png
 share/icons/gnome/32x32/status/connect_established.png
 share/icons/gnome/32x32/status/connect_no.png
 share/icons/gnome/32x32/status/dialog-error.png
 share/icons/gnome/32x32/status/dialog-information.png
+share/icons/gnome/32x32/status/dialog-password.png
+share/icons/gnome/32x32/status/dialog-question.png
 share/icons/gnome/32x32/status/dialog-warning.png
 share/icons/gnome/32x32/status/edittrash.png
 share/icons/gnome/32x32/status/error.png
@@ -4499,13 +5018,22 @@ share/icons/gnome/32x32/status/gnome-netstatus-rx.png
 share/icons/gnome/32x32/status/gnome-netstatus-tx.png
 share/icons/gnome/32x32/status/gnome-netstatus-txrx.png
 share/icons/gnome/32x32/status/gnome-stock-trash-full.png
+share/icons/gnome/32x32/status/gtk-dialog-authentication.png
 share/icons/gnome/32x32/status/gtk-dialog-error.png
 share/icons/gnome/32x32/status/gtk-dialog-info.png
+share/icons/gnome/32x32/status/gtk-dialog-question.png
 share/icons/gnome/32x32/status/gtk-dialog-warning.png
+share/icons/gnome/32x32/status/gtk-missing-image.png
 share/icons/gnome/32x32/status/image-loading.png
+share/icons/gnome/32x32/status/image-missing.png
 share/icons/gnome/32x32/status/important.png
 share/icons/gnome/32x32/status/info.png
 share/icons/gnome/32x32/status/mail-attachment.png
+share/icons/gnome/32x32/status/mail-read.png
+share/icons/gnome/32x32/status/mail-replied.png
+share/icons/gnome/32x32/status/mail-unread.png
+share/icons/gnome/32x32/status/media-playlist-repeat.png
+share/icons/gnome/32x32/status/media-playlist-shuffle.png
 share/icons/gnome/32x32/status/messagebox_critical.png
 share/icons/gnome/32x32/status/messagebox_info.png
 share/icons/gnome/32x32/status/messagebox_warning.png
@@ -4520,13 +5048,35 @@ share/icons/gnome/32x32/status/nm-device-wired.png
 share/icons/gnome/32x32/status/nm-device-wireless.png
 share/icons/gnome/32x32/status/nm-no-connection.png
 share/icons/gnome/32x32/status/printer-error.png
+share/icons/gnome/32x32/status/printer-printing.png
+share/icons/gnome/32x32/status/security-high.png
+share/icons/gnome/32x32/status/security-low.png
+share/icons/gnome/32x32/status/security-medium.png
+share/icons/gnome/32x32/status/software-update-available.png
+share/icons/gnome/32x32/status/software-update-urgent.png
+share/icons/gnome/32x32/status/stock_appointment-reminder-excl.png
+share/icons/gnome/32x32/status/stock_appointment-reminder.png
 share/icons/gnome/32x32/status/stock_dialog-error.png
 share/icons/gnome/32x32/status/stock_dialog-info.png
+share/icons/gnome/32x32/status/stock_dialog-question.png
 share/icons/gnome/32x32/status/stock_dialog-warning.png
+share/icons/gnome/32x32/status/stock_lock-broken.png
+share/icons/gnome/32x32/status/stock_lock-ok.png
+share/icons/gnome/32x32/status/stock_lock-open.png
+share/icons/gnome/32x32/status/stock_lock.png
 share/icons/gnome/32x32/status/stock_open.png
+share/icons/gnome/32x32/status/stock_repeat.png
+share/icons/gnome/32x32/status/stock_shuffle.png
 share/icons/gnome/32x32/status/stock_trash_full.png
+share/icons/gnome/32x32/status/stock_volume-0.png
+share/icons/gnome/32x32/status/stock_volume-max.png
+share/icons/gnome/32x32/status/stock_volume-med.png
+share/icons/gnome/32x32/status/stock_volume-min.png
+share/icons/gnome/32x32/status/stock_volume-mute.png
+share/icons/gnome/32x32/status/stock_volume.png
 share/icons/gnome/32x32/status/stock_weather-cloudy.png
 share/icons/gnome/32x32/status/stock_weather-few-clouds.png
+share/icons/gnome/32x32/status/stock_weather-fog.png
 share/icons/gnome/32x32/status/stock_weather-night-clear.png
 share/icons/gnome/32x32/status/stock_weather-night-few-clouds.png
 share/icons/gnome/32x32/status/stock_weather-showers.png
@@ -4534,12 +5084,15 @@ share/icons/gnome/32x32/status/stock_weather-snow.png
 share/icons/gnome/32x32/status/stock_weather-storm.png
 share/icons/gnome/32x32/status/stock_weather-sunny.png
 share/icons/gnome/32x32/status/sunny.png
+share/icons/gnome/32x32/status/task-due.png
+share/icons/gnome/32x32/status/task-past-due.png
 share/icons/gnome/32x32/status/trashcan_full.png
 share/icons/gnome/32x32/status/user-trash-full.png
 share/icons/gnome/32x32/status/weather-clear-night.png
 share/icons/gnome/32x32/status/weather-clear.png
 share/icons/gnome/32x32/status/weather-few-clouds-night.png
 share/icons/gnome/32x32/status/weather-few-clouds.png
+share/icons/gnome/32x32/status/weather-fog.png
 share/icons/gnome/32x32/status/weather-overcast.png
 share/icons/gnome/32x32/status/weather-severe-alert.png
 share/icons/gnome/32x32/status/weather-showers-scattered.png
@@ -4582,12 +5135,10 @@ share/icons/gnome/48x48/apps/gnome-desktop-config.png
 share/icons/gnome/48x48/apps/gnome-favorites.png
 share/icons/gnome/48x48/apps/gnome-finance.png
 share/icons/gnome/48x48/apps/gnome-grecord.png
-share/icons/gnome/48x48/apps/gnome-logout.png
 share/icons/gnome/48x48/apps/gnome-networktool.png
 share/icons/gnome/48x48/apps/gnome-pdf.png
 share/icons/gnome/48x48/apps/gnome-searchtool-animation-rest.png
 share/icons/gnome/48x48/apps/gnome-searchtool-animation.png
-share/icons/gnome/48x48/apps/gnome-searchtool.png
 share/icons/gnome/48x48/apps/gnome-server-config.png
 share/icons/gnome/48x48/apps/gnome-settings-accessibility-keyboard.png
 share/icons/gnome/48x48/apps/gnome-settings-default-applications.png
@@ -4597,7 +5148,6 @@ share/icons/gnome/48x48/apps/gnome-unknown.png
 share/icons/gnome/48x48/apps/hint.png
 share/icons/gnome/48x48/apps/hwbrowser.png
 share/icons/gnome/48x48/apps/im.png
-share/icons/gnome/48x48/apps/image-viewer.png
 share/icons/gnome/48x48/apps/launcher-program.png
 share/icons/gnome/48x48/apps/network-config.png
 share/icons/gnome/48x48/apps/palm-pilot-sync.png
@@ -4607,9 +5157,7 @@ share/icons/gnome/48x48/apps/serviceconf.png
 share/icons/gnome/48x48/apps/stock-ticker.png
 share/icons/gnome/48x48/apps/visor.png
 share/icons/gnome/48x48/devices/gnome-dev-jazdisk.png
-share/icons/gnome/48x48/devices/gnome-dev-zipdisk.png
 share/icons/gnome/48x48/devices/media-jaz.png
-share/icons/gnome/48x48/devices/media-zip.png
 share/icons/gnome/48x48/emblems/emblem-OK.icon
 share/icons/gnome/48x48/emblems/emblem-OK.png
 share/icons/gnome/48x48/emblems/emblem-art.icon
@@ -4620,20 +5168,12 @@ share/icons/gnome/48x48/emblems/emblem-certified.icon
 share/icons/gnome/48x48/emblems/emblem-certified.png
 share/icons/gnome/48x48/emblems/emblem-cool.icon
 share/icons/gnome/48x48/emblems/emblem-cool.png
-share/icons/gnome/48x48/emblems/emblem-cvs-controlled.icon
-share/icons/gnome/48x48/emblems/emblem-cvs-controlled.png
-share/icons/gnome/48x48/emblems/emblem-cvs-modified.icon
-share/icons/gnome/48x48/emblems/emblem-cvs-modified.png
-share/icons/gnome/48x48/emblems/emblem-cvs-sticky-tag.icon
-share/icons/gnome/48x48/emblems/emblem-cvs-sticky-tag.png
 share/icons/gnome/48x48/emblems/emblem-danger.icon
 share/icons/gnome/48x48/emblems/emblem-danger.png
 share/icons/gnome/48x48/emblems/emblem-desktop.icon
 share/icons/gnome/48x48/emblems/emblem-desktop.png
 share/icons/gnome/48x48/emblems/emblem-distinguished.icon
 share/icons/gnome/48x48/emblems/emblem-distinguished.png
-share/icons/gnome/48x48/emblems/emblem-documents.icon
-share/icons/gnome/48x48/emblems/emblem-documents.png
 share/icons/gnome/48x48/emblems/emblem-draft.icon
 share/icons/gnome/48x48/emblems/emblem-draft.png
 share/icons/gnome/48x48/emblems/emblem-handshake.icon
@@ -4644,12 +5184,8 @@ share/icons/gnome/48x48/emblems/emblem-money.icon
 share/icons/gnome/48x48/emblems/emblem-money.png
 share/icons/gnome/48x48/emblems/emblem-multimedia.icon
 share/icons/gnome/48x48/emblems/emblem-multimedia.png
-share/icons/gnome/48x48/emblems/emblem-noread.icon
-share/icons/gnome/48x48/emblems/emblem-noread.png
 share/icons/gnome/48x48/emblems/emblem-note.icon
 share/icons/gnome/48x48/emblems/emblem-note.png
-share/icons/gnome/48x48/emblems/emblem-nowrite.icon
-share/icons/gnome/48x48/emblems/emblem-nowrite.png
 share/icons/gnome/48x48/emblems/emblem-ohno.icon
 share/icons/gnome/48x48/emblems/emblem-ohno.png
 share/icons/gnome/48x48/emblems/emblem-people.icon
@@ -4664,8 +5200,6 @@ share/icons/gnome/48x48/emblems/emblem-presentation.icon
 share/icons/gnome/48x48/emblems/emblem-presentation.png
 share/icons/gnome/48x48/emblems/emblem-sales.icon
 share/icons/gnome/48x48/emblems/emblem-sales.png
-share/icons/gnome/48x48/emblems/emblem-shared.icon
-share/icons/gnome/48x48/emblems/emblem-shared.png
 share/icons/gnome/48x48/emblems/emblem-sound.icon
 share/icons/gnome/48x48/emblems/emblem-sound.png
 share/icons/gnome/48x48/emblems/emblem-trash.icon
@@ -4696,7 +5230,6 @@ share/icons/gnome/48x48/stock/generic/stock_autocompletion.png
 share/icons/gnome/48x48/stock/generic/stock_autopilot.png
 share/icons/gnome/48x48/stock/generic/stock_briefcase.png
 share/icons/gnome/48x48/stock/generic/stock_calendar-and-tasks.png
-share/icons/gnome/48x48/stock/generic/stock_cell-phone.png
 share/icons/gnome/48x48/stock/generic/stock_creditcard.png
 share/icons/gnome/48x48/stock/generic/stock_edit.png
 share/icons/gnome/48x48/stock/generic/stock_example.png
@@ -4745,7 +5278,6 @@ share/icons/gnome/48x48/stock/net/stock_mail-replied.png
 share/icons/gnome/48x48/stock/net/stock_mail-send-receive.png
 share/icons/gnome/48x48/stock/net/stock_mail-send.png
 share/icons/gnome/48x48/stock/net/stock_mail.png
-share/icons/gnome/48x48/stock/net/stock_not-spam.png
 share/icons/gnome/48x48/stock/net/stock_outbox.png
 share/icons/gnome/48x48/stock/net/stock_post-message.png
 share/icons/gnome/48x48/stock/net/stock_proxy.png
@@ -4753,10 +5285,15 @@ share/icons/gnome/48x48/stock/net/stock_sent-mail.png
 share/icons/gnome/48x48/stock/net/stock_spam.png
 share/icons/gnome/8x8/emblems/emblem-default.png
 share/icons/gnome/8x8/emblems/emblem-new.png
+share/icons/gnome/8x8/emblems/emblem-readonly.png
 share/icons/gnome/8x8/emblems/emblem-symbolic-link.png
+share/icons/gnome/8x8/emblems/emblem-unreadable.png
 share/icons/gnome/index.theme
 share/icons/gnome/scalable/actions/add.svg
 share/icons/gnome/scalable/actions/address-book-new.svg
+share/icons/gnome/scalable/actions/application-exit.svg
+share/icons/gnome/scalable/actions/appointment-new.svg
+share/icons/gnome/scalable/actions/appointment.svg
 share/icons/gnome/scalable/actions/back.svg
 share/icons/gnome/scalable/actions/bookmark-new.svg
 share/icons/gnome/scalable/actions/bookmark_add.svg
@@ -4765,14 +5302,19 @@ share/icons/gnome/scalable/actions/bottom.svg
 share/icons/gnome/scalable/actions/centrejust.svg
 share/icons/gnome/scalable/actions/contact-new.svg
 share/icons/gnome/scalable/actions/document-new.svg
+share/icons/gnome/scalable/actions/document-open-recent.svg
 share/icons/gnome/scalable/actions/document-open.svg
+share/icons/gnome/scalable/actions/document-page-setup.svg
 share/icons/gnome/scalable/actions/document-print-preview.svg
 share/icons/gnome/scalable/actions/document-print.svg
 share/icons/gnome/scalable/actions/document-properties.svg
 share/icons/gnome/scalable/actions/document-revert.svg
 share/icons/gnome/scalable/actions/document-save-as.svg
 share/icons/gnome/scalable/actions/document-save.svg
+share/icons/gnome/scalable/actions/document-send.svg
 share/icons/gnome/scalable/actions/down.svg
+share/icons/gnome/scalable/actions/edit-clear.svg
+share/icons/gnome/scalable/actions/edit-copy.svg
 share/icons/gnome/scalable/actions/edit-cut.svg
 share/icons/gnome/scalable/actions/edit-delete.svg
 share/icons/gnome/scalable/actions/edit-find-replace.svg
@@ -4781,9 +5323,12 @@ share/icons/gnome/scalable/actions/edit-paste.svg
 share/icons/gnome/scalable/actions/edit-redo.svg
 share/icons/gnome/scalable/actions/edit-select-all.svg
 share/icons/gnome/scalable/actions/edit-undo.svg
+share/icons/gnome/scalable/actions/editclear.svg
+share/icons/gnome/scalable/actions/editcopy.svg
 share/icons/gnome/scalable/actions/editcut.svg
-share/icons/gnome/scalable/actions/editpaste.svg
 share/icons/gnome/scalable/actions/editdelete.svg
+share/icons/gnome/scalable/actions/editpaste.svg
+share/icons/gnome/scalable/actions/exit.svg
 share/icons/gnome/scalable/actions/filefind.svg
 share/icons/gnome/scalable/actions/filenew.svg
 share/icons/gnome/scalable/actions/fileopen.svg
@@ -4795,17 +5340,34 @@ share/icons/gnome/scalable/actions/find.svg
 share/icons/gnome/scalable/actions/finish.svg
 share/icons/gnome/scalable/actions/folder-new.svg
 share/icons/gnome/scalable/actions/folder_new.svg
+share/icons/gnome/scalable/actions/format-indent-less.svg
+share/icons/gnome/scalable/actions/format-indent-more.svg
 share/icons/gnome/scalable/actions/format-justify-center.svg
 share/icons/gnome/scalable/actions/format-justify-fill.svg
 share/icons/gnome/scalable/actions/format-justify-left.svg
 share/icons/gnome/scalable/actions/format-justify-right.svg
+share/icons/gnome/scalable/actions/format-text-bold.svg
+share/icons/gnome/scalable/actions/format-text-direction-ltr.svg
+share/icons/gnome/scalable/actions/format-text-direction-rtl.svg
+share/icons/gnome/scalable/actions/format-text-italic.svg
+share/icons/gnome/scalable/actions/format-text-strikethrough.svg
+share/icons/gnome/scalable/actions/format-text-underline.svg
 share/icons/gnome/scalable/actions/forward.svg
 share/icons/gnome/scalable/actions/gnome-lockscreen.svg
+share/icons/gnome/scalable/actions/gnome-logout.svg
 share/icons/gnome/scalable/actions/gnome-run.svg
+share/icons/gnome/scalable/actions/gnome-searchtool.svg
+share/icons/gnome/scalable/actions/gnome-stock-mail-fwd.svg
+share/icons/gnome/scalable/actions/gnome-stock-mail-new.svg
+share/icons/gnome/scalable/actions/gnome-stock-mail-rpl.svg
+share/icons/gnome/scalable/actions/gnome-stock-mail-snd.svg
+share/icons/gnome/scalable/actions/gnome-stock-text-indent.svg
+share/icons/gnome/scalable/actions/gnome-stock-text-unindent.svg
 share/icons/gnome/scalable/actions/go-bottom.svg
 share/icons/gnome/scalable/actions/go-down.svg
 share/icons/gnome/scalable/actions/go-first.svg
 share/icons/gnome/scalable/actions/go-home.svg
+share/icons/gnome/scalable/actions/go-jump.svg
 share/icons/gnome/scalable/actions/go-last.svg
 share/icons/gnome/scalable/actions/go-next.svg
 share/icons/gnome/scalable/actions/go-previous.svg
@@ -4813,6 +5375,10 @@ share/icons/gnome/scalable/actions/go-top.svg
 share/icons/gnome/scalable/actions/go-up.svg
 share/icons/gnome/scalable/actions/gohome.svg
 share/icons/gnome/scalable/actions/gtk-add.svg
+share/icons/gnome/scalable/actions/gtk-bold.svg
+share/icons/gnome/scalable/actions/gtk-clear.svg
+share/icons/gnome/scalable/actions/gtk-close.svg
+share/icons/gnome/scalable/actions/gtk-copy.svg
 share/icons/gnome/scalable/actions/gtk-cut.svg
 share/icons/gnome/scalable/actions/gtk-delete.svg
 share/icons/gnome/scalable/actions/gtk-find-and-replace.svg
@@ -4831,18 +5397,36 @@ share/icons/gnome/scalable/actions/gtk-goto-last-ltr.svg
 share/icons/gnome/scalable/actions/gtk-goto-last-rtl.svg
 share/icons/gnome/scalable/actions/gtk-goto-top.svg
 share/icons/gnome/scalable/actions/gtk-home.svg
+share/icons/gnome/scalable/actions/gtk-indent.svg
+share/icons/gnome/scalable/actions/gtk-italic.svg
+share/icons/gnome/scalable/actions/gtk-jump-to-ltr.svg
+share/icons/gnome/scalable/actions/gtk-jump-to-rtl.svg
 share/icons/gnome/scalable/actions/gtk-justify-center.svg
 share/icons/gnome/scalable/actions/gtk-justify-fill.svg
 share/icons/gnome/scalable/actions/gtk-justify-left.svg
 share/icons/gnome/scalable/actions/gtk-justify-right.svg
 share/icons/gnome/scalable/actions/gtk-leave-fullscreen.svg
+share/icons/gnome/scalable/actions/gtk-media-forward-ltr.svg
+share/icons/gnome/scalable/actions/gtk-media-forward-rtl.svg
+share/icons/gnome/scalable/actions/gtk-media-next-ltr.svg
+share/icons/gnome/scalable/actions/gtk-media-next-rtl.svg
+share/icons/gnome/scalable/actions/gtk-media-pause.svg
+share/icons/gnome/scalable/actions/gtk-media-play-ltr.svg
+share/icons/gnome/scalable/actions/gtk-media-previous-ltr.svg
+share/icons/gnome/scalable/actions/gtk-media-previous-rtl.svg
+share/icons/gnome/scalable/actions/gtk-media-record.svg
+share/icons/gnome/scalable/actions/gtk-media-rewind-ltr.svg
+share/icons/gnome/scalable/actions/gtk-media-rewind-rtl.svg
+share/icons/gnome/scalable/actions/gtk-media-stop.svg
 share/icons/gnome/scalable/actions/gtk-new.svg
 share/icons/gnome/scalable/actions/gtk-open.svg
 share/icons/gnome/scalable/actions/gtk-paste.svg
 share/icons/gnome/scalable/actions/gtk-print-preview.svg
 share/icons/gnome/scalable/actions/gtk-print.svg
 share/icons/gnome/scalable/actions/gtk-properties.svg
+share/icons/gnome/scalable/actions/gtk-quit.svg
 share/icons/gnome/scalable/actions/gtk-redo-ltr.svg
+share/icons/gnome/scalable/actions/gtk-refresh.svg
 share/icons/gnome/scalable/actions/gtk-remove.svg
 share/icons/gnome/scalable/actions/gtk-save-as.svg
 share/icons/gnome/scalable/actions/gtk-save.svg
@@ -4850,36 +5434,80 @@ share/icons/gnome/scalable/actions/gtk-select-all.svg
 share/icons/gnome/scalable/actions/gtk-sort-ascending.svg
 share/icons/gnome/scalable/actions/gtk-sort-descending.svg
 share/icons/gnome/scalable/actions/gtk-stop.svg
+share/icons/gnome/scalable/actions/gtk-strikethrough.svg
+share/icons/gnome/scalable/actions/gtk-underline.svg
 share/icons/gnome/scalable/actions/gtk-undo-ltr.svg
+share/icons/gnome/scalable/actions/gtk-unindent.svg
 share/icons/gnome/scalable/actions/gtk-zoom-100.svg
 share/icons/gnome/scalable/actions/gtk-zoom-fit.svg
 share/icons/gnome/scalable/actions/gtk-zoom-in.svg
 share/icons/gnome/scalable/actions/gtk-zoom-out.svg
+share/icons/gnome/scalable/actions/help-about.svg
+share/icons/gnome/scalable/actions/help-contents.svg
 share/icons/gnome/scalable/actions/help-faq.svg
 share/icons/gnome/scalable/actions/insert-image.svg
 share/icons/gnome/scalable/actions/insert-link.svg
+share/icons/gnome/scalable/actions/insert-object.svg
 share/icons/gnome/scalable/actions/insert-text.svg
+share/icons/gnome/scalable/actions/kfind.svg
 share/icons/gnome/scalable/actions/kfm_home.svg
 share/icons/gnome/scalable/actions/leftjust.svg
 share/icons/gnome/scalable/actions/list-add.svg
 share/icons/gnome/scalable/actions/list-remove.svg
 share/icons/gnome/scalable/actions/lock.svg
+share/icons/gnome/scalable/actions/mail-forward.svg
+share/icons/gnome/scalable/actions/mail-mark-important.svg
+share/icons/gnome/scalable/actions/mail-mark-read.svg
+share/icons/gnome/scalable/actions/mail-mark-unread.svg
+share/icons/gnome/scalable/actions/mail-message-new.svg
+share/icons/gnome/scalable/actions/mail-reply-all.svg
+share/icons/gnome/scalable/actions/mail-reply-sender.svg
+share/icons/gnome/scalable/actions/mail-send-receive.svg
+share/icons/gnome/scalable/actions/mail-send.svg
+share/icons/gnome/scalable/actions/mail_forward.svg
+share/icons/gnome/scalable/actions/mail_new.svg
+share/icons/gnome/scalable/actions/mail_reply.svg
+share/icons/gnome/scalable/actions/mail_replyall.svg
+share/icons/gnome/scalable/actions/mail_send.svg
 share/icons/gnome/scalable/actions/media-eject.svg
+share/icons/gnome/scalable/actions/media-playback-pause.svg
+share/icons/gnome/scalable/actions/media-playback-start.svg
+share/icons/gnome/scalable/actions/media-playback-stop.svg
+share/icons/gnome/scalable/actions/media-record.svg
+share/icons/gnome/scalable/actions/media-seek-backward.svg
+share/icons/gnome/scalable/actions/media-seek-forward.svg
+share/icons/gnome/scalable/actions/media-skip-backward.svg
+share/icons/gnome/scalable/actions/media-skip-forward.svg
 share/icons/gnome/scalable/actions/next.svg
 share/icons/gnome/scalable/actions/object-flip-horizontal.svg
 share/icons/gnome/scalable/actions/object-flip-vertical.svg
 share/icons/gnome/scalable/actions/object-rotate-left.svg
 share/icons/gnome/scalable/actions/object-rotate-right.svg
 share/icons/gnome/scalable/actions/player_eject.svg
+share/icons/gnome/scalable/actions/player_end.svg
+share/icons/gnome/scalable/actions/player_fwd.svg
+share/icons/gnome/scalable/actions/player_pause.svg
+share/icons/gnome/scalable/actions/player_play.svg
+share/icons/gnome/scalable/actions/player_record.svg
+share/icons/gnome/scalable/actions/player_rew.svg
+share/icons/gnome/scalable/actions/player_start.svg
+share/icons/gnome/scalable/actions/player_stop.svg
 share/icons/gnome/scalable/actions/previous.svg
 share/icons/gnome/scalable/actions/process-stop.svg
 share/icons/gnome/scalable/actions/redhat-home.svg
 share/icons/gnome/scalable/actions/redo.svg
+share/icons/gnome/scalable/actions/reload.svg
+share/icons/gnome/scalable/actions/reload3.svg
+share/icons/gnome/scalable/actions/reload_all_tabs.svg
+share/icons/gnome/scalable/actions/reload_page.svg
 share/icons/gnome/scalable/actions/remove.svg
 share/icons/gnome/scalable/actions/rightjust.svg
+share/icons/gnome/scalable/actions/search.svg
 share/icons/gnome/scalable/actions/start.svg
 share/icons/gnome/scalable/actions/stock_add-bookmark.svg
 share/icons/gnome/scalable/actions/stock_bottom.svg
+share/icons/gnome/scalable/actions/stock_close.svg
+share/icons/gnome/scalable/actions/stock_copy.svg
 share/icons/gnome/scalable/actions/stock_cut.svg
 share/icons/gnome/scalable/actions/stock_delete.svg
 share/icons/gnome/scalable/actions/stock_down.svg
@@ -4891,7 +5519,24 @@ share/icons/gnome/scalable/actions/stock_home.svg
 share/icons/gnome/scalable/actions/stock_last.svg
 share/icons/gnome/scalable/actions/stock_leave-fullscreen.svg
 share/icons/gnome/scalable/actions/stock_left.svg
+share/icons/gnome/scalable/actions/stock_mail-compose.svg
+share/icons/gnome/scalable/actions/stock_mail-forward.svg
+share/icons/gnome/scalable/actions/stock_mail-open.svg
+share/icons/gnome/scalable/actions/stock_mail-reply-to-all.svg
+share/icons/gnome/scalable/actions/stock_mail-reply.svg
+share/icons/gnome/scalable/actions/stock_mail-send-receive.svg
+share/icons/gnome/scalable/actions/stock_mail-send.svg
+share/icons/gnome/scalable/actions/stock_mail-unread.svg
+share/icons/gnome/scalable/actions/stock_media-fwd.svg
+share/icons/gnome/scalable/actions/stock_media-next.svg
+share/icons/gnome/scalable/actions/stock_media-pause.svg
+share/icons/gnome/scalable/actions/stock_media-play.svg
+share/icons/gnome/scalable/actions/stock_media-prev.svg
+share/icons/gnome/scalable/actions/stock_media-rec.svg
+share/icons/gnome/scalable/actions/stock_media-rew.svg
+share/icons/gnome/scalable/actions/stock_media-stop.svg
 share/icons/gnome/scalable/actions/stock_new-address-book.svg
+share/icons/gnome/scalable/actions/stock_new-appointment.svg
 share/icons/gnome/scalable/actions/stock_new-bcard.svg
 share/icons/gnome/scalable/actions/stock_new-dir.svg
 share/icons/gnome/scalable/actions/stock_new-text.svg
@@ -4901,6 +5546,7 @@ share/icons/gnome/scalable/actions/stock_print-preview.svg
 share/icons/gnome/scalable/actions/stock_print.svg
 share/icons/gnome/scalable/actions/stock_properties.svg
 share/icons/gnome/scalable/actions/stock_redo.svg
+share/icons/gnome/scalable/actions/stock_refresh.svg
 share/icons/gnome/scalable/actions/stock_right.svg
 share/icons/gnome/scalable/actions/stock_save-as.svg
 share/icons/gnome/scalable/actions/stock_save.svg
@@ -4908,10 +5554,16 @@ share/icons/gnome/scalable/actions/stock_search-and-replace.svg
 share/icons/gnome/scalable/actions/stock_search.svg
 share/icons/gnome/scalable/actions/stock_select-all.svg
 share/icons/gnome/scalable/actions/stock_stop.svg
+share/icons/gnome/scalable/actions/stock_text-strikethrough.svg
+share/icons/gnome/scalable/actions/stock_text_bold.svg
 share/icons/gnome/scalable/actions/stock_text_center.svg
+share/icons/gnome/scalable/actions/stock_text_indent.svg
+share/icons/gnome/scalable/actions/stock_text_italic.svg
 share/icons/gnome/scalable/actions/stock_text_justify.svg
 share/icons/gnome/scalable/actions/stock_text_left.svg
 share/icons/gnome/scalable/actions/stock_text_right.svg
+share/icons/gnome/scalable/actions/stock_text_underlined.svg
+share/icons/gnome/scalable/actions/stock_text_unindent.svg
 share/icons/gnome/scalable/actions/stock_top.svg
 share/icons/gnome/scalable/actions/stock_undo.svg
 share/icons/gnome/scalable/actions/stock_up.svg
@@ -4921,11 +5573,19 @@ share/icons/gnome/scalable/actions/stock_zoom-out.svg
 share/icons/gnome/scalable/actions/stock_zoom-page.svg
 share/icons/gnome/scalable/actions/stop.svg
 share/icons/gnome/scalable/actions/system-lock-screen.svg
+share/icons/gnome/scalable/actions/system-log-out.svg
 share/icons/gnome/scalable/actions/system-run.svg
+share/icons/gnome/scalable/actions/system-search.svg
+share/icons/gnome/scalable/actions/text_bold.svg
+share/icons/gnome/scalable/actions/text_italic.svg
+share/icons/gnome/scalable/actions/text_strike.svg
+share/icons/gnome/scalable/actions/text_under.svg
+share/icons/gnome/scalable/actions/tools-check-spelling.svg
 share/icons/gnome/scalable/actions/top.svg
 share/icons/gnome/scalable/actions/undo.svg
 share/icons/gnome/scalable/actions/up.svg
 share/icons/gnome/scalable/actions/view-fullscreen.svg
+share/icons/gnome/scalable/actions/view-refresh.svg
 share/icons/gnome/scalable/actions/view-restore.svg
 share/icons/gnome/scalable/actions/view-sort-ascending.svg
 share/icons/gnome/scalable/actions/view-sort-descending.svg
@@ -4933,10 +5593,12 @@ share/icons/gnome/scalable/actions/viewmag+.svg
 share/icons/gnome/scalable/actions/viewmag-.svg
 share/icons/gnome/scalable/actions/viewmag1.svg
 share/icons/gnome/scalable/actions/viewmagfit.svg
+share/icons/gnome/scalable/actions/window-close.svg
 share/icons/gnome/scalable/actions/window-new.svg
 share/icons/gnome/scalable/actions/window_fullscreen.svg
 share/icons/gnome/scalable/actions/window_new.svg
 share/icons/gnome/scalable/actions/window_nofullscreen.svg
+share/icons/gnome/scalable/actions/xfce-system-exit.svg
 share/icons/gnome/scalable/actions/xfce-system-lock.svg
 share/icons/gnome/scalable/actions/zoom-best-fit.svg
 share/icons/gnome/scalable/actions/zoom-in.svg
@@ -4945,6 +5607,7 @@ share/icons/gnome/scalable/actions/zoom-out.svg
 share/icons/gnome/scalable/apps/access.svg
 share/icons/gnome/scalable/apps/accessibility-directory.svg
 share/icons/gnome/scalable/apps/accessories-calculator.svg
+share/icons/gnome/scalable/apps/accessories-character-map.svg
 share/icons/gnome/scalable/apps/accessories-dictionary.svg
 share/icons/gnome/scalable/apps/accessories-text-editor.svg
 share/icons/gnome/scalable/apps/arts.svg
@@ -4955,6 +5618,7 @@ share/icons/gnome/scalable/apps/config-users.svg
 share/icons/gnome/scalable/apps/file-manager.svg
 share/icons/gnome/scalable/apps/fonts.svg
 share/icons/gnome/scalable/apps/gnome-calculator.svg
+share/icons/gnome/scalable/apps/gnome-character-map.svg
 share/icons/gnome/scalable/apps/gnome-help.svg
 share/icons/gnome/scalable/apps/gnome-mixer.svg
 share/icons/gnome/scalable/apps/gnome-monitor.svg
@@ -4969,6 +5633,7 @@ share/icons/gnome/scalable/apps/gnome-shutdown.svg
 share/icons/gnome/scalable/apps/gnome-terminal.svg
 share/icons/gnome/scalable/apps/gnome-window-manager.svg
 share/icons/gnome/scalable/apps/gtk-help.svg
+share/icons/gnome/scalable/apps/gucharmap.svg
 share/icons/gnome/scalable/apps/help-browser.svg
 share/icons/gnome/scalable/apps/help.svg
 share/icons/gnome/scalable/apps/im-aim.svg
@@ -4978,6 +5643,7 @@ share/icons/gnome/scalable/apps/im-msn.svg
 share/icons/gnome/scalable/apps/im-nov.svg
 share/icons/gnome/scalable/apps/im-yahoo.svg
 share/icons/gnome/scalable/apps/kcalc.svg
+share/icons/gnome/scalable/apps/kcharselect.svg
 share/icons/gnome/scalable/apps/kcmkwm.svg
 share/icons/gnome/scalable/apps/kcmsound.svg
 share/icons/gnome/scalable/apps/kedit.svg
@@ -5013,9 +5679,11 @@ share/icons/gnome/scalable/apps/susehelpcenter.svg
 share/icons/gnome/scalable/apps/system-config-users.svg
 share/icons/gnome/scalable/apps/system-file-manager.svg
 share/icons/gnome/scalable/apps/system-software-installer.svg
+share/icons/gnome/scalable/apps/system-software-update.svg
 share/icons/gnome/scalable/apps/system-users.svg
 share/icons/gnome/scalable/apps/terminal.svg
 share/icons/gnome/scalable/apps/text-editor.svg
+share/icons/gnome/scalable/apps/update-manager.svg
 share/icons/gnome/scalable/apps/user-info.svg
 share/icons/gnome/scalable/apps/utilities-system-monitor.svg
 share/icons/gnome/scalable/apps/utilities-terminal.svg
@@ -5028,8 +5696,10 @@ share/icons/gnome/scalable/apps/xfce4-backdrop.svg
 share/icons/gnome/scalable/apps/xfce4-mixer.svg
 share/icons/gnome/scalable/apps/xfwm4.svg
 share/icons/gnome/scalable/apps/xscreensaver.svg
+share/icons/gnome/scalable/apps/zen-icon.svg
 share/icons/gnome/scalable/categories/applications-accessories.svg
 share/icons/gnome/scalable/categories/applications-development.svg
+share/icons/gnome/scalable/categories/applications-engineering.svg
 share/icons/gnome/scalable/categories/applications-games.svg
 share/icons/gnome/scalable/categories/applications-graphics.svg
 share/icons/gnome/scalable/categories/applications-internet.svg
@@ -5038,6 +5708,7 @@ share/icons/gnome/scalable/categories/applications-office.svg
 share/icons/gnome/scalable/categories/applications-other.svg
 share/icons/gnome/scalable/categories/applications-science.svg
 share/icons/gnome/scalable/categories/applications-system.svg
+share/icons/gnome/scalable/categories/applications-utilities.svg
 share/icons/gnome/scalable/categories/gnome-applications.svg
 share/icons/gnome/scalable/categories/gnome-control-center.svg
 share/icons/gnome/scalable/categories/gnome-devel.svg
@@ -5049,6 +5720,7 @@ share/icons/gnome/scalable/categories/gnome-settings.svg
 share/icons/gnome/scalable/categories/gnome-system.svg
 share/icons/gnome/scalable/categories/gnome-util.svg
 share/icons/gnome/scalable/categories/gtk-preferences.svg
+share/icons/gnome/scalable/categories/input_devices_settings.svg
 share/icons/gnome/scalable/categories/kcontrol.svg
 share/icons/gnome/scalable/categories/package_development.svg
 share/icons/gnome/scalable/categories/package_games.svg
@@ -5059,7 +5731,11 @@ share/icons/gnome/scalable/categories/package_office.svg
 share/icons/gnome/scalable/categories/package_settings.svg
 share/icons/gnome/scalable/categories/package_system.svg
 share/icons/gnome/scalable/categories/package_utilities.svg
+share/icons/gnome/scalable/categories/preferences-desktop-peripherals.svg
+share/icons/gnome/scalable/categories/preferences-desktop-personal.svg
 share/icons/gnome/scalable/categories/preferences-desktop.svg
+share/icons/gnome/scalable/categories/preferences-other.svg
+share/icons/gnome/scalable/categories/preferences-system-network.svg
 share/icons/gnome/scalable/categories/preferences-system.svg
 share/icons/gnome/scalable/categories/redhat-accessories.svg
 share/icons/gnome/scalable/categories/redhat-games.svg
@@ -5072,18 +5748,21 @@ share/icons/gnome/scalable/categories/redhat-sound_video.svg
 share/icons/gnome/scalable/categories/redhat-system_settings.svg
 share/icons/gnome/scalable/categories/redhat-system_tools.svg
 share/icons/gnome/scalable/categories/stock_internet.svg
+share/icons/gnome/scalable/categories/system-help.svg
 share/icons/gnome/scalable/categories/xfce-games.svg
 share/icons/gnome/scalable/categories/xfce-graphics.svg
 share/icons/gnome/scalable/categories/xfce-internet.svg
 share/icons/gnome/scalable/categories/xfce-multimedia.svg
 share/icons/gnome/scalable/categories/xfce-office.svg
-share/icons/gnome/scalable/categories/xfce4-settings.svg
 share/icons/gnome/scalable/categories/xfce-system-settings.svg
 share/icons/gnome/scalable/categories/xfce-utils.svg
+share/icons/gnome/scalable/categories/xfce4-settings.svg
 share/icons/gnome/scalable/devices/3floppy_unmount.svg
+share/icons/gnome/scalable/devices/audio-card.svg
 share/icons/gnome/scalable/devices/audio-input-microphone.svg
 share/icons/gnome/scalable/devices/battery.svg
 share/icons/gnome/scalable/devices/camera-photo.svg
+share/icons/gnome/scalable/devices/camera-video.svg
 share/icons/gnome/scalable/devices/camera-web.svg
 share/icons/gnome/scalable/devices/camera.svg
 share/icons/gnome/scalable/devices/camera_unmount.svg
@@ -5109,6 +5788,7 @@ share/icons/gnome/scalable/devices/gnome-dev-disc-dvdram.svg
 share/icons/gnome/scalable/devices/gnome-dev-disc-dvdrom.svg
 share/icons/gnome/scalable/devices/gnome-dev-disc-dvdrw.svg
 share/icons/gnome/scalable/devices/gnome-dev-dvd.svg
+share/icons/gnome/scalable/devices/gnome-dev-ethernet.svg
 share/icons/gnome/scalable/devices/gnome-dev-floppy.svg
 share/icons/gnome/scalable/devices/gnome-dev-harddisk-1394.svg
 share/icons/gnome/scalable/devices/gnome-dev-harddisk-usb.svg
@@ -5125,6 +5805,8 @@ share/icons/gnome/scalable/devices/gnome-dev-printer.svg
 share/icons/gnome/scalable/devices/gnome-dev-removable-1394.svg
 share/icons/gnome/scalable/devices/gnome-dev-removable-usb.svg
 share/icons/gnome/scalable/devices/gnome-dev-removable.svg
+share/icons/gnome/scalable/devices/gnome-dev-wavelan.svg
+share/icons/gnome/scalable/devices/gnome-dev-zipdisk.svg
 share/icons/gnome/scalable/devices/gnome-fs-client.svg
 share/icons/gnome/scalable/devices/gnome-modem.svg
 share/icons/gnome/scalable/devices/gnome-stock-mic.svg
@@ -5133,10 +5815,12 @@ share/icons/gnome/scalable/devices/gtk-floppy.svg
 share/icons/gnome/scalable/devices/gtk-harddisk.svg
 share/icons/gnome/scalable/devices/harddrive.svg
 share/icons/gnome/scalable/devices/hdd_unmount.svg
+share/icons/gnome/scalable/devices/input-gaming.svg
 share/icons/gnome/scalable/devices/input-keyboard.svg
 share/icons/gnome/scalable/devices/input-mouse.svg
 share/icons/gnome/scalable/devices/input-tablet.svg
 share/icons/gnome/scalable/devices/ipod_mount.svg
+share/icons/gnome/scalable/devices/joystick.svg
 share/icons/gnome/scalable/devices/keyboard.svg
 share/icons/gnome/scalable/devices/kjobviewer.svg
 share/icons/gnome/scalable/devices/kxkb.svg
@@ -5145,13 +5829,19 @@ share/icons/gnome/scalable/devices/media-flash.svg
 share/icons/gnome/scalable/devices/media-floppy.svg
 share/icons/gnome/scalable/devices/media-optical.svg
 share/icons/gnome/scalable/devices/media-tape.svg
+share/icons/gnome/scalable/devices/media-zip.svg
 share/icons/gnome/scalable/devices/modem.svg
 share/icons/gnome/scalable/devices/mouse.svg
 share/icons/gnome/scalable/devices/multimedia-player.svg
+share/icons/gnome/scalable/devices/network-wired.svg
+share/icons/gnome/scalable/devices/network-wireless.svg
+share/icons/gnome/scalable/devices/pda.svg
+share/icons/gnome/scalable/devices/phone.svg
 share/icons/gnome/scalable/devices/printer-remote.svg
 share/icons/gnome/scalable/devices/printer.svg
 share/icons/gnome/scalable/devices/printer1.svg
 share/icons/gnome/scalable/devices/printmgr.svg
+share/icons/gnome/scalable/devices/scanner.svg
 share/icons/gnome/scalable/devices/stock_mic.svg
 share/icons/gnome/scalable/devices/stock_printers.svg
 share/icons/gnome/scalable/devices/system-floppy.svg
@@ -5164,15 +5854,15 @@ share/icons/gnome/scalable/devices/xfce4-keyboard.svg
 share/icons/gnome/scalable/devices/xfce4-mouse.svg
 share/icons/gnome/scalable/devices/yast_HD.svg
 share/icons/gnome/scalable/devices/yast_idetude.svg
+share/icons/gnome/scalable/devices/yast_joystick.svg
 share/icons/gnome/scalable/devices/yast_mouse.svg
 share/icons/gnome/scalable/devices/yast_printer.svg
-share/icons/gnome/scalable/emblems/emblem-cvs-added.icon
-share/icons/gnome/scalable/emblems/emblem-cvs-added.svg
-share/icons/gnome/scalable/emblems/emblem-cvs-conflict.icon
-share/icons/gnome/scalable/emblems/emblem-cvs-conflict.svg
-share/icons/gnome/scalable/emblems/emblem-cvs-removed.icon
-share/icons/gnome/scalable/emblems/emblem-cvs-removed.svg
+share/icons/gnome/scalable/devices/yast_soundcard.svg
 share/icons/gnome/scalable/emblems/emblem-default.svg
+share/icons/gnome/scalable/emblems/emblem-documents.icon
+share/icons/gnome/scalable/emblems/emblem-documents.svg
+share/icons/gnome/scalable/emblems/emblem-downloads.icon
+share/icons/gnome/scalable/emblems/emblem-downloads.svg
 share/icons/gnome/scalable/emblems/emblem-favorite.icon
 share/icons/gnome/scalable/emblems/emblem-favorite.svg
 share/icons/gnome/scalable/emblems/emblem-generic.icon
@@ -5185,15 +5875,36 @@ share/icons/gnome/scalable/emblems/emblem-new.icon
 share/icons/gnome/scalable/emblems/emblem-new.svg
 share/icons/gnome/scalable/emblems/emblem-package.icon
 share/icons/gnome/scalable/emblems/emblem-package.svg
-share/icons/gnome/scalable/emblems/emblem-special.icon
-share/icons/gnome/scalable/emblems/emblem-special.svg
+share/icons/gnome/scalable/emblems/emblem-photos.icon
+share/icons/gnome/scalable/emblems/emblem-photos.svg
+share/icons/gnome/scalable/emblems/emblem-readonly.icon
+share/icons/gnome/scalable/emblems/emblem-readonly.svg
+share/icons/gnome/scalable/emblems/emblem-shared.svg
 share/icons/gnome/scalable/emblems/emblem-symbolic-link.svg
+share/icons/gnome/scalable/emblems/emblem-system.svg
+share/icons/gnome/scalable/emblems/emblem-unreadable.icon
+share/icons/gnome/scalable/emblems/emblem-unreadable.svg
 share/icons/gnome/scalable/emblems/emblem-urgent.icon
 share/icons/gnome/scalable/emblems/emblem-urgent.svg
 share/icons/gnome/scalable/emblems/emblem-web.icon
 share/icons/gnome/scalable/emblems/emblem-web.svg
 share/icons/gnome/scalable/emblems/stock_mail-priority-high.icon
 share/icons/gnome/scalable/emblems/stock_mail-priority-high.svg
+share/icons/gnome/scalable/emotes/face-angel.svg
+share/icons/gnome/scalable/emotes/face-cool.svg
+share/icons/gnome/scalable/emotes/face-crying.svg
+share/icons/gnome/scalable/emotes/face-devilish.svg
+share/icons/gnome/scalable/emotes/face-embarrassed.svg
+share/icons/gnome/scalable/emotes/face-kiss.svg
+share/icons/gnome/scalable/emotes/face-monkey.svg
+share/icons/gnome/scalable/emotes/face-plain.svg
+share/icons/gnome/scalable/emotes/face-raspberry.svg
+share/icons/gnome/scalable/emotes/face-sad.svg
+share/icons/gnome/scalable/emotes/face-smile-big.svg
+share/icons/gnome/scalable/emotes/face-smile.svg
+share/icons/gnome/scalable/emotes/face-smirk.svg
+share/icons/gnome/scalable/emotes/face-surprise.svg
+share/icons/gnome/scalable/emotes/face-wink.svg
 share/icons/gnome/scalable/mimetypes/application-certificate.svg
 share/icons/gnome/scalable/mimetypes/application-x-executable.svg
 share/icons/gnome/scalable/mimetypes/ascii.svg
@@ -5402,11 +6113,15 @@ share/icons/gnome/scalable/status/audio-volume-high.svg
 share/icons/gnome/scalable/status/audio-volume-low.svg
 share/icons/gnome/scalable/status/audio-volume-medium.svg
 share/icons/gnome/scalable/status/audio-volume-muted.svg
+share/icons/gnome/scalable/status/battery-caution.svg
+share/icons/gnome/scalable/status/battery-low.svg
 share/icons/gnome/scalable/status/connect_creating.svg
 share/icons/gnome/scalable/status/connect_established.svg
 share/icons/gnome/scalable/status/connect_no.svg
 share/icons/gnome/scalable/status/dialog-error.svg
 share/icons/gnome/scalable/status/dialog-information.svg
+share/icons/gnome/scalable/status/dialog-password.svg
+share/icons/gnome/scalable/status/dialog-question.svg
 share/icons/gnome/scalable/status/dialog-warning.svg
 share/icons/gnome/scalable/status/edittrash.svg
 share/icons/gnome/scalable/status/error.svg
@@ -5431,13 +6146,22 @@ share/icons/gnome/scalable/status/gnome-netstatus-rx.svg
 share/icons/gnome/scalable/status/gnome-netstatus-tx.svg
 share/icons/gnome/scalable/status/gnome-netstatus-txrx.svg
 share/icons/gnome/scalable/status/gnome-stock-trash-full.svg
+share/icons/gnome/scalable/status/gtk-dialog-authentication.svg
 share/icons/gnome/scalable/status/gtk-dialog-error.svg
 share/icons/gnome/scalable/status/gtk-dialog-info.svg
+share/icons/gnome/scalable/status/gtk-dialog-question.svg
 share/icons/gnome/scalable/status/gtk-dialog-warning.svg
+share/icons/gnome/scalable/status/gtk-missing-image.svg
 share/icons/gnome/scalable/status/image-loading.svg
+share/icons/gnome/scalable/status/image-missing.svg
 share/icons/gnome/scalable/status/important.svg
 share/icons/gnome/scalable/status/info.svg
 share/icons/gnome/scalable/status/mail-attachment.svg
+share/icons/gnome/scalable/status/mail-read.svg
+share/icons/gnome/scalable/status/mail-replied.svg
+share/icons/gnome/scalable/status/mail-unread.svg
+share/icons/gnome/scalable/status/media-playlist-repeat.svg
+share/icons/gnome/scalable/status/media-playlist-shuffle.svg
 share/icons/gnome/scalable/status/messagebox_critical.svg
 share/icons/gnome/scalable/status/messagebox_info.svg
 share/icons/gnome/scalable/status/messagebox_warning.svg
@@ -5452,13 +6176,26 @@ share/icons/gnome/scalable/status/nm-device-wired.svg
 share/icons/gnome/scalable/status/nm-device-wireless.svg
 share/icons/gnome/scalable/status/nm-no-connection.svg
 share/icons/gnome/scalable/status/printer-error.svg
+share/icons/gnome/scalable/status/printer-printing.svg
+share/icons/gnome/scalable/status/security-high.svg
+share/icons/gnome/scalable/status/security-low.svg
+share/icons/gnome/scalable/status/security-medium.svg
+share/icons/gnome/scalable/status/software-update-available.svg
+share/icons/gnome/scalable/status/software-update-urgent.svg
 share/icons/gnome/scalable/status/stock_appointment-reminder-excl.svg
 share/icons/gnome/scalable/status/stock_appointment-reminder.svg
 share/icons/gnome/scalable/status/stock_dialog-error.svg
 share/icons/gnome/scalable/status/stock_dialog-info.svg
+share/icons/gnome/scalable/status/stock_dialog-question.svg
 share/icons/gnome/scalable/status/stock_dialog-warning.svg
+share/icons/gnome/scalable/status/stock_lock-broken.svg
+share/icons/gnome/scalable/status/stock_lock-ok.svg
+share/icons/gnome/scalable/status/stock_lock-open.svg
+share/icons/gnome/scalable/status/stock_lock.svg
 share/icons/gnome/scalable/status/stock_open.icon
 share/icons/gnome/scalable/status/stock_open.svg
+share/icons/gnome/scalable/status/stock_repeat.svg
+share/icons/gnome/scalable/status/stock_shuffle.svg
 share/icons/gnome/scalable/status/stock_trash_full.svg
 share/icons/gnome/scalable/status/stock_volume-0.svg
 share/icons/gnome/scalable/status/stock_volume-max.svg
@@ -5468,6 +6205,7 @@ share/icons/gnome/scalable/status/stock_volume-mute.svg
 share/icons/gnome/scalable/status/stock_volume.svg
 share/icons/gnome/scalable/status/stock_weather-cloudy.svg
 share/icons/gnome/scalable/status/stock_weather-few-clouds.svg
+share/icons/gnome/scalable/status/stock_weather-fog.svg
 share/icons/gnome/scalable/status/stock_weather-night-clear.svg
 share/icons/gnome/scalable/status/stock_weather-night-few-clouds.svg
 share/icons/gnome/scalable/status/stock_weather-showers.svg
@@ -5475,12 +6213,15 @@ share/icons/gnome/scalable/status/stock_weather-snow.svg
 share/icons/gnome/scalable/status/stock_weather-storm.svg
 share/icons/gnome/scalable/status/stock_weather-sunny.svg
 share/icons/gnome/scalable/status/sunny.svg
+share/icons/gnome/scalable/status/task-due.svg
+share/icons/gnome/scalable/status/task-past-due.svg
 share/icons/gnome/scalable/status/trashcan_full.svg
 share/icons/gnome/scalable/status/user-trash-full.svg
 share/icons/gnome/scalable/status/weather-clear-night.svg
 share/icons/gnome/scalable/status/weather-clear.svg
 share/icons/gnome/scalable/status/weather-few-clouds-night.svg
 share/icons/gnome/scalable/status/weather-few-clouds.svg
+share/icons/gnome/scalable/status/weather-fog.svg
 share/icons/gnome/scalable/status/weather-overcast.svg
 share/icons/gnome/scalable/status/weather-severe-alert.svg
 share/icons/gnome/scalable/status/weather-showers-scattered.svg
@@ -5495,8 +6236,12 @@ share/icons/gnome/scalable/stock/generic/stock_person.svg
 @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/mr/LC_MESSAGES
 @dirrmtry share/locale/mr
 @dirrmtry share/locale/mg/LC_MESSAGES
@@ -5505,11 +6250,14 @@ share/icons/gnome/scalable/stock/generic/stock_person.svg
 @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/icons/gnome/scalable/stock/generic
 @dirrmtry share/icons/gnome/scalable/stock
 @dirrmtry share/icons/gnome/scalable/status
 @dirrmtry share/icons/gnome/scalable/places
 @dirrmtry share/icons/gnome/scalable/mimetypes
+@dirrmtry share/icons/gnome/scalable/emotes
 @dirrmtry share/icons/gnome/scalable/emblems
 @dirrmtry share/icons/gnome/scalable/devices
 @dirrmtry share/icons/gnome/scalable/categories
@@ -5537,6 +6285,7 @@ share/icons/gnome/scalable/stock/generic/stock_person.svg
 @dirrmtry share/icons/gnome/32x32/status
 @dirrmtry share/icons/gnome/32x32/places
 @dirrmtry share/icons/gnome/32x32/mimetypes
+@dirrmtry share/icons/gnome/32x32/emotes
 @dirrmtry share/icons/gnome/32x32/emblems
 @dirrmtry share/icons/gnome/32x32/devices
 @dirrmtry share/icons/gnome/32x32/categories
@@ -5563,6 +6312,7 @@ share/icons/gnome/scalable/stock/generic/stock_person.svg
 @dirrmtry share/icons/gnome/24x24/places
 @dirrmtry share/icons/gnome/24x24/mimetypes
 @dirrmtry share/icons/gnome/24x24/filesystems
+@dirrmtry share/icons/gnome/24x24/emotes
 @dirrmtry share/icons/gnome/24x24/emblems
 @dirrmtry share/icons/gnome/24x24/devices
 @dirrmtry share/icons/gnome/24x24/categories
@@ -5573,6 +6323,7 @@ share/icons/gnome/scalable/stock/generic/stock_person.svg
 @dirrmtry share/icons/gnome/22x22/status
 @dirrmtry share/icons/gnome/22x22/places
 @dirrmtry share/icons/gnome/22x22/mimetypes
+@dirrmtry share/icons/gnome/22x22/emotes
 @dirrmtry share/icons/gnome/22x22/emblems
 @dirrmtry share/icons/gnome/22x22/devices
 @dirrmtry share/icons/gnome/22x22/categories
@@ -5600,6 +6351,7 @@ share/icons/gnome/scalable/stock/generic/stock_person.svg
 @dirrmtry share/icons/gnome/16x16/places
 @dirrmtry share/icons/gnome/16x16/mimetypes
 @dirrmtry share/icons/gnome/16x16/filesystems
+@dirrmtry share/icons/gnome/16x16/emotes
 @dirrmtry share/icons/gnome/16x16/emblems
 @dirrmtry share/icons/gnome/16x16/devices
 @dirrmtry share/icons/gnome/16x16/categories
diff --git a/misc/gnome-mime-data/Makefile b/misc/gnome-mime-data/Makefile
index 5d671f97e6a4..1d90551ef356 100644
--- a/misc/gnome-mime-data/Makefile
+++ b/misc/gnome-mime-data/Makefile
@@ -3,11 +3,11 @@
 # Whom:					Maxim Sobolev <sobomax@FreeBSD.org>
 #
 # $FreeBSD$
-#
+#    $MCom: ports/misc/gnome-mime-data/Makefile,v 1.14 2007/05/22 04:59:18 marcus Exp $
 
 PORTNAME=	gnome-mime-data
 PORTVERSION=	2.18.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	misc gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -20,7 +20,7 @@ COMMENT=	A MIME and Application database for GNOME
 USE_BZIP2=	yes
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomehack gnomehier intlhack gnomeprefix gnometarget pkgconfig
+USE_GNOME=	gnomeprefix gnomehack intlhack gnometarget pkgconfig
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib -lintl"
diff --git a/misc/gnome-mime-data/pkg-plist b/misc/gnome-mime-data/pkg-plist
index fcffef85746d..e1b3d4658bc1 100644
--- a/misc/gnome-mime-data/pkg-plist
+++ b/misc/gnome-mime-data/pkg-plist
@@ -1,8 +1,8 @@
 etc/gnome-vfs-mime-magic
 libdata/pkgconfig/gnome-mime-data-2.0.pc
-share/gnome/application-registry/gnome-vfs.applications
-share/gnome/mime-info/gnome-vfs.keys
-share/gnome/mime-info/gnome-vfs.mime
+share/application-registry/gnome-vfs.applications
+share/mime-info/gnome-vfs.keys
+share/mime-info/gnome-vfs.mime
 share/locale/af/LC_MESSAGES/gnome-mime-data.mo
 share/locale/am/LC_MESSAGES/gnome-mime-data.mo
 share/locale/ar/LC_MESSAGES/gnome-mime-data.mo
diff --git a/misc/gnome-osd/Makefile b/misc/gnome-osd/Makefile
index afe3b1c97bfb..210662072530 100644
--- a/misc/gnome-osd/Makefile
+++ b/misc/gnome-osd/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gnome-osd
 DISTVERSION=	0.11.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	misc
 MASTER_SITES=	http://telecom.inescporto.pt/~gjc/gnome-osd/${DISTVERSION:C|-.*$||}/
 
@@ -25,8 +25,7 @@ PORTDOCS=	AUTHORS NEWS README
 MAN1=		gnome-osd-client.1
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|control-center-2.0/capplets|applications|; \
-		s|$$(datadir)/dbus-1|$$(prefix)/share/dbus-1|' \
+	@${REINPLACE_CMD} -e 's|control-center-2.0/capplets|applications|' \
 		${WRKSRC}/Makefile.in
 
 post-install:
diff --git a/misc/gnome-osd/pkg-plist b/misc/gnome-osd/pkg-plist
index cddba282c61c..26ff6f4e0f90 100644
--- a/misc/gnome-osd/pkg-plist
+++ b/misc/gnome-osd/pkg-plist
@@ -39,17 +39,18 @@ libdata/bonobo/servers/GNOME_OSD.server
 libexec/gnome-osd-server
 share/dbus-1/services/pt.inescporto.telecom.GnomeOSD.EventBridge.service
 share/dbus-1/services/pt.inescporto.telecom.GnomeOSD.service
-share/gnome/applications/gnome-osd-properties.desktop
-share/gnome/gnome-osd/xchatosd.py
-share/gnome/pixmaps/gnome-osd.png
+share/applications/gnome-osd-properties.desktop
+share/gnome-osd/xchatosd.py
+share/pixmaps/gnome-osd.png
 share/locale/cs/LC_MESSAGES/gnome-osd.mo
 share/locale/ja/LC_MESSAGES/gnome-osd.mo
 share/locale/pt/LC_MESSAGES/gnome-osd.mo
 @dirrmtry etc/xdg/autostart
 @dirrmtry etc/xdg
-@dirrm share/gnome/gnome-osd
+@dirrm share/gnome-osd
 @dirrm %%PYTHON_SITELIBDIR%%/gnomeosd
 @dirrmtry %%PYTHON_SITELIBDIR%%
 @dirrmtry %%PYTHON_LIBDIR%%
 @comment only remove the dbus directories if dbus is not installed
 @unexec if ! [ -e %%LOCALBASE%%/bin/dbus-daemon ]; then rmdir %D/share/dbus-1/services 2>/dev/null; rmdir %D/share/dbus-1 2>/dev/null; fi
+@dirrmtry share/applications
diff --git a/misc/gnome-user-docs/Makefile b/misc/gnome-user-docs/Makefile
index 9b848799c099..6d4bce23777c 100644
--- a/misc/gnome-user-docs/Makefile
+++ b/misc/gnome-user-docs/Makefile
@@ -3,11 +3,11 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/misc/gnome-user-docs/Makefile,v 1.33 2007/03/13 00:11:38 marcus Exp $
+#   $MCom: ports/misc/gnome-user-docs/Makefile,v 1.40 2007/10/13 21:06:54 marcus Exp $
 #
 
 PORTNAME=	gnome-user-docs
-PORTVERSION=	2.18.2
+PORTVERSION=	2.20.1
 CATEGORIES=	misc gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -16,8 +16,8 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GNOME 2 users guide
 
-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_XLIB=	yes
diff --git a/misc/gnome-user-docs/distinfo b/misc/gnome-user-docs/distinfo
index 55b263b32c23..9a0f5ece6467 100644
--- a/misc/gnome-user-docs/distinfo
+++ b/misc/gnome-user-docs/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-user-docs-2.18.2.tar.bz2) = 4d3b5c8bd3cc8008f2a44d98efaa2502
-SHA256 (gnome2/gnome-user-docs-2.18.2.tar.bz2) = 930c67d304fdb4ad9042430bfac59998011b8be02183733b93f1a08dcb5a7400
-SIZE (gnome2/gnome-user-docs-2.18.2.tar.bz2) = 6520221
+MD5 (gnome2/gnome-user-docs-2.20.1.tar.bz2) = d6bba44acaed20117769ec8dce378f71
+SHA256 (gnome2/gnome-user-docs-2.20.1.tar.bz2) = cec02e5e31bc7ab1fa892314368d6021e6c80ded8af3f727122aa355f86d18c9
+SIZE (gnome2/gnome-user-docs-2.20.1.tar.bz2) = 9827506
diff --git a/misc/gnome-user-docs/pkg-plist b/misc/gnome-user-docs/pkg-plist
index c36c3ba07bfa..fbf3f44041f1 100644
--- a/misc/gnome-user-docs/pkg-plist
+++ b/misc/gnome-user-docs/pkg-plist
@@ -1,6 +1,5 @@
 share/gnome/help/gnome-access-guide/C/accessintro.xml
-share/gnome/help/gnome-access-guide/C/ats.xml
-share/gnome/help/gnome-access-guide/C/dtconfig.xml
+share/gnome/help/gnome-access-guide/C/enable.xml
 share/gnome/help/gnome-access-guide/C/figures/accessx.png
 share/gnome/help/gnome-access-guide/C/figures/bouncekeys.png
 share/gnome/help/gnome-access-guide/C/figures/button.png
@@ -27,12 +26,67 @@ share/gnome/help/gnome-access-guide/C/figures/stickywindowlock.png
 share/gnome/help/gnome-access-guide/C/figures/tabbed_section.png
 share/gnome/help/gnome-access-guide/C/figures/text_box.png
 share/gnome/help/gnome-access-guide/C/figures/tree.png
+share/gnome/help/gnome-access-guide/C/general.xml
 share/gnome/help/gnome-access-guide/C/gnome-access-guide.xml
-share/gnome/help/gnome-access-guide/C/keynav.xml
 share/gnome/help/gnome-access-guide/C/legal.xml
+share/gnome/help/gnome-access-guide/C/low-vision.xml
+share/gnome/help/gnome-access-guide/C/mobility.xml
 share/gnome/help/gnome-access-guide/C/preface.xml
 share/gnome/help/gnome-access-guide/C/sysadmin.xml
-share/gnome/help/gnome-access-guide/C/themes.xml
+share/gnome/help/gnome-access-guide/de/figures/accessx.png
+share/gnome/help/gnome-access-guide/de/figures/bouncekeys.png
+share/gnome/help/gnome-access-guide/de/figures/button.png
+share/gnome/help/gnome-access-guide/de/figures/check_box.png
+share/gnome/help/gnome-access-guide/de/figures/dropdown_combination_box.png
+share/gnome/help/gnome-access-guide/de/figures/dropdown_list_box.png
+share/gnome/help/gnome-access-guide/de/figures/mousekeys.png
+share/gnome/help/gnome-access-guide/de/figures/move_object_arrows.png
+share/gnome/help/gnome-access-guide/de/figures/move_object_before.png
+share/gnome/help/gnome-access-guide/de/figures/move_object_jump.png
+share/gnome/help/gnome-access-guide/de/figures/move_object_push.png
+share/gnome/help/gnome-access-guide/de/figures/radio_button.png
+share/gnome/help/gnome-access-guide/de/figures/slider.png
+share/gnome/help/gnome-access-guide/de/figures/slowkeys.png
+share/gnome/help/gnome-access-guide/de/figures/spin_box.png
+share/gnome/help/gnome-access-guide/de/figures/stickyaltlatch.png
+share/gnome/help/gnome-access-guide/de/figures/stickyaltlock.png
+share/gnome/help/gnome-access-guide/de/figures/stickyctrllatch.png
+share/gnome/help/gnome-access-guide/de/figures/stickyctrllock.png
+share/gnome/help/gnome-access-guide/de/figures/stickyshiftlatch.png
+share/gnome/help/gnome-access-guide/de/figures/stickyshiftlock.png
+share/gnome/help/gnome-access-guide/de/figures/stickywindowlatch.png
+share/gnome/help/gnome-access-guide/de/figures/stickywindowlock.png
+share/gnome/help/gnome-access-guide/de/figures/tabbed_section.png
+share/gnome/help/gnome-access-guide/de/figures/text_box.png
+share/gnome/help/gnome-access-guide/de/figures/tree.png
+share/gnome/help/gnome-access-guide/de/gnome-access-guide.xml
+share/gnome/help/gnome-access-guide/el/figures/accessx.png
+share/gnome/help/gnome-access-guide/el/figures/bouncekeys.png
+share/gnome/help/gnome-access-guide/el/figures/button.png
+share/gnome/help/gnome-access-guide/el/figures/check_box.png
+share/gnome/help/gnome-access-guide/el/figures/dropdown_combination_box.png
+share/gnome/help/gnome-access-guide/el/figures/dropdown_list_box.png
+share/gnome/help/gnome-access-guide/el/figures/mousekeys.png
+share/gnome/help/gnome-access-guide/el/figures/move_object_arrows.png
+share/gnome/help/gnome-access-guide/el/figures/move_object_before.png
+share/gnome/help/gnome-access-guide/el/figures/move_object_jump.png
+share/gnome/help/gnome-access-guide/el/figures/move_object_push.png
+share/gnome/help/gnome-access-guide/el/figures/radio_button.png
+share/gnome/help/gnome-access-guide/el/figures/slider.png
+share/gnome/help/gnome-access-guide/el/figures/slowkeys.png
+share/gnome/help/gnome-access-guide/el/figures/spin_box.png
+share/gnome/help/gnome-access-guide/el/figures/stickyaltlatch.png
+share/gnome/help/gnome-access-guide/el/figures/stickyaltlock.png
+share/gnome/help/gnome-access-guide/el/figures/stickyctrllatch.png
+share/gnome/help/gnome-access-guide/el/figures/stickyctrllock.png
+share/gnome/help/gnome-access-guide/el/figures/stickyshiftlatch.png
+share/gnome/help/gnome-access-guide/el/figures/stickyshiftlock.png
+share/gnome/help/gnome-access-guide/el/figures/stickywindowlatch.png
+share/gnome/help/gnome-access-guide/el/figures/stickywindowlock.png
+share/gnome/help/gnome-access-guide/el/figures/tabbed_section.png
+share/gnome/help/gnome-access-guide/el/figures/text_box.png
+share/gnome/help/gnome-access-guide/el/figures/tree.png
+share/gnome/help/gnome-access-guide/el/gnome-access-guide.xml
 share/gnome/help/gnome-access-guide/en_GB/figures/accessx.png
 share/gnome/help/gnome-access-guide/en_GB/figures/bouncekeys.png
 share/gnome/help/gnome-access-guide/en_GB/figures/button.png
@@ -141,6 +195,33 @@ share/gnome/help/gnome-access-guide/it/figures/tabbed_section.png
 share/gnome/help/gnome-access-guide/it/figures/text_box.png
 share/gnome/help/gnome-access-guide/it/figures/tree.png
 share/gnome/help/gnome-access-guide/it/gnome-access-guide.xml
+share/gnome/help/gnome-access-guide/pt/figures/accessx.png
+share/gnome/help/gnome-access-guide/pt/figures/bouncekeys.png
+share/gnome/help/gnome-access-guide/pt/figures/button.png
+share/gnome/help/gnome-access-guide/pt/figures/check_box.png
+share/gnome/help/gnome-access-guide/pt/figures/dropdown_combination_box.png
+share/gnome/help/gnome-access-guide/pt/figures/dropdown_list_box.png
+share/gnome/help/gnome-access-guide/pt/figures/mousekeys.png
+share/gnome/help/gnome-access-guide/pt/figures/move_object_arrows.png
+share/gnome/help/gnome-access-guide/pt/figures/move_object_before.png
+share/gnome/help/gnome-access-guide/pt/figures/move_object_jump.png
+share/gnome/help/gnome-access-guide/pt/figures/move_object_push.png
+share/gnome/help/gnome-access-guide/pt/figures/radio_button.png
+share/gnome/help/gnome-access-guide/pt/figures/slider.png
+share/gnome/help/gnome-access-guide/pt/figures/slowkeys.png
+share/gnome/help/gnome-access-guide/pt/figures/spin_box.png
+share/gnome/help/gnome-access-guide/pt/figures/stickyaltlatch.png
+share/gnome/help/gnome-access-guide/pt/figures/stickyaltlock.png
+share/gnome/help/gnome-access-guide/pt/figures/stickyctrllatch.png
+share/gnome/help/gnome-access-guide/pt/figures/stickyctrllock.png
+share/gnome/help/gnome-access-guide/pt/figures/stickyshiftlatch.png
+share/gnome/help/gnome-access-guide/pt/figures/stickyshiftlock.png
+share/gnome/help/gnome-access-guide/pt/figures/stickywindowlatch.png
+share/gnome/help/gnome-access-guide/pt/figures/stickywindowlock.png
+share/gnome/help/gnome-access-guide/pt/figures/tabbed_section.png
+share/gnome/help/gnome-access-guide/pt/figures/text_box.png
+share/gnome/help/gnome-access-guide/pt/figures/tree.png
+share/gnome/help/gnome-access-guide/pt/gnome-access-guide.xml
 share/gnome/help/gnome-access-guide/sv/figures/accessx.png
 share/gnome/help/gnome-access-guide/sv/figures/bouncekeys.png
 share/gnome/help/gnome-access-guide/sv/figures/button.png
@@ -187,6 +268,7 @@ share/gnome/help/system-admin-guide/es/system-admin-guide.xml
 share/gnome/help/system-admin-guide/fr/system-admin-guide.xml
 share/gnome/help/system-admin-guide/it/system-admin-guide.xml
 share/gnome/help/system-admin-guide/pa/system-admin-guide.xml
+share/gnome/help/system-admin-guide/pt/system-admin-guide.xml
 share/gnome/help/system-admin-guide/sv/system-admin-guide.xml
 share/gnome/help/user-guide/C/figures/ask_pointer.png
 share/gnome/help/user-guide/C/figures/busy_pointer.png
@@ -420,6 +502,160 @@ share/gnome/help/user-guide/bg/gospanel.xml
 share/gnome/help/user-guide/bg/gosstartsession.xml
 share/gnome/help/user-guide/bg/gostools.xml
 share/gnome/help/user-guide/bg/user-guide.xml
+share/gnome/help/user-guide/de/figures/ask_pointer.png
+share/gnome/help/user-guide/de/figures/busy_pointer.png
+share/gnome/help/user-guide/de/figures/com_file_manager_menu.png
+share/gnome/help/user-guide/de/figures/copy_pointer.png
+share/gnome/help/user-guide/de/figures/force_quit.png
+share/gnome/help/user-guide/de/figures/four_hide_button.png
+share/gnome/help/user-guide/de/figures/gedit_window.png
+share/gnome/help/user-guide/de/figures/gnome_panel.png
+share/gnome/help/user-guide/de/figures/hyperlink_pointer.png
+share/gnome/help/user-guide/de/figures/ibeam_pointer.png
+share/gnome/help/user-guide/de/figures/link_pointer.png
+share/gnome/help/user-guide/de/figures/lockscreen_icon.png
+share/gnome/help/user-guide/de/figures/logout_icon.png
+share/gnome/help/user-guide/de/figures/menu_bar_applet.png
+share/gnome/help/user-guide/de/figures/menu_panel.png
+share/gnome/help/user-guide/de/figures/move_panel_object_pointer.png
+share/gnome/help/user-guide/de/figures/move_pointer.png
+share/gnome/help/user-guide/de/figures/movewindow_pointer.png
+share/gnome/help/user-guide/de/figures/naut_browser_mode.png
+share/gnome/help/user-guide/de/figures/naut_button_bar.png
+share/gnome/help/user-guide/de/figures/naut_computer_launcher.png
+share/gnome/help/user-guide/de/figures/naut_emblem.png
+share/gnome/help/user-guide/de/figures/naut_go_to_location.png
+share/gnome/help/user-guide/de/figures/naut_link_emblem.png
+share/gnome/help/user-guide/de/figures/naut_noread_emblem.png
+share/gnome/help/user-guide/de/figures/naut_normal_size_button.png
+share/gnome/help/user-guide/de/figures/naut_nowrite_emblem.png
+share/gnome/help/user-guide/de/figures/naut_refine_search.png
+share/gnome/help/user-guide/de/figures/naut_sampleemblem1_icon.png
+share/gnome/help/user-guide/de/figures/naut_sampleemblem2_icon.png
+share/gnome/help/user-guide/de/figures/naut_sampleemblem3_icon.png
+share/gnome/help/user-guide/de/figures/naut_sampleemblem_icon.png
+share/gnome/help/user-guide/de/figures/naut_samplesymlink_icon.png
+share/gnome/help/user-guide/de/figures/naut_search_bar.png
+share/gnome/help/user-guide/de/figures/naut_search_results.png
+share/gnome/help/user-guide/de/figures/naut_spatial_icon_view.png
+share/gnome/help/user-guide/de/figures/naut_spatial_list_view.png
+share/gnome/help/user-guide/de/figures/naut_spatial_mode.png
+share/gnome/help/user-guide/de/figures/naut_spatial_view.png
+share/gnome/help/user-guide/de/figures/naut_starthere_launcher.png
+share/gnome/help/user-guide/de/figures/naut_trash_launcher.png
+share/gnome/help/user-guide/de/figures/naut_zoom_in_button.png
+share/gnome/help/user-guide/de/figures/naut_zoom_out_button.png
+share/gnome/help/user-guide/de/figures/nautilus_restore_saved_search.png
+share/gnome/help/user-guide/de/figures/normal_pointer.png
+share/gnome/help/user-guide/de/figures/not_available_pointer.png
+share/gnome/help/user-guide/de/figures/notification_area_icon.png
+share/gnome/help/user-guide/de/figures/open_drawer.png
+share/gnome/help/user-guide/de/figures/openwindows_menu.png
+share/gnome/help/user-guide/de/figures/panel_object_popup_menu.png
+share/gnome/help/user-guide/de/figures/resize_pointer.png
+share/gnome/help/user-guide/de/figures/run_button.png
+share/gnome/help/user-guide/de/figures/sample_applet.png
+share/gnome/help/user-guide/de/figures/screenshot_button.png
+share/gnome/help/user-guide/de/figures/searchtool_button.png
+share/gnome/help/user-guide/de/figures/show_desktop_button.png
+share/gnome/help/user-guide/de/figures/titlebar_anno_window.png
+share/gnome/help/user-guide/de/figures/titlebar_window.png
+share/gnome/help/user-guide/de/figures/typical_menu.png
+share/gnome/help/user-guide/de/figures/window_list_applet.png
+share/gnome/help/user-guide/de/figures/window_list_group_applet.png
+share/gnome/help/user-guide/de/figures/workspace_switcher_applet.png
+share/gnome/help/user-guide/de/figures/yelp_add_bookmark.png
+share/gnome/help/user-guide/de/figures/yelp_edit_bookmarks.png
+share/gnome/help/user-guide/de/figures/yelp_preferences.png
+share/gnome/help/user-guide/de/figures/yelp_window.png
+share/gnome/help/user-guide/de/glossary.xml
+share/gnome/help/user-guide/de/gosbasic.xml
+share/gnome/help/user-guide/de/goscustdesk.xml
+share/gnome/help/user-guide/de/goseditmainmenu.xml
+share/gnome/help/user-guide/de/gosfeedback.xml
+share/gnome/help/user-guide/de/gosnautilus.xml
+share/gnome/help/user-guide/de/gosoverview.xml
+share/gnome/help/user-guide/de/gospanel.xml
+share/gnome/help/user-guide/de/gosstartsession.xml
+share/gnome/help/user-guide/de/gostools.xml
+share/gnome/help/user-guide/de/user-guide.xml
+share/gnome/help/user-guide/el/figures/ask_pointer.png
+share/gnome/help/user-guide/el/figures/busy_pointer.png
+share/gnome/help/user-guide/el/figures/com_file_manager_menu.png
+share/gnome/help/user-guide/el/figures/copy_pointer.png
+share/gnome/help/user-guide/el/figures/force_quit.png
+share/gnome/help/user-guide/el/figures/four_hide_button.png
+share/gnome/help/user-guide/el/figures/gedit_window.png
+share/gnome/help/user-guide/el/figures/gnome_panel.png
+share/gnome/help/user-guide/el/figures/hyperlink_pointer.png
+share/gnome/help/user-guide/el/figures/ibeam_pointer.png
+share/gnome/help/user-guide/el/figures/link_pointer.png
+share/gnome/help/user-guide/el/figures/lockscreen_icon.png
+share/gnome/help/user-guide/el/figures/logout_icon.png
+share/gnome/help/user-guide/el/figures/menu_bar_applet.png
+share/gnome/help/user-guide/el/figures/menu_panel.png
+share/gnome/help/user-guide/el/figures/move_panel_object_pointer.png
+share/gnome/help/user-guide/el/figures/move_pointer.png
+share/gnome/help/user-guide/el/figures/movewindow_pointer.png
+share/gnome/help/user-guide/el/figures/naut_browser_mode.png
+share/gnome/help/user-guide/el/figures/naut_button_bar.png
+share/gnome/help/user-guide/el/figures/naut_computer_launcher.png
+share/gnome/help/user-guide/el/figures/naut_emblem.png
+share/gnome/help/user-guide/el/figures/naut_go_to_location.png
+share/gnome/help/user-guide/el/figures/naut_link_emblem.png
+share/gnome/help/user-guide/el/figures/naut_noread_emblem.png
+share/gnome/help/user-guide/el/figures/naut_normal_size_button.png
+share/gnome/help/user-guide/el/figures/naut_nowrite_emblem.png
+share/gnome/help/user-guide/el/figures/naut_refine_search.png
+share/gnome/help/user-guide/el/figures/naut_sampleemblem1_icon.png
+share/gnome/help/user-guide/el/figures/naut_sampleemblem2_icon.png
+share/gnome/help/user-guide/el/figures/naut_sampleemblem3_icon.png
+share/gnome/help/user-guide/el/figures/naut_sampleemblem_icon.png
+share/gnome/help/user-guide/el/figures/naut_samplesymlink_icon.png
+share/gnome/help/user-guide/el/figures/naut_search_bar.png
+share/gnome/help/user-guide/el/figures/naut_search_results.png
+share/gnome/help/user-guide/el/figures/naut_spatial_icon_view.png
+share/gnome/help/user-guide/el/figures/naut_spatial_list_view.png
+share/gnome/help/user-guide/el/figures/naut_spatial_mode.png
+share/gnome/help/user-guide/el/figures/naut_spatial_view.png
+share/gnome/help/user-guide/el/figures/naut_starthere_launcher.png
+share/gnome/help/user-guide/el/figures/naut_trash_launcher.png
+share/gnome/help/user-guide/el/figures/naut_zoom_in_button.png
+share/gnome/help/user-guide/el/figures/naut_zoom_out_button.png
+share/gnome/help/user-guide/el/figures/nautilus_restore_saved_search.png
+share/gnome/help/user-guide/el/figures/normal_pointer.png
+share/gnome/help/user-guide/el/figures/not_available_pointer.png
+share/gnome/help/user-guide/el/figures/notification_area_icon.png
+share/gnome/help/user-guide/el/figures/open_drawer.png
+share/gnome/help/user-guide/el/figures/openwindows_menu.png
+share/gnome/help/user-guide/el/figures/panel_object_popup_menu.png
+share/gnome/help/user-guide/el/figures/resize_pointer.png
+share/gnome/help/user-guide/el/figures/run_button.png
+share/gnome/help/user-guide/el/figures/sample_applet.png
+share/gnome/help/user-guide/el/figures/screenshot_button.png
+share/gnome/help/user-guide/el/figures/searchtool_button.png
+share/gnome/help/user-guide/el/figures/show_desktop_button.png
+share/gnome/help/user-guide/el/figures/titlebar_anno_window.png
+share/gnome/help/user-guide/el/figures/titlebar_window.png
+share/gnome/help/user-guide/el/figures/typical_menu.png
+share/gnome/help/user-guide/el/figures/window_list_applet.png
+share/gnome/help/user-guide/el/figures/window_list_group_applet.png
+share/gnome/help/user-guide/el/figures/workspace_switcher_applet.png
+share/gnome/help/user-guide/el/figures/yelp_add_bookmark.png
+share/gnome/help/user-guide/el/figures/yelp_edit_bookmarks.png
+share/gnome/help/user-guide/el/figures/yelp_preferences.png
+share/gnome/help/user-guide/el/figures/yelp_window.png
+share/gnome/help/user-guide/el/glossary.xml
+share/gnome/help/user-guide/el/gosbasic.xml
+share/gnome/help/user-guide/el/goscustdesk.xml
+share/gnome/help/user-guide/el/goseditmainmenu.xml
+share/gnome/help/user-guide/el/gosfeedback.xml
+share/gnome/help/user-guide/el/gosnautilus.xml
+share/gnome/help/user-guide/el/gosoverview.xml
+share/gnome/help/user-guide/el/gospanel.xml
+share/gnome/help/user-guide/el/gosstartsession.xml
+share/gnome/help/user-guide/el/gostools.xml
+share/gnome/help/user-guide/el/user-guide.xml
 share/gnome/help/user-guide/es/figures/ask_pointer.png
 share/gnome/help/user-guide/es/figures/busy_pointer.png
 share/gnome/help/user-guide/es/figures/com_file_manager_menu.png
@@ -497,6 +733,83 @@ share/gnome/help/user-guide/es/gospanel.xml
 share/gnome/help/user-guide/es/gosstartsession.xml
 share/gnome/help/user-guide/es/gostools.xml
 share/gnome/help/user-guide/es/user-guide.xml
+share/gnome/help/user-guide/fi/figures/ask_pointer.png
+share/gnome/help/user-guide/fi/figures/busy_pointer.png
+share/gnome/help/user-guide/fi/figures/com_file_manager_menu.png
+share/gnome/help/user-guide/fi/figures/copy_pointer.png
+share/gnome/help/user-guide/fi/figures/force_quit.png
+share/gnome/help/user-guide/fi/figures/four_hide_button.png
+share/gnome/help/user-guide/fi/figures/gedit_window.png
+share/gnome/help/user-guide/fi/figures/gnome_panel.png
+share/gnome/help/user-guide/fi/figures/hyperlink_pointer.png
+share/gnome/help/user-guide/fi/figures/ibeam_pointer.png
+share/gnome/help/user-guide/fi/figures/link_pointer.png
+share/gnome/help/user-guide/fi/figures/lockscreen_icon.png
+share/gnome/help/user-guide/fi/figures/logout_icon.png
+share/gnome/help/user-guide/fi/figures/menu_bar_applet.png
+share/gnome/help/user-guide/fi/figures/menu_panel.png
+share/gnome/help/user-guide/fi/figures/move_panel_object_pointer.png
+share/gnome/help/user-guide/fi/figures/move_pointer.png
+share/gnome/help/user-guide/fi/figures/movewindow_pointer.png
+share/gnome/help/user-guide/fi/figures/naut_browser_mode.png
+share/gnome/help/user-guide/fi/figures/naut_button_bar.png
+share/gnome/help/user-guide/fi/figures/naut_computer_launcher.png
+share/gnome/help/user-guide/fi/figures/naut_emblem.png
+share/gnome/help/user-guide/fi/figures/naut_go_to_location.png
+share/gnome/help/user-guide/fi/figures/naut_link_emblem.png
+share/gnome/help/user-guide/fi/figures/naut_noread_emblem.png
+share/gnome/help/user-guide/fi/figures/naut_normal_size_button.png
+share/gnome/help/user-guide/fi/figures/naut_nowrite_emblem.png
+share/gnome/help/user-guide/fi/figures/naut_refine_search.png
+share/gnome/help/user-guide/fi/figures/naut_sampleemblem1_icon.png
+share/gnome/help/user-guide/fi/figures/naut_sampleemblem2_icon.png
+share/gnome/help/user-guide/fi/figures/naut_sampleemblem3_icon.png
+share/gnome/help/user-guide/fi/figures/naut_sampleemblem_icon.png
+share/gnome/help/user-guide/fi/figures/naut_samplesymlink_icon.png
+share/gnome/help/user-guide/fi/figures/naut_search_bar.png
+share/gnome/help/user-guide/fi/figures/naut_search_results.png
+share/gnome/help/user-guide/fi/figures/naut_spatial_icon_view.png
+share/gnome/help/user-guide/fi/figures/naut_spatial_list_view.png
+share/gnome/help/user-guide/fi/figures/naut_spatial_mode.png
+share/gnome/help/user-guide/fi/figures/naut_spatial_view.png
+share/gnome/help/user-guide/fi/figures/naut_starthere_launcher.png
+share/gnome/help/user-guide/fi/figures/naut_trash_launcher.png
+share/gnome/help/user-guide/fi/figures/naut_zoom_in_button.png
+share/gnome/help/user-guide/fi/figures/naut_zoom_out_button.png
+share/gnome/help/user-guide/fi/figures/nautilus_restore_saved_search.png
+share/gnome/help/user-guide/fi/figures/normal_pointer.png
+share/gnome/help/user-guide/fi/figures/not_available_pointer.png
+share/gnome/help/user-guide/fi/figures/notification_area_icon.png
+share/gnome/help/user-guide/fi/figures/open_drawer.png
+share/gnome/help/user-guide/fi/figures/openwindows_menu.png
+share/gnome/help/user-guide/fi/figures/panel_object_popup_menu.png
+share/gnome/help/user-guide/fi/figures/resize_pointer.png
+share/gnome/help/user-guide/fi/figures/run_button.png
+share/gnome/help/user-guide/fi/figures/sample_applet.png
+share/gnome/help/user-guide/fi/figures/screenshot_button.png
+share/gnome/help/user-guide/fi/figures/searchtool_button.png
+share/gnome/help/user-guide/fi/figures/show_desktop_button.png
+share/gnome/help/user-guide/fi/figures/titlebar_anno_window.png
+share/gnome/help/user-guide/fi/figures/titlebar_window.png
+share/gnome/help/user-guide/fi/figures/typical_menu.png
+share/gnome/help/user-guide/fi/figures/window_list_applet.png
+share/gnome/help/user-guide/fi/figures/window_list_group_applet.png
+share/gnome/help/user-guide/fi/figures/workspace_switcher_applet.png
+share/gnome/help/user-guide/fi/figures/yelp_add_bookmark.png
+share/gnome/help/user-guide/fi/figures/yelp_edit_bookmarks.png
+share/gnome/help/user-guide/fi/figures/yelp_preferences.png
+share/gnome/help/user-guide/fi/figures/yelp_window.png
+share/gnome/help/user-guide/fi/glossary.xml
+share/gnome/help/user-guide/fi/gosbasic.xml
+share/gnome/help/user-guide/fi/goscustdesk.xml
+share/gnome/help/user-guide/fi/goseditmainmenu.xml
+share/gnome/help/user-guide/fi/gosfeedback.xml
+share/gnome/help/user-guide/fi/gosnautilus.xml
+share/gnome/help/user-guide/fi/gosoverview.xml
+share/gnome/help/user-guide/fi/gospanel.xml
+share/gnome/help/user-guide/fi/gosstartsession.xml
+share/gnome/help/user-guide/fi/gostools.xml
+share/gnome/help/user-guide/fi/user-guide.xml
 share/gnome/help/user-guide/fr/figures/ask_pointer.png
 share/gnome/help/user-guide/fr/figures/busy_pointer.png
 share/gnome/help/user-guide/fr/figures/com_file_manager_menu.png
@@ -574,6 +887,83 @@ share/gnome/help/user-guide/fr/gospanel.xml
 share/gnome/help/user-guide/fr/gosstartsession.xml
 share/gnome/help/user-guide/fr/gostools.xml
 share/gnome/help/user-guide/fr/user-guide.xml
+share/gnome/help/user-guide/hu/figures/ask_pointer.png
+share/gnome/help/user-guide/hu/figures/busy_pointer.png
+share/gnome/help/user-guide/hu/figures/com_file_manager_menu.png
+share/gnome/help/user-guide/hu/figures/copy_pointer.png
+share/gnome/help/user-guide/hu/figures/force_quit.png
+share/gnome/help/user-guide/hu/figures/four_hide_button.png
+share/gnome/help/user-guide/hu/figures/gedit_window.png
+share/gnome/help/user-guide/hu/figures/gnome_panel.png
+share/gnome/help/user-guide/hu/figures/hyperlink_pointer.png
+share/gnome/help/user-guide/hu/figures/ibeam_pointer.png
+share/gnome/help/user-guide/hu/figures/link_pointer.png
+share/gnome/help/user-guide/hu/figures/lockscreen_icon.png
+share/gnome/help/user-guide/hu/figures/logout_icon.png
+share/gnome/help/user-guide/hu/figures/menu_bar_applet.png
+share/gnome/help/user-guide/hu/figures/menu_panel.png
+share/gnome/help/user-guide/hu/figures/move_panel_object_pointer.png
+share/gnome/help/user-guide/hu/figures/move_pointer.png
+share/gnome/help/user-guide/hu/figures/movewindow_pointer.png
+share/gnome/help/user-guide/hu/figures/naut_browser_mode.png
+share/gnome/help/user-guide/hu/figures/naut_button_bar.png
+share/gnome/help/user-guide/hu/figures/naut_computer_launcher.png
+share/gnome/help/user-guide/hu/figures/naut_emblem.png
+share/gnome/help/user-guide/hu/figures/naut_go_to_location.png
+share/gnome/help/user-guide/hu/figures/naut_link_emblem.png
+share/gnome/help/user-guide/hu/figures/naut_noread_emblem.png
+share/gnome/help/user-guide/hu/figures/naut_normal_size_button.png
+share/gnome/help/user-guide/hu/figures/naut_nowrite_emblem.png
+share/gnome/help/user-guide/hu/figures/naut_refine_search.png
+share/gnome/help/user-guide/hu/figures/naut_sampleemblem1_icon.png
+share/gnome/help/user-guide/hu/figures/naut_sampleemblem2_icon.png
+share/gnome/help/user-guide/hu/figures/naut_sampleemblem3_icon.png
+share/gnome/help/user-guide/hu/figures/naut_sampleemblem_icon.png
+share/gnome/help/user-guide/hu/figures/naut_samplesymlink_icon.png
+share/gnome/help/user-guide/hu/figures/naut_search_bar.png
+share/gnome/help/user-guide/hu/figures/naut_search_results.png
+share/gnome/help/user-guide/hu/figures/naut_spatial_icon_view.png
+share/gnome/help/user-guide/hu/figures/naut_spatial_list_view.png
+share/gnome/help/user-guide/hu/figures/naut_spatial_mode.png
+share/gnome/help/user-guide/hu/figures/naut_spatial_view.png
+share/gnome/help/user-guide/hu/figures/naut_starthere_launcher.png
+share/gnome/help/user-guide/hu/figures/naut_trash_launcher.png
+share/gnome/help/user-guide/hu/figures/naut_zoom_in_button.png
+share/gnome/help/user-guide/hu/figures/naut_zoom_out_button.png
+share/gnome/help/user-guide/hu/figures/nautilus_restore_saved_search.png
+share/gnome/help/user-guide/hu/figures/normal_pointer.png
+share/gnome/help/user-guide/hu/figures/not_available_pointer.png
+share/gnome/help/user-guide/hu/figures/notification_area_icon.png
+share/gnome/help/user-guide/hu/figures/open_drawer.png
+share/gnome/help/user-guide/hu/figures/openwindows_menu.png
+share/gnome/help/user-guide/hu/figures/panel_object_popup_menu.png
+share/gnome/help/user-guide/hu/figures/resize_pointer.png
+share/gnome/help/user-guide/hu/figures/run_button.png
+share/gnome/help/user-guide/hu/figures/sample_applet.png
+share/gnome/help/user-guide/hu/figures/screenshot_button.png
+share/gnome/help/user-guide/hu/figures/searchtool_button.png
+share/gnome/help/user-guide/hu/figures/show_desktop_button.png
+share/gnome/help/user-guide/hu/figures/titlebar_anno_window.png
+share/gnome/help/user-guide/hu/figures/titlebar_window.png
+share/gnome/help/user-guide/hu/figures/typical_menu.png
+share/gnome/help/user-guide/hu/figures/window_list_applet.png
+share/gnome/help/user-guide/hu/figures/window_list_group_applet.png
+share/gnome/help/user-guide/hu/figures/workspace_switcher_applet.png
+share/gnome/help/user-guide/hu/figures/yelp_add_bookmark.png
+share/gnome/help/user-guide/hu/figures/yelp_edit_bookmarks.png
+share/gnome/help/user-guide/hu/figures/yelp_preferences.png
+share/gnome/help/user-guide/hu/figures/yelp_window.png
+share/gnome/help/user-guide/hu/glossary.xml
+share/gnome/help/user-guide/hu/gosbasic.xml
+share/gnome/help/user-guide/hu/goscustdesk.xml
+share/gnome/help/user-guide/hu/goseditmainmenu.xml
+share/gnome/help/user-guide/hu/gosfeedback.xml
+share/gnome/help/user-guide/hu/gosnautilus.xml
+share/gnome/help/user-guide/hu/gosoverview.xml
+share/gnome/help/user-guide/hu/gospanel.xml
+share/gnome/help/user-guide/hu/gosstartsession.xml
+share/gnome/help/user-guide/hu/gostools.xml
+share/gnome/help/user-guide/hu/user-guide.xml
 share/gnome/help/user-guide/it/figures/ask_pointer.png
 share/gnome/help/user-guide/it/figures/busy_pointer.png
 share/gnome/help/user-guide/it/figures/com_file_manager_menu.png
@@ -1190,34 +1580,42 @@ share/gnome/help/user-guide/zh_CN/gospanel.xml
 share/gnome/help/user-guide/zh_CN/gosstartsession.xml
 share/gnome/help/user-guide/zh_CN/gostools.xml
 share/gnome/help/user-guide/zh_CN/user-guide.xml
-share/gnome/omf/gnome-access-guide/gnome-access-guide-C.omf
-share/gnome/omf/gnome-access-guide/gnome-access-guide-en_GB.omf
-share/gnome/omf/gnome-access-guide/gnome-access-guide-es.omf
-share/gnome/omf/gnome-access-guide/gnome-access-guide-fr.omf
-share/gnome/omf/gnome-access-guide/gnome-access-guide-it.omf
-share/gnome/omf/gnome-access-guide/gnome-access-guide-sv.omf
-share/gnome/omf/system-admin-guide/system-admin-guide-C.omf
-share/gnome/omf/system-admin-guide/system-admin-guide-es.omf
-share/gnome/omf/system-admin-guide/system-admin-guide-fr.omf
-share/gnome/omf/system-admin-guide/system-admin-guide-it.omf
-share/gnome/omf/system-admin-guide/system-admin-guide-pa.omf
-share/gnome/omf/system-admin-guide/system-admin-guide-sv.omf
-share/gnome/omf/user-guide/user-guide-C.omf
-share/gnome/omf/user-guide/user-guide-ar.omf
-share/gnome/omf/user-guide/user-guide-bg.omf
-share/gnome/omf/user-guide/user-guide-es.omf
-share/gnome/omf/user-guide/user-guide-fr.omf
-share/gnome/omf/user-guide/user-guide-it.omf
-share/gnome/omf/user-guide/user-guide-ko.omf
-share/gnome/omf/user-guide/user-guide-pa.omf
-share/gnome/omf/user-guide/user-guide-pt.omf
-share/gnome/omf/user-guide/user-guide-pt_BR.omf
-share/gnome/omf/user-guide/user-guide-ru.omf
-share/gnome/omf/user-guide/user-guide-sv.omf
-share/gnome/omf/user-guide/user-guide-zh_CN.omf
-@dirrm share/gnome/omf/user-guide
-@dirrm share/gnome/omf/system-admin-guide
-@dirrm share/gnome/omf/gnome-access-guide
+share/omf/gnome-access-guide/gnome-access-guide-C.omf
+share/omf/gnome-access-guide/gnome-access-guide-de.omf
+share/omf/gnome-access-guide/gnome-access-guide-el.omf
+share/omf/gnome-access-guide/gnome-access-guide-en_GB.omf
+share/omf/gnome-access-guide/gnome-access-guide-es.omf
+share/omf/gnome-access-guide/gnome-access-guide-fr.omf
+share/omf/gnome-access-guide/gnome-access-guide-it.omf
+share/omf/gnome-access-guide/gnome-access-guide-pt.omf
+share/omf/gnome-access-guide/gnome-access-guide-sv.omf
+share/omf/system-admin-guide/system-admin-guide-C.omf
+share/omf/system-admin-guide/system-admin-guide-es.omf
+share/omf/system-admin-guide/system-admin-guide-fr.omf
+share/omf/system-admin-guide/system-admin-guide-it.omf
+share/omf/system-admin-guide/system-admin-guide-pa.omf
+share/omf/system-admin-guide/system-admin-guide-pt.omf
+share/omf/system-admin-guide/system-admin-guide-sv.omf
+share/omf/user-guide/user-guide-C.omf
+share/omf/user-guide/user-guide-ar.omf
+share/omf/user-guide/user-guide-bg.omf
+share/omf/user-guide/user-guide-de.omf
+share/omf/user-guide/user-guide-el.omf
+share/omf/user-guide/user-guide-es.omf
+share/omf/user-guide/user-guide-fi.omf
+share/omf/user-guide/user-guide-fr.omf
+share/omf/user-guide/user-guide-hu.omf
+share/omf/user-guide/user-guide-it.omf
+share/omf/user-guide/user-guide-ko.omf
+share/omf/user-guide/user-guide-pa.omf
+share/omf/user-guide/user-guide-pt.omf
+share/omf/user-guide/user-guide-pt_BR.omf
+share/omf/user-guide/user-guide-ru.omf
+share/omf/user-guide/user-guide-sv.omf
+share/omf/user-guide/user-guide-zh_CN.omf
+@dirrm share/omf/user-guide
+@dirrm share/omf/system-admin-guide
+@dirrm share/omf/gnome-access-guide
 @dirrm share/gnome/help/user-guide/zh_CN/figures
 @dirrm share/gnome/help/user-guide/zh_CN
 @dirrm share/gnome/help/user-guide/sv/figures
@@ -1234,10 +1632,18 @@ share/gnome/omf/user-guide/user-guide-zh_CN.omf
 @dirrm share/gnome/help/user-guide/ko
 @dirrm share/gnome/help/user-guide/it/figures
 @dirrm share/gnome/help/user-guide/it
+@dirrm share/gnome/help/user-guide/hu/figures
+@dirrm share/gnome/help/user-guide/hu
 @dirrm share/gnome/help/user-guide/fr/figures
 @dirrm share/gnome/help/user-guide/fr
+@dirrm share/gnome/help/user-guide/fi/figures
+@dirrm share/gnome/help/user-guide/fi
 @dirrm share/gnome/help/user-guide/es/figures
 @dirrm share/gnome/help/user-guide/es
+@dirrm share/gnome/help/user-guide/el/figures
+@dirrm share/gnome/help/user-guide/el
+@dirrm share/gnome/help/user-guide/de/figures
+@dirrm share/gnome/help/user-guide/de
 @dirrm share/gnome/help/user-guide/bg/figures
 @dirrm share/gnome/help/user-guide/bg
 @dirrm share/gnome/help/user-guide/ar/figures
@@ -1246,6 +1652,7 @@ share/gnome/omf/user-guide/user-guide-zh_CN.omf
 @dirrm share/gnome/help/user-guide/C
 @dirrm share/gnome/help/user-guide
 @dirrm share/gnome/help/system-admin-guide/sv
+@dirrm share/gnome/help/system-admin-guide/pt
 @dirrm share/gnome/help/system-admin-guide/pa
 @dirrm share/gnome/help/system-admin-guide/it
 @dirrm share/gnome/help/system-admin-guide/fr
@@ -1254,6 +1661,8 @@ share/gnome/omf/user-guide/user-guide-zh_CN.omf
 @dirrm share/gnome/help/system-admin-guide
 @dirrm share/gnome/help/gnome-access-guide/sv/figures
 @dirrm share/gnome/help/gnome-access-guide/sv
+@dirrm share/gnome/help/gnome-access-guide/pt/figures
+@dirrm share/gnome/help/gnome-access-guide/pt
 @dirrm share/gnome/help/gnome-access-guide/it/figures
 @dirrm share/gnome/help/gnome-access-guide/it
 @dirrm share/gnome/help/gnome-access-guide/fr/figures
@@ -1262,6 +1671,10 @@ share/gnome/omf/user-guide/user-guide-zh_CN.omf
 @dirrm share/gnome/help/gnome-access-guide/es
 @dirrm share/gnome/help/gnome-access-guide/en_GB/figures
 @dirrm share/gnome/help/gnome-access-guide/en_GB
+@dirrm share/gnome/help/gnome-access-guide/el/figures
+@dirrm share/gnome/help/gnome-access-guide/el
+@dirrm share/gnome/help/gnome-access-guide/de/figures
+@dirrm share/gnome/help/gnome-access-guide/de
 @dirrm share/gnome/help/gnome-access-guide/C/figures
 @dirrm share/gnome/help/gnome-access-guide/C
 @dirrm share/gnome/help/gnome-access-guide
diff --git a/misc/gnome2-reference/Makefile b/misc/gnome2-reference/Makefile
new file mode 100644
index 000000000000..4913ad0db5a7
--- /dev/null
+++ b/misc/gnome2-reference/Makefile
@@ -0,0 +1,85 @@
+# New ports collection makefile for:	gnome2-reference
+# Date created:		2006-07-24
+# Whom:			Michael Johnson <ahze@FreeBSD.org>
+#
+# $FreeBSD$
+#    $MCom: ports/misc/gnome2-reference/Makefile,v 1.7 2007/09/04 21:54:03 ahze Exp $
+
+PORTNAME=	gnome2-reference
+PORTVERSION=	2.20
+CATEGORIES=	misc gnome
+MASTER_SITES=	# empty
+DISTFILES=	# empty
+EXTRACT_ONLY=	# empty
+
+MAINTAINER=	gnome@FreeBSD.org
+COMMENT=	The "meta-port" for GNOME 2 programming references
+
+# Please keep this list alphabetically sorted.
+# If you add or remove an entry from REF_LIST you must
+# run 'make create-ref-list'
+
+REF_LIST=	accessibility/at-spi-reference \
+		accessibility/atk-reference \
+		accessibility/gail-reference \
+		databases/libgda2-reference \
+		databases/libgda3-reference \
+		databases/libgnomedb-reference \
+		devel/ORBit2-reference \
+		devel/gconf2-reference \
+		devel/glib20-reference \
+		devel/glibmm-reference \
+		devel/gnome-vfs-reference \
+		devel/libbonobo-reference \
+		devel/libglade2-reference \
+		devel/libsoup-reference \
+		graphics/cairo-reference \
+		graphics/libgnomecanvas-reference \
+		net/linc-reference \
+		print/libgnomeprint-reference \
+		textproc/gtkspell-reference \
+		textproc/libxml2-reference \
+		textproc/libxslt-reference \
+		x11/gnome-desktop-reference \
+		x11/gnome-panel-reference \
+		x11/libgnome-reference \
+		x11-fonts/fontconfig-reference \
+		x11-toolkits/gal2-reference \
+		x11-toolkits/gtk20-reference \
+		x11-toolkits/gtkmm20-reference \
+		x11-toolkits/gtkmm24-reference \
+		x11-toolkits/gtksourceview-reference \
+		x11-toolkits/libbonoboui-reference \
+		x11-toolkits/libgnomeui-reference \
+		x11-toolkits/libwnck-reference \
+		x11-toolkits/pango-reference \
+		x11-toolkits/vte-reference
+
+OPTIONS=	# empty
+NO_BUILD=	yes
+
+REF_LIST_INC=	${.CURDIR}/Makefile.inc
+.include "${REF_LIST_INC}"
+
+.include <bsd.port.pre.mk>
+
+.for ref in ${_PORT_REF_LIST:C/^([^:]+).*/\1/}
+OPTIONS+=	${ref:C|^[^/]+/([^/]+).*|\1|:S/-reference//:S/-/_/:U} "Install ${ref:C|^[^/]+/([^/]+).*|\1|:S/-reference//} programing reference " on
+.endfor
+
+.for ref in ${_PORT_REF_LIST}
+.if !defined(WITHOUT_${ref:C|^[^/]+/([^/]+).*|\1|:S/-reference//:S/-/_/:U:C/^([^:]+).*/\1/})
+RUN_DEPENDS+=	${ref:C|^[^:]+:([^:]+).*|\1|:C|^[^/]+/([^/]+).*|\1|}>0:${PORTSDIR}/${ref:C/^([^:]+).*/\1/}
+.endif
+.endfor
+
+do-install:	# empty
+
+create-ref-list:
+	${CP} ${REF_LIST_INC} ${REF_LIST_INC}.bak
+	${ECHO_CMD} "_PORT_REF_LIST= \\" > ${REF_LIST_INC}
+.for port in ${REF_LIST}
+	(cd ${PORTSDIR}/${port} && ${ECHO_CMD} "${port}:`${MAKE} -V PORTNAME` \\" >> ${REF_LIST_INC})
+.endfor
+
+.include <bsd.port.post.mk>
diff --git a/misc/gnome2-reference/Makefile.inc b/misc/gnome2-reference/Makefile.inc
new file mode 100644
index 000000000000..3f1b5ec7afb4
--- /dev/null
+++ b/misc/gnome2-reference/Makefile.inc
@@ -0,0 +1,36 @@
+_PORT_REF_LIST= \
+accessibility/at-spi-reference:at-spi-reference \
+accessibility/atk-reference:atk-reference \
+accessibility/gail-reference:gail-reference \
+databases/libgda2-reference:libgda2-reference \
+databases/libgda3-reference:libgda3-reference \
+databases/libgnomedb-reference:libgnomedb-reference \
+devel/ORBit2-reference:ORBit2-reference \
+devel/gconf2-reference:gconf2-reference \
+devel/glib20-reference:glib-reference \
+devel/glibmm-reference:glibmm-reference \
+devel/gnome-vfs-reference:gnome-vfs-reference \
+devel/libbonobo-reference:libbonobo-reference \
+devel/libglade2-reference:libglade2-reference \
+devel/libsoup-reference:libsoup-reference \
+graphics/cairo-reference:cairo-reference \
+graphics/libgnomecanvas-reference:libgnomecanvas-reference \
+net/linc-reference:linc-reference \
+print/libgnomeprint-reference:libgnomeprint-reference \
+textproc/gtkspell-reference:gtkspell-reference \
+textproc/libxml2-reference:libxml2-reference \
+textproc/libxslt-reference:libxslt-reference \
+x11/gnome-desktop-reference:gnome-desktop-reference \
+x11/gnome-panel-reference:gnome-panel-reference \
+x11/libgnome-reference:libgnome-reference \
+x11-fonts/fontconfig-reference:fontconfig-reference \
+x11-toolkits/gal2-reference:gal2-reference \
+x11-toolkits/gtk20-reference:gtk-reference \
+x11-toolkits/gtkmm20-reference:gtkmm-reference \
+x11-toolkits/gtkmm24-reference:gtkmm-reference \
+x11-toolkits/gtksourceview-reference:gtksourceview-reference \
+x11-toolkits/libbonoboui-reference:libbonoboui-reference \
+x11-toolkits/libgnomeui-reference:libgnomeui-reference \
+x11-toolkits/libwnck-reference:libwnck-reference \
+x11-toolkits/pango-reference:pango-reference \
+x11-toolkits/vte-reference:vte-reference \
diff --git a/misc/gnome2-reference/pkg-descr b/misc/gnome2-reference/pkg-descr
new file mode 100644
index 000000000000..3ca7ff2fa4df
--- /dev/null
+++ b/misc/gnome2-reference/pkg-descr
@@ -0,0 +1 @@
+The "meta-port" for GNOME 2 programming references
diff --git a/misc/gnomehier/Makefile b/misc/gnomehier/Makefile
index 53dce1b470b3..2b96e5b7fd54 100644
--- a/misc/gnomehier/Makefile
+++ b/misc/gnomehier/Makefile
@@ -3,13 +3,13 @@
 # Whom:					Maxim Sobolev <sobomax@FreeBSD.org>
 #
 # $FreeBSD$
-#    $MCom: ports/misc/gnomehier/Makefile,v 1.14 2006/10/10 20:22:15 mezz Exp $
+#    $MCom: ports/misc/gnomehier/Makefile,v 1.29 2007/09/12 14:40:40 ahze Exp $
 #
 # !!DON'T BUMP PORTREVISION ON MTREE CHANGES ANYMORE!!
 
 PORTNAME=	gnomehier
-PORTVERSION=	2.2
-PORTREVISION=	2
+PORTVERSION=	2.3
+PORTREVISION=	10
 CATEGORIES=	misc gnome
 MASTER_SITES=	# none
 DISTFILES=	# none
@@ -44,8 +44,8 @@ pre-install:
 		< ${FILESDIR}/pkg-install.in > ${PKGINSTALL}
 
 pre-su-install:
-	${CHGRP} games ${WRKSRC}/share/gnome/games
-	${CHMOD} g=rwXs ${WRKSRC}/share/gnome/games
+	${CHGRP} games ${WRKSRC}/share/games
+	${CHMOD} g=rwXs ${WRKSRC}/share/games
 	cd ${WRKSRC} && \
 		${MTREE_CMD} -U -d -n -i -c -k "uname, gname, mode" \
 			> ${WRKDIR}/${GNOME_MTREE}
diff --git a/misc/gnomehier/files/dirlist b/misc/gnomehier/files/dirlist
index 65d17732c66a..5cadd8d1c75f 100644
--- a/misc/gnomehier/files/dirlist
+++ b/misc/gnomehier/files/dirlist
@@ -9,9 +9,9 @@ etc/gconf/gconf.xml.defaults
 etc/gconf/gconf.xml.mandatory
 etc/gconf/schemas
 etc/gnome
-etc/gnome/config
 etc/gnome-vfs-2.0
 etc/gnome-vfs-2.0/modules
+etc/gnome/config
 etc/sound
 etc/sound/events
 etc/vfs
@@ -29,17 +29,32 @@ lib/vfs
 lib/vfs/modules
 libdata/bonobo
 libdata/bonobo/servers
+share/applets
+share/applets/Amusements
+share/applets/Clocks
+share/applets/Monitors
+share/applets/Multimedia
+share/applets/Network
+share/applets/Utility
+share/application-registry
+share/capplets
+share/control-center
+share/control-center-2.0
+share/control-center-2.0/capplets
+share/control-center/Desktop
+share/control-center/Documents
+share/control-center/Peripherals
+share/control-center/Session
+share/control-center/capplets
+share/control-center/keybindings
 share/doc/libgda
+share/games
 share/gnome
-share/gnome/applets
-share/gnome/applets/Amusements
-share/gnome/applets/Clocks
-share/gnome/applets/Monitors
-share/gnome/applets/Multimedia
-share/gnome/applets/Network
-share/gnome/applets/Utility
-share/gnome/application-registry
-share/gnome/applications
+share/gnome-2.0
+share/gnome-2.0/ui
+share/gnome-about
+share/gnome-control-center
+share/gnome-control-center/keybindings
 share/gnome/apps
 share/gnome/apps/Applications
 share/gnome/apps/Audio
@@ -55,20 +70,7 @@ share/gnome/apps/Settings/Peripherals
 share/gnome/apps/Settings/Session
 share/gnome/apps/System
 share/gnome/apps/Utilities
-share/gnome/capplets
-share/gnome/control-center
-share/gnome/control-center-2.0
-share/gnome/control-center-2.0/capplets
-share/gnome/control-center/Desktop
-share/gnome/control-center/Documents
-share/gnome/control-center/Peripherals
-share/gnome/control-center/Session
-share/gnome/control-center/capplets
-share/gnome/fonts
-share/gnome/games
-share/gnome/gnome-2.0
-share/gnome/gnome-2.0/ui
-share/gnome/gnome-about
+share/gnome/autostart
 share/gnome/help
 share/gnome/help/fdl
 share/gnome/help/fdl/C
@@ -76,24 +78,21 @@ share/gnome/help/gpl
 share/gnome/help/gpl/C
 share/gnome/help/lgpl
 share/gnome/help/lgpl/C
-share/gnome/icons
-share/gnome/idl
-share/gnome/images
-share/gnome/mc
-share/gnome/mc/templates
-share/gnome/mime-info
-share/gnome/oaf
-share/gnome/omf
 share/gnome/panel
-share/gnome/pixmaps
-share/gnome/pixmaps/document-icons
-share/gnome/pixmaps/splash
-share/gnome/sgml
-share/gnome/sgml/docbook
-share/gnome/sgml/docbook/gnome-customization-0.1
-share/gnome/sounds
-share/gnome/themes
 share/gnome/ui
-share/gnome/vfolders
 share/gnome/wm-properties
-share/gnome/xmodmap
+share/images
+share/mc
+share/mc/templates
+share/mime-info
+share/oaf
+share/omf
+share/pixmaps/document-icons
+share/pixmaps/splash
+share/sgml/docbook
+share/sgml/docbook/gnome-customization-0.1
+share/sounds
+share/vala
+share/vala/vapi
+share/vfolders
+share/xmodmap
diff --git a/misc/gnomesword/Makefile b/misc/gnomesword/Makefile
index a478378f50f0..ac643d243e50 100644
--- a/misc/gnomesword/Makefile
+++ b/misc/gnomesword/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gnomesword
 PORTVERSION=	2.2.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	misc gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/misc/gnomesword/files/patch-configure b/misc/gnomesword/files/patch-configure
index e5971dfbb18b..2338d3377c15 100644
--- a/misc/gnomesword/files/patch-configure
+++ b/misc/gnomesword/files/patch-configure
@@ -114,15 +114,3 @@
  
  
  
-@@ -26461,9 +26461,9 @@
- packagedatadir=share/${PACKAGE}
- packagedocdir=share/doc/${PACKAGE}
- 
--packagepixmapsdir=share/pixmaps/${PACKAGE}
-+packagepixmapsdir=share/gnome/pixmaps/${PACKAGE}
- packagehelpdir=share/gnome/help/${PACKAGE}
--packagemenudir=share/applications
-+packagemenudir=share/gnome/applications
- 
- NO_PREFIX_PACKAGE_DATA_DIR="${packagedatadir}"
- 
diff --git a/misc/gnomesword/pkg-plist b/misc/gnomesword/pkg-plist
index 114dc9592e5a..cfc98df237b8 100644
--- a/misc/gnomesword/pkg-plist
+++ b/misc/gnomesword/pkg-plist
@@ -5,15 +5,15 @@ bin/gnomesword2
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/TODO
-share/gnome/applications/gnomesword.desktop
-share/gnome/gnomesword/bookmarks.glade
-share/gnome/gnomesword/editor_note.xml
-share/gnome/gnomesword/editor_studypad.xml
-share/gnome/gnomesword/logo.png
-share/gnome/gnomesword/module-manager.glade
-share/gnome/gnomesword/prefs.glade
-share/gnome/gnomesword/search-dialog.glade
-share/gnome/gnomesword/sword3.png
+share/applications/gnomesword.desktop
+share/gnomesword/bookmarks.glade
+share/gnomesword/editor_note.xml
+share/gnomesword/editor_studypad.xml
+share/gnomesword/logo.png
+share/gnomesword/module-manager.glade
+share/gnomesword/prefs.glade
+share/gnomesword/search-dialog.glade
+share/gnomesword/sword3.png
 share/gnome/help/gnomesword/C/authors.xml
 share/gnome/help/gnomesword/C/figures/first_start.png
 share/gnome/help/gnomesword/C/figures/interface.png
@@ -144,25 +144,25 @@ share/gnome/help/gnomesword/fr/preferences.xml
 share/gnome/help/gnomesword/fr/search.xml
 share/gnome/help/gnomesword/fr/start.xml
 share/gnome/help/gnomesword/fr/studypad.xml
-share/gnome/pixmaps/gnomesword/about.png
-share/gnome/pixmaps/gnomesword/dlg-un.png
-share/gnome/pixmaps/gnomesword/epiphany-bookmark-page.png
-share/gnome/pixmaps/gnomesword/epiphany-bookmarks.png
-share/gnome/pixmaps/gnomesword/epiphany-secure.png
-share/gnome/pixmaps/gnomesword/epiphany-unsecure.png
-share/gnome/pixmaps/gnomesword/gnome-session.png
-share/gnome/pixmaps/gnomesword/gnome-window-manager.png
-share/gnome/pixmaps/gnomesword/gnome-windows.png
-share/gnome/pixmaps/gnomesword/gs2-48x48.ico
-share/gnome/pixmaps/gnomesword/gs2-48x48.png
-share/gnome/pixmaps/gnomesword/init-settings.png
-share/gnome/pixmaps/gnomesword/logo.png
-share/gnome/pixmaps/gnomesword/new_tab_button.png
-share/gnome/pixmaps/gnomesword/splash.png
-share/gnome/pixmaps/gnomesword/splash2.png
-share/gnome/pixmaps/gnomesword/sword.png
-share/gnome/pixmaps/gnomesword/sword3.png
-share/gnome/pixmaps/gnomesword/tt.png
+share/pixmaps/gnomesword/about.png
+share/pixmaps/gnomesword/dlg-un.png
+share/pixmaps/gnomesword/epiphany-bookmark-page.png
+share/pixmaps/gnomesword/epiphany-bookmarks.png
+share/pixmaps/gnomesword/epiphany-secure.png
+share/pixmaps/gnomesword/epiphany-unsecure.png
+share/pixmaps/gnomesword/gnome-session.png
+share/pixmaps/gnomesword/gnome-window-manager.png
+share/pixmaps/gnomesword/gnome-windows.png
+share/pixmaps/gnomesword/gs2-48x48.ico
+share/pixmaps/gnomesword/gs2-48x48.png
+share/pixmaps/gnomesword/init-settings.png
+share/pixmaps/gnomesword/logo.png
+share/pixmaps/gnomesword/new_tab_button.png
+share/pixmaps/gnomesword/splash.png
+share/pixmaps/gnomesword/splash2.png
+share/pixmaps/gnomesword/sword.png
+share/pixmaps/gnomesword/sword3.png
+share/pixmaps/gnomesword/tt.png
 share/locale/bg/LC_MESSAGES/gnomesword.mo
 share/locale/cs/LC_MESSAGES/gnomesword.mo
 share/locale/de/LC_MESSAGES/gnomesword.mo
@@ -174,7 +174,7 @@ share/locale/nl/LC_MESSAGES/gnomesword.mo
 share/locale/ru/LC_MESSAGES/gnomesword.mo
 share/locale/sk/LC_MESSAGES/gnomesword.mo
 share/locale/uk/LC_MESSAGES/gnomesword.mo
-@dirrm share/gnome/pixmaps/gnomesword
+@dirrm share/pixmaps/gnomesword
 @dirrm share/gnome/help/gnomesword/fr/figures
 @dirrm share/gnome/help/gnomesword/fr
 @dirrm share/gnome/help/gnomesword/de/figures
@@ -182,5 +182,6 @@ share/locale/uk/LC_MESSAGES/gnomesword.mo
 @dirrm share/gnome/help/gnomesword/C/figures
 @dirrm share/gnome/help/gnomesword/C
 @dirrm share/gnome/help/gnomesword
-@dirrm share/gnome/gnomesword
+@dirrm share/gnomesword
 @dirrm %%DOCSDIR%%
+@dirrmtry share/applications
diff --git a/misc/gregexp/Makefile b/misc/gregexp/Makefile
index 1a99398a71d9..33cef335c225 100644
--- a/misc/gregexp/Makefile
+++ b/misc/gregexp/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gregexp
 PORTVERSION=	0.3
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	misc
 MASTER_SITES=	http://dentrassi.de/download/gregexp/%SUBDIR%/
 MASTER_SITE_SUBDIR=	${PORTVERSION}
diff --git a/misc/gregexp/pkg-plist b/misc/gregexp/pkg-plist
index 6af56fd53fb3..ccee0944ca07 100644
--- a/misc/gregexp/pkg-plist
+++ b/misc/gregexp/pkg-plist
@@ -1,6 +1,7 @@
 bin/gregexp
-share/gnome/applications/gregexp.desktop
-share/gnome/pixmaps/gregexp.png
-share/gnome/gregexp/glade/gregexp.glade
-@dirrm share/gnome/gregexp/glade
-@dirrm share/gnome/gregexp
+share/applications/gregexp.desktop
+share/pixmaps/gregexp.png
+share/gregexp/glade/gregexp.glade
+@dirrm share/gregexp/glade
+@dirrm share/gregexp
+@dirrmtry share/applications
diff --git a/misc/gtktalog/Makefile b/misc/gtktalog/Makefile
index 204a2070e581..09b4d28aef56 100644
--- a/misc/gtktalog/Makefile
+++ b/misc/gtktalog/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gtktalog
 PORTVERSION=	1.0.4
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_SAVANNAH}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/misc/gtktalog/pkg-plist b/misc/gtktalog/pkg-plist
index 4985306d311a..a98d60ed9336 100644
--- a/misc/gtktalog/pkg-plist
+++ b/misc/gtktalog/pkg-plist
@@ -11,53 +11,53 @@ lib/gtktalog/mpeginfo
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/TODO
 share/gnome/apps/Applications/gtktalog.desktop
-share/gnome/gtktalog/gtktalog.cf
-share/gnome/gtktalog/icons/c.xpm
-share/gnome/gtktalog/icons/cat.xpm
-share/gnome/gtktalog/icons/cpp.xpm
-share/gnome/gtktalog/icons/deb.xpm
-share/gnome/gtktalog/icons/default_dir.xpm
-share/gnome/gtktalog/icons/default_disk.xpm
-share/gnome/gtktalog/icons/default_file.xpm
-share/gnome/gtktalog/icons/default_opened_dir.xpm
-share/gnome/gtktalog/icons/default_opened_disk.xpm
-share/gnome/gtktalog/icons/default_opened_vfs.xpm
-share/gnome/gtktalog/icons/default_unreadable.xpm
-share/gnome/gtktalog/icons/default_vfs.xpm
-share/gnome/gtktalog/icons/doc.xpm
-share/gnome/gtktalog/icons/file.xpm
-share/gnome/gtktalog/icons/gz.xpm
-share/gnome/gtktalog/icons/h.xpm
-share/gnome/gtktalog/icons/html.xpm
-share/gnome/gtktalog/icons/image.xpm
-share/gnome/gtktalog/icons/java.xpm
-share/gnome/gtktalog/icons/logo.xpm
-share/gnome/gtktalog/icons/movie.xpm
-share/gnome/gtktalog/icons/mp3.xpm
-share/gnome/gtktalog/icons/pdf.xpm
-share/gnome/gtktalog/icons/rpm.xpm
-share/gnome/gtktalog/icons/so.xpm
-share/gnome/gtktalog/icons/son.xpm
-share/gnome/gtktalog/icons/txt.xpm
-share/gnome/gtktalog/xpm/add.xpm
-share/gnome/gtktalog/xpm/exit.xpm
-share/gnome/gtktalog/xpm/find.xpm
-share/gnome/gtktalog/xpm/help.xpm
-share/gnome/gtktalog/xpm/new.xpm
-share/gnome/gtktalog/xpm/off.xpm
-share/gnome/gtktalog/xpm/on.xpm
-share/gnome/gtktalog/xpm/open.xpm
-share/gnome/gtktalog/xpm/report.xpm
-share/gnome/gtktalog/xpm/save.xpm
-share/gnome/gtktalog/xpm/setup__Disk_setup.xpm
-share/gnome/gtktalog/xpm/setup__General_options.xpm
-share/gnome/gtktalog/xpm/setup__Information_plugins.xpm
-share/gnome/gtktalog/xpm/setup__LoadSave_options.xpm
-share/gnome/gtktalog/xpm/setup__MIME_type_icons.xpm
-share/gnome/gtktalog/xpm/setup__MIME_types_to_skip_during_a_scan.xpm
-share/gnome/gtktalog/xpm/setup__Scan_mime_types.xpm
-share/gnome/gtktalog/xpm/setup__Scan_options.xpm
-share/gnome/gtktalog/xpm/setup__Virtual_File_Systems.xpm
+%%DATADIR%%/gtktalog.cf
+%%DATADIR%%/icons/c.xpm
+%%DATADIR%%/icons/cat.xpm
+%%DATADIR%%/icons/cpp.xpm
+%%DATADIR%%/icons/deb.xpm
+%%DATADIR%%/icons/default_dir.xpm
+%%DATADIR%%/icons/default_disk.xpm
+%%DATADIR%%/icons/default_file.xpm
+%%DATADIR%%/icons/default_opened_dir.xpm
+%%DATADIR%%/icons/default_opened_disk.xpm
+%%DATADIR%%/icons/default_opened_vfs.xpm
+%%DATADIR%%/icons/default_unreadable.xpm
+%%DATADIR%%/icons/default_vfs.xpm
+%%DATADIR%%/icons/doc.xpm
+%%DATADIR%%/icons/file.xpm
+%%DATADIR%%/icons/gz.xpm
+%%DATADIR%%/icons/h.xpm
+%%DATADIR%%/icons/html.xpm
+%%DATADIR%%/icons/image.xpm
+%%DATADIR%%/icons/java.xpm
+%%DATADIR%%/icons/logo.xpm
+%%DATADIR%%/icons/movie.xpm
+%%DATADIR%%/icons/mp3.xpm
+%%DATADIR%%/icons/pdf.xpm
+%%DATADIR%%/icons/rpm.xpm
+%%DATADIR%%/icons/so.xpm
+%%DATADIR%%/icons/son.xpm
+%%DATADIR%%/icons/txt.xpm
+%%DATADIR%%/xpm/add.xpm
+%%DATADIR%%/xpm/exit.xpm
+%%DATADIR%%/xpm/find.xpm
+%%DATADIR%%/xpm/help.xpm
+%%DATADIR%%/xpm/new.xpm
+%%DATADIR%%/xpm/off.xpm
+%%DATADIR%%/xpm/on.xpm
+%%DATADIR%%/xpm/open.xpm
+%%DATADIR%%/xpm/report.xpm
+%%DATADIR%%/xpm/save.xpm
+%%DATADIR%%/xpm/setup__Disk_setup.xpm
+%%DATADIR%%/xpm/setup__General_options.xpm
+%%DATADIR%%/xpm/setup__Information_plugins.xpm
+%%DATADIR%%/xpm/setup__LoadSave_options.xpm
+%%DATADIR%%/xpm/setup__MIME_type_icons.xpm
+%%DATADIR%%/xpm/setup__MIME_types_to_skip_during_a_scan.xpm
+%%DATADIR%%/xpm/setup__Scan_mime_types.xpm
+%%DATADIR%%/xpm/setup__Scan_options.xpm
+%%DATADIR%%/xpm/setup__Virtual_File_Systems.xpm
 share/gnome/help/gtktalog/C/book1.html
 share/gnome/help/gtktalog/C/c1019.html
 share/gnome/help/gtktalog/C/c114.html
@@ -152,7 +152,7 @@ share/gnome/help/gtktalog/fr/x779.html
 share/gnome/help/gtktalog/fr/x835.html
 share/gnome/help/gtktalog/fr/x846.html
 share/gnome/help/gtktalog/fr/x947.html
-share/gnome/pixmaps/gtktalog.png
+share/pixmaps/gtktalog.png
 %%NLS%%share/locale/ca/LC_MESSAGES/gtktalog.mo
 %%NLS%%share/locale/cs/LC_MESSAGES/gtktalog.mo
 %%NLS%%share/locale/de/LC_MESSAGES/gtktalog.mo
@@ -171,7 +171,7 @@ share/gnome/pixmaps/gtktalog.png
 @dirrm share/gnome/help/gtktalog/fr
 @dirrm share/gnome/help/gtktalog/C
 @dirrm share/gnome/help/gtktalog
-@dirrm share/gnome/gtktalog/xpm
-@dirrm share/gnome/gtktalog/icons
-@dirrm share/gnome/gtktalog
+@dirrm %%DATADIR%%/xpm
+@dirrm %%DATADIR%%/icons
+@dirrm %%DATADIR%%
 @dirrm lib/gtktalog
diff --git a/misc/misterproper/Makefile b/misc/misterproper/Makefile
index 33e841fba8c2..6505db4a27e5 100644
--- a/misc/misterproper/Makefile
+++ b/misc/misterproper/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	misterproper
 PORTVERSION=	0.4
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	misc gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 #ftp://misterproper.sourceforge.net/pub/misterproper/releases/ \
diff --git a/misc/misterproper/pkg-plist b/misc/misterproper/pkg-plist
index 024a47d0c863..d488520f5aaa 100644
--- a/misc/misterproper/pkg-plist
+++ b/misc/misterproper/pkg-plist
@@ -1,8 +1,8 @@
 bin/misterproper
-share/gnome/pixmaps/misterproper/misterproper.xpm
 share/locale/de/LC_MESSAGES/misterproper.mo
 share/locale/es/LC_MESSAGES/misterproper.mo
 share/locale/fr/LC_MESSAGES/misterproper.mo
 share/locale/pt/LC_MESSAGES/misterproper.mo
 share/locale/sv/LC_MESSAGES/misterproper.mo
-@dirrm share/gnome/pixmaps/misterproper
+share/pixmaps/misterproper/misterproper.xpm
+@dirrm share/pixmaps/misterproper
diff --git a/misc/pybliographer/Makefile b/misc/pybliographer/Makefile
index 95c7f18bba05..91234a6c1c02 100644
--- a/misc/pybliographer/Makefile
+++ b/misc/pybliographer/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	pybliographer
 PORTVERSION=	1.0.11
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	misc python gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/pybliographer/1.0
@@ -41,8 +41,8 @@ pre-patch:
 
 post-install:
 	@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py \
-		${PREFIX}/share/gnome/${PORTNAME}
+		${PREFIX}/share/${PORTNAME}
 	@${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py \
-		${PREFIX}/share/gnome/${PORTNAME}
+		${PREFIX}/share/${PORTNAME}
 
 .include <bsd.port.post.mk>
diff --git a/misc/pybliographer/pkg-plist b/misc/pybliographer/pkg-plist
index 70d8b74a6cdb..84c9934906b6 100644
--- a/misc/pybliographer/pkg-plist
+++ b/misc/pybliographer/pkg-plist
@@ -96,224 +96,224 @@ share/gnome/help/pybliographic/it/x305.html
 share/gnome/help/pybliographic/it/x329.html
 share/gnome/help/pybliographic/it/x369.html
 share/gnome/help/pybliographic/it/x55.html
-share/gnome/mime-info/pybliographic.keys
-share/gnome/mime-info/pybliographic.mime
-share/gnome/pixmaps/pybliographic-logo.png
-share/gnome/pixmaps/pybliographic.png
-share/gnome/pybliographer/Pyblio/Autoload.py
-share/gnome/pybliographer/Pyblio/Autoload.pyc
-share/gnome/pybliographer/Pyblio/Autoload.pyo
-share/gnome/pybliographer/Pyblio/Base.py
-share/gnome/pybliographer/Pyblio/Base.pyc
-share/gnome/pybliographer/Pyblio/Base.pyo
-share/gnome/pybliographer/Pyblio/ConfDir/Base.py
-share/gnome/pybliographer/Pyblio/ConfDir/Base.pyc
-share/gnome/pybliographer/Pyblio/ConfDir/Base.pyo
-share/gnome/pybliographer/Pyblio/ConfDir/BibTeX+.py
-share/gnome/pybliographer/Pyblio/ConfDir/BibTeX+.pyc
-share/gnome/pybliographer/Pyblio/ConfDir/BibTeX+.pyo
-share/gnome/pybliographer/Pyblio/ConfDir/BibTeX.py
-share/gnome/pybliographer/Pyblio/ConfDir/BibTeX.pyc
-share/gnome/pybliographer/Pyblio/ConfDir/BibTeX.pyo
-share/gnome/pybliographer/Pyblio/ConfDir/Gnome.py
-share/gnome/pybliographer/Pyblio/ConfDir/Gnome.pyc
-share/gnome/pybliographer/Pyblio/ConfDir/Gnome.pyo
-share/gnome/pybliographer/Pyblio/ConfDir/GnomeUI.py
-share/gnome/pybliographer/Pyblio/ConfDir/GnomeUI.pyc
-share/gnome/pybliographer/Pyblio/ConfDir/GnomeUI.pyo
-share/gnome/pybliographer/Pyblio/ConfDir/Medline.py
-share/gnome/pybliographer/Pyblio/ConfDir/Medline.pyc
-share/gnome/pybliographer/Pyblio/ConfDir/Medline.pyo
-share/gnome/pybliographer/Pyblio/ConfDir/Ovid.py
-share/gnome/pybliographer/Pyblio/ConfDir/Ovid.pyc
-share/gnome/pybliographer/Pyblio/ConfDir/Ovid.pyo
-share/gnome/pybliographer/Pyblio/ConfDir/Refer.py
-share/gnome/pybliographer/Pyblio/ConfDir/Refer.pyc
-share/gnome/pybliographer/Pyblio/ConfDir/Refer.pyo
-share/gnome/pybliographer/Pyblio/Config.py
-share/gnome/pybliographer/Pyblio/Config.pyc
-share/gnome/pybliographer/Pyblio/Config.pyo
-share/gnome/pybliographer/Pyblio/Connector.py
-share/gnome/pybliographer/Pyblio/Connector.pyc
-share/gnome/pybliographer/Pyblio/Connector.pyo
-share/gnome/pybliographer/Pyblio/Exceptions.py
-share/gnome/pybliographer/Pyblio/Exceptions.pyc
-share/gnome/pybliographer/Pyblio/Exceptions.pyo
-share/gnome/pybliographer/Pyblio/Fields.py
-share/gnome/pybliographer/Pyblio/Fields.pyc
-share/gnome/pybliographer/Pyblio/Fields.pyo
-share/gnome/pybliographer/Pyblio/Format/BibTeX.py
-share/gnome/pybliographer/Pyblio/Format/BibTeX.pyc
-share/gnome/pybliographer/Pyblio/Format/BibTeX.pyo
-share/gnome/pybliographer/Pyblio/Format/Medline.py
-share/gnome/pybliographer/Pyblio/Format/Medline.pyc
-share/gnome/pybliographer/Pyblio/Format/Medline.pyo
-share/gnome/pybliographer/Pyblio/Format/Ovid.py
-share/gnome/pybliographer/Pyblio/Format/Ovid.pyc
-share/gnome/pybliographer/Pyblio/Format/Ovid.pyo
-share/gnome/pybliographer/Pyblio/Format/OvidLike.py
-share/gnome/pybliographer/Pyblio/Format/OvidLike.pyc
-share/gnome/pybliographer/Pyblio/Format/OvidLike.pyo
-share/gnome/pybliographer/Pyblio/Format/Refer.py
-share/gnome/pybliographer/Pyblio/Format/Refer.pyc
-share/gnome/pybliographer/Pyblio/Format/Refer.pyo
-share/gnome/pybliographer/Pyblio/Format/__init__.py
-share/gnome/pybliographer/Pyblio/Format/__init__.pyc
-share/gnome/pybliographer/Pyblio/Format/__init__.pyo
-share/gnome/pybliographer/Pyblio/Format/isifile.py
-share/gnome/pybliographer/Pyblio/Format/isifile.pyc
-share/gnome/pybliographer/Pyblio/Format/isifile.pyo
-share/gnome/pybliographer/Pyblio/Formatter.py
-share/gnome/pybliographer/Pyblio/Formatter.pyc
-share/gnome/pybliographer/Pyblio/Formatter.pyo
-share/gnome/pybliographer/Pyblio/GnomeUI/Config.py
-share/gnome/pybliographer/Pyblio/GnomeUI/Config.pyc
-share/gnome/pybliographer/Pyblio/GnomeUI/Config.pyo
-share/gnome/pybliographer/Pyblio/GnomeUI/Document.py
-share/gnome/pybliographer/Pyblio/GnomeUI/Document.pyc
-share/gnome/pybliographer/Pyblio/GnomeUI/Document.pyo
-share/gnome/pybliographer/Pyblio/GnomeUI/Editor.py
-share/gnome/pybliographer/Pyblio/GnomeUI/Editor.pyc
-share/gnome/pybliographer/Pyblio/GnomeUI/Editor.pyo
-share/gnome/pybliographer/Pyblio/GnomeUI/Entry.py
-share/gnome/pybliographer/Pyblio/GnomeUI/Entry.pyc
-share/gnome/pybliographer/Pyblio/GnomeUI/Entry.pyo
-share/gnome/pybliographer/Pyblio/GnomeUI/Fields.py
-share/gnome/pybliographer/Pyblio/GnomeUI/Fields.pyc
-share/gnome/pybliographer/Pyblio/GnomeUI/Fields.pyo
-share/gnome/pybliographer/Pyblio/GnomeUI/FieldsInfo.py
-share/gnome/pybliographer/Pyblio/GnomeUI/FieldsInfo.pyc
-share/gnome/pybliographer/Pyblio/GnomeUI/FieldsInfo.pyo
-share/gnome/pybliographer/Pyblio/GnomeUI/FileSelector.py
-share/gnome/pybliographer/Pyblio/GnomeUI/FileSelector.pyc
-share/gnome/pybliographer/Pyblio/GnomeUI/FileSelector.pyo
-share/gnome/pybliographer/Pyblio/GnomeUI/Format.py
-share/gnome/pybliographer/Pyblio/GnomeUI/Format.pyc
-share/gnome/pybliographer/Pyblio/GnomeUI/Format.pyo
-share/gnome/pybliographer/Pyblio/GnomeUI/Index.py
-share/gnome/pybliographer/Pyblio/GnomeUI/Index.pyc
-share/gnome/pybliographer/Pyblio/GnomeUI/Index.pyo
-share/gnome/pybliographer/Pyblio/GnomeUI/Mime.py
-share/gnome/pybliographer/Pyblio/GnomeUI/Mime.pyc
-share/gnome/pybliographer/Pyblio/GnomeUI/Mime.pyo
-share/gnome/pybliographer/Pyblio/GnomeUI/Pybliographic.py
-share/gnome/pybliographer/Pyblio/GnomeUI/Pybliographic.pyc
-share/gnome/pybliographer/Pyblio/GnomeUI/Pybliographic.pyo
-share/gnome/pybliographer/Pyblio/GnomeUI/Search.py
-share/gnome/pybliographer/Pyblio/GnomeUI/Search.pyc
-share/gnome/pybliographer/Pyblio/GnomeUI/Search.pyo
-share/gnome/pybliographer/Pyblio/GnomeUI/Sort.py
-share/gnome/pybliographer/Pyblio/GnomeUI/Sort.pyc
-share/gnome/pybliographer/Pyblio/GnomeUI/Sort.pyo
-share/gnome/pybliographer/Pyblio/GnomeUI/Utils.py
-share/gnome/pybliographer/Pyblio/GnomeUI/Utils.pyc
-share/gnome/pybliographer/Pyblio/GnomeUI/Utils.pyo
-share/gnome/pybliographer/Pyblio/GnomeUI/__init__.py
-share/gnome/pybliographer/Pyblio/GnomeUI/__init__.pyc
-share/gnome/pybliographer/Pyblio/GnomeUI/__init__.pyo
-share/gnome/pybliographer/Pyblio/Help.py
-share/gnome/pybliographer/Pyblio/Help.pyc
-share/gnome/pybliographer/Pyblio/Help.pyo
-share/gnome/pybliographer/Pyblio/Iterator.py
-share/gnome/pybliographer/Pyblio/Iterator.pyc
-share/gnome/pybliographer/Pyblio/Iterator.pyo
-share/gnome/pybliographer/Pyblio/Key.py
-share/gnome/pybliographer/Pyblio/Key.pyc
-share/gnome/pybliographer/Pyblio/Key.pyo
-share/gnome/pybliographer/Pyblio/LyX.py
-share/gnome/pybliographer/Pyblio/LyX.pyc
-share/gnome/pybliographer/Pyblio/LyX.pyo
-share/gnome/pybliographer/Pyblio/Open.py
-share/gnome/pybliographer/Pyblio/Open.pyc
-share/gnome/pybliographer/Pyblio/Open.pyo
-share/gnome/pybliographer/Pyblio/Output/LaTeX.py
-share/gnome/pybliographer/Pyblio/Output/LaTeX.pyc
-share/gnome/pybliographer/Pyblio/Output/LaTeX.pyo
-share/gnome/pybliographer/Pyblio/Output/__init__.py
-share/gnome/pybliographer/Pyblio/Output/__init__.pyc
-share/gnome/pybliographer/Pyblio/Output/__init__.pyo
-share/gnome/pybliographer/Pyblio/Output/html.py
-share/gnome/pybliographer/Pyblio/Output/html.pyc
-share/gnome/pybliographer/Pyblio/Output/html.pyo
-share/gnome/pybliographer/Pyblio/Output/latexutils.py
-share/gnome/pybliographer/Pyblio/Output/latexutils.pyc
-share/gnome/pybliographer/Pyblio/Output/latexutils.pyo
-share/gnome/pybliographer/Pyblio/Output/raw.py
-share/gnome/pybliographer/Pyblio/Output/raw.pyc
-share/gnome/pybliographer/Pyblio/Output/raw.pyo
-share/gnome/pybliographer/Pyblio/Output/text.py
-share/gnome/pybliographer/Pyblio/Output/text.pyc
-share/gnome/pybliographer/Pyblio/Output/text.pyo
-share/gnome/pybliographer/Pyblio/Search.py
-share/gnome/pybliographer/Pyblio/Search.pyc
-share/gnome/pybliographer/Pyblio/Search.pyo
-share/gnome/pybliographer/Pyblio/Selection.py
-share/gnome/pybliographer/Pyblio/Selection.pyc
-share/gnome/pybliographer/Pyblio/Selection.pyo
-share/gnome/pybliographer/Pyblio/Sort.py
-share/gnome/pybliographer/Pyblio/Sort.pyc
-share/gnome/pybliographer/Pyblio/Sort.pyo
-share/gnome/pybliographer/Pyblio/Style/Generic.py
-share/gnome/pybliographer/Pyblio/Style/Generic.pyc
-share/gnome/pybliographer/Pyblio/Style/Generic.pyo
-share/gnome/pybliographer/Pyblio/Style/Parser.py
-share/gnome/pybliographer/Pyblio/Style/Parser.pyc
-share/gnome/pybliographer/Pyblio/Style/Parser.pyo
-share/gnome/pybliographer/Pyblio/Style/Utils.py
-share/gnome/pybliographer/Pyblio/Style/Utils.pyc
-share/gnome/pybliographer/Pyblio/Style/Utils.pyo
-share/gnome/pybliographer/Pyblio/Style/apa4e.py
-share/gnome/pybliographer/Pyblio/Style/apa4e.pyc
-share/gnome/pybliographer/Pyblio/Style/apa4e.pyo
-share/gnome/pybliographer/Pyblio/Style/__init__.py
-share/gnome/pybliographer/Pyblio/Style/__init__.pyc
-share/gnome/pybliographer/Pyblio/Style/__init__.pyo
-share/gnome/pybliographer/Pyblio/TextUI.py
-share/gnome/pybliographer/Pyblio/TextUI.pyc
-share/gnome/pybliographer/Pyblio/TextUI.pyo
-share/gnome/pybliographer/Pyblio/Types.py
-share/gnome/pybliographer/Pyblio/Types.pyc
-share/gnome/pybliographer/Pyblio/Types.pyo
-share/gnome/pybliographer/Pyblio/Utils.py
-share/gnome/pybliographer/Pyblio/Utils.pyc
-share/gnome/pybliographer/Pyblio/Utils.pyo
-share/gnome/pybliographer/Pyblio/__init__.py
-share/gnome/pybliographer/Pyblio/__init__.pyc
-share/gnome/pybliographer/Pyblio/__init__.pyo
-share/gnome/pybliographer/Pyblio/recode.py
-share/gnome/pybliographer/Pyblio/recode.pyc
-share/gnome/pybliographer/Pyblio/recode.pyo
-share/gnome/pybliographer/Pyblio/version.py
-share/gnome/pybliographer/Pyblio/version.pyc
-share/gnome/pybliographer/Pyblio/version.pyo
-share/gnome/pybliographer/Styles/Abbrev.xml
-share/gnome/pybliographer/Styles/Alpha.xml
-share/gnome/pybliographer/Styles/apa4e.xml
-share/gnome/pybliographer/Styles/bibstyle.dtd
-share/gnome/pybliographer/Pyblio/Query.py
-share/gnome/pybliographer/Pyblio/Query.pyc
-share/gnome/pybliographer/Pyblio/Query.pyo
-share/gnome/pybliographer/pybcheck.py
-share/gnome/pybliographer/pybcheck.pyc
-share/gnome/pybliographer/pybcheck.pyo
-share/gnome/pybliographer/pybcompact.py
-share/gnome/pybliographer/pybcompact.pyc
-share/gnome/pybliographer/pybcompact.pyo
-share/gnome/pybliographer/pybconvert.py
-share/gnome/pybliographer/pybconvert.pyc
-share/gnome/pybliographer/pybconvert.pyo
-share/gnome/pybliographer/pybformat.py
-share/gnome/pybliographer/pybformat.pyc
-share/gnome/pybliographer/pybformat.pyo
-share/gnome/pybliographer/pybliographic.py
-share/gnome/pybliographer/pybliographic.pyc
-share/gnome/pybliographer/pybliographic.pyo
-share/gnome/pybliographer/pybrc.py
-share/gnome/pybliographer/pybrc.pyc
-share/gnome/pybliographer/pybrc.pyo
-share/gnome/pybliographer/pybtex.py
-share/gnome/pybliographer/pybtex.pyc
-share/gnome/pybliographer/pybtex.pyo
+share/mime-info/pybliographic.keys
+share/mime-info/pybliographic.mime
+share/pixmaps/pybliographic-logo.png
+share/pixmaps/pybliographic.png
+share/pybliographer/Pyblio/Autoload.py
+share/pybliographer/Pyblio/Autoload.pyc
+share/pybliographer/Pyblio/Autoload.pyo
+share/pybliographer/Pyblio/Base.py
+share/pybliographer/Pyblio/Base.pyc
+share/pybliographer/Pyblio/Base.pyo
+share/pybliographer/Pyblio/ConfDir/Base.py
+share/pybliographer/Pyblio/ConfDir/Base.pyc
+share/pybliographer/Pyblio/ConfDir/Base.pyo
+share/pybliographer/Pyblio/ConfDir/BibTeX+.py
+share/pybliographer/Pyblio/ConfDir/BibTeX+.pyc
+share/pybliographer/Pyblio/ConfDir/BibTeX+.pyo
+share/pybliographer/Pyblio/ConfDir/BibTeX.py
+share/pybliographer/Pyblio/ConfDir/BibTeX.pyc
+share/pybliographer/Pyblio/ConfDir/BibTeX.pyo
+share/pybliographer/Pyblio/ConfDir/Gnome.py
+share/pybliographer/Pyblio/ConfDir/Gnome.pyc
+share/pybliographer/Pyblio/ConfDir/Gnome.pyo
+share/pybliographer/Pyblio/ConfDir/GnomeUI.py
+share/pybliographer/Pyblio/ConfDir/GnomeUI.pyc
+share/pybliographer/Pyblio/ConfDir/GnomeUI.pyo
+share/pybliographer/Pyblio/ConfDir/Medline.py
+share/pybliographer/Pyblio/ConfDir/Medline.pyc
+share/pybliographer/Pyblio/ConfDir/Medline.pyo
+share/pybliographer/Pyblio/ConfDir/Ovid.py
+share/pybliographer/Pyblio/ConfDir/Ovid.pyc
+share/pybliographer/Pyblio/ConfDir/Ovid.pyo
+share/pybliographer/Pyblio/ConfDir/Refer.py
+share/pybliographer/Pyblio/ConfDir/Refer.pyc
+share/pybliographer/Pyblio/ConfDir/Refer.pyo
+share/pybliographer/Pyblio/Config.py
+share/pybliographer/Pyblio/Config.pyc
+share/pybliographer/Pyblio/Config.pyo
+share/pybliographer/Pyblio/Connector.py
+share/pybliographer/Pyblio/Connector.pyc
+share/pybliographer/Pyblio/Connector.pyo
+share/pybliographer/Pyblio/Exceptions.py
+share/pybliographer/Pyblio/Exceptions.pyc
+share/pybliographer/Pyblio/Exceptions.pyo
+share/pybliographer/Pyblio/Fields.py
+share/pybliographer/Pyblio/Fields.pyc
+share/pybliographer/Pyblio/Fields.pyo
+share/pybliographer/Pyblio/Format/BibTeX.py
+share/pybliographer/Pyblio/Format/BibTeX.pyc
+share/pybliographer/Pyblio/Format/BibTeX.pyo
+share/pybliographer/Pyblio/Format/Medline.py
+share/pybliographer/Pyblio/Format/Medline.pyc
+share/pybliographer/Pyblio/Format/Medline.pyo
+share/pybliographer/Pyblio/Format/Ovid.py
+share/pybliographer/Pyblio/Format/Ovid.pyc
+share/pybliographer/Pyblio/Format/Ovid.pyo
+share/pybliographer/Pyblio/Format/OvidLike.py
+share/pybliographer/Pyblio/Format/OvidLike.pyc
+share/pybliographer/Pyblio/Format/OvidLike.pyo
+share/pybliographer/Pyblio/Format/Refer.py
+share/pybliographer/Pyblio/Format/Refer.pyc
+share/pybliographer/Pyblio/Format/Refer.pyo
+share/pybliographer/Pyblio/Format/__init__.py
+share/pybliographer/Pyblio/Format/__init__.pyc
+share/pybliographer/Pyblio/Format/__init__.pyo
+share/pybliographer/Pyblio/Format/isifile.py
+share/pybliographer/Pyblio/Format/isifile.pyc
+share/pybliographer/Pyblio/Format/isifile.pyo
+share/pybliographer/Pyblio/Formatter.py
+share/pybliographer/Pyblio/Formatter.pyc
+share/pybliographer/Pyblio/Formatter.pyo
+share/pybliographer/Pyblio/GnomeUI/Config.py
+share/pybliographer/Pyblio/GnomeUI/Config.pyc
+share/pybliographer/Pyblio/GnomeUI/Config.pyo
+share/pybliographer/Pyblio/GnomeUI/Document.py
+share/pybliographer/Pyblio/GnomeUI/Document.pyc
+share/pybliographer/Pyblio/GnomeUI/Document.pyo
+share/pybliographer/Pyblio/GnomeUI/Editor.py
+share/pybliographer/Pyblio/GnomeUI/Editor.pyc
+share/pybliographer/Pyblio/GnomeUI/Editor.pyo
+share/pybliographer/Pyblio/GnomeUI/Entry.py
+share/pybliographer/Pyblio/GnomeUI/Entry.pyc
+share/pybliographer/Pyblio/GnomeUI/Entry.pyo
+share/pybliographer/Pyblio/GnomeUI/Fields.py
+share/pybliographer/Pyblio/GnomeUI/Fields.pyc
+share/pybliographer/Pyblio/GnomeUI/Fields.pyo
+share/pybliographer/Pyblio/GnomeUI/FieldsInfo.py
+share/pybliographer/Pyblio/GnomeUI/FieldsInfo.pyc
+share/pybliographer/Pyblio/GnomeUI/FieldsInfo.pyo
+share/pybliographer/Pyblio/GnomeUI/FileSelector.py
+share/pybliographer/Pyblio/GnomeUI/FileSelector.pyc
+share/pybliographer/Pyblio/GnomeUI/FileSelector.pyo
+share/pybliographer/Pyblio/GnomeUI/Format.py
+share/pybliographer/Pyblio/GnomeUI/Format.pyc
+share/pybliographer/Pyblio/GnomeUI/Format.pyo
+share/pybliographer/Pyblio/GnomeUI/Index.py
+share/pybliographer/Pyblio/GnomeUI/Index.pyc
+share/pybliographer/Pyblio/GnomeUI/Index.pyo
+share/pybliographer/Pyblio/GnomeUI/Mime.py
+share/pybliographer/Pyblio/GnomeUI/Mime.pyc
+share/pybliographer/Pyblio/GnomeUI/Mime.pyo
+share/pybliographer/Pyblio/GnomeUI/Pybliographic.py
+share/pybliographer/Pyblio/GnomeUI/Pybliographic.pyc
+share/pybliographer/Pyblio/GnomeUI/Pybliographic.pyo
+share/pybliographer/Pyblio/GnomeUI/Search.py
+share/pybliographer/Pyblio/GnomeUI/Search.pyc
+share/pybliographer/Pyblio/GnomeUI/Search.pyo
+share/pybliographer/Pyblio/GnomeUI/Sort.py
+share/pybliographer/Pyblio/GnomeUI/Sort.pyc
+share/pybliographer/Pyblio/GnomeUI/Sort.pyo
+share/pybliographer/Pyblio/GnomeUI/Utils.py
+share/pybliographer/Pyblio/GnomeUI/Utils.pyc
+share/pybliographer/Pyblio/GnomeUI/Utils.pyo
+share/pybliographer/Pyblio/GnomeUI/__init__.py
+share/pybliographer/Pyblio/GnomeUI/__init__.pyc
+share/pybliographer/Pyblio/GnomeUI/__init__.pyo
+share/pybliographer/Pyblio/Help.py
+share/pybliographer/Pyblio/Help.pyc
+share/pybliographer/Pyblio/Help.pyo
+share/pybliographer/Pyblio/Iterator.py
+share/pybliographer/Pyblio/Iterator.pyc
+share/pybliographer/Pyblio/Iterator.pyo
+share/pybliographer/Pyblio/Key.py
+share/pybliographer/Pyblio/Key.pyc
+share/pybliographer/Pyblio/Key.pyo
+share/pybliographer/Pyblio/LyX.py
+share/pybliographer/Pyblio/LyX.pyc
+share/pybliographer/Pyblio/LyX.pyo
+share/pybliographer/Pyblio/Open.py
+share/pybliographer/Pyblio/Open.pyc
+share/pybliographer/Pyblio/Open.pyo
+share/pybliographer/Pyblio/Output/LaTeX.py
+share/pybliographer/Pyblio/Output/LaTeX.pyc
+share/pybliographer/Pyblio/Output/LaTeX.pyo
+share/pybliographer/Pyblio/Output/__init__.py
+share/pybliographer/Pyblio/Output/__init__.pyc
+share/pybliographer/Pyblio/Output/__init__.pyo
+share/pybliographer/Pyblio/Output/html.py
+share/pybliographer/Pyblio/Output/html.pyc
+share/pybliographer/Pyblio/Output/html.pyo
+share/pybliographer/Pyblio/Output/latexutils.py
+share/pybliographer/Pyblio/Output/latexutils.pyc
+share/pybliographer/Pyblio/Output/latexutils.pyo
+share/pybliographer/Pyblio/Output/raw.py
+share/pybliographer/Pyblio/Output/raw.pyc
+share/pybliographer/Pyblio/Output/raw.pyo
+share/pybliographer/Pyblio/Output/text.py
+share/pybliographer/Pyblio/Output/text.pyc
+share/pybliographer/Pyblio/Output/text.pyo
+share/pybliographer/Pyblio/Search.py
+share/pybliographer/Pyblio/Search.pyc
+share/pybliographer/Pyblio/Search.pyo
+share/pybliographer/Pyblio/Selection.py
+share/pybliographer/Pyblio/Selection.pyc
+share/pybliographer/Pyblio/Selection.pyo
+share/pybliographer/Pyblio/Sort.py
+share/pybliographer/Pyblio/Sort.pyc
+share/pybliographer/Pyblio/Sort.pyo
+share/pybliographer/Pyblio/Style/Generic.py
+share/pybliographer/Pyblio/Style/Generic.pyc
+share/pybliographer/Pyblio/Style/Generic.pyo
+share/pybliographer/Pyblio/Style/Parser.py
+share/pybliographer/Pyblio/Style/Parser.pyc
+share/pybliographer/Pyblio/Style/Parser.pyo
+share/pybliographer/Pyblio/Style/Utils.py
+share/pybliographer/Pyblio/Style/Utils.pyc
+share/pybliographer/Pyblio/Style/Utils.pyo
+share/pybliographer/Pyblio/Style/apa4e.py
+share/pybliographer/Pyblio/Style/apa4e.pyc
+share/pybliographer/Pyblio/Style/apa4e.pyo
+share/pybliographer/Pyblio/Style/__init__.py
+share/pybliographer/Pyblio/Style/__init__.pyc
+share/pybliographer/Pyblio/Style/__init__.pyo
+share/pybliographer/Pyblio/TextUI.py
+share/pybliographer/Pyblio/TextUI.pyc
+share/pybliographer/Pyblio/TextUI.pyo
+share/pybliographer/Pyblio/Types.py
+share/pybliographer/Pyblio/Types.pyc
+share/pybliographer/Pyblio/Types.pyo
+share/pybliographer/Pyblio/Utils.py
+share/pybliographer/Pyblio/Utils.pyc
+share/pybliographer/Pyblio/Utils.pyo
+share/pybliographer/Pyblio/__init__.py
+share/pybliographer/Pyblio/__init__.pyc
+share/pybliographer/Pyblio/__init__.pyo
+share/pybliographer/Pyblio/recode.py
+share/pybliographer/Pyblio/recode.pyc
+share/pybliographer/Pyblio/recode.pyo
+share/pybliographer/Pyblio/version.py
+share/pybliographer/Pyblio/version.pyc
+share/pybliographer/Pyblio/version.pyo
+share/pybliographer/Styles/Abbrev.xml
+share/pybliographer/Styles/Alpha.xml
+share/pybliographer/Styles/apa4e.xml
+share/pybliographer/Styles/bibstyle.dtd
+share/pybliographer/Pyblio/Query.py
+share/pybliographer/Pyblio/Query.pyc
+share/pybliographer/Pyblio/Query.pyo
+share/pybliographer/pybcheck.py
+share/pybliographer/pybcheck.pyc
+share/pybliographer/pybcheck.pyo
+share/pybliographer/pybcompact.py
+share/pybliographer/pybcompact.pyc
+share/pybliographer/pybcompact.pyo
+share/pybliographer/pybconvert.py
+share/pybliographer/pybconvert.pyc
+share/pybliographer/pybconvert.pyo
+share/pybliographer/pybformat.py
+share/pybliographer/pybformat.pyc
+share/pybliographer/pybformat.pyo
+share/pybliographer/pybliographic.py
+share/pybliographer/pybliographic.pyc
+share/pybliographer/pybliographic.pyo
+share/pybliographer/pybrc.py
+share/pybliographer/pybrc.pyc
+share/pybliographer/pybrc.pyo
+share/pybliographer/pybtex.py
+share/pybliographer/pybtex.pyc
+share/pybliographer/pybtex.pyo
 share/locale/az/LC_MESSAGES/pybliographer.mo
 share/locale/da/LC_MESSAGES/pybliographer.mo
 share/locale/de/LC_MESSAGES/pybliographer.mo
@@ -328,15 +328,15 @@ share/locale/ru/LC_MESSAGES/pybliographer.mo
 share/locale/sv/LC_MESSAGES/pybliographer.mo
 share/locale/tr/LC_MESSAGES/pybliographer.mo
 share/locale/uk/LC_MESSAGES/pybliographer.mo
-@unexec rm -f %D/share/gnome/pybliographer/pybrc.old
-@dirrm share/gnome/pybliographer/Styles
-@dirrm share/gnome/pybliographer/Pyblio/Style
-@dirrm share/gnome/pybliographer/Pyblio/Output
-@dirrm share/gnome/pybliographer/Pyblio/GnomeUI
-@dirrm share/gnome/pybliographer/Pyblio/Format
-@dirrm share/gnome/pybliographer/Pyblio/ConfDir
-@dirrm share/gnome/pybliographer/Pyblio
-@dirrm share/gnome/pybliographer
+@unexec rm -f %D/share/pybliographer/pybrc.old
+@dirrm share/pybliographer/Styles
+@dirrm share/pybliographer/Pyblio/Style
+@dirrm share/pybliographer/Pyblio/Output
+@dirrm share/pybliographer/Pyblio/GnomeUI
+@dirrm share/pybliographer/Pyblio/Format
+@dirrm share/pybliographer/Pyblio/ConfDir
+@dirrm share/pybliographer/Pyblio
+@dirrm share/pybliographer
 @dirrm share/gnome/help/pybliographic/it/stylesheet-images
 @dirrm share/gnome/help/pybliographic/it
 @dirrm share/gnome/help/pybliographic/C/stylesheet-images
diff --git a/misc/quick-lounge-applet/Makefile b/misc/quick-lounge-applet/Makefile
index 393b398d2ade..346bd3206c91 100644
--- a/misc/quick-lounge-applet/Makefile
+++ b/misc/quick-lounge-applet/Makefile
@@ -3,12 +3,12 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/misc/quick-lounge-applet/Makefile,v 1.8 2005/09/18 13:53:05 kwm Exp $
+#   $MCom: ports/misc/quick-lounge-applet/Makefile,v 1.11 2007/05/19 21:36:14 marcus Exp $
 #
 
 PORTNAME=	quick-lounge-applet
 PORTVERSION=	2.12.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	misc gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.12
diff --git a/misc/quick-lounge-applet/pkg-plist b/misc/quick-lounge-applet/pkg-plist
index e206c256f8ab..b7fe7f01d43b 100644
--- a/misc/quick-lounge-applet/pkg-plist
+++ b/misc/quick-lounge-applet/pkg-plist
@@ -1,6 +1,6 @@
 libdata/bonobo/servers/GNOME_QuickLoungeApplet_Factory.server
 libexec/quick-lounge-applet
-share/gnome/gnome-2.0/ui/GNOME_QuickLoungeApplet.xml
+share/gnome-2.0/ui/GNOME_QuickLoungeApplet.xml
 share/gnome/help/quick-lounge/C/figures/quick-lounge_down.png
 share/gnome/help/quick-lounge/C/figures/quick-lounge_end.png
 share/gnome/help/quick-lounge/C/figures/quick-lounge_start.png
@@ -88,18 +88,18 @@ share/gnome/help/quick-lounge/zh_TW/figures/quick-lounge_up.png
 share/gnome/help/quick-lounge/zh_TW/figures/quick-lounge_window.png
 share/gnome/help/quick-lounge/zh_TW/legal.xml
 share/gnome/help/quick-lounge/zh_TW/quick-lounge.xml
-share/gnome/omf/quick-lounge-applet/quick-lounge-C.omf
-share/gnome/omf/quick-lounge-applet/quick-lounge-de.omf
-share/gnome/omf/quick-lounge-applet/quick-lounge-es.omf
-share/gnome/omf/quick-lounge-applet/quick-lounge-fr.omf
-share/gnome/omf/quick-lounge-applet/quick-lounge-it.omf
-share/gnome/omf/quick-lounge-applet/quick-lounge-ja.omf
-share/gnome/omf/quick-lounge-applet/quick-lounge-ko.omf
-share/gnome/omf/quick-lounge-applet/quick-lounge-sv.omf
-share/gnome/omf/quick-lounge-applet/quick-lounge-zh_CN.omf
-share/gnome/omf/quick-lounge-applet/quick-lounge-zh_HK.omf
-share/gnome/omf/quick-lounge-applet/quick-lounge-zh_TW.omf
-share/gnome/quick-lounge-applet/glade/quick-lounge.glade
+share/omf/quick-lounge-applet/quick-lounge-C.omf
+share/omf/quick-lounge-applet/quick-lounge-de.omf
+share/omf/quick-lounge-applet/quick-lounge-es.omf
+share/omf/quick-lounge-applet/quick-lounge-fr.omf
+share/omf/quick-lounge-applet/quick-lounge-it.omf
+share/omf/quick-lounge-applet/quick-lounge-ja.omf
+share/omf/quick-lounge-applet/quick-lounge-ko.omf
+share/omf/quick-lounge-applet/quick-lounge-sv.omf
+share/omf/quick-lounge-applet/quick-lounge-zh_CN.omf
+share/omf/quick-lounge-applet/quick-lounge-zh_HK.omf
+share/omf/quick-lounge-applet/quick-lounge-zh_TW.omf
+share/quick-lounge-applet/glade/quick-lounge.glade
 share/icons/hicolor/48x48/apps/quick-lounge-applet.png
 share/locale/ar/LC_MESSAGES/quick-lounge-applet.mo
 share/locale/az/LC_MESSAGES/quick-lounge-applet.mo
@@ -144,9 +144,9 @@ share/locale/zh_CN/LC_MESSAGES/quick-lounge-applet.mo
 @dirrmtry share/locale/rw
 @dirrmtry share/locale/dz/LC_MESSAGES
 @dirrmtry share/locale/dz
-@dirrm share/gnome/quick-lounge-applet/glade
-@dirrm share/gnome/quick-lounge-applet
-@dirrm share/gnome/omf/quick-lounge-applet
+@dirrm share/quick-lounge-applet/glade
+@dirrm share/quick-lounge-applet
+@dirrm share/omf/quick-lounge-applet
 @dirrm share/gnome/help/quick-lounge/zh_TW/figures
 @dirrm share/gnome/help/quick-lounge/zh_TW
 @dirrm share/gnome/help/quick-lounge/zh_HK/figures
diff --git a/misc/shared-mime-info/Makefile b/misc/shared-mime-info/Makefile
index 98ace38e9e75..3302ea452dde 100644
--- a/misc/shared-mime-info/Makefile
+++ b/misc/shared-mime-info/Makefile
@@ -3,9 +3,12 @@
 # Whom:                olgeni@FreeBSD.org
 #
 # $FreeBSD$
+#   $MCom: ports/misc/shared-mime-info/Makefile,v 1.11 2007/08/09 19:33:41 marcus Exp $
+#
 
 PORTNAME=	shared-mime-info
 PORTVERSION=	0.22
+PORTREVISION=	1
 CATEGORIES=	misc gnome
 MASTER_SITES=	http://people.freedesktop.org/~hadess/
 
@@ -24,10 +27,8 @@ MAN1=		update-mime-database.1
 
 PKGINSTALL=	${WRKDIR}/pkg-install
 
-MIMEDIRS=	${LOCALBASE}/share/gnome/mime \
-		${LOCALBASE}/share/mime \
-		${PREFIX}/share/mime \
-		/usr/share/mime
+MIMEDIRS=	${LOCALBASE}/share/mime \
+		${PREFIX}/share/mime
 MIMESUBDIRS=	application audio image inode message model multipart \
 		packages text video
 
diff --git a/misc/shared-mime-info/files/patch-Makefile.in b/misc/shared-mime-info/files/patch-Makefile.in
index 4566071c59e5..6adf72809f1c 100644
--- a/misc/shared-mime-info/files/patch-Makefile.in
+++ b/misc/shared-mime-info/files/patch-Makefile.in
@@ -1,19 +1,10 @@
---- Makefile.in.orig	Sat Feb 10 04:50:08 2007
-+++ Makefile.in	Sat Feb 10 04:52:30 2007
-@@ -251,7 +251,7 @@ EXTRA_DIST = \
- 
- CLEANFILES = freedesktop.org.xml po/stamp-it
- DISTCLEANFILES = intltool-extract intltool-merge intltool-update
--pkgconfigdir = $(datadir)/pkgconfig
-+pkgconfigdir = $(prefix)/libdata/pkgconfig
- pkgconfig_DATA = shared-mime-info.pc
- all: config.h
- 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
-@@ -871,7 +871,11 @@ $(pkgconfig_DATA): config.status
+--- Makefile.in.orig	Fri Apr 27 16:56:45 2007
++++ Makefile.in	Fri Apr 27 16:57:14 2007
+@@ -901,7 +901,11 @@ $(pkgconfig_DATA): config.status
  @INTLTOOL_DESKTOP_RULE@
  
  install-data-hook: 
--@ENABLE_UPDATE_MIMEDB_TRUE@	$(DESTDIR)"$(bindir)/update-mime-database" -V "$(DESTDIR)$(prefix)/share/mime"
+-@ENABLE_UPDATE_MIMEDB_TRUE@	$(DESTDIR)"$(bindir)/update-mime-database" -V "$(DESTDIR)$(datadir)/mime"
 +@ENABLE_UPDATE_MIMEDB_TRUE@	for mdir in %%MIMEDIRS%%; do \
 +@ENABLE_UPDATE_MIMEDB_TRUE@		if [ -d $${mdir} ]; then \
 +@ENABLE_UPDATE_MIMEDB_TRUE@			$(DESTDIR)"$(bindir)/update-mime-database" "$${mdir}" ; \
@@ -21,4 +12,4 @@
 +@ENABLE_UPDATE_MIMEDB_TRUE@	done
  
  uninstall-hook:
- 	for media in text application image audio inode video message model multipart; do rm -f "$(DESTDIR)$(prefix)/share/mime/$${media}/"*.xml; done
+ 	for media in text application image audio inode video message model multipart; do rm -f "$(DESTDIR)$(datadir)/mime/$${media}/"*.xml; done
diff --git a/misc/shared-mime-info/files/patch-update-mime-database.c b/misc/shared-mime-info/files/patch-update-mime-database.c
index bea38c5677ac..045f753d2035 100644
--- a/misc/shared-mime-info/files/patch-update-mime-database.c
+++ b/misc/shared-mime-info/files/patch-update-mime-database.c
@@ -1,5 +1,5 @@
 --- update-mime-database.c.orig	2007-06-27 15:46:53.000000000 -0400
-+++ update-mime-database.c	2007-08-09 15:21:39.000000000 -0400
++++ update-mime-database.c	2007-08-09 15:32:31.000000000 -0400
 @@ -445,7 +445,8 @@ static void remove_old(Type *type, xmlNo
  		}
  	}
@@ -15,7 +15,7 @@
  	env = getenv("XDG_DATA_DIRS");
  	if (!env)
 -		env = "/usr/local/share/"PATH_SEPARATOR"/usr/share/";
-+		env = "/usr/local/gnome/share/"PATH_SEPARATOR"/usr/local/share/"PATH_SEPARATOR"/usr/share/";
++		env = "/usr/local/share/";
  	dirs = g_strsplit(env, PATH_SEPARATOR, 0);
  	g_return_if_fail(dirs != NULL);
  	for (n = 0; dirs[n]; n++)
diff --git a/misc/terraform/Makefile b/misc/terraform/Makefile
index 118a60a4ecbe..a7023a8280ec 100644
--- a/misc/terraform/Makefile
+++ b/misc/terraform/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	terraform
 PORTVERSION=	0.9.0
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	misc gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -32,8 +32,6 @@ post-patch:
 		 s|#define  1|#define HAVE_LIB_TRIO 1|g ; \
 		 s|(HAVE_LIB_TRIO)||g" ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e "s|malloc\.h|stdlib.h|g" ${WRKSRC}/src/xmlsupport.c
-	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
-		's|@datadir@/gnome/|@datadir@/|g'
 
 post-install:
 .if !defined(NOPORTDOCS)
diff --git a/misc/terraform/files/patch-desktop-links::Makefile.in b/misc/terraform/files/patch-desktop-links::Makefile.in
index a279be1d90cf..f2a285ae6141 100644
--- a/misc/terraform/files/patch-desktop-links::Makefile.in
+++ b/misc/terraform/files/patch-desktop-links::Makefile.in
@@ -8,8 +8,8 @@
 -		$(INSTALL_DATA) Terraform.desktop $(GNOME_DATADIR)/gnome/apps/Graphics; \
 -		$(mkinstalldirs) $(GNOME_DATADIR)/gnome/ximian/Programs/Graphics; \
 -		$(INSTALL_DATA) Terraform.desktop $(GNOME_DATADIR)/gnome/ximian/Programs/Graphics; \
-+		$(mkinstalldirs) $(GNOME_DATADIR)/apps/Graphics; \
-+		$(INSTALL_DATA) Terraform.desktop $(GNOME_DATADIR)/apps/Graphics; \
++		$(mkinstalldirs) $(GNOME_DATADIR)/gnome/apps/Graphics; \
++		$(INSTALL_DATA) Terraform.desktop $(GNOME_DATADIR)/gnome/apps/Graphics; \
  		$(mkinstalldirs) $(GNOME_DATADIR)/pixmaps; \
  		$(INSTALL_DATA) terraform.png $(GNOME_DATADIR)/pixmaps; \
  	fi
diff --git a/misc/terraform/pkg-plist b/misc/terraform/pkg-plist
index 2ca313f9eaa1..a345881e718f 100644
--- a/misc/terraform/pkg-plist
+++ b/misc/terraform/pkg-plist
@@ -20,78 +20,78 @@ share/gnome/help/terraform/fr/index.html
 share/gnome/help/terraform/fr/templates.html
 share/gnome/help/terraform/fr/topic.dat
 share/gnome/help/terraform/fr/tutorial.html
-share/gnome/pixmaps/terraform.png
-share/gnome/pixmaps/terraform/add.xpm
-share/gnome/pixmaps/terraform/arrow.xpm
-share/gnome/pixmaps/terraform/circle.xpm
-share/gnome/pixmaps/terraform/crop.xpm
-share/gnome/pixmaps/terraform/die.xpm
-share/gnome/pixmaps/terraform/gnome-question.png
-share/gnome/pixmaps/terraform/rectangle.xpm
-share/gnome/pixmaps/terraform/replace.xpm
-share/gnome/pixmaps/terraform/seed.xpm
-share/gnome/pixmaps/terraform/subtract.xpm
-share/gnome/pixmaps/terraform/terraform_logo.xpm
-share/gnome/pixmaps/terraform/zoom.xpm
-share/gnome/terraform/image_maps/moon_moon.png
-share/gnome/terraform/image_maps/sky_test_320x180.tga
-share/gnome/terraform/include/atmospheres/earth_fog.inc
-share/gnome/terraform/include/atmospheres/earth_haze_fast.inc
-share/gnome/terraform/include/atmospheres/earth_haze_slow.inc
-share/gnome/terraform/include/atmospheres/fog_ground.inc
-share/gnome/terraform/include/atmospheres/rainbow.inc
-share/gnome/terraform/include/defaults.inc
-share/gnome/terraform/include/earth_textures/earth_canyon_landscape.inc
-share/gnome/terraform/include/earth_textures/earth_desert_landscape.inc
-share/gnome/terraform/include/earth_textures/earth_green_landscape.inc
-share/gnome/terraform/include/earth_textures/earth_mountain_landscape.inc
-share/gnome/terraform/include/generic_land.inc
-share/gnome/terraform/include/generic_river.inc
-share/gnome/terraform/include/river_texture.inc
-share/gnome/terraform/include/skies/earth_regular_sky.inc
-share/gnome/terraform/include/skies/earth_static_sky.inc
-share/gnome/terraform/include/skies/include/clouds_01.inc
-share/gnome/terraform/include/skies/include/clouds_02.inc
-share/gnome/terraform/include/skies/include/clouds_03.inc
-share/gnome/terraform/include/skies/include/clouds_04.inc
-share/gnome/terraform/include/skies/include/clouds_05.inc
-share/gnome/terraform/include/skies/include/clouds_06.inc
-share/gnome/terraform/include/skies/include/clouds_07.inc
-share/gnome/terraform/include/skies/include/lights_standard.inc
-share/gnome/terraform/include/skies/include/lights_toymodel.inc
-share/gnome/terraform/include/skies/include/skycolor_earth.inc
-share/gnome/terraform/include/skies/include/stars_01.inc
-share/gnome/terraform/include/skies/include/stars_02.inc
-share/gnome/terraform/include/skies/include/stars_03.inc
-share/gnome/terraform/include/skies/include/stars_04.inc
-share/gnome/terraform/include/skies/include/stars_05.inc
-share/gnome/terraform/include/skies/include/stars_06.inc
-share/gnome/terraform/include/skies/mapped_sky.inc
-share/gnome/terraform/include/water/earth_water.inc
-share/gnome/terraform/objects/fern.gif
-share/gnome/terraform/objects/fern.inc
-share/gnome/terraform/objects/monolith.inc
-share/gnome/terraform/objects/tree_1.inc
-share/gnome/terraform/objects/tree_2.inc
-share/gnome/terraform/objects/tree_3.inc
-share/gnome/terraform/objects/tree_4.gif
-share/gnome/terraform/objects/tree_4.inc
-share/gnome/terraform/objects/tree_5.gif
-share/gnome/terraform/objects/tree_5.inc
-share/gnome/terraform/objects/tree_6.gif
-share/gnome/terraform/objects/tree_6.inc
+share/pixmaps/terraform.png
+share/pixmaps/terraform/add.xpm
+share/pixmaps/terraform/arrow.xpm
+share/pixmaps/terraform/circle.xpm
+share/pixmaps/terraform/crop.xpm
+share/pixmaps/terraform/die.xpm
+share/pixmaps/terraform/gnome-question.png
+share/pixmaps/terraform/rectangle.xpm
+share/pixmaps/terraform/replace.xpm
+share/pixmaps/terraform/seed.xpm
+share/pixmaps/terraform/subtract.xpm
+share/pixmaps/terraform/terraform_logo.xpm
+share/pixmaps/terraform/zoom.xpm
+share/terraform/image_maps/moon_moon.png
+share/terraform/image_maps/sky_test_320x180.tga
+share/terraform/include/atmospheres/earth_fog.inc
+share/terraform/include/atmospheres/earth_haze_fast.inc
+share/terraform/include/atmospheres/earth_haze_slow.inc
+share/terraform/include/atmospheres/fog_ground.inc
+share/terraform/include/atmospheres/rainbow.inc
+share/terraform/include/defaults.inc
+share/terraform/include/earth_textures/earth_canyon_landscape.inc
+share/terraform/include/earth_textures/earth_desert_landscape.inc
+share/terraform/include/earth_textures/earth_green_landscape.inc
+share/terraform/include/earth_textures/earth_mountain_landscape.inc
+share/terraform/include/generic_land.inc
+share/terraform/include/generic_river.inc
+share/terraform/include/river_texture.inc
+share/terraform/include/skies/earth_regular_sky.inc
+share/terraform/include/skies/earth_static_sky.inc
+share/terraform/include/skies/include/clouds_01.inc
+share/terraform/include/skies/include/clouds_02.inc
+share/terraform/include/skies/include/clouds_03.inc
+share/terraform/include/skies/include/clouds_04.inc
+share/terraform/include/skies/include/clouds_05.inc
+share/terraform/include/skies/include/clouds_06.inc
+share/terraform/include/skies/include/clouds_07.inc
+share/terraform/include/skies/include/lights_standard.inc
+share/terraform/include/skies/include/lights_toymodel.inc
+share/terraform/include/skies/include/skycolor_earth.inc
+share/terraform/include/skies/include/stars_01.inc
+share/terraform/include/skies/include/stars_02.inc
+share/terraform/include/skies/include/stars_03.inc
+share/terraform/include/skies/include/stars_04.inc
+share/terraform/include/skies/include/stars_05.inc
+share/terraform/include/skies/include/stars_06.inc
+share/terraform/include/skies/mapped_sky.inc
+share/terraform/include/water/earth_water.inc
+share/terraform/objects/fern.gif
+share/terraform/objects/fern.inc
+share/terraform/objects/monolith.inc
+share/terraform/objects/tree_1.inc
+share/terraform/objects/tree_2.inc
+share/terraform/objects/tree_3.inc
+share/terraform/objects/tree_4.gif
+share/terraform/objects/tree_4.inc
+share/terraform/objects/tree_5.gif
+share/terraform/objects/tree_5.inc
+share/terraform/objects/tree_6.gif
+share/terraform/objects/tree_6.inc
 share/locale/fr/LC_MESSAGES/terraform.mo
 share/locale/nl/LC_MESSAGES/terraform.mo
-@dirrm share/gnome/terraform/objects
-@dirrm share/gnome/terraform/include/water
-@dirrm share/gnome/terraform/include/skies/include
-@dirrm share/gnome/terraform/include/skies
-@dirrm share/gnome/terraform/include/earth_textures
-@dirrm share/gnome/terraform/include/atmospheres
-@dirrm share/gnome/terraform/include
-@dirrm share/gnome/terraform/image_maps
-@dirrm share/gnome/terraform
-@dirrm share/gnome/pixmaps/terraform
+@dirrm share/terraform/objects
+@dirrm share/terraform/include/water
+@dirrm share/terraform/include/skies/include
+@dirrm share/terraform/include/skies
+@dirrm share/terraform/include/earth_textures
+@dirrm share/terraform/include/atmospheres
+@dirrm share/terraform/include
+@dirrm share/terraform/image_maps
+@dirrm share/terraform
+@dirrm share/pixmaps/terraform
 @dirrm share/gnome/help/terraform/fr
 @dirrm share/gnome/help/terraform/C
 @dirrm share/gnome/help/terraform
diff --git a/misc/uf-view/Makefile b/misc/uf-view/Makefile
index bcf7066439a3..349c0acfdbd8 100644
--- a/misc/uf-view/Makefile
+++ b/misc/uf-view/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	uf-view
 PORTVERSION=	2.4
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	misc
 MASTER_SITES=	http://www.hadess.net/files/software/uf-view/
 
diff --git a/misc/uf-view/pkg-plist b/misc/uf-view/pkg-plist
index 2a257159072b..9d7e91604679 100644
--- a/misc/uf-view/pkg-plist
+++ b/misc/uf-view/pkg-plist
@@ -1,15 +1,15 @@
 bin/uf-view
-share/gnome/applications/uf-view.desktop
-share/gnome/pixmaps/uf-view/gnome-uf-view.png
-share/gnome/pixmaps/uf-view/uf-logo.png
-share/gnome/uf-view/at.desktop
-share/gnome/uf-view/ch.desktop
-share/gnome/uf-view/lg.desktop
-share/gnome/uf-view/ft.desktop
-share/gnome/uf-view/uf.desktop
-share/gnome/uf-view/pa.desktop
-share/gnome/uf-view/pvp.desktop
-share/gnome/uf-view/sf.desktop
+share/applications/uf-view.desktop
+share/pixmaps/uf-view/gnome-uf-view.png
+share/pixmaps/uf-view/uf-logo.png
+share/uf-view/at.desktop
+share/uf-view/ch.desktop
+share/uf-view/lg.desktop
+share/uf-view/ft.desktop
+share/uf-view/uf.desktop
+share/uf-view/pa.desktop
+share/uf-view/pvp.desktop
+share/uf-view/sf.desktop
 share/locale/az/LC_MESSAGES/uf-view.mo
 share/locale/be/LC_MESSAGES/uf-view.mo
 share/locale/cs/LC_MESSAGES/uf-view.mo
@@ -34,5 +34,6 @@ share/locale/sv/LC_MESSAGES/uf-view.mo
 share/locale/vi/LC_MESSAGES/uf-view.mo
 share/locale/wa/LC_MESSAGES/uf-view.mo
 share/locale/zh_CN/LC_MESSAGES/uf-view.mo
-@dirrm share/gnome/pixmaps/uf-view
-@dirrm share/gnome/uf-view
+@dirrm share/pixmaps/uf-view
+@dirrm share/uf-view
+@dirrmtry share/applications
diff --git a/misc/xiphos/Makefile b/misc/xiphos/Makefile
index a478378f50f0..ac643d243e50 100644
--- a/misc/xiphos/Makefile
+++ b/misc/xiphos/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gnomesword
 PORTVERSION=	2.2.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	misc gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/misc/xiphos/files/patch-configure b/misc/xiphos/files/patch-configure
index e5971dfbb18b..2338d3377c15 100644
--- a/misc/xiphos/files/patch-configure
+++ b/misc/xiphos/files/patch-configure
@@ -114,15 +114,3 @@
  
  
  
-@@ -26461,9 +26461,9 @@
- packagedatadir=share/${PACKAGE}
- packagedocdir=share/doc/${PACKAGE}
- 
--packagepixmapsdir=share/pixmaps/${PACKAGE}
-+packagepixmapsdir=share/gnome/pixmaps/${PACKAGE}
- packagehelpdir=share/gnome/help/${PACKAGE}
--packagemenudir=share/applications
-+packagemenudir=share/gnome/applications
- 
- NO_PREFIX_PACKAGE_DATA_DIR="${packagedatadir}"
- 
diff --git a/misc/xiphos/pkg-plist b/misc/xiphos/pkg-plist
index 114dc9592e5a..cfc98df237b8 100644
--- a/misc/xiphos/pkg-plist
+++ b/misc/xiphos/pkg-plist
@@ -5,15 +5,15 @@ bin/gnomesword2
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/TODO
-share/gnome/applications/gnomesword.desktop
-share/gnome/gnomesword/bookmarks.glade
-share/gnome/gnomesword/editor_note.xml
-share/gnome/gnomesword/editor_studypad.xml
-share/gnome/gnomesword/logo.png
-share/gnome/gnomesword/module-manager.glade
-share/gnome/gnomesword/prefs.glade
-share/gnome/gnomesword/search-dialog.glade
-share/gnome/gnomesword/sword3.png
+share/applications/gnomesword.desktop
+share/gnomesword/bookmarks.glade
+share/gnomesword/editor_note.xml
+share/gnomesword/editor_studypad.xml
+share/gnomesword/logo.png
+share/gnomesword/module-manager.glade
+share/gnomesword/prefs.glade
+share/gnomesword/search-dialog.glade
+share/gnomesword/sword3.png
 share/gnome/help/gnomesword/C/authors.xml
 share/gnome/help/gnomesword/C/figures/first_start.png
 share/gnome/help/gnomesword/C/figures/interface.png
@@ -144,25 +144,25 @@ share/gnome/help/gnomesword/fr/preferences.xml
 share/gnome/help/gnomesword/fr/search.xml
 share/gnome/help/gnomesword/fr/start.xml
 share/gnome/help/gnomesword/fr/studypad.xml
-share/gnome/pixmaps/gnomesword/about.png
-share/gnome/pixmaps/gnomesword/dlg-un.png
-share/gnome/pixmaps/gnomesword/epiphany-bookmark-page.png
-share/gnome/pixmaps/gnomesword/epiphany-bookmarks.png
-share/gnome/pixmaps/gnomesword/epiphany-secure.png
-share/gnome/pixmaps/gnomesword/epiphany-unsecure.png
-share/gnome/pixmaps/gnomesword/gnome-session.png
-share/gnome/pixmaps/gnomesword/gnome-window-manager.png
-share/gnome/pixmaps/gnomesword/gnome-windows.png
-share/gnome/pixmaps/gnomesword/gs2-48x48.ico
-share/gnome/pixmaps/gnomesword/gs2-48x48.png
-share/gnome/pixmaps/gnomesword/init-settings.png
-share/gnome/pixmaps/gnomesword/logo.png
-share/gnome/pixmaps/gnomesword/new_tab_button.png
-share/gnome/pixmaps/gnomesword/splash.png
-share/gnome/pixmaps/gnomesword/splash2.png
-share/gnome/pixmaps/gnomesword/sword.png
-share/gnome/pixmaps/gnomesword/sword3.png
-share/gnome/pixmaps/gnomesword/tt.png
+share/pixmaps/gnomesword/about.png
+share/pixmaps/gnomesword/dlg-un.png
+share/pixmaps/gnomesword/epiphany-bookmark-page.png
+share/pixmaps/gnomesword/epiphany-bookmarks.png
+share/pixmaps/gnomesword/epiphany-secure.png
+share/pixmaps/gnomesword/epiphany-unsecure.png
+share/pixmaps/gnomesword/gnome-session.png
+share/pixmaps/gnomesword/gnome-window-manager.png
+share/pixmaps/gnomesword/gnome-windows.png
+share/pixmaps/gnomesword/gs2-48x48.ico
+share/pixmaps/gnomesword/gs2-48x48.png
+share/pixmaps/gnomesword/init-settings.png
+share/pixmaps/gnomesword/logo.png
+share/pixmaps/gnomesword/new_tab_button.png
+share/pixmaps/gnomesword/splash.png
+share/pixmaps/gnomesword/splash2.png
+share/pixmaps/gnomesword/sword.png
+share/pixmaps/gnomesword/sword3.png
+share/pixmaps/gnomesword/tt.png
 share/locale/bg/LC_MESSAGES/gnomesword.mo
 share/locale/cs/LC_MESSAGES/gnomesword.mo
 share/locale/de/LC_MESSAGES/gnomesword.mo
@@ -174,7 +174,7 @@ share/locale/nl/LC_MESSAGES/gnomesword.mo
 share/locale/ru/LC_MESSAGES/gnomesword.mo
 share/locale/sk/LC_MESSAGES/gnomesword.mo
 share/locale/uk/LC_MESSAGES/gnomesword.mo
-@dirrm share/gnome/pixmaps/gnomesword
+@dirrm share/pixmaps/gnomesword
 @dirrm share/gnome/help/gnomesword/fr/figures
 @dirrm share/gnome/help/gnomesword/fr
 @dirrm share/gnome/help/gnomesword/de/figures
@@ -182,5 +182,6 @@ share/locale/uk/LC_MESSAGES/gnomesword.mo
 @dirrm share/gnome/help/gnomesword/C/figures
 @dirrm share/gnome/help/gnomesword/C
 @dirrm share/gnome/help/gnomesword
-@dirrm share/gnome/gnomesword
+@dirrm share/gnomesword
 @dirrm %%DOCSDIR%%
+@dirrmtry share/applications
diff --git a/multimedia/gmencoder/Makefile b/multimedia/gmencoder/Makefile
index e87472bb4298..e9539e07627c 100644
--- a/multimedia/gmencoder/Makefile
+++ b/multimedia/gmencoder/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gmencoder
 PORTVERSION=	0.1.0
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/multimedia/gmencoder/pkg-plist b/multimedia/gmencoder/pkg-plist
index 165ab27c02aa..7774924b6685 100644
--- a/multimedia/gmencoder/pkg-plist
+++ b/multimedia/gmencoder/pkg-plist
@@ -1,8 +1,8 @@
 bin/gmencoder
-share/gnome/pixmaps/gmencoder/media-pause.png
-share/gnome/pixmaps/gmencoder/media-play.png
+share/pixmaps/gmencoder/media-pause.png
+share/pixmaps/gmencoder/media-play.png
 %%PORTDOCS%%%%DOCSDIR%%/README
 share/locale/es/LC_MESSAGES/gmencoder.mo
 share/locale/en/LC_MESSAGES/gmencoder.mo
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm share/gnome/pixmaps/gmencoder
+@dirrm share/pixmaps/gmencoder
diff --git a/multimedia/gnome-subtitles/Makefile b/multimedia/gnome-subtitles/Makefile
index 63a9d4dde140..5a8f411efed1 100644
--- a/multimedia/gnome-subtitles/Makefile
+++ b/multimedia/gnome-subtitles/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gnome-subtitles
 PORTVERSION=	0.6
+PORTREVISION=	1
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/multimedia/gnome-subtitles/files/patch-src_GnomeSubtitles_Execution_Execution.cs b/multimedia/gnome-subtitles/files/patch-src_GnomeSubtitles_Execution_Execution.cs
deleted file mode 100644
index e0c1da9a25f5..000000000000
--- a/multimedia/gnome-subtitles/files/patch-src_GnomeSubtitles_Execution_Execution.cs
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/GnomeSubtitles/Execution/Execution.cs.orig	Thu Jun 21 22:53:01 2007
-+++ src/GnomeSubtitles/Execution/Execution.cs	Thu Jul 12 17:32:18 2007
-@@ -107,8 +107,7 @@
- 				return path;
- 			else {
- 				return Path.Combine(SystemShareDir,
--							Path.Combine("gnome",
--							Path.Combine("help", applicationID)));
-+							Path.Combine("help", applicationID));
- 			}
- 		}
- 	}
diff --git a/multimedia/gnome-subtitles/pkg-plist b/multimedia/gnome-subtitles/pkg-plist
index 0cac6377cfb9..a137d8a580d5 100644
--- a/multimedia/gnome-subtitles/pkg-plist
+++ b/multimedia/gnome-subtitles/pkg-plist
@@ -1,23 +1,24 @@
 bin/gnome-subtitles
 lib/gnome-subtitles/gnome-subtitles.exe
 lib/gnome-subtitles/sublib.dll
-share/gnome/applications/gnome-subtitles.desktop
+share/applications/gnome-subtitles.desktop
 share/gnome/help/gnome-subtitles/C/legal.xml
 share/gnome/help/gnome-subtitles/C/gnome-subtitles.xml
 share/gnome/help/gnome-subtitles/ca/gnome-subtitles.xml
 share/gnome/help/gnome-subtitles/sv/gnome-subtitles.xml
-share/gnome/omf/gnome-subtitles/gnome-subtitles-C.omf
-share/gnome/omf/gnome-subtitles/gnome-subtitles-ca.omf
-share/gnome/omf/gnome-subtitles/gnome-subtitles-sv.omf
-share/gnome/pixmaps/gnome-subtitles.png
+share/omf/gnome-subtitles/gnome-subtitles-C.omf
+share/omf/gnome-subtitles/gnome-subtitles-ca.omf
+share/omf/gnome-subtitles/gnome-subtitles-sv.omf
+share/pixmaps/gnome-subtitles.png
 share/locale/ca/LC_MESSAGES/gnome-subtitles.mo
 share/locale/es/LC_MESSAGES/gnome-subtitles.mo
 share/locale/sv/LC_MESSAGES/gnome-subtitles.mo
 share/locale/dz/LC_MESSAGES/gnome-subtitles.mo
 @dirrmtry lib/gnome-subtitles
-@dirrmtry share/gnome/omf/gnome-subtitles
+@dirrmtry share/omf/gnome-subtitles
 @dirrmtry share/gnome/help/gnome-subtitles/C
 @dirrmtry share/gnome/help/gnome-subtitles/sv
 @dirrmtry share/gnome/help/gnome-subtitles/ca
 @dirrmtry share/gnome/help/gnome-subtitles
 @dirrmtry locale
+@dirrmtry share/applications
diff --git a/multimedia/gsubedit/Makefile b/multimedia/gsubedit/Makefile
index 51d8da39456d..8e507bde72ec 100644
--- a/multimedia/gsubedit/Makefile
+++ b/multimedia/gsubedit/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	GSubEdit
 PORTVERSION=	0.4.p1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	multimedia gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME:L}
@@ -36,7 +36,7 @@ post-patch:
 		${WRKSRC}/Makefile.in
 # prefix safeness for pixmaps
 	@${REINPLACE_CMD} -E -e \
-		's|^(packagepixmapsdir[[:space:]]*=).*$$|\1share/gnome/pixmaps/\$${PACKAGE}|' \
+		's|^(packagepixmapsdir[[:space:]]*=).*$$|\1share/pixmaps/\$${PACKAGE}|' \
 		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT} \
 # install neither charset.alias nor locale.alias. Therefore, do not
 # build distfiles' gettext
diff --git a/multimedia/gsubedit/pkg-plist b/multimedia/gsubedit/pkg-plist
index 93b8da86d4a3..ddc3ad97abe9 100644
--- a/multimedia/gsubedit/pkg-plist
+++ b/multimedia/gsubedit/pkg-plist
@@ -9,20 +9,20 @@ bin/gsubedit
 share/gnome/apps/Applications/gsubedit.desktop
 share/gnome/help/gsubedit/C/index.html
 share/gnome/help/gsubedit/C/topic.dat
-share/gnome/pixmaps/gsubedit/gsubedit_icon.png
 share/locale/cs/LC_MESSAGES/gsubedit.mo
 share/locale/ro/LC_MESSAGES/gsubedit.mo
 share/locale/ru/LC_MESSAGES/gsubedit.mo
 share/locale/sv/LC_MESSAGES/gsubedit.mo
-@unexec %D/share/locale/sv/LC_MESSAGES 2>/dev/null || true
-@unexec %D/share/locale/sv 2>/dev/null || true
-@unexec %D/share/locale/ru/LC_MESSAGES 2>/dev/null || true
-@unexec %D/share/locale/ru 2>/dev/null || true
-@unexec %D/share/locale/ro/LC_MESSAGES 2>/dev/null || true
-@unexec %D/share/locale/ro 2>/dev/null || true
-@unexec %D/share/locale/cs/LC_MESSAGES 2>/dev/null || true
-@unexec %D/share/locale/cs 2>/dev/null || true
-@dirrm share/gnome/pixmaps/gsubedit
+share/pixmaps/gsubedit/gsubedit_icon.png
+@dirrmtry share/locale/sv/LC_MESSAGES 
+@dirrmtry share/locale/sv 
+@dirrmtry share/locale/ru/LC_MESSAGES 
+@dirrmtry share/locale/ru 
+@dirrmtry share/locale/ro/LC_MESSAGES 
+@dirrmtry share/locale/ro 
+@dirrmtry share/locale/cs/LC_MESSAGES 
+@dirrmtry share/locale/cs 
+@dirrm share/pixmaps/gsubedit
 @dirrm share/gnome/help/gsubedit/C
 @dirrm share/gnome/help/gsubedit
 %%PORTDOCS%%@dirrm share/doc/GSubEdit
diff --git a/multimedia/gtksubtitler/Makefile b/multimedia/gtksubtitler/Makefile
index cbcff322c371..96c1a8dc71ef 100644
--- a/multimedia/gtksubtitler/Makefile
+++ b/multimedia/gtksubtitler/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	GTKsubtitler
 PORTVERSION=	0.2.4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	multimedia gnome
 MASTER_SITES=	http://matrix.kamp.pl/~pawelb/gtksubtitler/download/
 DISTNAME=	${PORTNAME}-v${PORTVERSION}
diff --git a/multimedia/gtksubtitler/pkg-plist b/multimedia/gtksubtitler/pkg-plist
index 09db786d5809..9347f0a75927 100644
--- a/multimedia/gtksubtitler/pkg-plist
+++ b/multimedia/gtksubtitler/pkg-plist
@@ -1,10 +1,8 @@
 bin/GTKsubtitler
-share/gnome/GTKsubtitler/conf
-share/gnome/GTKsubtitler/lang.en
-share/gnome/GTKsubtitler/lang.hu
-share/gnome/GTKsubtitler/lang.pl
-share/gnome/pixmaps/GTKsubtitler/GTKsubtitler.xpm
-@dirrm share/gnome/pixmaps/GTKsubtitler
-@dirrmtry share/gnome/pixmaps
-@dirrm share/gnome/GTKsubtitler
-@dirrmtry share/gnome
+share/GTKsubtitler/conf
+share/GTKsubtitler/lang.en
+share/GTKsubtitler/lang.hu
+share/GTKsubtitler/lang.pl
+share/pixmaps/GTKsubtitler/GTKsubtitler.xpm
+@dirrm share/pixmaps/GTKsubtitler
+@dirrm share/GTKsubtitler
diff --git a/multimedia/gxmms/Makefile b/multimedia/gxmms/Makefile
index 5eacc49cb7e6..886fff30a5a9 100644
--- a/multimedia/gxmms/Makefile
+++ b/multimedia/gxmms/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gxmms
 PORTVERSION=	0.2.1
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	multimedia gnome
 MASTER_SITES=	${MASTER_SITE_SAVANNAH}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/multimedia/gxmms/pkg-plist b/multimedia/gxmms/pkg-plist
index 1eae5f334dbb..c958bcb411dd 100644
--- a/multimedia/gxmms/pkg-plist
+++ b/multimedia/gxmms/pkg-plist
@@ -1,14 +1,14 @@
 libdata/bonobo/servers/GNOME_gxmmsApplet.server
 libexec/gxmms_applet
-share/gnome/gnome-2.0/ui/GNOME_gxmmsApplet.xml
-share/gnome/gxmms/gxmms.png
-share/gnome/gxmms/gxmms_eject.png
-share/gnome/gxmms/gxmms_next.png
-share/gnome/gxmms/gxmms_play_pause.png
-share/gnome/gxmms/gxmms_prev.png
-share/gnome/gxmms/gxmms_stop.png
-share/gnome/pixmaps/gxmms_mini.png
+share/gnome-2.0/ui/GNOME_gxmmsApplet.xml
+share/gxmms/gxmms.png
+share/gxmms/gxmms_eject.png
+share/gxmms/gxmms_next.png
+share/gxmms/gxmms_play_pause.png
+share/gxmms/gxmms_prev.png
+share/gxmms/gxmms_stop.png
+share/pixmaps/gxmms_mini.png
 share/locale/ca/LC_MESSAGES/gxmms.mo
 share/locale/es/LC_MESSAGES/gxmms.mo
 share/locale/fr/LC_MESSAGES/gxmms.mo
-@dirrm share/gnome/gxmms
+@dirrm share/gxmms
diff --git a/multimedia/kino/Makefile b/multimedia/kino/Makefile
index afe5be803993..7179d5db6138 100644
--- a/multimedia/kino/Makefile
+++ b/multimedia/kino/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kino
 PORTVERSION=	1.1.1
+PORTREVISION=	1
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/multimedia/kino/pkg-plist b/multimedia/kino/pkg-plist
index 45c88cd0111f..f5bbb10132c5 100644
--- a/multimedia/kino/pkg-plist
+++ b/multimedia/kino/pkg-plist
@@ -23,365 +23,365 @@ lib/kino-gtk2/libkinoplus.so
 lib/kino-gtk2/libtimfx.a
 lib/kino-gtk2/libtimfx.la
 lib/kino-gtk2/libtimfx.so
-share/gnome/applications/Kino.desktop
-share/gnome/kino/about.jpeg
-share/gnome/kino/capture.png
-share/gnome/kino/dvtitler.glade
-share/gnome/kino/edit.png
-share/gnome/kino/export.png
-share/gnome/kino/fx.png
-share/gnome/kino/insert_after-16.png
-share/gnome/kino/insert_after.png
-share/gnome/kino/insert_before-16.png
-share/gnome/kino/insert_before.png
-share/gnome/kino/join.xpm
-share/gnome/kino/kino.glade
-share/gnome/kino/kino.png
-share/gnome/kino/kinoplus.glade
-share/gnome/kino/link.xpm
-share/gnome/kino/link_off.xpm
-share/gnome/kino/magick.glade
-share/gnome/kino/publish_project.png
-share/gnome/kino/publish_project_16.png
-share/gnome/kino/publish_still.png
-share/gnome/kino/publish_still_16.png
-share/gnome/kino/saveframe.png
-share/gnome/kino/saveframe_16.png
-share/gnome/kino/split.xpm
-share/gnome/kino/stock_media-begin-16.png
-share/gnome/kino/stock_media-end-16.png
-share/gnome/kino/stock_media-fwd-16.png
-share/gnome/kino/stock_media-next-16.png
-share/gnome/kino/stock_media-next-frame-16.png
-share/gnome/kino/stock_media-pause-16.png
-share/gnome/kino/stock_media-play-16.png
-share/gnome/kino/stock_media-prev-16.png
-share/gnome/kino/stock_media-prev-frame-16.png
-share/gnome/kino/stock_media-rec-16.png
-share/gnome/kino/stock_media-repeat-alt.png
-share/gnome/kino/stock_media-rew-16.png
-share/gnome/kino/stock_media-stop-16.png
-share/gnome/kino/timeline.png
-share/gnome/kino/timfx.glade
-share/gnome/kino/trim.png
-share/gnome/kino/trim_in.xpm
-share/gnome/kino/trim_out.xpm
-share/gnome/kino/help/en/AutoSplit.html
-share/gnome/kino/help/en/FX.html
-share/gnome/kino/help/en/GNU-FDL.html
-share/gnome/kino/help/en/appendix.html
-share/gnome/kino/help/en/aspectratio.html
-share/gnome/kino/help/en/capture.html
-share/gnome/kino/help/en/developers.html
-share/gnome/kino/help/en/docbook.css
-share/gnome/kino/help/en/dropframe.html
-share/gnome/kino/help/en/droppedframes.html
-share/gnome/kino/help/en/edit.html
-share/gnome/kino/help/en/export.html
-share/gnome/kino/help/en/export_audio.html
-share/gnome/kino/help/en/export_dv.html
-share/gnome/kino/help/en/export_export.html
-share/gnome/kino/help/en/export_ieee1394.html
-share/gnome/kino/help/en/export_other.html
-share/gnome/kino/help/en/export_selection.html
-share/gnome/kino/help/en/framedropping.html
-share/gnome/kino/help/en/fx_audio.html
-share/gnome/kino/help/en/fx_selection.html
-share/gnome/kino/help/en/fx_video.html
-share/gnome/kino/help/en/images/caution.png
-share/gnome/kino/help/en/images/important.png
-share/gnome/kino/help/en/images/note.png
-share/gnome/kino/help/en/images/tip.png
-share/gnome/kino/help/en/images/warning.png
-share/gnome/kino/help/en/index.html
-share/gnome/kino/help/en/interfieldmotion.html
-share/gnome/kino/help/en/interlace.html
-share/gnome/kino/help/en/intro.html
-share/gnome/kino/help/en/jogshuttle.html
-share/gnome/kino/help/en/keyboard.html
-share/gnome/kino/help/en/keyboard_capture.html
-share/gnome/kino/help/en/keyboard_edit.html
-share/gnome/kino/help/en/keyboard_export.html
-share/gnome/kino/help/en/keyboard_fx.html
-share/gnome/kino/help/en/keyboard_timeline.html
-share/gnome/kino/help/en/keyboard_trim.html
-share/gnome/kino/help/en/kino.xml
-share/gnome/kino/help/en/links.html
-share/gnome/kino/help/en/locked.html
-share/gnome/kino/help/en/media/FX/fx.png
-share/gnome/kino/help/en/media/FX/fx_audio/fx_audio_filters/fx_dub/fx-audiofilter-dub.png
-share/gnome/kino/help/en/media/FX/fx_audio/fx_audio_filters/fx_gain/fx-audiofilter-gain.png
-share/gnome/kino/help/en/media/FX/fx_audio/fx_audio_filters/fx_mix/fx-audiofilter-mix.png
-share/gnome/kino/help/en/media/FX/fx_audio/fx_audio_transitions/fx-audiotransition-crossfade.png
-share/gnome/kino/help/en/media/FX/fx_selection/fx-overwrite-advanced.png
-share/gnome/kino/help/en/media/FX/fx_selection/fx_create/fx_create_colorrange/fx-create-color_range.png
-share/gnome/kino/help/en/media/FX/fx_selection/fx_create/fx_create_fixedcolor/fx-create-fixed_color.png
-share/gnome/kino/help/en/media/FX/fx_selection/fx_create/fx_create_fromfile/fx-create-from_file.png
-share/gnome/kino/help/en/media/FX/fx_selection/fx_create/fx_create_gradient/fx-create-gradient.png
-share/gnome/kino/help/en/media/FX/fx_selection/fx_create/fx_create_noise/fx-create-noise.png
-share/gnome/kino/help/en/media/FX/fx_video/fx_video_filters/fx_blur/fx-vfilter-blur-eg.png
-share/gnome/kino/help/en/media/FX/fx_video/fx_video_filters/fx_blur/fx-vfilter-blur.png
-share/gnome/kino/help/en/media/FX/fx_video/fx_video_filters/fx_charcoal/fx-vfilter-charcoal-eg.png
-share/gnome/kino/help/en/media/FX/fx_video/fx_video_filters/fx_charcoal/fx-vfilter-charcoal.png
-share/gnome/kino/help/en/media/FX/fx_video/fx_video_filters/fx_coloraverage/fx-vfilter-coloravg-eg.png
-share/gnome/kino/help/en/media/FX/fx_video/fx_video_filters/fx_coloraverage/fx-vfilter-coloravg.png
-share/gnome/kino/help/en/media/FX/fx_video/fx_video_filters/fx_colorhold/fx-vfilter-colorhold-eg.png
-share/gnome/kino/help/en/media/FX/fx_video/fx_video_filters/fx_colorhold/fx-vfilter-colorhold.png
-share/gnome/kino/help/en/media/FX/fx_video/fx_video_filters/fx_flip/fx-vfilter-flip-eg.png
-share/gnome/kino/help/en/media/FX/fx_video/fx_video_filters/fx_flip/fx-vfilter-flip.png
-share/gnome/kino/help/en/media/FX/fx_video/fx_video_filters/fx_jerky/fx-vfilter-jerky.png
-share/gnome/kino/help/en/media/FX/fx_video/fx_video_filters/fx_kaleidoscope/fx-vfilter-kaleidoscope-eg.png
-share/gnome/kino/help/en/media/FX/fx_video/fx_video_filters/fx_kaleidoscope/fx-vfilter-kaleidoscope.png
-share/gnome/kino/help/en/media/FX/fx_video/fx_video_filters/fx_levels/fx-vfilter-levels.png
-share/gnome/kino/help/en/media/FX/fx_video/fx_video_filters/fx_mirror/fx-vfilter-mirror-eg.png
-share/gnome/kino/help/en/media/FX/fx_video/fx_video_filters/fx_mirror/fx-vfilter-mirror.png
-share/gnome/kino/help/en/media/FX/fx_video/fx_video_filters/fx_panzoom/fx-vfilter-panzoom-eg.png
-share/gnome/kino/help/en/media/FX/fx_video/fx_video_filters/fx_panzoom/fx-vfilter-panzoom.png
-share/gnome/kino/help/en/media/FX/fx_video/fx_video_filters/fx_pixelate/fx-vfilter-pixelate-eg.png
-share/gnome/kino/help/en/media/FX/fx_video/fx_video_filters/fx_pixelate/fx-vfilter-pixelate.png
-share/gnome/kino/help/en/media/FX/fx_video/fx_video_filters/fx_softfocus/fx-vfilter-soft-eg.png
-share/gnome/kino/help/en/media/FX/fx_video/fx_video_filters/fx_softfocus/fx-vfilter-soft.png
-share/gnome/kino/help/en/media/FX/fx_video/fx_video_filters/fx_superimpose/fx-vfilter-superimpose-eg.png
-share/gnome/kino/help/en/media/FX/fx_video/fx_video_filters/fx_superimpose/fx-vfilter-superimpose.png
-share/gnome/kino/help/en/media/FX/fx_video/fx_video_filters/fx_titler/fx-vfilter-titler-eg.png
-share/gnome/kino/help/en/media/FX/fx_video/fx_video_filters/fx_titler/fx-vfilter-titler.png
-share/gnome/kino/help/en/media/FX/fx_video/fx_video_transitions/fx-vtran.png
-share/gnome/kino/help/en/media/FX/fx_video/fx_video_transitions/fx_barndoor/fx-vtran-barn-horz-eg.png
-share/gnome/kino/help/en/media/FX/fx_video/fx_video_transitions/fx_barndoor/fx-vtran-barn-horz.png
-share/gnome/kino/help/en/media/FX/fx_video/fx_video_transitions/fx_barndoor/fx-vtran-barn-vert-eg.png
-share/gnome/kino/help/en/media/FX/fx_video/fx_video_transitions/fx_composite/fx-vtran-composite-eg.png
-share/gnome/kino/help/en/media/FX/fx_video/fx_video_transitions/fx_composite/fx-vtran-composite.png
-share/gnome/kino/help/en/media/FX/fx_video/fx_video_transitions/fx_differences/fx-vtran-diff-eg.png
-share/gnome/kino/help/en/media/FX/fx_video/fx_video_transitions/fx_differences/fx-vtran-diff.png
-share/gnome/kino/help/en/media/FX/fx_video/fx_video_transitions/fx_dissolve/fx-vtran-dissolve-eg.png
-share/gnome/kino/help/en/media/FX/fx_video/fx_video_transitions/fx_dissolve/fx-vtran-dissolve.png
-share/gnome/kino/help/en/media/FX/fx_video/fx_video_transitions/fx_luma/fx-vtran-wipe-barleft.png
-share/gnome/kino/help/en/media/FX/fx_video/fx_video_transitions/fx_luma/fx-vtran-wipe-barndiag.png
-share/gnome/kino/help/en/media/FX/fx_video/fx_video_transitions/fx_luma/fx-vtran-wipe-box.png
-share/gnome/kino/help/en/media/FX/fx_video/fx_video_transitions/fx_luma/fx-vtran-wipe-burst.png
-share/gnome/kino/help/en/media/FX/fx_video/fx_video_transitions/fx_luma/fx-vtran-wipe-clock.png
-share/gnome/kino/help/en/media/FX/fx_video/fx_video_transitions/fx_luma/fx-vtran-wipe-iris.png
-share/gnome/kino/help/en/media/FX/fx_video/fx_video_transitions/fx_luma/fx-vtran-wipe-matrix.png
-share/gnome/kino/help/en/media/FX/fx_video/fx_video_transitions/fx_luma/fx-vtran-wipe.png
-share/gnome/kino/help/en/media/FX/fx_video/fx_video_transitions/fx_push/fx-vtran-push-horz-eg.png
-share/gnome/kino/help/en/media/FX/fx_video/fx_video_transitions/fx_push/fx-vtran-push-vert-eg.png
-share/gnome/kino/help/en/media/FX/fx_video/fx_video_transitions/fx_push/fx-vtran-push.png
-share/gnome/kino/help/en/media/FX/fx_video/keyframing/fx-keyframe-add.png
-share/gnome/kino/help/en/media/FX/fx_video/keyframing/fx-keyframing-remove.png
-share/gnome/kino/help/en/media/capture/capture-empty.png
-share/gnome/kino/help/en/media/edit/button-copy.png
-share/gnome/kino/help/en/media/edit/button-cut.png
-share/gnome/kino/help/en/media/edit/button-join.png
-share/gnome/kino/help/en/media/edit/button-paste.png
-share/gnome/kino/help/en/media/edit/button-split.png
-share/gnome/kino/help/en/media/edit/edit.png
-share/gnome/kino/help/en/media/edit/pointclick/button-append.png
-share/gnome/kino/help/en/media/edit/pointclick/button-insert.png
-share/gnome/kino/help/en/media/edit/pointclick/file-open.png
-share/gnome/kino/help/en/media/export/export_audio/export-audio.png
-share/gnome/kino/help/en/media/export/export_dv/export-dv-range.png
-share/gnome/kino/help/en/media/export/export_ieee1394/export-1394-enabled.png
-share/gnome/kino/help/en/media/export/export_other/export-other-theora.png
-share/gnome/kino/help/en/media/export/export_selection/export-range.png
-share/gnome/kino/help/en/media/export/mpeg/dvdauthor/export-mpeg-dvd.png
-share/gnome/kino/help/en/media/export/mpeg/export-mpeg-vcd.png
-share/gnome/kino/help/en/media/export/stills/export-stills-current.png
-share/gnome/kino/help/en/media/keyboard/help-keyboard.png
-share/gnome/kino/help/en/media/metadata/metadata.png
-share/gnome/kino/help/en/media/prefs/prefs0/prefs-defaults.png
-share/gnome/kino/help/en/media/prefs/prefs1/prefs-capture.png
-share/gnome/kino/help/en/media/prefs/prefs2/prefs-1394-broken.png
-share/gnome/kino/help/en/media/prefs/prefs2/prefs-1394-empty.png
-share/gnome/kino/help/en/media/prefs/prefs3/prefs-display.png
-share/gnome/kino/help/en/media/prefs/prefs4/prefs-audio.png
-share/gnome/kino/help/en/media/prefs/prefs5/prefs-jogshuttle.png
-share/gnome/kino/help/en/media/prefs/prefs7/prefs-other.png
-share/gnome/kino/help/en/media/publish/button-publish_movie.png
-share/gnome/kino/help/en/media/terms/jogshuttle/shuttlepro.png
-share/gnome/kino/help/en/media/trim/trim.png
-share/gnome/kino/help/en/media/ui/kinoui.png
-share/gnome/kino/help/en/media/ui/properties.png
-share/gnome/kino/help/en/metadata.html
-share/gnome/kino/help/en/metadata_example.html
-share/gnome/kino/help/en/metanames.html
-share/gnome/kino/help/en/metavalues.html
-share/gnome/kino/help/en/mode.html
-share/gnome/kino/help/en/movie.html
-share/gnome/kino/help/en/mpeg.html
-share/gnome/kino/help/en/newprojecturi.html
-share/gnome/kino/help/en/newprojectxpath.html
-share/gnome/kino/help/en/overwrite_insert.html
-share/gnome/kino/help/en/pointclick.html
-share/gnome/kino/help/en/prefs.html
-share/gnome/kino/help/en/prefs0.html
-share/gnome/kino/help/en/prefs1.html
-share/gnome/kino/help/en/prefs2.html
-share/gnome/kino/help/en/prefs3.html
-share/gnome/kino/help/en/prefs4.html
-share/gnome/kino/help/en/prefs5.html
-share/gnome/kino/help/en/prefs7.html
-share/gnome/kino/help/en/preview.html
-share/gnome/kino/help/en/publish.html
-share/gnome/kino/help/en/render.html
-share/gnome/kino/help/en/scene.html
-share/gnome/kino/help/en/scrubbar.html
-share/gnome/kino/help/en/shuttle.html
-share/gnome/kino/help/en/stills.html
-share/gnome/kino/help/en/terms.html
-share/gnome/kino/help/en/time.html
-share/gnome/kino/help/en/timecode.html
-share/gnome/kino/help/en/timeentry.html
-share/gnome/kino/help/en/timeformats.html
-share/gnome/kino/help/en/transport.html
-share/gnome/kino/help/en/trim.html
-share/gnome/kino/help/en/trim_conclusion.html
-share/gnome/kino/help/en/trim_storyboard.html
-share/gnome/kino/help/en/trimloader.html
-share/gnome/kino/help/en/ui.html
-share/gnome/kino/help/en/vi.html
-share/gnome/kino/help/fr/AutoSplit.html
-share/gnome/kino/help/fr/FX.html
-share/gnome/kino/help/fr/GNU-FDL.html
-share/gnome/kino/help/fr/appendix.html
-share/gnome/kino/help/fr/aspectratio.html
-share/gnome/kino/help/fr/capture.html
-share/gnome/kino/help/fr/developers.html
-share/gnome/kino/help/fr/docbook.css
-share/gnome/kino/help/fr/dropframe.html
-share/gnome/kino/help/fr/droppedframes.html
-share/gnome/kino/help/fr/edit.html
-share/gnome/kino/help/fr/export.html
-share/gnome/kino/help/fr/export_audio.html
-share/gnome/kino/help/fr/export_dv.html
-share/gnome/kino/help/fr/export_export.html
-share/gnome/kino/help/fr/export_ieee1394.html
-share/gnome/kino/help/fr/export_other.html
-share/gnome/kino/help/fr/export_selection.html
-share/gnome/kino/help/fr/framedropping.html
-share/gnome/kino/help/fr/fx_audio.html
-share/gnome/kino/help/fr/fx_selection.html
-share/gnome/kino/help/fr/fx_video.html
-share/gnome/kino/help/fr/images/caution.png
-share/gnome/kino/help/fr/images/important.png
-share/gnome/kino/help/fr/images/note.png
-share/gnome/kino/help/fr/images/tip.png
-share/gnome/kino/help/fr/images/warning.png
-share/gnome/kino/help/fr/index.html
-share/gnome/kino/help/fr/interfieldmotion.html
-share/gnome/kino/help/fr/interlace.html
-share/gnome/kino/help/fr/intro.html
-share/gnome/kino/help/fr/jogshuttle.html
-share/gnome/kino/help/fr/keyboard.html
-share/gnome/kino/help/fr/kino.xml
-share/gnome/kino/help/fr/links.html
-share/gnome/kino/help/fr/locked.html
-share/gnome/kino/help/fr/media/ui/kinoui-fr.png
-share/gnome/kino/help/fr/metadata.html
-share/gnome/kino/help/fr/metadata_example.html
-share/gnome/kino/help/fr/metanames.html
-share/gnome/kino/help/fr/metavalues.html
-share/gnome/kino/help/fr/mode.html
-share/gnome/kino/help/fr/movie.html
-share/gnome/kino/help/fr/mpeg.html
-share/gnome/kino/help/fr/newprojecturi.html
-share/gnome/kino/help/fr/newprojectxpath.html
-share/gnome/kino/help/fr/overwrite_insert.html
-share/gnome/kino/help/fr/pointclick.html
-share/gnome/kino/help/fr/prefs.html
-share/gnome/kino/help/fr/prefs0.html
-share/gnome/kino/help/fr/prefs1.html
-share/gnome/kino/help/fr/prefs2.html
-share/gnome/kino/help/fr/prefs3.html
-share/gnome/kino/help/fr/prefs4.html
-share/gnome/kino/help/fr/prefs5.html
-share/gnome/kino/help/fr/prefs7.html
-share/gnome/kino/help/fr/preview.html
-share/gnome/kino/help/fr/publish.html
-share/gnome/kino/help/fr/render.html
-share/gnome/kino/help/fr/scene.html
-share/gnome/kino/help/fr/scrubbar.html
-share/gnome/kino/help/fr/shuttle.html
-share/gnome/kino/help/fr/stills.html
-share/gnome/kino/help/fr/terms.html
-share/gnome/kino/help/fr/time.html
-share/gnome/kino/help/fr/timecode.html
-share/gnome/kino/help/fr/timeentry.html
-share/gnome/kino/help/fr/timeformats.html
-share/gnome/kino/help/fr/transport.html
-share/gnome/kino/help/fr/trim.html
-share/gnome/kino/help/fr/trim_conclusion.html
-share/gnome/kino/help/fr/trim_storyboard.html
-share/gnome/kino/help/fr/trimloader.html
-share/gnome/kino/help/fr/ui.html
-share/gnome/kino/help/fr/vi.html
-share/gnome/kino/scripts/help.sh
-share/gnome/kino/scripts/dvdauthor/dvdauthor-k3b.sh
-share/gnome/kino/scripts/dvdauthor/dvdauthor.sh
-share/gnome/kino/scripts/dvdauthor/growisofs.sh
-share/gnome/kino/scripts/dvdauthor/none.sh
-share/gnome/kino/scripts/dvdauthor/qdvdauthor.sh
-share/gnome/kino/scripts/exports/extract_chapters
-share/gnome/kino/scripts/exports/ffmpeg2theora.sh
-share/gnome/kino/scripts/exports/ffmpeg_3gp.sh
-share/gnome/kino/scripts/exports/ffmpeg_divx.sh
-share/gnome/kino/scripts/exports/ffmpeg_divx_dual.sh
-share/gnome/kino/scripts/exports/ffmpeg_dvd.sh
-share/gnome/kino/scripts/exports/ffmpeg_dvd_dual.sh
-share/gnome/kino/scripts/exports/ffmpeg_flv.sh
-share/gnome/kino/scripts/exports/ffmpeg_h264.sh
-share/gnome/kino/scripts/exports/ffmpeg_h264_dual.sh
-share/gnome/kino/scripts/exports/ffmpeg_mp3.sh
-share/gnome/kino/scripts/exports/ffmpeg_mp4.sh
-share/gnome/kino/scripts/exports/ffmpeg_mp4_dual.sh
-share/gnome/kino/scripts/exports/ffmpeg_utils.sh
-share/gnome/kino/scripts/exports/ffmpeg_vcd.sh
-share/gnome/kino/scripts/exports/ffmpeg_xvid.sh
-share/gnome/kino/scripts/exports/ffmpeg_xvid_dual.sh
-share/gnome/kino/scripts/exports/mencoder.sh
-share/gnome/kino/scripts/exports/rawplay.sh
-share/gnome/kino/scripts/import/audio.sh
-share/gnome/kino/scripts/import/media.sh
-share/gnome/kino/scripts/publish/bliptv_frame.sh
-share/gnome/kino/scripts/publish/bliptv_project.sh
-share/gnome/kino/scripts/publish/echo.sh
-share/gnome/kino/scripts/publish/frame.sh
-share/gnome/kino/scripts/publish/project.sh
-share/gnome/kino/lumas/bar_bottom.png
-share/gnome/kino/lumas/bar_left.png
-share/gnome/kino/lumas/bar_right.png
-share/gnome/kino/lumas/bar_top.png
-share/gnome/kino/lumas/barn_bottomleft.png
-share/gnome/kino/lumas/barn_horz.png
-share/gnome/kino/lumas/barn_topleft.png
-share/gnome/kino/lumas/barn_vert.png
-share/gnome/kino/lumas/box_bottomcentre.png
-share/gnome/kino/lumas/box_bottomleft.png
-share/gnome/kino/lumas/box_bottomright.png
-share/gnome/kino/lumas/box_leftcentre.png
-share/gnome/kino/lumas/box_rightcentre.png
-share/gnome/kino/lumas/box_topcentre.png
-share/gnome/kino/lumas/box_topleft.png
-share/gnome/kino/lumas/box_topright.png
-share/gnome/kino/lumas/burst.png
-share/gnome/kino/lumas/checkerboard_small.png
-share/gnome/kino/lumas/clock.png
-share/gnome/kino/lumas/clock_clockwise12.png
-share/gnome/kino/lumas/clock_clockwise6.png
-share/gnome/kino/lumas/diag_bottomleft.png
-share/gnome/kino/lumas/diag_bottomright.png
-share/gnome/kino/lumas/diag_topleft.png
-share/gnome/kino/lumas/diag_topright.png
-share/gnome/kino/lumas/fourbox_in.png
-share/gnome/kino/lumas/fourbox_out.png
-share/gnome/kino/lumas/horizontal_barn_doors.png
-share/gnome/kino/lumas/horizontal_blinds.png
-share/gnome/kino/lumas/iris_circle.png
-share/gnome/kino/lumas/iris_rectangle.png
-share/gnome/kino/lumas/left_to_right.png
-share/gnome/kino/lumas/matrix_snake_toplefthorizontal.png
-share/gnome/kino/lumas/none.png
-share/gnome/kino/lumas/symmetric_clock.png
-share/gnome/pixmaps/kino.png
+share/applications/Kino.desktop
+share/kino/about.jpeg
+share/kino/capture.png
+share/kino/dvtitler.glade
+share/kino/edit.png
+share/kino/export.png
+share/kino/fx.png
+share/kino/insert_after-16.png
+share/kino/insert_after.png
+share/kino/insert_before-16.png
+share/kino/insert_before.png
+share/kino/join.xpm
+share/kino/kino.glade
+share/kino/kino.png
+share/kino/kinoplus.glade
+share/kino/link.xpm
+share/kino/link_off.xpm
+share/kino/magick.glade
+share/kino/publish_project.png
+share/kino/publish_project_16.png
+share/kino/publish_still.png
+share/kino/publish_still_16.png
+share/kino/saveframe.png
+share/kino/saveframe_16.png
+share/kino/split.xpm
+share/kino/stock_media-begin-16.png
+share/kino/stock_media-end-16.png
+share/kino/stock_media-fwd-16.png
+share/kino/stock_media-next-16.png
+share/kino/stock_media-next-frame-16.png
+share/kino/stock_media-pause-16.png
+share/kino/stock_media-play-16.png
+share/kino/stock_media-prev-16.png
+share/kino/stock_media-prev-frame-16.png
+share/kino/stock_media-rec-16.png
+share/kino/stock_media-repeat-alt.png
+share/kino/stock_media-rew-16.png
+share/kino/stock_media-stop-16.png
+share/kino/timeline.png
+share/kino/timfx.glade
+share/kino/trim.png
+share/kino/trim_in.xpm
+share/kino/trim_out.xpm
+share/kino/help/en/AutoSplit.html
+share/kino/help/en/FX.html
+share/kino/help/en/GNU-FDL.html
+share/kino/help/en/appendix.html
+share/kino/help/en/aspectratio.html
+share/kino/help/en/capture.html
+share/kino/help/en/developers.html
+share/kino/help/en/docbook.css
+share/kino/help/en/dropframe.html
+share/kino/help/en/droppedframes.html
+share/kino/help/en/edit.html
+share/kino/help/en/export.html
+share/kino/help/en/export_audio.html
+share/kino/help/en/export_dv.html
+share/kino/help/en/export_export.html
+share/kino/help/en/export_ieee1394.html
+share/kino/help/en/export_other.html
+share/kino/help/en/export_selection.html
+share/kino/help/en/framedropping.html
+share/kino/help/en/fx_audio.html
+share/kino/help/en/fx_selection.html
+share/kino/help/en/fx_video.html
+share/kino/help/en/images/caution.png
+share/kino/help/en/images/important.png
+share/kino/help/en/images/note.png
+share/kino/help/en/images/tip.png
+share/kino/help/en/images/warning.png
+share/kino/help/en/index.html
+share/kino/help/en/interfieldmotion.html
+share/kino/help/en/interlace.html
+share/kino/help/en/intro.html
+share/kino/help/en/jogshuttle.html
+share/kino/help/en/keyboard.html
+share/kino/help/en/keyboard_capture.html
+share/kino/help/en/keyboard_edit.html
+share/kino/help/en/keyboard_export.html
+share/kino/help/en/keyboard_fx.html
+share/kino/help/en/keyboard_timeline.html
+share/kino/help/en/keyboard_trim.html
+share/kino/help/en/kino.xml
+share/kino/help/en/links.html
+share/kino/help/en/locked.html
+share/kino/help/en/media/FX/fx.png
+share/kino/help/en/media/FX/fx_audio/fx_audio_filters/fx_dub/fx-audiofilter-dub.png
+share/kino/help/en/media/FX/fx_audio/fx_audio_filters/fx_gain/fx-audiofilter-gain.png
+share/kino/help/en/media/FX/fx_audio/fx_audio_filters/fx_mix/fx-audiofilter-mix.png
+share/kino/help/en/media/FX/fx_audio/fx_audio_transitions/fx-audiotransition-crossfade.png
+share/kino/help/en/media/FX/fx_selection/fx-overwrite-advanced.png
+share/kino/help/en/media/FX/fx_selection/fx_create/fx_create_colorrange/fx-create-color_range.png
+share/kino/help/en/media/FX/fx_selection/fx_create/fx_create_fixedcolor/fx-create-fixed_color.png
+share/kino/help/en/media/FX/fx_selection/fx_create/fx_create_fromfile/fx-create-from_file.png
+share/kino/help/en/media/FX/fx_selection/fx_create/fx_create_gradient/fx-create-gradient.png
+share/kino/help/en/media/FX/fx_selection/fx_create/fx_create_noise/fx-create-noise.png
+share/kino/help/en/media/FX/fx_video/fx_video_filters/fx_blur/fx-vfilter-blur-eg.png
+share/kino/help/en/media/FX/fx_video/fx_video_filters/fx_blur/fx-vfilter-blur.png
+share/kino/help/en/media/FX/fx_video/fx_video_filters/fx_charcoal/fx-vfilter-charcoal-eg.png
+share/kino/help/en/media/FX/fx_video/fx_video_filters/fx_charcoal/fx-vfilter-charcoal.png
+share/kino/help/en/media/FX/fx_video/fx_video_filters/fx_coloraverage/fx-vfilter-coloravg-eg.png
+share/kino/help/en/media/FX/fx_video/fx_video_filters/fx_coloraverage/fx-vfilter-coloravg.png
+share/kino/help/en/media/FX/fx_video/fx_video_filters/fx_colorhold/fx-vfilter-colorhold-eg.png
+share/kino/help/en/media/FX/fx_video/fx_video_filters/fx_colorhold/fx-vfilter-colorhold.png
+share/kino/help/en/media/FX/fx_video/fx_video_filters/fx_flip/fx-vfilter-flip-eg.png
+share/kino/help/en/media/FX/fx_video/fx_video_filters/fx_flip/fx-vfilter-flip.png
+share/kino/help/en/media/FX/fx_video/fx_video_filters/fx_jerky/fx-vfilter-jerky.png
+share/kino/help/en/media/FX/fx_video/fx_video_filters/fx_kaleidoscope/fx-vfilter-kaleidoscope-eg.png
+share/kino/help/en/media/FX/fx_video/fx_video_filters/fx_kaleidoscope/fx-vfilter-kaleidoscope.png
+share/kino/help/en/media/FX/fx_video/fx_video_filters/fx_levels/fx-vfilter-levels.png
+share/kino/help/en/media/FX/fx_video/fx_video_filters/fx_mirror/fx-vfilter-mirror-eg.png
+share/kino/help/en/media/FX/fx_video/fx_video_filters/fx_mirror/fx-vfilter-mirror.png
+share/kino/help/en/media/FX/fx_video/fx_video_filters/fx_panzoom/fx-vfilter-panzoom-eg.png
+share/kino/help/en/media/FX/fx_video/fx_video_filters/fx_panzoom/fx-vfilter-panzoom.png
+share/kino/help/en/media/FX/fx_video/fx_video_filters/fx_pixelate/fx-vfilter-pixelate-eg.png
+share/kino/help/en/media/FX/fx_video/fx_video_filters/fx_pixelate/fx-vfilter-pixelate.png
+share/kino/help/en/media/FX/fx_video/fx_video_filters/fx_softfocus/fx-vfilter-soft-eg.png
+share/kino/help/en/media/FX/fx_video/fx_video_filters/fx_softfocus/fx-vfilter-soft.png
+share/kino/help/en/media/FX/fx_video/fx_video_filters/fx_superimpose/fx-vfilter-superimpose-eg.png
+share/kino/help/en/media/FX/fx_video/fx_video_filters/fx_superimpose/fx-vfilter-superimpose.png
+share/kino/help/en/media/FX/fx_video/fx_video_filters/fx_titler/fx-vfilter-titler-eg.png
+share/kino/help/en/media/FX/fx_video/fx_video_filters/fx_titler/fx-vfilter-titler.png
+share/kino/help/en/media/FX/fx_video/fx_video_transitions/fx-vtran.png
+share/kino/help/en/media/FX/fx_video/fx_video_transitions/fx_barndoor/fx-vtran-barn-horz-eg.png
+share/kino/help/en/media/FX/fx_video/fx_video_transitions/fx_barndoor/fx-vtran-barn-horz.png
+share/kino/help/en/media/FX/fx_video/fx_video_transitions/fx_barndoor/fx-vtran-barn-vert-eg.png
+share/kino/help/en/media/FX/fx_video/fx_video_transitions/fx_composite/fx-vtran-composite-eg.png
+share/kino/help/en/media/FX/fx_video/fx_video_transitions/fx_composite/fx-vtran-composite.png
+share/kino/help/en/media/FX/fx_video/fx_video_transitions/fx_differences/fx-vtran-diff-eg.png
+share/kino/help/en/media/FX/fx_video/fx_video_transitions/fx_differences/fx-vtran-diff.png
+share/kino/help/en/media/FX/fx_video/fx_video_transitions/fx_dissolve/fx-vtran-dissolve-eg.png
+share/kino/help/en/media/FX/fx_video/fx_video_transitions/fx_dissolve/fx-vtran-dissolve.png
+share/kino/help/en/media/FX/fx_video/fx_video_transitions/fx_luma/fx-vtran-wipe-barleft.png
+share/kino/help/en/media/FX/fx_video/fx_video_transitions/fx_luma/fx-vtran-wipe-barndiag.png
+share/kino/help/en/media/FX/fx_video/fx_video_transitions/fx_luma/fx-vtran-wipe-box.png
+share/kino/help/en/media/FX/fx_video/fx_video_transitions/fx_luma/fx-vtran-wipe-burst.png
+share/kino/help/en/media/FX/fx_video/fx_video_transitions/fx_luma/fx-vtran-wipe-clock.png
+share/kino/help/en/media/FX/fx_video/fx_video_transitions/fx_luma/fx-vtran-wipe-iris.png
+share/kino/help/en/media/FX/fx_video/fx_video_transitions/fx_luma/fx-vtran-wipe-matrix.png
+share/kino/help/en/media/FX/fx_video/fx_video_transitions/fx_luma/fx-vtran-wipe.png
+share/kino/help/en/media/FX/fx_video/fx_video_transitions/fx_push/fx-vtran-push-horz-eg.png
+share/kino/help/en/media/FX/fx_video/fx_video_transitions/fx_push/fx-vtran-push-vert-eg.png
+share/kino/help/en/media/FX/fx_video/fx_video_transitions/fx_push/fx-vtran-push.png
+share/kino/help/en/media/FX/fx_video/keyframing/fx-keyframe-add.png
+share/kino/help/en/media/FX/fx_video/keyframing/fx-keyframing-remove.png
+share/kino/help/en/media/capture/capture-empty.png
+share/kino/help/en/media/edit/button-copy.png
+share/kino/help/en/media/edit/button-cut.png
+share/kino/help/en/media/edit/button-join.png
+share/kino/help/en/media/edit/button-paste.png
+share/kino/help/en/media/edit/button-split.png
+share/kino/help/en/media/edit/edit.png
+share/kino/help/en/media/edit/pointclick/button-append.png
+share/kino/help/en/media/edit/pointclick/button-insert.png
+share/kino/help/en/media/edit/pointclick/file-open.png
+share/kino/help/en/media/export/export_audio/export-audio.png
+share/kino/help/en/media/export/export_dv/export-dv-range.png
+share/kino/help/en/media/export/export_ieee1394/export-1394-enabled.png
+share/kino/help/en/media/export/export_other/export-other-theora.png
+share/kino/help/en/media/export/export_selection/export-range.png
+share/kino/help/en/media/export/mpeg/dvdauthor/export-mpeg-dvd.png
+share/kino/help/en/media/export/mpeg/export-mpeg-vcd.png
+share/kino/help/en/media/export/stills/export-stills-current.png
+share/kino/help/en/media/keyboard/help-keyboard.png
+share/kino/help/en/media/metadata/metadata.png
+share/kino/help/en/media/prefs/prefs0/prefs-defaults.png
+share/kino/help/en/media/prefs/prefs1/prefs-capture.png
+share/kino/help/en/media/prefs/prefs2/prefs-1394-broken.png
+share/kino/help/en/media/prefs/prefs2/prefs-1394-empty.png
+share/kino/help/en/media/prefs/prefs3/prefs-display.png
+share/kino/help/en/media/prefs/prefs4/prefs-audio.png
+share/kino/help/en/media/prefs/prefs5/prefs-jogshuttle.png
+share/kino/help/en/media/prefs/prefs7/prefs-other.png
+share/kino/help/en/media/publish/button-publish_movie.png
+share/kino/help/en/media/terms/jogshuttle/shuttlepro.png
+share/kino/help/en/media/trim/trim.png
+share/kino/help/en/media/ui/kinoui.png
+share/kino/help/en/media/ui/properties.png
+share/kino/help/en/metadata.html
+share/kino/help/en/metadata_example.html
+share/kino/help/en/metanames.html
+share/kino/help/en/metavalues.html
+share/kino/help/en/mode.html
+share/kino/help/en/movie.html
+share/kino/help/en/mpeg.html
+share/kino/help/en/newprojecturi.html
+share/kino/help/en/newprojectxpath.html
+share/kino/help/en/overwrite_insert.html
+share/kino/help/en/pointclick.html
+share/kino/help/en/prefs.html
+share/kino/help/en/prefs0.html
+share/kino/help/en/prefs1.html
+share/kino/help/en/prefs2.html
+share/kino/help/en/prefs3.html
+share/kino/help/en/prefs4.html
+share/kino/help/en/prefs5.html
+share/kino/help/en/prefs7.html
+share/kino/help/en/preview.html
+share/kino/help/en/publish.html
+share/kino/help/en/render.html
+share/kino/help/en/scene.html
+share/kino/help/en/scrubbar.html
+share/kino/help/en/shuttle.html
+share/kino/help/en/stills.html
+share/kino/help/en/terms.html
+share/kino/help/en/time.html
+share/kino/help/en/timecode.html
+share/kino/help/en/timeentry.html
+share/kino/help/en/timeformats.html
+share/kino/help/en/transport.html
+share/kino/help/en/trim.html
+share/kino/help/en/trim_conclusion.html
+share/kino/help/en/trim_storyboard.html
+share/kino/help/en/trimloader.html
+share/kino/help/en/ui.html
+share/kino/help/en/vi.html
+share/kino/help/fr/AutoSplit.html
+share/kino/help/fr/FX.html
+share/kino/help/fr/GNU-FDL.html
+share/kino/help/fr/appendix.html
+share/kino/help/fr/aspectratio.html
+share/kino/help/fr/capture.html
+share/kino/help/fr/developers.html
+share/kino/help/fr/docbook.css
+share/kino/help/fr/dropframe.html
+share/kino/help/fr/droppedframes.html
+share/kino/help/fr/edit.html
+share/kino/help/fr/export.html
+share/kino/help/fr/export_audio.html
+share/kino/help/fr/export_dv.html
+share/kino/help/fr/export_export.html
+share/kino/help/fr/export_ieee1394.html
+share/kino/help/fr/export_other.html
+share/kino/help/fr/export_selection.html
+share/kino/help/fr/framedropping.html
+share/kino/help/fr/fx_audio.html
+share/kino/help/fr/fx_selection.html
+share/kino/help/fr/fx_video.html
+share/kino/help/fr/images/caution.png
+share/kino/help/fr/images/important.png
+share/kino/help/fr/images/note.png
+share/kino/help/fr/images/tip.png
+share/kino/help/fr/images/warning.png
+share/kino/help/fr/index.html
+share/kino/help/fr/interfieldmotion.html
+share/kino/help/fr/interlace.html
+share/kino/help/fr/intro.html
+share/kino/help/fr/jogshuttle.html
+share/kino/help/fr/keyboard.html
+share/kino/help/fr/kino.xml
+share/kino/help/fr/links.html
+share/kino/help/fr/locked.html
+share/kino/help/fr/media/ui/kinoui-fr.png
+share/kino/help/fr/metadata.html
+share/kino/help/fr/metadata_example.html
+share/kino/help/fr/metanames.html
+share/kino/help/fr/metavalues.html
+share/kino/help/fr/mode.html
+share/kino/help/fr/movie.html
+share/kino/help/fr/mpeg.html
+share/kino/help/fr/newprojecturi.html
+share/kino/help/fr/newprojectxpath.html
+share/kino/help/fr/overwrite_insert.html
+share/kino/help/fr/pointclick.html
+share/kino/help/fr/prefs.html
+share/kino/help/fr/prefs0.html
+share/kino/help/fr/prefs1.html
+share/kino/help/fr/prefs2.html
+share/kino/help/fr/prefs3.html
+share/kino/help/fr/prefs4.html
+share/kino/help/fr/prefs5.html
+share/kino/help/fr/prefs7.html
+share/kino/help/fr/preview.html
+share/kino/help/fr/publish.html
+share/kino/help/fr/render.html
+share/kino/help/fr/scene.html
+share/kino/help/fr/scrubbar.html
+share/kino/help/fr/shuttle.html
+share/kino/help/fr/stills.html
+share/kino/help/fr/terms.html
+share/kino/help/fr/time.html
+share/kino/help/fr/timecode.html
+share/kino/help/fr/timeentry.html
+share/kino/help/fr/timeformats.html
+share/kino/help/fr/transport.html
+share/kino/help/fr/trim.html
+share/kino/help/fr/trim_conclusion.html
+share/kino/help/fr/trim_storyboard.html
+share/kino/help/fr/trimloader.html
+share/kino/help/fr/ui.html
+share/kino/help/fr/vi.html
+share/kino/scripts/help.sh
+share/kino/scripts/dvdauthor/dvdauthor-k3b.sh
+share/kino/scripts/dvdauthor/dvdauthor.sh
+share/kino/scripts/dvdauthor/growisofs.sh
+share/kino/scripts/dvdauthor/none.sh
+share/kino/scripts/dvdauthor/qdvdauthor.sh
+share/kino/scripts/exports/extract_chapters
+share/kino/scripts/exports/ffmpeg2theora.sh
+share/kino/scripts/exports/ffmpeg_3gp.sh
+share/kino/scripts/exports/ffmpeg_divx.sh
+share/kino/scripts/exports/ffmpeg_divx_dual.sh
+share/kino/scripts/exports/ffmpeg_dvd.sh
+share/kino/scripts/exports/ffmpeg_dvd_dual.sh
+share/kino/scripts/exports/ffmpeg_flv.sh
+share/kino/scripts/exports/ffmpeg_h264.sh
+share/kino/scripts/exports/ffmpeg_h264_dual.sh
+share/kino/scripts/exports/ffmpeg_mp3.sh
+share/kino/scripts/exports/ffmpeg_mp4.sh
+share/kino/scripts/exports/ffmpeg_mp4_dual.sh
+share/kino/scripts/exports/ffmpeg_utils.sh
+share/kino/scripts/exports/ffmpeg_vcd.sh
+share/kino/scripts/exports/ffmpeg_xvid.sh
+share/kino/scripts/exports/ffmpeg_xvid_dual.sh
+share/kino/scripts/exports/mencoder.sh
+share/kino/scripts/exports/rawplay.sh
+share/kino/scripts/import/audio.sh
+share/kino/scripts/import/media.sh
+share/kino/scripts/publish/bliptv_frame.sh
+share/kino/scripts/publish/bliptv_project.sh
+share/kino/scripts/publish/echo.sh
+share/kino/scripts/publish/frame.sh
+share/kino/scripts/publish/project.sh
+share/kino/lumas/bar_bottom.png
+share/kino/lumas/bar_left.png
+share/kino/lumas/bar_right.png
+share/kino/lumas/bar_top.png
+share/kino/lumas/barn_bottomleft.png
+share/kino/lumas/barn_horz.png
+share/kino/lumas/barn_topleft.png
+share/kino/lumas/barn_vert.png
+share/kino/lumas/box_bottomcentre.png
+share/kino/lumas/box_bottomleft.png
+share/kino/lumas/box_bottomright.png
+share/kino/lumas/box_leftcentre.png
+share/kino/lumas/box_rightcentre.png
+share/kino/lumas/box_topcentre.png
+share/kino/lumas/box_topleft.png
+share/kino/lumas/box_topright.png
+share/kino/lumas/burst.png
+share/kino/lumas/checkerboard_small.png
+share/kino/lumas/clock.png
+share/kino/lumas/clock_clockwise12.png
+share/kino/lumas/clock_clockwise6.png
+share/kino/lumas/diag_bottomleft.png
+share/kino/lumas/diag_bottomright.png
+share/kino/lumas/diag_topleft.png
+share/kino/lumas/diag_topright.png
+share/kino/lumas/fourbox_in.png
+share/kino/lumas/fourbox_out.png
+share/kino/lumas/horizontal_barn_doors.png
+share/kino/lumas/horizontal_blinds.png
+share/kino/lumas/iris_circle.png
+share/kino/lumas/iris_rectangle.png
+share/kino/lumas/left_to_right.png
+share/kino/lumas/matrix_snake_toplefthorizontal.png
+share/kino/lumas/none.png
+share/kino/lumas/symmetric_clock.png
+share/pixmaps/kino.png
 share/locale/ca/LC_MESSAGES/kino.mo
 share/locale/cs/LC_MESSAGES/kino.mo
 share/locale/da/LC_MESSAGES/kino.mo
@@ -398,83 +398,84 @@ share/locale/sv/LC_MESSAGES/kino.mo
 share/mime/packages/kino.xml
 @dirrm include/kino
 @dirrm lib/kino-gtk2
-@dirrm share/gnome/kino/help/en/media/ui
-@dirrm share/gnome/kino/help/en/media/trim
-@dirrm share/gnome/kino/help/en/media/terms/jogshuttle
-@dirrm share/gnome/kino/help/en/media/terms
-@dirrm share/gnome/kino/help/en/media/publish
-@dirrm share/gnome/kino/help/en/media/prefs/prefs7
-@dirrm share/gnome/kino/help/en/media/prefs/prefs5
-@dirrm share/gnome/kino/help/en/media/prefs/prefs4
-@dirrm share/gnome/kino/help/en/media/prefs/prefs3
-@dirrm share/gnome/kino/help/en/media/prefs/prefs2
-@dirrm share/gnome/kino/help/en/media/prefs/prefs1
-@dirrm share/gnome/kino/help/en/media/prefs/prefs0
-@dirrm share/gnome/kino/help/en/media/prefs
-@dirrm share/gnome/kino/help/en/media/metadata
-@dirrm share/gnome/kino/help/en/media/keyboard
-@dirrm share/gnome/kino/help/en/media/export/stills
-@dirrm share/gnome/kino/help/en/media/export/mpeg/dvdauthor
-@dirrm share/gnome/kino/help/en/media/export/mpeg
-@dirrm share/gnome/kino/help/en/media/export/export_selection
-@dirrm share/gnome/kino/help/en/media/export/export_other
-@dirrm share/gnome/kino/help/en/media/export/export_ieee1394
-@dirrm share/gnome/kino/help/en/media/export/export_dv
-@dirrm share/gnome/kino/help/en/media/export/export_audio
-@dirrm share/gnome/kino/help/en/media/export
-@dirrm share/gnome/kino/help/en/media/edit/pointclick
-@dirrm share/gnome/kino/help/en/media/edit
-@dirrm share/gnome/kino/help/en/media/capture
-@dirrm share/gnome/kino/help/en/media/FX/fx_video/keyframing
-@dirrm share/gnome/kino/help/en/media/FX/fx_video/fx_video_transitions/fx_push
-@dirrm share/gnome/kino/help/en/media/FX/fx_video/fx_video_transitions/fx_luma
-@dirrm share/gnome/kino/help/en/media/FX/fx_video/fx_video_transitions/fx_dissolve
-@dirrm share/gnome/kino/help/en/media/FX/fx_video/fx_video_transitions/fx_differences
-@dirrm share/gnome/kino/help/en/media/FX/fx_video/fx_video_transitions/fx_composite
-@dirrm share/gnome/kino/help/en/media/FX/fx_video/fx_video_transitions/fx_barndoor
-@dirrm share/gnome/kino/help/en/media/FX/fx_video/fx_video_transitions
-@dirrm share/gnome/kino/help/en/media/FX/fx_video/fx_video_filters/fx_titler
-@dirrm share/gnome/kino/help/en/media/FX/fx_video/fx_video_filters/fx_superimpose
-@dirrm share/gnome/kino/help/en/media/FX/fx_video/fx_video_filters/fx_softfocus
-@dirrm share/gnome/kino/help/en/media/FX/fx_video/fx_video_filters/fx_pixelate
-@dirrm share/gnome/kino/help/en/media/FX/fx_video/fx_video_filters/fx_panzoom
-@dirrm share/gnome/kino/help/en/media/FX/fx_video/fx_video_filters/fx_mirror
-@dirrm share/gnome/kino/help/en/media/FX/fx_video/fx_video_filters/fx_levels
-@dirrm share/gnome/kino/help/en/media/FX/fx_video/fx_video_filters/fx_kaleidoscope
-@dirrm share/gnome/kino/help/en/media/FX/fx_video/fx_video_filters/fx_jerky
-@dirrm share/gnome/kino/help/en/media/FX/fx_video/fx_video_filters/fx_flip
-@dirrm share/gnome/kino/help/en/media/FX/fx_video/fx_video_filters/fx_colorhold
-@dirrm share/gnome/kino/help/en/media/FX/fx_video/fx_video_filters/fx_coloraverage
-@dirrm share/gnome/kino/help/en/media/FX/fx_video/fx_video_filters/fx_charcoal
-@dirrm share/gnome/kino/help/en/media/FX/fx_video/fx_video_filters/fx_blur
-@dirrm share/gnome/kino/help/en/media/FX/fx_video/fx_video_filters
-@dirrm share/gnome/kino/help/en/media/FX/fx_video
-@dirrm share/gnome/kino/help/en/media/FX/fx_selection/fx_create/fx_create_noise
-@dirrm share/gnome/kino/help/en/media/FX/fx_selection/fx_create/fx_create_gradient
-@dirrm share/gnome/kino/help/en/media/FX/fx_selection/fx_create/fx_create_fromfile
-@dirrm share/gnome/kino/help/en/media/FX/fx_selection/fx_create/fx_create_fixedcolor
-@dirrm share/gnome/kino/help/en/media/FX/fx_selection/fx_create/fx_create_colorrange
-@dirrm share/gnome/kino/help/en/media/FX/fx_selection/fx_create
-@dirrm share/gnome/kino/help/en/media/FX/fx_selection
-@dirrm share/gnome/kino/help/en/media/FX/fx_audio/fx_audio_transitions
-@dirrm share/gnome/kino/help/en/media/FX/fx_audio/fx_audio_filters/fx_mix
-@dirrm share/gnome/kino/help/en/media/FX/fx_audio/fx_audio_filters/fx_gain
-@dirrm share/gnome/kino/help/en/media/FX/fx_audio/fx_audio_filters/fx_dub
-@dirrm share/gnome/kino/help/en/media/FX/fx_audio/fx_audio_filters
-@dirrm share/gnome/kino/help/en/media/FX/fx_audio
-@dirrm share/gnome/kino/help/en/media/FX
-@dirrm share/gnome/kino/help/en/media/
-@dirrm share/gnome/kino/help/en/images
-@dirrm share/gnome/kino/help/en
-@dirrm share/gnome/kino/help/fr/images
-@dirrm share/gnome/kino/help/fr/media/ui
-@dirrm share/gnome/kino/help/fr/media
-@dirrm share/gnome/kino/help/fr
-@dirrm share/gnome/kino/help
-@dirrm share/gnome/kino/lumas
-@dirrm share/gnome/kino/scripts/dvdauthor
-@dirrm share/gnome/kino/scripts/exports
-@dirrm share/gnome/kino/scripts/import
-@dirrm share/gnome/kino/scripts/publish
-@dirrm share/gnome/kino/scripts
-@dirrm share/gnome/kino
+@dirrm share/kino/help/en/media/ui
+@dirrm share/kino/help/en/media/trim
+@dirrm share/kino/help/en/media/terms/jogshuttle
+@dirrm share/kino/help/en/media/terms
+@dirrm share/kino/help/en/media/publish
+@dirrm share/kino/help/en/media/prefs/prefs7
+@dirrm share/kino/help/en/media/prefs/prefs5
+@dirrm share/kino/help/en/media/prefs/prefs4
+@dirrm share/kino/help/en/media/prefs/prefs3
+@dirrm share/kino/help/en/media/prefs/prefs2
+@dirrm share/kino/help/en/media/prefs/prefs1
+@dirrm share/kino/help/en/media/prefs/prefs0
+@dirrm share/kino/help/en/media/prefs
+@dirrm share/kino/help/en/media/metadata
+@dirrm share/kino/help/en/media/keyboard
+@dirrm share/kino/help/en/media/export/stills
+@dirrm share/kino/help/en/media/export/mpeg/dvdauthor
+@dirrm share/kino/help/en/media/export/mpeg
+@dirrm share/kino/help/en/media/export/export_selection
+@dirrm share/kino/help/en/media/export/export_other
+@dirrm share/kino/help/en/media/export/export_ieee1394
+@dirrm share/kino/help/en/media/export/export_dv
+@dirrm share/kino/help/en/media/export/export_audio
+@dirrm share/kino/help/en/media/export
+@dirrm share/kino/help/en/media/edit/pointclick
+@dirrm share/kino/help/en/media/edit
+@dirrm share/kino/help/en/media/capture
+@dirrm share/kino/help/en/media/FX/fx_video/keyframing
+@dirrm share/kino/help/en/media/FX/fx_video/fx_video_transitions/fx_push
+@dirrm share/kino/help/en/media/FX/fx_video/fx_video_transitions/fx_luma
+@dirrm share/kino/help/en/media/FX/fx_video/fx_video_transitions/fx_dissolve
+@dirrm share/kino/help/en/media/FX/fx_video/fx_video_transitions/fx_differences
+@dirrm share/kino/help/en/media/FX/fx_video/fx_video_transitions/fx_composite
+@dirrm share/kino/help/en/media/FX/fx_video/fx_video_transitions/fx_barndoor
+@dirrm share/kino/help/en/media/FX/fx_video/fx_video_transitions
+@dirrm share/kino/help/en/media/FX/fx_video/fx_video_filters/fx_titler
+@dirrm share/kino/help/en/media/FX/fx_video/fx_video_filters/fx_superimpose
+@dirrm share/kino/help/en/media/FX/fx_video/fx_video_filters/fx_softfocus
+@dirrm share/kino/help/en/media/FX/fx_video/fx_video_filters/fx_pixelate
+@dirrm share/kino/help/en/media/FX/fx_video/fx_video_filters/fx_panzoom
+@dirrm share/kino/help/en/media/FX/fx_video/fx_video_filters/fx_mirror
+@dirrm share/kino/help/en/media/FX/fx_video/fx_video_filters/fx_levels
+@dirrm share/kino/help/en/media/FX/fx_video/fx_video_filters/fx_kaleidoscope
+@dirrm share/kino/help/en/media/FX/fx_video/fx_video_filters/fx_jerky
+@dirrm share/kino/help/en/media/FX/fx_video/fx_video_filters/fx_flip
+@dirrm share/kino/help/en/media/FX/fx_video/fx_video_filters/fx_colorhold
+@dirrm share/kino/help/en/media/FX/fx_video/fx_video_filters/fx_coloraverage
+@dirrm share/kino/help/en/media/FX/fx_video/fx_video_filters/fx_charcoal
+@dirrm share/kino/help/en/media/FX/fx_video/fx_video_filters/fx_blur
+@dirrm share/kino/help/en/media/FX/fx_video/fx_video_filters
+@dirrm share/kino/help/en/media/FX/fx_video
+@dirrm share/kino/help/en/media/FX/fx_selection/fx_create/fx_create_noise
+@dirrm share/kino/help/en/media/FX/fx_selection/fx_create/fx_create_gradient
+@dirrm share/kino/help/en/media/FX/fx_selection/fx_create/fx_create_fromfile
+@dirrm share/kino/help/en/media/FX/fx_selection/fx_create/fx_create_fixedcolor
+@dirrm share/kino/help/en/media/FX/fx_selection/fx_create/fx_create_colorrange
+@dirrm share/kino/help/en/media/FX/fx_selection/fx_create
+@dirrm share/kino/help/en/media/FX/fx_selection
+@dirrm share/kino/help/en/media/FX/fx_audio/fx_audio_transitions
+@dirrm share/kino/help/en/media/FX/fx_audio/fx_audio_filters/fx_mix
+@dirrm share/kino/help/en/media/FX/fx_audio/fx_audio_filters/fx_gain
+@dirrm share/kino/help/en/media/FX/fx_audio/fx_audio_filters/fx_dub
+@dirrm share/kino/help/en/media/FX/fx_audio/fx_audio_filters
+@dirrm share/kino/help/en/media/FX/fx_audio
+@dirrm share/kino/help/en/media/FX
+@dirrm share/kino/help/en/media/
+@dirrm share/kino/help/en/images
+@dirrm share/kino/help/en
+@dirrm share/kino/help/fr/images
+@dirrm share/kino/help/fr/media/ui
+@dirrm share/kino/help/fr/media
+@dirrm share/kino/help/fr
+@dirrm share/kino/help
+@dirrm share/kino/lumas
+@dirrm share/kino/scripts/dvdauthor
+@dirrm share/kino/scripts/exports
+@dirrm share/kino/scripts/import
+@dirrm share/kino/scripts/publish
+@dirrm share/kino/scripts
+@dirrm share/kino
+@dirrmtry share/applications
diff --git a/multimedia/linux-realplayer/Makefile b/multimedia/linux-realplayer/Makefile
index 65114b78fa88..2ba78d87ebf5 100644
--- a/multimedia/linux-realplayer/Makefile
+++ b/multimedia/linux-realplayer/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	linux-realplayer
 DISTVERSION=	10.0.8.805-20060718
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	multimedia audio linux
 MASTER_SITES=	https://helixcommunity.org/download.php/2152/:player \
 		http://ftp.nluug.nl/ftp/pub/os/Linux/distr/pardusrepo/sources/:playeralt \
@@ -27,6 +27,7 @@ USE_LINUX=	yes
 USE_X_PREFIX=	yes
 RESTRICTED=	Redistribution not allowed
 NO_BUILD=	yes
+WANT_GNOME=	yes
 
 RADIR=		${PREFIX}/lib/RealPlayer
 PLUGINSDIR=	${PREFIX}/lib/linux-mozilla/plugins
@@ -47,7 +48,7 @@ PLIST_SUB+=	ICONS=""
 PLIST_SUB+=	ICONS="@comment "
 .endif
 
-.if exists(${LOCALBASE}/share/gnome)
+.if ${HAVE_GNOME:Mgnomehier}!=""
 WITH_GNOME=	yes
 PLIST_SUB+=	GNOME=""
 .else
@@ -115,21 +116,21 @@ do-install:
 .endif
 
 .if defined(WITH_GNOME)
-	@${MKDIR} ${LOCALBASE}/share/gnome/pixmaps
+	@${MKDIR} ${LOCALBASE}/share/pixmaps
 	${INSTALL_DATA} ${WRKSRC}/share/realplay.png \
-		${LOCALBASE}/share/gnome/pixmaps
+		${LOCALBASE}/share/pixmaps
 
-	@${MKDIR} ${LOCALBASE}/share/gnome/applications
+	@${MKDIR} ${LOCALBASE}/share/applications
 	${INSTALL_DATA} ${WRKSRC}/share/realplay.desktop \
-		${LOCALBASE}/share/gnome/applications
+		${LOCALBASE}/share/applications
 
-	@${MKDIR} ${LOCALBASE}/share/gnome/application-registry
+	@${MKDIR} ${LOCALBASE}/share/application-registry
 	${INSTALL_DATA} ${WRKSRC}/share/realplay.applications \
-		${LOCALBASE}/share/gnome/application-registry
+		${LOCALBASE}/share/application-registry
 
-	@${MKDIR} ${LOCALBASE}/share/gnome/mime-info
+	@${MKDIR} ${LOCALBASE}/share/mime-info
 	${INSTALL_DATA} ${WRKSRC}/share/realplay.keys ${WRKSRC}/share/realplay.mime \
-		${LOCALBASE}/share/gnome/mime-info
+		${LOCALBASE}/share/mime-info
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/multimedia/linux-realplayer/pkg-plist b/multimedia/linux-realplayer/pkg-plist
index 794ce4134501..6de623f44c6a 100644
--- a/multimedia/linux-realplayer/pkg-plist
+++ b/multimedia/linux-realplayer/pkg-plist
@@ -180,11 +180,11 @@ lib/linux-mozilla/plugins/nphelix.xpt
 @dirrmtry lib/linux-mozilla/plugins
 @dirrmtry lib/linux-mozilla
 %%X11%%@cwd %%LOCALBASE%%
-%%GNOME%%share/gnome/application-registry/realplay.applications
-%%GNOME%%share/gnome/applications/realplay.desktop
-%%GNOME%%share/gnome/mime-info/realplay.keys
-%%GNOME%%share/gnome/mime-info/realplay.mime
-%%GNOME%%share/gnome/pixmaps/realplay.png
+%%GNOME%%share/application-registry/realplay.applications
+%%GNOME%%share/applications/realplay.desktop
+%%GNOME%%share/mime-info/realplay.keys
+%%GNOME%%share/mime-info/realplay.mime
+%%GNOME%%share/pixmaps/realplay.png
 %%ICONS%%share/icons/hicolor/16x16/apps/realplay_16x16.png
 %%ICONS%%share/icons/hicolor/192x192/apps/realplay_192x192.png
 %%ICONS%%share/icons/hicolor/192x192/mimetypes/mime-application-generic_192x192.png
@@ -231,10 +231,10 @@ lib/linux-mozilla/plugins/nphelix.xpt
 %%ICONS%%share/icons/hicolor/48x48/mimetypes/mime-video-ogg_48x48.png
 %%ICONS%%share/icons/hicolor/48x48/mimetypes/mime-video-rv_48x48.png
 %%ICONS%%share/icons/hicolor/48x48/mimetypes/mime-video-swf_48x48.png
-%%GNOME%%@dirrmtry share/gnome/application-registry
-%%GNOME%%@dirrmtry share/gnome/applications
-%%GNOME%%@dirrmtry share/gnome/mime-info
-%%GNOME%%@dirrmtry share/gnome/pixmaps
+%%GNOME%%@dirrmtry share/application-registry
+%%GNOME%%@dirrmtry share/applications
+%%GNOME%%@dirrmtry share/mime-info
+%%GNOME%%@dirrmtry share/pixmaps
 %%ICONS%%@dirrmtry share/icons/hicolor/48x48/apps
 %%ICONS%%@dirrmtry share/icons/hicolor/48x48/mimetypes
 %%ICONS%%@dirrmtry share/icons/hicolor/48x48
diff --git a/multimedia/ogle-gui/Makefile b/multimedia/ogle-gui/Makefile
index 8f4a85980b0f..11f4a3f00e8f 100644
--- a/multimedia/ogle-gui/Makefile
+++ b/multimedia/ogle-gui/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ogle
 PORTVERSION=	0.9.2
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	multimedia gnome
 MASTER_SITES=	http://www.dtek.chalmers.se/groups/dvd/dist/
 PKGNAMESUFFIX=	-gui
diff --git a/multimedia/ogle-gui/pkg-plist b/multimedia/ogle-gui/pkg-plist
index b3a235aa99de..f8e02b44e8a4 100644
--- a/multimedia/ogle-gui/pkg-plist
+++ b/multimedia/ogle-gui/pkg-plist
@@ -1,27 +1,27 @@
 lib/ogle/ogle_gui
-share/gnome/ogle_gui/angle.xpm
-share/gnome/ogle_gui/enter.xpm
-share/gnome/ogle_gui/fastforward.xpm
-share/gnome/ogle_gui/go_up.xpm
-share/gnome/ogle_gui/menus.xpm
-share/gnome/ogle_gui/ogle.xpm
-share/gnome/ogle_gui/ogle_gui.glade
-share/gnome/ogle_gui/ogle_gui.glade2
-share/gnome/ogle_gui/rewind.xpm
-share/gnome/ogle_gui/skip_backwards.xpm
-share/gnome/ogle_gui/skip_forwards.xpm
-share/gnome/ogle_gui/stock_down_arrow.xpm
-share/gnome/ogle_gui/stock_first.xpm
-share/gnome/ogle_gui/stock_last.xpm
-share/gnome/ogle_gui/stock_left_arrow.xpm
-share/gnome/ogle_gui/stock_pause.xpm
-share/gnome/ogle_gui/stock_right_arrow.xpm
-share/gnome/ogle_gui/stock_stop.xpm
-share/gnome/ogle_gui/stock_timer.xpm
-share/gnome/ogle_gui/stock_timer_stopped.xpm
-share/gnome/ogle_gui/stock_up_arrow.xpm
-share/gnome/ogle_gui/stock_volume.xpm
-share/gnome/ogle_gui/subpicture.xpm
+share/ogle_gui/angle.xpm
+share/ogle_gui/enter.xpm
+share/ogle_gui/fastforward.xpm
+share/ogle_gui/go_up.xpm
+share/ogle_gui/menus.xpm
+share/ogle_gui/ogle.xpm
+share/ogle_gui/ogle_gui.glade
+share/ogle_gui/ogle_gui.glade2
+share/ogle_gui/rewind.xpm
+share/ogle_gui/skip_backwards.xpm
+share/ogle_gui/skip_forwards.xpm
+share/ogle_gui/stock_down_arrow.xpm
+share/ogle_gui/stock_first.xpm
+share/ogle_gui/stock_last.xpm
+share/ogle_gui/stock_left_arrow.xpm
+share/ogle_gui/stock_pause.xpm
+share/ogle_gui/stock_right_arrow.xpm
+share/ogle_gui/stock_stop.xpm
+share/ogle_gui/stock_timer.xpm
+share/ogle_gui/stock_timer_stopped.xpm
+share/ogle_gui/stock_up_arrow.xpm
+share/ogle_gui/stock_volume.xpm
+share/ogle_gui/subpicture.xpm
 share/locale/da/LC_MESSAGES/ogle_gui.mo
 share/locale/de/LC_MESSAGES/ogle_gui.mo
 share/locale/fr/LC_MESSAGES/ogle_gui.mo
@@ -29,5 +29,5 @@ share/locale/nl/LC_MESSAGES/ogle_gui.mo
 share/locale/pt/LC_MESSAGES/ogle_gui.mo
 share/locale/sv/LC_MESSAGES/ogle_gui.mo
 @dirrmtry share/locale
-@dirrm share/gnome/ogle_gui
+@dirrm share/ogle_gui
 @dirrm lib/ogle
diff --git a/multimedia/quark/Makefile b/multimedia/quark/Makefile
index 3c4232e9b0b4..ed9edea66e34 100644
--- a/multimedia/quark/Makefile
+++ b/multimedia/quark/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	quark
 PORTVERSION=	3.21
-PORTREVISION=	14
+PORTREVISION=	15
 CATEGORIES=	multimedia gnome
 MASTER_SITES=	http://quark.sunsite.dk/ \
 		http://demian.dyndns.org/src/
@@ -29,6 +29,8 @@ GCONF_SCHEMAS=	quark.schemas strange-quark.schemas
 post-patch:
 	@${REINPLACE_CMD} -e \
 		's|CFLAGS="-g |CFLAGS="$$CFLAGS |g' ${WRKSRC}/configure
+	@${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} ${REINPLACE_CMD} -e \
+		's|-D.*_DISABLE_DEPRECATED||g'
 
 post-install:
 .if !defined(NOPORTDOCS)
diff --git a/multimedia/quark/pkg-plist b/multimedia/quark/pkg-plist
index 403f0d2ac4cf..8c1257910ee7 100644
--- a/multimedia/quark/pkg-plist
+++ b/multimedia/quark/pkg-plist
@@ -1,6 +1,7 @@
 bin/charm-quark
 bin/quark
 bin/strange-quark
-share/gnome/applications/quark.desktop
-share/gnome/pixmaps/quark.png
+share/applications/quark.desktop
+share/pixmaps/quark.png
 share/locale/ko/LC_MESSAGES/quark.mo
+@dirrmtry share/applications
diff --git a/multimedia/totem/Makefile b/multimedia/totem/Makefile
index 6cc85fbada58..564c2e8c4269 100644
--- a/multimedia/totem/Makefile
+++ b/multimedia/totem/Makefile
@@ -3,11 +3,11 @@
 # Whom:                 Hendrik Scholz <hendrik@scholz.net>
 #
 # $FreeBSD$
-#    $MCom: ports/multimedia/totem/Makefile,v 1.77 2007/03/11 05:25:07 mezz Exp $
+#   $MCom: ports/multimedia/totem/Makefile,v 1.89 2007/10/17 17:22:32 mezz Exp $
 #
 
 PORTNAME=	totem
-PORTVERSION=	2.18.2
+PORTVERSION=	2.20.1
 PORTREVISION?=	0
 CATEGORIES=	multimedia gnome
 MASTER_SITES=	GNOME
@@ -25,7 +25,7 @@ USE_BZIP2=	yes
 USE_GETTEXT=	yes
 USE_XLIB=	yes
 USE_GNOME=	gnomeprefix intlhack gnomehack gnomedesktop desktopfileutils \
-		nautiluscdburner ltverhack
+		nautiluscdburner ltverhack gnomecontrolcenter2
 GNOME_DESKTOP_VERSION=2
 WANT_GSTREAMER=	yes
 INSTALLS_ICONS=	yes
@@ -34,16 +34,38 @@ USE_AUTOTOOLS=	libtool:15
 USE_LDCONFIG=	yes
 INSTALLS_OMF=	yes
 PKGMESSAGE=	${WRKDIR}/pkg-message
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
-	       	LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib -lXrandr"
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+	       	LIBS="-L${LOCALBASE}/lib -lXrandr"
+CONFIGURE_ARGS=	--with-plugins="${TOTEM_PLUGINS}"
 
 MAN1=		totem.1 totem-video-thumbnailer.1
 GCONF_SCHEMAS=	totem-handlers.schemas totem-video-thumbnail.schemas \
 		totem.schemas
 CONFLICTS?=	totem-gstreamer-[0-9]* totem-xine-[0-9]*
 
+OPTIONS=	LIRC "Enable lirc support" off \
+		GALAGO "Enable Galago support" off
+
+TOTEM_PLUGINS=	screensaver ontop gromit media-player-keys properties sidebar-test skipto
+
 .include <bsd.port.pre.mk>
 
+.if defined(WITH_LIRC)
+LIB_DEPENDS+=	lirc_client.1:${PORTSDIR}/comms/lirc
+PLIST_SUB+=	LIRC=""
+TOTEM_PLUGINS:=	${TOTEM_PLUGINS} lirc
+.else
+PLIST_SUB+=	LIRC="@comment "
+.endif
+
+.if defined(WITH_GALAGO)
+LIB_DEPENDS+=	galago.3:${PORTSDIR}/devel/libgalago
+PLIST_SUB+=	GALAGO=""
+TOTEM_PLUGINS:=	${TOTEM_PLUGINS} galago
+.else
+PLIST_SUB+=	GALAGO="@comment "
+.endif
+
 .if defined(WITH_MOZILLA_PLUGIN) && ${SLAVE_PORT:L}=="yes"
 USE_GECKO=	firefox mozilla seamonkey xulrunner<->firefox firefox-devel<->firefox
 .include "${PORTSDIR}/www/mozilla/bsd.gecko.mk"
@@ -102,5 +124,8 @@ post-patch:
 
 post-install:
 	@-update-desktop-database
+	${MKDIR} ${PREFIX}/share/vala/vapi
+	${INSTALL_DATA} ${WRKSRC}/bindings/vala/totem.vala ${PREFIX}/share/vala/vapi
+	${INSTALL_DATA} ${WRKSRC}/bindings/vala/totem.deps ${PREFIX}/share/vala/vapi
 
 .include <bsd.port.post.mk>
diff --git a/multimedia/totem/distinfo b/multimedia/totem/distinfo
index 5760d7220df2..62e019125a40 100644
--- a/multimedia/totem/distinfo
+++ b/multimedia/totem/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/totem-2.18.2.tar.bz2) = a77ca6f0c56b2fc6ececd8158bb0cdca
-SHA256 (gnome2/totem-2.18.2.tar.bz2) = ee310ae84cd8607548f25e802415262e247cb242bbe33c050fde34ce9a4cc2de
-SIZE (gnome2/totem-2.18.2.tar.bz2) = 2076779
+MD5 (gnome2/totem-2.20.1.tar.bz2) = 6627727e7abd7a7f95257be8df6359a6
+SHA256 (gnome2/totem-2.20.1.tar.bz2) = 59bd1fcbc723d32a678eeacf200394da4d8ae16dcd8ab36352659b55c29d04f5
+SIZE (gnome2/totem-2.20.1.tar.bz2) = 2196437
diff --git a/multimedia/totem/files/patch-browser-plugin_Makefile.in b/multimedia/totem/files/patch-browser-plugin_Makefile.in
index 2dd84be05bc8..df0d82b25039 100644
--- a/multimedia/totem/files/patch-browser-plugin_Makefile.in
+++ b/multimedia/totem/files/patch-browser-plugin_Makefile.in
@@ -1,110 +1,124 @@
---- browser-plugin/Makefile.in.orig	Fri Mar  2 07:22:29 2007
-+++ browser-plugin/Makefile.in	Fri Mar  2 07:24:05 2007
-@@ -72,7 +72,7 @@
+--- browser-plugin/Makefile.in.orig	2007-09-16 18:59:35.000000000 -0400
++++ browser-plugin/Makefile.in	2007-09-16 19:00:59.000000000 -0400
+@@ -69,7 +69,7 @@
  pluginLTLIBRARIES_INSTALL = $(INSTALL)
  LTLIBRARIES = $(noinst_LTLIBRARIES) $(plugin_LTLIBRARIES)
  am__DEPENDENCIES_1 =
 -@ENABLE_BASIC_PLUGIN_TRUE@libtotem_basic_plugin_la_DEPENDENCIES = $(top_builddir)/src/plparse/libtotem-plparser-mini.la \
 +@ENABLE_BASIC_PLUGIN_TRUE@libtotem_basic_plugin_la_DEPENDENCIES = \
- @ENABLE_BASIC_PLUGIN_TRUE@	libtotempluginviewer_marshal.la \
+ @ENABLE_BASIC_PLUGIN_TRUE@	libtotempluginviewer_helper.la \
  @ENABLE_BASIC_PLUGIN_TRUE@	$(am__DEPENDENCIES_1) \
  @ENABLE_BASIC_PLUGIN_TRUE@	$(am__DEPENDENCIES_1)
-@@ -88,7 +88,7 @@
- 	$(am_libtotem_basic_plugin_la_OBJECTS)
+@@ -89,7 +89,7 @@
+ 	$(libtotem_basic_plugin_la_LDFLAGS) $(LDFLAGS) -o $@
  @ENABLE_BASIC_PLUGIN_TRUE@am_libtotem_basic_plugin_la_rpath = -rpath \
  @ENABLE_BASIC_PLUGIN_TRUE@	$(plugindir)
 -@ENABLE_COMPLEX_PLUGIN_TRUE@libtotem_complex_plugin_la_DEPENDENCIES = $(top_builddir)/src/plparse/libtotem-plparser-mini.la \
 +@ENABLE_COMPLEX_PLUGIN_TRUE@libtotem_complex_plugin_la_DEPENDENCIES = \
- @ENABLE_COMPLEX_PLUGIN_TRUE@	libtotempluginviewer_marshal.la \
+ @ENABLE_COMPLEX_PLUGIN_TRUE@	libtotempluginviewer_helper.la \
  @ENABLE_COMPLEX_PLUGIN_TRUE@	$(am__DEPENDENCIES_1) \
  @ENABLE_COMPLEX_PLUGIN_TRUE@	$(am__DEPENDENCIES_1)
-@@ -104,7 +104,7 @@
- 	$(am_libtotem_complex_plugin_la_OBJECTS)
+@@ -109,7 +109,7 @@
+ 	$(libtotem_complex_plugin_la_LDFLAGS) $(LDFLAGS) -o $@
  @ENABLE_COMPLEX_PLUGIN_TRUE@am_libtotem_complex_plugin_la_rpath =  \
  @ENABLE_COMPLEX_PLUGIN_TRUE@	-rpath $(plugindir)
 -@ENABLE_GMP_PLUGIN_TRUE@libtotem_gmp_plugin_la_DEPENDENCIES = $(top_builddir)/src/plparse/libtotem-plparser-mini.la \
 +@ENABLE_GMP_PLUGIN_TRUE@libtotem_gmp_plugin_la_DEPENDENCIES = \
- @ENABLE_GMP_PLUGIN_TRUE@	libtotempluginviewer_marshal.la \
+ @ENABLE_GMP_PLUGIN_TRUE@	libtotempluginviewer_helper.la \
  @ENABLE_GMP_PLUGIN_TRUE@	$(am__DEPENDENCIES_1) \
  @ENABLE_GMP_PLUGIN_TRUE@	$(am__DEPENDENCIES_1)
-@@ -124,7 +124,7 @@
- libtotem_gmp_plugin_la_OBJECTS = $(am_libtotem_gmp_plugin_la_OBJECTS)
+@@ -133,7 +133,7 @@
+ 	$(libtotem_gmp_plugin_la_LDFLAGS) $(LDFLAGS) -o $@
  @ENABLE_GMP_PLUGIN_TRUE@am_libtotem_gmp_plugin_la_rpath = -rpath \
  @ENABLE_GMP_PLUGIN_TRUE@	$(plugindir)
 -@ENABLE_MULLY_PLUGIN_TRUE@libtotem_mully_plugin_la_DEPENDENCIES = $(top_builddir)/src/plparse/libtotem-plparser-mini.la \
 +@ENABLE_MULLY_PLUGIN_TRUE@libtotem_mully_plugin_la_DEPENDENCIES = \
- @ENABLE_MULLY_PLUGIN_TRUE@	libtotempluginviewer_marshal.la \
+ @ENABLE_MULLY_PLUGIN_TRUE@	libtotempluginviewer_helper.la \
  @ENABLE_MULLY_PLUGIN_TRUE@	$(am__DEPENDENCIES_1) \
  @ENABLE_MULLY_PLUGIN_TRUE@	$(am__DEPENDENCIES_1)
-@@ -140,7 +140,7 @@
- 	$(am_libtotem_mully_plugin_la_OBJECTS)
+@@ -153,7 +153,7 @@
+ 	$(libtotem_mully_plugin_la_LDFLAGS) $(LDFLAGS) -o $@
  @ENABLE_MULLY_PLUGIN_TRUE@am_libtotem_mully_plugin_la_rpath = -rpath \
  @ENABLE_MULLY_PLUGIN_TRUE@	$(plugindir)
 -@ENABLE_NARROWSPACE_PLUGIN_TRUE@libtotem_narrowspace_plugin_la_DEPENDENCIES = $(top_builddir)/src/plparse/libtotem-plparser-mini.la \
 +@ENABLE_NARROWSPACE_PLUGIN_TRUE@libtotem_narrowspace_plugin_la_DEPENDENCIES = \
- @ENABLE_NARROWSPACE_PLUGIN_TRUE@	libtotempluginviewer_marshal.la \
+ @ENABLE_NARROWSPACE_PLUGIN_TRUE@	libtotempluginviewer_helper.la \
  @ENABLE_NARROWSPACE_PLUGIN_TRUE@	$(am__DEPENDENCIES_1) \
  @ENABLE_NARROWSPACE_PLUGIN_TRUE@	$(am__DEPENDENCIES_1)
-@@ -360,7 +360,7 @@
+@@ -198,10 +198,6 @@
+ 	totem_plugin_viewer-totem-plugin-viewer.$(OBJEXT)
+ totem_plugin_viewer_OBJECTS = $(am_totem_plugin_viewer_OBJECTS)
+ totem_plugin_viewer_DEPENDENCIES =  \
+-	$(top_builddir)/src/backend/libbaconvideowidget.la \
+-	$(top_builddir)/src/libtotem_player.la \
+-	$(top_builddir)/src/plparse/libtotem-plparser.la \
+-	$(top_builddir)/lib/libtotemscrsaver.la \
+ 	libtotempluginviewer_helper.la $(am__DEPENDENCIES_1) \
+ 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+@@ -381,7 +377,7 @@
  MOZILLA_LIBDIR = @MOZILLA_LIBDIR@
  MOZILLA_NOT_LINKED_CFLAGS = @MOZILLA_NOT_LINKED_CFLAGS@
  MOZILLA_NOT_LINKED_LIBS = @MOZILLA_NOT_LINKED_LIBS@
 -MOZILLA_PLUGINDIR = @MOZILLA_PLUGINDIR@
-+MOZILLA_PLUGINDIR = /var/tmp/totem/lib/browser_plugins
++MOZILLA_PLUGINDIR = $(libdir)/browser_plugins
  MOZILLA_PREFIX = @MOZILLA_PREFIX@
  MOZILLA_XPCOM_CFLAGS = @MOZILLA_XPCOM_CFLAGS@
  MOZILLA_XPIDL = @MOZILLA_XPIDL@
-@@ -464,7 +464,7 @@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
- SUBDIRS = idl
--plugindir = $(libdir)/mozilla/plugins
-+plugindir = $(libdir)/browser_plugins
- plugin_LTLIBRARIES = $(am__append_1) $(am__append_2) $(am__append_3) \
- 	$(am__append_4) $(am__append_5)
- BUILT_SOURCES = $(libtotempluginviewer_marshal_la_SOURCES) \
-@@ -581,7 +581,7 @@
+@@ -599,10 +595,7 @@
+ 	$(AM_CFLAGS)
+ 
+ totem_plugin_viewer_LDADD = \
+-	$(top_builddir)/src/backend/libbaconvideowidget.la		\
+-	$(top_builddir)/src/libtotem_player.la				\
+-	$(top_builddir)/src/plparse/libtotem-plparser.la		\
+-	$(top_builddir)/lib/libtotemscrsaver.la				\
++	-ltotem-plparser \
+ 	libtotempluginviewer_helper.la					\
+ 	$(EXTRA_GNOME_LIBS)	\
+ 	$(XVIDMODE_LIBS) 	\
+@@ -654,7 +647,7 @@
  @ENABLE_BASIC_PLUGIN_TRUE@	$(AM_CXXFLAGS)
  
  @ENABLE_BASIC_PLUGIN_TRUE@libtotem_basic_plugin_la_LIBADD = \
 -@ENABLE_BASIC_PLUGIN_TRUE@	$(top_builddir)/src/plparse/libtotem-plparser-mini.la		\
 +@ENABLE_BASIC_PLUGIN_TRUE@	-ltotem-plparser \
- @ENABLE_BASIC_PLUGIN_TRUE@	libtotempluginviewer_marshal.la					\
+ @ENABLE_BASIC_PLUGIN_TRUE@	libtotempluginviewer_helper.la					\
  @ENABLE_BASIC_PLUGIN_TRUE@	$(DBUS_LIBS)	\
- @ENABLE_BASIC_PLUGIN_TRUE@ 	$(MOZILLA_LIBS)	\
-@@ -641,7 +641,7 @@
+ @ENABLE_BASIC_PLUGIN_TRUE@	$(MOZILLA_LIBS)	\
+@@ -715,7 +708,7 @@
  @ENABLE_GMP_PLUGIN_TRUE@	$(AM_CXXFLAGS)
  
  @ENABLE_GMP_PLUGIN_TRUE@libtotem_gmp_plugin_la_LIBADD = \
 -@ENABLE_GMP_PLUGIN_TRUE@	$(top_builddir)/src/plparse/libtotem-plparser-mini.la		\
 +@ENABLE_GMP_PLUGIN_TRUE@	-ltotem-plparser \
- @ENABLE_GMP_PLUGIN_TRUE@	libtotempluginviewer_marshal.la	\
+ @ENABLE_GMP_PLUGIN_TRUE@	libtotempluginviewer_helper.la	\
  @ENABLE_GMP_PLUGIN_TRUE@	$(DBUS_LIBS)	\
- @ENABLE_GMP_PLUGIN_TRUE@ 	$(MOZILLA_LIBS)	\
-@@ -695,7 +695,7 @@
+ @ENABLE_GMP_PLUGIN_TRUE@	$(MOZILLA_LIBS)	\
+@@ -770,7 +763,7 @@
  @ENABLE_COMPLEX_PLUGIN_TRUE@	$(AM_CXXFLAGS)
  
  @ENABLE_COMPLEX_PLUGIN_TRUE@libtotem_complex_plugin_la_LIBADD = \
 -@ENABLE_COMPLEX_PLUGIN_TRUE@	$(top_builddir)/src/plparse/libtotem-plparser-mini.la		\
-+@ENABLE_COMPLEX_PLUGIN_TRUE@	-ltotem-plparser \
- @ENABLE_COMPLEX_PLUGIN_TRUE@	libtotempluginviewer_marshal.la					\
++@ENABLE_COMPLEX_PLUGIN_TRUE@	-ltotem-plparser
+ @ENABLE_COMPLEX_PLUGIN_TRUE@	libtotempluginviewer_helper.la					\
  @ENABLE_COMPLEX_PLUGIN_TRUE@	$(DBUS_LIBS)	\
- @ENABLE_COMPLEX_PLUGIN_TRUE@ 	$(MOZILLA_LIBS)	\
-@@ -749,7 +749,7 @@
+ @ENABLE_COMPLEX_PLUGIN_TRUE@	$(MOZILLA_LIBS)	\
+@@ -825,7 +818,7 @@
  @ENABLE_NARROWSPACE_PLUGIN_TRUE@	$(AM_CXXFLAGS)
  
  @ENABLE_NARROWSPACE_PLUGIN_TRUE@libtotem_narrowspace_plugin_la_LIBADD = \
 -@ENABLE_NARROWSPACE_PLUGIN_TRUE@	$(top_builddir)/src/plparse/libtotem-plparser-mini.la		\
 +@ENABLE_NARROWSPACE_PLUGIN_TRUE@	-ltotem-plparser \
- @ENABLE_NARROWSPACE_PLUGIN_TRUE@	libtotempluginviewer_marshal.la					\
+ @ENABLE_NARROWSPACE_PLUGIN_TRUE@	libtotempluginviewer_helper.la					\
  @ENABLE_NARROWSPACE_PLUGIN_TRUE@	$(DBUS_LIBS)	\
- @ENABLE_NARROWSPACE_PLUGIN_TRUE@ 	$(MOZILLA_LIBS)	\
-@@ -803,7 +803,7 @@
+ @ENABLE_NARROWSPACE_PLUGIN_TRUE@	$(MOZILLA_LIBS)	\
+@@ -880,7 +873,7 @@
  @ENABLE_MULLY_PLUGIN_TRUE@	$(AM_CXXFLAGS)
  
  @ENABLE_MULLY_PLUGIN_TRUE@libtotem_mully_plugin_la_LIBADD = \
 -@ENABLE_MULLY_PLUGIN_TRUE@	$(top_builddir)/src/plparse/libtotem-plparser-mini.la		\
 +@ENABLE_MULLY_PLUGIN_TRUE@	-ltotem-plparser \
- @ENABLE_MULLY_PLUGIN_TRUE@	libtotempluginviewer_marshal.la					\
+ @ENABLE_MULLY_PLUGIN_TRUE@	libtotempluginviewer_helper.la					\
  @ENABLE_MULLY_PLUGIN_TRUE@	$(DBUS_LIBS)	\
- @ENABLE_MULLY_PLUGIN_TRUE@ 	$(MOZILLA_LIBS)	\
+ @ENABLE_MULLY_PLUGIN_TRUE@	$(MOZILLA_LIBS)	\
diff --git a/multimedia/totem/files/patch-configure b/multimedia/totem/files/patch-configure
new file mode 100644
index 000000000000..1fab81f6ed98
--- /dev/null
+++ b/multimedia/totem/files/patch-configure
@@ -0,0 +1,29 @@
+--- configure.orig	Fri May 25 00:24:10 2007
++++ configure	Fri May 25 00:24:23 2007
+@@ -22960,7 +22960,7 @@ GTK_LIBS="$GTK_LIBS $EXTRA_BACKEND_LIBS"
+ 
+ plugin_error_or_ignore()
+ {
+-	if test "${error_on_bad_plugin}" == "1" ; then
++	if test "${error_on_bad_plugin}" = "1" ; then
+ 		{ { echo "$as_me:$LINENO: error: $1" >&5
+ echo "$as_me: error: $1" >&2;}
+    { (exit 1); exit 1; }; }
+@@ -22982,7 +22982,7 @@ fi
+ used_plugins=""
+ used_plugins2=""
+ 
+-if test "x${with_plugins}" == "xautodetect" ; then
++if test "x${with_plugins}" = "xautodetect" ; then
+ 	# Default to all plugins and just ignore them if they won't compile
+ 	with_plugins="all"
+ 	error_on_bad_plugin="0"
+@@ -23384,7 +23384,7 @@ fi
+ 	esac
+ 
+ 	# Add the specified plugin
+-	if test "${add_plugin}" == "1" ; then
++	if test "${add_plugin}" = "1" ; then
+ 		used_plugins2="${used_plugins2} ${plugin}"
+ 	fi
+ done
diff --git a/multimedia/totem/pkg-plist b/multimedia/totem/pkg-plist
index 0652746dc89b..4124fd04a080 100644
--- a/multimedia/totem/pkg-plist
+++ b/multimedia/totem/pkg-plist
@@ -8,12 +8,45 @@ include/totem/1/plparser/totem-pl-parser.h
 lib/libtotem-plparser.a
 lib/libtotem-plparser.la
 lib/libtotem-plparser.so
-lib/libtotem-plparser.so.1
+lib/libtotem-plparser.so.7
 lib/nautilus/extensions-1.0/libtotem-properties-page.a
 lib/nautilus/extensions-1.0/libtotem-properties-page.la
 lib/nautilus/extensions-1.0/libtotem-properties-page.so
+%%GALAGO%%lib/totem/plugins/galago/galago.totem-plugin
+%%GALAGO%%lib/totem/plugins/galago/libtgp.a
+%%GALAGO%%lib/totem/plugins/galago/libtgp.la
+%%GALAGO%%lib/totem/plugins/galago/libtgp.so
+lib/totem/plugins/gromit/gromit.totem-plugin
+lib/totem/plugins/gromit/libgromit.a
+lib/totem/plugins/gromit/libgromit.la
+lib/totem/plugins/gromit/libgromit.so
+%%LIRC%%lib/totem/plugins/lirc/lirc.totem-plugin
+%%LIRC%%lib/totem/plugins/lirc/liblirc.a
+%%LIRC%%lib/totem/plugins/lirc/liblirc.la
+%%LIRC%%lib/totem/plugins/lirc/liblirc.so
+lib/totem/plugins/media-player-keys/libmedia_player_keys.a
+lib/totem/plugins/media-player-keys/libmedia_player_keys.la
+lib/totem/plugins/media-player-keys/libmedia_player_keys.so
+lib/totem/plugins/media-player-keys/media-player-keys.totem-plugin
+lib/totem/plugins/ontop/libontop.a
+lib/totem/plugins/ontop/libontop.la
+lib/totem/plugins/ontop/libontop.so
+lib/totem/plugins/ontop/ontop.totem-plugin
+lib/totem/plugins/properties/libmovie-properties.a
+lib/totem/plugins/properties/libmovie-properties.la
+lib/totem/plugins/properties/libmovie-properties.so
+lib/totem/plugins/properties/movie-properties.totem-plugin
+lib/totem/plugins/screensaver/libscreensaver.a
+lib/totem/plugins/screensaver/libscreensaver.la
+lib/totem/plugins/screensaver/libscreensaver.so
+lib/totem/plugins/screensaver/screensaver.totem-plugin
+lib/totem/plugins/skipto/libskipto.a
+lib/totem/plugins/skipto/libskipto.la
+lib/totem/plugins/skipto/libskipto.so
+lib/totem/plugins/skipto/skipto.totem-plugin
+lib/totem/plugins/skipto/skipto.ui
 libdata/pkgconfig/totem-plparser.pc
-share/gnome/applications/totem.desktop
+share/applications/totem.desktop
 share/gnome/help/totem/C/figures/totem_next_button.png
 share/gnome/help/totem/C/figures/totem_pause_button.png
 share/gnome/help/totem/C/figures/totem_play_button.png
@@ -27,6 +60,15 @@ share/gnome/help/totem/C/totem.xml
 share/gnome/help/totem/bg/figures/totem_start_window.png
 share/gnome/help/totem/bg/legal.xml
 share/gnome/help/totem/bg/totem.xml
+share/gnome/help/totem/ca/figures/totem_next_button.png
+share/gnome/help/totem/ca/figures/totem_pause_button.png
+share/gnome/help/totem/ca/figures/totem_play_button.png
+share/gnome/help/totem/ca/figures/totem_previous_button.png
+share/gnome/help/totem/ca/figures/totem_show_playlist_button.png
+share/gnome/help/totem/ca/figures/totem_start_window.png
+share/gnome/help/totem/ca/figures/totem_volume_maximum_button.png
+share/gnome/help/totem/ca/figures/totem_volume_mute_button.png
+share/gnome/help/totem/ca/totem.xml
 share/gnome/help/totem/de/figures/totem_next_button.png
 share/gnome/help/totem/de/figures/totem_pause_button.png
 share/gnome/help/totem/de/figures/totem_play_button.png
@@ -36,6 +78,15 @@ share/gnome/help/totem/de/figures/totem_start_window.png
 share/gnome/help/totem/de/figures/totem_volume_maximum_button.png
 share/gnome/help/totem/de/figures/totem_volume_mute_button.png
 share/gnome/help/totem/de/totem.xml
+share/gnome/help/totem/en_GB/figures/totem_next_button.png
+share/gnome/help/totem/en_GB/figures/totem_pause_button.png
+share/gnome/help/totem/en_GB/figures/totem_play_button.png
+share/gnome/help/totem/en_GB/figures/totem_previous_button.png
+share/gnome/help/totem/en_GB/figures/totem_show_playlist_button.png
+share/gnome/help/totem/en_GB/figures/totem_start_window.png
+share/gnome/help/totem/en_GB/figures/totem_volume_maximum_button.png
+share/gnome/help/totem/en_GB/figures/totem_volume_mute_button.png
+share/gnome/help/totem/en_GB/totem.xml
 share/gnome/help/totem/es/figures/totem_next_button.png
 share/gnome/help/totem/es/figures/totem_pause_button.png
 share/gnome/help/totem/es/figures/totem_play_button.png
@@ -54,6 +105,15 @@ share/gnome/help/totem/fr/figures/totem_start_window.png
 share/gnome/help/totem/fr/figures/totem_volume_maximum_button.png
 share/gnome/help/totem/fr/figures/totem_volume_mute_button.png
 share/gnome/help/totem/fr/totem.xml
+share/gnome/help/totem/oc/figures/totem_next_button.png
+share/gnome/help/totem/oc/figures/totem_pause_button.png
+share/gnome/help/totem/oc/figures/totem_play_button.png
+share/gnome/help/totem/oc/figures/totem_previous_button.png
+share/gnome/help/totem/oc/figures/totem_show_playlist_button.png
+share/gnome/help/totem/oc/figures/totem_start_window.png
+share/gnome/help/totem/oc/figures/totem_volume_maximum_button.png
+share/gnome/help/totem/oc/figures/totem_volume_mute_button.png
+share/gnome/help/totem/oc/totem.xml
 share/gnome/help/totem/pa/figures/totem_next_button.png
 share/gnome/help/totem/pa/figures/totem_pause_button.png
 share/gnome/help/totem/pa/figures/totem_play_button.png
@@ -99,33 +159,6 @@ share/gnome/help/totem/uk/figures/totem_start_window.png
 share/gnome/help/totem/uk/figures/totem_volume_maximum_button.png
 share/gnome/help/totem/uk/figures/totem_volume_mute_button.png
 share/gnome/help/totem/uk/totem.xml
-share/gnome/omf/totem/totem-C.omf
-share/gnome/omf/totem/totem-bg.omf
-share/gnome/omf/totem/totem-de.omf
-share/gnome/omf/totem/totem-es.omf
-share/gnome/omf/totem/totem-fr.omf
-share/gnome/omf/totem/totem-pa.omf
-share/gnome/omf/totem/totem-pt_BR.omf
-share/gnome/omf/totem/totem-ru.omf
-share/gnome/omf/totem/totem-sv.omf
-share/gnome/omf/totem/totem-uk.omf
-share/gnome/pixmaps/vanity.png
-share/gnome/totem/filmholes-big-left.png
-share/gnome/totem/filmholes-big-right.png
-share/gnome/totem/filmholes.png
-share/gnome/totem/mozilla-viewer.glade
-share/gnome/totem/playlist-ui.xml
-share/gnome/totem/playlist.glade
-share/gnome/totem/properties.glade
-share/gnome/totem/screenshot.glade
-share/gnome/totem/skip_to.glade
-share/gnome/totem/stock-tool-brightness-contrast-22.png
-share/gnome/totem/totem-ui.xml
-share/gnome/totem/totem.glade
-share/gnome/totem/totem_logo.png
-share/gnome/totem/uri.glade
-share/gnome/totem/vanity.glade
-share/gnome/totem/vanity.png
 share/icons/hicolor/16x16/apps/totem.png
 share/icons/hicolor/22x22/apps/totem.png
 share/icons/hicolor/24x24/apps/totem.png
@@ -180,6 +213,7 @@ share/locale/nb/LC_MESSAGES/totem.mo
 share/locale/ne/LC_MESSAGES/totem.mo
 share/locale/nl/LC_MESSAGES/totem.mo
 share/locale/nn/LC_MESSAGES/totem.mo
+share/locale/oc/LC_MESSAGES/totem.mo
 share/locale/or/LC_MESSAGES/totem.mo
 share/locale/pa/LC_MESSAGES/totem.mo
 share/locale/pl/LC_MESSAGES/totem.mo
@@ -206,8 +240,36 @@ share/locale/xh/LC_MESSAGES/totem.mo
 share/locale/zh_CN/LC_MESSAGES/totem.mo
 share/locale/zh_HK/LC_MESSAGES/totem.mo
 share/locale/zh_TW/LC_MESSAGES/totem.mo
-@dirrm share/gnome/totem
-@dirrm share/gnome/omf/totem
+share/omf/totem/totem-C.omf
+share/omf/totem/totem-bg.omf
+share/omf/totem/totem-ca.omf
+share/omf/totem/totem-de.omf
+share/omf/totem/totem-en_GB.omf
+share/omf/totem/totem-es.omf
+share/omf/totem/totem-fr.omf
+share/omf/totem/totem-oc.omf
+share/omf/totem/totem-pa.omf
+share/omf/totem/totem-pt_BR.omf
+share/omf/totem/totem-ru.omf
+share/omf/totem/totem-sv.omf
+share/omf/totem/totem-uk.omf
+%%DATADIR%%/filmholes-big-left.png
+%%DATADIR%%/filmholes-big-right.png
+%%DATADIR%%/filmholes.png
+%%DATADIR%%/fullscreen.ui
+%%DATADIR%%/mozilla-viewer.ui
+%%DATADIR%%/playlist-ui.xml
+%%DATADIR%%/playlist.ui
+%%DATADIR%%/plugins.ui
+%%DATADIR%%/properties.ui
+%%DATADIR%%/totem-ui.xml
+%%DATADIR%%/totem.ui
+%%DATADIR%%/totem_logo.png
+%%DATADIR%%/uri.ui
+share/vala/vapi/totem.deps
+share/vala/vapi/totem.vala
+@dirrm %%DATADIR%%
+@dirrm share/omf/totem
 @dirrm share/gnome/help/totem/uk/figures
 @dirrm share/gnome/help/totem/uk
 @dirrm share/gnome/help/totem/sv/figures
@@ -218,17 +280,33 @@ share/locale/zh_TW/LC_MESSAGES/totem.mo
 @dirrm share/gnome/help/totem/pt_BR
 @dirrm share/gnome/help/totem/pa/figures
 @dirrm share/gnome/help/totem/pa
+@dirrm share/gnome/help/totem/oc/figures
+@dirrm share/gnome/help/totem/oc
 @dirrm share/gnome/help/totem/fr/figures
 @dirrm share/gnome/help/totem/fr
 @dirrm share/gnome/help/totem/es/figures
 @dirrm share/gnome/help/totem/es
+@dirrm share/gnome/help/totem/en_GB/figures
+@dirrm share/gnome/help/totem/en_GB
 @dirrm share/gnome/help/totem/de/figures
 @dirrm share/gnome/help/totem/de
+@dirrm share/gnome/help/totem/ca/figures
+@dirrm share/gnome/help/totem/ca
 @dirrm share/gnome/help/totem/bg/figures
 @dirrm share/gnome/help/totem/bg
 @dirrm share/gnome/help/totem/C/figures
 @dirrm share/gnome/help/totem/C
 @dirrm share/gnome/help/totem
+@dirrm lib/totem/plugins/skipto
+@dirrm lib/totem/plugins/screensaver
+@dirrm lib/totem/plugins/properties
+@dirrm lib/totem/plugins/ontop
+@dirrm lib/totem/plugins/media-player-keys
+%%LIRC%%@dirrm lib/totem/plugins/lirc
+@dirrm lib/totem/plugins/gromit
+%%GALAGO%%@dirrm lib/totem/plugins/galago
+@dirrm lib/totem/plugins
+@dirrm lib/totem
 @dirrmtry lib/browser_plugins
 @dirrm include/totem/1/plparser
 @dirrm include/totem/1
@@ -245,6 +323,8 @@ share/locale/zh_TW/LC_MESSAGES/totem.mo
 @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/mg/LC_MESSAGES
@@ -257,3 +337,4 @@ share/locale/zh_TW/LC_MESSAGES/totem.mo
 @dirrmtry share/locale/bn_IN
 @dirrmtry share/locale/be@latin/LC_MESSAGES
 @dirrmtry share/locale/be@latin
+@dirrmtry share/applications
diff --git a/multimedia/xmps/Makefile b/multimedia/xmps/Makefile
index d7d0cae29bb6..16fa13fe9152 100644
--- a/multimedia/xmps/Makefile
+++ b/multimedia/xmps/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xmps
 PORTVERSION=	0.2.0
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	multimedia gnome
 MASTER_SITES=	http://ftp.vin.bg.ac.yu/linux/mmedia/xmps/
 
diff --git a/multimedia/xmps/pkg-plist b/multimedia/xmps/pkg-plist
index 5babc88ea4ce..22d3fe79cf1e 100644
--- a/multimedia/xmps/pkg-plist
+++ b/multimedia/xmps/pkg-plist
@@ -57,37 +57,37 @@ lib/xmps/system/libmpeg3.la
 lib/xmps/system/libmpeg3.so
 share/aclocal/xmps.m4
 share/gnome/apps/Multimedia/XMPS.desktop
-share/gnome/xmps/fast_forward.xpm
-share/gnome/xmps/load.xpm
-share/gnome/xmps/pause.xpm
-share/gnome/xmps/play.xpm
-share/gnome/xmps/rewind.xpm
-share/gnome/xmps/skins/DarkDepth/buttons.xpm
-share/gnome/xmps/skins/DarkDepth/config
-share/gnome/xmps/skins/DarkDepth/controls.xpm
-share/gnome/xmps/skins/DarkDepth/digits.xpm
-share/gnome/xmps/skins/DarkDepth/main.xpm
-share/gnome/xmps/skins/DarkDepth/playlist.xpm
-share/gnome/xmps/skins/DarkDepth/titlebar.xpm
-share/gnome/xmps/skins/default/buttons.xpm
-share/gnome/xmps/skins/default/config
-share/gnome/xmps/skins/default/controls.xpm
-share/gnome/xmps/skins/default/digits.xpm
-share/gnome/xmps/skins/default/main.xpm
-share/gnome/xmps/skins/default/playlist.xpm
-share/gnome/xmps/skins/default/titlebar.xpm
-share/gnome/xmps/stop.xpm
-share/gnome/xmps/xmps-logo.xpm
-share/gnome/xmps/xmps_intro.xpm
 share/locale/de/LC_MESSAGES/xmps.mo
 share/locale/fi/LC_MESSAGES/xmps.mo
 share/locale/fr/LC_MESSAGES/xmps.mo
 share/locale/pl/LC_MESSAGES/xmps.mo
 share/locale/sv/LC_MESSAGES/xmps.mo
-@dirrm share/gnome/xmps/skins/default
-@dirrm share/gnome/xmps/skins/DarkDepth
-@dirrm share/gnome/xmps/skins
-@dirrm share/gnome/xmps
+%%DATADIR%%/fast_forward.xpm
+%%DATADIR%%/load.xpm
+%%DATADIR%%/pause.xpm
+%%DATADIR%%/play.xpm
+%%DATADIR%%/rewind.xpm
+%%DATADIR%%/skins/DarkDepth/buttons.xpm
+%%DATADIR%%/skins/DarkDepth/config
+%%DATADIR%%/skins/DarkDepth/controls.xpm
+%%DATADIR%%/skins/DarkDepth/digits.xpm
+%%DATADIR%%/skins/DarkDepth/main.xpm
+%%DATADIR%%/skins/DarkDepth/playlist.xpm
+%%DATADIR%%/skins/DarkDepth/titlebar.xpm
+%%DATADIR%%/skins/default/buttons.xpm
+%%DATADIR%%/skins/default/config
+%%DATADIR%%/skins/default/controls.xpm
+%%DATADIR%%/skins/default/digits.xpm
+%%DATADIR%%/skins/default/main.xpm
+%%DATADIR%%/skins/default/playlist.xpm
+%%DATADIR%%/skins/default/titlebar.xpm
+%%DATADIR%%/stop.xpm
+%%DATADIR%%/xmps-logo.xpm
+%%DATADIR%%/xmps_intro.xpm
+@dirrm %%DATADIR%%/skins/default
+@dirrm %%DATADIR%%/skins/DarkDepth
+@dirrm %%DATADIR%%/skins
+@dirrm %%DATADIR%%
 @dirrm lib/xmps/system
 @dirrm lib/xmps/renderers/video
 @dirrm lib/xmps/renderers/audio
@@ -101,3 +101,7 @@ share/locale/sv/LC_MESSAGES/xmps.mo
 @dirrm lib/xmps/addons
 @dirrm lib/xmps
 @dirrm include/libxmps
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
diff --git a/net-im/gicq/Makefile b/net-im/gicq/Makefile
index 4034f2f528d3..c5218534cd8a 100644
--- a/net-im/gicq/Makefile
+++ b/net-im/gicq/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gicq
 PORTVERSION=	0.33
-PORTREVISION=	3
+PORTREVISION=	5
 CATEGORIES=	net-im
 MASTER_SITES=	http://download.sourceforge.net/gicq/ \
 		${MASTER_SITE_LOCAL}
@@ -21,7 +21,7 @@ LIB_DEPENDS=	icq.0:${PORTSDIR}/net-im/libicq
 USE_GETTEXT=	yes
 USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
-USE_GNOME=	gtk12 gnomehack
+USE_GNOME=	gtk12 gnomehack gnomeprefix
 WANT_GNOME=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
@@ -29,12 +29,10 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 .include <bsd.port.pre.mk>
 
 .if ${HAVE_GNOME:Mgnomelibs}!=""
-USE_GNOME+=	gnomeprefix gnomelibs
+USE_GNOME+=	gnomelibs
 PKGNAMESUFFIX=	-gnome
-PLIST_SUB=	DATADIR="share/gnome"
 .else
 CONFIGURE_ARGS+=--without-gnome
-PLIST_SUB=	DATADIR="share"
 .endif
 
 post-patch:
diff --git a/net-im/gicq/files/patch-ac b/net-im/gicq/files/patch-ac
index edb8ba6f0be0..16d7e3b332f3 100644
--- a/net-im/gicq/files/patch-ac
+++ b/net-im/gicq/files/patch-ac
@@ -5,7 +5,7 @@
  SUBDIRS = macros intl po pixmaps src doc
  
 +.ifdef HAVE_GNOME
- sysdir   = $(datadir)/apps/Applications
+ sysdir   = $(datadir)/gnome/apps/Applications
  sys_DATA = gicq.desktop
 +.endif
  
diff --git a/net-im/gicq/pkg-plist b/net-im/gicq/pkg-plist
index 48da86262567..6287609ecf25 100644
--- a/net-im/gicq/pkg-plist
+++ b/net-im/gicq/pkg-plist
@@ -1,7 +1,6 @@
 bin/gicq
 %%GNOME:%%share/gnome/apps/Applications/gicq.desktop
-%%DATADIR%%/help/gicq/C/index.html
-%%DATADIR%%/help/gicq/C/topic.dat
-@dirrm %%DATADIR%%/help/gicq/C
-@dirrm %%DATADIR%%/help/gicq
-%%NOGNOME:%%@dirrm %%DATADIR%%/help
+share/gnome/help/gicq/C/index.html
+share/gnome/help/gicq/C/topic.dat
+@dirrm share/gnome/help/gicq/C
+@dirrm share/gnome/help/gicq
diff --git a/net-im/gnome-jabber/Makefile b/net-im/gnome-jabber/Makefile
index 8c8f95fcfe1d..cced48c43c50 100644
--- a/net-im/gnome-jabber/Makefile
+++ b/net-im/gnome-jabber/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gnome-jabber
 PORTVERSION=	0.4
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	net-im gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/net-im/gnome-jabber/pkg-plist b/net-im/gnome-jabber/pkg-plist
index a751ebd010ea..0499da645ec0 100644
--- a/net-im/gnome-jabber/pkg-plist
+++ b/net-im/gnome-jabber/pkg-plist
@@ -1,38 +1,38 @@
 bin/gnome-jabber
-share/gnome/applications/gnome-jabber.desktop
-share/gnome/gnome-jabber/contact.wav
-share/gnome/gnome-jabber/gj_emote_biggrin.png
-share/gnome/gnome-jabber/gj_emote_confused.png
-share/gnome/gnome-jabber/gj_emote_cool.png
-share/gnome/gnome-jabber/gj_emote_eek.png
-share/gnome/gnome-jabber/gj_emote_frown.png
-share/gnome/gnome-jabber/gj_emote_mad.png
-share/gnome/gnome-jabber/gj_emote_redface.png
-share/gnome/gnome-jabber/gj_emote_rolleyes.png
-share/gnome/gnome-jabber/gj_emote_smile.png
-share/gnome/gnome-jabber/gj_emote_tongue.png
-share/gnome/gnome-jabber/gj_emote_wink.png
-share/gnome/gnome-jabber/gj_jsf.png
-share/gnome/gnome-jabber/gj_message_chat.png
-share/gnome/gnome-jabber/gj_message_error.png
-share/gnome/gnome-jabber/gj_message_groupchat.png
-share/gnome/gnome-jabber/gj_message_headline.png
-share/gnome/gnome-jabber/gj_message_normal.png
-share/gnome/gnome-jabber/gj_presence_available.png
-share/gnome/gnome-jabber/gj_presence_away.png
-share/gnome/gnome-jabber/gj_presence_chat.png
-share/gnome/gnome-jabber/gj_presence_dnd.png
-share/gnome/gnome-jabber/gj_presence_invisible.png
-share/gnome/gnome-jabber/gj_presence_none.png
-share/gnome/gnome-jabber/gj_presence_subscribe.png
-share/gnome/gnome-jabber/gj_presence_subscribed.png
-share/gnome/gnome-jabber/gj_presence_unavailable.png
-share/gnome/gnome-jabber/gj_presence_unsubscribe.png
-share/gnome/gnome-jabber/gj_presence_unsubscribed.png
-share/gnome/gnome-jabber/gj_presence_xa.png
-share/gnome/gnome-jabber/gnome-jabber.css
-share/gnome/gnome-jabber/gnome-jabber.glade
-share/gnome/gnome-jabber/message.wav
+share/applications/gnome-jabber.desktop
+share/gnome-jabber/contact.wav
+share/gnome-jabber/gj_emote_biggrin.png
+share/gnome-jabber/gj_emote_confused.png
+share/gnome-jabber/gj_emote_cool.png
+share/gnome-jabber/gj_emote_eek.png
+share/gnome-jabber/gj_emote_frown.png
+share/gnome-jabber/gj_emote_mad.png
+share/gnome-jabber/gj_emote_redface.png
+share/gnome-jabber/gj_emote_rolleyes.png
+share/gnome-jabber/gj_emote_smile.png
+share/gnome-jabber/gj_emote_tongue.png
+share/gnome-jabber/gj_emote_wink.png
+share/gnome-jabber/gj_jsf.png
+share/gnome-jabber/gj_message_chat.png
+share/gnome-jabber/gj_message_error.png
+share/gnome-jabber/gj_message_groupchat.png
+share/gnome-jabber/gj_message_headline.png
+share/gnome-jabber/gj_message_normal.png
+share/gnome-jabber/gj_presence_available.png
+share/gnome-jabber/gj_presence_away.png
+share/gnome-jabber/gj_presence_chat.png
+share/gnome-jabber/gj_presence_dnd.png
+share/gnome-jabber/gj_presence_invisible.png
+share/gnome-jabber/gj_presence_none.png
+share/gnome-jabber/gj_presence_subscribe.png
+share/gnome-jabber/gj_presence_subscribed.png
+share/gnome-jabber/gj_presence_unavailable.png
+share/gnome-jabber/gj_presence_unsubscribe.png
+share/gnome-jabber/gj_presence_unsubscribed.png
+share/gnome-jabber/gj_presence_xa.png
+share/gnome-jabber/gnome-jabber.css
+share/gnome-jabber/gnome-jabber.glade
+share/gnome-jabber/message.wav
 share/locale/ca/LC_MESSAGES/gnome-jabber.mo
 share/locale/cs/LC_MESSAGES/gnome-jabber.mo
 share/locale/de/LC_MESSAGES/gnome-jabber.mo
@@ -51,4 +51,5 @@ share/locale/ru/LC_MESSAGES/gnome-jabber.mo
 share/locale/sr/LC_MESSAGES/gnome-jabber.mo
 share/locale/sr@Latn/LC_MESSAGES/gnome-jabber.mo
 share/locale/sv/LC_MESSAGES/gnome-jabber.mo
-@dirrm share/gnome/gnome-jabber
+@dirrm share/gnome-jabber
+@dirrmtry share/applications
diff --git a/net-im/gnomeicu/Makefile b/net-im/gnomeicu/Makefile
index 43469084ca8d..3e8755dcfcfc 100644
--- a/net-im/gnomeicu/Makefile
+++ b/net-im/gnomeicu/Makefile
@@ -3,11 +3,11 @@
 # Whom:					nectar@FreeBSD.org
 #
 # $FreeBSD$
-#
+#    $MCom: ports/net-im/gnomeicu/Makefile,v 1.2 2007/05/19 21:36:18 marcus Exp $
 
 PORTNAME=	gnomeicu
 PORTVERSION=	0.99.12
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net-im gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	gnomeicu
diff --git a/net-im/gnomeicu/files/patch-src::icu_db.c b/net-im/gnomeicu/files/patch-src::icu_db.c
index 3df66fcf8c50..149a61e53c03 100644
--- a/net-im/gnomeicu/files/patch-src::icu_db.c
+++ b/net-im/gnomeicu/files/patch-src::icu_db.c
@@ -1,6 +1,3 @@
-
-$FreeBSD$
-
 --- src/icu_db.c.orig	Sat Jun 22 22:11:46 2002
 +++ src/icu_db.c	Wed Sep 11 11:45:05 2002
 @@ -27,7 +27,11 @@
diff --git a/net-im/gnomeicu/pkg-plist b/net-im/gnomeicu/pkg-plist
index c3fa965bd983..1e4ea2de5beb 100644
--- a/net-im/gnomeicu/pkg-plist
+++ b/net-im/gnomeicu/pkg-plist
@@ -1,205 +1,205 @@
 bin/gnomeicu
 bin/gnomeicu-client
 etc/sound/events/GnomeICU.soundlist
-share/gnome/applications/GnomeICU.desktop
-share/gnome/gnomeicu/emoticons/AIM/angel.xpm
-share/gnome/gnomeicu/emoticons/AIM/bigsmile.xpm
-share/gnome/gnomeicu/emoticons/AIM/crossedlips.xpm
-share/gnome/gnomeicu/emoticons/AIM/cry.xpm
-share/gnome/gnomeicu/emoticons/AIM/embarrassed.xpm
-share/gnome/gnomeicu/emoticons/AIM/emoticon-data
-share/gnome/gnomeicu/emoticons/AIM/kiss.xpm
-share/gnome/gnomeicu/emoticons/AIM/sad.xpm
-share/gnome/gnomeicu/emoticons/AIM/scream.xpm
-share/gnome/gnomeicu/emoticons/AIM/smile.xpm
-share/gnome/gnomeicu/emoticons/AIM/smile8.xpm
-share/gnome/gnomeicu/emoticons/AIM/think.xpm
-share/gnome/gnomeicu/emoticons/AIM/tongue.xpm
-share/gnome/gnomeicu/emoticons/AIM/wink.xpm
-share/gnome/gnomeicu/emoticons/Always/Annoyed.bmp
-share/gnome/gnomeicu/emoticons/Always/Disgusted.bmp
-share/gnome/gnomeicu/emoticons/Always/Drooling.bmp
-share/gnome/gnomeicu/emoticons/Always/Giggling.bmp
-share/gnome/gnomeicu/emoticons/Always/Jokingly.bmp
-share/gnome/gnomeicu/emoticons/Always/Shocked.bmp
-share/gnome/gnomeicu/emoticons/Always/Surprised-F.bmp
-share/gnome/gnomeicu/emoticons/Always/Surprised-M.bmp
-share/gnome/gnomeicu/emoticons/Always/Whining.bmp
-share/gnome/gnomeicu/emoticons/Always/asl.gif
-share/gnome/gnomeicu/emoticons/Always/bat.gif
-share/gnome/gnomeicu/emoticons/Always/beer.gif
-share/gnome/gnomeicu/emoticons/Always/boy.gif
-share/gnome/gnomeicu/emoticons/Always/broken_heart.gif
-share/gnome/gnomeicu/emoticons/Always/cake.gif
-share/gnome/gnomeicu/emoticons/Always/camera.gif
-share/gnome/gnomeicu/emoticons/Always/cat.gif
-share/gnome/gnomeicu/emoticons/Always/clock.gif
-share/gnome/gnomeicu/emoticons/Always/coffee.gif
-share/gnome/gnomeicu/emoticons/Always/cuffs.gif
-share/gnome/gnomeicu/emoticons/Always/dog.gif
-share/gnome/gnomeicu/emoticons/Always/dude_hug.gif
-share/gnome/gnomeicu/emoticons/Always/emoticon-data
-share/gnome/gnomeicu/emoticons/Always/envelope.gif
-share/gnome/gnomeicu/emoticons/Always/film.gif
-share/gnome/gnomeicu/emoticons/Always/girl.gif
-share/gnome/gnomeicu/emoticons/Always/girl_hug.gif
-share/gnome/gnomeicu/emoticons/Always/heart.gif
-share/gnome/gnomeicu/emoticons/Always/martini.gif
-share/gnome/gnomeicu/emoticons/Always/messenger.gif
-share/gnome/gnomeicu/emoticons/Always/moon.gif
-share/gnome/gnomeicu/emoticons/Always/musical_note.gif
-share/gnome/gnomeicu/emoticons/Always/phone.gif
-share/gnome/gnomeicu/emoticons/Always/present.gif
-share/gnome/gnomeicu/emoticons/Always/rainbow.gif
-share/gnome/gnomeicu/emoticons/Always/rose.gif
-share/gnome/gnomeicu/emoticons/Always/star.gif
-share/gnome/gnomeicu/emoticons/Always/sun.gif
-share/gnome/gnomeicu/emoticons/Always/thumbs_down.gif
-share/gnome/gnomeicu/emoticons/Always/thumbs_up.gif
-share/gnome/gnomeicu/emoticons/Always/wilted_rose.gif
-share/gnome/gnomeicu/emoticons/Default/bigsmile.png
-share/gnome/gnomeicu/emoticons/Default/cry.png
-share/gnome/gnomeicu/emoticons/Default/emoticon-data
-share/gnome/gnomeicu/emoticons/Default/glasses.png
-share/gnome/gnomeicu/emoticons/Default/sad.png
-share/gnome/gnomeicu/emoticons/Default/scream.png
-share/gnome/gnomeicu/emoticons/Default/smile.png
-share/gnome/gnomeicu/emoticons/Default/smile2.png
-share/gnome/gnomeicu/emoticons/Default/smile8.png
-share/gnome/gnomeicu/emoticons/Default/straight.png
-share/gnome/gnomeicu/emoticons/Default/tongue.png
-share/gnome/gnomeicu/emoticons/Default/unsure.png
-share/gnome/gnomeicu/emoticons/Default/wink.png
-share/gnome/gnomeicu/emoticons/MSN/angel.png
-share/gnome/gnomeicu/emoticons/MSN/angry.png
-share/gnome/gnomeicu/emoticons/MSN/bigsmile.png
-share/gnome/gnomeicu/emoticons/MSN/confused.png
-share/gnome/gnomeicu/emoticons/MSN/cry.png
-share/gnome/gnomeicu/emoticons/MSN/devil.png
-share/gnome/gnomeicu/emoticons/MSN/embarassed.png
-share/gnome/gnomeicu/emoticons/MSN/emoticon-data
-share/gnome/gnomeicu/emoticons/MSN/kiss.png
-share/gnome/gnomeicu/emoticons/MSN/light.gif
-share/gnome/gnomeicu/emoticons/MSN/sad.png
-share/gnome/gnomeicu/emoticons/MSN/shocked.png
-share/gnome/gnomeicu/emoticons/MSN/smile.png
-share/gnome/gnomeicu/emoticons/MSN/smile8.png
-share/gnome/gnomeicu/emoticons/MSN/straight.png
-share/gnome/gnomeicu/emoticons/MSN/tongue.png
-share/gnome/gnomeicu/emoticons/MSN/wink.png
-share/gnome/gnomeicu/emoticons/Yahoo/alien.gif
-share/gnome/gnomeicu/emoticons/Yahoo/angel.gif
-share/gnome/gnomeicu/emoticons/Yahoo/angry.gif
-share/gnome/gnomeicu/emoticons/Yahoo/bigsmile.gif
-share/gnome/gnomeicu/emoticons/Yahoo/blush.gif
-share/gnome/gnomeicu/emoticons/Yahoo/clown.gif
-share/gnome/gnomeicu/emoticons/Yahoo/cow.gif
-share/gnome/gnomeicu/emoticons/Yahoo/cowboy.gif
-share/gnome/gnomeicu/emoticons/Yahoo/devil.gif
-share/gnome/gnomeicu/emoticons/Yahoo/emoticon-data
-share/gnome/gnomeicu/emoticons/Yahoo/flag.gif
-share/gnome/gnomeicu/emoticons/Yahoo/green.gif
-share/gnome/gnomeicu/emoticons/Yahoo/hrmph.gif
-share/gnome/gnomeicu/emoticons/Yahoo/ignore.gif
-share/gnome/gnomeicu/emoticons/Yahoo/kiss.gif
-share/gnome/gnomeicu/emoticons/Yahoo/light.gif
-share/gnome/gnomeicu/emoticons/Yahoo/monkey.gif
-share/gnome/gnomeicu/emoticons/Yahoo/nerd.gif
-share/gnome/gnomeicu/emoticons/Yahoo/pig.gif
-share/gnome/gnomeicu/emoticons/Yahoo/pumpkin.gif
-share/gnome/gnomeicu/emoticons/Yahoo/quiet.gif
-share/gnome/gnomeicu/emoticons/Yahoo/rofl.gif
-share/gnome/gnomeicu/emoticons/Yahoo/rose.gif
-share/gnome/gnomeicu/emoticons/Yahoo/sad.gif
-share/gnome/gnomeicu/emoticons/Yahoo/shocked.gif
-share/gnome/gnomeicu/emoticons/Yahoo/skull.gif
-share/gnome/gnomeicu/emoticons/Yahoo/sleep.gif
-share/gnome/gnomeicu/emoticons/Yahoo/smile.gif
-share/gnome/gnomeicu/emoticons/Yahoo/smile8.gif
-share/gnome/gnomeicu/emoticons/Yahoo/stop.gif
-share/gnome/gnomeicu/emoticons/Yahoo/straight.gif
-share/gnome/gnomeicu/emoticons/Yahoo/tongue.gif
-share/gnome/gnomeicu/emoticons/Yahoo/wail.gif
-share/gnome/gnomeicu/emoticons/Yahoo/wink.gif
-share/gnome/gnomeicu/emoticons/Yahoo/wonder.gif
-share/gnome/gnomeicu/glade/addcontact.glade
-share/gnome/gnomeicu/glade/auth.glade
-share/gnome/gnomeicu/glade/auto_respond.glade
-share/gnome/gnomeicu/glade/grpmgr.glade
-share/gnome/gnomeicu/glade/history.glade
-share/gnome/gnomeicu/glade/main.glade
-share/gnome/gnomeicu/glade/message.glade
-share/gnome/gnomeicu/glade/prefs.glade
-share/gnome/gnomeicu/glade/user_info.glade
-share/gnome/gnomeicu/glade/welcome.glade
-share/gnome/gnomeicu/icons/Default/gnomeicu-animation.gif
-share/gnome/gnomeicu/icons/Default/gnomeicu-auth.png
-share/gnome/gnomeicu/icons/Default/gnomeicu-away.png
-share/gnome/gnomeicu/icons/Default/gnomeicu-birthday.png
-share/gnome/gnomeicu/icons/Default/gnomeicu-blank.png
-share/gnome/gnomeicu/icons/Default/gnomeicu-cancel.png
-share/gnome/gnomeicu/icons/Default/gnomeicu-chat.png
-share/gnome/gnomeicu/icons/Default/gnomeicu-contact.png
-share/gnome/gnomeicu/icons/Default/gnomeicu-dnd.png
-share/gnome/gnomeicu/icons/Default/gnomeicu-ffc.png
-share/gnome/gnomeicu/icons/Default/gnomeicu-file.png
-share/gnome/gnomeicu/icons/Default/gnomeicu-group.png
-share/gnome/gnomeicu/icons/Default/gnomeicu-hist.png
-share/gnome/gnomeicu/icons/Default/gnomeicu-info
-share/gnome/gnomeicu/icons/Default/gnomeicu-info.png
-share/gnome/gnomeicu/icons/Default/gnomeicu-inv.png
-share/gnome/gnomeicu/icons/Default/gnomeicu-message.png
-share/gnome/gnomeicu/icons/Default/gnomeicu-na.png
-share/gnome/gnomeicu/icons/Default/gnomeicu-occ.png
-share/gnome/gnomeicu/icons/Default/gnomeicu-offline.png
-share/gnome/gnomeicu/icons/Default/gnomeicu-ok.png
-share/gnome/gnomeicu/icons/Default/gnomeicu-online.png
-share/gnome/gnomeicu/icons/Default/gnomeicu-rename.png
-share/gnome/gnomeicu/icons/Default/gnomeicu-still.png
-share/gnome/gnomeicu/icons/Default/gnomeicu-url.png
-share/gnome/gnomeicu/icons/Eyeballs/gnomeicu-animation.gif
-share/gnome/gnomeicu/icons/Eyeballs/gnomeicu-auth.png
-share/gnome/gnomeicu/icons/Eyeballs/gnomeicu-away.png
-share/gnome/gnomeicu/icons/Eyeballs/gnomeicu-cancel.png
-share/gnome/gnomeicu/icons/Eyeballs/gnomeicu-chat.png
-share/gnome/gnomeicu/icons/Eyeballs/gnomeicu-contact.png
-share/gnome/gnomeicu/icons/Eyeballs/gnomeicu-dnd.png
-share/gnome/gnomeicu/icons/Eyeballs/gnomeicu-ffc.png
-share/gnome/gnomeicu/icons/Eyeballs/gnomeicu-file.png
-share/gnome/gnomeicu/icons/Eyeballs/gnomeicu-hist.png
-share/gnome/gnomeicu/icons/Eyeballs/gnomeicu-info
-share/gnome/gnomeicu/icons/Eyeballs/gnomeicu-info.png
-share/gnome/gnomeicu/icons/Eyeballs/gnomeicu-inv.png
-share/gnome/gnomeicu/icons/Eyeballs/gnomeicu-message.png
-share/gnome/gnomeicu/icons/Eyeballs/gnomeicu-na.png
-share/gnome/gnomeicu/icons/Eyeballs/gnomeicu-occ.png
-share/gnome/gnomeicu/icons/Eyeballs/gnomeicu-offline.png
-share/gnome/gnomeicu/icons/Eyeballs/gnomeicu-ok.png
-share/gnome/gnomeicu/icons/Eyeballs/gnomeicu-online.png
-share/gnome/gnomeicu/icons/Eyeballs/gnomeicu-rename.png
-share/gnome/gnomeicu/icons/Eyeballs/gnomeicu-still.png
-share/gnome/gnomeicu/icons/Eyeballs/gnomeicu-url.png
-share/gnome/gnomeicu/icons/Gradients/gnomeicu-animation.gif
-share/gnome/gnomeicu/icons/Gradients/gnomeicu-away.png
-share/gnome/gnomeicu/icons/Gradients/gnomeicu-dnd.png
-share/gnome/gnomeicu/icons/Gradients/gnomeicu-ffc.png
-share/gnome/gnomeicu/icons/Gradients/gnomeicu-info
-share/gnome/gnomeicu/icons/Gradients/gnomeicu-inv.png
-share/gnome/gnomeicu/icons/Gradients/gnomeicu-na.png
-share/gnome/gnomeicu/icons/Gradients/gnomeicu-occ.png
-share/gnome/gnomeicu/icons/Gradients/gnomeicu-offline.png
-share/gnome/gnomeicu/icons/Gradients/gnomeicu-online.png
-share/gnome/gnomeicu/icons/reDubbed/gnomeicu-away.png
-share/gnome/gnomeicu/icons/reDubbed/gnomeicu-dnd.png
-share/gnome/gnomeicu/icons/reDubbed/gnomeicu-ffc.png
-share/gnome/gnomeicu/icons/reDubbed/gnomeicu-info
-share/gnome/gnomeicu/icons/reDubbed/gnomeicu-inv.png
-share/gnome/gnomeicu/icons/reDubbed/gnomeicu-na.png
-share/gnome/gnomeicu/icons/reDubbed/gnomeicu-occ.png
-share/gnome/gnomeicu/icons/reDubbed/gnomeicu-offline.png
-share/gnome/gnomeicu/icons/reDubbed/gnomeicu-online.png
-share/gnome/gnomeicu/prefs_icon_gnomeicu.png
-share/gnome/gnomeicu/prefs_icon_icq.png
+share/applications/GnomeICU.desktop
+share/gnomeicu/emoticons/AIM/angel.xpm
+share/gnomeicu/emoticons/AIM/bigsmile.xpm
+share/gnomeicu/emoticons/AIM/crossedlips.xpm
+share/gnomeicu/emoticons/AIM/cry.xpm
+share/gnomeicu/emoticons/AIM/embarrassed.xpm
+share/gnomeicu/emoticons/AIM/emoticon-data
+share/gnomeicu/emoticons/AIM/kiss.xpm
+share/gnomeicu/emoticons/AIM/sad.xpm
+share/gnomeicu/emoticons/AIM/scream.xpm
+share/gnomeicu/emoticons/AIM/smile.xpm
+share/gnomeicu/emoticons/AIM/smile8.xpm
+share/gnomeicu/emoticons/AIM/think.xpm
+share/gnomeicu/emoticons/AIM/tongue.xpm
+share/gnomeicu/emoticons/AIM/wink.xpm
+share/gnomeicu/emoticons/Always/Annoyed.bmp
+share/gnomeicu/emoticons/Always/Disgusted.bmp
+share/gnomeicu/emoticons/Always/Drooling.bmp
+share/gnomeicu/emoticons/Always/Giggling.bmp
+share/gnomeicu/emoticons/Always/Jokingly.bmp
+share/gnomeicu/emoticons/Always/Shocked.bmp
+share/gnomeicu/emoticons/Always/Surprised-F.bmp
+share/gnomeicu/emoticons/Always/Surprised-M.bmp
+share/gnomeicu/emoticons/Always/Whining.bmp
+share/gnomeicu/emoticons/Always/asl.gif
+share/gnomeicu/emoticons/Always/bat.gif
+share/gnomeicu/emoticons/Always/beer.gif
+share/gnomeicu/emoticons/Always/boy.gif
+share/gnomeicu/emoticons/Always/broken_heart.gif
+share/gnomeicu/emoticons/Always/cake.gif
+share/gnomeicu/emoticons/Always/camera.gif
+share/gnomeicu/emoticons/Always/cat.gif
+share/gnomeicu/emoticons/Always/clock.gif
+share/gnomeicu/emoticons/Always/coffee.gif
+share/gnomeicu/emoticons/Always/cuffs.gif
+share/gnomeicu/emoticons/Always/dog.gif
+share/gnomeicu/emoticons/Always/dude_hug.gif
+share/gnomeicu/emoticons/Always/emoticon-data
+share/gnomeicu/emoticons/Always/envelope.gif
+share/gnomeicu/emoticons/Always/film.gif
+share/gnomeicu/emoticons/Always/girl.gif
+share/gnomeicu/emoticons/Always/girl_hug.gif
+share/gnomeicu/emoticons/Always/heart.gif
+share/gnomeicu/emoticons/Always/martini.gif
+share/gnomeicu/emoticons/Always/messenger.gif
+share/gnomeicu/emoticons/Always/moon.gif
+share/gnomeicu/emoticons/Always/musical_note.gif
+share/gnomeicu/emoticons/Always/phone.gif
+share/gnomeicu/emoticons/Always/present.gif
+share/gnomeicu/emoticons/Always/rainbow.gif
+share/gnomeicu/emoticons/Always/rose.gif
+share/gnomeicu/emoticons/Always/star.gif
+share/gnomeicu/emoticons/Always/sun.gif
+share/gnomeicu/emoticons/Always/thumbs_down.gif
+share/gnomeicu/emoticons/Always/thumbs_up.gif
+share/gnomeicu/emoticons/Always/wilted_rose.gif
+share/gnomeicu/emoticons/Default/bigsmile.png
+share/gnomeicu/emoticons/Default/cry.png
+share/gnomeicu/emoticons/Default/emoticon-data
+share/gnomeicu/emoticons/Default/glasses.png
+share/gnomeicu/emoticons/Default/sad.png
+share/gnomeicu/emoticons/Default/scream.png
+share/gnomeicu/emoticons/Default/smile.png
+share/gnomeicu/emoticons/Default/smile2.png
+share/gnomeicu/emoticons/Default/smile8.png
+share/gnomeicu/emoticons/Default/straight.png
+share/gnomeicu/emoticons/Default/tongue.png
+share/gnomeicu/emoticons/Default/unsure.png
+share/gnomeicu/emoticons/Default/wink.png
+share/gnomeicu/emoticons/MSN/angel.png
+share/gnomeicu/emoticons/MSN/angry.png
+share/gnomeicu/emoticons/MSN/bigsmile.png
+share/gnomeicu/emoticons/MSN/confused.png
+share/gnomeicu/emoticons/MSN/cry.png
+share/gnomeicu/emoticons/MSN/devil.png
+share/gnomeicu/emoticons/MSN/embarassed.png
+share/gnomeicu/emoticons/MSN/emoticon-data
+share/gnomeicu/emoticons/MSN/kiss.png
+share/gnomeicu/emoticons/MSN/light.gif
+share/gnomeicu/emoticons/MSN/sad.png
+share/gnomeicu/emoticons/MSN/shocked.png
+share/gnomeicu/emoticons/MSN/smile.png
+share/gnomeicu/emoticons/MSN/smile8.png
+share/gnomeicu/emoticons/MSN/straight.png
+share/gnomeicu/emoticons/MSN/tongue.png
+share/gnomeicu/emoticons/MSN/wink.png
+share/gnomeicu/emoticons/Yahoo/alien.gif
+share/gnomeicu/emoticons/Yahoo/angel.gif
+share/gnomeicu/emoticons/Yahoo/angry.gif
+share/gnomeicu/emoticons/Yahoo/bigsmile.gif
+share/gnomeicu/emoticons/Yahoo/blush.gif
+share/gnomeicu/emoticons/Yahoo/clown.gif
+share/gnomeicu/emoticons/Yahoo/cow.gif
+share/gnomeicu/emoticons/Yahoo/cowboy.gif
+share/gnomeicu/emoticons/Yahoo/devil.gif
+share/gnomeicu/emoticons/Yahoo/emoticon-data
+share/gnomeicu/emoticons/Yahoo/flag.gif
+share/gnomeicu/emoticons/Yahoo/green.gif
+share/gnomeicu/emoticons/Yahoo/hrmph.gif
+share/gnomeicu/emoticons/Yahoo/ignore.gif
+share/gnomeicu/emoticons/Yahoo/kiss.gif
+share/gnomeicu/emoticons/Yahoo/light.gif
+share/gnomeicu/emoticons/Yahoo/monkey.gif
+share/gnomeicu/emoticons/Yahoo/nerd.gif
+share/gnomeicu/emoticons/Yahoo/pig.gif
+share/gnomeicu/emoticons/Yahoo/pumpkin.gif
+share/gnomeicu/emoticons/Yahoo/quiet.gif
+share/gnomeicu/emoticons/Yahoo/rofl.gif
+share/gnomeicu/emoticons/Yahoo/rose.gif
+share/gnomeicu/emoticons/Yahoo/sad.gif
+share/gnomeicu/emoticons/Yahoo/shocked.gif
+share/gnomeicu/emoticons/Yahoo/skull.gif
+share/gnomeicu/emoticons/Yahoo/sleep.gif
+share/gnomeicu/emoticons/Yahoo/smile.gif
+share/gnomeicu/emoticons/Yahoo/smile8.gif
+share/gnomeicu/emoticons/Yahoo/stop.gif
+share/gnomeicu/emoticons/Yahoo/straight.gif
+share/gnomeicu/emoticons/Yahoo/tongue.gif
+share/gnomeicu/emoticons/Yahoo/wail.gif
+share/gnomeicu/emoticons/Yahoo/wink.gif
+share/gnomeicu/emoticons/Yahoo/wonder.gif
+share/gnomeicu/glade/addcontact.glade
+share/gnomeicu/glade/auth.glade
+share/gnomeicu/glade/auto_respond.glade
+share/gnomeicu/glade/grpmgr.glade
+share/gnomeicu/glade/history.glade
+share/gnomeicu/glade/main.glade
+share/gnomeicu/glade/message.glade
+share/gnomeicu/glade/prefs.glade
+share/gnomeicu/glade/user_info.glade
+share/gnomeicu/glade/welcome.glade
+share/gnomeicu/icons/Default/gnomeicu-animation.gif
+share/gnomeicu/icons/Default/gnomeicu-auth.png
+share/gnomeicu/icons/Default/gnomeicu-away.png
+share/gnomeicu/icons/Default/gnomeicu-birthday.png
+share/gnomeicu/icons/Default/gnomeicu-blank.png
+share/gnomeicu/icons/Default/gnomeicu-cancel.png
+share/gnomeicu/icons/Default/gnomeicu-chat.png
+share/gnomeicu/icons/Default/gnomeicu-contact.png
+share/gnomeicu/icons/Default/gnomeicu-dnd.png
+share/gnomeicu/icons/Default/gnomeicu-ffc.png
+share/gnomeicu/icons/Default/gnomeicu-file.png
+share/gnomeicu/icons/Default/gnomeicu-group.png
+share/gnomeicu/icons/Default/gnomeicu-hist.png
+share/gnomeicu/icons/Default/gnomeicu-info
+share/gnomeicu/icons/Default/gnomeicu-info.png
+share/gnomeicu/icons/Default/gnomeicu-inv.png
+share/gnomeicu/icons/Default/gnomeicu-message.png
+share/gnomeicu/icons/Default/gnomeicu-na.png
+share/gnomeicu/icons/Default/gnomeicu-occ.png
+share/gnomeicu/icons/Default/gnomeicu-offline.png
+share/gnomeicu/icons/Default/gnomeicu-ok.png
+share/gnomeicu/icons/Default/gnomeicu-online.png
+share/gnomeicu/icons/Default/gnomeicu-rename.png
+share/gnomeicu/icons/Default/gnomeicu-still.png
+share/gnomeicu/icons/Default/gnomeicu-url.png
+share/gnomeicu/icons/Eyeballs/gnomeicu-animation.gif
+share/gnomeicu/icons/Eyeballs/gnomeicu-auth.png
+share/gnomeicu/icons/Eyeballs/gnomeicu-away.png
+share/gnomeicu/icons/Eyeballs/gnomeicu-cancel.png
+share/gnomeicu/icons/Eyeballs/gnomeicu-chat.png
+share/gnomeicu/icons/Eyeballs/gnomeicu-contact.png
+share/gnomeicu/icons/Eyeballs/gnomeicu-dnd.png
+share/gnomeicu/icons/Eyeballs/gnomeicu-ffc.png
+share/gnomeicu/icons/Eyeballs/gnomeicu-file.png
+share/gnomeicu/icons/Eyeballs/gnomeicu-hist.png
+share/gnomeicu/icons/Eyeballs/gnomeicu-info
+share/gnomeicu/icons/Eyeballs/gnomeicu-info.png
+share/gnomeicu/icons/Eyeballs/gnomeicu-inv.png
+share/gnomeicu/icons/Eyeballs/gnomeicu-message.png
+share/gnomeicu/icons/Eyeballs/gnomeicu-na.png
+share/gnomeicu/icons/Eyeballs/gnomeicu-occ.png
+share/gnomeicu/icons/Eyeballs/gnomeicu-offline.png
+share/gnomeicu/icons/Eyeballs/gnomeicu-ok.png
+share/gnomeicu/icons/Eyeballs/gnomeicu-online.png
+share/gnomeicu/icons/Eyeballs/gnomeicu-rename.png
+share/gnomeicu/icons/Eyeballs/gnomeicu-still.png
+share/gnomeicu/icons/Eyeballs/gnomeicu-url.png
+share/gnomeicu/icons/Gradients/gnomeicu-animation.gif
+share/gnomeicu/icons/Gradients/gnomeicu-away.png
+share/gnomeicu/icons/Gradients/gnomeicu-dnd.png
+share/gnomeicu/icons/Gradients/gnomeicu-ffc.png
+share/gnomeicu/icons/Gradients/gnomeicu-info
+share/gnomeicu/icons/Gradients/gnomeicu-inv.png
+share/gnomeicu/icons/Gradients/gnomeicu-na.png
+share/gnomeicu/icons/Gradients/gnomeicu-occ.png
+share/gnomeicu/icons/Gradients/gnomeicu-offline.png
+share/gnomeicu/icons/Gradients/gnomeicu-online.png
+share/gnomeicu/icons/reDubbed/gnomeicu-away.png
+share/gnomeicu/icons/reDubbed/gnomeicu-dnd.png
+share/gnomeicu/icons/reDubbed/gnomeicu-ffc.png
+share/gnomeicu/icons/reDubbed/gnomeicu-info
+share/gnomeicu/icons/reDubbed/gnomeicu-inv.png
+share/gnomeicu/icons/reDubbed/gnomeicu-na.png
+share/gnomeicu/icons/reDubbed/gnomeicu-occ.png
+share/gnomeicu/icons/reDubbed/gnomeicu-offline.png
+share/gnomeicu/icons/reDubbed/gnomeicu-online.png
+share/gnomeicu/prefs_icon_gnomeicu.png
+share/gnomeicu/prefs_icon_icq.png
 share/gnome/help/gnomeicu/C/figures/addcontactdruid.png
 share/gnome/help/gnomeicu/C/figures/mainwindow.png
 share/gnome/help/gnomeicu/C/figures/messagedialog.png
@@ -220,15 +220,15 @@ share/gnome/help/gnomeicu/uk/figures/sendfile.png
 share/gnome/help/gnomeicu/uk/figures/sendurl.png
 share/gnome/help/gnomeicu/uk/figures/userinfo.png
 share/gnome/help/gnomeicu/uk/gnomeicu.xml
-share/gnome/omf/gnomeicu/gnomeicu-C.omf
-share/gnome/omf/gnomeicu/gnomeicu-uk.omf
-share/gnome/pixmaps/gnomeicu.png
-share/gnome/sounds/gnomeicu/Auth.wav
-share/gnome/sounds/gnomeicu/File.wav
-share/gnome/sounds/gnomeicu/Online.wav
-share/gnome/sounds/gnomeicu/URL.wav
-share/gnome/sounds/gnomeicu/contlist.wav
-share/gnome/sounds/gnomeicu/message.wav
+share/omf/gnomeicu/gnomeicu-C.omf
+share/omf/gnomeicu/gnomeicu-uk.omf
+share/pixmaps/gnomeicu.png
+share/sounds/gnomeicu/Auth.wav
+share/sounds/gnomeicu/File.wav
+share/sounds/gnomeicu/Online.wav
+share/sounds/gnomeicu/URL.wav
+share/sounds/gnomeicu/contlist.wav
+share/sounds/gnomeicu/message.wav
 share/locale/am/LC_MESSAGES/gnomeicu.mo
 share/locale/az/LC_MESSAGES/gnomeicu.mo
 share/locale/be/LC_MESSAGES/gnomeicu.mo
@@ -281,23 +281,28 @@ share/locale/vi/LC_MESSAGES/gnomeicu.mo
 share/locale/zh_CN/LC_MESSAGES/gnomeicu.mo
 share/locale/zh_HK/LC_MESSAGES/gnomeicu.mo
 share/locale/zh_TW/LC_MESSAGES/gnomeicu.mo
-@dirrm share/gnome/sounds/gnomeicu
-@dirrm share/gnome/omf/gnomeicu
+@dirrm share/sounds/gnomeicu
+@dirrm share/omf/gnomeicu
 @dirrm share/gnome/help/gnomeicu/uk/figures
 @dirrm share/gnome/help/gnomeicu/uk
 @dirrm share/gnome/help/gnomeicu/C/figures
 @dirrm share/gnome/help/gnomeicu/C
 @dirrm share/gnome/help/gnomeicu
-@dirrm share/gnome/gnomeicu/icons/reDubbed
-@dirrm share/gnome/gnomeicu/icons/Gradients
-@dirrm share/gnome/gnomeicu/icons/Eyeballs
-@dirrm share/gnome/gnomeicu/icons/Default
-@dirrm share/gnome/gnomeicu/icons
-@dirrm share/gnome/gnomeicu/glade
-@dirrm share/gnome/gnomeicu/emoticons/Yahoo
-@dirrm share/gnome/gnomeicu/emoticons/MSN
-@dirrm share/gnome/gnomeicu/emoticons/Default
-@dirrm share/gnome/gnomeicu/emoticons/Always
-@dirrm share/gnome/gnomeicu/emoticons/AIM
-@dirrm share/gnome/gnomeicu/emoticons
-@dirrm share/gnome/gnomeicu
+@dirrm share/gnomeicu/icons/reDubbed
+@dirrm share/gnomeicu/icons/Gradients
+@dirrm share/gnomeicu/icons/Eyeballs
+@dirrm share/gnomeicu/icons/Default
+@dirrm share/gnomeicu/icons
+@dirrm share/gnomeicu/glade
+@dirrm share/gnomeicu/emoticons/Yahoo
+@dirrm share/gnomeicu/emoticons/MSN
+@dirrm share/gnomeicu/emoticons/Default
+@dirrm share/gnomeicu/emoticons/Always
+@dirrm share/gnomeicu/emoticons/AIM
+@dirrm share/gnomeicu/emoticons
+@dirrm share/gnomeicu
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
+@dirrmtry share/applications
diff --git a/net-im/gossip/Makefile b/net-im/gossip/Makefile
index e4be7d216d82..5ddc5d3f999a 100644
--- a/net-im/gossip/Makefile
+++ b/net-im/gossip/Makefile
@@ -3,10 +3,12 @@
 # Whom:					Adam Weinberger <adamw@FreeBSD.org>
 #
 # $FreeBSD$
+#   $MCom: ports/net-im/gossip/Makefile,v 1.10 2007/07/30 20:30:21 mezz Exp $
 #
 
 PORTNAME=	gossip
 PORTVERSION=	0.26
+PORTREVISION=	1
 CATEGORIES=	net-im gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/net-im/gossip/pkg-plist b/net-im/gossip/pkg-plist
index 852b54052286..355667bf9404 100644
--- a/net-im/gossip/pkg-plist
+++ b/net-im/gossip/pkg-plist
@@ -2,35 +2,35 @@ bin/gossip
 etc/sound/events/gossip.soundlist
 libdata/bonobo/servers/GNOME_Peekaboo_Applet.server
 libexec/peekaboo-applet
-share/gnome/applications/gossip.desktop
-share/gnome/gossip/GNOME_Peekaboo_Applet.xml
-share/gnome/gossip/chat.glade
-share/gnome/gossip/file-transfer.glade
-share/gnome/gossip/gossip-account.dtd
-share/gnome/gossip/gossip-available.png
-share/gnome/gossip/gossip-away.png
-share/gnome/gossip/gossip-busy.png
-share/gnome/gossip/gossip-chatroom.dtd
-share/gnome/gossip/gossip-contact-groups.dtd
-share/gnome/gossip/gossip-contact.dtd
-share/gnome/gossip/gossip-extended-away.png
-share/gnome/gossip/gossip-group-message.png
-share/gnome/gossip/gossip-log.xsl
-share/gnome/gossip/gossip-logo.png
-share/gnome/gossip/gossip-message.png
-share/gnome/gossip/gossip-offline.png
-share/gnome/gossip/gossip-pending.png
-share/gnome/gossip/gossip-status-presets.dtd
-share/gnome/gossip/gossip-typing.png
-share/gnome/gossip/group-chat.glade
-share/gnome/gossip/main.glade
-share/gnome/gossip/vcard_16.png
-share/gnome/gossip/vcard_48.png
-share/gnome/gossip/protocols/aim.protocol
-share/gnome/gossip/protocols/gossip-protocol.dtd
-share/gnome/gossip/protocols/icq.protocol
-share/gnome/gossip/protocols/msn.protocol
-share/gnome/gossip/protocols/yahoo.protocol
+share/applications/gossip.desktop
+share/gossip/GNOME_Peekaboo_Applet.xml
+share/gossip/chat.glade
+share/gossip/file-transfer.glade
+share/gossip/gossip-account.dtd
+share/gossip/gossip-available.png
+share/gossip/gossip-away.png
+share/gossip/gossip-busy.png
+share/gossip/gossip-chatroom.dtd
+share/gossip/gossip-contact-groups.dtd
+share/gossip/gossip-contact.dtd
+share/gossip/gossip-extended-away.png
+share/gossip/gossip-group-message.png
+share/gossip/gossip-log.xsl
+share/gossip/gossip-logo.png
+share/gossip/gossip-message.png
+share/gossip/gossip-offline.png
+share/gossip/gossip-pending.png
+share/gossip/gossip-status-presets.dtd
+share/gossip/gossip-typing.png
+share/gossip/group-chat.glade
+share/gossip/main.glade
+share/gossip/vcard_16.png
+share/gossip/vcard_48.png
+share/gossip/protocols/aim.protocol
+share/gossip/protocols/gossip-protocol.dtd
+share/gossip/protocols/icq.protocol
+share/gossip/protocols/msn.protocol
+share/gossip/protocols/yahoo.protocol
 share/gnome/help/gossip/C/figures/gossip-available.png
 share/gnome/help/gossip/C/figures/gossip-away.png
 share/gnome/help/gossip/C/figures/gossip-busy.png
@@ -64,15 +64,15 @@ share/gnome/help/gossip/sv/figures/gossip-offline.png
 share/gnome/help/gossip/sv/figures/gossip-personal-details.png
 share/gnome/help/gossip/sv/figures/gossip-roster.png
 share/gnome/help/gossip/sv/gossip.xml
-share/gnome/omf/gossip/gossip-C.omf
-share/gnome/omf/gossip/gossip-es.omf
-share/gnome/omf/gossip/gossip-fr.omf
-share/gnome/omf/gossip/gossip-sv.omf
-share/gnome/sounds/gossip/chat1.wav
-share/gnome/sounds/gossip/chat2.wav
-share/gnome/sounds/gossip/offline.wav
-share/gnome/sounds/gossip/online.wav
-share/gnome/sounds/gossip/send.wav
+share/omf/gossip/gossip-C.omf
+share/omf/gossip/gossip-es.omf
+share/omf/gossip/gossip-fr.omf
+share/omf/gossip/gossip-sv.omf
+share/sounds/gossip/chat1.wav
+share/sounds/gossip/chat2.wav
+share/sounds/gossip/offline.wav
+share/sounds/gossip/online.wav
+share/sounds/gossip/send.wav
 share/icons/hicolor/16x16/apps/gossip.png
 share/icons/hicolor/22x22/apps/gossip.png
 share/icons/hicolor/32x32/apps/gossip.png
@@ -119,7 +119,7 @@ share/locale/vi/LC_MESSAGES/gossip.mo
 share/locale/zh_CN/LC_MESSAGES/gossip.mo
 share/locale/zh_HK/LC_MESSAGES/gossip.mo
 share/locale/zh_TW/LC_MESSAGES/gossip.mo
-@dirrm share/gnome/omf/gossip
+@dirrm share/omf/gossip
 @dirrm share/gnome/help/gossip/sv/figures
 @dirrm share/gnome/help/gossip/sv
 @dirrm share/gnome/help/gossip/fr/figures
@@ -129,10 +129,11 @@ share/locale/zh_TW/LC_MESSAGES/gossip.mo
 @dirrm share/gnome/help/gossip/C/figures
 @dirrm share/gnome/help/gossip/C
 @dirrm share/gnome/help/gossip
-@dirrm share/gnome/sounds/gossip
-@dirrm share/gnome/gossip/protocols
-@dirrm share/gnome/gossip
+@dirrm share/sounds/gossip
+@dirrm share/gossip/protocols
+@dirrm share/gossip
 @dirrmtry share/locale/zh_HK/LC_MESSAGES
 @dirrmtry share/locale/zh_HK
 @dirrmtry share/locale/dz/LC_MESSAGES
 @dirrmtry share/locale/dz
+@dirrmtry share/applications
diff --git a/net-im/ickle/Makefile b/net-im/ickle/Makefile
index efc76439f978..da669f23ace3 100644
--- a/net-im/ickle/Makefile
+++ b/net-im/ickle/Makefile
@@ -4,11 +4,11 @@
 # Whom:				ijliao
 #
 # $FreeBSD$
-#    $MCom: ports/net-im/ickle/Makefile,v 1.1 2006/10/04 15:40:14 ahze Exp $
+#
 
 PORTNAME=	ickle
 PORTVERSION=	0.3.2
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	net-im devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -38,11 +38,11 @@ post-patch:
 .if ${HAVE_GNOME:Mlibcapplet}!="" || defined(WITH_GNOME)
 USE_GNOME+=	libcapplet
 PKGNAMESUFFIX=	-gnome
-PLIST_SUB+=	ICKLEDATADIR="share/gnome/" GNOME="" NOGNOME="@comment "
+PLIST_SUB+=	GNOME="" NOGNOME="@comment "
 .else
 CONFIGURE_ARGS+=	--with-gnome=no
 
-PLIST_SUB+=	ICKLEDATADIR="share/" GNOME="@comment " NOGNOME=""
+PLIST_SUB+=	GNOME="@comment " NOGNOME=""
 .endif
 
 .if defined(WITH_ICKLE_CONTROL)
diff --git a/net-im/ickle/pkg-plist b/net-im/ickle/pkg-plist
index b7b1b48aee2a..8f7e0a3e53a7 100644
--- a/net-im/ickle/pkg-plist
+++ b/net-im/ickle/pkg-plist
@@ -2,151 +2,151 @@
 %%GNOME%%bin/ickle_applet
 %%ICKLECONTROL%%bin/ickle_control
 %%GNOME%%etc/CORBA/servers/ickle_applet.gnorba
-%%GNOME%%%%ICKLEDATADIR%%applets/Network/ickle_applet.desktop
-%%ICKLEDATADIR%%ickle/icons/doors/away.xpm
-%%ICKLEDATADIR%%ickle/icons/doors/chat.xpm
-%%ICKLEDATADIR%%ickle/icons/doors/dnd.xpm
-%%ICKLEDATADIR%%ickle/icons/doors/ffc.xpm
-%%ICKLEDATADIR%%ickle/icons/doors/file.xpm
-%%ICKLEDATADIR%%ickle/icons/doors/invisible.xpm
-%%ICKLEDATADIR%%ickle/icons/doors/message.xpm
-%%ICKLEDATADIR%%ickle/icons/doors/na.xpm
-%%ICKLEDATADIR%%ickle/icons/doors/occ.xpm
-%%ICKLEDATADIR%%ickle/icons/doors/offline.xpm
-%%ICKLEDATADIR%%ickle/icons/doors/online.xpm
-%%ICKLEDATADIR%%ickle/icons/doors/sms.xpm
-%%ICKLEDATADIR%%ickle/icons/doors/sysmsg.xpm
-%%ICKLEDATADIR%%ickle/icons/doors/url.xpm
-%%ICKLEDATADIR%%ickle/icons/eureka/away.xpm
-%%ICKLEDATADIR%%ickle/icons/eureka/chat.xpm
-%%ICKLEDATADIR%%ickle/icons/eureka/dnd.xpm
-%%ICKLEDATADIR%%ickle/icons/eureka/ffc.xpm
-%%ICKLEDATADIR%%ickle/icons/eureka/file.xpm
-%%ICKLEDATADIR%%ickle/icons/eureka/invisible.xpm
-%%ICKLEDATADIR%%ickle/icons/eureka/message.xpm
-%%ICKLEDATADIR%%ickle/icons/eureka/na.xpm
-%%ICKLEDATADIR%%ickle/icons/eureka/occ.xpm
-%%ICKLEDATADIR%%ickle/icons/eureka/offline.xpm
-%%ICKLEDATADIR%%ickle/icons/eureka/online.xpm
-%%ICKLEDATADIR%%ickle/icons/eureka/sms.xpm
-%%ICKLEDATADIR%%ickle/icons/eureka/sysmsg.xpm
-%%ICKLEDATADIR%%ickle/icons/eureka/url.xpm
-%%ICKLEDATADIR%%ickle/icons/gnomeicu/away.xpm
-%%ICKLEDATADIR%%ickle/icons/gnomeicu/chat.xpm
-%%ICKLEDATADIR%%ickle/icons/gnomeicu/dnd.xpm
-%%ICKLEDATADIR%%ickle/icons/gnomeicu/ffc.xpm
-%%ICKLEDATADIR%%ickle/icons/gnomeicu/file.xpm
-%%ICKLEDATADIR%%ickle/icons/gnomeicu/invisible.xpm
-%%ICKLEDATADIR%%ickle/icons/gnomeicu/message.xpm
-%%ICKLEDATADIR%%ickle/icons/gnomeicu/na.xpm
-%%ICKLEDATADIR%%ickle/icons/gnomeicu/occ.xpm
-%%ICKLEDATADIR%%ickle/icons/gnomeicu/offline.xpm
-%%ICKLEDATADIR%%ickle/icons/gnomeicu/online.xpm
-%%ICKLEDATADIR%%ickle/icons/gnomeicu/sms.xpm
-%%ICKLEDATADIR%%ickle/icons/gnomeicu/sysmsg.xpm
-%%ICKLEDATADIR%%ickle/icons/gnomeicu/url.xpm
-%%ICKLEDATADIR%%ickle/icons/ickle/away.xpm
-%%ICKLEDATADIR%%ickle/icons/ickle/chat.xpm
-%%ICKLEDATADIR%%ickle/icons/ickle/dnd.xpm
-%%ICKLEDATADIR%%ickle/icons/ickle/ffc.xpm
-%%ICKLEDATADIR%%ickle/icons/ickle/file.xpm
-%%ICKLEDATADIR%%ickle/icons/ickle/invisible.xpm
-%%ICKLEDATADIR%%ickle/icons/ickle/message.xpm
-%%ICKLEDATADIR%%ickle/icons/ickle/na.xpm
-%%ICKLEDATADIR%%ickle/icons/ickle/occ.xpm
-%%ICKLEDATADIR%%ickle/icons/ickle/offline.xpm
-%%ICKLEDATADIR%%ickle/icons/ickle/online.xpm
-%%ICKLEDATADIR%%ickle/icons/ickle/sms.xpm
-%%ICKLEDATADIR%%ickle/icons/ickle/sysmsg.xpm
-%%ICKLEDATADIR%%ickle/icons/ickle/url.xpm
-%%ICKLEDATADIR%%ickle/icons/icq/away.xpm
-%%ICKLEDATADIR%%ickle/icons/icq/chat.xpm
-%%ICKLEDATADIR%%ickle/icons/icq/dnd.xpm
-%%ICKLEDATADIR%%ickle/icons/icq/ffc.xpm
-%%ICKLEDATADIR%%ickle/icons/icq/file.xpm
-%%ICKLEDATADIR%%ickle/icons/icq/invisible.xpm
-%%ICKLEDATADIR%%ickle/icons/icq/message.xpm
-%%ICKLEDATADIR%%ickle/icons/icq/na.xpm
-%%ICKLEDATADIR%%ickle/icons/icq/occ.xpm
-%%ICKLEDATADIR%%ickle/icons/icq/offline.xpm
-%%ICKLEDATADIR%%ickle/icons/icq/online.xpm
-%%ICKLEDATADIR%%ickle/icons/icq/sms.xpm
-%%ICKLEDATADIR%%ickle/icons/icq/sysmsg.xpm
-%%ICKLEDATADIR%%ickle/icons/icq/url.xpm
-%%ICKLEDATADIR%%ickle/icons/kit/away.xpm
-%%ICKLEDATADIR%%ickle/icons/kit/chat.xpm
-%%ICKLEDATADIR%%ickle/icons/kit/dnd.xpm
-%%ICKLEDATADIR%%ickle/icons/kit/ffc.xpm
-%%ICKLEDATADIR%%ickle/icons/kit/file.xpm
-%%ICKLEDATADIR%%ickle/icons/kit/invisible.xpm
-%%ICKLEDATADIR%%ickle/icons/kit/message.xpm
-%%ICKLEDATADIR%%ickle/icons/kit/na.xpm
-%%ICKLEDATADIR%%ickle/icons/kit/occ.xpm
-%%ICKLEDATADIR%%ickle/icons/kit/offline.xpm
-%%ICKLEDATADIR%%ickle/icons/kit/online.xpm
-%%ICKLEDATADIR%%ickle/icons/kit/sms.xpm
-%%ICKLEDATADIR%%ickle/icons/kit/sysmsg.xpm
-%%ICKLEDATADIR%%ickle/icons/kit/url.xpm
-%%ICKLEDATADIR%%ickle/icons/new/away.xpm
-%%ICKLEDATADIR%%ickle/icons/new/chat.xpm
-%%ICKLEDATADIR%%ickle/icons/new/dnd.xpm
-%%ICKLEDATADIR%%ickle/icons/new/ffc.xpm
-%%ICKLEDATADIR%%ickle/icons/new/file.xpm
-%%ICKLEDATADIR%%ickle/icons/new/invisible.xpm
-%%ICKLEDATADIR%%ickle/icons/new/message.xpm
-%%ICKLEDATADIR%%ickle/icons/new/na.xpm
-%%ICKLEDATADIR%%ickle/icons/new/occ.xpm
-%%ICKLEDATADIR%%ickle/icons/new/offline.xpm
-%%ICKLEDATADIR%%ickle/icons/new/online.xpm
-%%ICKLEDATADIR%%ickle/icons/new/sms.xpm
-%%ICKLEDATADIR%%ickle/icons/new/sysmsg.xpm
-%%ICKLEDATADIR%%ickle/icons/new/url.xpm
-%%ICKLEDATADIR%%ickle/translations/ASCII
-%%ICKLEDATADIR%%ickle/translations/CP437
-%%ICKLEDATADIR%%ickle/translations/CP850
-%%ICKLEDATADIR%%ickle/translations/DANISH
-%%ICKLEDATADIR%%ickle/translations/DEC_MCS
-%%ICKLEDATADIR%%ickle/translations/DG_MCS
-%%ICKLEDATADIR%%ickle/translations/DUTCH
-%%ICKLEDATADIR%%ickle/translations/FINNISH
-%%ICKLEDATADIR%%ickle/translations/FRENCH
-%%ICKLEDATADIR%%ickle/translations/FRENCH_CANADIAN
-%%ICKLEDATADIR%%ickle/translations/GERMAN
-%%ICKLEDATADIR%%ickle/translations/HP_MCS
-%%ICKLEDATADIR%%ickle/translations/IRV
-%%ICKLEDATADIR%%ickle/translations/ITALIAN
-%%ICKLEDATADIR%%ickle/translations/JIS
-%%ICKLEDATADIR%%ickle/translations/LATIN_2
-%%ICKLEDATADIR%%ickle/translations/MACINTOSH
-%%ICKLEDATADIR%%ickle/translations/NEXT
-%%ICKLEDATADIR%%ickle/translations/NORWEGIAN_1
-%%ICKLEDATADIR%%ickle/translations/NORWEGIAN_2
-%%ICKLEDATADIR%%ickle/translations/POLISH
-%%ICKLEDATADIR%%ickle/translations/POLISH_NOPL
-%%ICKLEDATADIR%%ickle/translations/PORTUGUESE
-%%ICKLEDATADIR%%ickle/translations/PORTUGUESE_COM
-%%ICKLEDATADIR%%ickle/translations/RUSSIAN
-%%ICKLEDATADIR%%ickle/translations/RUSSIAN_ALT
-%%ICKLEDATADIR%%ickle/translations/RUSSIAN_WIN
-%%ICKLEDATADIR%%ickle/translations/SPANISH
-%%ICKLEDATADIR%%ickle/translations/SWEDISH
-%%ICKLEDATADIR%%ickle/translations/SWEDISH_NAMES
-%%ICKLEDATADIR%%ickle/translations/SWEDISH_NAMES_COM
-%%ICKLEDATADIR%%ickle/translations/SWISS
-%%ICKLEDATADIR%%ickle/translations/UKRAINIAN_WIN
-%%ICKLEDATADIR%%ickle/translations/UNITED_KINGDOM
-%%ICKLEDATADIR%%ickle/translations/UNITED_KINGDOM_COM
-@dirrm %%ICKLEDATADIR%%ickle/translations
-@dirrm %%ICKLEDATADIR%%ickle/icons/new
-@dirrm %%ICKLEDATADIR%%ickle/icons/kit
-@dirrm %%ICKLEDATADIR%%ickle/icons/icq
-@dirrm %%ICKLEDATADIR%%ickle/icons/ickle
-@dirrm %%ICKLEDATADIR%%ickle/icons/gnomeicu
-@dirrm %%ICKLEDATADIR%%ickle/icons/eureka
-@dirrm %%ICKLEDATADIR%%ickle/icons/doors
-@dirrm %%ICKLEDATADIR%%ickle/icons
-@dirrm %%ICKLEDATADIR%%ickle
-@dirrmtry %%ICKLEDATADIR%%applets/Network
-@dirrmtry %%ICKLEDATADIR%%applets
+%%GNOME%%share/applets/Network/ickle_applet.desktop
+%%DATADIR%%/icons/doors/away.xpm
+%%DATADIR%%/icons/doors/chat.xpm
+%%DATADIR%%/icons/doors/dnd.xpm
+%%DATADIR%%/icons/doors/ffc.xpm
+%%DATADIR%%/icons/doors/file.xpm
+%%DATADIR%%/icons/doors/invisible.xpm
+%%DATADIR%%/icons/doors/message.xpm
+%%DATADIR%%/icons/doors/na.xpm
+%%DATADIR%%/icons/doors/occ.xpm
+%%DATADIR%%/icons/doors/offline.xpm
+%%DATADIR%%/icons/doors/online.xpm
+%%DATADIR%%/icons/doors/sms.xpm
+%%DATADIR%%/icons/doors/sysmsg.xpm
+%%DATADIR%%/icons/doors/url.xpm
+%%DATADIR%%/icons/eureka/away.xpm
+%%DATADIR%%/icons/eureka/chat.xpm
+%%DATADIR%%/icons/eureka/dnd.xpm
+%%DATADIR%%/icons/eureka/ffc.xpm
+%%DATADIR%%/icons/eureka/file.xpm
+%%DATADIR%%/icons/eureka/invisible.xpm
+%%DATADIR%%/icons/eureka/message.xpm
+%%DATADIR%%/icons/eureka/na.xpm
+%%DATADIR%%/icons/eureka/occ.xpm
+%%DATADIR%%/icons/eureka/offline.xpm
+%%DATADIR%%/icons/eureka/online.xpm
+%%DATADIR%%/icons/eureka/sms.xpm
+%%DATADIR%%/icons/eureka/sysmsg.xpm
+%%DATADIR%%/icons/eureka/url.xpm
+%%DATADIR%%/icons/gnomeicu/away.xpm
+%%DATADIR%%/icons/gnomeicu/chat.xpm
+%%DATADIR%%/icons/gnomeicu/dnd.xpm
+%%DATADIR%%/icons/gnomeicu/ffc.xpm
+%%DATADIR%%/icons/gnomeicu/file.xpm
+%%DATADIR%%/icons/gnomeicu/invisible.xpm
+%%DATADIR%%/icons/gnomeicu/message.xpm
+%%DATADIR%%/icons/gnomeicu/na.xpm
+%%DATADIR%%/icons/gnomeicu/occ.xpm
+%%DATADIR%%/icons/gnomeicu/offline.xpm
+%%DATADIR%%/icons/gnomeicu/online.xpm
+%%DATADIR%%/icons/gnomeicu/sms.xpm
+%%DATADIR%%/icons/gnomeicu/sysmsg.xpm
+%%DATADIR%%/icons/gnomeicu/url.xpm
+%%DATADIR%%/icons/ickle/away.xpm
+%%DATADIR%%/icons/ickle/chat.xpm
+%%DATADIR%%/icons/ickle/dnd.xpm
+%%DATADIR%%/icons/ickle/ffc.xpm
+%%DATADIR%%/icons/ickle/file.xpm
+%%DATADIR%%/icons/ickle/invisible.xpm
+%%DATADIR%%/icons/ickle/message.xpm
+%%DATADIR%%/icons/ickle/na.xpm
+%%DATADIR%%/icons/ickle/occ.xpm
+%%DATADIR%%/icons/ickle/offline.xpm
+%%DATADIR%%/icons/ickle/online.xpm
+%%DATADIR%%/icons/ickle/sms.xpm
+%%DATADIR%%/icons/ickle/sysmsg.xpm
+%%DATADIR%%/icons/ickle/url.xpm
+%%DATADIR%%/icons/icq/away.xpm
+%%DATADIR%%/icons/icq/chat.xpm
+%%DATADIR%%/icons/icq/dnd.xpm
+%%DATADIR%%/icons/icq/ffc.xpm
+%%DATADIR%%/icons/icq/file.xpm
+%%DATADIR%%/icons/icq/invisible.xpm
+%%DATADIR%%/icons/icq/message.xpm
+%%DATADIR%%/icons/icq/na.xpm
+%%DATADIR%%/icons/icq/occ.xpm
+%%DATADIR%%/icons/icq/offline.xpm
+%%DATADIR%%/icons/icq/online.xpm
+%%DATADIR%%/icons/icq/sms.xpm
+%%DATADIR%%/icons/icq/sysmsg.xpm
+%%DATADIR%%/icons/icq/url.xpm
+%%DATADIR%%/icons/kit/away.xpm
+%%DATADIR%%/icons/kit/chat.xpm
+%%DATADIR%%/icons/kit/dnd.xpm
+%%DATADIR%%/icons/kit/ffc.xpm
+%%DATADIR%%/icons/kit/file.xpm
+%%DATADIR%%/icons/kit/invisible.xpm
+%%DATADIR%%/icons/kit/message.xpm
+%%DATADIR%%/icons/kit/na.xpm
+%%DATADIR%%/icons/kit/occ.xpm
+%%DATADIR%%/icons/kit/offline.xpm
+%%DATADIR%%/icons/kit/online.xpm
+%%DATADIR%%/icons/kit/sms.xpm
+%%DATADIR%%/icons/kit/sysmsg.xpm
+%%DATADIR%%/icons/kit/url.xpm
+%%DATADIR%%/icons/new/away.xpm
+%%DATADIR%%/icons/new/chat.xpm
+%%DATADIR%%/icons/new/dnd.xpm
+%%DATADIR%%/icons/new/ffc.xpm
+%%DATADIR%%/icons/new/file.xpm
+%%DATADIR%%/icons/new/invisible.xpm
+%%DATADIR%%/icons/new/message.xpm
+%%DATADIR%%/icons/new/na.xpm
+%%DATADIR%%/icons/new/occ.xpm
+%%DATADIR%%/icons/new/offline.xpm
+%%DATADIR%%/icons/new/online.xpm
+%%DATADIR%%/icons/new/sms.xpm
+%%DATADIR%%/icons/new/sysmsg.xpm
+%%DATADIR%%/icons/new/url.xpm
+%%DATADIR%%/translations/ASCII
+%%DATADIR%%/translations/CP437
+%%DATADIR%%/translations/CP850
+%%DATADIR%%/translations/DANISH
+%%DATADIR%%/translations/DEC_MCS
+%%DATADIR%%/translations/DG_MCS
+%%DATADIR%%/translations/DUTCH
+%%DATADIR%%/translations/FINNISH
+%%DATADIR%%/translations/FRENCH
+%%DATADIR%%/translations/FRENCH_CANADIAN
+%%DATADIR%%/translations/GERMAN
+%%DATADIR%%/translations/HP_MCS
+%%DATADIR%%/translations/IRV
+%%DATADIR%%/translations/ITALIAN
+%%DATADIR%%/translations/JIS
+%%DATADIR%%/translations/LATIN_2
+%%DATADIR%%/translations/MACINTOSH
+%%DATADIR%%/translations/NEXT
+%%DATADIR%%/translations/NORWEGIAN_1
+%%DATADIR%%/translations/NORWEGIAN_2
+%%DATADIR%%/translations/POLISH
+%%DATADIR%%/translations/POLISH_NOPL
+%%DATADIR%%/translations/PORTUGUESE
+%%DATADIR%%/translations/PORTUGUESE_COM
+%%DATADIR%%/translations/RUSSIAN
+%%DATADIR%%/translations/RUSSIAN_ALT
+%%DATADIR%%/translations/RUSSIAN_WIN
+%%DATADIR%%/translations/SPANISH
+%%DATADIR%%/translations/SWEDISH
+%%DATADIR%%/translations/SWEDISH_NAMES
+%%DATADIR%%/translations/SWEDISH_NAMES_COM
+%%DATADIR%%/translations/SWISS
+%%DATADIR%%/translations/UKRAINIAN_WIN
+%%DATADIR%%/translations/UNITED_KINGDOM
+%%DATADIR%%/translations/UNITED_KINGDOM_COM
+@dirrm %%DATADIR%%/translations
+@dirrm %%DATADIR%%/icons/new
+@dirrm %%DATADIR%%/icons/kit
+@dirrm %%DATADIR%%/icons/icq
+@dirrm %%DATADIR%%/icons/ickle
+@dirrm %%DATADIR%%/icons/gnomeicu
+@dirrm %%DATADIR%%/icons/eureka
+@dirrm %%DATADIR%%/icons/doors
+@dirrm %%DATADIR%%/icons
+@dirrm %%DATADIR%%
+@dirrmtry share/applets/Network
+@dirrmtry share/applets
 @dirrmtry etc/CORBA/servers
 @dirrmtry etc/CORBA
diff --git a/net-im/libpurple/Makefile b/net-im/libpurple/Makefile
index 0ba703ee1ea3..0ec8e2d33491 100644
--- a/net-im/libpurple/Makefile
+++ b/net-im/libpurple/Makefile
@@ -3,12 +3,12 @@
 # Whom:				Jim Mock <jim@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/net-im/libgaim/Makefile,v 1.10 2007/03/11 06:36:56 marcus Exp $
+#   $MCom: ports/net-im/libpurple/Makefile,v 1.27 2007/10/11 16:32:55 marcus Exp $
 #
 
 PORTNAME?=	libpurple
 PORTVERSION=	2.2.1
-PORTREVISION?=	0
+PORTREVISION?=	2
 CATEGORIES?=	net-im
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	pidgin
@@ -24,8 +24,8 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS?=--disable-gtkui \
 		--disable-consoleui \
 		--with-dynamic_prpls=${PRPL_MODULES}
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS}" \
-		LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS}" \
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
+		LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" \
 		PTHREAD_LIB="${PTHREAD_LIBS}"
 
 .if !defined(PIDGIN_SLAVE)
diff --git a/net-im/libpurple/pkg-plist b/net-im/libpurple/pkg-plist
index acfc863b5761..745c81518758 100644
--- a/net-im/libpurple/pkg-plist
+++ b/net-im/libpurple/pkg-plist
@@ -136,16 +136,16 @@ lib/libpurple.so
 lib/libpurple.so.2
 libdata/pkgconfig/purple.pc
 share/aclocal/purple.m4
-share/gnome/applications/pidgin.desktop
-share/gnome/purple/ca-certs/Equifax_Secure_CA.pem
-share/gnome/purple/ca-certs/GTE_CyberTrust_Global_Root.pem
-share/gnome/purple/ca-certs/Verisign_Class3_Primary_CA.pem
-share/gnome/purple/ca-certs/Verisign_RSA_Secure_Server_CA.pem
-share/gnome/sounds/purple/alert.wav
-share/gnome/sounds/purple/login.wav
-share/gnome/sounds/purple/logout.wav
-share/gnome/sounds/purple/receive.wav
-share/gnome/sounds/purple/send.wav
+share/applications/pidgin.desktop
+share/purple/ca-certs/Equifax_Secure_CA.pem
+share/purple/ca-certs/GTE_CyberTrust_Global_Root.pem
+share/purple/ca-certs/Verisign_Class3_Primary_CA.pem
+share/purple/ca-certs/Verisign_RSA_Secure_Server_CA.pem
+share/sounds/purple/alert.wav
+share/sounds/purple/login.wav
+share/sounds/purple/logout.wav
+share/sounds/purple/receive.wav
+share/sounds/purple/send.wav
 share/locale/af/LC_MESSAGES/pidgin.mo
 share/locale/am/LC_MESSAGES/pidgin.mo
 share/locale/ar/LC_MESSAGES/pidgin.mo
@@ -214,65 +214,33 @@ share/locale/xh/LC_MESSAGES/pidgin.mo
 share/locale/zh_CN/LC_MESSAGES/pidgin.mo
 share/locale/zh_HK/LC_MESSAGES/pidgin.mo
 share/locale/zh_TW/LC_MESSAGES/pidgin.mo
-@dirrmtry share/locale/zh_TW/LC_MESSAGES
-@dirrmtry share/locale/zh_TW
 @dirrmtry share/locale/zh_HK/LC_MESSAGES
 @dirrmtry share/locale/zh_HK
-@dirrmtry share/locale/zh_CN/LC_MESSAGES
-@dirrmtry share/locale/zh_CN
 @dirrmtry share/locale/xh/LC_MESSAGES
 @dirrmtry share/locale/xh
-@dirrmtry share/locale/uk/LC_MESSAGES
-@dirrmtry share/locale/uk
 @dirrmtry share/locale/te/LC_MESSAGES
 @dirrmtry share/locale/te
 @dirrmtry share/locale/sr@latin/LC_MESSAGES
 @dirrmtry share/locale/sr@latin
-@dirrmtry share/locale/sr/LC_MESSAGES
-@dirrmtry share/locale/sr
-@dirrmtry share/locale/sl/LC_MESSAGES
-@dirrmtry share/locale/sl
-@dirrmtry share/locale/sk/LC_MESSAGES
-@dirrmtry share/locale/sk
-@dirrmtry share/locale/ro/LC_MESSAGES
-@dirrmtry share/locale/ro
-@dirrmtry share/locale/pt/LC_MESSAGES
-@dirrmtry share/locale/pt
 @dirrmtry share/locale/ps/LC_MESSAGES
 @dirrmtry share/locale/ps
-@dirrmtry share/locale/pl/LC_MESSAGES
-@dirrmtry share/locale/pl
-@dirrmtry share/locale/nn/LC_MESSAGES
-@dirrmtry share/locale/nn
-@dirrmtry share/locale/ne/LC_MESSAGES
-@dirrmtry share/locale/ne
 @dirrmtry share/locale/my_MM/LC_MESSAGES
 @dirrmtry share/locale/my_MM
 @dirrmtry share/locale/lo/LC_MESSAGES
 @dirrmtry share/locale/lo
 @dirrmtry share/locale/ku/LC_MESSAGES
 @dirrmtry share/locale/ku
-@dirrmtry share/locale/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
-@dirrmtry share/locale/gl/LC_MESSAGES
-@dirrmtry share/locale/gl
-@dirrmtry share/locale/fi/LC_MESSAGES
-@dirrmtry share/locale/fi
-@dirrmtry share/locale/el/LC_MESSAGES
-@dirrmtry share/locale/el
 @dirrmtry share/locale/dz/LC_MESSAGES
 @dirrmtry share/locale/dz
-@dirrmtry share/locale/cs/LC_MESSAGES
-@dirrmtry share/locale/cs
 @dirrmtry share/locale/ca@valencia/LC_MESSAGES
 @dirrmtry share/locale/ca@valencia
-@dirrmtry share/locale/ca/LC_MESSAGES
-@dirrmtry share/locale/ca
 @dirrmtry share/locale/be@latin/LC_MESSAGES
 @dirrmtry share/locale/be@latin
-@dirrm share/gnome/sounds/purple
-@dirrm share/gnome/purple/ca-certs
-@dirrm share/gnome/purple
+@dirrm share/purple/ca-certs
+@dirrm share/purple
+@dirrm share/pidgin/
+@dirrm share/sounds/purple
 %%PERL:%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Purple
 @dirrm lib/purple-2
 @dirrm include/libpurple
+@dirrmtry share/applications
diff --git a/net-im/pidgin-guifications/Makefile b/net-im/pidgin-guifications/Makefile
index b822191f7b35..26b344de3c00 100644
--- a/net-im/pidgin-guifications/Makefile
+++ b/net-im/pidgin-guifications/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	pidgin-guifications
 PORTVERSION=	2.14
+PORTREVISION=	1
 CATEGORIES=	net-im
 MASTER_SITES=	http://downloads.guifications.org/plugins/Guifications2/
 
diff --git a/net-im/pidgin-guifications/pkg-plist b/net-im/pidgin-guifications/pkg-plist
index 59e0a5435cd0..dbd4d063962c 100644
--- a/net-im/pidgin-guifications/pkg-plist
+++ b/net-im/pidgin-guifications/pkg-plist
@@ -1,35 +1,35 @@
 lib/pidgin/guifications.la
 lib/pidgin/guifications.so
-share/gnome/pixmaps/pidgin/guifications/conf/item_icon_size_big.png
-share/gnome/pixmaps/pidgin/guifications/conf/item_icon_size_huge.png
-share/gnome/pixmaps/pidgin/guifications/conf/item_icon_size_large.png
-share/gnome/pixmaps/pidgin/guifications/conf/item_icon_size_little.png
-share/gnome/pixmaps/pidgin/guifications/conf/item_icon_size_normal.png
-share/gnome/pixmaps/pidgin/guifications/conf/item_icon_size_small.png
-share/gnome/pixmaps/pidgin/guifications/conf/item_icon_size_tiny.png
-share/gnome/pixmaps/pidgin/guifications/conf/item_position_center.png
-share/gnome/pixmaps/pidgin/guifications/conf/item_position_east.png
-share/gnome/pixmaps/pidgin/guifications/conf/item_position_north.png
-share/gnome/pixmaps/pidgin/guifications/conf/item_position_north_east.png
-share/gnome/pixmaps/pidgin/guifications/conf/item_position_north_west.png
-share/gnome/pixmaps/pidgin/guifications/conf/item_position_south.png
-share/gnome/pixmaps/pidgin/guifications/conf/item_position_south_east.png
-share/gnome/pixmaps/pidgin/guifications/conf/item_position_south_west.png
-share/gnome/pixmaps/pidgin/guifications/conf/item_position_west.png
-share/gnome/pixmaps/pidgin/guifications/conf/item_text_clipping_ellipsis_end.png
-share/gnome/pixmaps/pidgin/guifications/conf/item_text_clipping_ellipsis_middle.png
-share/gnome/pixmaps/pidgin/guifications/conf/item_text_clipping_ellipsis_start.png
-share/gnome/pixmaps/pidgin/guifications/conf/item_text_clipping_truncate.png
-share/gnome/pixmaps/pidgin/guifications/conf/window_position_north_east.png
-share/gnome/pixmaps/pidgin/guifications/conf/window_position_north_west.png
-share/gnome/pixmaps/pidgin/guifications/conf/window_position_south_east.png
-share/gnome/pixmaps/pidgin/guifications/conf/window_position_south_west.png
-share/gnome/pixmaps/pidgin/guifications/themes/Penguins/penguin.png
-share/gnome/pixmaps/pidgin/guifications/themes/Penguins/theme.xml
-share/gnome/pixmaps/pidgin/guifications/themes/default/background.png
-share/gnome/pixmaps/pidgin/guifications/themes/default/theme.xml
-share/gnome/pixmaps/pidgin/guifications/themes/mini/background.png
-share/gnome/pixmaps/pidgin/guifications/themes/mini/theme.xml
+share/pixmaps/pidgin/guifications/conf/item_icon_size_big.png
+share/pixmaps/pidgin/guifications/conf/item_icon_size_huge.png
+share/pixmaps/pidgin/guifications/conf/item_icon_size_large.png
+share/pixmaps/pidgin/guifications/conf/item_icon_size_little.png
+share/pixmaps/pidgin/guifications/conf/item_icon_size_normal.png
+share/pixmaps/pidgin/guifications/conf/item_icon_size_small.png
+share/pixmaps/pidgin/guifications/conf/item_icon_size_tiny.png
+share/pixmaps/pidgin/guifications/conf/item_position_center.png
+share/pixmaps/pidgin/guifications/conf/item_position_east.png
+share/pixmaps/pidgin/guifications/conf/item_position_north.png
+share/pixmaps/pidgin/guifications/conf/item_position_north_east.png
+share/pixmaps/pidgin/guifications/conf/item_position_north_west.png
+share/pixmaps/pidgin/guifications/conf/item_position_south.png
+share/pixmaps/pidgin/guifications/conf/item_position_south_east.png
+share/pixmaps/pidgin/guifications/conf/item_position_south_west.png
+share/pixmaps/pidgin/guifications/conf/item_position_west.png
+share/pixmaps/pidgin/guifications/conf/item_text_clipping_ellipsis_end.png
+share/pixmaps/pidgin/guifications/conf/item_text_clipping_ellipsis_middle.png
+share/pixmaps/pidgin/guifications/conf/item_text_clipping_ellipsis_start.png
+share/pixmaps/pidgin/guifications/conf/item_text_clipping_truncate.png
+share/pixmaps/pidgin/guifications/conf/window_position_north_east.png
+share/pixmaps/pidgin/guifications/conf/window_position_north_west.png
+share/pixmaps/pidgin/guifications/conf/window_position_south_east.png
+share/pixmaps/pidgin/guifications/conf/window_position_south_west.png
+share/pixmaps/pidgin/guifications/themes/Penguins/penguin.png
+share/pixmaps/pidgin/guifications/themes/Penguins/theme.xml
+share/pixmaps/pidgin/guifications/themes/default/background.png
+share/pixmaps/pidgin/guifications/themes/default/theme.xml
+share/pixmaps/pidgin/guifications/themes/mini/background.png
+share/pixmaps/pidgin/guifications/themes/mini/theme.xml
 share/locale/bn/LC_MESSAGES/guifications.mo
 share/locale/cs/LC_MESSAGES/guifications.mo
 share/locale/de/LC_MESSAGES/guifications.mo
@@ -55,9 +55,9 @@ share/locale/sv/LC_MESSAGES/guifications.mo
 share/locale/uk/LC_MESSAGES/guifications.mo
 share/locale/zh_CN/LC_MESSAGES/guifications.mo
 share/locale/zh_TW/LC_MESSAGES/guifications.mo
-@dirrm share/gnome/pixmaps/pidgin/guifications/themes/mini
-@dirrm share/gnome/pixmaps/pidgin/guifications/themes/default
-@dirrm share/gnome/pixmaps/pidgin/guifications/themes/Penguins
-@dirrm share/gnome/pixmaps/pidgin/guifications/themes
-@dirrm share/gnome/pixmaps/pidgin/guifications/conf
-@dirrm share/gnome/pixmaps/pidgin/guifications
+@dirrm share/pixmaps/pidgin/guifications/themes/mini
+@dirrm share/pixmaps/pidgin/guifications/themes/default
+@dirrm share/pixmaps/pidgin/guifications/themes/Penguins
+@dirrm share/pixmaps/pidgin/guifications/themes
+@dirrm share/pixmaps/pidgin/guifications/conf
+@dirrm share/pixmaps/pidgin/guifications
diff --git a/net-im/pidgin/Makefile b/net-im/pidgin/Makefile
index 3c530dec2338..099d31b73e54 100644
--- a/net-im/pidgin/Makefile
+++ b/net-im/pidgin/Makefile
@@ -3,11 +3,11 @@
 # Whom:				Jim Mock <jim@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports-stable/net-im/gaim-devel/Makefile,v 1.3 2006/10/29 18:55:29 marcus Exp $
+#   $MCom: ports/net-im/pidgin/Makefile,v 1.17 2007/09/17 19:53:06 marcus Exp $
 #
 
 PORTNAME=	pidgin
-PORTREVISION=	0
+PORTREVISION=	2
 
 MAINTAINER=	marcus@FreeBSD.org
 COMMENT=	Pidgin multi-protocol messaging client (GTK+ UI)
diff --git a/net-im/pidgin/pkg-plist b/net-im/pidgin/pkg-plist
index 0cf5638491f4..52a9cd9bc83f 100644
--- a/net-im/pidgin/pkg-plist
+++ b/net-im/pidgin/pkg-plist
@@ -84,550 +84,550 @@ lib/pidgin/timestamp_format.so
 lib/pidgin/xmppconsole.la
 lib/pidgin/xmppconsole.so
 libdata/pkgconfig/pidgin.pc
-share/gnome/pixmaps/pidgin/animations/16/connect0.png
-share/gnome/pixmaps/pidgin/animations/16/connect1.png
-share/gnome/pixmaps/pidgin/animations/16/connect2.png
-share/gnome/pixmaps/pidgin/animations/16/connect3.png
-share/gnome/pixmaps/pidgin/animations/16/connect4.png
-share/gnome/pixmaps/pidgin/animations/16/connect5.png
-share/gnome/pixmaps/pidgin/animations/16/connect6.png
-share/gnome/pixmaps/pidgin/animations/16/connect7.png
-share/gnome/pixmaps/pidgin/animations/16/connect8.png
-share/gnome/pixmaps/pidgin/animations/16/typing0.png
-share/gnome/pixmaps/pidgin/animations/16/typing1.png
-share/gnome/pixmaps/pidgin/animations/16/typing2.png
-share/gnome/pixmaps/pidgin/animations/16/typing3.png
-share/gnome/pixmaps/pidgin/animations/16/typing4.png
-share/gnome/pixmaps/pidgin/animations/16/typing5.png
-share/gnome/pixmaps/pidgin/arrow-down.xpm
-share/gnome/pixmaps/pidgin/arrow-left.xpm
-share/gnome/pixmaps/pidgin/arrow-right.xpm
-share/gnome/pixmaps/pidgin/arrow-up.xpm
-share/gnome/pixmaps/pidgin/buttons/edit.png
-share/gnome/pixmaps/pidgin/buttons/info.png
-share/gnome/pixmaps/pidgin/buttons/music.png
-share/gnome/pixmaps/pidgin/buttons/pause.png
-share/gnome/pixmaps/pidgin/dialogs/16/auth.png
-share/gnome/pixmaps/pidgin/dialogs/16/error.png
-share/gnome/pixmaps/pidgin/dialogs/16/info.png
-share/gnome/pixmaps/pidgin/dialogs/16/mail.png
-share/gnome/pixmaps/pidgin/dialogs/16/question.png
-share/gnome/pixmaps/pidgin/dialogs/64/auth.png
-share/gnome/pixmaps/pidgin/dialogs/64/cool.png
-share/gnome/pixmaps/pidgin/dialogs/64/dialog.png
-share/gnome/pixmaps/pidgin/dialogs/64/error.png
-share/gnome/pixmaps/pidgin/dialogs/64/info.png
-share/gnome/pixmaps/pidgin/dialogs/64/mail.png
-share/gnome/pixmaps/pidgin/dialogs/64/question.png
-share/gnome/pixmaps/pidgin/dialogs/64/warning.png
-share/gnome/pixmaps/pidgin/emblems/16/aol-client.png
-share/gnome/pixmaps/pidgin/emblems/16/blocked.png
-share/gnome/pixmaps/pidgin/emblems/16/bot.png
-share/gnome/pixmaps/pidgin/emblems/16/external.png
-share/gnome/pixmaps/pidgin/emblems/16/female.png
-share/gnome/pixmaps/pidgin/emblems/16/founder.png
-share/gnome/pixmaps/pidgin/emblems/16/free-for-chat.png
-share/gnome/pixmaps/pidgin/emblems/16/game.png
-share/gnome/pixmaps/pidgin/emblems/16/half-operator.png
-share/gnome/pixmaps/pidgin/emblems/16/hiptop.png
-share/gnome/pixmaps/pidgin/emblems/16/male.png
-share/gnome/pixmaps/pidgin/emblems/16/mobile.png
-share/gnome/pixmaps/pidgin/emblems/16/not-authorized.png
-share/gnome/pixmaps/pidgin/emblems/16/operator.png
-share/gnome/pixmaps/pidgin/emblems/16/qq-member.png
-share/gnome/pixmaps/pidgin/emblems/16/secure.png
-share/gnome/pixmaps/pidgin/emblems/16/unavailable.png
-share/gnome/pixmaps/pidgin/emblems/16/video.png
-share/gnome/pixmaps/pidgin/emblems/16/voice.png
-share/gnome/pixmaps/pidgin/emotes/default/act-up.png
-share/gnome/pixmaps/pidgin/emotes/default/airplane.png
-share/gnome/pixmaps/pidgin/emotes/default/alien.png
-share/gnome/pixmaps/pidgin/emotes/default/angel.png
-share/gnome/pixmaps/pidgin/emotes/default/angry.png
-share/gnome/pixmaps/pidgin/emotes/default/arrogant.png
-share/gnome/pixmaps/pidgin/emotes/default/at-wits-end.png
-share/gnome/pixmaps/pidgin/emotes/default/bad.png
-share/gnome/pixmaps/pidgin/emotes/default/bashful.png
-share/gnome/pixmaps/pidgin/emotes/default/beat-up.png
-share/gnome/pixmaps/pidgin/emotes/default/beauty.png
-share/gnome/pixmaps/pidgin/emotes/default/beer.png
-share/gnome/pixmaps/pidgin/emotes/default/blowkiss.png
-share/gnome/pixmaps/pidgin/emotes/default/bomb.png
-share/gnome/pixmaps/pidgin/emotes/default/bowl.png
-share/gnome/pixmaps/pidgin/emotes/default/boy.png
-share/gnome/pixmaps/pidgin/emotes/default/brb.png
-share/gnome/pixmaps/pidgin/emotes/default/bulgy-eyes.png
-share/gnome/pixmaps/pidgin/emotes/default/bye.png
-share/gnome/pixmaps/pidgin/emotes/default/cake.png
-share/gnome/pixmaps/pidgin/emotes/default/call-me.png
-share/gnome/pixmaps/pidgin/emotes/default/camera.png
-share/gnome/pixmaps/pidgin/emotes/default/can.png
-share/gnome/pixmaps/pidgin/emotes/default/car.png
-share/gnome/pixmaps/pidgin/emotes/default/cat.png
-share/gnome/pixmaps/pidgin/emotes/default/chicken.png
-share/gnome/pixmaps/pidgin/emotes/default/clap.png
-share/gnome/pixmaps/pidgin/emotes/default/clock.png
-share/gnome/pixmaps/pidgin/emotes/default/cloudy.png
-share/gnome/pixmaps/pidgin/emotes/default/clover.png
-share/gnome/pixmaps/pidgin/emotes/default/clown.png
-share/gnome/pixmaps/pidgin/emotes/default/coffee.png
-share/gnome/pixmaps/pidgin/emotes/default/coins.png
-share/gnome/pixmaps/pidgin/emotes/default/computer.png
-share/gnome/pixmaps/pidgin/emotes/default/confused.png
-share/gnome/pixmaps/pidgin/emotes/default/console.png
-share/gnome/pixmaps/pidgin/emotes/default/cow.png
-share/gnome/pixmaps/pidgin/emotes/default/cowboy.png
-share/gnome/pixmaps/pidgin/emotes/default/crying.png
-share/gnome/pixmaps/pidgin/emotes/default/curl-lip.png
-share/gnome/pixmaps/pidgin/emotes/default/curse.png
-share/gnome/pixmaps/pidgin/emotes/default/cute.png
-share/gnome/pixmaps/pidgin/emotes/default/cyclops.png
-share/gnome/pixmaps/pidgin/emotes/default/dance.png
-share/gnome/pixmaps/pidgin/emotes/default/dazed.png
-share/gnome/pixmaps/pidgin/emotes/default/desire.png
-share/gnome/pixmaps/pidgin/emotes/default/devil.png
-share/gnome/pixmaps/pidgin/emotes/default/disapointed.png
-share/gnome/pixmaps/pidgin/emotes/default/disdain.png
-share/gnome/pixmaps/pidgin/emotes/default/doctor.png
-share/gnome/pixmaps/pidgin/emotes/default/dog.png
-share/gnome/pixmaps/pidgin/emotes/default/doh.png
-share/gnome/pixmaps/pidgin/emotes/default/dont-know.png
-share/gnome/pixmaps/pidgin/emotes/default/drink.png
-share/gnome/pixmaps/pidgin/emotes/default/drool.png
-share/gnome/pixmaps/pidgin/emotes/default/eat.png
-share/gnome/pixmaps/pidgin/emotes/default/embarrassed.png
-share/gnome/pixmaps/pidgin/emotes/default/excruciating.png
-share/gnome/pixmaps/pidgin/emotes/default/eyeroll.png
-share/gnome/pixmaps/pidgin/emotes/default/female-fighter.png
-share/gnome/pixmaps/pidgin/emotes/default/film.png
-share/gnome/pixmaps/pidgin/emotes/default/fingers-crossed.png
-share/gnome/pixmaps/pidgin/emotes/default/flag.png
-share/gnome/pixmaps/pidgin/emotes/default/foot-in-mouth.png
-share/gnome/pixmaps/pidgin/emotes/default/freaked-out.png
-share/gnome/pixmaps/pidgin/emotes/default/ghost.png
-share/gnome/pixmaps/pidgin/emotes/default/giggle.png
-share/gnome/pixmaps/pidgin/emotes/default/girl.png
-share/gnome/pixmaps/pidgin/emotes/default/glasses-cool.png
-share/gnome/pixmaps/pidgin/emotes/default/glasses-nerdy.png
-share/gnome/pixmaps/pidgin/emotes/default/go-away.png
-share/gnome/pixmaps/pidgin/emotes/default/goat.png
-share/gnome/pixmaps/pidgin/emotes/default/good.png
-share/gnome/pixmaps/pidgin/emotes/default/hammer.png
-share/gnome/pixmaps/pidgin/emotes/default/handcuffs.png
-share/gnome/pixmaps/pidgin/emotes/default/handshake.png
-share/gnome/pixmaps/pidgin/emotes/default/highfive.png
-share/gnome/pixmaps/pidgin/emotes/default/hug-left.png
-share/gnome/pixmaps/pidgin/emotes/default/hug-right.png
-share/gnome/pixmaps/pidgin/emotes/default/hypnotized.png
-share/gnome/pixmaps/pidgin/emotes/default/in-love.png
-share/gnome/pixmaps/pidgin/emotes/default/island.png
-share/gnome/pixmaps/pidgin/emotes/default/jump.png
-share/gnome/pixmaps/pidgin/emotes/default/kiss.png
-share/gnome/pixmaps/pidgin/emotes/default/kissed.png
-share/gnome/pixmaps/pidgin/emotes/default/kissing.png
-share/gnome/pixmaps/pidgin/emotes/default/knife.png
-share/gnome/pixmaps/pidgin/emotes/default/lamp.png
-share/gnome/pixmaps/pidgin/emotes/default/lashes.png
-share/gnome/pixmaps/pidgin/emotes/default/laugh.png
-share/gnome/pixmaps/pidgin/emotes/default/liquor.png
-share/gnome/pixmaps/pidgin/emotes/default/loser.png
-share/gnome/pixmaps/pidgin/emotes/default/love-over.png
-share/gnome/pixmaps/pidgin/emotes/default/love.png
-share/gnome/pixmaps/pidgin/emotes/default/lying.png
-share/gnome/pixmaps/pidgin/emotes/default/mad-tongue.png
-share/gnome/pixmaps/pidgin/emotes/default/mail.png
-share/gnome/pixmaps/pidgin/emotes/default/male-fighter1.png
-share/gnome/pixmaps/pidgin/emotes/default/male-fighter2.png
-share/gnome/pixmaps/pidgin/emotes/default/mean.png
-share/gnome/pixmaps/pidgin/emotes/default/meeting.png
-share/gnome/pixmaps/pidgin/emotes/default/messed.png
-share/gnome/pixmaps/pidgin/emotes/default/mobile.png
-share/gnome/pixmaps/pidgin/emotes/default/mohawk.png
-share/gnome/pixmaps/pidgin/emotes/default/moneymouth.png
-share/gnome/pixmaps/pidgin/emotes/default/monkey.png
-share/gnome/pixmaps/pidgin/emotes/default/moon.png
-share/gnome/pixmaps/pidgin/emotes/default/msn-away.png
-share/gnome/pixmaps/pidgin/emotes/default/msn-busy.png
-share/gnome/pixmaps/pidgin/emotes/default/msn.png
-share/gnome/pixmaps/pidgin/emotes/default/msn_online.png
-share/gnome/pixmaps/pidgin/emotes/default/music.png
-share/gnome/pixmaps/pidgin/emotes/default/musical-note.png
-share/gnome/pixmaps/pidgin/emotes/default/nailbiting.png
-share/gnome/pixmaps/pidgin/emotes/default/neutral.png
-share/gnome/pixmaps/pidgin/emotes/default/on-the-phone.png
-share/gnome/pixmaps/pidgin/emotes/default/party.png
-share/gnome/pixmaps/pidgin/emotes/default/peace.png
-share/gnome/pixmaps/pidgin/emotes/default/phone.png
-share/gnome/pixmaps/pidgin/emotes/default/pig.png
-share/gnome/pixmaps/pidgin/emotes/default/pill.png
-share/gnome/pixmaps/pidgin/emotes/default/pirate.png
-share/gnome/pixmaps/pidgin/emotes/default/pissed-off.png
-share/gnome/pixmaps/pidgin/emotes/default/pizza.png
-share/gnome/pixmaps/pidgin/emotes/default/plate.png
-share/gnome/pixmaps/pidgin/emotes/default/poop.png
-share/gnome/pixmaps/pidgin/emotes/default/pray.png
-share/gnome/pixmaps/pidgin/emotes/default/present.png
-share/gnome/pixmaps/pidgin/emotes/default/pumpkin.png
-share/gnome/pixmaps/pidgin/emotes/default/qq.png
-share/gnome/pixmaps/pidgin/emotes/default/question.png
-share/gnome/pixmaps/pidgin/emotes/default/quiet.png
-share/gnome/pixmaps/pidgin/emotes/default/rain.png
-share/gnome/pixmaps/pidgin/emotes/default/rainbow.png
-share/gnome/pixmaps/pidgin/emotes/default/rose-dead.png
-share/gnome/pixmaps/pidgin/emotes/default/rose.png
-share/gnome/pixmaps/pidgin/emotes/default/rotfl.png
-share/gnome/pixmaps/pidgin/emotes/default/sad.png
-share/gnome/pixmaps/pidgin/emotes/default/sarcastic.png
-share/gnome/pixmaps/pidgin/emotes/default/search.png
-share/gnome/pixmaps/pidgin/emotes/default/secret.png
-share/gnome/pixmaps/pidgin/emotes/default/shame.png
-share/gnome/pixmaps/pidgin/emotes/default/sheep.png
-share/gnome/pixmaps/pidgin/emotes/default/shock.png
-share/gnome/pixmaps/pidgin/emotes/default/shout.png
-share/gnome/pixmaps/pidgin/emotes/default/shut-mouth.png
-share/gnome/pixmaps/pidgin/emotes/default/sick.png
-share/gnome/pixmaps/pidgin/emotes/default/sidefrown.png
-share/gnome/pixmaps/pidgin/emotes/default/sigarette.png
-share/gnome/pixmaps/pidgin/emotes/default/silly.png
-share/gnome/pixmaps/pidgin/emotes/default/sinister.png
-share/gnome/pixmaps/pidgin/emotes/default/skeleton.png
-share/gnome/pixmaps/pidgin/emotes/default/skywalker.png
-share/gnome/pixmaps/pidgin/emotes/default/sleepy.png
-share/gnome/pixmaps/pidgin/emotes/default/smile-big.png
-share/gnome/pixmaps/pidgin/emotes/default/smile.png
-share/gnome/pixmaps/pidgin/emotes/default/smirk.png
-share/gnome/pixmaps/pidgin/emotes/default/snail.png
-share/gnome/pixmaps/pidgin/emotes/default/snicker.png
-share/gnome/pixmaps/pidgin/emotes/default/snowman.png
-share/gnome/pixmaps/pidgin/emotes/default/soccerball.png
-share/gnome/pixmaps/pidgin/emotes/default/soldier.png
-share/gnome/pixmaps/pidgin/emotes/default/star.png
-share/gnome/pixmaps/pidgin/emotes/default/starving.png
-share/gnome/pixmaps/pidgin/emotes/default/stop.png
-share/gnome/pixmaps/pidgin/emotes/default/struggle.png
-share/gnome/pixmaps/pidgin/emotes/default/sun.png
-share/gnome/pixmaps/pidgin/emotes/default/sweat.png
-share/gnome/pixmaps/pidgin/emotes/default/talktohand.png
-share/gnome/pixmaps/pidgin/emotes/default/teeth.png
-share/gnome/pixmaps/pidgin/emotes/default/terror.png
-share/gnome/pixmaps/pidgin/emotes/default/theme
-share/gnome/pixmaps/pidgin/emotes/default/thinking.png
-share/gnome/pixmaps/pidgin/emotes/default/thunder.png
-share/gnome/pixmaps/pidgin/emotes/default/time-out.png
-share/gnome/pixmaps/pidgin/emotes/default/tongue.png
-share/gnome/pixmaps/pidgin/emotes/default/tremble.png
-share/gnome/pixmaps/pidgin/emotes/default/turtle.png
-share/gnome/pixmaps/pidgin/emotes/default/tv.png
-share/gnome/pixmaps/pidgin/emotes/default/umbrella.png
-share/gnome/pixmaps/pidgin/emotes/default/vampire.png
-share/gnome/pixmaps/pidgin/emotes/default/victory.png
-share/gnome/pixmaps/pidgin/emotes/default/waiting.png
-share/gnome/pixmaps/pidgin/emotes/default/watermelon.png
-share/gnome/pixmaps/pidgin/emotes/default/waving.png
-share/gnome/pixmaps/pidgin/emotes/default/weep.png
-share/gnome/pixmaps/pidgin/emotes/default/wilt.png
-share/gnome/pixmaps/pidgin/emotes/default/wink.png
-share/gnome/pixmaps/pidgin/emotes/default/worship.png
-share/gnome/pixmaps/pidgin/emotes/default/yawn.png
-share/gnome/pixmaps/pidgin/emotes/default/yin-yang.png
-share/gnome/pixmaps/pidgin/emotes/none/theme
-share/gnome/pixmaps/pidgin/logo.png
-share/gnome/pixmaps/pidgin/protocols/16/aim.png
-share/gnome/pixmaps/pidgin/protocols/16/bonjour.png
-share/gnome/pixmaps/pidgin/protocols/16/gadu-gadu.png
-share/gnome/pixmaps/pidgin/protocols/16/google-talk.png
-share/gnome/pixmaps/pidgin/protocols/16/icq.png
-share/gnome/pixmaps/pidgin/protocols/16/irc.png
-share/gnome/pixmaps/pidgin/protocols/16/jabber.png
-share/gnome/pixmaps/pidgin/protocols/16/meanwhile.png
-share/gnome/pixmaps/pidgin/protocols/16/msn.png
-share/gnome/pixmaps/pidgin/protocols/16/myspace.png
-share/gnome/pixmaps/pidgin/protocols/16/novell.png
-share/gnome/pixmaps/pidgin/protocols/16/qq.png
-share/gnome/pixmaps/pidgin/protocols/16/silc.png
-share/gnome/pixmaps/pidgin/protocols/16/simple.png
-share/gnome/pixmaps/pidgin/protocols/16/yahoo.png
-share/gnome/pixmaps/pidgin/protocols/16/zephyr.png
-share/gnome/pixmaps/pidgin/protocols/22/aim.png
-share/gnome/pixmaps/pidgin/protocols/22/bonjour.png
-share/gnome/pixmaps/pidgin/protocols/22/gadu-gadu.png
-share/gnome/pixmaps/pidgin/protocols/22/google-talk.png
-share/gnome/pixmaps/pidgin/protocols/22/icq.png
-share/gnome/pixmaps/pidgin/protocols/22/irc.png
-share/gnome/pixmaps/pidgin/protocols/22/jabber.png
-share/gnome/pixmaps/pidgin/protocols/22/meanwhile.png
-share/gnome/pixmaps/pidgin/protocols/22/msn.png
-share/gnome/pixmaps/pidgin/protocols/22/myspace.png
-share/gnome/pixmaps/pidgin/protocols/22/novell.png
-share/gnome/pixmaps/pidgin/protocols/22/qq.png
-share/gnome/pixmaps/pidgin/protocols/22/silc.png
-share/gnome/pixmaps/pidgin/protocols/22/simple.png
-share/gnome/pixmaps/pidgin/protocols/22/yahoo.png
-share/gnome/pixmaps/pidgin/protocols/22/zephyr.png
-share/gnome/pixmaps/pidgin/protocols/48/aim.png
-share/gnome/pixmaps/pidgin/protocols/48/bonjour.png
-share/gnome/pixmaps/pidgin/protocols/48/gadu-gadu.png
-share/gnome/pixmaps/pidgin/protocols/48/icq.png
-share/gnome/pixmaps/pidgin/protocols/48/irc.png
-share/gnome/pixmaps/pidgin/protocols/48/jabber.png
-share/gnome/pixmaps/pidgin/protocols/48/meanwhile.png
-share/gnome/pixmaps/pidgin/protocols/48/msn.png
-share/gnome/pixmaps/pidgin/protocols/48/myspace.png
-share/gnome/pixmaps/pidgin/protocols/48/novell.png
-share/gnome/pixmaps/pidgin/protocols/48/qq.png
-share/gnome/pixmaps/pidgin/protocols/48/silc.png
-share/gnome/pixmaps/pidgin/protocols/48/simple.png
-share/gnome/pixmaps/pidgin/protocols/48/yahoo.png
-share/gnome/pixmaps/pidgin/protocols/48/zephyr.png
-share/gnome/pixmaps/pidgin/status/11/available.png
-share/gnome/pixmaps/pidgin/status/11/away.png
-share/gnome/pixmaps/pidgin/status/11/busy.png
-share/gnome/pixmaps/pidgin/status/11/chat.png
-share/gnome/pixmaps/pidgin/status/11/extended-away.png
-share/gnome/pixmaps/pidgin/status/11/invisible.png
-share/gnome/pixmaps/pidgin/status/11/offline.png
-share/gnome/pixmaps/pidgin/status/11/person.png
-share/gnome/pixmaps/pidgin/status/11/rtl/extended-away.png
-share/gnome/pixmaps/pidgin/status/16/available.png
-share/gnome/pixmaps/pidgin/status/16/away.png
-share/gnome/pixmaps/pidgin/status/16/busy.png
-share/gnome/pixmaps/pidgin/status/16/chat.png
-share/gnome/pixmaps/pidgin/status/16/extended-away.png
-share/gnome/pixmaps/pidgin/status/16/invisible.png
-share/gnome/pixmaps/pidgin/status/16/log-in.png
-share/gnome/pixmaps/pidgin/status/16/log-out.png
-share/gnome/pixmaps/pidgin/status/16/offline.png
-share/gnome/pixmaps/pidgin/status/16/person.png
-share/gnome/pixmaps/pidgin/status/16/rtl/extended-away.png
-share/gnome/pixmaps/pidgin/status/16/rtl/log-in.png
-share/gnome/pixmaps/pidgin/status/16/rtl/log-out.png
-share/gnome/pixmaps/pidgin/status/22/available.png
-share/gnome/pixmaps/pidgin/status/22/away.png
-share/gnome/pixmaps/pidgin/status/22/busy.png
-share/gnome/pixmaps/pidgin/status/22/chat.png
-share/gnome/pixmaps/pidgin/status/22/extended-away.png
-share/gnome/pixmaps/pidgin/status/22/invisible.png
-share/gnome/pixmaps/pidgin/status/22/log-in.png
-share/gnome/pixmaps/pidgin/status/22/log-out.png
-share/gnome/pixmaps/pidgin/status/22/offline.png
-share/gnome/pixmaps/pidgin/status/22/person.png
-share/gnome/pixmaps/pidgin/status/22/rtl/extended-away.png
-share/gnome/pixmaps/pidgin/status/22/rtl/log-in.png
-share/gnome/pixmaps/pidgin/status/22/rtl/log-out.png
-share/gnome/pixmaps/pidgin/status/32/available.png
-share/gnome/pixmaps/pidgin/status/32/away.png
-share/gnome/pixmaps/pidgin/status/32/busy.png
-share/gnome/pixmaps/pidgin/status/32/chat.png
-share/gnome/pixmaps/pidgin/status/32/extended-away.png
-share/gnome/pixmaps/pidgin/status/32/invisible.png
-share/gnome/pixmaps/pidgin/status/32/log-in.png
-share/gnome/pixmaps/pidgin/status/32/log-out.png
-share/gnome/pixmaps/pidgin/status/32/offline.png
-share/gnome/pixmaps/pidgin/status/32/person.png
-share/gnome/pixmaps/pidgin/status/32/rtl/extended-away.png
-share/gnome/pixmaps/pidgin/status/32/rtl/log-in.png
-share/gnome/pixmaps/pidgin/status/32/rtl/log-out.png
-share/gnome/pixmaps/pidgin/status/48/available.png
-share/gnome/pixmaps/pidgin/status/48/away.png
-share/gnome/pixmaps/pidgin/status/48/busy.png
-share/gnome/pixmaps/pidgin/status/48/chat.png
-share/gnome/pixmaps/pidgin/status/48/extended-away.png
-share/gnome/pixmaps/pidgin/status/48/log-in.png
-share/gnome/pixmaps/pidgin/status/48/log-out.png
-share/gnome/pixmaps/pidgin/status/48/offline.png
-share/gnome/pixmaps/pidgin/status/48/person.png
-share/gnome/pixmaps/pidgin/status/48/rtl/extended-away.png
-share/gnome/pixmaps/pidgin/toolbar/16/change-bgcolor.png
-share/gnome/pixmaps/pidgin/toolbar/16/change-fgcolor.png
-share/gnome/pixmaps/pidgin/toolbar/16/emote-select.png
-share/gnome/pixmaps/pidgin/toolbar/16/font-face.png
-share/gnome/pixmaps/pidgin/toolbar/16/font-size-down.png
-share/gnome/pixmaps/pidgin/toolbar/16/font-size-up.png
-share/gnome/pixmaps/pidgin/toolbar/16/insert-image.png
-share/gnome/pixmaps/pidgin/toolbar/16/insert-link.png
-share/gnome/pixmaps/pidgin/toolbar/16/insert.png
-share/gnome/pixmaps/pidgin/toolbar/16/message-new.png
-share/gnome/pixmaps/pidgin/toolbar/16/plugins.png
-share/gnome/pixmaps/pidgin/toolbar/16/send-file.png
-share/gnome/pixmaps/pidgin/toolbar/16/unblock.png
-share/gnome/pixmaps/pidgin/toolbar/22/select-avatar.png
-share/gnome/pixmaps/pidgin/tray/16/tray-away.png
-share/gnome/pixmaps/pidgin/tray/16/tray-busy.png
-share/gnome/pixmaps/pidgin/tray/16/tray-connecting.png
-share/gnome/pixmaps/pidgin/tray/16/tray-extended-away.png
-share/gnome/pixmaps/pidgin/tray/16/tray-invisible.png
-share/gnome/pixmaps/pidgin/tray/16/tray-message.png
-share/gnome/pixmaps/pidgin/tray/16/tray-new-im.png
-share/gnome/pixmaps/pidgin/tray/16/tray-offline.png
-share/gnome/pixmaps/pidgin/tray/16/tray-online.png
-share/gnome/pixmaps/pidgin/tray/22/tray-away.png
-share/gnome/pixmaps/pidgin/tray/22/tray-busy.png
-share/gnome/pixmaps/pidgin/tray/22/tray-connecting.png
-share/gnome/pixmaps/pidgin/tray/22/tray-extended-away.png
-share/gnome/pixmaps/pidgin/tray/22/tray-invisible.png
-share/gnome/pixmaps/pidgin/tray/22/tray-message.png
-share/gnome/pixmaps/pidgin/tray/22/tray-new-im.png
-share/gnome/pixmaps/pidgin/tray/22/tray-offline.png
-share/gnome/pixmaps/pidgin/tray/22/tray-online.png
-share/gnome/pixmaps/pidgin/tray/32/tray-away.png
-share/gnome/pixmaps/pidgin/tray/32/tray-busy.png
-share/gnome/pixmaps/pidgin/tray/32/tray-connecting.png
-share/gnome/pixmaps/pidgin/tray/32/tray-extended-away.png
-share/gnome/pixmaps/pidgin/tray/32/tray-invisible.png
-share/gnome/pixmaps/pidgin/tray/32/tray-new-im.png
-share/gnome/pixmaps/pidgin/tray/32/tray-offline.png
-share/gnome/pixmaps/pidgin/tray/32/tray-online.png
-share/gnome/pixmaps/pidgin/tray/48/tray-away.png
-share/gnome/pixmaps/pidgin/tray/48/tray-busy.png
-share/gnome/pixmaps/pidgin/tray/48/tray-connecting.png
-share/gnome/pixmaps/pidgin/tray/48/tray-extended-away.png
-share/gnome/pixmaps/pidgin/tray/48/tray-invisible.png
-share/gnome/pixmaps/pidgin/tray/48/tray-new-im.png
-share/gnome/pixmaps/pidgin/tray/48/tray-offline.png
-share/gnome/pixmaps/pidgin/tray/48/tray-online.png
-share/gnome/pixmaps/purple/buddy_icons/qq/qq_1.png
-share/gnome/pixmaps/purple/buddy_icons/qq/qq_10.png
-share/gnome/pixmaps/purple/buddy_icons/qq/qq_100.png
-share/gnome/pixmaps/purple/buddy_icons/qq/qq_11.png
-share/gnome/pixmaps/purple/buddy_icons/qq/qq_12.png
-share/gnome/pixmaps/purple/buddy_icons/qq/qq_13.png
-share/gnome/pixmaps/purple/buddy_icons/qq/qq_14.png
-share/gnome/pixmaps/purple/buddy_icons/qq/qq_15.png
-share/gnome/pixmaps/purple/buddy_icons/qq/qq_16.png
-share/gnome/pixmaps/purple/buddy_icons/qq/qq_17.png
-share/gnome/pixmaps/purple/buddy_icons/qq/qq_18.png
-share/gnome/pixmaps/purple/buddy_icons/qq/qq_19.png
-share/gnome/pixmaps/purple/buddy_icons/qq/qq_2.png
-share/gnome/pixmaps/purple/buddy_icons/qq/qq_20.png
-share/gnome/pixmaps/purple/buddy_icons/qq/qq_21.png
-share/gnome/pixmaps/purple/buddy_icons/qq/qq_22.png
-share/gnome/pixmaps/purple/buddy_icons/qq/qq_23.png
-share/gnome/pixmaps/purple/buddy_icons/qq/qq_24.png
-share/gnome/pixmaps/purple/buddy_icons/qq/qq_25.png
-share/gnome/pixmaps/purple/buddy_icons/qq/qq_26.png
-share/gnome/pixmaps/purple/buddy_icons/qq/qq_27.png
-share/gnome/pixmaps/purple/buddy_icons/qq/qq_28.png
-share/gnome/pixmaps/purple/buddy_icons/qq/qq_29.png
-share/gnome/pixmaps/purple/buddy_icons/qq/qq_3.png
-share/gnome/pixmaps/purple/buddy_icons/qq/qq_30.png
-share/gnome/pixmaps/purple/buddy_icons/qq/qq_31.png
-share/gnome/pixmaps/purple/buddy_icons/qq/qq_32.png
-share/gnome/pixmaps/purple/buddy_icons/qq/qq_33.png
-share/gnome/pixmaps/purple/buddy_icons/qq/qq_34.png
-share/gnome/pixmaps/purple/buddy_icons/qq/qq_35.png
-share/gnome/pixmaps/purple/buddy_icons/qq/qq_36.png
-share/gnome/pixmaps/purple/buddy_icons/qq/qq_37.png
-share/gnome/pixmaps/purple/buddy_icons/qq/qq_38.png
-share/gnome/pixmaps/purple/buddy_icons/qq/qq_39.png
-share/gnome/pixmaps/purple/buddy_icons/qq/qq_4.png
-share/gnome/pixmaps/purple/buddy_icons/qq/qq_40.png
-share/gnome/pixmaps/purple/buddy_icons/qq/qq_41.png
-share/gnome/pixmaps/purple/buddy_icons/qq/qq_42.png
-share/gnome/pixmaps/purple/buddy_icons/qq/qq_43.png
-share/gnome/pixmaps/purple/buddy_icons/qq/qq_44.png
-share/gnome/pixmaps/purple/buddy_icons/qq/qq_45.png
-share/gnome/pixmaps/purple/buddy_icons/qq/qq_46.png
-share/gnome/pixmaps/purple/buddy_icons/qq/qq_47.png
-share/gnome/pixmaps/purple/buddy_icons/qq/qq_48.png
-share/gnome/pixmaps/purple/buddy_icons/qq/qq_49.png
-share/gnome/pixmaps/purple/buddy_icons/qq/qq_5.png
-share/gnome/pixmaps/purple/buddy_icons/qq/qq_50.png
-share/gnome/pixmaps/purple/buddy_icons/qq/qq_51.png
-share/gnome/pixmaps/purple/buddy_icons/qq/qq_52.png
-share/gnome/pixmaps/purple/buddy_icons/qq/qq_53.png
-share/gnome/pixmaps/purple/buddy_icons/qq/qq_54.png
-share/gnome/pixmaps/purple/buddy_icons/qq/qq_55.png
-share/gnome/pixmaps/purple/buddy_icons/qq/qq_56.png
-share/gnome/pixmaps/purple/buddy_icons/qq/qq_57.png
-share/gnome/pixmaps/purple/buddy_icons/qq/qq_58.png
-share/gnome/pixmaps/purple/buddy_icons/qq/qq_59.png
-share/gnome/pixmaps/purple/buddy_icons/qq/qq_6.png
-share/gnome/pixmaps/purple/buddy_icons/qq/qq_60.png
-share/gnome/pixmaps/purple/buddy_icons/qq/qq_61.png
-share/gnome/pixmaps/purple/buddy_icons/qq/qq_62.png
-share/gnome/pixmaps/purple/buddy_icons/qq/qq_63.png
-share/gnome/pixmaps/purple/buddy_icons/qq/qq_64.png
-share/gnome/pixmaps/purple/buddy_icons/qq/qq_65.png
-share/gnome/pixmaps/purple/buddy_icons/qq/qq_66.png
-share/gnome/pixmaps/purple/buddy_icons/qq/qq_67.png
-share/gnome/pixmaps/purple/buddy_icons/qq/qq_68.png
-share/gnome/pixmaps/purple/buddy_icons/qq/qq_69.png
-share/gnome/pixmaps/purple/buddy_icons/qq/qq_7.png
-share/gnome/pixmaps/purple/buddy_icons/qq/qq_70.png
-share/gnome/pixmaps/purple/buddy_icons/qq/qq_71.png
-share/gnome/pixmaps/purple/buddy_icons/qq/qq_72.png
-share/gnome/pixmaps/purple/buddy_icons/qq/qq_73.png
-share/gnome/pixmaps/purple/buddy_icons/qq/qq_74.png
-share/gnome/pixmaps/purple/buddy_icons/qq/qq_75.png
-share/gnome/pixmaps/purple/buddy_icons/qq/qq_76.png
-share/gnome/pixmaps/purple/buddy_icons/qq/qq_77.png
-share/gnome/pixmaps/purple/buddy_icons/qq/qq_78.png
-share/gnome/pixmaps/purple/buddy_icons/qq/qq_79.png
-share/gnome/pixmaps/purple/buddy_icons/qq/qq_8.png
-share/gnome/pixmaps/purple/buddy_icons/qq/qq_80.png
-share/gnome/pixmaps/purple/buddy_icons/qq/qq_81.png
-share/gnome/pixmaps/purple/buddy_icons/qq/qq_82.png
-share/gnome/pixmaps/purple/buddy_icons/qq/qq_83.png
-share/gnome/pixmaps/purple/buddy_icons/qq/qq_84.png
-share/gnome/pixmaps/purple/buddy_icons/qq/qq_85.png
-share/gnome/pixmaps/purple/buddy_icons/qq/qq_86.png
-share/gnome/pixmaps/purple/buddy_icons/qq/qq_87.png
-share/gnome/pixmaps/purple/buddy_icons/qq/qq_88.png
-share/gnome/pixmaps/purple/buddy_icons/qq/qq_89.png
-share/gnome/pixmaps/purple/buddy_icons/qq/qq_9.png
-share/gnome/pixmaps/purple/buddy_icons/qq/qq_90.png
-share/gnome/pixmaps/purple/buddy_icons/qq/qq_91.png
-share/gnome/pixmaps/purple/buddy_icons/qq/qq_92.png
-share/gnome/pixmaps/purple/buddy_icons/qq/qq_93.png
-share/gnome/pixmaps/purple/buddy_icons/qq/qq_94.png
-share/gnome/pixmaps/purple/buddy_icons/qq/qq_95.png
-share/gnome/pixmaps/purple/buddy_icons/qq/qq_96.png
-share/gnome/pixmaps/purple/buddy_icons/qq/qq_97.png
-share/gnome/pixmaps/purple/buddy_icons/qq/qq_98.png
-share/gnome/pixmaps/purple/buddy_icons/qq/qq_99.png
+share/pixmaps/pidgin/animations/16/connect0.png
+share/pixmaps/pidgin/animations/16/connect1.png
+share/pixmaps/pidgin/animations/16/connect2.png
+share/pixmaps/pidgin/animations/16/connect3.png
+share/pixmaps/pidgin/animations/16/connect4.png
+share/pixmaps/pidgin/animations/16/connect5.png
+share/pixmaps/pidgin/animations/16/connect6.png
+share/pixmaps/pidgin/animations/16/connect7.png
+share/pixmaps/pidgin/animations/16/connect8.png
+share/pixmaps/pidgin/animations/16/typing0.png
+share/pixmaps/pidgin/animations/16/typing1.png
+share/pixmaps/pidgin/animations/16/typing2.png
+share/pixmaps/pidgin/animations/16/typing3.png
+share/pixmaps/pidgin/animations/16/typing4.png
+share/pixmaps/pidgin/animations/16/typing5.png
+share/pixmaps/pidgin/arrow-down.xpm
+share/pixmaps/pidgin/arrow-left.xpm
+share/pixmaps/pidgin/arrow-right.xpm
+share/pixmaps/pidgin/arrow-up.xpm
+share/pixmaps/pidgin/buttons/edit.png
+share/pixmaps/pidgin/buttons/info.png
+share/pixmaps/pidgin/buttons/music.png
+share/pixmaps/pidgin/buttons/pause.png
+share/pixmaps/pidgin/dialogs/16/auth.png
+share/pixmaps/pidgin/dialogs/16/error.png
+share/pixmaps/pidgin/dialogs/16/info.png
+share/pixmaps/pidgin/dialogs/16/mail.png
+share/pixmaps/pidgin/dialogs/16/question.png
+share/pixmaps/pidgin/dialogs/64/auth.png
+share/pixmaps/pidgin/dialogs/64/cool.png
+share/pixmaps/pidgin/dialogs/64/dialog.png
+share/pixmaps/pidgin/dialogs/64/error.png
+share/pixmaps/pidgin/dialogs/64/info.png
+share/pixmaps/pidgin/dialogs/64/mail.png
+share/pixmaps/pidgin/dialogs/64/question.png
+share/pixmaps/pidgin/dialogs/64/warning.png
+share/pixmaps/pidgin/emblems/16/aol-client.png
+share/pixmaps/pidgin/emblems/16/blocked.png
+share/pixmaps/pidgin/emblems/16/bot.png
+share/pixmaps/pidgin/emblems/16/external.png
+share/pixmaps/pidgin/emblems/16/female.png
+share/pixmaps/pidgin/emblems/16/founder.png
+share/pixmaps/pidgin/emblems/16/free-for-chat.png
+share/pixmaps/pidgin/emblems/16/game.png
+share/pixmaps/pidgin/emblems/16/half-operator.png
+share/pixmaps/pidgin/emblems/16/hiptop.png
+share/pixmaps/pidgin/emblems/16/male.png
+share/pixmaps/pidgin/emblems/16/mobile.png
+share/pixmaps/pidgin/emblems/16/not-authorized.png
+share/pixmaps/pidgin/emblems/16/operator.png
+share/pixmaps/pidgin/emblems/16/qq-member.png
+share/pixmaps/pidgin/emblems/16/secure.png
+share/pixmaps/pidgin/emblems/16/unavailable.png
+share/pixmaps/pidgin/emblems/16/video.png
+share/pixmaps/pidgin/emblems/16/voice.png
+share/pixmaps/pidgin/emotes/default/act-up.png
+share/pixmaps/pidgin/emotes/default/airplane.png
+share/pixmaps/pidgin/emotes/default/alien.png
+share/pixmaps/pidgin/emotes/default/angel.png
+share/pixmaps/pidgin/emotes/default/angry.png
+share/pixmaps/pidgin/emotes/default/arrogant.png
+share/pixmaps/pidgin/emotes/default/at-wits-end.png
+share/pixmaps/pidgin/emotes/default/bad.png
+share/pixmaps/pidgin/emotes/default/bashful.png
+share/pixmaps/pidgin/emotes/default/beat-up.png
+share/pixmaps/pidgin/emotes/default/beauty.png
+share/pixmaps/pidgin/emotes/default/beer.png
+share/pixmaps/pidgin/emotes/default/blowkiss.png
+share/pixmaps/pidgin/emotes/default/bomb.png
+share/pixmaps/pidgin/emotes/default/bowl.png
+share/pixmaps/pidgin/emotes/default/boy.png
+share/pixmaps/pidgin/emotes/default/brb.png
+share/pixmaps/pidgin/emotes/default/bulgy-eyes.png
+share/pixmaps/pidgin/emotes/default/bye.png
+share/pixmaps/pidgin/emotes/default/cake.png
+share/pixmaps/pidgin/emotes/default/call-me.png
+share/pixmaps/pidgin/emotes/default/camera.png
+share/pixmaps/pidgin/emotes/default/can.png
+share/pixmaps/pidgin/emotes/default/car.png
+share/pixmaps/pidgin/emotes/default/cat.png
+share/pixmaps/pidgin/emotes/default/chicken.png
+share/pixmaps/pidgin/emotes/default/clap.png
+share/pixmaps/pidgin/emotes/default/clock.png
+share/pixmaps/pidgin/emotes/default/cloudy.png
+share/pixmaps/pidgin/emotes/default/clover.png
+share/pixmaps/pidgin/emotes/default/clown.png
+share/pixmaps/pidgin/emotes/default/coffee.png
+share/pixmaps/pidgin/emotes/default/coins.png
+share/pixmaps/pidgin/emotes/default/computer.png
+share/pixmaps/pidgin/emotes/default/confused.png
+share/pixmaps/pidgin/emotes/default/console.png
+share/pixmaps/pidgin/emotes/default/cow.png
+share/pixmaps/pidgin/emotes/default/cowboy.png
+share/pixmaps/pidgin/emotes/default/crying.png
+share/pixmaps/pidgin/emotes/default/curl-lip.png
+share/pixmaps/pidgin/emotes/default/curse.png
+share/pixmaps/pidgin/emotes/default/cute.png
+share/pixmaps/pidgin/emotes/default/cyclops.png
+share/pixmaps/pidgin/emotes/default/dance.png
+share/pixmaps/pidgin/emotes/default/dazed.png
+share/pixmaps/pidgin/emotes/default/desire.png
+share/pixmaps/pidgin/emotes/default/devil.png
+share/pixmaps/pidgin/emotes/default/disapointed.png
+share/pixmaps/pidgin/emotes/default/disdain.png
+share/pixmaps/pidgin/emotes/default/doctor.png
+share/pixmaps/pidgin/emotes/default/dog.png
+share/pixmaps/pidgin/emotes/default/doh.png
+share/pixmaps/pidgin/emotes/default/dont-know.png
+share/pixmaps/pidgin/emotes/default/drink.png
+share/pixmaps/pidgin/emotes/default/drool.png
+share/pixmaps/pidgin/emotes/default/eat.png
+share/pixmaps/pidgin/emotes/default/embarrassed.png
+share/pixmaps/pidgin/emotes/default/excruciating.png
+share/pixmaps/pidgin/emotes/default/eyeroll.png
+share/pixmaps/pidgin/emotes/default/female-fighter.png
+share/pixmaps/pidgin/emotes/default/film.png
+share/pixmaps/pidgin/emotes/default/fingers-crossed.png
+share/pixmaps/pidgin/emotes/default/flag.png
+share/pixmaps/pidgin/emotes/default/foot-in-mouth.png
+share/pixmaps/pidgin/emotes/default/freaked-out.png
+share/pixmaps/pidgin/emotes/default/ghost.png
+share/pixmaps/pidgin/emotes/default/giggle.png
+share/pixmaps/pidgin/emotes/default/girl.png
+share/pixmaps/pidgin/emotes/default/glasses-cool.png
+share/pixmaps/pidgin/emotes/default/glasses-nerdy.png
+share/pixmaps/pidgin/emotes/default/go-away.png
+share/pixmaps/pidgin/emotes/default/goat.png
+share/pixmaps/pidgin/emotes/default/good.png
+share/pixmaps/pidgin/emotes/default/hammer.png
+share/pixmaps/pidgin/emotes/default/handcuffs.png
+share/pixmaps/pidgin/emotes/default/handshake.png
+share/pixmaps/pidgin/emotes/default/highfive.png
+share/pixmaps/pidgin/emotes/default/hug-left.png
+share/pixmaps/pidgin/emotes/default/hug-right.png
+share/pixmaps/pidgin/emotes/default/hypnotized.png
+share/pixmaps/pidgin/emotes/default/in-love.png
+share/pixmaps/pidgin/emotes/default/island.png
+share/pixmaps/pidgin/emotes/default/jump.png
+share/pixmaps/pidgin/emotes/default/kiss.png
+share/pixmaps/pidgin/emotes/default/kissed.png
+share/pixmaps/pidgin/emotes/default/kissing.png
+share/pixmaps/pidgin/emotes/default/knife.png
+share/pixmaps/pidgin/emotes/default/lamp.png
+share/pixmaps/pidgin/emotes/default/lashes.png
+share/pixmaps/pidgin/emotes/default/laugh.png
+share/pixmaps/pidgin/emotes/default/liquor.png
+share/pixmaps/pidgin/emotes/default/loser.png
+share/pixmaps/pidgin/emotes/default/love-over.png
+share/pixmaps/pidgin/emotes/default/love.png
+share/pixmaps/pidgin/emotes/default/lying.png
+share/pixmaps/pidgin/emotes/default/mad-tongue.png
+share/pixmaps/pidgin/emotes/default/mail.png
+share/pixmaps/pidgin/emotes/default/male-fighter1.png
+share/pixmaps/pidgin/emotes/default/male-fighter2.png
+share/pixmaps/pidgin/emotes/default/mean.png
+share/pixmaps/pidgin/emotes/default/meeting.png
+share/pixmaps/pidgin/emotes/default/messed.png
+share/pixmaps/pidgin/emotes/default/mobile.png
+share/pixmaps/pidgin/emotes/default/mohawk.png
+share/pixmaps/pidgin/emotes/default/moneymouth.png
+share/pixmaps/pidgin/emotes/default/monkey.png
+share/pixmaps/pidgin/emotes/default/moon.png
+share/pixmaps/pidgin/emotes/default/msn-away.png
+share/pixmaps/pidgin/emotes/default/msn-busy.png
+share/pixmaps/pidgin/emotes/default/msn.png
+share/pixmaps/pidgin/emotes/default/msn_online.png
+share/pixmaps/pidgin/emotes/default/music.png
+share/pixmaps/pidgin/emotes/default/musical-note.png
+share/pixmaps/pidgin/emotes/default/nailbiting.png
+share/pixmaps/pidgin/emotes/default/neutral.png
+share/pixmaps/pidgin/emotes/default/on-the-phone.png
+share/pixmaps/pidgin/emotes/default/party.png
+share/pixmaps/pidgin/emotes/default/peace.png
+share/pixmaps/pidgin/emotes/default/phone.png
+share/pixmaps/pidgin/emotes/default/pig.png
+share/pixmaps/pidgin/emotes/default/pill.png
+share/pixmaps/pidgin/emotes/default/pirate.png
+share/pixmaps/pidgin/emotes/default/pissed-off.png
+share/pixmaps/pidgin/emotes/default/pizza.png
+share/pixmaps/pidgin/emotes/default/plate.png
+share/pixmaps/pidgin/emotes/default/poop.png
+share/pixmaps/pidgin/emotes/default/pray.png
+share/pixmaps/pidgin/emotes/default/present.png
+share/pixmaps/pidgin/emotes/default/pumpkin.png
+share/pixmaps/pidgin/emotes/default/qq.png
+share/pixmaps/pidgin/emotes/default/question.png
+share/pixmaps/pidgin/emotes/default/quiet.png
+share/pixmaps/pidgin/emotes/default/rain.png
+share/pixmaps/pidgin/emotes/default/rainbow.png
+share/pixmaps/pidgin/emotes/default/rose-dead.png
+share/pixmaps/pidgin/emotes/default/rose.png
+share/pixmaps/pidgin/emotes/default/rotfl.png
+share/pixmaps/pidgin/emotes/default/sad.png
+share/pixmaps/pidgin/emotes/default/sarcastic.png
+share/pixmaps/pidgin/emotes/default/search.png
+share/pixmaps/pidgin/emotes/default/secret.png
+share/pixmaps/pidgin/emotes/default/shame.png
+share/pixmaps/pidgin/emotes/default/sheep.png
+share/pixmaps/pidgin/emotes/default/shock.png
+share/pixmaps/pidgin/emotes/default/shout.png
+share/pixmaps/pidgin/emotes/default/shut-mouth.png
+share/pixmaps/pidgin/emotes/default/sick.png
+share/pixmaps/pidgin/emotes/default/sidefrown.png
+share/pixmaps/pidgin/emotes/default/sigarette.png
+share/pixmaps/pidgin/emotes/default/silly.png
+share/pixmaps/pidgin/emotes/default/sinister.png
+share/pixmaps/pidgin/emotes/default/skeleton.png
+share/pixmaps/pidgin/emotes/default/skywalker.png
+share/pixmaps/pidgin/emotes/default/sleepy.png
+share/pixmaps/pidgin/emotes/default/smile-big.png
+share/pixmaps/pidgin/emotes/default/smile.png
+share/pixmaps/pidgin/emotes/default/smirk.png
+share/pixmaps/pidgin/emotes/default/snail.png
+share/pixmaps/pidgin/emotes/default/snicker.png
+share/pixmaps/pidgin/emotes/default/snowman.png
+share/pixmaps/pidgin/emotes/default/soccerball.png
+share/pixmaps/pidgin/emotes/default/soldier.png
+share/pixmaps/pidgin/emotes/default/star.png
+share/pixmaps/pidgin/emotes/default/starving.png
+share/pixmaps/pidgin/emotes/default/stop.png
+share/pixmaps/pidgin/emotes/default/struggle.png
+share/pixmaps/pidgin/emotes/default/sun.png
+share/pixmaps/pidgin/emotes/default/sweat.png
+share/pixmaps/pidgin/emotes/default/talktohand.png
+share/pixmaps/pidgin/emotes/default/teeth.png
+share/pixmaps/pidgin/emotes/default/terror.png
+share/pixmaps/pidgin/emotes/default/theme
+share/pixmaps/pidgin/emotes/default/thinking.png
+share/pixmaps/pidgin/emotes/default/thunder.png
+share/pixmaps/pidgin/emotes/default/time-out.png
+share/pixmaps/pidgin/emotes/default/tongue.png
+share/pixmaps/pidgin/emotes/default/tremble.png
+share/pixmaps/pidgin/emotes/default/turtle.png
+share/pixmaps/pidgin/emotes/default/tv.png
+share/pixmaps/pidgin/emotes/default/umbrella.png
+share/pixmaps/pidgin/emotes/default/vampire.png
+share/pixmaps/pidgin/emotes/default/victory.png
+share/pixmaps/pidgin/emotes/default/waiting.png
+share/pixmaps/pidgin/emotes/default/watermelon.png
+share/pixmaps/pidgin/emotes/default/waving.png
+share/pixmaps/pidgin/emotes/default/weep.png
+share/pixmaps/pidgin/emotes/default/wilt.png
+share/pixmaps/pidgin/emotes/default/wink.png
+share/pixmaps/pidgin/emotes/default/worship.png
+share/pixmaps/pidgin/emotes/default/yawn.png
+share/pixmaps/pidgin/emotes/default/yin-yang.png
+share/pixmaps/pidgin/emotes/none/theme
+share/pixmaps/pidgin/logo.png
+share/pixmaps/pidgin/protocols/16/aim.png
+share/pixmaps/pidgin/protocols/16/bonjour.png
+share/pixmaps/pidgin/protocols/16/gadu-gadu.png
+share/pixmaps/pidgin/protocols/16/google-talk.png
+share/pixmaps/pidgin/protocols/16/icq.png
+share/pixmaps/pidgin/protocols/16/irc.png
+share/pixmaps/pidgin/protocols/16/jabber.png
+share/pixmaps/pidgin/protocols/16/meanwhile.png
+share/pixmaps/pidgin/protocols/16/msn.png
+share/pixmaps/pidgin/protocols/16/myspace.png
+share/pixmaps/pidgin/protocols/16/novell.png
+share/pixmaps/pidgin/protocols/16/qq.png
+share/pixmaps/pidgin/protocols/16/silc.png
+share/pixmaps/pidgin/protocols/16/simple.png
+share/pixmaps/pidgin/protocols/16/yahoo.png
+share/pixmaps/pidgin/protocols/16/zephyr.png
+share/pixmaps/pidgin/protocols/22/aim.png
+share/pixmaps/pidgin/protocols/22/bonjour.png
+share/pixmaps/pidgin/protocols/22/gadu-gadu.png
+share/pixmaps/pidgin/protocols/22/google-talk.png
+share/pixmaps/pidgin/protocols/22/icq.png
+share/pixmaps/pidgin/protocols/22/irc.png
+share/pixmaps/pidgin/protocols/22/jabber.png
+share/pixmaps/pidgin/protocols/22/meanwhile.png
+share/pixmaps/pidgin/protocols/22/msn.png
+share/pixmaps/pidgin/protocols/22/myspace.png
+share/pixmaps/pidgin/protocols/22/novell.png
+share/pixmaps/pidgin/protocols/22/qq.png
+share/pixmaps/pidgin/protocols/22/silc.png
+share/pixmaps/pidgin/protocols/22/simple.png
+share/pixmaps/pidgin/protocols/22/yahoo.png
+share/pixmaps/pidgin/protocols/22/zephyr.png
+share/pixmaps/pidgin/protocols/48/aim.png
+share/pixmaps/pidgin/protocols/48/bonjour.png
+share/pixmaps/pidgin/protocols/48/gadu-gadu.png
+share/pixmaps/pidgin/protocols/48/icq.png
+share/pixmaps/pidgin/protocols/48/irc.png
+share/pixmaps/pidgin/protocols/48/jabber.png
+share/pixmaps/pidgin/protocols/48/meanwhile.png
+share/pixmaps/pidgin/protocols/48/msn.png
+share/pixmaps/pidgin/protocols/48/myspace.png
+share/pixmaps/pidgin/protocols/48/novell.png
+share/pixmaps/pidgin/protocols/48/qq.png
+share/pixmaps/pidgin/protocols/48/silc.png
+share/pixmaps/pidgin/protocols/48/simple.png
+share/pixmaps/pidgin/protocols/48/yahoo.png
+share/pixmaps/pidgin/protocols/48/zephyr.png
+share/pixmaps/pidgin/status/11/available.png
+share/pixmaps/pidgin/status/11/away.png
+share/pixmaps/pidgin/status/11/busy.png
+share/pixmaps/pidgin/status/11/chat.png
+share/pixmaps/pidgin/status/11/extended-away.png
+share/pixmaps/pidgin/status/11/invisible.png
+share/pixmaps/pidgin/status/11/offline.png
+share/pixmaps/pidgin/status/11/person.png
+share/pixmaps/pidgin/status/11/rtl/extended-away.png
+share/pixmaps/pidgin/status/16/available.png
+share/pixmaps/pidgin/status/16/away.png
+share/pixmaps/pidgin/status/16/busy.png
+share/pixmaps/pidgin/status/16/chat.png
+share/pixmaps/pidgin/status/16/extended-away.png
+share/pixmaps/pidgin/status/16/invisible.png
+share/pixmaps/pidgin/status/16/log-in.png
+share/pixmaps/pidgin/status/16/log-out.png
+share/pixmaps/pidgin/status/16/offline.png
+share/pixmaps/pidgin/status/16/person.png
+share/pixmaps/pidgin/status/16/rtl/extended-away.png
+share/pixmaps/pidgin/status/16/rtl/log-in.png
+share/pixmaps/pidgin/status/16/rtl/log-out.png
+share/pixmaps/pidgin/status/22/available.png
+share/pixmaps/pidgin/status/22/away.png
+share/pixmaps/pidgin/status/22/busy.png
+share/pixmaps/pidgin/status/22/chat.png
+share/pixmaps/pidgin/status/22/extended-away.png
+share/pixmaps/pidgin/status/22/invisible.png
+share/pixmaps/pidgin/status/22/log-in.png
+share/pixmaps/pidgin/status/22/log-out.png
+share/pixmaps/pidgin/status/22/offline.png
+share/pixmaps/pidgin/status/22/person.png
+share/pixmaps/pidgin/status/22/rtl/extended-away.png
+share/pixmaps/pidgin/status/22/rtl/log-in.png
+share/pixmaps/pidgin/status/22/rtl/log-out.png
+share/pixmaps/pidgin/status/32/available.png
+share/pixmaps/pidgin/status/32/away.png
+share/pixmaps/pidgin/status/32/busy.png
+share/pixmaps/pidgin/status/32/chat.png
+share/pixmaps/pidgin/status/32/extended-away.png
+share/pixmaps/pidgin/status/32/invisible.png
+share/pixmaps/pidgin/status/32/log-in.png
+share/pixmaps/pidgin/status/32/log-out.png
+share/pixmaps/pidgin/status/32/offline.png
+share/pixmaps/pidgin/status/32/person.png
+share/pixmaps/pidgin/status/32/rtl/extended-away.png
+share/pixmaps/pidgin/status/32/rtl/log-in.png
+share/pixmaps/pidgin/status/32/rtl/log-out.png
+share/pixmaps/pidgin/status/48/available.png
+share/pixmaps/pidgin/status/48/away.png
+share/pixmaps/pidgin/status/48/busy.png
+share/pixmaps/pidgin/status/48/chat.png
+share/pixmaps/pidgin/status/48/extended-away.png
+share/pixmaps/pidgin/status/48/log-in.png
+share/pixmaps/pidgin/status/48/log-out.png
+share/pixmaps/pidgin/status/48/offline.png
+share/pixmaps/pidgin/status/48/person.png
+share/pixmaps/pidgin/status/48/rtl/extended-away.png
+share/pixmaps/pidgin/toolbar/16/change-bgcolor.png
+share/pixmaps/pidgin/toolbar/16/change-fgcolor.png
+share/pixmaps/pidgin/toolbar/16/emote-select.png
+share/pixmaps/pidgin/toolbar/16/font-face.png
+share/pixmaps/pidgin/toolbar/16/font-size-down.png
+share/pixmaps/pidgin/toolbar/16/font-size-up.png
+share/pixmaps/pidgin/toolbar/16/insert-image.png
+share/pixmaps/pidgin/toolbar/16/insert-link.png
+share/pixmaps/pidgin/toolbar/16/insert.png
+share/pixmaps/pidgin/toolbar/16/message-new.png
+share/pixmaps/pidgin/toolbar/16/plugins.png
+share/pixmaps/pidgin/toolbar/16/send-file.png
+share/pixmaps/pidgin/toolbar/16/unblock.png
+share/pixmaps/pidgin/toolbar/22/select-avatar.png
+share/pixmaps/pidgin/tray/16/tray-away.png
+share/pixmaps/pidgin/tray/16/tray-busy.png
+share/pixmaps/pidgin/tray/16/tray-connecting.png
+share/pixmaps/pidgin/tray/16/tray-extended-away.png
+share/pixmaps/pidgin/tray/16/tray-invisible.png
+share/pixmaps/pidgin/tray/16/tray-message.png
+share/pixmaps/pidgin/tray/16/tray-new-im.png
+share/pixmaps/pidgin/tray/16/tray-offline.png
+share/pixmaps/pidgin/tray/16/tray-online.png
+share/pixmaps/pidgin/tray/22/tray-away.png
+share/pixmaps/pidgin/tray/22/tray-busy.png
+share/pixmaps/pidgin/tray/22/tray-connecting.png
+share/pixmaps/pidgin/tray/22/tray-extended-away.png
+share/pixmaps/pidgin/tray/22/tray-invisible.png
+share/pixmaps/pidgin/tray/22/tray-message.png
+share/pixmaps/pidgin/tray/22/tray-new-im.png
+share/pixmaps/pidgin/tray/22/tray-offline.png
+share/pixmaps/pidgin/tray/22/tray-online.png
+share/pixmaps/pidgin/tray/32/tray-away.png
+share/pixmaps/pidgin/tray/32/tray-busy.png
+share/pixmaps/pidgin/tray/32/tray-connecting.png
+share/pixmaps/pidgin/tray/32/tray-extended-away.png
+share/pixmaps/pidgin/tray/32/tray-invisible.png
+share/pixmaps/pidgin/tray/32/tray-new-im.png
+share/pixmaps/pidgin/tray/32/tray-offline.png
+share/pixmaps/pidgin/tray/32/tray-online.png
+share/pixmaps/pidgin/tray/48/tray-away.png
+share/pixmaps/pidgin/tray/48/tray-busy.png
+share/pixmaps/pidgin/tray/48/tray-connecting.png
+share/pixmaps/pidgin/tray/48/tray-extended-away.png
+share/pixmaps/pidgin/tray/48/tray-invisible.png
+share/pixmaps/pidgin/tray/48/tray-new-im.png
+share/pixmaps/pidgin/tray/48/tray-offline.png
+share/pixmaps/pidgin/tray/48/tray-online.png
+share/pixmaps/purple/buddy_icons/qq/qq_1.png
+share/pixmaps/purple/buddy_icons/qq/qq_10.png
+share/pixmaps/purple/buddy_icons/qq/qq_100.png
+share/pixmaps/purple/buddy_icons/qq/qq_11.png
+share/pixmaps/purple/buddy_icons/qq/qq_12.png
+share/pixmaps/purple/buddy_icons/qq/qq_13.png
+share/pixmaps/purple/buddy_icons/qq/qq_14.png
+share/pixmaps/purple/buddy_icons/qq/qq_15.png
+share/pixmaps/purple/buddy_icons/qq/qq_16.png
+share/pixmaps/purple/buddy_icons/qq/qq_17.png
+share/pixmaps/purple/buddy_icons/qq/qq_18.png
+share/pixmaps/purple/buddy_icons/qq/qq_19.png
+share/pixmaps/purple/buddy_icons/qq/qq_2.png
+share/pixmaps/purple/buddy_icons/qq/qq_20.png
+share/pixmaps/purple/buddy_icons/qq/qq_21.png
+share/pixmaps/purple/buddy_icons/qq/qq_22.png
+share/pixmaps/purple/buddy_icons/qq/qq_23.png
+share/pixmaps/purple/buddy_icons/qq/qq_24.png
+share/pixmaps/purple/buddy_icons/qq/qq_25.png
+share/pixmaps/purple/buddy_icons/qq/qq_26.png
+share/pixmaps/purple/buddy_icons/qq/qq_27.png
+share/pixmaps/purple/buddy_icons/qq/qq_28.png
+share/pixmaps/purple/buddy_icons/qq/qq_29.png
+share/pixmaps/purple/buddy_icons/qq/qq_3.png
+share/pixmaps/purple/buddy_icons/qq/qq_30.png
+share/pixmaps/purple/buddy_icons/qq/qq_31.png
+share/pixmaps/purple/buddy_icons/qq/qq_32.png
+share/pixmaps/purple/buddy_icons/qq/qq_33.png
+share/pixmaps/purple/buddy_icons/qq/qq_34.png
+share/pixmaps/purple/buddy_icons/qq/qq_35.png
+share/pixmaps/purple/buddy_icons/qq/qq_36.png
+share/pixmaps/purple/buddy_icons/qq/qq_37.png
+share/pixmaps/purple/buddy_icons/qq/qq_38.png
+share/pixmaps/purple/buddy_icons/qq/qq_39.png
+share/pixmaps/purple/buddy_icons/qq/qq_4.png
+share/pixmaps/purple/buddy_icons/qq/qq_40.png
+share/pixmaps/purple/buddy_icons/qq/qq_41.png
+share/pixmaps/purple/buddy_icons/qq/qq_42.png
+share/pixmaps/purple/buddy_icons/qq/qq_43.png
+share/pixmaps/purple/buddy_icons/qq/qq_44.png
+share/pixmaps/purple/buddy_icons/qq/qq_45.png
+share/pixmaps/purple/buddy_icons/qq/qq_46.png
+share/pixmaps/purple/buddy_icons/qq/qq_47.png
+share/pixmaps/purple/buddy_icons/qq/qq_48.png
+share/pixmaps/purple/buddy_icons/qq/qq_49.png
+share/pixmaps/purple/buddy_icons/qq/qq_5.png
+share/pixmaps/purple/buddy_icons/qq/qq_50.png
+share/pixmaps/purple/buddy_icons/qq/qq_51.png
+share/pixmaps/purple/buddy_icons/qq/qq_52.png
+share/pixmaps/purple/buddy_icons/qq/qq_53.png
+share/pixmaps/purple/buddy_icons/qq/qq_54.png
+share/pixmaps/purple/buddy_icons/qq/qq_55.png
+share/pixmaps/purple/buddy_icons/qq/qq_56.png
+share/pixmaps/purple/buddy_icons/qq/qq_57.png
+share/pixmaps/purple/buddy_icons/qq/qq_58.png
+share/pixmaps/purple/buddy_icons/qq/qq_59.png
+share/pixmaps/purple/buddy_icons/qq/qq_6.png
+share/pixmaps/purple/buddy_icons/qq/qq_60.png
+share/pixmaps/purple/buddy_icons/qq/qq_61.png
+share/pixmaps/purple/buddy_icons/qq/qq_62.png
+share/pixmaps/purple/buddy_icons/qq/qq_63.png
+share/pixmaps/purple/buddy_icons/qq/qq_64.png
+share/pixmaps/purple/buddy_icons/qq/qq_65.png
+share/pixmaps/purple/buddy_icons/qq/qq_66.png
+share/pixmaps/purple/buddy_icons/qq/qq_67.png
+share/pixmaps/purple/buddy_icons/qq/qq_68.png
+share/pixmaps/purple/buddy_icons/qq/qq_69.png
+share/pixmaps/purple/buddy_icons/qq/qq_7.png
+share/pixmaps/purple/buddy_icons/qq/qq_70.png
+share/pixmaps/purple/buddy_icons/qq/qq_71.png
+share/pixmaps/purple/buddy_icons/qq/qq_72.png
+share/pixmaps/purple/buddy_icons/qq/qq_73.png
+share/pixmaps/purple/buddy_icons/qq/qq_74.png
+share/pixmaps/purple/buddy_icons/qq/qq_75.png
+share/pixmaps/purple/buddy_icons/qq/qq_76.png
+share/pixmaps/purple/buddy_icons/qq/qq_77.png
+share/pixmaps/purple/buddy_icons/qq/qq_78.png
+share/pixmaps/purple/buddy_icons/qq/qq_79.png
+share/pixmaps/purple/buddy_icons/qq/qq_8.png
+share/pixmaps/purple/buddy_icons/qq/qq_80.png
+share/pixmaps/purple/buddy_icons/qq/qq_81.png
+share/pixmaps/purple/buddy_icons/qq/qq_82.png
+share/pixmaps/purple/buddy_icons/qq/qq_83.png
+share/pixmaps/purple/buddy_icons/qq/qq_84.png
+share/pixmaps/purple/buddy_icons/qq/qq_85.png
+share/pixmaps/purple/buddy_icons/qq/qq_86.png
+share/pixmaps/purple/buddy_icons/qq/qq_87.png
+share/pixmaps/purple/buddy_icons/qq/qq_88.png
+share/pixmaps/purple/buddy_icons/qq/qq_89.png
+share/pixmaps/purple/buddy_icons/qq/qq_9.png
+share/pixmaps/purple/buddy_icons/qq/qq_90.png
+share/pixmaps/purple/buddy_icons/qq/qq_91.png
+share/pixmaps/purple/buddy_icons/qq/qq_92.png
+share/pixmaps/purple/buddy_icons/qq/qq_93.png
+share/pixmaps/purple/buddy_icons/qq/qq_94.png
+share/pixmaps/purple/buddy_icons/qq/qq_95.png
+share/pixmaps/purple/buddy_icons/qq/qq_96.png
+share/pixmaps/purple/buddy_icons/qq/qq_97.png
+share/pixmaps/purple/buddy_icons/qq/qq_98.png
+share/pixmaps/purple/buddy_icons/qq/qq_99.png
 share/icons/hicolor/16x16/apps/pidgin.png
 share/icons/hicolor/22x22/apps/pidgin.png
 share/icons/hicolor/24x24/apps/pidgin.png
 share/icons/hicolor/32x32/apps/pidgin.png
 share/icons/hicolor/48x48/apps/pidgin.png
 share/icons/hicolor/scalable/apps/pidgin.svg
-@dirrm share/gnome/pixmaps/purple/buddy_icons/qq
-@dirrm share/gnome/pixmaps/purple/buddy_icons
-@dirrm share/gnome/pixmaps/purple
-@dirrm share/gnome/pixmaps/pidgin/tray/48
-@dirrm share/gnome/pixmaps/pidgin/tray/32
-@dirrm share/gnome/pixmaps/pidgin/tray/22
-@dirrm share/gnome/pixmaps/pidgin/tray/16
-@dirrm share/gnome/pixmaps/pidgin/tray
-@dirrm share/gnome/pixmaps/pidgin/toolbar/22
-@dirrm share/gnome/pixmaps/pidgin/toolbar/16
-@dirrm share/gnome/pixmaps/pidgin/toolbar
-@dirrm share/gnome/pixmaps/pidgin/status/48/rtl
-@dirrm share/gnome/pixmaps/pidgin/status/48
-@dirrm share/gnome/pixmaps/pidgin/status/32/rtl
-@dirrm share/gnome/pixmaps/pidgin/status/32
-@dirrm share/gnome/pixmaps/pidgin/status/22/rtl
-@dirrm share/gnome/pixmaps/pidgin/status/22
-@dirrm share/gnome/pixmaps/pidgin/status/16/rtl
-@dirrm share/gnome/pixmaps/pidgin/status/16
-@dirrm share/gnome/pixmaps/pidgin/status/11/rtl
-@dirrm share/gnome/pixmaps/pidgin/status/11
-@dirrm share/gnome/pixmaps/pidgin/status
-@dirrm share/gnome/pixmaps/pidgin/protocols/48
-@dirrm share/gnome/pixmaps/pidgin/protocols/22
-@dirrm share/gnome/pixmaps/pidgin/protocols/16
-@dirrm share/gnome/pixmaps/pidgin/protocols
-@dirrm share/gnome/pixmaps/pidgin/emotes/none
-@dirrm share/gnome/pixmaps/pidgin/emotes/default
-@dirrm share/gnome/pixmaps/pidgin/emotes
-@dirrm share/gnome/pixmaps/pidgin/emblems/16
-@dirrm share/gnome/pixmaps/pidgin/emblems
-@dirrm share/gnome/pixmaps/pidgin/dialogs/64
-@dirrm share/gnome/pixmaps/pidgin/dialogs/16
-@dirrm share/gnome/pixmaps/pidgin/dialogs
-@dirrm share/gnome/pixmaps/pidgin/buttons
-@dirrm share/gnome/pixmaps/pidgin/animations/16
-@dirrm share/gnome/pixmaps/pidgin/animations
-@dirrm share/gnome/pixmaps/pidgin
+@dirrm share/pixmaps/purple/buddy_icons/qq
+@dirrm share/pixmaps/purple/buddy_icons
+@dirrm share/pixmaps/purple
+@dirrm share/pixmaps/pidgin/tray/48
+@dirrm share/pixmaps/pidgin/tray/32
+@dirrm share/pixmaps/pidgin/tray/22
+@dirrm share/pixmaps/pidgin/tray/16
+@dirrm share/pixmaps/pidgin/tray
+@dirrm share/pixmaps/pidgin/toolbar/22
+@dirrm share/pixmaps/pidgin/toolbar/16
+@dirrm share/pixmaps/pidgin/toolbar
+@dirrm share/pixmaps/pidgin/status/48/rtl
+@dirrm share/pixmaps/pidgin/status/48
+@dirrm share/pixmaps/pidgin/status/32/rtl
+@dirrm share/pixmaps/pidgin/status/32
+@dirrm share/pixmaps/pidgin/status/22/rtl
+@dirrm share/pixmaps/pidgin/status/22
+@dirrm share/pixmaps/pidgin/status/16/rtl
+@dirrm share/pixmaps/pidgin/status/16
+@dirrm share/pixmaps/pidgin/status/11/rtl
+@dirrm share/pixmaps/pidgin/status/11
+@dirrm share/pixmaps/pidgin/status
+@dirrm share/pixmaps/pidgin/protocols/48
+@dirrm share/pixmaps/pidgin/protocols/22
+@dirrm share/pixmaps/pidgin/protocols/16
+@dirrm share/pixmaps/pidgin/protocols
+@dirrm share/pixmaps/pidgin/emotes/none
+@dirrm share/pixmaps/pidgin/emotes/default
+@dirrm share/pixmaps/pidgin/emotes
+@dirrm share/pixmaps/pidgin/emblems/16
+@dirrm share/pixmaps/pidgin/emblems
+@dirrm share/pixmaps/pidgin/dialogs/64
+@dirrm share/pixmaps/pidgin/dialogs/16
+@dirrm share/pixmaps/pidgin/dialogs
+@dirrm share/pixmaps/pidgin/buttons
+@dirrm share/pixmaps/pidgin/animations/16
+@dirrm share/pixmaps/pidgin/animations
+@dirrm share/pixmaps/pidgin
 @dirrm lib/pidgin
 @dirrm include/pidgin
diff --git a/net-im/vqcc-gtk/Makefile b/net-im/vqcc-gtk/Makefile
index b37972ca31db..e67b97e5d583 100644
--- a/net-im/vqcc-gtk/Makefile
+++ b/net-im/vqcc-gtk/Makefile
@@ -1,12 +1,13 @@
 # New ports collection makefile for:	vqcc-gtk
 # Date created:			07 Sep 2004
 # Whom:				Saulius Menkevicius <bob@nulis.lt>
+#
 # $FreeBSD$
 #
 
 PORTNAME=	vqcc-gtk
 PORTVERSION=	0.5
-PORTREVISION=	1
+PORTREVISION=	3
 CATEGORIES?=	net-im
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -22,12 +23,6 @@ USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 
-PLIST_FILES=	bin/vqcc-gtk \
-		share/gnome/applications/vqcc-gtk.desktop \
-		share/gnome/pixmaps/vqcc-gtk.png \
-		share/locale/lt/LC_MESSAGES/vqcc-gtk.mo \
-		share/locale/ru/LC_MESSAGES/vqcc-gtk.mo
-
 CPPFLAGS=	-I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS}
 LDFLAGS=	-L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS}
 
diff --git a/net-im/vqcc-gtk/pkg-plist b/net-im/vqcc-gtk/pkg-plist
new file mode 100644
index 000000000000..d98770eca16d
--- /dev/null
+++ b/net-im/vqcc-gtk/pkg-plist
@@ -0,0 +1,6 @@
+bin/vqcc-gtk
+share/applications/vqcc-gtk.desktop
+share/pixmaps/vqcc-gtk.png
+share/locale/lt/LC_MESSAGES/vqcc-gtk.mo
+share/locale/ru/LC_MESSAGES/vqcc-gtk.mo
+@dirrmtry share/applications
diff --git a/net-mgmt/etherape/Makefile b/net-mgmt/etherape/Makefile
index 1393da8ae233..0cbd5c5fe414 100644
--- a/net-mgmt/etherape/Makefile
+++ b/net-mgmt/etherape/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	etherape
 PORTVERSION=	0.9.6
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net-mgmt gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/net-mgmt/etherape/pkg-plist b/net-mgmt/etherape/pkg-plist
index 0990c1762afa..d1cfcd3f3afa 100644
--- a/net-mgmt/etherape/pkg-plist
+++ b/net-mgmt/etherape/pkg-plist
@@ -1,34 +1,35 @@
 bin/etherape
 etc/etherape/services
-share/gnome/applications/etherape.desktop
-share/gnome/etherape/doc/etherape/C/etherape.xml
-share/gnome/etherape/doc/etherape/C/figures/appmain.png
-share/gnome/etherape/doc/etherape/C/figures/capture_file_dlg.png
-share/gnome/etherape/doc/etherape/C/figures/color_select_dlg.png
-share/gnome/etherape/doc/etherape/C/figures/eth_toolbar.png
-share/gnome/etherape/doc/etherape/C/figures/link_info.png
-share/gnome/etherape/doc/etherape/C/figures/node_info.png
-share/gnome/etherape/doc/etherape/C/figures/pref_colors_dlg.png
-share/gnome/etherape/doc/etherape/C/figures/pref_diagram_dlg.png
-share/gnome/etherape/doc/etherape/C/figures/pref_timings_dlg.png
-share/gnome/etherape/doc/etherape/C/figures/proto_info.png
-share/gnome/etherape/doc/etherape/C/figures/protocol_edit_dlg.png
-share/gnome/etherape/glade/etherape.glade2
-share/gnome/etherape/glade/etherape.png
-share/gnome/etherape/glade/pause.xpm
-share/gnome/etherape/glade/play.xpm
-share/gnome/etherape/glade/stop.xpm
-share/gnome/omf/etherape/etherape-C.omf
-share/gnome/pixmaps/etherape.png
+share/applications/etherape.desktop
+share/etherape/doc/etherape/C/etherape.xml
+share/etherape/doc/etherape/C/figures/appmain.png
+share/etherape/doc/etherape/C/figures/capture_file_dlg.png
+share/etherape/doc/etherape/C/figures/color_select_dlg.png
+share/etherape/doc/etherape/C/figures/eth_toolbar.png
+share/etherape/doc/etherape/C/figures/link_info.png
+share/etherape/doc/etherape/C/figures/node_info.png
+share/etherape/doc/etherape/C/figures/pref_colors_dlg.png
+share/etherape/doc/etherape/C/figures/pref_diagram_dlg.png
+share/etherape/doc/etherape/C/figures/pref_timings_dlg.png
+share/etherape/doc/etherape/C/figures/proto_info.png
+share/etherape/doc/etherape/C/figures/protocol_edit_dlg.png
+share/etherape/glade/etherape.glade2
+share/etherape/glade/etherape.png
+share/etherape/glade/pause.xpm
+share/etherape/glade/play.xpm
+share/etherape/glade/stop.xpm
+share/omf/etherape/etherape-C.omf
+share/pixmaps/etherape.png
 share/locale/es/LC_MESSAGES/etherape.mo
 share/locale/fr/LC_MESSAGES/etherape.mo
 share/locale/nl/LC_MESSAGES/etherape.mo
 share/locale/tr/LC_MESSAGES/etherape.mo
-@dirrm share/gnome/omf/etherape
-@dirrm share/gnome/etherape/glade
-@dirrm share/gnome/etherape/doc/etherape/C/figures
-@dirrm share/gnome/etherape/doc/etherape/C
-@dirrm share/gnome/etherape/doc/etherape
-@dirrm share/gnome/etherape/doc
-@dirrm share/gnome/etherape
+@dirrm share/omf/etherape
+@dirrm share/etherape/glade
+@dirrm share/etherape/doc/etherape/C/figures
+@dirrm share/etherape/doc/etherape/C
+@dirrm share/etherape/doc/etherape
+@dirrm share/etherape/doc
+@dirrm share/etherape
 @dirrm etc/etherape
+@dirrmtry share/applications
diff --git a/net-p2p/amule-devel/Makefile b/net-p2p/amule-devel/Makefile
index d3f8c5b150a0..4c03a526eed1 100644
--- a/net-p2p/amule-devel/Makefile
+++ b/net-p2p/amule-devel/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	aMule
 PORTVERSION=	2.1.3
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	net-p2p
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	amule
diff --git a/net-p2p/amule-devel/pkg-plist b/net-p2p/amule-devel/pkg-plist
index 63f3714bb704..aacd1a4949a0 100644
--- a/net-p2p/amule-devel/pkg-plist
+++ b/net-p2p/amule-devel/pkg-plist
@@ -39,195 +39,194 @@ share/locale/sl/LC_MESSAGES/amule.mo
 @dirrmtry share/locale/it_CH
 @dirrmtry share/locale/ko_KR/LC_MESSAGES
 @dirrmtry share/locale/ko_KR
-share/gnome/doc/aMule-2.1.3/ABOUT-NLS
-share/gnome/doc/aMule-2.1.3/amulesig.txt
-share/gnome/doc/aMule-2.1.3/amule-win32.HOWTO.txt
-share/gnome/doc/aMule-2.1.3/Changelog
-share/gnome/doc/aMule-2.1.3/Doxyfile
-share/gnome/doc/aMule-2.1.3/ED2K-Links.HOWTO
-share/gnome/doc/aMule-2.1.3/INSTALL
-share/gnome/doc/aMule-2.1.3/license.txt
-share/gnome/doc/aMule-2.1.3/README
-share/gnome/doc/aMule-2.1.3/TODO
-share/gnome/doc/aMule-2.1.3/EC_Protocol.txt
-share/gnome/doc/aMule-2.1.3/socks4.protocol
-@dirrmtry share/gnome/doc/aMule-2.1.3
-@dirrmtry share/gnome/doc
-%%PL_CAS%%share/gnome/cas/tmp.html
-%%PL_CAS%%share/gnome/cas/stat.png
-%%PL_CAS%%@dirrmtry share/gnome/cas
-%%PL_CAS%%share/gnome/pixmaps/wxcas.xpm
-%%PL_ALC%%share/gnome/pixmaps/alc.xpm
-share/gnome/pixmaps/amule.xpm
-@dirrmtry share/gnome/pixmaps
-%%PL_CAS%%share/gnome/applications/wxcas.desktop
-%%PL_ALC%%share/gnome/applications/alc.desktop
-share/gnome/applications/amule.desktop
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/aMule.tmpl
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/add_server.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/arrow_down.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/arrow_right.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/arrow_up.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/back.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/black.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/blue1.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/blue2.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/blue3.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/blue4.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/blue5.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/blue6.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/cp_download.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/cp_kad.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/cp_search.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/cp_servers.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/cp_settings.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/cp_shared.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/cp_stats.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/emule.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/green.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/greenpercent.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/l_cancel.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/l_connect.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/l_down.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/l_ed2klink.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/l_info.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/l_pause.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/l_resume.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/l_up.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/log.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/logo.jpg
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/red.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/transparent.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/yellow.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/phpamule.png
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/tree-leaf.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/tree-open.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/tree-closed.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/favicon.ico
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/downloads.php
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/preferences.php
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/search.php
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/servers.php
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/shared.php
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/stat_graphs.php
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/stat_tree.php
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/login.php
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/index.php
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/amuleweb-main-dload.php
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/amuleweb-main-search.php
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/amuleweb-main-servers.php
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/amuleweb-main-shared.php
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/amuleweb-main-stats.php
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/amuleweb-main-prefs.php
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/amuleweb-main-kad.php
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/stats.php
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/stats_tree.php
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/top.html
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/footer.php
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/login.php
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/tree-open.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/tree-closed.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/tree-leaf.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/toolbutton-reload.jpeg
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/toolbutton-search.jpeg
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/toolbutton-search-pressed.jpeg
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/toolbutton-servers.jpeg
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/toolbutton-servers-pressed.jpeg
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/toolbutton-settings.jpeg
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/toolbutton-settings-pressed.jpeg
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/toolbutton-shared.jpeg
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/toolbutton-shared-pressed.jpeg
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/toolbutton-download.jpeg
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/toolbutton-download-pressed.jpeg
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/toolbutton-kad.jpeg
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/toolbutton-kad-pressed.jpeg
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/toolbutton-stats.jpeg
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/toolbutton-stats-pressed.jpeg
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/toolbutton-connect.jpeg
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/toolbutton-logout.jpeg
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/toolbutton-logout-pressed.jpeg
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/toolbutton-filter.jpeg
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/connect.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/cancel.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/arrow-r.png
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/up.jpeg
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/down.jpeg
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/pause.jpeg
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/resume.jpeg
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/apply.jpeg
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/delete.jpeg
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/phpamule.png
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/favicon.ico
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/index.html
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/aMule.tmpl
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/add_server.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/arrow_down.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/arrow_down_logout.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/arrow_right.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/arrow_up.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/back.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/black.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/blank1x1.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/blue1.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/blue2.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/blue3.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/blue4.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/blue5.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/blue6.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/cp_download.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/cp_kad.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/cp_search.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/cp_servers.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/cp_settings.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/cp_shared.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/log.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/cp_stats.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/emule.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/green.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/greenpercent.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/l_cancel.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/l_connect.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/l_down.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/l_ed2klink.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/l_info.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/l_pause.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/l_resume.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/l_up.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/login_bottom.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/login_downmain.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/login_lefttop.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/login_righttop.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/login_top.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/login_topdown.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/login_topseperator.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/logo.jpg
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/main_bg.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/main_top_bg.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/main_topbar.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/main_topbardarker.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/main_topbarseperator.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/red.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/transparent.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/yellow.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/phpamule.png
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/tree-leaf.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/tree-open.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/tree-closed.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/favicon.ico
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/downloads.php
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/preferences.php
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/search.php
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/servers.php
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/shared.php
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/stat_graphs.php
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/stat_tree.php
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/login.php
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/index.php
-%%PL_AMULEWEBSRV%%@dirrmtry share/gnome/amule/webserver/default
-%%PL_AMULEWEBSRV%%@dirrmtry share/gnome/amule/webserver/php-default
-%%PL_AMULEWEBSRV%%@dirrmtry share/gnome/amule/webserver/chicane
-%%PL_AMULEWEBSRV%%@dirrmtry share/gnome/amule/webserver
-%%PL_AMULEWEBSRV%%@dirrmtry share/gnome/amule
+share/doc/aMule-2.1.3/ABOUT-NLS
+share/doc/aMule-2.1.3/amulesig.txt
+share/doc/aMule-2.1.3/amule-win32.HOWTO.txt
+share/doc/aMule-2.1.3/Changelog
+share/doc/aMule-2.1.3/Doxyfile
+share/doc/aMule-2.1.3/ED2K-Links.HOWTO
+share/doc/aMule-2.1.3/INSTALL
+share/doc/aMule-2.1.3/license.txt
+share/doc/aMule-2.1.3/README
+share/doc/aMule-2.1.3/TODO
+share/doc/aMule-2.1.3/EC_Protocol.txt
+share/doc/aMule-2.1.3/socks4.protocol
+@dirrmtry share/doc/aMule-2.1.3
+@dirrmtry share/doc
+%%PL_CAS%%share/cas/tmp.html
+%%PL_CAS%%share/cas/stat.png
+%%PL_CAS%%@dirrmtry share/cas
+%%PL_CAS%%share/pixmaps/wxcas.xpm
+%%PL_ALC%%share/pixmaps/alc.xpm
+share/pixmaps/amule.xpm
+%%PL_CAS%%share/applications/wxcas.desktop
+%%PL_ALC%%share/applications/alc.desktop
+share/applications/amule.desktop
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/aMule.tmpl
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/add_server.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/arrow_down.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/arrow_right.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/arrow_up.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/back.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/black.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/blue1.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/blue2.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/blue3.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/blue4.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/blue5.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/blue6.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/cp_download.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/cp_kad.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/cp_search.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/cp_servers.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/cp_settings.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/cp_shared.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/cp_stats.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/emule.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/green.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/greenpercent.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/l_cancel.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/l_connect.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/l_down.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/l_ed2klink.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/l_info.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/l_pause.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/l_resume.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/l_up.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/log.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/logo.jpg
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/red.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/transparent.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/yellow.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/phpamule.png
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/tree-leaf.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/tree-open.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/tree-closed.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/favicon.ico
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/downloads.php
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/preferences.php
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/search.php
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/servers.php
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/shared.php
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/stat_graphs.php
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/stat_tree.php
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/login.php
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/index.php
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/amuleweb-main-dload.php
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/amuleweb-main-search.php
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/amuleweb-main-servers.php
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/amuleweb-main-shared.php
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/amuleweb-main-stats.php
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/amuleweb-main-prefs.php
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/amuleweb-main-kad.php
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/stats.php
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/stats_tree.php
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/top.html
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/footer.php
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/login.php
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/tree-open.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/tree-closed.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/tree-leaf.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/toolbutton-reload.jpeg
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/toolbutton-search.jpeg
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/toolbutton-search-pressed.jpeg
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/toolbutton-servers.jpeg
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/toolbutton-servers-pressed.jpeg
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/toolbutton-settings.jpeg
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/toolbutton-settings-pressed.jpeg
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/toolbutton-shared.jpeg
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/toolbutton-shared-pressed.jpeg
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/toolbutton-download.jpeg
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/toolbutton-download-pressed.jpeg
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/toolbutton-kad.jpeg
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/toolbutton-kad-pressed.jpeg
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/toolbutton-stats.jpeg
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/toolbutton-stats-pressed.jpeg
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/toolbutton-connect.jpeg
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/toolbutton-logout.jpeg
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/toolbutton-logout-pressed.jpeg
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/toolbutton-filter.jpeg
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/connect.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/cancel.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/arrow-r.png
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/up.jpeg
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/down.jpeg
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/pause.jpeg
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/resume.jpeg
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/apply.jpeg
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/delete.jpeg
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/phpamule.png
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/favicon.ico
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/index.html
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/aMule.tmpl
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/add_server.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/arrow_down.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/arrow_down_logout.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/arrow_right.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/arrow_up.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/back.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/black.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/blank1x1.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/blue1.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/blue2.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/blue3.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/blue4.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/blue5.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/blue6.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/cp_download.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/cp_kad.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/cp_search.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/cp_servers.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/cp_settings.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/cp_shared.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/log.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/cp_stats.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/emule.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/green.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/greenpercent.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/l_cancel.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/l_connect.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/l_down.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/l_ed2klink.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/l_info.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/l_pause.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/l_resume.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/l_up.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/login_bottom.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/login_downmain.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/login_lefttop.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/login_righttop.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/login_top.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/login_topdown.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/login_topseperator.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/logo.jpg
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/main_bg.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/main_top_bg.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/main_topbar.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/main_topbardarker.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/main_topbarseperator.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/red.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/transparent.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/yellow.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/phpamule.png
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/tree-leaf.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/tree-open.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/tree-closed.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/favicon.ico
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/downloads.php
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/preferences.php
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/search.php
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/servers.php
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/shared.php
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/stat_graphs.php
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/stat_tree.php
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/login.php
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/index.php
+%%PL_AMULEWEBSRV%%@dirrmtry share/amule/webserver/default
+%%PL_AMULEWEBSRV%%@dirrmtry share/amule/webserver/php-default
+%%PL_AMULEWEBSRV%%@dirrmtry share/amule/webserver/chicane
+%%PL_AMULEWEBSRV%%@dirrmtry share/amule/webserver
+%%PL_AMULEWEBSRV%%@dirrmtry share/amule
 lib/xchat/plugins/xas.pl
 @dirrmtry lib/xchat/plugins
 @dirrmtry lib/xchat
@@ -241,3 +240,4 @@ lib/xchat/plugins/xas.pl
 %%PL_AMULEDAEMON%%bin/amulegui
 %%PL_AMULEDAEMON%%bin/amuled
 bin/amule
+@dirrmtry share/applications
diff --git a/net-p2p/amule/Makefile b/net-p2p/amule/Makefile
index d3f8c5b150a0..4c03a526eed1 100644
--- a/net-p2p/amule/Makefile
+++ b/net-p2p/amule/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	aMule
 PORTVERSION=	2.1.3
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	net-p2p
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	amule
diff --git a/net-p2p/amule/pkg-plist b/net-p2p/amule/pkg-plist
index 63f3714bb704..aacd1a4949a0 100644
--- a/net-p2p/amule/pkg-plist
+++ b/net-p2p/amule/pkg-plist
@@ -39,195 +39,194 @@ share/locale/sl/LC_MESSAGES/amule.mo
 @dirrmtry share/locale/it_CH
 @dirrmtry share/locale/ko_KR/LC_MESSAGES
 @dirrmtry share/locale/ko_KR
-share/gnome/doc/aMule-2.1.3/ABOUT-NLS
-share/gnome/doc/aMule-2.1.3/amulesig.txt
-share/gnome/doc/aMule-2.1.3/amule-win32.HOWTO.txt
-share/gnome/doc/aMule-2.1.3/Changelog
-share/gnome/doc/aMule-2.1.3/Doxyfile
-share/gnome/doc/aMule-2.1.3/ED2K-Links.HOWTO
-share/gnome/doc/aMule-2.1.3/INSTALL
-share/gnome/doc/aMule-2.1.3/license.txt
-share/gnome/doc/aMule-2.1.3/README
-share/gnome/doc/aMule-2.1.3/TODO
-share/gnome/doc/aMule-2.1.3/EC_Protocol.txt
-share/gnome/doc/aMule-2.1.3/socks4.protocol
-@dirrmtry share/gnome/doc/aMule-2.1.3
-@dirrmtry share/gnome/doc
-%%PL_CAS%%share/gnome/cas/tmp.html
-%%PL_CAS%%share/gnome/cas/stat.png
-%%PL_CAS%%@dirrmtry share/gnome/cas
-%%PL_CAS%%share/gnome/pixmaps/wxcas.xpm
-%%PL_ALC%%share/gnome/pixmaps/alc.xpm
-share/gnome/pixmaps/amule.xpm
-@dirrmtry share/gnome/pixmaps
-%%PL_CAS%%share/gnome/applications/wxcas.desktop
-%%PL_ALC%%share/gnome/applications/alc.desktop
-share/gnome/applications/amule.desktop
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/aMule.tmpl
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/add_server.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/arrow_down.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/arrow_right.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/arrow_up.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/back.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/black.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/blue1.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/blue2.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/blue3.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/blue4.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/blue5.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/blue6.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/cp_download.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/cp_kad.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/cp_search.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/cp_servers.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/cp_settings.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/cp_shared.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/cp_stats.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/emule.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/green.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/greenpercent.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/l_cancel.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/l_connect.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/l_down.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/l_ed2klink.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/l_info.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/l_pause.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/l_resume.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/l_up.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/log.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/logo.jpg
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/red.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/transparent.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/yellow.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/phpamule.png
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/tree-leaf.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/tree-open.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/tree-closed.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/favicon.ico
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/downloads.php
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/preferences.php
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/search.php
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/servers.php
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/shared.php
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/stat_graphs.php
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/stat_tree.php
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/login.php
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/index.php
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/amuleweb-main-dload.php
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/amuleweb-main-search.php
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/amuleweb-main-servers.php
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/amuleweb-main-shared.php
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/amuleweb-main-stats.php
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/amuleweb-main-prefs.php
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/amuleweb-main-kad.php
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/stats.php
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/stats_tree.php
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/top.html
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/footer.php
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/login.php
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/tree-open.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/tree-closed.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/tree-leaf.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/toolbutton-reload.jpeg
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/toolbutton-search.jpeg
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/toolbutton-search-pressed.jpeg
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/toolbutton-servers.jpeg
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/toolbutton-servers-pressed.jpeg
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/toolbutton-settings.jpeg
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/toolbutton-settings-pressed.jpeg
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/toolbutton-shared.jpeg
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/toolbutton-shared-pressed.jpeg
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/toolbutton-download.jpeg
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/toolbutton-download-pressed.jpeg
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/toolbutton-kad.jpeg
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/toolbutton-kad-pressed.jpeg
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/toolbutton-stats.jpeg
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/toolbutton-stats-pressed.jpeg
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/toolbutton-connect.jpeg
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/toolbutton-logout.jpeg
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/toolbutton-logout-pressed.jpeg
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/toolbutton-filter.jpeg
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/connect.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/cancel.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/arrow-r.png
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/up.jpeg
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/down.jpeg
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/pause.jpeg
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/resume.jpeg
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/apply.jpeg
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/delete.jpeg
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/phpamule.png
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/favicon.ico
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/index.html
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/aMule.tmpl
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/add_server.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/arrow_down.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/arrow_down_logout.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/arrow_right.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/arrow_up.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/back.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/black.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/blank1x1.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/blue1.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/blue2.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/blue3.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/blue4.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/blue5.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/blue6.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/cp_download.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/cp_kad.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/cp_search.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/cp_servers.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/cp_settings.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/cp_shared.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/log.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/cp_stats.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/emule.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/green.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/greenpercent.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/l_cancel.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/l_connect.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/l_down.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/l_ed2klink.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/l_info.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/l_pause.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/l_resume.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/l_up.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/login_bottom.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/login_downmain.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/login_lefttop.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/login_righttop.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/login_top.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/login_topdown.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/login_topseperator.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/logo.jpg
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/main_bg.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/main_top_bg.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/main_topbar.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/main_topbardarker.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/main_topbarseperator.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/red.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/transparent.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/yellow.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/phpamule.png
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/tree-leaf.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/tree-open.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/tree-closed.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/favicon.ico
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/downloads.php
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/preferences.php
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/search.php
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/servers.php
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/shared.php
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/stat_graphs.php
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/stat_tree.php
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/login.php
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/index.php
-%%PL_AMULEWEBSRV%%@dirrmtry share/gnome/amule/webserver/default
-%%PL_AMULEWEBSRV%%@dirrmtry share/gnome/amule/webserver/php-default
-%%PL_AMULEWEBSRV%%@dirrmtry share/gnome/amule/webserver/chicane
-%%PL_AMULEWEBSRV%%@dirrmtry share/gnome/amule/webserver
-%%PL_AMULEWEBSRV%%@dirrmtry share/gnome/amule
+share/doc/aMule-2.1.3/ABOUT-NLS
+share/doc/aMule-2.1.3/amulesig.txt
+share/doc/aMule-2.1.3/amule-win32.HOWTO.txt
+share/doc/aMule-2.1.3/Changelog
+share/doc/aMule-2.1.3/Doxyfile
+share/doc/aMule-2.1.3/ED2K-Links.HOWTO
+share/doc/aMule-2.1.3/INSTALL
+share/doc/aMule-2.1.3/license.txt
+share/doc/aMule-2.1.3/README
+share/doc/aMule-2.1.3/TODO
+share/doc/aMule-2.1.3/EC_Protocol.txt
+share/doc/aMule-2.1.3/socks4.protocol
+@dirrmtry share/doc/aMule-2.1.3
+@dirrmtry share/doc
+%%PL_CAS%%share/cas/tmp.html
+%%PL_CAS%%share/cas/stat.png
+%%PL_CAS%%@dirrmtry share/cas
+%%PL_CAS%%share/pixmaps/wxcas.xpm
+%%PL_ALC%%share/pixmaps/alc.xpm
+share/pixmaps/amule.xpm
+%%PL_CAS%%share/applications/wxcas.desktop
+%%PL_ALC%%share/applications/alc.desktop
+share/applications/amule.desktop
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/aMule.tmpl
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/add_server.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/arrow_down.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/arrow_right.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/arrow_up.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/back.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/black.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/blue1.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/blue2.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/blue3.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/blue4.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/blue5.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/blue6.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/cp_download.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/cp_kad.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/cp_search.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/cp_servers.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/cp_settings.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/cp_shared.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/cp_stats.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/emule.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/green.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/greenpercent.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/l_cancel.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/l_connect.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/l_down.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/l_ed2klink.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/l_info.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/l_pause.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/l_resume.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/l_up.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/log.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/logo.jpg
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/red.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/transparent.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/yellow.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/phpamule.png
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/tree-leaf.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/tree-open.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/tree-closed.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/favicon.ico
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/downloads.php
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/preferences.php
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/search.php
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/servers.php
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/shared.php
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/stat_graphs.php
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/stat_tree.php
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/login.php
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/index.php
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/amuleweb-main-dload.php
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/amuleweb-main-search.php
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/amuleweb-main-servers.php
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/amuleweb-main-shared.php
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/amuleweb-main-stats.php
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/amuleweb-main-prefs.php
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/amuleweb-main-kad.php
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/stats.php
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/stats_tree.php
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/top.html
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/footer.php
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/login.php
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/tree-open.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/tree-closed.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/tree-leaf.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/toolbutton-reload.jpeg
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/toolbutton-search.jpeg
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/toolbutton-search-pressed.jpeg
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/toolbutton-servers.jpeg
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/toolbutton-servers-pressed.jpeg
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/toolbutton-settings.jpeg
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/toolbutton-settings-pressed.jpeg
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/toolbutton-shared.jpeg
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/toolbutton-shared-pressed.jpeg
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/toolbutton-download.jpeg
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/toolbutton-download-pressed.jpeg
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/toolbutton-kad.jpeg
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/toolbutton-kad-pressed.jpeg
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/toolbutton-stats.jpeg
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/toolbutton-stats-pressed.jpeg
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/toolbutton-connect.jpeg
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/toolbutton-logout.jpeg
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/toolbutton-logout-pressed.jpeg
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/toolbutton-filter.jpeg
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/connect.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/cancel.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/arrow-r.png
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/up.jpeg
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/down.jpeg
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/pause.jpeg
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/resume.jpeg
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/apply.jpeg
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/delete.jpeg
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/phpamule.png
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/favicon.ico
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/index.html
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/aMule.tmpl
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/add_server.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/arrow_down.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/arrow_down_logout.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/arrow_right.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/arrow_up.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/back.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/black.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/blank1x1.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/blue1.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/blue2.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/blue3.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/blue4.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/blue5.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/blue6.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/cp_download.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/cp_kad.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/cp_search.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/cp_servers.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/cp_settings.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/cp_shared.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/log.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/cp_stats.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/emule.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/green.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/greenpercent.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/l_cancel.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/l_connect.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/l_down.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/l_ed2klink.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/l_info.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/l_pause.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/l_resume.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/l_up.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/login_bottom.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/login_downmain.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/login_lefttop.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/login_righttop.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/login_top.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/login_topdown.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/login_topseperator.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/logo.jpg
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/main_bg.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/main_top_bg.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/main_topbar.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/main_topbardarker.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/main_topbarseperator.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/red.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/transparent.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/yellow.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/phpamule.png
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/tree-leaf.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/tree-open.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/tree-closed.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/favicon.ico
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/downloads.php
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/preferences.php
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/search.php
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/servers.php
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/shared.php
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/stat_graphs.php
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/stat_tree.php
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/login.php
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/index.php
+%%PL_AMULEWEBSRV%%@dirrmtry share/amule/webserver/default
+%%PL_AMULEWEBSRV%%@dirrmtry share/amule/webserver/php-default
+%%PL_AMULEWEBSRV%%@dirrmtry share/amule/webserver/chicane
+%%PL_AMULEWEBSRV%%@dirrmtry share/amule/webserver
+%%PL_AMULEWEBSRV%%@dirrmtry share/amule
 lib/xchat/plugins/xas.pl
 @dirrmtry lib/xchat/plugins
 @dirrmtry lib/xchat
@@ -241,3 +240,4 @@ lib/xchat/plugins/xas.pl
 %%PL_AMULEDAEMON%%bin/amulegui
 %%PL_AMULEDAEMON%%bin/amuled
 bin/amule
+@dirrmtry share/applications
diff --git a/net-p2p/amule2/Makefile b/net-p2p/amule2/Makefile
index d3f8c5b150a0..4c03a526eed1 100644
--- a/net-p2p/amule2/Makefile
+++ b/net-p2p/amule2/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	aMule
 PORTVERSION=	2.1.3
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	net-p2p
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	amule
diff --git a/net-p2p/amule2/pkg-plist b/net-p2p/amule2/pkg-plist
index 63f3714bb704..aacd1a4949a0 100644
--- a/net-p2p/amule2/pkg-plist
+++ b/net-p2p/amule2/pkg-plist
@@ -39,195 +39,194 @@ share/locale/sl/LC_MESSAGES/amule.mo
 @dirrmtry share/locale/it_CH
 @dirrmtry share/locale/ko_KR/LC_MESSAGES
 @dirrmtry share/locale/ko_KR
-share/gnome/doc/aMule-2.1.3/ABOUT-NLS
-share/gnome/doc/aMule-2.1.3/amulesig.txt
-share/gnome/doc/aMule-2.1.3/amule-win32.HOWTO.txt
-share/gnome/doc/aMule-2.1.3/Changelog
-share/gnome/doc/aMule-2.1.3/Doxyfile
-share/gnome/doc/aMule-2.1.3/ED2K-Links.HOWTO
-share/gnome/doc/aMule-2.1.3/INSTALL
-share/gnome/doc/aMule-2.1.3/license.txt
-share/gnome/doc/aMule-2.1.3/README
-share/gnome/doc/aMule-2.1.3/TODO
-share/gnome/doc/aMule-2.1.3/EC_Protocol.txt
-share/gnome/doc/aMule-2.1.3/socks4.protocol
-@dirrmtry share/gnome/doc/aMule-2.1.3
-@dirrmtry share/gnome/doc
-%%PL_CAS%%share/gnome/cas/tmp.html
-%%PL_CAS%%share/gnome/cas/stat.png
-%%PL_CAS%%@dirrmtry share/gnome/cas
-%%PL_CAS%%share/gnome/pixmaps/wxcas.xpm
-%%PL_ALC%%share/gnome/pixmaps/alc.xpm
-share/gnome/pixmaps/amule.xpm
-@dirrmtry share/gnome/pixmaps
-%%PL_CAS%%share/gnome/applications/wxcas.desktop
-%%PL_ALC%%share/gnome/applications/alc.desktop
-share/gnome/applications/amule.desktop
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/aMule.tmpl
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/add_server.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/arrow_down.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/arrow_right.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/arrow_up.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/back.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/black.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/blue1.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/blue2.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/blue3.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/blue4.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/blue5.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/blue6.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/cp_download.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/cp_kad.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/cp_search.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/cp_servers.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/cp_settings.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/cp_shared.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/cp_stats.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/emule.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/green.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/greenpercent.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/l_cancel.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/l_connect.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/l_down.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/l_ed2klink.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/l_info.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/l_pause.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/l_resume.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/l_up.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/log.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/logo.jpg
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/red.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/transparent.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/yellow.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/phpamule.png
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/tree-leaf.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/tree-open.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/tree-closed.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/favicon.ico
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/downloads.php
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/preferences.php
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/search.php
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/servers.php
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/shared.php
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/stat_graphs.php
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/stat_tree.php
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/login.php
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/index.php
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/amuleweb-main-dload.php
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/amuleweb-main-search.php
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/amuleweb-main-servers.php
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/amuleweb-main-shared.php
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/amuleweb-main-stats.php
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/amuleweb-main-prefs.php
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/amuleweb-main-kad.php
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/stats.php
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/stats_tree.php
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/top.html
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/footer.php
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/login.php
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/tree-open.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/tree-closed.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/tree-leaf.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/toolbutton-reload.jpeg
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/toolbutton-search.jpeg
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/toolbutton-search-pressed.jpeg
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/toolbutton-servers.jpeg
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/toolbutton-servers-pressed.jpeg
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/toolbutton-settings.jpeg
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/toolbutton-settings-pressed.jpeg
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/toolbutton-shared.jpeg
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/toolbutton-shared-pressed.jpeg
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/toolbutton-download.jpeg
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/toolbutton-download-pressed.jpeg
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/toolbutton-kad.jpeg
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/toolbutton-kad-pressed.jpeg
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/toolbutton-stats.jpeg
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/toolbutton-stats-pressed.jpeg
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/toolbutton-connect.jpeg
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/toolbutton-logout.jpeg
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/toolbutton-logout-pressed.jpeg
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/toolbutton-filter.jpeg
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/connect.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/cancel.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/arrow-r.png
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/up.jpeg
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/down.jpeg
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/pause.jpeg
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/resume.jpeg
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/apply.jpeg
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/delete.jpeg
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/phpamule.png
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/favicon.ico
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/index.html
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/aMule.tmpl
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/add_server.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/arrow_down.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/arrow_down_logout.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/arrow_right.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/arrow_up.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/back.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/black.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/blank1x1.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/blue1.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/blue2.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/blue3.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/blue4.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/blue5.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/blue6.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/cp_download.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/cp_kad.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/cp_search.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/cp_servers.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/cp_settings.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/cp_shared.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/log.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/cp_stats.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/emule.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/green.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/greenpercent.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/l_cancel.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/l_connect.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/l_down.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/l_ed2klink.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/l_info.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/l_pause.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/l_resume.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/l_up.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/login_bottom.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/login_downmain.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/login_lefttop.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/login_righttop.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/login_top.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/login_topdown.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/login_topseperator.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/logo.jpg
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/main_bg.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/main_top_bg.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/main_topbar.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/main_topbardarker.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/main_topbarseperator.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/red.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/transparent.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/yellow.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/phpamule.png
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/tree-leaf.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/tree-open.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/tree-closed.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/favicon.ico
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/downloads.php
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/preferences.php
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/search.php
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/servers.php
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/shared.php
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/stat_graphs.php
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/stat_tree.php
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/login.php
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/index.php
-%%PL_AMULEWEBSRV%%@dirrmtry share/gnome/amule/webserver/default
-%%PL_AMULEWEBSRV%%@dirrmtry share/gnome/amule/webserver/php-default
-%%PL_AMULEWEBSRV%%@dirrmtry share/gnome/amule/webserver/chicane
-%%PL_AMULEWEBSRV%%@dirrmtry share/gnome/amule/webserver
-%%PL_AMULEWEBSRV%%@dirrmtry share/gnome/amule
+share/doc/aMule-2.1.3/ABOUT-NLS
+share/doc/aMule-2.1.3/amulesig.txt
+share/doc/aMule-2.1.3/amule-win32.HOWTO.txt
+share/doc/aMule-2.1.3/Changelog
+share/doc/aMule-2.1.3/Doxyfile
+share/doc/aMule-2.1.3/ED2K-Links.HOWTO
+share/doc/aMule-2.1.3/INSTALL
+share/doc/aMule-2.1.3/license.txt
+share/doc/aMule-2.1.3/README
+share/doc/aMule-2.1.3/TODO
+share/doc/aMule-2.1.3/EC_Protocol.txt
+share/doc/aMule-2.1.3/socks4.protocol
+@dirrmtry share/doc/aMule-2.1.3
+@dirrmtry share/doc
+%%PL_CAS%%share/cas/tmp.html
+%%PL_CAS%%share/cas/stat.png
+%%PL_CAS%%@dirrmtry share/cas
+%%PL_CAS%%share/pixmaps/wxcas.xpm
+%%PL_ALC%%share/pixmaps/alc.xpm
+share/pixmaps/amule.xpm
+%%PL_CAS%%share/applications/wxcas.desktop
+%%PL_ALC%%share/applications/alc.desktop
+share/applications/amule.desktop
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/aMule.tmpl
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/add_server.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/arrow_down.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/arrow_right.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/arrow_up.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/back.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/black.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/blue1.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/blue2.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/blue3.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/blue4.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/blue5.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/blue6.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/cp_download.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/cp_kad.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/cp_search.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/cp_servers.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/cp_settings.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/cp_shared.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/cp_stats.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/emule.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/green.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/greenpercent.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/l_cancel.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/l_connect.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/l_down.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/l_ed2klink.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/l_info.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/l_pause.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/l_resume.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/l_up.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/log.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/logo.jpg
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/red.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/transparent.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/yellow.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/phpamule.png
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/tree-leaf.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/tree-open.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/tree-closed.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/favicon.ico
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/downloads.php
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/preferences.php
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/search.php
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/servers.php
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/shared.php
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/stat_graphs.php
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/stat_tree.php
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/login.php
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/index.php
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/amuleweb-main-dload.php
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/amuleweb-main-search.php
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/amuleweb-main-servers.php
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/amuleweb-main-shared.php
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/amuleweb-main-stats.php
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/amuleweb-main-prefs.php
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/amuleweb-main-kad.php
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/stats.php
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/stats_tree.php
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/top.html
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/footer.php
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/login.php
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/tree-open.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/tree-closed.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/tree-leaf.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/toolbutton-reload.jpeg
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/toolbutton-search.jpeg
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/toolbutton-search-pressed.jpeg
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/toolbutton-servers.jpeg
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/toolbutton-servers-pressed.jpeg
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/toolbutton-settings.jpeg
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/toolbutton-settings-pressed.jpeg
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/toolbutton-shared.jpeg
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/toolbutton-shared-pressed.jpeg
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/toolbutton-download.jpeg
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/toolbutton-download-pressed.jpeg
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/toolbutton-kad.jpeg
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/toolbutton-kad-pressed.jpeg
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/toolbutton-stats.jpeg
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/toolbutton-stats-pressed.jpeg
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/toolbutton-connect.jpeg
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/toolbutton-logout.jpeg
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/toolbutton-logout-pressed.jpeg
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/toolbutton-filter.jpeg
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/connect.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/cancel.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/arrow-r.png
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/up.jpeg
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/down.jpeg
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/pause.jpeg
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/resume.jpeg
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/apply.jpeg
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/delete.jpeg
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/phpamule.png
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/favicon.ico
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/index.html
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/aMule.tmpl
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/add_server.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/arrow_down.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/arrow_down_logout.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/arrow_right.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/arrow_up.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/back.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/black.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/blank1x1.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/blue1.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/blue2.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/blue3.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/blue4.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/blue5.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/blue6.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/cp_download.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/cp_kad.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/cp_search.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/cp_servers.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/cp_settings.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/cp_shared.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/log.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/cp_stats.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/emule.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/green.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/greenpercent.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/l_cancel.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/l_connect.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/l_down.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/l_ed2klink.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/l_info.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/l_pause.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/l_resume.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/l_up.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/login_bottom.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/login_downmain.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/login_lefttop.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/login_righttop.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/login_top.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/login_topdown.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/login_topseperator.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/logo.jpg
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/main_bg.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/main_top_bg.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/main_topbar.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/main_topbardarker.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/main_topbarseperator.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/red.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/transparent.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/yellow.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/phpamule.png
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/tree-leaf.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/tree-open.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/tree-closed.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/favicon.ico
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/downloads.php
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/preferences.php
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/search.php
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/servers.php
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/shared.php
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/stat_graphs.php
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/stat_tree.php
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/login.php
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/index.php
+%%PL_AMULEWEBSRV%%@dirrmtry share/amule/webserver/default
+%%PL_AMULEWEBSRV%%@dirrmtry share/amule/webserver/php-default
+%%PL_AMULEWEBSRV%%@dirrmtry share/amule/webserver/chicane
+%%PL_AMULEWEBSRV%%@dirrmtry share/amule/webserver
+%%PL_AMULEWEBSRV%%@dirrmtry share/amule
 lib/xchat/plugins/xas.pl
 @dirrmtry lib/xchat/plugins
 @dirrmtry lib/xchat
@@ -241,3 +240,4 @@ lib/xchat/plugins/xas.pl
 %%PL_AMULEDAEMON%%bin/amulegui
 %%PL_AMULEDAEMON%%bin/amuled
 bin/amule
+@dirrmtry share/applications
diff --git a/net-p2p/dctc-gui/Makefile b/net-p2p/dctc-gui/Makefile
index a9a588cde699..255b969c2814 100644
--- a/net-p2p/dctc-gui/Makefile
+++ b/net-p2p/dctc-gui/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	dctc
 PORTVERSION=	0.66
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	net-p2p gnome
 MASTER_SITES=	http://unixpages.org/distfiles/
 PKGNAMESUFFIX=	-gui
diff --git a/net-p2p/dctc-gui/pkg-plist b/net-p2p/dctc-gui/pkg-plist
index 6bccd6512052..a171e8456de3 100644
--- a/net-p2p/dctc-gui/pkg-plist
+++ b/net-p2p/dctc-gui/pkg-plist
@@ -9,25 +9,25 @@ share/gnome/help/dc_gui/es/index.html
 share/gnome/help/dc_gui/es/topic.dat
 share/gnome/help/dc_gui/nl/index.html
 share/gnome/help/dc_gui/nl/topic.dat
-share/gnome/pixmaps/dc_gui/icon_folder_add.xpm
-share/gnome/pixmaps/dc_gui/icon_folder_del.xpm
-share/gnome/pixmaps/dc_gui/icon_kill.xpm
-share/gnome/pixmaps/dc_gui/icon_refresh.xpm
-share/gnome/pixmaps/dc_gui/icon_remove_all.xpm
-share/gnome/pixmaps/dc_gui/icon_remove_selected.xpm
 share/locale/de/LC_MESSAGES/dc_gui.mo
 share/locale/fr/LC_MESSAGES/dc_gui.mo
 share/locale/nl/LC_MESSAGES/dc_gui.mo
 share/locale/sv/LC_MESSAGES/dc_gui.mo
-@unexec %D/share/locale/sv/LC_MESSAGES 2>/dev/null || true
-@unexec %D/share/locale/sv 2>/dev/null || true
-@unexec %D/share/locale/nl/LC_MESSAGES 2>/dev/null || true
-@unexec %D/share/locale/nl 2>/dev/null || true
-@unexec %D/share/locale/fr/LC_MESSAGES 2>/dev/null || true
-@unexec %D/share/locale/fr 2>/dev/null || true
-@unexec %D/share/locale/de/LC_MESSAGES 2>/dev/null || true
-@unexec %D/share/locale/de 2>/dev/null || true
-@dirrm share/gnome/pixmaps/dc_gui
+share/pixmaps/dc_gui/icon_folder_add.xpm
+share/pixmaps/dc_gui/icon_folder_del.xpm
+share/pixmaps/dc_gui/icon_kill.xpm
+share/pixmaps/dc_gui/icon_refresh.xpm
+share/pixmaps/dc_gui/icon_remove_all.xpm
+share/pixmaps/dc_gui/icon_remove_selected.xpm
+@dirrm share/pixmaps/dc_gui
+@dirrmtry share/locale/sv/LC_MESSAGES 
+@dirrmtry share/locale/sv 
+@dirrmtry share/locale/nl/LC_MESSAGES 
+@dirrmtry share/locale/nl 
+@dirrmtry share/locale/fr/LC_MESSAGES 
+@dirrmtry share/locale/fr 
+@dirrmtry share/locale/de/LC_MESSAGES 
+@dirrmtry share/locale/de 
 @dirrmtry share/gnome/help/dc_gui/nl/images
 @dirrm share/gnome/help/dc_gui/nl
 @dirrmtry share/gnome/help/dc_gui/es/images
diff --git a/net-p2p/fidelio/Makefile b/net-p2p/fidelio/Makefile
index 3330cc371c34..8ed826972259 100644
--- a/net-p2p/fidelio/Makefile
+++ b/net-p2p/fidelio/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	fidelio
 PORTVERSION=	1.0.b1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	net-p2p gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/net-p2p/fidelio/pkg-plist b/net-p2p/fidelio/pkg-plist
index 823d88297311..38eec7542de2 100644
--- a/net-p2p/fidelio/pkg-plist
+++ b/net-p2p/fidelio/pkg-plist
@@ -1,5 +1,5 @@
 bin/fidelio
-share/gnome/fidelio.default
+share/fidelio.default
 share/locale/de/LC_MESSAGES/fidelio.mo
 share/locale/el/LC_MESSAGES/fidelio.mo
 share/locale/fr/LC_MESSAGES/fidelio.mo
diff --git a/net-p2p/giftoxic/Makefile b/net-p2p/giftoxic/Makefile
index 57a8bab2962b..871b526ff031 100644
--- a/net-p2p/giftoxic/Makefile
+++ b/net-p2p/giftoxic/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	giFToxic
 PORTVERSION=	0.0.9
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	net-p2p
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	giftoxic
diff --git a/net-p2p/giftoxic/pkg-plist b/net-p2p/giftoxic/pkg-plist
index a570dc6a9ff2..32a4bb571ed3 100644
--- a/net-p2p/giftoxic/pkg-plist
+++ b/net-p2p/giftoxic/pkg-plist
@@ -1,8 +1,9 @@
 bin/giFToxic
-share/gnome/applications/giFToxic.desktop
-share/gnome/giFToxic/logo.png
-share/gnome/pixmaps/giFToxic-48.png
+share/applications/giFToxic.desktop
+share/giFToxic/logo.png
+share/pixmaps/giFToxic-48.png
 share/locale/de/LC_MESSAGES/giFToxic.mo
 share/locale/es/LC_MESSAGES/giFToxic.mo
 share/locale/nl/LC_MESSAGES/giFToxic.mo
-@dirrm share/gnome/giFToxic
+@dirrm share/giFToxic
+@dirrmtry share/applications
diff --git a/net-p2p/giftui/Makefile b/net-p2p/giftui/Makefile
index 668eec258fff..d9f7d57211a5 100644
--- a/net-p2p/giftui/Makefile
+++ b/net-p2p/giftui/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	giFTui
 PORTVERSION=	0.4.1
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	net-p2p
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	giftui
diff --git a/net-p2p/giftui/pkg-plist b/net-p2p/giftui/pkg-plist
index c52cc2709cdb..40cabc74bffb 100644
--- a/net-p2p/giftui/pkg-plist
+++ b/net-p2p/giftui/pkg-plist
@@ -1,21 +1,22 @@
 bin/giftui
-share/gnome/applications/giftui.desktop
-share/gnome/giftui/icons/fasttrack-down.png
-share/gnome/giftui/icons/fasttrack-network.png
-share/gnome/giftui/icons/fasttrack-search.png
-share/gnome/giftui/icons/fasttrack-up.png
-share/gnome/giftui/icons/gnutella-down.png
-share/gnome/giftui/icons/gnutella-network.png
-share/gnome/giftui/icons/gnutella-search.png
-share/gnome/giftui/icons/gnutella-up.png
-share/gnome/giftui/icons/openft-down.png
-share/gnome/giftui/icons/openft-network.png
-share/gnome/giftui/icons/openft-search.png
-share/gnome/giftui/icons/openft-up.png
-share/gnome/giftui/icons/opennap-down.png
-share/gnome/giftui/icons/opennap-network.png
-share/gnome/giftui/icons/opennap-search.png
-share/gnome/giftui/icons/opennap-up.png
-share/gnome/pixmaps/giftui.png
-@dirrm share/gnome/giftui/icons
-@dirrm share/gnome/giftui
+share/applications/giftui.desktop
+share/giftui/icons/fasttrack-down.png
+share/giftui/icons/fasttrack-network.png
+share/giftui/icons/fasttrack-search.png
+share/giftui/icons/fasttrack-up.png
+share/giftui/icons/gnutella-down.png
+share/giftui/icons/gnutella-network.png
+share/giftui/icons/gnutella-search.png
+share/giftui/icons/gnutella-up.png
+share/giftui/icons/openft-down.png
+share/giftui/icons/openft-network.png
+share/giftui/icons/openft-search.png
+share/giftui/icons/openft-up.png
+share/giftui/icons/opennap-down.png
+share/giftui/icons/opennap-network.png
+share/giftui/icons/opennap-search.png
+share/giftui/icons/opennap-up.png
+share/pixmaps/giftui.png
+@dirrm share/giftui/icons
+@dirrm share/giftui
+@dirrmtry share/applications
diff --git a/net-p2p/gtorrentviewer/Makefile b/net-p2p/gtorrentviewer/Makefile
index 3692ee214524..04ecda575b90 100644
--- a/net-p2p/gtorrentviewer/Makefile
+++ b/net-p2p/gtorrentviewer/Makefile
@@ -3,11 +3,12 @@
 # Whom:			Michael Johnson <ahze@ahze.net>
 #
 # $FreeBSD$
-#    $MCom: ports/net-p2p/gtorrentviewer/Makefile,v 1.2 2006/09/30 01:22:35 ahze Exp $
+#   $MCom: ports/net-p2p/gtorrentviewer/Makefile,v 1.4 2007/08/06 17:16:29 mezz Exp $
+#
 
 PORTNAME=	gtorrentviewer
 PORTVERSION=	0.2b
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	net-p2p
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -25,8 +26,8 @@ GNU_CONFIGURE=	yes
 USE_GETOPT_LONG=yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
-CONFIGURE_ARGS=	--with-pixmapsdir=${PREFIX}/share/gnome/pixmaps \
-		--with-desktopdir=${PREFIX}/share/gnome/applications
+CONFIGURE_ARGS=	--with-pixmapsdir=${PREFIX}/share/pixmaps \
+		--with-desktopdir=${PREFIX}/share/applications
 
 MAN1=		gtorrentviewer.1
 DOCS=		AUTHORS COPYING ChangeLog README
diff --git a/net-p2p/gtorrentviewer/pkg-plist b/net-p2p/gtorrentviewer/pkg-plist
index d09d2ed6ce57..5fccb68c11b9 100644
--- a/net-p2p/gtorrentviewer/pkg-plist
+++ b/net-p2p/gtorrentviewer/pkg-plist
@@ -16,9 +16,10 @@ share/GTorrentViewer/pixmaps/warning.png
 %%PORTDOCS%%%%DOCSDIR%%/COPYING
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
 %%PORTDOCS%%%%DOCSDIR%%/README
-share/gnome/applications/gtorrentviewer.desktop
-share/gnome/pixmaps/gtorrentviewer.png
-share/gnome/pixmaps/gtorrentviewer.xpm
+share/applications/gtorrentviewer.desktop
+share/pixmaps/gtorrentviewer.png
+share/pixmaps/gtorrentviewer.xpm
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm share/GTorrentViewer/pixmaps
 @dirrm share/GTorrentViewer
+@dirrmtry share/applications
diff --git a/net-p2p/xmule/Makefile b/net-p2p/xmule/Makefile
index 7d61e9f4103e..c9daf955d9c9 100644
--- a/net-p2p/xmule/Makefile
+++ b/net-p2p/xmule/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xmule
 PORTVERSION=	1.12.2
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	net-p2p
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
 #MASTER_SITES=	http://download.berlios.de/%SUBDIR%/
diff --git a/net-p2p/xmule/pkg-plist b/net-p2p/xmule/pkg-plist
index 2a4a5d69d73f..0a897333fb59 100644
--- a/net-p2p/xmule/pkg-plist
+++ b/net-p2p/xmule/pkg-plist
@@ -1,7 +1,7 @@
 bin/xmule
 bin/xmule-ed2k-handler
-share/gnome/applications/xmule.desktop
-share/gnome/icons/xmule.xpm
+share/applications/xmule.desktop
+share/icons/xmule.xpm
 share/locale/de/LC_MESSAGES/xmule.mo
 share/locale/ee/LC_MESSAGES/xmule.mo
 share/locale/es/LC_MESSAGES/xmule.mo
@@ -11,4 +11,5 @@ share/locale/it/LC_MESSAGES/xmule.mo
 share/locale/ko/LC_MESSAGES/xmule.mo
 share/locale/pl/LC_MESSAGES/xmule.mo
 share/locale/tr/LC_MESSAGES/xmule.mo
-@dirrmtry share/gnome/locale
+@dirrmtry share/icons
+@dirrmtry share/applications
diff --git a/net/Makefile b/net/Makefile
index 3780109e23fd..d58317957fa2 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -39,6 +39,10 @@
     SUBDIR += astfax
     SUBDIR += atmsupport
     SUBDIR += avahi
+    SUBDIR += avahi-app
+    SUBDIR += avahi-autoipd
+    SUBDIR += avahi-gtk
+    SUBDIR += avahi-libdns
     SUBDIR += avahi-qt3
     SUBDIR += avahi-sharp
     SUBDIR += b2bua
@@ -122,6 +126,7 @@
     SUBDIR += etherboot
     SUBDIR += etrace
     SUBDIR += etunnel
+    SUBDIR += evolution-rss
     SUBDIR += findmtu
     SUBDIR += flowgrep
     SUBDIR += forg
diff --git a/net/avahi-app/Makefile b/net/avahi-app/Makefile
new file mode 100644
index 000000000000..d647f23e70ad
--- /dev/null
+++ b/net/avahi-app/Makefile
@@ -0,0 +1,135 @@
+# New ports collection makefile for:	avahi
+# Date created:		18 November 2005
+# Whom:			Joe Marcus Clarke <marcus@FreeBSD.org>
+#
+# $FreeBSD$
+#   $MCom: ports/net/avahi-app/Makefile,v 1.6 2007/08/26 06:10:14 marcus Exp $
+#
+
+PORTNAME=	avahi
+PORTVERSION=	0.6.21
+PORTREVISION?=	1
+CATEGORIES?=	net dns
+MASTER_SITES=	http://www.avahi.org/download/
+PKGNAMESUFFIX?=	-app
+
+MAINTAINER?=	gnome@FreeBSD.org
+COMMENT?=	Service discovery on a local network
+
+LIB_DEPENDS?=	expat.6:${PORTSDIR}/textproc/expat2 \
+		daemon.0:${PORTSDIR}/devel/libdaemon \
+		dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
+		gdbm.3:${PORTSDIR}/databases/gdbm
+
+USE_GNOME?=	gnomehack ltverhack glib20
+USE_GNOME_SUBR=	yes
+USE_GMAKE=	yes
+USE_AUTOTOOLS=	libtool:15
+USE_LDCONFIG=	yes
+USE_GETOPT_LONG=yes
+AVAHI_SLAVE?=	no
+CONFIGURE_ARGS?=--with-distro=freebsd \
+		--with-dbus-system-address=unix:path=/var/run/dbus/system_bus_socket \
+		--disable-monodoc \
+		--disable-doxygen-doc \
+		--disable-doxygen-dot \
+		--localstatedir=/var \
+		--enable-compat-howl
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -DHAVE_KQUEUE" \
+		LDFLAGS="-L${LOCALBASE}/lib" \
+		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
+		PTHREAD_LIBS="${PTHREAD_LIBS}"
+
+.if ${AVAHI_SLAVE}=="no"
+CONFLICTS=	howl-[0-9]*
+
+MAN1=	avahi-browse.1 avahi-publish.1 avahi-resolve.1 avahi-set-host-name.1
+MAN5=	avahi-daemon.conf.5 avahi.service.5 avahi.hosts.5
+MAN8=	avahi-daemon.8 avahi-dnsconfd.8 avahi-dnsconfd.action.8
+
+MLINKS=	avahi-browse.1 avahi-browse-domains.1 \
+	avahi-publish.1 avahi-publish-address.1 \
+	avahi-publish.1 avahi-publish-service.1 \
+	avahi-resolve.1 avahi-resolve-address.1 \
+	avahi-resolve.1 avahi-resolve-host-name.1
+.endif
+
+USE_RC_SUBR=yes
+
+.include <bsd.port.pre.mk>
+
+.if ${AVAHI_SLAVE}=="autoipd"
+CONFIGURE_ARGS+=--enable-autoipd
+.else
+CONFIGURE_ARGS+=--disable-autoipd
+.endif
+.if ${AVAHI_SLAVE}=="gtk"
+CONFIGURE_ARGS+=--enable-gtk
+.else
+CONFIGURE_ARGS+=--disable-gtk
+.endif
+.if ${AVAHI_SLAVE}=="libdns"
+CONFIGURE_ARGS+=--enable-compat-libdns_sd
+.else
+CONFIGURE_ARGS+=--disable-compat-libdns_sd
+.endif
+.if ${AVAHI_SLAVE}=="python"
+CONFIGURE_ARGS+=--enable-python
+.else
+CONFIGURE_ARGS+=--disable-python
+.endif
+.if ${AVAHI_SLAVE}=="qt3"
+CONFIGURE_ARGS+=--enable-qt3
+.else
+CONFIGURE_ARGS+=--disable-qt3
+.endif
+.if ${AVAHI_SLAVE}=="qt4"
+CONFIGURE_ARGS+=--enable-qt4
+.else
+CONFIGURE_ARGS+=--disable-qt4
+.endif
+.if ${AVAHI_SLAVE}=="sharp"
+CONFIGURE_ARGS+=--enable-mono
+.else
+CONFIGURE_ARGS+=--disable-mono
+.endif
+
+post-patch: avahi-post-patch
+
+avahi-post-patch:
+	@${REINPLACE_CMD} -e 's|/etc|${PREFIX}/etc|' \
+		${WRKSRC}/man/*.*
+	@${RM} -f ${WRKSRC}/man/*.bak
+	@${REINPLACE_CMD} -e 's|-ldl||g ; s|netdev|network|g' \
+		${WRKSRC}/configure \
+		${WRKSRC}/avahi-client/Makefile.in \
+		${WRKSRC}/avahi-daemon/Makefile.in
+	@${REINPLACE_CMD} -e 's|%%RC_SUBR%%|${RC_SUBR}| ; \
+	    	s|%%GNOME_SUBR%%|${GNOME_SUBR}|' \
+		${WRKSRC}/initscript/freebsd/avahi-dnsconfd.sh.in \
+		${WRKSRC}/initscript/freebsd/avahi-daemon.sh.in
+
+post-build: avahi-post-build
+
+avahi-post-build:
+.for f in ${AVAHI_PKGCONFIG}
+	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} \
+		${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${f}
+.endfor
+
+post-install: avahi-post-install
+
+avahi-post-install:
+.if ${AVAHI_SLAVE}!="no"
+.for f in ${MAN1} ${MAN2} ${MAN3} ${MAN4} ${MAN5} ${MAN6} ${MAN7} ${MAN8} ${MAN9}
+	${INSTALL_DATA} ${WRKSRC}/man/${f} ${PREFIX}/man/man${f:E}/${f}
+.endfor
+.endif
+.for f in ${AVAHI_PKGCONFIG}
+	${INSTALL_DATA} ${WRKSRC}/${f} ${PREFIX}/libdata/pkgconfig
+.endfor
+.if !defined(PACKAGE_BUILDING) && (${AVAHI_SLAVE}=="no" || ${AVAHI_SLAVE}=="autoipd")
+	@${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/net/avahi/distinfo b/net/avahi-app/distinfo
index 2600f64c27fe..2600f64c27fe 100644
--- a/net/avahi/distinfo
+++ b/net/avahi-app/distinfo
diff --git a/net/avahi/files/patch-Makefile.in b/net/avahi-app/files/patch-Makefile.in
index 9c28621038bd..9c28621038bd 100644
--- a/net/avahi/files/patch-Makefile.in
+++ b/net/avahi-app/files/patch-Makefile.in
diff --git a/net/avahi/files/patch-avahi-client.pc.in b/net/avahi-app/files/patch-avahi-client.pc.in
index e980e52e0fe2..e980e52e0fe2 100644
--- a/net/avahi/files/patch-avahi-client.pc.in
+++ b/net/avahi-app/files/patch-avahi-client.pc.in
diff --git a/net/avahi/files/patch-avahi-common_dbus-watch-glue.c b/net/avahi-app/files/patch-avahi-common_dbus-watch-glue.c
index 1e148af8564c..1e148af8564c 100644
--- a/net/avahi/files/patch-avahi-common_dbus-watch-glue.c
+++ b/net/avahi-app/files/patch-avahi-common_dbus-watch-glue.c
diff --git a/net/avahi/files/patch-avahi-compat-howl.pc.in b/net/avahi-app/files/patch-avahi-compat-howl.pc.in
index f101cc1da5e3..f101cc1da5e3 100644
--- a/net/avahi/files/patch-avahi-compat-howl.pc.in
+++ b/net/avahi-app/files/patch-avahi-compat-howl.pc.in
diff --git a/net/avahi/files/patch-avahi-compat-libdns_sd.pc.in b/net/avahi-app/files/patch-avahi-compat-libdns_sd.pc.in
index 8487c1b5a298..8487c1b5a298 100644
--- a/net/avahi/files/patch-avahi-compat-libdns_sd.pc.in
+++ b/net/avahi-app/files/patch-avahi-compat-libdns_sd.pc.in
diff --git a/net/avahi-app/files/patch-avahi-compat-libdns_sd_Makefile.in b/net/avahi-app/files/patch-avahi-compat-libdns_sd_Makefile.in
new file mode 100644
index 000000000000..f111db2ab974
--- /dev/null
+++ b/net/avahi-app/files/patch-avahi-compat-libdns_sd_Makefile.in
@@ -0,0 +1,58 @@
+--- avahi-compat-libdns_sd/Makefile.in.orig	2007-07-31 12:31:07.000000000 -0400
++++ avahi-compat-libdns_sd/Makefile.in	2007-07-31 12:35:41.000000000 -0400
+@@ -101,17 +101,14 @@
+ null_test_OBJECTS = $(am_null_test_OBJECTS)
+ am__DEPENDENCIES_1 =
+ @ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@null_test_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+-@ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@	$(am__DEPENDENCIES_1) \
+-@ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@	../avahi-common/libavahi-common.la \
+-@ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@	../avahi-client/libavahi-client.la
++@ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@	$(am__DEPENDENCIES_1)
+ am__txt_test_SOURCES_DIST = dns_sd.h txt.c txt-test.c warn.c warn.h
+ @ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@am_txt_test_OBJECTS = txt_test-txt.$(OBJEXT) \
+ @ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@	txt_test-txt-test.$(OBJEXT) \
+ @ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@	txt_test-warn.$(OBJEXT)
+ txt_test_OBJECTS = $(am_txt_test_OBJECTS)
+ @ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@txt_test_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+-@ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@	$(am__DEPENDENCIES_1) \
+-@ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@	../avahi-common/libavahi-common.la
++@ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@	$(am__DEPENDENCIES_1)
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
+ am__depfiles_maybe = depfiles
+@@ -430,7 +427,7 @@
+ @ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@	warn.c warn.h
+ 
+ @ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@libdns_sd_la_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS)
+-@ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@libdns_sd_la_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -version-info $(LIBAVAHI_COMPAT_LIBDNS_SD_VERSION_INFO) $(PTHREAD_LIBS) $(PTHREAD_CFLAGS) ../avahi-common/libavahi-common.la ../avahi-client/libavahi-client.la
++@ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@libdns_sd_la_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -version-info $(LIBAVAHI_COMPAT_LIBDNS_SD_VERSION_INFO) $(PTHREAD_LIBS) $(PTHREAD_CFLAGS) `$(PKG_CONFIG) --libs --cflags avahi-client`
+ @ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@txt_test_SOURCES = \
+ @ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@	dns_sd.h \
+ @ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@	txt.c \
+@@ -438,7 +435,7 @@
+ @ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@	warn.c warn.h
+ 
+ @ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@txt_test_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS)
+-@ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@txt_test_LDADD = $(AM_LDADD) $(PTHREAD_LIBS) $(PTHREAD_CFLAGS) ../avahi-common/libavahi-common.la
++@ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@txt_test_LDADD = $(AM_LDADD) $(PTHREAD_LIBS) $(PTHREAD_CFLAGS) `$(PKG_CONFIG) --libs --cflags avahi-client`
+ @ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@null_test_SOURCES = \
+ @ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@	dns_sd.h \
+ @ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@	compat.c \
+@@ -446,7 +443,7 @@
+ @ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@	warn.c warn.h
+ 
+ @ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@null_test_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS)
+-@ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@null_test_LDADD = $(AM_LDADD) $(PTHREAD_LIBS) $(PTHREAD_CFLAGS) ../avahi-common/libavahi-common.la ../avahi-client/libavahi-client.la
++@ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@null_test_LDADD = $(AM_LDADD) $(PTHREAD_LIBS) $(PTHREAD_CFLAGS) `$(PKG_CONFIG) --libs --cflags avahi-client`
+ @ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@CLEANFILES = libdns_sd-test.o libdns_sd-test
+ all: all-am
+ 
+@@ -883,7 +880,7 @@
+ 
+ @ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@libdns_sd-test: libdns_sd-test.c libdns_sd.la
+ @ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@	$(LIBTOOL) --mode=compile $(CC) $(AM_CFLAGS) $(PTHREAD_CFLAGS) -o libdns_sd-test.o -c libdns_sd-test.c 
+-@ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@	$(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(PTHREAD_CFLAGS) -o libdns_sd-test libdns_sd-test.o $(PTHREAD_LIBS) ../avahi-common/libavahi-common.la libdns_sd.la 
++@ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@	$(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(PTHREAD_CFLAGS) -o libdns_sd-test libdns_sd-test.o $(PTHREAD_LIBS) libdns_sd.la 
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
diff --git a/net/avahi/files/patch-avahi-core.pc.in b/net/avahi-app/files/patch-avahi-core.pc.in
index fdde41be9c53..fdde41be9c53 100644
--- a/net/avahi/files/patch-avahi-core.pc.in
+++ b/net/avahi-app/files/patch-avahi-core.pc.in
diff --git a/net/avahi/files/patch-avahi-daemon_main.c b/net/avahi-app/files/patch-avahi-daemon_main.c
index c95ab399fe7e..c95ab399fe7e 100644
--- a/net/avahi/files/patch-avahi-daemon_main.c
+++ b/net/avahi-app/files/patch-avahi-daemon_main.c
diff --git a/net/avahi-app/files/patch-avahi-discover-standalone_Makefile.in b/net/avahi-app/files/patch-avahi-discover-standalone_Makefile.in
new file mode 100644
index 000000000000..70562fd5aa4e
--- /dev/null
+++ b/net/avahi-app/files/patch-avahi-discover-standalone_Makefile.in
@@ -0,0 +1,24 @@
+--- avahi-discover-standalone/Makefile.in.orig	Tue Jul 31 11:41:28 2007
++++ avahi-discover-standalone/Makefile.in	Tue Jul 31 11:43:05 2007
+@@ -79,9 +79,6 @@
+ 	$(am_avahi_discover_standalone_OBJECTS)
+ am__DEPENDENCIES_1 =
+ @HAVE_GTK_TRUE@avahi_discover_standalone_DEPENDENCIES =  \
+-@HAVE_GTK_TRUE@	../avahi-common/libavahi-common.la \
+-@HAVE_GTK_TRUE@	../avahi-glib/libavahi-glib.la \
+-@HAVE_GTK_TRUE@	../avahi-core/libavahi-core.la \
+ @HAVE_GTK_TRUE@	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ @HAVE_GTK_TRUE@	$(am__DEPENDENCIES_1)
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+@@ -406,10 +403,7 @@
+ @HAVE_GTK_TRUE@	-DAVAHI_INTERFACES_DIR=\"$(interfacesdir)\"
+ 
+ @HAVE_GTK_TRUE@avahi_discover_standalone_LDADD = \
+-@HAVE_GTK_TRUE@	$(AM_LDADD) \
+-@HAVE_GTK_TRUE@	../avahi-common/libavahi-common.la \
+-@HAVE_GTK_TRUE@	../avahi-glib/libavahi-glib.la \
+-@HAVE_GTK_TRUE@	../avahi-core/libavahi-core.la  \
++@HAVE_GTK_TRUE@	$(AM_LDADD) `$(PKG_CONFIG) --cflags --libs avahi-client avahi-core avahi-glib` \
+ @HAVE_GTK_TRUE@	$(GLIB20_LIBS) $(GTK20_LIBS) $(GLADE20_LIBS)
+ 
+ @HAVE_GTK_FALSE@@HAVE_PYTHON_DBUS_TRUE@interfaces_DATA = $(interfaces)
diff --git a/net/avahi/files/patch-avahi-glib.pc.in b/net/avahi-app/files/patch-avahi-glib.pc.in
index e2633c32db44..e2633c32db44 100644
--- a/net/avahi/files/patch-avahi-glib.pc.in
+++ b/net/avahi-app/files/patch-avahi-glib.pc.in
diff --git a/net/avahi/files/patch-avahi-qt3.pc.in b/net/avahi-app/files/patch-avahi-qt3.pc.in
index 8174f25846d8..8174f25846d8 100644
--- a/net/avahi/files/patch-avahi-qt3.pc.in
+++ b/net/avahi-app/files/patch-avahi-qt3.pc.in
diff --git a/net/avahi/files/patch-avahi-qt_Makefile.in b/net/avahi-app/files/patch-avahi-qt_Makefile.in
index 5788e2399dd5..5788e2399dd5 100644
--- a/net/avahi/files/patch-avahi-qt_Makefile.in
+++ b/net/avahi-app/files/patch-avahi-qt_Makefile.in
diff --git a/net/avahi-app/files/patch-avahi-ui_Makefile.in b/net/avahi-app/files/patch-avahi-ui_Makefile.in
new file mode 100644
index 000000000000..531e506687df
--- /dev/null
+++ b/net/avahi-app/files/patch-avahi-ui_Makefile.in
@@ -0,0 +1,40 @@
+--- avahi-ui/Makefile.in.orig	Tue Jul 31 11:49:11 2007
++++ avahi-ui/Makefile.in	Tue Jul 31 11:50:37 2007
+@@ -89,9 +89,7 @@
+ libLTLIBRARIES_INSTALL = $(INSTALL)
+ LTLIBRARIES = $(lib_LTLIBRARIES)
+ am__DEPENDENCIES_1 =
+-@HAVE_DBUS_TRUE@@HAVE_GTK_TRUE@libavahi_ui_la_DEPENDENCIES = ../avahi-common/libavahi-common.la \
+-@HAVE_DBUS_TRUE@@HAVE_GTK_TRUE@	../avahi-client/libavahi-client.la \
+-@HAVE_DBUS_TRUE@@HAVE_GTK_TRUE@	../avahi-glib/libavahi-glib.la \
++@HAVE_DBUS_TRUE@@HAVE_GTK_TRUE@libavahi_ui_la_DEPENDENCIES = \
+ @HAVE_DBUS_TRUE@@HAVE_GTK_TRUE@	$(am__DEPENDENCIES_1) \
+ @HAVE_DBUS_TRUE@@HAVE_GTK_TRUE@	$(am__DEPENDENCIES_1)
+ am__libavahi_ui_la_SOURCES_DIST = avahi-ui.h avahi-ui.c \
+@@ -112,8 +110,6 @@
+ bssh_OBJECTS = $(am_bssh_OBJECTS)
+ @HAVE_DBUS_TRUE@@HAVE_GTK_TRUE@bssh_DEPENDENCIES =  \
+ @HAVE_DBUS_TRUE@@HAVE_GTK_TRUE@	$(am__DEPENDENCIES_1) \
+-@HAVE_DBUS_TRUE@@HAVE_GTK_TRUE@	../avahi-client/libavahi-client.la \
+-@HAVE_DBUS_TRUE@@HAVE_GTK_TRUE@	../avahi-common/libavahi-common.la \
+ @HAVE_DBUS_TRUE@@HAVE_GTK_TRUE@	libavahi-ui.la
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
+@@ -439,15 +435,12 @@
+ @HAVE_DBUS_TRUE@@HAVE_GTK_TRUE@libavahi_ui_la_CFLAGS = $(AM_CFLAGS) \
+ @HAVE_DBUS_TRUE@@HAVE_GTK_TRUE@	$(GTK20_CFLAGS) $(am__append_2) \
+ @HAVE_DBUS_TRUE@@HAVE_GTK_TRUE@	$(am__append_5)
+-@HAVE_DBUS_TRUE@@HAVE_GTK_TRUE@libavahi_ui_la_LIBADD = $(AM_LDADD) \
+-@HAVE_DBUS_TRUE@@HAVE_GTK_TRUE@	../avahi-common/libavahi-common.la \
+-@HAVE_DBUS_TRUE@@HAVE_GTK_TRUE@	../avahi-client/libavahi-client.la \
+-@HAVE_DBUS_TRUE@@HAVE_GTK_TRUE@	../avahi-glib/libavahi-glib.la \
++@HAVE_DBUS_TRUE@@HAVE_GTK_TRUE@libavahi_ui_la_LIBADD = $(AM_LDADD) `$(PKG_CONFIG) --cflags --libs avahi-client avahi-core avahi-glib` \
+ @HAVE_DBUS_TRUE@@HAVE_GTK_TRUE@	$(GTK20_LIBS) $(am__append_3)
+ @HAVE_DBUS_TRUE@@HAVE_GTK_TRUE@libavahi_ui_la_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -version-info $(LIBAVAHI_UI_VERSION_INFO)
+ @HAVE_DBUS_TRUE@@HAVE_GTK_TRUE@bssh_SOURCES = bssh.c
+ @HAVE_DBUS_TRUE@@HAVE_GTK_TRUE@bssh_CFLAGS = $(AM_CFLAGS) $(GTK20_CFLAGS)
+-@HAVE_DBUS_TRUE@@HAVE_GTK_TRUE@bssh_LDADD = $(AM_LDADD) $(GTK20_LIBS) ../avahi-client/libavahi-client.la ../avahi-common/libavahi-common.la libavahi-ui.la
++@HAVE_DBUS_TRUE@@HAVE_GTK_TRUE@bssh_LDADD = $(AM_LDADD) $(GTK20_LIBS) `$(PKG_CONFIG) --cflags --libs avahi-client avahi-core` libavahi-ui.la
+ CLEANFILES = $(desktop_DATA)
+ all: all-am
+ 
diff --git a/net/avahi/files/patch-configure b/net/avahi-app/files/patch-configure
index 141c9403f76b..141c9403f76b 100644
--- a/net/avahi/files/patch-configure
+++ b/net/avahi-app/files/patch-configure
diff --git a/net/avahi/files/patch-initscript_freebsd_avahi-daemon.sh.in b/net/avahi-app/files/patch-initscript_freebsd_avahi-daemon.sh.in
index 564577bf0b9e..564577bf0b9e 100644
--- a/net/avahi/files/patch-initscript_freebsd_avahi-daemon.sh.in
+++ b/net/avahi-app/files/patch-initscript_freebsd_avahi-daemon.sh.in
diff --git a/net/avahi/files/patch-initscript_freebsd_avahi-dnsconfd.sh.in b/net/avahi-app/files/patch-initscript_freebsd_avahi-dnsconfd.sh.in
index 1e7939466c58..1e7939466c58 100644
--- a/net/avahi/files/patch-initscript_freebsd_avahi-dnsconfd.sh.in
+++ b/net/avahi-app/files/patch-initscript_freebsd_avahi-dnsconfd.sh.in
diff --git a/net/avahi/files/patch-man_Makefile.in b/net/avahi-app/files/patch-man_Makefile.in
index b46557af681a..b46557af681a 100644
--- a/net/avahi/files/patch-man_Makefile.in
+++ b/net/avahi-app/files/patch-man_Makefile.in
diff --git a/net/avahi-app/pkg-descr b/net/avahi-app/pkg-descr
new file mode 100644
index 000000000000..fb85b6205ba1
--- /dev/null
+++ b/net/avahi-app/pkg-descr
@@ -0,0 +1,7 @@
+Service discovery on a local network -- this means that you can plug your
+laptop or computer into a network and instantly be able to view other people
+who you can chat with, find printers to print to or find files being shared.
+This kind of technology is already found in MacOS X (branded 'Rendezvous',
+'Bonjour' and sometimes 'ZeroConf') and is very convenient.
+
+WWW: http://www.avahi.org/
diff --git a/net/avahi/pkg-install b/net/avahi-app/pkg-install
index 9bbd14bce237..9bbd14bce237 100644
--- a/net/avahi/pkg-install
+++ b/net/avahi-app/pkg-install
diff --git a/net/avahi/pkg-plist b/net/avahi-app/pkg-plist
index 25d108d0a72a..04bf17bfdfa7 100644
--- a/net/avahi/pkg-plist
+++ b/net/avahi-app/pkg-plist
@@ -1,6 +1,5 @@
 bin/avahi-browse
 bin/avahi-browse-domains
-%%GTK%%bin/avahi-discover-standalone
 bin/avahi-publish
 bin/avahi-publish-address
 bin/avahi-publish-service
@@ -8,8 +7,6 @@ bin/avahi-resolve
 bin/avahi-resolve-address
 bin/avahi-resolve-host-name
 bin/avahi-set-host-name
-%%GTK%%bin/bssh
-%%GTK%%bin/bvnc
 etc/avahi/avahi-daemon.conf
 etc/avahi/avahi-dnsconfd.action
 etc/avahi/hosts
@@ -55,7 +52,6 @@ include/avahi-compat-howl/salt/salt.h
 include/avahi-compat-howl/salt/signal.h
 include/avahi-compat-howl/salt/socket.h
 include/avahi-compat-howl/salt/time.h
-%%LIBDNS%%include/avahi-compat-libdns_sd/dns_sd.h
 include/avahi-core/core.h
 include/avahi-core/log.h
 include/avahi-core/lookup.h
@@ -63,7 +59,6 @@ include/avahi-core/publish.h
 include/avahi-core/rr.h
 include/avahi-glib/glib-malloc.h
 include/avahi-glib/glib-watch.h
-%%GTK%%include/avahi-ui/avahi-ui.h
 lib/libavahi-client.a
 lib/libavahi-client.la
 lib/libavahi-client.so
@@ -80,30 +75,17 @@ lib/libavahi-glib.a
 lib/libavahi-glib.la
 lib/libavahi-glib.so
 lib/libavahi-glib.so.1
-%%GTK%%lib/libavahi-ui.a
-%%GTK%%lib/libavahi-ui.la
-%%GTK%%lib/libavahi-ui.so
-%%GTK%%lib/libavahi-ui.so.0
-%%LIBDNS%%lib/libdns_sd.a
-%%LIBDNS%%lib/libdns_sd.la
-%%LIBDNS%%lib/libdns_sd.so
-%%LIBDNS%%lib/libdns_sd.so.1
 lib/libhowl.a
 lib/libhowl.la
 lib/libhowl.so
 lib/libhowl.so.0
 libdata/pkgconfig/avahi-client.pc
 libdata/pkgconfig/avahi-compat-howl.pc
-%%LIBDNS%%libdata/pkgconfig/avahi-compat-libdns_sd.pc
 libdata/pkgconfig/avahi-core.pc
 libdata/pkgconfig/avahi-glib.pc
-%%GTK%%libdata/pkgconfig/avahi-ui.pc
 sbin/avahi-daemon
 sbin/avahi-dnsconfd
-%%GTK%%share/applications/bssh.desktop
-%%GTK%%share/applications/bvnc.desktop
 %%DATADIR%%/avahi-service.dtd
-%%GTK%%%%DATADIR%%/interfaces/avahi-discover.glade
 %%DATADIR%%/introspection/AddressResolver.introspect
 %%DATADIR%%/introspection/DomainBrowser.introspect
 %%DATADIR%%/introspection/EntryGroup.introspect
@@ -115,13 +97,10 @@ sbin/avahi-dnsconfd
 %%DATADIR%%/introspection/ServiceTypeBrowser.introspect
 %%DATADIR%%/service-types
 @dirrm %%DATADIR%%/introspection
-%%GTK%%@dirrm %%DATADIR%%/interfaces
 @dirrm %%DATADIR%%
 @dirrmtry share/applications
-%%GTK%%@dirrm include/avahi-ui
 @dirrm include/avahi-glib
 @dirrm include/avahi-core
-%%LIBDNS%%@dirrm include/avahi-compat-libdns_sd
 @dirrm include/avahi-compat-howl/salt
 @dirrm include/avahi-compat-howl/rendezvous
 @dirrm include/avahi-compat-howl/discovery
diff --git a/net/avahi-autoipd/Makefile b/net/avahi-autoipd/Makefile
new file mode 100644
index 000000000000..32c5540a98b4
--- /dev/null
+++ b/net/avahi-autoipd/Makefile
@@ -0,0 +1,29 @@
+# New ports collection makefile for:	avahi-autoipd
+# Date created:				31 July 2007
+# Whom:					Michael Johnson <ahze@FreeBSD.org>
+#
+# $FreeBSD$
+#    $MCom: ports/net/avahi-autoipd/Makefile,v 1.1 2007/07/31 18:24:12 ahze Exp $
+
+PORTREVISION=	0
+CATEGORIES=	net
+PKGNAMESUFFIX=	-autoipd
+
+MAINTAINER=	gnome@FreeBSD.org
+COMMENT=	IPv4LL network address configuration daemon
+
+LIB_DEPENDS=	avahi-common.3:${PORTSDIR}/net/avahi
+
+MASTERDIR=	${.CURDIR}/../avahi-app
+BUILD_WRKSRC=	${WRKSRC}/avahi-autoipd
+INSTALL_WRKSRC=	${BUILD_WRKSRC}
+DESCR=		${.CURDIR}/pkg-descr
+PLIST=		${.CURDIR}/pkg-plist
+
+AVAHI_SLAVE=	autoipd
+
+MAN8=		avahi-autoipd.8
+USE_GNOME=	gnomehack gnometarget ltverhack
+PKGINSTALL=	${.CURDIR}/pkg-install
+
+.include "${MASTERDIR}/Makefile"
diff --git a/net/avahi-autoipd/pkg-descr b/net/avahi-autoipd/pkg-descr
new file mode 100644
index 000000000000..6bd36b16a559
--- /dev/null
+++ b/net/avahi-autoipd/pkg-descr
@@ -0,0 +1,3 @@
+IPv4LL network address configuration daemon
+
+WWW: http://www.avahi.org/
diff --git a/net/avahi-autoipd/pkg-install b/net/avahi-autoipd/pkg-install
new file mode 100644
index 000000000000..c4ce455d28a4
--- /dev/null
+++ b/net/avahi-autoipd/pkg-install
@@ -0,0 +1,36 @@
+#!/bin/sh
+
+case $2 in
+POST-INSTALL)
+	USER=avahi-autoipd
+	GROUP=${USER}
+	UID=546
+	GID=${UID}
+	PW=/usr/sbin/pw
+
+	if ${PW} group show "${GROUP}" 2>/dev/null; then
+		echo "You already have a group \"${GROUP}\", so I will use it."
+	else
+		if ${PW} groupadd ${GROUP} -g ${GID}; then
+			echo "Added group \"${GROUP}\"."
+		else
+			echo "Adding group \"${GROUP}\" failed..."
+			exit 1
+		fi
+	fi
+
+	if ${PW} user show "${USER}" 2>/dev/null; then
+		echo "You already have a user \"${USER}\", so I will use it."
+	else
+		if ${PW} useradd ${USER} -u ${UID} -g ${GROUP} -h - \
+			-d "/nonexistent" -s /sbin/nologin -c "Avahi Autoipd Daemon User"
+		then
+			echo "Added user \"${USER}\"."
+		else
+			echo "Adding user \"${USER}\" failed..."
+			exit 1
+		fi
+	fi
+	exit 0
+	;;
+esac
diff --git a/net/avahi-autoipd/pkg-plist b/net/avahi-autoipd/pkg-plist
new file mode 100644
index 000000000000..1b558b08b699
--- /dev/null
+++ b/net/avahi-autoipd/pkg-plist
@@ -0,0 +1,3 @@
+etc/avahi/avahi-autoipd.action
+sbin/avahi-autoipd
+@dirrm etc/avahi
diff --git a/net/avahi-gtk/Makefile b/net/avahi-gtk/Makefile
new file mode 100644
index 000000000000..e98f44128756
--- /dev/null
+++ b/net/avahi-gtk/Makefile
@@ -0,0 +1,38 @@
+# New ports collection makefile for:	avahi-gtk
+# Date created:				31 July 2007
+# Whom:					Michael Johnson <ahze@FreeBSD.org>
+#
+# $FreeBSD$
+#    $MCom: ports/net/avahi-gtk/Makefile,v 1.2 2007/09/12 12:41:45 ahze Exp $
+
+PORTREVISION=	0
+CATEGORIES=	net
+PKGNAMESUFFIX=	-gtk
+
+MAINTAINER=	gnome@FreeBSD.org
+COMMENT=	Gtk+ tools and bindings to the Avahi mDNS system
+
+LIB_DEPENDS=	avahi-common.3:${PORTSDIR}/net/avahi
+
+MASTERDIR=	${.CURDIR}/../avahi-app
+BUILD_WRKSRC=	${WRKSRC}/avahi-ui
+INSTALL_WRKSRC=	${BUILD_WRKSRC}
+DESCR=		${.CURDIR}/pkg-descr
+PLIST=		${.CURDIR}/pkg-plist
+
+AVAHI_SLAVE=	gtk
+AVAHI_PKGCONFIG=avahi-ui.pc
+
+MAN1+=		bssh.1
+MLINKS+=	bssh.1 bvnc.1
+USE_GNOME=	gnomehack gnometarget ltverhack libglade2
+
+post-build:
+	@(cd ${WRKSRC}/avahi-discover-standalone; \
+		${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET})
+
+post-install:
+	@(cd ${WRKSRC}/avahi-discover-standalone; \
+		${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET})
+
+.include "${MASTERDIR}/Makefile"
diff --git a/net/avahi-gtk/pkg-descr b/net/avahi-gtk/pkg-descr
new file mode 100644
index 000000000000..a1980414528b
--- /dev/null
+++ b/net/avahi-gtk/pkg-descr
@@ -0,0 +1,3 @@
+Gtk+ tools and bindings to the avahi mDNS service discovery system.
+
+WWW: http://www.avahi.org/
diff --git a/net/avahi-gtk/pkg-plist b/net/avahi-gtk/pkg-plist
new file mode 100644
index 000000000000..59f4cfe2b5ca
--- /dev/null
+++ b/net/avahi-gtk/pkg-plist
@@ -0,0 +1,16 @@
+bin/avahi-discover-standalone
+bin/bssh
+bin/bvnc
+include/avahi-ui/avahi-ui.h
+lib/libavahi-ui.a
+lib/libavahi-ui.la
+lib/libavahi-ui.so
+lib/libavahi-ui.so.0
+libdata/pkgconfig/avahi-ui.pc
+share/applications/bssh.desktop
+share/applications/bvnc.desktop
+%%DATADIR%%/interfaces/avahi-discover.glade
+@dirrm %%DATADIR%%/interfaces
+@dirrm %%DATADIR%%
+@dirrmtry share/applications
+@dirrm include/avahi-ui
diff --git a/net/avahi-libdns/Makefile b/net/avahi-libdns/Makefile
new file mode 100644
index 000000000000..249f9287a994
--- /dev/null
+++ b/net/avahi-libdns/Makefile
@@ -0,0 +1,26 @@
+# New ports collection makefile for:	avahi-libdns
+# Date created:				31 July 2007
+# Whom:					Michael Johnson <ahze@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTREVISION=	0
+CATEGORIES=	net
+PKGNAMESUFFIX=	-libdns
+
+MAINTAINER=	gnome@FreeBSD.org
+COMMENT=	mDNSResponder compatibility from Avahi
+
+LIB_DEPENDS=	avahi-common.3:${PORTSDIR}/net/avahi
+
+MASTERDIR=	${.CURDIR}/../avahi-app
+BUILD_WRKSRC=	${WRKSRC}/avahi-compat-libdns_sd
+INSTALL_WRKSRC=	${BUILD_WRKSRC}
+DESCR=		${.CURDIR}/pkg-descr
+PLIST=		${.CURDIR}/pkg-plist
+
+AVAHI_SLAVE=	libdns
+AVAHI_PKGCONFIG=avahi-compat-libdns_sd.pc
+
+.include "${MASTERDIR}/Makefile"
diff --git a/net/avahi-libdns/pkg-descr b/net/avahi-libdns/pkg-descr
new file mode 100644
index 000000000000..a2a56e5199ac
--- /dev/null
+++ b/net/avahi-libdns/pkg-descr
@@ -0,0 +1,3 @@
+mDNSResponder compatibility from Avavhi
+
+WWW: http://www.avahi.org/
diff --git a/net/avahi-libdns/pkg-install b/net/avahi-libdns/pkg-install
new file mode 100644
index 000000000000..a7134b49febe
--- /dev/null
+++ b/net/avahi-libdns/pkg-install
@@ -0,0 +1,36 @@
+#!/bin/sh
+
+case $2 in
+POST-INSTALL)
+	USER=avahi-autoipd
+	GROUP=${USER}
+	UID=546
+	GID=${UID}
+	PW=/usr/sbin/pw
+
+	if ${PW} group show "${GROUP}" 2>/dev/null; then
+		echo "You already have a group \"${GROUP}\", so I will use it."
+	else
+		if ${PW} groupadd ${GROUP} -g ${GID}; then
+			echo "Added group \"${GROUP}\"."
+		else
+			echo "Adding group \"${GROUP}\" failed..."
+			exit 1
+		fi
+	fi
+
+	if ${PW} user show "${USER}" 2>/dev/null; then
+		echo "You already have a user \"${USER}\", so I will use it."
+	else
+		if ${PW} useradd ${USER} -u ${UID} -g ${GROUP} -h - \
+			-d "/nonexistent" -s /sbin/nologin -c "Avahi Daemon User"
+		then
+			echo "Added user \"${USER}\"."
+		else
+			echo "Adding user \"${USER}\" failed..."
+			exit 1
+		fi
+	fi
+	exit 0
+	;;
+esac
diff --git a/net/avahi-libdns/pkg-plist b/net/avahi-libdns/pkg-plist
new file mode 100644
index 000000000000..16d0e55333ef
--- /dev/null
+++ b/net/avahi-libdns/pkg-plist
@@ -0,0 +1,7 @@
+include/avahi-compat-libdns_sd/dns_sd.h
+lib/libdns_sd.a
+lib/libdns_sd.la
+lib/libdns_sd.so
+lib/libdns_sd.so.1
+libdata/pkgconfig/avahi-compat-libdns_sd.pc
+@dirrm include/avahi-compat-libdns_sd
diff --git a/net/avahi-qt3/Makefile b/net/avahi-qt3/Makefile
index 45e0bf2904b1..5c9e18ca6bd6 100644
--- a/net/avahi-qt3/Makefile
+++ b/net/avahi-qt3/Makefile
@@ -3,7 +3,7 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#
+#    $MCom: ports/net/avahi-qt3/Makefile,v 1.1 2007/07/31 18:24:12 ahze Exp $
 
 PORTREVISION=	0
 CATEGORIES=	net
@@ -14,35 +14,15 @@ COMMENT=	Qt 3 bindings to the Avahi mDNS system
 
 LIB_DEPENDS=	avahi-common.3:${PORTSDIR}/net/avahi
 
-MASTERDIR=	${.CURDIR}/../avahi
+MASTERDIR=	${.CURDIR}/../avahi-app
 BUILD_WRKSRC=	${WRKSRC}/avahi-qt
 INSTALL_WRKSRC=	${BUILD_WRKSRC}
 DESCR=		${.CURDIR}/pkg-descr
 PLIST=		${.CURDIR}/pkg-plist
 
-AVAHI_SLAVE=	yes
-
+AVAHI_SLAVE=	qt3
 USE_GNOME=	gnomehack gnometarget ltverhack
 USE_QT_VER=	3
-CONFIGURE_ARGS=	--disable-python \
-		--disable-mono \
-		--disable-monodoc \
-		--disable-gtk \
-		--enable-qt3 \
-		--disable-qt4 \
-		--localstatedir=/var \
-		--disable-doxygen-docs \
-		--disable-xml-docs \
-		--disable-doxygen-dot \
-		--with-dbus-system-address=unix:path=/var/run/dbus/system_bus_socket \
-		--with-distro=freebsd
-
-post-build:
-	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} \
-	    	${MAKE_FLAGS} Makefile ${MAKE_ARGS} avahi-qt3.pc
-
-post-install:
-	${MKDIR} ${PREFIX}/libdata/pkgconfig
-	${INSTALL_DATA} ${WRKSRC}/avahi-qt3.pc ${PREFIX}/libdata/pkgconfig
+AVAHI_PKGCONFIG=	avahi-qt3.pc
 
 .include "${MASTERDIR}/Makefile"
diff --git a/net/avahi-sharp/Makefile b/net/avahi-sharp/Makefile
index c488e52cbea7..f4d9e8ea48ff 100644
--- a/net/avahi-sharp/Makefile
+++ b/net/avahi-sharp/Makefile
@@ -17,41 +17,21 @@ LIB_DEPENDS=	avahi-core:${PORTSDIR}/net/avahi
 BUILD_DEPENDS=	mono:${PORTSDIR}/lang/mono
 RUN_DEPENDS=	mono:${PORTSDIR}/lang/mono
 
-MASTERDIR=	${.CURDIR}/../avahi
+MASTERDIR=	${.CURDIR}/../avahi-app
 BUILD_WRKSRC=	${WRKSRC}/avahi-sharp
 INSTALL_WRKSRC=	${BUILD_WRKSRC}
 DESCR=		${.CURDIR}/pkg-descr
 PLIST=		${.CURDIR}/pkg-plist
 
-AVAHI_SLAVE=	yes
-
-USE_GNOME=	gnomehack gnometarget
-CONFIGURE_ARGS= --with-distro=freebsd \
-		--with-dbus-system-address=unix:path=/var/run/dbus/system_bus_socket \
-		--disable-gtk \
-		--disable-qt3 \
-		--disable-qt4 \
-		--disable-python \
-		--enable-mono \
-		--disable-monodoc \
-		--disable-doxygen-doc \
-		--disable-doxygen-dot \
-		--localstatedir=/var
+AVAHI_SLAVE=	sharp
+AVAHI_PKGCONFIG=avahi-sharp.pc
 
 post-patch:
 	@${REINPLACE_CMD} 's|@CLIENT_DLNAME@|libavahi-client.so|g; \
 		s|@COMMON_DLNAME@|libavahi-common.so|g; \
 		s|@GLIB_DLNAME@|libavahi-glib.so|g' \
 		${BUILD_WRKSRC}/avahi-sharp.dll.config.in
-	@${REINPLACE_CMD} 's|@prefix@|${PREFIX}|g; \
-		s|@libdir@|$${prefix}/lib|g; \
-		s|@PACKAGE_VERSION@|${PORTVERSION}|g' \
-		${WRKSRC}/avahi-sharp.pc.in
-	@${CP} ${WRKSRC}/avahi-sharp.pc.in ${WRKSRC}/avahi-sharp.pc
 	@${CP} ${WRKSRC}/avahi-sharp/avahi-sharp.dll.config.in ${WRKSRC}/avahi-sharp/avahi-sharp.dll.config
 
-post-install:
-	${INSTALL_DATA} ${WRKSRC}/avahi-sharp.pc  ${PREFIX}/libdata/pkgconfig/
-
 .include "${.CURDIR}/../../lang/mono/bsd.mono.mk"
 .include "${MASTERDIR}/Makefile"
diff --git a/net/avahi/Makefile b/net/avahi/Makefile
index 5a509b3cb7eb..e90d5a8c6ab0 100644
--- a/net/avahi/Makefile
+++ b/net/avahi/Makefile
@@ -3,101 +3,63 @@
 # Whom:			Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#    $MCom: ports/net/avahi/Makefile,v 1.19 2006/10/12 16:44:41 marcus Exp $
+#   $MCom: ports/net/avahi/Makefile,v 1.26 2007/09/09 22:45:27 mezz Exp $
+#
 
 PORTNAME=	avahi
 PORTVERSION=	0.6.21
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES?=	net dns
-MASTER_SITES=	http://www.avahi.org/download/
-
-MAINTAINER?=	gnome@FreeBSD.org
-COMMENT?=	Service discovery on a local network
+MASTER_SITES=	# empty
+DISTFILES=	# empty
+EXTRACT_ONLY=	# empty
 
-LIB_DEPENDS?=	expat.6:${PORTSDIR}/textproc/expat2 \
-		daemon.0:${PORTSDIR}/devel/libdaemon \
-		dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
-		gdbm.3:${PORTSDIR}/databases/gdbm
+MAINTAINER=	gnome@FreeBSD.org
+COMMENT=	The "meta-port" for the Avahi service discovery suite
 
-USE_GNOME?=	gnomehack ltverhack glib20
-USE_GNOME_SUBR=yes
-USE_RC_SUBR=	yes
-USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:15
-USE_LDCONFIG=	yes
-USE_GETOPT_LONG=yes
-CONFIGURE_ARGS?=--with-distro=freebsd \
-		--with-dbus-system-address=unix:path=/var/run/dbus/system_bus_socket \
-		--disable-qt3 \
-		--disable-qt4 \
-		--disable-python \
-		--disable-mono \
-		--disable-monodoc \
-		--disable-doxygen-doc \
-		--disable-doxygen-dot \
-		--localstatedir=/var \
-		--enable-compat-howl \
-		--disable-autoipd
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -DHAVE_KQUEUE" \
-		LDFLAGS="-L${LOCALBASE}/lib" \
-		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
-		PTHREAD_LIBS="${PTHREAD_LIBS}"
+RUN_DEPENDS=	avahi-resolve:${PORTSDIR}/net/avahi-app \
+		avahi-app>=0.6.20_2:${PORTSDIR}/net/avahi-app
 
-.if !defined(AVAHI_SLAVE)
-CONFLICTS=	howl-[0-9]*
+OPTIONS=	AUTOIPD "IPv4LL network address configuration daemon" off \
+		GTK "Gtk+ tools and bindings" off \
+		LIBDNS "mDNSResponder compatibility" off \
+		MONO "Mono bindings" off \
+		QT3 "Qt 3 bindings" off \
+		QT4 "Qt 4 bindings" off \
+		PYTHON "Python bindings and tools" off
 
-MAN1=	avahi-browse.1 avahi-publish.1 avahi-resolve.1 avahi-set-host-name.1
-MAN5=	avahi-daemon.conf.5 avahi.service.5 avahi.hosts.5
-MAN8=	avahi-daemon.8 avahi-dnsconfd.8 avahi-dnsconfd.action.8
+NO_BUILD=	yes
 
-MLINKS=	avahi-browse.1 avahi-browse-domains.1 \
-	avahi-publish.1 avahi-publish-address.1 \
-	avahi-publish.1 avahi-publish-service.1 \
-	avahi-resolve.1 avahi-resolve-address.1 \
-	avahi-resolve.1 avahi-resolve-host-name.1
+.include <bsd.port.pre.mk>
 
-OPTIONS=	GTK2 "Build a GTK+ 2 browser utility and other tools" off \
-		LIBDNS "Enable mDNSResponder compatibility" off
+.if defined(WITH_AUTOIPD)
+RUN_DEPENDS+=	avahi-autoipd:${PORTSDIR}/net/avahi-autoipd
 .endif
 
-.include <bsd.port.pre.mk>
+.if defined(WITH_GTK)
+RUN_DEPENDS+=	avahi-discover-standalone:${PORTSDIR}/net/avahi-gtk
+.endif
 
-.if !defined(AVAHI_SLAVE)
 .if defined(WITH_LIBDNS)
-CONFIGURE_ARGS+=--enable-compat-libdns_sd
-PLIST_SUB+=	LIBDNS=""
-CONFLICTS+=	mDNSResponder-[0-9]*
-PKGNAMESUFFIX:=	${PKGNAMESUFFIX}+libdns
-.else
-CONFIGURE_ARGS+=--disable-compat-libdns_sd
-PLIST_SUB+=	LIBDNS="@comment "
+RUN_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/avahi-compat-libdns_sd.pc:${PORTSDIR}/net/avahi-libdns
 .endif
 
-.if defined(WITH_GTK2)
-USE_GNOME+=	libglade2
-PLIST_SUB+=	GTK=""
-MAN1+=		bssh.1
-MLINKS+=	bssh.1 bvnc.1
-.else
-CONFIGURE_ARGS+=--disable-gtk
-PLIST_SUB+=	GTK="@comment "
+.if defined(WITH_MONO)
+RUN_DEPENDS+=	${LOCALBASE}/lib/mono/avahi-sharp/avahi-sharp.dll:${PORTSDIR}/net/avahi-sharp
 .endif
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|-ldl||g ; s|netdev|network|g' \
-		${WRKSRC}/configure \
-		${WRKSRC}/avahi-client/Makefile.in \
-		${WRKSRC}/avahi-daemon/Makefile.in
-	@${REINPLACE_CMD} -e 's|%%RC_SUBR%%|${RC_SUBR}| ; \
-	    	s|%%GNOME_SUBR%%|${GNOME_SUBR}|' \
-		${WRKSRC}/initscript/freebsd/avahi-dnsconfd.sh.in \
-		${WRKSRC}/initscript/freebsd/avahi-daemon.sh.in
+.if defined(WITH_QT3)
+RUN_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/avahi-qt3.pc:${PORTSDIR}/net/avahi-qt3
+.endif
 
-post-install:
-.if !defined(PACKAGE_BUILDING)
-	@${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
+.if defined(WITH_QT4)
+RUN_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/avahi-qt4.pc:${PORTSDIR}/net/avahi-qt4
 .endif
 
+.if defined(WITH_PYTHON)
+RUN_DEPENDS+=	avahi-bookmarks:${PORTSDIR}/net/py-avahi
 .endif
 
+do-install:
+
 .include <bsd.port.post.mk>
diff --git a/net/blam/Makefile b/net/blam/Makefile
index 6b59821f9981..d34d9f399cda 100644
--- a/net/blam/Makefile
+++ b/net/blam/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	blam
 PORTVERSION=	1.8.4
+PORTREVISION=	1
 CATEGORIES=	net gnome
 MASTER_SITES=	http://www.cmartin.tk/blam/
 
@@ -32,9 +33,9 @@ MAN1=	blam.1
 GCONF_SCHEMAS=	blam.schemas
 
 post-patch:
-	@${REINPLACE_CMD} 's|img src="|img src="file://${PREFIX}/share/gnome/blam/themes/blam/|g' \
+	@${REINPLACE_CMD} 's|img src="|img src="file://${PREFIX}/share/blam/themes/blam/|g' \
 		${WRKSRC}/themes/blam/theme.html
-	@${REINPLACE_CMD} 's|img src="|img src="file://${PREFIX}/share/gnome/blam/themes/pimped/|g' \
+	@${REINPLACE_CMD} 's|img src="|img src="file://${PREFIX}/share/blam/themes/pimped/|g' \
 		${WRKSRC}/themes/pimped/theme.html
 
 
diff --git a/net/blam/files/extra-libblam_blam-gecko-utils.cpp b/net/blam/files/extra-libblam_blam-gecko-utils.cpp
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/net/blam/files/extra-libblam_blam-gecko-utils.cpp
+++ /dev/null
diff --git a/net/blam/pkg-plist b/net/blam/pkg-plist
index ecfd7bf0326f..9cbf238201c8 100644
--- a/net/blam/pkg-plist
+++ b/net/blam/pkg-plist
@@ -7,31 +7,31 @@ lib/blam/libblam.a
 lib/blam/libblam.la
 lib/blam/libblam.so
 lib/blam/libblam.so.0
-share/gnome/applications/blam.desktop
-share/gnome/blam/themes/planet/theme.html
-share/gnome/blam/themes/planet/planet.css
-share/gnome/blam/themes/planet/bubble-top.png
-share/gnome/blam/themes/planet/bubble-top-right.png
-share/gnome/blam/themes/planet/bubble-top-left.png
-share/gnome/blam/themes/planet/bubble-right.png
-share/gnome/blam/themes/planet/bubble-nipple.png
-share/gnome/blam/themes/planet/bubble-left.png
-share/gnome/blam/themes/planet/bubble-bottom.png
-share/gnome/blam/themes/planet/bubble-bottom-right.png
-share/gnome/blam/themes/planet/bubble-bottom-left.png
-share/gnome/blam/themes/pimped/theme.html
-share/gnome/blam/themes/pimped/pimped.css
-share/gnome/blam/themes/pimped/news.png
-share/gnome/blam/themes/pimped/blam.png
-share/gnome/blam/themes/blam/theme.html
-share/gnome/blam/themes/blam/blam-box-top-right.png
-share/gnome/blam/themes/blam/blam-box-top-left.png
-share/gnome/blam/themes/blam/blam-box-pad.png
-share/gnome/blam/themes/blam/blam-box-bottom-right.png
-share/gnome/blam/themes/blam/blam-box-bottom-left.png
-share/gnome/blam/themes/akregator/theme.html
-share/gnome/blam/collection.xml
-share/gnome/pixmaps/blam.png
+share/applications/blam.desktop
+share/blam/themes/planet/theme.html
+share/blam/themes/planet/planet.css
+share/blam/themes/planet/bubble-top.png
+share/blam/themes/planet/bubble-top-right.png
+share/blam/themes/planet/bubble-top-left.png
+share/blam/themes/planet/bubble-right.png
+share/blam/themes/planet/bubble-nipple.png
+share/blam/themes/planet/bubble-left.png
+share/blam/themes/planet/bubble-bottom.png
+share/blam/themes/planet/bubble-bottom-right.png
+share/blam/themes/planet/bubble-bottom-left.png
+share/blam/themes/pimped/theme.html
+share/blam/themes/pimped/pimped.css
+share/blam/themes/pimped/news.png
+share/blam/themes/pimped/blam.png
+share/blam/themes/blam/theme.html
+share/blam/themes/blam/blam-box-top-right.png
+share/blam/themes/blam/blam-box-top-left.png
+share/blam/themes/blam/blam-box-pad.png
+share/blam/themes/blam/blam-box-bottom-right.png
+share/blam/themes/blam/blam-box-bottom-left.png
+share/blam/themes/akregator/theme.html
+share/blam/collection.xml
+share/pixmaps/blam.png
 share/locale/bg/LC_MESSAGES/blam.mo
 share/locale/bs/LC_MESSAGES/blam.mo
 share/locale/ca/LC_MESSAGES/blam.mo
@@ -82,10 +82,11 @@ share/locale/zh_TW/LC_MESSAGES/blam.mo
 @dirrmtry share/locale/rw
 @dirrmtry share/locale/ne/LC_MESSAGES
 @dirrmtry share/locale/ne
-@dirrm share/gnome/blam/themes/planet
-@dirrm share/gnome/blam/themes/pimped
-@dirrm share/gnome/blam/themes/blam
-@dirrm share/gnome/blam/themes/akregator
-@dirrm share/gnome/blam/themes
-@dirrm share/gnome/blam
+@dirrm share/blam/themes/planet
+@dirrm share/blam/themes/pimped
+@dirrm share/blam/themes/blam
+@dirrm share/blam/themes/akregator
+@dirrm share/blam/themes
+@dirrm share/blam
 @dirrm lib/blam
+@dirrmtry share/applications
diff --git a/net/crescendo/Makefile b/net/crescendo/Makefile
index 652ba39f76c9..0eda368638ad 100644
--- a/net/crescendo/Makefile
+++ b/net/crescendo/Makefile
@@ -3,12 +3,12 @@
 # Whom:                 dirk.meyer@dinoex.sub.org
 #
 # $FreeBSD$
-#    $MCom: ports/net/crescendo/Makefile,v 1.2 2006/10/07 16:29:01 mezz Exp $
+#   $MCom: ports/net/crescendo/Makefile,v 1.6 2007/05/30 18:26:15 mezz Exp $
 #
 
 PORTNAME=	crescendo
 PORTVERSION=	1.1.7
-PORTREVISION=	6
+PORTREVISION=	8
 CATEGORIES=	net gnome
 # Master Site broken
 #MASTER_SITES=	http://crescendo.lyrical.net/files/
@@ -27,7 +27,6 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
 CFLAGS+=	-g
 PLIST_SUB=	DOCDIR=share/doc/${PORTNAME}
-MODIFY=		Makefile.in data/Makefile.in
 
 USE_XLIB=	yes
 USE_GNOME=	gnomelibs
@@ -38,13 +37,6 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|txtOutput|txtNotepadOutput|g' \
 		${WRKSRC}/src/notepad.c
 
-pre-patch:
-.for i in ${MODIFY}
-	@${MV} ${WRKSRC}/${i} ${WRKSRC}/${i}.sed
-	${SED} -e 's=$$(prefix)/share/=$$(datadir)/gnome/=g' \
-		${WRKSRC}/${i}.sed > ${WRKSRC}/${i}
-.endfor
-
 post-install:
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
diff --git a/net/crescendo/pkg-plist b/net/crescendo/pkg-plist
index ca27d66e88b3..e13a206ce6e6 100644
--- a/net/crescendo/pkg-plist
+++ b/net/crescendo/pkg-plist
@@ -1,10 +1,10 @@
 bin/crescendo
-share/gnome/crescendo/cr-about.jpg
-share/gnome/crescendo/cr-splash1.jpg
-share/gnome/crescendo/startup2.wav
+%%DATADIR%%/cr-about.jpg
+%%DATADIR%%/cr-splash1.jpg
+%%DATADIR%%/startup2.wav
 share/gnome/apps/Internet/crescendo.desktop
-share/gnome/pixmaps/crescendo.png
-@dirrm share/gnome/crescendo
+share/pixmaps/crescendo.png
+@dirrm %%DATADIR%%
 %%PORTDOCS%%%%DOCDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCDIR%%/ChangeLog
 %%PORTDOCS%%%%DOCDIR%%/HACKING
diff --git a/net/diradmin/Makefile b/net/diradmin/Makefile
index 1c59cbb13bcc..e268632dffec 100644
--- a/net/diradmin/Makefile
+++ b/net/diradmin/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	diradmin
 PORTVERSION=	1.5.1
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	net
 MASTER_SITES=	http://diradmin.open-it.org/releases/ \
 		http://diradmin.open-it.org/releases/old/
diff --git a/net/diradmin/files/patch-configure b/net/diradmin/files/patch-configure
index 066499b4fe00..68576e1c7018 100644
--- a/net/diradmin/files/patch-configure
+++ b/net/diradmin/files/patch-configure
@@ -9,12 +9,3 @@
  
  
  
-@@ -5625,7 +5625,7 @@
- 
- fi
- 
--PACKAGE_PIXMAPS_DIR="/share/pixmaps/${PACKAGE}"
-+PACKAGE_PIXMAPS_DIR="/share/gnome/pixmaps/${PACKAGE}"
- 
- PACKAGE_APPLNK_DIR="/share/applications"
- SYSTEM_MENU_DIR="/lib/menu"
diff --git a/net/diradmin/pkg-plist b/net/diradmin/pkg-plist
index c01186ec2b6d..4fb65be2b350 100644
--- a/net/diradmin/pkg-plist
+++ b/net/diradmin/pkg-plist
@@ -1,23 +1,23 @@
 bin/directory_administrator
 share/applications/dragonfear-directory_administrator.desktop
-share/gnome/pixmaps/directory_administrator/briefcase.png
-share/gnome/pixmaps/directory_administrator/byruddo.png
-share/gnome/pixmaps/directory_administrator/cellphone.png
-share/gnome/pixmaps/directory_administrator/diradminlogo.ico
-share/gnome/pixmaps/directory_administrator/diradminlogo.png
-share/gnome/pixmaps/directory_administrator/diradminlogo.xcf
-share/gnome/pixmaps/directory_administrator/gnome-computer.png
-share/gnome/pixmaps/directory_administrator/gnome-gnomecard.png
-share/gnome/pixmaps/directory_administrator/gnome-who.png
-share/gnome/pixmaps/directory_administrator/group-icon.xpm
-share/gnome/pixmaps/directory_administrator/house.png
-share/gnome/pixmaps/directory_administrator/ico-mail.png
-share/gnome/pixmaps/directory_administrator/new-16.xpm
-share/gnome/pixmaps/directory_administrator/new.xpm
-share/gnome/pixmaps/directory_administrator/newgroup-16.xpm
-share/gnome/pixmaps/directory_administrator/newgroup.xpm
-share/gnome/pixmaps/directory_administrator/old-group-icon.xpm
-share/gnome/pixmaps/directory_administrator/old-user-icon.xpm
-share/gnome/pixmaps/directory_administrator/user-icon.xpm
-@dirrm share/gnome/pixmaps/directory_administrator
+share/pixmaps/directory_administrator/briefcase.png
+share/pixmaps/directory_administrator/byruddo.png
+share/pixmaps/directory_administrator/cellphone.png
+share/pixmaps/directory_administrator/diradminlogo.ico
+share/pixmaps/directory_administrator/diradminlogo.png
+share/pixmaps/directory_administrator/diradminlogo.xcf
+share/pixmaps/directory_administrator/gnome-computer.png
+share/pixmaps/directory_administrator/gnome-gnomecard.png
+share/pixmaps/directory_administrator/gnome-who.png
+share/pixmaps/directory_administrator/group-icon.xpm
+share/pixmaps/directory_administrator/house.png
+share/pixmaps/directory_administrator/ico-mail.png
+share/pixmaps/directory_administrator/new-16.xpm
+share/pixmaps/directory_administrator/new.xpm
+share/pixmaps/directory_administrator/newgroup-16.xpm
+share/pixmaps/directory_administrator/newgroup.xpm
+share/pixmaps/directory_administrator/old-group-icon.xpm
+share/pixmaps/directory_administrator/old-user-icon.xpm
+share/pixmaps/directory_administrator/user-icon.xpm
+@dirrm share/pixmaps/directory_administrator
 @dirrmtry share/applications
diff --git a/net/ekiga/Makefile b/net/ekiga/Makefile
index e95198e27f28..0f9975eb55b4 100644
--- a/net/ekiga/Makefile
+++ b/net/ekiga/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	ekiga
 PORTVERSION=	2.0.9
+PORTREVISION=	1
 CATEGORIES=	net gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.0
@@ -62,10 +63,4 @@ CONFIGURE_ARGS+=--disable-dbus
 PLIST_SUB+=	DBUS:="@comment "
 .endif
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|@prefix@/@DATADIRNAME@|${PREFIX}/share/gnome|' \
-		${WRKSRC}/*schemas*
-	@${REINPLACE_CMD} -e 's|{datadir}/dbus-1|(prefix)/share/dbus-1|g' \
-		${WRKSRC}/Makefile.in
-
 .include <bsd.port.post.mk>
diff --git a/net/ekiga/pkg-plist b/net/ekiga/pkg-plist
index bc90b586baa8..79263d01bd31 100644
--- a/net/ekiga/pkg-plist
+++ b/net/ekiga/pkg-plist
@@ -4,7 +4,7 @@ bin/ekiga-config-tool
 libdata/bonobo/servers/ekiga.server
 %%DBUS:%%share/dbus-1/services/net.ekiga.helper.service
 %%DBUS:%%share/dbus-1/services/net.ekiga.instance.service
-share/gnome/applications/ekiga.desktop
+share/applications/ekiga.desktop
 share/gnome/help/ekiga/C/ekiga.xml
 share/gnome/help/ekiga/C/figures/accounts_d1.png
 share/gnome/help/ekiga/C/figures/accounts_h323.png
@@ -24,6 +24,25 @@ share/gnome/help/ekiga/C/figures/config_d8.png
 share/gnome/help/ekiga/C/figures/config_d9.png
 share/gnome/help/ekiga/C/figures/lumi.png
 share/gnome/help/ekiga/C/figures/stats.png
+share/gnome/help/ekiga/pt_BR/ekiga.xml
+share/gnome/help/ekiga/pt_BR/figures/accounts_d1.png
+share/gnome/help/ekiga/pt_BR/figures/accounts_h323.png
+share/gnome/help/ekiga/pt_BR/figures/accounts_sip.png
+share/gnome/help/ekiga/pt_BR/figures/audio_codecs.png
+share/gnome/help/ekiga/pt_BR/figures/call_d1.png
+share/gnome/help/ekiga/pt_BR/figures/chat_d1.png
+share/gnome/help/ekiga/pt_BR/figures/config_d1.png
+share/gnome/help/ekiga/pt_BR/figures/config_d10.png
+share/gnome/help/ekiga/pt_BR/figures/config_d2.png
+share/gnome/help/ekiga/pt_BR/figures/config_d3.png
+share/gnome/help/ekiga/pt_BR/figures/config_d4.png
+share/gnome/help/ekiga/pt_BR/figures/config_d5.png
+share/gnome/help/ekiga/pt_BR/figures/config_d6.png
+share/gnome/help/ekiga/pt_BR/figures/config_d7.png
+share/gnome/help/ekiga/pt_BR/figures/config_d8.png
+share/gnome/help/ekiga/pt_BR/figures/config_d9.png
+share/gnome/help/ekiga/pt_BR/figures/lumi.png
+share/gnome/help/ekiga/pt_BR/figures/stats.png
 share/gnome/help/ekiga/bg/ekiga.xml
 share/gnome/help/ekiga/bg/figures/accounts_d1.png
 share/gnome/help/ekiga/bg/figures/accounts_h323.png
@@ -100,25 +119,6 @@ share/gnome/help/ekiga/fr/figures/config_d8.png
 share/gnome/help/ekiga/fr/figures/config_d9.png
 share/gnome/help/ekiga/fr/figures/lumi.png
 share/gnome/help/ekiga/fr/figures/stats.png
-share/gnome/help/ekiga/pt_BR/ekiga.xml
-share/gnome/help/ekiga/pt_BR/figures/accounts_d1.png
-share/gnome/help/ekiga/pt_BR/figures/accounts_h323.png
-share/gnome/help/ekiga/pt_BR/figures/accounts_sip.png
-share/gnome/help/ekiga/pt_BR/figures/audio_codecs.png
-share/gnome/help/ekiga/pt_BR/figures/call_d1.png
-share/gnome/help/ekiga/pt_BR/figures/chat_d1.png
-share/gnome/help/ekiga/pt_BR/figures/config_d1.png
-share/gnome/help/ekiga/pt_BR/figures/config_d10.png
-share/gnome/help/ekiga/pt_BR/figures/config_d2.png
-share/gnome/help/ekiga/pt_BR/figures/config_d3.png
-share/gnome/help/ekiga/pt_BR/figures/config_d4.png
-share/gnome/help/ekiga/pt_BR/figures/config_d5.png
-share/gnome/help/ekiga/pt_BR/figures/config_d6.png
-share/gnome/help/ekiga/pt_BR/figures/config_d7.png
-share/gnome/help/ekiga/pt_BR/figures/config_d8.png
-share/gnome/help/ekiga/pt_BR/figures/config_d9.png
-share/gnome/help/ekiga/pt_BR/figures/lumi.png
-share/gnome/help/ekiga/pt_BR/figures/stats.png
 share/gnome/help/ekiga/sv/ekiga.xml
 share/gnome/help/ekiga/sv/figures/accounts_d1.png
 share/gnome/help/ekiga/sv/figures/accounts_h323.png
@@ -157,22 +157,22 @@ share/gnome/help/ekiga/uk/figures/config_d8.png
 share/gnome/help/ekiga/uk/figures/config_d9.png
 share/gnome/help/ekiga/uk/figures/lumi.png
 share/gnome/help/ekiga/uk/figures/stats.png
-share/gnome/omf/ekiga/ekiga-C.omf
-share/gnome/omf/ekiga/ekiga-bg.omf
-share/gnome/omf/ekiga/ekiga-de.omf
-share/gnome/omf/ekiga/ekiga-es.omf
-share/gnome/omf/ekiga/ekiga-fr.omf
-share/gnome/omf/ekiga/ekiga-pt_BR.omf
-share/gnome/omf/ekiga/ekiga-sv.omf
-share/gnome/omf/ekiga/ekiga-uk.omf
-share/gnome/pixmaps/ekiga.png
-share/gnome/pixmaps/ekiga/ekiga-logo.png
-share/gnome/pixmaps/ekiga/ekiga.png
-share/gnome/sounds/ekiga/busytone.wav
-share/gnome/sounds/ekiga/dialtone.wav
-share/gnome/sounds/ekiga/newmessage.wav
-share/gnome/sounds/ekiga/ring.wav
-share/gnome/sounds/ekiga/voicemail.wav
+share/omf/ekiga/ekiga-C.omf
+share/omf/ekiga/ekiga-bg.omf
+share/omf/ekiga/ekiga-de.omf
+share/omf/ekiga/ekiga-es.omf
+share/omf/ekiga/ekiga-fr.omf
+share/omf/ekiga/ekiga-pt_BR.omf
+share/omf/ekiga/ekiga-sv.omf
+share/omf/ekiga/ekiga-uk.omf
+share/pixmaps/ekiga.png
+share/pixmaps/ekiga/ekiga-logo.png
+share/pixmaps/ekiga/ekiga.png
+share/sounds/ekiga/busytone.wav
+share/sounds/ekiga/dialtone.wav
+share/sounds/ekiga/newmessage.wav
+share/sounds/ekiga/ring.wav
+share/sounds/ekiga/voicemail.wav
 share/locale/am/LC_MESSAGES/ekiga.mo
 share/locale/ar/LC_MESSAGES/ekiga.mo
 share/locale/az/LC_MESSAGES/ekiga.mo
@@ -244,9 +244,9 @@ share/locale/xh/LC_MESSAGES/ekiga.mo
 share/locale/zh_CN/LC_MESSAGES/ekiga.mo
 share/locale/zh_HK/LC_MESSAGES/ekiga.mo
 share/locale/zh_TW/LC_MESSAGES/ekiga.mo
-@dirrm share/gnome/sounds/ekiga
-@dirrm share/gnome/pixmaps/ekiga
-@dirrm share/gnome/omf/ekiga
+@dirrm share/sounds/ekiga
+@dirrm share/pixmaps/ekiga
+@dirrm share/omf/ekiga
 @dirrm share/gnome/help/ekiga/uk/figures
 @dirrm share/gnome/help/ekiga/uk
 @dirrm share/gnome/help/ekiga/sv/figures
@@ -278,3 +278,4 @@ share/locale/zh_TW/LC_MESSAGES/ekiga.mo
 @dirrmtry share/locale/dz
 @dirrmtry share/locale/bn_IN/LC_MESSAGES
 @dirrmtry share/locale/bn_IN
+@dirrmtry share/applications
diff --git a/net/evolution-rss/Makefile b/net/evolution-rss/Makefile
new file mode 100644
index 000000000000..a5922514d0c3
--- /dev/null
+++ b/net/evolution-rss/Makefile
@@ -0,0 +1,33 @@
+# New ports collection makefile for:	evolution-rss
+# Date created:		2007-09-21
+# Whom:			Michael Johnson <ahze@FreeBSD.org>
+#
+# $FreeBSD$
+#    $MCom: ports/net/evolution-rss/Makefile,v 1.2 2007/10/11 12:35:05 ahze Exp $
+
+PORTNAME=	evolution-rss
+PORTVERSION=	0.0.5
+PORTREVISION=	1
+CATEGORIES=	net gnome
+MASTER_SITES=	http://mips.edu.ms/
+
+MAINTAINER=	ahze@FreeBSD.org
+COMMENT=	RSS Feeds support for evolution mail
+
+BUILD_DEPENDS=	evolution:${PORTSDIR}/mail/evolution
+RUN_DEPENDS=	evolution:${PORTSDIR}/mail/evolution
+
+USE_GECKO=	firefox
+USE_GNOME=	intltool
+GNU_CONFIGURE=	yes
+USE_GMAKE=	yes
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
+USE_GETTEXT=	yes
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|@serverdir@|${PREFIX}/libdata/bonobo/servers|' \
+		${WRKSRC}/src/Makefile.in
+
+.include <bsd.port.pre.mk>
+.include "${PORTSDIR}/www/mozilla/bsd.gecko.mk"
+.include <bsd.port.post.mk>
diff --git a/net/evolution-rss/distinfo b/net/evolution-rss/distinfo
new file mode 100644
index 000000000000..d5c12141853c
--- /dev/null
+++ b/net/evolution-rss/distinfo
@@ -0,0 +1,3 @@
+MD5 (evolution-rss-0.0.5.tar.gz) = 227a95b7b7d5c90e930226a9534551c6
+SHA256 (evolution-rss-0.0.5.tar.gz) = ea55cd59c229787bd0a8db1b752b9014b8b5ebda41969a85c6f87154021779bd
+SIZE (evolution-rss-0.0.5.tar.gz) = 422495
diff --git a/net/evolution-rss/pkg-descr b/net/evolution-rss/pkg-descr
new file mode 100644
index 000000000000..aabc4646ef91
--- /dev/null
+++ b/net/evolution-rss/pkg-descr
@@ -0,0 +1,3 @@
+RSS Feeds support for evolution mail
+
+WWW: http://mips.edu.ms/evo/index.php/Evolution_RSS_Reader_Plugin
diff --git a/net/evolution-rss/pkg-plist b/net/evolution-rss/pkg-plist
new file mode 100644
index 000000000000..2b73f273f321
--- /dev/null
+++ b/net/evolution-rss/pkg-plist
@@ -0,0 +1,10 @@
+lib/evolution/2.12/plugins/liborg-gnome-evolution-rss.la
+lib/evolution/2.12/plugins/liborg-gnome-evolution-rss.so
+lib/evolution/2.12/plugins/org-gnome-evolution-rss.eplug
+lib/evolution/2.12/plugins/org-gnome-evolution-rss.xml
+libdata/bonobo/servers/GNOME_Evolution_RSS_2.12.server
+share/evolution/2.12/errors/org-gnome-evolution-rss.error
+share/evolution/2.12/images/rss.png
+share/evolution/glade/rss-ui.glade
+share/locale/en_AU/LC_MESSAGES/evolution-rss.mo
+share/locale/sv/LC_MESSAGES/evolution-rss.mo
diff --git a/net/g2ipmsg/Makefile b/net/g2ipmsg/Makefile
index 9b56fb06800c..91a8f3752891 100644
--- a/net/g2ipmsg/Makefile
+++ b/net/g2ipmsg/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	g2ipmsg
 PORTVERSION=	0.9.3
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	net gnome
 MASTER_SITES=	http://www.ipmsg.org/archive/ \
 		${MASTER_SITE_LOCAL} \
diff --git a/net/g2ipmsg/pkg-plist b/net/g2ipmsg/pkg-plist
index 57915357800b..b0288b1deeeb 100644
--- a/net/g2ipmsg/pkg-plist
+++ b/net/g2ipmsg/pkg-plist
@@ -1,14 +1,15 @@
 bin/g2ipmsg
 bin/g2ipmsg_applet
 libdata/bonobo/servers/g2ipmsg.server
-share/gnome/applications/g2ipmsg.desktop
-share/gnome/gnome-2.0/ui/g2ipmsg.xml
-share/gnome/pixmaps/ipmsg.png
-share/gnome/pixmaps/g2ipmsg/ipmsg.xpm
-share/gnome/pixmaps/g2ipmsg/ipmsgrev.xpm
-share/gnome/sounds/g2ipmsg/g2ipmsg.ogg
+share/applications/g2ipmsg.desktop
+share/gnome-2.0/ui/g2ipmsg.xml
+share/pixmaps/ipmsg.png
+share/pixmaps/g2ipmsg/ipmsg.xpm
+share/pixmaps/g2ipmsg/ipmsgrev.xpm
+share/sounds/g2ipmsg/g2ipmsg.ogg
 share/locale/ja/LC_MESSAGES/g2ipmsg.mo
 @exec   %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
 @unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
-@dirrm share/gnome/sounds/g2ipmsg
-@dirrm share/gnome/pixmaps/g2ipmsg
+@dirrm share/sounds/g2ipmsg
+@dirrm share/pixmaps/g2ipmsg
+@dirrmtry share/applications
diff --git a/net/gnoemoe/Makefile b/net/gnoemoe/Makefile
index 37383a835917..afad5e060acd 100644
--- a/net/gnoemoe/Makefile
+++ b/net/gnoemoe/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gnoemoe
 PORTVERSION=	0.8.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	net
 MASTER_SITES=	http://www.icecrew.nl/software/gnoemoe/download/
 
diff --git a/net/gnoemoe/files/patch-Makefile.in b/net/gnoemoe/files/patch-Makefile.in
deleted file mode 100644
index 29bcf9f697f1..000000000000
--- a/net/gnoemoe/files/patch-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in.orig	Tue Dec 14 09:34:20 2004
-+++ Makefile.in	Fri Jan 14 18:51:47 2005
-@@ -186,7 +186,7 @@
- langdir = $(datadir)/gtksourceview-1.0/language-specs
- lang_DATA = moo.lang
- 
--mimedir = $(datadir)/mime/packages
-+mimedir = $(prefix)/share/mime/packages
- mime_DATA = gnoemoe.xml
- subdir = .
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
diff --git a/net/gnoemoe/files/patch-po-Makefile.in.in b/net/gnoemoe/files/patch-po-Makefile.in.in
deleted file mode 100644
index add512d0d84f..000000000000
--- a/net/gnoemoe/files/patch-po-Makefile.in.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- po/Makefile.in.in.orig	Tue Dec 14 09:34:17 2004
-+++ po/Makefile.in.in	Fri Jan 14 18:34:59 2005
-@@ -29,7 +29,7 @@
- datadir = @datadir@
- libdir = @libdir@
- localedir = $(libdir)/locale
--gnulocaledir = $(datadir)/locale
-+gnulocaledir = $(prefix)/share/locale
- gettextsrcdir = $(datadir)/glib-2.0/gettext/po
- subdir = po
- install_sh = @install_sh@
diff --git a/net/gnoemoe/pkg-plist b/net/gnoemoe/pkg-plist
index 6a10c3c2c292..c86db120f32d 100644
--- a/net/gnoemoe/pkg-plist
+++ b/net/gnoemoe/pkg-plist
@@ -1,50 +1,51 @@
 bin/gnoemoe
-share/gnome/applications/gnoemoe.desktop
-share/gnome/gnoemoe/gnoemoe.glade
-share/gnome/gnoemoe/pixmaps/browser.png
-share/gnome/gnoemoe/pixmaps/close.xpm
-share/gnome/gnoemoe/pixmaps/editor.xpm
-share/gnome/gnoemoe/pixmaps/editor_text.xpm
-share/gnome/gnoemoe/pixmaps/editor_verb.xpm
-share/gnome/gnoemoe/pixmaps/gnoemoe_logo.svg
-share/gnome/gnoemoe/pixmaps/ice-userlist/avail+idle.svg
-share/gnome/gnoemoe/pixmaps/ice-userlist/away+idle.svg
-share/gnome/gnoemoe/pixmaps/ice-userlist/away.svg
-share/gnome/gnoemoe/pixmaps/ice-userlist/busy+idle.svg
-share/gnome/gnoemoe/pixmaps/ice-userlist/busy.svg
-share/gnome/gnoemoe/pixmaps/ice-userlist/inhabitant.svg
-share/gnome/gnoemoe/pixmaps/ice-userlist/programmer.svg
-share/gnome/gnoemoe/pixmaps/ice-userlist/wizard.svg
-share/gnome/gnoemoe/pixmaps/saveclose.xpm
-share/gnome/gnoemoe/pixmaps/terminal.png
-share/gnome/gnoemoe/pixmaps/tray/active.svg
-share/gnome/gnoemoe/pixmaps/tray/default.svg
-share/gnome/gnoemoe/pixmaps/userlist/away.svg
-share/gnome/gnoemoe/pixmaps/userlist/friend.svg
-share/gnome/gnoemoe/pixmaps/userlist/idle.svg
-share/gnome/gnoemoe/pixmaps/userlist/idleaway.svg
-share/gnome/gnoemoe/pixmaps/userlist/inhabitant.svg
-share/gnome/gnoemoe/pixmaps/userlist/inhabitantplus.svg
-share/gnome/gnoemoe/pixmaps/userlist/key.svg
-share/gnome/gnoemoe/pixmaps/userlist/newbie.svg
-share/gnome/gnoemoe/pixmaps/userlist/schooled.svg
-share/gnome/gnoemoe/pixmaps/userlist/star.svg
-share/gnome/gnoemoe/pixmaps/userlist/wizard.svg
-share/gnome/gnoemoe/pixmaps/world.png
-share/gnome/gnoemoe/pixmaps/world_inactive.png
-share/gnome/gnoemoe/scripts/editing.rb
-share/gnome/gnoemoe/scripts/misc.rb
-share/gnome/gnoemoe/scripts/music.rb
-share/gnome/gnoemoe/scripts/run.rb
-share/gnome/gtksourceview-1.0/language-specs/moo.lang
-share/gnome/pixmaps/gnoemoe-logo.svg
+share/applications/gnoemoe.desktop
+share/gnoemoe/gnoemoe.glade
+share/gnoemoe/pixmaps/browser.png
+share/gnoemoe/pixmaps/close.xpm
+share/gnoemoe/pixmaps/editor.xpm
+share/gnoemoe/pixmaps/editor_text.xpm
+share/gnoemoe/pixmaps/editor_verb.xpm
+share/gnoemoe/pixmaps/gnoemoe_logo.svg
+share/gnoemoe/pixmaps/ice-userlist/avail+idle.svg
+share/gnoemoe/pixmaps/ice-userlist/away+idle.svg
+share/gnoemoe/pixmaps/ice-userlist/away.svg
+share/gnoemoe/pixmaps/ice-userlist/busy+idle.svg
+share/gnoemoe/pixmaps/ice-userlist/busy.svg
+share/gnoemoe/pixmaps/ice-userlist/inhabitant.svg
+share/gnoemoe/pixmaps/ice-userlist/programmer.svg
+share/gnoemoe/pixmaps/ice-userlist/wizard.svg
+share/gnoemoe/pixmaps/saveclose.xpm
+share/gnoemoe/pixmaps/terminal.png
+share/gnoemoe/pixmaps/tray/active.svg
+share/gnoemoe/pixmaps/tray/default.svg
+share/gnoemoe/pixmaps/userlist/away.svg
+share/gnoemoe/pixmaps/userlist/friend.svg
+share/gnoemoe/pixmaps/userlist/idle.svg
+share/gnoemoe/pixmaps/userlist/idleaway.svg
+share/gnoemoe/pixmaps/userlist/inhabitant.svg
+share/gnoemoe/pixmaps/userlist/inhabitantplus.svg
+share/gnoemoe/pixmaps/userlist/key.svg
+share/gnoemoe/pixmaps/userlist/newbie.svg
+share/gnoemoe/pixmaps/userlist/schooled.svg
+share/gnoemoe/pixmaps/userlist/star.svg
+share/gnoemoe/pixmaps/userlist/wizard.svg
+share/gnoemoe/pixmaps/world.png
+share/gnoemoe/pixmaps/world_inactive.png
+share/gnoemoe/scripts/editing.rb
+share/gnoemoe/scripts/misc.rb
+share/gnoemoe/scripts/music.rb
+share/gnoemoe/scripts/run.rb
+share/gtksourceview-1.0/language-specs/moo.lang
+share/pixmaps/gnoemoe-logo.svg
 share/locale/nl/LC_MESSAGES/gnoemoe.mo
 share/mime/packages/gnoemoe.xml
-@dirrm share/gnome/gnoemoe/scripts
-@dirrm share/gnome/gnoemoe/pixmaps/userlist
-@dirrm share/gnome/gnoemoe/pixmaps/tray
-@dirrm share/gnome/gnoemoe/pixmaps/ice-userlist
-@dirrm share/gnome/gnoemoe/pixmaps
-@dirrm share/gnome/gnoemoe
+@dirrm share/gnoemoe/scripts
+@dirrm share/gnoemoe/pixmaps/userlist
+@dirrm share/gnoemoe/pixmaps/tray
+@dirrm share/gnoemoe/pixmaps/ice-userlist
+@dirrm share/gnoemoe/pixmaps
+@dirrm share/gnoemoe
 @exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
 @unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
+@dirrmtry share/applications
diff --git a/net/gnome-mud/Makefile b/net/gnome-mud/Makefile
index 18fcd99193e4..01c7a9d30126 100644
--- a/net/gnome-mud/Makefile
+++ b/net/gnome-mud/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gnome-mud
 PORTVERSION=	0.10.7
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	net gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:R}
diff --git a/net/gnome-mud/pkg-plist b/net/gnome-mud/pkg-plist
index f81f91edef0d..07ae39f92ee2 100644
--- a/net/gnome-mud/pkg-plist
+++ b/net/gnome-mud/pkg-plist
@@ -1,6 +1,6 @@
 bin/gnome-mud
-share/gnome/applications/gnome-mud.desktop
-share/gnome/gnome-mud/directions.glade
+share/applications/gnome-mud.desktop
+share/gnome-mud/directions.glade
 share/gnome/help/gnome-mud/C/figures/connections-window.png
 share/gnome/help/gnome-mud/C/figures/main-window.png
 share/gnome/help/gnome-mud/C/figures/mudlist-window.png
@@ -9,12 +9,12 @@ share/gnome/help/gnome-mud/C/figures/profiles-window.png
 share/gnome/help/gnome-mud/C/gnome-mud-manual.xml
 share/gnome/help/gnome-mud/C/gnome-mud-plugin-api.xml
 share/gnome/help/gnome-mud/C/monitor.py
-share/gnome/omf/gnome-mud/gnome-mud-manual-C.omf
-share/gnome/omf/gnome-mud/gnome-mud-plugin-api-C.omf
-share/gnome/pixmaps/gnome-mud/connection-offline.png
-share/gnome/pixmaps/gnome-mud/connection-online.png
-share/gnome/pixmaps/gnome-mud/gnome-mud-tray-icon.png
-share/gnome/pixmaps/gnome-mud.png
+share/omf/gnome-mud/gnome-mud-manual-C.omf
+share/omf/gnome-mud/gnome-mud-plugin-api-C.omf
+share/pixmaps/gnome-mud/connection-offline.png
+share/pixmaps/gnome-mud/connection-online.png
+share/pixmaps/gnome-mud/gnome-mud-tray-icon.png
+share/pixmaps/gnome-mud.png
 share/locale/az/LC_MESSAGES/gnome-mud.mo
 share/locale/ca/LC_MESSAGES/gnome-mud.mo
 share/locale/cs/LC_MESSAGES/gnome-mud.mo
@@ -37,11 +37,12 @@ share/locale/sr@Latn/LC_MESSAGES/gnome-mud.mo
 share/locale/sv/LC_MESSAGES/gnome-mud.mo
 share/locale/tr/LC_MESSAGES/gnome-mud.mo
 share/locale/zh_CN/LC_MESSAGES/gnome-mud.mo
-@dirrm share/gnome/pixmaps/gnome-mud
-@dirrm share/gnome/omf/gnome-mud
+@dirrm share/pixmaps/gnome-mud
+@dirrm share/omf/gnome-mud
 @dirrm share/gnome/help/gnome-mud/C/figures
 @dirrm share/gnome/help/gnome-mud/C
 @dirrm share/gnome/help/gnome-mud
-@dirrm share/gnome/gnome-mud
+@dirrm share/gnome-mud
 @dirrmtry share/locale/rw/LC_MESSAGES
 @dirrmtry share/locale/rw
+@dirrmtry share/applications
diff --git a/net/gnome-netstatus/Makefile b/net/gnome-netstatus/Makefile
index 2f3e70cd5629..e9819bf3807c 100644
--- a/net/gnome-netstatus/Makefile
+++ b/net/gnome-netstatus/Makefile
@@ -3,16 +3,15 @@
 # Whom:				Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/net/gnome-netstatus/Makefile,v 1.41 2006/07/23 01:10:49 mezz Exp $
+#   $MCom: ports/net/gnome-netstatus/Makefile,v 1.48 2007/07/04 21:42:20 marcus Exp $
 #
 
 PORTNAME=	gnome-netstatus
 PORTVERSION=	2.12.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	net gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/gnome-netstatus/2.12
-DISTNAME=	gnome-netstatus-${PORTVERSION}
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/net/gnome-netstatus/pkg-plist b/net/gnome-netstatus/pkg-plist
index aa2ec728fad4..b9ca84c79d5c 100644
--- a/net/gnome-netstatus/pkg-plist
+++ b/net/gnome-netstatus/pkg-plist
@@ -1,7 +1,7 @@
 libdata/bonobo/servers/GNOME_NetstatusApplet_Factory.server
 libexec/gnome-netstatus-applet
-share/gnome/gnome-2.0/ui/GNOME_NetstatusApplet.xml
-share/gnome/gnome-netstatus/gnome-netstatus.glade
+share/gnome-2.0/ui/GNOME_NetstatusApplet.xml
+share/gnome-netstatus/gnome-netstatus.glade
 share/gnome/help/gnome-netstatus/C/gnome-netstatus.xml
 share/gnome/help/gnome-netstatus/C/legal.xml
 share/gnome/help/gnome-netstatus/bg/gnome-netstatus.xml
@@ -68,23 +68,23 @@ share/gnome/help/gnome-netstatus/zh_TW/figures/gnome-netstatus-tx.png
 share/gnome/help/gnome-netstatus/zh_TW/figures/gnome-netstatus-txrx.png
 share/gnome/help/gnome-netstatus/zh_TW/gnome-netstatus.xml
 share/gnome/help/gnome-netstatus/zh_TW/legal.xml
-share/gnome/omf/gnome-netstatus/gnome-netstatus-C.omf
-share/gnome/omf/gnome-netstatus/gnome-netstatus-bg.omf
-share/gnome/omf/gnome-netstatus/gnome-netstatus-de.omf
-share/gnome/omf/gnome-netstatus/gnome-netstatus-es.omf
-share/gnome/omf/gnome-netstatus/gnome-netstatus-fr.omf
-share/gnome/omf/gnome-netstatus/gnome-netstatus-it.omf
-share/gnome/omf/gnome-netstatus/gnome-netstatus-ja.omf
-share/gnome/omf/gnome-netstatus/gnome-netstatus-ko.omf
-share/gnome/omf/gnome-netstatus/gnome-netstatus-nl.omf
-share/gnome/omf/gnome-netstatus/gnome-netstatus-pa.omf
-share/gnome/omf/gnome-netstatus/gnome-netstatus-ru.omf
-share/gnome/omf/gnome-netstatus/gnome-netstatus-sv.omf
-share/gnome/omf/gnome-netstatus/gnome-netstatus-uk.omf
-share/gnome/omf/gnome-netstatus/gnome-netstatus-zh_CN.omf
-share/gnome/omf/gnome-netstatus/gnome-netstatus-zh_HK.omf
-share/gnome/omf/gnome-netstatus/gnome-netstatus-zh_TW.omf
-share/gnome/pixmaps/gnome-netstatus-tx.png
+share/omf/gnome-netstatus/gnome-netstatus-C.omf
+share/omf/gnome-netstatus/gnome-netstatus-bg.omf
+share/omf/gnome-netstatus/gnome-netstatus-de.omf
+share/omf/gnome-netstatus/gnome-netstatus-es.omf
+share/omf/gnome-netstatus/gnome-netstatus-fr.omf
+share/omf/gnome-netstatus/gnome-netstatus-it.omf
+share/omf/gnome-netstatus/gnome-netstatus-ja.omf
+share/omf/gnome-netstatus/gnome-netstatus-ko.omf
+share/omf/gnome-netstatus/gnome-netstatus-nl.omf
+share/omf/gnome-netstatus/gnome-netstatus-pa.omf
+share/omf/gnome-netstatus/gnome-netstatus-ru.omf
+share/omf/gnome-netstatus/gnome-netstatus-sv.omf
+share/omf/gnome-netstatus/gnome-netstatus-uk.omf
+share/omf/gnome-netstatus/gnome-netstatus-zh_CN.omf
+share/omf/gnome-netstatus/gnome-netstatus-zh_HK.omf
+share/omf/gnome-netstatus/gnome-netstatus-zh_TW.omf
+share/pixmaps/gnome-netstatus-tx.png
 share/icons/hicolor/48x48/apps/gnome-netstatus-0-24.png
 share/icons/hicolor/48x48/apps/gnome-netstatus-25-49.png
 share/icons/hicolor/48x48/apps/gnome-netstatus-50-74.png
@@ -164,7 +164,7 @@ share/locale/xh/LC_MESSAGES/gnome-netstatus.mo
 share/locale/zh_CN/LC_MESSAGES/gnome-netstatus.mo
 share/locale/zh_HK/LC_MESSAGES/gnome-netstatus.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-netstatus.mo
-@dirrm share/gnome/omf/gnome-netstatus
+@dirrm share/omf/gnome-netstatus
 @dirrm share/gnome/help/gnome-netstatus/zh_TW/figures
 @dirrm share/gnome/help/gnome-netstatus/zh_TW
 @dirrm share/gnome/help/gnome-netstatus/zh_HK/figures
@@ -189,7 +189,7 @@ share/locale/zh_TW/LC_MESSAGES/gnome-netstatus.mo
 @dirrm share/gnome/help/gnome-netstatus/bg
 @dirrm share/gnome/help/gnome-netstatus/C
 @dirrm share/gnome/help/gnome-netstatus
-@dirrm share/gnome/gnome-netstatus
+@dirrm share/gnome-netstatus
 @dirrmtry share/locale/zh_HK/LC_MESSAGES
 @dirrmtry share/locale/zh_HK
 @dirrmtry share/locale/xh/LC_MESSAGES
diff --git a/net/gnome-nettool/Makefile b/net/gnome-nettool/Makefile
index 11546a4107df..5463ef66074c 100644
--- a/net/gnome-nettool/Makefile
+++ b/net/gnome-nettool/Makefile
@@ -3,12 +3,11 @@
 # Whom:				Adam Weinberger <adamw@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/net/gnome-nettool/Makefile,v 1.35 2007/03/13 12:41:51 ahze Exp $
+#   $MCom: ports/net/gnome-nettool/Makefile,v 1.40 2007/09/18 14:09:24 ahze Exp $
 #
 
 PORTNAME=	gnome-nettool
-PORTVERSION=	2.18.0
-PORTREVISION=	1
+PORTVERSION=	2.20.0
 PORTEPOCH=	1
 CATEGORIES=	net gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
@@ -32,8 +31,8 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 CFLAGS+=	-DHAVE_SOCKADDR_SA_LEN
 
 post-install:
-	${MKDIR} ${PREFIX}/share/gnome/pixmaps
-	${LN} -sf ${PREFIX}/share/gnome/gnome-nettool/pixmaps/gnome-nettool.png \
-		${PREFIX}/share/gnome/pixmaps/gnome-nettool.png
+	${MKDIR} ${PREFIX}/share/pixmaps
+	${LN} -sf ${PREFIX}/share/gnome-nettool/pixmaps/gnome-nettool.png \
+		${PREFIX}/share/pixmaps/gnome-nettool.png
 
 .include <bsd.port.mk>
diff --git a/net/gnome-nettool/distinfo b/net/gnome-nettool/distinfo
index 9adbfe2e9736..60572e77e0f0 100644
--- a/net/gnome-nettool/distinfo
+++ b/net/gnome-nettool/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-nettool-2.18.0.tar.bz2) = 596616cf631b5bc9ec0c873208ccfce9
-SHA256 (gnome2/gnome-nettool-2.18.0.tar.bz2) = 348b6c0f0c7d58df1514f87956e6987fcccc418d1cfea98a1f3a1b84e4d60e57
-SIZE (gnome2/gnome-nettool-2.18.0.tar.bz2) = 511010
+MD5 (gnome2/gnome-nettool-2.20.0.tar.bz2) = 8f16e4207655ccf1e7af679fc0f58bbd
+SHA256 (gnome2/gnome-nettool-2.20.0.tar.bz2) = 8668dfa5b7d97245ffe5d53630b891d17f22e86c237ca9b8345774b20d745c15
+SIZE (gnome2/gnome-nettool-2.20.0.tar.bz2) = 572137
diff --git a/net/gnome-nettool/pkg-plist b/net/gnome-nettool/pkg-plist
index 17424514cc9a..50ceb8333f26 100644
--- a/net/gnome-nettool/pkg-plist
+++ b/net/gnome-nettool/pkg-plist
@@ -1,24 +1,28 @@
 bin/gnome-nettool
-share/gnome/applications/gnome-nettool.desktop
-share/gnome/gnome-nettool/dialogs/gnome-nettool.glade
-share/gnome/gnome-nettool/pixmaps/16_ethernet.xpm
-share/gnome/gnome-nettool/pixmaps/16_loopback.xpm
-share/gnome/gnome-nettool/pixmaps/16_plip.xpm
-share/gnome/gnome-nettool/pixmaps/16_ppp.xpm
-share/gnome/gnome-nettool/pixmaps/irda-16.png
-share/gnome/gnome-nettool/pixmaps/network.png
-share/gnome/gnome-nettool/pixmaps/wavelan-16.png
+share/applications/gnome-nettool.desktop
+%%DATADIR%%/dialogs/gnome-nettool.glade
+%%DATADIR%%/pixmaps/16_ethernet.xpm
+%%DATADIR%%/pixmaps/16_loopback.xpm
+%%DATADIR%%/pixmaps/16_plip.xpm
+%%DATADIR%%/pixmaps/16_ppp.xpm
+%%DATADIR%%/pixmaps/gnome-nettool.png
+%%DATADIR%%/pixmaps/irda-16.png
+%%DATADIR%%/pixmaps/network.png
+%%DATADIR%%/pixmaps/wavelan-16.png
 share/gnome/help/gnome-nettool/C/gnome-nettool.xml
 share/gnome/help/gnome-nettool/C/legal.xml
+share/gnome/help/gnome-nettool/ca/gnome-nettool.xml
+share/gnome/help/gnome-nettool/es/gnome-nettool.xml
 share/gnome/help/gnome-nettool/fr/gnome-nettool.xml
+share/gnome/help/gnome-nettool/oc/gnome-nettool.xml
 share/gnome/help/gnome-nettool/pa/gnome-nettool.xml
 share/gnome/help/gnome-nettool/sv/gnome-nettool.xml
-share/gnome/omf/gnome-nettool/gnome-nettool-C.omf
-share/gnome/omf/gnome-nettool/gnome-nettool-fr.omf
-share/gnome/omf/gnome-nettool/gnome-nettool-pa.omf
-share/gnome/omf/gnome-nettool/gnome-nettool-sv.omf
-share/gnome/pixmaps/gnome-nettool.png
-share/icons/hicolor/48x48/apps/gnome-nettool.png
+share/gnome/help/gnome-nettool/uk/gnome-nettool.xml
+share/gnome/help/gnome-nettool/vi/gnome-nettool.xml
+share/icons/hicolor/16x16/apps/gnome-nettool.png
+share/icons/hicolor/22x22/apps/gnome-nettool.png
+share/icons/hicolor/32x32/apps/gnome-nettool.png
+share/icons/hicolor/scalable/apps/gnome-nettool.svg
 share/locale/ar/LC_MESSAGES/gnome-nettool.mo
 share/locale/az/LC_MESSAGES/gnome-nettool.mo
 share/locale/bg/LC_MESSAGES/gnome-nettool.mo
@@ -63,6 +67,7 @@ share/locale/ms/LC_MESSAGES/gnome-nettool.mo
 share/locale/nb/LC_MESSAGES/gnome-nettool.mo
 share/locale/ne/LC_MESSAGES/gnome-nettool.mo
 share/locale/nl/LC_MESSAGES/gnome-nettool.mo
+share/locale/oc/LC_MESSAGES/gnome-nettool.mo
 share/locale/or/LC_MESSAGES/gnome-nettool.mo
 share/locale/pa/LC_MESSAGES/gnome-nettool.mo
 share/locale/pl/LC_MESSAGES/gnome-nettool.mo
@@ -71,6 +76,7 @@ share/locale/pt_BR/LC_MESSAGES/gnome-nettool.mo
 share/locale/ro/LC_MESSAGES/gnome-nettool.mo
 share/locale/ru/LC_MESSAGES/gnome-nettool.mo
 share/locale/rw/LC_MESSAGES/gnome-nettool.mo
+share/locale/si/LC_MESSAGES/gnome-nettool.mo
 share/locale/sk/LC_MESSAGES/gnome-nettool.mo
 share/locale/sl/LC_MESSAGES/gnome-nettool.mo
 share/locale/sq/LC_MESSAGES/gnome-nettool.mo
@@ -78,6 +84,7 @@ share/locale/sr/LC_MESSAGES/gnome-nettool.mo
 share/locale/sr@Latn/LC_MESSAGES/gnome-nettool.mo
 share/locale/sv/LC_MESSAGES/gnome-nettool.mo
 share/locale/ta/LC_MESSAGES/gnome-nettool.mo
+share/locale/te/LC_MESSAGES/gnome-nettool.mo
 share/locale/th/LC_MESSAGES/gnome-nettool.mo
 share/locale/tr/LC_MESSAGES/gnome-nettool.mo
 share/locale/uk/LC_MESSAGES/gnome-nettool.mo
@@ -87,12 +94,42 @@ share/locale/xh/LC_MESSAGES/gnome-nettool.mo
 share/locale/zh_CN/LC_MESSAGES/gnome-nettool.mo
 share/locale/zh_HK/LC_MESSAGES/gnome-nettool.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-nettool.mo
+share/omf/gnome-nettool/gnome-nettool-C.omf
+share/omf/gnome-nettool/gnome-nettool-ca.omf
+share/omf/gnome-nettool/gnome-nettool-es.omf
+share/omf/gnome-nettool/gnome-nettool-fr.omf
+share/omf/gnome-nettool/gnome-nettool-oc.omf
+share/omf/gnome-nettool/gnome-nettool-pa.omf
+share/omf/gnome-nettool/gnome-nettool-sv.omf
+share/omf/gnome-nettool/gnome-nettool-uk.omf
+share/omf/gnome-nettool/gnome-nettool-vi.omf
+share/pixmaps/gnome-nettool.png
+@dirrm share/omf/gnome-nettool
+@dirrm share/gnome/help/gnome-nettool/vi
+@dirrm share/gnome/help/gnome-nettool/uk
+@dirrm share/gnome/help/gnome-nettool/sv
+@dirrm share/gnome/help/gnome-nettool/pa
+@dirrm share/gnome/help/gnome-nettool/oc
+@dirrm share/gnome/help/gnome-nettool/fr
+@dirrm share/gnome/help/gnome-nettool/es
+@dirrm share/gnome/help/gnome-nettool/ca
+@dirrm share/gnome/help/gnome-nettool/C
+@dirrm share/gnome/help/gnome-nettool
+@dirrm %%DATADIR%%/pixmaps
+@dirrm %%DATADIR%%/dialogs
+@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/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
@@ -101,12 +138,4 @@ share/locale/zh_TW/LC_MESSAGES/gnome-nettool.mo
 @dirrmtry share/locale/dz
 @dirrmtry share/locale/bn_IN/LC_MESSAGES
 @dirrmtry share/locale/bn_IN
-@dirrm share/gnome/omf/gnome-nettool
-@dirrm share/gnome/help/gnome-nettool/sv
-@dirrm share/gnome/help/gnome-nettool/pa
-@dirrm share/gnome/help/gnome-nettool/fr
-@dirrm share/gnome/help/gnome-nettool/C
-@dirrm share/gnome/help/gnome-nettool
-@dirrm share/gnome/gnome-nettool/pixmaps
-@dirrm share/gnome/gnome-nettool/dialogs
-@dirrm share/gnome/gnome-nettool
+@dirrmtry share/applications
diff --git a/net/gnometelnet/Makefile b/net/gnometelnet/Makefile
index b5e920472335..0cd8ffd84407 100644
--- a/net/gnometelnet/Makefile
+++ b/net/gnometelnet/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gnometelnet
 PORTVERSION=	2.5
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	net gnome
 MASTER_SITES=	http://www.cyest.org/downloads/
 DISTNAME=	${PORTNAME:S/gnome/gnome-/}-${PORTVERSION}
@@ -34,11 +34,11 @@ post-install:
 	@${MKDIR} ${PREFIX}/share/gnome/apps/Internet
 	${INSTALL_DATA} ${WRKSRC}/share/GTelnet.desktop \
 		${PREFIX}/share/gnome/apps/Internet
-	@${MKDIR} ${PREFIX}/share/gnome/pixmaps
+	@${MKDIR} ${PREFIX}/share/pixmaps
 	${INSTALL_DATA} ${WRKSRC}/share/*.png \
-		${PREFIX}/share/gnome/pixmaps
-	@${MKDIR} ${PREFIX}/share/gnome/pixmaps/gnome-telnet
+		${PREFIX}/share/pixmaps
+	@${MKDIR} ${PREFIX}/share/pixmaps/gnome-telnet
 	${INSTALL_DATA} ${WRKSRC}/share/*.jpg \
-		${PREFIX}/share/gnome/pixmaps/gnome-telnet
+		${PREFIX}/share/pixmaps/gnome-telnet
 
 .include <bsd.port.mk>
diff --git a/net/gnometelnet/pkg-plist b/net/gnometelnet/pkg-plist
index 094b0af242fa..5d8b745db1cd 100644
--- a/net/gnometelnet/pkg-plist
+++ b/net/gnometelnet/pkg-plist
@@ -1,9 +1,9 @@
 bin/gnome-telnet
 share/gnome/apps/Internet/GTelnet.desktop
-share/gnome/pixmaps/gnome-telnet.png
-share/gnome/pixmaps/gnome-telnet/gtelnet_bg_black.jpg
-share/gnome/pixmaps/gnome-telnet/gtelnet_bg_brown.jpg
 share/locale/de/LC_MESSAGES/gnome-telnet.mo
 share/locale/ja/LC_MESSAGES/gnome-telnet.mo
 share/locale/sl/LC_MESSAGES/gnome-telnet.mo
-@dirrm share/gnome/pixmaps/gnome-telnet
+share/pixmaps/gnome-telnet.png
+share/pixmaps/gnome-telnet/gtelnet_bg_black.jpg
+share/pixmaps/gnome-telnet/gtelnet_bg_brown.jpg
+@dirrm share/pixmaps/gnome-telnet
diff --git a/net/grdesktop/Makefile b/net/grdesktop/Makefile
index b686cb551382..ac48ed74160b 100644
--- a/net/grdesktop/Makefile
+++ b/net/grdesktop/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	grdesktop
 PORTVERSION=	0.23
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SAVANNAH}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -32,6 +32,6 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|^\(GETTEXT_PACKAGE =\).*|\1 grdesktop|' ${WRKSRC}/po/Makefile.in.in
 
 post-install:
-	@${INSTALL_DATA} ${PREFIX}/share/gnome/pixmaps/grdesktop/icon.png ${PREFIX}/share/gnome/pixmaps/grdesktop.png
+	@${INSTALL_DATA} ${PREFIX}/share/pixmaps/grdesktop/icon.png ${PREFIX}/share/pixmaps/grdesktop.png
 
 .include <bsd.port.mk>
diff --git a/net/grdesktop/pkg-plist b/net/grdesktop/pkg-plist
index db5c067d03fb..daca75f736a0 100644
--- a/net/grdesktop/pkg-plist
+++ b/net/grdesktop/pkg-plist
@@ -1,32 +1,33 @@
 bin/grdesktop
-share/gnome/application-registry/grdesktop.applications
-share/gnome/applications/grdesktop.desktop
+share/application-registry/grdesktop.applications
+share/applications/grdesktop.desktop
 share/gnome/help/grdesktop/C/grdesktop.xml
 share/gnome/help/grdesktop/C/legal.xml
-share/gnome/mime-info/grdesktop.keys
-share/gnome/mime-info/grdesktop.mime
-share/gnome/omf/grdesktop/grdesktop-C.omf
-share/gnome/pixmaps/grdesktop/animation.gif
-share/gnome/pixmaps/grdesktop/colors_1.png
-share/gnome/pixmaps/grdesktop/colors_2.png
-share/gnome/pixmaps/grdesktop/colors_3.png
-share/gnome/pixmaps/grdesktop/colors_4.png
-share/gnome/pixmaps/grdesktop/folder.png
-share/gnome/pixmaps/grdesktop/host.png
-share/gnome/pixmaps/grdesktop/icon.png
-share/gnome/pixmaps/grdesktop/icon.xpm
-share/gnome/pixmaps/grdesktop/keyboard.png
-share/gnome/pixmaps/grdesktop/monitor.png
-share/gnome/pixmaps/grdesktop/program.png
-share/gnome/pixmaps/grdesktop/settings.png
-share/gnome/pixmaps/grdesktop/sound.png
-share/gnome/pixmaps/grdesktop/topimage.png
-share/gnome/pixmaps/grdesktop/topimage2.png
-share/gnome/pixmaps/grdesktop.png
+share/mime-info/grdesktop.keys
+share/mime-info/grdesktop.mime
+share/omf/grdesktop/grdesktop-C.omf
+share/pixmaps/grdesktop/animation.gif
+share/pixmaps/grdesktop/colors_1.png
+share/pixmaps/grdesktop/colors_2.png
+share/pixmaps/grdesktop/colors_3.png
+share/pixmaps/grdesktop/colors_4.png
+share/pixmaps/grdesktop/folder.png
+share/pixmaps/grdesktop/host.png
+share/pixmaps/grdesktop/icon.png
+share/pixmaps/grdesktop/icon.xpm
+share/pixmaps/grdesktop/keyboard.png
+share/pixmaps/grdesktop/monitor.png
+share/pixmaps/grdesktop/program.png
+share/pixmaps/grdesktop/settings.png
+share/pixmaps/grdesktop/sound.png
+share/pixmaps/grdesktop/topimage.png
+share/pixmaps/grdesktop/topimage2.png
+share/pixmaps/grdesktop.png
 share/locale/de/LC_MESSAGES/grdesktop.mo
 share/locale/es/LC_MESSAGES/grdesktop.mo
 share/locale/fr/LC_MESSAGES/grdesktop.mo
-@dirrm share/gnome/pixmaps/grdesktop
-@dirrm share/gnome/omf/grdesktop
+@dirrm share/pixmaps/grdesktop
+@dirrm share/omf/grdesktop
 @dirrm share/gnome/help/grdesktop/C
 @dirrm share/gnome/help/grdesktop
+@dirrmtry share/applications
diff --git a/net/liferea/Makefile b/net/liferea/Makefile
index 9b81041d9aa8..f88bc70c84f2 100644
--- a/net/liferea/Makefile
+++ b/net/liferea/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	liferea
 PORTVERSION=	1.4.5b
+PORTREVISION=	1
 CATEGORIES=	net gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	liferea
@@ -17,7 +18,7 @@ COMMENT=	Simple RSS/RDF feed reader
 LIB_DEPENDS=	sqlite3.8:${PORTSDIR}/databases/sqlite3
 
 USE_GECKO=	mozilla firefox
-USE_GNOME=	gnomeprefix gnomehack libgtkhtml
+USE_GNOME=	gnomeprefix gnomehack libgtkhtml libglade2
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/net/liferea/pkg-plist b/net/liferea/pkg-plist
index ba1caf1d9bab..2922c74f7598 100644
--- a/net/liferea/pkg-plist
+++ b/net/liferea/pkg-plist
@@ -9,120 +9,120 @@ lib/liferea/liblihtmlg.so
 %%NOTIFY%%lib/liferea/liblinotiflibnotify.la
 %%NOTIFY%%lib/liferea/liblinotiflibnotify.so
 %%NOTIFY%%lib/liferea/liblinotiflibnotify.so.0
-share/gnome/applications/liferea.desktop
-share/gnome/liferea/bloglines_source.glade
-share/gnome/liferea/google_source.glade
-share/gnome/liferea/liferea.glade
-share/gnome/liferea/node_source.glade
-share/gnome/liferea/opml_source.glade
-share/gnome/liferea/css/adblock.css
-share/gnome/liferea/css/liferea.css
-share/gnome/liferea/doc/html/about_de.html
-share/gnome/liferea/doc/html/about_en.html
-share/gnome/liferea/doc/html/concepts_de.html
-share/gnome/liferea/doc/html/concepts_en.html
-share/gnome/liferea/doc/html/enclosures_de.html
-share/gnome/liferea/doc/html/enclosures_en.html
-share/gnome/liferea/doc/html/faq_de.html
-share/gnome/liferea/doc/html/faq_en.html
-share/gnome/liferea/doc/html/faq_ja.html
-share/gnome/liferea/doc/html/folders_de.html
-share/gnome/liferea/doc/html/folders_en.html
-share/gnome/liferea/doc/html/headlines_de.html
-share/gnome/liferea/doc/html/headlines_en.html
-share/gnome/liferea/doc/html/help_feed_default.png
-share/gnome/liferea/doc/html/help_feed_error.png
-share/gnome/liferea/doc/html/help_feed_prop_adv_1.4.0.png
-share/gnome/liferea/doc/html/help_feed_prop_cache_1.4.0.png
-share/gnome/liferea/doc/html/help_feed_prop_downl_1.4.0.png
-share/gnome/liferea/doc/html/help_feed_prop_general_1.4.0.png
-share/gnome/liferea/doc/html/help_feed_prop_source_1.4.0.png
-share/gnome/liferea/doc/html/help_folder.png
-share/gnome/liferea/doc/html/help_item_flag.png
-share/gnome/liferea/doc/html/help_item_unread.png
-share/gnome/liferea/doc/html/help_opml.png
-share/gnome/liferea/doc/html/help_prefs_browser_1.4.0.png
-share/gnome/liferea/doc/html/help_prefs_enclosures_1.4.0.png
-share/gnome/liferea/doc/html/help_prefs_feeds_1.4.0.png
-share/gnome/liferea/doc/html/help_prefs_folders_1.4.0.png
-share/gnome/liferea/doc/html/help_prefs_gui_1.4.0.png
-share/gnome/liferea/doc/html/help_prefs_headlines_1.4.0.png
-share/gnome/liferea/doc/html/help_prefs_proxy_1.4.0.png
-share/gnome/liferea/doc/html/help_search_1.4.0.png
-share/gnome/liferea/doc/html/help_source_add_1.4.0.png
-share/gnome/liferea/doc/html/help_subscribe_1.4.0.png
-share/gnome/liferea/doc/html/help_vfolder_1.4.0.png
-share/gnome/liferea/doc/html/newsbin_de.html
-share/gnome/liferea/doc/html/newsbin_en.html
-share/gnome/liferea/doc/html/preferences_de.html
-share/gnome/liferea/doc/html/preferences_en.html
-share/gnome/liferea/doc/html/reference.css
-share/gnome/liferea/doc/html/reference_de.html
-share/gnome/liferea/doc/html/reference_en.html
-share/gnome/liferea/doc/html/reference_ja.html
-share/gnome/liferea/doc/html/reference_nl.html
-share/gnome/liferea/doc/html/searching_de.html
-share/gnome/liferea/doc/html/searching_en.html
-share/gnome/liferea/doc/html/subscriptions_de.html
-share/gnome/liferea/doc/html/subscriptions_en.html
-share/gnome/liferea/doc/html/topics_de.html
-share/gnome/liferea/doc/html/topics_en.html
-share/gnome/liferea/doc/html/topics_ja.html
-share/gnome/liferea/doc/html/updating_de.html
-share/gnome/liferea/doc/html/updating_en.html
-share/gnome/liferea/dtd/html.ent
-share/gnome/liferea/media/xspf_license.txt
-share/gnome/liferea/media/xspf_player_slim.swf
-share/gnome/liferea/opml/feedlist.opml
-share/gnome/liferea/opml/feedlist_ca.opml
-share/gnome/liferea/opml/feedlist_de.opml
-share/gnome/liferea/opml/feedlist_es.opml
-share/gnome/liferea/opml/feedlist_eu.opml
-share/gnome/liferea/opml/feedlist_fr.opml
-share/gnome/liferea/opml/feedlist_nl.opml
-share/gnome/liferea/opml/feedlist_pl.opml
-share/gnome/liferea/opml/feedlist_sk.opml
-share/gnome/liferea/opml/feedlist_sv.opml
-share/gnome/liferea/opml/feedlist_tr.opml
-share/gnome/liferea/pixmaps/arrow.png
-share/gnome/liferea/pixmaps/attachment.png
-share/gnome/liferea/pixmaps/available.png
-share/gnome/liferea/pixmaps/available_offline.png
-share/gnome/liferea/pixmaps/bookmark.png
-share/gnome/liferea/pixmaps/comments.png
-share/gnome/liferea/pixmaps/default.png
-share/gnome/liferea/pixmaps/directory.png
-share/gnome/liferea/pixmaps/edit.png
-share/gnome/liferea/pixmaps/empty.png
-share/gnome/liferea/pixmaps/empty_offline.png
-share/gnome/liferea/pixmaps/fl_bloglines.png
-share/gnome/liferea/pixmaps/fl_google.png
-share/gnome/liferea/pixmaps/fl_opml.png
-share/gnome/liferea/pixmaps/flag.png
-share/gnome/liferea/pixmaps/grayflag.png
-share/gnome/liferea/pixmaps/liferea.png
-share/gnome/liferea/pixmaps/newsbin.png
-share/gnome/liferea/pixmaps/ocs.png
-share/gnome/liferea/pixmaps/offline.png
-share/gnome/liferea/pixmaps/online.png
-share/gnome/liferea/pixmaps/read.xpm
-share/gnome/liferea/pixmaps/tag.png
-share/gnome/liferea/pixmaps/technorati.png
-share/gnome/liferea/pixmaps/unread.png
-share/gnome/liferea/pixmaps/vfolder.png
-share/gnome/liferea/xslt/feed.xml
-share/gnome/liferea/xslt/feed.xml.in
-share/gnome/liferea/xslt/folder.xml
-share/gnome/liferea/xslt/folder.xml.in
-share/gnome/liferea/xslt/item.xml
-share/gnome/liferea/xslt/item.xml.in
-share/gnome/liferea/xslt/i18n-filter.xslt
-share/gnome/liferea/xslt/newsbin.xml
-share/gnome/liferea/xslt/newsbin.xml.in
-share/gnome/liferea/xslt/source.xml
-share/gnome/liferea/xslt/source.xml.in
-share/gnome/liferea/xslt/vfolder.xml
-share/gnome/liferea/xslt/vfolder.xml.in
+share/applications/liferea.desktop
+share/liferea/bloglines_source.glade
+share/liferea/google_source.glade
+share/liferea/liferea.glade
+share/liferea/node_source.glade
+share/liferea/opml_source.glade
+share/liferea/css/adblock.css
+share/liferea/css/liferea.css
+share/liferea/doc/html/about_de.html
+share/liferea/doc/html/about_en.html
+share/liferea/doc/html/concepts_de.html
+share/liferea/doc/html/concepts_en.html
+share/liferea/doc/html/enclosures_de.html
+share/liferea/doc/html/enclosures_en.html
+share/liferea/doc/html/faq_de.html
+share/liferea/doc/html/faq_en.html
+share/liferea/doc/html/faq_ja.html
+share/liferea/doc/html/folders_de.html
+share/liferea/doc/html/folders_en.html
+share/liferea/doc/html/headlines_de.html
+share/liferea/doc/html/headlines_en.html
+share/liferea/doc/html/help_feed_default.png
+share/liferea/doc/html/help_feed_error.png
+share/liferea/doc/html/help_feed_prop_adv_1.4.0.png
+share/liferea/doc/html/help_feed_prop_cache_1.4.0.png
+share/liferea/doc/html/help_feed_prop_downl_1.4.0.png
+share/liferea/doc/html/help_feed_prop_general_1.4.0.png
+share/liferea/doc/html/help_feed_prop_source_1.4.0.png
+share/liferea/doc/html/help_folder.png
+share/liferea/doc/html/help_item_flag.png
+share/liferea/doc/html/help_item_unread.png
+share/liferea/doc/html/help_opml.png
+share/liferea/doc/html/help_prefs_browser_1.4.0.png
+share/liferea/doc/html/help_prefs_enclosures_1.4.0.png
+share/liferea/doc/html/help_prefs_feeds_1.4.0.png
+share/liferea/doc/html/help_prefs_folders_1.4.0.png
+share/liferea/doc/html/help_prefs_gui_1.4.0.png
+share/liferea/doc/html/help_prefs_headlines_1.4.0.png
+share/liferea/doc/html/help_prefs_proxy_1.4.0.png
+share/liferea/doc/html/help_search_1.4.0.png
+share/liferea/doc/html/help_source_add_1.4.0.png
+share/liferea/doc/html/help_subscribe_1.4.0.png
+share/liferea/doc/html/help_vfolder_1.4.0.png
+share/liferea/doc/html/newsbin_de.html
+share/liferea/doc/html/newsbin_en.html
+share/liferea/doc/html/preferences_de.html
+share/liferea/doc/html/preferences_en.html
+share/liferea/doc/html/reference.css
+share/liferea/doc/html/reference_de.html
+share/liferea/doc/html/reference_en.html
+share/liferea/doc/html/reference_ja.html
+share/liferea/doc/html/reference_nl.html
+share/liferea/doc/html/searching_de.html
+share/liferea/doc/html/searching_en.html
+share/liferea/doc/html/subscriptions_de.html
+share/liferea/doc/html/subscriptions_en.html
+share/liferea/doc/html/topics_de.html
+share/liferea/doc/html/topics_en.html
+share/liferea/doc/html/topics_ja.html
+share/liferea/doc/html/updating_de.html
+share/liferea/doc/html/updating_en.html
+share/liferea/dtd/html.ent
+share/liferea/media/xspf_license.txt
+share/liferea/media/xspf_player_slim.swf
+share/liferea/opml/feedlist.opml
+share/liferea/opml/feedlist_ca.opml
+share/liferea/opml/feedlist_de.opml
+share/liferea/opml/feedlist_es.opml
+share/liferea/opml/feedlist_eu.opml
+share/liferea/opml/feedlist_fr.opml
+share/liferea/opml/feedlist_nl.opml
+share/liferea/opml/feedlist_pl.opml
+share/liferea/opml/feedlist_sk.opml
+share/liferea/opml/feedlist_sv.opml
+share/liferea/opml/feedlist_tr.opml
+share/liferea/pixmaps/arrow.png
+share/liferea/pixmaps/attachment.png
+share/liferea/pixmaps/available.png
+share/liferea/pixmaps/available_offline.png
+share/liferea/pixmaps/bookmark.png
+share/liferea/pixmaps/comments.png
+share/liferea/pixmaps/default.png
+share/liferea/pixmaps/directory.png
+share/liferea/pixmaps/edit.png
+share/liferea/pixmaps/empty.png
+share/liferea/pixmaps/empty_offline.png
+share/liferea/pixmaps/fl_bloglines.png
+share/liferea/pixmaps/fl_google.png
+share/liferea/pixmaps/fl_opml.png
+share/liferea/pixmaps/flag.png
+share/liferea/pixmaps/grayflag.png
+share/liferea/pixmaps/liferea.png
+share/liferea/pixmaps/newsbin.png
+share/liferea/pixmaps/ocs.png
+share/liferea/pixmaps/offline.png
+share/liferea/pixmaps/online.png
+share/liferea/pixmaps/read.xpm
+share/liferea/pixmaps/tag.png
+share/liferea/pixmaps/technorati.png
+share/liferea/pixmaps/unread.png
+share/liferea/pixmaps/vfolder.png
+share/liferea/xslt/feed.xml
+share/liferea/xslt/feed.xml.in
+share/liferea/xslt/folder.xml
+share/liferea/xslt/folder.xml.in
+share/liferea/xslt/item.xml
+share/liferea/xslt/item.xml.in
+share/liferea/xslt/i18n-filter.xslt
+share/liferea/xslt/newsbin.xml
+share/liferea/xslt/newsbin.xml.in
+share/liferea/xslt/source.xml
+share/liferea/xslt/source.xml.in
+share/liferea/xslt/vfolder.xml
+share/liferea/xslt/vfolder.xml.in
 share/icons/hicolor/48x48/apps/liferea.png
 share/locale/ar/LC_MESSAGES/liferea.mo
 share/locale/be@latin/LC_MESSAGES/liferea.mo
@@ -138,15 +138,16 @@ share/locale/pt_BR/LC_MESSAGES/liferea.mo
 share/locale/ru/LC_MESSAGES/liferea.mo
 share/locale/sv/LC_MESSAGES/liferea.mo
 share/locale/tr/LC_MESSAGES/liferea.mo
-@dirrm share/gnome/liferea/xslt
-@dirrm share/gnome/liferea/pixmaps
-@dirrm share/gnome/liferea/opml
-@dirrm share/gnome/liferea/media
-@dirrm share/gnome/liferea/dtd
-@dirrm share/gnome/liferea/doc/html
-@dirrm share/gnome/liferea/doc
-@dirrm share/gnome/liferea/css
-@dirrm share/gnome/liferea
+@dirrm share/liferea/xslt
+@dirrm share/liferea/pixmaps
+@dirrm share/liferea/opml
+@dirrm share/liferea/media
+@dirrm share/liferea/dtd
+@dirrm share/liferea/doc/html
+@dirrm share/liferea/doc
+@dirrm share/liferea/css
+@dirrm share/liferea
 @dirrmtry man/pl/man1
 @dirrmtry man/pl
 @dirrm lib/liferea
+@dirrmtry share/applications
diff --git a/net/link-monitor-applet/Makefile b/net/link-monitor-applet/Makefile
index de2eddd92869..107279bb2d28 100644
--- a/net/link-monitor-applet/Makefile
+++ b/net/link-monitor-applet/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	link-monitor-applet
 PORTVERSION=	2.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net ipv6
 MASTER_SITES=	${MASTER_SITE_SAVANNAH}
 MASTER_SITE_SUBDIR=	link-monitor
diff --git a/net/link-monitor-applet/pkg-plist b/net/link-monitor-applet/pkg-plist
index e751e15183c5..28f7e5f02e9e 100644
--- a/net/link-monitor-applet/pkg-plist
+++ b/net/link-monitor-applet/pkg-plist
@@ -1,226 +1,226 @@
 libdata/bonobo/servers/GNOME_LinkMonitorApplet.server
 libexec/link-monitor-applet
-share/gnome/gnome-2.0/ui/GNOME_LinkMonitorApplet.xml
+share/gnome-2.0/ui/GNOME_LinkMonitorApplet.xml
 share/gnome/help/link-monitor-applet/C/documentation-license.xml
 share/gnome/help/link-monitor-applet/C/figures/link-monitor-applet-5hosts.png
 share/gnome/help/link-monitor-applet/C/figures/link-monitor-applet-empty.png
 share/gnome/help/link-monitor-applet/C/link-monitor-applet.xml
 share/gnome/help/link-monitor-applet/C/software-license.xml
-share/gnome/link-monitor-applet/flags/ad.svg
-share/gnome/link-monitor-applet/flags/ae.svg
-share/gnome/link-monitor-applet/flags/af.svg
-share/gnome/link-monitor-applet/flags/ag.svg
-share/gnome/link-monitor-applet/flags/ai.svg
-share/gnome/link-monitor-applet/flags/al.svg
-share/gnome/link-monitor-applet/flags/am.svg
-share/gnome/link-monitor-applet/flags/an.svg
-share/gnome/link-monitor-applet/flags/ao.svg
-share/gnome/link-monitor-applet/flags/ar.svg
-share/gnome/link-monitor-applet/flags/as.svg
-share/gnome/link-monitor-applet/flags/at.svg
-share/gnome/link-monitor-applet/flags/au.svg
-share/gnome/link-monitor-applet/flags/aw.svg
-share/gnome/link-monitor-applet/flags/az.svg
-share/gnome/link-monitor-applet/flags/ba.svg
-share/gnome/link-monitor-applet/flags/bb.svg
-share/gnome/link-monitor-applet/flags/bd.svg
-share/gnome/link-monitor-applet/flags/be.svg
-share/gnome/link-monitor-applet/flags/bf.svg
-share/gnome/link-monitor-applet/flags/bg.svg
-share/gnome/link-monitor-applet/flags/bh.svg
-share/gnome/link-monitor-applet/flags/bi.svg
-share/gnome/link-monitor-applet/flags/bj.svg
-share/gnome/link-monitor-applet/flags/bn.svg
-share/gnome/link-monitor-applet/flags/bo.svg
-share/gnome/link-monitor-applet/flags/br.svg
-share/gnome/link-monitor-applet/flags/bs.svg
-share/gnome/link-monitor-applet/flags/bt.svg
-share/gnome/link-monitor-applet/flags/bw.svg
-share/gnome/link-monitor-applet/flags/by.svg
-share/gnome/link-monitor-applet/flags/bz.svg
-share/gnome/link-monitor-applet/flags/ca.svg
-share/gnome/link-monitor-applet/flags/cd.svg
-share/gnome/link-monitor-applet/flags/cf.svg
-share/gnome/link-monitor-applet/flags/cg.svg
-share/gnome/link-monitor-applet/flags/ch.svg
-share/gnome/link-monitor-applet/flags/ci.svg
-share/gnome/link-monitor-applet/flags/ck.svg
-share/gnome/link-monitor-applet/flags/cl.svg
-share/gnome/link-monitor-applet/flags/cm.svg
-share/gnome/link-monitor-applet/flags/cn.svg
-share/gnome/link-monitor-applet/flags/co.svg
-share/gnome/link-monitor-applet/flags/cr.svg
-share/gnome/link-monitor-applet/flags/cs.svg
-share/gnome/link-monitor-applet/flags/cu.svg
-share/gnome/link-monitor-applet/flags/cv.svg
-share/gnome/link-monitor-applet/flags/cx.svg
-share/gnome/link-monitor-applet/flags/cy.svg
-share/gnome/link-monitor-applet/flags/cz.svg
-share/gnome/link-monitor-applet/flags/de.svg
-share/gnome/link-monitor-applet/flags/dj.svg
-share/gnome/link-monitor-applet/flags/dk.svg
-share/gnome/link-monitor-applet/flags/dm.svg
-share/gnome/link-monitor-applet/flags/do.svg
-share/gnome/link-monitor-applet/flags/dz.svg
-share/gnome/link-monitor-applet/flags/ec.svg
-share/gnome/link-monitor-applet/flags/ee.svg
-share/gnome/link-monitor-applet/flags/eg.svg
-share/gnome/link-monitor-applet/flags/eh.svg
-share/gnome/link-monitor-applet/flags/er.svg
-share/gnome/link-monitor-applet/flags/es.svg
-share/gnome/link-monitor-applet/flags/et.svg
-share/gnome/link-monitor-applet/flags/fi.svg
-share/gnome/link-monitor-applet/flags/fj.svg
-share/gnome/link-monitor-applet/flags/fm.svg
-share/gnome/link-monitor-applet/flags/fr.svg
-share/gnome/link-monitor-applet/flags/ga.svg
-share/gnome/link-monitor-applet/flags/gb.svg
-share/gnome/link-monitor-applet/flags/gd.svg
-share/gnome/link-monitor-applet/flags/ge.svg
-share/gnome/link-monitor-applet/flags/gh.svg
-share/gnome/link-monitor-applet/flags/gm.svg
-share/gnome/link-monitor-applet/flags/gn.svg
-share/gnome/link-monitor-applet/flags/gq.svg
-share/gnome/link-monitor-applet/flags/gr.svg
-share/gnome/link-monitor-applet/flags/gs.svg
-share/gnome/link-monitor-applet/flags/gt.svg
-share/gnome/link-monitor-applet/flags/gu.svg
-share/gnome/link-monitor-applet/flags/gw.svg
-share/gnome/link-monitor-applet/flags/gy.svg
-share/gnome/link-monitor-applet/flags/hn.svg
-share/gnome/link-monitor-applet/flags/hr.svg
-share/gnome/link-monitor-applet/flags/ht.svg
-share/gnome/link-monitor-applet/flags/hu.svg
-share/gnome/link-monitor-applet/flags/id.svg
-share/gnome/link-monitor-applet/flags/ie.svg
-share/gnome/link-monitor-applet/flags/il.svg
-share/gnome/link-monitor-applet/flags/in.svg
-share/gnome/link-monitor-applet/flags/iq.svg
-share/gnome/link-monitor-applet/flags/ir.svg
-share/gnome/link-monitor-applet/flags/is.svg
-share/gnome/link-monitor-applet/flags/it.svg
-share/gnome/link-monitor-applet/flags/jm.svg
-share/gnome/link-monitor-applet/flags/jo.svg
-share/gnome/link-monitor-applet/flags/jp.svg
-share/gnome/link-monitor-applet/flags/ke.svg
-share/gnome/link-monitor-applet/flags/kg.svg
-share/gnome/link-monitor-applet/flags/kh.svg
-share/gnome/link-monitor-applet/flags/ki.svg
-share/gnome/link-monitor-applet/flags/km.svg
-share/gnome/link-monitor-applet/flags/kn.svg
-share/gnome/link-monitor-applet/flags/kp.svg
-share/gnome/link-monitor-applet/flags/kr.svg
-share/gnome/link-monitor-applet/flags/kw.svg
-share/gnome/link-monitor-applet/flags/kz.svg
-share/gnome/link-monitor-applet/flags/la.svg
-share/gnome/link-monitor-applet/flags/lb.svg
-share/gnome/link-monitor-applet/flags/lc.svg
-share/gnome/link-monitor-applet/flags/li.svg
-share/gnome/link-monitor-applet/flags/lk.svg
-share/gnome/link-monitor-applet/flags/lr.svg
-share/gnome/link-monitor-applet/flags/ls.svg
-share/gnome/link-monitor-applet/flags/lt.svg
-share/gnome/link-monitor-applet/flags/lu.svg
-share/gnome/link-monitor-applet/flags/lv.svg
-share/gnome/link-monitor-applet/flags/ly.svg
-share/gnome/link-monitor-applet/flags/ma.svg
-share/gnome/link-monitor-applet/flags/mc.svg
-share/gnome/link-monitor-applet/flags/md.svg
-share/gnome/link-monitor-applet/flags/mg.svg
-share/gnome/link-monitor-applet/flags/mh.svg
-share/gnome/link-monitor-applet/flags/mk.svg
-share/gnome/link-monitor-applet/flags/ml.svg
-share/gnome/link-monitor-applet/flags/mm.svg
-share/gnome/link-monitor-applet/flags/mn.svg
-share/gnome/link-monitor-applet/flags/mp.svg
-share/gnome/link-monitor-applet/flags/mr.svg
-share/gnome/link-monitor-applet/flags/ms.svg
-share/gnome/link-monitor-applet/flags/mt.svg
-share/gnome/link-monitor-applet/flags/mu.svg
-share/gnome/link-monitor-applet/flags/mv.svg
-share/gnome/link-monitor-applet/flags/mw.svg
-share/gnome/link-monitor-applet/flags/mx.svg
-share/gnome/link-monitor-applet/flags/my.svg
-share/gnome/link-monitor-applet/flags/mz.svg
-share/gnome/link-monitor-applet/flags/na.svg
-share/gnome/link-monitor-applet/flags/ne.svg
-share/gnome/link-monitor-applet/flags/ng.svg
-share/gnome/link-monitor-applet/flags/ni.svg
-share/gnome/link-monitor-applet/flags/nl.svg
-share/gnome/link-monitor-applet/flags/no.svg
-share/gnome/link-monitor-applet/flags/np.svg
-share/gnome/link-monitor-applet/flags/nr.svg
-share/gnome/link-monitor-applet/flags/nu.svg
-share/gnome/link-monitor-applet/flags/nz.svg
-share/gnome/link-monitor-applet/flags/om.svg
-share/gnome/link-monitor-applet/flags/pa.svg
-share/gnome/link-monitor-applet/flags/pe.svg
-share/gnome/link-monitor-applet/flags/pg.svg
-share/gnome/link-monitor-applet/flags/ph.svg
-share/gnome/link-monitor-applet/flags/pk.svg
-share/gnome/link-monitor-applet/flags/pl.svg
-share/gnome/link-monitor-applet/flags/pn.svg
-share/gnome/link-monitor-applet/flags/pr.svg
-share/gnome/link-monitor-applet/flags/pt.svg
-share/gnome/link-monitor-applet/flags/pw.svg
-share/gnome/link-monitor-applet/flags/py.svg
-share/gnome/link-monitor-applet/flags/qa.svg
-share/gnome/link-monitor-applet/flags/ro.svg
-share/gnome/link-monitor-applet/flags/ru.svg
-share/gnome/link-monitor-applet/flags/rw.svg
-share/gnome/link-monitor-applet/flags/sa.svg
-share/gnome/link-monitor-applet/flags/sb.svg
-share/gnome/link-monitor-applet/flags/sc.svg
-share/gnome/link-monitor-applet/flags/sd.svg
-share/gnome/link-monitor-applet/flags/se.svg
-share/gnome/link-monitor-applet/flags/sg.svg
-share/gnome/link-monitor-applet/flags/si.svg
-share/gnome/link-monitor-applet/flags/sk.svg
-share/gnome/link-monitor-applet/flags/sl.svg
-share/gnome/link-monitor-applet/flags/sm.svg
-share/gnome/link-monitor-applet/flags/sn.svg
-share/gnome/link-monitor-applet/flags/so.svg
-share/gnome/link-monitor-applet/flags/sr.svg
-share/gnome/link-monitor-applet/flags/st.svg
-share/gnome/link-monitor-applet/flags/sv.svg
-share/gnome/link-monitor-applet/flags/sy.svg
-share/gnome/link-monitor-applet/flags/sz.svg
-share/gnome/link-monitor-applet/flags/td.svg
-share/gnome/link-monitor-applet/flags/tg.svg
-share/gnome/link-monitor-applet/flags/th.svg
-share/gnome/link-monitor-applet/flags/tj.svg
-share/gnome/link-monitor-applet/flags/tk.svg
-share/gnome/link-monitor-applet/flags/tm.svg
-share/gnome/link-monitor-applet/flags/tn.svg
-share/gnome/link-monitor-applet/flags/to.svg
-share/gnome/link-monitor-applet/flags/tp.svg
-share/gnome/link-monitor-applet/flags/tr.svg
-share/gnome/link-monitor-applet/flags/tt.svg
-share/gnome/link-monitor-applet/flags/tv.svg
-share/gnome/link-monitor-applet/flags/tz.svg
-share/gnome/link-monitor-applet/flags/ua.svg
-share/gnome/link-monitor-applet/flags/ug.svg
-share/gnome/link-monitor-applet/flags/us.svg
-share/gnome/link-monitor-applet/flags/uy.svg
-share/gnome/link-monitor-applet/flags/uz.svg
-share/gnome/link-monitor-applet/flags/va.svg
-share/gnome/link-monitor-applet/flags/vc.svg
-share/gnome/link-monitor-applet/flags/ve.svg
-share/gnome/link-monitor-applet/flags/vn.svg
-share/gnome/link-monitor-applet/flags/vu.svg
-share/gnome/link-monitor-applet/flags/ws.svg
-share/gnome/link-monitor-applet/flags/ye.svg
-share/gnome/link-monitor-applet/flags/za.svg
-share/gnome/link-monitor-applet/flags/zm.svg
-share/gnome/link-monitor-applet/flags/zw.svg
-share/gnome/link-monitor-applet/ui/preferences-dialog.glade
-share/gnome/omf/link-monitor-applet/link-monitor-applet-C.omf
-share/gnome/pixmaps/link-monitor-applet.png
+share/link-monitor-applet/flags/ad.svg
+share/link-monitor-applet/flags/ae.svg
+share/link-monitor-applet/flags/af.svg
+share/link-monitor-applet/flags/ag.svg
+share/link-monitor-applet/flags/ai.svg
+share/link-monitor-applet/flags/al.svg
+share/link-monitor-applet/flags/am.svg
+share/link-monitor-applet/flags/an.svg
+share/link-monitor-applet/flags/ao.svg
+share/link-monitor-applet/flags/ar.svg
+share/link-monitor-applet/flags/as.svg
+share/link-monitor-applet/flags/at.svg
+share/link-monitor-applet/flags/au.svg
+share/link-monitor-applet/flags/aw.svg
+share/link-monitor-applet/flags/az.svg
+share/link-monitor-applet/flags/ba.svg
+share/link-monitor-applet/flags/bb.svg
+share/link-monitor-applet/flags/bd.svg
+share/link-monitor-applet/flags/be.svg
+share/link-monitor-applet/flags/bf.svg
+share/link-monitor-applet/flags/bg.svg
+share/link-monitor-applet/flags/bh.svg
+share/link-monitor-applet/flags/bi.svg
+share/link-monitor-applet/flags/bj.svg
+share/link-monitor-applet/flags/bn.svg
+share/link-monitor-applet/flags/bo.svg
+share/link-monitor-applet/flags/br.svg
+share/link-monitor-applet/flags/bs.svg
+share/link-monitor-applet/flags/bt.svg
+share/link-monitor-applet/flags/bw.svg
+share/link-monitor-applet/flags/by.svg
+share/link-monitor-applet/flags/bz.svg
+share/link-monitor-applet/flags/ca.svg
+share/link-monitor-applet/flags/cd.svg
+share/link-monitor-applet/flags/cf.svg
+share/link-monitor-applet/flags/cg.svg
+share/link-monitor-applet/flags/ch.svg
+share/link-monitor-applet/flags/ci.svg
+share/link-monitor-applet/flags/ck.svg
+share/link-monitor-applet/flags/cl.svg
+share/link-monitor-applet/flags/cm.svg
+share/link-monitor-applet/flags/cn.svg
+share/link-monitor-applet/flags/co.svg
+share/link-monitor-applet/flags/cr.svg
+share/link-monitor-applet/flags/cs.svg
+share/link-monitor-applet/flags/cu.svg
+share/link-monitor-applet/flags/cv.svg
+share/link-monitor-applet/flags/cx.svg
+share/link-monitor-applet/flags/cy.svg
+share/link-monitor-applet/flags/cz.svg
+share/link-monitor-applet/flags/de.svg
+share/link-monitor-applet/flags/dj.svg
+share/link-monitor-applet/flags/dk.svg
+share/link-monitor-applet/flags/dm.svg
+share/link-monitor-applet/flags/do.svg
+share/link-monitor-applet/flags/dz.svg
+share/link-monitor-applet/flags/ec.svg
+share/link-monitor-applet/flags/ee.svg
+share/link-monitor-applet/flags/eg.svg
+share/link-monitor-applet/flags/eh.svg
+share/link-monitor-applet/flags/er.svg
+share/link-monitor-applet/flags/es.svg
+share/link-monitor-applet/flags/et.svg
+share/link-monitor-applet/flags/fi.svg
+share/link-monitor-applet/flags/fj.svg
+share/link-monitor-applet/flags/fm.svg
+share/link-monitor-applet/flags/fr.svg
+share/link-monitor-applet/flags/ga.svg
+share/link-monitor-applet/flags/gb.svg
+share/link-monitor-applet/flags/gd.svg
+share/link-monitor-applet/flags/ge.svg
+share/link-monitor-applet/flags/gh.svg
+share/link-monitor-applet/flags/gm.svg
+share/link-monitor-applet/flags/gn.svg
+share/link-monitor-applet/flags/gq.svg
+share/link-monitor-applet/flags/gr.svg
+share/link-monitor-applet/flags/gs.svg
+share/link-monitor-applet/flags/gt.svg
+share/link-monitor-applet/flags/gu.svg
+share/link-monitor-applet/flags/gw.svg
+share/link-monitor-applet/flags/gy.svg
+share/link-monitor-applet/flags/hn.svg
+share/link-monitor-applet/flags/hr.svg
+share/link-monitor-applet/flags/ht.svg
+share/link-monitor-applet/flags/hu.svg
+share/link-monitor-applet/flags/id.svg
+share/link-monitor-applet/flags/ie.svg
+share/link-monitor-applet/flags/il.svg
+share/link-monitor-applet/flags/in.svg
+share/link-monitor-applet/flags/iq.svg
+share/link-monitor-applet/flags/ir.svg
+share/link-monitor-applet/flags/is.svg
+share/link-monitor-applet/flags/it.svg
+share/link-monitor-applet/flags/jm.svg
+share/link-monitor-applet/flags/jo.svg
+share/link-monitor-applet/flags/jp.svg
+share/link-monitor-applet/flags/ke.svg
+share/link-monitor-applet/flags/kg.svg
+share/link-monitor-applet/flags/kh.svg
+share/link-monitor-applet/flags/ki.svg
+share/link-monitor-applet/flags/km.svg
+share/link-monitor-applet/flags/kn.svg
+share/link-monitor-applet/flags/kp.svg
+share/link-monitor-applet/flags/kr.svg
+share/link-monitor-applet/flags/kw.svg
+share/link-monitor-applet/flags/kz.svg
+share/link-monitor-applet/flags/la.svg
+share/link-monitor-applet/flags/lb.svg
+share/link-monitor-applet/flags/lc.svg
+share/link-monitor-applet/flags/li.svg
+share/link-monitor-applet/flags/lk.svg
+share/link-monitor-applet/flags/lr.svg
+share/link-monitor-applet/flags/ls.svg
+share/link-monitor-applet/flags/lt.svg
+share/link-monitor-applet/flags/lu.svg
+share/link-monitor-applet/flags/lv.svg
+share/link-monitor-applet/flags/ly.svg
+share/link-monitor-applet/flags/ma.svg
+share/link-monitor-applet/flags/mc.svg
+share/link-monitor-applet/flags/md.svg
+share/link-monitor-applet/flags/mg.svg
+share/link-monitor-applet/flags/mh.svg
+share/link-monitor-applet/flags/mk.svg
+share/link-monitor-applet/flags/ml.svg
+share/link-monitor-applet/flags/mm.svg
+share/link-monitor-applet/flags/mn.svg
+share/link-monitor-applet/flags/mp.svg
+share/link-monitor-applet/flags/mr.svg
+share/link-monitor-applet/flags/ms.svg
+share/link-monitor-applet/flags/mt.svg
+share/link-monitor-applet/flags/mu.svg
+share/link-monitor-applet/flags/mv.svg
+share/link-monitor-applet/flags/mw.svg
+share/link-monitor-applet/flags/mx.svg
+share/link-monitor-applet/flags/my.svg
+share/link-monitor-applet/flags/mz.svg
+share/link-monitor-applet/flags/na.svg
+share/link-monitor-applet/flags/ne.svg
+share/link-monitor-applet/flags/ng.svg
+share/link-monitor-applet/flags/ni.svg
+share/link-monitor-applet/flags/nl.svg
+share/link-monitor-applet/flags/no.svg
+share/link-monitor-applet/flags/np.svg
+share/link-monitor-applet/flags/nr.svg
+share/link-monitor-applet/flags/nu.svg
+share/link-monitor-applet/flags/nz.svg
+share/link-monitor-applet/flags/om.svg
+share/link-monitor-applet/flags/pa.svg
+share/link-monitor-applet/flags/pe.svg
+share/link-monitor-applet/flags/pg.svg
+share/link-monitor-applet/flags/ph.svg
+share/link-monitor-applet/flags/pk.svg
+share/link-monitor-applet/flags/pl.svg
+share/link-monitor-applet/flags/pn.svg
+share/link-monitor-applet/flags/pr.svg
+share/link-monitor-applet/flags/pt.svg
+share/link-monitor-applet/flags/pw.svg
+share/link-monitor-applet/flags/py.svg
+share/link-monitor-applet/flags/qa.svg
+share/link-monitor-applet/flags/ro.svg
+share/link-monitor-applet/flags/ru.svg
+share/link-monitor-applet/flags/rw.svg
+share/link-monitor-applet/flags/sa.svg
+share/link-monitor-applet/flags/sb.svg
+share/link-monitor-applet/flags/sc.svg
+share/link-monitor-applet/flags/sd.svg
+share/link-monitor-applet/flags/se.svg
+share/link-monitor-applet/flags/sg.svg
+share/link-monitor-applet/flags/si.svg
+share/link-monitor-applet/flags/sk.svg
+share/link-monitor-applet/flags/sl.svg
+share/link-monitor-applet/flags/sm.svg
+share/link-monitor-applet/flags/sn.svg
+share/link-monitor-applet/flags/so.svg
+share/link-monitor-applet/flags/sr.svg
+share/link-monitor-applet/flags/st.svg
+share/link-monitor-applet/flags/sv.svg
+share/link-monitor-applet/flags/sy.svg
+share/link-monitor-applet/flags/sz.svg
+share/link-monitor-applet/flags/td.svg
+share/link-monitor-applet/flags/tg.svg
+share/link-monitor-applet/flags/th.svg
+share/link-monitor-applet/flags/tj.svg
+share/link-monitor-applet/flags/tk.svg
+share/link-monitor-applet/flags/tm.svg
+share/link-monitor-applet/flags/tn.svg
+share/link-monitor-applet/flags/to.svg
+share/link-monitor-applet/flags/tp.svg
+share/link-monitor-applet/flags/tr.svg
+share/link-monitor-applet/flags/tt.svg
+share/link-monitor-applet/flags/tv.svg
+share/link-monitor-applet/flags/tz.svg
+share/link-monitor-applet/flags/ua.svg
+share/link-monitor-applet/flags/ug.svg
+share/link-monitor-applet/flags/us.svg
+share/link-monitor-applet/flags/uy.svg
+share/link-monitor-applet/flags/uz.svg
+share/link-monitor-applet/flags/va.svg
+share/link-monitor-applet/flags/vc.svg
+share/link-monitor-applet/flags/ve.svg
+share/link-monitor-applet/flags/vn.svg
+share/link-monitor-applet/flags/vu.svg
+share/link-monitor-applet/flags/ws.svg
+share/link-monitor-applet/flags/ye.svg
+share/link-monitor-applet/flags/za.svg
+share/link-monitor-applet/flags/zm.svg
+share/link-monitor-applet/flags/zw.svg
+share/link-monitor-applet/ui/preferences-dialog.glade
+share/omf/link-monitor-applet/link-monitor-applet-C.omf
+share/pixmaps/link-monitor-applet.png
 share/locale/fr/LC_MESSAGES/link-monitor-applet.mo
 @dirrm share/gnome/help/link-monitor-applet/C/figures
 @dirrm share/gnome/help/link-monitor-applet/C
 @dirrm share/gnome/help/link-monitor-applet
-@dirrm share/gnome/link-monitor-applet/flags
-@dirrm share/gnome/link-monitor-applet/ui
-@dirrm share/gnome/link-monitor-applet
-@dirrm share/gnome/omf/link-monitor-applet
+@dirrm share/link-monitor-applet/flags
+@dirrm share/link-monitor-applet/ui
+@dirrm share/link-monitor-applet
+@dirrm share/omf/link-monitor-applet
diff --git a/net/linphone-base/Makefile b/net/linphone-base/Makefile
index a325b1fab695..f5652ecc3053 100644
--- a/net/linphone-base/Makefile
+++ b/net/linphone-base/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	linphone
 PORTVERSION=	1.7.1
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES?=	net
 MASTER_SITES=	${MASTER_SITE_SAVANNAH:S/$/:linphone/} \
@@ -39,7 +39,7 @@ MAKE_ENV=	SUBDIRS="${SUBDIRS}"
 USE_LDCONFIG=	yes
 
 CFLAGS+=	-DPACKAGE_LOCALE_DIR='\"${PREFIX}/share/locale\"' \
-		-DPACKAGE_DATA_DIR='\"${PREFIX}/${DATA_PATH}\"' \
+		-DPACKAGE_DATA_DIR='\"${PREFIX}/share\"' \
 		-DPACKAGE_SOUND_DIR='\"${DATADIR}/sounds\"' \
 		-DHAVE_STRUCT_TIMEVAL
 CPPFLAGS=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
@@ -65,13 +65,11 @@ DESCR=		${PKGDIR}/pkg-descr.gui
 PLIST=		${PKGDIR}/pkg-plist.gui
 USE_GNOME+=	gnomepanel gnomeprefix
 MAN1=		linphone.1
-DATA_PATH=	share/gnome
 SUBDIRS=	pixmaps gtk
 .else
 PKGNAMESUFFIX=	-base
 CONFIGURE_ARGS+=	--enable-gtk_ui=no
 MAN1=		linphonec.1 sipomatic.1
-DATA_PATH=	share
 SUBDIRS=	po gsmlib mediastreamer2 media_api exosip coreapi console
 .endif
 
@@ -91,9 +89,9 @@ post-install:
 .if defined(LINPHONE_GUI)
 	${INSTALL_MAN} ${WRKSRC}/share/C/linphone.1 ${MANPREFIX}/man/man1
 	${INSTALL_DATA} ${WRKSRC}/share/linphone.desktop \
-		${PREFIX}/share/gnome/applications
+		${PREFIX}/share/applications
 	${INSTALL_DATA} ${WRKSRC}/share/linphone_applet.desktop \
-		${PREFIX}/share/gnome/applications
+		${PREFIX}/share/applications
 .else
 	${INSTALL_MAN} ${WRKSRC}/share/C/linphonec.1 ${MANPREFIX}/man/man1
 	${INSTALL_MAN} ${WRKSRC}/share/C/sipomatic.1 ${MANPREFIX}/man/man1
diff --git a/net/linphone-base/pkg-plist.gui b/net/linphone-base/pkg-plist.gui
index a722f7880a5d..6674b192ecdf 100644
--- a/net/linphone-base/pkg-plist.gui
+++ b/net/linphone-base/pkg-plist.gui
@@ -1,18 +1,18 @@
 bin/linphone
 libdata/bonobo/servers/GNOME_LinphoneApplet.server
 libexec/linphone_applet
-share/gnome/applications/linphone.desktop
-share/gnome/applications/linphone_applet.desktop
-share/gnome/gnome-2.0/ui/GNOME_LinphoneApplet.xml
-share/gnome/pixmaps/linphone/linphone.png
-share/gnome/pixmaps/linphone/linphone2.png
-share/gnome/pixmaps/linphone/linphone2.xpm
-share/gnome/pixmaps/linphone/sip-away.png
-share/gnome/pixmaps/linphone/sip-bifm.png
-share/gnome/pixmaps/linphone/sip-busy.png
-share/gnome/pixmaps/linphone/sip-closed.png
-share/gnome/pixmaps/linphone/sip-online.png
-share/gnome/pixmaps/linphone/sip-otl.png
-share/gnome/pixmaps/linphone/sip-otp.png
-share/gnome/pixmaps/linphone/sip-wfa.png
-@dirrm share/gnome/pixmaps/linphone
+share/applications/linphone.desktop
+share/applications/linphone_applet.desktop
+share/gnome-2.0/ui/GNOME_LinphoneApplet.xml
+share/pixmaps/linphone/linphone.png
+share/pixmaps/linphone/linphone2.png
+share/pixmaps/linphone/linphone2.xpm
+share/pixmaps/linphone/sip-away.png
+share/pixmaps/linphone/sip-bifm.png
+share/pixmaps/linphone/sip-busy.png
+share/pixmaps/linphone/sip-closed.png
+share/pixmaps/linphone/sip-online.png
+share/pixmaps/linphone/sip-otl.png
+share/pixmaps/linphone/sip-otp.png
+share/pixmaps/linphone/sip-wfa.png
+@dirrm share/pixmaps/linphone
diff --git a/net/linux-nx-client/Makefile b/net/linux-nx-client/Makefile
index 7436cfdbbef1..93ef70f9817c 100644
--- a/net/linux-nx-client/Makefile
+++ b/net/linux-nx-client/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=		linux-nx-client
 PORTVERSION=		2.1.0
-PORTREVISION=		2
+PORTREVISION=		3
 CATEGORIES=		net
 MASTER_SITES=		http://web04.nomachine.com/download/${PORTVERSION}/Linux/
 DISTNAME=		nxclient-${PORTVERSION}-17.i386
@@ -48,8 +48,8 @@ do-install:
 	${MKDIR} ${NXDST}/share/images
 	${INSTALL_DATA} ${NXSRC}/share/images/* ${NXDST}/share/images
 
-	${MKDIR} ${LOCALBASE}/share/gnome/pixmaps
-	${INSTALL_DATA} ${NXSRC}/share/icons/*.png ${LOCALBASE}/share/gnome/pixmaps
+	${MKDIR} ${LOCALBASE}/share/pixmaps
+	${INSTALL_DATA} ${NXSRC}/share/icons/*.png ${LOCALBASE}/share/pixmaps
 	${MKDIR} ${LOCALBASE}/share/icons/crystalsvg/48x48 \
 		${LOCALBASE}/share/icons/crystalsvg/32x32
 	${INSTALL_DATA} ${NXSRC}/share/icons/nx-desktop.png \
diff --git a/net/linux-nx-client/pkg-plist b/net/linux-nx-client/pkg-plist
index 879dc6ee920f..4919d2d9ec0c 100644
--- a/net/linux-nx-client/pkg-plist
+++ b/net/linux-nx-client/pkg-plist
@@ -74,12 +74,10 @@ lib/linux-nx-client/share/keys/server.id_dsa.key
 @dirrm lib/linux-nx-client/share
 @dirrm lib/linux-nx-client
 @cwd %%LOCALBASE%%
-share/gnome/pixmaps/nx-desktop.png
-share/gnome/pixmaps/nx.png
-share/gnome/pixmaps/nxclient-admin.png
-share/gnome/pixmaps/nxclient-wizard.png
-@dirrmtry share/gnome/pixmaps
-@dirrmtry share/gnome
+share/pixmaps/nx-desktop.png
+share/pixmaps/nx.png
+share/pixmaps/nxclient-admin.png
+share/pixmaps/nxclient-wizard.png
 share/icons/crystalsvg/48x48/nx-desktop.png
 share/icons/crystalsvg/32x32/nx.png
 share/icons/crystalsvg/32x32/nxclient-admin.png
diff --git a/net/mugshot/Makefile b/net/mugshot/Makefile
index 33b421377631..e56a087b773d 100644
--- a/net/mugshot/Makefile
+++ b/net/mugshot/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	mugshot
 PORTVERSION=	1.1.45
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	http://download.mugshot.org/client/sources/linux/
 
diff --git a/net/mugshot/pkg-plist b/net/mugshot/pkg-plist
index 104a70e82151..2d673237d624 100644
--- a/net/mugshot/pkg-plist
+++ b/net/mugshot/pkg-plist
@@ -24,7 +24,7 @@ lib/mugshot/firefox/components/libhippofirefox.so
 lib/mugshot/firefox/defaults/preferences/prefs.js
 lib/mugshot/firefox/install.rdf
 share/applications/mugshot.desktop
-share/autostart/mugshot.desktop
+share/gnome/autostart/mugshot.desktop
 @unexec %%PREFIX%%/share/mugshot/firefox-update.sh remove
 %%DATADIR%%/firefox-update.sh
 %%DATADIR%%/version
@@ -39,24 +39,7 @@ share/icons/hicolor/24x24/apps/mugshot.png
 share/icons/hicolor/32x32/apps/mugshot.png
 share/icons/hicolor/48x48/apps/mugshot.png
 @dirrm %%DATADIR%%
-@dirrm share/icons/hicolor/48x48/apps
-@dirrm share/icons/hicolor/48x48
-@dirrm share/icons/hicolor/32x32/apps
-@dirrm share/icons/hicolor/32x32
-@dirrm share/icons/hicolor/24x24/apps
-@dirrm share/icons/hicolor/24x24
-@dirrm share/icons/hicolor/22x22/apps
-@dirrm share/icons/hicolor/22x22
-@dirrm share/icons/hicolor/16x16/apps
-@dirrm share/icons/hicolor/16x16
-@dirrm share/icons/hicolor/128x128/apps
-@dirrm share/icons/hicolor/128x128
-@dirrm share/icons/hicolor
-@dirrm share/icons
-@dirrm share/dbus-1/services
-@dirrm share/dbus-1
-@dirrm share/autostart
-@dirrm share/applications
+@dirrmtry share/applications
 @dirrm lib/mugshot/firefox/defaults/preferences
 @dirrm lib/mugshot/firefox/defaults
 @dirrm lib/mugshot/firefox/components
diff --git a/net/netspeed_applet/Makefile b/net/netspeed_applet/Makefile
index 6e527ed6a921..2f18fc1beedb 100644
--- a/net/netspeed_applet/Makefile
+++ b/net/netspeed_applet/Makefile
@@ -3,11 +3,11 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#
+#    $MCom: ports/net/netspeed_applet/Makefile,v 1.2 2007/05/19 21:36:17 marcus Exp $
 
 PORTNAME=	netspeed_applet
 PORTVERSION=	0.13
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net gnome
 MASTER_SITES=	http://www.wh-hms.uni-ulm.de/~mfcn/shared/netspeed/
 
diff --git a/net/netspeed_applet/pkg-plist b/net/netspeed_applet/pkg-plist
index 5c47ebd8f824..f4e872288ebb 100644
--- a/net/netspeed_applet/pkg-plist
+++ b/net/netspeed_applet/pkg-plist
@@ -52,15 +52,15 @@ share/gnome/help/netspeed_applet/ru/figures/phone_24.png
 share/gnome/help/netspeed_applet/ru/figures/settings.png
 share/gnome/help/netspeed_applet/ru/legal.xml
 share/gnome/help/netspeed_applet/ru/netspeed_applet.xml
-share/gnome/omf/netspeed_applet/netspeed_applet-C.omf
-share/gnome/omf/netspeed_applet/netspeed_applet-cs.omf
-share/gnome/omf/netspeed_applet/netspeed_applet-de.omf
-share/gnome/omf/netspeed_applet/netspeed_applet-es.omf
-share/gnome/omf/netspeed_applet/netspeed_applet-ru.omf
-share/gnome/pixmaps/netspeed_applet.png
-share/gnome/pixmaps/netspeed_applet/gnome-dev-loopback.png
-share/gnome/pixmaps/netspeed_applet/gnome-dev-plip.png
-share/gnome/pixmaps/netspeed_applet/gnome-dev-ppp.png
+share/omf/netspeed_applet/netspeed_applet-C.omf
+share/omf/netspeed_applet/netspeed_applet-cs.omf
+share/omf/netspeed_applet/netspeed_applet-de.omf
+share/omf/netspeed_applet/netspeed_applet-es.omf
+share/omf/netspeed_applet/netspeed_applet-ru.omf
+share/pixmaps/netspeed_applet.png
+share/pixmaps/netspeed_applet/gnome-dev-loopback.png
+share/pixmaps/netspeed_applet/gnome-dev-plip.png
+share/pixmaps/netspeed_applet/gnome-dev-ppp.png
 share/locale/cs/LC_MESSAGES/netspeed_applet.mo
 share/locale/de/LC_MESSAGES/netspeed_applet.mo
 share/locale/es/LC_MESSAGES/netspeed_applet.mo
@@ -76,8 +76,8 @@ share/locale/ru/LC_MESSAGES/netspeed_applet.mo
 share/locale/sv/LC_MESSAGES/netspeed_applet.mo
 share/locale/tr/LC_MESSAGES/netspeed_applet.mo
 share/locale/zh_CN/LC_MESSAGES/netspeed_applet.mo
-@dirrm share/gnome/pixmaps/netspeed_applet
-@dirrm share/gnome/omf/netspeed_applet
+@dirrm share/pixmaps/netspeed_applet
+@dirrm share/omf/netspeed_applet
 @dirrm share/gnome/help/netspeed_applet/ru/figures
 @dirrm share/gnome/help/netspeed_applet/ru
 @dirrm share/gnome/help/netspeed_applet/es/figures
diff --git a/net/py-avahi/Makefile b/net/py-avahi/Makefile
index 460027e3fc0a..7ef083f1be5d 100644
--- a/net/py-avahi/Makefile
+++ b/net/py-avahi/Makefile
@@ -3,11 +3,12 @@
 # Whom:				Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#
+#    $MCom: ports/net/py-avahi/Makefile,v 1.4 2007/07/31 18:24:13 ahze Exp $
 
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	net gnome python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+PKGNAMESUFFIX=	# empty
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Python interface to the Avahi mDNS system
@@ -18,30 +19,16 @@ LIB_DEPENDS=	avahi-client.3:${PORTSDIR}/net/avahi
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/gdbm.so:${PORTSDIR}/databases/py-gdbm \
 		${PYTHON_SITELIBDIR}/dbus/_dbus.py:${PORTSDIR}/devel/py-dbus
 
-MASTERDIR=	${.CURDIR}/../avahi
+MASTERDIR=	${.CURDIR}/../avahi-app
 BUILD_WRKSRC=	${WRKSRC}/avahi-python
 INSTALL_WRKSRC=	${BUILD_WRKSRC}
 DESCR=		${.CURDIR}/pkg-descr
 PLIST=		${.CURDIR}/pkg-plist
 
-AVAHI_SLAVE=	yes
+AVAHI_SLAVE=	python
 
 USE_GNOME=	gnomehack gnometarget pygtk2
 USE_PYTHON=	yes
-CONFIGURE_ARGS=	--enable-python \
-		--disable-mono \
-		--disable-monodoc \
-		--disable-gtk \
-		--disable-qt3 \
-		--disable-qt4 \
-		--localstatedir=/var \
-		--disable-doxygen-docs \
-		--disable-xml-docs \
-		--disable-doxygen-dot \
-		--localstatedir=/var \
-		--with-dbus-system-address=unix:path=/var/run/dbus/system_bus_socket \
-		--with-distro=freebsd
-
 MAN1=		avahi-bookmarks.1 avahi-discover.1
 
 pre-build:
@@ -57,8 +44,5 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/service-type-database/service-types.db ${DATADIR}
 	@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py -l ${PYTHONPREFIX_SITELIBDIR}/avahi
 	@${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py -l ${PYTHONPREFIX_SITELIBDIR}/avahi
-.for mf in ${MAN1}
-	${INSTALL_MAN} ${WRKSRC}/man/${mf} ${MAN1PREFIX}/man/man1
-.endfor
 
 .include "${MASTERDIR}/Makefile"
diff --git a/net/service-discovery-applet/Makefile b/net/service-discovery-applet/Makefile
index ced4ca1a6004..dc582b2aca3f 100644
--- a/net/service-discovery-applet/Makefile
+++ b/net/service-discovery-applet/Makefile
@@ -3,12 +3,12 @@
 # Whom:				Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/net/service-discovery-applet/Makefile,v 1.3 2006/10/11 05:53:39 marcus Exp $
+#   $MCom: ports/net/service-discovery-applet/Makefile,v 1.5 2007/08/06 16:57:53 mezz Exp $
 #
 
 PORTNAME=	service-discovery-applet
 PORTVERSION=	0.4.3
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	net dns gnome
 MASTER_SITES=	http://0pointer.de/~sebest/
 
@@ -36,6 +36,6 @@ post-patch:
 
 post-install:
 	@${LOCALBASE}/bin/gtk-update-icon-cache -f -q --ignore-theme-index \
-		${PREFIX}/share/gnome/service-discovery-applet/icons
+		${PREFIX}/share/service-discovery-applet/icons
 
 .include <bsd.port.mk>
diff --git a/net/service-discovery-applet/pkg-plist b/net/service-discovery-applet/pkg-plist
index 9f426d622478..ba152e1a99ae 100644
--- a/net/service-discovery-applet/pkg-plist
+++ b/net/service-discovery-applet/pkg-plist
@@ -10,38 +10,38 @@ lib/%%PYTHON_VERSION%%/site-packages/sdapplet/pluginutils.py
 lib/%%PYTHON_VERSION%%/site-packages/sdapplet/pluginutils.pyc
 lib/%%PYTHON_VERSION%%/site-packages/sdapplet/pluginutils.pyo
 libdata/bonobo/servers/GNOME_ServiceDiscoveryApplet.server
-share/gnome/service-discovery-applet/icons/24x24/_ftp._tcp.png
-share/gnome/service-discovery-applet/icons/24x24/_http._tcp.png
-share/gnome/service-discovery-applet/icons/24x24/_https._tcp.png
-share/gnome/service-discovery-applet/icons/24x24/_rfb._tcp.png
-share/gnome/service-discovery-applet/icons/24x24/_sftp-ssh._tcp.png
-share/gnome/service-discovery-applet/icons/24x24/_ssh._tcp.png
-share/gnome/service-discovery-applet/icons/24x24/service-discovery-applet.png
-share/gnome/service-discovery-applet/icons/48x48/_ftp._tcp.png
-share/gnome/service-discovery-applet/icons/48x48/_http._tcp.png
-share/gnome/service-discovery-applet/icons/48x48/_https._tcp.png
-share/gnome/service-discovery-applet/icons/48x48/_rfb._tcp.png
-share/gnome/service-discovery-applet/icons/48x48/_sftp-ssh._tcp.png
-share/gnome/service-discovery-applet/icons/48x48/_ssh._tcp.png
-share/gnome/service-discovery-applet/icons/48x48/service-discovery-applet.png
-share/gnome/service-discovery-applet/icons/icon-theme.cache
-share/gnome/service-discovery-applet/interfaces/service-discovery-config.glade
-share/gnome/service-discovery-applet/plugins/ekiga.py
-share/gnome/service-discovery-applet/plugins/gconfterminal.py
-share/gnome/service-discovery-applet/plugins/nautilus.py
-share/gnome/service-discovery-applet/plugins/xvncviewer.py
-share/gnome/service-discovery-applet/tools/exec_wrapper
+share/service-discovery-applet/icons/24x24/_ftp._tcp.png
+share/service-discovery-applet/icons/24x24/_http._tcp.png
+share/service-discovery-applet/icons/24x24/_https._tcp.png
+share/service-discovery-applet/icons/24x24/_rfb._tcp.png
+share/service-discovery-applet/icons/24x24/_sftp-ssh._tcp.png
+share/service-discovery-applet/icons/24x24/_ssh._tcp.png
+share/service-discovery-applet/icons/24x24/service-discovery-applet.png
+share/service-discovery-applet/icons/48x48/_ftp._tcp.png
+share/service-discovery-applet/icons/48x48/_http._tcp.png
+share/service-discovery-applet/icons/48x48/_https._tcp.png
+share/service-discovery-applet/icons/48x48/_rfb._tcp.png
+share/service-discovery-applet/icons/48x48/_sftp-ssh._tcp.png
+share/service-discovery-applet/icons/48x48/_ssh._tcp.png
+share/service-discovery-applet/icons/48x48/service-discovery-applet.png
+share/service-discovery-applet/icons/icon-theme.cache
+share/service-discovery-applet/interfaces/service-discovery-config.glade
+share/service-discovery-applet/plugins/ekiga.py
+share/service-discovery-applet/plugins/gconfterminal.py
+share/service-discovery-applet/plugins/nautilus.py
+share/service-discovery-applet/plugins/xvncviewer.py
+share/service-discovery-applet/tools/exec_wrapper
 share/locale/ca/LC_MESSAGES/service-discovery-applet.mo
 share/locale/da/LC_MESSAGES/service-discovery-applet.mo
 share/locale/de/LC_MESSAGES/service-discovery-applet.mo
 share/locale/fr/LC_MESSAGES/service-discovery-applet.mo
-@dirrm share/gnome/service-discovery-applet/tools
-@dirrm share/gnome/service-discovery-applet/plugins
-@dirrm share/gnome/service-discovery-applet/interfaces
-@dirrm share/gnome/service-discovery-applet/icons/48x48
-@dirrm share/gnome/service-discovery-applet/icons/24x24
-@dirrm share/gnome/service-discovery-applet/icons
-@dirrm share/gnome/service-discovery-applet
+@dirrm share/service-discovery-applet/tools
+@dirrm share/service-discovery-applet/plugins
+@dirrm share/service-discovery-applet/interfaces
+@dirrm share/service-discovery-applet/icons/48x48
+@dirrm share/service-discovery-applet/icons/24x24
+@dirrm share/service-discovery-applet/icons
+@dirrm share/service-discovery-applet
 @dirrm lib/%%PYTHON_VERSION%%/site-packages/sdapplet
 @dirrmtry lib/%%PYTHON_VERSION%%/site-packages
 @dirrmtry lib/%%PYTHON_VERSION%%
diff --git a/net/straw/Makefile b/net/straw/Makefile
index eb3a6fcfce6b..8a2f5f03f9fa 100644
--- a/net/straw/Makefile
+++ b/net/straw/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	straw
 PORTVERSION=	0.27
+PORTREVISION=	1
 CATEGORIES=	net gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=sources/${PORTNAME}/${PORTVERSION}
@@ -25,10 +26,10 @@ USE_GNOME=	gnomehier libglade2 pygnome2 pygnomeextras
 USE_PYTHON=	2.4+
 USE_PYDISTUTILS=	yes
 PYDISTUTILS_PKGNAME=	Straw
-PYDISTUTILS_EGGINFODIR=	${PREFIX}/share/gnome
+PYDISTUTILS_EGGINFODIR=	${PREFIX}/share
 PYDISTUTILS_INSTALLARGS=	-c -O1 --prefix=${PREFIX} \
-				--install-lib=${PREFIX}/share/gnome \
-				--with-desktop-file-dir=share/gnome/applications
+				--install-lib=${PREFIX}/share \
+				--with-desktop-file-dir=share/applications
 
 GCONF_SCHEMAS=	straw.schemas
 
diff --git a/net/straw/files/patch-constants.py.in b/net/straw/files/patch-constants.py.in
deleted file mode 100644
index a0b097fa5403..000000000000
--- a/net/straw/files/patch-constants.py.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- constants.py.in	Sat Feb  4 14:24:37 2006
-+++ constants.py.in	Wed Jan  3 23:42:34 2007
-@@ -11,7 +11,7 @@
- STRAW_REF_URL = "%sstraw-ref.html" % STRAW_URL
- libdir = os.path.normpath('$libdir')
- localedir = os.path.normpath(os.path.join('$datadir','locale'))
--datadir = os.path.normpath(os.path.join('$datadir','straw'))
-+datadir = os.path.normpath(os.path.join('$datadir','gnome','straw'))
- 
- # if STRAW_IN_SOURCE_DIR, this will be the glade/ and images/ in source
- # which is different from datadir (data/), whereas on default installations,
diff --git a/net/straw/files/patch-setup.py b/net/straw/files/patch-setup.py
index 0e4ca8d55714..a024cf1f0576 100644
--- a/net/straw/files/patch-setup.py
+++ b/net/straw/files/patch-setup.py
@@ -1,14 +1,5 @@
 --- setup.py	Sat Feb 18 16:22:43 2006
 +++ setup.py	Wed Jan  3 23:38:53 2007
-@@ -127,7 +127,7 @@
-         ]
-     files = [
-         ('share/pixmaps', ['images/straw.png']),
--        ('share/straw', images + misc)]
-+        ('share/gnome/straw', images + misc)]
-     return files
- 
- # Let distutils do the work
 @@ -146,7 +146,7 @@
        pot_file         = 'po/straw.pot',
        translations     = translations(),
diff --git a/net/straw/files/patch-src::straw b/net/straw/files/patch-src::straw
index cb965b2ce848..ec142ac7ee74 100644
--- a/net/straw/files/patch-src::straw
+++ b/net/straw/files/patch-src::straw
@@ -1,14 +1,5 @@
 --- src/straw	Sat Oct 21 07:53:23 2006
 +++ src/straw	Sun May 20 09:49:06 2007
-@@ -49,7 +49,7 @@
-     if not sdir:
-         h, t = os.path.split(os.path.split(os.path.abspath(sys.argv[0]))[0])
-         if t == 'bin':
--            libdir = os.path.join(h, 'lib')
-+            libdir = os.path.join(h, 'share', 'gnome')
-             fp = os.path.join(libdir, 'straw')
-             if os.path.isdir(fp):
-                 sdir = fp
 @@ -102,7 +102,7 @@
      if ENV_IN_SOURCE:
          from lib import Application, Config
diff --git a/net/straw/pkg-plist b/net/straw/pkg-plist
index 453d699a646e..4f0bdbb280e6 100644
--- a/net/straw/pkg-plist
+++ b/net/straw/pkg-plist
@@ -1,143 +1,143 @@
 bin/straw
-share/gnome/applications/straw.desktop
-share/gnome/straw/Application.py
-share/gnome/straw/Application.pyc
-share/gnome/straw/Application.pyo
-share/gnome/straw/CategorySelector.py
-share/gnome/straw/CategorySelector.pyc
-share/gnome/straw/CategorySelector.pyo
-share/gnome/straw/Config.py
-share/gnome/straw/Config.pyc
-share/gnome/straw/Config.pyo
-share/gnome/straw/Event.py
-share/gnome/straw/Event.pyc
-share/gnome/straw/Event.pyo
-share/gnome/straw/Feed.py
-share/gnome/straw/Feed.pyc
-share/gnome/straw/Feed.pyo
-share/gnome/straw/FeedCategoryList.py
-share/gnome/straw/FeedCategoryList.pyc
-share/gnome/straw/FeedCategoryList.pyo
-share/gnome/straw/FeedDataRouter.py
-share/gnome/straw/FeedDataRouter.pyc
-share/gnome/straw/FeedDataRouter.pyo
-share/gnome/straw/FeedItems.py
-share/gnome/straw/FeedItems.pyc
-share/gnome/straw/FeedItems.pyo
-share/gnome/straw/FeedList.py
-share/gnome/straw/FeedList.pyc
-share/gnome/straw/FeedList.pyo
-share/gnome/straw/FeedListView.py
-share/gnome/straw/FeedListView.pyc
-share/gnome/straw/FeedListView.pyo
-share/gnome/straw/FeedPropertiesDialog.py
-share/gnome/straw/FeedPropertiesDialog.pyc
-share/gnome/straw/FeedPropertiesDialog.pyo
-share/gnome/straw/Find.py
-share/gnome/straw/Find.pyc
-share/gnome/straw/Find.pyo
-share/gnome/straw/ImageCache.py
-share/gnome/straw/ImageCache.pyc
-share/gnome/straw/ImageCache.pyo
-share/gnome/straw/ItemList.py
-share/gnome/straw/ItemList.pyc
-share/gnome/straw/ItemList.pyo
-share/gnome/straw/ItemStore.py
-share/gnome/straw/ItemStore.pyc
-share/gnome/straw/ItemStore.pyo
-share/gnome/straw/ItemView.py
-share/gnome/straw/ItemView.pyc
-share/gnome/straw/ItemView.pyo
-share/gnome/straw/LookupManager.py
-share/gnome/straw/LookupManager.pyc
-share/gnome/straw/LookupManager.pyo
-share/gnome/straw/MVP.py
-share/gnome/straw/MVP.pyc
-share/gnome/straw/MVP.pyo
-share/gnome/straw/MainloopManager.py
-share/gnome/straw/MainloopManager.pyc
-share/gnome/straw/MainloopManager.pyo
-share/gnome/straw/MessageManager.py
-share/gnome/straw/MessageManager.pyc
-share/gnome/straw/MessageManager.pyo
-share/gnome/straw/NetworkConstants.py
-share/gnome/straw/NetworkConstants.pyc
-share/gnome/straw/NetworkConstants.pyo
-share/gnome/straw/OPML.py
-share/gnome/straw/OPML.pyc
-share/gnome/straw/OPML.pyo
-share/gnome/straw/OPMLExport.py
-share/gnome/straw/OPMLExport.pyc
-share/gnome/straw/OPMLExport.pyo
-share/gnome/straw/OPMLImport.py
-share/gnome/straw/OPMLImport.pyc
-share/gnome/straw/OPMLImport.pyo
-share/gnome/straw/OfflineToggle.py
-share/gnome/straw/OfflineToggle.pyc
-share/gnome/straw/OfflineToggle.pyo
-share/gnome/straw/ParsedSummary.py
-share/gnome/straw/ParsedSummary.pyc
-share/gnome/straw/ParsedSummary.pyo
-share/gnome/straw/PollManager.py
-share/gnome/straw/PollManager.pyc
-share/gnome/straw/PollManager.pyo
-share/gnome/straw/PreferencesDialog.py
-share/gnome/straw/PreferencesDialog.pyc
-share/gnome/straw/PreferencesDialog.pyo
-share/gnome/straw/QueueDict.py
-share/gnome/straw/QueueDict.pyc
-share/gnome/straw/QueueDict.pyo
-share/gnome/straw/SummaryItem.py
-share/gnome/straw/SummaryItem.pyc
-share/gnome/straw/SummaryItem.pyo
-share/gnome/straw/SummaryParser.py
-share/gnome/straw/SummaryParser.pyc
-share/gnome/straw/SummaryParser.pyo
-share/gnome/straw/Tray.py
-share/gnome/straw/Tray.pyc
-share/gnome/straw/Tray.pyo
-share/gnome/straw/URLFetch.py
-share/gnome/straw/URLFetch.pyc
-share/gnome/straw/URLFetch.pyo
-share/gnome/straw/ValueMonitor.py
-share/gnome/straw/ValueMonitor.pyc
-share/gnome/straw/ValueMonitor.pyo
-share/gnome/straw/__init__.py
-share/gnome/straw/__init__.pyc
-share/gnome/straw/__init__.pyo
-share/gnome/straw/constants.py
-share/gnome/straw/constants.pyc
-share/gnome/straw/constants.pyo
-share/gnome/straw/default_subscriptions.opml
-share/gnome/straw/dialogs.py
-share/gnome/straw/dialogs.pyc
-share/gnome/straw/dialogs.pyo
-share/gnome/straw/error.py
-share/gnome/straw/error.pyc
-share/gnome/straw/error.pyo
-share/gnome/straw/feedfinder.py
-share/gnome/straw/feedfinder.pyc
-share/gnome/straw/feedfinder.pyo
-share/gnome/straw/feedparser.py
-share/gnome/straw/feedparser.pyc
-share/gnome/straw/feedparser.pyo
-share/gnome/straw/httplib_async.py
-share/gnome/straw/httplib_async.pyc
-share/gnome/straw/httplib_async.pyo
-share/gnome/straw/image-broken.png
-share/gnome/straw/image-waiting.png
-share/gnome/straw/straw.css
-share/gnome/straw/straw.glade
-share/gnome/straw/straw.png
-share/gnome/straw/strawdbus.py
-share/gnome/straw/strawdbus.pyc
-share/gnome/straw/strawdbus.pyo
-share/gnome/straw/subscribe.py
-share/gnome/straw/subscribe.pyc
-share/gnome/straw/subscribe.pyo
-share/gnome/straw/utils.py
-share/gnome/straw/utils.pyc
-share/gnome/straw/utils.pyo
+share/applications/straw.desktop
+share/straw/Application.py
+share/straw/Application.pyc
+share/straw/Application.pyo
+share/straw/CategorySelector.py
+share/straw/CategorySelector.pyc
+share/straw/CategorySelector.pyo
+share/straw/Config.py
+share/straw/Config.pyc
+share/straw/Config.pyo
+share/straw/Event.py
+share/straw/Event.pyc
+share/straw/Event.pyo
+share/straw/Feed.py
+share/straw/Feed.pyc
+share/straw/Feed.pyo
+share/straw/FeedCategoryList.py
+share/straw/FeedCategoryList.pyc
+share/straw/FeedCategoryList.pyo
+share/straw/FeedDataRouter.py
+share/straw/FeedDataRouter.pyc
+share/straw/FeedDataRouter.pyo
+share/straw/FeedItems.py
+share/straw/FeedItems.pyc
+share/straw/FeedItems.pyo
+share/straw/FeedList.py
+share/straw/FeedList.pyc
+share/straw/FeedList.pyo
+share/straw/FeedListView.py
+share/straw/FeedListView.pyc
+share/straw/FeedListView.pyo
+share/straw/FeedPropertiesDialog.py
+share/straw/FeedPropertiesDialog.pyc
+share/straw/FeedPropertiesDialog.pyo
+share/straw/Find.py
+share/straw/Find.pyc
+share/straw/Find.pyo
+share/straw/ImageCache.py
+share/straw/ImageCache.pyc
+share/straw/ImageCache.pyo
+share/straw/ItemList.py
+share/straw/ItemList.pyc
+share/straw/ItemList.pyo
+share/straw/ItemStore.py
+share/straw/ItemStore.pyc
+share/straw/ItemStore.pyo
+share/straw/ItemView.py
+share/straw/ItemView.pyc
+share/straw/ItemView.pyo
+share/straw/LookupManager.py
+share/straw/LookupManager.pyc
+share/straw/LookupManager.pyo
+share/straw/MVP.py
+share/straw/MVP.pyc
+share/straw/MVP.pyo
+share/straw/MainloopManager.py
+share/straw/MainloopManager.pyc
+share/straw/MainloopManager.pyo
+share/straw/MessageManager.py
+share/straw/MessageManager.pyc
+share/straw/MessageManager.pyo
+share/straw/NetworkConstants.py
+share/straw/NetworkConstants.pyc
+share/straw/NetworkConstants.pyo
+share/straw/OPML.py
+share/straw/OPML.pyc
+share/straw/OPML.pyo
+share/straw/OPMLExport.py
+share/straw/OPMLExport.pyc
+share/straw/OPMLExport.pyo
+share/straw/OPMLImport.py
+share/straw/OPMLImport.pyc
+share/straw/OPMLImport.pyo
+share/straw/OfflineToggle.py
+share/straw/OfflineToggle.pyc
+share/straw/OfflineToggle.pyo
+share/straw/ParsedSummary.py
+share/straw/ParsedSummary.pyc
+share/straw/ParsedSummary.pyo
+share/straw/PollManager.py
+share/straw/PollManager.pyc
+share/straw/PollManager.pyo
+share/straw/PreferencesDialog.py
+share/straw/PreferencesDialog.pyc
+share/straw/PreferencesDialog.pyo
+share/straw/QueueDict.py
+share/straw/QueueDict.pyc
+share/straw/QueueDict.pyo
+share/straw/SummaryItem.py
+share/straw/SummaryItem.pyc
+share/straw/SummaryItem.pyo
+share/straw/SummaryParser.py
+share/straw/SummaryParser.pyc
+share/straw/SummaryParser.pyo
+share/straw/Tray.py
+share/straw/Tray.pyc
+share/straw/Tray.pyo
+share/straw/URLFetch.py
+share/straw/URLFetch.pyc
+share/straw/URLFetch.pyo
+share/straw/ValueMonitor.py
+share/straw/ValueMonitor.pyc
+share/straw/ValueMonitor.pyo
+share/straw/__init__.py
+share/straw/__init__.pyc
+share/straw/__init__.pyo
+share/straw/constants.py
+share/straw/constants.pyc
+share/straw/constants.pyo
+share/straw/default_subscriptions.opml
+share/straw/dialogs.py
+share/straw/dialogs.pyc
+share/straw/dialogs.pyo
+share/straw/error.py
+share/straw/error.pyc
+share/straw/error.pyo
+share/straw/feedfinder.py
+share/straw/feedfinder.pyc
+share/straw/feedfinder.pyo
+share/straw/feedparser.py
+share/straw/feedparser.pyc
+share/straw/feedparser.pyo
+share/straw/httplib_async.py
+share/straw/httplib_async.pyc
+share/straw/httplib_async.pyo
+share/straw/image-broken.png
+share/straw/image-waiting.png
+share/straw/straw.css
+share/straw/straw.glade
+share/straw/straw.png
+share/straw/strawdbus.py
+share/straw/strawdbus.pyc
+share/straw/strawdbus.pyo
+share/straw/subscribe.py
+share/straw/subscribe.pyc
+share/straw/subscribe.pyo
+share/straw/utils.py
+share/straw/utils.pyc
+share/straw/utils.pyo
 share/locale/ar/LC_MESSAGES/straw.mo
 share/locale/bg/LC_MESSAGES/straw.mo
 share/locale/cs/LC_MESSAGES/straw.mo
@@ -167,4 +167,5 @@ share/locale/uk/LC_MESSAGES/straw.mo
 share/locale/vi/LC_MESSAGES/straw.mo
 share/locale/zh_CN/LC_MESSAGES/straw.mo
 share/pixmaps/straw.png
-@dirrm share/gnome/straw
+@dirrm share/straw
+@dirrmtry share/applications
diff --git a/net/tsclient/Makefile b/net/tsclient/Makefile
index f84cf4c081a9..efb11d77288a 100644
--- a/net/tsclient/Makefile
+++ b/net/tsclient/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	tsclient
 PORTVERSION=	0.148
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net gnome
 MASTER_SITES=	http://www.gnomepro.com/tsclient/
 
@@ -44,7 +44,7 @@ post-patch:
 		${WRKSRC}/configure
 
 post-install:
-	@${LN} -sf ${PREFIX}/share/gnome/pixmaps/tsclient/tsclient.png \
-		${PREFIX}/share/gnome/pixmaps/tsclient.png
+	@${LN} -sf ${PREFIX}/share/pixmaps/tsclient/tsclient.png \
+		${PREFIX}/share/pixmaps/tsclient.png
 
 .include <bsd.port.mk>
diff --git a/net/tsclient/pkg-plist b/net/tsclient/pkg-plist
index b1591f5aabb6..c4903907074f 100644
--- a/net/tsclient/pkg-plist
+++ b/net/tsclient/pkg-plist
@@ -1,29 +1,29 @@
 bin/tsclient
-share/gnome/application-registry/tsclient.applications
-share/gnome/applications/tsclient.desktop
-share/gnome/mime-info/tsclient.keys
-share/gnome/mime-info/tsclient.mime
-share/gnome/pixmaps/tsclient.png
-share/gnome/pixmaps/tsclient/banner-ar.png
-share/gnome/pixmaps/tsclient/banner-en.png
-share/gnome/pixmaps/tsclient/banner-es.png
-share/gnome/pixmaps/tsclient/banner-hu.png
-share/gnome/pixmaps/tsclient/banner-ja.png
-share/gnome/pixmaps/tsclient/banner-ms.png
-share/gnome/pixmaps/tsclient/banner-nl.png
-share/gnome/pixmaps/tsclient/banner-pa.png
-share/gnome/pixmaps/tsclient/banner-ru.png
-share/gnome/pixmaps/tsclient/banner-sv.png
-share/gnome/pixmaps/tsclient/banner-zh-cn.png
-share/gnome/pixmaps/tsclient/banner-zh-tw.png
-share/gnome/pixmaps/tsclient/colors.png
-share/gnome/pixmaps/tsclient/computer.png
-share/gnome/pixmaps/tsclient/keyboard.png
-share/gnome/pixmaps/tsclient/perform.png
-share/gnome/pixmaps/tsclient/program.png
-share/gnome/pixmaps/tsclient/size.png
-share/gnome/pixmaps/tsclient/sound.png
-share/gnome/pixmaps/tsclient/tsclient.png
+share/application-registry/tsclient.applications
+share/applications/tsclient.desktop
+share/mime-info/tsclient.keys
+share/mime-info/tsclient.mime
+share/pixmaps/tsclient.png
+share/pixmaps/tsclient/banner-ar.png
+share/pixmaps/tsclient/banner-en.png
+share/pixmaps/tsclient/banner-es.png
+share/pixmaps/tsclient/banner-hu.png
+share/pixmaps/tsclient/banner-ja.png
+share/pixmaps/tsclient/banner-ms.png
+share/pixmaps/tsclient/banner-nl.png
+share/pixmaps/tsclient/banner-pa.png
+share/pixmaps/tsclient/banner-ru.png
+share/pixmaps/tsclient/banner-sv.png
+share/pixmaps/tsclient/banner-zh-cn.png
+share/pixmaps/tsclient/banner-zh-tw.png
+share/pixmaps/tsclient/colors.png
+share/pixmaps/tsclient/computer.png
+share/pixmaps/tsclient/keyboard.png
+share/pixmaps/tsclient/perform.png
+share/pixmaps/tsclient/program.png
+share/pixmaps/tsclient/size.png
+share/pixmaps/tsclient/sound.png
+share/pixmaps/tsclient/tsclient.png
 share/locale/ar/LC_MESSAGES/tsclient.mo
 share/locale/ca/LC_MESSAGES/tsclient.mo
 share/locale/cs/LC_MESSAGES/tsclient.mo
@@ -62,4 +62,5 @@ share/locale/zh_TW/LC_MESSAGES/tsclient.mo
 @dirrmtry share/locale/se
 @dirrmtry share/locale/xh/LC_MESSAGES
 @dirrmtry share/locale/xh
-@dirrm share/gnome/pixmaps/tsclient
+@dirrm share/pixmaps/tsclient
+@dirrmtry share/applications
diff --git a/net/vino/Makefile b/net/vino/Makefile
index 12e0f5cc2f99..1ca45177c993 100644
--- a/net/vino/Makefile
+++ b/net/vino/Makefile
@@ -3,12 +3,11 @@
 # Whom:					Tom McLaughlin <tmclaugh@sdf.lonestar.org>
 #
 # $FreeBSD$
-#   $MCom: ports/net/vino/Makefile,v 1.37 2007/03/12 13:41:32 ahze Exp $
+#   $MCom: ports/net/vino/Makefile,v 1.48 2007/10/15 17:13:51 mezz Exp $
 #
 
 PORTNAME=	vino
-PORTVERSION=	2.18.1
-PORTREVISION=	2
+PORTVERSION=	2.20.1
 CATEGORIES=	net gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -27,9 +26,16 @@ GNOME_DESKTOP_VERSION=2
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
 CONFIGURE_ARGS=	--enable-session-support
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
 GCONF_SCHEMAS=	vino-server.schemas
 
+.if !defined(WITHOUT_NOTIFY)
+LIB_DEPENDS+=	notify.1:${PORTSDIR}/devel/libnotify
+CONFIGURE_ARGS+=--enable-libnotify=yes
+.else
+CONFIGURE_ARGS+=--enable-libnotify=no
+.endif
+
 .include <bsd.port.mk>
diff --git a/net/vino/distinfo b/net/vino/distinfo
index 3e47221e2b1e..eb4977814af6 100644
--- a/net/vino/distinfo
+++ b/net/vino/distinfo
@@ -1,3 +1,3 @@
-MD5 (vino-2.18.1.tar.bz2) = caf0025b1ed95f03e29f9b40ae48b75b
-SHA256 (vino-2.18.1.tar.bz2) = ce50a7c8c8209aecf81912f9eb784c9a5a8748f89abf49ac613c907e6ecc12f4
-SIZE (vino-2.18.1.tar.bz2) = 635144
+MD5 (vino-2.20.1.tar.bz2) = c45379bd177e0bc9a937a3388fc81650
+SHA256 (vino-2.20.1.tar.bz2) = 372ec01ebf8bffdd4b2f318eae7a49873a79634bb715e6355de19809c9fa1221
+SIZE (vino-2.20.1.tar.bz2) = 625243
diff --git a/net/vino/pkg-plist b/net/vino/pkg-plist
index 16bb51793ffb..067a1a1cc76b 100644
--- a/net/vino/pkg-plist
+++ b/net/vino/pkg-plist
@@ -2,9 +2,7 @@ bin/vino-preferences
 bin/vino-session
 libdata/bonobo/servers/GNOME_RemoteDesktop.server
 libexec/vino-server
-share/gnome/applications/vino-preferences.desktop
-share/gnome/vino/vino-preferences.glade
-share/gnome/vino/vino-prompt.glade
+share/applications/vino-preferences.desktop
 share/icons/hicolor/48x48/apps/gnome-remote-desktop.png
 share/locale/ar/LC_MESSAGES/vino.mo
 share/locale/az/LC_MESSAGES/vino.mo
@@ -48,6 +46,7 @@ share/locale/nb/LC_MESSAGES/vino.mo
 share/locale/ne/LC_MESSAGES/vino.mo
 share/locale/nl/LC_MESSAGES/vino.mo
 share/locale/nn/LC_MESSAGES/vino.mo
+share/locale/oc/LC_MESSAGES/vino.mo
 share/locale/or/LC_MESSAGES/vino.mo
 share/locale/pa/LC_MESSAGES/vino.mo
 share/locale/pl/LC_MESSAGES/vino.mo
@@ -56,6 +55,7 @@ share/locale/pt_BR/LC_MESSAGES/vino.mo
 share/locale/ro/LC_MESSAGES/vino.mo
 share/locale/ru/LC_MESSAGES/vino.mo
 share/locale/rw/LC_MESSAGES/vino.mo
+share/locale/si/LC_MESSAGES/vino.mo
 share/locale/sk/LC_MESSAGES/vino.mo
 share/locale/sl/LC_MESSAGES/vino.mo
 share/locale/sq/LC_MESSAGES/vino.mo
@@ -73,18 +73,25 @@ share/locale/xh/LC_MESSAGES/vino.mo
 share/locale/zh_CN/LC_MESSAGES/vino.mo
 share/locale/zh_HK/LC_MESSAGES/vino.mo
 share/locale/zh_TW/LC_MESSAGES/vino.mo
-@dirrm share/gnome/vino
+%%DATADIR%%/vino-preferences.glade
+%%DATADIR%%/vino-prompt.glade
+@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/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/bn_IN/LC_MESSAGES
 @dirrmtry share/locale/bn_IN
+@dirrmtry share/applications
diff --git a/news/grn/Makefile b/news/grn/Makefile
index 0274fdabc5f9..9f967fb4db26 100644
--- a/news/grn/Makefile
+++ b/news/grn/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	grn
 PORTVERSION=	0.0.28
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	news gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/news/grn/pkg-plist b/news/grn/pkg-plist
index c0c85cbabe28..2cb988f05854 100644
--- a/news/grn/pkg-plist
+++ b/news/grn/pkg-plist
@@ -13,7 +13,7 @@ share/gnome/help/grn/ru/index.html
 share/gnome/help/grn/ru/inline_vars.html
 share/gnome/help/grn/ru/keyboard.html
 share/gnome/help/grn/ru/topic.dat
-share/gnome/pixmaps/grn.png
+share/pixmaps/grn.png
 @dirrm share/gnome/help/grn/ru
 @dirrm share/gnome/help/grn/C
 @dirrm share/gnome/help/grn
diff --git a/palm/gnome-pilot-conduits/Makefile b/palm/gnome-pilot-conduits/Makefile
index 4eb76bd22b8f..3db629cffbbe 100644
--- a/palm/gnome-pilot-conduits/Makefile
+++ b/palm/gnome-pilot-conduits/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gnome-pilot-conduits
 PORTVERSION=	2.0.15
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	palm comms gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.0
diff --git a/palm/gnome-pilot-conduits/pkg-plist b/palm/gnome-pilot-conduits/pkg-plist
index 2853878326cf..164536dc6e5e 100644
--- a/palm/gnome-pilot-conduits/pkg-plist
+++ b/palm/gnome-pilot-conduits/pkg-plist
@@ -13,12 +13,12 @@ lib/gnome-pilot/conduits/libmemo_file_conduit.so
 lib/gnome-pilot/conduits/libtime_conduit.a
 lib/gnome-pilot/conduits/libtime_conduit.la
 lib/gnome-pilot/conduits/libtime_conduit.so
-share/gnome/gnome-pilot/conduits/expense.conduit
-share/gnome/gnome-pilot/conduits/mal.conduit
-share/gnome/gnome-pilot/conduits/memofile.conduit
-share/gnome/gnome-pilot/conduits/sendmail.conduit
-share/gnome/gnome-pilot/conduits/time.conduit
-share/gnome/pixmaps/avantgo.png
+share/gnome-pilot/conduits/expense.conduit
+share/gnome-pilot/conduits/mal.conduit
+share/gnome-pilot/conduits/memofile.conduit
+share/gnome-pilot/conduits/sendmail.conduit
+share/gnome-pilot/conduits/time.conduit
+share/pixmaps/avantgo.png
 share/locale/ar/LC_MESSAGES/gnome-pilot-conduits.mo
 share/locale/az/LC_MESSAGES/gnome-pilot-conduits.mo
 share/locale/be/LC_MESSAGES/gnome-pilot-conduits.mo
@@ -65,7 +65,11 @@ share/locale/xh/LC_MESSAGES/gnome-pilot-conduits.mo
 share/locale/zh_CN/LC_MESSAGES/gnome-pilot-conduits.mo
 share/locale/zh_HK/LC_MESSAGES/gnome-pilot-conduits.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-pilot-conduits.mo
+@dirrm share/gnome-pilot/conduits
+@dirrm lib/gnome-pilot/conduits
 @dirrmtry share/locale/zh_HK/LC_MESSAGES
 @dirrmtry share/locale/zh_HK
-@dirrm share/gnome/gnome-pilot/conduits
-@dirrm lib/gnome-pilot/conduits
+@dirrmtry share/locale/xh/LC_MESSAGES
+@dirrmtry share/locale/xh
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
diff --git a/palm/gnome-pilot/Makefile b/palm/gnome-pilot/Makefile
index 09fdc74ca0cb..9dec76fdea86 100644
--- a/palm/gnome-pilot/Makefile
+++ b/palm/gnome-pilot/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gnome-pilot
 PORTVERSION=	2.0.15
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	palm comms gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.0
diff --git a/palm/gnome-pilot/files/patch-aa b/palm/gnome-pilot/files/patch-aa
deleted file mode 100644
index fe734c76b010..000000000000
--- a/palm/gnome-pilot/files/patch-aa
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig	Mon Apr 14 16:24:54 2003
-+++ configure	Mon Apr 14 21:12:15 2003
-@@ -10653,7 +10654,7 @@
- 
- 
- cat >>confdefs.h <<_ACEOF
--#define GNOME_ICONDIR "${prefix}/share/pixmaps"
-+#define GNOME_ICONDIR "${datadir}/pixmaps"
- _ACEOF
- 
- 
diff --git a/palm/gnome-pilot/pkg-plist b/palm/gnome-pilot/pkg-plist
index 650cdb7756c6..bc9a7871ac4a 100644
--- a/palm/gnome-pilot/pkg-plist
+++ b/palm/gnome-pilot/pkg-plist
@@ -40,26 +40,26 @@ libdata/bonobo/servers/GNOME_Pilot_Daemon.server
 libdata/pkgconfig/gnome-pilot-2.0.pc
 libexec/gpilot-applet
 libexec/gpilotd
-share/gnome/applications/gpilotd-control-applet.desktop
-share/gnome/gnome-pilot/conduits/backup.conduit
-share/gnome/gnome-pilot/conduits/file.conduit
-share/gnome/gnome-pilot/conduits/test.conduit
-share/gnome/gnome-pilot/devices.xml
-share/gnome/gnome-pilot/glade/gnome-palm.png
-share/gnome/gnome-pilot/glade/gnome-pilot-watermark.png
-share/gnome/gnome-pilot/glade/gpilotd-capplet.glade
-share/gnome/gnome-pilot/glade/pilot-applet.glade
+share/applications/gpilotd-control-applet.desktop
+share/gnome-pilot/conduits/backup.conduit
+share/gnome-pilot/conduits/file.conduit
+share/gnome-pilot/conduits/test.conduit
+share/gnome-pilot/devices.xml
+share/gnome-pilot/glade/gnome-palm.png
+share/gnome-pilot/glade/gnome-pilot-watermark.png
+share/gnome-pilot/glade/gpilotd-capplet.glade
+share/gnome-pilot/glade/pilot-applet.glade
 share/gnome/help/gnome-pilot/C/gnome-pilot.xml
-share/gnome/idl/gnome-pilot.idl
-share/gnome/mime-info/palm.keys
-share/gnome/mime-info/palm.mime
-share/gnome/omf/gnome-pilot/gnome-pilot-C.omf
-share/gnome/pixmaps/gnome-palm-conduit.png
-share/gnome/pixmaps/gnome-palm.png
-share/gnome/pixmaps/sync_broken.png
-share/gnome/pixmaps/sync_icon.png
-share/gnome/pixmaps/sync_paused.png
-share/gnome/pixmaps/syncing_icon.png
+share/idl/gnome-pilot.idl
+share/mime-info/palm.keys
+share/mime-info/palm.mime
+share/omf/gnome-pilot/gnome-pilot-C.omf
+share/pixmaps/gnome-palm-conduit.png
+share/pixmaps/gnome-palm.png
+share/pixmaps/sync_broken.png
+share/pixmaps/sync_icon.png
+share/pixmaps/sync_paused.png
+share/pixmaps/syncing_icon.png
 share/locale/am/LC_MESSAGES/gnome-pilot.mo
 share/locale/ar/LC_MESSAGES/gnome-pilot.mo
 share/locale/az/LC_MESSAGES/gnome-pilot.mo
@@ -107,15 +107,20 @@ share/locale/xh/LC_MESSAGES/gnome-pilot.mo
 share/locale/zh_CN/LC_MESSAGES/gnome-pilot.mo
 share/locale/zh_HK/LC_MESSAGES/gnome-pilot.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-pilot.mo
-@dirrmtry share/locale/zh_HK/LC_MESSAGES
-@dirrmtry share/locale/zh_HK
-@dirrm share/gnome/omf/gnome-pilot
+@dirrm share/omf/gnome-pilot
 @dirrm share/gnome/help/gnome-pilot/C
 @dirrm share/gnome/help/gnome-pilot
-@dirrm share/gnome/gnome-pilot/glade
+@dirrm share/gnome-pilot/glade
 @dirrm include/libgpilotdCM
 @dirrm include/gpilotd
-@dirrmtry share/gnome/gnome-pilot/conduits
-@dirrmtry share/gnome/gnome-pilot
+@dirrmtry share/gnome-pilot/conduits
+@dirrmtry share/gnome-pilot
 @dirrmtry lib/gnome-pilot/conduits
 @dirrmtry lib/gnome-pilot
+@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/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
+@dirrmtry share/applications
diff --git a/palm/synce-gnomevfs/Makefile b/palm/synce-gnomevfs/Makefile
index 6a9465c14ab8..3edf324f7d7e 100644
--- a/palm/synce-gnomevfs/Makefile
+++ b/palm/synce-gnomevfs/Makefile
@@ -3,10 +3,11 @@
 # Whom:                        Sam Lawrance <boris@brooknet.com.au>
 #
 # $FreeBSD$
+#
 
 PORTNAME=	synce-gnomevfs
 PORTVERSION=	0.9.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	palm
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	synce
diff --git a/palm/synce-gnomevfs/pkg-plist b/palm/synce-gnomevfs/pkg-plist
index 40e090b7c8fa..7f0dff7e1d18 100644
--- a/palm/synce-gnomevfs/pkg-plist
+++ b/palm/synce-gnomevfs/pkg-plist
@@ -1,9 +1,9 @@
 bin/synce-in-computer-folder
 etc/gnome-vfs-2.0/modules/synce-module.conf
-share/gnome/pixmaps/synce/synce-color.png
-share/gnome/synce/synce-in-computer-folder.sh
+share/pixmaps/synce/synce-color.png
+share/synce/synce-in-computer-folder.sh
 lib/gnome-vfs-2.0/modules/libsyncevfs.a
 lib/gnome-vfs-2.0/modules/libsyncevfs.la
 lib/gnome-vfs-2.0/modules/libsyncevfs.so
-@dirrmtry share/gnome/pixmaps/synce
-@dirrmtry share/gnome/synce
+@dirrmtry share/pixmaps/synce
+@dirrmtry share/synce
diff --git a/palm/synce-gvfs/Makefile b/palm/synce-gvfs/Makefile
index 6a9465c14ab8..3edf324f7d7e 100644
--- a/palm/synce-gvfs/Makefile
+++ b/palm/synce-gvfs/Makefile
@@ -3,10 +3,11 @@
 # Whom:                        Sam Lawrance <boris@brooknet.com.au>
 #
 # $FreeBSD$
+#
 
 PORTNAME=	synce-gnomevfs
 PORTVERSION=	0.9.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	palm
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	synce
diff --git a/palm/synce-gvfs/pkg-plist b/palm/synce-gvfs/pkg-plist
index 40e090b7c8fa..7f0dff7e1d18 100644
--- a/palm/synce-gvfs/pkg-plist
+++ b/palm/synce-gvfs/pkg-plist
@@ -1,9 +1,9 @@
 bin/synce-in-computer-folder
 etc/gnome-vfs-2.0/modules/synce-module.conf
-share/gnome/pixmaps/synce/synce-color.png
-share/gnome/synce/synce-in-computer-folder.sh
+share/pixmaps/synce/synce-color.png
+share/synce/synce-in-computer-folder.sh
 lib/gnome-vfs-2.0/modules/libsyncevfs.a
 lib/gnome-vfs-2.0/modules/libsyncevfs.la
 lib/gnome-vfs-2.0/modules/libsyncevfs.so
-@dirrmtry share/gnome/pixmaps/synce
-@dirrmtry share/gnome/synce
+@dirrmtry share/pixmaps/synce
+@dirrmtry share/synce
diff --git a/palm/synce-multisync/Makefile b/palm/synce-multisync/Makefile
index f836578f1f61..6a7b8de54b77 100644
--- a/palm/synce-multisync/Makefile
+++ b/palm/synce-multisync/Makefile
@@ -3,10 +3,11 @@
 # Whom:                        Sam Lawrance <boris@brooknet.com.au>
 #
 # $FreeBSD$
+#
 
 PORTNAME=	synce-multisync_plugin
 PORTVERSION=	0.9.0
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	palm deskutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	synce
diff --git a/palm/synce-multisync/pkg-plist b/palm/synce-multisync/pkg-plist
index dcfd1c46ecb7..e4687c2a0c9a 100644
--- a/palm/synce-multisync/pkg-plist
+++ b/palm/synce-multisync/pkg-plist
@@ -2,6 +2,6 @@ lib/multisync/libsynce_plugin.a
 lib/multisync/libsynce_plugin.la
 lib/multisync/libsynce_plugin.so
 lib/multisync/libsynce_plugin.so.0
-share/gnome/synce/synce_multisync_plugin.glade
-@dirrm share/gnome/synce
+share/synce/synce_multisync_plugin.glade
+@dirrm share/synce
 @dirrmtry lib/multisync
diff --git a/polish/gnugadu2/Makefile b/polish/gnugadu2/Makefile
index ee1a278a01ee..26e4754a5f32 100644
--- a/polish/gnugadu2/Makefile
+++ b/polish/gnugadu2/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gnugadu2
 PORTVERSION=	2.3.0
+PORTREVISION=	1
 CATEGORIES=	polish net-im
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	ggadu
@@ -170,7 +171,7 @@ post-patch:
 post-install:
 .if (${HAVE_GNOME:Mgnomehier}!="")
 	${INSTALL_DATA} ${WRKSRC}/gg2.desktop ${LOCALBASE}/share/gnome/apps/Internet
-	${LN} -sf ${PREFIX}/share/pixmaps/gg2.png ${LOCALBASE}/share/gnome/pixmaps
+	${LN} -sf ${PREFIX}/share/pixmaps/gg2.png ${LOCALBASE}/share/pixmaps
 .endif
 .if exists(${LOCALBASE}/lib/libkdecore.so)
 	${INSTALL_DATA} ${WRKSRC}/gg2.desktop ${LOCALBASE}/share/applnk/Internet
diff --git a/polish/gnugadu2/files/patch-configure b/polish/gnugadu2/files/patch-configure
deleted file mode 100644
index b2d2e49bbf7a..000000000000
--- a/polish/gnugadu2/files/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig	Sun Dec 14 21:35:41 2003
-+++ configure	Sun Dec 14 21:39:11 2003
-@@ -24937,7 +24938,7 @@
-   fi
- else
-   cat >>confdefs.h <<_ACEOF
--#define PACKAGE_LOCALE_DIR "${datadir}/locale"
-+#define PACKAGE_LOCALE_DIR "${prefix}/share/locale"
- _ACEOF
- 
- fi
diff --git a/polish/gnugadu2/pkg-plist b/polish/gnugadu2/pkg-plist
index 276b1c9d88dd..4a15e5221643 100644
--- a/polish/gnugadu2/pkg-plist
+++ b/polish/gnugadu2/pkg-plist
@@ -338,6 +338,6 @@ share/pixmaps/gg2.png
 @dirrm lib/gg2
 %%GNOME:%%@cwd %%LOCALBASE%%
 %%GNOME:%%share/gnome/apps/Internet/gg2.desktop
-%%GNOME:%%share/gnome/pixmaps/gg2.png
+%%GNOME:%%share/pixmaps/gg2.png
 %%KDE:%%@cwd %%LOCALBASE%%
 %%KDE:%%share/applnk/Internet/gg2.desktop
diff --git a/print/freetype2/Makefile b/print/freetype2/Makefile
index 9ee188f0cc5e..18aa8a24f00c 100644
--- a/print/freetype2/Makefile
+++ b/print/freetype2/Makefile
@@ -3,11 +3,11 @@
 # Whom:			jseger@FreeBSD.org
 #
 # $FreeBSD$
+#   $MCom: ports/print/freetype2/Makefile,v 1.11 2007/07/06 16:59:40 marcus Exp $
 #
 
 PORTNAME=	freetype2
-PORTVERSION=	2.2.1
-PORTREVISION=	2
+PORTVERSION=	2.3.5
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:S,%SUBDIR%,freetype,} \
 		http://sunsite.cnlab-switch.ch/ftp/mirror/freetype/%SUBDIR%/ \
diff --git a/print/freetype2/distinfo b/print/freetype2/distinfo
index 208832af0a19..6c426d1468f9 100644
--- a/print/freetype2/distinfo
+++ b/print/freetype2/distinfo
@@ -1,3 +1,3 @@
-MD5 (freetype-2.2.1.tar.bz2) = 5b2f827082c544392a7701f7423f0781
-SHA256 (freetype-2.2.1.tar.bz2) = 0e8eb40392752b306d3a3de21f9fa479d53c17bd774b8051771cb258e162e006
-SIZE (freetype-2.2.1.tar.bz2) = 1212258
+MD5 (freetype-2.3.5.tar.bz2) = 65234327c5ac46ee00ebda15995d4c1c
+SHA256 (freetype-2.3.5.tar.bz2) = 1b357a3a1106c78c80dfd25e3854c3faa9a3dfc7063a4a1e5404e70c241d677e
+SIZE (freetype-2.3.5.tar.bz2) = 1279861
diff --git a/print/freetype2/files/patch-aa b/print/freetype2/files/patch-aa
index 87863d444bb2..32efc9a5d18d 100644
--- a/print/freetype2/files/patch-aa
+++ b/print/freetype2/files/patch-aa
@@ -1,6 +1,16 @@
---- builds/unix/detect.mk.orig	Tue Aug 22 17:53:59 2006
-+++ builds/unix/detect.mk	Tue Aug 22 17:54:09 2006
-@@ -78,9 +78,9 @@ ifeq ($(PLATFORM),unix)
+--- builds/unix/detect.mk.orig	2006-12-09 13:51:54.000000000 -0500
++++ builds/unix/detect.mk	2007-07-06 12:55:05.000000000 -0400
+@@ -21,6 +21,9 @@ ifeq ($(PLATFORM),ansi)
+   is_unix := $(strip $(wildcard /sbin/init) \
+                      $(wildcard /usr/sbin/init) \
+                      $(wildcard /hurd/auth))
++  # FreeBSD is "unix" so just mandate this to fix the build in
++  # jails that do not have init (see PR#113470).
++  is_unix := true
+   ifneq ($(is_unix),)
+ 
+     PLATFORM := unix
+@@ -79,9 +82,9 @@ ifeq ($(PLATFORM),unix)
    ifdef must_configure
      ifneq ($(have_Makefile),)
        # we are building FT2 not in the src tree
diff --git a/print/freetype2/files/patch-src_pcf_pcfdrivr.c b/print/freetype2/files/patch-src_pcf_pcfdrivr.c
deleted file mode 100644
index 01758d8a9091..000000000000
--- a/print/freetype2/files/patch-src_pcf_pcfdrivr.c
+++ /dev/null
@@ -1,50 +0,0 @@
---- src/pcf/pcfdrivr.c.orig	2006-02-17 07:40:36.000000000 +0100
-+++ src/pcf/pcfdrivr.c
-@@ -203,19 +203,23 @@ THE SOFTWARE.
- 
-     /* free properties */
-     {
--      PCF_Property  prop = face->properties;
-+      PCF_Property  prop;
-       FT_Int        i;
- 
- 
--      for ( i = 0; i < face->nprops; i++ )
-+      if ( face->properties )
-       {
--        prop = &face->properties[i];
-+        for ( i = 0; i < face->nprops; i++ )
-+        {
-+          prop = &face->properties[i];
- 
--        FT_FREE( prop->name );
--        if ( prop->isString )
--          FT_FREE( prop->value.atom );
-+          if ( prop ) {
-+            FT_FREE( prop->name );
-+            if ( prop->isString )
-+              FT_FREE( prop->value.atom );
-+          }
-+        }
-       }
--
-       FT_FREE( face->properties );
-     }
- 
-@@ -258,6 +262,8 @@ THE SOFTWARE.
-       FT_Error  error2;
- 
- 
-+      PCF_Face_Done( pcfface );
-+
-       /* this didn't work, try gzip support! */
-       error2 = FT_Stream_OpenGzip( &face->gzip_stream, stream );
-       if ( FT_ERROR_BASE( error2 ) == FT_Err_Unimplemented_Feature )
-@@ -357,6 +363,7 @@ THE SOFTWARE.
- 
-   Fail:
-     FT_TRACE2(( "[not a valid PCF file]\n" ));
-+    PCF_Face_Done( pcfface );
-     error = PCF_Err_Unknown_File_Format;  /* error */
-     goto Exit;
-   }
diff --git a/print/freetype2/files/patch-src_pcf_pcfread.c b/print/freetype2/files/patch-src_pcf_pcfread.c
deleted file mode 100644
index c9117f2062cc..000000000000
--- a/print/freetype2/files/patch-src_pcf_pcfread.c
+++ /dev/null
@@ -1,455 +0,0 @@
---- src/pcf/pcfread.c.orig	2006-01-23 17:35:18.000000000 +0100
-+++ src/pcf/pcfread.c
-@@ -102,7 +102,8 @@ THE SOFTWARE.
-       return PCF_Err_Cannot_Open_Resource;
- 
-     if ( toc->version != PCF_FILE_VERSION                 ||
--         toc->count   >  FT_ARRAY_MAX( face->toc.tables ) )
-+         toc->count   >  FT_ARRAY_MAX( face->toc.tables ) ||
-+         toc->count   == 0                                )
-       return PCF_Err_Invalid_File_Format;
- 
-     if ( FT_NEW_ARRAY( face->toc.tables, toc->count ) )
-@@ -116,6 +117,41 @@ THE SOFTWARE.
-       tables++;
-     }
- 
-+    /* Sort tables and check for overlaps.  Because they are almost      */
-+    /* always ordered already, an in-place bubble sort with simultaneous */
-+    /* boundary checking seems appropriate.                              */
-+    tables = face->toc.tables;
-+
-+    for ( n = 0; n < toc->count - 1; n++ )
-+    {
-+      FT_UInt  i, have_change;
-+
-+
-+      have_change = 0;
-+
-+      for ( i = 0; i < toc->count - 1 - n; i++ )
-+      {
-+        PCF_TableRec  tmp;
-+
-+
-+        if ( tables[i].offset > tables[i + 1].offset )
-+        {
-+          tmp           = tables[i];
-+          tables[i]     = tables[i + 1];
-+          tables[i + 1] = tmp;
-+
-+          have_change = 1;
-+        }
-+
-+        if ( ( tables[i].size   > tables[i + 1].offset )                  ||
-+             ( tables[i].offset > tables[i + 1].offset - tables[i].size ) )
-+          return PCF_Err_Invalid_Offset;
-+      }
-+
-+      if ( !have_change )
-+        break;
-+    }
-+
- #if defined( FT_DEBUG_LEVEL_TRACE )
- 
-     {
-@@ -130,7 +166,8 @@ THE SOFTWARE.
-       tables = face->toc.tables;
-       for ( i = 0; i < toc->count; i++ )
-       {
--        for( j = 0; j < sizeof ( tableNames ) / sizeof ( tableNames[0] ); j++ )
-+        for ( j = 0; j < sizeof ( tableNames ) / sizeof ( tableNames[0] );
-+              j++ )
-           if ( tables[i].type == (FT_UInt)( 1 << j ) )
-             name = tableNames[j];
- 
-@@ -153,13 +190,15 @@ THE SOFTWARE.
-   }
- 
- 
-+#define PCF_METRIC_SIZE  12
-+
-   static
-   const FT_Frame_Field  pcf_metric_header[] =
-   {
- #undef  FT_STRUCTURE
- #define FT_STRUCTURE  PCF_MetricRec
- 
--    FT_FRAME_START( 12 ),
-+    FT_FRAME_START( PCF_METRIC_SIZE ),
-       FT_FRAME_SHORT_LE( leftSideBearing ),
-       FT_FRAME_SHORT_LE( rightSideBearing ),
-       FT_FRAME_SHORT_LE( characterWidth ),
-@@ -176,7 +215,7 @@ THE SOFTWARE.
- #undef  FT_STRUCTURE
- #define FT_STRUCTURE  PCF_MetricRec
- 
--    FT_FRAME_START( 12 ),
-+    FT_FRAME_START( PCF_METRIC_SIZE ),
-       FT_FRAME_SHORT( leftSideBearing ),
-       FT_FRAME_SHORT( rightSideBearing ),
-       FT_FRAME_SHORT( characterWidth ),
-@@ -187,13 +226,15 @@ THE SOFTWARE.
-   };
- 
- 
-+#define PCF_COMPRESSED_METRIC_SIZE  5
-+
-   static
-   const FT_Frame_Field  pcf_compressed_metric_header[] =
-   {
- #undef  FT_STRUCTURE
- #define FT_STRUCTURE  PCF_Compressed_MetricRec
- 
--    FT_FRAME_START( 5 ),
-+    FT_FRAME_START( PCF_COMPRESSED_METRIC_SIZE ),
-       FT_FRAME_BYTE( leftSideBearing ),
-       FT_FRAME_BYTE( rightSideBearing ),
-       FT_FRAME_BYTE( characterWidth ),
-@@ -221,7 +262,7 @@ THE SOFTWARE.
-                ? pcf_metric_msb_header
-                : pcf_metric_header;
- 
--      /* the following sets 'error' but doesn't return in case of failure */
-+      /* the following sets `error' but doesn't return in case of failure */
-       (void)FT_STREAM_READ_FIELDS( fields, metric );
-     }
-     else
-@@ -261,17 +302,19 @@ THE SOFTWARE.
-     for ( i = 0; i < ntables; i++ )
-       if ( tables[i].type == type )
-       {
--        if ( stream->pos > tables[i].offset ) {
-+        if ( stream->pos > tables[i].offset )
-+        {
-           error = PCF_Err_Invalid_Stream_Skip;
-           goto Fail;
-         }
- 
--        if ( FT_STREAM_SKIP( tables[i].offset - stream->pos ) ) {
-+        if ( FT_STREAM_SKIP( tables[i].offset - stream->pos ) )
-+        {
-           error = PCF_Err_Invalid_Stream_Skip;
-           goto Fail;
-         }
- 
--        *asize   = tables[i].size;  /* unused - to be removed */
-+        *asize   = tables[i].size;
-         *aformat = tables[i].format;
- 
-         return PCF_Err_Ok;
-@@ -298,13 +341,15 @@ THE SOFTWARE.
-   }
- 
- 
-+#define PCF_PROPERTY_SIZE  9
-+
-   static
-   const FT_Frame_Field  pcf_property_header[] =
-   {
- #undef  FT_STRUCTURE
- #define FT_STRUCTURE  PCF_ParsePropertyRec
- 
--    FT_FRAME_START( 9 ),
-+    FT_FRAME_START( PCF_PROPERTY_SIZE ),
-       FT_FRAME_LONG_LE( name ),
-       FT_FRAME_BYTE   ( isString ),
-       FT_FRAME_LONG_LE( value ),
-@@ -318,7 +363,7 @@ THE SOFTWARE.
- #undef  FT_STRUCTURE
- #define FT_STRUCTURE  PCF_ParsePropertyRec
- 
--    FT_FRAME_START( 9 ),
-+    FT_FRAME_START( PCF_PROPERTY_SIZE ),
-       FT_FRAME_LONG( name ),
-       FT_FRAME_BYTE( isString ),
-       FT_FRAME_LONG( value ),
-@@ -353,8 +398,8 @@ THE SOFTWARE.
-                       PCF_Face   face )
-   {
-     PCF_ParseProperty  props      = 0;
--    PCF_Property       properties = 0;
--    FT_Int             nprops, i;
-+    PCF_Property       properties;
-+    FT_UInt            nprops, i;
-     FT_ULong           format, size;
-     FT_Error           error;
-     FT_Memory          memory     = FT_FACE(face)->memory;
-@@ -390,6 +435,15 @@ THE SOFTWARE.
- 
-     FT_TRACE4(( "  nprop = %d\n", nprops ));
- 
-+    /* rough estimate */
-+    if ( nprops > size / PCF_PROPERTY_SIZE )
-+    {
-+      error = PCF_Err_Invalid_Table;
-+      goto Bail;
-+    }
-+
-+    face->nprops = nprops;
-+
-     if ( FT_NEW_ARRAY( props, nprops ) )
-       goto Bail;
- 
-@@ -427,6 +481,13 @@ THE SOFTWARE.
- 
-     FT_TRACE4(( "  string_size = %ld\n", string_size ));
- 
-+    /* rough estimate */
-+    if ( string_size > size - nprops * PCF_PROPERTY_SIZE )
-+    {
-+      error = PCF_Err_Invalid_Table;
-+      goto Bail;
-+    }
-+
-     if ( FT_NEW_ARRAY( strings, string_size ) )
-       goto Bail;
- 
-@@ -437,13 +498,24 @@ THE SOFTWARE.
-     if ( FT_NEW_ARRAY( properties, nprops ) )
-       goto Bail;
- 
-+    face->properties = properties;
-+
-     for ( i = 0; i < nprops; i++ )
-     {
--      /* XXX: make atom */
-+      FT_Long  name_offset = props[i].name;
-+
-+
-+      if ( ( name_offset < 0 )                     ||
-+           ( (FT_ULong)name_offset > string_size ) )
-+      {
-+        error = PCF_Err_Invalid_Offset;
-+        goto Bail;
-+      }
-+
-       if ( FT_NEW_ARRAY( properties[i].name,
--                         ft_strlen( strings + props[i].name ) + 1 ) )
-+                         ft_strlen( strings + name_offset ) + 1 ) )
-         goto Bail;
--      ft_strcpy( properties[i].name, strings + props[i].name );
-+      ft_strcpy( properties[i].name, strings + name_offset );
- 
-       FT_TRACE4(( "  %s:", properties[i].name ));
- 
-@@ -451,8 +523,18 @@ THE SOFTWARE.
- 
-       if ( props[i].isString )
-       {
-+        FT_Long  value_offset = props[i].value;
-+
-+
-+        if ( ( value_offset < 0 )                     ||
-+             ( (FT_ULong)value_offset > string_size ) )
-+        {
-+          error = PCF_Err_Invalid_Offset;
-+          goto Bail;
-+        }
-+
-         if ( FT_NEW_ARRAY( properties[i].value.atom,
--                           ft_strlen( strings + props[i].value ) + 1 ) )
-+                           ft_strlen( strings + value_offset ) + 1 ) )
-           goto Bail;
-         ft_strcpy( properties[i].value.atom, strings + props[i].value );
- 
-@@ -466,14 +548,8 @@ THE SOFTWARE.
-       }
-     }
- 
--    face->properties = properties;
--    face->nprops = nprops;
--
--    FT_FREE( props );
--    FT_FREE( strings );
--
--    return PCF_Err_Ok;
--
-+    error = PCF_Err_Ok;
-+    
-   Bail:
-     FT_FREE( props );
-     FT_FREE( strings );
-@@ -488,11 +564,9 @@ THE SOFTWARE.
-   {
-     FT_Error    error    = PCF_Err_Ok;
-     FT_Memory   memory   = FT_FACE(face)->memory;
--    FT_ULong    format   = 0;
--    FT_ULong    size     = 0;
-+    FT_ULong    format, size;
-     PCF_Metric  metrics  = 0;
--    int         i;
--    int         nmetrics = -1;
-+    FT_ULong    nmetrics, i;
- 
- 
-     error = pcf_seek_to_table_type( stream,
-@@ -504,7 +578,8 @@ THE SOFTWARE.
-     if ( error )
-       return error;
- 
--    error = FT_READ_ULONG_LE( format );
-+    if ( FT_READ_ULONG_LE( format ) )
-+      goto Bail;
- 
-     if ( !PCF_FORMAT_MATCH( format, PCF_DEFAULT_FORMAT )     &&
-          !PCF_FORMAT_MATCH( format, PCF_COMPRESSED_METRICS ) )
-@@ -524,16 +599,30 @@ THE SOFTWARE.
-       else
-         (void)FT_READ_USHORT_LE( nmetrics );
-     }
--    if ( error || nmetrics == -1 )
-+    if ( error )
-       return PCF_Err_Invalid_File_Format;
- 
-     face->nmetrics = nmetrics;
- 
-+    FT_TRACE4(( "pcf_get_metrics:\n" ));
-+
-+    FT_TRACE4(( "  number of metrics: %d\n", nmetrics ));
-+
-+    /* rough estimate */
-+    if ( PCF_FORMAT_MATCH( format, PCF_DEFAULT_FORMAT ) )
-+    {
-+      if ( nmetrics > size / PCF_METRIC_SIZE )
-+        return PCF_Err_Invalid_Table;
-+    }
-+    else
-+    {
-+      if ( nmetrics > size / PCF_COMPRESSED_METRIC_SIZE )
-+        return PCF_Err_Invalid_Table;
-+    }
-+
-     if ( FT_NEW_ARRAY( face->metrics, nmetrics ) )
-       return PCF_Err_Out_Of_Memory;
- 
--    FT_TRACE4(( "pcf_get_metrics:\n" ));
--
-     metrics = face->metrics;
-     for ( i = 0; i < nmetrics; i++ )
-     {
-@@ -541,7 +630,7 @@ THE SOFTWARE.
- 
-       metrics[i].bits = 0;
- 
--      FT_TRACE4(( "  idx %d: width=%d, "
-+      FT_TRACE5(( "  idx %d: width=%d, "
-                   "lsb=%d, rsb=%d, ascent=%d, descent=%d, swidth=%d\n",
-                   i,
-                   ( metrics + i )->characterWidth,
-@@ -557,6 +646,8 @@ THE SOFTWARE.
- 
-     if ( error )
-       FT_FREE( face->metrics );
-+
-+  Bail:
-     return error;
-   }
- 
-@@ -597,14 +688,16 @@ THE SOFTWARE.
-     if ( !PCF_FORMAT_MATCH( format, PCF_DEFAULT_FORMAT ) )
-       return PCF_Err_Invalid_File_Format;
- 
-+    FT_TRACE4(( "pcf_get_bitmaps:\n" ));
-+
-+    FT_TRACE4(( "  number of bitmaps: %d\n", nbitmaps ));
-+
-     if ( nbitmaps != face->nmetrics )
-       return PCF_Err_Invalid_File_Format;
- 
-     if ( FT_NEW_ARRAY( offsets, nbitmaps ) )
-       return error;
- 
--    FT_TRACE4(( "pcf_get_bitmaps:\n" ));
--
-     for ( i = 0; i < nbitmaps; i++ )
-     {
-       if ( PCF_BYTE_ORDER( format ) == MSBFirst )
-@@ -612,7 +705,7 @@ THE SOFTWARE.
-       else
-         (void)FT_READ_LONG_LE( offsets[i] );
- 
--      FT_TRACE4(( "  bitmap %d: offset %ld (0x%lX)\n",
-+      FT_TRACE5(( "  bitmap %d: offset %ld (0x%lX)\n",
-                   i, offsets[i], offsets[i] ));
-     }
-     if ( error )
-@@ -640,15 +733,22 @@ THE SOFTWARE.
-     FT_UNUSED( sizebitmaps );       /* only used for debugging */
- 
-     for ( i = 0; i < nbitmaps; i++ )
--      face->metrics[i].bits = stream->pos + offsets[i];
-+    {
-+      /* rough estimate */
-+      if ( ( offsets[i] < 0 )              ||
-+           ( (FT_ULong)offsets[i] > size ) )
-+      {
-+        FT_ERROR(( "pcf_get_bitmaps:"));
-+        FT_ERROR(( " invalid offset to bitmap data of glyph %d\n", i ));
-+      }
-+      else
-+        face->metrics[i].bits = stream->pos + offsets[i];
-+    }
- 
-     face->bitmapsFormat = format;
- 
--    FT_FREE ( offsets );
--    return error;
--
-   Bail:
--    FT_FREE ( offsets );
-+    FT_FREE( offsets );
-     return error;
-   }
- 
-@@ -734,7 +834,7 @@ THE SOFTWARE.
- 
-         tmpEncoding[j].glyph = (FT_Short)encodingOffset;
- 
--        FT_TRACE4(( "  code %d (0x%04X): idx %d\n",
-+        FT_TRACE5(( "  code %d (0x%04X): idx %d\n",
-                     tmpEncoding[j].enc, tmpEncoding[j].enc,
-                     tmpEncoding[j].glyph ));
- 
-@@ -828,7 +928,8 @@ THE SOFTWARE.
-     if ( error )
-       goto Bail;
- 
--    error = FT_READ_ULONG_LE( format );
-+    if ( FT_READ_ULONG_LE( format ) )
-+      goto Bail;
- 
-     if ( !PCF_FORMAT_MATCH( format, PCF_DEFAULT_FORMAT )    &&
-          !PCF_FORMAT_MATCH( format, PCF_ACCEL_W_INKBOUNDS ) )
-@@ -876,7 +977,6 @@ THE SOFTWARE.
-       accel->ink_minbounds = accel->minbounds; /* I'm not sure about this */
-       accel->ink_maxbounds = accel->maxbounds;
-     }
--    return error;
- 
-   Bail:
-     return error;
-@@ -1082,11 +1182,12 @@ THE SOFTWARE.
-       else
-         root->family_name = NULL;
- 
--      /* Note: We shift all glyph indices by +1 since we must
-+      /* 
-+       * Note: We shift all glyph indices by +1 since we must
-        * respect the convention that glyph 0 always corresponds
--       * to the "missing glyph".
-+       * to the `missing glyph'.
-        *
--       * This implies bumping the number of "available" glyphs by 1.
-+       * This implies bumping the number of `available' glyphs by 1.
-        */
-       root->num_glyphs = face->nmetrics + 1;
- 
-@@ -1171,7 +1272,7 @@ THE SOFTWARE.
-   Exit:
-     if ( error )
-     {
--      /* this is done to respect the behaviour of the original */
-+      /* This is done to respect the behaviour of the original */
-       /* PCF font driver.                                      */
-       error = PCF_Err_Invalid_File_Format;
-     }
diff --git a/print/freetype2/files/patch-src_truetype_ttgload.c b/print/freetype2/files/patch-src_truetype_ttgload.c
deleted file mode 100644
index 803bdeeb30e8..000000000000
--- a/print/freetype2/files/patch-src_truetype_ttgload.c
+++ /dev/null
@@ -1,32 +0,0 @@
---- src/truetype/ttgload.c.orig	Tue Feb 14 12:44:56 2006
-+++ src/truetype/ttgload.c	Fri May 18 13:05:34 2007
-@@ -269,7 +269,11 @@
- 
-     n_points = 0;
-     if ( n_contours > 0 )
-+    {
-       n_points = cont[-1] + 1;
-+      if ( n_points < 0 )
-+        goto Invalid_Outline;
-+    }
- 
-     /* note that we will add four phantom points later */
-     error = FT_GLYPHLOADER_CHECK_POINTS( gloader, n_points + 4, 0 );
-@@ -677,7 +681,7 @@
-     FT_GlyphLoader  gloader = loader->gloader;
-     FT_Error        error   = TT_Err_Ok;
-     FT_Outline*     outline;
--    FT_UInt         n_points;
-+    FT_Int          n_points;
- 
- 
-     outline  = &gloader->current.outline;
-@@ -704,7 +708,7 @@
-       /* Deltas apply to the unscaled data. */
-       FT_Vector*  deltas;
-       FT_Memory   memory = loader->face->memory;
--      FT_UInt     i;
-+      FT_Int      i;
- 
- 
-       error = TT_Vary_Get_Glyph_Deltas( (TT_Face)(loader->face),
diff --git a/print/freetype2/pkg-descr b/print/freetype2/pkg-descr
index 538d9a8f8fa2..57ec2a4c68fc 100644
--- a/print/freetype2/pkg-descr
+++ b/print/freetype2/pkg-descr
@@ -7,4 +7,4 @@ ttf2bdf: Produce bitmapped fonts from TrueType files for your X11
          applications.
 ttfbanner: make posters using a TrueType font
 
-WWW: http://freetype.sourceforge.net/freetype1/projects.html
+WWW: http://freetype.sourceforge.net/
diff --git a/print/freetype2/pkg-plist b/print/freetype2/pkg-plist
index 1be8c735027d..501381bcee13 100644
--- a/print/freetype2/pkg-plist
+++ b/print/freetype2/pkg-plist
@@ -12,11 +12,13 @@ include/freetype2/freetype/ftcache.h
 include/freetype2/freetype/ftchapters.h
 include/freetype2/freetype/fterrdef.h
 include/freetype2/freetype/fterrors.h
+include/freetype2/freetype/ftgasp.h
 include/freetype2/freetype/ftglyph.h
 include/freetype2/freetype/ftgxval.h
 include/freetype2/freetype/ftgzip.h
 include/freetype2/freetype/ftimage.h
 include/freetype2/freetype/ftincrem.h
+include/freetype2/freetype/ftlcdfil.h
 include/freetype2/freetype/ftlist.h
 include/freetype2/freetype/ftlzw.h
 include/freetype2/freetype/ftmac.h
diff --git a/print/gfontview/Makefile b/print/gfontview/Makefile
index 71d3218c24fd..9375587700e8 100644
--- a/print/gfontview/Makefile
+++ b/print/gfontview/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gfontview
 PORTVERSION=	0.5.0
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	print gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/print/gfontview/pkg-plist b/print/gfontview/pkg-plist
index 196217ed532f..517d2ad80fbf 100644
--- a/print/gfontview/pkg-plist
+++ b/print/gfontview/pkg-plist
@@ -1,7 +1,7 @@
 bin/gfontview
-share/gnome/gfontviewrc
+share/gfontviewrc
 share/gnome/apps/Utilities/gfontview.desktop
-share/gnome/pixmaps/gfontview.png
+share/pixmaps/gfontview.png
 share/locale/de/LC_MESSAGES/gfontview.mo
 share/locale/es/LC_MESSAGES/gfontview.mo
 share/locale/fr/LC_MESSAGES/gfontview.mo
diff --git a/print/ggv/Makefile b/print/ggv/Makefile
index 7ea57f479fb2..424bef417de1 100644
--- a/print/ggv/Makefile
+++ b/print/ggv/Makefile
@@ -3,12 +3,12 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/print/ggv/Makefile,v 1.5 2005/09/05 20:16:08 marcus Exp $
+#   $MCom: ports/print/ggv/Makefile,v 1.8 2007/09/24 19:40:45 mezz Exp $
 #
 
 PORTNAME=	ggv
 PORTVERSION=	2.12.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	print gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/2.12
diff --git a/print/ggv/pkg-plist b/print/ggv/pkg-plist
index b4b027581f3a..b1a063dd664e 100644
--- a/print/ggv/pkg-plist
+++ b/print/ggv/pkg-plist
@@ -1,11 +1,11 @@
 bin/ggv
 libdata/bonobo/servers/GNOME_GGV.server
 libexec/ggv-postscript-viewer
-share/gnome/applications/ggv.desktop
+share/applications/ggv.desktop
 @exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
-share/gnome/gnome-2.0/ui/ggv-control-ui.xml
-share/gnome/gnome-2.0/ui/ggv-postscript-view-ui.xml
-share/gnome/gnome-2.0/ui/ggv-ui.xml
+share/gnome-2.0/ui/ggv-control-ui.xml
+share/gnome-2.0/ui/ggv-postscript-view-ui.xml
+share/gnome-2.0/ui/ggv-ui.xml
 share/gnome/help/ggv/C/figures/ggv_window.png
 share/gnome/help/ggv/C/ggv.xml
 share/gnome/help/ggv/C/legal.xml
@@ -40,25 +40,25 @@ share/gnome/help/ggv/zh_CN/legal.xml
 share/gnome/help/ggv/zh_TW/figures/ggv_window.png
 share/gnome/help/ggv/zh_TW/ggv.xml
 share/gnome/help/ggv/zh_TW/legal.xml
-share/gnome/idl/Ggv.idl
-share/gnome/omf/ggv/ggv-C.omf
-share/gnome/omf/ggv/ggv-de.omf
-share/gnome/omf/ggv/ggv-es.omf
-share/gnome/omf/ggv/ggv-fr.omf
-share/gnome/omf/ggv/ggv-it.omf
-share/gnome/omf/ggv/ggv-ja.omf
-share/gnome/omf/ggv/ggv-ko.omf
-share/gnome/omf/ggv/ggv-sv.omf
-share/gnome/omf/ggv/ggv-zh_CN.omf
-share/gnome/omf/ggv/ggv-zh_TW.omf
-share/gnome/pixmaps/ggv/clearall.xpm
-share/gnome/pixmaps/ggv/fitwidth.png
-share/gnome/pixmaps/ggv/ggv-splash.png
-share/gnome/pixmaps/ggv/toggleall.xpm
-share/gnome/pixmaps/ggv/toggleeven.xpm
-share/gnome/pixmaps/ggv/toggleodd.xpm
-share/gnome/pixmaps/ggv/zoom.xpm
-share/gnome/pixmaps/gnome-ghostview.png
+share/idl/Ggv.idl
+share/omf/ggv/ggv-C.omf
+share/omf/ggv/ggv-de.omf
+share/omf/ggv/ggv-es.omf
+share/omf/ggv/ggv-fr.omf
+share/omf/ggv/ggv-it.omf
+share/omf/ggv/ggv-ja.omf
+share/omf/ggv/ggv-ko.omf
+share/omf/ggv/ggv-sv.omf
+share/omf/ggv/ggv-zh_CN.omf
+share/omf/ggv/ggv-zh_TW.omf
+share/pixmaps/ggv/clearall.xpm
+share/pixmaps/ggv/fitwidth.png
+share/pixmaps/ggv/ggv-splash.png
+share/pixmaps/ggv/toggleall.xpm
+share/pixmaps/ggv/toggleeven.xpm
+share/pixmaps/ggv/toggleodd.xpm
+share/pixmaps/ggv/zoom.xpm
+share/pixmaps/gnome-ghostview.png
 share/locale/af/LC_MESSAGES/ggv.mo
 share/locale/am/LC_MESSAGES/ggv.mo
 share/locale/ar/LC_MESSAGES/ggv.mo
@@ -126,8 +126,8 @@ share/locale/vi/LC_MESSAGES/ggv.mo
 share/locale/xh/LC_MESSAGES/ggv.mo
 share/locale/zh_CN/LC_MESSAGES/ggv.mo
 share/locale/zh_TW/LC_MESSAGES/ggv.mo
-@dirrm share/gnome/pixmaps/ggv
-@dirrm share/gnome/omf/ggv
+@dirrm share/pixmaps/ggv
+@dirrm share/omf/ggv
 @dirrm share/gnome/help/ggv/zh_TW/figures
 @dirrm share/gnome/help/ggv/zh_TW
 @dirrm share/gnome/help/ggv/zh_CN/figures
@@ -150,3 +150,8 @@ share/locale/zh_TW/LC_MESSAGES/ggv.mo
 @dirrm share/gnome/help/ggv/C
 @dirrm share/gnome/help/ggv
 @unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
+@dirrmtry share/locale/xh/LC_MESSAGES
+@dirrmtry share/locale/xh
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
+@dirrmtry share/applications
diff --git a/print/gimp-gutenprint/Makefile b/print/gimp-gutenprint/Makefile
index df8a571c8466..ebee7e9a85c7 100644
--- a/print/gimp-gutenprint/Makefile
+++ b/print/gimp-gutenprint/Makefile
@@ -3,7 +3,7 @@
 # Whom:			Michael Johnson <ahze@FreeBSD.org>
 #
 # $FreeBSD$
-#    $MCom: ports/print/gimp-gutenprint/Makefile,v 1.2 2007/03/30 16:42:46 ahze Exp $
+#    $MCom: ports/print/gimp-gutenprint/Makefile,v 1.5 2007/10/24 21:05:40 ahze Exp $
 
 PORTREVISION=	2
 PORTEPOCH=	0
@@ -15,7 +15,7 @@ COMMENT=	Gimp print plug-in
 
 MASTERDIR=	${.CURDIR}/../../print/gutenprint-base
 
-GUT_SLAVE=	gimp
+GUT_SLAVE=	gimp-devel
 PLIST=	${.CURDIR}/pkg-plist
 
 .include "${MASTERDIR}/Makefile"
diff --git a/print/gimp-gutenprint/pkg-plist b/print/gimp-gutenprint/pkg-plist
index af87e9adcdbe..9d281e62629e 100644
--- a/print/gimp-gutenprint/pkg-plist
+++ b/print/gimp-gutenprint/pkg-plist
@@ -1 +1 @@
-libexec/gimp/2.2/plug-ins/print
+libexec/gimp/2.2/plug-ins/gutenprint
diff --git a/print/gnome-cups-manager/Makefile b/print/gnome-cups-manager/Makefile
index 66163b21bcfa..e64a36f766b0 100644
--- a/print/gnome-cups-manager/Makefile
+++ b/print/gnome-cups-manager/Makefile
@@ -3,11 +3,12 @@
 # Whom:					Glenn Johnson <glennpj@charter.net>
 #
 # $FreeBSD$
+#   $MCom: ports/print/gnome-cups-manager/Makefile,v 1.8 2007/07/20 01:11:31 mezz Exp $
 #
 
 PORTNAME=	gnome-cups-manager
 PORTVERSION=	0.31
-PORTREVISION=	6
+PORTREVISION=	7
 PORTEPOCH=	1
 CATEGORIES=	print gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
@@ -43,8 +44,8 @@ post-patch:
 		${WRKSRC}/libgnomecups/gnome-cups-ui-driver.c
 
 post-install:
-	${MKDIR} ${PREFIX}/share/gnome/applications
+	${MKDIR} ${PREFIX}/share/applications
 	${INSTALL_DATA} ${WRKSRC}/gnome-cups-manager.desktop \
-		${PREFIX}/share/gnome/applications
+		${PREFIX}/share/applications
 
 .include <bsd.port.mk>
diff --git a/print/gnome-cups-manager/pkg-plist b/print/gnome-cups-manager/pkg-plist
index 43ea9b7a402b..35719294310a 100644
--- a/print/gnome-cups-manager/pkg-plist
+++ b/print/gnome-cups-manager/pkg-plist
@@ -14,16 +14,14 @@ lib/libgnomecupsui-1.0.so.1
 libdata/bonobo/servers/Gnome_CupsManager.server
 libdata/pkgconfig/libgnomecupsui-1.0.pc
 sbin/gnome-cups-switch
-share/gnome/applications/gnome-cups-manager.desktop
-share/gnome/gnome-cups-manager/gnome-cups-add-druid.png
-share/gnome/gnome-cups-manager/gnome-cups-add.glade
-share/gnome/gnome-cups-manager/gnome-cups-manager.glade
-share/gnome/gnome-cups-manager/gnome-cups-ui-connection.glade
-share/gnome/gnome-cups-manager/gnome-cups-ui-driver.glade
-share/gnome/gnome-cups-manager/xd2-testpage-a4.eps
-share/gnome/gnome-cups-manager/xd2-testpage-letter.eps
-share/gnome/pixmaps/gnome-cups-manager/printer-tray-normal.png
-share/gnome/pixmaps/gnome-cups-manager/printer-tray-stopped.png
+share/applications/gnome-cups-manager.desktop
+%%DATADIR%%/gnome-cups-add-druid.png
+%%DATADIR%%/gnome-cups-add.glade
+%%DATADIR%%/gnome-cups-manager.glade
+%%DATADIR%%/gnome-cups-ui-connection.glade
+%%DATADIR%%/gnome-cups-ui-driver.glade
+%%DATADIR%%/xd2-testpage-a4.eps
+%%DATADIR%%/xd2-testpage-letter.eps
 share/icons/hicolor/48x48/devices/gnome-dev-printer-network.png
 share/icons/hicolor/48x48/devices/gnome-dev-printer-new.png
 share/icons/hicolor/48x48/devices/gnome-dev-printer.png
@@ -66,8 +64,10 @@ share/locale/uk/LC_MESSAGES/gnome-cups-manager.mo
 share/locale/xh/LC_MESSAGES/gnome-cups-manager.mo
 share/locale/zh_CN/LC_MESSAGES/gnome-cups-manager.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-cups-manager.mo
-@dirrm share/gnome/pixmaps/gnome-cups-manager
-@dirrm share/gnome/gnome-cups-manager
+share/pixmaps/gnome-cups-manager/printer-tray-normal.png
+share/pixmaps/gnome-cups-manager/printer-tray-stopped.png
+@dirrm share/pixmaps/gnome-cups-manager
+@dirrm %%DATADIR%%
 @unexec /bin/rmdir %D/sbin 2>/dev/null || /usr/bin/true
 @dirrmtry include/libgnomecups-1/libgnomecups
 @dirrmtry include/libgnomecups-1
@@ -75,3 +75,4 @@ share/locale/zh_TW/LC_MESSAGES/gnome-cups-manager.mo
 @dirrmtry share/locale/xh
 @dirrmtry share/locale/rw/LC_MESSAGES
 @dirrmtry share/locale/rw
+@dirrmtry share/applications
diff --git a/print/gnome-print/Makefile b/print/gnome-print/Makefile
index 656c0a58b94f..b97db20f14ac 100644
--- a/print/gnome-print/Makefile
+++ b/print/gnome-print/Makefile
@@ -3,12 +3,12 @@
 # Whom:					Vanilla I. Shu <vanilla@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/print/gnome-print/Makefile,v 1.2 2006/09/10 00:51:12 mezz Exp $
+#   $MCom: ports/print/gnome-print/Makefile,v 1.6 2007/09/24 19:40:45 mezz Exp $
 #
 
 PORTNAME=	gnome-print
 PORTVERSION=	0.37
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	print gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-print/0.37
diff --git a/print/gnome-print/pkg-plist b/print/gnome-print/pkg-plist
index 0ebdefdb5faa..9e46a7faa853 100644
--- a/print/gnome-print/pkg-plist
+++ b/print/gnome-print/pkg-plist
@@ -30,54 +30,54 @@ lib/libgnomeprint.a
 lib/libgnomeprint.la
 lib/libgnomeprint.so
 lib/libgnomeprint.so.16
-share/gnome/fonts/README.binaries
-share/gnome/fonts/README.installer
+share/fonts/README.binaries
+share/fonts/README.installer
+share/fonts/afms/adobe/pagd8a.afm
+share/fonts/afms/adobe/pagdo8a.afm
+share/fonts/afms/adobe/pagk8a.afm
+share/fonts/afms/adobe/pagko8a.afm
+share/fonts/afms/adobe/pbkd8a.afm
+share/fonts/afms/adobe/pbkdi8a.afm
+share/fonts/afms/adobe/pbkl8a.afm
+share/fonts/afms/adobe/pbkli8a.afm
+share/fonts/afms/adobe/pcrb8a.afm
+share/fonts/afms/adobe/pcrbo8a.afm
+share/fonts/afms/adobe/pcrr8a.afm
+share/fonts/afms/adobe/pcrro8a.afm
+share/fonts/afms/adobe/phvb8a.afm
+share/fonts/afms/adobe/phvb8an.afm
+share/fonts/afms/adobe/phvbo8a.afm
+share/fonts/afms/adobe/phvbo8an.afm
+share/fonts/afms/adobe/phvl8a.afm
+share/fonts/afms/adobe/phvlo8a.afm
+share/fonts/afms/adobe/phvr8a.afm
+share/fonts/afms/adobe/phvr8an.afm
+share/fonts/afms/adobe/phvro8a.afm
+share/fonts/afms/adobe/phvro8an.afm
+share/fonts/afms/adobe/pncb8a.afm
+share/fonts/afms/adobe/pncbi8a.afm
+share/fonts/afms/adobe/pncr8a.afm
+share/fonts/afms/adobe/pncri8a.afm
+share/fonts/afms/adobe/pplb8a.afm
+share/fonts/afms/adobe/pplbi8a.afm
+share/fonts/afms/adobe/pplr8a.afm
+share/fonts/afms/adobe/pplri8a.afm
+share/fonts/afms/adobe/psyr.afm
+share/fonts/afms/adobe/ptmb8a.afm
+share/fonts/afms/adobe/ptmbi8a.afm
+share/fonts/afms/adobe/ptmr8a.afm
+share/fonts/afms/adobe/ptmri8a.afm
+share/fonts/afms/adobe/putb8a.afm
+share/fonts/afms/adobe/putbi8a.afm
+share/fonts/afms/adobe/putr8a.afm
+share/fonts/afms/adobe/putri8a.afm
+share/fonts/afms/adobe/pzcmi8a.afm
+share/fonts/afms/adobe/pzdr.afm
+%%DATADIR%%/profiles/PostscriptOptimized.profile
+%%DATADIR%%/profiles/fax-g3.profile
+%%DATADIR%%/profiles/pdf.profile
 share/gnome/fonts/adobe-urw.font
-share/gnome/fonts/afms/adobe/pagd8a.afm
-share/gnome/fonts/afms/adobe/pagdo8a.afm
-share/gnome/fonts/afms/adobe/pagk8a.afm
-share/gnome/fonts/afms/adobe/pagko8a.afm
-share/gnome/fonts/afms/adobe/pbkd8a.afm
-share/gnome/fonts/afms/adobe/pbkdi8a.afm
-share/gnome/fonts/afms/adobe/pbkl8a.afm
-share/gnome/fonts/afms/adobe/pbkli8a.afm
-share/gnome/fonts/afms/adobe/pcrb8a.afm
-share/gnome/fonts/afms/adobe/pcrbo8a.afm
-share/gnome/fonts/afms/adobe/pcrr8a.afm
-share/gnome/fonts/afms/adobe/pcrro8a.afm
-share/gnome/fonts/afms/adobe/phvb8a.afm
-share/gnome/fonts/afms/adobe/phvb8an.afm
-share/gnome/fonts/afms/adobe/phvbo8a.afm
-share/gnome/fonts/afms/adobe/phvbo8an.afm
-share/gnome/fonts/afms/adobe/phvl8a.afm
-share/gnome/fonts/afms/adobe/phvlo8a.afm
-share/gnome/fonts/afms/adobe/phvr8a.afm
-share/gnome/fonts/afms/adobe/phvr8an.afm
-share/gnome/fonts/afms/adobe/phvro8a.afm
-share/gnome/fonts/afms/adobe/phvro8an.afm
-share/gnome/fonts/afms/adobe/pncb8a.afm
-share/gnome/fonts/afms/adobe/pncbi8a.afm
-share/gnome/fonts/afms/adobe/pncr8a.afm
-share/gnome/fonts/afms/adobe/pncri8a.afm
-share/gnome/fonts/afms/adobe/pplb8a.afm
-share/gnome/fonts/afms/adobe/pplbi8a.afm
-share/gnome/fonts/afms/adobe/pplr8a.afm
-share/gnome/fonts/afms/adobe/pplri8a.afm
-share/gnome/fonts/afms/adobe/psyr.afm
-share/gnome/fonts/afms/adobe/ptmb8a.afm
-share/gnome/fonts/afms/adobe/ptmbi8a.afm
-share/gnome/fonts/afms/adobe/ptmr8a.afm
-share/gnome/fonts/afms/adobe/ptmri8a.afm
-share/gnome/fonts/afms/adobe/putb8a.afm
-share/gnome/fonts/afms/adobe/putbi8a.afm
-share/gnome/fonts/afms/adobe/putr8a.afm
-share/gnome/fonts/afms/adobe/putri8a.afm
-share/gnome/fonts/afms/adobe/pzcmi8a.afm
-share/gnome/fonts/afms/adobe/pzdr.afm
 share/gnome/fonts/defaults.fontmap
-share/gnome/gnome-print/profiles/PostscriptOptimized.profile
-share/gnome/gnome-print/profiles/fax-g3.profile
-share/gnome/gnome-print/profiles/pdf.profile
 share/locale/az/LC_MESSAGES/gnome-print.mo
 share/locale/bg/LC_MESSAGES/gnome-print.mo
 share/locale/ca/LC_MESSAGES/gnome-print.mo
@@ -113,9 +113,11 @@ share/locale/uk/LC_MESSAGES/gnome-print.mo
 share/locale/wa/LC_MESSAGES/gnome-print.mo
 share/locale/zh_CN/LC_MESSAGES/gnome-print.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-print.mo
-@dirrm share/gnome/gnome-print/profiles
-@dirrm share/gnome/gnome-print
-@dirrm share/gnome/fonts/afms/adobe
-@dirrm share/gnome/fonts/afms
+@dirrmtry share/gnome/fonts
+@dirrm %%DATADIR%%/profiles
+@dirrm %%DATADIR%%
+@dirrm share/fonts/afms/adobe
+@dirrm share/fonts/afms
+@dirrmtry share/fonts
 @dirrm include/gnome-1.0/libgnomeprint
 @dirrm etc/gnome/fonts
diff --git a/print/gnomephotoprinter/Makefile b/print/gnomephotoprinter/Makefile
index ffd0056a6bb8..3d4a5050f2ea 100644
--- a/print/gnomephotoprinter/Makefile
+++ b/print/gnomephotoprinter/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gnomephotoprinter
 PORTVERSION=	0.7.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	print gnome
 MASTER_SITES=	http://www.fogman.de/gpp/
 DISTNAME=	gpp-${PORTVERSION}
diff --git a/print/gnomephotoprinter/pkg-plist b/print/gnomephotoprinter/pkg-plist
index f66c5042dc3a..26b91e3cbdee 100644
--- a/print/gnomephotoprinter/pkg-plist
+++ b/print/gnomephotoprinter/pkg-plist
@@ -1,12 +1,13 @@
 bin/gnome-photo-printer
-share/gnome/applications/gnome-photo-printer.desktop
-share/gnome/gnome-photo-printer/gpp.glade
-share/gnome/gnome-photo-printer/scale_with_ratio.jpg
-share/gnome/gnome-photo-printer/scale_without_ratio.jpg
+share/applications/gnome-photo-printer.desktop
+share/gnome-photo-printer/gpp.glade
+share/gnome-photo-printer/scale_with_ratio.jpg
+share/gnome-photo-printer/scale_without_ratio.jpg
 share/icons/hicolor/16x16/apps/gnome-photo-printer.png
 share/icons/hicolor/22x22/apps/gnome-photo-printer.png
 share/icons/hicolor/32x32/apps/gnome-photo-printer.png
 share/icons/hicolor/48x48/apps/gnome-photo-printer.png
 share/icons/hicolor/scalable/apps/gnome-photo-printer.svg
 share/locale/de/LC_MESSAGES/gnome-photo-printer.mo
-@dirrm share/gnome/gnome-photo-printer
+@dirrm share/gnome-photo-printer
+@dirrmtry share/applications
diff --git a/print/gribouy/Makefile b/print/gribouy/Makefile
index cbecf9f9f140..089a5cc939ad 100644
--- a/print/gribouy/Makefile
+++ b/print/gribouy/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gribouy
 PORTVERSION=	0.0.8
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	print gnome
 #MASTER_SITES=	${MASTER_SITE_SAVANNAH}
 #MASTER_SITE_SUBDIR=	gribouy/unstable.pkg/${PORTVERSION:R}
diff --git a/print/gribouy/pkg-plist b/print/gribouy/pkg-plist
index e446c5bf3b9b..b0584c957726 100644
--- a/print/gribouy/pkg-plist
+++ b/print/gribouy/pkg-plist
@@ -1,10 +1,11 @@
 bin/gribouy
-share/gnome/applications/gribouy.desktop
-share/gnome/gnome-2.0/ui/gribouy-ui.xml
-share/gnome/gribouy/glade/gribouy.glade
-share/gnome/pixmaps/gribouy.png
-share/gnome/pixmaps/gribouy/gribouy-graphics.png
-share/gnome/pixmaps/gribouy/gribouy-logo.jpg
-@dirrm share/gnome/pixmaps/gribouy
-@dirrm share/gnome/gribouy/glade
-@dirrm share/gnome/gribouy
+share/applications/gribouy.desktop
+share/gnome-2.0/ui/gribouy-ui.xml
+share/gribouy/glade/gribouy.glade
+share/pixmaps/gribouy.png
+share/pixmaps/gribouy/gribouy-graphics.png
+share/pixmaps/gribouy/gribouy-logo.jpg
+@dirrm share/pixmaps/gribouy
+@dirrm share/gribouy/glade
+@dirrm share/gribouy
+@dirrmtry share/applications
diff --git a/print/libgnomeprint/Makefile b/print/libgnomeprint/Makefile
index 7380df7185bc..ebff6059d909 100644
--- a/print/libgnomeprint/Makefile
+++ b/print/libgnomeprint/Makefile
@@ -3,11 +3,11 @@
 # Whom:					Vanilla I. Shu <vanilla@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/print/libgnomeprint/Makefile,v 1.64 2007/03/13 12:57:41 ahze Exp $
+#   $MCom: ports/print/libgnomeprint/Makefile,v 1.71 2007/10/17 21:36:12 mezz Exp $
 #
 
 PORTNAME=	libgnomeprint
-PORTVERSION=	2.18.1
+PORTVERSION=	2.18.2
 PORTREVISION?=	1
 CATEGORIES=	print gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
diff --git a/print/libgnomeprint/distinfo b/print/libgnomeprint/distinfo
index 52b40c8b4d31..7d75b5bcf593 100644
--- a/print/libgnomeprint/distinfo
+++ b/print/libgnomeprint/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/libgnomeprint-2.18.1.tar.bz2) = be87a17490c4976a85488537f22bcfde
-SHA256 (gnome2/libgnomeprint-2.18.1.tar.bz2) = a64ce84b67552c32bd6cc322dbad2056ca9bdc43d825eb126109841adb67d18b
-SIZE (gnome2/libgnomeprint-2.18.1.tar.bz2) = 870168
+MD5 (gnome2/libgnomeprint-2.18.2.tar.bz2) = b1f6c95a8dbb8ce17ab00fc2eea2aa91
+SHA256 (gnome2/libgnomeprint-2.18.2.tar.bz2) = a55b91288aa00b3523feafae155cb7182abb6b646dc86b8bfaf191076389dda4
+SIZE (gnome2/libgnomeprint-2.18.2.tar.bz2) = 867762
diff --git a/print/libgnomeprint/pkg-plist b/print/libgnomeprint/pkg-plist
index 3608f935e5e6..296d23cfd9ea 100644
--- a/print/libgnomeprint/pkg-plist
+++ b/print/libgnomeprint/pkg-plist
@@ -85,13 +85,13 @@ lib/libgnomeprint/%%VERSION%%/modules/transports/libgnomeprint-lpr.a
 lib/libgnomeprint/%%VERSION%%/modules/transports/libgnomeprint-lpr.la
 lib/libgnomeprint/%%VERSION%%/modules/transports/libgnomeprint-lpr.so
 libdata/pkgconfig/libgnomeprint-%%LIBVERSION%%.pc
-share/gnome/libgnomeprint/%%VERSION%%/globals.xml
-share/gnome/libgnomeprint/%%VERSION%%/models/GNOME-GENERIC-PS.xml
-share/gnome/libgnomeprint/%%VERSION%%/models/GNOME-PDF-WRITER.xml
-share/gnome/libgnomeprint/%%VERSION%%/models/uninstalled/GNOME-META.xml
-share/gnome/libgnomeprint/%%VERSION%%/printers/GENERIC.xml
-share/gnome/libgnomeprint/%%VERSION%%/printers/PDF-WRITER.xml
-share/gnome/libgnomeprint/%%VERSION%%/printers/uninstalled/META.xml
+%%DATADIR%%/%%VERSION%%/globals.xml
+%%DATADIR%%/%%VERSION%%/models/GNOME-GENERIC-PS.xml
+%%DATADIR%%/%%VERSION%%/models/GNOME-PDF-WRITER.xml
+%%DATADIR%%/%%VERSION%%/models/uninstalled/GNOME-META.xml
+%%DATADIR%%/%%VERSION%%/printers/GENERIC.xml
+%%DATADIR%%/%%VERSION%%/printers/PDF-WRITER.xml
+%%DATADIR%%/%%VERSION%%/printers/uninstalled/META.xml
 share/locale/am/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
 share/locale/ar/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
 share/locale/az/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
@@ -167,12 +167,12 @@ share/locale/xh/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
 share/locale/zh_CN/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
 share/locale/zh_HK/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
 share/locale/zh_TW/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
-@dirrm share/gnome/libgnomeprint/%%VERSION%%/printers/uninstalled
-@dirrm share/gnome/libgnomeprint/%%VERSION%%/printers
-@dirrm share/gnome/libgnomeprint/%%VERSION%%/models/uninstalled
-@dirrm share/gnome/libgnomeprint/%%VERSION%%/models
-@dirrm share/gnome/libgnomeprint/%%VERSION%%
-@dirrm share/gnome/libgnomeprint
+@dirrm %%DATADIR%%/%%VERSION%%/printers/uninstalled
+@dirrm %%DATADIR%%/%%VERSION%%/printers
+@dirrm %%DATADIR%%/%%VERSION%%/models/uninstalled
+@dirrm %%DATADIR%%/%%VERSION%%/models
+@dirrm %%DATADIR%%/%%VERSION%%
+@dirrm %%DATADIR%%
 @dirrm lib/libgnomeprint/%%VERSION%%/modules/transports
 @dirrm lib/libgnomeprint/%%VERSION%%/modules/filters
 @dirrm lib/libgnomeprint/%%VERSION%%/modules
diff --git a/print/lilypond/Makefile b/print/lilypond/Makefile
index 50b3049962b5..774e02beffc0 100644
--- a/print/lilypond/Makefile
+++ b/print/lilypond/Makefile
@@ -9,7 +9,7 @@
 
 PORTNAME=	lilypond
 PORTVERSION=	2.2.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	print audio
 MASTER_SITES=	http://download.linuxaudio.org/lilypond/sources/v${PORTVERSION:R}/:src \
 		http://distfiles.master.finkmirrors.net/:rpm
@@ -21,7 +21,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	The GNU music typesetter
 
 BUILD_DEPENDS=	latex:${PORTSDIR}/print/teTeX \
-		scrollkeeper-install:${PORTSDIR}/textproc/scrollkeeper
+		rarian-sk-config:${PORTSDIR}/textproc/rarian
 LIB_DEPENDS=	guile.15:${PORTSDIR}/lang/guile
 RUN_DEPENDS=	latex:${PORTSDIR}/print/teTeX
 
diff --git a/print/lilypond/pkg-plist b/print/lilypond/pkg-plist
index 5910bccaf35c..e782e4eb738d 100644
--- a/print/lilypond/pkg-plist
+++ b/print/lilypond/pkg-plist
@@ -974,7 +974,6 @@ share/locale/sv/LC_MESSAGES/lilypond.mo
 %%CONDITIONAL%%@dirrm %%DATADIR%%/%%PORTVERSION%%/vim
 %%CONDITIONAL%%@dirrm share/omf/lilypond/%%PORTVERSION%%
 %%CONDITIONAL%%@dirrm share/omf/lilypond
-%%CONDITIONAL%%@dirrm share/omf
 @dirrm %%DATADIR%%/%%PORTVERSION%%/python
 @dirrm %%DATADIR%%/%%PORTVERSION%%/fonts/source
 @dirrm %%DATADIR%%/%%PORTVERSION%%/fonts/afm
diff --git a/science/gchempaint/Makefile b/science/gchempaint/Makefile
index 8826512e6f96..905f002c1117 100644
--- a/science/gchempaint/Makefile
+++ b/science/gchempaint/Makefile
@@ -3,9 +3,11 @@
 # Whom:				Pav Lucistnik <pav@oook.cz>
 #
 # $FreeBSD$
+#
 
 PORTNAME=	gchempaint
 PORTVERSION=	0.8.3
+PORTREVISION=	1
 CATEGORIES=	science
 MASTER_SITES=	${MASTER_SITE_SAVANNAH}
 MASTER_SITE_SUBDIR=	${PORTNAME}/0.8
@@ -26,7 +28,7 @@ USE_GNOME=	gnomehack intlhack libgnomeprintui libgnomeui
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" LIBS="-L${LOCALBASE}/lib"
-CONFIGURE_ARGS=	--with-help-dir=${PREFIX}/share/gnome/help --with-omf-dir=${PREFIX}/share/gnome/omf
+CONFIGURE_ARGS=	--with-help-dir=${PREFIX}/share/gnome/help --with-omf-dir=${PREFIX}/share/omf
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|-release $$(VERSION)|-version @GCP_VERSION_INFO@|' \
diff --git a/science/gchempaint/pkg-plist b/science/gchempaint/pkg-plist
index 84a89dc6bd6a..b787725939ad 100644
--- a/science/gchempaint/pkg-plist
+++ b/science/gchempaint/pkg-plist
@@ -108,7 +108,7 @@ share/gnome/help/gchempaint/C/figures/templates.png
 share/gnome/help/gchempaint/C/figures/text.png
 share/gnome/help/gchempaint/C/figures/texttools-bar.png
 share/gnome/help/gchempaint/C/figures/toolbox.png
-share/gnome/omf/gchempaint/gchempaint-C.omf
+share/omf/gchempaint/gchempaint-C.omf
 share/icons/hicolor/32x32/apps/gchempaint.png
 share/icons/hicolor/32x32/mimetypes/gnome-mime-application-x-gchempaint.png
 share/icons/hicolor/48x48/apps/gchempaint.png
@@ -137,9 +137,10 @@ share/mimelnk/application/x-gchempaint.desktop
 @dirrm share/gnome/help/gchempaint/C/figures
 @dirrm share/gnome/help/gchempaint/C
 @dirrm share/gnome/help/gchempaint
-@dirrm share/gnome/omf/gchempaint
+@dirrm share/omf/gchempaint
 @dirrm lib/goffice/0.4.3/plugins/gchempaint
 @dirrm lib/gchempaint/plugins
 @dirrm lib/gchempaint
 @exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
 @unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
+@dirrmtry share/applications
diff --git a/science/gchemutils/Makefile b/science/gchemutils/Makefile
index aef708773eed..6860a345056a 100644
--- a/science/gchemutils/Makefile
+++ b/science/gchemutils/Makefile
@@ -3,9 +3,11 @@
 # Whom:				Pav Lucistnik <pav@oook.cz>
 #
 # $FreeBSD$
+#
 
 PORTNAME=	gchemutils
 PORTVERSION=	0.8.3
+PORTREVISION=	1
 CATEGORIES=	science
 MASTER_SITES=	${MASTER_SITE_SAVANNAH}
 MASTER_SITE_SUBDIR=	${PORTNAME}/0.8
@@ -29,7 +31,7 @@ USE_GMAKE=	yes
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" LIBS="-L${LOCALBASE}/lib"
-CONFIGURE_ARGS=	--with-omf-dir=${PREFIX}/share/gnome/omf
+CONFIGURE_ARGS=	--with-omf-dir=${PREFIX}/share/omf
 INSTALLS_ICONS=	yes
 INSTALLS_OMF=	yes
 GCONF_SCHEMAS=	gcrystal.schemas
diff --git a/science/gchemutils/pkg-plist b/science/gchemutils/pkg-plist
index dbc5faa298d9..709589be28f2 100644
--- a/science/gchemutils/pkg-plist
+++ b/science/gchemutils/pkg-plist
@@ -301,10 +301,10 @@ share/gnome/help/gcrystal/C/figures/size-dlg.png
 share/gnome/help/gcrystal/C/figures/view-settings.png
 share/gnome/help/gcrystal/C/gcrystal.xml
 share/gnome/help/gcrystal/C/legal.xml
-share/gnome/omf/gchem3d-viewer/gchem3d-viewer-C.omf
-share/gnome/omf/gchemcalc/gchemcalc-C.omf
-share/gnome/omf/gcrystal/gcrystal-C.omf
-share/gnome/omf/gchemtable/gchemtable-C.omf
+share/omf/gchem3d-viewer/gchem3d-viewer-C.omf
+share/omf/gchemcalc/gchemcalc-C.omf
+share/omf/gcrystal/gcrystal-C.omf
+share/omf/gchemtable/gchemtable-C.omf
 share/mimelnk/application/x-gcrystal.desktop
 share/icons/hicolor/32x32/mimetypes/gnome-mime-application-x-gcrystal.png
 share/icons/hicolor/32x32/apps/gchem3d-viewer.png
@@ -344,10 +344,10 @@ share/mime/packages/gchemutils.xml
 @dirrm share/gchemutils/glade/table
 @dirrm share/gchemutils/glade
 @dirrm share/gchemutils
-@dirrm share/gnome/omf/gchem3d-viewer
-@dirrm share/gnome/omf/gchemcalc
-@dirrm share/gnome/omf/gcrystal
-@dirrm share/gnome/omf/gchemtable
+@dirrm share/omf/gchem3d-viewer
+@dirrm share/omf/gchemcalc
+@dirrm share/omf/gcrystal
+@dirrm share/omf/gchemtable
 @dirrm share/gnome/help/gchem3d-viewer/C/figures
 @dirrm share/gnome/help/gchem3d-viewer/C
 @dirrm share/gnome/help/gchem3d-viewer
diff --git a/security/fpm/Makefile b/security/fpm/Makefile
index bf0ad5b10378..8ebe9e9b0b90 100644
--- a/security/fpm/Makefile
+++ b/security/fpm/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	fpm
 PORTVERSION=	0.60
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -24,8 +24,8 @@ CONFIGURE_ENV+=	CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
 
 MAN1=		fpm.1
 PORTDOCS=	AUTHORS ChangeLog README TODO
-PLIST_FILES=	bin/fpm share/gnome/pixmaps/fpm/logo.xpm
-PLIST_DIRS=	share/gnome/pixmaps/fpm
+PLIST_FILES=	bin/fpm share/pixmaps/fpm/logo.xpm
+PLIST_DIRS=	share/pixmaps/fpm
 
 pre-build:
 	${REINPLACE_CMD} -E -e "s@encrypt\(@bfishencrypt\(@g" ${WRKSRC}/src/blowfish.c
diff --git a/security/gcipher/Makefile b/security/gcipher/Makefile
index 6825fb54f901..ef1681c30d3d 100644
--- a/security/gcipher/Makefile
+++ b/security/gcipher/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gcipher
 PORTVERSION=	1.0
-PORTREVISION=	7
+PORTREVISION=	9
 CATEGORIES=	security gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -21,10 +21,14 @@ USE_PYTHON=	yes
 USE_XLIB=	yes
 USE_GNOME=	libgnomeui
 
-GCIPHER_PREFIX=	${PREFIX}/share/gnome/gcipher
+GCIPHER_PREFIX=	${PREFIX}/share/gcipher
 
 MAN1=	gcipher.1
 
+post-patch:
+	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \
+		${WRKSRC}/src/Const.py ${WRKSRC}/src/gcipher
+
 do-build:
 	(cd ${WRKSRC}/src; \
 	 ${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py .)
@@ -42,7 +46,7 @@ do-install:
 
 	(cd ${WRKSRC}/src; \
 	 ${INSTALL_SCRIPT} gcipher ${PREFIX}/bin/gcipher; \
-	 ${INSTALL_DATA} gcipher.desktop ${PREFIX}/share/gnome/applications; \
+	 ${INSTALL_DATA} gcipher.desktop ${PREFIX}/share/applications; \
 	 for i in `${FIND} . -name '*.py' \
 		       -o -name '*.pyc' \
 		       -o -name '*.glade' \
diff --git a/security/gcipher/files/patch-Const.py b/security/gcipher/files/patch-Const.py
index eac9b1ae6d1b..b4b94da306da 100644
--- a/security/gcipher/files/patch-Const.py
+++ b/security/gcipher/files/patch-Const.py
@@ -6,4 +6,4 @@ diff -ur ../gcipher-1.0.orig/src/Const.py ./src/Const.py
  as a command line filter or as a network proxy."""
  AUTHORS = ["Shannon -jj Behrens <jjinux@yahoo.com>"]
 -GLADEDIR = "."
-+GLADEDIR = "/usr/X11R6/share/gnome/gcipher/lib"
++GLADEDIR = "%%PREFIX%%/share/gcipher/lib"
diff --git a/security/gcipher/files/patch-gcipher b/security/gcipher/files/patch-gcipher
index cb48ac1009fb..2e7ba1abc059 100644
--- a/security/gcipher/files/patch-gcipher
+++ b/security/gcipher/files/patch-gcipher
@@ -10,7 +10,7 @@ diff -ur ../gcipher-1.0.orig/src/gcipher ./src/gcipher
  # Edit the path below if you need to port GCipher.
  import sys
 -# sys.path.append("/usr/share/gcipher/lib")
-+sys.path.append("/usr/X11R6/share/gnome/gcipher/lib")
++sys.path.append("%%PREFIX%%/share/gcipher/lib")
  
  from os import environ 
  from os.path import join
diff --git a/security/gcipher/files/patch-gcipher.desktop b/security/gcipher/files/patch-gcipher.desktop
index 6027a262a8dd..fa076993d6cc 100644
--- a/security/gcipher/files/patch-gcipher.desktop
+++ b/security/gcipher/files/patch-gcipher.desktop
@@ -6,7 +6,7 @@ diff -ur ../gcipher-1.0.orig/src/gcipher.desktop ./src/gcipher.desktop
  Comment[en_US.ISO8859-15]=A simple encryption tool
  Exec=gcipher
 -Icon=/usr/share/pixmaps/gnome-lockscreen.png
-+Icon=/usr/X11R6/share/gnome/pixmaps/gnome-lockscreen.png
++Icon=gnome-lockscreen.png
  Terminal=false
  Type=Application
  StartupNotify=true
diff --git a/security/gcipher/pkg-plist b/security/gcipher/pkg-plist
index 640f01df3d09..2e0d6874038b 100644
--- a/security/gcipher/pkg-plist
+++ b/security/gcipher/pkg-plist
@@ -1,65 +1,66 @@
 bin/gcipher
-share/gnome/applications/gcipher.desktop
-share/gnome/gcipher/CONTRIB
-share/gnome/gcipher/LICENSE
-share/gnome/gcipher/README
-share/gnome/gcipher/lib/cipher/__init__.pyc
-share/gnome/gcipher/lib/cipher/Ceasar.py
-share/gnome/gcipher/lib/cipher/CharacterCipher.py
-share/gnome/gcipher/lib/cipher/Gie.py
-share/gnome/gcipher/lib/cipher/KeyedCipher.py
-share/gnome/gcipher/lib/cipher/Rot.py
-share/gnome/gcipher/lib/cipher/Tools.py
-share/gnome/gcipher/lib/cipher/Vigenere.py
-share/gnome/gcipher/lib/cipher/__init__.py
-share/gnome/gcipher/lib/cipher/KeyedCipher.pyc
-share/gnome/gcipher/lib/cipher/Vigenere.pyc
-share/gnome/gcipher/lib/cipher/CharacterCipher.pyc
-share/gnome/gcipher/lib/cipher/Tools.pyc
-share/gnome/gcipher/lib/cipher/Gie.pyc
-share/gnome/gcipher/lib/cipher/Ceasar.pyc
-share/gnome/gcipher/lib/cipher/Rot.pyc
-share/gnome/gcipher/lib/AutomaticClass.py
-share/gnome/gcipher/lib/Const.py
-share/gnome/gcipher/lib/GtkAttributesFacade.py
-share/gnome/gcipher/lib/LibGladeApplication.py
-share/gnome/gcipher/lib/MainCLI.py
-share/gnome/gcipher/lib/MainGUI.py
-share/gnome/gcipher/lib/Proxy.py
-share/gnome/gcipher/lib/gcipher.glade
-share/gnome/gcipher/lib/gcipher.gladep
-share/gnome/gcipher/lib/ciphergui/__init__.pyc
-share/gnome/gcipher/lib/ciphergui/Ceasar.py
-share/gnome/gcipher/lib/ciphergui/CipherGUIList.py
-share/gnome/gcipher/lib/ciphergui/Gie.py
-share/gnome/gcipher/lib/ciphergui/KeyDialog.py
-share/gnome/gcipher/lib/ciphergui/Rot.py
-share/gnome/gcipher/lib/ciphergui/Vigenere.py
-share/gnome/gcipher/lib/ciphergui/__init__.py
-share/gnome/gcipher/lib/ciphergui/rot.glade
-share/gnome/gcipher/lib/ciphergui/rot.gladep
-share/gnome/gcipher/lib/ciphergui/vigenere.glade
-share/gnome/gcipher/lib/ciphergui/vigenere.gladep
-share/gnome/gcipher/lib/ciphergui/CipherGUIList.pyc
-share/gnome/gcipher/lib/ciphergui/Vigenere.pyc
-share/gnome/gcipher/lib/ciphergui/KeyDialog.pyc
-share/gnome/gcipher/lib/ciphergui/Gie.pyc
-share/gnome/gcipher/lib/ciphergui/Ceasar.pyc
-share/gnome/gcipher/lib/ciphergui/Rot.pyc
-share/gnome/gcipher/lib/Const.pyc
-share/gnome/gcipher/lib/MainCLI.pyc
-share/gnome/gcipher/lib/AutomaticClass.pyc
-share/gnome/gcipher/lib/MainGUI.pyc
-share/gnome/gcipher/lib/LibGladeApplication.pyc
-share/gnome/gcipher/lib/GtkAttributesFacade.pyc
-share/gnome/gcipher/lib/Proxy.pyc
-share/gnome/gcipher/plugins/cipher/Identity.py
-share/gnome/gcipher/plugins/ciphergui/Identity.py
-share/gnome/gcipher/plugins/ciphergui/PluginCipherGUIList.py
-@dirrm share/gnome/gcipher/lib/cipher
-@dirrm share/gnome/gcipher/lib/ciphergui
-@dirrm share/gnome/gcipher/lib
-@dirrm share/gnome/gcipher/plugins/cipher
-@dirrm share/gnome/gcipher/plugins/ciphergui
-@dirrm share/gnome/gcipher/plugins
-@dirrm share/gnome/gcipher
+share/applications/gcipher.desktop
+share/gcipher/CONTRIB
+share/gcipher/LICENSE
+share/gcipher/README
+share/gcipher/lib/cipher/__init__.pyc
+share/gcipher/lib/cipher/Ceasar.py
+share/gcipher/lib/cipher/CharacterCipher.py
+share/gcipher/lib/cipher/Gie.py
+share/gcipher/lib/cipher/KeyedCipher.py
+share/gcipher/lib/cipher/Rot.py
+share/gcipher/lib/cipher/Tools.py
+share/gcipher/lib/cipher/Vigenere.py
+share/gcipher/lib/cipher/__init__.py
+share/gcipher/lib/cipher/KeyedCipher.pyc
+share/gcipher/lib/cipher/Vigenere.pyc
+share/gcipher/lib/cipher/CharacterCipher.pyc
+share/gcipher/lib/cipher/Tools.pyc
+share/gcipher/lib/cipher/Gie.pyc
+share/gcipher/lib/cipher/Ceasar.pyc
+share/gcipher/lib/cipher/Rot.pyc
+share/gcipher/lib/AutomaticClass.py
+share/gcipher/lib/Const.py
+share/gcipher/lib/GtkAttributesFacade.py
+share/gcipher/lib/LibGladeApplication.py
+share/gcipher/lib/MainCLI.py
+share/gcipher/lib/MainGUI.py
+share/gcipher/lib/Proxy.py
+share/gcipher/lib/gcipher.glade
+share/gcipher/lib/gcipher.gladep
+share/gcipher/lib/ciphergui/__init__.pyc
+share/gcipher/lib/ciphergui/Ceasar.py
+share/gcipher/lib/ciphergui/CipherGUIList.py
+share/gcipher/lib/ciphergui/Gie.py
+share/gcipher/lib/ciphergui/KeyDialog.py
+share/gcipher/lib/ciphergui/Rot.py
+share/gcipher/lib/ciphergui/Vigenere.py
+share/gcipher/lib/ciphergui/__init__.py
+share/gcipher/lib/ciphergui/rot.glade
+share/gcipher/lib/ciphergui/rot.gladep
+share/gcipher/lib/ciphergui/vigenere.glade
+share/gcipher/lib/ciphergui/vigenere.gladep
+share/gcipher/lib/ciphergui/CipherGUIList.pyc
+share/gcipher/lib/ciphergui/Vigenere.pyc
+share/gcipher/lib/ciphergui/KeyDialog.pyc
+share/gcipher/lib/ciphergui/Gie.pyc
+share/gcipher/lib/ciphergui/Ceasar.pyc
+share/gcipher/lib/ciphergui/Rot.pyc
+share/gcipher/lib/Const.pyc
+share/gcipher/lib/MainCLI.pyc
+share/gcipher/lib/AutomaticClass.pyc
+share/gcipher/lib/MainGUI.pyc
+share/gcipher/lib/LibGladeApplication.pyc
+share/gcipher/lib/GtkAttributesFacade.pyc
+share/gcipher/lib/Proxy.pyc
+share/gcipher/plugins/cipher/Identity.py
+share/gcipher/plugins/ciphergui/Identity.py
+share/gcipher/plugins/ciphergui/PluginCipherGUIList.py
+@dirrm share/gcipher/lib/cipher
+@dirrm share/gcipher/lib/ciphergui
+@dirrm share/gcipher/lib
+@dirrm share/gcipher/plugins/cipher
+@dirrm share/gcipher/plugins/ciphergui
+@dirrm share/gcipher/plugins
+@dirrm share/gcipher
+@dirrmtry share/applications
diff --git a/security/gnome-keyring-manager/Makefile b/security/gnome-keyring-manager/Makefile
index 42346cf6b2ca..f7fdd7d1485b 100644
--- a/security/gnome-keyring-manager/Makefile
+++ b/security/gnome-keyring-manager/Makefile
@@ -3,12 +3,11 @@
 # Whom:					Adam Weinberger <adamw@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/security/gnome-keyring-manager/Makefile,v 1.27 2007/03/13 12:35:40 ahze Exp $
+#   $MCom: ports/security/gnome-keyring-manager/Makefile,v 1.32 2007/09/18 01:27:58 ahze Exp $
 #
 
 PORTNAME=	gnome-keyring-manager
-PORTVERSION=	2.18.0
-PORTREVISION=	1
+PORTVERSION=	2.20.0
 CATEGORIES=	security gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
diff --git a/security/gnome-keyring-manager/distinfo b/security/gnome-keyring-manager/distinfo
index 128a495ae831..99541a9d89fd 100644
--- a/security/gnome-keyring-manager/distinfo
+++ b/security/gnome-keyring-manager/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-keyring-manager-2.18.0.tar.bz2) = 05183cdea9d933cb1e9a8f4202c6ffc0
-SHA256 (gnome2/gnome-keyring-manager-2.18.0.tar.bz2) = a8d90a900a137434467a3d5c9f618249f1520ec3a86a998e62f648235f0ae611
-SIZE (gnome2/gnome-keyring-manager-2.18.0.tar.bz2) = 455431
+MD5 (gnome2/gnome-keyring-manager-2.20.0.tar.bz2) = 61d701888f00c02490c0cd551bf3fcb1
+SHA256 (gnome2/gnome-keyring-manager-2.20.0.tar.bz2) = a4c9560f79067d528501198dd103b3df060b24f64cd878f22436031eeb113140
+SIZE (gnome2/gnome-keyring-manager-2.20.0.tar.bz2) = 455466
diff --git a/security/gnome-keyring-manager/pkg-plist b/security/gnome-keyring-manager/pkg-plist
index aae072ad233e..5d1b24c0fb98 100644
--- a/security/gnome-keyring-manager/pkg-plist
+++ b/security/gnome-keyring-manager/pkg-plist
@@ -1,28 +1,25 @@
 bin/gnome-keyring-manager
-share/gnome/applications/gnome-keyring-manager.desktop
-share/gnome/gnome-keyring-manager/gnome-keyring-manager-ui.xml
-share/gnome/gnome-keyring-manager/gnome-keyring-manager.glade
-share/gnome/gnome-keyring-manager/stock_delete-key.png
-share/gnome/gnome-keyring-manager/stock_delete-keyring.png
-share/gnome/gnome-keyring-manager/stock_new-key.png
-share/gnome/gnome-keyring-manager/stock_new-keyring.png
+share/applications/gnome-keyring-manager.desktop
+%%DATADIR%%/gnome-keyring-manager-ui.xml
+%%DATADIR%%/gnome-keyring-manager.glade
+%%DATADIR%%/stock_delete-key.png
+%%DATADIR%%/stock_delete-keyring.png
+%%DATADIR%%/stock_new-key.png
+%%DATADIR%%/stock_new-keyring.png
 share/gnome/help/gnome-keyring-manager/C/gnome-keyring-manager.xml
 share/gnome/help/gnome-keyring-manager/C/legal.xml
+share/gnome/help/gnome-keyring-manager/ca/gnome-keyring-manager.xml
 share/gnome/help/gnome-keyring-manager/da/gnome-keyring-manager.xml
 share/gnome/help/gnome-keyring-manager/en_GB/gnome-keyring-manager.xml
 share/gnome/help/gnome-keyring-manager/es/gnome-keyring-manager.xml
 share/gnome/help/gnome-keyring-manager/fr/gnome-keyring-manager.xml
+share/gnome/help/gnome-keyring-manager/oc/gnome-keyring-manager.xml
 share/gnome/help/gnome-keyring-manager/sv/gnome-keyring-manager.xml
 share/gnome/help/gnome-keyring-manager/uk/gnome-keyring-manager.xml
-share/gnome/omf/gnome-keyring-manager/gnome-keyring-manager-C.omf
-share/gnome/omf/gnome-keyring-manager/gnome-keyring-manager-da.omf
-share/gnome/omf/gnome-keyring-manager/gnome-keyring-manager-en_GB.omf
-share/gnome/omf/gnome-keyring-manager/gnome-keyring-manager-es.omf
-share/gnome/omf/gnome-keyring-manager/gnome-keyring-manager-fr.omf
-share/gnome/omf/gnome-keyring-manager/gnome-keyring-manager-sv.omf
-share/gnome/omf/gnome-keyring-manager/gnome-keyring-manager-uk.omf
+share/gnome/help/gnome-keyring-manager/vi/gnome-keyring-manager.xml
 share/locale/ar/LC_MESSAGES/gnome-keyring-manager.mo
 share/locale/be/LC_MESSAGES/gnome-keyring-manager.mo
+share/locale/be@latin/LC_MESSAGES/gnome-keyring-manager.mo
 share/locale/bg/LC_MESSAGES/gnome-keyring-manager.mo
 share/locale/bn/LC_MESSAGES/gnome-keyring-manager.mo
 share/locale/bn_IN/LC_MESSAGES/gnome-keyring-manager.mo
@@ -61,6 +58,7 @@ share/locale/nb/LC_MESSAGES/gnome-keyring-manager.mo
 share/locale/ne/LC_MESSAGES/gnome-keyring-manager.mo
 share/locale/nl/LC_MESSAGES/gnome-keyring-manager.mo
 share/locale/nn/LC_MESSAGES/gnome-keyring-manager.mo
+share/locale/oc/LC_MESSAGES/gnome-keyring-manager.mo
 share/locale/or/LC_MESSAGES/gnome-keyring-manager.mo
 share/locale/pa/LC_MESSAGES/gnome-keyring-manager.mo
 share/locale/pl/LC_MESSAGES/gnome-keyring-manager.mo
@@ -69,6 +67,7 @@ share/locale/pt_BR/LC_MESSAGES/gnome-keyring-manager.mo
 share/locale/ro/LC_MESSAGES/gnome-keyring-manager.mo
 share/locale/ru/LC_MESSAGES/gnome-keyring-manager.mo
 share/locale/rw/LC_MESSAGES/gnome-keyring-manager.mo
+share/locale/si/LC_MESSAGES/gnome-keyring-manager.mo
 share/locale/sk/LC_MESSAGES/gnome-keyring-manager.mo
 share/locale/sl/LC_MESSAGES/gnome-keyring-manager.mo
 share/locale/sq/LC_MESSAGES/gnome-keyring-manager.mo
@@ -76,6 +75,7 @@ share/locale/sr/LC_MESSAGES/gnome-keyring-manager.mo
 share/locale/sr@Latn/LC_MESSAGES/gnome-keyring-manager.mo
 share/locale/sv/LC_MESSAGES/gnome-keyring-manager.mo
 share/locale/ta/LC_MESSAGES/gnome-keyring-manager.mo
+share/locale/te/LC_MESSAGES/gnome-keyring-manager.mo
 share/locale/th/LC_MESSAGES/gnome-keyring-manager.mo
 share/locale/tr/LC_MESSAGES/gnome-keyring-manager.mo
 share/locale/uk/LC_MESSAGES/gnome-keyring-manager.mo
@@ -83,10 +83,39 @@ share/locale/vi/LC_MESSAGES/gnome-keyring-manager.mo
 share/locale/zh_CN/LC_MESSAGES/gnome-keyring-manager.mo
 share/locale/zh_HK/LC_MESSAGES/gnome-keyring-manager.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-keyring-manager.mo
+share/omf/gnome-keyring-manager/gnome-keyring-manager-C.omf
+share/omf/gnome-keyring-manager/gnome-keyring-manager-ca.omf
+share/omf/gnome-keyring-manager/gnome-keyring-manager-da.omf
+share/omf/gnome-keyring-manager/gnome-keyring-manager-en_GB.omf
+share/omf/gnome-keyring-manager/gnome-keyring-manager-es.omf
+share/omf/gnome-keyring-manager/gnome-keyring-manager-fr.omf
+share/omf/gnome-keyring-manager/gnome-keyring-manager-oc.omf
+share/omf/gnome-keyring-manager/gnome-keyring-manager-sv.omf
+share/omf/gnome-keyring-manager/gnome-keyring-manager-uk.omf
+share/omf/gnome-keyring-manager/gnome-keyring-manager-vi.omf
+@dirrm share/omf/gnome-keyring-manager
+@dirrm share/gnome/help/gnome-keyring-manager/vi
+@dirrm share/gnome/help/gnome-keyring-manager/uk
+@dirrm share/gnome/help/gnome-keyring-manager/sv
+@dirrm share/gnome/help/gnome-keyring-manager/oc
+@dirrm share/gnome/help/gnome-keyring-manager/fr
+@dirrm share/gnome/help/gnome-keyring-manager/es
+@dirrm share/gnome/help/gnome-keyring-manager/en_GB
+@dirrm share/gnome/help/gnome-keyring-manager/da
+@dirrm share/gnome/help/gnome-keyring-manager/ca
+@dirrm share/gnome/help/gnome-keyring-manager/C
+@dirrm share/gnome/help/gnome-keyring-manager
+@dirrm %%DATADIR%%
 @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
+@dirrmtry share/locale/oc
 @dirrmtry share/locale/mr/LC_MESSAGES
 @dirrmtry share/locale/mr
 @dirrmtry share/locale/mg/LC_MESSAGES
@@ -95,13 +124,6 @@ share/locale/zh_TW/LC_MESSAGES/gnome-keyring-manager.mo
 @dirrmtry share/locale/dz
 @dirrmtry share/locale/bn_IN/LC_MESSAGES
 @dirrmtry share/locale/bn_IN
-@dirrm share/gnome/omf/gnome-keyring-manager
-@dirrm share/gnome/help/gnome-keyring-manager/uk
-@dirrm share/gnome/help/gnome-keyring-manager/sv
-@dirrm share/gnome/help/gnome-keyring-manager/fr
-@dirrm share/gnome/help/gnome-keyring-manager/es
-@dirrm share/gnome/help/gnome-keyring-manager/en_GB
-@dirrm share/gnome/help/gnome-keyring-manager/da
-@dirrm share/gnome/help/gnome-keyring-manager/C
-@dirrm share/gnome/help/gnome-keyring-manager
-@dirrm share/gnome/gnome-keyring-manager
+@dirrmtry share/locale/be@latin/LC_MESSAGES
+@dirrmtry share/locale/be@latin
+@dirrmtry share/applications
diff --git a/security/gnome-keyring/Makefile b/security/gnome-keyring/Makefile
index 4656b6c54206..8deb19ee081c 100644
--- a/security/gnome-keyring/Makefile
+++ b/security/gnome-keyring/Makefile
@@ -3,12 +3,11 @@
 # Whom:				Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/security/gnome-keyring/Makefile,v 1.31 2007/03/12 19:28:27 mezz Exp $
+#   $MCom: ports/security/gnome-keyring/Makefile,v 1.47 2007/10/15 17:36:20 mezz Exp $
 #
 
 PORTNAME=	gnome-keyring
-PORTVERSION=	0.8.1
-PORTREVISION=	1
+PORTVERSION=	2.20.1
 CATEGORIES=	security gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -18,16 +17,15 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	A program that keeps passwords and other secrets
 
-LIB_DEPENDS=	dbus-1.3:${PORTSDIR}/devel/dbus
+LIB_DEPENDS=	hal.1:${PORTSDIR}/sysutils/hal \
+    		gcrypt.13:${PORTSDIR}/security/libgcrypt
 
 USE_BZIP2=	yes
-USE_GNOME=	gnomehack gtk20
+USE_GNOME=	gnomehack gnomeprefix gtk20 ltverhack
 USE_GMAKE=	yes
 USE_GETTEXT=	yes
-GNU_CONFIGURE=	yes
+USE_AUTOTOOLS=	libtool:15
 USE_LDCONFIG=	yes
-CONFIGURE_ARGS=	--disable-gtk-doc \
-		--with-html-dir=${GNOME_HTML_DIR}
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
diff --git a/security/gnome-keyring/distinfo b/security/gnome-keyring/distinfo
index 7be87150cd2d..d390c1f0bcd0 100644
--- a/security/gnome-keyring/distinfo
+++ b/security/gnome-keyring/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-keyring-0.8.1.tar.bz2) = 24b15dedcf40c1c60d0fb989370d80ff
-SHA256 (gnome2/gnome-keyring-0.8.1.tar.bz2) = ad28558e2c0e5496cdfec3f8badf84d64af3aebc3fc9f5632066591e20ce3943
-SIZE (gnome2/gnome-keyring-0.8.1.tar.bz2) = 448558
+MD5 (gnome2/gnome-keyring-2.20.1.tar.bz2) = 16eb73c4a23db11ee8f20a731cf2a92b
+SHA256 (gnome2/gnome-keyring-2.20.1.tar.bz2) = 69208630af42bc3eb7561161067e24eb6bfb8afc2eb73e526efd0bbe337868f8
+SIZE (gnome2/gnome-keyring-2.20.1.tar.bz2) = 546007
diff --git a/security/gnome-keyring/pkg-plist b/security/gnome-keyring/pkg-plist
index 65d9dffbcaef..bde5f3d2a70e 100644
--- a/security/gnome-keyring/pkg-plist
+++ b/security/gnome-keyring/pkg-plist
@@ -1,12 +1,29 @@
 bin/gnome-keyring-daemon
+include/gnome-keyring-1/gnome-keyring-memory.h
+include/gnome-keyring-1/gnome-keyring-result.h
 include/gnome-keyring-1/gnome-keyring.h
+lib/libgnome-keyring.a
 lib/libgnome-keyring.la
 lib/libgnome-keyring.so
 lib/libgnome-keyring.so.0
+lib/security/pam_gnome_keyring.a
+lib/security/pam_gnome_keyring.la
+lib/security/pam_gnome_keyring.so
 libdata/pkgconfig/gnome-keyring-1.pc
 libexec/gnome-keyring-ask
 %%DOCSDIR%%/ch01.html
-%%DOCSDIR%%/gnome-keyring-gnome-keyring.html
+%%DOCSDIR%%/gnome-keyring-gnome-keyring-acl.html
+%%DOCSDIR%%/gnome-keyring-gnome-keyring-attributes.html
+%%DOCSDIR%%/gnome-keyring-gnome-keyring-find.html
+%%DOCSDIR%%/gnome-keyring-gnome-keyring-generic-callbacks.html
+%%DOCSDIR%%/gnome-keyring-gnome-keyring-item-info.html
+%%DOCSDIR%%/gnome-keyring-gnome-keyring-items.html
+%%DOCSDIR%%/gnome-keyring-gnome-keyring-keyring-info.html
+%%DOCSDIR%%/gnome-keyring-gnome-keyring-keyrings.html
+%%DOCSDIR%%/gnome-keyring-gnome-keyring-memory.html
+%%DOCSDIR%%/gnome-keyring-gnome-keyring-misc.html
+%%DOCSDIR%%/gnome-keyring-gnome-keyring-network.html
+%%DOCSDIR%%/gnome-keyring-gnome-keyring-result.html
 %%DOCSDIR%%/gnome-keyring.devhelp
 %%DOCSDIR%%/gnome-keyring.devhelp2
 %%DOCSDIR%%/home.png
@@ -19,6 +36,7 @@ libexec/gnome-keyring-ask
 share/locale/ar/LC_MESSAGES/gnome-keyring.mo
 share/locale/az/LC_MESSAGES/gnome-keyring.mo
 share/locale/be/LC_MESSAGES/gnome-keyring.mo
+share/locale/be@latin/LC_MESSAGES/gnome-keyring.mo
 share/locale/bg/LC_MESSAGES/gnome-keyring.mo
 share/locale/bn/LC_MESSAGES/gnome-keyring.mo
 share/locale/bn_IN/LC_MESSAGES/gnome-keyring.mo
@@ -60,6 +78,7 @@ share/locale/ms/LC_MESSAGES/gnome-keyring.mo
 share/locale/nb/LC_MESSAGES/gnome-keyring.mo
 share/locale/ne/LC_MESSAGES/gnome-keyring.mo
 share/locale/nl/LC_MESSAGES/gnome-keyring.mo
+share/locale/oc/LC_MESSAGES/gnome-keyring.mo
 share/locale/or/LC_MESSAGES/gnome-keyring.mo
 share/locale/pa/LC_MESSAGES/gnome-keyring.mo
 share/locale/pl/LC_MESSAGES/gnome-keyring.mo
@@ -68,6 +87,7 @@ share/locale/pt_BR/LC_MESSAGES/gnome-keyring.mo
 share/locale/ro/LC_MESSAGES/gnome-keyring.mo
 share/locale/ru/LC_MESSAGES/gnome-keyring.mo
 share/locale/rw/LC_MESSAGES/gnome-keyring.mo
+share/locale/si/LC_MESSAGES/gnome-keyring.mo
 share/locale/sk/LC_MESSAGES/gnome-keyring.mo
 share/locale/sl/LC_MESSAGES/gnome-keyring.mo
 share/locale/sq/LC_MESSAGES/gnome-keyring.mo
@@ -75,6 +95,7 @@ share/locale/sr/LC_MESSAGES/gnome-keyring.mo
 share/locale/sr@Latn/LC_MESSAGES/gnome-keyring.mo
 share/locale/sv/LC_MESSAGES/gnome-keyring.mo
 share/locale/ta/LC_MESSAGES/gnome-keyring.mo
+share/locale/te/LC_MESSAGES/gnome-keyring.mo
 share/locale/th/LC_MESSAGES/gnome-keyring.mo
 share/locale/tr/LC_MESSAGES/gnome-keyring.mo
 share/locale/uk/LC_MESSAGES/gnome-keyring.mo
@@ -84,13 +105,20 @@ share/locale/zh_CN/LC_MESSAGES/gnome-keyring.mo
 share/locale/zh_HK/LC_MESSAGES/gnome-keyring.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-keyring.mo
 @dirrm %%DOCSDIR%%
+@dirrmtry lib/security
 @dirrm include/gnome-keyring-1
 @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/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
@@ -99,3 +127,5 @@ share/locale/zh_TW/LC_MESSAGES/gnome-keyring.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/security/gnome-password-generator/Makefile b/security/gnome-password-generator/Makefile
index bf3bbeabeccf..d2950c52b6d6 100644
--- a/security/gnome-password-generator/Makefile
+++ b/security/gnome-password-generator/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gnome-password-generator
 PORTVERSION=	1.4
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	security gnome python
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	gnome-password
@@ -20,7 +20,7 @@ USE_PYTHON=	yes
 USE_GMAKE=	yes
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|prefix=/usr|prefix=${PREFIX}|g' -e 's|(prefix)/share|(prefix)/share/gnome|g' ${WRKSRC}/Makefile
+	@${REINPLACE_CMD} -e 's|prefix=/usr|prefix=${PREFIX}|g' ${WRKSRC}/Makefile
 	@${REINPLACE_CMD} -e 's|/usr/bin/python|${PYTHON_CMD}|g' ${WRKSRC}/${PORTNAME}
 
 .include <bsd.port.mk>
diff --git a/security/gnome-password-generator/pkg-plist b/security/gnome-password-generator/pkg-plist
index 623d99f94537..7762ffe8fc8e 100644
--- a/security/gnome-password-generator/pkg-plist
+++ b/security/gnome-password-generator/pkg-plist
@@ -1,3 +1,4 @@
 bin/gnome-password-generator
-share/gnome/pixmaps/gnome-password-generator.png
-share/gnome/applications/gnome-password-generator.desktop
+share/pixmaps/gnome-password-generator.png
+share/applications/gnome-password-generator.desktop
+@dirrmtry share/applications
diff --git a/security/gpass/Makefile b/security/gpass/Makefile
index 2f94e387f7c0..205ff66a8be7 100644
--- a/security/gpass/Makefile
+++ b/security/gpass/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gpass
 PORTVERSION=	0.5.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	security gnome
 MASTER_SITES=	http://projects.netlab.jp/gpass/release/
 
diff --git a/security/gpass/pkg-plist b/security/gpass/pkg-plist
index 9910308dc5b2..4400601aeb07 100644
--- a/security/gpass/pkg-plist
+++ b/security/gpass/pkg-plist
@@ -1,7 +1,7 @@
 bin/gpass
 bin/gpass-convert
-share/gnome/applications/gpass.desktop
-share/gnome/pixmaps/gpass-icon.png
+share/applications/gpass.desktop
+share/pixmaps/gpass-icon.png
 %%DATADIR%%/attribute-editor.glade
 %%DATADIR%%/authentication.glade
 %%DATADIR%%/change-master-password.glade
@@ -15,3 +15,4 @@ share/gnome/pixmaps/gpass-icon.png
 @dirrm %%DATADIR%%
 @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/security/gringotts/Makefile b/security/gringotts/Makefile
index b6fb10d98d2e..e7d0852836e8 100644
--- a/security/gringotts/Makefile
+++ b/security/gringotts/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gringotts
 PORTVERSION=	1.2.8
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	security
 MASTER_SITES=	http://devel.pluto.linux.it/projects/Gringotts/current/ \
 		ftp://ftp.nuug.no/pub/anders/distfiles/
@@ -37,7 +37,6 @@ PLIST_SUB+=	GNOMEHIER='@comment '
 
 post-patch:
 	${REINPLACE_CMD} -E -e "s|^(gringottsdocdir =).*|\1 ${DOCSDIR}|;s|md5sum|md5|g" ${WRKSRC}/Makefile.in
-	${REINPLACE_CMD} -E -e "s|^(pixmapdir =).*|\1 ${PREFIX}/share/gnome/pixmaps|" ${WRKSRC}/pixmaps/Makefile.in
 	@${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} ${REINPLACE_CMD} -e \
 		's|-D.*_DISABLE_DEPRECATED||g'
 .if defined(NOPORTDOCS)
diff --git a/security/gringotts/pkg-plist b/security/gringotts/pkg-plist
index 4cfe3580d89f..b7dfbba3d743 100644
--- a/security/gringotts/pkg-plist
+++ b/security/gringotts/pkg-plist
@@ -1,12 +1,10 @@
 bin/gringotts
-share/gnome/pixmaps/gringotts.xpm
+share/pixmaps/gringotts.xpm
 share/locale/de/LC_MESSAGES/gringotts.mo
 share/locale/fr/LC_MESSAGES/gringotts.mo
 share/locale/it/LC_MESSAGES/gringotts.mo
 %%GNOMEHIER%%share/gnome/apps/Utilities/gringotts.desktop
 %%GNOMEHIER%%@unexec rmdir -p %D/share/gnome/apps/Utilities 2>/dev/null || true
-@dirrmtry share/gnome/pixmaps
-@dirrmtry share/gnome
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/BUGS
 %%PORTDOCS%%%%DOCSDIR%%/COPYING
diff --git a/security/libgnomesu/Makefile b/security/libgnomesu/Makefile
index a6cf086befa0..521d48dae1dd 100644
--- a/security/libgnomesu/Makefile
+++ b/security/libgnomesu/Makefile
@@ -3,11 +3,11 @@
 # Whom:					Adam Weinberger <adamw@FreeBSD.org>
 #
 # $FreeBSD$
-#
+#    $MCom: ports/security/libgnomesu/Makefile,v 1.2 2007/05/19 21:36:21 marcus Exp $
 
 PORTNAME=	libgnomesu
 PORTVERSION=	1.0.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	security gnome
 MASTER_SITES=	http://members.chello.nl/~h.lai/libgnomesu/
 
diff --git a/security/libgnomesu/pkg-message b/security/libgnomesu/pkg-message
index f2fe9a5a4a3a..c7c9cf5d9331 100644
--- a/security/libgnomesu/pkg-message
+++ b/security/libgnomesu/pkg-message
@@ -8,7 +8,7 @@ you must perform the following:
 On 4.x:
   cat %%EXAMPLESDIR%%/gnomesu-pam.4.x.sample >> /etc/pam.conf
 
-On 5.x:
+On 5.x/6.x:
   cp %%EXAMPLESDIR%%/gnomesu-pam.5.x.sample \
   	/etc/pam.d/gnomesu-pam
 
diff --git a/security/libgnomesu/pkg-plist b/security/libgnomesu/pkg-plist
index e6ef9927de12..0c8487288ac1 100644
--- a/security/libgnomesu/pkg-plist
+++ b/security/libgnomesu/pkg-plist
@@ -12,8 +12,8 @@ libexec/gnomesu-pam-backend
 %%PORTDOCS%%%%DOCSDIR%%/libgnomesu.css
 %%EXAMPLESDIR%%/gnomesu-pam.4.x.sample
 %%EXAMPLESDIR%%/gnomesu-pam.5.x.sample
-share/gnome/application-registry/gnomesu-nautilus.applications
-share/gnome/mime-info/gnomesu-nautilus.keys
+share/application-registry/gnomesu-nautilus.applications
+share/mime-info/gnomesu-nautilus.keys
 share/locale/az/LC_MESSAGES/libgnomesu-1.0.mo
 share/locale/bg/LC_MESSAGES/libgnomesu-1.0.mo
 share/locale/bs/LC_MESSAGES/libgnomesu-1.0.mo
diff --git a/security/nofgpg/Makefile b/security/nofgpg/Makefile
index a3f0b7d7432d..c223f9370a27 100644
--- a/security/nofgpg/Makefile
+++ b/security/nofgpg/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	nofgpg
 PORTVERSION=	0.5.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	security python
 MASTER_SITES=	http://www.cgabriel.org/download/nofgpg/
 
@@ -25,7 +25,7 @@ MAN1=		nofgpg.1
 PLIST_FILES=	bin/nofgpg
 
 post-patch:
-	@${REINPLACE_CMD} -e "s,/usr/share,${LOCALBASE}/share/gnome,g" \
+	@${REINPLACE_CMD} -e "s,/usr/share,${LOCALBASE}/share,g" \
 		${WRKSRC}/nofgpg
 
 do-install:
diff --git a/security/revelation/Makefile b/security/revelation/Makefile
index cf054647fb76..ded0f90c5a96 100644
--- a/security/revelation/Makefile
+++ b/security/revelation/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	revelation
 PORTVERSION=	0.4.11
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security gnome
 MASTER_SITES=	ftp://oss.codepoet.no/revelation/
 
diff --git a/security/revelation/pkg-plist b/security/revelation/pkg-plist
index 648648140250..19de610e3d51 100644
--- a/security/revelation/pkg-plist
+++ b/security/revelation/pkg-plist
@@ -76,17 +76,17 @@ share/locale/fr/LC_MESSAGES/revelation.mo
 share/locale/sv/LC_MESSAGES/revelation.mo
 share/locale/zh/LC_MESSAGES/revelation.mo
 share/locale/cs/LC_MESSAGES/revelation.mo
-share/gnome/applications/revelation.desktop
+share/applications/revelation.desktop
 @exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
 @unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
-share/gnome/revelation/ui/menubar.xml
-share/gnome/revelation/ui/popup-tree.xml
-share/gnome/revelation/ui/toolbar.xml
-@dirrm share/gnome/revelation/ui
-share/gnome/revelation/pwdict.hwm
-share/gnome/revelation/pwdict.pwd
-share/gnome/revelation/pwdict.pwi
-@dirrm share/gnome/revelation
+share/revelation/ui/menubar.xml
+share/revelation/ui/popup-tree.xml
+share/revelation/ui/toolbar.xml
+@dirrm share/revelation/ui
+share/revelation/pwdict.hwm
+share/revelation/pwdict.pwd
+share/revelation/pwdict.pwi
+@dirrm share/revelation
 share/icons/hicolor/16x16/apps/revelation.png
 share/icons/hicolor/24x24/apps/revelation.png
 share/icons/hicolor/24x24/apps/revelation-locked.png
@@ -99,3 +99,4 @@ share/mime/packages/revelation.xml
 share/mime/application/x-revelation.xml
 @exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
 @unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
+@dirrmtry share/applications
diff --git a/security/seahorse/Makefile b/security/seahorse/Makefile
index 179509b0a954..30ea939904ac 100644
--- a/security/seahorse/Makefile
+++ b/security/seahorse/Makefile
@@ -3,12 +3,11 @@
 # Whom:			Dave McKay <dave@mu.org>
 #
 # $FreeBSD$
-#   $MCom: ports/security/seahorse/Makefile,v 1.31 2007/03/15 16:34:55 marcus Exp $
+#   $MCom: ports/security/seahorse/Makefile,v 1.47 2007/10/15 17:59:07 mezz Exp $
 #
 
 PORTNAME=	seahorse
-PORTVERSION=	1.0.1
-PORTREVISION=	3
+PORTVERSION=	2.20.1
 CATEGORIES=	security gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -17,8 +16,8 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GNOME application for managing encryption keys (PGP, SSH)
 
-BUILD_DEPENDS=	gpgv:${PORTSDIR}/security/gnupg1
-RUN_DEPENDS=	gpgv:${PORTSDIR}/security/gnupg1
+BUILD_DEPENDS=	gpg:${PORTSDIR}/security/gnupg
+RUN_DEPENDS=	gpg:${PORTSDIR}/security/gnupg
 LIB_DEPENDS=	gpgme.17:${PORTSDIR}/security/gpgme \
     		dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
 
@@ -42,12 +41,12 @@ MAN1=		seahorse-agent.1 seahorse-daemon.1 seahorse-tool.1
 OPTIONS=	NAUTILUS "Enable the Nautilus component" on \
 		LDAP "Enable LDAP support" on \
 		HKP "Enable HKP keyserver interface" on \
-		GEDIT "Enable GEdit plug-in support" on \
+		EPIPHANY "Enable Epiphany plug-in support" on \
 		NOTIFY "Enable libnotify support" on \
 		APPLET "Enable clipboard encryption applet" on \
 		KEYRING "Enable GNOME Keyring support" on \
 		MDNS "Enable mDNS key sharing" on \
-		EPIPHANY "Enable Epiphany plug-in support" on
+		GEDIT "Enable GEdit plug-in support" on
 
 .include <bsd.port.pre.mk>
 
@@ -93,7 +92,7 @@ CONFIGURE_ARGS+=--disable-libnotify
 .if !defined(WITHOUT_EPIPHANY)
 BUILD_DEPENDS+=	epiphany:${PORTSDIR}/www/epiphany
 RUN_DEPENDS+=	epiphany:${PORTSDIR}/www/epiphany
-PLIST_SUB+=	EPHY="" EPHY_VERSION="2.18"
+PLIST_SUB+=	EPHY="" EPHY_VERSION="2.20"
 .else
 CONFIGURE_ARGS+=--disable-epiphany
 PLIST_SUB+=	EPHY="@comment "
@@ -119,6 +118,10 @@ LIB_DEPENDS+=	avahi-client:${PORTSDIR}/net/avahi
 CONFIGURE_ARGS+=--disable-sharing
 .endif
 
+post-patch:
+	@${REINPLACE_CMD} -e 's|" == "|" = "|g' \
+			${WRKSRC}/configure
+
 post-install:
 	-@update-desktop-database
 
diff --git a/security/seahorse/distinfo b/security/seahorse/distinfo
index e478f73c1d10..d2ebdad70d12 100644
--- a/security/seahorse/distinfo
+++ b/security/seahorse/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/seahorse-1.0.1.tar.bz2) = 687b44dff0cf765d193af79de7fe856f
-SHA256 (gnome2/seahorse-1.0.1.tar.bz2) = 6afdbba1629b054c93c9a657f797c574a2bf96c0a6ab15a5d99c5b8ee5601a1b
-SIZE (gnome2/seahorse-1.0.1.tar.bz2) = 1857602
+MD5 (gnome2/seahorse-2.20.1.tar.bz2) = e4266963ee9d2ffc6185938a7eaf474d
+SHA256 (gnome2/seahorse-2.20.1.tar.bz2) = 718ff187c1951d0a2baa6dd1b9e97ddf9c5d845ebd356b502437a83582843dbf
+SIZE (gnome2/seahorse-2.20.1.tar.bz2) = 2287702
diff --git a/security/seahorse/files/patch-agent_Makefile.in b/security/seahorse/files/patch-agent_Makefile.in
deleted file mode 100644
index be068d34e256..000000000000
--- a/security/seahorse/files/patch-agent_Makefile.in
+++ /dev/null
@@ -1,13 +0,0 @@
---- agent/Makefile.in.orig	Sun Apr  8 10:04:58 2007
-+++ agent/Makefile.in	Sun Apr  8 10:05:12 2007
-@@ -739,10 +739,6 @@ uninstall-man: uninstall-man1
- 	uninstall-man uninstall-man1
- 
- 
--# Don't make the daemon setuid
--# Make the daemon setuid
--@HAVE_USER_MLOCK_FALSE@install-exec-hook:
--@HAVE_USER_MLOCK_FALSE@	chmod u+s $(DESTDIR)$(bindir)/seahorse-daemon
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
diff --git a/security/seahorse/files/patch-configure b/security/seahorse/files/patch-configure
deleted file mode 100644
index b77fe2ddda83..000000000000
--- a/security/seahorse/files/patch-configure
+++ /dev/null
@@ -1,20 +0,0 @@
---- configure.orig	Sun Dec  3 23:18:17 2006
-+++ configure	Sun Dec  3 23:18:57 2006
-@@ -30954,7 +30954,7 @@ fi
- 
- 
- 
--if test "$enable_ssh" == "yes"; then
-+if test "$enable_ssh" = "yes"; then
-   WITH_SSH_TRUE=
-   WITH_SSH_FALSE='#'
- else
-@@ -31014,7 +31014,7 @@ fi
- 
- 
- 
--if test "$enable_tests" == "yes"; then
-+if test "$enable_tests" = "yes"; then
-   WITH_TESTS_TRUE=
-   WITH_TESTS_FALSE='#'
- else
diff --git a/security/seahorse/pkg-plist b/security/seahorse/pkg-plist
index b06be456a0a2..cd02f7a7af86 100644
--- a/security/seahorse/pkg-plist
+++ b/security/seahorse/pkg-plist
@@ -29,17 +29,21 @@ lib/seahorse/seahorse-ssh-askpass
 lib/seahorse/xloadimage
 %%APPLET%%libdata/bonobo/servers/GNOME_SeahorseApplet.server
 libdata/pkgconfig/cryptui-0.0.pc
+share/applications/seahorse-pgp-encrypted.desktop
+share/applications/seahorse-pgp-keys.desktop
+share/applications/seahorse-pgp-preferences.desktop
+share/applications/seahorse-pgp-signature.desktop
+share/applications/seahorse.desktop
 share/dbus-1/services/org.gnome.seahorse.service
-share/gnome/applications/seahorse-pgp-preferences.desktop
-share/gnome/applications/seahorse.desktop
-share/gnome/applications/seahorse-pgp-encrypted.desktop
-share/gnome/applications/seahorse-pgp-keys.desktop
-share/gnome/applications/seahorse-pgp-signature.desktop
-share/gnome/control-center-2.0/capplets/seahorse-pgp-preferences.desktop
-%%APPLET%%share/gnome/gnome-2.0/ui/GNOME_SeahorseApplet.xml
-@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
+%%APPLET%%share/gnome-2.0/ui/GNOME_SeahorseApplet.xml
 %%APPLET%%share/gnome/help/seahorse-applet/C/legal.xml
 %%APPLET%%share/gnome/help/seahorse-applet/C/seahorse-applet.xml
+%%APPLET%%share/gnome/help/seahorse-applet/es/seahorse-applet.xml
+%%APPLET%%share/gnome/help/seahorse-applet/fr/seahorse-applet.xml
+%%APPLET%%share/gnome/help/seahorse-applet/it/seahorse-applet.xml
+%%APPLET%%share/gnome/help/seahorse-applet/oc/seahorse-applet.xml
+%%APPLET%%share/gnome/help/seahorse-applet/sv/seahorse-applet.xml
+%%APPLET%%share/gnome/help/seahorse-applet/vi/seahorse-applet.xml
 share/gnome/help/seahorse/C/figures/export.png
 share/gnome/help/seahorse/C/figures/file-manager.png
 share/gnome/help/seahorse/C/figures/generate.png
@@ -106,6 +110,19 @@ share/gnome/help/seahorse/it/figures/seahorse-window.png
 share/gnome/help/seahorse/it/figures/signature.png
 share/gnome/help/seahorse/it/figures/text-editor.png
 share/gnome/help/seahorse/it/seahorse.xml
+share/gnome/help/seahorse/oc/figures/export.png
+share/gnome/help/seahorse/oc/figures/file-manager.png
+share/gnome/help/seahorse/oc/figures/generate.png
+share/gnome/help/seahorse/oc/figures/import.png
+share/gnome/help/seahorse/oc/figures/key-manager.png
+share/gnome/help/seahorse/oc/figures/key-properties.png
+share/gnome/help/seahorse/oc/figures/passphrase.png
+share/gnome/help/seahorse/oc/figures/preferences.png
+share/gnome/help/seahorse/oc/figures/recipients.png
+share/gnome/help/seahorse/oc/figures/seahorse-window.png
+share/gnome/help/seahorse/oc/figures/signature.png
+share/gnome/help/seahorse/oc/figures/text-editor.png
+share/gnome/help/seahorse/oc/seahorse.xml
 share/gnome/help/seahorse/sv/figures/export.png
 share/gnome/help/seahorse/sv/figures/file-manager.png
 share/gnome/help/seahorse/sv/figures/generate.png
@@ -119,91 +136,19 @@ share/gnome/help/seahorse/sv/figures/seahorse-window.png
 share/gnome/help/seahorse/sv/figures/signature.png
 share/gnome/help/seahorse/sv/figures/text-editor.png
 share/gnome/help/seahorse/sv/seahorse.xml
-%%APPLET%%share/gnome/omf/seahorse-applet/seahorse-applet-C.omf
-share/gnome/omf/seahorse/seahorse-C.omf
-share/gnome/omf/seahorse/seahorse-en_GB.omf
-share/gnome/omf/seahorse/seahorse-es.omf
-share/gnome/omf/seahorse/seahorse-fr.omf
-share/gnome/omf/seahorse/seahorse-it.omf
-share/gnome/omf/seahorse/seahorse-sv.omf
-share/gnome/pixmaps/seahorse-applet.svg
-share/gnome/pixmaps/seahorse-preferences.png
-share/gnome/pixmaps/seahorse.png
-share/gnome/pixmaps/seahorse/22x22/seahorse-applet-encrypted.png
-share/gnome/pixmaps/seahorse/22x22/seahorse-applet-key.png
-share/gnome/pixmaps/seahorse/22x22/seahorse-applet-signed.png
-share/gnome/pixmaps/seahorse/22x22/seahorse-applet-text.png
-share/gnome/pixmaps/seahorse/22x22/seahorse-applet-unknown.png
-share/gnome/pixmaps/seahorse/22x22/seahorse-key-personal.png
-share/gnome/pixmaps/seahorse/22x22/seahorse-key-ssh.png
-share/gnome/pixmaps/seahorse/22x22/seahorse-key.png
-share/gnome/pixmaps/seahorse/22x22/seahorse-preferences.png
-share/gnome/pixmaps/seahorse/22x22/seahorse-share-keys.png
-share/gnome/pixmaps/seahorse/22x22/seahorse-sign-bad.png
-share/gnome/pixmaps/seahorse/22x22/seahorse-sign-ok.png
-share/gnome/pixmaps/seahorse/22x22/seahorse.png
-share/gnome/pixmaps/seahorse/48x48/seahorse-applet-encrypted.png
-share/gnome/pixmaps/seahorse/48x48/seahorse-applet-key.png
-share/gnome/pixmaps/seahorse/48x48/seahorse-applet-signed.png
-share/gnome/pixmaps/seahorse/48x48/seahorse-applet-text.png
-share/gnome/pixmaps/seahorse/48x48/seahorse-applet-unknown.png
-share/gnome/pixmaps/seahorse/48x48/seahorse-applet.png
-share/gnome/pixmaps/seahorse/48x48/seahorse-key-personal.png
-share/gnome/pixmaps/seahorse/48x48/seahorse-key-ssh.png
-share/gnome/pixmaps/seahorse/48x48/seahorse-key.png
-share/gnome/pixmaps/seahorse/48x48/seahorse-person.png
-share/gnome/pixmaps/seahorse/48x48/seahorse-preferences.png
-share/gnome/pixmaps/seahorse/48x48/seahorse-share-keys.png
-share/gnome/pixmaps/seahorse/48x48/seahorse-sign-bad.png
-share/gnome/pixmaps/seahorse/48x48/seahorse-sign-ok.png
-share/gnome/pixmaps/seahorse/48x48/seahorse-sign-unknown.png
-share/gnome/pixmaps/seahorse/48x48/seahorse-sign.png
-share/gnome/pixmaps/seahorse/48x48/seahorse.png
-share/gnome/pixmaps/seahorse/scalable/seahorse-applet-encrypted.svg
-share/gnome/pixmaps/seahorse/scalable/seahorse-applet-key.svg
-share/gnome/pixmaps/seahorse/scalable/seahorse-applet-signed.svg
-share/gnome/pixmaps/seahorse/scalable/seahorse-applet-text.svg
-share/gnome/pixmaps/seahorse/scalable/seahorse-applet-unknown.svg
-share/gnome/pixmaps/seahorse/scalable/seahorse-applet.svg
-share/gnome/pixmaps/seahorse/scalable/seahorse-key-personal.svg
-share/gnome/pixmaps/seahorse/scalable/seahorse-key-ssh.svg
-share/gnome/pixmaps/seahorse/scalable/seahorse-key.svg
-share/gnome/pixmaps/seahorse/scalable/seahorse-person.svg
-share/gnome/pixmaps/seahorse/scalable/seahorse-preferences.svg
-share/gnome/pixmaps/seahorse/scalable/seahorse-share-keys.svg
-share/gnome/pixmaps/seahorse/scalable/seahorse-sign-bad.svg
-share/gnome/pixmaps/seahorse/scalable/seahorse-sign-ok.svg
-share/gnome/pixmaps/seahorse/scalable/seahorse-sign-unknown.svg
-share/gnome/pixmaps/seahorse/scalable/seahorse-sign.svg
-share/gnome/pixmaps/seahorse/scalable/seahorse.svg
-share/gnome/seahorse/glade/seahorse-add-keyserver.glade
-share/gnome/seahorse/glade/seahorse-add-subkey.glade
-share/gnome/seahorse/glade/seahorse-add-uid.glade
-share/gnome/seahorse/glade/seahorse-agent-cache.glade
-%%APPLET%%share/gnome/seahorse/glade/seahorse-applet-preferences.glade
-share/gnome/seahorse/glade/seahorse-change-passphrase.glade
-share/gnome/seahorse/glade/seahorse-expires.glade
-share/gnome/seahorse/glade/seahorse-generate-select.glade
-share/gnome/seahorse/glade/seahorse-gkeyring-item-properties.glade
-share/gnome/seahorse/glade/seahorse-key-manager.glade
-share/gnome/seahorse/glade/seahorse-key-manager.ui
-share/gnome/seahorse/glade/seahorse-keyserver-results.glade
-share/gnome/seahorse/glade/seahorse-keyserver-results.ui
-share/gnome/seahorse/glade/seahorse-keyserver-search.glade
-share/gnome/seahorse/glade/seahorse-keyserver-sync.glade
-share/gnome/seahorse/glade/seahorse-multi-encrypt.glade
-share/gnome/seahorse/glade/seahorse-notify.glade
-share/gnome/seahorse/glade/seahorse-pgp-generate.glade
-share/gnome/seahorse/glade/seahorse-pgp-private-key-properties.glade
-share/gnome/seahorse/glade/seahorse-pgp-public-key-properties.glade
-share/gnome/seahorse/glade/seahorse-prefs.glade
-share/gnome/seahorse/glade/seahorse-progress.glade
-share/gnome/seahorse/glade/seahorse-revoke.glade
-share/gnome/seahorse/glade/seahorse-sign.glade
-share/gnome/seahorse/glade/seahorse-signer.glade
-share/gnome/seahorse/glade/seahorse-ssh-generate.glade
-share/gnome/seahorse/glade/seahorse-ssh-key-properties.glade
-share/gnome/seahorse/glade/seahorse-ssh-upload.glade
+share/gnome/help/seahorse/vi/figures/export.png
+share/gnome/help/seahorse/vi/figures/file-manager.png
+share/gnome/help/seahorse/vi/figures/generate.png
+share/gnome/help/seahorse/vi/figures/import.png
+share/gnome/help/seahorse/vi/figures/key-manager.png
+share/gnome/help/seahorse/vi/figures/key-properties.png
+share/gnome/help/seahorse/vi/figures/passphrase.png
+share/gnome/help/seahorse/vi/figures/preferences.png
+share/gnome/help/seahorse/vi/figures/recipients.png
+share/gnome/help/seahorse/vi/figures/seahorse-window.png
+share/gnome/help/seahorse/vi/figures/signature.png
+share/gnome/help/seahorse/vi/figures/text-editor.png
+share/gnome/help/seahorse/vi/seahorse.xml
 share/icons/hicolor/22x22/apps/seahorse-preferences.svg
 share/icons/hicolor/22x22/apps/seahorse.svg
 share/icons/hicolor/48x48/apps/seahorse-applet.png
@@ -212,10 +157,11 @@ share/icons/hicolor/48x48/apps/seahorse.png
 share/icons/hicolor/scalable/apps/seahorse-applet.svg
 share/icons/hicolor/scalable/apps/seahorse-preferences.svg
 share/icons/hicolor/scalable/apps/seahorse.svg
-share/mime/packages/seahorse.xml
 share/locale/ar/LC_MESSAGES/seahorse.mo
 share/locale/az/LC_MESSAGES/seahorse.mo
+share/locale/be@latin/LC_MESSAGES/seahorse.mo
 share/locale/bg/LC_MESSAGES/seahorse.mo
+share/locale/bn/LC_MESSAGES/seahorse.mo
 share/locale/bn_IN/LC_MESSAGES/seahorse.mo
 share/locale/ca/LC_MESSAGES/seahorse.mo
 share/locale/cs/LC_MESSAGES/seahorse.mo
@@ -229,34 +175,41 @@ share/locale/es/LC_MESSAGES/seahorse.mo
 share/locale/et/LC_MESSAGES/seahorse.mo
 share/locale/eu/LC_MESSAGES/seahorse.mo
 share/locale/fi/LC_MESSAGES/seahorse.mo
+share/locale/fr/LC_MESSAGES/seahorse.mo
 share/locale/gl/LC_MESSAGES/seahorse.mo
 share/locale/gu/LC_MESSAGES/seahorse.mo
-share/locale/fr/LC_MESSAGES/seahorse.mo
 share/locale/he/LC_MESSAGES/seahorse.mo
+share/locale/hi/LC_MESSAGES/seahorse.mo
 share/locale/hr/LC_MESSAGES/seahorse.mo
 share/locale/hu/LC_MESSAGES/seahorse.mo
 share/locale/it/LC_MESSAGES/seahorse.mo
 share/locale/ja/LC_MESSAGES/seahorse.mo
 share/locale/ko/LC_MESSAGES/seahorse.mo
 share/locale/lt/LC_MESSAGES/seahorse.mo
+share/locale/lv/LC_MESSAGES/seahorse.mo
 share/locale/mk/LC_MESSAGES/seahorse.mo
 share/locale/ml/LC_MESSAGES/seahorse.mo
 share/locale/ms/LC_MESSAGES/seahorse.mo
 share/locale/nb/LC_MESSAGES/seahorse.mo
 share/locale/ne/LC_MESSAGES/seahorse.mo
 share/locale/nl/LC_MESSAGES/seahorse.mo
+share/locale/oc/LC_MESSAGES/seahorse.mo
+share/locale/or/LC_MESSAGES/seahorse.mo
 share/locale/pa/LC_MESSAGES/seahorse.mo
 share/locale/pl/LC_MESSAGES/seahorse.mo
 share/locale/pt/LC_MESSAGES/seahorse.mo
 share/locale/pt_BR/LC_MESSAGES/seahorse.mo
 share/locale/ru/LC_MESSAGES/seahorse.mo
 share/locale/rw/LC_MESSAGES/seahorse.mo
+share/locale/si/LC_MESSAGES/seahorse.mo
 share/locale/sk/LC_MESSAGES/seahorse.mo
 share/locale/sl/LC_MESSAGES/seahorse.mo
 share/locale/sq/LC_MESSAGES/seahorse.mo
 share/locale/sr/LC_MESSAGES/seahorse.mo
 share/locale/sr@Latn/LC_MESSAGES/seahorse.mo
 share/locale/sv/LC_MESSAGES/seahorse.mo
+share/locale/ta/LC_MESSAGES/seahorse.mo
+share/locale/te/LC_MESSAGES/seahorse.mo
 share/locale/th/LC_MESSAGES/seahorse.mo
 share/locale/tr/LC_MESSAGES/seahorse.mo
 share/locale/uk/LC_MESSAGES/seahorse.mo
@@ -264,14 +217,116 @@ share/locale/vi/LC_MESSAGES/seahorse.mo
 share/locale/zh_CN/LC_MESSAGES/seahorse.mo
 share/locale/zh_HK/LC_MESSAGES/seahorse.mo
 share/locale/zh_TW/LC_MESSAGES/seahorse.mo
-@dirrm share/gnome/pixmaps/seahorse/scalable
-@dirrm share/gnome/pixmaps/seahorse/48x48
-@dirrm share/gnome/pixmaps/seahorse/22x22
-@dirrm share/gnome/pixmaps/seahorse
-%%APPLET%%@dirrm share/gnome/help/seahorse-applet/C
-%%APPLET%%@dirrm share/gnome/help/seahorse-applet
+share/mime/packages/seahorse.xml
+%%APPLET%%share/omf/seahorse-applet/seahorse-applet-C.omf
+%%APPLET%%share/omf/seahorse-applet/seahorse-applet-es.omf
+%%APPLET%%share/omf/seahorse-applet/seahorse-applet-fr.omf
+%%APPLET%%share/omf/seahorse-applet/seahorse-applet-it.omf
+%%APPLET%%share/omf/seahorse-applet/seahorse-applet-oc.omf
+%%APPLET%%share/omf/seahorse-applet/seahorse-applet-sv.omf
+%%APPLET%%share/omf/seahorse-applet/seahorse-applet-vi.omf
+share/omf/seahorse/seahorse-C.omf
+share/omf/seahorse/seahorse-en_GB.omf
+share/omf/seahorse/seahorse-es.omf
+share/omf/seahorse/seahorse-fr.omf
+share/omf/seahorse/seahorse-it.omf
+share/omf/seahorse/seahorse-oc.omf
+share/omf/seahorse/seahorse-sv.omf
+share/omf/seahorse/seahorse-vi.omf
+share/pixmaps/seahorse-applet.svg
+share/pixmaps/seahorse-preferences.png
+share/pixmaps/seahorse.png
+share/pixmaps/seahorse/22x22/seahorse-applet-encrypted.png
+share/pixmaps/seahorse/22x22/seahorse-applet-key.png
+share/pixmaps/seahorse/22x22/seahorse-applet-signed.png
+share/pixmaps/seahorse/22x22/seahorse-applet-text.png
+share/pixmaps/seahorse/22x22/seahorse-applet-unknown.png
+share/pixmaps/seahorse/22x22/seahorse-key-personal.png
+share/pixmaps/seahorse/22x22/seahorse-key-ssh.png
+share/pixmaps/seahorse/22x22/seahorse-key.png
+share/pixmaps/seahorse/22x22/seahorse-person.png
+share/pixmaps/seahorse/22x22/seahorse-preferences.png
+share/pixmaps/seahorse/22x22/seahorse-share-keys.png
+share/pixmaps/seahorse/22x22/seahorse-sign-bad.png
+share/pixmaps/seahorse/22x22/seahorse-sign-ok.png
+share/pixmaps/seahorse/22x22/seahorse-sign.png
+share/pixmaps/seahorse/22x22/seahorse.png
+share/pixmaps/seahorse/48x48/seahorse-applet-encrypted.png
+share/pixmaps/seahorse/48x48/seahorse-applet-key.png
+share/pixmaps/seahorse/48x48/seahorse-applet-signed.png
+share/pixmaps/seahorse/48x48/seahorse-applet-text.png
+share/pixmaps/seahorse/48x48/seahorse-applet-unknown.png
+share/pixmaps/seahorse/48x48/seahorse-applet.png
+share/pixmaps/seahorse/48x48/seahorse-key-personal.png
+share/pixmaps/seahorse/48x48/seahorse-key-ssh.png
+share/pixmaps/seahorse/48x48/seahorse-key.png
+share/pixmaps/seahorse/48x48/seahorse-person.png
+share/pixmaps/seahorse/48x48/seahorse-preferences.png
+share/pixmaps/seahorse/48x48/seahorse-share-keys.png
+share/pixmaps/seahorse/48x48/seahorse-sign-bad.png
+share/pixmaps/seahorse/48x48/seahorse-sign-ok.png
+share/pixmaps/seahorse/48x48/seahorse-sign-unknown.png
+share/pixmaps/seahorse/48x48/seahorse-sign.png
+share/pixmaps/seahorse/48x48/seahorse.png
+share/pixmaps/seahorse/scalable/seahorse-applet-encrypted.svg
+share/pixmaps/seahorse/scalable/seahorse-applet-key.svg
+share/pixmaps/seahorse/scalable/seahorse-applet-signed.svg
+share/pixmaps/seahorse/scalable/seahorse-applet-text.svg
+share/pixmaps/seahorse/scalable/seahorse-applet-unknown.svg
+share/pixmaps/seahorse/scalable/seahorse-applet.svg
+share/pixmaps/seahorse/scalable/seahorse-key-personal.svg
+share/pixmaps/seahorse/scalable/seahorse-key-ssh.svg
+share/pixmaps/seahorse/scalable/seahorse-key.svg
+share/pixmaps/seahorse/scalable/seahorse-person.svg
+share/pixmaps/seahorse/scalable/seahorse-preferences.svg
+share/pixmaps/seahorse/scalable/seahorse-share-keys.svg
+share/pixmaps/seahorse/scalable/seahorse-sign-bad.svg
+share/pixmaps/seahorse/scalable/seahorse-sign-ok.svg
+share/pixmaps/seahorse/scalable/seahorse-sign-unknown.svg
+share/pixmaps/seahorse/scalable/seahorse-sign.svg
+share/pixmaps/seahorse/scalable/seahorse.svg
+%%DATADIR%%/glade/seahorse-add-keyserver.glade
+%%DATADIR%%/glade/seahorse-add-subkey.glade
+%%DATADIR%%/glade/seahorse-add-uid.glade
+%%DATADIR%%/glade/seahorse-agent-cache.glade
+%%APPLET%%%%DATADIR%%/glade/seahorse-applet-preferences.glade
+%%DATADIR%%/glade/seahorse-change-passphrase.glade
+%%DATADIR%%/glade/seahorse-expires.glade
+%%DATADIR%%/glade/seahorse-generate-select.glade
+%%DATADIR%%/glade/seahorse-gkeyring-item-properties.glade
+%%DATADIR%%/glade/seahorse-key-manager.glade
+%%DATADIR%%/glade/seahorse-key-manager.ui
+%%DATADIR%%/glade/seahorse-keyserver-results.glade
+%%DATADIR%%/glade/seahorse-keyserver-results.ui
+%%DATADIR%%/glade/seahorse-keyserver-search.glade
+%%DATADIR%%/glade/seahorse-keyserver-sync.glade
+%%DATADIR%%/glade/seahorse-multi-encrypt.glade
+%%DATADIR%%/glade/seahorse-notify.glade
+%%DATADIR%%/glade/seahorse-pgp-generate.glade
+%%DATADIR%%/glade/seahorse-pgp-private-key-properties.glade
+%%DATADIR%%/glade/seahorse-pgp-public-key-properties.glade
+%%DATADIR%%/glade/seahorse-prefs.glade
+%%DATADIR%%/glade/seahorse-progress.glade
+%%DATADIR%%/glade/seahorse-revoke.glade
+%%DATADIR%%/glade/seahorse-sign.glade
+%%DATADIR%%/glade/seahorse-signer.glade
+%%DATADIR%%/glade/seahorse-ssh-generate.glade
+%%DATADIR%%/glade/seahorse-ssh-key-properties.glade
+%%DATADIR%%/glade/seahorse-ssh-upload.glade
+@dirrm %%DATADIR%%/glade
+@dirrm %%DATADIR%%
+@dirrm share/pixmaps/seahorse/scalable
+@dirrm share/pixmaps/seahorse/48x48
+@dirrm share/pixmaps/seahorse/22x22
+@dirrm share/pixmaps/seahorse
+%%APPLET%%@dirrm share/omf/seahorse-applet
+@dirrm share/omf/seahorse
+@dirrm share/gnome/help/seahorse/vi/figures
+@dirrm share/gnome/help/seahorse/vi
 @dirrm share/gnome/help/seahorse/sv/figures
 @dirrm share/gnome/help/seahorse/sv
+@dirrm share/gnome/help/seahorse/oc/figures
+@dirrm share/gnome/help/seahorse/oc
 @dirrm share/gnome/help/seahorse/it/figures
 @dirrm share/gnome/help/seahorse/it
 @dirrm share/gnome/help/seahorse/fr/figures
@@ -282,11 +337,15 @@ share/locale/zh_TW/LC_MESSAGES/seahorse.mo
 @dirrm share/gnome/help/seahorse/en_GB
 @dirrm share/gnome/help/seahorse/C/figures
 @dirrm share/gnome/help/seahorse/C
+%%APPLET%%@dirrm share/gnome/help/seahorse-applet/vi
+%%APPLET%%@dirrm share/gnome/help/seahorse-applet/sv
+%%APPLET%%@dirrm share/gnome/help/seahorse-applet/oc
+%%APPLET%%@dirrm share/gnome/help/seahorse-applet/it
+%%APPLET%%@dirrm share/gnome/help/seahorse-applet/fr
+%%APPLET%%@dirrm share/gnome/help/seahorse-applet/es
+%%APPLET%%@dirrm share/gnome/help/seahorse-applet/C
+%%APPLET%%@dirrm share/gnome/help/seahorse-applet
 @dirrm share/gnome/help/seahorse
-%%APPLET%%@dirrm share/gnome/omf/seahorse-applet
-@dirrm share/gnome/omf/seahorse
-@dirrm share/gnome/seahorse/glade
-@dirrm share/gnome/seahorse
 @dirrm lib/seahorse
 %%EPHY%%@dirrmtry lib/epiphany/%%EPHY_VERSION%%/extensions
 %%EPHY%%@dirrmtry lib/epiphany/%%EPHY_VERSION%%
@@ -294,12 +353,22 @@ share/locale/zh_TW/LC_MESSAGES/seahorse.mo
 @dirrm include/libcryptui
 @exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
 @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/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
+@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/locale/be@latin/LC_MESSAGES
+@dirrmtry share/locale/be@latin
+@dirrmtry share/applications
diff --git a/sysutils/battfink/Makefile b/sysutils/battfink/Makefile
index 833ffa3e396a..e224a2593e86 100644
--- a/sysutils/battfink/Makefile
+++ b/sysutils/battfink/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	battfink
 PORTVERSION=	0.6.2
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/0.6
diff --git a/sysutils/battfink/pkg-plist b/sysutils/battfink/pkg-plist
index dc47c075ce7f..305b5f733daf 100644
--- a/sysutils/battfink/pkg-plist
+++ b/sysutils/battfink/pkg-plist
@@ -1,16 +1,16 @@
 bin/battfink
 libdata/bonobo/servers/GNOME_Battfink.server
-share/gnome/battfink/battfink.glade
-share/gnome/battfink/help/C/battfink.xml
-share/gnome/battfink/help/C/legal.xml
-share/gnome/battfink/icons/battfink-100.png
-share/gnome/battfink/icons/battfink-25.png
-share/gnome/battfink/icons/battfink-50.png
-share/gnome/battfink/icons/battfink-75.png
-share/gnome/battfink/icons/battfink-charge.png
-share/gnome/control-center-2.0/capplets/battfink-preferences.desktop
-share/gnome/omf/battfink/battfink-C.omf
-share/gnome/pixmaps/battfink.png
+share/battfink/battfink.glade
+share/battfink/help/C/battfink.xml
+share/battfink/help/C/legal.xml
+share/battfink/icons/battfink-100.png
+share/battfink/icons/battfink-25.png
+share/battfink/icons/battfink-50.png
+share/battfink/icons/battfink-75.png
+share/battfink/icons/battfink-charge.png
+share/control-center-2.0/capplets/battfink-preferences.desktop
+share/omf/battfink/battfink-C.omf
+share/pixmaps/battfink.png
 share/locale/az/LC_MESSAGES/battfink-0.1.mo
 share/locale/da/LC_MESSAGES/battfink-0.1.mo
 share/locale/de/LC_MESSAGES/battfink-0.1.mo
@@ -32,8 +32,8 @@ share/locale/sr@Latn/LC_MESSAGES/battfink-0.1.mo
 share/locale/sv/LC_MESSAGES/battfink-0.1.mo
 share/locale/zh_CN/LC_MESSAGES/battfink-0.1.mo
 share/locale/zh_TW/LC_MESSAGES/battfink-0.1.mo
-@dirrm share/gnome/omf/battfink
-@dirrm share/gnome/battfink/icons
-@dirrm share/gnome/battfink/help/C
-@dirrm share/gnome/battfink/help
-@dirrm share/gnome/battfink
+@dirrm share/omf/battfink
+@dirrm share/battfink/icons
+@dirrm share/battfink/help/C
+@dirrm share/battfink/help
+@dirrm share/battfink
diff --git a/sysutils/brasero/Makefile b/sysutils/brasero/Makefile
index e3f9ad6d43c1..67f5712f49b0 100644
--- a/sysutils/brasero/Makefile
+++ b/sysutils/brasero/Makefile
@@ -3,11 +3,11 @@
 # Whom:			Michael Johnson <ahze@FreeBSD.org>
 #
 # $FreeBSD$
-#    $MCom: ports/sysutils/brasero/Makefile,v 1.15 2007/03/04 22:46:49 ahze Exp $
+#    $MCom: ports/sysutils/brasero/Makefile,v 1.18 2007/10/21 02:19:44 mezz Exp $
 
 PORTNAME=	brasero
 PORTVERSION=	0.5.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	sysutils audio multimedia gnome
 MASTER_SITES=	SOURCEFORGE
 MASTER_SITE_SUBDIR=	bonfire
@@ -16,7 +16,9 @@ MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	CD/DVD mastering tool for the GNOME desktop
 
 LIB_DEPENDS=	notify.1:${PORTSDIR}/devel/libnotify \
-		totem-plparser.1:${PORTSDIR}/multimedia/totem
+		totem-plparser.7:${PORTSDIR}/multimedia/totem
+
+IGNORE=	does not build and broke in runtime if you fix the build anyway
 
 USE_GETTEXT=	yes
 USE_BZIP2=	yes
diff --git a/sysutils/bubblemon2/Makefile b/sysutils/bubblemon2/Makefile
index d53fe60a7ecf..7f830bba7d35 100644
--- a/sysutils/bubblemon2/Makefile
+++ b/sysutils/bubblemon2/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	bubblemon2
 PORTVERSION=	2.0.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_SAVANNAH}
 MASTER_SITE_SUBDIR=	bubblemon
diff --git a/sysutils/bubblemon2/pkg-plist b/sysutils/bubblemon2/pkg-plist
index 8f14b612d8ec..fdf788882a91 100644
--- a/sysutils/bubblemon2/pkg-plist
+++ b/sysutils/bubblemon2/pkg-plist
@@ -8,8 +8,8 @@ libexec/bubblemon-gnome2
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/TODO
-share/gnome/gnome-2.0/ui/GNOME_BubblemonApplet.xml
-share/gnome/pixmaps/bubblemon.png
+share/gnome-2.0/ui/GNOME_BubblemonApplet.xml
+share/pixmaps/bubblemon.png
 share/locale/ca/LC_MESSAGES/bubblemon.mo
 share/locale/da/LC_MESSAGES/bubblemon.mo
 share/locale/de/LC_MESSAGES/bubblemon.mo
diff --git a/sysutils/cdrdao/Makefile b/sysutils/cdrdao/Makefile
index 8c1bea2c1a81..0b23368bf615 100644
--- a/sysutils/cdrdao/Makefile
+++ b/sysutils/cdrdao/Makefile
@@ -103,7 +103,7 @@ post-patch:
 		's|(SET_CDRDAO_PATH.+path=)(cdrdao)|\1${LOCALBASE}\/bin\/\2|g' \
 		${WRKSRC}/xdao/Settings.cc
 	@${REINPLACE_CMD} -E -e \
-		's|(icon-filename=).+(gcdmaster-doc.png)|\1${LOCALBASE}\/share\/gnome\/pixmaps\/document-icons\/\2|g' \
+		's|(icon-filename=).+(gcdmaster-doc.png)|\1${LOCALBASE}\/share\/pixmaps\/document-icons\/\2|g' \
 		${WRKSRC}/xdao/gcdmaster.keys
 .else
 .for i in cdrdao.man main.cc
@@ -119,17 +119,17 @@ do-install:
 	@${INSTALL_MAN} ${WRKSRC}/xdao/gcdmaster.man \
 		${PREFIX}/man/man1/gcdmaster.1
 	@${INSTALL_DATA} ${WRKSRC}/xdao/gcdmaster-doc.png \
-		${LOCALBASE}/share/gnome/pixmaps/document-icons
+		${LOCALBASE}/share/pixmaps/document-icons
 	@${INSTALL_DATA} ${WRKSRC}/xdao/gcdmaster.applications \
-		${LOCALBASE}/share/gnome/application-registry
+		${LOCALBASE}/share/application-registry
 	@${INSTALL_DATA} ${WRKSRC}/xdao/gcdmaster.desktop \
-		${LOCALBASE}/share/gnome/applications
+		${LOCALBASE}/share/applications
 	@${INSTALL_DATA} ${WRKSRC}/xdao/gcdmaster.keys \
-		${LOCALBASE}/share/gnome/mime-info
+		${LOCALBASE}/share/mime-info
 	@${INSTALL_DATA} ${WRKSRC}/xdao/gcdmaster.mime \
-		${LOCALBASE}/share/gnome/mime-info
+		${LOCALBASE}/share/mime-info
 	@${INSTALL_DATA} ${WRKSRC}/xdao/gcdmaster.png \
-		${LOCALBASE}/share/gnome/pixmaps
+		${LOCALBASE}/share/pixmaps
 	@${INSTALL_DATA} ${WRKSRC}/xdao/gcdmaster.xml \
 		${LOCALBASE}/share/mime/packages
 	@${MKDIR} ${DATADIR}
diff --git a/sysutils/cog/Makefile b/sysutils/cog/Makefile
index 41079a0d1d48..8aaa1337ea00 100644
--- a/sysutils/cog/Makefile
+++ b/sysutils/cog/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	cog
 PORTVERSION=	0.8.0
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	http://www.krakoa.dk/progs/cog/
 
diff --git a/sysutils/cog/files/patch-configure b/sysutils/cog/files/patch-configure
deleted file mode 100644
index 75bc96493710..000000000000
--- a/sysutils/cog/files/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig	Sat May  1 18:43:53 2004
-+++ configure	Sat May  1 18:44:08 2004
-@@ -5228,7 +5228,7 @@
-   cog_prefix="${prefix}"
- fi
- cog_version="${VERSION}"
--cog_datadir="${cog_prefix}/share/cog/${cog_version}"
-+cog_datadir="${cog_prefix}/share/gnome/cog/${cog_version}"
- cog_gladedir="${cog_datadir}/glade"
- 
- 
diff --git a/sysutils/cog/pkg-plist b/sysutils/cog/pkg-plist
index fa9adb3e4df4..89c64a47df74 100644
--- a/sysutils/cog/pkg-plist
+++ b/sysutils/cog/pkg-plist
@@ -1,8 +1,9 @@
 bin/cog
-share/gnome/applications/cog.desktop
-share/gnome/cog/%%VERSION%%/glade/cog.glade
-share/gnome/pixmaps/cog-icon-2-48x48.png
+share/applications/cog.desktop
+share/cog/%%VERSION%%/glade/cog.glade
+share/pixmaps/cog-icon-2-48x48.png
 share/locale/fr/LC_MESSAGES/cog.mo
-@dirrm share/gnome/cog/%%VERSION%%/glade
-@dirrm share/gnome/cog/%%VERSION%%
-@dirrm share/gnome/cog
+@dirrm share/cog/%%VERSION%%/glade
+@dirrm share/cog/%%VERSION%%
+@dirrm share/cog
+@dirrmtry share/applications
diff --git a/sysutils/eiciel/Makefile b/sysutils/eiciel/Makefile
index 6743d1fce66d..ae781ce26080 100644
--- a/sysutils/eiciel/Makefile
+++ b/sysutils/eiciel/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	eiciel
 PORTVERSION=	0.9.4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	sysutils security
 MASTER_SITES=	http://rofi.pinchito.com/eiciel/download/
 
diff --git a/sysutils/eiciel/pkg-plist b/sysutils/eiciel/pkg-plist
index fa51b6f52794..69d6e514d8d4 100644
--- a/sysutils/eiciel/pkg-plist
+++ b/sysutils/eiciel/pkg-plist
@@ -2,50 +2,51 @@ bin/eiciel
 lib/nautilus/extensions-1.0/libeiciel-nautilus.a
 lib/nautilus/extensions-1.0/libeiciel-nautilus.la
 lib/nautilus/extensions-1.0/libeiciel-nautilus.so
-share/gnome/applications/eiciel.desktop
-share/gnome/eiciel/doc/C/eiciel.xml
-share/gnome/eiciel/doc/C/figures/altres-default.png
-share/gnome/eiciel/doc/C/figures/altres.png
-share/gnome/eiciel/doc/C/figures/detall_mascara.png
-share/gnome/eiciel/doc/C/figures/entrada_acl.png
-share/gnome/eiciel/doc/C/figures/grup-acl-default.png
-share/gnome/eiciel/doc/C/figures/grup-acl.png
-share/gnome/eiciel/doc/C/figures/grup-default.png
-share/gnome/eiciel/doc/C/figures/grup.png
-share/gnome/eiciel/doc/C/figures/mascara-default.png
-share/gnome/eiciel/doc/C/figures/mascara.png
-share/gnome/eiciel/doc/C/figures/obrir_fitxer.png
-share/gnome/eiciel/doc/C/figures/obrir_fitxer_nautilus.png
-share/gnome/eiciel/doc/C/figures/pantalla_ea.png
-share/gnome/eiciel/doc/C/figures/permisos_acl.png
-share/gnome/eiciel/doc/C/figures/permisos_ugo.png
-share/gnome/eiciel/doc/C/figures/usuari-acl-default.png
-share/gnome/eiciel/doc/C/figures/usuari-acl.png
-share/gnome/eiciel/doc/C/figures/usuari-default.png
-share/gnome/eiciel/doc/C/figures/usuari.png
-share/gnome/eiciel/img/altres-default.png
-share/gnome/eiciel/img/altres.png
-share/gnome/eiciel/img/grup-acl-default.png
-share/gnome/eiciel/img/grup-acl.png
-share/gnome/eiciel/img/grup-default.png
-share/gnome/eiciel/img/grup.png
-share/gnome/eiciel/img/icona_eiciel_16.png
-share/gnome/eiciel/img/icona_eiciel_24.png
-share/gnome/eiciel/img/icona_eiciel_32.png
-share/gnome/eiciel/img/icona_eiciel_48.png
-share/gnome/eiciel/img/icona_eiciel_64.png
-share/gnome/eiciel/img/mascara-default.png
-share/gnome/eiciel/img/mascara.png
-share/gnome/eiciel/img/usuari-acl-default.png
-share/gnome/eiciel/img/usuari-acl.png
-share/gnome/eiciel/img/usuari-default.png
-share/gnome/eiciel/img/usuari.png
+share/applications/eiciel.desktop
+share/eiciel/doc/C/eiciel.xml
+share/eiciel/doc/C/figures/altres-default.png
+share/eiciel/doc/C/figures/altres.png
+share/eiciel/doc/C/figures/detall_mascara.png
+share/eiciel/doc/C/figures/entrada_acl.png
+share/eiciel/doc/C/figures/grup-acl-default.png
+share/eiciel/doc/C/figures/grup-acl.png
+share/eiciel/doc/C/figures/grup-default.png
+share/eiciel/doc/C/figures/grup.png
+share/eiciel/doc/C/figures/mascara-default.png
+share/eiciel/doc/C/figures/mascara.png
+share/eiciel/doc/C/figures/obrir_fitxer.png
+share/eiciel/doc/C/figures/obrir_fitxer_nautilus.png
+share/eiciel/doc/C/figures/pantalla_ea.png
+share/eiciel/doc/C/figures/permisos_acl.png
+share/eiciel/doc/C/figures/permisos_ugo.png
+share/eiciel/doc/C/figures/usuari-acl-default.png
+share/eiciel/doc/C/figures/usuari-acl.png
+share/eiciel/doc/C/figures/usuari-default.png
+share/eiciel/doc/C/figures/usuari.png
+share/eiciel/img/altres-default.png
+share/eiciel/img/altres.png
+share/eiciel/img/grup-acl-default.png
+share/eiciel/img/grup-acl.png
+share/eiciel/img/grup-default.png
+share/eiciel/img/grup.png
+share/eiciel/img/icona_eiciel_16.png
+share/eiciel/img/icona_eiciel_24.png
+share/eiciel/img/icona_eiciel_32.png
+share/eiciel/img/icona_eiciel_48.png
+share/eiciel/img/icona_eiciel_64.png
+share/eiciel/img/mascara-default.png
+share/eiciel/img/mascara.png
+share/eiciel/img/usuari-acl-default.png
+share/eiciel/img/usuari-acl.png
+share/eiciel/img/usuari-default.png
+share/eiciel/img/usuari.png
 %%NLS%%share/locale/ca/LC_MESSAGES/eiciel.mo
 %%NLS%%share/locale/de/LC_MESSAGES/eiciel.mo
 %%NLS%%share/locale/es/LC_MESSAGES/eiciel.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/eiciel.mo
-@dirrm share/gnome/eiciel/img
-@dirrm share/gnome/eiciel/doc/C/figures
-@dirrm share/gnome/eiciel/doc/C
-@dirrm share/gnome/eiciel/doc
-@dirrm share/gnome/eiciel
+@dirrm share/eiciel/img
+@dirrm share/eiciel/doc/C/figures
+@dirrm share/eiciel/doc/C
+@dirrm share/eiciel/doc
+@dirrm share/eiciel
+@dirrmtry share/applications
diff --git a/sysutils/gai-leds/Makefile b/sysutils/gai-leds/Makefile
index 84f4c3a8932d..bb0c840f7d78 100644
--- a/sysutils/gai-leds/Makefile
+++ b/sysutils/gai-leds/Makefile
@@ -3,9 +3,11 @@
 # Whom:					Douglas Thrift <douglas@douglasthrift.net>
 #
 # $FreeBSD$
+#
 
 PORTNAME=	gai-leds
 PORTVERSION=	0.6
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	gai
@@ -23,14 +25,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/sysutils/gai-leds/pkg-plist b/sysutils/gai-leds/pkg-plist
index afea9f53d7d0..a56628e19a98 100644
--- a/sysutils/gai-leds/pkg-plist
+++ b/sysutils/gai-leds/pkg-plist
@@ -1,12 +1,12 @@
 bin/gai-leds
 libdata/bonobo/servers/GNOME_gai-ledsApplet.server
-share/gnome/pixmaps/gai-leds-icon.png
-share/gnome/pixmaps/gai-leds/capslock_off.png
-share/gnome/pixmaps/gai-leds/capslock_on.png
-share/gnome/pixmaps/gai-leds/ledsbg_horz.png
-share/gnome/pixmaps/gai-leds/ledsbg_vert.png
-share/gnome/pixmaps/gai-leds/numlock_off.png
-share/gnome/pixmaps/gai-leds/numlock_on.png
-share/gnome/pixmaps/gai-leds/scrollock_off.png
-share/gnome/pixmaps/gai-leds/scrollock_on.png
-@dirrm share/gnome/pixmaps/gai-leds
+share/pixmaps/gai-leds-icon.png
+share/pixmaps/gai-leds/capslock_off.png
+share/pixmaps/gai-leds/capslock_on.png
+share/pixmaps/gai-leds/ledsbg_horz.png
+share/pixmaps/gai-leds/ledsbg_vert.png
+share/pixmaps/gai-leds/numlock_off.png
+share/pixmaps/gai-leds/numlock_on.png
+share/pixmaps/gai-leds/scrollock_off.png
+share/pixmaps/gai-leds/scrollock_on.png
+@dirrm share/pixmaps/gai-leds
diff --git a/sysutils/gcdmaster/Makefile b/sysutils/gcdmaster/Makefile
index 1f37a98e5b12..cfd05499582f 100644
--- a/sysutils/gcdmaster/Makefile
+++ b/sysutils/gcdmaster/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gcdmaster
-PORTREVISION=	0
+PORTREVISION=	1
 
 COMMENT=	GNOME frontend for cdrdao
 
diff --git a/sysutils/gcdmaster/pkg-plist b/sysutils/gcdmaster/pkg-plist
index acf062b72b5e..5c7e16737e65 100644
--- a/sysutils/gcdmaster/pkg-plist
+++ b/sysutils/gcdmaster/pkg-plist
@@ -1,12 +1,13 @@
 bin/gcdmaster
 %%DATADIR%%/ProjectChooser.glade
-share/gnome/application-registry/gcdmaster.applications
-share/gnome/applications/gcdmaster.desktop
-share/gnome/mime-info/gcdmaster.keys
-share/gnome/mime-info/gcdmaster.mime
-share/gnome/pixmaps/document-icons/gcdmaster-doc.png
-share/gnome/pixmaps/gcdmaster.png
+share/application-registry/gcdmaster.applications
+share/applications/gcdmaster.desktop
+share/mime-info/gcdmaster.keys
+share/mime-info/gcdmaster.mime
+share/pixmaps/document-icons/gcdmaster-doc.png
+share/pixmaps/gcdmaster.png
 share/mime/packages/gcdmaster.xml
 @dirrm %%DATADIR%%
 @exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
 @unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
+@dirrmtry share/applications
diff --git a/sysutils/gconf-editor/Makefile b/sysutils/gconf-editor/Makefile
index 597460eee0b9..aca189afa042 100644
--- a/sysutils/gconf-editor/Makefile
+++ b/sysutils/gconf-editor/Makefile
@@ -3,11 +3,11 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/sysutils/gconf-editor/Makefile,v 1.59 2007/03/13 12:30:40 ahze Exp $
+#   $MCom: ports/sysutils/gconf-editor/Makefile,v 1.66 2007/09/18 01:30:46 ahze Exp $
 #
 
 PORTNAME=	gconf-editor
-PORTVERSION=	2.18.2
+PORTVERSION=	2.20.0
 PORTEPOCH=	1
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
diff --git a/sysutils/gconf-editor/distinfo b/sysutils/gconf-editor/distinfo
index 07a2c866e75c..cbe4c5480452 100644
--- a/sysutils/gconf-editor/distinfo
+++ b/sysutils/gconf-editor/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gconf-editor-2.18.2.tar.bz2) = e40f51b3cb2809b882c29d45b71657bd
-SHA256 (gnome2/gconf-editor-2.18.2.tar.bz2) = e6c07528a1f770c9848550d8f101940f52d40bdf616754e4eba93af1079ef6d6
-SIZE (gnome2/gconf-editor-2.18.2.tar.bz2) = 922748
+MD5 (gnome2/gconf-editor-2.20.0.tar.bz2) = b686677878b5754ffa8d0a2cc1129988
+SHA256 (gnome2/gconf-editor-2.20.0.tar.bz2) = 10b5043c4152cf5d33b138c516c10708005212ee150ea8dc6c7dc396ac27a79a
+SIZE (gnome2/gconf-editor-2.20.0.tar.bz2) = 892603
diff --git a/sysutils/gconf-editor/pkg-plist b/sysutils/gconf-editor/pkg-plist
index 6ba0118b5107..6df1d36571f4 100644
--- a/sysutils/gconf-editor/pkg-plist
+++ b/sysutils/gconf-editor/pkg-plist
@@ -1,5 +1,5 @@
 bin/gconf-editor
-share/gnome/applications/gconf-editor.desktop
+share/applications/gconf-editor.desktop
 share/gnome/help/gconf-editor/C/figures/gconf_editor_anno_window.png
 share/gnome/help/gconf-editor/C/gconf-editor.xml
 share/gnome/help/gconf-editor/C/legal.xml
@@ -17,25 +17,26 @@ share/gnome/help/gconf-editor/sv/figures/gconf_editor_anno_window.png
 share/gnome/help/gconf-editor/sv/gconf-editor.xml
 share/gnome/help/gconf-editor/uk/figures/gconf_editor_anno_window.png
 share/gnome/help/gconf-editor/uk/gconf-editor.xml
-share/gnome/omf/gconf-editor/gconf-editor-C.omf
-share/gnome/omf/gconf-editor/gconf-editor-de.omf
-share/gnome/omf/gconf-editor/gconf-editor-es.omf
-share/gnome/omf/gconf-editor/gconf-editor-fr.omf
-share/gnome/omf/gconf-editor/gconf-editor-it.omf
-share/gnome/omf/gconf-editor/gconf-editor-oc.omf
-share/gnome/omf/gconf-editor/gconf-editor-sv.omf
-share/gnome/omf/gconf-editor/gconf-editor-uk.omf
-share/gnome/pixmaps/gconf-editor/entry-blank.png
-share/gnome/pixmaps/gconf-editor/entry-bool.png
-share/gnome/pixmaps/gconf-editor/entry-list.png
-share/gnome/pixmaps/gconf-editor/entry-number.png
-share/gnome/pixmaps/gconf-editor/entry-schema.png
-share/gnome/pixmaps/gconf-editor/entry-string.png
-share/gnome/pixmaps/gconf-editor/folder-closed.png
-share/gnome/pixmaps/gconf-editor/folder-open.png
+share/omf/gconf-editor/gconf-editor-C.omf
+share/omf/gconf-editor/gconf-editor-de.omf
+share/omf/gconf-editor/gconf-editor-es.omf
+share/omf/gconf-editor/gconf-editor-fr.omf
+share/omf/gconf-editor/gconf-editor-it.omf
+share/omf/gconf-editor/gconf-editor-oc.omf
+share/omf/gconf-editor/gconf-editor-sv.omf
+share/omf/gconf-editor/gconf-editor-uk.omf
+share/pixmaps/gconf-editor/entry-blank.png
+share/pixmaps/gconf-editor/entry-bool.png
+share/pixmaps/gconf-editor/entry-list.png
+share/pixmaps/gconf-editor/entry-number.png
+share/pixmaps/gconf-editor/entry-schema.png
+share/pixmaps/gconf-editor/entry-string.png
+share/pixmaps/gconf-editor/folder-closed.png
+share/pixmaps/gconf-editor/folder-open.png
 share/icons/hicolor/48x48/apps/gconf-editor.png
 share/locale/am/LC_MESSAGES/gconf-editor.mo
 share/locale/ar/LC_MESSAGES/gconf-editor.mo
+share/locale/as/LC_MESSAGES/gconf-editor.mo
 share/locale/az/LC_MESSAGES/gconf-editor.mo
 share/locale/be/LC_MESSAGES/gconf-editor.mo
 share/locale/be@latin/LC_MESSAGES/gconf-editor.mo
@@ -112,8 +113,8 @@ share/locale/xh/LC_MESSAGES/gconf-editor.mo
 share/locale/zh_CN/LC_MESSAGES/gconf-editor.mo
 share/locale/zh_HK/LC_MESSAGES/gconf-editor.mo
 share/locale/zh_TW/LC_MESSAGES/gconf-editor.mo
-@dirrm share/gnome/pixmaps/gconf-editor
-@dirrm share/gnome/omf/gconf-editor
+@dirrm share/pixmaps/gconf-editor
+@dirrm share/omf/gconf-editor
 @dirrm share/gnome/help/gconf-editor/uk/figures
 @dirrm share/gnome/help/gconf-editor/uk
 @dirrm share/gnome/help/gconf-editor/sv/figures
@@ -157,3 +158,6 @@ share/locale/zh_TW/LC_MESSAGES/gconf-editor.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
+@dirrmtry share/applications
diff --git a/sysutils/gdmap/Makefile b/sysutils/gdmap/Makefile
index dbcbf2ee5b9c..6a979c052194 100644
--- a/sysutils/gdmap/Makefile
+++ b/sysutils/gdmap/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gdmap
 PORTVERSION=	0.7.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	gdmap
@@ -28,5 +28,7 @@ MAN1=	gdmap.1
 post-patch:
 	@${REINPLACE_CMD} -e 's,<sys/vfs.h>,<sys/statvfs.h>,' \
 		${WRKSRC}/src/gui_main.c
+	@${REINPLACE_CMD} -e 's|-D.*_DISABLE_DEPRECATED||g' \
+		${WRKSRC}/configure
 
 .include <bsd.port.mk>
diff --git a/sysutils/gdmap/pkg-plist b/sysutils/gdmap/pkg-plist
index c2e9d5f979a2..57456bbb70d0 100644
--- a/sysutils/gdmap/pkg-plist
+++ b/sysutils/gdmap/pkg-plist
@@ -1,6 +1,7 @@
 bin/gdmap
-share/gnome/applications/gdmap.desktop
-share/gnome/gdmap/pixmaps/gdmap_icon.png
-share/gnome/pixmaps/gdmap_icon.png
-@dirrm share/gnome/gdmap/pixmaps
-@dirrm share/gnome/gdmap
+share/applications/gdmap.desktop
+share/gdmap/pixmaps/gdmap_icon.png
+share/pixmaps/gdmap_icon.png
+@dirrm share/gdmap/pixmaps
+@dirrm share/gdmap
+@dirrmtry share/applications
diff --git a/sysutils/gfslicer/Makefile b/sysutils/gfslicer/Makefile
index 5393ada32554..74adec688e63 100644
--- a/sysutils/gfslicer/Makefile
+++ b/sysutils/gfslicer/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gfslicer
 PORTVERSION=	1.5.4
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_DEBIAN_POOL}
 DISTNAME=	${PORTNAME}_${PORTVERSION}.orig
diff --git a/sysutils/gfslicer/pkg-plist b/sysutils/gfslicer/pkg-plist
index 22b449f47b46..bb2cd94e687a 100644
--- a/sysutils/gfslicer/pkg-plist
+++ b/sysutils/gfslicer/pkg-plist
@@ -1,7 +1,7 @@
 bin/gfslicer
-share/gnome/pixmaps/gfslicer/deslice.xpm
-share/gnome/pixmaps/gfslicer/pref.xpm
-share/gnome/pixmaps/gfslicer/slice.xpm
-share/gnome/pixmaps/gfslicer/tar.xpm
-share/gnome/pixmaps/gfslicer/untar.xpm
-@dirrm share/gnome/pixmaps/gfslicer
+share/pixmaps/gfslicer/deslice.xpm
+share/pixmaps/gfslicer/pref.xpm
+share/pixmaps/gfslicer/slice.xpm
+share/pixmaps/gfslicer/tar.xpm
+share/pixmaps/gfslicer/untar.xpm
+@dirrm share/pixmaps/gfslicer
diff --git a/sysutils/gksu/Makefile b/sysutils/gksu/Makefile
index 3eaddd603412..6d9ec981b999 100644
--- a/sysutils/gksu/Makefile
+++ b/sysutils/gksu/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gksu
 PORTVERSION=	1.3.7
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils
 MASTER_SITES=	http://people.debian.org/~kov/gksu/old_stuff/gksu/
 
diff --git a/sysutils/gksu/pkg-plist b/sysutils/gksu/pkg-plist
index 153f085576cd..deca7847d06b 100644
--- a/sysutils/gksu/pkg-plist
+++ b/sysutils/gksu/pkg-plist
@@ -1,11 +1,11 @@
 bin/gksu
 bin/gksudo
 bin/gksuexec
-share/gnome/applications/gksu.desktop
-share/gnome/applications/gksuexec.desktop
-share/gnome/pixmaps/gksu-icon.png
-share/gnome/pixmaps/gksu-root-terminal.png
-share/gnome/gksu/gksu-migrate-conf.sh
+share/applications/gksu.desktop
+share/applications/gksuexec.desktop
+share/pixmaps/gksu-icon.png
+share/pixmaps/gksu-root-terminal.png
+share/gksu/gksu-migrate-conf.sh
 share/locale/ca/LC_MESSAGES/gksu.mo
 share/locale/da/LC_MESSAGES/gksu.mo
 share/locale/de/LC_MESSAGES/gksu.mo
@@ -24,4 +24,5 @@ share/locale/pt/LC_MESSAGES/gksu.mo
 share/locale/ro/LC_MESSAGES/gksu.mo
 share/locale/sk/LC_MESSAGES/gksu.mo
 share/locale/xh/LC_MESSAGES/gksu.mo
-@dirrm share/gnome/gksu
+@dirrm share/gksu
+@dirrmtry share/applications
diff --git a/sysutils/gnome-control-center/Makefile b/sysutils/gnome-control-center/Makefile
index 636231b55fb9..66fbc75c298d 100644
--- a/sysutils/gnome-control-center/Makefile
+++ b/sysutils/gnome-control-center/Makefile
@@ -3,16 +3,14 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/sysutils/gnome-control-center/Makefile,v 1.132 2007/03/12 22:05:56 marcus Exp $
+#   $MCom: ports/sysutils/gnome-control-center/Makefile,v 1.157 2007/10/15 17:48:45 mezz Exp $
 #
 
 PORTNAME=	gnome-control-center
-PORTVERSION=	2.18.1
-PORTREVISION=	1
+PORTVERSION=	2.20.1
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/control-center/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
-DISTNAME=	control-center-${PORTVERSION}
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
@@ -34,8 +32,8 @@ INSTALLS_OMF=	yes
 INSTALLS_ICONS=	yes
 USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--enable-gstreamer=0.10
-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=	apps_gnome_settings_daemon_default_editor.schemas \
 		apps_gnome_settings_daemon_keybindings.schemas \
@@ -61,11 +59,8 @@ PLIST_SUB+=	ABOUTME="@comment "
 .endif
 
 post-patch:
-	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
-		's|[{]prefix[}]/share/pixmaps|{datadir}/pixmaps|g'
-	@${REINPLACE_CMD} -e 's|/bin/tar|/usr/bin/tar|g ; \
-		s|/bin/gzip|/usr/bin/gzip|g' \
-		${WRKSRC}/capplets/theme-switcher/gnome-theme-installer.c
+	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \
+	    	${WRKSRC}/capplets/common/gnome-theme-info.c
 
 post-install:
 	@-update-desktop-database
diff --git a/sysutils/gnome-control-center/distinfo b/sysutils/gnome-control-center/distinfo
index 93f3920035fa..8d9a2d632d89 100644
--- a/sysutils/gnome-control-center/distinfo
+++ b/sysutils/gnome-control-center/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/control-center-2.18.1.tar.bz2) = bae0fd0f9e32f374bd7236d98788b13f
-SHA256 (gnome2/control-center-2.18.1.tar.bz2) = 3bb1474a6914d5a210a6f21368c48c9c302918a4ab94a5282b84b57ebc432c87
-SIZE (gnome2/control-center-2.18.1.tar.bz2) = 2150134
+MD5 (gnome2/gnome-control-center-2.20.1.tar.bz2) = d7420f0fc28937573a13bc5c1633b23b
+SHA256 (gnome2/gnome-control-center-2.20.1.tar.bz2) = 631d7621584a27a0edc43f05c6e2b45d6c44c1bc570abaa155472ca9b321d4d0
+SIZE (gnome2/gnome-control-center-2.20.1.tar.bz2) = 2292719
diff --git a/sysutils/gnome-control-center/files/patch-capplets_common_gnome-theme-info.c b/sysutils/gnome-control-center/files/patch-capplets_common_gnome-theme-info.c
new file mode 100644
index 000000000000..5f5eb4bc15a5
--- /dev/null
+++ b/sysutils/gnome-control-center/files/patch-capplets_common_gnome-theme-info.c
@@ -0,0 +1,20 @@
+--- capplets/common/gnome-theme-info.c.orig	2007-08-27 04:09:06.000000000 -0400
++++ capplets/common/gnome-theme-info.c	2007-09-20 15:24:56.000000000 -0400
+@@ -1845,7 +1845,7 @@ read_cursor_fonts (void)
+     theme_info->thumbnail = gdk_pixbuf_new_from_file (filename, NULL);
+     g_free (filename);
+ 
+-    theme_info->name = g_build_filename (GNOMECC_DATA_DIR, builtins[i][0], NULL);
++    theme_info->name = g_build_filename (INSTALL_PREFIX, "share", builtins[i][0], NULL);
+     theme_info->path = g_strdup (theme_info->name);
+ 
+     if (!strcmp (theme_info->path, cursor_font))
+@@ -1974,7 +1974,7 @@ gnome_theme_init (gboolean *monitor_not_
+   gnome_vfs_uri_unref (top_theme_dir_uri);
+ 
+   /* The weird /usr/share/icons */
+-  top_theme_dir_uri = gnome_vfs_uri_new ("/usr/share/icons");
++  top_theme_dir_uri = gnome_vfs_uri_new ("%%LOCALBASE%%/lib/X11/icons");
+   if (!gnome_vfs_uri_exists (top_theme_dir_uri))
+     gnome_vfs_make_directory_for_uri (top_theme_dir_uri, 0775);
+   result = add_top_icon_theme_dir_monitor (top_theme_dir_uri, &real_monitor_not_added, 2, NULL);
diff --git a/sysutils/gnome-control-center/files/patch-libwindow-settings_gnome-wm-manager.c b/sysutils/gnome-control-center/files/patch-libwindow-settings_gnome-wm-manager.c
deleted file mode 100644
index 95bbf2ea4dab..000000000000
--- a/sysutils/gnome-control-center/files/patch-libwindow-settings_gnome-wm-manager.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- libwindow-settings/gnome-wm-manager.c.orig	Mon Nov 11 00:42:08 2002
-+++ libwindow-settings/gnome-wm-manager.c	Mon Nov 11 00:43:26 2002
-@@ -227,7 +227,7 @@
- 
-         done_scan = TRUE;
-         
--        tempdir = gnome_unconditional_datadir_file ("gnome/wm-properties/");
-+        tempdir = gnome_unconditional_datadir_file ("wm-properties/");
-         scan_wm_directory (tempdir, FALSE);
-         g_free (tempdir);
-         
diff --git a/sysutils/gnome-control-center/pkg-plist b/sysutils/gnome-control-center/pkg-plist
index 45b72866f165..6832272beb97 100644
--- a/sysutils/gnome-control-center/pkg-plist
+++ b/sysutils/gnome-control-center/pkg-plist
@@ -1,22 +1,21 @@
 %%ABOUTME%%bin/gnome-about-me
 bin/gnome-accessibility-keyboard-properties
+bin/gnome-appearance-properties
+bin/gnome-at-mobility
 bin/gnome-at-properties
-bin/gnome-background-properties
+bin/gnome-at-visual
 bin/gnome-control-center
 bin/gnome-default-applications-properties
 bin/gnome-display-properties
-bin/gnome-font-properties
 bin/gnome-font-viewer
 bin/gnome-keybinding-properties
 bin/gnome-keyboard-properties
 bin/gnome-mouse-properties
 bin/gnome-network-preferences
 bin/gnome-sound-properties
-bin/gnome-theme-manager
 bin/gnome-theme-thumbnailer
 bin/gnome-thumbnail-font
 bin/gnome-typing-monitor
-bin/gnome-ui-properties
 bin/gnome-window-properties
 bin/themus-theme-applier
 etc/gnome-vfs-2.0/modules/font-method.conf
@@ -44,95 +43,95 @@ lib/nautilus/extensions-1.0/libnautilus-themus.so
 lib/window-manager-settings/libmetacity.a
 lib/window-manager-settings/libmetacity.la
 lib/window-manager-settings/libmetacity.so
+libdata/pkgconfig/gnome-keybindings.pc
 libdata/pkgconfig/gnome-settings-daemon.pc
 libdata/pkgconfig/gnome-window-settings-2.0.pc
 libexec/gnome-settings-daemon
+share/applications/accessibility-keyboard.desktop
+share/applications/at-properties.desktop
+share/applications/default-applications.desktop
+share/applications/display-properties.desktop
+%%ABOUTME%%share/applications/gnome-about-me.desktop
+share/applications/gnome-appearance-properties.desktop
+share/applications/gnome-font-viewer.desktop
+share/applications/gnome-network-preferences.desktop
+share/applications/gnome-settings-mouse.desktop
+share/applications/gnome-settings-sound.desktop
+share/applications/gnome-theme-installer.desktop
+share/applications/gnomecc.desktop
+share/applications/keybinding.desktop
+share/applications/keyboard.desktop
+share/applications/themus-theme-applier.desktop
+share/applications/window-properties.desktop
 share/dbus-1/services/org.gnome.SettingsDaemon.service
-share/gnome/applications/accessibility-keyboard.desktop
-share/gnome/applications/at-properties.desktop
-share/gnome/applications/background.desktop
-share/gnome/applications/default-applications.desktop
-share/gnome/applications/display-properties.desktop
-share/gnome/applications/font-properties.desktop
-%%ABOUTME%%share/gnome/applications/gnome-about-me.desktop
-share/gnome/applications/gnome-font-viewer.desktop
-share/gnome/applications/gnome-network-preferences.desktop
-share/gnome/applications/gnome-settings-mouse.desktop
-share/gnome/applications/gnome-settings-sound.desktop
-share/gnome/applications/gnome-theme-installer.desktop
-share/gnome/applications/gnome-ui-properties.desktop
-share/gnome/applications/gnomecc.desktop
-share/gnome/applications/gtk-theme-selector.desktop
-share/gnome/applications/keybinding.desktop
-share/gnome/applications/keyboard.desktop
-share/gnome/applications/themus-theme-applier.desktop
-share/gnome/applications/window-properties.desktop
-share/gnome/control-center/glade/acme.glade
-share/gnome/control-center/glade/apply-font.glade
-share/gnome/control-center/glade/at-enable-dialog.glade
-share/gnome/control-center/glade/font-properties.glade
-%%ABOUTME%%share/gnome/control-center/glade/gnome-about-me.glade
-share/gnome/control-center/glade/gnome-accessibility-keyboard-properties.glade
-share/gnome/control-center/glade/gnome-background-properties.glade
-share/gnome/control-center/glade/gnome-default-applications-properties.glade
-share/gnome/control-center/glade/gnome-keybinding-properties.glade
-share/gnome/control-center/glade/gnome-keyboard-properties.glade
-share/gnome/control-center/glade/gnome-mouse-properties.glade
-share/gnome/control-center/glade/gnome-network-preferences.glade
-share/gnome/control-center/glade/gnome-ui-properties.glade
-share/gnome/control-center/glade/gnome-window-properties.glade
-share/gnome/control-center/glade/modmap-dialog.glade
-share/gnome/control-center/glade/sound-properties.glade
-share/gnome/control-center/glade/theme-properties.glade
-share/gnome/control-center/gnome-default-applications.xml
-share/gnome/control-center/icons/display-capplet.png
-share/gnome/control-center/pixmaps/accessibility-keyboard-bouncekey.png
-share/gnome/control-center/pixmaps/accessibility-keyboard-mousekey.png
-share/gnome/control-center/pixmaps/accessibility-keyboard-slowkey.png
-share/gnome/control-center/pixmaps/accessibility-keyboard-stickykey.png
-share/gnome/control-center/pixmaps/accessibility-keyboard-togglekey.png
-share/gnome/control-center/pixmaps/acme-eject.png
-share/gnome/control-center/pixmaps/at-startup.png
-share/gnome/control-center/pixmaps/at-support.png
-share/gnome/control-center/pixmaps/bar-disabled.png
-share/gnome/control-center/pixmaps/bar-green.png
-share/gnome/control-center/pixmaps/bar-red.png
-share/gnome/control-center/pixmaps/bar.png
-share/gnome/control-center/pixmaps/double-click-maybe.png
-share/gnome/control-center/pixmaps/double-click-off.png
-share/gnome/control-center/pixmaps/double-click-on.png
-%%ABOUTME%%share/gnome/control-center/pixmaps/gnome-about-me-lock-open.png
-%%ABOUTME%%share/gnome/control-center/pixmaps/gnome-about-me-lock.png
-share/gnome/control-center/pixmaps/keyboard-bell.png
-share/gnome/control-center/pixmaps/keyboard-cursor.png
-share/gnome/control-center/pixmaps/keyboard-repeat.png
-share/gnome/control-center/pixmaps/keyboard-volume.png
-share/gnome/control-center/pixmaps/mouse-cursor-normal-large.png
-share/gnome/control-center/pixmaps/mouse-cursor-normal.png
-share/gnome/control-center/pixmaps/mouse-cursor-white-large.png
-share/gnome/control-center/pixmaps/mouse-cursor-white.png
-share/gnome/control-center/pixmaps/mouse-left.png
-share/gnome/control-center/pixmaps/mouse-right.png
-share/gnome/control-center/pixmaps/ocean-stripes.png
-share/gnome/control-center/pixmaps/stop.png
-share/gnome/control-center/pixmaps/subpixel-bgr.png
-share/gnome/control-center/pixmaps/subpixel-rgb.png
-share/gnome/control-center/pixmaps/subpixel-vbgr.png
-share/gnome/control-center/pixmaps/subpixel-vrgb.png
-share/gnome/control-center/pixmaps/theme-thumbnailing.png
-share/gnome/control-center/pixmaps/visual-bell.png
-share/gnome/control-center/xrdb/Editres.ad
-share/gnome/control-center/xrdb/Emacs.ad
-share/gnome/control-center/xrdb/General.ad
-share/gnome/control-center/xrdb/Motif.ad
-share/gnome/control-center/xrdb/Tk.ad
-share/gnome/control-center/xrdb/Xaw.ad
+share/desktop-directories/font-method.directory
+share/desktop-directories/gnomecc.directory
+share/desktop-directories/theme-method.directory
+%%DATADIR%%/glade/acme.glade
+%%DATADIR%%/glade/appearance.glade
+%%DATADIR%%/glade/apply-font.glade
+%%DATADIR%%/glade/at-enable-dialog.glade
+%%ABOUTME%%%%DATADIR%%/glade/gnome-about-me.glade
+%%DATADIR%%/glade/gnome-accessibility-keyboard-properties.glade
+%%DATADIR%%/glade/gnome-default-applications-properties.glade
+%%DATADIR%%/glade/gnome-keybinding-properties.glade
+%%DATADIR%%/glade/gnome-keyboard-properties.glade
+%%DATADIR%%/glade/gnome-mouse-properties.glade
+%%DATADIR%%/glade/gnome-network-preferences.glade
+%%DATADIR%%/glade/gnome-window-properties.glade
+%%DATADIR%%/glade/modmap-dialog.glade
+%%DATADIR%%/glade/sound-properties.glade
+%%DATADIR%%/gnome-default-applications.xml
+%%DATADIR%%/keybindings/00-multimedia-key.xml
+%%DATADIR%%/keybindings/01-desktop-key.xml
+%%DATADIR%%/pixmaps/accessibility-keyboard-bouncekey.png
+%%DATADIR%%/pixmaps/accessibility-keyboard-mousekey.png
+%%DATADIR%%/pixmaps/accessibility-keyboard-slowkey.png
+%%DATADIR%%/pixmaps/accessibility-keyboard-stickykey.png
+%%DATADIR%%/pixmaps/accessibility-keyboard-togglekey.png
+%%DATADIR%%/pixmaps/acme-eject.png
+%%DATADIR%%/pixmaps/at-startup.png
+%%DATADIR%%/pixmaps/at-support.png
+%%DATADIR%%/pixmaps/bar-disabled.png
+%%DATADIR%%/pixmaps/bar-green.png
+%%DATADIR%%/pixmaps/bar-red.png
+%%DATADIR%%/pixmaps/bar.png
+%%DATADIR%%/pixmaps/double-click-maybe.png
+%%DATADIR%%/pixmaps/double-click-off.png
+%%DATADIR%%/pixmaps/double-click-on.png
+%%ABOUTME%%%%DATADIR%%/pixmaps/gnome-about-me-lock-open.png
+%%ABOUTME%%%%DATADIR%%/pixmaps/gnome-about-me-lock.png
+%%DATADIR%%/pixmaps/gtk-theme-thumbnailing.png
+%%DATADIR%%/pixmaps/icon-theme-thumbnailing.png
+%%DATADIR%%/pixmaps/keyboard-bell.png
+%%DATADIR%%/pixmaps/keyboard-cursor.png
+%%DATADIR%%/pixmaps/keyboard-repeat.png
+%%DATADIR%%/pixmaps/keyboard-volume.png
+%%DATADIR%%/pixmaps/mouse-cursor-normal-large.png
+%%DATADIR%%/pixmaps/mouse-cursor-normal.png
+%%DATADIR%%/pixmaps/mouse-cursor-white-large.png
+%%DATADIR%%/pixmaps/mouse-cursor-white.png
+%%DATADIR%%/pixmaps/mouse-left.png
+%%DATADIR%%/pixmaps/mouse-right.png
+%%DATADIR%%/pixmaps/ocean-stripes.png
+%%DATADIR%%/pixmaps/stop.png
+%%DATADIR%%/pixmaps/subpixel-bgr.png
+%%DATADIR%%/pixmaps/subpixel-rgb.png
+%%DATADIR%%/pixmaps/subpixel-vbgr.png
+%%DATADIR%%/pixmaps/subpixel-vrgb.png
+%%DATADIR%%/pixmaps/theme-thumbnailing.png
+%%DATADIR%%/pixmaps/visual-bell.png
+%%DATADIR%%/pixmaps/window-theme-thumbnailing.png
+%%DATADIR%%/xrdb/Editres.ad
+%%DATADIR%%/xrdb/Emacs.ad
+%%DATADIR%%/xrdb/General.ad
+%%DATADIR%%/xrdb/Motif.ad
+%%DATADIR%%/xrdb/Tk.ad
+%%DATADIR%%/xrdb/Xaw.ad
+share/gnome/autostart/gnome-at-session.desktop
 share/gnome/cursor-fonts/cursor-large-white.pcf
 share/gnome/cursor-fonts/cursor-large.pcf
 share/gnome/cursor-fonts/cursor-white.pcf
-share/gnome/desktop-directories/font-method.directory
-share/gnome/desktop-directories/gnomecc.directory
-share/gnome/desktop-directories/theme-method.directory
 share/gnome/help/control-center/C/config-accessibility-keyboard.xml
 share/gnome/help/control-center/C/config-background.xml
 share/gnome/help/control-center/C/config-behavior.xml
@@ -148,106 +147,162 @@ share/gnome/help/control-center/C/config-screensaver.xml
 share/gnome/help/control-center/C/config-sound.xml
 share/gnome/help/control-center/C/config-themes.xml
 share/gnome/help/control-center/C/control-center.xml
+share/gnome/help/control-center/ca/control-center.xml
 share/gnome/help/control-center/en_GB/control-center.xml
 share/gnome/help/control-center/es/control-center.xml
 share/gnome/help/control-center/fr/control-center.xml
+share/gnome/help/control-center/ja/control-center.xml
+share/gnome/help/control-center/oc/control-center.xml
 share/gnome/help/control-center/pa/control-center.xml
+share/gnome/help/control-center/pt_BR/control-center.xml
 share/gnome/help/control-center/ru/control-center.xml
 share/gnome/help/control-center/sv/control-center.xml
 share/gnome/help/control-center/uk/control-center.xml
+share/gnome/help/control-center/vi/control-center.xml
 share/gnome/help/control-center/zh_CN/control-center.xml
-share/gnome/omf/control-center/control-center-C.omf
-share/gnome/omf/control-center/control-center-en_GB.omf
-share/gnome/omf/control-center/control-center-es.omf
-share/gnome/omf/control-center/control-center-fr.omf
-share/gnome/omf/control-center/control-center-pa.omf
-share/gnome/omf/control-center/control-center-ru.omf
-share/gnome/omf/control-center/control-center-sv.omf
-share/gnome/omf/control-center/control-center-uk.omf
-share/gnome/omf/control-center/control-center-zh_CN.omf
-share/gnome/pixmaps/display-capplet.png
+share/icons/hicolor/16x16/apps/gnome-display-properties.png
+share/icons/hicolor/16x16/apps/gnome-network-preferences.png
+share/icons/hicolor/16x16/apps/gnome-sound-properties.png
+share/icons/hicolor/22x22/apps/gnome-display-properties.png
+share/icons/hicolor/22x22/apps/gnome-network-preferences.png
+share/icons/hicolor/22x22/apps/gnome-sound-properties.png
+share/icons/hicolor/24x24/apps/gnome-display-properties.png
+share/icons/hicolor/24x24/apps/gnome-network-preferences.png
+share/icons/hicolor/24x24/apps/gnome-sound-properties.png
+share/icons/hicolor/32x32/apps/gnome-display-properties.png
+share/icons/hicolor/32x32/apps/gnome-network-preferences.png
+share/icons/hicolor/32x32/apps/gnome-sound-properties.png
 share/icons/hicolor/48x48/apps/typing-monitor.png
+share/icons/hicolor/scalable/apps/gnome-display-properties.svg
+share/icons/hicolor/scalable/apps/gnome-network-preferences.svg
+share/icons/hicolor/scalable/apps/gnome-sound-properties.svg
 share/icons/hicolor/scalable/apps/typing-monitor.svg
-share/locale/af/LC_MESSAGES/control-center-2.0.mo
-share/locale/am/LC_MESSAGES/control-center-2.0.mo
-share/locale/ar/LC_MESSAGES/control-center-2.0.mo
-share/locale/az/LC_MESSAGES/control-center-2.0.mo
-share/locale/be/LC_MESSAGES/control-center-2.0.mo
-share/locale/bg/LC_MESSAGES/control-center-2.0.mo
-share/locale/bn/LC_MESSAGES/control-center-2.0.mo
-share/locale/bn_IN/LC_MESSAGES/control-center-2.0.mo
-share/locale/br/LC_MESSAGES/control-center-2.0.mo
-share/locale/bs/LC_MESSAGES/control-center-2.0.mo
-share/locale/ca/LC_MESSAGES/control-center-2.0.mo
-share/locale/cs/LC_MESSAGES/control-center-2.0.mo
-share/locale/cy/LC_MESSAGES/control-center-2.0.mo
-share/locale/da/LC_MESSAGES/control-center-2.0.mo
-share/locale/de/LC_MESSAGES/control-center-2.0.mo
-share/locale/dz/LC_MESSAGES/control-center-2.0.mo
-share/locale/el/LC_MESSAGES/control-center-2.0.mo
-share/locale/en_CA/LC_MESSAGES/control-center-2.0.mo
-share/locale/en_GB/LC_MESSAGES/control-center-2.0.mo
-share/locale/es/LC_MESSAGES/control-center-2.0.mo
-share/locale/et/LC_MESSAGES/control-center-2.0.mo
-share/locale/eu/LC_MESSAGES/control-center-2.0.mo
-share/locale/fa/LC_MESSAGES/control-center-2.0.mo
-share/locale/fi/LC_MESSAGES/control-center-2.0.mo
-share/locale/fr/LC_MESSAGES/control-center-2.0.mo
-share/locale/ga/LC_MESSAGES/control-center-2.0.mo
-share/locale/gl/LC_MESSAGES/control-center-2.0.mo
-share/locale/gu/LC_MESSAGES/control-center-2.0.mo
-share/locale/he/LC_MESSAGES/control-center-2.0.mo
-share/locale/hi/LC_MESSAGES/control-center-2.0.mo
-share/locale/hr/LC_MESSAGES/control-center-2.0.mo
-share/locale/hu/LC_MESSAGES/control-center-2.0.mo
-share/locale/id/LC_MESSAGES/control-center-2.0.mo
-share/locale/is/LC_MESSAGES/control-center-2.0.mo
-share/locale/it/LC_MESSAGES/control-center-2.0.mo
-share/locale/ja/LC_MESSAGES/control-center-2.0.mo
-share/locale/ka/LC_MESSAGES/control-center-2.0.mo
-share/locale/ko/LC_MESSAGES/control-center-2.0.mo
-share/locale/ku/LC_MESSAGES/control-center-2.0.mo
-share/locale/lt/LC_MESSAGES/control-center-2.0.mo
-share/locale/lv/LC_MESSAGES/control-center-2.0.mo
-share/locale/mg/LC_MESSAGES/control-center-2.0.mo
-share/locale/mk/LC_MESSAGES/control-center-2.0.mo
-share/locale/ml/LC_MESSAGES/control-center-2.0.mo
-share/locale/mn/LC_MESSAGES/control-center-2.0.mo
-share/locale/mr/LC_MESSAGES/control-center-2.0.mo
-share/locale/ms/LC_MESSAGES/control-center-2.0.mo
-share/locale/nb/LC_MESSAGES/control-center-2.0.mo
-share/locale/ne/LC_MESSAGES/control-center-2.0.mo
-share/locale/nl/LC_MESSAGES/control-center-2.0.mo
-share/locale/nn/LC_MESSAGES/control-center-2.0.mo
-share/locale/nso/LC_MESSAGES/control-center-2.0.mo
-share/locale/or/LC_MESSAGES/control-center-2.0.mo
-share/locale/pa/LC_MESSAGES/control-center-2.0.mo
-share/locale/pl/LC_MESSAGES/control-center-2.0.mo
-share/locale/pt/LC_MESSAGES/control-center-2.0.mo
-share/locale/pt_BR/LC_MESSAGES/control-center-2.0.mo
-share/locale/ro/LC_MESSAGES/control-center-2.0.mo
-share/locale/ru/LC_MESSAGES/control-center-2.0.mo
-share/locale/rw/LC_MESSAGES/control-center-2.0.mo
-share/locale/sk/LC_MESSAGES/control-center-2.0.mo
-share/locale/sl/LC_MESSAGES/control-center-2.0.mo
-share/locale/sq/LC_MESSAGES/control-center-2.0.mo
-share/locale/sr/LC_MESSAGES/control-center-2.0.mo
-share/locale/sr@Latn/LC_MESSAGES/control-center-2.0.mo
-share/locale/sv/LC_MESSAGES/control-center-2.0.mo
-share/locale/ta/LC_MESSAGES/control-center-2.0.mo
-share/locale/te/LC_MESSAGES/control-center-2.0.mo
-share/locale/th/LC_MESSAGES/control-center-2.0.mo
-share/locale/tr/LC_MESSAGES/control-center-2.0.mo
-share/locale/uk/LC_MESSAGES/control-center-2.0.mo
-share/locale/vi/LC_MESSAGES/control-center-2.0.mo
-share/locale/wa/LC_MESSAGES/control-center-2.0.mo
-share/locale/xh/LC_MESSAGES/control-center-2.0.mo
-share/locale/zh_CN/LC_MESSAGES/control-center-2.0.mo
-share/locale/zh_HK/LC_MESSAGES/control-center-2.0.mo
-share/locale/zh_TW/LC_MESSAGES/control-center-2.0.mo
-share/locale/zu/LC_MESSAGES/control-center-2.0.mo
+share/locale/af/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/am/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/ar/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/az/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/be/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/be@latin/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/bg/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/bn/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/bn_IN/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/br/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/bs/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/ca/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/cs/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/cy/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/da/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/de/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/dz/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/el/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/en_CA/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/en_GB/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/es/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/et/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/eu/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/fa/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/fi/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/fr/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/ga/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/gl/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/gu/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/he/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/hi/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/hr/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/hu/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/id/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/is/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/it/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/ja/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/ka/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/ko/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/ku/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/lt/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/lv/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/mg/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/mk/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/ml/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/mn/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/mr/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/ms/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/nb/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/ne/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/nl/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/nn/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/nso/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/oc/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/or/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/pa/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/pl/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/pt/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/pt_BR/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/ro/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/ru/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/rw/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/si/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/sk/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/sl/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/sq/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/sr/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/sr@Latn/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/sv/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/ta/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/te/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/th/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/tr/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/uk/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/vi/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/wa/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/xh/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/zh_CN/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/zh_HK/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/zh_TW/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/zu/LC_MESSAGES/gnome-control-center-2.0.mo
 share/mime/application/x-gnome-theme-package.xml
 share/mime/packages/gnome-theme-package.xml
+share/omf/control-center/control-center-C.omf
+share/omf/control-center/control-center-ca.omf
+share/omf/control-center/control-center-en_GB.omf
+share/omf/control-center/control-center-es.omf
+share/omf/control-center/control-center-fr.omf
+share/omf/control-center/control-center-ja.omf
+share/omf/control-center/control-center-oc.omf
+share/omf/control-center/control-center-pa.omf
+share/omf/control-center/control-center-pt_BR.omf
+share/omf/control-center/control-center-ru.omf
+share/omf/control-center/control-center-sv.omf
+share/omf/control-center/control-center-uk.omf
+share/omf/control-center/control-center-vi.omf
+share/omf/control-center/control-center-zh_CN.omf
+@dirrm share/omf/control-center
+@dirrm share/gnome/help/control-center/zh_CN
+@dirrm share/gnome/help/control-center/vi
+@dirrm share/gnome/help/control-center/uk
+@dirrm share/gnome/help/control-center/sv
+@dirrm share/gnome/help/control-center/ru
+@dirrm share/gnome/help/control-center/pt_BR
+@dirrm share/gnome/help/control-center/pa
+@dirrm share/gnome/help/control-center/oc
+@dirrm share/gnome/help/control-center/ja
+@dirrm share/gnome/help/control-center/fr
+@dirrm share/gnome/help/control-center/es
+@dirrm share/gnome/help/control-center/en_GB
+@dirrm share/gnome/help/control-center/ca
+@dirrm share/gnome/help/control-center/C
+@dirrm share/gnome/help/control-center
+@dirrm share/gnome/cursor-fonts
+@dirrm %%DATADIR%%/xrdb
+@dirrm %%DATADIR%%/pixmaps
+@dirrm %%DATADIR%%/glade
+@dirrmtry share/desktop-directories
+@dirrm lib/window-manager-settings
+@dirrm include/gnome-window-settings-2.0
+@dirrm include/gnome-settings-daemon-2.0/gnome-settings-daemon
+@dirrm include/gnome-settings-daemon-2.0
+@exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
+@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/zu/LC_MESSAGES
 @dirrmtry share/locale/zu
 @dirrmtry share/locale/zh_HK/LC_MESSAGES
@@ -256,8 +311,12 @@ share/mime/packages/gnome-theme-package.xml
 @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/nso/LC_MESSAGES
 @dirrmtry share/locale/nso
 @dirrmtry share/locale/mr/LC_MESSAGES
@@ -270,29 +329,6 @@ share/mime/packages/gnome-theme-package.xml
 @dirrmtry share/locale/dz
 @dirrmtry share/locale/bn_IN/LC_MESSAGES
 @dirrmtry share/locale/bn_IN
-@dirrm share/gnome/omf/control-center
-@dirrm share/gnome/help/control-center/zh_CN
-@dirrm share/gnome/help/control-center/uk
-@dirrm share/gnome/help/control-center/sv
-@dirrm share/gnome/help/control-center/ru
-@dirrm share/gnome/help/control-center/pa
-@dirrm share/gnome/help/control-center/fr
-@dirrm share/gnome/help/control-center/es
-@dirrm share/gnome/help/control-center/en_GB
-@dirrm share/gnome/help/control-center/C
-@dirrm share/gnome/help/control-center
-@dirrmtry share/gnome/gnome-background-properties
-@dirrm share/gnome/desktop-directories
-@dirrm share/gnome/cursor-fonts
-@dirrm share/gnome/control-center/xrdb
-@dirrm share/gnome/control-center/pixmaps
-@dirrmtry share/gnome/control-center/icons
-@dirrm share/gnome/control-center/glade
-@dirrm lib/window-manager-settings
-@dirrm include/gnome-window-settings-2.0
-@dirrm include/gnome-settings-daemon-2.0/gnome-settings-daemon
-@dirrm include/gnome-settings-daemon-2.0
-@exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
-@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/be@latin/LC_MESSAGES
+@dirrmtry share/locale/be@latin
+@dirrmtry share/applications
diff --git a/sysutils/gnome-control-center1/Makefile b/sysutils/gnome-control-center1/Makefile
index 74c2b5687627..00ef992ea785 100644
--- a/sysutils/gnome-control-center1/Makefile
+++ b/sysutils/gnome-control-center1/Makefile
@@ -3,11 +3,12 @@
 # Whom:					Vanilla I. Shu <vanilla@FreeBSD.org>
 #
 # $FreeBSD$
+#   $MCom: ports/sysutils/gnome-control-center1/Makefile,v 1.3 2007/05/30 05:02:04 mezz Exp $
 #
 
 PORTNAME=	gnome-control-center
 PORTVERSION=	1.4.0.5
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/control-center/1.4
@@ -29,4 +30,8 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 
 LATEST_LINK=	gnome-control-center1
 
+post-patch:
+	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \
+		${WRKSRC}/capplets/wm-properties/wm-desktops/WindowMaker.desktop
+
 .include <bsd.port.mk>
diff --git a/sysutils/gnome-control-center1/files/patch-ad b/sysutils/gnome-control-center1/files/patch-ad
deleted file mode 100644
index c27189a35ee9..000000000000
--- a/sysutils/gnome-control-center1/files/patch-ad
+++ /dev/null
@@ -1,11 +0,0 @@
---- capplets/wm-properties/wm-list.c.orig	Tue Mar  2 22:53:29 1999
-+++ capplets/wm-properties/wm-list.c	Tue Mar  2 22:53:52 1999
-@@ -210,7 +210,7 @@
-         gchar *tempdir;
-         gchar *name;
-         
--        tempdir = gnome_unconditional_datadir_file ("gnome/wm-properties/");
-+        tempdir = gnome_unconditional_datadir_file ("wm-properties/");
-         wm_list_read_dir (tempdir, FALSE);
-         g_free (tempdir);
-         
diff --git a/sysutils/gnome-control-center1/files/patch-capplets_file-types_file-types-icon-entry.c b/sysutils/gnome-control-center1/files/patch-capplets_file-types_file-types-icon-entry.c
deleted file mode 100644
index 5b48cd25cb94..000000000000
--- a/sysutils/gnome-control-center1/files/patch-capplets_file-types_file-types-icon-entry.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- capplets/file-types/file-types-icon-entry.c.orig	Sun May  5 16:33:51 2002
-+++ capplets/file-types/file-types-icon-entry.c	Sun May  5 16:34:02 2002
-@@ -424,7 +424,7 @@
- 	result = NULL;
- 	filename = nautilus_mime_type_icon_entry_get_full_filename (NAUTILUS_MIME_ICON_ENTRY (ientry));
- 	if (filename != NULL) {
--		path_parts = g_strsplit (filename, "/share/pixmaps/", 0);
-+		path_parts = g_strsplit (filename, "/share/gnome/pixmaps/", 0);
- 		g_free (filename);
- 
- 		if (path_parts[1] != NULL) {
diff --git a/sysutils/gnome-control-center1/files/patch-ce b/sysutils/gnome-control-center1/files/patch-ce
index b2186ac89c4c..8fbfc41ab86f 100644
--- a/sysutils/gnome-control-center1/files/patch-ce
+++ b/sysutils/gnome-control-center1/files/patch-ce
@@ -5,4 +5,4 @@
  [Window Manager]
  SessionManaged=false
 -ConfigExec=/usr/X11R6/lib/GNUstep/Apps/WPrefs.app/WPrefs
-+ConfigExec=/usr/X11R6/share/GNUstep/Apps/WPrefs.app/WPrefs
++ConfigExec=/usr/local/share/GNUstep/Apps/WPrefs.app/WPrefs
diff --git a/sysutils/gnome-control-center1/files/patch-configure b/sysutils/gnome-control-center1/files/patch-configure
deleted file mode 100644
index 53566354e4ac..000000000000
--- a/sysutils/gnome-control-center1/files/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig	Sun May  5 16:29:53 2002
-+++ configure	Sun May  5 16:30:05 2002
-@@ -9161,7 +9161,7 @@
- 
- 
- cat >> confdefs.h <<EOF
--#define GNOME_ICONDIR "${prefix}/share/pixmaps"
-+#define GNOME_ICONDIR "${datadir}/pixmaps"
- EOF
- 
- 
diff --git a/sysutils/gnome-control-center1/pkg-plist b/sysutils/gnome-control-center1/pkg-plist
index bea2205dc885..16333e629479 100644
--- a/sysutils/gnome-control-center1/pkg-plist
+++ b/sysutils/gnome-control-center1/pkg-plist
@@ -10,6 +10,25 @@ bin/ui-properties
 bin/url-properties
 bin/wm-properties-capplet
 etc/CORBA/servers/gnomecc.gnorba
+share/control-center/.directory
+share/control-center/Desktop/.directory
+share/control-center/Desktop/background-properties.desktop
+share/control-center/Desktop/theme-selector.desktop
+share/control-center/Desktop/wm-properties.desktop
+share/control-center/Documents/.directory
+share/control-center/Documents/default-application-properties.desktop
+share/control-center/Documents/file-types-capplet.desktop
+share/control-center/Documents/url-properties.desktop
+share/control-center/Multimedia/.directory
+share/control-center/Multimedia/sound-properties.desktop
+share/control-center/Peripherals/.directory
+share/control-center/Peripherals/keyboard-properties.desktop
+share/control-center/Peripherals/mouse-properties.desktop
+share/control-center/Session/.directory
+share/control-center/UIOptions/.directory
+share/control-center/UIOptions/application.desktop
+share/control-center/UIOptions/dialogs.desktop
+share/control-center/UIOptions/mdi.desktop
 share/gnome/apps/Settings/Desktop/.directory
 share/gnome/apps/Settings/Desktop/background-properties.desktop
 share/gnome/apps/Settings/Desktop/theme-selector.desktop
@@ -26,25 +45,6 @@ share/gnome/apps/Settings/Session/.directory
 share/gnome/apps/Settings/UIOptions/.directory
 share/gnome/apps/Settings/file-types-capplet.desktop
 share/gnome/apps/Settings/gnomecc.desktop
-share/gnome/control-center/.directory
-share/gnome/control-center/Desktop/.directory
-share/gnome/control-center/Desktop/background-properties.desktop
-share/gnome/control-center/Desktop/theme-selector.desktop
-share/gnome/control-center/Desktop/wm-properties.desktop
-share/gnome/control-center/Documents/.directory
-share/gnome/control-center/Documents/default-application-properties.desktop
-share/gnome/control-center/Documents/file-types-capplet.desktop
-share/gnome/control-center/Documents/url-properties.desktop
-share/gnome/control-center/Multimedia/.directory
-share/gnome/control-center/Multimedia/sound-properties.desktop
-share/gnome/control-center/Peripherals/.directory
-share/gnome/control-center/Peripherals/keyboard-properties.desktop
-share/gnome/control-center/Peripherals/mouse-properties.desktop
-share/gnome/control-center/Session/.directory
-share/gnome/control-center/UIOptions/.directory
-share/gnome/control-center/UIOptions/application.desktop
-share/gnome/control-center/UIOptions/dialogs.desktop
-share/gnome/control-center/UIOptions/mdi.desktop
 share/gnome/help/control-center/C/control-center.sgml
 share/gnome/help/control-center/C/desktop-intro.html
 share/gnome/help/control-center/C/doc-handlers.html
@@ -125,10 +125,6 @@ share/gnome/help/control-center/eu/stylesheet-images/up.gif
 share/gnome/help/control-center/eu/stylesheet-images/warning.gif
 share/gnome/help/control-center/eu/topic.dat
 share/gnome/help/control-center/eu/usage.html
-share/gnome/omf/control-center/control-center-C.omf
-share/gnome/omf/control-center/control-center-eu.omf
-share/gnome/pixmaps/ccsplash.png
-share/gnome/pixmaps/control-center.png
 share/gnome/wm-properties/Enlightenment.desktop
 share/gnome/wm-properties/IceWM.desktop
 share/gnome/wm-properties/Scwm.desktop
@@ -171,15 +167,19 @@ share/locale/uk/LC_MESSAGES/control-center.mo
 share/locale/wa/LC_MESSAGES/control-center.mo
 share/locale/zh_CN/LC_MESSAGES/control-center.mo
 share/locale/zh_TW/LC_MESSAGES/control-center.mo
-@dirrm share/gnome/omf/control-center
-@dirrm share/gnome/help/control-center/C/stylesheet-images
-@dirrm share/gnome/help/control-center/C/figures
-@dirrm share/gnome/help/control-center/C
+share/omf/control-center/control-center-C.omf
+share/omf/control-center/control-center-eu.omf
+share/pixmaps/ccsplash.png
+share/pixmaps/control-center.png
+@dirrm share/omf/control-center
 @dirrm share/gnome/help/control-center/eu/stylesheet-images
 @dirrm share/gnome/help/control-center/eu/figures
 @dirrm share/gnome/help/control-center/eu
+@dirrm share/gnome/help/control-center/C/stylesheet-images
+@dirrm share/gnome/help/control-center/C/figures
+@dirrm share/gnome/help/control-center/C
 @dirrm share/gnome/help/control-center
-@dirrm share/gnome/control-center/UIOptions
-@dirrm share/gnome/control-center/Multimedia
 @dirrm share/gnome/apps/Settings/UIOptions
 @dirrm share/gnome/apps/Settings/Multimedia
+@dirrm share/control-center/UIOptions
+@dirrm share/control-center/Multimedia
diff --git a/sysutils/gnome-mount/Makefile b/sysutils/gnome-mount/Makefile
index f0daa09acd1a..da19f96cf641 100644
--- a/sysutils/gnome-mount/Makefile
+++ b/sysutils/gnome-mount/Makefile
@@ -3,12 +3,12 @@
 # Whom:				Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/sysutils/gnome-mount/Makefile,v 1.13 2007/02/11 06:03:50 marcus Exp $
+#   $MCom: ports/sysutils/gnome-mount/Makefile,v 1.16 2007/05/19 21:36:22 marcus Exp $
 #
 
 PORTNAME=	gnome-mount
 PORTVERSION=	0.6
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	http://people.freedesktop.org/~david/dist/
 
diff --git a/sysutils/gnome-mount/pkg-plist b/sysutils/gnome-mount/pkg-plist
index 34627d076c00..1586c42b826c 100644
--- a/sysutils/gnome-mount/pkg-plist
+++ b/sysutils/gnome-mount/pkg-plist
@@ -5,7 +5,7 @@ lib/nautilus/extensions-1.0/libgnome-mount.a
 lib/nautilus/extensions-1.0/libgnome-mount.la
 lib/nautilus/extensions-1.0/libgnome-mount.so
 libdata/pkgconfig/gnome-mount.pc
-share/gnome/gnome-mount/gnome-mount-properties.glade
+share/gnome-mount/gnome-mount-properties.glade
 share/locale/ar/LC_MESSAGES/gnome-mount.mo
 share/locale/be/LC_MESSAGES/gnome-mount.mo
 share/locale/ca/LC_MESSAGES/gnome-mount.mo
@@ -24,10 +24,6 @@ share/locale/pt_BR/LC_MESSAGES/gnome-mount.mo
 share/locale/ru/LC_MESSAGES/gnome-mount.mo
 share/locale/sv/LC_MESSAGES/gnome-mount.mo
 share/locale/vi/LC_MESSAGES/gnome-mount.mo
-@dirrm share/gnome/gnome-mount
+@dirrm share/gnome-mount
 @dirrmtry share/locale/dz/LC_MESSAGES
 @dirrmtry share/locale/dz
-@dirrmtry share/locale/ca/LC_MESSAGES
-@dirrmtry share/locale/ca
-@dirrmtry share/locale/be/LC_MESSAGES
-@dirrmtry share/locale/be
diff --git a/sysutils/gnome-pkgview/Makefile b/sysutils/gnome-pkgview/Makefile
index 11e61cb4ac61..cb44b898c3ca 100644
--- a/sysutils/gnome-pkgview/Makefile
+++ b/sysutils/gnome-pkgview/Makefile
@@ -3,11 +3,11 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#
+#    $MCom: ports/sysutils/gnome-pkgview/Makefile,v 1.6 2007/05/30 03:21:44 mezz Exp $
 
 PORTNAME=	gnome-pkgview
 PORTVERSION=	1.0.6
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	http://www.greatnorthern.demon.co.uk/packages/gnome-pkgview/
 
@@ -26,9 +26,6 @@ GCONF_SCHEMAS=	gnome-pkgview.schemas
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
-		-e 's|%%X11BASE%%|${X11BASE}|g' \
-			${WRKSRC}/src/config-path.c
-	@${REINPLACE_CMD} -e 's|Icon=|Icon=${PREFIX}/share/gnome/pixmaps/|g' \
-		${WRKSRC}/gnome-pkgview.desktop.in
+		${WRKSRC}/src/config-path.c
 
 .include <bsd.port.mk>
diff --git a/sysutils/gnome-pkgview/files/patch-configure b/sysutils/gnome-pkgview/files/patch-configure
deleted file mode 100644
index a8e15c3c2e15..000000000000
--- a/sysutils/gnome-pkgview/files/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig	Thu Nov 14 02:31:45 2002
-+++ configure	Thu Nov 14 02:31:56 2002
-@@ -3991,7 +3991,7 @@
- 
- 
- cat >>confdefs.h <<_ACEOF
--#define GNOME_ICONDIR "${prefix}/share/pixmaps"
-+#define GNOME_ICONDIR "${prefix}/share/gnome/pixmaps"
- _ACEOF
- 
- 
diff --git a/sysutils/gnome-pkgview/files/patch-src_config-path.c b/sysutils/gnome-pkgview/files/patch-src_config-path.c
index 2eed9821d2bb..b61d1cedc959 100644
--- a/sysutils/gnome-pkgview/files/patch-src_config-path.c
+++ b/sysutils/gnome-pkgview/files/patch-src_config-path.c
@@ -7,7 +7,7 @@
 -	if ( getenv ("PKG_CONFIG_PATH") ) {
 -		path = g_strconcat(getenv("PKG_CONFIG_PATH"),":DIRS_DONE",NULL);
 -	}
-+	path = "%%LOCALBASE%%/libdata/pkgconfig:%%X11BASE%%/libdata/pkgconfig:DIRS_DONE";
++	path = "%%LOCALBASE%%/libdata/pkgconfig:DIRS_DONE";
  
  	/* walk the PKG_CONFIG_PATH for other files */
  	if ( path ) {
diff --git a/sysutils/gnome-pkgview/pkg-plist b/sysutils/gnome-pkgview/pkg-plist
index ff3ee10dfb7c..d19cfe86dbb2 100644
--- a/sysutils/gnome-pkgview/pkg-plist
+++ b/sysutils/gnome-pkgview/pkg-plist
@@ -1,16 +1,16 @@
 bin/gnome-pkgview
-share/gnome/applications/gnome-pkgview.desktop
-share/gnome/pixmaps/gnome-pkgview/debian.png
-share/gnome/pixmaps/gnome-pkgview/fedora.png
-share/gnome/pixmaps/gnome-pkgview/gentoo.png
-share/gnome/pixmaps/gnome-pkgview/gnome.png
-share/gnome/pixmaps/gnome-pkgview/pkgview.png
-share/gnome/pixmaps/gnome-pkgview/pld.png
-share/gnome/pixmaps/gnome-pkgview/redhat.png
-share/gnome/pixmaps/gnome-pkgview/slackware.png
-share/gnome/pixmaps/gnome-pkgview/solaris.png
-share/gnome/pixmaps/gnome-pkgview/suse.png
-share/gnome/pixmaps/gnome-pkgview/whitebox.png
+share/applications/gnome-pkgview.desktop
+share/pixmaps/gnome-pkgview/debian.png
+share/pixmaps/gnome-pkgview/fedora.png
+share/pixmaps/gnome-pkgview/gentoo.png
+share/pixmaps/gnome-pkgview/gnome.png
+share/pixmaps/gnome-pkgview/pkgview.png
+share/pixmaps/gnome-pkgview/pld.png
+share/pixmaps/gnome-pkgview/redhat.png
+share/pixmaps/gnome-pkgview/slackware.png
+share/pixmaps/gnome-pkgview/solaris.png
+share/pixmaps/gnome-pkgview/suse.png
+share/pixmaps/gnome-pkgview/whitebox.png
 share/locale/am/LC_MESSAGES/gnome-pkgview.mo
 share/locale/az/LC_MESSAGES/gnome-pkgview.mo
 share/locale/be/LC_MESSAGES/gnome-pkgview.mo
@@ -47,4 +47,5 @@ share/locale/uk/LC_MESSAGES/gnome-pkgview.mo
 share/locale/vi/LC_MESSAGES/gnome-pkgview.mo
 share/locale/zh_CN/LC_MESSAGES/gnome-pkgview.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-pkgview.mo
-@dirrm share/gnome/pixmaps/gnome-pkgview
+@dirrm share/pixmaps/gnome-pkgview
+@dirrmtry share/applications
diff --git a/sysutils/gnome-power-manager/Makefile b/sysutils/gnome-power-manager/Makefile
index 04cc48260762..95af3733e293 100644
--- a/sysutils/gnome-power-manager/Makefile
+++ b/sysutils/gnome-power-manager/Makefile
@@ -3,11 +3,11 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/sysutils/gnome-power-manager/Makefile,v 1.23 2007/03/13 00:33:21 mezz Exp $
+#   $MCom: ports/sysutils/gnome-power-manager/Makefile,v 1.36 2007/09/17 19:59:06 marcus Exp $
 #
 
 PORTNAME=	gnome-power-manager
-PORTVERSION=	2.18.3
+PORTVERSION=	2.20.0
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -28,6 +28,7 @@ USE_GMAKE=	yes
 INSTALLS_OMF=	yes
 INSTALLS_ICONS=	yes
 USE_AUTOTOOLS=	libtool:15
+USE_GSTREAMER=	good
 USE_GNOME=	gnomeprefix gnomehack intlhack libgnomeui libwnck \
 		gnomedocutils gnomepanel
 CONFIGURE_ARGS=	--disable-icon-framing \
diff --git a/sysutils/gnome-power-manager/distinfo b/sysutils/gnome-power-manager/distinfo
index 2d9b2174d2d0..c25bc26a6d42 100644
--- a/sysutils/gnome-power-manager/distinfo
+++ b/sysutils/gnome-power-manager/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-power-manager-2.18.3.tar.bz2) = 3341092fc87ced400631c3d635979426
-SHA256 (gnome2/gnome-power-manager-2.18.3.tar.bz2) = 0bcc8a35d52279cd24de93e957bf0f8b3359d096cd891e5bed07cb4b912f920b
-SIZE (gnome2/gnome-power-manager-2.18.3.tar.bz2) = 2068991
+MD5 (gnome2/gnome-power-manager-2.20.0.tar.bz2) = 881f012dcbdff38a85603393cb9d39bb
+SHA256 (gnome2/gnome-power-manager-2.20.0.tar.bz2) = bc1a3428bc98bfcab473e0f62387f32205c40693f6c6897931204ef4800aa1e5
+SIZE (gnome2/gnome-power-manager-2.20.0.tar.bz2) = 2588839
diff --git a/sysutils/gnome-power-manager/pkg-plist b/sysutils/gnome-power-manager/pkg-plist
index 89d70a45f6f1..efc61c06920e 100644
--- a/sysutils/gnome-power-manager/pkg-plist
+++ b/sysutils/gnome-power-manager/pkg-plist
@@ -5,22 +5,278 @@ bin/gnome-power-cmd.sh
 bin/gnome-power-manager
 bin/gnome-power-preferences
 bin/gnome-power-statistics
-etc/dbus-1/system.d/gnome-power-manager.conf
 libdata/bonobo/servers/GNOME_BrightnessApplet.server
 libdata/bonobo/servers/GNOME_InhibitApplet.server
+share/applications/gnome-power-preferences.desktop
+share/applications/gnome-power-statistics.desktop
 share/dbus-1/services/gnome-power-manager.service
-share/gnome/applications/gnome-power-preferences.desktop
-share/gnome/applications/gnome-power-statistics.desktop
+share/gnome-2.0/ui/GNOME_BrightnessApplet.xml
+share/gnome-2.0/ui/GNOME_InhibitApplet.xml
+%%DATADIR%%/gpm-critical-power.wav
+%%DATADIR%%/gpm-feedback-widget.glade
+%%DATADIR%%/gpm-graph.glade
+%%DATADIR%%/gpm-inhibit-test.glade
+%%DATADIR%%/gpm-lid-down.wav
+%%DATADIR%%/gpm-lid-up.wav
+%%DATADIR%%/gpm-prefs.glade
+%%DATADIR%%/gpm-suspend-failure.wav
+%%DATADIR%%/gpm-unplugged.wav
+%%DATADIR%%/icons/hicolor/16x16/actions/gpm-hibernate.png
+%%DATADIR%%/icons/hicolor/16x16/actions/gpm-suspend.png
+%%DATADIR%%/icons/hicolor/16x16/status/gpm-ac-adapter.png
+%%DATADIR%%/icons/hicolor/16x16/status/gpm-brightness-kbd-disabled.png
+%%DATADIR%%/icons/hicolor/16x16/status/gpm-brightness-kbd-invalid.png
+%%DATADIR%%/icons/hicolor/16x16/status/gpm-brightness-kbd.png
+%%DATADIR%%/icons/hicolor/16x16/status/gpm-brightness-lcd-disabled.png
+%%DATADIR%%/icons/hicolor/16x16/status/gpm-brightness-lcd-invalid.png
+%%DATADIR%%/icons/hicolor/16x16/status/gpm-brightness-lcd.png
+%%DATADIR%%/icons/hicolor/16x16/status/gpm-inhibit-invalid.png
+%%DATADIR%%/icons/hicolor/16x16/status/gpm-inhibit.png
+%%DATADIR%%/icons/hicolor/16x16/status/gpm-keyboard-000.png
+%%DATADIR%%/icons/hicolor/16x16/status/gpm-keyboard-030.png
+%%DATADIR%%/icons/hicolor/16x16/status/gpm-keyboard-060.png
+%%DATADIR%%/icons/hicolor/16x16/status/gpm-keyboard-100.png
+%%DATADIR%%/icons/hicolor/16x16/status/gpm-mouse-000.png
+%%DATADIR%%/icons/hicolor/16x16/status/gpm-mouse-030.png
+%%DATADIR%%/icons/hicolor/16x16/status/gpm-mouse-060.png
+%%DATADIR%%/icons/hicolor/16x16/status/gpm-mouse-100.png
+%%DATADIR%%/icons/hicolor/16x16/status/gpm-phone-000.png
+%%DATADIR%%/icons/hicolor/16x16/status/gpm-phone-030.png
+%%DATADIR%%/icons/hicolor/16x16/status/gpm-phone-060.png
+%%DATADIR%%/icons/hicolor/16x16/status/gpm-phone-100.png
+%%DATADIR%%/icons/hicolor/16x16/status/gpm-primary-000-charging.png
+%%DATADIR%%/icons/hicolor/16x16/status/gpm-primary-000.png
+%%DATADIR%%/icons/hicolor/16x16/status/gpm-primary-020-charging.png
+%%DATADIR%%/icons/hicolor/16x16/status/gpm-primary-020.png
+%%DATADIR%%/icons/hicolor/16x16/status/gpm-primary-040-charging.png
+%%DATADIR%%/icons/hicolor/16x16/status/gpm-primary-040.png
+%%DATADIR%%/icons/hicolor/16x16/status/gpm-primary-060-charging.png
+%%DATADIR%%/icons/hicolor/16x16/status/gpm-primary-060.png
+%%DATADIR%%/icons/hicolor/16x16/status/gpm-primary-080-charging.png
+%%DATADIR%%/icons/hicolor/16x16/status/gpm-primary-080.png
+%%DATADIR%%/icons/hicolor/16x16/status/gpm-primary-100-charging.png
+%%DATADIR%%/icons/hicolor/16x16/status/gpm-primary-100.png
+%%DATADIR%%/icons/hicolor/16x16/status/gpm-primary-charged.png
+%%DATADIR%%/icons/hicolor/16x16/status/gpm-primary-missing.png
+%%DATADIR%%/icons/hicolor/16x16/status/gpm-ups-000-charging.png
+%%DATADIR%%/icons/hicolor/16x16/status/gpm-ups-000.png
+%%DATADIR%%/icons/hicolor/16x16/status/gpm-ups-020-charging.png
+%%DATADIR%%/icons/hicolor/16x16/status/gpm-ups-020.png
+%%DATADIR%%/icons/hicolor/16x16/status/gpm-ups-040-charging.png
+%%DATADIR%%/icons/hicolor/16x16/status/gpm-ups-040.png
+%%DATADIR%%/icons/hicolor/16x16/status/gpm-ups-060-charging.png
+%%DATADIR%%/icons/hicolor/16x16/status/gpm-ups-060.png
+%%DATADIR%%/icons/hicolor/16x16/status/gpm-ups-080-charging.png
+%%DATADIR%%/icons/hicolor/16x16/status/gpm-ups-080.png
+%%DATADIR%%/icons/hicolor/16x16/status/gpm-ups-100-charging.png
+%%DATADIR%%/icons/hicolor/16x16/status/gpm-ups-100.png
+%%DATADIR%%/icons/hicolor/16x16/status/gpm-ups-charged.png
+%%DATADIR%%/icons/hicolor/16x16/status/gpm-ups-missing.png
+%%DATADIR%%/icons/hicolor/22x22/actions/gpm-hibernate.png
+%%DATADIR%%/icons/hicolor/22x22/actions/gpm-suspend.png
+%%DATADIR%%/icons/hicolor/22x22/status/gpm-ac-adapter.png
+%%DATADIR%%/icons/hicolor/22x22/status/gpm-brightness-kbd-disabled.png
+%%DATADIR%%/icons/hicolor/22x22/status/gpm-brightness-kbd-invalid.png
+%%DATADIR%%/icons/hicolor/22x22/status/gpm-brightness-kbd.png
+%%DATADIR%%/icons/hicolor/22x22/status/gpm-brightness-lcd-disabled.png
+%%DATADIR%%/icons/hicolor/22x22/status/gpm-brightness-lcd-invalid.png
+%%DATADIR%%/icons/hicolor/22x22/status/gpm-brightness-lcd.png
+%%DATADIR%%/icons/hicolor/22x22/status/gpm-inhibit-invalid.png
+%%DATADIR%%/icons/hicolor/22x22/status/gpm-inhibit.png
+%%DATADIR%%/icons/hicolor/22x22/status/gpm-keyboard-000.png
+%%DATADIR%%/icons/hicolor/22x22/status/gpm-keyboard-030.png
+%%DATADIR%%/icons/hicolor/22x22/status/gpm-keyboard-060.png
+%%DATADIR%%/icons/hicolor/22x22/status/gpm-keyboard-100.png
+%%DATADIR%%/icons/hicolor/22x22/status/gpm-mouse-000.png
+%%DATADIR%%/icons/hicolor/22x22/status/gpm-mouse-030.png
+%%DATADIR%%/icons/hicolor/22x22/status/gpm-mouse-060.png
+%%DATADIR%%/icons/hicolor/22x22/status/gpm-mouse-100.png
+%%DATADIR%%/icons/hicolor/22x22/status/gpm-phone-000.png
+%%DATADIR%%/icons/hicolor/22x22/status/gpm-phone-030.png
+%%DATADIR%%/icons/hicolor/22x22/status/gpm-phone-060.png
+%%DATADIR%%/icons/hicolor/22x22/status/gpm-phone-100.png
+%%DATADIR%%/icons/hicolor/22x22/status/gpm-primary-000-charging.png
+%%DATADIR%%/icons/hicolor/22x22/status/gpm-primary-000.png
+%%DATADIR%%/icons/hicolor/22x22/status/gpm-primary-020-charging.png
+%%DATADIR%%/icons/hicolor/22x22/status/gpm-primary-020.png
+%%DATADIR%%/icons/hicolor/22x22/status/gpm-primary-040-charging.png
+%%DATADIR%%/icons/hicolor/22x22/status/gpm-primary-040.png
+%%DATADIR%%/icons/hicolor/22x22/status/gpm-primary-060-charging.png
+%%DATADIR%%/icons/hicolor/22x22/status/gpm-primary-060.png
+%%DATADIR%%/icons/hicolor/22x22/status/gpm-primary-080-charging.png
+%%DATADIR%%/icons/hicolor/22x22/status/gpm-primary-080.png
+%%DATADIR%%/icons/hicolor/22x22/status/gpm-primary-100-charging.png
+%%DATADIR%%/icons/hicolor/22x22/status/gpm-primary-100.png
+%%DATADIR%%/icons/hicolor/22x22/status/gpm-primary-charged.png
+%%DATADIR%%/icons/hicolor/22x22/status/gpm-primary-missing.png
+%%DATADIR%%/icons/hicolor/22x22/status/gpm-ups-000-charging.png
+%%DATADIR%%/icons/hicolor/22x22/status/gpm-ups-000.png
+%%DATADIR%%/icons/hicolor/22x22/status/gpm-ups-020-charging.png
+%%DATADIR%%/icons/hicolor/22x22/status/gpm-ups-020.png
+%%DATADIR%%/icons/hicolor/22x22/status/gpm-ups-040-charging.png
+%%DATADIR%%/icons/hicolor/22x22/status/gpm-ups-040.png
+%%DATADIR%%/icons/hicolor/22x22/status/gpm-ups-060-charging.png
+%%DATADIR%%/icons/hicolor/22x22/status/gpm-ups-060.png
+%%DATADIR%%/icons/hicolor/22x22/status/gpm-ups-080-charging.png
+%%DATADIR%%/icons/hicolor/22x22/status/gpm-ups-080.png
+%%DATADIR%%/icons/hicolor/22x22/status/gpm-ups-100-charging.png
+%%DATADIR%%/icons/hicolor/22x22/status/gpm-ups-100.png
+%%DATADIR%%/icons/hicolor/22x22/status/gpm-ups-charged.png
+%%DATADIR%%/icons/hicolor/22x22/status/gpm-ups-missing.png
+%%DATADIR%%/icons/hicolor/24x24/actions/gpm-hibernate.png
+%%DATADIR%%/icons/hicolor/24x24/actions/gpm-suspend.png
+%%DATADIR%%/icons/hicolor/24x24/status/gpm-ac-adapter.png
+%%DATADIR%%/icons/hicolor/24x24/status/gpm-brightness-kbd-disabled.png
+%%DATADIR%%/icons/hicolor/24x24/status/gpm-brightness-kbd-invalid.png
+%%DATADIR%%/icons/hicolor/24x24/status/gpm-brightness-kbd.png
+%%DATADIR%%/icons/hicolor/24x24/status/gpm-brightness-lcd-disabled.png
+%%DATADIR%%/icons/hicolor/24x24/status/gpm-brightness-lcd-invalid.png
+%%DATADIR%%/icons/hicolor/24x24/status/gpm-brightness-lcd.png
+%%DATADIR%%/icons/hicolor/24x24/status/gpm-inhibit-invalid.png
+%%DATADIR%%/icons/hicolor/24x24/status/gpm-inhibit.png
+%%DATADIR%%/icons/hicolor/24x24/status/gpm-keyboard-000.png
+%%DATADIR%%/icons/hicolor/24x24/status/gpm-keyboard-030.png
+%%DATADIR%%/icons/hicolor/24x24/status/gpm-keyboard-060.png
+%%DATADIR%%/icons/hicolor/24x24/status/gpm-keyboard-100.png
+%%DATADIR%%/icons/hicolor/24x24/status/gpm-mouse-000.png
+%%DATADIR%%/icons/hicolor/24x24/status/gpm-mouse-030.png
+%%DATADIR%%/icons/hicolor/24x24/status/gpm-mouse-060.png
+%%DATADIR%%/icons/hicolor/24x24/status/gpm-mouse-100.png
+%%DATADIR%%/icons/hicolor/24x24/status/gpm-phone-000.png
+%%DATADIR%%/icons/hicolor/24x24/status/gpm-phone-030.png
+%%DATADIR%%/icons/hicolor/24x24/status/gpm-phone-060.png
+%%DATADIR%%/icons/hicolor/24x24/status/gpm-phone-100.png
+%%DATADIR%%/icons/hicolor/24x24/status/gpm-primary-000-charging.png
+%%DATADIR%%/icons/hicolor/24x24/status/gpm-primary-000.png
+%%DATADIR%%/icons/hicolor/24x24/status/gpm-primary-020-charging.png
+%%DATADIR%%/icons/hicolor/24x24/status/gpm-primary-020.png
+%%DATADIR%%/icons/hicolor/24x24/status/gpm-primary-040-charging.png
+%%DATADIR%%/icons/hicolor/24x24/status/gpm-primary-040.png
+%%DATADIR%%/icons/hicolor/24x24/status/gpm-primary-060-charging.png
+%%DATADIR%%/icons/hicolor/24x24/status/gpm-primary-060.png
+%%DATADIR%%/icons/hicolor/24x24/status/gpm-primary-080-charging.png
+%%DATADIR%%/icons/hicolor/24x24/status/gpm-primary-080.png
+%%DATADIR%%/icons/hicolor/24x24/status/gpm-primary-100-charging.png
+%%DATADIR%%/icons/hicolor/24x24/status/gpm-primary-100.png
+%%DATADIR%%/icons/hicolor/24x24/status/gpm-primary-charged.png
+%%DATADIR%%/icons/hicolor/24x24/status/gpm-primary-missing.png
+%%DATADIR%%/icons/hicolor/24x24/status/gpm-ups-000-charging.png
+%%DATADIR%%/icons/hicolor/24x24/status/gpm-ups-000.png
+%%DATADIR%%/icons/hicolor/24x24/status/gpm-ups-020-charging.png
+%%DATADIR%%/icons/hicolor/24x24/status/gpm-ups-020.png
+%%DATADIR%%/icons/hicolor/24x24/status/gpm-ups-040-charging.png
+%%DATADIR%%/icons/hicolor/24x24/status/gpm-ups-040.png
+%%DATADIR%%/icons/hicolor/24x24/status/gpm-ups-060-charging.png
+%%DATADIR%%/icons/hicolor/24x24/status/gpm-ups-060.png
+%%DATADIR%%/icons/hicolor/24x24/status/gpm-ups-080-charging.png
+%%DATADIR%%/icons/hicolor/24x24/status/gpm-ups-080.png
+%%DATADIR%%/icons/hicolor/24x24/status/gpm-ups-100-charging.png
+%%DATADIR%%/icons/hicolor/24x24/status/gpm-ups-100.png
+%%DATADIR%%/icons/hicolor/24x24/status/gpm-ups-charged.png
+%%DATADIR%%/icons/hicolor/24x24/status/gpm-ups-missing.png
+%%DATADIR%%/icons/hicolor/48x48/actions/gpm-hibernate.png
+%%DATADIR%%/icons/hicolor/48x48/actions/gpm-suspend.png
+%%DATADIR%%/icons/hicolor/48x48/status/gpm-ac-adapter.png
+%%DATADIR%%/icons/hicolor/48x48/status/gpm-brightness-kbd-disabled.png
+%%DATADIR%%/icons/hicolor/48x48/status/gpm-brightness-kbd-invalid.png
+%%DATADIR%%/icons/hicolor/48x48/status/gpm-brightness-kbd.png
+%%DATADIR%%/icons/hicolor/48x48/status/gpm-brightness-lcd-disabled.png
+%%DATADIR%%/icons/hicolor/48x48/status/gpm-brightness-lcd-invalid.png
+%%DATADIR%%/icons/hicolor/48x48/status/gpm-brightness-lcd.png
+%%DATADIR%%/icons/hicolor/48x48/status/gpm-inhibit-invalid.png
+%%DATADIR%%/icons/hicolor/48x48/status/gpm-inhibit.png
+%%DATADIR%%/icons/hicolor/48x48/status/gpm-keyboard-000.png
+%%DATADIR%%/icons/hicolor/48x48/status/gpm-keyboard-030.png
+%%DATADIR%%/icons/hicolor/48x48/status/gpm-keyboard-060.png
+%%DATADIR%%/icons/hicolor/48x48/status/gpm-keyboard-100.png
+%%DATADIR%%/icons/hicolor/48x48/status/gpm-mouse-000.png
+%%DATADIR%%/icons/hicolor/48x48/status/gpm-mouse-030.png
+%%DATADIR%%/icons/hicolor/48x48/status/gpm-mouse-060.png
+%%DATADIR%%/icons/hicolor/48x48/status/gpm-mouse-100.png
+%%DATADIR%%/icons/hicolor/48x48/status/gpm-phone-000.png
+%%DATADIR%%/icons/hicolor/48x48/status/gpm-phone-030.png
+%%DATADIR%%/icons/hicolor/48x48/status/gpm-phone-060.png
+%%DATADIR%%/icons/hicolor/48x48/status/gpm-phone-100.png
+%%DATADIR%%/icons/hicolor/48x48/status/gpm-primary-000-charging.png
+%%DATADIR%%/icons/hicolor/48x48/status/gpm-primary-000.png
+%%DATADIR%%/icons/hicolor/48x48/status/gpm-primary-020-charging.png
+%%DATADIR%%/icons/hicolor/48x48/status/gpm-primary-020.png
+%%DATADIR%%/icons/hicolor/48x48/status/gpm-primary-040-charging.png
+%%DATADIR%%/icons/hicolor/48x48/status/gpm-primary-040.png
+%%DATADIR%%/icons/hicolor/48x48/status/gpm-primary-060-charging.png
+%%DATADIR%%/icons/hicolor/48x48/status/gpm-primary-060.png
+%%DATADIR%%/icons/hicolor/48x48/status/gpm-primary-080-charging.png
+%%DATADIR%%/icons/hicolor/48x48/status/gpm-primary-080.png
+%%DATADIR%%/icons/hicolor/48x48/status/gpm-primary-100-charging.png
+%%DATADIR%%/icons/hicolor/48x48/status/gpm-primary-100.png
+%%DATADIR%%/icons/hicolor/48x48/status/gpm-primary-charged.png
+%%DATADIR%%/icons/hicolor/48x48/status/gpm-primary-missing.png
+%%DATADIR%%/icons/hicolor/48x48/status/gpm-ups-000-charging.png
+%%DATADIR%%/icons/hicolor/48x48/status/gpm-ups-000.png
+%%DATADIR%%/icons/hicolor/48x48/status/gpm-ups-020-charging.png
+%%DATADIR%%/icons/hicolor/48x48/status/gpm-ups-020.png
+%%DATADIR%%/icons/hicolor/48x48/status/gpm-ups-040-charging.png
+%%DATADIR%%/icons/hicolor/48x48/status/gpm-ups-040.png
+%%DATADIR%%/icons/hicolor/48x48/status/gpm-ups-060-charging.png
+%%DATADIR%%/icons/hicolor/48x48/status/gpm-ups-060.png
+%%DATADIR%%/icons/hicolor/48x48/status/gpm-ups-080-charging.png
+%%DATADIR%%/icons/hicolor/48x48/status/gpm-ups-080.png
+%%DATADIR%%/icons/hicolor/48x48/status/gpm-ups-100-charging.png
+%%DATADIR%%/icons/hicolor/48x48/status/gpm-ups-100.png
+%%DATADIR%%/icons/hicolor/48x48/status/gpm-ups-charged.png
+%%DATADIR%%/icons/hicolor/48x48/status/gpm-ups-missing.png
+%%DATADIR%%/icons/hicolor/scalable/actions/gpm-hibernate.svg
+%%DATADIR%%/icons/hicolor/scalable/actions/gpm-suspend.svg
+%%DATADIR%%/icons/hicolor/scalable/status/gpm-ac-adapter.svg
+%%DATADIR%%/icons/hicolor/scalable/status/gpm-brightness-kbd-disabled.svg
+%%DATADIR%%/icons/hicolor/scalable/status/gpm-brightness-kbd-invalid.svg
+%%DATADIR%%/icons/hicolor/scalable/status/gpm-brightness-kbd.svg
+%%DATADIR%%/icons/hicolor/scalable/status/gpm-brightness-lcd-disabled.svg
+%%DATADIR%%/icons/hicolor/scalable/status/gpm-brightness-lcd-invalid.svg
+%%DATADIR%%/icons/hicolor/scalable/status/gpm-brightness-lcd.svg
+%%DATADIR%%/icons/hicolor/scalable/status/gpm-inhibit-invalid.svg
+%%DATADIR%%/icons/hicolor/scalable/status/gpm-inhibit.svg
+%%DATADIR%%/icons/hicolor/scalable/status/gpm-keyboard-000.svg
+%%DATADIR%%/icons/hicolor/scalable/status/gpm-keyboard-030.svg
+%%DATADIR%%/icons/hicolor/scalable/status/gpm-keyboard-060.svg
+%%DATADIR%%/icons/hicolor/scalable/status/gpm-keyboard-100.svg
+%%DATADIR%%/icons/hicolor/scalable/status/gpm-mouse-000.svg
+%%DATADIR%%/icons/hicolor/scalable/status/gpm-mouse-030.svg
+%%DATADIR%%/icons/hicolor/scalable/status/gpm-mouse-060.svg
+%%DATADIR%%/icons/hicolor/scalable/status/gpm-mouse-100.svg
+%%DATADIR%%/icons/hicolor/scalable/status/gpm-phone-000.svg
+%%DATADIR%%/icons/hicolor/scalable/status/gpm-phone-030.svg
+%%DATADIR%%/icons/hicolor/scalable/status/gpm-phone-060.svg
+%%DATADIR%%/icons/hicolor/scalable/status/gpm-phone-100.svg
+%%DATADIR%%/icons/hicolor/scalable/status/gpm-primary-000-charging.svg
+%%DATADIR%%/icons/hicolor/scalable/status/gpm-primary-000.svg
+%%DATADIR%%/icons/hicolor/scalable/status/gpm-primary-020-charging.svg
+%%DATADIR%%/icons/hicolor/scalable/status/gpm-primary-020.svg
+%%DATADIR%%/icons/hicolor/scalable/status/gpm-primary-040-charging.svg
+%%DATADIR%%/icons/hicolor/scalable/status/gpm-primary-040.svg
+%%DATADIR%%/icons/hicolor/scalable/status/gpm-primary-060-charging.svg
+%%DATADIR%%/icons/hicolor/scalable/status/gpm-primary-060.svg
+%%DATADIR%%/icons/hicolor/scalable/status/gpm-primary-080-charging.svg
+%%DATADIR%%/icons/hicolor/scalable/status/gpm-primary-080.svg
+%%DATADIR%%/icons/hicolor/scalable/status/gpm-primary-100-charging.svg
+%%DATADIR%%/icons/hicolor/scalable/status/gpm-primary-100.svg
+%%DATADIR%%/icons/hicolor/scalable/status/gpm-primary-charged.svg
+%%DATADIR%%/icons/hicolor/scalable/status/gpm-primary-missing.svg
+%%DATADIR%%/icons/hicolor/scalable/status/gpm-ups-000-charging.svg
+%%DATADIR%%/icons/hicolor/scalable/status/gpm-ups-000.svg
+%%DATADIR%%/icons/hicolor/scalable/status/gpm-ups-020-charging.svg
+%%DATADIR%%/icons/hicolor/scalable/status/gpm-ups-020.svg
+%%DATADIR%%/icons/hicolor/scalable/status/gpm-ups-040-charging.svg
+%%DATADIR%%/icons/hicolor/scalable/status/gpm-ups-040.svg
+%%DATADIR%%/icons/hicolor/scalable/status/gpm-ups-060-charging.svg
+%%DATADIR%%/icons/hicolor/scalable/status/gpm-ups-060.svg
+%%DATADIR%%/icons/hicolor/scalable/status/gpm-ups-080-charging.svg
+%%DATADIR%%/icons/hicolor/scalable/status/gpm-ups-080.svg
+%%DATADIR%%/icons/hicolor/scalable/status/gpm-ups-100-charging.svg
+%%DATADIR%%/icons/hicolor/scalable/status/gpm-ups-100.svg
+%%DATADIR%%/icons/hicolor/scalable/status/gpm-ups-charged.svg
+%%DATADIR%%/icons/hicolor/scalable/status/gpm-ups-missing.svg
 share/gnome/autostart/gnome-power-manager.desktop
-share/gnome/gnome-2.0/ui/GNOME_BrightnessApplet.xml
-share/gnome/gnome-2.0/ui/GNOME_InhibitApplet.xml
-share/gnome/gnome-power-manager/gpm-critical-power.wav
-share/gnome/gnome-power-manager/gpm-feedback-widget.glade
-share/gnome/gnome-power-manager/gpm-graph.glade
-share/gnome/gnome-power-manager/gpm-inhibit-test.glade
-share/gnome/gnome-power-manager/gpm-prefs.glade
-share/gnome/gnome-power-manager/gpm-suspend-failure.wav
-share/gnome/gnome-power-manager/gpm-unplugged.wav
 share/gnome/help/gnome-power-manager/C/figures/gpm-cell-capacity.png
 share/gnome/help/gnome-power-manager/C/figures/gpm-charged.png
 share/gnome/help/gnome-power-manager/C/figures/gpm-critical.png
@@ -33,6 +289,17 @@ share/gnome/help/gnome-power-manager/C/figures/gpm-unplugged.png
 share/gnome/help/gnome-power-manager/C/figures/gs-prefs.png
 share/gnome/help/gnome-power-manager/C/gnome-power-manager.xml
 share/gnome/help/gnome-power-manager/C/legal.xml
+share/gnome/help/gnome-power-manager/ca/figures/gpm-cell-capacity.png
+share/gnome/help/gnome-power-manager/ca/figures/gpm-charged.png
+share/gnome/help/gnome-power-manager/ca/figures/gpm-critical.png
+share/gnome/help/gnome-power-manager/ca/figures/gpm-low.png
+share/gnome/help/gnome-power-manager/ca/figures/gpm-mouse-left.png
+share/gnome/help/gnome-power-manager/ca/figures/gpm-mouse-right.png
+share/gnome/help/gnome-power-manager/ca/figures/gpm-stats-graph.png
+share/gnome/help/gnome-power-manager/ca/figures/gpm-suspend-problem.png
+share/gnome/help/gnome-power-manager/ca/figures/gpm-unplugged.png
+share/gnome/help/gnome-power-manager/ca/figures/gs-prefs.png
+share/gnome/help/gnome-power-manager/ca/gnome-power-manager.xml
 share/gnome/help/gnome-power-manager/es/figures/gpm-cell-capacity.png
 share/gnome/help/gnome-power-manager/es/figures/gpm-charged.png
 share/gnome/help/gnome-power-manager/es/figures/gpm-critical.png
@@ -66,6 +333,28 @@ share/gnome/help/gnome-power-manager/hu/figures/gpm-suspend-problem.png
 share/gnome/help/gnome-power-manager/hu/figures/gpm-unplugged.png
 share/gnome/help/gnome-power-manager/hu/figures/gs-prefs.png
 share/gnome/help/gnome-power-manager/hu/gnome-power-manager.xml
+share/gnome/help/gnome-power-manager/it/figures/gpm-cell-capacity.png
+share/gnome/help/gnome-power-manager/it/figures/gpm-charged.png
+share/gnome/help/gnome-power-manager/it/figures/gpm-critical.png
+share/gnome/help/gnome-power-manager/it/figures/gpm-low.png
+share/gnome/help/gnome-power-manager/it/figures/gpm-mouse-left.png
+share/gnome/help/gnome-power-manager/it/figures/gpm-mouse-right.png
+share/gnome/help/gnome-power-manager/it/figures/gpm-stats-graph.png
+share/gnome/help/gnome-power-manager/it/figures/gpm-suspend-problem.png
+share/gnome/help/gnome-power-manager/it/figures/gpm-unplugged.png
+share/gnome/help/gnome-power-manager/it/figures/gs-prefs.png
+share/gnome/help/gnome-power-manager/it/gnome-power-manager.xml
+share/gnome/help/gnome-power-manager/oc/figures/gpm-cell-capacity.png
+share/gnome/help/gnome-power-manager/oc/figures/gpm-charged.png
+share/gnome/help/gnome-power-manager/oc/figures/gpm-critical.png
+share/gnome/help/gnome-power-manager/oc/figures/gpm-low.png
+share/gnome/help/gnome-power-manager/oc/figures/gpm-mouse-left.png
+share/gnome/help/gnome-power-manager/oc/figures/gpm-mouse-right.png
+share/gnome/help/gnome-power-manager/oc/figures/gpm-stats-graph.png
+share/gnome/help/gnome-power-manager/oc/figures/gpm-suspend-problem.png
+share/gnome/help/gnome-power-manager/oc/figures/gpm-unplugged.png
+share/gnome/help/gnome-power-manager/oc/figures/gs-prefs.png
+share/gnome/help/gnome-power-manager/oc/gnome-power-manager.xml
 share/gnome/help/gnome-power-manager/pa/figures/gpm-cell-capacity.png
 share/gnome/help/gnome-power-manager/pa/figures/gpm-charged.png
 share/gnome/help/gnome-power-manager/pa/figures/gpm-critical.png
@@ -99,193 +388,26 @@ share/gnome/help/gnome-power-manager/sv/figures/gpm-suspend-problem.png
 share/gnome/help/gnome-power-manager/sv/figures/gpm-unplugged.png
 share/gnome/help/gnome-power-manager/sv/figures/gs-prefs.png
 share/gnome/help/gnome-power-manager/sv/gnome-power-manager.xml
-share/gnome/omf/gnome-power-manager/gnome-power-manager-C.omf
-share/gnome/omf/gnome-power-manager/gnome-power-manager-es.omf
-share/gnome/omf/gnome-power-manager/gnome-power-manager-fr.omf
-share/gnome/omf/gnome-power-manager/gnome-power-manager-hu.omf
-share/gnome/omf/gnome-power-manager/gnome-power-manager-pa.omf
-share/gnome/omf/gnome-power-manager/gnome-power-manager-ru.omf
-share/gnome/omf/gnome-power-manager/gnome-power-manager-sv.omf
-share/icons/hicolor/16x16/apps/gpm-ac-adapter.png
-share/icons/hicolor/16x16/apps/gpm-brightness-kbd-disabled.png
-share/icons/hicolor/16x16/apps/gpm-brightness-kbd.png
-share/icons/hicolor/16x16/apps/gpm-brightness-lcd-disabled.png
-share/icons/hicolor/16x16/apps/gpm-brightness-lcd.png
-share/icons/hicolor/16x16/apps/gpm-hibernate.png
-share/icons/hicolor/16x16/apps/gpm-inhibit.png
-share/icons/hicolor/16x16/apps/gpm-keyboard-000.png
-share/icons/hicolor/16x16/apps/gpm-keyboard-030.png
-share/icons/hicolor/16x16/apps/gpm-keyboard-060.png
-share/icons/hicolor/16x16/apps/gpm-keyboard-100.png
-share/icons/hicolor/16x16/apps/gpm-mouse-000.png
-share/icons/hicolor/16x16/apps/gpm-mouse-030.png
-share/icons/hicolor/16x16/apps/gpm-mouse-060.png
-share/icons/hicolor/16x16/apps/gpm-mouse-100.png
-share/icons/hicolor/16x16/apps/gpm-primary-000-charging.png
-share/icons/hicolor/16x16/apps/gpm-primary-000.png
-share/icons/hicolor/16x16/apps/gpm-primary-020-charging.png
-share/icons/hicolor/16x16/apps/gpm-primary-020.png
-share/icons/hicolor/16x16/apps/gpm-primary-040-charging.png
-share/icons/hicolor/16x16/apps/gpm-primary-040.png
-share/icons/hicolor/16x16/apps/gpm-primary-060-charging.png
-share/icons/hicolor/16x16/apps/gpm-primary-060.png
-share/icons/hicolor/16x16/apps/gpm-primary-080-charging.png
-share/icons/hicolor/16x16/apps/gpm-primary-080.png
-share/icons/hicolor/16x16/apps/gpm-primary-100-charging.png
-share/icons/hicolor/16x16/apps/gpm-primary-100.png
-share/icons/hicolor/16x16/apps/gpm-primary-charged.png
-share/icons/hicolor/16x16/apps/gpm-primary-missing.png
-share/icons/hicolor/16x16/apps/gpm-statistics.png
-share/icons/hicolor/16x16/apps/gpm-suspend.png
-share/icons/hicolor/16x16/apps/gpm-ups-000-charging.png
-share/icons/hicolor/16x16/apps/gpm-ups-000.png
-share/icons/hicolor/16x16/apps/gpm-ups-020-charging.png
-share/icons/hicolor/16x16/apps/gpm-ups-020.png
-share/icons/hicolor/16x16/apps/gpm-ups-040-charging.png
-share/icons/hicolor/16x16/apps/gpm-ups-040.png
-share/icons/hicolor/16x16/apps/gpm-ups-060-charging.png
-share/icons/hicolor/16x16/apps/gpm-ups-060.png
-share/icons/hicolor/16x16/apps/gpm-ups-080-charging.png
-share/icons/hicolor/16x16/apps/gpm-ups-080.png
-share/icons/hicolor/16x16/apps/gpm-ups-100-charging.png
-share/icons/hicolor/16x16/apps/gpm-ups-100.png
-share/icons/hicolor/16x16/apps/gpm-ups-charged.png
-share/icons/hicolor/16x16/apps/gpm-ups-missing.png
-share/icons/hicolor/22x22/apps/gpm-ac-adapter.png
-share/icons/hicolor/22x22/apps/gpm-brightness-kbd-disabled.png
-share/icons/hicolor/22x22/apps/gpm-brightness-kbd.png
-share/icons/hicolor/22x22/apps/gpm-brightness-lcd-disabled.png
-share/icons/hicolor/22x22/apps/gpm-brightness-lcd.png
-share/icons/hicolor/22x22/apps/gpm-hibernate.png
-share/icons/hicolor/22x22/apps/gpm-inhibit.png
-share/icons/hicolor/22x22/apps/gpm-keyboard-000.png
-share/icons/hicolor/22x22/apps/gpm-keyboard-030.png
-share/icons/hicolor/22x22/apps/gpm-keyboard-060.png
-share/icons/hicolor/22x22/apps/gpm-keyboard-100.png
-share/icons/hicolor/22x22/apps/gpm-mouse-000.png
-share/icons/hicolor/22x22/apps/gpm-mouse-030.png
-share/icons/hicolor/22x22/apps/gpm-mouse-060.png
-share/icons/hicolor/22x22/apps/gpm-mouse-100.png
-share/icons/hicolor/22x22/apps/gpm-primary-000-charging.png
-share/icons/hicolor/22x22/apps/gpm-primary-000.png
-share/icons/hicolor/22x22/apps/gpm-primary-020-charging.png
-share/icons/hicolor/22x22/apps/gpm-primary-020.png
-share/icons/hicolor/22x22/apps/gpm-primary-040-charging.png
-share/icons/hicolor/22x22/apps/gpm-primary-040.png
-share/icons/hicolor/22x22/apps/gpm-primary-060-charging.png
-share/icons/hicolor/22x22/apps/gpm-primary-060.png
-share/icons/hicolor/22x22/apps/gpm-primary-080-charging.png
-share/icons/hicolor/22x22/apps/gpm-primary-080.png
-share/icons/hicolor/22x22/apps/gpm-primary-100-charging.png
-share/icons/hicolor/22x22/apps/gpm-primary-100.png
-share/icons/hicolor/22x22/apps/gpm-primary-charged.png
-share/icons/hicolor/22x22/apps/gpm-primary-missing.png
-share/icons/hicolor/22x22/apps/gpm-statistics.png
-share/icons/hicolor/22x22/apps/gpm-suspend.png
-share/icons/hicolor/22x22/apps/gpm-ups-000-charging.png
-share/icons/hicolor/22x22/apps/gpm-ups-000.png
-share/icons/hicolor/22x22/apps/gpm-ups-020-charging.png
-share/icons/hicolor/22x22/apps/gpm-ups-020.png
-share/icons/hicolor/22x22/apps/gpm-ups-040-charging.png
-share/icons/hicolor/22x22/apps/gpm-ups-040.png
-share/icons/hicolor/22x22/apps/gpm-ups-060-charging.png
-share/icons/hicolor/22x22/apps/gpm-ups-060.png
-share/icons/hicolor/22x22/apps/gpm-ups-080-charging.png
-share/icons/hicolor/22x22/apps/gpm-ups-080.png
-share/icons/hicolor/22x22/apps/gpm-ups-100-charging.png
-share/icons/hicolor/22x22/apps/gpm-ups-100.png
-share/icons/hicolor/22x22/apps/gpm-ups-charged.png
-share/icons/hicolor/22x22/apps/gpm-ups-missing.png
-share/icons/hicolor/24x24/apps/gpm-ac-adapter.png
-share/icons/hicolor/24x24/apps/gpm-brightness-kbd-disabled.png
-share/icons/hicolor/24x24/apps/gpm-brightness-kbd.png
-share/icons/hicolor/24x24/apps/gpm-brightness-lcd-disabled.png
-share/icons/hicolor/24x24/apps/gpm-brightness-lcd.png
-share/icons/hicolor/24x24/apps/gpm-hibernate.png
-share/icons/hicolor/24x24/apps/gpm-inhibit.png
-share/icons/hicolor/24x24/apps/gpm-keyboard-000.png
-share/icons/hicolor/24x24/apps/gpm-keyboard-030.png
-share/icons/hicolor/24x24/apps/gpm-keyboard-060.png
-share/icons/hicolor/24x24/apps/gpm-keyboard-100.png
-share/icons/hicolor/24x24/apps/gpm-mouse-000.png
-share/icons/hicolor/24x24/apps/gpm-mouse-030.png
-share/icons/hicolor/24x24/apps/gpm-mouse-060.png
-share/icons/hicolor/24x24/apps/gpm-mouse-100.png
-share/icons/hicolor/24x24/apps/gpm-primary-000-charging.png
-share/icons/hicolor/24x24/apps/gpm-primary-000.png
-share/icons/hicolor/24x24/apps/gpm-primary-020-charging.png
-share/icons/hicolor/24x24/apps/gpm-primary-020.png
-share/icons/hicolor/24x24/apps/gpm-primary-040-charging.png
-share/icons/hicolor/24x24/apps/gpm-primary-040.png
-share/icons/hicolor/24x24/apps/gpm-primary-060-charging.png
-share/icons/hicolor/24x24/apps/gpm-primary-060.png
-share/icons/hicolor/24x24/apps/gpm-primary-080-charging.png
-share/icons/hicolor/24x24/apps/gpm-primary-080.png
-share/icons/hicolor/24x24/apps/gpm-primary-100-charging.png
-share/icons/hicolor/24x24/apps/gpm-primary-100.png
-share/icons/hicolor/24x24/apps/gpm-primary-charged.png
-share/icons/hicolor/24x24/apps/gpm-primary-missing.png
-share/icons/hicolor/24x24/apps/gpm-statistics.png
-share/icons/hicolor/24x24/apps/gpm-suspend.png
-share/icons/hicolor/24x24/apps/gpm-ups-000-charging.png
-share/icons/hicolor/24x24/apps/gpm-ups-000.png
-share/icons/hicolor/24x24/apps/gpm-ups-020-charging.png
-share/icons/hicolor/24x24/apps/gpm-ups-020.png
-share/icons/hicolor/24x24/apps/gpm-ups-040-charging.png
-share/icons/hicolor/24x24/apps/gpm-ups-040.png
-share/icons/hicolor/24x24/apps/gpm-ups-060-charging.png
-share/icons/hicolor/24x24/apps/gpm-ups-060.png
-share/icons/hicolor/24x24/apps/gpm-ups-080-charging.png
-share/icons/hicolor/24x24/apps/gpm-ups-080.png
-share/icons/hicolor/24x24/apps/gpm-ups-100-charging.png
-share/icons/hicolor/24x24/apps/gpm-ups-100.png
-share/icons/hicolor/24x24/apps/gpm-ups-charged.png
-share/icons/hicolor/24x24/apps/gpm-ups-missing.png
-share/icons/hicolor/scalable/apps/gpm-ac-adapter.svg
-share/icons/hicolor/scalable/apps/gpm-brightness-kbd-disabled.svg
-share/icons/hicolor/scalable/apps/gpm-brightness-kbd.svg
-share/icons/hicolor/scalable/apps/gpm-brightness-lcd-disabled.svg
-share/icons/hicolor/scalable/apps/gpm-brightness-lcd.svg
-share/icons/hicolor/scalable/apps/gpm-hibernate.svg
-share/icons/hicolor/scalable/apps/gpm-inhibit.svg
-share/icons/hicolor/scalable/apps/gpm-keyboard-000.svg
-share/icons/hicolor/scalable/apps/gpm-keyboard-030.svg
-share/icons/hicolor/scalable/apps/gpm-keyboard-060.svg
-share/icons/hicolor/scalable/apps/gpm-keyboard-100.svg
-share/icons/hicolor/scalable/apps/gpm-mouse-000.svg
-share/icons/hicolor/scalable/apps/gpm-mouse-030.svg
-share/icons/hicolor/scalable/apps/gpm-mouse-060.svg
-share/icons/hicolor/scalable/apps/gpm-mouse-100.svg
-share/icons/hicolor/scalable/apps/gpm-primary-000-charging.svg
-share/icons/hicolor/scalable/apps/gpm-primary-000.svg
-share/icons/hicolor/scalable/apps/gpm-primary-020-charging.svg
-share/icons/hicolor/scalable/apps/gpm-primary-020.svg
-share/icons/hicolor/scalable/apps/gpm-primary-040-charging.svg
-share/icons/hicolor/scalable/apps/gpm-primary-040.svg
-share/icons/hicolor/scalable/apps/gpm-primary-060-charging.svg
-share/icons/hicolor/scalable/apps/gpm-primary-060.svg
-share/icons/hicolor/scalable/apps/gpm-primary-080-charging.svg
-share/icons/hicolor/scalable/apps/gpm-primary-080.svg
-share/icons/hicolor/scalable/apps/gpm-primary-100-charging.svg
-share/icons/hicolor/scalable/apps/gpm-primary-100.svg
-share/icons/hicolor/scalable/apps/gpm-primary-charged.svg
-share/icons/hicolor/scalable/apps/gpm-primary-missing.svg
-share/icons/hicolor/scalable/apps/gpm-statistics.svg
-share/icons/hicolor/scalable/apps/gpm-suspend.svg
-share/icons/hicolor/scalable/apps/gpm-ups-000-charging.svg
-share/icons/hicolor/scalable/apps/gpm-ups-000.svg
-share/icons/hicolor/scalable/apps/gpm-ups-020-charging.svg
-share/icons/hicolor/scalable/apps/gpm-ups-020.svg
-share/icons/hicolor/scalable/apps/gpm-ups-040-charging.svg
-share/icons/hicolor/scalable/apps/gpm-ups-040.svg
-share/icons/hicolor/scalable/apps/gpm-ups-060-charging.svg
-share/icons/hicolor/scalable/apps/gpm-ups-060.svg
-share/icons/hicolor/scalable/apps/gpm-ups-080-charging.svg
-share/icons/hicolor/scalable/apps/gpm-ups-080.svg
-share/icons/hicolor/scalable/apps/gpm-ups-100-charging.svg
-share/icons/hicolor/scalable/apps/gpm-ups-100.svg
-share/icons/hicolor/scalable/apps/gpm-ups-charged.svg
-share/icons/hicolor/scalable/apps/gpm-ups-missing.svg
+share/icons/hicolor/16x16/apps/gnome-brightness-applet.png
+share/icons/hicolor/16x16/apps/gnome-inhibit-applet.png
+share/icons/hicolor/16x16/apps/gnome-power-manager.png
+share/icons/hicolor/16x16/apps/gnome-power-statistics.png
+share/icons/hicolor/22x22/apps/gnome-brightness-applet.png
+share/icons/hicolor/22x22/apps/gnome-inhibit-applet.png
+share/icons/hicolor/22x22/apps/gnome-power-manager.png
+share/icons/hicolor/22x22/apps/gnome-power-statistics.png
+share/icons/hicolor/24x24/apps/gnome-brightness-applet.png
+share/icons/hicolor/24x24/apps/gnome-inhibit-applet.png
+share/icons/hicolor/24x24/apps/gnome-power-manager.png
+share/icons/hicolor/24x24/apps/gnome-power-statistics.png
+share/icons/hicolor/48x48/apps/gnome-brightness-applet.png
+share/icons/hicolor/48x48/apps/gnome-inhibit-applet.png
+share/icons/hicolor/48x48/apps/gnome-power-manager.png
+share/icons/hicolor/48x48/apps/gnome-power-statistics.png
+share/icons/hicolor/scalable/apps/gnome-brightness-applet.svg
+share/icons/hicolor/scalable/apps/gnome-inhibit-applet.svg
+share/icons/hicolor/scalable/apps/gnome-power-manager.svg
+share/icons/hicolor/scalable/apps/gnome-power-statistics.svg
 share/locale/ar/LC_MESSAGES/gnome-power-manager.mo
 share/locale/bg/LC_MESSAGES/gnome-power-manager.mo
 share/locale/bn/LC_MESSAGES/gnome-power-manager.mo
@@ -310,6 +432,7 @@ share/locale/gu/LC_MESSAGES/gnome-power-manager.mo
 share/locale/he/LC_MESSAGES/gnome-power-manager.mo
 share/locale/hi/LC_MESSAGES/gnome-power-manager.mo
 share/locale/hu/LC_MESSAGES/gnome-power-manager.mo
+share/locale/id/LC_MESSAGES/gnome-power-manager.mo
 share/locale/it/LC_MESSAGES/gnome-power-manager.mo
 share/locale/ja/LC_MESSAGES/gnome-power-manager.mo
 share/locale/ka/LC_MESSAGES/gnome-power-manager.mo
@@ -322,11 +445,15 @@ share/locale/mk/LC_MESSAGES/gnome-power-manager.mo
 share/locale/ml/LC_MESSAGES/gnome-power-manager.mo
 share/locale/nb/LC_MESSAGES/gnome-power-manager.mo
 share/locale/nl/LC_MESSAGES/gnome-power-manager.mo
+share/locale/oc/LC_MESSAGES/gnome-power-manager.mo
+share/locale/or/LC_MESSAGES/gnome-power-manager.mo
 share/locale/pa/LC_MESSAGES/gnome-power-manager.mo
 share/locale/pl/LC_MESSAGES/gnome-power-manager.mo
 share/locale/pt/LC_MESSAGES/gnome-power-manager.mo
 share/locale/pt_BR/LC_MESSAGES/gnome-power-manager.mo
+share/locale/ro/LC_MESSAGES/gnome-power-manager.mo
 share/locale/ru/LC_MESSAGES/gnome-power-manager.mo
+share/locale/si/LC_MESSAGES/gnome-power-manager.mo
 share/locale/sk/LC_MESSAGES/gnome-power-manager.mo
 share/locale/sl/LC_MESSAGES/gnome-power-manager.mo
 share/locale/sr/LC_MESSAGES/gnome-power-manager.mo
@@ -339,26 +466,62 @@ share/locale/vi/LC_MESSAGES/gnome-power-manager.mo
 share/locale/zh_CN/LC_MESSAGES/gnome-power-manager.mo
 share/locale/zh_HK/LC_MESSAGES/gnome-power-manager.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-power-manager.mo
-@dirrm share/gnome/omf/gnome-power-manager
+share/omf/gnome-power-manager/gnome-power-manager-C.omf
+share/omf/gnome-power-manager/gnome-power-manager-ca.omf
+share/omf/gnome-power-manager/gnome-power-manager-es.omf
+share/omf/gnome-power-manager/gnome-power-manager-fr.omf
+share/omf/gnome-power-manager/gnome-power-manager-hu.omf
+share/omf/gnome-power-manager/gnome-power-manager-it.omf
+share/omf/gnome-power-manager/gnome-power-manager-oc.omf
+share/omf/gnome-power-manager/gnome-power-manager-pa.omf
+share/omf/gnome-power-manager/gnome-power-manager-ru.omf
+share/omf/gnome-power-manager/gnome-power-manager-sv.omf
+@dirrm share/omf/gnome-power-manager
 @dirrm share/gnome/help/gnome-power-manager/sv/figures
 @dirrm share/gnome/help/gnome-power-manager/sv
 @dirrm share/gnome/help/gnome-power-manager/ru/figures
 @dirrm share/gnome/help/gnome-power-manager/ru
 @dirrm share/gnome/help/gnome-power-manager/pa/figures
 @dirrm share/gnome/help/gnome-power-manager/pa
+@dirrm share/gnome/help/gnome-power-manager/oc/figures
+@dirrm share/gnome/help/gnome-power-manager/oc
+@dirrm share/gnome/help/gnome-power-manager/it/figures
+@dirrm share/gnome/help/gnome-power-manager/it
 @dirrm share/gnome/help/gnome-power-manager/hu/figures
 @dirrm share/gnome/help/gnome-power-manager/hu
 @dirrm share/gnome/help/gnome-power-manager/fr/figures
 @dirrm share/gnome/help/gnome-power-manager/fr
 @dirrm share/gnome/help/gnome-power-manager/es/figures
 @dirrm share/gnome/help/gnome-power-manager/es
+@dirrm share/gnome/help/gnome-power-manager/ca/figures
+@dirrm share/gnome/help/gnome-power-manager/ca
 @dirrm share/gnome/help/gnome-power-manager/C/figures
 @dirrm share/gnome/help/gnome-power-manager/C
 @dirrm share/gnome/help/gnome-power-manager
-@dirrm share/gnome/gnome-power-manager
-@dirrmtry share/gnome/autostart
+@dirrm %%DATADIR%%/icons/hicolor/scalable/status
+@dirrm %%DATADIR%%/icons/hicolor/scalable/actions
+@dirrm %%DATADIR%%/icons/hicolor/scalable
+@dirrm %%DATADIR%%/icons/hicolor/48x48/status
+@dirrm %%DATADIR%%/icons/hicolor/48x48/actions
+@dirrm %%DATADIR%%/icons/hicolor/48x48
+@dirrm %%DATADIR%%/icons/hicolor/24x24/status
+@dirrm %%DATADIR%%/icons/hicolor/24x24/actions
+@dirrm %%DATADIR%%/icons/hicolor/24x24
+@dirrm %%DATADIR%%/icons/hicolor/22x22/status
+@dirrm %%DATADIR%%/icons/hicolor/22x22/actions
+@dirrm %%DATADIR%%/icons/hicolor/22x22
+@dirrm %%DATADIR%%/icons/hicolor/16x16/status
+@dirrm %%DATADIR%%/icons/hicolor/16x16/actions
+@dirrm %%DATADIR%%/icons/hicolor/16x16
+@dirrm %%DATADIR%%/icons/hicolor
+@dirrm %%DATADIR%%/icons
+@dirrm %%DATADIR%%
 @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/mg/LC_MESSAGES
 @dirrmtry share/locale/mg
 @dirrmtry share/locale/ku/LC_MESSAGES
@@ -367,3 +530,4 @@ share/locale/zh_TW/LC_MESSAGES/gnome-power-manager.mo
 @dirrmtry share/locale/dz
 @dirrmtry share/locale/bn_IN/LC_MESSAGES
 @dirrmtry share/locale/bn_IN
+@dirrmtry share/applications
diff --git a/sysutils/gnome-schedule/Makefile b/sysutils/gnome-schedule/Makefile
index 5ec219beeacd..075bf0e1cabe 100644
--- a/sysutils/gnome-schedule/Makefile
+++ b/sysutils/gnome-schedule/Makefile
@@ -3,12 +3,12 @@
 # Whom:			Michael Johnson <ahze@FreeBSD.org>
 #
 # $FreeBSD$
-#    $MCom: ports/sysutils/gnome-schedule/Makefile,v 1.3 2006/07/27 17:55:58 mezz Exp $
+#   $MCom: ports/sysutils/gnome-schedule/Makefile,v 1.5 2007/09/10 06:20:14 mezz Exp $
 #
 
 PORTNAME=	gnome-schedule
 PORTVERSION=	0.9.0
-PORTREVISION=	3
+PORTREVISION=	5
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -17,14 +17,14 @@ MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GNOME GUI for configuring a users crontab
 
 BUILD_DEPENDS=	yelp:${PORTSDIR}/x11/yelp
-RUN_DEPENDS=	${BUILD_DEPENDS}
+RUN_DEPENDS=	yelp:${PORTSDIR}/x11/yelp
 
 USE_BZIP2=	yes
 USE_PYTHON=	yes
 USE_GNOME=	gnomeprefix pygnome2
 USE_XLIB=	yes
 GNU_CONFIGURE=	yes
-DATADIR=	${PREFIX}/share/gnome
+DATADIR=	${PREFIX}/share
 
 PORTDOCS=	addingandediting.html index.html
 
diff --git a/sysutils/gnome-system-monitor/Makefile b/sysutils/gnome-system-monitor/Makefile
index cb99154810bc..aa8aed3101f5 100644
--- a/sysutils/gnome-system-monitor/Makefile
+++ b/sysutils/gnome-system-monitor/Makefile
@@ -3,11 +3,11 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/sysutils/gnome-system-monitor/Makefile,v 1.95 2007/03/12 23:11:28 marcus Exp $
+#   $MCom: ports/sysutils/gnome-system-monitor/Makefile,v 1.109 2007/10/15 21:02:38 mezz Exp $
 #
 
 PORTNAME=	gnome-system-monitor
-PORTVERSION=	2.18.2
+PORTVERSION=	2.20.1
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-system-monitor/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -19,7 +19,8 @@ COMMENT=	GNOME 2 system monitor program
 
 BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gnome-icon-theme.pc:${PORTSDIR}/misc/gnome-icon-theme
 LIB_DEPENDS=	gtop-2.0.7:${PORTSDIR}/devel/libgtop \
-    		pcre.0:${PORTSDIR}/devel/pcre
+    		pcre.0:${PORTSDIR}/devel/pcre \
+		gtkmm-2.4.1:${PORTSDIR}/x11-toolkits/gtkmm24
 RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gnome-icon-theme.pc:${PORTSDIR}/misc/gnome-icon-theme
 
 USE_BZIP2=	yes
@@ -29,6 +30,7 @@ INSTALLS_OMF=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix intlhack gnomehack libwnck gnomevfs2 gnomedocutils
 GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--enable-pcrecpp
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib -lutil"
 
diff --git a/sysutils/gnome-system-monitor/distinfo b/sysutils/gnome-system-monitor/distinfo
index 3ac932317156..e7cfef5ba41e 100644
--- a/sysutils/gnome-system-monitor/distinfo
+++ b/sysutils/gnome-system-monitor/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-system-monitor-2.18.2.tar.bz2) = 860047e636522af2c068dddb5df883bd
-SHA256 (gnome2/gnome-system-monitor-2.18.2.tar.bz2) = 83d1da86d7ded5402418c8e5a06b1e9d1b35edcf9b83afb55fc40053bc15c632
-SIZE (gnome2/gnome-system-monitor-2.18.2.tar.bz2) = 1734003
+MD5 (gnome2/gnome-system-monitor-2.20.1.tar.bz2) = 51d501c06ad46a185e5c2bc35f88c0bb
+SHA256 (gnome2/gnome-system-monitor-2.20.1.tar.bz2) = 19304dfcd81bd4c66eefb6d19f28fcff032aeeaa4ddc69bc4e7c9c1b38509ed6
+SIZE (gnome2/gnome-system-monitor-2.20.1.tar.bz2) = 1825337
diff --git a/sysutils/gnome-system-monitor/pkg-plist b/sysutils/gnome-system-monitor/pkg-plist
index f9c1f0318722..f099100907d6 100644
--- a/sysutils/gnome-system-monitor/pkg-plist
+++ b/sysutils/gnome-system-monitor/pkg-plist
@@ -1,5 +1,5 @@
 bin/gnome-system-monitor
-share/gnome/applications/gnome-system-monitor.desktop
+share/applications/gnome-system-monitor.desktop
 share/gnome/help/gnome-system-monitor/C/figures/addColumn.png
 share/gnome/help/gnome-system-monitor/C/figures/changePriority.png
 share/gnome/help/gnome-system-monitor/C/figures/colorPanel.png
@@ -29,6 +29,20 @@ share/gnome/help/gnome-system-monitor/bg/figures/sortMenu2.png
 share/gnome/help/gnome-system-monitor/bg/figures/systemMonitor.png
 share/gnome/help/gnome-system-monitor/bg/figures/viewMenu.png
 share/gnome/help/gnome-system-monitor/bg/gnome-system-monitor.xml
+share/gnome/help/gnome-system-monitor/ca/figures/addColumn.png
+share/gnome/help/gnome-system-monitor/ca/figures/changePriority.png
+share/gnome/help/gnome-system-monitor/ca/figures/colorPanel.png
+share/gnome/help/gnome-system-monitor/ca/figures/columnContextMenu.png
+share/gnome/help/gnome-system-monitor/ca/figures/gnome-system-monitor_window.png
+share/gnome/help/gnome-system-monitor/ca/figures/memoryMaps.png
+share/gnome/help/gnome-system-monitor/ca/figures/moreInfo.png
+share/gnome/help/gnome-system-monitor/ca/figures/processListing.png
+share/gnome/help/gnome-system-monitor/ca/figures/sortButton.png
+share/gnome/help/gnome-system-monitor/ca/figures/sortMenu.png
+share/gnome/help/gnome-system-monitor/ca/figures/sortMenu2.png
+share/gnome/help/gnome-system-monitor/ca/figures/systemMonitor.png
+share/gnome/help/gnome-system-monitor/ca/figures/viewMenu.png
+share/gnome/help/gnome-system-monitor/ca/gnome-system-monitor.xml
 share/gnome/help/gnome-system-monitor/es/figures/addColumn.png
 share/gnome/help/gnome-system-monitor/es/figures/changePriority.png
 share/gnome/help/gnome-system-monitor/es/figures/colorPanel.png
@@ -57,6 +71,20 @@ share/gnome/help/gnome-system-monitor/fr/figures/sortMenu2.png
 share/gnome/help/gnome-system-monitor/fr/figures/systemMonitor.png
 share/gnome/help/gnome-system-monitor/fr/figures/viewMenu.png
 share/gnome/help/gnome-system-monitor/fr/gnome-system-monitor.xml
+share/gnome/help/gnome-system-monitor/oc/figures/addColumn.png
+share/gnome/help/gnome-system-monitor/oc/figures/changePriority.png
+share/gnome/help/gnome-system-monitor/oc/figures/colorPanel.png
+share/gnome/help/gnome-system-monitor/oc/figures/columnContextMenu.png
+share/gnome/help/gnome-system-monitor/oc/figures/gnome-system-monitor_window.png
+share/gnome/help/gnome-system-monitor/oc/figures/memoryMaps.png
+share/gnome/help/gnome-system-monitor/oc/figures/moreInfo.png
+share/gnome/help/gnome-system-monitor/oc/figures/processListing.png
+share/gnome/help/gnome-system-monitor/oc/figures/sortButton.png
+share/gnome/help/gnome-system-monitor/oc/figures/sortMenu.png
+share/gnome/help/gnome-system-monitor/oc/figures/sortMenu2.png
+share/gnome/help/gnome-system-monitor/oc/figures/systemMonitor.png
+share/gnome/help/gnome-system-monitor/oc/figures/viewMenu.png
+share/gnome/help/gnome-system-monitor/oc/gnome-system-monitor.xml
 share/gnome/help/gnome-system-monitor/pa/figures/addColumn.png
 share/gnome/help/gnome-system-monitor/pa/figures/changePriority.png
 share/gnome/help/gnome-system-monitor/pa/figures/colorPanel.png
@@ -85,13 +113,6 @@ share/gnome/help/gnome-system-monitor/sv/figures/sortMenu2.png
 share/gnome/help/gnome-system-monitor/sv/figures/systemMonitor.png
 share/gnome/help/gnome-system-monitor/sv/figures/viewMenu.png
 share/gnome/help/gnome-system-monitor/sv/gnome-system-monitor.xml
-share/gnome/omf/gnome-system-monitor/gnome-system-monitor-C.omf
-share/gnome/omf/gnome-system-monitor/gnome-system-monitor-bg.omf
-share/gnome/omf/gnome-system-monitor/gnome-system-monitor-es.omf
-share/gnome/omf/gnome-system-monitor/gnome-system-monitor-fr.omf
-share/gnome/omf/gnome-system-monitor/gnome-system-monitor-pa.omf
-share/gnome/omf/gnome-system-monitor/gnome-system-monitor-sv.omf
-share/gnome/pixmaps/gnome-system-monitor/side.png
 share/locale/am/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/ar/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/az/LC_MESSAGES/gnome-system-monitor.mo
@@ -141,6 +162,7 @@ share/locale/nb/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/ne/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/nl/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/nn/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/oc/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/or/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/pa/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/pl/LC_MESSAGES/gnome-system-monitor.mo
@@ -149,6 +171,7 @@ share/locale/pt_BR/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/ro/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/ru/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/rw/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/si/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/sk/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/sl/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/sq/LC_MESSAGES/gnome-system-monitor.mo
@@ -156,6 +179,7 @@ share/locale/sr/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/sr@Latn/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/sv/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/ta/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/te/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/th/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/tr/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/ug/LC_MESSAGES/gnome-system-monitor.mo
@@ -164,12 +188,46 @@ share/locale/vi/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/zh_CN/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/zh_HK/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-system-monitor.mo
+share/omf/gnome-system-monitor/gnome-system-monitor-C.omf
+share/omf/gnome-system-monitor/gnome-system-monitor-bg.omf
+share/omf/gnome-system-monitor/gnome-system-monitor-ca.omf
+share/omf/gnome-system-monitor/gnome-system-monitor-es.omf
+share/omf/gnome-system-monitor/gnome-system-monitor-fr.omf
+share/omf/gnome-system-monitor/gnome-system-monitor-oc.omf
+share/omf/gnome-system-monitor/gnome-system-monitor-pa.omf
+share/omf/gnome-system-monitor/gnome-system-monitor-sv.omf
+share/pixmaps/gnome-system-monitor/side.png
+@dirrm share/pixmaps/gnome-system-monitor
+@dirrm share/omf/gnome-system-monitor
+@dirrm share/gnome/help/gnome-system-monitor/sv/figures
+@dirrm share/gnome/help/gnome-system-monitor/sv
+@dirrm share/gnome/help/gnome-system-monitor/pa/figures
+@dirrm share/gnome/help/gnome-system-monitor/pa
+@dirrm share/gnome/help/gnome-system-monitor/oc/figures
+@dirrm share/gnome/help/gnome-system-monitor/oc
+@dirrm share/gnome/help/gnome-system-monitor/fr/figures
+@dirrm share/gnome/help/gnome-system-monitor/fr
+@dirrm share/gnome/help/gnome-system-monitor/es/figures
+@dirrm share/gnome/help/gnome-system-monitor/es
+@dirrm share/gnome/help/gnome-system-monitor/ca/figures
+@dirrm share/gnome/help/gnome-system-monitor/ca
+@dirrm share/gnome/help/gnome-system-monitor/bg/figures
+@dirrm share/gnome/help/gnome-system-monitor/bg
+@dirrm share/gnome/help/gnome-system-monitor/C/figures
+@dirrm share/gnome/help/gnome-system-monitor/C
+@dirrm share/gnome/help/gnome-system-monitor
 @dirrmtry share/locale/zh_HK/LC_MESSAGES
 @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/mg/LC_MESSAGES
@@ -180,18 +238,4 @@ share/locale/zh_TW/LC_MESSAGES/gnome-system-monitor.mo
 @dirrmtry share/locale/dz
 @dirrmtry share/locale/bn_IN/LC_MESSAGES
 @dirrmtry share/locale/bn_IN
-@dirrm share/gnome/pixmaps/gnome-system-monitor
-@dirrm share/gnome/omf/gnome-system-monitor
-@dirrm share/gnome/help/gnome-system-monitor/sv/figures
-@dirrm share/gnome/help/gnome-system-monitor/sv
-@dirrm share/gnome/help/gnome-system-monitor/pa/figures
-@dirrm share/gnome/help/gnome-system-monitor/pa
-@dirrm share/gnome/help/gnome-system-monitor/fr/figures
-@dirrm share/gnome/help/gnome-system-monitor/fr
-@dirrm share/gnome/help/gnome-system-monitor/es/figures
-@dirrm share/gnome/help/gnome-system-monitor/es
-@dirrm share/gnome/help/gnome-system-monitor/bg/figures
-@dirrm share/gnome/help/gnome-system-monitor/bg
-@dirrm share/gnome/help/gnome-system-monitor/C/figures
-@dirrm share/gnome/help/gnome-system-monitor/C
-@dirrm share/gnome/help/gnome-system-monitor
+@dirrmtry share/applications
diff --git a/sysutils/gnome-system-tools/Makefile b/sysutils/gnome-system-tools/Makefile
index e048f695e1da..52467f1877de 100644
--- a/sysutils/gnome-system-tools/Makefile
+++ b/sysutils/gnome-system-tools/Makefile
@@ -3,11 +3,10 @@
 # Whom:					Adam Weinberger <adamw@FreeBSD.org>
 #
 # $FreeBSD$
-#    $MCom: ports/sysutils/gnome-system-tools/Makefile,v 1.59 2007/03/12 12:55:31 ahze Exp $
+#    $MCom: ports/sysutils/gnome-system-tools/Makefile,v 1.68 2007/09/16 16:56:43 ahze Exp $
 
 PORTNAME=	gnome-system-tools
-PORTVERSION=	2.18.1
-PORTREVISION=	2
+PORTVERSION=	2.20.0
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-system-tools/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -35,8 +34,4 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 
 GCONF_SCHEMAS=	gnome-system-tools.schemas
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|$${prefix}/$${DATADIRNAME}|$${datadir}|g' \
-	    	${WRKSRC}/configure
-
 .include <bsd.port.mk>
diff --git a/sysutils/gnome-system-tools/distinfo b/sysutils/gnome-system-tools/distinfo
index 51b2ba709ede..1317b19b6e8d 100644
--- a/sysutils/gnome-system-tools/distinfo
+++ b/sysutils/gnome-system-tools/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-system-tools-2.18.1.tar.bz2) = e55a1a37084fe4f5739109e00af81b86
-SHA256 (gnome2/gnome-system-tools-2.18.1.tar.bz2) = 3f591326901f5c9457a670484d5264f286df55f7f274878cf9edd19d8991f7e7
-SIZE (gnome2/gnome-system-tools-2.18.1.tar.bz2) = 2845382
+MD5 (gnome2/gnome-system-tools-2.20.0.tar.bz2) = 382ed1f5ad4cb6ce7b88985611e2be18
+SHA256 (gnome2/gnome-system-tools-2.20.0.tar.bz2) = 5635b305322ee4d1e2dddd3a9b9f4b29f195663f4c51e77428f81f6bbd325581
+SIZE (gnome2/gnome-system-tools-2.20.0.tar.bz2) = 3226583
diff --git a/sysutils/gnome-system-tools/pkg-plist b/sysutils/gnome-system-tools/pkg-plist
index 6865d5fc1355..95534a249571 100644
--- a/sysutils/gnome-system-tools/pkg-plist
+++ b/sysutils/gnome-system-tools/pkg-plist
@@ -7,32 +7,38 @@ lib/nautilus/extensions-1.0/libnautilus-gst-shares.a
 lib/nautilus/extensions-1.0/libnautilus-gst-shares.la
 lib/nautilus/extensions-1.0/libnautilus-gst-shares.so
 libdata/pkgconfig/gnome-system-tools.pc
-share/gnome/applications/network.desktop
-share/gnome/applications/services.desktop
-share/gnome/applications/shares.desktop
-share/gnome/applications/time.desktop
-share/gnome/applications/users.desktop
-share/gnome/gnome-system-tools/interfaces/boot.glade
-share/gnome/gnome-system-tools/interfaces/common.glade
-share/gnome/gnome-system-tools/interfaces/disks.glade
-share/gnome/gnome-system-tools/interfaces/network.glade
-share/gnome/gnome-system-tools/interfaces/services.glade
-share/gnome/gnome-system-tools/interfaces/shares.glade
-share/gnome/gnome-system-tools/interfaces/time.glade
-share/gnome/gnome-system-tools/interfaces/users.glade
-share/gnome/gnome-system-tools/pixmaps/world_map-960.png
+share/applications/network.desktop
+share/applications/services.desktop
+share/applications/shares.desktop
+share/applications/time.desktop
+share/applications/users.desktop
+%%DATADIR%%/interfaces/boot.glade
+%%DATADIR%%/interfaces/common.glade
+%%DATADIR%%/interfaces/disks.glade
+%%DATADIR%%/interfaces/network.glade
+%%DATADIR%%/interfaces/services.glade
+%%DATADIR%%/interfaces/shares.glade
+%%DATADIR%%/interfaces/time.glade
+%%DATADIR%%/interfaces/users.glade
+%%DATADIR%%/pixmaps/world_map-960.png
 share/gnome/help/network-admin/C/figures/network-tool.png
 share/gnome/help/network-admin/C/legal.xml
 share/gnome/help/network-admin/C/network-admin.xml
+share/gnome/help/network-admin/ca/figures/network-tool.png
+share/gnome/help/network-admin/ca/network-admin.xml
 share/gnome/help/network-admin/es/figures/network-tool.png
 share/gnome/help/network-admin/es/network-admin.xml
 share/gnome/help/network-admin/fr/figures/network-tool.png
 share/gnome/help/network-admin/fr/network-admin.xml
+share/gnome/help/network-admin/oc/figures/network-tool.png
+share/gnome/help/network-admin/oc/network-admin.xml
 share/gnome/help/network-admin/sv/figures/network-tool.png
 share/gnome/help/network-admin/sv/network-admin.xml
 share/gnome/help/services-admin/C/figures/services-tool.png
 share/gnome/help/services-admin/C/legal.xml
 share/gnome/help/services-admin/C/services-admin.xml
+share/gnome/help/services-admin/ca/figures/services-tool.png
+share/gnome/help/services-admin/ca/services-admin.xml
 share/gnome/help/services-admin/es/figures/services-tool.png
 share/gnome/help/services-admin/es/services-admin.xml
 share/gnome/help/services-admin/fr/figures/services-tool.png
@@ -41,13 +47,21 @@ share/gnome/help/services-admin/nl/figures/service-properties.png
 share/gnome/help/services-admin/nl/figures/services-tool.png
 share/gnome/help/services-admin/nl/legal.xml
 share/gnome/help/services-admin/nl/services-admin.xml
+share/gnome/help/services-admin/oc/figures/services-tool.png
+share/gnome/help/services-admin/oc/services-admin.xml
 share/gnome/help/services-admin/sv/figures/services-tool.png
 share/gnome/help/services-admin/sv/services-admin.xml
 share/gnome/help/shares-admin/C/figures/shares-tool.png
 share/gnome/help/shares-admin/C/legal.xml
 share/gnome/help/shares-admin/C/shares-admin.xml
+share/gnome/help/shares-admin/ca/figures/shares-tool.png
+share/gnome/help/shares-admin/ca/shares-admin.xml
+share/gnome/help/shares-admin/es/figures/shares-tool.png
+share/gnome/help/shares-admin/es/shares-admin.xml
 share/gnome/help/shares-admin/fr/figures/shares-tool.png
 share/gnome/help/shares-admin/fr/shares-admin.xml
+share/gnome/help/shares-admin/oc/figures/shares-tool.png
+share/gnome/help/shares-admin/oc/shares-admin.xml
 share/gnome/help/shares-admin/sv/figures/shares-tool.png
 share/gnome/help/shares-admin/sv/shares-admin.xml
 share/gnome/help/time-admin/C/figures/time-map.png
@@ -56,6 +70,11 @@ share/gnome/help/time-admin/C/figures/time-tool-automatic.png
 share/gnome/help/time-admin/C/figures/time-tool-manual.png
 share/gnome/help/time-admin/C/legal.xml
 share/gnome/help/time-admin/C/time-admin.xml
+share/gnome/help/time-admin/ca/figures/time-map.png
+share/gnome/help/time-admin/ca/figures/time-servers.png
+share/gnome/help/time-admin/ca/figures/time-tool-automatic.png
+share/gnome/help/time-admin/ca/figures/time-tool-manual.png
+share/gnome/help/time-admin/ca/time-admin.xml
 share/gnome/help/time-admin/es/figures/time-map.png
 share/gnome/help/time-admin/es/figures/time-servers.png
 share/gnome/help/time-admin/es/figures/time-tool-automatic.png
@@ -71,6 +90,11 @@ share/gnome/help/time-admin/nl/figures/time-servers.png
 share/gnome/help/time-admin/nl/figures/time-tool.png
 share/gnome/help/time-admin/nl/legal.xml
 share/gnome/help/time-admin/nl/time-admin.xml
+share/gnome/help/time-admin/oc/figures/time-map.png
+share/gnome/help/time-admin/oc/figures/time-servers.png
+share/gnome/help/time-admin/oc/figures/time-tool-automatic.png
+share/gnome/help/time-admin/oc/figures/time-tool-manual.png
+share/gnome/help/time-admin/oc/time-admin.xml
 share/gnome/help/time-admin/ru/figures/time-map.png
 share/gnome/help/time-admin/ru/figures/time-servers.png
 share/gnome/help/time-admin/ru/figures/time-tool-automatic.png
@@ -84,43 +108,25 @@ share/gnome/help/time-admin/sv/time-admin.xml
 share/gnome/help/users-admin/C/figures/users-tool.png
 share/gnome/help/users-admin/C/legal.xml
 share/gnome/help/users-admin/C/users-admin.xml
+share/gnome/help/users-admin/ca/figures/users-tool.png
+share/gnome/help/users-admin/ca/users-admin.xml
 share/gnome/help/users-admin/es/figures/users-tool.png
 share/gnome/help/users-admin/es/users-admin.xml
 share/gnome/help/users-admin/fr/figures/users-tool.png
 share/gnome/help/users-admin/fr/users-admin.xml
+share/gnome/help/users-admin/oc/figures/users-tool.png
+share/gnome/help/users-admin/oc/users-admin.xml
 share/gnome/help/users-admin/ru/figures/users-tool.png
 share/gnome/help/users-admin/ru/users-admin.xml
 share/gnome/help/users-admin/sv/figures/users-tool.png
 share/gnome/help/users-admin/sv/users-admin.xml
-share/gnome/omf/gnome-system-tools/services-admin-nl.omf
-share/gnome/omf/gnome-system-tools/time-admin-nl.omf
-share/gnome/omf/network-admin/network-admin-C.omf
-share/gnome/omf/network-admin/network-admin-es.omf
-share/gnome/omf/network-admin/network-admin-fr.omf
-share/gnome/omf/network-admin/network-admin-sv.omf
-share/gnome/omf/services-admin/services-admin-C.omf
-share/gnome/omf/services-admin/services-admin-es.omf
-share/gnome/omf/services-admin/services-admin-fr.omf
-share/gnome/omf/services-admin/services-admin-sv.omf
-share/gnome/omf/shares-admin/shares-admin-C.omf
-share/gnome/omf/shares-admin/shares-admin-fr.omf
-share/gnome/omf/shares-admin/shares-admin-sv.omf
-share/gnome/omf/time-admin/time-admin-C.omf
-share/gnome/omf/time-admin/time-admin-es.omf
-share/gnome/omf/time-admin/time-admin-fr.omf
-share/gnome/omf/time-admin/time-admin-ru.omf
-share/gnome/omf/time-admin/time-admin-sv.omf
-share/gnome/omf/users-admin/users-admin-C.omf
-share/gnome/omf/users-admin/users-admin-es.omf
-share/gnome/omf/users-admin/users-admin-fr.omf
-share/gnome/omf/users-admin/users-admin-ru.omf
-share/gnome/omf/users-admin/users-admin-sv.omf
 share/icons/hicolor/48x48/devices/irda.png
 share/icons/hicolor/48x48/devices/plip.png
 share/locale/am/LC_MESSAGES/gnome-system-tools.mo
 share/locale/ar/LC_MESSAGES/gnome-system-tools.mo
 share/locale/az/LC_MESSAGES/gnome-system-tools.mo
 share/locale/be/LC_MESSAGES/gnome-system-tools.mo
+share/locale/be@latin/LC_MESSAGES/gnome-system-tools.mo
 share/locale/bg/LC_MESSAGES/gnome-system-tools.mo
 share/locale/bn/LC_MESSAGES/gnome-system-tools.mo
 share/locale/bn_IN/LC_MESSAGES/gnome-system-tools.mo
@@ -163,6 +169,7 @@ share/locale/nb/LC_MESSAGES/gnome-system-tools.mo
 share/locale/ne/LC_MESSAGES/gnome-system-tools.mo
 share/locale/nl/LC_MESSAGES/gnome-system-tools.mo
 share/locale/nn/LC_MESSAGES/gnome-system-tools.mo
+share/locale/oc/LC_MESSAGES/gnome-system-tools.mo
 share/locale/or/LC_MESSAGES/gnome-system-tools.mo
 share/locale/pa/LC_MESSAGES/gnome-system-tools.mo
 share/locale/pl/LC_MESSAGES/gnome-system-tools.mo
@@ -171,6 +178,7 @@ share/locale/pt_BR/LC_MESSAGES/gnome-system-tools.mo
 share/locale/ro/LC_MESSAGES/gnome-system-tools.mo
 share/locale/ru/LC_MESSAGES/gnome-system-tools.mo
 share/locale/rw/LC_MESSAGES/gnome-system-tools.mo
+share/locale/si/LC_MESSAGES/gnome-system-tools.mo
 share/locale/sk/LC_MESSAGES/gnome-system-tools.mo
 share/locale/sq/LC_MESSAGES/gnome-system-tools.mo
 share/locale/sr/LC_MESSAGES/gnome-system-tools.mo
@@ -186,20 +194,58 @@ share/locale/xh/LC_MESSAGES/gnome-system-tools.mo
 share/locale/zh_CN/LC_MESSAGES/gnome-system-tools.mo
 share/locale/zh_HK/LC_MESSAGES/gnome-system-tools.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-system-tools.mo
-@dirrm share/gnome/omf/users-admin
-@dirrm share/gnome/omf/time-admin
-@dirrm share/gnome/omf/shares-admin
-@dirrm share/gnome/omf/services-admin
-@dirrm share/gnome/omf/network-admin
-@dirrm share/gnome/omf/gnome-system-tools
+share/omf/gnome-system-tools/services-admin-nl.omf
+share/omf/gnome-system-tools/time-admin-nl.omf
+share/omf/network-admin/network-admin-C.omf
+share/omf/network-admin/network-admin-ca.omf
+share/omf/network-admin/network-admin-es.omf
+share/omf/network-admin/network-admin-fr.omf
+share/omf/network-admin/network-admin-oc.omf
+share/omf/network-admin/network-admin-sv.omf
+share/omf/services-admin/services-admin-C.omf
+share/omf/services-admin/services-admin-ca.omf
+share/omf/services-admin/services-admin-es.omf
+share/omf/services-admin/services-admin-fr.omf
+share/omf/services-admin/services-admin-oc.omf
+share/omf/services-admin/services-admin-sv.omf
+share/omf/shares-admin/shares-admin-C.omf
+share/omf/shares-admin/shares-admin-ca.omf
+share/omf/shares-admin/shares-admin-es.omf
+share/omf/shares-admin/shares-admin-fr.omf
+share/omf/shares-admin/shares-admin-oc.omf
+share/omf/shares-admin/shares-admin-sv.omf
+share/omf/time-admin/time-admin-C.omf
+share/omf/time-admin/time-admin-ca.omf
+share/omf/time-admin/time-admin-es.omf
+share/omf/time-admin/time-admin-fr.omf
+share/omf/time-admin/time-admin-oc.omf
+share/omf/time-admin/time-admin-ru.omf
+share/omf/time-admin/time-admin-sv.omf
+share/omf/users-admin/users-admin-C.omf
+share/omf/users-admin/users-admin-ca.omf
+share/omf/users-admin/users-admin-es.omf
+share/omf/users-admin/users-admin-fr.omf
+share/omf/users-admin/users-admin-oc.omf
+share/omf/users-admin/users-admin-ru.omf
+share/omf/users-admin/users-admin-sv.omf
+@dirrm share/omf/users-admin
+@dirrm share/omf/time-admin
+@dirrm share/omf/shares-admin
+@dirrm share/omf/services-admin
+@dirrm share/omf/network-admin
+@dirrm share/omf/gnome-system-tools
 @dirrm share/gnome/help/users-admin/sv/figures
 @dirrm share/gnome/help/users-admin/sv
 @dirrm share/gnome/help/users-admin/ru/figures
 @dirrm share/gnome/help/users-admin/ru
+@dirrm share/gnome/help/users-admin/oc/figures
+@dirrm share/gnome/help/users-admin/oc
 @dirrm share/gnome/help/users-admin/fr/figures
 @dirrm share/gnome/help/users-admin/fr
 @dirrm share/gnome/help/users-admin/es/figures
 @dirrm share/gnome/help/users-admin/es
+@dirrm share/gnome/help/users-admin/ca/figures
+@dirrm share/gnome/help/users-admin/ca
 @dirrm share/gnome/help/users-admin/C/figures
 @dirrm share/gnome/help/users-admin/C
 @dirrm share/gnome/help/users-admin
@@ -207,51 +253,73 @@ share/locale/zh_TW/LC_MESSAGES/gnome-system-tools.mo
 @dirrm share/gnome/help/time-admin/sv
 @dirrm share/gnome/help/time-admin/ru/figures
 @dirrm share/gnome/help/time-admin/ru
+@dirrm share/gnome/help/time-admin/oc/figures
+@dirrm share/gnome/help/time-admin/oc
 @dirrm share/gnome/help/time-admin/nl/figures
 @dirrm share/gnome/help/time-admin/nl
 @dirrm share/gnome/help/time-admin/fr/figures
 @dirrm share/gnome/help/time-admin/fr
 @dirrm share/gnome/help/time-admin/es/figures
 @dirrm share/gnome/help/time-admin/es
+@dirrm share/gnome/help/time-admin/ca/figures
+@dirrm share/gnome/help/time-admin/ca
 @dirrm share/gnome/help/time-admin/C/figures
 @dirrm share/gnome/help/time-admin/C
 @dirrm share/gnome/help/time-admin
 @dirrm share/gnome/help/shares-admin/sv/figures
 @dirrm share/gnome/help/shares-admin/sv
+@dirrm share/gnome/help/shares-admin/oc/figures
+@dirrm share/gnome/help/shares-admin/oc
 @dirrm share/gnome/help/shares-admin/fr/figures
 @dirrm share/gnome/help/shares-admin/fr
+@dirrm share/gnome/help/shares-admin/es/figures
+@dirrm share/gnome/help/shares-admin/es
+@dirrm share/gnome/help/shares-admin/ca/figures
+@dirrm share/gnome/help/shares-admin/ca
 @dirrm share/gnome/help/shares-admin/C/figures
 @dirrm share/gnome/help/shares-admin/C
 @dirrm share/gnome/help/shares-admin
 @dirrm share/gnome/help/services-admin/sv/figures
 @dirrm share/gnome/help/services-admin/sv
+@dirrm share/gnome/help/services-admin/oc/figures
+@dirrm share/gnome/help/services-admin/oc
 @dirrm share/gnome/help/services-admin/nl/figures
 @dirrm share/gnome/help/services-admin/nl
 @dirrm share/gnome/help/services-admin/fr/figures
 @dirrm share/gnome/help/services-admin/fr
 @dirrm share/gnome/help/services-admin/es/figures
 @dirrm share/gnome/help/services-admin/es
+@dirrm share/gnome/help/services-admin/ca/figures
+@dirrm share/gnome/help/services-admin/ca
 @dirrm share/gnome/help/services-admin/C/figures
 @dirrm share/gnome/help/services-admin/C
 @dirrm share/gnome/help/services-admin
 @dirrm share/gnome/help/network-admin/sv/figures
 @dirrm share/gnome/help/network-admin/sv
+@dirrm share/gnome/help/network-admin/oc/figures
+@dirrm share/gnome/help/network-admin/oc
 @dirrm share/gnome/help/network-admin/fr/figures
 @dirrm share/gnome/help/network-admin/fr
 @dirrm share/gnome/help/network-admin/es/figures
 @dirrm share/gnome/help/network-admin/es
+@dirrm share/gnome/help/network-admin/ca/figures
+@dirrm share/gnome/help/network-admin/ca
 @dirrm share/gnome/help/network-admin/C/figures
 @dirrm share/gnome/help/network-admin/C
 @dirrm share/gnome/help/network-admin
-@dirrm share/gnome/gnome-system-tools/pixmaps
-@dirrm share/gnome/gnome-system-tools/interfaces
-@dirrm share/gnome/gnome-system-tools
+@dirrm %%DATADIR%%/pixmaps
+@dirrm %%DATADIR%%/interfaces
+@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/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
@@ -260,3 +328,6 @@ share/locale/zh_TW/LC_MESSAGES/gnome-system-tools.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/sysutils/gnome-volume-manager/Makefile b/sysutils/gnome-volume-manager/Makefile
index 43fcb70ae3c1..e291787b154b 100644
--- a/sysutils/gnome-volume-manager/Makefile
+++ b/sysutils/gnome-volume-manager/Makefile
@@ -3,12 +3,12 @@
 # Whom:				Jean-Yves Lefort <jylefort@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/sysutils/gnome-volume-manager/Makefile,v 1.13 2007/03/09 22:15:17 mezz Exp $
+#   $MCom: ports/sysutils/gnome-volume-manager/Makefile,v 1.19 2007/10/17 04:15:23 marcus Exp $
 #
 
 PORTNAME=	gnome-volume-manager
 PORTVERSION=	2.17.0
-PORTREVISION=	6
+PORTREVISION=	8
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:R}
diff --git a/sysutils/gnome-volume-manager/pkg-plist b/sysutils/gnome-volume-manager/pkg-plist
index 035e5037d15f..49ded72dd76e 100644
--- a/sysutils/gnome-volume-manager/pkg-plist
+++ b/sysutils/gnome-volume-manager/pkg-plist
@@ -1,9 +1,9 @@
 bin/gnome-volume-manager
 bin/gnome-volume-properties
-share/gnome/applications/gnome-volume-properties.desktop
+share/applications/gnome-volume-properties.desktop
 share/gnome/autostart/gnome-volume-manager.desktop
-share/gnome/gnome-volume-manager/gnome-volume-properties.glade
-share/gnome/gnome-volume-manager/icons/gvm-dev-tablet.png
+share/gnome-volume-manager/gnome-volume-properties.glade
+share/gnome-volume-manager/icons/gvm-dev-tablet.png
 share/locale/ang/LC_MESSAGES/gnome-volume-manager.mo
 share/locale/ar/LC_MESSAGES/gnome-volume-manager.mo
 share/locale/az/LC_MESSAGES/gnome-volume-manager.mo
@@ -73,9 +73,8 @@ share/locale/xh/LC_MESSAGES/gnome-volume-manager.mo
 share/locale/zh_CN/LC_MESSAGES/gnome-volume-manager.mo
 share/locale/zh_HK/LC_MESSAGES/gnome-volume-manager.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-volume-manager.mo
-@dirrmtry share/gnome/autostart
-@dirrm share/gnome/gnome-volume-manager/icons
-@dirrm share/gnome/gnome-volume-manager
+@dirrm share/gnome-volume-manager/icons
+@dirrm share/gnome-volume-manager
 @dirrmtry share/locale/zh_HK/LC_MESSAGES
 @dirrmtry share/locale/zh_HK
 @dirrmtry share/locale/xh/LC_MESSAGES
@@ -92,3 +91,4 @@ share/locale/zh_TW/LC_MESSAGES/gnome-volume-manager.mo
 @dirrmtry share/locale/bn_IN
 @dirrmtry share/locale/ang/LC_MESSAGES
 @dirrmtry share/locale/ang
+@dirrmtry share/applications
diff --git a/sysutils/gnomebaker/Makefile b/sysutils/gnomebaker/Makefile
index bcf7ca0100f2..3fdef2f660db 100644
--- a/sysutils/gnomebaker/Makefile
+++ b/sysutils/gnomebaker/Makefile
@@ -3,10 +3,11 @@
 # Whom:                Dominique Goncalves <dominique.goncalves@gmail.com>
 #
 # $FreeBSD$
+#
 
 PORTNAME=		gnomebaker
 PORTVERSION=		0.6.1
-PORTREVISION=		3
+PORTREVISION=		4
 CATEGORIES=		sysutils gnome
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	gnomebaker
@@ -38,12 +39,6 @@ RUN_DEPENDS+=		cdrdao:${PORTSDIR}/sysutils/cdrdao
 RUN_DEPENDS+=		growisofs:${PORTSDIR}/sysutils/dvd+rw-tools
 .endif
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|docdir = $(datadir)/gnome/help/$(docname)/$(lang)|docdir = $(datadir)/help/$(docname)/$(lang)|' \
-		${WRKSRC}/help/C/Makefile.in
-	@${REINPLACE_CMD} -e 's|Icon=@prefix@/share/gnomebaker/gnomebaker-48.png|Icon=@prefix@/share/gnome/gnomebaker/gnomebaker-48.png|' \
-		${WRKSRC}/gnomebaker.desktop.in
-
 post-install:
 	@-update-desktop-database
 
diff --git a/sysutils/gnomebaker/pkg-plist b/sysutils/gnomebaker/pkg-plist
index a3d27ec3597e..b3ea116c369a 100644
--- a/sysutils/gnomebaker/pkg-plist
+++ b/sysutils/gnomebaker/pkg-plist
@@ -1,37 +1,37 @@
 bin/gnomebaker
-share/gnome/applications/gnomebaker.desktop
-share/gnome/gnomebaker/BurnFailed.wav
-share/gnome/gnomebaker/BurnOk.wav
-share/gnome/gnomebaker/baker-add-dir.png
-share/gnome/gnomebaker/baker-add-files.png
-share/gnome/gnomebaker/baker-audio-copy.png
-share/gnome/gnomebaker/baker-blank-cdrw.png
-share/gnome/gnomebaker/baker-blank-dvdrw.png
-share/gnome/gnomebaker/baker-burn-cd.png
-share/gnome/gnomebaker/baker-cd-iso.png
-share/gnome/gnomebaker/baker-cd.png
-share/gnome/gnomebaker/baker-cue-image.png
-share/gnome/gnomebaker/baker-data-copy.png
-share/gnome/gnomebaker/baker-dvd-iso.png
-share/gnome/gnomebaker/baker-import-session.png
-share/gnome/gnomebaker/baker-remove-files.png
-share/gnome/gnomebaker/gnomebaker-48.png
-share/gnome/gnomebaker/gnomebaker.glade
-share/gnome/gnomebaker/splash_2.png
-share/gnome/gnomebaker/state00.png
-share/gnome/gnomebaker/state01.png
-share/gnome/gnomebaker/state02.png
-share/gnome/gnomebaker/state03.png
-share/gnome/gnomebaker/state04.png
-share/gnome/gnomebaker/state05.png
-share/gnome/gnomebaker/state06.png
-share/gnome/gnomebaker/state07.png
-share/gnome/gnomebaker/state08.png
-share/gnome/gnomebaker/state09.png
-share/gnome/gnomebaker/state10.png
-share/gnome/gnomebaker/state11.png
-share/gnome/gnomebaker/state12.png
-share/gnome/gnomebaker/state13.png
+share/applications/gnomebaker.desktop
+share/gnomebaker/BurnFailed.wav
+share/gnomebaker/BurnOk.wav
+share/gnomebaker/baker-add-dir.png
+share/gnomebaker/baker-add-files.png
+share/gnomebaker/baker-audio-copy.png
+share/gnomebaker/baker-blank-cdrw.png
+share/gnomebaker/baker-blank-dvdrw.png
+share/gnomebaker/baker-burn-cd.png
+share/gnomebaker/baker-cd-iso.png
+share/gnomebaker/baker-cd.png
+share/gnomebaker/baker-cue-image.png
+share/gnomebaker/baker-data-copy.png
+share/gnomebaker/baker-dvd-iso.png
+share/gnomebaker/baker-import-session.png
+share/gnomebaker/baker-remove-files.png
+share/gnomebaker/gnomebaker-48.png
+share/gnomebaker/gnomebaker.glade
+share/gnomebaker/splash_2.png
+share/gnomebaker/state00.png
+share/gnomebaker/state01.png
+share/gnomebaker/state02.png
+share/gnomebaker/state03.png
+share/gnomebaker/state04.png
+share/gnomebaker/state05.png
+share/gnomebaker/state06.png
+share/gnomebaker/state07.png
+share/gnomebaker/state08.png
+share/gnomebaker/state09.png
+share/gnomebaker/state10.png
+share/gnomebaker/state11.png
+share/gnomebaker/state12.png
+share/gnomebaker/state13.png
 share/gnome/help/gnomebaker/C/figures/gnomebaker-blank-cdrw.png
 share/gnome/help/gnomebaker/C/figures/gnomebaker-burn-iso.png
 share/gnome/help/gnomebaker/C/figures/gnomebaker-copy-audio-cd.png
@@ -43,7 +43,7 @@ share/gnome/help/gnomebaker/C/figures/gnomebaker_prefs-tmp.png
 share/gnome/help/gnomebaker/C/figures/gnomebaker_window.png
 share/gnome/help/gnomebaker/C/gnomebaker.xml
 share/gnome/help/gnomebaker/C/legal.xml
-share/gnome/omf/gnomebaker/gnomebaker-C.omf
+share/omf/gnomebaker/gnomebaker-C.omf
 share/icons/hicolor/48x48/apps/gnomebaker-48.png
 share/icons/hicolor/icon-theme.cache
 share/locale/af/LC_MESSAGES/gnomebaker.mo
@@ -159,10 +159,11 @@ share/locale/zh_TW/LC_MESSAGES/gnomebaker.mo
 @dirrmtry share/icons/hicolor/48x48
 @dirrmtry share/icons/hicolor
 @dirrmtry share/icons
-@dirrm share/gnome/omf/gnomebaker
+@dirrm share/omf/gnomebaker
 @dirrm share/gnome/help/gnomebaker/C/figures
 @dirrm share/gnome/help/gnomebaker/C
 @dirrm share/gnome/help/gnomebaker
-@dirrm share/gnome/gnomebaker
+@dirrm share/gnomebaker
 @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/sysutils/gnomefind/Makefile b/sysutils/gnomefind/Makefile
index a145fcae6a1a..5a77f08ce2cb 100644
--- a/sysutils/gnomefind/Makefile
+++ b/sysutils/gnomefind/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gnomefind
 PORTVERSION=	1.0.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	gnome-find
diff --git a/sysutils/gnomefind/pkg-plist b/sysutils/gnomefind/pkg-plist
index e0f6d8a78ff6..3c86bfd151f9 100644
--- a/sysutils/gnomefind/pkg-plist
+++ b/sysutils/gnomefind/pkg-plist
@@ -1,9 +1,9 @@
 bin/gnome-find
 share/gnome/apps/Utilities/gnome-find.desktop
-share/gnome/gnome-find/gnome-find.glade
-share/gnome/gnome-find/gnome-find.xpm
-share/gnome/gnome-find/multiple.xpm
-share/gnome/gnome-find/shell.xpm
+share/gnome-find/gnome-find.glade
+share/gnome-find/gnome-find.xpm
+share/gnome-find/multiple.xpm
+share/gnome-find/shell.xpm
 share/gnome/help/gnome-find/C/bugreport.html
 share/gnome/help/gnome-find/C/contacting.html
 share/gnome/help/gnome-find/C/copyright.html
@@ -31,4 +31,4 @@ share/locale/sv/LC_MESSAGES/gnome-find.mo
 share/locale/uk/LC_MESSAGES/gnome-find.mo
 @dirrm share/gnome/help/gnome-find/C
 @dirrm share/gnome/help/gnome-find
-@dirrm share/gnome/gnome-find
+@dirrm share/gnome-find
diff --git a/sysutils/graveman/Makefile b/sysutils/graveman/Makefile
index b33f800c72b2..f29b22f57a37 100644
--- a/sysutils/graveman/Makefile
+++ b/sysutils/graveman/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	graveman
 PORTVERSION=	0.3.12.5
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	sysutils
 MASTER_SITES=	http://graveman.tuxfamily.org/sources/
 DISTNAME=	${PORTNAME}-${PORTVERSION:C/\.(.)$/-\1/}
diff --git a/sysutils/graveman/pkg-plist b/sysutils/graveman/pkg-plist
index 08840d338f7a..6115e5cd6115 100644
--- a/sysutils/graveman/pkg-plist
+++ b/sysutils/graveman/pkg-plist
@@ -1,177 +1,177 @@
 bin/graveman
-share/gnome/applications/graveman.desktop
-share/gnome/pixmaps/graveman48.png
-share/gnome/graveman/dialog-question3.png
-share/gnome/graveman/dialog_about.glade
-share/gnome/graveman/dialog_add_charset.glade
-share/gnome/graveman/dialog_add_device.glade
-share/gnome/graveman/dialog_charset.glade
-share/gnome/graveman/dialog_confirm_operation.glade
-share/gnome/graveman/dialog_device.glade
-share/gnome/graveman/dialog_media.glade
-share/gnome/graveman/dialog_properties.glade
-share/gnome/graveman/dialog_select_operation.glade
-share/gnome/graveman/dialog_welcome.glade
-share/gnome/graveman/erase-cdrw.png
-share/gnome/graveman/file_image.png
-share/gnome/graveman/folder5-petit.png
-share/gnome/graveman/gnome-dev-cdrom-audio-24.png
-share/gnome/graveman/gnome-dev-dvdrw-24.png
-share/gnome/graveman/gnome-dev-dvdrw-plus-24.png
-share/gnome/graveman/graveman-main.png
-share/gnome/graveman/graveman24.png
-share/gnome/graveman/graveman32.png
-share/gnome/graveman/graveman48.png
-share/gnome/graveman/graver-petite.png
-share/gnome/graveman/graver.png
-share/gnome/graveman/hint.png
-share/gnome/graveman/main-settings.png
-share/gnome/graveman/menu-data.png
-share/gnome/graveman/petit-parametre.png
-share/gnome/graveman/petitcd.png
-share/gnome/graveman/petitcdrw.png
-share/gnome/graveman/petitcharset.png
-share/gnome/graveman/petitdvd.png
-share/gnome/graveman/petitdvdrw.png
-share/gnome/graveman/petitiso.png
-share/gnome/graveman/properties.png
-share/gnome/graveman/sort.png
-share/gnome/graveman/sound.png
-share/gnome/graveman/stock_new.png
-share/gnome/graveman/window_burn.glade
-share/gnome/graveman/window_inprogress.glade
-share/gnome/graveman/window_main.glade
-share/gnome/graveman/window_waiting_cd.glade
-share/gnome/graveman/window_welcome.glade
-share/gnome/graveman/themes/default/AudioIcon.png
-share/gnome/graveman/themes/default/BADIcon.png
-share/gnome/graveman/themes/default/BurnIcon.png
-share/gnome/graveman/themes/default/BurnsmallIcon.png
-share/gnome/graveman/themes/default/CDIcon.png
-share/gnome/graveman/themes/default/CDRWIcon.png
-share/gnome/graveman/themes/default/CDRWsmallIcon.png
-share/gnome/graveman/themes/default/CDsmallIcon.png
-share/gnome/graveman/themes/default/CharsetSmallIcon.png
-share/gnome/graveman/themes/default/DVDRWsmallIcon.png
-share/gnome/graveman/themes/default/DVDsmallIcon.png
-share/gnome/graveman/themes/default/DirIcon.png
-share/gnome/graveman/themes/default/EraseCDRWIcon.png
-share/gnome/graveman/themes/default/FileIcon.png
-share/gnome/graveman/themes/default/FileImage.png
-share/gnome/graveman/themes/default/ISOsmallIcon.png
-share/gnome/graveman/themes/default/Menu-Audio-16.png
-share/gnome/graveman/themes/default/Menu-Audio-24.png
-share/gnome/graveman/themes/default/Menu-Audio-32.png
-share/gnome/graveman/themes/default/Menu-Audio-48.png
-share/gnome/graveman/themes/default/Menu-Copy-16.png
-share/gnome/graveman/themes/default/Menu-Copy-24.png
-share/gnome/graveman/themes/default/Menu-Copy-32.png
-share/gnome/graveman/themes/default/Menu-Copy-48.png
-share/gnome/graveman/themes/default/Menu-Data-16.png
-share/gnome/graveman/themes/default/Menu-Data-24.png
-share/gnome/graveman/themes/default/Menu-Data-32.png
-share/gnome/graveman/themes/default/Menu-Data-48.png
-share/gnome/graveman/themes/default/Menu-Dvd-16.png
-share/gnome/graveman/themes/default/Menu-Dvd-24.png
-share/gnome/graveman/themes/default/Menu-Dvd-32.png
-share/gnome/graveman/themes/default/Menu-Dvd-48.png
-share/gnome/graveman/themes/default/Menu-Other-16.png
-share/gnome/graveman/themes/default/Menu-Other-24.png
-share/gnome/graveman/themes/default/Menu-Other-32.png
-share/gnome/graveman/themes/default/Menu-Other-48.png
-share/gnome/graveman/themes/default/OKIcon.png
-share/gnome/graveman/themes/default/Themes.png
-share/gnome/graveman/themes/default/WARNIcon.png
-share/gnome/graveman/themes/default/Working.mng
-share/gnome/graveman/themes/default/graveman
-share/gnome/graveman/themes/plainset/AudioIcon.png
-share/gnome/graveman/themes/plainset/BADIcon.png
-share/gnome/graveman/themes/plainset/BurnIcon.png
-share/gnome/graveman/themes/plainset/BurnsmallIcon.png
-share/gnome/graveman/themes/plainset/CDIcon.png
-share/gnome/graveman/themes/plainset/CDRWIcon.png
-share/gnome/graveman/themes/plainset/CDRWsmallIcon.png
-share/gnome/graveman/themes/plainset/CDsmallIcon.png
-share/gnome/graveman/themes/plainset/CharsetSmallIcon.png
-share/gnome/graveman/themes/plainset/DVDRWsmallIcon.png
-share/gnome/graveman/themes/plainset/DVDsmallIcon.png
-share/gnome/graveman/themes/plainset/DirIcon.png
-share/gnome/graveman/themes/plainset/EraseCDRWIcon.png
-share/gnome/graveman/themes/plainset/FileIcon.png
-share/gnome/graveman/themes/plainset/FileImage.png
-share/gnome/graveman/themes/plainset/ISOsmallIcon.png
-share/gnome/graveman/themes/plainset/Menu-Audio-16.png
-share/gnome/graveman/themes/plainset/Menu-Audio-24.png
-share/gnome/graveman/themes/plainset/Menu-Audio-32.png
-share/gnome/graveman/themes/plainset/Menu-Audio-48.png
-share/gnome/graveman/themes/plainset/Menu-Copy-16.png
-share/gnome/graveman/themes/plainset/Menu-Copy-24.png
-share/gnome/graveman/themes/plainset/Menu-Copy-32.png
-share/gnome/graveman/themes/plainset/Menu-Copy-48.png
-share/gnome/graveman/themes/plainset/Menu-Data-16.png
-share/gnome/graveman/themes/plainset/Menu-Data-24.png
-share/gnome/graveman/themes/plainset/Menu-Data-32.png
-share/gnome/graveman/themes/plainset/Menu-Data-48.png
-share/gnome/graveman/themes/plainset/Menu-Dvd-16.png
-share/gnome/graveman/themes/plainset/Menu-Dvd-24.png
-share/gnome/graveman/themes/plainset/Menu-Dvd-32.png
-share/gnome/graveman/themes/plainset/Menu-Dvd-48.png
-share/gnome/graveman/themes/plainset/Menu-Other-16.png
-share/gnome/graveman/themes/plainset/Menu-Other-24.png
-share/gnome/graveman/themes/plainset/Menu-Other-32.png
-share/gnome/graveman/themes/plainset/Menu-Other-48.png
-share/gnome/graveman/themes/plainset/OKIcon.png
-share/gnome/graveman/themes/plainset/Themes.png
-share/gnome/graveman/themes/plainset/WARNIcon.png
-share/gnome/graveman/themes/plainset/Working.mng
-share/gnome/graveman/themes/plainset/graveman
-share/gnome/graveman/themes/isoset/BADIcon.png
-share/gnome/graveman/themes/isoset/DVDRWsmallIcon.png
-share/gnome/graveman/themes/isoset/DVDsmallIcon.png
-share/gnome/graveman/themes/isoset/Menu-Audio-16.png
-share/gnome/graveman/themes/isoset/Menu-Audio-24.png
-share/gnome/graveman/themes/isoset/Menu-Audio-32.png
-share/gnome/graveman/themes/isoset/Menu-Audio-48.png
-share/gnome/graveman/themes/isoset/Menu-Copy-16.png
-share/gnome/graveman/themes/isoset/Menu-Copy-24.png
-share/gnome/graveman/themes/isoset/Menu-Copy-32.png
-share/gnome/graveman/themes/isoset/Menu-Copy-48.png
-share/gnome/graveman/themes/isoset/Menu-Data-16.png
-share/gnome/graveman/themes/isoset/Menu-Data-24.png
-share/gnome/graveman/themes/isoset/Menu-Data-32.png
-share/gnome/graveman/themes/isoset/Menu-Data-48.png
-share/gnome/graveman/themes/isoset/Menu-Dvd-16.png
-share/gnome/graveman/themes/isoset/Menu-Dvd-24.png
-share/gnome/graveman/themes/isoset/Menu-Dvd-32.png
-share/gnome/graveman/themes/isoset/Menu-Dvd-48.png
-share/gnome/graveman/themes/isoset/Menu-Other-16.png
-share/gnome/graveman/themes/isoset/Menu-Other-24.png
-share/gnome/graveman/themes/isoset/Menu-Other-32.png
-share/gnome/graveman/themes/isoset/Menu-Other-48.png
-share/gnome/graveman/themes/isoset/OKIcon.png
-share/gnome/graveman/themes/isoset/WARNIcon.png
-share/gnome/graveman/themes/isoset/graveman
-share/gnome/graveman/themes/essai/Menu-Audio-16.png
-share/gnome/graveman/themes/essai/Menu-Audio-24.png
-share/gnome/graveman/themes/essai/Menu-Audio-32.png
-share/gnome/graveman/themes/essai/Menu-Audio-48.png
-share/gnome/graveman/themes/essai/Menu-Copy-16.png
-share/gnome/graveman/themes/essai/Menu-Copy-24.png
-share/gnome/graveman/themes/essai/Menu-Copy-32.png
-share/gnome/graveman/themes/essai/Menu-Copy-48.png
-share/gnome/graveman/themes/essai/Menu-Data-16.png
-share/gnome/graveman/themes/essai/Menu-Data-24.png
-share/gnome/graveman/themes/essai/Menu-Data-32.png
-share/gnome/graveman/themes/essai/Menu-Data-48.png
-share/gnome/graveman/themes/essai/Menu-Dvd-16.png
-share/gnome/graveman/themes/essai/Menu-Dvd-24.png
-share/gnome/graveman/themes/essai/Menu-Dvd-32.png
-share/gnome/graveman/themes/essai/Menu-Dvd-48.png
-share/gnome/graveman/themes/essai/Menu-Other-16.png
-share/gnome/graveman/themes/essai/Menu-Other-24.png
-share/gnome/graveman/themes/essai/Menu-Other-32.png
-share/gnome/graveman/themes/essai/Menu-Other-48.png
-share/gnome/graveman/themes/essai/graveman
+share/applications/graveman.desktop
+share/pixmaps/graveman48.png
+share/graveman/dialog-question3.png
+share/graveman/dialog_about.glade
+share/graveman/dialog_add_charset.glade
+share/graveman/dialog_add_device.glade
+share/graveman/dialog_charset.glade
+share/graveman/dialog_confirm_operation.glade
+share/graveman/dialog_device.glade
+share/graveman/dialog_media.glade
+share/graveman/dialog_properties.glade
+share/graveman/dialog_select_operation.glade
+share/graveman/dialog_welcome.glade
+share/graveman/erase-cdrw.png
+share/graveman/file_image.png
+share/graveman/folder5-petit.png
+share/graveman/gnome-dev-cdrom-audio-24.png
+share/graveman/gnome-dev-dvdrw-24.png
+share/graveman/gnome-dev-dvdrw-plus-24.png
+share/graveman/graveman-main.png
+share/graveman/graveman24.png
+share/graveman/graveman32.png
+share/graveman/graveman48.png
+share/graveman/graver-petite.png
+share/graveman/graver.png
+share/graveman/hint.png
+share/graveman/main-settings.png
+share/graveman/menu-data.png
+share/graveman/petit-parametre.png
+share/graveman/petitcd.png
+share/graveman/petitcdrw.png
+share/graveman/petitcharset.png
+share/graveman/petitdvd.png
+share/graveman/petitdvdrw.png
+share/graveman/petitiso.png
+share/graveman/properties.png
+share/graveman/sort.png
+share/graveman/sound.png
+share/graveman/stock_new.png
+share/graveman/window_burn.glade
+share/graveman/window_inprogress.glade
+share/graveman/window_main.glade
+share/graveman/window_waiting_cd.glade
+share/graveman/window_welcome.glade
+share/graveman/themes/default/AudioIcon.png
+share/graveman/themes/default/BADIcon.png
+share/graveman/themes/default/BurnIcon.png
+share/graveman/themes/default/BurnsmallIcon.png
+share/graveman/themes/default/CDIcon.png
+share/graveman/themes/default/CDRWIcon.png
+share/graveman/themes/default/CDRWsmallIcon.png
+share/graveman/themes/default/CDsmallIcon.png
+share/graveman/themes/default/CharsetSmallIcon.png
+share/graveman/themes/default/DVDRWsmallIcon.png
+share/graveman/themes/default/DVDsmallIcon.png
+share/graveman/themes/default/DirIcon.png
+share/graveman/themes/default/EraseCDRWIcon.png
+share/graveman/themes/default/FileIcon.png
+share/graveman/themes/default/FileImage.png
+share/graveman/themes/default/ISOsmallIcon.png
+share/graveman/themes/default/Menu-Audio-16.png
+share/graveman/themes/default/Menu-Audio-24.png
+share/graveman/themes/default/Menu-Audio-32.png
+share/graveman/themes/default/Menu-Audio-48.png
+share/graveman/themes/default/Menu-Copy-16.png
+share/graveman/themes/default/Menu-Copy-24.png
+share/graveman/themes/default/Menu-Copy-32.png
+share/graveman/themes/default/Menu-Copy-48.png
+share/graveman/themes/default/Menu-Data-16.png
+share/graveman/themes/default/Menu-Data-24.png
+share/graveman/themes/default/Menu-Data-32.png
+share/graveman/themes/default/Menu-Data-48.png
+share/graveman/themes/default/Menu-Dvd-16.png
+share/graveman/themes/default/Menu-Dvd-24.png
+share/graveman/themes/default/Menu-Dvd-32.png
+share/graveman/themes/default/Menu-Dvd-48.png
+share/graveman/themes/default/Menu-Other-16.png
+share/graveman/themes/default/Menu-Other-24.png
+share/graveman/themes/default/Menu-Other-32.png
+share/graveman/themes/default/Menu-Other-48.png
+share/graveman/themes/default/OKIcon.png
+share/graveman/themes/default/Themes.png
+share/graveman/themes/default/WARNIcon.png
+share/graveman/themes/default/Working.mng
+share/graveman/themes/default/graveman
+share/graveman/themes/plainset/AudioIcon.png
+share/graveman/themes/plainset/BADIcon.png
+share/graveman/themes/plainset/BurnIcon.png
+share/graveman/themes/plainset/BurnsmallIcon.png
+share/graveman/themes/plainset/CDIcon.png
+share/graveman/themes/plainset/CDRWIcon.png
+share/graveman/themes/plainset/CDRWsmallIcon.png
+share/graveman/themes/plainset/CDsmallIcon.png
+share/graveman/themes/plainset/CharsetSmallIcon.png
+share/graveman/themes/plainset/DVDRWsmallIcon.png
+share/graveman/themes/plainset/DVDsmallIcon.png
+share/graveman/themes/plainset/DirIcon.png
+share/graveman/themes/plainset/EraseCDRWIcon.png
+share/graveman/themes/plainset/FileIcon.png
+share/graveman/themes/plainset/FileImage.png
+share/graveman/themes/plainset/ISOsmallIcon.png
+share/graveman/themes/plainset/Menu-Audio-16.png
+share/graveman/themes/plainset/Menu-Audio-24.png
+share/graveman/themes/plainset/Menu-Audio-32.png
+share/graveman/themes/plainset/Menu-Audio-48.png
+share/graveman/themes/plainset/Menu-Copy-16.png
+share/graveman/themes/plainset/Menu-Copy-24.png
+share/graveman/themes/plainset/Menu-Copy-32.png
+share/graveman/themes/plainset/Menu-Copy-48.png
+share/graveman/themes/plainset/Menu-Data-16.png
+share/graveman/themes/plainset/Menu-Data-24.png
+share/graveman/themes/plainset/Menu-Data-32.png
+share/graveman/themes/plainset/Menu-Data-48.png
+share/graveman/themes/plainset/Menu-Dvd-16.png
+share/graveman/themes/plainset/Menu-Dvd-24.png
+share/graveman/themes/plainset/Menu-Dvd-32.png
+share/graveman/themes/plainset/Menu-Dvd-48.png
+share/graveman/themes/plainset/Menu-Other-16.png
+share/graveman/themes/plainset/Menu-Other-24.png
+share/graveman/themes/plainset/Menu-Other-32.png
+share/graveman/themes/plainset/Menu-Other-48.png
+share/graveman/themes/plainset/OKIcon.png
+share/graveman/themes/plainset/Themes.png
+share/graveman/themes/plainset/WARNIcon.png
+share/graveman/themes/plainset/Working.mng
+share/graveman/themes/plainset/graveman
+share/graveman/themes/isoset/BADIcon.png
+share/graveman/themes/isoset/DVDRWsmallIcon.png
+share/graveman/themes/isoset/DVDsmallIcon.png
+share/graveman/themes/isoset/Menu-Audio-16.png
+share/graveman/themes/isoset/Menu-Audio-24.png
+share/graveman/themes/isoset/Menu-Audio-32.png
+share/graveman/themes/isoset/Menu-Audio-48.png
+share/graveman/themes/isoset/Menu-Copy-16.png
+share/graveman/themes/isoset/Menu-Copy-24.png
+share/graveman/themes/isoset/Menu-Copy-32.png
+share/graveman/themes/isoset/Menu-Copy-48.png
+share/graveman/themes/isoset/Menu-Data-16.png
+share/graveman/themes/isoset/Menu-Data-24.png
+share/graveman/themes/isoset/Menu-Data-32.png
+share/graveman/themes/isoset/Menu-Data-48.png
+share/graveman/themes/isoset/Menu-Dvd-16.png
+share/graveman/themes/isoset/Menu-Dvd-24.png
+share/graveman/themes/isoset/Menu-Dvd-32.png
+share/graveman/themes/isoset/Menu-Dvd-48.png
+share/graveman/themes/isoset/Menu-Other-16.png
+share/graveman/themes/isoset/Menu-Other-24.png
+share/graveman/themes/isoset/Menu-Other-32.png
+share/graveman/themes/isoset/Menu-Other-48.png
+share/graveman/themes/isoset/OKIcon.png
+share/graveman/themes/isoset/WARNIcon.png
+share/graveman/themes/isoset/graveman
+share/graveman/themes/essai/Menu-Audio-16.png
+share/graveman/themes/essai/Menu-Audio-24.png
+share/graveman/themes/essai/Menu-Audio-32.png
+share/graveman/themes/essai/Menu-Audio-48.png
+share/graveman/themes/essai/Menu-Copy-16.png
+share/graveman/themes/essai/Menu-Copy-24.png
+share/graveman/themes/essai/Menu-Copy-32.png
+share/graveman/themes/essai/Menu-Copy-48.png
+share/graveman/themes/essai/Menu-Data-16.png
+share/graveman/themes/essai/Menu-Data-24.png
+share/graveman/themes/essai/Menu-Data-32.png
+share/graveman/themes/essai/Menu-Data-48.png
+share/graveman/themes/essai/Menu-Dvd-16.png
+share/graveman/themes/essai/Menu-Dvd-24.png
+share/graveman/themes/essai/Menu-Dvd-32.png
+share/graveman/themes/essai/Menu-Dvd-48.png
+share/graveman/themes/essai/Menu-Other-16.png
+share/graveman/themes/essai/Menu-Other-24.png
+share/graveman/themes/essai/Menu-Other-32.png
+share/graveman/themes/essai/Menu-Other-48.png
+share/graveman/themes/essai/graveman
 share/locale/cs/LC_MESSAGES/graveman.mo
 share/locale/de/LC_MESSAGES/graveman.mo
 share/locale/es/LC_MESSAGES/graveman.mo
@@ -186,9 +186,10 @@ share/locale/pl/LC_MESSAGES/graveman.mo
 share/locale/pt_BR/LC_MESSAGES/graveman.mo
 share/locale/ru/LC_MESSAGES/graveman.mo
 share/locale/sv/LC_MESSAGES/graveman.mo
-@dirrm share/gnome/graveman/themes/default
-@dirrm share/gnome/graveman/themes/essai
-@dirrm share/gnome/graveman/themes/isoset
-@dirrm share/gnome/graveman/themes/plainset
-@dirrm share/gnome/graveman/themes
-@dirrm share/gnome/graveman
+@dirrm share/graveman/themes/default
+@dirrm share/graveman/themes/essai
+@dirrm share/graveman/themes/isoset
+@dirrm share/graveman/themes/plainset
+@dirrm share/graveman/themes
+@dirrm share/graveman
+@dirrmtry share/applications
diff --git a/sysutils/gupsc/Makefile b/sysutils/gupsc/Makefile
index 4a95d18442f8..fbb60cd51e1e 100644
--- a/sysutils/gupsc/Makefile
+++ b/sysutils/gupsc/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gupsc
 PORTVERSION=	0.3.1
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	http://heim.ifi.uio.no/~hennikul/gupsc/download/
 
@@ -27,8 +27,5 @@ pre-patch:
 		 s|/usr/local|${PREFIX}|; \
 		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure \
 		${WRKSRC}/src/Makefile.in
-	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${PERL} -pi -e \
-		's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \
-		 s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g'
 
 .include <bsd.port.mk>
diff --git a/sysutils/gupsc/files/patch-Makefile.in b/sysutils/gupsc/files/patch-Makefile.in
deleted file mode 100644
index 5e904ee157e9..000000000000
--- a/sysutils/gupsc/files/patch-Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- Makefile.in	2002/05/13 12:37:29	1.1
-+++ Makefile.in	2002/05/13 12:37:39
-@@ -109,7 +109,7 @@
- 
- SUBDIRS = intl po macros src
- 
--Applicationsdir = $(shell $(GNOME_CONFIG) --datadir)/gnome/apps/System
-+Applicationsdir = $(shell $(GNOME_CONFIG) --datadir)/apps/System
- Applications_DATA = gupsc.desktop
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/sysutils/gupsc/pkg-plist b/sysutils/gupsc/pkg-plist
index 213dcb215695..96ce5465acd4 100644
--- a/sysutils/gupsc/pkg-plist
+++ b/sysutils/gupsc/pkg-plist
@@ -1,5 +1,5 @@
 bin/gupsc
 share/locale/no/LC_MESSAGES/gupsc.mo
-share/gnome/pixmaps/gupsc/ups.png
 share/gnome/apps/System/gupsc.desktop
-@dirrm share/gnome/pixmaps/gupsc
+share/pixmaps/gupsc/ups.png
+@dirrm share/pixmaps/gupsc
diff --git a/sysutils/nautilus-cd-burner/Makefile b/sysutils/nautilus-cd-burner/Makefile
index 451d3ca06eb1..2f5a1903d595 100644
--- a/sysutils/nautilus-cd-burner/Makefile
+++ b/sysutils/nautilus-cd-burner/Makefile
@@ -3,11 +3,11 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/sysutils/nautilus-cd-burner/Makefile,v 1.128 2007/03/12 20:33:36 mezz Exp $
+#   $MCom: ports/sysutils/nautilus-cd-burner/Makefile,v 1.134 2007/09/18 00:44:04 marcus Exp $
 #
 
 PORTNAME=	nautilus-cd-burner
-PORTVERSION=	2.18.2
+PORTVERSION=	2.20.0
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/sysutils/nautilus-cd-burner/distinfo b/sysutils/nautilus-cd-burner/distinfo
index 8ff2ed8a6c05..95075e8ab2c7 100644
--- a/sysutils/nautilus-cd-burner/distinfo
+++ b/sysutils/nautilus-cd-burner/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/nautilus-cd-burner-2.18.2.tar.bz2) = fee9ec2f398a6b1eacfd59e239d06837
-SHA256 (gnome2/nautilus-cd-burner-2.18.2.tar.bz2) = 551924c49c883c52f1a3de639c068cf15a25b7922088d0b4427d2d64f4a1b1cb
-SIZE (gnome2/nautilus-cd-burner-2.18.2.tar.bz2) = 740992
+MD5 (gnome2/nautilus-cd-burner-2.20.0.tar.bz2) = a7ddb02c33be107f6c9c1874b7703e9e
+SHA256 (gnome2/nautilus-cd-burner-2.20.0.tar.bz2) = fc7a91473bc3cab7cba8ef4185e8f62ea6ad50a4558d8bce1aa639a4397ec905
+SIZE (gnome2/nautilus-cd-burner-2.20.0.tar.bz2) = 730319
diff --git a/sysutils/nautilus-cd-burner/pkg-plist b/sysutils/nautilus-cd-burner/pkg-plist
index 86a6b7dcff02..efd6f53c256c 100644
--- a/sysutils/nautilus-cd-burner/pkg-plist
+++ b/sysutils/nautilus-cd-burner/pkg-plist
@@ -19,17 +19,8 @@ lib/nautilus/extensions-1.0/libnautilus-burn-extension.la
 lib/nautilus/extensions-1.0/libnautilus-burn-extension.so
 libdata/pkgconfig/libnautilus-burn.pc
 libexec/mapping-daemon
-share/gnome/applications/nautilus-cd-burner-open-iso.desktop
-share/gnome/applications/nautilus-cd-burner.desktop
-share/gnome/nautilus-cd-burner/cdspin1.png
-share/gnome/nautilus-cd-burner/cdspin2.png
-share/gnome/nautilus-cd-burner/cdspin3.png
-share/gnome/nautilus-cd-burner/cdspin4.png
-share/gnome/nautilus-cd-burner/cdspin5.png
-share/gnome/nautilus-cd-burner/cdspin6.png
-share/gnome/nautilus-cd-burner/cdspin7.png
-share/gnome/nautilus-cd-burner/cdspin8.png
-share/gnome/nautilus-cd-burner/nautilus-cd-burner.glade
+share/applications/nautilus-cd-burner-open-iso.desktop
+share/applications/nautilus-cd-burner.desktop
 share/icons/hicolor/16x16/apps/nautilus-cd-burner.png
 share/icons/hicolor/22x22/apps/nautilus-cd-burner.png
 share/icons/hicolor/24x24/apps/nautilus-cd-burner.png
@@ -84,6 +75,7 @@ share/locale/nb/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/ne/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/nl/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/nn/LC_MESSAGES/nautilus-cd-burner.mo
+share/locale/oc/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/or/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/pa/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/pl/LC_MESSAGES/nautilus-cd-burner.mo
@@ -92,6 +84,7 @@ share/locale/pt_BR/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/ro/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/ru/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/rw/LC_MESSAGES/nautilus-cd-burner.mo
+share/locale/si/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/sk/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/sl/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/sq/LC_MESSAGES/nautilus-cd-burner.mo
@@ -109,7 +102,16 @@ share/locale/xh/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/zh_CN/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/zh_HK/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/zh_TW/LC_MESSAGES/nautilus-cd-burner.mo
-@dirrm share/gnome/nautilus-cd-burner
+%%DATADIR%%/cdspin1.png
+%%DATADIR%%/cdspin2.png
+%%DATADIR%%/cdspin3.png
+%%DATADIR%%/cdspin4.png
+%%DATADIR%%/cdspin5.png
+%%DATADIR%%/cdspin6.png
+%%DATADIR%%/cdspin7.png
+%%DATADIR%%/cdspin8.png
+%%DATADIR%%/nautilus-cd-burner.glade
+@dirrm %%DATADIR%%
 @dirrm include/libnautilus-burn
 @exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
 @unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
@@ -121,8 +123,12 @@ share/locale/zh_TW/LC_MESSAGES/nautilus-cd-burner.mo
 @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/mg/LC_MESSAGES
 @dirrmtry share/locale/mg
 @dirrmtry share/locale/ku/LC_MESSAGES
@@ -135,3 +141,4 @@ share/locale/zh_TW/LC_MESSAGES/nautilus-cd-burner.mo
 @dirrmtry share/locale/bn_IN
 @dirrmtry share/locale/be@latin/LC_MESSAGES
 @dirrmtry share/locale/be@latin
+@dirrmtry share/applications
diff --git a/sysutils/pessulus/Makefile b/sysutils/pessulus/Makefile
index 27f32445d864..02c64f4972f9 100644
--- a/sysutils/pessulus/Makefile
+++ b/sysutils/pessulus/Makefile
@@ -3,12 +3,11 @@
 # Whom:					FreeBSD GNOME Team
 #
 # $FreeBSD$
-#   $MCom: ports/sysutils/pessulus/Makefile,v 1.11 2006/10/03 01:27:41 ahze Exp $
+#   $MCom: ports/sysutils/pessulus/Makefile,v 1.14 2007/09/17 20:08:42 ahze Exp $
 #
 
 PORTNAME=	pessulus
-PORTVERSION=	2.16.2
-PORTREVISION=	1
+PORTVERSION=	2.16.3
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	 sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/sysutils/pessulus/distinfo b/sysutils/pessulus/distinfo
index 5117bd4bd982..da3165e0369f 100644
--- a/sysutils/pessulus/distinfo
+++ b/sysutils/pessulus/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/pessulus-2.16.2.tar.gz) = 8b64b63c72565d7ea71706f8e19c427e
-SHA256 (gnome2/pessulus-2.16.2.tar.gz) = 13dae2987452a10ffb07819df67cdbddcd78d1a4eab690f55b0f500c6a0d15e5
-SIZE (gnome2/pessulus-2.16.2.tar.gz) = 179104
+MD5 (gnome2/pessulus-2.16.3.tar.gz) = 002c70e42a04cf1abb3e02d962dad11f
+SHA256 (gnome2/pessulus-2.16.3.tar.gz) = a9c164cae356382c83779ff6e1273e7e50184d95eb66a2c3e563816d4b2a73f4
+SIZE (gnome2/pessulus-2.16.3.tar.gz) = 213734
diff --git a/sysutils/pessulus/pkg-plist b/sysutils/pessulus/pkg-plist
index 2648287f579a..beaade773392 100644
--- a/sysutils/pessulus/pkg-plist
+++ b/sysutils/pessulus/pkg-plist
@@ -38,6 +38,7 @@ bin/pessulus
 %%PYTHON_SITELIBDIR%%/Pessulus/simpleeditabletreeview.py
 %%PYTHON_SITELIBDIR%%/Pessulus/simpleeditabletreeview.pyc
 %%PYTHON_SITELIBDIR%%/Pessulus/simpleeditabletreeview.pyo
+share/applications/pessulus.desktop
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/COPYING
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
@@ -46,9 +47,10 @@ bin/pessulus
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/TODO
-share/gnome/applications/pessulus.desktop
-share/gnome/pessulus/glade/pessulus.glade
 share/locale/ar/LC_MESSAGES/pessulus.mo
+share/locale/as/LC_MESSAGES/pessulus.mo
+share/locale/be/LC_MESSAGES/pessulus.mo
+share/locale/be@latin/LC_MESSAGES/pessulus.mo
 share/locale/bg/LC_MESSAGES/pessulus.mo
 share/locale/bn/LC_MESSAGES/pessulus.mo
 share/locale/bn_IN/LC_MESSAGES/pessulus.mo
@@ -76,6 +78,7 @@ share/locale/it/LC_MESSAGES/pessulus.mo
 share/locale/ja/LC_MESSAGES/pessulus.mo
 share/locale/ka/LC_MESSAGES/pessulus.mo
 share/locale/ko/LC_MESSAGES/pessulus.mo
+share/locale/ku/LC_MESSAGES/pessulus.mo
 share/locale/lt/LC_MESSAGES/pessulus.mo
 share/locale/lv/LC_MESSAGES/pessulus.mo
 share/locale/mk/LC_MESSAGES/pessulus.mo
@@ -85,6 +88,7 @@ share/locale/mr/LC_MESSAGES/pessulus.mo
 share/locale/nb/LC_MESSAGES/pessulus.mo
 share/locale/ne/LC_MESSAGES/pessulus.mo
 share/locale/nl/LC_MESSAGES/pessulus.mo
+share/locale/oc/LC_MESSAGES/pessulus.mo
 share/locale/or/LC_MESSAGES/pessulus.mo
 share/locale/pa/LC_MESSAGES/pessulus.mo
 share/locale/pl/LC_MESSAGES/pessulus.mo
@@ -98,6 +102,7 @@ share/locale/sr/LC_MESSAGES/pessulus.mo
 share/locale/sr@Latn/LC_MESSAGES/pessulus.mo
 share/locale/sv/LC_MESSAGES/pessulus.mo
 share/locale/ta/LC_MESSAGES/pessulus.mo
+share/locale/te/LC_MESSAGES/pessulus.mo
 share/locale/th/LC_MESSAGES/pessulus.mo
 share/locale/tr/LC_MESSAGES/pessulus.mo
 share/locale/uk/LC_MESSAGES/pessulus.mo
@@ -105,17 +110,27 @@ share/locale/vi/LC_MESSAGES/pessulus.mo
 share/locale/zh_CN/LC_MESSAGES/pessulus.mo
 share/locale/zh_HK/LC_MESSAGES/pessulus.mo
 share/locale/zh_TW/LC_MESSAGES/pessulus.mo
-@dirrm share/gnome/pessulus/glade
-@dirrm share/gnome/pessulus
+%%DATADIR%%/glade/pessulus.glade
+@dirrm %%DATADIR%%/glade
+@dirrm %%DATADIR%%
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm %%PYTHON_SITELIBDIR%%/Pessulus
-@dirrmtry %%PYTHON_SITELIBDIR%%
-@dirrmtry %%PYTHON_LIBDIR%%
 @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/oc/LC_MESSAGES
+@dirrmtry share/locale/oc
 @dirrmtry share/locale/mr/LC_MESSAGES
 @dirrmtry share/locale/mr
+@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
+@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/sysutils/pyrenamer/Makefile b/sysutils/pyrenamer/Makefile
index 3fc4ff781548..786cd12fcf5a 100644
--- a/sysutils/pyrenamer/Makefile
+++ b/sysutils/pyrenamer/Makefile
@@ -3,11 +3,12 @@
 # Whom:					Mezz <mezz@FreeBSD.org>
 #
 # $FreeBSD$
+#   $MCom: ports/sysutils/pyrenamer/Makefile,v 1.1 2007/08/14 21:33:09 mezz Exp $
 #
 
 PORTNAME=	pyrenamer
 DISTVERSION=	0.4.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils python gnome
 MASTER_SITES=	http://www.infinicode.org/code/${PORTNAME}/
 
diff --git a/sysutils/pyrenamer/pkg-plist b/sysutils/pyrenamer/pkg-plist
index d47ce3ef9c4a..0a84d06b69de 100644
--- a/sysutils/pyrenamer/pkg-plist
+++ b/sysutils/pyrenamer/pkg-plist
@@ -23,7 +23,7 @@ bin/pyrenamer
 %%PYTHON_SITELIBDIR%%/pyrenamer/treefilebrowser.py
 %%PYTHON_SITELIBDIR%%/pyrenamer/treefilebrowser.pyc
 %%PYTHON_SITELIBDIR%%/pyrenamer/treefilebrowser.pyo
-share/gnome/applications/pyrenamer.desktop
+share/applications/pyrenamer.desktop
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/COPYING
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
@@ -32,11 +32,11 @@ share/gnome/applications/pyrenamer.desktop
 %%EXAMPLESDIR%%/treefilebrowser_example.py
 share/locale/en/LC_MESSAGES/pyrenamer.mo
 share/locale/es/LC_MESSAGES/pyrenamer.mo
-share/gnome/pixmaps/pyrenamer.png
-share/gnome/pyrenamer/pyrenamer.glade
-share/gnome/pyrenamer/pyrenamer.png
-share/gnome/pyrenamer/pyrenamer.svg
-@dirrm share/gnome/pyrenamer
+share/pixmaps/pyrenamer.png
+%%DATADIR%%/pyrenamer.glade
+%%DATADIR%%/pyrenamer.png
+%%DATADIR%%/pyrenamer.svg
+@dirrm %%DATADIR%%
 @dirrm %%EXAMPLESDIR%%
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrmtry share/applications
diff --git a/sysutils/sensors-applet/Makefile b/sysutils/sensors-applet/Makefile
index 0142a398946b..16a5532f6e60 100644
--- a/sysutils/sensors-applet/Makefile
+++ b/sysutils/sensors-applet/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	sensors-applet
 PORTVERSION=	1.6.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/sysutils/sensors-applet/pkg-plist b/sysutils/sensors-applet/pkg-plist
index e0b6c498983f..fae823ba7ab9 100644
--- a/sysutils/sensors-applet/pkg-plist
+++ b/sysutils/sensors-applet/pkg-plist
@@ -1,23 +1,23 @@
 libdata/bonobo/servers/SensorsApplet.server
 libexec/sensors-applet
 libexec/smartctl-helper
-share/gnome/gnome-2.0/ui/SensorsApplet.xml
+share/gnome-2.0/ui/SensorsApplet.xml
 share/gnome/help/sensors-applet/C/figures/applet_in_panel.png
 share/gnome/help/sensors-applet/C/legal.xml
 share/gnome/help/sensors-applet/C/sensors-applet.xml
-share/gnome/omf/sensors-applet/sensors-applet-C.omf
-share/gnome/pixmaps/sensors-applet/battery-icon.png
-share/gnome/pixmaps/sensors-applet/case-icon.png
-share/gnome/pixmaps/sensors-applet/cpu-icon.png
-share/gnome/pixmaps/sensors-applet/fan-icon.png
-share/gnome/pixmaps/sensors-applet/hdd-icon.png
-share/gnome/pixmaps/sensors-applet/high-temp-icon.png
-share/gnome/pixmaps/sensors-applet/low-temp-icon.png
-share/gnome/pixmaps/sensors-applet/memory-icon.png
-share/gnome/pixmaps/sensors-applet/normal-temp-icon.png
-share/gnome/pixmaps/sensors-applet/sensors-applet-icon.png
-share/gnome/pixmaps/sensors-applet/very-high-temp-icon.png
-share/gnome/pixmaps/sensors-applet/very-low-temp-icon.png
+share/omf/sensors-applet/sensors-applet-C.omf
+share/pixmaps/sensors-applet/battery-icon.png
+share/pixmaps/sensors-applet/case-icon.png
+share/pixmaps/sensors-applet/cpu-icon.png
+share/pixmaps/sensors-applet/fan-icon.png
+share/pixmaps/sensors-applet/hdd-icon.png
+share/pixmaps/sensors-applet/high-temp-icon.png
+share/pixmaps/sensors-applet/low-temp-icon.png
+share/pixmaps/sensors-applet/memory-icon.png
+share/pixmaps/sensors-applet/normal-temp-icon.png
+share/pixmaps/sensors-applet/sensors-applet-icon.png
+share/pixmaps/sensors-applet/very-high-temp-icon.png
+share/pixmaps/sensors-applet/very-low-temp-icon.png
 share/locale/de/LC_MESSAGES/sensors-applet.mo
 share/locale/es/LC_MESSAGES/sensors-applet.mo
 share/locale/fi/LC_MESSAGES/sensors-applet.mo
@@ -29,5 +29,5 @@ share/locale/ru/LC_MESSAGES/sensors-applet.mo
 @dirrm share/gnome/help/sensors-applet/C/figures
 @dirrm share/gnome/help/sensors-applet/C
 @dirrm share/gnome/help/sensors-applet
-@dirrm share/gnome/omf/sensors-applet
-@dirrm share/gnome/pixmaps/sensors-applet
+@dirrm share/omf/sensors-applet
+@dirrm share/pixmaps/sensors-applet
diff --git a/sysutils/system-tools-backends/Makefile b/sysutils/system-tools-backends/Makefile
index fed2dcfab5a0..008b7aee13b7 100644
--- a/sysutils/system-tools-backends/Makefile
+++ b/sysutils/system-tools-backends/Makefile
@@ -3,12 +3,11 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/sysutils/system-tools-backends/Makefile,v 1.34 2007/03/12 12:25:41 ahze Exp $
+#   $MCom: ports/sysutils/system-tools-backends/Makefile,v 1.40 2007/10/04 11:32:48 ahze Exp $
 #
 
 PORTNAME=	system-tools-backends
-PORTVERSION=	2.2.1
-PORTREVISION=	3
+PORTVERSION=	2.4.1
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/sysutils/system-tools-backends/distinfo b/sysutils/system-tools-backends/distinfo
index f62826e89bf5..ccad604a0755 100644
--- a/sysutils/system-tools-backends/distinfo
+++ b/sysutils/system-tools-backends/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/system-tools-backends-2.2.1.tar.bz2) = ee8a0f412e47748285672f9825647cd2
-SHA256 (gnome2/system-tools-backends-2.2.1.tar.bz2) = 192e79dccf72e84be4ff16c9936cc358f66bd626ba4c994e181663944d6648b7
-SIZE (gnome2/system-tools-backends-2.2.1.tar.bz2) = 409158
+MD5 (gnome2/system-tools-backends-2.4.1.tar.bz2) = 063f38e6014c8f7ba9b92b0f94255652
+SHA256 (gnome2/system-tools-backends-2.4.1.tar.bz2) = c0aea44c58d32870b429337751bf3f41cd471b8c8849a373c46999fd63d583e8
+SIZE (gnome2/system-tools-backends-2.4.1.tar.bz2) = 411012
diff --git a/sysutils/system-tools-backends/files/system-tools-backends.in b/sysutils/system-tools-backends/files/system-tools-backends.in
index dcaff5e34e54..b23f16bb2648 100644
--- a/sysutils/system-tools-backends/files/system-tools-backends.in
+++ b/sysutils/system-tools-backends/files/system-tools-backends.in
@@ -1,6 +1,6 @@
 #!/bin/sh
 # $FreeBSD$
-#    $MCom: ports/sysutils/system-tools-backends/files/system-tools-backends.in,v 1.3 2006/12/06 19:31:12 marcus Exp $
+#    $MCom: ports/sysutils/system-tools-backends/files/system-tools-backends.in,v 1.5 2007/07/10 16:47:46 ahze Exp $
 
 # PROVIDE: system-tools-backends
 # REQUIRE: DAEMON dbus
diff --git a/sysutils/system-tools-backends/pkg-plist b/sysutils/system-tools-backends/pkg-plist
index 257e1ef96fce..31f146f16b1f 100644
--- a/sysutils/system-tools-backends/pkg-plist
+++ b/sysutils/system-tools-backends/pkg-plist
@@ -37,6 +37,7 @@ share/system-tools-backends-2.0/scripts/Users/Shells.pm
 share/system-tools-backends-2.0/scripts/Users/Users.pm
 share/system-tools-backends-2.0/scripts/UsersConfig.pm
 share/system-tools-backends-2.0/scripts/Utils/Backend.pm
+share/system-tools-backends-2.0/scripts/Utils/DBus.pm
 share/system-tools-backends-2.0/scripts/Utils/File.pm
 share/system-tools-backends-2.0/scripts/Utils/Monitor.pm
 share/system-tools-backends-2.0/scripts/Utils/Parse.pm
diff --git a/sysutils/tracker-client/Makefile b/sysutils/tracker-client/Makefile
index b45081f01e8b..867d4b49f82d 100644
--- a/sysutils/tracker-client/Makefile
+++ b/sysutils/tracker-client/Makefile
@@ -3,12 +3,12 @@
 # Whom:			Michael Johnson <ahze@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/sysutils/tracker/Makefile,v 1.2 2006/12/10 17:33:17 ahze Exp $
+#   $MCom: ports/sysutils/tracker/Makefile,v 1.8 2007/10/05 16:55:59 mezz Exp $
 #
 
 PORTNAME=	tracker
-PORTVERSION=	0.6.1
-PORTREVISION=	1
+PORTVERSION=	0.6.2
+PORTREVISION=	2
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	http://www.gnome.org/~jamiemcc/tracker/
 
@@ -19,7 +19,9 @@ LIB_DEPENDS=	dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
 		poppler-glib.2:${PORTSDIR}/graphics/poppler-gtk \
 		exif.12:${PORTSDIR}/graphics/libexif \
 		wv-1.2.3:${PORTSDIR}/textproc/wv \
-		gmime-2.0.4:${PORTSDIR}/mail/gmime2
+		gmime-2.0.4:${PORTSDIR}/mail/gmime2 \
+		sqlite3.8:${PORTSDIR}/databases/sqlite3
+#RUN_DEPENDS=	${LOCALBASE}/lib/deskbar-applet/deskbar-applet:${PORTSDIR}/deskutils/deskbar-applet
 
 USE_BZIP2=	yes
 USE_FAM=	yes
@@ -39,12 +41,12 @@ CONFIGURE_ARGS=	--enable-video-extractor=gstreamer \
 		--enable-deskbar-applet \
 		--with-deskbar-applet-handler-dir=${LOCALBASE}/lib/deskbar-applet/handlers
 
-MAN1=		tracker-extract.1 tracker-files.1 tracker-meta-folder.1 \
-		tracker-query.1 tracker-search.1 tracker-stats.1 trackerd.1 \
-		tracker-preferences.1 tracker-search-tool.1 tracker-status.1 \
-		tracker-tag.1 tracker-thumbnailer.1
-MAN5=		tracker.cfg.5
-MAN7=		tracker-services.7
+MAN1=	tracker-extract.1 tracker-files.1 tracker-meta-folder.1 \
+	tracker-preferences.1 tracker-query.1 tracker-search.1 \
+	tracker-search-tool.1 tracker-stats.1 tracker-status.1 \
+	tracker-tag.1 tracker-thumbnailer.1 trackerd.1
+MAN5=	tracker.cfg.5
+MAN7=	tracker-services.7
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|libpng|libpng12|' ${WRKSRC}/configure
diff --git a/sysutils/tracker-client/distinfo b/sysutils/tracker-client/distinfo
index a9bf15f39356..01cde91775e7 100644
--- a/sysutils/tracker-client/distinfo
+++ b/sysutils/tracker-client/distinfo
@@ -1,3 +1,3 @@
-MD5 (tracker-0.6.1.tar.bz2) = 3f706dc73fffa0a7b633b0c0aff6a263
-SHA256 (tracker-0.6.1.tar.bz2) = 2c671498d7406b25bb6e75dd1799165d0d0abfe4309532aeb6ba5e533556932a
-SIZE (tracker-0.6.1.tar.bz2) = 1199993
+MD5 (tracker-0.6.2.tar.bz2) = d4d66cd73e6c59ac392565be622370f2
+SHA256 (tracker-0.6.2.tar.bz2) = 8a7e80fe5384c0f5d7f87f43121b48be0b7bc5ccf50fdb2ca81517ce2375b36f
+SIZE (tracker-0.6.2.tar.bz2) = 747560
diff --git a/sysutils/tracker-client/files/patch-src_sqlite3_Makefile.in b/sysutils/tracker-client/files/patch-src_sqlite3_Makefile.in
deleted file mode 100644
index 21069bd24ced..000000000000
--- a/sysutils/tracker-client/files/patch-src_sqlite3_Makefile.in
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/sqlite3/Makefile.in.orig	2007-08-25 13:54:21.000000000 -0500
-+++ src/sqlite3/Makefile.in	2007-08-25 13:54:28.000000000 -0500
-@@ -321,7 +321,6 @@
- INCLUDES = \
- 	 $(SQLITE_OS)			\
- 	 -DHAVE_USLEEP=1 		\
--	 -DHAVE_FDATASYNC=1 		\
- 	 -DNDEBUG			\
- 	 -DTHREADSAFE=1			\
- 	 -DSQLITE_THREAD_OVERRIDE_LOCK=-1	\
diff --git a/sysutils/tracker-client/files/patch-src_trackerd_tracker-apps.c b/sysutils/tracker-client/files/patch-src_trackerd_tracker-apps.c
new file mode 100644
index 000000000000..6326c01a2719
--- /dev/null
+++ b/sysutils/tracker-client/files/patch-src_trackerd_tracker-apps.c
@@ -0,0 +1,12 @@
+--- ./src/trackerd/tracker-apps.c.orig	2007-10-05 20:18:39.000000000 +0400
++++ ./src/trackerd/tracker-apps.c	2007-10-05 20:19:10.000000000 +0400
+@@ -18,7 +18,8 @@
+  * Boston, MA  02110-1301, USA.
+  */
+ 
+-#include<string.h>
++#include <stdlib.h>
++#include <string.h>
+ 
+ #include "tracker-apps.h"
+ #include "tracker-db.h"
diff --git a/sysutils/tracker-client/pkg-plist b/sysutils/tracker-client/pkg-plist
index ea2c827b73a6..2d36ccbfa4e1 100644
--- a/sysutils/tracker-client/pkg-plist
+++ b/sysutils/tracker-client/pkg-plist
@@ -20,7 +20,6 @@ include/libtracker-gtk/tracker-ui.h
 include/libtracker-gtk/tracker-utils.h
 include/tracker-client.h
 include/tracker.h
-lib/deskbar-applet/handlers/tracker-handler.py
 lib/libtracker-gtk.a
 lib/libtracker-gtk.la
 lib/libtracker-gtk.so
@@ -67,44 +66,9 @@ lib/tracker/thumbnailers/image/jpeg_thumbnailer
 lib/tracker/thumbnailers/image/png_thumbnailer
 libdata/pkgconfig/libtracker-gtk.pc
 libdata/pkgconfig/tracker.pc
+share/applications/tracker-preferences.desktop
+share/applications/tracker-search-tool.desktop
 share/dbus-1/services/tracker.service
-share/gnome/applications/tracker-preferences.desktop
-share/gnome/applications/tracker-search-tool.desktop
-share/gnome/tracker/icons/thumbnail_frame.png
-share/gnome/tracker/languages/stopwords.da
-share/gnome/tracker/languages/stopwords.de
-share/gnome/tracker/languages/stopwords.en
-share/gnome/tracker/languages/stopwords.es
-share/gnome/tracker/languages/stopwords.fi
-share/gnome/tracker/languages/stopwords.fr
-share/gnome/tracker/languages/stopwords.it
-share/gnome/tracker/languages/stopwords.nb
-share/gnome/tracker/languages/stopwords.nl
-share/gnome/tracker/languages/stopwords.pt
-share/gnome/tracker/languages/stopwords.ru
-share/gnome/tracker/languages/stopwords.sv
-share/gnome/tracker/services/application.metadata
-share/gnome/tracker/services/audio.metadata
-share/gnome/tracker/services/default.metadata
-share/gnome/tracker/services/default.service
-share/gnome/tracker/services/document.metadata
-share/gnome/tracker/services/email.metadata
-share/gnome/tracker/services/file.metadata
-share/gnome/tracker/services/image.metadata
-share/gnome/tracker/services/video.metadata
-share/gnome/tracker/sqlite-cache.sql
-share/gnome/tracker/sqlite-email.sql
-share/gnome/tracker/sqlite-metadata.sql
-share/gnome/tracker/sqlite-service-stored-procs.sql
-share/gnome/tracker/sqlite-service-triggers.sql
-share/gnome/tracker/sqlite-service-types.sql
-share/gnome/tracker/sqlite-service.sql
-share/gnome/tracker/sqlite-stored-procs.sql
-share/gnome/tracker/sqlite-tracker-triggers.sql
-share/gnome/tracker/sqlite-tracker.sql
-share/gnome/tracker/sqlite-user-data.sql
-share/gnome/tracker/tracker-introspect.xml
-share/gnome/tracker/tracker-preferences.glade
 share/icons/hicolor/16x16/apps/tracker.png
 share/icons/hicolor/22x22/apps/tracker.png
 share/icons/hicolor/24x24/apps/tracker.png
@@ -122,14 +86,55 @@ share/locale/fi/LC_MESSAGES/tracker.mo
 share/locale/fr/LC_MESSAGES/tracker.mo
 share/locale/gl/LC_MESSAGES/tracker.mo
 share/locale/it/LC_MESSAGES/tracker.mo
+share/locale/lt/LC_MESSAGES/tracker.mo
 share/locale/mk/LC_MESSAGES/tracker.mo
 share/locale/nb/LC_MESSAGES/tracker.mo
+share/locale/nl/LC_MESSAGES/tracker.mo
 share/locale/oc/LC_MESSAGES/tracker.mo
+share/locale/pl/LC_MESSAGES/tracker.mo
 share/locale/pt/LC_MESSAGES/tracker.mo
 share/locale/ru/LC_MESSAGES/tracker.mo
 share/locale/sl/LC_MESSAGES/tracker.mo
 share/locale/sv/LC_MESSAGES/tracker.mo
-@dirrm include/libtracker-gtk
+%%DATADIR%%/icons/thumbnail_frame.png
+%%DATADIR%%/languages/stopwords.da
+%%DATADIR%%/languages/stopwords.de
+%%DATADIR%%/languages/stopwords.en
+%%DATADIR%%/languages/stopwords.es
+%%DATADIR%%/languages/stopwords.fi
+%%DATADIR%%/languages/stopwords.fr
+%%DATADIR%%/languages/stopwords.it
+%%DATADIR%%/languages/stopwords.nb
+%%DATADIR%%/languages/stopwords.nl
+%%DATADIR%%/languages/stopwords.pt
+%%DATADIR%%/languages/stopwords.ru
+%%DATADIR%%/languages/stopwords.sv
+%%DATADIR%%/services/application.metadata
+%%DATADIR%%/services/audio.metadata
+%%DATADIR%%/services/default.metadata
+%%DATADIR%%/services/default.service
+%%DATADIR%%/services/document.metadata
+%%DATADIR%%/services/email.metadata
+%%DATADIR%%/services/file.metadata
+%%DATADIR%%/services/image.metadata
+%%DATADIR%%/services/video.metadata
+%%DATADIR%%/sqlite-cache.sql
+%%DATADIR%%/sqlite-email.sql
+%%DATADIR%%/sqlite-metadata.sql
+%%DATADIR%%/sqlite-service-stored-procs.sql
+%%DATADIR%%/sqlite-service-triggers.sql
+%%DATADIR%%/sqlite-service-types.sql
+%%DATADIR%%/sqlite-service.sql
+%%DATADIR%%/sqlite-stored-procs.sql
+%%DATADIR%%/sqlite-tracker-triggers.sql
+%%DATADIR%%/sqlite-tracker.sql
+%%DATADIR%%/sqlite-user-data.sql
+%%DATADIR%%/tracker-introspect.xml
+%%DATADIR%%/tracker-preferences.glade
+@dirrm %%DATADIR%%/services
+@dirrm %%DATADIR%%/languages
+@dirrm %%DATADIR%%/icons
+@dirrm %%DATADIR%%
 @dirrm lib/tracker/thumbnailers/image
 @dirrm lib/tracker/thumbnailers/application
 @dirrm lib/tracker/thumbnailers
@@ -137,15 +142,11 @@ share/locale/sv/LC_MESSAGES/tracker.mo
 @dirrm lib/tracker/filters/application
 @dirrm lib/tracker/filters
 @dirrm lib/tracker
-@dirrm share/gnome/tracker/services
-@dirrm share/gnome/tracker/languages
-@dirrm share/gnome/tracker/icons
-@dirrm share/gnome/tracker
+@dirrm include/libtracker-gtk
 @dirrmtry etc/xdg/autostart
 @dirrmtry etc/xdg
-@dirrmtry lib/deskbar-applet/handlers
-@dirrmtry lib/deskbar-applet
 @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/sysutils/tracker/Makefile b/sysutils/tracker/Makefile
index b45081f01e8b..867d4b49f82d 100644
--- a/sysutils/tracker/Makefile
+++ b/sysutils/tracker/Makefile
@@ -3,12 +3,12 @@
 # Whom:			Michael Johnson <ahze@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/sysutils/tracker/Makefile,v 1.2 2006/12/10 17:33:17 ahze Exp $
+#   $MCom: ports/sysutils/tracker/Makefile,v 1.8 2007/10/05 16:55:59 mezz Exp $
 #
 
 PORTNAME=	tracker
-PORTVERSION=	0.6.1
-PORTREVISION=	1
+PORTVERSION=	0.6.2
+PORTREVISION=	2
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	http://www.gnome.org/~jamiemcc/tracker/
 
@@ -19,7 +19,9 @@ LIB_DEPENDS=	dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
 		poppler-glib.2:${PORTSDIR}/graphics/poppler-gtk \
 		exif.12:${PORTSDIR}/graphics/libexif \
 		wv-1.2.3:${PORTSDIR}/textproc/wv \
-		gmime-2.0.4:${PORTSDIR}/mail/gmime2
+		gmime-2.0.4:${PORTSDIR}/mail/gmime2 \
+		sqlite3.8:${PORTSDIR}/databases/sqlite3
+#RUN_DEPENDS=	${LOCALBASE}/lib/deskbar-applet/deskbar-applet:${PORTSDIR}/deskutils/deskbar-applet
 
 USE_BZIP2=	yes
 USE_FAM=	yes
@@ -39,12 +41,12 @@ CONFIGURE_ARGS=	--enable-video-extractor=gstreamer \
 		--enable-deskbar-applet \
 		--with-deskbar-applet-handler-dir=${LOCALBASE}/lib/deskbar-applet/handlers
 
-MAN1=		tracker-extract.1 tracker-files.1 tracker-meta-folder.1 \
-		tracker-query.1 tracker-search.1 tracker-stats.1 trackerd.1 \
-		tracker-preferences.1 tracker-search-tool.1 tracker-status.1 \
-		tracker-tag.1 tracker-thumbnailer.1
-MAN5=		tracker.cfg.5
-MAN7=		tracker-services.7
+MAN1=	tracker-extract.1 tracker-files.1 tracker-meta-folder.1 \
+	tracker-preferences.1 tracker-query.1 tracker-search.1 \
+	tracker-search-tool.1 tracker-stats.1 tracker-status.1 \
+	tracker-tag.1 tracker-thumbnailer.1 trackerd.1
+MAN5=	tracker.cfg.5
+MAN7=	tracker-services.7
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|libpng|libpng12|' ${WRKSRC}/configure
diff --git a/sysutils/tracker/distinfo b/sysutils/tracker/distinfo
index a9bf15f39356..01cde91775e7 100644
--- a/sysutils/tracker/distinfo
+++ b/sysutils/tracker/distinfo
@@ -1,3 +1,3 @@
-MD5 (tracker-0.6.1.tar.bz2) = 3f706dc73fffa0a7b633b0c0aff6a263
-SHA256 (tracker-0.6.1.tar.bz2) = 2c671498d7406b25bb6e75dd1799165d0d0abfe4309532aeb6ba5e533556932a
-SIZE (tracker-0.6.1.tar.bz2) = 1199993
+MD5 (tracker-0.6.2.tar.bz2) = d4d66cd73e6c59ac392565be622370f2
+SHA256 (tracker-0.6.2.tar.bz2) = 8a7e80fe5384c0f5d7f87f43121b48be0b7bc5ccf50fdb2ca81517ce2375b36f
+SIZE (tracker-0.6.2.tar.bz2) = 747560
diff --git a/sysutils/tracker/files/patch-src_sqlite3_Makefile.in b/sysutils/tracker/files/patch-src_sqlite3_Makefile.in
deleted file mode 100644
index 21069bd24ced..000000000000
--- a/sysutils/tracker/files/patch-src_sqlite3_Makefile.in
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/sqlite3/Makefile.in.orig	2007-08-25 13:54:21.000000000 -0500
-+++ src/sqlite3/Makefile.in	2007-08-25 13:54:28.000000000 -0500
-@@ -321,7 +321,6 @@
- INCLUDES = \
- 	 $(SQLITE_OS)			\
- 	 -DHAVE_USLEEP=1 		\
--	 -DHAVE_FDATASYNC=1 		\
- 	 -DNDEBUG			\
- 	 -DTHREADSAFE=1			\
- 	 -DSQLITE_THREAD_OVERRIDE_LOCK=-1	\
diff --git a/sysutils/tracker/files/patch-src_trackerd_tracker-apps.c b/sysutils/tracker/files/patch-src_trackerd_tracker-apps.c
new file mode 100644
index 000000000000..6326c01a2719
--- /dev/null
+++ b/sysutils/tracker/files/patch-src_trackerd_tracker-apps.c
@@ -0,0 +1,12 @@
+--- ./src/trackerd/tracker-apps.c.orig	2007-10-05 20:18:39.000000000 +0400
++++ ./src/trackerd/tracker-apps.c	2007-10-05 20:19:10.000000000 +0400
+@@ -18,7 +18,8 @@
+  * Boston, MA  02110-1301, USA.
+  */
+ 
+-#include<string.h>
++#include <stdlib.h>
++#include <string.h>
+ 
+ #include "tracker-apps.h"
+ #include "tracker-db.h"
diff --git a/sysutils/tracker/pkg-plist b/sysutils/tracker/pkg-plist
index ea2c827b73a6..2d36ccbfa4e1 100644
--- a/sysutils/tracker/pkg-plist
+++ b/sysutils/tracker/pkg-plist
@@ -20,7 +20,6 @@ include/libtracker-gtk/tracker-ui.h
 include/libtracker-gtk/tracker-utils.h
 include/tracker-client.h
 include/tracker.h
-lib/deskbar-applet/handlers/tracker-handler.py
 lib/libtracker-gtk.a
 lib/libtracker-gtk.la
 lib/libtracker-gtk.so
@@ -67,44 +66,9 @@ lib/tracker/thumbnailers/image/jpeg_thumbnailer
 lib/tracker/thumbnailers/image/png_thumbnailer
 libdata/pkgconfig/libtracker-gtk.pc
 libdata/pkgconfig/tracker.pc
+share/applications/tracker-preferences.desktop
+share/applications/tracker-search-tool.desktop
 share/dbus-1/services/tracker.service
-share/gnome/applications/tracker-preferences.desktop
-share/gnome/applications/tracker-search-tool.desktop
-share/gnome/tracker/icons/thumbnail_frame.png
-share/gnome/tracker/languages/stopwords.da
-share/gnome/tracker/languages/stopwords.de
-share/gnome/tracker/languages/stopwords.en
-share/gnome/tracker/languages/stopwords.es
-share/gnome/tracker/languages/stopwords.fi
-share/gnome/tracker/languages/stopwords.fr
-share/gnome/tracker/languages/stopwords.it
-share/gnome/tracker/languages/stopwords.nb
-share/gnome/tracker/languages/stopwords.nl
-share/gnome/tracker/languages/stopwords.pt
-share/gnome/tracker/languages/stopwords.ru
-share/gnome/tracker/languages/stopwords.sv
-share/gnome/tracker/services/application.metadata
-share/gnome/tracker/services/audio.metadata
-share/gnome/tracker/services/default.metadata
-share/gnome/tracker/services/default.service
-share/gnome/tracker/services/document.metadata
-share/gnome/tracker/services/email.metadata
-share/gnome/tracker/services/file.metadata
-share/gnome/tracker/services/image.metadata
-share/gnome/tracker/services/video.metadata
-share/gnome/tracker/sqlite-cache.sql
-share/gnome/tracker/sqlite-email.sql
-share/gnome/tracker/sqlite-metadata.sql
-share/gnome/tracker/sqlite-service-stored-procs.sql
-share/gnome/tracker/sqlite-service-triggers.sql
-share/gnome/tracker/sqlite-service-types.sql
-share/gnome/tracker/sqlite-service.sql
-share/gnome/tracker/sqlite-stored-procs.sql
-share/gnome/tracker/sqlite-tracker-triggers.sql
-share/gnome/tracker/sqlite-tracker.sql
-share/gnome/tracker/sqlite-user-data.sql
-share/gnome/tracker/tracker-introspect.xml
-share/gnome/tracker/tracker-preferences.glade
 share/icons/hicolor/16x16/apps/tracker.png
 share/icons/hicolor/22x22/apps/tracker.png
 share/icons/hicolor/24x24/apps/tracker.png
@@ -122,14 +86,55 @@ share/locale/fi/LC_MESSAGES/tracker.mo
 share/locale/fr/LC_MESSAGES/tracker.mo
 share/locale/gl/LC_MESSAGES/tracker.mo
 share/locale/it/LC_MESSAGES/tracker.mo
+share/locale/lt/LC_MESSAGES/tracker.mo
 share/locale/mk/LC_MESSAGES/tracker.mo
 share/locale/nb/LC_MESSAGES/tracker.mo
+share/locale/nl/LC_MESSAGES/tracker.mo
 share/locale/oc/LC_MESSAGES/tracker.mo
+share/locale/pl/LC_MESSAGES/tracker.mo
 share/locale/pt/LC_MESSAGES/tracker.mo
 share/locale/ru/LC_MESSAGES/tracker.mo
 share/locale/sl/LC_MESSAGES/tracker.mo
 share/locale/sv/LC_MESSAGES/tracker.mo
-@dirrm include/libtracker-gtk
+%%DATADIR%%/icons/thumbnail_frame.png
+%%DATADIR%%/languages/stopwords.da
+%%DATADIR%%/languages/stopwords.de
+%%DATADIR%%/languages/stopwords.en
+%%DATADIR%%/languages/stopwords.es
+%%DATADIR%%/languages/stopwords.fi
+%%DATADIR%%/languages/stopwords.fr
+%%DATADIR%%/languages/stopwords.it
+%%DATADIR%%/languages/stopwords.nb
+%%DATADIR%%/languages/stopwords.nl
+%%DATADIR%%/languages/stopwords.pt
+%%DATADIR%%/languages/stopwords.ru
+%%DATADIR%%/languages/stopwords.sv
+%%DATADIR%%/services/application.metadata
+%%DATADIR%%/services/audio.metadata
+%%DATADIR%%/services/default.metadata
+%%DATADIR%%/services/default.service
+%%DATADIR%%/services/document.metadata
+%%DATADIR%%/services/email.metadata
+%%DATADIR%%/services/file.metadata
+%%DATADIR%%/services/image.metadata
+%%DATADIR%%/services/video.metadata
+%%DATADIR%%/sqlite-cache.sql
+%%DATADIR%%/sqlite-email.sql
+%%DATADIR%%/sqlite-metadata.sql
+%%DATADIR%%/sqlite-service-stored-procs.sql
+%%DATADIR%%/sqlite-service-triggers.sql
+%%DATADIR%%/sqlite-service-types.sql
+%%DATADIR%%/sqlite-service.sql
+%%DATADIR%%/sqlite-stored-procs.sql
+%%DATADIR%%/sqlite-tracker-triggers.sql
+%%DATADIR%%/sqlite-tracker.sql
+%%DATADIR%%/sqlite-user-data.sql
+%%DATADIR%%/tracker-introspect.xml
+%%DATADIR%%/tracker-preferences.glade
+@dirrm %%DATADIR%%/services
+@dirrm %%DATADIR%%/languages
+@dirrm %%DATADIR%%/icons
+@dirrm %%DATADIR%%
 @dirrm lib/tracker/thumbnailers/image
 @dirrm lib/tracker/thumbnailers/application
 @dirrm lib/tracker/thumbnailers
@@ -137,15 +142,11 @@ share/locale/sv/LC_MESSAGES/tracker.mo
 @dirrm lib/tracker/filters/application
 @dirrm lib/tracker/filters
 @dirrm lib/tracker
-@dirrm share/gnome/tracker/services
-@dirrm share/gnome/tracker/languages
-@dirrm share/gnome/tracker/icons
-@dirrm share/gnome/tracker
+@dirrm include/libtracker-gtk
 @dirrmtry etc/xdg/autostart
 @dirrmtry etc/xdg
-@dirrmtry lib/deskbar-applet/handlers
-@dirrmtry lib/deskbar-applet
 @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/sysutils/xvidcap/Makefile b/sysutils/xvidcap/Makefile
index 3633f7c909e5..47db010b8c49 100644
--- a/sysutils/xvidcap/Makefile
+++ b/sysutils/xvidcap/Makefile
@@ -16,7 +16,7 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=		thierry@FreeBSD.org
 COMMENT=		Capture your X display to individual frames or MPEG video
 
-BUILD_DEPENDS=		scrollkeeper-config:${PORTSDIR}/textproc/scrollkeeper	\
+BUILD_DEPENDS=		rarian-sk-config:${PORTSDIR}/textproc/rarian	\
 			xml2po:${PORTSDIR}/textproc/gnome-doc-utils	\
 			texi2html:${PORTSDIR}/textproc/texi2html
 # To be reactivated when ffmpeg-devel will install libswscale.
diff --git a/textproc/Makefile b/textproc/Makefile
index bd76a509dc88..e36019e04a17 100644
--- a/textproc/Makefile
+++ b/textproc/Makefile
@@ -823,6 +823,7 @@
     SUBDIR += queequeg
     SUBDIR += rand
     SUBDIR += raptor
+    SUBDIR += rarian
     SUBDIR += rast
     SUBDIR += re_graph
     SUBDIR += redet
diff --git a/textproc/gnome-doc-utils/Makefile b/textproc/gnome-doc-utils/Makefile
index 76498989cf98..2fb44b7df9ba 100644
--- a/textproc/gnome-doc-utils/Makefile
+++ b/textproc/gnome-doc-utils/Makefile
@@ -3,12 +3,11 @@
 # Whom:					Adam Weinberger <adamw@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/textproc/gnome-doc-utils/Makefile,v 1.44 2007/03/13 00:37:32 mezz Exp $
+#   $MCom: ports/textproc/gnome-doc-utils/Makefile,v 1.55 2007/09/18 16:49:47 mezz Exp $
 #
 
 PORTNAME=	gnome-doc-utils
-PORTVERSION=	0.10.3
-PORTREVISION=	1
+PORTVERSION=	0.12.0
 CATEGORIES=	textproc gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -17,9 +16,9 @@ DISTNAME=	gnome-doc-utils-${PORTVERSION}
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GNOME doc utils
 
-BUILD_DEPENDS=	scrollkeeper-config:${PORTSDIR}/textproc/scrollkeeper \
+BUILD_DEPENDS=	rarian-sk-config:${PORTSDIR}/textproc/rarian \
     		gawk:${PORTSDIR}/lang/gawk
-RUN_DEPENDS=	scrollkeeper-config:${PORTSDIR}/textproc/scrollkeeper \
+RUN_DEPENDS=	rarian-sk-config:${PORTSDIR}/textproc/rarian \
 		${PYTHON_SITELIBDIR}/libxml2mod.so:${PORTSDIR}/textproc/py-libxml2 \
 		${LOCALBASE}/share/xml/docbook/4.3/catalog.xml:${PORTSDIR}/textproc/docbook-xml-430 \
 		${LOCALBASE}/share/xml/docbook/4.4/catalog.xml:${PORTSDIR}/textproc/docbook-xml-440
@@ -27,11 +26,11 @@ RUN_DEPENDS=	scrollkeeper-config:${PORTSDIR}/textproc/scrollkeeper \
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_GETTEXT=	yes
-USE_GNOME=	gnomehier gnometarget gnomehack libxslt
+USE_GNOME=	gnomehier gnometarget gnomehack libxslt intlhack
 USE_PYTHON=	yes
 INSTALLS_OMF=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-omf-dir=${PREFIX}/share/gnome/omf
+CONFIGURE_ARGS=	--with-omf-dir=${PREFIX}/share/omf
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
diff --git a/textproc/gnome-doc-utils/distinfo b/textproc/gnome-doc-utils/distinfo
index cfcc35c11337..481be468bd69 100644
--- a/textproc/gnome-doc-utils/distinfo
+++ b/textproc/gnome-doc-utils/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome-doc-utils-0.10.3.tar.bz2) = 43f3a4086ec1254cbe20b85948192d18
-SHA256 (gnome-doc-utils-0.10.3.tar.bz2) = 19b5b4425bc578af8a1c58b61f1b9a416743d0b1fae3356cd9a0071f1f66632c
-SIZE (gnome-doc-utils-0.10.3.tar.bz2) = 451981
+MD5 (gnome-doc-utils-0.12.0.tar.bz2) = 5934c08d12407d8233416343cd73df24
+SHA256 (gnome-doc-utils-0.12.0.tar.bz2) = 6bb8ec068558e380aff1e3f0aa130b52161ad68f8d495fce45c55783bbba9076
+SIZE (gnome-doc-utils-0.12.0.tar.bz2) = 592073
diff --git a/textproc/gnome-doc-utils/pkg-plist b/textproc/gnome-doc-utils/pkg-plist
index 86bb06a79f10..aa2dd49a3748 100644
--- a/textproc/gnome-doc-utils/pkg-plist
+++ b/textproc/gnome-doc-utils/pkg-plist
@@ -5,9 +5,31 @@ libdata/pkgconfig/gnome-doc-utils.pc
 libdata/pkgconfig/xml2po.pc
 share/aclocal/gnome-doc-utils.m4
 %%DATADIR%%/gnome-doc-utils.make
+%%DATADIR%%/icons/hicolor/48x48/admon-bug.png
+%%DATADIR%%/icons/hicolor/48x48/admon-caution.png
+%%DATADIR%%/icons/hicolor/48x48/admon-important.png
+%%DATADIR%%/icons/hicolor/48x48/admon-note.png
+%%DATADIR%%/icons/hicolor/48x48/admon-tip.png
+%%DATADIR%%/icons/hicolor/48x48/admon-warning.png
+%%DATADIR%%/icons/hicolor/scalable/admon-bug.svg
+%%DATADIR%%/icons/hicolor/scalable/admon-caution.svg
+%%DATADIR%%/icons/hicolor/scalable/admon-important.svg
+%%DATADIR%%/icons/hicolor/scalable/admon-note.svg
+%%DATADIR%%/icons/hicolor/scalable/admon-tip.svg
+%%DATADIR%%/icons/hicolor/scalable/admon-warning.svg
 %%DATADIR%%/template-document.xml
 %%DATADIR%%/template.make
 %%DATADIR%%/template.omf.in
+%%DATADIR%%/templates/gnome-app-template.xml
+%%DATADIR%%/templates/gnome-applet-template.xml
+%%DATADIR%%/templates/legal.xml
+%%DATADIR%%/watermarks/watermark-blockquote-00AB.png
+%%DATADIR%%/watermarks/watermark-blockquote-00BB.png
+%%DATADIR%%/watermarks/watermark-blockquote-201C.png
+%%DATADIR%%/watermarks/watermark-blockquote-201D.png
+%%DATADIR%%/watermarks/watermark-blockquote-201E.png
+%%DATADIR%%/watermarks/watermark-code-python.png
+%%DATADIR%%/watermarks/watermark-code.png
 share/gnome/help/gnome-doc-make/C/gnome-doc-make.xml
 share/gnome/help/gnome-doc-make/C/legal.xml
 share/gnome/help/gnome-doc-make/C/make-ref.xml
@@ -16,7 +38,6 @@ share/gnome/help/gnome-doc-xslt/C/db-common.xml
 share/gnome/help/gnome-doc-xslt/C/db-label.xml
 share/gnome/help/gnome-doc-xslt/C/db-title.xml
 share/gnome/help/gnome-doc-xslt/C/db-xref.xml
-share/gnome/help/gnome-doc-xslt/C/db2html-admon.xml
 share/gnome/help/gnome-doc-xslt/C/db2html-autotoc.xml
 share/gnome/help/gnome-doc-xslt/C/db2html-bibliography.xml
 share/gnome/help/gnome-doc-xslt/C/db2html-block.xml
@@ -28,6 +49,7 @@ share/gnome/help/gnome-doc-xslt/C/db2html-division.xml
 share/gnome/help/gnome-doc-xslt/C/db2html-ebnf.xml
 share/gnome/help/gnome-doc-xslt/C/db2html-footnote.xml
 share/gnome/help/gnome-doc-xslt/C/db2html-funcsynopsis.xml
+share/gnome/help/gnome-doc-xslt/C/db2html-index.xml
 share/gnome/help/gnome-doc-xslt/C/db2html-info.xml
 share/gnome/help/gnome-doc-xslt/C/db2html-inline.xml
 share/gnome/help/gnome-doc-xslt/C/db2html-l10n.xml
@@ -40,13 +62,13 @@ share/gnome/help/gnome-doc-xslt/C/db2html-title.xml
 share/gnome/help/gnome-doc-xslt/C/db2html-xref.xml
 share/gnome/help/gnome-doc-xslt/C/db2html.xml
 share/gnome/help/gnome-doc-xslt/C/db2omf.xml
+share/gnome/help/gnome-doc-xslt/C/db2xhtml.xml
 share/gnome/help/gnome-doc-xslt/C/gettext.xml
 share/gnome/help/gnome-doc-xslt/C/gnome-doc-xslt.xml
 share/gnome/help/gnome-doc-xslt/C/l10n-numbers.xml
 share/gnome/help/gnome-doc-xslt/C/legal.xml
+share/gnome/help/gnome-doc-xslt/C/theme.xml
 share/gnome/help/gnome-doc-xslt/C/translating.xml
-share/gnome/omf/gnome-doc-make/gnome-doc-make-C.omf
-share/gnome/omf/gnome-doc-xslt/gnome-doc-xslt-C.omf
 share/locale/ar/LC_MESSAGES/gnome-doc-utils.mo
 share/locale/bg/LC_MESSAGES/gnome-doc-utils.mo
 share/locale/bn/LC_MESSAGES/gnome-doc-utils.mo
@@ -85,6 +107,7 @@ share/locale/mr/LC_MESSAGES/gnome-doc-utils.mo
 share/locale/nb/LC_MESSAGES/gnome-doc-utils.mo
 share/locale/ne/LC_MESSAGES/gnome-doc-utils.mo
 share/locale/nl/LC_MESSAGES/gnome-doc-utils.mo
+share/locale/oc/LC_MESSAGES/gnome-doc-utils.mo
 share/locale/or/LC_MESSAGES/gnome-doc-utils.mo
 share/locale/pa/LC_MESSAGES/gnome-doc-utils.mo
 share/locale/pl/LC_MESSAGES/gnome-doc-utils.mo
@@ -109,12 +132,14 @@ share/locale/wa/LC_MESSAGES/gnome-doc-utils.mo
 share/locale/zh_CN/LC_MESSAGES/gnome-doc-utils.mo
 share/locale/zh_HK/LC_MESSAGES/gnome-doc-utils.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-doc-utils.mo
+share/omf/gnome-doc-make/gnome-doc-make-C.omf
+share/omf/gnome-doc-xslt/gnome-doc-xslt-C.omf
+share/xml/gnome/xslt/common/theme.xsl
 share/xml/gnome/xslt/docbook/common/db-chunk.xsl
 share/xml/gnome/xslt/docbook/common/db-common.xsl
 share/xml/gnome/xslt/docbook/common/db-label.xsl
 share/xml/gnome/xslt/docbook/common/db-title.xsl
 share/xml/gnome/xslt/docbook/common/db-xref.xsl
-share/xml/gnome/xslt/docbook/html/db2html-admon.xsl
 share/xml/gnome/xslt/docbook/html/db2html-autotoc.xsl
 share/xml/gnome/xslt/docbook/html/db2html-bibliography.xsl
 share/xml/gnome/xslt/docbook/html/db2html-block.xsl
@@ -126,6 +151,7 @@ share/xml/gnome/xslt/docbook/html/db2html-division.xsl
 share/xml/gnome/xslt/docbook/html/db2html-ebnf.xsl
 share/xml/gnome/xslt/docbook/html/db2html-footnote.xsl
 share/xml/gnome/xslt/docbook/html/db2html-funcsynopsis.xsl
+share/xml/gnome/xslt/docbook/html/db2html-index.xsl
 share/xml/gnome/xslt/docbook/html/db2html-info.xsl
 share/xml/gnome/xslt/docbook/html/db2html-inline.xsl
 share/xml/gnome/xslt/docbook/html/db2html-l10n.xsl
@@ -138,10 +164,12 @@ share/xml/gnome/xslt/docbook/html/db2html-table.xsl
 share/xml/gnome/xslt/docbook/html/db2html-title.xsl
 share/xml/gnome/xslt/docbook/html/db2html-xref.xsl
 share/xml/gnome/xslt/docbook/html/db2html.xsl
+share/xml/gnome/xslt/docbook/html/db2xhtml.xsl
 share/xml/gnome/xslt/docbook/omf/db2omf.xsl
 share/xml/gnome/xslt/docbook/utils/chunks.xsl
 share/xml/gnome/xslt/docbook/utils/credits.xsl
 share/xml/gnome/xslt/docbook/utils/figures.xsl
+share/xml/gnome/xslt/docbook/utils/graphics.xsl
 share/xml/gnome/xslt/docbook/utils/ids.xsl
 share/xml/gnome/xslt/gettext/gettext.xsl
 share/xml/gnome/xslt/gettext/l10n-numbers.xsl
@@ -163,15 +191,21 @@ share/xml2po/xhtml.pyc
 @dirrm share/xml/gnome/xslt/docbook/html
 @dirrm share/xml/gnome/xslt/docbook/common
 @dirrm share/xml/gnome/xslt/docbook
+@dirrm share/xml/gnome/xslt/common
 @dirrm share/xml/gnome/xslt
 @dirrm share/xml/gnome
-@dirrm share/xml
-@dirrm share/gnome/omf/gnome-doc-xslt
-@dirrm share/gnome/omf/gnome-doc-make
+@dirrm share/omf/gnome-doc-xslt
+@dirrm share/omf/gnome-doc-make
 @dirrm share/gnome/help/gnome-doc-xslt/C
 @dirrm share/gnome/help/gnome-doc-xslt
 @dirrm share/gnome/help/gnome-doc-make/C
 @dirrm share/gnome/help/gnome-doc-make
+@dirrm %%DATADIR%%/watermarks
+@dirrm %%DATADIR%%/templates
+@dirrm %%DATADIR%%/icons/hicolor/scalable
+@dirrm %%DATADIR%%/icons/hicolor/48x48
+@dirrm %%DATADIR%%/icons/hicolor
+@dirrm %%DATADIR%%/icons
 @dirrm %%DATADIR%%
 @dirrmtry share/locale/zh_HK/LC_MESSAGES
 @dirrmtry share/locale/zh_HK
@@ -179,6 +213,8 @@ share/xml2po/xhtml.pyc
 @dirrmtry share/locale/ug
 @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
diff --git a/textproc/gnome-spell/Makefile b/textproc/gnome-spell/Makefile
index 1ecf4b617681..aa0c66bf6b9e 100644
--- a/textproc/gnome-spell/Makefile
+++ b/textproc/gnome-spell/Makefile
@@ -3,16 +3,14 @@
 # Whom:					Maxim Sobolev <sobomax@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/textproc/gnome-spell/Makefile,v 1.9 2006/07/23 01:44:27 mezz Exp $
+#   $MCom: ports/textproc/gnome-spell/Makefile,v 1.13 2007/10/15 17:17:18 mezz Exp $
 #
 
 PORTNAME=	gnome-spell
-PORTVERSION=	1.0.7
-PORTREVISION=	3
+PORTVERSION=	1.0.8
 CATEGORIES=	textproc gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/gnome-spell/1.0
-DISTNAME=	gnome-spell-${PORTVERSION}
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
 DIST_SUBDIR=	gnome
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/textproc/gnome-spell/distinfo b/textproc/gnome-spell/distinfo
index 47e05f752f02..090d35b3c71b 100644
--- a/textproc/gnome-spell/distinfo
+++ b/textproc/gnome-spell/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome/gnome-spell-1.0.7.tar.bz2) = da3ad2c664afd06a0c56c84d5055f8ad
-SHA256 (gnome/gnome-spell-1.0.7.tar.bz2) = 6f3117635267acd29bb934bd6e588c58a8f5643fcaf41310d6633c2d7909f5f6
-SIZE (gnome/gnome-spell-1.0.7.tar.bz2) = 331063
+MD5 (gnome/gnome-spell-1.0.8.tar.bz2) = 6ccc46b4e3dc7cb1c6d413358e35d445
+SHA256 (gnome/gnome-spell-1.0.8.tar.bz2) = 04393bef844a92a18c9e6a676355d89b21cdc1b3111a407299108507eb9763a2
+SIZE (gnome/gnome-spell-1.0.8.tar.bz2) = 417076
diff --git a/textproc/gnome-spell/pkg-plist b/textproc/gnome-spell/pkg-plist
index a078dddab685..b589c5283aa9 100644
--- a/textproc/gnome-spell/pkg-plist
+++ b/textproc/gnome-spell/pkg-plist
@@ -3,10 +3,11 @@ lib/gnome-spell/libgnome-spell-component.a
 lib/gnome-spell/libgnome-spell-component.la
 lib/gnome-spell/libgnome-spell-component.so
 libdata/bonobo/servers/GNOME_Spell.server
-share/gnome/control-center-2.0/icons/spell-checker.png
-share/gnome/gnome-spell-%%VERSION%%/spell-checker.glade
-share/gnome/idl/Spell-%%VERSION%%.idl
+share/control-center-2.0/icons/spell-checker.png
+share/gnome-spell-%%VERSION%%/spell-checker.glade
+share/idl/Spell-%%VERSION%%.idl
 share/locale/am/LC_MESSAGES/gnome-spell-%%VERSION%%.mo
+share/locale/ar/LC_MESSAGES/gnome-spell-%%VERSION%%.mo
 share/locale/az/LC_MESSAGES/gnome-spell-%%VERSION%%.mo
 share/locale/be/LC_MESSAGES/gnome-spell-%%VERSION%%.mo
 share/locale/bg/LC_MESSAGES/gnome-spell-%%VERSION%%.mo
@@ -14,10 +15,12 @@ share/locale/ca/LC_MESSAGES/gnome-spell-%%VERSION%%.mo
 share/locale/cs/LC_MESSAGES/gnome-spell-%%VERSION%%.mo
 share/locale/da/LC_MESSAGES/gnome-spell-%%VERSION%%.mo
 share/locale/de/LC_MESSAGES/gnome-spell-%%VERSION%%.mo
+share/locale/dz/LC_MESSAGES/gnome-spell-%%VERSION%%.mo
 share/locale/el/LC_MESSAGES/gnome-spell-%%VERSION%%.mo
 share/locale/en_CA/LC_MESSAGES/gnome-spell-%%VERSION%%.mo
 share/locale/en_GB/LC_MESSAGES/gnome-spell-%%VERSION%%.mo
 share/locale/es/LC_MESSAGES/gnome-spell-%%VERSION%%.mo
+share/locale/et/LC_MESSAGES/gnome-spell-%%VERSION%%.mo
 share/locale/fi/LC_MESSAGES/gnome-spell-%%VERSION%%.mo
 share/locale/fr/LC_MESSAGES/gnome-spell-%%VERSION%%.mo
 share/locale/ga/LC_MESSAGES/gnome-spell-%%VERSION%%.mo
@@ -34,7 +37,7 @@ share/locale/lv/LC_MESSAGES/gnome-spell-%%VERSION%%.mo
 share/locale/nb/LC_MESSAGES/gnome-spell-%%VERSION%%.mo
 share/locale/ne/LC_MESSAGES/gnome-spell-%%VERSION%%.mo
 share/locale/nl/LC_MESSAGES/gnome-spell-%%VERSION%%.mo
-share/locale/no/LC_MESSAGES/gnome-spell-%%VERSION%%.mo
+share/locale/oc/LC_MESSAGES/gnome-spell-%%VERSION%%.mo
 share/locale/pa/LC_MESSAGES/gnome-spell-%%VERSION%%.mo
 share/locale/pl/LC_MESSAGES/gnome-spell-%%VERSION%%.mo
 share/locale/pt/LC_MESSAGES/gnome-spell-%%VERSION%%.mo
@@ -42,6 +45,7 @@ share/locale/pt_BR/LC_MESSAGES/gnome-spell-%%VERSION%%.mo
 share/locale/ru/LC_MESSAGES/gnome-spell-%%VERSION%%.mo
 share/locale/rw/LC_MESSAGES/gnome-spell-%%VERSION%%.mo
 share/locale/sk/LC_MESSAGES/gnome-spell-%%VERSION%%.mo
+share/locale/sl/LC_MESSAGES/gnome-spell-%%VERSION%%.mo
 share/locale/sq/LC_MESSAGES/gnome-spell-%%VERSION%%.mo
 share/locale/sr/LC_MESSAGES/gnome-spell-%%VERSION%%.mo
 share/locale/sr@Latn/LC_MESSAGES/gnome-spell-%%VERSION%%.mo
@@ -53,11 +57,15 @@ share/locale/vi/LC_MESSAGES/gnome-spell-%%VERSION%%.mo
 share/locale/wa/LC_MESSAGES/gnome-spell-%%VERSION%%.mo
 share/locale/xh/LC_MESSAGES/gnome-spell-%%VERSION%%.mo
 share/locale/zh_CN/LC_MESSAGES/gnome-spell-%%VERSION%%.mo
-@dirrmtry share/gnome/control-center-2.0/icons 2>/dev/null
-@dirrmtry share/gnome/control-center-2.0
-@dirrm share/gnome/gnome-spell-%%VERSION%%
+@dirrm share/gnome-spell-%%VERSION%%
+@dirrmtry share/control-center-2.0/icons
+@dirrmtry share/control-center-2.0
 @dirrm lib/gnome-spell
 @dirrmtry share/locale/xh/LC_MESSAGES
 @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/dz/LC_MESSAGES
+@dirrmtry share/locale/dz
diff --git a/textproc/gnome-translate/Makefile b/textproc/gnome-translate/Makefile
index a71f44072271..b70d4dff93ff 100644
--- a/textproc/gnome-translate/Makefile
+++ b/textproc/gnome-translate/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=		gnome-translate
 PORTVERSION=		0.99
-PORTREVISION=		7
+PORTREVISION=		8
 CATEGORIES=		textproc
 MASTER_SITES=		${MASTER_SITE_SAVANNAH}
 MASTER_SITE_SUBDIR=	libtranslate
diff --git a/textproc/gnome-translate/pkg-plist b/textproc/gnome-translate/pkg-plist
index 1c1ba0431126..bfcd65aa4676 100644
--- a/textproc/gnome-translate/pkg-plist
+++ b/textproc/gnome-translate/pkg-plist
@@ -1,19 +1,19 @@
 bin/gnome-translate
-share/gnome/applications/gnome-translate.desktop
-share/gnome/gnome-translate/ui/app.glade
-share/gnome/gnome-translate/ui/edit-toolbars.glade
-share/gnome/gnome-translate/ui/hand-open.png
-share/gnome/gnome-translate/ui/logo.png
-share/gnome/gnome-translate/ui/menus.xml
-share/gnome/gnome-translate/ui/preferences.glade
-share/gnome/gnome-translate/ui/toolbars.xml
-share/gnome/gnome-translate/ui/translate-web-page.glade
+share/applications/gnome-translate.desktop
+share/gnome-translate/ui/app.glade
+share/gnome-translate/ui/edit-toolbars.glade
+share/gnome-translate/ui/hand-open.png
+share/gnome-translate/ui/logo.png
+share/gnome-translate/ui/menus.xml
+share/gnome-translate/ui/preferences.glade
+share/gnome-translate/ui/toolbars.xml
+share/gnome-translate/ui/translate-web-page.glade
 share/gnome/help/gnome-translate/C/documentation-license.xml
 share/gnome/help/gnome-translate/C/figures/main-window.png
 share/gnome/help/gnome-translate/C/gnome-translate.xml
 share/gnome/help/gnome-translate/C/software-license.xml
-share/gnome/omf/gnome-translate/gnome-translate-C.omf
-share/gnome/pixmaps/gnome-translate.png
+share/omf/gnome-translate/gnome-translate-C.omf
+share/pixmaps/gnome-translate.png
 share/icons/hicolor/16x16/apps/gnome-translate-web-page.png
 share/icons/hicolor/16x16/apps/gnome-translate.png
 share/icons/hicolor/24x24/apps/gnome-translate-web-page.png
@@ -24,9 +24,10 @@ share/icons/hicolor/32x32/apps/gnome-translate.png
 share/icons/hicolor/48x48/apps/gnome-translate-web-page.png
 share/icons/hicolor/48x48/apps/gnome-translate.png
 share/locale/fr/LC_MESSAGES/gnome-translate.mo
-@dirrm share/gnome/gnome-translate/ui
-@dirrm share/gnome/gnome-translate
+@dirrm share/gnome-translate/ui
+@dirrm share/gnome-translate
 @dirrm share/gnome/help/gnome-translate/C/figures
 @dirrm share/gnome/help/gnome-translate/C
 @dirrm share/gnome/help/gnome-translate
-@dirrm share/gnome/omf/gnome-translate
+@dirrm share/omf/gnome-translate
+@dirrmtry share/applications
diff --git a/textproc/gtk-doc/Makefile b/textproc/gtk-doc/Makefile
index 3ef4c63f520f..88a1e8fe3558 100644
--- a/textproc/gtk-doc/Makefile
+++ b/textproc/gtk-doc/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gtk-doc
-PORTVERSION=	1.8
-PORTREVISION=	1
+PORTVERSION=	1.9
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -18,11 +17,11 @@ COMMENT=	Code documentation system, originally for GTK+
 BUILD_DEPENDS=	jade:${PORTSDIR}/textproc/jade \
 		${LOCALBASE}/share/xml/docbook/${DOCBOOK_VERSION}/docbook.cat:${PORTSDIR}/textproc/docbook-sk \
 		${LOCALBASE}/share/xsl/docbook/xhtml/chunk.xsl:${PORTSDIR}/textproc/docbook-xsl \
-		scrollkeeper-config:${PORTSDIR}/textproc/scrollkeeper
+		rarian-sk-config:${PORTSDIR}/textproc/rarian
 RUN_DEPENDS=	jade:${PORTSDIR}/textproc/jade \
 		${LOCALBASE}/share/xml/docbook/${DOCBOOK_VERSION}/docbook.cat:${PORTSDIR}/textproc/docbook-sk \
 		${LOCALBASE}/share/xsl/docbook/xhtml/chunk.xsl:${PORTSDIR}/textproc/docbook-xsl \
-		scrollkeeper-config:${PORTSDIR}/textproc/scrollkeeper
+		rarian-sk-config:${PORTSDIR}/textproc/rarian
 
 DOCBOOK_VERSION=	4.1.2
 
@@ -33,7 +32,7 @@ CATALOG_PORTS_SGML=	${PREFIX}/share/sgml/catalog.ports
 USE_BZIP2=	yes
 USE_PERL5=	yes
 GNU_CONFIGURE=	yes
-USE_GNOME=	gnomehack gnometarget libxslt
+USE_GNOME=	gnomehack gnometarget gnomeprefix libxslt
 INSTALLS_OMF=	yes
 CONFIGURE_ARGS=	--with-xml-catalog=${LOCALBASE}/share/xml/catalog.ports
 
@@ -41,10 +40,6 @@ PLIST_SUB=	XMLCATMGR=${XMLCATMGR} \
 		CATALOG_PORTS_SGML=${CATALOG_PORTS_SGML} \
 		CATALOG_DIR=${CATALOG_DIR}
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|[(]datadir[)]/pkgconfig|(prefix)/libdata/pkgconfig|' \
-		${WRKSRC}/Makefile.in
-
 post-install:
 	@${XMLCATMGR} -sc ${CATALOG_PORTS_SGML} add CATALOG ${CATALOG_DIR}/gtk-doc.cat
 
diff --git a/textproc/gtk-doc/distinfo b/textproc/gtk-doc/distinfo
index 57dfde8e5ba1..9fc10e82f9d1 100644
--- a/textproc/gtk-doc/distinfo
+++ b/textproc/gtk-doc/distinfo
@@ -1,3 +1,3 @@
-MD5 (gtk-doc-1.8.tar.bz2) = e61595df21431db28c83fe4c7d4a4fa8
-SHA256 (gtk-doc-1.8.tar.bz2) = 7a21c6f094f39b73ab23653ec628dd78ded47412636c491b3513fa760a8a22d3
-SIZE (gtk-doc-1.8.tar.bz2) = 186203
+MD5 (gtk-doc-1.9.tar.bz2) = bcd002f381385812737a05538eb8b21e
+SHA256 (gtk-doc-1.9.tar.bz2) = d1be2fc7be880b912f871675baed4a9e28ee4c19eef7fd1299c9c5d11cc9a80d
+SIZE (gtk-doc-1.9.tar.bz2) = 391957
diff --git a/textproc/gtk-doc/files/patch-help_manual_C_Makefile.in b/textproc/gtk-doc/files/patch-help_manual_C_Makefile.in
new file mode 100644
index 000000000000..4c52d15064d9
--- /dev/null
+++ b/textproc/gtk-doc/files/patch-help_manual_C_Makefile.in
@@ -0,0 +1,10 @@
+--- help/manual/C/Makefile.in.orig	2007-10-02 12:53:30.000000000 -0500
++++ help/manual/C/Makefile.in	2007-10-02 12:53:52.000000000 -0500
+@@ -213,7 +213,6 @@
+ # This variable (docdir) specifies where the documents should be installed.
+ # This default value should work for most packages.
+ @ENABLE_SCROLLKEEPER_TRUE@docdir = $(datadir)/gnome/help/$(docname)/$(lang)
+-docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ glib_prefix = @glib_prefix@
diff --git a/textproc/gtk-doc/pkg-plist b/textproc/gtk-doc/pkg-plist
index 29f1437d9c6f..52438fd79b66 100644
--- a/textproc/gtk-doc/pkg-plist
+++ b/textproc/gtk-doc/pkg-plist
@@ -1,19 +1,24 @@
+bin/gtkdoc-check
 bin/gtkdoc-fixxref
 bin/gtkdoc-mkdb
 bin/gtkdoc-mkhtml
 bin/gtkdoc-mkman
 bin/gtkdoc-mktmpl
+bin/gtkdoc-rebase
 bin/gtkdoc-scan
 bin/gtkdoc-scangobj
 bin/gtkdoc-scanobj
 bin/gtkdocize
 libdata/pkgconfig/gtk-doc.pc
 share/aclocal/gtk-doc.m4
+share/gnome/help/gtk-doc-manual/C/fdl-appendix.xml
+share/gnome/help/gtk-doc-manual/C/gtk-doc-manual.xml
 %%DATADIR%%/data/devhelp.xsl
 %%DATADIR%%/data/devhelp2.xsl
 %%DATADIR%%/data/gtk-doc.dcl
 %%DATADIR%%/data/gtk-doc.dsl
 %%DATADIR%%/data/gtk-doc.make
+%%DATADIR%%/data/gtk-doc.notmpl.make
 %%DATADIR%%/data/gtk-doc.xsl
 %%DATADIR%%/data/gtkdoc-common.pl
 %%DATADIR%%/data/home.png
@@ -22,17 +27,13 @@ share/aclocal/gtk-doc.m4
 %%DATADIR%%/data/style.css
 %%DATADIR%%/data/up.png
 %%DATADIR%%/data/version-greater-or-equal.xsl
-share/help/gtk-doc-manual/C/fdl-appendix.xml
-share/help/gtk-doc-manual/C/gtk-doc-manual.xml
 share/omf/gtk-doc/gtk-doc-manual-C.omf
 @unexec %%XMLCATMGR%% -sc %%CATALOG_PORTS_SGML%% remove CATALOG %%CATALOG_DIR%%/gtk-doc.cat
 share/sgml/gtk-doc/gtk-doc.cat
 @exec %%XMLCATMGR%% -sc %%CATALOG_PORTS_SGML%% add CATALOG %%CATALOG_DIR%%/gtk-doc.cat
 @dirrm share/sgml/gtk-doc
 @dirrm share/omf/gtk-doc
-@dirrmtry share/omf
-@dirrm share/help/gtk-doc-manual/C
-@dirrm share/help/gtk-doc-manual
-@dirrmtry share/help
 @dirrm %%DATADIR%%/data
 @dirrm %%DATADIR%%
+@dirrm share/gnome/help/gtk-doc-manual/C
+@dirrm share/gnome/help/gtk-doc-manual
diff --git a/textproc/gtkdiff/Makefile b/textproc/gtkdiff/Makefile
index 391ab0f56698..22dc546f609f 100644
--- a/textproc/gtkdiff/Makefile
+++ b/textproc/gtkdiff/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gtkdiff
 PORTVERSION=	1.8.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	textproc gnome
 MASTER_SITES=	TUCOWS
 
diff --git a/textproc/gtkdiff/pkg-plist b/textproc/gtkdiff/pkg-plist
index 54f235cf9292..d751bf70594f 100644
--- a/textproc/gtkdiff/pkg-plist
+++ b/textproc/gtkdiff/pkg-plist
@@ -2,11 +2,11 @@ bin/gtkdiff
 bin/gtkdiff-cvs
 bin/gtkdiff-rcs
 share/gnome/apps/Utilities/gtkdiff.desktop
-share/gnome/gtkdiff/gtkdiffrc
+%%DATADIR%%/gtkdiffrc
 share/locale/da/LC_MESSAGES/gtkdiff.mo
 share/locale/de/LC_MESSAGES/gtkdiff.mo
 share/locale/es/LC_MESSAGES/gtkdiff.mo
 share/locale/fr/LC_MESSAGES/gtkdiff.mo
 share/locale/ja/LC_MESSAGES/gtkdiff.mo
 share/locale/tr/LC_MESSAGES/gtkdiff.mo
-@dirrm share/gnome/gtkdiff
+@dirrm %%DATADIR%%
diff --git a/textproc/gxmlviewer/Makefile b/textproc/gxmlviewer/Makefile
index a64f2e730424..57e96af661f0 100644
--- a/textproc/gxmlviewer/Makefile
+++ b/textproc/gxmlviewer/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gxmlviewer
 PORTVERSION=	1.3.3
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/textproc/gxmlviewer/pkg-plist b/textproc/gxmlviewer/pkg-plist
index 88fc21b80912..24f5da4d4b4b 100644
--- a/textproc/gxmlviewer/pkg-plist
+++ b/textproc/gxmlviewer/pkg-plist
@@ -2,7 +2,7 @@ bin/gxmlviewer
 bin/xmlview-control
 bin/xmlformatter
 lib/gxmlviewer/plugins/npgxmlviewer.so
-share/gnome/oaf/GNOME_XMLView.oaf
+share/oaf/GNOME_XMLView.oaf
 @unexec rm -f %%LOCALBASE%%/lib/browser_plugins/npgxmlviewer.so
 @unexec rmdir %%LOCALBASE%%/lib/browser_plugins 2>/dev/null || true
 @exec mkdir -p %%LOCALBASE%%/lib/browser_plugins 2>/dev/null || true
diff --git a/textproc/iiimf-gnome-im-switcher/Makefile b/textproc/iiimf-gnome-im-switcher/Makefile
index cc5bdae0943b..0a84acf375ef 100644
--- a/textproc/iiimf-gnome-im-switcher/Makefile
+++ b/textproc/iiimf-gnome-im-switcher/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gnome-im-switcher
 PORTVERSION=	12.2
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	textproc
 MASTER_SITES=	http://www.openi18n.org/download/im-sdk/src/
 PKGNAMEPREFIX=	iiimf-
@@ -46,25 +46,15 @@ CONFIGURE_ENV+=	CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
 post-patch:
 	${REINPLACE_CMD} \
 		-e '/^serverdir/s,$$[(]libdir[)],%%LOCALBASE%%/libdata,g' \
-		-e '/^uidir/s,$$[(]datadir[)]/,&gnome/,g' \
 		${BUILDDIR}/src/Makefile.am
 	${REINPLACE_CMD} \
 		-e "s,%%LOCALBASE%%,${LOCALBASE},g" \
 		-e "s,%%PREFIX%%,${PREFIX},g" \
 		${WRKSRC}/Makefile ${BUILDDIR}/Makefile.am \
 		${BUILDDIR}/src/Makefile.am
-	${REINPLACE_CMD} -e "/GNOMECC_DATA_DIR/s,/share/,&gnome/,g" \
-		${BUILDDIR}/configure.ac
-	${REINPLACE_CMD} -e "/^GNOMECC_.*_DIR=/s,[(]datadir[)]/,&gnome/,g" \
-		${BUILDDIR}/configure.ac
 
 do-configure:
 	@cd ${WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${GMAKE} bootstrap
 	@cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${GMAKE} config
 
-post-configure:
-	${REINPLACE_CMD} -e '/^pkgdatadir/s,[(]datadir[)]/,&gnome/,g' \
-		-e '/^iconsdir/s,[(]datadir[)]/,&gnome/,g' \
-		${BUILDDIR}/src/Makefile
-
 .include <bsd.port.post.mk>
diff --git a/textproc/iiimf-gnome-im-switcher/files/patch-gnome_help_omf.make b/textproc/iiimf-gnome-im-switcher/files/patch-gnome_help_omf.make
index 20ba08efe479..78bf144ed989 100644
--- a/textproc/iiimf-gnome-im-switcher/files/patch-gnome_help_omf.make
+++ b/textproc/iiimf-gnome-im-switcher/files/patch-gnome_help_omf.make
@@ -1,14 +1,5 @@
 --- gnome-im-switcher/help/omf.make.orig	Thu Sep 23 06:31:15 2004
 +++ gnome-im-switcher/help/omf.make		Sun May 29 22:04:45 2005
-@@ -26,7 +26,7 @@
- # 	Version: 0.1.3 (last updated: March 20, 2002)
- #
- 
--omf_dest_dir=$(datadir)/omf/@PACKAGE@
-+omf_dest_dir=$(datadir)/gnome/omf/@PACKAGE@
- scrollkeeper_localstate_dir = $(localstatedir)/scrollkeeper
- 
- # At some point, it may be wise to change to something like this:
 @@ -45,7 +45,9 @@
  	for file in $(omffile); do \
  		$(INSTALL_DATA) $$file.out $(DESTDIR)$(omf_dest_dir)/$$file; \
diff --git a/textproc/iiimf-gnome-im-switcher/pkg-plist b/textproc/iiimf-gnome-im-switcher/pkg-plist
index 65d33b87369a..677d42f07ff1 100644
--- a/textproc/iiimf-gnome-im-switcher/pkg-plist
+++ b/textproc/iiimf-gnome-im-switcher/pkg-plist
@@ -2,17 +2,17 @@ bin/gnome-im-properties
 bin/gnome-im-settings-daemon
 libdata/bonobo/servers/GNOME_IMSwitcherApplet.server
 libexec/gnome-im-switcher-applet
-share/gnome/control-center-2.0/capplets/gnome-im-properties.desktop
-share/gnome/control-center-2.0/interfaces/gnome-im-properties.glade2
-share/gnome/gnome-2.0/ui/GNOME_InputMethodSwitcherApplet.xml
+share/control-center-2.0/capplets/gnome-im-properties.desktop
+share/control-center-2.0/interfaces/gnome-im-properties.glade2
+share/gnome-2.0/ui/GNOME_InputMethodSwitcherApplet.xml
 share/gnome/help/imswitcher/C/imswitcher.xml
 share/gnome/help/imswitcher/C/legal.xml
-share/gnome/iiimf-im-switcher/glade/gnome-im-switcher.glade2
-share/gnome/omf/iiimf-im-switcher/imswitcher-C.omf
-share/gnome/pixmaps/gimlet-disable.png
-share/gnome/pixmaps/gimlet-off.png
-share/gnome/pixmaps/gimlet-on.png
-share/gnome/pixmaps/gnome-settings-im.png
+share/iiimf-im-switcher/glade/gnome-im-switcher.glade2
+share/omf/iiimf-im-switcher/imswitcher-C.omf
+share/pixmaps/gimlet-disable.png
+share/pixmaps/gimlet-off.png
+share/pixmaps/gimlet-on.png
+share/pixmaps/gnome-settings-im.png
 share/icons/hicolor/48x48/apps/gnome-settings-im.png
 share/locale/bn/LC_MESSAGES/iiimf-im-switcher.mo
 share/locale/cs/LC_MESSAGES/iiimf-im-switcher.mo
@@ -34,11 +34,11 @@ share/locale/ta/LC_MESSAGES/iiimf-im-switcher.mo
 share/locale/zh_CN/LC_MESSAGES/iiimf-im-switcher.mo
 share/locale/zh_HK/LC_MESSAGES/iiimf-im-switcher.mo
 share/locale/zh_TW/LC_MESSAGES/iiimf-im-switcher.mo
-@dirrm share/gnome/omf/iiimf-im-switcher
-@dirrm share/gnome/iiimf-im-switcher/glade
-@dirrm share/gnome/iiimf-im-switcher
+@dirrm share/omf/iiimf-im-switcher
+@dirrm share/iiimf-im-switcher/glade
+@dirrm share/iiimf-im-switcher
 @dirrm share/gnome/help/imswitcher/C
 @dirrm share/gnome/help/imswitcher
-@dirrmtry share/gnome/control-center-2.0/interfaces
+@dirrmtry share/control-center-2.0/interfaces
 @dirrmtry share/locale/zh_HK/LC_MESSAGES
 @dirrmtry share/locale/zh_HK
diff --git a/textproc/libxml++26/Makefile b/textproc/libxml++26/Makefile
index 3b67edb5fa53..c2fe64402f72 100644
--- a/textproc/libxml++26/Makefile
+++ b/textproc/libxml++26/Makefile
@@ -4,11 +4,11 @@
 # Whom:				Ying-Chieh Liao <ijliao@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/textproc/libxml++26/Makefile,v 1.18 2007/03/07 19:06:06 marcus Exp $
+#   $MCom: ports/textproc/libxml++26/Makefile,v 1.22 2007/09/18 16:36:01 marcus Exp $
 #
 
 PORTNAME=	libxml++
-PORTVERSION=	2.18.0
+PORTVERSION=	2.20.0
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/textproc/libxml++26/distinfo b/textproc/libxml++26/distinfo
index 9a2cf8468c6c..7ae26a4ff694 100644
--- a/textproc/libxml++26/distinfo
+++ b/textproc/libxml++26/distinfo
@@ -1,3 +1,3 @@
-MD5 (libxml++-2.18.0.tar.gz) = 63b31bd9751cf99aaafccf6dfa4f88cd
-SHA256 (libxml++-2.18.0.tar.gz) = 0733c759c818d5aff07692b11c1bd1df736e4b479fb79cc50c3ab8b948d26b7e
-SIZE (libxml++-2.18.0.tar.gz) = 2020427
+MD5 (libxml++-2.20.0.tar.gz) = 0f6a95220c7cd893e711f85ad4056a1c
+SHA256 (libxml++-2.20.0.tar.gz) = 4b77156f6590a294aea179f2c42c2ced6b97368552be1298ee1ed072ca2e130e
+SIZE (libxml++-2.20.0.tar.gz) = 2044144
diff --git a/textproc/libxml++26/pkg-plist b/textproc/libxml++26/pkg-plist
index afb1d2e4f4a2..2124a9f6e57e 100644
--- a/textproc/libxml++26/pkg-plist
+++ b/textproc/libxml++26/pkg-plist
@@ -167,25 +167,25 @@ libdata/pkgconfig/libxml++-%%API_VERSION%%.pc
 %%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1validity__error__inherit__graph.md5
 %%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/commentnode_8h.html
 %%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/contentnode_8h.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/dir_32008f4d917c53e6cfd05a5ea51dedc7.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/dir_32008f4d917c53e6cfd05a5ea51dedc7_dep.jpg
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/dir_32008f4d917c53e6cfd05a5ea51dedc7_dep.map
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/dir_65e551a142d652aded9ca2dceeff3a63.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/dir_65e551a142d652aded9ca2dceeff3a63_dep.jpg
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/dir_65e551a142d652aded9ca2dceeff3a63_dep.map
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/dir_6838e863111a3eb2223eace1205f0754.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/dir_6838e863111a3eb2223eace1205f0754_dep.jpg
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/dir_6838e863111a3eb2223eace1205f0754_dep.map
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/dir_7146fab70a01c720ccb41a8cc1039409.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/dir_7146fab70a01c720ccb41a8cc1039409_dep.jpg
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/dir_7146fab70a01c720ccb41a8cc1039409_dep.map
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/dir_90b4fb38958b63647b10dd7f2c14b828.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/dir_90b4fb38958b63647b10dd7f2c14b828_dep.jpg
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/dir_90b4fb38958b63647b10dd7f2c14b828_dep.map
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/dir_d3a0f78a890734e21280a988361c8980.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/dir_d3a0f78a890734e21280a988361c8980_dep.jpg
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/dir_d3a0f78a890734e21280a988361c8980_dep.map
 %%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/dirs.html
-%%PORTDOCS%%share/doc/libxml++-2.6/docs/reference/%%DOC_VERSION%%/html/dir_060042f61ad41255a77b5a60dc66afb4.html
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/dir_060042f61ad41255a77b5a60dc66afb4_dep.jpg
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/dir_060042f61ad41255a77b5a60dc66afb4_dep.map
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/dir_98cc7bcadc131313690a7320eb0caa09.html
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/dir_98cc7bcadc131313690a7320eb0caa09_dep.jpg
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/dir_98cc7bcadc131313690a7320eb0caa09_dep.map
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/dir_9cc7404ab660b5374779d403c202c70c.html
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/dir_9cc7404ab660b5374779d403c202c70c_dep.jpg
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/dir_9cc7404ab660b5374779d403c202c70c_dep.map
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/dir_c513157412c8384caf468454c2c3cfa9.html
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/dir_c513157412c8384caf468454c2c3cfa9_dep.jpg
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/dir_c513157412c8384caf468454c2c3cfa9_dep.map
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/dir_cf5c1e9933cb056be190fe9c88b8f1f0.html
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/dir_cf5c1e9933cb056be190fe9c88b8f1f0_dep.jpg
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/dir_cf5c1e9933cb056be190fe9c88b8f1f0_dep.map
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/dir_d49b71a5503b600be72da967490472e5.html
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/dir_d49b71a5503b600be72da967490472e5_dep.jpg
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/dir_d49b71a5503b600be72da967490472e5_dep.map
 %%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/document_8h.html
 %%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/domparser_8h.html
 %%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/doxygen.css
@@ -217,6 +217,9 @@ libdata/pkgconfig/libxml++-%%API_VERSION%%.pc
 %%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/functions_0x77.html
 %%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/functions_0x78.html
 %%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/functions_0x7e.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/functions_enum.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/functions_eval.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/functions_func.html
 %%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/functions_func_0x63.html
 %%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/functions_func_0x64.html
 %%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/functions_func_0x65.html
@@ -236,9 +239,6 @@ libdata/pkgconfig/libxml++-%%API_VERSION%%.pc
 %%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/functions_func_0x76.html
 %%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/functions_func_0x77.html
 %%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/functions_func_0x7e.html
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/functions_enum.html
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/functions_eval.html
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/functions_func.html
 %%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/functions_rela.html
 %%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/functions_type.html
 %%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/functions_vars.html
@@ -277,19 +277,22 @@ libdata/pkgconfig/libxml++-%%API_VERSION%%.pc
 %%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/internal__error_8h.html
 %%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/istreamparserinputbuffer_8h.html
 %%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/keepblanks_8h.html
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/libxml++config_8h.html
 %%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/libxml++_8h.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/libxml++config_8h.html
 %%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/namespacemembers.html
 %%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/namespacemembers_enum.html
 %%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/namespacemembers_eval.html
 %%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/namespacemembers_type.html
 %%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/namespaces.html
 %%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/namespacesigc.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/namespacestatic_01const_01std.html
 %%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/namespacexmlpp.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/newin2p20s.html
 %%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/node_8h.html
 %%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/noncopyable_8h.html
 %%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/ostreamoutputbuffer_8h.html
 %%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/outputbuffer_8h.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/pages.html
 %%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/parse__error_8h.html
 %%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/parser_8h.html
 %%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/parserinputbuffer_8h.html
diff --git a/textproc/meld/Makefile b/textproc/meld/Makefile
index 96da82f7c764..021d7d465d01 100644
--- a/textproc/meld/Makefile
+++ b/textproc/meld/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	meld
 PORTVERSION=	1.1.5.1
+PORTREVISION=	1
 CATEGORIES=	textproc devel python
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:R:R}
@@ -28,11 +29,7 @@ INSTALLS_OMF=	yes
 
 post-patch:
 	@${FIND} ${WRKSRC} -name "${MAKEFILE}" | ${XARGS} ${REINPLACE_CMD} -e \
-		's|$$(sharedir)/applications|$$(sharedir)/gnome/applications|g ; \
-		 s|$$(sharedir)/application-registry|$$(sharedir)/gnome/application-registry|g ; \
-		 s|$$(sharedir)/pixmaps|$$(sharedir)/gnome/pixmaps|g ; \
-		 s|$$(localstatedir)/lib/scrollkeeper|/var/db/scrollkeeper|g ; \
-		 s|$$(sharedir)/omf/meld|$$(sharedir)/gnome/omf/meld|g'
+		's|$$(localstatedir)/lib/scrollkeeper|/var/db/scrollkeeper|g'
 
 .include <bsd.port.pre.mk>
 
diff --git a/textproc/meld/pkg-plist b/textproc/meld/pkg-plist
index b82347c538c1..e4ab87014be0 100644
--- a/textproc/meld/pkg-plist
+++ b/textproc/meld/pkg-plist
@@ -68,17 +68,17 @@ lib/meld/vc/tla.pyo
 lib/meld/vcview.py
 lib/meld/vcview.pyc
 lib/meld/vcview.pyo
-share/gnome/application-registry/meld.applications
-share/gnome/applications/meld.desktop
+share/application-registry/meld.applications
+share/applications/meld.desktop
 share/gnome/help/meld/C/figures/dirdiff.png
 share/gnome/help/meld/C/figures/filediff.png
 share/gnome/help/meld/C/meld.xml
 share/gnome/help/meld/es/figures/dirdiff.png
 share/gnome/help/meld/es/figures/filediff.png
 share/gnome/help/meld/es/meld.xml
-share/gnome/omf/meld/meld-C.omf
-share/gnome/omf/meld/meld-es.omf
-share/gnome/pixmaps/meld.png
+share/omf/meld/meld-C.omf
+share/omf/meld/meld-es.omf
+share/pixmaps/meld.png
 share/locale/ar/LC_MESSAGES/meld.mo
 share/locale/bg/LC_MESSAGES/meld.mo
 share/locale/ca/LC_MESSAGES/meld.mo
@@ -144,7 +144,7 @@ share/locale/zh_TW/LC_MESSAGES/meld.mo
 @dirrm %%DATADIR%%
 @dirrmtry share/locale/rw/LC_MESSAGES
 @dirrmtry share/locale/rw
-@dirrm share/gnome/omf/meld
+@dirrm share/omf/meld
 @dirrm share/gnome/help/meld/es/figures
 @dirrm share/gnome/help/meld/es
 @dirrm share/gnome/help/meld/C/figures
@@ -154,3 +154,4 @@ share/locale/zh_TW/LC_MESSAGES/meld.mo
 @dirrm %%DOCSDIR%%
 @dirrm lib/meld/vc
 @dirrm lib/meld
+@dirrmtry share/applications
diff --git a/textproc/rarian/Makefile b/textproc/rarian/Makefile
new file mode 100644
index 000000000000..f8d0260c8988
--- /dev/null
+++ b/textproc/rarian/Makefile
@@ -0,0 +1,59 @@
+# New ports collection makefile for:	rarian
+# Date created:				02 August 2007
+# Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
+#
+# $FreeBSD$
+#   $MCom: ports/textproc/rarian/Makefile,v 1.8 2007/10/11 04:04:18 mezz Exp $
+#
+
+PORTNAME=	rarian
+PORTVERSION=	0.6.0
+PORTREVISION=	1
+CATEGORIES=	textproc gnome
+MASTER_SITES=	${MASTER_SITE_GNOME}
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
+
+MAINTAINER=	gnome@FreeBSD.org
+COMMENT=	An OMF help system based on the Freedesktop specification
+
+BUILD_DEPENDS=	${LOCALBASE}/share/xsl/docbook/xhtml/chunk.xsl:${PORTSDIR}/textproc/docbook-xsl \
+    		${LOCALBASE}/share/xml/docbook/${DOCBOOK_VERSION}/catalog.xml:${PORTSDIR}/textproc/docbook-xml \
+		${LOCALBASE}/share/xml/docbook/4.1.2/docbookx.dtd:${PORTSDIR}/textproc/docbook-sk \
+		bash:${PORTSDIR}/shells/bash
+RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash \
+    		${LOCALBASE}/bin/getopt:${PORTSDIR}/misc/getopt \
+		${LOCALBASE}/share/xsl/docbook/xhtml/chunk.xsl:${PORTSDIR}/textproc/docbook-xsl \
+		${LOCALBASE}/share/xml/docbook/${DOCBOOK_VERSION}/catalog.xml:${PORTSDIR}/textproc/docbook-xml \
+		${LOCALBASE}/share/xml/docbook/4.1.2/docbookx.dtd:${PORTSDIR}/textproc/docbook-sk
+
+DOCBOOK_VERSION=4.2
+
+CONFLICTS=	scrollkeeper-[0-9]*
+
+USE_BZIP2=	yes
+USE_GMAKE=	yes
+USE_GNOME=	gnomehier gnometarget gnomehack libxslt
+USE_PYTHON=	yes
+GNU_CONFIGURE=	yes
+USE_LDCONFIG=	yes
+CONFIGURE_ARGS=	--with-convert-dir=${LOCALBASE}/share/omf \
+		--datadir=${PREFIX}/share \
+		--localstatedir=/var
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|/lib/rarian|/db/rarian|' \
+		${WRKSRC}/util/Makefile.in
+	@${REINPLACE_CMD} -e 's|@localstatedir@/lib/rarian|@localstatedir@/db/rarian|g ; \
+		s|getopt|${LOCALBASE}/bin/getopt|' \
+	    	${WRKSRC}/util/rarian-sk-config.in \
+		${WRKSRC}/util/rarian-sk-extract.in \
+		${WRKSRC}/util/rarian-sk-rebuild.in \
+		${WRKSRC}/util/rarian-sk-update.in
+	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' \
+	    	${WRKSRC}/librarian/rarian-main.c \
+		${WRKSRC}/librarian/rarian-man.c \
+		${WRKSRC}/librarian/rarian-info.c
+
+.include <bsd.port.mk>
diff --git a/textproc/rarian/distinfo b/textproc/rarian/distinfo
new file mode 100644
index 000000000000..c10840549f71
--- /dev/null
+++ b/textproc/rarian/distinfo
@@ -0,0 +1,3 @@
+MD5 (rarian-0.6.0.tar.bz2) = 23772a3b0f882d13c86dd9fa67bb21bf
+SHA256 (rarian-0.6.0.tar.bz2) = 2f169f3c794b2602d8590b1fd16c0aa5b7ca77e993f74b89c4f42db74c1d2029
+SIZE (rarian-0.6.0.tar.bz2) = 312258
diff --git a/textproc/rarian/files/patch-docs_Makefile.in b/textproc/rarian/files/patch-docs_Makefile.in
new file mode 100644
index 000000000000..10e4783a75b8
--- /dev/null
+++ b/textproc/rarian/files/patch-docs_Makefile.in
@@ -0,0 +1,11 @@
+--- docs/Makefile.in.orig	2007-08-02 01:37:06.000000000 -0400
++++ docs/Makefile.in	2007-08-02 01:37:22.000000000 -0400
+@@ -183,7 +183,7 @@ target_alias = @target_alias@
+ EXTRA_DIST = help-spec-0.2.xml index.xhtml rar-mdf.xhtml rar-lib.xhtml rar-skcompat.xhtml rarian.document.in
+ manualdir = $(datadir)/librarian/manual
+ manual_DATA = help-spec-0.2.xml index.xhtml rar-mdf.xhtml rar-lib.xhtml rar-skcompat.xhtml
+-metadatadir = $(datadir)/help
++metadatadir = $(datadir)/doc/rarian
+ metadata_DATA = rarian.document
+ all: all-am
+ 
diff --git a/textproc/rarian/files/patch-librarian_rarian-main.c b/textproc/rarian/files/patch-librarian_rarian-main.c
new file mode 100644
index 000000000000..549390150c64
--- /dev/null
+++ b/textproc/rarian/files/patch-librarian_rarian-main.c
@@ -0,0 +1,11 @@
+--- librarian/rarian-main.c.orig	2007-08-02 16:04:45.000000000 -0400
++++ librarian/rarian-main.c	2007-08-02 16:12:58.000000000 -0400
+@@ -212,7 +212,7 @@ past:
+     path = getenv ("XDG_DATA_DIRS");
+ 
+     if (!path || !strcmp (path, "")) {
+-        path = "/usr/local/share/:/usr/share/";
++        path = "/usr/local/share/";
+     }
+     cur_path = path;
+     do {
diff --git a/textproc/rarian/files/patch-util_rarian-sk-config.in b/textproc/rarian/files/patch-util_rarian-sk-config.in
new file mode 100644
index 000000000000..c97a07c77b6c
--- /dev/null
+++ b/textproc/rarian/files/patch-util_rarian-sk-config.in
@@ -0,0 +1,11 @@
+--- util/rarian-sk-config.in.orig	2007-10-10 23:00:03.000000000 -0500
++++ util/rarian-sk-config.in	2007-10-10 23:00:30.000000000 -0500
+@@ -47,7 +47,7 @@
+ 		print_help
+ 		;;
+ 	--version )
+-		echo $package_version \(Rarian replacement for scrollkeeper-config\)
++		echo $package_version
+ 		;;
+ 	--prefix )
+ 		echo $prefix
diff --git a/textproc/rarian/pkg-descr b/textproc/rarian/pkg-descr
new file mode 100644
index 000000000000..e60b1e98e756
--- /dev/null
+++ b/textproc/rarian/pkg-descr
@@ -0,0 +1,9 @@
+Rarian is designed to be a replacement for scrollkeeper.  It is
+currently undergoing heavy development.  As of writing, rarian can be
+installed in place of scrollkeeper and everything will work okay.
+
+Rarian manages documentation metadata (as specified by the Open Source
+Metadata Framework (OMF) and provides a simple API to allow help browsers
+to find, sort, and search the document catalog.  It will also be able to
+communicate with catalog servers on the Net to search for documents which
+are not on the local system.
diff --git a/textproc/rarian/pkg-plist b/textproc/rarian/pkg-plist
new file mode 100644
index 000000000000..1abb978331bc
--- /dev/null
+++ b/textproc/rarian/pkg-plist
@@ -0,0 +1,53 @@
+bin/rarian-example
+bin/rarian-sk-config
+bin/rarian-sk-extract
+bin/rarian-sk-gen-uuid
+bin/rarian-sk-get-cl
+bin/rarian-sk-get-content-list
+bin/rarian-sk-get-extended-content-list
+bin/rarian-sk-get-scripts
+bin/rarian-sk-install
+bin/rarian-sk-migrate
+bin/rarian-sk-preinstall
+bin/rarian-sk-rebuild
+bin/rarian-sk-update
+bin/scrollkeeper-config
+bin/scrollkeeper-extract
+bin/scrollkeeper-gen-seriesid
+bin/scrollkeeper-get-cl
+bin/scrollkeeper-get-content-list
+bin/scrollkeeper-get-extended-content-list
+bin/scrollkeeper-get-index-from-docpath
+bin/scrollkeeper-get-toc-from-docpath
+bin/scrollkeeper-get-toc-from-id
+bin/scrollkeeper-install
+bin/scrollkeeper-preinstall
+bin/scrollkeeper-rebuilddb
+bin/scrollkeeper-uninstall
+bin/scrollkeeper-update
+include/rarian/rarian-info.h
+include/rarian/rarian-man.h
+include/rarian/rarian-reg-utils.h
+include/rarian/rarian.h
+lib/librarian.a
+lib/librarian.la
+lib/librarian.so
+lib/librarian.so.0
+libdata/pkgconfig/rarian.pc
+share/doc/rarian/rarian.document
+share/librarian/Templates/C/scrollkeeper_cl.xml
+share/librarian/manual/help-spec-0.2.xml
+share/librarian/manual/index.xhtml
+share/librarian/manual/rar-lib.xhtml
+share/librarian/manual/rar-mdf.xhtml
+share/librarian/manual/rar-skcompat.xhtml
+share/librarian/rarian-sk-cl.xml
+@dirrm share/librarian/manual
+@dirrm share/librarian/Templates/C
+@dirrm share/librarian/Templates
+@dirrm share/librarian
+@dirrm share/doc/rarian
+@dirrm include/rarian
+@unexec rm -rf /var/db/scrollkeeper 2>/dev/null || true
+@exec mkdir -p /var/db/rarian
+@exec %%PREFIX%%/bin/rarian-sk-update || true
diff --git a/textproc/sagasu/Makefile b/textproc/sagasu/Makefile
index 60a2f774dba9..d453824e43ad 100644
--- a/textproc/sagasu/Makefile
+++ b/textproc/sagasu/Makefile
@@ -3,10 +3,11 @@
 # Whom:					Juan Salaverria <rael@vectorstar.net>
 #
 # $FreeBSD$
+#
 
 PORTNAME=	sagasu
 PORTVERSION=	2.0.8
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc gnome
 MASTER_SITES=	http://www3.sympatico.ca/sarrazip/dev/
 
diff --git a/textproc/sagasu/pkg-plist b/textproc/sagasu/pkg-plist
index 152ce2bb4bb0..d504328416c4 100644
--- a/textproc/sagasu/pkg-plist
+++ b/textproc/sagasu/pkg-plist
@@ -5,22 +5,23 @@ bin/sagasu
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/THANKS
 %%PORTDOCS%%%%DOCSDIR%%/TODO
-share/gnome/applications/sagasu.desktop
+share/applications/sagasu.desktop
 share/gnome/help/sagasu/C/sagasu.html
 share/gnome/help/sagasu/fr/sagasu.html
-share/gnome/pixmaps/close.xpm
-share/gnome/pixmaps/sagasu.png
-share/gnome/sagasu/COPYING
-share/gnome/sagasu/sagasu-helper.pl
-share/gnome/sounds/sagasu/sagasu.wav
+share/pixmaps/close.xpm
+share/pixmaps/sagasu.png
+share/sagasu/COPYING
+share/sagasu/sagasu-helper.pl
+share/sounds/sagasu/sagasu.wav
 share/locale/de/LC_MESSAGES/sagasu.mo
 share/locale/fr/LC_MESSAGES/sagasu.mo
 share/locale/ja/LC_MESSAGES/sagasu.mo
 share/locale/ru/LC_MESSAGES/sagasu.mo
 share/locale/sr/LC_MESSAGES/sagasu.mo
-@dirrm share/gnome/sounds/sagasu
-@dirrm share/gnome/sagasu
+@dirrm share/sounds/sagasu
+@dirrm share/sagasu
 @dirrm share/gnome/help/sagasu/fr
 @dirrm share/gnome/help/sagasu/C
 @dirrm share/gnome/help/sagasu
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrmtry share/applications
diff --git a/textproc/scim/Makefile b/textproc/scim/Makefile
index 1f61cda5baf4..3b3b9d7ecb12 100644
--- a/textproc/scim/Makefile
+++ b/textproc/scim/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	scim
 PORTVERSION=	1.4.7
+PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=scim
@@ -32,11 +33,7 @@ CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include -D__STDC_ISO_10646__" \
 		LDFLAGS="-L${LOCALBASE}/lib -lintl"
 
 post-patch:
-	${REINPLACE_CMD} 's|$$(datadir)/pixmaps|$$(prefix)/share/gnome/pixmaps|' \
-			${WRKSRC}/data/pixmaps/Makefile.in
-	${REINPLACE_CMD} -e 's|$$(datadir)/app|$$(prefix)/share/gnome/app| ; \
-		 s|$$(datadir)/control|$$(prefix)/share/gnome/control| ; \
-		 /^scim_setup_LDFLAGS/s|=|= ${PTHREAD_LIBS}|' \
+	${REINPLACE_CMD} -e '/^scim_setup_LDFLAGS/s|=|= ${PTHREAD_LIBS}|' \
 			${WRKSRC}/extras/setup/Makefile.in
 
 post-install:
diff --git a/textproc/scim/pkg-plist b/textproc/scim/pkg-plist
index 3da4b75ba7ca..c559f3221083 100644
--- a/textproc/scim/pkg-plist
+++ b/textproc/scim/pkg-plist
@@ -102,9 +102,9 @@ lib/scim-1.0/scim-panel-gtk
 libdata/pkgconfig/scim-gtkutils.pc
 libdata/pkgconfig/scim-x11utils.pc
 libdata/pkgconfig/scim.pc
-share/gnome/applications/scim-setup.desktop
-share/gnome/control-center-2.0/capplets/scim-setup.desktop
-share/gnome/pixmaps/scim-setup.png
+share/applications/scim-setup.desktop
+share/control-center-2.0/capplets/scim-setup.desktop
+share/pixmaps/scim-setup.png
 share/locale/cs/LC_MESSAGES/scim.mo
 share/locale/de/LC_MESSAGES/scim.mo
 share/locale/fi/LC_MESSAGES/scim.mo
@@ -153,3 +153,4 @@ share/locale/zh_TW/LC_MESSAGES/scim.mo
 @dirrm %%DATADIR%%
 @exec gtk-query-immodules-2.0 > %D/etc/gtk-2.0/gtk.immodules
 @unexec gtk-query-immodules-2.0 > %D/etc/gtk-2.0/gtk.immodules
+@dirrmtry share/applications
diff --git a/textproc/scrollkeeper/Makefile b/textproc/scrollkeeper/Makefile
index 67e2f99dfee9..81eb73a554b1 100644
--- a/textproc/scrollkeeper/Makefile
+++ b/textproc/scrollkeeper/Makefile
@@ -3,11 +3,11 @@
 # Whom:					Rene Hexel <rh@netbsd.org>
 #
 # $FreeBSD$
-#    $MCom: ports/textproc/scrollkeeper/Makefile,v 1.7 2007/02/20 20:26:47 marcus Exp $
+#    $MCom: ports/textproc/scrollkeeper/Makefile,v 1.12 2007/10/17 21:36:13 mezz Exp $
 
 PORTNAME=	scrollkeeper
 PORTVERSION=	0.3.14
-PORTREVISION=	9
+PORTREVISION=	10
 PORTEPOCH=	1
 CATEGORIES=	textproc gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
@@ -28,6 +28,8 @@ RUN_DEPENDS=	intltool-extract:${PORTSDIR}/textproc/intltool \
 
 DOCBOOK_VERSION=4.2
 
+CONFLICTS=	rarian-[0-9]*
+
 USE_BZIP2=	yes
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
@@ -35,8 +37,8 @@ USE_AUTOTOOLS=	libtool:15
 USE_BISON=	build
 USE_GNOME=	gnomehack gnomehier gnometarget libxslt intlhack
 USE_LDCONFIG=	yes
-CONFIGURE_ARGS=	--localstatedir=/var --datadir=${PREFIX}/share/gnome \
-		--with-omfdirs=${PREFIX}/share/gnome/omf \
+CONFIGURE_ARGS=	--localstatedir=/var --datadir=${PREFIX}/share \
+		--with-omfdirs=${PREFIX}/share/omf \
 		--with-xml-catalog=${LOCALBASE}/share/xml/catalog.ports
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib -lintl" \
diff --git a/textproc/scrollkeeper/files/patch-libs_scrollkeeper.h.in b/textproc/scrollkeeper/files/patch-libs_scrollkeeper.h.in
deleted file mode 100644
index c8a8d3400623..000000000000
--- a/textproc/scrollkeeper/files/patch-libs_scrollkeeper.h.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- libs/scrollkeeper.h.in.orig	Mon Jun  3 14:00:51 2002
-+++ libs/scrollkeeper.h.in	Mon Jun  3 14:01:11 2002
-@@ -32,7 +32,7 @@
- #define SCROLLKEEPERLOCALEDIR "/usr/X11R6/share/locale"
- #define SCROLLKEEPERLOGFILE "@localstatedir@/log/scrollkeeper.log"
- #define SCROLLKEEPERLOGFILE_ROT "@localstatedir@/log/scrollkeeper.log.1"
--#define SCROLLKEEPER_OMF_DTD "@prefix@/share/xml/scrollkeeper/dtds/scrollkeeper-omf.dtd"
-+#define SCROLLKEEPER_OMF_DTD "@prefix@/share/gnome/xml/scrollkeeper/dtds/scrollkeeper-omf.dtd"
- #define PATHLEN		256
- 
- /*
diff --git a/textproc/scrollkeeper/files/patch-scripts_scrollkeeper-config.in b/textproc/scrollkeeper/files/patch-scripts_scrollkeeper-config.in
deleted file mode 100644
index 0185737cea7d..000000000000
--- a/textproc/scrollkeeper/files/patch-scripts_scrollkeeper-config.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- scripts/scrollkeeper-config.in.orig	Thu Mar 21 00:08:51 2002
-+++ scripts/scrollkeeper-config.in	Sat May 25 23:59:53 2002
-@@ -4,7 +4,7 @@
- localstatedir=@localstatedir@
- partial_db_dir=@SCROLLKEEPER_PARTIAL_DB_DIR@
- pkglocalstatedir=${localstatedir}/${partial_db_dir}
--pkgdatadir=${prefix}/share/scrollkeeper
-+pkgdatadir=${prefix}/share/gnome/scrollkeeper
- datadir=@datadir@
- 
- usage()
diff --git a/textproc/scrollkeeper/pkg-install b/textproc/scrollkeeper/pkg-install
index a2a601b74d86..4af1430f1f2b 100644
--- a/textproc/scrollkeeper/pkg-install
+++ b/textproc/scrollkeeper/pkg-install
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-PATH=${PATH}:/bin:/usr/bin:/usr/local/bin:/usr/X11R6/bin
+PATH=${PATH}:/bin:/usr/bin:/usr/local/bin
 export PATH
 
 PREFIX=`xml2-config --prefix`
@@ -12,7 +12,7 @@ if [ "$2" = "POST-INSTALL" ]; then
 
     xmlcatalog --noout --add "public" \
     	"-//OMF//DTD Scrollkeeper OMF Variant V1.0//EN" \
-	"${SKPREFIX}/share/gnome/xml/scrollkeeper/dtds/scrollkeeper-omf.dtd" \
+	"${SKPREFIX}/share/xml/scrollkeeper/dtds/scrollkeeper-omf.dtd" \
 	${ROOTCATALOG}
 
     scrollkeeper-rebuilddb -q -p /var/db/scrollkeeper || /usr/bin/true
diff --git a/textproc/scrollkeeper/pkg-plist b/textproc/scrollkeeper/pkg-plist
index 49289b7ded61..27e2a47e1d55 100644
--- a/textproc/scrollkeeper/pkg-plist
+++ b/textproc/scrollkeeper/pkg-plist
@@ -17,46 +17,46 @@ lib/libscrollkeeper.a
 lib/libscrollkeeper.la
 lib/libscrollkeeper.so
 lib/libscrollkeeper.so.0
-share/gnome/omf/scrollkeeper/writing_scrollkeeper_omf_files-C.omf
-share/gnome/scrollkeeper/Templates/C/scrollkeeper_cl.xml
-share/gnome/scrollkeeper/Templates/am/scrollkeeper_cl.xml
-share/gnome/scrollkeeper/Templates/az/scrollkeeper_cl.xml
-share/gnome/scrollkeeper/Templates/be/scrollkeeper_cl.xml
-share/gnome/scrollkeeper/Templates/ca/scrollkeeper_cl.xml
-share/gnome/scrollkeeper/Templates/cs/scrollkeeper_cl.xml
-share/gnome/scrollkeeper/Templates/da/scrollkeeper_cl.xml
-share/gnome/scrollkeeper/Templates/de/scrollkeeper_cl.xml
-share/gnome/scrollkeeper/Templates/el/scrollkeeper_cl.xml
-share/gnome/scrollkeeper/Templates/es/scrollkeeper_cl.xml
-share/gnome/scrollkeeper/Templates/fr/scrollkeeper_cl.xml
-share/gnome/scrollkeeper/Templates/hu/scrollkeeper_cl.xml
-share/gnome/scrollkeeper/Templates/it/scrollkeeper_cl.xml
-share/gnome/scrollkeeper/Templates/ja/scrollkeeper_cl.xml
-share/gnome/scrollkeeper/Templates/kn/scrollkeeper_cl.xml
-share/gnome/scrollkeeper/Templates/ko/scrollkeeper_cl.xml
-share/gnome/scrollkeeper/Templates/nl/scrollkeeper_cl.xml
-share/gnome/scrollkeeper/Templates/no/scrollkeeper_cl.xml
-share/gnome/scrollkeeper/Templates/pl/scrollkeeper_cl.xml
-share/gnome/scrollkeeper/Templates/pt_BR/scrollkeeper_cl.xml
-share/gnome/scrollkeeper/Templates/ro/scrollkeeper_cl.xml
-share/gnome/scrollkeeper/Templates/ru/scrollkeeper_cl.xml
-share/gnome/scrollkeeper/Templates/sl/scrollkeeper_cl.xml
-share/gnome/scrollkeeper/Templates/sk/scrollkeeper_cl.xml
-share/gnome/scrollkeeper/Templates/sr/scrollkeeper_cl.xml
-share/gnome/scrollkeeper/Templates/sr@Latn/scrollkeeper_cl.xml
-share/gnome/scrollkeeper/Templates/sv/scrollkeeper_cl.xml
-share/gnome/scrollkeeper/Templates/tr/scrollkeeper_cl.xml
-share/gnome/scrollkeeper/Templates/uk/scrollkeeper_cl.xml
-share/gnome/scrollkeeper/Templates/vi/scrollkeeper_cl.xml
-share/gnome/scrollkeeper/Templates/zh_CN/scrollkeeper_cl.xml
-share/gnome/scrollkeeper/Templates/zh_TW/scrollkeeper_cl.xml
-share/gnome/scrollkeeper/doc/writing_scrollkeeper_omf_files/C/legal.xml
-share/gnome/scrollkeeper/doc/writing_scrollkeeper_omf_files/C/writing_scrollkeeper_omf_files.xml
-share/gnome/scrollkeeper/stylesheets/categories.xsl
-share/gnome/scrollkeeper/stylesheets/index.xsl
-share/gnome/scrollkeeper/stylesheets/toc.xsl
-share/gnome/xml/scrollkeeper/dtds/scrollkeeper-cl.dtd
-share/gnome/xml/scrollkeeper/dtds/scrollkeeper-omf.dtd
+share/omf/scrollkeeper/writing_scrollkeeper_omf_files-C.omf
+share/scrollkeeper/Templates/C/scrollkeeper_cl.xml
+share/scrollkeeper/Templates/am/scrollkeeper_cl.xml
+share/scrollkeeper/Templates/az/scrollkeeper_cl.xml
+share/scrollkeeper/Templates/be/scrollkeeper_cl.xml
+share/scrollkeeper/Templates/ca/scrollkeeper_cl.xml
+share/scrollkeeper/Templates/cs/scrollkeeper_cl.xml
+share/scrollkeeper/Templates/da/scrollkeeper_cl.xml
+share/scrollkeeper/Templates/de/scrollkeeper_cl.xml
+share/scrollkeeper/Templates/el/scrollkeeper_cl.xml
+share/scrollkeeper/Templates/es/scrollkeeper_cl.xml
+share/scrollkeeper/Templates/fr/scrollkeeper_cl.xml
+share/scrollkeeper/Templates/hu/scrollkeeper_cl.xml
+share/scrollkeeper/Templates/it/scrollkeeper_cl.xml
+share/scrollkeeper/Templates/ja/scrollkeeper_cl.xml
+share/scrollkeeper/Templates/kn/scrollkeeper_cl.xml
+share/scrollkeeper/Templates/ko/scrollkeeper_cl.xml
+share/scrollkeeper/Templates/nl/scrollkeeper_cl.xml
+share/scrollkeeper/Templates/no/scrollkeeper_cl.xml
+share/scrollkeeper/Templates/pl/scrollkeeper_cl.xml
+share/scrollkeeper/Templates/pt_BR/scrollkeeper_cl.xml
+share/scrollkeeper/Templates/ro/scrollkeeper_cl.xml
+share/scrollkeeper/Templates/ru/scrollkeeper_cl.xml
+share/scrollkeeper/Templates/sl/scrollkeeper_cl.xml
+share/scrollkeeper/Templates/sk/scrollkeeper_cl.xml
+share/scrollkeeper/Templates/sr/scrollkeeper_cl.xml
+share/scrollkeeper/Templates/sr@Latn/scrollkeeper_cl.xml
+share/scrollkeeper/Templates/sv/scrollkeeper_cl.xml
+share/scrollkeeper/Templates/tr/scrollkeeper_cl.xml
+share/scrollkeeper/Templates/uk/scrollkeeper_cl.xml
+share/scrollkeeper/Templates/vi/scrollkeeper_cl.xml
+share/scrollkeeper/Templates/zh_CN/scrollkeeper_cl.xml
+share/scrollkeeper/Templates/zh_TW/scrollkeeper_cl.xml
+share/scrollkeeper/doc/writing_scrollkeeper_omf_files/C/legal.xml
+share/scrollkeeper/doc/writing_scrollkeeper_omf_files/C/writing_scrollkeeper_omf_files.xml
+share/scrollkeeper/stylesheets/categories.xsl
+share/scrollkeeper/stylesheets/index.xsl
+share/scrollkeeper/stylesheets/toc.xsl
+share/xml/scrollkeeper/dtds/scrollkeeper-cl.dtd
+share/xml/scrollkeeper/dtds/scrollkeeper-omf.dtd
 share/locale/am/LC_MESSAGES/scrollkeeper.mo
 share/locale/az/LC_MESSAGES/scrollkeeper.mo
 share/locale/be/LC_MESSAGES/scrollkeeper.mo
@@ -88,50 +88,50 @@ share/locale/uk/LC_MESSAGES/scrollkeeper.mo
 share/locale/vi/LC_MESSAGES/scrollkeeper.mo
 share/locale/zh_CN/LC_MESSAGES/scrollkeeper.mo
 share/locale/zh_TW/LC_MESSAGES/scrollkeeper.mo
-@dirrm share/gnome/xml/scrollkeeper/dtds
-@dirrm share/gnome/xml/scrollkeeper
-@dirrm share/gnome/xml
-@dirrm share/gnome/scrollkeeper/stylesheets
-@dirrm share/gnome/scrollkeeper/doc/writing_scrollkeeper_omf_files/C
-@dirrm share/gnome/scrollkeeper/doc/writing_scrollkeeper_omf_files
-@dirrm share/gnome/scrollkeeper/doc
-@dirrm share/gnome/scrollkeeper/Templates/zh_TW
-@dirrm share/gnome/scrollkeeper/Templates/zh_CN
-@dirrm share/gnome/scrollkeeper/Templates/vi
-@dirrm share/gnome/scrollkeeper/Templates/uk
-@dirrm share/gnome/scrollkeeper/Templates/tr
-@dirrm share/gnome/scrollkeeper/Templates/sv
-@dirrm share/gnome/scrollkeeper/Templates/sr@Latn
-@dirrm share/gnome/scrollkeeper/Templates/sr
-@dirrm share/gnome/scrollkeeper/Templates/sl
-@dirrm share/gnome/scrollkeeper/Templates/sk
-@dirrm share/gnome/scrollkeeper/Templates/ru
-@dirrm share/gnome/scrollkeeper/Templates/ro
-@dirrm share/gnome/scrollkeeper/Templates/pt_BR
-@dirrm share/gnome/scrollkeeper/Templates/pl
-@dirrm share/gnome/scrollkeeper/Templates/no
-@dirrm share/gnome/scrollkeeper/Templates/nl
-@dirrm share/gnome/scrollkeeper/Templates/ko
-@dirrm share/gnome/scrollkeeper/Templates/kn
-@dirrm share/gnome/scrollkeeper/Templates/ja
-@dirrm share/gnome/scrollkeeper/Templates/it
-@dirrm share/gnome/scrollkeeper/Templates/hu
-@dirrm share/gnome/scrollkeeper/Templates/fr
-@dirrm share/gnome/scrollkeeper/Templates/es
-@dirrm share/gnome/scrollkeeper/Templates/el
-@dirrm share/gnome/scrollkeeper/Templates/de
-@dirrm share/gnome/scrollkeeper/Templates/da
-@dirrm share/gnome/scrollkeeper/Templates/cs
-@dirrm share/gnome/scrollkeeper/Templates/ca
-@dirrm share/gnome/scrollkeeper/Templates/be
-@dirrm share/gnome/scrollkeeper/Templates/az
-@dirrm share/gnome/scrollkeeper/Templates/am
-@dirrm share/gnome/scrollkeeper/Templates/C
-@dirrm share/gnome/scrollkeeper/Templates
-@dirrm share/gnome/scrollkeeper
-@dirrm share/gnome/omf/scrollkeeper
+@dirrm share/xml/scrollkeeper/dtds
+@dirrm share/xml/scrollkeeper
+@dirrmtry share/xml
+@dirrm share/scrollkeeper/stylesheets
+@dirrm share/scrollkeeper/doc/writing_scrollkeeper_omf_files/C
+@dirrm share/scrollkeeper/doc/writing_scrollkeeper_omf_files
+@dirrm share/scrollkeeper/doc
+@dirrm share/scrollkeeper/Templates/zh_TW
+@dirrm share/scrollkeeper/Templates/zh_CN
+@dirrm share/scrollkeeper/Templates/vi
+@dirrm share/scrollkeeper/Templates/uk
+@dirrm share/scrollkeeper/Templates/tr
+@dirrm share/scrollkeeper/Templates/sv
+@dirrm share/scrollkeeper/Templates/sr@Latn
+@dirrm share/scrollkeeper/Templates/sr
+@dirrm share/scrollkeeper/Templates/sl
+@dirrm share/scrollkeeper/Templates/sk
+@dirrm share/scrollkeeper/Templates/ru
+@dirrm share/scrollkeeper/Templates/ro
+@dirrm share/scrollkeeper/Templates/pt_BR
+@dirrm share/scrollkeeper/Templates/pl
+@dirrm share/scrollkeeper/Templates/no
+@dirrm share/scrollkeeper/Templates/nl
+@dirrm share/scrollkeeper/Templates/ko
+@dirrm share/scrollkeeper/Templates/kn
+@dirrm share/scrollkeeper/Templates/ja
+@dirrm share/scrollkeeper/Templates/it
+@dirrm share/scrollkeeper/Templates/hu
+@dirrm share/scrollkeeper/Templates/fr
+@dirrm share/scrollkeeper/Templates/es
+@dirrm share/scrollkeeper/Templates/el
+@dirrm share/scrollkeeper/Templates/de
+@dirrm share/scrollkeeper/Templates/da
+@dirrm share/scrollkeeper/Templates/cs
+@dirrm share/scrollkeeper/Templates/ca
+@dirrm share/scrollkeeper/Templates/be
+@dirrm share/scrollkeeper/Templates/az
+@dirrm share/scrollkeeper/Templates/am
+@dirrm share/scrollkeeper/Templates/C
+@dirrm share/scrollkeeper/Templates
+@dirrm share/scrollkeeper
+@dirrm share/omf/scrollkeeper
 @unexec rm -f /var/log/scrollkeeper.log 2>/dev/null || true
 @unexec rm -rf /var/db/scrollkeeper 2>/dev/null || true
-@unexec %%LOCALBASE%%/bin/xmlcatalog --noout --del %D/share/gnome/xml/scrollkeeper/dtds/scrollkeeper-omf.dtd %%LOCALBASE%%/share/xml/catalog.ports || true
+@unexec %%LOCALBASE%%/bin/xmlcatalog --noout --del %D/share/xml/scrollkeeper/dtds/scrollkeeper-omf.dtd %%LOCALBASE%%/share/xml/catalog.ports || true
 @exec touch -f /var/log/scrollkeeper.log
 @exec mkdir -p /var/db/scrollkeeper
diff --git a/textproc/stardict2-dictd_mova/Makefile b/textproc/stardict2-dictd_mova/Makefile
index a8530bf46595..8d321c496612 100644
--- a/textproc/stardict2-dictd_mova/Makefile
+++ b/textproc/stardict2-dictd_mova/Makefile
@@ -1,12 +1,13 @@
 # Ports collection makefile for:	stardict-dictd_www.mova.org
 # Date created:				16 Dec 2004
 # Whom:					Timur I. Bakeyev <timur@gnome.org>
+#
 # $FreeBSD$
 #
 
 PORTNAME=	stardict
 PORTVERSION=	2.4.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	stardict
@@ -23,7 +24,7 @@ USE_BZIP2=	yes
 
 LATEST_LINK=	${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}
 
-DICTDIR=	share/gnome/stardict/dic
+DICTDIR=	share/stardict/dic
 
 DISTSUFFIX=	-dictd_www.mova.org
 
diff --git a/textproc/stardict2-quick/Makefile b/textproc/stardict2-quick/Makefile
index 940ce21a571b..f7210ac25d9b 100644
--- a/textproc/stardict2-quick/Makefile
+++ b/textproc/stardict2-quick/Makefile
@@ -1,12 +1,13 @@
 # Ports collection makefile for:	stardict-quick
 # Date created:				16 Dec 2004
 # Whom:					Timur I. Bakeyev <timur@gnome.org>
+#
 # $FreeBSD$
 #
 
 PORTNAME=	stardict
 PORTVERSION=	2.4.2
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	stardict
@@ -23,7 +24,7 @@ USE_BZIP2=	yes
 
 LATEST_LINK=	${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}
 
-DICTDIR=	share/gnome/stardict/dic
+DICTDIR=	share/stardict/dic
 
 DICTIONARIES=	afr-eng afr-swe bul-swe dan-deu dan-eng dan-fin dan-fra \
 		dan-hun dan-ind dan-ita dan-jpn dan-lat dan-nld dan-nor \
diff --git a/textproc/stardict2/Makefile b/textproc/stardict2/Makefile
index d91c60073f07..2d5f0174ce0a 100644
--- a/textproc/stardict2/Makefile
+++ b/textproc/stardict2/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	stardict
 PORTVERSION=	2.4.8
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/textproc/stardict2/pkg-plist b/textproc/stardict2/pkg-plist
index 26dd31626e97..85342966e0fc 100644
--- a/textproc/stardict2/pkg-plist
+++ b/textproc/stardict2/pkg-plist
@@ -1,6 +1,6 @@
 bin/stardict
 %%GNOME%%libdata/bonobo/servers/GNOME_Stardict.server
-share/gnome/applications/stardict.desktop
+share/applications/stardict.desktop
 %%GNOME%%share/gnome/help/stardict/C/figures/stardict_float_window.png
 %%GNOME%%share/gnome/help/stardict/C/figures/stardict_main_window.png
 %%GNOME%%share/gnome/help/stardict/C/figures/stardict_notification_area.png
@@ -36,24 +36,24 @@ share/gnome/applications/stardict.desktop
 %%GNOME%%share/gnome/help/stardict/zh_TW/figures/stardict_notification_area.png
 %%GNOME%%share/gnome/help/stardict/zh_TW/legal.xml
 %%GNOME%%share/gnome/help/stardict/zh_TW/stardict.xml
-%%GNOME%%share/gnome/idl/GNOME_Stardict.idl
-%%GNOME%%share/gnome/omf/stardict/stardict-C.omf
-%%GNOME%%share/gnome/omf/stardict/stardict-mk.omf
-%%GNOME%%share/gnome/omf/stardict/stardict-nl.omf
-%%GNOME%%share/gnome/omf/stardict/stardict-ru.omf
-%%GNOME%%share/gnome/omf/stardict/stardict-uk.omf
-%%GNOME%%share/gnome/omf/stardict/stardict-zh_CN.omf
-%%GNOME%%share/gnome/omf/stardict/stardict-zh_TW.omf
-share/gnome/pixmaps/stardict.png
-share/gnome/stardict/pixmaps/docklet_normal.png
-share/gnome/stardict/pixmaps/docklet_scan.png
-share/gnome/stardict/pixmaps/docklet_stop.png
-share/gnome/stardict/pixmaps/index_appendix.png
-share/gnome/stardict/pixmaps/index_dictlist.png
-share/gnome/stardict/pixmaps/index_wazard.png
-share/gnome/stardict/pixmaps/splash.png
-share/gnome/stardict/sounds/buttonactive.wav
-share/gnome/stardict/sounds/menushow.wav
+%%GNOME%%share/idl/GNOME_Stardict.idl
+%%GNOME%%share/omf/stardict/stardict-C.omf
+%%GNOME%%share/omf/stardict/stardict-mk.omf
+%%GNOME%%share/omf/stardict/stardict-nl.omf
+%%GNOME%%share/omf/stardict/stardict-ru.omf
+%%GNOME%%share/omf/stardict/stardict-uk.omf
+%%GNOME%%share/omf/stardict/stardict-zh_CN.omf
+%%GNOME%%share/omf/stardict/stardict-zh_TW.omf
+share/pixmaps/stardict.png
+share/stardict/pixmaps/docklet_normal.png
+share/stardict/pixmaps/docklet_scan.png
+share/stardict/pixmaps/docklet_stop.png
+share/stardict/pixmaps/index_appendix.png
+share/stardict/pixmaps/index_dictlist.png
+share/stardict/pixmaps/index_wazard.png
+share/stardict/pixmaps/splash.png
+share/stardict/sounds/buttonactive.wav
+share/stardict/sounds/menushow.wav
 share/locale/cs/LC_MESSAGES/stardict.mo
 share/locale/de/LC_MESSAGES/stardict.mo
 share/locale/el/LC_MESSAGES/stardict.mo
@@ -73,10 +73,10 @@ share/locale/zh_CN/LC_MESSAGES/stardict.mo
 share/locale/zh_TW/LC_MESSAGES/stardict.mo
 @dirrmtry share/locale/tt/LC_MESSAGES
 @dirrmtry share/locale/tt
-@dirrm share/gnome/stardict/sounds
-@dirrm share/gnome/stardict/pixmaps
-@dirrmtry share/gnome/stardict
-%%GNOME%%@dirrm share/gnome/omf/stardict
+@dirrm share/stardict/sounds
+@dirrm share/stardict/pixmaps
+@dirrmtry share/stardict
+%%GNOME%%@dirrm share/omf/stardict
 %%GNOME%%@dirrm share/gnome/help/stardict/zh_TW/figures
 %%GNOME%%@dirrm share/gnome/help/stardict/zh_TW
 %%GNOME%%@dirrm share/gnome/help/stardict/zh_CN/figures
@@ -92,3 +92,4 @@ share/locale/zh_TW/LC_MESSAGES/stardict.mo
 %%GNOME%%@dirrm share/gnome/help/stardict/C/figures
 %%GNOME%%@dirrm share/gnome/help/stardict/C
 %%GNOME%%@dirrm share/gnome/help/stardict
+@dirrmtry share/applications
diff --git a/textproc/stardict3/Makefile b/textproc/stardict3/Makefile
index d91c60073f07..2d5f0174ce0a 100644
--- a/textproc/stardict3/Makefile
+++ b/textproc/stardict3/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	stardict
 PORTVERSION=	2.4.8
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/textproc/stardict3/pkg-plist b/textproc/stardict3/pkg-plist
index 26dd31626e97..85342966e0fc 100644
--- a/textproc/stardict3/pkg-plist
+++ b/textproc/stardict3/pkg-plist
@@ -1,6 +1,6 @@
 bin/stardict
 %%GNOME%%libdata/bonobo/servers/GNOME_Stardict.server
-share/gnome/applications/stardict.desktop
+share/applications/stardict.desktop
 %%GNOME%%share/gnome/help/stardict/C/figures/stardict_float_window.png
 %%GNOME%%share/gnome/help/stardict/C/figures/stardict_main_window.png
 %%GNOME%%share/gnome/help/stardict/C/figures/stardict_notification_area.png
@@ -36,24 +36,24 @@ share/gnome/applications/stardict.desktop
 %%GNOME%%share/gnome/help/stardict/zh_TW/figures/stardict_notification_area.png
 %%GNOME%%share/gnome/help/stardict/zh_TW/legal.xml
 %%GNOME%%share/gnome/help/stardict/zh_TW/stardict.xml
-%%GNOME%%share/gnome/idl/GNOME_Stardict.idl
-%%GNOME%%share/gnome/omf/stardict/stardict-C.omf
-%%GNOME%%share/gnome/omf/stardict/stardict-mk.omf
-%%GNOME%%share/gnome/omf/stardict/stardict-nl.omf
-%%GNOME%%share/gnome/omf/stardict/stardict-ru.omf
-%%GNOME%%share/gnome/omf/stardict/stardict-uk.omf
-%%GNOME%%share/gnome/omf/stardict/stardict-zh_CN.omf
-%%GNOME%%share/gnome/omf/stardict/stardict-zh_TW.omf
-share/gnome/pixmaps/stardict.png
-share/gnome/stardict/pixmaps/docklet_normal.png
-share/gnome/stardict/pixmaps/docklet_scan.png
-share/gnome/stardict/pixmaps/docklet_stop.png
-share/gnome/stardict/pixmaps/index_appendix.png
-share/gnome/stardict/pixmaps/index_dictlist.png
-share/gnome/stardict/pixmaps/index_wazard.png
-share/gnome/stardict/pixmaps/splash.png
-share/gnome/stardict/sounds/buttonactive.wav
-share/gnome/stardict/sounds/menushow.wav
+%%GNOME%%share/idl/GNOME_Stardict.idl
+%%GNOME%%share/omf/stardict/stardict-C.omf
+%%GNOME%%share/omf/stardict/stardict-mk.omf
+%%GNOME%%share/omf/stardict/stardict-nl.omf
+%%GNOME%%share/omf/stardict/stardict-ru.omf
+%%GNOME%%share/omf/stardict/stardict-uk.omf
+%%GNOME%%share/omf/stardict/stardict-zh_CN.omf
+%%GNOME%%share/omf/stardict/stardict-zh_TW.omf
+share/pixmaps/stardict.png
+share/stardict/pixmaps/docklet_normal.png
+share/stardict/pixmaps/docklet_scan.png
+share/stardict/pixmaps/docklet_stop.png
+share/stardict/pixmaps/index_appendix.png
+share/stardict/pixmaps/index_dictlist.png
+share/stardict/pixmaps/index_wazard.png
+share/stardict/pixmaps/splash.png
+share/stardict/sounds/buttonactive.wav
+share/stardict/sounds/menushow.wav
 share/locale/cs/LC_MESSAGES/stardict.mo
 share/locale/de/LC_MESSAGES/stardict.mo
 share/locale/el/LC_MESSAGES/stardict.mo
@@ -73,10 +73,10 @@ share/locale/zh_CN/LC_MESSAGES/stardict.mo
 share/locale/zh_TW/LC_MESSAGES/stardict.mo
 @dirrmtry share/locale/tt/LC_MESSAGES
 @dirrmtry share/locale/tt
-@dirrm share/gnome/stardict/sounds
-@dirrm share/gnome/stardict/pixmaps
-@dirrmtry share/gnome/stardict
-%%GNOME%%@dirrm share/gnome/omf/stardict
+@dirrm share/stardict/sounds
+@dirrm share/stardict/pixmaps
+@dirrmtry share/stardict
+%%GNOME%%@dirrm share/omf/stardict
 %%GNOME%%@dirrm share/gnome/help/stardict/zh_TW/figures
 %%GNOME%%@dirrm share/gnome/help/stardict/zh_TW
 %%GNOME%%@dirrm share/gnome/help/stardict/zh_CN/figures
@@ -92,3 +92,4 @@ share/locale/zh_TW/LC_MESSAGES/stardict.mo
 %%GNOME%%@dirrm share/gnome/help/stardict/C/figures
 %%GNOME%%@dirrm share/gnome/help/stardict/C
 %%GNOME%%@dirrm share/gnome/help/stardict
+@dirrmtry share/applications
diff --git a/www/bluefish/Makefile b/www/bluefish/Makefile
index 7d180a9fb107..8c84f2236cb6 100644
--- a/www/bluefish/Makefile
+++ b/www/bluefish/Makefile
@@ -3,12 +3,12 @@
 # Whom:				Koop Mast <einekoai@chello.nl>
 #
 # $FreeBSD$
-#   $MCom: ports/www/bluefish/Makefile,v 1.1 2006/09/30 03:21:27 ahze Exp $
+#   $MCom: ports/www/bluefish/Makefile,v 1.6 2007/10/11 03:20:30 mezz Exp $
 #
 
 PORTNAME=	bluefish
 PORTVERSION=	1.0.7
-PORTREVISION=	2
+PORTREVISION=	4
 CATEGORIES=	www editors
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -28,16 +28,16 @@ RUN_DEPENDS+=	tidy:${PORTSDIR}/www/tidy
 
 USE_BZIP2=	yes
 USE_GETTEXT=	yes
-USE_GNOME=	gnomehier gtk20 gnomevfs2
+USE_GNOME=	gnomeprefix gtk20 gnomevfs2 gnomemimedata desktopfileutils
 WANT_GNOME=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
-CONFIGURE_ARGS=	--with-freedesktop_org-menu=${PREFIX}/share/gnome/applications \
+CONFIGURE_ARGS=	--with-freedesktop_org-menu=${PREFIX}/share/applications \
 		--with-freedesktop_org-mime=${PREFIX}/share/mime \
 		--without-gnome2_4-mime \
 		--without-gnome2_4-appreg \
-		--with-icon-path=${PREFIX}/share/gnome/pixmaps
+		--with-icon-path=${PREFIX}/share/pixmaps
 
 # Turns debugging output on
 .if defined(WITH_DEBUG)
@@ -62,6 +62,9 @@ pre-everything::
 	@${ECHO_MSG} "This will reduce the number of warning in the console when running bluefish."
 	@${ECHO_MSG} ""
 
+pre-install:
+	@${MKDIR} ${PREIX}/share/mime
+
 .include <bsd.port.pre.mk>
 
 .if ${HAVE_GNOME:Mlibgnomeui}!=""
diff --git a/www/bluefish/pkg-plist b/www/bluefish/pkg-plist
index 8a7b525d9692..4817ee543072 100644
--- a/www/bluefish/pkg-plist
+++ b/www/bluefish/pkg-plist
@@ -22,10 +22,10 @@ bin/bluefish
 %%DATADIR%%/icon_r.png
 %%DATADIR%%/icon_unknown.png
 %%DATADIR%%/icon_xml.png
-share/gnome/applications/bluefish-project.desktop
-share/gnome/applications/bluefish.desktop
-share/gnome/pixmaps/bluefish-icon.png
-share/gnome/pixmaps/gnome-mime-application-bluefish-project.png
+share/applications/bluefish-project.desktop
+share/applications/bluefish.desktop
+share/pixmaps/bluefish-icon.png
+share/pixmaps/gnome-mime-application-bluefish-project.png
 share/locale/bg/LC_MESSAGES/bluefish.mo
 share/locale/cs/LC_MESSAGES/bluefish.mo
 share/locale/da/LC_MESSAGES/bluefish.mo
@@ -54,3 +54,5 @@ share/mime/packages/bluefish.xml
 @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/mime
+@dirrmtry share/applications
diff --git a/www/epiphany-extensions/Makefile b/www/epiphany-extensions/Makefile
index 6cd0ed6851d9..915de298e6f5 100644
--- a/www/epiphany-extensions/Makefile
+++ b/www/epiphany-extensions/Makefile
@@ -3,12 +3,11 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/www/epiphany-extensions/Makefile,v 1.88 2007/03/11 20:34:21 mezz Exp $
+#   $MCom: ports/www/epiphany-extensions/Makefile,v 1.101 2007/10/15 22:00:17 mezz Exp $
 #
 
 PORTNAME=	epiphany-extensions
-PORTVERSION=	2.18.3
-PORTREVISION=	2
+PORTVERSION=	2.20.1
 CATEGORIES=	www gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -18,6 +17,7 @@ MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	A set of add-ons for the Epiphany web browser
 
 BUILD_DEPENDS=	epiphany:${PORTSDIR}/www/epiphany
+LIB_DEPENDS=	pcre.0:${PORTSDIR}/devel/pcre
 RUN_DEPENDS=	epiphany:${PORTSDIR}/www/epiphany
 
 USE_GETTEXT=	yes
@@ -35,12 +35,11 @@ CONFIGURE_ARGS=	--with-mozilla=${GECKO}
 GCONF_SCHEMAS=	smart-bookmarks.schemas
 
 EPHY_EXTENSIONS=all,rss
-EPHY_VERSION=	2.18
+EPHY_VERSION=	2.20
 
-PLIST_SUB=	VERSION="2.18" EPHY_VERSION=${EPHY_VERSION}
+PLIST_SUB=	VERSION="2.20" EPHY_VERSION=${EPHY_VERSION}
 
-OPTIONS=	OPENSP "Enable OpenSP SGML support" off \
-		ADBLOCK "Enable the adblock extension" on
+OPTIONS=	OPENSP "Enable OpenSP SGML support" off
 
 .include <bsd.port.pre.mk>
 .include "${PORTSDIR}/www/mozilla/bsd.gecko.mk"
@@ -51,14 +50,6 @@ CONFIGURE_ARGS+=	--enable-opensp=yes
 CONFIGURE_ARGS+=	--disable-opensp
 .endif
 
-.if !defined(WITHOUT_ADBLOCK)
-EPHY_EXTENSIONS:=	${EPHY_EXTENSIONS},adblock
-LIB_DEPENDS+=		pcre.0:${PORTSDIR}/devel/pcre
-PLIST_SUB+=		ADBLOCK=""
-.else
-PLIST_SUB+=		ADBLOCK="@comment "
-.endif
-
 .if exists(${LOCALBASE}/share/pygtk/2.0/defs/epiphany.defs)
 USE_PYTHON=	yes
 .include "${PORTSDIR}/Mk/bsd.python.mk"
diff --git a/www/epiphany-extensions/distinfo b/www/epiphany-extensions/distinfo
index 37a96347a87b..44f53585cab1 100644
--- a/www/epiphany-extensions/distinfo
+++ b/www/epiphany-extensions/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/epiphany-extensions-2.18.3.tar.bz2) = 4e55bedcfe7f2f359043eb14b17e8cc4
-SHA256 (gnome2/epiphany-extensions-2.18.3.tar.bz2) = 50063c8bd5d03f0625c287015f7b4d9fcfd320b7405161d1bab40d27d3368682
-SIZE (gnome2/epiphany-extensions-2.18.3.tar.bz2) = 893264
+MD5 (gnome2/epiphany-extensions-2.20.1.tar.bz2) = cd8a247d81960217df4d7c8edfe9fbf8
+SHA256 (gnome2/epiphany-extensions-2.20.1.tar.bz2) = 35a66aa9151f0cbd492435077f4bef30ecb8728e990e29da3e4a5f275a5875d0
+SIZE (gnome2/epiphany-extensions-2.20.1.tar.bz2) = 908577
diff --git a/www/epiphany-extensions/pkg-plist b/www/epiphany-extensions/pkg-plist
index 6b3f2f49c971..f107dc0306ba 100644
--- a/www/epiphany-extensions/pkg-plist
+++ b/www/epiphany-extensions/pkg-plist
@@ -1,5 +1,5 @@
 lib/epiphany/%%VERSION%%/extensions/actions.ephy-extension
-%%ADBLOCK%%lib/epiphany/%%VERSION%%/extensions/adblock.ephy-extension
+lib/epiphany/%%VERSION%%/extensions/adblock.ephy-extension
 lib/epiphany/%%VERSION%%/extensions/auto-reload.ephy-extension
 lib/epiphany/%%VERSION%%/extensions/auto-scroller.ephy-extension
 %%PYTHON%%lib/epiphany/%%VERSION%%/extensions/cc-license-viewer.ephy-extension
@@ -20,8 +20,8 @@ lib/epiphany/%%VERSION%%/extensions/gestures.ephy-extension
 lib/epiphany/%%VERSION%%/extensions/java-console.ephy-extension
 lib/epiphany/%%VERSION%%/extensions/libactionsextension.la
 lib/epiphany/%%VERSION%%/extensions/libactionsextension.so
-%%ADBLOCK%%lib/epiphany/%%VERSION%%/extensions/libadblockextension.la
-%%ADBLOCK%%lib/epiphany/%%VERSION%%/extensions/libadblockextension.so
+lib/epiphany/%%VERSION%%/extensions/libadblockextension.la
+lib/epiphany/%%VERSION%%/extensions/libadblockextension.so
 lib/epiphany/%%VERSION%%/extensions/libautoreloadextension.la
 lib/epiphany/%%VERSION%%/extensions/libautoreloadextension.so
 lib/epiphany/%%VERSION%%/extensions/libautoscrollerextension.la
@@ -61,23 +61,23 @@ lib/epiphany/%%VERSION%%/extensions/sidebar.ephy-extension
 lib/epiphany/%%VERSION%%/extensions/smart-bookmarks.ephy-extension
 lib/epiphany/%%VERSION%%/extensions/tab-groups.ephy-extension
 lib/epiphany/%%VERSION%%/extensions/tab-states.ephy-extension
-%%ADBLOCK%%share/gnome/epiphany-extensions/adblock-patterns
-%%ADBLOCK%%share/gnome/epiphany-extensions/adblock-statusbar-icon.svg
-share/gnome/epiphany-extensions/ephy-gestures.xml
-share/gnome/epiphany-extensions/glade/action-properties.glade
-share/gnome/epiphany-extensions/glade/actions-editor.glade
-%%ADBLOCK%%share/gnome/epiphany-extensions/glade/adblock.glade
-share/gnome/epiphany-extensions/glade/error-viewer.glade
-share/gnome/epiphany-extensions/glade/extensions-manager-ui.glade
-share/gnome/epiphany-extensions/glade/page-info.glade
-share/gnome/epiphany-extensions/glade/rss-ui.glade
-share/gnome/epiphany-extensions/xml/epiphany-sidebar-ui.xml
-share/gnome/epiphany-extensions/xml/page-info-context-ui.xml
-share/gnome/epiphany/icons/hicolor/16x16/status/feed-presence.png
-share/gnome/epiphany/icons/hicolor/22x22/status/feed-presence.png
-share/gnome/epiphany/icons/hicolor/24x24/status/feed-presence.png
-share/gnome/epiphany/icons/hicolor/32x32/status/feed-presence.png
-share/gnome/epiphany/icons/hicolor/scalable/status/feed-presence.svg
+%%DATADIR%%/adblock-patterns
+%%DATADIR%%/adblock-statusbar-icon.svg
+%%DATADIR%%/ephy-gestures.xml
+%%DATADIR%%/glade/action-properties.glade
+%%DATADIR%%/glade/actions-editor.glade
+%%DATADIR%%/glade/adblock.glade
+%%DATADIR%%/glade/error-viewer.glade
+%%DATADIR%%/glade/extensions-manager-ui.glade
+%%DATADIR%%/glade/page-info.glade
+%%DATADIR%%/glade/rss-ui.glade
+%%DATADIR%%/xml/epiphany-sidebar-ui.xml
+%%DATADIR%%/xml/page-info-context-ui.xml
+share/epiphany/icons/hicolor/16x16/status/feed-presence.png
+share/epiphany/icons/hicolor/22x22/status/feed-presence.png
+share/epiphany/icons/hicolor/24x24/status/feed-presence.png
+share/epiphany/icons/hicolor/32x32/status/feed-presence.png
+share/epiphany/icons/hicolor/scalable/status/feed-presence.svg
 share/gnome/help/epiphany-extensions/C/epiphany-extensions.xml
 share/gnome/help/epiphany-extensions/C/figures/epi-ext-action-create.png
 share/gnome/help/epiphany-extensions/C/figures/epi-ext-adblocker.png
@@ -119,14 +119,13 @@ share/gnome/help/epiphany-extensions/sv/figures/epi-ext-gestures-view-source-2.p
 share/gnome/help/epiphany-extensions/sv/figures/epi-ext-gestures-view-source.png
 share/gnome/help/epiphany-extensions/sv/figures/epi-ext-sidebar.png
 share/gnome/help/epiphany-extensions/sv/figures/epi-ext-tabgroups.png
-share/gnome/omf/epiphany-extensions/epiphany-extensions-C.omf
-share/gnome/omf/epiphany-extensions/epiphany-extensions-sv.omf
 share/locale/ar/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
 share/locale/bg/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
 share/locale/ca/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
 share/locale/cs/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
 share/locale/da/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
 share/locale/de/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
+share/locale/dz/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
 share/locale/el/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
 share/locale/en_CA/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
 share/locale/en_GB/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
@@ -143,6 +142,7 @@ share/locale/lt/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
 share/locale/nb/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
 share/locale/ne/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
 share/locale/nl/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
+share/locale/oc/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
 share/locale/pa/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
 share/locale/pl/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
 share/locale/pt/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
@@ -162,15 +162,30 @@ share/locale/wa/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
 share/locale/zh_CN/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
 share/locale/zh_HK/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
 share/locale/zh_TW/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
-@dirrm share/gnome/omf/epiphany-extensions
+share/omf/epiphany-extensions/epiphany-extensions-C.omf
+share/omf/epiphany-extensions/epiphany-extensions-sv.omf
+@dirrm share/omf/epiphany-extensions
 @dirrm share/gnome/help/epiphany-extensions/sv/figures
 @dirrm share/gnome/help/epiphany-extensions/sv
 @dirrm share/gnome/help/epiphany-extensions/C/figures
 @dirrm share/gnome/help/epiphany-extensions/C
 @dirrm share/gnome/help/epiphany-extensions
-@dirrm share/gnome/epiphany-extensions/xml
-@dirrm share/gnome/epiphany-extensions/glade
-@dirrm share/gnome/epiphany-extensions
+@dirrmtry share/epiphany/icons/hicolor/scalable/status
+@dirrmtry share/epiphany/icons/hicolor/scalable
+@dirrmtry share/epiphany/icons/hicolor/32x32/status
+@dirrmtry share/epiphany/icons/hicolor/32x32
+@dirrmtry share/epiphany/icons/hicolor/24x24/status
+@dirrmtry share/epiphany/icons/hicolor/24x24
+@dirrmtry share/epiphany/icons/hicolor/22x22/status
+@dirrmtry share/epiphany/icons/hicolor/22x22
+@dirrmtry share/epiphany/icons/hicolor/16x16/status
+@dirrmtry share/epiphany/icons/hicolor/16x16
+@dirrmtry share/epiphany/icons/hicolor
+@dirrmtry share/epiphany/icons
+@dirrmtry share/epiphany
+@dirrm %%DATADIR%%/xml
+@dirrm %%DATADIR%%/glade
+@dirrm %%DATADIR%%
 @dirrmtry lib/epiphany/%%VERSION%%/extensions
 @dirrmtry lib/epiphany/%%VERSION%%/plugins
 @dirrmtry lib/epiphany/%%VERSION%%
@@ -179,3 +194,7 @@ share/locale/zh_TW/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
 @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/www/epiphany/Makefile b/www/epiphany/Makefile
index 7ec7bb1671b6..ec7ecb1170d5 100644
--- a/www/epiphany/Makefile
+++ b/www/epiphany/Makefile
@@ -3,11 +3,11 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/www/epiphany/Makefile,v 1.141 2007/03/11 20:12:27 mezz Exp $
+#   $MCom: ports/www/epiphany/Makefile,v 1.155 2007/10/15 21:47:21 mezz Exp $
 #
 
 PORTNAME=	epiphany
-PORTVERSION=	2.18.3
+PORTVERSION=	2.20.1
 CATEGORIES=	www gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -17,7 +17,8 @@ COMMENT=	An extremely lightweight and simple web browser for GNOME 2
 
 BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes
 LIB_DEPENDS=	dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
-RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes
+RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes \
+    		${LOCALBASE}/share/themes/LowContrast/index.theme:${PORTSDIR}/x11-themes/gnome-themes
 
 USE_LDCONFIG=	yes
 INSTALLS_ICONS=	yes
@@ -32,7 +33,7 @@ WANT_GNOME=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 INSTALLS_OMF=	yes
-CONFIGURE_ARGS=	--with-mozilla=${GECKO}
+CONFIGURE_ARGS=	--with-gecko=${GECKO}
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
 		LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
 
@@ -77,8 +78,6 @@ post-patch:
 		${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|/lib/mozilla/plugins"|/lib/browser_plugins" ":" MOZILLA_PREFIX "/lib/browser_linux_plugins"|' \
 		${WRKSRC}/embed/mozilla/mozilla-embed-single.cpp
-	@${REINPLACE_CMD} -e 's|[$$](datadir)/pygtk/2.0/defs|${LOCALBASE}/share/pygtk/2.0/defs|' \
-		${WRKSRC}/src/Makefile.in
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/data/epiphany-fonts.schemas \
diff --git a/www/epiphany/distinfo b/www/epiphany/distinfo
index 99dd06ba7946..8a567de151f5 100644
--- a/www/epiphany/distinfo
+++ b/www/epiphany/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/epiphany-2.18.3.tar.bz2) = 2e77f3f0651a27cac29224e82c3cc793
-SHA256 (gnome2/epiphany-2.18.3.tar.bz2) = ccceb15371782b2cfed2f7e4c078336dd20a0d864d9c1e31b28518aa5a25e6de
-SIZE (gnome2/epiphany-2.18.3.tar.bz2) = 4772883
+MD5 (gnome2/epiphany-2.20.1.tar.bz2) = bacb5c7f1a421f6d5adbec35d4cab3ea
+SHA256 (gnome2/epiphany-2.20.1.tar.bz2) = 2a1d9b9e928dd2cb7c3778d1990d5a42ae1b49b4d5e70d0bf86584a52d45bff1
+SIZE (gnome2/epiphany-2.20.1.tar.bz2) = 4878092
diff --git a/www/epiphany/pkg-plist b/www/epiphany/pkg-plist
index e6a3e1970474..42fa196eac82 100644
--- a/www/epiphany/pkg-plist
+++ b/www/epiphany/pkg-plist
@@ -37,84 +37,66 @@ lib/epiphany/%%EPHY_VERSION%%/plugins/libdesktopfileplugin.la
 lib/epiphany/%%EPHY_VERSION%%/plugins/libdesktopfileplugin.so
 libdata/pkgconfig/epiphany-%%EPHY_VERSION%%.pc
 share/aclocal/epiphany.m4
+share/applications/bme.desktop
+share/applications/epiphany.desktop
 share/dbus-1/services/org.gnome.Epiphany.service
-%%DOCSDIR%%/EphyCommandManager.html
-%%DOCSDIR%%/EphyEmbed.html
-%%DOCSDIR%%/EphyNodeDb.html
-%%DOCSDIR%%/EphyTab.html
-%%DOCSDIR%%/EphyWindow.html
-%%DOCSDIR%%/ch01.html
-%%DOCSDIR%%/ch02.html
-%%DOCSDIR%%/epiphany-EphyEmbedFactory.html
-%%DOCSDIR%%/epiphany-EphyEmbedPersist.html
-%%DOCSDIR%%/epiphany-EphyEmbedSingle.html
-%%DOCSDIR%%/epiphany-EphyExtensionsManager.html
-%%DOCSDIR%%/epiphany-EphyGlade.html
-%%DOCSDIR%%/epiphany-EphyPermissionManager.html
-%%DOCSDIR%%/epiphany-ephy-cookie-manager.html
-%%DOCSDIR%%/epiphany-ephy-password-manager.html
-%%DOCSDIR%%/epiphany-ephy-session.html
-%%DOCSDIR%%/epiphany-ephy-shell.html
-%%DOCSDIR%%/epiphany.devhelp
-%%DOCSDIR%%/epiphany.devhelp2
-%%DOCSDIR%%/home.png
-%%DOCSDIR%%/index.html
-%%DOCSDIR%%/index.sgml
-%%DOCSDIR%%/left.png
-%%DOCSDIR%%/right.png
-%%DOCSDIR%%/style.css
-%%DOCSDIR%%/up.png
-share/gnome/applications/bme.desktop
-share/gnome/applications/epiphany.desktop
-share/gnome/epiphany/about.ini
-share/gnome/epiphany/chrome/branding/brand.dtd
-share/gnome/epiphany/chrome/branding/brand.properties
-share/gnome/epiphany/chrome/epiphany.manifest
-share/gnome/epiphany/chrome/global/about.xhtml
-share/gnome/epiphany/default-prefs.js
-share/gnome/epiphany/ephy-xml2ini.xsl
-share/gnome/epiphany/epiphany-bookmark-editor-ui.xml
-share/gnome/epiphany/epiphany-bookmarks-html.xsl
-share/gnome/epiphany/epiphany-bookmarksbar.xml
-share/gnome/epiphany/epiphany-fs-toolbar.xml
-share/gnome/epiphany/epiphany-history-window-ui.xml
-share/gnome/epiphany/epiphany-toolbar.xml
-share/gnome/epiphany/epiphany-ui.xml
-share/gnome/epiphany/epiphany.xhtml
-share/gnome/epiphany/glade/certificate-dialogs.glade
-share/gnome/epiphany/glade/epiphany.glade
-share/gnome/epiphany/glade/form-signing-dialog.glade
-share/gnome/epiphany/glade/prefs-dialog.glade
-share/gnome/epiphany/glade/print.glade
-share/gnome/epiphany/icons/hicolor/16x16/actions/bookmark-view.png
-share/gnome/epiphany/icons/hicolor/16x16/actions/bookmark-web.png
-share/gnome/epiphany/icons/hicolor/16x16/actions/download.png
-share/gnome/epiphany/icons/hicolor/16x16/actions/history-view.png
-share/gnome/epiphany/icons/hicolor/16x16/actions/location-entry.png
-share/gnome/epiphany/icons/hicolor/16x16/status/popup-hidden.png
-share/gnome/epiphany/icons/hicolor/22x22/actions/bookmark-view.png
-share/gnome/epiphany/icons/hicolor/22x22/actions/bookmark-web.png
-share/gnome/epiphany/icons/hicolor/22x22/actions/download.png
-share/gnome/epiphany/icons/hicolor/22x22/actions/history-view.png
-share/gnome/epiphany/icons/hicolor/22x22/actions/location-entry.png
-share/gnome/epiphany/icons/hicolor/22x22/status/popup-hidden.png
-share/gnome/epiphany/icons/hicolor/24x24/actions/bookmark-view.png
-share/gnome/epiphany/icons/hicolor/24x24/actions/bookmark-web.png
-share/gnome/epiphany/icons/hicolor/24x24/actions/download.png
-share/gnome/epiphany/icons/hicolor/24x24/actions/history-view.png
-share/gnome/epiphany/icons/hicolor/24x24/actions/location-entry.png
-share/gnome/epiphany/icons/hicolor/24x24/status/popup-hidden.png
-share/gnome/epiphany/icons/hicolor/32x32/actions/bookmark-view.png
-share/gnome/epiphany/icons/hicolor/32x32/actions/download.png
-share/gnome/epiphany/icons/hicolor/32x32/actions/history-view.png
-share/gnome/epiphany/icons/hicolor/32x32/actions/location-entry.png
-share/gnome/epiphany/icons/hicolor/32x32/status/popup-hidden.png
-share/gnome/epiphany/icons/hicolor/scalable/actions/bookmark-view.svg
-share/gnome/epiphany/icons/hicolor/scalable/actions/download.svg
-share/gnome/epiphany/icons/hicolor/scalable/actions/history-view.svg
-share/gnome/epiphany/icons/hicolor/scalable/actions/location-entry.svg
-share/gnome/epiphany/icons/hicolor/scalable/status/popup-hidden.svg
-share/gnome/epiphany/mime-types-permissions.xml
+%%DATADIR%%/about.ini
+%%DATADIR%%/chrome/branding/brand.dtd
+%%DATADIR%%/chrome/branding/brand.properties
+%%DATADIR%%/chrome/epiphany.manifest
+%%DATADIR%%/chrome/global/about.xhtml
+%%DATADIR%%/default-prefs.js
+%%DATADIR%%/ephy-xml2ini.xsl
+%%DATADIR%%/epiphany-bookmark-editor-ui.xml
+%%DATADIR%%/epiphany-bookmarks-html.xsl
+%%DATADIR%%/epiphany-bookmarksbar.xml
+%%DATADIR%%/epiphany-fs-toolbar.xml
+%%DATADIR%%/epiphany-history-window-ui.xml
+%%DATADIR%%/epiphany-toolbar.xml
+%%DATADIR%%/epiphany-ui.xml
+%%DATADIR%%/epiphany.xhtml
+%%DATADIR%%/glade/certificate-dialogs.glade
+%%DATADIR%%/glade/epiphany.glade
+%%DATADIR%%/glade/form-signing-dialog.glade
+%%DATADIR%%/glade/prefs-dialog.glade
+%%DATADIR%%/glade/print.glade
+%%DATADIR%%/icons/hicolor/16x16/actions/bookmark-view.png
+%%DATADIR%%/icons/hicolor/16x16/actions/history-view.png
+%%DATADIR%%/icons/hicolor/16x16/actions/location-entry.png
+%%DATADIR%%/icons/hicolor/16x16/places/bookmark-web.png
+%%DATADIR%%/icons/hicolor/16x16/status/lock-broken.png
+%%DATADIR%%/icons/hicolor/16x16/status/lock-insecure.png
+%%DATADIR%%/icons/hicolor/16x16/status/lock-secure-checked.png
+%%DATADIR%%/icons/hicolor/16x16/status/lock-secure.png
+%%DATADIR%%/icons/hicolor/16x16/status/popup-hidden.png
+%%DATADIR%%/icons/hicolor/22x22/actions/bookmark-view.png
+%%DATADIR%%/icons/hicolor/22x22/actions/history-view.png
+%%DATADIR%%/icons/hicolor/22x22/actions/location-entry.png
+%%DATADIR%%/icons/hicolor/22x22/places/bookmark-web.png
+%%DATADIR%%/icons/hicolor/22x22/status/popup-hidden.png
+%%DATADIR%%/icons/hicolor/24x24/actions/bookmark-view.png
+%%DATADIR%%/icons/hicolor/24x24/actions/history-view.png
+%%DATADIR%%/icons/hicolor/24x24/actions/location-entry.png
+%%DATADIR%%/icons/hicolor/24x24/places/bookmark-web.png
+%%DATADIR%%/icons/hicolor/24x24/status/lock-broken.png
+%%DATADIR%%/icons/hicolor/24x24/status/lock-insecure.png
+%%DATADIR%%/icons/hicolor/24x24/status/lock-secure-checked.png
+%%DATADIR%%/icons/hicolor/24x24/status/lock-secure.png
+%%DATADIR%%/icons/hicolor/24x24/status/popup-hidden.png
+%%DATADIR%%/icons/hicolor/32x32/actions/bookmark-view.png
+%%DATADIR%%/icons/hicolor/32x32/actions/history-view.png
+%%DATADIR%%/icons/hicolor/32x32/actions/location-entry.png
+%%DATADIR%%/icons/hicolor/32x32/actions/location-entry.svg
+%%DATADIR%%/icons/hicolor/32x32/status/popup-hidden.png
+%%DATADIR%%/icons/hicolor/48x48/status/lock-broken.png
+%%DATADIR%%/icons/hicolor/48x48/status/lock-insecure.png
+%%DATADIR%%/icons/hicolor/48x48/status/lock-secure-checked.png
+%%DATADIR%%/icons/hicolor/48x48/status/lock-secure.png
+%%DATADIR%%/icons/hicolor/scalable/actions/bookmark-view.svg
+%%DATADIR%%/icons/hicolor/scalable/actions/history-view.svg
+%%DATADIR%%/icons/hicolor/scalable/actions/location-entry.svg
+%%DATADIR%%/icons/hicolor/scalable/status/popup-hidden.svg
+%%DATADIR%%/mime-types-permissions.xml
 share/gnome/help/epiphany/C/epiphany.xml
 share/gnome/help/epiphany/C/figures/ephy-addressbar-smartbookmark-screenshot.png
 share/gnome/help/epiphany/C/figures/ephy-bookmarkbar-smartbookmark-screenshot.png
@@ -126,6 +108,11 @@ share/gnome/help/epiphany/bg/figures/ephy-addressbar-smartbookmark-screenshot.pn
 share/gnome/help/epiphany/bg/figures/ephy-bookmarkbar-smartbookmark-screenshot.png
 share/gnome/help/epiphany/bg/figures/ephy-history-window-screenshot.png
 share/gnome/help/epiphany/bg/figures/ephy-screenshot.png
+share/gnome/help/epiphany/ca/epiphany.xml
+share/gnome/help/epiphany/ca/figures/ephy-addressbar-smartbookmark-screenshot.png
+share/gnome/help/epiphany/ca/figures/ephy-bookmarkbar-smartbookmark-screenshot.png
+share/gnome/help/epiphany/ca/figures/ephy-history-window-screenshot.png
+share/gnome/help/epiphany/ca/figures/ephy-screenshot.png
 share/gnome/help/epiphany/de/epiphany.xml
 share/gnome/help/epiphany/de/figures/ephy-addressbar-smartbookmark-screenshot.png
 share/gnome/help/epiphany/de/figures/ephy-bookmarkbar-smartbookmark-screenshot.png
@@ -176,6 +163,11 @@ share/gnome/help/epiphany/nl/figures/ephy-addressbar-smartbookmark-screenshot.pn
 share/gnome/help/epiphany/nl/figures/ephy-bookmarkbar-smartbookmark-screenshot.png
 share/gnome/help/epiphany/nl/figures/ephy-history-window-screenshot.png
 share/gnome/help/epiphany/nl/figures/ephy-screenshot.png
+share/gnome/help/epiphany/oc/epiphany.xml
+share/gnome/help/epiphany/oc/figures/ephy-addressbar-smartbookmark-screenshot.png
+share/gnome/help/epiphany/oc/figures/ephy-bookmarkbar-smartbookmark-screenshot.png
+share/gnome/help/epiphany/oc/figures/ephy-history-window-screenshot.png
+share/gnome/help/epiphany/oc/figures/ephy-screenshot.png
 share/gnome/help/epiphany/ru/epiphany.xml
 share/gnome/help/epiphany/ru/figures/ephy-addressbar-smartbookmark-screenshot.png
 share/gnome/help/epiphany/ru/figures/ephy-bookmarkbar-smartbookmark-screenshot.png
@@ -191,22 +183,15 @@ share/gnome/help/epiphany/uk/figures/ephy-addressbar-smartbookmark-screenshot.pn
 share/gnome/help/epiphany/uk/figures/ephy-bookmarkbar-smartbookmark-screenshot.png
 share/gnome/help/epiphany/uk/figures/ephy-history-window-screenshot.png
 share/gnome/help/epiphany/uk/figures/ephy-screenshot.png
-share/gnome/omf/epiphany/epiphany-C.omf
-share/gnome/omf/epiphany/epiphany-bg.omf
-share/gnome/omf/epiphany/epiphany-de.omf
-share/gnome/omf/epiphany/epiphany-el.omf
-share/gnome/omf/epiphany/epiphany-en_GB.omf
-share/gnome/omf/epiphany/epiphany-es.omf
-share/gnome/omf/epiphany/epiphany-eu.omf
-share/gnome/omf/epiphany/epiphany-fi.omf
-share/gnome/omf/epiphany/epiphany-fr.omf
-share/gnome/omf/epiphany/epiphany-it.omf
-share/gnome/omf/epiphany/epiphany-ja.omf
-share/gnome/omf/epiphany/epiphany-nl.omf
-share/gnome/omf/epiphany/epiphany-ru.omf
-share/gnome/omf/epiphany/epiphany-sv.omf
-share/gnome/omf/epiphany/epiphany-uk.omf
+share/icons/HighContrastLargePrint/48x48/apps/gnome-web-browser.png
+share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-web-browser.png
+share/icons/LowContrastLargePrint/48x48/apps/gnome-web-browser.png
+share/icons/hicolor/16x16/apps/gnome-web-browser.png
+share/icons/hicolor/22x22/apps/gnome-web-browser.png
+share/icons/hicolor/24x24/apps/gnome-web-browser.png
+share/icons/hicolor/32x32/apps/gnome-web-browser.png
 share/icons/hicolor/48x48/apps/epiphany-bookmarks.png
+share/icons/hicolor/scalable/apps/gnome-web-browser.svg
 share/locale/am/LC_MESSAGES/epiphany.mo
 share/locale/ar/LC_MESSAGES/epiphany.mo
 share/locale/az/LC_MESSAGES/epiphany.mo
@@ -267,6 +252,7 @@ share/locale/pt_BR/LC_MESSAGES/epiphany.mo
 share/locale/ro/LC_MESSAGES/epiphany.mo
 share/locale/ru/LC_MESSAGES/epiphany.mo
 share/locale/rw/LC_MESSAGES/epiphany.mo
+share/locale/si/LC_MESSAGES/epiphany.mo
 share/locale/sk/LC_MESSAGES/epiphany.mo
 share/locale/sl/LC_MESSAGES/epiphany.mo
 share/locale/sq/LC_MESSAGES/epiphany.mo
@@ -284,14 +270,33 @@ share/locale/wa/LC_MESSAGES/epiphany.mo
 share/locale/zh_CN/LC_MESSAGES/epiphany.mo
 share/locale/zh_HK/LC_MESSAGES/epiphany.mo
 share/locale/zh_TW/LC_MESSAGES/epiphany.mo
-%%PYTHON%%share/pygtk/2.0/defs/epiphany.defs
-@dirrm share/gnome/omf/epiphany
+share/omf/epiphany/epiphany-C.omf
+share/omf/epiphany/epiphany-bg.omf
+share/omf/epiphany/epiphany-ca.omf
+share/omf/epiphany/epiphany-de.omf
+share/omf/epiphany/epiphany-el.omf
+share/omf/epiphany/epiphany-en_GB.omf
+share/omf/epiphany/epiphany-es.omf
+share/omf/epiphany/epiphany-eu.omf
+share/omf/epiphany/epiphany-fi.omf
+share/omf/epiphany/epiphany-fr.omf
+share/omf/epiphany/epiphany-it.omf
+share/omf/epiphany/epiphany-ja.omf
+share/omf/epiphany/epiphany-nl.omf
+share/omf/epiphany/epiphany-oc.omf
+share/omf/epiphany/epiphany-ru.omf
+share/omf/epiphany/epiphany-sv.omf
+share/omf/epiphany/epiphany-uk.omf
+share/pygtk/2.0/defs/epiphany.defs
+@dirrm share/omf/epiphany
 @dirrm share/gnome/help/epiphany/uk/figures
 @dirrm share/gnome/help/epiphany/uk
 @dirrm share/gnome/help/epiphany/sv/figures
 @dirrm share/gnome/help/epiphany/sv
 @dirrm share/gnome/help/epiphany/ru/figures
 @dirrm share/gnome/help/epiphany/ru
+@dirrm share/gnome/help/epiphany/oc/figures
+@dirrm share/gnome/help/epiphany/oc
 @dirrm share/gnome/help/epiphany/nl/figures
 @dirrm share/gnome/help/epiphany/nl
 @dirrm share/gnome/help/epiphany/ja/figures
@@ -312,38 +317,45 @@ share/locale/zh_TW/LC_MESSAGES/epiphany.mo
 @dirrm share/gnome/help/epiphany/el
 @dirrm share/gnome/help/epiphany/de/figures
 @dirrm share/gnome/help/epiphany/de
+@dirrm share/gnome/help/epiphany/ca/figures
+@dirrm share/gnome/help/epiphany/ca
 @dirrm share/gnome/help/epiphany/bg/figures
 @dirrm share/gnome/help/epiphany/bg
 @dirrm share/gnome/help/epiphany/C/figures
 @dirrm share/gnome/help/epiphany/C
 @dirrm share/gnome/help/epiphany
-@dirrm share/gnome/epiphany/icons/hicolor/scalable/status
-@dirrm share/gnome/epiphany/icons/hicolor/scalable/actions
-@dirrm share/gnome/epiphany/icons/hicolor/scalable
-@dirrm share/gnome/epiphany/icons/hicolor/32x32/status
-@dirrm share/gnome/epiphany/icons/hicolor/32x32/actions
-@dirrm share/gnome/epiphany/icons/hicolor/32x32
-@dirrm share/gnome/epiphany/icons/hicolor/24x24/status
-@dirrm share/gnome/epiphany/icons/hicolor/24x24/actions
-@dirrm share/gnome/epiphany/icons/hicolor/24x24
-@dirrm share/gnome/epiphany/icons/hicolor/22x22/status
-@dirrm share/gnome/epiphany/icons/hicolor/22x22/actions
-@dirrm share/gnome/epiphany/icons/hicolor/22x22
-@dirrm share/gnome/epiphany/icons/hicolor/16x16/status
-@dirrm share/gnome/epiphany/icons/hicolor/16x16/actions
-@dirrm share/gnome/epiphany/icons/hicolor/16x16
-@dirrm share/gnome/epiphany/icons/hicolor
-@dirrm share/gnome/epiphany/icons
-@dirrm share/gnome/epiphany/glade
-@dirrm share/gnome/epiphany/chrome/global
-@dirrm share/gnome/epiphany/chrome/branding
-@dirrm share/gnome/epiphany/chrome
-@dirrm share/gnome/epiphany/art
-@dirrm share/gnome/epiphany
+@dirrm %%DATADIR%%/icons/hicolor/scalable/status
+@dirrm %%DATADIR%%/icons/hicolor/scalable/actions
+@dirrm %%DATADIR%%/icons/hicolor/scalable
+@dirrm %%DATADIR%%/icons/hicolor/48x48/status
+@dirrm %%DATADIR%%/icons/hicolor/48x48
+@dirrm %%DATADIR%%/icons/hicolor/32x32/status
+@dirrm %%DATADIR%%/icons/hicolor/32x32/actions
+@dirrm %%DATADIR%%/icons/hicolor/32x32
+@dirrm %%DATADIR%%/icons/hicolor/24x24/status
+@dirrm %%DATADIR%%/icons/hicolor/24x24/places
+@dirrm %%DATADIR%%/icons/hicolor/24x24/actions
+@dirrm %%DATADIR%%/icons/hicolor/24x24
+@dirrm %%DATADIR%%/icons/hicolor/22x22/status
+@dirrm %%DATADIR%%/icons/hicolor/22x22/places
+@dirrm %%DATADIR%%/icons/hicolor/22x22/actions
+@dirrm %%DATADIR%%/icons/hicolor/22x22
+@dirrm %%DATADIR%%/icons/hicolor/16x16/status
+@dirrm %%DATADIR%%/icons/hicolor/16x16/places
+@dirrm %%DATADIR%%/icons/hicolor/16x16/actions
+@dirrm %%DATADIR%%/icons/hicolor/16x16
+@dirrm %%DATADIR%%/icons/hicolor
+@dirrm %%DATADIR%%/icons
+@dirrm %%DATADIR%%/glade
+@dirrm %%DATADIR%%/chrome/global
+@dirrm %%DATADIR%%/chrome/branding
+@dirrm %%DATADIR%%/chrome
+@dirrm %%DATADIR%%/art
+@dirrm %%DATADIR%%
 @dirrm %%DOCSDIR%%
-@dirrmtry lib/epiphany/%%EPHY_VERSION%%/plugins
-@dirrmtry lib/epiphany/%%EPHY_VERSION%%
-@dirrmtry lib/epiphany
+@dirrm lib/epiphany/%%EPHY_VERSION%%/plugins
+@dirrm lib/epiphany/%%EPHY_VERSION%%
+@dirrm lib/epiphany
 @dirrm include/epiphany/%%EPHY_VERSION%%/epiphany
 @dirrm include/epiphany/%%EPHY_VERSION%%
 @dirrm include/epiphany
@@ -353,6 +365,8 @@ share/locale/zh_TW/LC_MESSAGES/epiphany.mo
 @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
@@ -369,3 +383,4 @@ share/locale/zh_TW/LC_MESSAGES/epiphany.mo
 @dirrmtry share/locale/dz
 @dirrmtry share/locale/bn_IN/LC_MESSAGES
 @dirrmtry share/locale/bn_IN
+@dirrmtry share/applications
diff --git a/www/erwn/Makefile b/www/erwn/Makefile
index 47032f0678b7..8ddaff916e1b 100644
--- a/www/erwn/Makefile
+++ b/www/erwn/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	erwn
 PORTVERSION=	0.8
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	www editors
 MASTER_SITES=	http://lisas.de/erwin/
 DISTNAME=	erwin-${PORTVERSION}
diff --git a/www/erwn/pkg-plist b/www/erwn/pkg-plist
index d97e67ffb47c..6ea2bd7b1534 100644
--- a/www/erwn/pkg-plist
+++ b/www/erwn/pkg-plist
@@ -1,15 +1,15 @@
 bin/erwin
-share/gnome/erwin/bold.svg
-share/gnome/erwin/bold1.svg
-share/gnome/erwin/erwin-highlighting.xml
-share/gnome/erwin/h1.svg
-share/gnome/erwin/h11.svg
-share/gnome/erwin/h2.svg
-share/gnome/erwin/h22.svg
-share/gnome/erwin/h3.svg
-share/gnome/erwin/h33.svg
-share/gnome/erwin/small.svg
-share/gnome/pixmaps/erwin.xpm
-@dirrm share/gnome/erwin
+share/erwin/bold.svg
+share/erwin/bold1.svg
+share/erwin/erwin-highlighting.xml
+share/erwin/h1.svg
+share/erwin/h11.svg
+share/erwin/h2.svg
+share/erwin/h22.svg
+share/erwin/h3.svg
+share/erwin/h33.svg
+share/erwin/small.svg
+share/pixmaps/erwin.xpm
+@dirrm share/erwin
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/www/evolution-webcal/Makefile b/www/evolution-webcal/Makefile
index ee02ac1c1abe..105f4fc1eadf 100644
--- a/www/evolution-webcal/Makefile
+++ b/www/evolution-webcal/Makefile
@@ -3,12 +3,11 @@
 # Whom:					Koop Mast <kwm@rainbow-runner.nl>
 #
 # $FreeBSD$
-#   $MCom: ports/www/evolution-webcal/Makefile,v 1.46 2007/03/13 20:47:20 mezz Exp $
+#   $MCom: ports/www/evolution-webcal/Makefile,v 1.50 2007/09/16 16:52:22 ahze Exp $
 #
 
 PORTNAME=	webcal
-PORTVERSION=	2.10.0
-PORTREVISION=	2
+PORTVERSION=	2.12.0
 CATEGORIES=	www gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PKGNAMEPREFIX}${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/www/evolution-webcal/distinfo b/www/evolution-webcal/distinfo
index 1e808f3dd7a0..882d3aec8b85 100644
--- a/www/evolution-webcal/distinfo
+++ b/www/evolution-webcal/distinfo
@@ -1,3 +1,3 @@
-MD5 (evolution-webcal-2.10.0.tar.bz2) = a29004e6e1ad977845ed7c68963c8925
-SHA256 (evolution-webcal-2.10.0.tar.bz2) = 4017850f067d1b08f7b76b94988978f8f63ecfc8d201c910ea5d6119097add15
-SIZE (evolution-webcal-2.10.0.tar.bz2) = 163306
+MD5 (evolution-webcal-2.12.0.tar.bz2) = 21e77fa081decb87ce641f3a77245864
+SHA256 (evolution-webcal-2.12.0.tar.bz2) = f8445c3d93af4f8f4f325c5eb3fa94093f9eb299171a0983056d069e9658fc00
+SIZE (evolution-webcal-2.12.0.tar.bz2) = 193553
diff --git a/www/evolution-webcal/pkg-plist b/www/evolution-webcal/pkg-plist
index faa941663b8f..82f6d353b2fe 100644
--- a/www/evolution-webcal/pkg-plist
+++ b/www/evolution-webcal/pkg-plist
@@ -41,6 +41,7 @@ share/locale/ms/LC_MESSAGES/evolution-webcal.mo
 share/locale/nb/LC_MESSAGES/evolution-webcal.mo
 share/locale/ne/LC_MESSAGES/evolution-webcal.mo
 share/locale/nl/LC_MESSAGES/evolution-webcal.mo
+share/locale/oc/LC_MESSAGES/evolution-webcal.mo
 share/locale/or/LC_MESSAGES/evolution-webcal.mo
 share/locale/pa/LC_MESSAGES/evolution-webcal.mo
 share/locale/pl/LC_MESSAGES/evolution-webcal.mo
@@ -49,6 +50,7 @@ share/locale/pt_BR/LC_MESSAGES/evolution-webcal.mo
 share/locale/ro/LC_MESSAGES/evolution-webcal.mo
 share/locale/ru/LC_MESSAGES/evolution-webcal.mo
 share/locale/rw/LC_MESSAGES/evolution-webcal.mo
+share/locale/si/LC_MESSAGES/evolution-webcal.mo
 share/locale/sk/LC_MESSAGES/evolution-webcal.mo
 share/locale/sl/LC_MESSAGES/evolution-webcal.mo
 share/locale/sq/LC_MESSAGES/evolution-webcal.mo
@@ -74,8 +76,12 @@ share/locale/zh_TW/LC_MESSAGES/evolution-webcal.mo
 @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/ky/LC_MESSAGES
diff --git a/www/galeon/Makefile b/www/galeon/Makefile
index 31b77a68cec4..0e2335912772 100644
--- a/www/galeon/Makefile
+++ b/www/galeon/Makefile
@@ -3,12 +3,12 @@
 # Whom:					Maxim Sobolev <sobomax@FreeBSD.org>
 #
 # $FreeBSD$
-#    $MCom: ports/www/galeon/Makefile,v 1.9 2006/07/27 18:09:47 mezz Exp $
+#    $MCom: ports/www/galeon/Makefile,v 1.14 2007/10/08 19:42:51 mezz Exp $
 #
 
 PORTNAME=	galeon
 PORTVERSION=	2.0.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://osdn.dl.sourceforge.net/sourceforge/galeon/
@@ -29,14 +29,14 @@ USE_GMAKE=	yes
 USE_GETTEXT=	yes
 CONFIGURE_ARGS=	--enable-nautilus-view=no \
 		--with-mozilla=${GECKO}
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS}" \
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
 		LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
 
 MAN1=		galeon.1
 GCONF_SCHEMAS=	galeon.schemas
 
 .include <bsd.port.pre.mk>
-.include "${.CURDIR}/../../www/mozilla/bsd.gecko.mk"
+.include "${PORTSDIR}/www/mozilla/bsd.gecko.mk"
 
 # Galeon does not build correctly in -CURRENT if -Werror is passed
 # to the compiler.
@@ -54,7 +54,7 @@ post-patch:
 		's|malloc\.h|stdlib.h|g'
 	@${REINPLACE_CMD} -e 's|@prefix@/@DATADIRNAME@|@datadir@|g' \
 		${WRKSRC}/ui/galeon-bookmarks-editor-ui.xml.in
-	@${REINPLACE_CMD} -e 's|/usr/lib/mozilla/plugins|${LOCALBASE}/lib/browser_plugins:${X11BASE}/lib/browser_plugins:${LOCALBASE}/lib/browser_linux_plugins:${X11BASE}/lib/browser_linux_plugins|' \
+	@${REINPLACE_CMD} -e 's|/usr/lib/mozilla/plugins|${LOCALBASE}/lib/browser_plugins:${LOCALBASE}/lib/browser_linux_plugins|' \
 		${WRKSRC}/mozilla/mozilla-embed-shell.cpp
 
 .include <bsd.port.post.mk>
diff --git a/www/galeon/pkg-plist b/www/galeon/pkg-plist
index c2136ee67bb4..127a1bd68cd6 100644
--- a/www/galeon/pkg-plist
+++ b/www/galeon/pkg-plist
@@ -3,72 +3,72 @@ bin/galeon-config-tool
 etc/sound/events/galeon.soundlist
 libdata/bonobo/servers/GNOME_Galeon_Automation.server
 libdata/bonobo/servers/GNOME_Galeon_NautilusView.server
-share/gnome/applications/galeon.desktop
-share/gnome/galeon/FAQ.html
-share/gnome/galeon/about_logo.png
-share/gnome/galeon/autoscroll.xpm
-share/gnome/galeon/bookmarks-editor-small.glade
-share/gnome/galeon/bookmarks-editor.glade
-share/gnome/galeon/bookmarks.glade
-share/gnome/galeon/bug.png
-share/gnome/galeon/certificate-dialogs.glade
-share/gnome/galeon/chrome/branding/brand.dtd
-share/gnome/galeon/chrome/branding/brand.properties
-share/gnome/galeon/chrome/galeon.manifest
-share/gnome/galeon/chrome/global/about.xhtml
-share/gnome/galeon/debian.png
-share/gnome/galeon/default-bookmarks.xbel
-share/gnome/galeon/default-prefs.js
-share/gnome/galeon/fetch_favicon.xpm
-share/gnome/galeon/freshmeat.png
-share/gnome/galeon/galeon-bookmark-alias-mark.png
-share/gnome/galeon/galeon-default.png
-share/gnome/galeon/galeon-download.png
-share/gnome/galeon/galeon-egg-ui-toolbar.xml
-share/gnome/galeon/galeon-egg-ui.xml
-share/gnome/galeon/galeon-entry.png
-share/gnome/galeon/galeon-filter.png
-share/gnome/galeon/galeon-folder.png
-share/gnome/galeon/galeon-history.png
-share/gnome/galeon/galeon-insecure.png
-share/gnome/galeon/galeon-popup-blocked.png
-share/gnome/galeon/galeon-prefs-fonts.png
-share/gnome/galeon/galeon-prefs-general.png
-share/gnome/galeon/galeon-prefs-language.png
-share/gnome/galeon/galeon-prefs-mouse.png
-share/gnome/galeon/galeon-prefs-network.png
-share/gnome/galeon/galeon-prefs-privacy.png
-share/gnome/galeon/galeon-prefs-tabs.png
-share/gnome/galeon/galeon-prefs-web-content.png
-share/gnome/galeon/galeon-secure.png
-share/gnome/galeon/galeon-separator.png
-share/gnome/galeon/galeon-tab-loading.gif
-share/gnome/galeon/galeon.glade
-share/gnome/galeon/galeon.png
-share/gnome/galeon/gnu.png
-share/gnome/galeon/google.png
-share/gnome/galeon/google_groups.png
-share/gnome/galeon/google_images.png
-share/gnome/galeon/hand-open.png
-share/gnome/galeon/imdb_movies.png
-share/gnome/galeon/logo.png
-share/gnome/galeon/myportal.css
-share/gnome/galeon/new_alias.xpm
-share/gnome/galeon/new_alias_small.xpm
-share/gnome/galeon/new_folder.xpm
-share/gnome/galeon/new_folder_small.xpm
-share/gnome/galeon/new_item.xpm
-share/gnome/galeon/new_item_small.xpm
-share/gnome/galeon/new_separator.xpm
-share/gnome/galeon/new_separator_small.xpm
-share/gnome/galeon/prefs-dialog.glade
-share/gnome/galeon/print.glade
-share/gnome/galeon/rpm.png
-share/gnome/galeon/slack.png
-share/gnome/galeon/smart-bm-fold.png
-share/gnome/galeon/smart-bm-unfold.png
-share/gnome/galeon/stocks.png
-share/gnome/gnome-2.0/ui/galeon-bookmarks-editor-ui.xml
+share/applications/galeon.desktop
+share/galeon/FAQ.html
+share/galeon/about_logo.png
+share/galeon/autoscroll.xpm
+share/galeon/bookmarks-editor-small.glade
+share/galeon/bookmarks-editor.glade
+share/galeon/bookmarks.glade
+share/galeon/bug.png
+share/galeon/certificate-dialogs.glade
+share/galeon/chrome/branding/brand.dtd
+share/galeon/chrome/branding/brand.properties
+share/galeon/chrome/galeon.manifest
+share/galeon/chrome/global/about.xhtml
+share/galeon/debian.png
+share/galeon/default-bookmarks.xbel
+share/galeon/default-prefs.js
+share/galeon/fetch_favicon.xpm
+share/galeon/freshmeat.png
+share/galeon/galeon-bookmark-alias-mark.png
+share/galeon/galeon-default.png
+share/galeon/galeon-download.png
+share/galeon/galeon-egg-ui-toolbar.xml
+share/galeon/galeon-egg-ui.xml
+share/galeon/galeon-entry.png
+share/galeon/galeon-filter.png
+share/galeon/galeon-folder.png
+share/galeon/galeon-history.png
+share/galeon/galeon-insecure.png
+share/galeon/galeon-popup-blocked.png
+share/galeon/galeon-prefs-fonts.png
+share/galeon/galeon-prefs-general.png
+share/galeon/galeon-prefs-language.png
+share/galeon/galeon-prefs-mouse.png
+share/galeon/galeon-prefs-network.png
+share/galeon/galeon-prefs-privacy.png
+share/galeon/galeon-prefs-tabs.png
+share/galeon/galeon-prefs-web-content.png
+share/galeon/galeon-secure.png
+share/galeon/galeon-separator.png
+share/galeon/galeon-tab-loading.gif
+share/galeon/galeon.glade
+share/galeon/galeon.png
+share/galeon/gnu.png
+share/galeon/google.png
+share/galeon/google_groups.png
+share/galeon/google_images.png
+share/galeon/hand-open.png
+share/galeon/imdb_movies.png
+share/galeon/logo.png
+share/galeon/myportal.css
+share/galeon/new_alias.xpm
+share/galeon/new_alias_small.xpm
+share/galeon/new_folder.xpm
+share/galeon/new_folder_small.xpm
+share/galeon/new_item.xpm
+share/galeon/new_item_small.xpm
+share/galeon/new_separator.xpm
+share/galeon/new_separator_small.xpm
+share/galeon/prefs-dialog.glade
+share/galeon/print.glade
+share/galeon/rpm.png
+share/galeon/slack.png
+share/galeon/smart-bm-fold.png
+share/galeon/smart-bm-unfold.png
+share/galeon/stocks.png
+share/gnome-2.0/ui/galeon-bookmarks-editor-ui.xml
 share/gnome/help/galeon/C/apx-authors.xml
 share/gnome/help/galeon/C/apx-bugs.xml
 share/gnome/help/galeon/C/apx-command-line.xml
@@ -159,10 +159,10 @@ share/gnome/help/galeon/es/other-tools.xml
 share/gnome/help/galeon/es/plugins.xml
 share/gnome/help/galeon/es/preface.xml
 share/gnome/help/galeon/es/preferences.xml
-share/gnome/omf/galeon/galeon-C.omf
-share/gnome/omf/galeon/galeon-es.omf
-share/gnome/pixmaps/galeon.png
-share/gnome/sounds/galeon/clicked.wav
+share/omf/galeon/galeon-C.omf
+share/omf/galeon/galeon-es.omf
+share/pixmaps/galeon.png
+share/sounds/galeon/clicked.wav
 share/locale/am/LC_MESSAGES/galeon-2.0.mo
 share/locale/az/LC_MESSAGES/galeon-2.0.mo
 share/locale/be/LC_MESSAGES/galeon-2.0.mo
@@ -217,20 +217,21 @@ share/locale/wa/LC_MESSAGES/galeon-2.0.mo
 share/locale/zh_CN/LC_MESSAGES/galeon-2.0.mo
 share/locale/zh_HK/LC_MESSAGES/galeon-2.0.mo
 share/locale/zh_TW/LC_MESSAGES/galeon-2.0.mo
-@dirrm share/gnome/sounds/galeon
-@dirrm share/gnome/omf/galeon
+@dirrm share/sounds/galeon
+@dirrm share/omf/galeon
 @dirrm share/gnome/help/galeon/es/figures
 @dirrm share/gnome/help/galeon/es
 @dirrm share/gnome/help/galeon/C/figures
 @dirrm share/gnome/help/galeon/C
 @dirrm share/gnome/help/galeon
-@dirrm share/gnome/galeon/chrome/global
-@dirrm share/gnome/galeon/chrome/branding
-@dirrm share/gnome/galeon/chrome
-@dirrm share/gnome/galeon
+@dirrm share/galeon/chrome/global
+@dirrm share/galeon/chrome/branding
+@dirrm share/galeon/chrome
+@dirrm share/galeon
 @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/zh_HK/LC_MESSAGES
 @dirrmtry share/locale/zh_HK
 @dirrmtry share/locale/rw/LC_MESSAGES
 @dirrmtry share/locale/rw
+@dirrmtry share/applications
diff --git a/www/gnome-user-share/Makefile b/www/gnome-user-share/Makefile
index 6dff469968db..4fa187f73b50 100644
--- a/www/gnome-user-share/Makefile
+++ b/www/gnome-user-share/Makefile
@@ -3,11 +3,11 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#
+#    $MCom: ports/www/gnome-user-share/Makefile,v 1.5 2007/05/19 21:36:26 marcus Exp $
 
 PORTNAME=	gnome-user-share
 PORTVERSION=	0.11
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www deskutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/0.11
diff --git a/www/gnome-user-share/files/patch-user_share.c b/www/gnome-user-share/files/patch-user_share.c
deleted file mode 100644
index 352588ade5ac..000000000000
--- a/www/gnome-user-share/files/patch-user_share.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- user_share.c.orig	Tue Nov  8 10:41:50 2005
-+++ user_share.c	Thu Nov 10 13:38:07 2005
-@@ -252,8 +252,8 @@ howl_input (GIOChannel  *io_channel,
- 			gpointer     callback_data)
- {
- 	sw_discovery session;
--	session = callback_data;
- 	sw_salt salt;
-+	session = callback_data;
- 
- 	if (sw_discovery_salt (session, &salt) == SW_OKAY) {
- 		sw_salt_lock (salt);
diff --git a/www/gnome-user-share/pkg-plist b/www/gnome-user-share/pkg-plist
index 218573008460..f2908b82a8fc 100644
--- a/www/gnome-user-share/pkg-plist
+++ b/www/gnome-user-share/pkg-plist
@@ -1,11 +1,11 @@
 bin/gnome-file-share-properties
 libexec/gnome-user-share
-share/gnome/applications/gnome-user-share-properties.desktop
-share/gnome/gnome-user-share/dav_groupfile
-share/gnome/gnome-user-share/dav_user.conf
-share/gnome/gnome-user-share/dav_user_2.0.conf
-share/gnome/gnome-user-share/dav_user_2.2.conf
-share/gnome/gnome-user-share/file-share-properties.glade
+share/applications/gnome-user-share-properties.desktop
+share/gnome-user-share/dav_groupfile
+share/gnome-user-share/dav_user.conf
+share/gnome-user-share/dav_user_2.0.conf
+share/gnome-user-share/dav_user_2.2.conf
+share/gnome-user-share/file-share-properties.glade
 share/locale/ar/LC_MESSAGES/gnome-user-share.mo
 share/locale/bg/LC_MESSAGES/gnome-user-share.mo
 share/locale/ca/LC_MESSAGES/gnome-user-share.mo
@@ -38,6 +38,9 @@ share/locale/sv/LC_MESSAGES/gnome-user-share.mo
 share/locale/uk/LC_MESSAGES/gnome-user-share.mo
 share/locale/vi/LC_MESSAGES/gnome-user-share.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-user-share.mo
-@dirrm share/locale/dz/LC_MESSAGES
-@dirrm share/locale/dz
-@dirrm share/gnome/gnome-user-share
+@dirrm share/gnome-user-share
+@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/www/gnome-web-photo/Makefile b/www/gnome-web-photo/Makefile
index aa8336d5d467..f236d96b8f47 100644
--- a/www/gnome-web-photo/Makefile
+++ b/www/gnome-web-photo/Makefile
@@ -3,12 +3,13 @@
 # Whom:			Michael Johnson <ahze@FreeBSD.org>
 #
 # $FreeBSD$
-#    $MCom: ports/www/gnome-web-photo/Makefile,v 1.3 2006/08/20 01:51:48 mezz Exp $
+#   $MCom: ports/www/gnome-web-photo/Makefile,v 1.5 2007/08/07 03:27:32 mezz Exp $
+#
 #
 
 PORTNAME=	gnome-web-photo
 PORTVERSION=	0.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/0.2
diff --git a/www/gnome-web-photo/pkg-plist b/www/gnome-web-photo/pkg-plist
index 816a430a88e0..5e0f7dedbbaf 100644
--- a/www/gnome-web-photo/pkg-plist
+++ b/www/gnome-web-photo/pkg-plist
@@ -1,6 +1,6 @@
 bin/gnome-web-photo
 bin/gnome-web-print
 bin/gnome-web-thumbnail
-share/gnome/gnome-web-photo/prefs.js
-share/gnome/gnome-web-photo/style.css
-@dirrm share/gnome/gnome-web-photo
+share/gnome-web-photo/prefs.js
+share/gnome-web-photo/style.css
+@dirrm share/gnome-web-photo
diff --git a/www/gtkhtml/Makefile b/www/gtkhtml/Makefile
index 1561810ba991..14f2f22ad71c 100644
--- a/www/gtkhtml/Makefile
+++ b/www/gtkhtml/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gtkhtml
 PORTVERSION=	1.1.10
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	www gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/1.1
@@ -40,7 +40,6 @@ LIB_DEPENDS+=	soup.6:${PORTSDIR}/devel/soup
 post-configure:
 	@${SED} -e 's|%%PREFIX%%|${PREFIX}|g ; \
 		s|%%LOCALBASE%%|${LOCALBASE}|g ; \
-		s|%%X11BASE%%|${X11BASE}|g ; \
 		s|%%VERSION%%|${VERSION}|g' ${FILESDIR}/gtkhtmlConf.sh \
 			> ${WRKSRC}/gtkhtmlConf.sh
 
diff --git a/www/gtkhtml/files/gtkhtmlConf.sh b/www/gtkhtml/files/gtkhtmlConf.sh
index 4dc806a68c1b..12cee8fa1e2d 100644
--- a/www/gtkhtml/files/gtkhtmlConf.sh
+++ b/www/gtkhtml/files/gtkhtmlConf.sh
@@ -1,5 +1,5 @@
 GTKHTML_LIBDIR="-L%%PREFIX%%/lib"
-GTKHTML_LIBS=" -L%%PREFIX%%/lib -lgtkhtml-1.1 -Wl,-E -L%%X11BASE%%/lib -L%%LOCALBASE%%/lib -lgal -lgnomeprint -lfreetype -lglade-gnome -lglade -lxml -lXpm -ljpeg -lgnomeui -lart_lgpl -lgdk_imlib -ltiff -lungif -lpng -lz -lSM -lICE -lgnome -lgnomesupport -lesd -laudiofile -lgdk_pixbuf -lgtk-12 -lgdk-12 -lgmodule-12 -lglib-12 -lintl -lXi -lXext -lX11 -lm -lgnomecanvaspixbuf -liconv -Wl,-E -L%%X11BASE%%/lib -L%%LOCALBASE%%/lib -lgconf-gtk-1 -lgconf-1 -loaf -lORBitCosNaming -lORBit -lIIOP -lORBitutil -lwrap -lgtk-12 -lgdk-12 -lgmodule-12 -lglib-12 -lintl -lXi -lXext -lX11 -lm"
-GTKHTML_INCLUDEDIR="-I%%PREFIX%%/include -I%%PREFIX%%/include/gtkhtml-1.1 -I%%LOCALBASE%%/include/gdk-pixbuf-1.0 -I%%LOCALBASE%%/include/gtk12 -I%%LOCALBASE%%/include/glib12 -I%%LOCALBASE%%/include -I%%X11BASE%%/include -I%%LOCALBASE%%/include/gnome-1.0 -I%%LOCALBASE%%/include/freetype2 -DNEED_GNOMESUPPORT_H -I%%LOCALBASE%%/lib/gnome-libs/include -I%%LOCALBASE%%/include/gnome-xml -I%%LOCALBASE%%/include/libglade-1.0 -I%%LOCALBASE%%/include/gconf/1 -I%%X11BASE%%/include -I%%LOCALBASE%%/include/glib12 -I%%LOCALBASE%%/include/orbit-1.0 -I%%LOCALBASE%%/include -I%%LOCALBASE%%/include/gtk12 -DGTKHTML_HAVE_GCONF"
-GTKHTML_DATADIR="%%PREFIX%%/share/gnome"
+GTKHTML_LIBS=" -L%%PREFIX%%/lib -lgtkhtml-1.1 -Wl,-E -L%%LOCALBASE%%/lib -lgal -lgnomeprint -lfreetype -lglade-gnome -lglade -lxml -lXpm -ljpeg -lgnomeui -lart_lgpl -lgdk_imlib -ltiff -lungif -lpng -lz -lSM -lICE -lgnome -lgnomesupport -lesd -laudiofile -lgdk_pixbuf -lgtk-12 -lgdk-12 -lgmodule-12 -lglib-12 -lintl -lXi -lXext -lX11 -lm -lgnomecanvaspixbuf -liconv -Wl,-E -L%%LOCALBASE%%/lib -lgconf-gtk-1 -lgconf-1 -loaf -lORBitCosNaming -lORBit -lIIOP -lORBitutil -lwrap -lgtk-12 -lgdk-12 -lgmodule-12 -lglib-12 -lintl -lXi -lXext -lX11 -lm"
+GTKHTML_INCLUDEDIR="-I%%PREFIX%%/include -I%%PREFIX%%/include/gtkhtml-1.1 -I%%LOCALBASE%%/include/gdk-pixbuf-1.0 -I%%LOCALBASE%%/include/gtk12 -I%%LOCALBASE%%/include/glib12 -I%%LOCALBASE%%/include -I%%LOCALBASE%%/include/gnome-1.0 -I%%LOCALBASE%%/include/freetype2 -DNEED_GNOMESUPPORT_H -I%%LOCALBASE%%/lib/gnome-libs/include -I%%LOCALBASE%%/include/gnome-xml -I%%LOCALBASE%%/include/libglade-1.0 -I%%LOCALBASE%%/include/gconf/1 -I%%LOCALBASE%%/include/glib12 -I%%LOCALBASE%%/include/orbit-1.0 -I%%LOCALBASE%%/include -I%%LOCALBASE%%/include/gtk12 -DGTKHTML_HAVE_GCONF"
+GTKHTML_DATADIR="%%PREFIX%%/share"
 MODULE_VERSION="%%VERSION%%"
diff --git a/www/gtkhtml/files/patch-ad b/www/gtkhtml/files/patch-ad
deleted file mode 100644
index 863d79c3bdf9..000000000000
--- a/www/gtkhtml/files/patch-ad
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/gtkhtml.c.orig	Wed Sep  4 20:00:35 2002
-+++ src/gtkhtml.c	Wed Sep 18 21:40:55 2002
-@@ -4353,7 +4353,7 @@
- {
- 	gchar *rcfile;
- 
--	rcfile = g_strconcat ((from_share ? PREFIX "/share/gtkhtml-" GTKHTML_RELEASE "/" : gnome_util_user_home ()),
-+	rcfile = g_strconcat ((from_share ? PREFIX "/share/gnome/gtkhtml-" GTKHTML_RELEASE "/" : gnome_util_user_home ()),
- 			      (from_share ? "" : "/.gnome/"), name, NULL);
- 
- 	if (g_file_test (rcfile, G_FILE_TEST_ISFILE))
diff --git a/www/gtkhtml/files/patch-doc::Makefile.in b/www/gtkhtml/files/patch-doc::Makefile.in
index 575490af80ea..cc08c2029ff4 100644
--- a/www/gtkhtml/files/patch-doc::Makefile.in
+++ b/www/gtkhtml/files/patch-doc::Makefile.in
@@ -7,7 +7,7 @@ $FreeBSD$
  CFLAGS = @CFLAGS@ $(EXTRA_GNOME_CFLAGS)
  LDFLAGS = @LDFLAGS@ $(EXTRA_GNOME_LIBS)
  
--HTML_DIR = $(datadir)/html
+-HTML_DIR = $(datadir)/gnome/html
 +HTML_DIR = $(prefix)/share/doc/gtkhtml
  
  TARGET_DIR = $(HTML_DIR)/$(DOC_MODULE)
diff --git a/www/gtkhtml/pkg-plist b/www/gtkhtml/pkg-plist
index 4eae08527c73..946cd317d4c3 100644
--- a/www/gtkhtml/pkg-plist
+++ b/www/gtkhtml/pkg-plist
@@ -97,71 +97,69 @@ lib/libgtkhtml-1.1.la
 lib/libgtkhtml-1.1.so
 lib/libgtkhtml-1.1.so.3
 libdata/pkgconfig/gtkhtml-1.1.pc
+share/control-center/Documents/gtkhtml-properties.desktop
 %%DOCSDIR%%/gtkhtml-decl.txt
 %%DOCSDIR%%/gtkhtml-sections.txt
 %%DOCSDIR%%/gtkhtml.hierarchy
 %%DOCSDIR%%/gtkhtml.sgml
 %%DOCSDIR%%/gtkhtml.types
 share/gnome/apps/Settings/Documents/gtkhtml-properties.desktop
-share/gnome/control-center/Documents/gtkhtml-properties.desktop
-share/gnome/gtkhtml-1.1/Editor.idl
-share/gnome/gtkhtml-1.1/gtkhtml-capplet.glade
-share/gnome/gtkhtml-1.1/gtkhtml-editor-properties.glade
-share/gnome/gtkhtml-1.1/icons/16_copy.png
-share/gnome/gtkhtml-1.1/icons/16_cut.png
-share/gnome/gtkhtml-1.1/icons/16_paste.png
-share/gnome/gtkhtml-1.1/icons/24_copy.png
-share/gnome/gtkhtml-1.1/icons/24_cut.png
-share/gnome/gtkhtml-1.1/icons/24_paste.png
-share/gnome/gtkhtml-1.1/icons/bulb.png
-share/gnome/gtkhtml-1.1/icons/empty_image.png
-share/gnome/gtkhtml-1.1/icons/flowers.png
-share/gnome/gtkhtml-1.1/icons/html-viewer.png
-share/gnome/gtkhtml-1.1/icons/insert-image-16.png
-share/gnome/gtkhtml-1.1/icons/insert-image-24.png
-share/gnome/gtkhtml-1.1/icons/insert-link-16.png
-share/gnome/gtkhtml-1.1/icons/insert-link-24.png
-share/gnome/gtkhtml-1.1/icons/insert-object-16.png
-share/gnome/gtkhtml-1.1/icons/insert-object-24.png
-share/gnome/gtkhtml-1.1/icons/insert-rule-16.png
-share/gnome/gtkhtml-1.1/icons/insert-rule-24.png
-share/gnome/gtkhtml-1.1/icons/insert-table-16.png
-share/gnome/gtkhtml-1.1/icons/insert-table-24.png
-share/gnome/gtkhtml-1.1/icons/paper.png
-share/gnome/gtkhtml-1.1/icons/properties-16.png
-share/gnome/gtkhtml-1.1/icons/rect.png
-share/gnome/gtkhtml-1.1/icons/redo-16.png
-share/gnome/gtkhtml-1.1/icons/redo-24.png
-share/gnome/gtkhtml-1.1/icons/rule-blue-center.png
-share/gnome/gtkhtml-1.1/icons/rule-blue-left.png
-share/gnome/gtkhtml-1.1/icons/rule-blue-right.png
-share/gnome/gtkhtml-1.1/icons/rule-yellow-flowers-center.png
-share/gnome/gtkhtml-1.1/icons/rule-yellow-flowers-left.png
-share/gnome/gtkhtml-1.1/icons/rule-yellow-flowers-right.png
-share/gnome/gtkhtml-1.1/icons/search-16.png
-share/gnome/gtkhtml-1.1/icons/search-24.png
-share/gnome/gtkhtml-1.1/icons/search-and-replace-16.png
-share/gnome/gtkhtml-1.1/icons/search-and-replace-24.png
-share/gnome/gtkhtml-1.1/icons/smiley-1.png
-share/gnome/gtkhtml-1.1/icons/smiley-10.png
-share/gnome/gtkhtml-1.1/icons/smiley-11.png
-share/gnome/gtkhtml-1.1/icons/smiley-2.png
-share/gnome/gtkhtml-1.1/icons/smiley-3.png
-share/gnome/gtkhtml-1.1/icons/smiley-4.png
-share/gnome/gtkhtml-1.1/icons/smiley-5.png
-share/gnome/gtkhtml-1.1/icons/smiley-6.png
-share/gnome/gtkhtml-1.1/icons/smiley-8.png
-share/gnome/gtkhtml-1.1/icons/smiley-9.png
-share/gnome/gtkhtml-1.1/icons/texture.png
-share/gnome/gtkhtml-1.1/icons/transparent.png
-share/gnome/gtkhtml-1.1/icons/undo-16.png
-share/gnome/gtkhtml-1.1/icons/undo-24.png
-share/gnome/gtkhtml-1.1/keybindingsrc.emacs
-share/gnome/gtkhtml-1.1/keybindingsrc.ms
-share/gnome/gtkhtml-1.1/keybindingsrc.xemacs
-share/gnome/oaf/GNOME_GtkHTML_EBrowser.oaf
-share/gnome/oaf/GNOME_GtkHTML_Editor.oaf
 share/gnome/ui/GNOME_GtkHTML_Editor.xml
+share/gtkhtml-1.1/Editor.idl
+share/gtkhtml-1.1/gtkhtml-capplet.glade
+share/gtkhtml-1.1/gtkhtml-editor-properties.glade
+share/gtkhtml-1.1/icons/16_copy.png
+share/gtkhtml-1.1/icons/16_cut.png
+share/gtkhtml-1.1/icons/16_paste.png
+share/gtkhtml-1.1/icons/24_copy.png
+share/gtkhtml-1.1/icons/24_cut.png
+share/gtkhtml-1.1/icons/24_paste.png
+share/gtkhtml-1.1/icons/bulb.png
+share/gtkhtml-1.1/icons/empty_image.png
+share/gtkhtml-1.1/icons/flowers.png
+share/gtkhtml-1.1/icons/html-viewer.png
+share/gtkhtml-1.1/icons/insert-image-16.png
+share/gtkhtml-1.1/icons/insert-image-24.png
+share/gtkhtml-1.1/icons/insert-link-16.png
+share/gtkhtml-1.1/icons/insert-link-24.png
+share/gtkhtml-1.1/icons/insert-object-16.png
+share/gtkhtml-1.1/icons/insert-object-24.png
+share/gtkhtml-1.1/icons/insert-rule-16.png
+share/gtkhtml-1.1/icons/insert-rule-24.png
+share/gtkhtml-1.1/icons/insert-table-16.png
+share/gtkhtml-1.1/icons/insert-table-24.png
+share/gtkhtml-1.1/icons/paper.png
+share/gtkhtml-1.1/icons/properties-16.png
+share/gtkhtml-1.1/icons/rect.png
+share/gtkhtml-1.1/icons/redo-16.png
+share/gtkhtml-1.1/icons/redo-24.png
+share/gtkhtml-1.1/icons/rule-blue-center.png
+share/gtkhtml-1.1/icons/rule-blue-left.png
+share/gtkhtml-1.1/icons/rule-blue-right.png
+share/gtkhtml-1.1/icons/rule-yellow-flowers-center.png
+share/gtkhtml-1.1/icons/rule-yellow-flowers-left.png
+share/gtkhtml-1.1/icons/rule-yellow-flowers-right.png
+share/gtkhtml-1.1/icons/search-16.png
+share/gtkhtml-1.1/icons/search-24.png
+share/gtkhtml-1.1/icons/search-and-replace-16.png
+share/gtkhtml-1.1/icons/search-and-replace-24.png
+share/gtkhtml-1.1/icons/smiley-1.png
+share/gtkhtml-1.1/icons/smiley-10.png
+share/gtkhtml-1.1/icons/smiley-11.png
+share/gtkhtml-1.1/icons/smiley-2.png
+share/gtkhtml-1.1/icons/smiley-3.png
+share/gtkhtml-1.1/icons/smiley-4.png
+share/gtkhtml-1.1/icons/smiley-5.png
+share/gtkhtml-1.1/icons/smiley-6.png
+share/gtkhtml-1.1/icons/smiley-8.png
+share/gtkhtml-1.1/icons/smiley-9.png
+share/gtkhtml-1.1/icons/texture.png
+share/gtkhtml-1.1/icons/transparent.png
+share/gtkhtml-1.1/icons/undo-16.png
+share/gtkhtml-1.1/icons/undo-24.png
+share/gtkhtml-1.1/keybindingsrc.emacs
+share/gtkhtml-1.1/keybindingsrc.ms
+share/gtkhtml-1.1/keybindingsrc.xemacs
 share/locale/az/LC_MESSAGES/gtkhtml.mo
 share/locale/ca/LC_MESSAGES/gtkhtml.mo
 share/locale/cs/LC_MESSAGES/gtkhtml.mo
@@ -196,8 +194,10 @@ share/locale/uk/LC_MESSAGES/gtkhtml.mo
 share/locale/vi/LC_MESSAGES/gtkhtml.mo
 share/locale/zh_CN/LC_MESSAGES/gtkhtml.mo
 share/locale/zh_TW/LC_MESSAGES/gtkhtml.mo
-@dirrm share/gnome/gtkhtml-1.1/icons
-@dirrm share/gnome/gtkhtml-1.1
+share/oaf/GNOME_GtkHTML_EBrowser.oaf
+share/oaf/GNOME_GtkHTML_Editor.oaf
+@dirrm share/gtkhtml-1.1/icons
+@dirrm share/gtkhtml-1.1
 @dirrm %%DOCSDIR%%/gtkhtml
 @dirrm %%DOCSDIR%%
 @dirrm include/gtkhtml-1.1/gtkhtml
diff --git a/www/gtkhtml3/Makefile b/www/gtkhtml3/Makefile
index 9ab551e8c227..6024520b6ed4 100644
--- a/www/gtkhtml3/Makefile
+++ b/www/gtkhtml3/Makefile
@@ -3,11 +3,11 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/www/gtkhtml3/Makefile,v 1.98 2007/03/13 01:24:10 marcus Exp $
+#   $MCom: ports/www/gtkhtml3/Makefile,v 1.113 2007/10/15 14:28:31 ahze Exp $
 #
 
 PORTNAME=	gtkhtml3
-PORTVERSION=	3.14.3
+PORTVERSION=	3.16.1
 CATEGORIES=	www gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/3$//}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -31,4 +31,8 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 
 PLIST_SUB=	VERSION="3.14"
 
+post-patch:
+	@${REINPLACE_CMD} -e 's|@INTLTOOL_LIBDIR@|${LOCALBASE}/libdata|' \
+	    	${WRKSRC}/intltool-merge.in
+
 .include <bsd.port.mk>
diff --git a/www/gtkhtml3/distinfo b/www/gtkhtml3/distinfo
index 69a4c791ecc4..8c3bdb5b5032 100644
--- a/www/gtkhtml3/distinfo
+++ b/www/gtkhtml3/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gtkhtml-3.14.3.tar.bz2) = 7c028f07e0eb061b0a895ac514265cf1
-SHA256 (gnome2/gtkhtml-3.14.3.tar.bz2) = 6419265c9766de668bd553742d915df095bdab2737a4583f63e67242d3903832
-SIZE (gnome2/gtkhtml-3.14.3.tar.bz2) = 1283748
+MD5 (gnome2/gtkhtml-3.16.1.tar.bz2) = 71d2d115e3629a634e115b8c0b0fd5b5
+SHA256 (gnome2/gtkhtml-3.16.1.tar.bz2) = 47ab5cd171ba4c0932fc108d4ec45dc6a7bd3afd8ac9801e1d12c40c2c071b72
+SIZE (gnome2/gtkhtml-3.16.1.tar.bz2) = 1303349
diff --git a/www/gtkhtml3/files/patch-src_gtkhtml.c b/www/gtkhtml3/files/patch-src_gtkhtml.c
deleted file mode 100644
index cc9534035220..000000000000
--- a/www/gtkhtml3/files/patch-src_gtkhtml.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/gtkhtml.c.orig	Mon Aug 22 15:56:46 2005
-+++ src/gtkhtml.c	Mon Aug 22 18:56:03 2005
-@@ -3104,7 +3104,7 @@
- 	add_bindings (klass);
- 	gtk_html_accessibility_init ();
- 
--	filename = g_build_filename (PREFIX, "share", GTKHTML_RELEASE_STRING, "keybindingsrc.emacs", NULL);
-+	filename = g_build_filename (PREFIX, "share/gnome", GTKHTML_RELEASE_STRING, "keybindingsrc.emacs", NULL);
- 	gtk_rc_parse (filename);
- 	g_free (filename);
- 	html_class->emacs_bindings = gtk_binding_set_find ("gtkhtml-bindings-emacs");
diff --git a/www/gtkhtml3/pkg-plist b/www/gtkhtml3/pkg-plist
index 2f85980f058e..a084714f5c45 100644
--- a/www/gtkhtml3/pkg-plist
+++ b/www/gtkhtml3/pkg-plist
@@ -17,33 +17,34 @@ lib/libgtkhtml-%%VERSION%%.so
 lib/libgtkhtml-%%VERSION%%.so.19
 libdata/bonobo/servers/GNOME_GtkHTML_Editor-%%VERSION%%.server
 libdata/pkgconfig/libgtkhtml-%%VERSION%%.pc
-share/gnome/gtkhtml-%%VERSION%%/Editor.idl
-share/gnome/gtkhtml-%%VERSION%%/GNOME_GtkHTML_Editor-emacs.xml
-share/gnome/gtkhtml-%%VERSION%%/GNOME_GtkHTML_Editor.xml
-share/gnome/gtkhtml-%%VERSION%%/gtkhtml-editor-properties.glade
-share/gnome/gtkhtml-%%VERSION%%/icons/bulb.png
-share/gnome/gtkhtml-%%VERSION%%/icons/confidential-stamp.jpg
-share/gnome/gtkhtml-%%VERSION%%/icons/draft-paper.png
-share/gnome/gtkhtml-%%VERSION%%/icons/draft-stamp.jpg
-share/gnome/gtkhtml-%%VERSION%%/icons/empty_image.png
-share/gnome/gtkhtml-%%VERSION%%/icons/flowers.png
-share/gnome/gtkhtml-%%VERSION%%/icons/html-viewer.png
-share/gnome/gtkhtml-%%VERSION%%/icons/info_bulb.png
-share/gnome/gtkhtml-%%VERSION%%/icons/midnight-stars.jpg
-share/gnome/gtkhtml-%%VERSION%%/icons/paper.png
-share/gnome/gtkhtml-%%VERSION%%/icons/rect.png
-share/gnome/gtkhtml-%%VERSION%%/icons/ribbon.jpg
-share/gnome/gtkhtml-%%VERSION%%/icons/rule-blue-center.png
-share/gnome/gtkhtml-%%VERSION%%/icons/rule-blue-left.png
-share/gnome/gtkhtml-%%VERSION%%/icons/rule-blue-right.png
-share/gnome/gtkhtml-%%VERSION%%/icons/rule-yellow-flowers-center.png
-share/gnome/gtkhtml-%%VERSION%%/icons/rule-yellow-flowers-left.png
-share/gnome/gtkhtml-%%VERSION%%/icons/rule-yellow-flowers-right.png
-share/gnome/gtkhtml-%%VERSION%%/icons/texture.png
-share/gnome/gtkhtml-%%VERSION%%/icons/transparent.png
-share/gnome/gtkhtml-%%VERSION%%/keybindingsrc.emacs
+share/gtkhtml-%%VERSION%%/Editor.idl
+share/gtkhtml-%%VERSION%%/GNOME_GtkHTML_Editor-emacs.xml
+share/gtkhtml-%%VERSION%%/GNOME_GtkHTML_Editor.xml
+share/gtkhtml-%%VERSION%%/gtkhtml-editor-properties.glade
+share/gtkhtml-%%VERSION%%/icons/bulb.png
+share/gtkhtml-%%VERSION%%/icons/confidential-stamp.jpg
+share/gtkhtml-%%VERSION%%/icons/draft-paper.png
+share/gtkhtml-%%VERSION%%/icons/draft-stamp.jpg
+share/gtkhtml-%%VERSION%%/icons/empty_image.png
+share/gtkhtml-%%VERSION%%/icons/flowers.png
+share/gtkhtml-%%VERSION%%/icons/html-viewer.png
+share/gtkhtml-%%VERSION%%/icons/info_bulb.png
+share/gtkhtml-%%VERSION%%/icons/midnight-stars.jpg
+share/gtkhtml-%%VERSION%%/icons/paper.png
+share/gtkhtml-%%VERSION%%/icons/rect.png
+share/gtkhtml-%%VERSION%%/icons/ribbon.jpg
+share/gtkhtml-%%VERSION%%/icons/rule-blue-center.png
+share/gtkhtml-%%VERSION%%/icons/rule-blue-left.png
+share/gtkhtml-%%VERSION%%/icons/rule-blue-right.png
+share/gtkhtml-%%VERSION%%/icons/rule-yellow-flowers-center.png
+share/gtkhtml-%%VERSION%%/icons/rule-yellow-flowers-left.png
+share/gtkhtml-%%VERSION%%/icons/rule-yellow-flowers-right.png
+share/gtkhtml-%%VERSION%%/icons/texture.png
+share/gtkhtml-%%VERSION%%/icons/transparent.png
+share/gtkhtml-%%VERSION%%/keybindingsrc.emacs
 share/locale/am/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
 share/locale/ar/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
+share/locale/as/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
 share/locale/az/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
 share/locale/be/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
 share/locale/bg/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
@@ -89,6 +90,7 @@ share/locale/nb/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
 share/locale/ne/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
 share/locale/nl/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
 share/locale/nn/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
+share/locale/oc/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
 share/locale/or/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
 share/locale/pa/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
 share/locale/pl/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
@@ -97,6 +99,7 @@ share/locale/pt_BR/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
 share/locale/ro/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
 share/locale/ru/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
 share/locale/rw/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
+share/locale/si/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
 share/locale/sk/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
 share/locale/sl/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
 share/locale/sq/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
@@ -112,8 +115,8 @@ share/locale/xh/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
 share/locale/zh_CN/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
 share/locale/zh_HK/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
 share/locale/zh_TW/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
-@dirrm share/gnome/gtkhtml-%%VERSION%%/icons
-@dirrm share/gnome/gtkhtml-%%VERSION%%
+@dirrm share/gtkhtml-%%VERSION%%/icons
+@dirrm share/gtkhtml-%%VERSION%%
 @dirrmtry lib/gtkhtml
 @dirrm include/libgtkhtml-%%VERSION%%/gtkhtml
 @dirrm include/libgtkhtml-%%VERSION%%
@@ -121,8 +124,12 @@ share/locale/zh_TW/LC_MESSAGES/gtkhtml-%%VERSION%%.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/mg/LC_MESSAGES
@@ -133,3 +140,5 @@ share/locale/zh_TW/LC_MESSAGES/gtkhtml-%%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/www/gtkhtml38/Makefile b/www/gtkhtml38/Makefile
index f4005761d7ef..c34c002a4c56 100644
--- a/www/gtkhtml38/Makefile
+++ b/www/gtkhtml38/Makefile
@@ -3,10 +3,12 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
+#   $MCom: ports/www/gtkhtml38/Makefile,v 1.104 2007/05/30 19:19:29 mezz Exp $
 #
 
 PORTNAME=	gtkhtml3
 PORTVERSION=	3.12.3
+PORTREVISION=	2
 CATEGORIES=	www gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/3$//}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -25,8 +27,8 @@ USE_GETTEXT=	yes
 USE_BZIP2=	yes
 USE_XLIB=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomeprefix gnomehack intlhack gail libgnomeui \
-		libgnomeprintui ltverhack
+USE_GNOME=	gnomeprefix gnomehack intlhack gail libgnomeui ltverhack \
+		libgnomeprintui
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool:15
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/www/gtkhtml38/files/patch-src_gtkhtml.c b/www/gtkhtml38/files/patch-src_gtkhtml.c
deleted file mode 100644
index cc9534035220..000000000000
--- a/www/gtkhtml38/files/patch-src_gtkhtml.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/gtkhtml.c.orig	Mon Aug 22 15:56:46 2005
-+++ src/gtkhtml.c	Mon Aug 22 18:56:03 2005
-@@ -3104,7 +3104,7 @@
- 	add_bindings (klass);
- 	gtk_html_accessibility_init ();
- 
--	filename = g_build_filename (PREFIX, "share", GTKHTML_RELEASE_STRING, "keybindingsrc.emacs", NULL);
-+	filename = g_build_filename (PREFIX, "share/gnome", GTKHTML_RELEASE_STRING, "keybindingsrc.emacs", NULL);
- 	gtk_rc_parse (filename);
- 	g_free (filename);
- 	html_class->emacs_bindings = gtk_binding_set_find ("gtkhtml-bindings-emacs");
diff --git a/www/gtkhtml38/pkg-plist b/www/gtkhtml38/pkg-plist
index 6fe3280fb1a8..f37b8166d4eb 100644
--- a/www/gtkhtml38/pkg-plist
+++ b/www/gtkhtml38/pkg-plist
@@ -17,72 +17,72 @@ lib/libgtkhtml-%%VERSION%%.so
 lib/libgtkhtml-%%VERSION%%.so.15
 libdata/bonobo/servers/GNOME_GtkHTML_Editor-%%VERSION%%.server
 libdata/pkgconfig/libgtkhtml-%%VERSION%%.pc
-share/gnome/gtkhtml-%%VERSION%%/Editor.idl
-share/gnome/gtkhtml-%%VERSION%%/GNOME_GtkHTML_Editor-emacs.xml
-share/gnome/gtkhtml-%%VERSION%%/GNOME_GtkHTML_Editor.xml
-share/gnome/gtkhtml-%%VERSION%%/gtkhtml-editor-properties.glade
-share/gnome/gtkhtml-%%VERSION%%/icons/16_copy.png
-share/gnome/gtkhtml-%%VERSION%%/icons/16_cut.png
-share/gnome/gtkhtml-%%VERSION%%/icons/16_paste.png
-share/gnome/gtkhtml-%%VERSION%%/icons/24_copy.png
-share/gnome/gtkhtml-%%VERSION%%/icons/24_cut.png
-share/gnome/gtkhtml-%%VERSION%%/icons/24_paste.png
-share/gnome/gtkhtml-%%VERSION%%/icons/bulb.png
-share/gnome/gtkhtml-%%VERSION%%/icons/confidential-stamp.jpg
-share/gnome/gtkhtml-%%VERSION%%/icons/draft-paper.png
-share/gnome/gtkhtml-%%VERSION%%/icons/draft-stamp.jpg
-share/gnome/gtkhtml-%%VERSION%%/icons/empty_image.png
-share/gnome/gtkhtml-%%VERSION%%/icons/flowers.png
-share/gnome/gtkhtml-%%VERSION%%/icons/font-tt-16.png
-share/gnome/gtkhtml-%%VERSION%%/icons/font-tt-24.png
-share/gnome/gtkhtml-%%VERSION%%/icons/html-viewer.png
-share/gnome/gtkhtml-%%VERSION%%/icons/info_bulb.png
-share/gnome/gtkhtml-%%VERSION%%/icons/insert-image-16.png
-share/gnome/gtkhtml-%%VERSION%%/icons/insert-image-24.png
-share/gnome/gtkhtml-%%VERSION%%/icons/insert-link-16.png
-share/gnome/gtkhtml-%%VERSION%%/icons/insert-link-24.png
-share/gnome/gtkhtml-%%VERSION%%/icons/insert-object-16.png
-share/gnome/gtkhtml-%%VERSION%%/icons/insert-object-24.png
-share/gnome/gtkhtml-%%VERSION%%/icons/insert-rule-16.png
-share/gnome/gtkhtml-%%VERSION%%/icons/insert-rule-24.png
-share/gnome/gtkhtml-%%VERSION%%/icons/insert-table-16.png
-share/gnome/gtkhtml-%%VERSION%%/icons/insert-table-24.png
-share/gnome/gtkhtml-%%VERSION%%/icons/midnight-stars.jpg
-share/gnome/gtkhtml-%%VERSION%%/icons/paper.png
-share/gnome/gtkhtml-%%VERSION%%/icons/properties-16.png
-share/gnome/gtkhtml-%%VERSION%%/icons/rect.png
-share/gnome/gtkhtml-%%VERSION%%/icons/redo-16.png
-share/gnome/gtkhtml-%%VERSION%%/icons/redo-24.png
-share/gnome/gtkhtml-%%VERSION%%/icons/ribbon.jpg
-share/gnome/gtkhtml-%%VERSION%%/icons/rule-blue-center.png
-share/gnome/gtkhtml-%%VERSION%%/icons/rule-blue-left.png
-share/gnome/gtkhtml-%%VERSION%%/icons/rule-blue-right.png
-share/gnome/gtkhtml-%%VERSION%%/icons/rule-yellow-flowers-center.png
-share/gnome/gtkhtml-%%VERSION%%/icons/rule-yellow-flowers-left.png
-share/gnome/gtkhtml-%%VERSION%%/icons/rule-yellow-flowers-right.png
-share/gnome/gtkhtml-%%VERSION%%/icons/search-16.png
-share/gnome/gtkhtml-%%VERSION%%/icons/search-24.png
-share/gnome/gtkhtml-%%VERSION%%/icons/search-and-replace-16.png
-share/gnome/gtkhtml-%%VERSION%%/icons/search-and-replace-24.png
-share/gnome/gtkhtml-%%VERSION%%/icons/smiley-1.png
-share/gnome/gtkhtml-%%VERSION%%/icons/smiley-10.png
-share/gnome/gtkhtml-%%VERSION%%/icons/smiley-11.png
-share/gnome/gtkhtml-%%VERSION%%/icons/smiley-12.png
-share/gnome/gtkhtml-%%VERSION%%/icons/smiley-2.png
-share/gnome/gtkhtml-%%VERSION%%/icons/smiley-3.png
-share/gnome/gtkhtml-%%VERSION%%/icons/smiley-4.png
-share/gnome/gtkhtml-%%VERSION%%/icons/smiley-5.png
-share/gnome/gtkhtml-%%VERSION%%/icons/smiley-6.png
-share/gnome/gtkhtml-%%VERSION%%/icons/smiley-8.png
-share/gnome/gtkhtml-%%VERSION%%/icons/smiley-9.png
-share/gnome/gtkhtml-%%VERSION%%/icons/table-column-16.png
-share/gnome/gtkhtml-%%VERSION%%/icons/table-row-16.png
-share/gnome/gtkhtml-%%VERSION%%/icons/table-table-16.png
-share/gnome/gtkhtml-%%VERSION%%/icons/texture.png
-share/gnome/gtkhtml-%%VERSION%%/icons/transparent.png
-share/gnome/gtkhtml-%%VERSION%%/icons/undo-16.png
-share/gnome/gtkhtml-%%VERSION%%/icons/undo-24.png
-share/gnome/gtkhtml-%%VERSION%%/keybindingsrc.emacs
+share/gtkhtml-%%VERSION%%/Editor.idl
+share/gtkhtml-%%VERSION%%/GNOME_GtkHTML_Editor-emacs.xml
+share/gtkhtml-%%VERSION%%/GNOME_GtkHTML_Editor.xml
+share/gtkhtml-%%VERSION%%/gtkhtml-editor-properties.glade
+share/gtkhtml-%%VERSION%%/icons/16_copy.png
+share/gtkhtml-%%VERSION%%/icons/16_cut.png
+share/gtkhtml-%%VERSION%%/icons/16_paste.png
+share/gtkhtml-%%VERSION%%/icons/24_copy.png
+share/gtkhtml-%%VERSION%%/icons/24_cut.png
+share/gtkhtml-%%VERSION%%/icons/24_paste.png
+share/gtkhtml-%%VERSION%%/icons/bulb.png
+share/gtkhtml-%%VERSION%%/icons/confidential-stamp.jpg
+share/gtkhtml-%%VERSION%%/icons/draft-paper.png
+share/gtkhtml-%%VERSION%%/icons/draft-stamp.jpg
+share/gtkhtml-%%VERSION%%/icons/empty_image.png
+share/gtkhtml-%%VERSION%%/icons/flowers.png
+share/gtkhtml-%%VERSION%%/icons/font-tt-16.png
+share/gtkhtml-%%VERSION%%/icons/font-tt-24.png
+share/gtkhtml-%%VERSION%%/icons/html-viewer.png
+share/gtkhtml-%%VERSION%%/icons/info_bulb.png
+share/gtkhtml-%%VERSION%%/icons/insert-image-16.png
+share/gtkhtml-%%VERSION%%/icons/insert-image-24.png
+share/gtkhtml-%%VERSION%%/icons/insert-link-16.png
+share/gtkhtml-%%VERSION%%/icons/insert-link-24.png
+share/gtkhtml-%%VERSION%%/icons/insert-object-16.png
+share/gtkhtml-%%VERSION%%/icons/insert-object-24.png
+share/gtkhtml-%%VERSION%%/icons/insert-rule-16.png
+share/gtkhtml-%%VERSION%%/icons/insert-rule-24.png
+share/gtkhtml-%%VERSION%%/icons/insert-table-16.png
+share/gtkhtml-%%VERSION%%/icons/insert-table-24.png
+share/gtkhtml-%%VERSION%%/icons/midnight-stars.jpg
+share/gtkhtml-%%VERSION%%/icons/paper.png
+share/gtkhtml-%%VERSION%%/icons/properties-16.png
+share/gtkhtml-%%VERSION%%/icons/rect.png
+share/gtkhtml-%%VERSION%%/icons/redo-16.png
+share/gtkhtml-%%VERSION%%/icons/redo-24.png
+share/gtkhtml-%%VERSION%%/icons/ribbon.jpg
+share/gtkhtml-%%VERSION%%/icons/rule-blue-center.png
+share/gtkhtml-%%VERSION%%/icons/rule-blue-left.png
+share/gtkhtml-%%VERSION%%/icons/rule-blue-right.png
+share/gtkhtml-%%VERSION%%/icons/rule-yellow-flowers-center.png
+share/gtkhtml-%%VERSION%%/icons/rule-yellow-flowers-left.png
+share/gtkhtml-%%VERSION%%/icons/rule-yellow-flowers-right.png
+share/gtkhtml-%%VERSION%%/icons/search-16.png
+share/gtkhtml-%%VERSION%%/icons/search-24.png
+share/gtkhtml-%%VERSION%%/icons/search-and-replace-16.png
+share/gtkhtml-%%VERSION%%/icons/search-and-replace-24.png
+share/gtkhtml-%%VERSION%%/icons/smiley-1.png
+share/gtkhtml-%%VERSION%%/icons/smiley-10.png
+share/gtkhtml-%%VERSION%%/icons/smiley-11.png
+share/gtkhtml-%%VERSION%%/icons/smiley-12.png
+share/gtkhtml-%%VERSION%%/icons/smiley-2.png
+share/gtkhtml-%%VERSION%%/icons/smiley-3.png
+share/gtkhtml-%%VERSION%%/icons/smiley-4.png
+share/gtkhtml-%%VERSION%%/icons/smiley-5.png
+share/gtkhtml-%%VERSION%%/icons/smiley-6.png
+share/gtkhtml-%%VERSION%%/icons/smiley-8.png
+share/gtkhtml-%%VERSION%%/icons/smiley-9.png
+share/gtkhtml-%%VERSION%%/icons/table-column-16.png
+share/gtkhtml-%%VERSION%%/icons/table-row-16.png
+share/gtkhtml-%%VERSION%%/icons/table-table-16.png
+share/gtkhtml-%%VERSION%%/icons/texture.png
+share/gtkhtml-%%VERSION%%/icons/transparent.png
+share/gtkhtml-%%VERSION%%/icons/undo-16.png
+share/gtkhtml-%%VERSION%%/icons/undo-24.png
+share/gtkhtml-%%VERSION%%/keybindingsrc.emacs
 share/locale/am/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
 share/locale/ar/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
 share/locale/az/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
@@ -153,8 +153,8 @@ share/locale/xh/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
 share/locale/zh_CN/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
 share/locale/zh_HK/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
 share/locale/zh_TW/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
-@dirrm share/gnome/gtkhtml-%%VERSION%%/icons
-@dirrm share/gnome/gtkhtml-%%VERSION%%
+@dirrm share/gtkhtml-%%VERSION%%/icons
+@dirrm share/gtkhtml-%%VERSION%%
 @dirrmtry lib/gtkhtml
 @dirrm include/libgtkhtml-%%VERSION%%/gtkhtml
 @dirrm include/libgtkhtml-%%VERSION%%
diff --git a/www/gurlchecker/Makefile b/www/gurlchecker/Makefile
index 74579a1958ac..d3a9b02fd862 100644
--- a/www/gurlchecker/Makefile
+++ b/www/gurlchecker/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gurlchecker
 PORTVERSION=	0.10.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	www gnome
 MASTER_SITES=	http://labs.libre-entreprise.org/frs/download.php/%SUBDIR%/
 MASTER_SITE_SUBDIR=	547
diff --git a/www/gurlchecker/pkg-plist b/www/gurlchecker/pkg-plist
index 549ca04415de..503a491d651a 100644
--- a/www/gurlchecker/pkg-plist
+++ b/www/gurlchecker/pkg-plist
@@ -1,42 +1,42 @@
 bin/gurlchecker
-share/gnome/applications/gurlchecker.desktop
-share/gnome/gurlchecker/stylesheets/uc_html.xsl
-share/gnome/gurlchecker/ui/empty_icon.png
-share/gnome/gurlchecker/ui/gurlchecker.glade
-share/gnome/gurlchecker/ui/gurlchecker.png
-share/gnome/gurlchecker/ui/gurlchecker_icon.png
-share/gnome/gurlchecker/ui/link_status_bad.png
-share/gnome/gurlchecker/ui/link_status_file_error.png
-share/gnome/gurlchecker/ui/link_status_good.png
-share/gnome/gurlchecker/ui/link_status_ignored.png
-share/gnome/gurlchecker/ui/link_status_mail_bad.png
-share/gnome/gurlchecker/ui/link_status_mail_good.png
-share/gnome/gurlchecker/ui/link_status_malformed.png
-share/gnome/gurlchecker/ui/link_status_nodata.png
-share/gnome/gurlchecker/ui/link_status_restricted.png
-share/gnome/gurlchecker/ui/link_status_timeout.png
-share/gnome/gurlchecker/ui/link_type_css.png
-share/gnome/gurlchecker/ui/link_type_css_ssl.png
-share/gnome/gurlchecker/ui/link_type_folder.png
-share/gnome/gurlchecker/ui/link_type_frame.png
-share/gnome/gurlchecker/ui/link_type_frame_ssl.png
-share/gnome/gurlchecker/ui/link_type_href.png
-share/gnome/gurlchecker/ui/link_type_href_ftp.png
-share/gnome/gurlchecker/ui/link_type_href_local.png
-share/gnome/gurlchecker/ui/link_type_href_ssl.png
-share/gnome/gurlchecker/ui/link_type_image.png
-share/gnome/gurlchecker/ui/link_type_image_local.png
-share/gnome/gurlchecker/ui/link_type_image_ssl.png
-share/gnome/gurlchecker/ui/link_type_mail.png
-share/gnome/gurlchecker/ui/link_type_unknown.png
-share/gnome/gurlchecker/ui/menu_new_bookmarks_file.png
-share/gnome/gurlchecker/ui/menu_new_local_file.png
-share/gnome/gurlchecker/ui/menu_new_web_site.png
-share/gnome/gurlchecker/ui/menu_protocol_ftp.png
-share/gnome/gurlchecker/ui/menu_protocol_https.png
-share/gnome/gurlchecker/ui/security_alert.png
-share/gnome/gurlchecker/ui/w3c_alert.png
-share/gnome/pixmaps/gurlchecker.png
+share/applications/gurlchecker.desktop
+share/gurlchecker/stylesheets/uc_html.xsl
+share/gurlchecker/ui/empty_icon.png
+share/gurlchecker/ui/gurlchecker.glade
+share/gurlchecker/ui/gurlchecker.png
+share/gurlchecker/ui/gurlchecker_icon.png
+share/gurlchecker/ui/link_status_bad.png
+share/gurlchecker/ui/link_status_file_error.png
+share/gurlchecker/ui/link_status_good.png
+share/gurlchecker/ui/link_status_ignored.png
+share/gurlchecker/ui/link_status_mail_bad.png
+share/gurlchecker/ui/link_status_mail_good.png
+share/gurlchecker/ui/link_status_malformed.png
+share/gurlchecker/ui/link_status_nodata.png
+share/gurlchecker/ui/link_status_restricted.png
+share/gurlchecker/ui/link_status_timeout.png
+share/gurlchecker/ui/link_type_css.png
+share/gurlchecker/ui/link_type_css_ssl.png
+share/gurlchecker/ui/link_type_folder.png
+share/gurlchecker/ui/link_type_frame.png
+share/gurlchecker/ui/link_type_frame_ssl.png
+share/gurlchecker/ui/link_type_href.png
+share/gurlchecker/ui/link_type_href_ftp.png
+share/gurlchecker/ui/link_type_href_local.png
+share/gurlchecker/ui/link_type_href_ssl.png
+share/gurlchecker/ui/link_type_image.png
+share/gurlchecker/ui/link_type_image_local.png
+share/gurlchecker/ui/link_type_image_ssl.png
+share/gurlchecker/ui/link_type_mail.png
+share/gurlchecker/ui/link_type_unknown.png
+share/gurlchecker/ui/menu_new_bookmarks_file.png
+share/gurlchecker/ui/menu_new_local_file.png
+share/gurlchecker/ui/menu_new_web_site.png
+share/gurlchecker/ui/menu_protocol_ftp.png
+share/gurlchecker/ui/menu_protocol_https.png
+share/gurlchecker/ui/security_alert.png
+share/gurlchecker/ui/w3c_alert.png
+share/pixmaps/gurlchecker.png
 %%NLS%%share/locale/da/LC_MESSAGES/gurlchecker.mo
 %%NLS%%share/locale/de/LC_MESSAGES/gurlchecker.mo
 %%NLS%%share/locale/eo/LC_MESSAGES/gurlchecker.mo
@@ -45,6 +45,7 @@ share/gnome/pixmaps/gurlchecker.png
 %%NLS%%share/locale/it/LC_MESSAGES/gurlchecker.mo
 %%NLS%%share/locale/ja/LC_MESSAGES/gurlchecker.mo
 %%NLS%%share/locale/sk/LC_MESSAGES/gurlchecker.mo
-@dirrm share/gnome/gurlchecker/ui
-@dirrm share/gnome/gurlchecker/stylesheets
-@dirrm share/gnome/gurlchecker
+@dirrm share/gurlchecker/ui
+@dirrm share/gurlchecker/stylesheets
+@dirrm share/gurlchecker
+@dirrmtry share/applications
diff --git a/www/kazehakase/Makefile b/www/kazehakase/Makefile
index b5040d2737b0..c32b57e9278e 100644
--- a/www/kazehakase/Makefile
+++ b/www/kazehakase/Makefile
@@ -3,15 +3,14 @@
 # Whom:			michael johnson <ahze@ahze.net>
 #
 # $FreeBSD$
-#    $MCom: ports/www/kazehakase/Makefile,v 1.4 2006/03/10 02:09:53 ahze Exp $
+#   $MCom: ports/www/kazehakase/Makefile,v 1.9 2007/10/24 16:17:14 ahze Exp $
 #
 
 PORTNAME=	kazehakase
-PORTVERSION=	0.4.5
-PORTREVISION=	2
+PORTVERSION=	0.4.9
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_JP}
-MASTER_SITE_SUBDIR=	${PORTNAME}/24791
+MASTER_SITE_SUBDIR=	${PORTNAME}/27353
 
 MAINTAINER=	ahze@FreeBSD.org
 COMMENT=	Kazehakase is a browser with gecko engine like Epiphany or Galeon
@@ -37,13 +36,13 @@ RUN_DEPENDS+=	${RUBY_SITEARCHLIBDIR}/uconv.so:${PORTSDIR}/japanese/ruby-uconv
 .endif
 
 .include <bsd.port.pre.mk>
-.include "${.CURDIR}/../../www/mozilla/bsd.gecko.mk"
+.include "${PORTSDIR}/www/mozilla/bsd.gecko.mk"
 
 # !!! gtk-webcore higly experimental right now and not very stable !!!
 # See https://mail.gna.org/public/kazehakase-devel/2004-10/msg00001.html
 # on how to use gtk-webcore with kazehakase. and yes you still have to
 # have mozilla even if you don't use it in kazehakase.
-.if defined(WITH_GTKWEBCORE)
+.if defined(WITH_GTKWEBCORE) || exists(${LOCALBASE}/libnrcit.a)
 LIB_DEPENDS+=	nrcit.0:${PORTSDIR}/www/osb-nrcit
 CONFIGURE_ARGS+=--enable-gtk-webcore
 .endif
@@ -89,4 +88,8 @@ post-patch:
 	@${ECHO_MSG} "create_thumbnail=true" >> ${WRKSRC}/etc/kzrc
 .endif
 
+pre-install:
+	@${REINPLACE_CMD} -e 's|localen|locale|' \
+		${WRKSRC}/po/Makefile
+
 .include <bsd.port.post.mk>
diff --git a/www/kazehakase/distinfo b/www/kazehakase/distinfo
index e9a39c451918..50c9e6d8d2df 100644
--- a/www/kazehakase/distinfo
+++ b/www/kazehakase/distinfo
@@ -1,3 +1,3 @@
-MD5 (kazehakase-0.4.5.tar.gz) = 2171f02d58a575e148436c7102686afb
-SHA256 (kazehakase-0.4.5.tar.gz) = 87ad1345e1d6df6ffdb1b43af92cfd87a16eade7de4060c5ce2fabd4d37bf99a
-SIZE (kazehakase-0.4.5.tar.gz) = 1445140
+MD5 (kazehakase-0.4.9.tar.gz) = 6259322e4fb6ed18a5f23ceda97f7ceb
+SHA256 (kazehakase-0.4.9.tar.gz) = b6b04776c058a88efd888bb61140e3a80658ac51e7f6151dc5c4f2edc644c326
+SIZE (kazehakase-0.4.9.tar.gz) = 1364165
diff --git a/www/kazehakase/pkg-plist b/www/kazehakase/pkg-plist
index a8bf98b2d615..cd41b8e8fcfb 100644
--- a/www/kazehakase/pkg-plist
+++ b/www/kazehakase/pkg-plist
@@ -11,66 +11,67 @@ etc/kazehakase/proxyrc
 etc/kazehakase/smartbookmarks.xml
 lib/kazehakase/libkazehakase.la
 lib/kazehakase/libkazehakase.so
-lib/kazehakase/libkazehakase.so.0
+lib/kazehakase/libkazehakase.so.1
 lib/kazehakase/embed/gecko.la
 lib/kazehakase/embed/gecko.so
 lib/kazehakase/search/hyper-estraier.la
 lib/kazehakase/search/hyper-estraier.so
-share/gnome/applications/kazehakase.desktop
-share/gnome/kazehakase/icons/autoscroll.xpm
-share/gnome/kazehakase/icons/kz-anchor.png
-share/gnome/kazehakase/icons/kz-book-search.png
-share/gnome/kazehakase/icons/kz-bookmark.png
-share/gnome/kazehakase/icons/kz-closebackward.png
-share/gnome/kazehakase/icons/kz-closeforward.png
-share/gnome/kazehakase/icons/kz-closewindow.png
-share/gnome/kazehakase/icons/kz-copyimagelocation.png
-share/gnome/kazehakase/icons/kz-copyurl.png
-share/gnome/kazehakase/icons/kz-epiphany.png
-share/gnome/kazehakase/icons/kz-firefox.png
-share/gnome/kazehakase/icons/kz-folder-open.png
-share/gnome/kazehakase/icons/kz-folder-search.png
-share/gnome/kazehakase/icons/kz-folder.png
-share/gnome/kazehakase/icons/kz-font-decrease.png
-share/gnome/kazehakase/icons/kz-font-increase.png
-share/gnome/kazehakase/icons/kz-galeon.png
-share/gnome/kazehakase/icons/kz-google.png
-share/gnome/kazehakase/icons/kz-gray.png
-share/gnome/kazehakase/icons/kz-green.png
-share/gnome/kazehakase/icons/kz-history.png
-share/gnome/kazehakase/icons/kz-konqueror.png
-share/gnome/kazehakase/icons/kz-logo-bg.png
-share/gnome/kazehakase/icons/kz-logo.png
-share/gnome/kazehakase/icons/kz-mozilla.png
-share/gnome/kazehakase/icons/kz-netscape.png
-share/gnome/kazehakase/icons/kz-newwindow.png
-share/gnome/kazehakase/icons/kz-openimagewindow.png
-share/gnome/kazehakase/icons/kz-openlinkwindow.png
-share/gnome/kazehakase/icons/kz-openselectedlink.png
-share/gnome/kazehakase/icons/kz-red.png
-share/gnome/kazehakase/icons/kz-remote-bookmark.png
-share/gnome/kazehakase/icons/kz-rss-feed.png
-share/gnome/kazehakase/icons/kz-savelink.png
-share/gnome/kazehakase/icons/kz-scrap-bookmark.png
-share/gnome/kazehakase/icons/kz-search.png
-share/gnome/kazehakase/icons/kz-select-all.png
-share/gnome/kazehakase/icons/kz-separator.png
-share/gnome/kazehakase/icons/kz-smart-bookmark.png
-share/gnome/kazehakase/icons/kz-tab-next.png
-share/gnome/kazehakase/icons/kz-tab-prev.png
-share/gnome/kazehakase/icons/kz-view-source.png
-share/gnome/kazehakase/icons/kz-yellow.png
-share/gnome/kazehakase/kz-no-thumbnail.png
-share/gnome/kazehakase/search-result.css
-share/gnome/pixmaps/kazehakase-icon.png
+share/applications/kazehakase.desktop
+share/kazehakase/icons/autoscroll.xpm
+share/kazehakase/icons/kz-anchor.png
+share/kazehakase/icons/kz-book-search.png
+share/kazehakase/icons/kz-bookmark.png
+share/kazehakase/icons/kz-closebackward.png
+share/kazehakase/icons/kz-closeforward.png
+share/kazehakase/icons/kz-closewindow.png
+share/kazehakase/icons/kz-copyimagelocation.png
+share/kazehakase/icons/kz-copyurl.png
+share/kazehakase/icons/kz-epiphany.png
+share/kazehakase/icons/kz-firefox.png
+share/kazehakase/icons/kz-folder-open.png
+share/kazehakase/icons/kz-folder-search.png
+share/kazehakase/icons/kz-folder.png
+share/kazehakase/icons/kz-font-decrease.png
+share/kazehakase/icons/kz-font-increase.png
+share/kazehakase/icons/kz-galeon.png
+share/kazehakase/icons/kz-google.png
+share/kazehakase/icons/kz-gray.png
+share/kazehakase/icons/kz-green.png
+share/kazehakase/icons/kz-history.png
+share/kazehakase/icons/kz-konqueror.png
+share/kazehakase/icons/kz-logo-bg.png
+share/kazehakase/icons/kz-logo.png
+share/kazehakase/icons/kz-mozilla.png
+share/kazehakase/icons/kz-netscape.png
+share/kazehakase/icons/kz-newwindow.png
+share/kazehakase/icons/kz-openimagewindow.png
+share/kazehakase/icons/kz-openlinkwindow.png
+share/kazehakase/icons/kz-openselectedlink.png
+share/kazehakase/icons/kz-red.png
+share/kazehakase/icons/kz-remote-bookmark.png
+share/kazehakase/icons/kz-rss-feed.png
+share/kazehakase/icons/kz-savelink.png
+share/kazehakase/icons/kz-scrap-bookmark.png
+share/kazehakase/icons/kz-search.png
+share/kazehakase/icons/kz-select-all.png
+share/kazehakase/icons/kz-separator.png
+share/kazehakase/icons/kz-smart-bookmark.png
+share/kazehakase/icons/kz-tab-next.png
+share/kazehakase/icons/kz-tab-prev.png
+share/kazehakase/icons/kz-view-source.png
+share/kazehakase/icons/kz-yellow.png
+share/kazehakase/kz-no-thumbnail.png
+share/kazehakase/search-result.css
+share/pixmaps/kazehakase-icon.png
 share/locale/cs/LC_MESSAGES/kazehakase.mo
 share/locale/fr/LC_MESSAGES/kazehakase.mo
 share/locale/ja/LC_MESSAGES/kazehakase.mo
 share/locale/ru/LC_MESSAGES/kazehakase.mo
-@dirrm share/gnome/kazehakase/icons
-@dirrm share/gnome/kazehakase
+@dirrm share/kazehakase/icons
+@dirrm share/kazehakase
 @dirrm lib/kazehakase/search
 @dirrm lib/kazehakase/embed
 @dirrm lib/kazehakase
 @dirrm etc/kazehakase/mozilla
 @dirrm etc/kazehakase
+@dirrmtry share/applications
diff --git a/www/nscache/Makefile b/www/nscache/Makefile
index c54a19bf173e..a477753eb135 100644
--- a/www/nscache/Makefile
+++ b/www/nscache/Makefile
@@ -3,11 +3,12 @@
 # Whom:			Kris Kennaway <kris@FreeBSD.org>
 #
 # $FreeBSD$
-#    $MCom: ports/www/nscache/Makefile,v 1.1 2006/10/04 11:49:18 ahze Exp $
+#   $MCom: ports/www/nscache/Makefile,v 1.3 2007/08/07 03:35:07 mezz Exp $
+#
 
 PORTNAME=	nscache
 PORTVERSION=	0.6
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://www.idata.sk/~ondrej/sw/
@@ -34,6 +35,6 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/nscache.desktop \
 		${PREFIX}/share/gnome/apps/Internet
 	${INSTALL_DATA} ${WRKSRC}/nscache.xpm \
-		${PREFIX}/share/gnome/pixmaps
+		${PREFIX}/share/pixmaps
 
 .include <bsd.port.mk>
diff --git a/www/nscache/pkg-plist b/www/nscache/pkg-plist
index c67f02bef6d8..140802e44d32 100644
--- a/www/nscache/pkg-plist
+++ b/www/nscache/pkg-plist
@@ -8,4 +8,4 @@ share/locale/pt_BR/LC_MESSAGES/nscache.mo
 share/locale/sk/LC_MESSAGES/nscache.mo
 share/locale/tr/LC_MESSAGES/nscache.mo
 share/gnome/apps/Internet/nscache.desktop
-share/gnome/pixmaps/nscache.xpm
+share/pixmaps/nscache.xpm
diff --git a/www/opera/Makefile b/www/opera/Makefile
index 8a00fd4ee5c7..73d406a92ef4 100644
--- a/www/opera/Makefile
+++ b/www/opera/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	opera
 PORTVERSION=	${OPERA_VER}.${OPERA_DATE}
+PORTREVISION=	1
 CATEGORIES=	www ipv6
 MASTER_SITES=	ftp://opera.inode.at/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/${OPERA_LIB}/ \
 		http://gd.tuwien.ac.at/infosys/browsers/opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/${OPERA_LIB}/ \
diff --git a/www/opera/files/patch-install.sh b/www/opera/files/patch-install.sh
index cf440a0ee89b..8e3c5761f316 100644
--- a/www/opera/files/patch-install.sh
+++ b/www/opera/files/patch-install.sh
@@ -169,8 +169,8 @@
 -	then
 -	    # /opt/gnome icon
 -	    if test ! -d /opt/gnome/share/pixmaps/
-+	    # %%LOCALBASE%%/share/gnome icon
-+	    if test ! -d %%LOCALBASE%%/share/gnome/pixmaps/;
++	    # %%LOCALBASE%%/share icon
++	    if test ! -d %%LOCALBASE%%/share/pixmaps/;
  	    then
 -		if test -w /opt/gnome/share
 +		if test -w %%LOCALBASE%%/share/gnome;
@@ -178,17 +178,17 @@
 -		    mkdir $mkdirv $mkdirp /opt/gnome/share/pixmaps/
 -		    chmod $chmodv 755 /opt/gnome/share/pixmaps
 -		    cp $cpv $share_dir/images/opera.xpm /opt/gnome/share/pixmaps/opera.xpm
-+		    mkdir $mkdirv $mkdirp %%LOCALBASE%%/share/gnome/pixmaps/
-+		    chmod $chmodv 755 %%LOCALBASE%%/share/gnome/pixmaps
-+		    cp $cpv $share_dir/images/opera.xpm %%LOCALBASE%%/share/gnome/pixmaps/opera.xpm
++		    mkdir $mkdirv $mkdirp %%LOCALBASE%%/share/pixmaps/
++		    chmod $chmodv 755 %%LOCALBASE%%/share/pixmaps
++		    cp $cpv $share_dir/images/opera.xpm %%LOCALBASE%%/share/pixmaps/opera.xpm
  		fi
 -	    elif test -w /opt/gnome/share/pixmaps
 -	    then cp $cpv $share_dir/images/opera.xpm /opt/gnome/share/pixmaps/opera.xpm
-+	    elif test -w %%LOCALBASE%%/share/gnome/pixmaps
-+	    then cp $cpv $share_dir/images/opera.xpm %%LOCALBASE%%/share/gnome/pixmaps/opera.xpm
++	    elif test -w %%LOCALBASE%%/share/pixmaps
++	    then cp $cpv $share_dir/images/opera.xpm %%LOCALBASE%%/share/pixmaps/opera.xpm
  	    fi
 -	    # end /opt/gnome icon
-+	    # end %%LOCALBASE%%/share/gnome icon
++	    # end %%LOCALBASE%%/share icon
  
 -	    # /opt/gnome link
 -	    if test -d /opt/gnome/share/gnome/apps/
diff --git a/www/opera/pkg-plist b/www/opera/pkg-plist
index 97bd407f185c..ba5fa09b8898 100644
--- a/www/opera/pkg-plist
+++ b/www/opera/pkg-plist
@@ -87,7 +87,7 @@ bin/opera
 %%SYMHACK%%%%DATADIR%%/symhack.so
 
 %%GNOME%%share/gnome/apps/Internet/opera.desktop
-%%GNOME%%share/gnome/pixmaps/opera.xpm
+%%GNOME%%share/pixmaps/opera.xpm
 @dirrm %%DATADIR%%/styles/user
 @dirrm %%DATADIR%%/styles/images
 @dirrm %%DATADIR%%/styles
diff --git a/www/osb-nrcore/Makefile b/www/osb-nrcore/Makefile
index b50b45371e26..6f109ade88b3 100644
--- a/www/osb-nrcore/Makefile
+++ b/www/osb-nrcore/Makefile
@@ -33,6 +33,7 @@ BROKEN=		Does not compile on alpha
 post-patch:
 	@${REINPLACE_CMD} -e '/test/s|==|=|g ; \
 		 s|-nostdinc++||g ; \
-		 s|-nodefaultlibs -lgcc -lc||g' ${WRKSRC}/configure
+		 s|-nodefaultlibs -lgcc -lc||g; \
+		 s|-D.*_DISABLE_DEPRECATED||g' ${WRKSRC}/configure
 
 .include <bsd.port.post.mk>
diff --git a/www/peacock/Makefile b/www/peacock/Makefile
index e6591a1cee0d..3aea44850626 100644
--- a/www/peacock/Makefile
+++ b/www/peacock/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	peacock
 PORTVERSION=	1.9.1
-PORTREVISION=	10
+PORTREVISION=	12
 CATEGORIES=	www gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/www/peacock/pkg-plist b/www/peacock/pkg-plist
index cf58da995534..474a4cfc2483 100644
--- a/www/peacock/pkg-plist
+++ b/www/peacock/pkg-plist
@@ -1,8 +1,8 @@
 bin/peacock-2
-share/gnome/peacock-2/glade/dialogs.glade
-share/gnome/peacock-2/pixmaps/peacock-logo.png
-share/gnome/peacock-2/ui/peacock-ui.xml
-@dirrm share/gnome/peacock-2/ui
-@dirrm share/gnome/peacock-2/pixmaps
-@dirrm share/gnome/peacock-2/glade
-@dirrm share/gnome/peacock-2
+share/peacock-2/glade/dialogs.glade
+share/peacock-2/pixmaps/peacock-logo.png
+share/peacock-2/ui/peacock-ui.xml
+@dirrm share/peacock-2/ui
+@dirrm share/peacock-2/pixmaps
+@dirrm share/peacock-2/glade
+@dirrm share/peacock-2
diff --git a/www/screem-devel/Makefile b/www/screem-devel/Makefile
index c12b979f75cf..38dc023426b1 100644
--- a/www/screem-devel/Makefile
+++ b/www/screem-devel/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	screem
 PORTVERSION=	0.16.1
-PORTREVISION=	5
+PORTREVISION=	7
 CATEGORIES=	www gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -45,10 +45,10 @@ CONFIGURE_ARGS+=	--enable-enchant
 .endif
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|$${DATADIRNAME}/$${PACKAGE}|$${DATADIRNAME}/gnome/$${PACKAGE}|g ; \
-		s|-DGNOME_DISABLE_DEPRECATED||g ; \
+	@${REINPLACE_CMD} -e 's|-DGNOME_DISABLE_DEPRECATED||g ; \
 		s|-DGNOMEUI_DISABLE_DEPRECATED||g ; \
 		s|-DGTK_DISABLE_DEPRECATED||g' ${WRKSRC}/configure
-	@${REINPLACE_CMD} -e 's|\&\& make|\&\& $$(MAKE)|g' ${WRKSRC}/tests/Makefile.in
+	@${REINPLACE_CMD} -e 's|\&\& make|\&\& $$(MAKE)|g' \
+		${WRKSRC}/tests/Makefile.in
 
 .include <bsd.port.mk>
diff --git a/www/screem-devel/pkg-plist b/www/screem-devel/pkg-plist
index b78d729b40d9..8c3d349f4e8c 100644
--- a/www/screem-devel/pkg-plist
+++ b/www/screem-devel/pkg-plist
@@ -25,8 +25,8 @@ lib/screem/plugins/tableWizard.so
 lib/screem/plugins/uploadWizard.la
 lib/screem/plugins/uploadWizard.so
 libdata/pkgconfig/screem-plugin.pc
-share/gnome/application-registry/screem.applications
-share/gnome/applications/screem.desktop
+share/application-registry/screem.applications
+share/applications/screem.desktop
 @exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
 share/gnome/help/screem/C/figures/color-wizard.png
 share/gnome/help/screem/C/figures/css-wizard1.png
@@ -75,125 +75,125 @@ share/gnome/help/screem/C/figures/table-wizard.png
 share/gnome/help/screem/C/figures/tree.png
 share/gnome/help/screem/C/legal.xml
 share/gnome/help/screem/C/screem.xml
-share/gnome/omf/screem/screem-C.omf
-share/gnome/pixmaps/screem/splash/splash.png
-share/gnome/pixmaps/screem.png
-share/gnome/screem/doctypes.xml
-share/gnome/screem/dtd/HTMLlat1.ent
-share/gnome/screem/dtd/HTMLspecial.ent
-share/gnome/screem/dtd/HTMLsymbols.ent
-share/gnome/screem/dtd/catalog
-share/gnome/screem/dtd/gtkuimanager.dtd
-share/gnome/screem/dtd/http%3A%2F%2Fwww.w3.org%2FTR%2Fhtml4%2Fframeset.dtd
-share/gnome/screem/dtd/http%3A%2F%2Fwww.w3.org%2FTR%2Fhtml4%2Floose.dtd
-share/gnome/screem/dtd/http%3A%2F%2Fwww.w3.org%2FTR%2Fhtml4%2Fstrict.dtd
-share/gnome/screem/dtd/http%3A%2F%2Fwww.w3.org%2FTR%2Fxhtml1%2FDTD%2Fxhtml1-frameset.dtd
-share/gnome/screem/dtd/http%3A%2F%2Fwww.w3.org%2FTR%2Fxhtml1%2FDTD%2Fxhtml1-strict.dtd
-share/gnome/screem/dtd/http%3A%2F%2Fwww.w3.org%2FTR%2Fxhtml1%2FDTD%2Fxhtml1-transitional.dtd
-share/gnome/screem/dtd/screem-doctypes.dtd
-share/gnome/screem/dtd/screem-tagtree-config.dtd
-share/gnome/screem/dtd/screem-tagtree.dtd
-share/gnome/screem/dtd/xhtml-lat1.ent
-share/gnome/screem/dtd/xhtml-special.ent
-share/gnome/screem/dtd/xhtml-symbol.ent
-share/gnome/screem/features.xml
-share/gnome/screem/glade/css-wizard.glade
-share/gnome/screem/glade/entityWizard.glade
-share/gnome/screem/glade/linkwizard.glade
-share/gnome/screem/glade/object-wizard.glade
-share/gnome/screem/glade/screem.glade
-share/gnome/screem/glade/ssiwizard.glade
-share/gnome/screem/glade/tablewizard.glade
-share/gnome/screem/glade/uploadwizard.glade
-share/gnome/screem/helpers/Tidy/TidyHTML.desktop
-share/gnome/screem/helpers/Tidy/TidyXML.desktop
-share/gnome/screem/helpers/browsers/epiphany.desktop
-share/gnome/screem/helpers/browsers/konqueror.desktop
-share/gnome/screem/helpers/browsers/opera.desktop
-share/gnome/screem/helpers/browsers-remote/epiphany.desktop
-share/gnome/screem/helpers/browsers-remote/konqueror.desktop
-share/gnome/screem/helpers/browsers-remote/opera.desktop
-share/gnome/screem/hints/screem_hints.txt
-share/gnome/screem/hints/screem_hints_fr.txt
-share/gnome/screem/hints/screem_hints_pt_BR.txt
-share/gnome/screem/hints/screem_hints_sv.txt
-share/gnome/screem/pixmaps/add-link-16.png
-share/gnome/screem/pixmaps/add-link-24.png
-share/gnome/screem/pixmaps/add_column-16.png
-share/gnome/screem/pixmaps/add_column-24.png
-share/gnome/screem/pixmaps/add_row-16.png
-share/gnome/screem/pixmaps/add_row-24.png
-share/gnome/screem/pixmaps/bookmarks-open.png
-share/gnome/screem/pixmaps/bookmarks-preferences.png
-share/gnome/screem/pixmaps/browser.xpm
-share/gnome/screem/pixmaps/button.xpm
-share/gnome/screem/pixmaps/caption.xpm
-share/gnome/screem/pixmaps/checkbutton.xpm
-share/gnome/screem/pixmaps/cvs-add-16.png
-share/gnome/screem/pixmaps/cvs-add-24.png
-share/gnome/screem/pixmaps/cvs-add.png
-share/gnome/screem/pixmaps/cvs-checkout-16.png
-share/gnome/screem/pixmaps/cvs-checkout-24.png
-share/gnome/screem/pixmaps/cvs-checkout.png
-share/gnome/screem/pixmaps/cvs-commit-16.png
-share/gnome/screem/pixmaps/cvs-commit-24.png
-share/gnome/screem/pixmaps/cvs-remove-16.png
-share/gnome/screem/pixmaps/cvs-remove-24.png
-share/gnome/screem/pixmaps/cvs-remove.png
-share/gnome/screem/pixmaps/cvs-update-16.png
-share/gnome/screem/pixmaps/cvs-update-24.png
-share/gnome/screem/pixmaps/cvs-update.png
-share/gnome/screem/pixmaps/entry.xpm
-share/gnome/screem/pixmaps/fixed.xpm
-share/gnome/screem/pixmaps/gallery.xpm
-share/gnome/screem/pixmaps/gnome-fileentry.xpm
-share/gnome/screem/pixmaps/hand-open.png
-share/gnome/screem/pixmaps/insert-symbol-16.png
-share/gnome/screem/pixmaps/insert-symbol-24.png
-share/gnome/screem/pixmaps/optionmenu.xpm
-share/gnome/screem/pixmaps/paragraphs.png
-share/gnome/screem/pixmaps/pre.xpm
-share/gnome/screem/pixmaps/radiobutton.xpm
-share/gnome/screem/pixmaps/resources.png
-share/gnome/screem/pixmaps/screem_site.png
-share/gnome/screem/pixmaps/site_preview.png
-share/gnome/screem/pixmaps/site_structure-48.png
-share/gnome/screem/pixmaps/stock-close-12.png
-share/gnome/screem/pixmaps/stock-menu-left-12.png
-share/gnome/screem/pixmaps/stock-menu-right-12.png
-share/gnome/screem/pixmaps/stock_connect.png
-share/gnome/screem/pixmaps/stock_disconnect.png
-share/gnome/screem/pixmaps/stock_insert_image-16.png
-share/gnome/screem/pixmaps/stock_insert_image.png
-share/gnome/screem/pixmaps/stock_insert_object-16.png
-share/gnome/screem/pixmaps/stock_insert_object.png
-share/gnome/screem/pixmaps/stock_insert_table-16.png
-share/gnome/screem/pixmaps/sub.xpm
-share/gnome/screem/pixmaps/sup.xpm
-share/gnome/screem/pixmaps/td.xpm
-share/gnome/screem/pixmaps/text.xpm
-share/gnome/screem/pixmaps/th.xpm
-share/gnome/screem/pixmaps/todo.png
-share/gnome/screem/pixmaps/tr.xpm
-share/gnome/screem/resources/Images/made.png
-share/gnome/screem/resources/Javascript/linktitle.js
-share/gnome/screem/resources/Javascript/preload.js
-share/gnome/screem/resources/Javascript/rollover.js
-share/gnome/screem/resources/Templates/template.html
-share/gnome/screem/tagtrees/apache.tagtree
-share/gnome/screem/tagtrees/cfml.tagtree
-share/gnome/screem/tagtrees/css.tagtree
-share/gnome/screem/tagtrees/funcref_php.tagtree
-share/gnome/screem/tagtrees/funcref_python.tagtree
-share/gnome/screem/tagtrees/html.tagtree
-share/gnome/screem/tagtrees/javascript.tagtree
-share/gnome/screem/tagtrees/teixlite.tagtree
-share/gnome/screem/ui/layout
-share/gnome/screem/ui/screem-editable-toolbars.xml
-share/gnome/screem/ui/screem-tag-tree-bar.xml
-share/gnome/screem/ui/screem-window-menu.xml
-share/gnome/screem/ui/screem-window-popups.xml
-share/gnome/screem/ui/screem-window-toolbar.xml
+share/omf/screem/screem-C.omf
+share/pixmaps/screem/splash/splash.png
+share/pixmaps/screem.png
+share/screem/doctypes.xml
+share/screem/dtd/HTMLlat1.ent
+share/screem/dtd/HTMLspecial.ent
+share/screem/dtd/HTMLsymbols.ent
+share/screem/dtd/catalog
+share/screem/dtd/gtkuimanager.dtd
+share/screem/dtd/http%3A%2F%2Fwww.w3.org%2FTR%2Fhtml4%2Fframeset.dtd
+share/screem/dtd/http%3A%2F%2Fwww.w3.org%2FTR%2Fhtml4%2Floose.dtd
+share/screem/dtd/http%3A%2F%2Fwww.w3.org%2FTR%2Fhtml4%2Fstrict.dtd
+share/screem/dtd/http%3A%2F%2Fwww.w3.org%2FTR%2Fxhtml1%2FDTD%2Fxhtml1-frameset.dtd
+share/screem/dtd/http%3A%2F%2Fwww.w3.org%2FTR%2Fxhtml1%2FDTD%2Fxhtml1-strict.dtd
+share/screem/dtd/http%3A%2F%2Fwww.w3.org%2FTR%2Fxhtml1%2FDTD%2Fxhtml1-transitional.dtd
+share/screem/dtd/screem-doctypes.dtd
+share/screem/dtd/screem-tagtree-config.dtd
+share/screem/dtd/screem-tagtree.dtd
+share/screem/dtd/xhtml-lat1.ent
+share/screem/dtd/xhtml-special.ent
+share/screem/dtd/xhtml-symbol.ent
+share/screem/features.xml
+share/screem/glade/css-wizard.glade
+share/screem/glade/entityWizard.glade
+share/screem/glade/linkwizard.glade
+share/screem/glade/object-wizard.glade
+share/screem/glade/screem.glade
+share/screem/glade/ssiwizard.glade
+share/screem/glade/tablewizard.glade
+share/screem/glade/uploadwizard.glade
+share/screem/helpers/Tidy/TidyHTML.desktop
+share/screem/helpers/Tidy/TidyXML.desktop
+share/screem/helpers/browsers/epiphany.desktop
+share/screem/helpers/browsers/konqueror.desktop
+share/screem/helpers/browsers/opera.desktop
+share/screem/helpers/browsers-remote/epiphany.desktop
+share/screem/helpers/browsers-remote/konqueror.desktop
+share/screem/helpers/browsers-remote/opera.desktop
+share/screem/hints/screem_hints.txt
+share/screem/hints/screem_hints_fr.txt
+share/screem/hints/screem_hints_pt_BR.txt
+share/screem/hints/screem_hints_sv.txt
+share/screem/pixmaps/add-link-16.png
+share/screem/pixmaps/add-link-24.png
+share/screem/pixmaps/add_column-16.png
+share/screem/pixmaps/add_column-24.png
+share/screem/pixmaps/add_row-16.png
+share/screem/pixmaps/add_row-24.png
+share/screem/pixmaps/bookmarks-open.png
+share/screem/pixmaps/bookmarks-preferences.png
+share/screem/pixmaps/browser.xpm
+share/screem/pixmaps/button.xpm
+share/screem/pixmaps/caption.xpm
+share/screem/pixmaps/checkbutton.xpm
+share/screem/pixmaps/cvs-add-16.png
+share/screem/pixmaps/cvs-add-24.png
+share/screem/pixmaps/cvs-add.png
+share/screem/pixmaps/cvs-checkout-16.png
+share/screem/pixmaps/cvs-checkout-24.png
+share/screem/pixmaps/cvs-checkout.png
+share/screem/pixmaps/cvs-commit-16.png
+share/screem/pixmaps/cvs-commit-24.png
+share/screem/pixmaps/cvs-remove-16.png
+share/screem/pixmaps/cvs-remove-24.png
+share/screem/pixmaps/cvs-remove.png
+share/screem/pixmaps/cvs-update-16.png
+share/screem/pixmaps/cvs-update-24.png
+share/screem/pixmaps/cvs-update.png
+share/screem/pixmaps/entry.xpm
+share/screem/pixmaps/fixed.xpm
+share/screem/pixmaps/gallery.xpm
+share/screem/pixmaps/gnome-fileentry.xpm
+share/screem/pixmaps/hand-open.png
+share/screem/pixmaps/insert-symbol-16.png
+share/screem/pixmaps/insert-symbol-24.png
+share/screem/pixmaps/optionmenu.xpm
+share/screem/pixmaps/paragraphs.png
+share/screem/pixmaps/pre.xpm
+share/screem/pixmaps/radiobutton.xpm
+share/screem/pixmaps/resources.png
+share/screem/pixmaps/screem_site.png
+share/screem/pixmaps/site_preview.png
+share/screem/pixmaps/site_structure-48.png
+share/screem/pixmaps/stock-close-12.png
+share/screem/pixmaps/stock-menu-left-12.png
+share/screem/pixmaps/stock-menu-right-12.png
+share/screem/pixmaps/stock_connect.png
+share/screem/pixmaps/stock_disconnect.png
+share/screem/pixmaps/stock_insert_image-16.png
+share/screem/pixmaps/stock_insert_image.png
+share/screem/pixmaps/stock_insert_object-16.png
+share/screem/pixmaps/stock_insert_object.png
+share/screem/pixmaps/stock_insert_table-16.png
+share/screem/pixmaps/sub.xpm
+share/screem/pixmaps/sup.xpm
+share/screem/pixmaps/td.xpm
+share/screem/pixmaps/text.xpm
+share/screem/pixmaps/th.xpm
+share/screem/pixmaps/todo.png
+share/screem/pixmaps/tr.xpm
+share/screem/resources/Images/made.png
+share/screem/resources/Javascript/linktitle.js
+share/screem/resources/Javascript/preload.js
+share/screem/resources/Javascript/rollover.js
+share/screem/resources/Templates/template.html
+share/screem/tagtrees/apache.tagtree
+share/screem/tagtrees/cfml.tagtree
+share/screem/tagtrees/css.tagtree
+share/screem/tagtrees/funcref_php.tagtree
+share/screem/tagtrees/funcref_python.tagtree
+share/screem/tagtrees/html.tagtree
+share/screem/tagtrees/javascript.tagtree
+share/screem/tagtrees/teixlite.tagtree
+share/screem/ui/layout
+share/screem/ui/screem-editable-toolbars.xml
+share/screem/ui/screem-tag-tree-bar.xml
+share/screem/ui/screem-window-menu.xml
+share/screem/ui/screem-window-popups.xml
+share/screem/ui/screem-window-toolbar.xml
 share/locale/az/LC_MESSAGES/screem.mo
 share/locale/cs/LC_MESSAGES/screem.mo
 share/locale/da/LC_MESSAGES/screem.mo
@@ -217,27 +217,27 @@ share/locale/uk/LC_MESSAGES/screem.mo
 share/locale/vi/LC_MESSAGES/screem.mo
 share/locale/zh_CN/LC_MESSAGES/screem.mo
 share/mime/packages/screem.xml
-@dirrm share/gnome/screem/ui
-@dirrm share/gnome/screem/tagtrees
-@dirrm share/gnome/screem/resources/Templates
-@dirrm share/gnome/screem/resources/PHP3
-@dirrm share/gnome/screem/resources/Javascript
-@dirrm share/gnome/screem/resources/Images
-@dirrm share/gnome/screem/resources/HTML
-@dirrm share/gnome/screem/resources/Applets
-@dirrm share/gnome/screem/resources
-@dirrm share/gnome/screem/pixmaps
-@dirrm share/gnome/screem/hints
-@dirrm share/gnome/screem/helpers/browsers-remote
-@dirrm share/gnome/screem/helpers/browsers
-@dirrm share/gnome/screem/helpers/Tidy
-@dirrm share/gnome/screem/helpers
-@dirrm share/gnome/screem/glade
-@dirrm share/gnome/screem/dtd
-@dirrm share/gnome/screem
-@dirrm share/gnome/pixmaps/screem/splash
-@dirrm share/gnome/pixmaps/screem
-@dirrm share/gnome/omf/screem
+@dirrm share/screem/ui
+@dirrm share/screem/tagtrees
+@dirrm share/screem/resources/Templates
+@dirrm share/screem/resources/PHP3
+@dirrm share/screem/resources/Javascript
+@dirrm share/screem/resources/Images
+@dirrm share/screem/resources/HTML
+@dirrm share/screem/resources/Applets
+@dirrm share/screem/resources
+@dirrm share/screem/pixmaps
+@dirrm share/screem/hints
+@dirrm share/screem/helpers/browsers-remote
+@dirrm share/screem/helpers/browsers
+@dirrm share/screem/helpers/Tidy
+@dirrm share/screem/helpers
+@dirrm share/screem/glade
+@dirrm share/screem/dtd
+@dirrm share/screem
+@dirrm share/pixmaps/screem/splash
+@dirrm share/pixmaps/screem
+@dirrm share/omf/screem
 @dirrm share/gnome/help/screem/C/figures
 @dirrm share/gnome/help/screem/C
 @dirrm share/gnome/help/screem
@@ -249,3 +249,4 @@ share/mime/packages/screem.xml
 @unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
 @dirrmtry share/locale/rw/LC_MESSAGES
 @dirrmtry share/locale/rw
+@dirrmtry share/applications
diff --git a/www/screem/Makefile b/www/screem/Makefile
index c12b979f75cf..38dc023426b1 100644
--- a/www/screem/Makefile
+++ b/www/screem/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	screem
 PORTVERSION=	0.16.1
-PORTREVISION=	5
+PORTREVISION=	7
 CATEGORIES=	www gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -45,10 +45,10 @@ CONFIGURE_ARGS+=	--enable-enchant
 .endif
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|$${DATADIRNAME}/$${PACKAGE}|$${DATADIRNAME}/gnome/$${PACKAGE}|g ; \
-		s|-DGNOME_DISABLE_DEPRECATED||g ; \
+	@${REINPLACE_CMD} -e 's|-DGNOME_DISABLE_DEPRECATED||g ; \
 		s|-DGNOMEUI_DISABLE_DEPRECATED||g ; \
 		s|-DGTK_DISABLE_DEPRECATED||g' ${WRKSRC}/configure
-	@${REINPLACE_CMD} -e 's|\&\& make|\&\& $$(MAKE)|g' ${WRKSRC}/tests/Makefile.in
+	@${REINPLACE_CMD} -e 's|\&\& make|\&\& $$(MAKE)|g' \
+		${WRKSRC}/tests/Makefile.in
 
 .include <bsd.port.mk>
diff --git a/www/screem/pkg-plist b/www/screem/pkg-plist
index b78d729b40d9..8c3d349f4e8c 100644
--- a/www/screem/pkg-plist
+++ b/www/screem/pkg-plist
@@ -25,8 +25,8 @@ lib/screem/plugins/tableWizard.so
 lib/screem/plugins/uploadWizard.la
 lib/screem/plugins/uploadWizard.so
 libdata/pkgconfig/screem-plugin.pc
-share/gnome/application-registry/screem.applications
-share/gnome/applications/screem.desktop
+share/application-registry/screem.applications
+share/applications/screem.desktop
 @exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
 share/gnome/help/screem/C/figures/color-wizard.png
 share/gnome/help/screem/C/figures/css-wizard1.png
@@ -75,125 +75,125 @@ share/gnome/help/screem/C/figures/table-wizard.png
 share/gnome/help/screem/C/figures/tree.png
 share/gnome/help/screem/C/legal.xml
 share/gnome/help/screem/C/screem.xml
-share/gnome/omf/screem/screem-C.omf
-share/gnome/pixmaps/screem/splash/splash.png
-share/gnome/pixmaps/screem.png
-share/gnome/screem/doctypes.xml
-share/gnome/screem/dtd/HTMLlat1.ent
-share/gnome/screem/dtd/HTMLspecial.ent
-share/gnome/screem/dtd/HTMLsymbols.ent
-share/gnome/screem/dtd/catalog
-share/gnome/screem/dtd/gtkuimanager.dtd
-share/gnome/screem/dtd/http%3A%2F%2Fwww.w3.org%2FTR%2Fhtml4%2Fframeset.dtd
-share/gnome/screem/dtd/http%3A%2F%2Fwww.w3.org%2FTR%2Fhtml4%2Floose.dtd
-share/gnome/screem/dtd/http%3A%2F%2Fwww.w3.org%2FTR%2Fhtml4%2Fstrict.dtd
-share/gnome/screem/dtd/http%3A%2F%2Fwww.w3.org%2FTR%2Fxhtml1%2FDTD%2Fxhtml1-frameset.dtd
-share/gnome/screem/dtd/http%3A%2F%2Fwww.w3.org%2FTR%2Fxhtml1%2FDTD%2Fxhtml1-strict.dtd
-share/gnome/screem/dtd/http%3A%2F%2Fwww.w3.org%2FTR%2Fxhtml1%2FDTD%2Fxhtml1-transitional.dtd
-share/gnome/screem/dtd/screem-doctypes.dtd
-share/gnome/screem/dtd/screem-tagtree-config.dtd
-share/gnome/screem/dtd/screem-tagtree.dtd
-share/gnome/screem/dtd/xhtml-lat1.ent
-share/gnome/screem/dtd/xhtml-special.ent
-share/gnome/screem/dtd/xhtml-symbol.ent
-share/gnome/screem/features.xml
-share/gnome/screem/glade/css-wizard.glade
-share/gnome/screem/glade/entityWizard.glade
-share/gnome/screem/glade/linkwizard.glade
-share/gnome/screem/glade/object-wizard.glade
-share/gnome/screem/glade/screem.glade
-share/gnome/screem/glade/ssiwizard.glade
-share/gnome/screem/glade/tablewizard.glade
-share/gnome/screem/glade/uploadwizard.glade
-share/gnome/screem/helpers/Tidy/TidyHTML.desktop
-share/gnome/screem/helpers/Tidy/TidyXML.desktop
-share/gnome/screem/helpers/browsers/epiphany.desktop
-share/gnome/screem/helpers/browsers/konqueror.desktop
-share/gnome/screem/helpers/browsers/opera.desktop
-share/gnome/screem/helpers/browsers-remote/epiphany.desktop
-share/gnome/screem/helpers/browsers-remote/konqueror.desktop
-share/gnome/screem/helpers/browsers-remote/opera.desktop
-share/gnome/screem/hints/screem_hints.txt
-share/gnome/screem/hints/screem_hints_fr.txt
-share/gnome/screem/hints/screem_hints_pt_BR.txt
-share/gnome/screem/hints/screem_hints_sv.txt
-share/gnome/screem/pixmaps/add-link-16.png
-share/gnome/screem/pixmaps/add-link-24.png
-share/gnome/screem/pixmaps/add_column-16.png
-share/gnome/screem/pixmaps/add_column-24.png
-share/gnome/screem/pixmaps/add_row-16.png
-share/gnome/screem/pixmaps/add_row-24.png
-share/gnome/screem/pixmaps/bookmarks-open.png
-share/gnome/screem/pixmaps/bookmarks-preferences.png
-share/gnome/screem/pixmaps/browser.xpm
-share/gnome/screem/pixmaps/button.xpm
-share/gnome/screem/pixmaps/caption.xpm
-share/gnome/screem/pixmaps/checkbutton.xpm
-share/gnome/screem/pixmaps/cvs-add-16.png
-share/gnome/screem/pixmaps/cvs-add-24.png
-share/gnome/screem/pixmaps/cvs-add.png
-share/gnome/screem/pixmaps/cvs-checkout-16.png
-share/gnome/screem/pixmaps/cvs-checkout-24.png
-share/gnome/screem/pixmaps/cvs-checkout.png
-share/gnome/screem/pixmaps/cvs-commit-16.png
-share/gnome/screem/pixmaps/cvs-commit-24.png
-share/gnome/screem/pixmaps/cvs-remove-16.png
-share/gnome/screem/pixmaps/cvs-remove-24.png
-share/gnome/screem/pixmaps/cvs-remove.png
-share/gnome/screem/pixmaps/cvs-update-16.png
-share/gnome/screem/pixmaps/cvs-update-24.png
-share/gnome/screem/pixmaps/cvs-update.png
-share/gnome/screem/pixmaps/entry.xpm
-share/gnome/screem/pixmaps/fixed.xpm
-share/gnome/screem/pixmaps/gallery.xpm
-share/gnome/screem/pixmaps/gnome-fileentry.xpm
-share/gnome/screem/pixmaps/hand-open.png
-share/gnome/screem/pixmaps/insert-symbol-16.png
-share/gnome/screem/pixmaps/insert-symbol-24.png
-share/gnome/screem/pixmaps/optionmenu.xpm
-share/gnome/screem/pixmaps/paragraphs.png
-share/gnome/screem/pixmaps/pre.xpm
-share/gnome/screem/pixmaps/radiobutton.xpm
-share/gnome/screem/pixmaps/resources.png
-share/gnome/screem/pixmaps/screem_site.png
-share/gnome/screem/pixmaps/site_preview.png
-share/gnome/screem/pixmaps/site_structure-48.png
-share/gnome/screem/pixmaps/stock-close-12.png
-share/gnome/screem/pixmaps/stock-menu-left-12.png
-share/gnome/screem/pixmaps/stock-menu-right-12.png
-share/gnome/screem/pixmaps/stock_connect.png
-share/gnome/screem/pixmaps/stock_disconnect.png
-share/gnome/screem/pixmaps/stock_insert_image-16.png
-share/gnome/screem/pixmaps/stock_insert_image.png
-share/gnome/screem/pixmaps/stock_insert_object-16.png
-share/gnome/screem/pixmaps/stock_insert_object.png
-share/gnome/screem/pixmaps/stock_insert_table-16.png
-share/gnome/screem/pixmaps/sub.xpm
-share/gnome/screem/pixmaps/sup.xpm
-share/gnome/screem/pixmaps/td.xpm
-share/gnome/screem/pixmaps/text.xpm
-share/gnome/screem/pixmaps/th.xpm
-share/gnome/screem/pixmaps/todo.png
-share/gnome/screem/pixmaps/tr.xpm
-share/gnome/screem/resources/Images/made.png
-share/gnome/screem/resources/Javascript/linktitle.js
-share/gnome/screem/resources/Javascript/preload.js
-share/gnome/screem/resources/Javascript/rollover.js
-share/gnome/screem/resources/Templates/template.html
-share/gnome/screem/tagtrees/apache.tagtree
-share/gnome/screem/tagtrees/cfml.tagtree
-share/gnome/screem/tagtrees/css.tagtree
-share/gnome/screem/tagtrees/funcref_php.tagtree
-share/gnome/screem/tagtrees/funcref_python.tagtree
-share/gnome/screem/tagtrees/html.tagtree
-share/gnome/screem/tagtrees/javascript.tagtree
-share/gnome/screem/tagtrees/teixlite.tagtree
-share/gnome/screem/ui/layout
-share/gnome/screem/ui/screem-editable-toolbars.xml
-share/gnome/screem/ui/screem-tag-tree-bar.xml
-share/gnome/screem/ui/screem-window-menu.xml
-share/gnome/screem/ui/screem-window-popups.xml
-share/gnome/screem/ui/screem-window-toolbar.xml
+share/omf/screem/screem-C.omf
+share/pixmaps/screem/splash/splash.png
+share/pixmaps/screem.png
+share/screem/doctypes.xml
+share/screem/dtd/HTMLlat1.ent
+share/screem/dtd/HTMLspecial.ent
+share/screem/dtd/HTMLsymbols.ent
+share/screem/dtd/catalog
+share/screem/dtd/gtkuimanager.dtd
+share/screem/dtd/http%3A%2F%2Fwww.w3.org%2FTR%2Fhtml4%2Fframeset.dtd
+share/screem/dtd/http%3A%2F%2Fwww.w3.org%2FTR%2Fhtml4%2Floose.dtd
+share/screem/dtd/http%3A%2F%2Fwww.w3.org%2FTR%2Fhtml4%2Fstrict.dtd
+share/screem/dtd/http%3A%2F%2Fwww.w3.org%2FTR%2Fxhtml1%2FDTD%2Fxhtml1-frameset.dtd
+share/screem/dtd/http%3A%2F%2Fwww.w3.org%2FTR%2Fxhtml1%2FDTD%2Fxhtml1-strict.dtd
+share/screem/dtd/http%3A%2F%2Fwww.w3.org%2FTR%2Fxhtml1%2FDTD%2Fxhtml1-transitional.dtd
+share/screem/dtd/screem-doctypes.dtd
+share/screem/dtd/screem-tagtree-config.dtd
+share/screem/dtd/screem-tagtree.dtd
+share/screem/dtd/xhtml-lat1.ent
+share/screem/dtd/xhtml-special.ent
+share/screem/dtd/xhtml-symbol.ent
+share/screem/features.xml
+share/screem/glade/css-wizard.glade
+share/screem/glade/entityWizard.glade
+share/screem/glade/linkwizard.glade
+share/screem/glade/object-wizard.glade
+share/screem/glade/screem.glade
+share/screem/glade/ssiwizard.glade
+share/screem/glade/tablewizard.glade
+share/screem/glade/uploadwizard.glade
+share/screem/helpers/Tidy/TidyHTML.desktop
+share/screem/helpers/Tidy/TidyXML.desktop
+share/screem/helpers/browsers/epiphany.desktop
+share/screem/helpers/browsers/konqueror.desktop
+share/screem/helpers/browsers/opera.desktop
+share/screem/helpers/browsers-remote/epiphany.desktop
+share/screem/helpers/browsers-remote/konqueror.desktop
+share/screem/helpers/browsers-remote/opera.desktop
+share/screem/hints/screem_hints.txt
+share/screem/hints/screem_hints_fr.txt
+share/screem/hints/screem_hints_pt_BR.txt
+share/screem/hints/screem_hints_sv.txt
+share/screem/pixmaps/add-link-16.png
+share/screem/pixmaps/add-link-24.png
+share/screem/pixmaps/add_column-16.png
+share/screem/pixmaps/add_column-24.png
+share/screem/pixmaps/add_row-16.png
+share/screem/pixmaps/add_row-24.png
+share/screem/pixmaps/bookmarks-open.png
+share/screem/pixmaps/bookmarks-preferences.png
+share/screem/pixmaps/browser.xpm
+share/screem/pixmaps/button.xpm
+share/screem/pixmaps/caption.xpm
+share/screem/pixmaps/checkbutton.xpm
+share/screem/pixmaps/cvs-add-16.png
+share/screem/pixmaps/cvs-add-24.png
+share/screem/pixmaps/cvs-add.png
+share/screem/pixmaps/cvs-checkout-16.png
+share/screem/pixmaps/cvs-checkout-24.png
+share/screem/pixmaps/cvs-checkout.png
+share/screem/pixmaps/cvs-commit-16.png
+share/screem/pixmaps/cvs-commit-24.png
+share/screem/pixmaps/cvs-remove-16.png
+share/screem/pixmaps/cvs-remove-24.png
+share/screem/pixmaps/cvs-remove.png
+share/screem/pixmaps/cvs-update-16.png
+share/screem/pixmaps/cvs-update-24.png
+share/screem/pixmaps/cvs-update.png
+share/screem/pixmaps/entry.xpm
+share/screem/pixmaps/fixed.xpm
+share/screem/pixmaps/gallery.xpm
+share/screem/pixmaps/gnome-fileentry.xpm
+share/screem/pixmaps/hand-open.png
+share/screem/pixmaps/insert-symbol-16.png
+share/screem/pixmaps/insert-symbol-24.png
+share/screem/pixmaps/optionmenu.xpm
+share/screem/pixmaps/paragraphs.png
+share/screem/pixmaps/pre.xpm
+share/screem/pixmaps/radiobutton.xpm
+share/screem/pixmaps/resources.png
+share/screem/pixmaps/screem_site.png
+share/screem/pixmaps/site_preview.png
+share/screem/pixmaps/site_structure-48.png
+share/screem/pixmaps/stock-close-12.png
+share/screem/pixmaps/stock-menu-left-12.png
+share/screem/pixmaps/stock-menu-right-12.png
+share/screem/pixmaps/stock_connect.png
+share/screem/pixmaps/stock_disconnect.png
+share/screem/pixmaps/stock_insert_image-16.png
+share/screem/pixmaps/stock_insert_image.png
+share/screem/pixmaps/stock_insert_object-16.png
+share/screem/pixmaps/stock_insert_object.png
+share/screem/pixmaps/stock_insert_table-16.png
+share/screem/pixmaps/sub.xpm
+share/screem/pixmaps/sup.xpm
+share/screem/pixmaps/td.xpm
+share/screem/pixmaps/text.xpm
+share/screem/pixmaps/th.xpm
+share/screem/pixmaps/todo.png
+share/screem/pixmaps/tr.xpm
+share/screem/resources/Images/made.png
+share/screem/resources/Javascript/linktitle.js
+share/screem/resources/Javascript/preload.js
+share/screem/resources/Javascript/rollover.js
+share/screem/resources/Templates/template.html
+share/screem/tagtrees/apache.tagtree
+share/screem/tagtrees/cfml.tagtree
+share/screem/tagtrees/css.tagtree
+share/screem/tagtrees/funcref_php.tagtree
+share/screem/tagtrees/funcref_python.tagtree
+share/screem/tagtrees/html.tagtree
+share/screem/tagtrees/javascript.tagtree
+share/screem/tagtrees/teixlite.tagtree
+share/screem/ui/layout
+share/screem/ui/screem-editable-toolbars.xml
+share/screem/ui/screem-tag-tree-bar.xml
+share/screem/ui/screem-window-menu.xml
+share/screem/ui/screem-window-popups.xml
+share/screem/ui/screem-window-toolbar.xml
 share/locale/az/LC_MESSAGES/screem.mo
 share/locale/cs/LC_MESSAGES/screem.mo
 share/locale/da/LC_MESSAGES/screem.mo
@@ -217,27 +217,27 @@ share/locale/uk/LC_MESSAGES/screem.mo
 share/locale/vi/LC_MESSAGES/screem.mo
 share/locale/zh_CN/LC_MESSAGES/screem.mo
 share/mime/packages/screem.xml
-@dirrm share/gnome/screem/ui
-@dirrm share/gnome/screem/tagtrees
-@dirrm share/gnome/screem/resources/Templates
-@dirrm share/gnome/screem/resources/PHP3
-@dirrm share/gnome/screem/resources/Javascript
-@dirrm share/gnome/screem/resources/Images
-@dirrm share/gnome/screem/resources/HTML
-@dirrm share/gnome/screem/resources/Applets
-@dirrm share/gnome/screem/resources
-@dirrm share/gnome/screem/pixmaps
-@dirrm share/gnome/screem/hints
-@dirrm share/gnome/screem/helpers/browsers-remote
-@dirrm share/gnome/screem/helpers/browsers
-@dirrm share/gnome/screem/helpers/Tidy
-@dirrm share/gnome/screem/helpers
-@dirrm share/gnome/screem/glade
-@dirrm share/gnome/screem/dtd
-@dirrm share/gnome/screem
-@dirrm share/gnome/pixmaps/screem/splash
-@dirrm share/gnome/pixmaps/screem
-@dirrm share/gnome/omf/screem
+@dirrm share/screem/ui
+@dirrm share/screem/tagtrees
+@dirrm share/screem/resources/Templates
+@dirrm share/screem/resources/PHP3
+@dirrm share/screem/resources/Javascript
+@dirrm share/screem/resources/Images
+@dirrm share/screem/resources/HTML
+@dirrm share/screem/resources/Applets
+@dirrm share/screem/resources
+@dirrm share/screem/pixmaps
+@dirrm share/screem/hints
+@dirrm share/screem/helpers/browsers-remote
+@dirrm share/screem/helpers/browsers
+@dirrm share/screem/helpers/Tidy
+@dirrm share/screem/helpers
+@dirrm share/screem/glade
+@dirrm share/screem/dtd
+@dirrm share/screem
+@dirrm share/pixmaps/screem/splash
+@dirrm share/pixmaps/screem
+@dirrm share/omf/screem
 @dirrm share/gnome/help/screem/C/figures
 @dirrm share/gnome/help/screem/C
 @dirrm share/gnome/help/screem
@@ -249,3 +249,4 @@ share/mime/packages/screem.xml
 @unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
 @dirrmtry share/locale/rw/LC_MESSAGES
 @dirrmtry share/locale/rw
+@dirrmtry share/applications
diff --git a/www/syndigator/Makefile b/www/syndigator/Makefile
index f69b5fdbaa6b..8b7ea7902122 100644
--- a/www/syndigator/Makefile
+++ b/www/syndigator/Makefile
@@ -4,11 +4,12 @@
 # Whom:				ijliao
 #
 # $FreeBSD$
-#    $MCom: ports/www/syndigator/Makefile,v 1.1 2006/09/30 18:31:24 ahze Exp $
+#   $MCom: ports/www/syndigator/Makefile,v 1.4 2007/09/09 22:45:27 mezz Exp $
+#
 
 PORTNAME=	syndigator
 PORTVERSION=	0.15.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -31,7 +32,7 @@ USE_GNOME=	gnomehier
 USE_PERL5=	yes
 NO_BUILD=	yes
 
-GNOMEDIR=	${PREFIX}/share/gnome
+GNOMEDIR=	${PREFIX}/share
 
 post-patch:
 	@${PERL} -pi -e 's|./lib|${PREFIX}/${SITE_PERL_REL}/${PORTNAME}|g' \
diff --git a/www/syndigator/pkg-plist b/www/syndigator/pkg-plist
index 447333940db7..862159f14578 100644
--- a/www/syndigator/pkg-plist
+++ b/www/syndigator/pkg-plist
@@ -49,30 +49,30 @@ bin/syndigator
 %%SITE_PERL%%/syndigator/RSSReader/Parser.pm
 %%SITE_PERL%%/syndigator/RSSReader/UI/Preferences.pm
 %%SITE_PERL%%/syndigator/RSSReader.pm
-share/gnome/applications/syndigator.desktop
-share/gnome/pixmaps/syndigator.png
-share/gnome/pixmaps/syndigator/closed.png
-share/gnome/pixmaps/syndigator/comment-gs.png
-share/gnome/pixmaps/syndigator/comment.png
-share/gnome/pixmaps/syndigator/fetches_failed.png
-share/gnome/pixmaps/syndigator/fetches_failed_16.png
-share/gnome/pixmaps/syndigator/item-gtk2.png
-share/gnome/pixmaps/syndigator/item-notify-gtk2.png
-share/gnome/pixmaps/syndigator/item-notify.xpm
-share/gnome/pixmaps/syndigator/item.xpm
-share/gnome/pixmaps/syndigator/logo-124x22.xpm
-share/gnome/pixmaps/syndigator/logo-simple.gif
-share/gnome/pixmaps/syndigator/logo-simple.xpm
-share/gnome/pixmaps/syndigator/not_to_keep.xpm
-share/gnome/pixmaps/syndigator/offline.png
-share/gnome/pixmaps/syndigator/online.png
-share/gnome/pixmaps/syndigator/opened.png
-share/gnome/pixmaps/syndigator/post-comment.png
-share/gnome/pixmaps/syndigator/to_keep.png
-share/gnome/pixmaps/syndigator/tokeep-gtk2.png
-share/gnome/pixmaps/syndigator/trayicon-notify.gif
-share/gnome/pixmaps/syndigator/trayicon.gif
-@dirrm share/gnome/pixmaps/syndigator
+share/applications/syndigator.desktop
+share/pixmaps/syndigator.png
+share/pixmaps/syndigator/closed.png
+share/pixmaps/syndigator/comment-gs.png
+share/pixmaps/syndigator/comment.png
+share/pixmaps/syndigator/fetches_failed.png
+share/pixmaps/syndigator/fetches_failed_16.png
+share/pixmaps/syndigator/item-gtk2.png
+share/pixmaps/syndigator/item-notify-gtk2.png
+share/pixmaps/syndigator/item-notify.xpm
+share/pixmaps/syndigator/item.xpm
+share/pixmaps/syndigator/logo-124x22.xpm
+share/pixmaps/syndigator/logo-simple.gif
+share/pixmaps/syndigator/logo-simple.xpm
+share/pixmaps/syndigator/not_to_keep.xpm
+share/pixmaps/syndigator/offline.png
+share/pixmaps/syndigator/online.png
+share/pixmaps/syndigator/opened.png
+share/pixmaps/syndigator/post-comment.png
+share/pixmaps/syndigator/to_keep.png
+share/pixmaps/syndigator/tokeep-gtk2.png
+share/pixmaps/syndigator/trayicon-notify.gif
+share/pixmaps/syndigator/trayicon.gif
+@dirrm share/pixmaps/syndigator
 @dirrm %%SITE_PERL%%/syndigator/RSSReader/UI
 @dirrm %%SITE_PERL%%/syndigator/RSSReader/Parser
 @dirrm %%SITE_PERL%%/syndigator/RSSReader/Importer
@@ -88,3 +88,4 @@ share/gnome/pixmaps/syndigator/trayicon.gif
 @dirrmtry %%SITE_PERL%%
 @dirrmtry lib/perl5/site_perl
 @dirrmtry lib/perl5
+@dirrmtry share/applications
diff --git a/x11-clocks/gdesklets-clock/Makefile b/x11-clocks/gdesklets-clock/Makefile
index bff0f1947341..8761fdacc93d 100644
--- a/x11-clocks/gdesklets-clock/Makefile
+++ b/x11-clocks/gdesklets-clock/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	clock
 PORTVERSION=	0.32
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	x11-clocks gnome
 MASTER_SITES=	http://gdesklets.gnomedesktop.org/files/
 PKGNAMEPREFIX=	gdesklets-
@@ -23,7 +23,7 @@ USE_PYTHON=	yes
 USE_XLIB=	yes
 
 NAME=		Clock
-DATADIR=	${PREFIX}/share/gnome
+DATADIR=	${PREFIX}/share
 LANG=		de fr pt sq sr sr@Latn sv
 
 do-build:
diff --git a/x11-clocks/gdesklets-clock/pkg-message b/x11-clocks/gdesklets-clock/pkg-message
index f16b427c6d04..c9b65b336552 100644
--- a/x11-clocks/gdesklets-clock/pkg-message
+++ b/x11-clocks/gdesklets-clock/pkg-message
@@ -1,16 +1,16 @@
 ##
 To view the README:
 
-	cat ${PREFIX}/share/gnome/gdesklets/Displays/${name}/README
-	cat ${PREFIX}/share/gnome/gdesklets/Sensors/${name}/README
+	cat ${PREFIX}/share/gdesklets/Displays/${name}/README
+	cat ${PREFIX}/share/gdesklets/Sensors/${name}/README
 
 To view all installed applets:
 
-	ls ${PREFIX}/share/gnome/gdesklets/Displays
+	ls ${PREFIX}/share/gdesklets/Displays
 
 To use those applets:
 
-	gdesklets open ${PREFIX}/share/gnome/gdesklets/Displays/${name}/${name}.display
+	gdesklets open ${PREFIX}/share/gdesklets/Displays/${name}/${name}.display
 
 Replace ${name} with the correct name of the applets you want to use.
 
diff --git a/x11-clocks/gdesklets-clock/pkg-plist b/x11-clocks/gdesklets-clock/pkg-plist
index e75d46f8d072..7b4bf935c554 100644
--- a/x11-clocks/gdesklets-clock/pkg-plist
+++ b/x11-clocks/gdesklets-clock/pkg-plist
@@ -1,41 +1,41 @@
-share/gnome/gdesklets/Displays/Clock/README
-share/gnome/gdesklets/Displays/Clock/gfx/clock.png
-share/gnome/gdesklets/Displays/Clock/gfx/gnomeclock.png
-share/gnome/gdesklets/Displays/Clock/gfx/gnomeclock.xcf
-share/gnome/gdesklets/Displays/Clock/gfx/osXclock.png
-share/gnome/gdesklets/Displays/Clock/gfx/pocketwatch.png
-share/gnome/gdesklets/Displays/Clock/gfx/pocketwatch.xcf
-share/gnome/gdesklets/Displays/Clock/gfx/rafclock.png
-share/gnome/gdesklets/Displays/Clock/gnomeclock.display
-share/gnome/gdesklets/Displays/Clock/osXclock.display
-share/gnome/gdesklets/Displays/Clock/plainclock.display
-share/gnome/gdesklets/Displays/Clock/pocket-watch.display
-share/gnome/gdesklets/Displays/Clock/rafclock.display
-share/gnome/gdesklets/Sensors/Clock/README
-share/gnome/gdesklets/Sensors/Clock/__init__.py
-share/gnome/gdesklets/Sensors/Clock/locale/de/LC_MESSAGES/gdesklets.mo
-share/gnome/gdesklets/Sensors/Clock/locale/fr/LC_MESSAGES/gdesklets.mo
-share/gnome/gdesklets/Sensors/Clock/locale/pt/LC_MESSAGES/gdesklets.mo
-share/gnome/gdesklets/Sensors/Clock/locale/sq/LC_MESSAGES/gdesklets.mo
-share/gnome/gdesklets/Sensors/Clock/locale/sr/LC_MESSAGES/gdesklets.mo
-share/gnome/gdesklets/Sensors/Clock/locale/sr@Latn/LC_MESSAGES/gdesklets.mo
-share/gnome/gdesklets/Sensors/Clock/locale/sv/LC_MESSAGES/gdesklets.mo
-share/gnome/gdesklets/Sensors/Clock/timezones.dat
-@dirrm share/gnome/gdesklets/Sensors/Clock/locale/sv/LC_MESSAGES
-@dirrm share/gnome/gdesklets/Sensors/Clock/locale/sv
-@dirrm share/gnome/gdesklets/Sensors/Clock/locale/sr@Latn/LC_MESSAGES
-@dirrm share/gnome/gdesklets/Sensors/Clock/locale/sr@Latn
-@dirrm share/gnome/gdesklets/Sensors/Clock/locale/sr/LC_MESSAGES
-@dirrm share/gnome/gdesklets/Sensors/Clock/locale/sr
-@dirrm share/gnome/gdesklets/Sensors/Clock/locale/sq/LC_MESSAGES
-@dirrm share/gnome/gdesklets/Sensors/Clock/locale/sq
-@dirrm share/gnome/gdesklets/Sensors/Clock/locale/pt/LC_MESSAGES
-@dirrm share/gnome/gdesklets/Sensors/Clock/locale/pt
-@dirrm share/gnome/gdesklets/Sensors/Clock/locale/fr/LC_MESSAGES
-@dirrm share/gnome/gdesklets/Sensors/Clock/locale/fr
-@dirrm share/gnome/gdesklets/Sensors/Clock/locale/de/LC_MESSAGES
-@dirrm share/gnome/gdesklets/Sensors/Clock/locale/de
-@dirrm share/gnome/gdesklets/Sensors/Clock/locale
-@dirrm share/gnome/gdesklets/Sensors/Clock
-@dirrm share/gnome/gdesklets/Displays/Clock/gfx
-@dirrm share/gnome/gdesklets/Displays/Clock
+share/gdesklets/Displays/Clock/README
+share/gdesklets/Displays/Clock/gfx/clock.png
+share/gdesklets/Displays/Clock/gfx/gnomeclock.png
+share/gdesklets/Displays/Clock/gfx/gnomeclock.xcf
+share/gdesklets/Displays/Clock/gfx/osXclock.png
+share/gdesklets/Displays/Clock/gfx/pocketwatch.png
+share/gdesklets/Displays/Clock/gfx/pocketwatch.xcf
+share/gdesklets/Displays/Clock/gfx/rafclock.png
+share/gdesklets/Displays/Clock/gnomeclock.display
+share/gdesklets/Displays/Clock/osXclock.display
+share/gdesklets/Displays/Clock/plainclock.display
+share/gdesklets/Displays/Clock/pocket-watch.display
+share/gdesklets/Displays/Clock/rafclock.display
+share/gdesklets/Sensors/Clock/README
+share/gdesklets/Sensors/Clock/__init__.py
+share/gdesklets/Sensors/Clock/locale/de/LC_MESSAGES/gdesklets.mo
+share/gdesklets/Sensors/Clock/locale/fr/LC_MESSAGES/gdesklets.mo
+share/gdesklets/Sensors/Clock/locale/pt/LC_MESSAGES/gdesklets.mo
+share/gdesklets/Sensors/Clock/locale/sq/LC_MESSAGES/gdesklets.mo
+share/gdesklets/Sensors/Clock/locale/sr/LC_MESSAGES/gdesklets.mo
+share/gdesklets/Sensors/Clock/locale/sr@Latn/LC_MESSAGES/gdesklets.mo
+share/gdesklets/Sensors/Clock/locale/sv/LC_MESSAGES/gdesklets.mo
+share/gdesklets/Sensors/Clock/timezones.dat
+@dirrm share/gdesklets/Sensors/Clock/locale/sv/LC_MESSAGES
+@dirrm share/gdesklets/Sensors/Clock/locale/sv
+@dirrm share/gdesklets/Sensors/Clock/locale/sr@Latn/LC_MESSAGES
+@dirrm share/gdesklets/Sensors/Clock/locale/sr@Latn
+@dirrm share/gdesklets/Sensors/Clock/locale/sr/LC_MESSAGES
+@dirrm share/gdesklets/Sensors/Clock/locale/sr
+@dirrm share/gdesklets/Sensors/Clock/locale/sq/LC_MESSAGES
+@dirrm share/gdesklets/Sensors/Clock/locale/sq
+@dirrm share/gdesklets/Sensors/Clock/locale/pt/LC_MESSAGES
+@dirrm share/gdesklets/Sensors/Clock/locale/pt
+@dirrm share/gdesklets/Sensors/Clock/locale/fr/LC_MESSAGES
+@dirrm share/gdesklets/Sensors/Clock/locale/fr
+@dirrm share/gdesklets/Sensors/Clock/locale/de/LC_MESSAGES
+@dirrm share/gdesklets/Sensors/Clock/locale/de
+@dirrm share/gdesklets/Sensors/Clock/locale
+@dirrm share/gdesklets/Sensors/Clock
+@dirrm share/gdesklets/Displays/Clock/gfx
+@dirrm share/gdesklets/Displays/Clock
diff --git a/x11-clocks/gdesklets-countdown/Makefile b/x11-clocks/gdesklets-countdown/Makefile
index 992341e22f70..8e032390c8d0 100644
--- a/x11-clocks/gdesklets-countdown/Makefile
+++ b/x11-clocks/gdesklets-countdown/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	countdown
 PORTVERSION=	0.8
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	x11-clocks gnome
 MASTER_SITES=	http://gdesklets.gnomedesktop.org/files/
 PKGNAMEPREFIX=	gdesklets-
@@ -23,7 +23,7 @@ USE_XLIB=	yes
 USE_PYTHON=	yes
 
 NAME=		Countdown
-DATADIR=	${PREFIX}/share/gnome
+DATADIR=	${PREFIX}/share
 PKGMESSAGE=	${WRKDIR}/pkg-message
 
 do-build:
diff --git a/x11-clocks/gdesklets-countdown/pkg-message b/x11-clocks/gdesklets-countdown/pkg-message
index 444cfc57fe16..9fd7bd2d6086 100644
--- a/x11-clocks/gdesklets-countdown/pkg-message
+++ b/x11-clocks/gdesklets-countdown/pkg-message
@@ -1,16 +1,16 @@
 ##
 To view the README:
 
-	cat %%PREFIX%%/share/gnome/gdesklets/Displays/Countdown/README
-	cat %%PREFIX%%/share/gnome/gdesklets/Sensors/Countdown/README
+	cat %%PREFIX%%/share/gdesklets/Displays/Countdown/README
+	cat %%PREFIX%%/share/gdesklets/Sensors/Countdown/README
 
 To view all installed applets:
 
-	ls %%PREFIX%%/share/gnome/gdesklets/Displays
+	ls %%PREFIX%%/share/gdesklets/Displays
 
 To use those applets:
 
-	gdesklets open %%PREFIX%%/share/gnome/gdesklets/Displays/Countdown/Countdown.display
+	gdesklets open %%PREFIX%%/share/gdesklets/Displays/Countdown/Countdown.display
 
 NOTE: Be sure to login as your user when you use the gdesklets command,
       as the configuration will be stored in the ~/.gdesklets/ directory.
diff --git a/x11-clocks/gdesklets-countdown/pkg-plist b/x11-clocks/gdesklets-countdown/pkg-plist
index 2cf75c0f8eb7..feab11e48c57 100644
--- a/x11-clocks/gdesklets-countdown/pkg-plist
+++ b/x11-clocks/gdesklets-countdown/pkg-plist
@@ -1,16 +1,16 @@
-share/gnome/gdesklets/Displays/Countdown/Countdown.display
-share/gnome/gdesklets/Displays/Countdown/README
-share/gnome/gdesklets/Displays/Countdown/gfx/frame.png
-share/gnome/gdesklets/Displays/Countdown/gfx/safari1.png
-share/gnome/gdesklets/Displays/Countdown/gfx/safari2.png
-share/gnome/gdesklets/Displays/Countdown/gfx/safari3.png
-share/gnome/gdesklets/Sensors/Countdown/__init__.py
-share/gnome/gdesklets/Sensors/Countdown/__init__.pyc
-share/gnome/gdesklets/Sensors/Countdown/__init__.pyo
-share/gnome/gdesklets/Sensors/LTVFontSelector/__init__.py
-share/gnome/gdesklets/Sensors/LTVFontSelector/__init__.pyc
-share/gnome/gdesklets/Sensors/LTVFontSelector/__init__.pyo
-@dirrm share/gnome/gdesklets/Sensors/LTVFontSelector
-@dirrm share/gnome/gdesklets/Sensors/Countdown
-@dirrm share/gnome/gdesklets/Displays/Countdown/gfx
-@dirrm share/gnome/gdesklets/Displays/Countdown
+share/gdesklets/Displays/Countdown/Countdown.display
+share/gdesklets/Displays/Countdown/README
+share/gdesklets/Displays/Countdown/gfx/frame.png
+share/gdesklets/Displays/Countdown/gfx/safari1.png
+share/gdesklets/Displays/Countdown/gfx/safari2.png
+share/gdesklets/Displays/Countdown/gfx/safari3.png
+share/gdesklets/Sensors/Countdown/__init__.py
+share/gdesklets/Sensors/Countdown/__init__.pyc
+share/gdesklets/Sensors/Countdown/__init__.pyo
+share/gdesklets/Sensors/LTVFontSelector/__init__.py
+share/gdesklets/Sensors/LTVFontSelector/__init__.pyc
+share/gdesklets/Sensors/LTVFontSelector/__init__.pyo
+@dirrm share/gdesklets/Sensors/LTVFontSelector
+@dirrm share/gdesklets/Sensors/Countdown
+@dirrm share/gdesklets/Displays/Countdown/gfx
+@dirrm share/gdesklets/Displays/Countdown
diff --git a/x11-clocks/gdesklets-ebichuclock/Makefile b/x11-clocks/gdesklets-ebichuclock/Makefile
index a6b2f61904ef..ec65f90095cd 100644
--- a/x11-clocks/gdesklets-ebichuclock/Makefile
+++ b/x11-clocks/gdesklets-ebichuclock/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ebichuclock
 PORTVERSION=	0.1.1
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	x11-clocks gnome
 MASTER_SITES=	http://gdesklets.gnomedesktop.org/files/
 PKGNAMEPREFIX=	gdesklets-
@@ -16,13 +16,13 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A very simple clock with a small Ebichu picture in it
 
 RUN_DEPENDS=	gdesklets:${PORTSDIR}/deskutils/gdesklets \
-		${LOCALBASE}/share/gnome/gdesklets/Sensors/Clock/__init__.py:${PORTSDIR}/x11-clocks/gdesklets-clock
+		${LOCALBASE}/share/gdesklets/Sensors/Clock/__init__.py:${PORTSDIR}/x11-clocks/gdesklets-clock
 
 USE_BZIP2=	yes
 USE_XLIB=	yes
 
 NAME=		ebichuclock
-DATADIR=	${PREFIX}/share/gnome
+DATADIR=	${PREFIX}/share
 PKGMESSAGE=	${WRKDIR}/pkg-message
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
diff --git a/x11-clocks/gdesklets-ebichuclock/pkg-message b/x11-clocks/gdesklets-ebichuclock/pkg-message
index 6410433455a2..f1fd712ef551 100644
--- a/x11-clocks/gdesklets-ebichuclock/pkg-message
+++ b/x11-clocks/gdesklets-ebichuclock/pkg-message
@@ -1,9 +1,9 @@
 
 To list displays installed by this port:
 
-    ls %%PREFIX%%/share/gnome/gdesklets/Displays/%%NAME%%
+    ls %%PREFIX%%/share/gdesklets/Displays/%%NAME%%
 
 To add this desklet to your desktop:
 
-    gdesklets open %%PREFIX%%/share/gnome/gdesklets/Displays/%%NAME%%/<name>.display
+    gdesklets open %%PREFIX%%/share/gdesklets/Displays/%%NAME%%/<name>.display
 
diff --git a/x11-clocks/gdesklets-ebichuclock/pkg-plist b/x11-clocks/gdesklets-ebichuclock/pkg-plist
index 3b7773ea451f..4e4807c622e2 100644
--- a/x11-clocks/gdesklets-ebichuclock/pkg-plist
+++ b/x11-clocks/gdesklets-ebichuclock/pkg-plist
@@ -1,11 +1,11 @@
-share/gnome/gdesklets/Displays/ebichuclock/README
-share/gnome/gdesklets/Displays/ebichuclock/ebichuclock-happy.display
-share/gnome/gdesklets/Displays/ebichuclock/ebichuclock-pie.display
-share/gnome/gdesklets/Displays/ebichuclock/ebichuclock-xface.display
-share/gnome/gdesklets/Displays/ebichuclock/ebichuclock.display
-share/gnome/gdesklets/Displays/ebichuclock/gfx/ebichu0.png
-share/gnome/gdesklets/Displays/ebichuclock/gfx/ebichu1.png
-share/gnome/gdesklets/Displays/ebichuclock/gfx/ebichu2.png
-share/gnome/gdesklets/Displays/ebichuclock/gfx/ebichuclock.png
-@dirrm share/gnome/gdesklets/Displays/ebichuclock/gfx
-@dirrm share/gnome/gdesklets/Displays/ebichuclock
+share/gdesklets/Displays/ebichuclock/README
+share/gdesklets/Displays/ebichuclock/ebichuclock-happy.display
+share/gdesklets/Displays/ebichuclock/ebichuclock-pie.display
+share/gdesklets/Displays/ebichuclock/ebichuclock-xface.display
+share/gdesklets/Displays/ebichuclock/ebichuclock.display
+share/gdesklets/Displays/ebichuclock/gfx/ebichu0.png
+share/gdesklets/Displays/ebichuclock/gfx/ebichu1.png
+share/gdesklets/Displays/ebichuclock/gfx/ebichu2.png
+share/gdesklets/Displays/ebichuclock/gfx/ebichuclock.png
+@dirrm share/gdesklets/Displays/ebichuclock/gfx
+@dirrm share/gdesklets/Displays/ebichuclock
diff --git a/x11-clocks/gtubeclock/Makefile b/x11-clocks/gtubeclock/Makefile
index e5cf1ff262f3..addfc48e34d4 100644
--- a/x11-clocks/gtubeclock/Makefile
+++ b/x11-clocks/gtubeclock/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gtubeclock
 PORTVERSION=	0.9.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	x11-clocks
 MASTER_SITES=	http://www.bonnyswan.com/gtubeclock/downloads/
 
diff --git a/x11-clocks/gtubeclock/pkg-plist b/x11-clocks/gtubeclock/pkg-plist
index f10c80c9fbb6..821646a4de49 100644
--- a/x11-clocks/gtubeclock/pkg-plist
+++ b/x11-clocks/gtubeclock/pkg-plist
@@ -1,33 +1,34 @@
 bin/gtubeclock
-share/gnome/applications/gtubeclock.desktop
-share/gnome/gtubeclock/gtubeclock.settings
-share/gnome/gtubeclock/pixmaps/newclock/1-0.png
-share/gnome/gtubeclock/pixmaps/newclock/1-1.png
-share/gnome/gtubeclock/pixmaps/newclock/1-2.png
-share/gnome/gtubeclock/pixmaps/newclock/1-3.png
-share/gnome/gtubeclock/pixmaps/newclock/1-4.png
-share/gnome/gtubeclock/pixmaps/newclock/1-5.png
-share/gnome/gtubeclock/pixmaps/newclock/1-6.png
-share/gnome/gtubeclock/pixmaps/newclock/1-7.png
-share/gnome/gtubeclock/pixmaps/newclock/1-8.png
-share/gnome/gtubeclock/pixmaps/newclock/1-9.png
-share/gnome/gtubeclock/pixmaps/newclock/AM.png
-share/gnome/gtubeclock/pixmaps/newclock/Background.png
-share/gnome/gtubeclock/pixmaps/newclock/PM.png
-share/gnome/gtubeclock/pixmaps/tubeclock/1-0.png
-share/gnome/gtubeclock/pixmaps/tubeclock/1-1.png
-share/gnome/gtubeclock/pixmaps/tubeclock/1-2.png
-share/gnome/gtubeclock/pixmaps/tubeclock/1-3.png
-share/gnome/gtubeclock/pixmaps/tubeclock/1-4.png
-share/gnome/gtubeclock/pixmaps/tubeclock/1-5.png
-share/gnome/gtubeclock/pixmaps/tubeclock/1-6.png
-share/gnome/gtubeclock/pixmaps/tubeclock/1-7.png
-share/gnome/gtubeclock/pixmaps/tubeclock/1-8.png
-share/gnome/gtubeclock/pixmaps/tubeclock/1-9.png
-share/gnome/gtubeclock/pixmaps/tubeclock/Background-scaled.png
-share/gnome/gtubeclock/pixmaps/tubeclock/Background.png
-share/gnome/gtubeclock/pixmaps/tubeclock/Reflection.png
-@dirrm share/gnome/gtubeclock/pixmaps/tubeclock
-@dirrm share/gnome/gtubeclock/pixmaps/newclock
-@dirrm share/gnome/gtubeclock/pixmaps
-@dirrm share/gnome/gtubeclock
+share/applications/gtubeclock.desktop
+share/gtubeclock/gtubeclock.settings
+share/gtubeclock/pixmaps/newclock/1-0.png
+share/gtubeclock/pixmaps/newclock/1-1.png
+share/gtubeclock/pixmaps/newclock/1-2.png
+share/gtubeclock/pixmaps/newclock/1-3.png
+share/gtubeclock/pixmaps/newclock/1-4.png
+share/gtubeclock/pixmaps/newclock/1-5.png
+share/gtubeclock/pixmaps/newclock/1-6.png
+share/gtubeclock/pixmaps/newclock/1-7.png
+share/gtubeclock/pixmaps/newclock/1-8.png
+share/gtubeclock/pixmaps/newclock/1-9.png
+share/gtubeclock/pixmaps/newclock/AM.png
+share/gtubeclock/pixmaps/newclock/Background.png
+share/gtubeclock/pixmaps/newclock/PM.png
+share/gtubeclock/pixmaps/tubeclock/1-0.png
+share/gtubeclock/pixmaps/tubeclock/1-1.png
+share/gtubeclock/pixmaps/tubeclock/1-2.png
+share/gtubeclock/pixmaps/tubeclock/1-3.png
+share/gtubeclock/pixmaps/tubeclock/1-4.png
+share/gtubeclock/pixmaps/tubeclock/1-5.png
+share/gtubeclock/pixmaps/tubeclock/1-6.png
+share/gtubeclock/pixmaps/tubeclock/1-7.png
+share/gtubeclock/pixmaps/tubeclock/1-8.png
+share/gtubeclock/pixmaps/tubeclock/1-9.png
+share/gtubeclock/pixmaps/tubeclock/Background-scaled.png
+share/gtubeclock/pixmaps/tubeclock/Background.png
+share/gtubeclock/pixmaps/tubeclock/Reflection.png
+@dirrm share/gtubeclock/pixmaps/tubeclock
+@dirrm share/gtubeclock/pixmaps/newclock
+@dirrm share/gtubeclock/pixmaps
+@dirrm share/gtubeclock
+@dirrmtry share/applications
diff --git a/x11-clocks/sanduhr/Makefile b/x11-clocks/sanduhr/Makefile
index dc44e09a4570..5d6ed958eb3e 100644
--- a/x11-clocks/sanduhr/Makefile
+++ b/x11-clocks/sanduhr/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	sanduhr
 PORTVERSION=	1.93
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-clocks gnome
 MASTER_SITES=	http://seehuhn.de/data/
 
diff --git a/x11-clocks/sanduhr/pkg-plist b/x11-clocks/sanduhr/pkg-plist
index f7eb4b32d616..bd9b75d66fe6 100644
--- a/x11-clocks/sanduhr/pkg-plist
+++ b/x11-clocks/sanduhr/pkg-plist
@@ -1,36 +1,36 @@
 bin/sanduhr
 libdata/bonobo/servers/sanduhr.server
-share/locale/de/LC_MESSAGES/sanduhr.mo
 share/gnome/apps/Utilities/sanduhr.desktop
-share/gnome/help/sanduhr/C/sanduhr.xml
-share/gnome/help/sanduhr/C/factoryref.xml
 share/gnome/help/sanduhr/C/alarmref.xml
+share/gnome/help/sanduhr/C/factoryref.xml
+share/gnome/help/sanduhr/C/sanduhr.xml
 share/gnome/help/sanduhr/C/timerref.xml
 share/gnome/help/sanduhr/C/topic.dat
-share/gnome/help/sanduhr/de/sanduhr.xml
-share/gnome/help/sanduhr/de/factoryref.xml
 share/gnome/help/sanduhr/de/alarmref.xml
+share/gnome/help/sanduhr/de/factoryref.xml
+share/gnome/help/sanduhr/de/sanduhr.xml
 share/gnome/help/sanduhr/de/timerref.xml
-share/gnome/idl/sanduhr.idl
-share/gnome/omf/sanduhr/sanduhr-C.omf
-share/gnome/omf/sanduhr/sanduhr-de.omf
-share/gnome/pixmaps/sanduhr/default/back.png
-share/gnome/pixmaps/sanduhr/default/front.png
-share/gnome/pixmaps/sanduhr/default/mask.png
-share/gnome/pixmaps/sanduhr/steel/back.png
-share/gnome/pixmaps/sanduhr/steel/front.png
-share/gnome/pixmaps/sanduhr/steel/mask.png
-share/gnome/pixmaps/sanduhr/about.png
-share/gnome/pixmaps/sanduhr/logo.png
-share/gnome/pixmaps/sanduhr/icon.xpm
-share/gnome/sounds/sanduhr/bell.wav
-@dirrmtry share/gnome/pixmaps/sanduhr/steel
-@dirrmtry share/gnome/pixmaps/sanduhr/default
-@dirrmtry share/gnome/pixmaps/sanduhr
-@dirrmtry share/gnome/help/sanduhr/de/figures
-@dirrmtry share/gnome/help/sanduhr/de
-@dirrmtry share/gnome/help/sanduhr/C/figures
-@dirrmtry share/gnome/help/sanduhr/C
-@dirrmtry share/gnome/help/sanduhr
-@dirrmtry share/gnome/sounds/sanduhr
-@dirrmtry share/gnome/omf/sanduhr
+share/idl/sanduhr.idl
+share/locale/de/LC_MESSAGES/sanduhr.mo
+share/omf/sanduhr/sanduhr-C.omf
+share/omf/sanduhr/sanduhr-de.omf
+share/pixmaps/sanduhr/about.png
+share/pixmaps/sanduhr/default/back.png
+share/pixmaps/sanduhr/default/front.png
+share/pixmaps/sanduhr/default/mask.png
+share/pixmaps/sanduhr/icon.xpm
+share/pixmaps/sanduhr/logo.png
+share/pixmaps/sanduhr/steel/back.png
+share/pixmaps/sanduhr/steel/front.png
+share/pixmaps/sanduhr/steel/mask.png
+share/sounds/sanduhr/bell.wav
+@dirrm share/sounds/sanduhr
+@dirrm share/pixmaps/sanduhr/steel
+@dirrm share/pixmaps/sanduhr/default
+@dirrm share/pixmaps/sanduhr
+@dirrm share/omf/sanduhr
+@dirrm share/gnome/help/sanduhr/de/figures
+@dirrm share/gnome/help/sanduhr/de
+@dirrm share/gnome/help/sanduhr/C/figures
+@dirrm share/gnome/help/sanduhr/C
+@dirrm share/gnome/help/sanduhr
diff --git a/x11-fm/gnome-commander/Makefile b/x11-fm/gnome-commander/Makefile
index 2271cc19423f..b950f6c1caf5 100644
--- a/x11-fm/gnome-commander/Makefile
+++ b/x11-fm/gnome-commander/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gnome-commander
 PORTVERSION=	1.0.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	x11-fm gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-commander/1.0/
@@ -28,8 +28,8 @@ USE_GMAKE=	yes
 USE_BZIP2=	yes
 USE_GNOME=	gnomeprefix gnomehack gnometarget gnomevfs gnomelibs gdkpixbuf
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
-		LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib -lintl"
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LIBS="-L${LOCALBASE}/lib -lintl"
 
 .include <bsd.port.pre.mk>
 
diff --git a/x11-fm/gnome-commander/files/patch-configure b/x11-fm/gnome-commander/files/patch-configure
deleted file mode 100644
index 7921d595f0c7..000000000000
--- a/x11-fm/gnome-commander/files/patch-configure
+++ /dev/null
@@ -1,18 +0,0 @@
---- configure.orig	Fri Oct 24 00:59:12 2003
-+++ configure	Fri Oct 24 00:59:25 2003
-@@ -9397,13 +9397,13 @@
- if test "x${prefix}" = "xNONE"; then
- 
- cat >>confdefs.h <<_ACEOF
--#define PIXMAPS_DIR "${ac_default_prefix}/share/pixmaps/${PACKAGE}"
-+#define PIXMAPS_DIR "${ac_default_prefix}/share/gnome/pixmaps/${PACKAGE}"
- _ACEOF
- 
- else
- 
- cat >>confdefs.h <<_ACEOF
--#define PIXMAPS_DIR "${prefix}/share/pixmaps/${PACKAGE}"
-+#define PIXMAPS_DIR "${prefix}/share/gnome/pixmaps/${PACKAGE}"
- _ACEOF
- 
- fi
diff --git a/x11-fm/gnome-commander/pkg-plist b/x11-fm/gnome-commander/pkg-plist
index 7014bc0ccfd4..c5b0d20a0ff2 100644
--- a/x11-fm/gnome-commander/pkg-plist
+++ b/x11-fm/gnome-commander/pkg-plist
@@ -1,83 +1,5 @@
 bin/gnome-commander
 share/gnome/apps/Applications/gnome-commander.desktop
-share/gnome/pixmaps/gnome-commander/device-icons/burner.xpm
-share/gnome/pixmaps/gnome-commander/device-icons/camera.xpm
-share/gnome/pixmaps/gnome-commander/device-icons/cdrom.xpm
-share/gnome/pixmaps/gnome-commander/device-icons/floppy.xpm
-share/gnome/pixmaps/gnome-commander/device-icons/zip.xpm
-share/gnome/pixmaps/gnome-commander/exec.xpm
-share/gnome/pixmaps/gnome-commander/file-type-icons/file_type_block_device.xpm
-share/gnome/pixmaps/gnome-commander/file-type-icons/file_type_char_device.xpm
-share/gnome/pixmaps/gnome-commander/file-type-icons/file_type_dir.xpm
-share/gnome/pixmaps/gnome-commander/file-type-icons/file_type_fifo.xpm
-share/gnome/pixmaps/gnome-commander/file-type-icons/file_type_regular.xpm
-share/gnome/pixmaps/gnome-commander/file-type-icons/file_type_socket.xpm
-share/gnome/pixmaps/gnome-commander/file-type-icons/file_type_symlink.xpm
-share/gnome/pixmaps/gnome-commander/ftp.xpm
-share/gnome/pixmaps/gnome-commander/ftp_connect.xpm
-share/gnome/pixmaps/gnome-commander/ftp_disconnect.xpm
-share/gnome/pixmaps/gnome-commander/gcmd-icon1.png
-share/gnome/pixmaps/gnome-commander/gcmd-icon1.xpm
-share/gnome/pixmaps/gnome-commander/gcmd-icon2.png
-share/gnome/pixmaps/gnome-commander/gcmd-icon3.xpm
-share/gnome/pixmaps/gnome-commander/gnome_cmd_arrow_blank.xpm
-share/gnome/pixmaps/gnome-commander/gnome_cmd_arrow_down.xpm
-share/gnome/pixmaps/gnome-commander/gnome_cmd_arrow_up.xpm
-share/gnome/pixmaps/gnome-commander/home.xpm
-share/gnome/pixmaps/gnome-commander/key.xpm
-share/gnome/pixmaps/gnome-commander/lock.xpm
-share/gnome/pixmaps/gnome-commander/menu_bookmark.xpm
-share/gnome/pixmaps/gnome-commander/menu_ftp_connect.xpm
-share/gnome/pixmaps/gnome-commander/menu_ftp_disconnect.xpm
-share/gnome/pixmaps/gnome-commander/mime-icons/gnome-application-msword.png
-share/gnome/pixmaps/gnome-commander/mime-icons/gnome-application-pdf.png
-share/gnome/pixmaps/gnome-commander/mime-icons/gnome-application-postscript.png
-share/gnome/pixmaps/gnome-commander/mime-icons/gnome-application-vnd.ms-excel.png
-share/gnome/pixmaps/gnome-commander/mime-icons/gnome-application-vnd.ms-powerpoint.png
-share/gnome/pixmaps/gnome-commander/mime-icons/gnome-application-vnd.sun.xml.calc.png
-share/gnome/pixmaps/gnome-commander/mime-icons/gnome-application-vnd.sun.xml.draw.png
-share/gnome/pixmaps/gnome-commander/mime-icons/gnome-application-vnd.sun.xml.impress.png
-share/gnome/pixmaps/gnome-commander/mime-icons/gnome-application-vnd.sun.xml.writer.math.png
-share/gnome/pixmaps/gnome-commander/mime-icons/gnome-application-vnd.sun.xml.writer.png
-share/gnome/pixmaps/gnome-commander/mime-icons/gnome-application-x-anjuta-project.png
-share/gnome/pixmaps/gnome-commander/mime-icons/gnome-application-x-arj.png
-share/gnome/pixmaps/gnome-commander/mime-icons/gnome-application-x-bzip.png
-share/gnome/pixmaps/gnome-commander/mime-icons/gnome-application-x-compressed.png
-share/gnome/pixmaps/gnome-commander/mime-icons/gnome-application-x-dia-diagram.png
-share/gnome/pixmaps/gnome-commander/mime-icons/gnome-application-x-executable-binary.png
-share/gnome/pixmaps/gnome-commander/mime-icons/gnome-application-x-glade.png
-share/gnome/pixmaps/gnome-commander/mime-icons/gnome-application-x-gnumeric.png
-share/gnome/pixmaps/gnome-commander/mime-icons/gnome-application-x-gzip.png
-share/gnome/pixmaps/gnome-commander/mime-icons/gnome-application-x-mrproject.png
-share/gnome/pixmaps/gnome-commander/mime-icons/gnome-application-x-ogg.png
-share/gnome/pixmaps/gnome-commander/mime-icons/gnome-application-x-rpm.png
-share/gnome/pixmaps/gnome-commander/mime-icons/gnome-application-zip.png
-share/gnome/pixmaps/gnome-commander/mime-icons/gnome-audio-plain.png
-share/gnome/pixmaps/gnome-commander/mime-icons/gnome-audio-x-mp3.png
-share/gnome/pixmaps/gnome-commander/mime-icons/gnome-compressed.png
-share/gnome/pixmaps/gnome-commander/mime-icons/gnome-image-plain.png
-share/gnome/pixmaps/gnome-commander/mime-icons/gnome-text-html.png
-share/gnome/pixmaps/gnome-commander/mime-icons/gnome-text-plain.png
-share/gnome/pixmaps/gnome-commander/mime-icons/gnome-text-x-c-header.png
-share/gnome/pixmaps/gnome-commander/mime-icons/gnome-text-x-c.png
-share/gnome/pixmaps/gnome-commander/mime-icons/gnome-text-x-sh.png
-share/gnome/pixmaps/gnome-commander/mime-icons/gnome-video-plain.png
-share/gnome/pixmaps/gnome-commander/mime-icons/i-blockdev.png
-share/gnome/pixmaps/gnome-commander/mime-icons/i-chardev.png
-share/gnome/pixmaps/gnome-commander/mime-icons/i-directory.png
-share/gnome/pixmaps/gnome-commander/mime-icons/i-fifo.png
-share/gnome/pixmaps/gnome-commander/mime-icons/i-music.png
-share/gnome/pixmaps/gnome-commander/mime-icons/i-regular.png
-share/gnome/pixmaps/gnome-commander/mime-icons/i-socket.png
-share/gnome/pixmaps/gnome-commander/mime-icons/i-symlink.png
-share/gnome/pixmaps/gnome-commander/mkdir.xpm
-share/gnome/pixmaps/gnome-commander/overlay_symlink.xpm
-share/gnome/pixmaps/gnome-commander/overlay_umount.xpm
-share/gnome/pixmaps/gnome-commander/parent_dir.xpm
-share/gnome/pixmaps/gnome-commander/root_dir.xpm
-share/gnome/pixmaps/gnome-commander/server.xpm
-share/gnome/pixmaps/gnome-commander/smb-computer.xpm
-share/gnome/pixmaps/gnome-commander/smb-network.xpm
 share/locale/de/LC_MESSAGES/gnome-commander.mo
 share/locale/es/LC_MESSAGES/gnome-commander.mo
 share/locale/fr/LC_MESSAGES/gnome-commander.mo
@@ -85,7 +7,85 @@ share/locale/pl/LC_MESSAGES/gnome-commander.mo
 share/locale/ru/LC_MESSAGES/gnome-commander.mo
 share/locale/sk/LC_MESSAGES/gnome-commander.mo
 share/locale/sv/LC_MESSAGES/gnome-commander.mo
-@dirrm share/gnome/pixmaps/gnome-commander/file-type-icons
-@dirrm share/gnome/pixmaps/gnome-commander/device-icons
-@dirrm share/gnome/pixmaps/gnome-commander/mime-icons
-@dirrm share/gnome/pixmaps/gnome-commander
+share/pixmaps/gnome-commander/device-icons/burner.xpm
+share/pixmaps/gnome-commander/device-icons/camera.xpm
+share/pixmaps/gnome-commander/device-icons/cdrom.xpm
+share/pixmaps/gnome-commander/device-icons/floppy.xpm
+share/pixmaps/gnome-commander/device-icons/zip.xpm
+share/pixmaps/gnome-commander/exec.xpm
+share/pixmaps/gnome-commander/file-type-icons/file_type_block_device.xpm
+share/pixmaps/gnome-commander/file-type-icons/file_type_char_device.xpm
+share/pixmaps/gnome-commander/file-type-icons/file_type_dir.xpm
+share/pixmaps/gnome-commander/file-type-icons/file_type_fifo.xpm
+share/pixmaps/gnome-commander/file-type-icons/file_type_regular.xpm
+share/pixmaps/gnome-commander/file-type-icons/file_type_socket.xpm
+share/pixmaps/gnome-commander/file-type-icons/file_type_symlink.xpm
+share/pixmaps/gnome-commander/ftp.xpm
+share/pixmaps/gnome-commander/ftp_connect.xpm
+share/pixmaps/gnome-commander/ftp_disconnect.xpm
+share/pixmaps/gnome-commander/gcmd-icon1.png
+share/pixmaps/gnome-commander/gcmd-icon1.xpm
+share/pixmaps/gnome-commander/gcmd-icon2.png
+share/pixmaps/gnome-commander/gcmd-icon3.xpm
+share/pixmaps/gnome-commander/gnome_cmd_arrow_blank.xpm
+share/pixmaps/gnome-commander/gnome_cmd_arrow_down.xpm
+share/pixmaps/gnome-commander/gnome_cmd_arrow_up.xpm
+share/pixmaps/gnome-commander/home.xpm
+share/pixmaps/gnome-commander/key.xpm
+share/pixmaps/gnome-commander/lock.xpm
+share/pixmaps/gnome-commander/menu_bookmark.xpm
+share/pixmaps/gnome-commander/menu_ftp_connect.xpm
+share/pixmaps/gnome-commander/menu_ftp_disconnect.xpm
+share/pixmaps/gnome-commander/mime-icons/gnome-application-msword.png
+share/pixmaps/gnome-commander/mime-icons/gnome-application-pdf.png
+share/pixmaps/gnome-commander/mime-icons/gnome-application-postscript.png
+share/pixmaps/gnome-commander/mime-icons/gnome-application-vnd.ms-excel.png
+share/pixmaps/gnome-commander/mime-icons/gnome-application-vnd.ms-powerpoint.png
+share/pixmaps/gnome-commander/mime-icons/gnome-application-vnd.sun.xml.calc.png
+share/pixmaps/gnome-commander/mime-icons/gnome-application-vnd.sun.xml.draw.png
+share/pixmaps/gnome-commander/mime-icons/gnome-application-vnd.sun.xml.impress.png
+share/pixmaps/gnome-commander/mime-icons/gnome-application-vnd.sun.xml.writer.math.png
+share/pixmaps/gnome-commander/mime-icons/gnome-application-vnd.sun.xml.writer.png
+share/pixmaps/gnome-commander/mime-icons/gnome-application-x-anjuta-project.png
+share/pixmaps/gnome-commander/mime-icons/gnome-application-x-arj.png
+share/pixmaps/gnome-commander/mime-icons/gnome-application-x-bzip.png
+share/pixmaps/gnome-commander/mime-icons/gnome-application-x-compressed.png
+share/pixmaps/gnome-commander/mime-icons/gnome-application-x-dia-diagram.png
+share/pixmaps/gnome-commander/mime-icons/gnome-application-x-executable-binary.png
+share/pixmaps/gnome-commander/mime-icons/gnome-application-x-glade.png
+share/pixmaps/gnome-commander/mime-icons/gnome-application-x-gnumeric.png
+share/pixmaps/gnome-commander/mime-icons/gnome-application-x-gzip.png
+share/pixmaps/gnome-commander/mime-icons/gnome-application-x-mrproject.png
+share/pixmaps/gnome-commander/mime-icons/gnome-application-x-ogg.png
+share/pixmaps/gnome-commander/mime-icons/gnome-application-x-rpm.png
+share/pixmaps/gnome-commander/mime-icons/gnome-application-zip.png
+share/pixmaps/gnome-commander/mime-icons/gnome-audio-plain.png
+share/pixmaps/gnome-commander/mime-icons/gnome-audio-x-mp3.png
+share/pixmaps/gnome-commander/mime-icons/gnome-compressed.png
+share/pixmaps/gnome-commander/mime-icons/gnome-image-plain.png
+share/pixmaps/gnome-commander/mime-icons/gnome-text-html.png
+share/pixmaps/gnome-commander/mime-icons/gnome-text-plain.png
+share/pixmaps/gnome-commander/mime-icons/gnome-text-x-c-header.png
+share/pixmaps/gnome-commander/mime-icons/gnome-text-x-c.png
+share/pixmaps/gnome-commander/mime-icons/gnome-text-x-sh.png
+share/pixmaps/gnome-commander/mime-icons/gnome-video-plain.png
+share/pixmaps/gnome-commander/mime-icons/i-blockdev.png
+share/pixmaps/gnome-commander/mime-icons/i-chardev.png
+share/pixmaps/gnome-commander/mime-icons/i-directory.png
+share/pixmaps/gnome-commander/mime-icons/i-fifo.png
+share/pixmaps/gnome-commander/mime-icons/i-music.png
+share/pixmaps/gnome-commander/mime-icons/i-regular.png
+share/pixmaps/gnome-commander/mime-icons/i-socket.png
+share/pixmaps/gnome-commander/mime-icons/i-symlink.png
+share/pixmaps/gnome-commander/mkdir.xpm
+share/pixmaps/gnome-commander/overlay_symlink.xpm
+share/pixmaps/gnome-commander/overlay_umount.xpm
+share/pixmaps/gnome-commander/parent_dir.xpm
+share/pixmaps/gnome-commander/root_dir.xpm
+share/pixmaps/gnome-commander/server.xpm
+share/pixmaps/gnome-commander/smb-computer.xpm
+share/pixmaps/gnome-commander/smb-network.xpm
+@dirrm share/pixmaps/gnome-commander/mime-icons
+@dirrm share/pixmaps/gnome-commander/file-type-icons
+@dirrm share/pixmaps/gnome-commander/device-icons
+@dirrm share/pixmaps/gnome-commander
diff --git a/x11-fm/gnome-commander2/Makefile b/x11-fm/gnome-commander2/Makefile
index b6b5e70c3373..7763255d2b65 100644
--- a/x11-fm/gnome-commander2/Makefile
+++ b/x11-fm/gnome-commander2/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gnome-commander
 PORTVERSION=	1.2.4
+PORTREVISION=	1
 CATEGORIES=	x11-fm gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-commander/1.2
@@ -34,8 +35,4 @@ INSTALLS_OMF=	yes
 
 MAN1=		gnome-commander.1
 
-post-patch:
-	@${REINPLACE_CMD} -e \
-		's|share/pixmaps|share/gnome/pixmaps|g' ${WRKSRC}/configure
-
 .include <bsd.port.mk>
diff --git a/x11-fm/gnome-commander2/pkg-plist b/x11-fm/gnome-commander2/pkg-plist
index d91e972528a6..fd8a6acaa1d7 100644
--- a/x11-fm/gnome-commander2/pkg-plist
+++ b/x11-fm/gnome-commander2/pkg-plist
@@ -18,7 +18,7 @@ lib/gnome-commander/plugins/md5sum.pyo
 lib/gnome-commander/plugins/sha1sum.py
 lib/gnome-commander/plugins/sha1sum.pyc
 lib/gnome-commander/plugins/sha1sum.pyo
-share/gnome/applications/gnome-commander.desktop
+share/applications/gnome-commander.desktop
 share/gnome/help/gnome-commander/C/figures/create_archive.png
 share/gnome/help/gnome-commander/C/figures/dev_cd.png
 share/gnome/help/gnome-commander/C/figures/extract_archive.png
@@ -34,107 +34,107 @@ share/gnome/help/gnome-commander/C/figures/gnome-commander_window.png
 share/gnome/help/gnome-commander/C/figures/mounting.png
 share/gnome/help/gnome-commander/C/gnome-commander.xml
 share/gnome/help/gnome-commander/C/legal.xml
-share/gnome/omf/gnome-commander/gnome-commander-C.omf
-share/gnome/pixmaps/gnome-commander/copy_file_names.xpm
-share/gnome/pixmaps/gnome-commander/desktop.xpm
-share/gnome/pixmaps/gnome-commander/device-icons/bluetooth.xpm
-share/gnome/pixmaps/gnome-commander/device-icons/burner.xpm
-share/gnome/pixmaps/gnome-commander/device-icons/camera.xpm
-share/gnome/pixmaps/gnome-commander/device-icons/cdrom.xpm
-share/gnome/pixmaps/gnome-commander/device-icons/floppy.xpm
-share/gnome/pixmaps/gnome-commander/device-icons/harddisk.xpm
-share/gnome/pixmaps/gnome-commander/device-icons/ipod.xpm
-share/gnome/pixmaps/gnome-commander/device-icons/pci.xpm
-share/gnome/pixmaps/gnome-commander/device-icons/removable-1394.xpm
-share/gnome/pixmaps/gnome-commander/device-icons/removable-usb.xpm
-share/gnome/pixmaps/gnome-commander/device-icons/removable.xpm
-share/gnome/pixmaps/gnome-commander/device-icons/usb.xpm
-share/gnome/pixmaps/gnome-commander/device-icons/wavelan-encrypted.xpm
-share/gnome/pixmaps/gnome-commander/device-icons/wavelan.xpm
-share/gnome/pixmaps/gnome-commander/device-icons/zip.xpm
-share/gnome/pixmaps/gnome-commander/exec.xpm
-share/gnome/pixmaps/gnome-commander/exec_wheel.xpm
-share/gnome/pixmaps/gnome-commander/file-type-icons/file_type_block_device.xpm
-share/gnome/pixmaps/gnome-commander/file-type-icons/file_type_char_device.xpm
-share/gnome/pixmaps/gnome-commander/file-type-icons/file_type_dir.xpm
-share/gnome/pixmaps/gnome-commander/file-type-icons/file_type_fifo.xpm
-share/gnome/pixmaps/gnome-commander/file-type-icons/file_type_regular.xpm
-share/gnome/pixmaps/gnome-commander/file-type-icons/file_type_socket.xpm
-share/gnome/pixmaps/gnome-commander/file-type-icons/file_type_symlink.xpm
-share/gnome/pixmaps/gnome-commander/flip-horizontal-16.xpm
-share/gnome/pixmaps/gnome-commander/flip-vertical-16.xpm
-share/gnome/pixmaps/gnome-commander/ftp.xpm
-share/gnome/pixmaps/gnome-commander/ftp_connect.xpm
-share/gnome/pixmaps/gnome-commander/ftp_disconnect.xpm
-share/gnome/pixmaps/gnome-commander/gnome-commander.xpm
-share/gnome/pixmaps/gnome-commander/gnome_cmd_arrow_blank.xpm
-share/gnome/pixmaps/gnome-commander/gnome_cmd_arrow_down.xpm
-share/gnome/pixmaps/gnome-commander/gnome_cmd_arrow_up.xpm
-share/gnome/pixmaps/gnome-commander/home.xpm
-share/gnome/pixmaps/gnome-commander/internal-viewer.xpm
-share/gnome/pixmaps/gnome-commander/python-plugin.svg
-share/gnome/pixmaps/gnome-commander/key.xpm
-share/gnome/pixmaps/gnome-commander/lock.xpm
-share/gnome/pixmaps/gnome-commander/menu_bookmark.xpm
-share/gnome/pixmaps/gnome-commander/mime-icons/gnome-application-msword.png
-share/gnome/pixmaps/gnome-commander/mime-icons/gnome-application-pdf.png
-share/gnome/pixmaps/gnome-commander/mime-icons/gnome-application-postscript.png
-share/gnome/pixmaps/gnome-commander/mime-icons/gnome-application-vnd.ms-excel.png
-share/gnome/pixmaps/gnome-commander/mime-icons/gnome-application-vnd.ms-powerpoint.png
-share/gnome/pixmaps/gnome-commander/mime-icons/gnome-application-vnd.sun.xml.calc.png
-share/gnome/pixmaps/gnome-commander/mime-icons/gnome-application-vnd.sun.xml.draw.png
-share/gnome/pixmaps/gnome-commander/mime-icons/gnome-application-vnd.sun.xml.impress.png
-share/gnome/pixmaps/gnome-commander/mime-icons/gnome-application-vnd.sun.xml.writer.math.png
-share/gnome/pixmaps/gnome-commander/mime-icons/gnome-application-vnd.sun.xml.writer.png
-share/gnome/pixmaps/gnome-commander/mime-icons/gnome-application-x-anjuta-project.png
-share/gnome/pixmaps/gnome-commander/mime-icons/gnome-application-x-arj.png
-share/gnome/pixmaps/gnome-commander/mime-icons/gnome-application-x-bzip-compressed-tar.png
-share/gnome/pixmaps/gnome-commander/mime-icons/gnome-application-x-bzip.png
-share/gnome/pixmaps/gnome-commander/mime-icons/gnome-application-x-compressed-tar.png
-share/gnome/pixmaps/gnome-commander/mime-icons/gnome-application-x-compressed.png
-share/gnome/pixmaps/gnome-commander/mime-icons/gnome-application-x-dia-diagram.png
-share/gnome/pixmaps/gnome-commander/mime-icons/gnome-application-x-executable-binary.png
-share/gnome/pixmaps/gnome-commander/mime-icons/gnome-application-x-glade.png
-share/gnome/pixmaps/gnome-commander/mime-icons/gnome-application-x-gnumeric.png
-share/gnome/pixmaps/gnome-commander/mime-icons/gnome-application-x-gzip.png
-share/gnome/pixmaps/gnome-commander/mime-icons/gnome-application-x-mrproject.png
-share/gnome/pixmaps/gnome-commander/mime-icons/gnome-application-x-ogg.png
-share/gnome/pixmaps/gnome-commander/mime-icons/gnome-application-x-rpm.png
-share/gnome/pixmaps/gnome-commander/mime-icons/gnome-application-zip.png
-share/gnome/pixmaps/gnome-commander/mime-icons/gnome-audio-plain.png
-share/gnome/pixmaps/gnome-commander/mime-icons/gnome-audio-x-mp3.png
-share/gnome/pixmaps/gnome-commander/mime-icons/gnome-compressed.png
-share/gnome/pixmaps/gnome-commander/mime-icons/gnome-image-plain.png
-share/gnome/pixmaps/gnome-commander/mime-icons/gnome-text-html.png
-share/gnome/pixmaps/gnome-commander/mime-icons/gnome-text-plain.png
-share/gnome/pixmaps/gnome-commander/mime-icons/gnome-text-x-c-header.png
-share/gnome/pixmaps/gnome-commander/mime-icons/gnome-text-x-c.png
-share/gnome/pixmaps/gnome-commander/mime-icons/gnome-text-x-sh.png
-share/gnome/pixmaps/gnome-commander/mime-icons/gnome-video-plain.png
-share/gnome/pixmaps/gnome-commander/mime-icons/gnome-x-directory-smb-server.png
-share/gnome/pixmaps/gnome-commander/mime-icons/gnome-x-directory-smb-workgroup.png
-share/gnome/pixmaps/gnome-commander/mime-icons/i-blockdev.png
-share/gnome/pixmaps/gnome-commander/mime-icons/i-chardev.png
-share/gnome/pixmaps/gnome-commander/mime-icons/i-directory.png
-share/gnome/pixmaps/gnome-commander/mime-icons/i-fifo.png
-share/gnome/pixmaps/gnome-commander/mime-icons/i-music.png
-share/gnome/pixmaps/gnome-commander/mime-icons/i-regular.png
-share/gnome/pixmaps/gnome-commander/mime-icons/i-socket.png
-share/gnome/pixmaps/gnome-commander/mime-icons/i-symlink.png
-share/gnome/pixmaps/gnome-commander/mkdir.xpm
-share/gnome/pixmaps/gnome-commander/overlay_symlink.xpm
-share/gnome/pixmaps/gnome-commander/overlay_umount.xpm
-share/gnome/pixmaps/gnome-commander/parent_dir.xpm
-share/gnome/pixmaps/gnome-commander/root_dir.xpm
-share/gnome/pixmaps/gnome-commander/rotate-180-16.xpm
-share/gnome/pixmaps/gnome-commander/rotate-270-16.xpm
-share/gnome/pixmaps/gnome-commander/rotate-90-16.xpm
-share/gnome/pixmaps/gnome-commander/server.xpm
-share/gnome/pixmaps/gnome-commander/smb-computer.xpm
-share/gnome/pixmaps/gnome-commander/smb-network.xpm
-share/gnome/pixmaps/gnome-commander/toggle_horizontal.xpm
-share/gnome/pixmaps/gnome-commander/toggle_vertical.xpm
-share/gnome/pixmaps/gnome-commander.png
+share/omf/gnome-commander/gnome-commander-C.omf
+share/pixmaps/gnome-commander/copy_file_names.xpm
+share/pixmaps/gnome-commander/desktop.xpm
+share/pixmaps/gnome-commander/device-icons/bluetooth.xpm
+share/pixmaps/gnome-commander/device-icons/burner.xpm
+share/pixmaps/gnome-commander/device-icons/camera.xpm
+share/pixmaps/gnome-commander/device-icons/cdrom.xpm
+share/pixmaps/gnome-commander/device-icons/floppy.xpm
+share/pixmaps/gnome-commander/device-icons/harddisk.xpm
+share/pixmaps/gnome-commander/device-icons/ipod.xpm
+share/pixmaps/gnome-commander/device-icons/pci.xpm
+share/pixmaps/gnome-commander/device-icons/removable-1394.xpm
+share/pixmaps/gnome-commander/device-icons/removable-usb.xpm
+share/pixmaps/gnome-commander/device-icons/removable.xpm
+share/pixmaps/gnome-commander/device-icons/usb.xpm
+share/pixmaps/gnome-commander/device-icons/wavelan-encrypted.xpm
+share/pixmaps/gnome-commander/device-icons/wavelan.xpm
+share/pixmaps/gnome-commander/device-icons/zip.xpm
+share/pixmaps/gnome-commander/exec.xpm
+share/pixmaps/gnome-commander/exec_wheel.xpm
+share/pixmaps/gnome-commander/file-type-icons/file_type_block_device.xpm
+share/pixmaps/gnome-commander/file-type-icons/file_type_char_device.xpm
+share/pixmaps/gnome-commander/file-type-icons/file_type_dir.xpm
+share/pixmaps/gnome-commander/file-type-icons/file_type_fifo.xpm
+share/pixmaps/gnome-commander/file-type-icons/file_type_regular.xpm
+share/pixmaps/gnome-commander/file-type-icons/file_type_socket.xpm
+share/pixmaps/gnome-commander/file-type-icons/file_type_symlink.xpm
+share/pixmaps/gnome-commander/flip-horizontal-16.xpm
+share/pixmaps/gnome-commander/flip-vertical-16.xpm
+share/pixmaps/gnome-commander/ftp.xpm
+share/pixmaps/gnome-commander/ftp_connect.xpm
+share/pixmaps/gnome-commander/ftp_disconnect.xpm
+share/pixmaps/gnome-commander/gnome-commander.xpm
+share/pixmaps/gnome-commander/gnome_cmd_arrow_blank.xpm
+share/pixmaps/gnome-commander/gnome_cmd_arrow_down.xpm
+share/pixmaps/gnome-commander/gnome_cmd_arrow_up.xpm
+share/pixmaps/gnome-commander/home.xpm
+share/pixmaps/gnome-commander/internal-viewer.xpm
+share/pixmaps/gnome-commander/python-plugin.svg
+share/pixmaps/gnome-commander/key.xpm
+share/pixmaps/gnome-commander/lock.xpm
+share/pixmaps/gnome-commander/menu_bookmark.xpm
+share/pixmaps/gnome-commander/mime-icons/gnome-application-msword.png
+share/pixmaps/gnome-commander/mime-icons/gnome-application-pdf.png
+share/pixmaps/gnome-commander/mime-icons/gnome-application-postscript.png
+share/pixmaps/gnome-commander/mime-icons/gnome-application-vnd.ms-excel.png
+share/pixmaps/gnome-commander/mime-icons/gnome-application-vnd.ms-powerpoint.png
+share/pixmaps/gnome-commander/mime-icons/gnome-application-vnd.sun.xml.calc.png
+share/pixmaps/gnome-commander/mime-icons/gnome-application-vnd.sun.xml.draw.png
+share/pixmaps/gnome-commander/mime-icons/gnome-application-vnd.sun.xml.impress.png
+share/pixmaps/gnome-commander/mime-icons/gnome-application-vnd.sun.xml.writer.math.png
+share/pixmaps/gnome-commander/mime-icons/gnome-application-vnd.sun.xml.writer.png
+share/pixmaps/gnome-commander/mime-icons/gnome-application-x-anjuta-project.png
+share/pixmaps/gnome-commander/mime-icons/gnome-application-x-arj.png
+share/pixmaps/gnome-commander/mime-icons/gnome-application-x-bzip-compressed-tar.png
+share/pixmaps/gnome-commander/mime-icons/gnome-application-x-bzip.png
+share/pixmaps/gnome-commander/mime-icons/gnome-application-x-compressed-tar.png
+share/pixmaps/gnome-commander/mime-icons/gnome-application-x-compressed.png
+share/pixmaps/gnome-commander/mime-icons/gnome-application-x-dia-diagram.png
+share/pixmaps/gnome-commander/mime-icons/gnome-application-x-executable-binary.png
+share/pixmaps/gnome-commander/mime-icons/gnome-application-x-glade.png
+share/pixmaps/gnome-commander/mime-icons/gnome-application-x-gnumeric.png
+share/pixmaps/gnome-commander/mime-icons/gnome-application-x-gzip.png
+share/pixmaps/gnome-commander/mime-icons/gnome-application-x-mrproject.png
+share/pixmaps/gnome-commander/mime-icons/gnome-application-x-ogg.png
+share/pixmaps/gnome-commander/mime-icons/gnome-application-x-rpm.png
+share/pixmaps/gnome-commander/mime-icons/gnome-application-zip.png
+share/pixmaps/gnome-commander/mime-icons/gnome-audio-plain.png
+share/pixmaps/gnome-commander/mime-icons/gnome-audio-x-mp3.png
+share/pixmaps/gnome-commander/mime-icons/gnome-compressed.png
+share/pixmaps/gnome-commander/mime-icons/gnome-image-plain.png
+share/pixmaps/gnome-commander/mime-icons/gnome-text-html.png
+share/pixmaps/gnome-commander/mime-icons/gnome-text-plain.png
+share/pixmaps/gnome-commander/mime-icons/gnome-text-x-c-header.png
+share/pixmaps/gnome-commander/mime-icons/gnome-text-x-c.png
+share/pixmaps/gnome-commander/mime-icons/gnome-text-x-sh.png
+share/pixmaps/gnome-commander/mime-icons/gnome-video-plain.png
+share/pixmaps/gnome-commander/mime-icons/gnome-x-directory-smb-server.png
+share/pixmaps/gnome-commander/mime-icons/gnome-x-directory-smb-workgroup.png
+share/pixmaps/gnome-commander/mime-icons/i-blockdev.png
+share/pixmaps/gnome-commander/mime-icons/i-chardev.png
+share/pixmaps/gnome-commander/mime-icons/i-directory.png
+share/pixmaps/gnome-commander/mime-icons/i-fifo.png
+share/pixmaps/gnome-commander/mime-icons/i-music.png
+share/pixmaps/gnome-commander/mime-icons/i-regular.png
+share/pixmaps/gnome-commander/mime-icons/i-socket.png
+share/pixmaps/gnome-commander/mime-icons/i-symlink.png
+share/pixmaps/gnome-commander/mkdir.xpm
+share/pixmaps/gnome-commander/overlay_symlink.xpm
+share/pixmaps/gnome-commander/overlay_umount.xpm
+share/pixmaps/gnome-commander/parent_dir.xpm
+share/pixmaps/gnome-commander/root_dir.xpm
+share/pixmaps/gnome-commander/rotate-180-16.xpm
+share/pixmaps/gnome-commander/rotate-270-16.xpm
+share/pixmaps/gnome-commander/rotate-90-16.xpm
+share/pixmaps/gnome-commander/server.xpm
+share/pixmaps/gnome-commander/smb-computer.xpm
+share/pixmaps/gnome-commander/smb-network.xpm
+share/pixmaps/gnome-commander/toggle_horizontal.xpm
+share/pixmaps/gnome-commander/toggle_vertical.xpm
+share/pixmaps/gnome-commander.png
 share/locale/ar/LC_MESSAGES/gnome-commander.mo
 share/locale/bg/LC_MESSAGES/gnome-commander.mo
 share/locale/ca/LC_MESSAGES/gnome-commander.mo
@@ -173,17 +173,16 @@ share/locale/vi/LC_MESSAGES/gnome-commander.mo
 share/locale/oc/LC_MESSAGES/gnome-commander.mo
 share/locale/zh_CN/LC_MESSAGES/gnome-commander.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-commander.mo
-@dirrmtry share/locale/dz/LC_MESSAGES
-@dirrmtry share/locale/dz
 @dirrmtry share/locale/oc/LC_MESSAGES
 @dirrmtry share/locale/oc
-@dirrm share/gnome/pixmaps/gnome-commander/mime-icons
-@dirrm share/gnome/pixmaps/gnome-commander/file-type-icons
-@dirrm share/gnome/pixmaps/gnome-commander/device-icons
-@dirrm share/gnome/pixmaps/gnome-commander
-@dirrm share/gnome/omf/gnome-commander
+@dirrm share/pixmaps/gnome-commander/mime-icons
+@dirrm share/pixmaps/gnome-commander/file-type-icons
+@dirrm share/pixmaps/gnome-commander/device-icons
+@dirrm share/pixmaps/gnome-commander
+@dirrm share/omf/gnome-commander
 @dirrm share/gnome/help/gnome-commander/C/figures
 @dirrm share/gnome/help/gnome-commander/C
 @dirrm share/gnome/help/gnome-commander
 @dirrm lib/gnome-commander/plugins
 @dirrm lib/gnome-commander
+@dirrmtry share/applications
diff --git a/x11-fm/nautilus/Makefile b/x11-fm/nautilus/Makefile
index 89f3216a018e..33dc04835929 100644
--- a/x11-fm/nautilus/Makefile
+++ b/x11-fm/nautilus/Makefile
@@ -3,11 +3,11 @@
 # Whom:                 		ade, archie
 #
 # $FreeBSD$
-#   $MCom: ports/x11-fm/nautilus/Makefile,v 1.127 2007/03/16 16:07:42 marcus Exp $
+#   $MCom: ports/x11-fm/nautilus/Makefile,v 1.142 2007/09/18 14:48:10 ahze Exp $
 #
 
 PORTNAME=	nautilus
-PORTVERSION=	2.18.3
+PORTVERSION=	2.20.0
 CATEGORIES=	x11-fm gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/x11-fm/nautilus/distinfo b/x11-fm/nautilus/distinfo
index eea3c4ce5b5b..9a778b2a04e2 100644
--- a/x11-fm/nautilus/distinfo
+++ b/x11-fm/nautilus/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/nautilus-2.18.3.tar.bz2) = e027b4e1a925122ef3e7f54323cc3c44
-SHA256 (gnome2/nautilus-2.18.3.tar.bz2) = 8ecc2b27f9e8e7f12ee2a84ae54d71d60c769e559f9952f8d792447e6f657c16
-SIZE (gnome2/nautilus-2.18.3.tar.bz2) = 4331118
+MD5 (gnome2/nautilus-2.20.0.tar.bz2) = 3856ec2ffeba786d12f8f6622e398c33
+SHA256 (gnome2/nautilus-2.20.0.tar.bz2) = 98f9d9f7bc89db67cbcc4c7d08ec72175b8c9b3eb9489f7869c5cec9f16feb08
+SIZE (gnome2/nautilus-2.20.0.tar.bz2) = 4916284
diff --git a/x11-fm/nautilus/files/patch-configure b/x11-fm/nautilus/files/patch-configure
new file mode 100644
index 000000000000..4a9390ced7e9
--- /dev/null
+++ b/x11-fm/nautilus/files/patch-configure
@@ -0,0 +1,22 @@
+--- configure.orig	Mon May 14 20:47:58 2007
++++ configure	Mon May 14 20:52:42 2007
+@@ -23611,9 +23611,7 @@ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ #include <unistd.h>
+-  #ifdef HAVE_SYS_PARAM_H
+   #include <sys/param.h>
+-  #endif
+   #ifdef HAVE_SYS_VFS_H
+   #include <sys/vfs.h>
+   #endif
+@@ -23674,9 +23672,7 @@ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ #include <unistd.h>
+-  #ifdef HAVE_SYS_PARAM_H
+   #include <sys/param.h>
+-  #endif
+   #ifdef HAVE_SYS_VFS_H
+   #include <sys/vfs.h>
+   #endif
diff --git a/x11-fm/nautilus/files/patch-src_file-manager_fm-properties-window.c b/x11-fm/nautilus/files/patch-src_file-manager_fm-properties-window.c
new file mode 100644
index 000000000000..d709dec1e833
--- /dev/null
+++ b/x11-fm/nautilus/files/patch-src_file-manager_fm-properties-window.c
@@ -0,0 +1,12 @@
+--- src/file-manager/fm-properties-window.c.orig	Mon May 14 20:58:01 2007
++++ src/file-manager/fm-properties-window.c	Mon May 14 20:58:42 2007
+@@ -89,9 +89,7 @@
+ #if HAVE_SYS_VFS_H
+ #include <sys/vfs.h>
+ #elif HAVE_SYS_MOUNT_H
+-#if HAVE_SYS_PARAM_H
+ #include <sys/param.h>
+-#endif
+ #include <sys/mount.h>
+ #endif
+ 
diff --git a/x11-fm/nautilus/pkg-plist b/x11-fm/nautilus/pkg-plist
index 780b573f78db..1e031e1ad977 100644
--- a/x11-fm/nautilus/pkg-plist
+++ b/x11-fm/nautilus/pkg-plist
@@ -18,64 +18,12 @@ lib/libnautilus-extension.so
 lib/libnautilus-extension.so.1
 libdata/bonobo/servers/Nautilus_shell.server
 libdata/pkgconfig/libnautilus-extension.pc
-share/gnome/applications/nautilus-computer.desktop
-share/gnome/applications/nautilus-file-management-properties.desktop
-share/gnome/applications/nautilus-folder-handler.desktop
-share/gnome/applications/nautilus-home.desktop
-share/gnome/applications/nautilus.desktop
-share/gnome/applications/network-scheme.desktop
-share/gnome/nautilus/browser.xml
-share/gnome/nautilus/glade/nautilus-bookmarks-window.glade
-share/gnome/nautilus/glade/nautilus-file-management-properties.glade
-share/gnome/nautilus/nautilus-extras.placeholder
-share/gnome/nautilus/nautilus-suggested.placeholder
-share/gnome/nautilus/patterns/blue_gray_rough.png
-share/gnome/nautilus/patterns/blue_ridge.png
-share/gnome/nautilus/patterns/blue_type.png
-share/gnome/nautilus/patterns/brushed_metal.png
-share/gnome/nautilus/patterns/burlap.jpg
-share/gnome/nautilus/patterns/camouflage.png
-share/gnome/nautilus/patterns/chalk.jpg
-share/gnome/nautilus/patterns/cork.png
-share/gnome/nautilus/patterns/countertop.png
-share/gnome/nautilus/patterns/dark-gnome.jpg
-share/gnome/nautilus/patterns/dots.png
-share/gnome/nautilus/patterns/fibers.png
-share/gnome/nautilus/patterns/fleur_de_lis.png
-share/gnome/nautilus/patterns/floral.png
-share/gnome/nautilus/patterns/fossil.png
-share/gnome/nautilus/patterns/gnome.jpg
-share/gnome/nautilus/patterns/green_weave.png
-share/gnome/nautilus/patterns/ice.png
-share/gnome/nautilus/patterns/manila_paper.png
-share/gnome/nautilus/patterns/moss_ridge.png
-share/gnome/nautilus/patterns/numbers.png
-share/gnome/nautilus/patterns/ocean_stripes.png
-share/gnome/nautilus/patterns/purple_marble.png
-share/gnome/nautilus/patterns/reset.png
-share/gnome/nautilus/patterns/ridged_paper.png
-share/gnome/nautilus/patterns/rough_paper.png
-share/gnome/nautilus/patterns/sky_ridge.png
-share/gnome/nautilus/patterns/snow_ridge.png
-share/gnome/nautilus/patterns/stucco.jpg
-share/gnome/nautilus/patterns/terracotta.png
-share/gnome/nautilus/patterns/wavy_white.png
-share/gnome/nautilus/ui/nautilus-desktop-icon-view-ui.xml
-share/gnome/nautilus/ui/nautilus-directory-view-ui.xml
-share/gnome/nautilus/ui/nautilus-icon-view-ui.xml
-share/gnome/nautilus/ui/nautilus-list-view-ui.xml
-share/gnome/nautilus/ui/nautilus-navigation-window-ui.xml
-share/gnome/nautilus/ui/nautilus-shell-ui.xml
-share/gnome/nautilus/ui/nautilus-spatial-window-ui.xml
-share/gnome/pixmaps/nautilus/audio.svg
-share/gnome/pixmaps/nautilus/backgrounds.png
-share/gnome/pixmaps/nautilus/chit_frame.png
-share/gnome/pixmaps/nautilus/colors.png
-share/gnome/pixmaps/nautilus/emblems.png
-share/gnome/pixmaps/nautilus/erase.png
-share/gnome/pixmaps/nautilus/knob.png
-share/gnome/pixmaps/nautilus/note-indicator.png
-share/gnome/pixmaps/nautilus/thumbnail_frame.png
+share/applications/nautilus-computer.desktop
+share/applications/nautilus-file-management-properties.desktop
+share/applications/nautilus-folder-handler.desktop
+share/applications/nautilus-home.desktop
+share/applications/nautilus.desktop
+share/applications/network-scheme.desktop
 share/icons/hicolor/16x16/apps/nautilus.png
 share/icons/hicolor/22x22/apps/nautilus.png
 share/icons/hicolor/24x24/apps/nautilus.png
@@ -84,6 +32,7 @@ share/icons/hicolor/scalable/apps/nautilus.svg
 share/locale/af/LC_MESSAGES/nautilus.mo
 share/locale/am/LC_MESSAGES/nautilus.mo
 share/locale/ar/LC_MESSAGES/nautilus.mo
+share/locale/as/LC_MESSAGES/nautilus.mo
 share/locale/az/LC_MESSAGES/nautilus.mo
 share/locale/be/LC_MESSAGES/nautilus.mo
 share/locale/be@latin/LC_MESSAGES/nautilus.mo
@@ -122,6 +71,7 @@ share/locale/it/LC_MESSAGES/nautilus.mo
 share/locale/ja/LC_MESSAGES/nautilus.mo
 share/locale/ka/LC_MESSAGES/nautilus.mo
 share/locale/km/LC_MESSAGES/nautilus.mo
+share/locale/kn/LC_MESSAGES/nautilus.mo
 share/locale/ko/LC_MESSAGES/nautilus.mo
 share/locale/ku/LC_MESSAGES/nautilus.mo
 share/locale/li/LC_MESSAGES/nautilus.mo
@@ -147,6 +97,7 @@ share/locale/pt_BR/LC_MESSAGES/nautilus.mo
 share/locale/ro/LC_MESSAGES/nautilus.mo
 share/locale/ru/LC_MESSAGES/nautilus.mo
 share/locale/rw/LC_MESSAGES/nautilus.mo
+share/locale/si/LC_MESSAGES/nautilus.mo
 share/locale/sk/LC_MESSAGES/nautilus.mo
 share/locale/sl/LC_MESSAGES/nautilus.mo
 share/locale/sq/LC_MESSAGES/nautilus.mo
@@ -170,16 +121,68 @@ share/locale/zh_TW/LC_MESSAGES/nautilus.mo
 share/locale/zu/LC_MESSAGES/nautilus.mo
 share/mime/application/x-gnome-saved-search.xml
 share/mime/packages/nautilus.xml
-@dirrm share/gnome/pixmaps/nautilus
-@dirrm share/gnome/nautilus/ui
-@dirrm share/gnome/nautilus/patterns
-@dirrm share/gnome/nautilus/glade
-@dirrm share/gnome/nautilus
-@dirrm include/nautilus/libnautilus-extension
-@dirrm include/nautilus
+%%DATADIR%%/browser.xml
+%%DATADIR%%/glade/nautilus-bookmarks-window.glade
+%%DATADIR%%/glade/nautilus-file-management-properties.glade
+%%DATADIR%%/nautilus-extras.placeholder
+%%DATADIR%%/nautilus-suggested.placeholder
+%%DATADIR%%/patterns/blue_gray_rough.png
+%%DATADIR%%/patterns/blue_ridge.png
+%%DATADIR%%/patterns/blue_type.png
+%%DATADIR%%/patterns/brushed_metal.png
+%%DATADIR%%/patterns/burlap.jpg
+%%DATADIR%%/patterns/camouflage.png
+%%DATADIR%%/patterns/chalk.jpg
+%%DATADIR%%/patterns/cork.png
+%%DATADIR%%/patterns/countertop.png
+%%DATADIR%%/patterns/dark-gnome.jpg
+%%DATADIR%%/patterns/dots.png
+%%DATADIR%%/patterns/fibers.png
+%%DATADIR%%/patterns/fleur_de_lis.png
+%%DATADIR%%/patterns/floral.png
+%%DATADIR%%/patterns/fossil.png
+%%DATADIR%%/patterns/gnome.jpg
+%%DATADIR%%/patterns/green_weave.png
+%%DATADIR%%/patterns/ice.png
+%%DATADIR%%/patterns/manila_paper.png
+%%DATADIR%%/patterns/moss_ridge.png
+%%DATADIR%%/patterns/numbers.png
+%%DATADIR%%/patterns/ocean_stripes.png
+%%DATADIR%%/patterns/purple_marble.png
+%%DATADIR%%/patterns/reset.png
+%%DATADIR%%/patterns/ridged_paper.png
+%%DATADIR%%/patterns/rough_paper.png
+%%DATADIR%%/patterns/sky_ridge.png
+%%DATADIR%%/patterns/snow_ridge.png
+%%DATADIR%%/patterns/stucco.jpg
+%%DATADIR%%/patterns/terracotta.png
+%%DATADIR%%/patterns/wavy_white.png
+%%DATADIR%%/ui/nautilus-desktop-icon-view-ui.xml
+%%DATADIR%%/ui/nautilus-directory-view-ui.xml
+%%DATADIR%%/ui/nautilus-icon-view-ui.xml
+%%DATADIR%%/ui/nautilus-list-view-ui.xml
+%%DATADIR%%/ui/nautilus-navigation-window-ui.xml
+%%DATADIR%%/ui/nautilus-shell-ui.xml
+%%DATADIR%%/ui/nautilus-spatial-window-ui.xml
+share/pixmaps/nautilus/audio.svg
+share/pixmaps/nautilus/backgrounds.png
+share/pixmaps/nautilus/chit_frame.png
+share/pixmaps/nautilus/colors.png
+share/pixmaps/nautilus/emblems.png
+share/pixmaps/nautilus/erase.png
+share/pixmaps/nautilus/knob.png
+share/pixmaps/nautilus/note-indicator.png
+share/pixmaps/nautilus/thumbnail_frame.png
+@dirrm share/pixmaps/nautilus
+@dirrm %%DATADIR%%/ui
+@dirrm %%DATADIR%%/patterns
+@dirrm %%DATADIR%%/glade
+@dirrm %%DATADIR%%
 @exec /bin/mkdir -p %D/lib/nautilus/extensions-1.0
 @dirrmtry lib/nautilus/extensions-1.0
 @dirrmtry lib/nautilus
+@dirrm include/nautilus/libnautilus-extension
+@dirrm include/nautilus
 @exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
 @unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
 @exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
@@ -196,6 +199,8 @@ share/mime/packages/nautilus.xml
 @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
@@ -218,3 +223,6 @@ share/mime/packages/nautilus.xml
 @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/x11-fm/velocity/Makefile b/x11-fm/velocity/Makefile
index 46ff339a8bd0..bab45304a560 100644
--- a/x11-fm/velocity/Makefile
+++ b/x11-fm/velocity/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	velocity
 PORTVERSION=	0.1.0b
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	x11-fm
 MASTER_SITES=	http://www.jarrodkoehler.com/velocity/
 DISTNAME=	velocity-0.1.0beta
diff --git a/x11-fm/velocity/files/patch-configure b/x11-fm/velocity/files/patch-configure
deleted file mode 100644
index b90722cd34ba..000000000000
--- a/x11-fm/velocity/files/patch-configure
+++ /dev/null
@@ -1,27 +0,0 @@
---- configure.orig	Tue Aug 26 03:15:17 2003
-+++ configure	Wed Dec 10 20:50:34 2003
-@@ -7156,16 +7156,16 @@
-   packageprefix=${prefix}
- fi
- 
--packagedatadir=share/${PACKAGE}
--packagedocdir=doc/${PACKAGE}
-+packagedatadir=share/gnome/${PACKAGE}
-+packagedocdir=share/doc/${PACKAGE}
- 
--packagepixmapsdir=share/pixmaps/${PACKAGE}
-+packagepixmapsdir=share/gnome/pixmaps/${PACKAGE}
- packagehelpdir=share/gnome/help/${PACKAGE}
--packagemenudir=share/applications
--packagescriptsdir=share/${PACKAGE}/scripts
--packagetemplatesdir=share/${PACKAGE}/templates
--packagepluginsdir=share/${PACKAGE}/plugins
--packagesendtodir=share/${PACKAGE}/sendto
-+packagemenudir=share/gnome/applications
-+packagescriptsdir=share/gnome/${PACKAGE}/scripts
-+packagetemplatesdir=share/gnome/${PACKAGE}/templates
-+packagepluginsdir=share/gnome/${PACKAGE}/plugins
-+packagesendtodir=share/gnome/${PACKAGE}/sendto
- 
- NO_PREFIX_PACKAGE_DATA_DIR="${packagedatadir}"
- 
diff --git a/x11-fm/velocity/pkg-plist b/x11-fm/velocity/pkg-plist
index 1b5e70d0d9c5..39b9e8b8fdfd 100644
--- a/x11-fm/velocity/pkg-plist
+++ b/x11-fm/velocity/pkg-plist
@@ -1,45 +1,46 @@
 bin/velocity
-share/gnome/applications/velocity.desktop
-share/gnome/pixmaps/velocity/advanced.png
-share/gnome/pixmaps/velocity/behavior.png
-share/gnome/pixmaps/velocity/bin.png
-share/gnome/pixmaps/velocity/desktop.png
-share/gnome/pixmaps/velocity/druid-left.png
-share/gnome/pixmaps/velocity/druid-top.png
-share/gnome/pixmaps/velocity/puzzle-piece.png
-share/gnome/pixmaps/velocity/puzzle.png
-share/gnome/pixmaps/velocity/themes.png
-share/gnome/pixmaps/velocity/velocity.png
-share/gnome/velocity/plugins/audio.so
-share/gnome/velocity/plugins/burn.so
-share/gnome/velocity/scripts/audio-to-mp3
-share/gnome/velocity/scripts/audio-to-ogg
-share/gnome/velocity/scripts/create-tarball
-share/gnome/velocity/scripts/line-word-count
-share/gnome/velocity/scripts/pdf-to-postscript
-share/gnome/velocity/scripts/postscript-to-pdf
-share/gnome/velocity/scripts/terminal-here
-share/gnome/velocity/scripts/uncompress
-share/gnome/velocity/templates/abiword-document
-share/gnome/velocity/templates/data/abiword-document
-share/gnome/velocity/templates/data/dia-document
-share/gnome/velocity/templates/data/gimp-image
-share/gnome/velocity/templates/data/gnumeric-document
-share/gnome/velocity/templates/data/html-document
-share/gnome/velocity/templates/data/shell-script
-share/gnome/velocity/templates/data/velocity-script
-share/gnome/velocity/templates/data/word-document
-share/gnome/velocity/templates/dia-document
-share/gnome/velocity/templates/gimp-image
-share/gnome/velocity/templates/gnumeric-document
-share/gnome/velocity/templates/html-document
-share/gnome/velocity/templates/plain-text
-share/gnome/velocity/templates/shell-script
-share/gnome/velocity/templates/velocity-script
-share/gnome/velocity/templates/word-document
-@dirrm share/gnome/velocity/templates/data
-@dirrm share/gnome/velocity/templates
-@dirrm share/gnome/velocity/scripts
-@dirrm share/gnome/velocity/plugins
-@dirrm share/gnome/velocity
-@dirrm share/gnome/pixmaps/velocity
+share/applications/velocity.desktop
+share/pixmaps/velocity/advanced.png
+share/pixmaps/velocity/behavior.png
+share/pixmaps/velocity/bin.png
+share/pixmaps/velocity/desktop.png
+share/pixmaps/velocity/druid-left.png
+share/pixmaps/velocity/druid-top.png
+share/pixmaps/velocity/puzzle-piece.png
+share/pixmaps/velocity/puzzle.png
+share/pixmaps/velocity/themes.png
+share/pixmaps/velocity/velocity.png
+share/velocity/plugins/audio.so
+share/velocity/plugins/burn.so
+share/velocity/scripts/audio-to-mp3
+share/velocity/scripts/audio-to-ogg
+share/velocity/scripts/create-tarball
+share/velocity/scripts/line-word-count
+share/velocity/scripts/pdf-to-postscript
+share/velocity/scripts/postscript-to-pdf
+share/velocity/scripts/terminal-here
+share/velocity/scripts/uncompress
+share/velocity/templates/abiword-document
+share/velocity/templates/data/abiword-document
+share/velocity/templates/data/dia-document
+share/velocity/templates/data/gimp-image
+share/velocity/templates/data/gnumeric-document
+share/velocity/templates/data/html-document
+share/velocity/templates/data/shell-script
+share/velocity/templates/data/velocity-script
+share/velocity/templates/data/word-document
+share/velocity/templates/dia-document
+share/velocity/templates/gimp-image
+share/velocity/templates/gnumeric-document
+share/velocity/templates/html-document
+share/velocity/templates/plain-text
+share/velocity/templates/shell-script
+share/velocity/templates/velocity-script
+share/velocity/templates/word-document
+@dirrm share/velocity/templates/data
+@dirrm share/velocity/templates
+@dirrm share/velocity/scripts
+@dirrm share/velocity/plugins
+@dirrm share/velocity
+@dirrm share/pixmaps/velocity
+@dirrmtry share/applications
diff --git a/x11-fonts/gnome-font-sampler/Makefile b/x11-fonts/gnome-font-sampler/Makefile
index 4de9e6a1df3f..78de511bc13e 100644
--- a/x11-fonts/gnome-font-sampler/Makefile
+++ b/x11-fonts/gnome-font-sampler/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gnome-font-sampler
 PORTVERSION=	0.4
-PORTREVISION=	4
+PORTREVISION=	6
 CATEGORIES=	x11-fonts
 MASTER_SITES=	http://linuxadvocate.org/projects/gfontsampler/downloads/
 DISTNAME=	gfontsampler-${PORTVERSION}
@@ -23,9 +23,9 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
 
 post-patch:
 	@${REINPLACE_CMD} -e \
-		's|^packagedatadir=.*|packagedatadir=share/gnome| ; \
-		 s|^packagepixmapsdir=.*|packagepixmapsdir=share/gnome/pixmaps| ; \
-		 s|^packagemenudir=.*|packagemenudir=share/gnome/applications|; \
+		's|^packagedatadir=.*|packagedatadir=share| ; \
+		 s|^packagepixmapsdir=.*|packagepixmapsdir=share/pixmaps| ; \
+		 s|^packagemenudir=.*|packagemenudir=share/applications|; \
 		 /^CFLAGS=""$$/ d; s|gtk+-2.0|pangoxft &|' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e \
 		's|\(@NO_PREFIX_PACKAGE_MENU_DIR@\)/Utilities|\1|' \
diff --git a/x11-fonts/gnome-font-sampler/pkg-plist b/x11-fonts/gnome-font-sampler/pkg-plist
index 95cacd1fc588..9185f0eab4fc 100644
--- a/x11-fonts/gnome-font-sampler/pkg-plist
+++ b/x11-fonts/gnome-font-sampler/pkg-plist
@@ -1,7 +1,8 @@
 bin/gfontsampler
-share/gnome/applications/gfontsampler.desktop
-share/gnome/gfontsampler/glade/gfontsampler-icon.png
-share/gnome/gfontsampler/glade/gfontsampler.glade
-share/gnome/pixmaps/gfontsampler-icon.png
-@dirrm share/gnome/gfontsampler/glade
-@dirrm share/gnome/gfontsampler
+share/applications/gfontsampler.desktop
+share/gfontsampler/glade/gfontsampler-icon.png
+share/gfontsampler/glade/gfontsampler.glade
+share/pixmaps/gfontsampler-icon.png
+@dirrm share/gfontsampler/glade
+@dirrm share/gfontsampler
+@dirrmtry share/applications
diff --git a/x11-themes/bluecurve-themes/Makefile b/x11-themes/bluecurve-themes/Makefile
index 089b20f6490b..546a87409093 100644
--- a/x11-themes/bluecurve-themes/Makefile
+++ b/x11-themes/bluecurve-themes/Makefile
@@ -41,7 +41,7 @@ do-install:	# empty
 .else					# master port
 
 PORTVERSION=	5.0.11
-PORTREVISION=	1
+PORTREVISION=	3
 CATEGORIES=	x11-themes
 MASTER_SITES=	${MASTER_SITE_FEDORA_LINUX:S|$|:fedora|} ${MASTER_SITE_LOCAL:S|$|:local|}
 MASTER_SITE_SUBDIR=	development/source/SRPMS/:fedora jylefort/:local
diff --git a/x11-themes/clearlooks-metacity/Makefile b/x11-themes/clearlooks-metacity/Makefile
index d879f399aafd..705bbfc40bd5 100644
--- a/x11-themes/clearlooks-metacity/Makefile
+++ b/x11-themes/clearlooks-metacity/Makefile
@@ -3,12 +3,12 @@
 # Whom:			Michael Johnson <ahze@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/x11-themes/clearlooks-metacity/Makefile,v 1.1 2005/08/08 15:27:13 kwm Exp $
+#   $MCom: ports/x11-themes/clearlooks-metacity/Makefile,v 1.3 2007/09/10 15:44:29 mezz Exp $
 #
 
 PORTNAME=	clearlooks-metacity
 PORTVERSION=	2.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-themes
 MASTER_SITES=	http://www.stellingwerff.com/
 #MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
@@ -22,12 +22,12 @@ CONFLICTS=	gnome-themes-2.11.9[1-9]* gnome-themes-2.*
 WRKSRC=		${WRKDIR}/Clearlooks/metacity-1/
 USE_GNOME=	metacity gnomeprefix
 USE_X_PREFIX=	yes
-DATADIR=	share/gnome/themes/Clearlooks/metacity-1
+DATADIR=	share/themes/Clearlooks/metacity-1
 NO_BUILD=	yes
 
 PLIST_FILES=	%%DATADIR%%/metacity-theme-1.xml
 PLIST_DIRS=	%%DATADIR%% \
-		share/gnome/themes/Clearlooks
+		share/themes/Clearlooks
 
 do-install:
 	${MKDIR} ${PREFIX}/${DATADIR}
diff --git a/x11-themes/clearlooks/Makefile b/x11-themes/clearlooks/Makefile
index f76ba9fd8a7f..a67f4e8d5866 100644
--- a/x11-themes/clearlooks/Makefile
+++ b/x11-themes/clearlooks/Makefile
@@ -3,12 +3,12 @@
 # Whom:			Michael Johnson <ahze@FreeBSD.org>
 #
 # $FreeBSD$
-#      $MCom: ports/x11-themes/clearlooks/Makefile,v 1.6 2006/07/19 19:56:11 ahze Exp $
+#   $MCom: ports/x11-themes/clearlooks/Makefile,v 1.8 2007/08/07 04:34:29 mezz Exp $
 #
 
 PORTNAME?=	clearlooks
 PORTVERSION=	0.6.2
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	x11-themes
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	clearlooks
@@ -48,7 +48,7 @@ PLIST_SUB+=	ENGINE="@comment "
 .endif
 
 .if !defined(WITHOUT_METACITY) && ${PORTNAME}=="clearlooks"
-RUN_DEPENDS+=	${LOCALBASE}/share/gnome/themes/Clearlooks/metacity-1/metacity-theme-1.xml:${PORTSDIR}/x11-themes/clearlooks-metacity
+RUN_DEPENDS+=	${LOCALBASE}/share/themes/Clearlooks/metacity-1/metacity-theme-1.xml:${PORTSDIR}/x11-themes/clearlooks-metacity
 .endif
 
 .if defined(WITH_ANIMATION)
diff --git a/x11-themes/clearlooks/pkg-plist b/x11-themes/clearlooks/pkg-plist
index 333c5ed6676c..b4f9f96050ee 100644
--- a/x11-themes/clearlooks/pkg-plist
+++ b/x11-themes/clearlooks/pkg-plist
@@ -45,7 +45,8 @@ share/themes/Clearlooks/index.theme
 @dirrm share/themes/Clearlooks-DeepSky/gtk-2.0
 @dirrm share/themes/Clearlooks-DeepSky
 @dirrm share/themes/Clearlooks
-@dirrm share/gnome/themes/Clearlooks
+@dirrm share/themes/Clearlooks
+@dirrmtry share/themes
 @dirrm share/icons/Clearlooks/24x24/gtk
 @dirrm share/icons/Clearlooks/24x24
 @dirrm share/icons/Clearlooks/16x16/gtk
diff --git a/x11-themes/gnome-backgrounds/Makefile b/x11-themes/gnome-backgrounds/Makefile
index 444020d256b8..ff066859e27c 100644
--- a/x11-themes/gnome-backgrounds/Makefile
+++ b/x11-themes/gnome-backgrounds/Makefile
@@ -3,11 +3,11 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/x11-themes/gnome-backgrounds/Makefile,v 1.26 2006/10/02 23:33:59 ahze Exp $
+#   $MCom: ports/x11-themes/gnome-backgrounds/Makefile,v 1.31 2007/09/18 16:40:37 mezz Exp $
 #
 
 PORTNAME=	gnome-backgrounds
-PORTVERSION=	2.18.3
+PORTVERSION=	2.20.0
 CATEGORIES=	x11-themes graphics gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/x11-themes/gnome-backgrounds/distinfo b/x11-themes/gnome-backgrounds/distinfo
index 804ac1709e32..8041d3135574 100644
--- a/x11-themes/gnome-backgrounds/distinfo
+++ b/x11-themes/gnome-backgrounds/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-backgrounds-2.18.3.tar.bz2) = d91b925d358d2cbc705b4a033e7d5c2e
-SHA256 (gnome2/gnome-backgrounds-2.18.3.tar.bz2) = dfbd4d65a738c37b086fc17000e546e1e080e281bd36677f6f4d081a60a36500
-SIZE (gnome2/gnome-backgrounds-2.18.3.tar.bz2) = 1211585
+MD5 (gnome2/gnome-backgrounds-2.20.0.tar.bz2) = 391c0c64407c5bd2a52207b0298beac4
+SHA256 (gnome2/gnome-backgrounds-2.20.0.tar.bz2) = ca8058d515db7ba7bc0dd9083149b5b64fc5bb0b8729d65367af4ef93dae000a
+SIZE (gnome2/gnome-backgrounds-2.20.0.tar.bz2) = 1208607
diff --git a/x11-themes/gnome-backgrounds/pkg-plist b/x11-themes/gnome-backgrounds/pkg-plist
index 576be68cafea..c87551f73f1f 100644
--- a/x11-themes/gnome-backgrounds/pkg-plist
+++ b/x11-themes/gnome-backgrounds/pkg-plist
@@ -1,16 +1,7 @@
-share/gnome/gnome-background-properties/gnome-branded.xml
-share/gnome/gnome-background-properties/gnome-nature.xml
-share/gnome/gnome-background-properties/gnome-tiles.xml
-share/gnome/gnome-background-properties/gnome-translucent.xml
-share/gnome/pixmaps/backgrounds/gnome/branded/GNOME-Curves.png
-share/gnome/pixmaps/backgrounds/gnome/nature/FreshFlower.jpg
-share/gnome/pixmaps/backgrounds/gnome/nature/GreenMeadow.jpg
-share/gnome/pixmaps/backgrounds/gnome/nature/OpenFlower.jpg
-share/gnome/pixmaps/backgrounds/gnome/tiles/pattern-boats.svg
-share/gnome/pixmaps/backgrounds/gnome/tiles/pattern-clouds.svg
-share/gnome/pixmaps/backgrounds/gnome/tiles/pattern-stars.svg
-share/gnome/pixmaps/backgrounds/gnome/translucent/ellipsis.svg
-share/gnome/pixmaps/backgrounds/gnome/translucent/tentacles.svg
+share/gnome-background-properties/gnome-branded.xml
+share/gnome-background-properties/gnome-nature.xml
+share/gnome-background-properties/gnome-tiles.xml
+share/gnome-background-properties/gnome-translucent.xml
 share/locale/ar/LC_MESSAGES/gnome-backgrounds.mo
 share/locale/as/LC_MESSAGES/gnome-backgrounds.mo
 share/locale/be/LC_MESSAGES/gnome-backgrounds.mo
@@ -48,6 +39,7 @@ share/locale/ku/LC_MESSAGES/gnome-backgrounds.mo
 share/locale/ky/LC_MESSAGES/gnome-backgrounds.mo
 share/locale/lt/LC_MESSAGES/gnome-backgrounds.mo
 share/locale/lv/LC_MESSAGES/gnome-backgrounds.mo
+share/locale/mai/LC_MESSAGES/gnome-backgrounds.mo
 share/locale/mg/LC_MESSAGES/gnome-backgrounds.mo
 share/locale/mk/LC_MESSAGES/gnome-backgrounds.mo
 share/locale/ml/LC_MESSAGES/gnome-backgrounds.mo
@@ -82,13 +74,22 @@ share/locale/vi/LC_MESSAGES/gnome-backgrounds.mo
 share/locale/zh_CN/LC_MESSAGES/gnome-backgrounds.mo
 share/locale/zh_HK/LC_MESSAGES/gnome-backgrounds.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-backgrounds.mo
-@dirrm share/gnome/pixmaps/backgrounds/gnome/translucent
-@dirrm share/gnome/pixmaps/backgrounds/gnome/tiles
-@dirrm share/gnome/pixmaps/backgrounds/gnome/nature
-@dirrm share/gnome/pixmaps/backgrounds/gnome/branded
-@dirrm share/gnome/pixmaps/backgrounds/gnome
-@dirrm share/gnome/pixmaps/backgrounds
-@dirrmtry share/gnome/gnome-background-properties
+share/pixmaps/backgrounds/gnome/branded/GNOME-Curves.png
+share/pixmaps/backgrounds/gnome/nature/FreshFlower.jpg
+share/pixmaps/backgrounds/gnome/nature/GreenMeadow.jpg
+share/pixmaps/backgrounds/gnome/nature/OpenFlower.jpg
+share/pixmaps/backgrounds/gnome/tiles/pattern-boats.svg
+share/pixmaps/backgrounds/gnome/tiles/pattern-clouds.svg
+share/pixmaps/backgrounds/gnome/tiles/pattern-stars.svg
+share/pixmaps/backgrounds/gnome/translucent/ellipsis.svg
+share/pixmaps/backgrounds/gnome/translucent/tentacles.svg
+@dirrm share/pixmaps/backgrounds/gnome/translucent
+@dirrm share/pixmaps/backgrounds/gnome/tiles
+@dirrm share/pixmaps/backgrounds/gnome/nature
+@dirrm share/pixmaps/backgrounds/gnome/branded
+@dirrm share/pixmaps/backgrounds/gnome
+@dirrm share/pixmaps/backgrounds
+@dirrmtry share/gnome-background-properties
 @dirrmtry share/locale/zh_HK/LC_MESSAGES
 @dirrmtry share/locale/zh_HK
 @dirrmtry share/locale/te/LC_MESSAGES
@@ -103,6 +104,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-backgrounds.mo
 @dirrmtry share/locale/mr
 @dirrmtry share/locale/mg/LC_MESSAGES
 @dirrmtry share/locale/mg
+@dirrmtry share/locale/mai/LC_MESSAGES
+@dirrmtry share/locale/mai
 @dirrmtry share/locale/ky/LC_MESSAGES
 @dirrmtry share/locale/ky
 @dirrmtry share/locale/ku/LC_MESSAGES
diff --git a/x11-themes/gnome-bluecurve-theme/Makefile b/x11-themes/gnome-bluecurve-theme/Makefile
index c0a3b22ef65a..d8c3f94b9053 100644
--- a/x11-themes/gnome-bluecurve-theme/Makefile
+++ b/x11-themes/gnome-bluecurve-theme/Makefile
@@ -7,11 +7,13 @@
 
 PORTNAME=	gnome-bluecurve-theme
 
+PORTREVISION=	1
+
 COMMENT=	The Bluecurve GNOME meta-theme
 
 RUN_DEPENDS=	${LOCALBASE}/share/themes/Bluecurve/gtk-2.0/gtkrc:${PORTSDIR}/x11-themes/gtk-bluecurve-theme \
 		${LOCALBASE}/share/icons/Bluecurve/index.theme:${PORTSDIR}/x11-themes/icon-bluecurve-theme \
-		${LOCALBASE}/share/gnome/themes/Bluecurve/metacity-1/metacity-theme-1.xml:${PORTSDIR}/x11-themes/metacity-bluecurve-theme
+		${LOCALBASE}/share/themes/Bluecurve/metacity-1/metacity-theme-1.xml:${PORTSDIR}/x11-themes/metacity-bluecurve-theme
 
 MASTERDIR=	${.CURDIR}/../bluecurve-themes
 
diff --git a/x11-themes/gnome-industrial-theme/Makefile b/x11-themes/gnome-industrial-theme/Makefile
index 5bc269cbf11a..1f3b314e8561 100644
--- a/x11-themes/gnome-industrial-theme/Makefile
+++ b/x11-themes/gnome-industrial-theme/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gnome-industrial-theme
 PORTVERSION=	0.2.29
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	x11-themes
 MASTER_SITES=	http://ftp.ximian.com/pub/xd2/redhat-9-i386/source/ \
 		${MASTER_SITE_GENTOO:S,%SUBDIR%,distfiles,}
@@ -21,6 +21,10 @@ EXTRACT_DEPENDS=rpm2cpio.pl:${PORTSDIR}/archivers/rpm2cpio
 BUILD_DEPENDS=	${LOCALBASE}/lib/gtk-2.0/${GTK2_VERSION}/engines/libindustrial.so:${PORTSDIR}/x11-themes/gnome-themes-extras
 RUN_DEPENDS=	${LOCALBASE}/lib/gtk-2.0/${GTK2_VERSION}/engines/libindustrial.so:${PORTSDIR}/x11-themes/gnome-themes-extras
 
+BROKEN=		gnome-themes-extras no longer has industrial engine
+DEPRECATED=	yes
+EXPIRATION_DATE=2007-11-22
+
 NO_BUILD=	yes
 USE_GNOME=	gnomehack libgnomeui
 
@@ -101,8 +105,8 @@ do-install:
 
 	@${INSTALL_DATA} ${WRKSRC}/icons/Industrial/index.theme ${PREFIX}/share/icons/Industrial
 
-	@${MKDIR} ${PREFIX}/share/gnome/themes/Industrial/metacity-1
-	@${INSTALL_DATA} ${WRKSRC}/metacity/metacity-theme-1.xml ${PREFIX}/share/gnome/themes/Industrial/metacity-1
+	@${MKDIR} ${PREFIX}/share/themes/Industrial/metacity-1
+	@${INSTALL_DATA} ${WRKSRC}/metacity/metacity-theme-1.xml ${PREFIX}/share/themes/Industrial/metacity-1
 	@${INSTALL_DATA} ${WRKSRC}/index.theme ${PREFIX}/share/themes/Industrial
 
 .if defined(WITH_XMMS)
diff --git a/x11-themes/gnome-industrial-theme/pkg-plist b/x11-themes/gnome-industrial-theme/pkg-plist
index d74125d850e5..cebe1d41b292 100644
--- a/x11-themes/gnome-industrial-theme/pkg-plist
+++ b/x11-themes/gnome-industrial-theme/pkg-plist
@@ -176,7 +176,7 @@ share/icons/Industrial/scalable/filesystems/gnome-fs-trash-full-accept.svg
 share/icons/Industrial/scalable/filesystems/gnome-fs-trash-full.svg
 share/icons/Industrial/scalable/filesystems/gnome-fs-directory.icon
 share/icons/Industrial/index.theme
-share/gnome/themes/Industrial/metacity-1/metacity-theme-1.xml
+share/themes/Industrial/metacity-1/metacity-theme-1.xml
 share/themes/Industrial/index.theme
 %%XMMS%%share/xmms/Skins/Industrial/balance.bmp
 %%XMMS%%share/xmms/Skins/Industrial/cbuttons.bmp
@@ -215,7 +215,8 @@ share/themes/Industrial/index.theme
 @dirrm share/icons/Industrial/scalable/filesystems
 @dirrm share/icons/Industrial/scalable
 @dirrm share/icons/Industrial
-@dirrm share/gnome/themes/Industrial/metacity-1
-@dirrm share/gnome/themes/Industrial
+@dirrm share/themes/Industrial/metacity-1
+@dirrm share/themes/Industrial
 @dirrmtry share/themes/Industrial
+@dirrmtry share/themes
 %%XMMS%%@dirrm share/xmms/Skins/Industrial
diff --git a/x11-themes/gnome-splashscreen-manager/Makefile b/x11-themes/gnome-splashscreen-manager/Makefile
index ab7d27d931d2..bcf4487b4fce 100644
--- a/x11-themes/gnome-splashscreen-manager/Makefile
+++ b/x11-themes/gnome-splashscreen-manager/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gnome-splashscreen-manager
 PORTVERSION=	0.2
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	x11-themes
 MASTER_SITES=	http://www.miketech.net/gnome-art/download/
 DISTNAME=	gnome-art-${PORTVERSION}
@@ -24,7 +24,7 @@ RUN_DEPENDS=	${BUILD_DEPENDS}
 WRKSRC=		${WRKDIR}/gnome-art/${PORTNAME}
 USE_RUBY=	yes
 USE_RUBY_SETUP=	yes
-GSPLASH=	${LOCALBASE}/share/gnome/pixmaps/splash
+GSPLASH=	${LOCALBASE}/share/pixmaps/splash
 SPLASH_ICON=	${DATADIR}/glade/gnome-graphics.png
 
 post-patch:
diff --git a/x11-themes/gnome-themes-extras/Makefile b/x11-themes/gnome-themes-extras/Makefile
index 467f039a9e31..0cfd1393cb9e 100644
--- a/x11-themes/gnome-themes-extras/Makefile
+++ b/x11-themes/gnome-themes-extras/Makefile
@@ -3,21 +3,21 @@
 # Whom:					Adam Weinberger <adamw@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/x11-themes/gnome-themes-extras/Makefile,v 1.12 2006/07/18 16:31:04 ahze Exp $
+#   $MCom: ports/x11-themes/gnome-themes-extras/Makefile,v 1.18 2007/10/04 02:36:16 mezz Exp $
+#
 
 PORTNAME=	gnome-themes-extras
-PORTVERSION=	0.9.0
-PORTREVISION=	2
+PORTVERSION=	2.20
 CATEGORIES=	x11-themes gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/0.9
+MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	More themes for the GNOME 2 desktop environment
 
-BUILD_DEPENDS=	gtk-engines2>=2.7.5_1:${PORTSDIR}/x11-themes/gtk-engines2
-RUN_DEPENDS=	gtk-engines2>=2.7.5_1:${PORTSDIR}/x11-themes/gtk-engines2
+BUILD_DEPENDS=	gtk-engines2>=2.11.0:${PORTSDIR}/x11-themes/gtk-engines2 \
+		icon-naming-utils>=0.8.1:${PORTSDIR}/x11-themes/icon-naming-utils
+RUN_DEPENDS=	gtk-engines2>=2.11.0:${PORTSDIR}/x11-themes/gtk-engines2
 
 USE_BZIP2=	yes
 USE_GETTEXT=	yes
@@ -28,15 +28,4 @@ INSTALLS_ICONS=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 503001
-EXTRACT_DEPENDS+=	gtar:${PORTSDIR}/archivers/gtar
-TAR=			${LOCALBASE}/bin/gtar
-.endif
-
-post-patch:
-	@${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} ${REINPLACE_CMD} -e \
-		"/^themedir =.*metacity-1$$/s|themes|gnome/themes|"
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-themes/gnome-themes-extras/distinfo b/x11-themes/gnome-themes-extras/distinfo
index 5ca19d142dfa..33b1d6c9e77d 100644
--- a/x11-themes/gnome-themes-extras/distinfo
+++ b/x11-themes/gnome-themes-extras/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-themes-extras-0.9.0.tar.bz2) = bac18c11fb9de8403e27441be64d9717
-SHA256 (gnome2/gnome-themes-extras-0.9.0.tar.bz2) = 551bce54b34214b562a806ea7b7535fab5ad1825935a4eb698d5a22680600869
-SIZE (gnome2/gnome-themes-extras-0.9.0.tar.bz2) = 5625636
+MD5 (gnome2/gnome-themes-extras-2.20.tar.bz2) = 830b27cb368e40c70b15288d2db12937
+SHA256 (gnome2/gnome-themes-extras-2.20.tar.bz2) = c833197c5042986c252ec91d5d768575132459fc8224da5d80166b68f98a54d4
+SIZE (gnome2/gnome-themes-extras-2.20.tar.bz2) = 4574872
diff --git a/x11-themes/gnome-themes-extras/pkg-plist b/x11-themes/gnome-themes-extras/pkg-plist
index 564c4b58c433..4b53c3bb8c7e 100644
--- a/x11-themes/gnome-themes-extras/pkg-plist
+++ b/x11-themes/gnome-themes-extras/pkg-plist
@@ -1,1231 +1,5343 @@
-share/gnome/themes/Amaranth/metacity-1/left-side.png
-share/gnome/themes/Amaranth/metacity-1/metacity-theme-1.xml
-share/gnome/themes/Amaranth/metacity-1/right-side.png
-share/gnome/themes/Amaranth/metacity-1/title-bar.png
-share/gnome/themes/Amaranth/metacity-1/wm-close-focus.svg
-share/gnome/themes/Amaranth/metacity-1/wm-close.svg
-share/gnome/themes/Amaranth/metacity-1/wm-max-focus.svg
-share/gnome/themes/Amaranth/metacity-1/wm-max.svg
-share/gnome/themes/Amaranth/metacity-1/wm-menu-focus.svg
-share/gnome/themes/Amaranth/metacity-1/wm-menu.svg
-share/gnome/themes/Amaranth/metacity-1/wm-min-focus.svg
-share/gnome/themes/Amaranth/metacity-1/wm-min.svg
-share/gnome/themes/Amaranth/metacity-1/wm-restore.svg
-share/gnome/themes/Gorilla/metacity-1/metacity-theme-1.xml
-share/gnome/themes/Gorilla/metacity-1/wm-close.svg
-share/gnome/themes/Gorilla/metacity-1/wm-max.svg
-share/gnome/themes/Gorilla/metacity-1/wm-menu.svg
-share/gnome/themes/Gorilla/metacity-1/wm-min.svg
-share/gnome/themes/Gorilla/metacity-1/wm-restore.svg
-share/gnome/themes/Lush/metacity-1/BT-agrandirfenetre.png
-share/gnome/themes/Lush/metacity-1/BT-fermer.png
-share/gnome/themes/Lush/metacity-1/BT-neutre.png
-share/gnome/themes/Lush/metacity-1/BT-reduire.png
-share/gnome/themes/Lush/metacity-1/BT-reduirefenetre.png
-share/gnome/themes/Lush/metacity-1/barre-grise-bas.png
-share/gnome/themes/Lush/metacity-1/coindroit-bas.png
-share/gnome/themes/Lush/metacity-1/coingauche-bas.png
-share/gnome/themes/Lush/metacity-1/cote-droit.png
-share/gnome/themes/Lush/metacity-1/cote-gauche.png
-share/gnome/themes/Lush/metacity-1/cote_suitearrondi.png
-share/gnome/themes/Lush/metacity-1/degrade-color.png
-share/gnome/themes/Lush/metacity-1/degrade-gris.png
-share/gnome/themes/Lush/metacity-1/metacity-theme-1.xml
-share/gnome/themes/Lush/metacity-1/transition.png
-share/gnome/themes/Nuvola-old/metacity-1/metacity-theme-1.xml
-share/gnome/themes/Nuvola-old/metacity-1/wm-close.png
-share/gnome/themes/Nuvola-old/metacity-1/wm-inac.png
-share/gnome/themes/Nuvola-old/metacity-1/wm-max.png
-share/gnome/themes/Nuvola-old/metacity-1/wm-menu.png
-share/gnome/themes/Nuvola-old/metacity-1/wm-min.png
-share/gnome/themes/Nuvola-old/metacity-1/wm-restore.png
-share/gnome/themes/Nuvola/metacity-1/metacity-theme-1.xml
-share/gnome/themes/Nuvola/metacity-1/wm-close-alt.svg
-share/gnome/themes/Nuvola/metacity-1/wm-close.svg
-share/gnome/themes/Nuvola/metacity-1/wm-max-alt.svg
-share/gnome/themes/Nuvola/metacity-1/wm-max.svg
-share/gnome/themes/Nuvola/metacity-1/wm-min-alt.svg
-share/gnome/themes/Nuvola/metacity-1/wm-min.svg
-share/gnome/themes/Nuvola/metacity-1/wm-restore-alt.svg
-share/gnome/themes/Nuvola/metacity-1/wm-restore.svg
-share/gnome/themes/Wasp/metacity-1/metacity-theme-1.xml
-share/icons/Amaranth/index.theme
-share/icons/Amaranth/scalable/apps/abiword_48.svg
-share/icons/Amaranth/scalable/apps/accessibility-keyboard-capplet.svg
-share/icons/Amaranth/scalable/apps/accessories.svg
-share/icons/Amaranth/scalable/apps/advanced-directory.svg
-share/icons/Amaranth/scalable/apps/apacheconf.svg
-share/icons/Amaranth/scalable/apps/blender.svg
-share/icons/Amaranth/scalable/apps/camera.svg
-share/icons/Amaranth/scalable/apps/disks.svg
-share/icons/Amaranth/scalable/apps/downloadmanager.svg
-share/icons/Amaranth/scalable/apps/email.svg
-share/icons/Amaranth/scalable/apps/evolution-1.4.svg
-share/icons/Amaranth/scalable/apps/evolution.svg
-share/icons/Amaranth/scalable/apps/file-manager.svg
-share/icons/Amaranth/scalable/apps/file-roller.svg
-share/icons/Amaranth/scalable/apps/gaim.svg
-share/icons/Amaranth/scalable/apps/gcalctool.svg
-share/icons/Amaranth/scalable/apps/gedit-icon.svg
-share/icons/Amaranth/scalable/apps/gedit.svg
-share/icons/Amaranth/scalable/apps/gftp.svg
-share/icons/Amaranth/scalable/apps/gimp.svg
-share/icons/Amaranth/scalable/apps/gnome-aisleriot.svg
-share/icons/Amaranth/scalable/apps/gnome-applications.svg
-share/icons/Amaranth/scalable/apps/gnome-calc3.svg
-share/icons/Amaranth/scalable/apps/gnome-cardgame.svg
-share/icons/Amaranth/scalable/apps/gnome-cdplayer-icon.svg
-share/icons/Amaranth/scalable/apps/gnome-cdplayer.svg
-share/icons/Amaranth/scalable/apps/gnome-devel.svg
-share/icons/Amaranth/scalable/apps/gnome-envelope.svg
-share/icons/Amaranth/scalable/apps/gnome-gaim.svg
-share/icons/Amaranth/scalable/apps/gnome-gimp.svg
-share/icons/Amaranth/scalable/apps/gnome-globe.svg
-share/icons/Amaranth/scalable/apps/gnome-graphics.svg
-share/icons/Amaranth/scalable/apps/gnome-help.svg
-share/icons/Amaranth/scalable/apps/gnome-home.svg
-share/icons/Amaranth/scalable/apps/gnome-icq.svg
-share/icons/Amaranth/scalable/apps/gnome-joystick.svg
-share/icons/Amaranth/scalable/apps/gnome-lockscreen.svg
-share/icons/Amaranth/scalable/apps/gnome-logo.svg
-share/icons/Amaranth/scalable/apps/gnome-main-menu.svg
-share/icons/Amaranth/scalable/apps/gnome-media-player.svg
-share/icons/Amaranth/scalable/apps/gnome-mixer.svg
-share/icons/Amaranth/scalable/apps/gnome-mouse.svg
-share/icons/Amaranth/scalable/apps/gnome-multimedia.svg
-share/icons/Amaranth/scalable/apps/gnome-palette.svg
-share/icons/Amaranth/scalable/apps/gnome-pdf.svg
-share/icons/Amaranth/scalable/apps/gnome-settings.svg
-share/icons/Amaranth/scalable/apps/gnome-starthere.svg
-share/icons/Amaranth/scalable/apps/gnome-terminal.svg
-share/icons/Amaranth/scalable/apps/gnumeric.svg
-share/icons/Amaranth/scalable/apps/gripicon.svg
-share/icons/Amaranth/scalable/apps/gucharmap.svg
-share/icons/Amaranth/scalable/apps/hwbrowser.svg
-share/icons/Amaranth/scalable/apps/icon-system-tools.svg
-share/icons/Amaranth/scalable/apps/icon-update.svg
-share/icons/Amaranth/scalable/apps/monitor.svg
-share/icons/Amaranth/scalable/apps/mouse-capplet.svg
-share/icons/Amaranth/scalable/apps/mozilla-icon.svg
-share/icons/Amaranth/scalable/apps/mozilla-mail-icon.svg
-share/icons/Amaranth/scalable/apps/mozilla-orig.svg
-share/icons/Amaranth/scalable/apps/mozilla-star.svg
-share/icons/Amaranth/scalable/apps/mozilla.svg
-share/icons/Amaranth/scalable/apps/my-computer.svg
-share/icons/Amaranth/scalable/apps/netscape.svg
-share/icons/Amaranth/scalable/apps/opera.svg
-share/icons/Amaranth/scalable/apps/redhat-accessories.svg
-share/icons/Amaranth/scalable/apps/redhat-config-xfree86.svg
-share/icons/Amaranth/scalable/apps/redhat-email.svg
-share/icons/Amaranth/scalable/apps/redhat-games.svg
-share/icons/Amaranth/scalable/apps/redhat-graphics.svg
-share/icons/Amaranth/scalable/apps/redhat-home.svg
-share/icons/Amaranth/scalable/apps/redhat-internet.svg
-share/icons/Amaranth/scalable/apps/redhat-main-menu.svg
-share/icons/Amaranth/scalable/apps/redhat-office.svg
-share/icons/Amaranth/scalable/apps/redhat-preferences.svg
-share/icons/Amaranth/scalable/apps/redhat-programming.svg
-share/icons/Amaranth/scalable/apps/redhat-sound_video.svg
-share/icons/Amaranth/scalable/apps/redhat-system_settings.svg
-share/icons/Amaranth/scalable/apps/redhat-system_tools.svg
-share/icons/Amaranth/scalable/apps/redhat-web-browser.svg
-share/icons/Amaranth/scalable/apps/rhythmbox.svg
-share/icons/Amaranth/scalable/apps/sambaconf.svg
-share/icons/Amaranth/scalable/apps/seti.svg
-share/icons/Amaranth/scalable/apps/sound-juicer.svg
-share/icons/Amaranth/scalable/apps/system-floppy.svg
-share/icons/Amaranth/scalable/apps/system-search-32.svg
-share/icons/Amaranth/scalable/apps/system-tools-32.svg
-share/icons/Amaranth/scalable/apps/tex.svg
-share/icons/Amaranth/scalable/apps/thunderbird.svg
-share/icons/Amaranth/scalable/apps/up2date.svg
-share/icons/Amaranth/scalable/apps/web-browser.svg
-share/icons/Amaranth/scalable/apps/wilber-icon.svg
-share/icons/Amaranth/scalable/apps/xmms.svg
-share/icons/Amaranth/scalable/apps/xpdf.svg
-share/icons/Amaranth/scalable/devices/gnome-dev-cdrom-audio.svg
-share/icons/Amaranth/scalable/devices/gnome-dev-cdrom.svg
-share/icons/Amaranth/scalable/devices/gnome-dev-cdwriter.svg
-share/icons/Amaranth/scalable/devices/gnome-dev-dvd.svg
-share/icons/Amaranth/scalable/devices/gnome-dev-floppy.svg
-share/icons/Amaranth/scalable/devices/gnome-dev-harddisk.svg
-share/icons/Amaranth/scalable/devices/gnome-dev-network.svg
-share/icons/Amaranth/scalable/devices/gnome-dev-removable.svg
-share/icons/Amaranth/scalable/devices/gnome-dev-symlink.svg
-share/icons/Amaranth/scalable/emblems/emblem-camera.svg
-share/icons/Amaranth/scalable/emblems/emblem-cool.svg
-share/icons/Amaranth/scalable/emblems/emblem-danger.svg
-share/icons/Amaranth/scalable/emblems/emblem-distinguished.svg
-share/icons/Amaranth/scalable/emblems/emblem-documents.svg
-share/icons/Amaranth/scalable/emblems/emblem-favorite.svg
-share/icons/Amaranth/scalable/emblems/emblem-fun.svg
-share/icons/Amaranth/scalable/emblems/emblem-generic.svg
-share/icons/Amaranth/scalable/emblems/emblem-important.svg
-share/icons/Amaranth/scalable/emblems/emblem-multimedia.svg
-share/icons/Amaranth/scalable/emblems/emblem-noread.svg
-share/icons/Amaranth/scalable/emblems/emblem-nowrite.svg
-share/icons/Amaranth/scalable/emblems/emblem-ohno.svg
-share/icons/Amaranth/scalable/emblems/emblem-package.svg
-share/icons/Amaranth/scalable/emblems/emblem-pictures.svg
-share/icons/Amaranth/scalable/emblems/emblem-relax.svg
-share/icons/Amaranth/scalable/emblems/emblem-sound.svg
-share/icons/Amaranth/scalable/emblems/emblem-symbolic-link.svg
-share/icons/Amaranth/scalable/emblems/emblem-web.svg
-share/icons/Amaranth/scalable/filesystems/gnome-fs-blockdev.svg
-share/icons/Amaranth/scalable/filesystems/gnome-fs-client.svg
-share/icons/Amaranth/scalable/filesystems/gnome-fs-directory-accept.icon
-share/icons/Amaranth/scalable/filesystems/gnome-fs-directory-accept.svg
-share/icons/Amaranth/scalable/filesystems/gnome-fs-directory.icon
-share/icons/Amaranth/scalable/filesystems/gnome-fs-directory.svg
-share/icons/Amaranth/scalable/filesystems/gnome-fs-executable.svg
-share/icons/Amaranth/scalable/filesystems/gnome-fs-home.svg
-share/icons/Amaranth/scalable/filesystems/gnome-fs-loading-icon.svg
-share/icons/Amaranth/scalable/filesystems/gnome-fs-network.svg
-share/icons/Amaranth/scalable/filesystems/gnome-fs-regular.svg
-share/icons/Amaranth/scalable/filesystems/gnome-fs-server.svg
-share/icons/Amaranth/scalable/filesystems/gnome-fs-smb.svg
-share/icons/Amaranth/scalable/filesystems/gnome-fs-trash-empty.svg
-share/icons/Amaranth/scalable/filesystems/gnome-fs-trash-full.svg
-share/icons/Amaranth/scalable/mimetypes/gnome-compressed.svg
-share/icons/Amaranth/scalable/mimetypes/gnome-mime-application-ogg.svg
-share/icons/Amaranth/scalable/mimetypes/gnome-mime-application-pdf.svg
-share/icons/Amaranth/scalable/mimetypes/gnome-mime-application-pgp.svg
-share/icons/Amaranth/scalable/mimetypes/gnome-mime-application-vnd.sun.xml.writer.svg
-share/icons/Amaranth/scalable/mimetypes/gnome-mime-application-x-objectfile.svg
-share/icons/Amaranth/scalable/mimetypes/gnome-mime-application-x-rpm.svg
-share/icons/Amaranth/scalable/mimetypes/gnome-mime-application-x-stuffit.svg
-share/icons/Amaranth/scalable/mimetypes/gnome-mime-application-x-tgz.svg
-share/icons/Amaranth/scalable/mimetypes/gnome-mime-audio.svg
-share/icons/Amaranth/scalable/mimetypes/gnome-mime-autorun.svg
-share/icons/Amaranth/scalable/mimetypes/gnome-mime-image-xcf.svg
-share/icons/Amaranth/scalable/mimetypes/gnome-mime-image.svg
-share/icons/Amaranth/scalable/mimetypes/gnome-mime-text-x-asm.svg
-share/icons/Amaranth/scalable/mimetypes/gnome-mime-text-x-c++.svg
-share/icons/Amaranth/scalable/mimetypes/gnome-mime-text-x-c-header.svg
-share/icons/Amaranth/scalable/mimetypes/gnome-mime-text-x-c.svg
-share/icons/Amaranth/scalable/mimetypes/gnome-mime-text-x-fortran.svg
-share/icons/Amaranth/scalable/mimetypes/gnome-mime-text-x-install.svg
-share/icons/Amaranth/scalable/mimetypes/gnome-mime-text-x-pascal.svg
-share/icons/Amaranth/scalable/mimetypes/gnome-mime-text-x-perl.svg
-share/icons/Amaranth/scalable/mimetypes/gnome-mime-text-x-python.svg
-share/icons/Amaranth/scalable/mimetypes/gnome-mime-text-x-sh.svg
-share/icons/Amaranth/scalable/mimetypes/gnome-mime-text-x-yacc.svg
-share/icons/Amaranth/scalable/mimetypes/gnome-mime-text.svg
-share/icons/Amaranth/scalable/mimetypes/gnome-mime-video.svg
-share/icons/Amaranth/scalable/stock/applets-screenshooter.svg
-share/icons/Amaranth/scalable/stock/gnome-logo.svg
-share/icons/Amaranth/scalable/stock/stock_about.svg
-share/icons/Amaranth/scalable/stock/stock_cdrom.svg
-share/icons/Amaranth/scalable/stock/stock_copy.svg
-share/icons/Amaranth/scalable/stock/stock_cut.svg
-share/icons/Amaranth/scalable/stock/stock_delete.svg
-share/icons/Amaranth/scalable/stock/stock_dialog_error.png
-share/icons/Amaranth/scalable/stock/stock_dialog_info.png
-share/icons/Amaranth/scalable/stock/stock_dialog_warning.png
-share/icons/Amaranth/scalable/stock/stock_execute.svg
-share/icons/Amaranth/scalable/stock/stock_floppy.svg
-share/icons/Amaranth/scalable/stock/stock_go-back.svg
-share/icons/Amaranth/scalable/stock/stock_go-down.svg
-share/icons/Amaranth/scalable/stock/stock_go-forward.svg
-share/icons/Amaranth/scalable/stock/stock_go-up.svg
-share/icons/Amaranth/scalable/stock/stock_gtk-sort-ascending.svg
-share/icons/Amaranth/scalable/stock/stock_gtk-sort-descending.svg
-share/icons/Amaranth/scalable/stock/stock_help.svg
-share/icons/Amaranth/scalable/stock/stock_home.svg
-share/icons/Amaranth/scalable/stock/stock_lockscreen.svg
-share/icons/Amaranth/scalable/stock/stock_new.svg
-share/icons/Amaranth/scalable/stock/stock_open.svg
-share/icons/Amaranth/scalable/stock/stock_paste.svg
-share/icons/Amaranth/scalable/stock/stock_preferences.svg
-share/icons/Amaranth/scalable/stock/stock_print-preview.svg
-share/icons/Amaranth/scalable/stock/stock_print.svg
-share/icons/Amaranth/scalable/stock/stock_quit.svg
-share/icons/Amaranth/scalable/stock/stock_redo.svg
-share/icons/Amaranth/scalable/stock/stock_refresh.svg
-share/icons/Amaranth/scalable/stock/stock_replace.svg
-share/icons/Amaranth/scalable/stock/stock_reset.svg
-share/icons/Amaranth/scalable/stock/stock_save_as.svg
-share/icons/Amaranth/scalable/stock/stock_screenshot.svg
-share/icons/Amaranth/scalable/stock/stock_search.svg
-share/icons/Amaranth/scalable/stock/stock_stop.svg
-share/icons/Amaranth/scalable/stock/stock_undo.svg
-share/icons/Amaranth/scalable/stock/stock_volume-0.svg
-share/icons/Amaranth/scalable/stock/stock_volume-max.svg
-share/icons/Amaranth/scalable/stock/stock_volume-med.svg
-share/icons/Amaranth/scalable/stock/stock_volume-min.svg
-share/icons/Gorilla/24x24/apps/gnome-spinner-rest.png
-share/icons/Gorilla/24x24/apps/gnome-spinner.png
-share/icons/Gorilla/index.theme
-share/icons/Gorilla/scalable/apps/accessibility-directory.svg
-share/icons/Gorilla/scalable/apps/galeon.svg
-share/icons/Gorilla/scalable/apps/gnome-games.svg
-share/icons/Gorilla/scalable/apps/gnome-gimp.svg
-share/icons/Gorilla/scalable/apps/gnome-joystick.svg
-share/icons/Gorilla/scalable/apps/gnome-terminal.svg
-share/icons/Gorilla/scalable/apps/web-browser.svg
-share/icons/Gorilla/scalable/devices/gnome-dev-cdrom-audio.svg
-share/icons/Gorilla/scalable/devices/gnome-dev-cdrom.svg
-share/icons/Gorilla/scalable/devices/gnome-dev-dvd.svg
-share/icons/Gorilla/scalable/devices/gnome-dev-floppy.svg
-share/icons/Gorilla/scalable/devices/gnome-dev-harddisk.svg
-share/icons/Gorilla/scalable/devices/gnome-dev-mouse.svg
-share/icons/Gorilla/scalable/devices/gnome-dev-network.svg
-share/icons/Gorilla/scalable/devices/gnome-dev-removable.svg
-share/icons/Gorilla/scalable/devices/gnome-dev-rw.svg
-share/icons/Gorilla/scalable/devices/gnome-dev-symlink.svg
-share/icons/Gorilla/scalable/emblems/emblem-camera.svg
-share/icons/Gorilla/scalable/emblems/emblem-cool.svg
-share/icons/Gorilla/scalable/emblems/emblem-danger.svg
-share/icons/Gorilla/scalable/emblems/emblem-distinguished.svg
-share/icons/Gorilla/scalable/emblems/emblem-documents.svg
-share/icons/Gorilla/scalable/emblems/emblem-fun.svg
-share/icons/Gorilla/scalable/emblems/emblem-generic.svg
-share/icons/Gorilla/scalable/emblems/emblem-important.svg
-share/icons/Gorilla/scalable/emblems/emblem-multimedia.svg
-share/icons/Gorilla/scalable/emblems/emblem-noread.svg
-share/icons/Gorilla/scalable/emblems/emblem-nowrite.svg
-share/icons/Gorilla/scalable/emblems/emblem-ohno.svg
-share/icons/Gorilla/scalable/emblems/emblem-package.svg
-share/icons/Gorilla/scalable/emblems/emblem-pictures.svg
-share/icons/Gorilla/scalable/emblems/emblem-relax.svg
-share/icons/Gorilla/scalable/emblems/emblem-sound.svg
-share/icons/Gorilla/scalable/emblems/emblem-symbolic-link.svg
-share/icons/Gorilla/scalable/emblems/emblem-urgent.svg
-share/icons/Gorilla/scalable/emblems/emblem-web.svg
-share/icons/Gorilla/scalable/filesystems/gnome-fs-blockdev.svg
-share/icons/Gorilla/scalable/filesystems/gnome-fs-bookmark-missing.svg
-share/icons/Gorilla/scalable/filesystems/gnome-fs-bookmark.svg
-share/icons/Gorilla/scalable/filesystems/gnome-fs-chardev.svg
-share/icons/Gorilla/scalable/filesystems/gnome-fs-client.svg
-share/icons/Gorilla/scalable/filesystems/gnome-fs-directory-accept.icon
-share/icons/Gorilla/scalable/filesystems/gnome-fs-directory-accept.svg
-share/icons/Gorilla/scalable/filesystems/gnome-fs-directory-visiting.icon
-share/icons/Gorilla/scalable/filesystems/gnome-fs-directory-visiting.svg
-share/icons/Gorilla/scalable/filesystems/gnome-fs-directory.icon
-share/icons/Gorilla/scalable/filesystems/gnome-fs-directory.svg
-share/icons/Gorilla/scalable/filesystems/gnome-fs-ftp.svg
-share/icons/Gorilla/scalable/filesystems/gnome-fs-home.svg
-share/icons/Gorilla/scalable/filesystems/gnome-fs-loading-icon.svg
-share/icons/Gorilla/scalable/filesystems/gnome-fs-network.svg
-share/icons/Gorilla/scalable/filesystems/gnome-fs-nfs.svg
-share/icons/Gorilla/scalable/filesystems/gnome-fs-regular.svg
-share/icons/Gorilla/scalable/filesystems/gnome-fs-server.svg
-share/icons/Gorilla/scalable/filesystems/gnome-fs-smb.svg
-share/icons/Gorilla/scalable/filesystems/gnome-fs-ssh.svg
-share/icons/Gorilla/scalable/filesystems/gnome-fs-trash-empty.svg
-share/icons/Gorilla/scalable/filesystems/gnome-fs-trash-full.svg
-share/icons/Gorilla/scalable/filesystems/gnome-fs-web.svg
-share/icons/Gorilla/scalable/mimetypes/gnome-compressed.svg
-share/icons/Gorilla/scalable/mimetypes/gnome-mime-application-msword.svg
-share/icons/Gorilla/scalable/mimetypes/gnome-mime-application-ogg.svg
-share/icons/Gorilla/scalable/mimetypes/gnome-mime-application-pdf.svg
-share/icons/Gorilla/scalable/mimetypes/gnome-mime-application-pgp.svg
-share/icons/Gorilla/scalable/mimetypes/gnome-mime-application-postscript.svg
-share/icons/Gorilla/scalable/mimetypes/gnome-mime-application-vnd.ms-excel.svg
-share/icons/Gorilla/scalable/mimetypes/gnome-mime-application-vnd.ms-powerpoint.svg
-share/icons/Gorilla/scalable/mimetypes/gnome-mime-application-vnd.rn-realmedia.svg
-share/icons/Gorilla/scalable/mimetypes/gnome-mime-application-vnd.sun.xml.calc.svg
-share/icons/Gorilla/scalable/mimetypes/gnome-mime-application-vnd.sun.xml.draw.svg
-share/icons/Gorilla/scalable/mimetypes/gnome-mime-application-vnd.sun.xml.impress.svg
-share/icons/Gorilla/scalable/mimetypes/gnome-mime-application-vnd.sun.xml.writer.svg
-share/icons/Gorilla/scalable/mimetypes/gnome-mime-application-x-abiword.svg
-share/icons/Gorilla/scalable/mimetypes/gnome-mime-application-x-backup.svg
-share/icons/Gorilla/scalable/mimetypes/gnome-mime-application-x-deb.svg
-share/icons/Gorilla/scalable/mimetypes/gnome-mime-application-x-dvi.svg
-share/icons/Gorilla/scalable/mimetypes/gnome-mime-application-x-executable.svg
-share/icons/Gorilla/scalable/mimetypes/gnome-mime-application-x-font-afm.svg
-share/icons/Gorilla/scalable/mimetypes/gnome-mime-application-x-font-bdf.svg
-share/icons/Gorilla/scalable/mimetypes/gnome-mime-application-x-font-linux-psf.svg
-share/icons/Gorilla/scalable/mimetypes/gnome-mime-application-x-font-pcf.svg
-share/icons/Gorilla/scalable/mimetypes/gnome-mime-application-x-font-ttf.svg
-share/icons/Gorilla/scalable/mimetypes/gnome-mime-application-x-font-type1.svg
-share/icons/Gorilla/scalable/mimetypes/gnome-mime-application-x-font.svg
-share/icons/Gorilla/scalable/mimetypes/gnome-mime-application-x-gnome-app-info.svg
-share/icons/Gorilla/scalable/mimetypes/gnome-mime-application-x-gnucash.svg
-share/icons/Gorilla/scalable/mimetypes/gnome-mime-application-x-gnumeric.svg
-share/icons/Gorilla/scalable/mimetypes/gnome-mime-application-x-killustrator.svg
-share/icons/Gorilla/scalable/mimetypes/gnome-mime-application-x-kpresenter.svg
-share/icons/Gorilla/scalable/mimetypes/gnome-mime-application-x-kspread.svg
-share/icons/Gorilla/scalable/mimetypes/gnome-mime-application-x-kword.svg
-share/icons/Gorilla/scalable/mimetypes/gnome-mime-application-x-php.svg
-share/icons/Gorilla/scalable/mimetypes/gnome-mime-application-x-rpm.svg
-share/icons/Gorilla/scalable/mimetypes/gnome-mime-application-x-shared-library.svg
-share/icons/Gorilla/scalable/mimetypes/gnome-mime-application-x-stuffit.svg
-share/icons/Gorilla/scalable/mimetypes/gnome-mime-audio-x-midi.svg
-share/icons/Gorilla/scalable/mimetypes/gnome-mime-audio.svg
-share/icons/Gorilla/scalable/mimetypes/gnome-mime-image-x-xcf.svg
-share/icons/Gorilla/scalable/mimetypes/gnome-mime-image.svg
-share/icons/Gorilla/scalable/mimetypes/gnome-mime-text-css.svg
-share/icons/Gorilla/scalable/mimetypes/gnome-mime-text-html.svg
-share/icons/Gorilla/scalable/mimetypes/gnome-mime-text-x-authors.svg
-share/icons/Gorilla/scalable/mimetypes/gnome-mime-text-x-copying.svg
-share/icons/Gorilla/scalable/mimetypes/gnome-mime-text-x-install.svg
-share/icons/Gorilla/scalable/mimetypes/gnome-mime-text-x-java.svg
-share/icons/Gorilla/scalable/mimetypes/gnome-mime-text-x-lyx.svg
-share/icons/Gorilla/scalable/mimetypes/gnome-mime-text-x-makefile.svg
-share/icons/Gorilla/scalable/mimetypes/gnome-mime-text-x-patch.svg
-share/icons/Gorilla/scalable/mimetypes/gnome-mime-text-x-readme.svg
-share/icons/Gorilla/scalable/mimetypes/gnome-mime-text-x-sh.svg
-share/icons/Gorilla/scalable/mimetypes/gnome-mime-text-x-sql.svg
-share/icons/Gorilla/scalable/mimetypes/gnome-mime-text-x-troff-man.svg
-share/icons/Gorilla/scalable/mimetypes/gnome-mime-text.svg
-share/icons/Gorilla/scalable/mimetypes/gnome-mime-video-mpeg.svg
-share/icons/Gorilla/scalable/mimetypes/gnome-mime-video-quicktime.svg
-share/icons/Gorilla/scalable/mimetypes/gnome-mime-video-x-ms-wmv.svg
-share/icons/Gorilla/scalable/mimetypes/gnome-mime-video-x-msvideo.svg
-share/icons/Gorilla/scalable/mimetypes/gnome-mime-video.svg
-share/icons/Gorilla/scalable/stock/gtk-about.svg
-share/icons/Gorilla/scalable/stock/gtk-add.svg
-share/icons/Gorilla/scalable/stock/gtk-attachment.svg
-share/icons/Gorilla/scalable/stock/gtk-balance.svg
-share/icons/Gorilla/scalable/stock/gtk-bold.svg
-share/icons/Gorilla/scalable/stock/gtk-book.svg
-share/icons/Gorilla/scalable/stock/gtk-cancel.svg
-share/icons/Gorilla/scalable/stock/gtk-cdrom.svg
-share/icons/Gorilla/scalable/stock/gtk-clear.svg
-share/icons/Gorilla/scalable/stock/gtk-close.svg
-share/icons/Gorilla/scalable/stock/gtk-connect.svg
-share/icons/Gorilla/scalable/stock/gtk-convert.svg
-share/icons/Gorilla/scalable/stock/gtk-copy.svg
-share/icons/Gorilla/scalable/stock/gtk-cut.svg
-share/icons/Gorilla/scalable/stock/gtk-delete.svg
-share/icons/Gorilla/scalable/stock/gtk-dialog-error.svg
-share/icons/Gorilla/scalable/stock/gtk-dialog-info.svg
-share/icons/Gorilla/scalable/stock/gtk-dialog-question.svg
-share/icons/Gorilla/scalable/stock/gtk-dialog-warning.svg
-share/icons/Gorilla/scalable/stock/gtk-disconnect.svg
-share/icons/Gorilla/scalable/stock/gtk-dnd-multiple.svg
-share/icons/Gorilla/scalable/stock/gtk-dnd.svg
-share/icons/Gorilla/scalable/stock/gtk-edit.svg
-share/icons/Gorilla/scalable/stock/gtk-execute.svg
-share/icons/Gorilla/scalable/stock/gtk-export.svg
-share/icons/Gorilla/scalable/stock/gtk-find-and-replace.svg
-share/icons/Gorilla/scalable/stock/gtk-find.svg
-share/icons/Gorilla/scalable/stock/gtk-floppy.svg
-share/icons/Gorilla/scalable/stock/gtk-go-back-ltr.svg
-share/icons/Gorilla/scalable/stock/gtk-go-down.svg
-share/icons/Gorilla/scalable/stock/gtk-go-forward-ltr.svg
-share/icons/Gorilla/scalable/stock/gtk-go-up.svg
-share/icons/Gorilla/scalable/stock/gtk-goto-first-ltr.svg
-share/icons/Gorilla/scalable/stock/gtk-goto-last-ltr.svg
-share/icons/Gorilla/scalable/stock/gtk-goto-top.svg
-share/icons/Gorilla/scalable/stock/gtk-help.svg
-share/icons/Gorilla/scalable/stock/gtk-home.svg
-share/icons/Gorilla/scalable/stock/gtk-import.svg
-share/icons/Gorilla/scalable/stock/gtk-index.svg
-share/icons/Gorilla/scalable/stock/gtk-insert-image.svg
-share/icons/Gorilla/scalable/stock/gtk-insert-object.svg
-share/icons/Gorilla/scalable/stock/gtk-insert-table.svg
-share/icons/Gorilla/scalable/stock/gtk-italic.svg
-share/icons/Gorilla/scalable/stock/gtk-jump-to.svg
-share/icons/Gorilla/scalable/stock/gtk-justify-center.svg
-share/icons/Gorilla/scalable/stock/gtk-justify-fill.svg
-share/icons/Gorilla/scalable/stock/gtk-justify-left.svg
-share/icons/Gorilla/scalable/stock/gtk-justify-right.svg
-share/icons/Gorilla/scalable/stock/gtk-line-in.svg
-share/icons/Gorilla/scalable/stock/gtk-mic.svg
-share/icons/Gorilla/scalable/stock/gtk-missing-image.svg
-share/icons/Gorilla/scalable/stock/gtk-new.svg
-share/icons/Gorilla/scalable/stock/gtk-no.svg
-share/icons/Gorilla/scalable/stock/gtk-ok.svg
-share/icons/Gorilla/scalable/stock/gtk-open-book.svg
-share/icons/Gorilla/scalable/stock/gtk-open.svg
-share/icons/Gorilla/scalable/stock/gtk-paste.svg
-share/icons/Gorilla/scalable/stock/gtk-preferences.svg
-share/icons/Gorilla/scalable/stock/gtk-print-preview.svg
-share/icons/Gorilla/scalable/stock/gtk-print.svg
-share/icons/Gorilla/scalable/stock/gtk-properties.svg
-share/icons/Gorilla/scalable/stock/gtk-quit.svg
-share/icons/Gorilla/scalable/stock/gtk-redo.svg
-share/icons/Gorilla/scalable/stock/gtk-refresh.svg
-share/icons/Gorilla/scalable/stock/gtk-remove.svg
-share/icons/Gorilla/scalable/stock/gtk-reset.svg
-share/icons/Gorilla/scalable/stock/gtk-revert-to-saved.svg
-share/icons/Gorilla/scalable/stock/gtk-save-as.svg
-share/icons/Gorilla/scalable/stock/gtk-save.svg
-share/icons/Gorilla/scalable/stock/gtk-select-color.svg
-share/icons/Gorilla/scalable/stock/gtk-select-font.svg
-share/icons/Gorilla/scalable/stock/gtk-sort-ascending.svg
-share/icons/Gorilla/scalable/stock/gtk-sort-descending.svg
-share/icons/Gorilla/scalable/stock/gtk-spell-check.svg
-share/icons/Gorilla/scalable/stock/gtk-stop.svg
-share/icons/Gorilla/scalable/stock/gtk-strikethrough.svg
-share/icons/Gorilla/scalable/stock/gtk-undelete.svg
-share/icons/Gorilla/scalable/stock/gtk-underline.svg
-share/icons/Gorilla/scalable/stock/gtk-undo.svg
-share/icons/Gorilla/scalable/stock/gtk-volume.svg
-share/icons/Gorilla/scalable/stock/gtk-yes.svg
-share/icons/Gorilla/scalable/stock/gtk-zoom-100.svg
-share/icons/Gorilla/scalable/stock/gtk-zoom-fit.svg
-share/icons/Gorilla/scalable/stock/gtk-zoom-in.svg
-share/icons/Gorilla/scalable/stock/gtk-zoom-out.svg
-share/icons/Gorilla/scalable/stock/stock_volume-0.svg
-share/icons/Gorilla/scalable/stock/stock_volume-max.svg
-share/icons/Gorilla/scalable/stock/stock_volume-med.svg
-share/icons/Gorilla/scalable/stock/stock_volume-min.svg
-share/icons/Gorilla/scalable/stock/stock_volume-mute.svg
-share/icons/Lush/index.theme
-share/icons/Lush/scalable/apps/evolution-1.4.svg
-share/icons/Lush/scalable/apps/evolution.svg
-share/icons/Lush/scalable/apps/gnome-envelope.svg
-share/icons/Lush/scalable/apps/gnome-gimp.svg
-share/icons/Lush/scalable/apps/gnome-palette.svg
-share/icons/Lush/scalable/apps/mozilla-orig.svg
-share/icons/Lush/scalable/apps/mozilla-star.svg
-share/icons/Lush/scalable/apps/mozilla.svg
-share/icons/Lush/scalable/apps/redhat-web-browser.svg
-share/icons/Lush/scalable/apps/web-browser.svg
-share/icons/Lush/scalable/apps/wilber-icon.svg
-share/icons/Lush/scalable/devices/gnome-dev-cdrom-audio.svg
-share/icons/Lush/scalable/devices/gnome-dev-cdrom.svg
-share/icons/Lush/scalable/devices/gnome-dev-cdwriter.svg
-share/icons/Lush/scalable/devices/gnome-dev-dvd.svg
-share/icons/Lush/scalable/devices/gnome-dev-floppy.svg
-share/icons/Lush/scalable/devices/gnome-dev-harddisk.svg
-share/icons/Lush/scalable/devices/gnome-dev-joystick.svg
-share/icons/Lush/scalable/devices/gnome-dev-mouse.svg
-share/icons/Lush/scalable/devices/gnome-dev-network.svg
-share/icons/Lush/scalable/devices/gnome-dev-printer.svg
-share/icons/Lush/scalable/devices/gnome-dev-scanner.svg
-share/icons/Lush/scalable/devices/gnome-dev-symlink.svg
-share/icons/Lush/scalable/devices/gnome-dev-zipdisk.svg
-share/icons/Lush/scalable/emblems/emblem-camera.svg
-share/icons/Lush/scalable/emblems/emblem-cool.svg
-share/icons/Lush/scalable/emblems/emblem-danger.svg
-share/icons/Lush/scalable/emblems/emblem-distinguished.svg
-share/icons/Lush/scalable/emblems/emblem-documents.svg
-share/icons/Lush/scalable/emblems/emblem-fun.svg
-share/icons/Lush/scalable/emblems/emblem-generic.svg
-share/icons/Lush/scalable/emblems/emblem-important.svg
-share/icons/Lush/scalable/emblems/emblem-mail.svg
-share/icons/Lush/scalable/emblems/emblem-multimedia.svg
-share/icons/Lush/scalable/emblems/emblem-noread.svg
-share/icons/Lush/scalable/emblems/emblem-nowrite.svg
-share/icons/Lush/scalable/emblems/emblem-ohno.svg
-share/icons/Lush/scalable/emblems/emblem-package.svg
-share/icons/Lush/scalable/emblems/emblem-pictures.svg
-share/icons/Lush/scalable/emblems/emblem-relax.svg
-share/icons/Lush/scalable/emblems/emblem-sound.svg
-share/icons/Lush/scalable/emblems/emblem-symbolic-link.svg
-share/icons/Lush/scalable/emblems/emblem-web.svg
-share/icons/Lush/scalable/filesystems/gnome-fs-blockdev.svg
-share/icons/Lush/scalable/filesystems/gnome-fs-bookmark-missing.svg
-share/icons/Lush/scalable/filesystems/gnome-fs-bookmark.svg
-share/icons/Lush/scalable/filesystems/gnome-fs-chardev.svg
-share/icons/Lush/scalable/filesystems/gnome-fs-directory-accept.icon
-share/icons/Lush/scalable/filesystems/gnome-fs-directory-accept.svg
-share/icons/Lush/scalable/filesystems/gnome-fs-directory.icon
-share/icons/Lush/scalable/filesystems/gnome-fs-directory.svg
-share/icons/Lush/scalable/filesystems/gnome-fs-executable.svg
-share/icons/Lush/scalable/filesystems/gnome-fs-ftp.svg
-share/icons/Lush/scalable/filesystems/gnome-fs-home.svg
-share/icons/Lush/scalable/filesystems/gnome-fs-loading-icon.svg
-share/icons/Lush/scalable/filesystems/gnome-fs-network.svg
-share/icons/Lush/scalable/filesystems/gnome-fs-nfs.svg
-share/icons/Lush/scalable/filesystems/gnome-fs-regular.svg
-share/icons/Lush/scalable/filesystems/gnome-fs-server.svg
-share/icons/Lush/scalable/filesystems/gnome-fs-smb.svg
-share/icons/Lush/scalable/filesystems/gnome-fs-ssh.svg
-share/icons/Lush/scalable/filesystems/gnome-fs-trash-empty.svg
-share/icons/Lush/scalable/filesystems/gnome-fs-trash-full.svg
-share/icons/Lush/scalable/filesystems/gnome-fs-web.svg
-share/icons/Lush/scalable/mimetypes/gnome-compressed.svg
-share/icons/Lush/scalable/mimetypes/gnome-library.svg
-share/icons/Lush/scalable/mimetypes/gnome-mime-application-applix.svg
-share/icons/Lush/scalable/mimetypes/gnome-mime-application-msword.svg
-share/icons/Lush/scalable/mimetypes/gnome-mime-application-ogg.svg
-share/icons/Lush/scalable/mimetypes/gnome-mime-application-pdf.svg
-share/icons/Lush/scalable/mimetypes/gnome-mime-application-pgp.svg
-share/icons/Lush/scalable/mimetypes/gnome-mime-application-postscript.svg
-share/icons/Lush/scalable/mimetypes/gnome-mime-application-rtf.svg
-share/icons/Lush/scalable/mimetypes/gnome-mime-application-vnd.sun.xml.calc.svg
-share/icons/Lush/scalable/mimetypes/gnome-mime-application-vnd.sun.xml.draw.svg
-share/icons/Lush/scalable/mimetypes/gnome-mime-application-vnd.sun.xml.impress.svg
-share/icons/Lush/scalable/mimetypes/gnome-mime-application-vnd.sun.xml.writer.svg
-share/icons/Lush/scalable/mimetypes/gnome-mime-application-x-deb.svg
-share/icons/Lush/scalable/mimetypes/gnome-mime-application-x-font-afm.svg
-share/icons/Lush/scalable/mimetypes/gnome-mime-application-x-font-bdf.svg
-share/icons/Lush/scalable/mimetypes/gnome-mime-application-x-font-linux-psf.svg
-share/icons/Lush/scalable/mimetypes/gnome-mime-application-x-font-pcf.svg
-share/icons/Lush/scalable/mimetypes/gnome-mime-application-x-font-ttf.svg
-share/icons/Lush/scalable/mimetypes/gnome-mime-application-x-font-type1.svg
-share/icons/Lush/scalable/mimetypes/gnome-mime-application-x-font.svg
-share/icons/Lush/scalable/mimetypes/gnome-mime-application-x-gnome-app-info.svg
-share/icons/Lush/scalable/mimetypes/gnome-mime-application-x-gzip.svg
-share/icons/Lush/scalable/mimetypes/gnome-mime-application-x-jar.svg
-share/icons/Lush/scalable/mimetypes/gnome-mime-application-x-objectfile.svg
-share/icons/Lush/scalable/mimetypes/gnome-mime-application-x-php.svg
-share/icons/Lush/scalable/mimetypes/gnome-mime-application-x-reject.svg
-share/icons/Lush/scalable/mimetypes/gnome-mime-application-x-rpm.svg
-share/icons/Lush/scalable/mimetypes/gnome-mime-application-x-stuffit.svg
-share/icons/Lush/scalable/mimetypes/gnome-mime-audio-basic.svg
-share/icons/Lush/scalable/mimetypes/gnome-mime-audio-x-midi.svg
-share/icons/Lush/scalable/mimetypes/gnome-mime-audio-x-pn-realaudio.svg
-share/icons/Lush/scalable/mimetypes/gnome-mime-audio.svg
-share/icons/Lush/scalable/mimetypes/gnome-mime-image-xcf.svg
-share/icons/Lush/scalable/mimetypes/gnome-mime-image.svg
-share/icons/Lush/scalable/mimetypes/gnome-mime-text-html.svg
-share/icons/Lush/scalable/mimetypes/gnome-mime-text-x-asm.svg
-share/icons/Lush/scalable/mimetypes/gnome-mime-text-x-c++.svg
-share/icons/Lush/scalable/mimetypes/gnome-mime-text-x-c-header.svg
-share/icons/Lush/scalable/mimetypes/gnome-mime-text-x-c.svg
-share/icons/Lush/scalable/mimetypes/gnome-mime-text-x-fortran.svg
-share/icons/Lush/scalable/mimetypes/gnome-mime-text-x-install.svg
-share/icons/Lush/scalable/mimetypes/gnome-mime-text-x-java.svg
-share/icons/Lush/scalable/mimetypes/gnome-mime-text-x-pascal.svg
-share/icons/Lush/scalable/mimetypes/gnome-mime-text-x-python.svg
-share/icons/Lush/scalable/mimetypes/gnome-mime-text-x-readme.svg
-share/icons/Lush/scalable/mimetypes/gnome-mime-text-x-sh.svg
-share/icons/Lush/scalable/mimetypes/gnome-mime-text-x-yacc.svg
-share/icons/Lush/scalable/mimetypes/gnome-mime-text.svg
-share/icons/Lush/scalable/mimetypes/gnome-mime-video-mpeg.svg
-share/icons/Lush/scalable/mimetypes/gnome-mime-video.svg
-share/icons/Lush/scalable/mimetypes/gnome-package.svg
-share/icons/Lush/scalable/stock/back.svg
-share/icons/Lush/scalable/stock/cancel.svg
-share/icons/Lush/scalable/stock/down.svg
-share/icons/Lush/scalable/stock/editcopy.svg
-share/icons/Lush/scalable/stock/editpaste.svg
-share/icons/Lush/scalable/stock/edittrash.svg
-share/icons/Lush/scalable/stock/filenew.svg
-share/icons/Lush/scalable/stock/fileopen.svg
-share/icons/Lush/scalable/stock/filesave.svg
-share/icons/Lush/scalable/stock/filesaveas.svg
-share/icons/Lush/scalable/stock/forward.svg
-share/icons/Lush/scalable/stock/gohome.svg
-share/icons/Lush/scalable/stock/help.svg
-share/icons/Lush/scalable/stock/info.svg
-share/icons/Lush/scalable/stock/print.svg
-share/icons/Lush/scalable/stock/reload.svg
-share/icons/Lush/scalable/stock/stock_cut.svg
-share/icons/Lush/scalable/stock/stock_delete.svg
-share/icons/Lush/scalable/stock/stock_quit.svg
-share/icons/Lush/scalable/stock/stock_redo.svg
-share/icons/Lush/scalable/stock/stock_undo.svg
-share/icons/Lush/scalable/stock/up.svg
-share/icons/Nuvola/index.theme
-share/icons/Nuvola/scalable/apps/accessibility-directory.svg
-share/icons/Nuvola/scalable/apps/accessories.svg
-share/icons/Nuvola/scalable/apps/acroread.svg
-share/icons/Nuvola/scalable/apps/button_tell_a_friend.png
-share/icons/Nuvola/scalable/apps/camera.svg
-share/icons/Nuvola/scalable/apps/chess.svg
-share/icons/Nuvola/scalable/apps/disks.svg
-share/icons/Nuvola/scalable/apps/evolution-1.4.svg
-share/icons/Nuvola/scalable/apps/evolution.svg
-share/icons/Nuvola/scalable/apps/file-manager.svg
-share/icons/Nuvola/scalable/apps/firefox.svg
-share/icons/Nuvola/scalable/apps/gaim.svg
-share/icons/Nuvola/scalable/apps/gcalctool.svg
-share/icons/Nuvola/scalable/apps/gdict.svg
-share/icons/Nuvola/scalable/apps/gedit-icon.svg
-share/icons/Nuvola/scalable/apps/gedit.svg
-share/icons/Nuvola/scalable/apps/gftp.svg
-share/icons/Nuvola/scalable/apps/gnome-applications.svg
-share/icons/Nuvola/scalable/apps/gnome-audio.svg
-share/icons/Nuvola/scalable/apps/gnome-ccdesktop.svg
-share/icons/Nuvola/scalable/apps/gnome-cd.svg
-share/icons/Nuvola/scalable/apps/gnome-devel.svg
-share/icons/Nuvola/scalable/apps/gnome-envelope.svg
-share/icons/Nuvola/scalable/apps/gnome-favorites.svg
-share/icons/Nuvola/scalable/apps/gnome-gimp.svg
-share/icons/Nuvola/scalable/apps/gnome-globe.svg
-share/icons/Nuvola/scalable/apps/gnome-gnomine.svg
-share/icons/Nuvola/scalable/apps/gnome-graphics.svg
-share/icons/Nuvola/scalable/apps/gnome-help.svg
-share/icons/Nuvola/scalable/apps/gnome-home.svg
-share/icons/Nuvola/scalable/apps/gnome-icq.svg
-share/icons/Nuvola/scalable/apps/gnome-joystick.svg
-share/icons/Nuvola/scalable/apps/gnome-lockscreen.svg
-share/icons/Nuvola/scalable/apps/gnome-logo.svg
-share/icons/Nuvola/scalable/apps/gnome-main-menu.svg
-share/icons/Nuvola/scalable/apps/gnome-mixer-applet.svg
-share/icons/Nuvola/scalable/apps/gnome-mixer.svg
-share/icons/Nuvola/scalable/apps/gnome-mouse.svg
-share/icons/Nuvola/scalable/apps/gnome-multimedia.svg
-share/icons/Nuvola/scalable/apps/gnome-palette.svg
-share/icons/Nuvola/scalable/apps/gnome-searchtool.svg
-share/icons/Nuvola/scalable/apps/gnome-settings-accessibility-keyboard.svg
-share/icons/Nuvola/scalable/apps/gnome-settings-background.svg
-share/icons/Nuvola/scalable/apps/gnome-settings-keybindings.svg
-share/icons/Nuvola/scalable/apps/gnome-settings-theme.svg
-share/icons/Nuvola/scalable/apps/gnome-show-desktop.svg
-share/icons/Nuvola/scalable/apps/gnome-system-config.svg
-share/icons/Nuvola/scalable/apps/gnome-system.svg
-share/icons/Nuvola/scalable/apps/gnome-terminal.svg
-share/icons/Nuvola/scalable/apps/go.svg
-share/icons/Nuvola/scalable/apps/gswitchit-applet.svg
-share/icons/Nuvola/scalable/apps/gswitchit-properties-capplet.svg
-share/icons/Nuvola/scalable/apps/hwbrowser.svg
-share/icons/Nuvola/scalable/apps/inkscape.svg
-share/icons/Nuvola/scalable/apps/kasteroids.svg
-share/icons/Nuvola/scalable/apps/maelstrom.svg
-share/icons/Nuvola/scalable/apps/mouse-capplet.svg
-share/icons/Nuvola/scalable/apps/mozilla--mail.svg
-share/icons/Nuvola/scalable/apps/mozilla-compose-icon.svg
-share/icons/Nuvola/scalable/apps/mozilla-composer.svg
-share/icons/Nuvola/scalable/apps/mozilla-mail-icon.svg
-share/icons/Nuvola/scalable/apps/mozilla-orig.svg
-share/icons/Nuvola/scalable/apps/mozilla-star.svg
-share/icons/Nuvola/scalable/apps/mozilla.svg
-share/icons/Nuvola/scalable/apps/mplayer-logo.svg
-share/icons/Nuvola/scalable/apps/mplayer.svg
-share/icons/Nuvola/scalable/apps/my-computer.svg
-share/icons/Nuvola/scalable/apps/network.svg
-share/icons/Nuvola/scalable/apps/ooo_calc.svg
-share/icons/Nuvola/scalable/apps/ooo_draw.svg
-share/icons/Nuvola/scalable/apps/ooo_impress.svg
-share/icons/Nuvola/scalable/apps/ooo_writer.svg
-share/icons/Nuvola/scalable/apps/password.svg
-share/icons/Nuvola/scalable/apps/postscript-viewer.svg
-share/icons/Nuvola/scalable/apps/printer.svg
-share/icons/Nuvola/scalable/apps/procman.svg
-share/icons/Nuvola/scalable/apps/realplayer.svg
-share/icons/Nuvola/scalable/apps/redhat-accessories.svg
-share/icons/Nuvola/scalable/apps/redhat-email.svg
-share/icons/Nuvola/scalable/apps/redhat-games.svg
-share/icons/Nuvola/scalable/apps/redhat-graphics.svg
-share/icons/Nuvola/scalable/apps/redhat-home.svg
-share/icons/Nuvola/scalable/apps/redhat-internet.svg
-share/icons/Nuvola/scalable/apps/redhat-main-menu.svg
-share/icons/Nuvola/scalable/apps/redhat-office.svg
-share/icons/Nuvola/scalable/apps/redhat-preferences.svg
-share/icons/Nuvola/scalable/apps/redhat-presentations.svg
-share/icons/Nuvola/scalable/apps/redhat-programming.svg
-share/icons/Nuvola/scalable/apps/redhat-sound_video.svg
-share/icons/Nuvola/scalable/apps/redhat-spreadsheet.svg
-share/icons/Nuvola/scalable/apps/redhat-system_settings.svg
-share/icons/Nuvola/scalable/apps/redhat-system_tools.svg
-share/icons/Nuvola/scalable/apps/redhat-web-browser.svg
-share/icons/Nuvola/scalable/apps/redhat-word-processor.svg
-share/icons/Nuvola/scalable/apps/sane.svg
-share/icons/Nuvola/scalable/apps/screensaver.svg
-share/icons/Nuvola/scalable/apps/sdm.svg
-share/icons/Nuvola/scalable/apps/sodipodi.svg
-share/icons/Nuvola/scalable/apps/system-config-users.svg
-share/icons/Nuvola/scalable/apps/system-floppy.svg
-share/icons/Nuvola/scalable/apps/system-search-32.svg
-share/icons/Nuvola/scalable/apps/thunderbird.svg
-share/icons/Nuvola/scalable/apps/tsclient.svg
-share/icons/Nuvola/scalable/apps/user_icon.svg
-share/icons/Nuvola/scalable/apps/web-browser.svg
-share/icons/Nuvola/scalable/apps/wilber-icon.svg
-share/icons/Nuvola/scalable/apps/xscreensaver.svg
-share/icons/Nuvola/scalable/devices/gnome-dev-camera.svg
-share/icons/Nuvola/scalable/devices/gnome-dev-cdrom-audio.svg
-share/icons/Nuvola/scalable/devices/gnome-dev-cdrom.svg
-share/icons/Nuvola/scalable/devices/gnome-dev-cdwriter.svg
-share/icons/Nuvola/scalable/devices/gnome-dev-dvd.svg
-share/icons/Nuvola/scalable/devices/gnome-dev-floppy.svg
-share/icons/Nuvola/scalable/devices/gnome-dev-harddisk.svg
-share/icons/Nuvola/scalable/devices/gnome-dev-ipod.svg
-share/icons/Nuvola/scalable/devices/gnome-dev-mouse-optical.svg
-share/icons/Nuvola/scalable/devices/gnome-dev-mouse.svg
-share/icons/Nuvola/scalable/devices/gnome-dev-network.svg
-share/icons/Nuvola/scalable/devices/gnome-dev-printer.svg
-share/icons/Nuvola/scalable/devices/gnome-dev-removable-usb.svg
-share/icons/Nuvola/scalable/devices/gnome-dev-removable.svg
-share/icons/Nuvola/scalable/devices/gnome-dev-scanner.svg
-share/icons/Nuvola/scalable/devices/gnome-dev-symlink.svg
-share/icons/Nuvola/scalable/devices/gnome-dev-zipdisk.svg
-share/icons/Nuvola/scalable/emblems/emblem-camera.svg
-share/icons/Nuvola/scalable/emblems/emblem-cool.svg
-share/icons/Nuvola/scalable/emblems/emblem-danger.svg
-share/icons/Nuvola/scalable/emblems/emblem-desktop.svg
-share/icons/Nuvola/scalable/emblems/emblem-distinguished.svg
-share/icons/Nuvola/scalable/emblems/emblem-documents.svg
-share/icons/Nuvola/scalable/emblems/emblem-favorite.svg
-share/icons/Nuvola/scalable/emblems/emblem-fun.svg
-share/icons/Nuvola/scalable/emblems/emblem-generic.svg
-share/icons/Nuvola/scalable/emblems/emblem-important.svg
-share/icons/Nuvola/scalable/emblems/emblem-multimedia.svg
-share/icons/Nuvola/scalable/emblems/emblem-noread.svg
-share/icons/Nuvola/scalable/emblems/emblem-nowrite.svg
-share/icons/Nuvola/scalable/emblems/emblem-ohno.svg
-share/icons/Nuvola/scalable/emblems/emblem-package.svg
-share/icons/Nuvola/scalable/emblems/emblem-pictures.svg
-share/icons/Nuvola/scalable/emblems/emblem-relax.svg
-share/icons/Nuvola/scalable/emblems/emblem-sound.svg
-share/icons/Nuvola/scalable/emblems/emblem-symbolic-link.svg
-share/icons/Nuvola/scalable/emblems/emblem-web.svg
-share/icons/Nuvola/scalable/filesystems/gnome-fs-blockdev.svg
-share/icons/Nuvola/scalable/filesystems/gnome-fs-bookmark-missing.svg
-share/icons/Nuvola/scalable/filesystems/gnome-fs-bookmark.svg
-share/icons/Nuvola/scalable/filesystems/gnome-fs-chardev.svg
-share/icons/Nuvola/scalable/filesystems/gnome-fs-client.svg
-share/icons/Nuvola/scalable/filesystems/gnome-fs-desktop.svg
-share/icons/Nuvola/scalable/filesystems/gnome-fs-directory-accept.icon
-share/icons/Nuvola/scalable/filesystems/gnome-fs-directory-accept.svg
-share/icons/Nuvola/scalable/filesystems/gnome-fs-directory-visiting.svg
-share/icons/Nuvola/scalable/filesystems/gnome-fs-directory.icon
-share/icons/Nuvola/scalable/filesystems/gnome-fs-directory.svg
-share/icons/Nuvola/scalable/filesystems/gnome-fs-executable.svg
-share/icons/Nuvola/scalable/filesystems/gnome-fs-ftp.svg
-share/icons/Nuvola/scalable/filesystems/gnome-fs-home.svg
-share/icons/Nuvola/scalable/filesystems/gnome-fs-loading-icon.svg
-share/icons/Nuvola/scalable/filesystems/gnome-fs-network.svg
-share/icons/Nuvola/scalable/filesystems/gnome-fs-nfs.svg
-share/icons/Nuvola/scalable/filesystems/gnome-fs-regular.svg
-share/icons/Nuvola/scalable/filesystems/gnome-fs-server.svg
-share/icons/Nuvola/scalable/filesystems/gnome-fs-smb.svg
-share/icons/Nuvola/scalable/filesystems/gnome-fs-ssh.svg
-share/icons/Nuvola/scalable/filesystems/gnome-fs-trash-empty.svg
-share/icons/Nuvola/scalable/filesystems/gnome-fs-trash-full.svg
-share/icons/Nuvola/scalable/filesystems/gnome-fs-web.svg
-share/icons/Nuvola/scalable/mimetypes/gnome-compressed.svg
-share/icons/Nuvola/scalable/mimetypes/gnome-mime-application-msword.svg
-share/icons/Nuvola/scalable/mimetypes/gnome-mime-application-ogg.svg
-share/icons/Nuvola/scalable/mimetypes/gnome-mime-application-pdf.svg
-share/icons/Nuvola/scalable/mimetypes/gnome-mime-application-pgp-encrypted.svg
-share/icons/Nuvola/scalable/mimetypes/gnome-mime-application-pgp.svg
-share/icons/Nuvola/scalable/mimetypes/gnome-mime-application-postscript.svg
-share/icons/Nuvola/scalable/mimetypes/gnome-mime-application-text.svg
-share/icons/Nuvola/scalable/mimetypes/gnome-mime-application-vnd.ms-excel.svg
-share/icons/Nuvola/scalable/mimetypes/gnome-mime-application-vnd.rn-realmedia.svg
-share/icons/Nuvola/scalable/mimetypes/gnome-mime-application-vnd.sun.xml.calc.svg
-share/icons/Nuvola/scalable/mimetypes/gnome-mime-application-vnd.sun.xml.draw.svg
-share/icons/Nuvola/scalable/mimetypes/gnome-mime-application-vnd.sun.xml.impress.svg
-share/icons/Nuvola/scalable/mimetypes/gnome-mime-application-vnd.sun.xml.writer.svg
-share/icons/Nuvola/scalable/mimetypes/gnome-mime-application-x-abiword.svg
-share/icons/Nuvola/scalable/mimetypes/gnome-mime-application-x-backup.svg
-share/icons/Nuvola/scalable/mimetypes/gnome-mime-application-x-core-file.svg
-share/icons/Nuvola/scalable/mimetypes/gnome-mime-application-x-deb.svg
-share/icons/Nuvola/scalable/mimetypes/gnome-mime-application-x-dvi.svg
-share/icons/Nuvola/scalable/mimetypes/gnome-mime-application-x-executable.svg
-share/icons/Nuvola/scalable/mimetypes/gnome-mime-application-x-font-afm.svg
-share/icons/Nuvola/scalable/mimetypes/gnome-mime-application-x-font-bdf.svg
-share/icons/Nuvola/scalable/mimetypes/gnome-mime-application-x-font-pcf.svg
-share/icons/Nuvola/scalable/mimetypes/gnome-mime-application-x-font-psf.svg
-share/icons/Nuvola/scalable/mimetypes/gnome-mime-application-x-font-ttf.svg
-share/icons/Nuvola/scalable/mimetypes/gnome-mime-application-x-font.svg
-share/icons/Nuvola/scalable/mimetypes/gnome-mime-application-x-gnome-app-info.svg
-share/icons/Nuvola/scalable/mimetypes/gnome-mime-application-x-gnumeric.svg
-share/icons/Nuvola/scalable/mimetypes/gnome-mime-application-x-iso-image.svg
-share/icons/Nuvola/scalable/mimetypes/gnome-mime-application-x-jar.svg
-share/icons/Nuvola/scalable/mimetypes/gnome-mime-application-x-killustrator.svg
-share/icons/Nuvola/scalable/mimetypes/gnome-mime-application-x-kpresenter.svg
-share/icons/Nuvola/scalable/mimetypes/gnome-mime-application-x-kspread.svg
-share/icons/Nuvola/scalable/mimetypes/gnome-mime-application-x-kword.svg
-share/icons/Nuvola/scalable/mimetypes/gnome-mime-application-x-rpm.svg
-share/icons/Nuvola/scalable/mimetypes/gnome-mime-application-x-stuffit.svg
-share/icons/Nuvola/scalable/mimetypes/gnome-mime-application-x-tex.svg
-share/icons/Nuvola/scalable/mimetypes/gnome-mime-application-x-tgz.svg
-share/icons/Nuvola/scalable/mimetypes/gnome-mime-audio-x-midi.svg
-share/icons/Nuvola/scalable/mimetypes/gnome-mime-audio-x-pn-realaudio.svg
-share/icons/Nuvola/scalable/mimetypes/gnome-mime-audio.svg
-share/icons/Nuvola/scalable/mimetypes/gnome-mime-image-svg.svg
-share/icons/Nuvola/scalable/mimetypes/gnome-mime-image-x-cdr.svg
-share/icons/Nuvola/scalable/mimetypes/gnome-mime-image-xcf.svg
-share/icons/Nuvola/scalable/mimetypes/gnome-mime-image.svg
-share/icons/Nuvola/scalable/mimetypes/gnome-mime-text-css.svg
-share/icons/Nuvola/scalable/mimetypes/gnome-mime-text-html.svg
-share/icons/Nuvola/scalable/mimetypes/gnome-mime-text-x-c.svg
-share/icons/Nuvola/scalable/mimetypes/gnome-mime-text-x-credits.svg
-share/icons/Nuvola/scalable/mimetypes/gnome-mime-text-x-install.svg
-share/icons/Nuvola/scalable/mimetypes/gnome-mime-text-x-java.svg
-share/icons/Nuvola/scalable/mimetypes/gnome-mime-text-x-lyx.svg
-share/icons/Nuvola/scalable/mimetypes/gnome-mime-text-x-makefile.svg
-share/icons/Nuvola/scalable/mimetypes/gnome-mime-text-x-patch.svg
-share/icons/Nuvola/scalable/mimetypes/gnome-mime-text-x-readme.svg
-share/icons/Nuvola/scalable/mimetypes/gnome-mime-text-x-sh.svg
-share/icons/Nuvola/scalable/mimetypes/gnome-mime-text-x-sql.svg
-share/icons/Nuvola/scalable/mimetypes/gnome-mime-text-x-troff-man.svg
-share/icons/Nuvola/scalable/mimetypes/gnome-mime-text.svg
-share/icons/Nuvola/scalable/mimetypes/gnome-mime-video-quicktime.svg
-share/icons/Nuvola/scalable/mimetypes/gnome-mime-video.svg
-share/icons/Nuvola/scalable/mimetypes/gnome-mime-x-readme.svg
-share/icons/Nuvola/scalable/stock/applets-screenshooter.svg
-share/icons/Nuvola/scalable/stock/bookmark.svg
-share/icons/Nuvola/scalable/stock/bookmark_add.svg
-share/icons/Nuvola/scalable/stock/folder_new.svg
-share/icons/Nuvola/scalable/stock/gaim_insert-smiley-small.svg
-share/icons/Nuvola/scalable/stock/gaim_send-im.svg
-share/icons/Nuvola/scalable/stock/gnome-logo.svg
-share/icons/Nuvola/scalable/stock/gtk-about.svg
-share/icons/Nuvola/scalable/stock/gtk-add.svg
-share/icons/Nuvola/scalable/stock/gtk-attachment.svg
-share/icons/Nuvola/scalable/stock/gtk-bold.svg
-share/icons/Nuvola/scalable/stock/gtk-brokenimage.svg
-share/icons/Nuvola/scalable/stock/gtk-cdrom.svg
-share/icons/Nuvola/scalable/stock/gtk-copy.svg
-share/icons/Nuvola/scalable/stock/gtk-cut.svg
-share/icons/Nuvola/scalable/stock/gtk-delete.svg
-share/icons/Nuvola/scalable/stock/gtk-dialog-authentication.svg
-share/icons/Nuvola/scalable/stock/gtk-dialog-info.svg
-share/icons/Nuvola/scalable/stock/gtk-dialog-warning.svg
-share/icons/Nuvola/scalable/stock/gtk-directory.svg
-share/icons/Nuvola/scalable/stock/gtk-edit.svg
-share/icons/Nuvola/scalable/stock/gtk-execute.svg
-share/icons/Nuvola/scalable/stock/gtk-find-and-replace.svg
-share/icons/Nuvola/scalable/stock/gtk-find.svg
-share/icons/Nuvola/scalable/stock/gtk-floppy.svg
-share/icons/Nuvola/scalable/stock/gtk-go-back-ltr.svg
-share/icons/Nuvola/scalable/stock/gtk-go-down.svg
-share/icons/Nuvola/scalable/stock/gtk-go-forward-ltr.svg
-share/icons/Nuvola/scalable/stock/gtk-go-up.svg
-share/icons/Nuvola/scalable/stock/gtk-goto-first-ltr.svg
-share/icons/Nuvola/scalable/stock/gtk-goto-last-ltr.svg
-share/icons/Nuvola/scalable/stock/gtk-harddisk.svg
-share/icons/Nuvola/scalable/stock/gtk-help.svg
-share/icons/Nuvola/scalable/stock/gtk-home.svg
-share/icons/Nuvola/scalable/stock/gtk-mail-send.svg
-share/icons/Nuvola/scalable/stock/gtk-media-forward-ltr.svg
-share/icons/Nuvola/scalable/stock/gtk-media-next-ltr.svg
-share/icons/Nuvola/scalable/stock/gtk-media-play-ltr.svg
-share/icons/Nuvola/scalable/stock/gtk-media-previous-ltr.svg
-share/icons/Nuvola/scalable/stock/gtk-media-rewind-ltr.svg
-share/icons/Nuvola/scalable/stock/gtk-media-stop.svg
-share/icons/Nuvola/scalable/stock/gtk-new.svg
-share/icons/Nuvola/scalable/stock/gtk-ok.svg
-share/icons/Nuvola/scalable/stock/gtk-open.svg
-share/icons/Nuvola/scalable/stock/gtk-paste.svg
-share/icons/Nuvola/scalable/stock/gtk-print-preview.svg
-share/icons/Nuvola/scalable/stock/gtk-print.svg
-share/icons/Nuvola/scalable/stock/gtk-quit.svg
-share/icons/Nuvola/scalable/stock/gtk-redo-ltr.svg
-share/icons/Nuvola/scalable/stock/gtk-refresh.svg
-share/icons/Nuvola/scalable/stock/gtk-reload.svg
-share/icons/Nuvola/scalable/stock/gtk-revert-to-saved-ltr.svg
-share/icons/Nuvola/scalable/stock/gtk-save-as.svg
-share/icons/Nuvola/scalable/stock/gtk-save.svg
-share/icons/Nuvola/scalable/stock/gtk-stop.svg
-share/icons/Nuvola/scalable/stock/gtk-strikethrough.svg
-share/icons/Nuvola/scalable/stock/gtk-underline.svg
-share/icons/Nuvola/scalable/stock/gtk-undo-ltr.svg
-share/icons/Nuvola/scalable/stock/gtk-zoom-100.svg
-share/icons/Nuvola/scalable/stock/gtk-zoom-fit.svg
-share/icons/Nuvola/scalable/stock/gtk-zoom-in.svg
-share/icons/Nuvola/scalable/stock/gtk-zoom-out.svg
-share/icons/Nuvola/scalable/stock/panel-lockscreen.svg
-share/icons/Nuvola/scalable/stock/searchtool.svg
-share/icons/Nuvola/scalable/stock/stock_alarm.svg
-share/icons/Nuvola/scalable/stock/stock_desktop.svg
-share/icons/Nuvola/scalable/stock/stock_keyring.svg
-share/icons/Nuvola/scalable/stock/stock_post_message.svg
-share/icons/Nuvola/scalable/stock/stock_volume-0.svg
-share/icons/Nuvola/scalable/stock/stock_volume-max.svg
-share/icons/Nuvola/scalable/stock/stock_volume-med.svg
-share/icons/Nuvola/scalable/stock/stock_volume-min.svg
-share/icons/Nuvola/scalable/stock/stock_volume-mute.svg
-share/icons/Nuvola/scalable/stock/stock_volume.svg
-share/icons/Wasp/index.theme
-share/icons/Wasp/scalable/apps/advanced-directory.svg
-share/icons/Wasp/scalable/apps/applets-screenshooter.svg
-share/icons/Wasp/scalable/apps/background-capplet.svg
-share/icons/Wasp/scalable/apps/bluefish.svg
-share/icons/Wasp/scalable/apps/control-center2.svg
-share/icons/Wasp/scalable/apps/evolution-1.4.svg
-share/icons/Wasp/scalable/apps/file-manager.svg
-share/icons/Wasp/scalable/apps/file-roller.svg
-share/icons/Wasp/scalable/apps/fonts-capplet.svg
-share/icons/Wasp/scalable/apps/gaim.svg
-share/icons/Wasp/scalable/apps/gdm.svg
-share/icons/Wasp/scalable/apps/gedit-icon.svg
-share/icons/Wasp/scalable/apps/gnome-applications.svg
-share/icons/Wasp/scalable/apps/gnome-audio2.svg
-share/icons/Wasp/scalable/apps/gnome-ccdesktop.svg
-share/icons/Wasp/scalable/apps/gnome-cd-player.svg
-share/icons/Wasp/scalable/apps/gnome-devel.svg
-share/icons/Wasp/scalable/apps/gnome-envelope.svg
-share/icons/Wasp/scalable/apps/gnome-eyes.svg
-share/icons/Wasp/scalable/apps/gnome-favorites.svg
-share/icons/Wasp/scalable/apps/gnome-gaim.svg
-share/icons/Wasp/scalable/apps/gnome-gimp.svg
-share/icons/Wasp/scalable/apps/gnome-globe.svg
-share/icons/Wasp/scalable/apps/gnome-help.svg
-share/icons/Wasp/scalable/apps/gnome-home.svg
-share/icons/Wasp/scalable/apps/gnome-joystick.svg
-share/icons/Wasp/scalable/apps/gnome-logo.svg
-share/icons/Wasp/scalable/apps/gnome-main-menu.svg
-share/icons/Wasp/scalable/apps/gnome-media-player.svg
-share/icons/Wasp/scalable/apps/gnome-monitor.svg
-share/icons/Wasp/scalable/apps/gnome-multimedia.svg
-share/icons/Wasp/scalable/apps/gnome-palette.svg
-share/icons/Wasp/scalable/apps/gnome-pdf.svg
-share/icons/Wasp/scalable/apps/gnome-printers-properties.svg
-share/icons/Wasp/scalable/apps/gnome-terminal.svg
-share/icons/Wasp/scalable/apps/gnome-util.svg
-share/icons/Wasp/scalable/apps/gnumeric.svg
-share/icons/Wasp/scalable/apps/hwbrowser.svg
-share/icons/Wasp/scalable/apps/keyboard-capplet.svg
-share/icons/Wasp/scalable/apps/keyboard-shortcut.svg
-share/icons/Wasp/scalable/apps/keyboard.svg
-share/icons/Wasp/scalable/apps/login-photo.svg
-share/icons/Wasp/scalable/apps/mouse-capplet.svg
-share/icons/Wasp/scalable/apps/mozilla-orig.svg
-share/icons/Wasp/scalable/apps/mozilla-star.svg
-share/icons/Wasp/scalable/apps/mozilla.svg
-share/icons/Wasp/scalable/apps/my-computer.svg
-share/icons/Wasp/scalable/apps/network-config.svg
-share/icons/Wasp/scalable/apps/network.svg
-share/icons/Wasp/scalable/apps/procman.svg
-share/icons/Wasp/scalable/apps/redhat-config-date.svg
-share/icons/Wasp/scalable/apps/redhat-config-users.svg
-share/icons/Wasp/scalable/apps/redhat-config-xfree86.svg
-share/icons/Wasp/scalable/apps/redhat-email.svg
-share/icons/Wasp/scalable/apps/redhat-games.svg
-share/icons/Wasp/scalable/apps/redhat-home.svg
-share/icons/Wasp/scalable/apps/redhat-internet.svg
-share/icons/Wasp/scalable/apps/redhat-main-menu.svg
-share/icons/Wasp/scalable/apps/redhat-office.svg
-share/icons/Wasp/scalable/apps/redhat-preferences.svg
-share/icons/Wasp/scalable/apps/redhat-programming.svg
-share/icons/Wasp/scalable/apps/redhat-sound_video.svg
-share/icons/Wasp/scalable/apps/redhat-web-browser.svg
-share/icons/Wasp/scalable/apps/screensaver-properties.svg
-share/icons/Wasp/scalable/apps/system-tools-32.svg
-share/icons/Wasp/scalable/apps/system-tools.svg
-share/icons/Wasp/scalable/apps/thunderbird.svg
-share/icons/Wasp/scalable/apps/user_auth.svg
-share/icons/Wasp/scalable/apps/vanity.svg
-share/icons/Wasp/scalable/apps/web-browser.svg
-share/icons/Wasp/scalable/apps/webbrowser.svg
-share/icons/Wasp/scalable/apps/wilber-icon.svg
-share/icons/Wasp/scalable/apps/ximian-evolution-calendar.svg
-share/icons/Wasp/scalable/apps/ximian-redhat-config-nfs.svg
-share/icons/Wasp/scalable/apps/xmms.svg
-share/icons/Wasp/scalable/devices/gnome-dev-camera.svg
-share/icons/Wasp/scalable/devices/gnome-dev-cdrom-audio.svg
-share/icons/Wasp/scalable/devices/gnome-dev-cdrom.svg
-share/icons/Wasp/scalable/devices/gnome-dev-cdwriter.svg
-share/icons/Wasp/scalable/devices/gnome-dev-dvd.svg
-share/icons/Wasp/scalable/devices/gnome-dev-firewire.svg
-share/icons/Wasp/scalable/devices/gnome-dev-floppy.svg
-share/icons/Wasp/scalable/devices/gnome-dev-harddisk.svg
-share/icons/Wasp/scalable/devices/gnome-dev-network.svg
-share/icons/Wasp/scalable/devices/gnome-dev-palm.svg
-share/icons/Wasp/scalable/devices/gnome-dev-printer.svg
-share/icons/Wasp/scalable/devices/gnome-dev-removeable.svg
-share/icons/Wasp/scalable/devices/gnome-dev-symlink.svg
-share/icons/Wasp/scalable/devices/gnome-dev-tape.svg
-share/icons/Wasp/scalable/devices/gnome-dev-tv.svg
-share/icons/Wasp/scalable/devices/gnome-dev-usb.svg
-share/icons/Wasp/scalable/devices/gnome-dev-zipdisk.svg
-share/icons/Wasp/scalable/emblems/emblem-camera.svg
-share/icons/Wasp/scalable/emblems/emblem-cool.svg
-share/icons/Wasp/scalable/emblems/emblem-danger.svg
-share/icons/Wasp/scalable/emblems/emblem-desktop.svg
-share/icons/Wasp/scalable/emblems/emblem-distinguished.svg
-share/icons/Wasp/scalable/emblems/emblem-documents.svg
-share/icons/Wasp/scalable/emblems/emblem-favorite.svg
-share/icons/Wasp/scalable/emblems/emblem-fun.svg
-share/icons/Wasp/scalable/emblems/emblem-generic.svg
-share/icons/Wasp/scalable/emblems/emblem-idea.svg
-share/icons/Wasp/scalable/emblems/emblem-important.svg
-share/icons/Wasp/scalable/emblems/emblem-mail.svg
-share/icons/Wasp/scalable/emblems/emblem-multimedia.svg
-share/icons/Wasp/scalable/emblems/emblem-noread.svg
-share/icons/Wasp/scalable/emblems/emblem-nowrite.svg
-share/icons/Wasp/scalable/emblems/emblem-package.svg
-share/icons/Wasp/scalable/emblems/emblem-pictures.svg
-share/icons/Wasp/scalable/emblems/emblem-relax.svg
-share/icons/Wasp/scalable/emblems/emblem-sound.svg
-share/icons/Wasp/scalable/emblems/emblem-symbolic-link.svg
-share/icons/Wasp/scalable/emblems/emblem-web.svg
-share/icons/Wasp/scalable/filesystems/gnome-fs-blockdev.svg
-share/icons/Wasp/scalable/filesystems/gnome-fs-bookmark-missing.svg
-share/icons/Wasp/scalable/filesystems/gnome-fs-bookmark.svg
-share/icons/Wasp/scalable/filesystems/gnome-fs-chardev.svg
-share/icons/Wasp/scalable/filesystems/gnome-fs-directory-accept.icon
-share/icons/Wasp/scalable/filesystems/gnome-fs-directory-accept.svg
-share/icons/Wasp/scalable/filesystems/gnome-fs-directory.icon
-share/icons/Wasp/scalable/filesystems/gnome-fs-directory.svg
-share/icons/Wasp/scalable/filesystems/gnome-fs-executable.svg
-share/icons/Wasp/scalable/filesystems/gnome-fs-home.svg
-share/icons/Wasp/scalable/filesystems/gnome-fs-loading-icon.svg
-share/icons/Wasp/scalable/filesystems/gnome-fs-network.svg
-share/icons/Wasp/scalable/filesystems/gnome-fs-regular.svg
-share/icons/Wasp/scalable/filesystems/gnome-fs-server.svg
-share/icons/Wasp/scalable/filesystems/gnome-fs-smb.svg
-share/icons/Wasp/scalable/filesystems/gnome-fs-trash-empty.svg
-share/icons/Wasp/scalable/filesystems/gnome-fs-trash-full.svg
-share/icons/Wasp/scalable/filesystems/gnome-fs-web.svg
-share/icons/Wasp/scalable/mimetypes/gnome-mime-application-ogg.svg
-share/icons/Wasp/scalable/mimetypes/gnome-mime-application-pdf.svg
-share/icons/Wasp/scalable/mimetypes/gnome-mime-application-pgp.svg
-share/icons/Wasp/scalable/mimetypes/gnome-mime-application-rtf.svg
-share/icons/Wasp/scalable/mimetypes/gnome-mime-application-text.svg
-share/icons/Wasp/scalable/mimetypes/gnome-mime-application-x-deb.svg
-share/icons/Wasp/scalable/mimetypes/gnome-mime-application-x-font-afm.svg
-share/icons/Wasp/scalable/mimetypes/gnome-mime-application-x-font-bdf.svg
-share/icons/Wasp/scalable/mimetypes/gnome-mime-application-x-font-linux-psf.svg
-share/icons/Wasp/scalable/mimetypes/gnome-mime-application-x-font-pcf.svg
-share/icons/Wasp/scalable/mimetypes/gnome-mime-application-x-font-ttf.svg
-share/icons/Wasp/scalable/mimetypes/gnome-mime-application-x-font-type1.svg
-share/icons/Wasp/scalable/mimetypes/gnome-mime-application-x-font.svg
-share/icons/Wasp/scalable/mimetypes/gnome-mime-application-x-gnome-app-info.svg
-share/icons/Wasp/scalable/mimetypes/gnome-mime-application-x-php.svg
-share/icons/Wasp/scalable/mimetypes/gnome-mime-application-x-rpm.svg
-share/icons/Wasp/scalable/mimetypes/gnome-mime-application-x-stuffit.svg
-share/icons/Wasp/scalable/mimetypes/gnome-mime-application-x-tar.svg
-share/icons/Wasp/scalable/mimetypes/gnome-mime-application-x-zip.svg
-share/icons/Wasp/scalable/mimetypes/gnome-mime-audio-x-aiff.svg
-share/icons/Wasp/scalable/mimetypes/gnome-mime-audio-x-mp3.svg
-share/icons/Wasp/scalable/mimetypes/gnome-mime-audio-x-wav.svg
-share/icons/Wasp/scalable/mimetypes/gnome-mime-audio.svg
-share/icons/Wasp/scalable/mimetypes/gnome-mime-image-xcf.svg
-share/icons/Wasp/scalable/mimetypes/gnome-mime-image.svg
-share/icons/Wasp/scalable/mimetypes/gnome-mime-package.svg
-share/icons/Wasp/scalable/mimetypes/gnome-mime-text-html.svg
-share/icons/Wasp/scalable/mimetypes/gnome-mime-text-x-c-header.svg
-share/icons/Wasp/scalable/mimetypes/gnome-mime-text-x-c.svg
-share/icons/Wasp/scalable/mimetypes/gnome-mime-text-x-java.svg
-share/icons/Wasp/scalable/mimetypes/gnome-mime-video.svg
-share/icons/Wasp/scalable/stock/checkmark.svg
-share/icons/Wasp/scalable/stock/clipboard.svg
-share/icons/Wasp/scalable/stock/disk-floppy.svg
-share/icons/Wasp/scalable/stock/filenew.svg
-share/icons/Wasp/scalable/stock/find.svg
-share/icons/Wasp/scalable/stock/findreplace.svg
-share/icons/Wasp/scalable/stock/folder.svg
-share/icons/Wasp/scalable/stock/gaim_auth.svg
-share/icons/Wasp/scalable/stock/gaim_error.svg
-share/icons/Wasp/scalable/stock/gaim_info.svg
-share/icons/Wasp/scalable/stock/gaim_offline.svg
-share/icons/Wasp/scalable/stock/gaim_online.svg
-share/icons/Wasp/scalable/stock/help_book.svg
-share/icons/Wasp/scalable/stock/home.svg
-share/icons/Wasp/scalable/stock/information.svg
-share/icons/Wasp/scalable/stock/navigation_down.svg
-share/icons/Wasp/scalable/stock/navigation_left.svg
-share/icons/Wasp/scalable/stock/navigation_reload.svg
-share/icons/Wasp/scalable/stock/navigation_right.svg
-share/icons/Wasp/scalable/stock/navigation_stop.svg
-share/icons/Wasp/scalable/stock/navigation_up.svg
-share/icons/Wasp/scalable/stock/print.svg
-share/icons/Wasp/scalable/stock/stickies.svg
-share/icons/Wasp/scalable/stock/stock_accessories.svg
-share/icons/Wasp/scalable/stock/stock_amusements.svg
-share/icons/Wasp/scalable/stock/stock_dialog_info.svg
-share/icons/Wasp/scalable/stock/stock_gnome-logo.svg
-share/icons/Wasp/scalable/stock/stock_internet.svg
-share/icons/Wasp/scalable/stock/stock_lockscreen.svg
-share/icons/Wasp/scalable/stock/stock_logout.svg
-share/icons/Wasp/scalable/stock/stock_multimedia.svg
-share/icons/Wasp/scalable/stock/stock_searchtool.svg
-share/icons/Wasp/scalable/stock/stock_volume-0.svg
-share/icons/Wasp/scalable/stock/stock_volume-max.svg
-share/icons/Wasp/scalable/stock/stock_volume-med.svg
-share/icons/Wasp/scalable/stock/stock_volume-min.svg
-share/icons/Wasp/scalable/stock/stock_volume-mute.svg
-share/locale/az/LC_MESSAGES/gnome-themes-extras.mo
-share/locale/bg/LC_MESSAGES/gnome-themes-extras.mo
-share/locale/ca/LC_MESSAGES/gnome-themes-extras.mo
-share/locale/cs/LC_MESSAGES/gnome-themes-extras.mo
-share/locale/da/LC_MESSAGES/gnome-themes-extras.mo
-share/locale/de/LC_MESSAGES/gnome-themes-extras.mo
-share/locale/el/LC_MESSAGES/gnome-themes-extras.mo
-share/locale/en_CA/LC_MESSAGES/gnome-themes-extras.mo
-share/locale/en_GB/LC_MESSAGES/gnome-themes-extras.mo
-share/locale/es/LC_MESSAGES/gnome-themes-extras.mo
-share/locale/fi/LC_MESSAGES/gnome-themes-extras.mo
-share/locale/fr/LC_MESSAGES/gnome-themes-extras.mo
-share/locale/gl/LC_MESSAGES/gnome-themes-extras.mo
-share/locale/he/LC_MESSAGES/gnome-themes-extras.mo
-share/locale/hr/LC_MESSAGES/gnome-themes-extras.mo
-share/locale/hu/LC_MESSAGES/gnome-themes-extras.mo
-share/locale/it/LC_MESSAGES/gnome-themes-extras.mo
-share/locale/ja/LC_MESSAGES/gnome-themes-extras.mo
-share/locale/ko/LC_MESSAGES/gnome-themes-extras.mo
-share/locale/lt/LC_MESSAGES/gnome-themes-extras.mo
-share/locale/ne/LC_MESSAGES/gnome-themes-extras.mo
-share/locale/nl/LC_MESSAGES/gnome-themes-extras.mo
-share/locale/no/LC_MESSAGES/gnome-themes-extras.mo
-share/locale/pa/LC_MESSAGES/gnome-themes-extras.mo
-share/locale/pl/LC_MESSAGES/gnome-themes-extras.mo
-share/locale/pt/LC_MESSAGES/gnome-themes-extras.mo
-share/locale/pt_BR/LC_MESSAGES/gnome-themes-extras.mo
-share/locale/ru/LC_MESSAGES/gnome-themes-extras.mo
-share/locale/rw/LC_MESSAGES/gnome-themes-extras.mo
-share/locale/sk/LC_MESSAGES/gnome-themes-extras.mo
-share/locale/sq/LC_MESSAGES/gnome-themes-extras.mo
-share/locale/sr/LC_MESSAGES/gnome-themes-extras.mo
-share/locale/sr@Latn/LC_MESSAGES/gnome-themes-extras.mo
-share/locale/sv/LC_MESSAGES/gnome-themes-extras.mo
-share/locale/tr/LC_MESSAGES/gnome-themes-extras.mo
-share/locale/uk/LC_MESSAGES/gnome-themes-extras.mo
-share/locale/zh_CN/LC_MESSAGES/gnome-themes-extras.mo
-share/locale/zh_TW/LC_MESSAGES/gnome-themes-extras.mo
-share/themes/Amaranth/gtk-2.0/gtkrc
-share/themes/Amaranth/gtk-2.0/iconrc
-share/themes/Amaranth/index.theme
-share/themes/Gorilla/gtk-2.0/gtkrc
-share/themes/Gorilla/gtk/gtkrc
-share/themes/Gorilla/index.theme
-share/themes/Lush/gtk-2.0/gtkrc
-share/themes/Lush/gtk-2.0/iconrc
-share/themes/Lush/index.theme
-share/themes/Nuvola/gtk-1.0/gtkrc
-share/themes/Nuvola/gtk-2.0/gtkrc
-share/themes/Nuvola/index.theme
-share/themes/Wasp/gtk-2.0/gtkrc
-share/themes/Wasp/gtk-2.0/iconrc
-share/themes/Wasp/index.theme
-@dirrm share/themes/Wasp/gtk-2.0
-@dirrm share/themes/Wasp
-@dirrm share/themes/Nuvola/gtk-2.0
-@dirrm share/themes/Nuvola/gtk-1.0
-@dirrm share/themes/Nuvola
-@dirrm share/themes/Lush/gtk-2.0
-@dirrm share/themes/Lush
-@dirrm share/themes/Gorilla/gtk-2.0
-@dirrm share/themes/Gorilla/gtk
-@dirrm share/themes/Gorilla
-@dirrm share/themes/Amaranth/gtk-2.0
-@dirrm share/themes/Amaranth
-@dirrm share/icons/Wasp/scalable/stock
-@dirrm share/icons/Wasp/scalable/mimetypes
-@dirrm share/icons/Wasp/scalable/filesystems
-@dirrm share/icons/Wasp/scalable/emblems
-@dirrm share/icons/Wasp/scalable/devices
-@dirrm share/icons/Wasp/scalable/apps
-@dirrm share/icons/Wasp/scalable
-@dirrm share/icons/Wasp
-@dirrm share/icons/Nuvola/scalable/stock
-@dirrm share/icons/Nuvola/scalable/mimetypes
-@dirrm share/icons/Nuvola/scalable/filesystems
-@dirrm share/icons/Nuvola/scalable/emblems
-@dirrm share/icons/Nuvola/scalable/devices
-@dirrm share/icons/Nuvola/scalable/apps
-@dirrm share/icons/Nuvola/scalable
-@dirrm share/icons/Nuvola
-@dirrm share/icons/Lush/scalable/stock
-@dirrm share/icons/Lush/scalable/mimetypes
-@dirrm share/icons/Lush/scalable/filesystems
-@dirrm share/icons/Lush/scalable/emblems
-@dirrm share/icons/Lush/scalable/devices
-@dirrm share/icons/Lush/scalable/apps
-@dirrm share/icons/Lush/scalable
-@dirrm share/icons/Lush
-@dirrm share/icons/Gorilla/scalable/stock
-@dirrm share/icons/Gorilla/scalable/mimetypes
-@dirrm share/icons/Gorilla/scalable/filesystems
-@dirrm share/icons/Gorilla/scalable/emblems
-@dirrm share/icons/Gorilla/scalable/devices
-@dirrm share/icons/Gorilla/scalable/apps
-@dirrm share/icons/Gorilla/scalable
-@dirrm share/icons/Gorilla/24x24/apps
-@dirrm share/icons/Gorilla/24x24
-@dirrm share/icons/Gorilla
-@dirrm share/icons/Amaranth/scalable/stock
-@dirrm share/icons/Amaranth/scalable/mimetypes
-@dirrm share/icons/Amaranth/scalable/filesystems
-@dirrm share/icons/Amaranth/scalable/emblems
-@dirrm share/icons/Amaranth/scalable/devices
-@dirrm share/icons/Amaranth/scalable/apps
-@dirrm share/icons/Amaranth/scalable
-@dirrm share/icons/Amaranth
-@dirrm share/gnome/themes/Wasp/metacity-1
-@dirrm share/gnome/themes/Wasp
-@dirrm share/gnome/themes/Nuvola/metacity-1
-@dirrm share/gnome/themes/Nuvola-old/metacity-1
-@dirrm share/gnome/themes/Nuvola-old
-@dirrm share/gnome/themes/Nuvola
-@dirrm share/gnome/themes/Lush/metacity-1
-@dirrm share/gnome/themes/Lush
-@dirrm share/gnome/themes/Gorilla/metacity-1
-@dirrm share/gnome/themes/Gorilla
-@dirrm share/gnome/themes/Amaranth/metacity-1
-@dirrm share/gnome/themes/Amaranth
-@dirrmtry share/locale/rw/LC_MESSAGES
-@dirrmtry share/locale/rw
+share/icons/Foxtrot/16x16/actions/back.png
+share/icons/Foxtrot/16x16/actions/bottom.png
+share/icons/Foxtrot/16x16/actions/document-open.png
+share/icons/Foxtrot/16x16/actions/down.png
+share/icons/Foxtrot/16x16/actions/fileopen.png
+share/icons/Foxtrot/16x16/actions/finish.png
+share/icons/Foxtrot/16x16/actions/folder-new.png
+share/icons/Foxtrot/16x16/actions/folder_new.png
+share/icons/Foxtrot/16x16/actions/forward.png
+share/icons/Foxtrot/16x16/actions/go-bottom.png
+share/icons/Foxtrot/16x16/actions/go-down.png
+share/icons/Foxtrot/16x16/actions/go-first.png
+share/icons/Foxtrot/16x16/actions/go-home.png
+share/icons/Foxtrot/16x16/actions/go-last.png
+share/icons/Foxtrot/16x16/actions/go-next.png
+share/icons/Foxtrot/16x16/actions/go-previous.png
+share/icons/Foxtrot/16x16/actions/go-top.png
+share/icons/Foxtrot/16x16/actions/go-up.png
+share/icons/Foxtrot/16x16/actions/gohome.png
+share/icons/Foxtrot/16x16/actions/gtk-go-back-ltr.png
+share/icons/Foxtrot/16x16/actions/gtk-go-back-rtl.png
+share/icons/Foxtrot/16x16/actions/gtk-go-down.png
+share/icons/Foxtrot/16x16/actions/gtk-go-forward-ltr.png
+share/icons/Foxtrot/16x16/actions/gtk-go-forward-rtl.png
+share/icons/Foxtrot/16x16/actions/gtk-go-up.png
+share/icons/Foxtrot/16x16/actions/gtk-goto-bottom.png
+share/icons/Foxtrot/16x16/actions/gtk-goto-first-ltr.png
+share/icons/Foxtrot/16x16/actions/gtk-goto-first-rtl.png
+share/icons/Foxtrot/16x16/actions/gtk-goto-last-ltr.png
+share/icons/Foxtrot/16x16/actions/gtk-goto-last-rtl.png
+share/icons/Foxtrot/16x16/actions/gtk-goto-top.png
+share/icons/Foxtrot/16x16/actions/gtk-home.png
+share/icons/Foxtrot/16x16/actions/gtk-open.png
+share/icons/Foxtrot/16x16/actions/gtk-refresh.png
+share/icons/Foxtrot/16x16/actions/kfm_home.png
+share/icons/Foxtrot/16x16/actions/next.png
+share/icons/Foxtrot/16x16/actions/previous.png
+share/icons/Foxtrot/16x16/actions/redhat-home.png
+share/icons/Foxtrot/16x16/actions/reload.png
+share/icons/Foxtrot/16x16/actions/reload3.png
+share/icons/Foxtrot/16x16/actions/reload_all_tabs.png
+share/icons/Foxtrot/16x16/actions/reload_page.png
+share/icons/Foxtrot/16x16/actions/start.png
+share/icons/Foxtrot/16x16/actions/stock_bottom.png
+share/icons/Foxtrot/16x16/actions/stock_down.png
+share/icons/Foxtrot/16x16/actions/stock_first.png
+share/icons/Foxtrot/16x16/actions/stock_home.png
+share/icons/Foxtrot/16x16/actions/stock_last.png
+share/icons/Foxtrot/16x16/actions/stock_left.png
+share/icons/Foxtrot/16x16/actions/stock_new-dir.png
+share/icons/Foxtrot/16x16/actions/stock_refresh.png
+share/icons/Foxtrot/16x16/actions/stock_right.png
+share/icons/Foxtrot/16x16/actions/stock_top.png
+share/icons/Foxtrot/16x16/actions/stock_up.png
+share/icons/Foxtrot/16x16/actions/top.png
+share/icons/Foxtrot/16x16/actions/up.png
+share/icons/Foxtrot/16x16/actions/view-refresh.png
+share/icons/Foxtrot/16x16/places/desktop.png
+share/icons/Foxtrot/16x16/places/folder_home.png
+share/icons/Foxtrot/16x16/places/gnome-fs-desktop.png
+share/icons/Foxtrot/16x16/places/gnome-fs-directory-accept.png
+share/icons/Foxtrot/16x16/places/gnome-fs-home.png
+share/icons/Foxtrot/16x16/places/stock_open.png
+share/icons/Foxtrot/16x16/places/user-desktop.png
+share/icons/Foxtrot/16x16/places/user-home-folder.png
+share/icons/Foxtrot/16x16/places/user-home.png
+share/icons/Foxtrot/16x16/places/x-directory-normal-home.png
+share/icons/Foxtrot/16x16/places/x-directory-normal-open.png
+share/icons/Foxtrot/16x16/places/x-directory-normal.png
+share/icons/Foxtrot/16x16/places/x-directory-remote.png
+share/icons/Foxtrot/22x22/actions/add.png
+share/icons/Foxtrot/22x22/actions/back.png
+share/icons/Foxtrot/22x22/actions/bottom.png
+share/icons/Foxtrot/22x22/actions/document-open.png
+share/icons/Foxtrot/22x22/actions/down.png
+share/icons/Foxtrot/22x22/actions/fileopen.png
+share/icons/Foxtrot/22x22/actions/finish.png
+share/icons/Foxtrot/22x22/actions/folder-new.png
+share/icons/Foxtrot/22x22/actions/folder_new.png
+share/icons/Foxtrot/22x22/actions/forward.png
+share/icons/Foxtrot/22x22/actions/go-bottom.png
+share/icons/Foxtrot/22x22/actions/go-down.png
+share/icons/Foxtrot/22x22/actions/go-first.png
+share/icons/Foxtrot/22x22/actions/go-home.png
+share/icons/Foxtrot/22x22/actions/go-last.png
+share/icons/Foxtrot/22x22/actions/go-next.png
+share/icons/Foxtrot/22x22/actions/go-previous.png
+share/icons/Foxtrot/22x22/actions/go-top.png
+share/icons/Foxtrot/22x22/actions/go-up.png
+share/icons/Foxtrot/22x22/actions/gohome.png
+share/icons/Foxtrot/22x22/actions/gtk-add.png
+share/icons/Foxtrot/22x22/actions/gtk-go-back-ltr.png
+share/icons/Foxtrot/22x22/actions/gtk-go-back-rtl.png
+share/icons/Foxtrot/22x22/actions/gtk-go-down.png
+share/icons/Foxtrot/22x22/actions/gtk-go-forward-ltr.png
+share/icons/Foxtrot/22x22/actions/gtk-go-forward-rtl.png
+share/icons/Foxtrot/22x22/actions/gtk-go-up.png
+share/icons/Foxtrot/22x22/actions/gtk-goto-bottom.png
+share/icons/Foxtrot/22x22/actions/gtk-goto-first-ltr.png
+share/icons/Foxtrot/22x22/actions/gtk-goto-first-rtl.png
+share/icons/Foxtrot/22x22/actions/gtk-goto-last-ltr.png
+share/icons/Foxtrot/22x22/actions/gtk-goto-last-rtl.png
+share/icons/Foxtrot/22x22/actions/gtk-goto-top.png
+share/icons/Foxtrot/22x22/actions/gtk-home.png
+share/icons/Foxtrot/22x22/actions/gtk-open.png
+share/icons/Foxtrot/22x22/actions/gtk-refresh.png
+share/icons/Foxtrot/22x22/actions/gtk-remove.png
+share/icons/Foxtrot/22x22/actions/kfm_home.png
+share/icons/Foxtrot/22x22/actions/list-add.png
+share/icons/Foxtrot/22x22/actions/list-remove.png
+share/icons/Foxtrot/22x22/actions/next.png
+share/icons/Foxtrot/22x22/actions/previous.png
+share/icons/Foxtrot/22x22/actions/redhat-home.png
+share/icons/Foxtrot/22x22/actions/reload.png
+share/icons/Foxtrot/22x22/actions/reload3.png
+share/icons/Foxtrot/22x22/actions/reload_all_tabs.png
+share/icons/Foxtrot/22x22/actions/reload_page.png
+share/icons/Foxtrot/22x22/actions/remove.png
+share/icons/Foxtrot/22x22/actions/start.png
+share/icons/Foxtrot/22x22/actions/stock_bottom.png
+share/icons/Foxtrot/22x22/actions/stock_down.png
+share/icons/Foxtrot/22x22/actions/stock_first.png
+share/icons/Foxtrot/22x22/actions/stock_home.png
+share/icons/Foxtrot/22x22/actions/stock_last.png
+share/icons/Foxtrot/22x22/actions/stock_left.png
+share/icons/Foxtrot/22x22/actions/stock_new-dir.png
+share/icons/Foxtrot/22x22/actions/stock_refresh.png
+share/icons/Foxtrot/22x22/actions/stock_right.png
+share/icons/Foxtrot/22x22/actions/stock_top.png
+share/icons/Foxtrot/22x22/actions/stock_up.png
+share/icons/Foxtrot/22x22/actions/top.png
+share/icons/Foxtrot/22x22/actions/up.png
+share/icons/Foxtrot/22x22/actions/view-refresh.png
+share/icons/Foxtrot/22x22/actions/x-directory-normal.png
+share/icons/Foxtrot/22x22/places/desktop.png
+share/icons/Foxtrot/22x22/places/folder-remote.png
+share/icons/Foxtrot/22x22/places/folder_home.png
+share/icons/Foxtrot/22x22/places/gnome-fs-desktop.png
+share/icons/Foxtrot/22x22/places/gnome-fs-ftp.png
+share/icons/Foxtrot/22x22/places/gnome-fs-home.png
+share/icons/Foxtrot/22x22/places/gnome-fs-nfs.png
+share/icons/Foxtrot/22x22/places/gnome-fs-share.png
+share/icons/Foxtrot/22x22/places/gnome-fs-smb.png
+share/icons/Foxtrot/22x22/places/gnome-fs-ssh.png
+share/icons/Foxtrot/22x22/places/gnome-mime-x-directory-smb-share.png
+share/icons/Foxtrot/22x22/places/network.png
+share/icons/Foxtrot/22x22/places/user-desktop.png
+share/icons/Foxtrot/22x22/places/user-home.png
+share/icons/Foxtrot/22x22/places/user_home-folder.png
+share/icons/Foxtrot/22x22/places/x-directory-normal.png
+share/icons/Foxtrot/22x22/places/x-directory-remote.png
+share/icons/Foxtrot/22x22/status/folder-drag-accept.png
+share/icons/Foxtrot/22x22/status/folder-open.png
+share/icons/Foxtrot/22x22/status/folder_open.png
+share/icons/Foxtrot/22x22/status/gnome-fs-directory-accept.png
+share/icons/Foxtrot/22x22/status/stock_open.png
+share/icons/Foxtrot/22x22/status/x-directory-normal-accept.png
+share/icons/Foxtrot/24x24/actions/add.png
+share/icons/Foxtrot/24x24/actions/back.png
+share/icons/Foxtrot/24x24/actions/bottom.png
+share/icons/Foxtrot/24x24/actions/document-open.png
+share/icons/Foxtrot/24x24/actions/down.png
+share/icons/Foxtrot/24x24/actions/fileopen.png
+share/icons/Foxtrot/24x24/actions/finish.png
+share/icons/Foxtrot/24x24/actions/folder-new.png
+share/icons/Foxtrot/24x24/actions/folder_new.png
+share/icons/Foxtrot/24x24/actions/forward.png
+share/icons/Foxtrot/24x24/actions/go-bottom.png
+share/icons/Foxtrot/24x24/actions/go-down.png
+share/icons/Foxtrot/24x24/actions/go-first.png
+share/icons/Foxtrot/24x24/actions/go-home.png
+share/icons/Foxtrot/24x24/actions/go-last.png
+share/icons/Foxtrot/24x24/actions/go-next.png
+share/icons/Foxtrot/24x24/actions/go-previous.png
+share/icons/Foxtrot/24x24/actions/go-top.png
+share/icons/Foxtrot/24x24/actions/go-up.png
+share/icons/Foxtrot/24x24/actions/gohome.png
+share/icons/Foxtrot/24x24/actions/gtk-add.png
+share/icons/Foxtrot/24x24/actions/gtk-go-back-ltr.png
+share/icons/Foxtrot/24x24/actions/gtk-go-back-rtl.png
+share/icons/Foxtrot/24x24/actions/gtk-go-down.png
+share/icons/Foxtrot/24x24/actions/gtk-go-forward-ltr.png
+share/icons/Foxtrot/24x24/actions/gtk-go-forward-rtl.png
+share/icons/Foxtrot/24x24/actions/gtk-go-up.png
+share/icons/Foxtrot/24x24/actions/gtk-goto-bottom.png
+share/icons/Foxtrot/24x24/actions/gtk-goto-first-ltr.png
+share/icons/Foxtrot/24x24/actions/gtk-goto-first-rtl.png
+share/icons/Foxtrot/24x24/actions/gtk-goto-last-ltr.png
+share/icons/Foxtrot/24x24/actions/gtk-goto-last-rtl.png
+share/icons/Foxtrot/24x24/actions/gtk-goto-top.png
+share/icons/Foxtrot/24x24/actions/gtk-home.png
+share/icons/Foxtrot/24x24/actions/gtk-open.png
+share/icons/Foxtrot/24x24/actions/gtk-refresh.png
+share/icons/Foxtrot/24x24/actions/gtk-remove.png
+share/icons/Foxtrot/24x24/actions/kfm_home.png
+share/icons/Foxtrot/24x24/actions/list-add.png
+share/icons/Foxtrot/24x24/actions/list-remove.png
+share/icons/Foxtrot/24x24/actions/next.png
+share/icons/Foxtrot/24x24/actions/previous.png
+share/icons/Foxtrot/24x24/actions/redhat-home.png
+share/icons/Foxtrot/24x24/actions/reload.png
+share/icons/Foxtrot/24x24/actions/reload3.png
+share/icons/Foxtrot/24x24/actions/reload_all_tabs.png
+share/icons/Foxtrot/24x24/actions/reload_page.png
+share/icons/Foxtrot/24x24/actions/remove.png
+share/icons/Foxtrot/24x24/actions/start.png
+share/icons/Foxtrot/24x24/actions/stock_bottom.png
+share/icons/Foxtrot/24x24/actions/stock_down.png
+share/icons/Foxtrot/24x24/actions/stock_first.png
+share/icons/Foxtrot/24x24/actions/stock_home.png
+share/icons/Foxtrot/24x24/actions/stock_last.png
+share/icons/Foxtrot/24x24/actions/stock_left.png
+share/icons/Foxtrot/24x24/actions/stock_new-dir.png
+share/icons/Foxtrot/24x24/actions/stock_refresh.png
+share/icons/Foxtrot/24x24/actions/stock_right.png
+share/icons/Foxtrot/24x24/actions/stock_top.png
+share/icons/Foxtrot/24x24/actions/stock_up.png
+share/icons/Foxtrot/24x24/actions/top.png
+share/icons/Foxtrot/24x24/actions/up.png
+share/icons/Foxtrot/24x24/actions/view-refresh.png
+share/icons/Foxtrot/24x24/actions/x-directory-normal.png
+share/icons/Foxtrot/24x24/places/desktop.png
+share/icons/Foxtrot/24x24/places/folder_home.png
+share/icons/Foxtrot/24x24/places/gnome-fs-desktop.png
+share/icons/Foxtrot/24x24/places/gnome-fs-directory-accept.png
+share/icons/Foxtrot/24x24/places/gnome-fs-home.png
+share/icons/Foxtrot/24x24/places/stock_open.png
+share/icons/Foxtrot/24x24/places/user-desktop.png
+share/icons/Foxtrot/24x24/places/user-home.png
+share/icons/Foxtrot/24x24/places/user_home-folder.png
+share/icons/Foxtrot/24x24/places/x-directory-normal-accept.png
+share/icons/Foxtrot/24x24/places/x-directory-normal-open.png
+share/icons/Foxtrot/24x24/places/x-directory-normal.png
+share/icons/Foxtrot/24x24/places/x-directory-remote.png
+share/icons/Foxtrot/index.theme
+share/icons/Foxtrot/scalable/actions/add.svg
+share/icons/Foxtrot/scalable/actions/back.svg
+share/icons/Foxtrot/scalable/actions/bottom.svg
+share/icons/Foxtrot/scalable/actions/document-open.svg
+share/icons/Foxtrot/scalable/actions/down.svg
+share/icons/Foxtrot/scalable/actions/fileopen.svg
+share/icons/Foxtrot/scalable/actions/finish.svg
+share/icons/Foxtrot/scalable/actions/folder-new.svg
+share/icons/Foxtrot/scalable/actions/folder_new.svg
+share/icons/Foxtrot/scalable/actions/forward.svg
+share/icons/Foxtrot/scalable/actions/gnome-searchtool.svg
+share/icons/Foxtrot/scalable/actions/go-bottom.svg
+share/icons/Foxtrot/scalable/actions/go-down.svg
+share/icons/Foxtrot/scalable/actions/go-first.svg
+share/icons/Foxtrot/scalable/actions/go-home.svg
+share/icons/Foxtrot/scalable/actions/go-last.svg
+share/icons/Foxtrot/scalable/actions/go-next.svg
+share/icons/Foxtrot/scalable/actions/go-previous.svg
+share/icons/Foxtrot/scalable/actions/go-top.svg
+share/icons/Foxtrot/scalable/actions/go-up.svg
+share/icons/Foxtrot/scalable/actions/gohome.svg
+share/icons/Foxtrot/scalable/actions/gtk-add.svg
+share/icons/Foxtrot/scalable/actions/gtk-go-back-ltr.svg
+share/icons/Foxtrot/scalable/actions/gtk-go-back-rtl.svg
+share/icons/Foxtrot/scalable/actions/gtk-go-down.svg
+share/icons/Foxtrot/scalable/actions/gtk-go-forward-ltr.svg
+share/icons/Foxtrot/scalable/actions/gtk-go-forward-rtl.svg
+share/icons/Foxtrot/scalable/actions/gtk-go-up.svg
+share/icons/Foxtrot/scalable/actions/gtk-goto-bottom.svg
+share/icons/Foxtrot/scalable/actions/gtk-goto-first-ltr.svg
+share/icons/Foxtrot/scalable/actions/gtk-goto-first-rtl.svg
+share/icons/Foxtrot/scalable/actions/gtk-goto-last-ltr.svg
+share/icons/Foxtrot/scalable/actions/gtk-goto-last-rtl.svg
+share/icons/Foxtrot/scalable/actions/gtk-goto-top.svg
+share/icons/Foxtrot/scalable/actions/gtk-home.svg
+share/icons/Foxtrot/scalable/actions/gtk-open.svg
+share/icons/Foxtrot/scalable/actions/gtk-refresh.svg
+share/icons/Foxtrot/scalable/actions/gtk-remove.svg
+share/icons/Foxtrot/scalable/actions/kfind.svg
+share/icons/Foxtrot/scalable/actions/kfm_home.svg
+share/icons/Foxtrot/scalable/actions/list-add.svg
+share/icons/Foxtrot/scalable/actions/list-remove.svg
+share/icons/Foxtrot/scalable/actions/next.svg
+share/icons/Foxtrot/scalable/actions/previous.svg
+share/icons/Foxtrot/scalable/actions/redhat-home.svg
+share/icons/Foxtrot/scalable/actions/reload.svg
+share/icons/Foxtrot/scalable/actions/reload3.svg
+share/icons/Foxtrot/scalable/actions/reload_all_tabs.svg
+share/icons/Foxtrot/scalable/actions/reload_page.svg
+share/icons/Foxtrot/scalable/actions/remove.svg
+share/icons/Foxtrot/scalable/actions/search.svg
+share/icons/Foxtrot/scalable/actions/start.svg
+share/icons/Foxtrot/scalable/actions/stock_bottom.svg
+share/icons/Foxtrot/scalable/actions/stock_down.svg
+share/icons/Foxtrot/scalable/actions/stock_first.svg
+share/icons/Foxtrot/scalable/actions/stock_home.svg
+share/icons/Foxtrot/scalable/actions/stock_last.svg
+share/icons/Foxtrot/scalable/actions/stock_left.svg
+share/icons/Foxtrot/scalable/actions/stock_new-dir.svg
+share/icons/Foxtrot/scalable/actions/stock_refresh.svg
+share/icons/Foxtrot/scalable/actions/stock_right.svg
+share/icons/Foxtrot/scalable/actions/stock_top.svg
+share/icons/Foxtrot/scalable/actions/stock_up.svg
+share/icons/Foxtrot/scalable/actions/system-search.svg
+share/icons/Foxtrot/scalable/actions/top.svg
+share/icons/Foxtrot/scalable/actions/up.svg
+share/icons/Foxtrot/scalable/actions/view-refresh.svg
+share/icons/Foxtrot/scalable/categories/package_settings.svg
+share/icons/Foxtrot/scalable/categories/preferences-system.svg
+share/icons/Foxtrot/scalable/categories/redhat-system_settings.svg
+share/icons/Foxtrot/scalable/categories/xfce-system-settings.svg
+share/icons/Foxtrot/scalable/devices/chardevice.svg
+share/icons/Foxtrot/scalable/devices/computer.svg
+share/icons/Foxtrot/scalable/devices/display.svg
+share/icons/Foxtrot/scalable/devices/gnome-dev-computer.svg
+share/icons/Foxtrot/scalable/devices/gnome-fs-client.svg
+share/icons/Foxtrot/scalable/devices/system.svg
+share/icons/Foxtrot/scalable/devices/video-display.svg
+share/icons/Foxtrot/scalable/devices/xfce4-display.svg
+share/icons/Foxtrot/scalable/places/desktop.svg
+share/icons/Foxtrot/scalable/places/emptytrash.svg
+share/icons/Foxtrot/scalable/places/folder-remote.svg
+share/icons/Foxtrot/scalable/places/folder.svg
+share/icons/Foxtrot/scalable/places/folder_home.svg
+share/icons/Foxtrot/scalable/places/gnome-fs-desktop.svg
+share/icons/Foxtrot/scalable/places/gnome-fs-directory.svg
+share/icons/Foxtrot/scalable/places/gnome-fs-ftp.svg
+share/icons/Foxtrot/scalable/places/gnome-fs-home.svg
+share/icons/Foxtrot/scalable/places/gnome-fs-network.svg
+share/icons/Foxtrot/scalable/places/gnome-fs-nfs.svg
+share/icons/Foxtrot/scalable/places/gnome-fs-share.svg
+share/icons/Foxtrot/scalable/places/gnome-fs-smb.svg
+share/icons/Foxtrot/scalable/places/gnome-fs-ssh.svg
+share/icons/Foxtrot/scalable/places/gnome-fs-trash-empty.svg
+share/icons/Foxtrot/scalable/places/gnome-fs-trash-full.svg
+share/icons/Foxtrot/scalable/places/gnome-mime-x-directory-smb-share.svg
+share/icons/Foxtrot/scalable/places/gnome-mime-x-directory-smb-workgroup.svg
+share/icons/Foxtrot/scalable/places/gnome-stock-trash.svg
+share/icons/Foxtrot/scalable/places/gtk-network.svg
+share/icons/Foxtrot/scalable/places/network-workgroup.svg
+share/icons/Foxtrot/scalable/places/network.svg
+share/icons/Foxtrot/scalable/places/network_local.svg
+share/icons/Foxtrot/scalable/places/stock_folder.svg
+share/icons/Foxtrot/scalable/places/trashcan_empty.svg
+share/icons/Foxtrot/scalable/places/user-desktop.svg
+share/icons/Foxtrot/scalable/places/user-home-folder.svg
+share/icons/Foxtrot/scalable/places/user-home.svg
+share/icons/Foxtrot/scalable/places/user-trash-full.svg
+share/icons/Foxtrot/scalable/places/user-trash.svg
+share/icons/Foxtrot/scalable/places/x-directory-normal.svg
+share/icons/Foxtrot/scalable/places/x-directory-remote.svg
+share/icons/Foxtrot/scalable/places/xfce-trash_empty.svg
+share/icons/Foxtrot/scalable/status/edittrash.svg
+share/icons/Foxtrot/scalable/status/folder-accept.svg
+share/icons/Foxtrot/scalable/status/folder-drag-accept.svg
+share/icons/Foxtrot/scalable/status/folder-open.svg
+share/icons/Foxtrot/scalable/status/folder_open.svg
+share/icons/Foxtrot/scalable/status/gnome-fs-accept.svg
+share/icons/Foxtrot/scalable/status/gnome-fs-directory-accept.svg
+share/icons/Foxtrot/scalable/status/gnome-fs-trash-full.svg
+share/icons/Foxtrot/scalable/status/gnome-stock-trash-full.svg
+share/icons/Foxtrot/scalable/status/stock_open.svg
+share/icons/Foxtrot/scalable/status/stock_trash_full.svg
+share/icons/Foxtrot/scalable/status/trashcan_full.svg
+share/icons/Foxtrot/scalable/status/user-trash-full.svg
+share/icons/Foxtrot/scalable/status/x-directory-drag-accept.svg
+share/icons/Foxtrot/scalable/status/x-directory-normal-accept.svg
+share/icons/Foxtrot/scalable/status/x-directory-normal-open.svg
+share/icons/Foxtrot/scalable/status/xfce-trash_full.svg
+share/icons/Gion/128x128/actions/back.png
+share/icons/Gion/128x128/actions/bookmark-new.png
+share/icons/Gion/128x128/actions/bookmark_add.png
+share/icons/Gion/128x128/actions/bookmarks_list_add.png
+share/icons/Gion/128x128/actions/document-open.png
+share/icons/Gion/128x128/actions/down.png
+share/icons/Gion/128x128/actions/fileopen.png
+share/icons/Gion/128x128/actions/forward.png
+share/icons/Gion/128x128/actions/go-down.png
+share/icons/Gion/128x128/actions/go-next.png
+share/icons/Gion/128x128/actions/go-previous.png
+share/icons/Gion/128x128/actions/go-up.png
+share/icons/Gion/128x128/actions/gtk-go-back-ltr.png
+share/icons/Gion/128x128/actions/gtk-go-back-rtl.png
+share/icons/Gion/128x128/actions/gtk-go-down.png
+share/icons/Gion/128x128/actions/gtk-go-forward-ltr.png
+share/icons/Gion/128x128/actions/gtk-go-forward-rtl.png
+share/icons/Gion/128x128/actions/gtk-go-up.png
+share/icons/Gion/128x128/actions/gtk-open.png
+share/icons/Gion/128x128/actions/gtk-refresh.png
+share/icons/Gion/128x128/actions/gtk-stop.png
+share/icons/Gion/128x128/actions/next.png
+share/icons/Gion/128x128/actions/previous.png
+share/icons/Gion/128x128/actions/process-stop.png
+share/icons/Gion/128x128/actions/reload.png
+share/icons/Gion/128x128/actions/reload3.png
+share/icons/Gion/128x128/actions/reload_all_tabs.png
+share/icons/Gion/128x128/actions/reload_page.png
+share/icons/Gion/128x128/actions/stock_add-bookmark.png
+share/icons/Gion/128x128/actions/stock_down.png
+share/icons/Gion/128x128/actions/stock_help-add-bookmark.png
+share/icons/Gion/128x128/actions/stock_left.png
+share/icons/Gion/128x128/actions/stock_refresh.png
+share/icons/Gion/128x128/actions/stock_right.png
+share/icons/Gion/128x128/actions/stock_stop.png
+share/icons/Gion/128x128/actions/stock_up.png
+share/icons/Gion/128x128/actions/stop.png
+share/icons/Gion/128x128/actions/up.png
+share/icons/Gion/128x128/actions/view-refresh.png
+share/icons/Gion/128x128/apps/accessories-archiver.png
+share/icons/Gion/128x128/apps/browser.png
+share/icons/Gion/128x128/apps/email.png
+share/icons/Gion/128x128/apps/evolution.png
+share/icons/Gion/128x128/apps/gnome-terminal.png
+share/icons/Gion/128x128/apps/internet-mail.png
+share/icons/Gion/128x128/apps/internet-web-browser.png
+share/icons/Gion/128x128/apps/konsole.png
+share/icons/Gion/128x128/apps/mail_generic.png
+share/icons/Gion/128x128/apps/music-player.png
+share/icons/Gion/128x128/apps/openterm.png
+share/icons/Gion/128x128/apps/redhat-email.png
+share/icons/Gion/128x128/apps/redhat-web-browser.png
+share/icons/Gion/128x128/apps/terminal.png
+share/icons/Gion/128x128/apps/utilities-terminal.png
+share/icons/Gion/128x128/apps/web-browser.png
+share/icons/Gion/128x128/apps/xfce-mail.png
+share/icons/Gion/128x128/apps/xfce-terminal.png
+share/icons/Gion/128x128/categories/applications-internet.png
+share/icons/Gion/128x128/categories/gnome-globe.png
+share/icons/Gion/128x128/categories/package_network.png
+share/icons/Gion/128x128/categories/redhat-internet.png
+share/icons/Gion/128x128/categories/stock_internet.png
+share/icons/Gion/128x128/categories/xfce-internet.png
+share/icons/Gion/128x128/devices/computer.png
+share/icons/Gion/128x128/devices/drive-harddisk.png
+share/icons/Gion/128x128/devices/drive-removable-media.png
+share/icons/Gion/128x128/devices/gnome-dev-computer.png
+share/icons/Gion/128x128/devices/gnome-dev-harddisk-1394.png
+share/icons/Gion/128x128/devices/gnome-dev-harddisk-usb.png
+share/icons/Gion/128x128/devices/gnome-dev-harddisk.png
+share/icons/Gion/128x128/devices/gnome-dev-removable-1394.png
+share/icons/Gion/128x128/devices/gnome-dev-removable-usb.png
+share/icons/Gion/128x128/devices/gnome-dev-removable.png
+share/icons/Gion/128x128/devices/gnome-fs-client.png
+share/icons/Gion/128x128/devices/gtk-harddisk.png
+share/icons/Gion/128x128/devices/harddrive.png
+share/icons/Gion/128x128/devices/hdd_unmount.png
+share/icons/Gion/128x128/devices/media-cdrom-audio.png
+share/icons/Gion/128x128/devices/media-cdrom.png
+share/icons/Gion/128x128/devices/media-cdrw.png
+share/icons/Gion/128x128/devices/media-dvd.png
+share/icons/Gion/128x128/devices/media-dvdrw.png
+share/icons/Gion/128x128/devices/system.png
+share/icons/Gion/128x128/devices/usbpendrive_unmount.png
+share/icons/Gion/128x128/devices/yast_HD.png
+share/icons/Gion/128x128/devices/yast_idetude.png
+share/icons/Gion/128x128/mimetypes/application-certificate.png
+share/icons/Gion/128x128/mimetypes/ascii.png
+share/icons/Gion/128x128/mimetypes/audio-x-generic.png
+share/icons/Gion/128x128/mimetypes/deb.png
+share/icons/Gion/128x128/mimetypes/document.png
+share/icons/Gion/128x128/mimetypes/empty.png
+share/icons/Gion/128x128/mimetypes/folder_tar.png
+share/icons/Gion/128x128/mimetypes/gnome-mime-application-msword.png
+share/icons/Gion/128x128/mimetypes/gnome-mime-application-ogg.png
+share/icons/Gion/128x128/mimetypes/gnome-mime-application-pdf.png
+share/icons/Gion/128x128/mimetypes/gnome-mime-application-postscript.png
+share/icons/Gion/128x128/mimetypes/gnome-mime-application-rtf.png
+share/icons/Gion/128x128/mimetypes/gnome-mime-application-vnd.lotus-1-2-3.png
+share/icons/Gion/128x128/mimetypes/gnome-mime-application-vnd.ms-excel.png
+share/icons/Gion/128x128/mimetypes/gnome-mime-application-vnd.oasis.opendocument.spreadsheet.png
+share/icons/Gion/128x128/mimetypes/gnome-mime-application-vnd.oasis.opendocument.text-web.png
+share/icons/Gion/128x128/mimetypes/gnome-mime-application-vnd.oasis.opendocument.text.png
+share/icons/Gion/128x128/mimetypes/gnome-mime-application-vnd.stardivision.calc.png
+share/icons/Gion/128x128/mimetypes/gnome-mime-application-vnd.stardivision.writer.png
+share/icons/Gion/128x128/mimetypes/gnome-mime-application-vnd.sun.xml.calc.png
+share/icons/Gion/128x128/mimetypes/gnome-mime-application-vnd.sun.xml.writer.png
+share/icons/Gion/128x128/mimetypes/gnome-mime-application-wordperfect.png
+share/icons/Gion/128x128/mimetypes/gnome-mime-application-x-7z-compressed.png
+share/icons/Gion/128x128/mimetypes/gnome-mime-application-x-abiword.png
+share/icons/Gion/128x128/mimetypes/gnome-mime-application-x-applix-spreadsheet.png
+share/icons/Gion/128x128/mimetypes/gnome-mime-application-x-applix-word.png
+share/icons/Gion/128x128/mimetypes/gnome-mime-application-x-archive.png
+share/icons/Gion/128x128/mimetypes/gnome-mime-application-x-arj.png
+share/icons/Gion/128x128/mimetypes/gnome-mime-application-x-bzip-compressed-tar.png
+share/icons/Gion/128x128/mimetypes/gnome-mime-application-x-bzip.png
+share/icons/Gion/128x128/mimetypes/gnome-mime-application-x-compress.png
+share/icons/Gion/128x128/mimetypes/gnome-mime-application-x-compressed-tar.png
+share/icons/Gion/128x128/mimetypes/gnome-mime-application-x-cpio-compressed.png
+share/icons/Gion/128x128/mimetypes/gnome-mime-application-x-cpio.png
+share/icons/Gion/128x128/mimetypes/gnome-mime-application-x-deb.png
+share/icons/Gion/128x128/mimetypes/gnome-mime-application-x-dvi.png
+share/icons/Gion/128x128/mimetypes/gnome-mime-application-x-gnumeric.png
+share/icons/Gion/128x128/mimetypes/gnome-mime-application-x-gzip.png
+share/icons/Gion/128x128/mimetypes/gnome-mime-application-x-gzpostscript.png
+share/icons/Gion/128x128/mimetypes/gnome-mime-application-x-jar.png
+share/icons/Gion/128x128/mimetypes/gnome-mime-application-x-killustrator.png
+share/icons/Gion/128x128/mimetypes/gnome-mime-application-x-kspread.png
+share/icons/Gion/128x128/mimetypes/gnome-mime-application-x-kword.png
+share/icons/Gion/128x128/mimetypes/gnome-mime-application-x-lha.png
+share/icons/Gion/128x128/mimetypes/gnome-mime-application-x-lhz.png
+share/icons/Gion/128x128/mimetypes/gnome-mime-application-x-perl.png
+share/icons/Gion/128x128/mimetypes/gnome-mime-application-x-php.png
+share/icons/Gion/128x128/mimetypes/gnome-mime-application-x-python-bytecode.png
+share/icons/Gion/128x128/mimetypes/gnome-mime-application-x-rar.png
+share/icons/Gion/128x128/mimetypes/gnome-mime-application-x-rpm.png
+share/icons/Gion/128x128/mimetypes/gnome-mime-application-x-scribus.png
+share/icons/Gion/128x128/mimetypes/gnome-mime-application-x-shellscript.png
+share/icons/Gion/128x128/mimetypes/gnome-mime-application-x-stuffit.png
+share/icons/Gion/128x128/mimetypes/gnome-mime-application-x-tar.png
+share/icons/Gion/128x128/mimetypes/gnome-mime-application-x-tarz.png
+share/icons/Gion/128x128/mimetypes/gnome-mime-application-x-tex.png
+share/icons/Gion/128x128/mimetypes/gnome-mime-application-xhtml+xml.png
+share/icons/Gion/128x128/mimetypes/gnome-mime-application-zip.png
+share/icons/Gion/128x128/mimetypes/gnome-mime-audio.png
+share/icons/Gion/128x128/mimetypes/gnome-mime-image.png
+share/icons/Gion/128x128/mimetypes/gnome-mime-text-html.png
+share/icons/Gion/128x128/mimetypes/gnome-mime-text-vnd.wap.wml.png
+share/icons/Gion/128x128/mimetypes/gnome-mime-text-x-csh.png
+share/icons/Gion/128x128/mimetypes/gnome-mime-text-x-python.png
+share/icons/Gion/128x128/mimetypes/gnome-mime-text-x-sh.png
+share/icons/Gion/128x128/mimetypes/gnome-mime-text-x-zsh.png
+share/icons/Gion/128x128/mimetypes/gnome-mime-text.png
+share/icons/Gion/128x128/mimetypes/gnome-package.png
+share/icons/Gion/128x128/mimetypes/html.png
+share/icons/Gion/128x128/mimetypes/image-x-generic.png
+share/icons/Gion/128x128/mimetypes/image.png
+share/icons/Gion/128x128/mimetypes/mime_ascii.png
+share/icons/Gion/128x128/mimetypes/misc.png
+share/icons/Gion/128x128/mimetypes/package-x-generic.png
+share/icons/Gion/128x128/mimetypes/package.png
+share/icons/Gion/128x128/mimetypes/package_editors.png
+share/icons/Gion/128x128/mimetypes/package_wordprocessing.png
+share/icons/Gion/128x128/mimetypes/rpm.png
+share/icons/Gion/128x128/mimetypes/shellscript.png
+share/icons/Gion/128x128/mimetypes/sound.png
+share/icons/Gion/128x128/mimetypes/spreadsheet.png
+share/icons/Gion/128x128/mimetypes/stock_certificate.png
+share/icons/Gion/128x128/mimetypes/stock_script.png
+share/icons/Gion/128x128/mimetypes/tar.png
+share/icons/Gion/128x128/mimetypes/text-html.png
+share/icons/Gion/128x128/mimetypes/text-x-authors.png
+share/icons/Gion/128x128/mimetypes/text-x-changelog.png
+share/icons/Gion/128x128/mimetypes/text-x-copying.png
+share/icons/Gion/128x128/mimetypes/text-x-generic.png
+share/icons/Gion/128x128/mimetypes/text-x-install.png
+share/icons/Gion/128x128/mimetypes/text-x-readme.png
+share/icons/Gion/128x128/mimetypes/text-x-script.png
+share/icons/Gion/128x128/mimetypes/text-x-source.png
+share/icons/Gion/128x128/mimetypes/tgz.png
+share/icons/Gion/128x128/mimetypes/txt.png
+share/icons/Gion/128x128/mimetypes/txt2.png
+share/icons/Gion/128x128/mimetypes/unknown.png
+share/icons/Gion/128x128/mimetypes/wordprocessing.png
+share/icons/Gion/128x128/mimetypes/www.png
+share/icons/Gion/128x128/mimetypes/x-office-document.png
+share/icons/Gion/128x128/mimetypes/x-office-spreadsheet.png
+share/icons/Gion/128x128/mimetypes/zip.png
+share/icons/Gion/128x128/places/application-x-gnome-saved-search.png
+share/icons/Gion/128x128/places/desktop.png
+share/icons/Gion/128x128/places/emptytrash.png
+share/icons/Gion/128x128/places/folder-remote.png
+share/icons/Gion/128x128/places/folder-saved-search.png
+share/icons/Gion/128x128/places/folder.png
+share/icons/Gion/128x128/places/folder_home.png
+share/icons/Gion/128x128/places/gnome-fs-desktop.png
+share/icons/Gion/128x128/places/gnome-fs-directory.png
+share/icons/Gion/128x128/places/gnome-fs-ftp.png
+share/icons/Gion/128x128/places/gnome-fs-home.png
+share/icons/Gion/128x128/places/gnome-fs-nfs.png
+share/icons/Gion/128x128/places/gnome-fs-share.png
+share/icons/Gion/128x128/places/gnome-fs-smb.png
+share/icons/Gion/128x128/places/gnome-fs-ssh.png
+share/icons/Gion/128x128/places/gnome-fs-trash-empty.png
+share/icons/Gion/128x128/places/gnome-mime-x-directory-smb-share.png
+share/icons/Gion/128x128/places/gnome-stock-trash.png
+share/icons/Gion/128x128/places/network.png
+share/icons/Gion/128x128/places/stock_folder.png
+share/icons/Gion/128x128/places/trashcan_empty.png
+share/icons/Gion/128x128/places/user-desktop.png
+share/icons/Gion/128x128/places/user-home.png
+share/icons/Gion/128x128/places/user-trash.png
+share/icons/Gion/128x128/places/xfce-trash_empty.png
+share/icons/Gion/128x128/status/edittrash.png
+share/icons/Gion/128x128/status/folder-drag-accept.png
+share/icons/Gion/128x128/status/folder-open.png
+share/icons/Gion/128x128/status/folder-visiting.png
+share/icons/Gion/128x128/status/folder_open.png
+share/icons/Gion/128x128/status/gnome-fs-directory-accept.png
+share/icons/Gion/128x128/status/gnome-fs-directory-visiting.png
+share/icons/Gion/128x128/status/gnome-fs-trash-full.png
+share/icons/Gion/128x128/status/gnome-stock-trash-full.png
+share/icons/Gion/128x128/status/stock_open.png
+share/icons/Gion/128x128/status/stock_trash_full.png
+share/icons/Gion/128x128/status/trashcan_full.png
+share/icons/Gion/128x128/status/user-trash-full.png
+share/icons/Gion/128x128/status/xfce-trash_full.png
+share/icons/Gion/16x16/actions/add.png
+share/icons/Gion/16x16/actions/back.png
+share/icons/Gion/16x16/actions/bookmark-new.png
+share/icons/Gion/16x16/actions/bookmark_add.png
+share/icons/Gion/16x16/actions/bookmarks_list_add.png
+share/icons/Gion/16x16/actions/bottom.png
+share/icons/Gion/16x16/actions/browser-download.png
+share/icons/Gion/16x16/actions/button_cancel.png
+share/icons/Gion/16x16/actions/cancel.png
+share/icons/Gion/16x16/actions/dialog-cancel.png
+share/icons/Gion/16x16/actions/dialog-close.png
+share/icons/Gion/16x16/actions/dialog-ok.png
+share/icons/Gion/16x16/actions/document-new.png
+share/icons/Gion/16x16/actions/document-open.png
+share/icons/Gion/16x16/actions/document-properties.png
+share/icons/Gion/16x16/actions/down.png
+share/icons/Gion/16x16/actions/edit-copy.png
+share/icons/Gion/16x16/actions/edit-find-replace.png
+share/icons/Gion/16x16/actions/edit-find.png
+share/icons/Gion/16x16/actions/edit-paste.png
+share/icons/Gion/16x16/actions/edit.png
+share/icons/Gion/16x16/actions/editcopy.png
+share/icons/Gion/16x16/actions/editpaste.png
+share/icons/Gion/16x16/actions/filefind.png
+share/icons/Gion/16x16/actions/filenew.png
+share/icons/Gion/16x16/actions/fileopen.png
+share/icons/Gion/16x16/actions/find.png
+share/icons/Gion/16x16/actions/finish.png
+share/icons/Gion/16x16/actions/forward.png
+share/icons/Gion/16x16/actions/gnome-searchtool.png
+share/icons/Gion/16x16/actions/go-bottom.png
+share/icons/Gion/16x16/actions/go-down.png
+share/icons/Gion/16x16/actions/go-first.png
+share/icons/Gion/16x16/actions/go-home.png
+share/icons/Gion/16x16/actions/go-last.png
+share/icons/Gion/16x16/actions/go-next.png
+share/icons/Gion/16x16/actions/go-previous.png
+share/icons/Gion/16x16/actions/go-top.png
+share/icons/Gion/16x16/actions/go-up.png
+share/icons/Gion/16x16/actions/gohome.png
+share/icons/Gion/16x16/actions/gtk-add.png
+share/icons/Gion/16x16/actions/gtk-cancel.png
+share/icons/Gion/16x16/actions/gtk-copy.png
+share/icons/Gion/16x16/actions/gtk-find-and-replace.png
+share/icons/Gion/16x16/actions/gtk-find.png
+share/icons/Gion/16x16/actions/gtk-go-back-ltr.png
+share/icons/Gion/16x16/actions/gtk-go-back-rtl.png
+share/icons/Gion/16x16/actions/gtk-go-down.png
+share/icons/Gion/16x16/actions/gtk-go-forward-ltr.png
+share/icons/Gion/16x16/actions/gtk-go-forward-rtl.png
+share/icons/Gion/16x16/actions/gtk-go-up.png
+share/icons/Gion/16x16/actions/gtk-goto-bottom.png
+share/icons/Gion/16x16/actions/gtk-goto-first-ltr.png
+share/icons/Gion/16x16/actions/gtk-goto-first-rtl.png
+share/icons/Gion/16x16/actions/gtk-goto-last-ltr.png
+share/icons/Gion/16x16/actions/gtk-goto-last-rtl.png
+share/icons/Gion/16x16/actions/gtk-goto-top.png
+share/icons/Gion/16x16/actions/gtk-home.png
+share/icons/Gion/16x16/actions/gtk-new.png
+share/icons/Gion/16x16/actions/gtk-open.png
+share/icons/Gion/16x16/actions/gtk-paste.png
+share/icons/Gion/16x16/actions/gtk-properties.png
+share/icons/Gion/16x16/actions/gtk-refresh.png
+share/icons/Gion/16x16/actions/gtk-remove.png
+share/icons/Gion/16x16/actions/gtk-stop.png
+share/icons/Gion/16x16/actions/help-about.png
+share/icons/Gion/16x16/actions/kfind.png
+share/icons/Gion/16x16/actions/kfm_home.png
+share/icons/Gion/16x16/actions/list-add.png
+share/icons/Gion/16x16/actions/list-remove.png
+share/icons/Gion/16x16/actions/next.png
+share/icons/Gion/16x16/actions/previous.png
+share/icons/Gion/16x16/actions/process-stop.png
+share/icons/Gion/16x16/actions/redhat-home.png
+share/icons/Gion/16x16/actions/reload.png
+share/icons/Gion/16x16/actions/reload3.png
+share/icons/Gion/16x16/actions/reload_all_tabs.png
+share/icons/Gion/16x16/actions/reload_page.png
+share/icons/Gion/16x16/actions/remove.png
+share/icons/Gion/16x16/actions/search.png
+share/icons/Gion/16x16/actions/start.png
+share/icons/Gion/16x16/actions/stock_add-bookmark.png
+share/icons/Gion/16x16/actions/stock_bottom.png
+share/icons/Gion/16x16/actions/stock_copy.png
+share/icons/Gion/16x16/actions/stock_down.png
+share/icons/Gion/16x16/actions/stock_file-properites.png
+share/icons/Gion/16x16/actions/stock_first.png
+share/icons/Gion/16x16/actions/stock_help-add-bookmark.png
+share/icons/Gion/16x16/actions/stock_home.png
+share/icons/Gion/16x16/actions/stock_last.png
+share/icons/Gion/16x16/actions/stock_left.png
+share/icons/Gion/16x16/actions/stock_new-text.png
+share/icons/Gion/16x16/actions/stock_paste.png
+share/icons/Gion/16x16/actions/stock_properties.png
+share/icons/Gion/16x16/actions/stock_refresh.png
+share/icons/Gion/16x16/actions/stock_right.png
+share/icons/Gion/16x16/actions/stock_search-and-replace.png
+share/icons/Gion/16x16/actions/stock_search.png
+share/icons/Gion/16x16/actions/stock_stop.png
+share/icons/Gion/16x16/actions/stock_top.png
+share/icons/Gion/16x16/actions/stock_up.png
+share/icons/Gion/16x16/actions/stop.png
+share/icons/Gion/16x16/actions/system-search.png
+share/icons/Gion/16x16/actions/top.png
+share/icons/Gion/16x16/actions/up.png
+share/icons/Gion/16x16/actions/view-refresh.png
+share/icons/Gion/16x16/apps/accessories-archiver.png
+share/icons/Gion/16x16/apps/browser.png
+share/icons/Gion/16x16/apps/email.png
+share/icons/Gion/16x16/apps/evolution.png
+share/icons/Gion/16x16/apps/gnome-help.png
+share/icons/Gion/16x16/apps/gnome-terminal.png
+share/icons/Gion/16x16/apps/gtk-help.png
+share/icons/Gion/16x16/apps/help-browser.png
+share/icons/Gion/16x16/apps/help.png
+share/icons/Gion/16x16/apps/internet-mail.png
+share/icons/Gion/16x16/apps/internet-web-browser.png
+share/icons/Gion/16x16/apps/khelpcenter.png
+share/icons/Gion/16x16/apps/konsole.png
+share/icons/Gion/16x16/apps/mail_generic.png
+share/icons/Gion/16x16/apps/music-player.png
+share/icons/Gion/16x16/apps/openterm.png
+share/icons/Gion/16x16/apps/redhat-email.png
+share/icons/Gion/16x16/apps/redhat-web-browser.png
+share/icons/Gion/16x16/apps/stock_help.png
+share/icons/Gion/16x16/apps/susehelpcenter.png
+share/icons/Gion/16x16/apps/terminal.png
+share/icons/Gion/16x16/apps/utilities-terminal.png
+share/icons/Gion/16x16/apps/web-browser.png
+share/icons/Gion/16x16/apps/xfce-mail.png
+share/icons/Gion/16x16/apps/xfce-terminal.png
+share/icons/Gion/16x16/devices/computer.png
+share/icons/Gion/16x16/devices/drive-harddisk.png
+share/icons/Gion/16x16/devices/drive-removable-media.png
+share/icons/Gion/16x16/devices/gnome-dev-computer.png
+share/icons/Gion/16x16/devices/gnome-dev-harddisk-1394.png
+share/icons/Gion/16x16/devices/gnome-dev-harddisk-usb.png
+share/icons/Gion/16x16/devices/gnome-dev-harddisk.png
+share/icons/Gion/16x16/devices/gnome-dev-removable-1394.png
+share/icons/Gion/16x16/devices/gnome-dev-removable-usb.png
+share/icons/Gion/16x16/devices/gnome-dev-removable.png
+share/icons/Gion/16x16/devices/gnome-fs-client.png
+share/icons/Gion/16x16/devices/gtk-harddisk.png
+share/icons/Gion/16x16/devices/harddrive.png
+share/icons/Gion/16x16/devices/hdd_unmount.png
+share/icons/Gion/16x16/devices/system.png
+share/icons/Gion/16x16/devices/usbpendrive_unmount.png
+share/icons/Gion/16x16/devices/yast_HD.png
+share/icons/Gion/16x16/devices/yast_idetude.png
+share/icons/Gion/16x16/mimetypes/application-certificate.png
+share/icons/Gion/16x16/mimetypes/ascii.png
+share/icons/Gion/16x16/mimetypes/audio-x-generic.png
+share/icons/Gion/16x16/mimetypes/deb.png
+share/icons/Gion/16x16/mimetypes/document.png
+share/icons/Gion/16x16/mimetypes/empty.png
+share/icons/Gion/16x16/mimetypes/folder_tar.png
+share/icons/Gion/16x16/mimetypes/gnome-mime-application-msword.png
+share/icons/Gion/16x16/mimetypes/gnome-mime-application-ogg.png
+share/icons/Gion/16x16/mimetypes/gnome-mime-application-pdf.png
+share/icons/Gion/16x16/mimetypes/gnome-mime-application-postscript.png
+share/icons/Gion/16x16/mimetypes/gnome-mime-application-rtf.png
+share/icons/Gion/16x16/mimetypes/gnome-mime-application-vnd.lotus-1-2-3.png
+share/icons/Gion/16x16/mimetypes/gnome-mime-application-vnd.ms-excel.png
+share/icons/Gion/16x16/mimetypes/gnome-mime-application-vnd.oasis.opendocument.spreadsheet.png
+share/icons/Gion/16x16/mimetypes/gnome-mime-application-vnd.oasis.opendocument.text-web.png
+share/icons/Gion/16x16/mimetypes/gnome-mime-application-vnd.oasis.opendocument.text.png
+share/icons/Gion/16x16/mimetypes/gnome-mime-application-vnd.stardivision.calc.png
+share/icons/Gion/16x16/mimetypes/gnome-mime-application-vnd.stardivision.writer.png
+share/icons/Gion/16x16/mimetypes/gnome-mime-application-vnd.sun.xml.calc.png
+share/icons/Gion/16x16/mimetypes/gnome-mime-application-vnd.sun.xml.writer.png
+share/icons/Gion/16x16/mimetypes/gnome-mime-application-wordperfect.png
+share/icons/Gion/16x16/mimetypes/gnome-mime-application-x-7z-compressed.png
+share/icons/Gion/16x16/mimetypes/gnome-mime-application-x-abiword.png
+share/icons/Gion/16x16/mimetypes/gnome-mime-application-x-applix-spreadsheet.png
+share/icons/Gion/16x16/mimetypes/gnome-mime-application-x-applix-word.png
+share/icons/Gion/16x16/mimetypes/gnome-mime-application-x-archive.png
+share/icons/Gion/16x16/mimetypes/gnome-mime-application-x-arj.png
+share/icons/Gion/16x16/mimetypes/gnome-mime-application-x-bzip-compressed-tar.png
+share/icons/Gion/16x16/mimetypes/gnome-mime-application-x-bzip.png
+share/icons/Gion/16x16/mimetypes/gnome-mime-application-x-compress.png
+share/icons/Gion/16x16/mimetypes/gnome-mime-application-x-compressed-tar.png
+share/icons/Gion/16x16/mimetypes/gnome-mime-application-x-cpio-compressed.png
+share/icons/Gion/16x16/mimetypes/gnome-mime-application-x-cpio.png
+share/icons/Gion/16x16/mimetypes/gnome-mime-application-x-deb.png
+share/icons/Gion/16x16/mimetypes/gnome-mime-application-x-dvi.png
+share/icons/Gion/16x16/mimetypes/gnome-mime-application-x-gnumeric.png
+share/icons/Gion/16x16/mimetypes/gnome-mime-application-x-gzip.png
+share/icons/Gion/16x16/mimetypes/gnome-mime-application-x-gzpostscript.png
+share/icons/Gion/16x16/mimetypes/gnome-mime-application-x-jar.png
+share/icons/Gion/16x16/mimetypes/gnome-mime-application-x-killustrator.png
+share/icons/Gion/16x16/mimetypes/gnome-mime-application-x-kspread.png
+share/icons/Gion/16x16/mimetypes/gnome-mime-application-x-kword.png
+share/icons/Gion/16x16/mimetypes/gnome-mime-application-x-lha.png
+share/icons/Gion/16x16/mimetypes/gnome-mime-application-x-lhz.png
+share/icons/Gion/16x16/mimetypes/gnome-mime-application-x-perl.png
+share/icons/Gion/16x16/mimetypes/gnome-mime-application-x-php.png
+share/icons/Gion/16x16/mimetypes/gnome-mime-application-x-python-bytecode.png
+share/icons/Gion/16x16/mimetypes/gnome-mime-application-x-rar.png
+share/icons/Gion/16x16/mimetypes/gnome-mime-application-x-rpm.png
+share/icons/Gion/16x16/mimetypes/gnome-mime-application-x-scribus.png
+share/icons/Gion/16x16/mimetypes/gnome-mime-application-x-shellscript.png
+share/icons/Gion/16x16/mimetypes/gnome-mime-application-x-stuffit.png
+share/icons/Gion/16x16/mimetypes/gnome-mime-application-x-tar.png
+share/icons/Gion/16x16/mimetypes/gnome-mime-application-x-tarz.png
+share/icons/Gion/16x16/mimetypes/gnome-mime-application-x-tex.png
+share/icons/Gion/16x16/mimetypes/gnome-mime-application-xhtml+xml.png
+share/icons/Gion/16x16/mimetypes/gnome-mime-application-zip.png
+share/icons/Gion/16x16/mimetypes/gnome-mime-audio.png
+share/icons/Gion/16x16/mimetypes/gnome-mime-image.png
+share/icons/Gion/16x16/mimetypes/gnome-mime-text-html.png
+share/icons/Gion/16x16/mimetypes/gnome-mime-text-vnd.wap.wml.png
+share/icons/Gion/16x16/mimetypes/gnome-mime-text-x-csh.png
+share/icons/Gion/16x16/mimetypes/gnome-mime-text-x-python.png
+share/icons/Gion/16x16/mimetypes/gnome-mime-text-x-sh.png
+share/icons/Gion/16x16/mimetypes/gnome-mime-text-x-zsh.png
+share/icons/Gion/16x16/mimetypes/gnome-mime-text.png
+share/icons/Gion/16x16/mimetypes/gnome-package.png
+share/icons/Gion/16x16/mimetypes/html.png
+share/icons/Gion/16x16/mimetypes/image-x-generic.png
+share/icons/Gion/16x16/mimetypes/image.png
+share/icons/Gion/16x16/mimetypes/mime_ascii.png
+share/icons/Gion/16x16/mimetypes/misc.png
+share/icons/Gion/16x16/mimetypes/package-x-generic.png
+share/icons/Gion/16x16/mimetypes/package.png
+share/icons/Gion/16x16/mimetypes/package_editors.png
+share/icons/Gion/16x16/mimetypes/package_wordprocessing.png
+share/icons/Gion/16x16/mimetypes/rpm.png
+share/icons/Gion/16x16/mimetypes/shellscript.png
+share/icons/Gion/16x16/mimetypes/sound.png
+share/icons/Gion/16x16/mimetypes/spreadsheet.png
+share/icons/Gion/16x16/mimetypes/stock_certificate.png
+share/icons/Gion/16x16/mimetypes/stock_script.png
+share/icons/Gion/16x16/mimetypes/tar.png
+share/icons/Gion/16x16/mimetypes/template_source.png
+share/icons/Gion/16x16/mimetypes/text-html.png
+share/icons/Gion/16x16/mimetypes/text-x-authors.png
+share/icons/Gion/16x16/mimetypes/text-x-changelog.png
+share/icons/Gion/16x16/mimetypes/text-x-copying.png
+share/icons/Gion/16x16/mimetypes/text-x-generic-template.png
+share/icons/Gion/16x16/mimetypes/text-x-generic.png
+share/icons/Gion/16x16/mimetypes/text-x-install.png
+share/icons/Gion/16x16/mimetypes/text-x-readme.png
+share/icons/Gion/16x16/mimetypes/text-x-script.png
+share/icons/Gion/16x16/mimetypes/text-x-source.png
+share/icons/Gion/16x16/mimetypes/tgz.png
+share/icons/Gion/16x16/mimetypes/txt.png
+share/icons/Gion/16x16/mimetypes/txt2.png
+share/icons/Gion/16x16/mimetypes/unknown.png
+share/icons/Gion/16x16/mimetypes/wordprocessing.png
+share/icons/Gion/16x16/mimetypes/www.png
+share/icons/Gion/16x16/mimetypes/x-office-document.png
+share/icons/Gion/16x16/mimetypes/x-office-spreadsheet.png
+share/icons/Gion/16x16/mimetypes/zip.png
+share/icons/Gion/16x16/places/emptytrash.png
+share/icons/Gion/16x16/places/folder.png
+share/icons/Gion/16x16/places/folder_home.png
+share/icons/Gion/16x16/places/gnome-fs-directory.png
+share/icons/Gion/16x16/places/gnome-fs-home.png
+share/icons/Gion/16x16/places/gnome-fs-trash-empty.png
+share/icons/Gion/16x16/places/gnome-stock-trash.png
+share/icons/Gion/16x16/places/stock_folder.png
+share/icons/Gion/16x16/places/trashcan_empty.png
+share/icons/Gion/16x16/places/user-home.png
+share/icons/Gion/16x16/places/user-trash.png
+share/icons/Gion/16x16/places/xfce-trash_empty.png
+share/icons/Gion/22x22/actions/add.png
+share/icons/Gion/22x22/actions/back.png
+share/icons/Gion/22x22/actions/bookmark-new.png
+share/icons/Gion/22x22/actions/bookmark_add.png
+share/icons/Gion/22x22/actions/bookmarks_list_add.png
+share/icons/Gion/22x22/actions/bottom.png
+share/icons/Gion/22x22/actions/browser-download.png
+share/icons/Gion/22x22/actions/button_cancel.png
+share/icons/Gion/22x22/actions/cancel.png
+share/icons/Gion/22x22/actions/dialog-cancel.png
+share/icons/Gion/22x22/actions/dialog-close.png
+share/icons/Gion/22x22/actions/dialog-no.png
+share/icons/Gion/22x22/actions/dialog-ok.png
+share/icons/Gion/22x22/actions/dialog-yes.png
+share/icons/Gion/22x22/actions/document-new.png
+share/icons/Gion/22x22/actions/document-open.png
+share/icons/Gion/22x22/actions/document-properties.png
+share/icons/Gion/22x22/actions/down.png
+share/icons/Gion/22x22/actions/edit-copy.png
+share/icons/Gion/22x22/actions/edit-find-replace.png
+share/icons/Gion/22x22/actions/edit-find.png
+share/icons/Gion/22x22/actions/edit-paste.png
+share/icons/Gion/22x22/actions/edit.png
+share/icons/Gion/22x22/actions/editcopy.png
+share/icons/Gion/22x22/actions/editpaste.png
+share/icons/Gion/22x22/actions/filefind.png
+share/icons/Gion/22x22/actions/filenew.png
+share/icons/Gion/22x22/actions/fileopen.png
+share/icons/Gion/22x22/actions/find.png
+share/icons/Gion/22x22/actions/finish.png
+share/icons/Gion/22x22/actions/forward.png
+share/icons/Gion/22x22/actions/gnome-searchtool.png
+share/icons/Gion/22x22/actions/go-bottom.png
+share/icons/Gion/22x22/actions/go-down.png
+share/icons/Gion/22x22/actions/go-first.png
+share/icons/Gion/22x22/actions/go-home.png
+share/icons/Gion/22x22/actions/go-last.png
+share/icons/Gion/22x22/actions/go-next.png
+share/icons/Gion/22x22/actions/go-previous.png
+share/icons/Gion/22x22/actions/go-top.png
+share/icons/Gion/22x22/actions/go-up.png
+share/icons/Gion/22x22/actions/gohome.png
+share/icons/Gion/22x22/actions/gtk-add.png
+share/icons/Gion/22x22/actions/gtk-cancel.png
+share/icons/Gion/22x22/actions/gtk-copy.png
+share/icons/Gion/22x22/actions/gtk-find-and-replace.png
+share/icons/Gion/22x22/actions/gtk-find.png
+share/icons/Gion/22x22/actions/gtk-go-back-ltr.png
+share/icons/Gion/22x22/actions/gtk-go-back-rtl.png
+share/icons/Gion/22x22/actions/gtk-go-down.png
+share/icons/Gion/22x22/actions/gtk-go-forward-ltr.png
+share/icons/Gion/22x22/actions/gtk-go-forward-rtl.png
+share/icons/Gion/22x22/actions/gtk-go-up.png
+share/icons/Gion/22x22/actions/gtk-goto-bottom.png
+share/icons/Gion/22x22/actions/gtk-goto-first-ltr.png
+share/icons/Gion/22x22/actions/gtk-goto-first-rtl.png
+share/icons/Gion/22x22/actions/gtk-goto-last-ltr.png
+share/icons/Gion/22x22/actions/gtk-goto-last-rtl.png
+share/icons/Gion/22x22/actions/gtk-goto-top.png
+share/icons/Gion/22x22/actions/gtk-home.png
+share/icons/Gion/22x22/actions/gtk-new.png
+share/icons/Gion/22x22/actions/gtk-open.png
+share/icons/Gion/22x22/actions/gtk-paste.png
+share/icons/Gion/22x22/actions/gtk-properties.png
+share/icons/Gion/22x22/actions/gtk-refresh.png
+share/icons/Gion/22x22/actions/gtk-remove.png
+share/icons/Gion/22x22/actions/gtk-stop.png
+share/icons/Gion/22x22/actions/help-about.png
+share/icons/Gion/22x22/actions/help.png
+share/icons/Gion/22x22/actions/kfind.png
+share/icons/Gion/22x22/actions/kfm_home.png
+share/icons/Gion/22x22/actions/list-add.png
+share/icons/Gion/22x22/actions/list-remove.png
+share/icons/Gion/22x22/actions/next.png
+share/icons/Gion/22x22/actions/previous.png
+share/icons/Gion/22x22/actions/process-stop.png
+share/icons/Gion/22x22/actions/redhat-home.png
+share/icons/Gion/22x22/actions/reload.png
+share/icons/Gion/22x22/actions/reload3.png
+share/icons/Gion/22x22/actions/reload_all_tabs.png
+share/icons/Gion/22x22/actions/reload_page.png
+share/icons/Gion/22x22/actions/remove.png
+share/icons/Gion/22x22/actions/search.png
+share/icons/Gion/22x22/actions/start.png
+share/icons/Gion/22x22/actions/stock_add-bookmark.png
+share/icons/Gion/22x22/actions/stock_bottom.png
+share/icons/Gion/22x22/actions/stock_copy.png
+share/icons/Gion/22x22/actions/stock_down.png
+share/icons/Gion/22x22/actions/stock_file-properites.png
+share/icons/Gion/22x22/actions/stock_first.png
+share/icons/Gion/22x22/actions/stock_help-add-bookmark.png
+share/icons/Gion/22x22/actions/stock_home.png
+share/icons/Gion/22x22/actions/stock_last.png
+share/icons/Gion/22x22/actions/stock_left.png
+share/icons/Gion/22x22/actions/stock_new-text.png
+share/icons/Gion/22x22/actions/stock_paste.png
+share/icons/Gion/22x22/actions/stock_properties.png
+share/icons/Gion/22x22/actions/stock_refresh.png
+share/icons/Gion/22x22/actions/stock_right.png
+share/icons/Gion/22x22/actions/stock_search-and-replace.png
+share/icons/Gion/22x22/actions/stock_search.png
+share/icons/Gion/22x22/actions/stock_stop.png
+share/icons/Gion/22x22/actions/stock_top.png
+share/icons/Gion/22x22/actions/stock_up.png
+share/icons/Gion/22x22/actions/stop.png
+share/icons/Gion/22x22/actions/system-search.png
+share/icons/Gion/22x22/actions/top.png
+share/icons/Gion/22x22/actions/up.png
+share/icons/Gion/22x22/actions/view-refresh.png
+share/icons/Gion/22x22/apps/accessories-archiver.png
+share/icons/Gion/22x22/apps/browser.png
+share/icons/Gion/22x22/apps/email.png
+share/icons/Gion/22x22/apps/epiphany-bookmarks.png
+share/icons/Gion/22x22/apps/evolution.png
+share/icons/Gion/22x22/apps/gnome-terminal.png
+share/icons/Gion/22x22/apps/internet-mail.png
+share/icons/Gion/22x22/apps/internet-web-browser.png
+share/icons/Gion/22x22/apps/konsole.png
+share/icons/Gion/22x22/apps/mail_generic.png
+share/icons/Gion/22x22/apps/music-player.png
+share/icons/Gion/22x22/apps/openterm.png
+share/icons/Gion/22x22/apps/redhat-email.png
+share/icons/Gion/22x22/apps/redhat-web-browser.png
+share/icons/Gion/22x22/apps/terminal.png
+share/icons/Gion/22x22/apps/utilities-terminal.png
+share/icons/Gion/22x22/apps/web-browser.png
+share/icons/Gion/22x22/apps/xfce-mail.png
+share/icons/Gion/22x22/apps/xfce-terminal.png
+share/icons/Gion/22x22/devices/computer.png
+share/icons/Gion/22x22/devices/drive-harddisk.png
+share/icons/Gion/22x22/devices/drive-removable-media.png
+share/icons/Gion/22x22/devices/gnome-dev-computer.png
+share/icons/Gion/22x22/devices/gnome-dev-harddisk-1394.png
+share/icons/Gion/22x22/devices/gnome-dev-harddisk-usb.png
+share/icons/Gion/22x22/devices/gnome-dev-harddisk.png
+share/icons/Gion/22x22/devices/gnome-dev-removable-1394.png
+share/icons/Gion/22x22/devices/gnome-dev-removable-usb.png
+share/icons/Gion/22x22/devices/gnome-dev-removable.png
+share/icons/Gion/22x22/devices/gnome-fs-client.png
+share/icons/Gion/22x22/devices/gtk-harddisk.png
+share/icons/Gion/22x22/devices/harddrive.png
+share/icons/Gion/22x22/devices/hdd_unmount.png
+share/icons/Gion/22x22/devices/media-cdrom-audio.png
+share/icons/Gion/22x22/devices/media-cdrom.png
+share/icons/Gion/22x22/devices/media-cdrw.png
+share/icons/Gion/22x22/devices/media-dvd.png
+share/icons/Gion/22x22/devices/media-dvdrw.png
+share/icons/Gion/22x22/devices/system.png
+share/icons/Gion/22x22/devices/usbpendrive_unmount.png
+share/icons/Gion/22x22/devices/yast_HD.png
+share/icons/Gion/22x22/devices/yast_idetude.png
+share/icons/Gion/22x22/mimetypes/application-certificate.png
+share/icons/Gion/22x22/mimetypes/ascii.png
+share/icons/Gion/22x22/mimetypes/audio-x-generic.png
+share/icons/Gion/22x22/mimetypes/deb.png
+share/icons/Gion/22x22/mimetypes/document.png
+share/icons/Gion/22x22/mimetypes/empty.png
+share/icons/Gion/22x22/mimetypes/folder_tar.png
+share/icons/Gion/22x22/mimetypes/gnome-mime-application-msword.png
+share/icons/Gion/22x22/mimetypes/gnome-mime-application-ogg.png
+share/icons/Gion/22x22/mimetypes/gnome-mime-application-pdf.png
+share/icons/Gion/22x22/mimetypes/gnome-mime-application-postscript.png
+share/icons/Gion/22x22/mimetypes/gnome-mime-application-rtf.png
+share/icons/Gion/22x22/mimetypes/gnome-mime-application-vnd.lotus-1-2-3.png
+share/icons/Gion/22x22/mimetypes/gnome-mime-application-vnd.ms-excel.png
+share/icons/Gion/22x22/mimetypes/gnome-mime-application-vnd.oasis.opendocument.spreadsheet.png
+share/icons/Gion/22x22/mimetypes/gnome-mime-application-vnd.oasis.opendocument.text-web.png
+share/icons/Gion/22x22/mimetypes/gnome-mime-application-vnd.oasis.opendocument.text.png
+share/icons/Gion/22x22/mimetypes/gnome-mime-application-vnd.stardivision.calc.png
+share/icons/Gion/22x22/mimetypes/gnome-mime-application-vnd.stardivision.writer.png
+share/icons/Gion/22x22/mimetypes/gnome-mime-application-vnd.sun.xml.calc.png
+share/icons/Gion/22x22/mimetypes/gnome-mime-application-vnd.sun.xml.writer.png
+share/icons/Gion/22x22/mimetypes/gnome-mime-application-wordperfect.png
+share/icons/Gion/22x22/mimetypes/gnome-mime-application-x-7z-compressed.png
+share/icons/Gion/22x22/mimetypes/gnome-mime-application-x-abiword.png
+share/icons/Gion/22x22/mimetypes/gnome-mime-application-x-applix-spreadsheet.png
+share/icons/Gion/22x22/mimetypes/gnome-mime-application-x-applix-word.png
+share/icons/Gion/22x22/mimetypes/gnome-mime-application-x-archive.png
+share/icons/Gion/22x22/mimetypes/gnome-mime-application-x-arj.png
+share/icons/Gion/22x22/mimetypes/gnome-mime-application-x-bzip-compressed-tar.png
+share/icons/Gion/22x22/mimetypes/gnome-mime-application-x-bzip.png
+share/icons/Gion/22x22/mimetypes/gnome-mime-application-x-compress.png
+share/icons/Gion/22x22/mimetypes/gnome-mime-application-x-compressed-tar.png
+share/icons/Gion/22x22/mimetypes/gnome-mime-application-x-cpio-compressed.png
+share/icons/Gion/22x22/mimetypes/gnome-mime-application-x-cpio.png
+share/icons/Gion/22x22/mimetypes/gnome-mime-application-x-deb.png
+share/icons/Gion/22x22/mimetypes/gnome-mime-application-x-dvi.png
+share/icons/Gion/22x22/mimetypes/gnome-mime-application-x-gnumeric.png
+share/icons/Gion/22x22/mimetypes/gnome-mime-application-x-gzip.png
+share/icons/Gion/22x22/mimetypes/gnome-mime-application-x-gzpostscript.png
+share/icons/Gion/22x22/mimetypes/gnome-mime-application-x-jar.png
+share/icons/Gion/22x22/mimetypes/gnome-mime-application-x-killustrator.png
+share/icons/Gion/22x22/mimetypes/gnome-mime-application-x-kspread.png
+share/icons/Gion/22x22/mimetypes/gnome-mime-application-x-kword.png
+share/icons/Gion/22x22/mimetypes/gnome-mime-application-x-lha.png
+share/icons/Gion/22x22/mimetypes/gnome-mime-application-x-lhz.png
+share/icons/Gion/22x22/mimetypes/gnome-mime-application-x-perl.png
+share/icons/Gion/22x22/mimetypes/gnome-mime-application-x-php.png
+share/icons/Gion/22x22/mimetypes/gnome-mime-application-x-python-bytecode.png
+share/icons/Gion/22x22/mimetypes/gnome-mime-application-x-rar.png
+share/icons/Gion/22x22/mimetypes/gnome-mime-application-x-rpm.png
+share/icons/Gion/22x22/mimetypes/gnome-mime-application-x-scribus.png
+share/icons/Gion/22x22/mimetypes/gnome-mime-application-x-shellscript.png
+share/icons/Gion/22x22/mimetypes/gnome-mime-application-x-stuffit.png
+share/icons/Gion/22x22/mimetypes/gnome-mime-application-x-tar.png
+share/icons/Gion/22x22/mimetypes/gnome-mime-application-x-tarz.png
+share/icons/Gion/22x22/mimetypes/gnome-mime-application-x-tex.png
+share/icons/Gion/22x22/mimetypes/gnome-mime-application-xhtml+xml.png
+share/icons/Gion/22x22/mimetypes/gnome-mime-application-zip.png
+share/icons/Gion/22x22/mimetypes/gnome-mime-audio.png
+share/icons/Gion/22x22/mimetypes/gnome-mime-image.png
+share/icons/Gion/22x22/mimetypes/gnome-mime-text-html.png
+share/icons/Gion/22x22/mimetypes/gnome-mime-text-vnd.wap.wml.png
+share/icons/Gion/22x22/mimetypes/gnome-mime-text-x-csh.png
+share/icons/Gion/22x22/mimetypes/gnome-mime-text-x-python.png
+share/icons/Gion/22x22/mimetypes/gnome-mime-text-x-sh.png
+share/icons/Gion/22x22/mimetypes/gnome-mime-text-x-zsh.png
+share/icons/Gion/22x22/mimetypes/gnome-mime-text.png
+share/icons/Gion/22x22/mimetypes/gnome-package.png
+share/icons/Gion/22x22/mimetypes/html.png
+share/icons/Gion/22x22/mimetypes/image-x-generic.png
+share/icons/Gion/22x22/mimetypes/image.png
+share/icons/Gion/22x22/mimetypes/mime_ascii.png
+share/icons/Gion/22x22/mimetypes/misc.png
+share/icons/Gion/22x22/mimetypes/other-desktop.png
+share/icons/Gion/22x22/mimetypes/package-x-generic.png
+share/icons/Gion/22x22/mimetypes/package.png
+share/icons/Gion/22x22/mimetypes/package_editors.png
+share/icons/Gion/22x22/mimetypes/package_wordprocessing.png
+share/icons/Gion/22x22/mimetypes/rpm.png
+share/icons/Gion/22x22/mimetypes/shellscript.png
+share/icons/Gion/22x22/mimetypes/sound.png
+share/icons/Gion/22x22/mimetypes/spreadsheet.png
+share/icons/Gion/22x22/mimetypes/stock_certificate.png
+share/icons/Gion/22x22/mimetypes/stock_script.png
+share/icons/Gion/22x22/mimetypes/tar.png
+share/icons/Gion/22x22/mimetypes/text-html.png
+share/icons/Gion/22x22/mimetypes/text-x-authors.png
+share/icons/Gion/22x22/mimetypes/text-x-changelog.png
+share/icons/Gion/22x22/mimetypes/text-x-copying.png
+share/icons/Gion/22x22/mimetypes/text-x-generic.png
+share/icons/Gion/22x22/mimetypes/text-x-install.png
+share/icons/Gion/22x22/mimetypes/text-x-readme.png
+share/icons/Gion/22x22/mimetypes/text-x-script.png
+share/icons/Gion/22x22/mimetypes/text-x-source.png
+share/icons/Gion/22x22/mimetypes/tgz.png
+share/icons/Gion/22x22/mimetypes/txt.png
+share/icons/Gion/22x22/mimetypes/txt2.png
+share/icons/Gion/22x22/mimetypes/unknown.png
+share/icons/Gion/22x22/mimetypes/wordprocessing.png
+share/icons/Gion/22x22/mimetypes/www.png
+share/icons/Gion/22x22/mimetypes/x-office-document.png
+share/icons/Gion/22x22/mimetypes/x-office-spreadsheet.png
+share/icons/Gion/22x22/mimetypes/zip.png
+share/icons/Gion/22x22/places/application-x-gnome-saved-search.png
+share/icons/Gion/22x22/places/desktop.png
+share/icons/Gion/22x22/places/emptytrash.png
+share/icons/Gion/22x22/places/folder-remote.png
+share/icons/Gion/22x22/places/folder-saved-search.png
+share/icons/Gion/22x22/places/folder.png
+share/icons/Gion/22x22/places/folder_home.png
+share/icons/Gion/22x22/places/gnome-fs-desktop.png
+share/icons/Gion/22x22/places/gnome-fs-directory.png
+share/icons/Gion/22x22/places/gnome-fs-ftp.png
+share/icons/Gion/22x22/places/gnome-fs-home.png
+share/icons/Gion/22x22/places/gnome-fs-nfs.png
+share/icons/Gion/22x22/places/gnome-fs-share.png
+share/icons/Gion/22x22/places/gnome-fs-smb.png
+share/icons/Gion/22x22/places/gnome-fs-ssh.png
+share/icons/Gion/22x22/places/gnome-fs-trash-empty.png
+share/icons/Gion/22x22/places/gnome-mime-x-directory-smb-share.png
+share/icons/Gion/22x22/places/gnome-stock-trash.png
+share/icons/Gion/22x22/places/network.png
+share/icons/Gion/22x22/places/stock_folder.png
+share/icons/Gion/22x22/places/trashcan_empty.png
+share/icons/Gion/22x22/places/user-desktop.png
+share/icons/Gion/22x22/places/user-home.png
+share/icons/Gion/22x22/places/user-trash.png
+share/icons/Gion/22x22/places/xfce-trash_empty.png
+share/icons/Gion/22x22/status/edittrash.png
+share/icons/Gion/22x22/status/folder-drag-accept.png
+share/icons/Gion/22x22/status/folder-open.png
+share/icons/Gion/22x22/status/folder-visiting.png
+share/icons/Gion/22x22/status/folder_open.png
+share/icons/Gion/22x22/status/gnome-fs-directory-accept.png
+share/icons/Gion/22x22/status/gnome-fs-directory-visiting.png
+share/icons/Gion/22x22/status/gnome-fs-trash-full.png
+share/icons/Gion/22x22/status/gnome-stock-trash-full.png
+share/icons/Gion/22x22/status/stock_open.png
+share/icons/Gion/22x22/status/stock_trash_full.png
+share/icons/Gion/22x22/status/trashcan_full.png
+share/icons/Gion/22x22/status/user-trash-full.png
+share/icons/Gion/22x22/status/xfce-trash_full.png
+share/icons/Gion/24x24/actions/add.png
+share/icons/Gion/24x24/actions/back.png
+share/icons/Gion/24x24/actions/bookmark-new.png
+share/icons/Gion/24x24/actions/bookmark_add.png
+share/icons/Gion/24x24/actions/bookmarks_list_add.png
+share/icons/Gion/24x24/actions/bottom.png
+share/icons/Gion/24x24/actions/browser-download.png
+share/icons/Gion/24x24/actions/button_cancel.png
+share/icons/Gion/24x24/actions/cancel.png
+share/icons/Gion/24x24/actions/dialog-cancel.png
+share/icons/Gion/24x24/actions/dialog-close.png
+share/icons/Gion/24x24/actions/dialog-no.png
+share/icons/Gion/24x24/actions/dialog-ok.png
+share/icons/Gion/24x24/actions/dialog-yes.png
+share/icons/Gion/24x24/actions/document-new.png
+share/icons/Gion/24x24/actions/document-open.png
+share/icons/Gion/24x24/actions/document-properties.png
+share/icons/Gion/24x24/actions/down.png
+share/icons/Gion/24x24/actions/edit-copy.png
+share/icons/Gion/24x24/actions/edit-find-replace.png
+share/icons/Gion/24x24/actions/edit-find.png
+share/icons/Gion/24x24/actions/edit-paste.png
+share/icons/Gion/24x24/actions/edit.png
+share/icons/Gion/24x24/actions/editcopy.png
+share/icons/Gion/24x24/actions/editpaste.png
+share/icons/Gion/24x24/actions/filefind.png
+share/icons/Gion/24x24/actions/filenew.png
+share/icons/Gion/24x24/actions/fileopen.png
+share/icons/Gion/24x24/actions/find.png
+share/icons/Gion/24x24/actions/finish.png
+share/icons/Gion/24x24/actions/forward.png
+share/icons/Gion/24x24/actions/gnome-searchtool.png
+share/icons/Gion/24x24/actions/go-bottom.png
+share/icons/Gion/24x24/actions/go-down.png
+share/icons/Gion/24x24/actions/go-first.png
+share/icons/Gion/24x24/actions/go-home.png
+share/icons/Gion/24x24/actions/go-last.png
+share/icons/Gion/24x24/actions/go-next.png
+share/icons/Gion/24x24/actions/go-previous.png
+share/icons/Gion/24x24/actions/go-top.png
+share/icons/Gion/24x24/actions/go-up.png
+share/icons/Gion/24x24/actions/gohome.png
+share/icons/Gion/24x24/actions/gtk-add.png
+share/icons/Gion/24x24/actions/gtk-cancel.png
+share/icons/Gion/24x24/actions/gtk-copy.png
+share/icons/Gion/24x24/actions/gtk-find-and-replace.png
+share/icons/Gion/24x24/actions/gtk-find.png
+share/icons/Gion/24x24/actions/gtk-go-back-ltr.png
+share/icons/Gion/24x24/actions/gtk-go-back-rtl.png
+share/icons/Gion/24x24/actions/gtk-go-down.png
+share/icons/Gion/24x24/actions/gtk-go-forward-ltr.png
+share/icons/Gion/24x24/actions/gtk-go-forward-rtl.png
+share/icons/Gion/24x24/actions/gtk-go-up.png
+share/icons/Gion/24x24/actions/gtk-goto-bottom.png
+share/icons/Gion/24x24/actions/gtk-goto-first-ltr.png
+share/icons/Gion/24x24/actions/gtk-goto-first-rtl.png
+share/icons/Gion/24x24/actions/gtk-goto-last-ltr.png
+share/icons/Gion/24x24/actions/gtk-goto-last-rtl.png
+share/icons/Gion/24x24/actions/gtk-goto-top.png
+share/icons/Gion/24x24/actions/gtk-home.png
+share/icons/Gion/24x24/actions/gtk-new.png
+share/icons/Gion/24x24/actions/gtk-open.png
+share/icons/Gion/24x24/actions/gtk-paste.png
+share/icons/Gion/24x24/actions/gtk-properties.png
+share/icons/Gion/24x24/actions/gtk-refresh.png
+share/icons/Gion/24x24/actions/gtk-remove.png
+share/icons/Gion/24x24/actions/gtk-stop.png
+share/icons/Gion/24x24/actions/kfind.png
+share/icons/Gion/24x24/actions/kfm_home.png
+share/icons/Gion/24x24/actions/list-add.png
+share/icons/Gion/24x24/actions/list-remove.png
+share/icons/Gion/24x24/actions/next.png
+share/icons/Gion/24x24/actions/previous.png
+share/icons/Gion/24x24/actions/process-stop.png
+share/icons/Gion/24x24/actions/redhat-home.png
+share/icons/Gion/24x24/actions/reload.png
+share/icons/Gion/24x24/actions/reload3.png
+share/icons/Gion/24x24/actions/reload_all_tabs.png
+share/icons/Gion/24x24/actions/reload_page.png
+share/icons/Gion/24x24/actions/remove.png
+share/icons/Gion/24x24/actions/search.png
+share/icons/Gion/24x24/actions/start.png
+share/icons/Gion/24x24/actions/stock_add-bookmark.png
+share/icons/Gion/24x24/actions/stock_bottom.png
+share/icons/Gion/24x24/actions/stock_copy.png
+share/icons/Gion/24x24/actions/stock_down.png
+share/icons/Gion/24x24/actions/stock_file-properites.png
+share/icons/Gion/24x24/actions/stock_first.png
+share/icons/Gion/24x24/actions/stock_help-add-bookmark.png
+share/icons/Gion/24x24/actions/stock_home.png
+share/icons/Gion/24x24/actions/stock_last.png
+share/icons/Gion/24x24/actions/stock_left.png
+share/icons/Gion/24x24/actions/stock_new-text.png
+share/icons/Gion/24x24/actions/stock_paste.png
+share/icons/Gion/24x24/actions/stock_properties.png
+share/icons/Gion/24x24/actions/stock_refresh.png
+share/icons/Gion/24x24/actions/stock_right.png
+share/icons/Gion/24x24/actions/stock_search-and-replace.png
+share/icons/Gion/24x24/actions/stock_search.png
+share/icons/Gion/24x24/actions/stock_stop.png
+share/icons/Gion/24x24/actions/stock_top.png
+share/icons/Gion/24x24/actions/stock_up.png
+share/icons/Gion/24x24/actions/stop.png
+share/icons/Gion/24x24/actions/system-search.png
+share/icons/Gion/24x24/actions/top.png
+share/icons/Gion/24x24/actions/up.png
+share/icons/Gion/24x24/actions/view-refresh.png
+share/icons/Gion/24x24/apps/accessories-archiver.png
+share/icons/Gion/24x24/apps/browser.png
+share/icons/Gion/24x24/apps/email.png
+share/icons/Gion/24x24/apps/epiphany-bookmarks.png
+share/icons/Gion/24x24/apps/evolution.png
+share/icons/Gion/24x24/apps/gnome-help.png
+share/icons/Gion/24x24/apps/gnome-terminal.png
+share/icons/Gion/24x24/apps/gtk-help.png
+share/icons/Gion/24x24/apps/help-browser.png
+share/icons/Gion/24x24/apps/help.png
+share/icons/Gion/24x24/apps/internet-mail.png
+share/icons/Gion/24x24/apps/internet-web-browser.png
+share/icons/Gion/24x24/apps/khelpcenter.png
+share/icons/Gion/24x24/apps/konsole.png
+share/icons/Gion/24x24/apps/mail_generic.png
+share/icons/Gion/24x24/apps/music-player.png
+share/icons/Gion/24x24/apps/openterm.png
+share/icons/Gion/24x24/apps/redhat-email.png
+share/icons/Gion/24x24/apps/redhat-web-browser.png
+share/icons/Gion/24x24/apps/stock_help.png
+share/icons/Gion/24x24/apps/susehelpcenter.png
+share/icons/Gion/24x24/apps/terminal.png
+share/icons/Gion/24x24/apps/utilities-terminal.png
+share/icons/Gion/24x24/apps/web-browser.png
+share/icons/Gion/24x24/apps/xfce-mail.png
+share/icons/Gion/24x24/apps/xfce-terminal.png
+share/icons/Gion/24x24/devices/computer.png
+share/icons/Gion/24x24/devices/drive-harddisk.png
+share/icons/Gion/24x24/devices/drive-removable-media.png
+share/icons/Gion/24x24/devices/gnome-dev-computer.png
+share/icons/Gion/24x24/devices/gnome-dev-harddisk-1394.png
+share/icons/Gion/24x24/devices/gnome-dev-harddisk-usb.png
+share/icons/Gion/24x24/devices/gnome-dev-harddisk.png
+share/icons/Gion/24x24/devices/gnome-dev-removable-1394.png
+share/icons/Gion/24x24/devices/gnome-dev-removable-usb.png
+share/icons/Gion/24x24/devices/gnome-dev-removable.png
+share/icons/Gion/24x24/devices/gnome-fs-client.png
+share/icons/Gion/24x24/devices/gtk-harddisk.png
+share/icons/Gion/24x24/devices/harddrive.png
+share/icons/Gion/24x24/devices/hdd_unmount.png
+share/icons/Gion/24x24/devices/media-cdrom-audio.png
+share/icons/Gion/24x24/devices/media-cdrom.png
+share/icons/Gion/24x24/devices/media-cdrw.png
+share/icons/Gion/24x24/devices/media-dvd.png
+share/icons/Gion/24x24/devices/media-dvdrw.png
+share/icons/Gion/24x24/devices/system.png
+share/icons/Gion/24x24/devices/usbpendrive_unmount.png
+share/icons/Gion/24x24/devices/yast_HD.png
+share/icons/Gion/24x24/devices/yast_idetude.png
+share/icons/Gion/24x24/mimetypes/application-certificate.png
+share/icons/Gion/24x24/mimetypes/ascii.png
+share/icons/Gion/24x24/mimetypes/audio-x-generic.png
+share/icons/Gion/24x24/mimetypes/deb.png
+share/icons/Gion/24x24/mimetypes/document.png
+share/icons/Gion/24x24/mimetypes/empty.png
+share/icons/Gion/24x24/mimetypes/folder_tar.png
+share/icons/Gion/24x24/mimetypes/gnome-mime-application-msword.png
+share/icons/Gion/24x24/mimetypes/gnome-mime-application-ogg.png
+share/icons/Gion/24x24/mimetypes/gnome-mime-application-pdf.png
+share/icons/Gion/24x24/mimetypes/gnome-mime-application-postscript.png
+share/icons/Gion/24x24/mimetypes/gnome-mime-application-rtf.png
+share/icons/Gion/24x24/mimetypes/gnome-mime-application-vnd.lotus-1-2-3.png
+share/icons/Gion/24x24/mimetypes/gnome-mime-application-vnd.ms-excel.png
+share/icons/Gion/24x24/mimetypes/gnome-mime-application-vnd.oasis.opendocument.spreadsheet.png
+share/icons/Gion/24x24/mimetypes/gnome-mime-application-vnd.oasis.opendocument.text-web.png
+share/icons/Gion/24x24/mimetypes/gnome-mime-application-vnd.oasis.opendocument.text.png
+share/icons/Gion/24x24/mimetypes/gnome-mime-application-vnd.stardivision.calc.png
+share/icons/Gion/24x24/mimetypes/gnome-mime-application-vnd.stardivision.writer.png
+share/icons/Gion/24x24/mimetypes/gnome-mime-application-vnd.sun.xml.calc.png
+share/icons/Gion/24x24/mimetypes/gnome-mime-application-vnd.sun.xml.writer.png
+share/icons/Gion/24x24/mimetypes/gnome-mime-application-wordperfect.png
+share/icons/Gion/24x24/mimetypes/gnome-mime-application-x-7z-compressed.png
+share/icons/Gion/24x24/mimetypes/gnome-mime-application-x-abiword.png
+share/icons/Gion/24x24/mimetypes/gnome-mime-application-x-applix-spreadsheet.png
+share/icons/Gion/24x24/mimetypes/gnome-mime-application-x-applix-word.png
+share/icons/Gion/24x24/mimetypes/gnome-mime-application-x-archive.png
+share/icons/Gion/24x24/mimetypes/gnome-mime-application-x-arj.png
+share/icons/Gion/24x24/mimetypes/gnome-mime-application-x-bzip-compressed-tar.png
+share/icons/Gion/24x24/mimetypes/gnome-mime-application-x-bzip.png
+share/icons/Gion/24x24/mimetypes/gnome-mime-application-x-compress.png
+share/icons/Gion/24x24/mimetypes/gnome-mime-application-x-compressed-tar.png
+share/icons/Gion/24x24/mimetypes/gnome-mime-application-x-cpio-compressed.png
+share/icons/Gion/24x24/mimetypes/gnome-mime-application-x-cpio.png
+share/icons/Gion/24x24/mimetypes/gnome-mime-application-x-deb.png
+share/icons/Gion/24x24/mimetypes/gnome-mime-application-x-dvi.png
+share/icons/Gion/24x24/mimetypes/gnome-mime-application-x-gnumeric.png
+share/icons/Gion/24x24/mimetypes/gnome-mime-application-x-gzip.png
+share/icons/Gion/24x24/mimetypes/gnome-mime-application-x-gzpostscript.png
+share/icons/Gion/24x24/mimetypes/gnome-mime-application-x-jar.png
+share/icons/Gion/24x24/mimetypes/gnome-mime-application-x-killustrator.png
+share/icons/Gion/24x24/mimetypes/gnome-mime-application-x-kspread.png
+share/icons/Gion/24x24/mimetypes/gnome-mime-application-x-kword.png
+share/icons/Gion/24x24/mimetypes/gnome-mime-application-x-lha.png
+share/icons/Gion/24x24/mimetypes/gnome-mime-application-x-lhz.png
+share/icons/Gion/24x24/mimetypes/gnome-mime-application-x-perl.png
+share/icons/Gion/24x24/mimetypes/gnome-mime-application-x-php.png
+share/icons/Gion/24x24/mimetypes/gnome-mime-application-x-python-bytecode.png
+share/icons/Gion/24x24/mimetypes/gnome-mime-application-x-rar.png
+share/icons/Gion/24x24/mimetypes/gnome-mime-application-x-rpm.png
+share/icons/Gion/24x24/mimetypes/gnome-mime-application-x-scribus.png
+share/icons/Gion/24x24/mimetypes/gnome-mime-application-x-shellscript.png
+share/icons/Gion/24x24/mimetypes/gnome-mime-application-x-stuffit.png
+share/icons/Gion/24x24/mimetypes/gnome-mime-application-x-tar.png
+share/icons/Gion/24x24/mimetypes/gnome-mime-application-x-tarz.png
+share/icons/Gion/24x24/mimetypes/gnome-mime-application-x-tex.png
+share/icons/Gion/24x24/mimetypes/gnome-mime-application-xhtml+xml.png
+share/icons/Gion/24x24/mimetypes/gnome-mime-application-zip.png
+share/icons/Gion/24x24/mimetypes/gnome-mime-audio.png
+share/icons/Gion/24x24/mimetypes/gnome-mime-image.png
+share/icons/Gion/24x24/mimetypes/gnome-mime-text-html.png
+share/icons/Gion/24x24/mimetypes/gnome-mime-text-vnd.wap.wml.png
+share/icons/Gion/24x24/mimetypes/gnome-mime-text-x-csh.png
+share/icons/Gion/24x24/mimetypes/gnome-mime-text-x-python.png
+share/icons/Gion/24x24/mimetypes/gnome-mime-text-x-sh.png
+share/icons/Gion/24x24/mimetypes/gnome-mime-text-x-zsh.png
+share/icons/Gion/24x24/mimetypes/gnome-mime-text.png
+share/icons/Gion/24x24/mimetypes/gnome-package.png
+share/icons/Gion/24x24/mimetypes/html.png
+share/icons/Gion/24x24/mimetypes/image-x-generic.png
+share/icons/Gion/24x24/mimetypes/image.png
+share/icons/Gion/24x24/mimetypes/mime_ascii.png
+share/icons/Gion/24x24/mimetypes/misc.png
+share/icons/Gion/24x24/mimetypes/other-desktop.png
+share/icons/Gion/24x24/mimetypes/package-x-generic.png
+share/icons/Gion/24x24/mimetypes/package.png
+share/icons/Gion/24x24/mimetypes/package_editors.png
+share/icons/Gion/24x24/mimetypes/package_wordprocessing.png
+share/icons/Gion/24x24/mimetypes/rpm.png
+share/icons/Gion/24x24/mimetypes/shellscript.png
+share/icons/Gion/24x24/mimetypes/sound.png
+share/icons/Gion/24x24/mimetypes/spreadsheet.png
+share/icons/Gion/24x24/mimetypes/stock_certificate.png
+share/icons/Gion/24x24/mimetypes/stock_script.png
+share/icons/Gion/24x24/mimetypes/tar.png
+share/icons/Gion/24x24/mimetypes/text-html.png
+share/icons/Gion/24x24/mimetypes/text-x-authors.png
+share/icons/Gion/24x24/mimetypes/text-x-changelog.png
+share/icons/Gion/24x24/mimetypes/text-x-copying.png
+share/icons/Gion/24x24/mimetypes/text-x-generic.png
+share/icons/Gion/24x24/mimetypes/text-x-install.png
+share/icons/Gion/24x24/mimetypes/text-x-readme.png
+share/icons/Gion/24x24/mimetypes/text-x-script.png
+share/icons/Gion/24x24/mimetypes/text-x-source.png
+share/icons/Gion/24x24/mimetypes/tgz.png
+share/icons/Gion/24x24/mimetypes/txt.png
+share/icons/Gion/24x24/mimetypes/txt2.png
+share/icons/Gion/24x24/mimetypes/unknown.png
+share/icons/Gion/24x24/mimetypes/wordprocessing.png
+share/icons/Gion/24x24/mimetypes/www.png
+share/icons/Gion/24x24/mimetypes/x-office-document.png
+share/icons/Gion/24x24/mimetypes/x-office-spreadsheet.png
+share/icons/Gion/24x24/mimetypes/zip.png
+share/icons/Gion/24x24/places/application-x-gnome-saved-search.png
+share/icons/Gion/24x24/places/desktop.png
+share/icons/Gion/24x24/places/emptytrash.png
+share/icons/Gion/24x24/places/folder-remote.png
+share/icons/Gion/24x24/places/folder-saved-search.png
+share/icons/Gion/24x24/places/folder.png
+share/icons/Gion/24x24/places/folder_home.png
+share/icons/Gion/24x24/places/gnome-fs-desktop.png
+share/icons/Gion/24x24/places/gnome-fs-directory.png
+share/icons/Gion/24x24/places/gnome-fs-ftp.png
+share/icons/Gion/24x24/places/gnome-fs-home.png
+share/icons/Gion/24x24/places/gnome-fs-nfs.png
+share/icons/Gion/24x24/places/gnome-fs-share.png
+share/icons/Gion/24x24/places/gnome-fs-smb.png
+share/icons/Gion/24x24/places/gnome-fs-ssh.png
+share/icons/Gion/24x24/places/gnome-fs-trash-empty.png
+share/icons/Gion/24x24/places/gnome-mime-x-directory-smb-share.png
+share/icons/Gion/24x24/places/gnome-stock-trash.png
+share/icons/Gion/24x24/places/network.png
+share/icons/Gion/24x24/places/stock_folder.png
+share/icons/Gion/24x24/places/trashcan_empty.png
+share/icons/Gion/24x24/places/user-desktop.png
+share/icons/Gion/24x24/places/user-home.png
+share/icons/Gion/24x24/places/user-trash.png
+share/icons/Gion/24x24/places/xfce-trash_empty.png
+share/icons/Gion/24x24/status/edittrash.png
+share/icons/Gion/24x24/status/folder-drag-accept.png
+share/icons/Gion/24x24/status/folder-open.png
+share/icons/Gion/24x24/status/folder-visiting.png
+share/icons/Gion/24x24/status/folder_open.png
+share/icons/Gion/24x24/status/gnome-fs-directory-accept.png
+share/icons/Gion/24x24/status/gnome-fs-directory-visiting.png
+share/icons/Gion/24x24/status/gnome-fs-trash-full.png
+share/icons/Gion/24x24/status/gnome-stock-trash-full.png
+share/icons/Gion/24x24/status/stock_open.png
+share/icons/Gion/24x24/status/stock_trash_full.png
+share/icons/Gion/24x24/status/trashcan_full.png
+share/icons/Gion/24x24/status/user-trash-full.png
+share/icons/Gion/24x24/status/xfce-trash_full.png
+share/icons/Gion/48x48/actions/back.png
+share/icons/Gion/48x48/actions/bookmark-new.png
+share/icons/Gion/48x48/actions/bookmark_add.png
+share/icons/Gion/48x48/actions/bookmarks_list_add.png
+share/icons/Gion/48x48/actions/document-open.png
+share/icons/Gion/48x48/actions/document-properties.png
+share/icons/Gion/48x48/actions/down.png
+share/icons/Gion/48x48/actions/fileopen.png
+share/icons/Gion/48x48/actions/forward.png
+share/icons/Gion/48x48/actions/go-down.png
+share/icons/Gion/48x48/actions/go-next.png
+share/icons/Gion/48x48/actions/go-previous.png
+share/icons/Gion/48x48/actions/go-up.png
+share/icons/Gion/48x48/actions/gtk-go-back-ltr.png
+share/icons/Gion/48x48/actions/gtk-go-back-rtl.png
+share/icons/Gion/48x48/actions/gtk-go-down.png
+share/icons/Gion/48x48/actions/gtk-go-forward-ltr.png
+share/icons/Gion/48x48/actions/gtk-go-forward-rtl.png
+share/icons/Gion/48x48/actions/gtk-go-up.png
+share/icons/Gion/48x48/actions/gtk-open.png
+share/icons/Gion/48x48/actions/gtk-properties.png
+share/icons/Gion/48x48/actions/gtk-refresh.png
+share/icons/Gion/48x48/actions/gtk-stop.png
+share/icons/Gion/48x48/actions/next.png
+share/icons/Gion/48x48/actions/previous.png
+share/icons/Gion/48x48/actions/process-stop.png
+share/icons/Gion/48x48/actions/reload.png
+share/icons/Gion/48x48/actions/reload3.png
+share/icons/Gion/48x48/actions/reload_all_tabs.png
+share/icons/Gion/48x48/actions/reload_page.png
+share/icons/Gion/48x48/actions/stock_add-bookmark.png
+share/icons/Gion/48x48/actions/stock_down.png
+share/icons/Gion/48x48/actions/stock_file-properites.png
+share/icons/Gion/48x48/actions/stock_help-add-bookmark.png
+share/icons/Gion/48x48/actions/stock_left.png
+share/icons/Gion/48x48/actions/stock_properties.png
+share/icons/Gion/48x48/actions/stock_refresh.png
+share/icons/Gion/48x48/actions/stock_right.png
+share/icons/Gion/48x48/actions/stock_stop.png
+share/icons/Gion/48x48/actions/stock_up.png
+share/icons/Gion/48x48/actions/stop.png
+share/icons/Gion/48x48/actions/up.png
+share/icons/Gion/48x48/actions/view-refresh.png
+share/icons/Gion/48x48/apps/accessories-archiver.png
+share/icons/Gion/48x48/apps/browser.png
+share/icons/Gion/48x48/apps/email.png
+share/icons/Gion/48x48/apps/evolution.png
+share/icons/Gion/48x48/apps/gnome-terminal.png
+share/icons/Gion/48x48/apps/internet-mail.png
+share/icons/Gion/48x48/apps/internet-web-browser.png
+share/icons/Gion/48x48/apps/konsole.png
+share/icons/Gion/48x48/apps/mail_generic.png
+share/icons/Gion/48x48/apps/music-player.png
+share/icons/Gion/48x48/apps/openterm.png
+share/icons/Gion/48x48/apps/redhat-email.png
+share/icons/Gion/48x48/apps/redhat-web-browser.png
+share/icons/Gion/48x48/apps/terminal.png
+share/icons/Gion/48x48/apps/utilities-terminal.png
+share/icons/Gion/48x48/apps/web-browser.png
+share/icons/Gion/48x48/apps/xfce-mail.png
+share/icons/Gion/48x48/apps/xfce-terminal.png
+share/icons/Gion/48x48/categories/applications-internet.png
+share/icons/Gion/48x48/categories/gnome-globe.png
+share/icons/Gion/48x48/categories/package_network.png
+share/icons/Gion/48x48/categories/redhat-internet.png
+share/icons/Gion/48x48/categories/stock_internet.png
+share/icons/Gion/48x48/categories/xfce-internet.png
+share/icons/Gion/48x48/devices/computer.png
+share/icons/Gion/48x48/devices/drive-harddisk.png
+share/icons/Gion/48x48/devices/drive-removable-media.png
+share/icons/Gion/48x48/devices/gnome-dev-computer.png
+share/icons/Gion/48x48/devices/gnome-dev-harddisk-1394.png
+share/icons/Gion/48x48/devices/gnome-dev-harddisk-usb.png
+share/icons/Gion/48x48/devices/gnome-dev-harddisk.png
+share/icons/Gion/48x48/devices/gnome-dev-removable-1394.png
+share/icons/Gion/48x48/devices/gnome-dev-removable-usb.png
+share/icons/Gion/48x48/devices/gnome-dev-removable.png
+share/icons/Gion/48x48/devices/gnome-fs-client.png
+share/icons/Gion/48x48/devices/gtk-harddisk.png
+share/icons/Gion/48x48/devices/harddrive.png
+share/icons/Gion/48x48/devices/hdd_unmount.png
+share/icons/Gion/48x48/devices/media-cdrom-audio.png
+share/icons/Gion/48x48/devices/media-cdrom.png
+share/icons/Gion/48x48/devices/media-cdrw.png
+share/icons/Gion/48x48/devices/media-dvd.png
+share/icons/Gion/48x48/devices/media-dvdrw.png
+share/icons/Gion/48x48/devices/system.png
+share/icons/Gion/48x48/devices/usbpendrive_unmount.png
+share/icons/Gion/48x48/devices/yast_HD.png
+share/icons/Gion/48x48/devices/yast_idetude.png
+share/icons/Gion/48x48/mimetypes/application-certificate.png
+share/icons/Gion/48x48/mimetypes/ascii.png
+share/icons/Gion/48x48/mimetypes/audio-x-generic.png
+share/icons/Gion/48x48/mimetypes/deb.png
+share/icons/Gion/48x48/mimetypes/document.png
+share/icons/Gion/48x48/mimetypes/empty.png
+share/icons/Gion/48x48/mimetypes/folder_tar.png
+share/icons/Gion/48x48/mimetypes/gnome-mime-application-msword.png
+share/icons/Gion/48x48/mimetypes/gnome-mime-application-ogg.png
+share/icons/Gion/48x48/mimetypes/gnome-mime-application-pdf.png
+share/icons/Gion/48x48/mimetypes/gnome-mime-application-postscript.png
+share/icons/Gion/48x48/mimetypes/gnome-mime-application-rtf.png
+share/icons/Gion/48x48/mimetypes/gnome-mime-application-vnd.lotus-1-2-3.png
+share/icons/Gion/48x48/mimetypes/gnome-mime-application-vnd.ms-excel.png
+share/icons/Gion/48x48/mimetypes/gnome-mime-application-vnd.oasis.opendocument.spreadsheet.png
+share/icons/Gion/48x48/mimetypes/gnome-mime-application-vnd.oasis.opendocument.text-web.png
+share/icons/Gion/48x48/mimetypes/gnome-mime-application-vnd.oasis.opendocument.text.png
+share/icons/Gion/48x48/mimetypes/gnome-mime-application-vnd.stardivision.calc.png
+share/icons/Gion/48x48/mimetypes/gnome-mime-application-vnd.stardivision.writer.png
+share/icons/Gion/48x48/mimetypes/gnome-mime-application-vnd.sun.xml.calc.png
+share/icons/Gion/48x48/mimetypes/gnome-mime-application-vnd.sun.xml.writer.png
+share/icons/Gion/48x48/mimetypes/gnome-mime-application-wordperfect.png
+share/icons/Gion/48x48/mimetypes/gnome-mime-application-x-7z-compressed.png
+share/icons/Gion/48x48/mimetypes/gnome-mime-application-x-abiword.png
+share/icons/Gion/48x48/mimetypes/gnome-mime-application-x-applix-spreadsheet.png
+share/icons/Gion/48x48/mimetypes/gnome-mime-application-x-applix-word.png
+share/icons/Gion/48x48/mimetypes/gnome-mime-application-x-archive.png
+share/icons/Gion/48x48/mimetypes/gnome-mime-application-x-arj.png
+share/icons/Gion/48x48/mimetypes/gnome-mime-application-x-bzip-compressed-tar.png
+share/icons/Gion/48x48/mimetypes/gnome-mime-application-x-bzip.png
+share/icons/Gion/48x48/mimetypes/gnome-mime-application-x-compress.png
+share/icons/Gion/48x48/mimetypes/gnome-mime-application-x-compressed-tar.png
+share/icons/Gion/48x48/mimetypes/gnome-mime-application-x-cpio-compressed.png
+share/icons/Gion/48x48/mimetypes/gnome-mime-application-x-cpio.png
+share/icons/Gion/48x48/mimetypes/gnome-mime-application-x-deb.png
+share/icons/Gion/48x48/mimetypes/gnome-mime-application-x-dvi.png
+share/icons/Gion/48x48/mimetypes/gnome-mime-application-x-gnumeric.png
+share/icons/Gion/48x48/mimetypes/gnome-mime-application-x-gzip.png
+share/icons/Gion/48x48/mimetypes/gnome-mime-application-x-gzpostscript.png
+share/icons/Gion/48x48/mimetypes/gnome-mime-application-x-jar.png
+share/icons/Gion/48x48/mimetypes/gnome-mime-application-x-killustrator.png
+share/icons/Gion/48x48/mimetypes/gnome-mime-application-x-kspread.png
+share/icons/Gion/48x48/mimetypes/gnome-mime-application-x-kword.png
+share/icons/Gion/48x48/mimetypes/gnome-mime-application-x-lha.png
+share/icons/Gion/48x48/mimetypes/gnome-mime-application-x-lhz.png
+share/icons/Gion/48x48/mimetypes/gnome-mime-application-x-perl.png
+share/icons/Gion/48x48/mimetypes/gnome-mime-application-x-php.png
+share/icons/Gion/48x48/mimetypes/gnome-mime-application-x-python-bytecode.png
+share/icons/Gion/48x48/mimetypes/gnome-mime-application-x-rar.png
+share/icons/Gion/48x48/mimetypes/gnome-mime-application-x-rpm.png
+share/icons/Gion/48x48/mimetypes/gnome-mime-application-x-scribus.png
+share/icons/Gion/48x48/mimetypes/gnome-mime-application-x-shellscript.png
+share/icons/Gion/48x48/mimetypes/gnome-mime-application-x-stuffit.png
+share/icons/Gion/48x48/mimetypes/gnome-mime-application-x-tar.png
+share/icons/Gion/48x48/mimetypes/gnome-mime-application-x-tarz.png
+share/icons/Gion/48x48/mimetypes/gnome-mime-application-x-tex.png
+share/icons/Gion/48x48/mimetypes/gnome-mime-application-xhtml+xml.png
+share/icons/Gion/48x48/mimetypes/gnome-mime-application-zip.png
+share/icons/Gion/48x48/mimetypes/gnome-mime-audio.png
+share/icons/Gion/48x48/mimetypes/gnome-mime-image.png
+share/icons/Gion/48x48/mimetypes/gnome-mime-text-html.png
+share/icons/Gion/48x48/mimetypes/gnome-mime-text-vnd.wap.wml.png
+share/icons/Gion/48x48/mimetypes/gnome-mime-text-x-csh.png
+share/icons/Gion/48x48/mimetypes/gnome-mime-text-x-python.png
+share/icons/Gion/48x48/mimetypes/gnome-mime-text-x-sh.png
+share/icons/Gion/48x48/mimetypes/gnome-mime-text-x-zsh.png
+share/icons/Gion/48x48/mimetypes/gnome-mime-text.png
+share/icons/Gion/48x48/mimetypes/gnome-package.png
+share/icons/Gion/48x48/mimetypes/html.png
+share/icons/Gion/48x48/mimetypes/image-x-generic.png
+share/icons/Gion/48x48/mimetypes/image.png
+share/icons/Gion/48x48/mimetypes/mime_ascii.png
+share/icons/Gion/48x48/mimetypes/misc.png
+share/icons/Gion/48x48/mimetypes/other-desktop.png
+share/icons/Gion/48x48/mimetypes/package-x-generic.png
+share/icons/Gion/48x48/mimetypes/package.png
+share/icons/Gion/48x48/mimetypes/package_editors.png
+share/icons/Gion/48x48/mimetypes/package_wordprocessing.png
+share/icons/Gion/48x48/mimetypes/rpm.png
+share/icons/Gion/48x48/mimetypes/shellscript.png
+share/icons/Gion/48x48/mimetypes/sound.png
+share/icons/Gion/48x48/mimetypes/spreadsheet.png
+share/icons/Gion/48x48/mimetypes/stock_certificate.png
+share/icons/Gion/48x48/mimetypes/stock_script.png
+share/icons/Gion/48x48/mimetypes/tar.png
+share/icons/Gion/48x48/mimetypes/text-html.png
+share/icons/Gion/48x48/mimetypes/text-x-authors.png
+share/icons/Gion/48x48/mimetypes/text-x-changelog.png
+share/icons/Gion/48x48/mimetypes/text-x-copying.png
+share/icons/Gion/48x48/mimetypes/text-x-generic.png
+share/icons/Gion/48x48/mimetypes/text-x-install.png
+share/icons/Gion/48x48/mimetypes/text-x-readme.png
+share/icons/Gion/48x48/mimetypes/text-x-script.png
+share/icons/Gion/48x48/mimetypes/text-x-source.png
+share/icons/Gion/48x48/mimetypes/tgz.png
+share/icons/Gion/48x48/mimetypes/txt.png
+share/icons/Gion/48x48/mimetypes/txt2.png
+share/icons/Gion/48x48/mimetypes/unknown.png
+share/icons/Gion/48x48/mimetypes/wordprocessing.png
+share/icons/Gion/48x48/mimetypes/www.png
+share/icons/Gion/48x48/mimetypes/x-office-document.png
+share/icons/Gion/48x48/mimetypes/x-office-spreadsheet.png
+share/icons/Gion/48x48/mimetypes/zip.png
+share/icons/Gion/48x48/places/application-x-gnome-saved-search.png
+share/icons/Gion/48x48/places/desktop.png
+share/icons/Gion/48x48/places/emptytrash.png
+share/icons/Gion/48x48/places/folder-remote.png
+share/icons/Gion/48x48/places/folder-saved-search.png
+share/icons/Gion/48x48/places/folder.png
+share/icons/Gion/48x48/places/folder_home.png
+share/icons/Gion/48x48/places/gnome-fs-desktop.png
+share/icons/Gion/48x48/places/gnome-fs-directory.png
+share/icons/Gion/48x48/places/gnome-fs-ftp.png
+share/icons/Gion/48x48/places/gnome-fs-home.png
+share/icons/Gion/48x48/places/gnome-fs-nfs.png
+share/icons/Gion/48x48/places/gnome-fs-share.png
+share/icons/Gion/48x48/places/gnome-fs-smb.png
+share/icons/Gion/48x48/places/gnome-fs-ssh.png
+share/icons/Gion/48x48/places/gnome-fs-trash-empty.png
+share/icons/Gion/48x48/places/gnome-mime-x-directory-smb-share.png
+share/icons/Gion/48x48/places/gnome-stock-trash.png
+share/icons/Gion/48x48/places/network.png
+share/icons/Gion/48x48/places/stock_folder.png
+share/icons/Gion/48x48/places/trashcan_empty.png
+share/icons/Gion/48x48/places/user-desktop.png
+share/icons/Gion/48x48/places/user-home.png
+share/icons/Gion/48x48/places/user-trash.png
+share/icons/Gion/48x48/places/xfce-trash_empty.png
+share/icons/Gion/48x48/status/edittrash.png
+share/icons/Gion/48x48/status/folder-drag-accept.png
+share/icons/Gion/48x48/status/folder-open.png
+share/icons/Gion/48x48/status/folder-visiting.png
+share/icons/Gion/48x48/status/folder_open.png
+share/icons/Gion/48x48/status/gnome-fs-directory-accept.png
+share/icons/Gion/48x48/status/gnome-fs-directory-visiting.png
+share/icons/Gion/48x48/status/gnome-fs-trash-full.png
+share/icons/Gion/48x48/status/gnome-stock-trash-full.png
+share/icons/Gion/48x48/status/stock_open.png
+share/icons/Gion/48x48/status/stock_trash_full.png
+share/icons/Gion/48x48/status/trashcan_full.png
+share/icons/Gion/48x48/status/user-trash-full.png
+share/icons/Gion/48x48/status/xfce-trash_full.png
+share/icons/Gion/index.theme
+share/icons/Gion/scalable/actions/back.svg
+share/icons/Gion/scalable/actions/bookmark-new.svg
+share/icons/Gion/scalable/actions/bookmark_add.svg
+share/icons/Gion/scalable/actions/bookmarks_list_add.svg
+share/icons/Gion/scalable/actions/document-open.svg
+share/icons/Gion/scalable/actions/down.svg
+share/icons/Gion/scalable/actions/fileopen.svg
+share/icons/Gion/scalable/actions/forward.svg
+share/icons/Gion/scalable/actions/go-down.svg
+share/icons/Gion/scalable/actions/go-next.svg
+share/icons/Gion/scalable/actions/go-previous.svg
+share/icons/Gion/scalable/actions/go-up.svg
+share/icons/Gion/scalable/actions/gtk-go-back-ltr.svg
+share/icons/Gion/scalable/actions/gtk-go-back-rtl.svg
+share/icons/Gion/scalable/actions/gtk-go-down.svg
+share/icons/Gion/scalable/actions/gtk-go-forward-ltr.svg
+share/icons/Gion/scalable/actions/gtk-go-forward-rtl.svg
+share/icons/Gion/scalable/actions/gtk-go-up.svg
+share/icons/Gion/scalable/actions/gtk-open.svg
+share/icons/Gion/scalable/actions/gtk-refresh.svg
+share/icons/Gion/scalable/actions/gtk-stop.svg
+share/icons/Gion/scalable/actions/next.svg
+share/icons/Gion/scalable/actions/previous.svg
+share/icons/Gion/scalable/actions/process-stop.svg
+share/icons/Gion/scalable/actions/reload.svg
+share/icons/Gion/scalable/actions/reload3.svg
+share/icons/Gion/scalable/actions/reload_all_tabs.svg
+share/icons/Gion/scalable/actions/reload_page.svg
+share/icons/Gion/scalable/actions/stock_add-bookmark.svg
+share/icons/Gion/scalable/actions/stock_down.svg
+share/icons/Gion/scalable/actions/stock_help-add-bookmark.svg
+share/icons/Gion/scalable/actions/stock_left.svg
+share/icons/Gion/scalable/actions/stock_refresh.svg
+share/icons/Gion/scalable/actions/stock_right.svg
+share/icons/Gion/scalable/actions/stock_stop.svg
+share/icons/Gion/scalable/actions/stock_up.svg
+share/icons/Gion/scalable/actions/stop.svg
+share/icons/Gion/scalable/actions/up.svg
+share/icons/Gion/scalable/actions/view-refresh.svg
+share/icons/Gion/scalable/apps/accessories-archiver.svg
+share/icons/Gion/scalable/apps/browser.svg
+share/icons/Gion/scalable/apps/email.svg
+share/icons/Gion/scalable/apps/evolution.svg
+share/icons/Gion/scalable/apps/gnome-terminal.svg
+share/icons/Gion/scalable/apps/internet-mail.svg
+share/icons/Gion/scalable/apps/internet-web-browser.svg
+share/icons/Gion/scalable/apps/konsole.svg
+share/icons/Gion/scalable/apps/mail_generic.svg
+share/icons/Gion/scalable/apps/music-player.svg
+share/icons/Gion/scalable/apps/openterm.svg
+share/icons/Gion/scalable/apps/redhat-email.svg
+share/icons/Gion/scalable/apps/redhat-web-browser.svg
+share/icons/Gion/scalable/apps/terminal.svg
+share/icons/Gion/scalable/apps/utilities-terminal.svg
+share/icons/Gion/scalable/apps/web-browser.svg
+share/icons/Gion/scalable/apps/xfce-mail.svg
+share/icons/Gion/scalable/apps/xfce-terminal.svg
+share/icons/Gion/scalable/categories/applications-internet.svg
+share/icons/Gion/scalable/categories/gnome-globe.svg
+share/icons/Gion/scalable/categories/package_network.svg
+share/icons/Gion/scalable/categories/redhat-internet.svg
+share/icons/Gion/scalable/categories/stock_internet.svg
+share/icons/Gion/scalable/categories/xfce-internet.svg
+share/icons/Gion/scalable/devices/computer.svg
+share/icons/Gion/scalable/devices/drive-harddisk.svg
+share/icons/Gion/scalable/devices/drive-removable-media.svg
+share/icons/Gion/scalable/devices/gnome-dev-computer.svg
+share/icons/Gion/scalable/devices/gnome-dev-harddisk-1394.svg
+share/icons/Gion/scalable/devices/gnome-dev-harddisk-usb.svg
+share/icons/Gion/scalable/devices/gnome-dev-harddisk.svg
+share/icons/Gion/scalable/devices/gnome-dev-removable-1394.svg
+share/icons/Gion/scalable/devices/gnome-dev-removable-usb.svg
+share/icons/Gion/scalable/devices/gnome-dev-removable.svg
+share/icons/Gion/scalable/devices/gnome-fs-client.svg
+share/icons/Gion/scalable/devices/gtk-harddisk.svg
+share/icons/Gion/scalable/devices/harddrive.svg
+share/icons/Gion/scalable/devices/hdd_unmount.svg
+share/icons/Gion/scalable/devices/media-cdrom-audio.svg
+share/icons/Gion/scalable/devices/media-cdrom.svg
+share/icons/Gion/scalable/devices/media-cdrw.svg
+share/icons/Gion/scalable/devices/media-dvd.svg
+share/icons/Gion/scalable/devices/media-dvdrw.svg
+share/icons/Gion/scalable/devices/system.svg
+share/icons/Gion/scalable/devices/usbpendrive_unmount.svg
+share/icons/Gion/scalable/devices/yast_HD.svg
+share/icons/Gion/scalable/devices/yast_idetude.svg
+share/icons/Gion/scalable/mimetypes/application-certificate.svg
+share/icons/Gion/scalable/mimetypes/ascii.svg
+share/icons/Gion/scalable/mimetypes/audio-x-generic.svg
+share/icons/Gion/scalable/mimetypes/deb.svg
+share/icons/Gion/scalable/mimetypes/document.svg
+share/icons/Gion/scalable/mimetypes/empty.svg
+share/icons/Gion/scalable/mimetypes/folder_tar.svg
+share/icons/Gion/scalable/mimetypes/gnome-mime-application-msword.svg
+share/icons/Gion/scalable/mimetypes/gnome-mime-application-ogg.svg
+share/icons/Gion/scalable/mimetypes/gnome-mime-application-pdf.svg
+share/icons/Gion/scalable/mimetypes/gnome-mime-application-postscript.svg
+share/icons/Gion/scalable/mimetypes/gnome-mime-application-rtf.svg
+share/icons/Gion/scalable/mimetypes/gnome-mime-application-vnd.lotus-1-2-3.svg
+share/icons/Gion/scalable/mimetypes/gnome-mime-application-vnd.ms-excel.svg
+share/icons/Gion/scalable/mimetypes/gnome-mime-application-vnd.oasis.opendocument.spreadsheet.svg
+share/icons/Gion/scalable/mimetypes/gnome-mime-application-vnd.oasis.opendocument.text-web.svg
+share/icons/Gion/scalable/mimetypes/gnome-mime-application-vnd.oasis.opendocument.text.svg
+share/icons/Gion/scalable/mimetypes/gnome-mime-application-vnd.stardivision.calc.svg
+share/icons/Gion/scalable/mimetypes/gnome-mime-application-vnd.stardivision.writer.svg
+share/icons/Gion/scalable/mimetypes/gnome-mime-application-vnd.sun.xml.calc.svg
+share/icons/Gion/scalable/mimetypes/gnome-mime-application-vnd.sun.xml.writer.svg
+share/icons/Gion/scalable/mimetypes/gnome-mime-application-wordperfect.svg
+share/icons/Gion/scalable/mimetypes/gnome-mime-application-x-7z-compressed.svg
+share/icons/Gion/scalable/mimetypes/gnome-mime-application-x-abiword.svg
+share/icons/Gion/scalable/mimetypes/gnome-mime-application-x-applix-spreadsheet.svg
+share/icons/Gion/scalable/mimetypes/gnome-mime-application-x-applix-word.svg
+share/icons/Gion/scalable/mimetypes/gnome-mime-application-x-archive.svg
+share/icons/Gion/scalable/mimetypes/gnome-mime-application-x-arj.svg
+share/icons/Gion/scalable/mimetypes/gnome-mime-application-x-bzip-compressed-tar.svg
+share/icons/Gion/scalable/mimetypes/gnome-mime-application-x-bzip.svg
+share/icons/Gion/scalable/mimetypes/gnome-mime-application-x-compress.svg
+share/icons/Gion/scalable/mimetypes/gnome-mime-application-x-compressed-tar.svg
+share/icons/Gion/scalable/mimetypes/gnome-mime-application-x-cpio-compressed.svg
+share/icons/Gion/scalable/mimetypes/gnome-mime-application-x-cpio.svg
+share/icons/Gion/scalable/mimetypes/gnome-mime-application-x-deb.svg
+share/icons/Gion/scalable/mimetypes/gnome-mime-application-x-dvi.svg
+share/icons/Gion/scalable/mimetypes/gnome-mime-application-x-gnumeric.svg
+share/icons/Gion/scalable/mimetypes/gnome-mime-application-x-gzip.svg
+share/icons/Gion/scalable/mimetypes/gnome-mime-application-x-gzpostscript.svg
+share/icons/Gion/scalable/mimetypes/gnome-mime-application-x-jar.svg
+share/icons/Gion/scalable/mimetypes/gnome-mime-application-x-killustrator.svg
+share/icons/Gion/scalable/mimetypes/gnome-mime-application-x-kspread.svg
+share/icons/Gion/scalable/mimetypes/gnome-mime-application-x-kword.svg
+share/icons/Gion/scalable/mimetypes/gnome-mime-application-x-lha.svg
+share/icons/Gion/scalable/mimetypes/gnome-mime-application-x-lhz.svg
+share/icons/Gion/scalable/mimetypes/gnome-mime-application-x-perl.svg
+share/icons/Gion/scalable/mimetypes/gnome-mime-application-x-php.svg
+share/icons/Gion/scalable/mimetypes/gnome-mime-application-x-python-bytecode.svg
+share/icons/Gion/scalable/mimetypes/gnome-mime-application-x-rar.svg
+share/icons/Gion/scalable/mimetypes/gnome-mime-application-x-rpm.svg
+share/icons/Gion/scalable/mimetypes/gnome-mime-application-x-scribus.svg
+share/icons/Gion/scalable/mimetypes/gnome-mime-application-x-shellscript.svg
+share/icons/Gion/scalable/mimetypes/gnome-mime-application-x-stuffit.svg
+share/icons/Gion/scalable/mimetypes/gnome-mime-application-x-tar.svg
+share/icons/Gion/scalable/mimetypes/gnome-mime-application-x-tarz.svg
+share/icons/Gion/scalable/mimetypes/gnome-mime-application-x-tex.svg
+share/icons/Gion/scalable/mimetypes/gnome-mime-application-xhtml+xml.svg
+share/icons/Gion/scalable/mimetypes/gnome-mime-application-zip.svg
+share/icons/Gion/scalable/mimetypes/gnome-mime-audio.svg
+share/icons/Gion/scalable/mimetypes/gnome-mime-image.svg
+share/icons/Gion/scalable/mimetypes/gnome-mime-text-html.svg
+share/icons/Gion/scalable/mimetypes/gnome-mime-text-vnd.wap.wml.svg
+share/icons/Gion/scalable/mimetypes/gnome-mime-text-x-csh.svg
+share/icons/Gion/scalable/mimetypes/gnome-mime-text-x-python.svg
+share/icons/Gion/scalable/mimetypes/gnome-mime-text-x-sh.svg
+share/icons/Gion/scalable/mimetypes/gnome-mime-text-x-zsh.svg
+share/icons/Gion/scalable/mimetypes/gnome-mime-text.svg
+share/icons/Gion/scalable/mimetypes/gnome-package.svg
+share/icons/Gion/scalable/mimetypes/html.svg
+share/icons/Gion/scalable/mimetypes/image-x-generic.svg
+share/icons/Gion/scalable/mimetypes/image.svg
+share/icons/Gion/scalable/mimetypes/mime_ascii.svg
+share/icons/Gion/scalable/mimetypes/misc.svg
+share/icons/Gion/scalable/mimetypes/package-x-generic.svg
+share/icons/Gion/scalable/mimetypes/package.svg
+share/icons/Gion/scalable/mimetypes/package_editors.svg
+share/icons/Gion/scalable/mimetypes/package_wordprocessing.svg
+share/icons/Gion/scalable/mimetypes/rpm.svg
+share/icons/Gion/scalable/mimetypes/shellscript.svg
+share/icons/Gion/scalable/mimetypes/sound.svg
+share/icons/Gion/scalable/mimetypes/spreadsheet.svg
+share/icons/Gion/scalable/mimetypes/stock_certificate.svg
+share/icons/Gion/scalable/mimetypes/stock_script.svg
+share/icons/Gion/scalable/mimetypes/tar.svg
+share/icons/Gion/scalable/mimetypes/text-html.svg
+share/icons/Gion/scalable/mimetypes/text-x-authors.svg
+share/icons/Gion/scalable/mimetypes/text-x-changelog.svg
+share/icons/Gion/scalable/mimetypes/text-x-copying.svg
+share/icons/Gion/scalable/mimetypes/text-x-generic.svg
+share/icons/Gion/scalable/mimetypes/text-x-install.svg
+share/icons/Gion/scalable/mimetypes/text-x-readme.svg
+share/icons/Gion/scalable/mimetypes/text-x-script.svg
+share/icons/Gion/scalable/mimetypes/text-x-source.svg
+share/icons/Gion/scalable/mimetypes/tgz.svg
+share/icons/Gion/scalable/mimetypes/txt.svg
+share/icons/Gion/scalable/mimetypes/txt2.svg
+share/icons/Gion/scalable/mimetypes/unknown.svg
+share/icons/Gion/scalable/mimetypes/wordprocessing.svg
+share/icons/Gion/scalable/mimetypes/www.svg
+share/icons/Gion/scalable/mimetypes/x-office-document.svg
+share/icons/Gion/scalable/mimetypes/x-office-spreadsheet.svg
+share/icons/Gion/scalable/mimetypes/zip.svg
+share/icons/Gion/scalable/places/application-x-gnome-saved-search.svg
+share/icons/Gion/scalable/places/desktop.svg
+share/icons/Gion/scalable/places/emptytrash.svg
+share/icons/Gion/scalable/places/folder-remote.svg
+share/icons/Gion/scalable/places/folder-saved-search.svg
+share/icons/Gion/scalable/places/folder.svg
+share/icons/Gion/scalable/places/folder_home.svg
+share/icons/Gion/scalable/places/gnome-fs-desktop.svg
+share/icons/Gion/scalable/places/gnome-fs-directory.svg
+share/icons/Gion/scalable/places/gnome-fs-ftp.svg
+share/icons/Gion/scalable/places/gnome-fs-home.svg
+share/icons/Gion/scalable/places/gnome-fs-nfs.svg
+share/icons/Gion/scalable/places/gnome-fs-share.svg
+share/icons/Gion/scalable/places/gnome-fs-smb.svg
+share/icons/Gion/scalable/places/gnome-fs-ssh.svg
+share/icons/Gion/scalable/places/gnome-fs-trash-empty.svg
+share/icons/Gion/scalable/places/gnome-mime-x-directory-smb-share.svg
+share/icons/Gion/scalable/places/gnome-stock-trash.svg
+share/icons/Gion/scalable/places/network.svg
+share/icons/Gion/scalable/places/stock_folder.svg
+share/icons/Gion/scalable/places/trashcan_empty.svg
+share/icons/Gion/scalable/places/user-desktop.svg
+share/icons/Gion/scalable/places/user-home.svg
+share/icons/Gion/scalable/places/user-trash.svg
+share/icons/Gion/scalable/places/xfce-trash_empty.svg
+share/icons/Gion/scalable/status/edittrash.svg
+share/icons/Gion/scalable/status/folder-drag-accept.svg
+share/icons/Gion/scalable/status/folder-open.svg
+share/icons/Gion/scalable/status/folder-visiting.svg
+share/icons/Gion/scalable/status/folder_open.svg
+share/icons/Gion/scalable/status/gnome-fs-directory-accept.svg
+share/icons/Gion/scalable/status/gnome-fs-directory-visiting.svg
+share/icons/Gion/scalable/status/gnome-fs-trash-full.svg
+share/icons/Gion/scalable/status/gnome-stock-trash-full.svg
+share/icons/Gion/scalable/status/stock_open.svg
+share/icons/Gion/scalable/status/stock_trash_full.svg
+share/icons/Gion/scalable/status/trashcan_full.svg
+share/icons/Gion/scalable/status/user-trash-full.svg
+share/icons/Gion/scalable/status/xfce-trash_full.svg
+share/icons/Neu/128x128/actions/add.png
+share/icons/Neu/128x128/actions/address-book-new.png
+share/icons/Neu/128x128/actions/appointment-new.png
+share/icons/Neu/128x128/actions/appointment.png
+share/icons/Neu/128x128/actions/back.png
+share/icons/Neu/128x128/actions/bookmark-new.png
+share/icons/Neu/128x128/actions/bookmark_add.png
+share/icons/Neu/128x128/actions/bookmarks_list_add.png
+share/icons/Neu/128x128/actions/bottom.png
+share/icons/Neu/128x128/actions/centrejust.png
+share/icons/Neu/128x128/actions/contact-new.png
+share/icons/Neu/128x128/actions/document-new.png
+share/icons/Neu/128x128/actions/document-open.png
+share/icons/Neu/128x128/actions/document-print-preview.png
+share/icons/Neu/128x128/actions/document-print.png
+share/icons/Neu/128x128/actions/document-properties.png
+share/icons/Neu/128x128/actions/document-save-as.png
+share/icons/Neu/128x128/actions/document-save.png
+share/icons/Neu/128x128/actions/down.png
+share/icons/Neu/128x128/actions/edit-clear.png
+share/icons/Neu/128x128/actions/edit-copy.png
+share/icons/Neu/128x128/actions/edit-cut.png
+share/icons/Neu/128x128/actions/edit-delete.png
+share/icons/Neu/128x128/actions/edit-find-replace.png
+share/icons/Neu/128x128/actions/edit-find.png
+share/icons/Neu/128x128/actions/edit-paste.png
+share/icons/Neu/128x128/actions/edit-redo.png
+share/icons/Neu/128x128/actions/edit-select-all.png
+share/icons/Neu/128x128/actions/edit-undo.png
+share/icons/Neu/128x128/actions/editclear.png
+share/icons/Neu/128x128/actions/editcopy.png
+share/icons/Neu/128x128/actions/editcut.png
+share/icons/Neu/128x128/actions/editdelete.png
+share/icons/Neu/128x128/actions/editpaste.png
+share/icons/Neu/128x128/actions/exit.png
+share/icons/Neu/128x128/actions/filefind.png
+share/icons/Neu/128x128/actions/filenew.png
+share/icons/Neu/128x128/actions/fileopen.png
+share/icons/Neu/128x128/actions/fileprint.png
+share/icons/Neu/128x128/actions/filequickprint.png
+share/icons/Neu/128x128/actions/filesave.png
+share/icons/Neu/128x128/actions/filesaveas.png
+share/icons/Neu/128x128/actions/find.png
+share/icons/Neu/128x128/actions/finish.png
+share/icons/Neu/128x128/actions/folder-new.png
+share/icons/Neu/128x128/actions/folder_new.png
+share/icons/Neu/128x128/actions/format-indent-less.png
+share/icons/Neu/128x128/actions/format-indent-more.png
+share/icons/Neu/128x128/actions/format-justify-center.png
+share/icons/Neu/128x128/actions/format-justify-fill.png
+share/icons/Neu/128x128/actions/format-justify-left.png
+share/icons/Neu/128x128/actions/format-justify-right.png
+share/icons/Neu/128x128/actions/format-text-bold.png
+share/icons/Neu/128x128/actions/format-text-italic.png
+share/icons/Neu/128x128/actions/format-text-underline.png
+share/icons/Neu/128x128/actions/forward.png
+share/icons/Neu/128x128/actions/gnome-lockscreen.png
+share/icons/Neu/128x128/actions/gnome-logout.png
+share/icons/Neu/128x128/actions/gnome-searchtool.png
+share/icons/Neu/128x128/actions/gnome-stock-mail-fwd.png
+share/icons/Neu/128x128/actions/gnome-stock-mail-new.png
+share/icons/Neu/128x128/actions/gnome-stock-mail-rpl.png
+share/icons/Neu/128x128/actions/gnome-stock-text-indent.png
+share/icons/Neu/128x128/actions/gnome-stock-text-unindent.png
+share/icons/Neu/128x128/actions/go-bottom.png
+share/icons/Neu/128x128/actions/go-down.png
+share/icons/Neu/128x128/actions/go-first.png
+share/icons/Neu/128x128/actions/go-home.png
+share/icons/Neu/128x128/actions/go-jump.png
+share/icons/Neu/128x128/actions/go-last.png
+share/icons/Neu/128x128/actions/go-next.png
+share/icons/Neu/128x128/actions/go-previous.png
+share/icons/Neu/128x128/actions/go-top.png
+share/icons/Neu/128x128/actions/go-up.png
+share/icons/Neu/128x128/actions/gohome.png
+share/icons/Neu/128x128/actions/gtk-add.png
+share/icons/Neu/128x128/actions/gtk-bold.png
+share/icons/Neu/128x128/actions/gtk-clear.png
+share/icons/Neu/128x128/actions/gtk-copy.png
+share/icons/Neu/128x128/actions/gtk-cut.png
+share/icons/Neu/128x128/actions/gtk-delete.png
+share/icons/Neu/128x128/actions/gtk-find-and-replace.png
+share/icons/Neu/128x128/actions/gtk-find.png
+share/icons/Neu/128x128/actions/gtk-go-back-ltr.png
+share/icons/Neu/128x128/actions/gtk-go-back-rtl.png
+share/icons/Neu/128x128/actions/gtk-go-down.png
+share/icons/Neu/128x128/actions/gtk-go-forward-ltr.png
+share/icons/Neu/128x128/actions/gtk-go-forward-rtl.png
+share/icons/Neu/128x128/actions/gtk-go-up.png
+share/icons/Neu/128x128/actions/gtk-goto-bottom.png
+share/icons/Neu/128x128/actions/gtk-goto-first-ltr.png
+share/icons/Neu/128x128/actions/gtk-goto-first-rtl.png
+share/icons/Neu/128x128/actions/gtk-goto-last-ltr.png
+share/icons/Neu/128x128/actions/gtk-goto-last-rtl.png
+share/icons/Neu/128x128/actions/gtk-goto-top.png
+share/icons/Neu/128x128/actions/gtk-home.png
+share/icons/Neu/128x128/actions/gtk-indent.png
+share/icons/Neu/128x128/actions/gtk-italic.png
+share/icons/Neu/128x128/actions/gtk-jump-to-ltr.png
+share/icons/Neu/128x128/actions/gtk-jump-to-rtl.png
+share/icons/Neu/128x128/actions/gtk-justify-center.png
+share/icons/Neu/128x128/actions/gtk-justify-fill.png
+share/icons/Neu/128x128/actions/gtk-justify-left.png
+share/icons/Neu/128x128/actions/gtk-justify-right.png
+share/icons/Neu/128x128/actions/gtk-new.png
+share/icons/Neu/128x128/actions/gtk-open.png
+share/icons/Neu/128x128/actions/gtk-paste.png
+share/icons/Neu/128x128/actions/gtk-print-preview.png
+share/icons/Neu/128x128/actions/gtk-print.png
+share/icons/Neu/128x128/actions/gtk-properties.png
+share/icons/Neu/128x128/actions/gtk-redo-ltr.png
+share/icons/Neu/128x128/actions/gtk-refresh.png
+share/icons/Neu/128x128/actions/gtk-remove.png
+share/icons/Neu/128x128/actions/gtk-save-as.png
+share/icons/Neu/128x128/actions/gtk-save.png
+share/icons/Neu/128x128/actions/gtk-select-all.png
+share/icons/Neu/128x128/actions/gtk-stop.png
+share/icons/Neu/128x128/actions/gtk-underline.png
+share/icons/Neu/128x128/actions/gtk-undo-ltr.png
+share/icons/Neu/128x128/actions/gtk-unindent.png
+share/icons/Neu/128x128/actions/help-about.png
+share/icons/Neu/128x128/actions/kfind.png
+share/icons/Neu/128x128/actions/kfm_home.png
+share/icons/Neu/128x128/actions/leftjust.png
+share/icons/Neu/128x128/actions/list-add.png
+share/icons/Neu/128x128/actions/list-remove.png
+share/icons/Neu/128x128/actions/lock.png
+share/icons/Neu/128x128/actions/mail-forward.png
+share/icons/Neu/128x128/actions/mail-message-new.png
+share/icons/Neu/128x128/actions/mail-reply-all.png
+share/icons/Neu/128x128/actions/mail-reply-sender.png
+share/icons/Neu/128x128/actions/mail-send-receive.png
+share/icons/Neu/128x128/actions/mail_forward.png
+share/icons/Neu/128x128/actions/mail_new.png
+share/icons/Neu/128x128/actions/mail_reply.png
+share/icons/Neu/128x128/actions/mail_replyall.png
+share/icons/Neu/128x128/actions/next.png
+share/icons/Neu/128x128/actions/previous.png
+share/icons/Neu/128x128/actions/process-stop.png
+share/icons/Neu/128x128/actions/redhat-home.png
+share/icons/Neu/128x128/actions/redo.png
+share/icons/Neu/128x128/actions/reload.png
+share/icons/Neu/128x128/actions/reload3.png
+share/icons/Neu/128x128/actions/reload_all_tabs.png
+share/icons/Neu/128x128/actions/reload_page.png
+share/icons/Neu/128x128/actions/remove.png
+share/icons/Neu/128x128/actions/rightjust.png
+share/icons/Neu/128x128/actions/search.png
+share/icons/Neu/128x128/actions/start.png
+share/icons/Neu/128x128/actions/stock_add-bookmark.png
+share/icons/Neu/128x128/actions/stock_bottom.png
+share/icons/Neu/128x128/actions/stock_copy.png
+share/icons/Neu/128x128/actions/stock_cut.png
+share/icons/Neu/128x128/actions/stock_delete.png
+share/icons/Neu/128x128/actions/stock_down.png
+share/icons/Neu/128x128/actions/stock_file-properites.png
+share/icons/Neu/128x128/actions/stock_first.png
+share/icons/Neu/128x128/actions/stock_help-add-bookmark.png
+share/icons/Neu/128x128/actions/stock_home.png
+share/icons/Neu/128x128/actions/stock_last.png
+share/icons/Neu/128x128/actions/stock_left.png
+share/icons/Neu/128x128/actions/stock_mail-compose.png
+share/icons/Neu/128x128/actions/stock_mail-forward.png
+share/icons/Neu/128x128/actions/stock_mail-reply-to-all.png
+share/icons/Neu/128x128/actions/stock_mail-reply.png
+share/icons/Neu/128x128/actions/stock_mail-send-receive.png
+share/icons/Neu/128x128/actions/stock_new-address-book.png
+share/icons/Neu/128x128/actions/stock_new-appointment.png
+share/icons/Neu/128x128/actions/stock_new-bcard.png
+share/icons/Neu/128x128/actions/stock_new-dir.png
+share/icons/Neu/128x128/actions/stock_new-text.png
+share/icons/Neu/128x128/actions/stock_new-window.png
+share/icons/Neu/128x128/actions/stock_paste.png
+share/icons/Neu/128x128/actions/stock_print-preview.png
+share/icons/Neu/128x128/actions/stock_print.png
+share/icons/Neu/128x128/actions/stock_properties.png
+share/icons/Neu/128x128/actions/stock_redo.png
+share/icons/Neu/128x128/actions/stock_refresh.png
+share/icons/Neu/128x128/actions/stock_right.png
+share/icons/Neu/128x128/actions/stock_save-as.png
+share/icons/Neu/128x128/actions/stock_save.png
+share/icons/Neu/128x128/actions/stock_search-and-replace.png
+share/icons/Neu/128x128/actions/stock_search.png
+share/icons/Neu/128x128/actions/stock_select-all.png
+share/icons/Neu/128x128/actions/stock_stop.png
+share/icons/Neu/128x128/actions/stock_text_bold.png
+share/icons/Neu/128x128/actions/stock_text_center.png
+share/icons/Neu/128x128/actions/stock_text_indent.png
+share/icons/Neu/128x128/actions/stock_text_italic.png
+share/icons/Neu/128x128/actions/stock_text_justify.png
+share/icons/Neu/128x128/actions/stock_text_left.png
+share/icons/Neu/128x128/actions/stock_text_right.png
+share/icons/Neu/128x128/actions/stock_text_underlined.png
+share/icons/Neu/128x128/actions/stock_text_unindent.png
+share/icons/Neu/128x128/actions/stock_top.png
+share/icons/Neu/128x128/actions/stock_undo.png
+share/icons/Neu/128x128/actions/stock_up.png
+share/icons/Neu/128x128/actions/stop.png
+share/icons/Neu/128x128/actions/system-lock-screen.png
+share/icons/Neu/128x128/actions/system-log-out.png
+share/icons/Neu/128x128/actions/system-search.png
+share/icons/Neu/128x128/actions/system-shutdown.png
+share/icons/Neu/128x128/actions/text_bold.png
+share/icons/Neu/128x128/actions/text_italic.png
+share/icons/Neu/128x128/actions/text_under.png
+share/icons/Neu/128x128/actions/top.png
+share/icons/Neu/128x128/actions/undo.png
+share/icons/Neu/128x128/actions/up.png
+share/icons/Neu/128x128/actions/view-refresh.png
+share/icons/Neu/128x128/actions/window-new.png
+share/icons/Neu/128x128/actions/window_new.png
+share/icons/Neu/128x128/actions/xfce-system-lock.png
+share/icons/Neu/128x128/apps/access.png
+share/icons/Neu/128x128/apps/accessibility-directory.png
+share/icons/Neu/128x128/apps/accessories-character-map.png
+share/icons/Neu/128x128/apps/accessories-text-editor.png
+share/icons/Neu/128x128/apps/arts.png
+share/icons/Neu/128x128/apps/background.png
+share/icons/Neu/128x128/apps/browser.png
+share/icons/Neu/128x128/apps/config-users.png
+share/icons/Neu/128x128/apps/email.png
+share/icons/Neu/128x128/apps/epiphany-bookmarks.png
+share/icons/Neu/128x128/apps/evolution.png
+share/icons/Neu/128x128/apps/file-manager.png
+share/icons/Neu/128x128/apps/fonts.png
+share/icons/Neu/128x128/apps/gaim.png
+share/icons/Neu/128x128/apps/gimp.png
+share/icons/Neu/128x128/apps/gnome-character-map.png
+share/icons/Neu/128x128/apps/gnome-help.png
+share/icons/Neu/128x128/apps/gnome-mixer.png
+share/icons/Neu/128x128/apps/gnome-monitor.png
+share/icons/Neu/128x128/apps/gnome-remote-desktop.png
+share/icons/Neu/128x128/apps/gnome-session.png
+share/icons/Neu/128x128/apps/gnome-settings-accessibility-technologies.png
+share/icons/Neu/128x128/apps/gnome-settings-background.png
+share/icons/Neu/128x128/apps/gnome-settings-font.png
+share/icons/Neu/128x128/apps/gnome-terminal.png
+share/icons/Neu/128x128/apps/gnome-window-manager.png
+share/icons/Neu/128x128/apps/graphics-image-editor.png
+share/icons/Neu/128x128/apps/graphics-image-viewer.png
+share/icons/Neu/128x128/apps/graphics-svg-editor.png
+share/icons/Neu/128x128/apps/gtk-help.png
+share/icons/Neu/128x128/apps/gucharmap.png
+share/icons/Neu/128x128/apps/help-browser.png
+share/icons/Neu/128x128/apps/help.png
+share/icons/Neu/128x128/apps/internet-group-chat.png
+share/icons/Neu/128x128/apps/internet-mail.png
+share/icons/Neu/128x128/apps/internet-web-browser.png
+share/icons/Neu/128x128/apps/kcharselect.png
+share/icons/Neu/128x128/apps/kcmkwm.png
+share/icons/Neu/128x128/apps/kcmsound.png
+share/icons/Neu/128x128/apps/kedit.png
+share/icons/Neu/128x128/apps/kfm.png
+share/icons/Neu/128x128/apps/khelpcenter.png
+share/icons/Neu/128x128/apps/konsole.png
+share/icons/Neu/128x128/apps/krfb.png
+share/icons/Neu/128x128/apps/kscreensaver.png
+share/icons/Neu/128x128/apps/ksysguard.png
+share/icons/Neu/128x128/apps/kuser.png
+share/icons/Neu/128x128/apps/kwin.png
+share/icons/Neu/128x128/apps/mail_generic.png
+share/icons/Neu/128x128/apps/multimedia-volume-control.png
+share/icons/Neu/128x128/apps/multimedia.png
+share/icons/Neu/128x128/apps/openterm.png
+share/icons/Neu/128x128/apps/preferences-desktop-accessibility.png
+share/icons/Neu/128x128/apps/preferences-desktop-assistive-technology.png
+share/icons/Neu/128x128/apps/preferences-desktop-font.png
+share/icons/Neu/128x128/apps/preferences-desktop-remote-desktop.png
+share/icons/Neu/128x128/apps/preferences-desktop-screensaver.png
+share/icons/Neu/128x128/apps/preferences-desktop-wallpaper.png
+share/icons/Neu/128x128/apps/preferences-system-network-proxy.png
+share/icons/Neu/128x128/apps/preferences-system-session.png
+share/icons/Neu/128x128/apps/preferences-system-windows.png
+share/icons/Neu/128x128/apps/proxy-config.png
+share/icons/Neu/128x128/apps/proxy.png
+share/icons/Neu/128x128/apps/redhat-email.png
+share/icons/Neu/128x128/apps/redhat-filemanager.png
+share/icons/Neu/128x128/apps/redhat-web-browser.png
+share/icons/Neu/128x128/apps/screensaver.png
+share/icons/Neu/128x128/apps/sound-juicer.png
+share/icons/Neu/128x128/apps/stock_help.png
+share/icons/Neu/128x128/apps/stock_proxy.png
+share/icons/Neu/128x128/apps/susehelpcenter.png
+share/icons/Neu/128x128/apps/system-config-users.png
+share/icons/Neu/128x128/apps/system-file-manager.png
+share/icons/Neu/128x128/apps/system-installer.png
+share/icons/Neu/128x128/apps/system-lock-screen.png
+share/icons/Neu/128x128/apps/system-software-update.png
+share/icons/Neu/128x128/apps/system-users.png
+share/icons/Neu/128x128/apps/terminal.png
+share/icons/Neu/128x128/apps/text-editor.png
+share/icons/Neu/128x128/apps/update-manager.png
+share/icons/Neu/128x128/apps/utilities-system-monitor.png
+share/icons/Neu/128x128/apps/utilities-terminal.png
+share/icons/Neu/128x128/apps/volume-knob.png
+share/icons/Neu/128x128/apps/wallpaper.png
+share/icons/Neu/128x128/apps/web-browser.png
+share/icons/Neu/128x128/apps/xfce-filemanager.png
+share/icons/Neu/128x128/apps/xfce-mail.png
+share/icons/Neu/128x128/apps/xfce-terminal.png
+share/icons/Neu/128x128/apps/xfce4-backdrop.png
+share/icons/Neu/128x128/apps/xfce4-mixer.png
+share/icons/Neu/128x128/apps/xfce4-session.png
+share/icons/Neu/128x128/apps/xfwm4.png
+share/icons/Neu/128x128/apps/xscreensaver.png
+share/icons/Neu/128x128/apps/zen-icon.png
+share/icons/Neu/128x128/categories/applications-accessories.png
+share/icons/Neu/128x128/categories/applications-development.png
+share/icons/Neu/128x128/categories/applications-games.png
+share/icons/Neu/128x128/categories/applications-graphics.png
+share/icons/Neu/128x128/categories/applications-internet.png
+share/icons/Neu/128x128/categories/applications-multimedia.png
+share/icons/Neu/128x128/categories/applications-office.png
+share/icons/Neu/128x128/categories/applications-other.png
+share/icons/Neu/128x128/categories/applications-system.png
+share/icons/Neu/128x128/categories/gnome-applications.png
+share/icons/Neu/128x128/categories/gnome-control-center.png
+share/icons/Neu/128x128/categories/gnome-devel.png
+share/icons/Neu/128x128/categories/gnome-globe.png
+share/icons/Neu/128x128/categories/gnome-graphics.png
+share/icons/Neu/128x128/categories/gnome-joystick.png
+share/icons/Neu/128x128/categories/gnome-multimedia.png
+share/icons/Neu/128x128/categories/gnome-settings.png
+share/icons/Neu/128x128/categories/gnome-system.png
+share/icons/Neu/128x128/categories/gnome-util.png
+share/icons/Neu/128x128/categories/gtk-preferences.png
+share/icons/Neu/128x128/categories/input_devices_settings.png
+share/icons/Neu/128x128/categories/kcontrol.png
+share/icons/Neu/128x128/categories/package_development.png
+share/icons/Neu/128x128/categories/package_games.png
+share/icons/Neu/128x128/categories/package_graphics.png
+share/icons/Neu/128x128/categories/package_multimedia.png
+share/icons/Neu/128x128/categories/package_network.png
+share/icons/Neu/128x128/categories/package_office.png
+share/icons/Neu/128x128/categories/package_settings.png
+share/icons/Neu/128x128/categories/package_system.png
+share/icons/Neu/128x128/categories/package_utilities.png
+share/icons/Neu/128x128/categories/preferences-desktop-peripherals.png
+share/icons/Neu/128x128/categories/preferences-desktop.png
+share/icons/Neu/128x128/categories/preferences-system.png
+share/icons/Neu/128x128/categories/redhat-accessories.png
+share/icons/Neu/128x128/categories/redhat-games.png
+share/icons/Neu/128x128/categories/redhat-graphics.png
+share/icons/Neu/128x128/categories/redhat-internet.png
+share/icons/Neu/128x128/categories/redhat-office.png
+share/icons/Neu/128x128/categories/redhat-preferences.png
+share/icons/Neu/128x128/categories/redhat-programming.png
+share/icons/Neu/128x128/categories/redhat-sound_video.png
+share/icons/Neu/128x128/categories/redhat-system_settings.png
+share/icons/Neu/128x128/categories/redhat-system_tools.png
+share/icons/Neu/128x128/categories/stock_internet.png
+share/icons/Neu/128x128/categories/xfce-games.png
+share/icons/Neu/128x128/categories/xfce-graphics.png
+share/icons/Neu/128x128/categories/xfce-internet.png
+share/icons/Neu/128x128/categories/xfce-multimedia.png
+share/icons/Neu/128x128/categories/xfce-office.png
+share/icons/Neu/128x128/categories/xfce-system-settings.png
+share/icons/Neu/128x128/categories/xfce-utils.png
+share/icons/Neu/128x128/categories/xfce4-settings.png
+share/icons/Neu/128x128/devices/3floppy_unmount.png
+share/icons/Neu/128x128/devices/battery.png
+share/icons/Neu/128x128/devices/chardevice.png
+share/icons/Neu/128x128/devices/computer.png
+share/icons/Neu/128x128/devices/display.png
+share/icons/Neu/128x128/devices/drive-cdrom.png
+share/icons/Neu/128x128/devices/drive-harddisk.png
+share/icons/Neu/128x128/devices/drive-removable-media.png
+share/icons/Neu/128x128/devices/gnome-dev-battery.png
+share/icons/Neu/128x128/devices/gnome-dev-computer.png
+share/icons/Neu/128x128/devices/gnome-dev-floppy.png
+share/icons/Neu/128x128/devices/gnome-dev-harddisk-1394.png
+share/icons/Neu/128x128/devices/gnome-dev-harddisk-usb.png
+share/icons/Neu/128x128/devices/gnome-dev-harddisk.png
+share/icons/Neu/128x128/devices/gnome-dev-keyboard.png
+share/icons/Neu/128x128/devices/gnome-dev-mouse-ball.png
+share/icons/Neu/128x128/devices/gnome-dev-mouse-optical.png
+share/icons/Neu/128x128/devices/gnome-dev-printer.png
+share/icons/Neu/128x128/devices/gnome-dev-removable-1394.png
+share/icons/Neu/128x128/devices/gnome-dev-removable-usb.png
+share/icons/Neu/128x128/devices/gnome-dev-removable.png
+share/icons/Neu/128x128/devices/gnome-fs-client.png
+share/icons/Neu/128x128/devices/gtk-floppy.png
+share/icons/Neu/128x128/devices/gtk-harddisk.png
+share/icons/Neu/128x128/devices/harddrive.png
+share/icons/Neu/128x128/devices/hdd_unmount.png
+share/icons/Neu/128x128/devices/input-keyboard.png
+share/icons/Neu/128x128/devices/input-mouse.png
+share/icons/Neu/128x128/devices/keyboard.png
+share/icons/Neu/128x128/devices/kjobviewer.png
+share/icons/Neu/128x128/devices/kxkb.png
+share/icons/Neu/128x128/devices/media-cdrom-audio.png
+share/icons/Neu/128x128/devices/media-cdrom.png
+share/icons/Neu/128x128/devices/media-cdrw.png
+share/icons/Neu/128x128/devices/media-dvd.png
+share/icons/Neu/128x128/devices/media-dvdrw.png
+share/icons/Neu/128x128/devices/media-floppy.png
+share/icons/Neu/128x128/devices/mouse.png
+share/icons/Neu/128x128/devices/printer-remote.png
+share/icons/Neu/128x128/devices/printer.png
+share/icons/Neu/128x128/devices/printer1.png
+share/icons/Neu/128x128/devices/printmgr.png
+share/icons/Neu/128x128/devices/stock_printers.png
+share/icons/Neu/128x128/devices/system-floppy.png
+share/icons/Neu/128x128/devices/system.png
+share/icons/Neu/128x128/devices/usbpendrive_unmount.png
+share/icons/Neu/128x128/devices/video-display.png
+share/icons/Neu/128x128/devices/xfce-printer.png
+share/icons/Neu/128x128/devices/xfce4-display.png
+share/icons/Neu/128x128/devices/xfce4-keyboard.png
+share/icons/Neu/128x128/devices/xfce4-mouse.png
+share/icons/Neu/128x128/devices/yast_HD.png
+share/icons/Neu/128x128/devices/yast_idetude.png
+share/icons/Neu/128x128/devices/yast_mouse.png
+share/icons/Neu/128x128/devices/yast_printer.png
+share/icons/Neu/128x128/emblems/emblem-important.png
+share/icons/Neu/128x128/emblems/emblem-pictures.png
+share/icons/Neu/128x128/emblems/emblem-readonly.png
+share/icons/Neu/128x128/emblems/emblem-symbolic-link.png
+share/icons/Neu/128x128/emblems/emblem-system.png
+share/icons/Neu/128x128/emblems/emblem-unreadable.png
+share/icons/Neu/128x128/emblems/emblem-web.png
+share/icons/Neu/128x128/emblems/stock_mail-priority-high.png
+share/icons/Neu/128x128/mimetypes/application-certificate.png
+share/icons/Neu/128x128/mimetypes/application-x-executable.png
+share/icons/Neu/128x128/mimetypes/ascii.png
+share/icons/Neu/128x128/mimetypes/audio-x-generic.png
+share/icons/Neu/128x128/mimetypes/binary.png
+share/icons/Neu/128x128/mimetypes/contents2.png
+share/icons/Neu/128x128/mimetypes/deb.png
+share/icons/Neu/128x128/mimetypes/document.png
+share/icons/Neu/128x128/mimetypes/empty.png
+share/icons/Neu/128x128/mimetypes/exec.png
+share/icons/Neu/128x128/mimetypes/folder_tar.png
+share/icons/Neu/128x128/mimetypes/font-x-generic.png
+share/icons/Neu/128x128/mimetypes/font.png
+share/icons/Neu/128x128/mimetypes/font_bitmap.png
+share/icons/Neu/128x128/mimetypes/font_truetype.png
+share/icons/Neu/128x128/mimetypes/font_type1.png
+share/icons/Neu/128x128/mimetypes/gnome-fs-executable.png
+share/icons/Neu/128x128/mimetypes/gnome-mime-application-msword.png
+share/icons/Neu/128x128/mimetypes/gnome-mime-application-ogg.png
+share/icons/Neu/128x128/mimetypes/gnome-mime-application-pdf.png
+share/icons/Neu/128x128/mimetypes/gnome-mime-application-postscript.png
+share/icons/Neu/128x128/mimetypes/gnome-mime-application-rtf.png
+share/icons/Neu/128x128/mimetypes/gnome-mime-application-vnd.lotus-1-2-3.png
+share/icons/Neu/128x128/mimetypes/gnome-mime-application-vnd.ms-excel.png
+share/icons/Neu/128x128/mimetypes/gnome-mime-application-vnd.oasis.opendocument.spreadsheet.png
+share/icons/Neu/128x128/mimetypes/gnome-mime-application-vnd.oasis.opendocument.text-web.png
+share/icons/Neu/128x128/mimetypes/gnome-mime-application-vnd.oasis.opendocument.text.png
+share/icons/Neu/128x128/mimetypes/gnome-mime-application-vnd.rn-realmedia-secure.png
+share/icons/Neu/128x128/mimetypes/gnome-mime-application-vnd.rn-realmedia-vbr.png
+share/icons/Neu/128x128/mimetypes/gnome-mime-application-vnd.rn-realmedia.png
+share/icons/Neu/128x128/mimetypes/gnome-mime-application-vnd.stardivision.calc.png
+share/icons/Neu/128x128/mimetypes/gnome-mime-application-vnd.stardivision.writer.png
+share/icons/Neu/128x128/mimetypes/gnome-mime-application-vnd.sun.xml.calc.png
+share/icons/Neu/128x128/mimetypes/gnome-mime-application-vnd.sun.xml.writer.png
+share/icons/Neu/128x128/mimetypes/gnome-mime-application-wordperfect.png
+share/icons/Neu/128x128/mimetypes/gnome-mime-application-x-7z-compressed.png
+share/icons/Neu/128x128/mimetypes/gnome-mime-application-x-abiword.png
+share/icons/Neu/128x128/mimetypes/gnome-mime-application-x-applix-spreadsheet.png
+share/icons/Neu/128x128/mimetypes/gnome-mime-application-x-applix-word.png
+share/icons/Neu/128x128/mimetypes/gnome-mime-application-x-archive.png
+share/icons/Neu/128x128/mimetypes/gnome-mime-application-x-arj.png
+share/icons/Neu/128x128/mimetypes/gnome-mime-application-x-bzip-compressed-tar.png
+share/icons/Neu/128x128/mimetypes/gnome-mime-application-x-bzip.png
+share/icons/Neu/128x128/mimetypes/gnome-mime-application-x-compress.png
+share/icons/Neu/128x128/mimetypes/gnome-mime-application-x-compressed-tar.png
+share/icons/Neu/128x128/mimetypes/gnome-mime-application-x-cpio-compressed.png
+share/icons/Neu/128x128/mimetypes/gnome-mime-application-x-cpio.png
+share/icons/Neu/128x128/mimetypes/gnome-mime-application-x-deb.png
+share/icons/Neu/128x128/mimetypes/gnome-mime-application-x-dvi.png
+share/icons/Neu/128x128/mimetypes/gnome-mime-application-x-executable.png
+share/icons/Neu/128x128/mimetypes/gnome-mime-application-x-font-afm.png
+share/icons/Neu/128x128/mimetypes/gnome-mime-application-x-font-bdf.png
+share/icons/Neu/128x128/mimetypes/gnome-mime-application-x-font-linux-psf.png
+share/icons/Neu/128x128/mimetypes/gnome-mime-application-x-font-pcf.png
+share/icons/Neu/128x128/mimetypes/gnome-mime-application-x-font-sunos-news.png
+share/icons/Neu/128x128/mimetypes/gnome-mime-application-x-font-ttf.png
+share/icons/Neu/128x128/mimetypes/gnome-mime-application-x-gnumeric.png
+share/icons/Neu/128x128/mimetypes/gnome-mime-application-x-gzip.png
+share/icons/Neu/128x128/mimetypes/gnome-mime-application-x-gzpostscript.png
+share/icons/Neu/128x128/mimetypes/gnome-mime-application-x-jar.png
+share/icons/Neu/128x128/mimetypes/gnome-mime-application-x-killustrator.png
+share/icons/Neu/128x128/mimetypes/gnome-mime-application-x-kspread.png
+share/icons/Neu/128x128/mimetypes/gnome-mime-application-x-kword.png
+share/icons/Neu/128x128/mimetypes/gnome-mime-application-x-lha.png
+share/icons/Neu/128x128/mimetypes/gnome-mime-application-x-lhz.png
+share/icons/Neu/128x128/mimetypes/gnome-mime-application-x-ms-dos-executable.png
+share/icons/Neu/128x128/mimetypes/gnome-mime-application-x-perl.png
+share/icons/Neu/128x128/mimetypes/gnome-mime-application-x-php.png
+share/icons/Neu/128x128/mimetypes/gnome-mime-application-x-python-bytecode.png
+share/icons/Neu/128x128/mimetypes/gnome-mime-application-x-rar.png
+share/icons/Neu/128x128/mimetypes/gnome-mime-application-x-rpm.png
+share/icons/Neu/128x128/mimetypes/gnome-mime-application-x-scribus.png
+share/icons/Neu/128x128/mimetypes/gnome-mime-application-x-shellscript.png
+share/icons/Neu/128x128/mimetypes/gnome-mime-application-x-shockwave-flash.png
+share/icons/Neu/128x128/mimetypes/gnome-mime-application-x-stuffit.png
+share/icons/Neu/128x128/mimetypes/gnome-mime-application-x-tar.png
+share/icons/Neu/128x128/mimetypes/gnome-mime-application-x-tarz.png
+share/icons/Neu/128x128/mimetypes/gnome-mime-application-x-tex.png
+share/icons/Neu/128x128/mimetypes/gnome-mime-application-xhtml+xml.png
+share/icons/Neu/128x128/mimetypes/gnome-mime-application-zip.png
+share/icons/Neu/128x128/mimetypes/gnome-mime-audio.png
+share/icons/Neu/128x128/mimetypes/gnome-mime-image.png
+share/icons/Neu/128x128/mimetypes/gnome-mime-text-html.png
+share/icons/Neu/128x128/mimetypes/gnome-mime-text-vnd.wap.wml.png
+share/icons/Neu/128x128/mimetypes/gnome-mime-text-x-csh.png
+share/icons/Neu/128x128/mimetypes/gnome-mime-text-x-python.png
+share/icons/Neu/128x128/mimetypes/gnome-mime-text-x-sh.png
+share/icons/Neu/128x128/mimetypes/gnome-mime-text-x-vcard.png
+share/icons/Neu/128x128/mimetypes/gnome-mime-text-x-zsh.png
+share/icons/Neu/128x128/mimetypes/gnome-mime-text.png
+share/icons/Neu/128x128/mimetypes/gnome-mime-video.png
+share/icons/Neu/128x128/mimetypes/gnome-mime-x-font-afm.png
+share/icons/Neu/128x128/mimetypes/gnome-package.png
+share/icons/Neu/128x128/mimetypes/html.png
+share/icons/Neu/128x128/mimetypes/image-x-generic.png
+share/icons/Neu/128x128/mimetypes/image.png
+share/icons/Neu/128x128/mimetypes/mime_ascii.png
+share/icons/Neu/128x128/mimetypes/misc.png
+share/icons/Neu/128x128/mimetypes/package-x-generic.png
+share/icons/Neu/128x128/mimetypes/package.png
+share/icons/Neu/128x128/mimetypes/package_editors.png
+share/icons/Neu/128x128/mimetypes/package_wordprocessing.png
+share/icons/Neu/128x128/mimetypes/rpm.png
+share/icons/Neu/128x128/mimetypes/shellscript.png
+share/icons/Neu/128x128/mimetypes/sound.png
+share/icons/Neu/128x128/mimetypes/spreadsheet.png
+share/icons/Neu/128x128/mimetypes/stock_addressbook.png
+share/icons/Neu/128x128/mimetypes/stock_certificate.png
+share/icons/Neu/128x128/mimetypes/stock_script.png
+share/icons/Neu/128x128/mimetypes/tar.png
+share/icons/Neu/128x128/mimetypes/text-html.png
+share/icons/Neu/128x128/mimetypes/text-x-generic.png
+share/icons/Neu/128x128/mimetypes/text-x-script.png
+share/icons/Neu/128x128/mimetypes/text-x-source.png
+share/icons/Neu/128x128/mimetypes/tgz.png
+share/icons/Neu/128x128/mimetypes/txt.png
+share/icons/Neu/128x128/mimetypes/txt2.png
+share/icons/Neu/128x128/mimetypes/unknown.png
+share/icons/Neu/128x128/mimetypes/vcard.png
+share/icons/Neu/128x128/mimetypes/video-x-generic.png
+share/icons/Neu/128x128/mimetypes/video.png
+share/icons/Neu/128x128/mimetypes/wordprocessing.png
+share/icons/Neu/128x128/mimetypes/www.png
+share/icons/Neu/128x128/mimetypes/x-office-address-book.png
+share/icons/Neu/128x128/mimetypes/x-office-document.png
+share/icons/Neu/128x128/mimetypes/x-office-spreadsheet.png
+share/icons/Neu/128x128/mimetypes/zip.png
+share/icons/Neu/128x128/places/application-x-gnome-saved-search.png
+share/icons/Neu/128x128/places/desktop.png
+share/icons/Neu/128x128/places/distributor-logo.png
+share/icons/Neu/128x128/places/emptytrash.png
+share/icons/Neu/128x128/places/folder-remote.png
+share/icons/Neu/128x128/places/folder-saved-search.png
+share/icons/Neu/128x128/places/folder.png
+share/icons/Neu/128x128/places/folder_home.png
+share/icons/Neu/128x128/places/gnome-fs-desktop.png
+share/icons/Neu/128x128/places/gnome-fs-directory.png
+share/icons/Neu/128x128/places/gnome-fs-ftp.png
+share/icons/Neu/128x128/places/gnome-fs-home.png
+share/icons/Neu/128x128/places/gnome-fs-network.png
+share/icons/Neu/128x128/places/gnome-fs-nfs.png
+share/icons/Neu/128x128/places/gnome-fs-server.png
+share/icons/Neu/128x128/places/gnome-fs-share.png
+share/icons/Neu/128x128/places/gnome-fs-smb.png
+share/icons/Neu/128x128/places/gnome-fs-ssh.png
+share/icons/Neu/128x128/places/gnome-fs-trash-empty.png
+share/icons/Neu/128x128/places/gnome-main-menu.png
+share/icons/Neu/128x128/places/gnome-mime-x-directory-nfs-server.png
+share/icons/Neu/128x128/places/gnome-mime-x-directory-smb-server.png
+share/icons/Neu/128x128/places/gnome-mime-x-directory-smb-share.png
+share/icons/Neu/128x128/places/gnome-mime-x-directory-smb-workgroup.png
+share/icons/Neu/128x128/places/gnome-stock-trash.png
+share/icons/Neu/128x128/places/gtk-network.png
+share/icons/Neu/128x128/places/network-server.png
+share/icons/Neu/128x128/places/network-workgroup.png
+share/icons/Neu/128x128/places/network.png
+share/icons/Neu/128x128/places/network_local.png
+share/icons/Neu/128x128/places/novell-button.png
+share/icons/Neu/128x128/places/redhat-network-server.png
+share/icons/Neu/128x128/places/server.png
+share/icons/Neu/128x128/places/start-here.png
+share/icons/Neu/128x128/places/stock_folder.png
+share/icons/Neu/128x128/places/trashcan_empty.png
+share/icons/Neu/128x128/places/user-desktop.png
+share/icons/Neu/128x128/places/user-home.png
+share/icons/Neu/128x128/places/user-trash.png
+share/icons/Neu/128x128/places/xfce-trash_empty.png
+share/icons/Neu/128x128/status/audio-volume-high.png
+share/icons/Neu/128x128/status/audio-volume-low.png
+share/icons/Neu/128x128/status/audio-volume-medium.png
+share/icons/Neu/128x128/status/audio-volume-muted.png
+share/icons/Neu/128x128/status/audio-volume-zero.png
+share/icons/Neu/128x128/status/battery-caution.png
+share/icons/Neu/128x128/status/connect_creating.png
+share/icons/Neu/128x128/status/connect_established.png
+share/icons/Neu/128x128/status/connect_no.png
+share/icons/Neu/128x128/status/dialog-error.png
+share/icons/Neu/128x128/status/dialog-information.png
+share/icons/Neu/128x128/status/dialog-password.png
+share/icons/Neu/128x128/status/dialog-question.png
+share/icons/Neu/128x128/status/dialog-warning.png
+share/icons/Neu/128x128/status/edittrash.png
+share/icons/Neu/128x128/status/error.png
+share/icons/Neu/128x128/status/folder-drag-accept.png
+share/icons/Neu/128x128/status/folder-open.png
+share/icons/Neu/128x128/status/folder-visiting.png
+share/icons/Neu/128x128/status/folder_open.png
+share/icons/Neu/128x128/status/gnome-fs-directory-accept.png
+share/icons/Neu/128x128/status/gnome-fs-directory-visiting.png
+share/icons/Neu/128x128/status/gnome-fs-loading-icon.png
+share/icons/Neu/128x128/status/gnome-fs-trash-full.png
+share/icons/Neu/128x128/status/gnome-netstatus-disconn.png
+share/icons/Neu/128x128/status/gnome-netstatus-error.png
+share/icons/Neu/128x128/status/gnome-netstatus-idle.png
+share/icons/Neu/128x128/status/gnome-netstatus-rx.png
+share/icons/Neu/128x128/status/gnome-netstatus-tx.png
+share/icons/Neu/128x128/status/gnome-netstatus-txrx.png
+share/icons/Neu/128x128/status/gnome-stock-trash-full.png
+share/icons/Neu/128x128/status/gtk-dialog-authentication.png
+share/icons/Neu/128x128/status/gtk-dialog-error.png
+share/icons/Neu/128x128/status/gtk-dialog-info.png
+share/icons/Neu/128x128/status/gtk-dialog-question.png
+share/icons/Neu/128x128/status/gtk-dialog-warning.png
+share/icons/Neu/128x128/status/gtk-missing-image.png
+share/icons/Neu/128x128/status/image-loading.png
+share/icons/Neu/128x128/status/image-missing.png
+share/icons/Neu/128x128/status/important.png
+share/icons/Neu/128x128/status/info.png
+share/icons/Neu/128x128/status/messagebox_critical.png
+share/icons/Neu/128x128/status/messagebox_info.png
+share/icons/Neu/128x128/status/messagebox_warning.png
+share/icons/Neu/128x128/status/network-error.png
+share/icons/Neu/128x128/status/network-idle.png
+share/icons/Neu/128x128/status/network-offline.png
+share/icons/Neu/128x128/status/network-receive.png
+share/icons/Neu/128x128/status/network-transmit-receive.png
+share/icons/Neu/128x128/status/network-transmit.png
+share/icons/Neu/128x128/status/nm-adhoc.png
+share/icons/Neu/128x128/status/nm-device-wired.png
+share/icons/Neu/128x128/status/nm-device-wireless.png
+share/icons/Neu/128x128/status/nm-no-connection.png
+share/icons/Neu/128x128/status/printer-error.png
+share/icons/Neu/128x128/status/stock_dialog-error.png
+share/icons/Neu/128x128/status/stock_dialog-info.png
+share/icons/Neu/128x128/status/stock_dialog-question.png
+share/icons/Neu/128x128/status/stock_dialog-warning.png
+share/icons/Neu/128x128/status/stock_open.png
+share/icons/Neu/128x128/status/stock_trash_full.png
+share/icons/Neu/128x128/status/stock_volume-0.png
+share/icons/Neu/128x128/status/stock_volume-max.png
+share/icons/Neu/128x128/status/stock_volume-med.png
+share/icons/Neu/128x128/status/stock_volume-min.png
+share/icons/Neu/128x128/status/stock_volume-mute.png
+share/icons/Neu/128x128/status/stock_volume.png
+share/icons/Neu/128x128/status/trashcan_full.png
+share/icons/Neu/128x128/status/user-trash-full.png
+share/icons/Neu/128x128/status/xfce-trash_full.png
+share/icons/Neu/22x22/actions/add.png
+share/icons/Neu/22x22/actions/address-book-new.png
+share/icons/Neu/22x22/actions/appointment-new.png
+share/icons/Neu/22x22/actions/appointment.png
+share/icons/Neu/22x22/actions/back.png
+share/icons/Neu/22x22/actions/bookmark-new.png
+share/icons/Neu/22x22/actions/bookmark_add.png
+share/icons/Neu/22x22/actions/bookmarks_list_add.png
+share/icons/Neu/22x22/actions/bottom.png
+share/icons/Neu/22x22/actions/button_cancel.png
+share/icons/Neu/22x22/actions/cancel.png
+share/icons/Neu/22x22/actions/centrejust.png
+share/icons/Neu/22x22/actions/contact-new.png
+share/icons/Neu/22x22/actions/dialog-cancel.png
+share/icons/Neu/22x22/actions/dialog-close.png
+share/icons/Neu/22x22/actions/dialog-ok.png
+share/icons/Neu/22x22/actions/document-new.png
+share/icons/Neu/22x22/actions/document-open.png
+share/icons/Neu/22x22/actions/document-print-preview.png
+share/icons/Neu/22x22/actions/document-print.png
+share/icons/Neu/22x22/actions/document-properties.png
+share/icons/Neu/22x22/actions/document-save-as.png
+share/icons/Neu/22x22/actions/document-save.png
+share/icons/Neu/22x22/actions/down.png
+share/icons/Neu/22x22/actions/edit-clear.png
+share/icons/Neu/22x22/actions/edit-copy.png
+share/icons/Neu/22x22/actions/edit-cut.png
+share/icons/Neu/22x22/actions/edit-delete.png
+share/icons/Neu/22x22/actions/edit-find-replace.png
+share/icons/Neu/22x22/actions/edit-find.png
+share/icons/Neu/22x22/actions/edit-paste.png
+share/icons/Neu/22x22/actions/edit-redo.png
+share/icons/Neu/22x22/actions/edit-select-all.png
+share/icons/Neu/22x22/actions/edit-undo.png
+share/icons/Neu/22x22/actions/editclear.png
+share/icons/Neu/22x22/actions/editcopy.png
+share/icons/Neu/22x22/actions/editcut.png
+share/icons/Neu/22x22/actions/editdelete.png
+share/icons/Neu/22x22/actions/editpaste.png
+share/icons/Neu/22x22/actions/exit.png
+share/icons/Neu/22x22/actions/filefind.png
+share/icons/Neu/22x22/actions/filenew.png
+share/icons/Neu/22x22/actions/fileopen.png
+share/icons/Neu/22x22/actions/fileprint.png
+share/icons/Neu/22x22/actions/filequickprint.png
+share/icons/Neu/22x22/actions/filesave.png
+share/icons/Neu/22x22/actions/filesaveas.png
+share/icons/Neu/22x22/actions/find.png
+share/icons/Neu/22x22/actions/finish.png
+share/icons/Neu/22x22/actions/folder-new.png
+share/icons/Neu/22x22/actions/folder_new.png
+share/icons/Neu/22x22/actions/format-indent-less.png
+share/icons/Neu/22x22/actions/format-indent-more.png
+share/icons/Neu/22x22/actions/format-justify-center.png
+share/icons/Neu/22x22/actions/format-justify-fill.png
+share/icons/Neu/22x22/actions/format-justify-left.png
+share/icons/Neu/22x22/actions/format-justify-right.png
+share/icons/Neu/22x22/actions/format-text-bold.png
+share/icons/Neu/22x22/actions/format-text-italic.png
+share/icons/Neu/22x22/actions/format-text-underline.png
+share/icons/Neu/22x22/actions/forward.png
+share/icons/Neu/22x22/actions/gnome-lockscreen.png
+share/icons/Neu/22x22/actions/gnome-logout.png
+share/icons/Neu/22x22/actions/gnome-run.png
+share/icons/Neu/22x22/actions/gnome-searchtool.png
+share/icons/Neu/22x22/actions/gnome-stock-mail-fwd.png
+share/icons/Neu/22x22/actions/gnome-stock-mail-new.png
+share/icons/Neu/22x22/actions/gnome-stock-mail-rpl.png
+share/icons/Neu/22x22/actions/gnome-stock-text-indent.png
+share/icons/Neu/22x22/actions/gnome-stock-text-unindent.png
+share/icons/Neu/22x22/actions/go-bottom.png
+share/icons/Neu/22x22/actions/go-down.png
+share/icons/Neu/22x22/actions/go-first.png
+share/icons/Neu/22x22/actions/go-home.png
+share/icons/Neu/22x22/actions/go-jump.png
+share/icons/Neu/22x22/actions/go-last.png
+share/icons/Neu/22x22/actions/go-next.png
+share/icons/Neu/22x22/actions/go-previous.png
+share/icons/Neu/22x22/actions/go-top.png
+share/icons/Neu/22x22/actions/go-up.png
+share/icons/Neu/22x22/actions/gohome.png
+share/icons/Neu/22x22/actions/gtk-add.png
+share/icons/Neu/22x22/actions/gtk-bold.png
+share/icons/Neu/22x22/actions/gtk-cancel.png
+share/icons/Neu/22x22/actions/gtk-clear.png
+share/icons/Neu/22x22/actions/gtk-copy.png
+share/icons/Neu/22x22/actions/gtk-cut.png
+share/icons/Neu/22x22/actions/gtk-delete.png
+share/icons/Neu/22x22/actions/gtk-find-and-replace.png
+share/icons/Neu/22x22/actions/gtk-find.png
+share/icons/Neu/22x22/actions/gtk-go-back-ltr.png
+share/icons/Neu/22x22/actions/gtk-go-back-rtl.png
+share/icons/Neu/22x22/actions/gtk-go-down.png
+share/icons/Neu/22x22/actions/gtk-go-forward-ltr.png
+share/icons/Neu/22x22/actions/gtk-go-forward-rtl.png
+share/icons/Neu/22x22/actions/gtk-go-up.png
+share/icons/Neu/22x22/actions/gtk-goto-bottom.png
+share/icons/Neu/22x22/actions/gtk-goto-first-ltr.png
+share/icons/Neu/22x22/actions/gtk-goto-first-rtl.png
+share/icons/Neu/22x22/actions/gtk-goto-last-ltr.png
+share/icons/Neu/22x22/actions/gtk-goto-last-rtl.png
+share/icons/Neu/22x22/actions/gtk-goto-top.png
+share/icons/Neu/22x22/actions/gtk-home.png
+share/icons/Neu/22x22/actions/gtk-indent.png
+share/icons/Neu/22x22/actions/gtk-italic.png
+share/icons/Neu/22x22/actions/gtk-jump-to-ltr.png
+share/icons/Neu/22x22/actions/gtk-jump-to-rtl.png
+share/icons/Neu/22x22/actions/gtk-justify-center.png
+share/icons/Neu/22x22/actions/gtk-justify-fill.png
+share/icons/Neu/22x22/actions/gtk-justify-left.png
+share/icons/Neu/22x22/actions/gtk-justify-right.png
+share/icons/Neu/22x22/actions/gtk-new.png
+share/icons/Neu/22x22/actions/gtk-open.png
+share/icons/Neu/22x22/actions/gtk-paste.png
+share/icons/Neu/22x22/actions/gtk-print-preview.png
+share/icons/Neu/22x22/actions/gtk-print.png
+share/icons/Neu/22x22/actions/gtk-properties.png
+share/icons/Neu/22x22/actions/gtk-redo-ltr.png
+share/icons/Neu/22x22/actions/gtk-refresh.png
+share/icons/Neu/22x22/actions/gtk-remove.png
+share/icons/Neu/22x22/actions/gtk-save-as.png
+share/icons/Neu/22x22/actions/gtk-save.png
+share/icons/Neu/22x22/actions/gtk-select-all.png
+share/icons/Neu/22x22/actions/gtk-stop.png
+share/icons/Neu/22x22/actions/gtk-underline.png
+share/icons/Neu/22x22/actions/gtk-undo-ltr.png
+share/icons/Neu/22x22/actions/gtk-unindent.png
+share/icons/Neu/22x22/actions/help-about.png
+share/icons/Neu/22x22/actions/kfind.png
+share/icons/Neu/22x22/actions/kfm_home.png
+share/icons/Neu/22x22/actions/leftjust.png
+share/icons/Neu/22x22/actions/list-add.png
+share/icons/Neu/22x22/actions/list-remove.png
+share/icons/Neu/22x22/actions/lock.png
+share/icons/Neu/22x22/actions/mail-forward.png
+share/icons/Neu/22x22/actions/mail-message-new.png
+share/icons/Neu/22x22/actions/mail-reply-all.png
+share/icons/Neu/22x22/actions/mail-reply-sender.png
+share/icons/Neu/22x22/actions/mail-send-receive.png
+share/icons/Neu/22x22/actions/mail_forward.png
+share/icons/Neu/22x22/actions/mail_new.png
+share/icons/Neu/22x22/actions/mail_reply.png
+share/icons/Neu/22x22/actions/mail_replyall.png
+share/icons/Neu/22x22/actions/next.png
+share/icons/Neu/22x22/actions/previous.png
+share/icons/Neu/22x22/actions/process-stop.png
+share/icons/Neu/22x22/actions/redhat-home.png
+share/icons/Neu/22x22/actions/redo.png
+share/icons/Neu/22x22/actions/reload.png
+share/icons/Neu/22x22/actions/reload3.png
+share/icons/Neu/22x22/actions/reload_all_tabs.png
+share/icons/Neu/22x22/actions/reload_page.png
+share/icons/Neu/22x22/actions/remove.png
+share/icons/Neu/22x22/actions/rightjust.png
+share/icons/Neu/22x22/actions/search.png
+share/icons/Neu/22x22/actions/start.png
+share/icons/Neu/22x22/actions/stock_add-bookmark.png
+share/icons/Neu/22x22/actions/stock_bottom.png
+share/icons/Neu/22x22/actions/stock_copy.png
+share/icons/Neu/22x22/actions/stock_cut.png
+share/icons/Neu/22x22/actions/stock_delete.png
+share/icons/Neu/22x22/actions/stock_down.png
+share/icons/Neu/22x22/actions/stock_file-properites.png
+share/icons/Neu/22x22/actions/stock_first.png
+share/icons/Neu/22x22/actions/stock_help-add-bookmark.png
+share/icons/Neu/22x22/actions/stock_home.png
+share/icons/Neu/22x22/actions/stock_last.png
+share/icons/Neu/22x22/actions/stock_left.png
+share/icons/Neu/22x22/actions/stock_mail-compose.png
+share/icons/Neu/22x22/actions/stock_mail-forward.png
+share/icons/Neu/22x22/actions/stock_mail-reply-to-all.png
+share/icons/Neu/22x22/actions/stock_mail-reply.png
+share/icons/Neu/22x22/actions/stock_mail-send-receive.png
+share/icons/Neu/22x22/actions/stock_new-address-book.png
+share/icons/Neu/22x22/actions/stock_new-appointment.png
+share/icons/Neu/22x22/actions/stock_new-bcard.png
+share/icons/Neu/22x22/actions/stock_new-dir.png
+share/icons/Neu/22x22/actions/stock_new-text.png
+share/icons/Neu/22x22/actions/stock_new-window.png
+share/icons/Neu/22x22/actions/stock_paste.png
+share/icons/Neu/22x22/actions/stock_print-preview.png
+share/icons/Neu/22x22/actions/stock_print.png
+share/icons/Neu/22x22/actions/stock_properties.png
+share/icons/Neu/22x22/actions/stock_redo.png
+share/icons/Neu/22x22/actions/stock_refresh.png
+share/icons/Neu/22x22/actions/stock_right.png
+share/icons/Neu/22x22/actions/stock_save-as.png
+share/icons/Neu/22x22/actions/stock_save.png
+share/icons/Neu/22x22/actions/stock_search-and-replace.png
+share/icons/Neu/22x22/actions/stock_search.png
+share/icons/Neu/22x22/actions/stock_select-all.png
+share/icons/Neu/22x22/actions/stock_stop.png
+share/icons/Neu/22x22/actions/stock_text_bold.png
+share/icons/Neu/22x22/actions/stock_text_center.png
+share/icons/Neu/22x22/actions/stock_text_indent.png
+share/icons/Neu/22x22/actions/stock_text_italic.png
+share/icons/Neu/22x22/actions/stock_text_justify.png
+share/icons/Neu/22x22/actions/stock_text_left.png
+share/icons/Neu/22x22/actions/stock_text_right.png
+share/icons/Neu/22x22/actions/stock_text_underlined.png
+share/icons/Neu/22x22/actions/stock_text_unindent.png
+share/icons/Neu/22x22/actions/stock_top.png
+share/icons/Neu/22x22/actions/stock_undo.png
+share/icons/Neu/22x22/actions/stock_up.png
+share/icons/Neu/22x22/actions/stop.png
+share/icons/Neu/22x22/actions/system-lock-screen.png
+share/icons/Neu/22x22/actions/system-log-out.png
+share/icons/Neu/22x22/actions/system-run.png
+share/icons/Neu/22x22/actions/system-search.png
+share/icons/Neu/22x22/actions/system-shutdown.png
+share/icons/Neu/22x22/actions/text_bold.png
+share/icons/Neu/22x22/actions/text_italic.png
+share/icons/Neu/22x22/actions/text_under.png
+share/icons/Neu/22x22/actions/top.png
+share/icons/Neu/22x22/actions/undo.png
+share/icons/Neu/22x22/actions/up.png
+share/icons/Neu/22x22/actions/view-refresh.png
+share/icons/Neu/22x22/actions/window-new.png
+share/icons/Neu/22x22/actions/window_new.png
+share/icons/Neu/22x22/actions/xfce-system-lock.png
+share/icons/Neu/22x22/apps/access.png
+share/icons/Neu/22x22/apps/accessibility-directory.png
+share/icons/Neu/22x22/apps/accessories-archiver.png
+share/icons/Neu/22x22/apps/accessories-character-map.png
+share/icons/Neu/22x22/apps/accessories-text-editor.png
+share/icons/Neu/22x22/apps/arts.png
+share/icons/Neu/22x22/apps/background.png
+share/icons/Neu/22x22/apps/browser.png
+share/icons/Neu/22x22/apps/config-users.png
+share/icons/Neu/22x22/apps/email.png
+share/icons/Neu/22x22/apps/epiphany-bookmarks.png
+share/icons/Neu/22x22/apps/evolution.png
+share/icons/Neu/22x22/apps/file-manager.png
+share/icons/Neu/22x22/apps/fonts.png
+share/icons/Neu/22x22/apps/gaim.png
+share/icons/Neu/22x22/apps/gimp.png
+share/icons/Neu/22x22/apps/gnome-character-map.png
+share/icons/Neu/22x22/apps/gnome-help.png
+share/icons/Neu/22x22/apps/gnome-mixer.png
+share/icons/Neu/22x22/apps/gnome-monitor.png
+share/icons/Neu/22x22/apps/gnome-remote-desktop.png
+share/icons/Neu/22x22/apps/gnome-session.png
+share/icons/Neu/22x22/apps/gnome-settings-accessibility-technologies.png
+share/icons/Neu/22x22/apps/gnome-settings-background.png
+share/icons/Neu/22x22/apps/gnome-settings-font.png
+share/icons/Neu/22x22/apps/gnome-terminal.png
+share/icons/Neu/22x22/apps/gnome-window-manager.png
+share/icons/Neu/22x22/apps/graphics-image-viewer.png
+share/icons/Neu/22x22/apps/graphics-svg-editor.png
+share/icons/Neu/22x22/apps/gtk-help.png
+share/icons/Neu/22x22/apps/gucharmap.png
+share/icons/Neu/22x22/apps/help-browser.png
+share/icons/Neu/22x22/apps/help.png
+share/icons/Neu/22x22/apps/internet-group-chat.png
+share/icons/Neu/22x22/apps/internet-mail.png
+share/icons/Neu/22x22/apps/internet-web-browser.png
+share/icons/Neu/22x22/apps/kcharselect.png
+share/icons/Neu/22x22/apps/kcmkwm.png
+share/icons/Neu/22x22/apps/kcmsound.png
+share/icons/Neu/22x22/apps/kedit.png
+share/icons/Neu/22x22/apps/kfm.png
+share/icons/Neu/22x22/apps/khelpcenter.png
+share/icons/Neu/22x22/apps/konsole.png
+share/icons/Neu/22x22/apps/krfb.png
+share/icons/Neu/22x22/apps/kscreensaver.png
+share/icons/Neu/22x22/apps/ksysguard.png
+share/icons/Neu/22x22/apps/kuser.png
+share/icons/Neu/22x22/apps/kwin.png
+share/icons/Neu/22x22/apps/mail_generic.png
+share/icons/Neu/22x22/apps/multimedia-volume-control.png
+share/icons/Neu/22x22/apps/multimedia.png
+share/icons/Neu/22x22/apps/openterm.png
+share/icons/Neu/22x22/apps/preferences-desktop-accessibility.png
+share/icons/Neu/22x22/apps/preferences-desktop-assistive-technology.png
+share/icons/Neu/22x22/apps/preferences-desktop-font.png
+share/icons/Neu/22x22/apps/preferences-desktop-remote-desktop.png
+share/icons/Neu/22x22/apps/preferences-desktop-screensaver.png
+share/icons/Neu/22x22/apps/preferences-desktop-wallpaper.png
+share/icons/Neu/22x22/apps/preferences-system-network-proxy.png
+share/icons/Neu/22x22/apps/preferences-system-session.png
+share/icons/Neu/22x22/apps/preferences-system-windows.png
+share/icons/Neu/22x22/apps/preferences-user-information.png
+share/icons/Neu/22x22/apps/proxy-config.png
+share/icons/Neu/22x22/apps/proxy.png
+share/icons/Neu/22x22/apps/redhat-email.png
+share/icons/Neu/22x22/apps/redhat-filemanager.png
+share/icons/Neu/22x22/apps/redhat-web-browser.png
+share/icons/Neu/22x22/apps/screensaver.png
+share/icons/Neu/22x22/apps/sound-juicer.png
+share/icons/Neu/22x22/apps/stock_help.png
+share/icons/Neu/22x22/apps/stock_proxy.png
+share/icons/Neu/22x22/apps/susehelpcenter.png
+share/icons/Neu/22x22/apps/system-config-users.png
+share/icons/Neu/22x22/apps/system-file-manager.png
+share/icons/Neu/22x22/apps/system-installer.png
+share/icons/Neu/22x22/apps/system-software-update.png
+share/icons/Neu/22x22/apps/system-users.png
+share/icons/Neu/22x22/apps/terminal.png
+share/icons/Neu/22x22/apps/text-editor.png
+share/icons/Neu/22x22/apps/update-manager.png
+share/icons/Neu/22x22/apps/utilities-system-monitor.png
+share/icons/Neu/22x22/apps/utilities-terminal.png
+share/icons/Neu/22x22/apps/volume-knob.png
+share/icons/Neu/22x22/apps/wallpaper.png
+share/icons/Neu/22x22/apps/web-browser.png
+share/icons/Neu/22x22/apps/xfce-filemanager.png
+share/icons/Neu/22x22/apps/xfce-mail.png
+share/icons/Neu/22x22/apps/xfce-terminal.png
+share/icons/Neu/22x22/apps/xfce4-backdrop.png
+share/icons/Neu/22x22/apps/xfce4-mixer.png
+share/icons/Neu/22x22/apps/xfce4-session.png
+share/icons/Neu/22x22/apps/xfwm4.png
+share/icons/Neu/22x22/apps/xscreensaver.png
+share/icons/Neu/22x22/apps/zen-icon.png
+share/icons/Neu/22x22/categories/applications-accessories.png
+share/icons/Neu/22x22/categories/applications-development.png
+share/icons/Neu/22x22/categories/applications-games.png
+share/icons/Neu/22x22/categories/applications-graphics.png
+share/icons/Neu/22x22/categories/applications-internet.png
+share/icons/Neu/22x22/categories/applications-multimedia.png
+share/icons/Neu/22x22/categories/applications-office.png
+share/icons/Neu/22x22/categories/applications-other.png
+share/icons/Neu/22x22/categories/applications-system.png
+share/icons/Neu/22x22/categories/gnome-applications.png
+share/icons/Neu/22x22/categories/gnome-control-center.png
+share/icons/Neu/22x22/categories/gnome-devel.png
+share/icons/Neu/22x22/categories/gnome-globe.png
+share/icons/Neu/22x22/categories/gnome-graphics.png
+share/icons/Neu/22x22/categories/gnome-joystick.png
+share/icons/Neu/22x22/categories/gnome-multimedia.png
+share/icons/Neu/22x22/categories/gnome-settings.png
+share/icons/Neu/22x22/categories/gnome-system.png
+share/icons/Neu/22x22/categories/gnome-util.png
+share/icons/Neu/22x22/categories/gtk-preferences.png
+share/icons/Neu/22x22/categories/input_devices_settings.png
+share/icons/Neu/22x22/categories/kcontrol.png
+share/icons/Neu/22x22/categories/package_development.png
+share/icons/Neu/22x22/categories/package_games.png
+share/icons/Neu/22x22/categories/package_graphics.png
+share/icons/Neu/22x22/categories/package_multimedia.png
+share/icons/Neu/22x22/categories/package_network.png
+share/icons/Neu/22x22/categories/package_office.png
+share/icons/Neu/22x22/categories/package_settings.png
+share/icons/Neu/22x22/categories/package_system.png
+share/icons/Neu/22x22/categories/package_utilities.png
+share/icons/Neu/22x22/categories/preferences-desktop-peripherals.png
+share/icons/Neu/22x22/categories/preferences-desktop.png
+share/icons/Neu/22x22/categories/preferences-system.png
+share/icons/Neu/22x22/categories/redhat-accessories.png
+share/icons/Neu/22x22/categories/redhat-games.png
+share/icons/Neu/22x22/categories/redhat-graphics.png
+share/icons/Neu/22x22/categories/redhat-internet.png
+share/icons/Neu/22x22/categories/redhat-office.png
+share/icons/Neu/22x22/categories/redhat-preferences.png
+share/icons/Neu/22x22/categories/redhat-programming.png
+share/icons/Neu/22x22/categories/redhat-sound_video.png
+share/icons/Neu/22x22/categories/redhat-system_settings.png
+share/icons/Neu/22x22/categories/redhat-system_tools.png
+share/icons/Neu/22x22/categories/stock_internet.png
+share/icons/Neu/22x22/categories/xfce-games.png
+share/icons/Neu/22x22/categories/xfce-graphics.png
+share/icons/Neu/22x22/categories/xfce-internet.png
+share/icons/Neu/22x22/categories/xfce-multimedia.png
+share/icons/Neu/22x22/categories/xfce-office.png
+share/icons/Neu/22x22/categories/xfce-system-settings.png
+share/icons/Neu/22x22/categories/xfce-utils.png
+share/icons/Neu/22x22/categories/xfce4-settings.png
+share/icons/Neu/22x22/devices/3floppy_unmount.png
+share/icons/Neu/22x22/devices/battery.png
+share/icons/Neu/22x22/devices/chardevice.png
+share/icons/Neu/22x22/devices/computer.png
+share/icons/Neu/22x22/devices/display.png
+share/icons/Neu/22x22/devices/drive-cdrom.png
+share/icons/Neu/22x22/devices/drive-harddisk.png
+share/icons/Neu/22x22/devices/drive-removable-media.png
+share/icons/Neu/22x22/devices/gnome-dev-battery.png
+share/icons/Neu/22x22/devices/gnome-dev-computer.png
+share/icons/Neu/22x22/devices/gnome-dev-floppy.png
+share/icons/Neu/22x22/devices/gnome-dev-harddisk-1394.png
+share/icons/Neu/22x22/devices/gnome-dev-harddisk-usb.png
+share/icons/Neu/22x22/devices/gnome-dev-harddisk.png
+share/icons/Neu/22x22/devices/gnome-dev-keyboard.png
+share/icons/Neu/22x22/devices/gnome-dev-mouse-ball.png
+share/icons/Neu/22x22/devices/gnome-dev-mouse-optical.png
+share/icons/Neu/22x22/devices/gnome-dev-printer.png
+share/icons/Neu/22x22/devices/gnome-dev-removable-1394.png
+share/icons/Neu/22x22/devices/gnome-dev-removable-usb.png
+share/icons/Neu/22x22/devices/gnome-dev-removable.png
+share/icons/Neu/22x22/devices/gnome-fs-client.png
+share/icons/Neu/22x22/devices/gtk-floppy.png
+share/icons/Neu/22x22/devices/gtk-harddisk.png
+share/icons/Neu/22x22/devices/harddrive.png
+share/icons/Neu/22x22/devices/hdd_unmount.png
+share/icons/Neu/22x22/devices/input-keyboard.png
+share/icons/Neu/22x22/devices/input-mouse.png
+share/icons/Neu/22x22/devices/keyboard.png
+share/icons/Neu/22x22/devices/kjobviewer.png
+share/icons/Neu/22x22/devices/kxkb.png
+share/icons/Neu/22x22/devices/media-cdrom-audio.png
+share/icons/Neu/22x22/devices/media-cdrom.png
+share/icons/Neu/22x22/devices/media-cdrw.png
+share/icons/Neu/22x22/devices/media-dvd.png
+share/icons/Neu/22x22/devices/media-dvdrw.png
+share/icons/Neu/22x22/devices/media-floppy.png
+share/icons/Neu/22x22/devices/mouse.png
+share/icons/Neu/22x22/devices/printer-remote.png
+share/icons/Neu/22x22/devices/printer.png
+share/icons/Neu/22x22/devices/printer1.png
+share/icons/Neu/22x22/devices/printmgr.png
+share/icons/Neu/22x22/devices/stock_printers.png
+share/icons/Neu/22x22/devices/system-floppy.png
+share/icons/Neu/22x22/devices/system.png
+share/icons/Neu/22x22/devices/usbpendrive_unmount.png
+share/icons/Neu/22x22/devices/video-display.png
+share/icons/Neu/22x22/devices/xfce-printer.png
+share/icons/Neu/22x22/devices/xfce4-display.png
+share/icons/Neu/22x22/devices/xfce4-keyboard.png
+share/icons/Neu/22x22/devices/xfce4-mouse.png
+share/icons/Neu/22x22/devices/yast_HD.png
+share/icons/Neu/22x22/devices/yast_idetude.png
+share/icons/Neu/22x22/devices/yast_mouse.png
+share/icons/Neu/22x22/devices/yast_printer.png
+share/icons/Neu/22x22/emblems/emblem-important.png
+share/icons/Neu/22x22/emblems/emblem-symbolic-link.png
+share/icons/Neu/22x22/emblems/emblem-system.png
+share/icons/Neu/22x22/emblems/emblem-web.png
+share/icons/Neu/22x22/emblems/stock_mail-priority-high.png
+share/icons/Neu/22x22/mimetypes/application-certificate.png
+share/icons/Neu/22x22/mimetypes/application-x-executable.png
+share/icons/Neu/22x22/mimetypes/ascii.png
+share/icons/Neu/22x22/mimetypes/audio-x-generic.png
+share/icons/Neu/22x22/mimetypes/binary.png
+share/icons/Neu/22x22/mimetypes/contents2.png
+share/icons/Neu/22x22/mimetypes/deb.png
+share/icons/Neu/22x22/mimetypes/document.png
+share/icons/Neu/22x22/mimetypes/empty.png
+share/icons/Neu/22x22/mimetypes/exec.png
+share/icons/Neu/22x22/mimetypes/folder_tar.png
+share/icons/Neu/22x22/mimetypes/font-x-generic.png
+share/icons/Neu/22x22/mimetypes/font.png
+share/icons/Neu/22x22/mimetypes/font_bitmap.png
+share/icons/Neu/22x22/mimetypes/font_truetype.png
+share/icons/Neu/22x22/mimetypes/font_type1.png
+share/icons/Neu/22x22/mimetypes/gnome-fs-executable.png
+share/icons/Neu/22x22/mimetypes/gnome-mime-application-msword.png
+share/icons/Neu/22x22/mimetypes/gnome-mime-application-ogg.png
+share/icons/Neu/22x22/mimetypes/gnome-mime-application-pdf.png
+share/icons/Neu/22x22/mimetypes/gnome-mime-application-postscript.png
+share/icons/Neu/22x22/mimetypes/gnome-mime-application-rtf.png
+share/icons/Neu/22x22/mimetypes/gnome-mime-application-vnd.lotus-1-2-3.png
+share/icons/Neu/22x22/mimetypes/gnome-mime-application-vnd.ms-excel.png
+share/icons/Neu/22x22/mimetypes/gnome-mime-application-vnd.oasis.opendocument.spreadsheet.png
+share/icons/Neu/22x22/mimetypes/gnome-mime-application-vnd.oasis.opendocument.text-web.png
+share/icons/Neu/22x22/mimetypes/gnome-mime-application-vnd.oasis.opendocument.text.png
+share/icons/Neu/22x22/mimetypes/gnome-mime-application-vnd.rn-realmedia-secure.png
+share/icons/Neu/22x22/mimetypes/gnome-mime-application-vnd.rn-realmedia-vbr.png
+share/icons/Neu/22x22/mimetypes/gnome-mime-application-vnd.rn-realmedia.png
+share/icons/Neu/22x22/mimetypes/gnome-mime-application-vnd.stardivision.calc.png
+share/icons/Neu/22x22/mimetypes/gnome-mime-application-vnd.stardivision.writer.png
+share/icons/Neu/22x22/mimetypes/gnome-mime-application-vnd.sun.xml.calc.png
+share/icons/Neu/22x22/mimetypes/gnome-mime-application-vnd.sun.xml.writer.png
+share/icons/Neu/22x22/mimetypes/gnome-mime-application-wordperfect.png
+share/icons/Neu/22x22/mimetypes/gnome-mime-application-x-7z-compressed.png
+share/icons/Neu/22x22/mimetypes/gnome-mime-application-x-abiword.png
+share/icons/Neu/22x22/mimetypes/gnome-mime-application-x-applix-spreadsheet.png
+share/icons/Neu/22x22/mimetypes/gnome-mime-application-x-applix-word.png
+share/icons/Neu/22x22/mimetypes/gnome-mime-application-x-archive.png
+share/icons/Neu/22x22/mimetypes/gnome-mime-application-x-arj.png
+share/icons/Neu/22x22/mimetypes/gnome-mime-application-x-bzip-compressed-tar.png
+share/icons/Neu/22x22/mimetypes/gnome-mime-application-x-bzip.png
+share/icons/Neu/22x22/mimetypes/gnome-mime-application-x-compress.png
+share/icons/Neu/22x22/mimetypes/gnome-mime-application-x-compressed-tar.png
+share/icons/Neu/22x22/mimetypes/gnome-mime-application-x-cpio-compressed.png
+share/icons/Neu/22x22/mimetypes/gnome-mime-application-x-cpio.png
+share/icons/Neu/22x22/mimetypes/gnome-mime-application-x-deb.png
+share/icons/Neu/22x22/mimetypes/gnome-mime-application-x-dvi.png
+share/icons/Neu/22x22/mimetypes/gnome-mime-application-x-executable.png
+share/icons/Neu/22x22/mimetypes/gnome-mime-application-x-font-afm.png
+share/icons/Neu/22x22/mimetypes/gnome-mime-application-x-font-bdf.png
+share/icons/Neu/22x22/mimetypes/gnome-mime-application-x-font-linux-psf.png
+share/icons/Neu/22x22/mimetypes/gnome-mime-application-x-font-pcf.png
+share/icons/Neu/22x22/mimetypes/gnome-mime-application-x-font-sunos-news.png
+share/icons/Neu/22x22/mimetypes/gnome-mime-application-x-font-ttf.png
+share/icons/Neu/22x22/mimetypes/gnome-mime-application-x-gnumeric.png
+share/icons/Neu/22x22/mimetypes/gnome-mime-application-x-gzip.png
+share/icons/Neu/22x22/mimetypes/gnome-mime-application-x-gzpostscript.png
+share/icons/Neu/22x22/mimetypes/gnome-mime-application-x-jar.png
+share/icons/Neu/22x22/mimetypes/gnome-mime-application-x-killustrator.png
+share/icons/Neu/22x22/mimetypes/gnome-mime-application-x-kspread.png
+share/icons/Neu/22x22/mimetypes/gnome-mime-application-x-kword.png
+share/icons/Neu/22x22/mimetypes/gnome-mime-application-x-lha.png
+share/icons/Neu/22x22/mimetypes/gnome-mime-application-x-lhz.png
+share/icons/Neu/22x22/mimetypes/gnome-mime-application-x-ms-dos-executable.png
+share/icons/Neu/22x22/mimetypes/gnome-mime-application-x-perl.png
+share/icons/Neu/22x22/mimetypes/gnome-mime-application-x-php.png
+share/icons/Neu/22x22/mimetypes/gnome-mime-application-x-python-bytecode.png
+share/icons/Neu/22x22/mimetypes/gnome-mime-application-x-rar.png
+share/icons/Neu/22x22/mimetypes/gnome-mime-application-x-rpm.png
+share/icons/Neu/22x22/mimetypes/gnome-mime-application-x-scribus.png
+share/icons/Neu/22x22/mimetypes/gnome-mime-application-x-shellscript.png
+share/icons/Neu/22x22/mimetypes/gnome-mime-application-x-shockwave-flash.png
+share/icons/Neu/22x22/mimetypes/gnome-mime-application-x-stuffit.png
+share/icons/Neu/22x22/mimetypes/gnome-mime-application-x-tar.png
+share/icons/Neu/22x22/mimetypes/gnome-mime-application-x-tarz.png
+share/icons/Neu/22x22/mimetypes/gnome-mime-application-x-tex.png
+share/icons/Neu/22x22/mimetypes/gnome-mime-application-xhtml+xml.png
+share/icons/Neu/22x22/mimetypes/gnome-mime-application-zip.png
+share/icons/Neu/22x22/mimetypes/gnome-mime-audio.png
+share/icons/Neu/22x22/mimetypes/gnome-mime-image.png
+share/icons/Neu/22x22/mimetypes/gnome-mime-text-html.png
+share/icons/Neu/22x22/mimetypes/gnome-mime-text-vnd.wap.wml.png
+share/icons/Neu/22x22/mimetypes/gnome-mime-text-x-csh.png
+share/icons/Neu/22x22/mimetypes/gnome-mime-text-x-python.png
+share/icons/Neu/22x22/mimetypes/gnome-mime-text-x-sh.png
+share/icons/Neu/22x22/mimetypes/gnome-mime-text-x-vcard.png
+share/icons/Neu/22x22/mimetypes/gnome-mime-text-x-zsh.png
+share/icons/Neu/22x22/mimetypes/gnome-mime-text.png
+share/icons/Neu/22x22/mimetypes/gnome-mime-video.png
+share/icons/Neu/22x22/mimetypes/gnome-mime-x-font-afm.png
+share/icons/Neu/22x22/mimetypes/gnome-package.png
+share/icons/Neu/22x22/mimetypes/html.png
+share/icons/Neu/22x22/mimetypes/image-x-generic.png
+share/icons/Neu/22x22/mimetypes/image.png
+share/icons/Neu/22x22/mimetypes/mime_ascii.png
+share/icons/Neu/22x22/mimetypes/misc-cd-image.png
+share/icons/Neu/22x22/mimetypes/misc.png
+share/icons/Neu/22x22/mimetypes/package-x-generic.png
+share/icons/Neu/22x22/mimetypes/package.png
+share/icons/Neu/22x22/mimetypes/package_editors.png
+share/icons/Neu/22x22/mimetypes/package_wordprocessing.png
+share/icons/Neu/22x22/mimetypes/rpm.png
+share/icons/Neu/22x22/mimetypes/shellscript.png
+share/icons/Neu/22x22/mimetypes/sound.png
+share/icons/Neu/22x22/mimetypes/spreadsheet.png
+share/icons/Neu/22x22/mimetypes/stock_addressbook.png
+share/icons/Neu/22x22/mimetypes/stock_certificate.png
+share/icons/Neu/22x22/mimetypes/stock_script.png
+share/icons/Neu/22x22/mimetypes/tar.png
+share/icons/Neu/22x22/mimetypes/text-html.png
+share/icons/Neu/22x22/mimetypes/text-x-generic.png
+share/icons/Neu/22x22/mimetypes/text-x-script.png
+share/icons/Neu/22x22/mimetypes/text-x-source.png
+share/icons/Neu/22x22/mimetypes/tgz.png
+share/icons/Neu/22x22/mimetypes/txt.png
+share/icons/Neu/22x22/mimetypes/txt2.png
+share/icons/Neu/22x22/mimetypes/unknown.png
+share/icons/Neu/22x22/mimetypes/vcard.png
+share/icons/Neu/22x22/mimetypes/video-x-generic.png
+share/icons/Neu/22x22/mimetypes/video.png
+share/icons/Neu/22x22/mimetypes/wordprocessing.png
+share/icons/Neu/22x22/mimetypes/www.png
+share/icons/Neu/22x22/mimetypes/x-office-address-book.png
+share/icons/Neu/22x22/mimetypes/x-office-document.png
+share/icons/Neu/22x22/mimetypes/x-office-spreadsheet.png
+share/icons/Neu/22x22/mimetypes/zip.png
+share/icons/Neu/22x22/places/application-x-gnome-saved-search.png
+share/icons/Neu/22x22/places/desktop.png
+share/icons/Neu/22x22/places/distributor-logo.png
+share/icons/Neu/22x22/places/emptytrash.png
+share/icons/Neu/22x22/places/folder-remote.png
+share/icons/Neu/22x22/places/folder-saved-search.png
+share/icons/Neu/22x22/places/folder.png
+share/icons/Neu/22x22/places/folder_home.png
+share/icons/Neu/22x22/places/gnome-fs-desktop.png
+share/icons/Neu/22x22/places/gnome-fs-directory.png
+share/icons/Neu/22x22/places/gnome-fs-ftp.png
+share/icons/Neu/22x22/places/gnome-fs-home.png
+share/icons/Neu/22x22/places/gnome-fs-network.png
+share/icons/Neu/22x22/places/gnome-fs-nfs.png
+share/icons/Neu/22x22/places/gnome-fs-server.png
+share/icons/Neu/22x22/places/gnome-fs-share.png
+share/icons/Neu/22x22/places/gnome-fs-smb.png
+share/icons/Neu/22x22/places/gnome-fs-ssh.png
+share/icons/Neu/22x22/places/gnome-fs-trash-empty.png
+share/icons/Neu/22x22/places/gnome-main-menu.png
+share/icons/Neu/22x22/places/gnome-mime-x-directory-nfs-server.png
+share/icons/Neu/22x22/places/gnome-mime-x-directory-smb-server.png
+share/icons/Neu/22x22/places/gnome-mime-x-directory-smb-share.png
+share/icons/Neu/22x22/places/gnome-mime-x-directory-smb-workgroup.png
+share/icons/Neu/22x22/places/gnome-stock-trash.png
+share/icons/Neu/22x22/places/gtk-network.png
+share/icons/Neu/22x22/places/network-server.png
+share/icons/Neu/22x22/places/network-workgroup.png
+share/icons/Neu/22x22/places/network.png
+share/icons/Neu/22x22/places/network_local.png
+share/icons/Neu/22x22/places/novell-button.png
+share/icons/Neu/22x22/places/redhat-network-server.png
+share/icons/Neu/22x22/places/server.png
+share/icons/Neu/22x22/places/start-here.png
+share/icons/Neu/22x22/places/stock_folder.png
+share/icons/Neu/22x22/places/trashcan_empty.png
+share/icons/Neu/22x22/places/user-desktop.png
+share/icons/Neu/22x22/places/user-home.png
+share/icons/Neu/22x22/places/user-trash.png
+share/icons/Neu/22x22/places/xfce-trash_empty.png
+share/icons/Neu/22x22/status/audio-volume-high.png
+share/icons/Neu/22x22/status/audio-volume-low.png
+share/icons/Neu/22x22/status/audio-volume-medium.png
+share/icons/Neu/22x22/status/audio-volume-muted.png
+share/icons/Neu/22x22/status/audio-volume-zero.png
+share/icons/Neu/22x22/status/battery-caution.png
+share/icons/Neu/22x22/status/connect_creating.png
+share/icons/Neu/22x22/status/connect_established.png
+share/icons/Neu/22x22/status/connect_no.png
+share/icons/Neu/22x22/status/dialog-error.png
+share/icons/Neu/22x22/status/dialog-information.png
+share/icons/Neu/22x22/status/dialog-password.png
+share/icons/Neu/22x22/status/dialog-question.png
+share/icons/Neu/22x22/status/dialog-warning.png
+share/icons/Neu/22x22/status/edittrash.png
+share/icons/Neu/22x22/status/error.png
+share/icons/Neu/22x22/status/folder-drag-accept.png
+share/icons/Neu/22x22/status/folder-open.png
+share/icons/Neu/22x22/status/folder-visiting.png
+share/icons/Neu/22x22/status/folder_open.png
+share/icons/Neu/22x22/status/gnome-fs-directory-accept.png
+share/icons/Neu/22x22/status/gnome-fs-directory-visiting.png
+share/icons/Neu/22x22/status/gnome-fs-loading-icon.png
+share/icons/Neu/22x22/status/gnome-fs-trash-full.png
+share/icons/Neu/22x22/status/gnome-netstatus-disconn.png
+share/icons/Neu/22x22/status/gnome-netstatus-error.png
+share/icons/Neu/22x22/status/gnome-netstatus-idle.png
+share/icons/Neu/22x22/status/gnome-netstatus-rx.png
+share/icons/Neu/22x22/status/gnome-netstatus-tx.png
+share/icons/Neu/22x22/status/gnome-netstatus-txrx.png
+share/icons/Neu/22x22/status/gnome-stock-trash-full.png
+share/icons/Neu/22x22/status/gtk-dialog-authentication.png
+share/icons/Neu/22x22/status/gtk-dialog-error.png
+share/icons/Neu/22x22/status/gtk-dialog-info.png
+share/icons/Neu/22x22/status/gtk-dialog-question.png
+share/icons/Neu/22x22/status/gtk-dialog-warning.png
+share/icons/Neu/22x22/status/gtk-missing-image.png
+share/icons/Neu/22x22/status/image-loading.png
+share/icons/Neu/22x22/status/image-missing.png
+share/icons/Neu/22x22/status/important.png
+share/icons/Neu/22x22/status/info.png
+share/icons/Neu/22x22/status/messagebox_critical.png
+share/icons/Neu/22x22/status/messagebox_info.png
+share/icons/Neu/22x22/status/messagebox_warning.png
+share/icons/Neu/22x22/status/network-error.png
+share/icons/Neu/22x22/status/network-idle.png
+share/icons/Neu/22x22/status/network-offline.png
+share/icons/Neu/22x22/status/network-receive.png
+share/icons/Neu/22x22/status/network-transmit-receive.png
+share/icons/Neu/22x22/status/network-transmit.png
+share/icons/Neu/22x22/status/nm-adhoc.png
+share/icons/Neu/22x22/status/nm-device-wired.png
+share/icons/Neu/22x22/status/nm-device-wireless.png
+share/icons/Neu/22x22/status/nm-no-connection.png
+share/icons/Neu/22x22/status/printer-error.png
+share/icons/Neu/22x22/status/stock_dialog-error.png
+share/icons/Neu/22x22/status/stock_dialog-info.png
+share/icons/Neu/22x22/status/stock_dialog-question.png
+share/icons/Neu/22x22/status/stock_dialog-warning.png
+share/icons/Neu/22x22/status/stock_open.png
+share/icons/Neu/22x22/status/stock_trash_full.png
+share/icons/Neu/22x22/status/stock_volume-0.png
+share/icons/Neu/22x22/status/stock_volume-max.png
+share/icons/Neu/22x22/status/stock_volume-med.png
+share/icons/Neu/22x22/status/stock_volume-min.png
+share/icons/Neu/22x22/status/stock_volume-mute.png
+share/icons/Neu/22x22/status/stock_volume.png
+share/icons/Neu/22x22/status/trashcan_full.png
+share/icons/Neu/22x22/status/user-trash-full.png
+share/icons/Neu/22x22/status/xfce-trash_full.png
+share/icons/Neu/24x24/actions/add.png
+share/icons/Neu/24x24/actions/address-book-new.png
+share/icons/Neu/24x24/actions/appointment-new.png
+share/icons/Neu/24x24/actions/appointment.png
+share/icons/Neu/24x24/actions/back.png
+share/icons/Neu/24x24/actions/bookmark-new.png
+share/icons/Neu/24x24/actions/bookmark_add.png
+share/icons/Neu/24x24/actions/bookmarks_list_add.png
+share/icons/Neu/24x24/actions/bottom.png
+share/icons/Neu/24x24/actions/button_cancel.png
+share/icons/Neu/24x24/actions/cancel.png
+share/icons/Neu/24x24/actions/centrejust.png
+share/icons/Neu/24x24/actions/contact-new.png
+share/icons/Neu/24x24/actions/dialog-cancel.png
+share/icons/Neu/24x24/actions/dialog-close.png
+share/icons/Neu/24x24/actions/dialog-ok.png
+share/icons/Neu/24x24/actions/document-new.png
+share/icons/Neu/24x24/actions/document-open.png
+share/icons/Neu/24x24/actions/document-print-preview.png
+share/icons/Neu/24x24/actions/document-print.png
+share/icons/Neu/24x24/actions/document-properties.png
+share/icons/Neu/24x24/actions/document-save-as.png
+share/icons/Neu/24x24/actions/document-save.png
+share/icons/Neu/24x24/actions/down.png
+share/icons/Neu/24x24/actions/edit-clear.png
+share/icons/Neu/24x24/actions/edit-copy.png
+share/icons/Neu/24x24/actions/edit-cut.png
+share/icons/Neu/24x24/actions/edit-delete.png
+share/icons/Neu/24x24/actions/edit-find-replace.png
+share/icons/Neu/24x24/actions/edit-find.png
+share/icons/Neu/24x24/actions/edit-paste.png
+share/icons/Neu/24x24/actions/edit-redo.png
+share/icons/Neu/24x24/actions/edit-select-all.png
+share/icons/Neu/24x24/actions/edit-undo.png
+share/icons/Neu/24x24/actions/editclear.png
+share/icons/Neu/24x24/actions/editcopy.png
+share/icons/Neu/24x24/actions/editcut.png
+share/icons/Neu/24x24/actions/editdelete.png
+share/icons/Neu/24x24/actions/editpaste.png
+share/icons/Neu/24x24/actions/exit.png
+share/icons/Neu/24x24/actions/filefind.png
+share/icons/Neu/24x24/actions/filenew.png
+share/icons/Neu/24x24/actions/fileopen.png
+share/icons/Neu/24x24/actions/fileprint.png
+share/icons/Neu/24x24/actions/filequickprint.png
+share/icons/Neu/24x24/actions/filesave.png
+share/icons/Neu/24x24/actions/filesaveas.png
+share/icons/Neu/24x24/actions/find.png
+share/icons/Neu/24x24/actions/finish.png
+share/icons/Neu/24x24/actions/folder-new.png
+share/icons/Neu/24x24/actions/folder_new.png
+share/icons/Neu/24x24/actions/format-indent-less.png
+share/icons/Neu/24x24/actions/format-indent-more.png
+share/icons/Neu/24x24/actions/format-justify-center.png
+share/icons/Neu/24x24/actions/format-justify-fill.png
+share/icons/Neu/24x24/actions/format-justify-left.png
+share/icons/Neu/24x24/actions/format-justify-right.png
+share/icons/Neu/24x24/actions/format-text-bold.png
+share/icons/Neu/24x24/actions/format-text-italic.png
+share/icons/Neu/24x24/actions/format-text-underline.png
+share/icons/Neu/24x24/actions/forward.png
+share/icons/Neu/24x24/actions/gnome-lockscreen.png
+share/icons/Neu/24x24/actions/gnome-logout.png
+share/icons/Neu/24x24/actions/gnome-run.png
+share/icons/Neu/24x24/actions/gnome-searchtool.png
+share/icons/Neu/24x24/actions/gnome-stock-mail-fwd.png
+share/icons/Neu/24x24/actions/gnome-stock-mail-new.png
+share/icons/Neu/24x24/actions/gnome-stock-mail-rpl.png
+share/icons/Neu/24x24/actions/gnome-stock-text-indent.png
+share/icons/Neu/24x24/actions/gnome-stock-text-unindent.png
+share/icons/Neu/24x24/actions/go-bottom.png
+share/icons/Neu/24x24/actions/go-down.png
+share/icons/Neu/24x24/actions/go-first.png
+share/icons/Neu/24x24/actions/go-home.png
+share/icons/Neu/24x24/actions/go-jump.png
+share/icons/Neu/24x24/actions/go-last.png
+share/icons/Neu/24x24/actions/go-next.png
+share/icons/Neu/24x24/actions/go-previous.png
+share/icons/Neu/24x24/actions/go-top.png
+share/icons/Neu/24x24/actions/go-up.png
+share/icons/Neu/24x24/actions/gohome.png
+share/icons/Neu/24x24/actions/gtk-add.png
+share/icons/Neu/24x24/actions/gtk-bold.png
+share/icons/Neu/24x24/actions/gtk-cancel.png
+share/icons/Neu/24x24/actions/gtk-clear.png
+share/icons/Neu/24x24/actions/gtk-copy.png
+share/icons/Neu/24x24/actions/gtk-cut.png
+share/icons/Neu/24x24/actions/gtk-delete.png
+share/icons/Neu/24x24/actions/gtk-find-and-replace.png
+share/icons/Neu/24x24/actions/gtk-find.png
+share/icons/Neu/24x24/actions/gtk-go-back-ltr.png
+share/icons/Neu/24x24/actions/gtk-go-back-rtl.png
+share/icons/Neu/24x24/actions/gtk-go-down.png
+share/icons/Neu/24x24/actions/gtk-go-forward-ltr.png
+share/icons/Neu/24x24/actions/gtk-go-forward-rtl.png
+share/icons/Neu/24x24/actions/gtk-go-up.png
+share/icons/Neu/24x24/actions/gtk-goto-bottom.png
+share/icons/Neu/24x24/actions/gtk-goto-first-ltr.png
+share/icons/Neu/24x24/actions/gtk-goto-first-rtl.png
+share/icons/Neu/24x24/actions/gtk-goto-last-ltr.png
+share/icons/Neu/24x24/actions/gtk-goto-last-rtl.png
+share/icons/Neu/24x24/actions/gtk-goto-top.png
+share/icons/Neu/24x24/actions/gtk-home.png
+share/icons/Neu/24x24/actions/gtk-indent.png
+share/icons/Neu/24x24/actions/gtk-italic.png
+share/icons/Neu/24x24/actions/gtk-jump-to-ltr.png
+share/icons/Neu/24x24/actions/gtk-jump-to-rtl.png
+share/icons/Neu/24x24/actions/gtk-justify-center.png
+share/icons/Neu/24x24/actions/gtk-justify-fill.png
+share/icons/Neu/24x24/actions/gtk-justify-left.png
+share/icons/Neu/24x24/actions/gtk-justify-right.png
+share/icons/Neu/24x24/actions/gtk-new.png
+share/icons/Neu/24x24/actions/gtk-open.png
+share/icons/Neu/24x24/actions/gtk-paste.png
+share/icons/Neu/24x24/actions/gtk-print-preview.png
+share/icons/Neu/24x24/actions/gtk-print.png
+share/icons/Neu/24x24/actions/gtk-properties.png
+share/icons/Neu/24x24/actions/gtk-redo-ltr.png
+share/icons/Neu/24x24/actions/gtk-refresh.png
+share/icons/Neu/24x24/actions/gtk-remove.png
+share/icons/Neu/24x24/actions/gtk-save-as.png
+share/icons/Neu/24x24/actions/gtk-save.png
+share/icons/Neu/24x24/actions/gtk-select-all.png
+share/icons/Neu/24x24/actions/gtk-stop.png
+share/icons/Neu/24x24/actions/gtk-underline.png
+share/icons/Neu/24x24/actions/gtk-undo-ltr.png
+share/icons/Neu/24x24/actions/gtk-unindent.png
+share/icons/Neu/24x24/actions/help-about.png
+share/icons/Neu/24x24/actions/kfind.png
+share/icons/Neu/24x24/actions/kfm_home.png
+share/icons/Neu/24x24/actions/leftjust.png
+share/icons/Neu/24x24/actions/list-add.png
+share/icons/Neu/24x24/actions/list-remove.png
+share/icons/Neu/24x24/actions/lock.png
+share/icons/Neu/24x24/actions/mail-forward.png
+share/icons/Neu/24x24/actions/mail-message-new.png
+share/icons/Neu/24x24/actions/mail-reply-all.png
+share/icons/Neu/24x24/actions/mail-reply-sender.png
+share/icons/Neu/24x24/actions/mail-send-receive.png
+share/icons/Neu/24x24/actions/mail_forward.png
+share/icons/Neu/24x24/actions/mail_new.png
+share/icons/Neu/24x24/actions/mail_reply.png
+share/icons/Neu/24x24/actions/mail_replyall.png
+share/icons/Neu/24x24/actions/next.png
+share/icons/Neu/24x24/actions/previous.png
+share/icons/Neu/24x24/actions/process-stop.png
+share/icons/Neu/24x24/actions/redhat-home.png
+share/icons/Neu/24x24/actions/redo.png
+share/icons/Neu/24x24/actions/reload.png
+share/icons/Neu/24x24/actions/reload3.png
+share/icons/Neu/24x24/actions/reload_all_tabs.png
+share/icons/Neu/24x24/actions/reload_page.png
+share/icons/Neu/24x24/actions/remove.png
+share/icons/Neu/24x24/actions/rightjust.png
+share/icons/Neu/24x24/actions/search.png
+share/icons/Neu/24x24/actions/start.png
+share/icons/Neu/24x24/actions/stock_add-bookmark.png
+share/icons/Neu/24x24/actions/stock_bottom.png
+share/icons/Neu/24x24/actions/stock_copy.png
+share/icons/Neu/24x24/actions/stock_cut.png
+share/icons/Neu/24x24/actions/stock_delete.png
+share/icons/Neu/24x24/actions/stock_down.png
+share/icons/Neu/24x24/actions/stock_file-properites.png
+share/icons/Neu/24x24/actions/stock_first.png
+share/icons/Neu/24x24/actions/stock_help-add-bookmark.png
+share/icons/Neu/24x24/actions/stock_home.png
+share/icons/Neu/24x24/actions/stock_last.png
+share/icons/Neu/24x24/actions/stock_left.png
+share/icons/Neu/24x24/actions/stock_mail-compose.png
+share/icons/Neu/24x24/actions/stock_mail-forward.png
+share/icons/Neu/24x24/actions/stock_mail-reply-to-all.png
+share/icons/Neu/24x24/actions/stock_mail-reply.png
+share/icons/Neu/24x24/actions/stock_mail-send-receive.png
+share/icons/Neu/24x24/actions/stock_new-address-book.png
+share/icons/Neu/24x24/actions/stock_new-appointment.png
+share/icons/Neu/24x24/actions/stock_new-bcard.png
+share/icons/Neu/24x24/actions/stock_new-dir.png
+share/icons/Neu/24x24/actions/stock_new-text.png
+share/icons/Neu/24x24/actions/stock_new-window.png
+share/icons/Neu/24x24/actions/stock_paste.png
+share/icons/Neu/24x24/actions/stock_print-preview.png
+share/icons/Neu/24x24/actions/stock_print.png
+share/icons/Neu/24x24/actions/stock_properties.png
+share/icons/Neu/24x24/actions/stock_redo.png
+share/icons/Neu/24x24/actions/stock_refresh.png
+share/icons/Neu/24x24/actions/stock_right.png
+share/icons/Neu/24x24/actions/stock_save-as.png
+share/icons/Neu/24x24/actions/stock_save.png
+share/icons/Neu/24x24/actions/stock_search-and-replace.png
+share/icons/Neu/24x24/actions/stock_search.png
+share/icons/Neu/24x24/actions/stock_select-all.png
+share/icons/Neu/24x24/actions/stock_stop.png
+share/icons/Neu/24x24/actions/stock_text_bold.png
+share/icons/Neu/24x24/actions/stock_text_center.png
+share/icons/Neu/24x24/actions/stock_text_indent.png
+share/icons/Neu/24x24/actions/stock_text_italic.png
+share/icons/Neu/24x24/actions/stock_text_justify.png
+share/icons/Neu/24x24/actions/stock_text_left.png
+share/icons/Neu/24x24/actions/stock_text_right.png
+share/icons/Neu/24x24/actions/stock_text_underlined.png
+share/icons/Neu/24x24/actions/stock_text_unindent.png
+share/icons/Neu/24x24/actions/stock_top.png
+share/icons/Neu/24x24/actions/stock_undo.png
+share/icons/Neu/24x24/actions/stock_up.png
+share/icons/Neu/24x24/actions/stop.png
+share/icons/Neu/24x24/actions/system-lock-screen.png
+share/icons/Neu/24x24/actions/system-log-out.png
+share/icons/Neu/24x24/actions/system-run.png
+share/icons/Neu/24x24/actions/system-search.png
+share/icons/Neu/24x24/actions/system-shutdown.png
+share/icons/Neu/24x24/actions/text_bold.png
+share/icons/Neu/24x24/actions/text_italic.png
+share/icons/Neu/24x24/actions/text_under.png
+share/icons/Neu/24x24/actions/top.png
+share/icons/Neu/24x24/actions/undo.png
+share/icons/Neu/24x24/actions/up.png
+share/icons/Neu/24x24/actions/view-refresh.png
+share/icons/Neu/24x24/actions/window-new.png
+share/icons/Neu/24x24/actions/window_new.png
+share/icons/Neu/24x24/actions/xfce-system-lock.png
+share/icons/Neu/24x24/apps/access.png
+share/icons/Neu/24x24/apps/accessibility-directory.png
+share/icons/Neu/24x24/apps/accessories-archiver.png
+share/icons/Neu/24x24/apps/accessories-character-map.png
+share/icons/Neu/24x24/apps/accessories-text-editor.png
+share/icons/Neu/24x24/apps/arts.png
+share/icons/Neu/24x24/apps/background.png
+share/icons/Neu/24x24/apps/browser.png
+share/icons/Neu/24x24/apps/config-users.png
+share/icons/Neu/24x24/apps/email.png
+share/icons/Neu/24x24/apps/epiphany-bookmarks.png
+share/icons/Neu/24x24/apps/evolution.png
+share/icons/Neu/24x24/apps/file-manager.png
+share/icons/Neu/24x24/apps/fonts.png
+share/icons/Neu/24x24/apps/gaim.png
+share/icons/Neu/24x24/apps/gimp.png
+share/icons/Neu/24x24/apps/gnome-character-map.png
+share/icons/Neu/24x24/apps/gnome-help.png
+share/icons/Neu/24x24/apps/gnome-mixer.png
+share/icons/Neu/24x24/apps/gnome-monitor.png
+share/icons/Neu/24x24/apps/gnome-remote-desktop.png
+share/icons/Neu/24x24/apps/gnome-session.png
+share/icons/Neu/24x24/apps/gnome-settings-accessibility-technologies.png
+share/icons/Neu/24x24/apps/gnome-settings-background.png
+share/icons/Neu/24x24/apps/gnome-settings-font.png
+share/icons/Neu/24x24/apps/gnome-terminal.png
+share/icons/Neu/24x24/apps/gnome-window-manager.png
+share/icons/Neu/24x24/apps/graphics-image-viewer.png
+share/icons/Neu/24x24/apps/graphics-svg-editor.png
+share/icons/Neu/24x24/apps/gtk-help.png
+share/icons/Neu/24x24/apps/gucharmap.png
+share/icons/Neu/24x24/apps/help-browser.png
+share/icons/Neu/24x24/apps/help.png
+share/icons/Neu/24x24/apps/internet-group-chat.png
+share/icons/Neu/24x24/apps/internet-mail.png
+share/icons/Neu/24x24/apps/internet-news-reader.png
+share/icons/Neu/24x24/apps/internet-web-browser.png
+share/icons/Neu/24x24/apps/kcharselect.png
+share/icons/Neu/24x24/apps/kcmkwm.png
+share/icons/Neu/24x24/apps/kcmsound.png
+share/icons/Neu/24x24/apps/kedit.png
+share/icons/Neu/24x24/apps/kfm.png
+share/icons/Neu/24x24/apps/khelpcenter.png
+share/icons/Neu/24x24/apps/konsole.png
+share/icons/Neu/24x24/apps/krfb.png
+share/icons/Neu/24x24/apps/kscreensaver.png
+share/icons/Neu/24x24/apps/ksysguard.png
+share/icons/Neu/24x24/apps/kuser.png
+share/icons/Neu/24x24/apps/kwin.png
+share/icons/Neu/24x24/apps/mail_generic.png
+share/icons/Neu/24x24/apps/multimedia-volume-control.png
+share/icons/Neu/24x24/apps/multimedia.png
+share/icons/Neu/24x24/apps/openterm.png
+share/icons/Neu/24x24/apps/preferences-desktop-accessibility.png
+share/icons/Neu/24x24/apps/preferences-desktop-assistive-technology.png
+share/icons/Neu/24x24/apps/preferences-desktop-font.png
+share/icons/Neu/24x24/apps/preferences-desktop-remote-desktop.png
+share/icons/Neu/24x24/apps/preferences-desktop-screensaver.png
+share/icons/Neu/24x24/apps/preferences-desktop-wallpaper.png
+share/icons/Neu/24x24/apps/preferences-system-network-proxy.png
+share/icons/Neu/24x24/apps/preferences-system-session.png
+share/icons/Neu/24x24/apps/preferences-system-windows.png
+share/icons/Neu/24x24/apps/preferences-user-information.png
+share/icons/Neu/24x24/apps/proxy-config.png
+share/icons/Neu/24x24/apps/proxy.png
+share/icons/Neu/24x24/apps/redhat-email.png
+share/icons/Neu/24x24/apps/redhat-filemanager.png
+share/icons/Neu/24x24/apps/redhat-web-browser.png
+share/icons/Neu/24x24/apps/screensaver.png
+share/icons/Neu/24x24/apps/sound-juicer.png
+share/icons/Neu/24x24/apps/stock_help.png
+share/icons/Neu/24x24/apps/stock_proxy.png
+share/icons/Neu/24x24/apps/susehelpcenter.png
+share/icons/Neu/24x24/apps/system-config-users.png
+share/icons/Neu/24x24/apps/system-file-manager.png
+share/icons/Neu/24x24/apps/system-installer.png
+share/icons/Neu/24x24/apps/system-software-update.png
+share/icons/Neu/24x24/apps/system-users.png
+share/icons/Neu/24x24/apps/terminal.png
+share/icons/Neu/24x24/apps/text-editor.png
+share/icons/Neu/24x24/apps/update-manager.png
+share/icons/Neu/24x24/apps/utilities-system-monitor.png
+share/icons/Neu/24x24/apps/utilities-terminal.png
+share/icons/Neu/24x24/apps/volume-knob.png
+share/icons/Neu/24x24/apps/wallpaper.png
+share/icons/Neu/24x24/apps/web-browser.png
+share/icons/Neu/24x24/apps/xfce-filemanager.png
+share/icons/Neu/24x24/apps/xfce-mail.png
+share/icons/Neu/24x24/apps/xfce-terminal.png
+share/icons/Neu/24x24/apps/xfce4-backdrop.png
+share/icons/Neu/24x24/apps/xfce4-mixer.png
+share/icons/Neu/24x24/apps/xfce4-session.png
+share/icons/Neu/24x24/apps/xfwm4.png
+share/icons/Neu/24x24/apps/xscreensaver.png
+share/icons/Neu/24x24/apps/zen-icon.png
+share/icons/Neu/24x24/categories/applications-accessories.png
+share/icons/Neu/24x24/categories/applications-development.png
+share/icons/Neu/24x24/categories/applications-games.png
+share/icons/Neu/24x24/categories/applications-graphics.png
+share/icons/Neu/24x24/categories/applications-internet.png
+share/icons/Neu/24x24/categories/applications-multimedia.png
+share/icons/Neu/24x24/categories/applications-office.png
+share/icons/Neu/24x24/categories/applications-other.png
+share/icons/Neu/24x24/categories/applications-system.png
+share/icons/Neu/24x24/categories/gnome-applications.png
+share/icons/Neu/24x24/categories/gnome-control-center.png
+share/icons/Neu/24x24/categories/gnome-devel.png
+share/icons/Neu/24x24/categories/gnome-globe.png
+share/icons/Neu/24x24/categories/gnome-graphics.png
+share/icons/Neu/24x24/categories/gnome-joystick.png
+share/icons/Neu/24x24/categories/gnome-multimedia.png
+share/icons/Neu/24x24/categories/gnome-settings.png
+share/icons/Neu/24x24/categories/gnome-system.png
+share/icons/Neu/24x24/categories/gnome-util.png
+share/icons/Neu/24x24/categories/gtk-preferences.png
+share/icons/Neu/24x24/categories/input_devices_settings.png
+share/icons/Neu/24x24/categories/kcontrol.png
+share/icons/Neu/24x24/categories/package_development.png
+share/icons/Neu/24x24/categories/package_games.png
+share/icons/Neu/24x24/categories/package_graphics.png
+share/icons/Neu/24x24/categories/package_multimedia.png
+share/icons/Neu/24x24/categories/package_network.png
+share/icons/Neu/24x24/categories/package_office.png
+share/icons/Neu/24x24/categories/package_settings.png
+share/icons/Neu/24x24/categories/package_system.png
+share/icons/Neu/24x24/categories/package_utilities.png
+share/icons/Neu/24x24/categories/preferences-desktop-peripherals.png
+share/icons/Neu/24x24/categories/preferences-desktop.png
+share/icons/Neu/24x24/categories/preferences-system.png
+share/icons/Neu/24x24/categories/redhat-accessories.png
+share/icons/Neu/24x24/categories/redhat-games.png
+share/icons/Neu/24x24/categories/redhat-graphics.png
+share/icons/Neu/24x24/categories/redhat-internet.png
+share/icons/Neu/24x24/categories/redhat-office.png
+share/icons/Neu/24x24/categories/redhat-preferences.png
+share/icons/Neu/24x24/categories/redhat-programming.png
+share/icons/Neu/24x24/categories/redhat-sound_video.png
+share/icons/Neu/24x24/categories/redhat-system_settings.png
+share/icons/Neu/24x24/categories/redhat-system_tools.png
+share/icons/Neu/24x24/categories/stock_internet.png
+share/icons/Neu/24x24/categories/xfce-games.png
+share/icons/Neu/24x24/categories/xfce-graphics.png
+share/icons/Neu/24x24/categories/xfce-internet.png
+share/icons/Neu/24x24/categories/xfce-multimedia.png
+share/icons/Neu/24x24/categories/xfce-office.png
+share/icons/Neu/24x24/categories/xfce-system-settings.png
+share/icons/Neu/24x24/categories/xfce-utils.png
+share/icons/Neu/24x24/categories/xfce4-settings.png
+share/icons/Neu/24x24/devices/3floppy_unmount.png
+share/icons/Neu/24x24/devices/battery.png
+share/icons/Neu/24x24/devices/chardevice.png
+share/icons/Neu/24x24/devices/computer.png
+share/icons/Neu/24x24/devices/display.png
+share/icons/Neu/24x24/devices/drive-cdrom.png
+share/icons/Neu/24x24/devices/drive-harddisk.png
+share/icons/Neu/24x24/devices/drive-removable-media.png
+share/icons/Neu/24x24/devices/gnome-dev-battery.png
+share/icons/Neu/24x24/devices/gnome-dev-computer.png
+share/icons/Neu/24x24/devices/gnome-dev-floppy.png
+share/icons/Neu/24x24/devices/gnome-dev-harddisk-1394.png
+share/icons/Neu/24x24/devices/gnome-dev-harddisk-usb.png
+share/icons/Neu/24x24/devices/gnome-dev-harddisk.png
+share/icons/Neu/24x24/devices/gnome-dev-keyboard.png
+share/icons/Neu/24x24/devices/gnome-dev-mouse-ball.png
+share/icons/Neu/24x24/devices/gnome-dev-mouse-optical.png
+share/icons/Neu/24x24/devices/gnome-dev-printer.png
+share/icons/Neu/24x24/devices/gnome-dev-removable-1394.png
+share/icons/Neu/24x24/devices/gnome-dev-removable-usb.png
+share/icons/Neu/24x24/devices/gnome-dev-removable.png
+share/icons/Neu/24x24/devices/gnome-fs-client.png
+share/icons/Neu/24x24/devices/gtk-floppy.png
+share/icons/Neu/24x24/devices/gtk-harddisk.png
+share/icons/Neu/24x24/devices/harddrive.png
+share/icons/Neu/24x24/devices/hdd_unmount.png
+share/icons/Neu/24x24/devices/input-keyboard.png
+share/icons/Neu/24x24/devices/input-mouse.png
+share/icons/Neu/24x24/devices/keyboard.png
+share/icons/Neu/24x24/devices/kjobviewer.png
+share/icons/Neu/24x24/devices/kxkb.png
+share/icons/Neu/24x24/devices/media-cdrom-audio.png
+share/icons/Neu/24x24/devices/media-cdrom.png
+share/icons/Neu/24x24/devices/media-cdrw.png
+share/icons/Neu/24x24/devices/media-dvd.png
+share/icons/Neu/24x24/devices/media-dvdrw.png
+share/icons/Neu/24x24/devices/media-floppy.png
+share/icons/Neu/24x24/devices/mouse.png
+share/icons/Neu/24x24/devices/printer-remote.png
+share/icons/Neu/24x24/devices/printer.png
+share/icons/Neu/24x24/devices/printer1.png
+share/icons/Neu/24x24/devices/printmgr.png
+share/icons/Neu/24x24/devices/stock_printers.png
+share/icons/Neu/24x24/devices/system-floppy.png
+share/icons/Neu/24x24/devices/system.png
+share/icons/Neu/24x24/devices/usbpendrive_unmount.png
+share/icons/Neu/24x24/devices/video-display.png
+share/icons/Neu/24x24/devices/xfce-printer.png
+share/icons/Neu/24x24/devices/xfce4-display.png
+share/icons/Neu/24x24/devices/xfce4-keyboard.png
+share/icons/Neu/24x24/devices/xfce4-mouse.png
+share/icons/Neu/24x24/devices/yast_HD.png
+share/icons/Neu/24x24/devices/yast_idetude.png
+share/icons/Neu/24x24/devices/yast_mouse.png
+share/icons/Neu/24x24/devices/yast_printer.png
+share/icons/Neu/24x24/mimetypes/application-certificate.png
+share/icons/Neu/24x24/mimetypes/application-x-executable.png
+share/icons/Neu/24x24/mimetypes/ascii.png
+share/icons/Neu/24x24/mimetypes/audio-x-generic.png
+share/icons/Neu/24x24/mimetypes/binary.png
+share/icons/Neu/24x24/mimetypes/contents2.png
+share/icons/Neu/24x24/mimetypes/deb.png
+share/icons/Neu/24x24/mimetypes/document.png
+share/icons/Neu/24x24/mimetypes/empty.png
+share/icons/Neu/24x24/mimetypes/exec.png
+share/icons/Neu/24x24/mimetypes/folder_tar.png
+share/icons/Neu/24x24/mimetypes/font-x-generic.png
+share/icons/Neu/24x24/mimetypes/font.png
+share/icons/Neu/24x24/mimetypes/font_bitmap.png
+share/icons/Neu/24x24/mimetypes/font_truetype.png
+share/icons/Neu/24x24/mimetypes/font_type1.png
+share/icons/Neu/24x24/mimetypes/gnome-fs-executable.png
+share/icons/Neu/24x24/mimetypes/gnome-mime-application-msword.png
+share/icons/Neu/24x24/mimetypes/gnome-mime-application-ogg.png
+share/icons/Neu/24x24/mimetypes/gnome-mime-application-pdf.png
+share/icons/Neu/24x24/mimetypes/gnome-mime-application-postscript.png
+share/icons/Neu/24x24/mimetypes/gnome-mime-application-rtf.png
+share/icons/Neu/24x24/mimetypes/gnome-mime-application-vnd.lotus-1-2-3.png
+share/icons/Neu/24x24/mimetypes/gnome-mime-application-vnd.ms-excel.png
+share/icons/Neu/24x24/mimetypes/gnome-mime-application-vnd.oasis.opendocument.spreadsheet.png
+share/icons/Neu/24x24/mimetypes/gnome-mime-application-vnd.oasis.opendocument.text-web.png
+share/icons/Neu/24x24/mimetypes/gnome-mime-application-vnd.oasis.opendocument.text.png
+share/icons/Neu/24x24/mimetypes/gnome-mime-application-vnd.rn-realmedia-secure.png
+share/icons/Neu/24x24/mimetypes/gnome-mime-application-vnd.rn-realmedia-vbr.png
+share/icons/Neu/24x24/mimetypes/gnome-mime-application-vnd.rn-realmedia.png
+share/icons/Neu/24x24/mimetypes/gnome-mime-application-vnd.stardivision.calc.png
+share/icons/Neu/24x24/mimetypes/gnome-mime-application-vnd.stardivision.writer.png
+share/icons/Neu/24x24/mimetypes/gnome-mime-application-vnd.sun.xml.calc.png
+share/icons/Neu/24x24/mimetypes/gnome-mime-application-vnd.sun.xml.writer.png
+share/icons/Neu/24x24/mimetypes/gnome-mime-application-wordperfect.png
+share/icons/Neu/24x24/mimetypes/gnome-mime-application-x-7z-compressed.png
+share/icons/Neu/24x24/mimetypes/gnome-mime-application-x-abiword.png
+share/icons/Neu/24x24/mimetypes/gnome-mime-application-x-applix-spreadsheet.png
+share/icons/Neu/24x24/mimetypes/gnome-mime-application-x-applix-word.png
+share/icons/Neu/24x24/mimetypes/gnome-mime-application-x-archive.png
+share/icons/Neu/24x24/mimetypes/gnome-mime-application-x-arj.png
+share/icons/Neu/24x24/mimetypes/gnome-mime-application-x-bzip-compressed-tar.png
+share/icons/Neu/24x24/mimetypes/gnome-mime-application-x-bzip.png
+share/icons/Neu/24x24/mimetypes/gnome-mime-application-x-compress.png
+share/icons/Neu/24x24/mimetypes/gnome-mime-application-x-compressed-tar.png
+share/icons/Neu/24x24/mimetypes/gnome-mime-application-x-cpio-compressed.png
+share/icons/Neu/24x24/mimetypes/gnome-mime-application-x-cpio.png
+share/icons/Neu/24x24/mimetypes/gnome-mime-application-x-deb.png
+share/icons/Neu/24x24/mimetypes/gnome-mime-application-x-dvi.png
+share/icons/Neu/24x24/mimetypes/gnome-mime-application-x-executable.png
+share/icons/Neu/24x24/mimetypes/gnome-mime-application-x-font-afm.png
+share/icons/Neu/24x24/mimetypes/gnome-mime-application-x-font-bdf.png
+share/icons/Neu/24x24/mimetypes/gnome-mime-application-x-font-linux-psf.png
+share/icons/Neu/24x24/mimetypes/gnome-mime-application-x-font-pcf.png
+share/icons/Neu/24x24/mimetypes/gnome-mime-application-x-font-sunos-news.png
+share/icons/Neu/24x24/mimetypes/gnome-mime-application-x-font-ttf.png
+share/icons/Neu/24x24/mimetypes/gnome-mime-application-x-gnumeric.png
+share/icons/Neu/24x24/mimetypes/gnome-mime-application-x-gzip.png
+share/icons/Neu/24x24/mimetypes/gnome-mime-application-x-gzpostscript.png
+share/icons/Neu/24x24/mimetypes/gnome-mime-application-x-jar.png
+share/icons/Neu/24x24/mimetypes/gnome-mime-application-x-killustrator.png
+share/icons/Neu/24x24/mimetypes/gnome-mime-application-x-kspread.png
+share/icons/Neu/24x24/mimetypes/gnome-mime-application-x-kword.png
+share/icons/Neu/24x24/mimetypes/gnome-mime-application-x-lha.png
+share/icons/Neu/24x24/mimetypes/gnome-mime-application-x-lhz.png
+share/icons/Neu/24x24/mimetypes/gnome-mime-application-x-ms-dos-executable.png
+share/icons/Neu/24x24/mimetypes/gnome-mime-application-x-perl.png
+share/icons/Neu/24x24/mimetypes/gnome-mime-application-x-php.png
+share/icons/Neu/24x24/mimetypes/gnome-mime-application-x-python-bytecode.png
+share/icons/Neu/24x24/mimetypes/gnome-mime-application-x-rar.png
+share/icons/Neu/24x24/mimetypes/gnome-mime-application-x-rpm.png
+share/icons/Neu/24x24/mimetypes/gnome-mime-application-x-scribus.png
+share/icons/Neu/24x24/mimetypes/gnome-mime-application-x-shellscript.png
+share/icons/Neu/24x24/mimetypes/gnome-mime-application-x-shockwave-flash.png
+share/icons/Neu/24x24/mimetypes/gnome-mime-application-x-stuffit.png
+share/icons/Neu/24x24/mimetypes/gnome-mime-application-x-tar.png
+share/icons/Neu/24x24/mimetypes/gnome-mime-application-x-tarz.png
+share/icons/Neu/24x24/mimetypes/gnome-mime-application-x-tex.png
+share/icons/Neu/24x24/mimetypes/gnome-mime-application-xhtml+xml.png
+share/icons/Neu/24x24/mimetypes/gnome-mime-application-zip.png
+share/icons/Neu/24x24/mimetypes/gnome-mime-audio.png
+share/icons/Neu/24x24/mimetypes/gnome-mime-image.png
+share/icons/Neu/24x24/mimetypes/gnome-mime-text-html.png
+share/icons/Neu/24x24/mimetypes/gnome-mime-text-vnd.wap.wml.png
+share/icons/Neu/24x24/mimetypes/gnome-mime-text-x-csh.png
+share/icons/Neu/24x24/mimetypes/gnome-mime-text-x-python.png
+share/icons/Neu/24x24/mimetypes/gnome-mime-text-x-sh.png
+share/icons/Neu/24x24/mimetypes/gnome-mime-text-x-vcard.png
+share/icons/Neu/24x24/mimetypes/gnome-mime-text-x-zsh.png
+share/icons/Neu/24x24/mimetypes/gnome-mime-text.png
+share/icons/Neu/24x24/mimetypes/gnome-mime-video.png
+share/icons/Neu/24x24/mimetypes/gnome-mime-x-font-afm.png
+share/icons/Neu/24x24/mimetypes/gnome-package.png
+share/icons/Neu/24x24/mimetypes/html.png
+share/icons/Neu/24x24/mimetypes/image-x-generic.png
+share/icons/Neu/24x24/mimetypes/image.png
+share/icons/Neu/24x24/mimetypes/mime_ascii.png
+share/icons/Neu/24x24/mimetypes/misc-cd-image.png
+share/icons/Neu/24x24/mimetypes/misc.png
+share/icons/Neu/24x24/mimetypes/package-x-generic.png
+share/icons/Neu/24x24/mimetypes/package.png
+share/icons/Neu/24x24/mimetypes/package_editors.png
+share/icons/Neu/24x24/mimetypes/package_wordprocessing.png
+share/icons/Neu/24x24/mimetypes/rpm.png
+share/icons/Neu/24x24/mimetypes/shellscript.png
+share/icons/Neu/24x24/mimetypes/sound.png
+share/icons/Neu/24x24/mimetypes/spreadsheet.png
+share/icons/Neu/24x24/mimetypes/stock_addressbook.png
+share/icons/Neu/24x24/mimetypes/stock_certificate.png
+share/icons/Neu/24x24/mimetypes/stock_script.png
+share/icons/Neu/24x24/mimetypes/tar.png
+share/icons/Neu/24x24/mimetypes/text-html.png
+share/icons/Neu/24x24/mimetypes/text-x-generic.png
+share/icons/Neu/24x24/mimetypes/text-x-script.png
+share/icons/Neu/24x24/mimetypes/text-x-source.png
+share/icons/Neu/24x24/mimetypes/tgz.png
+share/icons/Neu/24x24/mimetypes/txt.png
+share/icons/Neu/24x24/mimetypes/txt2.png
+share/icons/Neu/24x24/mimetypes/unknown.png
+share/icons/Neu/24x24/mimetypes/vcard.png
+share/icons/Neu/24x24/mimetypes/video-x-generic.png
+share/icons/Neu/24x24/mimetypes/video.png
+share/icons/Neu/24x24/mimetypes/wordprocessing.png
+share/icons/Neu/24x24/mimetypes/www.png
+share/icons/Neu/24x24/mimetypes/x-office-address-book.png
+share/icons/Neu/24x24/mimetypes/x-office-document.png
+share/icons/Neu/24x24/mimetypes/x-office-spreadsheet.png
+share/icons/Neu/24x24/mimetypes/zip.png
+share/icons/Neu/24x24/places/application-x-gnome-saved-search.png
+share/icons/Neu/24x24/places/desktop.png
+share/icons/Neu/24x24/places/distributor-logo.png
+share/icons/Neu/24x24/places/emptytrash.png
+share/icons/Neu/24x24/places/folder-remote.png
+share/icons/Neu/24x24/places/folder-saved-search.png
+share/icons/Neu/24x24/places/folder.png
+share/icons/Neu/24x24/places/folder_home.png
+share/icons/Neu/24x24/places/gnome-fs-desktop.png
+share/icons/Neu/24x24/places/gnome-fs-directory.png
+share/icons/Neu/24x24/places/gnome-fs-ftp.png
+share/icons/Neu/24x24/places/gnome-fs-home.png
+share/icons/Neu/24x24/places/gnome-fs-network.png
+share/icons/Neu/24x24/places/gnome-fs-nfs.png
+share/icons/Neu/24x24/places/gnome-fs-server.png
+share/icons/Neu/24x24/places/gnome-fs-share.png
+share/icons/Neu/24x24/places/gnome-fs-smb.png
+share/icons/Neu/24x24/places/gnome-fs-ssh.png
+share/icons/Neu/24x24/places/gnome-fs-trash-empty.png
+share/icons/Neu/24x24/places/gnome-main-menu.png
+share/icons/Neu/24x24/places/gnome-mime-x-directory-nfs-server.png
+share/icons/Neu/24x24/places/gnome-mime-x-directory-smb-server.png
+share/icons/Neu/24x24/places/gnome-mime-x-directory-smb-share.png
+share/icons/Neu/24x24/places/gnome-mime-x-directory-smb-workgroup.png
+share/icons/Neu/24x24/places/gnome-stock-trash.png
+share/icons/Neu/24x24/places/gtk-network.png
+share/icons/Neu/24x24/places/network-server.png
+share/icons/Neu/24x24/places/network-workgroup.png
+share/icons/Neu/24x24/places/network.png
+share/icons/Neu/24x24/places/network_local.png
+share/icons/Neu/24x24/places/novell-button.png
+share/icons/Neu/24x24/places/redhat-network-server.png
+share/icons/Neu/24x24/places/server.png
+share/icons/Neu/24x24/places/start-here.png
+share/icons/Neu/24x24/places/stock_folder.png
+share/icons/Neu/24x24/places/trashcan_empty.png
+share/icons/Neu/24x24/places/user-desktop.png
+share/icons/Neu/24x24/places/user-home.png
+share/icons/Neu/24x24/places/user-trash.png
+share/icons/Neu/24x24/places/xfce-trash_empty.png
+share/icons/Neu/24x24/status/audio-volume-high.png
+share/icons/Neu/24x24/status/audio-volume-low.png
+share/icons/Neu/24x24/status/audio-volume-medium.png
+share/icons/Neu/24x24/status/audio-volume-muted.png
+share/icons/Neu/24x24/status/audio-volume-zero.png
+share/icons/Neu/24x24/status/battery-caution.png
+share/icons/Neu/24x24/status/connect_creating.png
+share/icons/Neu/24x24/status/connect_established.png
+share/icons/Neu/24x24/status/connect_no.png
+share/icons/Neu/24x24/status/dialog-error.png
+share/icons/Neu/24x24/status/dialog-information.png
+share/icons/Neu/24x24/status/dialog-password.png
+share/icons/Neu/24x24/status/dialog-question.png
+share/icons/Neu/24x24/status/dialog-warning.png
+share/icons/Neu/24x24/status/edittrash.png
+share/icons/Neu/24x24/status/error.png
+share/icons/Neu/24x24/status/folder-drag-accept.png
+share/icons/Neu/24x24/status/folder-open.png
+share/icons/Neu/24x24/status/folder-visiting.png
+share/icons/Neu/24x24/status/folder_open.png
+share/icons/Neu/24x24/status/gnome-fs-directory-accept.png
+share/icons/Neu/24x24/status/gnome-fs-directory-visiting.png
+share/icons/Neu/24x24/status/gnome-fs-loading-icon.png
+share/icons/Neu/24x24/status/gnome-fs-trash-full.png
+share/icons/Neu/24x24/status/gnome-netstatus-disconn.png
+share/icons/Neu/24x24/status/gnome-netstatus-error.png
+share/icons/Neu/24x24/status/gnome-netstatus-idle.png
+share/icons/Neu/24x24/status/gnome-netstatus-rx.png
+share/icons/Neu/24x24/status/gnome-netstatus-tx.png
+share/icons/Neu/24x24/status/gnome-netstatus-txrx.png
+share/icons/Neu/24x24/status/gnome-stock-trash-full.png
+share/icons/Neu/24x24/status/gtk-dialog-authentication.png
+share/icons/Neu/24x24/status/gtk-dialog-error.png
+share/icons/Neu/24x24/status/gtk-dialog-info.png
+share/icons/Neu/24x24/status/gtk-dialog-question.png
+share/icons/Neu/24x24/status/gtk-dialog-warning.png
+share/icons/Neu/24x24/status/gtk-missing-image.png
+share/icons/Neu/24x24/status/image-loading.png
+share/icons/Neu/24x24/status/image-missing.png
+share/icons/Neu/24x24/status/important.png
+share/icons/Neu/24x24/status/info.png
+share/icons/Neu/24x24/status/messagebox_critical.png
+share/icons/Neu/24x24/status/messagebox_info.png
+share/icons/Neu/24x24/status/messagebox_warning.png
+share/icons/Neu/24x24/status/network-error.png
+share/icons/Neu/24x24/status/network-idle.png
+share/icons/Neu/24x24/status/network-offline.png
+share/icons/Neu/24x24/status/network-receive.png
+share/icons/Neu/24x24/status/network-transmit-receive.png
+share/icons/Neu/24x24/status/network-transmit.png
+share/icons/Neu/24x24/status/nm-adhoc.png
+share/icons/Neu/24x24/status/nm-device-wired.png
+share/icons/Neu/24x24/status/nm-device-wireless.png
+share/icons/Neu/24x24/status/nm-no-connection.png
+share/icons/Neu/24x24/status/printer-error.png
+share/icons/Neu/24x24/status/stock_dialog-error.png
+share/icons/Neu/24x24/status/stock_dialog-info.png
+share/icons/Neu/24x24/status/stock_dialog-question.png
+share/icons/Neu/24x24/status/stock_dialog-warning.png
+share/icons/Neu/24x24/status/stock_open.png
+share/icons/Neu/24x24/status/stock_trash_full.png
+share/icons/Neu/24x24/status/stock_volume-0.png
+share/icons/Neu/24x24/status/stock_volume-max.png
+share/icons/Neu/24x24/status/stock_volume-med.png
+share/icons/Neu/24x24/status/stock_volume-min.png
+share/icons/Neu/24x24/status/stock_volume-mute.png
+share/icons/Neu/24x24/status/stock_volume.png
+share/icons/Neu/24x24/status/trashcan_full.png
+share/icons/Neu/24x24/status/user-trash-full.png
+share/icons/Neu/24x24/status/xfce-trash_full.png
+share/icons/Neu/48x48/actions/add.png
+share/icons/Neu/48x48/actions/address-book-new.png
+share/icons/Neu/48x48/actions/appointment-new.png
+share/icons/Neu/48x48/actions/appointment.png
+share/icons/Neu/48x48/actions/back.png
+share/icons/Neu/48x48/actions/bookmark-new.png
+share/icons/Neu/48x48/actions/bookmark_add.png
+share/icons/Neu/48x48/actions/bookmarks_list_add.png
+share/icons/Neu/48x48/actions/bottom.png
+share/icons/Neu/48x48/actions/button_cancel.png
+share/icons/Neu/48x48/actions/cancel.png
+share/icons/Neu/48x48/actions/centrejust.png
+share/icons/Neu/48x48/actions/contact-new.png
+share/icons/Neu/48x48/actions/dialog-cancel.png
+share/icons/Neu/48x48/actions/dialog-close.png
+share/icons/Neu/48x48/actions/dialog-ok.png
+share/icons/Neu/48x48/actions/document-new.png
+share/icons/Neu/48x48/actions/document-open.png
+share/icons/Neu/48x48/actions/document-print-preview.png
+share/icons/Neu/48x48/actions/document-print.png
+share/icons/Neu/48x48/actions/document-properties.png
+share/icons/Neu/48x48/actions/document-save-as.png
+share/icons/Neu/48x48/actions/document-save.png
+share/icons/Neu/48x48/actions/down.png
+share/icons/Neu/48x48/actions/edit-clear.png
+share/icons/Neu/48x48/actions/edit-copy.png
+share/icons/Neu/48x48/actions/edit-cut.png
+share/icons/Neu/48x48/actions/edit-delete.png
+share/icons/Neu/48x48/actions/edit-find-replace.png
+share/icons/Neu/48x48/actions/edit-find.png
+share/icons/Neu/48x48/actions/edit-paste.png
+share/icons/Neu/48x48/actions/edit-redo.png
+share/icons/Neu/48x48/actions/edit-select-all.png
+share/icons/Neu/48x48/actions/edit-undo.png
+share/icons/Neu/48x48/actions/editclear.png
+share/icons/Neu/48x48/actions/editcopy.png
+share/icons/Neu/48x48/actions/editcut.png
+share/icons/Neu/48x48/actions/editdelete.png
+share/icons/Neu/48x48/actions/editpaste.png
+share/icons/Neu/48x48/actions/exit.png
+share/icons/Neu/48x48/actions/filefind.png
+share/icons/Neu/48x48/actions/filenew.png
+share/icons/Neu/48x48/actions/fileopen.png
+share/icons/Neu/48x48/actions/fileprint.png
+share/icons/Neu/48x48/actions/filequickprint.png
+share/icons/Neu/48x48/actions/filesave.png
+share/icons/Neu/48x48/actions/filesaveas.png
+share/icons/Neu/48x48/actions/find.png
+share/icons/Neu/48x48/actions/finish.png
+share/icons/Neu/48x48/actions/folder-new.png
+share/icons/Neu/48x48/actions/folder_new.png
+share/icons/Neu/48x48/actions/format-indent-less.png
+share/icons/Neu/48x48/actions/format-indent-more.png
+share/icons/Neu/48x48/actions/format-justify-center.png
+share/icons/Neu/48x48/actions/format-justify-fill.png
+share/icons/Neu/48x48/actions/format-justify-left.png
+share/icons/Neu/48x48/actions/format-justify-right.png
+share/icons/Neu/48x48/actions/format-text-bold.png
+share/icons/Neu/48x48/actions/format-text-italic.png
+share/icons/Neu/48x48/actions/format-text-underline.png
+share/icons/Neu/48x48/actions/forward.png
+share/icons/Neu/48x48/actions/gnome-lockscreen.png
+share/icons/Neu/48x48/actions/gnome-logout.png
+share/icons/Neu/48x48/actions/gnome-run.png
+share/icons/Neu/48x48/actions/gnome-searchtool.png
+share/icons/Neu/48x48/actions/gnome-stock-mail-fwd.png
+share/icons/Neu/48x48/actions/gnome-stock-mail-new.png
+share/icons/Neu/48x48/actions/gnome-stock-mail-rpl.png
+share/icons/Neu/48x48/actions/gnome-stock-text-indent.png
+share/icons/Neu/48x48/actions/gnome-stock-text-unindent.png
+share/icons/Neu/48x48/actions/go-bottom.png
+share/icons/Neu/48x48/actions/go-down.png
+share/icons/Neu/48x48/actions/go-first.png
+share/icons/Neu/48x48/actions/go-home.png
+share/icons/Neu/48x48/actions/go-jump.png
+share/icons/Neu/48x48/actions/go-last.png
+share/icons/Neu/48x48/actions/go-next.png
+share/icons/Neu/48x48/actions/go-previous.png
+share/icons/Neu/48x48/actions/go-top.png
+share/icons/Neu/48x48/actions/go-up.png
+share/icons/Neu/48x48/actions/gohome.png
+share/icons/Neu/48x48/actions/gtk-add.png
+share/icons/Neu/48x48/actions/gtk-bold.png
+share/icons/Neu/48x48/actions/gtk-cancel.png
+share/icons/Neu/48x48/actions/gtk-clear.png
+share/icons/Neu/48x48/actions/gtk-copy.png
+share/icons/Neu/48x48/actions/gtk-cut.png
+share/icons/Neu/48x48/actions/gtk-delete.png
+share/icons/Neu/48x48/actions/gtk-find-and-replace.png
+share/icons/Neu/48x48/actions/gtk-find.png
+share/icons/Neu/48x48/actions/gtk-go-back-ltr.png
+share/icons/Neu/48x48/actions/gtk-go-back-rtl.png
+share/icons/Neu/48x48/actions/gtk-go-down.png
+share/icons/Neu/48x48/actions/gtk-go-forward-ltr.png
+share/icons/Neu/48x48/actions/gtk-go-forward-rtl.png
+share/icons/Neu/48x48/actions/gtk-go-up.png
+share/icons/Neu/48x48/actions/gtk-goto-bottom.png
+share/icons/Neu/48x48/actions/gtk-goto-first-ltr.png
+share/icons/Neu/48x48/actions/gtk-goto-first-rtl.png
+share/icons/Neu/48x48/actions/gtk-goto-last-ltr.png
+share/icons/Neu/48x48/actions/gtk-goto-last-rtl.png
+share/icons/Neu/48x48/actions/gtk-goto-top.png
+share/icons/Neu/48x48/actions/gtk-home.png
+share/icons/Neu/48x48/actions/gtk-indent.png
+share/icons/Neu/48x48/actions/gtk-italic.png
+share/icons/Neu/48x48/actions/gtk-jump-to-ltr.png
+share/icons/Neu/48x48/actions/gtk-jump-to-rtl.png
+share/icons/Neu/48x48/actions/gtk-justify-center.png
+share/icons/Neu/48x48/actions/gtk-justify-fill.png
+share/icons/Neu/48x48/actions/gtk-justify-left.png
+share/icons/Neu/48x48/actions/gtk-justify-right.png
+share/icons/Neu/48x48/actions/gtk-new.png
+share/icons/Neu/48x48/actions/gtk-open.png
+share/icons/Neu/48x48/actions/gtk-paste.png
+share/icons/Neu/48x48/actions/gtk-print-preview.png
+share/icons/Neu/48x48/actions/gtk-print.png
+share/icons/Neu/48x48/actions/gtk-properties.png
+share/icons/Neu/48x48/actions/gtk-redo-ltr.png
+share/icons/Neu/48x48/actions/gtk-refresh.png
+share/icons/Neu/48x48/actions/gtk-remove.png
+share/icons/Neu/48x48/actions/gtk-save-as.png
+share/icons/Neu/48x48/actions/gtk-save.png
+share/icons/Neu/48x48/actions/gtk-select-all.png
+share/icons/Neu/48x48/actions/gtk-stop.png
+share/icons/Neu/48x48/actions/gtk-underline.png
+share/icons/Neu/48x48/actions/gtk-undo-ltr.png
+share/icons/Neu/48x48/actions/gtk-unindent.png
+share/icons/Neu/48x48/actions/help-about.png
+share/icons/Neu/48x48/actions/kfind.png
+share/icons/Neu/48x48/actions/kfm_home.png
+share/icons/Neu/48x48/actions/leftjust.png
+share/icons/Neu/48x48/actions/list-add.png
+share/icons/Neu/48x48/actions/list-remove.png
+share/icons/Neu/48x48/actions/lock.png
+share/icons/Neu/48x48/actions/mail-forward.png
+share/icons/Neu/48x48/actions/mail-message-new.png
+share/icons/Neu/48x48/actions/mail-reply-all.png
+share/icons/Neu/48x48/actions/mail-reply-sender.png
+share/icons/Neu/48x48/actions/mail-send-receive.png
+share/icons/Neu/48x48/actions/mail_forward.png
+share/icons/Neu/48x48/actions/mail_new.png
+share/icons/Neu/48x48/actions/mail_reply.png
+share/icons/Neu/48x48/actions/mail_replyall.png
+share/icons/Neu/48x48/actions/next.png
+share/icons/Neu/48x48/actions/previous.png
+share/icons/Neu/48x48/actions/process-stop.png
+share/icons/Neu/48x48/actions/redhat-home.png
+share/icons/Neu/48x48/actions/redo.png
+share/icons/Neu/48x48/actions/reload.png
+share/icons/Neu/48x48/actions/reload3.png
+share/icons/Neu/48x48/actions/reload_all_tabs.png
+share/icons/Neu/48x48/actions/reload_page.png
+share/icons/Neu/48x48/actions/remove.png
+share/icons/Neu/48x48/actions/rightjust.png
+share/icons/Neu/48x48/actions/search.png
+share/icons/Neu/48x48/actions/start.png
+share/icons/Neu/48x48/actions/stock_add-bookmark.png
+share/icons/Neu/48x48/actions/stock_bottom.png
+share/icons/Neu/48x48/actions/stock_copy.png
+share/icons/Neu/48x48/actions/stock_cut.png
+share/icons/Neu/48x48/actions/stock_delete.png
+share/icons/Neu/48x48/actions/stock_down.png
+share/icons/Neu/48x48/actions/stock_file-properites.png
+share/icons/Neu/48x48/actions/stock_first.png
+share/icons/Neu/48x48/actions/stock_help-add-bookmark.png
+share/icons/Neu/48x48/actions/stock_home.png
+share/icons/Neu/48x48/actions/stock_last.png
+share/icons/Neu/48x48/actions/stock_left.png
+share/icons/Neu/48x48/actions/stock_mail-compose.png
+share/icons/Neu/48x48/actions/stock_mail-forward.png
+share/icons/Neu/48x48/actions/stock_mail-reply-to-all.png
+share/icons/Neu/48x48/actions/stock_mail-reply.png
+share/icons/Neu/48x48/actions/stock_mail-send-receive.png
+share/icons/Neu/48x48/actions/stock_new-address-book.png
+share/icons/Neu/48x48/actions/stock_new-appointment.png
+share/icons/Neu/48x48/actions/stock_new-bcard.png
+share/icons/Neu/48x48/actions/stock_new-dir.png
+share/icons/Neu/48x48/actions/stock_new-text.png
+share/icons/Neu/48x48/actions/stock_new-window.png
+share/icons/Neu/48x48/actions/stock_paste.png
+share/icons/Neu/48x48/actions/stock_print-preview.png
+share/icons/Neu/48x48/actions/stock_print.png
+share/icons/Neu/48x48/actions/stock_properties.png
+share/icons/Neu/48x48/actions/stock_redo.png
+share/icons/Neu/48x48/actions/stock_refresh.png
+share/icons/Neu/48x48/actions/stock_right.png
+share/icons/Neu/48x48/actions/stock_save-as.png
+share/icons/Neu/48x48/actions/stock_save.png
+share/icons/Neu/48x48/actions/stock_search-and-replace.png
+share/icons/Neu/48x48/actions/stock_search.png
+share/icons/Neu/48x48/actions/stock_select-all.png
+share/icons/Neu/48x48/actions/stock_stop.png
+share/icons/Neu/48x48/actions/stock_text_bold.png
+share/icons/Neu/48x48/actions/stock_text_center.png
+share/icons/Neu/48x48/actions/stock_text_indent.png
+share/icons/Neu/48x48/actions/stock_text_italic.png
+share/icons/Neu/48x48/actions/stock_text_justify.png
+share/icons/Neu/48x48/actions/stock_text_left.png
+share/icons/Neu/48x48/actions/stock_text_right.png
+share/icons/Neu/48x48/actions/stock_text_underlined.png
+share/icons/Neu/48x48/actions/stock_text_unindent.png
+share/icons/Neu/48x48/actions/stock_top.png
+share/icons/Neu/48x48/actions/stock_undo.png
+share/icons/Neu/48x48/actions/stock_up.png
+share/icons/Neu/48x48/actions/stop.png
+share/icons/Neu/48x48/actions/system-lock-screen.png
+share/icons/Neu/48x48/actions/system-log-out.png
+share/icons/Neu/48x48/actions/system-run.png
+share/icons/Neu/48x48/actions/system-search.png
+share/icons/Neu/48x48/actions/system-shutdown.png
+share/icons/Neu/48x48/actions/text_bold.png
+share/icons/Neu/48x48/actions/text_italic.png
+share/icons/Neu/48x48/actions/text_under.png
+share/icons/Neu/48x48/actions/top.png
+share/icons/Neu/48x48/actions/undo.png
+share/icons/Neu/48x48/actions/up.png
+share/icons/Neu/48x48/actions/view-refresh.png
+share/icons/Neu/48x48/actions/window-new.png
+share/icons/Neu/48x48/actions/window_new.png
+share/icons/Neu/48x48/actions/xfce-system-lock.png
+share/icons/Neu/48x48/apps/access.png
+share/icons/Neu/48x48/apps/accessibility-directory.png
+share/icons/Neu/48x48/apps/accessories-character-map.png
+share/icons/Neu/48x48/apps/accessories-text-editor.png
+share/icons/Neu/48x48/apps/arts.png
+share/icons/Neu/48x48/apps/background.png
+share/icons/Neu/48x48/apps/browser.png
+share/icons/Neu/48x48/apps/config-users.png
+share/icons/Neu/48x48/apps/email.png
+share/icons/Neu/48x48/apps/epiphany-bookmarks.png
+share/icons/Neu/48x48/apps/evolution.png
+share/icons/Neu/48x48/apps/file-manager.png
+share/icons/Neu/48x48/apps/fonts.png
+share/icons/Neu/48x48/apps/gaim.png
+share/icons/Neu/48x48/apps/gimp.png
+share/icons/Neu/48x48/apps/gnome-character-map.png
+share/icons/Neu/48x48/apps/gnome-help.png
+share/icons/Neu/48x48/apps/gnome-mixer.png
+share/icons/Neu/48x48/apps/gnome-monitor.png
+share/icons/Neu/48x48/apps/gnome-remote-desktop.png
+share/icons/Neu/48x48/apps/gnome-session.png
+share/icons/Neu/48x48/apps/gnome-settings-accessibility-technologies.png
+share/icons/Neu/48x48/apps/gnome-settings-background.png
+share/icons/Neu/48x48/apps/gnome-settings-font.png
+share/icons/Neu/48x48/apps/gnome-terminal.png
+share/icons/Neu/48x48/apps/gnome-window-manager.png
+share/icons/Neu/48x48/apps/graphics-image-editor.png
+share/icons/Neu/48x48/apps/graphics-image-viewer.png
+share/icons/Neu/48x48/apps/graphics-svg-editor.png
+share/icons/Neu/48x48/apps/gtk-help.png
+share/icons/Neu/48x48/apps/gucharmap.png
+share/icons/Neu/48x48/apps/help-browser.png
+share/icons/Neu/48x48/apps/help.png
+share/icons/Neu/48x48/apps/internet-group-chat.png
+share/icons/Neu/48x48/apps/internet-mail.png
+share/icons/Neu/48x48/apps/internet-web-browser.png
+share/icons/Neu/48x48/apps/kcharselect.png
+share/icons/Neu/48x48/apps/kcmkwm.png
+share/icons/Neu/48x48/apps/kcmsound.png
+share/icons/Neu/48x48/apps/kedit.png
+share/icons/Neu/48x48/apps/kfm.png
+share/icons/Neu/48x48/apps/khelpcenter.png
+share/icons/Neu/48x48/apps/konsole.png
+share/icons/Neu/48x48/apps/krfb.png
+share/icons/Neu/48x48/apps/kscreensaver.png
+share/icons/Neu/48x48/apps/ksysguard.png
+share/icons/Neu/48x48/apps/kuser.png
+share/icons/Neu/48x48/apps/kwin.png
+share/icons/Neu/48x48/apps/mail_generic.png
+share/icons/Neu/48x48/apps/multimedia-volume-control.png
+share/icons/Neu/48x48/apps/multimedia.png
+share/icons/Neu/48x48/apps/openterm.png
+share/icons/Neu/48x48/apps/preferences-desktop-accessibility.png
+share/icons/Neu/48x48/apps/preferences-desktop-assistive-technology.png
+share/icons/Neu/48x48/apps/preferences-desktop-font.png
+share/icons/Neu/48x48/apps/preferences-desktop-remote-desktop.png
+share/icons/Neu/48x48/apps/preferences-desktop-screensaver.png
+share/icons/Neu/48x48/apps/preferences-desktop-wallpaper.png
+share/icons/Neu/48x48/apps/preferences-system-network-proxy.png
+share/icons/Neu/48x48/apps/preferences-system-session.png
+share/icons/Neu/48x48/apps/preferences-system-windows.png
+share/icons/Neu/48x48/apps/preferences-user-information.png
+share/icons/Neu/48x48/apps/proxy-config.png
+share/icons/Neu/48x48/apps/proxy.png
+share/icons/Neu/48x48/apps/redhat-email.png
+share/icons/Neu/48x48/apps/redhat-filemanager.png
+share/icons/Neu/48x48/apps/redhat-web-browser.png
+share/icons/Neu/48x48/apps/screensaver.png
+share/icons/Neu/48x48/apps/sound-juicer.png
+share/icons/Neu/48x48/apps/stock_help.png
+share/icons/Neu/48x48/apps/stock_proxy.png
+share/icons/Neu/48x48/apps/susehelpcenter.png
+share/icons/Neu/48x48/apps/system-config-users.png
+share/icons/Neu/48x48/apps/system-file-manager.png
+share/icons/Neu/48x48/apps/system-installer.png
+share/icons/Neu/48x48/apps/system-lock-screen.png
+share/icons/Neu/48x48/apps/system-software-update.png
+share/icons/Neu/48x48/apps/system-users.png
+share/icons/Neu/48x48/apps/terminal.png
+share/icons/Neu/48x48/apps/text-editor.png
+share/icons/Neu/48x48/apps/update-manager.png
+share/icons/Neu/48x48/apps/utilities-system-monitor.png
+share/icons/Neu/48x48/apps/utilities-terminal.png
+share/icons/Neu/48x48/apps/volume-knob.png
+share/icons/Neu/48x48/apps/wallpaper.png
+share/icons/Neu/48x48/apps/web-browser.png
+share/icons/Neu/48x48/apps/xfce-filemanager.png
+share/icons/Neu/48x48/apps/xfce-mail.png
+share/icons/Neu/48x48/apps/xfce-terminal.png
+share/icons/Neu/48x48/apps/xfce4-backdrop.png
+share/icons/Neu/48x48/apps/xfce4-mixer.png
+share/icons/Neu/48x48/apps/xfce4-session.png
+share/icons/Neu/48x48/apps/xfwm4.png
+share/icons/Neu/48x48/apps/xscreensaver.png
+share/icons/Neu/48x48/apps/zen-icon.png
+share/icons/Neu/48x48/categories/applications-accessories.png
+share/icons/Neu/48x48/categories/applications-development.png
+share/icons/Neu/48x48/categories/applications-games.png
+share/icons/Neu/48x48/categories/applications-graphics.png
+share/icons/Neu/48x48/categories/applications-internet.png
+share/icons/Neu/48x48/categories/applications-multimedia.png
+share/icons/Neu/48x48/categories/applications-office.png
+share/icons/Neu/48x48/categories/applications-other.png
+share/icons/Neu/48x48/categories/applications-system.png
+share/icons/Neu/48x48/categories/gnome-applications.png
+share/icons/Neu/48x48/categories/gnome-control-center.png
+share/icons/Neu/48x48/categories/gnome-devel.png
+share/icons/Neu/48x48/categories/gnome-globe.png
+share/icons/Neu/48x48/categories/gnome-graphics.png
+share/icons/Neu/48x48/categories/gnome-joystick.png
+share/icons/Neu/48x48/categories/gnome-multimedia.png
+share/icons/Neu/48x48/categories/gnome-settings.png
+share/icons/Neu/48x48/categories/gnome-system.png
+share/icons/Neu/48x48/categories/gnome-util.png
+share/icons/Neu/48x48/categories/gtk-preferences.png
+share/icons/Neu/48x48/categories/input_devices_settings.png
+share/icons/Neu/48x48/categories/kcontrol.png
+share/icons/Neu/48x48/categories/package_development.png
+share/icons/Neu/48x48/categories/package_games.png
+share/icons/Neu/48x48/categories/package_graphics.png
+share/icons/Neu/48x48/categories/package_multimedia.png
+share/icons/Neu/48x48/categories/package_network.png
+share/icons/Neu/48x48/categories/package_office.png
+share/icons/Neu/48x48/categories/package_settings.png
+share/icons/Neu/48x48/categories/package_system.png
+share/icons/Neu/48x48/categories/package_utilities.png
+share/icons/Neu/48x48/categories/preferences-desktop-peripherals.png
+share/icons/Neu/48x48/categories/preferences-desktop.png
+share/icons/Neu/48x48/categories/preferences-system.png
+share/icons/Neu/48x48/categories/redhat-accessories.png
+share/icons/Neu/48x48/categories/redhat-games.png
+share/icons/Neu/48x48/categories/redhat-graphics.png
+share/icons/Neu/48x48/categories/redhat-internet.png
+share/icons/Neu/48x48/categories/redhat-office.png
+share/icons/Neu/48x48/categories/redhat-preferences.png
+share/icons/Neu/48x48/categories/redhat-programming.png
+share/icons/Neu/48x48/categories/redhat-sound_video.png
+share/icons/Neu/48x48/categories/redhat-system_settings.png
+share/icons/Neu/48x48/categories/redhat-system_tools.png
+share/icons/Neu/48x48/categories/stock_internet.png
+share/icons/Neu/48x48/categories/xfce-games.png
+share/icons/Neu/48x48/categories/xfce-graphics.png
+share/icons/Neu/48x48/categories/xfce-internet.png
+share/icons/Neu/48x48/categories/xfce-multimedia.png
+share/icons/Neu/48x48/categories/xfce-office.png
+share/icons/Neu/48x48/categories/xfce-system-settings.png
+share/icons/Neu/48x48/categories/xfce-utils.png
+share/icons/Neu/48x48/categories/xfce4-settings.png
+share/icons/Neu/48x48/devices/3floppy_unmount.png
+share/icons/Neu/48x48/devices/battery.png
+share/icons/Neu/48x48/devices/chardevice.png
+share/icons/Neu/48x48/devices/computer.png
+share/icons/Neu/48x48/devices/display.png
+share/icons/Neu/48x48/devices/drive-cdrom.png
+share/icons/Neu/48x48/devices/drive-harddisk.png
+share/icons/Neu/48x48/devices/drive-removable-media.png
+share/icons/Neu/48x48/devices/gnome-dev-battery.png
+share/icons/Neu/48x48/devices/gnome-dev-computer.png
+share/icons/Neu/48x48/devices/gnome-dev-floppy.png
+share/icons/Neu/48x48/devices/gnome-dev-harddisk-1394.png
+share/icons/Neu/48x48/devices/gnome-dev-harddisk-usb.png
+share/icons/Neu/48x48/devices/gnome-dev-harddisk.png
+share/icons/Neu/48x48/devices/gnome-dev-keyboard.png
+share/icons/Neu/48x48/devices/gnome-dev-mouse-ball.png
+share/icons/Neu/48x48/devices/gnome-dev-mouse-optical.png
+share/icons/Neu/48x48/devices/gnome-dev-printer.png
+share/icons/Neu/48x48/devices/gnome-dev-removable-1394.png
+share/icons/Neu/48x48/devices/gnome-dev-removable-usb.png
+share/icons/Neu/48x48/devices/gnome-dev-removable.png
+share/icons/Neu/48x48/devices/gnome-fs-client.png
+share/icons/Neu/48x48/devices/gtk-floppy.png
+share/icons/Neu/48x48/devices/gtk-harddisk.png
+share/icons/Neu/48x48/devices/harddrive.png
+share/icons/Neu/48x48/devices/hdd_unmount.png
+share/icons/Neu/48x48/devices/input-keyboard.png
+share/icons/Neu/48x48/devices/input-mouse.png
+share/icons/Neu/48x48/devices/keyboard.png
+share/icons/Neu/48x48/devices/kjobviewer.png
+share/icons/Neu/48x48/devices/kxkb.png
+share/icons/Neu/48x48/devices/media-cdrom-audio.png
+share/icons/Neu/48x48/devices/media-cdrom.png
+share/icons/Neu/48x48/devices/media-cdrw.png
+share/icons/Neu/48x48/devices/media-dvd.png
+share/icons/Neu/48x48/devices/media-dvdrw.png
+share/icons/Neu/48x48/devices/media-floppy.png
+share/icons/Neu/48x48/devices/mouse.png
+share/icons/Neu/48x48/devices/printer-remote.png
+share/icons/Neu/48x48/devices/printer.png
+share/icons/Neu/48x48/devices/printer1.png
+share/icons/Neu/48x48/devices/printmgr.png
+share/icons/Neu/48x48/devices/stock_printers.png
+share/icons/Neu/48x48/devices/system-floppy.png
+share/icons/Neu/48x48/devices/system.png
+share/icons/Neu/48x48/devices/usbpendrive_unmount.png
+share/icons/Neu/48x48/devices/video-display.png
+share/icons/Neu/48x48/devices/xfce-printer.png
+share/icons/Neu/48x48/devices/xfce4-display.png
+share/icons/Neu/48x48/devices/xfce4-keyboard.png
+share/icons/Neu/48x48/devices/xfce4-mouse.png
+share/icons/Neu/48x48/devices/yast_HD.png
+share/icons/Neu/48x48/devices/yast_idetude.png
+share/icons/Neu/48x48/devices/yast_mouse.png
+share/icons/Neu/48x48/devices/yast_printer.png
+share/icons/Neu/48x48/emblems/emblem-important.png
+share/icons/Neu/48x48/emblems/emblem-pictures.png
+share/icons/Neu/48x48/emblems/emblem-readonly.png
+share/icons/Neu/48x48/emblems/emblem-symbolic-link.png
+share/icons/Neu/48x48/emblems/emblem-system.png
+share/icons/Neu/48x48/emblems/emblem-unreadable.png
+share/icons/Neu/48x48/emblems/emblem-web.png
+share/icons/Neu/48x48/emblems/stock_mail-priority-high.png
+share/icons/Neu/48x48/mimetypes/application-certificate.png
+share/icons/Neu/48x48/mimetypes/application-x-executable.png
+share/icons/Neu/48x48/mimetypes/ascii.png
+share/icons/Neu/48x48/mimetypes/audio-x-generic.png
+share/icons/Neu/48x48/mimetypes/binary.png
+share/icons/Neu/48x48/mimetypes/contents2.png
+share/icons/Neu/48x48/mimetypes/deb.png
+share/icons/Neu/48x48/mimetypes/document.png
+share/icons/Neu/48x48/mimetypes/empty.png
+share/icons/Neu/48x48/mimetypes/exec.png
+share/icons/Neu/48x48/mimetypes/folder_tar.png
+share/icons/Neu/48x48/mimetypes/font-x-generic.png
+share/icons/Neu/48x48/mimetypes/font.png
+share/icons/Neu/48x48/mimetypes/font_bitmap.png
+share/icons/Neu/48x48/mimetypes/font_truetype.png
+share/icons/Neu/48x48/mimetypes/font_type1.png
+share/icons/Neu/48x48/mimetypes/gnome-fs-executable.png
+share/icons/Neu/48x48/mimetypes/gnome-mime-application-msword.png
+share/icons/Neu/48x48/mimetypes/gnome-mime-application-ogg.png
+share/icons/Neu/48x48/mimetypes/gnome-mime-application-pdf.png
+share/icons/Neu/48x48/mimetypes/gnome-mime-application-postscript.png
+share/icons/Neu/48x48/mimetypes/gnome-mime-application-rtf.png
+share/icons/Neu/48x48/mimetypes/gnome-mime-application-vnd.lotus-1-2-3.png
+share/icons/Neu/48x48/mimetypes/gnome-mime-application-vnd.ms-excel.png
+share/icons/Neu/48x48/mimetypes/gnome-mime-application-vnd.oasis.opendocument.spreadsheet.png
+share/icons/Neu/48x48/mimetypes/gnome-mime-application-vnd.oasis.opendocument.text-web.png
+share/icons/Neu/48x48/mimetypes/gnome-mime-application-vnd.oasis.opendocument.text.png
+share/icons/Neu/48x48/mimetypes/gnome-mime-application-vnd.rn-realmedia-secure.png
+share/icons/Neu/48x48/mimetypes/gnome-mime-application-vnd.rn-realmedia-vbr.png
+share/icons/Neu/48x48/mimetypes/gnome-mime-application-vnd.rn-realmedia.png
+share/icons/Neu/48x48/mimetypes/gnome-mime-application-vnd.stardivision.calc.png
+share/icons/Neu/48x48/mimetypes/gnome-mime-application-vnd.stardivision.writer.png
+share/icons/Neu/48x48/mimetypes/gnome-mime-application-vnd.sun.xml.calc.png
+share/icons/Neu/48x48/mimetypes/gnome-mime-application-vnd.sun.xml.writer.png
+share/icons/Neu/48x48/mimetypes/gnome-mime-application-wordperfect.png
+share/icons/Neu/48x48/mimetypes/gnome-mime-application-x-7z-compressed.png
+share/icons/Neu/48x48/mimetypes/gnome-mime-application-x-abiword.png
+share/icons/Neu/48x48/mimetypes/gnome-mime-application-x-applix-spreadsheet.png
+share/icons/Neu/48x48/mimetypes/gnome-mime-application-x-applix-word.png
+share/icons/Neu/48x48/mimetypes/gnome-mime-application-x-archive.png
+share/icons/Neu/48x48/mimetypes/gnome-mime-application-x-arj.png
+share/icons/Neu/48x48/mimetypes/gnome-mime-application-x-bzip-compressed-tar.png
+share/icons/Neu/48x48/mimetypes/gnome-mime-application-x-bzip.png
+share/icons/Neu/48x48/mimetypes/gnome-mime-application-x-compress.png
+share/icons/Neu/48x48/mimetypes/gnome-mime-application-x-compressed-tar.png
+share/icons/Neu/48x48/mimetypes/gnome-mime-application-x-cpio-compressed.png
+share/icons/Neu/48x48/mimetypes/gnome-mime-application-x-cpio.png
+share/icons/Neu/48x48/mimetypes/gnome-mime-application-x-deb.png
+share/icons/Neu/48x48/mimetypes/gnome-mime-application-x-dvi.png
+share/icons/Neu/48x48/mimetypes/gnome-mime-application-x-executable.png
+share/icons/Neu/48x48/mimetypes/gnome-mime-application-x-font-afm.png
+share/icons/Neu/48x48/mimetypes/gnome-mime-application-x-font-bdf.png
+share/icons/Neu/48x48/mimetypes/gnome-mime-application-x-font-linux-psf.png
+share/icons/Neu/48x48/mimetypes/gnome-mime-application-x-font-pcf.png
+share/icons/Neu/48x48/mimetypes/gnome-mime-application-x-font-sunos-news.png
+share/icons/Neu/48x48/mimetypes/gnome-mime-application-x-font-ttf.png
+share/icons/Neu/48x48/mimetypes/gnome-mime-application-x-gnumeric.png
+share/icons/Neu/48x48/mimetypes/gnome-mime-application-x-gzip.png
+share/icons/Neu/48x48/mimetypes/gnome-mime-application-x-gzpostscript.png
+share/icons/Neu/48x48/mimetypes/gnome-mime-application-x-jar.png
+share/icons/Neu/48x48/mimetypes/gnome-mime-application-x-killustrator.png
+share/icons/Neu/48x48/mimetypes/gnome-mime-application-x-kspread.png
+share/icons/Neu/48x48/mimetypes/gnome-mime-application-x-kword.png
+share/icons/Neu/48x48/mimetypes/gnome-mime-application-x-lha.png
+share/icons/Neu/48x48/mimetypes/gnome-mime-application-x-lhz.png
+share/icons/Neu/48x48/mimetypes/gnome-mime-application-x-ms-dos-executable.png
+share/icons/Neu/48x48/mimetypes/gnome-mime-application-x-perl.png
+share/icons/Neu/48x48/mimetypes/gnome-mime-application-x-php.png
+share/icons/Neu/48x48/mimetypes/gnome-mime-application-x-python-bytecode.png
+share/icons/Neu/48x48/mimetypes/gnome-mime-application-x-rar.png
+share/icons/Neu/48x48/mimetypes/gnome-mime-application-x-rpm.png
+share/icons/Neu/48x48/mimetypes/gnome-mime-application-x-scribus.png
+share/icons/Neu/48x48/mimetypes/gnome-mime-application-x-shellscript.png
+share/icons/Neu/48x48/mimetypes/gnome-mime-application-x-shockwave-flash.png
+share/icons/Neu/48x48/mimetypes/gnome-mime-application-x-stuffit.png
+share/icons/Neu/48x48/mimetypes/gnome-mime-application-x-tar.png
+share/icons/Neu/48x48/mimetypes/gnome-mime-application-x-tarz.png
+share/icons/Neu/48x48/mimetypes/gnome-mime-application-x-tex.png
+share/icons/Neu/48x48/mimetypes/gnome-mime-application-xhtml+xml.png
+share/icons/Neu/48x48/mimetypes/gnome-mime-application-zip.png
+share/icons/Neu/48x48/mimetypes/gnome-mime-audio.png
+share/icons/Neu/48x48/mimetypes/gnome-mime-image.png
+share/icons/Neu/48x48/mimetypes/gnome-mime-text-html.png
+share/icons/Neu/48x48/mimetypes/gnome-mime-text-vnd.wap.wml.png
+share/icons/Neu/48x48/mimetypes/gnome-mime-text-x-csh.png
+share/icons/Neu/48x48/mimetypes/gnome-mime-text-x-python.png
+share/icons/Neu/48x48/mimetypes/gnome-mime-text-x-sh.png
+share/icons/Neu/48x48/mimetypes/gnome-mime-text-x-vcard.png
+share/icons/Neu/48x48/mimetypes/gnome-mime-text-x-zsh.png
+share/icons/Neu/48x48/mimetypes/gnome-mime-text.png
+share/icons/Neu/48x48/mimetypes/gnome-mime-video.png
+share/icons/Neu/48x48/mimetypes/gnome-mime-x-font-afm.png
+share/icons/Neu/48x48/mimetypes/gnome-package.png
+share/icons/Neu/48x48/mimetypes/html.png
+share/icons/Neu/48x48/mimetypes/image-x-generic.png
+share/icons/Neu/48x48/mimetypes/image.png
+share/icons/Neu/48x48/mimetypes/mime_ascii.png
+share/icons/Neu/48x48/mimetypes/misc-cd-image.png
+share/icons/Neu/48x48/mimetypes/misc.png
+share/icons/Neu/48x48/mimetypes/package-x-generic.png
+share/icons/Neu/48x48/mimetypes/package.png
+share/icons/Neu/48x48/mimetypes/package_editors.png
+share/icons/Neu/48x48/mimetypes/package_wordprocessing.png
+share/icons/Neu/48x48/mimetypes/rpm.png
+share/icons/Neu/48x48/mimetypes/shellscript.png
+share/icons/Neu/48x48/mimetypes/sound.png
+share/icons/Neu/48x48/mimetypes/spreadsheet.png
+share/icons/Neu/48x48/mimetypes/stock_addressbook.png
+share/icons/Neu/48x48/mimetypes/stock_certificate.png
+share/icons/Neu/48x48/mimetypes/stock_script.png
+share/icons/Neu/48x48/mimetypes/tar.png
+share/icons/Neu/48x48/mimetypes/text-html.png
+share/icons/Neu/48x48/mimetypes/text-x-generic.png
+share/icons/Neu/48x48/mimetypes/text-x-script.png
+share/icons/Neu/48x48/mimetypes/text-x-source.png
+share/icons/Neu/48x48/mimetypes/tgz.png
+share/icons/Neu/48x48/mimetypes/txt.png
+share/icons/Neu/48x48/mimetypes/txt2.png
+share/icons/Neu/48x48/mimetypes/unknown.png
+share/icons/Neu/48x48/mimetypes/vcard.png
+share/icons/Neu/48x48/mimetypes/video-x-generic.png
+share/icons/Neu/48x48/mimetypes/video.png
+share/icons/Neu/48x48/mimetypes/wordprocessing.png
+share/icons/Neu/48x48/mimetypes/www.png
+share/icons/Neu/48x48/mimetypes/x-office-address-book.png
+share/icons/Neu/48x48/mimetypes/x-office-document.png
+share/icons/Neu/48x48/mimetypes/x-office-spreadsheet.png
+share/icons/Neu/48x48/mimetypes/zip.png
+share/icons/Neu/48x48/places/application-x-gnome-saved-search.png
+share/icons/Neu/48x48/places/desktop.png
+share/icons/Neu/48x48/places/distributor-logo.png
+share/icons/Neu/48x48/places/emptytrash.png
+share/icons/Neu/48x48/places/folder-remote.png
+share/icons/Neu/48x48/places/folder-saved-search.png
+share/icons/Neu/48x48/places/folder.png
+share/icons/Neu/48x48/places/folder_home.png
+share/icons/Neu/48x48/places/gnome-fs-desktop.png
+share/icons/Neu/48x48/places/gnome-fs-directory.png
+share/icons/Neu/48x48/places/gnome-fs-ftp.png
+share/icons/Neu/48x48/places/gnome-fs-home.png
+share/icons/Neu/48x48/places/gnome-fs-network.png
+share/icons/Neu/48x48/places/gnome-fs-nfs.png
+share/icons/Neu/48x48/places/gnome-fs-server.png
+share/icons/Neu/48x48/places/gnome-fs-share.png
+share/icons/Neu/48x48/places/gnome-fs-smb.png
+share/icons/Neu/48x48/places/gnome-fs-ssh.png
+share/icons/Neu/48x48/places/gnome-fs-trash-empty.png
+share/icons/Neu/48x48/places/gnome-main-menu.png
+share/icons/Neu/48x48/places/gnome-mime-x-directory-nfs-server.png
+share/icons/Neu/48x48/places/gnome-mime-x-directory-smb-server.png
+share/icons/Neu/48x48/places/gnome-mime-x-directory-smb-share.png
+share/icons/Neu/48x48/places/gnome-mime-x-directory-smb-workgroup.png
+share/icons/Neu/48x48/places/gnome-stock-trash.png
+share/icons/Neu/48x48/places/gtk-network.png
+share/icons/Neu/48x48/places/network-server.png
+share/icons/Neu/48x48/places/network-workgroup.png
+share/icons/Neu/48x48/places/network.png
+share/icons/Neu/48x48/places/network_local.png
+share/icons/Neu/48x48/places/novell-button.png
+share/icons/Neu/48x48/places/redhat-network-server.png
+share/icons/Neu/48x48/places/server.png
+share/icons/Neu/48x48/places/start-here.png
+share/icons/Neu/48x48/places/stock_folder.png
+share/icons/Neu/48x48/places/trashcan_empty.png
+share/icons/Neu/48x48/places/user-desktop.png
+share/icons/Neu/48x48/places/user-home.png
+share/icons/Neu/48x48/places/user-trash.png
+share/icons/Neu/48x48/places/xfce-trash_empty.png
+share/icons/Neu/48x48/status/audio-volume-high.png
+share/icons/Neu/48x48/status/audio-volume-low.png
+share/icons/Neu/48x48/status/audio-volume-medium.png
+share/icons/Neu/48x48/status/audio-volume-muted.png
+share/icons/Neu/48x48/status/audio-volume-zero.png
+share/icons/Neu/48x48/status/battery-caution.png
+share/icons/Neu/48x48/status/connect_creating.png
+share/icons/Neu/48x48/status/connect_established.png
+share/icons/Neu/48x48/status/connect_no.png
+share/icons/Neu/48x48/status/dialog-error.png
+share/icons/Neu/48x48/status/dialog-information.png
+share/icons/Neu/48x48/status/dialog-password.png
+share/icons/Neu/48x48/status/dialog-question.png
+share/icons/Neu/48x48/status/dialog-warning.png
+share/icons/Neu/48x48/status/edittrash.png
+share/icons/Neu/48x48/status/error.png
+share/icons/Neu/48x48/status/folder-drag-accept.png
+share/icons/Neu/48x48/status/folder-open.png
+share/icons/Neu/48x48/status/folder-visiting.png
+share/icons/Neu/48x48/status/folder_open.png
+share/icons/Neu/48x48/status/gnome-fs-directory-accept.png
+share/icons/Neu/48x48/status/gnome-fs-directory-visiting.png
+share/icons/Neu/48x48/status/gnome-fs-loading-icon.png
+share/icons/Neu/48x48/status/gnome-fs-trash-full.png
+share/icons/Neu/48x48/status/gnome-netstatus-disconn.png
+share/icons/Neu/48x48/status/gnome-netstatus-error.png
+share/icons/Neu/48x48/status/gnome-netstatus-idle.png
+share/icons/Neu/48x48/status/gnome-netstatus-rx.png
+share/icons/Neu/48x48/status/gnome-netstatus-tx.png
+share/icons/Neu/48x48/status/gnome-netstatus-txrx.png
+share/icons/Neu/48x48/status/gnome-stock-trash-full.png
+share/icons/Neu/48x48/status/gtk-dialog-authentication.png
+share/icons/Neu/48x48/status/gtk-dialog-error.png
+share/icons/Neu/48x48/status/gtk-dialog-info.png
+share/icons/Neu/48x48/status/gtk-dialog-question.png
+share/icons/Neu/48x48/status/gtk-dialog-warning.png
+share/icons/Neu/48x48/status/gtk-missing-image.png
+share/icons/Neu/48x48/status/image-loading.png
+share/icons/Neu/48x48/status/image-missing.png
+share/icons/Neu/48x48/status/important.png
+share/icons/Neu/48x48/status/info.png
+share/icons/Neu/48x48/status/messagebox_critical.png
+share/icons/Neu/48x48/status/messagebox_info.png
+share/icons/Neu/48x48/status/messagebox_warning.png
+share/icons/Neu/48x48/status/network-error.png
+share/icons/Neu/48x48/status/network-idle.png
+share/icons/Neu/48x48/status/network-offline.png
+share/icons/Neu/48x48/status/network-receive.png
+share/icons/Neu/48x48/status/network-transmit-receive.png
+share/icons/Neu/48x48/status/network-transmit.png
+share/icons/Neu/48x48/status/nm-adhoc.png
+share/icons/Neu/48x48/status/nm-device-wired.png
+share/icons/Neu/48x48/status/nm-device-wireless.png
+share/icons/Neu/48x48/status/nm-no-connection.png
+share/icons/Neu/48x48/status/printer-error.png
+share/icons/Neu/48x48/status/stock_dialog-error.png
+share/icons/Neu/48x48/status/stock_dialog-info.png
+share/icons/Neu/48x48/status/stock_dialog-question.png
+share/icons/Neu/48x48/status/stock_dialog-warning.png
+share/icons/Neu/48x48/status/stock_open.png
+share/icons/Neu/48x48/status/stock_trash_full.png
+share/icons/Neu/48x48/status/stock_volume-0.png
+share/icons/Neu/48x48/status/stock_volume-max.png
+share/icons/Neu/48x48/status/stock_volume-med.png
+share/icons/Neu/48x48/status/stock_volume-min.png
+share/icons/Neu/48x48/status/stock_volume-mute.png
+share/icons/Neu/48x48/status/stock_volume.png
+share/icons/Neu/48x48/status/trashcan_full.png
+share/icons/Neu/48x48/status/user-trash-full.png
+share/icons/Neu/48x48/status/xfce-trash_full.png
+share/icons/Neu/index.theme
+share/icons/Neu/scalable/actions/add.svg
+share/icons/Neu/scalable/actions/address-book-new.svg
+share/icons/Neu/scalable/actions/appointment-new.svg
+share/icons/Neu/scalable/actions/appointment.svg
+share/icons/Neu/scalable/actions/back.svg
+share/icons/Neu/scalable/actions/bookmark-new.svg
+share/icons/Neu/scalable/actions/bookmark_add.svg
+share/icons/Neu/scalable/actions/bookmarks_list_add.svg
+share/icons/Neu/scalable/actions/bottom.svg
+share/icons/Neu/scalable/actions/button_cancel.svg
+share/icons/Neu/scalable/actions/cancel.svg
+share/icons/Neu/scalable/actions/centrejust.svg
+share/icons/Neu/scalable/actions/contact-new.svg
+share/icons/Neu/scalable/actions/dialog-cancel.svg
+share/icons/Neu/scalable/actions/dialog-close.svg
+share/icons/Neu/scalable/actions/dialog-ok.svg
+share/icons/Neu/scalable/actions/document-new.svg
+share/icons/Neu/scalable/actions/document-open.svg
+share/icons/Neu/scalable/actions/document-print-preview.svg
+share/icons/Neu/scalable/actions/document-print.svg
+share/icons/Neu/scalable/actions/document-properties.svg
+share/icons/Neu/scalable/actions/document-save-as.svg
+share/icons/Neu/scalable/actions/document-save.svg
+share/icons/Neu/scalable/actions/down.svg
+share/icons/Neu/scalable/actions/edit-clear.svg
+share/icons/Neu/scalable/actions/edit-copy.svg
+share/icons/Neu/scalable/actions/edit-cut.svg
+share/icons/Neu/scalable/actions/edit-delete.svg
+share/icons/Neu/scalable/actions/edit-find-replace.svg
+share/icons/Neu/scalable/actions/edit-find.svg
+share/icons/Neu/scalable/actions/edit-paste.svg
+share/icons/Neu/scalable/actions/edit-redo.svg
+share/icons/Neu/scalable/actions/edit-select-all.svg
+share/icons/Neu/scalable/actions/edit-undo.svg
+share/icons/Neu/scalable/actions/editclear.svg
+share/icons/Neu/scalable/actions/editcopy.svg
+share/icons/Neu/scalable/actions/editcut.svg
+share/icons/Neu/scalable/actions/editdelete.svg
+share/icons/Neu/scalable/actions/editpaste.svg
+share/icons/Neu/scalable/actions/exit.svg
+share/icons/Neu/scalable/actions/filefind.svg
+share/icons/Neu/scalable/actions/filenew.svg
+share/icons/Neu/scalable/actions/fileopen.svg
+share/icons/Neu/scalable/actions/fileprint.svg
+share/icons/Neu/scalable/actions/filequickprint.svg
+share/icons/Neu/scalable/actions/filesave.svg
+share/icons/Neu/scalable/actions/filesaveas.svg
+share/icons/Neu/scalable/actions/find.svg
+share/icons/Neu/scalable/actions/finish.svg
+share/icons/Neu/scalable/actions/folder-new.svg
+share/icons/Neu/scalable/actions/folder_new.svg
+share/icons/Neu/scalable/actions/format-indent-less.svg
+share/icons/Neu/scalable/actions/format-indent-more.svg
+share/icons/Neu/scalable/actions/format-justify-center.svg
+share/icons/Neu/scalable/actions/format-justify-fill.svg
+share/icons/Neu/scalable/actions/format-justify-left.svg
+share/icons/Neu/scalable/actions/format-justify-right.svg
+share/icons/Neu/scalable/actions/format-text-bold.svg
+share/icons/Neu/scalable/actions/format-text-italic.svg
+share/icons/Neu/scalable/actions/format-text-underline.svg
+share/icons/Neu/scalable/actions/forward.svg
+share/icons/Neu/scalable/actions/gnome-lockscreen.svg
+share/icons/Neu/scalable/actions/gnome-logout.svg
+share/icons/Neu/scalable/actions/gnome-searchtool.svg
+share/icons/Neu/scalable/actions/gnome-stock-mail-fwd.svg
+share/icons/Neu/scalable/actions/gnome-stock-mail-new.svg
+share/icons/Neu/scalable/actions/gnome-stock-mail-rpl.svg
+share/icons/Neu/scalable/actions/gnome-stock-text-indent.svg
+share/icons/Neu/scalable/actions/gnome-stock-text-unindent.svg
+share/icons/Neu/scalable/actions/go-bottom.svg
+share/icons/Neu/scalable/actions/go-down.svg
+share/icons/Neu/scalable/actions/go-first.svg
+share/icons/Neu/scalable/actions/go-home.svg
+share/icons/Neu/scalable/actions/go-jump.svg
+share/icons/Neu/scalable/actions/go-last.svg
+share/icons/Neu/scalable/actions/go-next.svg
+share/icons/Neu/scalable/actions/go-previous.svg
+share/icons/Neu/scalable/actions/go-top.svg
+share/icons/Neu/scalable/actions/go-up.svg
+share/icons/Neu/scalable/actions/gohome.svg
+share/icons/Neu/scalable/actions/gtk-add.svg
+share/icons/Neu/scalable/actions/gtk-bold.svg
+share/icons/Neu/scalable/actions/gtk-cancel.svg
+share/icons/Neu/scalable/actions/gtk-clear.svg
+share/icons/Neu/scalable/actions/gtk-copy.svg
+share/icons/Neu/scalable/actions/gtk-cut.svg
+share/icons/Neu/scalable/actions/gtk-delete.svg
+share/icons/Neu/scalable/actions/gtk-find-and-replace.svg
+share/icons/Neu/scalable/actions/gtk-find.svg
+share/icons/Neu/scalable/actions/gtk-go-back-ltr.svg
+share/icons/Neu/scalable/actions/gtk-go-back-rtl.svg
+share/icons/Neu/scalable/actions/gtk-go-down.svg
+share/icons/Neu/scalable/actions/gtk-go-forward-ltr.svg
+share/icons/Neu/scalable/actions/gtk-go-forward-rtl.svg
+share/icons/Neu/scalable/actions/gtk-go-up.svg
+share/icons/Neu/scalable/actions/gtk-goto-bottom.svg
+share/icons/Neu/scalable/actions/gtk-goto-first-ltr.svg
+share/icons/Neu/scalable/actions/gtk-goto-first-rtl.svg
+share/icons/Neu/scalable/actions/gtk-goto-last-ltr.svg
+share/icons/Neu/scalable/actions/gtk-goto-last-rtl.svg
+share/icons/Neu/scalable/actions/gtk-goto-top.svg
+share/icons/Neu/scalable/actions/gtk-home.svg
+share/icons/Neu/scalable/actions/gtk-indent.svg
+share/icons/Neu/scalable/actions/gtk-italic.svg
+share/icons/Neu/scalable/actions/gtk-jump-to-ltr.svg
+share/icons/Neu/scalable/actions/gtk-jump-to-rtl.svg
+share/icons/Neu/scalable/actions/gtk-justify-center.svg
+share/icons/Neu/scalable/actions/gtk-justify-fill.svg
+share/icons/Neu/scalable/actions/gtk-justify-left.svg
+share/icons/Neu/scalable/actions/gtk-justify-right.svg
+share/icons/Neu/scalable/actions/gtk-new.svg
+share/icons/Neu/scalable/actions/gtk-open.svg
+share/icons/Neu/scalable/actions/gtk-paste.svg
+share/icons/Neu/scalable/actions/gtk-print-preview.svg
+share/icons/Neu/scalable/actions/gtk-print.svg
+share/icons/Neu/scalable/actions/gtk-properties.svg
+share/icons/Neu/scalable/actions/gtk-redo-ltr.svg
+share/icons/Neu/scalable/actions/gtk-refresh.svg
+share/icons/Neu/scalable/actions/gtk-remove.svg
+share/icons/Neu/scalable/actions/gtk-save-as.svg
+share/icons/Neu/scalable/actions/gtk-save.svg
+share/icons/Neu/scalable/actions/gtk-select-all.svg
+share/icons/Neu/scalable/actions/gtk-stop.svg
+share/icons/Neu/scalable/actions/gtk-underline.svg
+share/icons/Neu/scalable/actions/gtk-undo-ltr.svg
+share/icons/Neu/scalable/actions/gtk-unindent.svg
+share/icons/Neu/scalable/actions/help-about.svg
+share/icons/Neu/scalable/actions/kfind.svg
+share/icons/Neu/scalable/actions/kfm_home.svg
+share/icons/Neu/scalable/actions/leftjust.svg
+share/icons/Neu/scalable/actions/list-add.svg
+share/icons/Neu/scalable/actions/list-remove.svg
+share/icons/Neu/scalable/actions/lock.svg
+share/icons/Neu/scalable/actions/mail-forward.svg
+share/icons/Neu/scalable/actions/mail-message-new.svg
+share/icons/Neu/scalable/actions/mail-reply-all.svg
+share/icons/Neu/scalable/actions/mail-reply-sender.svg
+share/icons/Neu/scalable/actions/mail-send-receive.svg
+share/icons/Neu/scalable/actions/mail_forward.svg
+share/icons/Neu/scalable/actions/mail_new.svg
+share/icons/Neu/scalable/actions/mail_reply.svg
+share/icons/Neu/scalable/actions/mail_replyall.svg
+share/icons/Neu/scalable/actions/next.svg
+share/icons/Neu/scalable/actions/previous.svg
+share/icons/Neu/scalable/actions/process-stop.svg
+share/icons/Neu/scalable/actions/redhat-home.svg
+share/icons/Neu/scalable/actions/redo.svg
+share/icons/Neu/scalable/actions/reload.svg
+share/icons/Neu/scalable/actions/reload3.svg
+share/icons/Neu/scalable/actions/reload_all_tabs.svg
+share/icons/Neu/scalable/actions/reload_page.svg
+share/icons/Neu/scalable/actions/remove.svg
+share/icons/Neu/scalable/actions/rightjust.svg
+share/icons/Neu/scalable/actions/search.svg
+share/icons/Neu/scalable/actions/start.svg
+share/icons/Neu/scalable/actions/stock_add-bookmark.svg
+share/icons/Neu/scalable/actions/stock_bottom.svg
+share/icons/Neu/scalable/actions/stock_copy.svg
+share/icons/Neu/scalable/actions/stock_cut.svg
+share/icons/Neu/scalable/actions/stock_delete.svg
+share/icons/Neu/scalable/actions/stock_down.svg
+share/icons/Neu/scalable/actions/stock_file-properites.svg
+share/icons/Neu/scalable/actions/stock_first.svg
+share/icons/Neu/scalable/actions/stock_help-add-bookmark.svg
+share/icons/Neu/scalable/actions/stock_home.svg
+share/icons/Neu/scalable/actions/stock_last.svg
+share/icons/Neu/scalable/actions/stock_left.svg
+share/icons/Neu/scalable/actions/stock_mail-compose.svg
+share/icons/Neu/scalable/actions/stock_mail-forward.svg
+share/icons/Neu/scalable/actions/stock_mail-reply-to-all.svg
+share/icons/Neu/scalable/actions/stock_mail-reply.svg
+share/icons/Neu/scalable/actions/stock_mail-send-receive.svg
+share/icons/Neu/scalable/actions/stock_new-address-book.svg
+share/icons/Neu/scalable/actions/stock_new-appointment.svg
+share/icons/Neu/scalable/actions/stock_new-bcard.svg
+share/icons/Neu/scalable/actions/stock_new-dir.svg
+share/icons/Neu/scalable/actions/stock_new-text.svg
+share/icons/Neu/scalable/actions/stock_new-window.svg
+share/icons/Neu/scalable/actions/stock_paste.svg
+share/icons/Neu/scalable/actions/stock_print-preview.svg
+share/icons/Neu/scalable/actions/stock_print.svg
+share/icons/Neu/scalable/actions/stock_properties.svg
+share/icons/Neu/scalable/actions/stock_redo.svg
+share/icons/Neu/scalable/actions/stock_refresh.svg
+share/icons/Neu/scalable/actions/stock_right.svg
+share/icons/Neu/scalable/actions/stock_save-as.svg
+share/icons/Neu/scalable/actions/stock_save.svg
+share/icons/Neu/scalable/actions/stock_search-and-replace.svg
+share/icons/Neu/scalable/actions/stock_search.svg
+share/icons/Neu/scalable/actions/stock_select-all.svg
+share/icons/Neu/scalable/actions/stock_stop.svg
+share/icons/Neu/scalable/actions/stock_text_bold.svg
+share/icons/Neu/scalable/actions/stock_text_center.svg
+share/icons/Neu/scalable/actions/stock_text_indent.svg
+share/icons/Neu/scalable/actions/stock_text_italic.svg
+share/icons/Neu/scalable/actions/stock_text_justify.svg
+share/icons/Neu/scalable/actions/stock_text_left.svg
+share/icons/Neu/scalable/actions/stock_text_right.svg
+share/icons/Neu/scalable/actions/stock_text_underlined.svg
+share/icons/Neu/scalable/actions/stock_text_unindent.svg
+share/icons/Neu/scalable/actions/stock_top.svg
+share/icons/Neu/scalable/actions/stock_undo.svg
+share/icons/Neu/scalable/actions/stock_up.svg
+share/icons/Neu/scalable/actions/stop.svg
+share/icons/Neu/scalable/actions/system-lock-screen.svg
+share/icons/Neu/scalable/actions/system-log-out.svg
+share/icons/Neu/scalable/actions/system-search.svg
+share/icons/Neu/scalable/actions/system-shutdown.svg
+share/icons/Neu/scalable/actions/text_bold.svg
+share/icons/Neu/scalable/actions/text_italic.svg
+share/icons/Neu/scalable/actions/text_under.svg
+share/icons/Neu/scalable/actions/top.svg
+share/icons/Neu/scalable/actions/undo.svg
+share/icons/Neu/scalable/actions/up.svg
+share/icons/Neu/scalable/actions/view-refresh.svg
+share/icons/Neu/scalable/actions/window-new.svg
+share/icons/Neu/scalable/actions/window_new.svg
+share/icons/Neu/scalable/actions/xfce-system-lock.svg
+share/icons/Neu/scalable/apps/access.svg
+share/icons/Neu/scalable/apps/accessibility-directory.svg
+share/icons/Neu/scalable/apps/accessories-archiver.svg
+share/icons/Neu/scalable/apps/accessories-character-map.svg
+share/icons/Neu/scalable/apps/accessories-text-editor.svg
+share/icons/Neu/scalable/apps/arts.svg
+share/icons/Neu/scalable/apps/background.svg
+share/icons/Neu/scalable/apps/browser.svg
+share/icons/Neu/scalable/apps/config-users.svg
+share/icons/Neu/scalable/apps/email.svg
+share/icons/Neu/scalable/apps/epiphany-bookmarks.svg
+share/icons/Neu/scalable/apps/evolution.svg
+share/icons/Neu/scalable/apps/file-manager.svg
+share/icons/Neu/scalable/apps/fonts.svg
+share/icons/Neu/scalable/apps/gaim.svg
+share/icons/Neu/scalable/apps/gimp.svg
+share/icons/Neu/scalable/apps/gnome-character-map.svg
+share/icons/Neu/scalable/apps/gnome-help.svg
+share/icons/Neu/scalable/apps/gnome-mixer.svg
+share/icons/Neu/scalable/apps/gnome-monitor.svg
+share/icons/Neu/scalable/apps/gnome-remote-desktop.svg
+share/icons/Neu/scalable/apps/gnome-session.svg
+share/icons/Neu/scalable/apps/gnome-settings-accessibility-technologies.svg
+share/icons/Neu/scalable/apps/gnome-settings-background.svg
+share/icons/Neu/scalable/apps/gnome-settings-font.svg
+share/icons/Neu/scalable/apps/gnome-terminal.svg
+share/icons/Neu/scalable/apps/gnome-window-manager.svg
+share/icons/Neu/scalable/apps/graphics-image-editor.svg
+share/icons/Neu/scalable/apps/graphics-image-viewer.svg
+share/icons/Neu/scalable/apps/graphics-svg-editor.svg
+share/icons/Neu/scalable/apps/gtk-help.svg
+share/icons/Neu/scalable/apps/gucharmap.svg
+share/icons/Neu/scalable/apps/help-browser.svg
+share/icons/Neu/scalable/apps/help.svg
+share/icons/Neu/scalable/apps/internet-ftp-client.svg
+share/icons/Neu/scalable/apps/internet-group-chat.svg
+share/icons/Neu/scalable/apps/internet-mail.svg
+share/icons/Neu/scalable/apps/internet-web-browser.svg
+share/icons/Neu/scalable/apps/kcharselect.svg
+share/icons/Neu/scalable/apps/kcmkwm.svg
+share/icons/Neu/scalable/apps/kcmsound.svg
+share/icons/Neu/scalable/apps/kedit.svg
+share/icons/Neu/scalable/apps/kfm.svg
+share/icons/Neu/scalable/apps/khelpcenter.svg
+share/icons/Neu/scalable/apps/konsole.svg
+share/icons/Neu/scalable/apps/krfb.svg
+share/icons/Neu/scalable/apps/kscreensaver.svg
+share/icons/Neu/scalable/apps/ksysguard.svg
+share/icons/Neu/scalable/apps/kuser.svg
+share/icons/Neu/scalable/apps/kwin.svg
+share/icons/Neu/scalable/apps/mail_generic.svg
+share/icons/Neu/scalable/apps/multimedia-volume-control.svg
+share/icons/Neu/scalable/apps/multimedia.svg
+share/icons/Neu/scalable/apps/openterm.svg
+share/icons/Neu/scalable/apps/preferences-desktop-accessibility.svg
+share/icons/Neu/scalable/apps/preferences-desktop-assistive-technology.svg
+share/icons/Neu/scalable/apps/preferences-desktop-font.svg
+share/icons/Neu/scalable/apps/preferences-desktop-remote-desktop.svg
+share/icons/Neu/scalable/apps/preferences-desktop-screensaver.svg
+share/icons/Neu/scalable/apps/preferences-desktop-wallpaper.svg
+share/icons/Neu/scalable/apps/preferences-system-network-proxy.svg
+share/icons/Neu/scalable/apps/preferences-system-session.svg
+share/icons/Neu/scalable/apps/preferences-system-windows.svg
+share/icons/Neu/scalable/apps/preferences-user-information.svg
+share/icons/Neu/scalable/apps/proxy-config.svg
+share/icons/Neu/scalable/apps/proxy.svg
+share/icons/Neu/scalable/apps/redhat-email.svg
+share/icons/Neu/scalable/apps/redhat-filemanager.svg
+share/icons/Neu/scalable/apps/redhat-web-browser.svg
+share/icons/Neu/scalable/apps/screensaver.svg
+share/icons/Neu/scalable/apps/sound-juicer.svg
+share/icons/Neu/scalable/apps/stock_help.svg
+share/icons/Neu/scalable/apps/stock_proxy.svg
+share/icons/Neu/scalable/apps/susehelpcenter.svg
+share/icons/Neu/scalable/apps/system-config-users.svg
+share/icons/Neu/scalable/apps/system-file-manager.svg
+share/icons/Neu/scalable/apps/system-installer.svg
+share/icons/Neu/scalable/apps/system-lock-screen.svg
+share/icons/Neu/scalable/apps/system-software-update.svg
+share/icons/Neu/scalable/apps/system-users.svg
+share/icons/Neu/scalable/apps/terminal.svg
+share/icons/Neu/scalable/apps/text-editor.svg
+share/icons/Neu/scalable/apps/update-manager.svg
+share/icons/Neu/scalable/apps/utilities-system-monitor.svg
+share/icons/Neu/scalable/apps/utilities-terminal.svg
+share/icons/Neu/scalable/apps/volume-knob.svg
+share/icons/Neu/scalable/apps/wallpaper.svg
+share/icons/Neu/scalable/apps/web-browser.svg
+share/icons/Neu/scalable/apps/xfce-filemanager.svg
+share/icons/Neu/scalable/apps/xfce-mail.svg
+share/icons/Neu/scalable/apps/xfce-terminal.svg
+share/icons/Neu/scalable/apps/xfce4-backdrop.svg
+share/icons/Neu/scalable/apps/xfce4-mixer.svg
+share/icons/Neu/scalable/apps/xfce4-session.svg
+share/icons/Neu/scalable/apps/xfwm4.svg
+share/icons/Neu/scalable/apps/xscreensaver.svg
+share/icons/Neu/scalable/apps/zen-icon.svg
+share/icons/Neu/scalable/categories/applications-accessories.svg
+share/icons/Neu/scalable/categories/applications-development.svg
+share/icons/Neu/scalable/categories/applications-games.svg
+share/icons/Neu/scalable/categories/applications-graphics.svg
+share/icons/Neu/scalable/categories/applications-internet.svg
+share/icons/Neu/scalable/categories/applications-multimedia.svg
+share/icons/Neu/scalable/categories/applications-office.svg
+share/icons/Neu/scalable/categories/applications-other.svg
+share/icons/Neu/scalable/categories/applications-system.svg
+share/icons/Neu/scalable/categories/gnome-applications.svg
+share/icons/Neu/scalable/categories/gnome-control-center.svg
+share/icons/Neu/scalable/categories/gnome-devel.svg
+share/icons/Neu/scalable/categories/gnome-globe.svg
+share/icons/Neu/scalable/categories/gnome-graphics.svg
+share/icons/Neu/scalable/categories/gnome-joystick.svg
+share/icons/Neu/scalable/categories/gnome-multimedia.svg
+share/icons/Neu/scalable/categories/gnome-settings.svg
+share/icons/Neu/scalable/categories/gnome-system.svg
+share/icons/Neu/scalable/categories/gnome-util.svg
+share/icons/Neu/scalable/categories/gtk-preferences.svg
+share/icons/Neu/scalable/categories/input_devices_settings.svg
+share/icons/Neu/scalable/categories/kcontrol.svg
+share/icons/Neu/scalable/categories/package_development.svg
+share/icons/Neu/scalable/categories/package_games.svg
+share/icons/Neu/scalable/categories/package_graphics.svg
+share/icons/Neu/scalable/categories/package_multimedia.svg
+share/icons/Neu/scalable/categories/package_network.svg
+share/icons/Neu/scalable/categories/package_office.svg
+share/icons/Neu/scalable/categories/package_settings.svg
+share/icons/Neu/scalable/categories/package_system.svg
+share/icons/Neu/scalable/categories/package_utilities.svg
+share/icons/Neu/scalable/categories/preferences-desktop-peripherals.svg
+share/icons/Neu/scalable/categories/preferences-desktop.svg
+share/icons/Neu/scalable/categories/preferences-system.svg
+share/icons/Neu/scalable/categories/redhat-accessories.svg
+share/icons/Neu/scalable/categories/redhat-games.svg
+share/icons/Neu/scalable/categories/redhat-graphics.svg
+share/icons/Neu/scalable/categories/redhat-internet.svg
+share/icons/Neu/scalable/categories/redhat-office.svg
+share/icons/Neu/scalable/categories/redhat-preferences.svg
+share/icons/Neu/scalable/categories/redhat-programming.svg
+share/icons/Neu/scalable/categories/redhat-sound_video.svg
+share/icons/Neu/scalable/categories/redhat-system_settings.svg
+share/icons/Neu/scalable/categories/redhat-system_tools.svg
+share/icons/Neu/scalable/categories/stock_internet.svg
+share/icons/Neu/scalable/categories/xfce-games.svg
+share/icons/Neu/scalable/categories/xfce-graphics.svg
+share/icons/Neu/scalable/categories/xfce-internet.svg
+share/icons/Neu/scalable/categories/xfce-multimedia.svg
+share/icons/Neu/scalable/categories/xfce-office.svg
+share/icons/Neu/scalable/categories/xfce-system-settings.svg
+share/icons/Neu/scalable/categories/xfce-utils.svg
+share/icons/Neu/scalable/categories/xfce4-settings.svg
+share/icons/Neu/scalable/devices/3floppy_unmount.svg
+share/icons/Neu/scalable/devices/battery.svg
+share/icons/Neu/scalable/devices/chardevice.svg
+share/icons/Neu/scalable/devices/computer.svg
+share/icons/Neu/scalable/devices/display.svg
+share/icons/Neu/scalable/devices/drive-cdrom.svg
+share/icons/Neu/scalable/devices/drive-harddisk.svg
+share/icons/Neu/scalable/devices/drive-removable-media.svg
+share/icons/Neu/scalable/devices/gnome-dev-battery.svg
+share/icons/Neu/scalable/devices/gnome-dev-computer.svg
+share/icons/Neu/scalable/devices/gnome-dev-floppy.svg
+share/icons/Neu/scalable/devices/gnome-dev-harddisk-1394.svg
+share/icons/Neu/scalable/devices/gnome-dev-harddisk-usb.svg
+share/icons/Neu/scalable/devices/gnome-dev-harddisk.svg
+share/icons/Neu/scalable/devices/gnome-dev-keyboard.svg
+share/icons/Neu/scalable/devices/gnome-dev-mouse-ball.svg
+share/icons/Neu/scalable/devices/gnome-dev-mouse-optical.svg
+share/icons/Neu/scalable/devices/gnome-dev-printer.svg
+share/icons/Neu/scalable/devices/gnome-dev-removable-1394.svg
+share/icons/Neu/scalable/devices/gnome-dev-removable-usb.svg
+share/icons/Neu/scalable/devices/gnome-dev-removable.svg
+share/icons/Neu/scalable/devices/gnome-fs-client.svg
+share/icons/Neu/scalable/devices/gtk-floppy.svg
+share/icons/Neu/scalable/devices/gtk-harddisk.svg
+share/icons/Neu/scalable/devices/harddrive.svg
+share/icons/Neu/scalable/devices/hdd_unmount.svg
+share/icons/Neu/scalable/devices/input-keyboard.svg
+share/icons/Neu/scalable/devices/input-mouse.svg
+share/icons/Neu/scalable/devices/keyboard.svg
+share/icons/Neu/scalable/devices/kjobviewer.svg
+share/icons/Neu/scalable/devices/kxkb.svg
+share/icons/Neu/scalable/devices/media-cdrom-audio.svg
+share/icons/Neu/scalable/devices/media-cdrom.svg
+share/icons/Neu/scalable/devices/media-cdrw.svg
+share/icons/Neu/scalable/devices/media-dvd.svg
+share/icons/Neu/scalable/devices/media-dvdrw.svg
+share/icons/Neu/scalable/devices/media-floppy.svg
+share/icons/Neu/scalable/devices/mouse.svg
+share/icons/Neu/scalable/devices/printer-remote.svg
+share/icons/Neu/scalable/devices/printer.svg
+share/icons/Neu/scalable/devices/printer1.svg
+share/icons/Neu/scalable/devices/printmgr.svg
+share/icons/Neu/scalable/devices/stock_printers.svg
+share/icons/Neu/scalable/devices/system-floppy.svg
+share/icons/Neu/scalable/devices/system.svg
+share/icons/Neu/scalable/devices/usbpendrive_unmount.svg
+share/icons/Neu/scalable/devices/video-display.svg
+share/icons/Neu/scalable/devices/xfce-printer.svg
+share/icons/Neu/scalable/devices/xfce4-display.svg
+share/icons/Neu/scalable/devices/xfce4-keyboard.svg
+share/icons/Neu/scalable/devices/xfce4-mouse.svg
+share/icons/Neu/scalable/devices/yast_HD.svg
+share/icons/Neu/scalable/devices/yast_idetude.svg
+share/icons/Neu/scalable/devices/yast_mouse.svg
+share/icons/Neu/scalable/devices/yast_printer.svg
+share/icons/Neu/scalable/emblems/emblem-important.svg
+share/icons/Neu/scalable/emblems/emblem-pictures.svg
+share/icons/Neu/scalable/emblems/emblem-readonly.svg
+share/icons/Neu/scalable/emblems/emblem-symbolic-link.svg
+share/icons/Neu/scalable/emblems/emblem-system.svg
+share/icons/Neu/scalable/emblems/emblem-unreadable.svg
+share/icons/Neu/scalable/emblems/emblem-web.svg
+share/icons/Neu/scalable/emblems/stock_mail-priority-high.svg
+share/icons/Neu/scalable/mimetypes/application-certificate.svg
+share/icons/Neu/scalable/mimetypes/application-x-executable.svg
+share/icons/Neu/scalable/mimetypes/ascii.svg
+share/icons/Neu/scalable/mimetypes/audio-x-generic.svg
+share/icons/Neu/scalable/mimetypes/binary.svg
+share/icons/Neu/scalable/mimetypes/contents2.svg
+share/icons/Neu/scalable/mimetypes/deb.svg
+share/icons/Neu/scalable/mimetypes/document.svg
+share/icons/Neu/scalable/mimetypes/empty.svg
+share/icons/Neu/scalable/mimetypes/exec.svg
+share/icons/Neu/scalable/mimetypes/folder_tar.svg
+share/icons/Neu/scalable/mimetypes/font-x-generic.svg
+share/icons/Neu/scalable/mimetypes/font.svg
+share/icons/Neu/scalable/mimetypes/font_bitmap.svg
+share/icons/Neu/scalable/mimetypes/font_truetype.svg
+share/icons/Neu/scalable/mimetypes/font_type1.svg
+share/icons/Neu/scalable/mimetypes/gnome-fs-executable.svg
+share/icons/Neu/scalable/mimetypes/gnome-mime-application-msword.svg
+share/icons/Neu/scalable/mimetypes/gnome-mime-application-ogg.svg
+share/icons/Neu/scalable/mimetypes/gnome-mime-application-pdf.svg
+share/icons/Neu/scalable/mimetypes/gnome-mime-application-postscript.svg
+share/icons/Neu/scalable/mimetypes/gnome-mime-application-rtf.svg
+share/icons/Neu/scalable/mimetypes/gnome-mime-application-vnd.lotus-1-2-3.svg
+share/icons/Neu/scalable/mimetypes/gnome-mime-application-vnd.ms-excel.svg
+share/icons/Neu/scalable/mimetypes/gnome-mime-application-vnd.oasis.opendocument.spreadsheet.svg
+share/icons/Neu/scalable/mimetypes/gnome-mime-application-vnd.oasis.opendocument.text-web.svg
+share/icons/Neu/scalable/mimetypes/gnome-mime-application-vnd.oasis.opendocument.text.svg
+share/icons/Neu/scalable/mimetypes/gnome-mime-application-vnd.rn-realmedia-secure.svg
+share/icons/Neu/scalable/mimetypes/gnome-mime-application-vnd.rn-realmedia-vbr.svg
+share/icons/Neu/scalable/mimetypes/gnome-mime-application-vnd.rn-realmedia.svg
+share/icons/Neu/scalable/mimetypes/gnome-mime-application-vnd.stardivision.calc.svg
+share/icons/Neu/scalable/mimetypes/gnome-mime-application-vnd.stardivision.writer.svg
+share/icons/Neu/scalable/mimetypes/gnome-mime-application-vnd.sun.xml.calc.svg
+share/icons/Neu/scalable/mimetypes/gnome-mime-application-vnd.sun.xml.writer.svg
+share/icons/Neu/scalable/mimetypes/gnome-mime-application-wordperfect.svg
+share/icons/Neu/scalable/mimetypes/gnome-mime-application-x-7z-compressed.svg
+share/icons/Neu/scalable/mimetypes/gnome-mime-application-x-abiword.svg
+share/icons/Neu/scalable/mimetypes/gnome-mime-application-x-applix-spreadsheet.svg
+share/icons/Neu/scalable/mimetypes/gnome-mime-application-x-applix-word.svg
+share/icons/Neu/scalable/mimetypes/gnome-mime-application-x-archive.svg
+share/icons/Neu/scalable/mimetypes/gnome-mime-application-x-arj.svg
+share/icons/Neu/scalable/mimetypes/gnome-mime-application-x-bzip-compressed-tar.svg
+share/icons/Neu/scalable/mimetypes/gnome-mime-application-x-bzip.svg
+share/icons/Neu/scalable/mimetypes/gnome-mime-application-x-compress.svg
+share/icons/Neu/scalable/mimetypes/gnome-mime-application-x-compressed-tar.svg
+share/icons/Neu/scalable/mimetypes/gnome-mime-application-x-cpio-compressed.svg
+share/icons/Neu/scalable/mimetypes/gnome-mime-application-x-cpio.svg
+share/icons/Neu/scalable/mimetypes/gnome-mime-application-x-deb.svg
+share/icons/Neu/scalable/mimetypes/gnome-mime-application-x-dvi.svg
+share/icons/Neu/scalable/mimetypes/gnome-mime-application-x-executable.svg
+share/icons/Neu/scalable/mimetypes/gnome-mime-application-x-font-afm.svg
+share/icons/Neu/scalable/mimetypes/gnome-mime-application-x-font-bdf.svg
+share/icons/Neu/scalable/mimetypes/gnome-mime-application-x-font-linux-psf.svg
+share/icons/Neu/scalable/mimetypes/gnome-mime-application-x-font-pcf.svg
+share/icons/Neu/scalable/mimetypes/gnome-mime-application-x-font-sunos-news.svg
+share/icons/Neu/scalable/mimetypes/gnome-mime-application-x-font-ttf.svg
+share/icons/Neu/scalable/mimetypes/gnome-mime-application-x-gnumeric.svg
+share/icons/Neu/scalable/mimetypes/gnome-mime-application-x-gzip.svg
+share/icons/Neu/scalable/mimetypes/gnome-mime-application-x-gzpostscript.svg
+share/icons/Neu/scalable/mimetypes/gnome-mime-application-x-jar.svg
+share/icons/Neu/scalable/mimetypes/gnome-mime-application-x-killustrator.svg
+share/icons/Neu/scalable/mimetypes/gnome-mime-application-x-kspread.svg
+share/icons/Neu/scalable/mimetypes/gnome-mime-application-x-kword.svg
+share/icons/Neu/scalable/mimetypes/gnome-mime-application-x-lha.svg
+share/icons/Neu/scalable/mimetypes/gnome-mime-application-x-lhz.svg
+share/icons/Neu/scalable/mimetypes/gnome-mime-application-x-ms-dos-executable.svg
+share/icons/Neu/scalable/mimetypes/gnome-mime-application-x-perl.svg
+share/icons/Neu/scalable/mimetypes/gnome-mime-application-x-php.svg
+share/icons/Neu/scalable/mimetypes/gnome-mime-application-x-python-bytecode.svg
+share/icons/Neu/scalable/mimetypes/gnome-mime-application-x-rar.svg
+share/icons/Neu/scalable/mimetypes/gnome-mime-application-x-rpm.svg
+share/icons/Neu/scalable/mimetypes/gnome-mime-application-x-scribus.svg
+share/icons/Neu/scalable/mimetypes/gnome-mime-application-x-shellscript.svg
+share/icons/Neu/scalable/mimetypes/gnome-mime-application-x-shockwave-flash.svg
+share/icons/Neu/scalable/mimetypes/gnome-mime-application-x-stuffit.svg
+share/icons/Neu/scalable/mimetypes/gnome-mime-application-x-tar.svg
+share/icons/Neu/scalable/mimetypes/gnome-mime-application-x-tarz.svg
+share/icons/Neu/scalable/mimetypes/gnome-mime-application-x-tex.svg
+share/icons/Neu/scalable/mimetypes/gnome-mime-application-xhtml+xml.svg
+share/icons/Neu/scalable/mimetypes/gnome-mime-application-zip.svg
+share/icons/Neu/scalable/mimetypes/gnome-mime-audio.svg
+share/icons/Neu/scalable/mimetypes/gnome-mime-image.svg
+share/icons/Neu/scalable/mimetypes/gnome-mime-text-html.svg
+share/icons/Neu/scalable/mimetypes/gnome-mime-text-vnd.wap.wml.svg
+share/icons/Neu/scalable/mimetypes/gnome-mime-text-x-csh.svg
+share/icons/Neu/scalable/mimetypes/gnome-mime-text-x-python.svg
+share/icons/Neu/scalable/mimetypes/gnome-mime-text-x-sh.svg
+share/icons/Neu/scalable/mimetypes/gnome-mime-text-x-vcard.svg
+share/icons/Neu/scalable/mimetypes/gnome-mime-text-x-zsh.svg
+share/icons/Neu/scalable/mimetypes/gnome-mime-text.svg
+share/icons/Neu/scalable/mimetypes/gnome-mime-video.svg
+share/icons/Neu/scalable/mimetypes/gnome-mime-x-font-afm.svg
+share/icons/Neu/scalable/mimetypes/gnome-package.svg
+share/icons/Neu/scalable/mimetypes/html.svg
+share/icons/Neu/scalable/mimetypes/image-x-generic.svg
+share/icons/Neu/scalable/mimetypes/image.svg
+share/icons/Neu/scalable/mimetypes/mime_ascii.svg
+share/icons/Neu/scalable/mimetypes/misc-cd-image.svg
+share/icons/Neu/scalable/mimetypes/misc.svg
+share/icons/Neu/scalable/mimetypes/package-x-generic.svg
+share/icons/Neu/scalable/mimetypes/package.svg
+share/icons/Neu/scalable/mimetypes/package_editors.svg
+share/icons/Neu/scalable/mimetypes/package_wordprocessing.svg
+share/icons/Neu/scalable/mimetypes/rpm.svg
+share/icons/Neu/scalable/mimetypes/shellscript.svg
+share/icons/Neu/scalable/mimetypes/sound.svg
+share/icons/Neu/scalable/mimetypes/spreadsheet.svg
+share/icons/Neu/scalable/mimetypes/stock_addressbook.svg
+share/icons/Neu/scalable/mimetypes/stock_certificate.svg
+share/icons/Neu/scalable/mimetypes/stock_script.svg
+share/icons/Neu/scalable/mimetypes/tar.svg
+share/icons/Neu/scalable/mimetypes/text-html.svg
+share/icons/Neu/scalable/mimetypes/text-x-generic.svg
+share/icons/Neu/scalable/mimetypes/text-x-script.svg
+share/icons/Neu/scalable/mimetypes/text-x-source.svg
+share/icons/Neu/scalable/mimetypes/tgz.svg
+share/icons/Neu/scalable/mimetypes/txt.svg
+share/icons/Neu/scalable/mimetypes/txt2.svg
+share/icons/Neu/scalable/mimetypes/unknown.svg
+share/icons/Neu/scalable/mimetypes/vcard.svg
+share/icons/Neu/scalable/mimetypes/video-x-generic.svg
+share/icons/Neu/scalable/mimetypes/video.svg
+share/icons/Neu/scalable/mimetypes/wordprocessing.svg
+share/icons/Neu/scalable/mimetypes/www.svg
+share/icons/Neu/scalable/mimetypes/x-office-address-book.svg
+share/icons/Neu/scalable/mimetypes/x-office-document.svg
+share/icons/Neu/scalable/mimetypes/x-office-spreadsheet.svg
+share/icons/Neu/scalable/mimetypes/zip.svg
+share/icons/Neu/scalable/places/application-x-gnome-saved-search.svg
+share/icons/Neu/scalable/places/desktop.svg
+share/icons/Neu/scalable/places/distributor-logo.svg
+share/icons/Neu/scalable/places/emptytrash.svg
+share/icons/Neu/scalable/places/folder-remote.svg
+share/icons/Neu/scalable/places/folder-saved-search.svg
+share/icons/Neu/scalable/places/folder.svg
+share/icons/Neu/scalable/places/folder_home.svg
+share/icons/Neu/scalable/places/gnome-fs-desktop.svg
+share/icons/Neu/scalable/places/gnome-fs-directory.svg
+share/icons/Neu/scalable/places/gnome-fs-ftp.svg
+share/icons/Neu/scalable/places/gnome-fs-home.svg
+share/icons/Neu/scalable/places/gnome-fs-network.svg
+share/icons/Neu/scalable/places/gnome-fs-nfs.svg
+share/icons/Neu/scalable/places/gnome-fs-server.svg
+share/icons/Neu/scalable/places/gnome-fs-share.svg
+share/icons/Neu/scalable/places/gnome-fs-smb.svg
+share/icons/Neu/scalable/places/gnome-fs-ssh.svg
+share/icons/Neu/scalable/places/gnome-fs-trash-empty.svg
+share/icons/Neu/scalable/places/gnome-main-menu.svg
+share/icons/Neu/scalable/places/gnome-mime-x-directory-nfs-server.svg
+share/icons/Neu/scalable/places/gnome-mime-x-directory-smb-server.svg
+share/icons/Neu/scalable/places/gnome-mime-x-directory-smb-share.svg
+share/icons/Neu/scalable/places/gnome-mime-x-directory-smb-workgroup.svg
+share/icons/Neu/scalable/places/gnome-stock-trash.svg
+share/icons/Neu/scalable/places/gtk-network.svg
+share/icons/Neu/scalable/places/network-server.svg
+share/icons/Neu/scalable/places/network-workgroup.svg
+share/icons/Neu/scalable/places/network.svg
+share/icons/Neu/scalable/places/network_local.svg
+share/icons/Neu/scalable/places/novell-button.svg
+share/icons/Neu/scalable/places/redhat-network-server.svg
+share/icons/Neu/scalable/places/server.svg
+share/icons/Neu/scalable/places/start-here.svg
+share/icons/Neu/scalable/places/stock_folder.svg
+share/icons/Neu/scalable/places/trashcan_empty.svg
+share/icons/Neu/scalable/places/user-desktop.svg
+share/icons/Neu/scalable/places/user-home.svg
+share/icons/Neu/scalable/places/user-trash.svg
+share/icons/Neu/scalable/places/xfce-trash_empty.svg
+share/icons/Neu/scalable/status/audio-volume-high.svg
+share/icons/Neu/scalable/status/audio-volume-low.svg
+share/icons/Neu/scalable/status/audio-volume-medium.svg
+share/icons/Neu/scalable/status/audio-volume-muted.svg
+share/icons/Neu/scalable/status/audio-volume-zero.svg
+share/icons/Neu/scalable/status/battery-caution.svg
+share/icons/Neu/scalable/status/connect_creating.svg
+share/icons/Neu/scalable/status/connect_established.svg
+share/icons/Neu/scalable/status/connect_no.svg
+share/icons/Neu/scalable/status/dialog-error.svg
+share/icons/Neu/scalable/status/dialog-information.svg
+share/icons/Neu/scalable/status/dialog-password.svg
+share/icons/Neu/scalable/status/dialog-question.svg
+share/icons/Neu/scalable/status/dialog-warning.svg
+share/icons/Neu/scalable/status/edittrash.svg
+share/icons/Neu/scalable/status/error.svg
+share/icons/Neu/scalable/status/folder-drag-accept.svg
+share/icons/Neu/scalable/status/folder-open.svg
+share/icons/Neu/scalable/status/folder-visiting.svg
+share/icons/Neu/scalable/status/folder_open.svg
+share/icons/Neu/scalable/status/gnome-fs-directory-accept.svg
+share/icons/Neu/scalable/status/gnome-fs-directory-visiting.svg
+share/icons/Neu/scalable/status/gnome-fs-loading-icon.svg
+share/icons/Neu/scalable/status/gnome-fs-trash-full.svg
+share/icons/Neu/scalable/status/gnome-netstatus-disconn.svg
+share/icons/Neu/scalable/status/gnome-netstatus-error.svg
+share/icons/Neu/scalable/status/gnome-netstatus-idle.svg
+share/icons/Neu/scalable/status/gnome-netstatus-rx.svg
+share/icons/Neu/scalable/status/gnome-netstatus-tx.svg
+share/icons/Neu/scalable/status/gnome-netstatus-txrx.svg
+share/icons/Neu/scalable/status/gnome-stock-trash-full.svg
+share/icons/Neu/scalable/status/gtk-dialog-authentication.svg
+share/icons/Neu/scalable/status/gtk-dialog-error.svg
+share/icons/Neu/scalable/status/gtk-dialog-info.svg
+share/icons/Neu/scalable/status/gtk-dialog-question.svg
+share/icons/Neu/scalable/status/gtk-dialog-warning.svg
+share/icons/Neu/scalable/status/gtk-missing-image.svg
+share/icons/Neu/scalable/status/image-loading.svg
+share/icons/Neu/scalable/status/image-missing.svg
+share/icons/Neu/scalable/status/important.svg
+share/icons/Neu/scalable/status/info.svg
+share/icons/Neu/scalable/status/messagebox_critical.svg
+share/icons/Neu/scalable/status/messagebox_info.svg
+share/icons/Neu/scalable/status/messagebox_warning.svg
+share/icons/Neu/scalable/status/network-error.svg
+share/icons/Neu/scalable/status/network-idle.svg
+share/icons/Neu/scalable/status/network-offline.svg
+share/icons/Neu/scalable/status/network-receive.svg
+share/icons/Neu/scalable/status/network-transmit-receive.svg
+share/icons/Neu/scalable/status/network-transmit.svg
+share/icons/Neu/scalable/status/nm-adhoc.svg
+share/icons/Neu/scalable/status/nm-device-wired.svg
+share/icons/Neu/scalable/status/nm-device-wireless.svg
+share/icons/Neu/scalable/status/nm-no-connection.svg
+share/icons/Neu/scalable/status/printer-error.svg
+share/icons/Neu/scalable/status/stock_dialog-error.svg
+share/icons/Neu/scalable/status/stock_dialog-info.svg
+share/icons/Neu/scalable/status/stock_dialog-question.svg
+share/icons/Neu/scalable/status/stock_dialog-warning.svg
+share/icons/Neu/scalable/status/stock_open.svg
+share/icons/Neu/scalable/status/stock_trash_full.svg
+share/icons/Neu/scalable/status/stock_volume-0.svg
+share/icons/Neu/scalable/status/stock_volume-max.svg
+share/icons/Neu/scalable/status/stock_volume-med.svg
+share/icons/Neu/scalable/status/stock_volume-min.svg
+share/icons/Neu/scalable/status/stock_volume-mute.svg
+share/icons/Neu/scalable/status/stock_volume.svg
+share/icons/Neu/scalable/status/trashcan_full.svg
+share/icons/Neu/scalable/status/user-trash-full.svg
+share/icons/Neu/scalable/status/xfce-trash_full.svg
+share/themes/Darklooks/gtk-2.0/gtkrc
+share/themes/Darklooks/index.theme
+@dirrm share/themes/Darklooks/gtk-2.0
+@dirrm share/themes/Darklooks
+@dirrmtry share/themes
+@dirrm share/icons/Neu/scalable/status
+@dirrm share/icons/Neu/scalable/places
+@dirrm share/icons/Neu/scalable/mimetypes
+@dirrm share/icons/Neu/scalable/emblems
+@dirrm share/icons/Neu/scalable/devices
+@dirrm share/icons/Neu/scalable/categories
+@dirrm share/icons/Neu/scalable/apps
+@dirrm share/icons/Neu/scalable/actions
+@dirrm share/icons/Neu/scalable
+@dirrm share/icons/Neu/48x48/status
+@dirrm share/icons/Neu/48x48/places
+@dirrm share/icons/Neu/48x48/mimetypes
+@dirrm share/icons/Neu/48x48/emblems
+@dirrm share/icons/Neu/48x48/devices
+@dirrm share/icons/Neu/48x48/categories
+@dirrm share/icons/Neu/48x48/apps
+@dirrm share/icons/Neu/48x48/actions
+@dirrm share/icons/Neu/48x48
+@dirrm share/icons/Neu/24x24/status
+@dirrm share/icons/Neu/24x24/places
+@dirrm share/icons/Neu/24x24/mimetypes
+@dirrm share/icons/Neu/24x24/devices
+@dirrm share/icons/Neu/24x24/categories
+@dirrm share/icons/Neu/24x24/apps
+@dirrm share/icons/Neu/24x24/actions
+@dirrm share/icons/Neu/24x24
+@dirrm share/icons/Neu/22x22/status
+@dirrm share/icons/Neu/22x22/places
+@dirrm share/icons/Neu/22x22/mimetypes
+@dirrm share/icons/Neu/22x22/emblems
+@dirrm share/icons/Neu/22x22/devices
+@dirrm share/icons/Neu/22x22/categories
+@dirrm share/icons/Neu/22x22/apps
+@dirrm share/icons/Neu/22x22/actions
+@dirrm share/icons/Neu/22x22
+@dirrm share/icons/Neu/128x128/status
+@dirrm share/icons/Neu/128x128/places
+@dirrm share/icons/Neu/128x128/mimetypes
+@dirrm share/icons/Neu/128x128/emblems
+@dirrm share/icons/Neu/128x128/devices
+@dirrm share/icons/Neu/128x128/categories
+@dirrm share/icons/Neu/128x128/apps
+@dirrm share/icons/Neu/128x128/actions
+@dirrm share/icons/Neu/128x128
+@dirrm share/icons/Neu
+@dirrm share/icons/Gion/scalable/status
+@dirrm share/icons/Gion/scalable/places
+@dirrm share/icons/Gion/scalable/mimetypes
+@dirrm share/icons/Gion/scalable/devices
+@dirrm share/icons/Gion/scalable/categories
+@dirrm share/icons/Gion/scalable/apps
+@dirrm share/icons/Gion/scalable/actions
+@dirrm share/icons/Gion/scalable
+@dirrm share/icons/Gion/48x48/status
+@dirrm share/icons/Gion/48x48/places
+@dirrm share/icons/Gion/48x48/mimetypes
+@dirrm share/icons/Gion/48x48/devices
+@dirrm share/icons/Gion/48x48/categories
+@dirrm share/icons/Gion/48x48/apps
+@dirrm share/icons/Gion/48x48/actions
+@dirrm share/icons/Gion/48x48
+@dirrm share/icons/Gion/24x24/status
+@dirrm share/icons/Gion/24x24/places
+@dirrm share/icons/Gion/24x24/mimetypes
+@dirrm share/icons/Gion/24x24/devices
+@dirrm share/icons/Gion/24x24/apps
+@dirrm share/icons/Gion/24x24/actions
+@dirrm share/icons/Gion/24x24
+@dirrm share/icons/Gion/22x22/status
+@dirrm share/icons/Gion/22x22/places
+@dirrm share/icons/Gion/22x22/mimetypes
+@dirrm share/icons/Gion/22x22/devices
+@dirrm share/icons/Gion/22x22/apps
+@dirrm share/icons/Gion/22x22/actions
+@dirrm share/icons/Gion/22x22
+@dirrm share/icons/Gion/16x16/places
+@dirrm share/icons/Gion/16x16/mimetypes
+@dirrm share/icons/Gion/16x16/devices
+@dirrm share/icons/Gion/16x16/apps
+@dirrm share/icons/Gion/16x16/actions
+@dirrm share/icons/Gion/16x16
+@dirrm share/icons/Gion/128x128/status
+@dirrm share/icons/Gion/128x128/places
+@dirrm share/icons/Gion/128x128/mimetypes
+@dirrm share/icons/Gion/128x128/devices
+@dirrm share/icons/Gion/128x128/categories
+@dirrm share/icons/Gion/128x128/apps
+@dirrm share/icons/Gion/128x128/actions
+@dirrm share/icons/Gion/128x128
+@dirrm share/icons/Gion
+@dirrm share/icons/Foxtrot/scalable/status
+@dirrm share/icons/Foxtrot/scalable/places
+@dirrm share/icons/Foxtrot/scalable/devices
+@dirrm share/icons/Foxtrot/scalable/categories
+@dirrm share/icons/Foxtrot/scalable/actions
+@dirrm share/icons/Foxtrot/scalable
+@dirrm share/icons/Foxtrot/24x24/places
+@dirrm share/icons/Foxtrot/24x24/actions
+@dirrm share/icons/Foxtrot/24x24
+@dirrm share/icons/Foxtrot/22x22/status
+@dirrm share/icons/Foxtrot/22x22/places
+@dirrm share/icons/Foxtrot/22x22/actions
+@dirrm share/icons/Foxtrot/22x22
+@dirrm share/icons/Foxtrot/16x16/places
+@dirrm share/icons/Foxtrot/16x16/actions
+@dirrm share/icons/Foxtrot/16x16
+@dirrm share/icons/Foxtrot
diff --git a/x11-themes/gnome-themes/Makefile b/x11-themes/gnome-themes/Makefile
index 6cf745e715b8..f07b2bd58600 100644
--- a/x11-themes/gnome-themes/Makefile
+++ b/x11-themes/gnome-themes/Makefile
@@ -3,12 +3,11 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/x11-themes/gnome-themes/Makefile,v 1.116 2007/03/15 03:20:01 marcus Exp $
+#   $MCom: ports/x11-themes/gnome-themes/Makefile,v 1.129 2007/10/15 17:24:57 mezz Exp $
 #
 
 PORTNAME=	gnome-themes
-PORTVERSION=	2.18.1
-PORTREVISION=	1
+PORTVERSION=	2.20.1
 CATEGORIES=	x11-themes gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/x11-themes/gnome-themes/distinfo b/x11-themes/gnome-themes/distinfo
index 4e71df4d8d0e..2e583716dec8 100644
--- a/x11-themes/gnome-themes/distinfo
+++ b/x11-themes/gnome-themes/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-themes-2.18.1.tar.bz2) = caa1683da286eeeb0f4f7ec8b0cc34bb
-SHA256 (gnome2/gnome-themes-2.18.1.tar.bz2) = c6b983c65d79de0d5034688570c4caae5331d78ed1a2f7fdd1624037e682b232
-SIZE (gnome2/gnome-themes-2.18.1.tar.bz2) = 2428977
+MD5 (gnome2/gnome-themes-2.20.1.tar.bz2) = 85d07ae96c7b2f78888750fd88aeb98e
+SHA256 (gnome2/gnome-themes-2.20.1.tar.bz2) = 87cb9a0beaf1e5c3a90147a8aba7bcb6e594b918fa3316a7fa23b60a498a26ee
+SIZE (gnome2/gnome-themes-2.20.1.tar.bz2) = 2408805
diff --git a/x11-themes/gnome-themes/files/patch-metacity-themes_Makefile.in b/x11-themes/gnome-themes/files/patch-metacity-themes_Makefile.in
deleted file mode 100644
index 7694d5d3a158..000000000000
--- a/x11-themes/gnome-themes/files/patch-metacity-themes_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- metacity-themes/Makefile.in.orig	Mon May 31 20:29:45 2004
-+++ metacity-themes/Makefile.in	Mon May 31 20:29:56 2004
-@@ -133,7 +133,7 @@
- THEMES =  	Mist			Sandwish		Smokey
- 
- 
--THEME_DIR = $(datadir)/themes
-+THEME_DIR = $(datadir)/gnome/themes
- THEME_SUBDIR = metacity-1
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../config.h
diff --git a/x11-themes/gnome-themes/pkg-plist b/x11-themes/gnome-themes/pkg-plist
index 26faa85ccb64..4d18e68a24cb 100644
--- a/x11-themes/gnome-themes/pkg-plist
+++ b/x11-themes/gnome-themes/pkg-plist
@@ -1,7 +1,3 @@
-share/gnome/themes/Clearlooks/metacity-1/metacity-theme-1.xml
-share/gnome/themes/Glider/metacity-1/metacity-theme-1.xml
-share/gnome/themes/Glossy/metacity-1/metacity-theme-1.xml
-share/gnome/themes/Mist/metacity-1/metacity-theme-1.xml
 share/icons/Crux/16x16/actions/back.png
 share/icons/Crux/16x16/actions/bottom.png
 share/icons/Crux/16x16/actions/document-open.png
@@ -822,6 +818,7 @@ share/icons/HighContrast-SVG/scalable/devices/audio-input-microphone.svg
 share/icons/HighContrast-SVG/scalable/devices/battery.svg
 share/icons/HighContrast-SVG/scalable/devices/camera-photo.svg
 share/icons/HighContrast-SVG/scalable/devices/camera-video.svg
+share/icons/HighContrast-SVG/scalable/devices/camera-web.svg
 share/icons/HighContrast-SVG/scalable/devices/camera.svg
 share/icons/HighContrast-SVG/scalable/devices/camera_unmount.svg
 share/icons/HighContrast-SVG/scalable/devices/cdrom_unmount.svg
@@ -875,6 +872,7 @@ share/icons/HighContrast-SVG/scalable/devices/hdd_unmount.svg
 share/icons/HighContrast-SVG/scalable/devices/input-gaming.svg
 share/icons/HighContrast-SVG/scalable/devices/input-keyboard.svg
 share/icons/HighContrast-SVG/scalable/devices/input-mouse.svg
+share/icons/HighContrast-SVG/scalable/devices/input-tablet.svg
 share/icons/HighContrast-SVG/scalable/devices/ipod_mount.svg
 share/icons/HighContrast-SVG/scalable/devices/joystick.svg
 share/icons/HighContrast-SVG/scalable/devices/keyboard.svg
@@ -890,10 +888,13 @@ share/icons/HighContrast-SVG/scalable/devices/mouse.svg
 share/icons/HighContrast-SVG/scalable/devices/multimedia-player.svg
 share/icons/HighContrast-SVG/scalable/devices/network-wired.svg
 share/icons/HighContrast-SVG/scalable/devices/network-wireless.svg
+share/icons/HighContrast-SVG/scalable/devices/pda.svg
+share/icons/HighContrast-SVG/scalable/devices/phone.svg
 share/icons/HighContrast-SVG/scalable/devices/printer-remote.svg
 share/icons/HighContrast-SVG/scalable/devices/printer.svg
 share/icons/HighContrast-SVG/scalable/devices/printer1.svg
 share/icons/HighContrast-SVG/scalable/devices/printmgr.svg
+share/icons/HighContrast-SVG/scalable/devices/scanner.svg
 share/icons/HighContrast-SVG/scalable/devices/stock_mic.svg
 share/icons/HighContrast-SVG/scalable/devices/stock_printers.svg
 share/icons/HighContrast-SVG/scalable/devices/system-floppy.svg
@@ -1026,11 +1027,15 @@ share/icons/HighContrast-SVG/scalable/places/gnome-mime-x-directory-smb-share.sv
 share/icons/HighContrast-SVG/scalable/places/gnome-mime-x-directory-smb-workgroup.svg
 share/icons/HighContrast-SVG/scalable/places/gnome-stock-trash.svg
 share/icons/HighContrast-SVG/scalable/places/gtk-network.svg
+share/icons/HighContrast-SVG/scalable/places/library-internet-radio.svg
+share/icons/HighContrast-SVG/scalable/places/library-podcast.svg
 share/icons/HighContrast-SVG/scalable/places/network-server.svg
 share/icons/HighContrast-SVG/scalable/places/network-workgroup.svg
 share/icons/HighContrast-SVG/scalable/places/network.svg
 share/icons/HighContrast-SVG/scalable/places/network_local.svg
 share/icons/HighContrast-SVG/scalable/places/novell-button.svg
+share/icons/HighContrast-SVG/scalable/places/playlist-automatic.svg
+share/icons/HighContrast-SVG/scalable/places/playlist.svg
 share/icons/HighContrast-SVG/scalable/places/redhat-network-server.svg
 share/icons/HighContrast-SVG/scalable/places/server.svg
 share/icons/HighContrast-SVG/scalable/places/start-here.svg
@@ -1080,6 +1085,8 @@ share/icons/HighContrast-SVG/scalable/status/nm-no-connection.svg
 share/icons/HighContrast-SVG/scalable/status/security-high.svg
 share/icons/HighContrast-SVG/scalable/status/security-low.svg
 share/icons/HighContrast-SVG/scalable/status/security-medium.svg
+share/icons/HighContrast-SVG/scalable/status/software-update-available.svg
+share/icons/HighContrast-SVG/scalable/status/software-update-urgent.svg
 share/icons/HighContrast-SVG/scalable/status/stock_dialog-error.svg
 share/icons/HighContrast-SVG/scalable/status/stock_dialog-info.svg
 share/icons/HighContrast-SVG/scalable/status/stock_dialog-question.svg
@@ -2152,8 +2159,10 @@ share/icons/Mist/16x16/places/stock_folder.png
 share/icons/Mist/16x16/places/user-home.png
 share/icons/Mist/16x16/status/folder-drag-accept.svg
 share/icons/Mist/16x16/status/folder-open.svg
+share/icons/Mist/16x16/status/folder-visiting.png
 share/icons/Mist/16x16/status/folder_open.svg
 share/icons/Mist/16x16/status/gnome-fs-directory-accept.svg
+share/icons/Mist/16x16/status/gnome-fs-directory-visiting.png
 share/icons/Mist/16x16/status/stock_open.svg
 share/icons/Mist/22x22/actions/document-open.png
 share/icons/Mist/22x22/actions/fileopen.png
@@ -2177,8 +2186,10 @@ share/icons/Mist/22x22/places/stock_folder.png
 share/icons/Mist/22x22/places/user-home.svg
 share/icons/Mist/22x22/status/folder-drag-accept.png
 share/icons/Mist/22x22/status/folder-open.png
+share/icons/Mist/22x22/status/folder-visiting.png
 share/icons/Mist/22x22/status/folder_open.png
 share/icons/Mist/22x22/status/gnome-fs-directory-accept.png
+share/icons/Mist/22x22/status/gnome-fs-directory-visiting.png
 share/icons/Mist/22x22/status/stock_open.png
 share/icons/Mist/24x24/actions/document-open.png
 share/icons/Mist/24x24/actions/fileopen.png
@@ -2202,8 +2213,10 @@ share/icons/Mist/24x24/places/stock_folder.png
 share/icons/Mist/24x24/places/user-home.png
 share/icons/Mist/24x24/status/folder-drag-accept.png
 share/icons/Mist/24x24/status/folder-open.png
+share/icons/Mist/24x24/status/folder-visiting.png
 share/icons/Mist/24x24/status/folder_open.png
 share/icons/Mist/24x24/status/gnome-fs-directory-accept.png
+share/icons/Mist/24x24/status/gnome-fs-directory-visiting.png
 share/icons/Mist/24x24/status/stock_open.png
 share/icons/Mist/32x32/actions/document-open.svg
 share/icons/Mist/32x32/actions/fileopen.svg
@@ -2227,8 +2240,10 @@ share/icons/Mist/32x32/places/stock_folder.svg
 share/icons/Mist/32x32/places/user-home.svg
 share/icons/Mist/32x32/status/folder-drag-accept.svg
 share/icons/Mist/32x32/status/folder-open.svg
+share/icons/Mist/32x32/status/folder-visiting.png
 share/icons/Mist/32x32/status/folder_open.svg
 share/icons/Mist/32x32/status/gnome-fs-directory-accept.svg
+share/icons/Mist/32x32/status/gnome-fs-directory-visiting.png
 share/icons/Mist/32x32/status/stock_open.svg
 share/icons/Mist/index.theme
 share/icons/Mist/scalable/actions/document-open.svg
@@ -2253,13 +2268,16 @@ share/icons/Mist/scalable/places/stock_folder.svg
 share/icons/Mist/scalable/places/user-home.svg
 share/icons/Mist/scalable/status/folder-drag-accept.svg
 share/icons/Mist/scalable/status/folder-open.svg
+share/icons/Mist/scalable/status/folder-visiting.svg
 share/icons/Mist/scalable/status/folder_open.svg
 share/icons/Mist/scalable/status/gnome-fs-directory-accept.svg
+share/icons/Mist/scalable/status/gnome-fs-directory-visiting.svg
 share/icons/Mist/scalable/status/stock_open.svg
 share/locale/am/LC_MESSAGES/gnome-themes.mo
 share/locale/ar/LC_MESSAGES/gnome-themes.mo
 share/locale/az/LC_MESSAGES/gnome-themes.mo
 share/locale/be/LC_MESSAGES/gnome-themes.mo
+share/locale/be@latin/LC_MESSAGES/gnome-themes.mo
 share/locale/bg/LC_MESSAGES/gnome-themes.mo
 share/locale/bn/LC_MESSAGES/gnome-themes.mo
 share/locale/bn_IN/LC_MESSAGES/gnome-themes.mo
@@ -2307,6 +2325,7 @@ share/locale/nb/LC_MESSAGES/gnome-themes.mo
 share/locale/ne/LC_MESSAGES/gnome-themes.mo
 share/locale/nl/LC_MESSAGES/gnome-themes.mo
 share/locale/nn/LC_MESSAGES/gnome-themes.mo
+share/locale/oc/LC_MESSAGES/gnome-themes.mo
 share/locale/or/LC_MESSAGES/gnome-themes.mo
 share/locale/pa/LC_MESSAGES/gnome-themes.mo
 share/locale/pl/LC_MESSAGES/gnome-themes.mo
@@ -2334,11 +2353,16 @@ share/locale/zh_CN/LC_MESSAGES/gnome-themes.mo
 share/locale/zh_HK/LC_MESSAGES/gnome-themes.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-themes.mo
 share/themes/Clearlooks/index.theme
+share/themes/Clearlooks/metacity-1/metacity-theme-1.xml
+share/themes/ClearlooksClassic/gtk-2.0/gtkrc
+share/themes/ClearlooksClassic/metacity-1/metacity-theme-1.xml
 share/themes/Crux/index.theme
 share/themes/Glider/gtk-2.0/gtkrc
 share/themes/Glider/index.theme
+share/themes/Glider/metacity-1/metacity-theme-1.xml
 share/themes/Glossy/gtk-2.0/gtkrc
 share/themes/Glossy/index.theme
+share/themes/Glossy/metacity-1/metacity-theme-1.xml
 share/themes/HighContrast/gtk-2.0/gtkrc
 share/themes/HighContrast/index.theme
 share/themes/HighContrastInverse/gtk-2.0/gtkrc
@@ -2383,7 +2407,6 @@ share/themes/HighContrastLargePrint/pixmaps/stock_commandline-history.xpm
 share/themes/HighContrastLargePrint/pixmaps/stock_connect.png
 share/themes/HighContrastLargePrint/pixmaps/stock_convert.png
 share/themes/HighContrastLargePrint/pixmaps/stock_copy.png
-share/themes/HighContrastLargePrint/pixmaps/stock_corner-panel.png
 share/themes/HighContrastLargePrint/pixmaps/stock_cut.png
 share/themes/HighContrastLargePrint/pixmaps/stock_delete.png
 share/themes/HighContrastLargePrint/pixmaps/stock_dialog_error.png
@@ -2394,14 +2417,12 @@ share/themes/HighContrastLargePrint/pixmaps/stock_disconnect.png
 share/themes/HighContrastLargePrint/pixmaps/stock_dnd.png
 share/themes/HighContrastLargePrint/pixmaps/stock_dnd_multiple.png
 share/themes/HighContrastLargePrint/pixmaps/stock_drawer.png
-share/themes/HighContrastLargePrint/pixmaps/stock_edge-panel.png
 share/themes/HighContrastLargePrint/pixmaps/stock_edit.png
 share/themes/HighContrastLargePrint/pixmaps/stock_empty.png
 share/themes/HighContrastLargePrint/pixmaps/stock_execute.png
 share/themes/HighContrastLargePrint/pixmaps/stock_export.png
 share/themes/HighContrastLargePrint/pixmaps/stock_find-and-replace.png
 share/themes/HighContrastLargePrint/pixmaps/stock_find.png
-share/themes/HighContrastLargePrint/pixmaps/stock_floating-panel.png
 share/themes/HighContrastLargePrint/pixmaps/stock_floppy.png
 share/themes/HighContrastLargePrint/pixmaps/stock_gnome-logo.png
 share/themes/HighContrastLargePrint/pixmaps/stock_gnome-util.png
@@ -2433,7 +2454,6 @@ share/themes/HighContrastLargePrint/pixmaps/stock_launcher-program.png
 share/themes/HighContrastLargePrint/pixmaps/stock_line-in.png
 share/themes/HighContrastLargePrint/pixmaps/stock_lockscreen.png
 share/themes/HighContrastLargePrint/pixmaps/stock_logout.png
-share/themes/HighContrastLargePrint/pixmaps/stock_menu-panel.png
 share/themes/HighContrastLargePrint/pixmaps/stock_mic.png
 share/themes/HighContrastLargePrint/pixmaps/stock_missing-image.png
 share/themes/HighContrastLargePrint/pixmaps/stock_multimedia.png
@@ -2441,10 +2461,6 @@ share/themes/HighContrastLargePrint/pixmaps/stock_new.png
 share/themes/HighContrastLargePrint/pixmaps/stock_no.png
 share/themes/HighContrastLargePrint/pixmaps/stock_ok.png
 share/themes/HighContrastLargePrint/pixmaps/stock_open.png
-share/themes/HighContrastLargePrint/pixmaps/stock_panel_hide_down.png
-share/themes/HighContrastLargePrint/pixmaps/stock_panel_hide_left.png
-share/themes/HighContrastLargePrint/pixmaps/stock_panel_hide_right.png
-share/themes/HighContrastLargePrint/pixmaps/stock_panel_hide_up.png
 share/themes/HighContrastLargePrint/pixmaps/stock_paste.png
 share/themes/HighContrastLargePrint/pixmaps/stock_preferences.png
 share/themes/HighContrastLargePrint/pixmaps/stock_print-preview.png
@@ -2462,7 +2478,6 @@ share/themes/HighContrastLargePrint/pixmaps/stock_screenshot.png
 share/themes/HighContrastLargePrint/pixmaps/stock_searchtool.png
 share/themes/HighContrastLargePrint/pixmaps/stock_select-color.png
 share/themes/HighContrastLargePrint/pixmaps/stock_select-font.png
-share/themes/HighContrastLargePrint/pixmaps/stock_sliding-panel.png
 share/themes/HighContrastLargePrint/pixmaps/stock_sort-ascending.png
 share/themes/HighContrastLargePrint/pixmaps/stock_sort-descending.png
 share/themes/HighContrastLargePrint/pixmaps/stock_spell-check.png
@@ -2522,7 +2537,6 @@ share/themes/HighContrastLargePrintInverse/pixmaps/stock_commandline-history.xpm
 share/themes/HighContrastLargePrintInverse/pixmaps/stock_connect.png
 share/themes/HighContrastLargePrintInverse/pixmaps/stock_convert.png
 share/themes/HighContrastLargePrintInverse/pixmaps/stock_copy.png
-share/themes/HighContrastLargePrintInverse/pixmaps/stock_corner-panel.png
 share/themes/HighContrastLargePrintInverse/pixmaps/stock_cut.png
 share/themes/HighContrastLargePrintInverse/pixmaps/stock_delete.png
 share/themes/HighContrastLargePrintInverse/pixmaps/stock_dialog_error.png
@@ -2533,14 +2547,12 @@ share/themes/HighContrastLargePrintInverse/pixmaps/stock_disconnect.png
 share/themes/HighContrastLargePrintInverse/pixmaps/stock_dnd.png
 share/themes/HighContrastLargePrintInverse/pixmaps/stock_dnd_multiple.png
 share/themes/HighContrastLargePrintInverse/pixmaps/stock_drawer.png
-share/themes/HighContrastLargePrintInverse/pixmaps/stock_edge-panel.png
 share/themes/HighContrastLargePrintInverse/pixmaps/stock_edit.png
 share/themes/HighContrastLargePrintInverse/pixmaps/stock_empty.png
 share/themes/HighContrastLargePrintInverse/pixmaps/stock_execute.png
 share/themes/HighContrastLargePrintInverse/pixmaps/stock_export.png
 share/themes/HighContrastLargePrintInverse/pixmaps/stock_find-and-replace.png
 share/themes/HighContrastLargePrintInverse/pixmaps/stock_find.png
-share/themes/HighContrastLargePrintInverse/pixmaps/stock_floating-panel.png
 share/themes/HighContrastLargePrintInverse/pixmaps/stock_floppy.png
 share/themes/HighContrastLargePrintInverse/pixmaps/stock_gnome-logo.png
 share/themes/HighContrastLargePrintInverse/pixmaps/stock_gnome-util.png
@@ -2572,7 +2584,6 @@ share/themes/HighContrastLargePrintInverse/pixmaps/stock_launcher-program.png
 share/themes/HighContrastLargePrintInverse/pixmaps/stock_line-in.png
 share/themes/HighContrastLargePrintInverse/pixmaps/stock_lockscreen.png
 share/themes/HighContrastLargePrintInverse/pixmaps/stock_logout.png
-share/themes/HighContrastLargePrintInverse/pixmaps/stock_menu-panel.png
 share/themes/HighContrastLargePrintInverse/pixmaps/stock_mic.png
 share/themes/HighContrastLargePrintInverse/pixmaps/stock_missing-image.png
 share/themes/HighContrastLargePrintInverse/pixmaps/stock_multimedia.png
@@ -2580,10 +2591,6 @@ share/themes/HighContrastLargePrintInverse/pixmaps/stock_new.png
 share/themes/HighContrastLargePrintInverse/pixmaps/stock_no.png
 share/themes/HighContrastLargePrintInverse/pixmaps/stock_ok.png
 share/themes/HighContrastLargePrintInverse/pixmaps/stock_open.png
-share/themes/HighContrastLargePrintInverse/pixmaps/stock_panel_hide_down.png
-share/themes/HighContrastLargePrintInverse/pixmaps/stock_panel_hide_left.png
-share/themes/HighContrastLargePrintInverse/pixmaps/stock_panel_hide_right.png
-share/themes/HighContrastLargePrintInverse/pixmaps/stock_panel_hide_up.png
 share/themes/HighContrastLargePrintInverse/pixmaps/stock_paste.png
 share/themes/HighContrastLargePrintInverse/pixmaps/stock_preferences.png
 share/themes/HighContrastLargePrintInverse/pixmaps/stock_print-preview.png
@@ -2601,7 +2608,6 @@ share/themes/HighContrastLargePrintInverse/pixmaps/stock_screenshot.png
 share/themes/HighContrastLargePrintInverse/pixmaps/stock_searchtool.png
 share/themes/HighContrastLargePrintInverse/pixmaps/stock_select-color.png
 share/themes/HighContrastLargePrintInverse/pixmaps/stock_select-font.png
-share/themes/HighContrastLargePrintInverse/pixmaps/stock_sliding-panel.png
 share/themes/HighContrastLargePrintInverse/pixmaps/stock_sort-ascending.png
 share/themes/HighContrastLargePrintInverse/pixmaps/stock_sort-descending.png
 share/themes/HighContrastLargePrintInverse/pixmaps/stock_spell-check.png
@@ -2621,6 +2627,8 @@ share/themes/HighContrastLargePrintInverse/pixmaps/volume-medium.png
 share/themes/HighContrastLargePrintInverse/pixmaps/volume-min.png
 share/themes/HighContrastLargePrintInverse/pixmaps/volume-mute.png
 share/themes/HighContrastLargePrintInverse/pixmaps/volume-zero.png
+share/themes/Inverted/gtk-2.0/gtkrc
+share/themes/Inverted/metacity-1/metacity-theme-1.xml
 share/themes/LargePrint/gtk-2.0/gtkrc
 share/themes/LargePrint/index.theme.disabled
 share/themes/LargePrint/pixmaps/double-click-maybe.png
@@ -2661,7 +2669,6 @@ share/themes/LargePrint/pixmaps/stock_commandline-history.xpm
 share/themes/LargePrint/pixmaps/stock_connect.png
 share/themes/LargePrint/pixmaps/stock_convert.png
 share/themes/LargePrint/pixmaps/stock_copy.png
-share/themes/LargePrint/pixmaps/stock_corner-panel.png
 share/themes/LargePrint/pixmaps/stock_cut.png
 share/themes/LargePrint/pixmaps/stock_delete.png
 share/themes/LargePrint/pixmaps/stock_dialog_error.png
@@ -2672,14 +2679,12 @@ share/themes/LargePrint/pixmaps/stock_disconnect.png
 share/themes/LargePrint/pixmaps/stock_dnd.png
 share/themes/LargePrint/pixmaps/stock_dnd_multiple.png
 share/themes/LargePrint/pixmaps/stock_drawer.png
-share/themes/LargePrint/pixmaps/stock_edge-panel.png
 share/themes/LargePrint/pixmaps/stock_edit.png
 share/themes/LargePrint/pixmaps/stock_empty.png
 share/themes/LargePrint/pixmaps/stock_execute.png
 share/themes/LargePrint/pixmaps/stock_export.png
 share/themes/LargePrint/pixmaps/stock_find-and-replace.png
 share/themes/LargePrint/pixmaps/stock_find.png
-share/themes/LargePrint/pixmaps/stock_floating-panel.png
 share/themes/LargePrint/pixmaps/stock_floppy.png
 share/themes/LargePrint/pixmaps/stock_gnome-logo.png
 share/themes/LargePrint/pixmaps/stock_gnome-util.png
@@ -2711,7 +2716,6 @@ share/themes/LargePrint/pixmaps/stock_launcher-program.png
 share/themes/LargePrint/pixmaps/stock_line-in.png
 share/themes/LargePrint/pixmaps/stock_lockscreen.png
 share/themes/LargePrint/pixmaps/stock_logout.png
-share/themes/LargePrint/pixmaps/stock_menu-panel.png
 share/themes/LargePrint/pixmaps/stock_mic.png
 share/themes/LargePrint/pixmaps/stock_missing-image.png
 share/themes/LargePrint/pixmaps/stock_multimedia.png
@@ -2719,10 +2723,6 @@ share/themes/LargePrint/pixmaps/stock_new.png
 share/themes/LargePrint/pixmaps/stock_no.png
 share/themes/LargePrint/pixmaps/stock_ok.png
 share/themes/LargePrint/pixmaps/stock_open.png
-share/themes/LargePrint/pixmaps/stock_panel_hide_down.png
-share/themes/LargePrint/pixmaps/stock_panel_hide_left.png
-share/themes/LargePrint/pixmaps/stock_panel_hide_right.png
-share/themes/LargePrint/pixmaps/stock_panel_hide_up.png
 share/themes/LargePrint/pixmaps/stock_paste.png
 share/themes/LargePrint/pixmaps/stock_preferences.png
 share/themes/LargePrint/pixmaps/stock_print-preview.png
@@ -2740,7 +2740,6 @@ share/themes/LargePrint/pixmaps/stock_screenshot.png
 share/themes/LargePrint/pixmaps/stock_searchtool.png
 share/themes/LargePrint/pixmaps/stock_select-color.png
 share/themes/LargePrint/pixmaps/stock_select-font.png
-share/themes/LargePrint/pixmaps/stock_sliding-panel.png
 share/themes/LargePrint/pixmaps/stock_sort-ascending.png
 share/themes/LargePrint/pixmaps/stock_sort-descending.png
 share/themes/LargePrint/pixmaps/stock_spell-check.png
@@ -2802,7 +2801,6 @@ share/themes/LowContrastLargePrint/pixmaps/stock_commandline-history.xpm
 share/themes/LowContrastLargePrint/pixmaps/stock_connect.png
 share/themes/LowContrastLargePrint/pixmaps/stock_convert.png
 share/themes/LowContrastLargePrint/pixmaps/stock_copy.png
-share/themes/LowContrastLargePrint/pixmaps/stock_corner-panel.png
 share/themes/LowContrastLargePrint/pixmaps/stock_cut.png
 share/themes/LowContrastLargePrint/pixmaps/stock_delete.png
 share/themes/LowContrastLargePrint/pixmaps/stock_dialog_error.png
@@ -2813,14 +2811,12 @@ share/themes/LowContrastLargePrint/pixmaps/stock_disconnect.png
 share/themes/LowContrastLargePrint/pixmaps/stock_dnd.png
 share/themes/LowContrastLargePrint/pixmaps/stock_dnd_multiple.png
 share/themes/LowContrastLargePrint/pixmaps/stock_drawer.png
-share/themes/LowContrastLargePrint/pixmaps/stock_edge-panel.png
 share/themes/LowContrastLargePrint/pixmaps/stock_edit.png
 share/themes/LowContrastLargePrint/pixmaps/stock_empty.png
 share/themes/LowContrastLargePrint/pixmaps/stock_execute.png
 share/themes/LowContrastLargePrint/pixmaps/stock_export.png
 share/themes/LowContrastLargePrint/pixmaps/stock_find-and-replace.png
 share/themes/LowContrastLargePrint/pixmaps/stock_find.png
-share/themes/LowContrastLargePrint/pixmaps/stock_floating-panel.png
 share/themes/LowContrastLargePrint/pixmaps/stock_floppy.png
 share/themes/LowContrastLargePrint/pixmaps/stock_gnome-logo.png
 share/themes/LowContrastLargePrint/pixmaps/stock_gnome-util.png
@@ -2852,7 +2848,6 @@ share/themes/LowContrastLargePrint/pixmaps/stock_launcher-program.png
 share/themes/LowContrastLargePrint/pixmaps/stock_line-in.png
 share/themes/LowContrastLargePrint/pixmaps/stock_lockscreen.png
 share/themes/LowContrastLargePrint/pixmaps/stock_logout.png
-share/themes/LowContrastLargePrint/pixmaps/stock_menu-panel.png
 share/themes/LowContrastLargePrint/pixmaps/stock_mic.png
 share/themes/LowContrastLargePrint/pixmaps/stock_missing-image.png
 share/themes/LowContrastLargePrint/pixmaps/stock_multimedia.png
@@ -2860,10 +2855,6 @@ share/themes/LowContrastLargePrint/pixmaps/stock_new.png
 share/themes/LowContrastLargePrint/pixmaps/stock_no.png
 share/themes/LowContrastLargePrint/pixmaps/stock_ok.png
 share/themes/LowContrastLargePrint/pixmaps/stock_open.png
-share/themes/LowContrastLargePrint/pixmaps/stock_panel_hide_down.png
-share/themes/LowContrastLargePrint/pixmaps/stock_panel_hide_left.png
-share/themes/LowContrastLargePrint/pixmaps/stock_panel_hide_right.png
-share/themes/LowContrastLargePrint/pixmaps/stock_panel_hide_up.png
 share/themes/LowContrastLargePrint/pixmaps/stock_paste.png
 share/themes/LowContrastLargePrint/pixmaps/stock_preferences.png
 share/themes/LowContrastLargePrint/pixmaps/stock_print-preview.png
@@ -2881,7 +2872,6 @@ share/themes/LowContrastLargePrint/pixmaps/stock_screenshot.png
 share/themes/LowContrastLargePrint/pixmaps/stock_searchtool.png
 share/themes/LowContrastLargePrint/pixmaps/stock_select-color.png
 share/themes/LowContrastLargePrint/pixmaps/stock_select-font.png
-share/themes/LowContrastLargePrint/pixmaps/stock_sliding-panel.png
 share/themes/LowContrastLargePrint/pixmaps/stock_sort-ascending.png
 share/themes/LowContrastLargePrint/pixmaps/stock_sort-descending.png
 share/themes/LowContrastLargePrint/pixmaps/stock_spell-check.png
@@ -2902,9 +2892,11 @@ share/themes/LowContrastLargePrint/pixmaps/volume-min.png
 share/themes/LowContrastLargePrint/pixmaps/volume-mute.png
 share/themes/LowContrastLargePrint/pixmaps/volume-zero.png
 share/themes/Mist/index.theme
+share/themes/Mist/metacity-1/metacity-theme-1.xml
 share/themes/Simple/gtk-2.0/gtkrc
 @dirrm share/themes/Simple/gtk-2.0
 @dirrm share/themes/Simple
+@dirrm share/themes/Mist/metacity-1
 @dirrm share/themes/Mist
 @dirrm share/themes/LowContrastLargePrint/pixmaps
 @dirrm share/themes/LowContrastLargePrint/gtk-2.0
@@ -2914,6 +2906,9 @@ share/themes/Simple/gtk-2.0/gtkrc
 @dirrm share/themes/LargePrint/pixmaps
 @dirrm share/themes/LargePrint/gtk-2.0
 @dirrm share/themes/LargePrint
+@dirrm share/themes/Inverted/metacity-1
+@dirrm share/themes/Inverted/gtk-2.0
+@dirrm share/themes/Inverted
 @dirrm share/themes/HighContrastLargePrintInverse/pixmaps
 @dirrm share/themes/HighContrastLargePrintInverse/gtk-2.0
 @dirrm share/themes/HighContrastLargePrintInverse
@@ -2924,11 +2919,17 @@ share/themes/Simple/gtk-2.0/gtkrc
 @dirrm share/themes/HighContrastInverse
 @dirrm share/themes/HighContrast/gtk-2.0
 @dirrm share/themes/HighContrast
+@dirrm share/themes/Glossy/metacity-1
 @dirrm share/themes/Glossy/gtk-2.0
 @dirrm share/themes/Glossy
+@dirrm share/themes/Glider/metacity-1
 @dirrm share/themes/Glider/gtk-2.0
 @dirrm share/themes/Glider
 @dirrm share/themes/Crux
+@dirrm share/themes/ClearlooksClassic/metacity-1
+@dirrm share/themes/ClearlooksClassic/gtk-2.0
+@dirrm share/themes/ClearlooksClassic
+@dirrm share/themes/Clearlooks/metacity-1
 @dirrm share/themes/Clearlooks
 @dirrmtry share/themes
 @dirrm share/icons/Mist/scalable/status
@@ -3018,14 +3019,6 @@ share/themes/Simple/gtk-2.0/gtkrc
 @dirrm share/icons/Crux/16x16
 @dirrm share/icons/Crux
 @dirrmtry share/icons
-@dirrm share/gnome/themes/Mist/metacity-1
-@dirrm share/gnome/themes/Mist
-@dirrm share/gnome/themes/Glossy/metacity-1
-@dirrm share/gnome/themes/Glossy
-@dirrm share/gnome/themes/Glider/metacity-1
-@dirrm share/gnome/themes/Glider
-@dirrm share/gnome/themes/Clearlooks/metacity-1
-@dirrm share/gnome/themes/Clearlooks
 @dirrmtry share/locale/zh_HK/LC_MESSAGES
 @dirrmtry share/locale/zh_HK
 @dirrmtry share/locale/xh/LC_MESSAGES
@@ -3036,6 +3029,8 @@ share/themes/Simple/gtk-2.0/gtkrc
 @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
@@ -3048,3 +3043,5 @@ share/themes/Simple/gtk-2.0/gtkrc
 @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/x11-themes/gtk-aluminumalloy-cryogenic-theme/Makefile b/x11-themes/gtk-aluminumalloy-cryogenic-theme/Makefile
index 5fd6929cfb67..6fa4645d3e9c 100644
--- a/x11-themes/gtk-aluminumalloy-cryogenic-theme/Makefile
+++ b/x11-themes/gtk-aluminumalloy-cryogenic-theme/Makefile
@@ -5,6 +5,8 @@
 # $FreeBSD$
 #
 
+PORTREVISION=	1
+
 FLAVOR=		cryogenic
 
 MASTERDIR=	${.CURDIR}/../gtk-aluminumalloy-volcanic-theme
diff --git a/x11-themes/gtk-aluminumalloy-cryogenic-theme/pkg-plist b/x11-themes/gtk-aluminumalloy-cryogenic-theme/pkg-plist
index ba40a05d1d58..9010eb3ac933 100644
--- a/x11-themes/gtk-aluminumalloy-cryogenic-theme/pkg-plist
+++ b/x11-themes/gtk-aluminumalloy-cryogenic-theme/pkg-plist
@@ -226,29 +226,30 @@
 %%GTK20%%@dirrm share/themes/AluminumAlloy-Cryogenic/gtk-2.0/icons
 %%GTK20%%@dirrm share/themes/AluminumAlloy-Cryogenic/gtk-2.0
 %%GTK20%%@dirrm share/themes/AluminumAlloy-Cryogenic
-%%METACITY%%share/gnome/themes/AluminumAlloy-Cryogenic/metacity-1/title-bar.png
-%%METACITY%%share/gnome/themes/AluminumAlloy-Cryogenic/metacity-1/title-bar-inactive.png
-%%METACITY%%share/gnome/themes/AluminumAlloy-Cryogenic/metacity-1/text_right.png
-%%METACITY%%share/gnome/themes/AluminumAlloy-Cryogenic/metacity-1/text_left.png
-%%METACITY%%share/gnome/themes/AluminumAlloy-Cryogenic/metacity-1/text_back.png
-%%METACITY%%share/gnome/themes/AluminumAlloy-Cryogenic/metacity-1/right-side.png
-%%METACITY%%share/gnome/themes/AluminumAlloy-Cryogenic/metacity-1/right-side-inactive.png
-%%METACITY%%share/gnome/themes/AluminumAlloy-Cryogenic/metacity-1/metacity-theme-1.xml
-%%METACITY%%share/gnome/themes/AluminumAlloy-Cryogenic/metacity-1/menu-button.png
-%%METACITY%%share/gnome/themes/AluminumAlloy-Cryogenic/metacity-1/menu-button-push.png
-%%METACITY%%share/gnome/themes/AluminumAlloy-Cryogenic/metacity-1/menu-button-inactive.png
-%%METACITY%%share/gnome/themes/AluminumAlloy-Cryogenic/metacity-1/left-side.png
-%%METACITY%%share/gnome/themes/AluminumAlloy-Cryogenic/metacity-1/left-side-inactive.png
-%%METACITY%%share/gnome/themes/AluminumAlloy-Cryogenic/metacity-1/close-button-inactive.png
-%%METACITY%%share/gnome/themes/AluminumAlloy-Cryogenic/metacity-1/button-min.png
-%%METACITY%%share/gnome/themes/AluminumAlloy-Cryogenic/metacity-1/button-min-push.png
-%%METACITY%%share/gnome/themes/AluminumAlloy-Cryogenic/metacity-1/button-min-focus.png
-%%METACITY%%share/gnome/themes/AluminumAlloy-Cryogenic/metacity-1/button-max.png
-%%METACITY%%share/gnome/themes/AluminumAlloy-Cryogenic/metacity-1/button-max-push.png
-%%METACITY%%share/gnome/themes/AluminumAlloy-Cryogenic/metacity-1/button-max-focus.png
-%%METACITY%%share/gnome/themes/AluminumAlloy-Cryogenic/metacity-1/button-inactive.png
-%%METACITY%%share/gnome/themes/AluminumAlloy-Cryogenic/metacity-1/button-close.png
-%%METACITY%%share/gnome/themes/AluminumAlloy-Cryogenic/metacity-1/button-close-push.png
-%%METACITY%%share/gnome/themes/AluminumAlloy-Cryogenic/metacity-1/button-close-focus.png
-%%METACITY%%@dirrm share/gnome/themes/AluminumAlloy-Cryogenic/metacity-1
-%%METACITY%%@dirrm share/gnome/themes/AluminumAlloy-Cryogenic
+%%METACITY%%share/themes/AluminumAlloy-Cryogenic/metacity-1/title-bar.png
+%%METACITY%%share/themes/AluminumAlloy-Cryogenic/metacity-1/title-bar-inactive.png
+%%METACITY%%share/themes/AluminumAlloy-Cryogenic/metacity-1/text_right.png
+%%METACITY%%share/themes/AluminumAlloy-Cryogenic/metacity-1/text_left.png
+%%METACITY%%share/themes/AluminumAlloy-Cryogenic/metacity-1/text_back.png
+%%METACITY%%share/themes/AluminumAlloy-Cryogenic/metacity-1/right-side.png
+%%METACITY%%share/themes/AluminumAlloy-Cryogenic/metacity-1/right-side-inactive.png
+%%METACITY%%share/themes/AluminumAlloy-Cryogenic/metacity-1/metacity-theme-1.xml
+%%METACITY%%share/themes/AluminumAlloy-Cryogenic/metacity-1/menu-button.png
+%%METACITY%%share/themes/AluminumAlloy-Cryogenic/metacity-1/menu-button-push.png
+%%METACITY%%share/themes/AluminumAlloy-Cryogenic/metacity-1/menu-button-inactive.png
+%%METACITY%%share/themes/AluminumAlloy-Cryogenic/metacity-1/left-side.png
+%%METACITY%%share/themes/AluminumAlloy-Cryogenic/metacity-1/left-side-inactive.png
+%%METACITY%%share/themes/AluminumAlloy-Cryogenic/metacity-1/close-button-inactive.png
+%%METACITY%%share/themes/AluminumAlloy-Cryogenic/metacity-1/button-min.png
+%%METACITY%%share/themes/AluminumAlloy-Cryogenic/metacity-1/button-min-push.png
+%%METACITY%%share/themes/AluminumAlloy-Cryogenic/metacity-1/button-min-focus.png
+%%METACITY%%share/themes/AluminumAlloy-Cryogenic/metacity-1/button-max.png
+%%METACITY%%share/themes/AluminumAlloy-Cryogenic/metacity-1/button-max-push.png
+%%METACITY%%share/themes/AluminumAlloy-Cryogenic/metacity-1/button-max-focus.png
+%%METACITY%%share/themes/AluminumAlloy-Cryogenic/metacity-1/button-inactive.png
+%%METACITY%%share/themes/AluminumAlloy-Cryogenic/metacity-1/button-close.png
+%%METACITY%%share/themes/AluminumAlloy-Cryogenic/metacity-1/button-close-push.png
+%%METACITY%%share/themes/AluminumAlloy-Cryogenic/metacity-1/button-close-focus.png
+%%METACITY%%@dirrm share/themes/AluminumAlloy-Cryogenic/metacity-1
+%%METACITY%%@dirrm share/themes/AluminumAlloy-Cryogenic
+@dirrmtry share/themes
diff --git a/x11-themes/gtk-aluminumalloy-smog-theme/Makefile b/x11-themes/gtk-aluminumalloy-smog-theme/Makefile
index bb2570e8ef6a..f8ed3cd16db5 100644
--- a/x11-themes/gtk-aluminumalloy-smog-theme/Makefile
+++ b/x11-themes/gtk-aluminumalloy-smog-theme/Makefile
@@ -5,6 +5,8 @@
 # $FreeBSD$
 #
 
+PORTREVISION=	1
+
 FLAVOR=		smog
 
 MASTERDIR=	${.CURDIR}/../gtk-aluminumalloy-volcanic-theme
diff --git a/x11-themes/gtk-aluminumalloy-smog-theme/pkg-plist b/x11-themes/gtk-aluminumalloy-smog-theme/pkg-plist
index 4090bbe9b707..2145d37ab37d 100644
--- a/x11-themes/gtk-aluminumalloy-smog-theme/pkg-plist
+++ b/x11-themes/gtk-aluminumalloy-smog-theme/pkg-plist
@@ -230,29 +230,30 @@
 %%GTK20%%@dirrm share/themes/AluminumAlloy-Smog/gtk-2.0/icons
 %%GTK20%%@dirrm share/themes/AluminumAlloy-Smog/gtk-2.0
 %%GTK20%%@dirrm share/themes/AluminumAlloy-Smog
-%%METACITY%%share/gnome/themes/AluminumAlloy-Smog/metacity-1/title-bar.png
-%%METACITY%%share/gnome/themes/AluminumAlloy-Smog/metacity-1/title-bar-inactive.png
-%%METACITY%%share/gnome/themes/AluminumAlloy-Smog/metacity-1/text_right.png
-%%METACITY%%share/gnome/themes/AluminumAlloy-Smog/metacity-1/text_left.png
-%%METACITY%%share/gnome/themes/AluminumAlloy-Smog/metacity-1/text_back.png
-%%METACITY%%share/gnome/themes/AluminumAlloy-Smog/metacity-1/right-side.png
-%%METACITY%%share/gnome/themes/AluminumAlloy-Smog/metacity-1/right-side-inactive.png
-%%METACITY%%share/gnome/themes/AluminumAlloy-Smog/metacity-1/metacity-theme-1.xml
-%%METACITY%%share/gnome/themes/AluminumAlloy-Smog/metacity-1/menu-button.png
-%%METACITY%%share/gnome/themes/AluminumAlloy-Smog/metacity-1/menu-button-push.png
-%%METACITY%%share/gnome/themes/AluminumAlloy-Smog/metacity-1/menu-button-inactive.png
-%%METACITY%%share/gnome/themes/AluminumAlloy-Smog/metacity-1/left-side.png
-%%METACITY%%share/gnome/themes/AluminumAlloy-Smog/metacity-1/left-side-inactive.png
-%%METACITY%%share/gnome/themes/AluminumAlloy-Smog/metacity-1/close-button-inactive.png
-%%METACITY%%share/gnome/themes/AluminumAlloy-Smog/metacity-1/button-min.png
-%%METACITY%%share/gnome/themes/AluminumAlloy-Smog/metacity-1/button-min-push.png
-%%METACITY%%share/gnome/themes/AluminumAlloy-Smog/metacity-1/button-min-focus.png
-%%METACITY%%share/gnome/themes/AluminumAlloy-Smog/metacity-1/button-max.png
-%%METACITY%%share/gnome/themes/AluminumAlloy-Smog/metacity-1/button-max-push.png
-%%METACITY%%share/gnome/themes/AluminumAlloy-Smog/metacity-1/button-max-focus.png
-%%METACITY%%share/gnome/themes/AluminumAlloy-Smog/metacity-1/button-inactive.png
-%%METACITY%%share/gnome/themes/AluminumAlloy-Smog/metacity-1/button-close.png
-%%METACITY%%share/gnome/themes/AluminumAlloy-Smog/metacity-1/button-close-push.png
-%%METACITY%%share/gnome/themes/AluminumAlloy-Smog/metacity-1/button-close-focus.png
-%%METACITY%%@dirrm share/gnome/themes/AluminumAlloy-Smog/metacity-1
-%%METACITY%%@dirrm share/gnome/themes/AluminumAlloy-Smog
+%%METACITY%%share/themes/AluminumAlloy-Smog/metacity-1/title-bar.png
+%%METACITY%%share/themes/AluminumAlloy-Smog/metacity-1/title-bar-inactive.png
+%%METACITY%%share/themes/AluminumAlloy-Smog/metacity-1/text_right.png
+%%METACITY%%share/themes/AluminumAlloy-Smog/metacity-1/text_left.png
+%%METACITY%%share/themes/AluminumAlloy-Smog/metacity-1/text_back.png
+%%METACITY%%share/themes/AluminumAlloy-Smog/metacity-1/right-side.png
+%%METACITY%%share/themes/AluminumAlloy-Smog/metacity-1/right-side-inactive.png
+%%METACITY%%share/themes/AluminumAlloy-Smog/metacity-1/metacity-theme-1.xml
+%%METACITY%%share/themes/AluminumAlloy-Smog/metacity-1/menu-button.png
+%%METACITY%%share/themes/AluminumAlloy-Smog/metacity-1/menu-button-push.png
+%%METACITY%%share/themes/AluminumAlloy-Smog/metacity-1/menu-button-inactive.png
+%%METACITY%%share/themes/AluminumAlloy-Smog/metacity-1/left-side.png
+%%METACITY%%share/themes/AluminumAlloy-Smog/metacity-1/left-side-inactive.png
+%%METACITY%%share/themes/AluminumAlloy-Smog/metacity-1/close-button-inactive.png
+%%METACITY%%share/themes/AluminumAlloy-Smog/metacity-1/button-min.png
+%%METACITY%%share/themes/AluminumAlloy-Smog/metacity-1/button-min-push.png
+%%METACITY%%share/themes/AluminumAlloy-Smog/metacity-1/button-min-focus.png
+%%METACITY%%share/themes/AluminumAlloy-Smog/metacity-1/button-max.png
+%%METACITY%%share/themes/AluminumAlloy-Smog/metacity-1/button-max-push.png
+%%METACITY%%share/themes/AluminumAlloy-Smog/metacity-1/button-max-focus.png
+%%METACITY%%share/themes/AluminumAlloy-Smog/metacity-1/button-inactive.png
+%%METACITY%%share/themes/AluminumAlloy-Smog/metacity-1/button-close.png
+%%METACITY%%share/themes/AluminumAlloy-Smog/metacity-1/button-close-push.png
+%%METACITY%%share/themes/AluminumAlloy-Smog/metacity-1/button-close-focus.png
+%%METACITY%%@dirrm share/themes/AluminumAlloy-Smog/metacity-1
+%%METACITY%%@dirrm share/themes/AluminumAlloy-Smog
+@dirrmtry share/themes
diff --git a/x11-themes/gtk-aluminumalloy-toxic-theme/Makefile b/x11-themes/gtk-aluminumalloy-toxic-theme/Makefile
index cf09c33a7e38..7722414ebd05 100644
--- a/x11-themes/gtk-aluminumalloy-toxic-theme/Makefile
+++ b/x11-themes/gtk-aluminumalloy-toxic-theme/Makefile
@@ -5,6 +5,8 @@
 # $FreeBSD$
 #
 
+PORTREVISION=	1
+
 FLAVOR=		toxic
 
 MASTERDIR=	${.CURDIR}/../gtk-aluminumalloy-volcanic-theme
diff --git a/x11-themes/gtk-aluminumalloy-toxic-theme/pkg-plist b/x11-themes/gtk-aluminumalloy-toxic-theme/pkg-plist
index 2ad2f4992b32..cca114847602 100644
--- a/x11-themes/gtk-aluminumalloy-toxic-theme/pkg-plist
+++ b/x11-themes/gtk-aluminumalloy-toxic-theme/pkg-plist
@@ -226,29 +226,30 @@
 %%GTK20%%@dirrm share/themes/AluminumAlloy-Toxic/gtk-2.0/icons
 %%GTK20%%@dirrm share/themes/AluminumAlloy-Toxic/gtk-2.0
 %%GTK20%%@dirrm share/themes/AluminumAlloy-Toxic
-%%METACITY%%share/gnome/themes/AluminumAlloy-Toxic/metacity-1/title-bar.png
-%%METACITY%%share/gnome/themes/AluminumAlloy-Toxic/metacity-1/title-bar-inactive.png
-%%METACITY%%share/gnome/themes/AluminumAlloy-Toxic/metacity-1/text_right.png
-%%METACITY%%share/gnome/themes/AluminumAlloy-Toxic/metacity-1/text_left.png
-%%METACITY%%share/gnome/themes/AluminumAlloy-Toxic/metacity-1/text_back.png
-%%METACITY%%share/gnome/themes/AluminumAlloy-Toxic/metacity-1/right-side.png
-%%METACITY%%share/gnome/themes/AluminumAlloy-Toxic/metacity-1/right-side-inactive.png
-%%METACITY%%share/gnome/themes/AluminumAlloy-Toxic/metacity-1/metacity-theme-1.xml
-%%METACITY%%share/gnome/themes/AluminumAlloy-Toxic/metacity-1/menu-button.png
-%%METACITY%%share/gnome/themes/AluminumAlloy-Toxic/metacity-1/menu-button-push.png
-%%METACITY%%share/gnome/themes/AluminumAlloy-Toxic/metacity-1/menu-button-inactive.png
-%%METACITY%%share/gnome/themes/AluminumAlloy-Toxic/metacity-1/left-side.png
-%%METACITY%%share/gnome/themes/AluminumAlloy-Toxic/metacity-1/left-side-inactive.png
-%%METACITY%%share/gnome/themes/AluminumAlloy-Toxic/metacity-1/close-button-inactive.png
-%%METACITY%%share/gnome/themes/AluminumAlloy-Toxic/metacity-1/button-min.png
-%%METACITY%%share/gnome/themes/AluminumAlloy-Toxic/metacity-1/button-min-push.png
-%%METACITY%%share/gnome/themes/AluminumAlloy-Toxic/metacity-1/button-min-focus.png
-%%METACITY%%share/gnome/themes/AluminumAlloy-Toxic/metacity-1/button-max.png
-%%METACITY%%share/gnome/themes/AluminumAlloy-Toxic/metacity-1/button-max-push.png
-%%METACITY%%share/gnome/themes/AluminumAlloy-Toxic/metacity-1/button-max-focus.png
-%%METACITY%%share/gnome/themes/AluminumAlloy-Toxic/metacity-1/button-inactive.png
-%%METACITY%%share/gnome/themes/AluminumAlloy-Toxic/metacity-1/button-close.png
-%%METACITY%%share/gnome/themes/AluminumAlloy-Toxic/metacity-1/button-close-push.png
-%%METACITY%%share/gnome/themes/AluminumAlloy-Toxic/metacity-1/button-close-focus.png
-%%METACITY%%@dirrm share/gnome/themes/AluminumAlloy-Toxic/metacity-1
-%%METACITY%%@dirrm share/gnome/themes/AluminumAlloy-Toxic
+%%METACITY%%share/themes/AluminumAlloy-Toxic/metacity-1/title-bar.png
+%%METACITY%%share/themes/AluminumAlloy-Toxic/metacity-1/title-bar-inactive.png
+%%METACITY%%share/themes/AluminumAlloy-Toxic/metacity-1/text_right.png
+%%METACITY%%share/themes/AluminumAlloy-Toxic/metacity-1/text_left.png
+%%METACITY%%share/themes/AluminumAlloy-Toxic/metacity-1/text_back.png
+%%METACITY%%share/themes/AluminumAlloy-Toxic/metacity-1/right-side.png
+%%METACITY%%share/themes/AluminumAlloy-Toxic/metacity-1/right-side-inactive.png
+%%METACITY%%share/themes/AluminumAlloy-Toxic/metacity-1/metacity-theme-1.xml
+%%METACITY%%share/themes/AluminumAlloy-Toxic/metacity-1/menu-button.png
+%%METACITY%%share/themes/AluminumAlloy-Toxic/metacity-1/menu-button-push.png
+%%METACITY%%share/themes/AluminumAlloy-Toxic/metacity-1/menu-button-inactive.png
+%%METACITY%%share/themes/AluminumAlloy-Toxic/metacity-1/left-side.png
+%%METACITY%%share/themes/AluminumAlloy-Toxic/metacity-1/left-side-inactive.png
+%%METACITY%%share/themes/AluminumAlloy-Toxic/metacity-1/close-button-inactive.png
+%%METACITY%%share/themes/AluminumAlloy-Toxic/metacity-1/button-min.png
+%%METACITY%%share/themes/AluminumAlloy-Toxic/metacity-1/button-min-push.png
+%%METACITY%%share/themes/AluminumAlloy-Toxic/metacity-1/button-min-focus.png
+%%METACITY%%share/themes/AluminumAlloy-Toxic/metacity-1/button-max.png
+%%METACITY%%share/themes/AluminumAlloy-Toxic/metacity-1/button-max-push.png
+%%METACITY%%share/themes/AluminumAlloy-Toxic/metacity-1/button-max-focus.png
+%%METACITY%%share/themes/AluminumAlloy-Toxic/metacity-1/button-inactive.png
+%%METACITY%%share/themes/AluminumAlloy-Toxic/metacity-1/button-close.png
+%%METACITY%%share/themes/AluminumAlloy-Toxic/metacity-1/button-close-push.png
+%%METACITY%%share/themes/AluminumAlloy-Toxic/metacity-1/button-close-focus.png
+%%METACITY%%@dirrm share/themes/AluminumAlloy-Toxic/metacity-1
+%%METACITY%%@dirrm share/themes/AluminumAlloy-Toxic
+@dirrmtry share/themes
diff --git a/x11-themes/gtk-aluminumalloy-volcanic-theme/Makefile b/x11-themes/gtk-aluminumalloy-volcanic-theme/Makefile
index 08aa0e9c0d41..09e9c51329fd 100644
--- a/x11-themes/gtk-aluminumalloy-volcanic-theme/Makefile
+++ b/x11-themes/gtk-aluminumalloy-volcanic-theme/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	aluminumalloy
 PORTVERSION?=	2004.01.04
-PORTREVISION?=	2
+PORTREVISION?=	3
 CATEGORIES=	x11-themes gnome
 MASTER_SITES=	http://www.users.monornet.hu/linux/gtk2/oldies/
 PKGNAMEPREFIX?=	${TYPE}-
@@ -31,7 +31,7 @@ THEME_DIR=	${PREFIX}/share/themes/${THEME_NAME}
 PLIST_SUB+=	GTK20="" METACITY="@comment "
 USE_GNOME=	gtk20
 .else	# metacity
-THEME_DIR=	${PREFIX}/share/gnome/themes/${THEME_NAME}
+THEME_DIR=	${PREFIX}/share/themes/${THEME_NAME}
 PLIST_SUB+=	GTK20="@comment " METACITY=""
 USE_GNOME=	gnomehier
 .endif
diff --git a/x11-themes/gtk-aluminumalloy-volcanic-theme/pkg-plist b/x11-themes/gtk-aluminumalloy-volcanic-theme/pkg-plist
index d5a7a06b3362..934ed5b35680 100644
--- a/x11-themes/gtk-aluminumalloy-volcanic-theme/pkg-plist
+++ b/x11-themes/gtk-aluminumalloy-volcanic-theme/pkg-plist
@@ -227,29 +227,30 @@
 %%GTK20%%@dirrm share/themes/AluminumAlloy-Volcanic/gtk-2.0/icons
 %%GTK20%%@dirrm share/themes/AluminumAlloy-Volcanic/gtk-2.0
 %%GTK20%%@dirrm share/themes/AluminumAlloy-Volcanic
-%%METACITY%%share/gnome/themes/AluminumAlloy-Volcanic/metacity-1/title-bar.png
-%%METACITY%%share/gnome/themes/AluminumAlloy-Volcanic/metacity-1/title-bar-inactive.png
-%%METACITY%%share/gnome/themes/AluminumAlloy-Volcanic/metacity-1/text_right.png
-%%METACITY%%share/gnome/themes/AluminumAlloy-Volcanic/metacity-1/text_left.png
-%%METACITY%%share/gnome/themes/AluminumAlloy-Volcanic/metacity-1/text_back.png
-%%METACITY%%share/gnome/themes/AluminumAlloy-Volcanic/metacity-1/right-side.png
-%%METACITY%%share/gnome/themes/AluminumAlloy-Volcanic/metacity-1/right-side-inactive.png
-%%METACITY%%share/gnome/themes/AluminumAlloy-Volcanic/metacity-1/metacity-theme-1.xml
-%%METACITY%%share/gnome/themes/AluminumAlloy-Volcanic/metacity-1/menu-button.png
-%%METACITY%%share/gnome/themes/AluminumAlloy-Volcanic/metacity-1/menu-button-push.png
-%%METACITY%%share/gnome/themes/AluminumAlloy-Volcanic/metacity-1/menu-button-inactive.png
-%%METACITY%%share/gnome/themes/AluminumAlloy-Volcanic/metacity-1/left-side.png
-%%METACITY%%share/gnome/themes/AluminumAlloy-Volcanic/metacity-1/left-side-inactive.png
-%%METACITY%%share/gnome/themes/AluminumAlloy-Volcanic/metacity-1/close-button-inactive.png
-%%METACITY%%share/gnome/themes/AluminumAlloy-Volcanic/metacity-1/button-min.png
-%%METACITY%%share/gnome/themes/AluminumAlloy-Volcanic/metacity-1/button-min-push.png
-%%METACITY%%share/gnome/themes/AluminumAlloy-Volcanic/metacity-1/button-min-focus.png
-%%METACITY%%share/gnome/themes/AluminumAlloy-Volcanic/metacity-1/button-max.png
-%%METACITY%%share/gnome/themes/AluminumAlloy-Volcanic/metacity-1/button-max-push.png
-%%METACITY%%share/gnome/themes/AluminumAlloy-Volcanic/metacity-1/button-max-focus.png
-%%METACITY%%share/gnome/themes/AluminumAlloy-Volcanic/metacity-1/button-inactive.png
-%%METACITY%%share/gnome/themes/AluminumAlloy-Volcanic/metacity-1/button-close.png
-%%METACITY%%share/gnome/themes/AluminumAlloy-Volcanic/metacity-1/button-close-push.png
-%%METACITY%%share/gnome/themes/AluminumAlloy-Volcanic/metacity-1/button-close-focus.png
-%%METACITY%%@dirrm share/gnome/themes/AluminumAlloy-Volcanic/metacity-1
-%%METACITY%%@dirrm share/gnome/themes/AluminumAlloy-Volcanic
+%%METACITY%%share/themes/AluminumAlloy-Volcanic/metacity-1/title-bar.png
+%%METACITY%%share/themes/AluminumAlloy-Volcanic/metacity-1/title-bar-inactive.png
+%%METACITY%%share/themes/AluminumAlloy-Volcanic/metacity-1/text_right.png
+%%METACITY%%share/themes/AluminumAlloy-Volcanic/metacity-1/text_left.png
+%%METACITY%%share/themes/AluminumAlloy-Volcanic/metacity-1/text_back.png
+%%METACITY%%share/themes/AluminumAlloy-Volcanic/metacity-1/right-side.png
+%%METACITY%%share/themes/AluminumAlloy-Volcanic/metacity-1/right-side-inactive.png
+%%METACITY%%share/themes/AluminumAlloy-Volcanic/metacity-1/metacity-theme-1.xml
+%%METACITY%%share/themes/AluminumAlloy-Volcanic/metacity-1/menu-button.png
+%%METACITY%%share/themes/AluminumAlloy-Volcanic/metacity-1/menu-button-push.png
+%%METACITY%%share/themes/AluminumAlloy-Volcanic/metacity-1/menu-button-inactive.png
+%%METACITY%%share/themes/AluminumAlloy-Volcanic/metacity-1/left-side.png
+%%METACITY%%share/themes/AluminumAlloy-Volcanic/metacity-1/left-side-inactive.png
+%%METACITY%%share/themes/AluminumAlloy-Volcanic/metacity-1/close-button-inactive.png
+%%METACITY%%share/themes/AluminumAlloy-Volcanic/metacity-1/button-min.png
+%%METACITY%%share/themes/AluminumAlloy-Volcanic/metacity-1/button-min-push.png
+%%METACITY%%share/themes/AluminumAlloy-Volcanic/metacity-1/button-min-focus.png
+%%METACITY%%share/themes/AluminumAlloy-Volcanic/metacity-1/button-max.png
+%%METACITY%%share/themes/AluminumAlloy-Volcanic/metacity-1/button-max-push.png
+%%METACITY%%share/themes/AluminumAlloy-Volcanic/metacity-1/button-max-focus.png
+%%METACITY%%share/themes/AluminumAlloy-Volcanic/metacity-1/button-inactive.png
+%%METACITY%%share/themes/AluminumAlloy-Volcanic/metacity-1/button-close.png
+%%METACITY%%share/themes/AluminumAlloy-Volcanic/metacity-1/button-close-push.png
+%%METACITY%%share/themes/AluminumAlloy-Volcanic/metacity-1/button-close-focus.png
+%%METACITY%%@dirrm share/themes/AluminumAlloy-Volcanic/metacity-1
+%%METACITY%%@dirrm share/themes/AluminumAlloy-Volcanic
+@dirrmtry share/themes
diff --git a/x11-themes/gtk-ana-theme/Makefile b/x11-themes/gtk-ana-theme/Makefile
index 6f8a1cb85834..55cb272b2234 100644
--- a/x11-themes/gtk-ana-theme/Makefile
+++ b/x11-themes/gtk-ana-theme/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ana
 PORTVERSION=	0.11
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	x11-themes gnome
 MASTER_SITES=	http://ana.netart.eu.org/
 PKGNAMEPREFIX=	${TYPE}-
@@ -18,7 +18,7 @@ MAINTAINER=	netchild@FreeBSD.org
 COMMENT=	Clean and white GTK engine
 
 LIB_DEPENDS=	rsvg-2:${PORTSDIR}/graphics/librsvg2
-RUN_DEPENDS=	${LOCALBASE}/share/themes/Gorilla/index.theme:${PORTSDIR}/x11-themes/gnome-themes-extras
+RUN_DEPENDS=	${LOCALBASE}/share/icons/Foxtrot/index.theme:${PORTSDIR}/x11-themes/gnome-themes-extras
 
 TYPE?=		gtk
 THEME_NAME=	Ana
@@ -33,7 +33,7 @@ PLIST_SUB+=	GTK20=""
 PLIST_SUB+=	METACITY="@comment "
 USE_GNOME=	gtk20
 .else   # metacity
-THEME_DIR=	${PREFIX}/share/gnome/themes/${THEME_NAME}
+THEME_DIR=	${PREFIX}/share/themes/${THEME_NAME}
 PLIST_SUB+=	GTK="@comment "
 PLIST_SUB+=	GTK20="@comment "
 PLIST_SUB+=	METACITY=""
diff --git a/x11-themes/gtk-ana-theme/pkg-plist b/x11-themes/gtk-ana-theme/pkg-plist
index 4a64b225195c..477d6bf76d56 100644
--- a/x11-themes/gtk-ana-theme/pkg-plist
+++ b/x11-themes/gtk-ana-theme/pkg-plist
@@ -135,6 +135,7 @@
 %%GTK20%%@dirrm share/themes/%%THEME_NAME%%/gtk
 %%GTK20%%@dirrm share/themes/%%THEME_NAME%%/icons
 %%GTK20%%@dirrm share/themes/%%THEME_NAME%%
-%%METACITY%%share/gnome/themes/%%THEME_NAME%%/metacity-1/metacity-theme-1.xml
-%%METACITY%%@dirrm share/gnome/themes/%%THEME_NAME%%/metacity-1
-%%METACITY%%@dirrm share/gnome/themes/%%THEME_NAME%%
+%%METACITY%%share/themes/%%THEME_NAME%%/metacity-1/metacity-theme-1.xml
+%%METACITY%%@dirrm share/themes/%%THEME_NAME%%/metacity-1
+%%METACITY%%@dirrm share/themes/%%THEME_NAME%%
+@dirrmtry share/themes
diff --git a/x11-themes/gtk-aquaextremesunken-theme/Makefile b/x11-themes/gtk-aquaextremesunken-theme/Makefile
index 2dce050c605d..b676ae3e98e9 100644
--- a/x11-themes/gtk-aquaextremesunken-theme/Makefile
+++ b/x11-themes/gtk-aquaextremesunken-theme/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	aquaextremesunken
 PORTVERSION=	1.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-themes gnome
 MASTER_SITES=	http://www.users.monornet.hu/linux/gtk2/oldies/
 PKGNAMEPREFIX?=	${TYPE}-
@@ -28,7 +28,7 @@ THEME_DIR=	${PREFIX}/share/themes/${THEME_NAME}
 PLIST_SUB+=	GTK20="" METACITY="@comment "
 USE_GNOME=	gtk20
 .else	# metacity
-THEME_DIR=	${PREFIX}/share/gnome/themes/${THEME_NAME}
+THEME_DIR=	${PREFIX}/share/themes/${THEME_NAME}
 PLIST_SUB+=	GTK20="@comment " METACITY=""
 USE_GNOME=	gnomehier
 .endif
diff --git a/x11-themes/gtk-aquaextremesunken-theme/pkg-plist b/x11-themes/gtk-aquaextremesunken-theme/pkg-plist
index da98a3daa6b1..63d384e2950f 100644
--- a/x11-themes/gtk-aquaextremesunken-theme/pkg-plist
+++ b/x11-themes/gtk-aquaextremesunken-theme/pkg-plist
@@ -282,32 +282,33 @@
 %%GTK20%%@dirrm share/themes/AquaExtremeSunken/gtk-2.0/Sliders
 %%GTK20%%@dirrm share/themes/AquaExtremeSunken/gtk-2.0
 %%GTK20%%@dirrm share/themes/AquaExtremeSunken
-%%METACITY%%share/gnome/themes/AquaExtremeSunken/metacity-1/titlebar-right-focused.png
-%%METACITY%%share/gnome/themes/AquaExtremeSunken/metacity-1/button-maximize-focused.png
-%%METACITY%%share/gnome/themes/AquaExtremeSunken/metacity-1/titlebar-left-unfocused.png
-%%METACITY%%share/gnome/themes/AquaExtremeSunken/metacity-1/button-menu-focused.png
-%%METACITY%%share/gnome/themes/AquaExtremeSunken/metacity-1/button-close-unfocused.png
-%%METACITY%%share/gnome/themes/AquaExtremeSunken/metacity-1/button-minimize-unfocused.png
-%%METACITY%%share/gnome/themes/AquaExtremeSunken/metacity-1/frame-right-focused.png
-%%METACITY%%share/gnome/themes/AquaExtremeSunken/metacity-1/frame-bottom-mid-focused.png
-%%METACITY%%share/gnome/themes/AquaExtremeSunken/metacity-1/frame-bottom-left-focused.png
-%%METACITY%%share/gnome/themes/AquaExtremeSunken/metacity-1/button-maximize-pressed.png
-%%METACITY%%share/gnome/themes/AquaExtremeSunken/metacity-1/titlebar-mid-focused.png
-%%METACITY%%share/gnome/themes/AquaExtremeSunken/metacity-1/frame-bottom-right-focused.png
-%%METACITY%%share/gnome/themes/AquaExtremeSunken/metacity-1/titlebar-mid-unfocused.png
-%%METACITY%%share/gnome/themes/AquaExtremeSunken/metacity-1/button-close-pressed.png
-%%METACITY%%share/gnome/themes/AquaExtremeSunken/metacity-1/frame-left-focused.png
-%%METACITY%%share/gnome/themes/AquaExtremeSunken/metacity-1/button-close-focused.png
-%%METACITY%%share/gnome/themes/AquaExtremeSunken/metacity-1/button-menu-unfocused.png
-%%METACITY%%share/gnome/themes/AquaExtremeSunken/metacity-1/button-minimize-focused.png
-%%METACITY%%share/gnome/themes/AquaExtremeSunken/metacity-1/button-menu-pressed.png
-%%METACITY%%share/gnome/themes/AquaExtremeSunken/metacity-1/titlebar-left-shaded-focused.png
-%%METACITY%%share/gnome/themes/AquaExtremeSunken/metacity-1/button-inactive.png
-%%METACITY%%share/gnome/themes/AquaExtremeSunken/metacity-1/metacity-theme-1.xml
-%%METACITY%%share/gnome/themes/AquaExtremeSunken/metacity-1/titlebar-right-unfocused.png
-%%METACITY%%share/gnome/themes/AquaExtremeSunken/metacity-1/titlebar-left-focused.png
-%%METACITY%%share/gnome/themes/AquaExtremeSunken/metacity-1/titlebar-right-shaded-focused.png
-%%METACITY%%share/gnome/themes/AquaExtremeSunken/metacity-1/button-minimize-pressed.png
-%%METACITY%%share/gnome/themes/AquaExtremeSunken/metacity-1/button-maximize-unfocused.png
-%%METACITY%%@dirrm share/gnome/themes/AquaExtremeSunken/metacity-1
-%%METACITY%%@dirrm share/gnome/themes/AquaExtremeSunken
+%%METACITY%%share/themes/AquaExtremeSunken/metacity-1/titlebar-right-focused.png
+%%METACITY%%share/themes/AquaExtremeSunken/metacity-1/button-maximize-focused.png
+%%METACITY%%share/themes/AquaExtremeSunken/metacity-1/titlebar-left-unfocused.png
+%%METACITY%%share/themes/AquaExtremeSunken/metacity-1/button-menu-focused.png
+%%METACITY%%share/themes/AquaExtremeSunken/metacity-1/button-close-unfocused.png
+%%METACITY%%share/themes/AquaExtremeSunken/metacity-1/button-minimize-unfocused.png
+%%METACITY%%share/themes/AquaExtremeSunken/metacity-1/frame-right-focused.png
+%%METACITY%%share/themes/AquaExtremeSunken/metacity-1/frame-bottom-mid-focused.png
+%%METACITY%%share/themes/AquaExtremeSunken/metacity-1/frame-bottom-left-focused.png
+%%METACITY%%share/themes/AquaExtremeSunken/metacity-1/button-maximize-pressed.png
+%%METACITY%%share/themes/AquaExtremeSunken/metacity-1/titlebar-mid-focused.png
+%%METACITY%%share/themes/AquaExtremeSunken/metacity-1/frame-bottom-right-focused.png
+%%METACITY%%share/themes/AquaExtremeSunken/metacity-1/titlebar-mid-unfocused.png
+%%METACITY%%share/themes/AquaExtremeSunken/metacity-1/button-close-pressed.png
+%%METACITY%%share/themes/AquaExtremeSunken/metacity-1/frame-left-focused.png
+%%METACITY%%share/themes/AquaExtremeSunken/metacity-1/button-close-focused.png
+%%METACITY%%share/themes/AquaExtremeSunken/metacity-1/button-menu-unfocused.png
+%%METACITY%%share/themes/AquaExtremeSunken/metacity-1/button-minimize-focused.png
+%%METACITY%%share/themes/AquaExtremeSunken/metacity-1/button-menu-pressed.png
+%%METACITY%%share/themes/AquaExtremeSunken/metacity-1/titlebar-left-shaded-focused.png
+%%METACITY%%share/themes/AquaExtremeSunken/metacity-1/button-inactive.png
+%%METACITY%%share/themes/AquaExtremeSunken/metacity-1/metacity-theme-1.xml
+%%METACITY%%share/themes/AquaExtremeSunken/metacity-1/titlebar-right-unfocused.png
+%%METACITY%%share/themes/AquaExtremeSunken/metacity-1/titlebar-left-focused.png
+%%METACITY%%share/themes/AquaExtremeSunken/metacity-1/titlebar-right-shaded-focused.png
+%%METACITY%%share/themes/AquaExtremeSunken/metacity-1/button-minimize-pressed.png
+%%METACITY%%share/themes/AquaExtremeSunken/metacity-1/button-maximize-unfocused.png
+%%METACITY%%@dirrm share/themes/AquaExtremeSunken/metacity-1
+%%METACITY%%@dirrm share/themes/AquaExtremeSunken
+@dirrmtry share/themes
diff --git a/x11-themes/gtk-digital-cream-theme/Makefile b/x11-themes/gtk-digital-cream-theme/Makefile
index a92fa830094a..d277b93b1a68 100644
--- a/x11-themes/gtk-digital-cream-theme/Makefile
+++ b/x11-themes/gtk-digital-cream-theme/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	digital-cream
 PORTVERSION=	1.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-themes gnome
 MASTER_SITES=	http://www.users.monornet.hu/linux/gtk2/oldies/
 PKGNAMEPREFIX=	${TYPE}-
@@ -29,7 +29,7 @@ THEME_DIR=	${PREFIX}/share/themes/${THEME_NAME}
 PLIST_SUB+=	GTK20="" METACITY="@comment "
 USE_GNOME=	gtk20
 .else	# metacity
-THEME_DIR=	${PREFIX}/share/gnome/themes/${THEME_NAME}
+THEME_DIR=	${PREFIX}/share/themes/${THEME_NAME}
 PLIST_SUB+=	GTK20="@comment " METACITY=""
 USE_GNOME=	gnomehier
 .endif
diff --git a/x11-themes/gtk-digital-cream-theme/pkg-plist b/x11-themes/gtk-digital-cream-theme/pkg-plist
index 091cf19fa928..018bfb18f965 100644
--- a/x11-themes/gtk-digital-cream-theme/pkg-plist
+++ b/x11-themes/gtk-digital-cream-theme/pkg-plist
@@ -232,34 +232,35 @@
 %%GTK20%%@dirrm share/themes/Digital-Cream/gtk-2.0
 %%GTK20%%share/themes/Digital-Cream/index.theme
 %%GTK20%%@dirrm share/themes/Digital-Cream
-%%METACITY%%share/gnome/themes/Digital-Cream/metacity-1/button-close-focus.png
-%%METACITY%%share/gnome/themes/Digital-Cream/metacity-1/button-close-push.png
-%%METACITY%%share/gnome/themes/Digital-Cream/metacity-1/button-close.png
-%%METACITY%%share/gnome/themes/Digital-Cream/metacity-1/button-inactive.png
-%%METACITY%%share/gnome/themes/Digital-Cream/metacity-1/button-max-focus.png
-%%METACITY%%share/gnome/themes/Digital-Cream/metacity-1/button-max-push.png
-%%METACITY%%share/gnome/themes/Digital-Cream/metacity-1/button-max.png
-%%METACITY%%share/gnome/themes/Digital-Cream/metacity-1/button-min-focus.png
-%%METACITY%%share/gnome/themes/Digital-Cream/metacity-1/button-min-push.png
-%%METACITY%%share/gnome/themes/Digital-Cream/metacity-1/button-min.png
-%%METACITY%%share/gnome/themes/Digital-Cream/metacity-1/close-button-inactive.png
-%%METACITY%%share/gnome/themes/Digital-Cream/metacity-1/close_normal.png
-%%METACITY%%share/gnome/themes/Digital-Cream/metacity-1/close_normal.svg
-%%METACITY%%share/gnome/themes/Digital-Cream/metacity-1/close_prelight.png
-%%METACITY%%share/gnome/themes/Digital-Cream/metacity-1/left-side-inactive.png
-%%METACITY%%share/gnome/themes/Digital-Cream/metacity-1/left-side.png
-%%METACITY%%share/gnome/themes/Digital-Cream/metacity-1/maximize_normal.png
-%%METACITY%%share/gnome/themes/Digital-Cream/metacity-1/maximize_prelight.png
-%%METACITY%%share/gnome/themes/Digital-Cream/metacity-1/menu-button-inactive.png
-%%METACITY%%share/gnome/themes/Digital-Cream/metacity-1/menu-button-push.png
-%%METACITY%%share/gnome/themes/Digital-Cream/metacity-1/menu-button.png
-%%METACITY%%share/gnome/themes/Digital-Cream/metacity-1/metacity-theme-1.xml
-%%METACITY%%share/gnome/themes/Digital-Cream/metacity-1/minimize_normal.png
-%%METACITY%%share/gnome/themes/Digital-Cream/metacity-1/minimize_prelight.png
-%%METACITY%%share/gnome/themes/Digital-Cream/metacity-1/right-side-inactive.png
-%%METACITY%%share/gnome/themes/Digital-Cream/metacity-1/right-side.png
-%%METACITY%%share/gnome/themes/Digital-Cream/metacity-1/title-bar-inactive.png
-%%METACITY%%share/gnome/themes/Digital-Cream/metacity-1/title-bar.png
-%%METACITY%%@dirrm share/gnome/themes/Digital-Cream/metacity-1
-%%METACITY%%share/gnome/themes/Digital-Cream/index.theme
-%%METACITY%%@dirrm share/gnome/themes/Digital-Cream
+%%METACITY%%share/themes/Digital-Cream/metacity-1/button-close-focus.png
+%%METACITY%%share/themes/Digital-Cream/metacity-1/button-close-push.png
+%%METACITY%%share/themes/Digital-Cream/metacity-1/button-close.png
+%%METACITY%%share/themes/Digital-Cream/metacity-1/button-inactive.png
+%%METACITY%%share/themes/Digital-Cream/metacity-1/button-max-focus.png
+%%METACITY%%share/themes/Digital-Cream/metacity-1/button-max-push.png
+%%METACITY%%share/themes/Digital-Cream/metacity-1/button-max.png
+%%METACITY%%share/themes/Digital-Cream/metacity-1/button-min-focus.png
+%%METACITY%%share/themes/Digital-Cream/metacity-1/button-min-push.png
+%%METACITY%%share/themes/Digital-Cream/metacity-1/button-min.png
+%%METACITY%%share/themes/Digital-Cream/metacity-1/close-button-inactive.png
+%%METACITY%%share/themes/Digital-Cream/metacity-1/close_normal.png
+%%METACITY%%share/themes/Digital-Cream/metacity-1/close_normal.svg
+%%METACITY%%share/themes/Digital-Cream/metacity-1/close_prelight.png
+%%METACITY%%share/themes/Digital-Cream/metacity-1/left-side-inactive.png
+%%METACITY%%share/themes/Digital-Cream/metacity-1/left-side.png
+%%METACITY%%share/themes/Digital-Cream/metacity-1/maximize_normal.png
+%%METACITY%%share/themes/Digital-Cream/metacity-1/maximize_prelight.png
+%%METACITY%%share/themes/Digital-Cream/metacity-1/menu-button-inactive.png
+%%METACITY%%share/themes/Digital-Cream/metacity-1/menu-button-push.png
+%%METACITY%%share/themes/Digital-Cream/metacity-1/menu-button.png
+%%METACITY%%share/themes/Digital-Cream/metacity-1/metacity-theme-1.xml
+%%METACITY%%share/themes/Digital-Cream/metacity-1/minimize_normal.png
+%%METACITY%%share/themes/Digital-Cream/metacity-1/minimize_prelight.png
+%%METACITY%%share/themes/Digital-Cream/metacity-1/right-side-inactive.png
+%%METACITY%%share/themes/Digital-Cream/metacity-1/right-side.png
+%%METACITY%%share/themes/Digital-Cream/metacity-1/title-bar-inactive.png
+%%METACITY%%share/themes/Digital-Cream/metacity-1/title-bar.png
+%%METACITY%%@dirrm share/themes/Digital-Cream/metacity-1
+%%METACITY%%share/themes/Digital-Cream/index.theme
+%%METACITY%%@dirrm share/themes/Digital-Cream
+@dirrmtry share/themes
diff --git a/x11-themes/gtk-digital-harmony-theme/Makefile b/x11-themes/gtk-digital-harmony-theme/Makefile
index d6b052846eb0..514f86a188a3 100644
--- a/x11-themes/gtk-digital-harmony-theme/Makefile
+++ b/x11-themes/gtk-digital-harmony-theme/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	digital-harmony
 PORTVERSION=	1.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-themes gnome
 MASTER_SITES=	http://www.users.monornet.hu/linux/gtk2/oldies/
 PKGNAMEPREFIX=	${TYPE}-
@@ -28,7 +28,7 @@ THEME_DIR=	${PREFIX}/share/themes/${THEME_NAME}
 PLIST_SUB+=	GTK20="" METACITY="@comment "
 USE_GNOME=	gtk20
 .else	# metacity
-THEME_DIR=	${PREFIX}/share/gnome/themes/${THEME_NAME}
+THEME_DIR=	${PREFIX}/share/themes/${THEME_NAME}
 PLIST_SUB+=	GTK20="@comment " METACITY=""
 USE_GNOME=	gnomehier
 .endif
diff --git a/x11-themes/gtk-digital-harmony-theme/pkg-plist b/x11-themes/gtk-digital-harmony-theme/pkg-plist
index b79e87fbb120..8bcbfd162e46 100644
--- a/x11-themes/gtk-digital-harmony-theme/pkg-plist
+++ b/x11-themes/gtk-digital-harmony-theme/pkg-plist
@@ -176,41 +176,42 @@
 %%GTK20%%@dirrm share/themes/Digital-Harmony/gtk-2.0
 %%GTK20%%share/themes/Digital-Harmony/index.theme
 %%GTK20%%@dirrm share/themes/Digital-Harmony
-%%METACITY%%share/gnome/themes/Digital-Harmony/metacity-1/button-close-focused.png
-%%METACITY%%share/gnome/themes/Digital-Harmony/metacity-1/button-close-pressed.png
-%%METACITY%%share/gnome/themes/Digital-Harmony/metacity-1/button-close-unfocused.png
-%%METACITY%%share/gnome/themes/Digital-Harmony/metacity-1/button-maximize-focused.png
-%%METACITY%%share/gnome/themes/Digital-Harmony/metacity-1/button-maximize-pressed.png
-%%METACITY%%share/gnome/themes/Digital-Harmony/metacity-1/button-maximize-unfocused.png
-%%METACITY%%share/gnome/themes/Digital-Harmony/metacity-1/button-menu-focused.png
-%%METACITY%%share/gnome/themes/Digital-Harmony/metacity-1/button-menu-pressed.png
-%%METACITY%%share/gnome/themes/Digital-Harmony/metacity-1/button-menu-unfocused.png
-%%METACITY%%share/gnome/themes/Digital-Harmony/metacity-1/button-minimize-focused.png
-%%METACITY%%share/gnome/themes/Digital-Harmony/metacity-1/button-minimize-pressed.png
-%%METACITY%%share/gnome/themes/Digital-Harmony/metacity-1/button-minimize-unfocused.png
-%%METACITY%%share/gnome/themes/Digital-Harmony/metacity-1/frame-bottom-left-focused.png
-%%METACITY%%share/gnome/themes/Digital-Harmony/metacity-1/frame-bottom-left-unfocused.png
-%%METACITY%%share/gnome/themes/Digital-Harmony/metacity-1/frame-bottom-mid-focused.png
-%%METACITY%%share/gnome/themes/Digital-Harmony/metacity-1/frame-bottom-mid-unfocused.png
-%%METACITY%%share/gnome/themes/Digital-Harmony/metacity-1/frame-bottom-right-focused.png
-%%METACITY%%share/gnome/themes/Digital-Harmony/metacity-1/frame-bottom-right-unfocused.png
-%%METACITY%%share/gnome/themes/Digital-Harmony/metacity-1/frame-left-focused.png
-%%METACITY%%share/gnome/themes/Digital-Harmony/metacity-1/frame-left-unfocused.png
-%%METACITY%%share/gnome/themes/Digital-Harmony/metacity-1/frame-right-focused.png
-%%METACITY%%share/gnome/themes/Digital-Harmony/metacity-1/frame-right-unfocused.png
-%%METACITY%%share/gnome/themes/Digital-Harmony/metacity-1/metacity-theme-1.xml
-%%METACITY%%share/gnome/themes/Digital-Harmony/metacity-1/titlebar-left-focused.png
-%%METACITY%%share/gnome/themes/Digital-Harmony/metacity-1/titlebar-left-shaded-focused.png
-%%METACITY%%share/gnome/themes/Digital-Harmony/metacity-1/titlebar-left-shaded-unfocused.png
-%%METACITY%%share/gnome/themes/Digital-Harmony/metacity-1/titlebar-left-unfocused.png
-%%METACITY%%share/gnome/themes/Digital-Harmony/metacity-1/titlebar-mid-focused.png
-%%METACITY%%share/gnome/themes/Digital-Harmony/metacity-1/titlebar-mid-shaded-focused.png
-%%METACITY%%share/gnome/themes/Digital-Harmony/metacity-1/titlebar-mid-shaded-unfocused.png
-%%METACITY%%share/gnome/themes/Digital-Harmony/metacity-1/titlebar-mid-unfocused.png
-%%METACITY%%share/gnome/themes/Digital-Harmony/metacity-1/titlebar-right-focused.png
-%%METACITY%%share/gnome/themes/Digital-Harmony/metacity-1/titlebar-right-shaded-focused.png
-%%METACITY%%share/gnome/themes/Digital-Harmony/metacity-1/titlebar-right-shaded-unfocused.png
-%%METACITY%%share/gnome/themes/Digital-Harmony/metacity-1/titlebar-right-unfocused.png
-%%METACITY%%@dirrm share/gnome/themes/Digital-Harmony/metacity-1
-%%METACITY%%share/gnome/themes/Digital-Harmony/index.theme
-%%METACITY%%@dirrm share/gnome/themes/Digital-Harmony
+%%METACITY%%share/themes/Digital-Harmony/metacity-1/button-close-focused.png
+%%METACITY%%share/themes/Digital-Harmony/metacity-1/button-close-pressed.png
+%%METACITY%%share/themes/Digital-Harmony/metacity-1/button-close-unfocused.png
+%%METACITY%%share/themes/Digital-Harmony/metacity-1/button-maximize-focused.png
+%%METACITY%%share/themes/Digital-Harmony/metacity-1/button-maximize-pressed.png
+%%METACITY%%share/themes/Digital-Harmony/metacity-1/button-maximize-unfocused.png
+%%METACITY%%share/themes/Digital-Harmony/metacity-1/button-menu-focused.png
+%%METACITY%%share/themes/Digital-Harmony/metacity-1/button-menu-pressed.png
+%%METACITY%%share/themes/Digital-Harmony/metacity-1/button-menu-unfocused.png
+%%METACITY%%share/themes/Digital-Harmony/metacity-1/button-minimize-focused.png
+%%METACITY%%share/themes/Digital-Harmony/metacity-1/button-minimize-pressed.png
+%%METACITY%%share/themes/Digital-Harmony/metacity-1/button-minimize-unfocused.png
+%%METACITY%%share/themes/Digital-Harmony/metacity-1/frame-bottom-left-focused.png
+%%METACITY%%share/themes/Digital-Harmony/metacity-1/frame-bottom-left-unfocused.png
+%%METACITY%%share/themes/Digital-Harmony/metacity-1/frame-bottom-mid-focused.png
+%%METACITY%%share/themes/Digital-Harmony/metacity-1/frame-bottom-mid-unfocused.png
+%%METACITY%%share/themes/Digital-Harmony/metacity-1/frame-bottom-right-focused.png
+%%METACITY%%share/themes/Digital-Harmony/metacity-1/frame-bottom-right-unfocused.png
+%%METACITY%%share/themes/Digital-Harmony/metacity-1/frame-left-focused.png
+%%METACITY%%share/themes/Digital-Harmony/metacity-1/frame-left-unfocused.png
+%%METACITY%%share/themes/Digital-Harmony/metacity-1/frame-right-focused.png
+%%METACITY%%share/themes/Digital-Harmony/metacity-1/frame-right-unfocused.png
+%%METACITY%%share/themes/Digital-Harmony/metacity-1/metacity-theme-1.xml
+%%METACITY%%share/themes/Digital-Harmony/metacity-1/titlebar-left-focused.png
+%%METACITY%%share/themes/Digital-Harmony/metacity-1/titlebar-left-shaded-focused.png
+%%METACITY%%share/themes/Digital-Harmony/metacity-1/titlebar-left-shaded-unfocused.png
+%%METACITY%%share/themes/Digital-Harmony/metacity-1/titlebar-left-unfocused.png
+%%METACITY%%share/themes/Digital-Harmony/metacity-1/titlebar-mid-focused.png
+%%METACITY%%share/themes/Digital-Harmony/metacity-1/titlebar-mid-shaded-focused.png
+%%METACITY%%share/themes/Digital-Harmony/metacity-1/titlebar-mid-shaded-unfocused.png
+%%METACITY%%share/themes/Digital-Harmony/metacity-1/titlebar-mid-unfocused.png
+%%METACITY%%share/themes/Digital-Harmony/metacity-1/titlebar-right-focused.png
+%%METACITY%%share/themes/Digital-Harmony/metacity-1/titlebar-right-shaded-focused.png
+%%METACITY%%share/themes/Digital-Harmony/metacity-1/titlebar-right-shaded-unfocused.png
+%%METACITY%%share/themes/Digital-Harmony/metacity-1/titlebar-right-unfocused.png
+%%METACITY%%@dirrm share/themes/Digital-Harmony/metacity-1
+%%METACITY%%share/themes/Digital-Harmony/index.theme
+%%METACITY%%@dirrm share/themes/Digital-Harmony
+@dirrmtry share/themes
diff --git a/x11-themes/gtk-engines2/Makefile b/x11-themes/gtk-engines2/Makefile
index 7e512e19ea1b..6f518ba41a89 100644
--- a/x11-themes/gtk-engines2/Makefile
+++ b/x11-themes/gtk-engines2/Makefile
@@ -3,11 +3,11 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/x11-themes/gtk-engines2/Makefile,v 1.37 2007/03/13 12:52:05 ahze Exp $
+#   $MCom: ports/x11-themes/gtk-engines2/Makefile,v 1.50 2007/10/16 03:21:53 mezz Exp $
 #
 
 PORTNAME=	gtk-engines2
-PORTVERSION=	2.10.2
+PORTVERSION=	2.12.2
 CATEGORIES=	x11-themes
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/x11-themes/gtk-engines2/distinfo b/x11-themes/gtk-engines2/distinfo
index c0a9f277953f..295c83ff44ed 100644
--- a/x11-themes/gtk-engines2/distinfo
+++ b/x11-themes/gtk-engines2/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gtk-engines-2.10.2.tar.bz2) = 01de081b24d7b5d92093cad5c5e4b8c7
-SHA256 (gnome2/gtk-engines-2.10.2.tar.bz2) = 9c72b0b3a42c2db05e245706d2345e5d529775ddaf029864fc1dc22ae0a190ef
-SIZE (gnome2/gtk-engines-2.10.2.tar.bz2) = 654866
+MD5 (gnome2/gtk-engines-2.12.2.tar.bz2) = a73506d8262eb52e0e4bd8e04517ea4e
+SHA256 (gnome2/gtk-engines-2.12.2.tar.bz2) = d227dfa35520af1ffb19a5d9c423a5d65b2071b9b43a0351ca2f4a4e1c836dba
+SIZE (gnome2/gtk-engines-2.12.2.tar.bz2) = 653441
diff --git a/x11-themes/gtk-engines2/pkg-plist b/x11-themes/gtk-engines2/pkg-plist
index 81b4f5039b05..c97e50ca8646 100644
--- a/x11-themes/gtk-engines2/pkg-plist
+++ b/x11-themes/gtk-engines2/pkg-plist
@@ -18,38 +18,54 @@ lib/gtk-2.0/%%GTK2_VERSION%%/engines/libthinice.la
 lib/gtk-2.0/%%GTK2_VERSION%%/engines/libthinice.so
 libdata/pkgconfig/gtk-engines-2.pc
 share/gtk-engines/clearlooks.xml
-share/gtk-engines/crux.xml
+share/gtk-engines/crux-engine.xml
 share/gtk-engines/glide.xml
-share/gtk-engines/hc.xml
+share/gtk-engines/hcengine.xml
 share/gtk-engines/industrial.xml
 share/gtk-engines/mist.xml
-share/gtk-engines/redmond.xml
+share/gtk-engines/redmond95.xml
 share/gtk-engines/smooth.xml
 share/gtk-engines/thinice.xml
 share/locale/ar/LC_MESSAGES/gtk-engines.mo
+share/locale/be@latin/LC_MESSAGES/gtk-engines.mo
 share/locale/bg/LC_MESSAGES/gtk-engines.mo
+share/locale/bn_IN/LC_MESSAGES/gtk-engines.mo
 share/locale/ca/LC_MESSAGES/gtk-engines.mo
 share/locale/da/LC_MESSAGES/gtk-engines.mo
 share/locale/de/LC_MESSAGES/gtk-engines.mo
 share/locale/dz/LC_MESSAGES/gtk-engines.mo
+share/locale/el/LC_MESSAGES/gtk-engines.mo
 share/locale/en_GB/LC_MESSAGES/gtk-engines.mo
 share/locale/es/LC_MESSAGES/gtk-engines.mo
 share/locale/et/LC_MESSAGES/gtk-engines.mo
+share/locale/fi/LC_MESSAGES/gtk-engines.mo
 share/locale/fr/LC_MESSAGES/gtk-engines.mo
 share/locale/gl/LC_MESSAGES/gtk-engines.mo
 share/locale/gu/LC_MESSAGES/gtk-engines.mo
 share/locale/hu/LC_MESSAGES/gtk-engines.mo
+share/locale/it/LC_MESSAGES/gtk-engines.mo
+share/locale/ja/LC_MESSAGES/gtk-engines.mo
 share/locale/ko/LC_MESSAGES/gtk-engines.mo
 share/locale/lt/LC_MESSAGES/gtk-engines.mo
 share/locale/mk/LC_MESSAGES/gtk-engines.mo
+share/locale/nb/LC_MESSAGES/gtk-engines.mo
 share/locale/nl/LC_MESSAGES/gtk-engines.mo
 share/locale/oc/LC_MESSAGES/gtk-engines.mo
 share/locale/or/LC_MESSAGES/gtk-engines.mo
 share/locale/pa/LC_MESSAGES/gtk-engines.mo
+share/locale/pl/LC_MESSAGES/gtk-engines.mo
 share/locale/pt/LC_MESSAGES/gtk-engines.mo
 share/locale/pt_BR/LC_MESSAGES/gtk-engines.mo
+share/locale/ru/LC_MESSAGES/gtk-engines.mo
+share/locale/si/LC_MESSAGES/gtk-engines.mo
+share/locale/sq/LC_MESSAGES/gtk-engines.mo
+share/locale/sr/LC_MESSAGES/gtk-engines.mo
 share/locale/sv/LC_MESSAGES/gtk-engines.mo
+share/locale/ta/LC_MESSAGES/gtk-engines.mo
+share/locale/th/LC_MESSAGES/gtk-engines.mo
 share/locale/uk/LC_MESSAGES/gtk-engines.mo
+share/locale/vi/LC_MESSAGES/gtk-engines.mo
+share/locale/zh_CN/LC_MESSAGES/gtk-engines.mo
 share/themes/Clearlooks/gtk-2.0/gtkrc
 share/themes/Crux/gtk-2.0/gtkrc
 share/themes/Industrial/gtk-2.0/gtkrc
@@ -68,8 +84,15 @@ share/themes/ThinIce/gtk-2.0/gtkrc
 @dirrmtry share/themes/Crux
 @dirrm share/themes/Clearlooks/gtk-2.0
 @dirrmtry share/themes/Clearlooks
+@dirrmtry share/themes
 @dirrm share/gtk-engines
+@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/locale/be@latin/LC_MESSAGES
+@dirrmtry share/locale/be@latin
diff --git a/x11-themes/gtk-envy-theme/Makefile b/x11-themes/gtk-envy-theme/Makefile
index 2233370230b2..f0c92e98eec8 100644
--- a/x11-themes/gtk-envy-theme/Makefile
+++ b/x11-themes/gtk-envy-theme/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gtk-envy-theme
 PORTVERSION=	1.0.${SNAPSHOT}
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-themes gnome
 MASTER_SITES=	http://www.gnome-look.org/CONTENT/content-files/
 DISTNAME=	35093-Envy
@@ -24,9 +24,9 @@ WRKSRC=		${WRKDIR}/Envy
 
 do-install:
 	${MKDIR} ${PREFIX}/share/themes/Envy/gtk-2.0
-	${MKDIR} ${PREFIX}/share/gnome/themes/Envy/metacity-1
+	${MKDIR} ${PREFIX}/share/themes/Envy/metacity-1
 	@${CP} ${FILESDIR}/index.theme.in ${PREFIX}/share/themes/Envy/index.theme
 	@${CP} -R ${WRKDIR}/Envy/gtk-2.0/* ${PREFIX}/share/themes/Envy/gtk-2.0
-	@${CP} -R ${WRKDIR}/Envy/metacity-1/* ${PREFIX}/share/gnome/themes/Envy/metacity-1
+	@${CP} -R ${WRKDIR}/Envy/metacity-1/* ${PREFIX}/share/themes/Envy/metacity-1
 
 .include <bsd.port.mk>
diff --git a/x11-themes/gtk-envy-theme/pkg-plist b/x11-themes/gtk-envy-theme/pkg-plist
index f6634e728edc..cbd07ac0c24c 100644
--- a/x11-themes/gtk-envy-theme/pkg-plist
+++ b/x11-themes/gtk-envy-theme/pkg-plist
@@ -1,20 +1,20 @@
-share/gnome/themes/Envy/metacity-1/close-i.png
-share/gnome/themes/Envy/metacity-1/close-inv.png
-share/gnome/themes/Envy/metacity-1/close-pre.png
-share/gnome/themes/Envy/metacity-1/close.png
-share/gnome/themes/Envy/metacity-1/maximize-i.png
-share/gnome/themes/Envy/metacity-1/maximize-inv.png
-share/gnome/themes/Envy/metacity-1/maximize-pre.png
-share/gnome/themes/Envy/metacity-1/maximize.png
-share/gnome/themes/Envy/metacity-1/metacity-theme-1.xml
-share/gnome/themes/Envy/metacity-1/minimize-i.png
-share/gnome/themes/Envy/metacity-1/minimize-inv.png
-share/gnome/themes/Envy/metacity-1/minimize-pre.png
-share/gnome/themes/Envy/metacity-1/minimize.png
-share/gnome/themes/Envy/metacity-1/restore-i.png
-share/gnome/themes/Envy/metacity-1/restore-inv.png
-share/gnome/themes/Envy/metacity-1/restore-pre.png
-share/gnome/themes/Envy/metacity-1/restore.png
+share/themes/Envy/metacity-1/close-i.png
+share/themes/Envy/metacity-1/close-inv.png
+share/themes/Envy/metacity-1/close-pre.png
+share/themes/Envy/metacity-1/close.png
+share/themes/Envy/metacity-1/maximize-i.png
+share/themes/Envy/metacity-1/maximize-inv.png
+share/themes/Envy/metacity-1/maximize-pre.png
+share/themes/Envy/metacity-1/maximize.png
+share/themes/Envy/metacity-1/metacity-theme-1.xml
+share/themes/Envy/metacity-1/minimize-i.png
+share/themes/Envy/metacity-1/minimize-inv.png
+share/themes/Envy/metacity-1/minimize-pre.png
+share/themes/Envy/metacity-1/minimize.png
+share/themes/Envy/metacity-1/restore-i.png
+share/themes/Envy/metacity-1/restore-inv.png
+share/themes/Envy/metacity-1/restore-pre.png
+share/themes/Envy/metacity-1/restore.png
 share/themes/Envy/gtk-2.0/button-default.png
 share/themes/Envy/gtk-2.0/button-insensitive.png
 share/themes/Envy/gtk-2.0/button-normal.png
@@ -125,7 +125,6 @@ share/themes/Envy/gtk-2.0/trough2.png
 share/themes/Envy/index.theme
 @dirrm share/themes/Envy/gtk-2.0
 @dirrm share/themes/Envy
-@dirrm share/gnome/themes/Envy/metacity-1
-@dirrm share/gnome/themes/Envy
-@dirrmtry share/gnome/themes
-@dirrmtry share/gnome
+@dirrm share/themes/Envy/metacity-1
+@dirrm share/themes/Envy
+@dirrmtry share/themes
diff --git a/x11-themes/gtk-gray-theme/Makefile b/x11-themes/gtk-gray-theme/Makefile
index 18c8bc76b2cf..d734034d5f96 100644
--- a/x11-themes/gtk-gray-theme/Makefile
+++ b/x11-themes/gtk-gray-theme/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gtk-gray-theme
 PORTVERSION=	1.7
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-themes gnome
 MASTER_SITES=	http://www.gnome-look.org/CONTENT/content-files/
 DISTNAME=	34132-Gray
@@ -23,13 +23,13 @@ USE_GNOME=	gtk20
 do-install:
 	${MKDIR} ${PREFIX}/share/themes/Gray/gtk-2.0
 	${MKDIR} ${PREFIX}/share/themes/Gray-Flat/gtk-2.0
-	${MKDIR} ${PREFIX}/share/gnome/themes/Gray/metacity-1
-	${MKDIR} ${PREFIX}/share/gnome/themes/Gray-Flat/metacity-1
+	${MKDIR} ${PREFIX}/share/themes/Gray/metacity-1
+	${MKDIR} ${PREFIX}/share/themes/Gray-Flat/metacity-1
 	@${CP} ${WRKDIR}/Gray/index.theme ${PREFIX}/share/themes/Gray
 	@${CP} -R ${WRKDIR}/Gray/gtk-2.0/* ${PREFIX}/share/themes/Gray/gtk-2.0
 	@${CP} ${WRKDIR}/Gray-Flat/index.theme ${PREFIX}/share/themes/Gray-Flat
 	@${CP} -R ${WRKDIR}/Gray-Flat/gtk-2.0/* ${PREFIX}/share/themes/Gray-Flat/gtk-2.0
-	@${CP} -R ${WRKDIR}/Gray/metacity-1/* ${PREFIX}/share/gnome/themes/Gray/metacity-1
-	@${CP} -R ${WRKDIR}/Gray-Flat/metacity-1/* ${PREFIX}/share/gnome/themes/Gray-Flat/metacity-1
+	@${CP} -R ${WRKDIR}/Gray/metacity-1/* ${PREFIX}/share/themes/Gray/metacity-1
+	@${CP} -R ${WRKDIR}/Gray-Flat/metacity-1/* ${PREFIX}/share/themes/Gray-Flat/metacity-1
 
 .include <bsd.port.mk>
diff --git a/x11-themes/gtk-gray-theme/pkg-plist b/x11-themes/gtk-gray-theme/pkg-plist
index ee7c03bbac88..de777cf69342 100644
--- a/x11-themes/gtk-gray-theme/pkg-plist
+++ b/x11-themes/gtk-gray-theme/pkg-plist
@@ -1,51 +1,51 @@
-share/gnome/themes/Gray-Flat/metacity-1/button-close-focused.png
-share/gnome/themes/Gray-Flat/metacity-1/button-close-pressed.png
-share/gnome/themes/Gray-Flat/metacity-1/button-close-unfocused.png
-share/gnome/themes/Gray-Flat/metacity-1/button-maximize-focused.png
-share/gnome/themes/Gray-Flat/metacity-1/button-maximize-pressed.png
-share/gnome/themes/Gray-Flat/metacity-1/button-maximize-unfocused.png
-share/gnome/themes/Gray-Flat/metacity-1/button-menu-focused.png
-share/gnome/themes/Gray-Flat/metacity-1/button-menu-pressed.png
-share/gnome/themes/Gray-Flat/metacity-1/button-menu-unfocused.png
-share/gnome/themes/Gray-Flat/metacity-1/button-minimize-focused.png
-share/gnome/themes/Gray-Flat/metacity-1/button-minimize-pressed.png
-share/gnome/themes/Gray-Flat/metacity-1/button-minimize-unfocused.png
-share/gnome/themes/Gray-Flat/metacity-1/frame-bottom-left-focused.png
-share/gnome/themes/Gray-Flat/metacity-1/frame-bottom-mid-focused.png
-share/gnome/themes/Gray-Flat/metacity-1/frame-bottom-right-focused.png
-share/gnome/themes/Gray-Flat/metacity-1/frame-left-focused.png
-share/gnome/themes/Gray-Flat/metacity-1/frame-right-focused.png
-share/gnome/themes/Gray-Flat/metacity-1/metacity-theme-1.xml
-share/gnome/themes/Gray-Flat/metacity-1/titlebar-left-focused.png
-share/gnome/themes/Gray-Flat/metacity-1/titlebar-left-shaded-focused.png
-share/gnome/themes/Gray-Flat/metacity-1/titlebar-mid-focused.png
-share/gnome/themes/Gray-Flat/metacity-1/titlebar-mid-shaded-focused.png
-share/gnome/themes/Gray-Flat/metacity-1/titlebar-right-focused.png
-share/gnome/themes/Gray-Flat/metacity-1/titlebar-right-shaded-focused.png
-share/gnome/themes/Gray/metacity-1/button-close-focused.png
-share/gnome/themes/Gray/metacity-1/button-close-pressed.png
-share/gnome/themes/Gray/metacity-1/button-close-unfocused.png
-share/gnome/themes/Gray/metacity-1/button-maximize-focused.png
-share/gnome/themes/Gray/metacity-1/button-maximize-pressed.png
-share/gnome/themes/Gray/metacity-1/button-maximize-unfocused.png
-share/gnome/themes/Gray/metacity-1/button-menu-focused.png
-share/gnome/themes/Gray/metacity-1/button-menu-pressed.png
-share/gnome/themes/Gray/metacity-1/button-menu-unfocused.png
-share/gnome/themes/Gray/metacity-1/button-minimize-focused.png
-share/gnome/themes/Gray/metacity-1/button-minimize-pressed.png
-share/gnome/themes/Gray/metacity-1/button-minimize-unfocused.png
-share/gnome/themes/Gray/metacity-1/frame-bottom-left-focused.png
-share/gnome/themes/Gray/metacity-1/frame-bottom-mid-focused.png
-share/gnome/themes/Gray/metacity-1/frame-bottom-right-focused.png
-share/gnome/themes/Gray/metacity-1/frame-left-focused.png
-share/gnome/themes/Gray/metacity-1/frame-right-focused.png
-share/gnome/themes/Gray/metacity-1/metacity-theme-1.xml
-share/gnome/themes/Gray/metacity-1/titlebar-left-focused.png
-share/gnome/themes/Gray/metacity-1/titlebar-left-shaded-focused.png
-share/gnome/themes/Gray/metacity-1/titlebar-mid-focused.png
-share/gnome/themes/Gray/metacity-1/titlebar-mid-shaded-focused.png
-share/gnome/themes/Gray/metacity-1/titlebar-right-focused.png
-share/gnome/themes/Gray/metacity-1/titlebar-right-shaded-focused.png
+share/themes/Gray-Flat/metacity-1/button-close-focused.png
+share/themes/Gray-Flat/metacity-1/button-close-pressed.png
+share/themes/Gray-Flat/metacity-1/button-close-unfocused.png
+share/themes/Gray-Flat/metacity-1/button-maximize-focused.png
+share/themes/Gray-Flat/metacity-1/button-maximize-pressed.png
+share/themes/Gray-Flat/metacity-1/button-maximize-unfocused.png
+share/themes/Gray-Flat/metacity-1/button-menu-focused.png
+share/themes/Gray-Flat/metacity-1/button-menu-pressed.png
+share/themes/Gray-Flat/metacity-1/button-menu-unfocused.png
+share/themes/Gray-Flat/metacity-1/button-minimize-focused.png
+share/themes/Gray-Flat/metacity-1/button-minimize-pressed.png
+share/themes/Gray-Flat/metacity-1/button-minimize-unfocused.png
+share/themes/Gray-Flat/metacity-1/frame-bottom-left-focused.png
+share/themes/Gray-Flat/metacity-1/frame-bottom-mid-focused.png
+share/themes/Gray-Flat/metacity-1/frame-bottom-right-focused.png
+share/themes/Gray-Flat/metacity-1/frame-left-focused.png
+share/themes/Gray-Flat/metacity-1/frame-right-focused.png
+share/themes/Gray-Flat/metacity-1/metacity-theme-1.xml
+share/themes/Gray-Flat/metacity-1/titlebar-left-focused.png
+share/themes/Gray-Flat/metacity-1/titlebar-left-shaded-focused.png
+share/themes/Gray-Flat/metacity-1/titlebar-mid-focused.png
+share/themes/Gray-Flat/metacity-1/titlebar-mid-shaded-focused.png
+share/themes/Gray-Flat/metacity-1/titlebar-right-focused.png
+share/themes/Gray-Flat/metacity-1/titlebar-right-shaded-focused.png
+share/themes/Gray/metacity-1/button-close-focused.png
+share/themes/Gray/metacity-1/button-close-pressed.png
+share/themes/Gray/metacity-1/button-close-unfocused.png
+share/themes/Gray/metacity-1/button-maximize-focused.png
+share/themes/Gray/metacity-1/button-maximize-pressed.png
+share/themes/Gray/metacity-1/button-maximize-unfocused.png
+share/themes/Gray/metacity-1/button-menu-focused.png
+share/themes/Gray/metacity-1/button-menu-pressed.png
+share/themes/Gray/metacity-1/button-menu-unfocused.png
+share/themes/Gray/metacity-1/button-minimize-focused.png
+share/themes/Gray/metacity-1/button-minimize-pressed.png
+share/themes/Gray/metacity-1/button-minimize-unfocused.png
+share/themes/Gray/metacity-1/frame-bottom-left-focused.png
+share/themes/Gray/metacity-1/frame-bottom-mid-focused.png
+share/themes/Gray/metacity-1/frame-bottom-right-focused.png
+share/themes/Gray/metacity-1/frame-left-focused.png
+share/themes/Gray/metacity-1/frame-right-focused.png
+share/themes/Gray/metacity-1/metacity-theme-1.xml
+share/themes/Gray/metacity-1/titlebar-left-focused.png
+share/themes/Gray/metacity-1/titlebar-left-shaded-focused.png
+share/themes/Gray/metacity-1/titlebar-mid-focused.png
+share/themes/Gray/metacity-1/titlebar-mid-shaded-focused.png
+share/themes/Gray/metacity-1/titlebar-right-focused.png
+share/themes/Gray/metacity-1/titlebar-right-shaded-focused.png
 share/themes/Gray-Flat/gtk-2.0/Arrows/arrow-down.png
 share/themes/Gray-Flat/gtk-2.0/Arrows/arrow-left.png
 share/themes/Gray-Flat/gtk-2.0/Arrows/arrow-right-norm.png
@@ -320,10 +320,8 @@ share/themes/Gray/index.theme
 @dirrm share/themes/Gray-Flat/gtk-2.0
 @dirrm share/themes/Gray-Flat
 @dirrm share/themes/Gray
+@dirrm share/themes/Gray/metacity-1
+@dirrm share/themes/Gray-Flat/metacity-1
+@dirrm share/themes/Gray-Flat
+@dirrm share/themes/Gray
 @dirrmtry share/themes
-@dirrm share/gnome/themes/Gray/metacity-1
-@dirrm share/gnome/themes/Gray-Flat/metacity-1
-@dirrm share/gnome/themes/Gray-Flat
-@dirrm share/gnome/themes/Gray
-@dirrmtry share/gnome/themes
-@dirrmtry share/gnome
diff --git a/x11-themes/gtk-longhorninspirat-theme/Makefile b/x11-themes/gtk-longhorninspirat-theme/Makefile
index 7c8b0c211daa..b3cf326502cf 100644
--- a/x11-themes/gtk-longhorninspirat-theme/Makefile
+++ b/x11-themes/gtk-longhorninspirat-theme/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	longhorninspirat
 PORTVERSION=	1.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-themes gnome
 MASTER_SITES=	http://www.users.monornet.hu/linux/gtk2/oldies/
 PKGNAMEPREFIX=	${TYPE}-
@@ -30,7 +30,7 @@ THEME_DIR=	${PREFIX}/share/themes/${THEME_NAME}
 PLIST_SUB+=	GTK20="" METACITY="@comment "
 USE_GNOME=	gtk20
 .else	# metacity
-THEME_DIR=	${PREFIX}/share/gnome/themes/${THEME_NAME}
+THEME_DIR=	${PREFIX}/share/themes/${THEME_NAME}
 PLIST_SUB+=	GTK20="@comment " METACITY=""
 USE_GNOME=	gnomehier
 .endif
diff --git a/x11-themes/gtk-longhorninspirat-theme/pkg-plist b/x11-themes/gtk-longhorninspirat-theme/pkg-plist
index cc39ab3c9115..ce3ee1dd3557 100644
--- a/x11-themes/gtk-longhorninspirat-theme/pkg-plist
+++ b/x11-themes/gtk-longhorninspirat-theme/pkg-plist
@@ -186,36 +186,37 @@
 %%GTK20%%@dirrm share/themes/Longhorn Inspirat/gtk-2.0/Tabs
 %%GTK20%%@dirrm share/themes/Longhorn Inspirat/gtk-2.0
 %%GTK20%%@dirrm share/themes/Longhorn Inspirat
-%%METACITY%%share/gnome/themes/Longhorn Inspirat/metacity-1/metacity-theme-1.xml
-%%METACITY%%share/gnome/themes/Longhorn Inspirat/metacity-1/button-close-pressed.png
-%%METACITY%%share/gnome/themes/Longhorn Inspirat/metacity-1/button-minimize-pressed.png
-%%METACITY%%share/gnome/themes/Longhorn Inspirat/metacity-1/titlebar-right-focused.png
-%%METACITY%%share/gnome/themes/Longhorn Inspirat/metacity-1/titlebar-right-unfocused.png
-%%METACITY%%share/gnome/themes/Longhorn Inspirat/metacity-1/titlebar-left-focused.png
-%%METACITY%%share/gnome/themes/Longhorn Inspirat/metacity-1/button-maximize-unfocused.png
-%%METACITY%%share/gnome/themes/Longhorn Inspirat/metacity-1/button-minimize-unfocused.png
-%%METACITY%%share/gnome/themes/Longhorn Inspirat/metacity-1/titlebar-mid-unfocused.png
-%%METACITY%%share/gnome/themes/Longhorn Inspirat/metacity-1/button-menu-unfocused.png
-%%METACITY%%share/gnome/themes/Longhorn Inspirat/metacity-1/frame-bottom-right-focused.png
-%%METACITY%%share/gnome/themes/Longhorn Inspirat/metacity-1/frame-left-focused.png
-%%METACITY%%share/gnome/themes/Longhorn Inspirat/metacity-1/frame-right-focused.png
-%%METACITY%%share/gnome/themes/Longhorn Inspirat/metacity-1/button-menu-pressed.png
-%%METACITY%%share/gnome/themes/Longhorn Inspirat/metacity-1/titlebar-mid-shaded-focused.png
-%%METACITY%%share/gnome/themes/Longhorn Inspirat/metacity-1/button-menu-focused.png
-%%METACITY%%share/gnome/themes/Longhorn Inspirat/metacity-1/titlebar-mid-focused.png
-%%METACITY%%share/gnome/themes/Longhorn Inspirat/metacity-1/titlebar-mid-focused-template.png
-%%METACITY%%share/gnome/themes/Longhorn Inspirat/metacity-1/button-maximize-pressed.png
-%%METACITY%%share/gnome/themes/Longhorn Inspirat/metacity-1/titlebar-right-shaded-focused.png
-%%METACITY%%share/gnome/themes/Longhorn Inspirat/metacity-1/button-close-focused.png
-%%METACITY%%share/gnome/themes/Longhorn Inspirat/metacity-1/titlebar-right-shaded-unfocused.png
-%%METACITY%%share/gnome/themes/Longhorn Inspirat/metacity-1/button-close-unfocused.png
-%%METACITY%%share/gnome/themes/Longhorn Inspirat/metacity-1/frame-bottom-left-focused.png
-%%METACITY%%share/gnome/themes/Longhorn Inspirat/metacity-1/titlebar-left-shaded-focused.png
-%%METACITY%%share/gnome/themes/Longhorn Inspirat/metacity-1/titlebar-left-unfocused.png
-%%METACITY%%share/gnome/themes/Longhorn Inspirat/metacity-1/button-minimize-focused.png
-%%METACITY%%share/gnome/themes/Longhorn Inspirat/metacity-1/button-maximize-focused.png
-%%METACITY%%share/gnome/themes/Longhorn Inspirat/metacity-1/titlebar-left-shaded-unfocused.png
-%%METACITY%%share/gnome/themes/Longhorn Inspirat/metacity-1/frame-bottom-mid-focused.png
-%%METACITY%%@dirrm share/gnome/themes/Longhorn Inspirat/metacity-1
-%%METACITY%%share/gnome/themes/Longhorn Inspirat/index.theme
-%%METACITY%%@dirrm share/gnome/themes/Longhorn Inspirat
+%%METACITY%%share/themes/Longhorn Inspirat/metacity-1/metacity-theme-1.xml
+%%METACITY%%share/themes/Longhorn Inspirat/metacity-1/button-close-pressed.png
+%%METACITY%%share/themes/Longhorn Inspirat/metacity-1/button-minimize-pressed.png
+%%METACITY%%share/themes/Longhorn Inspirat/metacity-1/titlebar-right-focused.png
+%%METACITY%%share/themes/Longhorn Inspirat/metacity-1/titlebar-right-unfocused.png
+%%METACITY%%share/themes/Longhorn Inspirat/metacity-1/titlebar-left-focused.png
+%%METACITY%%share/themes/Longhorn Inspirat/metacity-1/button-maximize-unfocused.png
+%%METACITY%%share/themes/Longhorn Inspirat/metacity-1/button-minimize-unfocused.png
+%%METACITY%%share/themes/Longhorn Inspirat/metacity-1/titlebar-mid-unfocused.png
+%%METACITY%%share/themes/Longhorn Inspirat/metacity-1/button-menu-unfocused.png
+%%METACITY%%share/themes/Longhorn Inspirat/metacity-1/frame-bottom-right-focused.png
+%%METACITY%%share/themes/Longhorn Inspirat/metacity-1/frame-left-focused.png
+%%METACITY%%share/themes/Longhorn Inspirat/metacity-1/frame-right-focused.png
+%%METACITY%%share/themes/Longhorn Inspirat/metacity-1/button-menu-pressed.png
+%%METACITY%%share/themes/Longhorn Inspirat/metacity-1/titlebar-mid-shaded-focused.png
+%%METACITY%%share/themes/Longhorn Inspirat/metacity-1/button-menu-focused.png
+%%METACITY%%share/themes/Longhorn Inspirat/metacity-1/titlebar-mid-focused.png
+%%METACITY%%share/themes/Longhorn Inspirat/metacity-1/titlebar-mid-focused-template.png
+%%METACITY%%share/themes/Longhorn Inspirat/metacity-1/button-maximize-pressed.png
+%%METACITY%%share/themes/Longhorn Inspirat/metacity-1/titlebar-right-shaded-focused.png
+%%METACITY%%share/themes/Longhorn Inspirat/metacity-1/button-close-focused.png
+%%METACITY%%share/themes/Longhorn Inspirat/metacity-1/titlebar-right-shaded-unfocused.png
+%%METACITY%%share/themes/Longhorn Inspirat/metacity-1/button-close-unfocused.png
+%%METACITY%%share/themes/Longhorn Inspirat/metacity-1/frame-bottom-left-focused.png
+%%METACITY%%share/themes/Longhorn Inspirat/metacity-1/titlebar-left-shaded-focused.png
+%%METACITY%%share/themes/Longhorn Inspirat/metacity-1/titlebar-left-unfocused.png
+%%METACITY%%share/themes/Longhorn Inspirat/metacity-1/button-minimize-focused.png
+%%METACITY%%share/themes/Longhorn Inspirat/metacity-1/button-maximize-focused.png
+%%METACITY%%share/themes/Longhorn Inspirat/metacity-1/titlebar-left-shaded-unfocused.png
+%%METACITY%%share/themes/Longhorn Inspirat/metacity-1/frame-bottom-mid-focused.png
+%%METACITY%%@dirrm share/themes/Longhorn Inspirat/metacity-1
+%%METACITY%%share/themes/Longhorn Inspirat/index.theme
+%%METACITY%%@dirrm share/themes/Longhorn Inspirat
+@dirrmtry share/themes
diff --git a/x11-themes/gtk-milk-theme/Makefile b/x11-themes/gtk-milk-theme/Makefile
index b90055f77c34..c6294bba09e1 100644
--- a/x11-themes/gtk-milk-theme/Makefile
+++ b/x11-themes/gtk-milk-theme/Makefile
@@ -3,12 +3,12 @@
 # Whom:					Alexey Dokuchaev <danfe@FreeBSD.org>
 #
 # $FreeBSD$
-#    $MCom: ports/x11-themes/gtk-milk-theme/Makefile,v 1.2 2006/09/22 19:53:01 mezz Exp $
+#   $MCom: ports/x11-themes/gtk-milk-theme/Makefile,v 1.4 2007/08/07 04:37:40 mezz Exp $
 #
 
 PORTNAME=	milk
 PORTVERSION=	2.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-themes gnome
 MASTER_SITES=	http://www.users.monornet.hu/linux/gtk2/oldies/
 PKGNAMEPREFIX?=	${TYPE}-
@@ -30,7 +30,7 @@ THEME_DIR=	${PREFIX}/share/themes/${THEME_NAME}
 PLIST_SUB+=	GTK20="" METACITY="@comment "
 USE_GNOME=	gtk20
 .else	# metacity
-THEME_DIR=	${PREFIX}/share/gnome/themes/${THEME_NAME}
+THEME_DIR=	${PREFIX}/share/themes/${THEME_NAME}
 PLIST_SUB+=	GTK20="@comment " METACITY=""
 USE_GNOME=	gnomehier
 .endif
diff --git a/x11-themes/gtk-milk-theme/pkg-plist b/x11-themes/gtk-milk-theme/pkg-plist
index 2d29f4c6d5f9..b18009bb2f6e 100644
--- a/x11-themes/gtk-milk-theme/pkg-plist
+++ b/x11-themes/gtk-milk-theme/pkg-plist
@@ -214,48 +214,49 @@
 %%GTK20%%@dirrm share/themes/Milk/gtk-2.0
 %%GTK20%%share/themes/Milk/index.theme
 %%GTK20%%@dirrm share/themes/Milk
-%%METACITY%%share/gnome/themes/Milk/metacity-1/button-close-focused.png
-%%METACITY%%share/gnome/themes/Milk/metacity-1/button-close-prelight.png
-%%METACITY%%share/gnome/themes/Milk/metacity-1/button-close-pressed.png
-%%METACITY%%share/gnome/themes/Milk/metacity-1/button-close-unfocused.png
-%%METACITY%%share/gnome/themes/Milk/metacity-1/button-inactive.png
-%%METACITY%%share/gnome/themes/Milk/metacity-1/button-maximize-focused.png
-%%METACITY%%share/gnome/themes/Milk/metacity-1/button-maximize-prelight.png
-%%METACITY%%share/gnome/themes/Milk/metacity-1/button-maximize-pressed.png
-%%METACITY%%share/gnome/themes/Milk/metacity-1/button-maximize-unfocused.png
-%%METACITY%%share/gnome/themes/Milk/metacity-1/button-menu-focused.png
-%%METACITY%%share/gnome/themes/Milk/metacity-1/button-menu-prelight.png
-%%METACITY%%share/gnome/themes/Milk/metacity-1/button-menu-pressed.png
-%%METACITY%%share/gnome/themes/Milk/metacity-1/button-menu-unfocused.png
-%%METACITY%%share/gnome/themes/Milk/metacity-1/button-minimize-focused.png
-%%METACITY%%share/gnome/themes/Milk/metacity-1/button-minimize-prelight.png
-%%METACITY%%share/gnome/themes/Milk/metacity-1/button-minimize-pressed.png
-%%METACITY%%share/gnome/themes/Milk/metacity-1/button-minimize-unfocused.png
-%%METACITY%%share/gnome/themes/Milk/metacity-1/frame-bottom-left-focused.xpm
-%%METACITY%%share/gnome/themes/Milk/metacity-1/frame-bottom-left-unfocused.xpm
-%%METACITY%%share/gnome/themes/Milk/metacity-1/frame-bottom-mid-focused.xpm
-%%METACITY%%share/gnome/themes/Milk/metacity-1/frame-bottom-mid-unfocused.xpm
-%%METACITY%%share/gnome/themes/Milk/metacity-1/frame-bottom-right-focused.xpm
-%%METACITY%%share/gnome/themes/Milk/metacity-1/frame-bottom-right-unfocused.xpm
-%%METACITY%%share/gnome/themes/Milk/metacity-1/frame-left-focused.xpm
-%%METACITY%%share/gnome/themes/Milk/metacity-1/frame-left-unfocused.xpm
-%%METACITY%%share/gnome/themes/Milk/metacity-1/frame-right-focused.png
-%%METACITY%%share/gnome/themes/Milk/metacity-1/frame-right-focused.xpm
-%%METACITY%%share/gnome/themes/Milk/metacity-1/frame-right-unfocused.png
-%%METACITY%%share/gnome/themes/Milk/metacity-1/frame-right-unfocused.xpm
-%%METACITY%%share/gnome/themes/Milk/metacity-1/metacity-theme-1.xml
-%%METACITY%%share/gnome/themes/Milk/metacity-1/titlebar-left-focused.xpm
-%%METACITY%%share/gnome/themes/Milk/metacity-1/titlebar-left-shaded-focused.xpm
-%%METACITY%%share/gnome/themes/Milk/metacity-1/titlebar-left-shaded-unfocused.xpm
-%%METACITY%%share/gnome/themes/Milk/metacity-1/titlebar-left-unfocused.xpm
-%%METACITY%%share/gnome/themes/Milk/metacity-1/titlebar-mid-focused.xpm
-%%METACITY%%share/gnome/themes/Milk/metacity-1/titlebar-mid-shaded-focused.xpm
-%%METACITY%%share/gnome/themes/Milk/metacity-1/titlebar-mid-shaded-unfocused.xpm
-%%METACITY%%share/gnome/themes/Milk/metacity-1/titlebar-mid-unfocused.xpm
-%%METACITY%%share/gnome/themes/Milk/metacity-1/titlebar-right-focused.xpm
-%%METACITY%%share/gnome/themes/Milk/metacity-1/titlebar-right-shaded-focused.xpm
-%%METACITY%%share/gnome/themes/Milk/metacity-1/titlebar-right-shaded-unfocused.xpm
-%%METACITY%%share/gnome/themes/Milk/metacity-1/titlebar-right-unfocused.xpm
-%%METACITY%%@dirrm share/gnome/themes/Milk/metacity-1
-%%METACITY%%share/gnome/themes/Milk/index.theme
-%%METACITY%%@dirrm share/gnome/themes/Milk
+%%METACITY%%share/themes/Milk/metacity-1/button-close-focused.png
+%%METACITY%%share/themes/Milk/metacity-1/button-close-prelight.png
+%%METACITY%%share/themes/Milk/metacity-1/button-close-pressed.png
+%%METACITY%%share/themes/Milk/metacity-1/button-close-unfocused.png
+%%METACITY%%share/themes/Milk/metacity-1/button-inactive.png
+%%METACITY%%share/themes/Milk/metacity-1/button-maximize-focused.png
+%%METACITY%%share/themes/Milk/metacity-1/button-maximize-prelight.png
+%%METACITY%%share/themes/Milk/metacity-1/button-maximize-pressed.png
+%%METACITY%%share/themes/Milk/metacity-1/button-maximize-unfocused.png
+%%METACITY%%share/themes/Milk/metacity-1/button-menu-focused.png
+%%METACITY%%share/themes/Milk/metacity-1/button-menu-prelight.png
+%%METACITY%%share/themes/Milk/metacity-1/button-menu-pressed.png
+%%METACITY%%share/themes/Milk/metacity-1/button-menu-unfocused.png
+%%METACITY%%share/themes/Milk/metacity-1/button-minimize-focused.png
+%%METACITY%%share/themes/Milk/metacity-1/button-minimize-prelight.png
+%%METACITY%%share/themes/Milk/metacity-1/button-minimize-pressed.png
+%%METACITY%%share/themes/Milk/metacity-1/button-minimize-unfocused.png
+%%METACITY%%share/themes/Milk/metacity-1/frame-bottom-left-focused.xpm
+%%METACITY%%share/themes/Milk/metacity-1/frame-bottom-left-unfocused.xpm
+%%METACITY%%share/themes/Milk/metacity-1/frame-bottom-mid-focused.xpm
+%%METACITY%%share/themes/Milk/metacity-1/frame-bottom-mid-unfocused.xpm
+%%METACITY%%share/themes/Milk/metacity-1/frame-bottom-right-focused.xpm
+%%METACITY%%share/themes/Milk/metacity-1/frame-bottom-right-unfocused.xpm
+%%METACITY%%share/themes/Milk/metacity-1/frame-left-focused.xpm
+%%METACITY%%share/themes/Milk/metacity-1/frame-left-unfocused.xpm
+%%METACITY%%share/themes/Milk/metacity-1/frame-right-focused.png
+%%METACITY%%share/themes/Milk/metacity-1/frame-right-focused.xpm
+%%METACITY%%share/themes/Milk/metacity-1/frame-right-unfocused.png
+%%METACITY%%share/themes/Milk/metacity-1/frame-right-unfocused.xpm
+%%METACITY%%share/themes/Milk/metacity-1/metacity-theme-1.xml
+%%METACITY%%share/themes/Milk/metacity-1/titlebar-left-focused.xpm
+%%METACITY%%share/themes/Milk/metacity-1/titlebar-left-shaded-focused.xpm
+%%METACITY%%share/themes/Milk/metacity-1/titlebar-left-shaded-unfocused.xpm
+%%METACITY%%share/themes/Milk/metacity-1/titlebar-left-unfocused.xpm
+%%METACITY%%share/themes/Milk/metacity-1/titlebar-mid-focused.xpm
+%%METACITY%%share/themes/Milk/metacity-1/titlebar-mid-shaded-focused.xpm
+%%METACITY%%share/themes/Milk/metacity-1/titlebar-mid-shaded-unfocused.xpm
+%%METACITY%%share/themes/Milk/metacity-1/titlebar-mid-unfocused.xpm
+%%METACITY%%share/themes/Milk/metacity-1/titlebar-right-focused.xpm
+%%METACITY%%share/themes/Milk/metacity-1/titlebar-right-shaded-focused.xpm
+%%METACITY%%share/themes/Milk/metacity-1/titlebar-right-shaded-unfocused.xpm
+%%METACITY%%share/themes/Milk/metacity-1/titlebar-right-unfocused.xpm
+%%METACITY%%@dirrm share/themes/Milk/metacity-1
+%%METACITY%%share/themes/Milk/index.theme
+%%METACITY%%@dirrm share/themes/Milk
+@dirrmtry share/themes
diff --git a/x11-themes/indubstrial/Makefile b/x11-themes/indubstrial/Makefile
index a4809de44f04..ce04aeb9a6b3 100644
--- a/x11-themes/indubstrial/Makefile
+++ b/x11-themes/indubstrial/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	indubstrial
 PORTVERSION=	0.3.2
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	x11-themes gnome
 MASTER_SITES=	http://www.gnome.org/~jdub/2004/indubstrial/
 
@@ -17,6 +17,10 @@ COMMENT=	A clean, clear modification on the Industrial GTK+ and Metacity themes
 RUN_DEPENDS=	${LOCALBASE}/lib/gtk-2.0/${GTK2_VERSION}/engines/libindustrial.so:${PORTSDIR}/x11-themes/gnome-themes-extras \
 		${LOCALBASE}/lib/gtk/themes/engines/libindustrial.so:${PORTSDIR}/x11-themes/gtk-industrial-theme
 
+BROKEN=		gnome-themes-extras no longer has industrial engine
+DEPRECATED=	yes
+EXPIRATION_DATE=2007-11-22
+
 WRKSRC=		${WRKDIR}/Indubstrial
 NO_BUILD=	yes
 USE_XLIB=	yes
@@ -25,13 +29,13 @@ USE_GNOME=	gnomehack gnomeprefix metacity
 do-install:
 	${MKDIR} ${PREFIX}/share/themes/Indubstrial/gtk-2.0
 	${MKDIR} ${PREFIX}/share/themes/Indubstrial/gtk
-	${MKDIR} ${PREFIX}/share/gnome/themes/Indubstrial/metacity-1
+	${MKDIR} ${PREFIX}/share/themes/Indubstrial/metacity-1
 	${INSTALL_DATA} ${WRKSRC}/gtk-2.0/gtkrc \
 		${PREFIX}/share/themes/Indubstrial/gtk-2.0
 	${INSTALL_DATA} ${WRKSRC}/gtk/gtkrc \
 		${PREFIX}/share/themes/Indubstrial/gtk
 	${INSTALL_DATA} ${WRKSRC}/metacity-1/metacity-theme-1.xml \
-		${PREFIX}/share/gnome/themes/Indubstrial/metacity-1
+		${PREFIX}/share/themes/Indubstrial/metacity-1
 	${INSTALL_DATA} ${WRKSRC}/index.theme \
 		${PREFIX}/share/themes/Indubstrial
 
diff --git a/x11-themes/indubstrial/pkg-plist b/x11-themes/indubstrial/pkg-plist
index 2d20e0c6c0a1..fe51e5797ab8 100644
--- a/x11-themes/indubstrial/pkg-plist
+++ b/x11-themes/indubstrial/pkg-plist
@@ -1,9 +1,10 @@
-share/gnome/themes/Indubstrial/metacity-1/metacity-theme-1.xml
+share/themes/Indubstrial/metacity-1/metacity-theme-1.xml
 share/themes/Indubstrial/gtk-2.0/gtkrc
 share/themes/Indubstrial/gtk/gtkrc
 share/themes/Indubstrial/index.theme
 @dirrm share/themes/Indubstrial/gtk
 @dirrm share/themes/Indubstrial/gtk-2.0
 @dirrm share/themes/Indubstrial
-@dirrm share/gnome/themes/Indubstrial/metacity-1
-@dirrm share/gnome/themes/Indubstrial
+@dirrm share/themes/Indubstrial/metacity-1
+@dirrm share/themes/Indubstrial
+@dirrmtry share/themes
diff --git a/x11-themes/kdeartwork3/Makefile b/x11-themes/kdeartwork3/Makefile
index 555ee74da243..cefad9d09d3d 100644
--- a/x11-themes/kdeartwork3/Makefile
+++ b/x11-themes/kdeartwork3/Makefile
@@ -36,7 +36,7 @@ LDCONFIG_DIRS+=	%%PREFIX%%/lib/kde3
 WITH_XS=	yes
 .endif # exists(${LOCALBASE}/bin/xscreensaver)
 
-.if exists(${LOCALBASE}/share/gnome/control-center-2.0/capplets/screensaver-properties.desktop)
+.if exists(${LOCALBASE}/share/control-center-2.0/capplets/screensaver-properties.desktop)
 WITH_XSGNOME=	yes
 .endif # exists(${LOCALBASE}/bin/screensaver-properties-capplet)
 
diff --git a/x11-themes/kdeartwork4/Makefile b/x11-themes/kdeartwork4/Makefile
index 555ee74da243..cefad9d09d3d 100644
--- a/x11-themes/kdeartwork4/Makefile
+++ b/x11-themes/kdeartwork4/Makefile
@@ -36,7 +36,7 @@ LDCONFIG_DIRS+=	%%PREFIX%%/lib/kde3
 WITH_XS=	yes
 .endif # exists(${LOCALBASE}/bin/xscreensaver)
 
-.if exists(${LOCALBASE}/share/gnome/control-center-2.0/capplets/screensaver-properties.desktop)
+.if exists(${LOCALBASE}/share/control-center-2.0/capplets/screensaver-properties.desktop)
 WITH_XSGNOME=	yes
 .endif # exists(${LOCALBASE}/bin/screensaver-properties-capplet)
 
diff --git a/x11-themes/metacity-bluecurve-theme/Makefile b/x11-themes/metacity-bluecurve-theme/Makefile
index 92723ec7c6e6..5a02bb7e27cf 100644
--- a/x11-themes/metacity-bluecurve-theme/Makefile
+++ b/x11-themes/metacity-bluecurve-theme/Makefile
@@ -15,8 +15,8 @@ NO_BUILD=	yes
 USE_GNOME=	gnomehier
 
 .for t in Bluecurve Bluecurve-classic
-BC_HIERS+=	${WRKSRC}/art/metacity/${t}:${PREFIX}/share/gnome/themes/${t}/metacity-1
-PLIST_DIRS+=	share/gnome/themes/${t}/metacity-1 share/gnome/themes/${t}
+BC_HIERS+=	${WRKSRC}/art/metacity/${t}:${PREFIX}/share/themes/${t}/metacity-1
+PLIST_DIRS+=	share/themes/${t}/metacity-1 share/themes/${t} share/themes
 .endfor
 
 .include "${MASTERDIR}/Makefile"
diff --git a/x11-themes/metacity-theme-microgui/Makefile b/x11-themes/metacity-theme-microgui/Makefile
index d5221cc0fb59..ec2059859389 100644
--- a/x11-themes/metacity-theme-microgui/Makefile
+++ b/x11-themes/metacity-theme-microgui/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	microgui
 PORTVERSION=	1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-themes gnome
 MASTER_SITES=	${MASTER_SITE_THEMES}
 MASTER_SITE_SUBDIR=	mcitymicrogui
diff --git a/x11-themes/metacity-theme-microgui/pkg-plist b/x11-themes/metacity-theme-microgui/pkg-plist
index 96dda92ba4c3..92065fa367ee 100644
--- a/x11-themes/metacity-theme-microgui/pkg-plist
+++ b/x11-themes/metacity-theme-microgui/pkg-plist
@@ -1,38 +1,39 @@
-share/gnome/themes/microgui/metacity-1/README
-share/gnome/themes/microgui/metacity-1/border_bottom.png
-share/gnome/themes/microgui/metacity-1/border_bottomleft.png
-share/gnome/themes/microgui/metacity-1/border_bottomright.png
-share/gnome/themes/microgui/metacity-1/border_left.png
-share/gnome/themes/microgui/metacity-1/border_right.png
-share/gnome/themes/microgui/metacity-1/border_top.png
-share/gnome/themes/microgui/metacity-1/border_topleft.png
-share/gnome/themes/microgui/metacity-1/border_topright.png
-share/gnome/themes/microgui/metacity-1/button_close.png
-share/gnome/themes/microgui/metacity-1/button_close_in.png
-share/gnome/themes/microgui/metacity-1/button_close_off.png
-share/gnome/themes/microgui/metacity-1/button_max.png
-share/gnome/themes/microgui/metacity-1/button_max_in.png
-share/gnome/themes/microgui/metacity-1/button_max_off.png
-share/gnome/themes/microgui/metacity-1/button_menu.png
-share/gnome/themes/microgui/metacity-1/button_menu_in.png
-share/gnome/themes/microgui/metacity-1/button_menu_off.png
-share/gnome/themes/microgui/metacity-1/button_min.png
-share/gnome/themes/microgui/metacity-1/button_min_in.png
-share/gnome/themes/microgui/metacity-1/button_min_off.png
-share/gnome/themes/microgui/metacity-1/metacity-theme-1.xml
-share/gnome/themes/microgui/metacity-1/title_left.png
-share/gnome/themes/microgui/metacity-1/title_left_off.png
-share/gnome/themes/microgui/metacity-1/title_left_shade.png
-share/gnome/themes/microgui/metacity-1/title_left_shade_off.png
-share/gnome/themes/microgui/metacity-1/title_mid.png
-share/gnome/themes/microgui/metacity-1/title_mid_left.png
-share/gnome/themes/microgui/metacity-1/title_mid_left_off.png
-share/gnome/themes/microgui/metacity-1/title_mid_off.png
-share/gnome/themes/microgui/metacity-1/title_mid_right.png
-share/gnome/themes/microgui/metacity-1/title_right.png
-share/gnome/themes/microgui/metacity-1/title_right_shade.png
-share/gnome/themes/microgui/metacity-1/title_right_shade_off.png
-share/gnome/themes/microgui/metacity-1/title_text_bg.png
-share/gnome/themes/microgui/metacity-1/title_text_bg_off.png
-@dirrm share/gnome/themes/microgui/metacity-1
-@dirrm share/gnome/themes/microgui
+share/themes/microgui/metacity-1/README
+share/themes/microgui/metacity-1/border_bottom.png
+share/themes/microgui/metacity-1/border_bottomleft.png
+share/themes/microgui/metacity-1/border_bottomright.png
+share/themes/microgui/metacity-1/border_left.png
+share/themes/microgui/metacity-1/border_right.png
+share/themes/microgui/metacity-1/border_top.png
+share/themes/microgui/metacity-1/border_topleft.png
+share/themes/microgui/metacity-1/border_topright.png
+share/themes/microgui/metacity-1/button_close.png
+share/themes/microgui/metacity-1/button_close_in.png
+share/themes/microgui/metacity-1/button_close_off.png
+share/themes/microgui/metacity-1/button_max.png
+share/themes/microgui/metacity-1/button_max_in.png
+share/themes/microgui/metacity-1/button_max_off.png
+share/themes/microgui/metacity-1/button_menu.png
+share/themes/microgui/metacity-1/button_menu_in.png
+share/themes/microgui/metacity-1/button_menu_off.png
+share/themes/microgui/metacity-1/button_min.png
+share/themes/microgui/metacity-1/button_min_in.png
+share/themes/microgui/metacity-1/button_min_off.png
+share/themes/microgui/metacity-1/metacity-theme-1.xml
+share/themes/microgui/metacity-1/title_left.png
+share/themes/microgui/metacity-1/title_left_off.png
+share/themes/microgui/metacity-1/title_left_shade.png
+share/themes/microgui/metacity-1/title_left_shade_off.png
+share/themes/microgui/metacity-1/title_mid.png
+share/themes/microgui/metacity-1/title_mid_left.png
+share/themes/microgui/metacity-1/title_mid_left_off.png
+share/themes/microgui/metacity-1/title_mid_off.png
+share/themes/microgui/metacity-1/title_mid_right.png
+share/themes/microgui/metacity-1/title_right.png
+share/themes/microgui/metacity-1/title_right_shade.png
+share/themes/microgui/metacity-1/title_right_shade_off.png
+share/themes/microgui/metacity-1/title_text_bg.png
+share/themes/microgui/metacity-1/title_text_bg_off.png
+@dirrm share/themes/microgui/metacity-1
+@dirrm share/themes/microgui
+@dirrmtry share/themes
diff --git a/x11-themes/metacity-themes/Makefile b/x11-themes/metacity-themes/Makefile
index 61ebfaa93ca9..1227cd44bb9e 100644
--- a/x11-themes/metacity-themes/Makefile
+++ b/x11-themes/metacity-themes/Makefile
@@ -9,7 +9,7 @@
 
 PORTNAME=	metacity-themes
 PORTVERSION=	20040306
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	x11-themes gnome
 MASTER_SITES=	# Empty
 DISTFILES=	# Empty
@@ -18,7 +18,7 @@ EXTRACT_ONLY=	# Empty
 MAINTAINER=	MrL0Lz@gmail.com
 COMMENT=	Meta-port for Gnome Metacity themes
 
-RUN_DEPENDS=	${LOCALBASE}/share/gnome/themes/microgui/metacity-1/metacity-theme-1.xml:${PORTSDIR}/x11-themes/metacity-theme-microgui
+RUN_DEPENDS=	${LOCALBASE}/share/themes/microgui/metacity-1/metacity-theme-1.xml:${PORTSDIR}/x11-themes/metacity-theme-microgui
 
 NO_BUILD=	yes
 
diff --git a/x11-themes/metacity-themes/Makefile.metacity b/x11-themes/metacity-themes/Makefile.metacity
index 9a8e68dd6c5c..dc1f664f5083 100644
--- a/x11-themes/metacity-themes/Makefile.metacity
+++ b/x11-themes/metacity-themes/Makefile.metacity
@@ -9,10 +9,10 @@ REASON=	Themes may contain artwork not done by the author. \
 	Keep FreeBSD safe if the theme author violated copyrights.
 
 do-install:
-	${MKDIR} ${PREFIX}/share/gnome/themes/${PORTNAME}
+	${MKDIR} ${PREFIX}/share/themes/${PORTNAME}
 	cd ${WRKSRC} && ${FIND} . -type d ! -empty \
 		-exec ${MKDIR} -m 0755 \
-		${PREFIX}/share/gnome/themes/${PORTNAME}/"{}" \;
+		${PREFIX}/share/themes/${PORTNAME}/"{}" \;
 	cd ${WRKSRC} && ${FIND} . -type f \
 		-exec ${INSTALL_DATA} ${WRKSRC}/"{}" \
-		${PREFIX}/share/gnome/themes/${PORTNAME}/"{}" \;
+		${PREFIX}/share/themes/${PORTNAME}/"{}" \;
diff --git a/x11-themes/nimbus/Makefile b/x11-themes/nimbus/Makefile
index 025a4fee169e..bc3e3e2e5b1a 100644
--- a/x11-themes/nimbus/Makefile
+++ b/x11-themes/nimbus/Makefile
@@ -3,10 +3,10 @@
 # Whom:			Michael Johnson <ahze@FreeBSD.org>
 #
 # $FreeBSD$
-#
+#    $MCom: ports/x11-themes/nimbus/Makefile,v 1.5 2007/10/23 12:51:24 ahze Exp $
 
 PORTNAME=	nimbus
-PORTVERSION=	0.0.8
+PORTVERSION=	0.0.9
 CATEGORIES=	x11-themes
 MASTER_SITES=	http://dlc.sun.com/osol/jds/downloads/extras/
 
@@ -23,12 +23,13 @@ USE_GMAKE=	yes
 INSTALLS_ICONS=	yes
 USE_GNOME=	intltool
 INTLTOOLIZE?=	${LOCALBASE}/bin/intltoolize
+CONFIGURE_ARGS=	--localedir=${PREFIX}/share/locale
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|$${libdir}/locale|$${datadir}/locale|' \
+		${WRKSRC}/aclocal.m4
 
 pre-configure:
 	@(cd ${WRKSRC} && ${INTLTOOLIZE} -f)
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|$$(datadir)|${PREFIX}/share/gnome|' \
-		${WRKSRC}/metacity/Makefile.in
-
 .include <bsd.port.mk>
diff --git a/x11-themes/nimbus/distinfo b/x11-themes/nimbus/distinfo
index d1d6366a5894..5d35a3225203 100644
--- a/x11-themes/nimbus/distinfo
+++ b/x11-themes/nimbus/distinfo
@@ -1,3 +1,3 @@
-MD5 (nimbus-0.0.8.tar.bz2) = 911b055f8beb706c1efcb91d15df9632
-SHA256 (nimbus-0.0.8.tar.bz2) = 4b33efc200ac3fbb075f55e1f6728a71f44f5a9c04bc872199e4de4d5ae904a6
-SIZE (nimbus-0.0.8.tar.bz2) = 9161988
+MD5 (nimbus-0.0.9.tar.bz2) = d46d48b78a9a96da05c38f6e84da2726
+SHA256 (nimbus-0.0.9.tar.bz2) = d971344df2867d0eb31dbb9dd0866b31f8bf52f3349eac9e3685d6d64e852b1c
+SIZE (nimbus-0.0.9.tar.bz2) = 9443199
diff --git a/x11-themes/nimbus/pkg-plist b/x11-themes/nimbus/pkg-plist
index 0ad7d429014d..aea9d226ba25 100644
--- a/x11-themes/nimbus/pkg-plist
+++ b/x11-themes/nimbus/pkg-plist
@@ -1,27 +1,6 @@
 lib/gtk-2.0/%%GTK2_VERSION%%/engines/libnimbus.a
 lib/gtk-2.0/%%GTK2_VERSION%%/engines/libnimbus.la
 lib/gtk-2.0/%%GTK2_VERSION%%/engines/libnimbus.so
-share/gnome/themes/nimbus/metacity-1/button-close-icon-prelight.png
-share/gnome/themes/nimbus/metacity-1/button-close-icon-pressed.png
-share/gnome/themes/nimbus/metacity-1/button-close-icon-unfocused.png
-share/gnome/themes/nimbus/metacity-1/button-close-icon.png
-share/gnome/themes/nimbus/metacity-1/button-max-icon-prelight.png
-share/gnome/themes/nimbus/metacity-1/button-max-icon-pressed.png
-share/gnome/themes/nimbus/metacity-1/button-max-icon-unfocused.png
-share/gnome/themes/nimbus/metacity-1/button-max-icon.png
-share/gnome/themes/nimbus/metacity-1/button-menu-icon-prelight.png
-share/gnome/themes/nimbus/metacity-1/button-menu-icon-pressed.png
-share/gnome/themes/nimbus/metacity-1/button-menu-icon-unfocused.png
-share/gnome/themes/nimbus/metacity-1/button-menu-icon.png
-share/gnome/themes/nimbus/metacity-1/button-min-icon-prelight.png
-share/gnome/themes/nimbus/metacity-1/button-min-icon-pressed.png
-share/gnome/themes/nimbus/metacity-1/button-min-icon-unfocused.png
-share/gnome/themes/nimbus/metacity-1/button-min-icon.png
-share/gnome/themes/nimbus/metacity-1/button-unmax-icon-prelight.png
-share/gnome/themes/nimbus/metacity-1/button-unmax-icon-pressed.png
-share/gnome/themes/nimbus/metacity-1/button-unmax-icon-unfocused.png
-share/gnome/themes/nimbus/metacity-1/button-unmax-icon.png
-share/gnome/themes/nimbus/metacity-1/metacity-theme-1.xml
 share/icons/nimbus/12x12/actions/add.png
 share/icons/nimbus/12x12/actions/gtk-add.png
 share/icons/nimbus/12x12/actions/gtk-remove.png
@@ -506,6 +485,7 @@ share/icons/nimbus/16x16/places/application-x-executable.png
 share/icons/nimbus/16x16/places/bookmark-missing.png
 share/icons/nimbus/16x16/places/bookmark.png
 share/icons/nimbus/16x16/places/desktop.png
+share/icons/nimbus/16x16/places/emptytrash.png
 share/icons/nimbus/16x16/places/file.png
 share/icons/nimbus/16x16/places/folder-drag-accept.png
 share/icons/nimbus/16x16/places/folder.png
@@ -515,22 +495,26 @@ share/icons/nimbus/16x16/places/gnome-fs-directory.png
 share/icons/nimbus/16x16/places/gnome-fs-home.png
 share/icons/nimbus/16x16/places/gnome-fs-network.png
 share/icons/nimbus/16x16/places/gnome-fs-server.png
+share/icons/nimbus/16x16/places/gnome-fs-share.png
+share/icons/nimbus/16x16/places/gnome-fs-trash-empty.png
 share/icons/nimbus/16x16/places/gnome-mime-x-directory-nfs-server.png
 share/icons/nimbus/16x16/places/gnome-mime-x-directory-smb-server.png
 share/icons/nimbus/16x16/places/gnome-mime-x-directory-smb-workgroup.png
+share/icons/nimbus/16x16/places/gnome-stock-trash.png
 share/icons/nimbus/16x16/places/gtk-network.png
 share/icons/nimbus/16x16/places/network-server.png
 share/icons/nimbus/16x16/places/network-workgroup.png
 share/icons/nimbus/16x16/places/network_local.png
 share/icons/nimbus/16x16/places/redhat-network-server.png
 share/icons/nimbus/16x16/places/server.png
-share/icons/nimbus/16x16/places/share.png
 share/icons/nimbus/16x16/places/stock_folder.png
+share/icons/nimbus/16x16/places/trashcan_empty.png
 share/icons/nimbus/16x16/places/user-desktop.png
 share/icons/nimbus/16x16/places/user-home.png
-share/icons/nimbus/16x16/places/user-trash_empty.png
-share/icons/nimbus/16x16/places/user-trash_full.png
+share/icons/nimbus/16x16/places/user-trash-full.png
+share/icons/nimbus/16x16/places/user-trash.png
 share/icons/nimbus/16x16/places/web.png
+share/icons/nimbus/16x16/places/xfce-trash_empty.png
 share/icons/nimbus/16x16/status/audio-volume-high.png
 share/icons/nimbus/16x16/status/audio-volume-low.png
 share/icons/nimbus/16x16/status/audio-volume-medium.png
@@ -751,6 +735,7 @@ share/icons/nimbus/192x192/mimetypes/gnome-mime-application-x-bzip.png
 share/icons/nimbus/192x192/mimetypes/gnome-mime-application-x-class-file.png
 share/icons/nimbus/192x192/mimetypes/gnome-mime-application-x-compress.png
 share/icons/nimbus/192x192/mimetypes/gnome-mime-application-x-compressed-tar.png
+share/icons/nimbus/192x192/mimetypes/gnome-mime-application-x-core.png
 share/icons/nimbus/192x192/mimetypes/gnome-mime-application-x-cpio.png
 share/icons/nimbus/192x192/mimetypes/gnome-mime-application-x-deb.png
 share/icons/nimbus/192x192/mimetypes/gnome-mime-application-x-dia-diagram.png
@@ -877,21 +862,26 @@ share/icons/nimbus/192x192/places/blockdev.png
 share/icons/nimbus/192x192/places/bookmark-missing.png
 share/icons/nimbus/192x192/places/bookmark.png
 share/icons/nimbus/192x192/places/desktop.png
+share/icons/nimbus/192x192/places/emptytrash.png
 share/icons/nimbus/192x192/places/file.png
 share/icons/nimbus/192x192/places/folder-drag-accept.png
 share/icons/nimbus/192x192/places/folder.png
 share/icons/nimbus/192x192/places/gnome-fs-desktop.png
 share/icons/nimbus/192x192/places/gnome-fs-directory.png
 share/icons/nimbus/192x192/places/gnome-fs-network.png
+share/icons/nimbus/192x192/places/gnome-fs-trash-empty.png
 share/icons/nimbus/192x192/places/gnome-mime-x-directory-smb-workgroup.png
+share/icons/nimbus/192x192/places/gnome-stock-trash.png
 share/icons/nimbus/192x192/places/gtk-network.png
 share/icons/nimbus/192x192/places/network-workgroup.png
 share/icons/nimbus/192x192/places/network_local.png
 share/icons/nimbus/192x192/places/stock_folder.png
+share/icons/nimbus/192x192/places/trashcan_empty.png
 share/icons/nimbus/192x192/places/user-desktop.png
-share/icons/nimbus/192x192/places/user-trash_empty.png
-share/icons/nimbus/192x192/places/user-trash_full.png
+share/icons/nimbus/192x192/places/user-trash-full.png
+share/icons/nimbus/192x192/places/user-trash.png
 share/icons/nimbus/192x192/places/web.png
+share/icons/nimbus/192x192/places/xfce-trash_empty.png
 share/icons/nimbus/20x20/status/dialog-apply.png
 share/icons/nimbus/20x20/status/dialog-cancel.png
 share/icons/nimbus/20x20/status/dialog-close.png
@@ -1145,6 +1135,8 @@ share/icons/nimbus/24x24/actions/zoom-best-fit.png
 share/icons/nimbus/24x24/actions/zoom-in.png
 share/icons/nimbus/24x24/actions/zoom-original.png
 share/icons/nimbus/24x24/actions/zoom-out.png
+share/icons/nimbus/24x24/animations/gnome-spinner.png
+share/icons/nimbus/24x24/animations/process-working.png
 share/icons/nimbus/24x24/apps/accessories-dictionary.png
 share/icons/nimbus/24x24/apps/accessories-text-editor.png
 share/icons/nimbus/24x24/apps/administration-login-screen-setup.png
@@ -1188,7 +1180,6 @@ share/icons/nimbus/24x24/apps/preferences-desktop-wallpaper.png
 share/icons/nimbus/24x24/apps/preferences-palmosdevices.png
 share/icons/nimbus/24x24/apps/preferences-settings-sound.png
 share/icons/nimbus/24x24/apps/preferences-system.png
-share/icons/nimbus/24x24/apps/process-working.png
 share/icons/nimbus/24x24/apps/programs.png
 share/icons/nimbus/24x24/apps/screensaver.png
 share/icons/nimbus/24x24/apps/searchtool.png
@@ -1307,6 +1298,8 @@ share/icons/nimbus/24x24/emblems/emblem-symbolic-link.png
 share/icons/nimbus/24x24/emblems/emblem-system.png
 share/icons/nimbus/24x24/emblems/stock_mail-priority-high.png
 share/icons/nimbus/24x24/mimetypes/gnome-fs-regular.icon
+share/icons/nimbus/24x24/mimetypes/gnome-mime-application-x-backup.png
+share/icons/nimbus/24x24/mimetypes/gnome-mime-application-x-core.png
 share/icons/nimbus/24x24/mimetypes/gnome-mime-x-directory-nfs-server.png
 share/icons/nimbus/24x24/mimetypes/gnome-mime-x-directory-nfs-share.png
 share/icons/nimbus/24x24/mimetypes/gnome-mime-x-directory-smb-server.png
@@ -1317,35 +1310,40 @@ share/icons/nimbus/24x24/places/blockdev.png
 share/icons/nimbus/24x24/places/bookmark-missing.png
 share/icons/nimbus/24x24/places/bookmark.png
 share/icons/nimbus/24x24/places/desktop.png
+share/icons/nimbus/24x24/places/emptytrash.png
 share/icons/nimbus/24x24/places/file.png
 share/icons/nimbus/24x24/places/folder-drag-accept.png
 share/icons/nimbus/24x24/places/folder.png
 share/icons/nimbus/24x24/places/folder_home.png
-share/icons/nimbus/24x24/places/ftp.png
 share/icons/nimbus/24x24/places/gnome-fs-desktop.png
 share/icons/nimbus/24x24/places/gnome-fs-directory.png
+share/icons/nimbus/24x24/places/gnome-fs-ftp.png
 share/icons/nimbus/24x24/places/gnome-fs-home.png
 share/icons/nimbus/24x24/places/gnome-fs-network.png
+share/icons/nimbus/24x24/places/gnome-fs-nfs.png
 share/icons/nimbus/24x24/places/gnome-fs-server.png
+share/icons/nimbus/24x24/places/gnome-fs-share.png
+share/icons/nimbus/24x24/places/gnome-fs-smb.png
+share/icons/nimbus/24x24/places/gnome-fs-ssh.png
+share/icons/nimbus/24x24/places/gnome-fs-trash-empty.png
 share/icons/nimbus/24x24/places/gnome-mime-x-directory-nfs-server.png
 share/icons/nimbus/24x24/places/gnome-mime-x-directory-smb-server.png
 share/icons/nimbus/24x24/places/gnome-mime-x-directory-smb-workgroup.png
+share/icons/nimbus/24x24/places/gnome-stock-trash.png
 share/icons/nimbus/24x24/places/gtk-network.png
 share/icons/nimbus/24x24/places/network-server.png
 share/icons/nimbus/24x24/places/network-workgroup.png
 share/icons/nimbus/24x24/places/network_local.png
-share/icons/nimbus/24x24/places/nfs.png
 share/icons/nimbus/24x24/places/redhat-network-server.png
 share/icons/nimbus/24x24/places/server.png
-share/icons/nimbus/24x24/places/share.png
-share/icons/nimbus/24x24/places/smb.png
-share/icons/nimbus/24x24/places/ssh.png
 share/icons/nimbus/24x24/places/stock_folder.png
+share/icons/nimbus/24x24/places/trashcan_empty.png
 share/icons/nimbus/24x24/places/user-desktop.png
 share/icons/nimbus/24x24/places/user-home.png
-share/icons/nimbus/24x24/places/user-trash_empty.png
-share/icons/nimbus/24x24/places/user-trash_full.png
+share/icons/nimbus/24x24/places/user-trash-full.png
+share/icons/nimbus/24x24/places/user-trash.png
 share/icons/nimbus/24x24/places/web.png
+share/icons/nimbus/24x24/places/xfce-trash_empty.png
 share/icons/nimbus/24x24/status/audio-volume-high.png
 share/icons/nimbus/24x24/status/audio-volume-low.png
 share/icons/nimbus/24x24/status/audio-volume-medium.png
@@ -1543,6 +1541,7 @@ share/icons/nimbus/32x32/mimetypes/gnome-mime-application-x-bzip.png
 share/icons/nimbus/32x32/mimetypes/gnome-mime-application-x-class-file.png
 share/icons/nimbus/32x32/mimetypes/gnome-mime-application-x-compress.png
 share/icons/nimbus/32x32/mimetypes/gnome-mime-application-x-compressed-tar.png
+share/icons/nimbus/32x32/mimetypes/gnome-mime-application-x-core.png
 share/icons/nimbus/32x32/mimetypes/gnome-mime-application-x-cpio.png
 share/icons/nimbus/32x32/mimetypes/gnome-mime-application-x-deb.png
 share/icons/nimbus/32x32/mimetypes/gnome-mime-application-x-dia-diagram.png
@@ -1672,25 +1671,32 @@ share/icons/nimbus/32x32/mimetypes/x-office-spreadsheet.png
 share/icons/nimbus/32x32/places/bookmark-missing.png
 share/icons/nimbus/32x32/places/bookmark.png
 share/icons/nimbus/32x32/places/distributor-logo.png
+share/icons/nimbus/32x32/places/emptytrash.png
 share/icons/nimbus/32x32/places/file.png
 share/icons/nimbus/32x32/places/folder-drag-accept.png
 share/icons/nimbus/32x32/places/folder.png
-share/icons/nimbus/32x32/places/ftp.png
 share/icons/nimbus/32x32/places/gnome-fs-directory.png
+share/icons/nimbus/32x32/places/gnome-fs-ftp.png
 share/icons/nimbus/32x32/places/gnome-fs-network.png
+share/icons/nimbus/32x32/places/gnome-fs-nfs.png
+share/icons/nimbus/32x32/places/gnome-fs-share.png
+share/icons/nimbus/32x32/places/gnome-fs-smb.png
+share/icons/nimbus/32x32/places/gnome-fs-ssh.png
+share/icons/nimbus/32x32/places/gnome-fs-trash-empty.png
 share/icons/nimbus/32x32/places/gnome-main-menu.png
 share/icons/nimbus/32x32/places/gnome-mime-x-directory-smb-workgroup.png
+share/icons/nimbus/32x32/places/gnome-stock-trash.png
 share/icons/nimbus/32x32/places/gtk-network.png
 share/icons/nimbus/32x32/places/network-workgroup.png
 share/icons/nimbus/32x32/places/network_local.png
-share/icons/nimbus/32x32/places/nfs.png
 share/icons/nimbus/32x32/places/novell-button.png
-share/icons/nimbus/32x32/places/share.png
-share/icons/nimbus/32x32/places/smb.png
-share/icons/nimbus/32x32/places/ssh.png
 share/icons/nimbus/32x32/places/start-here.png
 share/icons/nimbus/32x32/places/stock_folder.png
+share/icons/nimbus/32x32/places/trashcan_empty.png
+share/icons/nimbus/32x32/places/user-trash-full.png
+share/icons/nimbus/32x32/places/user-trash.png
 share/icons/nimbus/32x32/places/web.png
+share/icons/nimbus/32x32/places/xfce-trash_empty.png
 share/icons/nimbus/32x32/status/dialog-error.png
 share/icons/nimbus/32x32/status/dialog-information.png
 share/icons/nimbus/32x32/status/dialog-warning.png
@@ -1711,12 +1717,12 @@ share/icons/nimbus/36x36/actions/edit.png
 share/icons/nimbus/36x36/actions/filenew.png
 share/icons/nimbus/36x36/actions/gtk-new.png
 share/icons/nimbus/36x36/actions/stock_new-text.png
+share/icons/nimbus/36x36/animations/gnome-spinner.png
+share/icons/nimbus/36x36/animations/process-working.png
 share/icons/nimbus/36x36/apps/accessories-calculator.png
 share/icons/nimbus/36x36/apps/advanced-directory.png
 share/icons/nimbus/36x36/apps/calc.png
 share/icons/nimbus/36x36/apps/gnome-calculator.png
-share/icons/nimbus/36x36/apps/gnome-spinner-rest.png
-share/icons/nimbus/36x36/apps/gnome-spinner.png
 share/icons/nimbus/36x36/apps/kcalc.png
 share/icons/nimbus/36x36/apps/preferences-desktop-display.png
 share/icons/nimbus/36x36/apps/preferences-desktop-screen-resolution.png
@@ -1738,33 +1744,42 @@ share/icons/nimbus/36x36/devices/stock_printers.png
 share/icons/nimbus/36x36/devices/xfce-printer.png
 share/icons/nimbus/36x36/devices/yast_printer.png
 share/icons/nimbus/36x36/mimetypes/gnome-fs-regular.icon
+share/icons/nimbus/36x36/mimetypes/gnome-mime-application-x-backup.png
+share/icons/nimbus/36x36/mimetypes/gnome-mime-application-x-core.png
 share/icons/nimbus/36x36/mimetypes/gnome-mime-x-directory-nfs-server.png
 share/icons/nimbus/36x36/mimetypes/gnome-mime-x-directory-nfs-share.png
 share/icons/nimbus/36x36/mimetypes/gnome-mime-x-directory-smb-server.png
 share/icons/nimbus/36x36/mimetypes/gnome-mime-x-directory-smb-share.png
 share/icons/nimbus/36x36/mimetypes/stock_generic-mimetype.png
 share/icons/nimbus/36x36/places/desktop.png
+share/icons/nimbus/36x36/places/emptytrash.png
 share/icons/nimbus/36x36/places/file.png
 share/icons/nimbus/36x36/places/folder-drag-accept.png
 share/icons/nimbus/36x36/places/folder.png
 share/icons/nimbus/36x36/places/folder_home.png
-share/icons/nimbus/36x36/places/ftp.png
 share/icons/nimbus/36x36/places/gnome-fs-desktop.png
 share/icons/nimbus/36x36/places/gnome-fs-directory.png
+share/icons/nimbus/36x36/places/gnome-fs-ftp.png
 share/icons/nimbus/36x36/places/gnome-fs-home.png
+share/icons/nimbus/36x36/places/gnome-fs-nfs.png
 share/icons/nimbus/36x36/places/gnome-fs-server.png
+share/icons/nimbus/36x36/places/gnome-fs-share.png
+share/icons/nimbus/36x36/places/gnome-fs-smb.png
+share/icons/nimbus/36x36/places/gnome-fs-ssh.png
+share/icons/nimbus/36x36/places/gnome-fs-trash-empty.png
 share/icons/nimbus/36x36/places/gnome-mime-x-directory-nfs-server.png
 share/icons/nimbus/36x36/places/gnome-mime-x-directory-smb-server.png
+share/icons/nimbus/36x36/places/gnome-stock-trash.png
 share/icons/nimbus/36x36/places/network-server.png
-share/icons/nimbus/36x36/places/nfs.png
 share/icons/nimbus/36x36/places/redhat-network-server.png
 share/icons/nimbus/36x36/places/server.png
-share/icons/nimbus/36x36/places/share.png
-share/icons/nimbus/36x36/places/smb.png
-share/icons/nimbus/36x36/places/ssh.png
 share/icons/nimbus/36x36/places/stock_folder.png
+share/icons/nimbus/36x36/places/trashcan_empty.png
 share/icons/nimbus/36x36/places/user-desktop.png
 share/icons/nimbus/36x36/places/user-home.png
+share/icons/nimbus/36x36/places/user-trash-full.png
+share/icons/nimbus/36x36/places/user-trash.png
+share/icons/nimbus/36x36/places/xfce-trash_empty.png
 share/icons/nimbus/48x48/actions/document-print.png
 share/icons/nimbus/48x48/actions/edit.png
 share/icons/nimbus/48x48/actions/fileprint.png
@@ -1778,6 +1793,8 @@ share/icons/nimbus/48x48/actions/preferences.png
 share/icons/nimbus/48x48/actions/redhat-home.png
 share/icons/nimbus/48x48/actions/stock_home.png
 share/icons/nimbus/48x48/actions/stock_print.png
+share/icons/nimbus/48x48/animations/gnome-spinner.png
+share/icons/nimbus/48x48/animations/process-working.png
 share/icons/nimbus/48x48/apps/accessories-archive-manager.png
 share/icons/nimbus/48x48/apps/accessories-calculator.png
 share/icons/nimbus/48x48/apps/accessories-character-map.png
@@ -2023,6 +2040,7 @@ share/icons/nimbus/48x48/mimetypes/gnome-mime-application-x-bzip.png
 share/icons/nimbus/48x48/mimetypes/gnome-mime-application-x-class-file.png
 share/icons/nimbus/48x48/mimetypes/gnome-mime-application-x-compress.png
 share/icons/nimbus/48x48/mimetypes/gnome-mime-application-x-compressed-tar.png
+share/icons/nimbus/48x48/mimetypes/gnome-mime-application-x-core.png
 share/icons/nimbus/48x48/mimetypes/gnome-mime-application-x-cpio.png
 share/icons/nimbus/48x48/mimetypes/gnome-mime-application-x-deb.png
 share/icons/nimbus/48x48/mimetypes/gnome-mime-application-x-dia-diagram.png
@@ -2157,35 +2175,40 @@ share/icons/nimbus/48x48/places/blockdev.png
 share/icons/nimbus/48x48/places/bookmark-missing.png
 share/icons/nimbus/48x48/places/bookmark.png
 share/icons/nimbus/48x48/places/desktop.png
+share/icons/nimbus/48x48/places/emptytrash.png
 share/icons/nimbus/48x48/places/file.png
 share/icons/nimbus/48x48/places/folder-drag-accept.png
 share/icons/nimbus/48x48/places/folder.png
 share/icons/nimbus/48x48/places/folder_home.png
-share/icons/nimbus/48x48/places/ftp.png
 share/icons/nimbus/48x48/places/gnome-fs-desktop.png
 share/icons/nimbus/48x48/places/gnome-fs-directory.png
+share/icons/nimbus/48x48/places/gnome-fs-ftp.png
 share/icons/nimbus/48x48/places/gnome-fs-home.png
 share/icons/nimbus/48x48/places/gnome-fs-network.png
+share/icons/nimbus/48x48/places/gnome-fs-nfs.png
 share/icons/nimbus/48x48/places/gnome-fs-server.png
+share/icons/nimbus/48x48/places/gnome-fs-share.png
+share/icons/nimbus/48x48/places/gnome-fs-smb.png
+share/icons/nimbus/48x48/places/gnome-fs-ssh.png
+share/icons/nimbus/48x48/places/gnome-fs-trash-empty.png
 share/icons/nimbus/48x48/places/gnome-mime-x-directory-nfs-server.png
 share/icons/nimbus/48x48/places/gnome-mime-x-directory-smb-server.png
 share/icons/nimbus/48x48/places/gnome-mime-x-directory-smb-workgroup.png
+share/icons/nimbus/48x48/places/gnome-stock-trash.png
 share/icons/nimbus/48x48/places/gtk-network.png
 share/icons/nimbus/48x48/places/network-server.png
 share/icons/nimbus/48x48/places/network-workgroup.png
 share/icons/nimbus/48x48/places/network_local.png
-share/icons/nimbus/48x48/places/nfs.png
 share/icons/nimbus/48x48/places/redhat-network-server.png
 share/icons/nimbus/48x48/places/server.png
-share/icons/nimbus/48x48/places/share.png
-share/icons/nimbus/48x48/places/smb.png
-share/icons/nimbus/48x48/places/ssh.png
 share/icons/nimbus/48x48/places/stock_folder.png
+share/icons/nimbus/48x48/places/trashcan_empty.png
 share/icons/nimbus/48x48/places/user-desktop.png
 share/icons/nimbus/48x48/places/user-home.png
-share/icons/nimbus/48x48/places/user-trash_empty.png
-share/icons/nimbus/48x48/places/user-trash_full.png
+share/icons/nimbus/48x48/places/user-trash-full.png
+share/icons/nimbus/48x48/places/user-trash.png
 share/icons/nimbus/48x48/places/web.png
+share/icons/nimbus/48x48/places/xfce-trash_empty.png
 share/icons/nimbus/48x48/status/audio-volume-high.png
 share/icons/nimbus/48x48/status/audio-volume-low.png
 share/icons/nimbus/48x48/status/audio-volume-medium.png
@@ -2268,6 +2291,7 @@ share/icons/nimbus/72x72/mimetypes/gnome-mime-application-x-bzip.png
 share/icons/nimbus/72x72/mimetypes/gnome-mime-application-x-class-file.png
 share/icons/nimbus/72x72/mimetypes/gnome-mime-application-x-compress.png
 share/icons/nimbus/72x72/mimetypes/gnome-mime-application-x-compressed-tar.png
+share/icons/nimbus/72x72/mimetypes/gnome-mime-application-x-core.png
 share/icons/nimbus/72x72/mimetypes/gnome-mime-application-x-cpio.png
 share/icons/nimbus/72x72/mimetypes/gnome-mime-application-x-deb.png
 share/icons/nimbus/72x72/mimetypes/gnome-mime-application-x-dvi.png
@@ -2390,30 +2414,37 @@ share/icons/nimbus/72x72/mimetypes/x-office-document.png
 share/icons/nimbus/72x72/mimetypes/x-office-presentation.png
 share/icons/nimbus/72x72/mimetypes/x-office-spreadsheet.png
 share/icons/nimbus/72x72/places/desktop.png
+share/icons/nimbus/72x72/places/emptytrash.png
 share/icons/nimbus/72x72/places/file.png
 share/icons/nimbus/72x72/places/folder-drag-accept.png
 share/icons/nimbus/72x72/places/folder.png
-share/icons/nimbus/72x72/places/ftp.png
 share/icons/nimbus/72x72/places/gnome-fs-desktop.png
 share/icons/nimbus/72x72/places/gnome-fs-directory.png
+share/icons/nimbus/72x72/places/gnome-fs-ftp.png
 share/icons/nimbus/72x72/places/gnome-fs-network.png
+share/icons/nimbus/72x72/places/gnome-fs-nfs.png
 share/icons/nimbus/72x72/places/gnome-fs-server.png
+share/icons/nimbus/72x72/places/gnome-fs-share.png
+share/icons/nimbus/72x72/places/gnome-fs-smb.png
+share/icons/nimbus/72x72/places/gnome-fs-ssh.png
+share/icons/nimbus/72x72/places/gnome-fs-trash-empty.png
 share/icons/nimbus/72x72/places/gnome-mime-x-directory-nfs-server.png
 share/icons/nimbus/72x72/places/gnome-mime-x-directory-smb-server.png
 share/icons/nimbus/72x72/places/gnome-mime-x-directory-smb-workgroup.png
+share/icons/nimbus/72x72/places/gnome-stock-trash.png
 share/icons/nimbus/72x72/places/gtk-network.png
 share/icons/nimbus/72x72/places/network-server.png
 share/icons/nimbus/72x72/places/network-workgroup.png
 share/icons/nimbus/72x72/places/network_local.png
-share/icons/nimbus/72x72/places/nfs.png
 share/icons/nimbus/72x72/places/redhat-network-server.png
 share/icons/nimbus/72x72/places/server.png
-share/icons/nimbus/72x72/places/share.png
-share/icons/nimbus/72x72/places/smb.png
-share/icons/nimbus/72x72/places/ssh.png
 share/icons/nimbus/72x72/places/stock_folder.png
+share/icons/nimbus/72x72/places/trashcan_empty.png
 share/icons/nimbus/72x72/places/user-desktop.png
+share/icons/nimbus/72x72/places/user-trash-full.png
+share/icons/nimbus/72x72/places/user-trash.png
 share/icons/nimbus/72x72/places/web.png
+share/icons/nimbus/72x72/places/xfce-trash_empty.png
 share/icons/nimbus/96x96/apps/administration-login-screen-setup.png
 share/icons/nimbus/96x96/apps/administration-network-configuration.png
 share/icons/nimbus/96x96/apps/administration-printers.png
@@ -2535,6 +2566,7 @@ share/icons/nimbus/96x96/mimetypes/gnome-mime-application-x-bzip.png
 share/icons/nimbus/96x96/mimetypes/gnome-mime-application-x-class-file.png
 share/icons/nimbus/96x96/mimetypes/gnome-mime-application-x-compress.png
 share/icons/nimbus/96x96/mimetypes/gnome-mime-application-x-compressed-tar.png
+share/icons/nimbus/96x96/mimetypes/gnome-mime-application-x-core.png
 share/icons/nimbus/96x96/mimetypes/gnome-mime-application-x-cpio.png
 share/icons/nimbus/96x96/mimetypes/gnome-mime-application-x-deb.png
 share/icons/nimbus/96x96/mimetypes/gnome-mime-application-x-dia-diagram.png
@@ -2665,33 +2697,40 @@ share/icons/nimbus/96x96/places/blockdev.png
 share/icons/nimbus/96x96/places/bookmark-missing.png
 share/icons/nimbus/96x96/places/bookmark.png
 share/icons/nimbus/96x96/places/desktop.png
+share/icons/nimbus/96x96/places/emptytrash.png
 share/icons/nimbus/96x96/places/file.png
 share/icons/nimbus/96x96/places/folder-drag-accept.png
 share/icons/nimbus/96x96/places/folder.png
 share/icons/nimbus/96x96/places/folder_home.png
-share/icons/nimbus/96x96/places/ftp.png
 share/icons/nimbus/96x96/places/gnome-fs-desktop.png
 share/icons/nimbus/96x96/places/gnome-fs-directory.png
+share/icons/nimbus/96x96/places/gnome-fs-ftp.png
 share/icons/nimbus/96x96/places/gnome-fs-home.png
 share/icons/nimbus/96x96/places/gnome-fs-network.png
+share/icons/nimbus/96x96/places/gnome-fs-nfs.png
 share/icons/nimbus/96x96/places/gnome-fs-server.png
+share/icons/nimbus/96x96/places/gnome-fs-share.png
+share/icons/nimbus/96x96/places/gnome-fs-smb.png
+share/icons/nimbus/96x96/places/gnome-fs-ssh.png
+share/icons/nimbus/96x96/places/gnome-fs-trash-empty.png
 share/icons/nimbus/96x96/places/gnome-mime-x-directory-nfs-server.png
 share/icons/nimbus/96x96/places/gnome-mime-x-directory-smb-server.png
 share/icons/nimbus/96x96/places/gnome-mime-x-directory-smb-workgroup.png
+share/icons/nimbus/96x96/places/gnome-stock-trash.png
 share/icons/nimbus/96x96/places/gtk-network.png
 share/icons/nimbus/96x96/places/network-server.png
 share/icons/nimbus/96x96/places/network-workgroup.png
 share/icons/nimbus/96x96/places/network_local.png
-share/icons/nimbus/96x96/places/nfs.png
 share/icons/nimbus/96x96/places/redhat-network-server.png
 share/icons/nimbus/96x96/places/server.png
-share/icons/nimbus/96x96/places/share.png
-share/icons/nimbus/96x96/places/smb.png
-share/icons/nimbus/96x96/places/ssh.png
 share/icons/nimbus/96x96/places/stock_folder.png
+share/icons/nimbus/96x96/places/trashcan_empty.png
 share/icons/nimbus/96x96/places/user-desktop.png
 share/icons/nimbus/96x96/places/user-home.png
+share/icons/nimbus/96x96/places/user-trash-full.png
+share/icons/nimbus/96x96/places/user-trash.png
 share/icons/nimbus/96x96/places/web.png
+share/icons/nimbus/96x96/places/xfce-trash_empty.png
 share/icons/nimbus/index.theme
 share/themes/nimbus/gtk-2.0/about.png
 share/themes/nimbus/gtk-2.0/add.png
@@ -2792,6 +2831,28 @@ share/themes/nimbus/gtk-2.0/zoom-in.png
 share/themes/nimbus/gtk-2.0/zoom-original.png
 share/themes/nimbus/gtk-2.0/zoom-out.png
 share/themes/nimbus/index.theme
+share/themes/nimbus/metacity-1/button-close-icon-prelight.png
+share/themes/nimbus/metacity-1/button-close-icon-pressed.png
+share/themes/nimbus/metacity-1/button-close-icon-unfocused.png
+share/themes/nimbus/metacity-1/button-close-icon.png
+share/themes/nimbus/metacity-1/button-max-icon-prelight.png
+share/themes/nimbus/metacity-1/button-max-icon-pressed.png
+share/themes/nimbus/metacity-1/button-max-icon-unfocused.png
+share/themes/nimbus/metacity-1/button-max-icon.png
+share/themes/nimbus/metacity-1/button-menu-icon-prelight.png
+share/themes/nimbus/metacity-1/button-menu-icon-pressed.png
+share/themes/nimbus/metacity-1/button-menu-icon-unfocused.png
+share/themes/nimbus/metacity-1/button-menu-icon.png
+share/themes/nimbus/metacity-1/button-min-icon-prelight.png
+share/themes/nimbus/metacity-1/button-min-icon-pressed.png
+share/themes/nimbus/metacity-1/button-min-icon-unfocused.png
+share/themes/nimbus/metacity-1/button-min-icon.png
+share/themes/nimbus/metacity-1/button-unmax-icon-prelight.png
+share/themes/nimbus/metacity-1/button-unmax-icon-pressed.png
+share/themes/nimbus/metacity-1/button-unmax-icon-unfocused.png
+share/themes/nimbus/metacity-1/button-unmax-icon.png
+share/themes/nimbus/metacity-1/metacity-theme-1.xml
+@dirrm share/themes/nimbus/metacity-1
 @dirrm share/themes/nimbus/gtk-2.0
 @dirrm share/themes/nimbus
 @dirrm share/icons/nimbus/96x96/places
@@ -2812,6 +2873,7 @@ share/themes/nimbus/index.theme
 @dirrm share/icons/nimbus/48x48/devices
 @dirrm share/icons/nimbus/48x48/categories
 @dirrm share/icons/nimbus/48x48/apps
+@dirrm share/icons/nimbus/48x48/animations
 @dirrm share/icons/nimbus/48x48/actions
 @dirrm share/icons/nimbus/48x48
 @dirrm share/icons/nimbus/36x36/places
@@ -2819,6 +2881,7 @@ share/themes/nimbus/index.theme
 @dirrm share/icons/nimbus/36x36/devices
 @dirrm share/icons/nimbus/36x36/categories
 @dirrm share/icons/nimbus/36x36/apps
+@dirrm share/icons/nimbus/36x36/animations
 @dirrm share/icons/nimbus/36x36/actions
 @dirrm share/icons/nimbus/36x36
 @dirrm share/icons/nimbus/32x32/status
@@ -2837,6 +2900,7 @@ share/themes/nimbus/index.theme
 @dirrm share/icons/nimbus/24x24/devices
 @dirrm share/icons/nimbus/24x24/categories
 @dirrm share/icons/nimbus/24x24/apps
+@dirrm share/icons/nimbus/24x24/animations
 @dirrm share/icons/nimbus/24x24/actions
 @dirrm share/icons/nimbus/24x24
 @dirrm share/icons/nimbus/20x20/status
@@ -2861,6 +2925,3 @@ share/themes/nimbus/index.theme
 @dirrm share/icons/nimbus/12x12/actions
 @dirrm share/icons/nimbus/12x12
 @dirrm share/icons/nimbus
-@dirrm share/gnome/themes/nimbus/metacity-1
-@dirrm share/gnome/themes/nimbus
-@dirrmtry lib/locale
diff --git a/x11-themes/ubuntulooks/Makefile b/x11-themes/ubuntulooks/Makefile
index 39617a82a72a..7da07165d514 100644
--- a/x11-themes/ubuntulooks/Makefile
+++ b/x11-themes/ubuntulooks/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ubuntulooks
 PORTVERSION=	0.9.12
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-themes
 MASTER_SITES=	http://archive.ubuntu.com/ubuntu/pool/main/u/ubuntulooks/
 DISTNAME=	${PORTNAME}_${PORTVERSION}.orig
diff --git a/x11-themes/ubuntulooks/files/patch-gtkrc b/x11-themes/ubuntulooks/files/patch-gtkrc
index 5d650376ae9e..ddb5b4b7f932 100644
--- a/x11-themes/ubuntulooks/files/patch-gtkrc
+++ b/x11-themes/ubuntulooks/files/patch-gtkrc
@@ -1,5 +1,5 @@
---- themes/Human/gtk-2.0/gtkrc.orig	Fri Jun  8 00:06:54 2007
-+++ themes/Human/gtk-2.0/gtkrc	Fri Jun  8 00:07:19 2007
+--- themes/Human/gtk-2.0/gtkrc.orig
++++ themes/Human/gtk-2.0/gtkrc
 @@ -7,6 +7,7 @@
  #
  # Feel free to modify and share!
@@ -8,3 +8,11 @@
  
  style "clearlooks-default"
  {
+@@ -219,6 +220,7 @@
+ # tooltips stuff
+ widget_class "*.tooltips.*.GtkToggleButton" style "clearlooks-tasklist"
+ widget "gtk-tooltips" style "clearlooks-tooltips"
++widget "gtk-tooltip" style "clearlooks-tooltips"
+ 
+ # treeview stuff
+ widget_class "*.GtkTreeView.GtkButton" style "clearlooks-tree"
diff --git a/x11-themes/ubuntulooks/pkg-plist b/x11-themes/ubuntulooks/pkg-plist
index c41da6283b82..39077b01b384 100644
--- a/x11-themes/ubuntulooks/pkg-plist
+++ b/x11-themes/ubuntulooks/pkg-plist
@@ -3,3 +3,4 @@ lib/gtk-2.0/%%GTK2_VERSION%%/engines/libubuntulooks.la
 share/themes/Human/gtk-2.0/gtkrc
 @dirrm share/themes/Human/gtk-2.0
 @dirrm share/themes/Human
+@dirrmtry share/themes
diff --git a/x11-toolkits/Makefile b/x11-toolkits/Makefile
index dd6d82b2d04f..d0303fce74d4 100644
--- a/x11-toolkits/Makefile
+++ b/x11-toolkits/Makefile
@@ -81,6 +81,8 @@
     SUBDIR += gtksourceview
     SUBDIR += gtksourceview-reference
     SUBDIR += gtksourceview-sharp
+    SUBDIR += gtksourceview2
+    SUBDIR += gtksourceview2-reference
     SUBDIR += gtkunique
     SUBDIR += gtoolkit
     SUBDIR += guile-gnome
@@ -193,6 +195,7 @@
     SUBDIR += py-gtkextra
     SUBDIR += py-gtkglext
     SUBDIR += py-gtkscintilla
+    SUBDIR += py-gtksourceview
     SUBDIR += py-gui
     SUBDIR += py-kde
     SUBDIR += py-kiwi
diff --git a/x11-toolkits/eel/Makefile b/x11-toolkits/eel/Makefile
index 3fc6812d74ba..41f8f44c5f63 100644
--- a/x11-toolkits/eel/Makefile
+++ b/x11-toolkits/eel/Makefile
@@ -3,11 +3,11 @@
 # Whom:                 		Ade Lovett <ade@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/x11-toolkits/eel/Makefile,v 1.51 2007/03/12 15:59:00 ahze Exp $
+#   $MCom: ports/x11-toolkits/eel/Makefile,v 1.60 2007/09/18 14:12:45 ahze Exp $
 #
 
 PORTNAME=	eel
-PORTVERSION=	2.18.3
+PORTVERSION=	2.20.0
 CATEGORIES=	x11-toolkits gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/x11-toolkits/eel/distinfo b/x11-toolkits/eel/distinfo
index e0ec62e7ef0b..24738bf2d84b 100644
--- a/x11-toolkits/eel/distinfo
+++ b/x11-toolkits/eel/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/eel-2.18.3.tar.bz2) = c51fea61eb99eaa7995754b8acf787ff
-SHA256 (gnome2/eel-2.18.3.tar.bz2) = ff84e4947638fa24e02aebb2d12d1f29c045e3a5384fbc346919a1558a016b6f
-SIZE (gnome2/eel-2.18.3.tar.bz2) = 643862
+MD5 (gnome2/eel-2.20.0.tar.bz2) = 691734dc1078e05e726b4f5b8646dadf
+SHA256 (gnome2/eel-2.20.0.tar.bz2) = ba35db646ce069ee66a92fa95d10aff583e00e6039b1b5bb0fa6036742fddd70
+SIZE (gnome2/eel-2.20.0.tar.bz2) = 647919
diff --git a/x11-toolkits/eel/pkg-plist b/x11-toolkits/eel/pkg-plist
index cdffed51de80..fac1807dce3c 100644
--- a/x11-toolkits/eel/pkg-plist
+++ b/x11-toolkits/eel/pkg-plist
@@ -100,6 +100,7 @@ share/locale/nb/LC_MESSAGES/eel-2.0.mo
 share/locale/ne/LC_MESSAGES/eel-2.0.mo
 share/locale/nl/LC_MESSAGES/eel-2.0.mo
 share/locale/nn/LC_MESSAGES/eel-2.0.mo
+share/locale/oc/LC_MESSAGES/eel-2.0.mo
 share/locale/or/LC_MESSAGES/eel-2.0.mo
 share/locale/pa/LC_MESSAGES/eel-2.0.mo
 share/locale/pl/LC_MESSAGES/eel-2.0.mo
@@ -108,6 +109,7 @@ share/locale/pt_BR/LC_MESSAGES/eel-2.0.mo
 share/locale/ro/LC_MESSAGES/eel-2.0.mo
 share/locale/ru/LC_MESSAGES/eel-2.0.mo
 share/locale/rw/LC_MESSAGES/eel-2.0.mo
+share/locale/si/LC_MESSAGES/eel-2.0.mo
 share/locale/sk/LC_MESSAGES/eel-2.0.mo
 share/locale/sl/LC_MESSAGES/eel-2.0.mo
 share/locale/sq/LC_MESSAGES/eel-2.0.mo
@@ -133,8 +135,12 @@ share/locale/zh_TW/LC_MESSAGES/eel-2.0.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/mr/LC_MESSAGES
 @dirrmtry share/locale/mr
 @dirrmtry share/locale/ky/LC_MESSAGES
diff --git a/x11-toolkits/gal/Makefile b/x11-toolkits/gal/Makefile
index 82f0f6d4ef80..e97e654c05ec 100644
--- a/x11-toolkits/gal/Makefile
+++ b/x11-toolkits/gal/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gal
 PORTVERSION=	0.24
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES?=	x11-toolkits gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/0.24
diff --git a/x11-toolkits/gal/pkg-plist b/x11-toolkits/gal/pkg-plist
index 69860b6edeb3..b46b4d3bafb0 100644
--- a/x11-toolkits/gal/pkg-plist
+++ b/x11-toolkits/gal/pkg-plist
@@ -149,33 +149,33 @@ libdata/pkgconfig/gal.pc
 %%DOCSDIR%%/gal.hierarchy
 %%DOCSDIR%%/gal.signals
 %%DOCSDIR%%/gal.types
-share/gnome/etable/%%VERSION%%/glade/e-table-config-no-group.glade
-share/gnome/etable/%%VERSION%%/glade/e-table-config.glade
-share/gnome/etable/%%VERSION%%/glade/e-table-field-chooser.glade
-share/gnome/etable/%%VERSION%%/glade/e-table-group.glade
-share/gnome/gal/%%VERSION%%/glade/e-categories-master-list-dialog.glade
-share/gnome/gal/%%VERSION%%/glade/gal-categories.glade
-share/gnome/gal/%%VERSION%%/glade/gal-define-views.glade
-share/gnome/gal/%%VERSION%%/glade/gal-view-instance-save-as-dialog.glade
-share/gnome/gal/%%VERSION%%/glade/gal-view-new-dialog.glade
-share/gnome/gal/%%VERSION%%/pixmaps/categories/category_birthday_16.png
-share/gnome/gal/%%VERSION%%/pixmaps/categories/category_business_16.png
-share/gnome/gal/%%VERSION%%/pixmaps/categories/category_favorites_16.png
-share/gnome/gal/%%VERSION%%/pixmaps/categories/category_gifts_16.png
-share/gnome/gal/%%VERSION%%/pixmaps/categories/category_goals_16.png
-share/gnome/gal/%%VERSION%%/pixmaps/categories/category_holiday-cards_16.png
-share/gnome/gal/%%VERSION%%/pixmaps/categories/category_holiday_16.png
-share/gnome/gal/%%VERSION%%/pixmaps/categories/category_hot-contacts_16.png
-share/gnome/gal/%%VERSION%%/pixmaps/categories/category_ideas_16.png
-share/gnome/gal/%%VERSION%%/pixmaps/categories/category_international_16.png
-share/gnome/gal/%%VERSION%%/pixmaps/categories/category_key-customer_16.png
-share/gnome/gal/%%VERSION%%/pixmaps/categories/category_miscellaneous_16.png
-share/gnome/gal/%%VERSION%%/pixmaps/categories/category_personal_16.png
-share/gnome/gal/%%VERSION%%/pixmaps/categories/category_phonecalls_16.png
-share/gnome/gal/%%VERSION%%/pixmaps/categories/category_status_16.png
-share/gnome/gal/%%VERSION%%/pixmaps/categories/category_strategies_16.png
-share/gnome/gal/%%VERSION%%/pixmaps/categories/category_suppliers_16.png
-share/gnome/gal/%%VERSION%%/pixmaps/categories/category_time-and-expenses_16.png
+share/etable/%%VERSION%%/glade/e-table-config-no-group.glade
+share/etable/%%VERSION%%/glade/e-table-config.glade
+share/etable/%%VERSION%%/glade/e-table-field-chooser.glade
+share/etable/%%VERSION%%/glade/e-table-group.glade
+%%DATADIR%%/%%VERSION%%/glade/e-categories-master-list-dialog.glade
+%%DATADIR%%/%%VERSION%%/glade/gal-categories.glade
+%%DATADIR%%/%%VERSION%%/glade/gal-define-views.glade
+%%DATADIR%%/%%VERSION%%/glade/gal-view-instance-save-as-dialog.glade
+%%DATADIR%%/%%VERSION%%/glade/gal-view-new-dialog.glade
+%%DATADIR%%/%%VERSION%%/pixmaps/categories/category_birthday_16.png
+%%DATADIR%%/%%VERSION%%/pixmaps/categories/category_business_16.png
+%%DATADIR%%/%%VERSION%%/pixmaps/categories/category_favorites_16.png
+%%DATADIR%%/%%VERSION%%/pixmaps/categories/category_gifts_16.png
+%%DATADIR%%/%%VERSION%%/pixmaps/categories/category_goals_16.png
+%%DATADIR%%/%%VERSION%%/pixmaps/categories/category_holiday-cards_16.png
+%%DATADIR%%/%%VERSION%%/pixmaps/categories/category_holiday_16.png
+%%DATADIR%%/%%VERSION%%/pixmaps/categories/category_hot-contacts_16.png
+%%DATADIR%%/%%VERSION%%/pixmaps/categories/category_ideas_16.png
+%%DATADIR%%/%%VERSION%%/pixmaps/categories/category_international_16.png
+%%DATADIR%%/%%VERSION%%/pixmaps/categories/category_key-customer_16.png
+%%DATADIR%%/%%VERSION%%/pixmaps/categories/category_miscellaneous_16.png
+%%DATADIR%%/%%VERSION%%/pixmaps/categories/category_personal_16.png
+%%DATADIR%%/%%VERSION%%/pixmaps/categories/category_phonecalls_16.png
+%%DATADIR%%/%%VERSION%%/pixmaps/categories/category_status_16.png
+%%DATADIR%%/%%VERSION%%/pixmaps/categories/category_strategies_16.png
+%%DATADIR%%/%%VERSION%%/pixmaps/categories/category_suppliers_16.png
+%%DATADIR%%/%%VERSION%%/pixmaps/categories/category_time-and-expenses_16.png
 share/locale/az/LC_MESSAGES/gal-%%VERSION%%.mo
 share/locale/ca/LC_MESSAGES/gal-%%VERSION%%.mo
 share/locale/cs/LC_MESSAGES/gal-%%VERSION%%.mo
@@ -208,14 +208,14 @@ share/locale/tr/LC_MESSAGES/gal-%%VERSION%%.mo
 share/locale/uk/LC_MESSAGES/gal-%%VERSION%%.mo
 share/locale/zh_CN/LC_MESSAGES/gal-%%VERSION%%.mo
 share/locale/zh_TW/LC_MESSAGES/gal-%%VERSION%%.mo
-@dirrm share/gnome/gal/%%VERSION%%/pixmaps/categories
-@dirrm share/gnome/gal/%%VERSION%%/pixmaps
-@dirrm share/gnome/gal/%%VERSION%%/glade
-@dirrm share/gnome/gal/%%VERSION%%
-@dirrm share/gnome/gal
-@dirrm share/gnome/etable/%%VERSION%%/glade
-@dirrm share/gnome/etable/%%VERSION%%
-@dirrm share/gnome/etable
+@dirrm %%DATADIR%%/%%VERSION%%/pixmaps/categories
+@dirrm %%DATADIR%%/%%VERSION%%/pixmaps
+@dirrm %%DATADIR%%/%%VERSION%%/glade
+@dirrm %%DATADIR%%/%%VERSION%%
+@dirrm %%DATADIR%%
+@dirrm share/etable/%%VERSION%%/glade
+@dirrm share/etable/%%VERSION%%
+@dirrm share/etable
 @dirrm %%DOCSDIR%%/gal
 @dirrm %%DOCSDIR%%
 @dirrm include/gal-1.0/gal/widgets
diff --git a/x11-toolkits/gal2/Makefile b/x11-toolkits/gal2/Makefile
index f865d412d9c8..135a82205632 100644
--- a/x11-toolkits/gal2/Makefile
+++ b/x11-toolkits/gal2/Makefile
@@ -3,12 +3,12 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/x11-toolkits/gal2/Makefile,v 1.52 2005/08/19 13:26:41 marcus Exp $
+#   $MCom: ports/x11-toolkits/gal2/Makefile,v 1.54 2007/05/23 14:37:18 ahze Exp $
 #
 
 PORTNAME=	gal2
 PORTVERSION=	2.5.3
-PORTREVISION?=	3
+PORTREVISION?=	4
 CATEGORIES=	x11-toolkits gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/2.5
diff --git a/x11-toolkits/gal2/pkg-plist b/x11-toolkits/gal2/pkg-plist
index ee4b7e591fd4..77571357565d 100644
--- a/x11-toolkits/gal2/pkg-plist
+++ b/x11-toolkits/gal2/pkg-plist
@@ -158,32 +158,32 @@ lib/libgal-a11y-%%SHLIBVERSION%%.la
 lib/libgal-a11y-%%SHLIBVERSION%%.so
 lib/libgal-a11y-%%SHLIBVERSION%%.so.0
 libdata/pkgconfig/gal-%%VERSION%%.pc
-share/gnome/gal-%%VERSION%%/%%PORTVERSION%%/glade/e-categories-master-list-dialog.glade
-share/gnome/gal-%%VERSION%%/%%PORTVERSION%%/glade/e-table-config-no-group.glade
-share/gnome/gal-%%VERSION%%/%%PORTVERSION%%/glade/e-table-config.glade
-share/gnome/gal-%%VERSION%%/%%PORTVERSION%%/glade/e-table-field-chooser.glade
-share/gnome/gal-%%VERSION%%/%%PORTVERSION%%/glade/gal-categories.glade
-share/gnome/gal-%%VERSION%%/%%PORTVERSION%%/glade/gal-define-views.glade
-share/gnome/gal-%%VERSION%%/%%PORTVERSION%%/glade/gal-view-instance-save-as-dialog.glade
-share/gnome/gal-%%VERSION%%/%%PORTVERSION%%/glade/gal-view-new-dialog.glade
-share/gnome/gal-%%VERSION%%/%%PORTVERSION%%/pixmaps/categories/category_birthday_16.png
-share/gnome/gal-%%VERSION%%/%%PORTVERSION%%/pixmaps/categories/category_business_16.png
-share/gnome/gal-%%VERSION%%/%%PORTVERSION%%/pixmaps/categories/category_favorites_16.png
-share/gnome/gal-%%VERSION%%/%%PORTVERSION%%/pixmaps/categories/category_gifts_16.png
-share/gnome/gal-%%VERSION%%/%%PORTVERSION%%/pixmaps/categories/category_goals_16.png
-share/gnome/gal-%%VERSION%%/%%PORTVERSION%%/pixmaps/categories/category_holiday-cards_16.png
-share/gnome/gal-%%VERSION%%/%%PORTVERSION%%/pixmaps/categories/category_holiday_16.png
-share/gnome/gal-%%VERSION%%/%%PORTVERSION%%/pixmaps/categories/category_hot-contacts_16.png
-share/gnome/gal-%%VERSION%%/%%PORTVERSION%%/pixmaps/categories/category_ideas_16.png
-share/gnome/gal-%%VERSION%%/%%PORTVERSION%%/pixmaps/categories/category_international_16.png
-share/gnome/gal-%%VERSION%%/%%PORTVERSION%%/pixmaps/categories/category_key-customer_16.png
-share/gnome/gal-%%VERSION%%/%%PORTVERSION%%/pixmaps/categories/category_miscellaneous_16.png
-share/gnome/gal-%%VERSION%%/%%PORTVERSION%%/pixmaps/categories/category_personal_16.png
-share/gnome/gal-%%VERSION%%/%%PORTVERSION%%/pixmaps/categories/category_phonecalls_16.png
-share/gnome/gal-%%VERSION%%/%%PORTVERSION%%/pixmaps/categories/category_status_16.png
-share/gnome/gal-%%VERSION%%/%%PORTVERSION%%/pixmaps/categories/category_strategies_16.png
-share/gnome/gal-%%VERSION%%/%%PORTVERSION%%/pixmaps/categories/category_suppliers_16.png
-share/gnome/gal-%%VERSION%%/%%PORTVERSION%%/pixmaps/categories/category_time-and-expenses_16.png
+share/gal-%%VERSION%%/%%PORTVERSION%%/glade/e-categories-master-list-dialog.glade
+share/gal-%%VERSION%%/%%PORTVERSION%%/glade/e-table-config-no-group.glade
+share/gal-%%VERSION%%/%%PORTVERSION%%/glade/e-table-config.glade
+share/gal-%%VERSION%%/%%PORTVERSION%%/glade/e-table-field-chooser.glade
+share/gal-%%VERSION%%/%%PORTVERSION%%/glade/gal-categories.glade
+share/gal-%%VERSION%%/%%PORTVERSION%%/glade/gal-define-views.glade
+share/gal-%%VERSION%%/%%PORTVERSION%%/glade/gal-view-instance-save-as-dialog.glade
+share/gal-%%VERSION%%/%%PORTVERSION%%/glade/gal-view-new-dialog.glade
+share/gal-%%VERSION%%/%%PORTVERSION%%/pixmaps/categories/category_birthday_16.png
+share/gal-%%VERSION%%/%%PORTVERSION%%/pixmaps/categories/category_business_16.png
+share/gal-%%VERSION%%/%%PORTVERSION%%/pixmaps/categories/category_favorites_16.png
+share/gal-%%VERSION%%/%%PORTVERSION%%/pixmaps/categories/category_gifts_16.png
+share/gal-%%VERSION%%/%%PORTVERSION%%/pixmaps/categories/category_goals_16.png
+share/gal-%%VERSION%%/%%PORTVERSION%%/pixmaps/categories/category_holiday-cards_16.png
+share/gal-%%VERSION%%/%%PORTVERSION%%/pixmaps/categories/category_holiday_16.png
+share/gal-%%VERSION%%/%%PORTVERSION%%/pixmaps/categories/category_hot-contacts_16.png
+share/gal-%%VERSION%%/%%PORTVERSION%%/pixmaps/categories/category_ideas_16.png
+share/gal-%%VERSION%%/%%PORTVERSION%%/pixmaps/categories/category_international_16.png
+share/gal-%%VERSION%%/%%PORTVERSION%%/pixmaps/categories/category_key-customer_16.png
+share/gal-%%VERSION%%/%%PORTVERSION%%/pixmaps/categories/category_miscellaneous_16.png
+share/gal-%%VERSION%%/%%PORTVERSION%%/pixmaps/categories/category_personal_16.png
+share/gal-%%VERSION%%/%%PORTVERSION%%/pixmaps/categories/category_phonecalls_16.png
+share/gal-%%VERSION%%/%%PORTVERSION%%/pixmaps/categories/category_status_16.png
+share/gal-%%VERSION%%/%%PORTVERSION%%/pixmaps/categories/category_strategies_16.png
+share/gal-%%VERSION%%/%%PORTVERSION%%/pixmaps/categories/category_suppliers_16.png
+share/gal-%%VERSION%%/%%PORTVERSION%%/pixmaps/categories/category_time-and-expenses_16.png
 share/locale/am/LC_MESSAGES/gal-%%VERSION%%.mo
 share/locale/ar/LC_MESSAGES/gal-%%VERSION%%.mo
 share/locale/az/LC_MESSAGES/gal-%%VERSION%%.mo
@@ -245,15 +245,11 @@ share/locale/vi/LC_MESSAGES/gal-%%VERSION%%.mo
 share/locale/xh/LC_MESSAGES/gal-%%VERSION%%.mo
 share/locale/zh_CN/LC_MESSAGES/gal-%%VERSION%%.mo
 share/locale/zh_TW/LC_MESSAGES/gal-%%VERSION%%.mo
-@dirrmtry share/locale/rw/LC_MESSAGES
-@dirrmtry share/locale/rw
-@dirrmtry share/locale/xh/LC_MESSAGES
-@dirrmtry share/locale/xh
-@dirrm share/gnome/gal-%%VERSION%%/%%PORTVERSION%%/pixmaps/categories
-@dirrm share/gnome/gal-%%VERSION%%/%%PORTVERSION%%/pixmaps
-@dirrm share/gnome/gal-%%VERSION%%/%%PORTVERSION%%/glade
-@dirrm share/gnome/gal-%%VERSION%%/%%PORTVERSION%%
-@dirrm share/gnome/gal-%%VERSION%%
+@dirrm share/gal-%%VERSION%%/%%PORTVERSION%%/pixmaps/categories
+@dirrm share/gal-%%VERSION%%/%%PORTVERSION%%/pixmaps
+@dirrm share/gal-%%VERSION%%/%%PORTVERSION%%/glade
+@dirrm share/gal-%%VERSION%%/%%PORTVERSION%%
+@dirrm share/gal-%%VERSION%%
 @dirrm include/gal-%%VERSION%%/gal/widgets
 @dirrm include/gal-%%VERSION%%/gal/util
 @dirrm include/gal-%%VERSION%%/gal/shortcut-bar
@@ -265,3 +261,7 @@ share/locale/zh_TW/LC_MESSAGES/gal-%%VERSION%%.mo
 @dirrm include/gal-%%VERSION%%/gal/a11y
 @dirrm include/gal-%%VERSION%%/gal
 @dirrm include/gal-%%VERSION%%
+@dirrmtry share/locale/xh/LC_MESSAGES
+@dirrmtry share/locale/xh
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
diff --git a/x11-toolkits/gauche-gtk/Makefile b/x11-toolkits/gauche-gtk/Makefile
index 3709c5d55f2f..895001a62f21 100644
--- a/x11-toolkits/gauche-gtk/Makefile
+++ b/x11-toolkits/gauche-gtk/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gauche
 PORTVERSION=	0.4.1
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	x11-toolkits scheme
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	gauche
diff --git a/x11-toolkits/gauche-gtk/files/patch-src_gtktexttag.stub b/x11-toolkits/gauche-gtk/files/patch-src_gtktexttag.stub
index 346af66453d1..03d0ba0d4336 100644
--- a/x11-toolkits/gauche-gtk/files/patch-src_gtktexttag.stub
+++ b/x11-toolkits/gauche-gtk/files/patch-src_gtktexttag.stub
@@ -1,14 +1,15 @@
---- src/gtktexttag.stub.orig	Sat Dec 10 22:21:57 2005
-+++ src/gtktexttag.stub	Sat Dec 10 22:22:07 2005
-@@ -36,7 +36,6 @@
+--- src/gtktexttag.stub.orig	2004-06-26 23:59:48.000000000 -0400
++++ src/gtktexttag.stub	2007-10-24 15:07:15.000000000 -0400
+@@ -35,8 +35,6 @@
+    (editable-set :type <uint>)
     (language-set :type <uint>)
     (pad1 :type <uint>)
-    (pad2 :type <uint>)
+-   (pad2 :type <uint>)
 -   (pad3 :type <uint>)
     )
  (allocator (c "Scm_GtkObjectAllocate"))
    )
-@@ -85,8 +84,6 @@
+@@ -85,8 +83,6 @@
     (is-text :type <uint>)
     (pad1 :type <uint>)
     (pad2 :type <uint>)
@@ -17,7 +18,7 @@
     )
    (allocator "return Scm_MakeGtkTextAppearance(NULL);")
    )
-@@ -128,8 +125,6 @@
+@@ -128,8 +124,6 @@
     (realized :type <uint>)
     (pad1 :type <uint>)
     (pad2 :type <uint>)
diff --git a/x11-toolkits/gdl/Makefile b/x11-toolkits/gdl/Makefile
index 9ae98081fa23..19bb58cbca37 100644
--- a/x11-toolkits/gdl/Makefile
+++ b/x11-toolkits/gdl/Makefile
@@ -3,11 +3,12 @@
 # Whom:					Maxim Sobolev <sobomax@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/x11-toolkits/gdl/Makefile,v 1.8 2007/02/16 18:14:27 mezz Exp $
+#   $MCom: ports/x11-toolkits/gdl/Makefile,v 1.15 2007/09/09 22:45:27 mezz Exp $
 #
 
 PORTNAME=	gdl
 PORTVERSION=	0.7.7
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:R}
diff --git a/x11-toolkits/gdl/pkg-plist b/x11-toolkits/gdl/pkg-plist
index e7690f48fc00..db77788e39ee 100644
--- a/x11-toolkits/gdl/pkg-plist
+++ b/x11-toolkits/gdl/pkg-plist
@@ -24,7 +24,7 @@ lib/libgdl-gnome-1.so
 lib/libgdl-gnome-1.so.0
 libdata/pkgconfig/gdl-1.0.pc
 libdata/pkgconfig/gdl-gnome-1.0.pc
-share/gnome/gdl/glade/layout.glade
+share/gdl/glade/layout.glade
 share/locale/am/LC_MESSAGES/gdl-1.mo
 share/locale/ar/LC_MESSAGES/gdl-1.mo
 share/locale/az/LC_MESSAGES/gdl-1.mo
@@ -64,11 +64,11 @@ share/locale/sr@Latn/LC_MESSAGES/gdl-1.mo
 share/locale/sv/LC_MESSAGES/gdl-1.mo
 share/locale/vi/LC_MESSAGES/gdl-1.mo
 share/locale/zh_CN/LC_MESSAGES/gdl-1.mo
+@dirrm share/gdl/glade
+@dirrm share/gdl
+@dirrm include/libgdl-1.0/gdl
+@dirrm include/libgdl-1.0
 @dirrmtry share/locale/rw/LC_MESSAGES
 @dirrmtry share/locale/rw
 @dirrmtry share/locale/dz/LC_MESSAGES
 @dirrmtry share/locale/dz
-@dirrm share/gnome/gdl/glade
-@dirrm share/gnome/gdl
-@dirrm include/libgdl-1.0/gdl
-@dirrm include/libgdl-1.0
diff --git a/x11-toolkits/gtk20/Makefile b/x11-toolkits/gtk20/Makefile
index 02f312ec599d..14da84939ea3 100644
--- a/x11-toolkits/gtk20/Makefile
+++ b/x11-toolkits/gtk20/Makefile
@@ -3,21 +3,21 @@
 # Whom:				Vanilla I. Shu <vanilla@MinJe.com.TW>
 #
 # $FreeBSD$
-#   $MCom: ports/x11-toolkits/gtk20/Makefile,v 1.101 2006/10/08 21:05:26 marcus Exp $
+#   $MCom: ports/x11-toolkits/gtk20/Makefile,v 1.120 2007/10/17 07:12:55 mezz Exp $
 #
 
 PORTNAME=	gtk
-PORTVERSION=	2.10.14
-PORTREVISION?=	3
+PORTVERSION=	2.12.1
+PORTREVISION?=	0
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_GNOME:S,%SUBDIR%,sources/gtk+/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}/,} \
-		ftp://ftp.gtk.org/pub/gtk/v2.10/ \
+		ftp://ftp.gtk.org/pub/gtk/%SUBDIR%/ \
 		ftp://ftp.gimp.org/pub/%SUBDIR%/ \
 		ftp://ftp.cs.umn.edu/pub/gimp/%SUBDIR%/ \
 		http://www.ameth.org/gimp/%SUBDIR%/ \
 		ftp://ftp.mirror.ac.uk/sites/ftp.gimp.org/pub/%SUBDIR%/ \
 		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,graphics/gimp/%SUBDIR%,}
-MASTER_SITE_SUBDIR=	gtk/v${PORTVERSION:R}
+MASTER_SITE_SUBDIR=	gtk/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
 DISTNAME=	gtk+-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
@@ -41,11 +41,11 @@ USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool:15
 USE_GNOME=	gnomehack atk pango ltverhack
 USE_GETTEXT=	yes
-USE_XORG=	dmx fontenc fontutil ice libfs oldx sm x11 xau xaw xaw6 xaw7 xaw8 xbitmaps \
-		xcomposite xcursor xdamage xdmcp xevie xext xfixes xfont xfontcache xft xi \
-		xinerama xkbfile xkbui xmu xmuu xp xpm xprintapputil xprintutil \
-		xrandr xrender xres xscrnsaver xt xtrans xtrap xtst xv xvmc xxf86dga xxf86misc \
-		xxf86vm
+USE_XORG=	dmx fontenc fontutil ice libfs oldx sm x11 xau xaw xaw6 xaw7 \
+		xaw8 xbitmaps xcomposite xcursor xdamage xdmcp xevie xext \
+		xfixes xfont xfontcache xft xi xinerama xkbfile xkbui xmu xmuu \
+		xp xpm xprintapputil xprintutil xrandr xrender xres xscrnsaver \
+		xt xtrans xtrap xtst xv xvmc xxf86dga xxf86misc xxf86vm
 CONFIGURE_ARGS=	--enable-static --with-xinput=yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include/freetype2 \
 			  -I${LOCALBASE}/include" \
diff --git a/x11-toolkits/gtk20/distinfo b/x11-toolkits/gtk20/distinfo
index 266f7458bd20..636864095eb5 100644
--- a/x11-toolkits/gtk20/distinfo
+++ b/x11-toolkits/gtk20/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gtk+-2.10.14.tar.bz2) = 018d7dd0fa7de01cfdb77c7c55e7ba26
-SHA256 (gnome2/gtk+-2.10.14.tar.bz2) = d02344239d048390ba02fcfd7de4f9efc0dfb51e7b06dfa46a6314d666ea4de2
-SIZE (gnome2/gtk+-2.10.14.tar.bz2) = 15172170
+MD5 (gnome2/gtk+-2.12.1.tar.bz2) = c46f34addc2fe3ea6756055d59fb8856
+SHA256 (gnome2/gtk+-2.12.1.tar.bz2) = 7dceb0a5e6edc2398cd94415b336d7b37eb8941c2c41403c2c60bfb6ae47d6d6
+SIZE (gnome2/gtk+-2.12.1.tar.bz2) = 15856678
diff --git a/x11-toolkits/gtk20/files/patch-ak b/x11-toolkits/gtk20/files/patch-ak
index 27156d238e58..f8dda5cbffaf 100644
--- a/x11-toolkits/gtk20/files/patch-ak
+++ b/x11-toolkits/gtk20/files/patch-ak
@@ -1,6 +1,6 @@
 
 $FreeBSD$
-  $MCom: ports/x11-toolkits/gtk20/files/patch-ak,v 1.19 2006/10/10 20:22:27 mezz Exp $
+  $MCom: ports/x11-toolkits/gtk20/files/patch-ak,v 1.21 2007/04/26 17:22:32 marcus Exp $
 
 --- gdk/Makefile.in.orig	Thu Feb 14 12:38:26 2002
 +++ gdk/Makefile.in	Thu Feb 14 12:45:37 2002
diff --git a/x11-toolkits/gtk20/files/patch-gtk_xdgmime_xdgmime.c b/x11-toolkits/gtk20/files/patch-gtk_xdgmime_xdgmime.c
index c33fc40e8264..e0fd02d4fbac 100644
--- a/x11-toolkits/gtk20/files/patch-gtk_xdgmime_xdgmime.c
+++ b/x11-toolkits/gtk20/files/patch-gtk_xdgmime_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 = "/usr/local/share/gnome/:/usr/local/share/:/usr/share/";
++    xdg_data_dirs = "/usr/local/share/";
  
    ptr = xdg_data_dirs;
  
diff --git a/x11-toolkits/gtk20/files/patch-gtk_xdgmime_xdgmimecache.h b/x11-toolkits/gtk20/files/patch-gtk_xdgmime_xdgmimecache.h
index 266d74c22365..b64106809ef6 100644
--- a/x11-toolkits/gtk20/files/patch-gtk_xdgmime_xdgmimecache.h
+++ b/x11-toolkits/gtk20/files/patch-gtk_xdgmime_xdgmimecache.h
@@ -1,25 +1,12 @@
---- gtk/xdgmime/xdgmimecache.h.orig	Mon May 29 20:04:24 2006
-+++ gtk/xdgmime/xdgmimecache.h	Mon May 29 20:11:42 2006
-@@ -32,9 +32,19 @@
- typedef struct _XdgMimeCache XdgMimeCache;
+--- gtk/xdgmime/xdgmimecache.h.orig	2007-09-13 16:35:37.000000000 -0400
++++ gtk/xdgmime/xdgmimecache.h	2007-09-14 00:59:43.000000000 -0400
+@@ -42,6 +42,9 @@ typedef struct _XdgMimeCache XdgMimeCach
+ #define _xdg_mime_cache_list_mime_parents             XDG_ENTRY(cache_list_mime_parents)
+ #define _xdg_mime_cache_mime_type_subclass            XDG_ENTRY(cache_mime_type_subclass)
+ #define _xdg_mime_cache_unalias_mime_type             XDG_ENTRY(cache_unalias_mime_type)
++#define _xdg_mime_cache_is_valid_mime_type            XDG_ENTRY(cache_is_valid_mime_type)
++#define _xdg_mime_cache_mime_type_equal               XDG_ENTRY(cache_mime_type_equal)
++#define _xdg_mime_cache_media_type_equal              XDG_ENTRY(cache_media_type_equal)
  
- #ifdef XDG_PREFIX
--#define _xdg_mime_cache_new_from_file        XDG_ENTRY(cache_new_from_file)
--#define _xdg_mime_cache_ref                  XDG_ENTRY(cache_ref)
--#define _xdg_mime_cache_unref                XDG_ENTRY(cache_unref)
-+#define _xdg_mime_cache_new_from_file                XDG_ENTRY(cache_new_from_file)
-+#define _xdg_mime_cache_ref                          XDG_ENTRY(cache_ref)
-+#define _xdg_mime_cache_unref                        XDG_ENTRY(cache_unref)
-+#define _xdg_mime_cache_get_mime_type_for_data       XDG_ENTRY(cache_get_mime_type_for_data)
-+#define _xdg_mime_cache_get_mime_type_for_file       XDG_ENTRY(cache_get_mime_type_for_file)
-+#define _xdg_mime_cache_get_mime_type_from_file_name XDG_ENTRY(cache_get_mime_type_from_file_name)
-+#define _xdg_mime_cache_is_valid_mime_type           XDG_ENTRY(cache_is_valid_mime_type)
-+#define _xdg_mime_cache_mime_type_equal              XDG_ENTRY(cache_mime_type_equal)
-+#define _xdg_mime_cache_media_type_equal             XDG_ENTRY(cache_media_type_equal)
-+#define _xdg_mime_cache_mime_type_subclass           XDG_ENTRY(cache_mime_type_subclass)
-+#define _xdg_mime_cache_list_mime_parents            XDG_ENTRY(cache_list_mime_parents)
-+#define _xdg_mime_cache_unalias_mime_type            XDG_ENTRY(cache_unalias_mime_type)
-+#define _xdg_mime_cache_get_max_buffer_extents       XDG_ENTRY(cache_get_max_buffer_extents)
  #endif
  
- extern XdgMimeCache **_caches;
diff --git a/x11-toolkits/gtk20/files/patch-modules_printbackends_cups_gtkcupsutils.c b/x11-toolkits/gtk20/files/patch-modules_printbackends_cups_gtkcupsutils.c
deleted file mode 100644
index 612f57b60af0..000000000000
--- a/x11-toolkits/gtk20/files/patch-modules_printbackends_cups_gtkcupsutils.c
+++ /dev/null
@@ -1,24 +0,0 @@
---- modules/printbackends/cups/gtkcupsutils.c.orig	2007-07-16 15:45:18.000000000 -0400
-+++ modules/printbackends/cups/gtkcupsutils.c	2007-10-01 14:27:17.000000000 -0400
-@@ -627,9 +627,7 @@ _post_send (GtkCupsRequest *request)
-   httpClearFields(request->http);
-   httpSetField(request->http, HTTP_FIELD_CONTENT_LENGTH, length);
-   httpSetField(request->http, HTTP_FIELD_CONTENT_TYPE, "application/ipp");
--#ifdef HAVE_HTTP_AUTHSTRING
--  httpSetField(request->http, HTTP_FIELD_AUTHORIZATION, request->http->authstring);
--#endif
-+  httpSetField (request->http, HTTP_FIELD_AUTHORIZATION, httpGetAuthString (request->http));
- 
-   if (httpPost(request->http, request->resource))
-     {
-@@ -966,9 +964,7 @@ _get_send (GtkCupsRequest *request)
-     }
- 
-   httpClearFields(request->http);
--#ifdef HAVE_HTTP_AUTHSTRING
--  httpSetField(request->http, HTTP_FIELD_AUTHORIZATION, request->http->authstring);
--#endif
-+  httpSetField(request->http, HTTP_FIELD_AUTHORIZATION, httpGetAuthString (request->http));
- 
-   if (httpGet(request->http, request->resource))
-     {
diff --git a/x11-toolkits/gtk20/pkg-plist b/x11-toolkits/gtk20/pkg-plist
index 05b3430cf44f..462c4c459bfa 100644
--- a/x11-toolkits/gtk20/pkg-plist
+++ b/x11-toolkits/gtk20/pkg-plist
@@ -1,10 +1,12 @@
 bin/gdk-pixbuf-csource
 bin/gdk-pixbuf-query-loaders
+bin/gtk-builder-convert
 bin/gtk-demo
 bin/gtk-query-immodules-2.0
 bin/gtk-update-icon-cache
 etc/gtk-2.0/gdk-pixbuf.loaders
 etc/gtk-2.0/gtk.immodules
+etc/gtk-2.0/im-multipress.conf
 include/gtk-2.0/gdk-pixbuf-xlib/gdk-pixbuf-xlib.h
 include/gtk-2.0/gdk-pixbuf-xlib/gdk-pixbuf-xlibrgb.h
 include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-animation.h
@@ -68,6 +70,8 @@ include/gtk-2.0/gtk/gtkbbox.h
 include/gtk-2.0/gtk/gtkbin.h
 include/gtk-2.0/gtk/gtkbindings.h
 include/gtk-2.0/gtk/gtkbox.h
+include/gtk-2.0/gtk/gtkbuildable.h
+include/gtk-2.0/gtk/gtkbuilder.h
 include/gtk-2.0/gtk/gtkbutton.h
 include/gtk-2.0/gtk/gtkcalendar.h
 include/gtk-2.0/gtk/gtkcelleditable.h
@@ -177,6 +181,7 @@ include/gtk-2.0/gtk/gtkradiomenuitem.h
 include/gtk-2.0/gtk/gtkradiotoolbutton.h
 include/gtk-2.0/gtk/gtkrange.h
 include/gtk-2.0/gtk/gtkrc.h
+include/gtk-2.0/gtk/gtkrecentaction.h
 include/gtk-2.0/gtk/gtkrecentchooser.h
 include/gtk-2.0/gtk/gtkrecentchooserdialog.h
 include/gtk-2.0/gtk/gtkrecentchoosermenu.h
@@ -185,6 +190,7 @@ include/gtk-2.0/gtk/gtkrecentfilter.h
 include/gtk-2.0/gtk/gtkrecentmanager.h
 include/gtk-2.0/gtk/gtkruler.h
 include/gtk-2.0/gtk/gtkscale.h
+include/gtk-2.0/gtk/gtkscalebutton.h
 include/gtk-2.0/gtk/gtkscrollbar.h
 include/gtk-2.0/gtk/gtkscrolledwindow.h
 include/gtk-2.0/gtk/gtkselection.h
@@ -220,6 +226,7 @@ include/gtk-2.0/gtk/gtktoggletoolbutton.h
 include/gtk-2.0/gtk/gtktoolbar.h
 include/gtk-2.0/gtk/gtktoolbutton.h
 include/gtk-2.0/gtk/gtktoolitem.h
+include/gtk-2.0/gtk/gtktooltip.h
 include/gtk-2.0/gtk/gtktooltips.h
 include/gtk-2.0/gtk/gtktree.h
 include/gtk-2.0/gtk/gtktreednd.h
@@ -239,6 +246,7 @@ include/gtk-2.0/gtk/gtkvbbox.h
 include/gtk-2.0/gtk/gtkvbox.h
 include/gtk-2.0/gtk/gtkversion.h
 include/gtk-2.0/gtk/gtkviewport.h
+include/gtk-2.0/gtk/gtkvolumebutton.h
 include/gtk-2.0/gtk/gtkvpaned.h
 include/gtk-2.0/gtk/gtkvruler.h
 include/gtk-2.0/gtk/gtkvscale.h
@@ -268,6 +276,9 @@ lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-inuktitut.so
 lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-ipa.a
 lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-ipa.la
 lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-ipa.so
+lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-multipress.a
+lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-multipress.la
+lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-multipress.so
 lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-thai.a
 lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-thai.la
 lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-thai.so
@@ -363,11 +374,13 @@ share/gtk-2.0/demo/apple-red.png
 share/gtk-2.0/demo/appwindow.c
 share/gtk-2.0/demo/assistant.c
 share/gtk-2.0/demo/background.jpg
+share/gtk-2.0/demo/builder.c
 share/gtk-2.0/demo/button_box.c
 share/gtk-2.0/demo/changedisplay.c
 share/gtk-2.0/demo/clipboard.c
 share/gtk-2.0/demo/colorsel.c
 share/gtk-2.0/demo/combobox.c
+share/gtk-2.0/demo/demo.ui
 share/gtk-2.0/demo/dialog.c
 share/gtk-2.0/demo/drawingarea.c
 share/gtk-2.0/demo/editable_cells.c
@@ -481,6 +494,8 @@ share/locale/ia/LC_MESSAGES/gtk20-properties.mo
 share/locale/ia/LC_MESSAGES/gtk20.mo
 share/locale/id/LC_MESSAGES/gtk20-properties.mo
 share/locale/id/LC_MESSAGES/gtk20.mo
+share/locale/io/LC_MESSAGES/gtk20-properties.mo
+share/locale/io/LC_MESSAGES/gtk20.mo
 share/locale/is/LC_MESSAGES/gtk20-properties.mo
 share/locale/is/LC_MESSAGES/gtk20.mo
 share/locale/it/LC_MESSAGES/gtk20-properties.mo
@@ -521,6 +536,8 @@ share/locale/nn/LC_MESSAGES/gtk20-properties.mo
 share/locale/nn/LC_MESSAGES/gtk20.mo
 share/locale/nso/LC_MESSAGES/gtk20-properties.mo
 share/locale/nso/LC_MESSAGES/gtk20.mo
+share/locale/oc/LC_MESSAGES/gtk20-properties.mo
+share/locale/oc/LC_MESSAGES/gtk20.mo
 share/locale/or/LC_MESSAGES/gtk20-properties.mo
 share/locale/or/LC_MESSAGES/gtk20.mo
 share/locale/pa/LC_MESSAGES/gtk20-properties.mo
@@ -537,8 +554,6 @@ share/locale/ru/LC_MESSAGES/gtk20-properties.mo
 share/locale/ru/LC_MESSAGES/gtk20.mo
 share/locale/rw/LC_MESSAGES/gtk20-properties.mo
 share/locale/rw/LC_MESSAGES/gtk20.mo
-share/locale/si/LC_MESSAGES/gtk20-properties.mo
-share/locale/si/LC_MESSAGES/gtk20.mo
 share/locale/sk/LC_MESSAGES/gtk20-properties.mo
 share/locale/sk/LC_MESSAGES/gtk20.mo
 share/locale/sl/LC_MESSAGES/gtk20-properties.mo
@@ -571,8 +586,8 @@ share/locale/ur/LC_MESSAGES/gtk20-properties.mo
 share/locale/ur/LC_MESSAGES/gtk20.mo
 share/locale/uz/LC_MESSAGES/gtk20-properties.mo
 share/locale/uz/LC_MESSAGES/gtk20.mo
-share/locale/uz@Latn/LC_MESSAGES/gtk20-properties.mo
-share/locale/uz@Latn/LC_MESSAGES/gtk20.mo
+share/locale/uz@cyrillic/LC_MESSAGES/gtk20-properties.mo
+share/locale/uz@cyrillic/LC_MESSAGES/gtk20.mo
 share/locale/vi/LC_MESSAGES/gtk20-properties.mo
 share/locale/vi/LC_MESSAGES/gtk20.mo
 share/locale/wa/LC_MESSAGES/gtk20-properties.mo
@@ -597,6 +612,7 @@ share/themes/Raleigh/gtk-2.0/gtkrc
 @dirrm share/themes/Emacs/gtk-2.0-key
 @dirrm share/themes/Emacs
 @dirrm share/themes/Default/gtk-2.0-key
+@dirrm share/themes/Default
 @dirrm share/gtk-2.0/demo
 @dirrm share/gtk-2.0
 @dirrm include/gtk-unix-print-2.0/gtk
@@ -624,8 +640,8 @@ share/themes/Raleigh/gtk-2.0/gtkrc
 @dirrmtry share/locale/yi
 @dirrmtry share/locale/xh/LC_MESSAGES
 @dirrmtry share/locale/xh
-@dirrmtry share/locale/uz@Latn/LC_MESSAGES
-@dirrmtry share/locale/uz@Latn
+@dirrmtry share/locale/uz@cyrillic/LC_MESSAGES
+@dirrmtry share/locale/uz@cyrillic
 @dirrmtry share/locale/ur/LC_MESSAGES
 @dirrmtry share/locale/ur
 @dirrmtry share/locale/tt/LC_MESSAGES
@@ -634,10 +650,10 @@ share/themes/Raleigh/gtk-2.0/gtkrc
 @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/nso/LC_MESSAGES
 @dirrmtry share/locale/nso
 @dirrmtry share/locale/mr/LC_MESSAGES
@@ -646,6 +662,8 @@ share/themes/Raleigh/gtk-2.0/gtkrc
 @dirrmtry share/locale/mi
 @dirrmtry share/locale/ku/LC_MESSAGES
 @dirrmtry share/locale/ku
+@dirrmtry share/locale/io/LC_MESSAGES
+@dirrmtry share/locale/io
 @dirrmtry share/locale/ia/LC_MESSAGES
 @dirrmtry share/locale/ia
 @dirrmtry share/locale/hy/LC_MESSAGES
diff --git a/x11-toolkits/gtk30/Makefile b/x11-toolkits/gtk30/Makefile
index 02f312ec599d..14da84939ea3 100644
--- a/x11-toolkits/gtk30/Makefile
+++ b/x11-toolkits/gtk30/Makefile
@@ -3,21 +3,21 @@
 # Whom:				Vanilla I. Shu <vanilla@MinJe.com.TW>
 #
 # $FreeBSD$
-#   $MCom: ports/x11-toolkits/gtk20/Makefile,v 1.101 2006/10/08 21:05:26 marcus Exp $
+#   $MCom: ports/x11-toolkits/gtk20/Makefile,v 1.120 2007/10/17 07:12:55 mezz Exp $
 #
 
 PORTNAME=	gtk
-PORTVERSION=	2.10.14
-PORTREVISION?=	3
+PORTVERSION=	2.12.1
+PORTREVISION?=	0
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_GNOME:S,%SUBDIR%,sources/gtk+/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}/,} \
-		ftp://ftp.gtk.org/pub/gtk/v2.10/ \
+		ftp://ftp.gtk.org/pub/gtk/%SUBDIR%/ \
 		ftp://ftp.gimp.org/pub/%SUBDIR%/ \
 		ftp://ftp.cs.umn.edu/pub/gimp/%SUBDIR%/ \
 		http://www.ameth.org/gimp/%SUBDIR%/ \
 		ftp://ftp.mirror.ac.uk/sites/ftp.gimp.org/pub/%SUBDIR%/ \
 		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,graphics/gimp/%SUBDIR%,}
-MASTER_SITE_SUBDIR=	gtk/v${PORTVERSION:R}
+MASTER_SITE_SUBDIR=	gtk/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
 DISTNAME=	gtk+-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
@@ -41,11 +41,11 @@ USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool:15
 USE_GNOME=	gnomehack atk pango ltverhack
 USE_GETTEXT=	yes
-USE_XORG=	dmx fontenc fontutil ice libfs oldx sm x11 xau xaw xaw6 xaw7 xaw8 xbitmaps \
-		xcomposite xcursor xdamage xdmcp xevie xext xfixes xfont xfontcache xft xi \
-		xinerama xkbfile xkbui xmu xmuu xp xpm xprintapputil xprintutil \
-		xrandr xrender xres xscrnsaver xt xtrans xtrap xtst xv xvmc xxf86dga xxf86misc \
-		xxf86vm
+USE_XORG=	dmx fontenc fontutil ice libfs oldx sm x11 xau xaw xaw6 xaw7 \
+		xaw8 xbitmaps xcomposite xcursor xdamage xdmcp xevie xext \
+		xfixes xfont xfontcache xft xi xinerama xkbfile xkbui xmu xmuu \
+		xp xpm xprintapputil xprintutil xrandr xrender xres xscrnsaver \
+		xt xtrans xtrap xtst xv xvmc xxf86dga xxf86misc xxf86vm
 CONFIGURE_ARGS=	--enable-static --with-xinput=yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include/freetype2 \
 			  -I${LOCALBASE}/include" \
diff --git a/x11-toolkits/gtk30/distinfo b/x11-toolkits/gtk30/distinfo
index 266f7458bd20..636864095eb5 100644
--- a/x11-toolkits/gtk30/distinfo
+++ b/x11-toolkits/gtk30/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gtk+-2.10.14.tar.bz2) = 018d7dd0fa7de01cfdb77c7c55e7ba26
-SHA256 (gnome2/gtk+-2.10.14.tar.bz2) = d02344239d048390ba02fcfd7de4f9efc0dfb51e7b06dfa46a6314d666ea4de2
-SIZE (gnome2/gtk+-2.10.14.tar.bz2) = 15172170
+MD5 (gnome2/gtk+-2.12.1.tar.bz2) = c46f34addc2fe3ea6756055d59fb8856
+SHA256 (gnome2/gtk+-2.12.1.tar.bz2) = 7dceb0a5e6edc2398cd94415b336d7b37eb8941c2c41403c2c60bfb6ae47d6d6
+SIZE (gnome2/gtk+-2.12.1.tar.bz2) = 15856678
diff --git a/x11-toolkits/gtk30/files/patch-ak b/x11-toolkits/gtk30/files/patch-ak
index 27156d238e58..f8dda5cbffaf 100644
--- a/x11-toolkits/gtk30/files/patch-ak
+++ b/x11-toolkits/gtk30/files/patch-ak
@@ -1,6 +1,6 @@
 
 $FreeBSD$
-  $MCom: ports/x11-toolkits/gtk20/files/patch-ak,v 1.19 2006/10/10 20:22:27 mezz Exp $
+  $MCom: ports/x11-toolkits/gtk20/files/patch-ak,v 1.21 2007/04/26 17:22:32 marcus Exp $
 
 --- gdk/Makefile.in.orig	Thu Feb 14 12:38:26 2002
 +++ gdk/Makefile.in	Thu Feb 14 12:45:37 2002
diff --git a/x11-toolkits/gtk30/files/patch-gtk_xdgmime_xdgmime.c b/x11-toolkits/gtk30/files/patch-gtk_xdgmime_xdgmime.c
index c33fc40e8264..e0fd02d4fbac 100644
--- a/x11-toolkits/gtk30/files/patch-gtk_xdgmime_xdgmime.c
+++ b/x11-toolkits/gtk30/files/patch-gtk_xdgmime_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 = "/usr/local/share/gnome/:/usr/local/share/:/usr/share/";
++    xdg_data_dirs = "/usr/local/share/";
  
    ptr = xdg_data_dirs;
  
diff --git a/x11-toolkits/gtk30/files/patch-gtk_xdgmime_xdgmimecache.h b/x11-toolkits/gtk30/files/patch-gtk_xdgmime_xdgmimecache.h
index 266d74c22365..b64106809ef6 100644
--- a/x11-toolkits/gtk30/files/patch-gtk_xdgmime_xdgmimecache.h
+++ b/x11-toolkits/gtk30/files/patch-gtk_xdgmime_xdgmimecache.h
@@ -1,25 +1,12 @@
---- gtk/xdgmime/xdgmimecache.h.orig	Mon May 29 20:04:24 2006
-+++ gtk/xdgmime/xdgmimecache.h	Mon May 29 20:11:42 2006
-@@ -32,9 +32,19 @@
- typedef struct _XdgMimeCache XdgMimeCache;
+--- gtk/xdgmime/xdgmimecache.h.orig	2007-09-13 16:35:37.000000000 -0400
++++ gtk/xdgmime/xdgmimecache.h	2007-09-14 00:59:43.000000000 -0400
+@@ -42,6 +42,9 @@ typedef struct _XdgMimeCache XdgMimeCach
+ #define _xdg_mime_cache_list_mime_parents             XDG_ENTRY(cache_list_mime_parents)
+ #define _xdg_mime_cache_mime_type_subclass            XDG_ENTRY(cache_mime_type_subclass)
+ #define _xdg_mime_cache_unalias_mime_type             XDG_ENTRY(cache_unalias_mime_type)
++#define _xdg_mime_cache_is_valid_mime_type            XDG_ENTRY(cache_is_valid_mime_type)
++#define _xdg_mime_cache_mime_type_equal               XDG_ENTRY(cache_mime_type_equal)
++#define _xdg_mime_cache_media_type_equal              XDG_ENTRY(cache_media_type_equal)
  
- #ifdef XDG_PREFIX
--#define _xdg_mime_cache_new_from_file        XDG_ENTRY(cache_new_from_file)
--#define _xdg_mime_cache_ref                  XDG_ENTRY(cache_ref)
--#define _xdg_mime_cache_unref                XDG_ENTRY(cache_unref)
-+#define _xdg_mime_cache_new_from_file                XDG_ENTRY(cache_new_from_file)
-+#define _xdg_mime_cache_ref                          XDG_ENTRY(cache_ref)
-+#define _xdg_mime_cache_unref                        XDG_ENTRY(cache_unref)
-+#define _xdg_mime_cache_get_mime_type_for_data       XDG_ENTRY(cache_get_mime_type_for_data)
-+#define _xdg_mime_cache_get_mime_type_for_file       XDG_ENTRY(cache_get_mime_type_for_file)
-+#define _xdg_mime_cache_get_mime_type_from_file_name XDG_ENTRY(cache_get_mime_type_from_file_name)
-+#define _xdg_mime_cache_is_valid_mime_type           XDG_ENTRY(cache_is_valid_mime_type)
-+#define _xdg_mime_cache_mime_type_equal              XDG_ENTRY(cache_mime_type_equal)
-+#define _xdg_mime_cache_media_type_equal             XDG_ENTRY(cache_media_type_equal)
-+#define _xdg_mime_cache_mime_type_subclass           XDG_ENTRY(cache_mime_type_subclass)
-+#define _xdg_mime_cache_list_mime_parents            XDG_ENTRY(cache_list_mime_parents)
-+#define _xdg_mime_cache_unalias_mime_type            XDG_ENTRY(cache_unalias_mime_type)
-+#define _xdg_mime_cache_get_max_buffer_extents       XDG_ENTRY(cache_get_max_buffer_extents)
  #endif
  
- extern XdgMimeCache **_caches;
diff --git a/x11-toolkits/gtk30/files/patch-modules_printbackends_cups_gtkcupsutils.c b/x11-toolkits/gtk30/files/patch-modules_printbackends_cups_gtkcupsutils.c
deleted file mode 100644
index 612f57b60af0..000000000000
--- a/x11-toolkits/gtk30/files/patch-modules_printbackends_cups_gtkcupsutils.c
+++ /dev/null
@@ -1,24 +0,0 @@
---- modules/printbackends/cups/gtkcupsutils.c.orig	2007-07-16 15:45:18.000000000 -0400
-+++ modules/printbackends/cups/gtkcupsutils.c	2007-10-01 14:27:17.000000000 -0400
-@@ -627,9 +627,7 @@ _post_send (GtkCupsRequest *request)
-   httpClearFields(request->http);
-   httpSetField(request->http, HTTP_FIELD_CONTENT_LENGTH, length);
-   httpSetField(request->http, HTTP_FIELD_CONTENT_TYPE, "application/ipp");
--#ifdef HAVE_HTTP_AUTHSTRING
--  httpSetField(request->http, HTTP_FIELD_AUTHORIZATION, request->http->authstring);
--#endif
-+  httpSetField (request->http, HTTP_FIELD_AUTHORIZATION, httpGetAuthString (request->http));
- 
-   if (httpPost(request->http, request->resource))
-     {
-@@ -966,9 +964,7 @@ _get_send (GtkCupsRequest *request)
-     }
- 
-   httpClearFields(request->http);
--#ifdef HAVE_HTTP_AUTHSTRING
--  httpSetField(request->http, HTTP_FIELD_AUTHORIZATION, request->http->authstring);
--#endif
-+  httpSetField(request->http, HTTP_FIELD_AUTHORIZATION, httpGetAuthString (request->http));
- 
-   if (httpGet(request->http, request->resource))
-     {
diff --git a/x11-toolkits/gtk30/pkg-plist b/x11-toolkits/gtk30/pkg-plist
index 05b3430cf44f..462c4c459bfa 100644
--- a/x11-toolkits/gtk30/pkg-plist
+++ b/x11-toolkits/gtk30/pkg-plist
@@ -1,10 +1,12 @@
 bin/gdk-pixbuf-csource
 bin/gdk-pixbuf-query-loaders
+bin/gtk-builder-convert
 bin/gtk-demo
 bin/gtk-query-immodules-2.0
 bin/gtk-update-icon-cache
 etc/gtk-2.0/gdk-pixbuf.loaders
 etc/gtk-2.0/gtk.immodules
+etc/gtk-2.0/im-multipress.conf
 include/gtk-2.0/gdk-pixbuf-xlib/gdk-pixbuf-xlib.h
 include/gtk-2.0/gdk-pixbuf-xlib/gdk-pixbuf-xlibrgb.h
 include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-animation.h
@@ -68,6 +70,8 @@ include/gtk-2.0/gtk/gtkbbox.h
 include/gtk-2.0/gtk/gtkbin.h
 include/gtk-2.0/gtk/gtkbindings.h
 include/gtk-2.0/gtk/gtkbox.h
+include/gtk-2.0/gtk/gtkbuildable.h
+include/gtk-2.0/gtk/gtkbuilder.h
 include/gtk-2.0/gtk/gtkbutton.h
 include/gtk-2.0/gtk/gtkcalendar.h
 include/gtk-2.0/gtk/gtkcelleditable.h
@@ -177,6 +181,7 @@ include/gtk-2.0/gtk/gtkradiomenuitem.h
 include/gtk-2.0/gtk/gtkradiotoolbutton.h
 include/gtk-2.0/gtk/gtkrange.h
 include/gtk-2.0/gtk/gtkrc.h
+include/gtk-2.0/gtk/gtkrecentaction.h
 include/gtk-2.0/gtk/gtkrecentchooser.h
 include/gtk-2.0/gtk/gtkrecentchooserdialog.h
 include/gtk-2.0/gtk/gtkrecentchoosermenu.h
@@ -185,6 +190,7 @@ include/gtk-2.0/gtk/gtkrecentfilter.h
 include/gtk-2.0/gtk/gtkrecentmanager.h
 include/gtk-2.0/gtk/gtkruler.h
 include/gtk-2.0/gtk/gtkscale.h
+include/gtk-2.0/gtk/gtkscalebutton.h
 include/gtk-2.0/gtk/gtkscrollbar.h
 include/gtk-2.0/gtk/gtkscrolledwindow.h
 include/gtk-2.0/gtk/gtkselection.h
@@ -220,6 +226,7 @@ include/gtk-2.0/gtk/gtktoggletoolbutton.h
 include/gtk-2.0/gtk/gtktoolbar.h
 include/gtk-2.0/gtk/gtktoolbutton.h
 include/gtk-2.0/gtk/gtktoolitem.h
+include/gtk-2.0/gtk/gtktooltip.h
 include/gtk-2.0/gtk/gtktooltips.h
 include/gtk-2.0/gtk/gtktree.h
 include/gtk-2.0/gtk/gtktreednd.h
@@ -239,6 +246,7 @@ include/gtk-2.0/gtk/gtkvbbox.h
 include/gtk-2.0/gtk/gtkvbox.h
 include/gtk-2.0/gtk/gtkversion.h
 include/gtk-2.0/gtk/gtkviewport.h
+include/gtk-2.0/gtk/gtkvolumebutton.h
 include/gtk-2.0/gtk/gtkvpaned.h
 include/gtk-2.0/gtk/gtkvruler.h
 include/gtk-2.0/gtk/gtkvscale.h
@@ -268,6 +276,9 @@ lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-inuktitut.so
 lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-ipa.a
 lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-ipa.la
 lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-ipa.so
+lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-multipress.a
+lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-multipress.la
+lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-multipress.so
 lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-thai.a
 lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-thai.la
 lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-thai.so
@@ -363,11 +374,13 @@ share/gtk-2.0/demo/apple-red.png
 share/gtk-2.0/demo/appwindow.c
 share/gtk-2.0/demo/assistant.c
 share/gtk-2.0/demo/background.jpg
+share/gtk-2.0/demo/builder.c
 share/gtk-2.0/demo/button_box.c
 share/gtk-2.0/demo/changedisplay.c
 share/gtk-2.0/demo/clipboard.c
 share/gtk-2.0/demo/colorsel.c
 share/gtk-2.0/demo/combobox.c
+share/gtk-2.0/demo/demo.ui
 share/gtk-2.0/demo/dialog.c
 share/gtk-2.0/demo/drawingarea.c
 share/gtk-2.0/demo/editable_cells.c
@@ -481,6 +494,8 @@ share/locale/ia/LC_MESSAGES/gtk20-properties.mo
 share/locale/ia/LC_MESSAGES/gtk20.mo
 share/locale/id/LC_MESSAGES/gtk20-properties.mo
 share/locale/id/LC_MESSAGES/gtk20.mo
+share/locale/io/LC_MESSAGES/gtk20-properties.mo
+share/locale/io/LC_MESSAGES/gtk20.mo
 share/locale/is/LC_MESSAGES/gtk20-properties.mo
 share/locale/is/LC_MESSAGES/gtk20.mo
 share/locale/it/LC_MESSAGES/gtk20-properties.mo
@@ -521,6 +536,8 @@ share/locale/nn/LC_MESSAGES/gtk20-properties.mo
 share/locale/nn/LC_MESSAGES/gtk20.mo
 share/locale/nso/LC_MESSAGES/gtk20-properties.mo
 share/locale/nso/LC_MESSAGES/gtk20.mo
+share/locale/oc/LC_MESSAGES/gtk20-properties.mo
+share/locale/oc/LC_MESSAGES/gtk20.mo
 share/locale/or/LC_MESSAGES/gtk20-properties.mo
 share/locale/or/LC_MESSAGES/gtk20.mo
 share/locale/pa/LC_MESSAGES/gtk20-properties.mo
@@ -537,8 +554,6 @@ share/locale/ru/LC_MESSAGES/gtk20-properties.mo
 share/locale/ru/LC_MESSAGES/gtk20.mo
 share/locale/rw/LC_MESSAGES/gtk20-properties.mo
 share/locale/rw/LC_MESSAGES/gtk20.mo
-share/locale/si/LC_MESSAGES/gtk20-properties.mo
-share/locale/si/LC_MESSAGES/gtk20.mo
 share/locale/sk/LC_MESSAGES/gtk20-properties.mo
 share/locale/sk/LC_MESSAGES/gtk20.mo
 share/locale/sl/LC_MESSAGES/gtk20-properties.mo
@@ -571,8 +586,8 @@ share/locale/ur/LC_MESSAGES/gtk20-properties.mo
 share/locale/ur/LC_MESSAGES/gtk20.mo
 share/locale/uz/LC_MESSAGES/gtk20-properties.mo
 share/locale/uz/LC_MESSAGES/gtk20.mo
-share/locale/uz@Latn/LC_MESSAGES/gtk20-properties.mo
-share/locale/uz@Latn/LC_MESSAGES/gtk20.mo
+share/locale/uz@cyrillic/LC_MESSAGES/gtk20-properties.mo
+share/locale/uz@cyrillic/LC_MESSAGES/gtk20.mo
 share/locale/vi/LC_MESSAGES/gtk20-properties.mo
 share/locale/vi/LC_MESSAGES/gtk20.mo
 share/locale/wa/LC_MESSAGES/gtk20-properties.mo
@@ -597,6 +612,7 @@ share/themes/Raleigh/gtk-2.0/gtkrc
 @dirrm share/themes/Emacs/gtk-2.0-key
 @dirrm share/themes/Emacs
 @dirrm share/themes/Default/gtk-2.0-key
+@dirrm share/themes/Default
 @dirrm share/gtk-2.0/demo
 @dirrm share/gtk-2.0
 @dirrm include/gtk-unix-print-2.0/gtk
@@ -624,8 +640,8 @@ share/themes/Raleigh/gtk-2.0/gtkrc
 @dirrmtry share/locale/yi
 @dirrmtry share/locale/xh/LC_MESSAGES
 @dirrmtry share/locale/xh
-@dirrmtry share/locale/uz@Latn/LC_MESSAGES
-@dirrmtry share/locale/uz@Latn
+@dirrmtry share/locale/uz@cyrillic/LC_MESSAGES
+@dirrmtry share/locale/uz@cyrillic
 @dirrmtry share/locale/ur/LC_MESSAGES
 @dirrmtry share/locale/ur
 @dirrmtry share/locale/tt/LC_MESSAGES
@@ -634,10 +650,10 @@ share/themes/Raleigh/gtk-2.0/gtkrc
 @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/nso/LC_MESSAGES
 @dirrmtry share/locale/nso
 @dirrmtry share/locale/mr/LC_MESSAGES
@@ -646,6 +662,8 @@ share/themes/Raleigh/gtk-2.0/gtkrc
 @dirrmtry share/locale/mi
 @dirrmtry share/locale/ku/LC_MESSAGES
 @dirrmtry share/locale/ku
+@dirrmtry share/locale/io/LC_MESSAGES
+@dirrmtry share/locale/io
 @dirrmtry share/locale/ia/LC_MESSAGES
 @dirrmtry share/locale/ia
 @dirrmtry share/locale/hy/LC_MESSAGES
diff --git a/x11-toolkits/gtkmm24/Makefile b/x11-toolkits/gtkmm24/Makefile
index 4357cb06eba6..6cf4f3eb3f92 100644
--- a/x11-toolkits/gtkmm24/Makefile
+++ b/x11-toolkits/gtkmm24/Makefile
@@ -3,11 +3,11 @@
 # Whom:                Martin Klaffenboeck <martin.klaffenboeck@gmx.at>
 #
 # $FreeBSD$
-#   $MCom: ports/x11-toolkits/gtkmm24/Makefile,v 1.20 2006/08/22 03:45:28 marcus Exp $
+#   $MCom: ports/x11-toolkits/gtkmm24/Makefile,v 1.30 2007/10/06 21:55:43 mezz Exp $
 #
 
 PORTNAME=	gtkmm
-PORTVERSION=	2.10.11
+PORTVERSION=	2.12.1
 PORTREVISION?=	0
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_GNOME}
diff --git a/x11-toolkits/gtkmm24/distinfo b/x11-toolkits/gtkmm24/distinfo
index e89aeb38c3d4..565d0a270cb4 100644
--- a/x11-toolkits/gtkmm24/distinfo
+++ b/x11-toolkits/gtkmm24/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gtkmm-2.10.11.tar.bz2) = 999e1b6f23bcc69c9effbeaf71686adc
-SHA256 (gnome2/gtkmm-2.10.11.tar.bz2) = 7d935422776f4a6de266f327d8d087df35352ea58ee6ff7a89b52533414e31af
-SIZE (gnome2/gtkmm-2.10.11.tar.bz2) = 8173151
+MD5 (gnome2/gtkmm-2.12.1.tar.bz2) = b2dbd8c9d69062c51dfd2835faef9cf1
+SHA256 (gnome2/gtkmm-2.12.1.tar.bz2) = 6b26d4e0d614bee8285c299d7550cb58799e6fba19a5db4a5e3d83258c24f610
+SIZE (gnome2/gtkmm-2.12.1.tar.bz2) = 13325799
diff --git a/x11-toolkits/gtkmm24/pkg-plist b/x11-toolkits/gtkmm24/pkg-plist
index 62028444fdcd..e405a27dcd87 100644
--- a/x11-toolkits/gtkmm24/pkg-plist
+++ b/x11-toolkits/gtkmm24/pkg-plist
@@ -110,6 +110,7 @@ include/gtkmm-%%API_VERSION%%/gtkmm/assistant.h
 include/gtkmm-%%API_VERSION%%/gtkmm/base.h
 include/gtkmm-%%API_VERSION%%/gtkmm/bin.h
 include/gtkmm-%%API_VERSION%%/gtkmm/box.h
+include/gtkmm-%%API_VERSION%%/gtkmm/builder.h
 include/gtkmm-%%API_VERSION%%/gtkmm/button.h
 include/gtkmm-%%API_VERSION%%/gtkmm/buttonbox.h
 include/gtkmm-%%API_VERSION%%/gtkmm/calendar.h
@@ -208,6 +209,7 @@ include/gtkmm-%%API_VERSION%%/gtkmm/private/aspectframe_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/assistant_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/bin_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/box_p.h
+include/gtkmm-%%API_VERSION%%/gtkmm/private/builder_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/button_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/buttonbox_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/calendar_p.h
@@ -296,6 +298,7 @@ include/gtkmm-%%API_VERSION%%/gtkmm/private/radiomenuitem_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/radiotoolbutton_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/range_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/rc_p.h
+include/gtkmm-%%API_VERSION%%/gtkmm/private/recentaction_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/recentchooser_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/recentchooserdialog_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/recentchoosermenu_p.h
@@ -305,6 +308,7 @@ include/gtkmm-%%API_VERSION%%/gtkmm/private/recentinfo_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/recentmanager_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/ruler_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/scale_p.h
+include/gtkmm-%%API_VERSION%%/gtkmm/private/scalebutton_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/scrollbar_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/scrolledwindow_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/selectiondata_p.h
@@ -336,6 +340,7 @@ include/gtkmm-%%API_VERSION%%/gtkmm/private/toggletoolbutton_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/toolbar_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/toolbutton_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/toolitem_p.h
+include/gtkmm-%%API_VERSION%%/gtkmm/private/tooltip_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/tooltips_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/treedragdest_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/treedragsource_p.h
@@ -352,6 +357,7 @@ include/gtkmm-%%API_VERSION%%/gtkmm/private/treeview_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/treeviewcolumn_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/uimanager_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/viewport_p.h
+include/gtkmm-%%API_VERSION%%/gtkmm/private/volumebutton_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/widget_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/window_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/progressbar.h
@@ -362,6 +368,7 @@ include/gtkmm-%%API_VERSION%%/gtkmm/radiomenuitem.h
 include/gtkmm-%%API_VERSION%%/gtkmm/radiotoolbutton.h
 include/gtkmm-%%API_VERSION%%/gtkmm/range.h
 include/gtkmm-%%API_VERSION%%/gtkmm/rc.h
+include/gtkmm-%%API_VERSION%%/gtkmm/recentaction.h
 include/gtkmm-%%API_VERSION%%/gtkmm/recentchooser.h
 include/gtkmm-%%API_VERSION%%/gtkmm/recentchooserdialog.h
 include/gtkmm-%%API_VERSION%%/gtkmm/recentchoosermenu.h
@@ -371,6 +378,7 @@ include/gtkmm-%%API_VERSION%%/gtkmm/recentinfo.h
 include/gtkmm-%%API_VERSION%%/gtkmm/recentmanager.h
 include/gtkmm-%%API_VERSION%%/gtkmm/ruler.h
 include/gtkmm-%%API_VERSION%%/gtkmm/scale.h
+include/gtkmm-%%API_VERSION%%/gtkmm/scalebutton.h
 include/gtkmm-%%API_VERSION%%/gtkmm/scrollbar.h
 include/gtkmm-%%API_VERSION%%/gtkmm/scrolledwindow.h
 include/gtkmm-%%API_VERSION%%/gtkmm/selectiondata.h
@@ -406,6 +414,7 @@ include/gtkmm-%%API_VERSION%%/gtkmm/toggletoolbutton.h
 include/gtkmm-%%API_VERSION%%/gtkmm/toolbar.h
 include/gtkmm-%%API_VERSION%%/gtkmm/toolbutton.h
 include/gtkmm-%%API_VERSION%%/gtkmm/toolitem.h
+include/gtkmm-%%API_VERSION%%/gtkmm/tooltip.h
 include/gtkmm-%%API_VERSION%%/gtkmm/tooltips.h
 include/gtkmm-%%API_VERSION%%/gtkmm/treedragdest.h
 include/gtkmm-%%API_VERSION%%/gtkmm/treedragsource.h
@@ -424,6 +433,7 @@ include/gtkmm-%%API_VERSION%%/gtkmm/treeview_private.h
 include/gtkmm-%%API_VERSION%%/gtkmm/treeviewcolumn.h
 include/gtkmm-%%API_VERSION%%/gtkmm/uimanager.h
 include/gtkmm-%%API_VERSION%%/gtkmm/viewport.h
+include/gtkmm-%%API_VERSION%%/gtkmm/volumebutton.h
 include/gtkmm-%%API_VERSION%%/gtkmm/widget.h
 include/gtkmm-%%API_VERSION%%/gtkmm/window.h
 include/gtkmm-%%API_VERSION%%/gtkmm/wrap_init.h
diff --git a/x11-toolkits/gtksourceview-sharp/Makefile b/x11-toolkits/gtksourceview-sharp/Makefile
index 05123ae08745..16d0becb2e7c 100644
--- a/x11-toolkits/gtksourceview-sharp/Makefile
+++ b/x11-toolkits/gtksourceview-sharp/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	gtksourceview-sharp
 PORTVERSION=	0.11
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	http://go-mono.com/sources/gtksourceview-sharp-2.0/
 DISTNAME=	${PORTNAME}-2.0-${PORTVERSION}
diff --git a/x11-toolkits/gtksourceview-sharp/files/patch-Makefile.in b/x11-toolkits/gtksourceview-sharp/files/patch-Makefile.in
index 4f842eb419c4..d36422d0ca56 100644
--- a/x11-toolkits/gtksourceview-sharp/files/patch-Makefile.in
+++ b/x11-toolkits/gtksourceview-sharp/files/patch-Makefile.in
@@ -5,7 +5,7 @@
  DISTCLEANFILES = gtksourceview-sharp-2.0.pc
  EXTRA_DIST = nemerle.lang vbnet.lang gtksourceview-sharp-2.0.pc.in gtk-sharp.snk
 -extra_langdir = $(gtksourceview_prefix)/share/gtksourceview-1.0/language-specs
-+extra_langdir = $(prefix)/share/gnome/gtksourceview-1.0/language-specs
++extra_langdir = $(prefix)/share/gtksourceview-1.0/language-specs
  extra_lang_DATA = nemerle.lang vbnet.lang
 -pkgconfigdir = $(prefix)/lib/pkgconfig
 +pkgconfigdir = $(prefix)/libdata/pkgconfig
diff --git a/x11-toolkits/gtksourceview/Makefile b/x11-toolkits/gtksourceview/Makefile
index b4f7705b9694..2c769257c55c 100644
--- a/x11-toolkits/gtksourceview/Makefile
+++ b/x11-toolkits/gtksourceview/Makefile
@@ -3,12 +3,12 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/x11-toolkits/gtksourceview/Makefile,v 1.43 2006/10/02 00:40:29 ahze Exp $
+#   $MCom: ports/x11-toolkits/gtksourceview/Makefile,v 1.46 2007/05/19 21:36:33 marcus Exp $
 #
 
 PORTNAME=	gtksourceview
 PORTVERSION=	1.8.5
-PORTREVISION?=	1
+PORTREVISION?=	2
 CATEGORIES=	x11-toolkits gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/x11-toolkits/gtksourceview/pkg-plist b/x11-toolkits/gtksourceview/pkg-plist
index fc1b38d8b2bb..910a7199dd6d 100644
--- a/x11-toolkits/gtksourceview/pkg-plist
+++ b/x11-toolkits/gtksourceview/pkg-plist
@@ -15,51 +15,51 @@ lib/libgtksourceview-1.0.la
 lib/libgtksourceview-1.0.so
 lib/libgtksourceview-1.0.so.0
 libdata/pkgconfig/gtksourceview-1.0.pc
-share/gnome/gtksourceview-1.0/language-specs/R.lang
-share/gnome/gtksourceview-1.0/language-specs/ada.lang
-share/gnome/gtksourceview-1.0/language-specs/boo.lang
-share/gnome/gtksourceview-1.0/language-specs/c.lang
-share/gnome/gtksourceview-1.0/language-specs/changelog.lang
-share/gnome/gtksourceview-1.0/language-specs/cpp.lang
-share/gnome/gtksourceview-1.0/language-specs/csharp.lang
-share/gnome/gtksourceview-1.0/language-specs/css.lang
-share/gnome/gtksourceview-1.0/language-specs/d.lang
-share/gnome/gtksourceview-1.0/language-specs/desktop.lang
-share/gnome/gtksourceview-1.0/language-specs/diff.lang
-share/gnome/gtksourceview-1.0/language-specs/docbook.lang
-share/gnome/gtksourceview-1.0/language-specs/fortran.lang
-share/gnome/gtksourceview-1.0/language-specs/gtkrc.lang
-share/gnome/gtksourceview-1.0/language-specs/haskell.lang
-share/gnome/gtksourceview-1.0/language-specs/html.lang
-share/gnome/gtksourceview-1.0/language-specs/idl.lang
-share/gnome/gtksourceview-1.0/language-specs/ini.lang
-share/gnome/gtksourceview-1.0/language-specs/java.lang
-share/gnome/gtksourceview-1.0/language-specs/javascript.lang
-share/gnome/gtksourceview-1.0/language-specs/language.dtd
-share/gnome/gtksourceview-1.0/language-specs/language.rng
-share/gnome/gtksourceview-1.0/language-specs/latex.lang
-share/gnome/gtksourceview-1.0/language-specs/lua.lang
-share/gnome/gtksourceview-1.0/language-specs/makefile.lang
-share/gnome/gtksourceview-1.0/language-specs/msil.lang
-share/gnome/gtksourceview-1.0/language-specs/nemerle.lang
-share/gnome/gtksourceview-1.0/language-specs/ocaml.lang
-share/gnome/gtksourceview-1.0/language-specs/octave.lang
-share/gnome/gtksourceview-1.0/language-specs/pascal.lang
-share/gnome/gtksourceview-1.0/language-specs/perl.lang
-share/gnome/gtksourceview-1.0/language-specs/php.lang
-share/gnome/gtksourceview-1.0/language-specs/po.lang
-share/gnome/gtksourceview-1.0/language-specs/python.lang
-share/gnome/gtksourceview-1.0/language-specs/ruby.lang
-share/gnome/gtksourceview-1.0/language-specs/scheme.lang
-share/gnome/gtksourceview-1.0/language-specs/sh.lang
-share/gnome/gtksourceview-1.0/language-specs/spec.lang
-share/gnome/gtksourceview-1.0/language-specs/sql.lang
-share/gnome/gtksourceview-1.0/language-specs/tcl.lang
-share/gnome/gtksourceview-1.0/language-specs/texinfo.lang
-share/gnome/gtksourceview-1.0/language-specs/vbnet.lang
-share/gnome/gtksourceview-1.0/language-specs/verilog.lang
-share/gnome/gtksourceview-1.0/language-specs/vhdl.lang
-share/gnome/gtksourceview-1.0/language-specs/xml.lang
+share/gtksourceview-1.0/language-specs/R.lang
+share/gtksourceview-1.0/language-specs/ada.lang
+share/gtksourceview-1.0/language-specs/boo.lang
+share/gtksourceview-1.0/language-specs/c.lang
+share/gtksourceview-1.0/language-specs/changelog.lang
+share/gtksourceview-1.0/language-specs/cpp.lang
+share/gtksourceview-1.0/language-specs/csharp.lang
+share/gtksourceview-1.0/language-specs/css.lang
+share/gtksourceview-1.0/language-specs/d.lang
+share/gtksourceview-1.0/language-specs/desktop.lang
+share/gtksourceview-1.0/language-specs/diff.lang
+share/gtksourceview-1.0/language-specs/docbook.lang
+share/gtksourceview-1.0/language-specs/fortran.lang
+share/gtksourceview-1.0/language-specs/gtkrc.lang
+share/gtksourceview-1.0/language-specs/haskell.lang
+share/gtksourceview-1.0/language-specs/html.lang
+share/gtksourceview-1.0/language-specs/idl.lang
+share/gtksourceview-1.0/language-specs/ini.lang
+share/gtksourceview-1.0/language-specs/java.lang
+share/gtksourceview-1.0/language-specs/javascript.lang
+share/gtksourceview-1.0/language-specs/language.dtd
+share/gtksourceview-1.0/language-specs/language.rng
+share/gtksourceview-1.0/language-specs/latex.lang
+share/gtksourceview-1.0/language-specs/lua.lang
+share/gtksourceview-1.0/language-specs/makefile.lang
+share/gtksourceview-1.0/language-specs/msil.lang
+share/gtksourceview-1.0/language-specs/nemerle.lang
+share/gtksourceview-1.0/language-specs/ocaml.lang
+share/gtksourceview-1.0/language-specs/octave.lang
+share/gtksourceview-1.0/language-specs/pascal.lang
+share/gtksourceview-1.0/language-specs/perl.lang
+share/gtksourceview-1.0/language-specs/php.lang
+share/gtksourceview-1.0/language-specs/po.lang
+share/gtksourceview-1.0/language-specs/python.lang
+share/gtksourceview-1.0/language-specs/ruby.lang
+share/gtksourceview-1.0/language-specs/scheme.lang
+share/gtksourceview-1.0/language-specs/sh.lang
+share/gtksourceview-1.0/language-specs/spec.lang
+share/gtksourceview-1.0/language-specs/sql.lang
+share/gtksourceview-1.0/language-specs/tcl.lang
+share/gtksourceview-1.0/language-specs/texinfo.lang
+share/gtksourceview-1.0/language-specs/vbnet.lang
+share/gtksourceview-1.0/language-specs/verilog.lang
+share/gtksourceview-1.0/language-specs/vhdl.lang
+share/gtksourceview-1.0/language-specs/xml.lang
 share/locale/ar/LC_MESSAGES/gtksourceview-1.0.mo
 share/locale/az/LC_MESSAGES/gtksourceview-1.0.mo
 share/locale/be/LC_MESSAGES/gtksourceview-1.0.mo
@@ -127,8 +127,8 @@ share/locale/xh/LC_MESSAGES/gtksourceview-1.0.mo
 share/locale/zh_CN/LC_MESSAGES/gtksourceview-1.0.mo
 share/locale/zh_HK/LC_MESSAGES/gtksourceview-1.0.mo
 share/locale/zh_TW/LC_MESSAGES/gtksourceview-1.0.mo
-@dirrm share/gnome/gtksourceview-1.0/language-specs
-@dirrm share/gnome/gtksourceview-1.0
+@dirrm share/gtksourceview-1.0/language-specs
+@dirrm share/gtksourceview-1.0
 @dirrm include/gtksourceview-1.0/gtksourceview
 @dirrm include/gtksourceview-1.0
 @dirrmtry share/locale/zh_HK/LC_MESSAGES
diff --git a/x11-toolkits/gtksourceview2-reference/Makefile b/x11-toolkits/gtksourceview2-reference/Makefile
new file mode 100644
index 000000000000..05721546b110
--- /dev/null
+++ b/x11-toolkits/gtksourceview2-reference/Makefile
@@ -0,0 +1,11 @@
+# New ports collection makefile for:	gtksourceview-reference
+# Date created:				09 May 2006
+# Whom:					Jean-Yves Lefort <jylefort@FreeBSD.org>
+#
+# $FreeBSD$
+#   $MCom: ports/x11-toolkits/gtksourceview2-reference/Makefile,v 1.1 2007/06/25 20:59:01 mezz Exp $
+#
+
+PORTREVISION=	0
+
+.include "${.CURDIR}/../../devel/glib20-reference/bsd.gnome-reference.mk"
diff --git a/x11-toolkits/gtksourceview2-reference/pkg-descr b/x11-toolkits/gtksourceview2-reference/pkg-descr
new file mode 100644
index 000000000000..3065f973f59b
--- /dev/null
+++ b/x11-toolkits/gtksourceview2-reference/pkg-descr
@@ -0,0 +1 @@
+This port contains the programming reference for x11-toolkits/gtksourceview2.
diff --git a/x11-toolkits/gtksourceview2/Makefile b/x11-toolkits/gtksourceview2/Makefile
new file mode 100644
index 000000000000..29237f6ca18c
--- /dev/null
+++ b/x11-toolkits/gtksourceview2/Makefile
@@ -0,0 +1,38 @@
+# New ports collection makefile for:	gtksourceview
+# Date created:				07 May 2003
+# Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
+#
+# $FreeBSD$
+#   $MCom: ports/x11-toolkits/gtksourceview2/Makefile,v 1.54 2007/10/17 17:10:06 mezz Exp $
+#
+
+PORTNAME=	gtksourceview2
+PORTVERSION=	2.0.1
+PORTREVISION?=	0
+CATEGORIES=	x11-toolkits gnome
+MASTER_SITES=	${MASTER_SITE_GNOME}
+MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
+DISTNAME=	${PORTNAME:S/2$//}-${PORTVERSION}
+DIST_SUBDIR=	gnome2
+
+MAINTAINER=	gnome@FreeBSD.org
+COMMENT=	A text widget that adds syntax highlighting to the GtkTextView widget
+
+USE_BZIP2=	yes
+
+.if !defined(REFERENCE_PORT)
+
+USE_GETTEXT=	yes
+USE_XLIB=	yes
+USE_GMAKE=	yes
+USE_AUTOTOOLS=	libtool:15
+USE_LDCONFIG=	yes
+USE_GNOME=	gnomeprefix gnomehack gtk20 libxml2 intlhack \
+		ltverhack referencehack
+CONFIGURE_ARGS=	--enable-compile-warnings=no
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LIBS="-L${LOCALBASE}/lib"
+
+.include <bsd.port.mk>
+
+.endif
diff --git a/x11-toolkits/gtksourceview2/distinfo b/x11-toolkits/gtksourceview2/distinfo
new file mode 100644
index 000000000000..aadd0ebe4f74
--- /dev/null
+++ b/x11-toolkits/gtksourceview2/distinfo
@@ -0,0 +1,3 @@
+MD5 (gnome2/gtksourceview-2.0.1.tar.bz2) = b7848c5328e7576b1717d75c53063602
+SHA256 (gnome2/gtksourceview-2.0.1.tar.bz2) = 818bd8c6559fd4f4dd5cba219b9ec88dfb3ca989f8ba82c8ddf06ee8fe25dfa6
+SIZE (gnome2/gtksourceview-2.0.1.tar.bz2) = 1017189
diff --git a/x11-toolkits/gtksourceview2/pkg-descr b/x11-toolkits/gtksourceview2/pkg-descr
new file mode 100644
index 000000000000..729f7178053b
--- /dev/null
+++ b/x11-toolkits/gtksourceview2/pkg-descr
@@ -0,0 +1,2 @@
+GtkSourceView is a text widget for Gtk+-2 that provides syntax highlighting
+and other features typically expected in a source code editor.
diff --git a/x11-toolkits/gtksourceview2/pkg-plist b/x11-toolkits/gtksourceview2/pkg-plist
new file mode 100644
index 000000000000..69850a61fae5
--- /dev/null
+++ b/x11-toolkits/gtksourceview2/pkg-plist
@@ -0,0 +1,177 @@
+include/gtksourceview-2.0/gtksourceview/gtksourcebuffer.h
+include/gtksourceview-2.0/gtksourceview/gtksourceiter.h
+include/gtksourceview-2.0/gtksourceview/gtksourcelanguage.h
+include/gtksourceview-2.0/gtksourceview/gtksourcelanguagemanager.h
+include/gtksourceview-2.0/gtksourceview/gtksourcestyle.h
+include/gtksourceview-2.0/gtksourceview/gtksourcestylescheme.h
+include/gtksourceview-2.0/gtksourceview/gtksourcestyleschememanager.h
+include/gtksourceview-2.0/gtksourceview/gtksourceview-typebuiltins.h
+include/gtksourceview-2.0/gtksourceview/gtksourceview.h
+lib/libgtksourceview-2.0.a
+lib/libgtksourceview-2.0.la
+lib/libgtksourceview-2.0.so
+lib/libgtksourceview-2.0.so.0
+libdata/pkgconfig/gtksourceview-2.0.pc
+share/gtksourceview-2.0/language-specs/R.lang
+share/gtksourceview-2.0/language-specs/ada.lang
+share/gtksourceview-2.0/language-specs/awk.lang
+share/gtksourceview-2.0/language-specs/boo.lang
+share/gtksourceview-2.0/language-specs/c.lang
+share/gtksourceview-2.0/language-specs/changelog.lang
+share/gtksourceview-2.0/language-specs/chdr.lang
+share/gtksourceview-2.0/language-specs/check.sh
+share/gtksourceview-2.0/language-specs/convert.py
+share/gtksourceview-2.0/language-specs/cpp.lang
+share/gtksourceview-2.0/language-specs/csharp.lang
+share/gtksourceview-2.0/language-specs/css.lang
+share/gtksourceview-2.0/language-specs/d.lang
+share/gtksourceview-2.0/language-specs/def.lang
+share/gtksourceview-2.0/language-specs/desktop.lang
+share/gtksourceview-2.0/language-specs/diff.lang
+share/gtksourceview-2.0/language-specs/docbook.lang
+share/gtksourceview-2.0/language-specs/dpatch.lang
+share/gtksourceview-2.0/language-specs/dtd.lang
+share/gtksourceview-2.0/language-specs/erlang.lang
+share/gtksourceview-2.0/language-specs/fortran.lang
+share/gtksourceview-2.0/language-specs/gap.lang
+share/gtksourceview-2.0/language-specs/gtk-doc.lang
+share/gtksourceview-2.0/language-specs/gtkrc.lang
+share/gtksourceview-2.0/language-specs/haddock.lang
+share/gtksourceview-2.0/language-specs/haskell-literate.lang
+share/gtksourceview-2.0/language-specs/haskell.lang
+share/gtksourceview-2.0/language-specs/html.lang
+share/gtksourceview-2.0/language-specs/idl.lang
+share/gtksourceview-2.0/language-specs/ini.lang
+share/gtksourceview-2.0/language-specs/java.lang
+share/gtksourceview-2.0/language-specs/javascript.lang
+share/gtksourceview-2.0/language-specs/language.dtd
+share/gtksourceview-2.0/language-specs/language.rng
+share/gtksourceview-2.0/language-specs/language2.rng
+share/gtksourceview-2.0/language-specs/latex.lang
+share/gtksourceview-2.0/language-specs/libtool.lang
+share/gtksourceview-2.0/language-specs/lua.lang
+share/gtksourceview-2.0/language-specs/m4.lang
+share/gtksourceview-2.0/language-specs/makefile.lang
+share/gtksourceview-2.0/language-specs/msil.lang
+share/gtksourceview-2.0/language-specs/nemerle.lang
+share/gtksourceview-2.0/language-specs/objc.lang
+share/gtksourceview-2.0/language-specs/ocaml.lang
+share/gtksourceview-2.0/language-specs/ocl.lang
+share/gtksourceview-2.0/language-specs/octave.lang
+share/gtksourceview-2.0/language-specs/pascal.lang
+share/gtksourceview-2.0/language-specs/perl.lang
+share/gtksourceview-2.0/language-specs/php.lang
+share/gtksourceview-2.0/language-specs/pkgconfig.lang
+share/gtksourceview-2.0/language-specs/po.lang
+share/gtksourceview-2.0/language-specs/python.lang
+share/gtksourceview-2.0/language-specs/rpmspec.lang
+share/gtksourceview-2.0/language-specs/ruby.lang
+share/gtksourceview-2.0/language-specs/scheme.lang
+share/gtksourceview-2.0/language-specs/sh.lang
+share/gtksourceview-2.0/language-specs/sql.lang
+share/gtksourceview-2.0/language-specs/styles.rng
+share/gtksourceview-2.0/language-specs/tcl.lang
+share/gtksourceview-2.0/language-specs/texinfo.lang
+share/gtksourceview-2.0/language-specs/vala.lang
+share/gtksourceview-2.0/language-specs/vbnet.lang
+share/gtksourceview-2.0/language-specs/verilog.lang
+share/gtksourceview-2.0/language-specs/vhdl.lang
+share/gtksourceview-2.0/language-specs/xml.lang
+share/gtksourceview-2.0/language-specs/yacc.lang
+share/gtksourceview-2.0/styles/classic.xml
+share/gtksourceview-2.0/styles/kate.xml
+share/gtksourceview-2.0/styles/oblivion.xml
+share/gtksourceview-2.0/styles/styles.rng
+share/gtksourceview-2.0/styles/tango.xml
+share/locale/ar/LC_MESSAGES/gtksourceview-2.0.mo
+share/locale/az/LC_MESSAGES/gtksourceview-2.0.mo
+share/locale/be/LC_MESSAGES/gtksourceview-2.0.mo
+share/locale/bg/LC_MESSAGES/gtksourceview-2.0.mo
+share/locale/bn/LC_MESSAGES/gtksourceview-2.0.mo
+share/locale/bn_IN/LC_MESSAGES/gtksourceview-2.0.mo
+share/locale/bs/LC_MESSAGES/gtksourceview-2.0.mo
+share/locale/ca/LC_MESSAGES/gtksourceview-2.0.mo
+share/locale/cs/LC_MESSAGES/gtksourceview-2.0.mo
+share/locale/cy/LC_MESSAGES/gtksourceview-2.0.mo
+share/locale/da/LC_MESSAGES/gtksourceview-2.0.mo
+share/locale/de/LC_MESSAGES/gtksourceview-2.0.mo
+share/locale/dz/LC_MESSAGES/gtksourceview-2.0.mo
+share/locale/el/LC_MESSAGES/gtksourceview-2.0.mo
+share/locale/en_CA/LC_MESSAGES/gtksourceview-2.0.mo
+share/locale/en_GB/LC_MESSAGES/gtksourceview-2.0.mo
+share/locale/es/LC_MESSAGES/gtksourceview-2.0.mo
+share/locale/et/LC_MESSAGES/gtksourceview-2.0.mo
+share/locale/eu/LC_MESSAGES/gtksourceview-2.0.mo
+share/locale/fa/LC_MESSAGES/gtksourceview-2.0.mo
+share/locale/fi/LC_MESSAGES/gtksourceview-2.0.mo
+share/locale/fr/LC_MESSAGES/gtksourceview-2.0.mo
+share/locale/ga/LC_MESSAGES/gtksourceview-2.0.mo
+share/locale/gl/LC_MESSAGES/gtksourceview-2.0.mo
+share/locale/gu/LC_MESSAGES/gtksourceview-2.0.mo
+share/locale/he/LC_MESSAGES/gtksourceview-2.0.mo
+share/locale/hi/LC_MESSAGES/gtksourceview-2.0.mo
+share/locale/hr/LC_MESSAGES/gtksourceview-2.0.mo
+share/locale/hu/LC_MESSAGES/gtksourceview-2.0.mo
+share/locale/id/LC_MESSAGES/gtksourceview-2.0.mo
+share/locale/it/LC_MESSAGES/gtksourceview-2.0.mo
+share/locale/ja/LC_MESSAGES/gtksourceview-2.0.mo
+share/locale/ko/LC_MESSAGES/gtksourceview-2.0.mo
+share/locale/lt/LC_MESSAGES/gtksourceview-2.0.mo
+share/locale/lv/LC_MESSAGES/gtksourceview-2.0.mo
+share/locale/mg/LC_MESSAGES/gtksourceview-2.0.mo
+share/locale/mk/LC_MESSAGES/gtksourceview-2.0.mo
+share/locale/ml/LC_MESSAGES/gtksourceview-2.0.mo
+share/locale/mn/LC_MESSAGES/gtksourceview-2.0.mo
+share/locale/mr/LC_MESSAGES/gtksourceview-2.0.mo
+share/locale/ms/LC_MESSAGES/gtksourceview-2.0.mo
+share/locale/nb/LC_MESSAGES/gtksourceview-2.0.mo
+share/locale/ne/LC_MESSAGES/gtksourceview-2.0.mo
+share/locale/nl/LC_MESSAGES/gtksourceview-2.0.mo
+share/locale/oc/LC_MESSAGES/gtksourceview-2.0.mo
+share/locale/or/LC_MESSAGES/gtksourceview-2.0.mo
+share/locale/pa/LC_MESSAGES/gtksourceview-2.0.mo
+share/locale/pl/LC_MESSAGES/gtksourceview-2.0.mo
+share/locale/pt/LC_MESSAGES/gtksourceview-2.0.mo
+share/locale/pt_BR/LC_MESSAGES/gtksourceview-2.0.mo
+share/locale/ro/LC_MESSAGES/gtksourceview-2.0.mo
+share/locale/ru/LC_MESSAGES/gtksourceview-2.0.mo
+share/locale/rw/LC_MESSAGES/gtksourceview-2.0.mo
+share/locale/si/LC_MESSAGES/gtksourceview-2.0.mo
+share/locale/sk/LC_MESSAGES/gtksourceview-2.0.mo
+share/locale/sl/LC_MESSAGES/gtksourceview-2.0.mo
+share/locale/sq/LC_MESSAGES/gtksourceview-2.0.mo
+share/locale/sr/LC_MESSAGES/gtksourceview-2.0.mo
+share/locale/sr@Latn/LC_MESSAGES/gtksourceview-2.0.mo
+share/locale/sv/LC_MESSAGES/gtksourceview-2.0.mo
+share/locale/ta/LC_MESSAGES/gtksourceview-2.0.mo
+share/locale/th/LC_MESSAGES/gtksourceview-2.0.mo
+share/locale/tr/LC_MESSAGES/gtksourceview-2.0.mo
+share/locale/uk/LC_MESSAGES/gtksourceview-2.0.mo
+share/locale/vi/LC_MESSAGES/gtksourceview-2.0.mo
+share/locale/xh/LC_MESSAGES/gtksourceview-2.0.mo
+share/locale/zh_CN/LC_MESSAGES/gtksourceview-2.0.mo
+share/locale/zh_HK/LC_MESSAGES/gtksourceview-2.0.mo
+share/locale/zh_TW/LC_MESSAGES/gtksourceview-2.0.mo
+@dirrm share/gtksourceview-2.0/styles
+@dirrm share/gtksourceview-2.0/language-specs
+@dirrm share/gtksourceview-2.0
+@dirrm include/gtksourceview-2.0/gtksourceview
+@dirrm include/gtksourceview-2.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/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
+@dirrmtry share/locale/mg
+@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/x11-toolkits/guile-gnome/Makefile b/x11-toolkits/guile-gnome/Makefile
index 70d158effba9..edffbec5870e 100644
--- a/x11-toolkits/guile-gnome/Makefile
+++ b/x11-toolkits/guile-gnome/Makefile
@@ -3,11 +3,11 @@
 # Whom:                			Ade Lovett <ade@FreeBSD.org>
 #
 # $FreeBSD$
-#
+#    $MCom: ports/x11-toolkits/guile-gnome/Makefile,v 1.2 2007/07/30 21:23:18 mezz Exp $
 
 PORTNAME=	guile-gnome
 PORTVERSION=	0.20
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	x11-toolkits gnome scheme
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-guile/0.20
diff --git a/x11-toolkits/guile-gnome/files/patch-guile-gnome::bonobo::Makefile.in b/x11-toolkits/guile-gnome/files/patch-guile-gnome::bonobo::Makefile.in
index b8a85cdc531d..2921ca1bf1d0 100644
--- a/x11-toolkits/guile-gnome/files/patch-guile-gnome::bonobo::Makefile.in
+++ b/x11-toolkits/guile-gnome/files/patch-guile-gnome::bonobo::Makefile.in
@@ -1,6 +1,3 @@
-
-$FreeBSD$
-
 --- guile-gnome/bonobo/Makefile.in.orig	Fri Mar  9 19:07:48 2001
 +++ guile-gnome/bonobo/Makefile.in	Mon Nov 12 14:05:21 2001
 @@ -98,10 +98,10 @@
diff --git a/x11-toolkits/guile-gnome/files/patch-guile-gnome::gdk-pixbuf::Makefile.in b/x11-toolkits/guile-gnome/files/patch-guile-gnome::gdk-pixbuf::Makefile.in
index 98da7a4aaa2f..70486d75329a 100644
--- a/x11-toolkits/guile-gnome/files/patch-guile-gnome::gdk-pixbuf::Makefile.in
+++ b/x11-toolkits/guile-gnome/files/patch-guile-gnome::gdk-pixbuf::Makefile.in
@@ -1,6 +1,3 @@
-
-$FreeBSD$
-
 --- guile-gnome/gdk-pixbuf/Makefile.in	2001/11/12 12:09:05	1.1
 +++ guile-gnome/gdk-pixbuf/Makefile.in	2001/11/12 12:09:54
 @@ -98,7 +98,7 @@
diff --git a/x11-toolkits/guile-gnome/files/patch-guile-gnome::gtkhtml::gtkhtml.defs b/x11-toolkits/guile-gnome/files/patch-guile-gnome::gtkhtml::gtkhtml.defs
index cb215e9ed4f6..50a187329f00 100644
--- a/x11-toolkits/guile-gnome/files/patch-guile-gnome::gtkhtml::gtkhtml.defs
+++ b/x11-toolkits/guile-gnome/files/patch-guile-gnome::gtkhtml::gtkhtml.defs
@@ -1,6 +1,3 @@
-
-$FreeBSD$
-
 --- guile-gnome/gtkhtml/gtkhtml.defs	2001/07/24 09:08:47	1.1
 +++ guile-gnome/gtkhtml/gtkhtml.defs	2001/07/24 09:20:23
 @@ -78,7 +78,8 @@
diff --git a/x11-toolkits/guile-gnome/pkg-plist b/x11-toolkits/guile-gnome/pkg-plist
index d815d124b9a3..12a345e5d2d0 100644
--- a/x11-toolkits/guile-gnome/pkg-plist
+++ b/x11-toolkits/guile-gnome/pkg-plist
@@ -31,24 +31,24 @@ lib/libguilezvt.a
 lib/libguilezvt.la
 lib/libguilezvt.so
 lib/libguilezvt.so.0
-share/gnome/guile-gnome/bonobo.defs
-share/gnome/guile-gnome/ghttp.defs
-share/gnome/guile-gnome/gnome.defs
-share/gnome/guile-gnome/gnorba.defs
-share/gnome/guile-gnome/gtkhtml.defs
-share/gnome/guile-gnome/zvt.defs
-share/gnome/guile-gtk/gdkpixbuf.defs
-share/gnome/guile-gtk/libglade.defs
-share/gnome/guile/gnome/bonobo.scm
-share/gnome/guile/gnome/ghttp.scm
-share/gnome/guile/gnome/gnome.scm
-share/gnome/guile/gnome/gnorba.scm
-share/gnome/guile/gnome/zvt.scm
-share/gnome/guile/gtk/gdkpixbuf.scm
-share/gnome/guile/gtk/gtkhtml.scm
-share/gnome/guile/gtk/libglade.scm
-@dirrm share/gnome/guile/gtk
-@dirrm share/gnome/guile/gnome
-@dirrm share/gnome/guile
-@dirrm share/gnome/guile-gtk
-@dirrm share/gnome/guile-gnome
+share/guile-gnome/bonobo.defs
+share/guile-gnome/ghttp.defs
+share/guile-gnome/gnome.defs
+share/guile-gnome/gnorba.defs
+share/guile-gnome/gtkhtml.defs
+share/guile-gnome/zvt.defs
+share/guile-gtk/gdkpixbuf.defs
+share/guile-gtk/libglade.defs
+share/guile/gnome/bonobo.scm
+share/guile/gnome/ghttp.scm
+share/guile/gnome/gnome.scm
+share/guile/gnome/gnorba.scm
+share/guile/gnome/zvt.scm
+share/guile/gtk/gdkpixbuf.scm
+share/guile/gtk/gtkhtml.scm
+share/guile/gtk/libglade.scm
+@dirrm share/guile/gtk
+@dirrm share/guile/gnome
+@dirrm share/guile
+@dirrm share/guile-gtk
+@dirrm share/guile-gnome
diff --git a/x11-toolkits/inti/Makefile b/x11-toolkits/inti/Makefile
index bd3f023934a8..02167a06e8af 100644
--- a/x11-toolkits/inti/Makefile
+++ b/x11-toolkits/inti/Makefile
@@ -4,11 +4,11 @@
 # Whom:				ijliao
 #
 # $FreeBSD$
-#
+#    $MCom: ports/x11-toolkits/inti/Makefile,v 1.3 2007/05/23 16:18:51 ahze Exp $
 
 PORTNAME=	inti
 PORTVERSION=	1.2
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	inti
@@ -47,9 +47,9 @@ post-install:
 	@${FIND} ${EXAMPLESDIR} -type d | ${SORT} -r | \
 		${SED} 's,^${PREFIX}/,@dirrm ,' >> ${TMPPLIST}
 .endif
-	@${FIND} ${PREFIX}/share/gnome/inti -type f | \
+	@${FIND} ${PREFIX}/share/inti -type f | \
 		${SED} 's,^${PREFIX}/,,' >> ${TMPPLIST}
-	@${FIND} ${PREFIX}/share/gnome/inti -type d | ${SORT} -r | \
+	@${FIND} ${PREFIX}/share/inti -type d | ${SORT} -r | \
 		${SED} 's,^${PREFIX}/,@dirrm ,' >> ${TMPPLIST}
 
 .include <bsd.port.post.mk>
diff --git a/x11-toolkits/libbonoboui/Makefile b/x11-toolkits/libbonoboui/Makefile
index dfc641f47583..9c1966b82d42 100644
--- a/x11-toolkits/libbonoboui/Makefile
+++ b/x11-toolkits/libbonoboui/Makefile
@@ -3,12 +3,12 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#    $MCom: ports/x11-toolkits/libbonoboui/Makefile,v 1.55 2007/03/12 18:11:27 marcus Exp $
+#    $MCom: ports/x11-toolkits/libbonoboui/Makefile,v 1.61 2007/09/17 14:52:59 ahze Exp $
 #
 
 PORTNAME=	libbonoboui
-PORTVERSION=	2.18.0
-PORTREVISION?=	1
+PORTVERSION=	2.20.0
+PORTREVISION?=	0
 CATEGORIES=	x11-toolkits gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/x11-toolkits/libbonoboui/distinfo b/x11-toolkits/libbonoboui/distinfo
index bc5fcfe2fea8..43cf32693b35 100644
--- a/x11-toolkits/libbonoboui/distinfo
+++ b/x11-toolkits/libbonoboui/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome/libbonoboui-2.18.0.tar.bz2) = 22bd67a0a8b7f156c02c5fc08fb1fa24
-SHA256 (gnome/libbonoboui-2.18.0.tar.bz2) = 2963b3f0f348faa43eb84083ce93070ec82844205744219dec2df46ed2305775
-SIZE (gnome/libbonoboui-2.18.0.tar.bz2) = 981973
+MD5 (gnome/libbonoboui-2.20.0.tar.bz2) = 14427a459f6ca355de5f5e47ce95c1c4
+SHA256 (gnome/libbonoboui-2.20.0.tar.bz2) = e6958e88039a9ef409ad8e90f78d65c0171e22ee0927f07790eaf6ede722a838
+SIZE (gnome/libbonoboui-2.20.0.tar.bz2) = 991509
diff --git a/x11-toolkits/libbonoboui/files/patch-Makefile.in b/x11-toolkits/libbonoboui/files/patch-Makefile.in
index 023280c3527b..4ef163bdabda 100644
--- a/x11-toolkits/libbonoboui/files/patch-Makefile.in
+++ b/x11-toolkits/libbonoboui/files/patch-Makefile.in
@@ -1,6 +1,6 @@
---- Makefile.in.orig	Sun Jan 28 17:47:38 2007
-+++ Makefile.in	Sun Jan 28 17:47:59 2007
-@@ -254,7 +254,7 @@ sysconfdir = @sysconfdir@
+--- Makefile.in.orig	2007-07-31 00:33:13.000000000 -0400
++++ Makefile.in	2007-07-31 00:33:29.000000000 -0400
+@@ -253,7 +253,7 @@ sysconfdir = @sysconfdir@
  target_alias = @target_alias@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
diff --git a/x11-toolkits/libbonoboui/pkg-plist b/x11-toolkits/libbonoboui/pkg-plist
index 1349efca8b18..f7257bbe9e60 100644
--- a/x11-toolkits/libbonoboui/pkg-plist
+++ b/x11-toolkits/libbonoboui/pkg-plist
@@ -43,10 +43,10 @@ lib/libglade/2.0/libbonobo.so
 libdata/bonobo/servers/Bonobo_Sample_Controls.server
 libdata/bonobo/servers/CanvDemo.server
 libdata/pkgconfig/libbonoboui-2.0.pc
-share/gnome/applications/bonobo-browser.desktop
-share/gnome/gnome-2.0/ui/Bonobo_Sample_Container-ui.xml
-share/gnome/gnome-2.0/ui/Bonobo_Sample_Hello.xml
-share/gnome/gnome-2.0/ui/bonobo-browser.xml
+share/applications/bonobo-browser.desktop
+share/gnome-2.0/ui/Bonobo_Sample_Container-ui.xml
+share/gnome-2.0/ui/Bonobo_Sample_Hello.xml
+share/gnome-2.0/ui/bonobo-browser.xml
 share/locale/af/LC_MESSAGES/libbonoboui-2.0.mo
 share/locale/am/LC_MESSAGES/libbonoboui-2.0.mo
 share/locale/ar/LC_MESSAGES/libbonoboui-2.0.mo
@@ -100,6 +100,7 @@ share/locale/ne/LC_MESSAGES/libbonoboui-2.0.mo
 share/locale/nl/LC_MESSAGES/libbonoboui-2.0.mo
 share/locale/nn/LC_MESSAGES/libbonoboui-2.0.mo
 share/locale/nso/LC_MESSAGES/libbonoboui-2.0.mo
+share/locale/oc/LC_MESSAGES/libbonoboui-2.0.mo
 share/locale/or/LC_MESSAGES/libbonoboui-2.0.mo
 share/locale/pa/LC_MESSAGES/libbonoboui-2.0.mo
 share/locale/pl/LC_MESSAGES/libbonoboui-2.0.mo
@@ -116,6 +117,7 @@ share/locale/sr@Latn/LC_MESSAGES/libbonoboui-2.0.mo
 share/locale/sr@ije/LC_MESSAGES/libbonoboui-2.0.mo
 share/locale/sv/LC_MESSAGES/libbonoboui-2.0.mo
 share/locale/ta/LC_MESSAGES/libbonoboui-2.0.mo
+share/locale/th/LC_MESSAGES/libbonoboui-2.0.mo
 share/locale/tr/LC_MESSAGES/libbonoboui-2.0.mo
 share/locale/uk/LC_MESSAGES/libbonoboui-2.0.mo
 share/locale/vi/LC_MESSAGES/libbonoboui-2.0.mo
@@ -142,6 +144,8 @@ share/locale/zu/LC_MESSAGES/libbonoboui-2.0.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/nso/LC_MESSAGES
 @dirrmtry share/locale/nso
 @dirrmtry share/locale/mr/LC_MESSAGES
@@ -154,3 +158,4 @@ share/locale/zu/LC_MESSAGES/libbonoboui-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/x11-toolkits/libgail-gnome/Makefile b/x11-toolkits/libgail-gnome/Makefile
index 15f6facea973..47b92a91db78 100644
--- a/x11-toolkits/libgail-gnome/Makefile
+++ b/x11-toolkits/libgail-gnome/Makefile
@@ -3,12 +3,11 @@
 # Whom:				Maxim Sobolev <sobomax@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/x11-toolkits/libgail-gnome/Makefile,v 1.18 2007/03/12 13:52:14 ahze Exp $
+#   $MCom: ports/x11-toolkits/libgail-gnome/Makefile,v 1.21 2007/09/17 13:13:59 ahze Exp $
 #
 
 PORTNAME=	libgail-gnome
-PORTVERSION=	1.18.0
-PORTREVISION=	1
+PORTVERSION=	1.20.0
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
diff --git a/x11-toolkits/libgail-gnome/distinfo b/x11-toolkits/libgail-gnome/distinfo
index 7232f8381615..bf5919840106 100644
--- a/x11-toolkits/libgail-gnome/distinfo
+++ b/x11-toolkits/libgail-gnome/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/libgail-gnome-1.18.0.tar.bz2) = 2dd239118bf252c7b1e3d1701cd8a954
-SHA256 (gnome2/libgail-gnome-1.18.0.tar.bz2) = c2c921517ea6be997316302df8cd3a7311a436d5101926516ea646dbb054a9b0
-SIZE (gnome2/libgail-gnome-1.18.0.tar.bz2) = 223621
+MD5 (gnome2/libgail-gnome-1.20.0.tar.bz2) = 5a7662e3d637c86baa95a50adb225e56
+SHA256 (gnome2/libgail-gnome-1.20.0.tar.bz2) = 9e29f7a66554103ef467334a7ac4bf682556b0268c30514a7050e3476e0e29c5
+SIZE (gnome2/libgail-gnome-1.20.0.tar.bz2) = 237027
diff --git a/x11-toolkits/libgnomeprintui/Makefile b/x11-toolkits/libgnomeprintui/Makefile
index 8bcb1408e7f5..fe3cfc0b5297 100644
--- a/x11-toolkits/libgnomeprintui/Makefile
+++ b/x11-toolkits/libgnomeprintui/Makefile
@@ -3,11 +3,11 @@
 # Whom:					Maxim Sobolev <sobomax@FreBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/x11-toolkits/libgnomeprintui/Makefile,v 1.64 2007/03/12 19:15:02 mezz Exp $
+#   $MCom: ports/x11-toolkits/libgnomeprintui/Makefile,v 1.69 2007/10/17 21:36:14 mezz Exp $
 #
 
 PORTNAME=	libgnomeprintui
-PORTVERSION=	2.18.0
+PORTVERSION=	2.18.1
 PORTREVISION=	2
 CATEGORIES=	x11-toolkits gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
@@ -28,7 +28,7 @@ USE_GNOME=	gnomeprefix gnomehack libgnomeprint libgnomecanvas \
 		intlhack ltverhack
 USE_GETTEXT=	yes
 USE_LDCONFIG=	yes
-USE_AUTOTOOLS=  libtool:15
+USE_AUTOTOOLS=	libtool:15
 USE_BISON=	build
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/x11-toolkits/libgnomeprintui/distinfo b/x11-toolkits/libgnomeprintui/distinfo
index 4e5193574e46..48a5909ff400 100644
--- a/x11-toolkits/libgnomeprintui/distinfo
+++ b/x11-toolkits/libgnomeprintui/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/libgnomeprintui-2.18.0.tar.bz2) = bea9871059cabee9d108bab32d58d2af
-SHA256 (gnome2/libgnomeprintui-2.18.0.tar.bz2) = dc75c70a998134e2e2a71fe7ce19f52764c2f5daa62a35c30eac1d86694e0975
-SIZE (gnome2/libgnomeprintui-2.18.0.tar.bz2) = 656952
+MD5 (gnome2/libgnomeprintui-2.18.1.tar.bz2) = 4f9a09372a5fa2cd5c35be30dff3fcd6
+SHA256 (gnome2/libgnomeprintui-2.18.1.tar.bz2) = c2bcd55a191083850d7894ee78178797603463fc79061c50f34c65c6a1d0bb0f
+SIZE (gnome2/libgnomeprintui-2.18.1.tar.bz2) = 686595
diff --git a/x11-toolkits/libgnomeprintui/pkg-plist b/x11-toolkits/libgnomeprintui/pkg-plist
index eae47f017834..ad52a4494454 100644
--- a/x11-toolkits/libgnomeprintui/pkg-plist
+++ b/x11-toolkits/libgnomeprintui/pkg-plist
@@ -30,7 +30,7 @@ libdata/pkgconfig/libgnomeprintui-2.2.pc
 %%DOCSDIR%%/right.png
 %%DOCSDIR%%/style.css
 %%DOCSDIR%%/up.png
-share/gnome/libgnomeprintui/%%VERSION%%/gnome-print-job-preview.xml
+share/libgnomeprintui/%%VERSION%%/gnome-print-job-preview.xml
 share/locale/af/LC_MESSAGES/libgnomeprintui-2.2.mo
 share/locale/am/LC_MESSAGES/libgnomeprintui-2.2.mo
 share/locale/ar/LC_MESSAGES/libgnomeprintui-2.2.mo
@@ -81,6 +81,7 @@ share/locale/nb/LC_MESSAGES/libgnomeprintui-2.2.mo
 share/locale/ne/LC_MESSAGES/libgnomeprintui-2.2.mo
 share/locale/nl/LC_MESSAGES/libgnomeprintui-2.2.mo
 share/locale/nn/LC_MESSAGES/libgnomeprintui-2.2.mo
+share/locale/oc/LC_MESSAGES/libgnomeprintui-2.2.mo
 share/locale/or/LC_MESSAGES/libgnomeprintui-2.2.mo
 share/locale/pa/LC_MESSAGES/libgnomeprintui-2.2.mo
 share/locale/pl/LC_MESSAGES/libgnomeprintui-2.2.mo
@@ -89,6 +90,7 @@ share/locale/pt_BR/LC_MESSAGES/libgnomeprintui-2.2.mo
 share/locale/ro/LC_MESSAGES/libgnomeprintui-2.2.mo
 share/locale/ru/LC_MESSAGES/libgnomeprintui-2.2.mo
 share/locale/rw/LC_MESSAGES/libgnomeprintui-2.2.mo
+share/locale/si/LC_MESSAGES/libgnomeprintui-2.2.mo
 share/locale/sk/LC_MESSAGES/libgnomeprintui-2.2.mo
 share/locale/sl/LC_MESSAGES/libgnomeprintui-2.2.mo
 share/locale/sq/LC_MESSAGES/libgnomeprintui-2.2.mo
@@ -106,8 +108,8 @@ share/locale/xh/LC_MESSAGES/libgnomeprintui-2.2.mo
 share/locale/zh_CN/LC_MESSAGES/libgnomeprintui-2.2.mo
 share/locale/zh_HK/LC_MESSAGES/libgnomeprintui-2.2.mo
 share/locale/zh_TW/LC_MESSAGES/libgnomeprintui-2.2.mo
-@dirrm share/gnome/libgnomeprintui/%%VERSION%%
-@dirrm share/gnome/libgnomeprintui
+@dirrm share/libgnomeprintui/%%VERSION%%
+@dirrm share/libgnomeprintui
 @dirrm %%DOCSDIR%%
 @dirrm include/libgnomeprintui-2.2/libgnomeprintui
 @dirrm include/libgnomeprintui-2.2
@@ -117,8 +119,12 @@ share/locale/zh_TW/LC_MESSAGES/libgnomeprintui-2.2.mo
 @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/mr/LC_MESSAGES
 @dirrmtry share/locale/mr
 @dirrmtry share/locale/dz/LC_MESSAGES
diff --git a/x11-toolkits/libgnomeui/Makefile b/x11-toolkits/libgnomeui/Makefile
index 99f09ed3db93..3bf8762aa97b 100644
--- a/x11-toolkits/libgnomeui/Makefile
+++ b/x11-toolkits/libgnomeui/Makefile
@@ -3,12 +3,12 @@
 # Whom:					Joe Marcus Clarke <marcus@FreBSD.org>
 #
 # $FreeBSD$
-#    $MCom: ports/x11-toolkits/libgnomeui/Makefile,v 1.99 2007/03/14 03:42:53 marcus Exp $
+#    $MCom: ports/x11-toolkits/libgnomeui/Makefile,v 1.108 2007/10/17 22:37:05 mezz Exp $
 #
 
 PORTNAME=	libgnomeui
-PORTVERSION=	2.18.1
-PORTREVISION?=	2
+PORTVERSION=	2.20.1.1
+PORTREVISION?=	0
 CATEGORIES=	x11-toolkits gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/x11-toolkits/libgnomeui/distinfo b/x11-toolkits/libgnomeui/distinfo
index 5930958b8652..36eb70bcf572 100644
--- a/x11-toolkits/libgnomeui/distinfo
+++ b/x11-toolkits/libgnomeui/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/libgnomeui-2.18.1.tar.bz2) = dbdb274517ad643d9397dd6868788631
-SHA256 (gnome2/libgnomeui-2.18.1.tar.bz2) = d6eef491e70fcc2c1e5b94f6a8dbb3774443b3b76b1ca5d62bfb5b802df14120
-SIZE (gnome2/libgnomeui-2.18.1.tar.bz2) = 1462027
+MD5 (gnome2/libgnomeui-2.20.1.1.tar.bz2) = d1f500c5d33ce93159b4952bb476fcf3
+SHA256 (gnome2/libgnomeui-2.20.1.1.tar.bz2) = 133933c70234ecd4560cec165034c21c94598c24c34138ed1ee1770f52328cef
+SIZE (gnome2/libgnomeui-2.20.1.1.tar.bz2) = 1445994
diff --git a/x11-toolkits/libgnomeui/files/patch-libgnomeui_gnome-thumbnail.c b/x11-toolkits/libgnomeui/files/patch-libgnomeui_gnome-thumbnail.c
deleted file mode 100644
index c3c751eff668..000000000000
--- a/x11-toolkits/libgnomeui/files/patch-libgnomeui_gnome-thumbnail.c
+++ /dev/null
@@ -1,28 +0,0 @@
---- libgnomeui/gnome-thumbnail.c.orig	Sat Jan 21 23:11:21 2006
-+++ libgnomeui/gnome-thumbnail.c	Sat Jan 21 23:10:52 2006
-@@ -994,11 +994,7 @@ gnome_thumbnail_factory_generate_thumbna
-     return NULL;
- 
-   width = gdk_pixbuf_get_width (pixbuf);
--  g_object_set_data_full (G_OBJECT (pixbuf), "gnome-thumbnail-width",
--			  g_strdup_printf ("%d", width), g_free);
-   height = gdk_pixbuf_get_height (pixbuf);
--  g_object_set_data_full (G_OBJECT (pixbuf), "gnome-thumbnail-height",
--			  g_strdup_printf ("%d", height), g_free);
- 
-   if (width > size || height > size)
-     {
-@@ -1011,6 +1007,13 @@ gnome_thumbnail_factory_generate_thumbna
-       g_object_unref (pixbuf);
-       pixbuf = scaled;
-     }
-+
-+  width = gdk_pixbuf_get_width (pixbuf);
-+  g_object_set_data_full (G_OBJECT (pixbuf), "gnome-thumbnail-width",
-+			  g_strdup_printf ("%d", width), g_free);
-+  height = gdk_pixbuf_get_height (pixbuf);
-+  g_object_set_data_full (G_OBJECT (pixbuf), "gnome-thumbnail-height",
-+			  g_strdup_printf ("%d", height), g_free);
-   
-   return pixbuf;
- }
diff --git a/x11-toolkits/libgnomeui/pkg-plist b/x11-toolkits/libgnomeui/pkg-plist
index ebd78c97d835..acce03934cfd 100644
--- a/x11-toolkits/libgnomeui/pkg-plist
+++ b/x11-toolkits/libgnomeui/pkg-plist
@@ -60,8 +60,6 @@ lib/libgnomeui-2.la
 lib/libgnomeui-2.so
 lib/libgnomeui-2.so.0
 libdata/pkgconfig/libgnomeui-2.0.pc
-libexec/gnome_segv2
-share/gnome/pixmaps/gnome-about-logo.png
 share/locale/af/LC_MESSAGES/libgnomeui-2.0.mo
 share/locale/am/LC_MESSAGES/libgnomeui-2.0.mo
 share/locale/ar/LC_MESSAGES/libgnomeui-2.0.mo
@@ -96,6 +94,7 @@ share/locale/he/LC_MESSAGES/libgnomeui-2.0.mo
 share/locale/hi/LC_MESSAGES/libgnomeui-2.0.mo
 share/locale/hr/LC_MESSAGES/libgnomeui-2.0.mo
 share/locale/hu/LC_MESSAGES/libgnomeui-2.0.mo
+share/locale/hy/LC_MESSAGES/libgnomeui-2.0.mo
 share/locale/id/LC_MESSAGES/libgnomeui-2.0.mo
 share/locale/is/LC_MESSAGES/libgnomeui-2.0.mo
 share/locale/it/LC_MESSAGES/libgnomeui-2.0.mo
@@ -119,6 +118,7 @@ share/locale/ne/LC_MESSAGES/libgnomeui-2.0.mo
 share/locale/nl/LC_MESSAGES/libgnomeui-2.0.mo
 share/locale/nn/LC_MESSAGES/libgnomeui-2.0.mo
 share/locale/nso/LC_MESSAGES/libgnomeui-2.0.mo
+share/locale/oc/LC_MESSAGES/libgnomeui-2.0.mo
 share/locale/or/LC_MESSAGES/libgnomeui-2.0.mo
 share/locale/pa/LC_MESSAGES/libgnomeui-2.0.mo
 share/locale/pl/LC_MESSAGES/libgnomeui-2.0.mo
@@ -127,6 +127,7 @@ share/locale/pt_BR/LC_MESSAGES/libgnomeui-2.0.mo
 share/locale/ro/LC_MESSAGES/libgnomeui-2.0.mo
 share/locale/ru/LC_MESSAGES/libgnomeui-2.0.mo
 share/locale/rw/LC_MESSAGES/libgnomeui-2.0.mo
+share/locale/si/LC_MESSAGES/libgnomeui-2.0.mo
 share/locale/sk/LC_MESSAGES/libgnomeui-2.0.mo
 share/locale/sl/LC_MESSAGES/libgnomeui-2.0.mo
 share/locale/sq/LC_MESSAGES/libgnomeui-2.0.mo
@@ -149,6 +150,7 @@ share/locale/zh_CN/LC_MESSAGES/libgnomeui-2.0.mo
 share/locale/zh_HK/LC_MESSAGES/libgnomeui-2.0.mo
 share/locale/zh_TW/LC_MESSAGES/libgnomeui-2.0.mo
 share/locale/zu/LC_MESSAGES/libgnomeui-2.0.mo
+share/pixmaps/gnome-about-logo.png
 @dirrmtry lib/gtk-2.0/%%GTK2_VERSION%%/filesystems
 @dirrm include/libgnomeui-2.0/libgnomeui
 @dirrm include/libgnomeui-2.0
@@ -166,8 +168,12 @@ share/locale/zu/LC_MESSAGES/libgnomeui-2.0.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/nso/LC_MESSAGES
 @dirrmtry share/locale/nso
 @dirrmtry share/locale/mr/LC_MESSAGES
@@ -178,6 +184,8 @@ share/locale/zu/LC_MESSAGES/libgnomeui-2.0.mo
 @dirrmtry share/locale/mg
 @dirrmtry share/locale/ku/LC_MESSAGES
 @dirrmtry share/locale/ku
+@dirrmtry share/locale/hy/LC_MESSAGES
+@dirrmtry share/locale/hy
 @dirrmtry share/locale/dz/LC_MESSAGES
 @dirrmtry share/locale/dz
 @dirrmtry share/locale/bn_IN/LC_MESSAGES
diff --git a/x11-toolkits/libgnomeuimm26/Makefile b/x11-toolkits/libgnomeuimm26/Makefile
index bdb4c9e4f893..1a714ac77067 100644
--- a/x11-toolkits/libgnomeuimm26/Makefile
+++ b/x11-toolkits/libgnomeuimm26/Makefile
@@ -3,12 +3,11 @@
 # Whom:                 Alexander Nedotsukov <bland@mail.ru>
 #
 # $FreeBSD$
-#   $MCom: ports/x11-toolkits/libgnomeuimm26/Makefile,v 1.10 2007/03/10 07:39:37 marcus Exp $
+#   $MCom: ports/x11-toolkits/libgnomeuimm26/Makefile,v 1.12 2007/09/17 17:05:03 marcus Exp $
 #
 
 PORTNAME=	libgnomeuimm
-PORTVERSION=	2.18.0
-PORTREVISION=	1
+PORTVERSION=	2.20.0
 CATEGORIES=	x11-toolkits gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/x11-toolkits/libgnomeuimm26/distinfo b/x11-toolkits/libgnomeuimm26/distinfo
index a83623df10cf..16f95ce7ae66 100644
--- a/x11-toolkits/libgnomeuimm26/distinfo
+++ b/x11-toolkits/libgnomeuimm26/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/libgnomeuimm-2.18.0.tar.bz2) = ba42d820f535f8e7fc5d31699d484efb
-SHA256 (gnome2/libgnomeuimm-2.18.0.tar.bz2) = 70638f28a4cc6504b9e39a1f80118dacaa029454510a1ae113dc861a665897cc
-SIZE (gnome2/libgnomeuimm-2.18.0.tar.bz2) = 349549
+MD5 (gnome2/libgnomeuimm-2.20.0.tar.bz2) = 350d3424247611a009432395aff8619f
+SHA256 (gnome2/libgnomeuimm-2.20.0.tar.bz2) = f8bb4f068b7b0fc65e026ca28a57f2109f643f537f050f8a2bd0bb019e8bca8f
+SIZE (gnome2/libgnomeuimm-2.20.0.tar.bz2) = 326994
diff --git a/x11-toolkits/libwnck/Makefile b/x11-toolkits/libwnck/Makefile
index 0e70539b7d57..374ad075f735 100644
--- a/x11-toolkits/libwnck/Makefile
+++ b/x11-toolkits/libwnck/Makefile
@@ -3,11 +3,11 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/x11-toolkits/libwnck/Makefile,v 1.85 2007/03/12 23:15:43 marcus Exp $
+#   $MCom: ports/x11-toolkits/libwnck/Makefile,v 1.98 2007/10/17 21:36:14 mezz Exp $
 #
 
 PORTNAME=	libwnck
-PORTVERSION=	2.18.3
+PORTVERSION=	2.20.1
 PORTREVISION?=	1
 CATEGORIES=	x11-toolkits gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
diff --git a/x11-toolkits/libwnck/distinfo b/x11-toolkits/libwnck/distinfo
index 2ff354fad676..6e4643d407e9 100644
--- a/x11-toolkits/libwnck/distinfo
+++ b/x11-toolkits/libwnck/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/libwnck-2.18.3.tar.bz2) = 1badcbb50e7bc59865f72ec270c15125
-SHA256 (gnome2/libwnck-2.18.3.tar.bz2) = 216e0c4d0995c3a6456141eefc07ce9905e1df67bfc2b2b7ae28ce248747415d
-SIZE (gnome2/libwnck-2.18.3.tar.bz2) = 482211
+MD5 (gnome2/libwnck-2.20.1.tar.bz2) = 8a5c390c7e2ea48e6260c0bc9ea2142b
+SHA256 (gnome2/libwnck-2.20.1.tar.bz2) = 9a9699ab2fa04433618adafb204f07216d7256c4f975ad066ac3ee0eb5e5797b
+SIZE (gnome2/libwnck-2.20.1.tar.bz2) = 648179
diff --git a/x11-toolkits/libwnck/pkg-plist b/x11-toolkits/libwnck/pkg-plist
index 2964ad3b42b3..2b85d43521af 100644
--- a/x11-toolkits/libwnck/pkg-plist
+++ b/x11-toolkits/libwnck/pkg-plist
@@ -1,3 +1,4 @@
+bin/wnckprop
 include/libwnck-1.0/libwnck/application.h
 include/libwnck-1.0/libwnck/class-group.h
 include/libwnck-1.0/libwnck/libwnck.h
@@ -13,7 +14,7 @@ include/libwnck-1.0/libwnck/workspace.h
 lib/libwnck-1.a
 lib/libwnck-1.la
 lib/libwnck-1.so
-lib/libwnck-1.so.18
+lib/libwnck-1.so.22
 libdata/pkgconfig/libwnck-1.0.pc
 share/locale/am/LC_MESSAGES/libwnck.mo
 share/locale/ar/LC_MESSAGES/libwnck.mo
@@ -69,6 +70,7 @@ share/locale/nb/LC_MESSAGES/libwnck.mo
 share/locale/ne/LC_MESSAGES/libwnck.mo
 share/locale/nl/LC_MESSAGES/libwnck.mo
 share/locale/nn/LC_MESSAGES/libwnck.mo
+share/locale/oc/LC_MESSAGES/libwnck.mo
 share/locale/or/LC_MESSAGES/libwnck.mo
 share/locale/pa/LC_MESSAGES/libwnck.mo
 share/locale/pl/LC_MESSAGES/libwnck.mo
@@ -77,6 +79,7 @@ share/locale/pt_BR/LC_MESSAGES/libwnck.mo
 share/locale/ro/LC_MESSAGES/libwnck.mo
 share/locale/ru/LC_MESSAGES/libwnck.mo
 share/locale/rw/LC_MESSAGES/libwnck.mo
+share/locale/si/LC_MESSAGES/libwnck.mo
 share/locale/sk/LC_MESSAGES/libwnck.mo
 share/locale/sl/LC_MESSAGES/libwnck.mo
 share/locale/sq/LC_MESSAGES/libwnck.mo
@@ -102,8 +105,12 @@ share/locale/zh_TW/LC_MESSAGES/libwnck.mo
 @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/mr/LC_MESSAGES
 @dirrmtry share/locale/mr
 @dirrmtry share/locale/mi/LC_MESSAGES
diff --git a/x11-toolkits/pango/Makefile b/x11-toolkits/pango/Makefile
index 4c152632efde..9a970c620685 100644
--- a/x11-toolkits/pango/Makefile
+++ b/x11-toolkits/pango/Makefile
@@ -3,11 +3,11 @@
 # Whom:				Maxim Sobolev <sobomax@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/x11-toolkits/pango/Makefile,v 1.94 2007/03/13 00:54:42 mezz Exp $
+#   $MCom: ports/x11-toolkits/pango/Makefile,v 1.111 2007/10/15 21:40:26 mezz Exp $
 #
 
 PORTNAME=	pango
-PORTVERSION=	1.16.5
+PORTVERSION=	1.18.3
 PORTREVISION?=	0
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_GNOME:S,%SUBDIR%,sources/pango/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/},} \
@@ -41,8 +41,8 @@ CONFIGURE_ARGS=	--with-qt=no \
 GLIB2_CFLAGS=	`pkg-config glib-2.0 --cflags`
 PLIST_SUB=	VERSION="1.6.0"
 
-FONTSCALE=	${X11BASE}/lib/X11/fonts/TTF/luximb.ttf
-FONTENCOD=	${X11BASE}/lib/X11/fonts/encodings/encodings.dir
+FONTSCALE=	${LOCALBASE}/lib/X11/fonts/TTF/luximb.ttf
+FONTENCOD=	${LOCALBASE}/lib/X11/fonts/encodings/encodings.dir
 
 MAN1=		pango-querymodules.1
 
@@ -53,12 +53,10 @@ CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include/freetype2 \
 			LDFLAGS="-L${LOCALBASE}/lib"
 PLIST_SUB+=		X11="@comment "
 .else
-USE_XLIB+=		yes
-LIB_DEPENDS+=		Xft.2:${PORTSDIR}/x11-fonts/libXft
+USE_XORG+=		xft xrender
 CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include/freetype2 \
-				${GLIB2_CFLAGS} -I${LOCALBASE}/include \
-				-I${X11BASE}/include" \
-			LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
+				${GLIB2_CFLAGS} -I${LOCALBASE}/include" \
+			LDFLAGS="-L${LOCALBASE}/lib"
 PLIST_SUB+=		X11=""
 .endif
 
diff --git a/x11-toolkits/pango/distinfo b/x11-toolkits/pango/distinfo
index 521323d36978..3fd27c4df6b5 100644
--- a/x11-toolkits/pango/distinfo
+++ b/x11-toolkits/pango/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/pango-1.16.5.tar.bz2) = d8d7da2ab854f6e257ec06bf552a6114
-SHA256 (gnome2/pango-1.16.5.tar.bz2) = 78ffda1dd67b16c6f558c918d2473de284091bfab075777a4f81e33752bc444d
-SIZE (gnome2/pango-1.16.5.tar.bz2) = 1345977
+MD5 (gnome2/pango-1.18.3.tar.bz2) = 4a9862b5151f16dcad8e30dd6ef08549
+SHA256 (gnome2/pango-1.18.3.tar.bz2) = a1547a88ba9330956ce9f2f9e2ab74491e7344cc25fee4310b7f72c7e5f38db3
+SIZE (gnome2/pango-1.18.3.tar.bz2) = 1394980
diff --git a/x11-toolkits/pango/pkg-plist b/x11-toolkits/pango/pkg-plist
index 0dfe3c306b63..86ba73dc53f8 100644
--- a/x11-toolkits/pango/pkg-plist
+++ b/x11-toolkits/pango/pkg-plist
@@ -16,6 +16,7 @@ include/pango-1.0/pango/pango-glyph-item.h
 include/pango-1.0/pango/pango-glyph.h
 include/pango-1.0/pango/pango-gravity.h
 include/pango-1.0/pango/pango-item.h
+include/pango-1.0/pango/pango-language.h
 include/pango-1.0/pango/pango-layout.h
 include/pango-1.0/pango/pango-matrix.h
 include/pango-1.0/pango/pango-modules.h
diff --git a/x11-toolkits/py-gnome-desktop/Makefile b/x11-toolkits/py-gnome-desktop/Makefile
index afe66097e2af..c7fad2d56cb1 100644
--- a/x11-toolkits/py-gnome-desktop/Makefile
+++ b/x11-toolkits/py-gnome-desktop/Makefile
@@ -3,12 +3,11 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#    $MCom: ports/x11-toolkits/py-gnome-desktop/Makefile,v 1.58 2007/03/18 05:45:44 marcus Exp $
+#    $MCom: ports/x11-toolkits/py-gnome-desktop/Makefile,v 1.65 2007/09/16 17:47:04 ahze Exp $
 #
 
 PORTNAME=	gnome
-PORTVERSION=	2.18.0
-PORTREVISION=	2
+PORTVERSION=	2.20.0
 CATEGORIES=	x11-toolkits python gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-python-desktop/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -22,7 +21,7 @@ COMMENT=	A set of Python bindings used by modules in the GNOME Desktop
 
 BUILD_DEPENDS=	bug-buddy:${PORTSDIR}/devel/bug-buddy
 LIB_DEPENDS=	gtop-2.0.7:${PORTSDIR}/devel/libgtop \
-		totem-plparser.1:${PORTSDIR}/multimedia/totem \
+		totem-plparser.7:${PORTSDIR}/multimedia/totem \
 		gnome-media-profiles.0:${PORTSDIR}/audio/gnome-media \
 		gnome-keyring:${PORTSDIR}/security/gnome-keyring
 RUN_DEPENDS=	bug-buddy:${PORTSDIR}/devel/bug-buddy
diff --git a/x11-toolkits/py-gnome-desktop/distinfo b/x11-toolkits/py-gnome-desktop/distinfo
index 7a6a8dc4b2cb..244fc7d5468b 100644
--- a/x11-toolkits/py-gnome-desktop/distinfo
+++ b/x11-toolkits/py-gnome-desktop/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-python-desktop-2.18.0.tar.bz2) = ce1b1c095a69c2656177570a2939fabb
-SHA256 (gnome2/gnome-python-desktop-2.18.0.tar.bz2) = 1238ed484620cd29e65695376ebf8a38162b4a94706b956b647e43776820d787
-SIZE (gnome2/gnome-python-desktop-2.18.0.tar.bz2) = 432321
+MD5 (gnome2/gnome-python-desktop-2.20.0.tar.bz2) = 02b177f488091d27bf0648ec4660d8f7
+SHA256 (gnome2/gnome-python-desktop-2.20.0.tar.bz2) = 32e2f5f4d3e79157a83cb7a1c6c409bc2fef75178f9626b2d83a1fd1c2ee4a8d
+SIZE (gnome2/gnome-python-desktop-2.20.0.tar.bz2) = 440199
diff --git a/x11-toolkits/py-gnome-extras/Makefile b/x11-toolkits/py-gnome-extras/Makefile
index 2cfcf76a57c6..8bb79f1fe771 100644
--- a/x11-toolkits/py-gnome-extras/Makefile
+++ b/x11-toolkits/py-gnome-extras/Makefile
@@ -3,12 +3,12 @@
 # Whom:					Koop Mast <kwm@FreeBSD.org>
 #
 # $FreeBSD$
-#    $MCom: ports/x11-toolkits/py-gnome-extras/Makefile,v 1.36 2006/03/12 23:45:37 marcus Exp $
+#   $MCom: ports/x11-toolkits/py-gnome-extras/Makefile,v 1.41 2007/07/28 18:23:53 marcus Exp $
 #
 
 PORTNAME=	gnome
-PORTVERSION=	2.14.3
-PORTREVISION=	3
+PORTVERSION=	2.19.1
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits python gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-python-extras/${PORTVERSION:C/..$//}
@@ -29,7 +29,7 @@ USE_GECKO=	firefox seamonkey xulrunner mozilla
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_PYTHON=	yes
-USE_GNOME=	gnomehack libgtkhtml pygnome2 libgda2
+USE_GNOME=	gnomehack libgtkhtml pygnome2
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-gtkmozembed=${GECKO}
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/x11-toolkits/py-gnome-extras/distinfo b/x11-toolkits/py-gnome-extras/distinfo
index 3616f3f71fc2..c16b77d8ddb3 100644
--- a/x11-toolkits/py-gnome-extras/distinfo
+++ b/x11-toolkits/py-gnome-extras/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-python-extras-2.14.3.tar.bz2) = 7d3414838ccb94cfcecc0a48f68c012d
-SHA256 (gnome2/gnome-python-extras-2.14.3.tar.bz2) = 2c0392d3f71272d4c3921f715aaf9ef7e54ee64be12d778fb2fb53f40d14f4c5
-SIZE (gnome2/gnome-python-extras-2.14.3.tar.bz2) = 363684
+MD5 (gnome2/gnome-python-extras-2.19.1.tar.bz2) = 08896c63d71ce44d20fafbaf9c0edc78
+SHA256 (gnome2/gnome-python-extras-2.19.1.tar.bz2) = c5f74f4c46dbb379d119d6f74ca4a47653af251bea176dc7a0ecacccb88339f0
+SIZE (gnome2/gnome-python-extras-2.19.1.tar.bz2) = 361721
diff --git a/x11-toolkits/py-gnome-extras/pkg-plist b/x11-toolkits/py-gnome-extras/pkg-plist
index 2940eacbaee6..9a0550865cec 100644
--- a/x11-toolkits/py-gnome-extras/pkg-plist
+++ b/x11-toolkits/py-gnome-extras/pkg-plist
@@ -1,4 +1,3 @@
-include/pygda-1.2/pygdavalue_conversions.h
 %%PYTHON_SITELIBDIR%%/gtk-2.0/egg/__init__.py
 %%PYTHON_SITELIBDIR%%/gtk-2.0/egg/__init__.pyc
 %%PYTHON_SITELIBDIR%%/gtk-2.0/egg/__init__.pyo
@@ -6,8 +5,6 @@ include/pygda-1.2/pygdavalue_conversions.h
 %%PYTHON_SITELIBDIR%%/gtk-2.0/egg/recent.so
 %%PYTHON_SITELIBDIR%%/gtk-2.0/egg/trayicon.la
 %%PYTHON_SITELIBDIR%%/gtk-2.0/egg/trayicon.so
-%%PYTHON_SITELIBDIR%%/gtk-2.0/gda.la
-%%PYTHON_SITELIBDIR%%/gtk-2.0/gda.so
 %%PYTHON_SITELIBDIR%%/gtk-2.0/gdl.la
 %%PYTHON_SITELIBDIR%%/gtk-2.0/gdl.so
 %%PYTHON_SITELIBDIR%%/gtk-2.0/gksu/__init__.py
@@ -24,7 +21,6 @@ include/pygda-1.2/pygdavalue_conversions.h
 %%PYTHON_SITELIBDIR%%/gtk-2.0/gtkspell.la
 %%PYTHON_SITELIBDIR%%/gtk-2.0/gtkspell.so
 libdata/pkgconfig/gnome-python-extras-2.0.pc
-libdata/pkgconfig/pygda-1.2.pc
 %%PORTDOCS%%%%DOCSDIR%%/pygtkmozembed/class-gtkmozembed.html
 %%PORTDOCS%%%%DOCSDIR%%/pygtkmozembed/gtkmozembed-class-reference.html
 %%PORTDOCS%%%%DOCSDIR%%/pygtkmozembed/index.html
@@ -43,15 +39,16 @@ libdata/pkgconfig/pygda-1.2.pc
 %%PORTDOCS%%share/examples/py-gnome/gdl/gdl_combo_button.py
 %%PORTDOCS%%share/examples/py-gnome/gdl/gdl_dock.py
 %%PORTDOCS%%share/examples/py-gnome/gdl/gdl_test.py
+%%PORTDOCS%%share/examples/py-gnome/gksu2/simple.py
 %%PORTDOCS%%share/examples/py-gnome/gtkhtml2/simple-browser.py
 %%PORTDOCS%%share/examples/py-gnome/gtkspell/gtkspell.py
 %%PORTDOCS%%share/examples/py-gnome/gtkspell/test.py
-share/pygtk/2.0/defs/gda.defs
 share/pygtk/2.0/defs/gtkhtml2.defs
 share/pygtk/2.0/defs/gtkmozembed.defs
 share/pygtk/2.0/defs/trayicon.defs
 %%PORTDOCS%%@dirrm share/examples/py-gnome/gtkspell
 %%PORTDOCS%%@dirrm share/examples/py-gnome/gtkhtml2
+%%PORTDOCS%%@dirrm share/examples/py-gnome/gksu2
 %%PORTDOCS%%@dirrm share/examples/py-gnome/gdl
 %%PORTDOCS%%@dirrm share/examples/py-gnome/egg/recent
 %%PORTDOCS%%@dirrm share/examples/py-gnome/egg
@@ -60,4 +57,3 @@ share/pygtk/2.0/defs/trayicon.defs
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm %%PYTHON_SITELIBDIR%%/gtk-2.0/gksu
 @dirrm %%PYTHON_SITELIBDIR%%/gtk-2.0/egg
-@dirrm include/pygda-1.2
diff --git a/x11-toolkits/py-gnome2/Makefile b/x11-toolkits/py-gnome2/Makefile
index 9b339eef4f7b..9a0446eaa24f 100644
--- a/x11-toolkits/py-gnome2/Makefile
+++ b/x11-toolkits/py-gnome2/Makefile
@@ -3,12 +3,11 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/x11-toolkits/py-gnome2/Makefile,v 1.41 2007/03/12 19:06:44 mezz Exp $
+#   $MCom: ports/x11-toolkits/py-gnome2/Makefile,v 1.45 2007/09/16 17:35:44 ahze Exp $
 #
 
 PORTNAME=	gnome
-PORTVERSION=	2.18.2
-PORTREVISION=	1
+PORTVERSION=	2.20.0
 CATEGORIES=	x11-toolkits python gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-python/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/x11-toolkits/py-gnome2/distinfo b/x11-toolkits/py-gnome2/distinfo
index e82aafe57d04..2f0ba44c4eb9 100644
--- a/x11-toolkits/py-gnome2/distinfo
+++ b/x11-toolkits/py-gnome2/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-python-2.18.2.tar.bz2) = 3df58e4354526d4e0be8524c0bf6ddb8
-SHA256 (gnome2/gnome-python-2.18.2.tar.bz2) = c1ae11e43276df87ec48ec630ce8f244df08eeabfa023d055bf9e673048788d7
-SIZE (gnome2/gnome-python-2.18.2.tar.bz2) = 415869
+MD5 (gnome2/gnome-python-2.20.0.tar.bz2) = b5f17b65333f1cf6a8c0de914eb06191
+SHA256 (gnome2/gnome-python-2.20.0.tar.bz2) = 45bf3132203f724f0ba4a4597b50c43a361d57e48dfc236c78882654204b4d06
+SIZE (gnome2/gnome-python-2.20.0.tar.bz2) = 417469
diff --git a/x11-toolkits/py-gtk2/Makefile b/x11-toolkits/py-gtk2/Makefile
index baf69d69155f..c5018b5b25df 100644
--- a/x11-toolkits/py-gtk2/Makefile
+++ b/x11-toolkits/py-gtk2/Makefile
@@ -3,11 +3,11 @@
 # Whom:					marc@informatik.uni-bremen.de
 #
 # $FreeBSD$
-#   $MCom: ports/x11-toolkits/py-gtk2/Makefile,v 1.49 2006/10/03 20:52:30 ahze Exp $
+#   $MCom: ports/x11-toolkits/py-gtk2/Makefile,v 1.54 2007/09/16 17:26:18 ahze Exp $
 #
 
 PORTNAME=	gtk
-PORTVERSION=	2.10.6
+PORTVERSION=	2.12.0
 CATEGORIES=	x11-toolkits python
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/pygtk/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/x11-toolkits/py-gtk2/distinfo b/x11-toolkits/py-gtk2/distinfo
index 4b8e748944c3..8dbdf2f95aad 100644
--- a/x11-toolkits/py-gtk2/distinfo
+++ b/x11-toolkits/py-gtk2/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/pygtk-2.10.6.tar.bz2) = f051e25adcbdc1ddcf736fadad3d66f2
-SHA256 (gnome2/pygtk-2.10.6.tar.bz2) = e524a45b7ffab55c441bafff43f9583e48616ce48a150413f30208e540435ac9
-SIZE (gnome2/pygtk-2.10.6.tar.bz2) = 1977892
+MD5 (gnome2/pygtk-2.12.0.tar.bz2) = 3c1a42b774600c353342cfa3782a7d77
+SHA256 (gnome2/pygtk-2.12.0.tar.bz2) = 0200c16528c8fd32eec2a9b1c1c2a303d88f5dc6ca94124a6e3ec8be1cac496e
+SIZE (gnome2/pygtk-2.12.0.tar.bz2) = 2154621
diff --git a/x11-toolkits/py-gtk2/pkg-plist b/x11-toolkits/py-gtk2/pkg-plist
index 9c376a08734e..3346306cdb6e 100644
--- a/x11-toolkits/py-gtk2/pkg-plist
+++ b/x11-toolkits/py-gtk2/pkg-plist
@@ -135,6 +135,7 @@ libdata/pkgconfig/pygtk-2.0.pc
 %%PORTDOCS%%%%EXAMPLESDIR%%/gobject/properties.py
 %%PORTDOCS%%%%EXAMPLESDIR%%/gobject/signal.py
 %%PORTDOCS%%%%EXAMPLESDIR%%/gtk/bin.py
+%%PORTDOCS%%%%EXAMPLESDIR%%/gtk/customtreemodel.py
 %%PORTDOCS%%%%EXAMPLESDIR%%/gtk/filechooser.py
 %%PORTDOCS%%%%EXAMPLESDIR%%/gtk/scrollable.py
 %%PORTDOCS%%%%EXAMPLESDIR%%/gtk/sizegroup.py
@@ -252,12 +253,15 @@ share/pygtk/2.0/codegen/scmexpr.pyo
 share/pygtk/2.0/defs/atk-types.defs
 share/pygtk/2.0/defs/atk.defs
 share/pygtk/2.0/defs/gdk-2.10.defs
+share/pygtk/2.0/defs/gdk-2.12.defs
 share/pygtk/2.0/defs/gdk-base-types.defs
 share/pygtk/2.0/defs/gdk-base.defs
 share/pygtk/2.0/defs/gdk-types.defs
 share/pygtk/2.0/defs/gdk.defs
 share/pygtk/2.0/defs/gtk-2.10-types.defs
 share/pygtk/2.0/defs/gtk-2.10.defs
+share/pygtk/2.0/defs/gtk-2.12-types.defs
+share/pygtk/2.0/defs/gtk-2.12.defs
 share/pygtk/2.0/defs/gtk-base-types.defs
 share/pygtk/2.0/defs/gtk-base.defs
 share/pygtk/2.0/defs/gtk-types.defs
diff --git a/x11-toolkits/py-gtksourceview/Makefile b/x11-toolkits/py-gtksourceview/Makefile
new file mode 100644
index 000000000000..533c315e3516
--- /dev/null
+++ b/x11-toolkits/py-gtksourceview/Makefile
@@ -0,0 +1,31 @@
+# New ports collection makefile for:	py-gtksourceview
+# Date created:				25 June 2007
+# Whom:					Mezz <mezz@FreeBSD.org>
+#
+# $FreeBSD$
+#   $MCom: ports/x11-toolkits/py-gtksourceview/Makefile,v 1.6 2007/09/17 13:46:28 ahze Exp $
+#
+
+PORTNAME=	gtksourceview
+PORTVERSION=	2.0.0
+CATEGORIES=	x11-toolkits gnome
+MASTER_SITES=	${MASTER_SITE_GNOME}
+MASTER_SITE_SUBDIR=	sources/pygtksourceview/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+DISTNAME=	pygtksourceview-${PORTVERSION}
+
+MAINTAINER=	gnome@FreeBSD.org
+COMMENT=	A python bindings for the version 2 of the GtkSourceView library
+
+USE_BZIP2=	yes
+USE_GMAKE=	yes
+USE_GNOME=	gnomehack gnomeprefix gnometarget gtksourceview2 pygtk2
+USE_PYTHON=	yes
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--disable-docs
+
+post-patch:
+	@${REINPLACE_CMD} -e 's| == x| = x|g' \
+		${WRKSRC}/configure
+
+.include <bsd.port.mk>
diff --git a/x11-toolkits/py-gtksourceview/distinfo b/x11-toolkits/py-gtksourceview/distinfo
new file mode 100644
index 000000000000..ed287d31e15f
--- /dev/null
+++ b/x11-toolkits/py-gtksourceview/distinfo
@@ -0,0 +1,3 @@
+MD5 (pygtksourceview-2.0.0.tar.bz2) = a4947108e7a669b67ff0ff157a132728
+SHA256 (pygtksourceview-2.0.0.tar.bz2) = 749075c118a029efc51c58f4a49afbf0ec969a1c1f9ee8c25782ea08b3f9c649
+SIZE (pygtksourceview-2.0.0.tar.bz2) = 255507
diff --git a/x11-toolkits/py-gtksourceview/pkg-descr b/x11-toolkits/py-gtksourceview/pkg-descr
new file mode 100644
index 000000000000..2e25fb73166a
--- /dev/null
+++ b/x11-toolkits/py-gtksourceview/pkg-descr
@@ -0,0 +1,4 @@
+This archive contains python bindings for the version 2 of the
+GtkSourceView library.
+
+WWW: http://www.gnome.org
diff --git a/x11-toolkits/py-gtksourceview/pkg-plist b/x11-toolkits/py-gtksourceview/pkg-plist
new file mode 100644
index 000000000000..579b96136d89
--- /dev/null
+++ b/x11-toolkits/py-gtksourceview/pkg-plist
@@ -0,0 +1,4 @@
+%%PYTHON_SITELIBDIR%%/gtksourceview2.la
+%%PYTHON_SITELIBDIR%%/gtksourceview2.so
+libdata/pkgconfig/pygtksourceview-2.0.pc
+share/pygtk/2.0/defs/gtksourceview2.defs
diff --git a/x11-toolkits/ruby-gtk2/Makefile b/x11-toolkits/ruby-gtk2/Makefile
index 5729c673b753..210de9ff9600 100644
--- a/x11-toolkits/ruby-gtk2/Makefile
+++ b/x11-toolkits/ruby-gtk2/Makefile
@@ -3,7 +3,7 @@
 # Whom:			Yasuhiro Fukuma <yasuf@big.or.jp>
 #
 # $FreeBSD$
-#   $MCom: ports/x11-toolkits/ruby-gtk2/Makefile,v 1.2 2005/10/17 07:05:43 mezz Exp $
+#   $MCom: ports/x11-toolkits/ruby-gtk2/Makefile,v 1.5 2007/10/05 05:06:39 mezz Exp $
 #
 
 PORTNAME=	gtk2
diff --git a/x11-toolkits/ruby-gtk2/pkg-plist b/x11-toolkits/ruby-gtk2/pkg-plist
index 041a6e30fa9f..6ed5a354978a 100644
--- a/x11-toolkits/ruby-gtk2/pkg-plist
+++ b/x11-toolkits/ruby-gtk2/pkg-plist
@@ -71,6 +71,7 @@
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/gtk-demo/tree_store.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/misc/aboutdialog.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/misc/aboutdialog2.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/misc/alpha-demo.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/misc/assistant.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/misc/bindings.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/misc/button.rb
@@ -112,10 +113,12 @@
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/misc/mouse-gesture.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/misc/pangorenderer.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/misc/pointer_grab.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/misc/print.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/misc/properties.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/misc/radiobutton.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/misc/recentchooserdialog.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/misc/rgtk+cairo.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/misc/scalebutton.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/misc/settings.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/misc/statusicon.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/misc/stock.rb
@@ -129,6 +132,7 @@
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/misc/to_drawable.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/misc/togglebutton.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/misc/toolbar.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/misc/tooltips.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/misc/tree_combo.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/misc/tree_progress.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/misc/treemodelfilter.rb
diff --git a/x11-toolkits/vte/Makefile b/x11-toolkits/vte/Makefile
index d3e0c63d9c82..ea23bc3e5071 100644
--- a/x11-toolkits/vte/Makefile
+++ b/x11-toolkits/vte/Makefile
@@ -3,11 +3,11 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/x11-toolkits/vte/Makefile,v 1.72 2007/03/13 00:43:46 mezz Exp $
+#   $MCom: ports/x11-toolkits/vte/Makefile,v 1.84 2007/10/17 21:36:14 mezz Exp $
 #
 
 PORTNAME=	vte
-PORTVERSION=	0.16.8
+PORTVERSION=	0.16.9
 PORTREVISION?=	1
 CATEGORIES=	x11-toolkits gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
diff --git a/x11-toolkits/vte/distinfo b/x11-toolkits/vte/distinfo
index b64906d0dbbf..8dadc503f151 100644
--- a/x11-toolkits/vte/distinfo
+++ b/x11-toolkits/vte/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/vte-0.16.8.tar.bz2) = 65344de3023c41c8dda2b35a415bf969
-SHA256 (gnome2/vte-0.16.8.tar.bz2) = 1dc06ad4224c18061b000de0435b81b7c249215da4163edecb62a8d46090098f
-SIZE (gnome2/vte-0.16.8.tar.bz2) = 1112410
+MD5 (gnome2/vte-0.16.9.tar.bz2) = a42c893a01e3d9818789be373e529422
+SHA256 (gnome2/vte-0.16.9.tar.bz2) = 0e61bbccbc6689d8d9ea4842795498d3ff85079b870eda899cbbd7beb80866ec
+SIZE (gnome2/vte-0.16.9.tar.bz2) = 1115282
diff --git a/x11-toolkits/vte/pkg-plist b/x11-toolkits/vte/pkg-plist
index 2039f668eee5..6f8bd8e95045 100644
--- a/x11-toolkits/vte/pkg-plist
+++ b/x11-toolkits/vte/pkg-plist
@@ -19,7 +19,7 @@ lib/vte/vterdb
 lib/vte/window
 libdata/pkgconfig/vte.pc
 libexec/gnome-pty-helper
-share/gnome/vte/termcap/xterm
+share/vte/termcap/xterm
 share/locale/am/LC_MESSAGES/vte.mo
 share/locale/ang/LC_MESSAGES/vte.mo
 share/locale/ar/LC_MESSAGES/vte.mo
@@ -101,8 +101,8 @@ share/locale/xh/LC_MESSAGES/vte.mo
 share/locale/zh_CN/LC_MESSAGES/vte.mo
 share/locale/zh_HK/LC_MESSAGES/vte.mo
 share/locale/zh_TW/LC_MESSAGES/vte.mo
-@dirrm share/gnome/vte/termcap
-@dirrm share/gnome/vte
+@dirrm share/vte/termcap
+@dirrm share/vte
 @dirrm lib/vte
 @dirrm include/vte
 @dirrmtry share/locale/zh_HK/LC_MESSAGES
diff --git a/x11-wm/expocity/Makefile b/x11-wm/expocity/Makefile
index 8ec35c2f3dfb..2638e4fa0396 100644
--- a/x11-wm/expocity/Makefile
+++ b/x11-wm/expocity/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	expocity
 PORTVERSION=	2.6.2
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://www.pycage.de/download/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-1
diff --git a/x11-wm/expocity/pkg-plist b/x11-wm/expocity/pkg-plist
index d06af82a9937..e0868d962050 100644
--- a/x11-wm/expocity/pkg-plist
+++ b/x11-wm/expocity/pkg-plist
@@ -14,97 +14,97 @@ lib/libmetacity-private.so
 lib/libmetacity-private.so.0
 libdata/pkgconfig/libmetacity-private.pc
 libexec/metacity-dialog
-share/gnome/expocity/glade/metacity-properties.glade
-share/gnome/expocity/icons/metacity-window-demo.png
-share/gnome/pixmaps/metacity-properties.png
-share/gnome/themes/AgingGorilla/metacity-1/active-button.png
-share/gnome/themes/AgingGorilla/metacity-1/active-close-button.png
-share/gnome/themes/AgingGorilla/metacity-1/active-close-menu-icon.png
-share/gnome/themes/AgingGorilla/metacity-1/active-maximize-button.png
-share/gnome/themes/AgingGorilla/metacity-1/active-maximize-menu-icon.png
-share/gnome/themes/AgingGorilla/metacity-1/active-menu-button.png
-share/gnome/themes/AgingGorilla/metacity-1/active-minimize-button.png
-share/gnome/themes/AgingGorilla/metacity-1/active-minimize-menu-icon.png
-share/gnome/themes/AgingGorilla/metacity-1/inactive-close-button.png
-share/gnome/themes/AgingGorilla/metacity-1/inactive-maximize-button.png
-share/gnome/themes/AgingGorilla/metacity-1/inactive-menu-button.png
-share/gnome/themes/AgingGorilla/metacity-1/inactive-minimize-button.png
-share/gnome/themes/AgingGorilla/metacity-1/metacity-theme-1.xml
-share/gnome/themes/Atlanta/metacity-1/metacity-theme-1.xml
-share/gnome/themes/Bright/metacity-1/metacity-theme-1.xml
-share/gnome/themes/Crux/metacity-1/active-border-top-left-border.png
-share/gnome/themes/Crux/metacity-1/active-border-top-right-border.png
-share/gnome/themes/Crux/metacity-1/active-bottom-left-border.png
-share/gnome/themes/Crux/metacity-1/active-bottom-left-corner.png
-share/gnome/themes/Crux/metacity-1/active-bottom-mid-left-border.png
-share/gnome/themes/Crux/metacity-1/active-bottom-mid-right-border.png
-share/gnome/themes/Crux/metacity-1/active-bottom-right-border.png
-share/gnome/themes/Crux/metacity-1/active-bottom-right-corner.png
-share/gnome/themes/Crux/metacity-1/active-button-prelight.png
-share/gnome/themes/Crux/metacity-1/active-button-pressed.png
-share/gnome/themes/Crux/metacity-1/active-button.png
-share/gnome/themes/Crux/metacity-1/active-close-button.png
-share/gnome/themes/Crux/metacity-1/active-left-border.png
-share/gnome/themes/Crux/metacity-1/active-left-top-border-shaded.png
-share/gnome/themes/Crux/metacity-1/active-left-top-border.png
-share/gnome/themes/Crux/metacity-1/active-maximize-button.png
-share/gnome/themes/Crux/metacity-1/active-menu-button-prelight.png
-share/gnome/themes/Crux/metacity-1/active-menu-button-pressed.png
-share/gnome/themes/Crux/metacity-1/active-menu-button.png
-share/gnome/themes/Crux/metacity-1/active-minimize-button.png
-share/gnome/themes/Crux/metacity-1/active-restore-button.png
-share/gnome/themes/Crux/metacity-1/active-right-border.png
-share/gnome/themes/Crux/metacity-1/active-right-top-border-shaded.png
-share/gnome/themes/Crux/metacity-1/active-right-top-border.png
-share/gnome/themes/Crux/metacity-1/active-top-center-left.png
-share/gnome/themes/Crux/metacity-1/active-top-center-mid-left.png
-share/gnome/themes/Crux/metacity-1/active-top-center-mid-right.png
-share/gnome/themes/Crux/metacity-1/active-top-center-right.png
-share/gnome/themes/Crux/metacity-1/active-top-left-border.png
-share/gnome/themes/Crux/metacity-1/active-top-left-corner.png
-share/gnome/themes/Crux/metacity-1/active-top-mid-left-border.png
-share/gnome/themes/Crux/metacity-1/active-top-mid-right-border.png
-share/gnome/themes/Crux/metacity-1/active-top-right-border.png
-share/gnome/themes/Crux/metacity-1/active-top-right-corner.png
-share/gnome/themes/Crux/metacity-1/inactive-border-top-left-border.png
-share/gnome/themes/Crux/metacity-1/inactive-border-top-right-border.png
-share/gnome/themes/Crux/metacity-1/inactive-bottom-left-border.png
-share/gnome/themes/Crux/metacity-1/inactive-bottom-left-corner.png
-share/gnome/themes/Crux/metacity-1/inactive-bottom-mid-border.png
-share/gnome/themes/Crux/metacity-1/inactive-bottom-right-border.png
-share/gnome/themes/Crux/metacity-1/inactive-bottom-right-corner.png
-share/gnome/themes/Crux/metacity-1/inactive-button-prelight.png
-share/gnome/themes/Crux/metacity-1/inactive-button-pressed.png
-share/gnome/themes/Crux/metacity-1/inactive-button.png
-share/gnome/themes/Crux/metacity-1/inactive-close-button.png
-share/gnome/themes/Crux/metacity-1/inactive-left-border.png
-share/gnome/themes/Crux/metacity-1/inactive-left-top-border-shaded.png
-share/gnome/themes/Crux/metacity-1/inactive-left-top-border.png
-share/gnome/themes/Crux/metacity-1/inactive-maximize-button.png
-share/gnome/themes/Crux/metacity-1/inactive-menu-button-prelight.png
-share/gnome/themes/Crux/metacity-1/inactive-menu-button-pressed.png
-share/gnome/themes/Crux/metacity-1/inactive-menu-button.png
-share/gnome/themes/Crux/metacity-1/inactive-minimize-button.png
-share/gnome/themes/Crux/metacity-1/inactive-restore-button.png
-share/gnome/themes/Crux/metacity-1/inactive-right-border.png
-share/gnome/themes/Crux/metacity-1/inactive-right-top-border-shaded.png
-share/gnome/themes/Crux/metacity-1/inactive-right-top-border.png
-share/gnome/themes/Crux/metacity-1/inactive-top-center-left.png
-share/gnome/themes/Crux/metacity-1/inactive-top-center-mid.png
-share/gnome/themes/Crux/metacity-1/inactive-top-center-right.png
-share/gnome/themes/Crux/metacity-1/inactive-top-left-border.png
-share/gnome/themes/Crux/metacity-1/inactive-top-left-corner.png
-share/gnome/themes/Crux/metacity-1/inactive-top-mid-border.png
-share/gnome/themes/Crux/metacity-1/inactive-top-right-border.png
-share/gnome/themes/Crux/metacity-1/inactive-top-right-corner.png
-share/gnome/themes/Crux/metacity-1/metacity-theme-1.xml
-share/gnome/themes/Esco/metacity-1/metacity-theme-1.xml
-share/gnome/themes/Metabox/metacity-1/metacity-theme-1.xml
-share/gnome/themes/Simple/metacity-1/close.png
-share/gnome/themes/Simple/metacity-1/maximize.png
-share/gnome/themes/Simple/metacity-1/maximized.png
-share/gnome/themes/Simple/metacity-1/metacity-theme-1.xml
-share/gnome/themes/Simple/metacity-1/minimize.png
+share/expocity/glade/metacity-properties.glade
+share/expocity/icons/metacity-window-demo.png
+share/pixmaps/metacity-properties.png
+share/themes/AgingGorilla/metacity-1/active-button.png
+share/themes/AgingGorilla/metacity-1/active-close-button.png
+share/themes/AgingGorilla/metacity-1/active-close-menu-icon.png
+share/themes/AgingGorilla/metacity-1/active-maximize-button.png
+share/themes/AgingGorilla/metacity-1/active-maximize-menu-icon.png
+share/themes/AgingGorilla/metacity-1/active-menu-button.png
+share/themes/AgingGorilla/metacity-1/active-minimize-button.png
+share/themes/AgingGorilla/metacity-1/active-minimize-menu-icon.png
+share/themes/AgingGorilla/metacity-1/inactive-close-button.png
+share/themes/AgingGorilla/metacity-1/inactive-maximize-button.png
+share/themes/AgingGorilla/metacity-1/inactive-menu-button.png
+share/themes/AgingGorilla/metacity-1/inactive-minimize-button.png
+share/themes/AgingGorilla/metacity-1/metacity-theme-1.xml
+share/themes/Atlanta/metacity-1/metacity-theme-1.xml
+share/themes/Bright/metacity-1/metacity-theme-1.xml
+share/themes/Crux/metacity-1/active-border-top-left-border.png
+share/themes/Crux/metacity-1/active-border-top-right-border.png
+share/themes/Crux/metacity-1/active-bottom-left-border.png
+share/themes/Crux/metacity-1/active-bottom-left-corner.png
+share/themes/Crux/metacity-1/active-bottom-mid-left-border.png
+share/themes/Crux/metacity-1/active-bottom-mid-right-border.png
+share/themes/Crux/metacity-1/active-bottom-right-border.png
+share/themes/Crux/metacity-1/active-bottom-right-corner.png
+share/themes/Crux/metacity-1/active-button-prelight.png
+share/themes/Crux/metacity-1/active-button-pressed.png
+share/themes/Crux/metacity-1/active-button.png
+share/themes/Crux/metacity-1/active-close-button.png
+share/themes/Crux/metacity-1/active-left-border.png
+share/themes/Crux/metacity-1/active-left-top-border-shaded.png
+share/themes/Crux/metacity-1/active-left-top-border.png
+share/themes/Crux/metacity-1/active-maximize-button.png
+share/themes/Crux/metacity-1/active-menu-button-prelight.png
+share/themes/Crux/metacity-1/active-menu-button-pressed.png
+share/themes/Crux/metacity-1/active-menu-button.png
+share/themes/Crux/metacity-1/active-minimize-button.png
+share/themes/Crux/metacity-1/active-restore-button.png
+share/themes/Crux/metacity-1/active-right-border.png
+share/themes/Crux/metacity-1/active-right-top-border-shaded.png
+share/themes/Crux/metacity-1/active-right-top-border.png
+share/themes/Crux/metacity-1/active-top-center-left.png
+share/themes/Crux/metacity-1/active-top-center-mid-left.png
+share/themes/Crux/metacity-1/active-top-center-mid-right.png
+share/themes/Crux/metacity-1/active-top-center-right.png
+share/themes/Crux/metacity-1/active-top-left-border.png
+share/themes/Crux/metacity-1/active-top-left-corner.png
+share/themes/Crux/metacity-1/active-top-mid-left-border.png
+share/themes/Crux/metacity-1/active-top-mid-right-border.png
+share/themes/Crux/metacity-1/active-top-right-border.png
+share/themes/Crux/metacity-1/active-top-right-corner.png
+share/themes/Crux/metacity-1/inactive-border-top-left-border.png
+share/themes/Crux/metacity-1/inactive-border-top-right-border.png
+share/themes/Crux/metacity-1/inactive-bottom-left-border.png
+share/themes/Crux/metacity-1/inactive-bottom-left-corner.png
+share/themes/Crux/metacity-1/inactive-bottom-mid-border.png
+share/themes/Crux/metacity-1/inactive-bottom-right-border.png
+share/themes/Crux/metacity-1/inactive-bottom-right-corner.png
+share/themes/Crux/metacity-1/inactive-button-prelight.png
+share/themes/Crux/metacity-1/inactive-button-pressed.png
+share/themes/Crux/metacity-1/inactive-button.png
+share/themes/Crux/metacity-1/inactive-close-button.png
+share/themes/Crux/metacity-1/inactive-left-border.png
+share/themes/Crux/metacity-1/inactive-left-top-border-shaded.png
+share/themes/Crux/metacity-1/inactive-left-top-border.png
+share/themes/Crux/metacity-1/inactive-maximize-button.png
+share/themes/Crux/metacity-1/inactive-menu-button-prelight.png
+share/themes/Crux/metacity-1/inactive-menu-button-pressed.png
+share/themes/Crux/metacity-1/inactive-menu-button.png
+share/themes/Crux/metacity-1/inactive-minimize-button.png
+share/themes/Crux/metacity-1/inactive-restore-button.png
+share/themes/Crux/metacity-1/inactive-right-border.png
+share/themes/Crux/metacity-1/inactive-right-top-border-shaded.png
+share/themes/Crux/metacity-1/inactive-right-top-border.png
+share/themes/Crux/metacity-1/inactive-top-center-left.png
+share/themes/Crux/metacity-1/inactive-top-center-mid.png
+share/themes/Crux/metacity-1/inactive-top-center-right.png
+share/themes/Crux/metacity-1/inactive-top-left-border.png
+share/themes/Crux/metacity-1/inactive-top-left-corner.png
+share/themes/Crux/metacity-1/inactive-top-mid-border.png
+share/themes/Crux/metacity-1/inactive-top-right-border.png
+share/themes/Crux/metacity-1/inactive-top-right-corner.png
+share/themes/Crux/metacity-1/metacity-theme-1.xml
+share/themes/Esco/metacity-1/metacity-theme-1.xml
+share/themes/Metabox/metacity-1/metacity-theme-1.xml
+share/themes/Simple/metacity-1/close.png
+share/themes/Simple/metacity-1/maximize.png
+share/themes/Simple/metacity-1/maximized.png
+share/themes/Simple/metacity-1/metacity-theme-1.xml
+share/themes/Simple/metacity-1/minimize.png
 share/gnome/wm-properties/metacity.desktop
 share/locale/am/LC_MESSAGES/metacity.mo
 share/locale/ar/LC_MESSAGES/metacity.mo
@@ -160,22 +160,22 @@ share/locale/vi/LC_MESSAGES/metacity.mo
 share/locale/wa/LC_MESSAGES/metacity.mo
 share/locale/zh_CN/LC_MESSAGES/metacity.mo
 share/locale/zh_TW/LC_MESSAGES/metacity.mo
-@dirrm share/gnome/themes/Simple/metacity-1
-@dirrm share/gnome/themes/Simple
-@dirrm share/gnome/themes/Metabox/metacity-1
-@dirrm share/gnome/themes/Metabox
-@dirrm share/gnome/themes/AgingGorilla/metacity-1
-@dirrm share/gnome/themes/AgingGorilla
-@dirrm share/gnome/themes/Esco/metacity-1
-@dirrm share/gnome/themes/Esco
-@dirrm share/gnome/themes/Crux/metacity-1
-@dirrm share/gnome/themes/Crux
-@dirrm share/gnome/themes/Bright/metacity-1
-@dirrm share/gnome/themes/Bright
-@dirrm share/gnome/themes/Atlanta/metacity-1
-@dirrm share/gnome/themes/Atlanta
-@dirrm share/gnome/expocity/icons
-@dirrm share/gnome/expocity/glade
-@dirrm share/gnome/expocity
+@dirrm share/themes/Simple/metacity-1
+@dirrm share/themes/Simple
+@dirrm share/themes/Metabox/metacity-1
+@dirrm share/themes/Metabox
+@dirrm share/themes/AgingGorilla/metacity-1
+@dirrm share/themes/AgingGorilla
+@dirrm share/themes/Esco/metacity-1
+@dirrm share/themes/Esco
+@dirrm share/themes/Crux/metacity-1
+@dirrm share/themes/Crux
+@dirrm share/themes/Bright/metacity-1
+@dirrm share/themes/Bright
+@dirrm share/themes/Atlanta/metacity-1
+@dirrm share/themes/Atlanta
+@dirrm share/expocity/icons
+@dirrm share/expocity/glade
+@dirrm share/expocity
 @dirrm include/metacity-1/metacity-private
 @dirrm include/metacity-1
diff --git a/x11-wm/heliodor/Makefile b/x11-wm/heliodor/Makefile
index f7cf79e9fed8..10aaa05c11b1 100644
--- a/x11-wm/heliodor/Makefile
+++ b/x11-wm/heliodor/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	heliodor
 PORTVERSION=	0.2.1
-#PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://releases.beryl-project.org/${PORTVERSION}/
 
diff --git a/x11-wm/heliodor/files/patch-src_main.c b/x11-wm/heliodor/files/patch-src_main.c
new file mode 100644
index 000000000000..06875d232632
--- /dev/null
+++ b/x11-wm/heliodor/files/patch-src_main.c
@@ -0,0 +1,10 @@
+--- src/main.c.orig	2007-03-17 15:46:59.000000000 -0400
++++ src/main.c	2007-06-11 15:04:58.000000000 -0400
+@@ -3342,7 +3342,6 @@ action_menu_map (WnckWindow *win,
+ 	return;
+     case WNCK_WINDOW_NORMAL:
+     case WNCK_WINDOW_DIALOG:
+-    case WNCK_WINDOW_MODAL_DIALOG:
+     case WNCK_WINDOW_TOOLBAR:
+     case WNCK_WINDOW_MENU:
+     case WNCK_WINDOW_UTILITY:
diff --git a/x11-wm/icewm/Makefile b/x11-wm/icewm/Makefile
index 8ccf3fcd8fae..518fc4f5b019 100644
--- a/x11-wm/icewm/Makefile
+++ b/x11-wm/icewm/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	icewm
 PORTVERSION=	1.2.32
+PORTREVISION=	1
 CATEGORIES=	x11-wm
 MASTER_SITES=	SF
 
@@ -101,8 +102,8 @@ post-extract:
 post-patch:
 	@${REINPLACE_CMD} -e '/test/s|==|=|g' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e \
-		's|/usr/share/control|${LOCALBASE}/share/gnome/control|g ; \
-		 s|/usr/share/app|${LOCALBASE}/share/gnome/app|g ; \
+		's|/usr/share/control|${LOCALBASE}/share/control|g ; \
+		 s|/usr/share/app|${LOCALBASE}/share/app|g ; \
 		 s|/usr/share/gnome|${LOCALBASE}/share/gnome|g' \
 		 ${WRKSRC}/src/gnome2.cc
 
diff --git a/x11-wm/metacity/Makefile b/x11-wm/metacity/Makefile
index 03792b10b653..270983187e97 100644
--- a/x11-wm/metacity/Makefile
+++ b/x11-wm/metacity/Makefile
@@ -3,11 +3,11 @@
 # Whom:                Garrett Rooney <rooneg@electricjellyfish.net>
 #
 # $FreeBSD$
-#    $MCom: ports/x11-wm/metacity/Makefile,v 1.101 2007/03/14 04:17:20 marcus Exp $
+#   $MCom: ports/x11-wm/metacity/Makefile,v 1.115 2007/09/16 17:06:07 ahze Exp $
 #
 
 PORTNAME=	metacity
-PORTVERSION=	2.18.5
+PORTVERSION=	2.20.0
 CATEGORIES=	x11-wm
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -27,7 +27,7 @@ USE_AUTOTOOLS=	libtool:15
 USE_GNOME=	gnomeprefix intlhack gnomehack gconf2 ltverhack
 USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--enable-render
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 MAKE_ENV=	G_CHARSET_ALIAS="${LOCALBASE}/libdata/charset.alias"
 
diff --git a/x11-wm/metacity/distinfo b/x11-wm/metacity/distinfo
index b7c6f2ff7fd0..ec26414a40d9 100644
--- a/x11-wm/metacity/distinfo
+++ b/x11-wm/metacity/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/metacity-2.18.5.tar.bz2) = 7928172bf41f6b63976a62554a699674
-SHA256 (gnome2/metacity-2.18.5.tar.bz2) = e611746caa24138d96c48d9bd6b71005d3c893433fcaf1890d37aa0e7d13930d
-SIZE (gnome2/metacity-2.18.5.tar.bz2) = 1949393
+MD5 (gnome2/metacity-2.20.0.tar.bz2) = e9c6317c85db019ac2d832dd9f45f536
+SHA256 (gnome2/metacity-2.20.0.tar.bz2) = e07a68c1015b8e77879c5f7ac492b3b622afeaf95eaef06180e8f7387836f08d
+SIZE (gnome2/metacity-2.20.0.tar.bz2) = 1882886
diff --git a/x11-wm/metacity/files/patch-configure b/x11-wm/metacity/files/patch-configure
index 9c810e0e2c36..f38f1ce514c1 100644
--- a/x11-wm/metacity/files/patch-configure
+++ b/x11-wm/metacity/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	Tue Mar 13 23:11:45 2007
-+++ configure	Tue Mar 13 23:13:04 2007
-@@ -29363,7 +29363,6 @@ echo "${ECHO_T}$have_xrender" >&6; }
+--- configure.orig	2007-09-16 11:47:50.000000000 -0400
++++ configure	2007-09-16 11:48:17.000000000 -0400
+@@ -28087,7 +28087,6 @@
  
    if test x$have_xrender = xyes; then
       echo "Building with Render"
@@ -8,10 +8,10 @@
    fi
  fi ## have_composite
  
-@@ -34431,7 +34430,7 @@ metacity-$VERSION:
+@@ -33175,7 +33174,7 @@
  "
  
- METACITY_MINOR_VERSION=18
+ METACITY_MINOR_VERSION=20
 -if test $(( $(echo $METACITY_MINOR_VERSION) %2)) == "1"; then
 +if test $(( $(echo $METACITY_MINOR_VERSION) %2)) = "1"; then
     stable_version=$(( ($METACITY_MINOR_VERSION / 2) * 2))
diff --git a/x11-wm/metacity/pkg-plist b/x11-wm/metacity/pkg-plist
index d24bd8719dec..bfd30f331423 100644
--- a/x11-wm/metacity/pkg-plist
+++ b/x11-wm/metacity/pkg-plist
@@ -15,109 +15,8 @@ lib/libmetacity-private.so
 lib/libmetacity-private.so.0
 libdata/pkgconfig/libmetacity-private.pc
 libexec/metacity-dialog
-share/gnome/metacity/icons/metacity-window-demo.png
-share/gnome/themes/AgingGorilla/metacity-1/active-button.png
-share/gnome/themes/AgingGorilla/metacity-1/active-close-button.png
-share/gnome/themes/AgingGorilla/metacity-1/active-close-menu-icon.png
-share/gnome/themes/AgingGorilla/metacity-1/active-maximize-button.png
-share/gnome/themes/AgingGorilla/metacity-1/active-maximize-menu-icon.png
-share/gnome/themes/AgingGorilla/metacity-1/active-menu-button.png
-share/gnome/themes/AgingGorilla/metacity-1/active-minimize-button.png
-share/gnome/themes/AgingGorilla/metacity-1/active-minimize-menu-icon.png
-share/gnome/themes/AgingGorilla/metacity-1/inactive-close-button.png
-share/gnome/themes/AgingGorilla/metacity-1/inactive-maximize-button.png
-share/gnome/themes/AgingGorilla/metacity-1/inactive-menu-button.png
-share/gnome/themes/AgingGorilla/metacity-1/inactive-minimize-button.png
-share/gnome/themes/AgingGorilla/metacity-1/metacity-theme-1.xml
-share/gnome/themes/Atlanta/metacity-1/metacity-theme-1.xml
-share/gnome/themes/Bright/metacity-1/metacity-theme-1.xml
-share/gnome/themes/Bright/metacity-1/metacity-theme-2.xml
-share/gnome/themes/Crux/metacity-1/active-above-button.png
-share/gnome/themes/Crux/metacity-1/active-border-top-left-border.png
-share/gnome/themes/Crux/metacity-1/active-border-top-right-border.png
-share/gnome/themes/Crux/metacity-1/active-bottom-left-border.png
-share/gnome/themes/Crux/metacity-1/active-bottom-left-corner.png
-share/gnome/themes/Crux/metacity-1/active-bottom-mid-left-border.png
-share/gnome/themes/Crux/metacity-1/active-bottom-mid-right-border.png
-share/gnome/themes/Crux/metacity-1/active-bottom-right-border.png
-share/gnome/themes/Crux/metacity-1/active-bottom-right-corner.png
-share/gnome/themes/Crux/metacity-1/active-button-prelight.png
-share/gnome/themes/Crux/metacity-1/active-button-pressed.png
-share/gnome/themes/Crux/metacity-1/active-button.png
-share/gnome/themes/Crux/metacity-1/active-close-button.png
-share/gnome/themes/Crux/metacity-1/active-left-border.png
-share/gnome/themes/Crux/metacity-1/active-left-top-border-shaded.png
-share/gnome/themes/Crux/metacity-1/active-left-top-border.png
-share/gnome/themes/Crux/metacity-1/active-maximize-button.png
-share/gnome/themes/Crux/metacity-1/active-menu-button-prelight.png
-share/gnome/themes/Crux/metacity-1/active-menu-button-pressed.png
-share/gnome/themes/Crux/metacity-1/active-menu-button.png
-share/gnome/themes/Crux/metacity-1/active-minimize-button.png
-share/gnome/themes/Crux/metacity-1/active-restore-button.png
-share/gnome/themes/Crux/metacity-1/active-right-border.png
-share/gnome/themes/Crux/metacity-1/active-right-top-border-shaded.png
-share/gnome/themes/Crux/metacity-1/active-right-top-border.png
-share/gnome/themes/Crux/metacity-1/active-shade-button.png
-share/gnome/themes/Crux/metacity-1/active-stick-button.png
-share/gnome/themes/Crux/metacity-1/active-top-center-left.png
-share/gnome/themes/Crux/metacity-1/active-top-center-mid-left.png
-share/gnome/themes/Crux/metacity-1/active-top-center-mid-right.png
-share/gnome/themes/Crux/metacity-1/active-top-center-right.png
-share/gnome/themes/Crux/metacity-1/active-top-left-border.png
-share/gnome/themes/Crux/metacity-1/active-top-left-corner.png
-share/gnome/themes/Crux/metacity-1/active-top-mid-left-border.png
-share/gnome/themes/Crux/metacity-1/active-top-mid-right-border.png
-share/gnome/themes/Crux/metacity-1/active-top-right-border.png
-share/gnome/themes/Crux/metacity-1/active-top-right-corner.png
-share/gnome/themes/Crux/metacity-1/active-unabove-button.png
-share/gnome/themes/Crux/metacity-1/active-unshade-button.png
-share/gnome/themes/Crux/metacity-1/active-unstick-button.png
-share/gnome/themes/Crux/metacity-1/inactive-above-button.png
-share/gnome/themes/Crux/metacity-1/inactive-border-top-left-border.png
-share/gnome/themes/Crux/metacity-1/inactive-border-top-right-border.png
-share/gnome/themes/Crux/metacity-1/inactive-bottom-left-border.png
-share/gnome/themes/Crux/metacity-1/inactive-bottom-left-corner.png
-share/gnome/themes/Crux/metacity-1/inactive-bottom-mid-border.png
-share/gnome/themes/Crux/metacity-1/inactive-bottom-right-border.png
-share/gnome/themes/Crux/metacity-1/inactive-bottom-right-corner.png
-share/gnome/themes/Crux/metacity-1/inactive-button-prelight.png
-share/gnome/themes/Crux/metacity-1/inactive-button-pressed.png
-share/gnome/themes/Crux/metacity-1/inactive-button.png
-share/gnome/themes/Crux/metacity-1/inactive-close-button.png
-share/gnome/themes/Crux/metacity-1/inactive-left-border.png
-share/gnome/themes/Crux/metacity-1/inactive-left-top-border-shaded.png
-share/gnome/themes/Crux/metacity-1/inactive-left-top-border.png
-share/gnome/themes/Crux/metacity-1/inactive-maximize-button.png
-share/gnome/themes/Crux/metacity-1/inactive-menu-button-prelight.png
-share/gnome/themes/Crux/metacity-1/inactive-menu-button-pressed.png
-share/gnome/themes/Crux/metacity-1/inactive-menu-button.png
-share/gnome/themes/Crux/metacity-1/inactive-minimize-button.png
-share/gnome/themes/Crux/metacity-1/inactive-restore-button.png
-share/gnome/themes/Crux/metacity-1/inactive-right-border.png
-share/gnome/themes/Crux/metacity-1/inactive-right-top-border-shaded.png
-share/gnome/themes/Crux/metacity-1/inactive-right-top-border.png
-share/gnome/themes/Crux/metacity-1/inactive-shade-button.png
-share/gnome/themes/Crux/metacity-1/inactive-stick-button.png
-share/gnome/themes/Crux/metacity-1/inactive-top-center-left.png
-share/gnome/themes/Crux/metacity-1/inactive-top-center-mid.png
-share/gnome/themes/Crux/metacity-1/inactive-top-center-right.png
-share/gnome/themes/Crux/metacity-1/inactive-top-left-border.png
-share/gnome/themes/Crux/metacity-1/inactive-top-left-corner.png
-share/gnome/themes/Crux/metacity-1/inactive-top-mid-border.png
-share/gnome/themes/Crux/metacity-1/inactive-top-right-border.png
-share/gnome/themes/Crux/metacity-1/inactive-top-right-corner.png
-share/gnome/themes/Crux/metacity-1/inactive-unabove-button.png
-share/gnome/themes/Crux/metacity-1/inactive-unshade-button.png
-share/gnome/themes/Crux/metacity-1/inactive-unstick-button.png
-share/gnome/themes/Crux/metacity-1/metacity-theme-1.xml
-share/gnome/themes/Crux/metacity-1/metacity-theme-2.xml
-share/gnome/themes/Esco/metacity-1/metacity-theme-1.xml
-share/gnome/themes/Metabox/metacity-1/metacity-theme-1.xml
-share/gnome/themes/Simple/metacity-1/close.png
-share/gnome/themes/Simple/metacity-1/maximize.png
-share/gnome/themes/Simple/metacity-1/maximized.png
-share/gnome/themes/Simple/metacity-1/metacity-theme-1.xml
-share/gnome/themes/Simple/metacity-1/minimize.png
+share/gnome-control-center/keybindings/50-metacity-desktop-key.xml
+share/gnome-control-center/keybindings/50-metacity-key.xml
 share/gnome/wm-properties/metacity.desktop
 share/locale/am/LC_MESSAGES/metacity.mo
 share/locale/ar/LC_MESSAGES/metacity.mo
@@ -170,6 +69,7 @@ share/locale/nb/LC_MESSAGES/metacity.mo
 share/locale/ne/LC_MESSAGES/metacity.mo
 share/locale/nl/LC_MESSAGES/metacity.mo
 share/locale/nn/LC_MESSAGES/metacity.mo
+share/locale/oc/LC_MESSAGES/metacity.mo
 share/locale/or/LC_MESSAGES/metacity.mo
 share/locale/pa/LC_MESSAGES/metacity.mo
 share/locale/pl/LC_MESSAGES/metacity.mo
@@ -178,6 +78,7 @@ share/locale/pt_BR/LC_MESSAGES/metacity.mo
 share/locale/ro/LC_MESSAGES/metacity.mo
 share/locale/ru/LC_MESSAGES/metacity.mo
 share/locale/rw/LC_MESSAGES/metacity.mo
+share/locale/si/LC_MESSAGES/metacity.mo
 share/locale/sk/LC_MESSAGES/metacity.mo
 share/locale/sl/LC_MESSAGES/metacity.mo
 share/locale/sq/LC_MESSAGES/metacity.mo
@@ -195,30 +96,137 @@ share/locale/xh/LC_MESSAGES/metacity.mo
 share/locale/zh_CN/LC_MESSAGES/metacity.mo
 share/locale/zh_HK/LC_MESSAGES/metacity.mo
 share/locale/zh_TW/LC_MESSAGES/metacity.mo
-@dirrm share/gnome/themes/Simple/metacity-1
-@dirrm share/gnome/themes/Simple
-@dirrm share/gnome/themes/Metabox/metacity-1
-@dirrm share/gnome/themes/Metabox
-@dirrm share/gnome/themes/Esco/metacity-1
-@dirrm share/gnome/themes/Esco
-@dirrm share/gnome/themes/Crux/metacity-1
-@dirrm share/gnome/themes/Crux
-@dirrm share/gnome/themes/Bright/metacity-1
-@dirrm share/gnome/themes/Bright
-@dirrm share/gnome/themes/Atlanta/metacity-1
-@dirrm share/gnome/themes/Atlanta
-@dirrm share/gnome/themes/AgingGorilla/metacity-1
-@dirrm share/gnome/themes/AgingGorilla
-@dirrm share/gnome/metacity/icons
-@dirrm share/gnome/metacity
+%%DATADIR%%/icons/metacity-window-demo.png
+share/themes/AgingGorilla/metacity-1/active-button.png
+share/themes/AgingGorilla/metacity-1/active-close-button.png
+share/themes/AgingGorilla/metacity-1/active-close-menu-icon.png
+share/themes/AgingGorilla/metacity-1/active-maximize-button.png
+share/themes/AgingGorilla/metacity-1/active-maximize-menu-icon.png
+share/themes/AgingGorilla/metacity-1/active-menu-button.png
+share/themes/AgingGorilla/metacity-1/active-minimize-button.png
+share/themes/AgingGorilla/metacity-1/active-minimize-menu-icon.png
+share/themes/AgingGorilla/metacity-1/inactive-close-button.png
+share/themes/AgingGorilla/metacity-1/inactive-maximize-button.png
+share/themes/AgingGorilla/metacity-1/inactive-menu-button.png
+share/themes/AgingGorilla/metacity-1/inactive-minimize-button.png
+share/themes/AgingGorilla/metacity-1/metacity-theme-1.xml
+share/themes/Atlanta/metacity-1/metacity-theme-1.xml
+share/themes/Bright/metacity-1/metacity-theme-1.xml
+share/themes/Bright/metacity-1/metacity-theme-2.xml
+share/themes/Crux/metacity-1/active-above-button.png
+share/themes/Crux/metacity-1/active-border-top-left-border.png
+share/themes/Crux/metacity-1/active-border-top-right-border.png
+share/themes/Crux/metacity-1/active-bottom-left-border.png
+share/themes/Crux/metacity-1/active-bottom-left-corner.png
+share/themes/Crux/metacity-1/active-bottom-mid-left-border.png
+share/themes/Crux/metacity-1/active-bottom-mid-right-border.png
+share/themes/Crux/metacity-1/active-bottom-right-border.png
+share/themes/Crux/metacity-1/active-bottom-right-corner.png
+share/themes/Crux/metacity-1/active-button-prelight.png
+share/themes/Crux/metacity-1/active-button-pressed.png
+share/themes/Crux/metacity-1/active-button.png
+share/themes/Crux/metacity-1/active-close-button.png
+share/themes/Crux/metacity-1/active-left-border.png
+share/themes/Crux/metacity-1/active-left-top-border-shaded.png
+share/themes/Crux/metacity-1/active-left-top-border.png
+share/themes/Crux/metacity-1/active-maximize-button.png
+share/themes/Crux/metacity-1/active-menu-button-prelight.png
+share/themes/Crux/metacity-1/active-menu-button-pressed.png
+share/themes/Crux/metacity-1/active-menu-button.png
+share/themes/Crux/metacity-1/active-minimize-button.png
+share/themes/Crux/metacity-1/active-restore-button.png
+share/themes/Crux/metacity-1/active-right-border.png
+share/themes/Crux/metacity-1/active-right-top-border-shaded.png
+share/themes/Crux/metacity-1/active-right-top-border.png
+share/themes/Crux/metacity-1/active-shade-button.png
+share/themes/Crux/metacity-1/active-stick-button.png
+share/themes/Crux/metacity-1/active-top-center-left.png
+share/themes/Crux/metacity-1/active-top-center-mid-left.png
+share/themes/Crux/metacity-1/active-top-center-mid-right.png
+share/themes/Crux/metacity-1/active-top-center-right.png
+share/themes/Crux/metacity-1/active-top-left-border.png
+share/themes/Crux/metacity-1/active-top-left-corner.png
+share/themes/Crux/metacity-1/active-top-mid-left-border.png
+share/themes/Crux/metacity-1/active-top-mid-right-border.png
+share/themes/Crux/metacity-1/active-top-right-border.png
+share/themes/Crux/metacity-1/active-top-right-corner.png
+share/themes/Crux/metacity-1/active-unabove-button.png
+share/themes/Crux/metacity-1/active-unshade-button.png
+share/themes/Crux/metacity-1/active-unstick-button.png
+share/themes/Crux/metacity-1/inactive-above-button.png
+share/themes/Crux/metacity-1/inactive-border-top-left-border.png
+share/themes/Crux/metacity-1/inactive-border-top-right-border.png
+share/themes/Crux/metacity-1/inactive-bottom-left-border.png
+share/themes/Crux/metacity-1/inactive-bottom-left-corner.png
+share/themes/Crux/metacity-1/inactive-bottom-mid-border.png
+share/themes/Crux/metacity-1/inactive-bottom-right-border.png
+share/themes/Crux/metacity-1/inactive-bottom-right-corner.png
+share/themes/Crux/metacity-1/inactive-button-prelight.png
+share/themes/Crux/metacity-1/inactive-button-pressed.png
+share/themes/Crux/metacity-1/inactive-button.png
+share/themes/Crux/metacity-1/inactive-close-button.png
+share/themes/Crux/metacity-1/inactive-left-border.png
+share/themes/Crux/metacity-1/inactive-left-top-border-shaded.png
+share/themes/Crux/metacity-1/inactive-left-top-border.png
+share/themes/Crux/metacity-1/inactive-maximize-button.png
+share/themes/Crux/metacity-1/inactive-menu-button-prelight.png
+share/themes/Crux/metacity-1/inactive-menu-button-pressed.png
+share/themes/Crux/metacity-1/inactive-menu-button.png
+share/themes/Crux/metacity-1/inactive-minimize-button.png
+share/themes/Crux/metacity-1/inactive-restore-button.png
+share/themes/Crux/metacity-1/inactive-right-border.png
+share/themes/Crux/metacity-1/inactive-right-top-border-shaded.png
+share/themes/Crux/metacity-1/inactive-right-top-border.png
+share/themes/Crux/metacity-1/inactive-shade-button.png
+share/themes/Crux/metacity-1/inactive-stick-button.png
+share/themes/Crux/metacity-1/inactive-top-center-left.png
+share/themes/Crux/metacity-1/inactive-top-center-mid.png
+share/themes/Crux/metacity-1/inactive-top-center-right.png
+share/themes/Crux/metacity-1/inactive-top-left-border.png
+share/themes/Crux/metacity-1/inactive-top-left-corner.png
+share/themes/Crux/metacity-1/inactive-top-mid-border.png
+share/themes/Crux/metacity-1/inactive-top-right-border.png
+share/themes/Crux/metacity-1/inactive-top-right-corner.png
+share/themes/Crux/metacity-1/inactive-unabove-button.png
+share/themes/Crux/metacity-1/inactive-unshade-button.png
+share/themes/Crux/metacity-1/inactive-unstick-button.png
+share/themes/Crux/metacity-1/metacity-theme-1.xml
+share/themes/Crux/metacity-1/metacity-theme-2.xml
+share/themes/Esco/metacity-1/metacity-theme-1.xml
+share/themes/Metabox/metacity-1/metacity-theme-1.xml
+share/themes/Simple/metacity-1/close.png
+share/themes/Simple/metacity-1/maximize.png
+share/themes/Simple/metacity-1/maximized.png
+share/themes/Simple/metacity-1/metacity-theme-1.xml
+share/themes/Simple/metacity-1/minimize.png
+@dirrm share/themes/Simple/metacity-1
+@dirrm share/themes/Simple
+@dirrm share/themes/Metabox/metacity-1
+@dirrm share/themes/Metabox
+@dirrm share/themes/Esco/metacity-1
+@dirrm share/themes/Esco
+@dirrm share/themes/Crux/metacity-1
+@dirrm share/themes/Crux
+@dirrm share/themes/Bright/metacity-1
+@dirrm share/themes/Bright
+@dirrm share/themes/Atlanta/metacity-1
+@dirrm share/themes/Atlanta
+@dirrm share/themes/AgingGorilla/metacity-1
+@dirrm share/themes/AgingGorilla
+@dirrm %%DATADIR%%/icons
+@dirrm %%DATADIR%%
 @dirrm include/metacity-1/metacity-private
 @dirrm include/metacity-1
 @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
diff --git a/x11-wm/sawfish/Makefile b/x11-wm/sawfish/Makefile
index e9a9e0469f50..b063aa15609d 100644
--- a/x11-wm/sawfish/Makefile
+++ b/x11-wm/sawfish/Makefile
@@ -3,11 +3,12 @@
 # Whom:                Yukihiro Nakai <nakai@FreeBSD.org>
 #
 # $FreeBSD$
-#    $MCom: ports/x11-wm/sawfish/Makefile,v 1.1 2006/07/18 17:01:14 ahze Exp $
+#   $MCom: ports/x11-wm/sawfish/Makefile,v 1.5 2007/10/10 22:57:29 mezz Exp $
+#
 
 PORTNAME=	sawfish
 PORTVERSION=	1.3
-PORTREVISION=	14
+PORTREVISION=	16
 PORTEPOCH=	2
 CATEGORIES=	x11-wm
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
@@ -36,7 +37,7 @@ CONFIGURE_ARGS=	--with-readline \
 		--enable-capplet \
 		--disable-themer \
 		--with-esd
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 CONFIGURE_TARGET=	${ARCH}-pc-freebsd${OSREL:C/\..*//}
 
diff --git a/x11-wm/sawfish/files/patch-ae b/x11-wm/sawfish/files/patch-ae
index 9ad8909b2ac8..ccd0bc67f4b6 100644
--- a/x11-wm/sawfish/files/patch-ae
+++ b/x11-wm/sawfish/files/patch-ae
@@ -1,13 +1,11 @@
---- capplet/Makefile.in.orig	Sun Jan 12 21:30:41 2003
-+++ capplet/Makefile.in	Wed Feb  8 04:25:14 2006
-@@ -26,8 +26,8 @@
+--- capplet/Makefile.in.orig	2007-10-10 17:59:01.000000000 -0500
++++ capplet/Makefile.in	2007-10-10 17:59:24.000000000 -0500
+@@ -26,7 +26,7 @@
  srcdir=@srcdir@
  VPATH=@srcdir@:@top_srcdir@
  
 -G_CC_DIR = $(GNOMEDIR)/share/control-center-2.0/capplets
--G_PIXMAP_DIR = $(GNOMEDIR)/share/pixmaps
-+G_CC_DIR = $(GNOMEDIR)/share/gnome/applications
-+G_PIXMAP_DIR = $(GNOMEDIR)/share/gnome/pixmaps
++G_CC_DIR = $(GNOMEDIR)/share/applications
+ G_PIXMAP_DIR = $(GNOMEDIR)/share/pixmaps
  
  all :
- 
diff --git a/x11-wm/sawfish/files/patch-af b/x11-wm/sawfish/files/patch-af
deleted file mode 100644
index baaf30e26c3a..000000000000
--- a/x11-wm/sawfish/files/patch-af
+++ /dev/null
@@ -1,11 +0,0 @@
---- scripts/Makefile.in	2000/09/21 13:09:15	1.1
-+++ scripts/Makefile.in	2000/09/21 13:09:33
-@@ -34,7 +34,7 @@
- SUBSTS := -e "s|__lispdir__|$(lispdir)|" \
- 	  -e "s|__version__|$(version)|"
- 
--G_PIXMAP_DIR = $(GNOMEDIR)/share/pixmaps
-+G_PIXMAP_DIR = $(GNOMEDIR)/share/gnome/pixmaps
- 
- %.jlc : %.jl
- 	$(REP_ENVIRON) rep compiler -f compile-batch $<
diff --git a/x11-wm/sawfish/pkg-plist b/x11-wm/sawfish/pkg-plist
index 5dfcd8ffc5df..364b03deaea3 100644
--- a/x11-wm/sawfish/pkg-plist
+++ b/x11-wm/sawfish/pkg-plist
@@ -23,28 +23,28 @@ libexec/sawfish/%%VERSION%%/%%GNUHOST%%/selection.la
 libexec/sawfish/%%VERSION%%/%%GNUHOST%%/selection.so
 libexec/sawfish/%%VERSION%%/%%GNUHOST%%/x.la
 libexec/sawfish/%%VERSION%%/%%GNUHOST%%/x.so
-share/gnome/applications/appearance-properties.desktop
-share/gnome/applications/bindings-properties.desktop
-share/gnome/applications/focus-properties.desktop
-share/gnome/applications/match-properties.desktop
-share/gnome/applications/maximize-properties.desktop
-share/gnome/applications/misc-properties.desktop
-share/gnome/applications/move-properties.desktop
-share/gnome/applications/placement-properties.desktop
-share/gnome/applications/sound-properties.desktop
-share/gnome/applications/workspace-properties.desktop
-share/gnome/pixmaps/sawfish-appearance.png
-share/gnome/pixmaps/sawfish-edgeflip.png
-share/gnome/pixmaps/sawfish-focus.png
-share/gnome/pixmaps/sawfish-logo.png
-share/gnome/pixmaps/sawfish-matched.png
-share/gnome/pixmaps/sawfish-minmax.png
-share/gnome/pixmaps/sawfish-misc.png
-share/gnome/pixmaps/sawfish-moveresize.png
-share/gnome/pixmaps/sawfish-placement.png
-share/gnome/pixmaps/sawfish-shortcuts.png
-share/gnome/pixmaps/sawfish-tooltips.png
-share/gnome/pixmaps/sawfish-workspaces.png
+share/applications/appearance-properties.desktop
+share/applications/bindings-properties.desktop
+share/applications/focus-properties.desktop
+share/applications/match-properties.desktop
+share/applications/maximize-properties.desktop
+share/applications/misc-properties.desktop
+share/applications/move-properties.desktop
+share/applications/placement-properties.desktop
+share/applications/sound-properties.desktop
+share/applications/workspace-properties.desktop
+share/pixmaps/sawfish-appearance.png
+share/pixmaps/sawfish-edgeflip.png
+share/pixmaps/sawfish-focus.png
+share/pixmaps/sawfish-logo.png
+share/pixmaps/sawfish-matched.png
+share/pixmaps/sawfish-minmax.png
+share/pixmaps/sawfish-misc.png
+share/pixmaps/sawfish-moveresize.png
+share/pixmaps/sawfish-placement.png
+share/pixmaps/sawfish-shortcuts.png
+share/pixmaps/sawfish-tooltips.png
+share/pixmaps/sawfish-workspaces.png
 share/gnome/wm-properties/Sawfish.desktop
 share/locale/am/LC_MESSAGES/sawfish.mo
 share/locale/az/LC_MESSAGES/sawfish.mo
@@ -680,3 +680,4 @@ share/locale/zh_TW/LC_MESSAGES/sawfish.mo
 @dirrm libexec/sawfish/%%VERSION%%
 @dirrm libexec/sawfish
 @dirrm libexec/rep/%%GNUHOST%%/sawfish
+@dirrmtry share/applications
diff --git a/x11-wm/selectwm/Makefile b/x11-wm/selectwm/Makefile
index b5e853a47141..d93ba3565b75 100644
--- a/x11-wm/selectwm/Makefile
+++ b/x11-wm/selectwm/Makefile
@@ -28,5 +28,7 @@ post-patch:
 	@${REINPLACE_CMD} -e 's,-O2,${CFLAGS},g' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's,^CFLAGS =,CFLAGS +=,' -e 's,-O2,,' \
 		${WRKSRC}/src/Makefile.in
+	@${REINPLACE_CMD} -e 's|#define G.*DISABLE_DEPRECATED||g' \
+		${WRKSRC}/src/define.h
 
 .include <bsd.port.mk>
diff --git a/x11/alltray/Makefile b/x11/alltray/Makefile
index 8390958579e8..252e0e60a91b 100644
--- a/x11/alltray/Makefile
+++ b/x11/alltray/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	alltray
 PORTVERSION=	0.69
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -37,7 +37,7 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|-ldl||' ${WRKSRC}/lib/Makefile.in
 	@${REINPLACE_CMD} -e 's|-L/usr/X11R6/lib||' ${WRKSRC}/src/Makefile.in
 	@${REINPLACE_CMD} -e 's|/etc/gconf|${LOCALBASE}/etc/gconf|; \
-		/THEME_DIR1/ s|/usr/share/|${LOCALBASE}/share/gnome/themes/|' \
+		/THEME_DIR1/ s|/usr/share/|${LOCALBASE}/share/themes/|' \
 		${WRKSRC}/src/gnome_theme.c
 	@${REINPLACE_CMD} -e 's|liballtray\.so\.0\.0\.0|liballtray.so.0|; \
 		s|/usr/lib|${PREFIX}/lib|' ${WRKSRC}/src/child.c
diff --git a/x11/apwal/Makefile b/x11/apwal/Makefile
index 711b8e5ff415..31a0f5f7d1d3 100644
--- a/x11/apwal/Makefile
+++ b/x11/apwal/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	apwal
 PORTVERSION=	0.4.5
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11
 MASTER_SITES=	http://apwal.free.fr/download/
 
@@ -24,7 +24,8 @@ PLIST_FILES=	bin/apwal bin/apwal-editor
 
 post-patch:
 	@${CP} ${FILESDIR}/group_member.c ${WRKSRC}
-	@${REINPLACE_CMD} -e 's|/usr/share|${PREFIX}/share/gnome|g' ${WRKSRC}/cereimg.c ${WRKSRC}/../example/apwalrc.xml
+	@${REINPLACE_CMD} -e 's|/usr/share|${PREFIX}/share|g' \
+		${WRKSRC}/cereimg.c ${WRKSRC}/../example/apwalrc.xml
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/apwal ${PREFIX}/bin
diff --git a/x11/brightside/Makefile b/x11/brightside/Makefile
index 9bd61f528d3f..c5d91513b4f8 100644
--- a/x11/brightside/Makefile
+++ b/x11/brightside/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	brightside
 PORTVERSION=	1.4.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11
 MASTER_SITES=	http://files.catmur.co.uk/brightside/
 
diff --git a/x11/brightside/pkg-plist b/x11/brightside/pkg-plist
index 746479636cea..6577e14dc7af 100644
--- a/x11/brightside/pkg-plist
+++ b/x11/brightside/pkg-plist
@@ -1,19 +1,19 @@
 bin/brightside
 bin/brightside-properties
-share/gnome/brightside/brightside-16.png
-share/gnome/brightside/brightside-48.png
-share/gnome/brightside/brightside-brightness.png
-share/gnome/brightside/brightside-properties.glade
-share/gnome/brightside/brightside.glade
-share/gnome/brightside/brightside.svg
-share/gnome/brightside/custom-action.glade
-share/gnome/brightside/dpms.png
-share/gnome/brightside/gnome-lockscreen.png
-share/gnome/brightside/gnome-speakernotes-muted.png
-share/gnome/brightside/gnome-speakernotes.png
-share/gnome/brightside/xscreensaver.png
-share/gnome/control-center-2.0/capplets/brightside.desktop
-share/gnome/pixmaps/brightside-48.png
+share/brightside/brightside-16.png
+share/brightside/brightside-48.png
+share/brightside/brightside-brightness.png
+share/brightside/brightside-properties.glade
+share/brightside/brightside.glade
+share/brightside/brightside.svg
+share/brightside/custom-action.glade
+share/brightside/dpms.png
+share/brightside/gnome-lockscreen.png
+share/brightside/gnome-speakernotes-muted.png
+share/brightside/gnome-speakernotes.png
+share/brightside/xscreensaver.png
+share/control-center-2.0/capplets/brightside.desktop
+share/pixmaps/brightside-48.png
 share/locale/am/LC_MESSAGES/Brightside.mo
 share/locale/ar/LC_MESSAGES/Brightside.mo
 share/locale/az/LC_MESSAGES/Brightside.mo
@@ -66,4 +66,4 @@ share/locale/uk/LC_MESSAGES/Brightside.mo
 share/locale/vi/LC_MESSAGES/Brightside.mo
 share/locale/zh_CN/LC_MESSAGES/Brightside.mo
 share/locale/zh_TW/LC_MESSAGES/Brightside.mo
-@dirrm share/gnome/brightside
+@dirrm share/brightside
diff --git a/x11/fast-user-switch-applet/Makefile b/x11/fast-user-switch-applet/Makefile
index 3eb4f29c792d..8cc82c3b54b4 100644
--- a/x11/fast-user-switch-applet/Makefile
+++ b/x11/fast-user-switch-applet/Makefile
@@ -3,11 +3,10 @@
 # Whom:			Alexander Nedotsukov <bland@FreeBSD.org>
 #
 # $FreeBSD$
-#    $MCom: ports/x11/fast-user-switch-applet/Makefile,v 1.22 2007/02/27 20:35:24 mezz Exp $
+#    $MCom: ports/x11/fast-user-switch-applet/Makefile,v 1.28 2007/09/18 15:01:12 ahze Exp $
 
 PORTNAME=	fast-user-switch-applet
-PORTVERSION=	2.18.0
-PORTREVISION=	1
+PORTVERSION=	2.20.0
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/x11/fast-user-switch-applet/distinfo b/x11/fast-user-switch-applet/distinfo
index 78f157034b79..1a39f7b9e781 100644
--- a/x11/fast-user-switch-applet/distinfo
+++ b/x11/fast-user-switch-applet/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/fast-user-switch-applet-2.18.0.tar.bz2) = aefe9ea3aecc908336ae909aeee385b5
-SHA256 (gnome2/fast-user-switch-applet-2.18.0.tar.bz2) = eec13f4a8d35e5b43ad78589dd02c255748a3d24be8da7c018f2a7e5fcb87436
-SIZE (gnome2/fast-user-switch-applet-2.18.0.tar.bz2) = 761628
+MD5 (gnome2/fast-user-switch-applet-2.20.0.tar.bz2) = 1d1fd25b5599f7656e3fa89aa913137c
+SHA256 (gnome2/fast-user-switch-applet-2.20.0.tar.bz2) = c7123f132aff47978e754d83cd5e449a4e02e215466fc3fc2f3bc81fb5cec5fd
+SIZE (gnome2/fast-user-switch-applet-2.20.0.tar.bz2) = 777118
diff --git a/x11/fast-user-switch-applet/files/patch-src_gdm-queue.c b/x11/fast-user-switch-applet/files/patch-src_gdm-queue.c
index a38c96493386..cd89dc462d8a 100644
--- a/x11/fast-user-switch-applet/files/patch-src_gdm-queue.c
+++ b/x11/fast-user-switch-applet/files/patch-src_gdm-queue.c
@@ -1,10 +1,19 @@
---- src/gdm-queue.c.orig	Thu Nov 16 12:39:45 2006
-+++ src/gdm-queue.c	Thu Nov 16 12:40:17 2006
-@@ -31,6 +31,7 @@
- #include <sys/socket.h>
+--- src/gdm-queue.c.orig	2007-04-09 12:01:03.000000000 -0400
++++ src/gdm-queue.c	2007-08-08 15:18:12.000000000 -0400
+@@ -32,6 +32,7 @@
+ #include <sys/stat.h>
  #include <sys/un.h>
  #include <errno.h>
 +#include <signal.h>
  #include <stdio.h>
  
  #include "gdm-queue.h"
+@@ -237,7 +238,7 @@ gboolean gdm_run_queue (void *dummy)
+ 
+         if (stat (GDM_NEW_SOCKET_FILENAME, &file_stat) == 0)
+           strcpy (addr.sun_path, GDM_NEW_SOCKET_FILENAME);
+-        if (stat (GDM_OLD_SOCKET_FILENAME, &file_stat) == 0)
++	else if (stat (GDM_OLD_SOCKET_FILENAME, &file_stat) == 0)
+           strcpy (addr.sun_path, GDM_OLD_SOCKET_FILENAME);
+         else
+           g_error ("Can't find gdm socket!");
diff --git a/x11/fast-user-switch-applet/pkg-plist b/x11/fast-user-switch-applet/pkg-plist
index eba6ee79cf16..6c9de7ec4923 100644
--- a/x11/fast-user-switch-applet/pkg-plist
+++ b/x11/fast-user-switch-applet/pkg-plist
@@ -1,7 +1,7 @@
 libdata/bonobo/servers/GNOME_FastUserSwitchApplet.server
 libexec/fast-user-switch-applet
-share/gnome/fast-user-switch-applet/ui.glade
-share/gnome/gnome-2.0/ui/GNOME_FastUserSwitchApplet.xml
+%%DATADIR%%/ui.glade
+share/gnome-2.0/ui/GNOME_FastUserSwitchApplet.xml
 share/gnome/help/fast-user-switch-applet/C/fast-user-switch-applet.xml
 share/gnome/help/fast-user-switch-applet/C/figures/fast_user_switch_applet-context.png
 share/gnome/help/fast-user-switch-applet/C/figures/fast_user_switch_applet-icon.png
@@ -31,6 +31,13 @@ share/gnome/help/fast-user-switch-applet/fr/figures/fast_user_switch_applet-pref
 share/gnome/help/fast-user-switch-applet/fr/figures/fast_user_switch_applet-text.png
 share/gnome/help/fast-user-switch-applet/fr/figures/fast_user_switch_applet-username.png
 share/gnome/help/fast-user-switch-applet/fr/figures/fast_user_switch_applet.png
+share/gnome/help/fast-user-switch-applet/oc/fast-user-switch-applet.xml
+share/gnome/help/fast-user-switch-applet/oc/figures/fast_user_switch_applet-context.png
+share/gnome/help/fast-user-switch-applet/oc/figures/fast_user_switch_applet-icon.png
+share/gnome/help/fast-user-switch-applet/oc/figures/fast_user_switch_applet-prefs.png
+share/gnome/help/fast-user-switch-applet/oc/figures/fast_user_switch_applet-text.png
+share/gnome/help/fast-user-switch-applet/oc/figures/fast_user_switch_applet-username.png
+share/gnome/help/fast-user-switch-applet/oc/figures/fast_user_switch_applet.png
 share/gnome/help/fast-user-switch-applet/pa/fast-user-switch-applet.xml
 share/gnome/help/fast-user-switch-applet/pa/figures/fast_user_switch_applet-context.png
 share/gnome/help/fast-user-switch-applet/pa/figures/fast_user_switch_applet-icon.png
@@ -52,13 +59,6 @@ share/gnome/help/fast-user-switch-applet/sv/figures/fast_user_switch_applet-pref
 share/gnome/help/fast-user-switch-applet/sv/figures/fast_user_switch_applet-text.png
 share/gnome/help/fast-user-switch-applet/sv/figures/fast_user_switch_applet-username.png
 share/gnome/help/fast-user-switch-applet/sv/figures/fast_user_switch_applet.png
-share/gnome/omf/fast-user-switch-applet/fast-user-switch-applet-C.omf
-share/gnome/omf/fast-user-switch-applet/fast-user-switch-applet-en_GB.omf
-share/gnome/omf/fast-user-switch-applet/fast-user-switch-applet-es.omf
-share/gnome/omf/fast-user-switch-applet/fast-user-switch-applet-fr.omf
-share/gnome/omf/fast-user-switch-applet/fast-user-switch-applet-pa.omf
-share/gnome/omf/fast-user-switch-applet/fast-user-switch-applet-sr.omf
-share/gnome/omf/fast-user-switch-applet/fast-user-switch-applet-sv.omf
 share/locale/ar/LC_MESSAGES/fast-user-switch-applet.mo
 share/locale/bg/LC_MESSAGES/fast-user-switch-applet.mo
 share/locale/bn/LC_MESSAGES/fast-user-switch-applet.mo
@@ -99,6 +99,7 @@ share/locale/mr/LC_MESSAGES/fast-user-switch-applet.mo
 share/locale/nb/LC_MESSAGES/fast-user-switch-applet.mo
 share/locale/ne/LC_MESSAGES/fast-user-switch-applet.mo
 share/locale/nl/LC_MESSAGES/fast-user-switch-applet.mo
+share/locale/oc/LC_MESSAGES/fast-user-switch-applet.mo
 share/locale/or/LC_MESSAGES/fast-user-switch-applet.mo
 share/locale/pa/LC_MESSAGES/fast-user-switch-applet.mo
 share/locale/pl/LC_MESSAGES/fast-user-switch-applet.mo
@@ -119,25 +120,23 @@ share/locale/vi/LC_MESSAGES/fast-user-switch-applet.mo
 share/locale/zh_CN/LC_MESSAGES/fast-user-switch-applet.mo
 share/locale/zh_HK/LC_MESSAGES/fast-user-switch-applet.mo
 share/locale/zh_TW/LC_MESSAGES/fast-user-switch-applet.mo
-@dirrmtry share/locale/zh_HK/LC_MESSAGES
-@dirrmtry share/locale/zh_HK
-@dirrmtry share/locale/mr/LC_MESSAGES
-@dirrmtry share/locale/mr
-@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
-@dirrm share/gnome/omf/fast-user-switch-applet
+share/omf/fast-user-switch-applet/fast-user-switch-applet-C.omf
+share/omf/fast-user-switch-applet/fast-user-switch-applet-en_GB.omf
+share/omf/fast-user-switch-applet/fast-user-switch-applet-es.omf
+share/omf/fast-user-switch-applet/fast-user-switch-applet-fr.omf
+share/omf/fast-user-switch-applet/fast-user-switch-applet-oc.omf
+share/omf/fast-user-switch-applet/fast-user-switch-applet-pa.omf
+share/omf/fast-user-switch-applet/fast-user-switch-applet-sr.omf
+share/omf/fast-user-switch-applet/fast-user-switch-applet-sv.omf
+@dirrm share/omf/fast-user-switch-applet
 @dirrm share/gnome/help/fast-user-switch-applet/sv/figures
 @dirrm share/gnome/help/fast-user-switch-applet/sv
 @dirrm share/gnome/help/fast-user-switch-applet/sr/figures
 @dirrm share/gnome/help/fast-user-switch-applet/sr
 @dirrm share/gnome/help/fast-user-switch-applet/pa/figures
 @dirrm share/gnome/help/fast-user-switch-applet/pa
+@dirrm share/gnome/help/fast-user-switch-applet/oc/figures
+@dirrm share/gnome/help/fast-user-switch-applet/oc
 @dirrm share/gnome/help/fast-user-switch-applet/fr/figures
 @dirrm share/gnome/help/fast-user-switch-applet/fr
 @dirrm share/gnome/help/fast-user-switch-applet/es/figures
@@ -147,4 +146,18 @@ share/locale/zh_TW/LC_MESSAGES/fast-user-switch-applet.mo
 @dirrm share/gnome/help/fast-user-switch-applet/C/figures
 @dirrm share/gnome/help/fast-user-switch-applet/C
 @dirrm share/gnome/help/fast-user-switch-applet
-@dirrm share/gnome/fast-user-switch-applet
+@dirrm %%DATADIR%%
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
+@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
+@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/x11/gcursor/Makefile b/x11/gcursor/Makefile
index e81e6775e462..9fbbb9393362 100644
--- a/x11/gcursor/Makefile
+++ b/x11/gcursor/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gcursor
 PORTVERSION=	0.061
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	x11 gnome
 MASTER_SITES=	http://download.qballcow.nl/programs/gcursor/
 
@@ -29,8 +29,6 @@ DOCS=		AUTHORS COPYING ChangeLog INSTALL TODO
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%X11BASE%%|${X11BASE}|g ; \
 		s|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/src/gcursor.c
-	@${REINPLACE_CMD} -e 's|share/applications|share/gnome/applications|g' \
-		${WRKSRC}/data/Makefile.in
 
 .ifndef (NOPORTDOCS)
 post-install:
diff --git a/x11/gcursor/pkg-plist b/x11/gcursor/pkg-plist
index 820f5ac5066a..a884872f6e09 100644
--- a/x11/gcursor/pkg-plist
+++ b/x11/gcursor/pkg-plist
@@ -4,10 +4,11 @@ bin/gcursor
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
 %%PORTDOCS%%%%DOCSDIR%%/INSTALL
 %%PORTDOCS%%%%DOCSDIR%%/TODO
-share/gnome/applications/gcursor.desktop
-share/gnome/gcursor/gcursor.glade
+share/applications/gcursor.desktop
+share/gcursor/gcursor.glade
 share/locale/de/LC_MESSAGES/gcursor.mo
 share/locale/es/LC_MESSAGES/gcursor.mo
 share/locale/sv/LC_MESSAGES/gcursor.mo
-@dirrm share/gnome/gcursor
+@dirrm share/gcursor
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrmtry share/applications
diff --git a/x11/gdesklets-tasklist/Makefile b/x11/gdesklets-tasklist/Makefile
index ed3412021bdb..e55337a4ae2a 100644
--- a/x11/gdesklets-tasklist/Makefile
+++ b/x11/gdesklets-tasklist/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	tasklist
 PORTVERSION=	0.10
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	x11 gnome
 MASTER_SITES=	http://gdesklets.zencomputer.ca/
 PKGNAMEPREFIX=	gdesklets-
@@ -21,7 +21,7 @@ RUN_DEPENDS=	gdesklets:${PORTSDIR}/deskutils/gdesklets
 USE_XLIB=	yes
 
 NAME=		tasklist
-DATADIR=	${PREFIX}/share/gnome
+DATADIR=	${PREFIX}/share
 PKGMESSAGE=	${WRKDIR}/pkg-message
 WRKSRC=		${WRKDIR}/${PORTNAME}-desklet-${PORTVERSION}
 
diff --git a/x11/gdesklets-tasklist/pkg-message b/x11/gdesklets-tasklist/pkg-message
index 7ee64d1a84cd..ebf3c223a9be 100644
--- a/x11/gdesklets-tasklist/pkg-message
+++ b/x11/gdesklets-tasklist/pkg-message
@@ -1,5 +1,5 @@
 
 To add this desklet to your desktop:
 
-    gdesklets open %%PREFIX%%/share/gnome/gdesklets/Displays/%%NAME%%/%%NAME%%.display
+    gdesklets open %%PREFIX%%/share/gdesklets/Displays/%%NAME%%/%%NAME%%.display
 
diff --git a/x11/gdesklets-tasklist/pkg-plist b/x11/gdesklets-tasklist/pkg-plist
index 34837bf19ea8..9e41ee90119d 100644
--- a/x11/gdesklets-tasklist/pkg-plist
+++ b/x11/gdesklets-tasklist/pkg-plist
@@ -1,4 +1,4 @@
-share/gnome/gdesklets/Displays/tasklist/preview.png
-share/gnome/gdesklets/Displays/tasklist/tasklist.display
-share/gnome/gdesklets/Displays/tasklist/README
-@dirrm share/gnome/gdesklets/Displays/tasklist
+share/gdesklets/Displays/tasklist/preview.png
+share/gdesklets/Displays/tasklist/tasklist.display
+share/gdesklets/Displays/tasklist/README
+@dirrm share/gdesklets/Displays/tasklist
diff --git a/x11/gdkxft/Makefile b/x11/gdkxft/Makefile
index e7c412168f94..0d80cff74bcf 100644
--- a/x11/gdkxft/Makefile
+++ b/x11/gdkxft/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gdkxft
 PORTVERSION=	1.5
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -24,7 +24,7 @@ WANT_GNOME=	yes
 USE_ICONV=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib -lgnuregex -liconv" \
+CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib -lgnuregex -liconv" \
 		CFLAGS="${CFLAGS} `pkg-config xft --cflags`"
 CONFIGURE_ARGS=	--sbindir=${PREFIX}/bin
 USE_LDCONFIG=	yes
@@ -49,7 +49,6 @@ post-patch:
 	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
 		's|src capplet|src @BUILD_CAPPLET_TRUE@capplet|g ; \
 		 s|DESTDIR)\$$(datadir|DESTDIR)\$$(pkgdatadir|g ; \
-		 s|/gnome/apps/|/apps/|g ; \
 		 s|la_LDFLAGS =.*$$|la_LDFLAGS = -module -avoid-version|g'
 .for file in gdkxft_sysinstall.in gdkxft.c generate.pl
 	@${REINPLACE_CMD} -e 's|<regex.h>|<gnuregex.h>|g ; \
diff --git a/x11/gdkxft/pkg-plist b/x11/gdkxft/pkg-plist
index 1ff25eefda34..17aff6656a3b 100644
--- a/x11/gdkxft/pkg-plist
+++ b/x11/gdkxft/pkg-plist
@@ -5,9 +5,9 @@ lib/libgdkxft.a
 lib/libgdkxft.la
 lib/libgdkxft.so
 %%PORTDOCS%%share/doc/gdkxft/README
-%%GNOME:%%share/gnome/apps/Settings/UIOptions/gdkxft.desktop
-%%GNOME:%%share/gnome/control-center/UIOptions/gdkxft.desktop
-%%GNOME:%%share/gnome/gdkxft/gdkxft-capplet.glade
-%%GNOME:%%share/gnome/pixmaps/gdkxft.png
-%%GNOME:%%@dirrm share/gnome/gdkxft
+%%GNOME:%%share/apps/Settings/UIOptions/gdkxft.desktop
+%%GNOME:%%share/control-center/UIOptions/gdkxft.desktop
+%%GNOME:%%share/gdkxft/gdkxft-capplet.glade
+%%GNOME:%%share/pixmaps/gdkxft.png
+%%GNOME:%%@dirrm share/gdkxft
 %%PORTDOCS%%@dirrm share/doc/gdkxft
diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile
index a54a1c443c46..023393457a2a 100644
--- a/x11/gdm/Makefile
+++ b/x11/gdm/Makefile
@@ -3,11 +3,11 @@
 # Whom:                Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/x11/gdm/Makefile,v 1.58 2007/03/12 16:56:06 marcus Exp $
+#   $MCom: ports/x11/gdm/Makefile,v 1.80 2007/10/22 04:42:08 marcus Exp $
 #
 
 PORTNAME=	gdm
-PORTVERSION=	2.18.4
+PORTVERSION=	2.20.1
 PORTREVISION=	1
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
@@ -84,9 +84,9 @@ post-patch:
 		${WRKSRC}/config/Makefile.in
 	@${REINPLACE_CMD} -e 's|/usr/X11R6|${LOCALBASE}|g' \
 		${WRKSRC}/configure ${WRKSRC}/po/*.po ${WRKSRC}/gui/*.glade \
-		${WRKSRC}/daemon/*.c ${WRKSRC}/docs/*/*.xml
+		${WRKSRC}/daemon/*.c ${WRKSRC}/docs/*/*.*
 	@${REINPLACE_CMD} -e 's|/etc/gdm/gdm.conf|${PREFIX}/etc/gdm/gdm.conf|' \
-	    	${WRKSRC}/docs/gdm.1
+		${WRKSRC}/docs/gdm.1
 
 post-install:
 .if !defined(PACKAGE_BUILDING)
diff --git a/x11/gdm/distinfo b/x11/gdm/distinfo
index 21dd4a4ea27e..c5f473bb23ca 100644
--- a/x11/gdm/distinfo
+++ b/x11/gdm/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gdm-2.18.4.tar.bz2) = 53e5f5820fa67abf55c37ea7570807b7
-SHA256 (gnome2/gdm-2.18.4.tar.bz2) = 1491178239060f14d7258e94fb511ae056da6b5525d6a64b69be45fe061342c3
-SIZE (gnome2/gdm-2.18.4.tar.bz2) = 3459899
+MD5 (gnome2/gdm-2.20.1.tar.bz2) = ed7b7efcb7fd97cc400e2416e0093e71
+SHA256 (gnome2/gdm-2.20.1.tar.bz2) = b916867853c0e4ef5b8e76a58baa28ff666fd3da741438c595b5f23d031501d7
+SIZE (gnome2/gdm-2.20.1.tar.bz2) = 3774217
diff --git a/x11/gdm/files/extra-patch-daemon_slave.c b/x11/gdm/files/extra-patch-daemon_slave.c
index 2d609cf2faec..b493dcd80ad9 100644
--- a/x11/gdm/files/extra-patch-daemon_slave.c
+++ b/x11/gdm/files/extra-patch-daemon_slave.c
@@ -1,6 +1,6 @@
---- daemon/slave.c.orig	Sat Oct 28 22:38:51 2006
-+++ daemon/slave.c	Tue Oct 31 12:33:41 2006
-@@ -321,8 +321,7 @@ run_session_output (gboolean read_until_
+--- daemon/slave.c.orig	2007-09-17 10:45:50.000000000 -0400
++++ daemon/slave.c	2007-09-25 13:42:06.000000000 -0400
+@@ -373,8 +373,7 @@
  			break;
  		}
  
@@ -10,17 +10,17 @@
  			continue;
  
  		/* write until we succeed in writing something */
-@@ -344,13 +343,6 @@ run_session_output (gboolean read_until_
- 		}
+@@ -397,13 +396,6 @@
  
  		d->xsession_errors_bytes += r;
--
+ 
 -		if G_UNLIKELY (d->xsession_errors_bytes >= MAX_XSESSION_ERRORS_BYTES &&
 -			       ! got_xfsz_signal) {
 -			VE_IGNORE_EINTR (write (d->xsession_errors_fd,
--					     "\n...Too much output, ignoring rest...\n",
--					     strlen ("\n...Too much output, ignoring rest...\n")));
+-						"\n...Too much output, ignoring rest...\n",
+-						strlen ("\n...Too much output, ignoring rest...\n")));
 -		}
- 
+-
  		/* there wasn't more then buf available, so no need to try reading
  		 * again, unless we really want to */
+ 		if (r < sizeof (buf) && ! read_until_eof)
diff --git a/x11/gdm/files/gdm.in b/x11/gdm/files/gdm.in
index 21b493a0595b..9b11f3fb3ee2 100644
--- a/x11/gdm/files/gdm.in
+++ b/x11/gdm/files/gdm.in
@@ -1,6 +1,6 @@
 #!/bin/sh
 # $FreeBSD$
-#    $MCom: ports/x11/gdm/files/gdm.in,v 1.12 2007/02/16 18:14:26 mezz Exp $
+#    $MCom: ports/x11/gdm/files/gdm.in,v 1.15 2007/08/15 17:52:06 mezz Exp $
 
 # PROVIDE: gdm
 # REQUIRE: LOGIN cleanvar moused
diff --git a/x11/gdm/files/patch-config_gdm.conf.in b/x11/gdm/files/patch-config_gdm.conf.in
index 0eeb4bfc5562..6382bd445fd8 100644
--- a/x11/gdm/files/patch-config_gdm.conf.in
+++ b/x11/gdm/files/patch-config_gdm.conf.in
@@ -6,7 +6,7 @@
  
 -# Automatic VT allocation.  Right now only works on Linux.  This way we force
 +# Automatic VT allocation.  This way we force
- # X to use specific vts.  turn VTAllocation to false if this is causing
+ # X to use specific vts.  Turn VTAllocation to false if this is causing
  # problems.
 -#FirstVT=7
 -#VTAllocation=true
@@ -15,12 +15,3 @@
  # Should double login be treated with a warning (and possibility to change VT's
  # on Linux and FreeBSD systems for console logins)
  #DoubleLoginWarning=true
-@@ -305,7 +305,7 @@
- # The specific gtkrc file we use.  It should be the full path to the gtkrc that
- # we need.  Unless you need a specific gtkrc that doesn't correspond to a
- # specific theme, then just use the GtkTheme key.
--#GtkRC=@datadir@/themes/Default/gtk-2.0/gtkrc
-+#GtkRC=@datadir@/../themes/Default/gtk-2.0/gtkrc
- 
- # The GTK+ theme to use for the GUI.
- #GtkTheme=Default
diff --git a/x11/gdm/files/patch-configure b/x11/gdm/files/patch-configure
new file mode 100644
index 000000000000..18b1e2742f57
--- /dev/null
+++ b/x11/gdm/files/patch-configure
@@ -0,0 +1,137 @@
+--- configure.orig	2007-10-22 00:31:04.000000000 -0400
++++ configure	2007-10-22 00:34:52.000000000 -0400
+@@ -29593,15 +29592,13 @@ fi
+ { echo "$as_me:$LINENO: result: $ac_cv_lib_util_login" >&5
+ echo "${ECHO_T}$ac_cv_lib_util_login" >&6; }
+ if test $ac_cv_lib_util_login = yes; then
+-  cat >>confdefs.h <<_ACEOF
+-#define HAVE_LIBUTIL 1
++  cat >>confdefs.h <<\_ACEOF
++#define HAVE_LOGIN 1
+ _ACEOF
+-
+-  LIBS="-lutil $LIBS"
+-
++
++			  	EXTRA_DAEMON_LIBS="$EXTRA_DAEMON_LIBS -lutil"
+ fi
+ 
+-
+ { echo "$as_me:$LINENO: checking for logout in -lutil" >&5
+ echo $ECHO_N "checking for logout in -lutil... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_util_logout+set}" = set; then
+@@ -29664,12 +29661,80 @@ fi
+ { echo "$as_me:$LINENO: result: $ac_cv_lib_util_logout" >&5
+ echo "${ECHO_T}$ac_cv_lib_util_logout" >&6; }
+ if test $ac_cv_lib_util_logout = yes; then
+-  cat >>confdefs.h <<_ACEOF
+-#define HAVE_LIBUTIL 1
++  cat >>confdefs.h <<\_ACEOF
++#define HAVE_LOGOUT 1
++_ACEOF
++
++			   	EXTRA_DAEMON_LIBS="$EXTRA_DAEMON_LIBS -lutil"
++fi
++
++{ echo "$as_me:$LINENO: checking for logwtmp in -lutil" >&5
++echo $ECHO_N "checking for logwtmp in -lutil... $ECHO_C" >&6; }
++if test "${ac_cv_lib_util_logwtmp+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-lutil  $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++char logwtmp ();
++int
++main ()
++{
++return logwtmp ();
++  ;
++  return 0;
++}
+ _ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
++  ac_cv_lib_util_logwtmp=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-  LIBS="-lutil $LIBS"
++	ac_cv_lib_util_logwtmp=no
++fi
+ 
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
++      conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_util_logwtmp" >&5
++echo "${ECHO_T}$ac_cv_lib_util_logwtmp" >&6; }
++if test $ac_cv_lib_util_logwtmp = yes; then
++  cat >>confdefs.h <<\_ACEOF
++#define HAVE_LOGWTMP 1
++_ACEOF
++
++			    	EXTRA_DAEMON_LIBS="$EXTRA_DAEMON_LIBS -lutil"
+ fi
+ 
+ 
+@@ -33472,18 +33537,18 @@ esac
+ 
+ # allow user to override the host-specific default
+ 
+-test "x$GDM_USER_PATH" == x && GDM_USER_PATH=${HOST_GDM_USER_PATH}
+-test "x$GDM_HALT_COMMAND" == x && GDM_HALT_COMMAND=${HOST_GDM_HALT_COMMAND}
+-test "x$HALT_COMMAND" == x && HALT_COMMAND=${HOST_HALT_COMMAND}
+-test "x$REBOOT_COMMAND" == x && REBOOT_COMMAND=${HOST_REBOOT_COMMAND}
+-test "x$SUSPEND_COMMAND" == x && SUSPEND_COMMAND=${HOST_SUSPEND_COMMAND}
+-test "x$XSESSION_SHELL" == x && XSESSION_SHELL=${HOST_XSESSION_SHELL}
+-test "x$SOUND_PROGRAM" == x && SOUND_PROGRAM=${HOST_SOUND_PROGRAM}
+-test "x$GDMGNOMESESSIONCMD" == x && GDMGNOMESESSIONCMD=${HOST_GDMGNOMESESSIONCMD}
+-test "x$UTMP_LINE_ATTACHED" == x && UTMP_LINE_ATTACHED=${HOST_UTMP_LINE_ATTACHED}
+-test "x$UTMP_LINE_REMOTE" == x && UTMP_LINE_REMOTE=${HOST_UTMP_LINE_REMOTE}
+-test "x$UTMP_PSEUDO_DEVICE" == x && UTMP_PSEUDO_DEVICE=${HOST_UTMP_PSEUDO_DEVICE}
+-test "x$GDM_RBAC_SYSCMD_KEYS" == x && GDM_RBAC_SYSCMD_KEYS=${HOST_GDM_RBAC_SYSCMD_KEYS}
++test "x$GDM_USER_PATH" = x && GDM_USER_PATH=${HOST_GDM_USER_PATH}
++test "x$GDM_HALT_COMMAND" = x && GDM_HALT_COMMAND=${HOST_GDM_HALT_COMMAND}
++test "x$HALT_COMMAND" = x && HALT_COMMAND=${HOST_HALT_COMMAND}
++test "x$REBOOT_COMMAND" = x && REBOOT_COMMAND=${HOST_REBOOT_COMMAND}
++test "x$SUSPEND_COMMAND" = x && SUSPEND_COMMAND=${HOST_SUSPEND_COMMAND}
++test "x$XSESSION_SHELL" = x && XSESSION_SHELL=${HOST_XSESSION_SHELL}
++test "x$SOUND_PROGRAM" = x && SOUND_PROGRAM=${HOST_SOUND_PROGRAM}
++test "x$GDMGNOMESESSIONCMD" = x && GDMGNOMESESSIONCMD=${HOST_GDMGNOMESESSIONCMD}
++test "x$UTMP_LINE_ATTACHED" = x && UTMP_LINE_ATTACHED=${HOST_UTMP_LINE_ATTACHED}
++test "x$UTMP_LINE_REMOTE" = x && UTMP_LINE_REMOTE=${HOST_UTMP_LINE_REMOTE}
++test "x$UTMP_PSEUDO_DEVICE" = x && UTMP_PSEUDO_DEVICE=${HOST_UTMP_PSEUDO_DEVICE}
++test "x$GDM_RBAC_SYSCMD_KEYS" = x && GDM_RBAC_SYSCMD_KEYS=${HOST_GDM_RBAC_SYSCMD_KEYS}
+ 
+ # On Solaris, the /usr/bin/Xserver script is used to decide whether to
+ # use Xsun or Xorg, so this is used on Solaris.
diff --git a/x11/gdm/files/patch-daemon_gdmconsolekit.c b/x11/gdm/files/patch-daemon_gdmconsolekit.c
new file mode 100644
index 000000000000..b07647071d08
--- /dev/null
+++ b/x11/gdm/files/patch-daemon_gdmconsolekit.c
@@ -0,0 +1,11 @@
+--- daemon/gdmconsolekit.c.orig	2007-08-30 22:57:18.000000000 -0400
++++ daemon/gdmconsolekit.c	2007-08-30 22:57:35.000000000 -0400
+@@ -457,7 +457,7 @@ open_ck_session (struct passwd *pwent,
+ 		char *device;
+ 
+ 		/* FIXME: how does xorg construct this */
+-		device = g_strdup_printf ("/dev/tty%d", d->vt);
++		device = g_strdup_printf ("/dev/ttyv%d", d->vt - 1);
+ 		add_param_string (&iter_struct, "x11-display-device", device);
+ 		g_free (device);
+ 	}
diff --git a/x11/gdm/pkg-install b/x11/gdm/pkg-install
index bcce174fd151..b775c107227c 100644
--- a/x11/gdm/pkg-install
+++ b/x11/gdm/pkg-install
@@ -38,8 +38,8 @@ POST-INSTALL)
 	${MKDIR} -p /var/log/gdm
 	${CHOWN} -R root:${GROUP} /var/gdm
 	${CHMOD} 1770 /var/gdm
-	${CHOWN} root:wheel ${PKG_PREFIX}/share/gnome/gdm
-	${CHMOD} 0755 ${PKG_PREFIX}/share/gnome/gdm
+	${CHOWN} root:wheel ${PKG_PREFIX}/share/gdm
+	${CHMOD} 0755 ${PKG_PREFIX}/share/gdm
 
 	${MKDIR} -p ${PKG_PREFIX}/etc/dm/Sessions
 	exit 0
diff --git a/x11/gdm/pkg-plist b/x11/gdm/pkg-plist
index 72961e6973a5..2a17308472eb 100644
--- a/x11/gdm/pkg-plist
+++ b/x11/gdm/pkg-plist
@@ -38,112 +38,47 @@ sbin/gdm-restart
 sbin/gdm-safe-restart
 sbin/gdm-stop
 sbin/gdmsetup
-share/gnome/applications/gdmflexiserver-xnest.desktop
-share/gnome/applications/gdmflexiserver.desktop
-share/gnome/applications/gdmphotosetup.desktop
-share/gnome/applications/gdmsetup.desktop
-share/gnome/gdm/BuiltInSessions/default.desktop
-share/gnome/gdm/defaults.conf
-share/gnome/gdm/factory-defaults.conf
-share/gnome/gdm/gdmchooser.glade
-share/gnome/gdm/gdmphotosetup.glade
-share/gnome/gdm/gdmsetup.glade
-share/gnome/gdm/themes/circles/GdmGreeterTheme.desktop
-share/gnome/gdm/themes/circles/background.svg
-share/gnome/gdm/themes/circles/circles.xml
-share/gnome/gdm/themes/circles/flower.png
-share/gnome/gdm/themes/circles/help.png
-share/gnome/gdm/themes/circles/options.png
-share/gnome/gdm/themes/circles/screenshot.png
-share/gnome/gdm/themes/happygnome-list/GdmGreeterTheme.desktop
-share/gnome/gdm/themes/happygnome-list/background.svg
-share/gnome/gdm/themes/happygnome-list/gnome-logo.svg
-share/gnome/gdm/themes/happygnome-list/happygnome.xml
-share/gnome/gdm/themes/happygnome-list/options.png
-share/gnome/gdm/themes/happygnome-list/screenshot.png
-share/gnome/gdm/themes/happygnome/GdmGreeterTheme.desktop
-share/gnome/gdm/themes/happygnome/background.svg
-share/gnome/gdm/themes/happygnome/gnome-logo.svg
-share/gnome/gdm/themes/happygnome/happygnome.xml
-share/gnome/gdm/themes/happygnome/options.png
-share/gnome/gdm/themes/happygnome/screenshot.png
+%%DATADIR%%/BuiltInSessions/default.desktop
+%%DATADIR%%/applications/gdmflexiserver-xnest.desktop
+%%DATADIR%%/applications/gdmflexiserver.desktop
+%%DATADIR%%/applications/gdmphotosetup.desktop
+%%DATADIR%%/applications/gdmsetup.desktop
+%%DATADIR%%/defaults.conf
+%%DATADIR%%/factory-defaults.conf
+%%DATADIR%%/gdmchooser.glade
+%%DATADIR%%/gdmphotosetup.glade
+%%DATADIR%%/gdmsetup.glade
+%%DATADIR%%/themes/circles/GdmGreeterTheme.desktop
+%%DATADIR%%/themes/circles/background.svg
+%%DATADIR%%/themes/circles/circles.xml
+%%DATADIR%%/themes/circles/flower.png
+%%DATADIR%%/themes/circles/screenshot.png
+%%DATADIR%%/themes/happygnome-list/GdmGreeterTheme.desktop
+%%DATADIR%%/themes/happygnome-list/background.svg
+%%DATADIR%%/themes/happygnome-list/gnome-logo.svg
+%%DATADIR%%/themes/happygnome-list/happygnome-list.xml
+%%DATADIR%%/themes/happygnome-list/screenshot.png
+%%DATADIR%%/themes/happygnome/GdmGreeterTheme.desktop
+%%DATADIR%%/themes/happygnome/background.svg
+%%DATADIR%%/themes/happygnome/gnome-logo.svg
+%%DATADIR%%/themes/happygnome/happygnome.xml
+%%DATADIR%%/themes/happygnome/screenshot.png
 share/gnome/help/gdm/C/gdm.xml
 share/gnome/help/gdm/C/legal.xml
-share/gnome/help/gdm/de/figures/gdm_window.png
-share/gnome/help/gdm/de/gdm.xml
-share/gnome/help/gdm/de/legal.xml
-share/gnome/help/gdm/es/figures/gdm_window.png
+share/gnome/help/gdm/en_GB/gdm.xml
 share/gnome/help/gdm/es/gdm.xml
-share/gnome/help/gdm/es/legal.xml
-share/gnome/help/gdm/fr/figures/gdm_window.png
 share/gnome/help/gdm/fr/gdm.xml
-share/gnome/help/gdm/fr/legal.xml
-share/gnome/help/gdm/it/figures/gdm_window.png
-share/gnome/help/gdm/it/gdm.xml
-share/gnome/help/gdm/it/legal.xml
-share/gnome/help/gdm/ja/figures/gdm_window.png
-share/gnome/help/gdm/ja/gdm.xml
-share/gnome/help/gdm/ja/legal.xml
-share/gnome/help/gdm/ko/figures/gdm_window.png
 share/gnome/help/gdm/ko/gdm.xml
-share/gnome/help/gdm/ko/legal.xml
+share/gnome/help/gdm/oc/gdm.xml
+share/gnome/help/gdm/sv/gdm.xml
 share/gnome/help/gdm/uk/gdm.xml
-share/gnome/help/gdm/uk/legal.xml
-share/gnome/help/gdm/zh_CN/figures/gdm_window.png
-share/gnome/help/gdm/zh_CN/gdm.xml
-share/gnome/help/gdm/zh_CN/legal.xml
-share/gnome/help/gdm/zh_HK/figures/gdm_window.png
-share/gnome/help/gdm/zh_HK/gdm.xml
-share/gnome/help/gdm/zh_HK/legal.xml
-share/gnome/help/gdm/zh_TW/figures/gdm_window.png
-share/gnome/help/gdm/zh_TW/gdm.xml
-share/gnome/help/gdm/zh_TW/legal.xml
-share/gnome/omf/gdm/gdm-C.omf
-share/gnome/omf/gdm/gdm-de.omf
-share/gnome/omf/gdm/gdm-es.omf
-share/gnome/omf/gdm/gdm-fr.omf
-share/gnome/omf/gdm/gdm-it.omf
-share/gnome/omf/gdm/gdm-ja.omf
-share/gnome/omf/gdm/gdm-ko.omf
-share/gnome/omf/gdm/gdm-uk.omf
-share/gnome/omf/gdm/gdm-zh_CN.omf
-share/gnome/omf/gdm/gdm-zh_HK.omf
-share/gnome/omf/gdm/gdm-zh_TW.omf
-share/gnome/pixmaps/faces/astronaut.jpg
-share/gnome/pixmaps/faces/baseball.png
-share/gnome/pixmaps/faces/butterfly.png
-share/gnome/pixmaps/faces/cat-eye.jpg
-share/gnome/pixmaps/faces/chess.jpg
-share/gnome/pixmaps/faces/coffee.jpg
-share/gnome/pixmaps/faces/dice.jpg
-share/gnome/pixmaps/faces/energy-arc.jpg
-share/gnome/pixmaps/faces/fish.jpg
-share/gnome/pixmaps/faces/flake.jpg
-share/gnome/pixmaps/faces/flower.jpg
-share/gnome/pixmaps/faces/grapes.jpg
-share/gnome/pixmaps/faces/guitar.jpg
-share/gnome/pixmaps/faces/launch.jpg
-share/gnome/pixmaps/faces/leaf.jpg
-share/gnome/pixmaps/faces/lightning.jpg
-share/gnome/pixmaps/faces/penguin.jpg
-share/gnome/pixmaps/faces/puppy.jpg
-share/gnome/pixmaps/faces/sky.jpg
-share/gnome/pixmaps/faces/soccerball.png
-share/gnome/pixmaps/faces/sunflower.jpg
-share/gnome/pixmaps/faces/sunset.jpg
-share/gnome/pixmaps/faces/tennis-ball.png
-share/gnome/pixmaps/faces/yellow-rose.jpg
-share/gnome/pixmaps/gdm-foot-logo.png
-share/gnome/pixmaps/gdm-setup.png
-share/gnome/pixmaps/gdm-xnest.png
-share/gnome/pixmaps/gdm.png
-share/gnome/pixmaps/login-photo.png
-share/gnome/pixmaps/nobody.png
-share/gnome/pixmaps/nohost.png
-share/gnome/xsessions/gnome.desktop
 share/icons/hicolor/16x16/apps/gdm-xnest.png
 share/icons/hicolor/32x32/apps/gdm-setup.png
 share/icons/hicolor/32x32/apps/gdm-xnest.png
+share/icons/hicolor/48x48/apps/gdm-login-photo.png
+share/icons/hicolor/48x48/apps/gdm-setup.png
+share/icons/hicolor/48x48/apps/gdm-xnest.png
+share/icons/hicolor/48x48/apps/gdm.png
 share/locale/af/LC_MESSAGES/gdm.mo
 share/locale/am/LC_MESSAGES/gdm.mo
 share/locale/ar/LC_MESSAGES/gdm.mo
@@ -182,6 +117,7 @@ share/locale/is/LC_MESSAGES/gdm.mo
 share/locale/it/LC_MESSAGES/gdm.mo
 share/locale/ja/LC_MESSAGES/gdm.mo
 share/locale/ka/LC_MESSAGES/gdm.mo
+share/locale/kn/LC_MESSAGES/gdm.mo
 share/locale/ko/LC_MESSAGES/gdm.mo
 share/locale/ku/LC_MESSAGES/gdm.mo
 share/locale/lt/LC_MESSAGES/gdm.mo
@@ -207,6 +143,7 @@ share/locale/pt_BR/LC_MESSAGES/gdm.mo
 share/locale/ro/LC_MESSAGES/gdm.mo
 share/locale/ru/LC_MESSAGES/gdm.mo
 share/locale/rw/LC_MESSAGES/gdm.mo
+share/locale/si/LC_MESSAGES/gdm.mo
 share/locale/sk/LC_MESSAGES/gdm.mo
 share/locale/sl/LC_MESSAGES/gdm.mo
 share/locale/sq/LC_MESSAGES/gdm.mo
@@ -214,6 +151,7 @@ share/locale/sr/LC_MESSAGES/gdm.mo
 share/locale/sr@Latn/LC_MESSAGES/gdm.mo
 share/locale/sv/LC_MESSAGES/gdm.mo
 share/locale/ta/LC_MESSAGES/gdm.mo
+share/locale/te/LC_MESSAGES/gdm.mo
 share/locale/th/LC_MESSAGES/gdm.mo
 share/locale/tr/LC_MESSAGES/gdm.mo
 share/locale/uk/LC_MESSAGES/gdm.mo
@@ -224,36 +162,61 @@ share/locale/zh_CN/LC_MESSAGES/gdm.mo
 share/locale/zh_HK/LC_MESSAGES/gdm.mo
 share/locale/zh_TW/LC_MESSAGES/gdm.mo
 share/locale/zu/LC_MESSAGES/gdm.mo
-@dirrm share/gnome/xsessions
-@dirrm share/gnome/pixmaps/faces
-@dirrm share/gnome/omf/gdm
-@dirrm share/gnome/help/gdm/zh_TW/figures
-@dirrm share/gnome/help/gdm/zh_TW
-@dirrm share/gnome/help/gdm/zh_HK/figures
-@dirrm share/gnome/help/gdm/zh_HK
-@dirrm share/gnome/help/gdm/zh_CN/figures
-@dirrm share/gnome/help/gdm/zh_CN
+share/omf/gdm/gdm-C.omf
+share/omf/gdm/gdm-en_GB.omf
+share/omf/gdm/gdm-es.omf
+share/omf/gdm/gdm-fr.omf
+share/omf/gdm/gdm-ko.omf
+share/omf/gdm/gdm-oc.omf
+share/omf/gdm/gdm-sv.omf
+share/omf/gdm/gdm-uk.omf
+share/pixmaps/faces/astronaut.jpg
+share/pixmaps/faces/baseball.png
+share/pixmaps/faces/butterfly.png
+share/pixmaps/faces/cat-eye.jpg
+share/pixmaps/faces/chess.jpg
+share/pixmaps/faces/coffee.jpg
+share/pixmaps/faces/dice.jpg
+share/pixmaps/faces/energy-arc.jpg
+share/pixmaps/faces/fish.jpg
+share/pixmaps/faces/flake.jpg
+share/pixmaps/faces/flower.jpg
+share/pixmaps/faces/grapes.jpg
+share/pixmaps/faces/guitar.jpg
+share/pixmaps/faces/launch.jpg
+share/pixmaps/faces/leaf.jpg
+share/pixmaps/faces/lightning.jpg
+share/pixmaps/faces/penguin.jpg
+share/pixmaps/faces/puppy.jpg
+share/pixmaps/faces/sky.jpg
+share/pixmaps/faces/soccerball.png
+share/pixmaps/faces/sunflower.jpg
+share/pixmaps/faces/sunset.jpg
+share/pixmaps/faces/tennis-ball.png
+share/pixmaps/faces/yellow-rose.jpg
+share/pixmaps/gdm-foot-logo.png
+share/pixmaps/nobody.png
+share/pixmaps/nohost.png
+share/xsessions/gnome.desktop
+@dirrm share/xsessions
+@dirrm share/pixmaps/faces
+@dirrm share/omf/gdm
 @dirrm share/gnome/help/gdm/uk
-@dirrm share/gnome/help/gdm/ko/figures
+@dirrm share/gnome/help/gdm/sv
+@dirrm share/gnome/help/gdm/oc
 @dirrm share/gnome/help/gdm/ko
-@dirrm share/gnome/help/gdm/ja/figures
-@dirrm share/gnome/help/gdm/ja
-@dirrm share/gnome/help/gdm/it/figures
-@dirrm share/gnome/help/gdm/it
-@dirrm share/gnome/help/gdm/fr/figures
 @dirrm share/gnome/help/gdm/fr
-@dirrm share/gnome/help/gdm/es/figures
 @dirrm share/gnome/help/gdm/es
-@dirrm share/gnome/help/gdm/de/figures
-@dirrm share/gnome/help/gdm/de
+@dirrm share/gnome/help/gdm/en_GB
 @dirrm share/gnome/help/gdm/C
 @dirrm share/gnome/help/gdm
-@dirrm share/gnome/gdm/themes/happygnome-list
-@dirrm share/gnome/gdm/themes/happygnome
-@dirrm share/gnome/gdm/themes/circles
-@dirrm share/gnome/gdm/themes
-@dirrm share/gnome/gdm/BuiltInSessions
-@dirrm share/gnome/gdm
+@dirrm %%DATADIR%%/themes/happygnome-list
+@dirrm %%DATADIR%%/themes/happygnome
+@dirrm %%DATADIR%%/themes/circles
+@dirrm %%DATADIR%%/themes
+@dirrm %%DATADIR%%/applications
+@dirrm %%DATADIR%%/BuiltInSessions
+@dirrm %%DATADIR%%
 @dirrm etc/gdm/modules
 @dirrm etc/gdm/Sessions
 @dirrm etc/gdm/PreSession
@@ -264,8 +227,8 @@ share/locale/zu/LC_MESSAGES/gdm.mo
 @dirrmtry etc/dm/Sessions
 @dirrmtry etc/dm
 @dirrmtry sbin
-@dirrmtry share/gnome/log/gdm
-@dirrmtry share/gnome/log
+@dirrmtry share/log/gdm
+@dirrmtry share/log
 @unexec /bin/rm -rf /var/gdm 2>/dev/null || /usr/bin/true
 @unexec /bin/rm -rf /var/log/gdm 2>/dev/null || /usr/bin/true
 @dirrmtry share/locale/zu/LC_MESSAGES
@@ -274,6 +237,10 @@ share/locale/zu/LC_MESSAGES/gdm.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
diff --git a/x11/gnome-applets/Makefile b/x11/gnome-applets/Makefile
index 885b47ad9e7b..0745ce4215d0 100644
--- a/x11/gnome-applets/Makefile
+++ b/x11/gnome-applets/Makefile
@@ -3,12 +3,11 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/x11/gnome-applets/Makefile,v 1.152 2007/03/12 17:47:04 marcus Exp $
+#   $MCom: ports/x11/gnome-applets/Makefile,v 1.165 2007/09/16 17:19:03 ahze Exp $
 #
 
 PORTNAME=	gnome-applets
-PORTVERSION=	2.18.0
-PORTREVISION=	4
+PORTVERSION=	2.20.0
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -45,8 +44,7 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
 		OS_SYS="/usr/include"
 
 GCONF_SCHEMAS=	charpick.schemas drivemount.schemas geyes.schemas \
-		gswitchit.schemas gweather.schemas \
-		mixer.schemas multiload.schemas \
+		gweather.schemas mixer.schemas multiload.schemas \
 		stickynotes.schemas
 
 OPTIONS=	MINI_COMMANDER "Enable mini-commander applet" off
@@ -99,8 +97,8 @@ PLIST_SUB+=	PYTHON="@comment "
 post-patch:
 	@${REINPLACE_CMD} -e 's|malloc.h|stdlib.h|g' \
 		${WRKSRC}/libgweather/weather-met.c
-	@${REINPLACE_CMD} -e 's|system-tools-backends|system-tools-backends-2.0|g' \
-	    	${WRKSRC}/configure
+	@${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} ${REINPLACE_CMD} -e \
+	    	's|" == "|" = "|g'
 .if !defined(USE_PYTHON)
 	@${REINPLACE_CMD} -e 's|HAVE_PYGTK="yes"|HAVE_PYGTK="no"|' \
 		${WRKSRC}/configure
diff --git a/x11/gnome-applets/distinfo b/x11/gnome-applets/distinfo
index 14fb514cff2b..cbb7fa73c51f 100644
--- a/x11/gnome-applets/distinfo
+++ b/x11/gnome-applets/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-applets-2.18.0.tar.bz2) = db3ef99c00335798f30fc0a9162c0257
-SHA256 (gnome2/gnome-applets-2.18.0.tar.bz2) = f8f23e0c5e156afb0811d7a7fcbfec8dc667b8e35fa8a1cfff0b4866014c2157
-SIZE (gnome2/gnome-applets-2.18.0.tar.bz2) = 7133902
+MD5 (gnome2/gnome-applets-2.20.0.tar.bz2) = 985cfc3c58a72e1a92201bf4a4873b87
+SHA256 (gnome2/gnome-applets-2.20.0.tar.bz2) = 7a0f23a99c6c2166786578ede34a81939aa771d25502c33e9c29236a8233acff
+SIZE (gnome2/gnome-applets-2.20.0.tar.bz2) = 7488862
diff --git a/x11/gnome-applets/files/patch-aa b/x11/gnome-applets/files/patch-aa
index 2e1c62bde21d..7d1f860845cb 100644
--- a/x11/gnome-applets/files/patch-aa
+++ b/x11/gnome-applets/files/patch-aa
@@ -1,16 +1,15 @@
---- configure.orig	Wed Jul 26 16:38:04 2006
-+++ configure	Wed Jul 26 16:38:04 2006
-@@ -24860,8 +24860,7 @@
+--- configure.orig	2007-07-09 18:13:48.000000000 -0400
++++ configure	2007-07-09 18:14:19.000000000 -0400
+@@ -25117,7 +25117,7 @@ _ACEOF
  
    test "x$prefix" = xNONE && prefix="$ac_default_prefix"
    test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
--  ac_define_dir=`eval echo $"${prefix}/share/locale"`
--  ac_define_dir=`eval echo $ac_define_dir`
-+  ac_define_dir=`eval echo "${prefix}/share/locale"`
+-  ac_define_dir=`eval echo $"${datadir}/locale"`
++  ac_define_dir=`eval echo "${datadir}/locale"`
+   ac_define_dir=`eval echo $ac_define_dir`
    GNOMELOCALEDIR="$ac_define_dir"
  
- 
-@@ -27066,8 +27065,8 @@
+@@ -27157,8 +27157,8 @@ fi
  
  	   ;;
         # list of supported OS cores that do not use libapm
@@ -21,7 +20,16 @@
  	       ACPIINC="-I${OS_SYS}"
  	   else
  	       ACPIINC="-I/usr/src/sys"
-@@ -28145,6 +28144,9 @@
+@@ -27924,7 +27924,7 @@ echo "${ECHO_T}no" >&6; }
+ fi
+ 
+ 
+-  stb="system-tools-backends"
++  stb="system-tools-backends-2.0"
+ 
+   if test x$PKG_CONFIG != xno ; then
+     if $PKG_CONFIG --atleast-pkgconfig-version 0.12 ; then
+@@ -28166,6 +28166,9 @@ if test x$disable_cpufreq = xno; then
        *linux*)
           build_cpufreq_applet=yes
  	 ;;
@@ -31,82 +39,66 @@
        *)
           { echo "$as_me:$LINENO: WARNING: ${host} is not supported by cpufreq applet, not building" >&5
  echo "$as_me: WARNING: ${host} is not supported by cpufreq applet, not building" >&2;}
-@@ -28752,7 +28754,7 @@
- ACLOCAL_AMFLAGS="\${ACLOCAL_FLAGS}"
- 
- 
--iconsdir="${datadir}/icons"
-+iconsdir="${prefix}/share/icons"
- 
- pixmapsdir="${datadir}/pixmaps"
- 
-@@ -28764,8 +28766,7 @@
+@@ -28684,7 +28687,7 @@ gladedir="${pkgdatadir}/glade"
  
    test "x$prefix" = xNONE && prefix="$ac_default_prefix"
    test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
 -  ac_define_dir=`eval echo $"${iconsdir}"`
--  ac_define_dir=`eval echo $ac_define_dir`
 +  ac_define_dir=`eval echo "${iconsdir}"`
+   ac_define_dir=`eval echo $ac_define_dir`
    GNOME_ICONDIR="$ac_define_dir"
  
- 
-@@ -28777,8 +28778,7 @@
+@@ -28697,7 +28700,7 @@ _ACEOF
  
    test "x$prefix" = xNONE && prefix="$ac_default_prefix"
    test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
 -  ac_define_dir=`eval echo $"${pixmapsdir}"`
--  ac_define_dir=`eval echo $ac_define_dir`
 +  ac_define_dir=`eval echo "${pixmapsdir}"`
+   ac_define_dir=`eval echo $ac_define_dir`
    GNOME_PIXMAPSDIR="$ac_define_dir"
  
- 
-@@ -28790,8 +28790,7 @@
+@@ -28710,7 +28713,7 @@ _ACEOF
  
    test "x$prefix" = xNONE && prefix="$ac_default_prefix"
    test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
 -  ac_define_dir=`eval echo $"${gladedir}"`
--  ac_define_dir=`eval echo $ac_define_dir`
 +  ac_define_dir=`eval echo "${gladedir}"`
+   ac_define_dir=`eval echo $ac_define_dir`
    GNOME_GLADEDIR="$ac_define_dir"
  
- 
-@@ -28803,8 +28802,7 @@
+@@ -28723,7 +28726,7 @@ _ACEOF
  
    test "x$prefix" = xNONE && prefix="$ac_default_prefix"
    test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
 -  ac_define_dir=`eval echo $"${datadir}"`
--  ac_define_dir=`eval echo $ac_define_dir`
 +  ac_define_dir=`eval echo "${datadir}"`
+   ac_define_dir=`eval echo $ac_define_dir`
    DATADIR="$ac_define_dir"
  
- 
-@@ -28816,8 +28814,7 @@
+@@ -28736,7 +28739,7 @@ _ACEOF
  
    test "x$prefix" = xNONE && prefix="$ac_default_prefix"
    test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
 -  ac_define_dir=`eval echo $"${sysconfdir}"`
--  ac_define_dir=`eval echo $ac_define_dir`
 +  ac_define_dir=`eval echo "${sysconfdir}"`
+   ac_define_dir=`eval echo $ac_define_dir`
    SYSCONFDIR="$ac_define_dir"
  
- 
-@@ -28829,8 +28826,7 @@
+@@ -28749,7 +28752,7 @@ _ACEOF
  
    test "x$prefix" = xNONE && prefix="$ac_default_prefix"
    test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
 -  ac_define_dir=`eval echo $"${libdir}"`
--  ac_define_dir=`eval echo $ac_define_dir`
 +  ac_define_dir=`eval echo "${libdir}"`
+   ac_define_dir=`eval echo $ac_define_dir`
    LIBDIR="$ac_define_dir"
  
- 
-@@ -28842,8 +28838,7 @@
+@@ -28762,7 +28765,7 @@ _ACEOF
  
    test "x$prefix" = xNONE && prefix="$ac_default_prefix"
    test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
 -  ac_define_dir=`eval echo $"$prefix"`
--  ac_define_dir=`eval echo $ac_define_dir`
 +  ac_define_dir=`eval echo "$prefix"`
+   ac_define_dir=`eval echo $ac_define_dir`
    PREFIX="$ac_define_dir"
  
- 
diff --git a/x11/gnome-applets/files/patch-cpufreq-freebsd b/x11/gnome-applets/files/patch-cpufreq-freebsd
index 5c7f4dfa71d6..a597e6725bd0 100644
--- a/x11/gnome-applets/files/patch-cpufreq-freebsd
+++ b/x11/gnome-applets/files/patch-cpufreq-freebsd
@@ -396,9 +396,9 @@
 +	return list;
 +}
 +#endif /* __FreeBSD__ */
---- cpufreq/src/Makefile.in.orig	Mon Mar 12 11:58:09 2007
-+++ cpufreq/src/Makefile.in	Mon Mar 12 12:12:06 2007
-@@ -62,7 +62,8 @@ am__cpufreq_applet_SOURCES_DIST = cpufre
+--- cpufreq/src/Makefile.in.orig	2007-07-30 21:06:58.000000000 -0400
++++ cpufreq/src/Makefile.in	2007-07-30 21:06:58.000000000 -0400
+@@ -61,7 +61,8 @@ am__cpufreq_applet_SOURCES_DIST = cpufre
  	cpufreq-monitor-procfs.h cpufreq-monitor-sysfs.c \
  	cpufreq-monitor-sysfs.h cpufreq-monitor-libcpufreq.c \
  	cpufreq-monitor-libcpufreq.h cpufreq-monitor-cpuinfo.c \
@@ -408,7 +408,7 @@
  @HAVE_LIBCPUFREQ_TRUE@am__objects_1 =  \
  @HAVE_LIBCPUFREQ_TRUE@	cpufreq-monitor-libcpufreq.$(OBJEXT)
  am_cpufreq_applet_OBJECTS = cpufreq-applet.$(OBJEXT) \
-@@ -71,7 +72,8 @@ am_cpufreq_applet_OBJECTS = cpufreq-appl
+@@ -70,7 +71,8 @@ am_cpufreq_applet_OBJECTS = cpufreq-appl
  	cpufreq-monitor-factory.$(OBJEXT) \
  	cpufreq-monitor-procfs.$(OBJEXT) \
  	cpufreq-monitor-sysfs.$(OBJEXT) $(am__objects_1) \
@@ -418,15 +418,7 @@
  cpufreq_applet_OBJECTS = $(am_cpufreq_applet_OBJECTS)
  am__DEPENDENCIES_1 =
  cpufreq_applet_DEPENDENCIES = $(am__DEPENDENCIES_1) \
-@@ -85,6 +87,7 @@ am__depfiles_maybe = depfiles
- @AMDEP_TRUE@	./$(DEPDIR)/cpufreq-monitor-libcpufreq.Po \
- @AMDEP_TRUE@	./$(DEPDIR)/cpufreq-monitor-procfs.Po \
- @AMDEP_TRUE@	./$(DEPDIR)/cpufreq-monitor-sysfs.Po \
-+@AMDEP_TRUE@	./$(DEPDIR)/cpufreq-monitor-sysctl.Po \
- @AMDEP_TRUE@	./$(DEPDIR)/cpufreq-monitor.Po \
- @AMDEP_TRUE@	./$(DEPDIR)/cpufreq-popup.Po \
- @AMDEP_TRUE@	./$(DEPDIR)/cpufreq-prefs.Po \
-@@ -411,6 +414,7 @@ cpufreq_applet_SOURCES = \
+@@ -402,6 +404,7 @@ cpufreq_applet_SOURCES = \
  	cpufreq-monitor.c       	cpufreq-monitor.h	      	\
  	cpufreq-monitor-factory.c	cpufreq-monitor-factory.h	\
  	cpufreq-monitor-procfs.c	cpufreq-monitor-procfs.h	\
@@ -434,7 +426,7 @@
  	cpufreq-monitor-sysfs.c	        cpufreq-monitor-sysfs.h	        \
  	$(cpufreq_files)						\
  	cpufreq-monitor-cpuinfo.c       cpufreq-monitor-cpuinfo.h
-@@ -496,6 +500,7 @@ distclean-compile:
+@@ -487,6 +490,7 @@ distclean-compile:
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-monitor-factory.Po@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-monitor-libcpufreq.Po@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-monitor-procfs.Po@am__quote@
diff --git a/x11/gnome-applets/files/patch-cpufreq-selector-freebsd b/x11/gnome-applets/files/patch-cpufreq-selector-freebsd
index 0647e375d529..734bd6c74cea 100644
--- a/x11/gnome-applets/files/patch-cpufreq-selector-freebsd
+++ b/x11/gnome-applets/files/patch-cpufreq-selector-freebsd
@@ -190,9 +190,9 @@
 +
 +	   return TRUE;
 +}
---- cpufreq/src/cpufreq-selector/Makefile.in.orig	Mon Mar 12 11:58:09 2007
-+++ cpufreq/src/cpufreq-selector/Makefile.in	Mon Mar 12 12:12:33 2007
-@@ -58,13 +58,15 @@ am__cpufreq_selector_SOURCES_DIST = cpuf
+--- cpufreq/src/cpufreq-selector/Makefile.in.orig	2007-07-30 21:08:35.000000000 -0400
++++ cpufreq/src/cpufreq-selector/Makefile.in	2007-07-30 21:08:36.000000000 -0400
+@@ -57,13 +57,15 @@ am__cpufreq_selector_SOURCES_DIST = cpuf
  	cpufreq-selector.h cpufreq-selector-sysfs.c \
  	cpufreq-selector-sysfs.h cpufreq-selector-procfs.c \
  	cpufreq-selector-procfs.h cpufreq-selector-libcpufreq.c \
@@ -210,15 +210,7 @@
  cpufreq_selector_OBJECTS = $(am_cpufreq_selector_OBJECTS)
  am__DEPENDENCIES_1 =
  cpufreq_selector_DEPENDENCIES = $(am__DEPENDENCIES_1) \
-@@ -75,6 +77,7 @@ am__depfiles_maybe = depfiles
- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/cpufreq-selector-libcpufreq.Po \
- @AMDEP_TRUE@	./$(DEPDIR)/cpufreq-selector-procfs.Po \
- @AMDEP_TRUE@	./$(DEPDIR)/cpufreq-selector-sysfs.Po \
-+@AMDEP_TRUE@	./$(DEPDIR)/cpufreq-selector-sysctl.Po \
- @AMDEP_TRUE@	./$(DEPDIR)/cpufreq-selector.Po \
- @AMDEP_TRUE@	./$(DEPDIR)/main.Po
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-@@ -385,6 +388,7 @@ cpufreq_selector_SOURCES = \
+@@ -381,6 +383,7 @@ cpufreq_selector_SOURCES = \
  	cpufreq-selector.c               cpufreq-selector.h        \
  	cpufreq-selector-sysfs.c         cpufreq-selector-sysfs.h  \
  	cpufreq-selector-procfs.c        cpufreq-selector-procfs.h \
@@ -226,7 +218,7 @@
  	$(cpufreq_files)					   \
  	main.c
  
-@@ -466,6 +470,7 @@ distclean-compile:
+@@ -462,6 +465,7 @@ distclean-compile:
  
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-selector-libcpufreq.Po@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-selector-procfs.Po@am__quote@
diff --git a/x11/gnome-applets/pkg-plist b/x11/gnome-applets/pkg-plist
index 6a2c5d8cf349..aab3b345a88c 100644
--- a/x11/gnome-applets/pkg-plist
+++ b/x11/gnome-applets/pkg-plist
@@ -70,54 +70,53 @@ libexec/multiload-applet-2
 libexec/null_applet
 libexec/stickynotes_applet
 libexec/trashapplet
-%%PYTHON%%share/gnome/applications/invest-chart.desktop
-share/gnome/gnome-2.0/ui/GNOME_AccessxApplet.xml
-%%BATTERY%%share/gnome/gnome-2.0/ui/GNOME_BattstatApplet.xml
-%%CPUFREQ%%share/gnome/gnome-2.0/ui/GNOME_CPUFreqApplet.xml
-share/gnome/gnome-2.0/ui/GNOME_CharpickerApplet.xml
-share/gnome/gnome-2.0/ui/GNOME_DriveMountApplet.xml
-share/gnome/gnome-2.0/ui/GNOME_GSwitchItApplet.xml
-share/gnome/gnome-2.0/ui/GNOME_GWeatherApplet.xml
-share/gnome/gnome-2.0/ui/GNOME_GeyesApplet.xml
-%%COMMANDER%%share/gnome/gnome-2.0/ui/GNOME_MiniCommanderApplet.xml
-share/gnome/gnome-2.0/ui/GNOME_MixerApplet.xml
-share/gnome/gnome-2.0/ui/GNOME_ModemLights.xml
-share/gnome/gnome-2.0/ui/GNOME_MultiloadApplet.xml
-share/gnome/gnome-2.0/ui/GNOME_Panel_TrashApplet.xml
-share/gnome/gnome-2.0/ui/GNOME_StickyNotesApplet.xml
-%%PYTHON%%share/gnome/gnome-2.0/ui/Invest_Applet.xml
-share/gnome/gnome-applets/geyes/Bizarre/Bizarre-eye.png
-share/gnome/gnome-applets/geyes/Bizarre/Bizarre-pupil.png
-share/gnome/gnome-applets/geyes/Bizarre/config
-share/gnome/gnome-applets/geyes/Bloodshot/Bloodshot-eye.png
-share/gnome/gnome-applets/geyes/Bloodshot/Bloodshot-pupil.png
-share/gnome/gnome-applets/geyes/Bloodshot/config
-share/gnome/gnome-applets/geyes/Default-tiny/Default-tiny-eye.png
-share/gnome/gnome-applets/geyes/Default-tiny/Default-tiny-pupil.png
-share/gnome/gnome-applets/geyes/Default-tiny/config
-share/gnome/gnome-applets/geyes/Default/Default-eye.png
-share/gnome/gnome-applets/geyes/Default/Default-pupil.png
-share/gnome/gnome-applets/geyes/Default/config
-share/gnome/gnome-applets/geyes/Horrid/config
-share/gnome/gnome-applets/geyes/Horrid/horrid_eye.png
-share/gnome/gnome-applets/geyes/Horrid/horrid_pupil.png
-share/gnome/gnome-applets/geyes/Tango/config
-share/gnome/gnome-applets/geyes/Tango/tango-eye.png
-share/gnome/gnome-applets/geyes/Tango/tango-pupil.png
-%%BATTERY%%share/gnome/gnome-applets/glade/battstat_applet.glade
-%%CPUFREQ%%share/gnome/gnome-applets/glade/cpufreq-preferences.glade
-%%PYTHON%%share/gnome/gnome-applets/glade/financialchart.glade
-share/gnome/gnome-applets/glade/gswitchit.glade
-%%COMMANDER%%share/gnome/gnome-applets/glade/mini-commander.glade
-share/gnome/gnome-applets/glade/modemlights.glade
-%%PYTHON%%share/gnome/gnome-applets/glade/prefs-dialog.glade
-share/gnome/gnome-applets/glade/stickynotes.glade
-share/gnome/gnome-applets/glade/trashapplet.glade
-share/gnome/gnome-applets/gweather/Locations.xml
-share/gnome/gnome-applets/gweather/locations.dtd
-%%PYTHON%%share/gnome/gnome-applets/invest-applet/invest-16.png
-%%PYTHON%%share/gnome/gnome-applets/invest-applet/invest-button.png
-%%PYTHON%%share/gnome/gnome-applets/invest-applet/invest.svg
+share/gnome-2.0/ui/GNOME_AccessxApplet.xml
+%%BATTERY%%share/gnome-2.0/ui/GNOME_BattstatApplet.xml
+%%CPUFREQ%%share/gnome-2.0/ui/GNOME_CPUFreqApplet.xml
+share/gnome-2.0/ui/GNOME_CharpickerApplet.xml
+share/gnome-2.0/ui/GNOME_DriveMountApplet.xml
+share/gnome-2.0/ui/GNOME_GSwitchItApplet.xml
+share/gnome-2.0/ui/GNOME_GWeatherApplet.xml
+share/gnome-2.0/ui/GNOME_GeyesApplet.xml
+%%COMMANDER%%share/gnome-2.0/ui/GNOME_MiniCommanderApplet.xml
+share/gnome-2.0/ui/GNOME_MixerApplet.xml
+share/gnome-2.0/ui/GNOME_ModemLights.xml
+share/gnome-2.0/ui/GNOME_MultiloadApplet.xml
+share/gnome-2.0/ui/GNOME_Panel_TrashApplet.xml
+share/gnome-2.0/ui/GNOME_StickyNotesApplet.xml
+%%PYTHON%%share/gnome-2.0/ui/Invest_Applet.xml
+%%DATADIR%%/geyes/Bizarre/Bizarre-eye.png
+%%DATADIR%%/geyes/Bizarre/Bizarre-pupil.png
+%%DATADIR%%/geyes/Bizarre/config
+%%DATADIR%%/geyes/Bloodshot/Bloodshot-eye.png
+%%DATADIR%%/geyes/Bloodshot/Bloodshot-pupil.png
+%%DATADIR%%/geyes/Bloodshot/config
+%%DATADIR%%/geyes/Default-tiny/Default-tiny-eye.png
+%%DATADIR%%/geyes/Default-tiny/Default-tiny-pupil.png
+%%DATADIR%%/geyes/Default-tiny/config
+%%DATADIR%%/geyes/Default/Default-eye.png
+%%DATADIR%%/geyes/Default/Default-pupil.png
+%%DATADIR%%/geyes/Default/config
+%%DATADIR%%/geyes/Horrid/config
+%%DATADIR%%/geyes/Horrid/horrid_eye.png
+%%DATADIR%%/geyes/Horrid/horrid_pupil.png
+%%DATADIR%%/geyes/Tango/config
+%%DATADIR%%/geyes/Tango/tango-eye.png
+%%DATADIR%%/geyes/Tango/tango-pupil.png
+%%BATTERY%%%%DATADIR%%/glade/battstat_applet.glade
+%%CPUFREQ%%%%DATADIR%%/glade/cpufreq-preferences.glade
+%%PYTHON%%%%DATADIR%%/glade/financialchart.glade
+%%DATADIR%%/glade/gswitchit.glade
+%%COMMANDER%%%%DATADIR%%/glade/mini-commander.glade
+%%DATADIR%%/glade/modemlights.glade
+%%PYTHON%%%%DATADIR%%/glade/prefs-dialog.glade
+%%DATADIR%%/glade/stickynotes.glade
+%%DATADIR%%/glade/trashapplet.glade
+%%DATADIR%%/gweather/Locations.xml
+%%DATADIR%%/gweather/locations.dtd
+%%PYTHON%%%%DATADIR%%/invest-applet/invest-16.png
+%%PYTHON%%%%DATADIR%%/invest-applet/invest-button.png
+%%PYTHON%%%%DATADIR%%/invest-applet/invest.svg
 share/gnome/help/accessx-status/C/accessx-status.xml
 share/gnome/help/accessx-status/C/figures/accessx-status-applet.png
 share/gnome/help/accessx-status/C/figures/accessx-status-disabled.png
@@ -143,6 +142,18 @@ share/gnome/help/accessx-status/bg/figures/accessx_sticky-keys.png
 share/gnome/help/accessx-status/bg/figures/accessx_sticky-meta-key.png
 share/gnome/help/accessx-status/bg/figures/accessx_sticky-shift-key.png
 share/gnome/help/accessx-status/bg/figures/accessx_sticky-windows-key.png
+share/gnome/help/accessx-status/ca/accessx-status.xml
+share/gnome/help/accessx-status/ca/figures/accessx-status-applet.png
+share/gnome/help/accessx-status/ca/figures/accessx-status-disabled.png
+share/gnome/help/accessx-status/ca/figures/accessx_bounce-keys.png
+share/gnome/help/accessx-status/ca/figures/accessx_mouse-keys.png
+share/gnome/help/accessx-status/ca/figures/accessx_slow-keys.png
+share/gnome/help/accessx-status/ca/figures/accessx_sticky-altGr-key.png
+share/gnome/help/accessx-status/ca/figures/accessx_sticky-ctrl-key.png
+share/gnome/help/accessx-status/ca/figures/accessx_sticky-keys.png
+share/gnome/help/accessx-status/ca/figures/accessx_sticky-meta-key.png
+share/gnome/help/accessx-status/ca/figures/accessx_sticky-shift-key.png
+share/gnome/help/accessx-status/ca/figures/accessx_sticky-windows-key.png
 share/gnome/help/accessx-status/en_GB/accessx-status.xml
 share/gnome/help/accessx-status/en_GB/figures/accessx-status-applet.png
 share/gnome/help/accessx-status/en_GB/figures/accessx-status-disabled.png
@@ -203,6 +214,18 @@ share/gnome/help/accessx-status/nl/figures/accessx_sticky-keys.png
 share/gnome/help/accessx-status/nl/figures/accessx_sticky-meta-key.png
 share/gnome/help/accessx-status/nl/figures/accessx_sticky-shift-key.png
 share/gnome/help/accessx-status/nl/figures/accessx_sticky-windows-key.png
+share/gnome/help/accessx-status/oc/accessx-status.xml
+share/gnome/help/accessx-status/oc/figures/accessx-status-applet.png
+share/gnome/help/accessx-status/oc/figures/accessx-status-disabled.png
+share/gnome/help/accessx-status/oc/figures/accessx_bounce-keys.png
+share/gnome/help/accessx-status/oc/figures/accessx_mouse-keys.png
+share/gnome/help/accessx-status/oc/figures/accessx_slow-keys.png
+share/gnome/help/accessx-status/oc/figures/accessx_sticky-altGr-key.png
+share/gnome/help/accessx-status/oc/figures/accessx_sticky-ctrl-key.png
+share/gnome/help/accessx-status/oc/figures/accessx_sticky-keys.png
+share/gnome/help/accessx-status/oc/figures/accessx_sticky-meta-key.png
+share/gnome/help/accessx-status/oc/figures/accessx_sticky-shift-key.png
+share/gnome/help/accessx-status/oc/figures/accessx_sticky-windows-key.png
 share/gnome/help/accessx-status/sv/accessx-status.xml
 share/gnome/help/accessx-status/sv/figures/accessx-status-applet.png
 share/gnome/help/accessx-status/sv/figures/accessx-status-disabled.png
@@ -258,6 +281,12 @@ share/gnome/help/accessx-status/uk/figures/accessx_sticky-windows-key.png
 %%BATTERY%%share/gnome/help/battstat/fr/figures/battstat-credits-hal.png
 %%BATTERY%%share/gnome/help/battstat/fr/figures/battstat-preferences.png
 %%BATTERY%%share/gnome/help/battstat/fr/figures/context-menu.png
+%%BATTERY%%share/gnome/help/battstat/oc/battstat.xml
+%%BATTERY%%share/gnome/help/battstat/oc/figures/battstat-applet-expanded.png
+%%BATTERY%%share/gnome/help/battstat/oc/figures/battstat-applet.png
+%%BATTERY%%share/gnome/help/battstat/oc/figures/battstat-credits-hal.png
+%%BATTERY%%share/gnome/help/battstat/oc/figures/battstat-preferences.png
+%%BATTERY%%share/gnome/help/battstat/oc/figures/context-menu.png
 %%BATTERY%%share/gnome/help/battstat/pa/battstat.xml
 %%BATTERY%%share/gnome/help/battstat/pa/figures/battstat-applet-expanded.png
 %%BATTERY%%share/gnome/help/battstat/pa/figures/battstat-applet.png
@@ -312,11 +341,21 @@ share/gnome/help/char-palette/nl/figures/charpalette_applet.png
 share/gnome/help/char-palette/nl/figures/charpalette_chargroup.png
 share/gnome/help/char-palette/nl/figures/charpick-preferences.png
 share/gnome/help/char-palette/nl/figures/charpick_characters.png
+share/gnome/help/char-palette/oc/char-palette.xml
+share/gnome/help/char-palette/oc/figures/charpalette_applet.png
+share/gnome/help/char-palette/oc/figures/charpalette_chargroup.png
+share/gnome/help/char-palette/oc/figures/charpick-preferences.png
+share/gnome/help/char-palette/oc/figures/charpick_characters.png
 share/gnome/help/char-palette/pt_BR/char-palette.xml
 share/gnome/help/char-palette/pt_BR/figures/charpalette_applet.png
 share/gnome/help/char-palette/pt_BR/figures/charpalette_chargroup.png
 share/gnome/help/char-palette/pt_BR/figures/charpick-preferences.png
 share/gnome/help/char-palette/pt_BR/figures/charpick_characters.png
+share/gnome/help/char-palette/ru/char-palette.xml
+share/gnome/help/char-palette/ru/figures/charpalette_applet.png
+share/gnome/help/char-palette/ru/figures/charpalette_chargroup.png
+share/gnome/help/char-palette/ru/figures/charpick-preferences.png
+share/gnome/help/char-palette/ru/figures/charpick_characters.png
 share/gnome/help/char-palette/sv/char-palette.xml
 share/gnome/help/char-palette/sv/figures/charpalette_applet.png
 share/gnome/help/char-palette/sv/figures/charpalette_chargroup.png
@@ -344,6 +383,10 @@ share/gnome/help/char-palette/uk/figures/charpick_characters.png
 %%COMMANDER%%share/gnome/help/command-line/fr/figures/command-line.png
 %%COMMANDER%%share/gnome/help/command-line/fr/figures/prefs-macros.png
 %%COMMANDER%%share/gnome/help/command-line/fr/figures/prefs.png
+%%COMMANDER%%share/gnome/help/command-line/oc/command-line.xml
+%%COMMANDER%%share/gnome/help/command-line/oc/figures/command-line.png
+%%COMMANDER%%share/gnome/help/command-line/oc/figures/prefs-macros.png
+%%COMMANDER%%share/gnome/help/command-line/oc/figures/prefs.png
 %%COMMANDER%%share/gnome/help/command-line/pt_BR/command-line.xml
 %%COMMANDER%%share/gnome/help/command-line/pt_BR/figures/command-line.png
 %%COMMANDER%%share/gnome/help/command-line/pt_BR/figures/prefs-macros.png
@@ -367,6 +410,16 @@ share/gnome/help/char-palette/uk/figures/charpick_characters.png
 %%CPUFREQ%%share/gnome/help/cpufreq-applet/C/figures/cpufreq-applet-selector.png
 %%CPUFREQ%%share/gnome/help/cpufreq-applet/C/figures/cpufreq-applet.png
 %%CPUFREQ%%share/gnome/help/cpufreq-applet/C/legal.xml
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/ca/cpufreq-applet.xml
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/ca/figures/cpufreq-100.png
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/ca/figures/cpufreq-25.png
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/ca/figures/cpufreq-50.png
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/ca/figures/cpufreq-75.png
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/ca/figures/cpufreq-applet-preferences-smp.png
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/ca/figures/cpufreq-applet-preferences.png
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/ca/figures/cpufreq-applet-selector-both.png
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/ca/figures/cpufreq-applet-selector.png
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/ca/figures/cpufreq-applet.png
 %%CPUFREQ%%share/gnome/help/cpufreq-applet/en_GB/cpufreq-applet.xml
 %%CPUFREQ%%share/gnome/help/cpufreq-applet/en_GB/figures/cpufreq-100.png
 %%CPUFREQ%%share/gnome/help/cpufreq-applet/en_GB/figures/cpufreq-25.png
@@ -407,6 +460,26 @@ share/gnome/help/char-palette/uk/figures/charpick_characters.png
 %%CPUFREQ%%share/gnome/help/cpufreq-applet/nl/figures/cpufreq-applet-selector-both.png
 %%CPUFREQ%%share/gnome/help/cpufreq-applet/nl/figures/cpufreq-applet-selector.png
 %%CPUFREQ%%share/gnome/help/cpufreq-applet/nl/figures/cpufreq-applet.png
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/oc/cpufreq-applet.xml
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/oc/figures/cpufreq-100.png
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/oc/figures/cpufreq-25.png
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/oc/figures/cpufreq-50.png
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/oc/figures/cpufreq-75.png
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/oc/figures/cpufreq-applet-preferences-smp.png
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/oc/figures/cpufreq-applet-preferences.png
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/oc/figures/cpufreq-applet-selector-both.png
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/oc/figures/cpufreq-applet-selector.png
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/oc/figures/cpufreq-applet.png
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/ru/cpufreq-applet.xml
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/ru/figures/cpufreq-100.png
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/ru/figures/cpufreq-25.png
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/ru/figures/cpufreq-50.png
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/ru/figures/cpufreq-75.png
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/ru/figures/cpufreq-applet-preferences-smp.png
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/ru/figures/cpufreq-applet-preferences.png
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/ru/figures/cpufreq-applet-selector-both.png
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/ru/figures/cpufreq-applet-selector.png
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/ru/figures/cpufreq-applet.png
 %%CPUFREQ%%share/gnome/help/cpufreq-applet/sv/cpufreq-applet.xml
 %%CPUFREQ%%share/gnome/help/cpufreq-applet/sv/figures/cpufreq-100.png
 %%CPUFREQ%%share/gnome/help/cpufreq-applet/sv/figures/cpufreq-25.png
@@ -468,6 +541,12 @@ share/gnome/help/drivemount/it/figures/drivemount-applet_example.png
 share/gnome/help/drivemount/it/figures/drivemount-applet_mount.png
 share/gnome/help/drivemount/it/figures/drivemount-applet_open.png
 share/gnome/help/drivemount/it/figures/drivemount-applet_status.png
+share/gnome/help/drivemount/oc/drivemount.xml
+share/gnome/help/drivemount/oc/figures/drivemount-applet_eject.png
+share/gnome/help/drivemount/oc/figures/drivemount-applet_example.png
+share/gnome/help/drivemount/oc/figures/drivemount-applet_mount.png
+share/gnome/help/drivemount/oc/figures/drivemount-applet_open.png
+share/gnome/help/drivemount/oc/figures/drivemount-applet_status.png
 share/gnome/help/drivemount/pa/drivemount.xml
 share/gnome/help/drivemount/pa/figures/drivemount-applet_eject.png
 share/gnome/help/drivemount/pa/figures/drivemount-applet_example.png
@@ -503,6 +582,8 @@ share/gnome/help/geyes/C/geyes.xml
 share/gnome/help/geyes/C/legal.xml
 share/gnome/help/geyes/bg/figures/geyes_applet.png
 share/gnome/help/geyes/bg/geyes.xml
+share/gnome/help/geyes/ca/figures/geyes_applet.png
+share/gnome/help/geyes/ca/geyes.xml
 share/gnome/help/geyes/en_GB/figures/geyes_applet.png
 share/gnome/help/geyes/en_GB/geyes.xml
 share/gnome/help/geyes/es/figures/geyes_applet.png
@@ -511,6 +592,8 @@ share/gnome/help/geyes/fr/figures/geyes_applet.png
 share/gnome/help/geyes/fr/geyes.xml
 share/gnome/help/geyes/it/figures/geyes_applet.png
 share/gnome/help/geyes/it/geyes.xml
+share/gnome/help/geyes/oc/figures/geyes_applet.png
+share/gnome/help/geyes/oc/geyes.xml
 share/gnome/help/geyes/ru/figures/geyes_applet.png
 share/gnome/help/geyes/ru/geyes.xml
 share/gnome/help/geyes/sv/figures/geyes_applet.png
@@ -519,9 +602,11 @@ share/gnome/help/geyes/uk/figures/geyes_applet.png
 share/gnome/help/geyes/uk/geyes.xml
 share/gnome/help/gswitchit/C/gswitchit.xml
 share/gnome/help/gswitchit/C/legal.xml
+share/gnome/help/gswitchit/el/gswitchit.xml
 share/gnome/help/gswitchit/en_GB/gswitchit.xml
 share/gnome/help/gswitchit/es/gswitchit.xml
 share/gnome/help/gswitchit/fr/gswitchit.xml
+share/gnome/help/gswitchit/oc/gswitchit.xml
 share/gnome/help/gswitchit/ru/gswitchit.xml
 share/gnome/help/gswitchit/sv/gswitchit.xml
 share/gnome/help/gswitchit/uk/gswitchit.xml
@@ -601,6 +686,21 @@ share/gnome/help/gweather/nl/figures/stock_weather-snow.png
 share/gnome/help/gweather/nl/figures/stock_weather-storm.png
 share/gnome/help/gweather/nl/figures/stock_weather-sunny.png
 share/gnome/help/gweather/nl/gweather.xml
+share/gnome/help/gweather/oc/figures/gweather-details.png
+share/gnome/help/gweather/oc/figures/gweather-menu-prefs.png
+share/gnome/help/gweather/oc/figures/gweather-prefs-general.png
+share/gnome/help/gweather/oc/figures/gweather-prefs-locations.png
+share/gnome/help/gweather/oc/figures/gweather_applet.png
+share/gnome/help/gweather/oc/figures/stock_weather-cloudy.png
+share/gnome/help/gweather/oc/figures/stock_weather-few-clouds.png
+share/gnome/help/gweather/oc/figures/stock_weather-fog.png
+share/gnome/help/gweather/oc/figures/stock_weather-night-clear.png
+share/gnome/help/gweather/oc/figures/stock_weather-night-few-clouds.png
+share/gnome/help/gweather/oc/figures/stock_weather-showers.png
+share/gnome/help/gweather/oc/figures/stock_weather-snow.png
+share/gnome/help/gweather/oc/figures/stock_weather-storm.png
+share/gnome/help/gweather/oc/figures/stock_weather-sunny.png
+share/gnome/help/gweather/oc/gweather.xml
 share/gnome/help/gweather/pa/figures/gweather-details.png
 share/gnome/help/gweather/pa/figures/gweather-menu-prefs.png
 share/gnome/help/gweather/pa/figures/gweather-prefs-general.png
@@ -649,6 +749,8 @@ share/gnome/help/gweather/uk/gweather.xml
 share/gnome/help/mixer_applet2/C/figures/volumecontrol_applet.png
 share/gnome/help/mixer_applet2/C/legal.xml
 share/gnome/help/mixer_applet2/C/mixer_applet2.xml
+share/gnome/help/mixer_applet2/ca/figures/volumecontrol_applet.png
+share/gnome/help/mixer_applet2/ca/mixer_applet2.xml
 share/gnome/help/mixer_applet2/en_GB/figures/volumecontrol_applet.png
 share/gnome/help/mixer_applet2/en_GB/mixer_applet2.xml
 share/gnome/help/mixer_applet2/es/figures/volumecontrol_applet.png
@@ -657,6 +759,8 @@ share/gnome/help/mixer_applet2/fr/figures/volumecontrol_applet.png
 share/gnome/help/mixer_applet2/fr/mixer_applet2.xml
 share/gnome/help/mixer_applet2/it/figures/volumecontrol_applet.png
 share/gnome/help/mixer_applet2/it/mixer_applet2.xml
+share/gnome/help/mixer_applet2/oc/figures/volumecontrol_applet.png
+share/gnome/help/mixer_applet2/oc/mixer_applet2.xml
 share/gnome/help/mixer_applet2/pa/figures/volumecontrol_applet.png
 share/gnome/help/mixer_applet2/pa/mixer_applet2.xml
 share/gnome/help/mixer_applet2/ru/figures/volumecontrol_applet.png
@@ -670,6 +774,10 @@ share/gnome/help/multiload/C/figures/system-monitor-applet_window.png
 share/gnome/help/multiload/C/figures/system_monitor.png
 share/gnome/help/multiload/C/legal.xml
 share/gnome/help/multiload/C/multiload.xml
+share/gnome/help/multiload/ca/figures/multiload-preferences.png
+share/gnome/help/multiload/ca/figures/system-monitor-applet_window.png
+share/gnome/help/multiload/ca/figures/system_monitor.png
+share/gnome/help/multiload/ca/multiload.xml
 share/gnome/help/multiload/en_GB/figures/multiload-preferences.png
 share/gnome/help/multiload/en_GB/figures/system-monitor-applet_window.png
 share/gnome/help/multiload/en_GB/figures/system_monitor.png
@@ -682,6 +790,10 @@ share/gnome/help/multiload/fr/figures/multiload-preferences.png
 share/gnome/help/multiload/fr/figures/system-monitor-applet_window.png
 share/gnome/help/multiload/fr/figures/system_monitor.png
 share/gnome/help/multiload/fr/multiload.xml
+share/gnome/help/multiload/oc/figures/multiload-preferences.png
+share/gnome/help/multiload/oc/figures/system-monitor-applet_window.png
+share/gnome/help/multiload/oc/figures/system_monitor.png
+share/gnome/help/multiload/oc/multiload.xml
 share/gnome/help/multiload/pa/figures/multiload-preferences.png
 share/gnome/help/multiload/pa/figures/system-monitor-applet_window.png
 share/gnome/help/multiload/pa/figures/system_monitor.png
@@ -723,6 +835,12 @@ share/gnome/help/stickynotes_applet/fr/figures/stickynotes-note-prefs.png
 share/gnome/help/stickynotes_applet/fr/figures/stickynotes-prefs.png
 share/gnome/help/stickynotes_applet/fr/figures/stickynotes_applet.png
 share/gnome/help/stickynotes_applet/fr/stickynotes_applet.xml
+share/gnome/help/stickynotes_applet/oc/figures/stickynote-right-menu-lock.png
+share/gnome/help/stickynotes_applet/oc/figures/stickynote-right-menu-new.png
+share/gnome/help/stickynotes_applet/oc/figures/stickynotes-note-prefs.png
+share/gnome/help/stickynotes_applet/oc/figures/stickynotes-prefs.png
+share/gnome/help/stickynotes_applet/oc/figures/stickynotes_applet.png
+share/gnome/help/stickynotes_applet/oc/stickynotes_applet.xml
 share/gnome/help/stickynotes_applet/pa/figures/stickynote-right-menu-lock.png
 share/gnome/help/stickynotes_applet/pa/figures/stickynote-right-menu-new.png
 share/gnome/help/stickynotes_applet/pa/figures/stickynotes-note-prefs.png
@@ -754,6 +872,8 @@ share/gnome/help/trashapplet/it/figures/trash-applet.png
 share/gnome/help/trashapplet/it/trashapplet.xml
 share/gnome/help/trashapplet/nl/figures/trash-applet.png
 share/gnome/help/trashapplet/nl/trashapplet.xml
+share/gnome/help/trashapplet/oc/figures/trash-applet.png
+share/gnome/help/trashapplet/oc/trashapplet.xml
 share/gnome/help/trashapplet/pa/figures/trash-applet.png
 share/gnome/help/trashapplet/pa/trashapplet.xml
 share/gnome/help/trashapplet/ru/figures/trash-applet.png
@@ -762,249 +882,6 @@ share/gnome/help/trashapplet/sv/figures/trash-applet.png
 share/gnome/help/trashapplet/sv/trashapplet.xml
 share/gnome/help/trashapplet/uk/figures/trash-applet.png
 share/gnome/help/trashapplet/uk/trashapplet.xml
-share/gnome/omf/accessx-status/accessx-status-C.omf
-share/gnome/omf/accessx-status/accessx-status-bg.omf
-share/gnome/omf/accessx-status/accessx-status-en_GB.omf
-share/gnome/omf/accessx-status/accessx-status-es.omf
-share/gnome/omf/accessx-status/accessx-status-fr.omf
-share/gnome/omf/accessx-status/accessx-status-it.omf
-share/gnome/omf/accessx-status/accessx-status-nl.omf
-share/gnome/omf/accessx-status/accessx-status-sv.omf
-share/gnome/omf/accessx-status/accessx-status-uk.omf
-%%BATTERY%%share/gnome/omf/battstat/battstat-C.omf
-%%BATTERY%%share/gnome/omf/battstat/battstat-bg.omf
-%%BATTERY%%share/gnome/omf/battstat/battstat-en_GB.omf
-%%BATTERY%%share/gnome/omf/battstat/battstat-es.omf
-%%BATTERY%%share/gnome/omf/battstat/battstat-fr.omf
-%%BATTERY%%share/gnome/omf/battstat/battstat-pa.omf
-%%BATTERY%%share/gnome/omf/battstat/battstat-sv.omf
-%%BATTERY%%share/gnome/omf/battstat/battstat-uk.omf
-share/gnome/omf/char-palette/char-palette-C.omf
-share/gnome/omf/char-palette/char-palette-bg.omf
-share/gnome/omf/char-palette/char-palette-en_GB.omf
-share/gnome/omf/char-palette/char-palette-es.omf
-share/gnome/omf/char-palette/char-palette-fr.omf
-share/gnome/omf/char-palette/char-palette-it.omf
-share/gnome/omf/char-palette/char-palette-nl.omf
-share/gnome/omf/char-palette/char-palette-pt_BR.omf
-share/gnome/omf/char-palette/char-palette-sv.omf
-share/gnome/omf/char-palette/char-palette-uk.omf
-%%COMMANDER%%share/gnome/omf/command-line/command-line-C.omf
-%%COMMANDER%%share/gnome/omf/command-line/command-line-en_GB.omf
-%%COMMANDER%%share/gnome/omf/command-line/command-line-es.omf
-%%COMMANDER%%share/gnome/omf/command-line/command-line-fr.omf
-%%COMMANDER%%share/gnome/omf/command-line/command-line-pt_BR.omf
-%%COMMANDER%%share/gnome/omf/command-line/command-line-sv.omf
-%%COMMANDER%%share/gnome/omf/command-line/command-line-uk.omf
-%%CPUFREQ%%share/gnome/omf/cpufreq-applet/cpufreq-applet-C.omf
-%%CPUFREQ%%share/gnome/omf/cpufreq-applet/cpufreq-applet-en_GB.omf
-%%CPUFREQ%%share/gnome/omf/cpufreq-applet/cpufreq-applet-es.omf
-%%CPUFREQ%%share/gnome/omf/cpufreq-applet/cpufreq-applet-fr.omf
-%%CPUFREQ%%share/gnome/omf/cpufreq-applet/cpufreq-applet-nl.omf
-%%CPUFREQ%%share/gnome/omf/cpufreq-applet/cpufreq-applet-sv.omf
-%%CPUFREQ%%share/gnome/omf/cpufreq-applet/cpufreq-applet-uk.omf
-%%CPUFREQ%%share/gnome/omf/cpufreq-applet/cpufreq-applet-zh_CN.omf
-share/gnome/omf/drivemount/drivemount-C.omf
-share/gnome/omf/drivemount/drivemount-en_GB.omf
-share/gnome/omf/drivemount/drivemount-es.omf
-share/gnome/omf/drivemount/drivemount-fr.omf
-share/gnome/omf/drivemount/drivemount-it.omf
-share/gnome/omf/drivemount/drivemount-pa.omf
-share/gnome/omf/drivemount/drivemount-ru.omf
-share/gnome/omf/drivemount/drivemount-sv.omf
-share/gnome/omf/drivemount/drivemount-uk.omf
-share/gnome/omf/drivemount/drivemount-zh_CN.omf
-share/gnome/omf/geyes/geyes-C.omf
-share/gnome/omf/geyes/geyes-bg.omf
-share/gnome/omf/geyes/geyes-en_GB.omf
-share/gnome/omf/geyes/geyes-es.omf
-share/gnome/omf/geyes/geyes-fr.omf
-share/gnome/omf/geyes/geyes-it.omf
-share/gnome/omf/geyes/geyes-ru.omf
-share/gnome/omf/geyes/geyes-sv.omf
-share/gnome/omf/geyes/geyes-uk.omf
-share/gnome/omf/gswitchit/gswitchit-C.omf
-share/gnome/omf/gswitchit/gswitchit-en_GB.omf
-share/gnome/omf/gswitchit/gswitchit-es.omf
-share/gnome/omf/gswitchit/gswitchit-fr.omf
-share/gnome/omf/gswitchit/gswitchit-ru.omf
-share/gnome/omf/gswitchit/gswitchit-sv.omf
-share/gnome/omf/gswitchit/gswitchit-uk.omf
-share/gnome/omf/gweather/gweather-C.omf
-share/gnome/omf/gweather/gweather-en_GB.omf
-share/gnome/omf/gweather/gweather-es.omf
-share/gnome/omf/gweather/gweather-fr.omf
-share/gnome/omf/gweather/gweather-nl.omf
-share/gnome/omf/gweather/gweather-pa.omf
-share/gnome/omf/gweather/gweather-sv.omf
-share/gnome/omf/gweather/gweather-uk.omf
-share/gnome/omf/mixer_applet2/mixer_applet2-C.omf
-share/gnome/omf/mixer_applet2/mixer_applet2-en_GB.omf
-share/gnome/omf/mixer_applet2/mixer_applet2-es.omf
-share/gnome/omf/mixer_applet2/mixer_applet2-fr.omf
-share/gnome/omf/mixer_applet2/mixer_applet2-it.omf
-share/gnome/omf/mixer_applet2/mixer_applet2-pa.omf
-share/gnome/omf/mixer_applet2/mixer_applet2-ru.omf
-share/gnome/omf/mixer_applet2/mixer_applet2-sv.omf
-share/gnome/omf/mixer_applet2/mixer_applet2-uk.omf
-share/gnome/omf/multiload/multiload-C.omf
-share/gnome/omf/multiload/multiload-en_GB.omf
-share/gnome/omf/multiload/multiload-es.omf
-share/gnome/omf/multiload/multiload-fr.omf
-share/gnome/omf/multiload/multiload-pa.omf
-share/gnome/omf/multiload/multiload-ru.omf
-share/gnome/omf/multiload/multiload-sv.omf
-share/gnome/omf/multiload/multiload-uk.omf
-share/gnome/omf/stickynotes_applet/stickynotes_applet-C.omf
-share/gnome/omf/stickynotes_applet/stickynotes_applet-en_GB.omf
-share/gnome/omf/stickynotes_applet/stickynotes_applet-es.omf
-share/gnome/omf/stickynotes_applet/stickynotes_applet-fr.omf
-share/gnome/omf/stickynotes_applet/stickynotes_applet-pa.omf
-share/gnome/omf/stickynotes_applet/stickynotes_applet-sv.omf
-share/gnome/omf/stickynotes_applet/stickynotes_applet-uk.omf
-share/gnome/omf/trashapplet/trashapplet-C.omf
-share/gnome/omf/trashapplet/trashapplet-en_GB.omf
-share/gnome/omf/trashapplet/trashapplet-es.omf
-share/gnome/omf/trashapplet/trashapplet-fr.omf
-share/gnome/omf/trashapplet/trashapplet-it.omf
-share/gnome/omf/trashapplet/trashapplet-nl.omf
-share/gnome/omf/trashapplet/trashapplet-pa.omf
-share/gnome/omf/trashapplet/trashapplet-ru.omf
-share/gnome/omf/trashapplet/trashapplet-sv.omf
-share/gnome/omf/trashapplet/trashapplet-uk.omf
-share/gnome/pixmaps/accessx-status-applet/ax-applet.png
-share/gnome/pixmaps/accessx-status-applet/ax-bouncekeys.png
-share/gnome/pixmaps/accessx-status-applet/ax-key-base.png
-share/gnome/pixmaps/accessx-status-applet/ax-key-inverse.png
-share/gnome/pixmaps/accessx-status-applet/ax-key-no.png
-share/gnome/pixmaps/accessx-status-applet/ax-key-none.png
-share/gnome/pixmaps/accessx-status-applet/ax-key-yes.png
-share/gnome/pixmaps/accessx-status-applet/ax-slowkeys-no.png
-share/gnome/pixmaps/accessx-status-applet/ax-slowkeys-pending.png
-share/gnome/pixmaps/accessx-status-applet/ax-slowkeys-yes.png
-share/gnome/pixmaps/accessx-status-applet/ax-slowkeys.png
-share/gnome/pixmaps/accessx-status-applet/mousekeys-base.png
-share/gnome/pixmaps/accessx-status-applet/mousekeys-default-left.png
-share/gnome/pixmaps/accessx-status-applet/mousekeys-default-middle.png
-share/gnome/pixmaps/accessx-status-applet/mousekeys-default-right.png
-share/gnome/pixmaps/accessx-status-applet/mousekeys-pressed-left.png
-share/gnome/pixmaps/accessx-status-applet/mousekeys-pressed-middle.png
-share/gnome/pixmaps/accessx-status-applet/mousekeys-pressed-right.png
-share/gnome/pixmaps/accessx-status-applet/sticky-alt-latched.png
-share/gnome/pixmaps/accessx-status-applet/sticky-alt-locked.png
-share/gnome/pixmaps/accessx-status-applet/sticky-alt-none.png
-share/gnome/pixmaps/accessx-status-applet/sticky-ctrl-latched.png
-share/gnome/pixmaps/accessx-status-applet/sticky-ctrl-locked.png
-share/gnome/pixmaps/accessx-status-applet/sticky-ctrl-none.png
-share/gnome/pixmaps/accessx-status-applet/sticky-hyper-latched.png
-share/gnome/pixmaps/accessx-status-applet/sticky-hyper-locked.png
-share/gnome/pixmaps/accessx-status-applet/sticky-hyper-none.png
-share/gnome/pixmaps/accessx-status-applet/sticky-meta-latched.png
-share/gnome/pixmaps/accessx-status-applet/sticky-meta-locked.png
-share/gnome/pixmaps/accessx-status-applet/sticky-meta-none.png
-share/gnome/pixmaps/accessx-status-applet/sticky-shift-latched.png
-share/gnome/pixmaps/accessx-status-applet/sticky-shift-locked.png
-share/gnome/pixmaps/accessx-status-applet/sticky-shift-none.png
-share/gnome/pixmaps/accessx-status-applet/sticky-super-latched.png
-share/gnome/pixmaps/accessx-status-applet/sticky-super-locked.png
-share/gnome/pixmaps/accessx-status-applet/sticky-super-none.png
-%%CPUFREQ%%share/gnome/pixmaps/cpufreq-applet/cpufreq-100.png
-%%CPUFREQ%%share/gnome/pixmaps/cpufreq-applet/cpufreq-25.png
-%%CPUFREQ%%share/gnome/pixmaps/cpufreq-applet/cpufreq-50.png
-%%CPUFREQ%%share/gnome/pixmaps/cpufreq-applet/cpufreq-75.png
-%%CPUFREQ%%share/gnome/pixmaps/cpufreq-applet/cpufreq-na.png
-%%PYTHON%%share/gnome/pixmaps/invest-big.png
-share/gnome/pixmaps/stickynotes/close.png
-share/gnome/pixmaps/stickynotes/locked.png
-share/gnome/pixmaps/stickynotes/resize_se.png
-share/gnome/pixmaps/stickynotes/resize_sw.png
-share/gnome/pixmaps/stickynotes/unlocked.png
-share/gnome/xmodmap/base.xml
-share/gnome/xmodmap/xmodmap.am
-share/gnome/xmodmap/xmodmap.ar
-share/gnome/xmodmap/xmodmap.be
-share/gnome/xmodmap/xmodmap.bg
-share/gnome/xmodmap/xmodmap.br
-share/gnome/xmodmap/xmodmap.ch
-share/gnome/xmodmap/xmodmap.ch_de
-share/gnome/xmodmap/xmodmap.ch_fr
-share/gnome/xmodmap/xmodmap.cz
-share/gnome/xmodmap/xmodmap.de
-share/gnome/xmodmap/xmodmap.de-apple
-share/gnome/xmodmap/xmodmap.dk
-share/gnome/xmodmap/xmodmap.dvorak
-share/gnome/xmodmap/xmodmap.ee
-share/gnome/xmodmap/xmodmap.es
-share/gnome/xmodmap/xmodmap.es_x86
-share/gnome/xmodmap/xmodmap.fi
-share/gnome/xmodmap/xmodmap.fr
-share/gnome/xmodmap/xmodmap.fr-2
-share/gnome/xmodmap/xmodmap.fr_x86
-share/gnome/xmodmap/xmodmap.gb
-share/gnome/xmodmap/xmodmap.gb-102
-share/gnome/xmodmap/xmodmap.gb-105
-share/gnome/xmodmap/xmodmap.ge_la
-share/gnome/xmodmap/xmodmap.ge_ru
-share/gnome/xmodmap/xmodmap.gr
-share/gnome/xmodmap/xmodmap.hu
-share/gnome/xmodmap/xmodmap.hu-101-lat1
-share/gnome/xmodmap/xmodmap.hu-101-lat2
-share/gnome/xmodmap/xmodmap.hu-ibm
-share/gnome/xmodmap/xmodmap.hu-lat1
-share/gnome/xmodmap/xmodmap.hu-sun-lat2
-share/gnome/xmodmap/xmodmap.hu.old
-share/gnome/xmodmap/xmodmap.hu_latin1
-share/gnome/xmodmap/xmodmap.hu_x86
-share/gnome/xmodmap/xmodmap.il
-share/gnome/xmodmap/xmodmap.il_phonetic
-share/gnome/xmodmap/xmodmap.is
-share/gnome/xmodmap/xmodmap.it
-share/gnome/xmodmap/xmodmap.jp
-share/gnome/xmodmap/xmodmap.kr
-share/gnome/xmodmap/xmodmap.la
-share/gnome/xmodmap/xmodmap.lt
-share/gnome/xmodmap/xmodmap.lt_b
-share/gnome/xmodmap/xmodmap.lt_p
-share/gnome/xmodmap/xmodmap.mk
-share/gnome/xmodmap/xmodmap.mn
-share/gnome/xmodmap/xmodmap.mn-phonet
-share/gnome/xmodmap/xmodmap.mn-rev
-share/gnome/xmodmap/xmodmap.mn-uni
-share/gnome/xmodmap/xmodmap.nl
-share/gnome/xmodmap/xmodmap.no
-share/gnome/xmodmap/xmodmap.pl
-share/gnome/xmodmap/xmodmap.pl2
-share/gnome/xmodmap/xmodmap.pt
-share/gnome/xmodmap/xmodmap.pt-dead
-share/gnome/xmodmap/xmodmap.qc
-share/gnome/xmodmap/xmodmap.qc-2
-share/gnome/xmodmap/xmodmap.ro
-share/gnome/xmodmap/xmodmap.ru
-share/gnome/xmodmap/xmodmap.ru-rev
-share/gnome/xmodmap/xmodmap.ru_yawerty
-share/gnome/xmodmap/xmodmap.se
-share/gnome/xmodmap/xmodmap.sf
-share/gnome/xmodmap/xmodmap.sg
-share/gnome/xmodmap/xmodmap.si
-share/gnome/xmodmap/xmodmap.sk
-share/gnome/xmodmap/xmodmap.th
-share/gnome/xmodmap/xmodmap.tr_f
-share/gnome/xmodmap/xmodmap.tr_q
-share/gnome/xmodmap/xmodmap.uk
-share/gnome/xmodmap/xmodmap.uk_x86
-share/gnome/xmodmap/xmodmap.us
-share/gnome/xmodmap/xmodmap.us-101
-share/gnome/xmodmap/xmodmap.us-84
-share/gnome/xmodmap/xmodmap.us-dec
-share/gnome/xmodmap/xmodmap.us-ibm
-share/gnome/xmodmap/xmodmap.us-int
-share/gnome/xmodmap/xmodmap.us-mac
-share/gnome/xmodmap/xmodmap.us-sgi-101
-share/gnome/xmodmap/xmodmap.us-sun
-share/gnome/xmodmap/xmodmap.us.old
-share/gnome/xmodmap/xmodmap.us101A_x86
-share/gnome/xmodmap/xmodmap.us_intl
-share/gnome/xmodmap/xmodmap.yu
 %%CPUFREQ%%share/icons/hicolor/16x16/apps/gnome-cpu-frequency-applet.png
 share/icons/hicolor/16x16/apps/gnome-eyes-applet.png
 share/icons/hicolor/16x16/apps/gnome-modem-monitor-applet.png
@@ -1026,14 +903,16 @@ share/icons/hicolor/48x48/apps/charpick.png
 %%COMMANDER%%share/icons/hicolor/48x48/apps/gnome-mini-commander.png
 share/icons/hicolor/48x48/apps/gswitchit-applet.png
 share/icons/hicolor/48x48/apps/gswitchit-properties-capplet.png
-%%CPUFREQ%%share/icons/hicolor/svgxsvg/apps/gnome-cpu-frequency-applet
-share/icons/hicolor/svgxsvg/apps/gnome-eyes-applet
-share/icons/hicolor/svgxsvg/apps/gnome-modem-monitor-applet
-share/icons/hicolor/svgxsvg/apps/gnome-sticky-notes-applet
+%%CPUFREQ%%share/icons/hicolor/scalable/apps/gnome-cpu-frequency-applet.svg
+share/icons/hicolor/scalable/apps/gnome-eyes-applet.svg
+share/icons/hicolor/scalable/apps/gnome-modem-monitor-applet.svg
+share/icons/hicolor/scalable/apps/gnome-sticky-notes-applet.svg
 share/locale/am/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/ar/LC_MESSAGES/gnome-applets-2.0.mo
+share/locale/as/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/az/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/be/LC_MESSAGES/gnome-applets-2.0.mo
+share/locale/be@latin/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/bg/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/bn/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/bn_IN/LC_MESSAGES/gnome-applets-2.0.mo
@@ -1098,6 +977,7 @@ share/locale/nb/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/ne/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/nl/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/nn/LC_MESSAGES/gnome-applets-2.0.mo
+share/locale/oc/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/or/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/pa/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/pl/LC_MESSAGES/gnome-applets-2.0.mo
@@ -1106,6 +986,7 @@ share/locale/pt_BR/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/ro/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/ru/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/rw/LC_MESSAGES/gnome-applets-2.0.mo
+share/locale/si/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/sk/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/sl/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/sq/LC_MESSAGES/gnome-applets-2.0.mo
@@ -1123,26 +1004,286 @@ share/locale/xh/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/zh_CN/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/zh_HK/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
-@dirrmtry share/icons/hicolor/svgxsvg/apps
-@dirrmtry share/icons/hicolor/svgxsvg
-@dirrmtry share/icons/hicolor
-@dirrmtry share/icons
-@dirrm share/gnome/pixmaps/stickynotes
-%%CPUFREQ%%@dirrm share/gnome/pixmaps/cpufreq-applet
-@dirrm share/gnome/pixmaps/accessx-status-applet
-@dirrm share/gnome/omf/trashapplet
-@dirrm share/gnome/omf/stickynotes_applet
-@dirrm share/gnome/omf/multiload
-@dirrm share/gnome/omf/mixer_applet2
-@dirrm share/gnome/omf/gweather
-@dirrm share/gnome/omf/gswitchit
-@dirrm share/gnome/omf/geyes
-@dirrm share/gnome/omf/drivemount
-%%CPUFREQ%%@dirrm share/gnome/omf/cpufreq-applet
-%%COMMANDER%%@dirrm share/gnome/omf/command-line
-@dirrm share/gnome/omf/char-palette
-%%BATTERY%%@dirrm share/gnome/omf/battstat
-@dirrm share/gnome/omf/accessx-status
+share/omf/accessx-status/accessx-status-C.omf
+share/omf/accessx-status/accessx-status-bg.omf
+share/omf/accessx-status/accessx-status-ca.omf
+share/omf/accessx-status/accessx-status-en_GB.omf
+share/omf/accessx-status/accessx-status-es.omf
+share/omf/accessx-status/accessx-status-fr.omf
+share/omf/accessx-status/accessx-status-it.omf
+share/omf/accessx-status/accessx-status-nl.omf
+share/omf/accessx-status/accessx-status-oc.omf
+share/omf/accessx-status/accessx-status-sv.omf
+share/omf/accessx-status/accessx-status-uk.omf
+%%BATTERY%%share/omf/battstat/battstat-C.omf
+%%BATTERY%%share/omf/battstat/battstat-bg.omf
+%%BATTERY%%share/omf/battstat/battstat-en_GB.omf
+%%BATTERY%%share/omf/battstat/battstat-es.omf
+%%BATTERY%%share/omf/battstat/battstat-fr.omf
+%%BATTERY%%share/omf/battstat/battstat-oc.omf
+%%BATTERY%%share/omf/battstat/battstat-pa.omf
+%%BATTERY%%share/omf/battstat/battstat-sv.omf
+%%BATTERY%%share/omf/battstat/battstat-uk.omf
+share/omf/char-palette/char-palette-C.omf
+share/omf/char-palette/char-palette-bg.omf
+share/omf/char-palette/char-palette-en_GB.omf
+share/omf/char-palette/char-palette-es.omf
+share/omf/char-palette/char-palette-fr.omf
+share/omf/char-palette/char-palette-it.omf
+share/omf/char-palette/char-palette-nl.omf
+share/omf/char-palette/char-palette-oc.omf
+share/omf/char-palette/char-palette-pt_BR.omf
+share/omf/char-palette/char-palette-ru.omf
+share/omf/char-palette/char-palette-sv.omf
+share/omf/char-palette/char-palette-uk.omf
+%%COMMANDER%%share/omf/command-line/command-line-C.omf
+%%COMMANDER%%share/omf/command-line/command-line-en_GB.omf
+%%COMMANDER%%share/omf/command-line/command-line-es.omf
+%%COMMANDER%%share/omf/command-line/command-line-fr.omf
+%%COMMANDER%%share/omf/command-line/command-line-oc.omf
+%%COMMANDER%%share/omf/command-line/command-line-pt_BR.omf
+%%COMMANDER%%share/omf/command-line/command-line-sv.omf
+%%COMMANDER%%share/omf/command-line/command-line-uk.omf
+%%CPUFREQ%%share/omf/cpufreq-applet/cpufreq-applet-C.omf
+%%CPUFREQ%%share/omf/cpufreq-applet/cpufreq-applet-ca.omf
+%%CPUFREQ%%share/omf/cpufreq-applet/cpufreq-applet-en_GB.omf
+%%CPUFREQ%%share/omf/cpufreq-applet/cpufreq-applet-es.omf
+%%CPUFREQ%%share/omf/cpufreq-applet/cpufreq-applet-fr.omf
+%%CPUFREQ%%share/omf/cpufreq-applet/cpufreq-applet-nl.omf
+%%CPUFREQ%%share/omf/cpufreq-applet/cpufreq-applet-oc.omf
+%%CPUFREQ%%share/omf/cpufreq-applet/cpufreq-applet-ru.omf
+%%CPUFREQ%%share/omf/cpufreq-applet/cpufreq-applet-sv.omf
+%%CPUFREQ%%share/omf/cpufreq-applet/cpufreq-applet-uk.omf
+%%CPUFREQ%%share/omf/cpufreq-applet/cpufreq-applet-zh_CN.omf
+share/omf/drivemount/drivemount-C.omf
+share/omf/drivemount/drivemount-en_GB.omf
+share/omf/drivemount/drivemount-es.omf
+share/omf/drivemount/drivemount-fr.omf
+share/omf/drivemount/drivemount-it.omf
+share/omf/drivemount/drivemount-oc.omf
+share/omf/drivemount/drivemount-pa.omf
+share/omf/drivemount/drivemount-ru.omf
+share/omf/drivemount/drivemount-sv.omf
+share/omf/drivemount/drivemount-uk.omf
+share/omf/drivemount/drivemount-zh_CN.omf
+share/omf/geyes/geyes-C.omf
+share/omf/geyes/geyes-bg.omf
+share/omf/geyes/geyes-ca.omf
+share/omf/geyes/geyes-en_GB.omf
+share/omf/geyes/geyes-es.omf
+share/omf/geyes/geyes-fr.omf
+share/omf/geyes/geyes-it.omf
+share/omf/geyes/geyes-oc.omf
+share/omf/geyes/geyes-ru.omf
+share/omf/geyes/geyes-sv.omf
+share/omf/geyes/geyes-uk.omf
+share/omf/gswitchit/gswitchit-C.omf
+share/omf/gswitchit/gswitchit-el.omf
+share/omf/gswitchit/gswitchit-en_GB.omf
+share/omf/gswitchit/gswitchit-es.omf
+share/omf/gswitchit/gswitchit-fr.omf
+share/omf/gswitchit/gswitchit-oc.omf
+share/omf/gswitchit/gswitchit-ru.omf
+share/omf/gswitchit/gswitchit-sv.omf
+share/omf/gswitchit/gswitchit-uk.omf
+share/omf/gweather/gweather-C.omf
+share/omf/gweather/gweather-en_GB.omf
+share/omf/gweather/gweather-es.omf
+share/omf/gweather/gweather-fr.omf
+share/omf/gweather/gweather-nl.omf
+share/omf/gweather/gweather-oc.omf
+share/omf/gweather/gweather-pa.omf
+share/omf/gweather/gweather-sv.omf
+share/omf/gweather/gweather-uk.omf
+share/omf/mixer_applet2/mixer_applet2-C.omf
+share/omf/mixer_applet2/mixer_applet2-ca.omf
+share/omf/mixer_applet2/mixer_applet2-en_GB.omf
+share/omf/mixer_applet2/mixer_applet2-es.omf
+share/omf/mixer_applet2/mixer_applet2-fr.omf
+share/omf/mixer_applet2/mixer_applet2-it.omf
+share/omf/mixer_applet2/mixer_applet2-oc.omf
+share/omf/mixer_applet2/mixer_applet2-pa.omf
+share/omf/mixer_applet2/mixer_applet2-ru.omf
+share/omf/mixer_applet2/mixer_applet2-sv.omf
+share/omf/mixer_applet2/mixer_applet2-uk.omf
+share/omf/multiload/multiload-C.omf
+share/omf/multiload/multiload-ca.omf
+share/omf/multiload/multiload-en_GB.omf
+share/omf/multiload/multiload-es.omf
+share/omf/multiload/multiload-fr.omf
+share/omf/multiload/multiload-oc.omf
+share/omf/multiload/multiload-pa.omf
+share/omf/multiload/multiload-ru.omf
+share/omf/multiload/multiload-sv.omf
+share/omf/multiload/multiload-uk.omf
+share/omf/stickynotes_applet/stickynotes_applet-C.omf
+share/omf/stickynotes_applet/stickynotes_applet-en_GB.omf
+share/omf/stickynotes_applet/stickynotes_applet-es.omf
+share/omf/stickynotes_applet/stickynotes_applet-fr.omf
+share/omf/stickynotes_applet/stickynotes_applet-oc.omf
+share/omf/stickynotes_applet/stickynotes_applet-pa.omf
+share/omf/stickynotes_applet/stickynotes_applet-sv.omf
+share/omf/stickynotes_applet/stickynotes_applet-uk.omf
+share/omf/trashapplet/trashapplet-C.omf
+share/omf/trashapplet/trashapplet-en_GB.omf
+share/omf/trashapplet/trashapplet-es.omf
+share/omf/trashapplet/trashapplet-fr.omf
+share/omf/trashapplet/trashapplet-it.omf
+share/omf/trashapplet/trashapplet-nl.omf
+share/omf/trashapplet/trashapplet-oc.omf
+share/omf/trashapplet/trashapplet-pa.omf
+share/omf/trashapplet/trashapplet-ru.omf
+share/omf/trashapplet/trashapplet-sv.omf
+share/omf/trashapplet/trashapplet-uk.omf
+share/pixmaps/accessx-status-applet/ax-applet.png
+share/pixmaps/accessx-status-applet/ax-bouncekeys.png
+share/pixmaps/accessx-status-applet/ax-key-base.png
+share/pixmaps/accessx-status-applet/ax-key-inverse.png
+share/pixmaps/accessx-status-applet/ax-key-no.png
+share/pixmaps/accessx-status-applet/ax-key-none.png
+share/pixmaps/accessx-status-applet/ax-key-yes.png
+share/pixmaps/accessx-status-applet/ax-slowkeys-no.png
+share/pixmaps/accessx-status-applet/ax-slowkeys-pending.png
+share/pixmaps/accessx-status-applet/ax-slowkeys-yes.png
+share/pixmaps/accessx-status-applet/ax-slowkeys.png
+share/pixmaps/accessx-status-applet/mousekeys-base.png
+share/pixmaps/accessx-status-applet/mousekeys-default-left.png
+share/pixmaps/accessx-status-applet/mousekeys-default-middle.png
+share/pixmaps/accessx-status-applet/mousekeys-default-right.png
+share/pixmaps/accessx-status-applet/mousekeys-pressed-left.png
+share/pixmaps/accessx-status-applet/mousekeys-pressed-middle.png
+share/pixmaps/accessx-status-applet/mousekeys-pressed-right.png
+share/pixmaps/accessx-status-applet/sticky-alt-latched.png
+share/pixmaps/accessx-status-applet/sticky-alt-locked.png
+share/pixmaps/accessx-status-applet/sticky-alt-none.png
+share/pixmaps/accessx-status-applet/sticky-ctrl-latched.png
+share/pixmaps/accessx-status-applet/sticky-ctrl-locked.png
+share/pixmaps/accessx-status-applet/sticky-ctrl-none.png
+share/pixmaps/accessx-status-applet/sticky-hyper-latched.png
+share/pixmaps/accessx-status-applet/sticky-hyper-locked.png
+share/pixmaps/accessx-status-applet/sticky-hyper-none.png
+share/pixmaps/accessx-status-applet/sticky-meta-latched.png
+share/pixmaps/accessx-status-applet/sticky-meta-locked.png
+share/pixmaps/accessx-status-applet/sticky-meta-none.png
+share/pixmaps/accessx-status-applet/sticky-shift-latched.png
+share/pixmaps/accessx-status-applet/sticky-shift-locked.png
+share/pixmaps/accessx-status-applet/sticky-shift-none.png
+share/pixmaps/accessx-status-applet/sticky-super-latched.png
+share/pixmaps/accessx-status-applet/sticky-super-locked.png
+share/pixmaps/accessx-status-applet/sticky-super-none.png
+%%CPUFREQ%%share/pixmaps/cpufreq-applet/cpufreq-100.png
+%%CPUFREQ%%share/pixmaps/cpufreq-applet/cpufreq-25.png
+%%CPUFREQ%%share/pixmaps/cpufreq-applet/cpufreq-50.png
+%%CPUFREQ%%share/pixmaps/cpufreq-applet/cpufreq-75.png
+%%CPUFREQ%%share/pixmaps/cpufreq-applet/cpufreq-na.png
+%%PYTHON%%share/pixmaps/invest-big.png
+share/pixmaps/stickynotes/close.png
+share/pixmaps/stickynotes/locked.png
+share/pixmaps/stickynotes/resize_se.png
+share/pixmaps/stickynotes/resize_sw.png
+share/pixmaps/stickynotes/unlocked.png
+share/xmodmap/base.xml
+share/xmodmap/xmodmap.am
+share/xmodmap/xmodmap.ar
+share/xmodmap/xmodmap.be
+share/xmodmap/xmodmap.bg
+share/xmodmap/xmodmap.br
+share/xmodmap/xmodmap.ch
+share/xmodmap/xmodmap.ch_de
+share/xmodmap/xmodmap.ch_fr
+share/xmodmap/xmodmap.cz
+share/xmodmap/xmodmap.de
+share/xmodmap/xmodmap.de-apple
+share/xmodmap/xmodmap.dk
+share/xmodmap/xmodmap.dvorak
+share/xmodmap/xmodmap.ee
+share/xmodmap/xmodmap.es
+share/xmodmap/xmodmap.es_x86
+share/xmodmap/xmodmap.fi
+share/xmodmap/xmodmap.fr
+share/xmodmap/xmodmap.fr-2
+share/xmodmap/xmodmap.fr_x86
+share/xmodmap/xmodmap.gb
+share/xmodmap/xmodmap.gb-102
+share/xmodmap/xmodmap.gb-105
+share/xmodmap/xmodmap.ge_la
+share/xmodmap/xmodmap.ge_ru
+share/xmodmap/xmodmap.gr
+share/xmodmap/xmodmap.hu
+share/xmodmap/xmodmap.hu-101-lat1
+share/xmodmap/xmodmap.hu-101-lat2
+share/xmodmap/xmodmap.hu-ibm
+share/xmodmap/xmodmap.hu-lat1
+share/xmodmap/xmodmap.hu-sun-lat2
+share/xmodmap/xmodmap.hu.old
+share/xmodmap/xmodmap.hu_latin1
+share/xmodmap/xmodmap.hu_x86
+share/xmodmap/xmodmap.il
+share/xmodmap/xmodmap.il_phonetic
+share/xmodmap/xmodmap.is
+share/xmodmap/xmodmap.it
+share/xmodmap/xmodmap.jp
+share/xmodmap/xmodmap.kr
+share/xmodmap/xmodmap.la
+share/xmodmap/xmodmap.lt
+share/xmodmap/xmodmap.lt_b
+share/xmodmap/xmodmap.lt_p
+share/xmodmap/xmodmap.mk
+share/xmodmap/xmodmap.mn
+share/xmodmap/xmodmap.mn-phonet
+share/xmodmap/xmodmap.mn-rev
+share/xmodmap/xmodmap.mn-uni
+share/xmodmap/xmodmap.nl
+share/xmodmap/xmodmap.no
+share/xmodmap/xmodmap.pl
+share/xmodmap/xmodmap.pl2
+share/xmodmap/xmodmap.pt
+share/xmodmap/xmodmap.pt-dead
+share/xmodmap/xmodmap.qc
+share/xmodmap/xmodmap.qc-2
+share/xmodmap/xmodmap.ro
+share/xmodmap/xmodmap.ru
+share/xmodmap/xmodmap.ru-rev
+share/xmodmap/xmodmap.ru_yawerty
+share/xmodmap/xmodmap.se
+share/xmodmap/xmodmap.sf
+share/xmodmap/xmodmap.sg
+share/xmodmap/xmodmap.si
+share/xmodmap/xmodmap.sk
+share/xmodmap/xmodmap.th
+share/xmodmap/xmodmap.tr_f
+share/xmodmap/xmodmap.tr_q
+share/xmodmap/xmodmap.uk
+share/xmodmap/xmodmap.uk_x86
+share/xmodmap/xmodmap.us
+share/xmodmap/xmodmap.us-101
+share/xmodmap/xmodmap.us-84
+share/xmodmap/xmodmap.us-dec
+share/xmodmap/xmodmap.us-ibm
+share/xmodmap/xmodmap.us-int
+share/xmodmap/xmodmap.us-mac
+share/xmodmap/xmodmap.us-sgi-101
+share/xmodmap/xmodmap.us-sun
+share/xmodmap/xmodmap.us.old
+share/xmodmap/xmodmap.us101A_x86
+share/xmodmap/xmodmap.us_intl
+share/xmodmap/xmodmap.yu
+@dirrm share/pixmaps/stickynotes
+%%CPUFREQ%%@dirrm share/pixmaps/cpufreq-applet
+@dirrm share/pixmaps/accessx-status-applet
+@dirrm share/omf/trashapplet
+@dirrm share/omf/stickynotes_applet
+@dirrm share/omf/multiload
+@dirrm share/omf/mixer_applet2
+@dirrm share/omf/gweather
+@dirrm share/omf/gswitchit
+@dirrm share/omf/geyes
+@dirrm share/omf/drivemount
+%%CPUFREQ%%@dirrm share/omf/cpufreq-applet
+%%COMMANDER%%@dirrm share/omf/command-line
+@dirrm share/omf/char-palette
+%%BATTERY%%@dirrm share/omf/battstat
+@dirrm share/omf/accessx-status
 @dirrm share/gnome/help/trashapplet/uk/figures
 @dirrm share/gnome/help/trashapplet/uk
 @dirrm share/gnome/help/trashapplet/sv/figures
@@ -1151,6 +1292,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
 @dirrm share/gnome/help/trashapplet/ru
 @dirrm share/gnome/help/trashapplet/pa/figures
 @dirrm share/gnome/help/trashapplet/pa
+@dirrm share/gnome/help/trashapplet/oc/figures
+@dirrm share/gnome/help/trashapplet/oc
 @dirrm share/gnome/help/trashapplet/nl/figures
 @dirrm share/gnome/help/trashapplet/nl
 @dirrm share/gnome/help/trashapplet/it/figures
@@ -1170,6 +1313,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
 @dirrm share/gnome/help/stickynotes_applet/sv
 @dirrm share/gnome/help/stickynotes_applet/pa/figures
 @dirrm share/gnome/help/stickynotes_applet/pa
+@dirrm share/gnome/help/stickynotes_applet/oc/figures
+@dirrm share/gnome/help/stickynotes_applet/oc
 @dirrm share/gnome/help/stickynotes_applet/fr/figures
 @dirrm share/gnome/help/stickynotes_applet/fr
 @dirrm share/gnome/help/stickynotes_applet/es/figures
@@ -1187,12 +1332,16 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
 @dirrm share/gnome/help/multiload/ru
 @dirrm share/gnome/help/multiload/pa/figures
 @dirrm share/gnome/help/multiload/pa
+@dirrm share/gnome/help/multiload/oc/figures
+@dirrm share/gnome/help/multiload/oc
 @dirrm share/gnome/help/multiload/fr/figures
 @dirrm share/gnome/help/multiload/fr
 @dirrm share/gnome/help/multiload/es/figures
 @dirrm share/gnome/help/multiload/es
 @dirrm share/gnome/help/multiload/en_GB/figures
 @dirrm share/gnome/help/multiload/en_GB
+@dirrm share/gnome/help/multiload/ca/figures
+@dirrm share/gnome/help/multiload/ca
 @dirrm share/gnome/help/multiload/C/figures
 @dirrm share/gnome/help/multiload/C
 @dirrm share/gnome/help/multiload
@@ -1204,6 +1353,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
 @dirrm share/gnome/help/mixer_applet2/ru
 @dirrm share/gnome/help/mixer_applet2/pa/figures
 @dirrm share/gnome/help/mixer_applet2/pa
+@dirrm share/gnome/help/mixer_applet2/oc/figures
+@dirrm share/gnome/help/mixer_applet2/oc
 @dirrm share/gnome/help/mixer_applet2/it/figures
 @dirrm share/gnome/help/mixer_applet2/it
 @dirrm share/gnome/help/mixer_applet2/fr/figures
@@ -1212,6 +1363,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
 @dirrm share/gnome/help/mixer_applet2/es
 @dirrm share/gnome/help/mixer_applet2/en_GB/figures
 @dirrm share/gnome/help/mixer_applet2/en_GB
+@dirrm share/gnome/help/mixer_applet2/ca/figures
+@dirrm share/gnome/help/mixer_applet2/ca
 @dirrm share/gnome/help/mixer_applet2/C/figures
 @dirrm share/gnome/help/mixer_applet2/C
 @dirrm share/gnome/help/mixer_applet2
@@ -1221,6 +1374,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
 @dirrm share/gnome/help/gweather/sv
 @dirrm share/gnome/help/gweather/pa/figures
 @dirrm share/gnome/help/gweather/pa
+@dirrm share/gnome/help/gweather/oc/figures
+@dirrm share/gnome/help/gweather/oc
 @dirrm share/gnome/help/gweather/nl/figures
 @dirrm share/gnome/help/gweather/nl
 @dirrm share/gnome/help/gweather/fr/figures
@@ -1235,9 +1390,11 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
 @dirrm share/gnome/help/gswitchit/uk
 @dirrm share/gnome/help/gswitchit/sv
 @dirrm share/gnome/help/gswitchit/ru
+@dirrm share/gnome/help/gswitchit/oc
 @dirrm share/gnome/help/gswitchit/fr
 @dirrm share/gnome/help/gswitchit/es
 @dirrm share/gnome/help/gswitchit/en_GB
+@dirrm share/gnome/help/gswitchit/el
 @dirrm share/gnome/help/gswitchit/C
 @dirrm share/gnome/help/gswitchit
 @dirrm share/gnome/help/geyes/uk/figures
@@ -1246,6 +1403,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
 @dirrm share/gnome/help/geyes/sv
 @dirrm share/gnome/help/geyes/ru/figures
 @dirrm share/gnome/help/geyes/ru
+@dirrm share/gnome/help/geyes/oc/figures
+@dirrm share/gnome/help/geyes/oc
 @dirrm share/gnome/help/geyes/it/figures
 @dirrm share/gnome/help/geyes/it
 @dirrm share/gnome/help/geyes/fr/figures
@@ -1254,6 +1413,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
 @dirrm share/gnome/help/geyes/es
 @dirrm share/gnome/help/geyes/en_GB/figures
 @dirrm share/gnome/help/geyes/en_GB
+@dirrm share/gnome/help/geyes/ca/figures
+@dirrm share/gnome/help/geyes/ca
 @dirrm share/gnome/help/geyes/bg/figures
 @dirrm share/gnome/help/geyes/bg
 @dirrm share/gnome/help/geyes/C/figures
@@ -1269,6 +1430,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
 @dirrm share/gnome/help/drivemount/ru
 @dirrm share/gnome/help/drivemount/pa/figures
 @dirrm share/gnome/help/drivemount/pa
+@dirrm share/gnome/help/drivemount/oc/figures
+@dirrm share/gnome/help/drivemount/oc
 @dirrm share/gnome/help/drivemount/it/figures
 @dirrm share/gnome/help/drivemount/it
 @dirrm share/gnome/help/drivemount/fr/figures
@@ -1286,6 +1449,10 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
 %%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/uk
 %%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/sv/figures
 %%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/sv
+%%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/ru/figures
+%%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/ru
+%%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/oc/figures
+%%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/oc
 %%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/nl/figures
 %%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/nl
 %%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/fr/figures
@@ -1294,6 +1461,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
 %%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/es
 %%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/en_GB/figures
 %%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/en_GB
+%%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/ca/figures
+%%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/ca
 %%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/C/figures
 %%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/C
 %%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet
@@ -1303,6 +1472,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
 %%COMMANDER%%@dirrm share/gnome/help/command-line/sv
 %%COMMANDER%%@dirrm share/gnome/help/command-line/pt_BR/figures
 %%COMMANDER%%@dirrm share/gnome/help/command-line/pt_BR
+%%COMMANDER%%@dirrm share/gnome/help/command-line/oc/figures
+%%COMMANDER%%@dirrm share/gnome/help/command-line/oc
 %%COMMANDER%%@dirrm share/gnome/help/command-line/fr/figures
 %%COMMANDER%%@dirrm share/gnome/help/command-line/fr
 %%COMMANDER%%@dirrm share/gnome/help/command-line/es/figures
@@ -1316,8 +1487,12 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
 @dirrm share/gnome/help/char-palette/uk
 @dirrm share/gnome/help/char-palette/sv/figures
 @dirrm share/gnome/help/char-palette/sv
+@dirrm share/gnome/help/char-palette/ru/figures
+@dirrm share/gnome/help/char-palette/ru
 @dirrm share/gnome/help/char-palette/pt_BR/figures
 @dirrm share/gnome/help/char-palette/pt_BR
+@dirrm share/gnome/help/char-palette/oc/figures
+@dirrm share/gnome/help/char-palette/oc
 @dirrm share/gnome/help/char-palette/nl/figures
 @dirrm share/gnome/help/char-palette/nl
 @dirrm share/gnome/help/char-palette/it/figures
@@ -1339,6 +1514,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
 %%BATTERY%%@dirrm share/gnome/help/battstat/sv
 %%BATTERY%%@dirrm share/gnome/help/battstat/pa/figures
 %%BATTERY%%@dirrm share/gnome/help/battstat/pa
+%%BATTERY%%@dirrm share/gnome/help/battstat/oc/figures
+%%BATTERY%%@dirrm share/gnome/help/battstat/oc
 %%BATTERY%%@dirrm share/gnome/help/battstat/fr/figures
 %%BATTERY%%@dirrm share/gnome/help/battstat/fr
 %%BATTERY%%@dirrm share/gnome/help/battstat/es/figures
@@ -1354,6 +1531,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
 @dirrm share/gnome/help/accessx-status/uk
 @dirrm share/gnome/help/accessx-status/sv/figures
 @dirrm share/gnome/help/accessx-status/sv
+@dirrm share/gnome/help/accessx-status/oc/figures
+@dirrm share/gnome/help/accessx-status/oc
 @dirrm share/gnome/help/accessx-status/nl/figures
 @dirrm share/gnome/help/accessx-status/nl
 @dirrm share/gnome/help/accessx-status/it/figures
@@ -1364,23 +1543,25 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
 @dirrm share/gnome/help/accessx-status/es
 @dirrm share/gnome/help/accessx-status/en_GB/figures
 @dirrm share/gnome/help/accessx-status/en_GB
+@dirrm share/gnome/help/accessx-status/ca/figures
+@dirrm share/gnome/help/accessx-status/ca
 @dirrm share/gnome/help/accessx-status/bg/figures
 @dirrm share/gnome/help/accessx-status/bg
 @dirrm share/gnome/help/accessx-status/C/figures
 @dirrm share/gnome/help/accessx-status/C
 @dirrm share/gnome/help/accessx-status
-%%PYTHON%%@dirrm share/gnome/gnome-applets/invest-applet
-@dirrm share/gnome/gnome-applets/gweather
-@dirrm share/gnome/gnome-applets/glade
-@dirrm share/gnome/gnome-applets/geyes/Tango
-@dirrm share/gnome/gnome-applets/geyes/Horrid
-@dirrm share/gnome/gnome-applets/geyes/Default-tiny
-@dirrm share/gnome/gnome-applets/geyes/Default
-@dirrm share/gnome/gnome-applets/geyes/Bloodshot
-@dirrm share/gnome/gnome-applets/geyes/Bizarre
-@dirrm share/gnome/gnome-applets/geyes
-@dirrm share/gnome/gnome-applets
-%%COMMANDER%%@dirrm libexec/gnome-applets
+%%PYTHON%%@dirrm %%DATADIR%%/invest-applet
+@dirrm %%DATADIR%%/gweather
+@dirrm %%DATADIR%%/glade
+@dirrm %%DATADIR%%/geyes/Tango
+@dirrm %%DATADIR%%/geyes/Horrid
+@dirrm %%DATADIR%%/geyes/Default-tiny
+@dirrm %%DATADIR%%/geyes/Default
+@dirrm %%DATADIR%%/geyes/Bloodshot
+@dirrm %%DATADIR%%/geyes/Bizarre
+@dirrm %%DATADIR%%/geyes
+@dirrm %%DATADIR%%
+%%COMMANDER%%@dirrmtry libexec/gnome-applets
 %%PYTHON%%@dirrm %%PYTHON_SITELIBDIR%%/invest
 @dirrm include/libgweather
 @dirrmtry share/locale/zh_HK/LC_MESSAGES
@@ -1389,8 +1570,12 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
 @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/mr/LC_MESSAGES
 @dirrmtry share/locale/mr
 @dirrmtry share/locale/mg/LC_MESSAGES
@@ -1435,3 +1620,7 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.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
diff --git a/x11/gnome-desktop/Makefile b/x11/gnome-desktop/Makefile
index a89bb978fe2d..8a1388ad5a36 100644
--- a/x11/gnome-desktop/Makefile
+++ b/x11/gnome-desktop/Makefile
@@ -3,11 +3,11 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/x11/gnome-desktop/Makefile,v 1.112 2007/03/13 12:15:44 ahze Exp $
+#   $MCom: ports/x11/gnome-desktop/Makefile,v 1.127 2007/10/17 21:36:13 mezz Exp $
 #
 
 PORTNAME=	gnome-desktop
-PORTVERSION=	2.18.3
+PORTVERSION=	2.20.1
 PORTREVISION?=	1
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
diff --git a/x11/gnome-desktop/distinfo b/x11/gnome-desktop/distinfo
index 1731b7eda864..1c2a077101d9 100644
--- a/x11/gnome-desktop/distinfo
+++ b/x11/gnome-desktop/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-desktop-2.18.3.tar.bz2) = 98de3b7d0da690da8b94cddc74f3914b
-SHA256 (gnome2/gnome-desktop-2.18.3.tar.bz2) = 8997a2ceca2dbb28fb402e23ea5f255b68c59ea4f932b253e2843bfe62af7c64
-SIZE (gnome2/gnome-desktop-2.18.3.tar.bz2) = 1306654
+MD5 (gnome2/gnome-desktop-2.20.1.tar.bz2) = 19912d1e1743960ebf824684cdf8f097
+SHA256 (gnome2/gnome-desktop-2.20.1.tar.bz2) = f94a3e8962980628ae8a18135c419d239109cf1f68b4d8de7e4739194cf53391
+SIZE (gnome2/gnome-desktop-2.20.1.tar.bz2) = 1356668
diff --git a/x11/gnome-desktop/pkg-plist b/x11/gnome-desktop/pkg-plist
index 9535ff1fde10..2d1c2909b170 100644
--- a/x11/gnome-desktop/pkg-plist
+++ b/x11/gnome-desktop/pkg-plist
@@ -7,25 +7,29 @@ lib/libgnome-desktop-2.la
 lib/libgnome-desktop-2.so
 lib/libgnome-desktop-2.so.2
 libdata/pkgconfig/gnome-desktop-2.0.pc
-share/gnome/applications/gnome-about.desktop
-share/gnome/gnome-about/gnome-64.png
-share/gnome/gnome-about/gnome-version.xml
-share/gnome/gnome-about/headers/header-bg-ancient01a.png
-share/gnome/gnome-about/headers/header-bg-city01.png
-share/gnome/gnome-about/headers/header-bg-clouds01.png
-share/gnome/gnome-about/headers/header-bg-clouds02.png
-share/gnome/gnome-about/headers/header-bg-hills01.png
-share/gnome/gnome-about/headers/header-bg-landscape01.png
-share/gnome/gnome-about/headers/header-bg-mountains01.png
-share/gnome/gnome-about/headers/header-bg-snow01.png
-share/gnome/gnome-about/headers/header-bg-sunset01.png
+share/applications/gnome-about.desktop
+share/gnome-about/contributors.list
+share/gnome-about/foundation-members.list
+share/gnome-about/gnome-64.png
+share/gnome-about/gnome-version.xml
+share/gnome-about/headers/header-bg-ancient01a.png
+share/gnome-about/headers/header-bg-city01.png
+share/gnome-about/headers/header-bg-clouds01.png
+share/gnome-about/headers/header-bg-clouds02.png
+share/gnome-about/headers/header-bg-hills01.png
+share/gnome-about/headers/header-bg-landscape01.png
+share/gnome-about/headers/header-bg-mountains01.png
+share/gnome-about/headers/header-bg-snow01.png
+share/gnome-about/headers/header-bg-sunset01.png
 share/gnome/help/fdl/C/fdl.xml
 share/gnome/help/fdl/ar/fdl.xml
 share/gnome/help/fdl/es/fdl.xml
 share/gnome/help/fdl/fr/fdl.xml
 share/gnome/help/fdl/ko/fdl.xml
+share/gnome/help/fdl/oc/fdl.xml
 share/gnome/help/fdl/sv/fdl.xml
 share/gnome/help/fdl/uk/fdl.xml
+share/gnome/help/fdl/vi/fdl.xml
 share/gnome/help/gpl/C/gpl.xml
 share/gnome/help/gpl/ar/gpl.xml
 share/gnome/help/gpl/ca/gpl.xml
@@ -33,6 +37,7 @@ share/gnome/help/gpl/es/gpl.xml
 share/gnome/help/gpl/fi/gpl.xml
 share/gnome/help/gpl/fr/gpl.xml
 share/gnome/help/gpl/ko/gpl.xml
+share/gnome/help/gpl/oc/gpl.xml
 share/gnome/help/gpl/pa/gpl.xml
 share/gnome/help/gpl/sv/gpl.xml
 share/gnome/help/gpl/uk/gpl.xml
@@ -43,110 +48,12 @@ share/gnome/help/lgpl/ar/lgpl.xml
 share/gnome/help/lgpl/es/lgpl.xml
 share/gnome/help/lgpl/fr/lgpl.xml
 share/gnome/help/lgpl/ko/lgpl.xml
+share/gnome/help/lgpl/oc/lgpl.xml
 share/gnome/help/lgpl/pa/lgpl.xml
 share/gnome/help/lgpl/sv/lgpl.xml
 share/gnome/help/lgpl/uk/lgpl.xml
+share/gnome/help/lgpl/vi/lgpl.xml
 share/gnome/help/lgpl/zh_CN/lgpl.xml
-share/gnome/omf/fdl/fdl-C.omf
-share/gnome/omf/fdl/fdl-ar.omf
-share/gnome/omf/fdl/fdl-es.omf
-share/gnome/omf/fdl/fdl-fr.omf
-share/gnome/omf/fdl/fdl-ko.omf
-share/gnome/omf/fdl/fdl-sv.omf
-share/gnome/omf/fdl/fdl-uk.omf
-share/gnome/omf/gpl/gpl-C.omf
-share/gnome/omf/gpl/gpl-ar.omf
-share/gnome/omf/gpl/gpl-ca.omf
-share/gnome/omf/gpl/gpl-es.omf
-share/gnome/omf/gpl/gpl-fi.omf
-share/gnome/omf/gpl/gpl-fr.omf
-share/gnome/omf/gpl/gpl-ko.omf
-share/gnome/omf/gpl/gpl-pa.omf
-share/gnome/omf/gpl/gpl-sv.omf
-share/gnome/omf/gpl/gpl-uk.omf
-share/gnome/omf/gpl/gpl-vi.omf
-share/gnome/omf/gpl/gpl-zh_CN.omf
-share/gnome/omf/lgpl/lgpl-C.omf
-share/gnome/omf/lgpl/lgpl-ar.omf
-share/gnome/omf/lgpl/lgpl-es.omf
-share/gnome/omf/lgpl/lgpl-fr.omf
-share/gnome/omf/lgpl/lgpl-ko.omf
-share/gnome/omf/lgpl/lgpl-pa.omf
-share/gnome/omf/lgpl/lgpl-sv.omf
-share/gnome/omf/lgpl/lgpl-uk.omf
-share/gnome/omf/lgpl/lgpl-zh_CN.omf
-share/gnome/pixmaps/apple-green.png
-share/gnome/pixmaps/apple-red.png
-share/gnome/pixmaps/gnome-aorta.png
-share/gnome/pixmaps/gnome-applets.png
-share/gnome/pixmaps/gnome-background-image.png
-share/gnome/pixmaps/gnome-background-pattern.png
-share/gnome/pixmaps/gnome-background.png
-share/gnome/pixmaps/gnome-calc2.png
-share/gnome/pixmaps/gnome-calc3.png
-share/gnome/pixmaps/gnome-calendar.png
-share/gnome/pixmaps/gnome-ccbackground.png
-share/gnome/pixmaps/gnome-ccdesktop.png
-share/gnome/pixmaps/gnome-ccdialog.png
-share/gnome/pixmaps/gnome-ccmime.png
-share/gnome/pixmaps/gnome-ccperiph.png
-share/gnome/pixmaps/gnome-ccscreensaver.png
-share/gnome/pixmaps/gnome-ccwindowmanager.png
-share/gnome/pixmaps/gnome-color-browser.png
-share/gnome/pixmaps/gnome-color-xterm.png
-share/gnome/pixmaps/gnome-computer.png
-share/gnome/pixmaps/gnome-cromagnon.png
-share/gnome/pixmaps/gnome-day.png
-share/gnome/pixmaps/gnome-debian.png
-share/gnome/pixmaps/gnome-diskfree.png
-share/gnome/pixmaps/gnome-emacs.png
-share/gnome/pixmaps/gnome-eterm.png
-share/gnome/pixmaps/gnome-file-c.png
-share/gnome/pixmaps/gnome-file-h.png
-share/gnome/pixmaps/gnome-folder.png
-share/gnome/pixmaps/gnome-gemvt.png
-share/gnome/pixmaps/gnome-gimp.png
-share/gnome/pixmaps/gnome-gmenu.png
-share/gnome/pixmaps/gnome-gmush.png
-share/gnome/pixmaps/gnome-gnomoku.png
-share/gnome/pixmaps/gnome-home.png
-share/gnome/pixmaps/gnome-html.png
-share/gnome/pixmaps/gnome-image-gif.png
-share/gnome/pixmaps/gnome-image-jpeg.png
-share/gnome/pixmaps/gnome-irc.png
-share/gnome/pixmaps/gnome-laptop.png
-share/gnome/pixmaps/gnome-log.png
-share/gnome/pixmaps/gnome-logo-icon-transparent.png
-share/gnome/pixmaps/gnome-logo-icon.png
-share/gnome/pixmaps/gnome-logo-large.png
-share/gnome/pixmaps/gnome-mdi.png
-share/gnome/pixmaps/gnome-mnemonic.png
-share/gnome/pixmaps/gnome-month.png
-share/gnome/pixmaps/gnome-mouse.png
-share/gnome/pixmaps/gnome-news.png
-share/gnome/pixmaps/gnome-note.png
-share/gnome/pixmaps/gnome-qeye.png
-share/gnome/pixmaps/gnome-set-time.png
-share/gnome/pixmaps/gnome-spider.png
-share/gnome/pixmaps/gnome-squeak.png
-share/gnome/pixmaps/gnome-suse.png
-share/gnome/pixmaps/gnome-talk.png
-share/gnome/pixmaps/gnome-term-linux.png
-share/gnome/pixmaps/gnome-term-linux2.png
-share/gnome/pixmaps/gnome-term-night.png
-share/gnome/pixmaps/gnome-term-tiger.png
-share/gnome/pixmaps/gnome-term.png
-share/gnome/pixmaps/gnome-tigert.png
-share/gnome/pixmaps/gnome-touristinfo.png
-share/gnome/pixmaps/gnome-user-interface.png
-share/gnome/pixmaps/gnome-week.png
-share/gnome/pixmaps/gnome-windows.png
-share/gnome/pixmaps/gnome-word.png
-share/gnome/pixmaps/gnome-xterm.png
-share/gnome/pixmaps/gtkvim.png
-share/gnome/pixmaps/kterm.xpm
-share/gnome/pixmaps/monitor.png
-share/gnome/pixmaps/vnterm.xpm
 share/locale/af/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/am/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/ar/LC_MESSAGES/gnome-desktop-2.0.mo
@@ -215,6 +122,7 @@ share/locale/pt_BR/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/ro/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/ru/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/rw/LC_MESSAGES/gnome-desktop-2.0.mo
+share/locale/si/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/sk/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/sl/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/sq/LC_MESSAGES/gnome-desktop-2.0.mo
@@ -229,7 +137,7 @@ share/locale/tr/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/ug/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/uk/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/ur/LC_MESSAGES/gnome-desktop-2.0.mo
-share/locale/uz/LC_MESSAGES/gnome-desktop-2.0.mo
+share/locale/uz@cyrillic/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/vi/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/wa/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/xh/LC_MESSAGES/gnome-desktop-2.0.mo
@@ -239,6 +147,148 @@ share/locale/zh_CN/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/zh_HK/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/zu/LC_MESSAGES/gnome-desktop-2.0.mo
+share/omf/fdl/fdl-C.omf
+share/omf/fdl/fdl-ar.omf
+share/omf/fdl/fdl-es.omf
+share/omf/fdl/fdl-fr.omf
+share/omf/fdl/fdl-ko.omf
+share/omf/fdl/fdl-oc.omf
+share/omf/fdl/fdl-sv.omf
+share/omf/fdl/fdl-uk.omf
+share/omf/fdl/fdl-vi.omf
+share/omf/gpl/gpl-C.omf
+share/omf/gpl/gpl-ar.omf
+share/omf/gpl/gpl-ca.omf
+share/omf/gpl/gpl-es.omf
+share/omf/gpl/gpl-fi.omf
+share/omf/gpl/gpl-fr.omf
+share/omf/gpl/gpl-ko.omf
+share/omf/gpl/gpl-oc.omf
+share/omf/gpl/gpl-pa.omf
+share/omf/gpl/gpl-sv.omf
+share/omf/gpl/gpl-uk.omf
+share/omf/gpl/gpl-vi.omf
+share/omf/gpl/gpl-zh_CN.omf
+share/omf/lgpl/lgpl-C.omf
+share/omf/lgpl/lgpl-ar.omf
+share/omf/lgpl/lgpl-es.omf
+share/omf/lgpl/lgpl-fr.omf
+share/omf/lgpl/lgpl-ko.omf
+share/omf/lgpl/lgpl-oc.omf
+share/omf/lgpl/lgpl-pa.omf
+share/omf/lgpl/lgpl-sv.omf
+share/omf/lgpl/lgpl-uk.omf
+share/omf/lgpl/lgpl-vi.omf
+share/omf/lgpl/lgpl-zh_CN.omf
+share/pixmaps/apple-green.png
+share/pixmaps/apple-red.png
+share/pixmaps/gnome-aorta.png
+share/pixmaps/gnome-applets.png
+share/pixmaps/gnome-background-image.png
+share/pixmaps/gnome-background-pattern.png
+share/pixmaps/gnome-background.png
+share/pixmaps/gnome-calc2.png
+share/pixmaps/gnome-calc3.png
+share/pixmaps/gnome-calendar.png
+share/pixmaps/gnome-ccbackground.png
+share/pixmaps/gnome-ccdesktop.png
+share/pixmaps/gnome-ccdialog.png
+share/pixmaps/gnome-ccmime.png
+share/pixmaps/gnome-ccperiph.png
+share/pixmaps/gnome-ccscreensaver.png
+share/pixmaps/gnome-ccwindowmanager.png
+share/pixmaps/gnome-color-browser.png
+share/pixmaps/gnome-color-xterm.png
+share/pixmaps/gnome-computer.png
+share/pixmaps/gnome-cromagnon.png
+share/pixmaps/gnome-day.png
+share/pixmaps/gnome-debian.png
+share/pixmaps/gnome-diskfree.png
+share/pixmaps/gnome-emacs.png
+share/pixmaps/gnome-eterm.png
+share/pixmaps/gnome-file-c.png
+share/pixmaps/gnome-file-h.png
+share/pixmaps/gnome-folder.png
+share/pixmaps/gnome-gemvt.png
+share/pixmaps/gnome-gimp.png
+share/pixmaps/gnome-gmenu.png
+share/pixmaps/gnome-gmush.png
+share/pixmaps/gnome-gnomoku.png
+share/pixmaps/gnome-home.png
+share/pixmaps/gnome-html.png
+share/pixmaps/gnome-image-gif.png
+share/pixmaps/gnome-image-jpeg.png
+share/pixmaps/gnome-irc.png
+share/pixmaps/gnome-laptop.png
+share/pixmaps/gnome-log.png
+share/pixmaps/gnome-logo-icon-transparent.png
+share/pixmaps/gnome-logo-icon.png
+share/pixmaps/gnome-logo-large.png
+share/pixmaps/gnome-mdi.png
+share/pixmaps/gnome-mnemonic.png
+share/pixmaps/gnome-month.png
+share/pixmaps/gnome-mouse.png
+share/pixmaps/gnome-news.png
+share/pixmaps/gnome-note.png
+share/pixmaps/gnome-qeye.png
+share/pixmaps/gnome-set-time.png
+share/pixmaps/gnome-spider.png
+share/pixmaps/gnome-squeak.png
+share/pixmaps/gnome-suse.png
+share/pixmaps/gnome-talk.png
+share/pixmaps/gnome-term-linux.png
+share/pixmaps/gnome-term-linux2.png
+share/pixmaps/gnome-term-night.png
+share/pixmaps/gnome-term-tiger.png
+share/pixmaps/gnome-term.png
+share/pixmaps/gnome-tigert.png
+share/pixmaps/gnome-touristinfo.png
+share/pixmaps/gnome-user-interface.png
+share/pixmaps/gnome-week.png
+share/pixmaps/gnome-windows.png
+share/pixmaps/gnome-word.png
+share/pixmaps/gnome-xterm.png
+share/pixmaps/gtkvim.png
+share/pixmaps/kterm.xpm
+share/pixmaps/monitor.png
+share/pixmaps/vnterm.xpm
+@dirrm share/omf/lgpl
+@dirrm share/omf/gpl
+@dirrm share/omf/fdl
+@dirrm share/gnome/help/lgpl/zh_CN
+@dirrm share/gnome/help/lgpl/vi
+@dirrm share/gnome/help/lgpl/uk
+@dirrm share/gnome/help/lgpl/sv
+@dirrm share/gnome/help/lgpl/pa
+@dirrm share/gnome/help/lgpl/oc
+@dirrm share/gnome/help/lgpl/ko
+@dirrm share/gnome/help/lgpl/fr
+@dirrm share/gnome/help/lgpl/es
+@dirrm share/gnome/help/lgpl/ar
+@dirrm share/gnome/help/gpl/zh_CN
+@dirrm share/gnome/help/gpl/vi
+@dirrm share/gnome/help/gpl/uk
+@dirrm share/gnome/help/gpl/sv
+@dirrm share/gnome/help/gpl/pa
+@dirrm share/gnome/help/gpl/oc
+@dirrm share/gnome/help/gpl/ko
+@dirrm share/gnome/help/gpl/fr
+@dirrm share/gnome/help/gpl/fi
+@dirrm share/gnome/help/gpl/es
+@dirrm share/gnome/help/gpl/ca
+@dirrm share/gnome/help/gpl/ar
+@dirrm share/gnome/help/fdl/vi
+@dirrm share/gnome/help/fdl/uk
+@dirrm share/gnome/help/fdl/sv
+@dirrm share/gnome/help/fdl/oc
+@dirrm share/gnome/help/fdl/ko
+@dirrm share/gnome/help/fdl/fr
+@dirrm share/gnome/help/fdl/es
+@dirrm share/gnome/help/fdl/ar
+@dirrm share/gnome-about/headers
+@dirrm include/gnome-desktop-2.0/libgnomeui
+@dirrm include/gnome-desktop-2.0/libgnome
+@dirrm include/gnome-desktop-2.0
 @dirrmtry share/locale/zu/LC_MESSAGES
 @dirrmtry share/locale/zu
 @dirrmtry share/locale/zh_HK/LC_MESSAGES
@@ -249,14 +299,16 @@ share/locale/zu/LC_MESSAGES/gnome-desktop-2.0.mo
 @dirrmtry share/locale/yi
 @dirrmtry share/locale/xh/LC_MESSAGES
 @dirrmtry share/locale/xh
-@dirrmtry share/locale/uz/LC_MESSAGES
-@dirrmtry share/locale/uz
+@dirrmtry share/locale/uz@cyrillic/LC_MESSAGES
+@dirrmtry share/locale/uz@cyrillic
 @dirrmtry share/locale/ur/LC_MESSAGES
 @dirrmtry share/locale/ur
 @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
@@ -281,35 +333,4 @@ share/locale/zu/LC_MESSAGES/gnome-desktop-2.0.mo
 @dirrmtry share/locale/bn_IN
 @dirrmtry share/locale/be@latin/LC_MESSAGES
 @dirrmtry share/locale/be@latin
-@dirrm share/gnome/omf/lgpl
-@dirrm share/gnome/omf/gpl
-@dirrm share/gnome/omf/fdl
-@dirrm share/gnome/help/lgpl/zh_CN
-@dirrm share/gnome/help/lgpl/uk
-@dirrm share/gnome/help/lgpl/sv
-@dirrm share/gnome/help/lgpl/pa
-@dirrm share/gnome/help/lgpl/ko
-@dirrm share/gnome/help/lgpl/fr
-@dirrm share/gnome/help/lgpl/es
-@dirrm share/gnome/help/lgpl/ar
-@dirrm share/gnome/help/gpl/zh_CN
-@dirrm share/gnome/help/gpl/vi
-@dirrm share/gnome/help/gpl/uk
-@dirrm share/gnome/help/gpl/sv
-@dirrm share/gnome/help/gpl/pa
-@dirrm share/gnome/help/gpl/ko
-@dirrm share/gnome/help/gpl/fr
-@dirrm share/gnome/help/gpl/fi
-@dirrm share/gnome/help/gpl/es
-@dirrm share/gnome/help/gpl/ca
-@dirrm share/gnome/help/gpl/ar
-@dirrm share/gnome/help/fdl/uk
-@dirrm share/gnome/help/fdl/sv
-@dirrm share/gnome/help/fdl/ko
-@dirrm share/gnome/help/fdl/fr
-@dirrm share/gnome/help/fdl/es
-@dirrm share/gnome/help/fdl/ar
-@dirrm share/gnome/gnome-about/headers
-@dirrm include/gnome-desktop-2.0/libgnomeui
-@dirrm include/gnome-desktop-2.0/libgnome
-@dirrm include/gnome-desktop-2.0
+@dirrmtry share/applications
diff --git a/x11/gnome-libs/Makefile b/x11/gnome-libs/Makefile
index f67e9b38520e..52d1f30f022c 100644
--- a/x11/gnome-libs/Makefile
+++ b/x11/gnome-libs/Makefile
@@ -3,12 +3,12 @@
 # Whom:					Yukihiro Nakai <Nakai@technologist.com>
 #
 # $FreeBSD$
-#   $MCom: ports/x11/gnome-libs/Makefile,v 1.2 2006/09/10 00:51:15 mezz Exp $
+#   $MCom: ports/x11/gnome-libs/Makefile,v 1.7 2007/08/04 03:51:32 marcus Exp $
 #
 
 PORTNAME=	gnome-libs
 PORTVERSION=	1.4.2
-PORTREVISION=	7
+PORTREVISION=	10
 CATEGORIES?=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-libs/1.4
@@ -17,8 +17,8 @@ DIST_SUBDIR=	gnome
 MAINTAINER?=	gnome@FreeBSD.org
 COMMENT=	Libraries for GNOME, a GNU desktop environment
 
-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_XLIB=	yes
diff --git a/x11/gnome-libs/files/patch-aa b/x11/gnome-libs/files/patch-aa
index 1af3d26ce2ef..8ec33082e174 100644
--- a/x11/gnome-libs/files/patch-aa
+++ b/x11/gnome-libs/files/patch-aa
@@ -1,6 +1,3 @@
-
-$FreeBSD$
-
 --- configure.orig	Mon Apr 29 12:07:59 2002
 +++ configure	Mon Apr 29 12:08:54 2002
 @@ -5339,6 +5339,7 @@
diff --git a/x11/gnome-libs/files/patch-ad b/x11/gnome-libs/files/patch-ad
deleted file mode 100644
index 32e656859e37..000000000000
--- a/x11/gnome-libs/files/patch-ad
+++ /dev/null
@@ -1,20 +0,0 @@
---- libgnome/gnome-help.c.orig	Thu Apr  8 15:01:21 1999
-+++ libgnome/gnome-help.c	Mon Jul 12 10:29:11 1999
-@@ -69,7 +69,7 @@
- 		lang= language_list->data;
- 		
- 		buf= g_string_new (NULL);
--		g_string_sprintf (buf, "gnome/help/%s/%s/%s", app, lang, path);
-+		g_string_sprintf (buf, "help/%s/%s/%s", app, lang, path);
- 		res= (gchar *)gnome_unconditional_datadir_file (buf->str);
- 		p = strrchr (res, '#');
- 		if (p) {
-@@ -118,7 +118,7 @@
- 	if (!res)
- 	{
- 		buf = g_string_new(NULL);
--		g_string_sprintf(buf, "gnome/help/%s/C/%s", app, path);
-+		g_string_sprintf(buf, "help/%s/C/%s", app, path);
- 		res = (gchar *)gnome_unconditional_datadir_file(buf->str);
- 		g_string_free(buf, TRUE);
- 	}
diff --git a/x11/gnome-libs/files/patch-bb b/x11/gnome-libs/files/patch-bb
index a1daaf14fc52..d6564a00e8c5 100644
--- a/x11/gnome-libs/files/patch-bb
+++ b/x11/gnome-libs/files/patch-bb
@@ -1,6 +1,3 @@
-
-$FreeBSD$
-
 --- gtk-xmhtml/Makefile.in.orig	Mon Jan 14 12:02:33 2002
 +++ gtk-xmhtml/Makefile.in	Mon Jan 14 12:03:13 2002
 @@ -151,7 +151,7 @@
diff --git a/x11/gnome-libs/files/patch-bg b/x11/gnome-libs/files/patch-bg
index 401724e01ed0..87aecf289d82 100644
--- a/x11/gnome-libs/files/patch-bg
+++ b/x11/gnome-libs/files/patch-bg
@@ -1,6 +1,3 @@
-
-$FreeBSD$
-
 --- zvt/Makefile.in.orig	Sat Apr  6 19:22:07 2002
 +++ zvt/Makefile.in	Sat Apr  6 19:23:02 2002
 @@ -20,7 +20,7 @@
diff --git a/x11/gnome-libs/files/patch-bi b/x11/gnome-libs/files/patch-bi
index dd39ef04d88e..3b2325030f35 100644
--- a/x11/gnome-libs/files/patch-bi
+++ b/x11/gnome-libs/files/patch-bi
@@ -1,6 +1,3 @@
-
-$FreeBSD$
-
 --- libart_lgpl/Makefile.in.orig	Sun Jun 23 11:41:23 2002
 +++ libart_lgpl/Makefile.in	Sun Jun 23 11:42:23 2002
 @@ -145,7 +145,7 @@
diff --git a/x11/gnome-libs/files/patch-devel-docs::gnome::Makefile.in b/x11/gnome-libs/files/patch-devel-docs::gnome::Makefile.in
index b98c5295317b..17709b79f18f 100644
--- a/x11/gnome-libs/files/patch-devel-docs::gnome::Makefile.in
+++ b/x11/gnome-libs/files/patch-devel-docs::gnome::Makefile.in
@@ -1,13 +1,10 @@
-
-$FreeBSD$
-
 --- devel-docs/gnome/Makefile.in	2002/05/01 01:47:18	1.1
 +++ devel-docs/gnome/Makefile.in	2002/05/01 01:50:40
 @@ -158,7 +158,7 @@
  # The directory containing the source code (if it contains documentation).
  DOC_SOURCE_DIR = $(GNOME_LIBS_DIR)/libgnome
  
--HTML_DIR = $(datadir)/html
+-HTML_DIR = $(datadir)/gnome/html
 +HTML_DIR = $(prefix)/share/doc/gnomelibs
  
  TARGET_DIR = $(HTML_DIR)/$(DOC_MODULE)
diff --git a/x11/gnome-libs/files/patch-devel-docs::gnomeui::Makefile.in b/x11/gnome-libs/files/patch-devel-docs::gnomeui::Makefile.in
index 9266154be01a..de8b5960f7c1 100644
--- a/x11/gnome-libs/files/patch-devel-docs::gnomeui::Makefile.in
+++ b/x11/gnome-libs/files/patch-devel-docs::gnomeui::Makefile.in
@@ -1,13 +1,10 @@
-
-$FreeBSD$
-
 --- devel-docs/gnomeui/Makefile.in	2002/05/01 01:47:18	1.1
 +++ devel-docs/gnomeui/Makefile.in	2002/05/01 01:50:55
 @@ -161,7 +161,7 @@
  CFLAGS = `gnome-config --cflags gnomeui`
  LDFLAGS = `gnome-config --libs gnomeui`
  
--HTML_DIR = $(datadir)/html
+-HTML_DIR = $(datadir)/gnome/html
 +HTML_DIR = $(prefix)/share/doc/gnomelibs
  
  TARGET_DIR = $(HTML_DIR)/$(DOC_MODULE)
diff --git a/x11/gnome-libs/files/patch-devel-docs::gnorba::Makefile.in b/x11/gnome-libs/files/patch-devel-docs::gnorba::Makefile.in
index e7cc10f89a6b..e5a6981cdb86 100644
--- a/x11/gnome-libs/files/patch-devel-docs::gnorba::Makefile.in
+++ b/x11/gnome-libs/files/patch-devel-docs::gnorba::Makefile.in
@@ -1,13 +1,10 @@
-
-$FreeBSD$
-
 --- devel-docs/gnorba/Makefile.in	2002/05/01 01:47:18	1.1
 +++ devel-docs/gnorba/Makefile.in	2002/05/01 01:51:15
 @@ -158,7 +158,7 @@
  # The directory containing the source code (if it contains documentation).
  DOC_SOURCE_DIR = $(GNOME_LIBS_DIR)/libgnorba
  
--HTML_DIR = $(datadir)/html
+-HTML_DIR = $(datadir)/gnome/html
 +HTML_DIR = $(prefix)/share/doc/gnomelibs
  
  TARGET_DIR = $(HTML_DIR)/$(DOC_MODULE)
diff --git a/x11/gnome-libs/files/patch-devel-docs::zvt::Makefile.in b/x11/gnome-libs/files/patch-devel-docs::zvt::Makefile.in
index c03007ea3a2d..60b6affec183 100644
--- a/x11/gnome-libs/files/patch-devel-docs::zvt::Makefile.in
+++ b/x11/gnome-libs/files/patch-devel-docs::zvt::Makefile.in
@@ -1,13 +1,10 @@
-
-$FreeBSD$
-
 --- devel-docs/zvt/Makefile.in	2002/05/01 01:47:18	1.1
 +++ devel-docs/zvt/Makefile.in	2002/05/01 01:51:06
 @@ -158,7 +158,7 @@
  # The directory containing the source code (if it contains documentation).
  DOC_SOURCE_DIR = $(GNOME_LIBS_DIR)/zvt
  
--HTML_DIR = $(datadir)/html
+-HTML_DIR = $(datadir)/gnome/html
 +HTML_DIR = $(prefix)/share/doc/gnomelibs
  
  TARGET_DIR = $(HTML_DIR)/$(DOC_MODULE)
diff --git a/x11/gnome-libs/files/patch-libart_lgpl::configure b/x11/gnome-libs/files/patch-libart_lgpl::configure
index 2ee4ceb2e6b1..2f4ef6723578 100644
--- a/x11/gnome-libs/files/patch-libart_lgpl::configure
+++ b/x11/gnome-libs/files/patch-libart_lgpl::configure
@@ -1,6 +1,3 @@
-
-$FreeBSD$
-
 --- libart_lgpl/configure	2002/04/29 09:45:17	1.1
 +++ libart_lgpl/configure	2002/04/29 09:45:37
 @@ -5090,6 +5090,7 @@
diff --git a/x11/gnome-libs/files/patch-po::Makefile.in.in b/x11/gnome-libs/files/patch-po::Makefile.in.in
index 68b6a8c98491..8cd933b46112 100644
--- a/x11/gnome-libs/files/patch-po::Makefile.in.in
+++ b/x11/gnome-libs/files/patch-po::Makefile.in.in
@@ -1,6 +1,3 @@
-
-$FreeBSD$
-
 --- po/Makefile.in.in	2002/01/14 11:02:35	1.1
 +++ po/Makefile.in.in	2002/01/14 11:02:49
 @@ -106,7 +106,7 @@
diff --git a/x11/gnome-libs/pkg-plist b/x11/gnome-libs/pkg-plist
index bf413271bf18..64c3256df41a 100644
--- a/x11/gnome-libs/pkg-plist
+++ b/x11/gnome-libs/pkg-plist
@@ -382,30 +382,30 @@ share/doc/libart/problems.html
 share/doc/libart/sample-display.html
 share/doc/libart/sample.html
 share/doc/libart/x35.html
-share/gnome/doc/gnome-doc
-share/gnome/doc/gnome-doc.1
-share/gnome/doc/gnome-doc.el
-share/gnome/doc/gnome-mkstub.1
-share/gnome/doc/mkstub
-share/gnome/gtkrc
-share/gnome/gtkrc.el
-share/gnome/gtkrc.eo
-share/gnome/gtkrc.he
-share/gnome/gtkrc.hy
-share/gnome/gtkrc.iso88592
-share/gnome/gtkrc.iso88595
-share/gnome/gtkrc.ja
-share/gnome/gtkrc.ka_GE.georgianacademy
-share/gnome/gtkrc.ka_GE.georgianps
-share/gnome/gtkrc.ko
-share/gnome/gtkrc.ru
-share/gnome/gtkrc.th
-share/gnome/gtkrc.tr
-share/gnome/gtkrc.uk
-share/gnome/gtkrc.vi_VN.tcvn
-share/gnome/gtkrc.vi_VN.viscii
-share/gnome/gtkrc.zh_CN
-share/gnome/gtkrc.zh_TW.Big5
+share/doc/gnome-doc
+share/doc/gnome-doc.1
+share/doc/gnome-doc.el
+share/doc/gnome-mkstub.1
+share/doc/mkstub
+share/gtkrc
+share/gtkrc.el
+share/gtkrc.eo
+share/gtkrc.he
+share/gtkrc.hy
+share/gtkrc.iso88592
+share/gtkrc.iso88595
+share/gtkrc.ja
+share/gtkrc.ka_GE.georgianacademy
+share/gtkrc.ka_GE.georgianps
+share/gtkrc.ko
+share/gtkrc.ru
+share/gtkrc.th
+share/gtkrc.tr
+share/gtkrc.uk
+share/gtkrc.vi_VN.tcvn
+share/gtkrc.vi_VN.viscii
+share/gtkrc.zh_CN
+share/gtkrc.zh_TW.Big5
 share/gnome/help/gnome-dev-info/C/addauth.html
 share/gnome/help/gnome-dev-info/C/altpol.html
 share/gnome/help/gnome-dev-info/C/arch.html
@@ -485,25 +485,25 @@ share/gnome/help/gnome-dev-info/C/x1453.html
 share/gnome/help/gnome-dev-info/C/x2161.html
 share/gnome/help/gnome-dev-info/C/x2674.html
 share/gnome/help/gnome-dev-info/C/x671.html
-share/gnome/idl/GnomeObject.idl
-share/gnome/idl/Table.idl
-share/gnome/idl/desktop-editor.idl
-share/gnome/idl/desktop-textviewer.idl
-share/gnome/idl/gnome-factory.idl
-share/gnome/idl/gnome-unknown.idl
-share/gnome/idl/name-service.idl
-share/gnome/mime-info/gnome.mime
-share/gnome/pixmaps/calculator-font.png
-share/gnome/pixmaps/gnome-default-dlg.png
-share/gnome/pixmaps/gnome-error.png
-share/gnome/pixmaps/gnome-info.png
-share/gnome/pixmaps/gnome-question.png
-share/gnome/pixmaps/gnome-warning.png
-share/gnome/pixmaps/no.xpm
-share/gnome/pixmaps/yes.xpm
-share/gnome/type-convert/gnome-make-postscript-mimes
-share/gnome/type-convert/postscript.convert
-share/gnome/type-convert/type.convert
+share/idl/GnomeObject.idl
+share/idl/Table.idl
+share/idl/desktop-editor.idl
+share/idl/desktop-textviewer.idl
+share/idl/gnome-factory.idl
+share/idl/gnome-unknown.idl
+share/idl/name-service.idl
+share/mime-info/gnome.mime
+share/pixmaps/calculator-font.png
+share/pixmaps/gnome-default-dlg.png
+share/pixmaps/gnome-error.png
+share/pixmaps/gnome-info.png
+share/pixmaps/gnome-question.png
+share/pixmaps/gnome-warning.png
+share/pixmaps/no.xpm
+share/pixmaps/yes.xpm
+share/type-convert/gnome-make-postscript-mimes
+share/type-convert/postscript.convert
+share/type-convert/type.convert
 share/locale/az/LC_MESSAGES/gnome-libs.mo
 share/locale/ca/LC_MESSAGES/gnome-libs.mo
 share/locale/cs/LC_MESSAGES/gnome-libs.mo
@@ -546,10 +546,9 @@ share/locale/vi/LC_MESSAGES/gnome-libs.mo
 share/locale/wa/LC_MESSAGES/gnome-libs.mo
 share/locale/zh_CN/LC_MESSAGES/gnome-libs.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-libs.mo
-@dirrm share/gnome/type-convert
+@dirrm share/type-convert
 @dirrm share/gnome/help/gnome-dev-info/C
 @dirrm share/gnome/help/gnome-dev-info
-@dirrm share/gnome/doc
 @dirrm share/doc/libart
 @dirrm %%DOCSDIR%%/zvt
 @dirrm %%DOCSDIR%%/gnorba
diff --git a/x11/gnome-menus/Makefile b/x11/gnome-menus/Makefile
index f7a92dc1551d..4767ebecfee7 100644
--- a/x11/gnome-menus/Makefile
+++ b/x11/gnome-menus/Makefile
@@ -3,11 +3,11 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/x11/gnome-menus/Makefile,v 1.50 2007/03/12 22:36:46 marcus Exp $
+#   $MCom: ports/x11/gnome-menus/Makefile,v 1.64 2007/10/15 21:09:56 mezz Exp $
 #
 
 PORTNAME=	gnome-menus
-PORTVERSION=	2.18.3
+PORTVERSION=	2.20.1
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -47,10 +47,9 @@ post-patch:
 		${WRKSRC}/simple-editor/GMenuSimpleEditor/menutreemodel.py
 
 post-install:
-	@${MKDIR} ${PREFIX}/share/gnome/desktop-directories
 	@${INSTALL_DATA} ${WRKSRC}/layout/applications.menu \
 		${PREFIX}/etc/xdg/menus/gnome-applications.menu
 	@${INSTALL_DATA} ${WRKSRC}/KDE.directory \
-		${PREFIX}/share/gnome/desktop-directories
+		${PREFIX}/share/desktop-directories
 
 .include <bsd.port.post.mk>
diff --git a/x11/gnome-menus/distinfo b/x11/gnome-menus/distinfo
index c67b66ede9b9..5e0997dd714e 100644
--- a/x11/gnome-menus/distinfo
+++ b/x11/gnome-menus/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-menus-2.18.3.tar.bz2) = e2b97b01b33b9744baf26982a8ad588a
-SHA256 (gnome2/gnome-menus-2.18.3.tar.bz2) = c6c0b9a93426dbdcb47fb7e586b9d910e2dbc0e9c894c0f322d08971a7b70933
-SIZE (gnome2/gnome-menus-2.18.3.tar.bz2) = 437539
+MD5 (gnome2/gnome-menus-2.20.1.tar.bz2) = ad141dc4d5e485e613b68f9fa58bae5f
+SHA256 (gnome2/gnome-menus-2.20.1.tar.bz2) = f6c147983b8c2a6ed0798667d9bd2f58a47b6e6b8e4ab850f83db82beda6badb
+SIZE (gnome2/gnome-menus-2.20.1.tar.bz2) = 450569
diff --git a/x11/gnome-menus/files/patch-layout::applications.menu b/x11/gnome-menus/files/patch-layout::applications.menu
index a3644747b8dc..85533b6d6c0e 100644
--- a/x11/gnome-menus/files/patch-layout::applications.menu
+++ b/x11/gnome-menus/files/patch-layout::applications.menu
@@ -1,5 +1,5 @@
---- layout/applications.menu.orig	Wed Mar  9 11:49:53 2005
-+++ layout/applications.menu	Fri Mar 25 11:45:09 2005
+--- layout/applications.menu.orig	Sun Jul  8 18:04:11 2007
++++ layout/applications.menu	Sun Jul  8 18:04:35 2007
 @@ -6,24 +6,26 @@
    <Name>Applications</Name>
    <Directory>Applications.directory</Directory>
@@ -60,7 +60,7 @@
        </And>
        <Filename>emacs.desktop</Filename>
 @@ -64,6 +78,12 @@
-     <Directory>Edutainment.directory</Directory>
+     <Directory>Education.directory</Directory>
      <Include>
        <And>
 +        <Not>
@@ -160,9 +160,9 @@
 +            <Category>KDE</Category>
 +          </Or>
 +        </Not>
-         <Category>Application</Category>
          <Not><Category>Core</Category></Not>
          <Not><Category>Settings</Category></Not>
+         <Not><Category>Screensaver</Category></Not>
        </And>
      </Include>
    </Menu> <!-- End Other -->
@@ -227,10 +227,10 @@
 +      </Include>
 +    </Menu> <!-- End KDevelopment Tools -->
 +
-+    <!-- KEdutainment -->
++    <!-- KEducation -->
 +    <Menu>
-+      <Name>Edutainment</Name>
-+      <Directory>Edutainment.directory</Directory>
++      <Name>Education</Name>
++      <Directory>Education.directory</Directory>
 +      <Include>
 +        <And>
 +          <Or>
@@ -240,7 +240,7 @@
 +          <Category>Education</Category>
 +        </And>
 +      </Include>
-+    </Menu> <!-- End KEdutainment -->
++    </Menu> <!-- End KEducation -->
 +
 +    <!-- KGames -->
 +    <Menu>
diff --git a/x11/gnome-menus/files/patch-simple-editor_GMenuSimpleEditor_menutreemodel.py b/x11/gnome-menus/files/patch-simple-editor_GMenuSimpleEditor_menutreemodel.py
index 5272bec03af4..b134a5817e56 100644
--- a/x11/gnome-menus/files/patch-simple-editor_GMenuSimpleEditor_menutreemodel.py
+++ b/x11/gnome-menus/files/patch-simple-editor_GMenuSimpleEditor_menutreemodel.py
@@ -14,7 +14,7 @@
          data_dirs = os.environ["XDG_DATA_DIRS"]
      if not data_dirs:
 -        data_dirs = "/usr/local/share/:/usr/share/"
-+	data_dirs = "%%LOCALBASE%%/share/gnome/:%%LOCALBASE%%/share/:/usr/share/"
++	data_dirs = "%%LOCALBASE%%/share/"
  
      for data_dir in data_dirs.split (":"):
          retval = load_icon_from_path (os.path.join (data_dir, "pixmaps", icon_value))
diff --git a/x11/gnome-menus/pkg-plist b/x11/gnome-menus/pkg-plist
index 6aaf768d7018..793995388be1 100644
--- a/x11/gnome-menus/pkg-plist
+++ b/x11/gnome-menus/pkg-plist
@@ -11,30 +11,31 @@ lib/libgnome-menu.so.2
 %%PYTHON_SITELIBDIR%%/gmenu.la
 %%PYTHON_SITELIBDIR%%/gmenu.so
 libdata/pkgconfig/libgnome-menu.pc
-share/gnome/desktop-directories/Accessibility.directory
-share/gnome/desktop-directories/Accessories.directory
-share/gnome/desktop-directories/Applications.directory
-share/gnome/desktop-directories/Desktop.directory
-share/gnome/desktop-directories/Development.directory
-share/gnome/desktop-directories/Education.directory
-share/gnome/desktop-directories/Games.directory
-share/gnome/desktop-directories/Graphics.directory
-share/gnome/desktop-directories/Hardware.directory
-share/gnome/desktop-directories/Internet.directory
-share/gnome/desktop-directories/InternetAndNetwork.directory
-share/gnome/desktop-directories/KDE.directory
-share/gnome/desktop-directories/LookAndFeel.directory
-share/gnome/desktop-directories/Multimedia.directory
-share/gnome/desktop-directories/Office.directory
-share/gnome/desktop-directories/Other.directory
-share/gnome/desktop-directories/Personal.directory
-share/gnome/desktop-directories/Preferences.directory
-share/gnome/desktop-directories/Settings-Accessibility.directory
-share/gnome/desktop-directories/Settings.directory
-share/gnome/desktop-directories/System-Settings.directory
-share/gnome/desktop-directories/System-Tools.directory
-share/gnome/desktop-directories/System.directory
+share/desktop-directories/Accessibility.directory
+share/desktop-directories/Accessories.directory
+share/desktop-directories/Applications.directory
+share/desktop-directories/Desktop.directory
+share/desktop-directories/Development.directory
+share/desktop-directories/Education.directory
+share/desktop-directories/Games.directory
+share/desktop-directories/Graphics.directory
+share/desktop-directories/Hardware.directory
+share/desktop-directories/Internet.directory
+share/desktop-directories/InternetAndNetwork.directory
+share/desktop-directories/KDE.directory
+share/desktop-directories/LookAndFeel.directory
+share/desktop-directories/Multimedia.directory
+share/desktop-directories/Office.directory
+share/desktop-directories/Other.directory
+share/desktop-directories/Personal.directory
+share/desktop-directories/Preferences.directory
+share/desktop-directories/Settings-Accessibility.directory
+share/desktop-directories/Settings.directory
+share/desktop-directories/System-Settings.directory
+share/desktop-directories/System-Tools.directory
+share/desktop-directories/System.directory
 share/locale/ar/LC_MESSAGES/gnome-menus.mo
+share/locale/as/LC_MESSAGES/gnome-menus.mo
 share/locale/be/LC_MESSAGES/gnome-menus.mo
 share/locale/be@latin/LC_MESSAGES/gnome-menus.mo
 share/locale/bg/LC_MESSAGES/gnome-menus.mo
@@ -57,6 +58,7 @@ share/locale/eu/LC_MESSAGES/gnome-menus.mo
 share/locale/fa/LC_MESSAGES/gnome-menus.mo
 share/locale/fi/LC_MESSAGES/gnome-menus.mo
 share/locale/fr/LC_MESSAGES/gnome-menus.mo
+share/locale/ga/LC_MESSAGES/gnome-menus.mo
 share/locale/gl/LC_MESSAGES/gnome-menus.mo
 share/locale/gn/LC_MESSAGES/gnome-menus.mo
 share/locale/gu/LC_MESSAGES/gnome-menus.mo
@@ -68,6 +70,7 @@ share/locale/id/LC_MESSAGES/gnome-menus.mo
 share/locale/it/LC_MESSAGES/gnome-menus.mo
 share/locale/ja/LC_MESSAGES/gnome-menus.mo
 share/locale/ka/LC_MESSAGES/gnome-menus.mo
+share/locale/kn/LC_MESSAGES/gnome-menus.mo
 share/locale/ko/LC_MESSAGES/gnome-menus.mo
 share/locale/ku/LC_MESSAGES/gnome-menus.mo
 share/locale/ky/LC_MESSAGES/gnome-menus.mo
@@ -92,6 +95,7 @@ share/locale/pt_BR/LC_MESSAGES/gnome-menus.mo
 share/locale/ro/LC_MESSAGES/gnome-menus.mo
 share/locale/ru/LC_MESSAGES/gnome-menus.mo
 share/locale/rw/LC_MESSAGES/gnome-menus.mo
+share/locale/si/LC_MESSAGES/gnome-menus.mo
 share/locale/sk/LC_MESSAGES/gnome-menus.mo
 share/locale/sl/LC_MESSAGES/gnome-menus.mo
 share/locale/sq/LC_MESSAGES/gnome-menus.mo
@@ -104,12 +108,13 @@ share/locale/th/LC_MESSAGES/gnome-menus.mo
 share/locale/tr/LC_MESSAGES/gnome-menus.mo
 share/locale/ug/LC_MESSAGES/gnome-menus.mo
 share/locale/uk/LC_MESSAGES/gnome-menus.mo
+share/locale/uz@cyrillic/LC_MESSAGES/gnome-menus.mo
 share/locale/vi/LC_MESSAGES/gnome-menus.mo
 share/locale/xh/LC_MESSAGES/gnome-menus.mo
 share/locale/zh_CN/LC_MESSAGES/gnome-menus.mo
 share/locale/zh_HK/LC_MESSAGES/gnome-menus.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-menus.mo
-@dirrm share/gnome/desktop-directories
+@dirrmtry share/desktop-directories
 @dirrm include/gnome-menus
 @dirrmtry etc/xdg/menus
 @dirrmtry etc/xdg
@@ -117,10 +122,14 @@ share/locale/zh_TW/LC_MESSAGES/gnome-menus.mo
 @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
@@ -143,3 +152,5 @@ share/locale/zh_TW/LC_MESSAGES/gnome-menus.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/x11/gnome-panel/Makefile b/x11/gnome-panel/Makefile
index ad6f6de021a0..b9aa1f0997fd 100644
--- a/x11/gnome-panel/Makefile
+++ b/x11/gnome-panel/Makefile
@@ -3,11 +3,11 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/x11/gnome-panel/Makefile,v 1.146 2007/03/14 21:00:05 marcus Exp $
+#   $MCom: ports/x11/gnome-panel/Makefile,v 1.161 2007/10/15 21:34:24 mezz Exp $
 #
 
 PORTNAME=	gnome-panel
-PORTVERSION=	2.18.3
+PORTVERSION=	2.20.1
 PORTREVISION?=	0
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
diff --git a/x11/gnome-panel/distinfo b/x11/gnome-panel/distinfo
index ddf8ddfd5f63..1f542a4af209 100644
--- a/x11/gnome-panel/distinfo
+++ b/x11/gnome-panel/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-panel-2.18.3.tar.bz2) = 545348de234fa8222e328fa7f3a5ba71
-SHA256 (gnome2/gnome-panel-2.18.3.tar.bz2) = efb12148ace94612b47add4060dd9ae088b47e09e5c4c223f8ab7e1c7dcc9410
-SIZE (gnome2/gnome-panel-2.18.3.tar.bz2) = 2722555
+MD5 (gnome2/gnome-panel-2.20.1.tar.bz2) = 87ef96c2cbb8ecaa328420c0d31cc4c0
+SHA256 (gnome2/gnome-panel-2.20.1.tar.bz2) = 3ec39b085b905946fa891cb01ae320166a85e11e850f29bf622057a00a4d1b01
+SIZE (gnome2/gnome-panel-2.20.1.tar.bz2) = 2820992
diff --git a/x11/gnome-panel/files/patch-po_ja.po b/x11/gnome-panel/files/patch-po_ja.po
index 1d3343b4140e..5a71e3919398 100644
--- a/x11/gnome-panel/files/patch-po_ja.po
+++ b/x11/gnome-panel/files/patch-po_ja.po
@@ -1,20 +1,20 @@
---- po/ja.po.orig	Mon Mar  7 23:15:19 2005
-+++ po/ja.po	Fri Apr  8 14:12:28 2005
-@@ -105,7 +105,7 @@
+--- po/ja.po.orig	2007-08-13 19:37:02.000000000 -0400
++++ po/ja.po	2007-08-14 17:00:06.000000000 -0400
+@@ -97,7 +97,7 @@ msgstr "%k:%M"
+ #. * possible.
+ #: ../applets/clock/calendar-window.c:234
+ msgid "%b %d"
+-msgstr "%b%e日"
++msgstr "%B%e日"
+ 
+ #: ../applets/clock/calendar-window.c:742
+ msgid "_Tasks"
+@@ -138,7 +138,7 @@ msgstr "%k:%M:%S"
  #.
- #: ../applets/clock/clock.c:281
+ #: ../applets/clock/clock.c:369
  msgid "%a %b %e"
 -msgstr "%b%e日 (%a)"
 +msgstr "%B%e日 (%a)"
  
  #. translators: reverse the order of these arguments
  #. *              if the time should come before the
-@@ -138,7 +138,7 @@
- #. we will display the start date in the most abbreviated way possible.
- #: ../applets/clock/clock.c:591
- msgid "%b %d"
--msgstr "%b%e日"
-+msgstr "%B%e日"
- 
- #: ../applets/clock/clock.c:890
- msgid "Tasks"
diff --git a/x11/gnome-panel/files/patch-po_ko.po b/x11/gnome-panel/files/patch-po_ko.po
index 7dbd45da700a..45d98a92c0be 100644
--- a/x11/gnome-panel/files/patch-po_ko.po
+++ b/x11/gnome-panel/files/patch-po_ko.po
@@ -1,38 +1,38 @@
---- po/ko.po.orig	Wed Sep 21 02:37:42 2005
-+++ po/ko.po	Fri Feb  3 15:58:18 2006
-@@ -98,7 +98,7 @@
+--- po/ko.po.orig	Sun Jul  8 18:23:19 2007
++++ po/ko.po	Sun Jul  8 18:26:46 2007
+@@ -88,7 +88,7 @@
+ #. * possible.
+ #: ../applets/clock/calendar-window.c:233
+ msgid "%b %d"
+-msgstr "%b %e일"
++msgstr "%B %e일"
+ 
+ #: ../applets/clock/calendar-window.c:741
+ msgid "_Tasks"
+@@ -129,7 +129,7 @@
  #.
- #: ../applets/clock/clock.c:279
+ #: ../applets/clock/clock.c:367
  msgid "%a %b %e"
 -msgstr "%b %e일 (%a)"
 +msgstr "%B %e일 (%a)"
  
  #. translators: reverse the order of these arguments
  #. *              if the time should come before the
-@@ -125,7 +125,7 @@
+@@ -156,7 +156,7 @@
  #. Show date in tooltip
- #: ../applets/clock/clock.c:378
+ #: ../applets/clock/clock.c:520
  msgid "%A %B %d"
 -msgstr "%b %e일 %A"
 +msgstr "%B %e일 %A"
  
- #: ../applets/clock/clock.c:390
- msgid "Click to view your appointments and tasks"
-@@ -139,7 +139,7 @@
- #. we will display the start date in the most abbreviated way possible.
- #: ../applets/clock/clock.c:598
- msgid "%b %d"
--msgstr "%b %e일"
-+msgstr "%B %e일"
- 
- #: ../applets/clock/clock.c:925
- msgid "Tasks"
-@@ -171,7 +171,7 @@
+ #: ../applets/clock/clock.c:534
+ msgid "Click to hide your appointments and tasks"
+@@ -188,7 +188,7 @@
  
- #: ../applets/clock/clock.c:1767
+ #: ../applets/clock/clock.c:1073
  msgid "%A, %B %d %Y"
 -msgstr "%Y년 %b %e일 %A"
 +msgstr "%Y년 %B %e일 %A"
  
- #: ../applets/clock/clock.c:1824
+ #: ../applets/clock/clock.c:1148
  #, c-format
diff --git a/x11/gnome-panel/pkg-plist b/x11/gnome-panel/pkg-plist
index 96b87b383e19..717d6d3cf887 100644
--- a/x11/gnome-panel/pkg-plist
+++ b/x11/gnome-panel/pkg-plist
@@ -24,22 +24,43 @@ libexec/clock-applet
 libexec/fish-applet-2
 libexec/notification-area-applet
 libexec/wnck-applet
-share/gnome/applications/gnome-panel.desktop
-share/gnome/gnome-2.0/ui/GNOME_ClockApplet.xml
-share/gnome/gnome-2.0/ui/GNOME_FishApplet.xml
-share/gnome/gnome-2.0/ui/GNOME_NotificationAreaApplet.xml
-share/gnome/gnome-2.0/ui/GNOME_Panel_Popup.xml
-share/gnome/gnome-2.0/ui/GNOME_ShowDesktopApplet.xml
-share/gnome/gnome-2.0/ui/GNOME_WindowListApplet.xml
-share/gnome/gnome-2.0/ui/GNOME_WindowMenuApplet.xml
-share/gnome/gnome-2.0/ui/GNOME_WorkspaceSwitcherApplet.xml
-share/gnome/gnome-panelrc
+share/applications/gnome-panel.desktop
+share/gnome-2.0/ui/GNOME_ClockApplet.xml
+share/gnome-2.0/ui/GNOME_FishApplet.xml
+share/gnome-2.0/ui/GNOME_NotificationAreaApplet.xml
+share/gnome-2.0/ui/GNOME_Panel_Popup.xml
+share/gnome-2.0/ui/GNOME_ShowDesktopApplet.xml
+share/gnome-2.0/ui/GNOME_WindowListApplet.xml
+share/gnome-2.0/ui/GNOME_WindowMenuApplet.xml
+share/gnome-2.0/ui/GNOME_WorkspaceSwitcherApplet.xml
+%%DATADIR%%/glade/fish.glade
+%%DATADIR%%/glade/panel-properties-dialog.glade
+%%DATADIR%%/glade/panel-run-dialog.glade
+%%DATADIR%%/glade/panel-test-applets.glade
+%%DATADIR%%/glade/timezone.glade
+%%DATADIR%%/glade/window-list.glade
+%%DATADIR%%/glade/workspace-switcher.glade
+%%DATADIR%%/pixmaps/fishanim.png
+%%DATADIR%%/pixmaps/footguy.png
+%%DATADIR%%/pixmaps/gnome-gegl2-2.png
+%%DATADIR%%/pixmaps/gnome-gegl2.png
+%%DATADIR%%/pixmaps/monkey.png
+%%DATADIR%%/pixmaps/oldwanda.png
+%%DATADIR%%/pixmaps/wanda.png
+%%DATADIR%%/pixmaps/world_map-960.png
+share/gnome-panelrc
 share/gnome/help/clock/C/clock.xml
 share/gnome/help/clock/C/figures/clock_applet.png
 share/gnome/help/clock/C/legal.xml
+share/gnome/help/clock/ca/clock.xml
+share/gnome/help/clock/ca/figures/clock_applet.png
+share/gnome/help/clock/ca/legal.xml
 share/gnome/help/clock/de/clock.xml
 share/gnome/help/clock/de/figures/clock_applet.png
 share/gnome/help/clock/de/legal.xml
+share/gnome/help/clock/el/clock.xml
+share/gnome/help/clock/el/figures/clock_applet.png
+share/gnome/help/clock/el/legal.xml
 share/gnome/help/clock/es/clock.xml
 share/gnome/help/clock/es/figures/clock_applet.png
 share/gnome/help/clock/es/legal.xml
@@ -58,6 +79,9 @@ share/gnome/help/clock/ko/legal.xml
 share/gnome/help/clock/nl/clock.xml
 share/gnome/help/clock/nl/figures/clock_applet.png
 share/gnome/help/clock/nl/legal.xml
+share/gnome/help/clock/oc/clock.xml
+share/gnome/help/clock/oc/figures/clock_applet.png
+share/gnome/help/clock/oc/legal.xml
 share/gnome/help/clock/pa/clock.xml
 share/gnome/help/clock/pa/figures/clock_applet.png
 share/gnome/help/clock/pa/legal.xml
@@ -86,10 +110,6 @@ share/gnome/help/fish-applet-2/de/legal.xml
 share/gnome/help/fish-applet-2/ja/figures/fish_applet.png
 share/gnome/help/fish-applet-2/ja/fish-applet-2.xml
 share/gnome/help/fish-applet-2/ja/legal.xml
-share/gnome/help/fish-applet-2/ko/figures/fish_applet.png
-share/gnome/help/fish-applet-2/ko/figures/fish_settings.png
-share/gnome/help/fish-applet-2/ko/fish-applet-2.xml
-share/gnome/help/fish-applet-2/ko/legal.xml
 share/gnome/help/fish-applet-2/zh_CN/figures/fish_applet.png
 share/gnome/help/fish-applet-2/zh_CN/figures/fish_settings.png
 share/gnome/help/fish-applet-2/zh_CN/fish-applet-2.xml
@@ -101,6 +121,12 @@ share/gnome/help/fish-applet-2/zh_TW/legal.xml
 share/gnome/help/fish/C/figures/fish_applet.png
 share/gnome/help/fish/C/fish.xml
 share/gnome/help/fish/C/legal.xml
+share/gnome/help/fish/ca/figures/fish_applet.png
+share/gnome/help/fish/ca/fish.xml
+share/gnome/help/fish/ca/legal.xml
+share/gnome/help/fish/el/figures/fish_applet.png
+share/gnome/help/fish/el/fish.xml
+share/gnome/help/fish/el/legal.xml
 share/gnome/help/fish/es/figures/fish_applet.png
 share/gnome/help/fish/es/fish.xml
 share/gnome/help/fish/es/legal.xml
@@ -110,105 +136,66 @@ share/gnome/help/fish/fr/legal.xml
 share/gnome/help/fish/it/figures/fish_applet.png
 share/gnome/help/fish/it/fish.xml
 share/gnome/help/fish/it/legal.xml
+share/gnome/help/fish/ko/figures/fish_applet.png
+share/gnome/help/fish/ko/fish.xml
+share/gnome/help/fish/ko/legal.xml
+share/gnome/help/fish/oc/figures/fish_applet.png
+share/gnome/help/fish/oc/fish.xml
+share/gnome/help/fish/oc/legal.xml
 share/gnome/help/fish/sv/figures/fish_applet.png
 share/gnome/help/fish/sv/fish.xml
 share/gnome/help/fish/sv/legal.xml
 share/gnome/help/fish/uk/figures/fish_applet.png
 share/gnome/help/fish/uk/fish.xml
 share/gnome/help/fish/uk/legal.xml
-share/gnome/help/window-list/C/figures/window_list_applet.png
-share/gnome/help/window-list/C/figures/window_list_group_applet.png
-share/gnome/help/window-list/C/legal.xml
 share/gnome/help/window-list/C/window-list.xml
+share/gnome/help/window-list/ca/window-list.xml
 share/gnome/help/window-list/de/figures/window_list_applet.png
 share/gnome/help/window-list/de/figures/window_list_group.png
 share/gnome/help/window-list/de/figures/window_list_group_applet.png
 share/gnome/help/window-list/de/legal.xml
 share/gnome/help/window-list/de/window-list.xml
-share/gnome/help/window-list/es/figures/window_list_applet.png
-share/gnome/help/window-list/es/figures/window_list_group_applet.png
-share/gnome/help/window-list/es/legal.xml
+share/gnome/help/window-list/el/window-list.xml
 share/gnome/help/window-list/es/window-list.xml
-share/gnome/help/window-list/fr/figures/window_list_applet.png
-share/gnome/help/window-list/fr/figures/window_list_group_applet.png
-share/gnome/help/window-list/fr/legal.xml
 share/gnome/help/window-list/fr/window-list.xml
-share/gnome/help/window-list/it/figures/window_list_applet.png
-share/gnome/help/window-list/it/figures/window_list_group_applet.png
-share/gnome/help/window-list/it/legal.xml
 share/gnome/help/window-list/it/window-list.xml
 share/gnome/help/window-list/ja/figures/window_list_applet.png
 share/gnome/help/window-list/ja/figures/window_list_group_applet.png
 share/gnome/help/window-list/ja/legal.xml
 share/gnome/help/window-list/ja/window-list.xml
-share/gnome/help/window-list/ko/figures/window_list_applet.png
-share/gnome/help/window-list/ko/figures/window_list_group.png
-share/gnome/help/window-list/ko/figures/window_list_group_applet.png
-share/gnome/help/window-list/ko/legal.xml
 share/gnome/help/window-list/ko/window-list.xml
-share/gnome/help/window-list/pa/figures/window_list_applet.png
-share/gnome/help/window-list/pa/figures/window_list_group_applet.png
-share/gnome/help/window-list/pa/legal.xml
+share/gnome/help/window-list/oc/window-list.xml
 share/gnome/help/window-list/pa/window-list.xml
-share/gnome/help/window-list/ru/figures/window_list_applet.png
-share/gnome/help/window-list/ru/figures/window_list_group_applet.png
-share/gnome/help/window-list/ru/legal.xml
 share/gnome/help/window-list/ru/window-list.xml
-share/gnome/help/window-list/sv/figures/window_list_applet.png
-share/gnome/help/window-list/sv/figures/window_list_group_applet.png
-share/gnome/help/window-list/sv/legal.xml
 share/gnome/help/window-list/sv/window-list.xml
-share/gnome/help/window-list/uk/figures/window_list_applet.png
-share/gnome/help/window-list/uk/figures/window_list_group_applet.png
-share/gnome/help/window-list/uk/legal.xml
 share/gnome/help/window-list/uk/window-list.xml
-share/gnome/help/window-list/zh_CN/figures/window_list_applet.png
-share/gnome/help/window-list/zh_CN/figures/window_list_group_applet.png
-share/gnome/help/window-list/zh_CN/legal.xml
 share/gnome/help/window-list/zh_CN/window-list.xml
 share/gnome/help/window-list/zh_TW/figures/window_list_applet.png
 share/gnome/help/window-list/zh_TW/figures/window_list_group.png
 share/gnome/help/window-list/zh_TW/figures/window_list_group_applet.png
 share/gnome/help/window-list/zh_TW/legal.xml
 share/gnome/help/window-list/zh_TW/window-list.xml
-share/gnome/help/workspace-switcher/C/figures/workspace_switcher_applet.png
-share/gnome/help/workspace-switcher/C/legal.xml
 share/gnome/help/workspace-switcher/C/workspace-switcher.xml
+share/gnome/help/workspace-switcher/ca/workspace-switcher.xml
 share/gnome/help/workspace-switcher/de/figures/workspace_switcher_applet.png
 share/gnome/help/workspace-switcher/de/figures/workspacelist_applet.png
 share/gnome/help/workspace-switcher/de/legal.xml
 share/gnome/help/workspace-switcher/de/workspace-switcher.xml
-share/gnome/help/workspace-switcher/es/figures/workspace_switcher_applet.png
-share/gnome/help/workspace-switcher/es/legal.xml
+share/gnome/help/workspace-switcher/el/workspace-switcher.xml
 share/gnome/help/workspace-switcher/es/workspace-switcher.xml
-share/gnome/help/workspace-switcher/fr/figures/workspace_switcher_applet.png
-share/gnome/help/workspace-switcher/fr/legal.xml
 share/gnome/help/workspace-switcher/fr/workspace-switcher.xml
-share/gnome/help/workspace-switcher/it/figures/workspace_switcher_applet.png
-share/gnome/help/workspace-switcher/it/legal.xml
 share/gnome/help/workspace-switcher/it/workspace-switcher.xml
 share/gnome/help/workspace-switcher/ja/figures/workspace_switcher_applet.png
 share/gnome/help/workspace-switcher/ja/legal.xml
 share/gnome/help/workspace-switcher/ja/workspace-switcher.xml
-share/gnome/help/workspace-switcher/ko/figures/workspace_switcher_applet.png
-share/gnome/help/workspace-switcher/ko/figures/workspacelist_applet.png
-share/gnome/help/workspace-switcher/ko/legal.xml
 share/gnome/help/workspace-switcher/ko/workspace-switcher.xml
-share/gnome/help/workspace-switcher/nl/figures/workspace_switcher_applet.png
-share/gnome/help/workspace-switcher/nl/legal.xml
 share/gnome/help/workspace-switcher/nl/workspace-switcher.xml
-share/gnome/help/workspace-switcher/pa/figures/workspace_switcher_applet.png
-share/gnome/help/workspace-switcher/pa/legal.xml
+share/gnome/help/workspace-switcher/oc/workspace-switcher.xml
 share/gnome/help/workspace-switcher/pa/workspace-switcher.xml
-share/gnome/help/workspace-switcher/ru/figures/workspace_switcher_applet.png
-share/gnome/help/workspace-switcher/ru/legal.xml
 share/gnome/help/workspace-switcher/ru/workspace-switcher.xml
-share/gnome/help/workspace-switcher/sv/figures/workspace_switcher_applet.png
-share/gnome/help/workspace-switcher/sv/legal.xml
 share/gnome/help/workspace-switcher/sv/workspace-switcher.xml
-share/gnome/help/workspace-switcher/uk/figures/workspace_switcher_applet.png
-share/gnome/help/workspace-switcher/uk/legal.xml
 share/gnome/help/workspace-switcher/uk/workspace-switcher.xml
+share/gnome/help/workspace-switcher/vi/workspace-switcher.xml
 share/gnome/help/workspace-switcher/zh_CN/figures/workspace_switcher_applet.png
 share/gnome/help/workspace-switcher/zh_CN/figures/workspacelist_applet.png
 share/gnome/help/workspace-switcher/zh_CN/legal.xml
@@ -217,73 +204,6 @@ share/gnome/help/workspace-switcher/zh_TW/figures/workspace_switcher_applet.png
 share/gnome/help/workspace-switcher/zh_TW/figures/workspacelist_applet.png
 share/gnome/help/workspace-switcher/zh_TW/legal.xml
 share/gnome/help/workspace-switcher/zh_TW/workspace-switcher.xml
-share/gnome/idl/gnome-panel-2.0/GNOME_Panel.idl
-share/gnome/omf/clock/clock-C.omf
-share/gnome/omf/clock/clock-de.omf
-share/gnome/omf/clock/clock-es.omf
-share/gnome/omf/clock/clock-fr.omf
-share/gnome/omf/clock/clock-it.omf
-share/gnome/omf/clock/clock-ja.omf
-share/gnome/omf/clock/clock-ko.omf
-share/gnome/omf/clock/clock-nl.omf
-share/gnome/omf/clock/clock-pa.omf
-share/gnome/omf/clock/clock-ru.omf
-share/gnome/omf/clock/clock-sr.omf
-share/gnome/omf/clock/clock-sv.omf
-share/gnome/omf/clock/clock-uk.omf
-share/gnome/omf/clock/clock-zh_CN.omf
-share/gnome/omf/clock/clock-zh_TW.omf
-share/gnome/omf/fish/fish-C.omf
-share/gnome/omf/fish/fish-es.omf
-share/gnome/omf/fish/fish-fr.omf
-share/gnome/omf/fish/fish-it.omf
-share/gnome/omf/fish/fish-sv.omf
-share/gnome/omf/fish/fish-uk.omf
-share/gnome/omf/gnome-panel/fish-applet-2-de.omf
-share/gnome/omf/gnome-panel/fish-applet-2-ja.omf
-share/gnome/omf/gnome-panel/fish-applet-2-ko.omf
-share/gnome/omf/gnome-panel/fish-applet-2-zh_CN.omf
-share/gnome/omf/gnome-panel/fish-applet-2-zh_TW.omf
-share/gnome/omf/gnome-panel/window-list-de.omf
-share/gnome/omf/gnome-panel/window-list-ja.omf
-share/gnome/omf/gnome-panel/window-list-ko.omf
-share/gnome/omf/gnome-panel/window-list-zh_TW.omf
-share/gnome/omf/gnome-panel/workspace-switcher-de.omf
-share/gnome/omf/gnome-panel/workspace-switcher-ja.omf
-share/gnome/omf/gnome-panel/workspace-switcher-ko.omf
-share/gnome/omf/gnome-panel/workspace-switcher-zh_CN.omf
-share/gnome/omf/gnome-panel/workspace-switcher-zh_TW.omf
-share/gnome/omf/window-list/window-list-C.omf
-share/gnome/omf/window-list/window-list-es.omf
-share/gnome/omf/window-list/window-list-fr.omf
-share/gnome/omf/window-list/window-list-it.omf
-share/gnome/omf/window-list/window-list-pa.omf
-share/gnome/omf/window-list/window-list-ru.omf
-share/gnome/omf/window-list/window-list-sv.omf
-share/gnome/omf/window-list/window-list-uk.omf
-share/gnome/omf/window-list/window-list-zh_CN.omf
-share/gnome/omf/workspace-switcher/workspace-switcher-C.omf
-share/gnome/omf/workspace-switcher/workspace-switcher-es.omf
-share/gnome/omf/workspace-switcher/workspace-switcher-fr.omf
-share/gnome/omf/workspace-switcher/workspace-switcher-it.omf
-share/gnome/omf/workspace-switcher/workspace-switcher-nl.omf
-share/gnome/omf/workspace-switcher/workspace-switcher-pa.omf
-share/gnome/omf/workspace-switcher/workspace-switcher-ru.omf
-share/gnome/omf/workspace-switcher/workspace-switcher-sv.omf
-share/gnome/omf/workspace-switcher/workspace-switcher-uk.omf
-share/gnome/panel/glade/fish.glade
-share/gnome/panel/glade/panel-properties-dialog.glade
-share/gnome/panel/glade/panel-run-dialog.glade
-share/gnome/panel/glade/panel-test-applets.glade
-share/gnome/panel/glade/window-list.glade
-share/gnome/panel/glade/workspace-switcher.glade
-share/gnome/panel/pixmaps/fishanim.png
-share/gnome/panel/pixmaps/footguy.png
-share/gnome/panel/pixmaps/gnome-gegl2-2.png
-share/gnome/panel/pixmaps/gnome-gegl2.png
-share/gnome/panel/pixmaps/monkey.png
-share/gnome/panel/pixmaps/oldwanda.png
-share/gnome/panel/pixmaps/wanda.png
 share/icons/hicolor/16x16/apps/gnome-panel-clock.png
 share/icons/hicolor/16x16/apps/gnome-panel-drawer.png
 share/icons/hicolor/16x16/apps/gnome-panel-fish.png
@@ -339,6 +259,7 @@ share/icons/hicolor/scalable/apps/gnome-panel-window-list.svg
 share/icons/hicolor/scalable/apps/gnome-panel-window-menu.svg
 share/icons/hicolor/scalable/apps/gnome-panel-workspace-switcher.svg
 share/icons/hicolor/scalable/apps/gnome-panel.svg
+share/idl/gnome-panel-2.0/GNOME_Panel.idl
 share/locale/af/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/am/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/ar/LC_MESSAGES/gnome-panel-2.0.mo
@@ -378,6 +299,7 @@ share/locale/id/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/it/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/ja/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/ka/LC_MESSAGES/gnome-panel-2.0.mo
+share/locale/kn/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/ko/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/ku/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/ky/LC_MESSAGES/gnome-panel-2.0.mo
@@ -405,6 +327,7 @@ share/locale/pt_BR/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/ro/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/ru/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/rw/LC_MESSAGES/gnome-panel-2.0.mo
+share/locale/si/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/sk/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/sl/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/sq/LC_MESSAGES/gnome-panel-2.0.mo
@@ -417,6 +340,8 @@ share/locale/te/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/th/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/tr/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/uk/LC_MESSAGES/gnome-panel-2.0.mo
+share/locale/uz/LC_MESSAGES/gnome-panel-2.0.mo
+share/locale/uz@cyrillic/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/vi/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/wa/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/xh/LC_MESSAGES/gnome-panel-2.0.mo
@@ -425,88 +350,147 @@ share/locale/zh_CN/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/zh_HK/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/zu/LC_MESSAGES/gnome-panel-2.0.mo
-@dirrm share/gnome/panel/pixmaps
-@dirrm share/gnome/panel/glade
-@dirrm share/gnome/omf/workspace-switcher
-@dirrm share/gnome/omf/window-list
-@dirrm share/gnome/omf/gnome-panel
-@dirrm share/gnome/omf/fish
-@dirrm share/gnome/omf/clock
-@dirrm share/gnome/idl/gnome-panel-2.0
+share/omf/clock/clock-C.omf
+share/omf/clock/clock-ca.omf
+share/omf/clock/clock-de.omf
+share/omf/clock/clock-el.omf
+share/omf/clock/clock-es.omf
+share/omf/clock/clock-fr.omf
+share/omf/clock/clock-it.omf
+share/omf/clock/clock-ja.omf
+share/omf/clock/clock-ko.omf
+share/omf/clock/clock-nl.omf
+share/omf/clock/clock-oc.omf
+share/omf/clock/clock-pa.omf
+share/omf/clock/clock-ru.omf
+share/omf/clock/clock-sr.omf
+share/omf/clock/clock-sv.omf
+share/omf/clock/clock-uk.omf
+share/omf/clock/clock-zh_CN.omf
+share/omf/clock/clock-zh_TW.omf
+share/omf/fish/fish-C.omf
+share/omf/fish/fish-ca.omf
+share/omf/fish/fish-el.omf
+share/omf/fish/fish-es.omf
+share/omf/fish/fish-fr.omf
+share/omf/fish/fish-it.omf
+share/omf/fish/fish-ko.omf
+share/omf/fish/fish-oc.omf
+share/omf/fish/fish-sv.omf
+share/omf/fish/fish-uk.omf
+share/omf/gnome-panel/fish-applet-2-de.omf
+share/omf/gnome-panel/fish-applet-2-ja.omf
+share/omf/gnome-panel/fish-applet-2-zh_CN.omf
+share/omf/gnome-panel/fish-applet-2-zh_TW.omf
+share/omf/gnome-panel/window-list-de.omf
+share/omf/gnome-panel/window-list-ja.omf
+share/omf/gnome-panel/window-list-zh_TW.omf
+share/omf/gnome-panel/workspace-switcher-de.omf
+share/omf/gnome-panel/workspace-switcher-ja.omf
+share/omf/gnome-panel/workspace-switcher-zh_CN.omf
+share/omf/gnome-panel/workspace-switcher-zh_TW.omf
+share/omf/window-list/window-list-C.omf
+share/omf/window-list/window-list-ca.omf
+share/omf/window-list/window-list-de.omf
+share/omf/window-list/window-list-el.omf
+share/omf/window-list/window-list-es.omf
+share/omf/window-list/window-list-fr.omf
+share/omf/window-list/window-list-it.omf
+share/omf/window-list/window-list-ko.omf
+share/omf/window-list/window-list-oc.omf
+share/omf/window-list/window-list-pa.omf
+share/omf/window-list/window-list-ru.omf
+share/omf/window-list/window-list-sv.omf
+share/omf/window-list/window-list-uk.omf
+share/omf/window-list/window-list-zh_CN.omf
+share/omf/workspace-switcher/workspace-switcher-C.omf
+share/omf/workspace-switcher/workspace-switcher-ca.omf
+share/omf/workspace-switcher/workspace-switcher-de.omf
+share/omf/workspace-switcher/workspace-switcher-el.omf
+share/omf/workspace-switcher/workspace-switcher-es.omf
+share/omf/workspace-switcher/workspace-switcher-fr.omf
+share/omf/workspace-switcher/workspace-switcher-it.omf
+share/omf/workspace-switcher/workspace-switcher-ko.omf
+share/omf/workspace-switcher/workspace-switcher-nl.omf
+share/omf/workspace-switcher/workspace-switcher-oc.omf
+share/omf/workspace-switcher/workspace-switcher-pa.omf
+share/omf/workspace-switcher/workspace-switcher-ru.omf
+share/omf/workspace-switcher/workspace-switcher-sv.omf
+share/omf/workspace-switcher/workspace-switcher-uk.omf
+share/omf/workspace-switcher/workspace-switcher-vi.omf
+@dirrm share/omf/workspace-switcher
+@dirrm share/omf/window-list
+@dirrm share/omf/gnome-panel
+@dirrm share/omf/fish
+@dirrm share/omf/clock
+@dirrm share/idl/gnome-panel-2.0
 @dirrm share/gnome/help/workspace-switcher/zh_TW/figures
 @dirrm share/gnome/help/workspace-switcher/zh_TW
 @dirrm share/gnome/help/workspace-switcher/zh_CN/figures
 @dirrm share/gnome/help/workspace-switcher/zh_CN
-@dirrm share/gnome/help/workspace-switcher/uk/figures
+@dirrm share/gnome/help/workspace-switcher/vi
 @dirrm share/gnome/help/workspace-switcher/uk
-@dirrm share/gnome/help/workspace-switcher/sv/figures
 @dirrm share/gnome/help/workspace-switcher/sv
-@dirrm share/gnome/help/workspace-switcher/ru/figures
 @dirrm share/gnome/help/workspace-switcher/ru
-@dirrm share/gnome/help/workspace-switcher/pa/figures
 @dirrm share/gnome/help/workspace-switcher/pa
-@dirrm share/gnome/help/workspace-switcher/nl/figures
+@dirrm share/gnome/help/workspace-switcher/oc
 @dirrm share/gnome/help/workspace-switcher/nl
-@dirrm share/gnome/help/workspace-switcher/ko/figures
 @dirrm share/gnome/help/workspace-switcher/ko
 @dirrm share/gnome/help/workspace-switcher/ja/figures
 @dirrm share/gnome/help/workspace-switcher/ja
-@dirrm share/gnome/help/workspace-switcher/it/figures
 @dirrm share/gnome/help/workspace-switcher/it
-@dirrm share/gnome/help/workspace-switcher/fr/figures
 @dirrm share/gnome/help/workspace-switcher/fr
-@dirrm share/gnome/help/workspace-switcher/es/figures
 @dirrm share/gnome/help/workspace-switcher/es
+@dirrm share/gnome/help/workspace-switcher/el
 @dirrm share/gnome/help/workspace-switcher/de/figures
 @dirrm share/gnome/help/workspace-switcher/de
-@dirrm share/gnome/help/workspace-switcher/C/figures
+@dirrm share/gnome/help/workspace-switcher/ca
 @dirrm share/gnome/help/workspace-switcher/C
 @dirrm share/gnome/help/workspace-switcher
 @dirrm share/gnome/help/window-list/zh_TW/figures
 @dirrm share/gnome/help/window-list/zh_TW
-@dirrm share/gnome/help/window-list/zh_CN/figures
 @dirrm share/gnome/help/window-list/zh_CN
-@dirrm share/gnome/help/window-list/uk/figures
 @dirrm share/gnome/help/window-list/uk
-@dirrm share/gnome/help/window-list/sv/figures
 @dirrm share/gnome/help/window-list/sv
-@dirrm share/gnome/help/window-list/ru/figures
 @dirrm share/gnome/help/window-list/ru
-@dirrm share/gnome/help/window-list/pa/figures
 @dirrm share/gnome/help/window-list/pa
-@dirrm share/gnome/help/window-list/ko/figures
+@dirrm share/gnome/help/window-list/oc
 @dirrm share/gnome/help/window-list/ko
 @dirrm share/gnome/help/window-list/ja/figures
 @dirrm share/gnome/help/window-list/ja
-@dirrm share/gnome/help/window-list/it/figures
 @dirrm share/gnome/help/window-list/it
-@dirrm share/gnome/help/window-list/fr/figures
 @dirrm share/gnome/help/window-list/fr
-@dirrm share/gnome/help/window-list/es/figures
 @dirrm share/gnome/help/window-list/es
+@dirrm share/gnome/help/window-list/el
 @dirrm share/gnome/help/window-list/de/figures
 @dirrm share/gnome/help/window-list/de
-@dirrm share/gnome/help/window-list/C/figures
+@dirrm share/gnome/help/window-list/ca
 @dirrm share/gnome/help/window-list/C
 @dirrm share/gnome/help/window-list
 @dirrm share/gnome/help/fish/uk/figures
 @dirrm share/gnome/help/fish/uk
 @dirrm share/gnome/help/fish/sv/figures
 @dirrm share/gnome/help/fish/sv
+@dirrm share/gnome/help/fish/oc/figures
+@dirrm share/gnome/help/fish/oc
+@dirrm share/gnome/help/fish/ko/figures
+@dirrm share/gnome/help/fish/ko
 @dirrm share/gnome/help/fish/it/figures
 @dirrm share/gnome/help/fish/it
 @dirrm share/gnome/help/fish/fr/figures
 @dirrm share/gnome/help/fish/fr
 @dirrm share/gnome/help/fish/es/figures
 @dirrm share/gnome/help/fish/es
+@dirrm share/gnome/help/fish/el/figures
+@dirrm share/gnome/help/fish/el
+@dirrm share/gnome/help/fish/ca/figures
+@dirrm share/gnome/help/fish/ca
 @dirrm share/gnome/help/fish/C/figures
 @dirrm share/gnome/help/fish/C
 @dirrm share/gnome/help/fish-applet-2/zh_TW/figures
 @dirrm share/gnome/help/fish-applet-2/zh_TW
 @dirrm share/gnome/help/fish-applet-2/zh_CN/figures
 @dirrm share/gnome/help/fish-applet-2/zh_CN
-@dirrm share/gnome/help/fish-applet-2/ko/figures
-@dirrm share/gnome/help/fish-applet-2/ko
 @dirrm share/gnome/help/fish-applet-2/ja/figures
 @dirrm share/gnome/help/fish-applet-2/ja
 @dirrm share/gnome/help/fish-applet-2/de/figures
@@ -527,6 +511,8 @@ share/locale/zu/LC_MESSAGES/gnome-panel-2.0.mo
 @dirrm share/gnome/help/clock/ru
 @dirrm share/gnome/help/clock/pa/figures
 @dirrm share/gnome/help/clock/pa
+@dirrm share/gnome/help/clock/oc/figures
+@dirrm share/gnome/help/clock/oc
 @dirrm share/gnome/help/clock/nl/figures
 @dirrm share/gnome/help/clock/nl
 @dirrm share/gnome/help/clock/ko/figures
@@ -539,11 +525,18 @@ share/locale/zu/LC_MESSAGES/gnome-panel-2.0.mo
 @dirrm share/gnome/help/clock/fr
 @dirrm share/gnome/help/clock/es/figures
 @dirrm share/gnome/help/clock/es
+@dirrm share/gnome/help/clock/el/figures
+@dirrm share/gnome/help/clock/el
 @dirrm share/gnome/help/clock/de/figures
 @dirrm share/gnome/help/clock/de
+@dirrm share/gnome/help/clock/ca/figures
+@dirrm share/gnome/help/clock/ca
 @dirrm share/gnome/help/clock/C/figures
 @dirrm share/gnome/help/clock/C
 @dirrm share/gnome/help/clock
+@dirrm %%DATADIR%%/pixmaps
+@dirrm %%DATADIR%%/glade
+@dirrm %%DATADIR%%
 @dirrm include/panel-2.0
 @dirrmtry share/locale/zu/LC_MESSAGES
 @dirrmtry share/locale/zu
@@ -553,10 +546,14 @@ share/locale/zu/LC_MESSAGES/gnome-panel-2.0.mo
 @dirrmtry share/locale/yi
 @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/te/LC_MESSAGES
 @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
@@ -581,3 +578,4 @@ share/locale/zu/LC_MESSAGES/gnome-panel-2.0.mo
 @dirrmtry share/locale/bn_IN
 @dirrmtry share/locale/be@latin/LC_MESSAGES
 @dirrmtry share/locale/be@latin
+@dirrmtry share/applications
diff --git a/x11/gnome-screensaver/Makefile b/x11/gnome-screensaver/Makefile
index 1d1493ea1b23..2f6d1e58a864 100644
--- a/x11/gnome-screensaver/Makefile
+++ b/x11/gnome-screensaver/Makefile
@@ -3,11 +3,11 @@
 # Whom:			Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/x11/gnome-screensaver/Makefile,v 1.71 2007/03/12 21:25:30 marcus Exp $
+#   $MCom: ports/x11/gnome-screensaver/Makefile,v 1.80 2007/09/18 16:46:42 marcus Exp $
 #
 
 PORTNAME=	gnome-screensaver
-PORTVERSION=	2.18.2
+PORTVERSION=	2.20.0
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -28,14 +28,14 @@ USE_GNOME=	gnomeprefix gnomehack intlhack libgnomeui gnomemenus \
 CONFIGURE_ARGS=	--with-gdm-config=${LOCALBASE}/etc/gdm/custom.conf \
 		--with-xscreensaverdir=${XSCREENSAVER_DIR} \
 		--with-xscreensaverhackdir=${LOCALBASE}/bin/xscreensaver-hacks
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 GCONF_SCHEMAS=	gnome-screensaver.schemas
 
 PLIST=	${WRKDIR}/pkg-plist
 
 XSCREENSAVER_DIR=	${LOCALBASE}/share/xscreensaver/config
-SCREENSAVER_DIR=	share/gnome/applications/screensavers
+SCREENSAVER_DIR=	share/applications/screensavers
 
 XSCREENSAVER_EXCLUDE=	"(popsquares.xml)"
 
diff --git a/x11/gnome-screensaver/distinfo b/x11/gnome-screensaver/distinfo
index 3503180103f1..e83e9955e264 100644
--- a/x11/gnome-screensaver/distinfo
+++ b/x11/gnome-screensaver/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-screensaver-2.18.2.tar.bz2) = b5931e1f39c62acee0df1fcf016ddc39
-SHA256 (gnome2/gnome-screensaver-2.18.2.tar.bz2) = 428d67dfbfb9fcc69144133e309093877ed0684a4c44afa1f859424159707f5e
-SIZE (gnome2/gnome-screensaver-2.18.2.tar.bz2) = 2023290
+MD5 (gnome2/gnome-screensaver-2.20.0.tar.bz2) = d166a3ebf69289331b2ebcf5c0187fd9
+SHA256 (gnome2/gnome-screensaver-2.20.0.tar.bz2) = 9ee744058d2c7139634543951a62828b2e1b69fe33cf0b5456737e9c5201dbb9
+SIZE (gnome2/gnome-screensaver-2.20.0.tar.bz2) = 2013842
diff --git a/x11/gnome-screensaver/pkg-plist b/x11/gnome-screensaver/pkg-plist
index bf4bf213dc8f..fd8810021e01 100644
--- a/x11/gnome-screensaver/pkg-plist
+++ b/x11/gnome-screensaver/pkg-plist
@@ -8,24 +8,14 @@ libexec/gnome-screensaver-gl-helper
 libexec/gnome-screensaver/floaters
 libexec/gnome-screensaver/popsquares
 libexec/gnome-screensaver/slideshow
-share/gnome/applications/gnome-screensaver-preferences.desktop
-share/gnome/applications/screensavers/cosmos-slideshow.desktop
-share/gnome/applications/screensavers/footlogo-floaters.desktop
-share/gnome/applications/screensavers/personal-slideshow.desktop
-share/gnome/applications/screensavers/popsquares.desktop
-share/gnome/desktop-directories/gnome-screensaver.directory
-share/gnome/gnome-screensaver/gnome-screensaver-preferences.glade
-share/gnome/gnome-screensaver/lock-dialog-default.glade
-share/gnome/pixmaps/backgrounds/cosmos/cloud.jpg
-share/gnome/pixmaps/backgrounds/cosmos/comet.jpg
-share/gnome/pixmaps/backgrounds/cosmos/earth-horizon.jpg
-share/gnome/pixmaps/backgrounds/cosmos/earthrise.jpg
-share/gnome/pixmaps/backgrounds/cosmos/galaxy-ngc3370.jpg
-share/gnome/pixmaps/backgrounds/cosmos/helix-nebula.jpg
-share/gnome/pixmaps/backgrounds/cosmos/jupiter.jpg
-share/gnome/pixmaps/backgrounds/cosmos/sombrero.jpg
-share/gnome/pixmaps/backgrounds/cosmos/whirlpool.jpg
-share/gnome/pixmaps/gnome-logo-white.svg
+share/applications/gnome-screensaver-preferences.desktop
+share/applications/screensavers/cosmos-slideshow.desktop
+share/applications/screensavers/footlogo-floaters.desktop
+share/applications/screensavers/personal-slideshow.desktop
+share/applications/screensavers/popsquares.desktop
+share/desktop-directories/gnome-screensaver.directory
+%%DATADIR%%/gnome-screensaver-preferences.glade
+%%DATADIR%%/lock-dialog-default.glade
 share/locale/ar/LC_MESSAGES/gnome-screensaver.mo
 share/locale/be@latin/LC_MESSAGES/gnome-screensaver.mo
 share/locale/bg/LC_MESSAGES/gnome-screensaver.mo
@@ -66,12 +56,15 @@ share/locale/mn/LC_MESSAGES/gnome-screensaver.mo
 share/locale/nb/LC_MESSAGES/gnome-screensaver.mo
 share/locale/ne/LC_MESSAGES/gnome-screensaver.mo
 share/locale/nl/LC_MESSAGES/gnome-screensaver.mo
+share/locale/oc/LC_MESSAGES/gnome-screensaver.mo
 share/locale/or/LC_MESSAGES/gnome-screensaver.mo
 share/locale/pa/LC_MESSAGES/gnome-screensaver.mo
 share/locale/pl/LC_MESSAGES/gnome-screensaver.mo
 share/locale/pt/LC_MESSAGES/gnome-screensaver.mo
 share/locale/pt_BR/LC_MESSAGES/gnome-screensaver.mo
+share/locale/ro/LC_MESSAGES/gnome-screensaver.mo
 share/locale/ru/LC_MESSAGES/gnome-screensaver.mo
+share/locale/si/LC_MESSAGES/gnome-screensaver.mo
 share/locale/sk/LC_MESSAGES/gnome-screensaver.mo
 share/locale/sl/LC_MESSAGES/gnome-screensaver.mo
 share/locale/sq/LC_MESSAGES/gnome-screensaver.mo
@@ -79,6 +72,7 @@ share/locale/sr/LC_MESSAGES/gnome-screensaver.mo
 share/locale/sr@Latn/LC_MESSAGES/gnome-screensaver.mo
 share/locale/sv/LC_MESSAGES/gnome-screensaver.mo
 share/locale/ta/LC_MESSAGES/gnome-screensaver.mo
+share/locale/te/LC_MESSAGES/gnome-screensaver.mo
 share/locale/th/LC_MESSAGES/gnome-screensaver.mo
 share/locale/tr/LC_MESSAGES/gnome-screensaver.mo
 share/locale/uk/LC_MESSAGES/gnome-screensaver.mo
@@ -86,12 +80,28 @@ share/locale/vi/LC_MESSAGES/gnome-screensaver.mo
 share/locale/zh_CN/LC_MESSAGES/gnome-screensaver.mo
 share/locale/zh_HK/LC_MESSAGES/gnome-screensaver.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-screensaver.mo
-@dirrm share/gnome/pixmaps/backgrounds/cosmos
-@dirrm share/gnome/pixmaps/backgrounds
-@dirrm share/gnome/gnome-screensaver
+share/pixmaps/backgrounds/cosmos/cloud.jpg
+share/pixmaps/backgrounds/cosmos/comet.jpg
+share/pixmaps/backgrounds/cosmos/earth-horizon.jpg
+share/pixmaps/backgrounds/cosmos/earthrise.jpg
+share/pixmaps/backgrounds/cosmos/galaxy-ngc3370.jpg
+share/pixmaps/backgrounds/cosmos/helix-nebula.jpg
+share/pixmaps/backgrounds/cosmos/jupiter.jpg
+share/pixmaps/backgrounds/cosmos/sombrero.jpg
+share/pixmaps/backgrounds/cosmos/whirlpool.jpg
+share/pixmaps/gnome-logo-white.svg
+@dirrm share/pixmaps/backgrounds/cosmos
+@dirrm share/pixmaps/backgrounds
+@dirrm %%DATADIR%%
 @dirrm libexec/gnome-screensaver
 @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/oc/LC_MESSAGES
+@dirrmtry share/locale/oc
 @dirrmtry share/locale/mg/LC_MESSAGES
 @dirrmtry share/locale/mg
 @dirrmtry share/locale/ku/LC_MESSAGES
@@ -102,3 +112,4 @@ share/locale/zh_TW/LC_MESSAGES/gnome-screensaver.mo
 @dirrmtry share/locale/bn_IN
 @dirrmtry share/locale/be@latin/LC_MESSAGES
 @dirrmtry share/locale/be@latin
+@dirrmtry share/applications
diff --git a/x11/gnome-session/Makefile b/x11/gnome-session/Makefile
index f2e11dfacbe6..ca5af031b52b 100644
--- a/x11/gnome-session/Makefile
+++ b/x11/gnome-session/Makefile
@@ -3,11 +3,12 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/x11/gnome-session/Makefile,v 1.110 2007/03/18 20:55:55 marcus Exp $
+#   $MCom: ports/x11/gnome-session/Makefile,v 1.126 2007/10/19 08:41:21 bland Exp $
 #
 
 PORTNAME=	gnome-session
-PORTVERSION=	2.18.3
+PORTVERSION=	2.20.1
+PORTREVISION=	1
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME} \
 		http://www.marcuscom.com/downloads/:local
@@ -23,7 +24,8 @@ COMMENT=	Session component for the GNOME 2 desktop
 BUILD_DEPENDS=	${LOCALBASE}/libexec/gnome-settings-daemon:${PORTSDIR}/sysutils/gnome-control-center
 LIB_DEPENDS=	dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
 		gnome-keyring.0:${PORTSDIR}/security/gnome-keyring
-RUN_DEPENDS=	${LOCALBASE}/libexec/gnome-settings-daemon:${PORTSDIR}/sysutils/gnome-control-center
+RUN_DEPENDS=	${LOCALBASE}/libexec/gnome-settings-daemon:${PORTSDIR}/sysutils/gnome-control-center \
+		${LOCALBASE}/bin/xdpyinfo:${PORTSDIR}/x11/xdpyinfo
 
 INSTALLS_ICONS=	yes
 USE_GETTEXT=	yes
@@ -48,12 +50,12 @@ post-extract:
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/data/gnome-splash.png \
-		${PREFIX}/share/gnome/pixmaps/splash/original-gnome-splash.png
+		${PREFIX}/share/pixmaps/splash/original-gnome-splash.png
 #	${INSTALL_DATA} ${WRKDIR}/freebsd-splashes-gnome-2.12/domix-splash-2.12.png \
-#		${PREFIX}/share/gnome/pixmaps/splash/gnome-splash.png
+#		${PREFIX}/share/pixmaps/splash/gnome-splash.png
 .for splash in MaMBaNgGaoX-2.12.png adamw-piggy-2.12.png adamw-trophy-2.12.png andreas-slogan-2.12.png andreas-splash-2.12.png domix-splash-2.12.png domix-splash2-2.12.png mumija-2.12.png mumija2-2.12.png mumija3-2.12.png tremulant-2.12.png tremulant-blood-2.12.png tremulant-brushed-metal-2.12.png franz-splash_218.png adamw-bat-2.18.jpg adamw-conky-2.18.png adamw-cow-2.18.png adamw-mouth-2.18.png adamw-swing-2.18.png
 	${INSTALL_DATA} ${WRKDIR}/freebsd-splashes-gnome-2.18/${splash} \
-		${PREFIX}/share/gnome/pixmaps/splash
+		${PREFIX}/share/pixmaps/splash
 .endfor
 
 .include <bsd.port.mk>
diff --git a/x11/gnome-session/distinfo b/x11/gnome-session/distinfo
index 749f1b40a18e..edb41056bac1 100644
--- a/x11/gnome-session/distinfo
+++ b/x11/gnome-session/distinfo
@@ -1,6 +1,6 @@
-MD5 (gnome2/gnome-session-2.18.3.tar.bz2) = 59b6809ed1d8e39c1550217e665c75df
-SHA256 (gnome2/gnome-session-2.18.3.tar.bz2) = 87f8dd9b89953e6bfaad98d1b50fd48517334588d0da9d038218751943dfc10a
-SIZE (gnome2/gnome-session-2.18.3.tar.bz2) = 716092
+MD5 (gnome2/gnome-session-2.20.1.tar.bz2) = 8c9c2940957dc0140a23ef638d23fb35
+SHA256 (gnome2/gnome-session-2.20.1.tar.bz2) = 134d102f7f6dc889158c262488b98c843616fa8aef23ce3aaa923366076a6a29
+SIZE (gnome2/gnome-session-2.20.1.tar.bz2) = 759126
 MD5 (gnome2/freebsd-splashes-gnome-2.18_1.tar) = 80eb8c52fcf9fe977e0bf8ed48b85fe5
 SHA256 (gnome2/freebsd-splashes-gnome-2.18_1.tar) = fcca0f6eb759a4ef0211ecd61340f84ce8ad4d7493f725ac8613724faadbb508
 SIZE (gnome2/freebsd-splashes-gnome-2.18_1.tar) = 1630720
diff --git a/x11/gnome-session/files/patch-data_Makefile.in b/x11/gnome-session/files/patch-data_Makefile.in
index 17d12d395c3b..8fcdd3e2c5e7 100644
--- a/x11/gnome-session/files/patch-data_Makefile.in
+++ b/x11/gnome-session/files/patch-data_Makefile.in
@@ -1,14 +1,5 @@
 --- data/Makefile.in.orig	Sun Jan 28 20:39:50 2007
 +++ data/Makefile.in	Sun Jan 28 20:41:03 2007
-@@ -253,7 +253,7 @@ sharedstatedir = @sharedstatedir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
- SUBDIRS = icons
--defaultdir = $(datadir)/gnome
-+defaultdir = $(datadir)
- default_in_files = default.session.in
- default_DATA = $(default_in_files:.session.in=.session)
- settingsdir = $(datadir)/applications
 @@ -271,7 +271,7 @@ EXTRA_DIST = \
  	session-properties.desktop.in
  
diff --git a/x11/gnome-session/files/patch-gnome-session_Makefile.in b/x11/gnome-session/files/patch-gnome-session_Makefile.in
deleted file mode 100644
index b07ad029e3dd..000000000000
--- a/x11/gnome-session/files/patch-gnome-session_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- gnome-session/Makefile.in.orig	Sun Apr 23 23:01:30 2006
-+++ gnome-session/Makefile.in	Sun Apr 23 23:06:41 2006
-@@ -310,7 +310,7 @@ sharedstatedir = @sharedstatedir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
- NULL = 
--defaultdir = $(datadir)/gnome
-+defaultdir = $(datadir)
- INCLUDES = \
- 	$(GNOME_SESSION_CFLAGS)				\
- 	$(STANDARD_PROPERTIES_CFLAGS)			\
diff --git a/x11/gnome-session/pkg-plist b/x11/gnome-session/pkg-plist
index 7e58bdc56660..d90630fed19f 100644
--- a/x11/gnome-session/pkg-plist
+++ b/x11/gnome-session/pkg-plist
@@ -3,29 +3,8 @@ bin/gnome-session-properties
 bin/gnome-session-remove
 bin/gnome-session-save
 bin/gnome-wm
-share/gnome/applications/session-properties.desktop
+share/applications/session-properties.desktop
 share/gnome/default.session
-share/gnome/pixmaps/splash/MaMBaNgGaoX-2.12.png
-share/gnome/pixmaps/splash/adamw-bat-2.18.jpg
-share/gnome/pixmaps/splash/adamw-conky-2.18.png
-share/gnome/pixmaps/splash/adamw-cow-2.18.png
-share/gnome/pixmaps/splash/adamw-mouth-2.18.png
-share/gnome/pixmaps/splash/adamw-piggy-2.12.png
-share/gnome/pixmaps/splash/adamw-swing-2.18.png
-share/gnome/pixmaps/splash/adamw-trophy-2.12.png
-share/gnome/pixmaps/splash/andreas-slogan-2.12.png
-share/gnome/pixmaps/splash/andreas-splash-2.12.png
-share/gnome/pixmaps/splash/domix-splash-2.12.png
-share/gnome/pixmaps/splash/domix-splash2-2.12.png
-share/gnome/pixmaps/splash/franz-splash_218.png
-share/gnome/pixmaps/splash/gnome-splash.png
-share/gnome/pixmaps/splash/mumija-2.12.png
-share/gnome/pixmaps/splash/mumija2-2.12.png
-share/gnome/pixmaps/splash/mumija3-2.12.png
-share/gnome/pixmaps/splash/original-gnome-splash.png
-share/gnome/pixmaps/splash/tremulant-2.12.png
-share/gnome/pixmaps/splash/tremulant-blood-2.12.png
-share/gnome/pixmaps/splash/tremulant-brushed-metal-2.12.png
 share/icons/hicolor/16x16/apps/session-properties.png
 share/icons/hicolor/22x22/apps/session-properties.png
 share/icons/hicolor/24x24/apps/session-properties.png
@@ -36,6 +15,7 @@ share/locale/am/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/ar/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/az/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/be/LC_MESSAGES/gnome-session-2.0.mo
+share/locale/be@latin/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/bg/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/bn/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/bn_IN/LC_MESSAGES/gnome-session-2.0.mo
@@ -95,6 +75,7 @@ share/locale/pt_BR/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/ro/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/ru/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/rw/LC_MESSAGES/gnome-session-2.0.mo
+share/locale/si/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/sk/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/sl/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/sq/LC_MESSAGES/gnome-session-2.0.mo
@@ -102,6 +83,7 @@ share/locale/sr/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/sr@Latn/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/sv/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/ta/LC_MESSAGES/gnome-session-2.0.mo
+share/locale/te/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/th/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/tk/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/tr/LC_MESSAGES/gnome-session-2.0.mo
@@ -113,12 +95,37 @@ share/locale/zh_CN/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/zh_HK/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/zu/LC_MESSAGES/gnome-session-2.0.mo
+share/pixmaps/splash/MaMBaNgGaoX-2.12.png
+share/pixmaps/splash/adamw-bat-2.18.jpg
+share/pixmaps/splash/adamw-conky-2.18.png
+share/pixmaps/splash/adamw-cow-2.18.png
+share/pixmaps/splash/adamw-mouth-2.18.png
+share/pixmaps/splash/adamw-piggy-2.12.png
+share/pixmaps/splash/adamw-swing-2.18.png
+share/pixmaps/splash/adamw-trophy-2.12.png
+share/pixmaps/splash/andreas-slogan-2.12.png
+share/pixmaps/splash/andreas-splash-2.12.png
+share/pixmaps/splash/domix-splash-2.12.png
+share/pixmaps/splash/domix-splash2-2.12.png
+share/pixmaps/splash/franz-splash_218.png
+share/pixmaps/splash/gnome-splash.png
+share/pixmaps/splash/mumija-2.12.png
+share/pixmaps/splash/mumija2-2.12.png
+share/pixmaps/splash/mumija3-2.12.png
+share/pixmaps/splash/original-gnome-splash.png
+share/pixmaps/splash/tremulant-2.12.png
+share/pixmaps/splash/tremulant-blood-2.12.png
+share/pixmaps/splash/tremulant-brushed-metal-2.12.png
 @dirrmtry share/locale/zu/LC_MESSAGES
 @dirrmtry share/locale/zu
 @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/si/LC_MESSAGES
+@dirrmtry share/locale/si
 @dirrmtry share/locale/rw/LC_MESSAGES
 @dirrmtry share/locale/rw
 @dirrmtry share/locale/oc/LC_MESSAGES
@@ -139,3 +146,6 @@ share/locale/zu/LC_MESSAGES/gnome-session-2.0.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/x11/gnome-terminal/Makefile b/x11/gnome-terminal/Makefile
index 35276e2e5f37..68a3ec1da2ed 100644
--- a/x11/gnome-terminal/Makefile
+++ b/x11/gnome-terminal/Makefile
@@ -3,11 +3,11 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/x11/gnome-terminal/Makefile,v 1.86 2007/03/13 00:46:19 mezz Exp $
+#   $MCom: ports/x11/gnome-terminal/Makefile,v 1.92 2007/09/18 13:06:26 ahze Exp $
 #
 
 PORTNAME=	gnome-terminal
-PORTVERSION=	2.18.1
+PORTVERSION=	2.18.2
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/x11/gnome-terminal/distinfo b/x11/gnome-terminal/distinfo
index a136df8d7b36..eaa330cc1f82 100644
--- a/x11/gnome-terminal/distinfo
+++ b/x11/gnome-terminal/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-terminal-2.18.1.tar.bz2) = c1902cf4727f4cd976d6cc0beb1c03fe
-SHA256 (gnome2/gnome-terminal-2.18.1.tar.bz2) = a66701d5c247c092d9b52ee2209cdb8094f5ce2ab339ee78738ccdb3a0b81cdb
-SIZE (gnome2/gnome-terminal-2.18.1.tar.bz2) = 1995096
+MD5 (gnome2/gnome-terminal-2.18.2.tar.bz2) = a54b010cdeb1e908cad6085bf9de87c4
+SHA256 (gnome2/gnome-terminal-2.18.2.tar.bz2) = f046e938f14aa2ec5cc6db5a85d7ffaf470b3cc233257ca55d2fa7530daa28d1
+SIZE (gnome2/gnome-terminal-2.18.2.tar.bz2) = 2057415
diff --git a/x11/gnome-terminal/pkg-plist b/x11/gnome-terminal/pkg-plist
index cefb430b0f52..f69d5bcef194 100644
--- a/x11/gnome-terminal/pkg-plist
+++ b/x11/gnome-terminal/pkg-plist
@@ -1,7 +1,7 @@
 bin/gnome-terminal
 libdata/bonobo/servers/gnome-terminal.server
-share/gnome/applications/gnome-terminal.desktop
-share/gnome/gnome-terminal/glade/gnome-terminal.glade2
+share/applications/gnome-terminal.desktop
+%%DATADIR%%/glade/gnome-terminal.glade2
 share/gnome/help/gnome-terminal/C/figures/gnome-terminal-default.png
 share/gnome/help/gnome-terminal/C/figures/gnome-terminal-tabbed.png
 share/gnome/help/gnome-terminal/C/gnome-terminal.xml
@@ -11,11 +11,12 @@ share/gnome/help/gnome-terminal/bg/figures/gnome-terminal-tabbed.png
 share/gnome/help/gnome-terminal/bg/figures/terminal_window.png
 share/gnome/help/gnome-terminal/bg/gnome-terminal.xml
 share/gnome/help/gnome-terminal/bg/legal.xml
+share/gnome/help/gnome-terminal/ca/figures/gnome-terminal-default.png
+share/gnome/help/gnome-terminal/ca/figures/gnome-terminal-tabbed.png
+share/gnome/help/gnome-terminal/ca/gnome-terminal.xml
 share/gnome/help/gnome-terminal/de/figures/gnome-terminal-default.png
 share/gnome/help/gnome-terminal/de/figures/gnome-terminal-tabbed.png
-share/gnome/help/gnome-terminal/de/figures/terminal_window.png
 share/gnome/help/gnome-terminal/de/gnome-terminal.xml
-share/gnome/help/gnome-terminal/de/legal.xml
 share/gnome/help/gnome-terminal/es/figures/gnome-terminal-default.png
 share/gnome/help/gnome-terminal/es/figures/gnome-terminal-tabbed.png
 share/gnome/help/gnome-terminal/es/gnome-terminal.xml
@@ -32,9 +33,10 @@ share/gnome/help/gnome-terminal/ja/gnome-terminal.xml
 share/gnome/help/gnome-terminal/ja/legal.xml
 share/gnome/help/gnome-terminal/ko/figures/gnome-terminal-default.png
 share/gnome/help/gnome-terminal/ko/figures/gnome-terminal-tabbed.png
-share/gnome/help/gnome-terminal/ko/figures/terminal_window.png
 share/gnome/help/gnome-terminal/ko/gnome-terminal.xml
-share/gnome/help/gnome-terminal/ko/legal.xml
+share/gnome/help/gnome-terminal/oc/figures/gnome-terminal-default.png
+share/gnome/help/gnome-terminal/oc/figures/gnome-terminal-tabbed.png
+share/gnome/help/gnome-terminal/oc/gnome-terminal.xml
 share/gnome/help/gnome-terminal/ro/figures/gnome-terminal-default.png
 share/gnome/help/gnome-terminal/ro/figures/gnome-terminal-tabbed.png
 share/gnome/help/gnome-terminal/ro/figures/terminal_window.png
@@ -59,23 +61,9 @@ share/gnome/help/gnome-terminal/zh_TW/figures/gnome-terminal-tabbed.png
 share/gnome/help/gnome-terminal/zh_TW/figures/terminal_window.png
 share/gnome/help/gnome-terminal/zh_TW/gnome-terminal.xml
 share/gnome/help/gnome-terminal/zh_TW/legal.xml
-share/gnome/omf/gnome-terminal/gnome-terminal-C.omf
-share/gnome/omf/gnome-terminal/gnome-terminal-bg.omf
-share/gnome/omf/gnome-terminal/gnome-terminal-de.omf
-share/gnome/omf/gnome-terminal/gnome-terminal-es.omf
-share/gnome/omf/gnome-terminal/gnome-terminal-fr.omf
-share/gnome/omf/gnome-terminal/gnome-terminal-it.omf
-share/gnome/omf/gnome-terminal/gnome-terminal-ja.omf
-share/gnome/omf/gnome-terminal/gnome-terminal-ko.omf
-share/gnome/omf/gnome-terminal/gnome-terminal-ro.omf
-share/gnome/omf/gnome-terminal/gnome-terminal-ru.omf
-share/gnome/omf/gnome-terminal/gnome-terminal-sv.omf
-share/gnome/omf/gnome-terminal/gnome-terminal-uk.omf
-share/gnome/omf/gnome-terminal/gnome-terminal-zh_CN.omf
-share/gnome/omf/gnome-terminal/gnome-terminal-zh_TW.omf
-share/gnome/pixmaps/gnome-terminal.png
 share/locale/am/LC_MESSAGES/gnome-terminal.mo
 share/locale/ar/LC_MESSAGES/gnome-terminal.mo
+share/locale/as/LC_MESSAGES/gnome-terminal.mo
 share/locale/az/LC_MESSAGES/gnome-terminal.mo
 share/locale/be/LC_MESSAGES/gnome-terminal.mo
 share/locale/be@latin/LC_MESSAGES/gnome-terminal.mo
@@ -133,6 +121,7 @@ share/locale/pt_BR/LC_MESSAGES/gnome-terminal.mo
 share/locale/ro/LC_MESSAGES/gnome-terminal.mo
 share/locale/ru/LC_MESSAGES/gnome-terminal.mo
 share/locale/rw/LC_MESSAGES/gnome-terminal.mo
+share/locale/si/LC_MESSAGES/gnome-terminal.mo
 share/locale/sk/LC_MESSAGES/gnome-terminal.mo
 share/locale/sl/LC_MESSAGES/gnome-terminal.mo
 share/locale/sq/LC_MESSAGES/gnome-terminal.mo
@@ -149,7 +138,24 @@ share/locale/xh/LC_MESSAGES/gnome-terminal.mo
 share/locale/zh_CN/LC_MESSAGES/gnome-terminal.mo
 share/locale/zh_HK/LC_MESSAGES/gnome-terminal.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-terminal.mo
-@dirrm share/gnome/omf/gnome-terminal
+share/omf/gnome-terminal/gnome-terminal-C.omf
+share/omf/gnome-terminal/gnome-terminal-bg.omf
+share/omf/gnome-terminal/gnome-terminal-ca.omf
+share/omf/gnome-terminal/gnome-terminal-de.omf
+share/omf/gnome-terminal/gnome-terminal-es.omf
+share/omf/gnome-terminal/gnome-terminal-fr.omf
+share/omf/gnome-terminal/gnome-terminal-it.omf
+share/omf/gnome-terminal/gnome-terminal-ja.omf
+share/omf/gnome-terminal/gnome-terminal-ko.omf
+share/omf/gnome-terminal/gnome-terminal-oc.omf
+share/omf/gnome-terminal/gnome-terminal-ro.omf
+share/omf/gnome-terminal/gnome-terminal-ru.omf
+share/omf/gnome-terminal/gnome-terminal-sv.omf
+share/omf/gnome-terminal/gnome-terminal-uk.omf
+share/omf/gnome-terminal/gnome-terminal-zh_CN.omf
+share/omf/gnome-terminal/gnome-terminal-zh_TW.omf
+share/pixmaps/gnome-terminal.png
+@dirrm share/omf/gnome-terminal
 @dirrm share/gnome/help/gnome-terminal/zh_TW/figures
 @dirrm share/gnome/help/gnome-terminal/zh_TW
 @dirrm share/gnome/help/gnome-terminal/zh_CN/figures
@@ -162,6 +168,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-terminal.mo
 @dirrm share/gnome/help/gnome-terminal/ru
 @dirrm share/gnome/help/gnome-terminal/ro/figures
 @dirrm share/gnome/help/gnome-terminal/ro
+@dirrm share/gnome/help/gnome-terminal/oc/figures
+@dirrm share/gnome/help/gnome-terminal/oc
 @dirrm share/gnome/help/gnome-terminal/ko/figures
 @dirrm share/gnome/help/gnome-terminal/ko
 @dirrm share/gnome/help/gnome-terminal/ja/figures
@@ -174,17 +182,21 @@ share/locale/zh_TW/LC_MESSAGES/gnome-terminal.mo
 @dirrm share/gnome/help/gnome-terminal/es
 @dirrm share/gnome/help/gnome-terminal/de/figures
 @dirrm share/gnome/help/gnome-terminal/de
+@dirrm share/gnome/help/gnome-terminal/ca/figures
+@dirrm share/gnome/help/gnome-terminal/ca
 @dirrm share/gnome/help/gnome-terminal/bg/figures
 @dirrm share/gnome/help/gnome-terminal/bg
 @dirrm share/gnome/help/gnome-terminal/C/figures
 @dirrm share/gnome/help/gnome-terminal/C
 @dirrm share/gnome/help/gnome-terminal
-@dirrm share/gnome/gnome-terminal/glade
-@dirrm share/gnome/gnome-terminal
+@dirrm %%DATADIR%%/glade
+@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/si/LC_MESSAGES
+@dirrmtry share/locale/si
 @dirrmtry share/locale/rw/LC_MESSAGES
 @dirrmtry share/locale/rw
 @dirrmtry share/locale/oc/LC_MESSAGES
@@ -203,3 +215,6 @@ share/locale/zh_TW/LC_MESSAGES/gnome-terminal.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
+@dirrmtry share/applications
diff --git a/x11/gnome2-fifth-toe/Makefile b/x11/gnome2-fifth-toe/Makefile
index 82094d0f3d26..73a606a105b9 100644
--- a/x11/gnome2-fifth-toe/Makefile
+++ b/x11/gnome2-fifth-toe/Makefile
@@ -3,7 +3,7 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/x11/gnome2-fifth-toe/Makefile,v 1.83 2007/04/03 01:14:24 ahze Exp $
+#   $MCom: ports/x11/gnome2-fifth-toe/Makefile,v 1.92 2007/10/18 23:45:20 marcus Exp $
 #
 
 PORTREVISION=	0
@@ -21,17 +21,18 @@ RUN_DEPENDS=	pan:${PORTSDIR}/news/pan \
 		pidgin:${PORTSDIR}/net-im/pidgin \
 		tsclient:${PORTSDIR}/net/tsclient \
 		galeon:${PORTSDIR}/www/galeon \
-		${LOCALBASE}/share/gnome/themes/Gorilla/metacity-1/metacity-theme-1.xml:${PORTSDIR}/x11-themes/gnome-themes-extras \
+		${LOCALBASE}/share/icons/Foxtrot/index.theme:${PORTSDIR}/x11-themes/gnome-themes-extras \
 		bluefish:${PORTSDIR}/www/bluefish \
 		gossip:${PORTSDIR}/net-im/gossip \
 		liferea:${PORTSDIR}/net/liferea \
 		gnotime:${PORTSDIR}/deskutils/gnotime \
 		rhythmbox:${PORTSDIR}/audio/rhythmbox \
-		${LOCALBASE}/share/gnome/pixmaps/glines/classic.png:${PORTSDIR}/games/gnome-games-extra-data \
+		${LOCALBASE}/share/pixmaps/glines/classic.png:${PORTSDIR}/games/gnome-games-extra-data \
 		nautilus-sendto:${PORTSDIR}/deskutils/nautilus-sendto \
 		inkscape:${PORTSDIR}/graphics/inkscape \
 		atomix:${PORTSDIR}/games/atomix \
-		straw:${PORTSDIR}/net/straw
+		straw:${PORTSDIR}/net/straw \
+		${LOCALBASE}/share/gnome/help/gdp-handbook/C/builddocs.xml:${PORTSDIR}/misc/gnome-devel-docs
 
 MASTERDIR=	${.CURDIR}/../gnome2
 GNOME_SLAVE=	yes
diff --git a/x11/gnome2-lite/Makefile b/x11/gnome2-lite/Makefile
index c30e821ce096..76509fc2c6bb 100644
--- a/x11/gnome2-lite/Makefile
+++ b/x11/gnome2-lite/Makefile
@@ -3,7 +3,7 @@
 # Whom:			Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/x11/gnome2-lite/Makefile,v 1.54 2007/03/02 15:38:59 ahze Exp $
+#   $MCom: ports/x11/gnome2-lite/Makefile,v 1.60 2007/08/15 17:52:07 mezz Exp $
 #
 
 PORTREVISION=	0
@@ -22,13 +22,13 @@ RUN_DEPENDS=	${LOCALBASE}/libexec/gweather-applet-2:${PORTSDIR}/x11/gnome-applet
 		gnome-system-monitor:${PORTSDIR}/sysutils/gnome-system-monitor \
 		nautilus:${PORTSDIR}/x11-fm/nautilus \
 		${LOCALBASE}/share/gnome/help/user-guide/C/user-guide.xml:${PORTSDIR}/misc/gnome-user-docs \
-		${LOCALBASE}/share/gnome/sounds/question.wav:${PORTSDIR}/audio/gnome-audio \
+		${LOCALBASE}/share/sounds/question.wav:${PORTSDIR}/audio/gnome-audio \
 		file-roller:${PORTSDIR}/archivers/file-roller \
 		${LOCALBASE}/share/themes/HighContrast/gtk-2.0/gtkrc:${PORTSDIR}/x11-themes/gnome-themes \
 		evince:${PORTSDIR}/graphics/evince \
 		gcalctool:${PORTSDIR}/math/gcalctool \
 		gucharmap:${PORTSDIR}/deskutils/gucharmap \
-		${X11BASE}/lib/X11/fonts/bitstream-vera/Vera.ttf:${PORTSDIR}/x11-fonts/bitstream-vera \
+		${LOCALBASE}/lib/X11/fonts/bitstream-vera/Vera.ttf:${PORTSDIR}/x11-fonts/bitstream-vera \
 		gconf-editor:${PORTSDIR}/sysutils/gconf-editor \
 		gnome-control-center:${PORTSDIR}/sysutils/gnome-control-center \
     		gnome-mount:${PORTSDIR}/sysutils/gnome-mount \
diff --git a/x11/gnome2-power-tools/Makefile b/x11/gnome2-power-tools/Makefile
index 3572e8356e81..b9fa5664607c 100644
--- a/x11/gnome2-power-tools/Makefile
+++ b/x11/gnome2-power-tools/Makefile
@@ -3,7 +3,7 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/x11/gnome2-power-tools/Makefile,v 1.76 2007/03/14 21:39:31 marcus Exp $
+#   $MCom: ports/x11/gnome2-power-tools/Makefile,v 1.79 2007/10/18 23:45:20 marcus Exp $
 #
 
 PORTREVISION=	0
@@ -12,7 +12,7 @@ PKGNAMESUFFIX=	-power-tools
 
 COMMENT=	The 'Geektoys' for the GNOME 2 power user
 
-RUN_DEPENDS=	${LOCALBASE}/lib/epiphany/2.18/extensions/libgesturesextension.so:${PORTSDIR}/www/epiphany-extensions \
+RUN_DEPENDS=	${LOCALBASE}/lib/epiphany/2.20/extensions/libgesturesextension.so:${PORTSDIR}/www/epiphany-extensions \
 		gnome-pkgview:${PORTSDIR}/sysutils/gnome-pkgview \
 		${LOCALBASE}/libexec/netspeed_applet2:${PORTSDIR}/net/netspeed_applet \
 		${LOCALBASE}/sbin/gkrellmd:${PORTSDIR}/sysutils/gkrellm2 \
diff --git a/x11/gnome2/Makefile b/x11/gnome2/Makefile
index 8de9418f46af..0762f2f7f850 100644
--- a/x11/gnome2/Makefile
+++ b/x11/gnome2/Makefile
@@ -3,11 +3,11 @@
 # Whom:			Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/x11/gnome2/Makefile,v 1.201 2007/03/14 21:39:30 marcus Exp $
+#   $MCom: ports/x11/gnome2/Makefile,v 1.221 2007/10/18 23:45:19 marcus Exp $
 #
 
 PORTNAME=	gnome2
-PORTVERSION=	2.18.3
+PORTVERSION=	2.20.1
 PORTREVISION?=	0
 CATEGORIES?=	x11 gnome
 MASTER_SITES=	# empty
@@ -31,7 +31,7 @@ RUN_DEPENDS?=	${LOCALBASE}/libexec/gweather-applet-2:${PORTSDIR}/x11/gnome-apple
 		nautilus:${PORTSDIR}/x11-fm/nautilus \
 		${LOCALBASE}/sbin/gdm:${PORTSDIR}/x11/gdm \
 		${LOCALBASE}/share/gnome/help/user-guide/C/user-guide.xml:${PORTSDIR}/misc/gnome-user-docs \
-		${LOCALBASE}/share/gnome/sounds/question.wav:${PORTSDIR}/audio/gnome-audio \
+		${LOCALBASE}/share/sounds/question.wav:${PORTSDIR}/audio/gnome-audio \
 		${LOCALBASE}/libdata/pkgconfig/libgail-gnome.pc:${PORTSDIR}/x11-toolkits/libgail-gnome \
 		file-roller:${PORTSDIR}/archivers/file-roller \
 		${LOCALBASE}/share/themes/HighContrast/gtk-2.0/gtkrc:${PORTSDIR}/x11-themes/gnome-themes \
@@ -40,20 +40,20 @@ RUN_DEPENDS?=	${LOCALBASE}/libexec/gweather-applet-2:${PORTSDIR}/x11/gnome-apple
 		gcalctool:${PORTSDIR}/math/gcalctool \
 		gucharmap:${PORTSDIR}/deskutils/gucharmap \
 		zenity:${PORTSDIR}/x11/zenity \
-		${X11BASE}/lib/X11/fonts/bitstream-vera/Vera.ttf:${PORTSDIR}/x11-fonts/bitstream-vera \
+		${LOCALBASE}/lib/X11/fonts/bitstream-vera/Vera.ttf:${PORTSDIR}/x11-fonts/bitstream-vera \
 		${LOCALBASE}/libexec/gnome-netstatus-applet:${PORTSDIR}/net/gnome-netstatus \
 		dasher:${PORTSDIR}/accessibility/dasher \
-		evolution-2.10:${PORTSDIR}/mail/evolution \
+		evolution:${PORTSDIR}/mail/evolution \
 		${LOCALBASE}/libexec/evolution-webcal:${PORTSDIR}/www/evolution-webcal \
 		network-admin:${PORTSDIR}/sysutils/gnome-system-tools \
 		gnome-nettool:${PORTSDIR}/net/gnome-nettool \
 		vino-session:${PORTSDIR}/net/vino \
-		exchange-connector-setup-2.10:${PORTSDIR}/mail/evolution-exchange \
+		exchange-connector-setup-2.12:${PORTSDIR}/mail/evolution-exchange \
 		${LOCALBASE}/lib/gstreamer-0.10/.gstreamer-plugins-core.keep:${PORTSDIR}/multimedia/gstreamer-plugins-core \
 		${LOCALBASE}/lib/gstreamer-0.10/libgstgconfelements.so:${PORTSDIR}/devel/gstreamer-plugins-gconf \
 		totem:${PORTSDIR}/multimedia/totem \
 		gnome-control-center:${PORTSDIR}/sysutils/gnome-control-center \
-		${LOCALBASE}/share/gnome/gnome-background-properties/gnome-branded.xml:${PORTSDIR}/x11-themes/gnome-backgrounds \
+		${LOCALBASE}/share/gnome-background-properties/gnome-branded.xml:${PORTSDIR}/x11-themes/gnome-backgrounds \
 		sound-juicer:${PORTSDIR}/audio/sound-juicer \
 		gnome-keyring-manager:${PORTSDIR}/security/gnome-keyring-manager \
 		${LOCALBASE}/libdata/pkgconfig/libgtkhtml-2.0.pc:${PORTSDIR}/www/libgtkhtml \
@@ -88,7 +88,7 @@ RUN_DEPENDS+=	yelp:${PORTSDIR}/x11/yelp \
 		epiphany:${PORTSDIR}/www/epiphany
 .endif
 .if ${.CURDIR:T}!="gnome2-lite"
-.if ${ARCH} == "i386" && ${OSVERSION} < 700042
+.if ${ARCH} == "i386"
 RUN_DEPENDS+=	tomboy:${PORTSDIR}/deskutils/tomboy
 .endif
 .if ${OSVERSION}>=600000
@@ -99,7 +99,7 @@ RUN_DEPENDS+=	ekiga:${PORTSDIR}/net/ekiga
 
 .if ${.CURDIR}==${MASTERDIR} || ${.CURDIR:T}=="gnome2-lite"
 .if defined(WITH_XSCREENSAVER)
-RUN_DEPENDS+=	${LOCALBASE}/share/gnome/applications/gnome-screensaver-properties.desktop:${PORTSDIR}/x11/xscreensaver-gnome
+RUN_DEPENDS+=	${LOCALBASE}/share/applications/gnome-screensaver-properties.desktop:${PORTSDIR}/x11/xscreensaver-gnome
 .else
 RUN_DEPENDS+=	gnome-screensaver:${PORTSDIR}/x11/gnome-screensaver
 .endif
diff --git a/x11/gsynaptics/pkg-plist b/x11/gsynaptics/pkg-plist
index 055dee05dfe9..65810d0a7be5 100644
--- a/x11/gsynaptics/pkg-plist
+++ b/x11/gsynaptics/pkg-plist
@@ -9,6 +9,5 @@ share/locale/ja/LC_MESSAGES/gsynaptics.mo
 share/locale/zh_CN/LC_MESSAGES/gsynaptics.mo
 share/locale/zh_TW/LC_MESSAGES/gsynaptics.mo
 share/pixmaps/touchpad.png
-@dirrmtry share/gnome/autostart
 @dirrmtry share/applications
 @dirrm share/gsynaptics
diff --git a/x11/gtstarter/Makefile b/x11/gtstarter/Makefile
index 2f9d41d63b5f..264329475700 100644
--- a/x11/gtstarter/Makefile
+++ b/x11/gtstarter/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gtstarter
-PORTVERSION=	0.4.6.2
-PORTREVISION=	1
+PORTVERSION=	0.4.6.3
 CATEGORIES=	x11 gnome
 MASTER_SITES=	http://webonaut.com/distfiles/${PORTNAME}/
 
@@ -20,7 +19,7 @@ USE_PYTHON=	yes
 USE_GNOME=	pygnome2 pygnomeextras gnomeprefix
 
 do-build:
-	@${REINPLACE_CMD} -e 's|/usr/X11R6|${PREFIX}|g' \
+	@${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|g' \
 		${WRKSRC}/*.py ${WRKSRC}/*.server
 	@${FIND} ${WRKSRC} -name '*.bak' -delete
 	@${FIND} ${WRKSRC} -name '*.orig' -delete
@@ -33,7 +32,7 @@ do-install:
 	@${INSTALL_SCRIPT} ${WRKSRC}/*.py* \
 		${PREFIX}/libexec/${PORTNAME}/
 	@${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.desktop \
-		${PREFIX}/share/gnome/applications/
+		${PREFIX}/share/applications/
 	@${INSTALL_DATA} ${WRKSRC}/*.server \
 		${PREFIX}/libdata/bonobo/servers/
 	@${LN} -sf ${PREFIX}/libexec/${PORTNAME}/${PORTNAME} \
diff --git a/x11/gtstarter/distinfo b/x11/gtstarter/distinfo
index a8cb3c41c45e..3ae279de3f00 100644
--- a/x11/gtstarter/distinfo
+++ b/x11/gtstarter/distinfo
@@ -1,3 +1,3 @@
-MD5 (gtstarter-0.4.6.2.tar.bz2) = 494035fdc7c5bd5049116d05558b704c
-SHA256 (gtstarter-0.4.6.2.tar.bz2) = 4a1d2ffbeb91f1103c654ba23f63594ea3589ca41b1484ca8fe7f48812eed088
-SIZE (gtstarter-0.4.6.2.tar.bz2) = 6168
+MD5 (gtstarter-0.4.6.3.tar.bz2) = 842d36f88da9fdbc1ffba31ee01b7438
+SHA256 (gtstarter-0.4.6.3.tar.bz2) = 2047b5d51312fe58b60d1dc15c01b25db25212a87b34a57c2797057ddffb7363
+SIZE (gtstarter-0.4.6.3.tar.bz2) = 6136
diff --git a/x11/gtstarter/pkg-plist b/x11/gtstarter/pkg-plist
index 223f7f867088..2d60f028675c 100644
--- a/x11/gtstarter/pkg-plist
+++ b/x11/gtstarter/pkg-plist
@@ -5,5 +5,6 @@ libexec/gtstarter/gtstarter_lib.py
 libexec/gtstarter/gtstarter_lib.pyc
 libexec/gtstarter/gtstarter
 libdata/bonobo/servers/GTStarterApplet.server
-share/gnome/applications/gtstarter.desktop
+share/applications/gtstarter.desktop
 @dirrm libexec/gtstarter
+@dirrmtry share/applications
diff --git a/x11/libcapplet/Makefile b/x11/libcapplet/Makefile
index 44281ffe1248..bbfcbbca3c98 100644
--- a/x11/libcapplet/Makefile
+++ b/x11/libcapplet/Makefile
@@ -3,11 +3,12 @@
 # Whom:					Maxim Soboleb <sobomax@FreeBSD.org>
 #
 # $FreeBSD$
-#    $MCom: ports/x11/libcapplet/Makefile,v 1.4 2006/10/07 19:06:46 ahze Exp $
+#    $MCom: ports/x11/libcapplet/Makefile,v 1.7 2007/05/19 21:36:29 marcus Exp $
+#
 
 PORTNAME=	libcapplet
 PORTVERSION=	1.4.0.5
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	x11 gnome
 MASTER_SITES=	http://people.freebsd.org/~sobomax/
 DIST_SUBDIR=	gnome
@@ -35,8 +36,8 @@ do-install:
 	${MKDIR} ${PREFIX}/include/libcapplet1
 	${INSTALL_DATA} ${WRKSRC}/capplet-widget.h \
 		${PREFIX}/include/libcapplet1
-	${MKDIR} ${PREFIX}/share/gnome/idl
-	${INSTALL_DATA} ${WRKSRC}/control-center.idl ${PREFIX}/share/gnome/idl
+	${MKDIR} ${PREFIX}/share/idl
+	${INSTALL_DATA} ${WRKSRC}/control-center.idl ${PREFIX}/share/idl
 	${INSTALL_SCRIPT} ${WRKSRC}/cappletConf.sh ${PREFIX}/etc
 
 .include <bsd.port.post.mk>
diff --git a/x11/libcapplet/pkg-plist b/x11/libcapplet/pkg-plist
index 1f2ac5c47e46..906f23b6cdfc 100644
--- a/x11/libcapplet/pkg-plist
+++ b/x11/libcapplet/pkg-plist
@@ -3,5 +3,5 @@ include/libcapplet1/capplet-widget.h
 lib/libcapplet.a
 lib/libcapplet.so
 lib/libcapplet.so.5
-share/gnome/idl/control-center.idl
+share/idl/control-center.idl
 @dirrm include/libcapplet1
diff --git a/x11/libgnome/Makefile b/x11/libgnome/Makefile
index c623a8e30cd0..cc476664cc1b 100644
--- a/x11/libgnome/Makefile
+++ b/x11/libgnome/Makefile
@@ -3,12 +3,12 @@
 # Whom:					Yukihiro Nakai <Nakai@technologist.com>
 #
 # $FreeBSD$
-#   $MCom: ports/x11/libgnome/Makefile,v 1.100 2007/03/12 15:49:09 ahze Exp $
+#   $MCom: ports/x11/libgnome/Makefile,v 1.110 2007/10/17 21:36:13 mezz Exp $
 #
 
 PORTNAME=	libgnome
-PORTVERSION=	2.18.0
-PORTREVISION?=	2
+PORTVERSION=	2.20.1.1
+PORTREVISION?=	1
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -21,8 +21,8 @@ USE_BZIP2=	yes
 
 .if !defined(REFERENCE_PORT)
 
-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_GETTEXT=	yes
 USE_XPM=	yes
diff --git a/x11/libgnome/distinfo b/x11/libgnome/distinfo
index c9dc30c0be72..0d26b855320a 100644
--- a/x11/libgnome/distinfo
+++ b/x11/libgnome/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/libgnome-2.18.0.tar.bz2) = 73426589d7c6fa3266fe4e8f3be2f5b5
-SHA256 (gnome2/libgnome-2.18.0.tar.bz2) = 53e3b241343c7ea9c4a8db4ca898fd7020c281f1400826d899b841d760dd5ba9
-SIZE (gnome2/libgnome-2.18.0.tar.bz2) = 1082802
+MD5 (gnome2/libgnome-2.20.1.1.tar.bz2) = cfab025a8b9a19cdae1c64f8b005c513
+SHA256 (gnome2/libgnome-2.20.1.1.tar.bz2) = d5b66f1beeefe3b61b654fa4d9c35b642fd73e310da1dd241e0ccb99dc93adec
+SIZE (gnome2/libgnome-2.20.1.1.tar.bz2) = 1370144
diff --git a/x11/libgnome/files/patch-libgnome::Makefile.in b/x11/libgnome/files/patch-libgnome::Makefile.in
index 5a240a06a94c..efac650ba5a4 100644
--- a/x11/libgnome/files/patch-libgnome::Makefile.in
+++ b/x11/libgnome/files/patch-libgnome::Makefile.in
@@ -1,12 +1,11 @@
---- libgnome/Makefile.in.orig	Mon May 31 16:33:14 2004
-+++ libgnome/Makefile.in	Mon May 31 16:33:45 2004
-@@ -211,6 +211,9 @@
+--- libgnome/Makefile.in.orig	Tue May 29 22:16:13 2007
++++ libgnome/Makefile.in	Tue May 29 22:16:58 2007
+@@ -280,6 +280,8 @@
+ LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@
  libgnomeincludedir = $(includedir)/libgnome-2.0/libgnome
- 
  INCLUDES = \
 +	-DPREFIX=\""$(PREFIX)"\"				\
 +	-DLOCALBASE=\""$(LOCALBASE)"\"				\
-+	-DX11BASE=\""$(X11BASE)"\"				\
  	-I..							\
  	-I$(srcdir)/..						\
  	$(WARN_CFLAGS)						\
diff --git a/x11/libgnome/files/patch-libgnome_gnome-program.c b/x11/libgnome/files/patch-libgnome_gnome-program.c
deleted file mode 100644
index 70ecbfd8fce0..000000000000
--- a/x11/libgnome/files/patch-libgnome_gnome-program.c
+++ /dev/null
@@ -1,55 +0,0 @@
---- libgnome/gnome-program.c.orig	Tue Apr  4 06:55:12 2006
-+++ libgnome/gnome-program.c	Mon Apr 10 21:07:02 2006
-@@ -936,17 +936,17 @@ gnome_program_locate_file (GnomeProgram 
- 	attr_rel = "";
- 	break;
-     case GNOME_FILE_DOMAIN_DATADIR:
--	prefix_rel = "/share";
-+	prefix_rel = "/share/gnome";
- 	attr_name = GNOME_PARAM_GNOME_DATADIR;
- 	attr_rel = "";
- 	break;
-     case GNOME_FILE_DOMAIN_SOUND:
--	prefix_rel = "/share/sounds";
-+	prefix_rel = "/share/gnome/sounds";
- 	attr_name = GNOME_PARAM_GNOME_DATADIR;
- 	attr_rel = "/sounds";
- 	break;
-     case GNOME_FILE_DOMAIN_PIXMAP:
--	prefix_rel = "/share/pixmaps";
-+	prefix_rel = "/share/gnome/pixmaps";
- 	attr_name = GNOME_PARAM_GNOME_DATADIR;
- 	attr_rel = "/pixmaps";
- 	break;
-@@ -958,7 +958,7 @@ gnome_program_locate_file (GnomeProgram 
-     case GNOME_FILE_DOMAIN_HELP:
- 	prefix_rel = "/share/gnome/help";
- 	attr_name = GNOME_PARAM_GNOME_DATADIR;
--	attr_rel = "/gnome/help";
-+	attr_rel = "/help";
- 	break;
-     case GNOME_FILE_DOMAIN_APP_LIBDIR:
- 	prefix_rel = "/lib";
-@@ -967,19 +967,19 @@ gnome_program_locate_file (GnomeProgram 
- 	search_path = FALSE;
- 	break;
-     case GNOME_FILE_DOMAIN_APP_DATADIR:
--	prefix_rel = "/share";
-+	prefix_rel = "/share/gnome";
- 	attr_name = GNOME_PARAM_APP_DATADIR;
- 	attr_rel = "";
- 	search_path = FALSE;
- 	break;
-     case GNOME_FILE_DOMAIN_APP_SOUND:
--	prefix_rel = "/share/sounds";
-+	prefix_rel = "/share/gnome/sounds";
- 	attr_name = GNOME_PARAM_APP_DATADIR;
- 	attr_rel = "/sounds";
- 	search_path = FALSE;
- 	break;
-     case GNOME_FILE_DOMAIN_APP_PIXMAP:
--	prefix_rel = "/share/pixmaps";
-+	prefix_rel = "/share/gnome/pixmaps";
- 	attr_name = GNOME_PARAM_APP_DATADIR;
- 	attr_rel = "/pixmaps";
- 	search_path = FALSE;
diff --git a/x11/libgnome/files/pkg-deinstall.in b/x11/libgnome/files/pkg-deinstall.in
index 3cfaf607920c..37c981693b8b 100644
--- a/x11/libgnome/files/pkg-deinstall.in
+++ b/x11/libgnome/files/pkg-deinstall.in
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 # $FreeBSD$
-#   $MCom: ports/x11/libgnome/files/pkg-deinstall.in,v 1.10 2007/02/16 18:14:27 mezz Exp $
+#   $MCom: ports/x11/libgnome/files/pkg-deinstall.in,v 1.12 2007/04/26 14:17:52 ahze Exp $
 #
 # Restore gconf keys of gnomevfs2.
 
diff --git a/x11/libgnome/pkg-plist b/x11/libgnome/pkg-plist
index 1eb129280b30..47b38ad06555 100644
--- a/x11/libgnome/pkg-plist
+++ b/x11/libgnome/pkg-plist
@@ -25,8 +25,10 @@ lib/libgnome-2.so
 lib/libgnome-2.so.0
 libdata/bonobo/servers/GNOME_Moniker_std.server
 libdata/pkgconfig/libgnome-2.0.pc
+share/gnome-background-properties/gnome-default.xml
 share/locale/am/LC_MESSAGES/libgnome-2.0.mo
 share/locale/ar/LC_MESSAGES/libgnome-2.0.mo
+share/locale/as/LC_MESSAGES/libgnome-2.0.mo
 share/locale/az/LC_MESSAGES/libgnome-2.0.mo
 share/locale/be/LC_MESSAGES/libgnome-2.0.mo
 share/locale/bg/LC_MESSAGES/libgnome-2.0.mo
@@ -65,6 +67,7 @@ share/locale/ko/LC_MESSAGES/libgnome-2.0.mo
 share/locale/ku/LC_MESSAGES/libgnome-2.0.mo
 share/locale/lt/LC_MESSAGES/libgnome-2.0.mo
 share/locale/lv/LC_MESSAGES/libgnome-2.0.mo
+share/locale/mg/LC_MESSAGES/libgnome-2.0.mo
 share/locale/mk/LC_MESSAGES/libgnome-2.0.mo
 share/locale/ml/LC_MESSAGES/libgnome-2.0.mo
 share/locale/mn/LC_MESSAGES/libgnome-2.0.mo
@@ -73,6 +76,7 @@ share/locale/nb/LC_MESSAGES/libgnome-2.0.mo
 share/locale/ne/LC_MESSAGES/libgnome-2.0.mo
 share/locale/nl/LC_MESSAGES/libgnome-2.0.mo
 share/locale/nn/LC_MESSAGES/libgnome-2.0.mo
+share/locale/oc/LC_MESSAGES/libgnome-2.0.mo
 share/locale/or/LC_MESSAGES/libgnome-2.0.mo
 share/locale/pa/LC_MESSAGES/libgnome-2.0.mo
 share/locale/pl/LC_MESSAGES/libgnome-2.0.mo
@@ -100,6 +104,10 @@ share/locale/yi/LC_MESSAGES/libgnome-2.0.mo
 share/locale/zh_CN/LC_MESSAGES/libgnome-2.0.mo
 share/locale/zh_HK/LC_MESSAGES/libgnome-2.0.mo
 share/locale/zh_TW/LC_MESSAGES/libgnome-2.0.mo
+share/pixmaps/backgrounds/gnome/background-default.jpg
+@dirrm share/pixmaps/backgrounds/gnome
+@dirrm share/pixmaps/backgrounds
+@dirrmtry share/gnome-background-properties
 @dirrm include/libgnome-2.0/libgnome
 @dirrm include/libgnome-2.0
 @dirrmtry share/locale/zh_HK/LC_MESSAGES
@@ -114,9 +122,15 @@ share/locale/zh_TW/LC_MESSAGES/libgnome-2.0.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/dz/LC_MESSAGES
 @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/x11/libgnomekbd/Makefile b/x11/libgnomekbd/Makefile
index 415a065145b8..85a453f578eb 100644
--- a/x11/libgnomekbd/Makefile
+++ b/x11/libgnomekbd/Makefile
@@ -3,11 +3,11 @@
 # Whom:			Michael Johnson <ahze@FreeBSD.org>
 #
 # $FreeBSD$
-#    $MCom: ports/x11/libgnomekbd/Makefile,v 1.5 2007/03/12 01:37:17 mezz Exp $
+#   $MCom: ports/x11/libgnomekbd/Makefile,v 1.13 2007/09/17 14:06:48 ahze Exp $
 #
 
 PORTNAME=	libgnomekbd
-PORTVERSION=	2.18.2
+PORTVERSION=	2.20.0
 CATEGORIES=	x11 gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -25,8 +25,8 @@ INSTALLS_ICONS=	yes
 USE_GETTEXT=	yes
 USE_LDCONFIG=	yes
 USE_GMAKE=	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=	desktop_gnome_peripherals_keyboard_xkb.schemas
 
diff --git a/x11/libgnomekbd/distinfo b/x11/libgnomekbd/distinfo
index 8d54198cf908..931fde380f27 100644
--- a/x11/libgnomekbd/distinfo
+++ b/x11/libgnomekbd/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/libgnomekbd-2.18.2.tar.bz2) = e99a9f1de689ba3c0ad03fadd55dd3e4
-SHA256 (gnome2/libgnomekbd-2.18.2.tar.bz2) = af7d2135e404564bafa8bb580ed7668098c507f1a4c6385d5d09a2eba02f3799
-SIZE (gnome2/libgnomekbd-2.18.2.tar.bz2) = 359702
+MD5 (gnome2/libgnomekbd-2.20.0.tar.bz2) = 0b495d355e25c3531419cb3996be7e28
+SHA256 (gnome2/libgnomekbd-2.20.0.tar.bz2) = b82310e5d319ac1ba33d008360c4fae128f1b68768f1e51ff1021b60c19a900c
+SIZE (gnome2/libgnomekbd-2.20.0.tar.bz2) = 392206
diff --git a/x11/libgnomekbd/pkg-plist b/x11/libgnomekbd/pkg-plist
index d955958218b3..e198161eecc8 100644
--- a/x11/libgnomekbd/pkg-plist
+++ b/x11/libgnomekbd/pkg-plist
@@ -18,38 +18,59 @@ lib/libgnomekbdui.so
 lib/libgnomekbdui.so.1
 libdata/pkgconfig/libgnomekbd.pc
 libdata/pkgconfig/libgnomekbdui.pc
-share/gnome/applications/gkbd-indicator-plugins-capplet.desktop
-share/gnome/libgnomekbd/glade/gkbd-indicator-plugins.glade
+share/applications/gkbd-indicator-plugins-capplet.desktop
 share/icons/hicolor/48x48/apps/gkbd-indicator-plugins-capplet.png
+%%DATADIR%%/glade/gkbd-indicator-plugins.glade
 share/locale/ar/LC_MESSAGES/libgnomekbd.mo
 share/locale/be@latin/LC_MESSAGES/libgnomekbd.mo
 share/locale/bg/LC_MESSAGES/libgnomekbd.mo
+share/locale/bn_IN/LC_MESSAGES/libgnomekbd.mo
 share/locale/ca/LC_MESSAGES/libgnomekbd.mo
 share/locale/da/LC_MESSAGES/libgnomekbd.mo
+share/locale/de/LC_MESSAGES/libgnomekbd.mo
 share/locale/dz/LC_MESSAGES/libgnomekbd.mo
 share/locale/el/LC_MESSAGES/libgnomekbd.mo
 share/locale/en_GB/LC_MESSAGES/libgnomekbd.mo
 share/locale/es/LC_MESSAGES/libgnomekbd.mo
+share/locale/et/LC_MESSAGES/libgnomekbd.mo
+share/locale/fi/LC_MESSAGES/libgnomekbd.mo
 share/locale/fr/LC_MESSAGES/libgnomekbd.mo
 share/locale/gl/LC_MESSAGES/libgnomekbd.mo
 share/locale/gu/LC_MESSAGES/libgnomekbd.mo
 share/locale/hu/LC_MESSAGES/libgnomekbd.mo
 share/locale/it/LC_MESSAGES/libgnomekbd.mo
 share/locale/ja/LC_MESSAGES/libgnomekbd.mo
+share/locale/ka/LC_MESSAGES/libgnomekbd.mo
 share/locale/ko/LC_MESSAGES/libgnomekbd.mo
 share/locale/lt/LC_MESSAGES/libgnomekbd.mo
 share/locale/mk/LC_MESSAGES/libgnomekbd.mo
 share/locale/nb/LC_MESSAGES/libgnomekbd.mo
+share/locale/nl/LC_MESSAGES/libgnomekbd.mo
+share/locale/oc/LC_MESSAGES/libgnomekbd.mo
+share/locale/or/LC_MESSAGES/libgnomekbd.mo
 share/locale/pa/LC_MESSAGES/libgnomekbd.mo
+share/locale/pl/LC_MESSAGES/libgnomekbd.mo
 share/locale/pt/LC_MESSAGES/libgnomekbd.mo
 share/locale/pt_BR/LC_MESSAGES/libgnomekbd.mo
 share/locale/ru/LC_MESSAGES/libgnomekbd.mo
+share/locale/si/LC_MESSAGES/libgnomekbd.mo
 share/locale/sv/LC_MESSAGES/libgnomekbd.mo
+share/locale/ta/LC_MESSAGES/libgnomekbd.mo
+share/locale/th/LC_MESSAGES/libgnomekbd.mo
 share/locale/uk/LC_MESSAGES/libgnomekbd.mo
-@dirrm share/gnome/libgnomekbd/glade
-@dirrm share/gnome/libgnomekbd
+share/locale/vi/LC_MESSAGES/libgnomekbd.mo
+share/locale/zh_CN/LC_MESSAGES/libgnomekbd.mo
+@dirrm %%DATADIR%%/glade
+@dirrm %%DATADIR%%
 @dirrm include/libgnomekbd
+@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/locale/be@latin/LC_MESSAGES
 @dirrmtry share/locale/be@latin
+@dirrmtry share/applications
diff --git a/x11/libgnomemm26/Makefile b/x11/libgnomemm26/Makefile
index ce58b9f1cde4..6e7db08070b5 100644
--- a/x11/libgnomemm26/Makefile
+++ b/x11/libgnomemm26/Makefile
@@ -3,12 +3,11 @@
 # Whom:                 Alexander Nedotsukov <bland@mail.ru>
 #
 # $FreeBSD$
-#   $MCom: ports/x11/libgnomemm26/Makefile,v 1.12 2007/03/10 05:37:03 marcus Exp $
+#   $MCom: ports/x11/libgnomemm26/Makefile,v 1.14 2007/09/17 03:10:06 marcus Exp $
 #
 
 PORTNAME=	libgnomemm
-PORTVERSION=	2.18.0
-PORTREVISION=	1
+PORTVERSION=	2.20.0
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/x11/libgnomemm26/distinfo b/x11/libgnomemm26/distinfo
index afa6cee74da9..862b17d72c20 100644
--- a/x11/libgnomemm26/distinfo
+++ b/x11/libgnomemm26/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/libgnomemm-2.18.0.tar.bz2) = da6d481fc4a7fb0084d0e48f5c182112
-SHA256 (gnome2/libgnomemm-2.18.0.tar.bz2) = 043a9bedcc55296981934acf19ecfb428bdc1710baaed6c82470ea38f7bca182
-SIZE (gnome2/libgnomemm-2.18.0.tar.bz2) = 252070
+MD5 (gnome2/libgnomemm-2.20.0.tar.bz2) = 6263d15a96c34a73964be37c4e9a261f
+SHA256 (gnome2/libgnomemm-2.20.0.tar.bz2) = 4118936224bec44913e11b6b850ae33512c7aa8fde5524d171fcc7eafe1c5aa8
+SIZE (gnome2/libgnomemm-2.20.0.tar.bz2) = 248837
diff --git a/x11/libxklavier/Makefile b/x11/libxklavier/Makefile
index c66d736635f4..64f69d0c2249 100644
--- a/x11/libxklavier/Makefile
+++ b/x11/libxklavier/Makefile
@@ -3,12 +3,12 @@
 # Whom:					Maxim Sobolev <sobomax@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/x11/libxklavier/Makefile,v 1.32 2007/02/24 21:00:46 mezz Exp $
+#   $MCom: ports/x11/libxklavier/Makefile,v 1.35 2007/09/10 15:36:39 mezz Exp $
 #
 
 PORTNAME=	libxklavier
-PORTVERSION=	3.2
-PORTREVISION=	2
+PORTVERSION=	3.3
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
@@ -25,16 +25,20 @@ USE_GNOME=	gnometarget gnomehack libxml2 glib20
 USE_LDCONFIG=	yes
 USE_GETOPT_LONG=yes
 GNU_CONFIGURE=	yes
-CPPFLAGS+=	-I${LOCALBASE}/include -I${X11BASE}/include
+CPPFLAGS+=	-I${LOCALBASE}/include
 CONFIGURE_ARGS=	--disable-doxygen \
-		--with-xkb-base=${X11BASE}/share/X11/xkb \
-		--with-xkb-bin-base=${X11BASE}/bin \
-		--with-xmodmap-base=${LOCALBASE}/share/gnome/xmodmap \
+		--with-xkb-base=${LOCALBASE}/share/X11/xkb \
+		--with-xkb-bin-base=${LOCALBASE}/bin \
+		--with-xmodmap-base=${LOCALBASE}/share/xmodmap \
 		--disable-gtk-doc \
 		--with-html-dir=${GNOME_HTML_DIR}
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" \
-		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
+		LDFLAGS="-L${LOCALBASE}/lib"
 
 PLIST_SUB=	VERSION=${PORTVERSION}
 
+post-patch:
+	@${REINPLACE_CMD} -e 's|== "yes|= "yes|g' \
+		${WRKSRC}/configure
+
 .include <bsd.port.mk>
diff --git a/x11/libxklavier/distinfo b/x11/libxklavier/distinfo
index 7a05cc44ff13..9c48625aed65 100644
--- a/x11/libxklavier/distinfo
+++ b/x11/libxklavier/distinfo
@@ -1,3 +1,3 @@
-MD5 (libxklavier-3.2.tar.gz) = 8f89a65b2d0aa8f8f5979c7d9de3d051
-SHA256 (libxklavier-3.2.tar.gz) = a82f36b5a7a766e66b46866b81c9a20a23c9de33cc0ee6e2480b560d1e50d942
-SIZE (libxklavier-3.2.tar.gz) = 466656
+MD5 (libxklavier-3.3.tar.gz) = 0b9a62ad4f007e6c42a70a4f6e0aecbf
+SHA256 (libxklavier-3.3.tar.gz) = 050a14ddeda0bbf5c742cb60dee56de48736968d050543fc2e46bcd2e1837870
+SIZE (libxklavier-3.3.tar.gz) = 475629
diff --git a/x11/libxklavier/files/patch-configure b/x11/libxklavier/files/patch-configure
deleted file mode 100644
index d6d10d94182c..000000000000
--- a/x11/libxklavier/files/patch-configure
+++ /dev/null
@@ -1,35 +0,0 @@
---- configure.orig	Sat Nov  4 15:13:39 2006
-+++ configure	Sat Nov  4 15:14:10 2006
-@@ -23045,9 +23045,9 @@ fi
- 
- { echo "$as_me:$LINENO: checking whether at least one libxklavier backend is enabled" >&5
- echo $ECHO_N "checking whether at least one libxklavier backend is enabled... $ECHO_C" >&6; }
--if test \( "$enable_xkb_support" == "yes" -a \
--          "$libxkbfile_present" == "yes" \) -o \
--        "$enable_xmodmap_support" == "yes" ; then
-+if test \( "$enable_xkb_support" = "yes" -a \
-+          "$libxkbfile_present" = "yes" \) -o \
-+        "$enable_xmodmap_support" = "yes" ; then
-   { echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6; }
- else
-@@ -24885,8 +24885,8 @@ fi
- 
- echo '**********************************************************'
- echo '  Libxklavier is configured with the following backends:'
--if test "$enable_xkb_support" == "yes" ; then
--  if test "$libxkbfile_present" == "yes" ; then
-+if test "$enable_xkb_support" = "yes" ; then
-+  if test "$libxkbfile_present" = "yes" ; then
-     echo "    XKB, libxkbfile is present"
-     echo "         default ruleset: $xkb_default_ruleset"
-     echo "         base: $xkb_base"
-@@ -24894,7 +24894,7 @@ if test "$enable_xkb_support" == "yes" ;
-     echo "    XKB, libxkbfile is NOT present"
-   fi
- fi
--if test "$enable_xmodmap_support" == "yes" ; then
-+if test "$enable_xmodmap_support" = "yes" ; then
-   echo "    xmodmap, default ruleset: $xmodmap_default_ruleset"
-   echo "             base: $xmodmap_base"
- fi
diff --git a/x11/libxklavier/pkg-plist b/x11/libxklavier/pkg-plist
index af1dcbcf8cf2..caf0c1705393 100644
--- a/x11/libxklavier/pkg-plist
+++ b/x11/libxklavier/pkg-plist
@@ -1,9 +1,9 @@
-include/libxklavier/xklavier.h
 include/libxklavier/xkl_config_item.h
 include/libxklavier/xkl_config_rec.h
 include/libxklavier/xkl_config_registry.h
 include/libxklavier/xkl_engine.h
 include/libxklavier/xkl_engine_marshal.h
+include/libxklavier/xklavier.h
 lib/libxklavier.a
 lib/libxklavier.la
 lib/libxklavier.so
diff --git a/x11/multi-gnome-terminal/Makefile b/x11/multi-gnome-terminal/Makefile
index 34370c360929..26b49d4103ca 100644
--- a/x11/multi-gnome-terminal/Makefile
+++ b/x11/multi-gnome-terminal/Makefile
@@ -3,11 +3,12 @@
 # Whom:		 	Frederic Dubuy <fdubuy@free.fr>
 #
 # $FreeBSD$
-#    $MCom: ports/x11/multi-gnome-terminal/Makefile,v 1.1 2006/10/04 20:27:01 ahze Exp $
+#   $MCom: ports/x11/multi-gnome-terminal/Makefile,v 1.3 2007/08/07 03:43:51 mezz Exp $
+#
 
 PORTNAME=	multi-gnome-terminal
 PORTVERSION=	1.6.2
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
 MASTER_SITE_SUBDIR=	multignometerm
@@ -29,6 +30,6 @@ post-patch:
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/pixmaps/multignometerm.png \
-		${PREFIX}/share/gnome/pixmaps/multignometerm.png
+		${PREFIX}/share/pixmaps/multignometerm.png
 
 .include <bsd.port.mk>
diff --git a/x11/multi-gnome-terminal/pkg-plist b/x11/multi-gnome-terminal/pkg-plist
index 8b23fd5565c0..0340f8f07d0e 100644
--- a/x11/multi-gnome-terminal/pkg-plist
+++ b/x11/multi-gnome-terminal/pkg-plist
@@ -137,35 +137,35 @@ share/gnome/help/multi-gnome-terminal/no/stylesheet-images/toc-plus.gif
 share/gnome/help/multi-gnome-terminal/no/stylesheet-images/up.gif
 share/gnome/help/multi-gnome-terminal/no/stylesheet-images/warning.gif
 share/gnome/help/multi-gnome-terminal/no/topic.dat
-share/gnome/idl/MultiTerminal.idl
-share/gnome/mgt/glade/edit_cmd.glade
-share/gnome/mgt/glade/multi-gnome-terminal.glade
-share/gnome/mgt/glade/search.glade
-share/gnome/mgt/glade/win_keys.glade
-share/gnome/mgt/glade/win_prefs.glade
-share/gnome/omf/mgt/multi-gnome-terminal-C.omf
-share/gnome/pixmaps/mgt/MGT_bb_back.png
-share/gnome/pixmaps/mgt/MGT_bb_forward.png
-share/gnome/pixmaps/mgt/MGT_bb_newshell.png
-share/gnome/pixmaps/mgt/MGT_bb_remove.png
-share/gnome/pixmaps/mgt/MGT_bb_title.png
-share/gnome/pixmaps/mgt/MGT_tb_back.png
-share/gnome/pixmaps/mgt/MGT_tb_forward.png
-share/gnome/pixmaps/mgt/MGT_tb_newmc.png
-share/gnome/pixmaps/mgt/MGT_tb_newroot.png
-share/gnome/pixmaps/mgt/MGT_tb_newshell.png
-share/gnome/pixmaps/mgt/MGT_tb_remove.png
-share/gnome/pixmaps/mgt/MGT_tb_title.png
-share/gnome/pixmaps/mgt/arrow_left2.png
-share/gnome/pixmaps/mgt/arrow_right2.png
-share/gnome/pixmaps/mgt/gnome-notepad.png
-share/gnome/pixmaps/mgt/multignometerm.png
-share/gnome/pixmaps/mgt/panel-folder.png
-share/gnome/pixmaps/multignometerm.png
-@dirrm share/gnome/pixmaps/mgt
-@dirrm share/gnome/omf/mgt
-@dirrm share/gnome/mgt/glade
-@dirrm share/gnome/mgt
+share/idl/MultiTerminal.idl
+share/mgt/glade/edit_cmd.glade
+share/mgt/glade/multi-gnome-terminal.glade
+share/mgt/glade/search.glade
+share/mgt/glade/win_keys.glade
+share/mgt/glade/win_prefs.glade
+share/omf/mgt/multi-gnome-terminal-C.omf
+share/pixmaps/mgt/MGT_bb_back.png
+share/pixmaps/mgt/MGT_bb_forward.png
+share/pixmaps/mgt/MGT_bb_newshell.png
+share/pixmaps/mgt/MGT_bb_remove.png
+share/pixmaps/mgt/MGT_bb_title.png
+share/pixmaps/mgt/MGT_tb_back.png
+share/pixmaps/mgt/MGT_tb_forward.png
+share/pixmaps/mgt/MGT_tb_newmc.png
+share/pixmaps/mgt/MGT_tb_newroot.png
+share/pixmaps/mgt/MGT_tb_newshell.png
+share/pixmaps/mgt/MGT_tb_remove.png
+share/pixmaps/mgt/MGT_tb_title.png
+share/pixmaps/mgt/arrow_left2.png
+share/pixmaps/mgt/arrow_right2.png
+share/pixmaps/mgt/gnome-notepad.png
+share/pixmaps/mgt/multignometerm.png
+share/pixmaps/mgt/panel-folder.png
+share/pixmaps/multignometerm.png
+@dirrm share/pixmaps/mgt
+@dirrm share/omf/mgt
+@dirrm share/mgt/glade
+@dirrm share/mgt
 @dirrm share/gnome/help/multi-gnome-terminal/no/stylesheet-images
 @dirrm share/gnome/help/multi-gnome-terminal/no/figures
 @dirrm share/gnome/help/multi-gnome-terminal/no
diff --git a/x11/ruby-gnome2/Makefile b/x11/ruby-gnome2/Makefile
index 867ab8647c92..baa7bca5f216 100644
--- a/x11/ruby-gnome2/Makefile
+++ b/x11/ruby-gnome2/Makefile
@@ -3,7 +3,7 @@
 # Whom:			Akinori MUSHA aka knu <knu@idaemons.org>
 #
 # $FreeBSD$
-#   $MCom: ports/x11/ruby-gnome2/Makefile,v 1.2 2005/10/17 07:05:42 mezz Exp $
+#   $MCom: ports/x11/ruby-gnome2/Makefile,v 1.6 2007/10/05 05:12:56 mezz Exp $
 #
 
 PORTNAME=	gnome2
diff --git a/x11/ruby-gnome2/Makefile.common b/x11/ruby-gnome2/Makefile.common
index 594d00c334d5..922d24482b3a 100644
--- a/x11/ruby-gnome2/Makefile.common
+++ b/x11/ruby-gnome2/Makefile.common
@@ -1,14 +1,17 @@
 # $FreeBSD$
 
-RUBY_GNOME_VERSION=		0.16.0
+RUBY_GNOME_VERSION=		0.16.0.20071004 #YYYYMMDD
 #RUBY_GNOME_SNAPSHOTDATE=	20061130
 .if defined(RUBY_GNOME_SNAPSHOTDATE)
 RUBY_GNOME_PORTVERSION=		${RUBY_GNOME_VERSION}.${RUBY_GNOME_SNAPSHOTDATE}
 .else
 RUBY_GNOME_PORTVERSION=		${RUBY_GNOME_VERSION}
 .endif
-RUBY_GNOME_MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-RUBY_GNOME_MASTER_SITE_SUBDIR=	ruby-gnome2
+#RUBY_GNOME_MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+#RUBY_GNOME_MASTER_SITE_SUBDIR=	ruby-gnome2
+RUBY_GNOME_MASTER_SITES=	${MASTER_SITE_LOCAL} \
+				http://people.freebsd.org/~mezz/distfiles/
+RUBY_GNOME_MASTER_SITE_SUBDIR=	mezz
 RUBY_GNOME_DISTNAME=		ruby-gnome2-all-${RUBY_GNOME_VERSION:S/r/rev/}
 
 CONFIGURE_ARGS+=		--ruby=${RUBY}
diff --git a/x11/ruby-gnome2/distinfo b/x11/ruby-gnome2/distinfo
index b1981b93f7dc..e206847bea11 100644
--- a/x11/ruby-gnome2/distinfo
+++ b/x11/ruby-gnome2/distinfo
@@ -1,3 +1,3 @@
-MD5 (ruby/ruby-gnome2-all-0.16.0.tar.gz) = b3b4f81ef0fe2ce6b3f965bb7c6d3686
-SHA256 (ruby/ruby-gnome2-all-0.16.0.tar.gz) = 0910f08c5224bc39aad66c46b506e5c97e260475ede6b427d5365a9ef2d69ad4
-SIZE (ruby/ruby-gnome2-all-0.16.0.tar.gz) = 1208856
+MD5 (ruby/ruby-gnome2-all-0.16.0.20071004.tar.gz) = ebc465e0a27c3f8f78bdb3d08dc50379
+SHA256 (ruby/ruby-gnome2-all-0.16.0.20071004.tar.gz) = 62d346af997a8bd071c13a1c9ff2232dea02569caf1656880b8abd843ba7d58e
+SIZE (ruby/ruby-gnome2-all-0.16.0.20071004.tar.gz) = 1346048
diff --git a/x11/trayer/Makefile b/x11/trayer/Makefile
index 6feb85453241..c510461a7cc6 100644
--- a/x11/trayer/Makefile
+++ b/x11/trayer/Makefile
@@ -3,6 +3,7 @@
 # Whom:         Alexey Mikhailov <karma@ez.pereslavl.ru>
 #
 # $FreeBSD$
+#
 
 PORTNAME=	trayer
 PORTVERSION=	1.0
@@ -29,6 +30,10 @@ PORTDOCS=	README CREDITS CHANGELOG
 
 PLIST_FILES=	bin/trayer
 
+post-patch:
+	@${REINPLACE_CMD} -e 's|-D.*_DISABLE_DEPRECATED||g' \
+		${WRKSRC}/Makefile.common
+
 post-install:
 	${MKDIR} ${DOCSDIR}
 .if !defined(NOPORTDOCS)
@@ -36,4 +41,5 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
 .endfor
 .endif
+
 .include <bsd.port.mk>
diff --git a/x11/workrave/Makefile b/x11/workrave/Makefile
index d737119f4e98..205ecb72b172 100644
--- a/x11/workrave/Makefile
+++ b/x11/workrave/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	workrave
 PORTVERSION=	1.8.5
+PORTREVISION=	1
 CATEGORIES=	x11 gnome
 MASTER_SITES=	SF
 
diff --git a/x11/workrave/pkg-plist b/x11/workrave/pkg-plist
index eb35165fb597..c4f6560436e6 100644
--- a/x11/workrave/pkg-plist
+++ b/x11/workrave/pkg-plist
@@ -3,60 +3,60 @@ etc/sound/events/workrave.soundlist
 %%GNOME%%libdata/bonobo/servers/Workrave-Applet.server
 %%GNOME%%libdata/bonobo/servers/Workrave-Control.server
 %%GNOME%%libexec/workrave-applet
-%%GNOME%%share/gnome/gnome-2.0/ui/GNOME_WorkraveApplet.xml
-share/gnome/pixmaps/workrave/workrave-icon-huge.png
-share/gnome/sounds/workrave/break-ignored.wav
-share/gnome/sounds/workrave/break-prelude.wav
-share/gnome/sounds/workrave/daily-limit.wav
-share/gnome/sounds/workrave/exercise-ended.wav
-share/gnome/sounds/workrave/exercises-ended.wav
-share/gnome/sounds/workrave/micro-break-ended.wav
-share/gnome/sounds/workrave/micro-break-started.wav
-share/gnome/sounds/workrave/rest-break-ended.wav
-share/gnome/sounds/workrave/rest-break-started.wav
-share/gnome/workrave/exercises/backward-shoulder-stretch.png
-share/gnome/workrave/exercises/chair-pushup-1.png
-share/gnome/workrave/exercises/chair-pushup-2.png
-share/gnome/workrave/exercises/depth-focus-1.png
-share/gnome/workrave/exercises/depth-focus-2.png
-share/gnome/workrave/exercises/exercises.xml
-share/gnome/workrave/exercises/eye-darkness.png
-share/gnome/workrave/exercises/finger-stretch-1.png
-share/gnome/workrave/exercises/finger-stretch-2.png
-share/gnome/workrave/exercises/fist-roll-1.png
-share/gnome/workrave/exercises/fist-roll-2.png
-share/gnome/workrave/exercises/monitor-border-1.png
-share/gnome/workrave/exercises/monitor-border-2.png
-share/gnome/workrave/exercises/monitor-border-3.png
-share/gnome/workrave/exercises/monitor-border-4.png
-share/gnome/workrave/exercises/neck-tilt-stretch-1.png
-share/gnome/workrave/exercises/neck-tilt-stretch-2.png
-share/gnome/workrave/exercises/rotate-arm.png
-share/gnome/workrave/exercises/shoulder-arm-stretch.png
-share/gnome/workrave/exercises/turn-head-1.png
-share/gnome/workrave/exercises/turn-head-2.png
-share/gnome/workrave/exercises/wrist-lower-arm-desk-stretch-1.png
-share/gnome/workrave/images/daily-limit.png
-share/gnome/workrave/images/display.png
-share/gnome/workrave/images/lock.png
-share/gnome/workrave/images/micro-break.png
-share/gnome/workrave/images/monitoring.png
-share/gnome/workrave/images/network.png
-share/gnome/workrave/images/prelude-hint-sad.png
-share/gnome/workrave/images/prelude-hint.png
-share/gnome/workrave/images/rest-break.png
-share/gnome/workrave/images/shutdown.png
-share/gnome/workrave/images/time.png
-share/gnome/workrave/images/timer-daily.png
-share/gnome/workrave/images/timer-micro-break.png
-share/gnome/workrave/images/timer-rest-break.png
-share/gnome/workrave/images/workrave-icon-huge.png
-share/gnome/workrave/images/workrave-icon-large.png
-share/gnome/workrave/images/workrave-icon-medium.png
-share/gnome/workrave/images/workrave-icon-small.png
-share/gnome/workrave/images/workrave-quiet-icon-medium.png
-share/gnome/workrave/images/workrave-suspended-icon-medium.png
-share/gnome/workrave/images/workrave.png
+%%GNOME%%share/gnome-2.0/ui/GNOME_WorkraveApplet.xml
+share/pixmaps/workrave/workrave-icon-huge.png
+share/sounds/workrave/break-ignored.wav
+share/sounds/workrave/break-prelude.wav
+share/sounds/workrave/daily-limit.wav
+share/sounds/workrave/exercise-ended.wav
+share/sounds/workrave/exercises-ended.wav
+share/sounds/workrave/micro-break-ended.wav
+share/sounds/workrave/micro-break-started.wav
+share/sounds/workrave/rest-break-ended.wav
+share/sounds/workrave/rest-break-started.wav
+share/workrave/exercises/backward-shoulder-stretch.png
+share/workrave/exercises/chair-pushup-1.png
+share/workrave/exercises/chair-pushup-2.png
+share/workrave/exercises/depth-focus-1.png
+share/workrave/exercises/depth-focus-2.png
+share/workrave/exercises/exercises.xml
+share/workrave/exercises/eye-darkness.png
+share/workrave/exercises/finger-stretch-1.png
+share/workrave/exercises/finger-stretch-2.png
+share/workrave/exercises/fist-roll-1.png
+share/workrave/exercises/fist-roll-2.png
+share/workrave/exercises/monitor-border-1.png
+share/workrave/exercises/monitor-border-2.png
+share/workrave/exercises/monitor-border-3.png
+share/workrave/exercises/monitor-border-4.png
+share/workrave/exercises/neck-tilt-stretch-1.png
+share/workrave/exercises/neck-tilt-stretch-2.png
+share/workrave/exercises/rotate-arm.png
+share/workrave/exercises/shoulder-arm-stretch.png
+share/workrave/exercises/turn-head-1.png
+share/workrave/exercises/turn-head-2.png
+share/workrave/exercises/wrist-lower-arm-desk-stretch-1.png
+share/workrave/images/daily-limit.png
+share/workrave/images/display.png
+share/workrave/images/lock.png
+share/workrave/images/micro-break.png
+share/workrave/images/monitoring.png
+share/workrave/images/network.png
+share/workrave/images/prelude-hint-sad.png
+share/workrave/images/prelude-hint.png
+share/workrave/images/rest-break.png
+share/workrave/images/shutdown.png
+share/workrave/images/time.png
+share/workrave/images/timer-daily.png
+share/workrave/images/timer-micro-break.png
+share/workrave/images/timer-rest-break.png
+share/workrave/images/workrave-icon-huge.png
+share/workrave/images/workrave-icon-large.png
+share/workrave/images/workrave-icon-medium.png
+share/workrave/images/workrave-icon-small.png
+share/workrave/images/workrave-quiet-icon-medium.png
+share/workrave/images/workrave-suspended-icon-medium.png
+share/workrave/images/workrave.png
 %%NLS%%share/locale/bg/LC_MESSAGES/workrave.mo
 %%NLS%%share/locale/ca/LC_MESSAGES/workrave.mo
 %%NLS%%share/locale/cs/LC_MESSAGES/workrave.mo
@@ -83,8 +83,8 @@ share/gnome/workrave/images/workrave.png
 %%NLS%%share/locale/tr/LC_MESSAGES/workrave.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/workrave.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/workrave.mo
-@dirrm share/gnome/workrave/images
-@dirrm share/gnome/workrave/exercises
-@dirrm share/gnome/workrave
-@dirrm share/gnome/sounds/workrave
-@dirrm share/gnome/pixmaps/workrave
+@dirrm share/workrave/images
+@dirrm share/workrave/exercises
+@dirrm share/workrave
+@dirrm share/sounds/workrave
+@dirrm share/pixmaps/workrave
diff --git a/x11/xscreensaver-gnome/Makefile b/x11/xscreensaver-gnome/Makefile
index 0182dc861001..12ae2dc840fc 100644
--- a/x11/xscreensaver-gnome/Makefile
+++ b/x11/xscreensaver-gnome/Makefile
@@ -3,11 +3,12 @@
 # Whom:					Ade Lovett <ade@FreeBSD.org>
 #
 # $FreeBSD$
-#    $MCom: ports/x11/xscreensaver-gnome/Makefile,v 1.2 2006/10/07 19:20:33 ahze Exp $
+#   $MCom: ports/x11/xscreensaver-gnome/Makefile,v 1.5 2007/08/15 18:29:16 mezz Exp $
+#
 
 PORTNAME?=	xscreensaver-gnome
 PORTVERSION=	4.24
-PORTREVISION?=	5
+PORTREVISION?=	6
 CATEGORIES=	x11 gnome
 MASTER_SITES=	http://www.jwz.org/xscreensaver/
 DISTNAME=	xscreensaver-${PORTVERSION}
@@ -96,7 +97,7 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|
||' \
 		${WRKSRC}/hacks/glx/klein.c
 	@${REINPLACE_CMD} -E -e 's|^[[:space:]]*GL_LIBS="${PTHREAD_LIBS}"|#|g ; \
-		s|/usr/X11R6|${X11BASE}|g' \
+		s|/usr/X11R6|${LOCALBASE}|g' \
 		${WRKSRC}/configure
 	@${REINPLACE_CMD}  -e 's|<util.h>|<libutil.h>|' \
 		${WRKSRC}/hacks/phosphor.c ${WRKSRC}/hacks/apple2-main.c
diff --git a/x11/xscreensaver-gnome/files/patch-ab b/x11/xscreensaver-gnome/files/patch-ab
index 5e896db2d49b..dce689cd2cbf 100644
--- a/x11/xscreensaver-gnome/files/patch-ab
+++ b/x11/xscreensaver-gnome/files/patch-ab
@@ -9,12 +9,3 @@
      OBJCC="$OBJCC -Wall"
      # supposedly gcc 3.4 will have "-Wdeclaration-after-statement"
      # and then perhaps we can do without -pedantic?
-@@ -14516,7 +14516,7 @@
-   GTK_DATADIR=""
-   if test "$have_gtk" = yes; then
-     GTK_DATADIR=`$pkg_config --variable=prefix gtk+-2.0`
--    GTK_DATADIR="$GTK_DATADIR/share"
-+    GTK_DATADIR="$GTK_DATADIR/share/gnome"
-   fi
- 
-   if test "$have_gtk" = yes; then
diff --git a/x11/xscreensaver-gnome/pkg-plist b/x11/xscreensaver-gnome/pkg-plist
index 58871d231409..0e309bef1bbd 100644
--- a/x11/xscreensaver-gnome/pkg-plist
+++ b/x11/xscreensaver-gnome/pkg-plist
@@ -211,15 +211,15 @@ bin/xscreensaver-hacks/xsublim
 bin/xscreensaver-hacks/xteevee
 bin/xscreensaver-hacks/zoom
 bin/xscreensaver-text
-share/gnome/applications/gnome-screensaver-properties.desktop
-share/gnome/pixmaps/xscreensaver.xpm
-share/gnome/xscreensaver/glade/screensaver-cmndln.png
-share/gnome/xscreensaver/glade/screensaver-colorselector.png
-share/gnome/xscreensaver/glade/screensaver-diagnostic.png
-share/gnome/xscreensaver/glade/screensaver-locking.png
-share/gnome/xscreensaver/glade/screensaver-power.png
-share/gnome/xscreensaver/glade/screensaver-snap.png
-share/gnome/xscreensaver/glade/xscreensaver-demo.glade2
+share/applications/gnome-screensaver-properties.desktop
+share/pixmaps/xscreensaver.xpm
+share/xscreensaver/glade/screensaver-cmndln.png
+share/xscreensaver/glade/screensaver-colorselector.png
+share/xscreensaver/glade/screensaver-diagnostic.png
+share/xscreensaver/glade/screensaver-locking.png
+share/xscreensaver/glade/screensaver-power.png
+share/xscreensaver/glade/screensaver-snap.png
+share/xscreensaver/glade/xscreensaver-demo.glade2
 share/locale/ca/LC_MESSAGES/xscreensaver.mo
 share/locale/da/LC_MESSAGES/xscreensaver.mo
 share/locale/de/LC_MESSAGES/xscreensaver.mo
@@ -449,8 +449,9 @@ share/xscreensaver/config/xteevee.xml
 share/xscreensaver/config/zoom.xml
 @dirrm share/xscreensaver/config
 @dirrm share/xscreensaver
-@dirrm share/gnome/xscreensaver/glade
-@dirrm share/gnome/xscreensaver
+@dirrm share/xscreensaver/glade
+@dirrm share/xscreensaver
 @dirrm bin/xscreensaver-hacks
-@cwd %%X11BASE%%
+@cwd %%LOCALBASE%%
 lib/X11/app-defaults/XScreenSaver
+@dirrmtry share/applications
diff --git a/x11/xscreensaver-kde/Makefile b/x11/xscreensaver-kde/Makefile
index 2c0b71b8cc39..673e6e5c49ce 100644
--- a/x11/xscreensaver-kde/Makefile
+++ b/x11/xscreensaver-kde/Makefile
@@ -34,7 +34,7 @@ LDCONFIG_DIRS+=	%%PREFIX%%/lib %%PREFIX%%/lib/kde3
 .include "${.CURDIR}/../../x11/kde3/Makefile.kde"
 .include <bsd.port.pre.mk>
 
-.if exists(${LOCALBASE}/share/gnome/applications/gnome-screensaver-properties.desktop)
+.if exists(${LOCALBASE}/share/applications/gnome-screensaver-properties.desktop)
 WITH_XSGNOME=	yes
 .elif exists(${LOCALBASE}/bin/screensaver)
 WITH_XSGNOME=	yes
@@ -48,8 +48,8 @@ RUN_DEPENDS+=	xscreensaver:${PORTSDIR}/x11/xscreensaver
 .endif # defined(WITH_XS)
 
 .if defined(WITH_XSGNOME)
-BUILD_DEPENDS+=	${LOCALBASE}/share/gnome/applications/gnome-screensaver-properties.desktop:${PORTSDIR}/x11/xscreensaver-gnome
-RUN_DEPENDS+=	${LOCALBASE}/share/gnome/applications/gnome-screensaver-properties.desktop:${PORTSDIR}/x11/xscreensaver-gnome
+BUILD_DEPENDS+=	${LOCALBASE}/share/applications/gnome-screensaver-properties.desktop:${PORTSDIR}/x11/xscreensaver-gnome
+RUN_DEPENDS+=	${LOCALBASE}/share/applications/gnome-screensaver-properties.desktop:${PORTSDIR}/x11/xscreensaver-gnome
 .endif # defined(WITH_XSGNOME)
 
 pre-configure:
diff --git a/x11/yelp/Makefile b/x11/yelp/Makefile
index b014892f06f4..c32be1a305ea 100644
--- a/x11/yelp/Makefile
+++ b/x11/yelp/Makefile
@@ -3,12 +3,11 @@
 # Whom:					Maxim Sobolev <sobomax@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/x11/yelp/Makefile,v 1.110 2007/03/14 17:45:40 marcus Exp $
+#   $MCom: ports/x11/yelp/Makefile,v 1.117 2007/09/18 16:50:09 marcus Exp $
 #
 
 PORTNAME=	yelp
-PORTVERSION=	2.18.1
-PORTREVISION=	1
+PORTVERSION=	2.20.0
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -17,7 +16,8 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	A help browser for the GNOME 2 desktop
 
-LIB_DEPENDS=	dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
+LIB_DEPENDS=	dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
+    		rarian.0:${PORTSDIR}/textproc/rarian
 
 USE_GECKO=	firefox xulrunner firefox-devel<->firefox
 USE_GETTEXT=	yes
diff --git a/x11/yelp/distinfo b/x11/yelp/distinfo
index b906d1dba010..4d65e16ff4f2 100644
--- a/x11/yelp/distinfo
+++ b/x11/yelp/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/yelp-2.18.1.tar.bz2) = 84abbfe7e042706cbf21752957e29bf3
-SHA256 (gnome2/yelp-2.18.1.tar.bz2) = 3add75de19550015a526a875bca66be81f73910561f1a84493d76d990717d1fa
-SIZE (gnome2/yelp-2.18.1.tar.bz2) = 900142
+MD5 (gnome2/yelp-2.20.0.tar.bz2) = 8902618c343093b1c64ee6d647ec41ed
+SHA256 (gnome2/yelp-2.20.0.tar.bz2) = 0f4e1c5f3c4bf8d5109794b4d0a340ed847d49381d42968beb405f14b68c61ed
+SIZE (gnome2/yelp-2.20.0.tar.bz2) = 903106
diff --git a/x11/yelp/pkg-plist b/x11/yelp/pkg-plist
index c2846177fdc2..9d5800d0c26b 100644
--- a/x11/yelp/pkg-plist
+++ b/x11/yelp/pkg-plist
@@ -1,39 +1,40 @@
 bin/gnome-help
 bin/yelp
-share/gnome/applications/yelp.desktop
-share/gnome/yelp/default.css
-share/gnome/yelp/icons/yelp-icon-caution.png
-share/gnome/yelp/icons/yelp-icon-important.png
-share/gnome/yelp/icons/yelp-icon-note.png
-share/gnome/yelp/icons/yelp-icon-tip.png
-share/gnome/yelp/icons/yelp-icon-warning.png
-share/gnome/yelp/icons/yelp-watermark-blockquote-00AB.png
-share/gnome/yelp/icons/yelp-watermark-blockquote-00BB.png
-share/gnome/yelp/icons/yelp-watermark-blockquote-201C.png
-share/gnome/yelp/icons/yelp-watermark-blockquote-201D.png
-share/gnome/yelp/icons/yelp-watermark-blockquote-201E.png
-share/gnome/yelp/important_docs.xml
-share/gnome/yelp/info.xml
-share/gnome/yelp/man.xml
-share/gnome/yelp/scrollkeeper.xml
-share/gnome/yelp/toc.xml
-share/gnome/yelp/ui/yelp-search-ui.xml
-share/gnome/yelp/ui/yelp-ui.xml
-share/gnome/yelp/ui/yelp.glade
-share/gnome/yelp/xslt/db-title.xsl
-share/gnome/yelp/xslt/db2html.xsl
-share/gnome/yelp/xslt/info2html.xsl
-share/gnome/yelp/xslt/man2html.xsl
-share/gnome/yelp/xslt/search2html.xsl
-share/gnome/yelp/xslt/toc2html.xsl
-share/gnome/yelp/xslt/yelp-common.xsl
-share/gnome/yelp/yelp.js
+share/applications/yelp.desktop
+share/yelp/default.css
+share/yelp/icons/yelp-icon-caution.png
+share/yelp/icons/yelp-icon-important.png
+share/yelp/icons/yelp-icon-note.png
+share/yelp/icons/yelp-icon-tip.png
+share/yelp/icons/yelp-icon-warning.png
+share/yelp/icons/yelp-watermark-blockquote-00AB.png
+share/yelp/icons/yelp-watermark-blockquote-00BB.png
+share/yelp/icons/yelp-watermark-blockquote-201C.png
+share/yelp/icons/yelp-watermark-blockquote-201D.png
+share/yelp/icons/yelp-watermark-blockquote-201E.png
+share/yelp/important_docs.xml
+share/yelp/info.xml
+share/yelp/man.xml
+share/yelp/scrollkeeper.xml
+share/yelp/toc.xml
+share/yelp/ui/yelp-search-ui.xml
+share/yelp/ui/yelp-ui.xml
+share/yelp/ui/yelp.glade
+share/yelp/xslt/db-title.xsl
+share/yelp/xslt/db2html.xsl
+share/yelp/xslt/info2html.xsl
+share/yelp/xslt/man2html.xsl
+share/yelp/xslt/search2html.xsl
+share/yelp/xslt/toc2html.xsl
+share/yelp/xslt/yelp-common.xsl
+share/yelp/yelp.js
 share/icons/hicolor/192x192/apps/yelp-icon-big.png
 share/locale/af/LC_MESSAGES/yelp.mo
 share/locale/am/LC_MESSAGES/yelp.mo
 share/locale/ar/LC_MESSAGES/yelp.mo
 share/locale/az/LC_MESSAGES/yelp.mo
 share/locale/be/LC_MESSAGES/yelp.mo
+share/locale/be@latin/LC_MESSAGES/yelp.mo
 share/locale/bg/LC_MESSAGES/yelp.mo
 share/locale/bn/LC_MESSAGES/yelp.mo
 share/locale/bn_IN/LC_MESSAGES/yelp.mo
@@ -86,6 +87,7 @@ share/locale/ne/LC_MESSAGES/yelp.mo
 share/locale/nl/LC_MESSAGES/yelp.mo
 share/locale/nn/LC_MESSAGES/yelp.mo
 share/locale/nso/LC_MESSAGES/yelp.mo
+share/locale/oc/LC_MESSAGES/yelp.mo
 share/locale/or/LC_MESSAGES/yelp.mo
 share/locale/pa/LC_MESSAGES/yelp.mo
 share/locale/pl/LC_MESSAGES/yelp.mo
@@ -94,6 +96,7 @@ share/locale/pt_BR/LC_MESSAGES/yelp.mo
 share/locale/ro/LC_MESSAGES/yelp.mo
 share/locale/ru/LC_MESSAGES/yelp.mo
 share/locale/rw/LC_MESSAGES/yelp.mo
+share/locale/si/LC_MESSAGES/yelp.mo
 share/locale/sk/LC_MESSAGES/yelp.mo
 share/locale/sl/LC_MESSAGES/yelp.mo
 share/locale/sq/LC_MESSAGES/yelp.mo
@@ -101,6 +104,7 @@ share/locale/sr/LC_MESSAGES/yelp.mo
 share/locale/sr@Latn/LC_MESSAGES/yelp.mo
 share/locale/sv/LC_MESSAGES/yelp.mo
 share/locale/ta/LC_MESSAGES/yelp.mo
+share/locale/te/LC_MESSAGES/yelp.mo
 share/locale/tg/LC_MESSAGES/yelp.mo
 share/locale/th/LC_MESSAGES/yelp.mo
 share/locale/tr/LC_MESSAGES/yelp.mo
@@ -113,10 +117,10 @@ share/locale/zh_CN/LC_MESSAGES/yelp.mo
 share/locale/zh_HK/LC_MESSAGES/yelp.mo
 share/locale/zh_TW/LC_MESSAGES/yelp.mo
 share/locale/zu/LC_MESSAGES/yelp.mo
-@dirrm share/gnome/yelp/xslt
-@dirrm share/gnome/yelp/ui
-@dirrm share/gnome/yelp/icons
-@dirrm share/gnome/yelp
+@dirrm share/yelp/xslt
+@dirrm share/yelp/ui
+@dirrm share/yelp/icons
+@dirrm share/yelp
 @dirrmtry share/locale/zu/LC_MESSAGES
 @dirrmtry share/locale/zu
 @dirrmtry share/locale/zh_HK/LC_MESSAGES
@@ -125,8 +129,14 @@ share/locale/zu/LC_MESSAGES/yelp.mo
 @dirrmtry share/locale/xh
 @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/nso/LC_MESSAGES
 @dirrmtry share/locale/nso
 @dirrmtry share/locale/nds@NFE/LC_MESSAGES
@@ -143,3 +153,6 @@ share/locale/zu/LC_MESSAGES/yelp.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/x11/zenity/Makefile b/x11/zenity/Makefile
index c8727ca30603..a4bd361d41d0 100644
--- a/x11/zenity/Makefile
+++ b/x11/zenity/Makefile
@@ -3,11 +3,11 @@
 # Whom:					Franz Klammer <klammer@webonaut.com>
 #
 # $FreeBSD$
-#   $MCom: ports/x11/zenity/Makefile,v 1.77 2007/03/11 19:58:27 mezz Exp $
+#   $MCom: ports/x11/zenity/Makefile,v 1.87 2007/09/17 20:34:06 ahze Exp $
 #
 
 PORTNAME=	zenity
-PORTVERSION=	2.18.2
+PORTVERSION=	2.20.0
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -16,8 +16,8 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Display GNOME dialogs from the command line
 
-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_XLIB=	yes
 USE_GMAKE=	yes
@@ -33,8 +33,4 @@ MAN1=		zenity.1
 
 CONFLICTS=	gtkada-1.2.*
 
-pre-configure:
-	@${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} ${REINPLACE_CMD} -e \
-		's|@DATADIRNAME@|share|'
-
 .include <bsd.port.mk>
diff --git a/x11/zenity/distinfo b/x11/zenity/distinfo
index 782940456e59..b33e0c475830 100644
--- a/x11/zenity/distinfo
+++ b/x11/zenity/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/zenity-2.18.2.tar.bz2) = 6eb60cebdfddd7f9ad302d0b5477382e
-SHA256 (gnome2/zenity-2.18.2.tar.bz2) = 6cef03198402125dfe56591c1db1f6e95075b9e4cb9e5ff3ac8e05ae38008813
-SIZE (gnome2/zenity-2.18.2.tar.bz2) = 1752871
+MD5 (gnome2/zenity-2.20.0.tar.bz2) = 64992cdbb38c9f8ea8cd9ea07c1dfc38
+SHA256 (gnome2/zenity-2.20.0.tar.bz2) = 811a27ef5ed951ceb4874f8d19a5a79a0c9802571822cc342e706839768b2ac1
+SIZE (gnome2/zenity-2.20.0.tar.bz2) = 1787052
diff --git a/x11/zenity/pkg-plist b/x11/zenity/pkg-plist
index 32293545e64c..8082156fb76f 100644
--- a/x11/zenity/pkg-plist
+++ b/x11/zenity/pkg-plist
@@ -25,6 +25,18 @@ share/gnome/help/zenity/bg/figures/zenity-question-screenshot.png
 share/gnome/help/zenity/bg/figures/zenity-text-screenshot.png
 share/gnome/help/zenity/bg/figures/zenity-warning-screenshot.png
 share/gnome/help/zenity/bg/zenity.xml
+share/gnome/help/zenity/en_GB/figures/zenity-calendar-screenshot.png
+share/gnome/help/zenity/en_GB/figures/zenity-entry-screenshot.png
+share/gnome/help/zenity/en_GB/figures/zenity-error-screenshot.png
+share/gnome/help/zenity/en_GB/figures/zenity-fileselection-screenshot.png
+share/gnome/help/zenity/en_GB/figures/zenity-information-screenshot.png
+share/gnome/help/zenity/en_GB/figures/zenity-list-screenshot.png
+share/gnome/help/zenity/en_GB/figures/zenity-notification-screenshot.png
+share/gnome/help/zenity/en_GB/figures/zenity-progress-screenshot.png
+share/gnome/help/zenity/en_GB/figures/zenity-question-screenshot.png
+share/gnome/help/zenity/en_GB/figures/zenity-text-screenshot.png
+share/gnome/help/zenity/en_GB/figures/zenity-warning-screenshot.png
+share/gnome/help/zenity/en_GB/zenity.xml
 share/gnome/help/zenity/es/figures/zenity-calendar-screenshot.png
 share/gnome/help/zenity/es/figures/zenity-entry-screenshot.png
 share/gnome/help/zenity/es/figures/zenity-error-screenshot.png
@@ -49,6 +61,18 @@ share/gnome/help/zenity/fr/figures/zenity-question-screenshot.png
 share/gnome/help/zenity/fr/figures/zenity-text-screenshot.png
 share/gnome/help/zenity/fr/figures/zenity-warning-screenshot.png
 share/gnome/help/zenity/fr/zenity.xml
+share/gnome/help/zenity/oc/figures/zenity-calendar-screenshot.png
+share/gnome/help/zenity/oc/figures/zenity-entry-screenshot.png
+share/gnome/help/zenity/oc/figures/zenity-error-screenshot.png
+share/gnome/help/zenity/oc/figures/zenity-fileselection-screenshot.png
+share/gnome/help/zenity/oc/figures/zenity-information-screenshot.png
+share/gnome/help/zenity/oc/figures/zenity-list-screenshot.png
+share/gnome/help/zenity/oc/figures/zenity-notification-screenshot.png
+share/gnome/help/zenity/oc/figures/zenity-progress-screenshot.png
+share/gnome/help/zenity/oc/figures/zenity-question-screenshot.png
+share/gnome/help/zenity/oc/figures/zenity-text-screenshot.png
+share/gnome/help/zenity/oc/figures/zenity-warning-screenshot.png
+share/gnome/help/zenity/oc/zenity.xml
 share/gnome/help/zenity/ru/figures/zenity-calendar-screenshot.png
 share/gnome/help/zenity/ru/figures/zenity-entry-screenshot.png
 share/gnome/help/zenity/ru/figures/zenity-error-screenshot.png
@@ -85,28 +109,6 @@ share/gnome/help/zenity/uk/figures/zenity-question-screenshot.png
 share/gnome/help/zenity/uk/figures/zenity-text-screenshot.png
 share/gnome/help/zenity/uk/figures/zenity-warning-screenshot.png
 share/gnome/help/zenity/uk/zenity.xml
-share/gnome/omf/zenity/zenity-C.omf
-share/gnome/omf/zenity/zenity-bg.omf
-share/gnome/omf/zenity/zenity-es.omf
-share/gnome/omf/zenity/zenity-fr.omf
-share/gnome/omf/zenity/zenity-ru.omf
-share/gnome/omf/zenity/zenity-sv.omf
-share/gnome/omf/zenity/zenity-uk.omf
-share/gnome/zenity/clothes/gnome-tshirt.png
-share/gnome/zenity/clothes/hawaii-shirt.png
-share/gnome/zenity/clothes/monk.png
-share/gnome/zenity/clothes/sunglasses.png
-share/gnome/zenity/clothes/surfboard.png
-share/gnome/zenity/zenity-calendar.png
-share/gnome/zenity/zenity-entry.png
-share/gnome/zenity/zenity-file.png
-share/gnome/zenity/zenity-list.png
-share/gnome/zenity/zenity-notification.png
-share/gnome/zenity/zenity-progress.png
-share/gnome/zenity/zenity-scale.png
-share/gnome/zenity/zenity-text.png
-share/gnome/zenity/zenity.glade
-share/gnome/zenity/zenity.png
 share/locale/am/LC_MESSAGES/zenity.mo
 share/locale/ar/LC_MESSAGES/zenity.mo
 share/locale/az/LC_MESSAGES/zenity.mo
@@ -157,6 +159,7 @@ share/locale/nb/LC_MESSAGES/zenity.mo
 share/locale/ne/LC_MESSAGES/zenity.mo
 share/locale/nl/LC_MESSAGES/zenity.mo
 share/locale/nn/LC_MESSAGES/zenity.mo
+share/locale/oc/LC_MESSAGES/zenity.mo
 share/locale/or/LC_MESSAGES/zenity.mo
 share/locale/pa/LC_MESSAGES/zenity.mo
 share/locale/pl/LC_MESSAGES/zenity.mo
@@ -181,19 +184,47 @@ share/locale/xh/LC_MESSAGES/zenity.mo
 share/locale/zh_CN/LC_MESSAGES/zenity.mo
 share/locale/zh_HK/LC_MESSAGES/zenity.mo
 share/locale/zh_TW/LC_MESSAGES/zenity.mo
-@dirrm share/gnome/zenity/clothes
-@dirrm share/gnome/zenity
-@dirrm share/gnome/omf/zenity
+share/omf/zenity/zenity-C.omf
+share/omf/zenity/zenity-bg.omf
+share/omf/zenity/zenity-en_GB.omf
+share/omf/zenity/zenity-es.omf
+share/omf/zenity/zenity-fr.omf
+share/omf/zenity/zenity-oc.omf
+share/omf/zenity/zenity-ru.omf
+share/omf/zenity/zenity-sv.omf
+share/omf/zenity/zenity-uk.omf
+%%DATADIR%%/clothes/gnome-tshirt.png
+%%DATADIR%%/clothes/hawaii-shirt.png
+%%DATADIR%%/clothes/monk.png
+%%DATADIR%%/clothes/sunglasses.png
+%%DATADIR%%/clothes/surfboard.png
+%%DATADIR%%/zenity-calendar.png
+%%DATADIR%%/zenity-entry.png
+%%DATADIR%%/zenity-file.png
+%%DATADIR%%/zenity-list.png
+%%DATADIR%%/zenity-notification.png
+%%DATADIR%%/zenity-progress.png
+%%DATADIR%%/zenity-scale.png
+%%DATADIR%%/zenity-text.png
+%%DATADIR%%/zenity.glade
+%%DATADIR%%/zenity.png
+@dirrm %%DATADIR%%/clothes
+@dirrm %%DATADIR%%
+@dirrm share/omf/zenity
 @dirrm share/gnome/help/zenity/uk/figures
 @dirrm share/gnome/help/zenity/uk
 @dirrm share/gnome/help/zenity/sv/figures
 @dirrm share/gnome/help/zenity/sv
 @dirrm share/gnome/help/zenity/ru/figures
 @dirrm share/gnome/help/zenity/ru
+@dirrm share/gnome/help/zenity/oc/figures
+@dirrm share/gnome/help/zenity/oc
 @dirrm share/gnome/help/zenity/fr/figures
 @dirrm share/gnome/help/zenity/fr
 @dirrm share/gnome/help/zenity/es/figures
 @dirrm share/gnome/help/zenity/es
+@dirrm share/gnome/help/zenity/en_GB/figures
+@dirrm share/gnome/help/zenity/en_GB
 @dirrm share/gnome/help/zenity/bg/figures
 @dirrm share/gnome/help/zenity/bg
 @dirrm share/gnome/help/zenity/C/figures
@@ -207,6 +238,8 @@ share/locale/zh_TW/LC_MESSAGES/zenity.mo
 @dirrmtry share/locale/ug
 @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