From owner-svn-ports-all@freebsd.org  Sat Oct  7 19:59:31 2017
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 C187AE40E1F;
 Sat,  7 Oct 2017 19:59:31 +0000 (UTC)
 (envelope-from naddy@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 61A7D69D1E;
 Sat,  7 Oct 2017 19:59:31 +0000 (UTC)
 (envelope-from naddy@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v97JxU9Y054366;
 Sat, 7 Oct 2017 19:59:30 GMT (envelope-from naddy@FreeBSD.org)
Received: (from naddy@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v97JxUCL054365;
 Sat, 7 Oct 2017 19:59:30 GMT (envelope-from naddy@FreeBSD.org)
Message-Id: <201710071959.v97JxUCL054365@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: naddy set sender to
 naddy@FreeBSD.org using -f
From: Christian Weisgerber <naddy@FreeBSD.org>
Date: Sat, 7 Oct 2017 19:59:30 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r451480 - head/net/openntpd
X-SVN-Group: ports-head
X-SVN-Commit-Author: naddy
X-SVN-Commit-Paths: head/net/openntpd
X-SVN-Commit-Revision: 451480
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.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: Sat, 07 Oct 2017 19:59:32 -0000

Author: naddy
Date: Sat Oct  7 19:59:30 2017
New Revision: 451480
URL: https://svnweb.freebsd.org/changeset/ports/451480

Log:
  Register conflict with ntp, ntp-devel.

Modified:
  head/net/openntpd/Makefile

Modified: head/net/openntpd/Makefile
==============================================================================
--- head/net/openntpd/Makefile	Sat Oct  7 19:45:04 2017	(r451479)
+++ head/net/openntpd/Makefile	Sat Oct  7 19:59:30 2017	(r451480)
@@ -13,11 +13,13 @@ LICENSE=	ISCL
 
 RUN_DEPENDS=	ca_root_nss>=0:security/ca_root_nss
 
+CONFLICTS=	ntp-[0-9].* ntp-devel-*
+
+USES=		ssl
+
 USE_RC_SUBR=	openntpd
 USERS=		_ntp
 GROUPS=		_ntp
-
-USES=		ssl
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-cacert=${LOCALBASE}/etc/ssl/cert.pem