From owner-svn-ports-all@freebsd.org  Tue Nov 22 13:54:45 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 38B13C4E86D;
 Tue, 22 Nov 2016 13:54:45 +0000 (UTC) (envelope-from cy@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 0AAD4628;
 Tue, 22 Nov 2016 13:54:44 +0000 (UTC) (envelope-from cy@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uAMDsixd065029;
 Tue, 22 Nov 2016 13:54:44 GMT (envelope-from cy@FreeBSD.org)
Received: (from cy@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id uAMDsiAo065027;
 Tue, 22 Nov 2016 13:54:44 GMT (envelope-from cy@FreeBSD.org)
Message-Id: <201611221354.uAMDsiAo065027@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: cy set sender to cy@FreeBSD.org
 using -f
From: Cy Schubert <cy@FreeBSD.org>
Date: Tue, 22 Nov 2016 13:54:44 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r426826 - in head/net: ntp ntp-devel
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: Tue, 22 Nov 2016 13:54:45 -0000

Author: cy
Date: Tue Nov 22 13:54:43 2016
New Revision: 426826
URL: https://svnweb.freebsd.org/changeset/ports/426826

Log:
  Remove documentation of conflict with the ntp-rc port. net/ntp-rc
  is only an active port when an NTP release candidate is available.
  
  Submitted by:	des

Modified:
  head/net/ntp-devel/Makefile
  head/net/ntp/Makefile

Modified: head/net/ntp-devel/Makefile
==============================================================================
--- head/net/ntp-devel/Makefile	Tue Nov 22 13:45:29 2016	(r426825)
+++ head/net/ntp-devel/Makefile	Tue Nov 22 13:54:43 2016	(r426826)
@@ -16,7 +16,7 @@ COMMENT=	The Network Time Protocol Distr
 LIB_DEPENDS=	libevent.so:devel/libevent2 \
 		libmd5.so:www/libwww
 
-CONFLICTS=	ntp-[0-9].* ntp-rc-*
+CONFLICTS=	ntp-[0-9].*
 
 USES=		cpe pathfix shebangfix libedit libtool localbase:ldflags \
 		pkgconfig ssl gettext-runtime

Modified: head/net/ntp/Makefile
==============================================================================
--- head/net/ntp/Makefile	Tue Nov 22 13:45:29 2016	(r426825)
+++ head/net/ntp/Makefile	Tue Nov 22 13:54:43 2016	(r426826)
@@ -16,7 +16,7 @@ COMMENT=	The Network Time Protocol Distr
 LIB_DEPENDS=	libevent.so:devel/libevent2 \
 		libmd5.so:www/libwww
 
-CONFLICTS=	ntp-rc-* ntp-devel-*
+CONFLICTS=	ntp-devel-*
 
 USES=		cpe pathfix shebangfix libedit libtool localbase:ldflags \
 		pkgconfig ssl