 @@ -1,8 +1,11 @@
-$NetBSD: distinfo,v 1.6 2015/11/03 23:27:11 agc Exp $
+$NetBSD: distinfo,v 1.6.36.1 2020/07/30 18:48:38 bsiegert Exp $
 SHA1 (opendmarc-1.3.1.tar.gz) = bdd12713888c16e77334281238f88990df225929
 RMD160 (opendmarc-1.3.1.tar.gz) = 623b51544f428ade14f0a5d6204f8bf41af8375a
 SHA512 (opendmarc-1.3.1.tar.gz) = 0be11540bc26bd3b3e6cc9817bc379a5d290b63ef16c5d3559bf96b241ad6628bea7a9daeb468afac855bc16be16676f722b3c1d468ea82c8d8364e8a8137226
 Size (opendmarc-1.3.1.tar.gz) = 640151 bytes
-SHA1 (patch-configure) = 15abea1f890249c46eb0b969133fc809507feb6a
+SHA1 (patch-build-config.h.in) = 14723ab0a578978117be7dcc1d60fe5af955b610
-SHA1 (patch-configure.ac) = b7ee9ae49e04fceaf2872dac7e2f60a15d3c9aa0
+SHA1 (patch-configure) = 1af3b346ac6db51d1701af8ba4e123e0e6a6b973
 SHA1 (patch-configure.ac) = bfd2c16d22e25b564d33220b5e7ceadedc5ee016
 SHA1 (patch-libopendmarc_opendmarc__dns.c) = 7c75d464bcdba6baf963cb002e7ba94a60593ecc
 SHA1 (patch-libopendmarc_opendmarc__spf__dns.c) = 82f22fd2e224ddef1cd3c6788518e629fdea125f

 @@ -1,22 +1,83 @@
-$NetBSD: patch-configure,v 1.1 2014/12/05 16:00:23 christos Exp $
+$NetBSD: patch-configure,v 1.1.44.1 2020/07/30 18:48:39 bsiegert Exp $
 Search also for __res_ninit on NetBSD because of namespace protection
---- configure.orig	2014-12-05 10:53:31.000000000 -0500
+Check for res_ndestroy(), __res_init(), and __res_ndestroy().
 +++ configure	2014-12-05 10:54:50.000000000 -0500
-@@ -12969,6 +12969,64 @@
+--- configure.orig	2015-02-23 20:32:13.000000000 +0000
 +++ configure
@@ -12971,6 +12971,184 @@ $as_echo "#define HAVE_RES_NINIT 1" >>co
  fi
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing res_ndestroy" >&5
 +$as_echo_n "checking for library containing res_ndestroy... " >&6; }
 +if ${ac_cv_search_res_ndestroy+:} false; then :
 +  $as_echo_n "(cached) " >&6
 +else
 +  ac_func_search_save_LIBS=$LIBS
 +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 +/* end confdefs.h.  */
++
 +/* Override any GCC internal prototype to avoid an error.
 +   Use char because int might match the return type of a GCC
 +   builtin and then its argument prototype would still apply.  */
 +#ifdef __cplusplus
 +extern "C"
 +#endif
 +char res_ndestroy ();
 +int
 +main ()
 +{
 +return res_ndestroy ();
 +  ;
 +  return 0;
 +}
 +_ACEOF
 +for ac_lib in '' resolv; do
 +  if test -z "$ac_lib"; then
 +    ac_res="none required"
 +  else
 +    ac_res=-l$ac_lib
 +    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
 +  fi
 +  if ac_fn_c_try_link "$LINENO"; then :
 +  ac_cv_search_res_ndestroy=$ac_res
 +fi
 +rm -f core conftest.err conftest.$ac_objext \
 +    conftest$ac_exeext
 +  if ${ac_cv_search_res_ndestroy+:} false; then :
 +  break
 +fi
 +done
 +if ${ac_cv_search_res_ndestroy+:} false; then :
++
 +else
 +  ac_cv_search_res_ndestroy=no
 +fi
 +rm conftest.$ac_ext
 +LIBS=$ac_func_search_save_LIBS
 +fi
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_res_ndestroy" >&5
 +$as_echo "$ac_cv_search_res_ndestroy" >&6; }
 +ac_res=$ac_cv_search_res_ndestroy
 +if test "$ac_res" != no; then :
 +  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
++
 +$as_echo "#define HAVE_RES_NDESTROY 1" >>confdefs.h
++
 +fi
++
++
++
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing __res_ninit" >&5
 +$as_echo_n "checking for library containing __res_ninit... " >&6; }
 +if ${ac_cv_search___res_ninit+:} false; then :
 +  $as_echo_n "(cached) " >&6
 +else
 +  ac_func_search_save_LIBS=$LIBS
 +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 +/* end confdefs.h.  */
++
 +/* Override any GCC internal prototype to avoid an error.
 +   Use char because int might match the return type of a GCC
 +   builtin and then its argument prototype would still apply.  */
 +#ifdef __cplusplus
 @@ -55,16 +116,76 @@ Search also for __res_ninit on NetBSD be
 +rm conftest.$ac_ext
 +LIBS=$ac_func_search_save_LIBS
 +fi
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search___res_ninit" >&5
 +$as_echo "$ac_cv_search___res_ninit" >&6; }
 +ac_res=$ac_cv_search___res_ninit
 +if test "$ac_res" != no; then :
 +  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
++
 +$as_echo "#define HAVE_RES_NINIT 1" >>confdefs.h
++
 +fi
++
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing __res_ndestroy" >&5
 +$as_echo_n "checking for library containing __res_ndestroy... " >&6; }
 +if ${ac_cv_search___res_ndestroy+:} false; then :
 +  $as_echo_n "(cached) " >&6
 +else
 +  ac_func_search_save_LIBS=$LIBS
 +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 +/* end confdefs.h.  */
++
 +/* Override any GCC internal prototype to avoid an error.
 +   Use char because int might match the return type of a GCC
 +   builtin and then its argument prototype would still apply.  */
 +#ifdef __cplusplus
 +extern "C"
 +#endif
 +char __res_ndestroy ();
 +int
 +main ()
 +{
 +return __res_ndestroy ();
 +  ;
 +  return 0;
 +}
 +_ACEOF
 +for ac_lib in '' resolv; do
 +  if test -z "$ac_lib"; then
 +    ac_res="none required"
 +  else
 +    ac_res=-l$ac_lib
 +    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
 +  fi
 +  if ac_fn_c_try_link "$LINENO"; then :
 +  ac_cv_search___res_ndestroy=$ac_res
 +fi
 +rm -f core conftest.err conftest.$ac_objext \
 +    conftest$ac_exeext
 +  if ${ac_cv_search___res_ndestroy+:} false; then :
 +  break
 +fi
 +done
 +if ${ac_cv_search___res_ndestroy+:} false; then :
++
 +else
 +  ac_cv_search___res_ndestroy=no
 +fi
 +rm conftest.$ac_ext
 +LIBS=$ac_func_search_save_LIBS
 +fi
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search___res_ndestroy" >&5
 +$as_echo "$ac_cv_search___res_ndestroy" >&6; }
 +ac_res=$ac_cv_search___res_ndestroy
 +if test "$ac_res" != no; then :
 +  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
++
 +$as_echo "#define HAVE_RES_NDESTROY 1" >>confdefs.h
++
 +fi
++
++
++
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for idn_free in -lidn" >&5
  $as_echo_n "checking for idn_free in -lidn... " >&6; }
  if ${ac_cv_lib_idn_idn_free+:} false; then :

 @@ -1,15 +1,24 @@
-$NetBSD: patch-configure.ac,v 1.1 2014/12/05 16:00:23 christos Exp $
+$NetBSD: patch-configure.ac,v 1.1.44.1 2020/07/30 18:48:39 bsiegert Exp $
 Search also for __res_ninit on NetBSD because of namespace protection
---- configure.ac.orig	2014-12-05 10:53:36.000000000 -0500
+Add appropriate flags if res_ndestroy(), __res_ninit(),  or
-+++ configure.ac	2014-12-05 10:53:51.000000000 -0500
+__res_ndestroy() are found.
@@ -126,6 +126,9 @@
 --- configure.ac.orig	2015-02-23 20:31:50.000000000 +0000
 +++ configure.ac
@@ -126,6 +126,16 @@ AC_CHECK_LIB(resolv, inet_aton, , , [-ln
  AC_SEARCH_LIBS(res_ninit, resolv,
  	AC_DEFINE(HAVE_RES_NINIT, 1,
  	[Define to 1 if you have the `res_ninit()' function.]))
 +AC_SEARCH_LIBS(res_ndestroy, resolv,
 +       AC_DEFINE(HAVE_RES_NDESTROY, 1,
 +       [Define to 1 if you have the `res_ndestroy()' function.]))
 +AC_SEARCH_LIBS(__res_ninit, resolv,
 +	AC_DEFINE(HAVE_RES_NINIT, 1,
-+	[Define to 1 if you have the `res_ninit()' function.]))
++	[Define to 1 if you have the `__res_ninit()' function.]))
 +AC_SEARCH_LIBS(__res_ndestroy, resolv,
 +       AC_DEFINE(HAVE_RES_NDESTROY, 1,
 +       [Define to 1 if you have the `__res_ndestroy()' function.]))
++
  AC_CHECK_LIB(idn, idn_free)
  AC_CHECK_LIB(rt, nanosleep)
  AC_SEARCH_LIBS(inet_addr, nsl)

 @@ -1,17 +1,17 @@
-# $NetBSD: Makefile,v 1.18 2020/01/25 10:45:11 jperkin Exp $
+# $NetBSD: Makefile,v 1.18.4.1 2020/07/30 18:48:38 bsiegert Exp $
 DISTNAME=	opendmarc-1.3.1
-PKGREVISION=	6
+PKGREVISION=	7
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=opendmarc/}
 MAINTAINER=	pettai@NetBSD.org
 HOMEPAGE=	http://www.trusteddomain.org/opendmarc/
 COMMENT=	Open source DMARC library, MTA filter implementation and tools
 LICENSE=	modified-bsd
 DEPENDS+=	p5-DBI-[0-9]*:../../databases/p5-DBI
 DEPENDS+=	p5-DBD-mysql-[0-9]*:../../databases/p5-DBD-mysql
 #DEPENDS+=	{perl>=5.6.1,p5-File-Temp-[0-9]*}:../../devel/p5-File-Temp
 DEPENDS+=	p5-Switch-[0-9]*:../../lang/p5-Switch