diff --git a/lang/luajit-devel/Makefile b/lang/luajit-devel/Makefile index 3dafc66c1798..597fd3a45afa 100644 --- a/lang/luajit-devel/Makefile +++ b/lang/luajit-devel/Makefile @@ -1,37 +1,37 @@ PORTNAME= luajit -DISTVERSION= 2.1.0.20250407 +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:e0a7ea8 +GH_TUPLE= LuaJIT:LuaJIT:f9140a6 LUAJIT_VERSION= 2.1 -LUAJIT_SOVERSION= 2.1.1744014795 +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 diff --git a/lang/luajit-devel/distinfo b/lang/luajit-devel/distinfo index 58bdd35b89a6..a7daefeea90e 100644 --- a/lang/luajit-devel/distinfo +++ b/lang/luajit-devel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1744041824 -SHA256 (LuaJIT-LuaJIT-2.1.0.20250407-e0a7ea8_GH0.tar.gz) = 78a37088ca83a10740f800ea8f665e6096b373164760c915cb287cca6c023962 -SIZE (LuaJIT-LuaJIT-2.1.0.20250407-e0a7ea8_GH0.tar.gz) = 1082733 +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 index a71763214b43..6ec5a3b862bd 100644 --- a/lang/luajit-devel/files/patch-Makefile +++ b/lang/luajit-devel/files/patch-Makefile @@ -1,59 +1,59 @@ ---- Makefile.orig 2024-11-14 11:21:00.000000000 -0500 -+++ Makefile 2024-11-25 11:34:57.220071000 -0500 -@@ -30,7 +30,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! # -export PREFIX= /usr/local +#export PREFIX= /usr/local export MULTILIB= lib ############################################################################## -@@ -41,6 +41,7 @@ +@@ -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 @@ +@@ -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 @@ +@@ -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 @@ +@@ -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 @@ +@@ -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) ===="