Index: head/cad/openscad-devel/files/patch-openscad.pro =================================================================== --- head/cad/openscad-devel/files/patch-openscad.pro (revision 482974) +++ head/cad/openscad-devel/files/patch-openscad.pro (nonexistent) @@ -1,13 +0,0 @@ ---- openscad.pro.orig 2018-04-19 22:08:08 UTC -+++ openscad.pro -@@ -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 Property changes on: head/cad/openscad-devel/files/patch-openscad.pro ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/cad/openscad-devel/files/patch-src-ModuleCache.h =================================================================== --- head/cad/openscad-devel/files/patch-src-ModuleCache.h (revision 482974) +++ head/cad/openscad-devel/files/patch-src-ModuleCache.h (nonexistent) @@ -1,10 +0,0 @@ ---- src/ModuleCache.h.orig 2018-04-19 22:08:08 UTC -+++ src/ModuleCache.h -@@ -1,6 +1,7 @@ - #pragma once - - #include -+#include - #include - - /*! Property changes on: head/cad/openscad-devel/files/patch-src-ModuleCache.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/cad/openscad-devel/Makefile =================================================================== --- head/cad/openscad-devel/Makefile (revision 482974) +++ head/cad/openscad-devel/Makefile (revision 482975) @@ -1,50 +1,46 @@ # Created by: Michael Reifenberger # $FreeBSD$ PORTNAME= openscad -PORTVERSION= 2018.04.19 -PORTREVISION= 5 +PORTVERSION= 2018.10.22 CATEGORIES= cad PKGNAMESUFFIX= -devel -DIST_SUBDIR= ${PORTNAME} MAINTAINER= mr@FreeBSD.org -COMMENT= Programmer's solid 3D CAD modeller +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 \ +LIB_DEPENDS= libzip.so:archivers/libzip \ + libhidapi.so:comms/hidapi \ + libboost_regex.so:devel/boost-libs \ + libqscintilla2_qt5.so:devel/qscintilla2-qt5 \ + libopencsg.so:graphics/opencsg \ libCGAL.so:math/cgal \ - libqscintilla2_qt4.so:devel/qscintilla2 \ + libgmp.so:math/gmp \ + libmpfr.so:math/mpfr \ + libfreetype.so:print/freetype2 \ libharfbuzz.so:print/harfbuzz \ - libopencsg.so:graphics/opencsg \ - libzip.so:archivers/libzip + libfontconfig.so:x11-fonts/fontconfig CONFLICTS= openscad -USES= bison compiler:c++11-lang desktop-file-utils eigen:3 gettext-tools \ - pkgconfig python:run qmake qt:4 shebangfix +USES= bison compiler:c++11-lib desktop-file-utils eigen:3 gettext \ + pkgconfig qmake qt:5 shared-mime-info USE_GITHUB= yes -GH_ACCOUNT= openscad -GH_PROJECT= openscad -GH_TAGNAME= 179074dff8c23cbc0e651ce8463737df0006f4ca +USE_GL= gl glu glew +USE_GNOME= glib20 libxml2 +USE_QT= buildtools_build core concurrent_build dbus gui multimedia widgets +USE_XORG= x11 +GH_TAGNAME= b8160eac0cca045e091fa65c3f7fbe68fdfada59 +QMAKE_ARGS= CONFIG+="experimental" VERSION=${PORTVERSION} +# Avoid overlinking: kvm, procstat, boost(thread, system), Qt5(concurrent, network, printsupport) +LDFLAGS+= -Wl,--as-needed -#SHEBANG_FILES= libraries/MCAD/get_submodules.py -USE_GL= glu glew -USE_QT= corelib gui opengl moc_build uic_build rcc_build -PLIST_SUB= PORTVERSION=${PORTVERSION} -QMAKE_ENV= EIGENDIR=${LOCALBASE}/include/eigen3 -QMAKE_ARGS+= VERSION=${PORTVERSION} \ - CONFIG+="experimental" \ - QMAKE_LEX=${LOCALBASE}/bin/flex \ - QMAKE_YAC=${LOCALBASE}/bin/bison - post-patch: + @${REINPLACE_CMD} 's/-libusb//' ${WRKSRC}/features/hidapi.prf @${REINPLACE_CMD} -e 's,share/man,man,' \ ${WRKSRC}/openscad.pro .include Index: head/cad/openscad-devel/distinfo =================================================================== --- head/cad/openscad-devel/distinfo (revision 482974) +++ head/cad/openscad-devel/distinfo (revision 482975) @@ -1,3 +1,3 @@ -TIMESTAMP = 1524416781 -SHA256 (openscad/openscad-openscad-2018.04.19-179074dff8c23cbc0e651ce8463737df0006f4ca_GH0.tar.gz) = 6ca736909959d72eba21a1d421fc215742d26dad5b70dabe72b37e29e025088a -SIZE (openscad/openscad-openscad-2018.04.19-179074dff8c23cbc0e651ce8463737df0006f4ca_GH0.tar.gz) = 13915669 +TIMESTAMP = 1540263111 +SHA256 (openscad-openscad-2018.10.22-b8160eac0cca045e091fa65c3f7fbe68fdfada59_GH0.tar.gz) = d5692d8c617aaac58c3c14167044b7ea6220735771167280c2d372ceb93615bb +SIZE (openscad-openscad-2018.10.22-b8160eac0cca045e091fa65c3f7fbe68fdfada59_GH0.tar.gz) = 13924891 Index: head/cad/openscad-devel/pkg-plist =================================================================== --- head/cad/openscad-devel/pkg-plist (revision 482974) +++ head/cad/openscad-devel/pkg-plist (revision 482975) @@ -1,110 +1,112 @@ bin/openscad man/man1/openscad.1.gz -share/appdata/openscad.appdata.xml share/applications/openscad.desktop +share/metainfo/org.openscad.OpenSCAD.appdata.xml share/mime/packages/openscad.xml %%DATADIR%%/color-schemes/editor/dark-background.json %%DATADIR%%/color-schemes/editor/light-background.json %%DATADIR%%/color-schemes/editor/monokai.json %%DATADIR%%/color-schemes/editor/solarized-dark.json %%DATADIR%%/color-schemes/editor/solarized-light.json %%DATADIR%%/color-schemes/editor/tomorrow-night.json %%DATADIR%%/color-schemes/editor/tomorrow.json %%DATADIR%%/color-schemes/editor/visualstudio.json %%DATADIR%%/color-schemes/readme.txt %%DATADIR%%/color-schemes/render/beforedawn.json %%DATADIR%%/color-schemes/render/deepocean.json %%DATADIR%%/color-schemes/render/metallic.json %%DATADIR%%/color-schemes/render/monotone.json %%DATADIR%%/color-schemes/render/nature.json %%DATADIR%%/color-schemes/render/solarized.json %%DATADIR%%/color-schemes/render/starnight.json %%DATADIR%%/color-schemes/render/sunset.json %%DATADIR%%/color-schemes/render/tomorrow-night.json %%DATADIR%%/color-schemes/render/tomorrow.json %%DATADIR%%/examples/Advanced/GEB.scad %%DATADIR%%/examples/Advanced/animation.scad +%%DATADIR%%/examples/Advanced/assert.scad %%DATADIR%%/examples/Advanced/children.scad %%DATADIR%%/examples/Advanced/children_indexed.scad %%DATADIR%%/examples/Advanced/module_recursion.scad %%DATADIR%%/examples/Advanced/offset.scad %%DATADIR%%/examples/Advanced/surface_image.png %%DATADIR%%/examples/Advanced/surface_image.scad %%DATADIR%%/examples/Basics/CSG-modules.scad %%DATADIR%%/examples/Basics/CSG.scad %%DATADIR%%/examples/Basics/LetterBlock.scad %%DATADIR%%/examples/Basics/linear_extrude.scad %%DATADIR%%/examples/Basics/logo.scad %%DATADIR%%/examples/Basics/logo_and_text.scad %%DATADIR%%/examples/Basics/projection.scad %%DATADIR%%/examples/Basics/projection.stl %%DATADIR%%/examples/Basics/rotate_extrude.scad %%DATADIR%%/examples/Basics/text_on_cube.scad %%DATADIR%%/examples/COPYING-CC0.txt +%%DATADIR%%/examples/Functions/echo.scad %%DATADIR%%/examples/Functions/functions.scad %%DATADIR%%/examples/Functions/list_comprehensions.scad %%DATADIR%%/examples/Functions/polygon_areas.scad %%DATADIR%%/examples/Functions/recursion.scad %%DATADIR%%/examples/Old/example001.scad %%DATADIR%%/examples/Old/example002.scad %%DATADIR%%/examples/Old/example003.scad %%DATADIR%%/examples/Old/example004.scad %%DATADIR%%/examples/Old/example005.scad %%DATADIR%%/examples/Old/example006.scad %%DATADIR%%/examples/Old/example007.dxf %%DATADIR%%/examples/Old/example007.scad %%DATADIR%%/examples/Old/example008.dxf %%DATADIR%%/examples/Old/example008.scad %%DATADIR%%/examples/Old/example009.dxf %%DATADIR%%/examples/Old/example009.scad %%DATADIR%%/examples/Old/example010.dat %%DATADIR%%/examples/Old/example010.scad %%DATADIR%%/examples/Old/example011.scad %%DATADIR%%/examples/Old/example012.scad %%DATADIR%%/examples/Old/example012.stl %%DATADIR%%/examples/Old/example013.dxf %%DATADIR%%/examples/Old/example013.scad %%DATADIR%%/examples/Old/example014.scad %%DATADIR%%/examples/Old/example015.scad %%DATADIR%%/examples/Old/example016.scad %%DATADIR%%/examples/Old/example016.stl %%DATADIR%%/examples/Old/example017.scad %%DATADIR%%/examples/Old/example018.scad %%DATADIR%%/examples/Old/example019.scad %%DATADIR%%/examples/Old/example020.scad %%DATADIR%%/examples/Old/example021.scad %%DATADIR%%/examples/Old/example022.scad %%DATADIR%%/examples/Old/example023.scad %%DATADIR%%/examples/Old/example024.scad %%DATADIR%%/examples/Parametric/candleStand.json %%DATADIR%%/examples/Parametric/candleStand.scad %%DATADIR%%/examples/Parametric/sign.json %%DATADIR%%/examples/Parametric/sign.scad %%DATADIR%%/examples/examples.json %%DATADIR%%/fonts/05-osx-fonts.conf %%DATADIR%%/fonts/10-liberation.conf %%DATADIR%%/fonts/Liberation-2.00.1/AUTHORS %%DATADIR%%/fonts/Liberation-2.00.1/ChangeLog %%DATADIR%%/fonts/Liberation-2.00.1/LICENSE %%DATADIR%%/fonts/Liberation-2.00.1/README %%DATADIR%%/fonts/Liberation-2.00.1/TODO %%DATADIR%%/fonts/Liberation-2.00.1/ttf/LiberationMono-Bold.ttf %%DATADIR%%/fonts/Liberation-2.00.1/ttf/LiberationMono-BoldItalic.ttf %%DATADIR%%/fonts/Liberation-2.00.1/ttf/LiberationMono-Italic.ttf %%DATADIR%%/fonts/Liberation-2.00.1/ttf/LiberationMono-Regular.ttf %%DATADIR%%/fonts/Liberation-2.00.1/ttf/LiberationSans-Bold.ttf %%DATADIR%%/fonts/Liberation-2.00.1/ttf/LiberationSans-BoldItalic.ttf %%DATADIR%%/fonts/Liberation-2.00.1/ttf/LiberationSans-Italic.ttf %%DATADIR%%/fonts/Liberation-2.00.1/ttf/LiberationSans-Regular.ttf %%DATADIR%%/fonts/Liberation-2.00.1/ttf/LiberationSerif-Bold.ttf %%DATADIR%%/fonts/Liberation-2.00.1/ttf/LiberationSerif-BoldItalic.ttf %%DATADIR%%/fonts/Liberation-2.00.1/ttf/LiberationSerif-Italic.ttf %%DATADIR%%/fonts/Liberation-2.00.1/ttf/LiberationSerif-Regular.ttf %%DATADIR%%/locale/cs/LC_MESSAGES/openscad.mo %%DATADIR%%/locale/de/LC_MESSAGES/openscad.mo %%DATADIR%%/locale/es/LC_MESSAGES/openscad.mo %%DATADIR%%/locale/fr/LC_MESSAGES/openscad.mo %%DATADIR%%/locale/pl/LC_MESSAGES/openscad.mo %%DATADIR%%/locale/ru/LC_MESSAGES/openscad.mo share/pixmaps/openscad.png @dir %%DATADIR%%/libraries/MCAD