Move to flat package hierarchy

Note to self: never try to move submodules again

To migrate your existing submodules (more or less):

	set -x
	set -e

	mkdir .git/modules/pkg
	for old in */*/src ; do
	        new="pkg/${old#*/}"
	        if ! [ -f "$old/.git" ] || [ "${old%%/*}" = pkg ] ; then
			continue
		fi
		git -C ".git/modules/$old" config core.worktree "../../../../../$new"
		rmdir "$new"
		mv "$old" "$new"
	        sed -e "s,$old,$new," "$new/.git" > "$new/.git.tmp"
	        mv "$new/.git.tmp" "$new/.git"
		mkdir ".git/modules/${new%/src}"
	        mv ".git/modules/$old" ".git/modules/$new"

		rm "${old%/src}"/*.ninja
		mv "${old%/src}"/*.tar.{gz,xz,bz2} "${new%/src}/"
		rmdir "${old%/src}" || true
	done
	sed -e 's,^\[submodule "[^/]*/,[submodule "pkg/,' .git/config > .git/config.tmp
	mv .git/config.tmp .git/config

5 files changed, 56 insertions, 0 deletions

diff --git a/pkg/tz/gen.rc b/pkg/tz/gen.rc
new file mode 100644
index 00000000..b2a9377e
--- /dev/null
+++ b/pkg/tz/gen.rc
@@ -0,0 +1,26 @@
+cflags -I '$dir'
+
+exe zic zic.c
+
+rule zic '$zic -d $outdir/zoneinfo $in'
+file bin/zic '$outdir'/zic 755
+
+tzdata=(\
+	africa\
+	antarctica\
+	asia\
+	australasia\
+	europe\
+	northamerica\
+	southamerica\
+	pacificnew\
+	etcetera\
+	backward\
+	systemv\
+	factory\
+)
+build '$outdir'/tzdata.index awk '$srcdir'/$tzdata '|' scripts/hash.rc '$dir/tzdata.awk' ; with\
+	expr '-f $dir/tzdata.awk out=$outdir/zoneinfo repo=$builddir/$repo.git'
+index_inputs=($index_inputs '$outdir'/tzdata.index)
+
+fetch git
diff --git a/pkg/tz/rev b/pkg/tz/rev
new file mode 100644
index 00000000..1e8b3149
--- /dev/null
+++ b/pkg/tz/rev
@@ -0,0 +1 @@
+6
diff --git a/pkg/tz/src b/pkg/tz/src
new file mode 160000
+Subproject eeff212d0f2b94a8c08d7ce2e1ff2278c027936
diff --git a/pkg/tz/tzdata.awk b/pkg/tz/tzdata.awk
new file mode 100644
index 00000000..e7b48085
--- /dev/null
+++ b/pkg/tz/tzdata.awk
@@ -0,0 +1,26 @@
+# usage: awk -f tzdata.awk repo=out/root.git out=out/pkg/tz/zoneinfo [file...]
+
+function run(cmd) {
+	status = system(cmd)
+	if (status != 0)
+		exit status
+}
+
+BEGIN {
+	cmdfmt = "rc ./scripts/hash.rc %s %s share/zoneinfo/%s %s"
+}
+
+FNR == 1 {
+	run(sprintf("zic -d %s %s", out, FILENAME))
+}
+
+$1 == "Link" {
+	s = $3
+	gsub(/[^\/]+/, "..", s)
+	s = substr(s, 1, length(s) - 2) $2
+	run(sprintf(cmdfmt, repo, 120000, $3, s))
+}
+
+$1 == "Zone" {
+	run(sprintf(cmdfmt, repo, 100644, $2, out "/" $2))
+}
diff --git a/pkg/tz/version.h b/pkg/tz/version.h
new file mode 100644
index 00000000..76f806c4
--- /dev/null
+++ b/pkg/tz/version.h
@@ -0,0 +1,3 @@
+static char const PKGVERSION[]="(tzcode) ";
+static char const TZVERSION[]="2016j";
+static char const REPORT_BUGS_TO[]="tz@iana.org";