Add common handling for libresolv similiar to dlopen(3) wrapping.

For now, DragonFly and FreeBSD use the libc version, it is not reentrant,
but thread-safe. NetBSD 3.0+ and Darwin 8.0+ use libresolv from base
(the BIND9 resolver), all other fall back to net/bind9. Feel free to add
your favorite platform if it has a thread-safe resolver in base.

Modify mail/libspf-alf, mail/milter-greylist, mail/spamdyke and
net/nocol accordingly. Testing on !DragonFly and feedback from tron@

4 files changed, 16 insertions, 12 deletions

diff --git a/mail/spamdyke/Makefile b/mail/spamdyke/Makefile
index e077078119f..477b9a0fe82 100644
--- a/mail/spamdyke/Makefile
+++ b/mail/spamdyke/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2007/06/21 19:08:45 schmonz Exp $
+# $NetBSD: Makefile,v 1.9 2007/07/03 13:54:45 joerg Exp $
 #
 
 DISTNAME=	spamdyke-2.6.3
@@ -41,4 +41,5 @@ do-install:
 		${INSTALL_DATA} $${f} ${PREFIX}/share/doc/${PKGBASE};	\
 	done
 
+.include "../../mk/resolv.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/spamdyke/distinfo b/mail/spamdyke/distinfo
index c6bfa30c3a3..72ea49a64f8 100644
--- a/mail/spamdyke/distinfo
+++ b/mail/spamdyke/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.7 2007/06/21 19:08:45 schmonz Exp $
+$NetBSD: distinfo,v 1.8 2007/07/03 13:54:46 joerg Exp $
 
 SHA1 (spamdyke-2.6.3.tgz) = e893b319c8808bc26a649b5ec7b82dae41e64e5f
 RMD160 (spamdyke-2.6.3.tgz) = 9b061fc32ee92d731db0d8ad2cf04d61829d59ac
 Size (spamdyke-2.6.3.tgz) = 116041 bytes
 SHA1 (patch-aa) = 9bb28e5535b28fa558ce577670e4a13324664ef4
-SHA1 (patch-ab) = e92e9ed2265debd1bf3607d83c3645a37acb4ffe
-SHA1 (patch-ac) = b8e6f4aedfcc721055c280d23019e26ac4e05ca1
+SHA1 (patch-ab) = 7297b987c9195d5c111390aaa4dfd2c82df37bac
+SHA1 (patch-ac) = 64e4f02e7ff14dee2016c33a4678eba2dc2951f0
diff --git a/mail/spamdyke/patches/patch-ab b/mail/spamdyke/patches/patch-ab
index e758026dbcd..a8a18acfed9 100644
--- a/mail/spamdyke/patches/patch-ab
+++ b/mail/spamdyke/patches/patch-ab
@@ -1,14 +1,15 @@
-$NetBSD: patch-ab,v 1.3 2007/05/30 05:58:11 schmonz Exp $
+$NetBSD: patch-ab,v 1.4 2007/07/03 13:54:46 joerg Exp $
 
---- spamdyke/Makefile.orig	2007-05-24 18:55:10.000000000 -0400
+--- spamdyke/Makefile.orig	2007-05-24 22:55:10.000000000 +0000
 +++ spamdyke/Makefile
 @@ -1,8 +1,8 @@
  #CFLAGS := -Wall -g -funsigned-char
 -CFLAGS := -Wall -O2 -funsigned-char
-+CFLAGS += -Wall -O2 -funsigned-char
- LFLAGS := -lresolv
+-LFLAGS := -lresolv
 -CFLAGS_TLS := -DTLS
 -LFLAGS_TLS := -lssl -lcrypto
++CFLAGS += -Wall -O2 -funsigned-char
++LFLAGS := ${RESOLV_DLFAGS}
 +CFLAGS_TLS ?= -DTLS
 +LFLAGS_TLS ?= -lssl -lcrypto
  OFILES := spamdyke.o command_line.o dns.o environment.o usage.o search_fs.o exec.o base64.o tls.o
diff --git a/mail/spamdyke/patches/patch-ac b/mail/spamdyke/patches/patch-ac
index fe41b569b34..f048fec2075 100644
--- a/mail/spamdyke/patches/patch-ac
+++ b/mail/spamdyke/patches/patch-ac
@@ -1,11 +1,13 @@
-$NetBSD: patch-ac,v 1.4 2007/06/08 01:08:29 schmonz Exp $
+$NetBSD: patch-ac,v 1.5 2007/07/03 13:54:46 joerg Exp $
 
---- utils/Makefile.orig	2007-06-05 22:51:35.000000000 -0400
+--- utils/Makefile.orig	2007-06-06 02:51:35.000000000 +0000
 +++ utils/Makefile
-@@ -1,5 +1,5 @@
+@@ -1,6 +1,6 @@
  #CFLAGS := -Wall -g -funsigned-char -I../spamdyke
 -CFLAGS := -Wall -O2 -funsigned-char -I../spamdyke
+-LFLAGS := -lresolv
 +CFLAGS += -Wall -O2 -funsigned-char -I../spamdyke
- LFLAGS := -lresolv
++LFLAGS := ${RESOLV_LDFLAGS}
  
  all: domain2path domainsplit dnstxt dnsptr dnsmx passwordcheck
+