Index: head/cad/openscad-devel/Makefile
===================================================================
--- head/cad/openscad-devel/Makefile	(revision 468544)
+++ head/cad/openscad-devel/Makefile	(revision 468545)
@@ -1,52 +1,56 @@
 # Created by: Michael Reifenberger <mr@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	openscad
 PORTVERSION=	2018.04.19
 PORTREVISION=	1
 CATEGORIES=	cad
 PKGNAMESUFFIX=  -devel
 DIST_SUBDIR=            ${PORTNAME}
 
 MAINTAINER=	mr@FreeBSD.org
 COMMENT=	Programmer's solid 3D CAD modeller
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BROKEN_FreeBSD_10=      Missing __cxa_thread_atexit
-
 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 \
 		libzip.so:archivers/libzip
 
 CONFLICTS=	openscad
 
 USES=		bison compiler:c++11-lang desktop-file-utils eigen:3 gettext-tools \
 		pkgconfig python:run qmake shebangfix
 USE_GITHUB=     yes
 GH_ACCOUNT=     openscad
 GH_PROJECT=     openscad
 GH_TAGNAME=	179074dff8c23cbc0e651ce8463737df0006f4ca
 
 #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} \
-		EXPERIMENTAL=yes \
+		CONFIG+="experimental" \
 		QMAKE_LEX=${LOCALBASE}/bin/flex \
 		QMAKE_YAC=${LOCALBASE}/bin/bison
 
 post-patch:
 	@${REINPLACE_CMD} -e 's,share/man,man,' \
 		${WRKSRC}/openscad.pro
+
+.include <bsd.port.options.mk>
+
+.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1003506
+BROKEN=		no __cxa_thread_atexit() support in FreeBSD libc < 10.4
+.endif
 
 .include <bsd.port.mk>
Index: head/cad/openscad-devel/files/patch-openscad.pro
===================================================================
--- head/cad/openscad-devel/files/patch-openscad.pro	(revision 468544)
+++ head/cad/openscad-devel/files/patch-openscad.pro	(revision 468545)
@@ -1,18 +1,13 @@
 --- openscad.pro.orig	2018-04-19 22:08:08 UTC
 +++ openscad.pro
-@@ -1,3 +1,4 @@
-+CONFIG+=experimental
- # Environment variables which can be set to specify library locations:
- # MPIRDIR
- # MPFRDIR
 @@ -105,6 +106,10 @@ mingw* {
  CONFIG += qt
  QT += widgets concurrent
  
 +freebsd* {
 +   LIBS += -lcompat
 +}
 +
  netbsd* {
     QMAKE_LFLAGS += -L/usr/X11R7/lib
     QMAKE_LFLAGS += -Wl,-R/usr/X11R7/lib