aboutsummaryrefslogtreecommitdiffstats
path: root/Mk
diff options
context:
space:
mode:
authorolivierd <olivierd@FreeBSD.org>2016-12-23 17:24:25 +0800
committerolivierd <olivierd@FreeBSD.org>2016-12-23 17:24:25 +0800
commitdf31cfabd7e37a092e99fec91b46c587a8f7e69c (patch)
tree3df4c0b18f975692cb7abea275e8578e4549eda4 /Mk
parentfeb360f9410302c82fbb1fdd17256b99c8cdf783 (diff)
downloadfreebsd-ports-gnome-df31cfabd7e37a092e99fec91b46c587a8f7e69c.tar.gz
freebsd-ports-gnome-df31cfabd7e37a092e99fec91b46c587a8f7e69c.tar.zst
freebsd-ports-gnome-df31cfabd7e37a092e99fec91b46c587a8f7e69c.zip
Rewrite GTK3 support
Obtained from: Xfce devel repository
Diffstat (limited to 'Mk')
-rw-r--r--Mk/Uses/xfce.mk37
1 files changed, 16 insertions, 21 deletions
diff --git a/Mk/Uses/xfce.mk b/Mk/Uses/xfce.mk
index 470fd248b96d..41909a502c60 100644
--- a/Mk/Uses/xfce.mk
+++ b/Mk/Uses/xfce.mk
@@ -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} ${comp}
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