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

1 files changed, 41 insertions, 0 deletions

diff --git a/pkg/pcre/gen.rc b/pkg/pcre/gen.rc
new file mode 100644
index 00000000..6064222d
--- /dev/null
+++ b/pkg/pcre/gen.rc
@@ -0,0 +1,41 @@
+cflags\
+	-D HAVE_CONFIG_H\
+	-I include\
+	-I '$dir' \
+	-I '$srcdir' \
+	-I '$outdir'/include
+
+build '$outdir'/include/pcre.h sed '$srcdir'/pcre.h.in ; exprs=(\
+	-e s,@PCRE_MAJOR@,8,\
+	-e s,@PCRE_MINOR@,39,\
+	-e s,@PCRE_PRERELEASE@,,\
+	-e s,@PCRE_DATE@,2016-06-14,\
+) with expr $"exprs
+
+phony headers '$outdir'/include/pcre.h
+
+build '$outdir'/pcre_chartables.c copy '$srcdir'/pcre_chartables.c.dist
+lib libpcre.a -d '$dir'/headers\
+	pcre_byte_order.c\
+	pcre_compile.c\
+	pcre_config.c\
+	pcre_dfa_exec.c\
+	pcre_exec.c\
+	pcre_fullinfo.c\
+	pcre_get.c\
+	pcre_globals.c\
+	pcre_jit_compile.c\
+	pcre_maketables.c\
+	pcre_newline.c\
+	pcre_ord2utf8.c\
+	pcre_refcount.c\
+	pcre_string_utils.c\
+	pcre_study.c\
+	pcre_tables.c\
+	pcre_ucd.c\
+	pcre_valid_utf8.c\
+	pcre_version.c\
+	pcre_xclass.c\
+	'$outdir'/pcre_chartables.c
+
+fetch curl