(cad/openscad) Updated 2015.x to 2019.05

[Makoto Fujiwara (CF-SX3) <makoto%ki.nu@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Makoto Fujiwara (CF-SX3) <makoto%ki.nu@localhost>
Pushed By:	mef
Date:		Tue May 28 22:13:40 2019 +0900
Changeset:	fa75a7c5fb6ac13d8c2e728f55ec4960757b45ce

Modified Files:
	openscad/Makefile
	openscad/PLIST
	openscad/distinfo
Removed Files:
	openscad/patches/patch-src_ModuleCache.cc
	openscad/patches/patch-src_StatCache.cc

Log Message:
(cad/openscad) Updated 2015.x to 2019.05

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=fa75a7c5fb6ac13d8c2e728f55ec4960757b45ce

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 openscad/Makefile                         | 13 +++++++------
 openscad/PLIST                            |  5 ++++-
 openscad/distinfo                         | 11 +++++------
 openscad/patches/patch-src_ModuleCache.cc | 12 ------------
 openscad/patches/patch-src_StatCache.cc   | 27 ---------------------------
 5 files changed, 16 insertions(+), 52 deletions(-)

diffs:
diff --git a/openscad/Makefile b/openscad/Makefile
index 6a3b2042c7..91c665049e 100644
--- a/openscad/Makefile
+++ b/openscad/Makefile
@@ -1,10 +1,10 @@
 # $NetBSD$
-#
 
-DISTNAME=	openscad-master
-CATEGORIES=	wip
-MASTER_SITES=	-https://github.com/openscad/openscad/archive/master.zip
-EXTRACT_SUFX=	.zip
+VERSION=	2019.05
+DISTNAME=	openscad-${VERSION}
+CATEGORIES=	cad
+MASTER_SITES=	${MASTER_SITE_GITHUB:=openscad/}
+GITHUB_TAG=	openscad-${VERSION}
 
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=	http://www.openscad.org/
@@ -15,7 +15,7 @@ USE_LANGUAGES=	c c++11
 USE_TOOLS+=	bison gettext pkg-config
 USE_LIBTOOL=	yes
 
-WRKSRC=		${WRKDIR}/${DISTNAME:R}
+WRKSRC=		${WRKDIR}/${PKGBASE}-${DISTNAME}
 
 CHECK_PORTABILITY_SKIP+=	tests/compare-bitmaps.sh
 
@@ -46,4 +46,5 @@ do-configure:
 .include "../../x11/qt4-tools/buildlink3.mk"
 .include "../../x11/qt4-qscintilla/buildlink3.mk"
 .include "../../textproc/libxml++/buildlink3.mk"
+.include "../../wip/double-conversion/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/openscad/PLIST b/openscad/PLIST
index 72b8bac73e..2d1858d1c8 100644
--- a/openscad/PLIST
+++ b/openscad/PLIST
@@ -1,8 +1,8 @@
 @comment $NetBSD$
 bin/openscad
 man/man1/openscad.1
-share/appdata/openscad.appdata.xml
 share/applications/openscad.desktop
+share/metainfo/org.openscad.OpenSCAD.appdata.xml
 share/mime/packages/openscad.xml
 share/openscad/color-schemes/editor/dark-background.json
 share/openscad/color-schemes/editor/light-background.json
@@ -25,6 +25,7 @@ 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/assert.scad
 share/openscad/examples/Advanced/children.scad
 share/openscad/examples/Advanced/children_indexed.scad
 share/openscad/examples/Advanced/module_recursion.scad
@@ -42,6 +43,7 @@ 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/echo.scad
 share/openscad/examples/Functions/functions.scad
 share/openscad/examples/Functions/list_comprehensions.scad
 share/openscad/examples/Functions/polygon_areas.scad
@@ -107,5 +109,6 @@ share/openscad/locale/es/LC_MESSAGES/openscad.mo
 share/openscad/locale/fr/LC_MESSAGES/openscad.mo
 share/openscad/locale/pl/LC_MESSAGES/openscad.mo
 share/openscad/locale/ru/LC_MESSAGES/openscad.mo
+share/openscad/locale/uk/LC_MESSAGES/openscad.mo
 share/pixmaps/openscad.png
 @pkgdir share/openscad/libraries/MCAD
diff --git a/openscad/distinfo b/openscad/distinfo
index e88a21ea65..53de092e36 100644
--- a/openscad/distinfo
+++ b/openscad/distinfo
@@ -1,11 +1,10 @@
 $NetBSD: distinfo,v 1.6 2016/12/16 11:13:27 plunky Exp $
 
-SHA1 (openscad-master.zip) = 78a2ced47e740bcec3a0c941f8a778f7e5ab05a1
-RMD160 (openscad-master.zip) = 0c689a516629509c3e230cc159a4caa23d59fca8
-SHA512 (openscad-master.zip) = 593bb7acb1c6de1941dbb2c78122c554c0759b874be88705401c350a7437723962aaa4461c1b25a391e9c0e280b9b53dd358aaa5becb0011afcaedfed3a78d10
-Size (openscad-master.zip) = 14843991 bytes
+SHA1 (openscad-2019.05.tar.gz) = 3817758e0c7299dbfbe340cdae0fe39da915c799
+RMD160 (openscad-2019.05.tar.gz) = 047761217599899d40226ee051f2f0d14e65b650
+SHA512 (openscad-2019.05.tar.gz) = 4a9408131bc3529239f350f99eefa717b2309296935158badeb430b574ef300411158a9c696498febf81ae659ba7f88009a633a4d14440c8b3fec66fd3fd7dd4
+Size (openscad-2019.05.tar.gz) = 14605674 bytes
+SHA1 (patch-features_qscintilla2-priv.prf) = ca5d5735d091441d6daf7535802f5ba7362c808c
 SHA1 (patch-openscad.pro) = 8b4250254ea66338ecafdac437ce9a69deb2fe27
-SHA1 (patch-src_ModuleCache.cc) = 039b77f4a065c700e2b3c1d0240b167f3cc5a661
-SHA1 (patch-src_StatCache.cc) = f502ac3b1b10b548f5174197a1dbf5af37b9c6c3
 SHA1 (patch-src_colormap.h) = cc48b16629ec8106d1b2c9686f90251e3d5d093d
 SHA1 (patch-src_scintillaeditor.h) = a94e87fa6eb410b77ade37b42b39971de7400229
diff --git a/openscad/patches/patch-src_ModuleCache.cc b/openscad/patches/patch-src_ModuleCache.cc
deleted file mode 100644
index ad5a975df4..0000000000
--- a/openscad/patches/patch-src_ModuleCache.cc
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD$
-
---- src/ModuleCache.cc.orig	2018-03-13 12:12:43.000000000 +0000
-+++ src/ModuleCache.cc
-@@ -10,6 +10,7 @@
- #include <fstream>
- #include <sstream>
- #include <time.h>
-+#include <sys/timeb.h>
- #include <sys/stat.h>
- #include <algorithm>
- 
diff --git a/openscad/patches/patch-src_StatCache.cc b/openscad/patches/patch-src_StatCache.cc
deleted file mode 100644
index 859149b907..0000000000
--- a/openscad/patches/patch-src_StatCache.cc
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD$
-
---- src/StatCache.cc.orig	2018-03-13 12:12:43.000000000 +0000
-+++ src/StatCache.cc
-@@ -27,7 +27,8 @@
- #include "StatCache.h"
- #include "printutils.h"
- 
--#include <sys/timeb.h>
-+#include <sys/types.h>
-+#include <sys/time.h>
- #include <string>
- #include <unordered_map>
- 
-@@ -37,9 +38,9 @@ const float stale = 0.190;  // Maximum l
- 
- double millis_clock(void)
- {
--	struct timeb tb;
--	ftime(&tb);
--	return tb.time + double(tb.millitm) / 1000;
-+	 struct timeval tv;
-+	 gettimeofday(&tv, NULL);
-+	 return (unsigned long)tv.tv_sec*1000UL+(unsigned long)tv.tv_usec/1000;
- }
- 
- struct CacheEntry