Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 22 Apr 2018 18:16:02 +0000 (UTC)
From:      Michael Reifenberger <mr@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r468046 - in head/cad: . openscad
Message-ID:  <201804221816.w3MIG2AD017119@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201804221816.w3MIG2AD017119>