Index: devel/doxygen/Makefile =================================================================== --- devel/doxygen/Makefile (revision 559554) +++ devel/doxygen/Makefile (working copy) @@ -2,20 +2,21 @@ # $FreeBSD$ PORTNAME= doxygen -PORTVERSION= 1.8.15 -PORTREVISION= 3 +PORTVERSION= 1.9.0 PORTEPOCH= 2 CATEGORIES= devel -MASTER_SITES= http://doxygen.nl/files/ +MASTER_SITES= SF/${PORTNAME}/rel-${PORTVERSION} \ + http://doxygen.nl/files/ + EXTRACT_SUFX= .src.tar.gz -MAINTAINER= cyberbotx@cyberbotx.com +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++11-lang iconv python shebangfix +USES= bison cmake:noninja compiler:c++14-lang iconv python shebangfix ALL_TARGET= all CMAKE_ARGS+= -DDOC_INSTALL_DIR:PATH=${DOCSDIR_REL} @@ -48,7 +49,7 @@ QT5_USES= qt:5 QT5_USE= QT=core,widgets,gui,xml,qmake_build,buildtools_build -QT5_CMAKE_ON= -Dbuild_wizard:BOOLEAN=true +QT5_CMAKE_BOOL= build_wizard QT5_PLIST_FILES= bin/doxywizard SEARCH_CMAKE_BOOL= build_search @@ -56,8 +57,4 @@ SEARCH_PLIST_FILES= bin/doxyindexer \ bin/doxysearch.cgi -post-patch: - @${REINPLACE_CMD} -e '/PERL_PATH/ s|/usr/bin/perl|${perl_CMD}|' \ - ${WRKSRC}/src/config.xml - .include Index: devel/doxygen/distinfo =================================================================== --- devel/doxygen/distinfo (revision 559554) +++ devel/doxygen/distinfo (working copy) @@ -1,3 +1,3 @@ -TIMESTAMP = 1550430912 -SHA256 (doxygen-1.8.15.src.tar.gz) = bd9c0ec462b6a9b5b41ede97bede5458e0d7bb40d4cfa27f6f622eb33c59245d -SIZE (doxygen-1.8.15.src.tar.gz) = 5097791 +TIMESTAMP = 1609267206 +SHA256 (doxygen-1.9.0.src.tar.gz) = 636bab2c3c85603302600ed9b95425717aee776e56a3215325fcce15bbfdaef6 +SIZE (doxygen-1.9.0.src.tar.gz) = 5118869 Index: devel/doxygen/files/patch-CMakeLists.txt =================================================================== --- devel/doxygen/files/patch-CMakeLists.txt (revision 559554) +++ devel/doxygen/files/patch-CMakeLists.txt (working copy) @@ -1,10 +1,10 @@ ---- CMakeLists.txt.orig 2015-06-16 17:42:32 UTC +--- CMakeLists.txt.orig 2020-12-21 14:08:57 UTC +++ CMakeLists.txt -@@ -122,7 +122,6 @@ if (win_static) - endif() +@@ -169,7 +169,6 @@ endif() + include(cmake/CompilerWarnings.cmake) + include(cmake/Coverage.cmake) - -add_subdirectory(libmd5) - add_subdirectory(qtools) - add_subdirectory(vhdlparser) - add_subdirectory(src) + add_subdirectory(liblodepng) + add_subdirectory(libmscgen) + add_subdirectory(libversion) Index: devel/doxygen/files/patch-doc-doxygen_manual.tex =================================================================== --- devel/doxygen/files/patch-doc-doxygen_manual.tex (revision 559554) +++ devel/doxygen/files/patch-doc-doxygen_manual.tex (working copy) @@ -1,9 +1,9 @@ ---- doc/doxygen_manual.tex.orig 2015-02-28 15:26:54 UTC +--- doc/doxygen_manual.tex.orig 2019-08-04 11:51:41 UTC +++ doc/doxygen_manual.tex -@@ -13,7 +13,7 @@ - % input used in their production; they are not affected by this license. - - \documentclass{book} +@@ -22,7 +22,7 @@ + \usepackage{array}[=2016-10-06] + \fi + %% -\usepackage[a4paper,left=2.5cm,right=2.5cm,top=2.5cm,bottom=2.5cm]{geometry} +\usepackage[left=2.5cm,right=2.5cm,top=2.5cm,bottom=2.5cm]{geometry} \usepackage{makeidx} Index: devel/doxygen/files/patch-doc_CMakeLists.txt =================================================================== --- devel/doxygen/files/patch-doc_CMakeLists.txt (revision 559554) +++ devel/doxygen/files/patch-doc_CMakeLists.txt (working copy) @@ -1,6 +1,6 @@ ---- doc/CMakeLists.txt.orig 2017-10-31 19:36:00 UTC +--- doc/CMakeLists.txt.orig 2020-11-14 18:13:29 UTC +++ doc/CMakeLists.txt -@@ -168,7 +168,7 @@ install(FILES +@@ -240,7 +240,7 @@ install(FILES "${PROJECT_BINARY_DIR}/man/doxywizard.1" "${PROJECT_BINARY_DIR}/man/doxysearch.1" "${PROJECT_BINARY_DIR}/man/doxyindexer.1" @@ -8,4 +8,4 @@ + DESTINATION man/man1 ) - install(FILES + install(CODE "if(NOT EXISTS \"${PROJECT_BINARY_DIR}/latex/doxygen_manual.pdf\") Index: devel/doxygen/files/patch-md5-Doxyfile =================================================================== --- devel/doxygen/files/patch-md5-Doxyfile (revision 559554) +++ devel/doxygen/files/patch-md5-Doxyfile (working copy) @@ -1,12 +1,10 @@ ---- Doxyfile.orig 2014-08-14 17:46:42 UTC +--- Doxyfile.orig 2019-07-30 13:23:30 UTC +++ Doxyfile -@@ -261,8 +261,7 @@ - MACRO_EXPANSION = YES +@@ -276,7 +276,6 @@ MACRO_EXPANSION = YES EXPAND_ONLY_PREDEF = YES SEARCH_INCLUDES = YES --INCLUDE_PATH = qtools \ -- libmd5 -+INCLUDE_PATH = qtools + INCLUDE_PATH = qtools \ +- libmd5 \ + liblodepng \ + libmscgen INCLUDE_FILE_PATTERNS = - PREDEFINED = - EXPAND_AS_DEFINED = Index: devel/doxygen/files/patch-md5-definition =================================================================== --- devel/doxygen/files/patch-md5-definition (revision 559554) +++ devel/doxygen/files/patch-md5-definition (working copy) @@ -1,6 +1,6 @@ ---- src/definition.cpp.orig 2015-01-03 22:38:57 UTC +--- src/definition.cpp.orig 2020-12-01 19:59:57 UTC +++ src/definition.cpp -@@ -17,6 +17,7 @@ +@@ -22,6 +22,7 @@ #include #include @@ -8,9 +8,9 @@ #include "md5.h" #include #include -@@ -537,13 +538,11 @@ void Definition::writeDocAnchorsToTagFil +@@ -446,13 +447,11 @@ void DefinitionImpl::writeDocAnchorsToTagFile(FTextStr - bool Definition::_docsAlreadyAdded(const QCString &doc,QCString &sigList) + bool DefinitionImpl::_docsAlreadyAdded(const QCString &doc,QCString &sigList) { - uchar md5_sig[16]; QCString sigStr(33); Index: devel/doxygen/files/patch-md5-dirdef =================================================================== --- devel/doxygen/files/patch-md5-dirdef (revision 559554) +++ devel/doxygen/files/patch-md5-dirdef (working copy) @@ -1,4 +1,4 @@ ---- src/dirdef.cpp.orig 2015-01-03 22:38:57 UTC +--- src/dirdef.cpp.orig 2020-11-27 20:27:34 UTC +++ src/dirdef.cpp @@ -1,3 +1,4 @@ +#include @@ -5,7 +5,7 @@ #include "md5.h" #include "dirdef.h" -@@ -81,10 +82,8 @@ void DirDef::addFile(FileDef *fd) +@@ -167,10 +168,8 @@ void DirDefImpl::sort() static QCString encodeDirName(const QCString &anchor) { // convert to md5 hash Index: devel/doxygen/files/patch-md5-dot =================================================================== --- devel/doxygen/files/patch-md5-dot (revision 559554) +++ devel/doxygen/files/patch-md5-dot (nonexistent) @@ -1,70 +0,0 @@ ---- src/dot.cpp.orig 2016-05-10 19:51:52 UTC -+++ src/dot.cpp -@@ -39,6 +39,7 @@ - #include "dirdef.h" - #include "vhdldocgen.h" - #include "ftextstream.h" -+#include - #include "md5.h" - #include "memberlist.h" - #include "groupdef.h" -@@ -2271,10 +2272,8 @@ void DotGfxHierarchyTable::createGraph(D - } - } - writeGraphFooter(md5stream); -- uchar md5_sig[16]; - QCString sigStr(33); -- MD5Buffer((const unsigned char *)theGraph.data(),theGraph.length(),md5_sig); -- MD5SigToString(md5_sig,sigStr.rawData(),33); -+ MD5Data((const unsigned char *)theGraph.data(),theGraph.length(),sigStr.rawData()); - bool regenerate=FALSE; - if (checkAndUpdateMd5Signature(absBaseName,sigStr) || - !checkDeliverables(absImgName,absMapName)) -@@ -3039,10 +3038,8 @@ QCString computeMd5Signature(DotNode *ro - } - } - writeGraphFooter(md5stream); -- uchar md5_sig[16]; - QCString sigStr(33); -- MD5Buffer((const unsigned char *)buf.data(),buf.length(),md5_sig); -- MD5SigToString(md5_sig,sigStr.rawData(),33); -+ MD5Data((const unsigned char *)buf.data(),buf.length(),sigStr.rawData()); - graphStr=buf.data(); - //printf("md5: %s | file: %s\n",sigStr,baseName.data()); - return sigStr; -@@ -3954,10 +3951,8 @@ QCString DotDirDeps::writeGraph(FTextStr - FTextStream md5stream(&theGraph); - //m_dir->writeDepGraph(md5stream); - writeDotDirDepGraph(md5stream,m_dir,linkRelations); -- uchar md5_sig[16]; - QCString sigStr(33); -- MD5Buffer((const unsigned char *)theGraph.data(),theGraph.length(),md5_sig); -- MD5SigToString(md5_sig,sigStr.rawData(),33); -+ MD5Data((const unsigned char *)theGraph.data(),theGraph.length(),sigStr.rawData()); - bool regenerate=FALSE; - if (checkAndUpdateMd5Signature(absBaseName,sigStr) || - !checkDeliverables(graphFormat==GOF_BITMAP ? absImgName : -@@ -4099,10 +4094,8 @@ void generateGraphLegend(const char *pat - md5stream << " Node18 -> Node9 [dir=\"back\",color=\"darkorchid3\",fontsize=\"" << FONTSIZE << "\",style=\"dashed\",label=\"m_usedClass\",fontname=\"" << FONTNAME << "\"];\n"; - md5stream << " Node18 [shape=\"box\",label=\"Used\",fontsize=\"" << FONTSIZE << "\",height=0.2,width=0.4,fontname=\"" << FONTNAME << "\",color=\"black\",URL=\"$classUsed" << Doxygen::htmlFileExtension << "\"];\n"; - writeGraphFooter(md5stream); -- uchar md5_sig[16]; - QCString sigStr(33); -- MD5Buffer((const unsigned char *)theGraph.data(),theGraph.length(),md5_sig); -- MD5SigToString(md5_sig,sigStr.rawData(),33); -+ MD5Data((const unsigned char *)theGraph.data(),theGraph.length(),sigStr.rawData()); - QCString absBaseName = (QCString)path+"/graph_legend"; - QCString absDotName = absBaseName+".dot"; - QCString imgExt = getDotImageExtension(); -@@ -4507,10 +4500,8 @@ QCString DotGroupCollaboration::writeGra - } - - writeGraphFooter(md5stream); -- uchar md5_sig[16]; - QCString sigStr(33); -- MD5Buffer((const unsigned char *)theGraph.data(),theGraph.length(),md5_sig); -- MD5SigToString(md5_sig,sigStr.rawData(),33); -+ MD5Data((const unsigned char *)theGraph.data(),theGraph.length(),sigStr.rawData()); - QCString imgExt = getDotImageExtension(); - QCString imgFmt = Config_getEnum(DOT_IMAGE_FORMAT); - QCString baseName = m_diskName; Property changes on: devel/doxygen/files/patch-md5-dot ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: devel/doxygen/files/patch-md5-dotgraph =================================================================== --- devel/doxygen/files/patch-md5-dotgraph (nonexistent) +++ devel/doxygen/files/patch-md5-dotgraph (working copy) @@ -0,0 +1,23 @@ +--- src/dotgraph.cpp.orig 2020-10-19 13:24:24 UTC ++++ src/dotgraph.cpp +@@ -16,6 +16,7 @@ + #include "config.h" + #include "doxygen.h" + #include "index.h" ++#include + #include "md5.h" + #include "message.h" + #include "util.h" +@@ -143,10 +144,8 @@ bool DotGraph::prepareDotFile() + + QCString sigStr(33); + uchar md5_sig[16]; +- // calculate md5 +- MD5Buffer((const unsigned char*)m_theGraph.data(), m_theGraph.length(), md5_sig); +- // convert result to a string +- MD5SigToString(md5_sig, sigStr.rawData(), 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 + Property changes on: devel/doxygen/files/patch-md5-dotgraph ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: devel/doxygen/files/patch-md5-memberdef =================================================================== --- devel/doxygen/files/patch-md5-memberdef (revision 559554) +++ devel/doxygen/files/patch-md5-memberdef (working copy) @@ -1,4 +1,4 @@ ---- src/memberdef.cpp.orig 2015-01-03 22:38:57 UTC +--- src/memberdef.cpp.orig 2020-12-26 19:49:45 UTC +++ src/memberdef.cpp @@ -17,6 +17,7 @@ #include @@ -8,7 +8,7 @@ #include "md5.h" #include "memberdef.h" #include "membername.h" -@@ -3326,11 +3327,9 @@ void MemberDef::setAnchor() +@@ -4198,10 +4199,8 @@ void MemberDefImpl::setAnchor() } // convert to md5 hash @@ -15,7 +15,6 @@ - uchar md5_sig[16]; QCString sigStr(33); - MD5Buffer((const unsigned char *)memAnchor.data(),memAnchor.length(),md5_sig); - //printf("memAnchor=%s\n",memAnchor.data()); - MD5SigToString(md5_sig,sigStr.rawData(),33); + MD5Data((const unsigned char *)memAnchor.data(),memAnchor.length(),sigStr.rawData()); m_impl->anc = "a"+sigStr; Index: devel/doxygen/files/patch-md5-membergroup =================================================================== --- devel/doxygen/files/patch-md5-membergroup (revision 559554) +++ devel/doxygen/files/patch-md5-membergroup (working copy) @@ -1,14 +1,14 @@ ---- src/membergroup.cpp.orig 2015-01-03 22:38:57 UTC +--- src/membergroup.cpp.orig 2020-11-28 16:00:56 UTC +++ src/membergroup.cpp -@@ -28,6 +28,7 @@ +@@ -27,6 +27,7 @@ + #include "doxygen.h" #include "docparser.h" - #include "marshal.h" #include "entry.h" +#include #include "md5.h" - //static QCString idToName(int id) -@@ -307,12 +308,10 @@ void MemberGroup::setInGroup(bool b) + MemberGroup::MemberGroup(const Definition *container,int id,const char *hdr,const char *d,const char *docFile,int docLine) +@@ -319,12 +320,10 @@ void MemberGroup::setInGroup(bool b) QCString MemberGroup::anchor() const { Index: devel/doxygen/files/patch-md5-util =================================================================== --- devel/doxygen/files/patch-md5-util (revision 559554) +++ devel/doxygen/files/patch-md5-util (working copy) @@ -1,14 +1,15 @@ ---- src/util.cpp.orig 2015-01-03 22:45:44 UTC +--- src/util.cpp.orig 2020-12-26 14:29:40 UTC +++ src/util.cpp -@@ -19,6 +19,7 @@ - #include - #include +@@ -25,6 +25,8 @@ + #include + #include +#include ++ #include "md5.h" #include -@@ -5335,16 +5336,16 @@ QCString convertNameToFile(const char *n +@@ -3823,16 +3825,16 @@ QCString convertNameToFile(const char *name,bool allow if (resultLen>=128) // prevent names that cannot be created! { // third algorithm based on MD5 hash @@ -17,7 +18,7 @@ - MD5Buffer((const unsigned char *)result.data(),resultLen,md5_sig); - MD5SigToString(md5_sig,sigStr.rawData(),33); + MD5Data((const unsigned char *)result.data(),resultLen,sigStr.rawData()); - result=result.left(128-32)+sigStr; + result=result.left(128-32)+sigStr; } } if (createSubdirs) @@ -26,9 +27,9 @@ int l1Dir=0,l2Dir=0; +#endif - #if MAP_ALGO==ALGO_COUNT + #if MAP_ALGO==ALGO_COUNT // old algorithm, has the problem that after regeneration the -@@ -5375,12 +5376,13 @@ QCString convertNameToFile(const char *n +@@ -3863,12 +3865,13 @@ QCString convertNameToFile(const char *name,bool allow l2Dir = (dirNum>>4)&0xff; #elif MAP_ALGO==ALGO_MD5 // third algorithm based on MD5 hash Index: devel/doxygen/files/patch-src_CMakeLists.txt =================================================================== --- devel/doxygen/files/patch-src_CMakeLists.txt (revision 559554) +++ devel/doxygen/files/patch-src_CMakeLists.txt (working copy) @@ -1,21 +1,19 @@ ---- src/CMakeLists.txt.orig 2015-05-31 19:01:12 UTC +--- src/CMakeLists.txt.orig 2020-12-24 14:02:11 UTC +++ src/CMakeLists.txt -@@ -1,8 +1,7 @@ - # vim:ts=4:sw=4:expandtab:autoindent: +@@ -2,7 +2,6 @@ --include_directories( -+include_directories(BEFORE - ${CMAKE_SOURCE_DIR}/qtools -- ${CMAKE_SOURCE_DIR}/libmd5 - ${CMAKE_SOURCE_DIR}/vhdlparser/ - ${CMAKE_SOURCE_DIR}/src - ${CLANG_INCLUDEDIR} -@@ -229,7 +228,7 @@ target_link_libraries(doxygen - _doxygen + include_directories( + ${PROJECT_SOURCE_DIR}/qtools +- ${PROJECT_SOURCE_DIR}/libmd5 + ${PROJECT_SOURCE_DIR}/liblodepng + ${PROJECT_SOURCE_DIR}/libmscgen + ${PROJECT_SOURCE_DIR}/libversion +@@ -345,7 +344,7 @@ target_link_libraries(doxygen PRIVATE + doxymain doxycfg qtools - md5 + md - vhdlparser - ${SQLITE3_LIBRARIES} - ${ICONV_LIBRARIES} + lodepng + mscgen + doxygen_version Index: devel/doxygen/files/patch-src_formula.cpp =================================================================== --- devel/doxygen/files/patch-src_formula.cpp (revision 559554) +++ devel/doxygen/files/patch-src_formula.cpp (nonexistent) @@ -1,15 +0,0 @@ -Upstream git commit 03daff4 resolving a problem with Ghostscript 9.50. - ---- src/formula.cpp -+++ src/formula.cpp -@@ -193,8 +193,8 @@ void FormulaList::generateBitmaps(const char *path) - // used. - - char gsArgs[4096]; -- sprintf(gsArgs,"-q -g%dx%d -r%dx%dx -sDEVICE=ppmraw " -- "-sOutputFile=%s.pnm -dNOPAUSE -dBATCH -- %s.ps", -+ sprintf(gsArgs,"-q -g%dx%d -r%dx%d -sDEVICE=ppmraw " -+ "-sOutputFile=%s.pnm -dNOPAUSE -dBATCH -dNOSAFER %s.ps", - gx,gy,(int)(scaleFactor*72),(int)(scaleFactor*72), - formBase.data(),formBase.data() - ); Property changes on: devel/doxygen/files/patch-src_formula.cpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: devel/doxygen/files/patch-vhdlparser_CMakeLists.txt =================================================================== --- devel/doxygen/files/patch-vhdlparser_CMakeLists.txt (revision 559554) +++ devel/doxygen/files/patch-vhdlparser_CMakeLists.txt (working copy) @@ -1,11 +1,11 @@ ---- vhdlparser/CMakeLists.txt.orig 2016-05-10 19:51:52 UTC +--- vhdlparser/CMakeLists.txt.orig 2020-11-17 19:19:24 UTC +++ vhdlparser/CMakeLists.txt -@@ -6,7 +6,7 @@ add_custom_command( +@@ -36,7 +36,7 @@ add_custom_command( ) - set_source_files_properties(${GENERATED_SRC}/configvalues.h PROPERTIES GENERATED 1) + set_source_files_properties(${GENERATED_SRC}/VhdlParser_adj.cc PROPERTIES GENERATED 1) --include_directories(${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/qtools ${GENERATED_SRC}) -+include_directories(BEFORE ${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/qtools ${GENERATED_SRC}) +-include_directories(${PROJECT_SOURCE_DIR}/src ${PROJECT_SOURCE_DIR}/qtools ${PROJECT_SOURCE_DIR}/vhdlparser ${GENERATED_SRC}) ++include_directories(BEFORE ${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/qtools ${CMAKE_SOURCE_DIR}/vhdlparser ${GENERATED_SRC}) add_library(vhdlparser STATIC - ${GENERATED_SRC}/configvalues.h CharStream.cc + ParseException.cc