svn commit: r535797 - in head/net: ntp ntp-devel ntpsec openntpd

[Yuri Victorovich]

Author: yuri
Date: Tue May 19 00:45:01 2020
New Revision: 535797
URL: https://svnweb.freebsd.org/changeset/ports/535797

Log:
  net/ntpsec: Add CONFLICTS between net/{ntp,ntp-devel,openntpd,ntpsec} because they all install sbin/ntpd
  
  Also remove -* for versions because this isn't needed.
  
  PR:		246553
  Reported by:	naddy
  Approved by:	portmgr (port compliance, infrastructure)

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

Modified: head/net/ntp-devel/Makefile
==============================================================================
--- head/net/ntp-devel/Makefile	Mon May 18 22:27:17 2020	(r535796)
+++ head/net/ntp-devel/Makefile	Tue May 19 00:45:01 2020	(r535797)
@@ -17,7 +17,7 @@ FORBIDDEN=	See http://support.ntp.org/bin/view/Main/Se
 
 LIB_DEPENDS=	libevent.so:devel/libevent
 
-CONFLICTS=	ntp-[0-9].* openntpd-*
+CONFLICTS=	ntp ntpsec openntpd
 
 USES=		cpe pathfix shebangfix libedit libtool localbase:ldflags \
 		pkgconfig gettext-runtime

Modified: head/net/ntp/Makefile
==============================================================================
--- head/net/ntp/Makefile	Mon May 18 22:27:17 2020	(r535796)
+++ head/net/ntp/Makefile	Tue May 19 00:45:01 2020	(r535797)
@@ -14,7 +14,7 @@ COMMENT=	The Network Time Protocol Distribution
 
 LIB_DEPENDS=	libevent.so:devel/libevent
 
-CONFLICTS=	ntp-devel-* openntpd-*
+CONFLICTS=	ntp-devel ntpsec openntpd
 
 USES=		cpe pathfix shebangfix libedit libtool localbase:ldflags \
 		pkgconfig

Modified: head/net/ntpsec/Makefile
==============================================================================
--- head/net/ntpsec/Makefile	Mon May 18 22:27:17 2020	(r535796)
+++ head/net/ntpsec/Makefile	Tue May 19 00:45:01 2020	(r535797)
@@ -18,6 +18,8 @@ USES=		bison gettext-runtime pkgconfig python shebangf
 SHEBANG_FILES=	${WRKSRC}/ntpclients/ntp*.py
 USE_GITHUB=	yes
 
+CONFLICTS=	ntp ntp-devel openntpd
+
 MAKE_ENV=	NOSYNC=1 # workaround for the console problem: https://gitlab.com/NTPsec/ntpsec/issues/599
 
 PORTSCOUT=	limit:^\d+\. # prevent alpha-numeric strings

Modified: head/net/openntpd/Makefile
==============================================================================
--- head/net/openntpd/Makefile	Mon May 18 22:27:17 2020	(r535796)
+++ head/net/openntpd/Makefile	Tue May 19 00:45:01 2020	(r535797)
@@ -16,7 +16,7 @@ RUN_DEPENDS=	ca_root_nss>=0:security/ca_root_nss
 
 USES=		ssl
 
-CONFLICTS=	ntp-[0-9].* ntp-devel-* ntpsec-*
+CONFLICTS=	ntp ntp-devel ntpsec
 
 USE_RC_SUBR=	openntpd
 USERS=		_ntp