git: 0cbaec563506 - main - multimedia/mkvtoolnix: Fix CONFLICTS with -nox11 port

From: Thomas Zander <riggs_at_FreeBSD.org>
Date: Mon, 06 Mar 2023 07:20:24 UTC 
The branch main has been updated by riggs:

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

commit 0cbaec56350601191e89f59962f0e8a6bbac5fd2
Author:     Thomas Zander <riggs@FreeBSD.org>
AuthorDate: 2023-03-06 07:13:59 +0000
Commit:     Thomas Zander <riggs@FreeBSD.org>
CommitDate: 2023-03-06 07:13:59 +0000

    multimedia/mkvtoolnix: Fix CONFLICTS with -nox11 port
    
    Reported by:    keith.chiem@gmail.com (via mail)
---
 multimedia/mkvtoolnix/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/multimedia/mkvtoolnix/Makefile b/multimedia/mkvtoolnix/Makefile
index 8294be130eda..4441bcface4a 100644
--- a/multimedia/mkvtoolnix/Makefile
+++ b/multimedia/mkvtoolnix/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	mkvtoolnix
 PORTVERSION=	74.0.0
-PORTREVISION?=	1
+PORTREVISION?=	2
 CATEGORIES=	multimedia audio
 MASTER_SITES=	https://www.bunkus.org/videotools/mkvtoolnix/sources/ \
 		https://mkvtoolnix.download/sources/
@@ -30,7 +30,7 @@ LIB_DEPENDS=	libvorbis.so:audio/libvorbis \
 USES=		compiler:c++17-lang iconv localbase pkgconfig qmake:no_env qt:5 tar:xz
 USE_QT=		buildtools:build concurrent core linguisttools:build multimedia svg
 
-CONFLICTS=	mkvtoolnix-nox11
+CONFLICTS?=	mkvtoolnix-nox11
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-boost=${LOCALBASE} \