plugins: register conflicts with development versions too #4202

To make this consistent the product_id and product_conflicts
now both have a consistent plugin prefix.

Mk/plugins.mk

@@ -67,6 +67,10 @@ PLUGIN_DEVEL?=		yes
 PLUGIN_PREFIX?=		os-
 PLUGIN_SUFFIX?=		-devel
 
+.for CONFLICT in ${PLUGIN_CONFLICTS}
+PLUGIN_CONFLICTS+=	${CONFLICT}${PLUGIN_SUFFIX}
+.endfor
+
 .if !empty(PLUGIN_VARIANTS)
 PLUGIN_VARIANT?=	${PLUGIN_VARIANTS:[1]}
 .if "${PLUGIN_VARIANT}" == ""
@@ -77,7 +81,7 @@ 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_VARIANT}_NAME}
+PLUGIN_CONFLICTS+=	${PLUGIN_PREFIX}${${_PLUGIN_VARIANT}_NAME}${PLUGIN_SUFFIX} ${PLUGIN_PREFIX}${${_PLUGIN_VARIANT}_NAME}
 .endfor
 PLUGIN_DEPENDS+=	${${PLUGIN_VARIANT}_DEPENDS}
 .endif
@@ -87,20 +91,16 @@ PLUGIN_DEPENDS+=	${${PLUGIN_VARIANT}_DEPENDS}
 PLUGIN_DIR?=		${.CURDIR:S/\// /g:[-2]}/${.CURDIR:S/\// /g:[-1]}
 .endif
 
-PLUGIN_PKGNAMES=	${PLUGIN_PREFIX}${PLUGIN_NAME}${PLUGIN_SUFFIX} \
-			${PLUGIN_PREFIX}${PLUGIN_NAME}
-.for CONFLICT in ${PLUGIN_CONFLICTS}
-PLUGIN_PKGNAMES+=	${PLUGIN_PREFIX}${CONFLICT}${PLUGIN_SUFFIX} \
-			${PLUGIN_PREFIX}${CONFLICT}
-.endfor
-
 .if "${PLUGIN_DEVEL}" != ""
+PLUGIN_CONFLICTS+=	${PLUGIN_PREFIX}${PLUGIN_NAME}
 PLUGIN_PKGSUFFIX=	${PLUGIN_SUFFIX}
 .else
+PLUGIN_CONFLICTS+=	${PLUGIN_PREFIX}${PLUGIN_NAME}${PLUGIN_SUFFIX}
 PLUGIN_PKGSUFFIX=	# empty
 .endif
 
 PLUGIN_PKGNAME=		${PLUGIN_PREFIX}${PLUGIN_NAME}${PLUGIN_PKGSUFFIX}
+PLUGIN_PKGNAMES=	${PLUGIN_CONFLICTS} ${PLUGIN_PKGNAME}
 
 .if "${PLUGIN_REVISION}" != "" && "${PLUGIN_REVISION}" != "0"
 PLUGIN_PKGVERSION=	${PLUGIN_VERSION}_${PLUGIN_REVISION}