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, 26 insertions, 77 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