Update Doxygen to 1.15. This update should also fix the current
issue with fmt. Since Doxygen uses C++20, I believe we can remove
NOT_FOR_ARCHS and BROKEN? I also added more use_sys_* to avoid the
bundled versions.
I don't see any PLIST changes in consumers.
OK?
diff --git a/devel/doxygen-gui/Makefile b/devel/doxygen-gui/Makefile
index 6202cb7039e..1ffe57711e8 100644
--- a/devel/doxygen-gui/Makefile
+++ b/devel/doxygen-gui/Makefile
@@ -1,14 +1,8 @@
-# Memory hog, stuck for days on the same file (configoptions.cpp) during build.
-# XXX check with different optimizer level? see doc/install.doc
-NOT_FOR_ARCHS= m88k sh
-BROKEN-alpha= .got subsegment exceeds 64K
-
COMMENT= GUI front-end for doxygen
-VERSION= 1.14.0
+VERSION= 1.15.0
DISTNAME= doxygen-${VERSION}.src
PKGNAME= doxygen-gui-${VERSION}
-REVISION= 0
CATEGORIES= devel textproc
@@ -22,7 +16,8 @@ PERMIT_PACKAGE= Yes
WANTLIB += ${COMPILER_LIBCXX} GL Qt6Core Qt6Gui Qt6Widgets Qt6Xml
WANTLIB += c m
-COMPILER = base-clang ports-gcc base-gcc
+# C++20
+COMPILER = base-clang ports-gcc
SITES= https://doxygen.nl/files/
diff --git a/devel/doxygen-gui/distinfo b/devel/doxygen-gui/distinfo
index 18957fe72d2..79d73a651e3 100644
--- a/devel/doxygen-gui/distinfo
+++ b/devel/doxygen-gui/distinfo
@@ -1,2 +1,2 @@
-SHA256 (doxygen-1.14.0.src.tar.gz) =
1FNtEasTA3Mn2NAmt19ahrfMsgk+L1RiNfr2H9hua10=
-SIZE (doxygen-1.14.0.src.tar.gz) = 8681251
+SHA256 (doxygen-1.15.0.src.tar.gz) =
qMr+YFhnrUdaryiKOFJ4MHbh34OqvxZIi7+pWAYudEA=
+SIZE (doxygen-1.15.0.src.tar.gz) = 9203196
diff --git a/devel/doxygen/Makefile b/devel/doxygen/Makefile
index ce41a6fc6ad..757db6e1e65 100644
--- a/devel/doxygen/Makefile
+++ b/devel/doxygen/Makefile
@@ -1,11 +1,6 @@
-# Memory hog, stuck for days on the same file (configoptions.cpp) during build.
-# XXX check with different optimizer level? see doc/install.doc
-NOT_FOR_ARCHS= m88k sh
-BROKEN-alpha= .got subsegment exceeds 64K
-
COMMENT= source code documentation generator tool
-VERSION= 1.14.0
+VERSION= 1.15.0
DISTNAME= doxygen-${VERSION}.src
PKGNAME= doxygen-${VERSION}
@@ -18,9 +13,11 @@ MAINTAINER= Rafael Sadowski <[email protected]>
# GPLv2
PERMIT_PACKAGE= Yes
-WANTLIB += ${COMPILER_LIBCXX} c iconv m xapian z
+WANTLIB += ${COMPILER_LIBCXX} c fmt iconv m spdlog sqlite3 xapian
+WANTLIB += z
-COMPILER = base-clang ports-gcc base-gcc
+# C++20
+COMPILER = base-clang ports-gcc
SITES= https://doxygen.nl/files/
@@ -30,7 +27,10 @@ MODULES= devel/cmake \
MODPY_RUNDEP= No
LIB_DEPENDS= converters/libiconv \
- databases/xapian-core
+ databases/sqlite3 \
+ databases/xapian-core \
+ devel/fmt \
+ devel/spdlog
BUILD_DEPENDS= devel/bison \
@@ -45,6 +45,12 @@ CONFIGURE_ARGS= -Dbuild_doc=ON \
CONFIGURE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_Javacc=ON
+CONFIGURE_ARGS+= -Duse_sys_fmt=ON \
+ -Duse_sys_spdlog=ON \
+ -Duse_sys_sqlite3=ON
+
+MODCMAKE_LDFLAGS = -L${LOCALBASE}/lib
+
.if ${MACHINE_ARCH} == "mips64" || ${MACHINE_ARCH} == "mips64el"
CXXFLAGS+= -mxgot
.endif
diff --git a/devel/doxygen/distinfo b/devel/doxygen/distinfo
index 18957fe72d2..79d73a651e3 100644
--- a/devel/doxygen/distinfo
+++ b/devel/doxygen/distinfo
@@ -1,2 +1,2 @@
-SHA256 (doxygen-1.14.0.src.tar.gz) =
1FNtEasTA3Mn2NAmt19ahrfMsgk+L1RiNfr2H9hua10=
-SIZE (doxygen-1.14.0.src.tar.gz) = 8681251
+SHA256 (doxygen-1.15.0.src.tar.gz) =
qMr+YFhnrUdaryiKOFJ4MHbh34OqvxZIi7+pWAYudEA=
+SIZE (doxygen-1.15.0.src.tar.gz) = 9203196
diff --git a/devel/doxygen/patches/patch-doc_CMakeLists_txt
b/devel/doxygen/patches/patch-doc_CMakeLists_txt
index 3a15e53b6d3..8771d9f6b20 100644
--- a/devel/doxygen/patches/patch-doc_CMakeLists_txt
+++ b/devel/doxygen/patches/patch-doc_CMakeLists_txt
@@ -42,7 +42,7 @@ Index: doc/CMakeLists.txt
if (doxygen_BINARY_DIR)
set(DOXYGEN_EXECUTABLE ${doxygen_BINARY_DIR}/bin/doxygen)
-@@ -210,91 +187,3 @@ add_custom_command(
+@@ -215,91 +192,3 @@ add_custom_command(
WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/doc/
)
set_source_files_properties(config.dox PROPERTIES GENERATED 1)
diff --git a/devel/doxygen/patches/patch-src_dirdef_cpp
b/devel/doxygen/patches/patch-src_dirdef_cpp
index 3b2baa2c4ce..f0158d3cabd 100644
--- a/devel/doxygen/patches/patch-src_dirdef_cpp
+++ b/devel/doxygen/patches/patch-src_dirdef_cpp
@@ -5,7 +5,7 @@ in generated filenames.
Index: src/dirdef.cpp
--- src/dirdef.cpp.orig
+++ src/dirdef.cpp
-@@ -222,7 +222,7 @@ static QCString encodeDirName(const QCString &anchor)
+@@ -223,7 +223,7 @@ static QCString encodeDirName(const QCString &anchor)
QCString DirDefImpl::getOutputFileBase() const
{
