svn commit: r451258 - in head/net: ntp ntp-devel

[Cy Schubert]

Author: cy
Date: Thu Oct  5 01:55:10 2017
New Revision: 451258
URL: https://svnweb.freebsd.org/changeset/ports/451258

Log:
  Register conflict with openntpd.
  
  Reported by:	rodrigo

Modified:
  head/net/ntp-devel/Makefile   (contents, props changed)
  head/net/ntp/Makefile   (contents, props changed)

Modified: head/net/ntp-devel/Makefile
==============================================================================
--- head/net/ntp-devel/Makefile	Thu Oct  5 01:54:56 2017	(r451257)
+++ head/net/ntp-devel/Makefile	Thu Oct  5 01:55:10 2017	(r451258)
@@ -16,7 +16,7 @@ COMMENT=	The Network Time Protocol Distribution
 LIB_DEPENDS=	libevent.so:devel/libevent \
 		libmd5.so:www/libwww
 
-CONFLICTS=	ntp-[0-9].*
+CONFLICTS=	ntp-[0-9].* openntpd-*
 
 USES=		cpe pathfix shebangfix libedit libtool localbase:ldflags \
 		pkgconfig gettext-runtime

Modified: head/net/ntp/Makefile
==============================================================================
--- head/net/ntp/Makefile	Thu Oct  5 01:54:56 2017	(r451257)
+++ head/net/ntp/Makefile	Thu Oct  5 01:55:10 2017	(r451258)
@@ -15,7 +15,7 @@ COMMENT=	The Network Time Protocol Distribution
 
 LIB_DEPENDS=	libevent.so:devel/libevent
 
-CONFLICTS=	ntp-devel-*
+CONFLICTS=	ntp-devel-* openntpd-*
 
 USES=		cpe pathfix shebangfix libedit libtool localbase:ldflags \
 		pkgconfig