Index: head/cad/Makefile
===================================================================
--- head/cad/Makefile	(revision 468045)
+++ head/cad/Makefile	(revision 468046)
@@ -1,102 +1,103 @@
 # $FreeBSD$
 #
 
     COMMENT = CAD tools
 
     SUBDIR += NASTRAN-95
     SUBDIR += admesh
     SUBDIR += adms
     SUBDIR += alliance
     SUBDIR += astk-client
     SUBDIR += astk-serveur
     SUBDIR += atlc
     SUBDIR += basicdsp
     SUBDIR += brickutils
     SUBDIR += brlcad
     SUBDIR += calculix
     SUBDIR += calculix-ccx
     SUBDIR += cascade
     SUBDIR += chipvault
     SUBDIR += cider
     SUBDIR += cura-engine
     SUBDIR += dinotrace
     SUBDIR += dxf2fig
     SUBDIR += electric
     SUBDIR += electric-ng
     SUBDIR += elmerfem
     SUBDIR += feappv
     SUBDIR += fidocadj
     SUBDIR += freecad
     SUBDIR += freehdl
     SUBDIR += fritzing
     SUBDIR += gdsreader
     SUBDIR += gdt
     SUBDIR += geda
     SUBDIR += gerbv
     SUBDIR += ghdl
     SUBDIR += gmsh
     SUBDIR += gmsh-occ
     SUBDIR += gnucap
     SUBDIR += gplcver
     SUBDIR += gspiceui
     SUBDIR += gtkwave
     SUBDIR += impact
     SUBDIR += irsim
     SUBDIR += iverilog
     SUBDIR += jspice3
     SUBDIR += kicad
     SUBDIR += kicad-devel
     SUBDIR += kicad-library
     SUBDIR += kicad-library-devel
     SUBDIR += klayout
     SUBDIR += layouteditor
     SUBDIR += ldraw
     SUBDIR += leocad
     SUBDIR += libopencad
     SUBDIR += librecad
     SUBDIR += linux-eagle5
     SUBDIR += linuxcnc-devel
     SUBDIR += logisim
     SUBDIR += magic
     SUBDIR += meshdev
     SUBDIR += meshlab
     SUBDIR += netgen
     SUBDIR += ngspice_rework
     SUBDIR += opencascade
     SUBDIR += openscad
+    SUBDIR += openscad-devel
     SUBDIR += openvsp
     SUBDIR += p5-GDS2
     SUBDIR += p5-Verilog-Perl
     SUBDIR += pcb
     SUBDIR += pdnmesh
     SUBDIR += py-gdspy
     SUBDIR += py-lcapy
     SUBDIR += py-pycam
     SUBDIR += py-pyfda
     SUBDIR += python-gdsii
     SUBDIR += pythoncad
     SUBDIR += qcad
     SUBDIR += qelectrotech
     SUBDIR += qfsm
     SUBDIR += qmls
     SUBDIR += qucs
     SUBDIR += repsnapper
     SUBDIR += rubygem-gdsii
     SUBDIR += sceptre
     SUBDIR += scotch
     SUBDIR += solvespace
     SUBDIR += sp2sp
     SUBDIR += spice
     SUBDIR += stepcode
     SUBDIR += sumo
     SUBDIR += sweethome3d
     SUBDIR += tkgate
     SUBDIR += tochnog
     SUBDIR += transcalc
     SUBDIR += varkon
     SUBDIR += verilog-mode.el
     SUBDIR += xcircuit
     SUBDIR += z88
     SUBDIR += zcad
 
 .include <bsd.port.subdir.mk>
Index: head/cad/openscad/Makefile
===================================================================
--- head/cad/openscad/Makefile	(revision 468045)
+++ head/cad/openscad/Makefile	(revision 468046)
@@ -1,42 +1,50 @@
 # Created by: Michael Reifenberger <mr@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	openscad
 PORTVERSION=	2015.03
 PORTREVISION=	18
 CATEGORIES=	cad
 MASTER_SITES=	http://files.openscad.org/
 DISTNAME=	openscad-${PORTVERSION}.src
 
 MAINTAINER=	mr@FreeBSD.org
 COMMENT=	Programmer's solid 3D CAD modeller
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	${LOCALBASE}/bin/flex:textproc/flex \
 		${LOCALBASE}/include/boost/tuple/tuple.hpp:devel/boost-libs
 LIB_DEPENDS=	libgmp.so:math/gmp \
 		libmpfr.so:math/mpfr \
 		libCGAL.so:math/cgal \
 		libqscintilla2_qt4.so:devel/qscintilla2 \
 		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
 USE_GL=		glu glew
 USE_QT4=	corelib gui opengl moc_build uic_build rcc_build
 PLIST_SUB=	PORTVERSION=${PORTVERSION}
 QMAKE_ENV=	EIGENDIR=${LOCALBASE}/include/eigen3
 QMAKE_ARGS+=	VERSION=${PORTVERSION} \
 		QMAKE_LEX=${LOCALBASE}/bin/flex \
 		QMAKE_YAC=${LOCALBASE}/bin/bison
 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>