Date: Fri, 28 Sep 2018 02:41:26 +0000 (UTC) From: Yuri Victorovich <yuri@FreeBSD.org> 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 Message-ID: <201809280241.w8S2fQ9g021039@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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 <bsd.port.mk> +.include <bsd.port.pre.mk> + +.if ${PYTHON_VER} == 2.7 +CONFLICTS_INSTALL= paraview +.endif + +.include <bsd.port.post.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201809280241.w8S2fQ9g021039>