net-im/ejabberd: Update to 23.06

- Add dependency on unzip
- Remove unneeded dependencies
- Handle FULLXML option which was missed
- Disable MAKE_JOBS

6 files changed, 114 insertions, 103 deletions

diff --git a/net-im/ejabberd/Makefile b/net-im/ejabberd/Makefile
index 67cd3af7bfb8..74d9c1ece057 100644
--- a/net-im/ejabberd/Makefile
+++ b/net-im/ejabberd/Makefile
@@ -1,6 +1,10 @@
 PORTNAME=	ejabberd
-PORTVERSION=	26.02
+PORTVERSION=	26.03
 CATEGORIES=	net-im
+MASTER_SITES=	https://code.jquery.com/:jquery \
+		https://github.com/twbs/bootstrap/releases/download/v5.3.8/:bootstrap
+DISTFILES=	jquery-${JQUERY_VER}.min.js:jquery \
+		bootstrap-${BOOTSTRAP_VER}-dist.zip:bootstrap
 
 MAINTAINER=	ashish@FreeBSD.org
 COMMENT=	Free and Open Source distributed fault-tolerant XMPP server
@@ -11,7 +15,8 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 BROKEN_riscv64=		fails to build: Hard-float 'd' ABI can't be used for a target that doesn't support the D instruction set extension
 
-BUILD_DEPENDS=	erlc:lang/erlang
+BUILD_DEPENDS=	erlc:lang/erlang \
+		unzip:archivers/unzip
 RUN_DEPENDS=	erl:lang/erlang
 LIB_DEPENDS=	libexpat.so:textproc/expat2 \
 		libyaml.so:textproc/libyaml \
@@ -24,6 +29,7 @@ USES=		compiler:c11 cpe gmake pkgconfig shebangfix ssl jpeg \
 
 USERS=		ejabberd
 GROUPS=		${USERS}
+EXTRACT_ONLY=	${DISTFILES:C/^.*:jquery//1:C/^.*:bootstrap//1:C/:.+$//}
 
 GNU_CONFIGURE=	yes
 GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
@@ -44,14 +50,12 @@ GH_TUPLE=	processone:p1_utils:${P1_UTILS_VER}:p1_utils/deps/p1_utils \
 		processone:p1_oauth2:${P1_OAUTH2_VER}:p1_oauth2/deps/p1_oauth2 \
 		potatosalad:erlang-jose:${JOSE_VER}:jose/deps/jose \
 		processone:eimp:${EIMP_VER}:eimp/deps/eimp \
-		dvv:base64url:${BASE64URL_VER}:base64url/deps/base64url \
 		processone:ezlib:${EZLIB_VER}:ezlib/deps/ezlib \
 		processone:pkix:${PKIX_VER}:pkix/deps/pkix \
 		processone:mqtree:${MQTREE_VER}:mqtree/deps/mqtree \
 		processone:yconf:${YCONF_VER}:yconf/deps/yconf \
 		processone:p1_acme:${P1_ACME_VER}:p1_acme/deps/p1_acme \
 		benoitc:erlang-idna:${IDNA_VER}:idna/deps/idna \
-		benoitc:unicode_util_compat:${UNICODE_UTIL_COMPAT_VER}:unicode_util_compat/deps/unicode_util_compat \
 		erlydtl:erlydtl:${ERLYDTL_VER}:erlydtl/deps/erlydtl
 
 OPTIONS_DEFINE=	ODBC PAM DOCS LUA MYSQL PGSQL REDIS SIP SQLITE \
@@ -61,13 +65,13 @@ OPTIONS_DEFAULT=SQLITE STUN
 EJABBERD_LIBDIR=lib/erlang/lib
 MAKE_ENV=	PORTVERSION=${PORTVERSION}
 CONFIGURE_ARGS+=--localstatedir=/var --libdir=${PREFIX}/${EJABBERD_LIBDIR} --with-rebar=rebar
+MAKE_JOBS_UNSAFE=	yes
 MAKE_ARGS=	"CPPFLAGS=${CPPFLAGS}" "CFLAGS=${CFLAGS}" "LDFLAGS=${LDFLAGS}"
 CPPFLAGS+=	-I${LOCALBASE}/include
 CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 SUBS=		PORTNAME=${PORTNAME} PORTVERSION=${PORTVERSION}		\
 		EJABBERD_LIBDIR=${EJABBERD_LIBDIR}			\
-		BASE64URL_VER=${BASE64URL_VER}				\
 		CACHE_TAB_VER=${CACHE_TAB_VER} EIMP_VER=${EIMP_VER}	\
 		EPAM_VER=${EPAM_VER} EREDIS_VER=${EREDIS_VER}		\
 		ESIP_VER=${ESIP_VER} EZLIB_VER=${EZLIB_VER}		\
@@ -85,7 +89,6 @@ SUBS=		PORTNAME=${PORTNAME} PORTVERSION=${PORTVERSION}		\
 		P1_UTILS_VER=${P1_UTILS_VER} PKIX_VER=${PKIX_VER}	\
 		SQLITE3_VER=${SQLITE3_VER}				\
 		STRINGPREP_VER=${STRINGPREP_VER} STUN_VER=${STUN_VER}	\
-		UNICODE_UTIL_COMPAT_VER=${UNICODE_UTIL_COMPAT_VER}	\
 		XMPP_VER=${XMPP_VER} YCONF_VER=${YCONF_VER}		\
 		ERLYDTL_VER=${ERLYDTL_VER:C/-.*//1}
 
@@ -97,39 +100,40 @@ SUB_LIST=	${SUBS} \
 		EJABBERD_LIBDIR=${EJABBERD_LIBDIR}
 SHEBANG_FILES=	${WRKSRC}/ejabberdctl.template
 
-BASE64URL_VER=	1.0.1
-CACHE_TAB_VER=	1.0.33
-EIMP_VER=	1.0.26
+CACHE_TAB_VER=	1.0.34
+EIMP_VER=	1.0.27
 EPAM_VER=	1.0.14
 EREDIS_VER=	1.2.0
-ESIP_VER=	1.0.59
-EZLIB_VER=	1.0.15
-FAST_TLS_VER=	1.1.25
-FAST_XML_VER=	1.1.57
-FAST_YAML_VER=	1.0.39
-IDNA_VER=	6.0.0
+ESIP_VER=	1.0.60
+EZLIB_VER=	1.0.16
+FAST_TLS_VER=	1.1.26
+FAST_XML_VER=	1.1.58
+FAST_YAML_VER=	1.0.40
+IDNA_VER=	7.1.0
 JIFFY_VER=	1.1.1
 JOSE_VER=	1.11.12
 LUERL_VER=	1.2
-MQTREE_VER=	1.0.19
-P1_ACME_VER=	1.0.30
-P1_MYSQL_VER=	1.0.27
+MQTREE_VER=	1.0.20
+P1_ACME_VER=	1.0.31
+P1_MYSQL_VER=	1.0.28
 P1_OAUTH2_VER=	0.6.14
-P1_PGSQL_VER=	1.1.38
-P1_UTILS_VER=	1.0.28
+P1_PGSQL_VER=	1.1.41
+P1_UTILS_VER=	1.0.29
 PKIX_VER=	1.0.10
 SQLITE3_VER=	1.1.15
-STRINGPREP_VER=	1.0.33
-STUN_VER=	1.2.21
-UNICODE_UTIL_COMPAT_VER=	0.4.1
-XMPP_VER=	1.12.0
-YCONF_VER=	1.0.22
+STRINGPREP_VER=	1.0.34
+STUN_VER=	1.2.22
+XMPP_VER=	1.13.1
+YCONF_VER=	1.0.23
 ERLYDTL_VER=	0.15.0
+JQUERY_VER=	4.0.0
+BOOTSTRAP_VER=	5.3.8
 
 OPTIONS_SUB=		yes
 SIP_DESC=	SIP support
 STUN_DESC=	STUN/TURN support
 FULLXML_DESC=	Full XML support
+FULLXML_CONFIGURE_ENABLE=	full-xml
 PAM_CONFIGURE_ENABLE=	pam
 PAM_GH_TUPLE=	processone:epam:${EPAM_VER}:epam/deps/epam
 ODBC_CONFIGURE_ENABLE=	odbc
@@ -168,6 +172,14 @@ post-patch:
 	@${REINPLACE_CMD} -e 's,^convert,${LOCALBASE}/bin/convert,' ${WRKSRC}/tools/captcha.sh
 	@${REINPLACE_CMD} -e '/^AC_INIT(ejabberd,/s,m4_esyscmd([^)]*),${PORTVERSION},' \
 			${WRKSRC}/configure.ac
+	@${REINPLACE_CMD} -e 's,/bin/bash,/bin/sh,' \
+		-e 's,^jquery=.*$$,jquery=${WRKSRC}/jquery-${JQUERY_VER}.min.js,' \
+		-e 's,^bootstrap=.*$$,bootstrap=${WRKSRC}/bootstrap-${BOOTSTRAP_VER}-dist.zip,' \
+		-e '/^curl/d' \
+		${WRKSRC}/tools/dl_invites_page_deps.sh
+.for F in jquery-${JQUERY_VER}.min.js bootstrap-${BOOTSTRAP_VER}-dist.zip
+	@${CP} ${DISTDIR}/${F} ${WRKSRC}/${F}
+.endfor
 
 pre-configure:
 	cd ${WRKSRC} && ${SH} autogen.sh
diff --git a/net-im/ejabberd/distinfo b/net-im/ejabberd/distinfo
index 01894acd6674..44cf70ae2838 100644
--- a/net-im/ejabberd/distinfo
+++ b/net-im/ejabberd/distinfo
@@ -1,59 +1,59 @@
-TIMESTAMP = 1770992249
-SHA256 (processone-ejabberd-26.02_GH0.tar.gz) = 676feea9ee8aeb3c1bc3c1844308a783941548d9befc3b252cd1ff0b7532842f
-SIZE (processone-ejabberd-26.02_GH0.tar.gz) = 2918404
-SHA256 (processone-p1_utils-1.0.28_GH0.tar.gz) = 3525dac8bcee70ff2fdc89dde9d47e9346fdeff87193e42e743657abb52e0146
-SIZE (processone-p1_utils-1.0.28_GH0.tar.gz) = 47943
-SHA256 (processone-cache_tab-1.0.33_GH0.tar.gz) = 1d62a7fa119f49f13e1cfae040404ee0f5d07b4fe348932ecdc2c2fd38108ff0
-SIZE (processone-cache_tab-1.0.33_GH0.tar.gz) = 61041
-SHA256 (processone-fast_tls-1.1.25_GH0.tar.gz) = 22d60ad0b8cdc2a717e31cc73d6fd9233c8dbcd563fcb3c8e6df9a6ee9c0f937
-SIZE (processone-fast_tls-1.1.25_GH0.tar.gz) = 86011
-SHA256 (processone-stringprep-1.0.33_GH0.tar.gz) = 2089fdd0454e5b8b88258539888bbd2a03b51cc62cfd0414da240877bb59c93f
-SIZE (processone-stringprep-1.0.33_GH0.tar.gz) = 99491
-SHA256 (processone-fast_xml-1.1.57_GH0.tar.gz) = a24daf6b363a9a2bd7d37a75bf42fb9fbe831c44c17fa8dda587237d005cd6e1
-SIZE (processone-fast_xml-1.1.57_GH0.tar.gz) = 105912
-SHA256 (processone-xmpp-1.12.0_GH0.tar.gz) = 9f4c2cf01c6f6daeb317092741d06fc537f835881081154f6adfccf8f6833f49
-SIZE (processone-xmpp-1.12.0_GH0.tar.gz) = 643605
-SHA256 (processone-fast_yaml-1.0.39_GH0.tar.gz) = 06ede9ce22239403f285741973ca54d78f73d6a2c82587165354aa21d76f599c
-SIZE (processone-fast_yaml-1.0.39_GH0.tar.gz) = 60529
+TIMESTAMP = 1775598399
+SHA256 (jquery-4.0.0.min.js) = 39a546ea9ad97f8bfaf5d3e0e8f8556adb415e470e59007ada9759dce472adaa
+SIZE (jquery-4.0.0.min.js) = 78748
+SHA256 (bootstrap-5.3.8-dist.zip) = 3258c873cbcb1e2d81f4374afea2ea6437d9eee9077041073fd81dd579c5ba6b
+SIZE (bootstrap-5.3.8-dist.zip) = 1500314
+SHA256 (processone-ejabberd-26.03_GH0.tar.gz) = 584b9d43a1f67e929fdb08fa7429f359fabc022923aca311666b1073ed709a52
+SIZE (processone-ejabberd-26.03_GH0.tar.gz) = 2935422
+SHA256 (processone-p1_utils-1.0.29_GH0.tar.gz) = be22dcf4daeeec7cbc9b9b5ae65da8e257e981d8b719b7f100b27422a45a68f9
+SIZE (processone-p1_utils-1.0.29_GH0.tar.gz) = 48222
+SHA256 (processone-cache_tab-1.0.34_GH0.tar.gz) = fbe180274790b8d7436d57690a4c8600b24cb5878738aa19ad157f08f76eeb34
+SIZE (processone-cache_tab-1.0.34_GH0.tar.gz) = 61255
+SHA256 (processone-fast_tls-1.1.26_GH0.tar.gz) = fbffef294f4c8695cd7000084bed89e9e206c58a6a4a097d50560ed6d0b0dd0c
+SIZE (processone-fast_tls-1.1.26_GH0.tar.gz) = 86023
+SHA256 (processone-stringprep-1.0.34_GH0.tar.gz) = bc74b00da6ffff415d1e088473802932131abcb16cfd89f2eafb47d9e6b562f9
+SIZE (processone-stringprep-1.0.34_GH0.tar.gz) = 99691
+SHA256 (processone-fast_xml-1.1.58_GH0.tar.gz) = 92c38ca126d5658345c4fee006273313e575b1e60b09c3dcbd19a0d5c4bdb961
+SIZE (processone-fast_xml-1.1.58_GH0.tar.gz) = 106416
+SHA256 (processone-xmpp-1.13.1_GH0.tar.gz) = 0b6fede766e822c53b315db758acfe57219e2ede6b2141e46e9f20bec4adb523
+SIZE (processone-xmpp-1.13.1_GH0.tar.gz) = 644663
+SHA256 (processone-fast_yaml-1.0.40_GH0.tar.gz) = ec798397a676a0c3f8f0930324fd108ae465eeafd4d56d3ed722395b2f609110
+SIZE (processone-fast_yaml-1.0.40_GH0.tar.gz) = 60448
 SHA256 (davisp-jiffy-1.1.1_GH0.tar.gz) = a999351d956d3ed10c33a6dd7e9435e674e519b5b82a46d60361afdb83062fd8
 SIZE (davisp-jiffy-1.1.1_GH0.tar.gz) = 1674571
 SHA256 (processone-p1_oauth2-0.6.14_GH0.tar.gz) = 6437184239ea3053584834771776062c4e055e897dc6ca94dd8f960f393d891c
 SIZE (processone-p1_oauth2-0.6.14_GH0.tar.gz) = 19021
 SHA256 (potatosalad-erlang-jose-1.11.12_GH0.tar.gz) = 60bb21984d212470f57d17a41a6fbd0b57298a03779580ebf437bcd3dd119edb
 SIZE (potatosalad-erlang-jose-1.11.12_GH0.tar.gz) = 310892
-SHA256 (processone-eimp-1.0.26_GH0.tar.gz) = d2e3c48cd6202180f88c7d064ba6a6c30b9cdd7860a4ce1ab7c06f50fb684051
-SIZE (processone-eimp-1.0.26_GH0.tar.gz) = 3475018
-SHA256 (dvv-base64url-1.0.1_GH0.tar.gz) = 7ef7210effd25ac1f82f190fcfaef53e49d7bc40bb94112c4aa07266c32a851b
-SIZE (dvv-base64url-1.0.1_GH0.tar.gz) = 2726
-SHA256 (processone-ezlib-1.0.15_GH0.tar.gz) = a7416a313db64f606288aa5d2ea4e5ca12c5649df0d4b57970cf8855ea1154e2
-SIZE (processone-ezlib-1.0.15_GH0.tar.gz) = 49862
+SHA256 (processone-eimp-1.0.27_GH0.tar.gz) = 841c0d34f97e28f259d71773ea0a6b25c9cbc6cc6711ef4a38c67959ae5b93a7
+SIZE (processone-eimp-1.0.27_GH0.tar.gz) = 3474966
+SHA256 (processone-ezlib-1.0.16_GH0.tar.gz) = c440fee6771453beb31bfa9b2bd84f7cca9e2091081239b655a226137cb8ec1d
+SIZE (processone-ezlib-1.0.16_GH0.tar.gz) = 49925
 SHA256 (processone-pkix-1.0.10_GH0.tar.gz) = da6279d3f8ee31ef04de2b82fb0d42ce8dcd72cedb9a8e6ae7b18e42590cb108
 SIZE (processone-pkix-1.0.10_GH0.tar.gz) = 401784
-SHA256 (processone-mqtree-1.0.19_GH0.tar.gz) = ea40b6679309bef1e589ea341adc04fb9aa5b588e0ec25ff4f072692e67d7f2e
-SIZE (processone-mqtree-1.0.19_GH0.tar.gz) = 265562
-SHA256 (processone-yconf-1.0.22_GH0.tar.gz) = 4da69014f10b4f88672b791c961e7b9dd1ce410d60897679a57b3694b26fae7d
-SIZE (processone-yconf-1.0.22_GH0.tar.gz) = 224525
-SHA256 (processone-p1_acme-1.0.30_GH0.tar.gz) = efd0f508b4122291bf63feaec0046890907b1bde237ac94173bdd8e390f1be73
-SIZE (processone-p1_acme-1.0.30_GH0.tar.gz) = 220899
-SHA256 (benoitc-erlang-idna-6.0.0_GH0.tar.gz) = d57e20ee88018ff0431e0275e91ada5915782870c9981fc798bcd05589031d6f
-SIZE (benoitc-erlang-idna-6.0.0_GH0.tar.gz) = 740802
-SHA256 (benoitc-unicode_util_compat-0.4.1_GH0.tar.gz) = daca2a0d9469b6d8b766f72168ff5576b1e902d1b026a659d6ef0073adb996fa
-SIZE (benoitc-unicode_util_compat-0.4.1_GH0.tar.gz) = 416975
+SHA256 (processone-mqtree-1.0.20_GH0.tar.gz) = f6678ff34b4407cb1f0829810dcaed7979a0391e6f8b6130a46eae785fea1cd6
+SIZE (processone-mqtree-1.0.20_GH0.tar.gz) = 265733
+SHA256 (processone-yconf-1.0.23_GH0.tar.gz) = f9e9d124c00fbbe93a3ab644f4234ea66dacde9c1b2eb9bb9fdf06d44144bf2e
+SIZE (processone-yconf-1.0.23_GH0.tar.gz) = 224873
+SHA256 (processone-p1_acme-1.0.31_GH0.tar.gz) = aa70cc5fefbcb140e734a582e3d029a1e5d9b469c593ff0d43c5d3842a18ca0f
+SIZE (processone-p1_acme-1.0.31_GH0.tar.gz) = 220900
+SHA256 (benoitc-erlang-idna-7.1.0_GH0.tar.gz) = fbe8d9392d89bc2dbd57713a98411f165c8b2f76be79abfd6501fd3f0193b545
+SIZE (benoitc-erlang-idna-7.1.0_GH0.tar.gz) = 855698
 SHA256 (erlydtl-erlydtl-0.15.0_GH0.tar.gz) = 089effa209c69aca13792e6064170d4564d528ecec187ad59c6fe0f18a682f85
 SIZE (erlydtl-erlydtl-0.15.0_GH0.tar.gz) = 120544
 SHA256 (rvirding-luerl-v1.2_GH0.tar.gz) = 9c8fd4cd27fef7b604e9d84d1bc6ac43f3f1f1f28378cc96f302e265698e9e99
 SIZE (rvirding-luerl-v1.2_GH0.tar.gz) = 544474
-SHA256 (processone-p1_mysql-1.0.27_GH0.tar.gz) = 04da7bf5f23774ffbe0b3c7863c710e932d8436ea09059c0f030cffc8d1abc2b
-SIZE (processone-p1_mysql-1.0.27_GH0.tar.gz) = 30093
+SHA256 (processone-p1_mysql-1.0.28_GH0.tar.gz) = c38b8c9e51a8c3404b66ab32e49cfb8859fc65c0154585c4a53029b40bba73d0
+SIZE (processone-p1_mysql-1.0.28_GH0.tar.gz) = 30198
 SHA256 (processone-epam-1.0.14_GH0.tar.gz) = 0e375557cf7ba670b626d0b1691b0257c2e68a4509bb72bf14ae8f8b7a30b3c3
 SIZE (processone-epam-1.0.14_GH0.tar.gz) = 49229
-SHA256 (processone-p1_pgsql-1.1.38_GH0.tar.gz) = bf1f4423368c7e02a7ceed6d6d57fe774ff93b8c1e63d6b23b62a87d3c28b1c2
-SIZE (processone-p1_pgsql-1.1.38_GH0.tar.gz) = 27865
+SHA256 (processone-p1_pgsql-1.1.41_GH0.tar.gz) = ccf733fce009f19d636df490937e612571a9099099caefb8cb90d5a5df15bdd8
+SIZE (processone-p1_pgsql-1.1.41_GH0.tar.gz) = 28142
 SHA256 (wooga-eredis-v1.2.0_GH0.tar.gz) = 31a2e61d8d5a9631bda6e72e74abd6042292a39323acb6df94c050a41eb1f1a3
 SIZE (wooga-eredis-v1.2.0_GH0.tar.gz) = 28568
-SHA256 (processone-esip-1.0.59_GH0.tar.gz) = be5769de24a8f204934da10b58905ee261e4fc4991f6b887bc1779ef5152c8a7
-SIZE (processone-esip-1.0.59_GH0.tar.gz) = 91385
+SHA256 (processone-esip-1.0.60_GH0.tar.gz) = 32cc2d0e6074ac2a21c3239f1179838434d1901ee5666b15cba53d2a94b1cdcc
+SIZE (processone-esip-1.0.60_GH0.tar.gz) = 91419
 SHA256 (processone-erlang-sqlite3-1.1.15_GH0.tar.gz) = a09566a1b0410d7f2662f75e4005387d6b29fb83bbb38c5de31efb3cdf8b6ad0
 SIZE (processone-erlang-sqlite3-1.1.15_GH0.tar.gz) = 1715864
-SHA256 (processone-stun-1.2.21_GH0.tar.gz) = e343bf856eec5c4db06435f594a3b0f04db4e68b211ec4d3965d663dd753b65f
-SIZE (processone-stun-1.2.21_GH0.tar.gz) = 41981
+SHA256 (processone-stun-1.2.22_GH0.tar.gz) = 01d0d1650e2796bdcb6630f25409e9bf683b247747bced19b3b15dd8916dfee9
+SIZE (processone-stun-1.2.22_GH0.tar.gz) = 42012
diff --git a/net-im/ejabberd/files/patch-Makefile.in b/net-im/ejabberd/files/patch-Makefile.in
index 17ad1cc02c47..47b0b0243ddd 100644
--- a/net-im/ejabberd/files/patch-Makefile.in
+++ b/net-im/ejabberd/files/patch-Makefile.in
@@ -1,41 +1,41 @@
---- Makefile.in.orig	2024-11-30 22:51:34.482725000 +0100
-+++ Makefile.in	2024-11-30 22:57:25.793611000 +0100
-@@ -36,7 +36,7 @@
+--- Makefile.in.orig	2026-03-25 14:37:09 UTC
++++ Makefile.in
+@@ -40,7 +40,7 @@ LIBDIR =  @libdir@
  LIBDIR =  @libdir@
-
+ 
  # /lib/ejabberd/
 -EJABBERDDIR = @libdir@/ejabberd
 +EJABBERDDIR = @libdir@/erlang/lib/ejabberd-$(PORTVERSION)
-
+ 
  # /share/doc/ejabberd
  PACKAGE_TARNAME = @PACKAGE_TARNAME@
-@@ -80,7 +80,7 @@
+@@ -84,7 +84,7 @@ LUADIR = $(PRIVDIR)/lua
  LUADIR = $(PRIVDIR)/lua
-
+ 
  # /var/lib/ejabberd/
 -SPOOLDIR = @localstatedir@/lib/ejabberd
 +SPOOLDIR = @localstatedir@/spool/ejabberd
-
+ 
  # /var/log/ejabberd/
  LOGDIR = @localstatedir@/log/ejabberd
-@@ -283,7 +283,7 @@
+@@ -305,7 +305,7 @@ ELIXIR_TO_DEST=$(LIBDIR) $(call VERSIONED_DEP,$(word 2
  LIBIX:=$(shell expr "$(DEPIX)" + 2)
-
+ 
  ELIXIR_TO_DEST=$(LIBDIR) $(call VERSIONED_DEP,$(word 2,$(1))) $(wordlist 5,1000,$(1))
 -DEPS_TO_DEST=$(LIBDIR) $(call VERSIONED_DEP,$(word 2,$(1))) $(wordlist 3,1000,$(1))
 +DEPS_TO_DEST=$(LIBDIR)/ejabberd-$(PORTVERSION)/lib $(call VERSIONED_DEP,$(word 2,$(1))) $(wordlist 3,1000,$(1))
  MAIN_TO_DEST=$(LIBDIR) $(call VERSIONED_DEP,ejabberd) $(1)
  TO_DEST_SINGLE=$(if $(subst X$(DEPSBASE)X,,X$(word 1,$(1))X),$(call MAIN_TO_DEST,$(1)),$(if $(subst XlibX,,X$(word $(LIBIX),$(1))X),$(call DEPS_TO_DEST,$(wordlist $(DEPIX),1000,$(1))),$(call ELIXIR_TO_DEST,$(wordlist $(DEPIX),1000,$(1)))))
  TO_DEST=$(foreach path,$(1),$(call JOIN_PATHS,$(DESTDIR)$(call TO_DEST_SINGLE,$(subst /, ,$(path)))))
-@@ -436,6 +436,7 @@
+@@ -461,6 +461,7 @@ ejabberdctl.example: vars.config
  		-e "s*ERTS_VSN*# ERTS_VSN*g" \
  		-e "s*{{iexpath}}*${IEX}*g" \
  		-e "s*{{erl}}*${ERL}*g" \
 +		-e "s*lib/erlang/lib/ejabberd*lib/erlang/lib/ejabberd-$(PORTVERSION)*" \
  		-e "s*{{epmd}}*${EPMD}*g" ejabberdctl.template \
  		> ejabberdctl.example
-
-@@ -453,17 +454,13 @@
+ 
+@@ -478,17 +479,13 @@ install-main:
  	#
  	# Configuration files
  	$(INSTALL) -d -m 750 $(G_USER) $(DESTDIR)$(ETCDIR)
@@ -57,7 +57,7 @@
  	# Elixir binaries
  	[ -d $(DESTDIR)$(BINDIR) ] || $(INSTALL) -d -m 755 $(DESTDIR)$(BINDIR)
  	[ -f $(DEPSDIR)/elixir/bin/iex ] && $(INSTALL) -m 550 $(G_USER) $(DEPSDIR)/elixir/bin/iex $(DESTDIR)$(BINDIR)/iex || true
-@@ -481,12 +478,14 @@
+@@ -506,12 +503,14 @@ install-main:
  	chmod -R 750 $(DESTDIR)$(LOGDIR)
  	#
  	# Documentation
@@ -69,6 +69,6 @@
  		|| echo "Man page not included in sources"
  	$(INSTALL) -m 644 COPYING $(DESTDIR)$(DOCDIR)
 +endif
-
+ 
  #.
  #' uninstall
diff --git a/net-im/ejabberd/files/patch-deps_jiffy_c__src_double-conversion_strtod.cc b/net-im/ejabberd/files/patch-deps_jiffy_c__src_double-conversion_strtod.cc
index 520b3c05724b..6efd5485d7dc 100644
--- a/net-im/ejabberd/files/patch-deps_jiffy_c__src_double-conversion_strtod.cc
+++ b/net-im/ejabberd/files/patch-deps_jiffy_c__src_double-conversion_strtod.cc
@@ -1,4 +1,4 @@
---- deps/jiffy/c_src/double-conversion/strtod.cc.orig	2020-04-10 09:23:29 UTC
+--- deps/jiffy/c_src/double-conversion/strtod.cc.orig	2022-02-23 18:46:15 UTC
 +++ deps/jiffy/c_src/double-conversion/strtod.cc
 @@ -38,7 +38,9 @@ namespace double_conversion {
  // 2^53 = 9007199254740992.
@@ -9,20 +9,20 @@
 +#endif
  // 2^64 = 18446744073709551616 > 10^19
  static const int kMaxUint64DecimalDigits = 19;
-
-@@ -55,6 +57,7 @@ static const int kMinDecimalPower = -324;
+ 
+@@ -55,6 +57,7 @@ static const uint64_t kMaxUint64 = UINT64_2PART_C(0xFF
  static const uint64_t kMaxUint64 = UINT64_2PART_C(0xFFFFFFFF, FFFFFFFF);
-
-
+ 
+ 
 +#if defined(DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS)
  static const double exact_powers_of_ten[] = {
    1.0,  // 10^0
    10.0,
-@@ -82,6 +85,7 @@ static const double exact_powers_of_ten[] = {
+@@ -82,6 +85,7 @@ static const int kExactPowersOfTenSize = ARRAY_SIZE(ex
    10000000000000000000000.0
  };
  static const int kExactPowersOfTenSize = ARRAY_SIZE(exact_powers_of_ten);
 +#endif
-
+ 
  // Maximum number of significant digits in the decimal representation.
  // In fact the value is 772 (see conversions.cc), but to give us some margin
diff --git a/net-im/ejabberd/files/patch-ejabberdctl.template b/net-im/ejabberd/files/patch-ejabberdctl.template
index cf5c28afc93b..bfb8be9f535f 100644
--- a/net-im/ejabberd/files/patch-ejabberdctl.template
+++ b/net-im/ejabberd/files/patch-ejabberdctl.template
@@ -1,7 +1,7 @@
---- ejabberdctl.template.orig	2022-10-30 09:41:25 UTC
+--- ejabberdctl.template.orig	2026-04-08 12:29:49 UTC
 +++ ejabberdctl.template
 @@ -58,7 +58,7 @@ done
-
+ 
  # define ejabberd variables if not already defined from the command line
  : "${CONFIG_DIR:="{{config_dir}}"}"
 -: "${LOGS_DIR:="{{logs_dir}}"}"
@@ -9,16 +9,16 @@
  : "${EJABBERD_CONFIG_PATH:="$CONFIG_DIR/ejabberd.yml"}"
  : "${EJABBERDCTL_CONFIG_PATH:="$CONFIG_DIR/ejabberdctl.cfg"}"
  # Allows passing extra Erlang command-line arguments in vm.args file
-@@ -67,7 +67,7 @@ done
- [ -f "$EJABBERDCTL_CONFIG_PATH" ] && . "$EJABBERDCTL_CONFIG_PATH"
+@@ -68,7 +68,7 @@ done
  [ -n "$ERLANG_NODE_ARG" ] && ERLANG_NODE="$ERLANG_NODE_ARG"
+ [ "$ERLANG_NODE" = "${ERLANG_NODE%@*}" ] && ERLANG_NODE="$ERLANG_NODE@$(hostname -s)"
  [ "$ERLANG_NODE" = "${ERLANG_NODE%.*}" ] && S="-s"
 -: "${SPOOL_DIR:="{{spool_dir}}"}"
 +: ${SPOOL_DIR:=/var/spool/ejabberd}
  : "${EJABBERD_LOG_PATH:="$LOGS_DIR/ejabberd.log"}"
-
- # define erl parameters
-@@ -84,7 +84,8 @@ fi
+ 
+ # backward support for old mnesia spool dir path
+@@ -92,7 +92,8 @@ fi
  [ -n "$ERL_DIST_PORT" ] && ERLANG_OPTS="$ERLANG_OPTS -erl_epmd_port $ERL_DIST_PORT -start_epmd false"
  # if vm.args file exists in config directory, pass it to Erlang VM
  [ -f "$VMARGS" ] && ERLANG_OPTS="$ERLANG_OPTS -args_file $VMARGS"
@@ -27,4 +27,4 @@
 +ERL_LIBS=$ERL_LIBS:{{libdir}}/ejabberd/lib
  ERL_CRASH_DUMP="$LOGS_DIR"/erl_crash_$(date "+%Y%m%d-%H%M%S").dump
  ERL_INETRC="$CONFIG_DIR"/inetrc
-
+ 
diff --git a/net-im/ejabberd/pkg-plist b/net-im/ejabberd/pkg-plist
index 0b4e9dfd7d60..2d4cd0c7fbc4 100644
--- a/net-im/ejabberd/pkg-plist
+++ b/net-im/ejabberd/pkg-plist
@@ -177,8 +177,13 @@
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/priv/mod_invites/register_error.html
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/priv/mod_invites/register_success.html
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/priv/mod_invites/roster.html
+%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/priv/mod_invites/static/bootstrap/css/bootstrap.min.css
+%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/priv/mod_invites/static/bootstrap/js/bootstrap.min.js
+%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/priv/mod_invites/static/favicon.png
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/priv/mod_invites/static/illus-empty.svg
+%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/priv/mod_invites/static/invite.css
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/priv/mod_invites/static/invite.js
+%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/priv/mod_invites/static/jquery/jquery.min.js
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/priv/mod_invites/static/logos/apple_as.svg
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/priv/mod_invites/static/logos/beagle-im.svg
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/priv/mod_invites/static/logos/conversations.svg
@@ -382,9 +387,6 @@
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/include/mqtt.hrl
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/include/pubsub.hrl
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/include/translate.hrl
-%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/base64url-%%BASE64URL_VER%%/LICENSE.txt
-%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/base64url-%%BASE64URL_VER%%/ebin/base64url.app
-%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/base64url-%%BASE64URL_VER%%/ebin/base64url.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/cache_tab-%%CACHE_TAB_VER%%/LICENSE.txt
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/cache_tab-%%CACHE_TAB_VER%%/ebin/cache_tab.app
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/cache_tab-%%CACHE_TAB_VER%%/ebin/cache_tab.beam
@@ -448,7 +450,7 @@
 %%SIP%%%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/esip-%%ESIP_VER%%/ebin/esip_udp_sup.beam
 %%SIP%%%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/esip-%%ESIP_VER%%/include/esip.hrl
 %%SIP%%%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/esip-%%ESIP_VER%%/include/esip_lib.hrl
-%%SIP%%%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/esip-%%ESIP_VER%%/priv/lib/esip_drv.so
+%%SIP%%%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/esip-%%ESIP_VER%%/priv/lib/esip_codec.so
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/ezlib-%%EZLIB_VER%%/LICENSE.txt
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/ezlib-%%EZLIB_VER%%/ebin/ezlib.app
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/ezlib-%%EZLIB_VER%%/ebin/ezlib.beam
@@ -764,9 +766,6 @@
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/eimp-%%EIMP_VER%%/ebin/eimp_worker.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/eimp-%%EIMP_VER%%/priv/bin/eimp
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/eimp-%%EIMP_VER%%/LICENSE.txt
-%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/unicode_util_compat-%%UNICODE_UTIL_COMPAT_VER%%/LICENSE
-%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/unicode_util_compat-%%UNICODE_UTIL_COMPAT_VER%%/ebin/unicode_util_compat.app
-%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/unicode_util_compat-%%UNICODE_UTIL_COMPAT_VER%%/ebin/unicode_util_compat.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/xmpp-%%XMPP_VER%%/LICENSE.txt
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/xmpp-%%XMPP_VER%%/ebin/captcha_form.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/xmpp-%%XMPP_VER%%/ebin/flex_offline.beam