From owner-svn-ports-head@freebsd.org Fri Sep 28 02:41:26 2018 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id BC844109EFDA; Fri, 28 Sep 2018 02:41:26 +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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 6BD47819CA; Fri, 28 Sep 2018 02:41:26 +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 669916FB5; Fri, 28 Sep 2018 02:41:26 +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 w8S2fQAP021040; Fri, 28 Sep 2018 02:41:26 GMT (envelope-from yuri@FreeBSD.org) Received: (from yuri@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w8S2fQ9g021039; Fri, 28 Sep 2018 02:41:26 GMT (envelope-from yuri@FreeBSD.org) Message-Id: <201809280241.w8S2fQ9g021039@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: yuri set sender to yuri@FreeBSD.org using -f From: Yuri Victorovich Date: Fri, 28 Sep 2018 02:41:26 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r480838 - in head: science/paraview textproc/py-pygments X-SVN-Group: ports-head X-SVN-Commit-Author: yuri X-SVN-Commit-Paths: in head: science/paraview textproc/py-pygments X-SVN-Commit-Revision: 480838 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.27 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: Fri, 28 Sep 2018 02:41:26 -0000 Author: yuri Date: Fri Sep 28 02:41:25 2018 New Revision: 480838 URL: https://svnweb.freebsd.org/changeset/ports/480838 Log: textproc/py-pygments and science/paraview conflict each other Approved by: portmgr blanket Modified: head/science/paraview/Makefile head/textproc/py-pygments/Makefile Modified: head/science/paraview/Makefile ============================================================================== --- head/science/paraview/Makefile Fri Sep 28 00:12:48 2018 (r480837) +++ head/science/paraview/Makefile Fri Sep 28 02:41:25 2018 (r480838) @@ -42,6 +42,8 @@ USE_XORG= x11 xt xext ice xdmcp xau xcb xfixes xdamage USE_LDCONFIG= yes USE_GSTREAMER= yes +CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}pygments + CMAKE_ARGS+= -DBUILD_SHARED_LIBS="ON" \ -DVTK_USE_SYSTEM_PNG="ON" \ -DVTK_USE_SYSTEM_JPEG="ON" \ Modified: head/textproc/py-pygments/Makefile ============================================================================== --- head/textproc/py-pygments/Makefile Fri Sep 28 00:12:48 2018 (r480837) +++ head/textproc/py-pygments/Makefile Fri Sep 28 02:41:25 2018 (r480838) @@ -17,4 +17,10 @@ USES= python USE_PYTHON= distutils concurrent autoplist NO_ARCH= yes -.include +.include + +.if ${PYTHON_VER} == 2.7 +CONFLICTS_INSTALL= paraview +.endif + +.include