git: 58d392be23a8 - main - mail/rspamd: Package hs_helper configs with VECTORSCAN

The branch main has been updated by vsevolod:

URL: https://cgit.FreeBSD.org/ports/commit/?id=58d392be23a82497ed8a697309d21e53fe2e638f

commit 58d392be23a82497ed8a697309d21e53fe2e638f
Author:     Vsevolod Stakhov <vsevolod@FreeBSD.org>
AuthorDate: 2026-10-12 11:36:09 +0000
Commit:     Vsevolod Stakhov <vsevolod@FreeBSD.org>
CommitDate: 2026-10-12 11:36:09 +0000

    mail/rspamd: Package hs_helper configs with VECTORSCAN
    
    Follow-up to 8f3058ca4f8 ("mail/rspamd: Add vectorscan support", PR 296532).
    
    Both the HYPERSCAN and VECTORSCAN options pass -DENABLE_HYPERSCAN=ON to
    CMake, and conf/worker-hs_helper.{conf,inc} are installed whenever
    ENABLE_HYPERSCAN is on (cmake/InstallRspamdFiles.cmake).  The packing
    list, however, gates those entries on %%HYPERSCAN%% only:
    
    - With VECTORSCAN enabled (the new default on amd64, aarch64 and
    powerpc64le) the two files are staged but commented out of the
    manifest: check-orphans/check-plist fail and the files are missing
    from the package.
    - On architectures where the HYPERSCAN option is not defined (aarch64,
    powerpc64le, i386, armv7, powerpc, powerpc64) %%HYPERSCAN%% is never
    defined in PLIST_SUB, so the literal leaks into the packing list.
    The PLIST_SUB block dropped by 8f3058ca4f8 was what defined that
    variable on non-amd64.
    
    Gate the entries on either scanner backend via a new HS_HELPER
    PLIST_SUB variable and bump PORTREVISION.
    
    PR:             299329
    Submitted by:   Alexander Moisseev <moiseev@mezonplus.ru>
    Fixes:          8f3058ca4f84d07d7144473296e5065728c76361
---
 mail/rspamd/Makefile  | 12 +++++++++++-
 mail/rspamd/pkg-plist |  4 ++--
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/mail/rspamd/Makefile b/mail/rspamd/Makefile
index fc6d052f96df..dc931287891d 100644
--- a/mail/rspamd/Makefile
+++ b/mail/rspamd/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	rspamd
 PORTVERSION=	4.2.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail
 
 MAINTAINER=	vsevolod@FreeBSD.org
@@ -88,6 +88,16 @@ LUAJIT_CMAKE_OFF=	-DENABLE_LUAJIT=OFF
 VECTORSCAN_LIB_DEPENDS=	libhs.so:devel/vectorscan
 VECTORSCAN_CMAKE_ON=	-DENABLE_HYPERSCAN=ON
 
+.include <bsd.port.options.mk>
+
+# worker-hs_helper.* are installed when either scanner backend is enabled
+# (both HYPERSCAN and VECTORSCAN set ENABLE_HYPERSCAN=ON in CMake).
+.if ${PORT_OPTIONS:MHYPERSCAN} || ${PORT_OPTIONS:MVECTORSCAN}
+PLIST_SUB+=	HS_HELPER=""
+.else
+PLIST_SUB+=	HS_HELPER="@comment "
+.endif
+
 post-install:
 	@${MKDIR} \
 		${STAGEDIR}/var/log/rspamd \
diff --git a/mail/rspamd/pkg-plist b/mail/rspamd/pkg-plist
index a92937c89a21..8c68010fc934 100644
--- a/mail/rspamd/pkg-plist
+++ b/mail/rspamd/pkg-plist
@@ -110,8 +110,8 @@ etc/newsyslog.conf.d/rspamd.newsyslog.conf
 %%ETCDIR%%/statistic.conf
 %%ETCDIR%%/worker-controller.inc
 %%ETCDIR%%/worker-fuzzy.inc
-%%HYPERSCAN%%%%ETCDIR%%/worker-hs_helper.conf
-%%HYPERSCAN%%%%ETCDIR%%/worker-hs_helper.inc
+%%HS_HELPER%%%%ETCDIR%%/worker-hs_helper.conf
+%%HS_HELPER%%%%ETCDIR%%/worker-hs_helper.inc
 %%ETCDIR%%/worker-normal.inc
 %%ETCDIR%%/worker-proxy.inc
 lib/rspamd/librspamd-actrie.so