pkg/58293: update lang/LuaJIT2 to v2.1

To: pkg-manager%netbsd.org@localhost,gnats-admin%netbsd.org@localhost,pkgsrc-bugs%netbsd.org@localhost
Subject: pkg/58293: update lang/LuaJIT2 to v2.1
From: Malte Dehling <mdehling%gmail.com@localhost>
Date: Mon, 27 May 2024 23:40:01 +0000 (UTC)
>Number:         58293
>Category:       pkg
>Synopsis:       update lang/LuaJIT to v2.1
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Mon May 27 23:40:00 +0000 2024
>Originator:     Malte Dehling
>Release:        NetBSD 10.0
>Organization:
>Environment:
    NetBSD 10.0 (GENERIC) #4: Wed Apr 24 12:21:26 PDT 2024
    mdehling@nb-base-dev:/scratch/obj/sys/arch/amd64/compile/GENERIC amd64

>Description:
    Update lang/LuaJIT2 to v2.1.

>How-To-Repeat:

>Fix:
    pkg/58291 and pkg/58292 should be handled first.

    These other packages should be patched at the same time:

    www/nginx
    www/nginx-devel
    www/lua-resty-core
    www/lua-resty-lrucache


Index: lang/LuaJIT2/DESCR
===================================================================
RCS file: /cvsroot/pkgsrc/lang/LuaJIT2/DESCR,v
retrieving revision 1.2
diff -u -r1.2 DESCR
--- lang/LuaJIT2/DESCR	31 Oct 2015 21:37:52 -0000	1.2
+++ lang/LuaJIT2/DESCR	27 May 2024 23:33:31 -0000
@@ -2,4 +2,4 @@
 Lua is a powerful, dynamic and light-weight programming language. It may
 be embedded or used as a general-purpose, stand-alone language.

-LuaJIT 2.0 is compatible with Lua 5.1.
+LuaJIT 2.1 is compatible with Lua 5.1.
Index: lang/LuaJIT2/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/lang/LuaJIT2/Makefile,v
retrieving revision 1.16
diff -u -r1.16 Makefile
--- lang/LuaJIT2/Makefile	6 Nov 2020 12:15:53 -0000	1.16
+++ lang/LuaJIT2/Makefile	27 May 2024 23:33:31 -0000
@@ -1,28 +1,27 @@
-# $NetBSD: Makefile,v 1.16 2020/11/06 12:15:53 nia Exp $
-#
+# $NetBSD$

-DISTNAME=	LuaJIT-2.0.5
+DISTNAME=	LuaJIT-2.1.1713773202	# see .relver
 PKGNAME=	${DISTNAME:S/LuaJIT/LuaJIT2/}
-PKGREVISION=	2
 CATEGORIES=	lang lua
-MASTER_SITES=	http://luajit.org/download/
+MASTER_SITES=	${MASTER_SITE_GITHUB:=LuaJIT/}
+GITHUB_PROJECT=	LuaJIT
+GITHUB_TAG=	5790d253972c9d78a0c2aece527eda5b134bbbf7

-MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
+MAINTAINER=	mdehling%gmail.com@localhost
 HOMEPAGE=	https://luajit.org/
 COMMENT=	Just-In-Time Compiler for the Lua programming language
 LICENSE=	mit

 USE_TOOLS+=	gmake

-# LuaJIT 2.1.0 will support mips64 and aarch64.
-ONLY_FOR_PLATFORM+=	*-*-*arm*
-ONLY_FOR_PLATFORM+=	*-*-i386
-ONLY_FOR_PLATFORM+=	*-*-mipseb
-ONLY_FOR_PLATFORM+=	*-*-mipsel
+ONLY_FOR_PLATFORM+=	*-*-aarch64*
+ONLY_FOR_PLATFORM+=	*-*-*arm*	# ARMv5+, ARM9E+
+ONLY_FOR_PLATFORM+=	*-*-i386	# req SSE2
+ONLY_FOR_PLATFORM+=	*-*-mips*
 ONLY_FOR_PLATFORM+=	*-*-powerpc
 ONLY_FOR_PLATFORM+=	*-*-x86_64

-# Address pkg/47587 lua not linked to pthread causes issues with modules
+# pkg/47587: lua not linked to pthread causes issues with modules
 PTHREAD_OPTS+=		native
 PTHREAD_AUTO_VARS=	yes

Index: lang/LuaJIT2/PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/lang/LuaJIT2/PLIST,v
retrieving revision 1.3
diff -u -r1.3 PLIST
--- lang/LuaJIT2/PLIST	21 Jun 2016 16:40:10 -0000	1.3
+++ lang/LuaJIT2/PLIST	27 May 2024 23:33:31 -0000
@@ -1,28 +1,36 @@
-@comment $NetBSD: PLIST,v 1.3 2016/06/21 16:40:10 fhajny Exp $
+@comment $NetBSD$
 bin/luajit
 bin/luajit-${PKGVERSION}
-include/luajit-2.0/lauxlib.h
-include/luajit-2.0/lua.h
-include/luajit-2.0/lua.hpp
-include/luajit-2.0/luaconf.h
-include/luajit-2.0/luajit.h
-include/luajit-2.0/lualib.h
+include/luajit-2.1/lauxlib.h
+include/luajit-2.1/lua.h
+include/luajit-2.1/lua.hpp
+include/luajit-2.1/luaconf.h
+include/luajit-2.1/luajit.h
+include/luajit-2.1/lualib.h
 lib/libluajit-5.1.a
 ${PLIST.shared}lib/libluajit-5.1.so
 ${PLIST.shared}lib/libluajit-5.1.so.2
 ${PLIST.shared}lib/libluajit-5.1.so.${PKGVERSION}
 lib/pkgconfig/luajit.pc
-share/luajit-${PKGVERSION}/jit/bc.lua
-share/luajit-${PKGVERSION}/jit/bcsave.lua
-share/luajit-${PKGVERSION}/jit/dis_arm.lua
-share/luajit-${PKGVERSION}/jit/dis_mips.lua
-share/luajit-${PKGVERSION}/jit/dis_mipsel.lua
-share/luajit-${PKGVERSION}/jit/dis_ppc.lua
-share/luajit-${PKGVERSION}/jit/dis_x64.lua
-share/luajit-${PKGVERSION}/jit/dis_x86.lua
-share/luajit-${PKGVERSION}/jit/dump.lua
-share/luajit-${PKGVERSION}/jit/v.lua
-share/luajit-${PKGVERSION}/jit/vmdef.lua
 man/man1/luajit.1
+share/luajit-2.1/jit/bc.lua
+share/luajit-2.1/jit/bcsave.lua
+share/luajit-2.1/jit/dis_arm.lua
+share/luajit-2.1/jit/dis_arm64.lua
+share/luajit-2.1/jit/dis_arm64be.lua
+share/luajit-2.1/jit/dis_mips.lua
+share/luajit-2.1/jit/dis_mips64.lua
+share/luajit-2.1/jit/dis_mips64el.lua
+share/luajit-2.1/jit/dis_mips64r6.lua
+share/luajit-2.1/jit/dis_mips64r6el.lua
+share/luajit-2.1/jit/dis_mipsel.lua
+share/luajit-2.1/jit/dis_ppc.lua
+share/luajit-2.1/jit/dis_x64.lua
+share/luajit-2.1/jit/dis_x86.lua
+share/luajit-2.1/jit/dump.lua
+share/luajit-2.1/jit/p.lua
+share/luajit-2.1/jit/v.lua
+share/luajit-2.1/jit/vmdef.lua
+share/luajit-2.1/jit/zone.lua
 @pkgdir share/lua/5.1
 @pkgdir lib/lua/5.1
Index: lang/LuaJIT2/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/lang/LuaJIT2/buildlink3.mk,v
retrieving revision 1.1
diff -u -r1.1 buildlink3.mk
--- lang/LuaJIT2/buildlink3.mk	26 Mar 2014 13:29:53 -0000	1.1
+++ lang/LuaJIT2/buildlink3.mk	27 May 2024 23:33:31 -0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2014/03/26 13:29:53 imil Exp $
+# $NetBSD$

 BUILDLINK_TREE+=	LuaJIT2

@@ -7,6 +7,7 @@

 BUILDLINK_API_DEPENDS.LuaJIT2+=	LuaJIT2>=2.0.3
 BUILDLINK_PKGSRCDIR.LuaJIT2?=	../../lang/LuaJIT2
+BUILDLINK_INCDIRS.LuaJIT2+=	include/luajit-2.1
 .endif	# LUAJIT2_BUILDLINK3_MK

 BUILDLINK_TREE+=	-LuaJIT2
Index: lang/LuaJIT2/distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/lang/LuaJIT2/distinfo,v
retrieving revision 1.13
diff -u -r1.13 distinfo
--- lang/LuaJIT2/distinfo	26 Oct 2021 10:51:29 -0000	1.13
+++ lang/LuaJIT2/distinfo	27 May 2024 23:33:31 -0000
@@ -1,10 +1,7 @@
-$NetBSD: distinfo,v 1.13 2021/10/26 10:51:29 nia Exp $
+$NetBSD$

-BLAKE2s (LuaJIT-2.0.5.tar.gz) =
54f7b86f27f588160895a8e076bb11d63eb60bdad87c9e573d627ae03ea5319d
-SHA512 (LuaJIT-2.0.5.tar.gz) =
2636675602b4a060b0571c05220db2061dd2f38568e35b2be346a0f5e3128d87057d11d3d0d7567d8cc4e0817b5e4cf2c52a17a48065520962b157816465a9fe
-Size (LuaJIT-2.0.5.tar.gz) = 849845 bytes
-SHA1 (patch-Makefile) = edea30d017c9d2938d951bfdee88020906945aee
-SHA1 (patch-src_Makefile) = d7236260dc17f470d7d6e41a57a22dcd3a501c28
-SHA1 (patch-src_lj__arch.h) = 4c34706db4c678b368bb3e38b07505abde01e590
-SHA1 (patch-src_lj__ccallback.c) = 8032bc451a504ae9538fb0ae4cc1ee729ede3a70
-SHA1 (patch-src_lj__mcode.c) = c150e0b07ab441e983ace21e0e813fd4334290b5
+BLAKE2s (LuaJIT-2.1.1713773202-5790d253972c9d78a0c2aece527eda5b134bbbf7.tar.gz)
= dd16b550d8657a6e598e09a3180ffb6d51096b066ff3888551dd0b0815c6ed50
+SHA512 (LuaJIT-2.1.1713773202-5790d253972c9d78a0c2aece527eda5b134bbbf7.tar.gz)
= 790c22d32424b7d7c79ebcd70485bc40ed6256b0bcc2a3591df90f471ff9935f33c32a86c239cd087b20580bbe7634d5a81bf9bb0cf32a66dd37339f5e9a8b4d
+Size (LuaJIT-2.1.1713773202-5790d253972c9d78a0c2aece527eda5b134bbbf7.tar.gz)
= 1081581 bytes
+SHA1 (patch-Makefile) = 95218d5d1cffe5149eef6308486a189874667485
+SHA1 (patch-src_Makefile) = 68f9ce9e42070b0f24ddf35ced92c22746d8d206
Index: lang/LuaJIT2/platform.mk
===================================================================
RCS file: /cvsroot/pkgsrc/lang/LuaJIT2/platform.mk,v
retrieving revision 1.1
diff -u -r1.1 platform.mk
--- lang/LuaJIT2/platform.mk	24 Jun 2020 11:16:00 -0000	1.1
+++ lang/LuaJIT2/platform.mk	27 May 2024 23:33:31 -0000
@@ -1,10 +1,10 @@
-# $NetBSD: platform.mk,v 1.1 2020/06/24 11:16:00 nia Exp $
+# $NetBSD$

 .include "../../mk/bsd.fast.prefs.mk"

 .if !defined(PLATFORM_SUPPORTS_LUAJIT)

-.  for _luajit_arch in *arm* i386 mipseb mipsel powerpc x86_64
+.  for _luajit_arch in aarch64* *arm* i386 mips* powerpc x86_64
 LUAJIT_PLATFORMS+=		*-*-${_luajit_arch}
 .  endfor

Index: lang/LuaJIT2/patches/patch-Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/lang/LuaJIT2/patches/patch-Makefile,v
retrieving revision 1.6
diff -u -r1.6 patch-Makefile
--- lang/LuaJIT2/patches/patch-Makefile	29 May 2017 21:47:31 -0000	1.6
+++ lang/LuaJIT2/patches/patch-Makefile	27 May 2024 23:33:31 -0000
@@ -1,10 +1,10 @@
-$NetBSD: patch-Makefile,v 1.6 2017/05/29 21:47:31 alnsn Exp $
+$NetBSD$

-Fix installation.
+fix install paths

---- Makefile.orig	2017-05-01 18:11:00.000000000 +0000
+--- Makefile.orig	2024-03-10 16:29:48.000000000 +0000
 +++ Makefile
-@@ -24,7 +24,6 @@ ABIVER=  5.1
+@@ -30,7 +30,6 @@ VERSION= $(MMVERSION).$(RELVER)
  # Change the installation path as needed. This automatically adjusts
  # the paths in src/luaconf.h, too. Note: PREFIX must be an absolute path!
  #
@@ -12,21 +12,12 @@
  export MULTILIB= lib
  ##############################################################################

-@@ -40,7 +39,7 @@ INSTALL_LMODD= $(INSTALL_SHARE)/lua
+@@ -47,7 +46,7 @@ INSTALL_LMODD= $(INSTALL_SHARE)/lua
  INSTALL_LMOD= $(INSTALL_LMODD)/$(ABIVER)
  INSTALL_CMODD= $(INSTALL_LIB)/lua
  INSTALL_CMOD= $(INSTALL_CMODD)/$(ABIVER)
 -INSTALL_MAN= $(INSTALL_SHARE)/man/man1
-+INSTALL_MAN= $(DPREFIX)/${PKGMANDIR}/man1
++INSTALL_MAN= $(DPREFIX)/$(PKGMANDIR)/man1
  INSTALL_PKGCONFIG= $(INSTALL_LIB)/pkgconfig

  INSTALL_TNAME= luajit-$(VERSION)
-@@ -74,7 +73,7 @@ SYMLINK= ln -sf
- INSTALL_X= install -m 0755
- INSTALL_F= install -m 0644
- UNINSTALL= $(RM)
--LDCONFIG= ldconfig -n
-+LDCONFIG= true
- SED_PC= sed -e "s|^prefix=.*|prefix=$(PREFIX)|" \
-             -e "s|^multilib=.*|multilib=$(MULTILIB)|"
-
Index: lang/LuaJIT2/patches/patch-src_Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/lang/LuaJIT2/patches/patch-src_Makefile,v
retrieving revision 1.2
diff -u -r1.2 patch-src_Makefile
--- lang/LuaJIT2/patches/patch-src_Makefile	29 May 2017 21:47:31 -0000	1.2
+++ lang/LuaJIT2/patches/patch-src_Makefile	27 May 2024 23:33:31 -0000
@@ -1,16 +1,16 @@
-$NetBSD: patch-src_Makefile,v 1.2 2017/05/29 21:47:31 alnsn Exp $
+$NetBSD$

-Fix building on OS X.
+fix building on darwin

---- src/Makefile.orig	2017-05-01 18:11:00.000000000 +0000
+--- src/Makefile.orig	2024-04-04 18:11:30.456080960 +0000
 +++ src/Makefile
-@@ -297,9 +297,6 @@ ifeq (,$(shell $(TARGET_CC) -o /dev/null
+@@ -315,9 +315,6 @@ ifeq (,$(shell $(TARGET_CC) -o /dev/null
    TARGET_XCFLAGS+= -fno-stack-protector
  endif
  ifeq (Darwin,$(TARGET_SYS))
 -  ifeq (,$(MACOSX_DEPLOYMENT_TARGET))
--    export MACOSX_DEPLOYMENT_TARGET=10.4
+-    $(error missing: export MACOSX_DEPLOYMENT_TARGET=XX.YY)
 -  endif
    TARGET_STRIP+= -x
+   TARGET_XCFLAGS+= -DLUAJIT_UNWIND_EXTERNAL
    TARGET_XSHLDFLAGS= -dynamiclib -single_module -undefined
dynamic_lookup -fPIC
-   TARGET_DYNXLDOPTS=


Index: www/lua-resty-core/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/www/lua-resty-core/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- www/lua-resty-core/Makefile	3 Jul 2023 05:40:59 -0000	1.2
+++ www/lua-resty-core/Makefile	27 May 2024 21:36:40 -0000
@@ -1,6 +1,7 @@
 # $NetBSD: Makefile,v 1.2 2023/07/03 05:40:59 adam Exp $

 DISTNAME=	lua-resty-core-0.1.27
+PKGREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_GITHUB:=openresty/}
 GITHUB_TAG=	v${PKGVERSION_NOREV}
@@ -12,8 +13,9 @@

 USE_LANGUAGES=	# none

-MAKE_ENV+=	LUA_INCLUDE_DIR=${PREFIX}/include/luajit-2.0
-MAKE_ENV+=	LUA_LIB_DIR=${PREFIX}/share/luajit-2.0.5
+MAKE_ENV+=	LUA_INCLUDE_DIR=${PREFIX}/include/luajit-2.1
+MAKE_ENV+=	LUA_LIB_DIR=${PREFIX}/share/luajit-2.1

+BUILDLINK_API_DEPENDS.LuaJIT2+=	LuaJIT2>=2.1
 .include "../../lang/LuaJIT2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
Index: www/lua-resty-core/PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/www/lua-resty-core/PLIST,v
retrieving revision 1.1
diff -u -r1.1 PLIST
--- www/lua-resty-core/PLIST	29 Mar 2023 08:29:08 -0000	1.1
+++ www/lua-resty-core/PLIST	27 May 2024 21:36:40 -0000
@@ -1,35 +1,35 @@
-@comment $NetBSD: PLIST,v 1.1 2023/03/29 08:29:08 adam Exp $
-share/luajit-2.0.5/ngx/balancer.lua
-share/luajit-2.0.5/ngx/base64.lua
-share/luajit-2.0.5/ngx/errlog.lua
-share/luajit-2.0.5/ngx/ocsp.lua
-share/luajit-2.0.5/ngx/pipe.lua
-share/luajit-2.0.5/ngx/process.lua
-share/luajit-2.0.5/ngx/re.lua
-share/luajit-2.0.5/ngx/req.lua
-share/luajit-2.0.5/ngx/resp.lua
-share/luajit-2.0.5/ngx/semaphore.lua
-share/luajit-2.0.5/ngx/ssl.lua
-share/luajit-2.0.5/ngx/ssl/clienthello.lua
-share/luajit-2.0.5/ngx/ssl/session.lua
-share/luajit-2.0.5/resty/core.lua
-share/luajit-2.0.5/resty/core/base.lua
-share/luajit-2.0.5/resty/core/base64.lua
-share/luajit-2.0.5/resty/core/coroutine.lua
-share/luajit-2.0.5/resty/core/ctx.lua
-share/luajit-2.0.5/resty/core/exit.lua
-share/luajit-2.0.5/resty/core/hash.lua
-share/luajit-2.0.5/resty/core/misc.lua
-share/luajit-2.0.5/resty/core/ndk.lua
-share/luajit-2.0.5/resty/core/param.lua
-share/luajit-2.0.5/resty/core/phase.lua
-share/luajit-2.0.5/resty/core/regex.lua
-share/luajit-2.0.5/resty/core/request.lua
-share/luajit-2.0.5/resty/core/response.lua
-share/luajit-2.0.5/resty/core/shdict.lua
-share/luajit-2.0.5/resty/core/socket.lua
-share/luajit-2.0.5/resty/core/time.lua
-share/luajit-2.0.5/resty/core/uri.lua
-share/luajit-2.0.5/resty/core/utils.lua
-share/luajit-2.0.5/resty/core/var.lua
-share/luajit-2.0.5/resty/core/worker.lua
+@comment $NetBSD$
+share/luajit-2.1/ngx/balancer.lua
+share/luajit-2.1/ngx/base64.lua
+share/luajit-2.1/ngx/errlog.lua
+share/luajit-2.1/ngx/ocsp.lua
+share/luajit-2.1/ngx/pipe.lua
+share/luajit-2.1/ngx/process.lua
+share/luajit-2.1/ngx/re.lua
+share/luajit-2.1/ngx/req.lua
+share/luajit-2.1/ngx/resp.lua
+share/luajit-2.1/ngx/semaphore.lua
+share/luajit-2.1/ngx/ssl.lua
+share/luajit-2.1/ngx/ssl/clienthello.lua
+share/luajit-2.1/ngx/ssl/session.lua
+share/luajit-2.1/resty/core.lua
+share/luajit-2.1/resty/core/base.lua
+share/luajit-2.1/resty/core/base64.lua
+share/luajit-2.1/resty/core/coroutine.lua
+share/luajit-2.1/resty/core/ctx.lua
+share/luajit-2.1/resty/core/exit.lua
+share/luajit-2.1/resty/core/hash.lua
+share/luajit-2.1/resty/core/misc.lua
+share/luajit-2.1/resty/core/ndk.lua
+share/luajit-2.1/resty/core/param.lua
+share/luajit-2.1/resty/core/phase.lua
+share/luajit-2.1/resty/core/regex.lua
+share/luajit-2.1/resty/core/request.lua
+share/luajit-2.1/resty/core/response.lua
+share/luajit-2.1/resty/core/shdict.lua
+share/luajit-2.1/resty/core/socket.lua
+share/luajit-2.1/resty/core/time.lua
+share/luajit-2.1/resty/core/uri.lua
+share/luajit-2.1/resty/core/utils.lua
+share/luajit-2.1/resty/core/var.lua
+share/luajit-2.1/resty/core/worker.lua


Index: www/lua-resty-lrucache/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/www/lua-resty-lrucache/Makefile,v
retrieving revision 1.1
diff -u -r1.1 Makefile
--- www/lua-resty-lrucache/Makefile	29 Mar 2023 08:29:57 -0000	1.1
+++ www/lua-resty-lrucache/Makefile	27 May 2024 21:36:55 -0000
@@ -1,6 +1,7 @@
 # $NetBSD: Makefile,v 1.1 2023/03/29 08:29:57 adam Exp $

 DISTNAME=	lua-resty-lrucache-0.13
+PKGREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_GITHUB:=openresty/}
 GITHUB_TAG=	v${PKGVERSION_NOREV}
@@ -12,11 +13,9 @@

 USE_LANGUAGES=	# none

-MAKE_ENV+=	LUA_INCLUDE_DIR=${PREFIX}/include/luajit-2.0
-MAKE_ENV+=	LUA_LIB_DIR=${PREFIX}/share/luajit-2.0.5
-#MAKE_ENV+=	LUA_INCLUDE_DIR=${PREFIX}/include/luajit-2.1
-#MAKE_ENV+=	LUA_LIB_DIR=${PREFIX}/share/luajit-2.1.0-beta3
+MAKE_ENV+=	LUA_INCLUDE_DIR=${PREFIX}/include/luajit-2.1
+MAKE_ENV+=	LUA_LIB_DIR=${PREFIX}/share/luajit-2.1

-#.include "../../lang/openresty-luajit2/buildlink3.mk"
+BUILDLINK_API_DEPENDS.LuaJIT2+=	LuaJIT2>=2.1
 .include "../../lang/LuaJIT2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
Index: www/lua-resty-lrucache/PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/www/lua-resty-lrucache/PLIST,v
retrieving revision 1.1
diff -u -r1.1 PLIST
--- www/lua-resty-lrucache/PLIST	29 Mar 2023 08:29:57 -0000	1.1
+++ www/lua-resty-lrucache/PLIST	27 May 2024 21:36:55 -0000
@@ -1,3 +1,3 @@
-@comment $NetBSD: PLIST,v 1.1 2023/03/29 08:29:57 adam Exp $
-share/luajit-2.0.5/resty/lrucache.lua
-share/luajit-2.0.5/resty/lrucache/pureffi.lua
+@comment $NetBSD$
+share/luajit-2.1/resty/lrucache.lua
+share/luajit-2.1/resty/lrucache/pureffi.lua


Index: www/nginx/options.mk
===================================================================
RCS file: /cvsroot/pkgsrc/www/nginx/options.mk,v
retrieving revision 1.102
diff -u -r1.102 options.mk
--- www/nginx/options.mk	7 May 2024 14:15:29 -0000	1.102
+++ www/nginx/options.mk	27 May 2024 21:37:33 -0000
@@ -157,11 +157,12 @@
 SITES.${LUA_DISTFILE}=	-${MASTER_SITE_GITHUB:=openresty/lua-nginx-module/archive/}v${LUA_VERSION}.tar.gz
 DISTFILES+=		${LUA_DISTFILE}
 .include "../../devel/pcre/buildlink3.mk"
+BUILDLINK_API_DEPENDS.LuaJIT2+=	LuaJIT2>=2.1
 .include "../../lang/LuaJIT2/buildlink3.mk"
-DEPENDS+=		lua-resty-core>=0.1.27:../../www/lua-resty-core
-DEPENDS+=		lua-resty-lrucache>=0.13:../../www/lua-resty-lrucache
+DEPENDS+=		lua-resty-core>=0.1.27nb1:../../www/lua-resty-core
+DEPENDS+=		lua-resty-lrucache>=0.13nb1:../../www/lua-resty-lrucache
 CONFIGURE_ENV+=		LUAJIT_LIB=${PREFIX}/lib
-CONFIGURE_ENV+=		LUAJIT_INC=${PREFIX}/include/luajit-2.0
+CONFIGURE_ENV+=		LUAJIT_INC=${PREFIX}/include/luajit-2.1
 DSO_EXTMODS+=		lua
 PLIST.lua=		yes
 .endif


Index: www/nginx-devel/options.mk
===================================================================
RCS file: /cvsroot/pkgsrc/www/nginx-devel/options.mk,v
retrieving revision 1.29
diff -u -r1.29 options.mk
--- www/nginx-devel/options.mk	7 May 2024 13:43:55 -0000	1.29
+++ www/nginx-devel/options.mk	27 May 2024 21:37:43 -0000
@@ -157,11 +157,12 @@
 SITES.${LUA_DISTFILE}=	-${MASTER_SITE_GITHUB:=openresty/lua-nginx-module/archive/}v${LUA_VERSION}.tar.gz
 DISTFILES+=		${LUA_DISTFILE}
 .include "../../devel/pcre/buildlink3.mk"
+BUILDLINK_API_DEPENDS.LuaJIT2+=	LuaJIT2>=2.1
 .include "../../lang/LuaJIT2/buildlink3.mk"
-DEPENDS+=		lua-resty-core>=0.1.27:../../www/lua-resty-core
-DEPENDS+=		lua-resty-lrucache>=0.13:../../www/lua-resty-lrucache
+DEPENDS+=		lua-resty-core>=0.1.27nb1:../../www/lua-resty-core
+DEPENDS+=		lua-resty-lrucache>=0.13nb1:../../www/lua-resty-lrucache
 CONFIGURE_ENV+=		LUAJIT_LIB=${PREFIX}/lib
-CONFIGURE_ENV+=		LUAJIT_INC=${PREFIX}/include/luajit-2.0
+CONFIGURE_ENV+=		LUAJIT_INC=${PREFIX}/include/luajit-2.1
 DSO_EXTMODS+=		lua
 PLIST.lua=		yes
 .endif

-- 
Malte Dehling
Prev by Date: pkg/58292: update games/solarus
Next by Date: pkg/58294: update editors/neovim to v0.10.0
Previous by Thread: pkg/58292: update games/solarus
Next by Thread: pkg/58294: update editors/neovim to v0.10.0
Indexes:
Home | Main Index | Thread Index | Old Index