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

6 files changed, 100 insertions, 0 deletions

diff --git a/pkg/nasm/.gitignore b/pkg/nasm/.gitignore
new file mode 100644
index 00000000..983a28a0
--- /dev/null
+++ b/pkg/nasm/.gitignore
@@ -0,0 +1,2 @@
+/nasm-2.12.02.tar.xz
+/src
diff --git a/pkg/nasm/config.h b/pkg/nasm/config.h
new file mode 100644
index 00000000..4881121c
--- /dev/null
+++ b/pkg/nasm/config.h
@@ -0,0 +1,61 @@
+#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/pkg/nasm/gen.rc b/pkg/nasm/gen.rc
new file mode 100644
index 00000000..c5f94191
--- /dev/null
+++ b/pkg/nasm/gen.rc
@@ -0,0 +1,34 @@
+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/pkg/nasm/rev b/pkg/nasm/rev
new file mode 100644
index 00000000..0cfbf088
--- /dev/null
+++ b/pkg/nasm/rev
@@ -0,0 +1 @@
+2
diff --git a/pkg/nasm/sha256 b/pkg/nasm/sha256
new file mode 100644
index 00000000..c8051b73
--- /dev/null
+++ b/pkg/nasm/sha256
@@ -0,0 +1 @@
+4c866b60c0b1c4ebc715205d007b4640ff4e36af637c9a7deb87b2900e544321  nasm-2.12.02.tar.xz
diff --git a/pkg/nasm/url b/pkg/nasm/url
new file mode 100644
index 00000000..ae040531
--- /dev/null
+++ b/pkg/nasm/url
@@ -0,0 +1 @@
+url = "http://www.nasm.us/pub/nasm/releasebuilds/2.12.02/nasm-2.12.02.tar.xz"