Index: Makefile
===================================================================
RCS file: /cvs/ports/mail/libspf2/Makefile,v
retrieving revision 1.9
diff -u -p -u -r1.9 Makefile
--- Makefile	26 Jan 2015 22:42:35 -0000	1.9
+++ Makefile	9 Oct 2016 09:14:17 -0000
@@ -3,7 +3,7 @@
 COMMENT=	SPF library
 
 DISTNAME=	libspf2-1.2.10
-REVISION=	0
+REVISION=	1
 
 SHARED_LIBS +=	spf2                 4.0      # 3.0
 
@@ -17,17 +17,13 @@ MAINTAINER=	Jakob Schlyter <jakob@openbs
 # BSD
 PERMIT_PACKAGE_CDROM=	Yes
 
-WANTLIB=		lib/libbind/bind c pthread
+WANTLIB=		c pthread
 MODULES=		devel/gettext
 
-# requires res_close() or res_ninit()
-LIB_DEPENDS=		net/libbind
-
 CONFIGURE_STYLE=	gnu
 
 CONFIGURE_ARGS=		--bindir=${PREFIX}/libexec/libspf2
-CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include/bind" \
-			LDFLAGS="-L${LOCALBASE}/lib -L${LOCALBASE}/lib/libbind -Wl,-rpath ${LOCALBASE}/lib/libbind -lbind"
+CONFIGURE_ENV=		LDFLAGS="-L${LOCALBASE}/lib"
 
 # broken test cases
 NO_TEST=		yes
Index: patches/patch-src_configure
===================================================================
RCS file: patches/patch-src_configure
diff -N patches/patch-src_configure
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_configure	9 Oct 2016 09:14:17 -0000
@@ -0,0 +1,157 @@
+--- configure.orig	Sun Oct  9 10:59:37 2016
++++ configure	Sun Oct  9 11:00:15 2016
+@@ -11931,154 +11931,6 @@
+ 
+ 
+ 
+-# Check whether --with-bind was given.
+-if test "${with_bind+set}" = set; then :
+-  withval=$with_bind; as_ac_File=`$as_echo "ac_cv_file_$withval/include/bind/resolv.h" | $as_tr_sh`
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $withval/include/bind/resolv.h" >&5
+-$as_echo_n "checking for $withval/include/bind/resolv.h... " >&6; }
+-if eval \${$as_ac_File+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  test "$cross_compiling" = yes &&
+-  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
+-if test -r "$withval/include/bind/resolv.h"; then
+-  eval "$as_ac_File=yes"
+-else
+-  eval "$as_ac_File=no"
+-fi
+-fi
+-eval ac_res=\$$as_ac_File
+-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
+-  CFLAGS="$CFLAGS -I$withval/include/bind"
+-else
+-  CFLAGS="$CFLAGS -I$withval/include"
+-fi
+-
+-         LDFLAGS="$LDFLAGS -L$withval/lib -Wl,$rpath$withval/lib"
+-         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for res_query in -lbind" >&5
+-$as_echo_n "checking for res_query in -lbind... " >&6; }
+-if ${ac_cv_lib_bind_res_query+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lbind  $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_query ();
+-int
+-main ()
+-{
+-return res_query ();
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-if ac_fn_c_try_link "$LINENO"; then :
+-  ac_cv_lib_bind_res_query=yes
+-else
+-  ac_cv_lib_bind_res_query=no
+-fi
+-rm -f core conftest.err conftest.$ac_objext \
+-    conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_check_lib_save_LIBS
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bind_res_query" >&5
+-$as_echo "$ac_cv_lib_bind_res_query" >&6; }
+-if test "x$ac_cv_lib_bind_res_query" = xyes; then :
+-  LIBS="$LIBS -lbind"
+-else
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for res_query in -lresolv" >&5
+-$as_echo_n "checking for res_query in -lresolv... " >&6; }
+-if ${ac_cv_lib_resolv_res_query+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lresolv  $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_query ();
+-int
+-main ()
+-{
+-return res_query ();
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-if ac_fn_c_try_link "$LINENO"; then :
+-  ac_cv_lib_resolv_res_query=yes
+-else
+-  ac_cv_lib_resolv_res_query=no
+-fi
+-rm -f core conftest.err conftest.$ac_objext \
+-    conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_check_lib_save_LIBS
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv_res_query" >&5
+-$as_echo "$ac_cv_lib_resolv_res_query" >&6; }
+-if test "x$ac_cv_lib_resolv_res_query" = xyes; then :
+-  LIBS="$LIBS -lresolv"
+-else
+-  echo "cannot find resolver library"; exit 1;
+-fi
+-
+-
+-fi
+-
+-
+-else
+-  				{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for res_query in -lresolv (with resolv.h if present)" >&5
+-$as_echo_n "checking for res_query in -lresolv (with resolv.h if present)... " >&6; }
+-				saved_libs="$LIBS"
+-				LIBS="-lresolv $LIBS"
+-				cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-
+-						#ifdef HAVE_RESOLV_H
+-						#include <resolv.h>
+-						#endif
+-int
+-main ()
+-{
+-res_query(0,0,0,0,0)
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-if ac_fn_c_try_link "$LINENO"; then :
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+-$as_echo "yes" >&6; }
+-								have_res_query=yes
+-else
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-								LIBS="$saved_libs"
+-fi
+-rm -f core conftest.err conftest.$ac_objext \
+-    conftest$ac_exeext conftest.$ac_ext
+-
+-fi
+-
+-
+-
+-
+-
+ # Checks for libraries.
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for inet_pton in -lnsl" >&5
+ $as_echo_n "checking for inet_pton in -lnsl... " >&6; }
Index: patches/patch-src_libspf2_spf_dns_resolv_c
===================================================================
RCS file: patches/patch-src_libspf2_spf_dns_resolv_c
diff -N patches/patch-src_libspf2_spf_dns_resolv_c
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_libspf2_spf_dns_resolv_c	9 Oct 2016 09:14:17 -0000
@@ -0,0 +1,13 @@
+$OpenBSD$
+--- src/libspf2/spf_dns_resolv.c.orig	Mon Feb 20 07:31:47 2012
++++ src/libspf2/spf_dns_resolv.c	Sun Oct  9 10:43:18 2016
+@@ -607,7 +607,8 @@
+ 	SPF_ASSERT_NOTNULL(spf_dns_server);
+ 
+ #if ! HAVE_DECL_RES_NINIT
+-	res_close();
++	/* OpenBSD libc provides res_init() but not res_close(). */
++	//res_close();
+ #endif
+ 
+ 	free(spf_dns_server);