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

5 files changed, 276 insertions, 0 deletions

diff --git a/pkg/vis/gen.rc b/pkg/vis/gen.rc
new file mode 100644
index 00000000..228c92a1
--- /dev/null
+++ b/pkg/vis/gen.rc
@@ -0,0 +1,196 @@
+version=v0.2-539-g37d98f3
+cflags\
+	'-std=c99' \
+	-D 'CONFIG_LUA=1' \
+	-D 'CONFIG_LUA_STATIC=1' \
+	-D '_POSIX_C_SOURCE=200809L' \
+	-D '_XOPEN_SOURCE=700' \
+	-D 'VERSION=''"'$version'"''' \
+	-D 'VIS_PATH=''"/share/vis"''' \
+	-D NDEBUG\
+	-isystem pkg/libtermkey/src\
+	-isystem pkg/lua/src/src\
+	-isystem '$builddir'/pkg/ncurses/include\
+	-I '$outdir'
+
+build '$outdir'/config.h copy '$srcdir'/config.def.h
+
+phony deps '$outdir'/config.h '$builddir'/pkg/^(\
+	libtermkey/fetch.stamp\
+	lua/fetch.stamp\
+) pkg/ncurses/headers
+
+exe vis -d '$dir'/deps \
+	array.c buffer.c libutf.c main.c map.c register.c ring-buffer.c\
+	sam.c text.c text-motions.c text-objects.c text-regex.c text-util.c\
+	ui-curses.c view.c vis.c vis-lua.c vis-modes.c vis-motions.c\
+	vis-operators.c vis-prompt.c vis-text-objects.c\
+	'$builddir'/pkg/^(\
+		libtermkey/libtermkey.a.d\
+		lpeg/liblpeg.a\
+		lua/liblua.a\
+		ncurses/libncurses.a\
+	)
+file bin/vis '$outdir'/vis 755
+
+exe vis-menu vis-menu.c
+file bin/vis-menu '$outdir'/vis-menu 755
+
+file bin/vis-open '$srcdir'/vis-open 755
+
+for(f in vis.1 vis-menu.1 vis-open.1) {
+	build '$outdir'/$f sed '$srcdir'/man/$f ; with\
+		expr s,VERSION,$version,
+	file share/man/man1/$f '$outdir'/$f 644
+}
+
+# <cd src/lua/lexers && printf '\t%s\\\n' *.lua | sort
+lexers=(\
+	lexer.lua\
+	vis-std.lua\
+	vis.lua\
+	visrc.lua\
+	plugins/^(\
+		filetype.lua\
+		textobject-lexer.lua\
+	)\
+	lexers/^(\
+		actionscript.lua\
+		ada.lua\
+		ansi_c.lua\
+		antlr.lua\
+		apdl.lua\
+		apl.lua\
+		applescript.lua\
+		asm.lua\
+		asp.lua\
+		autoit.lua\
+		awk.lua\
+		bash.lua\
+		batch.lua\
+		bibtex.lua\
+		boo.lua\
+		caml.lua\
+		chuck.lua\
+		cmake.lua\
+		coffeescript.lua\
+		container.lua\
+		context.lua\
+		cpp.lua\
+		crystal.lua\
+		csharp.lua\
+		css.lua\
+		cuda.lua\
+		dart.lua\
+		desktop.lua\
+		diff.lua\
+		django.lua\
+		dmd.lua\
+		dockerfile.lua\
+		dot.lua\
+		dsv.lua\
+		eiffel.lua\
+		elixir.lua\
+		erlang.lua\
+		faust.lua\
+		fish.lua\
+		forth.lua\
+		fortran.lua\
+		fsharp.lua\
+		fstab.lua\
+		gap.lua\
+		gettext.lua\
+		gherkin.lua\
+		glsl.lua\
+		gnuplot.lua\
+		go.lua\
+		groovy.lua\
+		gtkrc.lua\
+		haskell.lua\
+		html.lua\
+		icon.lua\
+		idl.lua\
+		inform.lua\
+		ini.lua\
+		io_lang.lua\
+		java.lua\
+		javascript.lua\
+		json.lua\
+		jsp.lua\
+		latex.lua\
+		ledger.lua\
+		less.lua\
+		lexer.lua\
+		lilypond.lua\
+		lisp.lua\
+		litcoffee.lua\
+		lua.lua\
+		makefile.lua\
+		man.lua\
+		markdown.lua\
+		matlab.lua\
+		moonscript.lua\
+		nemerle.lua\
+		networkd.lua\
+		nim.lua\
+		nsis.lua\
+		null.lua\
+		objective_c.lua\
+		pascal.lua\
+		perl.lua\
+		php.lua\
+		pico8.lua\
+		pike.lua\
+		pkgbuild.lua\
+		powershell.lua\
+		prolog.lua\
+		props.lua\
+		protobuf.lua\
+		ps.lua\
+		pure.lua\
+		python.lua\
+		rails.lua\
+		rebol.lua\
+		rest.lua\
+		rexx.lua\
+		rhtml.lua\
+		rstats.lua\
+		ruby.lua\
+		rust.lua\
+		sass.lua\
+		scala.lua\
+		scheme.lua\
+		smalltalk.lua\
+		sml.lua\
+		snobol4.lua\
+		sql.lua\
+		systemd.lua\
+		taskpaper.lua\
+		tcl.lua\
+		tex.lua\
+		texinfo.lua\
+		text.lua\
+		toml.lua\
+		vala.lua\
+		vb.lua\
+		vbscript.lua\
+		vcard.lua\
+		verilog.lua\
+		vhdl.lua\
+		wsf.lua\
+		xml.lua\
+		xtend.lua\
+		yaml.lua\
+	)\
+	themes/^(\
+		dark-16.lua\
+		default-16.lua\
+		default-256.lua\
+		light-16.lua\
+		solarized.lua\
+	)\
+)
+for(f in $lexers)
+	file share/vis/$f '$srcdir'/lua/$f 644
+
+fetch git
diff --git a/pkg/vis/patch/0001-Allow-building-lpeg-statically.patch b/pkg/vis/patch/0001-Allow-building-lpeg-statically.patch
new file mode 100644
index 00000000..025bfb41
--- /dev/null
+++ b/pkg/vis/patch/0001-Allow-building-lpeg-statically.patch
@@ -0,0 +1,54 @@
+From 7a20eee4766219a030f8f581713d9a2b04d2e0ea Mon Sep 17 00:00:00 2001
+From: Michael Forney <mforney@mforney.org>
+Date: Fri, 18 Nov 2016 21:35:52 -0800
+Subject: [PATCH] Allow building lpeg statically
+
+---
+ Makefile  | 3 ++-
+ vis-lua.c | 9 +++++++++
+ 2 files changed, 11 insertions(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index 962fb7e..201c0c1 100644
+--- a/Makefile
++++ b/Makefile
+@@ -16,6 +16,7 @@ MANPREFIX ?= ${PREFIX}/man
+ VERSION = $(shell git describe --always 2>/dev/null || echo "0.2")
+ 
+ CONFIG_LUA ?= 1
++CONFIG_LUA_STATIC ?= 0
+ CONFIG_ACL ?= 0
+ CONFIG_SELINUX ?= 0
+ 
+@@ -27,7 +28,7 @@ CFLAGS_VIS = $(CFLAGS_AUTO) $(CFLAGS_TERMKEY) $(CFLAGS_CURSES) $(CFLAGS_ACL) \
+ 	$(CFLAGS_SELINUX) $(CFLAGS_LUA) $(CFLAGS_STD)
+ 
+ CFLAGS_VIS += -DVIS_PATH=\"${SHAREPREFIX}/vis\"
+-CFLAGS_VIS += -DCONFIG_LUA=${CONFIG_LUA}
++CFLAGS_VIS += -DCONFIG_LUA=${CONFIG_LUA} -DCONFIG_LUA_STATIC=${CONFIG_LUA_STATIC}
+ CFLAGS_VIS += -DCONFIG_SELINUX=${CONFIG_SELINUX}
+ CFLAGS_VIS += -DCONFIG_ACL=${CONFIG_ACL}
+ CFLAGS_VIS += ${CFLAGS_DEBUG}
+diff --git a/vis-lua.c b/vis-lua.c
+index 29e94ef..83d2e52 100644
+--- a/vis-lua.c
++++ b/vis-lua.c
+@@ -1889,6 +1889,15 @@ void vis_lua_init(Vis *vis) {
+ 	vis->lua = L;
+ 	luaL_openlibs(L);
+ 
++#if CONFIG_LUA_STATIC
++	extern int luaopen_lpeg(lua_State *L);
++	lua_getglobal(L, "package");
++	lua_getfield(L, -1, "preload");
++	lua_pushcfunction(L, luaopen_lpeg);
++	lua_setfield(L, -2, "lpeg");
++	lua_pop(L, 2);
++#endif
++
+ 	/* remove any relative paths from lua's default package.path */
+ 	vis_lua_path_strip(vis);
+ 
+-- 
+2.10.2
+
diff --git a/pkg/vis/patch/0002-Set-default-theme-to-dark-16.patch b/pkg/vis/patch/0002-Set-default-theme-to-dark-16.patch
new file mode 100644
index 00000000..254b5c5c
--- /dev/null
+++ b/pkg/vis/patch/0002-Set-default-theme-to-dark-16.patch
@@ -0,0 +1,25 @@
+From af9461125ed8466c39da15ab9845fd95888da66e Mon Sep 17 00:00:00 2001
+From: Michael Forney <mforney@mforney.org>
+Date: Fri, 18 Nov 2016 21:53:25 -0800
+Subject: [PATCH] Set default theme to dark-16
+
+---
+ lua/visrc.lua | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lua/visrc.lua b/lua/visrc.lua
+index 13bd7f7..e308fc3 100644
+--- a/lua/visrc.lua
++++ b/lua/visrc.lua
+@@ -5,7 +5,7 @@ require('plugins/textobject-lexer')
+ 
+ vis.events.subscribe(vis.events.INIT, function()
+ 	-- Your global configuration options
+-	vis:command("set theme ".. (vis.ui.colors <= 16 and "default-16" or "default-256"))
++	vis:command("set theme default-16")
+ end)
+ 
+ vis.events.subscribe(vis.events.WIN_OPEN, function(win)
+-- 
+2.10.2
+
diff --git a/pkg/vis/rev b/pkg/vis/rev
new file mode 100644
index 00000000..00750edc
--- /dev/null
+++ b/pkg/vis/rev
@@ -0,0 +1 @@
+3
diff --git a/pkg/vis/src b/pkg/vis/src
new file mode 160000
+Subproject 37d98f3119d5d3a63492bf9683ec6a4d68cc1e2