# cvs rdiff -u -r1.7 -r1.8 src/external/bsd/ntp/bin/sntp/Makefile # cvs rdiff -u -r1.19 -r1.20 src/external/bsd/ntp/Makefile.inc # cvs rdiff -u -r1.3 -r1.4 src/external/bsd/ntp/bin/Makefile.inc rm \ bin/ntp-keygen/ntp-keygen.8 \ bin/ntpd/ntp.conf.5 \ bin/ntpd/ntp.keys.5 \ bin/ntpd/ntpd.8 \ bin/ntpdc/ntpdc.8 \ bin/ntpq/ntpq.8 \ bin/sntp/sntp.1 \ ; Index: bin/sntp/Makefile =================================================================== RCS file: /cvsroot/src/external/bsd/ntp/bin/sntp/Makefile,v retrieving revision 1.7 retrieving revision 1.8 diff -u -p -r1.7 -r1.8 --- bin/sntp/Makefile 13 Oct 2019 07:28:07 -0000 1.7 +++ bin/sntp/Makefile 10 Oct 2020 14:23:05 -0000 1.8 @@ -1,7 +1,9 @@ -# $NetBSD: Makefile,v 1.7 2019/10/13 07:28:07 mrg Exp $ +# $NetBSD: Makefile,v 1.8 2020/10/10 14:23:05 christos Exp $ USE_FORT?= yes # network client/server +.include + PROG= sntp MAN= sntp.1 SRCS= \ Index: Makefile.inc =================================================================== RCS file: /cvsroot/src/external/bsd/ntp/Makefile.inc,v retrieving revision 1.19 retrieving revision 1.20 diff -u -p -r1.19 -r1.20 --- Makefile.inc 29 Sep 2019 23:44:59 -0000 1.19 +++ Makefile.inc 10 Oct 2020 14:23:34 -0000 1.20 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.inc,v 1.19 2019/09/29 23:44:59 mrg Exp $ +# $NetBSD: Makefile.inc,v 1.20 2020/10/10 14:23:34 christos Exp $ .if !defined(NTP_MAKEFILE_INC) NTP_MAKEFILE_INC=yes @@ -12,9 +12,6 @@ CWARNFLAGS.clang+= -Wno-unneeded-interna WARNS?= 4 - -.include - IDIST= ${NETBSDSRCDIR}/external/bsd/ntp/dist NTP_SRCDIR= ${NETBSDSRCDIR}/external/bsd/ntp NTP_HTMLDIR= /usr/share/doc/reference/ref8 @@ -74,4 +71,27 @@ 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} + + +CLEANFILES+=${MAN} + .endif Index: bin/Makefile.inc =================================================================== RCS file: /cvsroot/src/external/bsd/ntp/bin/Makefile.inc,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- bin/Makefile.inc 4 Dec 2010 23:08:33 -0000 1.3 +++ bin/Makefile.inc 10 Oct 2020 14:23:48 -0000 1.4 @@ -1,3 +1,3 @@ -# $NetBSD: Makefile.inc,v 1.3 2010/12/04 23:08:33 christos Exp $ +# $NetBSD: Makefile.inc,v 1.4 2020/10/10 14:23:48 christos Exp $ -.include "../Makefile.inc" +.include "${.PARSEDIR}/../Makefile.inc"