The FreeBSD Xfce team proudly presents Xfce 4.12.

Announce: http://www.xfce.org/about/news/?post=1425081600

Global changes:
- Switch to USES= xfce (D677)
- Reorganize options helper
- Fix USES= gettext-* when NLS option is not set [1], [2]
- Add LICENSE (when missing)

Update:
- to 4.12 (core components)
- audio/xfce4-mpc-plugin to 0.4.5
- deskutils/xfce4-tumbler to 0.1.31
- deskutils/xfce4-xkb-plugin to 0.7.1
- editors/mousepad to 0.4.0
- graphics/ristretto to 0.8.0
- multimedia/xfce4-parole to 0.8.0
- sysutils/garcon to 0.4.0
- sysutils/xfce4-diskperf-plugin to 2.5.5 [3]
- sysutils/xfce4-fsguard-plugin to 1.0.2
- sysutils/xfce4-power-manager to 1.4.3
- sysutils/xfce4-wavelan-plugin to 0.5.12
- x11/libexo to 0.10.3
- x11-fm/thunar to 1.6.6
- x11-themes/gtk-xfce-engine to 3.2.0

PR:		196003 [1], 197251 [2], 198132
Differential Revision:	https://reviews.freebsd.org/D677
Submitted by:	Kamil Szczesny [1], amdmi3@ [2], myself
Exp-run by:	antoine@
Approved by:	danilo@ (maintainer) [3]
Tested by:	Ivan <enitarzi@gmail.com>

25 files changed, 184 insertions, 571 deletions

diff --git a/x11/libexo/Makefile b/x11/libexo/Makefile
index 645b5e6af26b..63144d081655 100644
--- a/x11/libexo/Makefile
+++ b/x11/libexo/Makefile
@@ -2,11 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	libexo
-PORTVERSION=	0.10.2
-PORTREVISION=	5
+PORTVERSION=	0.10.3
 CATEGORIES=	x11 xfce
 MASTER_SITES=	${MASTER_SITE_XFCE}
-MASTER_SITE_SUBDIR=	src/xfce/exo/${PORTVERSION:R}
 DISTNAME=	exo-${PORTVERSION}
 DIST_SUBDIR=	xfce4
 
@@ -22,38 +20,23 @@ BUILD_DEPENDS=	p5-URI>=1.60:${PORTSDIR}/net/p5-URI
 RUN_DEPENDS=	p5-URI>=1.60:${PORTSDIR}/net/p5-URI
 
 WRKSRC=		${WRKDIR}/${DISTNAME}
-DOCSDIR=	${PREFIX}/share/doc/${PORTNAME:S/lib//}
 
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
 INSTALL_TARGET=	install-strip
 USES=		desktop-file-utils gmake libtool pathfix perl5 \
-		pkgconfig tar:bzip2
+		pkgconfig gettext-tools xfce tar:bzip2
 USE_GNOME=	glib20 gtk20 intltool intlhack
 USE_LDCONFIG=	yes
-USE_XFCE=	configenv libmenu libutil
+USE_XFCE=	libmenu
 USE_XORG=	x11
 
-OPTIONS_DEFINE=	DOCS NLS
-
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MDOCS}
-CONFIGURE_ARGS+=--with-html-dir=${PREFIX}/share/gtk-doc/html
-PLIST_SUB+=	APIDOCS=""
-.else
-CONFIGURE_ARGS+=--without-html-dir
-PLIST_SUB+=	APIDOCS="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MNLS}
-USES+=		gettext
-CONFIGURE_ARGS+=--enable-nls
-PLIST_SUB+=	NLS=""
-.else
-CONFIGURE_ARGS+=--disable-nls
-PLIST_SUB+=	NLS="@comment "
-.endif
+CONFIGURE_ARGS=--without-html-dir
+
+OPTIONS_DEFINE=	NLS
+NLS_USES=	gettext-runtime
+NLS_CONFIGURE_ENABLE=	nls
+OPTIONS_SUB=	yes
 
 post-patch:
 	${REINPLACE_CMD} -e 's|internet-mail|mail-send|' \
diff --git a/x11/libexo/distinfo b/x11/libexo/distinfo
index 200deca38a23..1ff17e480a35 100644
--- a/x11/libexo/distinfo
+++ b/x11/libexo/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xfce4/exo-0.10.2.tar.bz2) = b385828bf8a38204da3254b57fdfa25a72694495aa189fabd5040f707eec76ce
-SIZE (xfce4/exo-0.10.2.tar.bz2) = 1209633
+SHA256 (xfce4/exo-0.10.3.tar.bz2) = 95704b14ef9065268c3aa9a7c0bacbe0ddb490a183a4f5ab13bba4a1722826bd
+SIZE (xfce4/exo-0.10.3.tar.bz2) = 1222247
diff --git a/x11/libexo/pkg-plist b/x11/libexo/pkg-plist
index 858a2ea7999e..f816ae359c60 100644
--- a/x11/libexo/pkg-plist
+++ b/x11/libexo/pkg-plist
@@ -40,57 +40,10 @@ share/applications/exo-mail-reader.desktop
 share/applications/exo-preferred-applications.desktop
 share/applications/exo-terminal-emulator.desktop
 share/applications/exo-web-browser.desktop
-%%APIDOCS%%share/gtk-doc/html/exo-1/ExoCellRendererEllipsizedText.html
-%%APIDOCS%%share/gtk-doc/html/exo-1/ExoCellRendererIcon.html
-%%APIDOCS%%share/gtk-doc/html/exo-1/ExoIconBar.html
-%%APIDOCS%%share/gtk-doc/html/exo-1/ExoIconChooserDialog.html
-%%APIDOCS%%share/gtk-doc/html/exo-1/ExoIconView.html
-%%APIDOCS%%share/gtk-doc/html/exo-1/ExoJob.html
-%%APIDOCS%%share/gtk-doc/html/exo-1/ExoSimpleJob.html
-%%APIDOCS%%share/gtk-doc/html/exo-1/ExoToolbarsEditor.html
-%%APIDOCS%%share/gtk-doc/html/exo-1/ExoToolbarsEditorDialog.html
-%%APIDOCS%%share/gtk-doc/html/exo-1/ExoToolbarsModel.html
-%%APIDOCS%%share/gtk-doc/html/exo-1/ExoToolbarsView.html
-%%APIDOCS%%share/gtk-doc/html/exo-1/ExoTreeView.html
-%%APIDOCS%%share/gtk-doc/html/exo-1/ExoWrapTable.html
-%%APIDOCS%%share/gtk-doc/html/exo-1/ExoXsessionClient.html
-%%APIDOCS%%share/gtk-doc/html/exo-1/ch01.html
-%%APIDOCS%%share/gtk-doc/html/exo-1/exo-1.devhelp2
-%%APIDOCS%%share/gtk-doc/html/exo-1/exo-Binding-Properties-Functions.html
-%%APIDOCS%%share/gtk-doc/html/exo-1/exo-Executing-Applications.html
-%%APIDOCS%%share/gtk-doc/html/exo-1/exo-Extensions-to-GObject.html
-%%APIDOCS%%share/gtk-doc/html/exo-1/exo-Extensions-to-Gtk.html
-%%APIDOCS%%share/gtk-doc/html/exo-1/exo-Extensions-to-gdk-pixbuf.html
-%%APIDOCS%%share/gtk-doc/html/exo-1/exo-Miscellaneous-Utility-Functions.html
-%%APIDOCS%%share/gtk-doc/html/exo-1/exo-String-Utility-Functions.html
-%%APIDOCS%%share/gtk-doc/html/exo-1/exo-Version-Information.html
-%%APIDOCS%%share/gtk-doc/html/exo-1/exo-cell-renderers.html
-%%APIDOCS%%share/gtk-doc/html/exo-1/exo-csource.html
-%%APIDOCS%%share/gtk-doc/html/exo-1/exo-extensions.html
-%%APIDOCS%%share/gtk-doc/html/exo-1/exo-gtk-file-chooser-add-thumbnail-preview.png
-%%APIDOCS%%share/gtk-doc/html/exo-1/exo-icon-chooser-dialog.png
-%%APIDOCS%%share/gtk-doc/html/exo-1/exo-jobs.html
-%%APIDOCS%%share/gtk-doc/html/exo-1/exo-miscelleanous.html
-%%APIDOCS%%share/gtk-doc/html/exo-1/exo-overview.html
-%%APIDOCS%%share/gtk-doc/html/exo-1/exo-toolbars-editor-dialog.png
-%%APIDOCS%%share/gtk-doc/html/exo-1/exo-toolbars-editor.png
-%%APIDOCS%%share/gtk-doc/html/exo-1/exo-toolbars-view.png
-%%APIDOCS%%share/gtk-doc/html/exo-1/exo-toolbars.html
-%%APIDOCS%%share/gtk-doc/html/exo-1/exo-tools.html
-%%APIDOCS%%share/gtk-doc/html/exo-1/exo-widgets.html
-%%APIDOCS%%share/gtk-doc/html/exo-1/exo-wrap-table.png
-%%APIDOCS%%share/gtk-doc/html/exo-1/home.png
-%%APIDOCS%%share/gtk-doc/html/exo-1/index.html
-%%APIDOCS%%share/gtk-doc/html/exo-1/index.sgml
-%%APIDOCS%%share/gtk-doc/html/exo-1/ix01.html
-%%APIDOCS%%share/gtk-doc/html/exo-1/left.png
-%%APIDOCS%%share/gtk-doc/html/exo-1/right.png
-%%APIDOCS%%share/gtk-doc/html/exo-1/style.css
-%%APIDOCS%%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/icons/hicolor/48x48/categories/applications-internet.png
+share/icons/hicolor/48x48/categories/applications-other.png
 %%NLS%%share/locale/ar/LC_MESSAGES/exo-1.mo
 %%NLS%%share/locale/ast/LC_MESSAGES/exo-1.mo
 %%NLS%%share/locale/be/LC_MESSAGES/exo-1.mo
@@ -101,6 +54,7 @@ share/icons/hicolor/48x48/apps/preferences-desktop-default-applications.png
 %%NLS%%share/locale/da/LC_MESSAGES/exo-1.mo
 %%NLS%%share/locale/de/LC_MESSAGES/exo-1.mo
 %%NLS%%share/locale/el/LC_MESSAGES/exo-1.mo
+%%NLS%%share/locale/en_AU/LC_MESSAGES/exo-1.mo
 %%NLS%%share/locale/en_GB/LC_MESSAGES/exo-1.mo
 %%NLS%%share/locale/es/LC_MESSAGES/exo-1.mo
 %%NLS%%share/locale/et/LC_MESSAGES/exo-1.mo
@@ -119,9 +73,11 @@ share/icons/hicolor/48x48/apps/preferences-desktop-default-applications.png
 %%NLS%%share/locale/ko/LC_MESSAGES/exo-1.mo
 %%NLS%%share/locale/lt/LC_MESSAGES/exo-1.mo
 %%NLS%%share/locale/lv/LC_MESSAGES/exo-1.mo
+%%NLS%%share/locale/ms/LC_MESSAGES/exo-1.mo
 %%NLS%%share/locale/nb/LC_MESSAGES/exo-1.mo
 %%NLS%%share/locale/nl/LC_MESSAGES/exo-1.mo
 %%NLS%%share/locale/nn/LC_MESSAGES/exo-1.mo
+%%NLS%%share/locale/oc/LC_MESSAGES/exo-1.mo
 %%NLS%%share/locale/pa/LC_MESSAGES/exo-1.mo
 %%NLS%%share/locale/pl/LC_MESSAGES/exo-1.mo
 %%NLS%%share/locale/pt/LC_MESSAGES/exo-1.mo
@@ -130,15 +86,20 @@ share/icons/hicolor/48x48/apps/preferences-desktop-default-applications.png
 %%NLS%%share/locale/ru/LC_MESSAGES/exo-1.mo
 %%NLS%%share/locale/si/LC_MESSAGES/exo-1.mo
 %%NLS%%share/locale/sk/LC_MESSAGES/exo-1.mo
+%%NLS%%share/locale/sl/LC_MESSAGES/exo-1.mo
 %%NLS%%share/locale/sq/LC_MESSAGES/exo-1.mo
 %%NLS%%share/locale/sr/LC_MESSAGES/exo-1.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/exo-1.mo
 %%NLS%%share/locale/tr/LC_MESSAGES/exo-1.mo
+%%NLS%%share/locale/te/LC_MESSAGES/exo-1.mo
+%%NLS%%share/locale/th/LC_MESSAGES/exo-1.mo
 %%NLS%%share/locale/ug/LC_MESSAGES/exo-1.mo
 %%NLS%%share/locale/uk/LC_MESSAGES/exo-1.mo
 %%NLS%%share/locale/ur/LC_MESSAGES/exo-1.mo
 %%NLS%%share/locale/ur_PK/LC_MESSAGES/exo-1.mo
+%%NLS%%share/locale/vi/LC_MESSAGES/exo-1.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/exo-1.mo
+%%NLS%%share/locale/zh_HK/LC_MESSAGES/exo-1.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/exo-1.mo
 share/pixmaps/exo-1/exo-thumbnail-frame.png
 share/xfce4/helpers/Thunar.desktop
@@ -174,13 +135,18 @@ 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
diff --git a/x11/libxfce4menu/Makefile b/x11/libxfce4menu/Makefile
index c637be7e8b5e..e993300f11d0 100644
--- a/x11/libxfce4menu/Makefile
+++ b/x11/libxfce4menu/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	libxfce4menu
-PORTVERSION=	4.10.0
-PORTREVISION=	5
+PORTVERSION=	4.12.0
 CATEGORIES=	x11 xfce
 MASTER_SITES=	${MASTER_SITE_XFCE}
 DISTNAME=	libxfce4ui-${PORTVERSION}
@@ -12,49 +11,29 @@ DIST_SUBDIR=	xfce4
 MAINTAINER=	xfce@FreeBSD.org
 COMMENT=	Widgets library for the Xfce desktop environment
 
+LICENSE=	GPLv2
+
 GNU_CONFIGURE=	yes
 USE_GNOME=	glib20 gtk20 intltool intlhack
 USE_LDCONFIG=	yes
-USE_XFCE=	configenv libutil xfconf
+USE_XFCE=	xfconf
 INSTALLS_ICONS=	yes
-USES=		gmake libtool:keepla pathfix pkgconfig tar:bzip2
-
-CONFIGURE_ARGS=	--with-vendor-info=FreeBSD
-
-OPTIONS_DEFINE=		DOCS NLS NOTIFY GLADE
-OPTIONS_DEFAULT=	NOTIFY
-
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MDOCS}
-CONFIGURE_ARGS+=--with-html-dir=${PREFIX}/share/gtk-doc/html
-PLIST_SUB+=	APIDOCS=""
-.else
-CONFIGURE_ARGS+=--without-html-dir
-PLIST_SUB+=	APIDOCS="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MNLS}
-USES+=		gettext
-CONFIGURE_ARGS+=--enable-nls
-PLIST_SUB+=	NLS=""
-.else
-CONFIGURE_ARGS+=--disable-nls
-PLIST_SUB+=	NLS="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MNOTIFY}
-LIB_DEPENDS+=	libstartup-notification-1.so:${PORTSDIR}/x11/startup-notification
-CONFIGURE_ARGS+=--enable-startup-notification
-.else
-CONFIGURE_ARGS+=--disable-startup-notification
-.endif
-
-.if ${PORT_OPTIONS:MGLADE}
-LIB_DEPENDS+=	libgladeui-1.so:${PORTSDIR}/devel/glade3
-CONFIGURE_ARGS+=--enable-gladeui
-.else
-CONFIGURE_ARGS+=--disable-gladeui
-.endif
+USES=		gmake libtool pathfix pkgconfig gettext-tools \
+	xfce tar:bzip2
+
+CONFIGURE_ARGS=	--with-vendor-info=${OPSYS} --without-html-dir
+
+OPTIONS_DEFINE=		GLADE GTK3 NLS STARTUP
+OPTIONS_DEFAULT=	GTK3 STARTUP
+STARTUP_DESC=	Startup notification
+STARTUP_LIB_DEPENDS=	libstartup-notification-1.so:${PORTSDIR}/x11/startup-notification
+STARTUP_CONFIGURE_ENABLE=	startup-notification
+NLS_USES=	gettext-runtime
+NLS_CONFIGURE_ENABLE=	nls
+GLADE_LIB_DEPENDS=	libgladeui-1.so:${PORTSDIR}/devel/glade3
+GLADE_CONFIGURE_ENABLE=	gladeui
+GTK3_USE=	gnome=gtk30
+GTK3_CONFIGURE_ENABLE=	gtk3
+OPTIONS_SUB=	yes
 
 .include <bsd.port.mk>
diff --git a/x11/libxfce4menu/distinfo b/x11/libxfce4menu/distinfo
index 9c5f72758052..0813552a5f16 100644
--- a/x11/libxfce4menu/distinfo
+++ b/x11/libxfce4menu/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xfce4/libxfce4ui-4.10.0.tar.bz2) = a2b9fa288ccb5f16fa13264e507ba3f7b8da0176da259a11239f21538c0ea3e2
-SIZE (xfce4/libxfce4ui-4.10.0.tar.bz2) = 545486
+SHA256 (xfce4/libxfce4ui-4.12.0.tar.bz2) = 011d9532337a8d0c4d6d2c4dfc854b4f298dbad0e9513b3495a573673b863987
+SIZE (xfce4/libxfce4ui-4.12.0.tar.bz2) = 678568
diff --git a/x11/libxfce4menu/files/patch-libxfce4kbd-private__xfce-shortcut-dialog.c b/x11/libxfce4menu/files/patch-libxfce4kbd-private__xfce-shortcut-dialog.c
deleted file mode 100644
index 8f87c4e255a2..000000000000
--- a/x11/libxfce4menu/files/patch-libxfce4kbd-private__xfce-shortcut-dialog.c
+++ /dev/null
@@ -1,13 +0,0 @@
-https://bugzilla.xfce.org/show_bug.cgi?id=8744
-
---- ./libxfce4kbd-private/xfce-shortcut-dialog.c.orig	2012-04-28 19:46:52.000000000 +0000
-+++ ./libxfce4kbd-private/xfce-shortcut-dialog.c	2013-05-09 09:19:32.000000000 +0000
-@@ -327,6 +327,8 @@
-                                        &keyval, NULL, NULL, &consumed);
- 
-   /* Get the modifiers */
-+  if ((modifiers & GDK_SHIFT_MASK) && (consumed & GDK_SHIFT_MASK))
-+    consumed &= ~GDK_SHIFT_MASK;
-   modifiers &= ~consumed;
-   modifiers &= mod_mask;
- 
diff --git a/x11/libxfce4menu/files/patch-libxfce4kbd-private__xfce-shortcuts-grabber.c b/x11/libxfce4menu/files/patch-libxfce4kbd-private__xfce-shortcuts-grabber.c
deleted file mode 100644
index 983d2f1ec839..000000000000
--- a/x11/libxfce4menu/files/patch-libxfce4kbd-private__xfce-shortcuts-grabber.c
+++ /dev/null
@@ -1,24 +0,0 @@
-https://bugzilla.xfce.org/show_bug.cgi?id=8744
-
---- ./libxfce4kbd-private/xfce-shortcuts-grabber.c.orig	2012-04-28 19:46:52.000000000 +0000
-+++ ./libxfce4kbd-private/xfce-shortcuts-grabber.c	2013-05-09 09:25:50.000000000 +0000
-@@ -512,8 +512,10 @@
-                                        &keyval, NULL, NULL, &consumed);
- 
-   /* Get the modifiers */
--  modifiers &= ~consumed;
-+  if ((modifiers & GDK_SHIFT_MASK) && (consumed & GDK_SHIFT_MASK))
-+    consumed &= ~GDK_SHIFT_MASK;
-   gdk_keymap_add_virtual_modifiers (keymap, &modifiers);
-+  modifiers &= ~consumed;
-   modifiers &= mod_mask;
- 
-   context.keyval = keyval;
-@@ -521,6 +523,7 @@
- 
-   raw_shortcut_name = gtk_accelerator_name (keyval, modifiers);
-   TRACE ("Looking for %s", raw_shortcut_name);
-+  gtk_accelerator_parse (raw_shortcut_name, &context.keyval, &context.modifiers);
-   g_free (raw_shortcut_name);
- 
-   g_hash_table_foreach (grabber->priv->keys, (GHFunc) find_event_key, &context);
diff --git a/x11/libxfce4menu/pkg-descr b/x11/libxfce4menu/pkg-descr
index 1453c4442082..50248291c57a 100644
--- a/x11/libxfce4menu/pkg-descr
+++ b/x11/libxfce4menu/pkg-descr
@@ -1,4 +1,4 @@
 libxfce4ui is used to share commonly used Xfce widgets amoung the Xfce 
 applications.
 
-WWW: http://www.xfce.org/projects
+WWW: http://www.xfce.org/
diff --git a/x11/libxfce4menu/pkg-plist b/x11/libxfce4menu/pkg-plist
index 72ac666b04d1..ddefb8f66d7d 100644
--- a/x11/libxfce4menu/pkg-plist
+++ b/x11/libxfce4menu/pkg-plist
@@ -3,7 +3,13 @@ etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml
 include/xfce4/libxfce4kbd-private-2/libxfce4kbd-private/xfce-shortcut-dialog.h
 include/xfce4/libxfce4kbd-private-2/libxfce4kbd-private/xfce-shortcuts-grabber.h
 include/xfce4/libxfce4kbd-private-2/libxfce4kbd-private/xfce-shortcuts-provider.h
+include/xfce4/libxfce4kbd-private-2/libxfce4kbd-private/xfce-shortcuts-xfwm4.h
 include/xfce4/libxfce4kbd-private-2/libxfce4kbd-private/xfce-shortcuts.h
+%%GTK3%%include/xfce4/libxfce4kbd-private-3/libxfce4kbd-private/xfce-shortcut-dialog.h
+%%GTK3%%include/xfce4/libxfce4kbd-private-3/libxfce4kbd-private/xfce-shortcuts-grabber.h
+%%GTK3%%include/xfce4/libxfce4kbd-private-3/libxfce4kbd-private/xfce-shortcuts-provider.h
+%%GTK3%%include/xfce4/libxfce4kbd-private-3/libxfce4kbd-private/xfce-shortcuts-xfwm4.h
+%%GTK3%%include/xfce4/libxfce4kbd-private-3/libxfce4kbd-private/xfce-shortcuts.h
 include/xfce4/libxfce4ui-1/libxfce4ui/libxfce4ui-config.h
 include/xfce4/libxfce4ui-1/libxfce4ui/libxfce4ui-enum-types.h
 include/xfce4/libxfce4ui-1/libxfce4ui/libxfce4ui.h
@@ -13,47 +19,49 @@ include/xfce4/libxfce4ui-1/libxfce4ui/xfce-gtk-extensions.h
 include/xfce4/libxfce4ui-1/libxfce4ui/xfce-sm-client.h
 include/xfce4/libxfce4ui-1/libxfce4ui/xfce-spawn.h
 include/xfce4/libxfce4ui-1/libxfce4ui/xfce-titled-dialog.h
-lib/libxfce4kbd-private-2.la
+%%GTK3%%include/xfce4/libxfce4ui-2/libxfce4ui/libxfce4ui-config.h
+%%GTK3%%include/xfce4/libxfce4ui-2/libxfce4ui/libxfce4ui-enum-types.h
+%%GTK3%%include/xfce4/libxfce4ui-2/libxfce4ui/libxfce4ui.h
+%%GTK3%%include/xfce4/libxfce4ui-2/libxfce4ui/xfce-dialogs.h
+%%GTK3%%include/xfce4/libxfce4ui-2/libxfce4ui/xfce-gdk-extensions.h
+%%GTK3%%include/xfce4/libxfce4ui-2/libxfce4ui/xfce-gtk-extensions.h
+%%GTK3%%include/xfce4/libxfce4ui-2/libxfce4ui/xfce-sm-client.h
+%%GTK3%%include/xfce4/libxfce4ui-2/libxfce4ui/xfce-spawn.h
+%%GTK3%%include/xfce4/libxfce4ui-2/libxfce4ui/xfce-titled-dialog.h
+%%GLADE%%lib/glade3/modules/libxfce4uiglade.so
 lib/libxfce4kbd-private-2.so
 lib/libxfce4kbd-private-2.so.0
 lib/libxfce4kbd-private-2.so.0.0.0
-lib/libxfce4ui-1.la
+%%GTK3%%lib/libxfce4kbd-private-3.so
+%%GTK3%%lib/libxfce4kbd-private-3.so.0
+%%GTK3%%lib/libxfce4kbd-private-3.so.0.0.0
 lib/libxfce4ui-1.so
 lib/libxfce4ui-1.so.0
 lib/libxfce4ui-1.so.0.0.0
+%%GTK3%%lib/libxfce4ui-2.so
+%%GTK3%%lib/libxfce4ui-2.so.0
+%%GTK3%%lib/libxfce4ui-2.so.0.0.0
 libdata/pkgconfig/libxfce4kbd-private-2.pc
+%%GTK3%%libdata/pkgconfig/libxfce4kbd-private-3.pc
 libdata/pkgconfig/libxfce4ui-1.pc
+%%GTK3%%libdata/pkgconfig/libxfce4ui-2.pc
 share/applications/xfce4-about.desktop
-%%APIDOCS%%share/gtk-doc/html/libxfce4ui/XfceSMClient.html
-%%APIDOCS%%share/gtk-doc/html/libxfce4ui/home.png
-%%APIDOCS%%share/gtk-doc/html/libxfce4ui/index.html
-%%APIDOCS%%share/gtk-doc/html/libxfce4ui/index.sgml
-%%APIDOCS%%share/gtk-doc/html/libxfce4ui/ix01.html
-%%APIDOCS%%share/gtk-doc/html/libxfce4ui/left.png
-%%APIDOCS%%share/gtk-doc/html/libxfce4ui/libxfce4ui-extensions.html
-%%APIDOCS%%share/gtk-doc/html/libxfce4ui/libxfce4ui-fundamentals.html
-%%APIDOCS%%share/gtk-doc/html/libxfce4ui/libxfce4ui-introduction.html
-%%APIDOCS%%share/gtk-doc/html/libxfce4ui/libxfce4ui-libxfce4ui-config.html
-%%APIDOCS%%share/gtk-doc/html/libxfce4ui/libxfce4ui-sm.html
-%%APIDOCS%%share/gtk-doc/html/libxfce4ui/libxfce4ui-widgets.html
-%%APIDOCS%%share/gtk-doc/html/libxfce4ui/libxfce4ui-xfce-dialogs.html
-%%APIDOCS%%share/gtk-doc/html/libxfce4ui/libxfce4ui-xfce-gdk-extensions.html
-%%APIDOCS%%share/gtk-doc/html/libxfce4ui/libxfce4ui-xfce-gtk-extensions.html
-%%APIDOCS%%share/gtk-doc/html/libxfce4ui/libxfce4ui-xfce-spawn.html
-%%APIDOCS%%share/gtk-doc/html/libxfce4ui/libxfce4ui-xfce-titled-dialog.html
-%%APIDOCS%%share/gtk-doc/html/libxfce4ui/libxfce4ui.devhelp2
-%%APIDOCS%%share/gtk-doc/html/libxfce4ui/right.png
-%%APIDOCS%%share/gtk-doc/html/libxfce4ui/style.css
-%%APIDOCS%%share/gtk-doc/html/libxfce4ui/up.png
+%%GLADE%%share/glade3/catalogs/libxfce4ui.xml
+%%GLADE%%share/glade3/catalogs/libxfce4ui.xml.in
+%%GLADE%%share/glade3/pixmaps/hicolor/16x16/actions/widget-libxfce4ui-xfce-titled-dialog.png
+%%GLADE%%share/glade3/pixmaps/hicolor/22x22/actions/widget-libxfce4ui-xfce-titled-dialog.png
 share/icons/hicolor/48x48/apps/xfce4-logo.png
+%%NLS%%share/locale/am/LC_MESSAGES/libxfce4ui.mo
 %%NLS%%share/locale/ar/LC_MESSAGES/libxfce4ui.mo
 %%NLS%%share/locale/ast/LC_MESSAGES/libxfce4ui.mo
+%%NLS%%share/locale/bg/LC_MESSAGES/libxfce4ui.mo
 %%NLS%%share/locale/bn/LC_MESSAGES/libxfce4ui.mo
 %%NLS%%share/locale/ca/LC_MESSAGES/libxfce4ui.mo
 %%NLS%%share/locale/cs/LC_MESSAGES/libxfce4ui.mo
 %%NLS%%share/locale/da/LC_MESSAGES/libxfce4ui.mo
 %%NLS%%share/locale/de/LC_MESSAGES/libxfce4ui.mo
 %%NLS%%share/locale/el/LC_MESSAGES/libxfce4ui.mo
+%%NLS%%share/locale/en_AU/LC_MESSAGES/libxfce4ui.mo
 %%NLS%%share/locale/en_GB/LC_MESSAGES/libxfce4ui.mo
 %%NLS%%share/locale/es/LC_MESSAGES/libxfce4ui.mo
 %%NLS%%share/locale/eu/LC_MESSAGES/libxfce4ui.mo
@@ -69,12 +77,13 @@ share/icons/hicolor/48x48/apps/xfce4-logo.png
 %%NLS%%share/locale/ja/LC_MESSAGES/libxfce4ui.mo
 %%NLS%%share/locale/kk/LC_MESSAGES/libxfce4ui.mo
 %%NLS%%share/locale/ko/LC_MESSAGES/libxfce4ui.mo
-%%NLS%%share/locale/ku/LC_MESSAGES/libxfce4ui.mo
 %%NLS%%share/locale/lt/LC_MESSAGES/libxfce4ui.mo
 %%NLS%%share/locale/lv/LC_MESSAGES/libxfce4ui.mo
+%%NLS%%share/locale/ms/LC_MESSAGES/libxfce4ui.mo
 %%NLS%%share/locale/nb/LC_MESSAGES/libxfce4ui.mo
 %%NLS%%share/locale/nl/LC_MESSAGES/libxfce4ui.mo
 %%NLS%%share/locale/nn/LC_MESSAGES/libxfce4ui.mo
+%%NLS%%share/locale/oc/LC_MESSAGES/libxfce4ui.mo
 %%NLS%%share/locale/pa/LC_MESSAGES/libxfce4ui.mo
 %%NLS%%share/locale/pl/LC_MESSAGES/libxfce4ui.mo
 %%NLS%%share/locale/pt/LC_MESSAGES/libxfce4ui.mo
@@ -83,10 +92,11 @@ share/icons/hicolor/48x48/apps/xfce4-logo.png
 %%NLS%%share/locale/ru/LC_MESSAGES/libxfce4ui.mo
 %%NLS%%share/locale/si/LC_MESSAGES/libxfce4ui.mo
 %%NLS%%share/locale/sk/LC_MESSAGES/libxfce4ui.mo
+%%NLS%%share/locale/sl/LC_MESSAGES/libxfce4ui.mo
+%%NLS%%share/locale/sr/LC_MESSAGES/libxfce4ui.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/libxfce4ui.mo
 %%NLS%%share/locale/te/LC_MESSAGES/libxfce4ui.mo
-%%NLS%%share/locale/tl/LC_MESSAGES/libxfce4ui.mo
-%%NLS%%share/locale/tl_PH/LC_MESSAGES/libxfce4ui.mo
+%%NLS%%share/locale/th/LC_MESSAGES/libxfce4ui.mo
 %%NLS%%share/locale/tr/LC_MESSAGES/libxfce4ui.mo
 %%NLS%%share/locale/ug/LC_MESSAGES/libxfce4ui.mo
 %%NLS%%share/locale/uk/LC_MESSAGES/libxfce4ui.mo
@@ -94,4 +104,5 @@ share/icons/hicolor/48x48/apps/xfce4-logo.png
 %%NLS%%share/locale/ur_PK/LC_MESSAGES/libxfce4ui.mo
 %%NLS%%share/locale/vi/LC_MESSAGES/libxfce4ui.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/libxfce4ui.mo
+%%NLS%%share/locale/zh_HK/LC_MESSAGES/libxfce4ui.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/libxfce4ui.mo
diff --git a/x11/libxfce4util/Makefile b/x11/libxfce4util/Makefile
index 476d379b94b0..311bad627ff0 100644
--- a/x11/libxfce4util/Makefile
+++ b/x11/libxfce4util/Makefile
@@ -2,29 +2,28 @@
 # $FreeBSD$
 
 PORTNAME=	libxfce4util
-PORTVERSION=	4.10.1
-PORTREVISION=	2
+PORTVERSION=	4.12.1
 CATEGORIES=	x11 xfce
 MASTER_SITES=	${MASTER_SITE_XFCE}
-MASTER_SITE_SUBDIR=	src/xfce/${PORTNAME}/${PORTVERSION:R}
 DIST_SUBDIR=	xfce4
 
 MAINTAINER=	xfce@FreeBSD.org
 COMMENT=	Extension library for the Xfce desktop environment
 
+LICENSE=	GPLv2
+
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
-USES=		gmake libtool pathfix perl5 pkgconfig tar:bzip2
+USES=		gmake libtool pathfix perl5 pkgconfig gettext-tools \
+	xfce tar:bzip2
 USE_GNOME=	glib20 intltool intlhack
 USE_LDCONFIG=	yes
-USE_XFCE=	configenv
-
-OPTIONS_DEFINE=	DOCS NLS
-OPTIONS_SUB=	yes
 
-DOCS_CONFIGURE_ENABLE=	gtk-doc-html
+CONFIGURE_ARGS=--without-html-dir
 
+OPTIONS_DEFINE=	NLS
+OPTIONS_SUB=	yes
+NLS_USES=		gettext-runtime
 NLS_CONFIGURE_ENABLE=	nls
-NLS_USES=		gettext
 
 .include <bsd.port.mk>
diff --git a/x11/libxfce4util/distinfo b/x11/libxfce4util/distinfo
index 23b4a91029b8..02d509a93255 100644
--- a/x11/libxfce4util/distinfo
+++ b/x11/libxfce4util/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xfce4/libxfce4util-4.10.1.tar.bz2) = e82cd1ad715c02a385b3cf6646cb89aa3c4724446dac1d7e424971df12f6cfbb
-SIZE (xfce4/libxfce4util-4.10.1.tar.bz2) = 453499
+SHA256 (xfce4/libxfce4util-4.12.1.tar.bz2) = 876bdefa2e13cbf68b626b2158892fb93e824e1ef59cf951123a96cefbc8881d
+SIZE (xfce4/libxfce4util-4.12.1.tar.bz2) = 455329
diff --git a/x11/libxfce4util/pkg-plist b/x11/libxfce4util/pkg-plist
index db9f7b9da556..7278aaec52d1 100644
--- a/x11/libxfce4util/pkg-plist
+++ b/x11/libxfce4util/pkg-plist
@@ -12,45 +12,21 @@ include/xfce4/libxfce4util/xfce-rc.h
 include/xfce4/libxfce4util/xfce-resource.h
 include/xfce4/libxfce4util/xfce-utf8.h
 lib/libxfce4util.so
-lib/libxfce4util.so.6
-lib/libxfce4util.so.6.0.0
+lib/libxfce4util.so.7
+lib/libxfce4util.so.7.0.0
 libdata/pkgconfig/libxfce4util-1.0.pc
 sbin/xfce4-kiosk-query
-%%PORTDOCS%%share/gtk-doc/html/libxfce4util/home.png
-%%PORTDOCS%%share/gtk-doc/html/libxfce4util/index.html
-%%PORTDOCS%%share/gtk-doc/html/libxfce4util/index.sgml
-%%PORTDOCS%%share/gtk-doc/html/libxfce4util/left.png
-%%PORTDOCS%%share/gtk-doc/html/libxfce4util/libxfce4util-File-Utilities.html
-%%PORTDOCS%%share/gtk-doc/html/libxfce4util/libxfce4util-Internationalisation.html
-%%PORTDOCS%%share/gtk-doc/html/libxfce4util/libxfce4util-Miscellaneous-Utilities.html
-%%PORTDOCS%%share/gtk-doc/html/libxfce4util/libxfce4util-POSIX-Signal-Handling.html
-%%PORTDOCS%%share/gtk-doc/html/libxfce4util/libxfce4util-Resource-Config-File-Support.html
-%%PORTDOCS%%share/gtk-doc/html/libxfce4util/libxfce4util-Resource-lookup-functions.html
-%%PORTDOCS%%share/gtk-doc/html/libxfce4util/libxfce4util-Software-Licenses.html
-%%PORTDOCS%%share/gtk-doc/html/libxfce4util/libxfce4util-Unicode-Support-Functions.html
-%%PORTDOCS%%share/gtk-doc/html/libxfce4util/libxfce4util-Version-Information.html
-%%PORTDOCS%%share/gtk-doc/html/libxfce4util/libxfce4util-Xfce-Generics.html
-%%PORTDOCS%%share/gtk-doc/html/libxfce4util/libxfce4util-Xfce-Kiosk-functions.html
-%%PORTDOCS%%share/gtk-doc/html/libxfce4util/libxfce4util-core.html
-%%PORTDOCS%%share/gtk-doc/html/libxfce4util/libxfce4util-datatypes.html
-%%PORTDOCS%%share/gtk-doc/html/libxfce4util/libxfce4util-fundamentals.html
-%%PORTDOCS%%share/gtk-doc/html/libxfce4util/libxfce4util-utilities.html
-%%PORTDOCS%%share/gtk-doc/html/libxfce4util/libxfce4util.devhelp2
-%%PORTDOCS%%share/gtk-doc/html/libxfce4util/reference.html
-%%PORTDOCS%%share/gtk-doc/html/libxfce4util/right.png
-%%PORTDOCS%%share/gtk-doc/html/libxfce4util/style.css
-%%PORTDOCS%%share/gtk-doc/html/libxfce4util/up.png
 %%NLS%%share/locale/am/LC_MESSAGES/libxfce4util.mo
 %%NLS%%share/locale/ar/LC_MESSAGES/libxfce4util.mo
 %%NLS%%share/locale/ast/LC_MESSAGES/libxfce4util.mo
+%%NLS%%share/locale/bg/LC_MESSAGES/libxfce4util.mo
 %%NLS%%share/locale/bn/LC_MESSAGES/libxfce4util.mo
 %%NLS%%share/locale/ca/LC_MESSAGES/libxfce4util.mo
 %%NLS%%share/locale/cs/LC_MESSAGES/libxfce4util.mo
-%%NLS%%share/locale/cy/LC_MESSAGES/libxfce4util.mo
 %%NLS%%share/locale/da/LC_MESSAGES/libxfce4util.mo
 %%NLS%%share/locale/de/LC_MESSAGES/libxfce4util.mo
-%%NLS%%share/locale/dz/LC_MESSAGES/libxfce4util.mo
 %%NLS%%share/locale/el/LC_MESSAGES/libxfce4util.mo
+%%NLS%%share/locale/en_AU/LC_MESSAGES/libxfce4util.mo
 %%NLS%%share/locale/en_GB/LC_MESSAGES/libxfce4util.mo
 %%NLS%%share/locale/es/LC_MESSAGES/libxfce4util.mo
 %%NLS%%share/locale/et/LC_MESSAGES/libxfce4util.mo
@@ -59,20 +35,21 @@ sbin/xfce4-kiosk-query
 %%NLS%%share/locale/fr/LC_MESSAGES/libxfce4util.mo
 %%NLS%%share/locale/gl/LC_MESSAGES/libxfce4util.mo
 %%NLS%%share/locale/he/LC_MESSAGES/libxfce4util.mo
+%%NLS%%share/locale/hr/LC_MESSAGES/libxfce4util.mo
 %%NLS%%share/locale/hu/LC_MESSAGES/libxfce4util.mo
 %%NLS%%share/locale/id/LC_MESSAGES/libxfce4util.mo
 %%NLS%%share/locale/is/LC_MESSAGES/libxfce4util.mo
 %%NLS%%share/locale/it/LC_MESSAGES/libxfce4util.mo
 %%NLS%%share/locale/ja/LC_MESSAGES/libxfce4util.mo
-%%NLS%%share/locale/ka/LC_MESSAGES/libxfce4util.mo
 %%NLS%%share/locale/kk/LC_MESSAGES/libxfce4util.mo
 %%NLS%%share/locale/ko/LC_MESSAGES/libxfce4util.mo
 %%NLS%%share/locale/lt/LC_MESSAGES/libxfce4util.mo
 %%NLS%%share/locale/lv/LC_MESSAGES/libxfce4util.mo
-%%NLS%%share/locale/mk/LC_MESSAGES/libxfce4util.mo
+%%NLS%%share/locale/ms/LC_MESSAGES/libxfce4util.mo
 %%NLS%%share/locale/nb/LC_MESSAGES/libxfce4util.mo
 %%NLS%%share/locale/nl/LC_MESSAGES/libxfce4util.mo
 %%NLS%%share/locale/nn/LC_MESSAGES/libxfce4util.mo
+%%NLS%%share/locale/oc/LC_MESSAGES/libxfce4util.mo
 %%NLS%%share/locale/pa/LC_MESSAGES/libxfce4util.mo
 %%NLS%%share/locale/pl/LC_MESSAGES/libxfce4util.mo
 %%NLS%%share/locale/pt/LC_MESSAGES/libxfce4util.mo
@@ -81,14 +58,16 @@ sbin/xfce4-kiosk-query
 %%NLS%%share/locale/ru/LC_MESSAGES/libxfce4util.mo
 %%NLS%%share/locale/si/LC_MESSAGES/libxfce4util.mo
 %%NLS%%share/locale/sk/LC_MESSAGES/libxfce4util.mo
-%%NLS%%share/locale/sl/LC_MESSAGES/libxfce4util.mo
 %%NLS%%share/locale/sq/LC_MESSAGES/libxfce4util.mo
+%%NLS%%share/locale/sr/LC_MESSAGES/libxfce4util.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/libxfce4util.mo
-%%NLS%%share/locale/tl_PH/LC_MESSAGES/libxfce4util.mo
+%%NLS%%share/locale/th/LC_MESSAGES/libxfce4util.mo
 %%NLS%%share/locale/tr/LC_MESSAGES/libxfce4util.mo
 %%NLS%%share/locale/ug/LC_MESSAGES/libxfce4util.mo
 %%NLS%%share/locale/uk/LC_MESSAGES/libxfce4util.mo
 %%NLS%%share/locale/ur/LC_MESSAGES/libxfce4util.mo
 %%NLS%%share/locale/ur_PK/LC_MESSAGES/libxfce4util.mo
+%%NLS%%share/locale/uz/LC_MESSAGES/libxfce4util.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/libxfce4util.mo
+%%NLS%%share/locale/zh_HK/LC_MESSAGES/libxfce4util.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/libxfce4util.mo
diff --git a/x11/xfce4-clipman-plugin/Makefile b/x11/xfce4-clipman-plugin/Makefile
index 368e9edfc3b5..387c621968cf 100644
--- a/x11/xfce4-clipman-plugin/Makefile
+++ b/x11/xfce4-clipman-plugin/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	xfce4-clipman-plugin
 PORTVERSION=	1.2.6
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11 xfce
 MASTER_SITES=	${MASTER_SITE_XFCE}
 MASTER_SITE_SUBDIR=	src/panel-plugins/${PORTNAME}/${PORTVERSION:R}
@@ -15,30 +15,19 @@ COMMENT=	Clipboard manager for the Xfce panel
 LICENSE=	GPLv2
 
 OPTIONS_DEFINE=	QRCODE UNIQUE
+OPTIONS_DEFAULT=	UNIQUE
 QRCODE_DESC=	QR Code support
 UNIQUE_DESC=	Unique (single instance) support
+QRCODE_LIB_DEPENDS=	libqrencode.so:${PORTSDIR}/graphics/libqrencode
+QRCODE_CONFIGURE_ENABLE=	libqrencode
+UNIQUE_LIB_DEPENDS=	libunique-1.0.so:${PORTSDIR}/x11-toolkits/unique
+UNIQUE_CONFIGURE_ENABLE=	unique
 
 GNU_CONFIGURE=	yes
 USE_GNOME=	gtk20 intltool intlhack glib20
-USE_XFCE=	configenv libexo libmenu libutil panel xfconf
+USE_XFCE=	panel
 USE_XORG=	xtst xproto
-USES=		gettext gmake libtool pkgconfig tar:bzip2
+USES=		gettext gmake libtool pkgconfig xfce tar:bzip2
 INSTALLS_ICONS=	yes
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MUNIQUE}
-LIB_DEPENDS+=	libunique-1.0.so:${PORTSDIR}/x11-toolkits/unique
-CONFIGURE_ARGS+=	--enable-unique
-.else
-CONFIGURE_ARGS+=	--disable-unique
-.endif
-
-.if ${PORT_OPTIONS:MQRCODE}
-LIB_DEPENDS+=	libqrencode.so:${PORTSDIR}/graphics/libqrencode
-CONFIGURE_ARGS+=	--enable-libqrencode
-.else
-CONFIGURE_ARGS+=	--disable-libqrencode
-.endif
-
 .include <bsd.port.mk>
diff --git a/x11/xfce4-conf/Makefile b/x11/xfce4-conf/Makefile
index 3dc54da86567..7a478268a1c9 100644
--- a/x11/xfce4-conf/Makefile
+++ b/x11/xfce4-conf/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	xfce4-conf
-PORTVERSION=	4.10.0
-PORTREVISION=	6
+PORTVERSION=	4.12.0
 CATEGORIES=	x11 xfce
 MASTER_SITES=	${MASTER_SITE_XFCE}
 DISTNAME=	xfconf-${PORTVERSION}
@@ -12,6 +11,8 @@ DIST_SUBDIR=	xfce4
 MAINTAINER=	xfce@FreeBSD.org
 COMMENT=	D-Bus-based configuration storage system
 
+LICENSE=	GPLv2
+
 BUILD_DEPENDS=	p5-XML-Parser>=2.41:${PORTSDIR}/textproc/p5-XML-Parser
 LIB_DEPENDS=	libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib
 
@@ -19,42 +20,21 @@ GNU_CONFIGURE=	yes
 USE_GNOME=	glib20 gtk20 intltool intlhack
 USE_LDCONFIG=	yes
 USE_PERL5=	build
-USE_XFCE=	configenv libutil
+USE_XFCE=	libutil
 USE_XORG=	x11
-USES=		gmake libtool pathfix pkgconfig perl5 tar:bzip2
-
-OPTIONS_DEFINE=		DOCS PERL NLS
-
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MDOCS}
-CONFIGURE_ARGS+=--with-html-dir=${PREFIX}/share/gtk-doc/html
-PLIST_SUB+=	APIDOCS=""
-.else
-CONFIGURE_ARGS+=--without-html-dir
-PLIST_SUB+=	APIDOCS="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MPERL}
-BUILD_DEPENDS+=	p5-ExtUtils-Depends>=0.304:${PORTSDIR}/devel/p5-ExtUtils-Depends \
-		p5-ExtUtils-PkgConfig>=1.15:${PORTSDIR}/devel/p5-ExtUtils-PkgConfig \
-		p5-Glib2>=1.280:${PORTSDIR}/devel/p5-Glib2
-RUN_DEPENDS+=	${BUILD_DEPENDS}
-USE_PERL5+=	run
-CONFIGURE_ARGS+=--enable-perl-bindings
-PLIST_SUB+=	PERLBIND=""
-.else
-CONFIGURE_ARGS+=--disable-perl-bindings
-PLIST_SUB+=	PERLBIND="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MNLS}
-USES+=		gettext
-CONFIGURE_ARGS+=--enable-nls
-PLIST_SUB+=	NLS=""
-.else
-CONFIGURE_ARGS+=--disable-nls
-PLIST_SUB+=	NLS="@comment "
-.endif
+USES=		gmake libtool pathfix pkgconfig perl5 gettext-tools \
+	xfce tar:bzip2
+
+CONFIGURE_ARGS=--without-html-dir
+
+OPTIONS_DEFINE=		PERL NLS
+NLS_USES=	gettext-runtime
+NLS_CONFIGURE_ENABLE=	nls
+PERL_BUILD_DEPENDS=	p5-ExtUtils-Depends>=0.304:${PORTSDIR}/devel/p5-ExtUtils-Depends \
+	p5-ExtUtils-PkgConfig>=1.15:${PORTSDIR}/devel/p5-ExtUtils-PkgConfig \
+	p5-Glib2>=1.280:${PORTSDIR}/devel/p5-Glib2
+PERL_USE=	perl5=run
+PERL_CONFIGURE_ENABLE=	perl-bindings
+OPTIONS_SUB=	yes
 
 .include <bsd.port.mk>
diff --git a/x11/xfce4-conf/distinfo b/x11/xfce4-conf/distinfo
index 180bec8bb0c6..ce33d3146696 100644
--- a/x11/xfce4-conf/distinfo
+++ b/x11/xfce4-conf/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xfce4/xfconf-4.10.0.tar.bz2) = 175219a441cc7d0f210bbd1a3b0abba41598627cd9db27235811400c3e100576
-SIZE (xfce4/xfconf-4.10.0.tar.bz2) = 517425
+SHA256 (xfce4/xfconf-4.12.0.tar.bz2) = 9910eaea8405336415d4d7f3056403f8c67bc23ba0dce251eac35205c603b156
+SIZE (xfce4/xfconf-4.12.0.tar.bz2) = 542544
diff --git a/x11/xfce4-conf/files/patch-xfconf__xfconf-cache.c b/x11/xfce4-conf/files/patch-xfconf__xfconf-cache.c
deleted file mode 100644
index 2db3faedc432..000000000000
--- a/x11/xfce4-conf/files/patch-xfconf__xfconf-cache.c
+++ /dev/null
@@ -1,221 +0,0 @@
---- ./xfconf/xfconf-cache.c.orig	2012-04-28 19:51:47.000000000 +0000
-+++ ./xfconf/xfconf-cache.c	2013-03-08 20:38:01.000000000 +0000
-@@ -47,10 +47,16 @@
- 
- #define ALIGN_VAL(val, align)  ( ((val) + ((align) -1)) & ~((align) - 1) )
- 
--static void xfconf_cache_mutex_lock(GStaticMutex *mtx) __attribute__((noinline));
--static void xfconf_cache_mutex_lock(GStaticMutex *mtx) { g_static_mutex_lock(mtx); }
--static void xfconf_cache_mutex_unlock(GStaticMutex *mtx) __attribute__((noinline));
--static void xfconf_cache_mutex_unlock(GStaticMutex *mtx) { g_static_mutex_unlock(mtx); }
-+
-+
-+#if GLIB_CHECK_VERSION (2, 32, 0)
-+#define xfconf_cache_mutex_lock(cache)   g_mutex_lock (&(cache)->cache_lock)
-+#define xfconf_cache_mutex_unlock(cache) g_mutex_unlock (&(cache)->cache_lock)
-+#else
-+#define xfconf_cache_mutex_lock(cache)   g_mutex_lock ((cache)->cache_lock)
-+#define xfconf_cache_mutex_unlock(cache) g_mutex_unlock ((cache)->cache_lock)
-+#endif
-+
- 
- 
- /**************** XfconfCacheItem ****************/
-@@ -210,7 +216,11 @@
-     GHashTable *pending_calls;
-     GHashTable *old_properties;
- 
--    GStaticMutex cache_lock;
-+#if GLIB_CHECK_VERSION (2, 32, 0)
-+    GMutex cache_lock;
-+#else
-+    GMutex *cache_lock;
-+#endif
- };
- 
- typedef struct _XfconfCacheClass
-@@ -347,7 +357,11 @@
-     cache->old_properties = g_hash_table_new_full(g_str_hash, g_str_equal,
-                                                   NULL, NULL);
- 
--    g_static_mutex_init(&cache->cache_lock);
-+#if GLIB_CHECK_VERSION (2, 32, 0)
-+    g_mutex_init (&cache->cache_lock);
-+#else
-+    cache->cache_lock = g_mutex_new ();
-+#endif
- }
- 
- static void
-@@ -433,7 +447,9 @@
-     g_tree_destroy(cache->properties);
-     g_hash_table_destroy(cache->old_properties);
- 
--    g_static_mutex_free(&cache->cache_lock);
-+#if !GLIB_CHECK_VERSION (2, 32, 0)
-+    g_mutex_free (cache->cache_lock);
-+#endif
- 
-     G_OBJECT_CLASS(xfconf_cache_parent_class)->finalize(obj);
- }
-@@ -508,7 +524,7 @@
-     if(!cache->pending_calls)
-         return;
- 
--    xfconf_cache_mutex_lock(&cache->cache_lock);
-+    xfconf_cache_mutex_lock(cache);
- 
-     old_item = g_hash_table_lookup(cache->pending_calls, call);
-     if(G_UNLIKELY(!old_item)) {
-@@ -547,12 +563,12 @@
-         }
- 
-         /* we need to drop the lock when running the signal handlers */
--        xfconf_cache_mutex_unlock(&cache->cache_lock);
-+        xfconf_cache_mutex_unlock(cache);
-         g_signal_emit(G_OBJECT(cache), signals[SIG_PROPERTY_CHANGED],
-                       g_quark_from_string(old_item->property),
-                       cache->channel_name, old_item->property,
-                       item ? item->value : &empty_val);
--        xfconf_cache_mutex_lock(&cache->cache_lock);
-+        xfconf_cache_mutex_lock(cache);
-     }
- 
-     /* we handled the call, so set it to %NULL */
-@@ -561,7 +577,7 @@
-     if(old_item)
-         xfconf_cache_old_item_free(old_item);
- out:
--    xfconf_cache_mutex_unlock(&cache->cache_lock);
-+    xfconf_cache_mutex_unlock(cache);
- }
- 
- 
-@@ -576,7 +592,7 @@
-     XfconfCacheOldItem *old_item;
-     GError *error = NULL;
- 
--    xfconf_cache_mutex_lock(&cache->cache_lock);
-+    xfconf_cache_mutex_lock(cache);
- 
-     old_item = g_hash_table_lookup(cache->pending_calls, call);
-     if(G_UNLIKELY(!old_item)) {
-@@ -594,7 +610,7 @@
-     if(old_item)
-         g_hash_table_remove(cache->pending_calls, old_item->call);
- 
--    xfconf_cache_mutex_unlock(&cache->cache_lock);
-+    xfconf_cache_mutex_unlock(cache);
- }
- #endif
- 
-@@ -634,7 +650,7 @@
- 
-     g_return_val_if_fail(g_tree_nnodes(cache->properties) == 0, FALSE);
- 
--    xfconf_cache_mutex_lock(&cache->cache_lock);
-+    xfconf_cache_mutex_lock(cache);
- 
-     if(xfconf_client_get_all_properties(proxy, cache->channel_name,
-                                         property_base ? property_base : "/",
-@@ -647,7 +663,7 @@
-     } else
-         g_propagate_error(error, tmp_error);
- 
--    xfconf_cache_mutex_unlock(&cache->cache_lock);
-+    xfconf_cache_mutex_unlock(cache);
- 
-     return ret;
- }
-@@ -710,9 +726,9 @@
-     g_return_val_if_fail(XFCONF_IS_CACHE(cache) && property
-                          && (!error || !*error), FALSE);
- 
--    xfconf_cache_mutex_lock(&cache->cache_lock);
-+    xfconf_cache_mutex_lock(cache);
-     ret = xfconf_cache_lookup_locked(cache, property, value, error);
--    xfconf_cache_mutex_unlock(&cache->cache_lock);
-+    xfconf_cache_mutex_unlock(cache);
- 
-     return ret;
- }
-@@ -727,7 +743,7 @@
-     XfconfCacheItem *item = NULL;
-     XfconfCacheOldItem *old_item = NULL;
- 
--    xfconf_cache_mutex_lock(&cache->cache_lock);
-+    xfconf_cache_mutex_lock(cache);
- 
-     item = g_tree_lookup(cache->properties, property);
-     if(!item) {
-@@ -756,7 +772,7 @@
-             {
-                 /* this is bad... */
-                 g_propagate_error(error, tmp_error);
--                xfconf_cache_mutex_unlock(&cache->cache_lock);
-+                xfconf_cache_mutex_unlock(cache);
-                 return FALSE;
-             }
- 
-@@ -771,7 +787,7 @@
-     if(item) {
-         /* if the value isn't changing, there's no reason to continue */
-         if(_xfconf_gvalue_is_equal(item->value, value)) {
--            xfconf_cache_mutex_unlock(&cache->cache_lock);
-+            xfconf_cache_mutex_unlock(cache);
-             return TRUE;
-         }
-     }
-@@ -814,7 +830,7 @@
-         g_tree_insert(cache->properties, g_strdup(property), item);
-     }
- 
--    xfconf_cache_mutex_unlock(&cache->cache_lock);
-+    xfconf_cache_mutex_unlock(cache);
- 
-     g_signal_emit(G_OBJECT(cache), signals[SIG_PROPERTY_CHANGED], 0,
-                   cache->channel_name, property, value);
-@@ -855,7 +871,7 @@
-     XfconfCacheOldItem *old_item = NULL;
- #endif
- 
--    xfconf_cache_mutex_lock(&cache->cache_lock);
-+    xfconf_cache_mutex_lock(cache);
- 
- #if 0
-     /* it's not really feasible here to look up all the old/new values
-@@ -919,7 +935,7 @@
-     }
- #endif
- 
--    xfconf_cache_mutex_unlock(&cache->cache_lock);
-+    xfconf_cache_mutex_unlock(cache);
- 
-     return ret;
- }
-@@ -929,10 +945,10 @@
- xfconf_cache_set_max_entries(XfconfCache *cache,
-                              gint max_entries)
- {
--    xfconf_cache_mutex_lock(&cache->cache_lock);
-+    xfconf_cache_mutex_lock(cache);
-     cache->max_entries = max_entries;
-     /* TODO: check tree for eviction */
--    xfconf_cache_mutex_unlock(&cache->cache_lock);
-+    xfconf_cache_mutex_unlock(cache);
- }
- 
- gint
-@@ -945,10 +961,10 @@
- xfconf_cache_set_max_age(XfconfCache *cache,
-                          gint max_age)
- {
--    xfconf_cache_mutex_lock(&cache->cache_lock);
-+    xfconf_cache_mutex_lock(cache);
-     cache->max_age = max_age;
-     /* TODO: check tree for eviction */
--    xfconf_cache_mutex_unlock(&cache->cache_lock);
-+    xfconf_cache_mutex_unlock(cache);
- }
- 
- gint
diff --git a/x11/xfce4-conf/pkg-plist b/x11/xfce4-conf/pkg-plist
index 213a3588e694..fb3b899e853a 100644
--- a/x11/xfce4-conf/pkg-plist
+++ b/x11/xfce4-conf/pkg-plist
@@ -10,31 +10,16 @@ lib/libxfconf-0.so.2.0.0
 lib/xfce4/xfconf/xfconfd
 libdata/pkgconfig/libxfconf-0.pc
 share/dbus-1/services/org.xfce.Xfconf.service
-%%APIDOCS%%share/gtk-doc/html/xfconf/ch01.html
-%%APIDOCS%%share/gtk-doc/html/xfconf/ch02.html
-%%APIDOCS%%share/gtk-doc/html/xfconf/ch03.html
-%%APIDOCS%%share/gtk-doc/html/xfconf/home.png
-%%APIDOCS%%share/gtk-doc/html/xfconf/index.html
-%%APIDOCS%%share/gtk-doc/html/xfconf/index.sgml
-%%APIDOCS%%share/gtk-doc/html/xfconf/left.png
-%%APIDOCS%%share/gtk-doc/html/xfconf/right.png
-%%APIDOCS%%share/gtk-doc/html/xfconf/style.css
-%%APIDOCS%%share/gtk-doc/html/xfconf/up.png
-%%APIDOCS%%share/gtk-doc/html/xfconf/xfconf-xfconf-backend.html
-%%APIDOCS%%share/gtk-doc/html/xfconf/xfconf-xfconf-binding.html
-%%APIDOCS%%share/gtk-doc/html/xfconf/xfconf-xfconf-channel.html
-%%APIDOCS%%share/gtk-doc/html/xfconf/xfconf-xfconf-errors.html
-%%APIDOCS%%share/gtk-doc/html/xfconf/xfconf-xfconf-types.html
-%%APIDOCS%%share/gtk-doc/html/xfconf/xfconf-xfconf.html
-%%APIDOCS%%share/gtk-doc/html/xfconf/xfconf.devhelp2
 %%NLS%%share/locale/ar/LC_MESSAGES/xfconf.mo
 %%NLS%%share/locale/ast/LC_MESSAGES/xfconf.mo
+%%NLS%%share/locale/bg/LC_MESSAGES/xfconf.mo
 %%NLS%%share/locale/bn/LC_MESSAGES/xfconf.mo
 %%NLS%%share/locale/ca/LC_MESSAGES/xfconf.mo
 %%NLS%%share/locale/cs/LC_MESSAGES/xfconf.mo
 %%NLS%%share/locale/da/LC_MESSAGES/xfconf.mo
 %%NLS%%share/locale/de/LC_MESSAGES/xfconf.mo
 %%NLS%%share/locale/el/LC_MESSAGES/xfconf.mo
+%%NLS%%share/locale/en_AU/LC_MESSAGES/xfconf.mo
 %%NLS%%share/locale/en_GB/LC_MESSAGES/xfconf.mo
 %%NLS%%share/locale/es/LC_MESSAGES/xfconf.mo
 %%NLS%%share/locale/eu/LC_MESSAGES/xfconf.mo
@@ -52,9 +37,11 @@ share/dbus-1/services/org.xfce.Xfconf.service
 %%NLS%%share/locale/ko/LC_MESSAGES/xfconf.mo
 %%NLS%%share/locale/lt/LC_MESSAGES/xfconf.mo
 %%NLS%%share/locale/lv/LC_MESSAGES/xfconf.mo
+%%NLS%%share/locale/ms/LC_MESSAGES/xfconf.mo
 %%NLS%%share/locale/nb/LC_MESSAGES/xfconf.mo
 %%NLS%%share/locale/nl/LC_MESSAGES/xfconf.mo
 %%NLS%%share/locale/nn/LC_MESSAGES/xfconf.mo
+%%NLS%%share/locale/oc/LC_MESSAGES/xfconf.mo
 %%NLS%%share/locale/pa/LC_MESSAGES/xfconf.mo
 %%NLS%%share/locale/pl/LC_MESSAGES/xfconf.mo
 %%NLS%%share/locale/pt/LC_MESSAGES/xfconf.mo
@@ -63,19 +50,22 @@ share/dbus-1/services/org.xfce.Xfconf.service
 %%NLS%%share/locale/ru/LC_MESSAGES/xfconf.mo
 %%NLS%%share/locale/si/LC_MESSAGES/xfconf.mo
 %%NLS%%share/locale/sk/LC_MESSAGES/xfconf.mo
+%%NLS%%share/locale/sr/LC_MESSAGES/xfconf.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/xfconf.mo
 %%NLS%%share/locale/te/LC_MESSAGES/xfconf.mo
+%%NLS%%share/locale/th/LC_MESSAGES/xfconf.mo
 %%NLS%%share/locale/tr/LC_MESSAGES/xfconf.mo
 %%NLS%%share/locale/ug/LC_MESSAGES/xfconf.mo
 %%NLS%%share/locale/uk/LC_MESSAGES/xfconf.mo
 %%NLS%%share/locale/ur/LC_MESSAGES/xfconf.mo
 %%NLS%%share/locale/ur_PK/LC_MESSAGES/xfconf.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/xfconf.mo
+%%NLS%%share/locale/zh_HK/LC_MESSAGES/xfconf.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/xfconf.mo
-%%PERLBIND%%%%PERL5_MAN3%%/Xfce4::Xfconf.3.gz
-%%PERLBIND%%%%SITE_ARCH%%/auto/Xfce4/Xfconf/Xfconf.so
-%%PERLBIND%%%%SITE_ARCH%%/Xfce4/Xfconf/Install/Files.pm
-%%PERLBIND%%%%SITE_ARCH%%/Xfce4/Xfconf/Install/xfconfperl.h
-%%PERLBIND%%%%SITE_ARCH%%/Xfce4/Xfconf/Install/xfconfperl-autogen.h
-%%PERLBIND%%%%SITE_ARCH%%/Xfce4/Xfconf/Install/xfconfperl.typemap
-%%PERLBIND%%%%SITE_ARCH%%/Xfce4/Xfconf.pm
+%%PERL%%%%PERL5_MAN3%%/Xfce4::Xfconf.3.gz
+%%PERL%%%%SITE_ARCH%%/auto/Xfce4/Xfconf/Xfconf.so
+%%PERL%%%%SITE_ARCH%%/Xfce4/Xfconf/Install/Files.pm
+%%PERL%%%%SITE_ARCH%%/Xfce4/Xfconf/Install/xfconfperl.h
+%%PERL%%%%SITE_ARCH%%/Xfce4/Xfconf/Install/xfconfperl-autogen.h
+%%PERL%%%%SITE_ARCH%%/Xfce4/Xfconf/Install/xfconfperl.typemap
+%%PERL%%%%SITE_ARCH%%/Xfce4/Xfconf.pm
diff --git a/x11/xfce4-dashboard/Makefile b/x11/xfce4-dashboard/Makefile
index 6a0a9edfc7de..098c777c8c11 100644
--- a/x11/xfce4-dashboard/Makefile
+++ b/x11/xfce4-dashboard/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	dashboard
 PORTVERSION=	0.2.3
+PORTREVISION=	1
 CATEGORIES=	x11 xfce
 MASTER_SITES=	http://xfdashboard.froevel.de/releases/
 PKGNAMEPREFIX=	xfce4-
@@ -20,9 +21,9 @@ LIB_DEPENDS=	libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \
 RUN_DEPENDS=	gnome-icon-theme-symbolic>=3.6.2:${PORTSDIR}/x11-themes/gnome-icon-theme-symbolic
 
 GNU_CONFIGURE=	yes
-USES=	pkgconfig libtool gmake perl5 gettext tar:bzip2
+USES=	pkgconfig libtool gmake perl5 gettext xfce tar:bzip2
 USE_GNOME=	glib20 libwnck intltool intlhack
-USE_XFCE=	configenv garcon xfconf
+USE_XFCE=	garcon
 USE_XORG=	x11 xcomposite xdamage
 USE_GL=	gl
 INSTALLS_ICONS=	yes
diff --git a/x11/xfce4-embed-plugin/Makefile b/x11/xfce4-embed-plugin/Makefile
index 4b748fe7ff1f..400d2a799397 100644
--- a/x11/xfce4-embed-plugin/Makefile
+++ b/x11/xfce4-embed-plugin/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	xfce4-embed-plugin
 PORTVERSION=	1.4.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11 xfce
 MASTER_SITES=	${MASTER_SITE_XFCE}
 MASTER_SITE_SUBDIR=	src/panel-plugins/${PORTNAME}/${PORTVERSION:R}
@@ -16,23 +16,20 @@ LICENSE=	GPLv2
 
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
-USES=		gmake libtool pkgconfig tar:bzip2
+USES=		gmake libtool pkgconfig gettext-tools xfce tar:bzip2
 USE_XORG=	x11
 USE_GNOME=	glib20 gtk20 intltool intlhack
-USE_XFCE=	configenv libmenu libutil panel
+USE_XFCE=	panel
 
 OPTIONS_DEFINE=	NLS
+NLS_USES=	gettext-runtime
+NLS_CONFIGURE_ENABLE=	nls
+OPTIONS_SUB=	yes
 
 .include <bsd.port.options.mk>
 
-.if ${PORT_OPTIONS:MNLS}
-USES+=	gettext
-CONFIGURE_ARGS+=--enable-nls
-PLIST_SUB+=	NLS=""
-.else
+.if !${PORT_OPTIONS:MNLS}
 EXTRA_PATCHES=	${FILESDIR}/extra-patch-configure
-CONFIGURE_ARGS+=--disable-nls
-PLIST_SUB+=	NLS="@comment "
 .endif
 
 .include <bsd.port.mk>
diff --git a/x11/xfce4-quicklauncher-plugin/Makefile b/x11/xfce4-quicklauncher-plugin/Makefile
index 056cd7f785c9..7dde7d01774e 100644
--- a/x11/xfce4-quicklauncher-plugin/Makefile
+++ b/x11/xfce4-quicklauncher-plugin/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	xfce4-quicklauncher-plugin
 PORTVERSION=	1.9.4
-PORTREVISION=	16
+PORTREVISION=	17
 CATEGORIES=	x11 xfce
 MASTER_SITES=	${MASTER_SITE_XFCE}
 MASTER_SITE_SUBDIR=src/panel-plugins/${PORTNAME}/${PORTVERSION:R}
@@ -16,8 +16,8 @@ LICENSE=	GPLv2
 
 SSP_UNSAFE=	yes
 GNU_CONFIGURE=	yes
-USES=		gettext gmake libtool pkgconfig tar:bzip2
+USES=		gettext gmake libtool pkgconfig xfce tar:bzip2
 USE_GNOME=	gtk20 intltool intlhack
-USE_XFCE=	configenv libgui panel
+USE_XFCE=	libgui panel
 
 .include <bsd.port.mk>
diff --git a/x11/xfce4-screenshooter-plugin/Makefile b/x11/xfce4-screenshooter-plugin/Makefile
index 9687df2dac47..636eee34c1d6 100644
--- a/x11/xfce4-screenshooter-plugin/Makefile
+++ b/x11/xfce4-screenshooter-plugin/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	xfce4-screenshooter-plugin
 PORTVERSION=	1.8.2
+PORTREVISION=	1
 CATEGORIES=	x11 xfce
 MASTER_SITES=	${MASTER_SITE_XFCE}
 MASTER_SITE_SUBDIR=src/apps/xfce4-screenshooter/${PORTVERSION:R}
@@ -20,8 +21,8 @@ LIB_DEPENDS=	libsoup-2.4.so:${PORTSDIR}/devel/libsoup
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
 USE_GNOME=	glib20 gtk20 intltool intlhack libxml2
-USE_XFCE=	configenv libexo libmenu libutil panel
-USES=		pkgconfig gmake libtool tar:bzip2
+USE_XFCE=	panel
+USES=		pkgconfig gmake libtool xfce tar:bzip2
 USE_XORG=	xfixes xext
 
 OPTIONS_DEFINE=	NLS
diff --git a/x11/xfce4-terminal/Makefile b/x11/xfce4-terminal/Makefile
index 965166ce575b..9c0cdc755e18 100644
--- a/x11/xfce4-terminal/Makefile
+++ b/x11/xfce4-terminal/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	xfce4-terminal
 PORTVERSION=	0.6.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11 xfce
 MASTER_SITES=	${MASTER_SITE_XFCE}
 MASTER_SITE_SUBDIR=	src/apps/${PORTNAME}/${PORTVERSION:R}
@@ -19,24 +19,18 @@ LIB_DEPENDS=	libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib
 
 GNU_CONFIGURE=	yes
 USE_GNOME=	gtk20 glib20 intltool intlhack vte libxml2
-USE_XFCE=	configenv libmenu
+USE_XFCE=	libmenu
 USE_XORG=	x11
-USES=		pkgconfig gmake tar:bzip2
+USES=		pkgconfig gmake gettext-tools xfce tar:bzip2
 
 CONFIGURE_ARGS=	--without-gnome-default-appsdir
 
 OPTIONS_DEFINE=	NLS
+NLS_CONFIGURE_ENABLE=	nls
+NLS_USES=	gettext-runtime
+OPTIONS_SUB=	yes
 
-.include  <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MNLS}
-USES+=		gettext
-CONFIGURE_ARGS+=--enable-nls
-PLIST_SUB+=	NLS=""
-.else
-CONFIGURE_ARGS+=--disable-nls
-PLIST_SUB+=	NLS="@comment "
-.endif
+.include <bsd.port.pre.mk>
 
 post-patch:
 .if ! ${PORT_OPTIONS:MNLS}
@@ -44,4 +38,4 @@ post-patch:
 		s|po \\|terminal|' ${WRKSRC}/Makefile.in
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/x11/xfce4-verve-plugin/Makefile b/x11/xfce4-verve-plugin/Makefile
index 2abd3ab56906..c3e3af8569fc 100644
--- a/x11/xfce4-verve-plugin/Makefile
+++ b/x11/xfce4-verve-plugin/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	verve-plugin
 PORTVERSION=	1.0.1
+PORTREVISION=	1
 CATEGORIES=	x11 xfce
 MASTER_SITES=	${MASTER_SITE_XFCE}
 MASTER_SITE_SUBDIR=src/panel-plugins/${PKGNAMEPREFIX}${PORTNAME}/${PORTVERSION:R}
@@ -19,9 +20,9 @@ LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre \
 	libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib
 
 GNU_CONFIGURE=	yes
-USES=		gmake libtool pkgconfig tar:bzip2
+USES=		gmake libtool pkgconfig xfce tar:bzip2
 USE_GNOME=	glib20 intltool intlhack
-USE_XFCE=	configenv libexo libmenu libutil panel
+USE_XFCE=	panel
 
 CONFIGURE_ARGS=--enable-dbus
 
diff --git a/x11/xfce4-whiskermenu-plugin/Makefile b/x11/xfce4-whiskermenu-plugin/Makefile
index 2c87a8b606f9..1c7274e37d6c 100644
--- a/x11/xfce4-whiskermenu-plugin/Makefile
+++ b/x11/xfce4-whiskermenu-plugin/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	xfce4-whiskermenu-plugin
 PORTVERSION=	1.5.0
+PORTREVISION=	1
 CATEGORIES=	x11 xfce
 MASTER_SITES=	XFCE
 MASTER_SITE_SUBDIR=	src/panel-plugins/${PORTNAME}/${PORTVERSION:R}
@@ -16,9 +17,9 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 WRKSRC=	${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
-USES=	pkgconfig cmake gettext tar:bzip2
+USES=	pkgconfig cmake gettext xfce tar:bzip2
 USE_GNOME=	gtk20
-USE_XFCE=	configenv garcon libexo libmenu libutil panel
+USE_XFCE=	panel
 INSTALLS_ICONS=	yes
 
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/x11/xfce4-wmdock-plugin/Makefile b/x11/xfce4-wmdock-plugin/Makefile
index 057093bfae34..1a1443771c2b 100644
--- a/x11/xfce4-wmdock-plugin/Makefile
+++ b/x11/xfce4-wmdock-plugin/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	xfce4-wmdock-plugin
 PORTVERSION=	0.6.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11 xfce
 MASTER_SITES=	XFCE/src/panel-plugins/xfce4-wmdock-plugin/0.6
 DIST_SUBDIR=	xfce4
@@ -12,10 +12,10 @@ MAINTAINER=	xfce@FreeBSD.org
 COMMENT=	WMdock plugin for Xfce
 
 GNU_CONFIGURE=	yes
-USES=		gettext gmake libtool pkgconfig tar:bzip2
+USES=		gettext gmake libtool pkgconfig xfce tar:bzip2
 INSTALLS_ICONS=	yes
 USE_GNOME=	gtk20 intltool intlhack libwnck
-USE_XFCE=	configenv libgui libutil panel
+USE_XFCE=	libgui panel
 INSTALLS_ICONS=	yes
 USE_XORG=	x11