From owner-svn-ports-all@freebsd.org  Sun Dec 25 17:52:12 2016
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@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 EC566C90F80;
 Sun, 25 Dec 2016 17:52:12 +0000 (UTC)
 (envelope-from riggs@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 BC1591C4C;
 Sun, 25 Dec 2016 17:52:12 +0000 (UTC)
 (envelope-from riggs@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uBPHqBG7035891;
 Sun, 25 Dec 2016 17:52:11 GMT (envelope-from riggs@FreeBSD.org)
Received: (from riggs@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id uBPHqBHW035890;
 Sun, 25 Dec 2016 17:52:11 GMT (envelope-from riggs@FreeBSD.org)
Message-Id: <201612251752.uBPHqBHW035890@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: riggs set sender to
 riggs@FreeBSD.org using -f
From: Thomas Zander <riggs@FreeBSD.org>
Date: Sun, 25 Dec 2016 17:52:11 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r429448 - head/net-mgmt/ccnet
X-SVN-Group: ports-head
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.23
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 25 Dec 2016 17:52:13 -0000

Author: riggs
Date: Sun Dec 25 17:52:11 2016
New Revision: 429448
URL: https://svnweb.freebsd.org/changeset/ports/429448

Log:
  Register CONFLICTS with ccnet-server
  
  PR:		215292

Modified:
  head/net-mgmt/ccnet/Makefile

Modified: head/net-mgmt/ccnet/Makefile
==============================================================================
--- head/net-mgmt/ccnet/Makefile	Sun Dec 25 17:33:03 2016	(r429447)
+++ head/net-mgmt/ccnet/Makefile	Sun Dec 25 17:52:11 2016	(r429448)
@@ -22,6 +22,8 @@ LIB_DEPENDS=	libsearpc.so:devel/libsearp
 		libjansson.so:devel/jansson \
 		libldap.so:net/openldap24-client
 
+CONFLICTS=	ccnet-server-[0-9]*
+
 USE_GITHUB=	yes
 GH_ACCOUNT=	haiwen