Fri Apr 19 09:01:35 2024 UTC (20d)
Pull up following revision(s) (requested by jakllsch in ticket #663):

	external/bsd/ntp/lib/libntp/Makefile: revision 1.30
	external/bsd/ntp/lib/libntp/Makefile: revision 1.31
	external/bsd/ntp/lib/libntp/Makefile: revision 1.28
	external/bsd/ntp/lib/libntp/Makefile: revision 1.29

use ${MKREPRO_TIMESTAMP} for baking in the date and time.
fix format.
remove now-unused assignment
Format MKREPRO_TIMESTAMP with "%b %d %Y" to correctly substitute __DATE__


(martin)
diff -r1.25.6.1 -r1.25.6.2 src/external/bsd/ntp/lib/libntp/Makefile
cvs diff -r1.25.6.1 -r1.25.6.2 src/external/bsd/ntp/lib/libntp/Makefile (expand / switch to unified diff)

--- src/external/bsd/ntp/lib/libntp/Makefile 2023/08/11 13:42:57 1.25.6.1
+++ src/external/bsd/ntp/lib/libntp/Makefile 2024/04/19 09:01:35 1.25.6.2
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.25.6.1 2023/08/11 13:42:57 martin Exp $ 1# $NetBSD: Makefile,v 1.25.6.2 2024/04/19 09:01:35 martin Exp $
2 2
3LIBISPRIVATE=yes 3LIBISPRIVATE=yes
4 4
5LIB=ntp 5LIB=ntp
6 6
7.include <bsd.own.mk> 7.include <bsd.own.mk>
8 8
9.include "${.CURDIR}/../Makefile.inc" 9.include "${.CURDIR}/../Makefile.inc"
10 10
11DIST= ${IDIST}/libntp  11DIST= ${IDIST}/libntp
12 12
13.PATH.c: ${DIST} 13.PATH.c: ${DIST}
14 14
@@ -76,35 +76,28 @@ systime.c \ @@ -76,35 +76,28 @@ systime.c \
76timespecops.c \ 76timespecops.c \
77timetoa.c \ 77timetoa.c \
78timexsup.c \ 78timexsup.c \
79uglydate.c \ 79uglydate.c \
80vint64ops.c \ 80vint64ops.c \
81work_fork.c \ 81work_fork.c \
82work_thread.c \ 82work_thread.c \
83xsbprintf.c \ 83xsbprintf.c \
84ymd2yd.c 84ymd2yd.c
85 85
86CPPFLAGS+= -I${IDIST}/sntp/libopts 86CPPFLAGS+= -I${IDIST}/sntp/libopts
87 87
88# For MKREPRO, avoid using __DATE__ and __TIME__. 88# For MKREPRO, avoid using __DATE__ and __TIME__.
89# Instead, use the date and time from ${IMPORTDATE_FILE}. 89# Instead, use the date and time from ${MKREPRO_TIMESTAMP}
90# 
91# The file should contain one line, like this: 
92# Fri Dec 27 19:28:17 EST 2013 (import) 
93# 
94.if ${MKREPRO:Uno} == "yes" 90.if ${MKREPRO:Uno} == "yes"
95IMPORTDATE_FILE := ${.PARSEDIR}/../../importdate 91MKREPRO_DATE != ${TOOL_DATE} -u -r "${MKREPRO_TIMESTAMP}" "+%b %d %Y"
96MKREPRO_DATE != ${TOOL_AWK} '{printf "%3s %2d %4d", $$2, $$3, $$6}' \ 92MKREPRO_TIME != ${TOOL_DATE} -u -r "${MKREPRO_TIMESTAMP}" "+%T"
97 <${IMPORTDATE_FILE} # "Mmm DD YYYY" 
98MKREPRO_TIME != ${TOOL_AWK} '{print $$4}' \ 
99 <${IMPORTDATE_FILE} # "HH:MM:SS" 
100CPPFLAGS.ntp_calendar.c += -DMKREPRO_DATE=\"${MKREPRO_DATE:Q}\" 93CPPFLAGS.ntp_calendar.c += -DMKREPRO_DATE=\"${MKREPRO_DATE:Q}\"
101CPPFLAGS.ntp_calendar.c += -DMKREPRO_TIME=\"${MKREPRO_TIME:Q}\" 94CPPFLAGS.ntp_calendar.c += -DMKREPRO_TIME=\"${MKREPRO_TIME:Q}\"
102.endif 95.endif
103 96
104COPTS.timetoa.c+= ${GCC_NO_FORMAT_TRUNCATION} 97COPTS.timetoa.c+= ${GCC_NO_FORMAT_TRUNCATION}
105COPTS.socktoa.c+= ${${ACTIVE_CC} == "gcc" && ${HAVE_GCC:U0} >= 10:? -Wno-restrict :} 98COPTS.socktoa.c+= ${${ACTIVE_CC} == "gcc" && ${HAVE_GCC:U0} >= 10:? -Wno-restrict :}
106COPTS.socktohost.c+= ${${ACTIVE_CC} == "gcc" && ${HAVE_GCC:U0} >= 10:? -Wno-restrict :} 99COPTS.socktohost.c+= ${${ACTIVE_CC} == "gcc" && ${HAVE_GCC:U0} >= 10:? -Wno-restrict :}
107 100
108COPTS.a_md5encrypt.c+= -Wno-error=deprecated-declarations 101COPTS.a_md5encrypt.c+= -Wno-error=deprecated-declarations
109 102
110.include <bsd.lib.mk> 103.include <bsd.lib.mk>