Module Name: src
Committed By: tls
Date: Sun Aug 10 07:09:33 UTC 2014
Modified Files:
src/external/bsd/ntp [tls-earlyentropy]: Makefile.inc
src/external/bsd/ntp/html [tls-earlyentropy]: Makefile
src/external/bsd/ntp/lib/libiscntp [tls-earlyentropy]: Makefile
src/external/bsd/ntp/lib/libntp [tls-earlyentropy]: Makefile
src/external/bsd/ntp/lib/libopts [tls-earlyentropy]: Makefile
Log Message:
Rebase.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.13.2.1 src/external/bsd/ntp/Makefile.inc
cvs rdiff -u -r1.2 -r1.2.2.1 src/external/bsd/ntp/html/Makefile
cvs rdiff -u -r1.8 -r1.8.2.1 src/external/bsd/ntp/lib/libiscntp/Makefile
cvs rdiff -u -r1.11 -r1.11.2.1 src/external/bsd/ntp/lib/libntp/Makefile
cvs rdiff -u -r1.9 -r1.9.2.1 src/external/bsd/ntp/lib/libopts/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/ntp/Makefile.inc
diff -u src/external/bsd/ntp/Makefile.inc:1.13 src/external/bsd/ntp/Makefile.inc:1.13.2.1
--- src/external/bsd/ntp/Makefile.inc:1.13 Thu Jan 2 21:38:38 2014
+++ src/external/bsd/ntp/Makefile.inc Sun Aug 10 07:09:32 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.13 2014/01/02 21:38:38 joerg Exp $
+# $NetBSD: Makefile.inc,v 1.13.2.1 2014/08/10 07:09:32 tls Exp $
.if !defined(NTP_MAKEFILE_INC)
NTP_MAKEFILE_INC=yes
@@ -17,7 +17,7 @@ WARNS?= 4
IDIST= ${NETBSDSRCDIR}/external/bsd/ntp/dist
NTP_SRCDIR= ${NETBSDSRCDIR}/external/bsd/ntp
-NTP_HTMLDIR= /usr/share/doc/html/ntp
+NTP_HTMLDIR= /usr/share/doc/reference/ref8
SYSCONFDIR=/etc
LOCALSTATEDIR=/var
Index: src/external/bsd/ntp/html/Makefile
diff -u src/external/bsd/ntp/html/Makefile:1.2 src/external/bsd/ntp/html/Makefile:1.2.2.1
--- src/external/bsd/ntp/html/Makefile:1.2 Sat Dec 28 18:06:41 2013
+++ src/external/bsd/ntp/html/Makefile Sun Aug 10 07:09:33 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2013/12/28 18:06:41 christos Exp $
+# $NetBSD: Makefile,v 1.2.2.1 2014/08/10 07:09:33 tls Exp $
.include <bsd.own.mk>
.include "${.CURDIR}/../Makefile.inc"
@@ -112,7 +112,7 @@ NTP_DOCFILES= \
_FDIR:= ntp/${F:H} # subdir
_FDIR:= ${_FDIR:S,/.$,,} # remove trivial directory
_FNAME:= ${F:T} # name override
-_F:= ${DESTDIR}${HTMLDOCDIR}/${_FDIR}/${_FNAME} # installed path
+_F:= ${DESTDIR}${NTP_HTMLDIR}/${_FDIR}/${_FNAME} # installed path
_FILE:= ${F}
.if ${MKUPDATE} == "no"
Index: src/external/bsd/ntp/lib/libiscntp/Makefile
diff -u src/external/bsd/ntp/lib/libiscntp/Makefile:1.8 src/external/bsd/ntp/lib/libiscntp/Makefile:1.8.2.1
--- src/external/bsd/ntp/lib/libiscntp/Makefile:1.8 Thu Jan 23 14:06:28 2014
+++ src/external/bsd/ntp/lib/libiscntp/Makefile Sun Aug 10 07:09:33 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2014/01/23 14:06:28 joerg Exp $
+# $NetBSD: Makefile,v 1.8.2.1 2014/08/10 07:09:33 tls Exp $
LIBISPRIVATE=yes
@@ -43,8 +43,6 @@ SRCS= assertions.c \
time.c \
sockaddr.c
-.if !defined(HAVE_GCC) || ${HAVE_GCC} >= 45
COPTS.log.c+= -Wno-error=format-nonliteral
-.endif
.include <bsd.lib.mk>
Index: src/external/bsd/ntp/lib/libntp/Makefile
diff -u src/external/bsd/ntp/lib/libntp/Makefile:1.11 src/external/bsd/ntp/lib/libntp/Makefile:1.11.2.1
--- src/external/bsd/ntp/lib/libntp/Makefile:1.11 Fri Jan 24 23:42:31 2014
+++ src/external/bsd/ntp/lib/libntp/Makefile Sun Aug 10 07:09:33 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2014/01/24 23:42:31 matt Exp $
+# $NetBSD: Makefile,v 1.11.2.1 2014/08/10 07:09:33 tls Exp $
LIBISPRIVATE=yes
@@ -77,9 +77,7 @@ ymd2yd.c
CPPFLAGS+= -I${IDIST}/sntp/libopts
-.if !defined(HAVE_GCC) || ${HAVE_GCC} >= 45
COPTS.msyslog.c+= -Wno-error=format-nonliteral
-.endif
# For MKREPRO, avoid using __DATE__ and __TIME__.
# Instead, use the date and time from ${IMPORTDATE_FILE}.
Index: src/external/bsd/ntp/lib/libopts/Makefile
diff -u src/external/bsd/ntp/lib/libopts/Makefile:1.9 src/external/bsd/ntp/lib/libopts/Makefile:1.9.2.1
--- src/external/bsd/ntp/lib/libopts/Makefile:1.9 Mon Jan 20 01:43:34 2014
+++ src/external/bsd/ntp/lib/libopts/Makefile Sun Aug 10 07:09:33 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2014/01/20 01:43:34 christos Exp $
+# $NetBSD: Makefile,v 1.9.2.1 2014/08/10 07:09:33 tls Exp $
LIBISPRIVATE=yes
@@ -17,10 +17,6 @@ CPPFLAGS+=-I${DIST}
SRCS=libopts.c
COPTS.libopts.c += -DPOSIX_SHELL="\"/bin/sh\"" -Wno-format-nonliteral
-.if ${HAVE_GCC:U} >= 45
COPTS.libopts.c+= ${${ACTIVE_CC} == "gcc":? -Wno-format-contains-nul :}
-.else
-COPTS.libopts.c+= -Wno-format
-.endif
.include <bsd.lib.mk>
