From owner-svn-ports-all@freebsd.org  Sun Apr 22 18:16:03 2018
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@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 329BDFB360D;
 Sun, 22 Apr 2018 18:16:03 +0000 (UTC) (envelope-from mr@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 D609374A9B;
 Sun, 22 Apr 2018 18:16:02 +0000 (UTC) (envelope-from mr@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 CD889193BB;
 Sun, 22 Apr 2018 18:16:02 +0000 (UTC) (envelope-from mr@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w3MIG2fg017121;
 Sun, 22 Apr 2018 18:16:02 GMT (envelope-from mr@FreeBSD.org)
Received: (from mr@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w3MIG2AD017119;
 Sun, 22 Apr 2018 18:16:02 GMT (envelope-from mr@FreeBSD.org)
Message-Id: <201804221816.w3MIG2AD017119@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: mr set sender to mr@FreeBSD.org
 using -f
From: Michael Reifenberger <mr@FreeBSD.org>
Date: Sun, 22 Apr 2018 18:16:02 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r468046 - in head/cad: . openscad
X-SVN-Group: ports-head
X-SVN-Commit-Author: mr
X-SVN-Commit-Paths: in head/cad: . openscad
X-SVN-Commit-Revision: 468046
X-SVN-Commit-Repository: ports
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 22 Apr 2018 18:16:03 -0000

Author: mr
Date: Sun Apr 22 18:16:02 2018
New Revision: 468046
URL: https://svnweb.freebsd.org/changeset/ports/468046

Log:
  Add openscad-devel to the build and register conflict.

Modified:
  head/cad/Makefile
  head/cad/openscad/Makefile

Modified: head/cad/Makefile
==============================================================================
--- head/cad/Makefile	Sun Apr 22 18:14:40 2018	(r468045)
+++ head/cad/Makefile	Sun Apr 22 18:16:02 2018	(r468046)
@@ -64,6 +64,7 @@
     SUBDIR += ngspice_rework
     SUBDIR += opencascade
     SUBDIR += openscad
+    SUBDIR += openscad-devel
     SUBDIR += openvsp
     SUBDIR += p5-GDS2
     SUBDIR += p5-Verilog-Perl

Modified: head/cad/openscad/Makefile
==============================================================================
--- head/cad/openscad/Makefile	Sun Apr 22 18:14:40 2018	(r468045)
+++ head/cad/openscad/Makefile	Sun Apr 22 18:16:02 2018	(r468046)
@@ -23,6 +23,8 @@ LIB_DEPENDS=	libgmp.so:math/gmp \
 		libharfbuzz.so:print/harfbuzz \
 		libopencsg.so:graphics/opencsg
 
+CONFLICTS=      openscad-devel
+
 USES=		bison compiler:c++11-lang desktop-file-utils eigen:3 gettext-tools \
 		pkgconfig python:run qmake shebangfix
 SHEBANG_FILES=	libraries/MCAD/get_submodules.py
@@ -38,5 +40,11 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 post-patch:
 	@${REINPLACE_CMD} -e 's,share/man,man,' \
 		${WRKSRC}/openscad.pro
+
+#.include <bsd.port.options.mk>
+#
+#.if ${ARCH} == i386 && ${OSVERSION} >= 1100000
+#USE_GCC=        yes
+#.endif
 
 .include <bsd.port.mk>