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

3 files changed, 34 insertions, 0 deletions

diff --git a/pkg/zlib/gen.rc b/pkg/zlib/gen.rc
new file mode 100644
index 00000000..56ac0a0a
--- /dev/null
+++ b/pkg/zlib/gen.rc
@@ -0,0 +1,33 @@
+cflags\
+	-D HAVE_HIDDEN\
+	-D HAVE_STDARG_H\
+	-D HAVE_UNISTD_H\
+	-D _LARGEFILE64_SOURCE
+
+lib libz.a\
+	adler32.c\
+	crc32.c\
+	deflate.c\
+	infback.c\
+	inffast.c\
+	inflate.c\
+	inftrees.c\
+	trees.c\
+	zutil.c\
+	\
+	compress.c\
+	uncompr.c\
+	gzclose.c\
+	gzlib.c\
+	gzread.c\
+	gzwrite.c
+file lib/libz.a '$outdir'/libz.a 644
+
+hdrs=(zlib.h zconf.h)
+for(hdr in $hdrs) {
+	build '$outdir'/include/$hdr copy '$srcdir'/$hdr
+	file include/$hdr '$srcdir'/$hdr 644
+}
+phony headers '$outdir'/include/$hdrs
+
+fetch git
diff --git a/pkg/zlib/rev b/pkg/zlib/rev
new file mode 100644
index 00000000..d00491fd
--- /dev/null
+++ b/pkg/zlib/rev
@@ -0,0 +1 @@
+1
diff --git a/pkg/zlib/src b/pkg/zlib/src
new file mode 160000
+Subproject 50893291621658f355bc5b4d450a8d06a563053