Module Name: src
Committed By: martin
Date: Mon Oct 12 10:17:33 UTC 2020
Modified Files:
src/external/bsd/ntp [netbsd-9]: Makefile.inc
src/external/bsd/ntp/bin [netbsd-9]: Makefile.inc
src/external/bsd/ntp/bin/ntp-keygen [netbsd-9]: Makefile
src/external/bsd/ntp/bin/ntpd [netbsd-9]: Makefile
src/external/bsd/ntp/bin/ntpdc [netbsd-9]: Makefile
src/external/bsd/ntp/bin/ntpq [netbsd-9]: Makefile
src/external/bsd/ntp/bin/sntp [netbsd-9]: Makefile
Removed Files:
src/external/bsd/ntp/bin/ntp-keygen [netbsd-9]: ntp-keygen.8
src/external/bsd/ntp/bin/ntpd [netbsd-9]: ntp.conf.5 ntp.keys.5 ntpd.8
src/external/bsd/ntp/bin/ntpdc [netbsd-9]: ntpdc.8
src/external/bsd/ntp/bin/ntpq [netbsd-9]: ntpq.8
src/external/bsd/ntp/bin/sntp [netbsd-9]: sntp.1
Log Message:
Pull up following revision(s) (requested by kim in ticket #1109):
external/bsd/ntp/bin/ntpq/ntpq.8: file removal
external/bsd/ntp/bin/Makefile.inc: revision 1.4
external/bsd/ntp/bin/ntpd/ntpd.8: file removal
external/bsd/ntp/bin/ntpq/Makefile: revision 1.9 (patch)
external/bsd/ntp/bin/ntpd/Makefile: revision 1.28 (patch)
external/bsd/ntp/bin/sntp/sntp.1: file removal
external/bsd/ntp/bin/ntpd/ntp.keys.5: file removal
external/bsd/ntp/bin/ntpd/ntp.conf.5: file removal
external/bsd/ntp/Makefile.inc: revision 1.20
external/bsd/ntp/Makefile.inc: revision 1.21
external/bsd/ntp/bin/sntp/Makefile: revision 1.8
external/bsd/ntp/bin/ntp-keygen/Makefile: revision 1.7 (patch)
external/bsd/ntp/bin/sntp/Makefile: revision 1.9 (patch)
external/bsd/ntp/bin/ntp-keygen/ntp-keygen.8: file removal
external/bsd/ntp/bin/ntpdc/ntpdc.8: file removal
external/bsd/ntp/bin/ntpdc/Makefile: revision 1.7 (patch)
Fix build; clean manpages only if they are generated automatically.
include bsd.own.mk so that ../../Makefile.inc does not do it...
Add rules for manual pages builds, remove including Makefile.inc
Use .PARSEDIR
PR/55710: Kimmo Suominen: Delete manual pages so that they get copy from the
imported, already generated ones.
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.18.2.1 src/external/bsd/ntp/Makefile.inc
cvs rdiff -u -r1.3 -r1.3.56.1 src/external/bsd/ntp/bin/Makefile.inc
cvs rdiff -u -r1.5 -r1.5.34.1 src/external/bsd/ntp/bin/ntp-keygen/Makefile
cvs rdiff -u -r1.1 -r0 src/external/bsd/ntp/bin/ntp-keygen/ntp-keygen.8
cvs rdiff -u -r1.22 -r1.22.6.1 src/external/bsd/ntp/bin/ntpd/Makefile
cvs rdiff -u -r1.1 -r0 src/external/bsd/ntp/bin/ntpd/ntp.conf.5 \
src/external/bsd/ntp/bin/ntpd/ntpd.8
cvs rdiff -u -r1.2 -r0 src/external/bsd/ntp/bin/ntpd/ntp.keys.5
cvs rdiff -u -r1.6 -r1.6.34.1 src/external/bsd/ntp/bin/ntpdc/Makefile
cvs rdiff -u -r1.1 -r0 src/external/bsd/ntp/bin/ntpdc/ntpdc.8
cvs rdiff -u -r1.7 -r1.7.34.1 src/external/bsd/ntp/bin/ntpq/Makefile
cvs rdiff -u -r1.1 -r0 src/external/bsd/ntp/bin/ntpq/ntpq.8
cvs rdiff -u -r1.6 -r1.6.34.1 src/external/bsd/ntp/bin/sntp/Makefile
cvs rdiff -u -r1.1 -r0 src/external/bsd/ntp/bin/sntp/sntp.1
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.18 src/external/bsd/ntp/Makefile.inc:1.18.2.1
--- src/external/bsd/ntp/Makefile.inc:1.18 Mon Feb 4 04:05:16 2019
+++ src/external/bsd/ntp/Makefile.inc Mon Oct 12 10:17:33 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.18 2019/02/04 04:05:16 mrg Exp $
+# $NetBSD: Makefile.inc,v 1.18.2.1 2020/10/12 10:17:33 martin Exp $
.if !defined(NTP_MAKEFILE_INC)
NTP_MAKEFILE_INC=yes
@@ -12,9 +12,6 @@ CWARNFLAGS.clang+= -Wno-unneeded-interna
WARNS?= 4
-
-.include <bsd.own.mk>
-
IDIST= ${NETBSDSRCDIR}/external/bsd/ntp/dist
NTP_SRCDIR= ${NETBSDSRCDIR}/external/bsd/ntp
NTP_HTMLDIR= /usr/share/doc/reference/ref8
@@ -74,4 +71,24 @@ COPTS.ntp_loopfilter.c+= -Wno-error=impl
COPTS.refclock_ulink.c+= -Wno-error=implicit-fallthrough
.endif
+.SUFFIXES: .1 .5 .8 .1ntpdmdoc .5mdoc .1ntp-keygenmdoc .1ntpdcmdoc .1ntpqmdoc .1sntpmdoc
+
+.5mdoc.5:
+ ${TOOL_SED} -e 's/5mdoc/5/g' < ${.IMPSRC} > ${.TARGET}
+
+.1ntpdmdoc.8:
+ ${TOOL_SED} -e 's/1ntpdmdoc/8/g' < ${.IMPSRC} > ${.TARGET}
+
+.1ntp-keygenmdoc.8:
+ ${TOOL_SED} -e 's/1ntp-keygenmdoc/8/g' < ${.IMPSRC} > ${.TARGET}
+
+.1ntpdcmdoc.8:
+ ${TOOL_SED} -e 's/1ntpdcmdoc/8/g' < ${.IMPSRC} > ${.TARGET}
+
+.1ntpqmdoc.8:
+ ${TOOL_SED} -e 's/1ntpqmdoc/8/g' < ${.IMPSRC} > ${.TARGET}
+
+.1sntpmdoc.1:
+ ${TOOL_SED} -e 's/1sntpmdoc/1/g' < ${.IMPSRC} > ${.TARGET}
+
.endif
Index: src/external/bsd/ntp/bin/Makefile.inc
diff -u src/external/bsd/ntp/bin/Makefile.inc:1.3 src/external/bsd/ntp/bin/Makefile.inc:1.3.56.1
--- src/external/bsd/ntp/bin/Makefile.inc:1.3 Sat Dec 4 23:08:33 2010
+++ src/external/bsd/ntp/bin/Makefile.inc Mon Oct 12 10:17:33 2020
@@ -1,3 +1,3 @@
-# $NetBSD: Makefile.inc,v 1.3 2010/12/04 23:08:33 christos Exp $
+# $NetBSD: Makefile.inc,v 1.3.56.1 2020/10/12 10:17:33 martin Exp $
-.include "../Makefile.inc"
+.include "${.PARSEDIR}/../Makefile.inc"
Index: src/external/bsd/ntp/bin/ntp-keygen/Makefile
diff -u src/external/bsd/ntp/bin/ntp-keygen/Makefile:1.5 src/external/bsd/ntp/bin/ntp-keygen/Makefile:1.5.34.1
--- src/external/bsd/ntp/bin/ntp-keygen/Makefile:1.5 Sat Dec 28 03:19:43 2013
+++ src/external/bsd/ntp/bin/ntp-keygen/Makefile Mon Oct 12 10:17:33 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2013/12/28 03:19:43 christos Exp $
+# $NetBSD: Makefile,v 1.5.34.1 2020/10/12 10:17:33 martin Exp $
.include <bsd.own.mk>
@@ -20,4 +20,6 @@ CPPFLAGS+=-I${IDIST}/include -I${IDIST}/
.PATH: ${DIST}
+CLEANFILES+=${MAN}
+
.include <bsd.prog.mk>
Index: src/external/bsd/ntp/bin/ntpd/Makefile
diff -u src/external/bsd/ntp/bin/ntpd/Makefile:1.22 src/external/bsd/ntp/bin/ntpd/Makefile:1.22.6.1
--- src/external/bsd/ntp/bin/ntpd/Makefile:1.22 Fri Feb 2 01:02:39 2018
+++ src/external/bsd/ntp/bin/ntpd/Makefile Mon Oct 12 10:17:33 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2018/02/02 01:02:39 mrg Exp $
+# $NetBSD: Makefile,v 1.22.6.1 2020/10/12 10:17:33 martin Exp $
.include <bsd.own.mk>
@@ -92,4 +92,6 @@ YHEADER=1
COPTS.ntp_control.c+= -Wno-error=maybe-uninitialized
.endif
+CLEANFILES+=${MAN}
+
.include <bsd.prog.mk>
Index: src/external/bsd/ntp/bin/ntpdc/Makefile
diff -u src/external/bsd/ntp/bin/ntpdc/Makefile:1.6 src/external/bsd/ntp/bin/ntpdc/Makefile:1.6.34.1
--- src/external/bsd/ntp/bin/ntpdc/Makefile:1.6 Sat Dec 28 03:19:43 2013
+++ src/external/bsd/ntp/bin/ntpdc/Makefile Mon Oct 12 10:17:33 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2013/12/28 03:19:43 christos Exp $
+# $NetBSD: Makefile,v 1.6.34.1 2020/10/12 10:17:33 martin Exp $
.include <bsd.own.mk>
@@ -22,4 +22,6 @@ CPPFLAGS+=-I${IDIST}/include -I${IDIST}/
.PATH: ${DIST}
+CLEANFILES+=${MAN}
+
.include <bsd.prog.mk>
Index: src/external/bsd/ntp/bin/ntpq/Makefile
diff -u src/external/bsd/ntp/bin/ntpq/Makefile:1.7 src/external/bsd/ntp/bin/ntpq/Makefile:1.7.34.1
--- src/external/bsd/ntp/bin/ntpq/Makefile:1.7 Sat Dec 28 03:19:43 2013
+++ src/external/bsd/ntp/bin/ntpq/Makefile Mon Oct 12 10:17:33 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2013/12/28 03:19:43 christos Exp $
+# $NetBSD: Makefile,v 1.7.34.1 2020/10/12 10:17:33 martin Exp $
.include <bsd.own.mk>
@@ -21,4 +21,6 @@ CPPFLAGS+=-I${IDIST}/include -I${IDIST}/
.PATH: ${DIST}
+CLEANFILES+=${MAN}
+
.include <bsd.prog.mk>
Index: src/external/bsd/ntp/bin/sntp/Makefile
diff -u src/external/bsd/ntp/bin/sntp/Makefile:1.6 src/external/bsd/ntp/bin/sntp/Makefile:1.6.34.1
--- src/external/bsd/ntp/bin/sntp/Makefile:1.6 Sat Dec 28 03:19:43 2013
+++ src/external/bsd/ntp/bin/sntp/Makefile Mon Oct 12 10:17:33 2020
@@ -1,7 +1,9 @@
-# $NetBSD: Makefile,v 1.6 2013/12/28 03:19:43 christos Exp $
+# $NetBSD: Makefile,v 1.6.34.1 2020/10/12 10:17:33 martin Exp $
USE_FORT?= yes # network client/server
+.include <bsd.own.mk>
+
PROG= sntp
MAN= sntp.1
SRCS= \
@@ -31,4 +33,6 @@ CPPFLAGS+= -DSAVENAME=\"/var/db/sntp.sta
LDADD+= -L${LIBISC} -liscntp -levent -lm
DPADD+= ${LIBM} ${LIBEVENT}
+CLEANFILES+=${MAN}
+
.include <bsd.prog.mk>
