Lua 5.1 compatibility

10 files changed, 12 insertions, 12 deletions

diff --git a/pkg/alsa-utils/gen.lua b/pkg/alsa-utils/gen.lua
index 7a153237..1336147a 100644
--- a/pkg/alsa-utils/gen.lua
+++ b/pkg/alsa-utils/gen.lua
@@ -13,7 +13,7 @@ local tools = {
 }
 
 for _, tool in ipairs(tools) do
-	local name, srcs = table.unpack(tool)
+	local name, srcs = tool[1], tool[2]
 	local out = 'bin/'..name
 	exe(out, {srcs, '$builddir/pkg/alsa-lib/libasound.a'})
 	file(out, '755', '$outdir/'..out)
diff --git a/pkg/binutils/gen.lua b/pkg/binutils/gen.lua
index 2f04f2bd..dd0dee7c 100644
--- a/pkg/binutils/gen.lua
+++ b/pkg/binutils/gen.lua
@@ -143,7 +143,7 @@ sub('bfd.ninja', function()
 		end
 	end
 	for arch in pairs(selarchs) do
-		srcs['bfd/cpu-'..arch:match('bfd_(%g+)_arch')..'.c'] = true
+		srcs['bfd/cpu-'..arch:match('bfd_([%w_]+)_arch')..'.c'] = true
 	end
 	local deps = {
 		'$gendir/deps',
diff --git a/pkg/ffmpeg/gen.lua b/pkg/ffmpeg/gen.lua
index 84c04056..35133aa1 100644
--- a/pkg/ffmpeg/gen.lua
+++ b/pkg/ffmpeg/gen.lua
@@ -46,7 +46,7 @@ build('awk', '$outdir/include/libavutil/avconfig.h', {'$dir/options.h', '|', '$d
 	expr='-f $dir/avconfig.awk',
 })
 
-rule('genlist', 'lua5.2 $dir/list.lua $dir/options.h $type $var <$in >$out')
+rule('genlist', 'lua $dir/list.lua $dir/options.h $type $var <$in >$out')
 local function genlist(out, src, type, var)
 	build('genlist', out, {src, '|', '$dir/list.lua', '$dir/options.h'}, {type=type, var=var})
 	table.insert(pkg.deps, out)
diff --git a/pkg/ffmpeg/list.lua b/pkg/ffmpeg/list.lua
index 66cfbcda..c75cd700 100644
--- a/pkg/ffmpeg/list.lua
+++ b/pkg/ffmpeg/list.lua
@@ -4,7 +4,7 @@ local var = arg[3]
 
 local options = {}
 for line in io.lines(optionshdr) do
-	local cfg, val = line:match('^#define CONFIG_(%g+) (%g+)$')
+	local cfg, val = line:match('^#define CONFIG_([%w_]+) (%d)$')
 	if cfg then
 		options[cfg] = val == '1'
 	end
@@ -12,7 +12,7 @@ end
 
 print('static const '..type..' *const '..var..'[] = {')
 for line in io.lines() do
-	local name = line:match('^extern .*'..type..' +ff_(%g+);$')
+	local name = line:match('^extern .*'..type..' +ff_([%w_]+);$')
 	if name then
 		local cfg
 		if var == 'filter_list' then
diff --git a/pkg/git/gen.lua b/pkg/git/gen.lua
index 14f7a627..41db8622 100644
--- a/pkg/git/gen.lua
+++ b/pkg/git/gen.lua
@@ -410,7 +410,7 @@ local programs = {
 }
 
 for _, prog in ipairs(programs) do
-	local name, srcs = table.unpack(prog)
+	local name, srcs = prog[1], prog[2]
 	exe('git-'..name, {srcs or name..'.c', 'common-main.c.o', 'libgit.a.d'})
 	file('libexec/git-core/git-'..name, '755', '$outdir/git-'..name)
 end
@@ -444,7 +444,7 @@ local scripts = {
 
 rule('sh_gen', 'sed -f $dir/sh_gen.sed $in >$out')
 for _, script in ipairs(scripts) do
-	local name, mode = table.unpack(script)
+	local name, mode = script[1], script[2]
 	build('sh_gen', '$outdir/git-'..name, {'$srcdir/git-'..name..'.sh', '|', '$dir/sh_gen.sed'})
 	file('libexec/git-core/git-'..name, mode, '$outdir/git-'..name)
 end
diff --git a/pkg/kbd/gen.lua b/pkg/kbd/gen.lua
index 855e39e7..461b6d60 100644
--- a/pkg/kbd/gen.lua
+++ b/pkg/kbd/gen.lua
@@ -56,7 +56,7 @@ local tools = {
 }
 
 for _, tool in ipairs(tools) do
-	local name, sect, subst, srcs = table.unpack(tool)
+	local name, sect, subst, srcs = tool[1], tool[2], tool[3], tool[4]
 	exe(name, {srcs or 'src/'..name..'.c', 'libcommon.a', 'libfont.a', 'libkeymap.a', 'libkbdfile.a'})
 	file('bin/'..name, '755', '$outdir/'..name)
 	if sect then
diff --git a/pkg/libevdev/eventnames.lua b/pkg/libevdev/eventnames.lua
index c8538972..1314cbd0 100644
--- a/pkg/libevdev/eventnames.lua
+++ b/pkg/libevdev/eventnames.lua
@@ -59,7 +59,7 @@ end
 
 for i = 1, #arg do
 	for line in io.lines(arg[i]) do
-		local name, value = line:match('^#define%s+(%g+)%s+([%xx]+)%f[^%g]')
+		local name, value = line:match('^#define%s+([%w_]+)%s+(%dx?%x*)')
 		value = tonumber(value)
 		if name and not duplicates[name] then
 			for prefix, b in pairs(bits) do
diff --git a/pkg/nsd/gen.lua b/pkg/nsd/gen.lua
index 3068a516..6cf87240 100644
--- a/pkg/nsd/gen.lua
+++ b/pkg/nsd/gen.lua
@@ -31,7 +31,7 @@ local cfg = {
 	ratelimit_default='on',
 }
 for line in iterlines('config.h', 1) do
-	local var, val = line:match('^#define (%g+) "(%g+)"$')
+	local var, val = line:match('^#define ([%w_]+) "(.*)"$')
 	if var then
 		cfg[var:lower()] = val
 	elseif line:find('^#define RATELIMIT') then
diff --git a/pkg/python/gen.lua b/pkg/python/gen.lua
index e90b9957..4ae83fb6 100644
--- a/pkg/python/gen.lua
+++ b/pkg/python/gen.lua
@@ -52,7 +52,7 @@ sources = table.keys(sources)
 
 cflags{'-D Py_BUILD_CORE'}
 
-rule('makesetup', 'lua5.2 $dir/makesetup.lua $dir/modules.lua <$in >$out')
+rule('makesetup', 'lua $dir/makesetup.lua $dir/modules.lua <$in >$out')
 build('makesetup', '$outdir/config.c', {'$srcdir/Modules/config.c.in', '|', '$dir/makesetup.lua', '$dir/modules.lua'})
 
 cc('Modules/getbuildinfo.c', nil, {
diff --git a/pkg/ubase/gen.lua b/pkg/ubase/gen.lua
index a3afbcaf..f584ec88 100644
--- a/pkg/ubase/gen.lua
+++ b/pkg/ubase/gen.lua
@@ -80,7 +80,7 @@ local tools = {
 }
 
 for _, tool in ipairs(tools) do
-	local name, sect, mode = table.unpack(tool)
+	local name, sect, mode = tool[1], tool[2], tool[3]
 	file('bin/'..name, mode or '755', exe(name, {name..'.c', 'libutil.a'}))
 	if sect then
 		man{name..'.'..sect}