[src/trunk]: src/external/public-domain/tz Adapt tzdata2netbsd script to the ...

[apb <apb%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/220e35f9a475
branches:  trunk
changeset: 331315:220e35f9a475
user:      apb <apb%NetBSD.org@localhost>
date:      Fri Aug 08 09:47:28 2014 +0000

description:
Adapt tzdata2netbsd script to the new source location.

* Change src/share/zoneinfo to src/external/public-domain/tz.
* The NEWS file is not distributed in the tzdata tar.gz file,
  but it logically belongs with it.  We were already downloading the
  NEWS file from a different location, but now we also add it to the
  import directory.

diffstat:

 external/public-domain/tz/tzdata2netbsd |  17 +++++++++++++----
 1 files changed, 13 insertions(+), 4 deletions(-)

diffs (62 lines):

diff -r 4bdd1f7e3003 -r 220e35f9a475 external/public-domain/tz/tzdata2netbsd
--- a/external/public-domain/tz/tzdata2netbsd   Fri Aug 08 09:34:10 2014 +0000
+++ b/external/public-domain/tz/tzdata2netbsd   Fri Aug 08 09:47:28 2014 +0000
@@ -1,8 +1,9 @@
-# $NetBSD: tzdata2netbsd,v 1.1 2014/08/08 09:08:19 apb Exp $
+# $NetBSD: tzdata2netbsd,v 1.2 2014/08/08 09:47:28 apb Exp $
 
 # For use by NetBSD developers when updating to new versions of tzdata.
 #
-# 0. Be in an up-to-date checkout of src/share/zoneinfo from NetBSD-current.
+# 0. Be in an up-to-date checkout of src/external/public-domain/tz
+#    from NetBSD-current.
 # 1. Edit OLDVER and NEWVER below.
 # 3. Run this script.  You will be prompted for confirmation before
 #    anything major (such as a cvs operation).
@@ -31,7 +32,7 @@
 NEWSURL="https://github.com/eggert/tz/raw/${GITHUBTAG}/NEWS";
 
 # Directories
-REPODIR="src/share/zoneinfo"   # relative to the NetSBD CVS repository
+REPODIR="src/external/public-domain/tz/dist" # relative to the NetBSD CVS repo
 WORKDIR="$(pwd)/update-work/${NEWVER}"
 EXTRACTDIR="${WORKDIR}/extract"
 
@@ -162,6 +163,12 @@
        tar -z -xf "${DISTFILE}" -C "${EXTRACTDIR}"
 }
 
+addnews()
+{
+       [ -f "${EXTRACTDIR}/NEWS" ] && return
+       cp -p "${NEWSFILE}" "${EXTRACTDIR}"/NEWS
+}
+
 # Find the relevant part of the NEWS file for all releases between
 # OLDVER and NEWVER, and save them to NEWSTRIMFILE.
 #
@@ -198,7 +205,7 @@
 EDIT ME: 
 EOF
        awk -v oldver="${OLDVER}" -v newver="${NEWVER}" \
-           -v disturl="${DISTURL}" \
+           -v disturl="${DISTURL}" -v newsurl="${NEWSURL}" \
            '
                BEGIN {
                        bullet = "  * ";
@@ -207,6 +214,7 @@
                        goodsection = 0;
                        havesentence = 0;
                        print "Import tzdata"newver" from "disturl;
+                       print "and NEWS file from "newsurl;
                }
                /^Release/ {
                        # "Release <version> - <date>"
@@ -323,6 +331,7 @@
        fetch
        checksig
        extract
+       addnews
        trimnews
        mkimportmsg
        editimportmsg