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.

11 files changed, 104 insertions, 98 deletions

diff --git a/x11/xfce4-settings/Makefile b/x11/xfce4-settings/Makefile
index aa4e604c039..52c1db57c31 100644
--- a/x11/xfce4-settings/Makefile
+++ b/x11/xfce4-settings/Makefile
@@ -1,35 +1,35 @@
-# $NetBSD: Makefile,v 1.29 2014/05/05 00:48:37 ryoon Exp $
+# $NetBSD: Makefile,v 1.30 2015/04/21 08:56:45 jperkin Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
-XFCE4_VERSION=		4.6.5
-
 DISTNAME=		xfce4-settings-${XFCE4_VERSION}
-PKGREVISION=		23
 CATEGORIES=		x11
-COMMENT=		Xfce settings manager
 
-MASTER_SITES+=		http://archive.xfce.org/src/xfce/xfce4-settings/4.6/
+HOMEPAGE=	http://docs.xfce.org/xfce/xfce4-settings/start
+COMMENT=		Xfce settings manager
 
 BUILD_DEFS+=		PKG_SYSCONFBASE
 
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFBASE}
+CONFIGURE_ARGS+=	--enable-sound-settings
 
-EGDIR=			${XFCE4_EGBASE}/xfconf/xfce-perchannel-xml
 PKG_SYSCONFSUBDIR=	xdg
 
-MAKE_DIRS+=	${XFCE4_EGBASE:Q} ${XFCE4_EGBASE:Q}/xfconf ${EGDIR}
-
-CONF_FILES=	${EGDIR}/xsettings.xml \
-	${PKG_SYSCONFDIR}/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml
+CONF_FILES=	${XFCE4_EGBASE}/menus/xfce-settings-manager.menu \
+		${PKG_SYSCONFDIR}/menus/xfce-settings-manager.menu \
+		${XFCE4_EGBASE}/xfconf/xfce-perchannel-xml/xsettings.xml \
+		${PKG_SYSCONFDIR}/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml \
+		${XFCE4_EGBASE}/autostart/xfsettingsd.desktop \
+		${PKG_SYSCONFDIR}/autostart/xfsettingsd.desktop
 
-CONF_FILES+=	\
-	${XFCE4_EGBASE:Q}/autostart/xfce4-settings-helper-autostart.desktop \
-	${PKG_SYSCONFDIR}/autostart/xfce4-settings-helper-autostart.desktop
+MAKE_DIRS+=	${PKG_SYSCONFDIR}/menus \
+		${XFCE4_EGBASE}/xfconf/xfce-perchannel-xml \
+		${XFCE4_EGBASE}/autostart \
+		${PKG_SYSCONFDIR}/xfce4/xfconf/xfce-perchannel-xml
 
+.include "../../audio/libcanberra/buildlink3.mk"
 .include "../../devel/libglade/buildlink3.mk"
 .include "../../devel/libwnck/buildlink3.mk"
-.include "../../devel/xfconf/buildlink3.mk"
 .include "../../sysutils/dbus-glib/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../sysutils/libnotify/buildlink3.mk"
@@ -37,8 +37,10 @@ CONF_FILES+=	\
 .include "../../x11/libXcursor/buildlink3.mk"
 .include "../../x11/libXi/buildlink3.mk"
 .include "../../x11/libXrandr/buildlink3.mk"
-.include "../../x11/libxfce4gui/buildlink3.mk"
-.include "../../x11/libxfce4util/buildlink3.mk"
+.include "../../x11/libxfce4ui/buildlink3.mk"
+.include "../../devel/xfce4-conf/buildlink3.mk"
 .include "../../x11/libxklavier/buildlink3.mk"
 .include "../../x11/xfce4-exo/buildlink3.mk"
+.include "../../x11/xfce4-garcon/buildlink3.mk"
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xfce4-settings/PLIST b/x11/xfce4-settings/PLIST
index d13f059ff33..32710e94e43 100644
--- a/x11/xfce4-settings/PLIST
+++ b/x11/xfce4-settings/PLIST
@@ -1,52 +1,79 @@
-@comment $NetBSD: PLIST,v 1.3 2010/07/14 16:15:19 drochner Exp $
+@comment $NetBSD: PLIST,v 1.4 2015/04/21 08:56:45 jperkin Exp $
 bin/xfce4-accessibility-settings
 bin/xfce4-appearance-settings
 bin/xfce4-display-settings
 bin/xfce4-keyboard-settings
+bin/xfce4-mime-settings
 bin/xfce4-mouse-settings
 bin/xfce4-settings-editor
-bin/xfce4-settings-helper
 bin/xfce4-settings-manager
 bin/xfsettingsd
+lib/xfce4/settings/appearance-install-theme
 share/applications/xfce-display-settings.desktop
 share/applications/xfce-keyboard-settings.desktop
 share/applications/xfce-mouse-settings.desktop
 share/applications/xfce-settings-manager.desktop
 share/applications/xfce-ui-settings.desktop
 share/applications/xfce4-accessibility-settings.desktop
+share/applications/xfce4-mime-settings.desktop
 share/applications/xfce4-settings-editor.desktop
-share/examples/xfce4/autostart/xfce4-settings-helper-autostart.desktop
+share/examples/xfce4/autostart/xfsettingsd.desktop
+share/examples/xfce4/menus/xfce-settings-manager.menu
 share/examples/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml
-share/locale/am/LC_MESSAGES/xfce4-settings.mo
+share/icons/hicolor/128x128/devices/xfce-display-extend.png
+share/icons/hicolor/128x128/devices/xfce-display-external.png
+share/icons/hicolor/128x128/devices/xfce-display-internal.png
+share/icons/hicolor/128x128/devices/xfce-display-mirror.png
+share/locale/ar/LC_MESSAGES/xfce4-settings.mo
 share/locale/ast/LC_MESSAGES/xfce4-settings.mo
+share/locale/bg/LC_MESSAGES/xfce4-settings.mo
+share/locale/bn/LC_MESSAGES/xfce4-settings.mo
 share/locale/ca/LC_MESSAGES/xfce4-settings.mo
 share/locale/cs/LC_MESSAGES/xfce4-settings.mo
 share/locale/da/LC_MESSAGES/xfce4-settings.mo
 share/locale/de/LC_MESSAGES/xfce4-settings.mo
 share/locale/el/LC_MESSAGES/xfce4-settings.mo
+share/locale/en_AU/LC_MESSAGES/xfce4-settings.mo
+share/locale/en_GB/LC_MESSAGES/xfce4-settings.mo
 share/locale/es/LC_MESSAGES/xfce4-settings.mo
 share/locale/eu/LC_MESSAGES/xfce4-settings.mo
 share/locale/fi/LC_MESSAGES/xfce4-settings.mo
 share/locale/fr/LC_MESSAGES/xfce4-settings.mo
 share/locale/gl/LC_MESSAGES/xfce4-settings.mo
+share/locale/he/LC_MESSAGES/xfce4-settings.mo
+share/locale/hr/LC_MESSAGES/xfce4-settings.mo
 share/locale/hu/LC_MESSAGES/xfce4-settings.mo
 share/locale/id/LC_MESSAGES/xfce4-settings.mo
+share/locale/is/LC_MESSAGES/xfce4-settings.mo
 share/locale/it/LC_MESSAGES/xfce4-settings.mo
 share/locale/ja/LC_MESSAGES/xfce4-settings.mo
 share/locale/kk/LC_MESSAGES/xfce4-settings.mo
+share/locale/ko/LC_MESSAGES/xfce4-settings.mo
+share/locale/lt/LC_MESSAGES/xfce4-settings.mo
 share/locale/lv/LC_MESSAGES/xfce4-settings.mo
+share/locale/ms/LC_MESSAGES/xfce4-settings.mo
 share/locale/nb/LC_MESSAGES/xfce4-settings.mo
 share/locale/nl/LC_MESSAGES/xfce4-settings.mo
+share/locale/nn/LC_MESSAGES/xfce4-settings.mo
+share/locale/oc/LC_MESSAGES/xfce4-settings.mo
+share/locale/pa/LC_MESSAGES/xfce4-settings.mo
 share/locale/pl/LC_MESSAGES/xfce4-settings.mo
 share/locale/pt/LC_MESSAGES/xfce4-settings.mo
 share/locale/pt_BR/LC_MESSAGES/xfce4-settings.mo
 share/locale/ro/LC_MESSAGES/xfce4-settings.mo
 share/locale/ru/LC_MESSAGES/xfce4-settings.mo
+share/locale/si/LC_MESSAGES/xfce4-settings.mo
 share/locale/sk/LC_MESSAGES/xfce4-settings.mo
+share/locale/sl/LC_MESSAGES/xfce4-settings.mo
+share/locale/sr/LC_MESSAGES/xfce4-settings.mo
 share/locale/sv/LC_MESSAGES/xfce4-settings.mo
+share/locale/te/LC_MESSAGES/xfce4-settings.mo
+share/locale/th/LC_MESSAGES/xfce4-settings.mo
 share/locale/tr/LC_MESSAGES/xfce4-settings.mo
 share/locale/ug/LC_MESSAGES/xfce4-settings.mo
 share/locale/uk/LC_MESSAGES/xfce4-settings.mo
 share/locale/ur/LC_MESSAGES/xfce4-settings.mo
 share/locale/ur_PK/LC_MESSAGES/xfce4-settings.mo
 share/locale/zh_CN/LC_MESSAGES/xfce4-settings.mo
+share/locale/zh_HK/LC_MESSAGES/xfce4-settings.mo
+share/locale/zh_TW/LC_MESSAGES/xfce4-settings.mo
diff --git a/x11/xfce4-settings/buildlink3.mk b/x11/xfce4-settings/buildlink3.mk
deleted file mode 100644
index 04d3f398484..00000000000
--- a/x11/xfce4-settings/buildlink3.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2009/09/16 01:04:02 reed Exp $
-
-BUILDLINK_TREE+=	xfce4-settings
-
-.if !defined(XFCE4_SETTINGS_BUILDLINK3_MK)
-XFCE4_SETTINGS_BUILDLINK3_MK:=
-
-BUILDLINK_API_DEPENDS.xfce4-settings+=	xfce4-settings>=4.6.0
-BUILDLINK_PKGSRCDIR.xfce4-settings?=	../../x11/xfce4-settings
-
-.endif	# XFCE4_SETTINGS_BUILDLINK3_MK
-
-BUILDLINK_TREE+=	-xfce4-settings
diff --git a/x11/xfce4-settings/distinfo b/x11/xfce4-settings/distinfo
index 6b6c0549fab..dc70b77e65e 100644
--- a/x11/xfce4-settings/distinfo
+++ b/x11/xfce4-settings/distinfo
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.5 2013/08/16 07:42:55 obache Exp $
+$NetBSD: distinfo,v 1.6 2015/04/21 08:56:45 jperkin Exp $
 
-SHA1 (xfce4-settings-4.6.5.tar.bz2) = c036cc2f3100a46b2649e678dff7c0106b219263
-RMD160 (xfce4-settings-4.6.5.tar.bz2) = a8155346285921f3087795598989df287be8abb4
-Size (xfce4-settings-4.6.5.tar.bz2) = 522389 bytes
-SHA1 (patch-aa) = 104e459ab5b7bd4ac821cacada43f2aa4da23f10
-SHA1 (patch-ab) = 4f23e05cacd765b5be2e101dec29d3c6f5cd839f
-SHA1 (patch-dialogs-keyboard-settings-xfce-keyboard-settings.c) = e011c194084458c65a7f47e27fc03cb8927287b2
-SHA1 (patch-xfce4-settings-helper_accessibility.c) = 190883186f2773ab914ef6be38d387f7aa96e9e4
+SHA1 (xfce4-settings-4.12.0.tar.bz2) = 507a66ed160e44078f81051878c8644d5a5f344e
+RMD160 (xfce4-settings-4.12.0.tar.bz2) = e778cdef17523a52d0113831734c597f5b737042
+Size (xfce4-settings-4.12.0.tar.bz2) = 973324 bytes
+SHA1 (patch-xfce4-settings-manager_Makefile.in) = 89b91e6ba1cef48dabf8dae8f2cb17c8e983eb1e
+SHA1 (patch-xfsettingsd_Makefile.in) = 68b9e1bda69df252a5e910b9b2969dc0b7f45432
+SHA1 (patch-xfsettingsd_xsettings.xml) = 182108ef2739855591ef09856020dbd036c8c5a7
diff --git a/x11/xfce4-settings/patches/patch-aa b/x11/xfce4-settings/patches/patch-aa
deleted file mode 100644
index bf41b1d5ab1..00000000000
--- a/x11/xfce4-settings/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2009/09/16 01:04:02 reed Exp $
-
---- xfsettingsd/Makefile.in.orig	2009-03-09 15:03:06.000000000 +0000
-+++ xfsettingsd/Makefile.in
-@@ -339,7 +339,7 @@ top_srcdir = @top_srcdir@
- @BUILD_XFSETTINGSD_TRUE@INCLUDES = \
- @BUILD_XFSETTINGSD_TRUE@	-I$(top_srcdir)
- 
--@BUILD_XFSETTINGSD_TRUE@settingsdir = $(sysconfdir)/xdg/xfce4/xfconf/xfce-perchannel-xml
-+@BUILD_XFSETTINGSD_TRUE@settingsdir = $(datadir)/examples/xfce4/xfconf/xfce-perchannel-xml
- @BUILD_XFSETTINGSD_TRUE@settings_DATA = xsettings.xml
- @BUILD_XFSETTINGSD_TRUE@EXTRA_DIST = \
- @BUILD_XFSETTINGSD_TRUE@	$(settings_DATA)
diff --git a/x11/xfce4-settings/patches/patch-ab b/x11/xfce4-settings/patches/patch-ab
deleted file mode 100644
index daaef69eb1a..00000000000
--- a/x11/xfce4-settings/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2009/09/16 01:04:02 reed Exp $
-
---- xfce4-settings-helper/Makefile.in.orig	2009-03-09 15:03:06.000000000 +0000
-+++ xfce4-settings-helper/Makefile.in
-@@ -375,7 +375,7 @@ xfce4_settings_helper_LDADD = $(GTK_LIBS
- 	$(LIBXFCEGUI4_LIBS) $(LIBXFCE4KBD_PRIVATE_LIBS) \
- 	$(LIBXKLAVIER_LIBS) $(XI_LIBS) $(LIBX11_LIBS) \
- 	$(LIBNOTIFY_LIBS) $(LIBWNCK_LIBS) $(am__append_3)
--autostartdir = $(sysconfdir)/xdg/autostart
-+autostartdir = $(datadir)/examples/xfce4/autostart
- autostart_DATA = xfce4-settings-helper-autostart.desktop
- EXTRA_DIST = \
- 	xfce4-settings-helper-autostart.desktop
diff --git a/x11/xfce4-settings/patches/patch-dialogs-keyboard-settings-xfce-keyboard-settings.c b/x11/xfce4-settings/patches/patch-dialogs-keyboard-settings-xfce-keyboard-settings.c
deleted file mode 100644
index 2315b0df45c..00000000000
--- a/x11/xfce4-settings/patches/patch-dialogs-keyboard-settings-xfce-keyboard-settings.c
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-dialogs-keyboard-settings-xfce-keyboard-settings.c,v 1.1 2011/09/08 00:22:49 joerg Exp $
-
---- dialogs/keyboard-settings/xfce-keyboard-settings.c.orig	2011-09-07 12:45:30.000000000 +0000
-+++ dialogs/keyboard-settings/xfce-keyboard-settings.c
-@@ -1082,8 +1082,8 @@ xfce_keyboard_settings_update_sensitive 
-   GtkWidget *xkb_layout_frame;
-   gboolean   active;
- 
--  g_return_if_fail (XFCE_IS_KEYBOARD_SETTINGS (settings));
--  g_return_if_fail (GLADE_IS_XML (settings->priv->glade_xml));
-+  g_return_val_if_fail (XFCE_IS_KEYBOARD_SETTINGS (settings), FALSE);
-+  g_return_val_if_fail (GLADE_IS_XML (settings->priv->glade_xml), FALSE);
- 
-   active = gtk_toggle_button_get_active (toggle);
-   xkb_model_frame = glade_xml_get_widget (settings->priv->glade_xml, "xkb_model_frame");
diff --git a/x11/xfce4-settings/patches/patch-xfce4-settings-helper_accessibility.c b/x11/xfce4-settings/patches/patch-xfce4-settings-helper_accessibility.c
deleted file mode 100644
index f4c193266d3..00000000000
--- a/x11/xfce4-settings/patches/patch-xfce4-settings-helper_accessibility.c
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-xfce4-settings-helper_accessibility.c,v 1.1 2013/08/16 07:42:55 obache Exp $
-
-* for libnotify-0.7 API change
-
---- xfce4-settings-helper/accessibility.c.orig	2010-05-21 17:05:32.000000000 +0000
-+++ xfce4-settings-helper/accessibility.c
-@@ -417,7 +417,7 @@ xfce_accessibility_helper_notification_s
-     if (helper->notification == NULL)
-     {
-         /* create a new notification */
--        helper->notification = notify_notification_new (summary, body, "keyboard", NULL);
-+        helper->notification = notify_notification_new (summary, body, "keyboard");
- 
-         /* close signal */
-         g_signal_connect (G_OBJECT (helper->notification), "closed", G_CALLBACK (xfce_accessibility_helper_notification_closed), helper);
diff --git a/x11/xfce4-settings/patches/patch-xfce4-settings-manager_Makefile.in b/x11/xfce4-settings/patches/patch-xfce4-settings-manager_Makefile.in
new file mode 100644
index 00000000000..870c44c94df
--- /dev/null
+++ b/x11/xfce4-settings/patches/patch-xfce4-settings-manager_Makefile.in
@@ -0,0 +1,14 @@
+$NetBSD: patch-xfce4-settings-manager_Makefile.in,v 1.1 2015/04/21 08:56:45 jperkin Exp $
+
+Adjust config path.
+--- xfce4-settings-manager/Makefile.in.orig	2015-02-28 19:10:30.000000000 +0000
++++ xfce4-settings-manager/Makefile.in
+@@ -489,7 +489,7 @@ xfce4_settings_manager_LDADD = \
+ 	$(EXO_LIBS) \
+ 	$(GARCON_LIBS)
+ 
+-menudir = $(sysconfdir)/xdg/menus
++menudir = $(datadir)/examples/xfce4/menus
+ menu_DATA = xfce-settings-manager.menu
+ desktopdir = $(datadir)/applications
+ desktop_in_files = xfce-settings-manager.desktop.in
diff --git a/x11/xfce4-settings/patches/patch-xfsettingsd_Makefile.in b/x11/xfce4-settings/patches/patch-xfsettingsd_Makefile.in
new file mode 100644
index 00000000000..f090970bf14
--- /dev/null
+++ b/x11/xfce4-settings/patches/patch-xfsettingsd_Makefile.in
@@ -0,0 +1,17 @@
+$NetBSD: patch-xfsettingsd_Makefile.in,v 1.1 2015/04/21 08:56:45 jperkin Exp $
+
+Adjust config path.
+--- xfsettingsd/Makefile.in.orig	2015-02-28 19:10:30.000000000 +0000
++++ xfsettingsd/Makefile.in
+@@ -535,9 +535,9 @@ xfsettingsd_LDADD = $(GTK_LIBS) $(GLIB_L
+ 	$(LIBXFCE4KBD_PRIVATE_LIBS) $(LIBXKLAVIER_LIBS) $(XI_LIBS) \
+ 	$(LIBX11_LIBS) $(LIBNOTIFY_LIBS) $(FONTCONFIG_LIBS) \
+ 	$(LIBINPUT_LIBS) -lm $(am__append_3) $(am__append_6)
+-settingsdir = $(sysconfdir)/xdg/xfce4/xfconf/xfce-perchannel-xml
++settingsdir = $(datadir)/examples/xfce4/xfconf/xfce-perchannel-xml
+ settings_DATA = xsettings.xml
+-autostartdir = $(sysconfdir)/xdg/autostart
++autostartdir = $(datadir)/examples/xfce4/autostart
+ autostart_in_files = xfsettingsd.desktop.in
+ autostart_DATA = $(autostart_in_files:.desktop.in=.desktop)
+ EXTRA_DIST = \
diff --git a/x11/xfce4-settings/patches/patch-xfsettingsd_xsettings.xml b/x11/xfce4-settings/patches/patch-xfsettingsd_xsettings.xml
new file mode 100644
index 00000000000..be5064aa619
--- /dev/null
+++ b/x11/xfce4-settings/patches/patch-xfsettingsd_xsettings.xml
@@ -0,0 +1,16 @@
+$NetBSD: patch-xfsettingsd_xsettings.xml,v 1.1 2015/04/21 08:56:45 jperkin Exp $
+
+Use an Xfce theme and icon theme by default.
+--- xfsettingsd/xsettings.xml.orig	2015-02-24 01:33:11.000000000 +0000
++++ xfsettingsd/xsettings.xml
+@@ -6,8 +6,8 @@
+ <?xml version="1.0" encoding="UTF-8"?>
+ <channel name="xsettings" version="1.0">
+   <property name="Net" type="empty">
+-    <property name="ThemeName" type="empty"/>
+-    <property name="IconThemeName" type="empty"/>
++    <property name="ThemeName" type="string" value="Xfce-dusk"/>
++    <property name="IconThemeName" type="string" value="elementary-xfce"/>
+     <property name="DoubleClickTime" type="int" value="400"/>
+     <property name="DoubleClickDistance" type="int" value="5"/>
+     <property name="DndDragThreshold" type="int" value="8"/>