diff --git a/lang/luajit-openresty/Makefile b/lang/luajit-openresty/Makefile index 80c135e92b91..2c611932ebb6 100644 --- a/lang/luajit-openresty/Makefile +++ b/lang/luajit-openresty/Makefile @@ -1,46 +1,48 @@ PORTNAME= luajit DISTVERSIONPREFIX= v -DISTVERSION= 2.1-20220411 +DISTVERSION= 2.1-20220915 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.0-beta3 LUAJIT_SOVERSION= 2.1.0 PLIST_SUB+= VERSION=${LUAJIT_VERSION} SOVERSION=${LUAJIT_SOVERSION} .include .if ${ARCH:Mpowerpc*} || ${ARCH:Mmips*} USE_GCC=yes .endif post-install: + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}-${LUAJIT_VERSION} + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libluajit-5.1.so.${LUAJIT_SOVERSION} ${LN} -sf ${PORTNAME}-${LUAJIT_VERSION} \ ${STAGEDIR}${PREFIX}/bin/${PORTNAME} ${INSTALL_MAN} ${WRKSRC}/etc/luajit.1 ${STAGEDIR}${MAN1PREFIX}/man/man1 .include diff --git a/lang/luajit-openresty/distinfo b/lang/luajit-openresty/distinfo index 3c64b20b5ec5..25c541075d50 100644 --- a/lang/luajit-openresty/distinfo +++ b/lang/luajit-openresty/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1649706479 -SHA256 (openresty-luajit2-v2.1-20220411_GH0.tar.gz) = d3f2c870f8f88477b01726b32accab30f6e5d57ae59c5ec87374ff73d0794316 -SIZE (openresty-luajit2-v2.1-20220411_GH0.tar.gz) = 1141007 +TIMESTAMP = 1665676839 +SHA256 (openresty-luajit2-v2.1-20220915_GH0.tar.gz) = a6104d4fa342d864ae00cb3313b07091af02dc61294b1d8fce1e17779998b497 +SIZE (openresty-luajit2-v2.1-20220915_GH0.tar.gz) = 1143798 diff --git a/lang/luajit-openresty/files/patch-Makefile b/lang/luajit-openresty/files/patch-Makefile index c3e37d347c2d..44b8ac5a3f64 100644 --- a/lang/luajit-openresty/files/patch-Makefile +++ b/lang/luajit-openresty/files/patch-Makefile @@ -1,59 +1,59 @@ ---- Makefile.orig 2019-06-26 21:12:49 UTC +--- Makefile.orig 2022-10-13 16:02:11 UTC +++ Makefile @@ -25,7 +25,7 @@ ABIVER= 5.1 # 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 ############################################################################## -@@ -34,6 +34,7 @@ INSTALL_BIN= $(DPREFIX)/bin - INSTALL_LIB= $(DPREFIX)/$(MULTILIB) +@@ -35,6 +35,7 @@ INSTALL_LIB= $(DPREFIX)/$(MULTILIB) INSTALL_SHARE= $(DPREFIX)/share - INSTALL_INC= $(DPREFIX)/include/luajit-$(MAJVER).$(MINVER) + INSTALL_DEFINC= $(DPREFIX)/include/luajit-$(MAJVER).$(MINVER) + INSTALL_INC= $(INSTALL_DEFINC) +INSTALL_LIBD= $(DPREFIX)/libdata INSTALL_LJLIBD= $(INSTALL_SHARE)/luajit-$(VERSION) INSTALL_JITLIB= $(INSTALL_LJLIBD)/jit -@@ -41,8 +42,7 @@ INSTALL_LMODD= $(INSTALL_SHARE)/lua +@@ -42,8 +43,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_PKGCONFIG= $(INSTALL_LIB)/pkgconfig +INSTALL_PKGCONFIG= $(INSTALL_LIBD)/pkgconfig INSTALL_TNAME= luajit-$(VERSION) INSTALL_TSYMNAME= luajit -@@ -63,8 +63,8 @@ INSTALL_T= $(INSTALL_BIN)/$(INSTALL_TNAME) +@@ -64,8 +64,8 @@ INSTALL_T= $(INSTALL_BIN)/$(INSTALL_TNAME) 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) \ $(INSTALL_LMOD) $(INSTALL_LMODD) $(INSTALL_CMOD) $(INSTALL_CMODD) -@@ -121,10 +121,8 @@ install: $(INSTALL_DEP) +@@ -125,10 +125,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 -@@ -143,7 +141,6 @@ uninstall: +@@ -147,7 +145,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) ===="