On Sat Aug 29, 2020 at 12:19:13PM +0100, Stuart Henderson wrote: > On 2020/08/24 00:15, Rafael Sadowski wrote: > > CVSROOT: /cvs > > Module name: ports > > Changes by: rsadow...@cvs.openbsd.org 2020/08/24 00:15:04 > > > > Modified files: > > devel/doxygen : Makefile distinfo > > devel/doxygen/patches: patch-doc_CMakeLists_txt > > > > Log message: > > Update doxygen to 1.8.19 > > > > Breaks graphics/orthanc/server packaging: > > Error: > /pobj/orthanc-1.3.0/fake-i386/usr/local/share/doc/orthanc/OrthancPlugin/doxygen.png > does not exist >
Already spotted by naddy@. On Tue Aug 25, 2020 at 04:25:19PM +0200, Christian Weisgerber wrote: > This showed up during my Mesa 20.1.6 test build, but a closer look > shows that the failure is unrelated and likely caused by the doxygen > 1.8.19 update instead. > > Full log attached, but diffing against the one from an old build shows > this difference... > > --- Installing: > /usr/obj/ports/orthanc-1.3.0/fake-amd64/usr/local/share/doc/orth > anc/OrthancPlugin/doxygen.png > +-- Installing: > /usr/obj/ports/orthanc-1.3.0/fake-amd64/usr/local/share/doc/orth > anc/OrthancPlugin/doxygen.svg > > ... resulting in a packaging error: > > Error: > /usr/obj/ports/orthanc-1.3.0/fake-amd64/usr/local/share/doc/orthanc/OrthancPlugin/doxygen.png > does not exist > > -- > Christian "naddy" Weisgerber na...@mips.inka.de Let's disable doxygen like we do in all other ports: Index: Makefile =================================================================== RCS file: /cvs/ports/graphics/orthanc/server/Makefile,v retrieving revision 1.10 diff -u -p -u -p -r1.10 Makefile --- Makefile 2 Oct 2019 18:29:33 -0000 1.10 +++ Makefile 25 Aug 2020 16:29:59 -0000 @@ -4,7 +4,7 @@ COMMENT = RESTful DICOM server for heal DISTNAME = Orthanc-1.3.0 PKGNAME = ${DISTNAME:L} -REVISION = 5 +REVISION = 6 HOMEPAGE = https://www.orthanc-server.com/ @@ -32,8 +32,6 @@ MODULES = devel/cmake \ MODPY_RUNDEP = No -BUILD_DEPENDS = devel/doxygen - LIB_DEPENDS = databases/sqlite3 \ devel/boost \ devel/gtest \ @@ -54,6 +52,8 @@ CONFIGURE_ARGS += -DCMAKE_C_FLAGS="-I${L # CMAKE_COMPILER_IS_GNUCXX isn't set for clang as we invoke the compiler # as 'c++' and not 'clang++' (ref: CMakeDetermineCXXCompiler.cmake) CONFIGURE_ARGS += -DCMAKE_COMPILER_IS_GNUCXX=Yes + +CONFIGURE_ARGS += -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON SUBST_VARS += VARBASE Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/graphics/orthanc/server/pkg/PLIST,v retrieving revision 1.3 diff -u -p -u -p -r1.3 PLIST --- pkg/PLIST 11 Nov 2018 18:49:21 -0000 1.3 +++ pkg/PLIST 25 Aug 2020 16:29:59 -0000 @@ -9,78 +9,9 @@ include/orthanc/OrthancCPlugin.h include/orthanc/OrthancCppDatabasePlugin.h libexec/orthanc/ libexec/orthanc/plugins/ -libexec/orthanc/plugins/libModalityWorklists.so -libexec/orthanc/plugins/libServeFolders.so +@so libexec/orthanc/plugins/libModalityWorklists.so +@so libexec/orthanc/plugins/libServeFolders.so @bin sbin/Orthanc -share/doc/orthanc/ -share/doc/orthanc/OrthancPlugin/ -share/doc/orthanc/OrthancPlugin/OrthancCDatabasePlugin_8h_source.html -share/doc/orthanc/OrthancPlugin/OrthancCPlugin_8h_source.html -share/doc/orthanc/OrthancPlugin/OrthancCppDatabasePlugin_8h_source.html -share/doc/orthanc/OrthancPlugin/OrthancLogoDocumentation.png -share/doc/orthanc/OrthancPlugin/annotated.html -share/doc/orthanc/OrthancPlugin/bc_s.png -share/doc/orthanc/OrthancPlugin/bdwn.png -share/doc/orthanc/OrthancPlugin/classOrthancPlugins_1_1DatabaseBackendAdapter-members.html -share/doc/orthanc/OrthancPlugin/classOrthancPlugins_1_1DatabaseBackendAdapter.html -share/doc/orthanc/OrthancPlugin/classOrthancPlugins_1_1DatabaseBackendOutput-members.html -share/doc/orthanc/OrthancPlugin/classOrthancPlugins_1_1DatabaseBackendOutput.html -share/doc/orthanc/OrthancPlugin/classOrthancPlugins_1_1DatabaseBackendOutput.png -share/doc/orthanc/OrthancPlugin/classOrthancPlugins_1_1DatabaseException-members.html -share/doc/orthanc/OrthancPlugin/classOrthancPlugins_1_1DatabaseException.html -share/doc/orthanc/OrthancPlugin/classOrthancPlugins_1_1IDatabaseBackend-members.html -share/doc/orthanc/OrthancPlugin/classOrthancPlugins_1_1IDatabaseBackend.html -share/doc/orthanc/OrthancPlugin/classOrthancPlugins_1_1IDatabaseBackend.png -share/doc/orthanc/OrthancPlugin/classes.html -share/doc/orthanc/OrthancPlugin/closed.png -share/doc/orthanc/OrthancPlugin/deprecated.html -share/doc/orthanc/OrthancPlugin/dir_027bf64fe5984d5a409df67e6d81a46a.html -share/doc/orthanc/OrthancPlugin/dir_102fbb84850d98ff4d15205d078556ec.html -share/doc/orthanc/OrthancPlugin/dir_23920acd21d87f5dd4f311023f778748.html -share/doc/orthanc/OrthancPlugin/dir_95a3b2b95bd26d983cc8fdeed39fa98b.html -share/doc/orthanc/OrthancPlugin/doc.png -share/doc/orthanc/OrthancPlugin/doxygen.css -share/doc/orthanc/OrthancPlugin/doxygen.png -share/doc/orthanc/OrthancPlugin/dynsections.js -share/doc/orthanc/OrthancPlugin/files.html -share/doc/orthanc/OrthancPlugin/folderclosed.png -share/doc/orthanc/OrthancPlugin/folderopen.png -share/doc/orthanc/OrthancPlugin/functions.html -share/doc/orthanc/OrthancPlugin/functions_func.html -share/doc/orthanc/OrthancPlugin/functions_vars.html -share/doc/orthanc/OrthancPlugin/group__Callbacks.html -share/doc/orthanc/OrthancPlugin/group__DicomCallbaks.html -share/doc/orthanc/OrthancPlugin/group__Images.html -share/doc/orthanc/OrthancPlugin/group__Orthanc.html -share/doc/orthanc/OrthancPlugin/group__REST.html -share/doc/orthanc/OrthancPlugin/group__Toolbox.html -share/doc/orthanc/OrthancPlugin/hierarchy.html -share/doc/orthanc/OrthancPlugin/index.html -share/doc/orthanc/OrthancPlugin/jquery.js -share/doc/orthanc/OrthancPlugin/menu.js -share/doc/orthanc/OrthancPlugin/menudata.js -share/doc/orthanc/OrthancPlugin/modules.html -share/doc/orthanc/OrthancPlugin/namespaceOrthancPlugins.html -share/doc/orthanc/OrthancPlugin/namespaces.html -share/doc/orthanc/OrthancPlugin/nav_f.png -share/doc/orthanc/OrthancPlugin/nav_g.png -share/doc/orthanc/OrthancPlugin/nav_h.png -share/doc/orthanc/OrthancPlugin/open.png -share/doc/orthanc/OrthancPlugin/pages.html -share/doc/orthanc/OrthancPlugin/splitbar.png -share/doc/orthanc/OrthancPlugin/structOrthancPluginDictionaryEntry-members.html -share/doc/orthanc/OrthancPlugin/structOrthancPluginDictionaryEntry.html -share/doc/orthanc/OrthancPlugin/structOrthancPluginHttpRequest-members.html -share/doc/orthanc/OrthancPlugin/structOrthancPluginHttpRequest.html -share/doc/orthanc/OrthancPlugin/structOrthancPluginMemoryBuffer-members.html -share/doc/orthanc/OrthancPlugin/structOrthancPluginMemoryBuffer.html -share/doc/orthanc/OrthancPlugin/sync_off.png -share/doc/orthanc/OrthancPlugin/sync_on.png -share/doc/orthanc/OrthancPlugin/tab_a.png -share/doc/orthanc/OrthancPlugin/tab_b.png -share/doc/orthanc/OrthancPlugin/tab_h.png -share/doc/orthanc/OrthancPlugin/tab_s.png -share/doc/orthanc/OrthancPlugin/tabs.css share/examples/orthanc/ @sample ${SYSCONFDIR}/orthanc/ share/examples/orthanc/Configuration.json @@ -89,5 +20,3 @@ share/examples/orthanc/Configuration.jso @group _orthanc @sample ${VARBASE}/orthanc/ @sample /var/log/orthanc/ -@group -@owner