svn commit: r483224 - head/cad/gmsh

[Joseph Mingrone]

Author: jrm
Date: Sun Oct 28 05:02:36 2018
New Revision: 483224
URL: https://svnweb.freebsd.org/changeset/ports/483224

Log:
  cad/gmsh: Remove CONFLICTS related to OCC knob and cad/gmsh-occ
  
  cad/gmsh-occ was removed in r482318

Modified:
  head/cad/gmsh/Makefile   (contents, props changed)

Modified: head/cad/gmsh/Makefile
==============================================================================
--- head/cad/gmsh/Makefile	Sun Oct 28 04:45:48 2018	(r483223)
+++ head/cad/gmsh/Makefile	Sun Oct 28 05:02:36 2018	(r483224)
@@ -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