Add ports for qtdiag and qtplugininfo from qt-tools.

[tcberner]

Summary

Both can be helpful when debugging Qt stuff.

[mat]

sysutils/qt5-qtdiag/Makefile

13 ↗

(On Diff #29845)

USES should be first in that block. from here

22 ↗

(On Diff #29845)

Add blank line before the target.

sysutils/qt5-qtdiag/pkg-descr

1 ↗

(On Diff #29845)

Expand.

sysutils/qt5-qtplugininfo/Makefile

22 ↗

(On Diff #29845)

blank line before.

sysutils/qt5-qtplugininfo/pkg-descr

1 ↗

(On Diff #29845)

Expand.

[rakuco]

Mk/bsd.qt.mk

178 ↗

(On Diff #29845)

Can you land this part separately?

[tcberner]

• Reorder USES
• Rather than coming up with a good description, follow the rest of the Qt5 ports and use the one from devel/qt5
• Add empty lines

[tcberner]

Switch to qmake:outsource.

[tcberner]

Don't bump revision in qt5-qtpaths (pkg-descr change is very minor).
[Note, I will commit this one separately, it just also had the same issues tht were critized for the new ones].

[rakuco]

I'd land the changes to qt5-qtpaths separately and focus on the new ports when referencing this diff in the commit.

[mat]

sysutils/qt5-qtpaths/Makefile

22 ↗

(On Diff #29899)

empty line before here too.

[tcberner]

Empty line.

[tcberner]

• qt5-qtpaths has been commited.

[rakuco]

shipit!

head/Mk/bsd.qt.mk

 
 _USE_QT4_ONLY=        accessible assistant-adp assistantclient clucene codecs-cn codecs-jp \
                                 codecs-kr codecs-tw corelib demo graphicssystems-opengl \
                                 help-tools iconengines inputmethods makeqpf moc phonon \
                                 phonon-gst porting qdoc3 qmlviewer qt3support qtconfig \
                                 qtestlib qvfb rcc uic uic3 xmlpatterns-tool
 
 _USE_QT5_ONLY=        3d buildtools canvas3d charts concurrent connectivity \
-                                core datavis3d declarative-render2d examples gamepad \
-                                graphicaleffects location paths phonon4 printsupport \
+                                core datavis3d declarative-render2d diag examples gamepad \
+                                graphicaleffects location paths phonon4 plugininfo printsupport \
                                 qdbus qdoc qdoc-data qev qml quick quickcontrols \
                                 quickcontrols2 scxml sensors serialbus serialport \
                                 sql-tds uiplugin uitools virtualkeyboard webchannel \
                                 websockets widgets x11extras
 
 3d_PORT=                graphics/${_QT_RELNAME}-3d
 3d_LIB=         libQt${_QT_LIBVER}3DCore.so
 

 declarative-render2d_PATH=      ${QT_PLUGINDIR}/scenegraph/libsoftwarecontext.so
 
 demo_PORT=                      misc/${_QT_RELNAME}-qtdemo
 demo_PATH=                      ${QT_BINDIR}/qtdemo
 
 designer_PORT=          devel/${_QT_RELNAME}-designer
 designer_PATH=          ${QT_BINDIR}/designer
 
+diag_PORT=              sysutils/${_QT_RELNAME}-qtdiag
+diag_PATH=              ${QT_BINDIR}/qtdiag
+
 doc_PORT=                       misc/${_QT_RELNAME}-doc
 doc_PATH=                        ${_QT_RELNAME}-doc>=${_QT_VERSION:R:R}
 
 examples_PORT=          misc/${_QT_RELNAME}-examples
 examples_PATH=                ${_QT_RELNAME}-examples>=${_QT_VERSION:R:R}
 
 gamepad_PORT=           x11-toolkits/${_QT_RELNAME}-gamepad
 gamepad_LIB=            libQt${_QT_LIBVER}Gamepad.so

 phonon_PORT=            multimedia/phonon
 phonon_LIB=             libphonon.so
 
 phonon4_PORT=           multimedia/${_QT_RELNAME}-phonon4
 phonon4_LIB=            libphonon4${_QT_RELNAME}.so
 
 phonon-gst_PORT=        multimedia/phonon-gstreamer
 phonon-gst_PATH=        ${QT_PLUGINDIR}/phonon_backend/libphonon_gstreamer.so
+
+plugininfo_PORT=                sysutils/${_QT_RELNAME}-qtplugininfo
+plugininfo_PATH=                ${QT_BINDIR}/qtplugininfo
 
 porting_PORT=           devel/${_QT_RELNAME}-porting
 porting_PATH=           ${QT_BINDIR}/qt3to4
 
 printsupport_PORT=      print/${_QT_RELNAME}-printsupport
 printsupport_LIB=       libQt${_QT_LIBVER}PrintSupport.so
 
 qdbus_PORT=                     devel/${_QT_RELNAME}-qdbus

head/sysutils/Makefile

#
     SUBDIR += pydf
     SUBDIR += qchroot
     SUBDIR += qjail
     SUBDIR += qjail2
     SUBDIR += qjail4
     SUBDIR += qlogtools
     SUBDIR += qpxtool
     SUBDIR += qsynergy
+    SUBDIR += qt5-qtdiag
     SUBDIR += qt5-qtpaths
+    SUBDIR += qt5-qtplugininfo
     SUBDIR += qtpass
     SUBDIR += quicksynergy
     SUBDIR += qzeitgeist
     SUBDIR += racktables
     SUBDIR += radeontool
     SUBDIR += radeontop
     SUBDIR += radmind
     SUBDIR += rainbarf

head/sysutils/qt5-qtdiag/Makefile

+# $FreeBSD$
+
+PORTNAME=       qtdiag
+DISTVERSION=    ${QT5_VERSION}
+CATEGORIES=     sysutils
+PKGNAMEPREFIX=  qt5-
+
+MAINTAINER=     [e-mail]
+COMMENT=        Tool for reporting diagnostic information about Qt and its environment
+
+USES=           qmake:outsource
+USE_QT5=        core gui
+QT_DIST=        tools
+
+PLIST_FILES=    ${QT_BINDIR}/qtdiag
+
+# Similarly to x11/qt5-qev, it makes more sense to just run the build system
+# from the qtdiag directory. If we run it from the top of the source tree, it
+# will look for a lot more dependencies for other tools such as lupdate, which
+# we do not really have to depend on.
+WRKSRC_SUBDIR=  src/${PORTNAME}
+
+post-patch:
+        ${CP} ${WRKSRC}/../../.qmake.conf ${WRKSRC}
+
+.include <bsd.port.mk>

head/sysutils/qt5-qtplugininfo/Makefile

+# $FreeBSD$
+
+PORTNAME=       qtplugininfo
+DISTVERSION=    ${QT5_VERSION}
+CATEGORIES=     sysutils
+PKGNAMEPREFIX=  qt5-
+
+MAINTAINER=     [e-mail]
+COMMENT=        Qt5 plugin metadata dumper
+
+USES=           qmake:outsource
+USE_QT5=        core
+QT_DIST=        tools
+
+PLIST_FILES=    ${QT_BINDIR}/qtplugininfo
+
+# Similarly to x11/qt5-qev, it makes more sense to just run the build system
+# from the qtplugininfo directory. If we run it from the top of the source tree, it
+# will look for a lot more dependencies for other tools such as lupdate, which
+# we do not really have to depend on.
+WRKSRC_SUBDIR=  src/${PORTNAME}
+
+post-patch:
+        ${CP} ${WRKSRC}/../../.qmake.conf ${WRKSRC}
+
+.include <bsd.port.mk>