aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Beich <jbeich@FreeBSD.org>2019-10-06 04:28:24 +0000
committerJan Beich <jbeich@FreeBSD.org>2019-10-06 04:28:24 +0000
commit7599c8080c017a1242cf6281bae5361f70467bc2 (patch)
treeee05b28f0e9bd4e359c0836089625d6d3bd6e002
parentbde62775844d520e85de194be1783112ecc3806f (diff)
downloadports-7599c8080c017a1242cf6281bae5361f70467bc2.tar.gz
ports-7599c8080c017a1242cf6281bae5361f70467bc2.zip
x11-fm/wcmcommander: conflicts with x11/wcm
Notes
Notes: svn path=/head/; revision=513868
-rw-r--r--x11-fm/wcmcommander/Makefile2
-rw-r--r--x11/wcm/Makefile2
2 files changed, 4 insertions, 0 deletions
diff --git a/x11-fm/wcmcommander/Makefile b/x11-fm/wcmcommander/Makefile
index 9cc229bb8aa6..6f35c890c266 100644
--- a/x11-fm/wcmcommander/Makefile
+++ b/x11-fm/wcmcommander/Makefile
@@ -17,6 +17,8 @@ USE_GITHUB= yes
GH_ACCOUNT= corporateshark
GH_PROJECT= WCMCommander
+CONFLICTS_INSTALL= wcm # bin/wcm
+
USES= compiler:c++11-lib cmake
CMAKE_ARGS= -DDATADIR="${DATADIR_REL}"
USE_XORG= x11
diff --git a/x11/wcm/Makefile b/x11/wcm/Makefile
index 04123332faa9..f9d859f22b53 100644
--- a/x11/wcm/Makefile
+++ b/x11/wcm/Makefile
@@ -12,6 +12,8 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
LIB_DEPENDS= libwf-config.so:devel/wf-config
+CONFLICTS_INSTALL= wcmcommander # bin/wcm
+
USES= compiler:c++11-lib meson pkgconfig
USE_GITHUB= yes
USE_GNOME= gtkmm30 libxml2