Mon Feb 1 09:33:12 2021 UTC ()
htmldoc: update to 1.9.11.

ChangeLog:

# Changes in HTMLDOC v1.9.11

- Added high-resolution desktop icons for Linux.
- Updated the internal HTTP library to fix truncation of redirection URLs
  (Issue #396)
- Fixed a regression in the handling of character entities for UTF-8 input
  (Issue #401)
- The `--numbered` option did not work when the table-of-contents was disabled
  (Issue #405)

# Changes in HTMLDOC v1.9.10

- Updated local zlib to v1.2.11.
- Updated local libpng to v1.6.37.
- Fixed packaging issues on macOS and Windows (Issue #377, Issue #386)
- Now ignore sRGB profile errors in PNG files (Issue #390)
- The GUI would crash when saving (Issue #391)
- Page comments are now allowed in `pre` text (Issue #394)

# Changes in HTMLDOC v1.9.9

- Fixed a redirection issue - some sites (incorrectly) provide an incomplete
  Location: URL in the HTTP response.
- Fixed https: support on newer versions of Windows (Issue #378)
- Fixed a problem with remote URLs containing spaces (Issue #379)
- Fixed a UTF-8 processing bug for Markdown files (Issue #383)
- Added support for `<FONT FACE="monospace">` (Issue #385)


(fcambus)
diff -r1.48 -r1.49 pkgsrc/www/htmldoc/Makefile
diff -r1.17 -r1.18 pkgsrc/www/htmldoc/Makefile.common
diff -r1.15 -r1.16 pkgsrc/www/htmldoc/distinfo
diff -r1.1 -r1.2 pkgsrc/www/htmldoc/patches/patch-htmldoc_http-addrlist.c
cvs diff -r1.48 -r1.49 pkgsrc/www/htmldoc/Makefile (expand / switch to unified diff)

--- pkgsrc/www/htmldoc/Makefile 2020/05/22 10:56:45 1.48
+++ pkgsrc/www/htmldoc/Makefile 2021/02/01 09:33:12 1.49
@@ -1,7 +1,6 @@ @@ -1,7 +1,6 @@
1# $NetBSD: Makefile,v 1.48 2020/05/22 10:56:45 adam Exp $ 1# $NetBSD: Makefile,v 1.49 2021/02/01 09:33:12 fcambus Exp $
2 2
3CONFIGURE_ARGS+= --without-gui 3CONFIGURE_ARGS+= --without-gui
4 4
5PKGREVISION= 2 
6.include "${.CURDIR}/Makefile.common" 5.include "${.CURDIR}/Makefile.common"
7.include "../../mk/bsd.pkg.mk" 6.include "../../mk/bsd.pkg.mk"
cvs diff -r1.17 -r1.18 pkgsrc/www/htmldoc/Makefile.common (expand / switch to unified diff)

--- pkgsrc/www/htmldoc/Makefile.common 2020/03/07 23:23:07 1.17
+++ pkgsrc/www/htmldoc/Makefile.common 2021/02/01 09:33:12 1.18
@@ -1,24 +1,24 @@ @@ -1,24 +1,24 @@
1# $NetBSD: Makefile.common,v 1.17 2020/03/07 23:23:07 fcambus Exp $ 1# $NetBSD: Makefile.common,v 1.18 2021/02/01 09:33:12 fcambus Exp $
2# 2#
3# used by www/htmldoc/Makefile 3# used by www/htmldoc/Makefile
4# used by www/htmldoc-x11/Makefile 4# used by www/htmldoc-x11/Makefile
5 5
6# This section contains variables that might be overridden. 6# This section contains variables that might be overridden.
7PKGNAME?= ${PKGNAME_BASE}-${VERSION} 7PKGNAME?= ${PKGNAME_BASE}-${VERSION}
8COMMENT?= Converts HTML to indexed HTML, PDF and/or PostScript 8COMMENT?= Converts HTML to indexed HTML, PDF and/or PostScript
9 9
10# Normal package Makefile contents follow. 10# Normal package Makefile contents follow.
11VERSION= 1.9.8 11VERSION= 1.9.11
12PKGNAME_BASE= htmldoc 12PKGNAME_BASE= htmldoc
13CATEGORIES= www 13CATEGORIES= www
14DIST_SUBDIR= ${PKGNAME_BASE} 14DIST_SUBDIR= ${PKGNAME_BASE}
15DISTNAME= v${VERSION} 15DISTNAME= v${VERSION}
16MASTER_SITES= ${MASTER_SITE_GITHUB:=michaelrsweet/htmldoc/archive/} 16MASTER_SITES= ${MASTER_SITE_GITHUB:=michaelrsweet/htmldoc/archive/}
17EXTRACT_USING= bsdtar 17EXTRACT_USING= bsdtar
18 18
19MAINTAINER= pkgsrc-users@NetBSD.org 19MAINTAINER= pkgsrc-users@NetBSD.org
20HOMEPAGE= https://www.msweet.org/htmldoc/ 20HOMEPAGE= https://www.msweet.org/htmldoc/
21LICENSE= gnu-gpl-v2 21LICENSE= gnu-gpl-v2
22 22
23PATCHDIR= ${.CURDIR}/../../www/htmldoc/patches 23PATCHDIR= ${.CURDIR}/../../www/htmldoc/patches
24DISTINFO_FILE= ${.CURDIR}/../../www/htmldoc/distinfo 24DISTINFO_FILE= ${.CURDIR}/../../www/htmldoc/distinfo
cvs diff -r1.15 -r1.16 pkgsrc/www/htmldoc/distinfo (expand / switch to unified diff)

--- pkgsrc/www/htmldoc/distinfo 2020/03/07 23:23:07 1.15
+++ pkgsrc/www/htmldoc/distinfo 2021/02/01 09:33:12 1.16
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
1$NetBSD: distinfo,v 1.15 2020/03/07 23:23:07 fcambus Exp $ 1$NetBSD: distinfo,v 1.16 2021/02/01 09:33:12 fcambus Exp $
2 2
3SHA1 (htmldoc/v1.9.8.tar.gz) = be2c6f79a2ffd43ac8e065e8d919fc5df519ddb5 3SHA1 (htmldoc/v1.9.11.tar.gz) = 6366646f9d548e1bb1d17f36f07f212ffdac7600
4RMD160 (htmldoc/v1.9.8.tar.gz) = 74408a9a7db74f981489c549b4d6c97c9f0a2b44 4RMD160 (htmldoc/v1.9.11.tar.gz) = 4bb448518ca2957df8c16600c8b77e9e3e85bdc7
5SHA512 (htmldoc/v1.9.8.tar.gz) = 5866f9a0fe38375ecb59dda72e9b83f4bd7303a216148a3d190c19371e28854138dc70291dcb519a8846927b944ffca8421970f96a34c51971207f33319a4aeb 5SHA512 (htmldoc/v1.9.11.tar.gz) = 008e0af36a05c1f358ddc344643e75e85dafc0b5213ffa693a3958a00082a935a957caf8f9790f4c2f0631436048f70e6c2ff2bb320977a9ba2c6d26d59ff0ed
6Size (htmldoc/v1.9.8.tar.gz) = 4498405 bytes 6Size (htmldoc/v1.9.11.tar.gz) = 4505305 bytes
7SHA1 (patch-htmldoc_http-addrlist.c) = 7c2db39b43cdbb31da0d884fbbba63e2ab258354 7SHA1 (patch-htmldoc_http-addrlist.c) = 5c36f78655838e633f805b6529a2a3183e10288a
cvs diff -r1.1 -r1.2 pkgsrc/www/htmldoc/patches/patch-htmldoc_http-addrlist.c (expand / switch to unified diff)

--- pkgsrc/www/htmldoc/patches/patch-htmldoc_http-addrlist.c 2019/10/18 11:02:13 1.1
+++ pkgsrc/www/htmldoc/patches/patch-htmldoc_http-addrlist.c 2021/02/01 09:33:12 1.2
@@ -1,15 +1,15 @@ @@ -1,15 +1,15 @@
1$NetBSD: patch-htmldoc_http-addrlist.c,v 1.1 2019/10/18 11:02:13 micha Exp $ 1$NetBSD: patch-htmldoc_http-addrlist.c,v 1.2 2021/02/01 09:33:12 fcambus Exp $
2 2
3Portability fix, s6_addr32 is not a standard. 3Portability fix, s6_addr32 is not a standard.
4 4
5--- htmldoc/http-addrlist.c.orig 2019-10-08 18:56:34.000000000 +0000 5--- htmldoc/http-addrlist.c.orig 2021-02-01 09:20:13.146886279 +0000
6+++ htmldoc/http-addrlist.c 6+++ htmldoc/http-addrlist.c
7@@ -804,7 +804,7 @@ httpAddrGetList(const char *hostname, /* 7@@ -866,7 +866,7 @@ httpAddrGetList(const char *hostname, /*
8 # ifdef WIN32 8 # ifdef _WIN32
9 temp->addr.ipv6.sin6_addr.u.Byte[15] = 1; 9 temp->addr.ipv6.sin6_addr.u.Byte[15] = 1;
10 # else 10 # else
11- temp->addr.ipv6.sin6_addr.s6_addr32[3] = htonl(1); 11- temp->addr.ipv6.sin6_addr.s6_addr32[3] = htonl(1);
12+ temp->addr.ipv6.sin6_addr.s6_addr[15] = 1; 12+ temp->addr.ipv6.sin6_addr.s6_addr[15] = 1;
13 # endif /* WIN32 */ 13 # endif /* _WIN32 */
14  14
15 if (!first) 15 if (!first)