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

5 files changed, 81 insertions, 0 deletions

diff --git a/pkg/libfuse/config.h b/pkg/libfuse/config.h
new file mode 100644
index 00000000..a4dfbf5a
--- /dev/null
+++ b/pkg/libfuse/config.h
@@ -0,0 +1,22 @@
+#include <config-posix.h>
+
+#define FUSERMOUNT_DIR "/bin"
+#define IGNORE_MTAB
+
+#define HAVE_MEMORY_H 1
+#define HAVE_SETXATTR 1
+#define HAVE_SPLICE 1
+#define HAVE_STRUCT_STAT_ST_ATIM 1
+/* #undef HAVE_STRUCT_STAT_ST_ATIMESPEC */
+#define HAVE_VMSPLICE 1
+#define ICONV_CONST
+/* #undef IGNORE_MTAB */
+#define LT_OBJDIR ".libs/"
+#define PACKAGE "fuse"
+#define PACKAGE_BUGREPORT ""
+#define PACKAGE_NAME "fuse"
+#define PACKAGE_STRING "fuse 2.9.7"
+#define PACKAGE_TARNAME "fuse"
+#define PACKAGE_URL ""
+#define PACKAGE_VERSION "2.9.7"
+#define VERSION "2.9.7"
diff --git a/pkg/libfuse/gen.rc b/pkg/libfuse/gen.rc
new file mode 100644
index 00000000..096ac3e0
--- /dev/null
+++ b/pkg/libfuse/gen.rc
@@ -0,0 +1,33 @@
+cflags\
+	-D '_FILE_OFFSET_BITS=64' \
+	-D 'FUSE_USE_VERSION=26' \
+	-I include\
+	-I '$dir' \
+	-I '$srcdir'/include\
+	-I '$srcdir'/lib
+
+cc lib/mount_util.c
+
+exe fusermount util/fusermount.c lib/mount_util.c.o
+file bin/fusermount '$outdir'/fusermount 4755
+file share/man/man1/fusermount.1 '$srcdir'/doc/fusermount.1 644
+
+lib libfuse.a lib/^(\
+	fuse.c\
+	fuse_kern_chan.c\
+	fuse_loop.c\
+	fuse_loop_mt.c\
+	fuse_lowlevel.c\
+	fuse_mt.c\
+	fuse_opt.c\
+	fuse_session.c\
+	fuse_signals.c\
+	buffer.c\
+	cuse_lowlevel.c\
+	helper.c\
+	modules/subdir.c\
+	\
+	mount.c mount_util.c.o\
+)
+
+fetch git
diff --git a/pkg/libfuse/patch/0001-Fix-poll.h-include.patch b/pkg/libfuse/patch/0001-Fix-poll.h-include.patch
new file mode 100644
index 00000000..193a7b12
--- /dev/null
+++ b/pkg/libfuse/patch/0001-Fix-poll.h-include.patch
@@ -0,0 +1,25 @@
+From 8926abd905339e40bf096c904d900caa42e3262f Mon Sep 17 00:00:00 2001
+From: Michael Forney <mforney@mforney.org>
+Date: Fri, 15 Jul 2016 19:21:28 -0700
+Subject: [PATCH] Fix poll.h include
+
+---
+ lib/mount.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/mount.c b/lib/mount.c
+index 227a408..0fc7d15 100644
+--- a/lib/mount.c
++++ b/lib/mount.c
+@@ -20,7 +20,7 @@
+ #include <string.h>
+ #include <fcntl.h>
+ #include <errno.h>
+-#include <sys/poll.h>
++#include <poll.h>
+ #include <sys/socket.h>
+ #include <sys/un.h>
+ #include <sys/wait.h>
+-- 
+2.9.1
+
diff --git a/pkg/libfuse/rev b/pkg/libfuse/rev
new file mode 100644
index 00000000..0cfbf088
--- /dev/null
+++ b/pkg/libfuse/rev
@@ -0,0 +1 @@
+2
diff --git a/pkg/libfuse/src b/pkg/libfuse/src
new file mode 160000
+Subproject df499bf1ce634f6e67d4d366c4475d32143f00f