git: 10b44269556c - main - cad/openscad-devel: Update and unbreak

The branch main has been updated by mr:

URL: https://cgit.FreeBSD.org/ports/commit/?id=10b44269556c1b8313cd3815dc2ea4725b26b332

commit 10b44269556c1b8313cd3815dc2ea4725b26b332
Author:     Michael Reifenberger <mr@FreeBSD.org>
AuthorDate: 2022-09-05 10:20:15 +0000
Commit:     Michael Reifenberger <mr@FreeBSD.org>
CommitDate: 2022-09-05 10:20:15 +0000

    cad/openscad-devel: Update and unbreak
    
    Update to the current state as of 2022.09.03 and try to unbreak.
---
 cad/openscad-devel/Makefile  | 23 ++++++++++++++---------
 cad/openscad-devel/distinfo  |  6 +++---
 cad/openscad-devel/pkg-plist |  2 +-
 3 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/cad/openscad-devel/Makefile b/cad/openscad-devel/Makefile
index 8e5c3301ebb1..790240f858bf 100644
--- a/cad/openscad-devel/Makefile
+++ b/cad/openscad-devel/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	openscad
-PORTVERSION=	2022.05.20
-PORTREVISION=	2
+PORTVERSION=	2022.09.03
+#PORTREVISION=	1
 CATEGORIES=	cad
 PKGNAMESUFFIX=	-devel
 
@@ -10,12 +10,11 @@ PKGNAMESUFFIX=	-devel
 MAINTAINER=	mr@FreeBSD.org
 COMMENT=	Programmer's solid 3D CAD modeller #'
 
-BROKEN=		fails to configure: The imported target "Qt5::Core" references the file "/usr/local/lib/qt5/bin/qmake" but this file does not exist.
-
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	cgal>0:math/cgal
+BUILD_DEPENDS=	cgal>0:math/cgal \
+		evdev-proto>0:devel/evdev-proto
 LIB_DEPENDS=	libzip.so:archivers/libzip \
 		libhidapi.so:comms/hidapi \
 		libboost_regex.so:devel/boost-libs \
@@ -31,23 +30,29 @@ LIB_DEPENDS=	libzip.so:archivers/libzip \
 CONFLICTS=	openscad
 
 USES=		bison cmake compiler:c++14-lang cpe desktop-file-utils eigen:3 gettext \
-		gl gnome pkgconfig qt:5 shared-mime-info xorg
+		gl gnome pkgconfig qmake qt:5 shared-mime-info xorg
 USE_GITHUB=	yes
 USE_GL=		gl glu glew
 USE_GNOME=	cairo glib20 libxml2
-USE_QT=		buildtools_build core concurrent_build dbus gui multimedia widgets
+USE_QT=		buildtools buildtools_build core concurrent_build dbus gui multimedia svg widgets
 USE_XORG=	x11
 GH_ACCOUNT=	microsoft:mimalloc
 GH_PROJECT=	MCAD:mcad mimalloc:mimalloc
-GH_TAGNAME=	6aae7963498675dfb5bedaaef2cb8e56bdcddcab bd0a7ba3f042bfbced5ca1894b236cea08904e26:mcad v2.0.3:mimalloc
+GH_TAGNAME=	ea8950bd3cd7f06da333c15463492e484098e591 bd0a7ba3f042bfbced5ca1894b236cea08904e26:mcad v2.0.3:mimalloc
 GH_SUBDIR=	libraries/MCAD:mcad submodules/mimalloc:mimalloc
 #QMAKE_ARGS=	CONFIG+="experimental" VERSION=${PORTVERSION}
 # Avoid overlinking: kvm, procstat, boost(thread, system), Qt5(concurrent, network, printsupport)
+CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-Wl,--as-needed -L${LOCALBASE}/lib
 
+.include <bsd.port.pre.mk>
+
 #post-patch:
 #	@${REINPLACE_CMD} 's/-libusb//' ${WRKSRC}/features/hidapi.prf
 #	@${REINPLACE_CMD} -e 's,share/man,man,' \
 #		${WRKSRC}/openscad.pro
 
-.include <bsd.port.mk>
+do-install:
+	${CMAKE_BIN} --install ${BUILD_WRKSRC} --prefix ${STAGEDIR}${PREFIX}
+
+.include <bsd.port.post.mk>
diff --git a/cad/openscad-devel/distinfo b/cad/openscad-devel/distinfo
index effab3f636bd..2cf3aaa9e7f4 100644
--- a/cad/openscad-devel/distinfo
+++ b/cad/openscad-devel/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1653125562
-SHA256 (openscad-openscad-2022.05.20-6aae7963498675dfb5bedaaef2cb8e56bdcddcab_GH0.tar.gz) = 9ae2eec9680a1bf7f9d3e8ee85cc48acef5abb674053ab74f4665187c7187a23
-SIZE (openscad-openscad-2022.05.20-6aae7963498675dfb5bedaaef2cb8e56bdcddcab_GH0.tar.gz) = 23042608
+TIMESTAMP = 1662218295
+SHA256 (openscad-openscad-2022.09.03-ea8950bd3cd7f06da333c15463492e484098e591_GH0.tar.gz) = 7c443183894aeeac2d113913667169d03e178c582a0ee12fcc11c18d8ef9998d
+SIZE (openscad-openscad-2022.09.03-ea8950bd3cd7f06da333c15463492e484098e591_GH0.tar.gz) = 23042725
 SHA256 (microsoft-mimalloc-v2.0.3_GH0.tar.gz) = 5af497f360879bf9d07a5146961d275a25f4177fbe21ee6c437db604422acd60
 SIZE (microsoft-mimalloc-v2.0.3_GH0.tar.gz) = 917461
 SHA256 (openscad-MCAD-bd0a7ba3f042bfbced5ca1894b236cea08904e26_GH0.tar.gz) = 1f7003bf1bdfe9c7e5898eb5e82c54834b156569e79da97d906f3bbcf7c5549c
diff --git a/cad/openscad-devel/pkg-plist b/cad/openscad-devel/pkg-plist
index 065134fa7276..fe24c00b490f 100644
--- a/cad/openscad-devel/pkg-plist
+++ b/cad/openscad-devel/pkg-plist
@@ -1,11 +1,11 @@
 bin/openscad
-man/man1/openscad.1.gz
 share/applications/openscad.desktop
 share/icons/hicolor/128x128/apps/openscad.png
 share/icons/hicolor/256x256/apps/openscad.png
 share/icons/hicolor/48x48/apps/openscad.png
 share/icons/hicolor/512x512/apps/openscad.png
 share/icons/hicolor/64x64/apps/openscad.png
+share/man/man1/openscad.1.gz
 share/metainfo/org.openscad.OpenSCAD.appdata.xml
 share/mime/packages/openscad.xml
 %%DATADIR%%/color-schemes/editor/dark-background.json