diff --git a/cad/openscad-devel/Makefile b/cad/openscad-devel/Makefile
index 790240f858bf..0ee27c803d9c 100644
--- a/cad/openscad-devel/Makefile
+++ b/cad/openscad-devel/Makefile
@@ -1,58 +1,58 @@
 PORTNAME=	openscad
 PORTVERSION=	2022.09.03
-#PORTREVISION=	1
+PORTREVISION=	1
 CATEGORIES=	cad
 PKGNAMESUFFIX=	-devel
 
 #PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
 #PATCHFILES+=	cc49ad8dac24.patch:-p1
 
 MAINTAINER=	mr@FreeBSD.org
 COMMENT=	Programmer's solid 3D CAD modeller #'
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 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 \
 		libqscintilla2_qt5.so:devel/qscintilla2-qt5 \
 		libopencsg.so:graphics/opencsg \
 		libgmp.so:math/gmp \
 		libmpfr.so:math/mpfr \
 		libfreetype.so:print/freetype2 \
 		libharfbuzz.so:print/harfbuzz \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libdouble-conversion.so:devel/double-conversion
 
 CONFLICTS=	openscad
 
 USES=		bison cmake compiler:c++14-lang cpe desktop-file-utils eigen:3 gettext \
-		gl gnome pkgconfig qmake qt:5 shared-mime-info xorg
+		gl gnome pkgconfig qt:5 shared-mime-info xorg
 USE_GITHUB=	yes
 USE_GL=		gl glu glew
 USE_GNOME=	cairo glib20 libxml2
-USE_QT=		buildtools buildtools_build core concurrent_build dbus gui multimedia svg widgets
+USE_QT=		buildtools_build core concurrent_build dbus gui multimedia qmake_build svg widgets
 USE_XORG=	x11
 GH_ACCOUNT=	microsoft:mimalloc
 GH_PROJECT=	MCAD:mcad mimalloc: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
 
 do-install:
 	${CMAKE_BIN} --install ${BUILD_WRKSRC} --prefix ${STAGEDIR}${PREFIX}
 
 .include <bsd.port.post.mk>
diff --git a/cad/openscad-devel/files/patch-cmake_Modules_FindQt5QScintilla.cmake b/cad/openscad-devel/files/patch-cmake_Modules_FindQt5QScintilla.cmake
new file mode 100644
index 000000000000..e9b1a9fac601
--- /dev/null
+++ b/cad/openscad-devel/files/patch-cmake_Modules_FindQt5QScintilla.cmake
@@ -0,0 +1,10 @@
+--- cmake/Modules/FindQt5QScintilla.cmake.orig	2021-10-23 02:33:13 UTC
++++ cmake/Modules/FindQt5QScintilla.cmake
+@@ -50,6 +50,7 @@ find_path ( QT5QSCINTILLA_INCLUDE_DIR
+ )
+ 
+ set ( QT5QSCINTILLA_INCLUDE_DIRS ${QT5QSCINTILLA_INCLUDE_DIR} )
++set (Qt5Widgets_LIBRARIES /usr/local/lib/qt5 /usr/local/lib /usr/lib )
+ 
+ # version
+ set ( _VERSION_FILE ${QT5QSCINTILLA_INCLUDE_DIR}/qsciglobal.h )
diff --git a/cad/openscad-devel/files/patch-src_handle__dep.cc b/cad/openscad-devel/files/patch-src_handle__dep.cc
new file mode 100644
index 000000000000..6c23311f11e6
--- /dev/null
+++ b/cad/openscad-devel/files/patch-src_handle__dep.cc
@@ -0,0 +1,8 @@
+--- src/handle_dep.cc.orig	2021-10-23 10:18:49 UTC
++++ src/handle_dep.cc
+@@ -1,3 +1,5 @@
++#include <sys/types.h>
++#include <sys/wait.h>
+ #include "handle_dep.h"
+ #include "printutils.h"
+ #include <string>