From 606da11cae2db6cdd4f741910775df65d0cb3651 Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Sat, 16 Sep 2017 18:12:27 +0200
Subject: [PATCH] Framework: more often than not, plugins are not installed

So in order to bootstrap a plugin during an upgrade we allow
the upgrade without the package in place.

(cherry picked from commit 06cbde40e2c5311c97465154548022efb2d2142f)
(cherry picked from commit 08a11456707406882e378efd60b11f26e0a30af2)
---
 Mk/plugins.mk | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/Mk/plugins.mk b/Mk/plugins.mk
index c71b16fdf..638115d52 100644
--- a/Mk/plugins.mk
+++ b/Mk/plugins.mk
@@ -212,14 +212,12 @@ package: check
 	    -p ${WRKSRC}/plist -o ${PKGDIR}
 
 upgrade-check: check
-	@if ! ${PKG} info ${PLUGIN_PKGNAME} > /dev/null; then \
-		echo ">>> Cannot find package.  Please run 'pkg install ${PLUGIN_PKGNAME}'" >&2; \
-		exit 1; \
-	fi
 	@rm -rf ${PKGDIR}
 
 upgrade: upgrade-check package
-	@${PKG} delete -fy ${PLUGIN_PKGNAME}
+	@if ${PKG} info ${PLUGIN_PKGNAME} > /dev/null; then \
+		${PKG} delete -fy ${PLUGIN_PKGNAME}; \
+	fi
 	@${PKG} add ${PKGDIR}/*.txz
 
 mount: check