CVS commit: pkgsrc/finance/libofx

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

Module Name:    pkgsrc
Committed By:   kamil
Date:           Fri Oct 25 09:23:38 UTC 2019

Modified Files:
        pkgsrc/finance/libofx: distinfo
        pkgsrc/finance/libofx/patches: patch-lib_ofx__preproc.cpp

Log Message:
libofx: 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.14 -r1.15 pkgsrc/finance/libofx/distinfo
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/finance/libofx/patches/patch-lib_ofx__preproc.cpp

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

Modified files:

Index: pkgsrc/finance/libofx/distinfo
diff -u pkgsrc/finance/libofx/distinfo:1.14 pkgsrc/finance/libofx/distinfo:1.15
--- pkgsrc/finance/libofx/distinfo:1.14 Sun Jan  7 20:59:40 2018
+++ pkgsrc/finance/libofx/distinfo      Fri Oct 25 09:23:37 2019
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.14 2018/01/07 20:59:40 joerg Exp $
+$NetBSD: distinfo,v 1.15 2019/10/25 09:23:37 kamil Exp $
 
 SHA1 (libofx-0.9.10.tar.gz) = 33f394c963c087217cb6c508af842d4844bc0823
 RMD160 (libofx-0.9.10.tar.gz) = 928069129cf945dc85521907325977a36dbeae7f
 SHA512 (libofx-0.9.10.tar.gz) = 061110702034dbbb9be3adaebe6236a4b0842169d8ee7671bad6c93960b380cbb33953bdf080c8b14f45930b0c817fcfe1bf71f15d9872dd2535a1415f5be895
 Size (libofx-0.9.10.tar.gz) = 1433837 bytes
 SHA1 (patch-lib_Makefile.in) = 512cf3dbaa257205ffff18f3953a08eb81d015f4
-SHA1 (patch-lib_ofx__preproc.cpp) = 355bc1db8bcdd723ef7534063a673348e3385163
+SHA1 (patch-lib_ofx__preproc.cpp) = 98ad35ccbd9b36ed486c6180287135b402e36558

Index: pkgsrc/finance/libofx/patches/patch-lib_ofx__preproc.cpp
diff -u pkgsrc/finance/libofx/patches/patch-lib_ofx__preproc.cpp:1.2 pkgsrc/finance/libofx/patches/patch-lib_ofx__preproc.cpp:1.3
--- pkgsrc/finance/libofx/patches/patch-lib_ofx__preproc.cpp:1.2        Tue Dec 30 13:20:29 2014
+++ pkgsrc/finance/libofx/patches/patch-lib_ofx__preproc.cpp    Fri Oct 25 09:23:37 2019
@@ -1,16 +1,38 @@
-$NetBSD: patch-lib_ofx__preproc.cpp,v 1.2 2014/12/30 13:20:29 wiz Exp $
+$NetBSD: patch-lib_ofx__preproc.cpp,v 1.3 2019/10/25 09:23:37 kamil Exp $
 
 Fix build on NetBSD where iconv has a different prototype.
 http://sourceforge.net/p/libofx/bugs/44/
 
 --- lib/ofx_preproc.cpp.orig   2014-09-12 19:26:30.000000000 +0000
 +++ lib/ofx_preproc.cpp
-@@ -310,7 +310,7 @@ int ofx_proc_file(LibofxContextPtr ctx, 
+@@ -34,6 +34,15 @@
+ #include <iconv.h>
+ #endif
+ 
++#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
++
+ #ifdef OS_WIN32
+ # define DIRSEP "\\"
+ #else
+@@ -310,7 +319,7 @@ int ofx_proc_file(LibofxContextPtr ctx, 
              size_t outbytesleft = inbytesleft * 2 - 1;
              iconv_buffer = (char*) malloc (inbytesleft * 2);
              memset(iconv_buffer, 0, inbytesleft * 2);
 -#if defined(OS_WIN32) || defined(__sun)
-+#if defined(OS_WIN32) || defined(__sun) || defined(__NetBSD__)
++#if defined(OS_WIN32) || defined(__sun) || (defined(__NetBSD__) && !NETBSD_POSIX_ICONV)
              const char * inchar = (const char *)s_buffer.c_str();
  #else
              char * inchar = (char *)s_buffer.c_str();
+@@ -655,5 +664,3 @@ std::string find_dtd(LibofxContextPtr ct
+   message_out(ERROR, "find_dtd():Unable to find the DTD named " + dtd_filename);
+   return "";
+ }
+-
+-