[Midnightbsd-cvs] mports [19271] trunk/Mk/extensions/xfce.mk: update xfce extension

Mon Jun 1 19:05:55 EDT 2015

Revision: 19271
          http://svnweb.midnightbsd.org/mports/?rev=19271
Author:   laffer1
Date:     2015-06-01 19:05:55 -0400 (Mon, 01 Jun 2015)
Log Message:
-----------
update xfce extension

Modified Paths:
--------------
    trunk/Mk/extensions/xfce.mk

Modified: trunk/Mk/extensions/xfce.mk
===================================================================

--- trunk/Mk/extensions/xfce.mk	2015-06-01 22:47:31 UTC (rev 19270)
+++ trunk/Mk/extensions/xfce.mk	2015-06-01 23:05:55 UTC (rev 19271)
@@ -1,71 +1,106 @@
 # $MidnightBSD$
 #
+# 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
+#
 
-.if !defined(_POSTMKINCLUDED) && !defined(Xfce_Pre_Include)
+.if !defined(_INCLUDE_USES_XFCE_Mk)
+_INCLUDE_USES_XFCE_Mk=	yes
+_USES_POST+=	xfce
 
-Xfce_Pre_Include=		xfce.mk
-Xfce_Include_MAINTAINER=	ports at MidnightBSD.org
+_USE_XFCE_ALL=	garcon libexo libgui libmenu libutil panel thunar xfconf
 
-# 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.
+XFCE_MASTER_SITE_VER=	4.12
 
-_USE_XFCE_ALL=			configenv garcon libexo libgui libmenu libutil panel \
-				thunar wm xfconf xfdev
+xfce_ARGS?=	# empty
 
-MASTER_SITE_SUBDIR?=		xfce/4.10/src
+CPPFLAGS+=	-I${LOCALBASE}/include
+LIBS+=	-L${LOCALBASE}/lib
 
-configenv_CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include -L${LOCALBASE}/lib"
+garcon_LIB_DEPENDS=	libgarcon-1.so:${PORTSDIR}/sysutils/garcon
+garcon_USE_XFCE_REQ=	libmenu
 
-garcon_BUILD_DEPENDS=		garcon>=0.2.1:${PORTSDIR}/sysutils/garcon
-garcon_RUN_DEPENDS=		garcon>=0.2.1:${PORTSDIR}/sysutils/garcon
+libexo_LIB_DEPENDS=	libexo-1.so:${PORTSDIR}/x11/libexo
+libexo_USE_XFCE_REQ=	libmenu
 
-libexo_BUILD_DEPENDS=		libexo>=0.10.1:${PORTSDIR}/x11/libexo
-libexo_RUN_DEPENDS=		libexo>=0.10.1:${PORTSDIR}/x11/libexo
+libgui_LIB_DEPENDS=	libxfcegui4.so:${PORTSDIR}/x11-toolkits/libxfce4gui
+libgui_USE_XFCE_REQ=	libutil
 
-libgui_BUILD_DEPENDS=		libxfce4gui>=4.10.0:${PORTSDIR}/x11-toolkits/libxfce4gui
-libgui_RUN_DEPENDS=		libxfce4gui>=4.10.0:${PORTSDIR}/x11-toolkits/libxfce4gui
+libmenu_LIB_DEPENDS=	libxfce4ui-1.so:${PORTSDIR}/x11/libxfce4menu
+libmenu_USE_XFCE_REQ=	xfconf
 
-libmenu_BUILD_DEPENDS=		libxfce4menu>=4.10.0:${PORTSDIR}/x11/libxfce4menu
-libmenu_RUN_DEPENDS=		libxfce4menu>=4.10.0:${PORTSDIR}/x11/libxfce4menu
+libutil_LIB_DEPENDS=	libxfce4util.so:${PORTSDIR}/x11/libxfce4util
 
-libutil_BUILD_DEPENDS=		libxfce4util>=4.10.1:${PORTSDIR}/x11/libxfce4util
-libutil_RUN_DEPENDS=		libxfce4util>=4.10.1:${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
 
-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_LIB_DEPENDS=	libthunarx-2.so:${PORTSDIR}/x11-fm/thunar
+thunar_RUN_DEPENDS=	Thunar:${PORTSDIR}/x11-fm/thunar
+thunar_USE_XFCE_REQ=	xfconf libmenu
 
-thunar_BUILD_DEPENDS=		Thunar>=1.6.3:${PORTSDIR}/x11-fm/thunar
-thunar_RUN_DEPENDS=		Thunar>=1.6.3:${PORTSDIR}/x11-fm/thunar
+xfconf_LIB_DEPENDS=	libxfconf-0.so:${PORTSDIR}/x11/xfce4-conf
+xfconf_USE_XFCE_REQ=	libutil
 
-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
+.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
 
-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
-
+# Then, use already expanded USE_XFCE_REQ to expand USE_XFCE.
+.if ${USE_XFCE} == yes
+.else
+.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
 .endif
 
-.if defined(_POSTMKINCLUDED) && !defined(Xfce_Post_Include)
+# Remove duplicate components
+USE_XFCE=	${_USE_XFCE:O:u}
 
-Xfce_Post_Include=		xfce.mk
+.for comp in ${USE_XFCE}
+. if defined(${comp}_BUILD_DEPENDS)
+BUILD_DEPENDS+=	${${comp}_BUILD_DEPENDS}
+. endif
 
-.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
+. if defined(${comp}_LIB_DEPENDS)
+LIB_DEPENDS+=	${${comp}_LIB_DEPENDS}
+. endif
 
-.for component in ${USE_XFCE}
-. if ${_USE_XFCE_ALL:M${component}}==""
-IGNORE=	cannot install: Unknown component ${component}
+. 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

