Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 22 Nov 2016 13:54:44 +0000 (UTC)
From:      Cy Schubert <cy@FreeBSD.org>
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
Message-ID:  <201611221354.uAMDsiAo065027@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201611221354.uAMDsiAo065027>