aboutsummaryrefslogtreecommitdiff
path: root/cad
diff options
context:
space:
mode:
authorJoseph Mingrone <jrm@FreeBSD.org>2018-10-28 05:02:36 +0000
committerJoseph Mingrone <jrm@FreeBSD.org>2018-10-28 05:02:36 +0000
commitab7ec115734cb7df078bfd03f770e895815113c5 (patch)
treee26037e6400aed1c90e21fca9c3909ca0119182c /cad
parent729f4c97de9905894936d7206c5cade7fa960d40 (diff)
downloadports-ab7ec115734cb7df078bfd03f770e895815113c5.tar.gz
ports-ab7ec115734cb7df078bfd03f770e895815113c5.zip
cad/gmsh: Remove CONFLICTS related to OCC knob and cad/gmsh-occ
cad/gmsh-occ was removed in r482318
Notes
Notes: svn path=/head/; revision=483224
Diffstat (limited to 'cad')
-rw-r--r--cad/gmsh/Makefile2
1 files changed, 0 insertions, 2 deletions
diff --git a/cad/gmsh/Makefile b/cad/gmsh/Makefile
index 02bf97ca655a..64dec3207529 100644
--- a/cad/gmsh/Makefile
+++ b/cad/gmsh/Makefile
@@ -58,8 +58,6 @@ MED_CMAKE_BOOL= ENABLE_MED
MED_LIB_DEPENDS= libmed.so:french/med
OCC_CMAKE_BOOL= ENABLE_OCC
OCC_CMAKE_ON= -DOCC_INC=${LOCALBASE}/include/OpenCASCADE
-OCC_CONFLICTS= gmsh-[23].*
-OCC_CONFLICTS_OFF= gmsh-occ-[23].*
OCC_LIB_DEPENDS= libopenblas.so:math/openblas libTKernel.so:cad/opencascade
OCC_USES= gnome
OCC_USE= gnome=cairo