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

diff --git a/core/openbsd/patch/0006-yacc-Add-some-includes.patch b/core/openbsd/patch/0006-yacc-Add-some-includes.patch
deleted file mode 100644
index a4b0ed78..00000000
--- a/core/openbsd/patch/0006-yacc-Add-some-includes.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 148c9835e6304a4247c7116156e8c5a97f153c0e Mon Sep 17 00:00:00 2001
-From: Michael Forney <mforney@mforney.org>
-Date: Mon, 18 Apr 2016 17:34:01 -0700
-Subject: [PATCH] yacc: Add some includes
-
----
- usr.bin/yacc/defs.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/usr.bin/yacc/defs.h b/usr.bin/yacc/defs.h
-index 7300cae..fab6e12 100644
---- a/usr.bin/yacc/defs.h
-+++ b/usr.bin/yacc/defs.h
-@@ -35,6 +35,7 @@
-  *	@(#)defs.h	5.6 (Berkeley) 5/24/93
-  */
- 
-+#include <sys/cdefs.h>
- #include <assert.h>
- #include <ctype.h>
- #include <stdio.h>
--- 
-2.8.1
-