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>

3 files changed, 22 insertions, 44 deletions

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