From owner-svn-ports-all@freebsd.org  Thu Jul  7 19:33:38 2016
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 74048B82665;
 Thu,  7 Jul 2016 19:33:38 +0000 (UTC) (envelope-from cy@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 404801262;
 Thu,  7 Jul 2016 19:33:38 +0000 (UTC) (envelope-from cy@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u67JXbOZ095618;
 Thu, 7 Jul 2016 19:33:37 GMT (envelope-from cy@FreeBSD.org)
Received: (from cy@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u67JXblf095615;
 Thu, 7 Jul 2016 19:33:37 GMT (envelope-from cy@FreeBSD.org)
Message-Id: <201607071933.u67JXblf095615@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: cy set sender to cy@FreeBSD.org
 using -f
From: Cy Schubert <cy@FreeBSD.org>
Date: Thu, 7 Jul 2016 19:33:37 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r418196 - in head/net: tightvnc tridiavnc vnc
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.22
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 07 Jul 2016 19:33:38 -0000

Author: cy
Date: Thu Jul  7 19:33:37 2016
New Revision: 418196
URL: https://svnweb.freebsd.org/changeset/ports/418196

Log:
  Register tigervnc conflict.

Modified:
  head/net/tightvnc/Makefile
  head/net/tridiavnc/Makefile
  head/net/vnc/Makefile

Modified: head/net/tightvnc/Makefile
==============================================================================
--- head/net/tightvnc/Makefile	Thu Jul  7 19:30:36 2016	(r418195)
+++ head/net/tightvnc/Makefile	Thu Jul  7 19:33:37 2016	(r418196)
@@ -19,7 +19,7 @@ RUN_DEPENDS=	showrgb:x11/rgb \
 		xorg-fonts>=7.2:x11-fonts/xorg-fonts
 
 MAKE_JOBS_UNSAFE=	yes
-CONFLICTS=	tridiavnc-[0-9]* vnc-[0-9]*
+CONFLICTS=	tridiavnc-[0-9]* vnc-[0-9]* tigervnc-*
 WRKSRC=		${WRKDIR}/vnc_unixsrc
 USES=		cpe imake jpeg shebangfix perl5 tar:bzip2
 SHEBANG_FILES=	vncserver

Modified: head/net/tridiavnc/Makefile
==============================================================================
--- head/net/tridiavnc/Makefile	Thu Jul  7 19:30:36 2016	(r418195)
+++ head/net/tridiavnc/Makefile	Thu Jul  7 19:33:37 2016	(r418196)
@@ -21,7 +21,7 @@ ALL_TARGET=	World
 XFREE86_HTML_MAN=	no
 MAKE_JOBS_UNSAFE=yes
 
-CONFLICTS=	tightvnc-[0-9]* vnc-[0-9]*
+CONFLICTS=	tightvnc-[0-9]* vnc-[0-9]* tigervnc-*
 
 # .ifdef(TRIDIAVNC_BASE)
 # PREFIX=${TRIDIAVNC_BASE}

Modified: head/net/vnc/Makefile
==============================================================================
--- head/net/vnc/Makefile	Thu Jul  7 19:30:36 2016	(r418195)
+++ head/net/vnc/Makefile	Thu Jul  7 19:33:37 2016	(r418196)
@@ -28,7 +28,7 @@ USE_XORG=	x11 xext xpm xext xtst sm ice 
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/unix
 PLIST=		${WRKDIR}/pkg-plist
-CONFLICTS=	tightvnc-[0-9]* tridiavnc-[0-9]*
+CONFLICTS=	tightvnc-[0-9]* tridiavnc-[0-9]* tigervnc-*
 
 OPTIONS_DEFINE=	SERVER
 OPTIONS_DEFAULT=	SERVER