From 293f5a93b77d92fd65db7f3d0df654f102e46cfb Mon Sep 17 00:00:00 2001
From: Michael Forney <mforney@mforney.org>
Date: Sun, 11 Dec 2016 16:04:20 -0800
Subject: 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
---
 core/openbsd/include/err.h            |  3 ---
 core/openbsd/include/grp.h            |  2 --
 core/openbsd/include/machine/endian.h |  1 -
 core/openbsd/include/pwd.h            |  2 --
 core/openbsd/include/stdlib.h         | 10 ----------
 core/openbsd/include/string.h         |  4 ----
 core/openbsd/include/sys/cdefs.h      |  5 -----
 core/openbsd/include/sys/param.h      |  3 ---
 core/openbsd/include/sys/time.h       |  5 -----
 core/openbsd/include/unistd.h         |  3 ---
 10 files changed, 38 deletions(-)
 delete mode 100644 core/openbsd/include/err.h
 delete mode 100644 core/openbsd/include/grp.h
 delete mode 100644 core/openbsd/include/machine/endian.h
 delete mode 100644 core/openbsd/include/pwd.h
 delete mode 100644 core/openbsd/include/stdlib.h
 delete mode 100644 core/openbsd/include/string.h
 delete mode 100644 core/openbsd/include/sys/cdefs.h
 delete mode 100644 core/openbsd/include/sys/param.h
 delete mode 100644 core/openbsd/include/sys/time.h
 delete mode 100644 core/openbsd/include/unistd.h

(limited to 'core/openbsd/include')

diff --git a/core/openbsd/include/err.h b/core/openbsd/include/err.h
deleted file mode 100644
index c537811b..00000000
--- a/core/openbsd/include/err.h
+++ /dev/null
@@ -1,3 +0,0 @@
-#include_next <err.h>
-void warnc(int, const char *, ...) __attribute__((__format__ (printf, 2, 3)));
-void vwarnc(int, const char *, va_list) __attribute__((__format__ (printf, 2, 0)));
diff --git a/core/openbsd/include/grp.h b/core/openbsd/include/grp.h
deleted file mode 100644
index 49f4dfd4..00000000
--- a/core/openbsd/include/grp.h
+++ /dev/null
@@ -1,2 +0,0 @@
-#include_next <grp.h>
-#define setgroupent(n) setgrent()
diff --git a/core/openbsd/include/machine/endian.h b/core/openbsd/include/machine/endian.h
deleted file mode 100644
index 2dc4d830..00000000
--- a/core/openbsd/include/machine/endian.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <endian.h>
diff --git a/core/openbsd/include/pwd.h b/core/openbsd/include/pwd.h
deleted file mode 100644
index e859a8d1..00000000
--- a/core/openbsd/include/pwd.h
+++ /dev/null
@@ -1,2 +0,0 @@
-#include_next <pwd.h>
-#define setpassent(n) setpwent()
diff --git a/core/openbsd/include/stdlib.h b/core/openbsd/include/stdlib.h
deleted file mode 100644
index 0e1aa252..00000000
--- a/core/openbsd/include/stdlib.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#include_next <stdlib.h>
-#include <stdint.h>
-void *reallocarray(void *, size_t, size_t);
-long long strtonum(const char *, long long, long long, const char **);
-uint32_t arc4random(void);
-uint32_t arc4random_uniform(uint32_t);
-void arc4random_buf(void *, size_t);
-void setprogname(const char *);
-const char *getprogname(void);
-extern char *__progname;
diff --git a/core/openbsd/include/string.h b/core/openbsd/include/string.h
deleted file mode 100644
index 17c8ad81..00000000
--- a/core/openbsd/include/string.h
+++ /dev/null
@@ -1,4 +0,0 @@
-#include_next <string.h>
-void explicit_bzero(void *, size_t);
-void strmode(int, char *);
-int timingsafe_memcmp(const void *, const void *, size_t);
diff --git a/core/openbsd/include/sys/cdefs.h b/core/openbsd/include/sys/cdefs.h
deleted file mode 100644
index 70258b8c..00000000
--- a/core/openbsd/include/sys/cdefs.h
+++ /dev/null
@@ -1,5 +0,0 @@
-/* only needed for C++ */
-#define __BEGIN_DECLS
-#define __END_DECLS
-
-#define __dead __attribute__((__noreturn__))
diff --git a/core/openbsd/include/sys/param.h b/core/openbsd/include/sys/param.h
deleted file mode 100644
index 3167713c..00000000
--- a/core/openbsd/include/sys/param.h
+++ /dev/null
@@ -1,3 +0,0 @@
-#include_next <sys/param.h>
-#define ALIGNBYTES (sizeof(uintptr_t) - 1)
-#define ALIGN(p) (((uintptr_t)(p) + ALIGNBYTES) &~ ALIGNBYTES)
diff --git a/core/openbsd/include/sys/time.h b/core/openbsd/include/sys/time.h
deleted file mode 100644
index 98d5d3a7..00000000
--- a/core/openbsd/include/sys/time.h
+++ /dev/null
@@ -1,5 +0,0 @@
-#include_next <sys/time.h>
-#define	timespeccmp(tsp, usp, cmp)					\
-	(((tsp)->tv_sec == (usp)->tv_sec) ?				\
-	    ((tsp)->tv_nsec cmp (usp)->tv_nsec) :			\
-	    ((tsp)->tv_sec cmp (usp)->tv_sec))
diff --git a/core/openbsd/include/unistd.h b/core/openbsd/include/unistd.h
deleted file mode 100644
index 17e14240..00000000
--- a/core/openbsd/include/unistd.h
+++ /dev/null
@@ -1,3 +0,0 @@
-#include_next <unistd.h>
-#define pledge(request, paths) 0 /* linux doesn't have pledge */
-int getentropy(void *, size_t);
-- 
cgit v1.2.3