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

2 files changed, 103 insertions, 0 deletions

diff --git a/pkg/alsa-utils/patch/0001-Include-poll.h-instead-of-sys-poll.h.patch b/pkg/alsa-utils/patch/0001-Include-poll.h-instead-of-sys-poll.h.patch
new file mode 100644
index 00000000..6423a770
--- /dev/null
+++ b/pkg/alsa-utils/patch/0001-Include-poll.h-instead-of-sys-poll.h.patch
@@ -0,0 +1,81 @@
+From 16fb793861d8833c81b4a7bb0eb8372099699772 Mon Sep 17 00:00:00 2001
+From: Michael Forney <mforney@mforney.org>
+Date: Sat, 2 Jul 2016 23:48:43 -0700
+Subject: [PATCH] Include poll.h instead of sys/poll.h
+
+---
+ amidi/amidi.c               | 2 +-
+ amixer/amixer.c             | 2 +-
+ aplay/aplay.c               | 2 +-
+ seq/aplaymidi/arecordmidi.c | 2 +-
+ seq/aseqdump/aseqdump.c     | 2 +-
+ 5 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/amidi/amidi.c b/amidi/amidi.c
+index cedf18c..46f5767 100644
+--- a/amidi/amidi.c
++++ b/amidi/amidi.c
+@@ -29,7 +29,7 @@
+ #include <errno.h>
+ #include <signal.h>
+ #include <sys/types.h>
+-#include <sys/poll.h>
++#include <poll.h>
+ #include <sys/stat.h>
+ #include <unistd.h>
+ #include <fcntl.h>
+diff --git a/amixer/amixer.c b/amixer/amixer.c
+index f9b09cb..8241148 100644
+--- a/amixer/amixer.c
++++ b/amixer/amixer.c
+@@ -28,7 +28,7 @@
+ #include <errno.h>
+ #include <assert.h>
+ #include <alsa/asoundlib.h>
+-#include <sys/poll.h>
++#include <poll.h>
+ #include <stdint.h>
+ #include "amixer.h"
+ #include "../alsamixer/volume_mapping.h"
+diff --git a/aplay/aplay.c b/aplay/aplay.c
+index 2da7dda..172287b 100644
+--- a/aplay/aplay.c
++++ b/aplay/aplay.c
+@@ -43,7 +43,7 @@
+ #include <assert.h>
+ #include <termios.h>
+ #include <signal.h>
+-#include <sys/poll.h>
++#include <poll.h>
+ #include <sys/uio.h>
+ #include <sys/time.h>
+ #include <sys/stat.h>
+diff --git a/seq/aplaymidi/arecordmidi.c b/seq/aplaymidi/arecordmidi.c
+index 9628086..1c25fa2 100644
+--- a/seq/aplaymidi/arecordmidi.c
++++ b/seq/aplaymidi/arecordmidi.c
+@@ -27,7 +27,7 @@
+ #include <string.h>
+ #include <signal.h>
+ #include <getopt.h>
+-#include <sys/poll.h>
++#include <poll.h>
+ #include <alsa/asoundlib.h>
+ #include "aconfig.h"
+ #include "version.h"
+diff --git a/seq/aseqdump/aseqdump.c b/seq/aseqdump/aseqdump.c
+index 24c5d21..05892e0 100644
+--- a/seq/aseqdump/aseqdump.c
++++ b/seq/aseqdump/aseqdump.c
+@@ -25,7 +25,7 @@
+ #include <string.h>
+ #include <signal.h>
+ #include <getopt.h>
+-#include <sys/poll.h>
++#include <poll.h>
+ #include <alsa/asoundlib.h>
+ #include "aconfig.h"
+ #include "version.h"
+-- 
+2.9.2
+
diff --git a/pkg/alsa-utils/patch/0002-amixer.h-Just-include-version.h.patch b/pkg/alsa-utils/patch/0002-amixer.h-Just-include-version.h.patch
new file mode 100644
index 00000000..83cf3821
--- /dev/null
+++ b/pkg/alsa-utils/patch/0002-amixer.h-Just-include-version.h.patch
@@ -0,0 +1,22 @@
+From be89553bd363678ab75c44b8e0630920aba52987 Mon Sep 17 00:00:00 2001
+From: Michael Forney <mforney@mforney.org>
+Date: Sun, 3 Jul 2016 00:01:24 -0700
+Subject: [PATCH] amixer.h: Just include "version.h"
+
+---
+ amixer/amixer.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/amixer/amixer.h b/amixer/amixer.h
+index 3588f04..0daa5b7 100644
+--- a/amixer/amixer.h
++++ b/amixer/amixer.h
+@@ -18,4 +18,4 @@
+  *
+  */
+ 
+-#include "../include/version.h"
++#include "version.h"
+-- 
+2.9.2
+