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>

5 files changed, 16 insertions, 55 deletions

diff --git a/x11-wm/xfce4-desktop/Makefile b/x11-wm/xfce4-desktop/Makefile
index 7ff176d8c1c4..1e7bb44a75e1 100644
--- a/x11-wm/xfce4-desktop/Makefile
+++ b/x11-wm/xfce4-desktop/Makefile
@@ -2,11 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	xfce4-desktop
-PORTVERSION=	4.10.3
-PORTREVISION=	2
+PORTVERSION=	4.12.0
 CATEGORIES=	x11-wm xfce
 MASTER_SITES=	${MASTER_SITE_XFCE}
-MASTER_SITE_SUBDIR=	src/xfce/xfdesktop/${PORTVERSION:R}
 DISTNAME=	xfdesktop-${PORTVERSION}
 DIST_SUBDIR=	xfce4
 
@@ -22,41 +20,24 @@ LIB_DEPENDS=	libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
 USE_GNOME=	glib20 gtk20 intltool intlhack libwnck
-USE_XFCE=	configenv garcon libmenu libutil libexo xfconf
-USES=	pkgconfig gmake tar:bzip2
+USE_XFCE=	garcon thunar
+USES=	pkgconfig gmake gettext-tools xfce tar:bzip2
 USE_XORG=	x11 sm
 
-# Prevent build error, with macro 'g_return_val_if_fail ()'
-CFLAGS+=	-Wno-return-type
-
 CONFIGURE_ARGS+=--enable-gio-unix \
-	--enable-notifications
-
-OPTIONS_DEFINE=		THUNAR NLS
-OPTIONS_DEFAULT=	THUNAR NLS
-THUNAR_DESC=	Enable thunar support
+	--enable-notifications \
+	--with-file-manager-fallback=Thunar
 
-.include <bsd.port.options.mk>
+OPTIONS_DEFINE=		NLS
+NLS_USES=	gettext-runtime
+NLS_CONFIGURE_ENABLE=	nls
+OPTIONS_SUB=	yes
 
-.if ${PORT_OPTIONS:MTHUNAR}
-CONFIGURE_ARGS+=--enable-thunarx --with-file-manager-fallback=Thunar
-USE_XFCE+=	thunar
-.else
-CONFIGURE_ARGS+=--disable-thunarx --without-file-manager-fallback
-.endif
-
-.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}
 	@${REINPLACE_CMD} -e 's|po ||' ${WRKSRC}/Makefile.in
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/x11-wm/xfce4-desktop/distinfo b/x11-wm/xfce4-desktop/distinfo
index caafbe6fbc09..f13937682248 100644
--- a/x11-wm/xfce4-desktop/distinfo
+++ b/x11-wm/xfce4-desktop/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xfce4/xfdesktop-4.10.3.tar.bz2) = 09ca2ba554d8b724b4bbb34b6fb3523de36b556efa4f28ecd802c9c5ba3272ce
-SIZE (xfce4/xfdesktop-4.10.3.tar.bz2) = 1054828
+SHA256 (xfce4/xfdesktop-4.12.0.tar.bz2) = 6e7a8b87317762214b6407576f6e2c1efcc176c136b4c7b869d18a74c87b7fc7
+SIZE (xfce4/xfdesktop-4.12.0.tar.bz2) = 1408116
diff --git a/x11-wm/xfce4-desktop/files/patch-src__xfdesktop-app-menu-item.c b/x11-wm/xfce4-desktop/files/patch-src__xfdesktop-app-menu-item.c
deleted file mode 100644
index c7ac70238e64..000000000000
--- a/x11-wm/xfce4-desktop/files/patch-src__xfdesktop-app-menu-item.c
+++ /dev/null
@@ -1,22 +0,0 @@
---- ./src/xfdesktop-app-menu-item.c.orig	2013-09-16 07:17:42.000000000 +0000
-+++ ./src/xfdesktop-app-menu-item.c	2013-12-17 20:23:34.000000000 +0000
-@@ -31,6 +31,7 @@
- 
- #include <libxfce4util/libxfce4util.h>
- #include <libxfce4ui/libxfce4ui.h>
-+#include <exo/exo.h>
- 
- #include "xfdesktop-app-menu-item.h"
- 
-@@ -212,6 +213,11 @@
- 
-             /* Turn the pixbuf into a gtk_image */
-             if(G_LIKELY(pixbuf)) {
-+                /* scale the pixbuf down if it needs it */
-+                GdkPixbuf *tmp = exo_gdk_pixbuf_scale_down(pixbuf, TRUE, w, h);
-+                g_object_unref(pixbuf);
-+                pixbuf = tmp;
-+
-                 image = gtk_image_new_from_pixbuf(pixbuf);
-                 g_object_unref(G_OBJECT(pixbuf));
-             }
diff --git a/x11-wm/xfce4-desktop/pkg-descr b/x11-wm/xfce4-desktop/pkg-descr
index f22117d413d5..b7b0115f5a6f 100644
--- a/x11-wm/xfce4-desktop/pkg-descr
+++ b/x11-wm/xfce4-desktop/pkg-descr
@@ -1,4 +1,4 @@
 The desktop manager sets the background image, and provides a root  
 window menu, desktop icons or minimized icons and windows list.
 
-WWW: http://docs.xfce.org/xfce/xfdesktop/start
+WWW: http://www.xfce.org/
diff --git a/x11-wm/xfce4-desktop/pkg-plist b/x11-wm/xfce4-desktop/pkg-plist
index de9240f7d343..c20a0a32efe3 100644
--- a/x11-wm/xfce4-desktop/pkg-plist
+++ b/x11-wm/xfce4-desktop/pkg-plist
@@ -3,6 +3,7 @@ bin/xfdesktop-settings
 man/man1/xfdesktop.1.gz
 share/applications/xfce-backdrop-settings.desktop
 share/backgrounds/xfce/xfce-blue.jpg
+share/backgrounds/xfce/xfce-teal.jpg
 share/icons/hicolor/32x32/apps/xfce4-backdrop.png
 share/icons/hicolor/32x32/apps/xfce4-menueditor.png
 share/icons/hicolor/48x48/apps/xfce4-backdrop.png
@@ -26,6 +27,7 @@ share/icons/hicolor/scalable/apps/xfce4-menueditor.svg
 %%NLS%%share/locale/es/LC_MESSAGES/xfdesktop.mo
 %%NLS%%share/locale/et/LC_MESSAGES/xfdesktop.mo
 %%NLS%%share/locale/eu/LC_MESSAGES/xfdesktop.mo
+%%NLS%%share/locale/fa_IR/LC_MESSAGES/xfdesktop.mo
 %%NLS%%share/locale/fi/LC_MESSAGES/xfdesktop.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/xfdesktop.mo
 %%NLS%%share/locale/gl/LC_MESSAGES/xfdesktop.mo