Update the various files to sync with vendor import of 4.2.4p5.

sntp includes a copy of libopts in itself in vendor code, rewrite the
Makefile to compile and use only one copy.  It is an internal library, not
installed.

MFC after:	2 weeks

1 files changed, 12 insertions, 10 deletions

diff --git a/usr.sbin/ntp/libntp/Makefile b/usr.sbin/ntp/libntp/Makefile
index 1903910..839c17d 100644
--- a/usr.sbin/ntp/libntp/Makefile
+++ b/usr.sbin/ntp/libntp/Makefile
@@ -8,25 +8,27 @@ INTERNALLIB=
 
 NTP_SRCS=	a_md5encrypt.c	adjtime.c	atoint.c	atolfp.c \
 	atouint.c	audio.c		authkeys.c \
-	authreadkeys.c	authusekey.c	binio.c \
-	buftvtots.c	caljulian.c	calleapwhen.c	caltontp.c \
+	authreadkeys.c	authusekey.c	\
+	buftvtots.c	caljulian.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 \
 	hextoint.c	hextolfp.c	humandate.c	icom.c \
-	ieee754io.c	inttoa.c	iosignal.c	lib_strbuf.c \
-	machines.c	md5c.c		memmove.c	mfp_mul.c \
-	mfptoa.c	mfptoms.c	modetoa.c	mstolfp.c \
+	inttoa.c	iosignal.c	lib_strbuf.c \
+	machines.c	md5c.c		memmove.c	\
+	mfptoa.c	mfptoms.c	mktime.c	modetoa.c \
+	mstolfp.c 	ntp_random.c \
 	msutotsf.c	msyslog.c	netof.c		ntp_rfc2553.c \
 	numtoa.c	numtohost.c	octtoint.c	prettydate.c \
-	ranny.c	recvbuff.c	refnumtoa.c	socktoa.c \
+	recvbuff.c	refnumtoa.c	snprintf.c	socktoa.c \
 	socktohost.c	strstr.c	systime_s.c	statestr.c \
-	syssignal.c	systime.c	tsftomsu.c	tstotv.c \
+	strerror.c	syssignal.c	tsftomsu.c	tstotv.c \
 	tvtoa.c	tvtots.c	uglydate.c	uinttoa.c \
 	utvtoa.c	ymd2yd.c 
 
-ISC_SRCS= assertions.c error.c inet_ntop.c interfaceiter.c \
-	isc_strerror.c lib.c mem.c msgcat.c net.c
+ISC_SRCS= assertions.c error.c inet_ntop.c inet_pton.c interfaceiter.c \
+	isc_strerror.c lib.c mem.c msgcat.c net.c netscope.c netaddr.c \
+	sockaddr.c
 
 SRCS=	${NTP_SRCS} ${ISC_SRCS}