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

15 files changed, 0 insertions, 254 deletions

diff --git a/devel/gen.rc b/devel/gen.rc
deleted file mode 100644
index d3590d17..00000000
--- a/devel/gen.rc
+++ /dev/null
@@ -1,3 +0,0 @@
-subgen make
-subgen nasm
-subgen qbe
diff --git a/devel/make/config.h b/devel/make/config.h
deleted file mode 100644
index 0938c4b2..00000000
--- a/devel/make/config.h
+++ /dev/null
@@ -1,119 +0,0 @@
-#include <config-posix.h>
-
-/* these cause make to use glibc symbols */
-#undef HAVE_WCHTYPE_H
-#undef HAVE_WCHAR_H
-
-/* paths */
-#define INCLUDEDIR "/include"
-#define LIBDIR "/lib"
-#define LOCALEDIR "/share/locale"
-
-/* #undef CLOSEDIR_VOID */
-/* #undef CRAY_STACKSEG_END */
-/* #undef C_ALLOCA */
-/* #undef C_GETLOADAVG */
-/* #undef DGUX */
-/* #undef ENABLE_NLS */
-#define FILE_TIMESTAMP_HI_RES 1
-/* #undef GETLOADAVG_PRIVILEGED */
-#define HAVE_ALLOCA 1
-#define HAVE_ALLOCA_H 1
-/* #undef HAVE_CASE_INSENSITIVE_FS */
-/* #undef HAVE_CFLOCALECOPYCURRENT */
-/* #undef HAVE_CFPREFERENCESCOPYAPPVALUE */
-/* #undef HAVE_DCGETTEXT */
-#define HAVE_DECL_BSD_SIGNAL 1
-#define HAVE_DECL_DLERROR 1
-#define HAVE_DECL_DLOPEN 1
-#define HAVE_DECL_DLSYM 1
-#define HAVE_DECL_SYS_SIGLIST 0
-#define HAVE_DECL__SYS_SIGLIST 0
-#define HAVE_DECL___SYS_SIGLIST 0
-/* #undef HAVE_DOS_PATHS */
-/* #undef HAVE_GETHOSTBYNAME */
-#define HAVE_GETLOADAVG 1
-/* #undef HAVE_GETTEXT */
-/* #undef HAVE_GUILE */
-/* #undef HAVE_LIBDGC */
-/* #undef HAVE_LIBKSTAT */
-/* #undef HAVE_MACH_MACH_H */
-#define HAVE_MEMORY_H 1
-#define HAVE_MKTEMP 1
-/* #undef HAVE_NDIR_H */
-/* #undef HAVE_NLIST_H */
-/* #undef HAVE_PSTAT_GETDYNAMIC */
-#define HAVE_SA_RESTART 1
-#define HAVE_SETLINEBUF 1
-/* #undef HAVE_SIGSETMASK */
-/* #undef HAVE_STRCMPI */
-/* #undef HAVE_STRICMP */
-/* #undef HAVE_STRNCMPI */
-/* #undef HAVE_STRNICMP */
-/* #undef HAVE_STRUCT_NLIST_N_UN_N_NAME */
-/* #undef HAVE_SYS_DIR_H */
-/* #undef HAVE_SYS_NDIR_H */
-#define HAVE_SYS_PARAM_H 1
-#define HAVE_SYS_TIMEB_H 1
-/* #undef HAVE_UNION_WAIT */
-#define HAVE_UNSIGNED_LONG_LONG_INT 1
-/* #undef HAVE_VFORK_H */
-#define HAVE_WAIT3 1
-#define MAKE_HOST "x86_64-linux-musl"
-#define MAKE_JOBSERVER 1
-#define MAKE_LOAD 1
-#define MAKE_SYMLINKS 1
-/* #undef NLIST_NAME_UNION */
-/* #undef NLIST_STRUCT */
-#define PACKAGE "make"
-#define PACKAGE_BUGREPORT "bug-make@gnu.org"
-#define PACKAGE_NAME "GNU make"
-#define PACKAGE_STRING "GNU make 4.2.1"
-#define PACKAGE_TARNAME "make"
-#define PACKAGE_URL "http://www.gnu.org/software/make/"
-#define PACKAGE_VERSION "4.2.1"
-#define PATH_SEPARATOR_CHAR ':'
-#define SCCS_GET "get"
-/* #undef SCCS_GET_MINUS_G */
-/* #undef STACK_DIRECTION */
-/* #undef STAT_MACROS_BROKEN */
-#define ST_MTIM_NSEC st_mtim.tv_nsec
-/* #undef SVR4 */
-#define TIME_WITH_SYS_TIME 1
-/* #undef UMAX */
-/* #undef UMAX4_3 */
-#ifndef _ALL_SOURCE
-# define _ALL_SOURCE 1
-#endif
-#ifndef _GNU_SOURCE
-# define _GNU_SOURCE 1
-#endif
-#ifndef _POSIX_PTHREAD_SEMANTICS
-# define _POSIX_PTHREAD_SEMANTICS 1
-#endif
-#ifndef _TANDEM_SOURCE
-# define _TANDEM_SOURCE 1
-#endif
-#ifndef __EXTENSIONS__
-# define __EXTENSIONS__ 1
-#endif
-#define VERSION "4.2.1"
-/* #undef WINDOWS32 */
-/* #undef WITH_DMALLOC */
-#ifndef _DARWIN_USE_64_BIT_INODE
-# define _DARWIN_USE_64_BIT_INODE 1
-#endif
-/* #undef _FILE_OFFSET_BITS */
-/* #undef _LARGE_FILES */
-/* #undef _MINIX */
-/* #undef _POSIX_1_SOURCE */
-/* #undef _POSIX_SOURCE */
-/* #undef const */
-/* #undef gid_t */
-/* #undef off_t */
-/* #undef pid_t */
-/* #undef size_t */
-/* #undef ssize_t */
-/* #undef uid_t */
-/* #undef uintmax_t */
-/* #undef vfork */
diff --git a/devel/make/gen.rc b/devel/make/gen.rc
deleted file mode 100644
index 1c46aa90..00000000
--- a/devel/make/gen.rc
+++ /dev/null
@@ -1,20 +0,0 @@
-cflags\
-	-D HAVE_CONFIG_H\
-	-I include\
-	-I '$dir' \
-	-I '$srcdir' \
-	-I '$srcdir'/glob
-
-lib libglob.a glob/^(glob.c fnmatch.c)
-
-exe make\
-	ar.c arscan.c commands.c default.c dir.c expand.c file.c\
-	function.c getopt.c getopt1.c guile.c implicit.c job.c load.c\
-	loadapi.c main.c misc.c posixos.c output.c read.c remake.c\
-	rule.c signame.c strcache.c variable.c version.c vpath.c\
-	hash.c remote-stub.c\
-	libglob.a
-file bin/make '$outdir'/make 755
-file share/man/man1/make.1 '$srcdir'/make.1 644
-
-fetch git
diff --git a/devel/make/rev b/devel/make/rev
deleted file mode 100644
index d00491fd..00000000
--- a/devel/make/rev
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/devel/make/src b/devel/make/src
deleted file mode 160000
-Subproject 9ab8af7cd8aaac587787d9df7e34758951d7c47
diff --git a/devel/nasm/.gitignore b/devel/nasm/.gitignore
deleted file mode 100644
index 983a28a0..00000000
--- a/devel/nasm/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/nasm-2.12.02.tar.xz
-/src
diff --git a/devel/nasm/config.h b/devel/nasm/config.h
deleted file mode 100644
index 4881121c..00000000
--- a/devel/nasm/config.h
+++ /dev/null
@@ -1,61 +0,0 @@
-#include <config-posix.h>
-
-/* #undef AC_APPLE_UNIVERSAL_BUILD */
-/* #undef HAVE_CANONICALIZE_FILE_NAME */
-#define HAVE_DECL_STRCASECMP 1
-#define HAVE_DECL_STRICMP 0
-#define HAVE_DECL_STRLCPY 1
-#define HAVE_DECL_STRNCASECMP 1
-#define HAVE_DECL_STRNICMP 0
-#define HAVE_DECL_STRSEP 1
-#define HAVE_MEMORY_H 1
-/* #undef HAVE_STRICMP */
-#define HAVE_STRLCPY 1
-/* #undef HAVE_STRNICMP */
-#define HAVE_STRSEP 1
-#define HAVE_SYS_PARAM_H 1
-#define HAVE_WORKING_BOOL 1
-/* #undef HAVE__FULLPATH */
-/* #undef HAVE__SNPRINTF */
-/* #undef HAVE__VSNPRINTF */
-#define PACKAGE_BUGREPORT ""
-#define PACKAGE_NAME ""
-#define PACKAGE_STRING ""
-#define PACKAGE_TARNAME ""
-#define PACKAGE_URL ""
-#define PACKAGE_VERSION ""
-#ifndef _ALL_SOURCE
-# define _ALL_SOURCE 1
-#endif
-#ifndef _GNU_SOURCE
-# define _GNU_SOURCE 1
-#endif
-#ifndef _POSIX_PTHREAD_SEMANTICS
-# define _POSIX_PTHREAD_SEMANTICS 1
-#endif
-#ifndef _TANDEM_SOURCE
-# define _TANDEM_SOURCE 1
-#endif
-#ifndef __EXTENSIONS__
-# define __EXTENSIONS__ 1
-#endif
-/* #undef WORDS_BIGENDIAN */
-#define WORDS_LITTLEENDIAN 1
-#ifndef _DARWIN_USE_64_BIT_INODE
-# define _DARWIN_USE_64_BIT_INODE 1
-#endif
-/* #undef _FILE_OFFSET_BITS */
-/* #undef _LARGE_FILES */
-/* #undef _MINIX */
-/* #undef _POSIX_1_SOURCE */
-/* #undef _POSIX_SOURCE */
-/* #undef const */
-#ifndef __cplusplus
-/* #undef inline */
-#endif
-#define restrict __restrict
-#if defined __SUNPRO_CC && !defined __RESTRICT
-# define _Restrict
-# define __restrict__
-#endif
-/* #undef size_t */
diff --git a/devel/nasm/gen.rc b/devel/nasm/gen.rc
deleted file mode 100644
index c5f94191..00000000
--- a/devel/nasm/gen.rc
+++ /dev/null
@@ -1,34 +0,0 @@
-cflags\
-	-D HAVE_CONFIG_H\
-	-I include\
-	-I '$dir' \
-	-I '$srcdir'
-
-exe nasm\
-	nasm.c nasmlib.c ver.c\
-	raa.c saa.c rbtree.c srcfile.c\
-	realpath.c\
-	float.c insnsa.c insnsb.c\
-	directiv.c\
-	assemble.c labels.c hashtbl.c crc64.c parser.c\
-	output/outform.c output/outlib.c output/nulldbg.c\
-	output/nullout.c\
-	output/outbin.c output/outaout.c output/outcoff.c\
-	output/outelf.c output/outelf32.c output/outelf64.c\
-	output/outelfx32.c\
-	output/outobj.c output/outas86.c output/outrdf2.c\
-	output/outdbg.c output/outieee.c output/outmacho.c\
-	md5c.c output/codeview.c\
-	preproc.c quote.c pptok.c\
-	macros.c listing.c eval.c exprlib.c stdscan.c\
-	strfunc.c tokhash.c regvals.c regflags.c\
-	ilog2.c\
-	lib/strlcpy.c\
-	preproc-nop.c\
-	disp8.c\
-	iflag.c
-
-file bin/nasm '$outdir'/nasm 755
-file share/man/man1/nasm.1 '$srcdir'/nasm.1 644
-
-fetch curl
diff --git a/devel/nasm/rev b/devel/nasm/rev
deleted file mode 100644
index 0cfbf088..00000000
--- a/devel/nasm/rev
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/devel/nasm/sha256 b/devel/nasm/sha256
deleted file mode 100644
index c8051b73..00000000
--- a/devel/nasm/sha256
+++ /dev/null
@@ -1 +0,0 @@
-4c866b60c0b1c4ebc715205d007b4640ff4e36af637c9a7deb87b2900e544321  nasm-2.12.02.tar.xz
diff --git a/devel/nasm/url b/devel/nasm/url
deleted file mode 100644
index ae040531..00000000
--- a/devel/nasm/url
+++ /dev/null
@@ -1 +0,0 @@
-url = "http://www.nasm.us/pub/nasm/releasebuilds/2.12.02/nasm-2.12.02.tar.xz"
diff --git a/devel/qbe/config.h b/devel/qbe/config.h
deleted file mode 100644
index 52d4b123..00000000
--- a/devel/qbe/config.h
+++ /dev/null
@@ -1 +0,0 @@
-#define Defaultasm Gaself
diff --git a/devel/qbe/gen.rc b/devel/qbe/gen.rc
deleted file mode 100644
index 1da79beb..00000000
--- a/devel/qbe/gen.rc
+++ /dev/null
@@ -1,9 +0,0 @@
-cflags\
-	-Wall -Wextra '-std=c99' -pedantic\
-	-I '$dir'
-
-abi=sysv
-exe qbe main.c util.c parse.c mem.c ssa.c copy.c fold.c live.c isel.c spill.c rega.c emit.c $abi.c
-file bin/qbe '$outdir'/qbe 755
-
-fetch git
diff --git a/devel/qbe/rev b/devel/qbe/rev
deleted file mode 100644
index 0cfbf088..00000000
--- a/devel/qbe/rev
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/devel/qbe/src b/devel/qbe/src
deleted file mode 160000
-Subproject fd9c2e045f7cc953bebab2e2e65da9cd73b04f1