From owner-svn-ports-all@freebsd.org Sun Oct 6 04:28:24 2019 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id DF59AFAEEB; Sun, 6 Oct 2019 04:28:24 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 46m9bD5SXSz4ZNw; Sun, 6 Oct 2019 04:28:24 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 9C3491FC30; Sun, 6 Oct 2019 04:28:24 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x964SOJU054447; Sun, 6 Oct 2019 04:28:24 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x964SOXa054446; Sun, 6 Oct 2019 04:28:24 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201910060428.x964SOXa054446@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Sun, 6 Oct 2019 04:28:24 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r513868 - in head: x11-fm/wcmcommander x11/wcm X-SVN-Group: ports-head X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: in head: x11-fm/wcmcommander x11/wcm X-SVN-Commit-Revision: 513868 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Oct 2019 04:28:25 -0000 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