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>

2 files changed, 105 insertions, 72 deletions

diff --git a/Mk/Uses/xfce.mk b/Mk/Uses/xfce.mk
new file mode 100644
index 000000000000..6ceb9ca407c4
--- /dev/null
+++ b/Mk/Uses/xfce.mk
@@ -0,0 +1,105 @@
+#
+# $FreeBSD$
+#
+# Provide support for Xfce related ports.
+#
+# Feature:	xfce
+# Usage:	USES=xfce or USES=xfce:ARGS
+# Valid ARGS:	gtk3
+#
+# Variables, which can be set by the port:
+#
+# MASTER_SITE_SUBDIR	Path
+# USE_XFCE		List of components
+#
+# MAINTAINER: xfce@FreeBSD.org
+
+.if !defined(_INCLUDE_USES_XFCE_Mk)
+_INCLUDE_USES_XFCE_Mk=	yes
+_USES_POST+=	xfce
+
+_USE_XFCE_ALL=	garcon libexo libgui libmenu libutil panel thunar xfconf
+
+MASTER_SITE_SUBDIR?=	xfce/4.12/src
+
+xfce_ARGS?=	# empty
+
+CPPFLAGS+=	-I${LOCALBASE}/include
+LIBS+=	-L${LOCALBASE}/lib
+
+garcon_LIB_DEPENDS=	libgarcon-1.so:${PORTSDIR}/sysutils/garcon
+garcon_USE_XFCE_REQ=	libmenu
+
+libexo_LIB_DEPENDS=	libexo-1.so:${PORTSDIR}/x11/libexo
+libexo_USE_XFCE_REQ=	libmenu
+
+libgui_LIB_DEPENDS=	libxfcegui4.so:${PORTSDIR}/x11-toolkits/libxfce4gui
+libgui_USE_XFCE_REQ=	libutil
+
+libmenu_LIB_DEPENDS=	libxfce4ui-1.so:${PORTSDIR}/x11/libxfce4menu
+libmenu_USE_XFCE_REQ=	xfconf
+
+libutil_LIB_DEPENDS=	libxfce4util.so:${PORTSDIR}/x11/libxfce4util
+
+panel_LIB_DEPENDS=	libxfce4panel-1.0.so:${PORTSDIR}/x11-wm/xfce4-panel
+panel_RUN_DEPENDS=	xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel
+panel_USE_XFCE_REQ=	garcon libexo xfconf
+
+thunar_LIB_DEPENDS=	libthunarx-2.so:${PORTSDIR}/x11-fm/thunar
+thunar_RUN_DEPENDS=	Thunar:${PORTSDIR}/x11-fm/thunar
+thunar_USE_XFCE_REQ=	xfconf libmenu
+
+xfconf_LIB_DEPENDS=	libxfconf-0.so:${PORTSDIR}/x11/xfce4-conf
+xfconf_USE_XFCE_REQ=	libutil
+
+.if defined(USE_XFCE)
+# First, expand all USE_XFCE_REQ recursively.
+.for comp in ${_USE_XFCE_ALL}
+. for subcomp in ${${comp}_USE_XFCE_REQ}
+${comp}_USE_XFCE_REQ+=${${subcomp}_USE_XFCE_REQ}
+. endfor
+.endfor
+
+# Then, use already expanded USE_XFCE_REQ to expand USE_XFCE.
+.for comp in ${USE_XFCE}
+. if ${_USE_XFCE_ALL:M${comp}} == ""
+IGNORE=	cannot install: Unknown component ${comp}
+. endif
+_USE_XFCE+=	${${comp}_USE_XFCE_REQ} ${comp}
+.endfor
+
+# Remove duplicate components
+USE_XFCE=	${_USE_XFCE:O:u}
+
+.for comp in ${USE_XFCE}
+. if defined(${comp}_BUILD_DEPENDS)
+BUILD_DEPENDS+=	${${comp}_BUILD_DEPENDS}
+. endif
+
+. if defined(${comp}_LIB_DEPENDS)
+LIB_DEPENDS+=	${${comp}_LIB_DEPENDS}
+. endif
+
+. if defined(${comp}_RUN_DEPENDS)
+RUN_DEPENDS+=	${${comp}_RUN_DEPENDS}
+. endif
+.endfor
+
+.if ${USE_XFCE:M*gui} == libgui
+DEPRECATED?=	Depends on unmaintained x11-toolkits/libxfce4gui
+. endif
+
+.if ${xfce_ARGS} == gtk3
+. if exists(${LOCALBASE}/lib/libxfce4ui-1.so) && !exists(${LOCALBASE}/lib/libxfce4ui-2.so)
+BROKEN=	GTK3 option needs to be set in x11/libxfce4menu
+. endif
+.endif
+
+.endif # end of defined(USE_XFCE)
+
+.endif
+
+.if defined(_POSTMKINCLUDED) && !defined(_INCLUDE_USES_XFCE_POST_MK)
+_INCLUDE_USES_XFCE_POST_MK=	yes
+
+.endif
diff --git a/Mk/bsd.xfce.mk b/Mk/bsd.xfce.mk
deleted file mode 100644
index 55ee09fd2ccb..000000000000
--- a/Mk/bsd.xfce.mk
+++ /dev/null
@@ -1,72 +0,0 @@
-#
-# $FreeBSD$
-#
-
-.if !defined(_POSTMKINCLUDED) && !defined(Xfce_Pre_Include)
-
-Xfce_Pre_Include=		bsd.xfce.mk
-Xfce_Include_MAINTAINER=	xfce@FreeBSD.org
-
-# This file contains some variable definitions that are supposed to
-# make your life easier when dealing with ports related to the Xfce
-# desktop environment. It's automatically included when USE_XFCE
-# is defined in the ports' makefile.
-
-_USE_XFCE_ALL=			configenv garcon libexo libgui libmenu libutil panel \
-				thunar wm xfconf xfdev
-
-MASTER_SITE_SUBDIR?=		xfce/4.10/src
-
-configenv_CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include -L${LOCALBASE}/lib"
-
-garcon_BUILD_DEPENDS=		garcon>=0.2.1:${PORTSDIR}/sysutils/garcon
-garcon_RUN_DEPENDS=		garcon>=0.2.1:${PORTSDIR}/sysutils/garcon
-
-libexo_BUILD_DEPENDS=		libexo>=0.10.1:${PORTSDIR}/x11/libexo
-libexo_RUN_DEPENDS=		libexo>=0.10.1:${PORTSDIR}/x11/libexo
-
-libgui_BUILD_DEPENDS=		libxfce4gui>=4.10.0:${PORTSDIR}/x11-toolkits/libxfce4gui
-libgui_RUN_DEPENDS=		libxfce4gui>=4.10.0:${PORTSDIR}/x11-toolkits/libxfce4gui
-
-libmenu_BUILD_DEPENDS=		libxfce4menu>=4.10.0:${PORTSDIR}/x11/libxfce4menu
-libmenu_RUN_DEPENDS=		libxfce4menu>=4.10.0:${PORTSDIR}/x11/libxfce4menu
-
-libutil_BUILD_DEPENDS=		libxfce4util>=4.10.1:${PORTSDIR}/x11/libxfce4util
-libutil_RUN_DEPENDS=		libxfce4util>=4.10.1:${PORTSDIR}/x11/libxfce4util
-
-panel_BUILD_DEPENDS=		xfce4-panel>=4.10.1:${PORTSDIR}/x11-wm/xfce4-panel
-panel_RUN_DEPENDS=		xfce4-panel>=4.10.1:${PORTSDIR}/x11-wm/xfce4-panel
-
-thunar_BUILD_DEPENDS=		Thunar>=1.6.3:${PORTSDIR}/x11-fm/thunar
-thunar_RUN_DEPENDS=		Thunar>=1.6.3:${PORTSDIR}/x11-fm/thunar
-
-wm_BUILD_DEPENDS=		xfce4-wm>=4.10.1:${PORTSDIR}/x11-wm/xfce4-wm
-wm_RUN_DEPENDS=			xfce4-wm>=4.10.1:${PORTSDIR}/x11-wm/xfce4-wm
-
-xfconf_BUILD_DEPENDS=		xfce4-conf>=4.10.0:${PORTSDIR}/x11/xfce4-conf
-xfconf_RUN_DEPENDS=		xfce4-conf>=4.10.0:${PORTSDIR}/x11/xfce4-conf
-
-xfdev_BUILD_DEPENDS=		xdt-csource:${PORTSDIR}/devel/xfce4-dev-tools
-xfdev_RUN_DEPENDS=		xdt-csource:${PORTSDIR}/devel/xfce4-dev-tools
-
-.endif
-
-.if defined(_POSTMKINCLUDED) && !defined(Xfce_Post_Include)
-
-Xfce_Post_Include=		bsd.xfce.mk
-
-.for component in ${USE_XFCE}
-BUILD_DEPENDS+=	${${component}_BUILD_DEPENDS}
-LIB_DEPENDS+=	${${component}_LIB_DEPENDS}
-RUN_DEPENDS+=	${${component}_RUN_DEPENDS}
-CONFIGURE_ENV+=	${${component}_CONFIGURE_ENV} \
-	ac_cv_prog_AWK="${AWK}"
-.endfor
-
-.for component in ${USE_XFCE}
-. if ${_USE_XFCE_ALL:M${component}}==""
-IGNORE=	cannot install: Unknown component ${component}
-. endif
-.endfor
-
-.endif