Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 23 Dec 2016 09:24:26 +0000 (UTC)
From:      Olivier Duchateau <olivierd@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r429233 - head/Mk/Uses
Message-ID:  <201612230924.uBN9OQTJ049623@repo.freebsd.org>

Next in thread | Raw E-Mail | Index | Archive | Help
Author: olivierd
Date: Fri Dec 23 09:24:25 2016
New Revision: 429233
URL: https://svnweb.freebsd.org/changeset/ports/429233

Log:
  Rewrite GTK3 support
  
  Obtained from:	Xfce devel repository

Modified:
  head/Mk/Uses/xfce.mk

Modified: head/Mk/Uses/xfce.mk
==============================================================================
--- head/Mk/Uses/xfce.mk	Fri Dec 23 09:12:26 2016	(r429232)
+++ head/Mk/Uses/xfce.mk	Fri Dec 23 09:24:25 2016	(r429233)
@@ -9,7 +9,6 @@
 #
 # Variables, which can be set by the port:
 #
-# MASTER_SITE_SUBDIR	Path
 # USE_XFCE		List of components
 #
 # MAINTAINER: xfce@FreeBSD.org
@@ -27,6 +26,22 @@ xfce_ARGS?=	# empty
 CPPFLAGS+=	-I${LOCALBASE}/include
 LIBS+=	-L${LOCALBASE}/lib
 
+.if ${xfce_ARGS:Mgtk3}
+libmenu_LIB_DEPENDS=	libxfce4ui-2.so:x11/libxfce4menu
+libmenu_USE_XFCE_REQ=	xfconf
+
+panel_LIB_DEPENDS=	libxfce4panel-2.0.so:x11-wm/xfce4-panel
+panel_RUN_DEPENDS=	xfce4-panel:x11-wm/xfce4-panel
+panel_USE_XFCE_REQ=	garcon libexo xfconf
+.else
+libmenu_LIB_DEPENDS=	libxfce4ui-1.so:x11/libxfce4menu
+libmenu_USE_XFCE_REQ=	xfconf
+
+panel_LIB_DEPENDS=	libxfce4panel-1.0.so:x11-wm/xfce4-panel
+panel_RUN_DEPENDS=	xfce4-panel:x11-wm/xfce4-panel
+panel_USE_XFCE_REQ=	garcon libexo xfconf
+.endif
+
 garcon_LIB_DEPENDS=	libgarcon-1.so:sysutils/garcon
 garcon_USE_XFCE_REQ=	libmenu
 
@@ -36,19 +51,8 @@ libexo_USE_XFCE_REQ=	libmenu
 libgui_LIB_DEPENDS=	libxfcegui4.so:x11-toolkits/libxfce4gui
 libgui_USE_XFCE_REQ=	libutil
 
-libmenu_LIB_DEPENDS=	libxfce4ui-1.so:x11/libxfce4menu
-libmenu_DETECT=	${LOCALBASE}/lib/libxfce4ui-1.so
-libmenu_GTK3_DETECT=	${LOCALBASE}/lib/libxfce4ui-2.so
-libmenu_USE_XFCE_REQ=	xfconf
-
 libutil_LIB_DEPENDS=	libxfce4util.so:x11/libxfce4util
 
-panel_LIB_DEPENDS=	libxfce4panel-1.0.so:x11-wm/xfce4-panel
-panel_RUN_DEPENDS=	xfce4-panel:x11-wm/xfce4-panel
-panel_DETECT=	${LOCALBASE}/lib/libxfce4panel-1.0.so
-panel_GTK3_DETECT=	${LOCALBASE}/lib/libxfce4panel-2.0.so
-panel_USE_XFCE_REQ=	garcon libexo xfconf
-
 thunar_LIB_DEPENDS=	libthunarx-2.so:x11-fm/thunar
 thunar_RUN_DEPENDS=	Thunar:x11-fm/thunar
 thunar_USE_XFCE_REQ=	xfconf libmenu
@@ -76,15 +80,6 @@ _USE_XFCE+=	${${comp}_USE_XFCE_REQ} ${co
 USE_XFCE=	${_USE_XFCE:O:u}
 
 .for comp in ${USE_XFCE}
-
-. if ${xfce_ARGS} == gtk3
-.  if defined(${comp}_GTK3_DETECT)
-.   if exists(${${comp}_DETECT}) && !exists(${${comp}_GTK3_DETECT})
-BROKEN+=	GTK3 option needs to be set in ${comp}
-.   endif
-.  endif
-. endif
-
 . if defined(${comp}_BUILD_DEPENDS)
 BUILD_DEPENDS+=	${${comp}_BUILD_DEPENDS}
 . endif



Want to link to this message? Use this URL: <http://docs.FreeBSD.org/cgi/mid.cgi?201612230924.uBN9OQTJ049623>