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

6 files changed, 110 insertions, 0 deletions

diff --git a/pkg/pcre/.gitignore b/pkg/pcre/.gitignore
new file mode 100644
index 00000000..39576135
--- /dev/null
+++ b/pkg/pcre/.gitignore
@@ -0,0 +1,2 @@
+/pcre-8.39.tar.gz
+/src
diff --git a/pkg/pcre/config.h b/pkg/pcre/config.h
new file mode 100644
index 00000000..b6cb1a55
--- /dev/null
+++ b/pkg/pcre/config.h
@@ -0,0 +1,64 @@
+#include <config-posix.h>
+
+/* #undef BSR_ANYCRLF */
+/* #undef EBCDIC */
+/* #undef EBCDIC_NL25 */
+#define HAVE_BCOPY 1
+/* #undef HAVE_BITS_TYPE_TRAITS_H */
+/* #undef HAVE_BZLIB_H */
+/* #undef HAVE_EDITLINE_READLINE_H */
+/* #undef HAVE_EDIT_READLINE_READLINE_H */
+#define HAVE_LONG_LONG 1
+#define HAVE_MEMORY_H 1
+#define HAVE_PTHREAD 1
+#define HAVE_PTHREAD_PRIO_INHERIT 1
+/* #undef HAVE_READLINE_HISTORY_H */
+/* #undef HAVE_READLINE_READLINE_H */
+#define HAVE_STRING 1
+/* #undef HAVE_STRTOQ */
+/* #undef HAVE_TYPE_TRAITS_H */
+#define HAVE_UNSIGNED_LONG_LONG 1
+#define HAVE_VISIBILITY 1
+/* #undef HAVE_WINDOWS_H */
+/* #undef HAVE_ZLIB_H */
+/* #undef HAVE__STRTOI64 */
+#define LINK_SIZE 2
+#define LT_OBJDIR ".libs/"
+#define MATCH_LIMIT 10000000
+#define MATCH_LIMIT_RECURSION MATCH_LIMIT
+#define MAX_NAME_COUNT 10000
+#define MAX_NAME_SIZE 32
+#define NEWLINE 10
+/* #undef NO_RECURSE */
+#define PACKAGE "pcre"
+#define PACKAGE_BUGREPORT ""
+#define PACKAGE_NAME "PCRE"
+#define PACKAGE_STRING "PCRE 8.39"
+#define PACKAGE_TARNAME "pcre"
+#define PACKAGE_URL ""
+#define PACKAGE_VERSION "8.39"
+#define PARENS_NEST_LIMIT 250
+#define PCRECPP_EXP_DECL extern __attribute__ ((visibility ("default")))
+#define PCRECPP_EXP_DEFN __attribute__ ((visibility ("default")))
+#define PCREGREP_BUFSIZE 20480
+#define PCREPOSIX_EXP_DECL extern __attribute__ ((visibility ("default")))
+#define PCREPOSIX_EXP_DEFN extern __attribute__ ((visibility ("default")))
+#define PCRE_EXP_DATA_DEFN __attribute__ ((visibility ("default")))
+#define PCRE_EXP_DECL extern __attribute__ ((visibility ("default")))
+#define PCRE_EXP_DEFN __attribute__ ((visibility ("default")))
+#define PCRE_STATIC 1
+#define POSIX_MALLOC_THRESHOLD 10
+/* #undef PTHREAD_CREATE_JOINABLE */
+#define SUPPORT_JIT /**/
+/* #undef SUPPORT_LIBBZ2 */
+/* #undef SUPPORT_LIBEDIT */
+/* #undef SUPPORT_LIBREADLINE */
+/* #undef SUPPORT_LIBZ */
+/* #undef SUPPORT_PCRE16 */
+/* #undef SUPPORT_PCRE32 */
+#define SUPPORT_PCRE8 /**/
+#define SUPPORT_PCREGREP_JIT /**/
+#define SUPPORT_UCP /**/
+#define SUPPORT_UTF /**/
+/* #undef SUPPORT_VALGRIND */
+#define VERSION "8.39"
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
diff --git a/pkg/pcre/rev b/pkg/pcre/rev
new file mode 100644
index 00000000..d00491fd
--- /dev/null
+++ b/pkg/pcre/rev
@@ -0,0 +1 @@
+1
diff --git a/pkg/pcre/sha256 b/pkg/pcre/sha256
new file mode 100644
index 00000000..a8ae49d8
--- /dev/null
+++ b/pkg/pcre/sha256
@@ -0,0 +1 @@
+ccdf7e788769838f8285b3ee672ed573358202305ee361cfec7a4a4fb005bbc7  pcre-8.39.tar.gz
diff --git a/pkg/pcre/url b/pkg/pcre/url
new file mode 100644
index 00000000..8333bf31
--- /dev/null
+++ b/pkg/pcre/url
@@ -0,0 +1 @@
+url = "ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-8.39.tar.gz"