aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--net/ntp-devel/Makefile2
-rw-r--r--net/ntp/Makefile2
-rw-r--r--net/ntpsec/Makefile2
-rw-r--r--net/openntpd/Makefile2
4 files changed, 5 insertions, 3 deletions
diff --git a/net/ntp-devel/Makefile b/net/ntp-devel/Makefile
index 3048b4ae0ff7..cc1ae6e016b6 100644
--- a/net/ntp-devel/Makefile
+++ b/net/ntp-devel/Makefile
@@ -17,7 +17,7 @@ FORBIDDEN= See http://support.ntp.org/bin/view/Main/SecurityNotice#March_2020_nt
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
diff --git a/net/ntp/Makefile b/net/ntp/Makefile
index 0e2d9aa38583..e6987fff8b76 100644
--- a/net/ntp/Makefile
+++ b/net/ntp/Makefile
@@ -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
diff --git a/net/ntpsec/Makefile b/net/ntpsec/Makefile
index 634d44914dec..5a7c285f2688 100644
--- a/net/ntpsec/Makefile
+++ b/net/ntpsec/Makefile
@@ -18,6 +18,8 @@ USES= bison gettext-runtime pkgconfig python shebangfix ssl waf
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
diff --git a/net/openntpd/Makefile b/net/openntpd/Makefile
index 3cc8a691be90..7fccc77f576d 100644
--- a/net/openntpd/Makefile
+++ b/net/openntpd/Makefile
@@ -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