From baef9fafd5323b9a5daba10083222d1080659de0 Mon Sep 17 00:00:00 2001
From: sthen <sthen@openbsd.org>
Date: Fri, 10 Apr 2026 13:27:09 +0000
Subject: [PATCH] worker-hs_helper.(conf|inc) are only installed on systems
 with hyperscan; fix PLISTs for other builds

---
 mail/rspamd/Makefile  | 5 ++++-
 mail/rspamd/pkg/PLIST | 8 ++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/mail/rspamd/Makefile b/mail/rspamd/Makefile
index a92c327948b..9c3b036a5f9 100644
--- a/mail/rspamd/Makefile
+++ b/mail/rspamd/Makefile
@@ -67,7 +67,7 @@ CONFIGURE_ARGS+= \
 # to line up @samples in plist
 ETC=		${SYSCONFDIR}
 FLAVOR_STRING=	${FLAVOR_EXT:S/-/,/g}
-SUBST_VARS+=	ETC FLAVOR_STRING
+SUBST_VARS+=	ETC FLAVOR_STRING HYPERSCAN_ONLY
 
 .include <bsd.port.arch.mk>
 .if !${PROPERTIES:Mlld}
@@ -90,6 +90,9 @@ WANTLIB+=	${MODLUA_WANTLIB}
 CONFIGURE_ARGS+= -DENABLE_HYPERSCAN=ON
 LIB_DEPENDS+=	textproc/hyperscan
 WANTLIB+=	hs
+HYPERSCAN_ONLY=
+.else
+HYPERSCAN_ONLY=	"@comment "
 .endif
 
 NO_TEST=	Yes
diff --git a/mail/rspamd/pkg/PLIST b/mail/rspamd/pkg/PLIST
index b2d1249e708..173de818964 100644
--- a/mail/rspamd/pkg/PLIST
+++ b/mail/rspamd/pkg/PLIST
@@ -226,10 +226,10 @@ share/examples/rspamd/worker-controller.inc
 @sample ${ETC}/rspamd/worker-controller.inc
 share/examples/rspamd/worker-fuzzy.inc
 @sample ${ETC}/rspamd/worker-fuzzy.inc
-share/examples/rspamd/worker-hs_helper.conf
-@sample ${ETC}/rspamd/worker-hs_helper.conf
-share/examples/rspamd/worker-hs_helper.inc
-@sample ${ETC}/rspamd/worker-hs_helper.inc
+${HYPERSCAN_ONLY}share/examples/rspamd/worker-hs_helper.conf
+${HYPERSCAN_ONLY}@sample ${ETC}/rspamd/worker-hs_helper.conf
+${HYPERSCAN_ONLY}share/examples/rspamd/worker-hs_helper.inc
+${HYPERSCAN_ONLY}@sample ${ETC}/rspamd/worker-hs_helper.inc
 share/examples/rspamd/worker-normal.inc
 @sample ${ETC}/rspamd/worker-normal.inc
 share/examples/rspamd/worker-proxy.inc