diff --git a/devel/doxygen/Makefile b/devel/doxygen/Makefile index a6b07d458f2e..731e4018d5b7 100644 --- a/devel/doxygen/Makefile +++ b/devel/doxygen/Makefile @@ -1,61 +1,60 @@ # Created by: Joep Grooten PORTNAME= doxygen -PORTVERSION= 1.9.3 -PORTREVISION= 1 +PORTVERSION= 1.9.4 PORTEPOCH= 2 CATEGORIES= devel MASTER_SITES= SF/${PORTNAME}/rel-${PORTVERSION} \ http://doxygen.nl/files/ EXTRACT_SUFX= .src.tar.gz MAINTAINER= fluffy@FreeBSD.org COMMENT= Documentation system for C, C++, and other languages LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/LICENSE -USES= bison cmake:noninja compiler:c++14-lang cpe dos2unix \ +USES= bison cmake:noninja compiler:c++17-lang cpe dos2unix \ iconv python shebangfix ALL_TARGET= all CMAKE_ARGS+= -DDOC_INSTALL_DIR:PATH=${DOCSDIR_REL} # Parallel jobs breaks when the DOCS option is on MAKE_JOBS_UNSAFE= yes EXTRACT_AFTER_ARGS= --exclude '*/libmd5' DOS2UNIX_FILES= doc/translator.py PLIST_FILES= bin/doxygen OPTIONS_DEFINE= DOCS GRAPHVIZ LATEX SEARCH QT5 OPTIONS_DEFAULT= GRAPHVIZ QT5_DESC= Install Doxywizard GUI with Qt5 SEARCH_DESC= Build external search tools (doxysearch and doxyindexer) DOCS_USES= ghostscript:build DOCS_USE= TEX=base:build,dvipsk:build,pdftex:build DOCS_ALL_TARGET= docs DOCS_BUILD_DEPENDS= dot:graphics/graphviz DOCS_CMAKE_BOOL= build_doc DOCS_PLIST_FILES= man/man1/doxygen.1.gz \ man/man1/doxyindexer.1.gz \ man/man1/doxysearch.1.gz \ man/man1/doxywizard.1.gz PORTDOCS= * GRAPHVIZ_RUN_DEPENDS= dot:graphics/graphviz LATEX_USE= TEX=base,dvipsk,pdftex QT5_USES= qt:5 QT5_USE= QT=core,widgets,gui,xml,qmake_build,buildtools_build QT5_CMAKE_BOOL= build_wizard QT5_PLIST_FILES= bin/doxywizard SEARCH_CMAKE_BOOL= build_search SEARCH_LIB_DEPENDS= libxapian.so:databases/xapian-core SEARCH_PLIST_FILES= bin/doxyindexer \ bin/doxysearch.cgi .include diff --git a/devel/doxygen/distinfo b/devel/doxygen/distinfo index ffe3bde04ad8..89e45dba26ee 100644 --- a/devel/doxygen/distinfo +++ b/devel/doxygen/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1641213008 -SHA256 (doxygen-1.9.3.src.tar.gz) = f352dbc3221af7012b7b00935f2dfdc9fb67a97d43287d2f6c81c50449d254e0 -SIZE (doxygen-1.9.3.src.tar.gz) = 5152156 +TIMESTAMP = 1652030233 +SHA256 (doxygen-1.9.4.src.tar.gz) = a15e9cd8c0d02b7888bc8356eac200222ecff1defd32f3fe05257d81227b1f37 +SIZE (doxygen-1.9.4.src.tar.gz) = 5196383 diff --git a/devel/doxygen/files/patch-addon_doxywizard_CMakeLists.txt b/devel/doxygen/files/patch-addon_doxywizard_CMakeLists.txt index d07be63e6623..9dafdd4a5334 100644 --- a/devel/doxygen/files/patch-addon_doxywizard_CMakeLists.txt +++ b/devel/doxygen/files/patch-addon_doxywizard_CMakeLists.txt @@ -1,16 +1,18 @@ -diff --git a/addon/doxywizard/CMakeLists.txt b/addon/doxywizard/CMakeLists.txt -index 6ae71a6..e03ea7c 100644 --- addon/doxywizard/CMakeLists.txt +++ addon/doxywizard/CMakeLists.txt -@@ -104,9 +104,9 @@ doxywizard.rc - ) +@@ -132,12 +132,12 @@ if(Qt5Core_FOUND) + endif() if(Qt5Core_FOUND) - target_link_libraries(doxywizard Qt5::Core Qt5::Gui Qt5::Widgets Qt5::Xml doxygen_version) + target_link_libraries(doxywizard Qt5::Core Qt5::Gui Qt5::Widgets Qt5::Xml doxygen_version pthread) else() + if(Qt6Core_FOUND) +- target_link_libraries(doxywizard Qt6::Core Qt6::Gui Qt6::Widgets Qt6::Xml doxygen_version) ++ target_link_libraries(doxywizard Qt6::Core Qt6::Gui Qt6::Widgets Qt6::Xml doxygen_version pthread) + else() - target_link_libraries(doxywizard ${QT_LIBRARIES} ${QT_QTMAIN_LIBRARY} doxygen_version) + target_link_libraries(doxywizard ${QT_LIBRARIES} ${QT_QTMAIN_LIBRARY} doxygen_version pthread) endif() + endif() - install(TARGETS doxywizard DESTINATION bin) diff --git a/devel/doxygen/files/patch-md5-definition b/devel/doxygen/files/patch-md5-definition index f30629f5cf90..4a720df255a0 100644 --- a/devel/doxygen/files/patch-md5-definition +++ b/devel/doxygen/files/patch-md5-definition @@ -1,26 +1,26 @@ --- src/definition.cpp.orig 2021-08-17 14:04:29 UTC +++ src/definition.cpp @@ -5,6 +5,7 @@ #include #include +#include #include "md5.h" #include #include -@@ -416,13 +417,11 @@ void DefinitionImpl::writeDocAnchorsToTagFile(TextStre +@@ -414,13 +415,11 @@ bool DefinitionImpl::_docsAlreadyAdded(const QCString bool DefinitionImpl::_docsAlreadyAdded(const QCString &doc,QCString &sigList) { - uchar md5_sig[16]; - char sigStr[33]; + QCString sigStr(33); // to avoid mismatches due to differences in indenting, we first remove // double whitespaces... QCString docStr = doc.simplifyWhiteSpace(); -- MD5Buffer((const unsigned char *)docStr.data(),docStr.length(),md5_sig); +- MD5Buffer(docStr.data(),docStr.length(),md5_sig); - MD5SigToString(md5_sig,sigStr); + MD5Data((const unsigned char *)docStr.data(),docStr.length(),sigStr.rawData()); //printf("%s:_docsAlreadyAdded doc='%s' sig='%s' docSigs='%s'\n", // qPrint(name()),qPrint(doc),qPrint(sigStr),qPrint(sigList)); if (sigList.find(sigStr)==-1) // new docs, add signature to prevent re-adding it diff --git a/devel/doxygen/files/patch-md5-dirdef b/devel/doxygen/files/patch-md5-dirdef index 175fbb61f47a..fffe95b0b4fe 100644 --- a/devel/doxygen/files/patch-md5-dirdef +++ b/devel/doxygen/files/patch-md5-dirdef @@ -1,29 +1,29 @@ --- src/dirdef.cpp.orig 2021-08-17 17:10:43 UTC +++ src/dirdef.cpp @@ -11,11 +11,13 @@ * Documents produced by Doxygen are derivative works derived from the * input used in their production; they are not affected by this license. * +#include */ #include #include "dirdef.h" +#include #include "md5.h" #include "filename.h" #include "doxygen.h" -@@ -178,10 +180,8 @@ void DirDefImpl::sort() +@@ -181,10 +183,8 @@ static QCString encodeDirName(const QCString &anchor) static QCString encodeDirName(const QCString &anchor) { // convert to md5 hash - uchar md5_sig[16]; - char sigStr[33]; -- MD5Buffer((const unsigned char *)anchor.data(),anchor.length(),md5_sig); +- MD5Buffer(anchor.data(),anchor.length(),md5_sig); - MD5SigToString(md5_sig,sigStr); + QCString sigStr(33); + MD5Data((const unsigned char *)anchor.data(),anchor.length(),sigStr.rawData()); return sigStr; // old algorithm diff --git a/devel/doxygen/files/patch-md5-dotgraph b/devel/doxygen/files/patch-md5-dotgraph index b6cdba85f5c9..39bf2f927c2f 100644 --- a/devel/doxygen/files/patch-md5-dotgraph +++ b/devel/doxygen/files/patch-md5-dotgraph @@ -1,26 +1,26 @@ --- src/dotgraph.cpp.orig 2021-05-12 18:53:13 UTC +++ src/dotgraph.cpp -@@ -18,6 +18,7 @@ +@@ -19,6 +19,7 @@ #include "config.h" #include "doxygen.h" #include "index.h" +#include #include "md5.h" #include "message.h" #include "util.h" -@@ -147,12 +148,9 @@ bool DotGraph::prepareDotFile() +@@ -154,12 +155,9 @@ bool DotGraph::prepareDotFile() term("Output dir %s does not exist!\n", m_dir.path().c_str()); } - char sigStr[33]; - uchar md5_sig[16]; - // calculate md5 -- MD5Buffer((const unsigned char*)m_theGraph.data(), m_theGraph.length(), md5_sig); +- MD5Buffer(m_theGraph.data(), m_theGraph.length(), md5_sig); - // convert result to a string - MD5SigToString(md5_sig, sigStr); + QCString sigStr(33); + // calculate md5 and convert result to a string + MD5Data((const unsigned char*)m_theGraph.data(), m_theGraph.length(), sigStr.rawData()); // already queued files are processed again in case the output format has changed diff --git a/devel/doxygen/files/patch-md5-memberdef b/devel/doxygen/files/patch-md5-memberdef index d42698ae1fb1..a86fd9a0b369 100644 --- a/devel/doxygen/files/patch-md5-memberdef +++ b/devel/doxygen/files/patch-md5-memberdef @@ -1,23 +1,23 @@ --- src/memberdef.cpp.orig 2021-08-18 13:55:35 UTC +++ src/memberdef.cpp @@ -17,6 +17,7 @@ #include #include #include +#include #include "md5.h" #include "memberdef.h" -@@ -4139,10 +4140,8 @@ void MemberDefImpl::setAnchor() +@@ -4115,10 +4116,8 @@ void MemberDefImpl::setAnchor() } // convert to md5 hash - uchar md5_sig[16]; - char sigStr[33]; -- MD5Buffer((const unsigned char *)memAnchor.data(),memAnchor.length(),md5_sig); +- MD5Buffer(memAnchor.data(),memAnchor.length(),md5_sig); - MD5SigToString(md5_sig,sigStr); + QCString sigStr(33); + MD5Data((const unsigned char *)memAnchor.data(),memAnchor.length(),sigStr.rawData()); m_impl->anc = QCString("a")+sigStr; } diff --git a/devel/doxygen/files/patch-md5-membergroup b/devel/doxygen/files/patch-md5-membergroup index 8b37b528a9df..2601f2f3e65a 100644 --- a/devel/doxygen/files/patch-md5-membergroup +++ b/devel/doxygen/files/patch-md5-membergroup @@ -1,25 +1,10 @@ --- src/membergroup.cpp.orig 2021-08-02 18:54:15 UTC +++ src/membergroup.cpp @@ -27,6 +27,7 @@ #include "doxygen.h" #include "docparser.h" #include "entry.h" +#include #include "md5.h" MemberGroup::MemberGroup(const Definition *container,int id,const QCString &hdr, -@@ -257,12 +258,10 @@ int MemberGroup::numDocEnumValues() const - - QCString MemberGroup::anchor() const - { -- uchar md5_sig[16]; -- char sigStr[33]; -+ QCString sigStr(33); - QCString locHeader = grpHeader; - if (locHeader.isEmpty()) locHeader="[NOHEADER]"; -- MD5Buffer((const unsigned char *)locHeader.data(),locHeader.length(),md5_sig); -- MD5SigToString(md5_sig,sigStr); -+ MD5Data((const unsigned char *)locHeader.data(),locHeader.length(),sigStr.rawData()); - return QCString("amgrp")+sigStr; - } - diff --git a/devel/doxygen/files/patch-md5-util b/devel/doxygen/files/patch-md5-util index 6cb1259a57e1..bfc51f6ec00a 100644 --- a/devel/doxygen/files/patch-md5-util +++ b/devel/doxygen/files/patch-md5-util @@ -1,52 +1,54 @@ --- src/util.cpp.orig 2021-08-18 18:55:03 UTC +++ src/util.cpp @@ -30,6 +30,7 @@ #include #include +#include #include "md5.h" #include "regex.h" -@@ -3638,24 +3639,18 @@ QCString convertNameToFile(const QCString &name,bool a +@@ -3633,26 +3634,18 @@ QCString convertNameToFile(const QCString &name,bool a if (resultLen>=128) // prevent names that cannot be created! { // third algorithm based on MD5 hash - uchar md5_sig[16]; - char sigStr[33]; -- MD5Buffer((const unsigned char *)result.data(),resultLen,md5_sig); +- MD5Buffer(result.data(),resultLen,md5_sig); - MD5SigToString(md5_sig,sigStr); + QCString sigStr(33); + MD5Data((const unsigned char *)result.data(),resultLen,sigStr.rawData()); result=result.left(128-32)+sigStr; } } if (createSubdirs) { - int l1Dir=0,l2Dir=0; +- int createSubdirsLevel = Config_getInt(CREATE_SUBDIRS_LEVEL); +- int createSubdirsBitmaskL2 = (1<%s\n",qPrint(name),qPrint(result)); return result; -@@ -7251,6 +7246,11 @@ QCString selectBlock(const QCString& s,const QCString +@@ -7269,6 +7262,11 @@ QCString removeEmptyLines(const QCString &s) QCString removeEmptyLines(const QCString &s) { BufStr out(s.length()+1); + if (s.length()==0) + { + out.addChar('\0'); + return out.data(); + } const char *p=s.data(); if (p) {