Sat Jan 26 23:20:41 2019 UTC ()
qt5-qttools: make qdoc optional

It pulls in all of clang and I don't need that just to build wireshark.


(tnn)
diff -r1.48 -r1.49 pkgsrc/x11/qt5-qttools/Makefile
diff -r1.9 -r1.10 pkgsrc/x11/qt5-qttools/PLIST
cvs diff -r1.48 -r1.49 pkgsrc/x11/qt5-qttools/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/qt5-qttools/Makefile 2018/12/18 09:57:19 1.48
+++ pkgsrc/x11/qt5-qttools/Makefile 2019/01/26 23:20:41 1.49
@@ -1,31 +1,39 @@ @@ -1,31 +1,39 @@
1# $NetBSD: Makefile,v 1.48 2018/12/18 09:57:19 adam Exp $ 1# $NetBSD: Makefile,v 1.49 2019/01/26 23:20:41 tnn Exp $
2 2
3DISTNAME= qttools-everywhere-src-${QTVERSION} 3DISTNAME= qttools-everywhere-src-${QTVERSION}
4PKGNAME= qt5-qttools-${QTVERSION} 4PKGNAME= qt5-qttools-${QTVERSION}
5COMMENT= Qt5 tools 5COMMENT= Qt5 tools
6 6
7DEPENDS+= xdg-utils-[0-9]*:../../misc/xdg-utils 7DEPENDS+= xdg-utils-[0-9]*:../../misc/xdg-utils
8 8
9MAKE_ENV+= LLVM_INSTALL_DIR=${BUILDLINK_PREFIX.clang} 
10MAKE_ENV+= QTDIR=${QTDIR} 9MAKE_ENV+= QTDIR=${QTDIR}
11INSTALL_ENV+= INSTALL_ROOT=${DESTDIR} 10INSTALL_ENV+= INSTALL_ROOT=${DESTDIR}
12INSTALLATION_DIRS+= lib/pkgconfig 11INSTALLATION_DIRS+= lib/pkgconfig
13 12
 13PKG_SUPPORTED_OPTIONS+= llvm
 14PKG_SUGGESTED_OPTIONS+= llvm
 15PLIST_VARS+= llvm
 16
14.include "../../x11/qt5-qtbase/Makefile.common" 17.include "../../x11/qt5-qtbase/Makefile.common"
15 18
 19.if !empty(PKG_OPTIONS:Mllvm)
 20PLIST.llvm= yes
 21MAKE_ENV+= LLVM_INSTALL_DIR=${BUILDLINK_PREFIX.clang}
 22.include "../../lang/clang/buildlink3.mk"
 23.endif
 24
16QTPKGCONFIGPC= Qt5Designer.pc Qt5Help.pc Qt5UiTools.pc 25QTPKGCONFIGPC= Qt5Designer.pc Qt5Help.pc Qt5UiTools.pc
17 26
18post-install: 27post-install:
19.for i in ${QTPKGCONFIGPC} 28.for i in ${QTPKGCONFIGPC}
20 cd ${DESTDIR}${PREFIX}/lib/pkgconfig && \ 29 cd ${DESTDIR}${PREFIX}/lib/pkgconfig && \
21 ln -f -s ${QTPREFIX}/lib/pkgconfig/${i} ${i} 30 ln -f -s ${QTPREFIX}/lib/pkgconfig/${i} ${i}
22.endfor 31.endfor
23 32
24.include "../../lang/clang/buildlink3.mk" 
25.include "../../x11/qt5-qtdeclarative/buildlink3.mk" 33.include "../../x11/qt5-qtdeclarative/buildlink3.mk"
26.include "../../x11/qt5-qtlocation/buildlink3.mk" 34.include "../../x11/qt5-qtlocation/buildlink3.mk"
27.include "../../x11/qt5-qtmultimedia/buildlink3.mk" 35.include "../../x11/qt5-qtmultimedia/buildlink3.mk"
28.include "../../x11/qt5-qtsensors/buildlink3.mk" 36.include "../../x11/qt5-qtsensors/buildlink3.mk"
29.include "../../x11/qt5-qtwebchannel/buildlink3.mk" 37.include "../../x11/qt5-qtwebchannel/buildlink3.mk"
30.include "../../x11/qt5-qtxmlpatterns/buildlink3.mk" 38.include "../../x11/qt5-qtxmlpatterns/buildlink3.mk"
31.include "../../mk/bsd.pkg.mk" 39.include "../../mk/bsd.pkg.mk"
cvs diff -r1.9 -r1.10 pkgsrc/x11/qt5-qttools/PLIST (expand / switch to unified diff)

--- pkgsrc/x11/qt5-qttools/PLIST 2018/12/18 09:57:19 1.9
+++ pkgsrc/x11/qt5-qttools/PLIST 2019/01/26 23:20:41 1.10
@@ -1,33 +1,33 @@ @@ -1,33 +1,33 @@
1@comment $NetBSD: PLIST,v 1.9 2018/12/18 09:57:19 adam Exp $ 1@comment $NetBSD: PLIST,v 1.10 2019/01/26 23:20:41 tnn Exp $
2lib/pkgconfig/Qt5Designer.pc 2lib/pkgconfig/Qt5Designer.pc
3lib/pkgconfig/Qt5Help.pc 3lib/pkgconfig/Qt5Help.pc
4lib/pkgconfig/Qt5UiTools.pc 4lib/pkgconfig/Qt5UiTools.pc
5${PLIST.mac}qt5/bin/Assistant 5${PLIST.mac}qt5/bin/Assistant
6${PLIST.mac}qt5/bin/Designer 6${PLIST.mac}qt5/bin/Designer
7${PLIST.mac}qt5/bin/Linguist 7${PLIST.mac}qt5/bin/Linguist
8${PLIST.unix}qt5/bin/assistant 8${PLIST.unix}qt5/bin/assistant
9${PLIST.unix}qt5/bin/designer 9${PLIST.unix}qt5/bin/designer
10qt5/bin/lconvert 10qt5/bin/lconvert
11${PLIST.unix}qt5/bin/linguist 11${PLIST.unix}qt5/bin/linguist
12qt5/bin/lrelease 12qt5/bin/lrelease
13qt5/bin/lupdate 13qt5/bin/lupdate
14${PLIST.mac}qt5/bin/macchangeqt 14${PLIST.mac}qt5/bin/macchangeqt
15${PLIST.mac}qt5/bin/macdeployqt 15${PLIST.mac}qt5/bin/macdeployqt
16qt5/bin/pixeltool 16qt5/bin/pixeltool
17qt5/bin/qdbus 17qt5/bin/qdbus
18qt5/bin/qdbusviewer 18qt5/bin/qdbusviewer
19qt5/bin/qdistancefieldgenerator 19qt5/bin/qdistancefieldgenerator
20qt5/bin/qdoc 20${PLIST.llvm}qt5/bin/qdoc
21qt5/bin/qhelpgenerator 21qt5/bin/qhelpgenerator
22qt5/bin/qtattributionsscanner 22qt5/bin/qtattributionsscanner
23qt5/bin/qtdiag 23qt5/bin/qtdiag
24qt5/bin/qtpaths 24qt5/bin/qtpaths
25qt5/bin/qtplugininfo 25qt5/bin/qtplugininfo
26qt5/include/QtDesigner/${PKGVERSION}/QtDesigner/private/abstractdialoggui_p.h 26qt5/include/QtDesigner/${PKGVERSION}/QtDesigner/private/abstractdialoggui_p.h
27qt5/include/QtDesigner/${PKGVERSION}/QtDesigner/private/abstractintrospection_p.h 27qt5/include/QtDesigner/${PKGVERSION}/QtDesigner/private/abstractintrospection_p.h
28qt5/include/QtDesigner/${PKGVERSION}/QtDesigner/private/actioneditor_p.h 28qt5/include/QtDesigner/${PKGVERSION}/QtDesigner/private/actioneditor_p.h
29qt5/include/QtDesigner/${PKGVERSION}/QtDesigner/private/actionprovider_p.h 29qt5/include/QtDesigner/${PKGVERSION}/QtDesigner/private/actionprovider_p.h
30qt5/include/QtDesigner/${PKGVERSION}/QtDesigner/private/actionrepository_p.h 30qt5/include/QtDesigner/${PKGVERSION}/QtDesigner/private/actionrepository_p.h
31qt5/include/QtDesigner/${PKGVERSION}/QtDesigner/private/codedialog_p.h 31qt5/include/QtDesigner/${PKGVERSION}/QtDesigner/private/codedialog_p.h
32qt5/include/QtDesigner/${PKGVERSION}/QtDesigner/private/connectionedit_p.h 32qt5/include/QtDesigner/${PKGVERSION}/QtDesigner/private/connectionedit_p.h
33qt5/include/QtDesigner/${PKGVERSION}/QtDesigner/private/csshighlighter_p.h 33qt5/include/QtDesigner/${PKGVERSION}/QtDesigner/private/csshighlighter_p.h