git: 9e703966e84a - main - net/tigervnc-server: Fix CONFLICTS

Go to: [ bottom of page ] [ top of archives ] [ this month ]

From: Stefan Eßer <se_at_FreeBSD.org>
Date: Thu, 25 Nov 2021 22:37:17 UTC

The branch main has been updated by se:

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

commit 9e703966e84a1c78709c91a16a18177d2fe9d73c
Author:     Stefan Eßer <se@FreeBSD.org>
AuthorDate: 2021-11-25 22:35:20 +0000
Commit:     Stefan Eßer <se@FreeBSD.org>
CommitDate: 2021-11-25 22:36:59 +0000

    net/tigervnc-server: Fix CONFLICTS
    
    Remove redundant version wildcard.
    
    Approved by:    portmgr (blanket)
---
 net/tigervnc-server/Makefile.common.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net/tigervnc-server/Makefile.common.mk b/net/tigervnc-server/Makefile.common.mk
index 1df1ac5dffbf..2b311ac13d73 100644
--- a/net/tigervnc-server/Makefile.common.mk
+++ b/net/tigervnc-server/Makefile.common.mk
@@ -12,7 +12,7 @@ USES+=		cmake:insource,noninja cpe
 USE_GITHUB=	yes
 
 GH_ACCOUNT=	TigerVNC
-CONFLICTS=	tightvnc-[0-9]*
+CONFLICTS=	tightvnc
 PLIST_SUB+=	TIGERVNC_COMPONENT=${PORTNAME}${PKGNAMESUFFIX}-
 
 CMAKE_ARGS+=	-G "Unix Makefiles" -DINSTALL_SYSTEMD_UNITS:BOOL=false