Sat Mar 26 20:37:09 2022 UTC ()
qt5: omit wayland dependency in meta package if not supported


(tnn)
diff -r1.19 -r1.20 pkgsrc/x11/qt5/Makefile
cvs diff -r1.19 -r1.20 pkgsrc/x11/qt5/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/qt5/Makefile 2020/01/21 20:25:36 1.19
+++ pkgsrc/x11/qt5/Makefile 2022/03/26 20:37:09 1.20
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.19 2020/01/21 20:25:36 adam Exp $ 1# $NetBSD: Makefile,v 1.20 2022/03/26 20:37:09 tnn Exp $
2 2
3DISTNAME= qt5-${QTVERSION} 3DISTNAME= qt5-${QTVERSION}
4 4
5COMMENT= "meta-package" for version 5 of the QT GUI C++ toolkit 5COMMENT= "meta-package" for version 5 of the QT GUI C++ toolkit
6 6
7META_PACKAGE= yes 7META_PACKAGE= yes
8 8
9.include "Makefile.common" 9.include "Makefile.common"
10 10
11DEPENDS+= qt5-qtbase-${QTVERSION}{,nb[0-9]*}:../../x11/qt5-qtbase 11DEPENDS+= qt5-qtbase-${QTVERSION}{,nb[0-9]*}:../../x11/qt5-qtbase
12DEPENDS+= qt5-qtcharts-${QTVERSION}{,nb[0-9]*}:../../x11/qt5-qtcharts 12DEPENDS+= qt5-qtcharts-${QTVERSION}{,nb[0-9]*}:../../x11/qt5-qtcharts
13DEPENDS+= qt5-qtconnectivity-${QTVERSION}{,nb[0-9]*}:../../x11/qt5-qtconnectivity 13DEPENDS+= qt5-qtconnectivity-${QTVERSION}{,nb[0-9]*}:../../x11/qt5-qtconnectivity
14DEPENDS+= qt5-qtdeclarative-${QTVERSION}{,nb[0-9]*}:../../x11/qt5-qtdeclarative 14DEPENDS+= qt5-qtdeclarative-${QTVERSION}{,nb[0-9]*}:../../x11/qt5-qtdeclarative
@@ -25,18 +25,21 @@ DEPENDS+= qt5-qtscxml-${QTVERSION}{,nb[0 @@ -25,18 +25,21 @@ DEPENDS+= qt5-qtscxml-${QTVERSION}{,nb[0
25DEPENDS+= qt5-qtsensors-${QTVERSION}{,nb[0-9]*}:../../x11/qt5-qtsensors 25DEPENDS+= qt5-qtsensors-${QTVERSION}{,nb[0-9]*}:../../x11/qt5-qtsensors
26DEPENDS+= qt5-qtserialport-${QTVERSION}{,nb[0-9]*}:../../x11/qt5-qtserialport 26DEPENDS+= qt5-qtserialport-${QTVERSION}{,nb[0-9]*}:../../x11/qt5-qtserialport
27DEPENDS+= qt5-qtspeech-${QTVERSION}{,nb[0-9]*}:../../x11/qt5-qtspeech 27DEPENDS+= qt5-qtspeech-${QTVERSION}{,nb[0-9]*}:../../x11/qt5-qtspeech
28DEPENDS+= qt5-qtsvg-${QTVERSION}{,nb[0-9]*}:../../x11/qt5-qtsvg 28DEPENDS+= qt5-qtsvg-${QTVERSION}{,nb[0-9]*}:../../x11/qt5-qtsvg
29DEPENDS+= qt5-qttools-${QTVERSION}{,nb[0-9]*}:../../x11/qt5-qttools 29DEPENDS+= qt5-qttools-${QTVERSION}{,nb[0-9]*}:../../x11/qt5-qttools
30DEPENDS+= qt5-qttranslations-${QTVERSION}{,nb[0-9]*}:../../x11/qt5-qttranslations 30DEPENDS+= qt5-qttranslations-${QTVERSION}{,nb[0-9]*}:../../x11/qt5-qttranslations
31DEPENDS+= qt5-qtvirtualkeyboard-${QTVERSION}{,nb[0-9]*}:../../x11/qt5-qtvirtualkeyboard 31DEPENDS+= qt5-qtvirtualkeyboard-${QTVERSION}{,nb[0-9]*}:../../x11/qt5-qtvirtualkeyboard
32DEPENDS+= qt5-qtwebchannel-${QTVERSION}{,nb[0-9]*}:../../x11/qt5-qtwebchannel 32DEPENDS+= qt5-qtwebchannel-${QTVERSION}{,nb[0-9]*}:../../x11/qt5-qtwebchannel
33DEPENDS+= qt5-qtwebsockets-${QTVERSION}{,nb[0-9]*}:../../x11/qt5-qtwebsockets 33DEPENDS+= qt5-qtwebsockets-${QTVERSION}{,nb[0-9]*}:../../x11/qt5-qtwebsockets
34DEPENDS+= qt5-qtxmlpatterns-${QTVERSION}{,nb[0-9]*}:../../x11/qt5-qtxmlpatterns 34DEPENDS+= qt5-qtxmlpatterns-${QTVERSION}{,nb[0-9]*}:../../x11/qt5-qtxmlpatterns
35.if ${OPSYS} == "Darwin" 35.if ${OPSYS} == "Darwin"
36DEPENDS+= qt5-qtmacextras-${QTVERSION}{,nb[0-9]*}:../../x11/qt5-qtmacextras 36DEPENDS+= qt5-qtmacextras-${QTVERSION}{,nb[0-9]*}:../../x11/qt5-qtmacextras
37.else 37.else
38DEPENDS+= qt5-qtwayland-${QTVERSION}{,nb[0-9]*}:../../x11/qt5-qtwayland 
39DEPENDS+= qt5-qtx11extras-${QTVERSION}{,nb[0-9]*}:../../x11/qt5-qtx11extras 38DEPENDS+= qt5-qtx11extras-${QTVERSION}{,nb[0-9]*}:../../x11/qt5-qtx11extras
40.endif 39.endif
 40.include "../../devel/wayland/platform.mk"
 41.if ${PLATFORM_SUPPORTS_WAYLAND} == "yes"
 42DEPENDS+= qt5-qtwayland-${QTVERSION}{,nb[0-9]*}:../../x11/qt5-qtwayland
 43.endif
41 44
42.include "../../mk/bsd.pkg.mk" 45.include "../../mk/bsd.pkg.mk"