On Sat Feb 17, 2024 at 09:08:19AM +0000, Stuart Henderson wrote:
> You'll need to actually add it to BUILD_DEPENDS e.g.
>
> .if ${MODQT6_DEPS:L} == "yes"
> BUILD_DEPENDS += ${MODQT6_BUILD_DEPENDS}
> LIB_DEPENDS += ${MODQT6_LIB_DEPENDS}
> .endif
That's what I did, isn't it?
>
> But then you'll also need to knock out the dep in qttools itself and
> anything that qttools depends on.
Good point. Please find below a complete diff. Only BUILD_DEPENDS
changes so no bump is necessary.
diff --git a/audio/musique/Makefile b/audio/musique/Makefile
index 7e63efc4c67..b4a0f67a711 100644
--- a/audio/musique/Makefile
+++ b/audio/musique/Makefile
@@ -17,8 +17,6 @@ EXTRACT_SUFX = .tar.bz2
MODULES = devel/qmake \
x11/qt6
-BUILD_DEPENDS = x11/qt6/qttools
-
LIB_DEPENDS = audio/taglib \
multimedia/mpv \
x11/qt6/qtdeclarative
diff --git a/audio/qsynth/Makefile b/audio/qsynth/Makefile
index 00766a9adf5..bfa38cacf86 100644
--- a/audio/qsynth/Makefile
+++ b/audio/qsynth/Makefile
@@ -20,7 +20,6 @@ WANTLIB += Qt6Widgets c fluidsynth m
MODULES = x11/qt6 \
devel/cmake
-BUILD_DEPENDS += x11/qt6/qttools
LIB_DEPENDS += audio/fluidsynth>=2.3.2 \
x11/qt6/qtsvg
diff --git a/multimedia/shotcut/Makefile b/multimedia/shotcut/Makefile
index 0ce5b519583..de63df90f95 100644
--- a/multimedia/shotcut/Makefile
+++ b/multimedia/shotcut/Makefile
@@ -24,7 +24,6 @@ MODULES = devel/cmake \
BUILD_DEPENDS = audio/jack \
devel/sdl2 \
- x11/qt6/qttools \
x11/qt6/qtwebsockets
RUN_DEPENDS = audio/jack \
diff --git a/net/qbittorrent/Makefile.inc b/net/qbittorrent/Makefile.inc
index 67b3097f932..b26ebf2532e 100644
--- a/net/qbittorrent/Makefile.inc
+++ b/net/qbittorrent/Makefile.inc
@@ -20,8 +20,7 @@ SITES ?= ${SITE_SOURCEFORGE:=qbittorrent/}
MODULES += devel/cmake \
x11/qt6
-BUILD_DEPENDS += devel/boost \
- x11/qt6/qttools
+BUILD_DEPENDS += devel/boost
LIB_DEPENDS += net/libtorrent-rasterbar>=2
diff --git a/net/transmission/Makefile b/net/transmission/Makefile
index b2b5f3ff3dd..d1996e02adc 100644
--- a/net/transmission/Makefile
+++ b/net/transmission/Makefile
@@ -84,7 +84,6 @@ CONFIGURE_ARGS += -DENABLE_GTK=OFF
.if ${BUILD_PACKAGES:M-qt}
MODULES += x11/qt6
# XXX =6 finds "Qt6", =5 fails to find "Qt", but Qt6 is preferred, anyway
-BUILD_DEPENDS += x11/qt6/qttools
CONFIGURE_ARGS += -DENABLE_QT=ON \
-DUSE_QT_VERSION=6
.else
diff --git a/net/wireshark/Makefile b/net/wireshark/Makefile
index ffb31fbb344..366ec190800 100644
--- a/net/wireshark/Makefile
+++ b/net/wireshark/Makefile
@@ -71,8 +71,7 @@ BUILD_DEPENDS += devel/bison \
textproc/libxml \
textproc/libxslt \
devel/xdg-utils \
- textproc/asciidoctor \
- x11/qt6/qttools
+ textproc/asciidoctor
RUN_DEPENDS = devel/desktop-file-utils \
devel/xdg-utils \
misc/shared-mime-info \
diff --git a/productivity/novprog/Makefile b/productivity/novprog/Makefile
index b6a94476ac3..c1f818ed671 100644
--- a/productivity/novprog/Makefile
+++ b/productivity/novprog/Makefile
@@ -22,8 +22,6 @@ SITES = https://gottcode.org/novprog/
MODULES = devel/cmake \
x11/qt6
-BUILD_DEPENDS = x11/qt6/qttools
-
RUN_DEPENDS = devel/desktop-file-utils \
x11/gtk+4,-guic
diff --git a/security/qdigidoc4/Makefile b/security/qdigidoc4/Makefile
index 8283d35061b..fb21e531b12 100644
--- a/security/qdigidoc4/Makefile
+++ b/security/qdigidoc4/Makefile
@@ -38,8 +38,7 @@ WANTLIB += c crypto digidocpp flatbuffers lber
ldap m pcsclite ssl z
MODULES = devel/cmake \
x11/qt6
-BUILD_DEPENDS = devel/gettext,-tools \
- x11/qt6/qttools
+BUILD_DEPENDS = devel/gettext,-tools
LIB_DEPENDS = devel/flatbuffers \
databases/openldap,-main \
diff --git a/security/qtkeychain/Makefile b/security/qtkeychain/Makefile
index d20b6feffdf..790f30b6752 100644
--- a/security/qtkeychain/Makefile
+++ b/security/qtkeychain/Makefile
@@ -34,7 +34,6 @@ FULLPKGNAME = qtkeychain-qt6-${GH_TAGNAME}
MODULES += lang/clang x11/qt6
MODCLANG_LANGS += c++
WANTLIB += Qt6Core Qt6DBus
-BUILD_DEPENDS += x11/qt6/qttools
LIB_DEPENDS += ${MODCLANG_LIB_DEPENDS}
LIBNAME = Qt6Keychain
QT = qt6
diff --git a/security/web-eid-app/Makefile b/security/web-eid-app/Makefile
index 52d87835a61..ccac3132ae0 100644
--- a/security/web-eid-app/Makefile
+++ b/security/web-eid-app/Makefile
@@ -65,8 +65,7 @@ MODULES = devel/cmake \
x11/qt6
BUILD_DEPENDS = devel/gtest \
- x11/qt6/qtsvg \
- x11/qt6/qttools
+ x11/qt6/qtsvg
LIB_DEPENDS-main = ${MODQT_LIB_DEPENDS} \
x11/qt6/qtsvg \
diff --git a/x11/qt6/qt6.port.mk b/x11/qt6/qt6.port.mk
index 377ad3ff343..870d793a211 100644
--- a/x11/qt6/qt6.port.mk
+++ b/x11/qt6/qt6.port.mk
@@ -34,10 +34,14 @@ _MODQT6_SETUP += Qt6_DIR=${MODQT6_LIBDIR}/cmake
MODQT6_LIB_DEPENDS = x11/qt6/qtbase
MODQT_LIB_DEPENDS ?= ${MODQT6_LIB_DEPENDS}
+# qdoc, etc.
+MODQT6_BUILD_DEPENDS = x11/qt6/qttools
+
MODQT_DEPS ?= Yes
MODQT6_DEPS ?= ${MODQT_DEPS}
.if ${MODQT6_DEPS:L} == "yes"
+BUILD_DEPENDS += ${MODQT6_BUILD_DEPENDS}
LIB_DEPENDS += ${MODQT6_LIB_DEPENDS}
.endif
diff --git a/x11/qt6/qttools/Makefile b/x11/qt6/qttools/Makefile
index 989e9e42c31..4170caca146 100644
--- a/x11/qt6/qttools/Makefile
+++ b/x11/qt6/qttools/Makefile
@@ -12,6 +12,8 @@ WANTLIB += Qt6OpenGL Qt6OpenGLWidgets Qt6PrintSupport Qt6Qml
Qt6QmlModels
WANTLIB += Qt6Quick Qt6QuickWidgets Qt6Sql Qt6Widgets Qt6Xml c
WANTLIB += m xkbcommon zstd
+# avoid BDEP on ourselves
+MODQT6_DEPS = No
MODULES += lang/clang
MODCLANG_COMPILER_LINKS = No
diff --git a/x11/qt6ct/Makefile b/x11/qt6ct/Makefile
index 21657676acc..63bf7b15a4a 100644
--- a/x11/qt6ct/Makefile
+++ b/x11/qt6ct/Makefile
@@ -19,7 +19,6 @@ PERMIT_PACKAGE= Yes
MODULES = devel/cmake \
x11/qt6
-BUILD_DEPENDS = x11/qt6/qttools
RUN_DEPENDS = devel/desktop-file-utils
.include <bsd.port.mk>
diff --git a/x11/tipp10/Makefile b/x11/tipp10/Makefile
index e4f156f11e2..1cee6520942 100644
--- a/x11/tipp10/Makefile
+++ b/x11/tipp10/Makefile
@@ -19,8 +19,6 @@ SITES =
https://gitlab.com/tipp10/tipp10/-/archive/v${V}/
MODULES = devel/cmake x11/qt6
-BUILD_DEPENDS = x11/qt6/qttools
-
RUN_DEPENDS = devel/desktop-file-utils \
x11/gtk+4,-guic \
x11/qt6/qttranslations
