summaryrefslogtreecommitdiff
path: root/net/nocol
diff options
context:
space:
mode:
authorjoerg <joerg>2007-07-03 13:54:45 +0000
committerjoerg <joerg>2007-07-03 13:54:45 +0000
commitb22ee580b2475a5e88db73792c79412d11938fc2 (patch)
treef0384614f91c073d547064a3c7e0dd2d67393d7e /net/nocol
parent36efe843f5019429645b370f087cfe0f21b9d7c5 (diff)
downloadpkgsrc-b22ee580b2475a5e88db73792c79412d11938fc2.tar.gz
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@
Diffstat (limited to 'net/nocol')
-rw-r--r--net/nocol/Makefile3
-rw-r--r--net/nocol/distinfo4
-rw-r--r--net/nocol/patches/patch-am21
3 files changed, 23 insertions, 5 deletions
diff --git a/net/nocol/Makefile b/net/nocol/Makefile
index 87d57746b8d..4018b4d36a9 100644
--- a/net/nocol/Makefile
+++ b/net/nocol/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2007/02/22 19:26:57 wiz Exp $
+# $NetBSD: Makefile,v 1.32 2007/07/03 13:54:46 joerg Exp $
#
DISTNAME= nocol-4.3.1
@@ -62,4 +62,5 @@ post-install:
${PREFIX}/share/nocol/gifs; \
done
+.include "../../mk/resolv.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/net/nocol/distinfo b/net/nocol/distinfo
index 93aa1a36f4b..77248ef25b8 100644
--- a/net/nocol/distinfo
+++ b/net/nocol/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.9 2005/12/27 13:47:11 joerg Exp $
+$NetBSD: distinfo,v 1.10 2007/07/03 13:54:46 joerg Exp $
SHA1 (nocol-4.3.1.tar.gz) = a8cb88727bc3a3ddd544792407d431b3ef13a325
RMD160 (nocol-4.3.1.tar.gz) = 77a57ae447f0a8f1ce2417d9b828710f21865cc8
@@ -13,7 +13,7 @@ SHA1 (patch-ai) = d8317fad7c5e4574fa980859762f5acb1a7c631d
SHA1 (patch-aj) = 0eb201f47864132b04702fab4d03e452c07c2e2a
SHA1 (patch-ak) = 8013fbe6dbff80749dbdc0d0fad391741e48a468
SHA1 (patch-al) = aa4fa83d53c72e17ea9ffe2685f326ebbbde9132
-SHA1 (patch-am) = 810cbecf5bb1f8a995579e8352be1007f09fa69e
+SHA1 (patch-am) = 395a5c446ac24cedf90783fc504c8817405d8e37
SHA1 (patch-an) = ed0e6099bdc29faf90de8b2916c858e8df57e493
SHA1 (patch-ao) = 114ebcc55d00981cc6709095f3280509880d76eb
SHA1 (patch-ap) = 45f30a886adda7831df056cf0f7a136b97a7e17d
diff --git a/net/nocol/patches/patch-am b/net/nocol/patches/patch-am
index e73f74d6e6a..42a1658ea6e 100644
--- a/net/nocol/patches/patch-am
+++ b/net/nocol/patches/patch-am
@@ -1,8 +1,25 @@
-$NetBSD: patch-am,v 1.2 2005/12/27 13:47:11 joerg Exp $
+$NetBSD: patch-am,v 1.3 2007/07/03 13:54:46 joerg Exp $
--- Configure.orig 2000-01-19 04:34:04.000000000 +0000
+++ Configure
-@@ -207,7 +207,7 @@ case "$OS" in
+@@ -167,15 +167,7 @@ export PSFLAGS
+ (ps $PSFLAGS) 2>&1 | egrep -i '^usage' >/dev/null 2>&1
+ if [ $? = 0 ]; then PSFLAGS='-ef' ; fi
+
+-LIBRESOLV="-lresolv"
+-ls /usr/lib/libresolv* >/dev/null 2>&1
+-if [ $? = 1 ]; then
+- ls /lib/libresolv* >/dev/null 2>&1
+- if [ $? = 1 ]; then
+- ls /usr/lib/libbind* >/dev/null 2>&1
+- if [ $? = 1 ]; then LIBRESOLV="" ; else LIBRESOLV="-lbind" ; fi
+- fi
+-fi
++LIBRESOLV="${RESOLV_LDFLAGS}"
+
+ # mainly for Solaris systems
+ WHOAMI="/usr/ucb/whoami"
+@@ -207,7 +199,7 @@ case "$OS" in
OS_LIBS="${LIBRESOLV}" # -lcompat
PING=`which ping` # can do ping -c cnt host
;;