Index: branches/2018Q3/net/ntp/Makefile =================================================================== --- branches/2018Q3/net/ntp/Makefile (revision 479142) +++ branches/2018Q3/net/ntp/Makefile (revision 479143) @@ -1,85 +1,88 @@ # Created by: andreas # $FreeBSD$ PORTNAME= ntp PORTVERSION= 4.2.8p12 +PORTREVISION= 3 CATEGORIES= net ipv6 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-* USES= cpe pathfix shebangfix libedit libtool localbase:ldflags \ pkgconfig GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-leap-smear 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-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: branches/2018Q3/net/ntp/files/pkg-message.in =================================================================== --- branches/2018Q3/net/ntp/files/pkg-message.in (nonexistent) +++ branches/2018Q3/net/ntp/files/pkg-message.in (revision 479143) @@ -0,0 +1,11 @@ +Please add + + ntpd_program="%%PREFIX%%/sbin/ntpd" + ntpdate_program="%%PREFIX%%/sbin/ntpdate" + +to your /etc/rc.conf or run + + sysrc ntpd_program="%%PREFIX%%/sbin/ntpd" + sysrc ntpdate_program="%%PREFIX%%/sbin/ntpdate" + +to enable ntp from ports/packages instead of base ntp. Property changes on: branches/2018Q3/net/ntp/files/pkg-message.in ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2018Q3/net/ntp-devel/Makefile =================================================================== --- branches/2018Q3/net/ntp-devel/Makefile (revision 479142) +++ branches/2018Q3/net/ntp-devel/Makefile (revision 479143) @@ -1,89 +1,91 @@ # Created by: andreas # $FreeBSD$ PORTNAME= ntp PORTVERSION= 4.3.93 -PORTREVISION= 8 +PORTREVISION= 10 CATEGORIES= net ipv6 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= It appears the development branch of NTP is dead. LIB_DEPENDS= libevent.so:devel/libevent \ libmd5.so:www/libwww CONFLICTS= ntp-[0-9].* openntpd-* USES= cpe pathfix shebangfix libedit libtool localbase:ldflags \ pkgconfig gettext-runtime GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-leap-smear 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 .include .if ${SSL_DEFAULT:Mlibressl*} IGNORE= detected LibreSSL (undefined references to MD5 symbols) .endif .for D in ${NTP_DRIVERS} ${D}_CONFIGURE_ENABLE= ${D} .endfor # XXX Temporary hack. Remember to remove this next commit. post-extract: @${TOUCH} ${WRKSRC}/scripts/build/checkHtmlFileDates @${CHMOD} +x ${WRKSRC}/scripts/build/checkHtmlFileDates 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: branches/2018Q3/net/ntp-devel/files/pkg-message.in =================================================================== --- branches/2018Q3/net/ntp-devel/files/pkg-message.in (nonexistent) +++ branches/2018Q3/net/ntp-devel/files/pkg-message.in (revision 479143) @@ -0,0 +1,7 @@ +Please add + + ntpd_program="%%PREFIX%%/sbin/ntpd" + ntpdate_program="%%PREFIX%%/sbin/ntpdate" + +to your /etc/rc.conf to enable ntp from ports/packages instead +of base ntp. Property changes on: branches/2018Q3/net/ntp-devel/files/pkg-message.in ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2018Q3 =================================================================== --- branches/2018Q3 (revision 479142) +++ branches/2018Q3 (revision 479143) Property changes on: branches/2018Q3 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r478512,478840,479083