[src/trunk]: src/external/public-domain/tz Updated import script for tzdata20...

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

details:   https://anonhg.NetBSD.org/src/rev/a999111d61c5
branches:  trunk
changeset: 331919:a999111d61c5
user:      apb <apb%NetBSD.org@localhost>
date:      Sun Aug 31 07:04:07 2014 +0000

description:
Updated import script for tzdata2014g.
Aso added "cd" commands that were missed in the recent move from
src/share/zoneinfo to external/public-domain/tz.

diffstat:

 external/public-domain/tz/tzdata2netbsd |  19 ++++++++++++-------
 1 files changed, 12 insertions(+), 7 deletions(-)

diffs (69 lines):

diff -r f2f776f4dc95 -r a999111d61c5 external/public-domain/tz/tzdata2netbsd
--- a/external/public-domain/tz/tzdata2netbsd   Sun Aug 31 06:59:52 2014 +0000
+++ b/external/public-domain/tz/tzdata2netbsd   Sun Aug 31 07:04:07 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: tzdata2netbsd,v 1.2 2014/08/08 09:47:28 apb Exp $
+# $NetBSD: tzdata2netbsd,v 1.3 2014/08/31 07:04:07 apb Exp $
 
 # For use by NetBSD developers when updating to new versions of tzdata.
 #
@@ -13,8 +13,8 @@
 #    redo non-trivial work done by earlier runs.
 #
 
-OLDVER=2014e
-NEWVER=2014f
+OLDVER=2014f
+NEWVER=2014g
 
 # Uppercase variants of OLDVER and NEWVER
 OLDVER_UC="$( echo "${OLDVER}" | tr '[a-z]' '[A-Z]' )"
@@ -33,6 +33,7 @@
 
 # Directories
 REPODIR="src/external/public-domain/tz/dist" # relative to the NetBSD CVS repo
+TZDISTDIR="$(pwd)/dist" # should be .../external/public-domain/tz/dist
 WORKDIR="$(pwd)/update-work/${NEWVER}"
 EXTRACTDIR="${WORKDIR}/extract"
 
@@ -50,6 +51,7 @@
        local really_do_it=false
        local reply
 
+       echo "In directory $(pwd)"
        echo "ABOUT TO DO:" "$(shell_quote "$@")"
        read -p "Really do it? [yes/no/quit] " reply
        case "${reply}" in
@@ -283,9 +285,11 @@
 }
 
 cvsmerge()
-{
+{(
+
+       cd "${TZDISTDIR}" || exit 1
        DOIT cvs -d "${CVSROOT}" update -j"${CVSOLDTAG}" -j"${CVSNEWTAG}"
-}
+)}
 
 resolveconflicts()
 {
@@ -299,7 +303,8 @@
 }
 
 cvscommitmerge()
-{
+{(
+       cd "${TZDISTDIR}" || exit 1
        if grep -l '^[<=>][<=>][<=>]' *
        then
                cat >&2 <<EOF
@@ -309,7 +314,7 @@
                return 1
        fi
        DOIT cvs -d "${CVSROOT}" commit -m "Merge tzdata${NEWVER}"
-}
+)}
 
 extra()
 {