Date: Thu, 7 Jul 2016 19:33:37 +0000 (UTC) From: Cy Schubert <cy@FreeBSD.org> 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 Message-ID: <201607071933.u67JXblf095615@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201607071933.u67JXblf095615>