(cad/openscad) Minimize diff to the pkgsrc proper

[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:		Sat Jun 15 13:56:19 2019 +0900
Changeset:	c75eb883a7679177e8cfac59137536efd6559897

Modified Files:
	openscad/Makefile
	openscad/distinfo
	openscad/patches/patch-src_colormap.h
	openscad/patches/patch-src_scintillaeditor.h

Log Message:
(cad/openscad) Minimize diff to the pkgsrc proper

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

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

diffstat:
 openscad/Makefile                            | 9 +++++----
 openscad/distinfo                            | 4 ++--
 openscad/patches/patch-src_colormap.h        | 5 ++++-
 openscad/patches/patch-src_scintillaeditor.h | 5 ++++-
 4 files changed, 15 insertions(+), 8 deletions(-)

diffs:
diff --git a/openscad/Makefile b/openscad/Makefile
index 01c72b61f4..0e66b90827 100644
--- a/openscad/Makefile
+++ b/openscad/Makefile
@@ -6,12 +6,12 @@ CATEGORIES=	cad
 MASTER_SITES=	${MASTER_SITE_GITHUB:=openscad/}
 GITHUB_TAG=	openscad-${VERSION}
 
-MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
+MAINTAINER=	reinoud%NetBSD.org@localhost
 HOMEPAGE=	http://www.openscad.org/
 COMMENT=	OpenSCAD - The Programmers Solid 3D CAD Modeller
 LICENSE=	gnu-gpl-v2
 
-USE_LANGUAGES=	c c++11
+USE_LANGUAGES=	c c++
 USE_TOOLS+=	bison gettext pkg-config
 USE_LIBTOOL=	yes
 
@@ -26,12 +26,13 @@ MAKE_ENV+=	INSTALL_ROOT=${DESTDIR}
 
 do-configure:
 	cd ${WRKSRC} && ${QTDIR}/bin/qmake \
-	    PREFIX=${PREFIX} -after QMAKE_YACC=bison QMAKE_LEX=flex
+	    PREFIX=${PREFIX} -after QMAKE_YACC=bison QMAKE_LEX=flex \
+	    QMAKE_CXXFLAGS+=-std=c++0x
 
 .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/flex/buildlink3.mk"
 .include "../../devel/gmp/buildlink3.mk"
 .include "../../fonts/fontconfig/buildlink3.mk"
 .include "../../fonts/harfbuzz/buildlink3.mk"
diff --git a/openscad/distinfo b/openscad/distinfo
index 53de092e36..ecd4b5f032 100644
--- a/openscad/distinfo
+++ b/openscad/distinfo
@@ -6,5 +6,5 @@ SHA512 (openscad-2019.05.tar.gz) = 4a9408131bc3529239f350f99eefa717b230929693515
 Size (openscad-2019.05.tar.gz) = 14605674 bytes
 SHA1 (patch-features_qscintilla2-priv.prf) = ca5d5735d091441d6daf7535802f5ba7362c808c
 SHA1 (patch-openscad.pro) = 8b4250254ea66338ecafdac437ce9a69deb2fe27
-SHA1 (patch-src_colormap.h) = cc48b16629ec8106d1b2c9686f90251e3d5d093d
-SHA1 (patch-src_scintillaeditor.h) = a94e87fa6eb410b77ade37b42b39971de7400229
+SHA1 (patch-src_colormap.h) = d218a17ac71e0178d32b79723b532c9f098bc038
+SHA1 (patch-src_scintillaeditor.h) = 5da071ca50470c36bab3792d4aaeb135df84726d
diff --git a/openscad/patches/patch-src_colormap.h b/openscad/patches/patch-src_colormap.h
index e091301ce8..f0975a353b 100644
--- a/openscad/patches/patch-src_colormap.h
+++ b/openscad/patches/patch-src_colormap.h
@@ -1,4 +1,7 @@
-$NetBSD$
+$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	2018-03-13 12:12:43.000000000 +0000
 +++ src/colormap.h
diff --git a/openscad/patches/patch-src_scintillaeditor.h b/openscad/patches/patch-src_scintillaeditor.h
index 51158ae795..0ac186c31a 100644
--- a/openscad/patches/patch-src_scintillaeditor.h
+++ b/openscad/patches/patch-src_scintillaeditor.h
@@ -1,4 +1,7 @@
-$NetBSD$
+$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	2018-03-13 12:12:43.000000000 +0000
 +++ src/scintillaeditor.h