From f6afbc5b4765e25f26855e6bbcaa5eb4c64409f1 Mon Sep 17 00:00:00 2001
From: Danny Rawlins <monster.romster@gmail.com>
Date: Thu, 7 Mar 2019 18:02:50 +1100
Subject: [PATCH] lua: 5.3.3 -> 5.3.5

---
 lua/.footprint | 14 ++++++++------
 lua/.signature |  8 ++++----
 lua/Pkgfile    | 33 +++++++++++++++++++--------------
 3 files changed, 31 insertions(+), 24 deletions(-)

diff --git a/lua/.footprint b/lua/.footprint
index a108b7337..55a342923 100644
--- a/lua/.footprint
+++ b/lua/.footprint
@@ -1,9 +1,9 @@
 drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/bin/
 -rwxr-xr-x	root/root	usr/bin/lua
-lrwxrwxrwx	root/root	usr/bin/lua5.3 -> /usr/bin/lua
+lrwxrwxrwx	root/root	usr/bin/lua5.3 -> lua
 -rwxr-xr-x	root/root	usr/bin/luac
-lrwxrwxrwx	root/root	usr/bin/luac5.3 -> /usr/bin/luac
+lrwxrwxrwx	root/root	usr/bin/luac5.3 -> luac
 drwxr-xr-x	root/root	usr/include/
 -rw-r--r--	root/root	usr/include/lauxlib.h
 -rw-r--r--	root/root	usr/include/lua.h
@@ -12,13 +12,15 @@ drwxr-xr-x	root/root	usr/include/
 -rw-r--r--	root/root	usr/include/lualib.h
 drwxr-xr-x	root/root	usr/lib/
 -rw-r--r--	root/root	usr/lib/liblua.a
-lrwxrwxrwx	root/root	usr/lib/liblua.so -> liblua.so.5.3
-lrwxrwxrwx	root/root	usr/lib/liblua.so.5.3 -> liblua.so.5.3.3
--rw-r--r--	root/root	usr/lib/liblua.so.5.3.3
+lrwxrwxrwx	root/root	usr/lib/liblua.so -> liblua.so.5.3.5
+lrwxrwxrwx	root/root	usr/lib/liblua.so.5.3 -> liblua.so.5.3.5
+-rwxr-xr-x	root/root	usr/lib/liblua.so.5.3.5
+lrwxrwxrwx	root/root	usr/lib/liblua5.3.so -> liblua.so.5.3.5
 drwxr-xr-x	root/root	usr/lib/lua/
 drwxr-xr-x	root/root	usr/lib/lua/5.3/
 drwxr-xr-x	root/root	usr/lib/pkgconfig/
--rw-r--r--	root/root	usr/lib/pkgconfig/lua.pc
+lrwxrwxrwx	root/root	usr/lib/pkgconfig/lua.pc -> lua53.pc
+-rw-r--r--	root/root	usr/lib/pkgconfig/lua53.pc
 drwxr-xr-x	root/root	usr/share/
 drwxr-xr-x	root/root	usr/share/lua/
 drwxr-xr-x	root/root	usr/share/lua/5.3/
diff --git a/lua/.signature b/lua/.signature
index f7b0c5e36..1644f98fb 100644
--- a/lua/.signature
+++ b/lua/.signature
@@ -1,7 +1,7 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/Xz2EsEj5eoDk6CExp1L5dLpgcJPSFbFo8y8EEbFq3+u5cTRT9dTKvueRe9lw4KcnDHY4HrPJCARtGAaS6ATwwA=
-SHA256 (Pkgfile) = dcf90b47fb299139b3755474303e0cfe210ba8105741ae0705902c26e4a8f3bf
-SHA256 (.footprint) = 914ab7de448b7b9a46e3946add5657d5c76d43fa777538dc552fc4050e78a795
-SHA256 (lua-5.3.3.tar.gz) = 5113c06884f7de453ce57702abaac1d618307f33f6789fa870e87a59d772aca2
+RWSE3ohX2g5d/S26+vgxOCK9ZgoGGoojsudB7JnvlMwyjF2g4ml+USwQJHY/+eICEFtgq6GwbQSf7xBN4KLRpSD6Jm3qyAhMtgI=
+SHA256 (Pkgfile) = 399a0145152d464921847f176b2ad6b3f35ece5305e06af66ea4fc07836fd05a
+SHA256 (.footprint) = 1aa9e836175fd8ea00b1712c341ea431cd58a6368804f7bb42a11271b75d0df8
+SHA256 (lua-5.3.5.tar.gz) = 0c2eed3f960446e1a3e4b9a1ca2f3ff893b6ce41942cf54d5dd59ab4b3b058ac
 SHA256 (liblua.so.patch) = 2cc83c77423a2dda3696766b2d1ccee2796e052ab04d5178905f41ed9241a3d8
 SHA256 (lua.pc) = ca9252633e782b8f85d6a94ea4f6babd4fe30bd759085b373160b1878e36ff78
diff --git a/lua/Pkgfile b/lua/Pkgfile
index aa3bdfd31..96fe683a5 100644
--- a/lua/Pkgfile
+++ b/lua/Pkgfile
@@ -1,35 +1,40 @@
 # Description: A programming language designed for extending applications.
 # URL: http://www.lua.org/
 # Maintainer: Danny Rawlins, crux at romster dot me
-# Packager: Tilman Sauerbeck, tilman at crux dot nu
 # Depends on: readline
 
 name=lua
-version=5.3.3
+version=5.3.5
 release=1
-source=(http://www.lua.org/ftp/$name-$version.tar.gz
+source=(https://www.lua.org/ftp/$name-$version.tar.gz
 	liblua.so.patch lua.pc)
 
 build() {
 	cd $name-$version
 
-	patch -p 1 -i $SRC/liblua.so.patch
-	export CFLAGS="$CFLAGS -fPIC -DLUA_COMPAT_5_2 -DLUA_COMPAT_5_1"
+	patch -p1 -i $SRC/liblua.so.patch
 
-	make MYCFLAGS="$CFLAGS" MYLDFLAGS="$LDFLAGS" linux
+	sed "s/%VER%/${version:0:3}/g;s/%REL%/$version/g" $SRC/lua.pc > lua.pc
+
+	# Lua 5.3.4 has wrong release version in its Makefile. Fix it.
+	sed "s/^R= \$V.4/R= \$V.5/" -i Makefile
+
+	make MYCFLAGS="$CFLAGS -fPIC -DLUA_COMPAT_5_2 -DLUA_COMPAT_5_1" MYLDFLAGS="$LDFLAGS" linux
 
 	make \
-		TO_LIB="liblua.a liblua.so.$version" \
+		TO_LIB="liblua.a liblua.so liblua.so.${version:0:3} liblua.so.$version" \
+		INSTALL_DATA='cp -d' \
 		INSTALL_TOP=$PKG/usr \
 		INSTALL_MAN=$PKG/usr/share/man/man1 \
 		install
 
-	ln -sf liblua.so.$version $PKG/usr/lib/liblua.so.${version:0:3}
-	ln -sf liblua.so.${version:0:3} $PKG/usr/lib/liblua.so
-	ln -sf /usr/bin/lua $PKG/usr/bin/lua${version:0:3}
-	ln -sf /usr/bin/luac $PKG/usr/bin/luac${version:0:3}
+	# odd behaviour
+	chmod -v u+w $PKG/usr/share/man/man1/lua.1
 
-	#make pc > lua.pc
-	sed "s/%VER%/${version:0:3}/g;s/%REL%/$version/g" $SRC/lua.pc > lua.pc
-	install -m 0644 -D lua.pc $PKG/usr/lib/pkgconfig/lua.pc
+	ln -s lua $PKG/usr/bin/lua${version:0:3}
+	ln -s luac $PKG/usr/bin/luac${version:0:3}
+	ln -s liblua.so.$version $PKG/usr/lib/liblua${version:0:3}.so
+
+	install -m 0644 -D lua.pc $PKG/usr/lib/pkgconfig/lua53.pc
+	ln -s lua53.pc $PKG/usr/lib/pkgconfig/lua.pc
 }