Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 28 Apr 2018 14:19:25 +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: r468545 - in head/cad/openscad-devel: . files
Message-ID:  <201804281419.w3SEJPd5064087@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: mr
Date: Sat Apr 28 14:19:25 2018
New Revision: 468545
URL: https://svnweb.freebsd.org/changeset/ports/468545

Log:
  Reenable for FreeBSD >= 10.4
  Use the CONFIG argument to enable experimental features
  
  Submitted by:	jbeich@

Modified:
  head/cad/openscad-devel/Makefile
  head/cad/openscad-devel/files/patch-openscad.pro

Modified: head/cad/openscad-devel/Makefile
==============================================================================
--- head/cad/openscad-devel/Makefile	Sat Apr 28 14:17:06 2018	(r468544)
+++ head/cad/openscad-devel/Makefile	Sat Apr 28 14:19:25 2018	(r468545)
@@ -14,8 +14,6 @@ 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 \
@@ -41,12 +39,18 @@ USE_QT4=	corelib gui opengl moc_build uic_build rcc_bu
 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>

Modified: head/cad/openscad-devel/files/patch-openscad.pro
==============================================================================
--- head/cad/openscad-devel/files/patch-openscad.pro	Sat Apr 28 14:17:06 2018	(r468544)
+++ head/cad/openscad-devel/files/patch-openscad.pro	Sat Apr 28 14:19:25 2018	(r468545)
@@ -1,10 +1,5 @@
 --- 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



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