3 files changed, 108 insertions, 37 deletions

diff --git a/cad/openscad/Makefile b/cad/openscad/Makefile
index 6926b0d08501..5576c61bea59 100644
--- a/cad/openscad/Makefile
+++ b/cad/openscad/Makefile
@@ -2,14 +2,13 @@
 # $FreeBSD$
 
 PORTNAME=	openscad
-PORTVERSION=	2014.03
-PORTREVISION=	2
+PORTVERSION=	2015.03
 CATEGORIES=	cad
 MASTER_SITES=	http://files.openscad.org/
 DISTNAME=	openscad-${PORTVERSION}.src
 
 MAINTAINER=	mr@FreeBSD.org
-COMMENT=	The programmer's solid 3D CAD modeller
+COMMENT=	Programmer's solid 3D CAD modeller
 
 LICENSE=	GPLv2
 
@@ -19,9 +18,11 @@ BUILD_DEPENDS=	${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex \
 LIB_DEPENDS=	libgmp.so:${PORTSDIR}/math/gmp \
 		libmpfr.so:${PORTSDIR}/math/mpfr \
 		libCGAL.so:${PORTSDIR}/math/cgal \
+		libqscintilla2.so:${PORTSDIR}/devel/qscintilla2 \
+		libharfbuzz.so:${PORTSDIR}/print/harfbuzz \
 		libopencsg.so:${PORTSDIR}/graphics/opencsg
 
-USES=		bison desktop-file-utils pkgconfig qmake
+USES=		gettext-tools bison desktop-file-utils pkgconfig qmake
 USE_GL=		glu glew
 USE_QT4=	corelib gui opengl moc_build uic_build rcc_build
 PLIST_SUB=	PORTVERSION=${PORTVERSION}
diff --git a/cad/openscad/distinfo b/cad/openscad/distinfo
index 3d0e8a6a7307..14e9b767a31e 100644
--- a/cad/openscad/distinfo
+++ b/cad/openscad/distinfo
@@ -1,2 +1,2 @@
-SHA256 (openscad-2014.03.src.tar.gz) = 865fdc637a3ceb0678d35e88995411d8e70e8a7937625d7ede147a1570a561c3
-SIZE (openscad-2014.03.src.tar.gz) = 4417283
+SHA256 (openscad-2015.03.src.tar.gz) = 68ce08adc9e90c606ad948fe0f3405ce62b03b6bf34c45dd3dfc6b20c1846182
+SIZE (openscad-2015.03.src.tar.gz) = 12748351
diff --git a/cad/openscad/pkg-plist b/cad/openscad/pkg-plist
index 5e59511228ed..0ed752dfc5ef 100644
--- a/cad/openscad/pkg-plist
+++ b/cad/openscad/pkg-plist
@@ -2,37 +2,100 @@ bin/openscad
 man/man1/openscad.1.gz
 share/appdata/openscad.appdata.xml
 share/applications/openscad.desktop
-%%DATADIR%%/examples/example001.scad
-%%DATADIR%%/examples/example002.scad
-%%DATADIR%%/examples/example003.scad
-%%DATADIR%%/examples/example004.scad
-%%DATADIR%%/examples/example005.scad
-%%DATADIR%%/examples/example006.scad
-%%DATADIR%%/examples/example007.dxf
-%%DATADIR%%/examples/example007.scad
-%%DATADIR%%/examples/example008.dxf
-%%DATADIR%%/examples/example008.scad
-%%DATADIR%%/examples/example009.dxf
-%%DATADIR%%/examples/example009.scad
-%%DATADIR%%/examples/example010.dat
-%%DATADIR%%/examples/example010.scad
-%%DATADIR%%/examples/example011.scad
-%%DATADIR%%/examples/example012.scad
-%%DATADIR%%/examples/example012.stl
-%%DATADIR%%/examples/example013.dxf
-%%DATADIR%%/examples/example013.scad
-%%DATADIR%%/examples/example014.scad
-%%DATADIR%%/examples/example015.scad
-%%DATADIR%%/examples/example016.scad
-%%DATADIR%%/examples/example016.stl
-%%DATADIR%%/examples/example017.scad
-%%DATADIR%%/examples/example018.scad
-%%DATADIR%%/examples/example019.scad
-%%DATADIR%%/examples/example020.scad
-%%DATADIR%%/examples/example021.scad
-%%DATADIR%%/examples/example022.scad
-%%DATADIR%%/examples/example023.scad
-%%DATADIR%%/examples/example024.scad
+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/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/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/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%%/libraries/MCAD/2Dshapes.scad
 %%DATADIR%%/libraries/MCAD/3d_triangle.scad
 %%DATADIR%%/libraries/MCAD/README.markdown
@@ -81,4 +144,11 @@ share/applications/openscad.desktop
 %%DATADIR%%/libraries/MCAD/units.scad
 %%DATADIR%%/libraries/MCAD/unregular_shapes.scad
 %%DATADIR%%/libraries/MCAD/utilities.scad
+%%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/ru/LC_MESSAGES/openscad.mo
 share/pixmaps/openscad.png
+@dir %%DATADIR%%/libraries/MCAD/SolidPython
+@dir %%DATADIR%%/libraries/MCAD/ThingDoc