summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Forney <mforney@mforney.org>2016-11-19 01:12:09 -0800
committerMichael Forney <mforney@mforney.org>2016-11-19 01:57:26 -0800
commitdf171453b1d23b8dccfb61c16d14935166595dbd (patch)
treee6d21a815544423ff8cc5fcff02bb99b39c050ec
parent4bfd73f8c5ba63018359e5773d6dc4a84397bc51 (diff)
Move some programming languages from devel to lang
-rw-r--r--.gitmodules6
-rw-r--r--devel/gen.rc3
-rw-r--r--extra/lpeg/gen.rc4
-rw-r--r--extra/vis/gen.rc6
-rw-r--r--gen.rc1
-rw-r--r--lang/gen.rc3
-rw-r--r--lang/lua/.gitignore (renamed from devel/lua/.gitignore)0
-rw-r--r--lang/lua/gen.rc (renamed from devel/lua/gen.rc)0
-rw-r--r--lang/lua/rev (renamed from devel/lua/rev)0
-rw-r--r--lang/lua/sha256 (renamed from devel/lua/sha256)0
-rw-r--r--lang/lua/url (renamed from devel/lua/url)0
-rw-r--r--lang/mc/config.h (renamed from devel/mc/config.h)0
-rw-r--r--lang/mc/gen.rc (renamed from devel/mc/gen.rc)0
-rw-r--r--lang/mc/rev (renamed from devel/mc/rev)0
m---------lang/mc/src (renamed from devel/mc/src)0
-rw-r--r--lang/python/.gitignore (renamed from devel/python/.gitignore)0
-rw-r--r--lang/python/Setup (renamed from devel/python/Setup)0
-rw-r--r--lang/python/gen.rc (renamed from devel/python/gen.rc)0
-rw-r--r--lang/python/lib/Makefile (renamed from devel/python/lib/Makefile)0
-rw-r--r--lang/python/lib/_sysconfigdata.py (renamed from devel/python/lib/_sysconfigdata.py)0
-rw-r--r--lang/python/modules.awk (renamed from devel/python/modules.awk)0
-rw-r--r--lang/python/pyconfig.h (renamed from devel/python/pyconfig.h)0
-rw-r--r--lang/python/pylibs.txt (renamed from devel/python/pylibs.txt)0
-rw-r--r--lang/python/rev (renamed from devel/python/rev)0
-rw-r--r--lang/python/sha256 (renamed from devel/python/sha256)0
-rw-r--r--lang/python/url (renamed from devel/python/url)0
-rw-r--r--media/mpv/gen.rc4
27 files changed, 14 insertions, 13 deletions
diff --git a/.gitmodules b/.gitmodules
index a51730db..2b998f95 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -131,9 +131,6 @@
[submodule "devel/make/src"]
path = devel/make/src
url = git://git.sv.gnu.org/make.git
-[submodule "devel/mc/src"]
- path = devel/mc/src
- url = https://github.com/oridb/mc
[submodule "devel/qbe/src"]
path = devel/qbe/src
url = git://c9x.me/qbe.git
@@ -187,6 +184,9 @@
path = extra/vis/src
url = https://github.com/martanne/vis
ignore = all
+[submodule "lang/mc/src"]
+ path = lang/mc/src
+ url = https://github.com/oridb/mc
[submodule "media/alsa-lib/src"]
path = media/alsa-lib/src
url = git://git.alsa-project.org/alsa-lib.git
diff --git a/devel/gen.rc b/devel/gen.rc
index 4c20e827..d3590d17 100644
--- a/devel/gen.rc
+++ b/devel/gen.rc
@@ -1,6 +1,3 @@
-subgen lua
subgen make
-subgen mc
subgen nasm
-subgen python
subgen qbe
diff --git a/extra/lpeg/gen.rc b/extra/lpeg/gen.rc
index 6c392300..a3de6bd8 100644
--- a/extra/lpeg/gen.rc
+++ b/extra/lpeg/gen.rc
@@ -1,8 +1,8 @@
cflags\
'-std=c99' \
- -isystem devel/lua/src/src
+ -isystem lang/lua/src/src
-lib liblpeg.a -d '$builddir'/devel/lua/fetch.stamp\
+lib liblpeg.a -d '$builddir'/lang/lua/fetch.stamp\
lpvm.c lpcap.c lptree.c lpcode.c lpprint.c
fetch curl
diff --git a/extra/vis/gen.rc b/extra/vis/gen.rc
index 5adf038f..08bc3fcb 100644
--- a/extra/vis/gen.rc
+++ b/extra/vis/gen.rc
@@ -8,16 +8,16 @@ cflags\
-D 'VERSION=''"'$version'"''' \
-D 'VIS_PATH=''"/share/vis"''' \
-D NDEBUG\
- -isystem devel/lua/src/src\
-isystem extra/libtermkey/src\
+ -isystem lang/lua/src/src\
-isystem '$builddir'/extra/ncurses/include\
-I '$outdir'
build '$outdir'/config.h copy '$srcdir'/config.def.h
phony deps config.h phony/extra/ncurses/headers '$builddir'/^(\
- devel/lua/fetch.stamp\
extra/libtermkey/fetch.stamp\
+ lang/lua/fetch.stamp\
)
exe vis -d 'phony/$dir/deps' \
@@ -26,10 +26,10 @@ exe vis -d 'phony/$dir/deps' \
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'/^(\
- devel/lua/liblua.a\
extra/libtermkey/libtermkey.a.d\
extra/lpeg/liblpeg.a\
extra/ncurses/libncurses.a\
+ lang/lua/liblua.a\
)
file bin/vis '$outdir'/vis 755
diff --git a/gen.rc b/gen.rc
index c091edce..ad9f7e55 100644
--- a/gen.rc
+++ b/gen.rc
@@ -2,6 +2,7 @@ subgen core
subgen desktop
subgen devel
subgen extra
+subgen lang
subgen media
subgen util
diff --git a/lang/gen.rc b/lang/gen.rc
new file mode 100644
index 00000000..3572e4ce
--- /dev/null
+++ b/lang/gen.rc
@@ -0,0 +1,3 @@
+subgen lua
+subgen mc
+subgen python
diff --git a/devel/lua/.gitignore b/lang/lua/.gitignore
index ccf896f9..ccf896f9 100644
--- a/devel/lua/.gitignore
+++ b/lang/lua/.gitignore
diff --git a/devel/lua/gen.rc b/lang/lua/gen.rc
index e596c832..e596c832 100644
--- a/devel/lua/gen.rc
+++ b/lang/lua/gen.rc
diff --git a/devel/lua/rev b/lang/lua/rev
index d00491fd..d00491fd 100644
--- a/devel/lua/rev
+++ b/lang/lua/rev
diff --git a/devel/lua/sha256 b/lang/lua/sha256
index 31f8228e..31f8228e 100644
--- a/devel/lua/sha256
+++ b/lang/lua/sha256
diff --git a/devel/lua/url b/lang/lua/url
index 9dbed4d5..9dbed4d5 100644
--- a/devel/lua/url
+++ b/lang/lua/url
diff --git a/devel/mc/config.h b/lang/mc/config.h
index b00373f7..b00373f7 100644
--- a/devel/mc/config.h
+++ b/lang/mc/config.h
diff --git a/devel/mc/gen.rc b/lang/mc/gen.rc
index a5276dec..a5276dec 100644
--- a/devel/mc/gen.rc
+++ b/lang/mc/gen.rc
diff --git a/devel/mc/rev b/lang/mc/rev
index d00491fd..d00491fd 100644
--- a/devel/mc/rev
+++ b/lang/mc/rev
diff --git a/devel/mc/src b/lang/mc/src
-Subproject faf16f0242436077c86358ccbe1a8d93966fdff
+Subproject faf16f0242436077c86358ccbe1a8d93966fdff
diff --git a/devel/python/.gitignore b/lang/python/.gitignore
index 90e82b82..90e82b82 100644
--- a/devel/python/.gitignore
+++ b/lang/python/.gitignore
diff --git a/devel/python/Setup b/lang/python/Setup
index 3aac233d..3aac233d 100644
--- a/devel/python/Setup
+++ b/lang/python/Setup
diff --git a/devel/python/gen.rc b/lang/python/gen.rc
index bbe4bee3..bbe4bee3 100644
--- a/devel/python/gen.rc
+++ b/lang/python/gen.rc
diff --git a/devel/python/lib/Makefile b/lang/python/lib/Makefile
index 636bc1a8..636bc1a8 100644
--- a/devel/python/lib/Makefile
+++ b/lang/python/lib/Makefile
diff --git a/devel/python/lib/_sysconfigdata.py b/lang/python/lib/_sysconfigdata.py
index 1daf2bde..1daf2bde 100644
--- a/devel/python/lib/_sysconfigdata.py
+++ b/lang/python/lib/_sysconfigdata.py
diff --git a/devel/python/modules.awk b/lang/python/modules.awk
index 5e01a9d1..5e01a9d1 100644
--- a/devel/python/modules.awk
+++ b/lang/python/modules.awk
diff --git a/devel/python/pyconfig.h b/lang/python/pyconfig.h
index e88d464f..e88d464f 100644
--- a/devel/python/pyconfig.h
+++ b/lang/python/pyconfig.h
diff --git a/devel/python/pylibs.txt b/lang/python/pylibs.txt
index fb5da439..fb5da439 100644
--- a/devel/python/pylibs.txt
+++ b/lang/python/pylibs.txt
diff --git a/devel/python/rev b/lang/python/rev
index d00491fd..d00491fd 100644
--- a/devel/python/rev
+++ b/lang/python/rev
diff --git a/devel/python/sha256 b/lang/python/sha256
index a4273e31..a4273e31 100644
--- a/devel/python/sha256
+++ b/lang/python/sha256
diff --git a/devel/python/url b/lang/python/url
index a8e7bbb3..a8e7bbb3 100644
--- a/devel/python/url
+++ b/lang/python/url
diff --git a/media/mpv/gen.rc b/media/mpv/gen.rc
index a65a840f..dee8e5c9 100644
--- a/media/mpv/gen.rc
+++ b/media/mpv/gen.rc
@@ -69,8 +69,8 @@ if(grep -qF 'HAVE_LIBASS 1' config.h) {
deps=($deps phony/media/libass/headers)
}
if(grep -qF 'HAVE_LUA 1' config.h) {
- cflags=($cflags -isystem devel/lua/src/src)
- libs=($libs devel/lua/liblua.a)
+ cflags=($cflags -isystem lang/lua/src/src)
+ libs=($libs lang/lua/liblua.a)
}
cflags $cflags