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

diff --git a/pkg/openbsd/patch/0001-fts-Avoid-d_namlen.patch b/pkg/openbsd/patch/0001-fts-Avoid-d_namlen.patch
new file mode 100644
index 00000000..fb3e7cbd
--- /dev/null
+++ b/pkg/openbsd/patch/0001-fts-Avoid-d_namlen.patch
@@ -0,0 +1,50 @@
+From 03bc025e5ccfc5ba5524cd76a83a5682263fd3e4 Mon Sep 17 00:00:00 2001
+From: Michael Forney <mforney@mforney.org>
+Date: Sun, 17 Apr 2016 23:50:15 -0700
+Subject: [PATCH] fts: Avoid d_namlen
+
+---
+ lib/libc/gen/fts.c | 11 +++++++----
+ 1 file changed, 7 insertions(+), 4 deletions(-)
+
+diff --git a/lib/libc/gen/fts.c b/lib/libc/gen/fts.c
+index 9a9b2a5..77e1e77 100644
+--- a/lib/libc/gen/fts.c
++++ b/lib/libc/gen/fts.c
+@@ -556,6 +556,7 @@ fts_build(FTS *sp, int type)
+ 	int nitems, cderrno, descend, level, nlinks, nostat, doadjust;
+ 	int saved_errno;
+ 	char *cp;
++	size_t namlen;
+ 
+ 	/* Set current node pointer. */
+ 	cur = sp->fts_cur;
+@@ -654,11 +655,13 @@ fts_build(FTS *sp, int type)
+ 		if (!ISSET(FTS_SEEDOT) && ISDOT(dp->d_name))
+ 			continue;
+ 
+-		if (!(p = fts_alloc(sp, dp->d_name, (size_t)dp->d_namlen)))
++		namlen = strlen(dp->d_name);
++
++		if (!(p = fts_alloc(sp, dp->d_name, namlen)))
+ 			goto mem1;
+-		if (dp->d_namlen >= maxlen) {	/* include space for NUL */
++		if (namlen >= maxlen) {	/* include space for NUL */
+ 			oldaddr = sp->fts_path;
+-			if (fts_palloc(sp, dp->d_namlen +len + 1)) {
++			if (fts_palloc(sp, namlen +len + 1)) {
+ 				/*
+ 				 * No more memory for path or structures.  Save
+ 				 * errno, free up the current structure and the
+@@ -684,7 +687,7 @@ mem1:				saved_errno = errno;
+ 
+ 		p->fts_level = level;
+ 		p->fts_parent = sp->fts_cur;
+-		p->fts_pathlen = len + dp->d_namlen;
++		p->fts_pathlen = len + namlen;
+ 		if (p->fts_pathlen < len) {
+ 			/*
+ 			 * If we wrap, free up the current structure and
+-- 
+2.9.3
+