From f8852876656a2b02bb0ec32a3be47e52978e2666 Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Tue, 27 Aug 2024 11:57:30 +0200
Subject: [PATCH] plugins: simplify this just a little #4202

---
 Mk/plugins.mk | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/Mk/plugins.mk b/Mk/plugins.mk
index b68ab957f..0dea226d9 100644
--- a/Mk/plugins.mk
+++ b/Mk/plugins.mk
@@ -81,7 +81,8 @@ PLUGIN_NAME:=		${${PLUGIN_VARIANT}_NAME}
 .error Plugin variant '${PLUGIN_VARIANT}' does not exist
 .endif
 .for _PLUGIN_VARIANT in ${PLUGIN_VARIANTS:N${PLUGIN_VARIANT}}
-PLUGIN_CONFLICTS+=	${PLUGIN_PREFIX}${${_PLUGIN_VARIANT}_NAME}${PLUGIN_SUFFIX} ${PLUGIN_PREFIX}${${_PLUGIN_VARIANT}_NAME}
+PLUGIN_CONFLICTS+=	${${_PLUGIN_VARIANT}_NAME}${PLUGIN_SUFFIX} \
+			${${_PLUGIN_VARIANT}_NAME}
 .endfor
 PLUGIN_DEPENDS+=	${${PLUGIN_VARIANT}_DEPENDS}
 .endif
@@ -92,13 +93,15 @@ PLUGIN_DIR?=		${.CURDIR:S/\// /g:[-2]}/${.CURDIR:S/\// /g:[-1]}
 .endif
 
 .if "${PLUGIN_DEVEL}" != ""
-PLUGIN_CONFLICTS+=	${PLUGIN_PREFIX}${PLUGIN_NAME}
+PLUGIN_CONFLICTS+=	${PLUGIN_NAME}
 PLUGIN_PKGSUFFIX=	${PLUGIN_SUFFIX}
 .else
-PLUGIN_CONFLICTS+=	${PLUGIN_PREFIX}${PLUGIN_NAME}${PLUGIN_SUFFIX}
+PLUGIN_CONFLICTS+=	${PLUGIN_NAME}${PLUGIN_SUFFIX}
 PLUGIN_PKGSUFFIX=	# empty
 .endif
 
+PLUGIN_CONFLICTS:=	${PLUGIN_CONFLICTS:S/^/${PLUGIN_PREFIX}/g:O}
+
 PLUGIN_PKGNAME=		${PLUGIN_PREFIX}${PLUGIN_NAME}${PLUGIN_PKGSUFFIX}
 PLUGIN_PKGNAMES=	${PLUGIN_CONFLICTS} ${PLUGIN_PKGNAME}