CVS commit: pkgsrc/www/htmldoc

["Frederic Cambus" <fcambus%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   fcambus
Date:           Mon Feb  1 09:33:12 UTC 2021

Modified Files:
        pkgsrc/www/htmldoc: Makefile Makefile.common distinfo
        pkgsrc/www/htmldoc/patches: patch-htmldoc_http-addrlist.c

Log Message:
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)


To generate a diff of this commit:
cvs rdiff -u -r1.48 -r1.49 pkgsrc/www/htmldoc/Makefile
cvs rdiff -u -r1.17 -r1.18 pkgsrc/www/htmldoc/Makefile.common
cvs rdiff -u -r1.15 -r1.16 pkgsrc/www/htmldoc/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/www/htmldoc/patches/patch-htmldoc_http-addrlist.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/www/htmldoc/Makefile
diff -u pkgsrc/www/htmldoc/Makefile:1.48 pkgsrc/www/htmldoc/Makefile:1.49
--- pkgsrc/www/htmldoc/Makefile:1.48    Fri May 22 10:56:45 2020
+++ pkgsrc/www/htmldoc/Makefile Mon Feb  1 09:33:12 2021
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.48 2020/05/22 10:56:45 adam Exp $
+# $NetBSD: Makefile,v 1.49 2021/02/01 09:33:12 fcambus Exp $
 
 CONFIGURE_ARGS+=       --without-gui
 
-PKGREVISION= 2
 .include "${.CURDIR}/Makefile.common"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/www/htmldoc/Makefile.common
diff -u pkgsrc/www/htmldoc/Makefile.common:1.17 pkgsrc/www/htmldoc/Makefile.common:1.18
--- pkgsrc/www/htmldoc/Makefile.common:1.17     Sat Mar  7 23:23:07 2020
+++ pkgsrc/www/htmldoc/Makefile.common  Mon Feb  1 09:33:12 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.17 2020/03/07 23:23:07 fcambus Exp $
+# $NetBSD: Makefile.common,v 1.18 2021/02/01 09:33:12 fcambus Exp $
 #
 # used by www/htmldoc/Makefile
 # used by www/htmldoc-x11/Makefile
@@ -8,7 +8,7 @@ PKGNAME?=       ${PKGNAME_BASE}-${VERSION}
 COMMENT?=      Converts HTML to indexed HTML, PDF and/or PostScript
 
 # Normal package Makefile contents follow.
-VERSION=       1.9.8
+VERSION=       1.9.11
 PKGNAME_BASE=  htmldoc
 CATEGORIES=    www
 DIST_SUBDIR=   ${PKGNAME_BASE}

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

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