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

7 files changed, 82 insertions, 0 deletions

diff --git a/pkg/bc/.gitignore b/pkg/bc/.gitignore
new file mode 100644
index 00000000..dce428a7
--- /dev/null
+++ b/pkg/bc/.gitignore
@@ -0,0 +1,2 @@
+/bc-1.06.95.tar.bz2
+/src
diff --git a/pkg/bc/config.h b/pkg/bc/config.h
new file mode 100644
index 00000000..35627d41
--- /dev/null
+++ b/pkg/bc/config.h
@@ -0,0 +1,40 @@
+#include <config-posix.h>
+
+#define BC_COPYRIGHT "Copyright 1991-1994, 1997, 1998, 2000, 2004, 2006 Free Software Foundation, Inc."
+#define DC_COPYRIGHT "Copyright 1994, 1997, 1998, 2000, 2001, 2004, 2005, 2006 Free Software Foundation, Inc."
+#define DC_VERSION "1.3.95"
+/* #undef HAVE_DOPRNT */
+/* #undef HAVE_LIB_H */
+#define HAVE_MEMORY_H 1
+/* #undef LIBEDIT */
+#define PACKAGE "bc"
+#define PACKAGE_BUGREPORT ""
+#define PACKAGE_NAME "bc"
+#define PACKAGE_STRING "bc 1.06.95"
+#define PACKAGE_TARNAME "bc"
+#define PACKAGE_URL ""
+#define PACKAGE_VERSION "1.06.95"
+/* #undef READLINE */
+#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 "1.06.95"
+/* #undef YYTEXT_POINTER */
+/* #undef _MINIX */
+/* #undef _POSIX_1_SOURCE */
+/* #undef _POSIX_SOURCE */
+/* #undef const */
+/* #undef ptrdiff_t */
+/* #undef size_t */
diff --git a/pkg/bc/gen.rc b/pkg/bc/gen.rc
new file mode 100644
index 00000000..c75aff92
--- /dev/null
+++ b/pkg/bc/gen.rc
@@ -0,0 +1,12 @@
+cflags\
+	-D HAVE_CONFIG_H\
+	-isystem include\
+	-I '$dir' \
+	-I '$srcdir'/h
+
+lib libbc.a lib/number.c
+exe bin/bc bc/^(main.c bc.c scan.c execute.c load.c storage.c util.c global.c warranty.c) libbc.a
+file bin/bc '$outdir'/bin/bc 755
+file share/man/man1/bc.1 '$srcdir'/doc/bc.1 644
+
+fetch curl
diff --git a/pkg/bc/patch/0001-Fix-use-of-uninitialized-f_void.patch b/pkg/bc/patch/0001-Fix-use-of-uninitialized-f_void.patch
new file mode 100644
index 00000000..2b91dc9b
--- /dev/null
+++ b/pkg/bc/patch/0001-Fix-use-of-uninitialized-f_void.patch
@@ -0,0 +1,25 @@
+From 359f44a3a0605c94d57f35e4de39e6028dce018f Mon Sep 17 00:00:00 2001
+From: Michael Forney <mforney@mforney.org>
+Date: Sun, 12 Jun 2016 20:12:28 -0700
+Subject: [PATCH] Fix use of uninitialized f_void
+
+See http://www.pixelbeat.org/programming/oss_bug_flow.html.
+---
+ bc/storage.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/bc/storage.c b/bc/storage.c
+index 699729a..37b4c6c 100644
+--- a/bc/storage.c
++++ b/bc/storage.c
+@@ -99,6 +99,7 @@ more_functions (VOID)
+     {
+       f = &functions[indx];
+       f->f_defined = FALSE;
++      f->f_void = FALSE;
+       f->f_body = (char *) bc_malloc (BC_START_SIZE);
+       f->f_body_size = BC_START_SIZE;
+       f->f_code_size = 0;
+-- 
+2.8.1
+
diff --git a/pkg/bc/rev b/pkg/bc/rev
new file mode 100644
index 00000000..d00491fd
--- /dev/null
+++ b/pkg/bc/rev
@@ -0,0 +1 @@
+1
diff --git a/pkg/bc/sha256 b/pkg/bc/sha256
new file mode 100644
index 00000000..5aebdc1f
--- /dev/null
+++ b/pkg/bc/sha256
@@ -0,0 +1 @@
+7ee4abbcfac03d8a6e1a8a3440558a3d239d6b858585063e745c760957725ecc  bc-1.06.95.tar.bz2
diff --git a/pkg/bc/url b/pkg/bc/url
new file mode 100644
index 00000000..29e9268a
--- /dev/null
+++ b/pkg/bc/url
@@ -0,0 +1 @@
+url = "http://alpha.gnu.org/gnu/bc/bc-1.06.95.tar.bz2"