UPDATE: x11/qt5

Update Qt5 to the latest stable opensource version 5.15.5.
I cleaned up some Makefile, removed non-used helper functions
and create a new openbsd-g++/qmake.conf based on freebsd-g++.

I have tested the update with a lot of Qt5 application without finding
any issues. While here, add me as maintainer.

The qtwebengine update will come separate.

OK?

Index: Makefile.inc
===================================================================
RCS file: /cvs/ports/x11/qt5/Makefile.inc,v
retrieving revision 1.19
diff -u -p -r1.19 Makefile.inc
--- Makefile.inc 11 Mar 2022 20:16:58 -0000 1.19
+++ Makefile.inc 6 Jul 2022 05:14:39 -0000
@@ -3,14 +3,16 @@ ONLY_FOR_ARCHS ?= ${GCC4_ARCHS} ${CLANG_
.include "Makefile.version"

# DIST_VERSION should be defined, e.g., when patch distfile gets issued,
-# e.g.: qtbase-everywhere-src-5.5.1-1.tar.gz
+# e.g.: qtbase-everywhere-opensource-src-5.5.1-1.tar.gz

VERSION ?= ${QT5_VERSION}
DIST_VERSION ?= ${QT5_DIST_VERSION}
NEXT_VERSION ?= ${QT5_NEXT_VERSION}
-DISTNAME ?= ${QT5NAME:L}-everywhere-src-${DIST_VERSION}
+DISTNAME ?= ${QT5NAME:L}-everywhere-opensource-src-${DIST_VERSION}

-PKGNAME ?= ${DISTNAME:C/-everywhere-src//:C/-${DIST_VERSION}/-${VERSION}/}
+MAINTAINER ?= Rafael Sadowski <rsadowski@openbsd.org>
+
+PKGNAME ?= ${DISTNAME:C/-everywhere-opensource-src//:C/-${DIST_VERSION}/-${VERSION}/}
PKGNAME-main ?= ${PKGNAME}
PKGNAME-examples ?= ${PKGNAME:C/(-[0-9])/-examples\1/}

@@ -60,6 +62,8 @@ MAKE_FLAGS = -B -j ${MAKE_JOBS} \
MAKE_FLAGS += LIB${_l}_VERSION=${_v}
.endfor

+WRKDIST ?= ${WRKDIR}/${DISTNAME:S/opensource-//}
+
# qmake supports so-called "shadow" builds: it's like normal
# out-of-source build but build directory is required to be located
# under source root.
@@ -77,6 +81,7 @@ QT_PLUGINSDIR = ${QT_BASEDIR}/plugins
QT_BINDIR = ${QT_BASEDIR}/bin
QT_PKGCFGDIR = ${QT_BASEDIR}/pkgconfig
QT_CMAKEDIR = ${QT_BASEDIR}/cmake
+QT_QMLDIR = ${QT_BASEDIR}/qml

CONFIGURE_ENV += MAKE=make \
MAKEFLAGS="-j ${MAKE_JOBS}" \
@@ -155,33 +160,4 @@ qt5-post-install:
${INSTALL_DATA_DIR} ${PREFIX}/lib/qt5/examples
cd ${WRKSRC}/examples; \
pax -rw */ ${PREFIX}/lib/qt5/examples
-.endif
-
-#
-# Helper targets, used during port development.
-#
-
-.PHONY: gen_pkg gen_pkg_plist gen_pkg_descr
-gen_pkg: gen_pkg_plist gen_pkg_descr
-
-# Generates DESCR-* from DESCR-main.
-QT5_DESCR_SRC ?= -main
-QT5_DESCR_SRC := ${PKGDIR}/DESCR${QT5_DESCR_SRC}
-gen_pkg_descr:
- test -e ${QT5_DESCR_SRC}
-.if ${MULTI_PACKAGES:M-examples}
- test X"${QT5_DESCR_SRC}" = X"${PKGDIR}/DESCR-examples" || \
- sed '$$s/.*/This package contains sources for ${QT5NAME} usage examples./' \
- <${QT5_DESCR_SRC} >${PKGDIR}/DESCR-examples
-.endif
-
-# Generates PLIST-* from PLIST-main.
-# Don't forget to run "rm pkg/PLIST-*; make plist" before this.
-gen_pkg_plist:
- test -e ${PKGDIR}/PLIST-main
-.if ${BUILD_PACKAGES:M-examples}
- echo -n '@comment $$Open' >${PKGDIR}/PLIST-examples
- echo 'BSD$$' >>${PKGDIR}/PLIST-examples
- egrep '^(@.* )?lib/qt5/examples/' ${PKGDIR}/PLIST-main >>${PKGDIR}/PLIST-examples
- sed -Ei '\,^(@.* )?lib/qt5/examples/,d' ${PKGDIR}/PLIST-main
.endif
Index: Makefile.version
===================================================================
RCS file: /cvs/ports/x11/qt5/Makefile.version,v
retrieving revision 1.15
diff -u -p -r1.15 Makefile.version
--- Makefile.version 11 Mar 2022 20:16:58 -0000 1.15
+++ Makefile.version 6 Jul 2022 05:14:39 -0000
@@ -1,8 +1,8 @@
# Common source for Qt5 version

-QT5_VERSION = 5.15.2
+QT5_VERSION = 5.15.5
QT5_WEBENGINE_VERSION = 5.15.2
-QT5_DIST_VERSION = 5.15.2
+QT5_DIST_VERSION = 5.15.5

# This one is used for building dependencies for examples and documentation,
# which obviously should be in sync with core packages.
Index: docs/Makefile
===================================================================
RCS file: /cvs/ports/x11/qt5/docs/Makefile,v
retrieving revision 1.15
diff -u -p -r1.15 Makefile
--- docs/Makefile 11 Mar 2022 20:16:58 -0000 1.15
+++ docs/Makefile 6 Jul 2022 05:14:39 -0000
@@ -4,7 +4,6 @@ COMMENT-qch = qdoc-compiled documentati
PKGNAME = qt5-docs-${QT5_VERSION}
PKGNAME-html = qt5-html-${QT5_VERSION}
PKGNAME-qch = qt5-qch-${QT5_VERSION}
-REVISION-html = 0

MULTI_PACKAGES = -html -qch
SUBPACKAGE ?= -html
@@ -37,7 +36,7 @@ DOC_COMPONENTS = \
qtx11extras \
qtxmlpatterns

-DISTFILES = ${DOC_COMPONENTS:C/$/-everywhere-src-${QT5_DIST_VERSION}${EXTRACT_SUFX}/}
+DISTFILES = ${DOC_COMPONENTS:C/$/-everywhere-opensource-src-${QT5_DIST_VERSION}${EXTRACT_SUFX}/}

MODQT5_USE_CXX11 = No
CONFIGURE_STYLE = none
@@ -50,6 +49,7 @@ RUN_DEPENDS = x11/qt5/qtbase,-global
NO_TEST = Yes

PKG_ARCH = *
+#WRKDIST = ${WRKDIR}/${DISTNAME:S/opensource-//}
WRKDIST = ${WRKDIR}

ALL_TARGET = html_docs qch_docs
Index: docs/distinfo
===================================================================
RCS file: /cvs/ports/x11/qt5/docs/distinfo,v
retrieving revision 1.11
diff -u -p -r1.11 distinfo
--- docs/distinfo 19 Jan 2021 06:16:29 -0000 1.11
+++ docs/distinfo 6 Jul 2022 05:14:39 -0000
@@ -1,46 +1,46 @@
-SHA256 (qt/qt3d-everywhere-src-5.15.2.tar.xz) = A+1qSMgTx1KWwZ9dchGEqxaCgLadJlbPFvh309TFXB0=
-SHA256 (qt/qtcharts-everywhere-src-5.15.2.tar.xz) = 4HUOQZW9iouXWKtNmNQ37b4nPNPSid1qjzJd9tE/PRE=
-SHA256 (qt/qtdoc-everywhere-src-5.15.2.tar.xz) = pHgJ8A8b1pDKTmmcsy/+dxfUPahOAWfR9WIhDadxTOQ=
-SHA256 (qt/qtgamepad-everywhere-src-5.15.2.tar.xz) = x3YR94mDJtaRdq1nqbiG9hfN7cNo7CnyI9Y1N9JbB1w=
-SHA256 (qt/qtgraphicaleffects-everywhere-src-5.15.2.tar.xz) = 7I1n9kln1QRkEEkLVJxXb5uei0fsaFlK6EqohwFz3+Q=
-SHA256 (qt/qtimageformats-everywhere-src-5.15.2.tar.xz) = v4KFx84EKEUnq4I93Hz0ihu3kTHbOnEnNCFn9IFCU9c=
-SHA256 (qt/qtlocation-everywhere-src-5.15.2.tar.xz) = mE/LCeEI30mo2sNdXObf/EnKr9KsscL4pRc6aiHzkqA=
-SHA256 (qt/qtmultimedia-everywhere-src-5.15.2.tar.xz) = DDdYgQ5RMaq8925JZeTBi4kRr1TZ7dkwXSqCeNg0bfU=
-SHA256 (qt/qtnetworkauth-everywhere-src-5.15.2.tar.xz) = /MLsQvqmhWHvqPAM1y5mL7wGVj68beHcQtlrspl6zYU=
-SHA256 (qt/qtpurchasing-everywhere-src-5.15.2.tar.xz) = hxINMZ/y+BBueJcfcpbXKmbf6R52PSExma6lUEbpMic=
-SHA256 (qt/qtremoteobjects-everywhere-src-5.15.2.tar.xz) = Z4G2vJCIglTqd86BJzbawAxn+k7rMJX1zWXkucFdz8I=
-SHA256 (qt/qtscript-everywhere-src-5.15.2.tar.xz) = oplxU2mvvRyqTX+ih11ELquRrcqsr85Uo2kiRCYkZz4=
-SHA256 (qt/qtscxml-everywhere-src-5.15.2.tar.xz) = YLlZC5pBxgzue4qMhBDuRiXwOJwf+NeYg+xamFY4p9w=
-SHA256 (qt/qtsensors-everywhere-src-5.15.2.tar.xz) = PwAR+emULK0RkUa1TZYEOPRWiiKidM2tT64Gu04OSDk=
-SHA256 (qt/qtserialbus-everywhere-src-5.15.2.tar.xz) = rut+XA0/hQMhWyLhqEwAAspnz2OGL248bvRKZ8oxvYg=
-SHA256 (qt/qtserialport-everywhere-src-5.15.2.tar.xz) = WcVZ10hBcwa8GyzyMVweY+7QEazjitkpRq9x8j4u950=
-SHA256 (qt/qtspeech-everywhere-src-5.15.2.tar.xz) = yBD7nuywgCZDRCKjLnkmlifzvClBvhmehuxBC9/og/U=
-SHA256 (qt/qtsvg-everywhere-src-5.15.2.tar.xz) = i8PCwbwmcenGfUIFWJqDCbV5A3Ia0Uxg6iGl0GrLWF4=
-SHA256 (qt/qtvirtualkeyboard-everywhere-src-5.15.2.tar.xz) = mjGTkTvjDwmoluO4wvlpbS6bP4imOunKjJeieGtoz1U=
-SHA256 (qt/qtwebchannel-everywhere-src-5.15.2.tar.xz) = En/nnEOzhnE/FR7X1BHNgeReKfnJVVhPKXNveMkwPsE=
-SHA256 (qt/qtwebsockets-everywhere-src-5.15.2.tar.xz) = oLQthd00/24tI0AOAvg9i4W82A5g79FSHRLZYl1KIz8=
-SHA256 (qt/qtx11extras-everywhere-src-5.15.2.tar.xz) = cBRwLummRKWpPacISKxHwYhR1PjtYisppy7tkoL8bj4=
-SHA256 (qt/qtxmlpatterns-everywhere-src-5.15.2.tar.xz) = duohYqfDSRiNfn5PbHe3joogVJTJD+486jSHoa4s8vo=
-SIZE (qt/qt3d-everywhere-src-5.15.2.tar.xz) = 81925416
-SIZE (qt/qtcharts-everywhere-src-5.15.2.tar.xz) = 4251992
-SIZE (qt/qtdoc-everywhere-src-5.15.2.tar.xz) = 5746492
-SIZE (qt/qtgamepad-everywhere-src-5.15.2.tar.xz) = 387084
-SIZE (qt/qtgraphicaleffects-everywhere-src-5.15.2.tar.xz) = 14040900
-SIZE (qt/qtimageformats-everywhere-src-5.15.2.tar.xz) = 1806740
-SIZE (qt/qtlocation-everywhere-src-5.15.2.tar.xz) = 6556764
-SIZE (qt/qtmultimedia-everywhere-src-5.15.2.tar.xz) = 3828172
-SIZE (qt/qtnetworkauth-everywhere-src-5.15.2.tar.xz) = 141688
-SIZE (qt/qtpurchasing-everywhere-src-5.15.2.tar.xz) = 208804
-SIZE (qt/qtremoteobjects-everywhere-src-5.15.2.tar.xz) = 374740
-SIZE (qt/qtscript-everywhere-src-5.15.2.tar.xz) = 2663016
-SIZE (qt/qtscxml-everywhere-src-5.15.2.tar.xz) = 434204
-SIZE (qt/qtsensors-everywhere-src-5.15.2.tar.xz) = 2056944
-SIZE (qt/qtserialbus-everywhere-src-5.15.2.tar.xz) = 356360
-SIZE (qt/qtserialport-everywhere-src-5.15.2.tar.xz) = 321496
-SIZE (qt/qtspeech-everywhere-src-5.15.2.tar.xz) = 101940
-SIZE (qt/qtsvg-everywhere-src-5.15.2.tar.xz) = 1886268
-SIZE (qt/qtvirtualkeyboard-everywhere-src-5.15.2.tar.xz) = 10955076
-SIZE (qt/qtwebchannel-everywhere-src-5.15.2.tar.xz) = 209208
-SIZE (qt/qtwebsockets-everywhere-src-5.15.2.tar.xz) = 259000
-SIZE (qt/qtx11extras-everywhere-src-5.15.2.tar.xz) = 143972
-SIZE (qt/qtxmlpatterns-everywhere-src-5.15.2.tar.xz) = 5209380
+SHA256 (qt/qt3d-everywhere-opensource-src-5.15.5.tar.xz) = QEysyMM8G215bGkVaZFeV1it32O9xsndw8Bmhko7ftQ=
+SHA256 (qt/qtcharts-everywhere-opensource-src-5.15.5.tar.xz) = EZNVvmgQVG6+Ulz1e0hcVfIyUWenMuTm8m6dgUIMBXg=
+SHA256 (qt/qtdoc-everywhere-opensource-src-5.15.5.tar.xz) = UjICgu/xlVbwqyQ0oTkJGk5AG7g+LW71qvCGhkMnfN8=
+SHA256 (qt/qtgamepad-everywhere-opensource-src-5.15.5.tar.xz) = YJXf4pA628RvQy/yucyTPFWoGC++/VYXuRQWARxqRHE=
+SHA256 (qt/qtgraphicaleffects-everywhere-opensource-src-5.15.5.tar.xz) = I3/V6tUIZhKKeuOCD0VNDmuVXmSIkkKfw7mbi3+x9nc=
+SHA256 (qt/qtimageformats-everywhere-opensource-src-5.15.5.tar.xz) = SqBY4SO5bCwXzZzxHKu9VHG525UNYc7SP1yqAMUXS/Y=
+SHA256 (qt/qtlocation-everywhere-opensource-src-5.15.5.tar.xz) = Yp0bqSPTnnZcWhzkIKRgoEjWJXWGEQBnyveN3hmEkFY=
+SHA256 (qt/qtmultimedia-everywhere-opensource-src-5.15.5.tar.xz) = vJ/0bGh1cLLvo/Mbm4IlwNpnLoH0hBZrQfWx7IKP5mA=
+SHA256 (qt/qtnetworkauth-everywhere-opensource-src-5.15.5.tar.xz) = wQlZpA6nRCNjDKyqa+GsylNdv1ZAG/0wA+/SXML59TA=
+SHA256 (qt/qtpurchasing-everywhere-opensource-src-5.15.5.tar.xz) = pzc3actV8QENP9eyOklv9jkbW9zxHf2gKe+NYz+v5hM=
+SHA256 (qt/qtremoteobjects-everywhere-opensource-src-5.15.5.tar.xz) = ek4QSYg9GEUy2CHxWaVqoVASBww2SkUaA9bpvihmHdQ=
+SHA256 (qt/qtscript-everywhere-opensource-src-5.15.5.tar.xz) = 9SK21NWroP+nrnFqazM/5FnmaVYnMEqvo/2QyNAF058=
+SHA256 (qt/qtscxml-everywhere-opensource-src-5.15.5.tar.xz) = F968T757w9mGJLQ9R+IqCouHEXOvevpkR9AEnjWuxXU=
+SHA256 (qt/qtsensors-everywhere-opensource-src-5.15.5.tar.xz) = bWgdaibuH89tvtwhEBXxD8xIHD+I5yHWitEKoCWpkH4=
+SHA256 (qt/qtserialbus-everywhere-opensource-src-5.15.5.tar.xz) = Mh3JvdFG5qUlxUUpDi8ATo3GQ2tO/VDEgMA6vGWoD6A=
+SHA256 (qt/qtserialport-everywhere-opensource-src-5.15.5.tar.xz) = VJ0Jap/SDF1IvQFCAa+4i1cLzivnUq6qwrLIDLls4nU=
+SHA256 (qt/qtspeech-everywhere-opensource-src-5.15.5.tar.xz) = pF5ZYHOP/xG3mHZgXbr1j/ro5eYPzee/xrZ4+Vu6U3c=
+SHA256 (qt/qtsvg-everywhere-opensource-src-5.15.5.tar.xz) = xM+eZArUPxV8axTudiQEf1lFKImRrV3oPJ7sZzussDE=
+SHA256 (qt/qtvirtualkeyboard-everywhere-opensource-src-5.15.5.tar.xz) = 2Wz4IDsTakOMfXWxS95w22YKeR86w79vTQv6aDG/CrY=
+SHA256 (qt/qtwebchannel-everywhere-opensource-src-5.15.5.tar.xz) = TtIxq6ClCyIgQBZspzKfVkjKI0UBO2/UeA9eittlFfE=
+SHA256 (qt/qtwebsockets-everywhere-opensource-src-5.15.5.tar.xz) = ZquLW7LmQ5L+Q3hsocL9S+Mwb7xLlpqhdI5Wi10GIjg=
+SHA256 (qt/qtx11extras-everywhere-opensource-src-5.15.5.tar.xz) = doXAq35bFbhPAr7C0Sse8ui8UPouhyC8r8jYOa3NunM=
+SHA256 (qt/qtxmlpatterns-everywhere-opensource-src-5.15.5.tar.xz) = BVe3ESB8T6XO8cKIrvUG/RJ90/J6Xp0ceIzEMl+Quxg=
+SIZE (qt/qt3d-everywhere-opensource-src-5.15.5.tar.xz) = 81935728
+SIZE (qt/qtcharts-everywhere-opensource-src-5.15.5.tar.xz) = 4254052
+SIZE (qt/qtdoc-everywhere-opensource-src-5.15.5.tar.xz) = 5747564
+SIZE (qt/qtgamepad-everywhere-opensource-src-5.15.5.tar.xz) = 388708
+SIZE (qt/qtgraphicaleffects-everywhere-opensource-src-5.15.5.tar.xz) = 14043788
+SIZE (qt/qtimageformats-everywhere-opensource-src-5.15.5.tar.xz) = 1829872
+SIZE (qt/qtlocation-everywhere-opensource-src-5.15.5.tar.xz) = 6559912
+SIZE (qt/qtmultimedia-everywhere-opensource-src-5.15.5.tar.xz) = 3832656
+SIZE (qt/qtnetworkauth-everywhere-opensource-src-5.15.5.tar.xz) = 143584
+SIZE (qt/qtpurchasing-everywhere-opensource-src-5.15.5.tar.xz) = 210480
+SIZE (qt/qtremoteobjects-everywhere-opensource-src-5.15.5.tar.xz) = 377896
+SIZE (qt/qtscript-everywhere-opensource-src-5.15.5.tar.xz) = 2665268
+SIZE (qt/qtscxml-everywhere-opensource-src-5.15.5.tar.xz) = 436640
+SIZE (qt/qtsensors-everywhere-opensource-src-5.15.5.tar.xz) = 2058852
+SIZE (qt/qtserialbus-everywhere-opensource-src-5.15.5.tar.xz) = 358296
+SIZE (qt/qtserialport-everywhere-opensource-src-5.15.5.tar.xz) = 323168
+SIZE (qt/qtspeech-everywhere-opensource-src-5.15.5.tar.xz) = 103640
+SIZE (qt/qtsvg-everywhere-opensource-src-5.15.5.tar.xz) = 1888600
+SIZE (qt/qtvirtualkeyboard-everywhere-opensource-src-5.15.5.tar.xz) = 10957016
+SIZE (qt/qtwebchannel-everywhere-opensource-src-5.15.5.tar.xz) = 210712
+SIZE (qt/qtwebsockets-everywhere-opensource-src-5.15.5.tar.xz) = 260676
+SIZE (qt/qtx11extras-everywhere-opensource-src-5.15.5.tar.xz) = 145540
+SIZE (qt/qtxmlpatterns-everywhere-opensource-src-5.15.5.tar.xz) = 5210040
Index: docs/pkg/PLIST-html
===================================================================
RCS file: /cvs/ports/x11/qt5/docs/pkg/PLIST-html,v
retrieving revision 1.13
diff -u -p -r1.13 PLIST-html
--- docs/pkg/PLIST-html 11 Mar 2022 20:16:58 -0000 1.13
+++ docs/pkg/PLIST-html 6 Jul 2022 05:14:39 -0000
@@ -2279,6 +2279,7 @@ share/doc/qt5/qtremoteobjects/qtremoteob
share/doc/qt5/qtremoteobjects/qtremoteobjects-replica.html
share/doc/qt5/qtremoteobjects/qtremoteobjects-source.html
share/doc/qt5/qtremoteobjects/qtremoteobjects-troubleshooting.html
+share/doc/qt5/qtremoteobjects/qtremoteobjects.html
share/doc/qt5/qtremoteobjects/qtroclientfactory.html
share/doc/qt5/qtremoteobjects/qtroserverfactory.html
share/doc/qt5/qtremoteobjects/remoteobjects-example-dynamic-replica.html
Index: qt3d/Makefile
===================================================================
RCS file: /cvs/ports/x11/qt5/qt3d/Makefile,v
retrieving revision 1.18
diff -u -p -r1.18 Makefile
--- qt3d/Makefile 11 Mar 2022 20:16:59 -0000 1.18
+++ qt3d/Makefile 6 Jul 2022 05:14:39 -0000
@@ -1,9 +1,6 @@
QT5NAME = Qt3D
COMMENT-main = Qt5 components for 3D graphics

-REVISION-main = 0
-REVISION-examples = 0
-
MULTI_PACKAGES = -main -examples

SHARED_LIBS += Qt53DCore 2.0 # 5.9
@@ -12,7 +9,7 @@ SHARED_LIBS += Qt53DLogic
SHARED_LIBS += Qt53DQuick 2.0 # 5.9
SHARED_LIBS += Qt53DQuickInput 2.0 # 5.9
SHARED_LIBS += Qt53DQuickRender 2.0 # 5.9
-SHARED_LIBS += Qt53DRender 2.0 # 5.9
+SHARED_LIBS += Qt53DRender 2.1 # 5.9
SHARED_LIBS += Qt53DAnimation 1.0 # 5.9
SHARED_LIBS += Qt53DExtras 1.0 # 5.9
SHARED_LIBS += Qt53DQuickAnimation 1.0 # 5.9
Index: qt3d/distinfo
===================================================================
RCS file: /cvs/ports/x11/qt5/qt3d/distinfo,v
retrieving revision 1.10
diff -u -p -r1.10 distinfo
--- qt3d/distinfo 19 Jan 2021 06:16:29 -0000 1.10
+++ qt3d/distinfo 6 Jul 2022 05:14:39 -0000
@@ -1,2 +1,2 @@
-SHA256 (qt/qt3d-everywhere-src-5.15.2.tar.xz) = A+1qSMgTx1KWwZ9dchGEqxaCgLadJlbPFvh309TFXB0=
-SIZE (qt/qt3d-everywhere-src-5.15.2.tar.xz) = 81925416
+SHA256 (qt/qt3d-everywhere-opensource-src-5.15.5.tar.xz) = QEysyMM8G215bGkVaZFeV1it32O9xsndw8Bmhko7ftQ=
+SIZE (qt/qt3d-everywhere-opensource-src-5.15.5.tar.xz) = 81935728
Index: qt3d/pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/x11/qt5/qt3d/pkg/PLIST-main,v
retrieving revision 1.9
diff -u -p -r1.9 PLIST-main
--- qt3d/pkg/PLIST-main 11 Mar 2022 20:16:59 -0000 1.9
+++ qt3d/pkg/PLIST-main 6 Jul 2022 05:14:39 -0000
@@ -1271,12 +1271,14 @@ lib/qt5/cmake/Qt53DQuickScene2D/Qt53DQui
lib/qt5/cmake/Qt53DRender/
lib/qt5/cmake/Qt53DRender/Qt53DRenderConfig.cmake
lib/qt5/cmake/Qt53DRender/Qt53DRenderConfigVersion.cmake
+lib/qt5/cmake/Qt53DRender/Qt53DRender_AssimpSceneImportPlugin.cmake
lib/qt5/cmake/Qt53DRender/Qt53DRender_DefaultGeometryLoaderPlugin.cmake
lib/qt5/cmake/Qt53DRender/Qt53DRender_GLTFGeometryLoaderPlugin.cmake
lib/qt5/cmake/Qt53DRender/Qt53DRender_GLTFSceneExportPlugin.cmake
lib/qt5/cmake/Qt53DRender/Qt53DRender_GLTFSceneImportPlugin.cmake
lib/qt5/cmake/Qt53DRender/Qt53DRender_OpenGLRendererPlugin.cmake
lib/qt5/cmake/Qt53DRender/Qt53DRender_Scene2DPlugin.cmake
+lib/qt5/examples/
lib/qt5/libQt53DAnimation.la
lib/qt5/libQt53DAnimation.prl
@lib lib/qt5/libQt53DAnimation.so.${LIBQt53DAnimation_VERSION}
@@ -1357,6 +1359,7 @@ lib/qt5/plugins/renderers/
lib/qt5/plugins/renderplugins/
@so lib/qt5/plugins/renderplugins/libscene2d.so
lib/qt5/plugins/sceneparsers/
+@so lib/qt5/plugins/sceneparsers/libassimpsceneimport.so
@so lib/qt5/plugins/sceneparsers/libgltfsceneexport.so
@so lib/qt5/plugins/sceneparsers/libgltfsceneimport.so
lib/qt5/qml/Qt3D/
Index: qtbase/Makefile
===================================================================
RCS file: /cvs/ports/x11/qt5/qtbase/Makefile,v
retrieving revision 1.52
diff -u -p -r1.52 Makefile
--- qtbase/Makefile 11 Mar 2022 20:16:59 -0000 1.52
+++ qtbase/Makefile 6 Jul 2022 05:14:39 -0000
@@ -1,4 +1,4 @@
-DISTNAME = qtbase-everywhere-src-${DIST_VERSION}
+DISTNAME = qtbase-everywhere-opensource-src-${DIST_VERSION}
QT5NAME = Qt5 core

COMMENT-main = C++ general-purpose toolkit
@@ -7,9 +7,6 @@ COMMENT-mysql = MySQL plugin for Qt5
COMMENT-psql = PostgresSQL plugin for Qt5
COMMENT-tds = TDS plugin for Qt5

-REVISION-main = 9
-REVISION-examples = 0
-
PKGNAME-mysql = qt5-mysql-${VERSION}
PKGNAME-global = qt5-global-${VERSION}
PKGNAME-psql = qt5-postgresql-${VERSION}
@@ -21,15 +18,15 @@ PKG_ARCH-examples = *
DPB_PROPERTIES = parallel

SHARED_LIBS += Qt5Concurrent 3.0 # 5.9
-SHARED_LIBS += Qt5Core 3.0 # 5.9
+SHARED_LIBS += Qt5Core 3.1 # 5.9
SHARED_LIBS += Qt5DBus 3.0 # 5.9
SHARED_LIBS += Qt5Gui 3.0 # 5.9
SHARED_LIBS += Qt5Network 4.0 # 5.9
SHARED_LIBS += Qt5OpenGL 3.0 # 5.9
SHARED_LIBS += Qt5PrintSupport 3.0 # 5.9
SHARED_LIBS += Qt5Sql 3.0 # 5.9
-SHARED_LIBS += Qt5Test 3.0 # 5.9
-SHARED_LIBS += Qt5Widgets 3.0 # 5.9
+SHARED_LIBS += Qt5Test 3.1 # 5.9
+SHARED_LIBS += Qt5Widgets 4.0 # 5.9
SHARED_LIBS += Qt5Xml 3.0 # 5.9
SHARED_LIBS += Qt5EglFSDeviceIntegration 1.0 # 5.9
SHARED_LIBS += Qt5EglFsKmsSupport 1.0 # 5.9
@@ -44,7 +41,7 @@ WANTLIB-main += icudata icui18n icuuc jp
WANTLIB-main += pcre2-16 png sqlite3 ssl xcb xcb-glx xcb-icccm xcb-image
WANTLIB-main += xcb-keysyms xcb-randr xcb-render xcb-render-util xcb-shape
WANTLIB-main += xcb-shm xcb-sync xcb-xfixes xcb-xinerama xcb-xinput
-WANTLIB-main += xcb-util xcb-xkb xkbcommon xkbcommon-x11 z zstd
+WANTLIB-main += xcb-xkb xkbcommon xkbcommon-x11 z zstd

WANTLIB-global =

@@ -116,17 +113,6 @@ CONFIGURE_STYLE = simple
FLAVORS = debug
FLAVOR ?=

-# readability macros
-QT_BASEDIR = ${PREFIX}/lib/qt5
-QT_INCDIR = ${PREFIX}/include/X11/qt5
-QT_EXAMPLES = ${QT_BASEDIR}/examples
-QT_DOC = ${PREFIX}/share/doc/qt5
-QT_PLUGINSDIR = ${QT_BASEDIR}/plugins
-QT_BINDIR = ${QT_BASEDIR}/bin
-QT_PKGCFGDIR = ${QT_BASEDIR}/pkgconfig
-QT_CMAKEDIR = ${QT_BASEDIR}/cmake
-QT_QMLDIR = ${QT_BASEDIR}/qml
-
CONFIGURE_ARGS += OPENSSL_LIBS="-L/usr/lib -lssl -lcrypto"

# configure
@@ -239,11 +225,15 @@ CONFIGURE_ARGS += -platform openbsd-g++
TEST_IS_INTERACTIVE = X11

post-extract:
- mkdir -p ${WRKDIST}/mkspecs/openbsd-clang
+ mkdir -p ${WRKDIST}/mkspecs/openbsd-{clang,g++}
cp ${FILESDIR}/clang-qmake.conf \
${WRKDIST}/mkspecs/openbsd-clang/qmake.conf
- cp ${WRKDIST}/mkspecs/openbsd-g++/qplatformdefs.h \
+ cp ${FILESDIR}/g++-qmake.conf \
+ ${WRKDIST}/mkspecs/openbsd-g++/qmake.conf
+ cp ${WRKDIST}/mkspecs/freebsd-clang/qplatformdefs.h \
${WRKDIST}/mkspecs/openbsd-clang/
+ cp ${WRKDIST}/mkspecs/freebsd-g++/qplatformdefs.h \
+ ${WRKDIST}/mkspecs/openbsd-g++/

post-install:
# often-used includes directory
Index: qtbase/distinfo
===================================================================
RCS file: /cvs/ports/x11/qt5/qtbase/distinfo,v
retrieving revision 1.10
diff -u -p -r1.10 distinfo
--- qtbase/distinfo 19 Jan 2021 06:16:29 -0000 1.10
+++ qtbase/distinfo 6 Jul 2022 05:14:39 -0000
@@ -1,2 +1,2 @@
-SHA256 (qt/qtbase-everywhere-src-5.15.2.tar.xz) = kJ+tJZHuNnmTp11+LqUK1NszLwXhw43XpaJ04Vak4Pg=
-SIZE (qt/qtbase-everywhere-src-5.15.2.tar.xz) = 50179672
+SHA256 (qt/qtbase-everywhere-opensource-src-5.15.5.tar.xz) = DELHmap8ieR5oHxFG/WjAeKRJmuniega/Bj5UElSTtw=
+SIZE (qt/qtbase-everywhere-opensource-src-5.15.5.tar.xz) = 50247388
Index: qtbase/files/clang-qmake.conf
===================================================================
RCS file: /cvs/ports/x11/qt5/qtbase/files/clang-qmake.conf,v
retrieving revision 1.2
diff -u -p -r1.2 clang-qmake.conf
--- qtbase/files/clang-qmake.conf 19 Jul 2017 22:30:12 -0000 1.2
+++ qtbase/files/clang-qmake.conf 6 Jul 2022 05:14:39 -0000
@@ -1,22 +1,25 @@
#
# qmake configuration for openbsd-clang
-#
+# Based on freebsd-clang

MAKEFILE_GENERATOR = UNIX
QMAKE_PLATFORM = openbsd

-include(../common/gcc-base-unix.conf)
-include(../common/clang.conf)
include(../common/bsd/bsd.conf)

-# Addon software goes into /usr/local on OpenBSD, by default we will look there
LOCALBASE = $$(LOCALBASE)
isEmpty(LOCALBASE) {
LOCALBASE = /usr/local
}
-QMAKE_INCDIR_PREPEND = /usr/include/c++/v1
-QMAKE_INCDIR = $$LOCALBASE/include
-QMAKE_LIBDIR = $$LOCALBASE/lib
+
+# Addon software goes into /usr/local on FreeBSD, by default we will look there
+QMAKE_INCDIR_POST = $$LOCALBASE/include
+QMAKE_LIBDIR_POST = $$LOCALBASE/lib
+
+QMAKE_LFLAGS_NOUNDEF = -Wl,--no-undefined
+
+include(../common/gcc-base-unix.conf)
+include(../common/clang.conf)

# System provided X11 defaults to X11R6 path on OpenBSD
X11BASE = $$(X11BASE)
Index: qtbase/files/g++-qmake.conf
===================================================================
RCS file: qtbase/files/g++-qmake.conf
diff -N qtbase/files/g++-qmake.conf
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ qtbase/files/g++-qmake.conf 6 Jul 2022 05:14:39 -0000
@@ -0,0 +1,41 @@
+#
+# qmake configuration for openbsd-g++
+# Based on freebsd-g++
+
+MAKEFILE_GENERATOR = UNIX
+QMAKE_PLATFORM = openbsd
+
+include(../common/bsd/bsd.conf)
+
+LOCALBASE = $$(LOCALBASE)
+isEmpty(LOCALBASE) {
+ LOCALBASE = /usr/local
+}
+
+# Addon software goes into /usr/local on FreeBSD, by default we will look there
+QMAKE_INCDIR_POST = $$LOCALBASE/include
+QMAKE_LIBDIR_POST = $$LOCALBASE/lib
+
+include(../common/gcc-base-unix.conf)
+include(../common/g++-unix.conf)
+
+# System provided X11 defaults to X11R6 path on OpenBSD
+X11BASE = $$(X11BASE)
+isEmpty(X11BASE) {
+ X11BASE = /usr/X11R6
+}
+QMAKE_INCDIR_X11 = $$X11BASE/include
+QMAKE_LIBDIR_X11 = $$X11BASE/lib
+QMAKE_INCDIR_OPENGL = $$X11BASE/include
+QMAKE_LIBDIR_OPENGL = $$X11BASE/lib
+
+QMAKE_RPATHDIR += $$QMAKE_LIBDIR_X11
+
+QMAKE_OPENBSD_SHLIB = 1
+
+# Reset g++-unix.conf's NOUNDEF flags as OpenBSD libc can't handle environ
+QMAKE_LFLAGS_NOUNDEF =
+QMAKE_LFLAGS_SONAME =
+QMAKE_LFLAGS_NEW_DTAGS =
+
+load(qt_config)
Index: qtbase/patches/patch-mkspecs_features_create_cmake_prf
===================================================================
RCS file: /cvs/ports/x11/qt5/qtbase/patches/patch-mkspecs_features_create_cmake_prf,v
retrieving revision 1.6
diff -u -p -r1.6 patch-mkspecs_features_create_cmake_prf
--- qtbase/patches/patch-mkspecs_features_create_cmake_prf 11 Mar 2022 20:16:59 -0000 1.6
+++ qtbase/patches/patch-mkspecs_features_create_cmake_prf 6 Jul 2022 05:14:39 -0000
@@ -16,7 +16,7 @@ Index: mkspecs/features/create_cmake.prf
split_incpath {
CMAKE_ADD_SOURCE_INCLUDE_DIRS = true
CMAKE_SOURCE_INCLUDES = \
-@@ -351,10 +351,16 @@ mac {
+@@ -358,10 +358,16 @@ mac {
CMAKE_LIB_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}.so
CMAKE_LIB_FILE_LOCATION_RELEASE = lib$${CMAKE_QT_STEM}.so
CMAKE_LIB_SONAME = lib$${CMAKE_QT_STEM}.so
Index: qtbase/patches/patch-mkspecs_openbsd-g++_qmake_conf
===================================================================
RCS file: qtbase/patches/patch-mkspecs_openbsd-g++_qmake_conf
diff -N qtbase/patches/patch-mkspecs_openbsd-g++_qmake_conf
--- qtbase/patches/patch-mkspecs_openbsd-g++_qmake_conf 11 Mar 2022 20:16:59 -0000 1.4
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,61 +0,0 @@
-Index: mkspecs/openbsd-g++/qmake.conf
---- mkspecs/openbsd-g++/qmake.conf.orig
-+++ mkspecs/openbsd-g++/qmake.conf
-@@ -5,28 +5,36 @@
- MAKEFILE_GENERATOR = UNIX
- QMAKE_PLATFORM = openbsd
-
-+include(../common/gcc-base-unix.conf)
-+include(../common/g++-unix.conf)
- include(../common/bsd/bsd.conf)
-
- # Addon software goes into /usr/local on OpenBSD, by default we will look there
-+LOCALBASE = $$(LOCALBASE)
-+isEmpty(LOCALBASE) {
-+ LOCALBASE = /usr/local
-+}
-+QMAKE_INCDIR_PREPEND = /usr/local/lib/gcc/x86_64-unknown-openbsd6.6/8.3.0/include
- QMAKE_INCDIR_POST = /usr/local/include
- QMAKE_LIBDIR_POST = /usr/local/lib
-
- # System provided X11 defaults to X11R6 path on OpenBSD
--QMAKE_INCDIR_X11 = /usr/X11R6/include
--QMAKE_LIBDIR_X11 = /usr/X11R6/lib
--QMAKE_INCDIR_OPENGL = /usr/X11R6/include
--QMAKE_LIBDIR_OPENGL = /usr/X11R6/lib
-+X11BASE = $$(X11BASE)
-+isEmpty(X11BASE) {
-+ X11BASE = /usr/X11R6
-+}
-+QMAKE_INCDIR_X11 = $$X11BASE/include
-+QMAKE_LIBDIR_X11 = $$X11BASE/lib
-+QMAKE_INCDIR_OPENGL = $$X11BASE/include
-+QMAKE_LIBDIR_OPENGL = $$X11BASE/lib
-
- QMAKE_RPATHDIR += $$QMAKE_LIBDIR_X11
-
--include(../common/gcc-base-unix.conf)
--include(../common/g++-unix.conf)
--
- # System compiler is gcc 4.2.1 up to OpenBSD 6.0.
- # For proper C++11 support, we need to use a newer gcc from ports/packages,
- # where compiler commands are renamed to egcc/eg++. Therefore, redefine
- # mkspecs/common/g++-base.conf compiler commands
--QMAKE_CC = egcc
-+QMAKE_CC = $$CC
-
- QMAKE_LINK_C = $$QMAKE_CC
- QMAKE_LINK_C_SHLIB = $$QMAKE_CC
-@@ -36,8 +44,12 @@ QMAKE_CXX = eg++
- QMAKE_LINK = $$QMAKE_CXX
- QMAKE_LINK_SHLIB = $$QMAKE_CXX
-
-+QMAKE_OPENBSD_SHLIB = 1
-
- # Reset g++-unix.conf's NOUNDEF flags as OpenBSD libc can't handle environ
-+QMAKE_LFLAGS_SONAME =
-+QMAKE_LFLAGS_NEW_DTAGS =
-+
- QMAKE_LFLAGS_NOUNDEF =
-
- load(qt_config)
Index: qtbase/patches/patch-src_corelib_io_qiodevice_cpp
===================================================================
RCS file: qtbase/patches/patch-src_corelib_io_qiodevice_cpp
diff -N qtbase/patches/patch-src_corelib_io_qiodevice_cpp
--- qtbase/patches/patch-src_corelib_io_qiodevice_cpp 11 Mar 2022 20:16:59 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,26 +0,0 @@
-https://codereview.qt-project.org/c/qt/qtbase/+/317907
-
-From 6485b6d45ad165cf976138cf8ab683c42515e794 Mon Sep 17 00:00:00 2001
-From: Kai Koehne <kai.koehne@qt.io>
-Date: Tue, 13 Oct 2020 15:47:31 +0200
-Subject: [PATCH] Fix allocated memory of QByteArray returned by
- QIODevice::readLine
-
-Index: src/corelib/io/qiodevice.cpp
---- src/corelib/io/qiodevice.cpp.orig
-+++ src/corelib/io/qiodevice.cpp
-@@ -1480,10 +1480,12 @@ QByteArray QIODevice::readLine(qint64 maxSize)
- } else
- readBytes = readLine(result.data(), result.size());
-
-- if (readBytes <= 0)
-+ if (readBytes <= 0) {
- result.clear();
-- else
-+ } else {
- result.resize(readBytes);
-+ result.squeeze();
-+ }
-
- return result;
- }
Index: qtbase/patches/patch-src_network_ssl_qsslcertificate_openssl_cpp
===================================================================
RCS file: /cvs/ports/x11/qt5/qtbase/patches/patch-src_network_ssl_qsslcertificate_openssl_cpp,v
retrieving revision 1.6
diff -u -p -r1.6 patch-src_network_ssl_qsslcertificate_openssl_cpp
--- qtbase/patches/patch-src_network_ssl_qsslcertificate_openssl_cpp 11 Mar 2022 20:16:59 -0000 1.6
+++ qtbase/patches/patch-src_network_ssl_qsslcertificate_openssl_cpp 6 Jul 2022 05:14:39 -0000
@@ -3,7 +3,7 @@ https://github.com/gentoo/libressl/blob/
Index: src/network/ssl/qsslcertificate_openssl.cpp
--- src/network/ssl/qsslcertificate_openssl.cpp.orig
+++ src/network/ssl/qsslcertificate_openssl.cpp
-@@ -661,7 +661,7 @@ static QMultiMap<QByteArray, QString> _q_mapFromX509Na
+@@ -691,7 +691,7 @@ static QMultiMap<QByteArray, QString> _q_mapFromX509Na
unsigned char *data = nullptr;
int size = q_ASN1_STRING_to_UTF8(&data, q_X509_NAME_ENTRY_get_data(e));
info.insert(name, QString::fromUtf8((char*)data, size));
Index: qtbase/patches/patch-src_network_ssl_qsslsocket_openssl_symbols_cpp
===================================================================
RCS file: /cvs/ports/x11/qt5/qtbase/patches/patch-src_network_ssl_qsslsocket_openssl_symbols_cpp,v
retrieving revision 1.12
diff -u -p -r1.12 patch-src_network_ssl_qsslsocket_openssl_symbols_cpp
--- qtbase/patches/patch-src_network_ssl_qsslsocket_openssl_symbols_cpp 11 Mar 2022 20:16:59 -0000 1.12
+++ qtbase/patches/patch-src_network_ssl_qsslsocket_openssl_symbols_cpp 6 Jul 2022 05:14:39 -0000
@@ -66,7 +66,7 @@ Index: src/network/ssl/qsslsocket_openss
DEFINEFUNC(void, SSL_free, SSL *a, a, return, DUMMYARG)
DEFINEFUNC(STACK_OF(SSL_CIPHER) *, SSL_get_ciphers, const SSL *a, a, return nullptr, return)
DEFINEFUNC(const SSL_CIPHER *, SSL_get_current_cipher, SSL *a, a, return nullptr, return)
-@@ -845,17 +864,21 @@ bool q_resolveOpenSslSymbols()
+@@ -849,17 +868,21 @@ bool q_resolveOpenSslSymbols()
RESOLVEFUNC(ASN1_STRING_get0_data)
RESOLVEFUNC(EVP_CIPHER_CTX_reset)
RESOLVEFUNC(EVP_PKEY_up_ref)
@@ -88,7 +88,7 @@ Index: src/network/ssl/qsslsocket_openss
RESOLVEFUNC(DH_get0_pqg)
RESOLVEFUNC(SSL_CTX_set_options)
RESOLVEFUNC(SSL_CTX_get_security_level)
-@@ -1058,12 +1081,14 @@ bool q_resolveOpenSslSymbols()
+@@ -1062,12 +1085,14 @@ bool q_resolveOpenSslSymbols()
RESOLVEFUNC(SSL_CTX_use_RSAPrivateKey)
RESOLVEFUNC(SSL_CTX_use_PrivateKey_file)
RESOLVEFUNC(SSL_CTX_get_cert_store);
Index: qtbase/patches/patch-src_network_ssl_qsslsocket_openssl_symbols_p_h
===================================================================
RCS file: /cvs/ports/x11/qt5/qtbase/patches/patch-src_network_ssl_qsslsocket_openssl_symbols_p_h,v
retrieving revision 1.11
diff -u -p -r1.11 patch-src_network_ssl_qsslsocket_openssl_symbols_p_h
--- qtbase/patches/patch-src_network_ssl_qsslsocket_openssl_symbols_p_h 11 Mar 2022 20:16:59 -0000 1.11
+++ qtbase/patches/patch-src_network_ssl_qsslsocket_openssl_symbols_p_h 6 Jul 2022 05:14:39 -0000
@@ -54,21 +54,7 @@ Index: src/network/ssl/qsslsocket_openss
int q_SSL_session_reused(SSL *a);
unsigned long q_SSL_CTX_set_options(SSL_CTX *ctx, unsigned long op);
int q_OPENSSL_init_ssl(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings);
-@@ -269,8 +295,13 @@ int q_DH_bits(DH *dh);
- # define q_SSL_load_error_strings() q_OPENSSL_init_ssl(OPENSSL_INIT_LOAD_SSL_STRINGS \
- | OPENSSL_INIT_LOAD_CRYPTO_STRINGS, NULL)
-
-+#ifndef LIBRESSL_VERSION_NUMBER
- #define q_SKM_sk_num(type, st) ((int (*)(const STACK_OF(type) *))q_OPENSSL_sk_num)(st)
- #define q_SKM_sk_value(type, st,i) ((type * (*)(const STACK_OF(type) *, int))q_OPENSSL_sk_value)(st, i)
-+#else
-+#define q_SKM_sk_num(type, st) ((int (*)(const STACK_OF(type) *))q_sk_num)(st)
-+#define q_SKM_sk_value(type, st,i) ((type * (*)(const STACK_OF(type) *, int))q_sk_value)(st, i)
-+