svn commit: r513868 - in head: x11-fm/wcmcommander x11/wcm

[Jan Beich]

Author: jbeich
Date: Sun Oct  6 04:28:24 2019
New Revision: 513868
URL: https://svnweb.freebsd.org/changeset/ports/513868

Log:
  x11-fm/wcmcommander: conflicts with x11/wcm

Modified:
  head/x11-fm/wcmcommander/Makefile   (contents, props changed)
  head/x11/wcm/Makefile   (contents, props changed)

Modified: head/x11-fm/wcmcommander/Makefile
==============================================================================
--- head/x11-fm/wcmcommander/Makefile	Sun Oct  6 04:28:18 2019	(r513867)
+++ head/x11-fm/wcmcommander/Makefile	Sun Oct  6 04:28:24 2019	(r513868)
@@ -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

Modified: head/x11/wcm/Makefile
==============================================================================
--- head/x11/wcm/Makefile	Sun Oct  6 04:28:18 2019	(r513867)
+++ head/x11/wcm/Makefile	Sun Oct  6 04:28:24 2019	(r513868)
@@ -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