From 705acbf574855a5201844da6af32f88817c96861 Mon Sep 17 00:00:00 2001 From: Yuri Victorovich Date: Fri, 28 Sep 2018 02:41:25 +0000 Subject: [PATCH] textproc/py-pygments and science/paraview conflict each other Approved by: portmgr blanket --- science/paraview/Makefile | 2 ++ textproc/py-pygments/Makefile | 8 +++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/science/paraview/Makefile b/science/paraview/Makefile index 80af7558a31b..576305dbc217 100644 --- a/science/paraview/Makefile +++ b/science/paraview/Makefile @@ -42,6 +42,8 @@ USE_XORG= x11 xt xext ice xdmcp xau xcb xfixes xdamage xxf86vm xrender sm xorgpr 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" \ diff --git a/textproc/py-pygments/Makefile b/textproc/py-pygments/Makefile index 886172945091..a84c9853210f 100644 --- a/textproc/py-pygments/Makefile +++ b/textproc/py-pygments/Makefile @@ -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