[pkgsrc/trunk]: pkgsrc/net Make these compile on DragonFly master.

[hasso <hasso%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/1a14502a4ecf
branches:  trunk
changeset: 556988:1a14502a4ecf
user:      hasso <hasso%pkgsrc.org@localhost>
date:      Tue Apr 07 17:38:10 2009 +0000

description:
Make these compile on DragonFly master.

diffstat:

 net/bind9/distinfo          |   4 ++--
 net/bind9/patches/patch-an  |  38 +++++++++++++++++++++++++++++++++++++-
 net/bind95/distinfo         |   4 ++--
 net/bind95/patches/patch-an |  42 +++++++++++++++++++++++++++++++++++++++---
 4 files changed, 80 insertions(+), 8 deletions(-)

diffs (135 lines):

diff -r e11f627060b5 -r 1a14502a4ecf net/bind9/distinfo
--- a/net/bind9/distinfo        Tue Apr 07 17:31:11 2009 +0000
+++ b/net/bind9/distinfo        Tue Apr 07 17:38:10 2009 +0000
@@ -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-aj) = c3bbf84a8a735298552f918ac38331e06a1b68a1
 SHA1 (patch-al) = eb6a52d3f865639447ec6f9019c0ea1d2122b772
 SHA1 (patch-am) = bb267f13dbd30d492f4dfcf9c278b941efa97bed
-SHA1 (patch-an) = 6ec6ede602292ef2eaf5f0891e97576218bd8c3e
+SHA1 (patch-an) = 21cb90b653121bb63434fa05aa9e00825e653a3e
 SHA1 (patch-ao) = 9a1ed7b37befdd8e29d233fe55cd62362df3c50e
diff -r e11f627060b5 -r 1a14502a4ecf net/bind9/patches/patch-an
--- a/net/bind9/patches/patch-an        Tue Apr 07 17:31:11 2009 +0000
+++ b/net/bind9/patches/patch-an        Tue Apr 07 17:38:10 2009 +0000
@@ -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 @@
  #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 -r e11f627060b5 -r 1a14502a4ecf net/bind95/distinfo
--- a/net/bind95/distinfo       Tue Apr 07 17:31:11 2009 +0000
+++ b/net/bind95/distinfo       Tue Apr 07 17:38:10 2009 +0000
@@ -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-aj) = c3bbf84a8a735298552f918ac38331e06a1b68a1
 SHA1 (patch-al) = eb6a52d3f865639447ec6f9019c0ea1d2122b772
 SHA1 (patch-am) = bb267f13dbd30d492f4dfcf9c278b941efa97bed
-SHA1 (patch-an) = 6ec6ede602292ef2eaf5f0891e97576218bd8c3e
+SHA1 (patch-an) = be808fcb6f2f9b88c6a0d94765bda4b5eb8a4c93
 SHA1 (patch-ao) = 9a1ed7b37befdd8e29d233fe55cd62362df3c50e
diff -r e11f627060b5 -r 1a14502a4ecf net/bind95/patches/patch-an
--- a/net/bind95/patches/patch-an       Tue Apr 07 17:31:11 2009 +0000
+++ b/net/bind95/patches/patch-an       Tue Apr 07 17:38:10 2009 +0000
@@ -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 @@
  #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 *,