CVS commit: pkgsrc/lang/lua54

["nikita" <nikita%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nikita
Date:           Mon May 15 08:17:11 UTC 2023

Modified Files:
        pkgsrc/lang/lua54: Makefile distinfo version.mk
        pkgsrc/lang/lua54/patches: patch-src_Makefile
Removed Files:
        pkgsrc/lang/lua54/patches: patch-Makefile

Log Message:
lua54: update to version 5.4.6

Changelog:

"Emergency" new version 5.4.6
'lua_resetthread' is back to its original signature, to avoid
incompatibilities in the ABI between releases of the same version.
New function 'lua_closethread' added with the 'correct' signature.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 pkgsrc/lang/lua54/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/lang/lua54/distinfo
cvs rdiff -u -r1.5 -r1.6 pkgsrc/lang/lua54/version.mk
cvs rdiff -u -r1.1 -r0 pkgsrc/lang/lua54/patches/patch-Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/lang/lua54/patches/patch-src_Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/lang/lua54/Makefile
diff -u pkgsrc/lang/lua54/Makefile:1.4 pkgsrc/lang/lua54/Makefile:1.5
--- pkgsrc/lang/lua54/Makefile:1.4      Sun Mar  6 07:46:10 2022
+++ pkgsrc/lang/lua54/Makefile  Mon May 15 08:17:11 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2022/03/06 07:46:10 nia Exp $
+# $NetBSD: Makefile,v 1.5 2023/05/15 08:17:11 nikita Exp $
 
 DISTNAME=      lua-${LUA_VERSION}
 PKGNAME=       lua54-${LUA_VERSION}
@@ -34,10 +34,10 @@ CFLAGS+=    -pthread
 LDFLAGS+=      -pthread
 .endif
 
-.if !empty(OPSYS:M*BSD*) || ${OPSYS} == "DragonFly"
+.if ${OPSYS:M*BSD*} || ${OPSYS} == "DragonFly"
 BUILD_TARGET=  bsd
 .elif ${OPSYS} == "Linux"
-BUILD_TARGET=  linux-noreadline
+BUILD_TARGET=  linux
 .elif ${OPSYS} == "Darwin"
 BUILD_TARGET=  macosx
 .elif ${OPSYS} == "SunOS"

Index: pkgsrc/lang/lua54/distinfo
diff -u pkgsrc/lang/lua54/distinfo:1.9 pkgsrc/lang/lua54/distinfo:1.10
--- pkgsrc/lang/lua54/distinfo:1.9      Sun Mar  6 07:46:10 2022
+++ pkgsrc/lang/lua54/distinfo  Mon May 15 08:17:11 2023
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.9 2022/03/06 07:46:10 nia Exp $
+$NetBSD: distinfo,v 1.10 2023/05/15 08:17:11 nikita Exp $
 
-BLAKE2s (lua-5.4.4.tar.gz) = 16efe43030b76ca6630011e9491066036a1da00b8de69b84e5ee5c201691abe9
-SHA512 (lua-5.4.4.tar.gz) = af0c35d5ba00fecbb2dd617bd7b825edf7418a16a73076e04f2a0df58cdbf098dc3ff4402e974afd789eb5d86d2e12ec6df9c84b99b23656ea694a85f83bcd21
-Size (lua-5.4.4.tar.gz) = 360876 bytes
-SHA1 (patch-Makefile) = 22523bc60fe8d004f3bfd59396cfc6e43f645a75
-SHA1 (patch-src_Makefile) = ab840599eea7303a015a9d7a303e99cb162d81bd
+BLAKE2s (lua-5.4.6.tar.gz) = 00c28c837b3b582bcc6fbd7e4e0f08c26fc1bf18a4cbf1c12e85bfa43e494f0c
+SHA512 (lua-5.4.6.tar.gz) = d90c6903355ee1309cb0d92a8a024522ff049091a117ea21efb585b5de35776191cd67d17a65b18c2f9d374795b7c944f047576f0e3fe818d094b26f0e4845c5
+Size (lua-5.4.6.tar.gz) = 363329 bytes
+SHA1 (patch-src_Makefile) = 01f6e222c3c72e12162e2c1032b8c7ef95ffe79b

Index: pkgsrc/lang/lua54/version.mk
diff -u pkgsrc/lang/lua54/version.mk:1.5 pkgsrc/lang/lua54/version.mk:1.6
--- pkgsrc/lang/lua54/version.mk:1.5    Sun Mar  6 07:46:10 2022
+++ pkgsrc/lang/lua54/version.mk        Mon May 15 08:17:11 2023
@@ -1,6 +1,6 @@
-# $NetBSD: version.mk,v 1.5 2022/03/06 07:46:10 nia Exp $
+# $NetBSD: version.mk,v 1.6 2023/05/15 08:17:11 nikita Exp $
 
-LUA_VERSION=   5.4.4
+LUA_VERSION=   5.4.6
 
 LUA_VERSION_MAJOR=     ${LUA_VERSION:C/([0-9]+)\.([0-9]+)\.([0-9]+)/\1/}
 LUA_VERSION_MINOR=     ${LUA_VERSION:C/([0-9]+)\.([0-9]+)\.([0-9]+)/\2/}

Index: pkgsrc/lang/lua54/patches/patch-src_Makefile
diff -u pkgsrc/lang/lua54/patches/patch-src_Makefile:1.4 pkgsrc/lang/lua54/patches/patch-src_Makefile:1.5
--- pkgsrc/lang/lua54/patches/patch-src_Makefile:1.4    Wed Oct 27 13:02:40 2021
+++ pkgsrc/lang/lua54/patches/patch-src_Makefile        Mon May 15 08:17:11 2023
@@ -1,10 +1,10 @@
-$NetBSD: patch-src_Makefile,v 1.4 2021/10/27 13:02:40 nia Exp $
+$NetBSD: patch-src_Makefile,v 1.5 2023/05/15 08:17:11 nikita Exp $
 
 - Don't override CC/CFLAGS/LDFLAGS.
 - Use libtool to build shared libraries.
 
---- src/Makefile.orig  2021-02-09 18:47:17.000000000 +0000
-+++ src/Makefile
+--- src/Makefile.orig  2023-02-03 11:43:14.000000000 +0100
++++ src/Makefile       2023-05-07 14:17:04.851265572 +0200
 @@ -6,9 +6,8 @@
  # Your platform. See PLATS for possible values.
  PLAT= guess
@@ -17,9 +17,9 @@ $NetBSD: patch-src_Makefile,v 1.4 2021/1
  LIBS= -lm $(SYSLIBS) $(MYLIBS)
  
  AR= ar rcu
-@@ -32,16 +31,16 @@ CMCFLAGS= 
+@@ -32,16 +31,16 @@
  
- PLATS= guess aix bsd c89 freebsd generic linux linux-readline macosx mingw posix solaris
+ PLATS= guess aix bsd c89 freebsd generic ios linux linux-readline macosx mingw posix solaris
  
 -LUA_A=        liblua.a
 +LUA_A=        liblua5.4.la
@@ -38,7 +38,7 @@ $NetBSD: patch-src_Makefile,v 1.4 2021/1
  
  ALL_O= $(BASE_O) $(LUA_O) $(LUAC_O)
  ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T)
-@@ -56,15 +55,19 @@ o: $(ALL_O)
+@@ -56,15 +55,19 @@
  
  a:    $(ALL_A)
  
@@ -62,7 +62,7 @@ $NetBSD: patch-src_Makefile,v 1.4 2021/1
  
  test:
        ./$(LUA_T) -v
-@@ -143,16 +146,6 @@ SunOS solaris:
+@@ -146,16 +149,6 @@
  # Targets that do not create files (not all makes understand .PHONY).
  .PHONY: all $(PLATS) help test clean default o a depend echo