librecad: Merge recent changes in pkgsrc, and adjust C++

[Greg Troxel (via pkgsrc-wip) <commit-notify%pkgsrc.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Greg Troxel <gdt%lexort.com@localhost>
Pushed By:	gdt
Date:		Mon Jan 20 18:58:50 2025 -0500
Changeset:	9a1e1295268ff0ea0c3827a10c5a3707d156092e

Modified Files:
	librecad/COMMIT_MSG
	librecad/Makefile

Log Message:
librecad: Merge recent changes in pkgsrc, and adjust C++

  - Merge changes from cad/librecad
    - boost issues (change to c++17, per upstream, and simplify)
    - don't reset MAINTAINER
  - Comment out boost-lib prefix stuff, with an explanation for
    discussion.  But it seems to build fine.

Builds ok and runs on NetBSD 10 amd64.

Note wip author in COMMIT_MSG.

A significant remaining issue is that the tarball I downloaded is
different (sha1, length) that the one in distinfo.  I am intentionally
not changing distinfo in this commit.  (Probably Atsushi and I should
compare our tarballs and ask upstream.)

Absent boost path, tarball and checking with $MAINTAINER, I think this
is ready.

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

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

diffstat:
 librecad/COMMIT_MSG |  2 ++
 librecad/Makefile   | 22 +++++++++++++---------
 2 files changed, 15 insertions(+), 9 deletions(-)

diffs:
diff --git a/librecad/COMMIT_MSG b/librecad/COMMIT_MSG
index 522813569d..0bc8b969f9 100644
--- a/librecad/COMMIT_MSG
+++ b/librecad/COMMIT_MSG
@@ -1,5 +1,7 @@
 cad/librecad: Update to 2.2.1
 
+Packaged in wip by Atsushi Toyokura.
+
 What's Changed
 
 - Issue #1007 - Update appadata to pass validation by @hfiguiere in
diff --git a/librecad/Makefile b/librecad/Makefile
index 2c52d1d41a..bb0d9ef2c7 100644
--- a/librecad/Makefile
+++ b/librecad/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.86 2024/12/29 15:09:40 adam Exp $
+# $NetBSD: Makefile,v 1.93 2025/01/20 23:39:20 gdt Exp $
 
 DISTNAME=	LibreCAD-2.2.1
 PKGNAME=	${DISTNAME:tl}
@@ -7,7 +7,7 @@ MASTER_SITES=	${MASTER_SITE_GITHUB:=LibreCAD/}
 GITHUB_PROJECT=	LibreCAD
 GITHUB_TAG=	${DISTNAME:S/LibreCAD-//g}
 
-MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
+MAINTAINER=	ryoon%NetBSD.org@localhost
 HOMEPAGE=	https://librecad.org/
 COMMENT=	Free Open Source personal CAD application
 LICENSE=	gnu-gpl-v2
@@ -16,19 +16,21 @@ TOOL_DEPENDS+=	qt5-qttools-[0-9]*:../../x11/qt5-qttools
 
 EXTRACT_USING=	bsdtar
 
-USE_LANGUAGES=	c c++11
+USE_LANGUAGES=	c c++
+# Upstream declares that c++17 is required in librecad.pro and adds -std.
+# Some subdirectories apparently use -std=gnu++1z.
+USE_CXX_FEATURES+=	c++17
+USE_CXX_FEATURES+=	gnu++1z
+
 USE_TOOLS+=	pax pkg-config
 USE_LIBTOOL=	yes
 
-USE_CXX_FEATURES+=	c++11
-
 SUBST_CLASSES+=		qtdir
 SUBST_STAGE.qtdir=	pre-configure
 SUBST_MESSAGE.qtdir=	Set qt5/bin
 SUBST_FILES.qtdir+=	scripts/postprocess-unix.sh
 SUBST_VARS.qtdir+=	QTDIR
 
-
 .include "../../mk/compiler.mk"
 .if !empty(CC_VERSION:Mclang*)
 BUILDLINK_TRANSFORM+=   rm:-fext-numeric-literals
@@ -41,9 +43,11 @@ INSTALLATION_DIRS+=	share/${PKGBASE}
 INSTALLATION_DIRS+=	lib/${PKGBASE}
 
 QMAKE_OPTIONS+=	CONFIG+=release
-QMAKE_OPTIONS+=	BOOST_DIR=${PREFIX}
-QMAKE_OPTIONS+=	BOOST_LIBDIR=${PREFIX}/lib
-QMAKE_OPTIONS+=	MUPARSER_DIR=${PREFIX}
+# This doesn't seem right.  Probably we should be using
+# BUILDLINK_PREFIX.boost-libs but that's empty.
+#QMAKE_OPTIONS+=	BOOST_DIR=${PREFIX}
+#QMAKE_OPTIONS+=	BOOST_LIBDIR=${PREFIX}/lib
+#QMAKE_OPTIONS+=	MUPARSER_DIR=${PREFIX}
 QMAKE_OPTIONS+=	QMAKE_LFLAGS_RELEASE=
 QMAKE_OPTIONS+=	DISABLE_POSTSCRIPT=true