Make build on Interix.

Part of the fix adds <sys/time.h> to ares.h to make it get fd_set on more
platforms, so bump PKGREVISION.

6 files changed, 53 insertions, 3 deletions

diff --git a/net/libares/Makefile b/net/libares/Makefile
index 9680ab3cc3c..55e443421c5 100644
--- a/net/libares/Makefile
+++ b/net/libares/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2004/04/25 00:25:01 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2005/03/12 05:42:48 tv Exp $
 #
 
 DISTNAME=	ares-1.1.1
 PKGNAME=	libares-1.1.1
+PKGREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	ftp://athena-dist.mit.edu/pub/ATHENA/ares/
 
diff --git a/net/libares/buildlink3.mk b/net/libares/buildlink3.mk
index 55d68f1e3a1..f052b339ea4 100644
--- a/net/libares/buildlink3.mk
+++ b/net/libares/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/04/25 00:34:21 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2005/03/12 05:42:48 tv Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LIBARES_BUILDLINK3_MK:=	${LIBARES_BUILDLINK3_MK}+
@@ -10,10 +10,19 @@ BUILDLINK_DEPENDS+=	libares
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibares}
 BUILDLINK_PACKAGES+=	libares
 
+.include "../../mk/bsd.prefs.mk"
+
 .if !empty(LIBARES_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.libares+=	libares>=1.1.1
 BUILDLINK_PKGSRCDIR.libares?=	../../net/libares
 BUILDLINK_DEPMETHOD.libares?=	build
 .endif	# LIBARES_BUILDLINK3_MK
 
+.if ${OPSYS} == "Interix"
+BUILDLINK_PASSTHRU_DIRS+=	/usr/local/include/bind /usr/local/lib/bind
+BUILDLINK_CPPFLAGS.libares+=	-I/usr/local/include/bind
+BUILDLINK_LDFLAGS.libares+=	-L/usr/local/lib/bind
+BUILDLINK_LIBS.libares+=	-lbind -ldb
+.endif
+
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/net/libares/distinfo b/net/libares/distinfo
index 4e678c21664..2d4e5d44f46 100644
--- a/net/libares/distinfo
+++ b/net/libares/distinfo
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.2 2005/02/24 12:13:52 agc Exp $
+$NetBSD: distinfo,v 1.3 2005/03/12 05:42:48 tv Exp $
 
 SHA1 (ares-1.1.1.tar.gz) = eafe6ba9c85122538f06dabd735a048abea8bb1e
 RMD160 (ares-1.1.1.tar.gz) = 2b564f1194f538ba12378034428bd3a22f8e5a98
 Size (ares-1.1.1.tar.gz) = 65463 bytes
+SHA1 (patch-aa) = cb8aaad721963f958d61b6b9f3d466c522736c56
+SHA1 (patch-ab) = 380f6cc08630e8173ca7106a939c77fbf6994010
diff --git a/net/libares/hacks.mk b/net/libares/hacks.mk
new file mode 100644
index 00000000000..874f4ab4cef
--- /dev/null
+++ b/net/libares/hacks.mk
@@ -0,0 +1,11 @@
+# $NetBSD: hacks.mk,v 1.1 2005/03/12 05:42:48 tv Exp $
+
+### [Sat Mar 12 05:35:46 UTC 2005 : tv]
+### Need a real resolver on Interix.
+###
+.if ${OPSYS} == "Interix"
+BUILDLINK_PASSTHRU_DIRS+= /usr/local/include/bind /usr/local/lib/bind
+CPPFLAGS+=		-I/usr/local/include/bind
+LDFLAGS+=		-L/usr/local/lib/bind
+LIBS+=			-lbind -ldb
+.endif
diff --git a/net/libares/patches/patch-aa b/net/libares/patches/patch-aa
new file mode 100644
index 00000000000..9715066ebea
--- /dev/null
+++ b/net/libares/patches/patch-aa
@@ -0,0 +1,12 @@
+$NetBSD: patch-aa,v 1.1 2005/03/12 05:42:48 tv Exp $
+
+--- ares.h.orig	2000-09-21 15:15:48.000000000 -0400
++++ ares.h
+@@ -19,6 +19,7 @@
+ #define ARES__H
+ 
+ #include <sys/types.h>
++#include <sys/time.h>
+ #include <netinet/in.h>
+ 
+ #define ARES_SUCCESS		0
diff --git a/net/libares/patches/patch-ab b/net/libares/patches/patch-ab
new file mode 100644
index 00000000000..d68d86aa915
--- /dev/null
+++ b/net/libares/patches/patch-ab
@@ -0,0 +1,15 @@
+$NetBSD: patch-ab,v 1.1 2005/03/12 05:42:48 tv Exp $
+
+--- ares_init.c.orig	1999-10-23 15:28:13.000000000 -0400
++++ ares_init.c
+@@ -32,6 +32,10 @@ static const char rcsid[] = "$Id: ares_i
+ #include "ares.h"
+ #include "ares_private.h"
+ 
++#ifndef INADDR_LOOPBACK
++#define INADDR_LOOPBACK inet_addr("127.0.0.1")
++#endif
++
+ static int init_by_options(ares_channel channel, struct ares_options *options,
+ 			   int optmask);
+ static int init_by_environment(ares_channel channel);