summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey A. Osokin <osa@FreeBSD.org>2025-07-08 23:01:33 -0400
committerSergey A. Osokin <osa@FreeBSD.org>2025-07-08 23:05:09 -0400
commit0af0578acb3569d34267bd71195c86f74e75a6af (patch)
treed36e70136342489c7aa3e659aa63c5084dfa9d6b
parentmisc/py-instructor: update to 1.9.2 (diff)
lang/luajit: update to v2.1
Disconnect lang/luajit-devel from the build, will be removed soon. Bump PORTREVISIONs for the consumers. Discussed with: adamw PR: 225342
-rw-r--r--Mk/Uses/luajit.mk6
-rw-r--r--Mk/bsd.default-versions.mk6
-rw-r--r--audio/csound/Makefile2
-rw-r--r--benchmarks/sysbench/Makefile2
-rw-r--r--benchmarks/wrk/Makefile4
-rw-r--r--converters/osm2pgsql/Makefile1
-rw-r--r--devel/efl/Makefile2
-rw-r--r--devel/love/Makefile1
-rw-r--r--devel/love10/Makefile2
-rw-r--r--devel/lua-luarocks/Makefile1
-rw-r--r--devel/luv/Makefile1
-rw-r--r--devel/xmake-io/Makefile1
-rw-r--r--dns/dnsdist/Makefile1
-rw-r--r--dns/dnsjit/Makefile1
-rw-r--r--dns/knot-resolver/Makefile1
-rw-r--r--dns/powerdns-recursor/Makefile2
-rw-r--r--dns/powerdns/Makefile2
-rw-r--r--editors/neovim/Makefile1
-rw-r--r--editors/pragtical/Makefile1
-rw-r--r--games/freeminer/Makefile2
-rw-r--r--games/instead/Makefile1
-rw-r--r--games/naev/Makefile2
-rw-r--r--games/openmw/Makefile1
-rw-r--r--games/powder-toy-devel/Makefile1
-rw-r--r--games/powder-toy/Makefile1
-rw-r--r--games/solarus-quest-editor/Makefile1
-rw-r--r--games/solarus/Makefile1
-rw-r--r--graphics/gimp3-app/Makefile2
-rw-r--r--lang/Makefile1
-rw-r--r--lang/emilua/Makefile3
-rw-r--r--lang/luajit/Makefile36
-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_Makefile29
-rw-r--r--lang/luajit/files/patch-src_jit_bcsave.lua11
-rw-r--r--lang/luajit/files/patch-src_lj__ccallback.c10
-rw-r--r--lang/luajit/files/patch-src_lj__prng.c18
-rw-r--r--lang/luajit/pkg-plist46
-rw-r--r--mail/rspamd-devel/Makefile2
-rw-r--r--mail/rspamd/Makefile1
-rw-r--r--math/cantor/Makefile1
-rw-r--r--misc/xplr/Makefile2
-rw-r--r--multimedia/arcan/Makefile1
-rw-r--r--multimedia/mpv/Makefile2
-rw-r--r--multimedia/obs-studio/Makefile2
-rw-r--r--net/kamailio/Makefile2
-rw-r--r--security/snort/Makefile2
-rw-r--r--security/snort3/Makefile1
-rw-r--r--security/suricata/Makefile2
-rw-r--r--sysutils/fluent-bit/Makefile3
-rw-r--r--www/apache24/Makefile2
-rw-r--r--www/luakit-devel/Makefile2
-rw-r--r--www/luakit/Makefile1
-rw-r--r--www/nift/Makefile1
-rw-r--r--www/trafficserver/Makefile1
56 files changed, 168 insertions, 110 deletions
diff --git a/Mk/Uses/luajit.mk b/Mk/Uses/luajit.mk
index c7a15b191209..7e62c192fd77 100644
--- a/Mk/Uses/luajit.mk
+++ b/Mk/Uses/luajit.mk
@@ -7,7 +7,7 @@
# 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)
+# (always 2.1)
.if !defined(_INCLUDE_USES_LUAJIT_MK)
_INCLUDE_USES_LUAJIT_MK=yes
@@ -28,11 +28,7 @@ IGNORE= Invalid luajit default version ${LUAJIT_DEFAULT}: valid versions are ${V
IGNORE= Invalid luajit version ${LUAJIT_VER}: valid versions are ${VALID_LUAJIT_VER}
.endif
-.if ${LUAJIT_VER} == luajit
-LUAJIT_LUAVER= 2.0
-.else
LUAJIT_LUAVER= 2.1
-.endif
LIB_DEPENDS+= libluajit-5.1.so:lang/${LUAJIT_VER}
LUAJIT_INCDIR= ${LOCALBASE}/include/luajit-${LUAJIT_LUAVER}
diff --git a/Mk/bsd.default-versions.mk b/Mk/bsd.default-versions.mk
index 549ad04fd4c1..51529a07afcb 100644
--- a/Mk/bsd.default-versions.mk
+++ b/Mk/bsd.default-versions.mk
@@ -98,11 +98,7 @@ LLVM_DEFAULT?= 19
# Possible values: 5.1, 5.2, 5.3, 5.4
LUA_DEFAULT?= 5.4
# Possible values: luajit, luajit-devel, luajit-openresty
-. if ${ARCH:Mpowerpc64*}
-LUAJIT_DEFAULT?= luajit-openresty
-. else
-LUAJIT_DEFAULT?= luajit-devel
-. endif
+LUAJIT_DEFAULT?= luajit
# Possible values: 5.10, 5.20, 6.8
MONO_DEFAULT?= 5.20
# Possible values: 8.0, 8.4, 9.1, 10.5m, 10.6m, 10.11m, 11.4m
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 52e58869a408..8e84536c6cd2 100644
--- a/benchmarks/wrk/Makefile
+++ b/benchmarks/wrk/Makefile
@@ -1,6 +1,6 @@
PORTNAME= wrk
PORTVERSION= 4.2.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= benchmarks www
MAINTAINER= osa@FreeBSD.org
@@ -26,7 +26,7 @@ USE_CSTD= c99
LLD_UNSAFE= yes
.if ${FLAVOR} == luajit
CFLAGS+= -I${LOCALBASE}/include/luajit-2.1
-LIB_DEPENDS= libluajit-5.1.so:lang/luajit-devel
+LIB_DEPENDS= libluajit-5.1.so:lang/luajit
.else
CFLAGS+= -I${LOCALBASE}/include/luajit-2.1
LIB_DEPENDS= libluajit-5.1.so:lang/luajit-openresty
diff --git a/converters/osm2pgsql/Makefile b/converters/osm2pgsql/Makefile
index eba0c38f74b7..5ddb752c9981 100644
--- a/converters/osm2pgsql/Makefile
+++ b/converters/osm2pgsql/Makefile
@@ -1,5 +1,6 @@
PORTNAME= osm2pgsql
PORTVERSION= 2.1.1
+PORTREVISION= 1
CATEGORIES= converters geography
MAINTAINER= amdmi3@FreeBSD.org
diff --git a/devel/efl/Makefile b/devel/efl/Makefile
index cf7fcb850ac0..10203eb167ff 100644
--- a/devel/efl/Makefile
+++ b/devel/efl/Makefile
@@ -1,6 +1,6 @@
PORTNAME= efl
DISTVERSION= 1.28.1
-PORTREVISION= 2
+PORTREVISION= 3
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 de37c60a28bf..45428803dfbf 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/ \
https://mirror.amdmi3.ru/distfiles/
diff --git a/devel/lua-luarocks/Makefile b/devel/lua-luarocks/Makefile
index 96794e21bd4b..467a4c8a6fc6 100644
--- a/devel/lua-luarocks/Makefile
+++ b/devel/lua-luarocks/Makefile
@@ -1,5 +1,6 @@
PORTNAME= luarocks
PORTVERSION= 3.12.2
+PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= https://luarocks.org/releases/
PKGNAMEPREFIX= ${LUA_PKGNAMEPREFIX}
diff --git a/devel/luv/Makefile b/devel/luv/Makefile
index 60ac92875958..04b53272e576 100644
--- a/devel/luv/Makefile
+++ b/devel/luv/Makefile
@@ -1,6 +1,7 @@
PORTNAME= luv
#DISTVERSIONPREFIX= v
DISTVERSION= 1.51.0-1
+PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= https://github.com/luvit/${PORTNAME}/releases/download/${DISTVERSION}/
diff --git a/devel/xmake-io/Makefile b/devel/xmake-io/Makefile
index 20a976b7f8c3..47fdb4d099ab 100644
--- a/devel/xmake-io/Makefile
+++ b/devel/xmake-io/Makefile
@@ -1,6 +1,7 @@
PORTNAME= xmake-io
DISTVERSIONPREFIX= v
DISTVERSION= 2.9.9
+PORTREVISION= 1
CATEGORIES= devel
MAINTAINER= pericycle.cc@gmail.com
diff --git a/dns/dnsdist/Makefile b/dns/dnsdist/Makefile
index 19937d5c6420..6a6b878b4494 100644
--- a/dns/dnsdist/Makefile
+++ b/dns/dnsdist/Makefile
@@ -1,5 +1,6 @@
PORTNAME= dnsdist
DISTVERSION= 1.9.10
+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 9808488e9eee..5882e8190f7f 100644
--- a/dns/knot-resolver/Makefile
+++ b/dns/knot-resolver/Makefile
@@ -1,5 +1,6 @@
PORTNAME= knot-resolver
DISTVERSION= 5.7.5
+PORTREVISION= 1
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 fab4f26f26a8..9d1c4520267d 100644
--- a/dns/powerdns-recursor/Makefile
+++ b/dns/powerdns-recursor/Makefile
@@ -1,6 +1,6 @@
PORTNAME= recursor
DISTVERSION= 5.2.2
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= dns
MASTER_SITES= https://downloads.powerdns.com/releases/
PKGNAMEPREFIX= powerdns-
diff --git a/dns/powerdns/Makefile b/dns/powerdns/Makefile
index b9005c0ea599..16bdebbae8af 100644
--- a/dns/powerdns/Makefile
+++ b/dns/powerdns/Makefile
@@ -1,6 +1,6 @@
PORTNAME= powerdns
DISTVERSION= 4.9.5
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= dns
MASTER_SITES= https://downloads.powerdns.com/releases/
DISTNAME= pdns-${DISTVERSION}
diff --git a/editors/neovim/Makefile b/editors/neovim/Makefile
index 76b409d71449..bd6397170323 100644
--- a/editors/neovim/Makefile
+++ b/editors/neovim/Makefile
@@ -1,6 +1,7 @@
PORTNAME= neovim
DISTVERSIONPREFIX= v
DISTVERSION= 0.11.2
+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 e41505574f3b..bbea8d80f369 100644
--- a/games/naev/Makefile
+++ b/games/naev/Makefile
@@ -1,6 +1,6 @@
PORTNAME= naev
PORTVERSION= 0.12.4
-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 07996735825b..fbd17c143ac4 100644
--- a/games/openmw/Makefile
+++ b/games/openmw/Makefile
@@ -1,6 +1,7 @@
PORTNAME= openmw
DISTVERSIONPREFIX= openmw-
DISTVERSION= 0.49.0
+PORTREVISION= 1
CATEGORIES= games
MAINTAINER= fluffy@FreeBSD.org
diff --git a/games/powder-toy-devel/Makefile b/games/powder-toy-devel/Makefile
index 43e3545bdcf9..f5b9a6bc05f4 100644
--- a/games/powder-toy-devel/Makefile
+++ b/games/powder-toy-devel/Makefile
@@ -1,5 +1,6 @@
PORTNAME= powder-toy
DISTVERSION= snapshot-387
+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 5441600e6f4c..a8ab05921bf4 100644
--- a/games/solarus-quest-editor/Makefile
+++ b/games/solarus-quest-editor/Makefile
@@ -1,5 +1,6 @@
PORTNAME= solarus-quest-editor
PORTVERSION= 2.0.0
+PORTREVISION= 1
DISTVERSIONPREFIX= v
CATEGORIES= games
diff --git a/games/solarus/Makefile b/games/solarus/Makefile
index 1f287ea7c45e..9e75e8333d8f 100644
--- a/games/solarus/Makefile
+++ b/games/solarus/Makefile
@@ -1,5 +1,6 @@
PORTNAME= solarus
PORTVERSION= 2.0.0
+PORTREVISION= 1
DISTVERSIONPREFIX= v
CATEGORIES= games
diff --git a/graphics/gimp3-app/Makefile b/graphics/gimp3-app/Makefile
index 5cfd19b7bf98..4f8b58cd719c 100644
--- a/graphics/gimp3-app/Makefile
+++ b/graphics/gimp3-app/Makefile
@@ -1,6 +1,6 @@
PORTNAME= gimp
DISTVERSION= 3.0.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES?= graphics gnome
MASTER_SITES= GIMP/gimp/v${PORTVERSION:R}
PKGNAMESUFFIX= 3-app
diff --git a/lang/Makefile b/lang/Makefile
index 4246634f39f0..f7c0932f1099 100644
--- a/lang/Makefile
+++ b/lang/Makefile
@@ -183,7 +183,6 @@
SUBDIR += lua53
SUBDIR += lua54
SUBDIR += luajit
- SUBDIR += luajit-devel
SUBDIR += luajit-openresty
SUBDIR += malbolge
SUBDIR += maude
diff --git a/lang/emilua/Makefile b/lang/emilua/Makefile
index 0feda3770898..6739ddb2e170 100644
--- a/lang/emilua/Makefile
+++ b/lang/emilua/Makefile
@@ -1,6 +1,7 @@
PORTNAME= emilua
DISTVERSIONPREFIX= v
DISTVERSION= 0.11.5
+PORTREVISION= 2
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:luajit meson ncurses pathfix \
pkgconfig ssl
USE_GITLAB= yes
diff --git a/lang/luajit/Makefile b/lang/luajit/Makefile
index 85e695a309e1..16c690d97959 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.20250528
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)
+IGNORE_riscv64= fails to compile: lj_arch.h:73:2: No support for this architecture (yet)
+
+USES= compiler cpe gmake
CONFLICTS_INSTALL= luajit-devel luajit-openresty
-WRKSRC= ${WRKDIR}/LuaJIT-${DISTVERSION}
-USES= compiler cpe gmake
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:f9140a6
-.include <bsd.port.pre.mk>
+LUAJIT_VERSION= 2.1
+LUAJIT_SOVERSION= 2.1.1748459687
-.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..a7daefeea90e 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 = 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/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/files/patch-src_Makefile b/lang/luajit/files/patch-src_Makefile
new file mode 100644
index 000000000000..ef9c346256f2
--- /dev/null
+++ b/lang/luajit/files/patch-src_Makefile
@@ -0,0 +1,29 @@
+--- src/Makefile.orig 2024-10-02 11:59:42 UTC
++++ src/Makefile
+@@ -23,7 +23,7 @@ NODOTABIVER= 51
+ # removing the '#' in front of them. Make sure you force a full recompile
+ # with "make clean", followed by "make" if you change any options.
+ #
+-DEFAULT_CC = gcc
++DEFAULT_CC = cc
+ #
+ # LuaJIT builds as a native 32 or 64 bit binary by default.
+ CC= $(DEFAULT_CC)
+@@ -35,7 +35,7 @@ CC= $(DEFAULT_CC)
+ # to slow down the C part by not omitting it. Debugging, tracebacks and
+ # unwinding are not affected -- the assembler part has frame unwind
+ # information and GCC emits it where needed (x64) or with -g (see CCDEBUG).
+-CCOPT= -O2 -fomit-frame-pointer
++#CCOPT= -O2 -fomit-frame-pointer
+ # Use this if you want to generate a smaller binary (but it's slower):
+ #CCOPT= -Os -fomit-frame-pointer
+ # Note: it's no longer recommended to use -O3 with GCC 4.x.
+@@ -46,7 +46,7 @@ CCOPT= -O2 -fomit-frame-pointer
+ # x86/x64 only: For GCC 4.2 or higher and if you don't intend to distribute
+ # the binaries to a different machine you could also use: -march=native
+ #
+-CCOPT_x86= -march=i686 -msse -msse2 -mfpmath=sse
++#CCOPT_x86= -march=i686 -msse -msse2 -mfpmath=sse
+ CCOPT_x64=
+ CCOPT_arm=
+ CCOPT_arm64=
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/files/patch-src_lj__ccallback.c b/lang/luajit/files/patch-src_lj__ccallback.c
new file mode 100644
index 000000000000..40d0cc76b15b
--- /dev/null
+++ b/lang/luajit/files/patch-src_lj__ccallback.c
@@ -0,0 +1,10 @@
+--- src/lj_ccallback.c.orig 2020-10-28 11:55:44 UTC
++++ src/lj_ccallback.c
+@@ -20,6 +20,7 @@
+ #include "lj_mcode.h"
+ #include "lj_trace.h"
+ #include "lj_vm.h"
++#include "lualib.h"
+
+ /* -- Target-specific handling of callback slots -------------------------- */
+
diff --git a/lang/luajit/files/patch-src_lj__prng.c b/lang/luajit/files/patch-src_lj__prng.c
new file mode 100644
index 000000000000..0a83880e65d7
--- /dev/null
+++ b/lang/luajit/files/patch-src_lj__prng.c
@@ -0,0 +1,18 @@
+--- src/lj_prng.c.orig 2024-10-02 11:59:42 UTC
++++ src/lj_prng.c
+@@ -113,6 +113,7 @@ static PRGR libfunc_rgr;
+ #include <sys/syscall.h>
+ #else
+
++#ifndef LJ_TARGET_HAS_GETENTROPY
+ #if LJ_TARGET_OSX && !LJ_TARGET_IOS
+ /*
+ ** In their infinite wisdom Apple decided to disallow getentropy() in the
+@@ -124,6 +125,7 @@ static PRGR libfunc_rgr;
+ #include <Availability.h>
+ #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200
+ #define LJ_TARGET_HAS_GETENTROPY 1
++#endif
+ #endif
+ #elif (LJ_TARGET_BSD && !defined(__NetBSD__)) || LJ_TARGET_SOLARIS || LJ_TARGET_CYGWIN || LJ_TARGET_QNX
+ #define LJ_TARGET_HAS_GETENTROPY 1
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 9b7a844dbecd..bc11a6b11422 100644
--- a/mail/rspamd/Makefile
+++ b/mail/rspamd/Makefile
@@ -1,5 +1,6 @@
PORTNAME= rspamd
PORTVERSION= 3.12.1
+PORTREVISION= 1
CATEGORIES= mail
MAINTAINER= vsevolod@FreeBSD.org
diff --git a/math/cantor/Makefile b/math/cantor/Makefile
index c5a8629aeb7f..f71fc0ad3913 100644
--- a/math/cantor/Makefile
+++ b/math/cantor/Makefile
@@ -1,5 +1,6 @@
PORTNAME= cantor
DISTVERSION= ${KDE_APPLICATIONS_VERSION}
+PORTREVISION= 1
CATEGORIES= math kde kde-applications
MAINTAINER= kde@FreeBSD.org
diff --git a/misc/xplr/Makefile b/misc/xplr/Makefile
index 5666d66add8a..19fdd19060a3 100644
--- a/misc/xplr/Makefile
+++ b/misc/xplr/Makefile
@@ -1,7 +1,7 @@
PORTNAME= xplr
DISTVERSIONPREFIX= v
DISTVERSION= 0.21.9
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= misc
MAINTAINER= lcook@FreeBSD.org
diff --git a/multimedia/arcan/Makefile b/multimedia/arcan/Makefile
index b55d3a7c5e9b..2e1cfaaa9623 100644
--- a/multimedia/arcan/Makefile
+++ b/multimedia/arcan/Makefile
@@ -1,5 +1,6 @@
PORTNAME= arcan
DISTVERSION= 0.7.0.1
+PORTREVISION= 1
CATEGORIES= multimedia
MAINTAINER= hoanga@gmail.com
diff --git a/multimedia/mpv/Makefile b/multimedia/mpv/Makefile
index c65c5d00067c..8e10172157b4 100644
--- a/multimedia/mpv/Makefile
+++ b/multimedia/mpv/Makefile
@@ -1,7 +1,7 @@
PORTNAME= mpv
DISTVERSIONPREFIX= v
DISTVERSION= 0.40.0
-PORTREVISION= 2
+PORTREVISION= 3
PORTEPOCH= 1
CATEGORIES= multimedia audio
diff --git a/multimedia/obs-studio/Makefile b/multimedia/obs-studio/Makefile
index 76af6a21a134..dbec0b803603 100644
--- a/multimedia/obs-studio/Makefile
+++ b/multimedia/obs-studio/Makefile
@@ -1,6 +1,6 @@
PORTNAME= obs-studio
DISTVERSION= 31.0.3
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= multimedia
PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
diff --git a/net/kamailio/Makefile b/net/kamailio/Makefile
index 1490619a9b43..e5e368116023 100644
--- a/net/kamailio/Makefile
+++ b/net/kamailio/Makefile
@@ -1,6 +1,6 @@
PORTNAME= kamailio
DISTVERSION= 6.0.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net
MASTER_SITES= http://www.kamailio.org/pub/kamailio/${PORTVERSION}/src/
DISTNAME= ${PORTNAME}-${DISTVERSION}_src
diff --git a/security/snort/Makefile b/security/snort/Makefile
index faf03f706b9b..87d65b106b18 100644
--- a/security/snort/Makefile
+++ b/security/snort/Makefile
@@ -1,6 +1,6 @@
PORTNAME= snort
PORTVERSION= 2.9.20
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= security
MASTER_SITES= https://snort.org/downloads/snort/ \
https://snort.org/downloads/archive/snort/
diff --git a/security/snort3/Makefile b/security/snort3/Makefile
index 59912933c61c..6c19698e3065 100644
--- a/security/snort3/Makefile
+++ b/security/snort3/Makefile
@@ -1,5 +1,6 @@
PORTNAME= snort
DISTVERSION= 3.9.1.0
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= security
PKGNAMESUFFIX= 3
diff --git a/security/suricata/Makefile b/security/suricata/Makefile
index 67bc1d7768e7..4e675be507fa 100644
--- a/security/suricata/Makefile
+++ b/security/suricata/Makefile
@@ -1,6 +1,6 @@
PORTNAME= suricata
DISTVERSION= 7.0.10
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= security
MASTER_SITES= https://www.openinfosecfoundation.org/download/
diff --git a/sysutils/fluent-bit/Makefile b/sysutils/fluent-bit/Makefile
index 596baea7aedd..9b90c5d6a2a5 100644
--- a/sysutils/fluent-bit/Makefile
+++ b/sysutils/fluent-bit/Makefile
@@ -1,6 +1,7 @@
PORTNAME= fluent-bit
DISTVERSIONPREFIX= v
DISTVERSION= 4.0.3
+PORTREVISION= 2
CATEGORIES= sysutils
MAINTAINER= girgen@FreeBSD.org
@@ -27,7 +28,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: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 7ce75c1927d0..d5a193c871dd 100644
--- a/www/apache24/Makefile
+++ b/www/apache24/Makefile
@@ -1,6 +1,6 @@
PORTNAME= apache24
PORTVERSION= 2.4.63
-PORTREVISION= 1
+PORTREVISION= 2
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}