Attachment 259221 Details for Bug 225342 – [PATCH] update lang/luajit to 2.1.0.20250311

[patch] [PATCH] update lang/luajit to 2.1.0.20250311

luajit-2.1.diff (text/plain), 25.75 KB, created by Sergey A. Osokin on 2025-03-31 18:09:46 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Sergey A. Osokin

Created: 2025-03-31 18:09:46 UTC

Size: 25.75 KB

patch

obsolete

>diff --git a/Mk/Uses/luajit.mk b/Mk/Uses/luajit.mk
>index c7a15b191209..0e0fe3fa8bc7 100644
>--- a/Mk/Uses/luajit.mk
>+++ b/Mk/Uses/luajit.mk
>@@ -6,8 +6,7 @@
> # After bsd.port.options.mk or bsd.port.pre.mk, the following are set:
> #   LUAJIT_VER:    The selected luajit version
> #   LUAJIT_INCDIR: The path to luajit's header files
>-#   LUAJIT_LUAVER: Which luajit spec version is selected
>-#                  (2.0 for luajit, else 2.1)
>+#   LUAJIT_LUAVER: Which luajit spec version is selected, it's 2.1
> 
> .if !defined(_INCLUDE_USES_LUAJIT_MK)
> _INCLUDE_USES_LUAJIT_MK=yes
>@@ -29,8 +28,6 @@ IGNORE=	Invalid luajit version ${LUAJIT_VER}: valid versions are ${VALID_LUAJIT_
> .endif
> 
> .if ${LUAJIT_VER} == luajit
>-LUAJIT_LUAVER=	2.0
>-.else
> LUAJIT_LUAVER=	2.1
> .endif
> 
>diff --git a/Mk/bsd.default-versions.mk b/Mk/bsd.default-versions.mk
>index 9e231f31e1f4..5891929383a0 100644
>--- a/Mk/bsd.default-versions.mk
>+++ b/Mk/bsd.default-versions.mk
>@@ -93,11 +93,11 @@ LINUX_DEFAULT?=		c7
> LLVM_DEFAULT?=		19
> # Possible values: 5.1, 5.2, 5.3, 5.4
> LUA_DEFAULT?=		5.4
>-# Possible values: luajit, luajit-devel, luajit-openresty
>+# Possible values: luajit, luajit-openresty
> .  if ${ARCH:Mpowerpc64*}
>-LUAJIT_DEFAULT?=	luajit-openresty
>+LUAJIT_DEFAULT?=	luajit
> .  else
>-LUAJIT_DEFAULT?=	luajit-devel
>+LUAJIT_DEFAULT?=	luajit-openresty
> .  endif
> # Possible values: 5.10, 5.20, 6.8
> MONO_DEFAULT?=		5.20
>diff --git a/audio/csound/Makefile b/audio/csound/Makefile
>index eb4caaf7c139..6ef2bc24cb06 100644
>--- a/audio/csound/Makefile
>+++ b/audio/csound/Makefile
>@@ -1,6 +1,6 @@
> PORTNAME=	csound
> DISTVERSION=	6.15.0
>-PORTREVISION=	10
>+PORTREVISION=	11
> CATEGORIES=	audio lang
> 
> MAINTAINER=	yuri@FreeBSD.org
>diff --git a/benchmarks/sysbench/Makefile b/benchmarks/sysbench/Makefile
>index e0f230275ac1..4d60f28f4ebb 100644
>--- a/benchmarks/sysbench/Makefile
>+++ b/benchmarks/sysbench/Makefile
>@@ -1,6 +1,6 @@
> PORTNAME=	sysbench
> PORTVERSION=	1.0.20
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	benchmarks databases
> 
> MAINTAINER=	sunpoet@FreeBSD.org
>diff --git a/benchmarks/wrk/Makefile b/benchmarks/wrk/Makefile
>index e3cd041ad403..19be87ec37b1 100644
>--- a/benchmarks/wrk/Makefile
>+++ b/benchmarks/wrk/Makefile
>@@ -1,5 +1,6 @@
> PORTNAME=	wrk
> PORTVERSION=	4.2.0
>+PORTREVISION=	1
> CATEGORIES=	benchmarks www
> 
> MAINTAINER=	osa@FreeBSD.org
>@@ -24,7 +25,7 @@ USES=		gmake ssl
> USE_CSTD=	c99
> LLD_UNSAFE=	yes
> .if ${FLAVOR} == luajit
>-CFLAGS+=	-I${LOCALBASE}/include/luajit-2.0
>+CFLAGS+=	-I${LOCALBASE}/include/luajit-2.1
> LIB_DEPENDS=	libluajit-5.1.so:lang/luajit
> .else
> CFLAGS+=	-I${LOCALBASE}/include/luajit-2.1
>diff --git a/converters/osm2pgsql/Makefile b/converters/osm2pgsql/Makefile
>index 8edce2debdb6..239fad9f0ab0 100644
>--- a/converters/osm2pgsql/Makefile
>+++ b/converters/osm2pgsql/Makefile
>@@ -1,6 +1,6 @@
> PORTNAME=	osm2pgsql
> PORTVERSION=	2.0.1
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	converters geography
> 
> MAINTAINER=	amdmi3@FreeBSD.org
>diff --git a/devel/efl/Makefile b/devel/efl/Makefile
>index e733a9072476..cf7fcb850ac0 100644
>--- a/devel/efl/Makefile
>+++ b/devel/efl/Makefile
>@@ -1,6 +1,6 @@
> PORTNAME=	efl
> DISTVERSION=	1.28.1
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	devel enlightenment
> MASTER_SITES=	http://download.enlightenment.org/rel/libs/${PORTNAME}/
> DIST_SUBDIR=	enlightenment
>diff --git a/devel/love/Makefile b/devel/love/Makefile
>index e68868ce1642..a7ecb82b7aab 100644
>--- a/devel/love/Makefile
>+++ b/devel/love/Makefile
>@@ -1,5 +1,6 @@
> PORTNAME=	love
> PORTVERSION=	11.5
>+PORTREVISION=	1
> CATEGORIES=	devel games
> MASTER_SITES=	https://github.com/love2d/love/releases/download/${PORTVERSION}/
> DISTNAME=	${PORTNAME}-${PORTVERSION}-linux-src
>diff --git a/devel/love10/Makefile b/devel/love10/Makefile
>index 09df76ffab02..baa7bce23774 100644
>--- a/devel/love10/Makefile
>+++ b/devel/love10/Makefile
>@@ -1,6 +1,6 @@
> PORTNAME=	love
> PORTVERSION=	0.10.2
>-PORTREVISION=	5
>+PORTREVISION=	6
> CATEGORIES=	devel games
> MASTER_SITES=	https://bitbucket.org/rude/love/downloads/ \
> 		http://mirror.amdmi3.ru/distfiles/
>diff --git a/devel/lua-bitop/Makefile b/devel/lua-bitop/Makefile
>index 6b017cf228a7..4066e7a604fb 100644
>--- a/devel/lua-bitop/Makefile
>+++ b/devel/lua-bitop/Makefile
>@@ -1,6 +1,6 @@
> PORTNAME=	bitop
> PORTVERSION=	1.0.2
>-PORTREVISION=	2
>+PORTREVISION=	3
> CATEGORIES=	devel
> MASTER_SITES=	http://bitop.luajit.org/download/ \
> 		LOCAL/sunpoet
>diff --git a/devel/lua-luarocks/Makefile b/devel/lua-luarocks/Makefile
>index c9678edd4cac..57fdd86833ba 100644
>--- a/devel/lua-luarocks/Makefile
>+++ b/devel/lua-luarocks/Makefile
>@@ -1,5 +1,6 @@
> PORTNAME=	luarocks
> PORTVERSION=	3.11.1
>+PORTREVISION=	1
> CATEGORIES=	devel
> MASTER_SITES=	https://luarocks.org/releases/
> PKGNAMEPREFIX=	${LUA_PKGNAMEPREFIX}
>diff --git a/devel/luv/Makefile b/devel/luv/Makefile
>index 4de8963f3ff3..79811b48ad29 100644
>--- a/devel/luv/Makefile
>+++ b/devel/luv/Makefile
>@@ -1,6 +1,7 @@
> PORTNAME=	luv
> #DISTVERSIONPREFIX=	v
> DISTVERSION=	1.50.0-1
>+PORTREVISION=	1
> CATEGORIES=	devel
> MASTER_SITES=	https://github.com/luvit/${PORTNAME}/releases/download/${DISTVERSION}/
> 
>diff --git a/devel/tex-libtexluajit/Makefile b/devel/tex-libtexluajit/Makefile
>index b53231cafddb..69f3e7a97cac 100644
>--- a/devel/tex-libtexluajit/Makefile
>+++ b/devel/tex-libtexluajit/Makefile
>@@ -1,5 +1,6 @@
> PORTNAME=	libtexluajit
> DISTVERSION=	2.1.81742
>+PORTREVISION=	1
> CATEGORIES=	devel
> MASTER_SITES=	TEX_CTAN/systems/texlive/${TEXLIVE_YEAR}
> PKGNAMEPREFIX=	tex-
>diff --git a/devel/tex-synctex/Makefile b/devel/tex-synctex/Makefile
>index 44d86f34b538..0de2b37493c2 100644
>--- a/devel/tex-synctex/Makefile
>+++ b/devel/tex-synctex/Makefile
>@@ -1,6 +1,6 @@
> PORTNAME=	synctex
> DISTVERSION=	2.0.0
>-PORTREVISION=	5
>+PORTREVISION=	6
> CATEGORIES=	devel
> MASTER_SITES=	TEX_CTAN/systems/texlive/${TEXLIVE_YEAR}/
> PKGNAMEPREFIX=	tex-
>diff --git a/devel/xmake-io/Makefile b/devel/xmake-io/Makefile
>index 3deec8ec3459..9c5548f341d5 100644
>--- a/devel/xmake-io/Makefile
>+++ b/devel/xmake-io/Makefile
>@@ -1,6 +1,7 @@
> PORTNAME=	xmake-io
> DISTVERSIONPREFIX=	v
> DISTVERSION=	2.9.8
>+PORTREVISION=	1
> CATEGORIES=	devel
> 
> MAINTAINER=	pericycle.cc@gmail.com
>diff --git a/dns/dnsdist/Makefile b/dns/dnsdist/Makefile
>index 0f6674057944..c9b55e465991 100644
>--- a/dns/dnsdist/Makefile
>+++ b/dns/dnsdist/Makefile
>@@ -1,5 +1,6 @@
> PORTNAME=	dnsdist
> DISTVERSION=	1.9.8
>+PORTREVISION=	1
> CATEGORIES=	dns net
> MASTER_SITES=	https://downloads.powerdns.com/releases/
> 
>diff --git a/dns/dnsjit/Makefile b/dns/dnsjit/Makefile
>index 7fdf3c9f0271..34891e6d14dd 100644
>--- a/dns/dnsjit/Makefile
>+++ b/dns/dnsjit/Makefile
>@@ -1,5 +1,6 @@
> PORTNAME=	dnsjit
> DISTVERSION=	1.4.0
>+PORTREVISION=	1
> CATEGORIES=	dns net
> MASTER_SITES=	https://www.dns-oarc.net/files/${PORTNAME}/
> 
>diff --git a/dns/knot-resolver/Makefile b/dns/knot-resolver/Makefile
>index 11d9bfcf732a..4de431023645 100644
>--- a/dns/knot-resolver/Makefile
>+++ b/dns/knot-resolver/Makefile
>@@ -1,6 +1,6 @@
> PORTNAME=	knot-resolver
> DISTVERSION=	5.7.4
>-PORTREVISION=	5
>+PORTREVISION=	6
> CATEGORIES=	dns
> MASTER_SITES=	https://secure.nic.cz/files/knot-resolver/ \
> 		https://dns.company/downloads/knot-resolver/
>diff --git a/dns/powerdns-recursor/Makefile b/dns/powerdns-recursor/Makefile
>index 9239f77fc52e..418775058e68 100644
>--- a/dns/powerdns-recursor/Makefile
>+++ b/dns/powerdns-recursor/Makefile
>@@ -1,6 +1,6 @@
> PORTNAME=	recursor
> DISTVERSION=	5.2.0
>-PORTREVISION=	2
>+PORTREVISION=	3
> CATEGORIES=	dns
> MASTER_SITES=	https://downloads.powerdns.com/releases/
> PKGNAMEPREFIX=	powerdns-
>diff --git a/dns/powerdns/Makefile b/dns/powerdns/Makefile
>index 81c0c8ce327d..5c3f6c4fa3ec 100644
>--- a/dns/powerdns/Makefile
>+++ b/dns/powerdns/Makefile
>@@ -1,5 +1,6 @@
> PORTNAME=	powerdns
> DISTVERSION=	4.9.4
>+PORTREVISION=	1
> CATEGORIES=	dns
> MASTER_SITES=	https://downloads.powerdns.com/releases/
> DISTNAME=	pdns-${DISTVERSION}
>diff --git a/editors/neovim/Makefile b/editors/neovim/Makefile
>index 1f959238ba92..95a4dff544d7 100644
>--- a/editors/neovim/Makefile
>+++ b/editors/neovim/Makefile
>@@ -1,6 +1,7 @@
> PORTNAME=	neovim
> DISTVERSIONPREFIX=	v
> DISTVERSION=	0.11.0
>+PORTREVISION=	1
> CATEGORIES=	editors
> 
> MAINTAINER=	adamw@FreeBSD.org
>diff --git a/editors/pragtical/Makefile b/editors/pragtical/Makefile
>index 290d294c8830..c3b8116d2495 100644
>--- a/editors/pragtical/Makefile
>+++ b/editors/pragtical/Makefile
>@@ -1,5 +1,6 @@
> PORTNAME=	pragtical
> PORTVERSION=	3.3.1
>+PORTREVISION=	1
> DISTVERSIONPREFIX=	v
> CATEGORIES=	editors
> 
>diff --git a/games/freeminer/Makefile b/games/freeminer/Makefile
>index f5b4724e26df..ef68961efbd9 100644
>--- a/games/freeminer/Makefile
>+++ b/games/freeminer/Makefile
>@@ -1,6 +1,6 @@
> PORTNAME=	freeminer
> PORTVERSION=	0.4.10.4
>-PORTREVISION=	13
>+PORTREVISION=	14
> CATEGORIES=	games
> 
> MAINTAINER=	ports@FreeBSD.org
>diff --git a/games/instead/Makefile b/games/instead/Makefile
>index cd85d162e68c..66ca15c66a6e 100644
>--- a/games/instead/Makefile
>+++ b/games/instead/Makefile
>@@ -1,5 +1,6 @@
> PORTNAME=	instead
> PORTVERSION=	3.5.2
>+PORTREVISION=	1
> CATEGORIES=	games
> MASTER_SITES=	SF
> DISTNAME=	${PORTNAME}_${PORTVERSION}
>diff --git a/games/naev/Makefile b/games/naev/Makefile
>index 4ecaab9e9f96..f4a3e5cb9d5b 100644
>--- a/games/naev/Makefile
>+++ b/games/naev/Makefile
>@@ -1,6 +1,6 @@
> PORTNAME=	naev
> PORTVERSION=	0.11.5
>-PORTREVISION=	1
>+PORTREVISION=	2
> DISTVERSIONSUFFIX=	-source
> CATEGORIES=	games
> MASTER_SITES=	https://github.com/naev/naev/releases/download/v${PORTVERSION}/
>diff --git a/games/openmw/Makefile b/games/openmw/Makefile
>index 975bd5612dd6..63e7b0e5094d 100644
>--- a/games/openmw/Makefile
>+++ b/games/openmw/Makefile
>@@ -1,7 +1,7 @@
> PORTNAME=	openmw
> DISTVERSIONPREFIX=	openmw-
> DISTVERSION=	0.48.0
>-PORTREVISION=	7
>+PORTREVISION=	8
> CATEGORIES=	games
> 
> MAINTAINER=	fluffy@FreeBSD.org
>diff --git a/games/powder-toy-devel/Makefile b/games/powder-toy-devel/Makefile
>index ba87665f9cbc..771231b037ab 100644
>--- a/games/powder-toy-devel/Makefile
>+++ b/games/powder-toy-devel/Makefile
>@@ -1,5 +1,6 @@
> PORTNAME=	powder-toy
> DISTVERSION=	snapshot-386
>+PORTREVISION=	1
> CATEGORIES=	games
> PKGNAMESUFFIX=	-devel
> 
>diff --git a/games/powder-toy/Makefile b/games/powder-toy/Makefile
>index 25debf83bdb8..8a76b8d1fb11 100644
>--- a/games/powder-toy/Makefile
>+++ b/games/powder-toy/Makefile
>@@ -1,6 +1,7 @@
> PORTNAME=	powder-toy
> DISTVERSIONPREFIX=	v
> DISTVERSION=	99.3.384
>+PORTREVISION=	1
> CATEGORIES=	games
> 
> MAINTAINER=	amdmi3@FreeBSD.org
>diff --git a/games/solarus-quest-editor/Makefile b/games/solarus-quest-editor/Makefile
>index ec8a737c4cc4..80354c68ef55 100644
>--- a/games/solarus-quest-editor/Makefile
>+++ b/games/solarus-quest-editor/Makefile
>@@ -1,6 +1,7 @@
> PORTNAME=	solarus-quest-editor
> PORTVERSION=	1.6.5
> DISTVERSIONPREFIX=	v
>+PORTREVISION=	1
> CATEGORIES=	games
> 
> MAINTAINER=	danilo@FreeBSD.org
>diff --git a/games/solarus/Makefile b/games/solarus/Makefile
>index 390046d30430..56948f6ecfd7 100644
>--- a/games/solarus/Makefile
>+++ b/games/solarus/Makefile
>@@ -1,7 +1,7 @@
> PORTNAME=	solarus
> PORTVERSION=	1.6.5
> DISTVERSIONPREFIX=	v
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	games
> 
> MAINTAINER=	danilo@FreeBSD.org
>diff --git a/games/tome4/Makefile b/games/tome4/Makefile
>index 2968175389df..9b34dcec0250 100644
>--- a/games/tome4/Makefile
>+++ b/games/tome4/Makefile
>@@ -1,6 +1,6 @@
> PORTNAME=	tome4
> DISTVERSION?=	1.7.6
>-PORTREVISION?=	0
>+PORTREVISION?=	1
> CATEGORIES=	games
> MASTER_SITES=	https://te4.org/dl/t-engine/ \
> 		SF/lifanov-ports-distfiles/${PORTNAME}/:icons
>diff --git a/lang/emilua/Makefile b/lang/emilua/Makefile
>index 28f029f80082..7d388120543c 100644
>--- a/lang/emilua/Makefile
>+++ b/lang/emilua/Makefile
>@@ -1,6 +1,7 @@
> PORTNAME=	emilua
> DISTVERSIONPREFIX=	v
> DISTVERSION=	0.11.2
>+PORTREVISION=	1
> CATEGORIES=	lang devel
> 
> MAINTAINER=	manipuladordedados@gmail.com
>@@ -25,7 +26,7 @@ LIB_DEPENDS=	libserd-0.so:devel/serd \
> 		libsord-0.so:devel/sord \
> 		libfmt.so:devel/libfmt
> 
>-USES=		localbase luajit:luajit-devel meson ncurses pathfix \
>+USES=		localbase luajit meson ncurses pathfix \
> 		pkgconfig ssl
> USE_GITLAB=	yes
> 
>diff --git a/lang/luajit/Makefile b/lang/luajit/Makefile
>index 85e695a309e1..96c74ec9562c 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.20250311
> 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:538a821
> 
>-.include <bsd.port.pre.mk>
>+LUAJIT_VERSION=	2.1
>+LUAJIT_SOVERSION=	2.1.1741730670
> 
>-.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..62c277b48eec 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 = 1742324978
>+SHA256 (LuaJIT-LuaJIT-2.1.0.20250311-538a821_GH0.tar.gz) = 3c5ee4cad8fa9743690dd80337a62e3ad3bd31e8b4ad4b83df366bd2d497485e
>+SIZE (LuaJIT-LuaJIT-2.1.0.20250311-538a821_GH0.tar.gz) = 1082679
>diff --git a/lang/luajit/files/patch-Makefile b/lang/luajit/files/patch-Makefile
>index eebac4678922..a71763214b43 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	2024-11-14 11:21:00.000000000 -0500
>++++ Makefile	2024-11-25 11:34:57.220071000 -0500
>+@@ -30,7 +30,7 @@
>  # 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_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_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_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 @@
>+ 	$(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 @@
>  	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/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/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
>diff --git a/mail/rspamd-devel/Makefile b/mail/rspamd-devel/Makefile
>index 0157fcb059e6..925d738a9086 100644
>--- a/mail/rspamd-devel/Makefile
>+++ b/mail/rspamd-devel/Makefile
>@@ -1,6 +1,6 @@
> PORTNAME=	rspamd
> PORTVERSION=	3.11.a1.20241020
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	mail
> PKGNAMESUFFIX=	-devel
> 
>diff --git a/mail/rspamd/Makefile b/mail/rspamd/Makefile
>index 2accb51be825..38889e529fde 100644
>--- a/mail/rspamd/Makefile
>+++ b/mail/rspamd/Makefile
>@@ -1,5 +1,6 @@
> PORTNAME=	rspamd
> PORTVERSION=	3.11.1
>+PORTREVISION=	1
> CATEGORIES=	mail
> 
> MAINTAINER=	vsevolod@FreeBSD.org
>diff --git a/math/cantor/Makefile b/math/cantor/Makefile
>index d16a94eb825b..7e1ee48c4a0e 100644
>--- a/math/cantor/Makefile
>+++ b/math/cantor/Makefile
>@@ -1,6 +1,6 @@
> PORTNAME=	cantor
> DISTVERSION=	${KDE_APPLICATIONS_VERSION}
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	math kde kde-applications
> 
> MAINTAINER=	kde@FreeBSD.org
>diff --git a/misc/xplr/Makefile b/misc/xplr/Makefile
>index 0690ed89b97a..3cdde5ca5735 100644
>--- a/misc/xplr/Makefile
>+++ b/misc/xplr/Makefile
>@@ -1,7 +1,7 @@
> PORTNAME=	xplr
> DISTVERSIONPREFIX=	v
> DISTVERSION=	0.21.9
>-PORTREVISION=	2
>+PORTREVISION=	3
> CATEGORIES=	misc
> 
> MAINTAINER=	lcook@FreeBSD.org
>diff --git a/multimedia/arcan/Makefile b/multimedia/arcan/Makefile
>index 58a29119a073..aae77426239d 100644
>--- a/multimedia/arcan/Makefile
>+++ b/multimedia/arcan/Makefile
>@@ -1,5 +1,6 @@
> PORTNAME=	arcan
> DISTVERSION=	0.6.3.3
>+PORTREVISION=	1
> CATEGORIES=	multimedia
> 
> MAINTAINER=	ports@FreeBSD.org
>diff --git a/multimedia/mpv/Makefile b/multimedia/mpv/Makefile
>index 929a2d01ebc5..e5163524d184 100644
>--- a/multimedia/mpv/Makefile
>+++ b/multimedia/mpv/Makefile
>@@ -1,6 +1,7 @@
> PORTNAME=	mpv
> DISTVERSIONPREFIX=	v
> DISTVERSION=	0.40.0
>+PORTREVISION=	1
> PORTEPOCH=	1
> CATEGORIES=	multimedia audio
> 
>diff --git a/multimedia/obs-studio/Makefile b/multimedia/obs-studio/Makefile
>index 91672ae06bbe..5733f1e897a5 100644
>--- a/multimedia/obs-studio/Makefile
>+++ b/multimedia/obs-studio/Makefile
>@@ -1,6 +1,6 @@
> PORTNAME=	obs-studio
> DISTVERSION=	31.0.1
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	multimedia
> 
> MAINTAINER=	yuri@FreeBSD.org
>diff --git a/net/kamailio/Makefile b/net/kamailio/Makefile
>index e6f739d68d99..99f01bb7a6a2 100644
>--- a/net/kamailio/Makefile
>+++ b/net/kamailio/Makefile
>@@ -1,5 +1,6 @@
> PORTNAME=	kamailio
> DISTVERSION=	6.0.1
>+PORTREVISION=	1
> CATEGORIES=	net
> MASTER_SITES=	http://www.kamailio.org/pub/kamailio/${PORTVERSION}/src/
> DISTNAME=	${PORTNAME}-${DISTVERSION}_src
>diff --git a/security/snort3/Makefile b/security/snort3/Makefile
>index e5f6b803d592..82f06ffdf87a 100644
>--- a/security/snort3/Makefile
>+++ b/security/snort3/Makefile
>@@ -1,5 +1,6 @@
> PORTNAME=	snort
> DISTVERSION=	3.7.1.0
>+PORTREVISION=	1
> PORTEPOCH=	1
> CATEGORIES=	security
> PKGNAMESUFFIX=	3
>diff --git a/security/suricata/Makefile b/security/suricata/Makefile
>index 8fac68a8cfbd..c097668310ad 100644
>--- a/security/suricata/Makefile
>+++ b/security/suricata/Makefile
>@@ -1,5 +1,6 @@
> PORTNAME=	suricata
> DISTVERSION=	7.0.10
>+PORTREVISION=	1
> CATEGORIES=	security
> MASTER_SITES=	https://www.openinfosecfoundation.org/download/
> 
>diff --git a/sysutils/fluent-bit/Makefile b/sysutils/fluent-bit/Makefile
>index 3dd726caa815..c2a7deb29533 100644
>--- a/sysutils/fluent-bit/Makefile
>+++ b/sysutils/fluent-bit/Makefile
>@@ -27,7 +27,7 @@ OPTIONS_DEFINE=		LUA_FILTER PGSQL SSL
> OPTIONS_DEFAULT=	LUA_FILTER PGSQL SSL
> LUA_FILTER_DESC=	Support for modifying incoming records using Lua scripts
> 
>-LUA_FILTER_USES=	luajit:luajit-devel pkgconfig
>+LUA_FILTER_USES=	luajit pkgconfig
> LUA_FILTER_CMAKE_ON=	-DFLB_FILTER_LUA=On \
> 			-DFLB_LUAJIT=On \
> 			-DFLB_PREFER_SYSTEM_LIB_LUAJIT=On
>diff --git a/www/apache24/Makefile b/www/apache24/Makefile
>index 2de058d2e090..f44b6799f950 100644
>--- a/www/apache24/Makefile
>+++ b/www/apache24/Makefile
>@@ -1,5 +1,6 @@
> PORTNAME=	apache24
> PORTVERSION=	2.4.63
>+PORTREVISION=	1
> CATEGORIES=	www
> MASTER_SITES=	APACHE_HTTPD
> DISTNAME=	httpd-${PORTVERSION}
>diff --git a/www/luakit-devel/Makefile b/www/luakit-devel/Makefile
>index 266607eaf1be..0f025c2da7ab 100644
>--- a/www/luakit-devel/Makefile
>+++ b/www/luakit-devel/Makefile
>@@ -1,7 +1,7 @@
> PORTNAME=	luakit
> DISTVERSION=	2.3.6-7
> DISTVERSIONSUFFIX=	-g0bc0e39
>-PORTREVISION=	2
>+PORTREVISION=	3
> PORTEPOCH=	2
> CATEGORIES=	www
> PKGNAMESUFFIX=	-devel
>diff --git a/www/luakit/Makefile b/www/luakit/Makefile
>index 0445c34bce2f..be5a1d4febcf 100644
>--- a/www/luakit/Makefile
>+++ b/www/luakit/Makefile
>@@ -1,5 +1,6 @@
> PORTNAME=	luakit
> DISTVERSION=	2.4.0
>+PORTREVISION=	1
> PORTEPOCH=	1
> CATEGORIES=	www
> 
>diff --git a/www/nift/Makefile b/www/nift/Makefile
>index a3f566c78eaa..dbd897314055 100644
>--- a/www/nift/Makefile
>+++ b/www/nift/Makefile
>@@ -1,6 +1,7 @@
> PORTNAME=	nift
> DISTVERSIONPREFIX=	v
> DISTVERSION=	3.0.3
>+PORTREVISION=	1
> CATEGORIES=	www
> 
> MAINTAINER=	info@babaei.net
>diff --git a/www/trafficserver/Makefile b/www/trafficserver/Makefile
>index 6bc3995b0724..3aa5da979f6c 100644
>--- a/www/trafficserver/Makefile
>+++ b/www/trafficserver/Makefile
>@@ -1,5 +1,6 @@
> PORTNAME=	trafficserver
> DISTVERSION=	9.2.5
>+PORTREVISION=	1
> CATEGORIES=	www
> MASTER_SITES=	APACHE/${PORTNAME}
> 
>diff --git a/x11-toolkits/gtk4-layer-shell/Makefile b/x11-toolkits/gtk4-layer-shell/Makefile
>index 1f8ad52e8e4c..50d3fe5a2b63 100644
>--- a/x11-toolkits/gtk4-layer-shell/Makefile
>+++ b/x11-toolkits/gtk4-layer-shell/Makefile
>@@ -1,6 +1,7 @@
> PORTNAME=	gtk4-layer-shell
> DISTVERSIONPREFIX=	v
> DISTVERSION=	1.1.1
>+PORTREVISION=	1
> CATEGORIES=	x11-toolkits
> 
> MAINTAINER=	jbeich@FreeBSD.org

Actions: View | Diff

Attachments on bug 225342: 189934 | 191436 | 195982 | 212216 | 259221