Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 16 Nov 2020 12:27:59 +0000 (UTC)
From:      Jan Beich <jbeich@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r555470 - head/x11/wcm
Message-ID:  <202011161227.0AGCRxS5021699@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: jbeich
Date: Mon Nov 16 12:27:58 2020
New Revision: 555470
URL: https://svnweb.freebsd.org/changeset/ports/555470

Log:
  x11/wcm: make wf-shell optional

Modified:
  head/x11/wcm/Makefile   (contents, props changed)
  head/x11/wcm/pkg-plist   (contents, props changed)

Modified: head/x11/wcm/Makefile
==============================================================================
--- head/x11/wcm/Makefile	Mon Nov 16 12:27:48 2020	(r555469)
+++ head/x11/wcm/Makefile	Mon Nov 16 12:27:58 2020	(r555470)
@@ -13,8 +13,7 @@ LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	evdev-proto>0:devel/evdev-proto \
-		wayfire>0:x11-wm/wayfire \
-		wf-shell>0:x11/wf-shell
+		wayfire>0:x11-wm/wayfire
 LIB_DEPENDS=	libevdev.so:devel/libevdev \
 		libwf-config.so:devel/wf-config \
 		libwayland-client.so:graphics/wayland
@@ -28,5 +27,13 @@ USE_GNOME=	gtk30 libxml2
 GH_ACCOUNT=	WayfireWM
 DATADIR=	${PREFIX}/share/wayfire
 INSTALLS_ICONS=	yes
+
+OPTIONS_DEFINE=	WFSHELL
+OPTIONS_DEFAULT=WFSHELL
+OPTIONS_SUB=	yes
+
+WFSHELL_DESC=			Build with wf-shell support
+WFSHELL_BUILD_DEPENDS=		wf-shell>0:x11/wf-shell
+WFSHELL_MESON_ENABLED=		wf_shell
 
 .include <bsd.port.mk>

Modified: head/x11/wcm/pkg-plist
==============================================================================
--- head/x11/wcm/pkg-plist	Mon Nov 16 12:27:48 2020	(r555469)
+++ head/x11/wcm/pkg-plist	Mon Nov 16 12:27:58 2020	(r555470)
@@ -13,14 +13,14 @@ share/icons/hicolor/96x96/apps/wcm.png
 %%DATADIR%%/icons/plugin-autorotate-iio.svg
 %%DATADIR%%/icons/plugin-autostart.svg
 %%DATADIR%%/icons/plugin-background-view.svg
-%%DATADIR%%/icons/plugin-background.svg
+%%WFSHELL%%%%DATADIR%%/icons/plugin-background.svg
 %%DATADIR%%/icons/plugin-bench.svg
 %%DATADIR%%/icons/plugin-blur.svg
 %%DATADIR%%/icons/plugin-command.svg
 %%DATADIR%%/icons/plugin-core.svg
 %%DATADIR%%/icons/plugin-cube.svg
 %%DATADIR%%/icons/plugin-decoration.svg
-%%DATADIR%%/icons/plugin-dock.svg
+%%WFSHELL%%%%DATADIR%%/icons/plugin-dock.svg
 %%DATADIR%%/icons/plugin-expo.svg
 %%DATADIR%%/icons/plugin-fast-switcher.svg
 %%DATADIR%%/icons/plugin-fisheye.svg
@@ -32,7 +32,7 @@ share/icons/hicolor/96x96/apps/wcm.png
 %%DATADIR%%/icons/plugin-mag.svg
 %%DATADIR%%/icons/plugin-move.svg
 %%DATADIR%%/icons/plugin-oswitch.svg
-%%DATADIR%%/icons/plugin-panel.svg
+%%WFSHELL%%%%DATADIR%%/icons/plugin-panel.svg
 %%DATADIR%%/icons/plugin-place.svg
 %%DATADIR%%/icons/plugin-resize.svg
 %%DATADIR%%/icons/plugin-simple-tile.svg



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202011161227.0AGCRxS5021699>