Index: head/net/ntp/Makefile =================================================================== --- head/net/ntp/Makefile (revision 511986) +++ head/net/ntp/Makefile (revision 511987) @@ -1,89 +1,90 @@ # Created by: andreas # $FreeBSD$ PORTNAME= ntp PORTVERSION= 4.2.8p13 -PORTREVISION= 1 +PORTREVISION= 2 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 +USES+= autoreconf # until rlimit_memlock changes accepted upstream GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-leap-smear --enable-trustedbsd-mac \ - --with-locfile=freebsd + --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-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/files/patch-sntp_m4_ntp__rlimit.m4 =================================================================== --- head/net/ntp/files/patch-sntp_m4_ntp__rlimit.m4 (nonexistent) +++ head/net/ntp/files/patch-sntp_m4_ntp__rlimit.m4 (revision 511987) @@ -0,0 +1,11 @@ +--- sntp/m4/ntp_rlimit.m4.orig 2015-09-23 04:49:10.000000000 -0700 ++++ sntp/m4/ntp_rlimit.m4 2019-09-11 20:36:17.291424000 -0700 +@@ -112,7 +112,7 @@ + yes | no) + ans=$ntp_dflt_rlimit_memlock + ;; +- [[1-9]][[0-9]]*) ;; ++ [[1-9]][[0-9]]*|-1) ;; + *) AC_MSG_ERROR(["--with-memlock requires an integer argument."]) + ;; + esac Property changes on: head/net/ntp/files/patch-sntp_m4_ntp__rlimit.m4 ___________________________________________________________________ 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: head/net/ntp-devel/Makefile =================================================================== --- head/net/ntp-devel/Makefile (revision 511986) +++ head/net/ntp-devel/Makefile (revision 511987) @@ -1,87 +1,89 @@ # Created by: andreas # $FreeBSD$ PORTNAME= ntp PORTVERSION= 4.3.99 -PORTREVISION= 1 +PORTREVISION= 2 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 LIB_DEPENDS= libevent.so:devel/libevent CONFLICTS= ntp-[0-9].* 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-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-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/files/patch-sntp_m4_ntp__rlimit.m4 =================================================================== --- head/net/ntp-devel/files/patch-sntp_m4_ntp__rlimit.m4 (nonexistent) +++ head/net/ntp-devel/files/patch-sntp_m4_ntp__rlimit.m4 (revision 511987) @@ -0,0 +1,11 @@ +--- sntp/m4/ntp_rlimit.m4.orig 2015-09-23 04:49:10.000000000 -0700 ++++ sntp/m4/ntp_rlimit.m4 2019-09-11 20:36:17.291424000 -0700 +@@ -112,7 +112,7 @@ + yes | no) + ans=$ntp_dflt_rlimit_memlock + ;; +- [[1-9]][[0-9]]*) ;; ++ [[1-9]][[0-9]]*|-1) ;; + *) AC_MSG_ERROR(["--with-memlock requires an integer argument."]) + ;; + esac Property changes on: head/net/ntp-devel/files/patch-sntp_m4_ntp__rlimit.m4 ___________________________________________________________________ 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