Hi, after some lengthy discussion here's two updates on the qdoc and doc ports for Qt 5.6.
The qdoc port now installs the global files from the qtbase distfile so it can be used standalone again. Accordingly the qt5-doc port is changed to exclude those global files and simplified by generating the Qt docs through an outsource build. With those patches, qbs and qtcreator docs can be added finally without depending on the qt5-doc port for generating. (patches for those following after appended patches are submitted to area51) -- Kind regards, Ralf Nolden
Index: branches/qt-5.6/QT/devel/qt5-qdoc/Makefile =================================================================== --- branches/qt-5.6/QT/devel/qt5-qdoc/Makefile (Revision 12509) +++ branches/qt-5.6/QT/devel/qt5-qdoc/Makefile (Arbeitskopie) @@ -9,12 +9,20 @@ COMMENT= Qt documentation generator USE_QT5= core xml buildtools_build qmake_build qml -QT_DIST= tools +QT_DIST= tools base USES= qmake +WRKSRC= ${WRKDIR}/qttools-opensource-src-${QT5_VERSION} BUILD_WRKSRC= ${WRKSRC}/src/${PORTNAME} INSTALL_WRKSRC= ${BUILD_WRKSRC} -PLIST_FILES= ${QT_BINDIR}/qdoc +DESCR= ${.CURDIR:H:H}/devel/qt5/pkg-descr +DOCSDIR= ${PREFIX}/share/doc/qt5/global + +post-install: + ${MKDIR} ${STAGEDIR}${DOCSDIR} && \ + cd ${WRKDIR}/qtbase-opensource-src-${QT5_VERSION}/doc/global && \ + ${COPYTREE_SHARE} \* ${STAGEDIR}${DOCSDIR} + .include <bsd.port.mk> Index: branches/qt-5.6/QT/devel/qt5-qdoc/pkg-plist =================================================================== --- branches/qt-5.6/QT/devel/qt5-qdoc/pkg-plist (nicht existent) +++ branches/qt-5.6/QT/devel/qt5-qdoc/pkg-plist (Arbeitskopie) @@ -0,0 +1,77 @@ +%%QT_BINDIR%%/qdoc +%%QT_DOCDIR%%/global/compat.qdocconf +%%QT_DOCDIR%%/global/config.qdocconf +%%QT_DOCDIR%%/global/externalsites.qdocconf +%%QT_DOCDIR%%/global/externalsites/external-resources.qdoc +%%QT_DOCDIR%%/global/externalsites/qt-webpages.qdoc +%%QT_DOCDIR%%/global/externalsites/qtcreator.qdoc +%%QT_DOCDIR%%/global/externalsites/rfc.qdoc +%%QT_DOCDIR%%/global/fileextensions.qdocconf +%%QT_DOCDIR%%/global/html-config.qdocconf +%%QT_DOCDIR%%/global/html-footer-online.qdocconf +%%QT_DOCDIR%%/global/html-footer.qdocconf +%%QT_DOCDIR%%/global/html-header-offline.qdocconf +%%QT_DOCDIR%%/global/html-header-online.qdocconf +%%QT_DOCDIR%%/global/includes-online/search.qdoc +%%QT_DOCDIR%%/global/includes/examples-run.qdocinc +%%QT_DOCDIR%%/global/macros.qdocconf +%%QT_DOCDIR%%/global/manifest-meta.qdocconf +%%QT_DOCDIR%%/global/qt-cpp-defines.qdocconf +%%QT_DOCDIR%%/global/qt-html-templates-offline-simple.qdocconf +%%QT_DOCDIR%%/global/qt-html-templates-offline.qdocconf +%%QT_DOCDIR%%/global/qt-html-templates-online.qdocconf +%%QT_DOCDIR%%/global/qt-module-defaults-offline.qdocconf +%%QT_DOCDIR%%/global/qt-module-defaults-online-commercial.qdocconf +%%QT_DOCDIR%%/global/qt-module-defaults-online.qdocconf +%%QT_DOCDIR%%/global/qt-module-defaults.qdocconf +%%QT_DOCDIR%%/global/template/images/Qt-dark_gradient.png +%%QT_DOCDIR%%/global/template/images/Qt-footer-bg.jpg +%%QT_DOCDIR%%/global/template/images/Qt-footer_shadow.png +%%QT_DOCDIR%%/global/template/images/Qt-gradient.png +%%QT_DOCDIR%%/global/template/images/Qt-header-bg.jpg +%%QT_DOCDIR%%/global/template/images/Qt-logo.png +%%QT_DOCDIR%%/global/template/images/arrow.png +%%QT_DOCDIR%%/global/template/images/arrow_bc.png +%%QT_DOCDIR%%/global/template/images/arrow_down.png +%%QT_DOCDIR%%/global/template/images/bg_l.png +%%QT_DOCDIR%%/global/template/images/bg_l_blank.png +%%QT_DOCDIR%%/global/template/images/bg_ll_blank.png +%%QT_DOCDIR%%/global/template/images/bg_r.png +%%QT_DOCDIR%%/global/template/images/bg_ul_blank.png +%%QT_DOCDIR%%/global/template/images/bgrContent.png +%%QT_DOCDIR%%/global/template/images/blu_dot.png +%%QT_DOCDIR%%/global/template/images/box_bg.png +%%QT_DOCDIR%%/global/template/images/breadcrumb.png +%%QT_DOCDIR%%/global/template/images/btn_next.png +%%QT_DOCDIR%%/global/template/images/btn_prev.png +%%QT_DOCDIR%%/global/template/images/bullet_dn.png +%%QT_DOCDIR%%/global/template/images/bullet_gt.png +%%QT_DOCDIR%%/global/template/images/bullet_sq.png +%%QT_DOCDIR%%/global/template/images/bullet_up.png +%%QT_DOCDIR%%/global/template/images/feedbackground.png +%%QT_DOCDIR%%/global/template/images/header_bg.png +%%QT_DOCDIR%%/global/template/images/home.png +%%QT_DOCDIR%%/global/template/images/horBar.png +%%QT_DOCDIR%%/global/template/images/ico_note.png +%%QT_DOCDIR%%/global/template/images/ico_note_attention.png +%%QT_DOCDIR%%/global/template/images/ico_out.png +%%QT_DOCDIR%%/global/template/images/logo.png +%%QT_DOCDIR%%/global/template/images/page.png +%%QT_DOCDIR%%/global/template/images/page_bg.png +%%QT_DOCDIR%%/global/template/images/spinner.gif +%%QT_DOCDIR%%/global/template/images/sprites-combined.png +%%QT_DOCDIR%%/global/template/scripts/extras.js +%%QT_DOCDIR%%/global/template/scripts/main.js +%%QT_DOCDIR%%/global/template/style/cookiebar-x.png +%%QT_DOCDIR%%/global/template/style/doc_search.png +%%QT_DOCDIR%%/global/template/style/gsc.css +%%QT_DOCDIR%%/global/template/style/icomoon.eot +%%QT_DOCDIR%%/global/template/style/icomoon.svg +%%QT_DOCDIR%%/global/template/style/icomoon.ttf +%%QT_DOCDIR%%/global/template/style/icomoon.woff +%%QT_DOCDIR%%/global/template/style/list_arrow.png +%%QT_DOCDIR%%/global/template/style/list_expand.png +%%QT_DOCDIR%%/global/template/style/offline-simple.css +%%QT_DOCDIR%%/global/template/style/offline.css +%%QT_DOCDIR%%/global/template/style/online.css +%%QT_DOCDIR%%/global/template/style/theqtcompany.png
Index: branches/qt-5.6/QT/misc/qt5-doc/Makefile =================================================================== --- branches/qt-5.6/QT/misc/qt5-doc/Makefile (Revision 12509) +++ branches/qt-5.6/QT/misc/qt5-doc/Makefile (Arbeitskopie) @@ -20,6 +20,7 @@ USES= python:build tar:xz HAS_CONFIGURE= yes +CONFIGURE_OUTSOURCE= yes QT_NONSTANDARD= yes CONFIGURE_ARGS= -opensource -confirm-license -developer-build -nomake tests @@ -37,11 +38,12 @@ DESCR= ${.CURDIR:H:H}/devel/qt5/pkg-descr post-extract: - ${LN} -sf ${MOC} ${WRKSRC}/qtbase/bin/moc - ${LN} -sf ${UIC} ${WRKSRC}/qtbase/bin/uic - ${LN} -sf ${RCC} ${WRKSRC}/qtbase/bin/rcc - ${LN} -sf ${QT_BINDIR}/qdoc ${WRKSRC}/qtbase/bin/qdoc - ${LN} -sf ${QT_BINDIR}/qhelpgenerator ${WRKSRC}/qtbase/bin/qhelpgenerator + ${MKDIR} ${BUILD_WRKSRC}/qtbase/bin + ${LN} -sf ${MOC} ${BUILD_WRKSRC}/qtbase/bin/moc + ${LN} -sf ${UIC} ${BUILD_WRKSRC}/qtbase/bin/uic + ${LN} -sf ${RCC} ${BUILD_WRKSRC}/qtbase/bin/rcc + ${LN} -sf ${QT_BINDIR}/qdoc ${BUILD_WRKSRC}/qtbase/bin/qdoc + ${LN} -sf ${QT_BINDIR}/qhelpgenerator ${BUILD_WRKSRC}/qtbase/bin/qhelpgenerator post-patch: # qtdeclarative.pro wants to run python, replace that with PYTHON_CMD @@ -50,8 +52,7 @@ do-install: ${MKDIR} ${STAGEDIR}${DOCSDIR} && \ - cd ${WRKSRC}/qtbase/doc && \ + cd ${BUILD_WRKSRC}/qtbase/doc && \ ${COPYTREE_SHARE} \* ${STAGEDIR}${DOCSDIR} - ${RM} -r ${STAGEDIR}${DOCSDIR}/src .include <bsd.port.post.mk> Index: branches/qt-5.6/QT/misc/qt5-doc/pkg-plist =================================================================== --- branches/qt-5.6/QT/misc/qt5-doc/pkg-plist (Revision 12509) +++ branches/qt-5.6/QT/misc/qt5-doc/pkg-plist (Arbeitskopie) @@ -1,4 +1,3 @@ -%%QT_DOCDIR%%/README %%QT_DOCDIR%%/activeqt.qch %%QT_DOCDIR%%/activeqt/activeqt-activeqt-comapp-comapp-pro.html %%QT_DOCDIR%%/activeqt/activeqt-activeqt-comapp-example.html @@ -95,82 +94,6 @@ %%QT_DOCDIR%%/activeqt/qaxwidget.html %%QT_DOCDIR%%/activeqt/style/offline-simple.css %%QT_DOCDIR%%/activeqt/style/offline.css -%%QT_DOCDIR%%/global/compat.qdocconf -%%QT_DOCDIR%%/global/config.qdocconf -%%QT_DOCDIR%%/global/externalsites.qdocconf -%%QT_DOCDIR%%/global/externalsites/external-resources.qdoc -%%QT_DOCDIR%%/global/externalsites/qt-webpages.qdoc -%%QT_DOCDIR%%/global/externalsites/qtcreator.qdoc -%%QT_DOCDIR%%/global/externalsites/rfc.qdoc -%%QT_DOCDIR%%/global/fileextensions.qdocconf -%%QT_DOCDIR%%/global/html-config.qdocconf -%%QT_DOCDIR%%/global/html-footer-online.qdocconf -%%QT_DOCDIR%%/global/html-footer.qdocconf -%%QT_DOCDIR%%/global/html-header-offline.qdocconf -%%QT_DOCDIR%%/global/html-header-online.qdocconf -%%QT_DOCDIR%%/global/includes-online/search.qdoc -%%QT_DOCDIR%%/global/includes/examples-run.qdocinc -%%QT_DOCDIR%%/global/macros.qdocconf -%%QT_DOCDIR%%/global/manifest-meta.qdocconf -%%QT_DOCDIR%%/global/qt-cpp-defines.qdocconf -%%QT_DOCDIR%%/global/qt-html-templates-offline-simple.qdocconf -%%QT_DOCDIR%%/global/qt-html-templates-offline.qdocconf -%%QT_DOCDIR%%/global/qt-html-templates-online.qdocconf -%%QT_DOCDIR%%/global/qt-module-defaults-offline.qdocconf -%%QT_DOCDIR%%/global/qt-module-defaults-online-commercial.qdocconf -%%QT_DOCDIR%%/global/qt-module-defaults-online.qdocconf -%%QT_DOCDIR%%/global/qt-module-defaults.qdocconf -%%QT_DOCDIR%%/global/template/images/Qt-dark_gradient.png -%%QT_DOCDIR%%/global/template/images/Qt-footer-bg.jpg -%%QT_DOCDIR%%/global/template/images/Qt-footer_shadow.png -%%QT_DOCDIR%%/global/template/images/Qt-gradient.png -%%QT_DOCDIR%%/global/template/images/Qt-header-bg.jpg -%%QT_DOCDIR%%/global/template/images/Qt-logo.png -%%QT_DOCDIR%%/global/template/images/arrow.png -%%QT_DOCDIR%%/global/template/images/arrow_bc.png -%%QT_DOCDIR%%/global/template/images/arrow_down.png -%%QT_DOCDIR%%/global/template/images/bg_l.png -%%QT_DOCDIR%%/global/template/images/bg_l_blank.png -%%QT_DOCDIR%%/global/template/images/bg_ll_blank.png -%%QT_DOCDIR%%/global/template/images/bg_r.png -%%QT_DOCDIR%%/global/template/images/bg_ul_blank.png -%%QT_DOCDIR%%/global/template/images/bgrContent.png -%%QT_DOCDIR%%/global/template/images/blu_dot.png -%%QT_DOCDIR%%/global/template/images/box_bg.png -%%QT_DOCDIR%%/global/template/images/breadcrumb.png -%%QT_DOCDIR%%/global/template/images/btn_next.png -%%QT_DOCDIR%%/global/template/images/btn_prev.png -%%QT_DOCDIR%%/global/template/images/bullet_dn.png -%%QT_DOCDIR%%/global/template/images/bullet_gt.png -%%QT_DOCDIR%%/global/template/images/bullet_sq.png -%%QT_DOCDIR%%/global/template/images/bullet_up.png -%%QT_DOCDIR%%/global/template/images/feedbackground.png -%%QT_DOCDIR%%/global/template/images/header_bg.png -%%QT_DOCDIR%%/global/template/images/home.png -%%QT_DOCDIR%%/global/template/images/horBar.png -%%QT_DOCDIR%%/global/template/images/ico_note.png -%%QT_DOCDIR%%/global/template/images/ico_note_attention.png -%%QT_DOCDIR%%/global/template/images/ico_out.png -%%QT_DOCDIR%%/global/template/images/logo.png -%%QT_DOCDIR%%/global/template/images/page.png -%%QT_DOCDIR%%/global/template/images/page_bg.png -%%QT_DOCDIR%%/global/template/images/spinner.gif -%%QT_DOCDIR%%/global/template/images/sprites-combined.png -%%QT_DOCDIR%%/global/template/scripts/extras.js -%%QT_DOCDIR%%/global/template/scripts/main.js -%%QT_DOCDIR%%/global/template/style/cookiebar-x.png -%%QT_DOCDIR%%/global/template/style/doc_search.png -%%QT_DOCDIR%%/global/template/style/gsc.css -%%QT_DOCDIR%%/global/template/style/icomoon.eot -%%QT_DOCDIR%%/global/template/style/icomoon.svg -%%QT_DOCDIR%%/global/template/style/icomoon.ttf -%%QT_DOCDIR%%/global/template/style/icomoon.woff -%%QT_DOCDIR%%/global/template/style/list_arrow.png -%%QT_DOCDIR%%/global/template/style/list_expand.png -%%QT_DOCDIR%%/global/template/style/offline-simple.css -%%QT_DOCDIR%%/global/template/style/offline.css -%%QT_DOCDIR%%/global/template/style/online.css -%%QT_DOCDIR%%/global/template/style/theqtcompany.png %%QT_DOCDIR%%/qdoc.qch %%QT_DOCDIR%%/qdoc/01-qdoc-manual.html %%QT_DOCDIR%%/qdoc/03-qdoc-commands-markup.html @@ -8763,7 +8686,6 @@ %%QT_DOCDIR%%/qtquickcontrols/qml-qtquick-controls-stack-members.html %%QT_DOCDIR%%/qtquickcontrols/qml-qtquick-controls-stack.html %%QT_DOCDIR%%/qtquickcontrols/qml-qtquick-controls-stackview-members.html -@comment %%QT_DOCDIR%%/qtquickcontrols/qml-qtquick-controls-stackview-obsolete.html %%QT_DOCDIR%%/qtquickcontrols/qml-qtquick-controls-stackview.html %%QT_DOCDIR%%/qtquickcontrols/qml-qtquick-controls-stackviewdelegate-members.html %%QT_DOCDIR%%/qtquickcontrols/qml-qtquick-controls-stackviewdelegate.html @@ -9545,7 +9467,6 @@ %%QT_DOCDIR%%/qtsensors/qtsensors-grue-lib-gruesensor-p-h.html %%QT_DOCDIR%%/qtsensors/qtsensors-grue-lib-lib-pro.html %%QT_DOCDIR%%/qtsensors/qtsensors-grue-main-cpp.html -%%QT_DOCDIR%%/qtsensors/qtsensors-grue-makefile-qml.html %%QT_DOCDIR%%/qtsensors/qtsensors-grue-plugin-gruesensorimpl-cpp.html %%QT_DOCDIR%%/qtsensors/qtsensors-grue-plugin-gruesensorimpl-h.html %%QT_DOCDIR%%/qtsensors/qtsensors-grue-plugin-plugin-pro.html @@ -9581,7 +9502,6 @@ %%QT_DOCDIR%%/qtsensors/qtsensors-qmlsensorgestures-gesturesview-qml.html %%QT_DOCDIR%%/qtsensors/qtsensors-qmlsensorgestures-gestureview-qml.html %%QT_DOCDIR%%/qtsensors/qtsensors-qmlsensorgestures-main-cpp.html -%%QT_DOCDIR%%/qtsensors/qtsensors-qmlsensorgestures-makefile-qml.html %%QT_DOCDIR%%/qtsensors/qtsensors-qmlsensorgestures-plugin-plugin-pro.html %%QT_DOCDIR%%/qtsensors/qtsensors-qmlsensorgestures-plugin-qcountergestureplugin-cpp.html %%QT_DOCDIR%%/qtsensors/qtsensors-qmlsensorgestures-plugin-qcountergestureplugin-h.html @@ -9601,7 +9521,6 @@ %%QT_DOCDIR%%/qtsensors/qtsensors-sensor-explorer-import-sensoritem-cpp.html %%QT_DOCDIR%%/qtsensors/qtsensors-sensor-explorer-import-sensoritem-h.html %%QT_DOCDIR%%/qtsensors/qtsensors-sensor-explorer-main-cpp.html -%%QT_DOCDIR%%/qtsensors/qtsensors-sensor-explorer-makefile-qml.html %%QT_DOCDIR%%/qtsensors/qtsensors-sensor-explorer-qml-pro.html %%QT_DOCDIR%%/qtsensors/qtsensors-sensor-explorer-qml-qrc.html %%QT_DOCDIR%%/qtsensors/qtsensors-sensor-explorer-sensor-explorer-pro.html
_______________________________________________ kde-freebsd mailing list kde-freebsd@kde.org https://mail.kde.org/mailman/listinfo/kde-freebsd See also http://freebsd.kde.org/ for latest information