Add qt6 qtbase package to pkgsrc wip

Add qt6 to pkgsrc wip, this package is based on the one for qt5 in pkgsrc qt6 is the latest version of qt.
2021-01-03 17:46:42 +00:00 · 2021-01-03 17:46:42 +00:00 · 147ef4a796
parent 044330863b
commit 147ef4a796
46 changed files with 5080 additions and 0 deletions
--- a/2
+++ b/2
@ -4617,6 +4617,8 @@ SUBDIR+=	qt5-libqtlua
 SUBDIR+=	qt5-qjson
 SUBDIR+=	qt5-qtbase-git
 SUBDIR+=	qt5-qtwebengine
+SUBDIR+=	qt6
+SUBDIR+=	qt6-qtbase
 SUBDIR+=	qtaccountsservice
 SUBDIR+=	qtile
 SUBDIR+=	qtnotifydaemon
--- a/qt6-qtbase/DESCR
+++ b/qt6-qtbase/DESCR
@ -0,0 +1,15 @@
+Qt(TM) is a GUI software toolkit. Qt simplifies the task of writing and
+maintaining GUI (graphical user interface) applications.
+
+Qt is written in C++ and is fully object-oriented. It has everything you need
+to create professional GUI applications. And it enables you to create them
+quickly.
+
+Qt is a multi-platform toolkit. When developing software with Qt, you can run
+it on the X Window System (Unix/X11) or Microsoft Windows NT and Windows 95/98.
+Simply recompile your source code on the platform you want.
+
+Qt cuts down the complexity in implementing large and complex systems. Its
+ingenious signal-slot technology enables true component programming.
+
+This package tracks Qt6 qtbase submodule.
--- a/qt6-qtbase/MESSAGE
+++ b/qt6-qtbase/MESSAGE
@ -0,0 +1,18 @@
+===========================================================================
+$NetBSD$
+
+To allow this package to coexist with other versions of Qt
+it has been installed in ${PREFIX}/qt6/{bin,include,lib,doc} etc.
+
+You should be able to select this version of Qt when compiling
+programs which use it by ensuring that
+
+1) QTDIR is set to ${PREFIX}/qt6
+
+2) Use the "configure" argument "--with-qt-dir=${PREFIX}/qt6"
+
+3) Use the "cmake" argument "-DCMAKE_SYSTEM_PREFIX_PATH:PATH=${PREFIX}/qt6"
+
+4) you may also have to put ${PREFIX}/qt6/bin in your PATH
+
+===========================================================================
--- a/qt6-qtbase/Makefile
+++ b/qt6-qtbase/Makefile
@ -0,0 +1,263 @@
+# $NetBSD$
+
+DISTNAME=	qtbase-everywhere-src-${QTVERSION}
+PKGNAME=	qt6-qtbase-${QTVERSION}
+COMMENT=	C++ X GUI toolkit
+
+.include "../../wip/qt6-qtbase/Makefile.common"
+
+HAS_CONFIGURE=		yes
+CONFIGURE_ARGS+=	-prefix "${QTPREFIX}"
+CONFIGURE_ARGS+=	-I "${PREFIX}/include"
+CONFIGURE_ARGS+=	-L "${PREFIX}/lib"
+CONFIGURE_ARGS+=	-cmake-use-default-generator
+CONFIGURE_ARGS+=	-opensource -confirm-license
+CONFIGURE_ARGS+=	-sysconfdir "${PKG_SYSCONFDIR}/xdg"
+CONFIGURE_ARGS+=	-accessibility
+CONFIGURE_ARGS+=	-icu
+CONFIGURE_ARGS+=	-libproxy
+CONFIGURE_ARGS+=	-openssl-linked
+CONFIGURE_ARGS+=	-nomake examples
+CONFIGURE_ARGS+=	-nomake tests
+CONFIGURE_ARGS+=	-no-pch
+CONFIGURE_ARGS+=	-no-sql-db2
+CONFIGURE_ARGS+=	-no-sql-ibase
+CONFIGURE_ARGS+=	-no-sql-mysql
+CONFIGURE_ARGS+=	-no-sql-oci
+CONFIGURE_ARGS+=	-no-sql-odbc
+CONFIGURE_ARGS+=	-no-sql-psql
+CONFIGURE_ARGS+=	-no-strip
+CONFIGURE_ARGS+=	-no-tslib
+CONFIGURE_ARGS+=	-no-vulkan
+CONFIGURE_ARGS+=	-no-use-gold-linker
+CONFIGURE_ARGS+=	-pkg-config
+CONFIGURE_ARGS+=	-release
+CONFIGURE_ARGS+=	-shared
+CONFIGURE_ARGS+=	-system-doubleconversion
+CONFIGURE_ARGS+=	-system-harfbuzz
+CONFIGURE_ARGS+=	-system-libjpeg
+CONFIGURE_ARGS+=	-system-libpng
+CONFIGURE_ARGS+=	-system-pcre
+CONFIGURE_ARGS+=	-system-sqlite
+CONFIGURE_ARGS+=	-system-zlib
+.if defined(MAKE_JOBS)
+.  if !defined(MAKE_JOBS_SAFE) || empty(MAKE_JOBS_SAFE:M[nN][oO])
+CONFIGURE_ENV+=		MAKEFLAGS=-j${MAKE_JOBS}
+.  endif
+.endif
+
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} != "Darwin"
+CONFIGURE_ARGS+=	-fontconfig
+QMAKE_CONF=		qmake.conf
+.  if ${OPSYS} != "SunOS" && \
+      (!empty(MACHINE_ARCH:Mi386) || !empty(MACHINE_ARCH:Mx86_64))
+CONFIGURE_ARGS+=	-reduce-relocations
+.  endif
+.else
+CONFIGURE_ARGS+=	-no-rpath	# avoid @rpath in dylibs
+QMAKE_CONF=		qmake.conf.mac
+.endif
+
+PLIST_VARS+=		egl
+
+.include "../../mk/compiler.mk"
+
+.if ${OPSYS} == "SunOS"
+.  if !empty(PKGSRC_COMPILER:Mgcc) || !empty(PKGSRC_COMPILER:Mclang)
+.    if ${ABI:U} == "64"
+CONFIGURE_ARGS+=		-platform solaris-g++-64
+.    else
+CONFIGURE_ARGS+=		-platform solaris-g++
+.    endif
+.  else
+.    if ${ABI:U} == "64"
+CONFIGURE_ARGS+=		-platform solaris-cc-64
+.    else
+CONFIGURE_ARGS+=		-platform solaris-cc
+.    endif
+.  endif
+NETWORK_LIBS=			-lsocket -lnsl
+.elif ${OPSYS} == "Interix"
+CONFIGURE_ARGS+=		-platform interix-g++
+CFLAGS+=			-I/usr/local/include/bind
+LDFLAGS+=			-L/usr/local/lib/bind -lbind
+BUILDLINK_PASSTHRU_DIRS+=	/usr/local/include/bind /usr/local/lib/bind
+SYS_LIBS=			-lbind -ldb -ldl
+.elif ${OPSYS} == "DragonFly"
+CONFIGURE_ARGS+=		-platform freebsd-g++
+LDFLAGS+=			-lexecinfo
+.elif ${OPSYS} == "Darwin"
+CONFIGURE_ARGS+=		-platform macx-clang
+CONFIGURE_ARGS+=		-no-framework
+# pkgsrc has a patch to avoid using SDK, but the configure
+# logic gets confused if it can't find the header files
+# so give it a direct path to them if they aren't installed
+# in /usr/include
+.  if !exists(/usr/include)
+CONFIGURE_ARGS+=	-I "$$(xcrun --show-sdk-path)"/usr/include
+.  endif
+.  if exists(/usr/lib/libresolv.dylib)
+LDFLAGS+=			-lresolv
+.  endif
+.elif ${OPSYS} == "Linux"
+LDFLAGS+=			-ldl
+.elif ${OPSYS} == "NetBSD" || ${OPSYS} == "FreeBSD"
+.  if exists(/usr/lib/libexecinfo.so)
+LDFLAGS+=			-lexecinfo
+.  endif
+LDFLAGS.FreeBSD+=		-lutil
+.endif
+
+REPLACE_PERL+=		bin/fixqt4headers.pl
+REPLACE_PERL+=		bin/syncqt.pl
+REPLACE_PERL+=		mkspecs/features/data/unix/findclasslist.pl
+
+PTHREAD_OPTS+=		require
+UNLIMIT_RESOURCES=	datasize
+
+BUILDLINK_PASSTHRU_DIRS+=	${QTPREFIX}
+
+#
+MAKE_ENV+=		LD_LIBRARY_PATH=${WRKSRC}/lib
+
+INSTALLATION_DIRS=	lib/pkgconfig
+
+CHECK_INTERPRETER_SKIP+=	qt6/mkspecs/features/data/mac/objc_namespace.sh
+CHECK_INTERPRETER_SKIP+=	qt6/mkspecs/features/uikit/device_destinations.sh
+CHECK_INTERPRETER_SKIP+=	qt6/mkspecs/features/uikit/devices.py
+
+SUBST_CLASSES+=		opt
+SUBST_STAGE.opt=	pre-configure
+SUBST_MESSAGE.opt=	Removing some Qt6 default compiler flags.
+SUBST_FILES.opt=	mkspecs/common/gcc-base.conf
+SUBST_SED.opt=		-e 's,-O[s23],,'
+
+SUBST_CLASSES.SunOS+=	vscript
+SUBST_STAGE.vscript=	pre-configure
+SUBST_FILES.vscript=	mkspecs/common/gcc-base-unix.conf
+SUBST_SED.vscript=	-e '/QMAKE_LFLAGS_VERSION_SCRIPT/d'
+
+SUBST_CLASSES+=		path
+SUBST_STAGE.path=	pre-configure
+SUBST_MESSAGE.path=	Add to default XDG path.
+SUBST_FILES.path=	src/corelib/io/qstandardpaths_unix.cpp
+SUBST_VARS.path=	PREFIX
+
+BROKEN_FILES=		qt5/mkspecs/qmodule.pri
+
+PC_FILES=		Qt5Concurrent.pc Qt5Core.pc \
+			Qt5Gui.pc Qt5Network.pc Qt5OpenGL.pc \
+			Qt5OpenGLExtensions.pc \
+			Qt5PrintSupport.pc Qt5Sql.pc Qt5Test.pc \
+			Qt5Widgets.pc Qt5Xml.pc
+
+.if ${OPSYS} == "Linux"
+QMAKE_EXTRA=		QMAKE_PLATFORM += linux
+.else
+QMAKE_EXTRA=
+.endif
+
+COMPILER=	gcc
+.if !empty(PKGSRC_COMPILER:Mclang)
+COMPILER+=	clang llvm
+.endif
+
+pre-configure:
+	${SED}  -e 's:@PREFIX@:${PREFIX}:g' \
+		-e 's:@X11BASE@:${X11BASE}:g' \
+		-e 's:@COMPILER@:${COMPILER:Q}:g' \
+		-e 's:@CC@:${CC:Q}:g' \
+		-e 's:@CXX@:${CXX:Q}:g' \
+		-e 's:@LDFLAGS@:${LDFLAGS:Q}:g' \
+		-e 's:@CFLAGS@:${CFLAGS:Q}:g' \
+		-e 's:@CXXFLAGS@:${CXXFLAGS:Q}:g' \
+		-e 's:@NETWORK_LIBS@:${NETWORK_LIBS:Q}:g' \
+		-e 's:@SYS_LIBS@:${SYS_LIBS:Q}:g' \
+		-e 's:@LEX@:${LEX}:g' \
+		-e 's:@YACC@:${TOOLS_CMDLINE_YACC:Q}:g' \
+		-e 's:@AR@:${AR:Q}:g' \
+		-e 's:@MKDIR@:${MKDIR}:g' \
+		-e 's:@LIBQT@:${LIBQT:Q}:g' \
+		-e 's:@PTHREAD_LDFLAGS@:${PTHREAD_LDFLAGS:Q}:g' \
+		-e 's:@PTHREAD_LIBS@:${PTHREAD_LIBS:Q}:g' \
+		-e 's:@COMPILER_RPATH_FLAG@:${COMPILER_RPATH_FLAG}:g' \
+		-e 's:@QMAKE_RANLIB@:${RANLIB}:g' \
+		-e 's:@QMAKE_EXTRA@:${QMAKE_EXTRA:Q}:g' \
+		${FILESDIR}/${QMAKE_CONF} > ${WRKSRC}/qmake.conf
+	for dir in ${WRKSRC}/mkspecs/*; do \
+			cp ${WRKSRC}/qmake.conf $${dir}; \
+			rm -f $${dir}/*.orig; \
+		done
+	${RM} -f ${WRKSRC}/mkspecs/features/mac/default_pre.prf
+	${RM} -f ${WRKSRC}/mkspecs/features/mac/default_post.prf
+
+.include "options.mk"
+
+.if ${OPSYS} != "Darwin"
+CONFIGURE_ARGS+= -- -DQT_DISABLE_RPATH:BOOL=ON
+CONFIGURE_ARGS+= -DCMAKE_SKIP_RPATH:BOOL=ON
+LDFLAGS+=${COMPILER_RPATH_FLAG}${QTPREFIX}/lib
+.endif
+
+post-install:
+.for i in ${PC_FILES}
+	cd ${DESTDIR}${PREFIX}/lib/pkgconfig && \
+	${LN} -f -s ${QTPREFIX}/lib/pkgconfig/${i} ${i}
+.endfor
+# The pri file has WRKSRC in it.
+	${SED} -e 's,PKG_CONFIG_EXECUTABLE = .*,PKG_CONFIG_EXECUTABLE = ${TOOLS_PATH.pkg-config},' \
+		${DESTDIR}${PREFIX}/${BROKEN_FILES} \
+		> ${DESTDIR}${PREFIX}/${BROKEN_FILES}.1
+	${MV} -f ${DESTDIR}${PREFIX}/${BROKEN_FILES}.1 \
+		${DESTDIR}${PREFIX}/${BROKEN_FILES}
+
+TOOL_DEPENDS+=	xmlstarlet-[0-9]*:../../textproc/xmlstarlet
+
+.include "../../archivers/brotli/buildlink3.mk"
+.include "../../archivers/zstd/buildlink3.mk"
+.include "../../converters/libiconv/buildlink3.mk"
+.include "../../databases/sqlite3/buildlink3.mk"
+.include "../../devel/at-spi2-core/buildlink3.mk"
+.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../devel/glib2/buildlink3.mk"
+.include "../../devel/pcre2/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
+.include "../../fonts/harfbuzz/buildlink3.mk"
+.include "../../graphics/freetype2/buildlink3.mk"
+.include "../../graphics/png/buildlink3.mk"
+.include "../../math/double-conversion/buildlink3.mk"
+.include "../../security/libb2/buildlink3.mk"
+.include "../../security/mit-krb5/buildlink3.mk"
+.include "../../security/openssl/buildlink3.mk"
+.include "../../textproc/icu/buildlink3.mk"
+.include "../../www/libproxy/buildlink3.mk"
+.if ${OPSYS} != "Darwin"
+.include "../../fonts/fontconfig/buildlink3.mk"
+.include "../../graphics/glu/buildlink3.mk"
+.  if !empty(MESALIB_SUPPORTS_EGL:Myes)
+PLIST.egl=	yes
+.  endif
+BUILDLINK_API_DEPENDS.libxcb+=	libxcb>=1.11
+.include "../../x11/libxcb/buildlink3.mk"
+.include "../../x11/xcb-util/buildlink3.mk"
+.include "../../x11/xcb-util-cursor/buildlink3.mk"
+.include "../../x11/xcb-util-image/buildlink3.mk"
+.include "../../x11/xcb-util-keysyms/buildlink3.mk"
+.include "../../x11/xcb-util-renderutil/buildlink3.mk"
+.include "../../x11/xcb-util-wm/buildlink3.mk"
+.include "../../x11/libSM/buildlink3.mk"
+.include "../../x11/libX11/buildlink3.mk"
+.include "../../x11/libXext/buildlink3.mk"
+.include "../../x11/libXcursor/buildlink3.mk"
+.include "../../x11/libXft/buildlink3.mk"
+.include "../../x11/libXi/buildlink3.mk"
+.include "../../x11/libXmu/buildlink3.mk"
+.include "../../x11/libXrandr/buildlink3.mk"
+.include "../../x11/libXrender/buildlink3.mk"
+.include "../../x11/libxkbcommon/buildlink3.mk"
+.endif
+.include "../../mk/jpeg.buildlink3.mk"
+.include "../../mk/pthread.buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
--- a/qt6-qtbase/Makefile.common
+++ b/qt6-qtbase/Makefile.common
@ -0,0 +1,55 @@
+# $NetBSD$
+# used by wip/qt6-qtbase/Makefile
+
+.include "../../wip/qt6/Makefile.common"
+
+.include "../../mk/dlopen.buildlink3.mk"
+BUILDLINK_TRANSFORM+=	opt:-ldl:${BUILDLINK_LDADD.dl:Q}
+
+USE_LANGUAGES=		c c++
+USE_TOOLS+=		gmake perl:build pkg-config
+
+# https://doc.qt.io/qt-5/supported-platforms.html
+GCC_REQD+=		5
+
+# Avoid failures to due 'register' usage in X11 headers.
+CXXFLAGS+=		-Wno-register
+
+# wcstof(3) etc. is used in C++ code.
+CFLAGS.NetBSD+=		-D_NETBSD_SOURCE
+
+# include/openssl/e_os2.h:283:25: error: '_Noreturn' does not name a type
+CXXFLAGS.SunOS+=	-D_Noreturn=""
+
+# for GL_GLEXT_LEGACY with GL/gl.h error, GL_ARB_shader_objects is not defined.
+BUILDLINK_TRANSFORM+=	rm:-Wundef
+
+# SunOS ld doesn't support -rpath-link
+BUILDLINK_TRANSFORM.SunOS+=	rm:-Wl,-rpath-link,${PREFIX}/qt5/lib
+BUILDLINK_TRANSFORM.SunOS+=	rm:-Wl,-rpath-link,${WRKSRC}/lib
+
+MAKE_ENV+=		QTPREFIX=${QTPREFIX:Q}
+PLIST_VARS+=		notdarwin
+.if ${OPSYS} != "Darwin"
+PLIST.notdarwin=	yes
+.endif
+
+# avoid creating a .qt directory in the users home directory
+SCRIPTS_ENV+=		HOME=${WRKDIR}
+
+.if "${PKGPATH}" != "wip/qt6-qtbase"
+do-configure:
+	cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${QTPREFIX}/bin/qt-configure-module
+.endif
+
+.if ${OPSYS} == "Darwin"
+.PHONY: fix-darwin-install-name
+post-install: fix-darwin-install-name
+fix-darwin-install-name:
+	${FIND} ${DESTDIR}${PREFIX} -name "*.dylib" -print |		\
+		while read lib; do					\
+		libname=`basename $${lib}`;				\
+		libdir=`dirname $${lib} | sed -e 's,${DESTDIR},,'`;	\
+		install_name_tool -id $${libdir}/$${libname} $${lib};	\
+	done
+.endif
--- a/qt6-qtbase/PLIST
+++ b/qt6-qtbase/PLIST
--- a/qt6-qtbase/PLIST.Darwin
+++ b/qt6-qtbase/PLIST.Darwin
@ -0,0 +1,28 @@
+@comment $NetBSD$
+qt6/include/QtClipboardSupport/${PKGVERSION}/QtClipboardSupport/private/qmacmime_p.h
+qt6/include/QtClipboardSupport/QtClipboardSupport
+qt6/include/QtClipboardSupport/QtClipboardSupportDepends
+qt6/include/QtClipboardSupport/QtClipboardSupportVersion
+qt6/include/QtClipboardSupport/qtclipboardsupportversion.h
+qt6/include/QtGraphicsSupport/${PKGVERSION}/QtGraphicsSupport/private/qrasterbackingstore_p.h
+qt6/include/QtGraphicsSupport/QtGraphicsSupport
+qt6/include/QtGraphicsSupport/QtGraphicsSupportDepends
+qt6/include/QtGraphicsSupport/QtGraphicsSupportVersion
+qt6/include/QtGraphicsSupport/qtgraphicssupportversion.h
+qt6/lib/cmake/Qt6ClipboardSupport/Qt6ClipboardSupportConfig.cmake
+qt6/lib/cmake/Qt6ClipboardSupport/Qt6ClipboardSupportConfigVersion.cmake
+qt6/lib/cmake/Qt6GraphicsSupport/Qt6GraphicsSupportConfig.cmake
+qt6/lib/cmake/Qt6GraphicsSupport/Qt6GraphicsSupportConfigVersion.cmake
+qt6/lib/cmake/Qt6Gui/Qt6Gui_QCocoaIntegrationPlugin.cmake
+qt6/lib/cmake/Qt6PrintSupport/Qt6PrintSupport_QCocoaPrinterSupportPlugin.cmake
+qt6/lib/cmake/Qt6Widgets/Qt6Widgets_QMacStylePlugin.cmake
+qt6/lib/libQt6ClipboardSupport.a
+qt6/lib/libQt6ClipboardSupport.prl
+qt6/lib/libQt6GraphicsSupport.a
+qt6/lib/libQt6GraphicsSupport.prl
+qt6/mkspecs/modules/qt_lib_clipboard_support_private.pri
+qt6/mkspecs/modules/qt_lib_graphics_support_private.pri
+qt6/plugins/bearer/libqcorewlanbearer.so
+qt6/plugins/platforms/libqcocoa.so
+qt6/plugins/printsupport/libcocoaprintersupport.so
+qt6/plugins/styles/libqmacstyle.so
--- a/qt6-qtbase/PLIST.Linux
+++ b/qt6-qtbase/PLIST.Linux
@ -0,0 +1,40 @@
+@comment $NetBSD$
+qt6/include/QtInputSupport/${PKGVERSION}/QtInputSupport/private/qevdevkeyboard_defaultmap_p.h
+qt6/include/QtInputSupport/${PKGVERSION}/QtInputSupport/private/qevdevkeyboardhandler_p.h
+qt6/include/QtInputSupport/${PKGVERSION}/QtInputSupport/private/qevdevkeyboardmanager_p.h
+qt6/include/QtInputSupport/${PKGVERSION}/QtInputSupport/private/qevdevmousehandler_p.h
+qt6/include/QtInputSupport/${PKGVERSION}/QtInputSupport/private/qevdevmousemanager_p.h
+qt6/include/QtInputSupport/${PKGVERSION}/QtInputSupport/private/qevdevtablethandler_p.h
+qt6/include/QtInputSupport/${PKGVERSION}/QtInputSupport/private/qevdevtabletmanager_p.h
+qt6/include/QtInputSupport/${PKGVERSION}/QtInputSupport/private/qevdevtouchfilter_p.h
+qt6/include/QtInputSupport/${PKGVERSION}/QtInputSupport/private/qevdevtouchhandler_p.h
+qt6/include/QtInputSupport/${PKGVERSION}/QtInputSupport/private/qevdevtouchmanager_p.h
+qt6/include/QtInputSupport/${PKGVERSION}/QtInputSupport/private/qlibinputhandler_p.h
+qt6/include/QtInputSupport/${PKGVERSION}/QtInputSupport/private/qlibinputkeyboard_p.h
+qt6/include/QtInputSupport/${PKGVERSION}/QtInputSupport/private/qlibinputpointer_p.h
+qt6/include/QtInputSupport/${PKGVERSION}/QtInputSupport/private/qlibinputtouch_p.h
+qt6/include/QtInputSupport/${PKGVERSION}/QtInputSupport/private/qtouchoutputmapping_p.h
+qt6/include/QtInputSupport/${PKGVERSION}/QtInputSupport/private/qtslib_p.h
+qt6/include/QtInputSupport/QIntegrityHIDManager
+qt6/include/QtInputSupport/QtInputSupport
+qt6/include/QtInputSupport/QtInputSupportDepends
+qt6/include/QtInputSupport/QtInputSupportVersion
+qt6/include/QtInputSupport/qintegrityhidmanager.h
+qt6/include/QtInputSupport/qtinputsupportversion.h
+qt6/lib/cmake/Qt6Gui/Qt6Gui_QEvdevKeyboardPlugin.cmake
+qt6/lib/cmake/Qt6Gui/Qt6Gui_QEvdevMousePlugin.cmake
+qt6/lib/cmake/Qt6Gui/Qt6Gui_QEvdevTabletPlugin.cmake
+qt6/lib/cmake/Qt6Gui/Qt6Gui_QEvdevTouchScreenPlugin.cmake
+qt6/lib/cmake/Qt6Gui/Qt6Gui_QLinuxFbIntegrationPlugin.cmake
+${PLIST.dbus}qt6/lib/cmake/Qt6Network/Qt6Network_QConnmanEnginePlugin.cmake
+${PLIST.dbus}qt6/lib/cmake/Qt6Network/Qt6Network_QNetworkManagerEnginePlugin.cmake
+qt6/lib/libQt6InputSupport.a
+qt6/lib/libQt6InputSupport.prl
+qt6/mkspecs/modules/qt_lib_input_support_private.pri
+${PLIST.dbus}qt6/plugins/bearer/libqconnmanbearer.so
+${PLIST.dbus}qt6/plugins/bearer/libqnmbearer.so
+qt6/plugins/generic/libqevdevkeyboardplugin.so
+qt6/plugins/generic/libqevdevmouseplugin.so
+qt6/plugins/generic/libqevdevtabletplugin.so
+qt6/plugins/generic/libqevdevtouchplugin.so
+qt6/plugins/platforms/libqlinuxfb.so
--- a/qt6-qtbase/TODO
+++ b/qt6-qtbase/TODO
@ -0,0 +1,2 @@
+test builds for Darwin and Linux
+remove unneeded stuff in makefiles from qt5
--- a/qt6-qtbase/buildlink3.mk
+++ b/qt6-qtbase/buildlink3.mk
@ -0,0 +1,65 @@
+# $NetBSD: buildlink3.mk,v 1.40 2020/08/17 20:17:57 leot Exp $
+
+BUILDLINK_TREE+=	qt6-qtbase
+
+.if !defined(QT6_QTBASE_BUILDLINK3_MK)
+QT6_QTBASE_BUILDLINK3_MK:=
+
+BUILDLINK_API_DEPENDS.qt6-qtbase+=	qt6-qtbase>=6.0.0
+BUILDLINK_PKGSRCDIR.qt6-qtbase?=	../../wip/qt6-qtbase
+
+BUILDLINK_INCDIRS.qt6-qtbase+=	qt6/include
+BUILDLINK_LIBDIRS.qt6-qtbase+=	qt6/lib
+BUILDLINK_LIBDIRS.qt6-qtbase+=	qt6/plugins
+
+QTDIR=		${BUILDLINK_PREFIX.qt6-qtbase}/qt6
+CMAKE_PREFIX_PATH+=	${QTDIR}
+
+CONFIGURE_ENV+=	QTDIR=${QTDIR}
+MAKE_ENV+=	QTDIR=${QTDIR}
+
+PTHREAD_OPTS+=	require
+
+pkgbase := qt6-qtbase
+.include "../../mk/pkg-build-options.mk"
+
+.if ${PKG_BUILD_OPTIONS.qt6-qtbase:Mdbus}
+.include "../../sysutils/dbus/buildlink3.mk"
+.endif
+
+.include "../../converters/libiconv/buildlink3.mk"
+.include "../../databases/sqlite3/buildlink3.mk"
+.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../devel/glib2/buildlink3.mk"
+.include "../../devel/pcre2/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
+.include "../../fonts/harfbuzz/buildlink3.mk"
+.include "../../graphics/freetype2/buildlink3.mk"
+.include "../../graphics/png/buildlink3.mk"
+.include "../../security/openssl/buildlink3.mk"
+.include "../../textproc/icu/buildlink3.mk"
+.include "../../www/libproxy/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
+.include "../../mk/pthread.buildlink3.mk"
+.if ${OPSYS} != "Darwin"
+.include "../../fonts/fontconfig/buildlink3.mk"
+.include "../../graphics/glu/buildlink3.mk"
+.include "../../x11/libxcb/buildlink3.mk"
+.include "../../x11/xcb-util/buildlink3.mk"
+.include "../../x11/xcb-util-image/buildlink3.mk"
+.include "../../x11/xcb-util-keysyms/buildlink3.mk"
+.include "../../x11/xcb-util-renderutil/buildlink3.mk"
+.include "../../x11/xcb-util-wm/buildlink3.mk"
+.include "../../x11/libSM/buildlink3.mk"
+.include "../../x11/libX11/buildlink3.mk"
+.include "../../x11/libXcursor/buildlink3.mk"
+.include "../../x11/libXft/buildlink3.mk"
+.include "../../x11/libXi/buildlink3.mk"
+.include "../../x11/libXmu/buildlink3.mk"
+.include "../../x11/libXrandr/buildlink3.mk"
+.include "../../x11/libXrender/buildlink3.mk"
+.include "../../x11/libxkbcommon/buildlink3.mk"
+.endif
+.endif	# QT6_QTBASE_BUILDLINK3_MK
+
+BUILDLINK_TREE+=	-qt6-qtbase
--- a/qt6-qtbase/distinfo
+++ b/qt6-qtbase/distinfo
@ -0,0 +1,35 @@
+$NetBSD$
+
+SHA1 (qtbase-everywhere-src-6.0.0.tar.xz) = 01b05dba35f5ed230ae402fde71ac1b5ff3c999b
+RMD160 (qtbase-everywhere-src-6.0.0.tar.xz) = d1eef5f53909afecdf30be9d5a468085938dd626
+SHA512 (qtbase-everywhere-src-6.0.0.tar.xz) = 0b32e38394c25577ab7746d36b8b96bdae9491395cd471887f56a62be6de533393056e9bc8c5219a7791e238bde3cdcc32f1f59b2d015fdc16260edf866fdafb
+Size (qtbase-everywhere-src-6.0.0.tar.xz) = 46234820 bytes
+SHA1 (patch-cmake_QtBuild.cmake) = 9e51c025686de3b1a383056eb6c61b0884349b57
+SHA1 (patch-cmake_QtPlatformSupport.cmake) = 597c57d1acd2798e2f8393c6fd391721c2f54f41
+SHA1 (patch-configure) = f5019131cc4e6cd4e35242cc7b598fbf8f5f766b
+SHA1 (patch-mkspecs_features_qt__module.prf) = a04c4b1fe80250b6b3591f5486ac0fd3b5056c26
+SHA1 (patch-mkspecs_features_toolchain.prf) = 0cf13cb6e859dd6276954239b91953e557add515
+SHA1 (patch-qmake_Makefile.unix) = 05037b4db1b83dbfc9647b3258f896f4fac4a4dc
+SHA1 (patch-qmake_generators_makefile.cpp) = 1bca636dc88f258876df54bd0c6c64114fa7411d
+SHA1 (patch-qmake_generators_unix_unixmake2.cpp) = 6ea4efd2ce88d7cf3c73e1dc2cdf984fe3b6af04
+SHA1 (patch-src_corelib_CMakeLists.txt) = 143853018b34cda0f0d48c3fe2d106714136d88d
+SHA1 (patch-src_corelib_configure.json) = 7a83a356330e602cbc65256dd345a107004a67cb
+SHA1 (patch-src_corelib_global_qrandom.cpp) = d910579df42d5b01583b88fa19f514b230596ca7
+SHA1 (patch-src_corelib_io_io.pri) = b2c1057e20c3150162695947bab958a2644df7dc
+SHA1 (patch-src_corelib_io_qstandardpaths_unix.cpp) = b12a41da19b25e34e12fdf80714a37e8c46278f9
+SHA1 (patch-src_corelib_io_qstorageinfo_unix.cpp) = 9919194e9f6b47f1f311b8f8223a6a7519152073
+SHA1 (patch-src_corelib_thread_qmutex__p.h) = 093089b8a37baa3071257c99bbde5f6295bd2eec
+SHA1 (patch-src_corelib_thread_qwaitcondition__unix.cpp) = 9dffdbfc81bc7d3259020cd32b4039b7be6ee2bd
+SHA1 (patch-src_gui_configure.cmake) = c83546416253522a96e2e8de418211ce3d0ec131
+SHA1 (patch-src_gui_kernel_qopenglcontext__platform.h) = 13f6c1c91f1ad3ca5a5090fd21d01f8e0c887251
+SHA1 (patch-src_gui_kernel_qplatformopenglcontext.h) = adbdbb18e2a6699454c042d4b1232a56eb35d1ab
+SHA1 (patch-src_gui_platform_unix_qunixnativeinterface.cpp) = 7bc8bd78c6c6f4ec70526f2efaff2551acb3697a
+SHA1 (patch-src_network_kernel_qnetworkinterface__unix.cpp) = 2c5569eb2ba19999eb62e4fdb54f347c88f6e6a5
+SHA1 (patch-src_plugins_platforms_cocoa_qiosurfacegraphicsbuffer.mm) = 01afb2aef1d14370308c897c1d077b05c5e3f0a9
+SHA1 (patch-src_plugins_platforms_xcb_qxcbatom.cpp) = abbd0b04b881666e82f45adc18e49aafdb43d4be
+SHA1 (patch-src_plugins_platforms_xcb_qxcbconnection__basic.h) = e369001cba31e865adf010ab714ad132b96c1bef
+SHA1 (patch-src_tools_moc_main.cpp) = ebdddd657ba1c24657a9ca5624907e31a5d0c8bb
+SHA1 (patch-src_widgets_graphicsview_qgraphicsitem__p.h) = fd55d5ef6fde506849aab07f7ba23e856373b3a1
+SHA1 (patch-tests_auto_corelib_global_qnumeric_CMakeLists.txt) = 53f3fcfcfd344565e36253d2b9105c1cd5dc6dd0
+SHA1 (patch-tests_auto_corelib_io_qprocess_qprocess.pro) = 1dbb08e5ec6715cbe239efdfb45389959b179ea3
+SHA1 (patch-tests_auto_widgets_itemviews_qtreewidgetitemiterator_qtreewidgetitemiterator.pro) = a0534c3fe05ea1d7a23170811d1da7fa740e31d1
--- a/qt6-qtbase/files/qmake.conf
+++ b/qt6-qtbase/files/qmake.conf
@ -0,0 +1,58 @@
+#
+# qmake configuration for pkgsrc
+#
+
+MAKEFILE_GENERATOR	= UNIX
+CONFIG += qt warn_on release link_prl incremental gdb_dwarf_index
+QMAKE_INCREMENTAL_STYLE = sublib
+
+@QMAKE_EXTRA@
+
+include(../common/gcc-base-unix.conf)
+include(../common/g++-unix.conf)
+include(../common/unix.conf)
+
+QMAKE_COMPILER		= @COMPILER@
+
+QMAKE_CC		= @CC@
+QMAKE_CXX		= @CXX@
+QMAKE_CFLAGS		= @CFLAGS@
+QMAKE_CXXFLAGS		= @CXXFLAGS@
+QMAKE_LEX		= @LEX@
+QMAKE_YACC		= @YACC@
+
+QMAKE_INCDIR		= @PREFIX@/include
+QMAKE_LIBDIR		= @PREFIX@/lib
+QMAKE_INCDIR_X11	= @X11BASE@/include
+QMAKE_LIBDIR_X11	= @X11BASE@/lib
+QMAKE_INCDIR_OPENGL	= @X11BASE@/include
+QMAKE_LIBDIR_OPENGL	= @X11BASE@/lib
+
+QMAKE_LINK_SHLIB_CMD	= $$QMAKE_LINK_SHLIB $$QMAKE_LFLAGS_SHLIB $(LFLAGS) $$QMAKE_LFLAGS -o $(TARGETD) $(OBJECTS) $(OBJMOC) $(LIBS)
+
+QMAKE_LFLAGS		= @LDFLAGS@
+QMAKE_LFLAGS_GCSECTIONS	= -Wl,--gc-sections
+QMAKE_LFLAGS_RPATHLINK	=
+QMAKE_LFLAGS_THREAD	= @PTHREAD_LDFLAGS@
+
+QMAKE_LIBS		=
+QMAKE_LIBS_DYNLOAD	=
+QMAKE_LIBS_X11		= -lXext -lX11 -lm @SYS_LIBS@
+QMAKE_LIBS_OPENGL	= -lGL
+QMAKE_LIBS_OPENGL_QT	= -lGL
+QMAKE_LIBS_THREAD	= @PTHREAD_LIBS@
+QMAKE_LIBS_NETWORK	= @NETWORK_LIBS@
+
+QMAKE_AR		= @AR@ cqs
+QMAKE_OBJCOPY           = objcopy
+QMAKE_NM		= nm -P
+QMAKE_RANLIB		= @QMAKE_RANLIB@
+
+QMAKE_MOC		= $(QTDIR)/bin/moc
+QMAKE_UIC		= $(QTDIR)/bin/uic
+QMAKE_UIC3		= $(QTDIR)/bin/uic3
+QMAKE_RCC		= $(QTDIR)/bin/rcc
+
+QMAKE_MKDIR		= @MKDIR@
+
+load(qt_config)
--- a/qt6-qtbase/files/qmake.conf.mac
+++ b/qt6-qtbase/files/qmake.conf.mac
@ -0,0 +1,63 @@
+#
+# qmake configuration for pkgsrc
+#
+
+MAKEFILE_GENERATOR	= UNIX
+QMAKE_PLATFORM		= darwin mac macos macx osx
+CONFIG += qt warn_on release link_prl incremental global_init_link_order lib_version_first plugin_no_soname
+CONFIG += objective_c
+QMAKE_INCREMENTAL_STYLE = sublib
+# this is a hack: 'moc' does not see the definition of Q_OS_MAC
+# it probably works correctly with CONFIG += sdk
+# see https://bugreports.qt.io/browse/QTBUG-56193
+QMAKE_COMPILER_DEFINES += TARGET_OS_MAC
+
+include(../common/gcc-base-mac.conf)
+include(../common/g++-unix.conf)
+include(../common/unix.conf)
+
+QMAKE_COMPILER		= @CC@
+
+QMAKE_CC		= @CC@
+QMAKE_CXX		= @CXX@
+QMAKE_CFLAGS		= @CFLAGS@
+QMAKE_CXXFLAGS		= @CXXFLAGS@
+QMAKE_LEX		= @LEX@
+QMAKE_YACC		= @YACC@
+
+QMAKE_INCDIR		= @PREFIX@/include
+QMAKE_LIBDIR		= @PREFIX@/lib
+
+QMAKE_LINK_SHLIB_CMD	= $$QMAKE_LINK_SHLIB $$QMAKE_LFLAGS_SHLIB $(LFLAGS) $$QMAKE_LFLAGS -o $(TARGETD) $(OBJECTS) $(OBJMOC) $(LIBS)
+
+QMAKE_LFLAGS		= @LDFLAGS@
+QMAKE_LFLAGS_GCSECTIONS	= -Wl,-dead_strip
+QMAKE_LFLAGS_RPATH	= -Wl,-rpath,
+QMAKE_LFLAGS_THREAD	= @PTHREAD_LDFLAGS@
+# Do not add -all_load, or build fails with duplicate symbols (in bearer).
+# -all_load required to make Objective-C categories work in static builds.
+QMAKE_LFLAGS_STATIC_LIB	=
+
+QMAKE_FIX_RPATH		= install_name_tool -id
+QMAKE_EXTENSION_SHLIB	= dylib
+QMAKE_REL_RPATH_BASE	= @loader_path
+
+QMAKE_LIBS		=
+QMAKE_LIBS_DYNLOAD	=
+QMAKE_LIBS_THREAD	=
+QMAKE_LIBS_OPENGL	= -framework OpenGL -framework AGL
+
+QMAKE_ACTOOL		= actool
+QMAKE_AR		= @AR@ cq
+QMAKE_DSYMUTIL		= dsymutil
+QMAKE_NM		= nm -P
+QMAKE_RANLIB		= @QMAKE_RANLIB@
+
+QMAKE_MOC		= $(QTDIR)/bin/moc
+QMAKE_UIC		= $(QTDIR)/bin/uic
+QMAKE_UIC3		= $(QTDIR)/bin/uic3
+QMAKE_RCC		= $(QTDIR)/bin/rcc
+
+QMAKE_MKDIR		= @MKDIR@
+
+load(qt_config)
--- a/qt6-qtbase/options.mk
+++ b/qt6-qtbase/options.mk
@ -0,0 +1,37 @@
+# $NetBSD$
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.qt6
+PKG_SUPPORTED_OPTIONS+=	cups dbus gtk3
+PKG_SUGGESTED_OPTIONS+=	cups dbus
+
+.include "../../mk/bsd.options.mk"
+
+PLIST_VARS+=		cups
+.if !empty(PKG_OPTIONS:Mcups)
+.  include "../../print/libcups/buildlink3.mk"
+CONFIGURE_ARGS+=	-cups
+PLIST.cups=		yes
+.else
+CONFIGURE_ARGS+=	-no-cups
+.endif
+
+PLIST_VARS+=		dbus
+.if !empty(PKG_OPTIONS:Mdbus)
+PC_FILES+=		Qt5DBus.pc
+# Use lib/dbus-1.0/include/dbus/dbus-arch-deps.h from sysutils/dbus
+USE_DBUS-ARCH-DEPS_H=	yes
+.include "../../sysutils/dbus/buildlink3.mk"
+CONFIGURE_ARGS+=	-dbus-linked
+PLIST.dbus=		yes
+.else
+CONFIGURE_ARGS+=	-no-dbus
+.endif
+
+PLIST_VARS+=		gtk3
+.if !empty(PKG_OPTIONS:Mgtk3)
+.  include "../../x11/gtk3/buildlink3.mk"
+CONFIGURE_ARGS+=	-gtk
+PLIST.gtk3=		yes
+.else
+CONFIGURE_ARGS+=	-no-gtk
+.endif
--- a/qt6-qtbase/patches/patch-cmake_QtBuild.cmake
+++ b/qt6-qtbase/patches/patch-cmake_QtBuild.cmake
@ -0,0 +1,23 @@
+$NetBSD$
+
+support more pkgsrc platforms
+
+--- cmake/QtBuild.cmake.orig	2020-12-04 10:14:27.000000000 +0000
+++ cmake/QtBuild.cmake
+@@ -303,6 +303,16 @@ elseif(LINUX)
+     elseif(ICC)
+         set(QT_DEFAULT_MKSPEC linux-icc-64)
+     endif()
+elseif(FREEBSD)
+    if(CLANG)
+        set(QT_DEFAULT_MKSPEC freebsd-clang)
+    else()
+        set(QT_DEFAULT_MKSPEC freebsd-g++)
+    endif()
+elseif(NETBSD)
+    set(QT_DEFAULT_MKSPEC netbsd-g++)
+elseif(OPENBSD)
+    set(QT_DEFAULT_MKSPEC openbsd-g++)
+ elseif(ANDROID)
+     if(GCC)
+         set(QT_DEFAULT_MKSPEC android-g++)
--- a/qt6-qtbase/patches/patch-cmake_QtPlatformSupport.cmake
+++ b/qt6-qtbase/patches/patch-cmake_QtPlatformSupport.cmake
@ -0,0 +1,15 @@
+$NetBSD$
+
+* add a common system type for all platforms that support X11
+
+--- cmake/QtPlatformSupport.cmake.orig	2020-12-04 10:14:27.000000000 +0000
+++ cmake/QtPlatformSupport.cmake
+@@ -20,6 +20,8 @@ qt_set01(WASM CMAKE_SYSTEM_NAME STREQUAL
+ 
+ qt_set01(BSD APPLE OR OPENBSD OR FREEBSD OR NETBSD)
+ 
+qt_set01(X11_PLATFORM LINUX OR HPUX OR OPENBSD OR FREEBSD OR NETBSD)
+
+ qt_set01(WINRT WIN32 AND CMAKE_VS_PLATFORM_TOOSLET STREQUAL "winrt") # FIXME: How to identify this?
+ 
+ qt_set01(IOS APPLE AND CMAKE_SYSTEM_NAME STREQUAL "iOS")
--- a/qt6-qtbase/patches/patch-configure
+++ b/qt6-qtbase/patches/patch-configure
@ -0,0 +1,35 @@
+$NetBSD: patch-configure,v 1.5 2018/01/17 19:30:47 markd Exp $
+
+Don't use SDKs on OS X
+Add NetBSD/sparc{,64} support
+
+--- configure.orig	2017-05-26 12:43:31.000000000 +0000
+++ configure
+@@ -292,7 +292,6 @@ getQMakeConf()
+ {
+     if [ -z "$specvals" ]; then
+         specvals=`expandQMakeConf "$QMAKESPEC/qmake.conf" | extractQMakeVariables`
+-        if [ "$BUILD_ON_MAC" = "yes" ]; then specvals=$(macSDKify "$specvals"); fi
+     fi
+     getSingleQMakeVariable "$1" "$specvals"
+ }
+@@ -605,6 +604,19 @@ if [ -z "$PLATFORM" ]; then
+      LynxOS*:*)
+         PLATFORM=lynxos-g++
+         ;;
+    NetBSD:*:sparc)
+        if [ "$OPT_VERBOSE" = "yes" ]; then
+            echo "    NetBSD on SPARC"
+        fi
+        CFG_HOST_ARCH=sparc
+        ;;
+    NetBSD:*:sparc64)
+        if [ "$OPT_VERBOSE" = "yes" ]; then
+            echo "    NetBSD on SPARC64"
+        fi
+        CFG_HOST_ARCH=sparc
+        CFG_HOST_BITSIZE=64
+        ;;
+      QNX:*)
+         PLATFORM=unsupported/qnx-g++
+         ;;
--- a/qt6-qtbase/patches/patch-mkspecs_features_qt__module.prf
+++ b/qt6-qtbase/patches/patch-mkspecs_features_qt__module.prf
@ -0,0 +1,14 @@
+$NetBSD: patch-mkspecs_features_qt__module.prf,v 1.1 2018/01/17 19:30:47 markd Exp $
+
+Do not create .la files.
+
+--- mkspecs/features/qt_module.prf.orig	2017-06-08 18:57:48.000000000 +0000
+++ mkspecs/features/qt_module.prf
+@@ -286,7 +286,6 @@ load(qt_targets)
+     QMAKE_PKGCONFIG_INSTALL_REPLACE += pclib_replace
+ }
+ !lib_bundle:unix {
+-    CONFIG += create_libtool
+     host_build: \
+         QMAKE_LIBTOOL_LIBDIR = $$[QT_HOST_LIBS]
+     else: \
--- a/qt6-qtbase/patches/patch-mkspecs_features_toolchain.prf
+++ b/qt6-qtbase/patches/patch-mkspecs_features_toolchain.prf
@ -0,0 +1,15 @@
+$NetBSD: patch-mkspecs_features_toolchain.prf,v 1.2 2018/12/18 09:57:18 adam Exp $
+
+Avoid "Variable QMAKE_CXX.COMPILER_MACROS is not defined" errors when using clang
+
+--- mkspecs/features/toolchain.prf.orig	2018-12-03 11:15:26.000000000 +0000
+++ mkspecs/features/toolchain.prf
+@@ -226,6 +226,8 @@ isEmpty($${target_prefix}.COMPILER_MACRO
+         }
+     } else: gcc|ghs {
+         vars = $$qtVariablesFromGCC($$QMAKE_CXX)
+    } else: clang {
+        vars = $$qtVariablesFromGCC($$QMAKE_CXX)
+     }
+     for (v, vars) {
+         !contains(v, "[A-Z_]+ = .*"): next()
--- a/qt6-qtbase/patches/patch-qmake_Makefile.unix
+++ b/qt6-qtbase/patches/patch-qmake_Makefile.unix
@ -0,0 +1,28 @@
+$NetBSD: patch-qmake_Makefile.unix,v 1.5 2020/06/02 06:41:00 adam Exp $
+
+Pass environmental variables from pkgsrc
+
+--- qmake/Makefile.unix.orig	2020-12-04 10:14:27.000000000 +0000
+++ qmake/Makefile.unix
+@@ -164,7 +164,7 @@ DEPEND_SRC = \
+ # by configure); QTSRCS2 may include *.mm entries on macOS.
+ # See below for special handling of qlibraryinfo.cpp
+ 
+-CPPFLAGS = -g $(EXTRA_CPPFLAGS) \
+CPPFLAGS += -g $(EXTRA_CPPFLAGS) \
+ 	   -I$(QMKSRC) -I$(QMKLIBSRC) -I$(QMKGENSRC) \
+ 	   -I$(SOURCE_PATH)/src/3rdparty/tinycbor/src \
+ 	   -I$(SOURCE_PATH)/src/3rdparty/pcre2/src \
+@@ -180,9 +180,9 @@ CPPFLAGS = -g $(EXTRA_CPPFLAGS) \
+            -DPCRE2_DISABLE_JIT \
+             $(EXTRA_CPPFLAGS)
+ 
+-CXXFLAGS = $(EXTRA_CXXFLAGS) $(CONFIG_CXXFLAGS) $(CPPFLAGS)
+-CFLAGS = $(CPPFLAGS) $(CONFIG_CFLAGS)
+-LFLAGS = $(EXTRA_LFLAGS) $(CONFIG_LFLAGS)
+CXXFLAGS += $(EXTRA_CXXFLAGS) $(CONFIG_CXXFLAGS) $(CPPFLAGS)
+CFLAGS += $(CPPFLAGS) $(CONFIG_CFLAGS)
+LFLAGS = $(LDFLAGS) $(EXTRA_LFLAGS) $(CONFIG_LFLAGS)
+ 
+ first all: $(BUILD_PATH)/bin/qmake$(EXEEXT)
+ qmake: $(BUILD_PATH)/bin/qmake$(EXEEXT)
--- a/qt6-qtbase/patches/patch-qmake_generators_makefile.cpp
+++ b/qt6-qtbase/patches/patch-qmake_generators_makefile.cpp
@ -0,0 +1,15 @@
+$NetBSD: patch-qmake_generators_makefile.cpp,v 1.4 2019/09/16 19:24:53 adam Exp $
+
+Pass library path to linker.
+
+--- qmake/generators/makefile.cpp.orig	2019-08-31 08:29:31.000000000 +0000
+++ qmake/generators/makefile.cpp
+@@ -3387,7 +3387,7 @@ MakefileGenerator::writePkgConfigFile()
+             pkgConfiglibName = bundle.toQString();
+         } else {
+             if (!project->values("QMAKE_DEFAULT_LIBDIRS").contains(libDir))
+-                t << "-L${libdir} ";
+                t << "-Wl,-R${libdir} -L${libdir} ";
+             pkgConfiglibName = "-l" + project->first("QMAKE_ORIG_TARGET");
+             if (project->isActiveConfig("shared"))
+                 pkgConfiglibName += project->first("TARGET_VERSION_EXT").toQString();
--- a/qt6-qtbase/patches/patch-qmake_generators_unix_unixmake2.cpp
+++ b/qt6-qtbase/patches/patch-qmake_generators_unix_unixmake2.cpp
@ -0,0 +1,34 @@
+$NetBSD: patch-qmake_generators_unix_unixmake2.cpp,v 1.6 2020/09/14 20:08:26 adam Exp $
+
+Append external variables.
+
+--- qmake/generators/unix/unixmake2.cpp.orig	2020-09-02 10:15:07.000000000 +0000
+++ qmake/generators/unix/unixmake2.cpp
+@@ -191,12 +191,12 @@ UnixMakefileGenerator::writeMakeParts(QT
+     t << "####### Compiler, tools and options\n\n";
+     t << "CC            = " << var("QMAKE_CC") << Qt::endl;
+     t << "CXX           = " << var("QMAKE_CXX") << Qt::endl;
+-    t << "DEFINES       = "
+    t << "DEFINES      += "
+       << varGlue("PRL_EXPORT_DEFINES","-D"," -D"," ")
+       << varGlue("DEFINES","-D"," -D","") << Qt::endl;
+-    t << "CFLAGS        = " << var("QMAKE_CFLAGS") << " $(DEFINES)\n";
+-    t << "CXXFLAGS      = " << var("QMAKE_CXXFLAGS") << " $(DEFINES)\n";
+-    t << "INCPATH       =";
+    t << "CFLAGS       += " << var("QMAKE_CFLAGS") << " $(DEFINES)\n";
+    t << "CXXFLAGS     += " << var("QMAKE_CXXFLAGS") << " $(DEFINES)\n";
+    t << "INCPATH      +=";
+     {
+         const ProStringList &incs = project->values("INCLUDEPATH");
+         for(int i = 0; i < incs.size(); ++i) {
+@@ -215,8 +215,8 @@ UnixMakefileGenerator::writeMakeParts(QT
+ 
+     if(!project->isActiveConfig("staticlib")) {
+         t << "LINK          = " << var("QMAKE_LINK") << Qt::endl;
+-        t << "LFLAGS        = " << var("QMAKE_LFLAGS") << Qt::endl;
+-        t << "LIBS          = $(SUBLIBS) " << fixLibFlags("LIBS").join(' ') << ' '
+        t << "LFLAGS       += " << var("QMAKE_LFLAGS") << Qt::endl;
+        t << "LIBS         += $(SUBLIBS) " << fixLibFlags("LIBS").join(' ') << ' '
+                                            << fixLibFlags("LIBS_PRIVATE").join(' ') << ' '
+                                            << fixLibFlags("QMAKE_LIBS").join(' ') << ' '
+                                            << fixLibFlags("QMAKE_LIBS_PRIVATE").join(' ') << Qt::endl;
--- a/qt6-qtbase/patches/patch-src_corelib_CMakeLists.txt
+++ b/qt6-qtbase/patches/patch-src_corelib_CMakeLists.txt
@ -0,0 +1,27 @@
+$NetBSD$
+
+somehow -fp-model is added to gcc builds when it should not
+
+use gzip compression instead of zstd since libarchive might miss zstd even
+if QT uses it, fixes the configure step on NetBSD
+
+--- src/corelib/CMakeLists.txt.orig	2020-12-04 10:14:27.000000000 +0000
+++ src/corelib/CMakeLists.txt
+@@ -690,7 +690,7 @@ qt_internal_extend_target(Core CONDITION
+         WrapAtomic::WrapAtomic
+ )
+ 
+-qt_internal_extend_target(Core CONDITION ICC
+qt_internal_extend_target(Core CONDITION (ICC AND NOT GCC)
+     COMPILE_OPTIONS
+         -fp-model
+         strict
+@@ -1174,7 +1174,7 @@ if(QT_FEATURE_mimetype AND QT_FEATURE_mi
+             COMMENT "Generating ${qmimeprovider_db_output}"
+         )
+     else()
+-        if(QT_FEATURE_zstd)
+        if(FALSE)
+             set(qmime_db_compression Zstd)
+             string(APPEND qmime_db_content "#define MIME_DATABASE_IS_ZSTD\n")
+         else()
--- a/qt6-qtbase/patches/patch-src_corelib_configure.json
+++ b/qt6-qtbase/patches/patch-src_corelib_configure.json
@ -0,0 +1,22 @@
+$NetBSD: patch-src_corelib_configure.json,v 1.2 2020/01/21 20:25:37 adam Exp $
+
+Revert change from 5.12.1 to correctly detect 64-bit atomics.
+
+--- src/corelib/configure.json.orig	2019-12-07 06:27:07.000000000 +0000
+++ src/corelib/configure.json
+@@ -134,6 +134,7 @@
+         "libatomic": {
+             "label": "64 bit atomics",
+             "test": {
+                "include": [ "atomic", "cstdint" ],
+                 "tail": [
+                     "void test(volatile std::atomic<std::int64_t> &a)",
+                     "{",
+@@ -152,7 +153,6 @@
+                 ],
+                 "qmake": "CONFIG += c++11"
+             },
+-            "headers": [ "atomic", "cstdint" ],
+             "sources": [
+                 "",
+                 "-latomic"
--- a/qt6-qtbase/patches/patch-src_corelib_global_qrandom.cpp
+++ b/qt6-qtbase/patches/patch-src_corelib_global_qrandom.cpp
@ -0,0 +1,15 @@
+$NetBSD: patch-src_corelib_global_qrandom.cpp,v 1.1 2020/05/03 11:41:45 wiedi Exp $
+
+No getauxval on SunOS
+
+--- src/corelib/global/qrandom.cpp.orig	2020-03-27 09:49:31.000000000 +0000
+++ src/corelib/global/qrandom.cpp
+@@ -277,7 +277,7 @@ static void fallback_fill(quint32 *ptr,
+     if (quint32 v = seed.loadRelaxed())
+         *end++ = v; // 6
+ 
+-#if QT_CONFIG(getauxval)
+#if QT_CONFIG(getauxval) && !defined(Q_OS_SOLARIS)
+     // works on Linux -- all modern libc have getauxval
+ #  ifdef AT_RANDOM
+     // ELF's auxv AT_RANDOM has 16 random bytes
--- a/qt6-qtbase/patches/patch-src_corelib_io_io.pri
+++ b/qt6-qtbase/patches/patch-src_corelib_io_io.pri
@ -0,0 +1,17 @@
+$NetBSD: patch-src_corelib_io_io.pri,v 1.7 2018/12/18 09:57:18 adam Exp $
+
+* Add DragonFly support
+* Patch sent and merged upstream:
+  http://codereview.qt-project.org/#/c/111741/
+
+--- src/corelib/io/io.pri.orig	2018-12-03 11:15:26.000000000 +0000
+++ src/corelib/io/io.pri
+@@ -101,7 +101,7 @@ qtConfig(filesystemwatcher) {
+         SOURCES += io/qfilesystemwatcher_inotify.cpp
+         HEADERS += io/qfilesystemwatcher_inotify_p.h
+     } else {
+-        freebsd|darwin|openbsd|netbsd {
+        freebsd-*|darwin-*|openbsd-*|netbsd-*|dragonfly-* {
+             SOURCES += io/qfilesystemwatcher_kqueue.cpp
+             HEADERS += io/qfilesystemwatcher_kqueue_p.h
+         }
--- a/qt6-qtbase/patches/patch-src_corelib_io_qstandardpaths_unix.cpp
+++ b/qt6-qtbase/patches/patch-src_corelib_io_qstandardpaths_unix.cpp
@ -0,0 +1,14 @@
+$NetBSD: patch-src_corelib_io_qstandardpaths_unix.cpp,v 1.2 2019/08/09 17:41:39 adam Exp $
+
+Add ${PREFIX}/share to search path
+
+--- src/corelib/io/qstandardpaths_unix.cpp.orig	2015-10-13 04:35:31.000000000 +0000
+++ src/corelib/io/qstandardpaths_unix.cpp
+@@ -255,6 +255,7 @@ static QStringList xdgDataDirs()
+     // http://standards.freedesktop.org/basedir-spec/latest/
+     QString xdgDataDirsEnv = QFile::decodeName(qgetenv("XDG_DATA_DIRS"));
+     if (xdgDataDirsEnv.isEmpty()) {
+        dirs.append(QString::fromLatin1("@PREFIX@/share"));
+         dirs.append(QString::fromLatin1("/usr/local/share"));
+         dirs.append(QString::fromLatin1("/usr/share"));
+     } else {
--- a/qt6-qtbase/patches/patch-src_corelib_io_qstorageinfo_unix.cpp
+++ b/qt6-qtbase/patches/patch-src_corelib_io_qstorageinfo_unix.cpp
@ -0,0 +1,15 @@
+$NetBSD: patch-src_corelib_io_qstorageinfo_unix.cpp,v 1.7 2018/01/17 19:30:47 markd Exp $
+
+* fix build on SunOS
+
+--- src/corelib/io/qstorageinfo_unix.cpp.orig	2015-10-13 04:35:31 UTC
+++ src/corelib/io/qstorageinfo_unix.cpp
+@@ -87,7 +87,7 @@
+ #  if !defined(ST_RDONLY)
+ #    define ST_RDONLY 1 // hack for missing define on Android
+ #  endif
+-#elif defined(Q_OS_HAIKU)
+#elif defined(Q_OS_HAIKU) || defined(Q_OS_SOLARIS)
+ #  define QT_STATFSBUF struct statvfs
+ #  define QT_STATFS    ::statvfs
+ #else
--- a/qt6-qtbase/patches/patch-src_corelib_thread_qmutex__p.h
+++ b/qt6-qtbase/patches/patch-src_corelib_thread_qmutex__p.h
@ -0,0 +1,16 @@
+$NetBSD: patch-src_corelib_thread_qmutex__p.h,v 1.1 2019/04/28 12:46:31 maya Exp $
+
+Avoid using semaphores on netbsd. they're flimsy and sem_init fails
+if you use too many semaphores.
+
+--- src/corelib/thread/qmutex_p.h.orig	2019-04-09 09:51:26.000000000 +0000
+++ src/corelib/thread/qmutex_p.h
+@@ -65,7 +65,7 @@
+ #elif defined(Q_OS_LINUX) && !defined(QT_LINUXBASE)
+ // use Linux mutexes everywhere except for LSB builds
+ #  define QT_LINUX_FUTEX
+-#elif defined(Q_OS_UNIX)
+#elif defined(Q_OS_UNIX) && !defined(__NetBSD__)
+ # if _POSIX_VERSION-0 >= 200112L || _XOPEN_VERSION-0 >= 600
+ #  include <semaphore.h>
+ #  define QT_UNIX_SEMAPHORE
--- a/qt6-qtbase/patches/patch-src_corelib_thread_qwaitcondition__unix.cpp
+++ b/qt6-qtbase/patches/patch-src_corelib_thread_qwaitcondition__unix.cpp
@ -0,0 +1,23 @@
+$NetBSD: patch-src_corelib_thread_qwaitcondition__unix.cpp,v 1.3 2018/12/18 09:57:18 adam Exp $
+
+On NetBSD before 6.1, do not use pthread_condattr_setclock().
+
+--- src/corelib/thread/qwaitcondition_unix.cpp.orig	2018-12-03 11:15:26.000000000 +0000
+++ src/corelib/thread/qwaitcondition_unix.cpp
+@@ -54,6 +54,7 @@
+ 
+ #include <errno.h>
+ #include <sys/time.h>
+#include <sys/param.h>
+ #include <time.h>
+ 
+ QT_BEGIN_NAMESPACE
+@@ -84,7 +85,7 @@ void qt_initialize_pthread_cond(pthread_
+ #if defined(Q_OS_ANDROID)
+     if (local_condattr_setclock && QElapsedTimer::clockType() == QElapsedTimer::MonotonicClock)
+         local_condattr_setclock(&condattr, CLOCK_MONOTONIC);
+-#elif !defined(Q_OS_MAC)
+#elif !defined(Q_OS_MAC) && !(defined(Q_OS_NETBSD) && (__NetBSD_Version__ < 600010000))
+     if (QElapsedTimer::clockType() == QElapsedTimer::MonotonicClock)
+         pthread_condattr_setclock(&condattr, CLOCK_MONOTONIC);
+ #endif
--- a/qt6-qtbase/patches/patch-src_gui_configure.cmake
+++ b/qt6-qtbase/patches/patch-src_gui_configure.cmake
@ -0,0 +1,121 @@
+$NetBSD$
+
+* check for X11 libs on all systems that support X11 not just linux
+* make QT_FEATURE_xcb_glx available everywhere so that glx can enabled
+  on other platforms than linux
+
+--- src/gui/configure.cmake.orig	2020-12-04 10:14:27.000000000 +0000
+++ src/gui/configure.cmake
+@@ -53,82 +53,82 @@ qt_find_package(Vulkan PROVIDED_TARGETS 
+ if((LINUX) OR QT_FIND_ALL_PACKAGES_ALWAYS)
+     qt_find_package(Wayland PROVIDED_TARGETS Wayland::Server MODULE_NAME gui QMAKE_LIB wayland_server)
+ endif()
+-if((LINUX) OR QT_FIND_ALL_PACKAGES_ALWAYS)
+if((X11_PLATFORM) OR QT_FIND_ALL_PACKAGES_ALWAYS)
+     qt_find_package(X11 PROVIDED_TARGETS X11::X11 MODULE_NAME gui QMAKE_LIB xlib)
+ endif()
+-if((LINUX) OR QT_FIND_ALL_PACKAGES_ALWAYS)
+if((X11_PLATFORM) OR QT_FIND_ALL_PACKAGES_ALWAYS)
+     qt_find_package(X11 PROVIDED_TARGETS ${X11_SM_LIB} ${X11_ICE_LIB} MODULE_NAME gui QMAKE_LIB x11sm)
+ endif()
+-if((LINUX) OR QT_FIND_ALL_PACKAGES_ALWAYS)
+if((X11_PLATFORM) OR QT_FIND_ALL_PACKAGES_ALWAYS)
+     qt_find_package(XCB 1.11 PROVIDED_TARGETS XCB::XCB MODULE_NAME gui QMAKE_LIB xcb)
+ endif()
+-if((LINUX) OR QT_FIND_ALL_PACKAGES_ALWAYS)
+if((X11_PLATFORM) OR QT_FIND_ALL_PACKAGES_ALWAYS)
+     qt_find_package(XCB 0.3.9 COMPONENTS ICCCM PROVIDED_TARGETS XCB::ICCCM MODULE_NAME gui QMAKE_LIB xcb_icccm)
+ endif()
+ qt_add_qmake_lib_dependency(xcb_icccm xcb)
+-if((LINUX) OR QT_FIND_ALL_PACKAGES_ALWAYS)
+if((X11_PLATFORM) OR QT_FIND_ALL_PACKAGES_ALWAYS)
+     qt_find_package(XCB 0.3.9 COMPONENTS UTIL PROVIDED_TARGETS XCB::UTIL MODULE_NAME gui QMAKE_LIB xcb_util)
+ endif()
+ qt_add_qmake_lib_dependency(xcb_util xcb)
+-if((LINUX) OR QT_FIND_ALL_PACKAGES_ALWAYS)
+if((X11_PLATFORM) OR QT_FIND_ALL_PACKAGES_ALWAYS)
+     qt_find_package(XCB 0.3.9 COMPONENTS IMAGE PROVIDED_TARGETS XCB::IMAGE MODULE_NAME gui QMAKE_LIB xcb_image)
+ endif()
+ qt_add_qmake_lib_dependency(xcb_image xcb_shm xcb_util xcb)
+-if((LINUX) OR QT_FIND_ALL_PACKAGES_ALWAYS)
+if((X11_PLATFORM) OR QT_FIND_ALL_PACKAGES_ALWAYS)
+     qt_find_package(XCB 0.3.9 COMPONENTS KEYSYMS PROVIDED_TARGETS XCB::KEYSYMS MODULE_NAME gui QMAKE_LIB xcb_keysyms)
+ endif()
+ qt_add_qmake_lib_dependency(xcb_keysyms xcb)
+-if((LINUX) OR QT_FIND_ALL_PACKAGES_ALWAYS)
+if((X11_PLATFORM) OR QT_FIND_ALL_PACKAGES_ALWAYS)
+     qt_find_package(XCB 0.3.9 COMPONENTS RENDERUTIL PROVIDED_TARGETS XCB::RENDERUTIL MODULE_NAME gui QMAKE_LIB xcb_renderutil)
+ endif()
+ qt_add_qmake_lib_dependency(xcb_renderutil xcb xcb_render)
+-if((LINUX) OR QT_FIND_ALL_PACKAGES_ALWAYS)
+if((X11_PLATFORM) OR QT_FIND_ALL_PACKAGES_ALWAYS)
+     qt_find_package(XCB COMPONENTS RANDR PROVIDED_TARGETS XCB::RANDR MODULE_NAME gui QMAKE_LIB xcb_randr)
+ endif()
+ qt_add_qmake_lib_dependency(xcb_randr xcb)
+-if((LINUX) OR QT_FIND_ALL_PACKAGES_ALWAYS)
+if((X11_PLATFORM) OR QT_FIND_ALL_PACKAGES_ALWAYS)
+     qt_find_package(XCB COMPONENTS SHAPE PROVIDED_TARGETS XCB::SHAPE MODULE_NAME gui QMAKE_LIB xcb_shape)
+ endif()
+ qt_add_qmake_lib_dependency(xcb_shape xcb)
+-if((LINUX) OR QT_FIND_ALL_PACKAGES_ALWAYS)
+if((X11_PLATFORM) OR QT_FIND_ALL_PACKAGES_ALWAYS)
+     qt_find_package(XCB COMPONENTS SHM PROVIDED_TARGETS XCB::SHM MODULE_NAME gui QMAKE_LIB xcb_shm)
+ endif()
+ qt_add_qmake_lib_dependency(xcb_shm xcb)
+-if((LINUX) OR QT_FIND_ALL_PACKAGES_ALWAYS)
+if((X11_PLATFORM) OR QT_FIND_ALL_PACKAGES_ALWAYS)
+     qt_find_package(XCB COMPONENTS SYNC PROVIDED_TARGETS XCB::SYNC MODULE_NAME gui QMAKE_LIB xcb_sync)
+ endif()
+ qt_add_qmake_lib_dependency(xcb_sync xcb)
+-if((LINUX) OR QT_FIND_ALL_PACKAGES_ALWAYS)
+if((X11_PLATFORM) OR QT_FIND_ALL_PACKAGES_ALWAYS)
+     qt_find_package(XCB COMPONENTS XFIXES PROVIDED_TARGETS XCB::XFIXES MODULE_NAME gui QMAKE_LIB xcb_xfixes)
+ endif()
+ qt_add_qmake_lib_dependency(xcb_xfixes xcb)
+-if((LINUX) OR QT_FIND_ALL_PACKAGES_ALWAYS)
+if((X11_PLATFORM) OR QT_FIND_ALL_PACKAGES_ALWAYS)
+     qt_find_package(X11_XCB PROVIDED_TARGETS X11::XCB MODULE_NAME gui QMAKE_LIB xcb_xlib)
+ endif()
+ qt_add_qmake_lib_dependency(xcb_xlib xcb xlib)
+-if((LINUX) OR QT_FIND_ALL_PACKAGES_ALWAYS)
+if((X11_PLATFORM) OR QT_FIND_ALL_PACKAGES_ALWAYS)
+     qt_find_package(XCB COMPONENTS XKB PROVIDED_TARGETS XCB::XKB MODULE_NAME gui QMAKE_LIB xcb_xkb)
+ endif()
+ qt_add_qmake_lib_dependency(xcb_xkb xcb)
+-if((LINUX) OR QT_FIND_ALL_PACKAGES_ALWAYS)
+if((X11_PLATFORM) OR QT_FIND_ALL_PACKAGES_ALWAYS)
+     qt_find_package(XCB COMPONENTS RENDER PROVIDED_TARGETS XCB::RENDER MODULE_NAME gui QMAKE_LIB xcb_render)
+ endif()
+ qt_add_qmake_lib_dependency(xcb_render xcb)
+-if((LINUX) OR QT_FIND_ALL_PACKAGES_ALWAYS)
+if((X11_PLATFORM) OR QT_FIND_ALL_PACKAGES_ALWAYS)
+     qt_find_package(XCB COMPONENTS GLX PROVIDED_TARGETS XCB::GLX MODULE_NAME gui QMAKE_LIB xcb_glx)
+ endif()
+ qt_add_qmake_lib_dependency(xcb_glx xcb)
+-if((LINUX) OR QT_FIND_ALL_PACKAGES_ALWAYS)
+if((X11_PLATFORM) OR QT_FIND_ALL_PACKAGES_ALWAYS)
+     qt_find_package(XCB 1.12 COMPONENTS XINPUT PROVIDED_TARGETS XCB::XINPUT MODULE_NAME gui QMAKE_LIB xcb_xinput)
+ endif()
+ qt_add_qmake_lib_dependency(xcb_xinput xcb)
+-if((LINUX) OR QT_FIND_ALL_PACKAGES_ALWAYS)
+if((X11_PLATFORM) OR QT_FIND_ALL_PACKAGES_ALWAYS)
+     qt_find_package(XKB 0.5.0 PROVIDED_TARGETS XKB::XKB MODULE_NAME gui QMAKE_LIB xkbcommon)
+ endif()
+-if((LINUX) OR QT_FIND_ALL_PACKAGES_ALWAYS)
+if((X11_PLATFORM) OR QT_FIND_ALL_PACKAGES_ALWAYS)
+     qt_find_package(XKB_COMMON_X11 0.5.0 PROVIDED_TARGETS PkgConfig::XKB_COMMON_X11 MODULE_NAME gui QMAKE_LIB xkbcommon_x11)
+ endif()
+-if((LINUX) OR QT_FIND_ALL_PACKAGES_ALWAYS)
+if((X11_PLATFORM) OR QT_FIND_ALL_PACKAGES_ALWAYS)
+     qt_find_package(XRender 0.6 PROVIDED_TARGETS PkgConfig::XRender MODULE_NAME gui QMAKE_LIB xrender)
+ endif()
+ qt_add_qmake_lib_dependency(xrender xlib)
+@@ -897,7 +897,7 @@ qt_feature("xcb-glx-plugin" PRIVATE
+     CONDITION QT_FEATURE_xcb_xlib AND QT_FEATURE_opengl AND NOT QT_FEATURE_opengles2
+     EMIT_IF QT_FEATURE_xcb
+ )
+-qt_feature("xcb-glx" PRIVATE
+qt_feature("xcb-glx" PUBLIC
+     LABEL "  XCB GLX"
+     CONDITION XCB_GLX_FOUND
+     EMIT_IF QT_FEATURE_xcb AND QT_FEATURE_xcb_glx_plugin
--- a/qt6-qtbase/patches/patch-src_gui_kernel_qopenglcontext__platform.h
+++ b/qt6-qtbase/patches/patch-src_gui_kernel_qopenglcontext__platform.h
@ -0,0 +1,24 @@
+$NetBSD$
+
+enable glx when xcb-glx is found not just on linux
+
+--- src/gui/kernel/qopenglcontext_platform.h.orig	2020-12-04 10:14:27.000000000 +0000
+++ src/gui/kernel/qopenglcontext_platform.h
+@@ -50,7 +50,7 @@
+ Q_FORWARD_DECLARE_OBJC_CLASS(NSOpenGLContext);
+ #endif
+ 
+-#if defined(Q_OS_LINUX)
+#if QT_CONFIG(xcb_glx)
+ struct __GLXcontextRec; typedef struct __GLXcontextRec *GLXContext;
+ #endif
+ #if QT_CONFIG(egl)
+@@ -85,7 +85,7 @@ struct Q_GUI_EXPORT QWGLContext
+ };
+ #endif
+ 
+-#if defined(Q_OS_LINUX) || defined(Q_CLANG_QDOC)
+#if QT_CONFIG(xcb_glx) || defined(Q_CLANG_QDOC)
+ struct Q_GUI_EXPORT QGLXContext
+ {
+     QT_DECLARE_NATIVE_INTERFACE(QGLXContext)
--- a/qt6-qtbase/patches/patch-src_gui_kernel_qplatformopenglcontext.h
+++ b/qt6-qtbase/patches/patch-src_gui_kernel_qplatformopenglcontext.h
@ -0,0 +1,15 @@
+$NetBSD$
+
+enable glx when xcb-glx is found not just on linux
+
+--- src/gui/kernel/qplatformopenglcontext.h.orig	2020-12-04 10:14:27.000000000 +0000
+++ src/gui/kernel/qplatformopenglcontext.h
+@@ -127,7 +127,7 @@ struct Q_GUI_EXPORT QWindowsGLIntegratio
+ };
+ #endif
+ 
+-#if defined(Q_OS_LINUX)
+#if QT_CONFIG(xcb_glx)
+ struct Q_GUI_EXPORT QGLXIntegration
+ {
+     QT_DECLARE_NATIVE_INTERFACE(QGLXIntegration)
--- a/qt6-qtbase/patches/patch-src_gui_platform_unix_qunixnativeinterface.cpp
+++ b/qt6-qtbase/patches/patch-src_gui_platform_unix_qunixnativeinterface.cpp
@ -0,0 +1,15 @@
+$NetBSD$
+
+enable glx when xcb_glx is available not just on linux
+
+--- src/gui/platform/unix/qunixnativeinterface.cpp.orig	2020-12-30 22:09:23.903201486 +0000
+++ src/gui/platform/unix/qunixnativeinterface.cpp
+@@ -55,7 +55,7 @@ using namespace QNativeInterface::Privat
+ 
+ #ifndef QT_NO_OPENGL
+ 
+-#if defined(Q_OS_LINUX)
+#if QT_CONFIG(xcb_glx)
+ 
+ /*!
+     \class QNativeInterface::QGLXContext
--- a/qt6-qtbase/patches/patch-src_network_kernel_qnetworkinterface__unix.cpp
+++ b/qt6-qtbase/patches/patch-src_network_kernel_qnetworkinterface__unix.cpp
@ -0,0 +1,44 @@
+$NetBSD: patch-src_network_kernel_qnetworkinterface__unix.cpp,v 1.1 2018/01/31 12:36:57 jperkin Exp $
+
+Support ifr_index.
+
+--- src/network/kernel/qnetworkinterface_unix.cpp.orig	2017-11-30 13:49:46.000000000 +0000
+++ src/network/kernel/qnetworkinterface_unix.cpp
+@@ -136,7 +136,11 @@ uint QNetworkInterfaceManager::interface
+ 
+     uint id = 0;
+     if (qt_safe_ioctl(socket, SIOCGIFINDEX, &req) >= 0)
+#ifdef ifr_ifindex
+         id = req.ifr_ifindex;
+#else
+        id = req.ifr_index;
+#endif
+     qt_safe_close(socket);
+     return id;
+ #else
+@@ -155,7 +159,11 @@ QString QNetworkInterfaceManager::interf
+     int socket = qt_safe_socket(AF_INET, SOCK_STREAM, 0);
+     if (socket >= 0) {
+         memset(&req, 0, sizeof(ifreq));
+#ifdef ifr_ifindex
+         req.ifr_ifindex = index;
+#else
+        req.ifr_index = index;
+#endif
+ 
+         if (qt_safe_ioctl(socket, SIOCGIFNAME, &req) >= 0) {
+             qt_safe_close(socket);
+@@ -232,10 +240,10 @@ static QNetworkInterfacePrivate *findInt
+     // Get the interface index
+ #  ifdef SIOCGIFINDEX
+     if (qt_safe_ioctl(socket, SIOCGIFINDEX, &req) >= 0)
+-#    if defined(Q_OS_HAIKU)
+-        ifindex = req.ifr_index;
+-#    else
+#    ifdef ifr_ifindex
+         ifindex = req.ifr_ifindex;
+#    else
+        ifindex = req.ifr_index;
+ #    endif
+ #  else
+     ifindex = if_nametoindex(req.ifr_name);
--- a/qt6-qtbase/patches/patch-src_plugins_platforms_cocoa_qiosurfacegraphicsbuffer.mm
+++ b/qt6-qtbase/patches/patch-src_plugins_platforms_cocoa_qiosurfacegraphicsbuffer.mm
@ -0,0 +1,19 @@
+$NetBSD: patch-src_plugins_platforms_cocoa_qiosurfacegraphicsbuffer.mm,v 1.1 2019/12/24 06:20:42 dbj Exp $
+
+Fix Darwin build on builds before macosx 10.13
+
+--- src/plugins/platforms/cocoa/qiosurfacegraphicsbuffer.mm.orig	2019-06-13 04:18:18.000000000 +0000
+++ src/plugins/platforms/cocoa/qiosurfacegraphicsbuffer.mm
+@@ -45,6 +45,12 @@
+ #include <CoreGraphics/CoreGraphics.h>
+ #include <IOSurface/IOSurface.h>
+ 
+// kIOReturnSuccess is only available on 10.13 and above
+// however, IOSurfaceLock has been around longer
+#ifndef kIOSurfaceSuccess
+#define kIOSurfaceSuccess kIOReturnSuccess
+#endif
+
+ // CGColorSpaceCopyPropertyList is available on 10.12 and above,
+ // but was only added in the 10.14 SDK, so declare it just in case.
+ extern "C" CFPropertyListRef CGColorSpaceCopyPropertyList(CGColorSpaceRef space);
--- a/qt6-qtbase/patches/patch-src_plugins_platforms_xcb_qxcbatom.cpp
+++ b/qt6-qtbase/patches/patch-src_plugins_platforms_xcb_qxcbatom.cpp
@ -0,0 +1,14 @@
+$NetBSD: patch-src_plugins_platforms_xcb_qxcbatom.cpp,v 1.1 2018/12/18 09:57:18 adam Exp $
+
+Fix building.
+
+--- src/plugins/platforms/xcb/qxcbatom.cpp.orig	2018-12-13 14:50:05.083875585 +0000
+++ src/plugins/platforms/xcb/qxcbatom.cpp
+@@ -40,6 +40,7 @@
+ 
+ #include <QtCore/qglobal.h>
+ 
+#include <stdlib.h>
+ #include <string.h>
+ 
+ #include <algorithm>
--- a/qt6-qtbase/patches/patch-src_plugins_platforms_xcb_qxcbconnection__basic.h
+++ b/qt6-qtbase/patches/patch-src_plugins_platforms_xcb_qxcbconnection__basic.h
@ -0,0 +1,14 @@
+$NetBSD: patch-src_plugins_platforms_xcb_qxcbconnection__basic.h,v 1.2 2020/01/21 20:25:37 adam Exp $
+
+Include <cstdlib> for std::free().
+
+--- src/plugins/platforms/xcb/qxcbconnection_basic.h.orig	2020-01-21 16:01:11.717518124 +0000
+++ src/plugins/platforms/xcb/qxcbconnection_basic.h
+@@ -50,6 +50,7 @@
+ 
+ #include <xcb/xcb.h>
+ 
+#include <cstdlib>
+ #include <memory>
+ 
+ QT_BEGIN_NAMESPACE
--- a/qt6-qtbase/patches/patch-src_tools_moc_main.cpp
+++ b/qt6-qtbase/patches/patch-src_tools_moc_main.cpp
@ -0,0 +1,14 @@
+$NetBSD: patch-src_tools_moc_main.cpp,v 1.2 2015/10/26 19:03:59 adam Exp $
+
+rh#756395, https://bugreports.qt-project.org/browse/QTBUG-22829
+
+--- src/tools/moc/main.cpp.orig	2013-11-27 01:01:11.000000000 +0000
+++ src/tools/moc/main.cpp
+@@ -192,6 +192,7 @@ int runMoc(int argc, char **argv)
+     Moc moc;
+     pp.macros["Q_MOC_RUN"];
+     pp.macros["__cplusplus"];
+    pp.macros["BOOST_TT_HAS_OPERATOR_HPP_INCLUDED"];
+ 
+     // Don't stumble over GCC extensions
+     Macro dummyVariadicFunctionMacro;
--- a/qt6-qtbase/patches/patch-src_widgets_graphicsview_qgraphicsitem__p.h
+++ b/qt6-qtbase/patches/patch-src_widgets_graphicsview_qgraphicsitem__p.h
@ -0,0 +1,13 @@
+$NetBSD: patch-src_widgets_graphicsview_qgraphicsitem__p.h,v 1.1 2014/12/30 17:23:46 adam Exp $
+
+--- src/widgets/graphicsview/qgraphicsitem_p.h.orig	2013-11-27 01:01:12.000000000 +0000
+++ src/widgets/graphicsview/qgraphicsitem_p.h
+@@ -761,7 +761,7 @@ inline bool qt_closestItemFirst(const QG
+     // item1Ancestor is now at the same level as item2Ancestor, but not the same.
+     const QGraphicsItem *p1 = t1;
+     const QGraphicsItem *p2 = t2;
+-    while (t1 && t1 != t2) {
+    while (t1 && t2 && t1 != t2) {
+         p1 = t1;
+         p2 = t2;
+         t1 = t1->d_ptr->parent;
--- a/qt6-qtbase/patches/patch-tests_auto_corelib_global_qnumeric_CMakeLists.txt
+++ b/qt6-qtbase/patches/patch-tests_auto_corelib_global_qnumeric_CMakeLists.txt
@ -0,0 +1,15 @@
+$NetBSD$
+
+somehow -fp-model is added to gcc builds
+
+--- tests/auto/corelib/global/qnumeric/CMakeLists.txt.orig	2020-12-04 10:14:27.000000000 +0000
+++ tests/auto/corelib/global/qnumeric/CMakeLists.txt
+@@ -14,7 +14,7 @@ qt_internal_add_test(tst_qnumeric
+ ## Scopes:
+ #####################################################################
+ 
+-qt_internal_extend_target(tst_qnumeric CONDITION ICC
+qt_internal_extend_target(tst_qnumeric CONDITION (ICC AND NOT GCC)
+     COMPILE_OPTIONS
+         -fp-model
+         strict
--- a/qt6-qtbase/patches/patch-tests_auto_corelib_io_qprocess_qprocess.pro
+++ b/qt6-qtbase/patches/patch-tests_auto_corelib_io_qprocess_qprocess.pro
@ -0,0 +1,18 @@
+$NetBSD: patch-tests_auto_corelib_io_qprocess_qprocess.pro,v 1.2 2018/01/17 19:30:47 markd Exp $
+
+* Pass whitespace(s) in filename test cases.
+
+--- tests/auto/corelib/io/qprocess/qprocess.pro.orig	2017-01-18 14:20:58.000000000 +0000
+++ tests/auto/corelib/io/qprocess/qprocess.pro
+@@ -3,10 +3,7 @@ TEMPLATE = subdirs
+ include(qprocess.pri)
+ SUBDIRS  = $$SUBPROGRAMS
+ # Add special cases
+-SUBDIRS += testProcessSpacesArgs/nospace.pro \
+-           testProcessSpacesArgs/onespace.pro \
+-           testProcessSpacesArgs/twospaces.pro \
+-           testSpaceInName
+SUBDIRS += testProcessSpacesArgs/nospace.pro
+ 
+ win32 {
+     SUBDIRS += \
--- a/qt6-qtbase/patches/patch-tests_auto_widgets_itemviews_qtreewidgetitemiterator_qtreewidgetitemiterator.pro
+++ b/qt6-qtbase/patches/patch-tests_auto_widgets_itemviews_qtreewidgetitemiterator_qtreewidgetitemiterator.pro
@ -0,0 +1,14 @@
+$NetBSD: patch-tests_auto_widgets_itemviews_qtreewidgetitemiterator_qtreewidgetitemiterator.pro,v 1.1 2014/12/30 17:23:46 adam Exp $
+
+Consumes too much memory with Clang. As it is just a test case,
+disable optimisation for all compiler.
+
+--- tests/auto/widgets/itemviews/qtreewidgetitemiterator/qtreewidgetitemiterator.pro.orig	2013-12-15 15:52:18.000000000 +0000
+++ tests/auto/widgets/itemviews/qtreewidgetitemiterator/qtreewidgetitemiterator.pro
+@@ -4,4 +4,6 @@ TARGET = tst_qtreewidgetitemiterator
+ QT += widgets testlib
+ SOURCES  += tst_qtreewidgetitemiterator.cpp
+ 
+QMAKE_CXXFLAGS_WARN_ON= -O0
+QMAKE_CXXFLAGS_WARN_OFF= -O0
+ 
--- a/qt6/DESCR
+++ b/qt6/DESCR
@ -0,0 +1,10 @@
+Qt(TM) is a GUI software toolkit. Qt simplifies the task of writing and
+maintaining GUI (graphical user interface) applications.
+
+This package does not contain anything by itself -- it is a
+"meta-package" that depends on other QT packages.  Its sole purpose is
+to require dependencies so users can install this package only and
+have all the QT stuff pulled in by the port/package dependency
+mechanism.
+
+This package tracks Qt6 branch.
--- a/qt6/Makefile
+++ b/qt6/Makefile
@ -0,0 +1,42 @@
+# $NetBSD: Makefile,v 1.19 2020/01/21 20:25:36 adam Exp $
+
+DISTNAME=	qt6-${QTVERSION}
+
+COMMENT=	"meta-package" for version 5 of the QT GUI C++ toolkit
+
+META_PACKAGE=	yes
+
+.include "Makefile.common"
+
+DEPENDS+=	qt5-qtbase-${QTVERSION}{,nb[0-9]*}:../../x11/qt5-qtbase
+DEPENDS+=	qt5-qtcharts-${QTVERSION}{,nb[0-9]*}:../../x11/qt5-qtcharts
+DEPENDS+=	qt5-qtconnectivity-${QTVERSION}{,nb[0-9]*}:../../x11/qt5-qtconnectivity
+DEPENDS+=	qt5-qtdeclarative-${QTVERSION}{,nb[0-9]*}:../../x11/qt5-qtdeclarative
+DEPENDS+=	qt5-qtdoc-${QTVERSION}{,nb[0-9]*}:../../x11/qt5-qtdoc
+DEPENDS+=	qt5-qtgraphicaleffects-${QTVERSION}{,nb[0-9]*}:../../x11/qt5-qtgraphicaleffects
+DEPENDS+=	qt5-qtimageformats-${QTVERSION}{,nb[0-9]*}:../../x11/qt5-qtimageformats
+DEPENDS+=	qt5-qtlocation-${QTVERSION}{,nb[0-9]*}:../../x11/qt5-qtlocation
+DEPENDS+=	qt5-qtmultimedia-${QTVERSION}{,nb[0-9]*}:../../x11/qt5-qtmultimedia
+DEPENDS+=	qt5-qtnetworkauth-${QTVERSION}{,nb[0-9]*}:../../x11/qt5-qtnetworkauth
+DEPENDS+=	qt5-qtquickcontrols-${QTVERSION}{,nb[0-9]*}:../../x11/qt5-qtquickcontrols
+DEPENDS+=	qt5-qtquickcontrols2-${QTVERSION}{,nb[0-9]*}:../../x11/qt5-qtquickcontrols2
+DEPENDS+=	qt5-qtscript-${QTVERSION}{,nb[0-9]*}:../../x11/qt5-qtscript
+DEPENDS+=	qt5-qtscxml-${QTVERSION}{,nb[0-9]*}:../../x11/qt5-qtscxml
+DEPENDS+=	qt5-qtsensors-${QTVERSION}{,nb[0-9]*}:../../x11/qt5-qtsensors
+DEPENDS+=	qt5-qtserialport-${QTVERSION}{,nb[0-9]*}:../../x11/qt5-qtserialport
+DEPENDS+=	qt5-qtspeech-${QTVERSION}{,nb[0-9]*}:../../x11/qt5-qtspeech
+DEPENDS+=	qt5-qtsvg-${QTVERSION}{,nb[0-9]*}:../../x11/qt5-qtsvg
+DEPENDS+=	qt5-qttools-${QTVERSION}{,nb[0-9]*}:../../x11/qt5-qttools
+DEPENDS+=	qt5-qttranslations-${QTVERSION}{,nb[0-9]*}:../../x11/qt5-qttranslations
+DEPENDS+=	qt5-qtvirtualkeyboard-${QTVERSION}{,nb[0-9]*}:../../x11/qt5-qtvirtualkeyboard
+DEPENDS+=	qt5-qtwebchannel-${QTVERSION}{,nb[0-9]*}:../../x11/qt5-qtwebchannel
+DEPENDS+=	qt5-qtwebsockets-${QTVERSION}{,nb[0-9]*}:../../x11/qt5-qtwebsockets
+DEPENDS+=	qt5-qtxmlpatterns-${QTVERSION}{,nb[0-9]*}:../../x11/qt5-qtxmlpatterns
+.if ${OPSYS} == "Darwin"
+DEPENDS+=	qt5-qtmacextras-${QTVERSION}{,nb[0-9]*}:../../x11/qt5-qtmacextras
+.else
+DEPENDS+=	qt5-qtwayland-${QTVERSION}{,nb[0-9]*}:../../x11/qt5-qtwayland
+DEPENDS+=	qt5-qtx11extras-${QTVERSION}{,nb[0-9]*}:../../x11/qt5-qtx11extras
+.endif
+
+.include "../../mk/bsd.pkg.mk"
--- a/qt6/Makefile.common
+++ b/qt6/Makefile.common
@ -0,0 +1,18 @@
+# $NetBSD: Makefile.common,v 1.24 2020/09/14 20:08:26 adam Exp $
+# used by x11/qt5-qtbase/Makefile.common
+# used by inputmethod/qt5-uim/Makefile
+
+QTVERSION=	6.0.0
+
+.include "../../mk/bsd.prefs.mk"
+
+CATEGORIES=	x11
+MASTER_SITES=	http://download.qt.io/official_releases/qt/${QTVERSION:R}/${QTVERSION}/submodules/
+EXTRACT_SUFX=	.tar.xz
+EXTRACT_USING=	bsdtar
+
+MAINTAINER?=	nros@NetBSD.org
+HOMEPAGE=	https://www.qt.io/
+LICENSE=	gnu-lgpl-v2.1 AND gnu-lgpl-v3 AND gnu-gpl-v2 AND gnu-gpl-v3
+
+QTPREFIX=	${PREFIX}/qt6