LuaJIT2: Update to v2.0.1710087801

diff --git a/LuaJIT2/Makefile b/LuaJIT2/Makefile
index 5a493451d750e3547f35a12a0ede52d6e68854fa..5aa4b157d4c34ff2a0cb751af031f94dc837dcd7 100644 (file)
--- a/LuaJIT2/Makefile
+++ b/LuaJIT2/Makefile
@@ -1,20 +1,24 @@
-# $NetBSD: Makefile,v 1.16 2020/11/06 12:15:53 nia Exp $
-#
+# $NetBSD$
 
-DISTNAME=      LuaJIT-2.0.5
+DISTNAME=      LuaJIT-2.0.${TIMESTAMP}
 PKGNAME=       ${DISTNAME:S/LuaJIT/LuaJIT2/}
-PKGREVISION=   2
 CATEGORIES=    lang lua
-MASTER_SITES=  http://luajit.org/download/
+MASTER_SITES=  ${MASTER_SITE_GITHUB:=LuaJIT/}
+GITHUB_PROJECT=        ${DISTNAME:C/-[^-]*$//}
+GITHUB_TAG=    cae36118
+TIMESTAMP=     1710087801      # git show --no-patch --format=%ct
 
-MAINTAINER=    pkgsrc-users@NetBSD.org
+MAINTAINER=    mdehling@gmail.com
 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.
+pre-configure:
+       ${ECHO} ${TIMESTAMP} >${WRKSRC}/.relver
+
+# LuaJIT 2.1 supports mips64 and aarch64.
 ONLY_FOR_PLATFORM+=    *-*-*arm*
 ONLY_FOR_PLATFORM+=    *-*-i386
 ONLY_FOR_PLATFORM+=    *-*-mipseb

diff --git a/LuaJIT2/PLIST b/LuaJIT2/PLIST
index f02164a6134009dfade2630a8e22dfa531030a79..37e1ae5580e18ad8219ca06f54a42ccbc168f7ec 100644 (file)
--- a/LuaJIT2/PLIST
+++ b/LuaJIT2/PLIST
@@ -1,4 +1,4 @@
-@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
@@ -12,17 +12,17 @@ ${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.0/jit/bc.lua
+share/luajit-2.0/jit/bcsave.lua
+share/luajit-2.0/jit/dis_arm.lua
+share/luajit-2.0/jit/dis_mips.lua
+share/luajit-2.0/jit/dis_mipsel.lua
+share/luajit-2.0/jit/dis_ppc.lua
+share/luajit-2.0/jit/dis_x64.lua
+share/luajit-2.0/jit/dis_x86.lua
+share/luajit-2.0/jit/dump.lua
+share/luajit-2.0/jit/v.lua
+share/luajit-2.0/jit/vmdef.lua
 @pkgdir share/lua/5.1
 @pkgdir lib/lua/5.1

diff --git a/LuaJIT2/buildlink3.mk b/LuaJIT2/buildlink3.mk
index 79a799b70a50a03b029946e25c0272e5b1b9fd9a..03f2e73dce955d5c4fc8924f153f96e41a717c9f 100644 (file)
--- a/LuaJIT2/buildlink3.mk
+++ b/LuaJIT2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2014/03/26 13:29:53 imil Exp $
+# $NetBSD$
 
 BUILDLINK_TREE+=       LuaJIT2
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        LuaJIT2
 LUAJIT2_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.LuaJIT2+=        LuaJIT2>=2.0.3
-BUILDLINK_PKGSRCDIR.LuaJIT2?=  ../../lang/LuaJIT2
+BUILDLINK_PKGSRCDIR.LuaJIT2?=  ../../wip/LuaJIT2
 .endif # LUAJIT2_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -LuaJIT2

diff --git a/LuaJIT2/distinfo b/LuaJIT2/distinfo
index 9c095926fb63dabde5b73fcef8ea1218fdf57a0d..92ac45b4509206ef45960b149c94ece068d52071 100644 (file)
--- a/LuaJIT2/distinfo
+++ b/LuaJIT2/distinfo
@@ -1,10 +1,9 @@
-$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
+BLAKE2s (LuaJIT-2.0.1710087801-cae36118.tar.gz) = dcda7cb04bcc14449c30fe6eaac94cc05d70eb02b874a8dd130adf147f7f9822
+SHA512 (LuaJIT-2.0.1710087801-cae36118.tar.gz) = ec460b76f7cbbe7a63bede04926dbd0984ab3bbf82bc7410f4b00471ac8e0faef96e81270a5e584cf002c0bbf0708337485629b360db9bd1c2f15d8ac4ff5027
+Size (LuaJIT-2.0.1710087801-cae36118.tar.gz) = 845112 bytes
+SHA1 (patch-Makefile) = 35fcad24934861c566539074a7f8e62ddf6c06f8
+SHA1 (patch-src_Makefile) = 43234d5e008c37d950252f00fe70346f67e7679b
 SHA1 (patch-src_lj__ccallback.c) = 8032bc451a504ae9538fb0ae4cc1ee729ede3a70
 SHA1 (patch-src_lj__mcode.c) = c150e0b07ab441e983ace21e0e813fd4334290b5

diff --git a/LuaJIT2/patches/patch-Makefile b/LuaJIT2/patches/patch-Makefile
index aac8fcb70dce028d6260f4ce911a09a9249a7cbc..2ee9633ae21aae75f4770760b14357a119f6e08a 100644 (file)
--- a/LuaJIT2/patches/patch-Makefile
+++ b/LuaJIT2/patches/patch-Makefile
@@ -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-04-03 03:45:29.535520201 +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)|"
- 

diff --git a/LuaJIT2/patches/patch-src_Makefile b/LuaJIT2/patches/patch-src_Makefile
index 85dfba636cb5f529ec98355dd770b63e66bd893e..51d9f4c9623c5be436c950004e06c64de57b75ba 100644 (file)
--- a/LuaJIT2/patches/patch-src_Makefile
+++ b/LuaJIT2/patches/patch-src_Makefile
@@ -1,16 +1,15 @@
-$NetBSD: patch-src_Makefile,v 1.2 2017/05/29 21:47:31 alnsn Exp $
+$NetBSD$
 
 Fix building on OS X.
 
---- src/Makefile.orig  2017-05-01 18:11:00.000000000 +0000
+--- src/Makefile.orig  2023-08-21 01:06:26.000000000 +0000
 +++ src/Makefile
-@@ -297,9 +297,6 @@ ifeq (,$(shell $(TARGET_CC) -o /dev/null
-   TARGET_XCFLAGS+= -fno-stack-protector
+@@ -302,7 +302,7 @@ ifeq (,$(shell $(TARGET_CC) -o /dev/null
  endif
  ifeq (Darwin,$(TARGET_SYS))
--  ifeq (,$(MACOSX_DEPLOYMENT_TARGET))
--    export MACOSX_DEPLOYMENT_TARGET=10.4
--  endif
+   ifeq (,$(MACOSX_DEPLOYMENT_TARGET))
+-    $(error missing: export MACOSX_DEPLOYMENT_TARGET=XX.YY)
++    export MACOSX_DEPLOYMENT_TARGET=10.4
+   endif
    TARGET_STRIP+= -x
    TARGET_XSHLDFLAGS= -dynamiclib -single_module -undefined dynamic_lookup -fPIC
-   TARGET_DYNXLDOPTS=

diff --git a/LuaJIT2/patches/patch-src_lj__arch.h b/LuaJIT2/patches/patch-src_lj__arch.h
deleted file mode 100644 (file)
index 5583524..0000000
--- a/LuaJIT2/patches/patch-src_lj__arch.h
+++ /dev/null
@@ -1,32 +0,0 @@
-$NetBSD: patch-src_lj__arch.h,v 1.1 2018/06/02 20:01:21 he Exp $
-
-Fix the test for endianness so that NetBSD/powerpc isn't
-mis-categorized as little-endian only because _LITTLE_ENDIAN
-is defined -- what matters on NetBSD is the value of _BYTE_ORDER.
-
---- src/lj_arch.h.orig 2017-05-01 18:11:00.000000000 +0000
-+++ src/lj_arch.h
-@@ -339,12 +339,21 @@
- #if defined(_SOFT_FLOAT) || defined(_SOFT_DOUBLE)
- #error "No support for PowerPC CPUs without double-precision FPU"
- #endif
--#if defined(_LITTLE_ENDIAN)
--#error "No support for little-endian PowerPC"
-+
-+#if defined(_BYTE_ORDER) && defined(_LITTLE_ENDIAN)
-+# if (_BYTE_ORDER == _LITTLE_ENDIAN)
-+#  error "No support for little-endian PowerPC"
-+# endif
-+#else
-+# if defined(_LITTLE_ENDIAN)
-+#  error "No support for little-endian PowerPC"
-+# endif
- #endif
-+
- #if defined(_LP64)
- #error "No support for PowerPC 64 bit mode"
- #endif
-+
- #elif LJ_TARGET_MIPS
- #if defined(__mips_soft_float)
- #error "No support for MIPS CPUs without FPU"