Module Name: src
Committed By: agc
Date: Thu Jun 16 15:17:56 UTC 2016
Modified Files:
src/distrib/sets/lists/base: mi
src/external/public-domain/tz: tzdata2netbsd
src/external/public-domain/tz/share/zoneinfo: Makefile
Added Files:
src/external/public-domain/tz/dist: TZDATA_VERSION
Log Message:
Record the tzdata version in a separate file in the share/zoneinfo directory.
The file is kept up to date by the tzdata2netbsd script
To generate a diff of this commit:
cvs rdiff -u -r1.1127 -r1.1128 src/distrib/sets/lists/base/mi
cvs rdiff -u -r1.9 -r1.10 src/external/public-domain/tz/tzdata2netbsd
cvs rdiff -u -r0 -r1.1 src/external/public-domain/tz/dist/TZDATA_VERSION
cvs rdiff -u -r1.2 -r1.3 \
src/external/public-domain/tz/share/zoneinfo/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/base/mi
diff -u src/distrib/sets/lists/base/mi:1.1127 src/distrib/sets/lists/base/mi:1.1128
--- src/distrib/sets/lists/base/mi:1.1127 Sat Jun 4 16:29:35 2016
+++ src/distrib/sets/lists/base/mi Thu Jun 16 15:17:56 2016
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1127 2016/06/04 16:29:35 nonaka Exp $
+# $NetBSD: mi,v 1.1128 2016/06/16 15:17:56 agc Exp $
#
# Note: Don't delete entries from here - mark them as "obsolete" instead,
# unless otherwise stated below.
@@ -5841,6 +5841,7 @@
./usr/share/zoneinfo/SystemV/PST8PDT base-obsolete obsolete
./usr/share/zoneinfo/SystemV/YST9 base-obsolete obsolete
./usr/share/zoneinfo/SystemV/YST9YDT base-obsolete obsolete
+./usr/share/zoneinfo/TZDATA_VERSION base-sys-share share
./usr/share/zoneinfo/Turkey base-sys-share share
./usr/share/zoneinfo/UCT base-sys-share share
./usr/share/zoneinfo/US base-sys-share
Index: src/external/public-domain/tz/tzdata2netbsd
diff -u src/external/public-domain/tz/tzdata2netbsd:1.9 src/external/public-domain/tz/tzdata2netbsd:1.10
--- src/external/public-domain/tz/tzdata2netbsd:1.9 Wed Jun 1 00:02:12 2016
+++ src/external/public-domain/tz/tzdata2netbsd Thu Jun 16 15:17:56 2016
@@ -1,4 +1,4 @@
-# $NetBSD: tzdata2netbsd,v 1.9 2016/06/01 00:02:12 agc Exp $
+# $NetBSD: tzdata2netbsd,v 1.10 2016/06/16 15:17:56 agc Exp $
# For use by NetBSD developers when updating to new versions of tzdata.
#
@@ -194,6 +194,7 @@ trimnews()
// { if (inrange) print; }
' \
<"${NEWSFILE}" >"${NEWSTRIMFILE}"
+ echo "tzdata-${NEWVER}" > ${TZDISTDIR}/TZDATA_VERSION
}
# Create IMPORTMSGFILE from NEWSTRIMFILE, by ignoring some sections,
Index: src/external/public-domain/tz/share/zoneinfo/Makefile
diff -u src/external/public-domain/tz/share/zoneinfo/Makefile:1.2 src/external/public-domain/tz/share/zoneinfo/Makefile:1.3
--- src/external/public-domain/tz/share/zoneinfo/Makefile:1.2 Fri Aug 8 09:17:03 2014
+++ src/external/public-domain/tz/share/zoneinfo/Makefile Thu Jun 16 15:17:56 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2014/08/08 09:17:03 apb Exp $
+# $NetBSD: Makefile,v 1.3 2016/06/16 15:17:56 agc Exp $
.include <bsd.own.mk>
.include "../../Makefile.inc"
@@ -138,6 +138,8 @@ afterinstall: ${DATA} ${REDO} ${TABDATA}
${INSTALL_FILE} -o ${BINOWN} -g ${BINGRP} -m ${NONBINMODE} \
${TZDISTDIR}/$$f ${DESTDIR}${TZDIR}; \
done
+ ${INSTALL_FILE} -o ${BINOWN} -g ${BINGRP} -m ${NONBINMODE} \
+ ${TZDISTDIR}/TZDATA_VERSION ${DESTDIR}${TZDIR}/TZDATA_VERSION
.else # ${MKSHARE} == "no"
afterinstall:
.endif # ${MKSHARE} == "no"
Added files:
Index: src/external/public-domain/tz/dist/TZDATA_VERSION
diff -u /dev/null src/external/public-domain/tz/dist/TZDATA_VERSION:1.1
--- /dev/null Thu Jun 16 15:17:56 2016
+++ src/external/public-domain/tz/dist/TZDATA_VERSION Thu Jun 16 15:17:56 2016
@@ -0,0 +1 @@
+tzdata-2016d
