From owner-svn-ports-head@freebsd.org  Sun Oct 28 05:02:37 2018
Return-Path: <owner-svn-ports-head@freebsd.org>
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 520CC10E3658;
 Sun, 28 Oct 2018 05:02:37 +0000 (UTC) (envelope-from jrm@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 08B226FE9C;
 Sun, 28 Oct 2018 05:02:37 +0000 (UTC) (envelope-from jrm@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 DE0291AD21;
 Sun, 28 Oct 2018 05:02:36 +0000 (UTC) (envelope-from jrm@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w9S52abJ095556;
 Sun, 28 Oct 2018 05:02:36 GMT (envelope-from jrm@FreeBSD.org)
Received: (from jrm@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w9S52aTQ095555;
 Sun, 28 Oct 2018 05:02:36 GMT (envelope-from jrm@FreeBSD.org)
Message-Id: <201810280502.w9S52aTQ095555@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: jrm set sender to jrm@FreeBSD.org
 using -f
From: Joseph Mingrone <jrm@FreeBSD.org>
Date: Sun, 28 Oct 2018 05:02:36 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r483224 - head/cad/gmsh
X-SVN-Group: ports-head
X-SVN-Commit-Author: jrm
X-SVN-Commit-Paths: head/cad/gmsh
X-SVN-Commit-Revision: 483224
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.29
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 28 Oct 2018 05:02:37 -0000

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