Attachment #256364 for bug #279330




PORTNAME=	doxygen
DISTVERSION=	1.13.1
PORTREVISION=	1
PORTEPOCH=	2
CATEGORIES=	devel
MASTER_SITES=	https://github.com/${PORTNAME}/${PORTNAME}/releases/download/Release_${DISTVERSION:C/\./_/g}/ \
		https://doxygen.nl/files/
DISTNAME=	${PORTNAME}-${DISTVERSION}.src

MAINTAINER=	fluffy@FreeBSD.org
COMMENT=	Documentation system for C, C++, and other languages
WWW=		https://www.doxygen.nl/

LICENSE=	GPLv2
LICENSE_FILE=	${WRKSRC}/LICENSE

USES=		bison cmake compiler:c++17-lang cpe iconv \
		localbase:ldflags python:build sqlite

LIB_DEPENDS=	libspdlog.so:devel/spdlog
CMAKE_ARGS+=	-DDOC_INSTALL_DIR:PATH=${DOCSDIR_REL}

EXTRACT_AFTER_ARGS=	--exclude ${PORTNAME}-${DISTVERSION}/deps/spdlog \
			--exclude ${PORTNAME}-${DISTVERSION}/deps/sqlite3 \
			--no-same-owner --no-same-permissions

WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION}
PLIST_FILES=	bin/doxygen

LDFLAGS+=	-Wl,--as-needed
TEST_TARGET=	test

PORTDOCS=	*
PLIST_FILES=	bin/doxygen \
		share/man/man1/doxygen.1.gz

CMAKE_ON=	CMAKE_DISABLE_FIND_PACKAGE_generateDS \
		use_sys_spdlog \
		use_sys_sqlite3
CMAKE_ARGS=	-DDOC_INSTALL_DIR:PATH=${DOCSDIR_REL} \
		-DGIT_EXECUTABLE:STRING=false \
		-DCMAKE_CTEST_ARGUMENTS="-E;012_cite"

OPTIONS_DEFINE=	DOCS GRAPHVIZ LATEX QT5 SEARCH
OPTIONS_DEFAULT=GRAPHVIZ

QT5_DESC=	Install Doxywizard GUI with QT5
SEARCH_DESC=	Build external search tools (doxysearch and doxyindexer)

DOCS_USES=		ghostscript:build tex

DOCS_ALL_TARGET=	docs
DOCS_BUILD_DEPENDS=	dot:graphics/graphviz
DOCS_CMAKE_BOOL=	build_doc
DOCS_PLIST_FILES=	share/man/man1/doxygen.1.gz \
			share/man/man1/doxyindexer.1.gz \
			share/man/man1/doxysearch.1.gz \
			share/man/man1/doxywizard.1.gz
# Parallel jobs break when the DOCS option is on
DOCS_VARS=		MAKE_JOBS_UNSAFE=yes

PORTDOCS=		*

GRAPHVIZ_RUN_DEPENDS=	dot:graphics/graphviz

LATEX_USES=		tex
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 \
			share/man/man1/doxywizard.1.gz

SEARCH_CMAKE_BOOL=	build_search
SEARCH_LIB_DEPENDS=	libxapian.so:databases/xapian-core
SEARCH_CMAKE_BOOL=	build_search
SEARCH_PLIST_FILES=	bin/doxyindexer \
			bin/doxysearch.cgi \
			share/man/man1/doxyindexer.1.gz \
			share/man/man1/doxysearch.1.gz

post-patch:
	@${REINPLACE_CMD} -e 's|%%DISTVERSION%%|${DISTVERSION:C/\./_/g}|g' \
	     ${PATCH_WRKSRC}/cmake/git_watcher.cmake
	@${REINPLACE_CMD} -e 's|%%DISTVERSION%%|${DISTVERSION:C/\./_/g}|g' \
	    ${PATCH_WRKSRC}/libversion/gitversion.cpp.in

.include <bsd.port.mk>

Lines 1-3 Link Here

(-)b/devel/doxygen/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1673081300	1	TIMESTAMP = 1735859836
2	SHA256 (doxygen-1.9.6.src.tar.gz) = 297f8ba484265ed3ebd3ff3fe7734eb349a77e4f95c8be52ed9977f51dea49df	2	SHA256 (doxygen-1.13.1.src.tar.gz) = b593a17e9f7dd00c253d5bb18f05b84632136e89753b87fe366c858ea63f6e62
3	SIZE (doxygen-1.9.6.src.tar.gz) = 5293513	3	SIZE (doxygen-1.13.1.src.tar.gz) = 8505582

Removed Link Here

(-)a/devel/doxygen/files/patch-CMakeLists.txt (-10 lines)
1	--- CMakeLists.txt.orig 2022-12-20 18:30:03 UTC
2	+++ CMakeLists.txt
3	@@ -197,7 +197,6 @@ include(cmake/Coverage.cmake)
4	include(cmake/CompilerWarnings.cmake)
5	include(cmake/Coverage.cmake)
6
7	-add_subdirectory(libmd5)
8	add_subdirectory(liblodepng)
9	add_subdirectory(libmscgen)
10	add_subdirectory(libversion)




--- addon/doxywizard/CMakeLists.txt.orig	2022-08-24 15:18:42 UTC
+++ addon/doxywizard/CMakeLists.txt
@@ -182,12 +182,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()
 




--- cmake/git_watcher.cmake.orig	2024-08-10 11:20:50 UTC
+++ cmake/git_watcher.cmake
@@ -109,7 +109,7 @@ function(GetGitState _working_dir _state)
             OUTPUT_STRIP_TRAILING_WHITESPACE)
         if(NOT res EQUAL 0)
             set(_success "false")
-            set(_hashvar "GIT-NOTFOUND")
+            set(_hashvar "Release_%%DISTVERSION%%")
         endif()
     
         # Get whether or not the working tree is dirty.
@@ -132,7 +132,7 @@ function(GetGitState _working_dir _state)
         endif()
     else()
         set(_success "false")
-        set(_hashvar "GIT-NOTFOUND")
+        set(_hashvar "Release_%%DISTVERSION%%")
         set(_dirty "false")
     endif()
 




--- doc_internal/Doxyfile.in.orig	2022-12-18 10:39:03 UTC
+++ doc_internal/Doxyfile.in
@@ -298,8 +298,7 @@ SEARCH_INCLUDES        = YES
 MACRO_EXPANSION        = YES
 EXPAND_ONLY_PREDEF     = YES
 SEARCH_INCLUDES        = YES
-INCLUDE_PATH           = @CMAKE_SOURCE_DIR@/libmd5 \
-                         @CMAKE_SOURCE_DIR@/liblodepng \
+INCLUDE_PATH           = @CMAKE_SOURCE_DIR@/liblodepng \
                          @CMAKE_SOURCE_DIR@/libmscgen
 INCLUDE_FILE_PATTERNS  =
 PREDEFINED             =

Removed Link Here

(-)a/devel/doxygen/files/patch-doc_doxygen__manual.tex (-11 lines)
1	--- doc/doxygen_manual.tex.orig 2019-08-04 11:51:41 UTC
2	+++ doc/doxygen_manual.tex
3	@@ -22,7 +22,7 @@
4	\usepackage{array}[=2016-10-06]
5	\fi
6	%%
7	-\usepackage[a4paper,left=2.5cm,right=2.5cm,top=2.5cm,bottom=2.5cm]{geometry}
8	+\usepackage[left=2.5cm,right=2.5cm,top=2.5cm,bottom=2.5cm]{geometry}
9	\usepackage{makeidx}
10	\usepackage{natbib}
11	\usepackage{graphicx}




Hack to avoid "UnicodeDecodeError: 'utf-8' codec can't decode byte 0xb0 in position 45: invalid start byte"
in src/._xmlgen.cpp which is binary. This doesn't seem like it should be present at the time the docs
are generated, but this is simpler for now.
--- doc/translator.py.orig	2023-01-07 08:48:38 UTC
+++ doc/translator.py
@@ -1459,10 +1459,13 @@ class TrManager:
 
         # Read content of the file as one string.
         assert os.path.isfile(fname)
-        f = xopen(fname)
-        cont = f.read()
-        cont = ''.join(cont.split('\n')) # otherwise the 'match' function won't work.
-        f.close()
+        try:
+            with xopen(fname) as f:
+                cont = f.read()
+                cont = ''.join(cont.split('\n')) # otherwise the 'match' function won't work.
+        except UnicodeDecodeError:
+            print("Skipping {0} because of decoding errors".format(fname))
+            return
 
         # Remove the items for identifiers that were found in the file.
         while lst_in:

Added Link Here

(-)b/devel/doxygen/files/patch-libversion_gitversion.cpp.in (+11 lines)
1	--- libversion/gitversion.cpp.in.orig 2024-08-10 11:09:53 UTC
2	+++ libversion/gitversion.cpp.in
3	@@ -17,7 +17,7 @@ std::string getGitVersion()
4	{
5	gitVersion+="*";
6	}
7	- if (gitVersion=="GIT-NOTFOUND")
8	+ if (gitVersion=="Release_%%DISTVERSION%%")
9	{
10	gitVersion="";
11	}




--- src/CMakeLists.txt.orig	2022-12-20 18:30:03 UTC
+++ src/CMakeLists.txt
@@ -2,7 +2,6 @@ include_directories(
 
 include_directories(
     ${PROJECT_SOURCE_DIR}/filesystem
-    ${PROJECT_SOURCE_DIR}/libmd5
     ${PROJECT_SOURCE_DIR}/liblodepng
     ${PROJECT_SOURCE_DIR}/libmscgen
     ${PROJECT_SOURCE_DIR}/libversion
@@ -69,7 +68,7 @@ add_custom_command(
 
 # 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}
@@ -387,7 +386,7 @@ target_link_libraries(doxygen PRIVATE
 target_link_libraries(doxygen PRIVATE
     doxymain
     doxycfg
-    md5
+    md
     lodepng
     mscgen
     xml

Removed Link Here

(-)a/devel/doxygen/files/patch-src_constexp.y (-11 lines)
1	--- src/constexp.y.orig 2021-05-12 18:53:13 UTC
2	+++ src/constexp.y
3	@@ -32,7 +32,7 @@ int constexpYYerror(yyscan_t yyscanner, const char *s)
4
5	%}
6
7	-%name-prefix "constexpYY"
8	+%define api.prefix {constexpYY}
9	%define api.pure full
10	%lex-param {yyscan_t yyscanner}
11	%parse-param {yyscan_t yyscanner}




--- src/definition.cpp.orig	2022-12-25 19:21:45 UTC
+++ src/definition.cpp
@@ -7,6 +7,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <assert.h>
+#include <sys/types.h>
 
 #include "md5.h"
 #include "regex.h"
@@ -417,13 +418,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(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




--- src/dirdef.cpp.orig	2022-12-18 12:21:42 UTC
+++ src/dirdef.cpp
@@ -14,6 +14,7 @@
  */
 
 #include <algorithm>
+#include <sys/types.h>
 
 #include "dirdef.h"
 #include "md5.h"
@@ -181,10 +182,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(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




--- src/dotgraph.cpp.orig	2022-12-25 19:00:20 UTC
+++ src/dotgraph.cpp
@@ -15,6 +15,7 @@
 
 #include <mutex>
 #include <regex>
+#include <sys/types.h>
 
 #include "config.h"
 #include "doxygen.h"
@@ -155,12 +156,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(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
 




--- src/memberdef.cpp.orig	2022-12-26 12:52:22 UTC
+++ src/memberdef.cpp
@@ -17,6 +17,7 @@
 #include <stdio.h>
 #include <assert.h>
 #include <mutex>
+#include <sys/types.h>
 
 #include "md5.h"
 #include "memberdef.h"
@@ -4149,10 +4150,8 @@ void MemberDefImpl::setAnchor()
   }
 
   // convert to md5 hash
-  uchar md5_sig[16];
-  char sigStr[33];
-  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;
 }
 

Removed Link Here

(-)a/devel/doxygen/files/patch-src_membergroup.cpp (-11 lines)
1	--- src/membergroup.cpp.orig 2022-09-18 12:47:12 UTC
2	+++ src/membergroup.cpp
3	@@ -15,6 +15,8 @@
4	*
5	*/
6
7	+#include <sys/types.h>
8	+
9	#include "membergroup.h"
10	#include "memberlist.h"
11	#include "outputlist.h"




--- src/util.cpp.orig	2022-12-25 18:59:09 UTC
+++ src/util.cpp
@@ -30,6 +30,7 @@
 #include <cinttypes>
 #include <sstream>
 
+#include <sys/types.h>
 #include "md5.h"
 
 #include "regex.h"
@@ -3754,26 +3755,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(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<<createSubdirsLevel)-1;
-
     // compute md5 hash to determine sub directory to use
-    uchar md5_sig[16];
-    MD5Buffer(result.data(),result.length(),md5_sig);
-    l1Dir = md5_sig[14] & 0xf;
-    l2Dir = md5_sig[15] & createSubdirsBitmaskL2;
+    char md5[33];
+    MD5Data((const unsigned char *)result.data(),result.length(),md5);
 
-    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",qPrint(name),qPrint(result));
   return result;
@@ -7429,6 +7422,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)
   {




--- vhdlparser/CMakeLists.txt.orig	2022-12-19 11:34:59 UTC
+++ vhdlparser/CMakeLists.txt
@@ -35,8 +35,8 @@ include_directories(
 set_source_files_properties(${GENERATED_SRC}/VhdlParser_adj.cc PROPERTIES GENERATED 1)
 
 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

Return to bug 279330

Lines 1-33 Link Here

(-)b/devel/doxygen/Makefile (-32 / +47 lines)
1	PORTNAME= doxygen	1	PORTNAME= doxygen
2	PORTVERSION= 1.9.6	2	DISTVERSION= 1.13.1
3	PORTREVISION= 1
4	PORTEPOCH= 2	3	PORTEPOCH= 2
5	CATEGORIES= devel	4	CATEGORIES= devel
6	MASTER_SITES= SF/${PORTNAME}/rel-${PORTVERSION} \	5	MASTER_SITES= https://github.com/${PORTNAME}/${PORTNAME}/releases/download/Release_${DISTVERSION:C/\./_/g}/ \
7	http://doxygen.nl/files/	6	https://doxygen.nl/files/
8	EXTRACT_SUFX= .src.tar.gz	7	DISTNAME= ${PORTNAME}-${DISTVERSION}.src
9		8
10	MAINTAINER= fluffy@FreeBSD.org	9	MAINTAINER= fluffy@FreeBSD.org
11	COMMENT= Documentation system for C, C++, and other languages	10	COMMENT= Documentation system for C, C++, and other languages
12	WWW= https://www.doxygen.org/	11	WWW= https://www.doxygen.nl/
13		12
14	LICENSE= GPLv2	13	LICENSE= GPLv2
15	LICENSE_FILE= ${WRKSRC}/LICENSE	14	LICENSE_FILE= ${WRKSRC}/LICENSE
16		15
17	USES= bison cmake:noninja compiler:c++17-lang cpe dos2unix \	16	USES= bison cmake compiler:c++17-lang cpe iconv \
18	iconv python shebangfix	17	localbase:ldflags python:build sqlite
19		18
20	ALL_TARGET= all	19	LIB_DEPENDS= libspdlog.so:devel/spdlog
21	CMAKE_ARGS+= -DDOC_INSTALL_DIR:PATH=${DOCSDIR_REL}
22		20
23	EXTRACT_AFTER_ARGS= --exclude '*/libmd5'	21	EXTRACT_AFTER_ARGS= --exclude ${PORTNAME}-${DISTVERSION}/deps/spdlog \
		22	--exclude ${PORTNAME}-${DISTVERSION}/deps/sqlite3 \
		23	--no-same-owner --no-same-permissions
24		24
25	DOS2UNIX_FILES= doc/translator.py	25	WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION}
26	PLIST_FILES= bin/doxygen
27		26
28	OPTIONS_DEFINE= DOCS GRAPHVIZ LATEX SEARCH QT5	27	LDFLAGS+= -Wl,--as-needed
29	OPTIONS_DEFAULT= GRAPHVIZ	28	TEST_TARGET= test
30	QT5_DESC= Install Doxywizard GUI with Qt5	29
		30	PORTDOCS= *
		31	PLIST_FILES= bin/doxygen \
		32	share/man/man1/doxygen.1.gz
		33
		34	CMAKE_ON= CMAKE_DISABLE_FIND_PACKAGE_generateDS \
		35	use_sys_spdlog \
		36	use_sys_sqlite3
		37	CMAKE_ARGS= -DDOC_INSTALL_DIR:PATH=${DOCSDIR_REL} \
		38	-DGIT_EXECUTABLE:STRING=false \
		39	-DCMAKE_CTEST_ARGUMENTS="-E;012_cite"
		40
		41	OPTIONS_DEFINE= DOCS GRAPHVIZ LATEX QT5 SEARCH
		42	OPTIONS_DEFAULT=GRAPHVIZ
		43
		44	QT5_DESC= Install Doxywizard GUI with QT5
31	SEARCH_DESC= Build external search tools (doxysearch and doxyindexer)	45	SEARCH_DESC= Build external search tools (doxysearch and doxyindexer)
32		46
33	DOCS_USES= ghostscript:build tex	47	DOCS_USES= ghostscript:build tex
Lines 35-62 DOCS_USE= TEX=base:build,dvipsk:build,pdftex:build Link Here
35	DOCS_ALL_TARGET= docs	49	DOCS_ALL_TARGET= docs
36	DOCS_BUILD_DEPENDS= dot:graphics/graphviz	50	DOCS_BUILD_DEPENDS= dot:graphics/graphviz
37	DOCS_CMAKE_BOOL= build_doc	51	DOCS_CMAKE_BOOL= build_doc
38	DOCS_PLIST_FILES= share/man/man1/doxygen.1.gz \
39	share/man/man1/doxyindexer.1.gz \
40	share/man/man1/doxysearch.1.gz \
41	share/man/man1/doxywizard.1.gz
42	# Parallel jobs break when the DOCS option is on
43	DOCS_VARS= MAKE_JOBS_UNSAFE=yes
44
45	PORTDOCS= *
46		52
47	GRAPHVIZ_RUN_DEPENDS= dot:graphics/graphviz	53	GRAPHVIZ_RUN_DEPENDS= dot:graphics/graphviz
48		54
49	LATEX_USES= tex	55	LATEX_USES= tex
50	LATEX_USE= TEX=base,dvipsk,pdftex	56	LATEX_USE= TEX=base,dvipsk,pdftex
51		57
52	QT5_USES= qt:5	58	QT5_USES= qt:5
53	QT5_USE= QT=core,widgets,gui,xml,qmake:build,buildtools:build	59	QT5_USE= QT=core,widgets,gui,xml,qmake:build,buildtools:build
54	QT5_CMAKE_BOOL= build_wizard	60	QT5_CMAKE_BOOL= build_wizard
55	QT5_PLIST_FILES= bin/doxywizard	61	QT5_PLIST_FILES= bin/doxywizard \
		62	share/man/man1/doxywizard.1.gz
56		63
57	SEARCH_CMAKE_BOOL= build_search
58	SEARCH_LIB_DEPENDS= libxapian.so:databases/xapian-core	64	SEARCH_LIB_DEPENDS= libxapian.so:databases/xapian-core
		65	SEARCH_CMAKE_BOOL= build_search
59	SEARCH_PLIST_FILES= bin/doxyindexer \	66	SEARCH_PLIST_FILES= bin/doxyindexer \
60	bin/doxysearch.cgi	67	bin/doxysearch.cgi \
		68	share/man/man1/doxyindexer.1.gz \
		69	share/man/man1/doxysearch.1.gz
		70
		71	post-patch:
		72	@${REINPLACE_CMD} -e 's\|%%DISTVERSION%%\|${DISTVERSION:C/\./_/g}\|g' \
		73	${PATCH_WRKSRC}/cmake/git_watcher.cmake
		74	@${REINPLACE_CMD} -e 's\|%%DISTVERSION%%\|${DISTVERSION:C/\./_/g}\|g' \
		75	${PATCH_WRKSRC}/libversion/gitversion.cpp.in
61		76
62	.include <bsd.port.mk>	77	.include <bsd.port.mk>

Removed Link Here

(-)a/devel/doxygen/files/patch-addon_doxywizard_CMakeLists.txt (-18 lines)
1	--- addon/doxywizard/CMakeLists.txt.orig 2022-08-24 15:18:42 UTC
2	+++ addon/doxywizard/CMakeLists.txt
3	@@ -182,12 +182,12 @@ if(Qt5Core_FOUND)
4	endif()
5
6	if(Qt5Core_FOUND)
7	- target_link_libraries(doxywizard Qt5::Core Qt5::Gui Qt5::Widgets Qt5::Xml doxygen_version)
8	+ target_link_libraries(doxywizard Qt5::Core Qt5::Gui Qt5::Widgets Qt5::Xml doxygen_version pthread)
9	else()
10	if(Qt6Core_FOUND)
11	- target_link_libraries(doxywizard Qt6::Core Qt6::Gui Qt6::Widgets Qt6::Xml doxygen_version)
12	+ target_link_libraries(doxywizard Qt6::Core Qt6::Gui Qt6::Widgets Qt6::Xml doxygen_version pthread)
13	else()
14	- target_link_libraries(doxywizard ${QT_LIBRARIES} ${QT_QTMAIN_LIBRARY} doxygen_version)
15	+ target_link_libraries(doxywizard ${QT_LIBRARIES} ${QT_QTMAIN_LIBRARY} doxygen_version pthread)
16	endif()
17	endif()
18

Added Link Here

(-)b/devel/doxygen/files/patch-cmake_git__watcher.cmake (+20 lines)
1	--- cmake/git_watcher.cmake.orig 2024-08-10 11:20:50 UTC
2	+++ cmake/git_watcher.cmake
3	@@ -109,7 +109,7 @@ function(GetGitState _working_dir _state)
4	OUTPUT_STRIP_TRAILING_WHITESPACE)
5	if(NOT res EQUAL 0)
6	set(_success "false")
7	- set(_hashvar "GIT-NOTFOUND")
8	+ set(_hashvar "Release_%%DISTVERSION%%")
9	endif()
10
11	# Get whether or not the working tree is dirty.
12	@@ -132,7 +132,7 @@ function(GetGitState _working_dir _state)
13	endif()
14	else()
15	set(_success "false")
16	- set(_hashvar "GIT-NOTFOUND")
17	+ set(_hashvar "Release_%%DISTVERSION%%")
18	set(_dirty "false")
19	endif()
20

Removed Link Here

(-)a/devel/doxygen/files/patch-doc__internal_Doxyfile.in (-12 lines)
1	--- doc_internal/Doxyfile.in.orig 2022-12-18 10:39:03 UTC
2	+++ doc_internal/Doxyfile.in
3	@@ -298,8 +298,7 @@ SEARCH_INCLUDES = YES
4	MACRO_EXPANSION = YES
5	EXPAND_ONLY_PREDEF = YES
6	SEARCH_INCLUDES = YES
7	-INCLUDE_PATH = @CMAKE_SOURCE_DIR@/libmd5 \
8	- @CMAKE_SOURCE_DIR@/liblodepng \
9	+INCLUDE_PATH = @CMAKE_SOURCE_DIR@/liblodepng \
10	@CMAKE_SOURCE_DIR@/libmscgen
11	INCLUDE_FILE_PATTERNS =
12	PREDEFINED =

Removed Link Here

(-)a/devel/doxygen/files/patch-doc_translator.py (-23 lines)
1	Hack to avoid "UnicodeDecodeError: 'utf-8' codec can't decode byte 0xb0 in position 45: invalid start byte"
2	in src/._xmlgen.cpp which is binary. This doesn't seem like it should be present at the time the docs
3	are generated, but this is simpler for now.
4	--- doc/translator.py.orig 2023-01-07 08:48:38 UTC
5	+++ doc/translator.py
6	@@ -1459,10 +1459,13 @@ class TrManager:
7
8	# Read content of the file as one string.
9	assert os.path.isfile(fname)
10	- f = xopen(fname)
11	- cont = f.read()
12	- cont = ''.join(cont.split('\n')) # otherwise the 'match' function won't work.
13	- f.close()
14	+ try:
15	+ with xopen(fname) as f:
16	+ cont = f.read()
17	+ cont = ''.join(cont.split('\n')) # otherwise the 'match' function won't work.
18	+ except UnicodeDecodeError:
19	+ print("Skipping {0} because of decoding errors".format(fname))
20	+ return
21
22	# Remove the items for identifiers that were found in the file.
23	while lst_in:

Removed Link Here

(-)a/devel/doxygen/files/patch-src_CMakeLists.txt (-28 lines)
1	--- src/CMakeLists.txt.orig 2022-12-20 18:30:03 UTC
2	+++ src/CMakeLists.txt
3	@@ -2,7 +2,6 @@ include_directories(
4
5	include_directories(
6	${PROJECT_SOURCE_DIR}/filesystem
7	- ${PROJECT_SOURCE_DIR}/libmd5
8	${PROJECT_SOURCE_DIR}/liblodepng
9	${PROJECT_SOURCE_DIR}/libmscgen
10	${PROJECT_SOURCE_DIR}/libversion
11	@@ -69,7 +68,7 @@ add_custom_command(
12
13	# ce_parse.h
14	add_custom_command(
15	- COMMAND ${BISON_EXECUTABLE} -l -d -p ce_parsexpYY ${CMAKE_CURRENT_LIST_DIR}/constexp.y -o ce_parse.c
16	+ COMMAND ${BISON_EXECUTABLE} -l -d ${CMAKE_CURRENT_LIST_DIR}/constexp.y -o ce_parse.c
17	DEPENDS ${CMAKE_CURRENT_LIST_DIR}/constexp.y
18	OUTPUT ${GENERATED_SRC}/ce_parse.h
19	WORKING_DIRECTORY ${GENERATED_SRC}
20	@@ -387,7 +386,7 @@ target_link_libraries(doxygen PRIVATE
21	target_link_libraries(doxygen PRIVATE
22	doxymain
23	doxycfg
24	- md5
25	+ md
26	lodepng
27	mscgen
28	xml

Removed Link Here

(-)a/devel/doxygen/files/patch-src_definition.cpp (-26 lines)
1	--- src/definition.cpp.orig 2022-12-25 19:21:45 UTC
2	+++ src/definition.cpp
3	@@ -7,6 +7,7 @@
4	#include <stdio.h>
5	#include <stdlib.h>
6	#include <assert.h>
7	+#include <sys/types.h>
8
9	#include "md5.h"
10	#include "regex.h"
11	@@ -417,13 +418,11 @@ bool DefinitionImpl::_docsAlreadyAdded(const QCString
12
13	bool DefinitionImpl::_docsAlreadyAdded(const QCString &doc,QCString &sigList)
14	{
15	- uchar md5_sig[16];
16	- char sigStr[33];
17	+ QCString sigStr(33);
18	// to avoid mismatches due to differences in indenting, we first remove
19	// double whitespaces...
20	QCString docStr = doc.simplifyWhiteSpace();
21	- MD5Buffer(docStr.data(),docStr.length(),md5_sig);
22	- MD5SigToString(md5_sig,sigStr);
23	+ MD5Data((const unsigned char *)docStr.data(),docStr.length(),sigStr.rawData());
24	//printf("%s:_docsAlreadyAdded doc='%s' sig='%s' docSigs='%s'\n",
25	// qPrint(name()),qPrint(doc),qPrint(sigStr),qPrint(sigList));
26	if (sigList.find(sigStr)==-1) // new docs, add signature to prevent re-adding it

Removed Link Here

(-)a/devel/doxygen/files/patch-src_dirdef.cpp (-23 lines)
1	--- src/dirdef.cpp.orig 2022-12-18 12:21:42 UTC
2	+++ src/dirdef.cpp
3	@@ -14,6 +14,7 @@
4	*/
5
6	#include <algorithm>
7	+#include <sys/types.h>
8
9	#include "dirdef.h"
10	#include "md5.h"
11	@@ -181,10 +182,8 @@ static QCString encodeDirName(const QCString &anchor)
12	static QCString encodeDirName(const QCString &anchor)
13	{
14	// convert to md5 hash
15	- uchar md5_sig[16];
16	- char sigStr[33];
17	- MD5Buffer(anchor.data(),anchor.length(),md5_sig);
18	- MD5SigToString(md5_sig,sigStr);
19	+ QCString sigStr(33);
20	+ MD5Data((const unsigned char *)anchor.data(),anchor.length(),sigStr.rawData());
21	return sigStr;
22
23	// old algorithm

Removed Link Here

(-)a/devel/doxygen/files/patch-src_dotgraph.cpp (-26 lines)
1	--- src/dotgraph.cpp.orig 2022-12-25 19:00:20 UTC
2	+++ src/dotgraph.cpp
3	@@ -15,6 +15,7 @@
4
5	#include <mutex>
6	#include <regex>
7	+#include <sys/types.h>
8
9	#include "config.h"
10	#include "doxygen.h"
11	@@ -155,12 +156,9 @@ bool DotGraph::prepareDotFile()
12	term("Output dir %s does not exist!\n", m_dir.path().c_str());
13	}
14
15	- char sigStr[33];
16	- uchar md5_sig[16];
17	- // calculate md5
18	- MD5Buffer(m_theGraph.data(), m_theGraph.length(), md5_sig);
19	- // convert result to a string
20	- MD5SigToString(md5_sig, sigStr);
21	+ QCString sigStr(33);
22	+ // calculate md5 and convert result to a string
23	+ MD5Data((const unsigned char*)m_theGraph.data(), m_theGraph.length(), sigStr.rawData());
24
25	// already queued files are processed again in case the output format has changed
26

Removed Link Here

(-)a/devel/doxygen/files/patch-src_memberdef.cpp (-23 lines)
1	--- src/memberdef.cpp.orig 2022-12-26 12:52:22 UTC
2	+++ src/memberdef.cpp
3	@@ -17,6 +17,7 @@
4	#include <stdio.h>
5	#include <assert.h>
6	#include <mutex>
7	+#include <sys/types.h>
8
9	#include "md5.h"
10	#include "memberdef.h"
11	@@ -4149,10 +4150,8 @@ void MemberDefImpl::setAnchor()
12	}
13
14	// convert to md5 hash
15	- uchar md5_sig[16];
16	- char sigStr[33];
17	- MD5Buffer(memAnchor.data(),memAnchor.length(),md5_sig);
18	- MD5SigToString(md5_sig,sigStr);
19	+ QCString sigStr(33);
20	+ MD5Data((const unsigned char *)memAnchor.data(),memAnchor.length(),sigStr.rawData());
21	m_impl->anc = QCString("a")+sigStr;
22	}
23

Removed Link Here

(-)a/devel/doxygen/files/patch-src_util.cpp (-54 lines)
1	--- src/util.cpp.orig 2022-12-25 18:59:09 UTC
2	+++ src/util.cpp
3	@@ -30,6 +30,7 @@
4	#include <cinttypes>
5	#include <sstream>
6
7	+#include <sys/types.h>
8	#include "md5.h"
9
10	#include "regex.h"
11	@@ -3754,26 +3755,18 @@ QCString convertNameToFile(const QCString &name,bool a
12	if (resultLen>=128) // prevent names that cannot be created!
13	{
14	// third algorithm based on MD5 hash
15	- uchar md5_sig[16];
16	- char sigStr[33];
17	- MD5Buffer(result.data(),resultLen,md5_sig);
18	- MD5SigToString(md5_sig,sigStr);
19	+ QCString sigStr(33);
20	+ MD5Data((const unsigned char *)result.data(),resultLen,sigStr.rawData());
21	result=result.left(128-32)+sigStr;
22	}
23	}
24	if (createSubdirs)
25	{
26	- int l1Dir=0,l2Dir=0;
27	- int createSubdirsLevel = Config_getInt(CREATE_SUBDIRS_LEVEL);
28	- int createSubdirsBitmaskL2 = (1<<createSubdirsLevel)-1;
29	-
30	// compute md5 hash to determine sub directory to use
31	- uchar md5_sig[16];
32	- MD5Buffer(result.data(),result.length(),md5_sig);
33	- l1Dir = md5_sig[14] & 0xf;
34	- l2Dir = md5_sig[15] & createSubdirsBitmaskL2;
35	+ char md5[33];
36	+ MD5Data((const unsigned char *)result.data(),result.length(),md5);
37
38	- result.prepend(QCString().sprintf("d%x/d%02x/",l1Dir,l2Dir));
39	+ result.prepend(QCString().sprintf("d%c/d%c%c/",md5[29],md5[30],md5[31]));
40	}
41	//printf("*** convertNameToFile(%s)->%s\n",qPrint(name),qPrint(result));
42	return result;
43	@@ -7429,6 +7422,11 @@ QCString removeEmptyLines(const QCString &s)
44	QCString removeEmptyLines(const QCString &s)
45	{
46	BufStr out(s.length()+1);
47	+ if (s.length()==0)
48	+ {
49	+ out.addChar('\0');
50	+ return out.data();
51	+ }
52	const char *p=s.data();
53	if (p)
54	{

Removed Link Here

(-)a/devel/doxygen/files/patch-vhdlparser_CMakeLists.txt (-13 lines)
1	--- vhdlparser/CMakeLists.txt.orig 2022-12-19 11:34:59 UTC
2	+++ vhdlparser/CMakeLists.txt
3	@@ -35,8 +35,8 @@ include_directories(
4	set_source_files_properties(${GENERATED_SRC}/VhdlParser_adj.cc PROPERTIES GENERATED 1)
5
6	include_directories(
7	- ${PROJECT_SOURCE_DIR}/src
8	- ${PROJECT_SOURCE_DIR}/vhdlparser
9	+ BEFORE ${CMAKE_SOURCE_DIR}/src
10	+ ${CMAKE_SOURCE_DIR}/vhdlparser
11	${GENERATED_SRC})
12	add_library(vhdlparser STATIC
13	CharStream.cc