Update for the import of 4.1.0.

usr.sbin/ntp/Makefile

@@ -3,6 +3,7 @@
 
 MAINTAINER=	roberto
 
-SUBDIR=	doc libntp libparse ntpd ntpdc ntpq ntpdate ntptrace ntptimeset ntptime
+SUBDIR= libntp libparse ntpd ntpdc ntpq ntpdate ntptrace \
+	ntptimeset ntptime ntp-genkeys
 
 .include <bsd.subdir.mk>

usr.sbin/ntp/libntp/Makefile

@@ -9,23 +9,23 @@ NOPIC=			true
 INTERNALSTATICLIB=	true
 NOMAN=			true
 
-SRCS=	a_md5encrypt.c	adjtime.c	atoint.c \
+SRCS=	a_md5encrypt.c	adjtime.c	atoint.c	atolfp.c \
-	atolfp.c	atouint.c	authencrypt.c	authkeys.c \
+	atouint.c	audio.c	authencrypt.c	authkeys.c \
 	authparity.c	authreadkeys.c	authusekey.c	binio.c \
 	buftvtots.c	caljulian.c	calleapwhen.c	caltontp.c \
 	calyearstart.c	clocktime.c	clocktypes.c	decodenetnum.c \
 	dofptoa.c	dolfptoa.c	emalloc.c	findconfig.c \
-	fptoa.c		fptoms.c	getopt.c	gpstolfp.c \
+	fptoa.c	fptoms.c	getopt.c	gpstolfp.c \
-	hextoint.c	hextolfp.c	humandate.c	ieee754io.c \
+	hextoint.c	hextolfp.c	humandate.c	icom.c \
-	inttoa.c	iosignal.c	lib_strbuf.c \
+	ieee754io.c	inttoa.c	iosignal.c	lib_strbuf.c \
-	machines.c	md5c.c		memmove.c \
+	machines.c	md5c.c	memmove.c	mfp_mul.c \
-	mfp_mul.c	mfptoa.c	mfptoms.c \
+	mfptoa.c	mfptoms.c	modetoa.c	mstolfp.c \
-	modetoa.c	mstolfp.c	msutotsf.c	msyslog.c \
+	msutotsf.c	msyslog.c	netof.c	numtoa.c \
-	netof.c		numtoa.c	numtohost.c	octtoint.c \
+	numtohost.c	octtoint.c	prettydate.c	ranny.c \
-	prettydate.c	ranny.c		recvbuff.c	refnumtoa.c \
+	recvbuff.c	refnumtoa.c	statestr.c	syssignal.c \
-	statestr.c	syssignal.c	systime.c \
+	systime.c	tsftomsu.c	tstotv.c	tvtoa.c \
-	tsftomsu.c	tstotv.c	tvtoa.c		tvtots.c \
+	tvtots.c	uglydate.c	uinttoa.c	utvtoa.c \
-	uglydate.c	uinttoa.c	utvtoa.c	ymd2yd.c 
+	ymd2yd.c
 
 CFLAGS+= -I${.CURDIR}/../../../contrib/ntp/include -I${.CURDIR}/../
 

usr.sbin/ntp/libparse/Makefile

@@ -9,12 +9,10 @@ INTERNALLIB=            true
 INTERNALSTATICLIB=      true
 NOMAN=                  true
 
-SRCS=	parse.c 	parse_conf.c \
+SRCS=	clk_computime.c	clk_dcf7000.c	clk_hopf6021.c	clk_meinberg.c \
-	clk_computime.c	clk_dcf7000.c	clk_hopf6021.c \
+	clk_rawdcf.c	clk_rcc8000.c	clk_schmid.c	clk_trimtaip.c \
-	clk_meinberg.c	clk_rawdcf.c	clk_rcc8000.c \
+	clk_trimtsip.c	clk_varitext.c	clk_wharton.c	data_mbg.c \
-	clk_schmid.c	clk_trimtaip.c	clk_trimtsip.c \
+	info_trimble.c	parse.c	parse_conf.c	trim_info.c
-	clk_varitext.c	clk_wharton.c	data_mbg.c \
-	info_trimble.c	trim_info.c
 
 CFLAGS+= -I${.CURDIR}/../../../contrib/ntp/include -I${.CURDIR}/../
 

usr.sbin/ntp/ntpd/Makefile

@@ -2,25 +2,28 @@
 
 .PATH: ${.CURDIR}/../../../contrib/ntp/ntpd
 
-PROG= ntpd
+PROG=	ntpd
-NOMAN= yes
+NOMAN=	yes
-SRCS=	map_vme.c	ntp_config.c \
+SRCS=	cmd_args.c	map_vme.c	ntp_config.c \
-	ntp_control.c	ntp_filegen.c	ntp_intres.c \
+	ntp_control.c	ntp_crypto.c	ntp_filegen.c \
-	ntp_io.c	ntp_loopfilter.c	ntp_monitor.c \
+	ntp_intres.c	ntp_io.c	ntp_loopfilter.c \
-	ntp_peer.c	ntp_proto.c	ntp_refclock.c \
+	ntp_monitor.c	ntp_peer.c	ntp_proto.c \
-	ntp_request.c	ntp_restrict.c	ntp_timer.c \
+	ntp_refclock.c	ntp_request.c	ntp_resolver.c \
-	ntp_util.c	ntpd.c	refclock_acts.c \
+	ntp_restrict.c	ntp_timer.c	ntp_util.c \
-	refclock_arbiter.c	refclock_arc.c	refclock_as2201.c \
+	ntpd.c	refclock_acts.c	refclock_arbiter.c \
-	refclock_atom.c	refclock_bancomm.c	refclock_chronolog.c \
+	refclock_arc.c	refclock_as2201.c	refclock_atom.c \
-	refclock_chu.c	refclock_conf.c	refclock_datum.c \
+	refclock_bancomm.c	refclock_chronolog.c	refclock_chu.c \
-	refclock_dumbclock.c	refclock_gpsvme.c	refclock_heath.c \
+	refclock_conf.c	refclock_datum.c	refclock_dumbclock.c \
-	refclock_hpgps.c	refclock_irig.c	refclock_jupiter.c \
+	refclock_fg.c	refclock_gpsvme.c	refclock_heath.c \
-	refclock_leitch.c	refclock_local.c	refclock_msfees.c \
+	refclock_hopfpci.c	refclock_hopfser.c	refclock_hpgps.c \
-	refclock_mx4200.c	refclock_nmea.c	refclock_oncore.c \
+	refclock_irig.c	refclock_jupiter.c	refclock_leitch.c \
-	refclock_palisade.c	refclock_parse.c	refclock_pst.c \
+	refclock_local.c	refclock_msfees.c	refclock_mx4200.c \
+	refclock_nmea.c	refclock_oncore.c	refclock_palisade.c \
+	refclock_parse.c	refclock_pcf.c	refclock_pst.c \
 	refclock_ptbacts.c	refclock_shm.c	refclock_tpro.c \
-	refclock_trak.c	refclock_true.c	refclock_usno.c \
+	refclock_trak.c	refclock_true.c	refclock_ulink.c \
-	refclock_wwvb.c	 version.c
+	refclock_usno.c	refclock_wwv.c	refclock_wwvb.c \
+	version.c
 
 CFLAGS+= -I${.CURDIR}/../../../contrib/ntp/include -I${.CURDIR}/../
 
@@ -32,7 +35,4 @@ CLEANFILES+= .version version.c
 version.c: 
 	sh -e ${.CURDIR}/../scripts/mkver ntpd
 
-afterinstall:
-	rm -f ${DESTDIR}/usr/sbin/xntpd
-
 .include <bsd.prog.mk>

usr.sbin/ntp/ntpdc/Makefile

@@ -8,8 +8,8 @@ SRCS= 	ntpdc.c ntpdc_ops.c version.c
 
 CFLAGS+= -I${.CURDIR}/../../../contrib/ntp/include -I${.CURDIR}/../
 
-DPADD=	${LIBNTP}
+DPADD=	${LIBNTP} -lreadline
-LDADD=	${LIBNTP}
+LDADD=	${LIBNTP} -lreadline
 
 CLEANFILES+= .version version.c
 

usr.sbin/ntp/scripts/mkver

@@ -1,15 +1,24 @@
 #!/bin/sh
+#
 # $FreeBSD$
+#
 PROG=${1-UNKNOWN}
 
 ConfStr="$PROG"
 
+ConfStr="$ConfStr 4.1.0"
+
 case "" in
- '') ;;
+ '')
- *)  ConfStr="$ConfStr RSAREF" ;;
+    case "1" in
+     '') ;;
+     *) ConfStr="${ConfStr}-a" ;;
+    esac
+    ;;
+ *)  ConfStr="${ConfStr}-r" ;;
 esac
 
-ConfStr="$ConfStr 4.0.99b `LC_ALL=C date`"
+ConfStr="$ConfStr `LC_ALL=C date`"
 
 if [ ! -f .version ]; then
   echo 0 > .version