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, 23 insertions, 0 deletions

diff --git a/pkg/plan9port/patch/0005-Include-u.h-before-any-other-system-headers.patch b/pkg/plan9port/patch/0005-Include-u.h-before-any-other-system-headers.patch
new file mode 100644
index 00000000..0b022c64
--- /dev/null
+++ b/pkg/plan9port/patch/0005-Include-u.h-before-any-other-system-headers.patch
@@ -0,0 +1,23 @@
+From c35ccfd7b03be1770ba3894e2e97b7faf87b8634 Mon Sep 17 00:00:00 2001
+From: Michael Forney <mforney@mforney.org>
+Date: Sun, 11 Dec 2016 13:28:47 -0800
+Subject: [PATCH] Include <u.h> before any other system headers
+
+Otherwise, the system headers may provide different values for feature test
+macros than we do in u.h.
+---
+ src/cmd/rc/io.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/cmd/rc/io.c b/src/cmd/rc/io.c
+index bb8af4ab..ac3b7585 100644
+--- a/src/cmd/rc/io.c
++++ b/src/cmd/rc/io.c
+@@ -1,3 +1,4 @@
++#include <u.h>
+ #include <limits.h>
+ #include "rc.h"
+ #include "exec.h"
+-- 
+2.11.0
+