I would like to get rid of the execution of “qt6-post-install” over all
$PROGRAMS6 in all qt6 ports. While here I updated the PROGRAMS6 list
major programs.
OK?
Index: Makefile.inc
===================================================================
RCS file: /cvs/ports/x11/qt6/Makefile.inc,v
diff -u -p -r1.12 Makefile.inc
--- Makefile.inc 9 Feb 2025 08:54:05 -0000 1.12
+++ Makefile.inc 22 May 2025 12:08:15 -0000
@@ -51,8 +51,7 @@ SUBST_VARS += VERSION
DEBUG_PACKAGES ?= ${BUILD_PACKAGES}
-PROGRAMS6 = assistant designer linguist lrelease lupdate moc pixeltool \
- qdbus qdoc qmake qml qtdiag rcc uic \
+PROGRAMS6 ?=
.PHONY: qt6-post-install
post-install: qt6-post-install
Index: qtbase/Makefile
===================================================================
RCS file: /cvs/ports/x11/qt6/qtbase/Makefile,v
diff -u -p -r1.42 Makefile
--- qtbase/Makefile 15 Apr 2025 17:29:05 -0000 1.42
+++ qtbase/Makefile 22 May 2025 12:08:15 -0000
@@ -4,7 +4,7 @@ COMMENT-main = C++ general-purpose tool
COMMENT-global = global Qt6 documentation internals
COMMENT-mysql = MySQL plugin for Qt6
COMMENT-psql = PostgresSQL plugin for Qt6
-REVISION-main = 0
+REVISION-main = 1
PKGSPEC-main = qt6-qtbase-${QT6_PKGSPEC}
@@ -145,6 +145,8 @@ MODQT6_DEPS = No
MODPY_ADJ_FILES = util/testrunner/qt-testrunner.py \
util/testrunner/sanitizer-testrunner.py \
mkspecs/features/uikit/devices.py
+
+PROGRAMS6 = moc qlalr qvkgen rcc syncqt tracegen tracepointgen uic
post-extract:
mkdir -p ${WRKDIST}/mkspecs/openbsd-clang
Index: qtbase/pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/x11/qt6/qtbase/pkg/PLIST-main,v
diff -u -p -r1.15 PLIST-main
--- qtbase/pkg/PLIST-main 14 Apr 2025 18:10:17 -0000 1.15
+++ qtbase/pkg/PLIST-main 22 May 2025 12:08:15 -0000
@@ -1,7 +1,3 @@
-bin/moc-qt6
-bin/qmake-qt6
-bin/rcc-qt6
-bin/uic-qt6
include/X11/qt6/
include/X11/qt6/QtConcurrent/
include/X11/qt6/QtConcurrent/QtConcurrent
Index: qtdeclarative/Makefile
===================================================================
RCS file: /cvs/ports/x11/qt6/qtdeclarative/Makefile,v
diff -u -p -r1.24 Makefile
--- qtdeclarative/Makefile 14 Apr 2025 18:10:17 -0000 1.24
+++ qtdeclarative/Makefile 22 May 2025 12:08:15 -0000
@@ -4,6 +4,7 @@ USE_WXNEEDED = Yes
QT6NAME = QtDeclarative
COMMENT = Qt6 Quick and QML components
PKGSPEC = qt6-qtdeclarative-${QT6_PKGSPEC}
+REVISION = 0
SHARED_LIBS = Qt6Qml 7.0 # 6.7
SHARED_LIBS += Qt6Quick 8.0 # 6.7
@@ -65,6 +66,10 @@ BUILD_DEPENDS = graphics/vulkan-loader \
LIB_DEPENDS = x11/qt6/qtbase \
x11/qt6/qtsvg \
x11/xkbcommon
+
+PROGRAMS6 = qml qmldom qmleasing qmlformat qmllint qmlls qmlplugindump \
+ qmlpreview qmlprofiler qmlscene qmltc qmltestrunner qmltime \
+ svgtoqml
pre-configure:
# Python is used for building, this path does not get into final packages.
Index: qtdeclarative/pkg/PLIST
===================================================================
RCS file: /cvs/ports/x11/qt6/qtdeclarative/pkg/PLIST,v
diff -u -p -r1.12 PLIST
--- qtdeclarative/pkg/PLIST 9 Feb 2025 08:54:05 -0000 1.12
+++ qtdeclarative/pkg/PLIST 22 May 2025 12:08:15 -0000
@@ -1,4 +1,17 @@
bin/qml-qt6
+bin/qmldom-qt6
+bin/qmleasing-qt6
+bin/qmlformat-qt6
+bin/qmllint-qt6
+bin/qmlls-qt6
+bin/qmlplugindump-qt6
+bin/qmlpreview-qt6
+bin/qmlprofiler-qt6
+bin/qmlscene-qt6
+bin/qmltc-qt6
+bin/qmltestrunner-qt6
+bin/qmltime-qt6
+bin/svgtoqml-qt6
include/X11/qt6/QtLabsAnimation/
include/X11/qt6/QtLabsAnimation/${VERSION}/
include/X11/qt6/QtLabsAnimation/${VERSION}/QtLabsAnimation/
Index: qttools/Makefile
===================================================================
RCS file: /cvs/ports/x11/qt6/qttools/Makefile,v
diff -u -p -r1.26 Makefile
--- qttools/Makefile 14 Apr 2025 18:10:18 -0000 1.26
+++ qttools/Makefile 22 May 2025 12:08:15 -0000
@@ -36,6 +36,10 @@ LIB_DEPENDS = ${MODCLANG_LIB_DEPENDS} \
x11/qt6/qtdeclarative \
x11/xkbcommon
+PROGRAMS6 = assistant designer lconvert linguist lrelease lupdate \
+ pixeltool qdbus qdbusviewer qdistancefieldgenerator qdoc \
+ qtdiag qtdiag6 qtplugininfo
+
CONFIGURE_ENV = LLVM_INSTALL_DIR=${LOCALBASE}/llvm${MODCLANG_VERSION}
MODCMAKE_LDFLAGS = -L${LOCALBASE}/llvm${MODCLANG_VERSION}/lib
-Wl,-rpath=${LOCALBASE}/llvm${MODCLANG_VERSION}/lib
Index: qttools/pkg/PLIST
===================================================================
RCS file: /cvs/ports/x11/qt6/qttools/pkg/PLIST,v
diff -u -p -r1.13 PLIST
--- qttools/pkg/PLIST 11 Feb 2025 09:36:47 -0000 1.13
+++ qttools/pkg/PLIST 22 May 2025 12:08:15 -0000
@@ -1,12 +1,17 @@
bin/assistant-qt6
bin/designer-qt6
+bin/lconvert-qt6
bin/linguist-qt6
bin/lrelease-qt6
bin/lupdate-qt6
bin/pixeltool-qt6
bin/qdbus-qt6
+bin/qdbusviewer-qt6
+bin/qdistancefieldgenerator-qt6
bin/qdoc-qt6
bin/qtdiag-qt6
+bin/qtdiag6-qt6
+bin/qtplugininfo-qt6
include/X11/qt6/QtDesigner/
include/X11/qt6/QtDesigner/${VERSION}/
include/X11/qt6/QtDesigner/${VERSION}/QtDesigner/
