Update Xfce to 4.12.0.

This is a very large change, and incorporates the 4.8, 4.10, and 4.12 major
Xfce releases since 4.6.2, our previous pkgsrc release.  For more information
about the thousands of changes in each major release since then, please see:

  Xfce 4.12 announcement:
    http://www.xfce.org/about/news

  Xfce 4.12 tour:
    http://www.xfce.org/about/tour

  Xfce 4.10 announcement:
    http://www.xfce.org/about/news/?post=1335571200

  Xfce 4.10 tour:
    http://www.xfce.org/about/tour410

  Xfce 4.8 announcement:
    http://www.xfce.org/about/news/?post=1295136000

  Xfce 4.8 tour:
    http://www.xfce.org/about/tour48

The pkgsrc changes since then are:

  New packages:
    archivers/xfce4-thunar-archive
    graphics/elementary-xfce-icon-theme
    mail/xfce4-mailwatch-plugin
    misc/xfce4-time-out-plugin
    multimedia/xfce4-thunar-media-tags
    sysutils/xfce4-mount-plugin
    sysutils/xfce4-taskmanager
    sysutils/xfce4-thunar-vcs
    sysutils/xfce4-verve-plugin
    x11/xfce4-garcon
    x11/xfce4-notifyd
    x11/xfce4-tumbler
    x11/xfce4-whiskermenu-plugin

  Renamed packages:
    devel/xfconf to devel/xfce4-conf
    x11/libxfce4menu to x11/libxfce4ui
    x11/xfce4-screenshooter-plugin to x11/xfce4-screenshooter

  Updated packages:
    audio/xfce4-mixer
    audio/xfce4-xmms-plugin
    devel/xfce4-dev-tools
    editors/xfce4-mousepad
    graphics/ristretto
    meta-pkgs/xfce4-extras
    meta-pkgs/xfce4
    misc/xfce4-weather-plugin
    multimedia/xfce4-mpc-plugin
    net/xfce4-wavelan-plugin
    sysutils/xfce4-appfinder
    sysutils/xfce4-battery-plugin
    sysutils/xfce4-cpugraph-plugin
    sysutils/xfce4-diskperf-plugin
    sysutils/xfce4-fsguard-plugin
    sysutils/xfce4-genmon-plugin
    sysutils/xfce4-netload-plugin
    sysutils/xfce4-quicklauncher-plugin
    sysutils/xfce4-systemload-plugin
    sysutils/xfce4-thunar
    sysutils/xfce4-xarchiver
    sysutils/xfce4-xkb-plugin
    textproc/xfce4-dict-plugin
    time/xfce4-datetime-plugin
    time/xfce4-orage
    time/xfce4-timer-plugin
    wm/xfce4-wm-themes
    wm/xfce4-wm
    x11/libxfce4gui
    x11/libxfce4util
    x11/xfce4-clipman-plugin
    x11/xfce4-desktop
    x11/xfce4-exo
    x11/xfce4-eyes-plugin
    x11/xfce4-gtk2-engine
    x11/xfce4-notes-plugin
    x11/xfce4-panel
    x11/xfce4-places-plugin
    x11/xfce4-session
    x11/xfce4-settings
    x11/xfce4-terminal

  Removed packages:
    sysutils/xfce4-volman
    x11/xfce4-utils

This is based on a huge amount of work by the NetBSDfr team and Youri Mouton,
who takes over as MAINTAINER, and has been tested by Youri on a large number
of platforms prior to commit.  A massive thanks to them.  Any issues with the
import are mine alone as the committer-by-proxy.

9 files changed, 199 insertions, 345 deletions

diff --git a/x11/xfce4-exo/Makefile b/x11/xfce4-exo/Makefile
index 2d8734b650b..41a0f63789f 100644
--- a/x11/xfce4-exo/Makefile
+++ b/x11/xfce4-exo/Makefile
@@ -1,42 +1,30 @@
-# $NetBSD: Makefile,v 1.37 2014/05/29 23:38:20 wiz Exp $
+# $NetBSD: Makefile,v 1.38 2015/04/21 08:56:44 jperkin Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
-XFCE4_VERSION=	0.3.101
-
-DISTNAME=	exo-${XFCE4_VERSION}
-PKGNAME=	xfce4-exo-${XFCE4_VERSION}
-PKGREVISION=	26
+VERSION=	0.10.4
+DISTNAME=	exo-${VERSION}
+PKGNAME=	xfce4-exo-${VERSION}
 CATEGORIES=	x11
+MASTER_SITES=	http://archive.xfce.org/src/xfce/exo/0.10/
+
+HOMEPAGE=	http://docs.xfce.org/xfce/exo/start
 COMMENT=	Xfce extension library
 
-DEPENDS+=	p5-URI>=0:../../www/p5-URI
+USE_TOOLS+=		perl:run
+REPLACE_PERL=		exo-helper/helpers/exo-compose-mail-1
 
-PKGCONFIG_OVERRIDE+=	exo/exo-0.3.pc.in exo-hal/exo-hal-0.3.pc.in
+DEPENDS+=	p5-URI>=0:../../www/p5-URI
 
-CONFIGURE_ARGS+=	--disable-python
-
-USE_TOOLS+=		perl:run
-REPLACE_PERL+=		exo-helper/helpers/exo-compose-mail-0.3
+PKGCONFIG_OVERRIDE+=	exo/exo-1.pc.in
 
 PKG_SYSCONFSUBDIR=	xdg/xfce4
 EGDIR=			${XFCE4_EGBASE}
 
-MAKE_DIRS+=	${SYSCONFDIR}
-MAKE_DIRS+=	${EGDIR} ${PREFIX}/share/xfce4 ${PREFIX}/share/xfce4/doc
-.for f in C es fr id ja pt_BR tr
-MAKE_DIRS+=	${PREFIX}/share/xfce4/doc/${f}
-MAKE_DIRS+=	${PREFIX}/share/xfce4/doc/${f}/images
-.endfor
-
 CONF_FILES=		${EGDIR}/helpers.rc ${PKG_SYSCONFDIR}/helpers.rc
 OWN_DIRS+=		${EGDIR}
 
-.include "options.mk"
-
-.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
-.include "../../sysutils/libnotify/buildlink3.mk"
-.include "../../x11/libxfce4util/buildlink3.mk"
-.include "../../mk/pthread.buildlink3.mk"
+.include "../../x11/libxfce4ui/buildlink3.mk"
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xfce4-exo/PLIST b/x11/xfce4-exo/PLIST
index e7a41b371f7..0d5ec234704 100644
--- a/x11/xfce4-exo/PLIST
+++ b/x11/xfce4-exo/PLIST
@@ -1,188 +1,161 @@
-@comment $NetBSD: PLIST,v 1.7 2010/01/24 20:00:06 gls Exp $
+@comment $NetBSD: PLIST,v 1.8 2015/04/21 08:56:44 jperkin Exp $
 bin/exo-csource
 bin/exo-desktop-item-edit
-bin/exo-eject
-bin/exo-mount
 bin/exo-open
 bin/exo-preferred-applications
-bin/exo-unmount
-include/exo-0.3/exo-hal/exo-hal.h
-include/exo-0.3/exo/exo-binding.h
-include/exo-0.3/exo/exo-cell-renderer-ellipsized-text.h
-include/exo-0.3/exo/exo-cell-renderer-icon.h
-include/exo-0.3/exo/exo-config.h
-include/exo-0.3/exo/exo-ellipsized-label.h
-include/exo-0.3/exo/exo-enum-types.h
-include/exo-0.3/exo/exo-execute.h
-include/exo-0.3/exo/exo-gdk-pixbuf-extensions.h
-include/exo-0.3/exo/exo-gobject-extensions.h
-include/exo-0.3/exo/exo-gtk-extensions.h
-include/exo-0.3/exo/exo-icon-bar.h
-include/exo-0.3/exo/exo-icon-chooser-dialog.h
-include/exo-0.3/exo/exo-icon-view.h
-include/exo-0.3/exo/exo-md5.h
-include/exo-0.3/exo/exo-mount-point.h
-include/exo-0.3/exo/exo-pango-extensions.h
-include/exo-0.3/exo/exo-string.h
-include/exo-0.3/exo/exo-toolbars-editor-dialog.h
-include/exo-0.3/exo/exo-toolbars-editor.h
-include/exo-0.3/exo/exo-toolbars-model.h
-include/exo-0.3/exo/exo-toolbars-view.h
-include/exo-0.3/exo/exo-tree-view.h
-include/exo-0.3/exo/exo-url.h
-include/exo-0.3/exo/exo-utils.h
-include/exo-0.3/exo/exo-wrap-table.h
-include/exo-0.3/exo/exo-xsession-client.h
-include/exo-0.3/exo/exo.h
-lib/libexo-0.3.la
-lib/libexo-hal-0.3.la
-lib/pkgconfig/exo-0.3.pc
-lib/pkgconfig/exo-hal-0.3.pc
-libexec/exo-compose-mail-0.3
-libexec/exo-helper-0.3
-libexec/exo-mount-notify-0.3
+include/exo-1/exo/exo-binding.h
+include/exo-1/exo/exo-cell-renderer-ellipsized-text.h
+include/exo-1/exo/exo-cell-renderer-icon.h
+include/exo-1/exo/exo-config.h
+include/exo-1/exo/exo-enum-types.h
+include/exo-1/exo/exo-execute.h
+include/exo-1/exo/exo-gdk-pixbuf-extensions.h
+include/exo-1/exo/exo-gobject-extensions.h
+include/exo-1/exo/exo-gtk-extensions.h
+include/exo-1/exo/exo-icon-bar.h
+include/exo-1/exo/exo-icon-chooser-dialog.h
+include/exo-1/exo/exo-icon-view.h
+include/exo-1/exo/exo-job.h
+include/exo-1/exo/exo-simple-job.h
+include/exo-1/exo/exo-string.h
+include/exo-1/exo/exo-toolbars-editor-dialog.h
+include/exo-1/exo/exo-toolbars-editor.h
+include/exo-1/exo/exo-toolbars-model.h
+include/exo-1/exo/exo-toolbars-view.h
+include/exo-1/exo/exo-tree-view.h
+include/exo-1/exo/exo-utils.h
+include/exo-1/exo/exo-wrap-table.h
+include/exo-1/exo/exo-xsession-client.h
+include/exo-1/exo/exo.h
+lib/libexo-1.la
+lib/pkgconfig/exo-1.pc
+lib/xfce4/exo-1/exo-compose-mail-1
+lib/xfce4/exo-1/exo-helper-1
 man/man1/exo-csource.1
 man/man1/exo-open.1
+share/applications/exo-file-manager.desktop
+share/applications/exo-mail-reader.desktop
 share/applications/exo-preferred-applications.desktop
+share/applications/exo-terminal-emulator.desktop
+share/applications/exo-web-browser.desktop
 share/examples/xfce4/helpers.rc
-share/gtk-doc/html/exo/ExoCellRendererEllipsizedText.html
-share/gtk-doc/html/exo/ExoCellRendererIcon.html
-share/gtk-doc/html/exo/ExoEllipsizedLabel.html
-share/gtk-doc/html/exo/ExoIconBar.html
-share/gtk-doc/html/exo/ExoIconChooserDialog.html
-share/gtk-doc/html/exo/ExoIconView.html
-share/gtk-doc/html/exo/ExoToolbarsEditor.html
-share/gtk-doc/html/exo/ExoToolbarsEditorDialog.html
-share/gtk-doc/html/exo/ExoToolbarsModel.html
-share/gtk-doc/html/exo/ExoToolbarsView.html
-share/gtk-doc/html/exo/ExoTreeView.html
-share/gtk-doc/html/exo/ExoWrapTable.html
-share/gtk-doc/html/exo/ExoXsessionClient.html
-share/gtk-doc/html/exo/ch01.html
-share/gtk-doc/html/exo/exo-Binding-Properties-Functions.html
-share/gtk-doc/html/exo/exo-Executing-Applications.html
-share/gtk-doc/html/exo/exo-Extensions-to-GObject.html
-share/gtk-doc/html/exo/exo-Extensions-to-Gtk.html
-share/gtk-doc/html/exo/exo-Extensions-to-Pango.html
-share/gtk-doc/html/exo/exo-Extensions-to-gdk-pixbuf.html
-share/gtk-doc/html/exo/exo-HAL-Support-Functions.html
-share/gtk-doc/html/exo/exo-MD5-functions.html
-share/gtk-doc/html/exo/exo-Miscellaneous-Utility-Functions.html
-share/gtk-doc/html/exo/exo-Mount-Points.html
-share/gtk-doc/html/exo/exo-Opening-URLs.html
-share/gtk-doc/html/exo/exo-String-Utility-Functions.html
-share/gtk-doc/html/exo/exo-Version-Information.html
-share/gtk-doc/html/exo/exo-cell-renderers.html
-share/gtk-doc/html/exo/exo-csource.html
-share/gtk-doc/html/exo/exo-deprecated-widgets.html
-share/gtk-doc/html/exo/exo-extensions.html
-share/gtk-doc/html/exo/exo-gtk-file-chooser-add-thumbnail-preview.png
-share/gtk-doc/html/exo/exo-icon-chooser-dialog.png
-share/gtk-doc/html/exo/exo-miscelleanous.html
-share/gtk-doc/html/exo/exo-overview.html
-share/gtk-doc/html/exo/exo-toolbars-editor-dialog.png
-share/gtk-doc/html/exo/exo-toolbars-editor.png
-share/gtk-doc/html/exo/exo-toolbars-view.png
-share/gtk-doc/html/exo/exo-toolbars.html
-share/gtk-doc/html/exo/exo-tools.html
-share/gtk-doc/html/exo/exo-widgets.html
-share/gtk-doc/html/exo/exo-wrap-table.png
-share/gtk-doc/html/exo/exo.devhelp
-share/gtk-doc/html/exo/exo.devhelp2
-share/gtk-doc/html/exo/home.png
-share/gtk-doc/html/exo/index.html
-share/gtk-doc/html/exo/index.sgml
-share/gtk-doc/html/exo/ix01.html
-share/gtk-doc/html/exo/left.png
-share/gtk-doc/html/exo/right.png
-share/gtk-doc/html/exo/style.css
-share/gtk-doc/html/exo/up.png
+share/gtk-doc/html/exo-1/ExoCellRendererEllipsizedText.html
+share/gtk-doc/html/exo-1/ExoCellRendererIcon.html
+share/gtk-doc/html/exo-1/ExoIconBar.html
+share/gtk-doc/html/exo-1/ExoIconChooserDialog.html
+share/gtk-doc/html/exo-1/ExoIconView.html
+share/gtk-doc/html/exo-1/ExoJob.html
+share/gtk-doc/html/exo-1/ExoSimpleJob.html
+share/gtk-doc/html/exo-1/ExoToolbarsEditor.html
+share/gtk-doc/html/exo-1/ExoToolbarsEditorDialog.html
+share/gtk-doc/html/exo-1/ExoToolbarsModel.html
+share/gtk-doc/html/exo-1/ExoToolbarsView.html
+share/gtk-doc/html/exo-1/ExoTreeView.html
+share/gtk-doc/html/exo-1/ExoWrapTable.html
+share/gtk-doc/html/exo-1/ExoXsessionClient.html
+share/gtk-doc/html/exo-1/ch01.html
+share/gtk-doc/html/exo-1/exo-1.devhelp2
+share/gtk-doc/html/exo-1/exo-Binding-Properties-Functions.html
+share/gtk-doc/html/exo-1/exo-Executing-Applications.html
+share/gtk-doc/html/exo-1/exo-Extensions-to-GObject.html
+share/gtk-doc/html/exo-1/exo-Extensions-to-Gtk.html
+share/gtk-doc/html/exo-1/exo-Extensions-to-gdk-pixbuf.html
+share/gtk-doc/html/exo-1/exo-Miscellaneous-Utility-Functions.html
+share/gtk-doc/html/exo-1/exo-String-Utility-Functions.html
+share/gtk-doc/html/exo-1/exo-Version-Information.html
+share/gtk-doc/html/exo-1/exo-cell-renderers.html
+share/gtk-doc/html/exo-1/exo-csource.html
+share/gtk-doc/html/exo-1/exo-extensions.html
+share/gtk-doc/html/exo-1/exo-gtk-file-chooser-add-thumbnail-preview.png
+share/gtk-doc/html/exo-1/exo-icon-chooser-dialog.png
+share/gtk-doc/html/exo-1/exo-jobs.html
+share/gtk-doc/html/exo-1/exo-miscelleanous.html
+share/gtk-doc/html/exo-1/exo-overview.html
+share/gtk-doc/html/exo-1/exo-toolbars-editor-dialog.png
+share/gtk-doc/html/exo-1/exo-toolbars-editor.png
+share/gtk-doc/html/exo-1/exo-toolbars-view.png
+share/gtk-doc/html/exo-1/exo-toolbars.html
+share/gtk-doc/html/exo-1/exo-tools.html
+share/gtk-doc/html/exo-1/exo-widgets.html
+share/gtk-doc/html/exo-1/exo-wrap-table.png
+share/gtk-doc/html/exo-1/home.png
+share/gtk-doc/html/exo-1/index.html
+share/gtk-doc/html/exo-1/index.sgml
+share/gtk-doc/html/exo-1/ix01.html
+share/gtk-doc/html/exo-1/left.png
+share/gtk-doc/html/exo-1/right.png
+share/gtk-doc/html/exo-1/style.css
+share/gtk-doc/html/exo-1/up.png
 share/icons/hicolor/24x24/apps/preferences-desktop-default-applications.png
-share/icons/hicolor/48x48/apps/applications-internet.png
-share/icons/hicolor/48x48/apps/applications-other.png
 share/icons/hicolor/48x48/apps/preferences-desktop-default-applications.png
-share/locale/ar/LC_MESSAGES/libexo-0.3.mo
-share/locale/be/LC_MESSAGES/libexo-0.3.mo
-share/locale/ca/LC_MESSAGES/libexo-0.3.mo
-share/locale/cs/LC_MESSAGES/libexo-0.3.mo
-share/locale/cy/LC_MESSAGES/libexo-0.3.mo
-share/locale/da/LC_MESSAGES/libexo-0.3.mo
-share/locale/de/LC_MESSAGES/libexo-0.3.mo
-share/locale/dz/LC_MESSAGES/libexo-0.3.mo
-share/locale/el/LC_MESSAGES/libexo-0.3.mo
-share/locale/en_GB/LC_MESSAGES/libexo-0.3.mo
-share/locale/es/LC_MESSAGES/libexo-0.3.mo
-share/locale/et/LC_MESSAGES/libexo-0.3.mo
-share/locale/eu/LC_MESSAGES/libexo-0.3.mo
-share/locale/fi/LC_MESSAGES/libexo-0.3.mo
-share/locale/fr/LC_MESSAGES/libexo-0.3.mo
-share/locale/gl/LC_MESSAGES/libexo-0.3.mo
-share/locale/he/LC_MESSAGES/libexo-0.3.mo
-share/locale/hu/LC_MESSAGES/libexo-0.3.mo
-share/locale/id/LC_MESSAGES/libexo-0.3.mo
-share/locale/it/LC_MESSAGES/libexo-0.3.mo
-share/locale/ja/LC_MESSAGES/libexo-0.3.mo
-share/locale/ka/LC_MESSAGES/libexo-0.3.mo
-share/locale/ku/LC_MESSAGES/libexo-0.3.mo
-share/locale/lt/LC_MESSAGES/libexo-0.3.mo
-share/locale/lv/LC_MESSAGES/libexo-0.3.mo
-share/locale/mk/LC_MESSAGES/libexo-0.3.mo
-share/locale/nb/LC_MESSAGES/libexo-0.3.mo
-share/locale/nl/LC_MESSAGES/libexo-0.3.mo
-share/locale/pa/LC_MESSAGES/libexo-0.3.mo
-share/locale/pl/LC_MESSAGES/libexo-0.3.mo
-share/locale/pt/LC_MESSAGES/libexo-0.3.mo
-share/locale/pt_BR/LC_MESSAGES/libexo-0.3.mo
-share/locale/ro/LC_MESSAGES/libexo-0.3.mo
-share/locale/ru/LC_MESSAGES/libexo-0.3.mo
-share/locale/sq/LC_MESSAGES/libexo-0.3.mo
-share/locale/sv/LC_MESSAGES/libexo-0.3.mo
-share/locale/tr/LC_MESSAGES/libexo-0.3.mo
-share/locale/uk/LC_MESSAGES/libexo-0.3.mo
-share/locale/ur/LC_MESSAGES/libexo-0.3.mo
-share/locale/zh_CN/LC_MESSAGES/libexo-0.3.mo
-share/locale/zh_TW/LC_MESSAGES/libexo-0.3.mo
-share/pixmaps/exo-0.3/exo-thumbnail-frame.png
-share/xfce4/doc/C/exo-preferred-applications.html
-share/xfce4/doc/C/images/exo-preferred-applications-internet.png
-share/xfce4/doc/C/images/exo-preferred-applications-utilities.png
-share/xfce4/doc/C/images/exo-preferred-applications-webbrowser-custom.png
-share/xfce4/doc/C/images/exo-preferred-applications-webbrowser-menu.png
-share/xfce4/doc/es/exo-preferred-applications.html
-share/xfce4/doc/es/images/exo-preferred-applications-internet.png
-share/xfce4/doc/es/images/exo-preferred-applications-utilities.png
-share/xfce4/doc/es/images/exo-preferred-applications-webbrowser-custom.png
-share/xfce4/doc/es/images/exo-preferred-applications-webbrowser-menu.png
-share/xfce4/doc/fr/exo-preferred-applications.html
-share/xfce4/doc/fr/images/exo-preferred-applications-internet.png
-share/xfce4/doc/fr/images/exo-preferred-applications-utilities.png
-share/xfce4/doc/fr/images/exo-preferred-applications-webbrowser-custom.png
-share/xfce4/doc/fr/images/exo-preferred-applications-webbrowser-menu.png
-share/xfce4/doc/id/exo-preferred-applications.html
-share/xfce4/doc/id/images/exo-preferred-applications-internet.png
-share/xfce4/doc/id/images/exo-preferred-applications-utilities.png
-share/xfce4/doc/id/images/exo-preferred-applications-webbrowser-custom.png
-share/xfce4/doc/id/images/exo-preferred-applications-webbrowser-menu.png
-share/xfce4/doc/ja/exo-preferred-applications.html
-share/xfce4/doc/ja/images/exo-preferred-applications-internet.png
-share/xfce4/doc/ja/images/exo-preferred-applications-utilities.png
-share/xfce4/doc/ja/images/exo-preferred-applications-webbrowser-custom.png
-share/xfce4/doc/ja/images/exo-preferred-applications-webbrowser-menu.png
-share/xfce4/doc/pt_BR/exo-preferred-applications.html
-share/xfce4/doc/pt_BR/images/exo-preferred-applications-internet.png
-share/xfce4/doc/pt_BR/images/exo-preferred-applications-utilities.png
-share/xfce4/doc/pt_BR/images/exo-preferred-applications-webbrowser-custom.png
-share/xfce4/doc/pt_BR/images/exo-preferred-applications-webbrowser-menu.png
-share/xfce4/doc/tr/exo-preferred-applications.html
-share/xfce4/doc/tr/images/exo-preferred-applications-internet.png
-share/xfce4/doc/tr/images/exo-preferred-applications-utilities.png
-share/xfce4/doc/tr/images/exo-preferred-applications-webbrowser-custom.png
-share/xfce4/doc/tr/images/exo-preferred-applications-webbrowser-menu.png
-share/xfce4/helpers/Terminal.desktop
+share/icons/hicolor/48x48/categories/applications-internet.png
+share/icons/hicolor/48x48/categories/applications-other.png
+share/locale/ar/LC_MESSAGES/exo-1.mo
+share/locale/ast/LC_MESSAGES/exo-1.mo
+share/locale/be/LC_MESSAGES/exo-1.mo
+share/locale/bg/LC_MESSAGES/exo-1.mo
+share/locale/bn/LC_MESSAGES/exo-1.mo
+share/locale/ca/LC_MESSAGES/exo-1.mo
+share/locale/cs/LC_MESSAGES/exo-1.mo
+share/locale/da/LC_MESSAGES/exo-1.mo
+share/locale/de/LC_MESSAGES/exo-1.mo
+share/locale/el/LC_MESSAGES/exo-1.mo
+share/locale/en_AU/LC_MESSAGES/exo-1.mo
+share/locale/en_GB/LC_MESSAGES/exo-1.mo
+share/locale/es/LC_MESSAGES/exo-1.mo
+share/locale/et/LC_MESSAGES/exo-1.mo
+share/locale/eu/LC_MESSAGES/exo-1.mo
+share/locale/fi/LC_MESSAGES/exo-1.mo
+share/locale/fr/LC_MESSAGES/exo-1.mo
+share/locale/gl/LC_MESSAGES/exo-1.mo
+share/locale/he/LC_MESSAGES/exo-1.mo
+share/locale/hr/LC_MESSAGES/exo-1.mo
+share/locale/hu/LC_MESSAGES/exo-1.mo
+share/locale/id/LC_MESSAGES/exo-1.mo
+share/locale/is/LC_MESSAGES/exo-1.mo
+share/locale/it/LC_MESSAGES/exo-1.mo
+share/locale/ja/LC_MESSAGES/exo-1.mo
+share/locale/kk/LC_MESSAGES/exo-1.mo
+share/locale/ko/LC_MESSAGES/exo-1.mo
+share/locale/lt/LC_MESSAGES/exo-1.mo
+share/locale/lv/LC_MESSAGES/exo-1.mo
+share/locale/ms/LC_MESSAGES/exo-1.mo
+share/locale/nb/LC_MESSAGES/exo-1.mo
+share/locale/nl/LC_MESSAGES/exo-1.mo
+share/locale/nn/LC_MESSAGES/exo-1.mo
+share/locale/oc/LC_MESSAGES/exo-1.mo
+share/locale/pa/LC_MESSAGES/exo-1.mo
+share/locale/pl/LC_MESSAGES/exo-1.mo
+share/locale/pt/LC_MESSAGES/exo-1.mo
+share/locale/pt_BR/LC_MESSAGES/exo-1.mo
+share/locale/ro/LC_MESSAGES/exo-1.mo
+share/locale/ru/LC_MESSAGES/exo-1.mo
+share/locale/si/LC_MESSAGES/exo-1.mo
+share/locale/sk/LC_MESSAGES/exo-1.mo
+share/locale/sl/LC_MESSAGES/exo-1.mo
+share/locale/sq/LC_MESSAGES/exo-1.mo
+share/locale/sr/LC_MESSAGES/exo-1.mo
+share/locale/sv/LC_MESSAGES/exo-1.mo
+share/locale/te/LC_MESSAGES/exo-1.mo
+share/locale/th/LC_MESSAGES/exo-1.mo
+share/locale/tr/LC_MESSAGES/exo-1.mo
+share/locale/ug/LC_MESSAGES/exo-1.mo
+share/locale/uk/LC_MESSAGES/exo-1.mo
+share/locale/ur/LC_MESSAGES/exo-1.mo
+share/locale/ur_PK/LC_MESSAGES/exo-1.mo
+share/locale/vi/LC_MESSAGES/exo-1.mo
+share/locale/zh_CN/LC_MESSAGES/exo-1.mo
+share/locale/zh_HK/LC_MESSAGES/exo-1.mo
+share/locale/zh_TW/LC_MESSAGES/exo-1.mo
+share/pixmaps/exo-1/exo-thumbnail-frame.png
+share/xfce4/helpers/Thunar.desktop
 share/xfce4/helpers/aterm.desktop
 share/xfce4/helpers/balsa.desktop
+share/xfce4/helpers/caja.desktop
+share/xfce4/helpers/chromium.desktop
 share/xfce4/helpers/debian-sensible-browser.desktop
 share/xfce4/helpers/debian-x-terminal-emulator.desktop
+share/xfce4/helpers/dillo.desktop
 share/xfce4/helpers/encompass.desktop
 share/xfce4/helpers/epiphany.desktop
 share/xfce4/helpers/eterm.desktop
@@ -190,6 +163,10 @@ share/xfce4/helpers/evolution.desktop
 share/xfce4/helpers/firefox.desktop
 share/xfce4/helpers/galeon.desktop
 share/xfce4/helpers/gnome-terminal.desktop
+share/xfce4/helpers/icecat.desktop
+share/xfce4/helpers/icedove.desktop
+share/xfce4/helpers/iceweasel.desktop
+share/xfce4/helpers/jumanji.desktop
 share/xfce4/helpers/kmail.desktop
 share/xfce4/helpers/konqueror.desktop
 share/xfce4/helpers/links.desktop
@@ -198,13 +175,25 @@ share/xfce4/helpers/midori.desktop
 share/xfce4/helpers/mozilla-browser.desktop
 share/xfce4/helpers/mozilla-mailer.desktop
 share/xfce4/helpers/mutt.desktop
+share/xfce4/helpers/nautilus.desktop
 share/xfce4/helpers/netscape-navigator.desktop
 share/xfce4/helpers/nxterm.desktop
 share/xfce4/helpers/opera-browser.desktop
 share/xfce4/helpers/opera-mailer.desktop
+share/xfce4/helpers/pcmanfm.desktop
+share/xfce4/helpers/qterminal.desktop
+share/xfce4/helpers/qtfm.desktop
+share/xfce4/helpers/qupzilla.desktop
+share/xfce4/helpers/rodent.desktop
+share/xfce4/helpers/rox-filer.desktop
+share/xfce4/helpers/sakura.desktop
+share/xfce4/helpers/surf.desktop
 share/xfce4/helpers/sylpheed-claws.desktop
 share/xfce4/helpers/sylpheed.desktop
 share/xfce4/helpers/thunderbird.desktop
 share/xfce4/helpers/urxvt.desktop
+share/xfce4/helpers/vimprobable2.desktop
 share/xfce4/helpers/w3m.desktop
+share/xfce4/helpers/xfce4-terminal.desktop
+share/xfce4/helpers/xfe.desktop
 share/xfce4/helpers/xterm.desktop
diff --git a/x11/xfce4-exo/buildlink3.mk b/x11/xfce4-exo/buildlink3.mk
index 43386facc6f..59784c3bf27 100644
--- a/x11/xfce4-exo/buildlink3.mk
+++ b/x11/xfce4-exo/buildlink3.mk
@@ -1,24 +1,14 @@
-# $NetBSD: buildlink3.mk,v 1.26 2014/05/05 00:48:37 ryoon Exp $
+# $NetBSD: buildlink3.mk,v 1.27 2015/04/21 08:56:44 jperkin Exp $
 
 BUILDLINK_TREE+=	xfce4-exo
 
 .if !defined(XFCE4_EXO_BUILDLINK3_MK)
 XFCE4_EXO_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.xfce4-exo+=	xfce4-exo>=0.3.100
-BUILDLINK_ABI_DEPENDS.xfce4-exo+=	xfce4-exo>=0.3.101nb25
+BUILDLINK_API_DEPENDS.xfce4-exo+=	xfce4-exo>=0.10.4
 BUILDLINK_PKGSRCDIR.xfce4-exo?=	../../x11/xfce4-exo
 
-pkgbase := xfce4-exo
-.include "../../mk/pkg-build-options.mk"
-
-.if !empty(PKG_BUILD_OPTIONS.xfce4-exo:Mhal)
-.include "../../sysutils/hal/buildlink3.mk"
-.endif
-
-.include "../../devel/glib2/buildlink3.mk"
-.include "../../x11/gtk2/buildlink3.mk"
-.include "../../x11/libxfce4util/buildlink3.mk"
-.endif # XFCE4_EXO_BUILDLINK3_MK
+.include "../../x11/libxfce4ui/buildlink3.mk"
+.endif	# XFCE4_EXO_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-xfce4-exo
diff --git a/x11/xfce4-exo/distinfo b/x11/xfce4-exo/distinfo
index 8edf04f6de1..42c41b0b65c 100644
--- a/x11/xfce4-exo/distinfo
+++ b/x11/xfce4-exo/distinfo
@@ -1,9 +1,7 @@
-$NetBSD: distinfo,v 1.8 2013/08/16 06:45:12 obache Exp $
+$NetBSD: distinfo,v 1.9 2015/04/21 08:56:44 jperkin Exp $
 
-SHA1 (exo-0.3.101.tar.bz2) = 74194f58278a2b9d963264806f142e5d6d05336c
-RMD160 (exo-0.3.101.tar.bz2) = 92dfc1e8f0bfa8ca74f151a2283f6988ce703649
-Size (exo-0.3.101.tar.bz2) = 1793815 bytes
-SHA1 (patch-ad) = af08127aad06a5e9d8e8055dff1f55982666d8d9
-SHA1 (patch-ae) = 18a95737a6eaef8697224d4c099625c18be7ddfb
-SHA1 (patch-af) = 86aee9fdf075c2de36deeebbb7594193e92cde95
-SHA1 (patch-exo-mount-notify_main.c) = 99892d72b240e90faa75bc91ae32308aceeb0b17
+SHA1 (exo-0.10.4.tar.bz2) = 85847a06182c316c42222b8cfcfab3a710fa96cc
+RMD160 (exo-0.10.4.tar.bz2) = a4ab860d6df42476c7f71e5cc1e8662c27a62db6
+Size (exo-0.10.4.tar.bz2) = 1219342 bytes
+SHA1 (patch-af) = 3c2a9313fab9b31797100eba2c88c0b01375e847
+SHA1 (patch-exo-helper_helpers_helpers.rc) = 85c19a3e034031e4c85aa61a27ea1c6500c290cf
diff --git a/x11/xfce4-exo/patches/patch-ad b/x11/xfce4-exo/patches/patch-ad
deleted file mode 100644
index 4cb3c83d773..00000000000
--- a/x11/xfce4-exo/patches/patch-ad
+++ /dev/null
@@ -1,86 +0,0 @@
-$NetBSD: patch-ad,v 1.4 2008/07/01 13:41:08 obache Exp $
-
---- exo/exo-mount-point.c.orig	2007-12-02 14:33:44 +0200
-+++ exo/exo-mount-point.c	2008-06-06 15:14:00 +0300
-@@ -253,57 +253,57 @@ exo_mount_point_list_match_active (ExoMo
- 
-   /* close the file handle */
-   fclose (fp);
--#elif defined(HAVE_GETFSSTAT) /* FreeBSD, OpenBSD, DragonFly, older NetBSD */
--  struct statfs *mntbuf = NULL;
--  glong          bufsize = 0;
--  gint           mntsize;
--  gint           n;
-+#elif defined(HAVE_GETVFSSTAT) && !defined(__DragonFly__) /* Newer NetBSD */
-+  struct statvfs *mntbuf = NULL;
-+  glong           bufsize = 0;
-+  gint            mntsize;
-+  gint            n;
- 
-   /* determine the number of active mount points */
--  mntsize = getfsstat (NULL, 0, MNT_NOWAIT);
-+  mntsize = getvfsstat (NULL, 0, MNT_NOWAIT);
-   if (G_LIKELY (mntsize > 0))
-     {
-       /* allocate a new buffer */
-       bufsize = (mntsize + 4) * sizeof (*mntbuf);
--      mntbuf = (struct statfs *) malloc (bufsize);
-+      mntbuf = (struct statvfs *) malloc (bufsize);
- 
-       /* determine the mount point for the device file */
--      mntsize = getfsstat (mntbuf, bufsize, MNT_NOWAIT);
-+      mntsize = getvfsstat (mntbuf, bufsize, ST_NOWAIT);
-       for (n = 0; n < mntsize; ++n)
-         {
-           /* check if we have a match here */
--          exo_mount_point_add_if_matches (mask, device, folder, fstype, mntbuf[n].f_mntfromname, mntbuf[n].f_mntonname,
--                                          mntbuf[n].f_fstypename, ((mntbuf[n].f_flags & MNT_RDONLY) != 0), &mount_points);
-+          exo_mount_point_add_if_matches (mask, device, folder, fstype,
-+                                          mntbuf[n].f_mntfromname,
-+                                          mntbuf[n].f_mntonname,
-+                                          mntbuf[n].f_fstypename,
-+                                          ((mntbuf[n].f_flag & MNT_RDONLY) != 0),
-+                                          &mount_points);
-         }
- 
-       /* release the buffer */
-       free (mntbuf);
-     }
--#elif defined(HAVE_GETVFSSTAT) /* Newer NetBSD */
--  struct statvfs *mntbuf = NULL;
--  glong           bufsize = 0;
--  gint            mntsize;
--  gint            n;
-+#elif defined(HAVE_GETFSSTAT) /* FreeBSD, OpenBSD, DragonFly, older NetBSD */
-+  struct statfs *mntbuf = NULL;
-+  glong          bufsize = 0;
-+  gint           mntsize;
-+  gint           n;
- 
-   /* determine the number of active mount points */
--  mntsize = getvfsstat (NULL, 0, MNT_NOWAIT);
-+  mntsize = getfsstat (NULL, 0, MNT_NOWAIT);
-   if (G_LIKELY (mntsize > 0))
-     {
-       /* allocate a new buffer */
-       bufsize = (mntsize + 4) * sizeof (*mntbuf);
--      mntbuf = (struct statvfs *) malloc (bufsize);
-+      mntbuf = (struct statfs *) malloc (bufsize);
- 
-       /* determine the mount point for the device file */
--      mntsize = getvfsstat (mntbuf, bufsize, ST_NOWAIT);
-+      mntsize = getfsstat (mntbuf, bufsize, MNT_NOWAIT);
-       for (n = 0; n < mntsize; ++n)
-         {
-           /* check if we have a match here */
--          exo_mount_point_add_if_matches (mask, device, folder, fstype,
--                                          mntbuf[n].f_mntfromname,
--                                          mntbuf[n].f_mntonname,
--                                          mntbuf[n].f_fstypename,
--                                          ((mntbuf[n].f_flag & MNT_RDONLY) != 0),
--                                          &mount_points);
-+          exo_mount_point_add_if_matches (mask, device, folder, fstype, mntbuf[n].f_mntfromname, mntbuf[n].f_mntonname,
-+                                          mntbuf[n].f_fstypename, ((mntbuf[n].f_flags & MNT_RDONLY) != 0), &mount_points);
-         }
- 
-       /* release the buffer */
diff --git a/x11/xfce4-exo/patches/patch-ae b/x11/xfce4-exo/patches/patch-ae
deleted file mode 100644
index 835c9e72ac2..00000000000
--- a/x11/xfce4-exo/patches/patch-ae
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2008/12/09 10:33:36 ahoka Exp $
-
---- exo-mount/exo-mount-fstab.c.orig	2007-12-02 13:33:44.000000000 +0100
-+++ exo-mount/exo-mount-fstab.c
-@@ -36,9 +36,15 @@
- 
- 
- 
--/* define _PATH_MOUNT if undefined */
-+/* define _PATH_MOUNT if undefined
-+ * TODO: My fix is even worse than the original, make it correct.
-+ */
- #ifndef _PATH_MOUNT
--#define _PATH_MOUNT "/bin/mount"
-+# if defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__DragonFly__)
-+#  define _PATH_MOUNT "/sbin/mount"
-+# else
-+#  define _PATH_MOUNT "/bin/mount"
-+# endif /* __NetBSD__ */
- #endif
- 
- 
diff --git a/x11/xfce4-exo/patches/patch-af b/x11/xfce4-exo/patches/patch-af
index 53eea103146..f194f8546fb 100644
--- a/x11/xfce4-exo/patches/patch-af
+++ b/x11/xfce4-exo/patches/patch-af
@@ -1,9 +1,10 @@
-$NetBSD: patch-af,v 1.2 2009/09/16 01:15:35 reed Exp $
+$NetBSD: patch-af,v 1.3 2015/04/21 08:56:44 jperkin Exp $
 
---- exo-helper/helpers/Makefile.in.orig	2009-02-24 20:56:34.000000000 +0000
+Adjust config path.
+--- exo-helper/helpers/Makefile.in.orig	2015-02-28 14:00:16.000000000 +0000
 +++ exo-helper/helpers/Makefile.in
-@@ -273,7 +273,7 @@ target_os = @target_os@
- target_vendor = @target_vendor@
+@@ -292,7 +292,7 @@ target_vendor = @target_vendor@
+ top_build_prefix = @top_build_prefix@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
 -defaultsdir = $(sysconfdir)/xdg/xfce4
diff --git a/x11/xfce4-exo/patches/patch-exo-helper_helpers_helpers.rc b/x11/xfce4-exo/patches/patch-exo-helper_helpers_helpers.rc
new file mode 100644
index 00000000000..aea9112ae04
--- /dev/null
+++ b/x11/xfce4-exo/patches/patch-exo-helper_helpers_helpers.rc
@@ -0,0 +1,11 @@
+$NetBSD: patch-exo-helper_helpers_helpers.rc,v 1.1 2015/04/21 08:56:44 jperkin Exp $
+
+Look for thunar, not Thunar.
+--- exo-helper/helpers/helpers.rc.orig	2015-02-28 14:00:00.000000000 +0000
++++ exo-helper/helpers/helpers.rc
+@@ -7,4 +7,4 @@
+ WebBrowser=firefox
+ MailReader=thunderbird
+ TerminalEmulator=xfce4-terminal
+-FileManager=Thunar
++FileManager=thunar
diff --git a/x11/xfce4-exo/patches/patch-exo-mount-notify_main.c b/x11/xfce4-exo/patches/patch-exo-mount-notify_main.c
deleted file mode 100644
index e55517a1153..00000000000
--- a/x11/xfce4-exo/patches/patch-exo-mount-notify_main.c
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-exo-mount-notify_main.c,v 1.1 2013/08/16 06:45:13 obache Exp $
-
-* for libnotify-0.7 API change
-
---- exo-mount-notify/main.c.orig	2009-01-12 20:33:40.000000000 +0000
-+++ exo-mount-notify/main.c
-@@ -243,7 +243,7 @@ main (int argc, char **argv)
-     }
- 
-   /* setup the notification */
--  notification = notify_notification_new (summary, message, opt_icon, NULL);
-+  notification = notify_notification_new (summary, message, opt_icon);
-   g_signal_connect (G_OBJECT (notification), "closed", G_CALLBACK (gtk_main_quit), NULL);
-   g_object_add_weak_pointer (G_OBJECT (notification), (gpointer) &notification);
-   notify_notification_set_urgency (notification, NOTIFY_URGENCY_CRITICAL);