From 20d124737fbb713bcf5b6b38e5bb9bc85e455c81 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

(cherry picked from commit 129acfd8edc241c44ed3df1f40464734b96f213d)
(cherry picked from commit 23035f19557c5e237347d85334e76e9965f22d8b)
---
 Mk/plugins.mk | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/Mk/plugins.mk b/Mk/plugins.mk
index 6114d836b..a9479cdc1 100644
--- a/Mk/plugins.mk
+++ b/Mk/plugins.mk
@@ -49,11 +49,20 @@ check:
 .endfor
 
 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}
@@ -220,9 +229,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} 2> /dev/null > /dev/null; then \
+		${PKG} delete -fy ${NAME}; \
 	fi
+.endfor
 	@${PKG} add ${PKGDIR}/*.txz
 
 mount: check