Update OpenSCAD to 2015.03p2

from the release notes:

  # OpenSCAD 2015.03

    **Language Features:**
    * Added text() module for 2D text
    * Added offset() module for 2D offsets
    * Added list comprehensions and let()
    * Added concat() function
    * Added chr() function
    * surface() can now take PNG images as input
    * min() and max() can now take a vector argument
    * 2D minkowski can now handle polygons with holes
    * Variables can now be assigned in local blocks without using assign()

    **Program Features:**
    * Added Toolbar icons
    * New code editor based on QScintilla
    * Added Splash screen
    * Added SVG export
    * Added AMF export
    * Added --viewall and --autocenter cmd-line parameters
    * GUI is now translated into German, Czech, Spanish, French and Russian
    * MDI (Multiple Document Interface) is now available on all platforms
    * Color schemes for viewer and editor can be user-edited using JSON files
    * GUI components are now dockable
    * Added Tickmarks on axes

    **Bugfixes/improvements:**
    * Performance improvement: 2D (clipper), preview, hull, minkowski, surface
    * Performance improvement: Reduce duplicate evaluation of identical expressions
    * Better recursion behavior
    * STL export and import is now more robust
    * Internal cavities are better supported
    * New examples
    * Windows cmd-line behaves better
    * Better mirror() and scale() behavior when using negative factors

    **Deprecations:**
    * polyhedron() now takes a faces= argument rather than triangles=
    * assign() is no longer needed. Local variables can be created in any scope

  # OpenSCAD 2014.03

    **Language Features:**
    * Added diameter argument: circle(d), cylinder(d, d1, d2) and sphere(d)
    * Added parent_module() and $parent_modules
    * Added children() as a replacement for child()
    * Unicode strings (using UTF-8) are now correctly handled
    * Ranges can have a negative step value
    * Added norm() and cross() functions

    **Program Features:**
    * Cmd-line: --info parameter prints system/library info
    * Cmd-line: --csglimit parameter to change CSG rendering limit
    * Cmd-line: Better handling of cmd-line arguments under Windows
    * GUI: Added Reset View
    * GUI: Added Search&Replace in editor
    * GUI: Syntax highlighting now has a dark background theme
    * GUI: We now create a backup file before rendering to allow for recovery if OpenSCAD crashes/freezes
    * GUI: Accessibility features enabled (e.g. screenreading)

    **Bugfixes/improvements:**
    * Reading empty STL files sometimes caused a crash
    * OPENSCADPATH now uses semicolon as path separator under Windows
    * polyhedron() is now much more robust handling almost planar polygons
    * Automatic reloads of large designs are more robust
    * Boolean logic in if() statements are now correctly short-circuited
    * rands() with zero range caused an infinite loop
    * resize(, auto=true) didn't work when shrinking objects
    * The $children variable sometimes misbehaved due to dynamic scoping
    * The --camera cmd-line option behaved differently then the corresponding GUI function
    * PNG export now doesn't leak transparency settings into the target image
    * Improved performance of 3D hull() operations
    * Some editor misbehaviors were fixed
    * Stability fixes of CGAL-related crashes
    * Windows cmd-line can now handle spaces in filenames
    * Default CSG rendering limit is now 100K elements
    * Fixed a crash reading DXF files using comma as decimal separator
    * Fixed a crash running the cmd-line without a HOME env. variable
    * Intersecting something with nothing now correctly results in an empty object

    **Deprecations:**
    * child() is no longer supported. Use children() instead.
    * polyhedron(triangles=[...]): Use polyhedron(faces=[...]) instead.

    **Misc:**
    * Test framework now shares more code with the GUI app
    * Test report can now be automatically uploaded to dinkypage.com
    * Better compatibility with BSD systems
    * Qt5 support

  # OpenSCAD 2013.06

    **Language Features:**
    * linear_extrude now takes a scale parameter:
      linear_extrude(height=a, slices=b, twist=c, scale=[x,y])
    * Recursive use of modules is now supported (including cascading child() operations):
      https://github.com/openscad/openscad/blob/master/examples/example024.scad
    * Parameter list values can now depend on earlier values, e.g. for (i=[0:2], j=[0:i]) ..
    * value assignments in parameters can now depend on already declared parameters
    * Added resize() module:
      http://en.wikibooks.org/wiki/OpenSCAD_User_Manual/Transformations#resize

    **Program Features:**
    * Added basic syntax highlighting in the editor
    * There is now a built-in library path in user-space:
      http://en.wikibooks.org/wiki/OpenSCAD_User_Manual/Libraries#Library_Locations
    * Commandline output to PNG, with various camera and rendering settings.
      Run openscad -h to see usage info or see the OpenSCAD wiki user manual.
    * Attempting to open dxf, off or stl files in the GUI will now create an import statement.
    * The preview operator (%) will now preserve any manually set color
    * The highlight operator (#) will now color the object in transparent red
    * Mac: Added document icon
    * Mac: Added auto-update check
    * Windows: Better cmd-line support using the openscad.com executable

    **Bugfixes:**
    * Importing files is now always relative to the importing script, also for libraries
    * We didn't always print a warning when CSG normalization created too many elements
    * Binary STLs can now be read on big endian architectures
    * Some binary STLs couldn't be read
    * Fixed some issues related to ARM builds
    * CGAL triangulation more lenient- enables partial rendering of 'bad' DXF data
    * The Automatic Reload feature is now more robust
    * If a file couldn't be saved it no longer fails silently
    * Fixed a number of crashes related to CGAL and OpenCSG rendering or complex models
    * The lookup() function had bad boundary condition behavior
    * The surface() module failed when the .dat file lacked a trailing newline
    * The hull() module could crash if any of the children were empty objects
    * Some problems using unicode filenames have been fixed

    **Misc:**
    * Build scripts have been further improved
    * Regression test now creates single monolithic .html file for easier uploading
    * Regression test auto-starts & stops Xvfb / Xvnc if on headless unix machine
    * The backend is finally independent of Qt
    * Windows: We now have a 64-bit version

    **Known Bugs:**
    * Linux: command-line png rendering on Gallium is flaky.
      Workaround: use CGAL --render or hardware rendering.

  # OpenSCAD 2013.01

    **Features:**
    * Snappier GUI while performing CGAL computations (computations running in separate thread)
    * The size of the misc. caches can now be adjusted from Preferences
    * The limit for when to disable OpenCSG can now be adjusted from Preferences
    * Added Dot product operator: vec * vec
    * Added Matrix multiplication operator: vec * mat, mat * mat
    * Added search() function
    * Dependencies are now tracked - any changes in uses/included files will be detected and cause a recompile
    * The OPENSCADPATH environment variable is now implemented will have precedence when searching for libraries
    * .csg files can now be opened from the GUI
    * linear_extrude() will now assume that the first parameter means 'height' if it's a number

    **Bugfixes:**
    * use'ing an non-existing file sometimes crashed under Windows
    * Better font handling: Ensure a monospace font is chosen as default
    * Division by zero caused hang in some cases (e.g. sin(1/0))
    * Larger minkowski operations sometimes caused a crash after a CGAL assert was thrown
    * Fixed crashes in shared_ptr.hpp (or similar places) due bugs in cache management and CSG normalization
    * scale() with a scale factor of zero could cause a crash
    * Fixed a number of issues related to use/include
    * Providing an unknown parameter on the cmd-line caused a crash
    * cmd-line overrides using -D now also work for USEd modules
    * Modifier characters can now be used in front of if statements
    * rotate() with a vector argument with less that 3 elements used uninitialized variables, ending up being non-deterministic.
    * .csg files will now have relative filenames whenever possible
    * Don't just ignore geometric nodes having zero volume/area - when doing difference/intersection, they tend to turn negative objects into positive ones.
    * Always use utf-8 file encoding, also under Windows
    * A lot of build script fixes
    * Some other crash bugs fixes

    **Deprecations:**
    * The old include syntax "<filename.scad>" without the include keyword is no
      longer supported and will cause a syntax error.

10 files changed, 196 insertions, 149 deletions

diff --git a/cad/openscad/MESSAGE b/cad/openscad/MESSAGE
deleted file mode 100644
index eeff924698d..00000000000
--- a/cad/openscad/MESSAGE
+++ /dev/null
@@ -1,22 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.2 2012/03/26 08:33:41 reinoud Exp $
-
-Hints and tips for OpenSCAD:
-
-openscad-2011.12: Sometimes it doesn't seem to render all objects when
-rendering with the fast OpenCSG. It is not yet clear if this is a problem with
-OpenSCAD or with OpenCSG. The solution is to add the render() primitive to the
-function. This will then use CGAL to create a primitive even when rendering
-with OpenCSG. It also speeds up rendering significantly since it creates them
-as primitives! So transform
-
-	func(l) {
-		....
-	}
-to
-	func(l) render() {
-		....
-	}
-
-if you encounter render problems or when rendering a primitive is very slow.
-===========================================================================
diff --git a/cad/openscad/Makefile b/cad/openscad/Makefile
index f4c3ab4532f..184a775d1af 100644
--- a/cad/openscad/Makefile
+++ b/cad/openscad/Makefile
@@ -1,56 +1,53 @@
-# $NetBSD: Makefile,v 1.35 2016/03/05 11:28:06 jperkin Exp $
+# $NetBSD: Makefile,v 1.36 2016/09/01 19:53:36 plunky Exp $
 #
 
-PKGNAME=	openscad-2011.12
-DISTNAME=	openscad-2011.12.src
-PKGREVISION=	24
+DISTNAME=	openscad-2015.03-2.src
+PKGNAME=	openscad-2015.03p2
 CATEGORIES=	cad
-MASTER_SITES=	https://cloud.github.com/downloads/openscad/openscad/
+MASTER_SITES=	http://files.openscad.org/
 
 MAINTAINER=	reinoud@NetBSD.org
 HOMEPAGE=	http://www.openscad.org/
 COMMENT=	OpenSCAD - The Programmers Solid 3D CAD Modeller
 LICENSE=	gnu-gpl-v2
 
-WRKSRC=		${WRKDIR}/openscad-2011.12
 USE_LANGUAGES=	c c++
-
-USE_TOOLS+=	cmake bison pkg-config
+USE_TOOLS+=	bison pkg-config
 USE_LIBTOOL=	yes
 
-SUBST_CLASSES+=prefix
-SUBST_SED.prefix=-e 's,@PREFIX@,${PREFIX},g'
-SUBST_FILES.prefix=${WRKSRC}/eigen2.pri ${WRKSRC}/openscad.pro
-SUBST_STAGE.prefix=post-patch
+WRKSRC=		${WRKDIR}/${DISTNAME:R}
 
-SUBST_CLASSES+=destdir
-SUBST_SED.destdir=-e 's,@DESTDIR@,${DESTDIR},g'
-SUBST_FILES.destdir=${WRKSRC}/openscad.pro
-SUBST_STAGE.destdir=post-patch
+MAKE_JOBS_SAFE=	no
 
-UNLIMIT_RESOURCES=	stacksize
 CHECK_PORTABILITY_SKIP+=tests/compare-bitmaps.sh
-CHECK_INTERPRETER_SKIP+=share/openscad/libraries/MCAD/get_submodules.py
 
-pre-build:
-	(cd ${WRKSRC} && ${QTDIR}/bin/qmake)
+REPLACE_PYTHON=	libraries/MCAD/get_submodules.py
+.include "../../lang/python/application.mk"
+
+QMAKE_ENV=	EIGENDIR=${PREFIX}/include/eigen3
 
-.include "../../mk/compiler.mk"
-.if !empty(PKGSRC_COMPILER:Mclang)
-_WRAP_EXTRA_ARGS.CXX+=	-std=c++11 -Wno-c++11-narrowing
-CWRAPPERS_APPEND.cxx+=	-std=c++11 -Wno-c++11-narrowing
-.endif
+MAKE_ENV+=	INSTALL_ROOT=${DESTDIR}
 
+do-configure:
+	cd ${WRKSRC} && ${SETENV} ${QMAKE_ENV} ${QTDIR}/bin/qmake \
+	    PREFIX=${PREFIX} -after QMAKE_YACC=bison QMAKE_LEX=flex
+
+.include "../../devel/boost-headers/buildlink3.mk"
+.include "../../devel/boost-libs/buildlink3.mk"
 # DragonFly requires FlexLexer.h from pkgsrc - base doesn't cut it.
 .include "../../devel/flex/buildlink3.mk"
 .include "../../devel/gmp/buildlink3.mk"
-.include "../../devel/boost-headers/buildlink3.mk"
-.include "../../devel/boost-libs/buildlink3.mk"
-.include "../../x11/qt4-libs/buildlink3.mk"
-.include "../../x11/qt4-tools/buildlink3.mk"
-.include "../../math/cgal/buildlink3.mk"
-.include "../../graphics/opencsg/buildlink3.mk"
+.include "../../fonts/fontconfig/buildlink3.mk"
+.include "../../fonts/harfbuzz/buildlink3.mk"
+.include "../../graphics/freetype2/buildlink3.mk"
 .include "../../graphics/glew/buildlink3.mk"
-.include "../../math/eigen2/buildlink3.mk"
+.include "../../graphics/opencsg/buildlink3.mk"
+.include "../../math/cgal/buildlink3.mk"
+.include "../../math/eigen3/buildlink3.mk"
 .include "../../math/mpfr/buildlink3.mk"
+.include "../../sysutils/desktop-file-utils/desktopdb.mk"
+.include "../../x11/qt4-libs/buildlink3.mk"
+.include "../../x11/qt4-tools/buildlink3.mk"
+.include "../../x11/qt4-qscintilla/buildlink3.mk"
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/cad/openscad/PLIST b/cad/openscad/PLIST
index dcd1f5c536a..ddba4505a9b 100644
--- a/cad/openscad/PLIST
+++ b/cad/openscad/PLIST
@@ -1,34 +1,103 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2012/02/27 14:44:28 reinoud Exp $
+@comment $NetBSD: PLIST,v 1.2 2016/09/01 19:53:36 plunky Exp $
 bin/openscad
-share/openscad/examples/example001.scad
-share/openscad/examples/example002.scad
-share/openscad/examples/example003.scad
-share/openscad/examples/example004.scad
-share/openscad/examples/example005.scad
-share/openscad/examples/example006.scad
-share/openscad/examples/example007.dxf
-share/openscad/examples/example007.scad
-share/openscad/examples/example008.dxf
-share/openscad/examples/example008.scad
-share/openscad/examples/example009.dxf
-share/openscad/examples/example009.scad
-share/openscad/examples/example010.dat
-share/openscad/examples/example010.scad
-share/openscad/examples/example011.scad
-share/openscad/examples/example012.scad
-share/openscad/examples/example012.stl
-share/openscad/examples/example013.dxf
-share/openscad/examples/example013.scad
-share/openscad/examples/example014.scad
-share/openscad/examples/example015.scad
-share/openscad/examples/example016.scad
-share/openscad/examples/example016.stl
-share/openscad/examples/example017.scad
-share/openscad/examples/example018.scad
-share/openscad/examples/example019.scad
-share/openscad/examples/example020.scad
-share/openscad/examples/example021.scad
-share/openscad/examples/example022.scad
+man/man1/openscad.1
+share/appdata/openscad.appdata.xml
+share/applications/openscad.desktop
+share/mime/packages/openscad.xml
+share/openscad/color-schemes/editor/dark-background.json
+share/openscad/color-schemes/editor/light-background.json
+share/openscad/color-schemes/editor/monokai.json
+share/openscad/color-schemes/editor/solarized-dark.json
+share/openscad/color-schemes/editor/solarized-light.json
+share/openscad/color-schemes/editor/tomorrow-night.json
+share/openscad/color-schemes/editor/tomorrow.json
+share/openscad/color-schemes/editor/visualstudio.json
+share/openscad/color-schemes/readme.txt
+share/openscad/color-schemes/render/beforedawn.json
+share/openscad/color-schemes/render/deepocean.json
+share/openscad/color-schemes/render/metallic.json
+share/openscad/color-schemes/render/monotone.json
+share/openscad/color-schemes/render/nature.json
+share/openscad/color-schemes/render/solarized.json
+share/openscad/color-schemes/render/starnight.json
+share/openscad/color-schemes/render/sunset.json
+share/openscad/color-schemes/render/tomorrow-night.json
+share/openscad/color-schemes/render/tomorrow.json
+share/openscad/examples/Advanced/GEB.scad
+share/openscad/examples/Advanced/animation.scad
+share/openscad/examples/Advanced/children.scad
+share/openscad/examples/Advanced/children_indexed.scad
+share/openscad/examples/Advanced/module_recursion.scad
+share/openscad/examples/Advanced/offset.scad
+share/openscad/examples/Advanced/surface_image.png
+share/openscad/examples/Advanced/surface_image.scad
+share/openscad/examples/Basics/CSG-modules.scad
+share/openscad/examples/Basics/CSG.scad
+share/openscad/examples/Basics/LetterBlock.scad
+share/openscad/examples/Basics/linear_extrude.scad
+share/openscad/examples/Basics/logo.scad
+share/openscad/examples/Basics/logo_and_text.scad
+share/openscad/examples/Basics/projection.scad
+share/openscad/examples/Basics/projection.stl
+share/openscad/examples/Basics/rotate_extrude.scad
+share/openscad/examples/Basics/text_on_cube.scad
+share/openscad/examples/COPYING-CC0.txt
+share/openscad/examples/Functions/functions.scad
+share/openscad/examples/Functions/list_comprehensions.scad
+share/openscad/examples/Functions/polygon_areas.scad
+share/openscad/examples/Functions/recursion.scad
+share/openscad/examples/Old/example001.scad
+share/openscad/examples/Old/example002.scad
+share/openscad/examples/Old/example003.scad
+share/openscad/examples/Old/example004.scad
+share/openscad/examples/Old/example005.scad
+share/openscad/examples/Old/example006.scad
+share/openscad/examples/Old/example007.dxf
+share/openscad/examples/Old/example007.scad
+share/openscad/examples/Old/example008.dxf
+share/openscad/examples/Old/example008.scad
+share/openscad/examples/Old/example009.dxf
+share/openscad/examples/Old/example009.scad
+share/openscad/examples/Old/example010.dat
+share/openscad/examples/Old/example010.scad
+share/openscad/examples/Old/example011.scad
+share/openscad/examples/Old/example012.scad
+share/openscad/examples/Old/example012.stl
+share/openscad/examples/Old/example013.dxf
+share/openscad/examples/Old/example013.scad
+share/openscad/examples/Old/example014.scad
+share/openscad/examples/Old/example015.scad
+share/openscad/examples/Old/example016.scad
+share/openscad/examples/Old/example016.stl
+share/openscad/examples/Old/example017.scad
+share/openscad/examples/Old/example018.scad
+share/openscad/examples/Old/example019.scad
+share/openscad/examples/Old/example020.scad
+share/openscad/examples/Old/example021.scad
+share/openscad/examples/Old/example022.scad
+share/openscad/examples/Old/example023.scad
+share/openscad/examples/Old/example024.scad
+share/openscad/examples/examples.json
+share/openscad/fonts/05-osx-fonts.conf
+share/openscad/fonts/10-liberation.conf
+share/openscad/fonts/Liberation-2.00.1/AUTHORS
+share/openscad/fonts/Liberation-2.00.1/ChangeLog
+share/openscad/fonts/Liberation-2.00.1/LICENSE
+share/openscad/fonts/Liberation-2.00.1/README
+share/openscad/fonts/Liberation-2.00.1/TODO
+share/openscad/fonts/Liberation-2.00.1/ttf/LiberationMono-Bold.ttf
+share/openscad/fonts/Liberation-2.00.1/ttf/LiberationMono-BoldItalic.ttf
+share/openscad/fonts/Liberation-2.00.1/ttf/LiberationMono-Italic.ttf
+share/openscad/fonts/Liberation-2.00.1/ttf/LiberationMono-Regular.ttf
+share/openscad/fonts/Liberation-2.00.1/ttf/LiberationSans-Bold.ttf
+share/openscad/fonts/Liberation-2.00.1/ttf/LiberationSans-BoldItalic.ttf
+share/openscad/fonts/Liberation-2.00.1/ttf/LiberationSans-Italic.ttf
+share/openscad/fonts/Liberation-2.00.1/ttf/LiberationSans-Regular.ttf
+share/openscad/fonts/Liberation-2.00.1/ttf/LiberationSerif-Bold.ttf
+share/openscad/fonts/Liberation-2.00.1/ttf/LiberationSerif-BoldItalic.ttf
+share/openscad/fonts/Liberation-2.00.1/ttf/LiberationSerif-Italic.ttf
+share/openscad/fonts/Liberation-2.00.1/ttf/LiberationSerif-Regular.ttf
+share/openscad/libraries/MCAD/2Dshapes.scad
 share/openscad/libraries/MCAD/3d_triangle.scad
 share/openscad/libraries/MCAD/README.markdown
 share/openscad/libraries/MCAD/TODO
@@ -43,16 +112,21 @@ share/openscad/libraries/MCAD/bitmap/name_tag.scad
 share/openscad/libraries/MCAD/boxes.scad
 share/openscad/libraries/MCAD/constants.scad
 share/openscad/libraries/MCAD/curves.scad
+share/openscad/libraries/MCAD/fonts.scad
 share/openscad/libraries/MCAD/gears.scad
 share/openscad/libraries/MCAD/get_submodules.py
 share/openscad/libraries/MCAD/gridbeam.scad
 share/openscad/libraries/MCAD/hardware.scad
 share/openscad/libraries/MCAD/involute_gears.scad
+share/openscad/libraries/MCAD/layouts.scad
+share/openscad/libraries/MCAD/lego_compatibility.scad
 share/openscad/libraries/MCAD/lgpl-2.1.txt
+share/openscad/libraries/MCAD/libtriangles.scad
 share/openscad/libraries/MCAD/materials.scad
 share/openscad/libraries/MCAD/math.scad
 share/openscad/libraries/MCAD/metric_fastners.scad
 share/openscad/libraries/MCAD/motors.scad
+share/openscad/libraries/MCAD/multiply.scad
 share/openscad/libraries/MCAD/nuts_and_bolts.scad
 share/openscad/libraries/MCAD/openscad_testing.py
 share/openscad/libraries/MCAD/openscad_utils.py
@@ -71,3 +145,9 @@ share/openscad/libraries/MCAD/trochoids.scad
 share/openscad/libraries/MCAD/units.scad
 share/openscad/libraries/MCAD/unregular_shapes.scad
 share/openscad/libraries/MCAD/utilities.scad
+share/openscad/locale/cs/LC_MESSAGES/openscad.mo
+share/openscad/locale/de/LC_MESSAGES/openscad.mo
+share/openscad/locale/es/LC_MESSAGES/openscad.mo
+share/openscad/locale/fr/LC_MESSAGES/openscad.mo
+share/openscad/locale/ru/LC_MESSAGES/openscad.mo
+share/pixmaps/openscad.png
diff --git a/cad/openscad/distinfo b/cad/openscad/distinfo
index ac89b50137e..82143df10b2 100644
--- a/cad/openscad/distinfo
+++ b/cad/openscad/distinfo
@@ -1,10 +1,9 @@
-$NetBSD: distinfo,v 1.4 2015/11/03 00:21:18 agc Exp $
+$NetBSD: distinfo,v 1.5 2016/09/01 19:53:36 plunky Exp $
 
-SHA1 (openscad-2011.12.src.tar.gz) = b1379c3a0c5552e2bf00b7a0f2dbf9a55fbf4bd0
-RMD160 (openscad-2011.12.src.tar.gz) = 0f7bf7452f04e0c929ea2a9acffab086e10ed053
-SHA512 (openscad-2011.12.src.tar.gz) = 5702c53186251207f216e2a6f62e158d2e4a4738a5ec931733d2c6de5c4b8a04a6f238920f9ff014707fa08b6880be32db953b1ca33fec1930dbe50bedb7741c
-Size (openscad-2011.12.src.tar.gz) = 3247723 bytes
-SHA1 (patch-bison.pri) = 2a6e4fd58e5b75e1f9dbdcafb3a5d581e3d702b6
-SHA1 (patch-eigen2.pri) = ac173f67fd187d7904aada40af44e9e4a5bb2a7b
-SHA1 (patch-flex.pri) = 5d4228e1b4e5ce2584aa898816e25088445b1bdb
-SHA1 (patch-openscad.pro) = 72c9ab9eae1f124f88e741d9ad7c336b2e72eabb
+SHA1 (openscad-2015.03-2.src.tar.gz) = 10a88552fe5276a49988dfe1ee6cd01647b707cc
+RMD160 (openscad-2015.03-2.src.tar.gz) = 7c0dcda82dbe8d1ada31dc49ee7a28fc8150d045
+SHA512 (openscad-2015.03-2.src.tar.gz) = 66e93715987a5211ce15c10ea39a9fec3296b606ace0aba1cda019635d5b26021457c8e49f389daa90a0da02e41007eab662e1ed6608cb51c24de00253b9783f
+Size (openscad-2015.03-2.src.tar.gz) = 13307974 bytes
+SHA1 (patch-openscad.pro) = 8b4250254ea66338ecafdac437ce9a69deb2fe27
+SHA1 (patch-src_colormap.h) = 6e2a4509dc0a93bd5c5e656b8dff3b2de7a30c1a
+SHA1 (patch-src_scintillaeditor.h) = c28a86e8c9951ed27b571fb943b3099138c97b5c
diff --git a/cad/openscad/patches/patch-bison.pri b/cad/openscad/patches/patch-bison.pri
deleted file mode 100644
index 1cf9da938cc..00000000000
--- a/cad/openscad/patches/patch-bison.pri
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-bison.pri,v 1.1 2012/08/13 22:33:56 marino Exp $
-
-Force QMAKE_YACC to look at .tools/bin/bison
-
---- bison.pri.orig	2011-12-17 17:00:38.000000000 +0000
-+++ bison.pri
-@@ -27,3 +27,5 @@ unix:linux* {
-     QMAKE_YACC = /usr/bin/bison
-   }
- }
-+
-+QMAKE_YACC = bison
diff --git a/cad/openscad/patches/patch-eigen2.pri b/cad/openscad/patches/patch-eigen2.pri
deleted file mode 100644
index f476f1e324d..00000000000
--- a/cad/openscad/patches/patch-eigen2.pri
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-eigen2.pri,v 1.2 2012/02/28 10:57:19 reinoud Exp $
-
-Explicitly set the Eigen2 include path for pkgsrc.
-
---- eigen2.pri.orig	2011-12-27 13:46:10.000000000 +0000
-+++ eigen2.pri
-@@ -31,6 +31,8 @@ eigen2 {
-     linux*: EIGEN2_INCLUDEPATH = /usr/include/eigen2
-   }
- 
-+  EIGEN2_INCLUDEPATH = @PREFIX@/include/eigen2
-+
-   # eigen2 being under 'include/eigen2' needs special prepending
-   QMAKE_INCDIR_QT = $$EIGEN2_INCLUDEPATH $$QMAKE_INCDIR_QT
- 
-@@ -40,4 +42,5 @@ eigen2 {
-       QMAKE_CXXFLAGS += -DEIGEN_DONT_ALIGN
-     }
-   }
-+
- }
diff --git a/cad/openscad/patches/patch-flex.pri b/cad/openscad/patches/patch-flex.pri
deleted file mode 100644
index 7a60bbeab94..00000000000
--- a/cad/openscad/patches/patch-flex.pri
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-flex.pri,v 1.1 2012/08/13 22:33:56 marino Exp $
-
-Force QMAKE_LEX to look at ${PREFIX}/bin/flex
-
---- flex.pri.orig	2011-12-17 17:00:39.000000000 +0000
-+++ flex.pri
-@@ -18,3 +18,5 @@ unix:linux* {
-     QMAKE_LEX = /usr/bin/flex
-   }
- }
-+
-+QMAKE_LEX = flex
diff --git a/cad/openscad/patches/patch-openscad.pro b/cad/openscad/patches/patch-openscad.pro
index 3b5712720e5..4a0359e04e1 100644
--- a/cad/openscad/patches/patch-openscad.pro
+++ b/cad/openscad/patches/patch-openscad.pro
@@ -1,14 +1,14 @@
-$NetBSD: patch-openscad.pro,v 1.1.1.1 2012/02/27 14:44:29 reinoud Exp $
+$NetBSD: patch-openscad.pro,v 1.2 2016/09/01 19:53:36 plunky Exp $
 
---- openscad.pro.orig	2011-12-29 17:10:30.000000000 +0000
+install manpage to correct location
+
+--- openscad.pro.orig	2015-11-16 05:13:56.000000000 +0000
 +++ openscad.pro
-@@ -275,6 +275,9 @@ macx {
- 
- isEmpty(PREFIX):PREFIX = /usr/local
- 
-+# fix pkgsrc prefix since it doesn't seem to get it from the environment
-+PREFIX = @DESTDIR@@PREFIX@
-+
- target.path = $$PREFIX/bin/
- INSTALLS += target
+@@ -585,6 +585,6 @@ icons.path = $$PREFIX/share/pixmaps
+ icons.extra = test -f icons/$${FULLNAME}.png && cp -f icons/$${FULLNAME}.png \"\$(INSTALL_ROOT)$${icons.path}/\" || cp -f icons/openscad.png \"\$(INSTALL_ROOT)$${icons.path}/$${FULLNAME}.png\"
+ INSTALLS += icons
  
+-man.path = $$PREFIX/share/man/man1
++man.path = $$PREFIX/man/man1
+ man.extra = cp -f doc/openscad.1 \"\$(INSTALL_ROOT)$${man.path}/$${FULLNAME}.1\"
+ INSTALLS += man
diff --git a/cad/openscad/patches/patch-src_colormap.h b/cad/openscad/patches/patch-src_colormap.h
new file mode 100644
index 00000000000..b46bd844853
--- /dev/null
+++ b/cad/openscad/patches/patch-src_colormap.h
@@ -0,0 +1,19 @@
+$NetBSD: patch-src_colormap.h,v 1.1 2016/09/01 19:53:36 plunky Exp $
+
+the Qt4 moc has some difficulty parsing in the boost headers. Apply
+the workaround from https://bugreports.qt.io/browse/QTBUG-22829
+
+--- src/colormap.h.orig	2016-09-01 12:19:29.305274482 +0000
++++ src/colormap.h
+@@ -5,9 +5,11 @@
+ #include <list>
+ #include "linalg.h"
+ 
++#ifndef Q_MOC_RUN
+ #include <boost/shared_ptr.hpp>
+ #include <boost/filesystem.hpp>
+ #include <boost/property_tree/ptree.hpp>
++#endif
+ 
+ namespace fs = boost::filesystem;
+ 
diff --git a/cad/openscad/patches/patch-src_scintillaeditor.h b/cad/openscad/patches/patch-src_scintillaeditor.h
new file mode 100644
index 00000000000..64325bfd1c4
--- /dev/null
+++ b/cad/openscad/patches/patch-src_scintillaeditor.h
@@ -0,0 +1,19 @@
+$NetBSD: patch-src_scintillaeditor.h,v 1.1 2016/09/01 19:53:36 plunky Exp $
+
+the Qt4 moc has some difficulty parsing in the boost headers. Apply
+the workaround from https://bugreports.qt.io/browse/QTBUG-22829
+
+--- src/scintillaeditor.h.orig	2015-04-05 14:01:12.000000000 +0000
++++ src/scintillaeditor.h
+@@ -11,9 +11,11 @@
+ #include "scadlexer.h"
+ #include "parsersettings.h"
+ 
++#ifndef Q_MOC_RUN
+ #include <boost/shared_ptr.hpp>
+ #include <boost/property_tree/ptree.hpp>
+ #include <boost/property_tree/json_parser.hpp>
++#endif
+ 
+ class EditorColorScheme
+ {