devel/doxygen: update to 1.9.2 release

Disable default runtime hard-depend on LATeX.
It needed only for some science/math apps to render formulas.

Sponsored by:	Netzkommune GmbH

14 files changed, 105 insertions, 89 deletions

diff --git a/devel/doxygen/Makefile b/devel/doxygen/Makefile
index dcc18fcb5dc4..0b5b5c9f31d8 100644
--- a/devel/doxygen/Makefile
+++ b/devel/doxygen/Makefile
@@ -1,7 +1,7 @@
 # Created by: Joep Grooten <joep@di.nl>
 
 PORTNAME=	doxygen
-PORTVERSION=	1.9.1
+PORTVERSION=	1.9.2
 PORTEPOCH=	2
 CATEGORIES=	devel
 MASTER_SITES=	SF/${PORTNAME}/rel-${PORTVERSION} \
@@ -28,7 +28,7 @@ DOS2UNIX_FILES=	doc/translator.py
 PLIST_FILES=	bin/doxygen
 
 OPTIONS_DEFINE=	DOCS GRAPHVIZ LATEX SEARCH QT5
-OPTIONS_DEFAULT=	GRAPHVIZ LATEX
+OPTIONS_DEFAULT=	GRAPHVIZ
 QT5_DESC=	Install Doxywizard GUI with Qt5
 SEARCH_DESC=	Build external search tools (doxysearch and doxyindexer)
 
diff --git a/devel/doxygen/distinfo b/devel/doxygen/distinfo
index 074c9275add9..194d3802bbfe 100644
--- a/devel/doxygen/distinfo
+++ b/devel/doxygen/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1610271185
-SHA256 (doxygen-1.9.1.src.tar.gz) = 67aeae1be4e1565519898f46f1f7092f1973cce8a767e93101ee0111717091d1
-SIZE (doxygen-1.9.1.src.tar.gz) = 5117435
+TIMESTAMP = 1629576293
+SHA256 (doxygen-1.9.2.src.tar.gz) = 060f254bcef48673cc7ccf542736b7455b67c110b30fdaa33512a5b09bbecee5
+SIZE (doxygen-1.9.2.src.tar.gz) = 5076037
diff --git a/devel/doxygen/files/patch-md5-Doxyfile b/devel/doxygen/files/patch-md5-Doxyfile
index d0c967036abc..1d1bdeb5db4e 100644
--- a/devel/doxygen/files/patch-md5-Doxyfile
+++ b/devel/doxygen/files/patch-md5-Doxyfile
@@ -1,10 +1,12 @@
---- Doxyfile.orig	2019-07-30 13:23:30 UTC
+--- Doxyfile.orig	2021-07-30 18:31:20 UTC
 +++ Doxyfile
-@@ -276,7 +276,6 @@ MACRO_EXPANSION        = YES
+@@ -274,8 +274,7 @@ ENABLE_PREPROCESSING   = YES
+ MACRO_EXPANSION        = YES
  EXPAND_ONLY_PREDEF     = YES
  SEARCH_INCLUDES        = YES
- INCLUDE_PATH           = qtools \
--                         libmd5 \
-                          liblodepng \
+-INCLUDE_PATH           = libmd5 \
+-                         liblodepng \
++INCLUDE_PATH           = liblodepng \
                           libmscgen
  INCLUDE_FILE_PATTERNS  =
+ PREDEFINED             =
diff --git a/devel/doxygen/files/patch-md5-definition b/devel/doxygen/files/patch-md5-definition
index a58170937917..f30629f5cf90 100644
--- a/devel/doxygen/files/patch-md5-definition
+++ b/devel/doxygen/files/patch-md5-definition
@@ -1,25 +1,26 @@
---- src/definition.cpp.orig	2020-12-01 19:59:57 UTC
+--- src/definition.cpp.orig	2021-08-17 14:04:29 UTC
 +++ src/definition.cpp
-@@ -22,6 +22,7 @@
+@@ -5,6 +5,7 @@
+ #include <string>
  
  #include <ctype.h>
- #include <qregexp.h>
 +#include <sys/types.h>
  #include "md5.h"
  #include <stdio.h>
  #include <stdlib.h>
-@@ -446,13 +447,11 @@ void DefinitionImpl::writeDocAnchorsToTagFile(FTextStr
+@@ -416,13 +417,11 @@ void DefinitionImpl::writeDocAnchorsToTagFile(TextStre
  
  bool DefinitionImpl::_docsAlreadyAdded(const QCString &doc,QCString &sigList)
  {
 -  uchar md5_sig[16];
-   QCString sigStr(33);
+-  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);
--  MD5SigToString(md5_sig,sigStr.rawData(),33);
+-  MD5SigToString(md5_sig,sigStr);
 +  MD5Data((const unsigned char *)docStr.data(),docStr.length(),sigStr.rawData());
    //printf("%s:_docsAlreadyAdded doc='%s' sig='%s' docSigs='%s'\n",
-   //    name().data(),doc.data(),sigStr.data(),sigList.data());
+   //    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 a83a6157df34..175fbb61f47a 100644
--- a/devel/doxygen/files/patch-md5-dirdef
+++ b/devel/doxygen/files/patch-md5-dirdef
@@ -1,4 +1,4 @@
---- src/dirdef.cpp.orig	2020-11-27 20:27:34 UTC
+--- 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
@@ -14,14 +14,15 @@
  #include "md5.h"
  #include "filename.h"
  #include "doxygen.h"
-@@ -180,10 +182,8 @@ void DirDefImpl::sort()
+@@ -178,10 +180,8 @@ void DirDefImpl::sort()
  static QCString encodeDirName(const QCString &anchor)
  {
    // convert to md5 hash
 -  uchar md5_sig[16];
-   QCString sigStr(33);
+-  char sigStr[33];
 -  MD5Buffer((const unsigned char *)anchor.data(),anchor.length(),md5_sig);
--  MD5SigToString(md5_sig,sigStr.rawData(),33);
+-  MD5SigToString(md5_sig,sigStr);
++  QCString sigStr(33);
 +  MD5Data((const unsigned char *)anchor.data(),anchor.length(),sigStr.rawData());
    return sigStr;
  
diff --git a/devel/doxygen/files/patch-md5-dotgraph b/devel/doxygen/files/patch-md5-dotgraph
index d17e87fe10de..b6cdba85f5c9 100644
--- a/devel/doxygen/files/patch-md5-dotgraph
+++ b/devel/doxygen/files/patch-md5-dotgraph
@@ -1,6 +1,6 @@
---- src/dotgraph.cpp.orig	2020-10-19 13:24:24 UTC
+--- src/dotgraph.cpp.orig	2021-05-12 18:53:13 UTC
 +++ src/dotgraph.cpp
-@@ -16,6 +16,7 @@
+@@ -18,6 +18,7 @@
  #include "config.h"
  #include "doxygen.h"
  #include "index.h"
@@ -8,14 +8,17 @@
  #include "md5.h"
  #include "message.h"
  #include "util.h"
-@@ -143,10 +144,8 @@ bool DotGraph::prepareDotFile()
+@@ -147,12 +148,9 @@ bool DotGraph::prepareDotFile()
+     term("Output dir %s does not exist!\n", m_dir.path().c_str());
+   }
  
-   QCString sigStr(33);
-   uchar md5_sig[16];
+-  char 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);
+-  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());
  
diff --git a/devel/doxygen/files/patch-md5-memberdef b/devel/doxygen/files/patch-md5-memberdef
index 2f555e11a3b6..d42698ae1fb1 100644
--- a/devel/doxygen/files/patch-md5-memberdef
+++ b/devel/doxygen/files/patch-md5-memberdef
@@ -1,22 +1,23 @@
---- src/memberdef.cpp.orig	2020-12-26 19:49:45 UTC
+--- src/memberdef.cpp.orig	2021-08-18 13:55:35 UTC
 +++ src/memberdef.cpp
 @@ -17,6 +17,7 @@
- #include <qglobal.h>
- #include <qregexp.h>
+ #include <stdio.h>
  #include <assert.h>
+ #include <mutex>
 +#include <sys/types.h>
+ 
  #include "md5.h"
  #include "memberdef.h"
- #include "membername.h"
-@@ -4198,10 +4199,8 @@ void MemberDefImpl::setAnchor()
+@@ -4139,10 +4140,8 @@ void MemberDefImpl::setAnchor()
    }
  
    // convert to md5 hash
 -  uchar md5_sig[16];
-   QCString sigStr(33);
+-  char sigStr[33];
 -  MD5Buffer((const unsigned char *)memAnchor.data(),memAnchor.length(),md5_sig);
--  MD5SigToString(md5_sig,sigStr.rawData(),33);
+-  MD5SigToString(md5_sig,sigStr);
++  QCString sigStr(33);
 +  MD5Data((const unsigned char *)memAnchor.data(),memAnchor.length(),sigStr.rawData());
-   m_impl->anc = "a"+sigStr;
+   m_impl->anc = QCString("a")+sigStr;
  }
  
diff --git a/devel/doxygen/files/patch-md5-membergroup b/devel/doxygen/files/patch-md5-membergroup
index 0753b0e3026a..8b37b528a9df 100644
--- a/devel/doxygen/files/patch-md5-membergroup
+++ b/devel/doxygen/files/patch-md5-membergroup
@@ -1,4 +1,4 @@
---- src/membergroup.cpp.orig	2020-11-28 16:00:56 UTC
+--- src/membergroup.cpp.orig	2021-08-02 18:54:15 UTC
 +++ src/membergroup.cpp
 @@ -27,6 +27,7 @@
  #include "doxygen.h"
@@ -7,18 +7,19 @@
 +#include <sys/types.h>
  #include "md5.h"
  
- 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)
+ 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];
-   QCString sigStr(33);
+-  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.rawData(),33);
+-  MD5SigToString(md5_sig,sigStr);
 +  MD5Data((const unsigned char *)locHeader.data(),locHeader.length(),sigStr.rawData());
-   return "amgrp"+sigStr;
+   return QCString("amgrp")+sigStr;
  }
  
diff --git a/devel/doxygen/files/patch-md5-util b/devel/doxygen/files/patch-md5-util
index 160c07832ee9..6cb1259a57e1 100644
--- a/devel/doxygen/files/patch-md5-util
+++ b/devel/doxygen/files/patch-md5-util
@@ -1,21 +1,22 @@
---- src/util.cpp.orig	2020-12-26 14:29:40 UTC
+--- src/util.cpp.orig	2021-08-18 18:55:03 UTC
 +++ src/util.cpp
-@@ -25,6 +25,7 @@
- #include <mutex>
- #include <unordered_set>
+@@ -30,6 +30,7 @@
+ #include <cinttypes>
+ #include <sstream>
  
 +#include <sys/types.h>
  #include "md5.h"
  
- #include <qregexp.h>
-@@ -3812,24 +3813,18 @@ QCString convertNameToFile(const char *name,bool allow
+ #include "regex.h"
+@@ -3638,24 +3639,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];
-       QCString sigStr(33);
+-      char sigStr[33];
 -      MD5Buffer((const unsigned char *)result.data(),resultLen,md5_sig);
--      MD5SigToString(md5_sig,sigStr.rawData(),33);
+-      MD5SigToString(md5_sig,sigStr);
++      QCString sigStr(33);
 +      MD5Data((const unsigned char *)result.data(),resultLen,sigStr.rawData());
        result=result.left(128-32)+sigStr;
      }
@@ -35,5 +36,17 @@
 -    result.prepend(QCString().sprintf("d%x/d%02x/",l1Dir,l2Dir));
 +    result.prepend(QCString().sprintf("d%c/d%c%c/",md5[29],md5[30],md5[31]));
    }
-   //printf("*** convertNameToFile(%s)->%s\n",name,result.data());
+   //printf("*** convertNameToFile(%s)->%s\n",qPrint(name),qPrint(result));
    return result;
+@@ -7251,6 +7246,11 @@ QCString selectBlock(const QCString& s,const QCString 
+ 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)
+   {
diff --git a/devel/doxygen/files/patch-qtools_CMakeLists.txt b/devel/doxygen/files/patch-qtools_CMakeLists.txt
deleted file mode 100644
index ab7b826bdd89..000000000000
--- a/devel/doxygen/files/patch-qtools_CMakeLists.txt
+++ /dev/null
@@ -1,8 +0,0 @@
---- qtools/CMakeLists.txt.orig	2015-05-31 19:01:12 UTC
-+++ qtools/CMakeLists.txt
-@@ -1,4 +1,4 @@
--include_directories(.)
-+include_directories(BEFORE .)
- 
- list(APPEND qtools_src
- qbuffer.cpp
diff --git a/devel/doxygen/files/patch-src_CMakeLists.txt b/devel/doxygen/files/patch-src_CMakeLists.txt
index e21a2adf3ef4..7e6b1364c26f 100644
--- a/devel/doxygen/files/patch-src_CMakeLists.txt
+++ b/devel/doxygen/files/patch-src_CMakeLists.txt
@@ -1,19 +1,28 @@
---- src/CMakeLists.txt.orig	2020-12-24 14:02:11 UTC
+--- src/CMakeLists.txt.orig	2021-05-12 18:47:52 UTC
 +++ src/CMakeLists.txt
 @@ -2,7 +2,6 @@
  
  include_directories(
-     ${PROJECT_SOURCE_DIR}/qtools
+     ${PROJECT_SOURCE_DIR}/filesystem
 -    ${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
+@@ -69,7 +68,7 @@ set_source_files_properties(${GENERATED_SRC}/configopt
+ 
+ # ce_parse.h
+ add_custom_command(
+-    COMMAND ${BISON_EXECUTABLE} -l -d -p ce_parsexpYY ${CMAKE_CURRENT_LIST_DIR}/constexp.y -o ce_parse.c
++    COMMAND ${BISON_EXECUTABLE} -l -d ${CMAKE_CURRENT_LIST_DIR}/constexp.y -o ce_parse.c
+     DEPENDS ${CMAKE_CURRENT_LIST_DIR}/constexp.y
+     OUTPUT ${GENERATED_SRC}/ce_parse.h
+     WORKING_DIRECTORY ${GENERATED_SRC}
+@@ -353,7 +352,7 @@ endif()
+ target_link_libraries(doxygen PRIVATE
      doxymain
      doxycfg
-     qtools
 -    md5
 +    md
      lodepng
      mscgen
-     doxygen_version
+     xml
diff --git a/devel/doxygen/files/patch-src_constexp.y b/devel/doxygen/files/patch-src_constexp.y
new file mode 100644
index 000000000000..b80f7c177c86
--- /dev/null
+++ b/devel/doxygen/files/patch-src_constexp.y
@@ -0,0 +1,11 @@
+--- src/constexp.y.orig	2021-05-12 18:53:13 UTC
++++ src/constexp.y
+@@ -32,7 +32,7 @@ int constexpYYerror(yyscan_t yyscanner, const char *s)
+ 
+ %}
+ 
+-%name-prefix "constexpYY"
++%define api.prefix {constexpYY}
+ %define api.pure full
+ %lex-param {yyscan_t yyscanner}
+ %parse-param {yyscan_t yyscanner}
diff --git a/devel/doxygen/files/patch-src_htmlgen.cpp b/devel/doxygen/files/patch-src_htmlgen.cpp
deleted file mode 100644
index 003910296556..000000000000
--- a/devel/doxygen/files/patch-src_htmlgen.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-removeEmptyLines() segfaults on empty string
-
-https://bugs.gentoo.org/show_bug.cgi?id=454348
-http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=676423
-
-Patch written by Thibaut Paumard <paumard@users.sourceforge.net>
---- src/htmlgen.cpp
-+++ src/htmlgen.cpp
-@@ -1022,6 +1022,11 @@
- static 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)
-   {
diff --git a/devel/doxygen/files/patch-vhdlparser_CMakeLists.txt b/devel/doxygen/files/patch-vhdlparser_CMakeLists.txt
index 209d02290e8e..3406f6109dec 100644
--- a/devel/doxygen/files/patch-vhdlparser_CMakeLists.txt
+++ b/devel/doxygen/files/patch-vhdlparser_CMakeLists.txt
@@ -1,11 +1,13 @@
---- vhdlparser/CMakeLists.txt.orig	2020-11-17 19:19:24 UTC
+--- vhdlparser/CMakeLists.txt.orig	2021-05-12 18:46:54 UTC
 +++ vhdlparser/CMakeLists.txt
-@@ -36,7 +36,7 @@ add_custom_command(
- )
+@@ -37,8 +37,8 @@ add_custom_command(
  set_source_files_properties(${GENERATED_SRC}/VhdlParser_adj.cc PROPERTIES GENERATED 1)
  
--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})
+ include_directories(
+-	${PROJECT_SOURCE_DIR}/src
+-	${PROJECT_SOURCE_DIR}/vhdlparser
++	BEFORE ${CMAKE_SOURCE_DIR}/src
++	${CMAKE_SOURCE_DIR}/vhdlparser
+ 	${GENERATED_SRC})
  add_library(vhdlparser STATIC
  CharStream.cc
- ParseException.cc