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
---
 extra/libtermkey/.gitignore | 2 --
 extra/libtermkey/gen.rc     | 9 ---------
 extra/libtermkey/rev        | 1 -
 extra/libtermkey/sha256     | 1 -
 extra/libtermkey/url        | 1 -
 5 files changed, 14 deletions(-)
 delete mode 100644 extra/libtermkey/.gitignore
 delete mode 100644 extra/libtermkey/gen.rc
 delete mode 100644 extra/libtermkey/rev
 delete mode 100644 extra/libtermkey/sha256
 delete mode 100644 extra/libtermkey/url

(limited to 'extra/libtermkey')

diff --git a/extra/libtermkey/.gitignore b/extra/libtermkey/.gitignore
deleted file mode 100644
index f6c9b14b..00000000
--- a/extra/libtermkey/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/libtermkey-0.18.tar.gz
-/src
diff --git a/extra/libtermkey/gen.rc b/extra/libtermkey/gen.rc
deleted file mode 100644
index ba8f9d89..00000000
--- a/extra/libtermkey/gen.rc
+++ /dev/null
@@ -1,9 +0,0 @@
-cflags\
-	'-std=c99' -Wall\
-	-isystem '$builddir'/extra/ncurses/include
-
-lib libtermkey.a -d extra/ncurses/headers\
-	termkey.c driver-csi.c driver-ti.c\
-	'$builddir'/extra/ncurses/libncurses.a
-
-fetch curl
diff --git a/extra/libtermkey/rev b/extra/libtermkey/rev
deleted file mode 100644
index d00491fd..00000000
--- a/extra/libtermkey/rev
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/extra/libtermkey/sha256 b/extra/libtermkey/sha256
deleted file mode 100644
index 67ca7f70..00000000
--- a/extra/libtermkey/sha256
+++ /dev/null
@@ -1 +0,0 @@
-239746de41c845af52bb3c14055558f743292dd6c24ac26c2d6567a5a6093926  libtermkey-0.18.tar.gz
diff --git a/extra/libtermkey/url b/extra/libtermkey/url
deleted file mode 100644
index ce0c5c85..00000000
--- a/extra/libtermkey/url
+++ /dev/null
@@ -1 +0,0 @@
-url = "http://www.leonerd.org.uk/code/libtermkey/libtermkey-0.18.tar.gz"
-- 
cgit v1.2.3