Make these compile on DragonFly master.

4 files changed, 80 insertions, 8 deletions

diff --git a/net/bind9/distinfo b/net/bind9/distinfo
index a8265466def..01e326ab5c3 100644
--- a/net/bind9/distinfo
+++ b/net/bind9/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.42 2009/03/22 15:31:44 adrianp Exp $
+$NetBSD: distinfo,v 1.43 2009/04/07 17:38:10 hasso Exp $
 
 SHA1 (bind-9.4.3-P2.tar.gz) = 6ef00b9db269180e4cfa2ea3fe06f7ab9bc7cfa0
 RMD160 (bind-9.4.3-P2.tar.gz) = 89d7c41a8c04833f4427914857f91ffffb0ac5ee
@@ -12,5 +12,5 @@ SHA1 (patch-ai) = 4375ae44c83050fd576c0ccb5b267fbc23761a63
 SHA1 (patch-aj) = c3bbf84a8a735298552f918ac38331e06a1b68a1
 SHA1 (patch-al) = eb6a52d3f865639447ec6f9019c0ea1d2122b772
 SHA1 (patch-am) = bb267f13dbd30d492f4dfcf9c278b941efa97bed
-SHA1 (patch-an) = 6ec6ede602292ef2eaf5f0891e97576218bd8c3e
+SHA1 (patch-an) = 21cb90b653121bb63434fa05aa9e00825e653a3e
 SHA1 (patch-ao) = 9a1ed7b37befdd8e29d233fe55cd62362df3c50e
diff --git a/net/bind9/patches/patch-an b/net/bind9/patches/patch-an
index 79c1cb8faad..79c4f9cd1bc 100644
--- a/net/bind9/patches/patch-an
+++ b/net/bind9/patches/patch-an
@@ -1,4 +1,4 @@
-$NetBSD: patch-an,v 1.2 2007/04/15 18:56:50 cjs Exp $
+$NetBSD: patch-an,v 1.3 2009/04/07 17:38:11 hasso Exp $
 
 --- lib/bind/include/netdb.h.orig
 +++ lib/bind/include/netdb.h
@@ -20,3 +20,39 @@ $NetBSD: patch-an,v 1.2 2007/04/15 18:56:50 cjs Exp $
  #ifdef __linux
  	struct sockaddr	*ai_addr; 	/*%< binary address */
  	char		*ai_canonname;	/*%< canonical name for hostname */
+@@ -492,7 +500,7 @@ int		innetgr_r __P((const char *, const 
+ #endif
+ #else
+  /* defined(sun) || defined(bsdi) */
+-#if defined(__GLIBC__) || defined(__FreeBSD__) && (__FreeBSD_version + 0 >= 601103)
++#if defined(__GLIBC__) || (defined(__FreeBSD__) && (__FreeBSD_version + 0 >= 601103)) || (defined(__DragonFly__) && (__DragonFly_version + 0 >= 200202))
+ int gethostbyaddr_r __P((const char *, int, int, struct hostent *,
+ 		         char *, size_t, struct hostent **, int *));
+ int gethostbyname_r __P((const char *, struct hostent *,
+@@ -509,7 +517,7 @@ struct hostent	*gethostent_r __P((struct
+ void		sethostent_r __P((int));
+ void		endhostent_r __P((void));
+ 
+-#if defined(__GLIBC__) || defined(__FreeBSD__) && (__FreeBSD_version + 0 >= 601103)
++#if defined(__GLIBC__) || (defined(__FreeBSD__) && (__FreeBSD_version + 0 >= 601103)) || (defined(__DragonFly__) && (__DragonFly_version + 0 >= 200202))
+ int getnetbyname_r __P((const char *, struct netent *,
+ 			char *, size_t, struct netent **, int*));
+ int getnetbyaddr_r __P((unsigned long int, int, struct netent *,
+@@ -525,7 +533,7 @@ struct netent	*getnetent_r __P((struct n
+ void		setnetent_r __P((int));
+ void		endnetent_r __P((void));
+ 
+-#if defined(__GLIBC__) || defined(__FreeBSD__) && (__FreeBSD_version + 0 >= 601103)
++#if defined(__GLIBC__) || (defined(__FreeBSD__) && (__FreeBSD_version + 0 >= 601103)) || (defined(__DragonFly__) && (__DragonFly_version + 0 >= 200202))
+ int getprotobyname_r __P((const char *, struct protoent *, char *,
+ 			  size_t, struct protoent **));
+ int getprotobynumber_r __P((int, struct protoent *, char *, size_t,
+@@ -541,7 +549,7 @@ struct protoent	*getprotoent_r __P((stru
+ void		setprotoent_r __P((int));
+ void		endprotoent_r __P((void));
+ 
+-#if defined(__GLIBC__) || defined(__FreeBSD__) && (__FreeBSD_version + 0 >= 601103)
++#if defined(__GLIBC__) || (defined(__FreeBSD__) && (__FreeBSD_version + 0 >= 601103)) || (defined(__DragonFly__) && (__DragonFly_version + 0 >= 200202))
+ int getservbyname_r __P((const char *name, const char *,
+ 			 struct servent *, char *, size_t, struct servent **));
+ int getservbyport_r __P((int port, const char *,
diff --git a/net/bind95/distinfo b/net/bind95/distinfo
index efd467a1e65..7a1b300240f 100644
--- a/net/bind95/distinfo
+++ b/net/bind95/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2009/03/22 15:34:03 adrianp Exp $
+$NetBSD: distinfo,v 1.8 2009/04/07 17:38:11 hasso Exp $
 
 SHA1 (bind-9.5.1-P2.tar.gz) = 5c122d1abf8edfe53f86059e67e28753935f62f5
 RMD160 (bind-9.5.1-P2.tar.gz) = e57cad26efc3ad4aea17aaf2cce506c69c70a643
@@ -12,5 +12,5 @@ SHA1 (patch-ai) = 88e6d90b67fccaab26c3a3a1b5539c374d51e417
 SHA1 (patch-aj) = c3bbf84a8a735298552f918ac38331e06a1b68a1
 SHA1 (patch-al) = eb6a52d3f865639447ec6f9019c0ea1d2122b772
 SHA1 (patch-am) = bb267f13dbd30d492f4dfcf9c278b941efa97bed
-SHA1 (patch-an) = 6ec6ede602292ef2eaf5f0891e97576218bd8c3e
+SHA1 (patch-an) = be808fcb6f2f9b88c6a0d94765bda4b5eb8a4c93
 SHA1 (patch-ao) = 9a1ed7b37befdd8e29d233fe55cd62362df3c50e
diff --git a/net/bind95/patches/patch-an b/net/bind95/patches/patch-an
index d3fd57ebcaf..9b67ae1dc1f 100644
--- a/net/bind95/patches/patch-an
+++ b/net/bind95/patches/patch-an
@@ -1,7 +1,7 @@
-$NetBSD: patch-an,v 1.1.1.1 2008/06/21 23:15:28 adrianp Exp $
+$NetBSD: patch-an,v 1.2 2009/04/07 17:38:11 hasso Exp $
 
---- lib/bind/include/netdb.h.orig
-+++ lib/bind/include/netdb.h
+--- lib/bind/include/netdb.h.orig	2008-02-28 07:46:12 +0200
++++ lib/bind/include/netdb.h	2009-04-06 12:10:27 +0300
 @@ -179,9 +179,17 @@ struct	addrinfo {
  	int		_ai_pad;
  #endif
@@ -20,3 +20,39 @@ $NetBSD: patch-an,v 1.1.1.1 2008/06/21 23:15:28 adrianp Exp $
  #ifdef __linux
  	struct sockaddr	*ai_addr; 	/*%< binary address */
  	char		*ai_canonname;	/*%< canonical name for hostname */
+@@ -492,7 +500,7 @@ int		innetgr_r __P((const char *, const 
+ #endif
+ #else
+  /* defined(sun) || defined(bsdi) */
+-#if defined(__GLIBC__) || defined(__FreeBSD__) && (__FreeBSD_version + 0 >= 601103)
++#if defined(__GLIBC__) || (defined(__FreeBSD__) && (__FreeBSD_version + 0 >= 601103)) || (defined(__DragonFly__) && (__DragonFly_version + 0 >= 200202))
+ int gethostbyaddr_r __P((const char *, int, int, struct hostent *,
+ 		         char *, size_t, struct hostent **, int *));
+ int gethostbyname_r __P((const char *, struct hostent *,
+@@ -509,7 +517,7 @@ struct hostent	*gethostent_r __P((struct
+ void		sethostent_r __P((int));
+ void		endhostent_r __P((void));
+ 
+-#if defined(__GLIBC__) || defined(__FreeBSD__) && (__FreeBSD_version + 0 >= 601103)
++#if defined(__GLIBC__) || (defined(__FreeBSD__) && (__FreeBSD_version + 0 >= 601103)) || (defined(__DragonFly__) && (__DragonFly_version + 0 >= 200202))
+ int getnetbyname_r __P((const char *, struct netent *,
+ 			char *, size_t, struct netent **, int*));
+ int getnetbyaddr_r __P((unsigned long int, int, struct netent *,
+@@ -525,7 +533,7 @@ struct netent	*getnetent_r __P((struct n
+ void		setnetent_r __P((int));
+ void		endnetent_r __P((void));
+ 
+-#if defined(__GLIBC__) || defined(__FreeBSD__) && (__FreeBSD_version + 0 >= 601103)
++#if defined(__GLIBC__) || (defined(__FreeBSD__) && (__FreeBSD_version + 0 >= 601103)) || (defined(__DragonFly__) && (__DragonFly_version + 0 >= 200202))
+ int getprotobyname_r __P((const char *, struct protoent *, char *,
+ 			  size_t, struct protoent **));
+ int getprotobynumber_r __P((int, struct protoent *, char *, size_t,
+@@ -541,7 +549,7 @@ struct protoent	*getprotoent_r __P((stru
+ void		setprotoent_r __P((int));
+ void		endprotoent_r __P((void));
+ 
+-#if defined(__GLIBC__) || defined(__FreeBSD__) && (__FreeBSD_version + 0 >= 601103)
++#if defined(__GLIBC__) || (defined(__FreeBSD__) && (__FreeBSD_version + 0 >= 601103)) || (defined(__DragonFly__) && (__DragonFly_version + 0 >= 200202))
+ int getservbyname_r __P((const char *name, const char *,
+ 			 struct servent *, char *, size_t, struct servent **));
+ int getservbyport_r __P((int port, const char *,