CVS commit: pkgsrc/www/htmlcxx

["Kamil Rytarowski" <kamil%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   kamil
Date:           Fri Oct 25 10:29:04 UTC 2019

Modified Files:
        pkgsrc/www/htmlcxx: distinfo
        pkgsrc/www/htmlcxx/patches: patch-html_CharsetConverter.cc

Log Message:
htmlcxx: Fix build on NetBSD 9.99.17

Adapt the local patch for the POSIX iconv(3) API change in new NetBSD.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 pkgsrc/www/htmlcxx/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/www/htmlcxx/patches/patch-html_CharsetConverter.cc

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

Modified files:

Index: pkgsrc/www/htmlcxx/distinfo
diff -u pkgsrc/www/htmlcxx/distinfo:1.2 pkgsrc/www/htmlcxx/distinfo:1.3
--- pkgsrc/www/htmlcxx/distinfo:1.2     Wed Nov  4 02:46:54 2015
+++ pkgsrc/www/htmlcxx/distinfo Fri Oct 25 10:29:04 2019
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.2 2015/11/04 02:46:54 agc Exp $
+$NetBSD: distinfo,v 1.3 2019/10/25 10:29:04 kamil Exp $
 
 SHA1 (htmlcxx-0.85.tar.gz) = e56fef830db51041fd297d269d24379b2dccb928
 RMD160 (htmlcxx-0.85.tar.gz) = d357b4c29127aae7f06da666c004c9db26ef29a4
 SHA512 (htmlcxx-0.85.tar.gz) = a385b65fb668727b0034a95e5dcda18939e4cd2fa5140bbf3bc63907abc481cb4e6f2f46089eac131cde2b8234a4fc5db4f81253b10e6dff6b42632cea990a61
 Size (htmlcxx-0.85.tar.gz) = 414624 bytes
-SHA1 (patch-html_CharsetConverter.cc) = 72204f93fa3639328b73c5bed1841f23c32946c8
+SHA1 (patch-html_CharsetConverter.cc) = c06dd6a2ad59ebbf25c65a567b24ace73b58f52f
 SHA1 (patch-html_ci__string.h) = 71438e4eea290f5934918d1996d0c80eefd5ffe5

Index: pkgsrc/www/htmlcxx/patches/patch-html_CharsetConverter.cc
diff -u pkgsrc/www/htmlcxx/patches/patch-html_CharsetConverter.cc:1.1 pkgsrc/www/htmlcxx/patches/patch-html_CharsetConverter.cc:1.2
--- pkgsrc/www/htmlcxx/patches/patch-html_CharsetConverter.cc:1.1       Sun Feb 16 22:58:51 2014
+++ pkgsrc/www/htmlcxx/patches/patch-html_CharsetConverter.cc   Fri Oct 25 10:29:04 2019
@@ -1,15 +1,34 @@
-$NetBSD: patch-html_CharsetConverter.cc,v 1.1 2014/02/16 22:58:51 wiz Exp $
+$NetBSD: patch-html_CharsetConverter.cc,v 1.2 2019/10/25 10:29:04 kamil Exp $
 
 Fix build on NetBSD.
 
 --- html/CharsetConverter.cc.orig      2011-05-15 17:32:10.000000000 +0000
 +++ html/CharsetConverter.cc
-@@ -37,7 +37,7 @@ string CharsetConverter::convert(const s
+@@ -4,6 +4,15 @@
+ #include <cerrno>
+ #include "CharsetConverter.h"
+ 
++#if defined(__NetBSD__)
++#include <sys/param.h>
++#if __NetBSD_Prereq__(9,99,17)
++#define NETBSD_POSIX_ICONV 1
++#else
++#define NETBSD_POSIX_ICONV 0
++#endif
++#endif
++
+ using namespace std;
+ using namespace htmlcxx;
+ 
+@@ -37,7 +46,11 @@ string CharsetConverter::convert(const s
  
        size_t ret;
        while (1) {
--              ret = iconv(mIconvDescriptor, const_cast<char**>(&inbuf), &inbytesleft, &outbuf, &outbytesleft);
++#if (defined(__NetBSD__) && !NETBSD_POSIX_ICONV)
 +              ret = iconv(mIconvDescriptor, (const char**)(&inbuf), &inbytesleft, &outbuf, &outbytesleft);
++#else
+               ret = iconv(mIconvDescriptor, const_cast<char**>(&inbuf), &inbytesleft, &outbuf, &outbytesleft);
++#endif
                if (ret == 0) break;
                if (ret == (size_t)-1 && errno == E2BIG) return string();