From owner-svn-ports-head@freebsd.org Sat May 2 01:41:14 2020 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 993432B8563; Sat, 2 May 2020 01:41:14 +0000 (UTC) (envelope-from yuri@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49DWzs5yvpz4TCy; Sat, 2 May 2020 01:41:13 +0000 (UTC) (envelope-from yuri@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id B697319B1B; Sat, 2 May 2020 01:41:13 +0000 (UTC) (envelope-from yuri@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0421fD3O060860; Sat, 2 May 2020 01:41:13 GMT (envelope-from yuri@FreeBSD.org) Received: (from yuri@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0421fDcL060858; Sat, 2 May 2020 01:41:13 GMT (envelope-from yuri@FreeBSD.org) Message-Id: <202005020141.0421fDcL060858@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: yuri set sender to yuri@FreeBSD.org using -f From: Yuri Victorovich Date: Sat, 2 May 2020 01:41:13 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r533650 - in head/math: vtk6 vtk8 vtk9 X-SVN-Group: ports-head X-SVN-Commit-Author: yuri X-SVN-Commit-Paths: in head/math: vtk6 vtk8 vtk9 X-SVN-Commit-Revision: 533650 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 02 May 2020 01:41:14 -0000 Author: yuri Date: Sat May 2 01:41:12 2020 New Revision: 533650 URL: https://svnweb.freebsd.org/changeset/ports/533650 Log: math/vtk*: Fix CONFLICTS lines Modified: head/math/vtk6/Makefile head/math/vtk8/Makefile head/math/vtk9/Makefile Modified: head/math/vtk6/Makefile ============================================================================== --- head/math/vtk6/Makefile Sat May 2 01:40:15 2020 (r533649) +++ head/math/vtk6/Makefile Sat May 2 01:41:12 2020 (r533650) @@ -23,7 +23,7 @@ LIB_DEPENDS= libtiff.so:graphics/tiff \ # TODO # * VTK Groups -CONFLICTS= vtk8 +CONFLICTS= vtk8 vtk9 USES= alias cmake jpeg localbase xorg USE_LDCONFIG= ${PREFIX}/lib/vtk-${VTK_SHORT_VER} USE_XORG= xt sm ice x11 xext Modified: head/math/vtk8/Makefile ============================================================================== --- head/math/vtk8/Makefile Sat May 2 01:40:15 2020 (r533649) +++ head/math/vtk8/Makefile Sat May 2 01:41:12 2020 (r533650) @@ -17,7 +17,7 @@ LIB_DEPENDS= libtiff.so:graphics/tiff \ libfreetype.so:print/freetype2 \ libexpat.so:textproc/expat2 -CONFLICTS= vtk5 vtk6 +CONFLICTS= vtk6 vtk9 USES= alias cmake compiler:c++11-lang gl jpeg localbase xorg USE_LDCONFIG= ${PREFIX}/lib/vtk-${VTK_SHORT_VER} Modified: head/math/vtk9/Makefile ============================================================================== --- head/math/vtk9/Makefile Sat May 2 01:40:15 2020 (r533649) +++ head/math/vtk9/Makefile Sat May 2 01:41:12 2020 (r533650) @@ -17,7 +17,7 @@ LIB_DEPENDS= libtiff.so:graphics/tiff \ libfreetype.so:print/freetype2 \ libexpat.so:textproc/expat2 -CONFLICTS= vtk5 vtk6 +CONFLICTS= vtk6 vtk8 USES= alias cmake compiler:c++11-lang gl jpeg localbase xorg USE_LDCONFIG= ${PREFIX}/lib/vtk-${VTK_SHORT_VER}