aboutsummaryrefslogtreecommitdiffstats
path: root/main/lua5.1
diff options
context:
space:
mode:
authorJakub Jirutka <jakub@jirutka.cz>2017-12-29 01:31:07 +0100
committerJakub Jirutka <jakub@jirutka.cz>2017-12-29 01:42:18 +0100
commit961c328693591e7ee0f64b2e40cc133a8390c03b (patch)
tree4877ef64a156c90c4f7cc7743dfedbb713f5dc32 /main/lua5.1
parentd7ae444687731d13a6eead839b1a958db2d69cf7 (diff)
downloadaports-961c328693591e7ee0f64b2e40cc133a8390c03b.tar.bz2
aports-961c328693591e7ee0f64b2e40cc133a8390c03b.tar.xz
main/lua5.1: add /usr/share/lua/common to LUA_PATH
Diffstat (limited to 'main/lua5.1')
-rw-r--r--main/lua5.1/APKBUILD4
-rw-r--r--main/lua5.1/lua-5.1-module_paths.patch18
2 files changed, 8 insertions, 14 deletions
diff --git a/main/lua5.1/APKBUILD b/main/lua5.1/APKBUILD
index 3a30cfae7c..7b4a8735fe 100644
--- a/main/lua5.1/APKBUILD
+++ b/main/lua5.1/APKBUILD
@@ -4,7 +4,7 @@ _pkgname=lua
_majorver=${pkgname#lua}
pkgver="$_majorver.5"
_pkgver=$pkgver
-pkgrel=3
+pkgrel=4
pkgdesc="A powerful light-weight programming language designed for extending applications."
url="https://www.lua.org/"
arch="all"
@@ -91,5 +91,5 @@ libs() {
sha512sums="0142fefcbd13afcd9b201403592aa60620011cc8e8559d4d2db2f92739d18186860989f48caa45830ff4f99bfc7483287fd3ff3a16d4dec928e2767ce4d542a9 lua-5.1.5.tar.gz
ec5945f9f73d87fceaaa2418f1dc5c0f1e2ab1392e3a110e9ca737bfd122a951543899cd9b6170771374c35de8dd106f7b51ba9885eae281241c79b47ee58370 lua-5.1-make.patch
-123b115389d01d383af8698d2ed66c75bb7c3e2d33de57b8539ae56a9478930a0a72fa5657e78cc1c5b6bef00d07ec3a51e19ec0e419647e84eb158fb5c4795a lua-5.1-module_paths.patch
+6f9ad12b48ce250d23ed5d91b2feb2db43c405efc30df8ea1c818a83d0a4b36d934e8629224a9a3ca575f9bad1337ed4a97624884e4e2bab9b73e3aed5c20c64 lua-5.1-module_paths.patch
a99154258419dc2e582804eae97517687e5b8b5f731dc91722193d1ff470b8522af6ff4e7142c9258afe4734cd52e6987d3c2108ac52b1487a262f1e89f2f332 lua-5.1-readline.patch"
diff --git a/main/lua5.1/lua-5.1-module_paths.patch b/main/lua5.1/lua-5.1-module_paths.patch
index 29ac4c3bf4..e67d09f82a 100644
--- a/main/lua5.1/lua-5.1-module_paths.patch
+++ b/main/lua5.1/lua-5.1-module_paths.patch
@@ -1,27 +1,21 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## src_luaconf.h.dpatch by John V. Belmonte <jbelmonte@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Set Lua's default PATH and CPATH.
-
-@DPATCH@
-diff -urNad trunk~/src/luaconf.h trunk/src/luaconf.h
---- trunk~/src/luaconf.h 2006-02-10 12:44:06.000000000 -0500
-+++ trunk/src/luaconf.h 2006-02-17 21:32:55.000000000 -0500
-@@ -83,13 +83,17 @@
+--- a/src/luaconf.h
++++ b/src/luaconf.h
+@@ -95,13 +94,19 @@
#else
#define LUA_ROOT "/usr/local/"
+#define LUA_ROOT2 "/usr/"
#define LUA_LDIR LUA_ROOT "share/lua/5.1/"
+#define LUA_LDIR2 LUA_ROOT2 "share/lua/5.1/"
++#define LUA_LDIR3 LUA_ROOT2 "share/lua/common/"
#define LUA_CDIR LUA_ROOT "lib/lua/5.1/"
+#define LUA_CDIR2 LUA_ROOT2 "lib/lua/5.1/"
#define LUA_PATH_DEFAULT \
"./?.lua;" LUA_LDIR"?.lua;" LUA_LDIR"?/init.lua;" \
- LUA_CDIR"?.lua;" LUA_CDIR"?/init.lua"
+ LUA_CDIR"?.lua;" LUA_CDIR"?/init.lua;" \
-+ LUA_LDIR2"?.lua;" LUA_LDIR2"?/init.lua"
++ LUA_LDIR2"?.lua;" LUA_LDIR2"?/init.lua;" \
++ LUA_LDIR3"?.lua;" LUA_LDIR3"?/init.lua"
#define LUA_CPATH_DEFAULT \
- "./?.so;" LUA_CDIR"?.so;" LUA_CDIR"loadall.so"
+ "./?.so;" LUA_CDIR"?.so;" LUA_CDIR2"?.so;" LUA_CDIR"loadall.so"