net-mgmt/unifi7: Fix upgrade steps

As suggested, make the upgrade steps in pkg-message and UPDATING
more accurate.

PR:		270171

3 files changed, 38 insertions, 24 deletions

diff --git a/UPDATING b/UPDATING
index 913c156b25b3..6d648be11f16 100644
--- a/UPDATING
+++ b/UPDATING
@@ -28,15 +28,24 @@ you update your ports collection, before attempting any port upgrades.
 
   2. Stop the unifi7 service (if running)
 
-  3. Copy the "backup" directory from LOCALBASE/share/java/unifi/data/db
-     to a safe location.
+  3. Copy the "backup" directory from LOCALBASE/share/java/unifi/data
+     to a safe location. Also copy keystore and system.properties if
+     you have made any modifications to those files
 
-  4. Remove all files and directories under
-     LOCALBASE/share/java/unifi/data/db
+  4. Remove files and directories under LOCALBASE/share/java/unifi/data
 
-  5. Upgrade the package and start the service
+  5. Upgrade the package
 
-  6. Restore the configuration from backup
+  6. Copy the "backup" directory from a safe location back to
+     LOCALBASE/share/java/unifi/data
+
+  7. Start the service
+
+  8. Restore the configuration from backup
+
+  As an optional step, review system.properties and keystore to merge any
+  manual modifications you have made (this has to be done with the application
+  stopped)
 
 20230310:
   AFFECTS: user of benchmarks/ddosify
diff --git a/net-mgmt/unifi7/Makefile b/net-mgmt/unifi7/Makefile
index 921d5dba4fe9..578835a7ba54 100644
--- a/net-mgmt/unifi7/Makefile
+++ b/net-mgmt/unifi7/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	unifi7
 PORTVERSION=	7.3.83
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net-mgmt java
 MASTER_SITES=	http://dl.ubnt.com/unifi/%SUBDIR%/:unifi \
 		https://repo1.maven.org/maven2/%SUBDIR%/:jax
diff --git a/net-mgmt/unifi7/files/pkg-message.in b/net-mgmt/unifi7/files/pkg-message.in
index 34b97e7333bf..8974e9b59e89 100644
--- a/net-mgmt/unifi7/files/pkg-message.in
+++ b/net-mgmt/unifi7/files/pkg-message.in
@@ -10,25 +10,30 @@ One of implications is that the instance MUST be restored from backup.
 
 The upgrade path can be as following:
 
-- Take a backup from within the unifi7 application BEFORE stopping or
-  restarting the service.
-
-- Stop the unifi7 service.
-
-- Copy the "backup" directory from %%LOCALBASE%%/share/java/unifi/data/db
-  to a safe location.
-
-- Remove all files and directories under
-  %%LOCALBASE%%/share/java/unifi/data/db
-
+- Take a backup from within the unifi7 application PRIOR to
+  updating!
+ 
+- Stop the unifi7 service (if running)
+ 
+- Copy the "backup" directory from %%LOCALBASE%%/share/java/unifi/data
+  to a safe location. Also copy keystore and system.properties if
+  you have made any modifications to those files
+ 
+- Remove files and directories under %%LOCALBASE%%/share/java/unifi/data
+ 
 - Upgrade the package
+ 
+- Copy the "backup" directory from a safe location back to
+  %%LOCALBASE%%/share/java/unifi/data
+ 
+- Start the service
+ 
+- Restore the configuration from backup
+
+- Review system.properties and keystore to merge any manual
+  modifications you have made (this has to be done with
+  the application stopped)
 
-- Copy the "backup" directory from the safe place to
-  %%LOCALBASE%%/share/java/unifi/data/db
-
-- Start the service.
-
-- Restore the configuration from backup.
 EEOOMM
 }
 ]