diff --git a/lang/luajit-openresty/Makefile b/lang/luajit-openresty/Makefile index 218ca44c30b6..398cacbbd456 100644 --- a/lang/luajit-openresty/Makefile +++ b/lang/luajit-openresty/Makefile @@ -1,48 +1,48 @@ PORTNAME= luajit DISTVERSIONPREFIX= v -DISTVERSION= 2.1-20241104 +DISTVERSION= 2.1-20250117 CATEGORIES= lang PKGNAMESUFFIX= -openresty PATCH_SITES= https://github.com/openresty/luajit2/commit/ MAINTAINER= mm@FreeBSD.org COMMENT= Just-In-Time Compiler for Lua (OpenResty branch) WWW= https://github.com/openresty/luajit2 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= cpe gmake CONFLICTS_INSTALL= luajit luajit-devel USE_LDCONFIG= yes MAKE_ARGS= CC=${CC} Q= USE_GITHUB= yes GH_ACCOUNT= openresty GH_PROJECT= luajit2 LUAJIT_VERSION= 2.1 -LUAJIT_SOVERSION= 2.1.1728714540 +LUAJIT_SOVERSION= 2.1.1737090214 PLIST_SUB+= VERSION=${LUAJIT_VERSION} SOVERSION=${LUAJIT_SOVERSION} .include .if ${ARCH:Mmips*} USE_GCC=yes .endif post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}-${LUAJIT_SOVERSION} ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libluajit-5.1.so.${LUAJIT_SOVERSION} ${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-openresty/distinfo b/lang/luajit-openresty/distinfo index 04c23b32b16a..04a6bd49dc11 100644 --- a/lang/luajit-openresty/distinfo +++ b/lang/luajit-openresty/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1731368493 -SHA256 (openresty-luajit2-v2.1-20241104_GH0.tar.gz) = 197a5eb626bc9e0c19dcb025a190735ca1e23890606204bd9ef4c9828d5c4d4a -SIZE (openresty-luajit2-v2.1-20241104_GH0.tar.gz) = 1163274 +TIMESTAMP = 1738619349 +SHA256 (openresty-luajit2-v2.1-20250117_GH0.tar.gz) = 68ff3dc2cc97969f7385679da7c9ff96738aa9cc275fa6bab77316eb3340ea8e +SIZE (openresty-luajit2-v2.1-20250117_GH0.tar.gz) = 1163528 diff --git a/lang/luajit-openresty/files/patch-Makefile b/lang/luajit-openresty/files/patch-Makefile index 44b8ac5a3f64..8b38ca2a49ee 100644 --- a/lang/luajit-openresty/files/patch-Makefile +++ b/lang/luajit-openresty/files/patch-Makefile @@ -1,59 +1,59 @@ ---- Makefile.orig 2022-10-13 16:02:11 UTC +--- Makefile.orig 2025-01-17 05:03:34 UTC +++ Makefile -@@ -25,7 +25,7 @@ ABIVER= 5.1 +@@ -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 ############################################################################## -@@ -35,6 +35,7 @@ INSTALL_LIB= $(DPREFIX)/$(MULTILIB) - INSTALL_SHARE= $(DPREFIX)/share - INSTALL_DEFINC= $(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 -@@ -42,8 +43,7 @@ INSTALL_LMODD= $(INSTALL_SHARE)/lua + 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 -@@ -64,8 +64,8 @@ INSTALL_T= $(INSTALL_BIN)/$(INSTALL_TNAME) +@@ -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) $(INSTALL_LJLIBD) $(INSTALL_INC) \ + UNINSTALL_DIRS= $(INSTALL_JITLIB) $(DESTDIR)$(INSTALL_LJLIBD) $(INSTALL_INC) \ $(INSTALL_LMOD) $(INSTALL_LMODD) $(INSTALL_CMOD) $(INSTALL_CMODD) -@@ -125,10 +125,8 @@ install: $(INSTALL_DEP) +@@ -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 -@@ -147,7 +145,6 @@ uninstall: +@@ -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) ===="