[pkgsrc/trunk]: pkgsrc/net/bind9 Bump PKGREVISION to 1.

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/b515de1e79c8
branches:  trunk
changeset: 518002:b515de1e79c8
user:      seb <seb%pkgsrc.org@localhost>
date:      Mon Aug 28 16:00:45 2006 +0000

description:
Bump PKGREVISION to 1.

Fix build on NetBSD/sparc64 3.x: sync CPP symbols usage between
struct addrinfo definition and its usage in getaddrinfo().

While here define struct addrinfo's pad members the same way as in
NetBSD's /usr/include/netbsd.h and sync code in
lib/bind/irs/getaddrinfo.c:getaddrinfo().

This had been reported to bind9-bugs at isc dot org.

diffstat:

 net/bind9/Makefile         |   3 ++-
 net/bind9/distinfo         |   4 +++-
 net/bind9/patches/patch-an |  22 ++++++++++++++++++++++
 net/bind9/patches/patch-ao |  22 ++++++++++++++++++++++
 4 files changed, 49 insertions(+), 2 deletions(-)

diffs (79 lines):

diff -r 2059042c1f08 -r b515de1e79c8 net/bind9/Makefile
--- a/net/bind9/Makefile        Mon Aug 28 15:07:48 2006 +0000
+++ b/net/bind9/Makefile        Mon Aug 28 16:00:45 2006 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.79 2006/08/17 14:14:18 taca Exp $
+# $NetBSD: Makefile,v 1.80 2006/08/28 16:00:45 seb Exp $
 
 DISTNAME=      bind-${BIND_VERSION}
+PKGREVISION=   1
 CATEGORIES=    net
 MASTER_SITES=  ftp://ftp.isc.org/isc/bind9/${BIND_VERSION}/
 
diff -r 2059042c1f08 -r b515de1e79c8 net/bind9/distinfo
--- a/net/bind9/distinfo        Mon Aug 28 15:07:48 2006 +0000
+++ b/net/bind9/distinfo        Mon Aug 28 16:00:45 2006 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.27 2006/08/17 14:14:18 taca Exp $
+$NetBSD: distinfo,v 1.28 2006/08/28 16:00:45 seb Exp $
 
 SHA1 (bind-9.3.2.tar.gz) = 13efeaf496ed110980088fb5cbe22460f04a0fac
 RMD160 (bind-9.3.2.tar.gz) = c825b6308eb374e9bcf9b6ccc48f65d8753c0a6d
@@ -12,3 +12,5 @@
 SHA1 (patch-aj) = c3bbf84a8a735298552f918ac38331e06a1b68a1
 SHA1 (patch-al) = eb6a52d3f865639447ec6f9019c0ea1d2122b772
 SHA1 (patch-am) = bb267f13dbd30d492f4dfcf9c278b941efa97bed
+SHA1 (patch-an) = b3e5cd93890aa9a9cec7c14abf1b62ddbf854b14
+SHA1 (patch-ao) = 8a3f8f1b5871af263fc99bc8e552b3ab615bc815
diff -r 2059042c1f08 -r b515de1e79c8 net/bind9/patches/patch-an
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/net/bind9/patches/patch-an        Mon Aug 28 16:00:45 2006 +0000
@@ -0,0 +1,22 @@
+$NetBSD: patch-an,v 1.1 2006/08/28 16:00:45 seb Exp $
+
+--- lib/bind/include/netdb.h.orig      2004-11-30 01:15:42.000000000 +0000
++++ lib/bind/include/netdb.h
+@@ -179,9 +179,17 @@ struct    addrinfo {
+       int             _ai_pad;
+ #endif
+       socklen_t       ai_addrlen;
++#elif defined(__NetBSD__)
++#if defined(__sparc__) && defined(_LP64)
++      int             _ai_pad;
++#endif
++      socklen_t       ai_addrlen;
+ #else
+       size_t          ai_addrlen;     /* length of ai_addr */
+ #endif
++#if defined(__NetBSD__) && (defined(__alpha__) || (defined(__i386__) && defined(_LP64)))
++      int             _ai_pad;
++#endif
+ #ifdef __linux
+       struct sockaddr *ai_addr;       /* binary address */
+       char            *ai_canonname;  /* canonical name for hostname */
diff -r 2059042c1f08 -r b515de1e79c8 net/bind9/patches/patch-ao
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/net/bind9/patches/patch-ao        Mon Aug 28 16:00:45 2006 +0000
@@ -0,0 +1,22 @@
+$NetBSD: patch-ao,v 1.1 2006/08/28 16:00:45 seb Exp $
+
+--- lib/bind/irs/getaddrinfo.c.orig    2005-07-28 07:43:19.000000000 +0000
++++ lib/bind/irs/getaddrinfo.c
+@@ -332,7 +332,7 @@ getaddrinfo(hostname, servname, hints, r
+       pai->ai_family = PF_UNSPEC;
+       pai->ai_socktype = ANY;
+       pai->ai_protocol = ANY;
+-#ifdef __sparcv9
++#if (defined(sun) && defined(_SOCKLEN_T) && defined(__sparc9)) || (defined(__NetBSD__) && (((defined(__sparc__) || defined(__i386__)) && defined(_LP64)) || defined(__alpha__)))
+       /*
+        * clear _ai_pad to preserve binary
+        * compatibility with previously compiled 64-bit
+@@ -365,7 +365,7 @@ getaddrinfo(hostname, servname, hints, r
+               }
+               memcpy(pai, hints, sizeof(*pai));
+ 
+-#ifdef __sparcv9
++#if (defined(sun) && defined(_SOCKLEN_T) && defined(__sparc9)) || (defined(__NetBSD__) && (((defined(__sparc__) || defined(__i386__)) && defined(_LP64)) || defined(__alpha__)))
+               /*
+                * We need to clear _ai_pad to preserve binary
+                * compatibility.  See prior comment.