Hi Benoit, here's an update of htmldoc to 1.9.17. Here are some of the
main changes from CHANGES.md:
- Added new `--pre-indent` option
- Now link to CUPS library instead of embedding its HTTP code.
- Updated PostScript and PDF date/time information to use UTC
And a few fixes are mentioned as well:
- Fixed a markdown parsing bug
- Fixed a relative URL handling bug
- Fixed a crash bug with bad title images
- Fixed some minor CodeQL warnings.
The main change in our port is that we add a new LIB_DEPENDS on
print/cups,-libs (and ssl and crypto can be removed from WANTLIB as a
result).
It also looks like the patch to work around an llvm 8 bug can go away at
this point? Indeed the build did not freeze for me when I compiled on an
amd64 box.
ok on the update below?
Index: Makefile
===================================================================
RCS file: /cvs/ports/print/htmldoc/Makefile,v
diff -u -p -u -r1.57 Makefile
--- Makefile 27 Sep 2023 14:32:02 -0000 1.57
+++ Makefile 19 Jan 2024 23:02:40 -0000
@@ -1,6 +1,6 @@
COMMENT = convert HTML pages to PDF/PS format
-V = 1.9.16
+V = 1.9.17
DISTNAME = htmldoc-${V}
CATEGORIES = print www
@@ -11,7 +11,7 @@ MAINTAINER = Benoit Lecocq <benoit@open
# GPLv2
PERMIT_PACKAGE = Yes
-WANTLIB += c crypto m ssl z jpeg png ${COMPILER_LIBCXX}
+WANTLIB += ${COMPILER_LIBCXX} c cups jpeg m png z
COMPILER = base-clang ports-gcc base-gcc
@@ -19,7 +19,8 @@ DISTFILES = ${DISTNAME}-source${EXTRACT
SITES =
https://github.com/michaelrsweet/htmldoc/releases/download/v${V}/
LIB_DEPENDS = graphics/jpeg \
- graphics/png
+ graphics/png \
+ print/cups,-libs
CONFIGURE_STYLE = gnu dest
CONFIGURE_ARGS += --without-gui --disable-gnutls
Index: distinfo
===================================================================
RCS file: /cvs/ports/print/htmldoc/distinfo,v
diff -u -p -u -r1.19 distinfo
--- distinfo 3 Jun 2022 09:24:54 -0000 1.19
+++ distinfo 19 Jan 2024 23:02:40 -0000
@@ -1,2 +1,2 @@
-SHA256 (htmldoc-1.9.16-source.tar.gz) =
sQhjhcTBbNq+QoqxqgQSZrrr7jnyIs9qOUe0ECe32uM=
-SIZE (htmldoc-1.9.16-source.tar.gz) = 3389563
+SHA256 (htmldoc-1.9.17-source.tar.gz) =
oEpxy6RTyE3+YokYcov0vEB33BeyfbgjCYXj5EdGpmM=
+SIZE (htmldoc-1.9.17-source.tar.gz) = 3289176
Index: patches/patch-htmldoc_http_c
===================================================================
RCS file: patches/patch-htmldoc_http_c
diff -N patches/patch-htmldoc_http_c
--- patches/patch-htmldoc_http_c 11 Mar 2022 19:51:02 -0000 1.4
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-Index: htmldoc/http.c
---- htmldoc/http.c.orig
-+++ htmldoc/http.c
-@@ -31,6 +31,10 @@
- # include <poll.h>
- #endif /* HAVE_POLL */
-
-+#if defined(__OpenBSD__)
-+# define CUPS_RAND() arc4random()
-+# define CUPS_SRAND(v)
-+#endif
-
- /*
- * Some operating systems have done away with the Fxxxx constants for
Index: patches/patch-htmldoc_ps-pdf_cxx
===================================================================
RCS file: patches/patch-htmldoc_ps-pdf_cxx
diff -N patches/patch-htmldoc_ps-pdf_cxx
--- patches/patch-htmldoc_ps-pdf_cxx 11 Mar 2022 19:51:02 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,16 +0,0 @@
-Work around an LLVM 8.0.0 optimizer bug that causes htmldoc to spin.
-https://github.com/michaelrsweet/htmldoc/issues/349
-https://bugs.llvm.org/show_bug.cgi?id=41998
-
-Index: htmldoc/ps-pdf.cxx
---- htmldoc/ps-pdf.cxx.orig
-+++ htmldoc/ps-pdf.cxx
-@@ -5440,7 +5440,7 @@ parse_pre(tree_t *t, /* I - Tree to parse */
- line[10240],
- *lineptr,
- *dataptr;
-- int col;
-+ volatile int col;
- float width,
- height,
- rgb[3];
