--- Makefile (revision 523595) +++ Makefile (working copy) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= doxygen -PORTVERSION= 1.8.15 -PORTREVISION= 3 +PORTVERSION= 1.8.17 PORTEPOCH= 2 CATEGORIES= devel MASTER_SITES= http://doxygen.nl/files/ @@ -15,7 +14,7 @@ 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 +47,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 --- distinfo (revision 523595) +++ 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 = 1579468939 +SHA256 (doxygen-1.8.17.src.tar.gz) = 2cba988af2d495541cbbe5541b3bee0ee11144dcb23a81eada19f5501fd8b599 +SIZE (doxygen-1.8.17.src.tar.gz) = 5138888 --- files/patch-CMakeLists.txt (revision 523595) +++ files/patch-CMakeLists.txt (working copy) @@ -1,10 +1,10 @@ ---- CMakeLists.txt.orig 2015-06-16 17:42:32 UTC +--- CMakeLists.txt.orig 2019-07-30 13:10:10 UTC +++ CMakeLists.txt -@@ -122,7 +122,6 @@ if (win_static) +@@ -152,7 +152,6 @@ if (win_static) endif() -add_subdirectory(libmd5) - add_subdirectory(qtools) - add_subdirectory(vhdlparser) - add_subdirectory(src) + add_subdirectory(liblodepng) + add_subdirectory(libmscgen) + add_subdirectory(libversion) --- files/patch-doc-doxygen_manual.tex (revision 523595) +++ 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} --- files/patch-md5-Doxyfile (revision 523595) +++ 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 = --- files/patch-md5-dot (revision 523595) +++ 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; --- files/patch-md5-dotgraph (nonexistent) +++ files/patch-md5-dotgraph (working copy) @@ -0,0 +1,23 @@ +--- src/dotgraph.cpp.orig 2019-06-13 19:36:00 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" +@@ -153,10 +154,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 + --- files/patch-md5-memberdef (revision 523595) +++ 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 2019-12-27 17:52:30 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() +@@ -4283,10 +4284,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; --- files/patch-src_CMakeLists.txt (revision 523595) +++ files/patch-src_CMakeLists.txt (working copy) @@ -1,4 +1,4 @@ ---- src/CMakeLists.txt.orig 2015-05-31 19:01:12 UTC +--- src/CMakeLists.txt.orig 2019-08-08 12:11:46 UTC +++ src/CMakeLists.txt @@ -1,8 +1,7 @@ # vim:ts=4:sw=4:expandtab:autoindent: @@ -7,15 +7,15 @@ +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 + ${CMAKE_SOURCE_DIR}/liblodepng + ${CMAKE_SOURCE_DIR}/libmscgen + ${CMAKE_SOURCE_DIR}/libversion +@@ -277,7 +276,7 @@ target_link_libraries(doxygen _doxygen doxycfg qtools - md5 + md - vhdlparser - ${SQLITE3_LIBRARIES} - ${ICONV_LIBRARIES} + lodepng + mscgen + doxygen_version --- files/patch-src_formula.cpp (revision 523595) +++ 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() - ); --- files/patch-vhdlparser_CMakeLists.txt (revision 523595) +++ files/patch-vhdlparser_CMakeLists.txt (working copy) @@ -1,11 +1,8 @@ ---- vhdlparser/CMakeLists.txt.orig 2016-05-10 19:51:52 UTC +--- vhdlparser/CMakeLists.txt.orig 2019-06-10 08:17:24 UTC +++ vhdlparser/CMakeLists.txt -@@ -6,7 +6,7 @@ add_custom_command( - ) - set_source_files_properties(${GENERATED_SRC}/configvalues.h PROPERTIES GENERATED 1) - +@@ -1,4 +1,4 @@ -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}) add_library(vhdlparser STATIC - ${GENERATED_SRC}/configvalues.h CharStream.cc + ParseException.cc