aboutsummaryrefslogtreecommitdiffstats
path: root/cad
diff options
context:
space:
mode:
authorMichael Reifenberger <mr@FreeBSD.org>2018-04-26 00:29:09 +0800
committerMichael Reifenberger <mr@FreeBSD.org>2018-04-26 00:29:09 +0800
commit55caf841166c6b623c560ed35330457f97311a2e (patch)
treee341e309826315293a130abc58e174228acbd247 /cad
parent7bd53a164ac94f54354b903e8fe7e8081c7e0df5 (diff)
downloadfreebsd-ports-gnome-55caf841166c6b623c560ed35330457f97311a2e.tar.gz
freebsd-ports-gnome-55caf841166c6b623c560ed35330457f97311a2e.tar.zst
freebsd-ports-gnome-55caf841166c6b623c560ed35330457f97311a2e.zip
Enable experimental features.
Make portlint happy. Mark Broken for FreeBSD 10 due to compile/link error.
Diffstat (limited to 'cad')
-rw-r--r--cad/openscad-devel/Makefile15
-rw-r--r--cad/openscad-devel/files/patch-openscad.pro13
-rw-r--r--cad/openscad-devel/files/patch-src-ModuleCache.h8
3 files changed, 21 insertions, 15 deletions
diff --git a/cad/openscad-devel/Makefile b/cad/openscad-devel/Makefile
index 1cd472c9afbe..65ad017d2d1d 100644
--- a/cad/openscad-devel/Makefile
+++ b/cad/openscad-devel/Makefile
@@ -3,7 +3,7 @@
PORTNAME= openscad
PORTVERSION= 2018.04.19
-#PORTREVISION= 1
+PORTREVISION= 1
CATEGORIES= cad
PKGNAMESUFFIX= -devel
DIST_SUBDIR= ${PORTNAME}
@@ -14,6 +14,8 @@ 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 \
@@ -26,19 +28,20 @@ LIB_DEPENDS= libgmp.so:math/gmp \
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
-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} \
+ EXPERIMENTAL=yes \
QMAKE_LEX=${LOCALBASE}/bin/flex \
QMAKE_YAC=${LOCALBASE}/bin/bison
@@ -46,10 +49,4 @@ 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>
diff --git a/cad/openscad-devel/files/patch-openscad.pro b/cad/openscad-devel/files/patch-openscad.pro
index 7412623be912..e261d4978ac7 100644
--- a/cad/openscad-devel/files/patch-openscad.pro
+++ b/cad/openscad-devel/files/patch-openscad.pro
@@ -1,6 +1,12 @@
---- openscad.pro.orig 2018-04-22 17:21:31.278695000 +0000
-+++ openscad.pro 2018-04-22 17:21:39.335408000 +0000
-@@ -106,4 +106,8 @@
+--- 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* {
@@ -9,3 +15,4 @@
+
netbsd* {
QMAKE_LFLAGS += -L/usr/X11R7/lib
+ QMAKE_LFLAGS += -Wl,-R/usr/X11R7/lib
diff --git a/cad/openscad-devel/files/patch-src-ModuleCache.h b/cad/openscad-devel/files/patch-src-ModuleCache.h
index 2c077446f02e..45667ac28988 100644
--- a/cad/openscad-devel/files/patch-src-ModuleCache.h
+++ b/cad/openscad-devel/files/patch-src-ModuleCache.h
@@ -1,8 +1,10 @@
---- src/ModuleCache.h.orig 2018-04-22 17:10:59.553926000 +0000
-+++ src/ModuleCache.h 2018-04-22 17:11:26.751065000 +0000
-@@ -2,4 +2,5 @@
+--- src/ModuleCache.h.orig 2018-04-19 22:08:08 UTC
++++ src/ModuleCache.h
+@@ -1,6 +1,7 @@
+ #pragma once
#include <string>
+#include <time.h>
#include <unordered_map>
+ /*!