summaryrefslogtreecommitdiff
path: root/lang/luajit
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--lang/luajit-devel/Makefile37
-rw-r--r--lang/luajit-devel/distinfo3
-rw-r--r--lang/luajit-devel/files/patch-Makefile59
-rw-r--r--lang/luajit-devel/files/patch-etc_luajit.pc9
-rw-r--r--lang/luajit-devel/pkg-descr1
-rw-r--r--lang/luajit-devel/pkg-plist33
-rw-r--r--lang/luajit-openresty/Makefile7
-rw-r--r--lang/luajit-openresty/distinfo6
-rw-r--r--lang/luajit-openresty/files/patch-src_jit_bcsave.lua11
-rw-r--r--lang/luajit-openresty/pkg-plist38
-rw-r--r--lang/luajit/Makefile38
-rw-r--r--lang/luajit/distinfo8
-rw-r--r--lang/luajit/files/patch-Makefile32
-rw-r--r--lang/luajit/files/patch-etc_luajit.pc6
-rw-r--r--lang/luajit/files/patch-src_Makefile (renamed from lang/luajit-devel/files/patch-src_Makefile)0
-rw-r--r--lang/luajit/files/patch-src_jit_bcsave.lua11
-rw-r--r--lang/luajit/files/patch-src_lj__ccallback.c (renamed from lang/luajit-devel/files/patch-src_lj__ccallback.c)0
-rw-r--r--lang/luajit/files/patch-src_lj__prng.c (renamed from lang/luajit-devel/files/patch-src_lj__prng.c)0
-rw-r--r--lang/luajit/pkg-plist46
19 files changed, 100 insertions, 245 deletions
diff --git a/lang/luajit-devel/Makefile b/lang/luajit-devel/Makefile
deleted file mode 100644
index 597fd3a45afa..000000000000
--- a/lang/luajit-devel/Makefile
+++ /dev/null
@@ -1,37 +0,0 @@
-PORTNAME= luajit
-DISTVERSION= 2.1.0.20250528
-CATEGORIES= lang
-PKGNAMESUFFIX= -devel
-DISTNAME= LuaJIT-${DISTVERSION}
-
-MAINTAINER= osa@FreeBSD.org
-COMMENT= Just-In-Time Compiler for Lua
-WWW= https://luajit.org/luajit.html
-
-LICENSE= MIT PD
-LICENSE_COMB= multi
-LICENSE_FILE= ${WRKSRC}/COPYRIGHT
-
-IGNORE_riscv64= fails to compile: lj_arch.h:73:2: No support for this architecture (yet)
-
-USES= compiler cpe gmake
-
-CONFLICTS_INSTALL= luajit luajit-openresty
-
-USE_LDCONFIG= yes
-MAKE_ARGS= CC=${CC} CCOPT= CCOPT_x86= Q=
-
-USE_GITHUB= yes
-GH_TUPLE= LuaJIT:LuaJIT:f9140a6
-
-LUAJIT_VERSION= 2.1
-LUAJIT_SOVERSION= 2.1.1748459687
-
-PLIST_SUB+= VERSION=${LUAJIT_VERSION} SOVERSION=${LUAJIT_SOVERSION}
-
-post-install:
- ${LN} -sf ${PORTNAME}-${LUAJIT_SOVERSION} \
- ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
- ${INSTALL_MAN} ${WRKSRC}/etc/luajit.1 ${STAGEDIR}${PREFIX}/share/man/man1
-
-.include <bsd.port.mk>
diff --git a/lang/luajit-devel/distinfo b/lang/luajit-devel/distinfo
deleted file mode 100644
index a7daefeea90e..000000000000
--- a/lang/luajit-devel/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1748983264
-SHA256 (LuaJIT-LuaJIT-2.1.0.20250528-f9140a6_GH0.tar.gz) = dd32256c3c8c02c2e7195c042b9eea774141dbe887dae951e55d10713ac92ccf
-SIZE (LuaJIT-LuaJIT-2.1.0.20250528-f9140a6_GH0.tar.gz) = 1083034
diff --git a/lang/luajit-devel/files/patch-Makefile b/lang/luajit-devel/files/patch-Makefile
deleted file mode 100644
index 6ec5a3b862bd..000000000000
--- a/lang/luajit-devel/files/patch-Makefile
+++ /dev/null
@@ -1,59 +0,0 @@
---- Makefile.orig 2025-05-28 19:14:47 UTC
-+++ Makefile
-@@ -30,7 +30,7 @@ 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!
- #
--export PREFIX= /usr/local
-+#export PREFIX= /usr/local
- export MULTILIB= lib
- ##############################################################################
-
-@@ -41,6 +41,7 @@ INSTALL_INC= $(INSTALL_DEFINC)
- INSTALL_SHARE= $(DESTDIR)$(INSTALL_SHARE_)
- INSTALL_DEFINC= $(DPREFIX)/include/luajit-$(MMVERSION)
- INSTALL_INC= $(INSTALL_DEFINC)
-+INSTALL_LIBD= $(DPREFIX)/libdata
-
- export INSTALL_LJLIBD= $(INSTALL_SHARE_)/luajit-$(MMVERSION)
- INSTALL_JITLIB= $(DESTDIR)$(INSTALL_LJLIBD)/jit
-@@ -48,8 +49,7 @@ INSTALL_CMOD= $(INSTALL_CMODD)/$(ABIVER)
- INSTALL_LMOD= $(INSTALL_LMODD)/$(ABIVER)
- INSTALL_CMODD= $(INSTALL_LIB)/lua
- INSTALL_CMOD= $(INSTALL_CMODD)/$(ABIVER)
--INSTALL_MAN= $(INSTALL_SHARE)/man/man1
--INSTALL_PKGCONFIG= $(INSTALL_LIB)/pkgconfig
-+INSTALL_PKGCONFIG= $(INSTALL_LIBD)/pkgconfig
-
- INSTALL_TNAME= luajit-$(VERSION)
- INSTALL_TSYMNAME= luajit
-@@ -70,8 +70,8 @@ INSTALL_PC= $(INSTALL_PKGCONFIG)/$(INSTALL_PCNAME)
- INSTALL_TSYM= $(INSTALL_BIN)/$(INSTALL_TSYMNAME)
- INSTALL_PC= $(INSTALL_PKGCONFIG)/$(INSTALL_PCNAME)
-
--INSTALL_DIRS= $(INSTALL_BIN) $(INSTALL_LIB) $(INSTALL_INC) $(INSTALL_MAN) \
-- $(INSTALL_PKGCONFIG) $(INSTALL_JITLIB) $(INSTALL_LMOD) $(INSTALL_CMOD)
-+INSTALL_DIRS= $(INSTALL_INC) \
-+ $(INSTALL_PKGCONFIG) $(INSTALL_JITLIB)
- UNINSTALL_DIRS= $(INSTALL_JITLIB) $(DESTDIR)$(INSTALL_LJLIBD) $(INSTALL_INC) \
- $(INSTALL_LMOD) $(INSTALL_LMODD) $(INSTALL_CMOD) $(INSTALL_CMODD)
-
-@@ -135,10 +135,8 @@ install: $(INSTALL_DEP)
- $(RM) $(INSTALL_DYN) $(INSTALL_SHORT1) $(INSTALL_SHORT2)
- cd src && test -f $(FILE_SO) && \
- $(INSTALL_X) $(FILE_SO) $(INSTALL_DYN) && \
-- ( $(LDCONFIG) $(INSTALL_LIB) || : ) && \
- $(SYMLINK) $(INSTALL_SONAME) $(INSTALL_SHORT1) && \
- $(SYMLINK) $(INSTALL_SONAME) $(INSTALL_SHORT2) || :
-- cd etc && $(INSTALL_F) $(FILE_MAN) $(INSTALL_MAN)
- cd etc && $(SED_PC) $(FILE_PC) > $(FILE_PC).tmp && \
- $(INSTALL_F) $(FILE_PC).tmp $(INSTALL_PC) && \
- $(RM) $(FILE_PC).tmp
-@@ -156,7 +154,6 @@ uninstall:
- for file in $(FILES_INC); do \
- $(UNINSTALL) $(INSTALL_INC)/$$file; \
- done
-- $(LDCONFIG) $(INSTALL_LIB)
- $(RMDIR) $(UNINSTALL_DIRS) || :
- @echo "==== Successfully uninstalled LuaJIT $(VERSION) from $(PREFIX) ===="
-
diff --git a/lang/luajit-devel/files/patch-etc_luajit.pc b/lang/luajit-devel/files/patch-etc_luajit.pc
deleted file mode 100644
index 8867dc0b4be8..000000000000
--- a/lang/luajit-devel/files/patch-etc_luajit.pc
+++ /dev/null
@@ -1,9 +0,0 @@
---- etc/luajit.pc.orig 2019-06-26 21:12:49 UTC
-+++ etc/luajit.pc
-@@ -21,5 +21,5 @@ URL: http://luajit.org
- Version: ${version}
- Requires:
- Libs: -L${libdir} -l${libname}
--Libs.private: -Wl,-E -lm -ldl
-+Libs.private: -Wl,-E -lm
- Cflags: -I${includedir}
diff --git a/lang/luajit-devel/pkg-descr b/lang/luajit-devel/pkg-descr
deleted file mode 100644
index b9711cc1d059..000000000000
--- a/lang/luajit-devel/pkg-descr
+++ /dev/null
@@ -1 +0,0 @@
-LuaJIT is a Just-In-Time Compiler for the Lua programming language.
diff --git a/lang/luajit-devel/pkg-plist b/lang/luajit-devel/pkg-plist
deleted file mode 100644
index 7d9ff63be460..000000000000
--- a/lang/luajit-devel/pkg-plist
+++ /dev/null
@@ -1,33 +0,0 @@
-bin/luajit
-bin/luajit-%%SOVERSION%%
-include/luajit-%%VERSION%%/lauxlib.h
-include/luajit-%%VERSION%%/lua.h
-include/luajit-%%VERSION%%/lua.hpp
-include/luajit-%%VERSION%%/luaconf.h
-include/luajit-%%VERSION%%/luajit.h
-include/luajit-%%VERSION%%/lualib.h
-lib/libluajit-5.1.a
-lib/libluajit-5.1.so
-lib/libluajit-5.1.so.2
-lib/libluajit-5.1.so.%%SOVERSION%%
-libdata/pkgconfig/luajit.pc
-share/man/man1/luajit.1.gz
-%%DATADIR%%-%%VERSION%%/jit/bc.lua
-%%DATADIR%%-%%VERSION%%/jit/bcsave.lua
-%%DATADIR%%-%%VERSION%%/jit/dis_arm.lua
-%%DATADIR%%-%%VERSION%%/jit/dis_arm64.lua
-%%DATADIR%%-%%VERSION%%/jit/dis_arm64be.lua
-%%DATADIR%%-%%VERSION%%/jit/dis_mips.lua
-%%DATADIR%%-%%VERSION%%/jit/dis_mips64.lua
-%%DATADIR%%-%%VERSION%%/jit/dis_mips64el.lua
-%%DATADIR%%-%%VERSION%%/jit/dis_mips64r6.lua
-%%DATADIR%%-%%VERSION%%/jit/dis_mips64r6el.lua
-%%DATADIR%%-%%VERSION%%/jit/dis_mipsel.lua
-%%DATADIR%%-%%VERSION%%/jit/dis_ppc.lua
-%%DATADIR%%-%%VERSION%%/jit/dis_x64.lua
-%%DATADIR%%-%%VERSION%%/jit/dis_x86.lua
-%%DATADIR%%-%%VERSION%%/jit/dump.lua
-%%DATADIR%%-%%VERSION%%/jit/p.lua
-%%DATADIR%%-%%VERSION%%/jit/v.lua
-%%DATADIR%%-%%VERSION%%/jit/vmdef.lua
-%%DATADIR%%-%%VERSION%%/jit/zone.lua
diff --git a/lang/luajit-openresty/Makefile b/lang/luajit-openresty/Makefile
index 398cacbbd456..fa254b91325f 100644
--- a/lang/luajit-openresty/Makefile
+++ b/lang/luajit-openresty/Makefile
@@ -1,6 +1,7 @@
PORTNAME= luajit
DISTVERSIONPREFIX= v
-DISTVERSION= 2.1-20250117
+DISTVERSION= 2.1-20250529
+PORTREVISION= 1
CATEGORIES= lang
PKGNAMESUFFIX= -openresty
@@ -18,7 +19,7 @@ IGNORE_riscv64= fails to compile: lj_arch.h:73:2: No support for this architect
USES= cpe gmake
-CONFLICTS_INSTALL= luajit luajit-devel
+CONFLICTS_INSTALL= luajit
USE_LDCONFIG= yes
MAKE_ARGS= CC=${CC} Q=
@@ -28,7 +29,7 @@ GH_ACCOUNT= openresty
GH_PROJECT= luajit2
LUAJIT_VERSION= 2.1
-LUAJIT_SOVERSION= 2.1.1737090214
+LUAJIT_SOVERSION= 2.1.1748495995
PLIST_SUB+= VERSION=${LUAJIT_VERSION} SOVERSION=${LUAJIT_SOVERSION}
diff --git a/lang/luajit-openresty/distinfo b/lang/luajit-openresty/distinfo
index 04a6bd49dc11..acdb1d7509ed 100644
--- a/lang/luajit-openresty/distinfo
+++ b/lang/luajit-openresty/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1738619349
-SHA256 (openresty-luajit2-v2.1-20250117_GH0.tar.gz) = 68ff3dc2cc97969f7385679da7c9ff96738aa9cc275fa6bab77316eb3340ea8e
-SIZE (openresty-luajit2-v2.1-20250117_GH0.tar.gz) = 1163528
+TIMESTAMP = 1752070076
+SHA256 (openresty-luajit2-v2.1-20250529_GH0.tar.gz) = a3f6f5ead9fc69603e51c66877614e6b5e93332d552f35d08f932447357ed593
+SIZE (openresty-luajit2-v2.1-20250529_GH0.tar.gz) = 1164879
diff --git a/lang/luajit-openresty/files/patch-src_jit_bcsave.lua b/lang/luajit-openresty/files/patch-src_jit_bcsave.lua
new file mode 100644
index 000000000000..1b1d94fcb232
--- /dev/null
+++ b/lang/luajit-openresty/files/patch-src_jit_bcsave.lua
@@ -0,0 +1,11 @@
+--- src/jit/bcsave.lua.orig 2025-08-14 13:39:47 UTC
++++ src/jit/bcsave.lua
+@@ -96,6 +96,8 @@ local map_arch = {
+ arm64 = { e = "le", b = 64, m = 183, p = 0xaa64, },
+ arm64be = { e = "be", b = 64, m = 183, },
+ ppc = { e = "be", b = 32, m = 20, },
++ ppc64 = { e = "be", b = 64, m = 21, },
++ ppc64le = { e = "le", b = 64, m = 21, },
+ mips = { e = "be", b = 32, m = 8, f = 0x50001006, },
+ mipsel = { e = "le", b = 32, m = 8, f = 0x50001006, },
+ mips64 = { e = "be", b = 64, m = 8, f = 0x80000007, },
diff --git a/lang/luajit-openresty/pkg-plist b/lang/luajit-openresty/pkg-plist
index c0c15925b4c6..53700f285685 100644
--- a/lang/luajit-openresty/pkg-plist
+++ b/lang/luajit-openresty/pkg-plist
@@ -11,23 +11,23 @@ lib/libluajit-5.1.so
lib/libluajit-5.1.so.2
lib/libluajit-5.1.so.%%SOVERSION%%
libdata/pkgconfig/luajit.pc
-share/luajit-%%VERSION%%/jit/bc.lua
-share/luajit-%%VERSION%%/jit/bcsave.lua
-share/luajit-%%VERSION%%/jit/dis_arm.lua
-share/luajit-%%VERSION%%/jit/dis_arm64.lua
-share/luajit-%%VERSION%%/jit/dis_arm64be.lua
-share/luajit-%%VERSION%%/jit/dis_mips.lua
-share/luajit-%%VERSION%%/jit/dis_mips64.lua
-share/luajit-%%VERSION%%/jit/dis_mips64el.lua
-share/luajit-%%VERSION%%/jit/dis_mips64r6.lua
-share/luajit-%%VERSION%%/jit/dis_mips64r6el.lua
-share/luajit-%%VERSION%%/jit/dis_mipsel.lua
-share/luajit-%%VERSION%%/jit/dis_ppc.lua
-share/luajit-%%VERSION%%/jit/dis_x64.lua
-share/luajit-%%VERSION%%/jit/dis_x86.lua
-share/luajit-%%VERSION%%/jit/dump.lua
-share/luajit-%%VERSION%%/jit/p.lua
-share/luajit-%%VERSION%%/jit/v.lua
-share/luajit-%%VERSION%%/jit/vmdef.lua
-share/luajit-%%VERSION%%/jit/zone.lua
+%%DATADIR%%-%%VERSION%%/jit/bc.lua
+%%DATADIR%%-%%VERSION%%/jit/bcsave.lua
+%%DATADIR%%-%%VERSION%%/jit/dis_arm.lua
+%%DATADIR%%-%%VERSION%%/jit/dis_arm64.lua
+%%DATADIR%%-%%VERSION%%/jit/dis_arm64be.lua
+%%DATADIR%%-%%VERSION%%/jit/dis_mips.lua
+%%DATADIR%%-%%VERSION%%/jit/dis_mips64.lua
+%%DATADIR%%-%%VERSION%%/jit/dis_mips64el.lua
+%%DATADIR%%-%%VERSION%%/jit/dis_mips64r6.lua
+%%DATADIR%%-%%VERSION%%/jit/dis_mips64r6el.lua
+%%DATADIR%%-%%VERSION%%/jit/dis_mipsel.lua
+%%DATADIR%%-%%VERSION%%/jit/dis_ppc.lua
+%%DATADIR%%-%%VERSION%%/jit/dis_x64.lua
+%%DATADIR%%-%%VERSION%%/jit/dis_x86.lua
+%%DATADIR%%-%%VERSION%%/jit/dump.lua
+%%DATADIR%%-%%VERSION%%/jit/p.lua
+%%DATADIR%%-%%VERSION%%/jit/v.lua
+%%DATADIR%%-%%VERSION%%/jit/vmdef.lua
+%%DATADIR%%-%%VERSION%%/jit/zone.lua
share/man/man1/luajit.1.gz
diff --git a/lang/luajit/Makefile b/lang/luajit/Makefile
index 85e695a309e1..a81ff41d76c8 100644
--- a/lang/luajit/Makefile
+++ b/lang/luajit/Makefile
@@ -1,46 +1,36 @@
PORTNAME= luajit
-DISTVERSION= 2.0.5
-PORTREVISION= 7
+DISTVERSION= 2.1.0.20250728
CATEGORIES= lang
-MASTER_SITES= https://luajit.org/download/
DISTNAME= LuaJIT-${DISTVERSION}
-PATCH_SITES= https://github.com/LuaJIT/LuaJIT/commit/
-PATCHFILES= a4f4f5b83564a1075bea0ac7c1fd8768be1caff7.patch:-p1
-
-MAINTAINER= ports@FreeBSD.org
+MAINTAINER= osa@FreeBSD.org
COMMENT= Just-In-Time Compiler for Lua
WWW= https://luajit.org/luajit.html
-OPTIONS_DEFINE= PTHREAD
-PTHREAD_DESC= with pthread support
-
LICENSE= MIT PD
LICENSE_COMB= multi
LICENSE_FILE= ${WRKSRC}/COPYRIGHT
-IGNORE_aarch64= fails to compile: lj_arch.h:55:2: No support for this architecture (yet)
-IGNORE_powerpc64= fails to compile: lj_arch.h:346:2: No support for PowerPC 64 bit mode
-IGNORE_riscv64= fails to compile: lj_arch.h:55:2: No support for this architecture (yet)
-
-CONFLICTS_INSTALL= luajit-devel luajit-openresty
+IGNORE_riscv64= fails to compile: lj_arch.h:73:2: No support for this architecture (yet)
-WRKSRC= ${WRKDIR}/LuaJIT-${DISTVERSION}
USES= compiler cpe gmake
+
+CONFLICTS_INSTALL= luajit-openresty
+
USE_LDCONFIG= yes
-MAKE_ARGS= CC=${CC} CCOPT= CCOPT_x86=
+MAKE_ARGS= CC=${CC} CCOPT= CCOPT_x86= Q=
-PLIST_SUB+= VERSION=${DISTVERSION}
+USE_GITHUB= yes
+GH_TUPLE= LuaJIT:LuaJIT:871db2c
-.include <bsd.port.pre.mk>
+LUAJIT_VERSION= 2.1
+LUAJIT_SOVERSION= 2.1.1753364724
-.if ${PORT_OPTIONS:MPTHREAD}
-LDFLAGS+= -lm -pthread
-.endif
+PLIST_SUB+= VERSION=${LUAJIT_VERSION} SOVERSION=${LUAJIT_SOVERSION}
post-install:
- ${LN} -sf ${PORTNAME}-${DISTVERSION} \
+ ${LN} -sf ${PORTNAME}-${LUAJIT_SOVERSION} \
${STAGEDIR}${PREFIX}/bin/${PORTNAME}
${INSTALL_MAN} ${WRKSRC}/etc/luajit.1 ${STAGEDIR}${PREFIX}/share/man/man1
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/lang/luajit/distinfo b/lang/luajit/distinfo
index 6678f4a7dbd5..1da95aac27f8 100644
--- a/lang/luajit/distinfo
+++ b/lang/luajit/distinfo
@@ -1,5 +1,3 @@
-TIMESTAMP = 1672840245
-SHA256 (LuaJIT-2.0.5.tar.gz) = 874b1f8297c697821f561f9b73b57ffd419ed8f4278c82e05b48806d30c1e979
-SIZE (LuaJIT-2.0.5.tar.gz) = 849845
-SHA256 (a4f4f5b83564a1075bea0ac7c1fd8768be1caff7.patch) = 172ee031fa64644b91c74b8488f976b39215bd128e5217eb93791729bd20916a
-SIZE (a4f4f5b83564a1075bea0ac7c1fd8768be1caff7.patch) = 831
+TIMESTAMP = 1753382137
+SHA256 (LuaJIT-LuaJIT-2.1.0.20250728-871db2c_GH0.tar.gz) = 47538f795c0971267f59e6215cfade6e738b5288c5c3fd07b5a575b08a383a1b
+SIZE (LuaJIT-LuaJIT-2.1.0.20250728-871db2c_GH0.tar.gz) = 1083031
diff --git a/lang/luajit/files/patch-Makefile b/lang/luajit/files/patch-Makefile
index eebac4678922..6ec5a3b862bd 100644
--- a/lang/luajit/files/patch-Makefile
+++ b/lang/luajit/files/patch-Makefile
@@ -1,6 +1,6 @@
---- Makefile.orig 2017-05-01 14:11:00.000000000 -0400
-+++ Makefile 2017-05-03 11:14:26.850889000 -0400
-@@ -24,7 +24,7 @@
+--- Makefile.orig 2025-05-28 19:14:47 UTC
++++ Makefile
+@@ -30,7 +30,7 @@ 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!
#
@@ -9,15 +9,15 @@
export MULTILIB= lib
##############################################################################
-@@ -33,6 +33,7 @@
- INSTALL_LIB= $(DPREFIX)/$(MULTILIB)
- INSTALL_SHARE= $(DPREFIX)/share
- INSTALL_INC= $(DPREFIX)/include/luajit-$(MAJVER).$(MINVER)
+@@ -41,6 +41,7 @@ INSTALL_INC= $(INSTALL_DEFINC)
+ INSTALL_SHARE= $(DESTDIR)$(INSTALL_SHARE_)
+ INSTALL_DEFINC= $(DPREFIX)/include/luajit-$(MMVERSION)
+ INSTALL_INC= $(INSTALL_DEFINC)
+INSTALL_LIBD= $(DPREFIX)/libdata
- INSTALL_LJLIBD= $(INSTALL_SHARE)/luajit-$(VERSION)
- INSTALL_JITLIB= $(INSTALL_LJLIBD)/jit
-@@ -40,8 +41,7 @@
+ export INSTALL_LJLIBD= $(INSTALL_SHARE_)/luajit-$(MMVERSION)
+ INSTALL_JITLIB= $(DESTDIR)$(INSTALL_LJLIBD)/jit
+@@ -48,8 +49,7 @@ INSTALL_CMOD= $(INSTALL_CMODD)/$(ABIVER)
INSTALL_LMOD= $(INSTALL_LMODD)/$(ABIVER)
INSTALL_CMODD= $(INSTALL_LIB)/lua
INSTALL_CMOD= $(INSTALL_CMODD)/$(ABIVER)
@@ -27,7 +27,7 @@
INSTALL_TNAME= luajit-$(VERSION)
INSTALL_TSYMNAME= luajit
-@@ -62,8 +62,8 @@
+@@ -70,8 +70,8 @@ INSTALL_PC= $(INSTALL_PKGCONFIG)/$(INSTALL_PCNAME)
INSTALL_TSYM= $(INSTALL_BIN)/$(INSTALL_TSYMNAME)
INSTALL_PC= $(INSTALL_PKGCONFIG)/$(INSTALL_PCNAME)
@@ -35,21 +35,21 @@
- $(INSTALL_PKGCONFIG) $(INSTALL_JITLIB) $(INSTALL_LMOD) $(INSTALL_CMOD)
+INSTALL_DIRS= $(INSTALL_INC) \
+ $(INSTALL_PKGCONFIG) $(INSTALL_JITLIB)
- UNINSTALL_DIRS= $(INSTALL_JITLIB) $(INSTALL_LJLIBD) $(INSTALL_INC) \
+ UNINSTALL_DIRS= $(INSTALL_JITLIB) $(DESTDIR)$(INSTALL_LJLIBD) $(INSTALL_INC) \
$(INSTALL_LMOD) $(INSTALL_LMODD) $(INSTALL_CMOD) $(INSTALL_CMODD)
-@@ -118,10 +118,8 @@
- $(RM) $(INSTALL_TSYM) $(INSTALL_DYN) $(INSTALL_SHORT1) $(INSTALL_SHORT2)
+@@ -135,10 +135,8 @@ install: $(INSTALL_DEP)
+ $(RM) $(INSTALL_DYN) $(INSTALL_SHORT1) $(INSTALL_SHORT2)
cd src && test -f $(FILE_SO) && \
$(INSTALL_X) $(FILE_SO) $(INSTALL_DYN) && \
-- $(LDCONFIG) $(INSTALL_LIB) && \
+- ( $(LDCONFIG) $(INSTALL_LIB) || : ) && \
$(SYMLINK) $(INSTALL_SONAME) $(INSTALL_SHORT1) && \
$(SYMLINK) $(INSTALL_SONAME) $(INSTALL_SHORT2) || :
- cd etc && $(INSTALL_F) $(FILE_MAN) $(INSTALL_MAN)
cd etc && $(SED_PC) $(FILE_PC) > $(FILE_PC).tmp && \
$(INSTALL_F) $(FILE_PC).tmp $(INSTALL_PC) && \
$(RM) $(FILE_PC).tmp
-@@ -139,7 +137,6 @@
+@@ -156,7 +154,6 @@ uninstall:
for file in $(FILES_INC); do \
$(UNINSTALL) $(INSTALL_INC)/$$file; \
done
diff --git a/lang/luajit/files/patch-etc_luajit.pc b/lang/luajit/files/patch-etc_luajit.pc
index 9470bf42dd7e..8867dc0b4be8 100644
--- a/lang/luajit/files/patch-etc_luajit.pc
+++ b/lang/luajit/files/patch-etc_luajit.pc
@@ -1,6 +1,6 @@
---- etc/luajit.pc.orig 2017-05-03 11:00:21.130353000 -0400
-+++ etc/luajit.pc 2017-05-03 11:00:54.763566000 -0400
-@@ -21,5 +21,5 @@
+--- etc/luajit.pc.orig 2019-06-26 21:12:49 UTC
++++ etc/luajit.pc
+@@ -21,5 +21,5 @@ URL: http://luajit.org
Version: ${version}
Requires:
Libs: -L${libdir} -l${libname}
diff --git a/lang/luajit-devel/files/patch-src_Makefile b/lang/luajit/files/patch-src_Makefile
index ef9c346256f2..ef9c346256f2 100644
--- a/lang/luajit-devel/files/patch-src_Makefile
+++ b/lang/luajit/files/patch-src_Makefile
diff --git a/lang/luajit/files/patch-src_jit_bcsave.lua b/lang/luajit/files/patch-src_jit_bcsave.lua
deleted file mode 100644
index af087ea121a1..000000000000
--- a/lang/luajit/files/patch-src_jit_bcsave.lua
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/jit/bcsave.lua.orig 2017-05-01 18:11:00 UTC
-+++ src/jit/bcsave.lua
-@@ -275,7 +275,7 @@ typedef struct {
- o.sect[2].size = fofs(ofs)
- o.sect[3].type = f32(3) -- .strtab
- o.sect[3].ofs = fofs(sofs + ofs)
-- o.sect[3].size = fofs(#symname+1)
-+ o.sect[3].size = fofs(#symname+2)
- ffi.copy(o.space+ofs+1, symname)
- ofs = ofs + #symname + 2
- o.sect[4].type = f32(1) -- .rodata
diff --git a/lang/luajit-devel/files/patch-src_lj__ccallback.c b/lang/luajit/files/patch-src_lj__ccallback.c
index 40d0cc76b15b..40d0cc76b15b 100644
--- a/lang/luajit-devel/files/patch-src_lj__ccallback.c
+++ b/lang/luajit/files/patch-src_lj__ccallback.c
diff --git a/lang/luajit-devel/files/patch-src_lj__prng.c b/lang/luajit/files/patch-src_lj__prng.c
index 0a83880e65d7..0a83880e65d7 100644
--- a/lang/luajit-devel/files/patch-src_lj__prng.c
+++ b/lang/luajit/files/patch-src_lj__prng.c
diff --git a/lang/luajit/pkg-plist b/lang/luajit/pkg-plist
index 17f6e4424958..7d9ff63be460 100644
--- a/lang/luajit/pkg-plist
+++ b/lang/luajit/pkg-plist
@@ -1,25 +1,33 @@
bin/luajit
-bin/luajit-%%VERSION%%
-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
+bin/luajit-%%SOVERSION%%
+include/luajit-%%VERSION%%/lauxlib.h
+include/luajit-%%VERSION%%/lua.h
+include/luajit-%%VERSION%%/lua.hpp
+include/luajit-%%VERSION%%/luaconf.h
+include/luajit-%%VERSION%%/luajit.h
+include/luajit-%%VERSION%%/lualib.h
lib/libluajit-5.1.a
lib/libluajit-5.1.so
lib/libluajit-5.1.so.2
-lib/libluajit-5.1.so.%%VERSION%%
+lib/libluajit-5.1.so.%%SOVERSION%%
libdata/pkgconfig/luajit.pc
-share/luajit-%%VERSION%%/jit/bc.lua
-share/luajit-%%VERSION%%/jit/bcsave.lua
-share/luajit-%%VERSION%%/jit/dis_arm.lua
-share/luajit-%%VERSION%%/jit/dis_mips.lua
-share/luajit-%%VERSION%%/jit/dis_mipsel.lua
-share/luajit-%%VERSION%%/jit/dis_ppc.lua
-share/luajit-%%VERSION%%/jit/dis_x64.lua
-share/luajit-%%VERSION%%/jit/dis_x86.lua
-share/luajit-%%VERSION%%/jit/dump.lua
-share/luajit-%%VERSION%%/jit/v.lua
-share/luajit-%%VERSION%%/jit/vmdef.lua
share/man/man1/luajit.1.gz
+%%DATADIR%%-%%VERSION%%/jit/bc.lua
+%%DATADIR%%-%%VERSION%%/jit/bcsave.lua
+%%DATADIR%%-%%VERSION%%/jit/dis_arm.lua
+%%DATADIR%%-%%VERSION%%/jit/dis_arm64.lua
+%%DATADIR%%-%%VERSION%%/jit/dis_arm64be.lua
+%%DATADIR%%-%%VERSION%%/jit/dis_mips.lua
+%%DATADIR%%-%%VERSION%%/jit/dis_mips64.lua
+%%DATADIR%%-%%VERSION%%/jit/dis_mips64el.lua
+%%DATADIR%%-%%VERSION%%/jit/dis_mips64r6.lua
+%%DATADIR%%-%%VERSION%%/jit/dis_mips64r6el.lua
+%%DATADIR%%-%%VERSION%%/jit/dis_mipsel.lua
+%%DATADIR%%-%%VERSION%%/jit/dis_ppc.lua
+%%DATADIR%%-%%VERSION%%/jit/dis_x64.lua
+%%DATADIR%%-%%VERSION%%/jit/dis_x86.lua
+%%DATADIR%%-%%VERSION%%/jit/dump.lua
+%%DATADIR%%-%%VERSION%%/jit/p.lua
+%%DATADIR%%-%%VERSION%%/jit/v.lua
+%%DATADIR%%-%%VERSION%%/jit/vmdef.lua
+%%DATADIR%%-%%VERSION%%/jit/zone.lua
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-30 10:30:39 +0000