git: cb3015f838af - main - net-mgmt/unifi7: Update CONFLICTS

From: Juraj Lutter <otis_at_FreeBSD.org>
Date: Tue, 21 Nov 2023 13:10:56 UTC
The branch main has been updated by otis:

URL: https://cgit.FreeBSD.org/ports/commit/?id=cb3015f838af7bc815c4970c9fc3b7a6a62e57d0

commit cb3015f838af7bc815c4970c9fc3b7a6a62e57d0
Author:     Juraj Lutter <otis@FreeBSD.org>
AuthorDate: 2023-11-21 12:39:00 +0000
Commit:     Juraj Lutter <otis@FreeBSD.org>
CommitDate: 2023-11-21 13:10:05 +0000

    net-mgmt/unifi7: Update CONFLICTS
    
    Update CONFLICTS as unifi8 is in the tree.
---
 net-mgmt/unifi7/Makefile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/net-mgmt/unifi7/Makefile b/net-mgmt/unifi7/Makefile
index 2591f07cd543..9d5bd90fb64c 100644
--- a/net-mgmt/unifi7/Makefile
+++ b/net-mgmt/unifi7/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	unifi7
 PORTVERSION=	7.5.187
+PORTREVISION=	1
 CATEGORIES=	net-mgmt java
 MASTER_SITES=	http://dl.ubnt.com/unifi/%SUBDIR%/:unifi \
 		https://repo1.maven.org/maven2/%SUBDIR%/:jax
@@ -30,7 +31,7 @@ JAVA_VERSION=	17
 JAVA_RUN=	jre
 USE_RC_SUBR=	unifi
 
-CONFLICTS_INSTALL=	unifi6
+CONFLICTS_INSTALL=	unifi8
 
 EXTRACT_CMD=	${AR}
 EXTRACT_BEFORE_ARGS=	-p