From 129acfd8edc241c44ed3df1f40464734b96f213d Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Mon, 8 Jan 2018 22:56:38 +0100
Subject: [PATCH] Framwork: allow package conflicts

"make upgrade" will do the right thing now always.
---
 Mk/plugins.mk | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/Mk/plugins.mk b/Mk/plugins.mk
index 7dfab6eb2..be0b42a66 100644
--- a/Mk/plugins.mk
+++ b/Mk/plugins.mk
@@ -51,11 +51,20 @@ check:
 PLUGIN_DEVEL?=		yes
 
 PLUGIN_PREFIX?=		os-
-.if "${PLUGIN_DEVEL}" != ""
 PLUGIN_SUFFIX?=		-devel
-.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_PKGNAME=		${PLUGIN_PREFIX}${PLUGIN_NAME}${PLUGIN_SUFFIX}
+.else
+PLUGIN_PKGNAME=		${PLUGIN_PREFIX}${PLUGIN_NAME}
+.endif
 
 .if "${PLUGIN_REVISION}" != "" && "${PLUGIN_REVISION}" != "0"
 PLUGIN_PKGVERSION=	${PLUGIN_VERSION}_${PLUGIN_REVISION}
@@ -222,9 +231,11 @@ upgrade-check: check
 	@rm -rf ${PKGDIR}
 
 upgrade: upgrade-check package
-	@if ${PKG} info ${PLUGIN_PKGNAME} > /dev/null; then \
-		${PKG} delete -fy ${PLUGIN_PKGNAME}; \
+.for NAME in ${PLUGIN_PKGNAMES}
+	@if ${PKG} info ${NAME} > /dev/null; then \
+		${PKG} delete -fy ${NAME}; \
 	fi
+.endfor
 	@${PKG} add ${PKGDIR}/*.txz
 
 mount: check