Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/x11/qt4-libs/distinfo,v
retrieving revision 1.115
diff -u -r1.115 distinfo
--- distinfo	3 Jul 2019 10:04:23 -0000	1.115
+++ distinfo	25 Oct 2019 10:45:08 -0000
@@ -19,7 +19,7 @@
 SHA1 (patch-am) = 018a5982834737ca8ceb6460dc696b6e3a70ec54
 SHA1 (patch-an) = 8aa6ceffb9acab4771d22b3184a1360227a81409
 SHA1 (patch-ao) = a63839ae22e0bf13ff40f5377df2bc36ca052d91
-SHA1 (patch-ap) = 86a2f5cce47607c8c453c63c6213d5efb48c8569
+SHA1 (patch-ap) = ed286de78b791e0b72fc0ac2515bc5168c3197fb
 SHA1 (patch-aq) = 7533741c81086cd1992d3e96a47c28d9ade27cbc
 SHA1 (patch-ar) = ba839210b42532b1797604722442841e43acbae1
 SHA1 (patch-as) = b0962c535fc2e8da08bb78b9ebcb5cd678565058
Index: patches/patch-ap
===================================================================
RCS file: /cvsroot/pkgsrc/x11/qt4-libs/patches/patch-ap,v
retrieving revision 1.2
diff -u -r1.2 patch-ap
--- patches/patch-ap	11 Oct 2009 09:14:52 -0000	1.2
+++ patches/patch-ap	25 Oct 2019 10:45:08 -0000
@@ -1,12 +1,28 @@
 $NetBSD: patch-ap,v 1.2 2009/10/11 09:14:52 adam Exp $
 
---- config.tests/unix/iconv/iconv.cpp.orig	2009-09-29 13:01:31.000000000 +0200
+--- config.tests/unix/iconv/iconv.cpp.orig	2015-05-07 14:14:42.000000000 +0000
 +++ config.tests/unix/iconv/iconv.cpp
-@@ -48,7 +48,11 @@ int main(int, char **)
+@@ -39,6 +39,15 @@
+ **
+ ****************************************************************************/
+ 
++#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
++
+ #if defined(__sgi)
+ #error "iconv not supported on IRIX"
+ #else
+@@ -48,7 +57,11 @@ int main(int, char **)
  {
      iconv_t x = iconv_open("", "");
  
-+#if defined(__NetBSD__)
++#if defined(__NetBSD__) && !NETBSD_POSIX_ICONV
 +    const char *inp;
 +#else
      char *inp;