Date: Thu, 9 Mar 2000 08:21:46 -0800 (PST) From: tkato@prontomail.ne.jp To: freebsd-gnats-submit@FreeBSD.org Subject: ports/17284: Update port: net/ntp to 4.0.99g (fix ports/17251) Message-ID: <200003091621.IAA19148@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 17284 >Category: ports >Synopsis: Update port: net/ntp to 4.0.99g (fix ports/17251) >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Thu Mar 9 08:30:02 PST 2000 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: 3.4-RELEASE i386 >Organization: >Environment: >Description: - Update to version 4.99g New file: patches/patch-ad Remove file: patches/patch-aa patches/patch-ab patches/patch-ac This PR supersedes ports/17251. >How-To-Repeat: >Fix: diff -urN /usr/ports/net/ntp/Makefile net/ntp/Makefile --- /usr/ports/net/ntp/Makefile Mon Feb 21 08:18:59 2000 +++ net/ntp/Makefile Fri Mar 10 01:09:43 2000 @@ -1,24 +1,29 @@ # New ports collection makefile for: ntp -# Version required: 4.0.72 +# Version required: 4.0.99g # Date created: Di 5 Mai 1998 21:31:03 CEST # Whom: andreas # # $FreeBSD: ports/net/ntp/Makefile,v 1.10 2000/02/20 17:06:43 andreas Exp $ # -DISTNAME= ntp-4.0.93a +DISTNAME= ntp-4.0.99g CATEGORIES= net -MASTER_SITES= ftp://ftp.udel.edu/pub/ntp/testing/ +MASTER_SITES= ftp://ftp.udel.edu/pub/ntp/ntp4/ MAINTAINER= ports@FreeBSD.org # ntp's configure script created by autoconf 2.14.1 doesn't work -# our autoconf version 2.13 produces better results -USE_AUTOCONF= yes -GNU_CONFIGURE= yes +# if GNU_CONFIGURE is defined +HAS_CONFIGURE= yes +CONFIGURE_ARGS= --prefix=${PREFIX} post-install: - ${MKDIR} ${PREFIX}/share/doc/ntp - ${CP} -r ${WRKSRC}/html/* ${PREFIX}/share/doc/ntp +.if !defined(NOPORTDOCS) + @${MKDIR} ${PREFIX}/share/doc/ntp + ${TAR} -C ${WRKSRC}/html --exclude '.*' -cf - . | \ + ${TAR} -C ${PREFIX}/share/doc/ntp --unlink -xf - + find ${PREFIX}/share/doc/ntp | xargs ${CHOWN} ${SHAREOWN}:${SHAREGRP} + find ${PREFIX}/share/doc/ntp -type f | xargs ${CHMOD} ${SHAREMODE} +.endif .include <bsd.port.mk> diff -urN /usr/ports/net/ntp/files/md5 net/ntp/files/md5 --- /usr/ports/net/ntp/files/md5 Sat Jun 26 19:55:18 1999 +++ net/ntp/files/md5 Tue Mar 7 05:23:44 2000 @@ -1 +1 @@ -MD5 (ntp-4.0.93a.tar.gz) = 63b9fe99b680a20946393812f5341683 +MD5 (ntp-4.0.99g.tar.gz) = 6f3132fb4f6a3ee411554d09270f562a diff -urN /usr/ports/net/ntp/patches/patch-aa net/ntp/patches/patch-aa --- /usr/ports/net/ntp/patches/patch-aa Sat Jun 26 15:54:15 1999 +++ net/ntp/patches/patch-aa Thu Jan 1 09:00:00 1970 @@ -1,36 +0,0 @@ ---- util/ntptime.c.orig Sat Apr 24 08:50:49 1999 -+++ util/ntptime.c Sat Jun 26 07:52:53 1999 -@@ -235,7 +235,7 @@ - --pll_control; - if (pll_control < 0) - break; -- times[c] = ntv.time.tv_usec; -+ times[c] = ntv.time.tv_nsec/1000; - } - #ifdef SIGSYS - } -@@ -281,19 +281,19 @@ - else { - printf("ntp_gettime() returns code %d (%s)\n", - status, timex_state(status)); -- time_frac = ntv.time.tv_usec; -+ time_frac = ntv.time.tv_nsec/1000; - #ifdef STA_NANO - if (flash & STA_NANO) { -- ntv.time.tv_usec /= 1000; -+ ntv.time.tv_nsec /= 1000000; - ts_mask = 0xfffffffc; /* 1/2^30 */ - ts_roundbit = 0x00000002; - fdigits = 9; - } - #endif -- TVTOTS(&ntv.time, &ts); -+ ts.l_uf = ntv.time.tv_nsec; -+ ts.l_uf *= 4.294967296; -+ ts.l_ui = ntv.time.tv_sec; - ts.l_ui += JAN_1970; -- ts.l_uf += ts_roundbit; -- ts.l_uf &= ts_mask; - printf(" time %s, (.%0*d),\n", - prettydate(&ts), fdigits, (int) time_frac); - printf(" maximum error %lu us, estimated error %lu us.\n", diff -urN /usr/ports/net/ntp/patches/patch-ab net/ntp/patches/patch-ab --- /usr/ports/net/ntp/patches/patch-ab Sun Feb 27 23:47:00 2000 +++ net/ntp/patches/patch-ab Thu Jan 1 09:00:00 1970 @@ -1,21 +0,0 @@ ---- ntpd/ntp_refclock.c.orig Sat Feb 26 14:19:14 2000 -+++ ntpd/ntp_refclock.c Sat Feb 26 14:20:31 2000 -@@ -635,7 +635,7 @@ - #endif - #ifdef HAVE_PPSAPI - pps_info_t pi; -- struct timespec *tsp; -+ struct timespec timeout, *tsp; - double a; - #endif - -@@ -651,7 +651,8 @@ - trtmp = rbufp->recv_time; - - #ifdef HAVE_PPSAPI -- if ((rbufp->fd == fdpps) && (time_pps_fetch(fdpps, &pi) >= 0)) { -+ if ((rbufp->fd == fdpps) && -+ (time_pps_fetch(fdpps, PPS_TSFMT_TSPEC, &pi, &timeout) >= 0)) { - tsp = &pi.assert_timestamp; - a = tsp->tv_nsec; - a /= 1e9; diff -urN /usr/ports/net/ntp/patches/patch-ac net/ntp/patches/patch-ac --- /usr/ports/net/ntp/patches/patch-ac Sun Feb 27 23:47:00 2000 +++ net/ntp/patches/patch-ac Thu Jan 1 09:00:00 1970 @@ -1,34 +0,0 @@ ---- ntpd/refclock_oncore.c.orig Sat Feb 26 14:21:53 2000 -+++ ntpd/refclock_oncore.c Sat Feb 26 14:27:16 2000 -@@ -453,11 +453,11 @@ - } - - if (instance->assert) { -- instance->pps_p.mode = PPS_CAPTUREASSERT | PPS_OFFSETASSERT | PPS_HARDPPSONASSERT; -+ instance->pps_p.mode = PPS_CAPTUREASSERT | PPS_OFFSETASSERT; - instance->pps_p.assert_offset.tv_sec = 0; - instance->pps_p.assert_offset.tv_nsec = 0; - } else { -- instance->pps_p.mode = PPS_CAPTURECLEAR | PPS_OFFSETCLEAR | PPS_HARDPPSONCLEAR; -+ instance->pps_p.mode = PPS_CAPTURECLEAR | PPS_OFFSETCLEAR; - instance->pps_p.clear_offset.tv_sec = 0; - instance->pps_p.clear_offset.tv_nsec = 0; - } -@@ -1226,6 +1226,7 @@ - struct timeval *tsp = 0; - #endif - #ifdef HAVE_PPSAPI -+ struct timespec timeout; - pps_info_t pps_i; - #else /* ! HAVE_PPSAPI */ - #ifdef HAVE_CIOGETEV -@@ -1255,7 +1256,8 @@ - - #ifdef HAVE_PPSAPI - j = instance->ev_serial; -- if (time_pps_fetch(instance->pps_h, &pps_i) < 0) { -+ if (time_pps_fetch(instance->pps_h, PPS_TSFMT_TSPEC, &pps_i, -+ &timeout) < 0) { - printf("ONCORE: time_pps_fetch failed\n"); - return; - } diff -urN /usr/ports/net/ntp/patches/patch-ad net/ntp/patches/patch-ad --- /usr/ports/net/ntp/patches/patch-ad Thu Jan 1 09:00:00 1970 +++ net/ntp/patches/patch-ad Tue Mar 7 05:53:33 2000 @@ -0,0 +1,35 @@ +--- configure.orig Sun Feb 27 17:01:04 2000 ++++ configure Tue Mar 7 05:53:20 2000 +@@ -8273,19 +8273,19 @@ + # there is NO way that I can tell to tell if a given OS is using timespec or + # timeval so just set it here for the one case that is KNOWN to use timespec. + +-case "$ac_cv_header_timepps_h$ac_cv_header_sys_timepps_h" in +- *yes*) +- cat >>confdefs.h <<\EOF +-#define HAVE_PPSAPI 1 +-EOF +- +- ac_cv_var_oncore_ok=yes +- cat >>confdefs.h <<\EOF +-#define HAVE_TIMESPEC 1 +-EOF +- +- ;; +-esac ++#case "$ac_cv_header_timepps_h$ac_cv_header_sys_timepps_h" in ++# *yes*) ++# cat >>confdefs.h <<\EOF ++##define HAVE_PPSAPI 1 ++#EOF ++# ++# ac_cv_var_oncore_ok=yes ++# cat >>confdefs.h <<\EOF ++##define HAVE_TIMESPEC 1 ++#EOF ++# ++# ;; ++#esac + + # Check for ioctls TIOCGSERIAL, TIOCSSERIAL, ASYNC_PPS_CD_POS, ASYNC_PPS_CD_NEG + echo $ac_n "checking for linux/serial.h... $ac_c" 1>&6 diff -urN /usr/ports/net/ntp/pkg/PLIST net/ntp/pkg/PLIST --- /usr/ports/net/ntp/pkg/PLIST Sat Jun 26 19:55:37 1999 +++ net/ntp/pkg/PLIST Wed Mar 8 04:11:41 2000 @@ -3,10 +3,13 @@ bin/ntpdc bin/ntpq bin/ntptime +bin/ntptimeset bin/ntptrace bin/tickadj +share/doc/ntp/Oncore-SHMEM.htm share/doc/ntp/accopt.htm share/doc/ntp/assoc.htm +share/doc/ntp/audio.htm share/doc/ntp/authopt.htm share/doc/ntp/biblio.htm share/doc/ntp/build.htm @@ -19,6 +22,7 @@ share/doc/ntp/driver10.htm share/doc/ntp/driver11.htm share/doc/ntp/driver12.htm +share/doc/ntp/driver16.htm share/doc/ntp/driver18.htm share/doc/ntp/driver19.htm share/doc/ntp/driver2.htm @@ -34,6 +38,10 @@ share/doc/ntp/driver30.htm share/doc/ntp/driver32.htm share/doc/ntp/driver33.htm +share/doc/ntp/driver34.htm +share/doc/ntp/driver35.htm +share/doc/ntp/driver36.htm +share/doc/ntp/driver37.htm share/doc/ntp/driver4.htm share/doc/ntp/driver5.htm share/doc/ntp/driver6.htm @@ -43,7 +51,6 @@ share/doc/ntp/exec.htm share/doc/ntp/extern.htm share/doc/ntp/gadget.htm -share/doc/ntp/hints.htm share/doc/ntp/hints/a-ux share/doc/ntp/hints/aix share/doc/ntp/hints/bsdi @@ -58,6 +65,7 @@ share/doc/ntp/hints/rs6000 share/doc/ntp/hints/sco.htm share/doc/ntp/hints/sgi +share/doc/ntp/hints/solaris-dosynctodr.html share/doc/ntp/hints/solaris.html share/doc/ntp/hints/solaris.xtra.4023118 share/doc/ntp/hints/solaris.xtra.4095849 @@ -68,7 +76,8 @@ share/doc/ntp/hints/svr4_package share/doc/ntp/hints/todo share/doc/ntp/hints/vxworks.html -share/doc/ntp/hints/winnt +share/doc/ntp/hints/winnt.htm +share/doc/ntp/hints.htm share/doc/ntp/howto.htm share/doc/ntp/htmlprimer.htm share/doc/ntp/index.htm @@ -109,6 +118,7 @@ share/doc/ntp/pic/barnstable.gif share/doc/ntp/pic/beaver.gif share/doc/ntp/pic/c51.jpg +share/doc/ntp/pic/driver29.gif share/doc/ntp/pic/fg6021.gif share/doc/ntp/pic/flatheads.gif share/doc/ntp/pic/gadget.jpg @@ -137,6 +147,7 @@ share/doc/ntp/porting.htm share/doc/ntp/pps.htm share/doc/ntp/prefer.htm +share/doc/ntp/qth.htm share/doc/ntp/quick.htm share/doc/ntp/rdebug.htm share/doc/ntp/refclock.htm >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200003091621.IAA19148>