Index: head/net/ntp/Makefile =================================================================== --- head/net/ntp/Makefile (revision 535796) +++ head/net/ntp/Makefile (revision 535797) @@ -1,92 +1,92 @@ # Created by: andreas # $FreeBSD$ PORTNAME= ntp PORTVERSION= 4.2.8p14 CATEGORIES= net MASTER_SITES= http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ \ http://archive.ntp.org/ntp4/ntp-4.2/ \ ftp://ftp.netlab.is.tsukuba.ac.jp/pub/network/ntp/ntp4/ DISTNAME= ${PORTNAME}-${PORTVERSION:S/P/p/:S/.r/-RC/} MAINTAINER= cy@FreeBSD.org 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 USES+= autoreconf # until rlimit_memlock changes accepted upstream GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-leap-smear --enable-trustedbsd-mac \ --with-locfile=freebsd --with-memlock=-1 TEST_TARGET= check SHEBANG_FILES= scripts/ntptrace/ntptrace.in \ scripts/ntp-wait/ntp-wait.in \ scripts/update-leap/update-leap.in perl_OLD_CMD= @PATH_PERL@ SUB_FILES= pkg-message .include "Makefile.inc" OPTIONS_DEFINE+= DEBUG NLS THREADS OPTIONS_DEFAULT+= THREADS OPTIONS_SUB= yes DEBUG_CONFIGURE_ENABLE= debugging IPV6_CONFIGURE_ENABLE= ipv6 NLS_CONFIGURE_ENABLE= nls NLS_CONFIGURE_OFF= ac_cv_lib_intl_gettext=no NLS_USES= gettext-runtime NTP_SIGND_CONFIGURE_ENABLE= ntp-signd NTPSNMPD_LIB_DEPENDS= libnetsnmp.so:net-mgmt/net-snmp NTPSNMPD_CONFIGURE_OFF= --without-ntpsnmpd PERL_UTILS_USES= perl5 SSL_CONFIGURE_ON= --with-openssl-incdir=${OPENSSLINC} \ --with-openssl-libdir=${OPENSSLLIB} SSL_CONFIGURE_OFF= --without-crypto SSL_USES= ssl DEBUG_CONFIGURE_ON= --enable-debug THREADS_CONFIGURE_ENABLE= thread-support THREADS_CONFIGURE_WITH= threads MD5_LIB_DEPENDS= libmd5.so:www/libwww MD5_IMPLIES= SSL .for D in ${NTP_DRIVERS} ${D}_CONFIGURE_ENABLE= ${D} .endfor .include # XXX Temporary hack. Remember to remove this next commit. post-extract: @${TOUCH} ${WRKSRC}/scripts/build/checkHtmlFileDates @${CHMOD} +x ${WRKSRC}/scripts/build/checkHtmlFileDates post-configure: @${ECHO_CMD} '#define HAVE_CLOSEFROM 1' >> ${WRKSRC}/config.h post-install: @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} ${INSTALL_DATA} ${WRKSRC}/conf/* ${STAGEDIR}${EXAMPLESDIR} @${MKDIR} ${STAGEDIR}${DOCSDIR} @${FIND} ${WRKSRC}/html -type f | ${XARGS} ${CHMOD} ${SHAREMODE} @cd ${WRKSRC}/html && ${FIND} . -print | \ ${CPIO} -pdu -R ${SHAREOWN}:${SHAREGRP} --quiet ${STAGEDIR}${DOCSDIR} .include Index: head/net/ntp-devel/Makefile =================================================================== --- head/net/ntp-devel/Makefile (revision 535796) +++ head/net/ntp-devel/Makefile (revision 535797) @@ -1,94 +1,94 @@ # Created by: andreas # $FreeBSD$ PORTNAME= ntp PORTVERSION= 4.3.99 PORTREVISION= 7 CATEGORIES= net MASTER_SITES= http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-dev/ \ http://archive.ntp.org/ntp4/ntp-dev/ PKGNAMESUFFIX= -devel DISTNAME= ${PORTNAME}-dev-${PORTVERSION:S/P/p/:S/r/-RC/:S/b/-beta/} MAINTAINER= cy@FreeBSD.org COMMENT= The Network Time Protocol Distribution FORBIDDEN= See http://support.ntp.org/bin/view/Main/SecurityNotice#March_2020_ntp_4_2_8p14_NTP_Rele 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 USES+= autoreconf # until rlimit_memlock changes accepted upstream LIB_DEPENDS+= libdns_sd.so:net/mDNSResponder GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-leap-smear --enable-trustedbsd-mac \ --with-locfile=freebsd --with-memlock=-1 TEST_TARGET= check SHEBANG_FILES= scripts/ntptrace/ntptrace.in \ scripts/ntp-wait/ntp-wait.in \ scripts/update-leap/update-leap.in perl_OLD_CMD= @PATH_PERL@ SUB_FILES= pkg-message .include "Makefile.inc" OPTIONS_DEFINE+= DEBUG NLS THREADS OPTIONS_DEFAULT+= THREADS OPTIONS_SUB= yes IPV6_CONFIGURE_ENABLE= ipv6 NLS_CONFIGURE_ENABLE= nls NLS_CONFIGURE_OFF= ac_cv_lib_intl_gettext=no NLS_USES= gettext-runtime NTP_SIGND_CONFIGURE_ENABLE= ntp-signd NTPSNMPD_LIB_DEPENDS= libnetsnmp.so:net-mgmt/net-snmp NTPSNMPD_CONFIGURE_OFF= --without-ntpsnmpd PERL_UTILS_USES= perl5 SSL_CONFIGURE_ON= --with-openssl-incdir=${OPENSSLINC} \ --with-openssl-libdir=${OPENSSLLIB} SSL_CONFIGURE_OFF= --without-crypto SSL_USES= ssl SSL_BROKEN_OFF= Includes OpenSSL when deselected DEBUG_CONFIGURE_ON= --enable-debug THREADS_CONFIGURE_ENABLE= thread-support THREADS_CONFIGURE_WITH= threads .for D in ${NTP_DRIVERS} ${D}_CONFIGURE_ENABLE= ${D} .endfor .include # XXX Temporary hack. Remember to remove this next commit. post-extract: @${TOUCH} ${WRKSRC}/scripts/build/checkHtmlFileDates @${CHMOD} +x ${WRKSRC}/scripts/build/checkHtmlFileDates post-configure: @${ECHO_CMD} '#define HAVE_CLOSEFROM 1' >> ${WRKSRC}/config.h post-install: @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} ${INSTALL_DATA} ${WRKSRC}/conf/* ${STAGEDIR}${EXAMPLESDIR} @${MKDIR} ${STAGEDIR}${DOCSDIR} @${FIND} ${WRKSRC}/html -type f | ${XARGS} ${CHMOD} ${SHAREMODE} @cd ${WRKSRC}/html && ${FIND} . -print | \ ${CPIO} -pdu -R ${SHAREOWN}:${SHAREGRP} --quiet ${STAGEDIR}${DOCSDIR} .include Index: head/net/ntpsec/Makefile =================================================================== --- head/net/ntpsec/Makefile (revision 535796) +++ head/net/ntpsec/Makefile (revision 535797) @@ -1,29 +1,31 @@ # $FreeBSD$ PORTNAME= ntpsec DISTVERSIONPREFIX= NTPsec_ DISTVERSION= 1_1_8 PORTREVISION= 2 CATEGORIES= net MAINTAINER= yuri@FreeBSD.org COMMENT= Network Time Protocol suite, refactored LICENSE= BSD2CLAUSE BUILD_DEPENDS= asciidoc:textproc/asciidoc LIB_DEPENDS= libdns_sd.so:net/mDNSResponder 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 post-install: # autoplist: plist varies depending on the python version @cd ${STAGEDIR}${PREFIX} && \ ${FIND} * -type f -or -type l | ${SED} -e 's|^share/man/.*|&.gz|' >> ${TMPPLIST} .include Index: head/net/openntpd/Makefile =================================================================== --- head/net/openntpd/Makefile (revision 535796) +++ head/net/openntpd/Makefile (revision 535797) @@ -1,59 +1,59 @@ # $FreeBSD$ PORTNAME= openntpd PORTVERSION= 6.2p3 PORTREVISION= 6 PORTEPOCH= 2 CATEGORIES= net MASTER_SITES= OPENBSD/OpenNTPD MAINTAINER= naddy@FreeBSD.org COMMENT= Network Time Protocol (NTP) daemon LICENSE= ISCL 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 GROUPS= _ntp GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-cacert=${LOCALBASE}/etc/ssl/cert.pem SUB_FILES= 480.status-openntpd pkg-message SUB_LIST= MANPREFIX="${MANPREFIX}" pre-build: ${REINPLACE_CMD} -e 's,%%PREFIX%%,${PREFIX},g' \ ${WRKSRC}/src/ntpd.conf.5 ${WRKSRC}/src/ntpd.8 post-install: cd ${STAGEDIR}${PREFIX}/etc && ${MV} ntpd.conf ntpd.conf.sample ${MKDIR} ${STAGEDIR}${PREFIX}/etc/periodic/daily ${INSTALL_SCRIPT} ${WRKDIR}/480.status-openntpd \ ${STAGEDIR}${PREFIX}/etc/periodic/daily .include # Requires libtls from LibreSSL .if ${SSL_DEFAULT:Mlibressl*} CPPFLAGS+= -I${OPENSSLINC} LDFLAGS+= -L${OPENSSLLIB} .else # SSL_DEFAULT BUILD_DEPENDS+= ${NONEXISTENT}:security/libressl:stage CPPFLAGS+= -I${WRKDIR}/libressl/include LDFLAGS+= -L${WRKDIR}/libressl/lib # Don't use COPYTREE_SHARE here as it hard links files, and the original files # are owned by root, which creates problems of its own. pre-configure: @cd `${MAKE} -V STAGEDIR -C ${PORTSDIR}/security/libressl`${PREFIX} \ && ${FIND} -E . ! -name *.so\* | ${CPIO} -dump ${WRKDIR}/libressl >/dev/null 2>&1 .endif # SSL_DEFAULT .include