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, 22 insertions, 48 deletions

diff --git a/devel/thunar-vcs-plugin/Makefile b/devel/thunar-vcs-plugin/Makefile
index 96995a4b0ac5..19246723d899 100644
--- a/devel/thunar-vcs-plugin/Makefile
+++ b/devel/thunar-vcs-plugin/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	thunar-vcs-plugin
 PORTVERSION=	0.1.4
-PORTREVISION=	12
+PORTREVISION=	13
 CATEGORIES=	devel xfce
 MASTER_SITES=	${MASTER_SITE_XFCE}
 MASTER_SITE_SUBDIR=	src/thunar-plugins/${PORTNAME}/${PORTVERSION:R}
@@ -14,43 +14,21 @@ COMMENT=	Version Control System plugin for Thunar
 
 GNU_CONFIGURE=	yes
 USE_GNOME=	gtk20 glib20 intltool intlhack
-USE_XFCE=	configenv libexo libutil thunar
+USE_XFCE=	thunar
 INSTALLS_ICONS=	yes
-USES=		pkgconfig gmake libtool tar:bzip2
+USES=		pkgconfig gmake libtool gettext-tools xfce tar:bzip2
 
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 OPTIONS_DEFINE=	NLS GIT SVN
 OPTIONS_DEFAULT=	SVN
 GIT_DESC=	Git support
-
-.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
-
-.if ${PORT_OPTIONS:MGIT}
-RUN_DEPENDS+=	git:${PORTSDIR}/devel/git
-CONFIGURE_ARGS+=--enable-git
-PLIST_SUB+=	GIT=""
-.else
-CONFIGURE_ARGS+=--disable-git
-PLIST_SUB+=	GIT="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MSVN}
-LIB_DEPENDS+=	libsvn_client-1.so:${PORTSDIR}/devel/subversion
-CONFIGURE_ARGS+=--enable-subversion
-PLIST_SUB+=	SVN=""
-.else
-CONFIGURE_ARGS+=--disable-subversion
-PLIST_SUB+=	SVN="@comment "
-.endif
+NLS_USES=	gettext-runtime
+NLS_CONFIGURE_ENABLE=	nls
+GIT_RUN_DEPENDS=	git:${PORTSDIR}/devel/git
+GIT_CONFIGURE_ENABLE=	git
+SVN_LIB_DEPENDS=	libsvn_client-1.so:${PORTSDIR}/devel/subversion
+SVN_CONFIGURE_ENABLE=	subversion
+OPTIONS_SUB=	yes
 
 .include <bsd.port.mk>
diff --git a/devel/xfce4-dev-tools/Makefile b/devel/xfce4-dev-tools/Makefile
index 98a858cb8338..df253705c5cf 100644
--- a/devel/xfce4-dev-tools/Makefile
+++ b/devel/xfce4-dev-tools/Makefile
@@ -2,22 +2,22 @@
 # $FreeBSD$
 
 PORTNAME=	xfce4-dev-tools
-PORTVERSION=	4.10.0
-PORTREVISION=	1
+PORTVERSION=	4.12.0
 CATEGORIES=	devel xfce
 MASTER_SITES=	${MASTER_SITE_XFCE}
 DIST_SUBDIR=	xfce4
 
 MAINTAINER=	xfce@FreeBSD.org
-COMMENT=	Xfce 4 development tools
+COMMENT=	Xfce development tools
+
+LICENSE=	GPLv2
 
 RUN_DEPENDS=	autoconf-2.69:${PORTSDIR}/devel/autoconf \
 		automake-1.15:${PORTSDIR}/devel/automake \
 		libtoolize:${PORTSDIR}/devel/libtool
 
 GNU_CONFIGURE=	yes
-USE_XFCE=	configenv	# to get MASTER_SITE_SUBDIR something has to be defined
 USE_GNOME=	glib20
-USES=		pkgconfig tar:bzip2
+USES=		pkgconfig xfce tar:bzip2
 
 .include <bsd.port.mk>
diff --git a/devel/xfce4-dev-tools/distinfo b/devel/xfce4-dev-tools/distinfo
index d64357618d48..a460297598de 100644
--- a/devel/xfce4-dev-tools/distinfo
+++ b/devel/xfce4-dev-tools/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xfce4/xfce4-dev-tools-4.10.0.tar.bz2) = f79649bbfbbf16881494ee9f67035063765aec12e23ab9bac31de2c8a4f32bf8
-SIZE (xfce4/xfce4-dev-tools-4.10.0.tar.bz2) = 283987
+SHA256 (xfce4/xfce4-dev-tools-4.12.0.tar.bz2) = e2e3a654fe9110df81f8c2483c9cbfa6d656fed15d5e5e717d6ef10bd0f5b5cb
+SIZE (xfce4/xfce4-dev-tools-4.12.0.tar.bz2) = 309586
diff --git a/devel/xfce4-dev-tools/pkg-descr b/devel/xfce4-dev-tools/pkg-descr
index 8e9848d4f149..a3ab2e316c92 100644
--- a/devel/xfce4-dev-tools/pkg-descr
+++ b/devel/xfce4-dev-tools/pkg-descr
@@ -1,4 +1,4 @@
 The Xfce development tools are a collection of tools and macros for
 Xfce developers and people that want to build Xfce from Git.
 
-WWW: http://www.xfce.org/projects
+WWW: http://www.xfce.org/
diff --git a/devel/xfce4-vala/Makefile b/devel/xfce4-vala/Makefile
index 067814e2cee7..a71342f386f6 100644
--- a/devel/xfce4-vala/Makefile
+++ b/devel/xfce4-vala/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	xfce4-vala
 PORTVERSION=	4.10.3
+PORTREVISION=	1
 CATEGORIES=	devel xfce
 MASTER_SITES=	${MASTER_SITE_XFCE}
 MASTER_SITE_SUBDIR=	src/bindings/${PORTNAME}/${PORTVERSION:R}
@@ -16,14 +17,9 @@ LICENSE=	LGPL21
 BUILD_DEPENDS=	valac:${PORTSDIR}/lang/vala
 
 GNU_CONFIGURE=	yes
-USES=	pkgconfig gmake pathfix tar:bzip2
-USE_XFCE=	configenv garcon libexo libmenu libutil panel xfconf
+USES=	pkgconfig gmake pathfix xfce tar:bzip2
+USE_XFCE=	panel
 
-# vala-1.0.pc is symlink to libvala-${VALA_VER}.pc
-CONFIGURE_ARGS=	--with-vala-api=1.0
-
-post-patch:
-	@${REINPLACE_CMD} -e 's|libvala-|vala-|g' ${WRKSRC}/acinclude.m4 \
-		${WRKSRC}/configure
+CONFIGURE_ARGS=	--with-vala-api=0.26
 
 .include <bsd.port.mk>