From owner-svn-ports-head@freebsd.org  Mon Oct 23 07:19:53 2017
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id DF3B8E43184;
 Mon, 23 Oct 2017 07:19:53 +0000 (UTC) (envelope-from vd@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 mx1.freebsd.org (Postfix) with ESMTPS id AE94A652FF;
 Mon, 23 Oct 2017 07:19:53 +0000 (UTC) (envelope-from vd@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9N7JqsI012176;
 Mon, 23 Oct 2017 07:19:52 GMT (envelope-from vd@FreeBSD.org)
Received: (from vd@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9N7JqrM012175;
 Mon, 23 Oct 2017 07:19:52 GMT (envelope-from vd@FreeBSD.org)
Message-Id: <201710230719.v9N7JqrM012175@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: vd set sender to vd@FreeBSD.org
 using -f
From: Vasil Dimov <vd@FreeBSD.org>
Date: Mon, 23 Oct 2017 07:19:52 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r452693 - head/net/cppzmq
X-SVN-Group: ports-head
X-SVN-Commit-Author: vd
X-SVN-Commit-Paths: head/net/cppzmq
X-SVN-Commit-Revision: 452693
X-SVN-Commit-Repository: ports
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 23 Oct 2017 07:19:54 -0000

Author: vd
Date: Mon Oct 23 07:19:52 2017
New Revision: 452693
URL: https://svnweb.freebsd.org/changeset/ports/452693

Log:
  net/cppzmq: s/CONFLICTS/CONFLICTS_INSTALL/
  
  CONFLICTS_INSTALL is more precise (it can be built and packaged
  concurrently, just not installed concurrently).
  
  Reported by:	koobs@

Modified:
  head/net/cppzmq/Makefile

Modified: head/net/cppzmq/Makefile
==============================================================================
--- head/net/cppzmq/Makefile	Mon Oct 23 06:49:03 2017	(r452692)
+++ head/net/cppzmq/Makefile	Mon Oct 23 07:19:52 2017	(r452693)
@@ -16,7 +16,7 @@ USES=		cmake pkgconfig
 CMAKE_ARGS=	--no-warn-unused-cli -Wno-dev
 
 # cppzmq is included in libzmq2
-CONFLICTS=	libzmq2
+CONFLICTS_INSTALL=	libzmq2
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	zeromq