- Rename rc script "named" to "named9" to avoid conflicts with NetBSD's

  builtin script.
- Don't set "pidfile" in "named9.sh" because it breaks change rooted
  configurations.
- Disable inlining in "lib/dns/rbt.c" on PowerPC systems because certain
  GCC version create broken code for that file.
Bump package revision because of the above changes.

4 files changed, 21 insertions, 5 deletions

diff --git a/net/bind9/Makefile b/net/bind9/Makefile
index 6753ae11841..0f164a36888 100644
--- a/net/bind9/Makefile
+++ b/net/bind9/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.66 2005/03/15 16:07:01 tron Exp $
+# $NetBSD: Makefile,v 1.67 2005/03/16 13:56:24 tron Exp $
 
 DISTNAME=	bind-${BIND_VERSION}
 PKGNAME=	bind-${BIND_VERSION}pl1
+PKGREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.isc.org/isc/bind9/${BIND_VERSION}/
 
@@ -44,7 +45,7 @@ PLIST_SUBST+=	IPV6H=
 .endif
 
 PLIST_SRC=	${WRKDIR}/PLIST
-RCD_SCRIPTS=	lwresd named
+RCD_SCRIPTS=	lwresd named9
 
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/bind9
diff --git a/net/bind9/distinfo b/net/bind9/distinfo
index 279f8e5c205..755274cfd9c 100644
--- a/net/bind9/distinfo
+++ b/net/bind9/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.22 2005/03/15 15:50:04 tron Exp $
+$NetBSD: distinfo,v 1.23 2005/03/16 13:56:24 tron Exp $
 
 SHA1 (bind/9.3.0/bind-9.3.0.tar.gz) = 8186898daea3122180a0f0fc54cf4b4632d2270e
 RMD160 (bind/9.3.0/bind-9.3.0.tar.gz) = d1ba3ed1ba992b19a51308b0958a17a56f5b102b
@@ -12,6 +12,7 @@ SHA1 (patch-ac) = 57f0fee92a6c84bf422c6b872eb327b755450557
 SHA1 (patch-ad) = 91fb539679a850f1b9ae4af5d6eb8f8ea740f3d9
 SHA1 (patch-ae) = 81b9d96b7c0b8da52ef8970113738d0d37483a5e
 SHA1 (patch-af) = 1f9058f0c6893a800d1af52b1daf35b45385a78e
+SHA1 (patch-ag) = 9d61e0f527a76977bf8457355997d201fa37dd4e
 SHA1 (patch-ah) = b6f6149d5730201c191fa35ba17e14ffc9195f67
 SHA1 (patch-ai) = 7ea8771f7dc1a6752838d7d458cf14c30118a8e4
 SHA1 (patch-aj) = 7422829ca0dc3d411f00628189f059e47350b524
diff --git a/net/bind9/files/named.sh b/net/bind9/files/named9.sh
index b3198bd6616..ef53fdc9457 100644
--- a/net/bind9/files/named.sh
+++ b/net/bind9/files/named9.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: named.sh,v 1.2 2002/09/23 14:40:52 grant Exp $
+# $NetBSD: named9.sh,v 1.1 2005/03/16 13:56:25 tron Exp $
 #
 # PROVIDE: named
 # REQUIRE: SERVERS
@@ -10,7 +10,6 @@
 name="named"
 rcvar=${name}9
 command="@PREFIX@/sbin/${name}"
-pidfile="/var/run/${name}.pid"
 
 extra_commands="reload"
 
diff --git a/net/bind9/patches/patch-ag b/net/bind9/patches/patch-ag
new file mode 100644
index 00000000000..f88d9c0c8e4
--- /dev/null
+++ b/net/bind9/patches/patch-ag
@@ -0,0 +1,15 @@
+$NetBSD: patch-ag,v 1.5 2005/03/16 13:56:25 tron Exp $
+
+--- lib/dns/rbt.c.orig	2004-03-08 21:06:27.000000000 +0000
++++ lib/dns/rbt.c	2005-03-16 13:45:23.000000000 +0000
+@@ -165,6 +165,10 @@
+ static void dns_rbt_printnodename(dns_rbtnode_t *node);
+ #endif
+ 
++#if !defined(inline) && defined(__powerpc__)
++#define	inline	/**/
++#endif
++
+ static inline dns_rbtnode_t *
+ find_up(dns_rbtnode_t *node) {
+ 	dns_rbtnode_t *root;