CVS commit: pkgsrc

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc
From: "Benny Siegert" <bsiegert%netbsd.org@localhost>
Date: Sat, 17 Aug 2024 15:20:22 +0000

Module Name:    pkgsrc
Committed By:   bsiegert
Date:           Sat Aug 17 15:20:21 UTC 2024

Modified Files:
        pkgsrc/lang/LuaJIT2: DESCR Makefile PLIST buildlink3.mk distinfo
            platform.mk
        pkgsrc/lang/LuaJIT2/patches: patch-Makefile patch-src_Makefile
        pkgsrc/www/lua-resty-core: Makefile PLIST
        pkgsrc/www/lua-resty-lrucache: Makefile PLIST
        pkgsrc/www/nginx: options.mk
        pkgsrc/www/nginx-devel: options.mk
Removed Files:
        pkgsrc/lang/LuaJIT2/patches: patch-src_lj__arch.h
            patch-src_lj__ccallback.c patch-src_lj__mcode.c

Log Message:
LuaJIT2: update to 2.1, rolling release

The LuaJIT project has decided to switch to a rolling release model. There
are only branches, no point releases. Also, no sensible changelog that I
could find either.

Patch from Malte Dehling in PR pkg/58293.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 pkgsrc/lang/LuaJIT2/DESCR
cvs rdiff -u -r1.16 -r1.17 pkgsrc/lang/LuaJIT2/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/lang/LuaJIT2/PLIST
cvs rdiff -u -r1.1 -r1.2 pkgsrc/lang/LuaJIT2/buildlink3.mk \
    pkgsrc/lang/LuaJIT2/platform.mk
cvs rdiff -u -r1.13 -r1.14 pkgsrc/lang/LuaJIT2/distinfo
cvs rdiff -u -r1.6 -r1.7 pkgsrc/lang/LuaJIT2/patches/patch-Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/lang/LuaJIT2/patches/patch-src_Makefile
cvs rdiff -u -r1.1 -r0 pkgsrc/lang/LuaJIT2/patches/patch-src_lj__arch.h \
    pkgsrc/lang/LuaJIT2/patches/patch-src_lj__ccallback.c \
    pkgsrc/lang/LuaJIT2/patches/patch-src_lj__mcode.c
cvs rdiff -u -r1.3 -r1.4 pkgsrc/www/lua-resty-core/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/www/lua-resty-core/PLIST
cvs rdiff -u -r1.1 -r1.2 pkgsrc/www/lua-resty-lrucache/Makefile \
    pkgsrc/www/lua-resty-lrucache/PLIST
cvs rdiff -u -r1.103 -r1.104 pkgsrc/www/nginx/options.mk
cvs rdiff -u -r1.30 -r1.31 pkgsrc/www/nginx-devel/options.mk

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

Modified files:

Index: pkgsrc/lang/LuaJIT2/DESCR
diff -u pkgsrc/lang/LuaJIT2/DESCR:1.2 pkgsrc/lang/LuaJIT2/DESCR:1.3
--- pkgsrc/lang/LuaJIT2/DESCR:1.2       Sat Oct 31 21:37:52 2015
+++ pkgsrc/lang/LuaJIT2/DESCR   Sat Aug 17 15:20:20 2024
@@ -2,4 +2,4 @@ LuaJIT is a Just-In-Time Compiler (JIT) 
 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: pkgsrc/lang/LuaJIT2/Makefile
diff -u pkgsrc/lang/LuaJIT2/Makefile:1.16 pkgsrc/lang/LuaJIT2/Makefile:1.17
--- pkgsrc/lang/LuaJIT2/Makefile:1.16   Fri Nov  6 12:15:53 2020
+++ pkgsrc/lang/LuaJIT2/Makefile        Sat Aug 17 15:20:20 2024
@@ -1,28 +1,27 @@
-# $NetBSD: Makefile,v 1.16 2020/11/06 12:15:53 nia Exp $
-#
+# $NetBSD: Makefile,v 1.17 2024/08/17 15:20:20 bsiegert Exp $
 
-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: pkgsrc/lang/LuaJIT2/PLIST
diff -u pkgsrc/lang/LuaJIT2/PLIST:1.3 pkgsrc/lang/LuaJIT2/PLIST:1.4
--- pkgsrc/lang/LuaJIT2/PLIST:1.3       Tue Jun 21 16:40:10 2016
+++ pkgsrc/lang/LuaJIT2/PLIST   Sat Aug 17 15:20:20 2024
@@ -1,28 +1,36 @@
-@comment $NetBSD: PLIST,v 1.3 2016/06/21 16:40:10 fhajny Exp $
+@comment $NetBSD: PLIST,v 1.4 2024/08/17 15:20:20 bsiegert Exp $
 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: pkgsrc/lang/LuaJIT2/buildlink3.mk
diff -u pkgsrc/lang/LuaJIT2/buildlink3.mk:1.1 pkgsrc/lang/LuaJIT2/buildlink3.mk:1.2
--- pkgsrc/lang/LuaJIT2/buildlink3.mk:1.1       Wed Mar 26 13:29:53 2014
+++ pkgsrc/lang/LuaJIT2/buildlink3.mk   Sat Aug 17 15:20:20 2024
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2014/03/26 13:29:53 imil Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2024/08/17 15:20:20 bsiegert Exp $
 
 BUILDLINK_TREE+=       LuaJIT2
 
@@ -7,6 +7,7 @@ LUAJIT2_BUILDLINK3_MK:=
 
 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: pkgsrc/lang/LuaJIT2/platform.mk
diff -u pkgsrc/lang/LuaJIT2/platform.mk:1.1 pkgsrc/lang/LuaJIT2/platform.mk:1.2
--- pkgsrc/lang/LuaJIT2/platform.mk:1.1 Wed Jun 24 11:16:00 2020
+++ pkgsrc/lang/LuaJIT2/platform.mk     Sat Aug 17 15:20:21 2024
@@ -1,10 +1,10 @@
-# $NetBSD: platform.mk,v 1.1 2020/06/24 11:16:00 nia Exp $
+# $NetBSD: platform.mk,v 1.2 2024/08/17 15:20:21 bsiegert Exp $
 
 .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: pkgsrc/lang/LuaJIT2/distinfo
diff -u pkgsrc/lang/LuaJIT2/distinfo:1.13 pkgsrc/lang/LuaJIT2/distinfo:1.14
--- pkgsrc/lang/LuaJIT2/distinfo:1.13   Tue Oct 26 10:51:29 2021
+++ pkgsrc/lang/LuaJIT2/distinfo        Sat Aug 17 15:20:21 2024
@@ -1,10 +1,7 @@
-$NetBSD: distinfo,v 1.13 2021/10/26 10:51:29 nia Exp $
+$NetBSD: distinfo,v 1.14 2024/08/17 15:20:21 bsiegert Exp $
 
-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) = 157b24b7f936e93e89e8bb797b939e71fb643d0b
+SHA1 (patch-src_Makefile) = 68f9ce9e42070b0f24ddf35ced92c22746d8d206

Index: pkgsrc/lang/LuaJIT2/patches/patch-Makefile
diff -u pkgsrc/lang/LuaJIT2/patches/patch-Makefile:1.6 pkgsrc/lang/LuaJIT2/patches/patch-Makefile:1.7
--- pkgsrc/lang/LuaJIT2/patches/patch-Makefile:1.6      Mon May 29 21:47:31 2017
+++ pkgsrc/lang/LuaJIT2/patches/patch-Makefile  Sat Aug 17 15:20:21 2024
@@ -1,10 +1,10 @@
-$NetBSD: patch-Makefile,v 1.6 2017/05/29 21:47:31 alnsn Exp $
+$NetBSD: patch-Makefile,v 1.7 2024/08/17 15:20:21 bsiegert Exp $
 
-Fix installation.
+fix install paths
 
---- Makefile.orig      2017-05-01 18:11:00.000000000 +0000
+--- Makefile.orig      2024-04-22 08:06:42.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 @@ Fix installation.
  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: pkgsrc/lang/LuaJIT2/patches/patch-src_Makefile
diff -u pkgsrc/lang/LuaJIT2/patches/patch-src_Makefile:1.2 pkgsrc/lang/LuaJIT2/patches/patch-src_Makefile:1.3
--- pkgsrc/lang/LuaJIT2/patches/patch-src_Makefile:1.2  Mon May 29 21:47:31 2017
+++ pkgsrc/lang/LuaJIT2/patches/patch-src_Makefile      Sat Aug 17 15:20:21 2024
@@ -1,16 +1,16 @@
-$NetBSD: patch-src_Makefile,v 1.2 2017/05/29 21:47:31 alnsn Exp $
+$NetBSD: patch-src_Makefile,v 1.3 2024/08/17 15:20:21 bsiegert Exp $
 
-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: pkgsrc/www/lua-resty-core/Makefile
diff -u pkgsrc/www/lua-resty-core/Makefile:1.3 pkgsrc/www/lua-resty-core/Makefile:1.4
--- pkgsrc/www/lua-resty-core/Makefile:1.3      Fri Jun 14 14:51:35 2024
+++ pkgsrc/www/lua-resty-core/Makefile  Sat Aug 17 15:20:21 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2024/06/14 14:51:35 adam Exp $
+# $NetBSD: Makefile,v 1.4 2024/08/17 15:20:21 bsiegert Exp $
 
 DISTNAME=      lua-resty-core-0.1.28
 CATEGORIES=    www
@@ -12,8 +12,9 @@ LICENSE=      modified-bsd
 
 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: pkgsrc/www/lua-resty-core/PLIST
diff -u pkgsrc/www/lua-resty-core/PLIST:1.1 pkgsrc/www/lua-resty-core/PLIST:1.2
--- pkgsrc/www/lua-resty-core/PLIST:1.1 Wed Mar 29 08:29:08 2023
+++ pkgsrc/www/lua-resty-core/PLIST     Sat Aug 17 15:20:21 2024
@@ -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: PLIST,v 1.2 2024/08/17 15:20:21 bsiegert Exp $
+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: pkgsrc/www/lua-resty-lrucache/Makefile
diff -u pkgsrc/www/lua-resty-lrucache/Makefile:1.1 pkgsrc/www/lua-resty-lrucache/Makefile:1.2
--- pkgsrc/www/lua-resty-lrucache/Makefile:1.1  Wed Mar 29 08:29:57 2023
+++ pkgsrc/www/lua-resty-lrucache/Makefile      Sat Aug 17 15:20:21 2024
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.1 2023/03/29 08:29:57 adam Exp $
+# $NetBSD: Makefile,v 1.2 2024/08/17 15:20:21 bsiegert 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 @@ LICENSE=     modified-bsd
 
 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: pkgsrc/www/lua-resty-lrucache/PLIST
diff -u pkgsrc/www/lua-resty-lrucache/PLIST:1.1 pkgsrc/www/lua-resty-lrucache/PLIST:1.2
--- pkgsrc/www/lua-resty-lrucache/PLIST:1.1     Wed Mar 29 08:29:57 2023
+++ pkgsrc/www/lua-resty-lrucache/PLIST Sat Aug 17 15:20:21 2024
@@ -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: PLIST,v 1.2 2024/08/17 15:20:21 bsiegert Exp $
+share/luajit-2.1/resty/lrucache.lua
+share/luajit-2.1/resty/lrucache/pureffi.lua

Index: pkgsrc/www/nginx/options.mk
diff -u pkgsrc/www/nginx/options.mk:1.103 pkgsrc/www/nginx/options.mk:1.104
--- pkgsrc/www/nginx/options.mk:1.103   Thu Jun 27 16:03:24 2024
+++ pkgsrc/www/nginx/options.mk Sat Aug 17 15:20:21 2024
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.103 2024/06/27 16:03:24 osa Exp $
+# $NetBSD: options.mk,v 1.104 2024/08/17 15:20:21 bsiegert Exp $
 
 CODELOAD_SITE_GITHUB=          https://codeload.github.com/
 
@@ -157,11 +157,12 @@ LUA_DISTFILE=             ${LUA_DISTNAME}.tar.gz
 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: pkgsrc/www/nginx-devel/options.mk
diff -u pkgsrc/www/nginx-devel/options.mk:1.30 pkgsrc/www/nginx-devel/options.mk:1.31
--- pkgsrc/www/nginx-devel/options.mk:1.30      Thu Jun 27 16:03:25 2024
+++ pkgsrc/www/nginx-devel/options.mk   Sat Aug 17 15:20:21 2024
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.30 2024/06/27 16:03:25 osa Exp $
+# $NetBSD: options.mk,v 1.31 2024/08/17 15:20:21 bsiegert Exp $
 
 CODELOAD_SITE_GITHUB=          https://codeload.github.com/
 
@@ -157,11 +157,12 @@ LUA_DISTFILE=             ${LUA_DISTNAME}.tar.gz
 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

Prev by Date: CVS commit: pkgsrc/mk/configure
Next by Date: CVS commit: pkgsrc/editors/neovim
Previous by Thread: CVS commit: pkgsrc/mk/configure
Next by Thread: CVS commit: pkgsrc/editors/neovim
Indexes:

Home | Main Index | Thread Index | Old Index