Update to radmind 1.9

Major changes from 1.8.1:
- Added support for minus transcripts and special files in command
files
- Ported to HP/UX
Thanks to Jim Foraker for the patch. [ PATCH 1733645 ]

Minor changes from 1.8.1:
- Daemon no longer displays -R in usage. Users should begin using -B
- Fixed bug where path to echo wasn't being set in ra.sh
- Fixed bug where fsdiff wasn't displaying correct version number

6 files changed, 18 insertions, 55 deletions

diff --git a/sysutils/radmind/Makefile b/sysutils/radmind/Makefile
index 10c7e02cdf0..1cef47cc50f 100644
--- a/sysutils/radmind/Makefile
+++ b/sysutils/radmind/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.13 2007/05/07 14:14:06 hauke Exp $
+# $NetBSD: Makefile,v 1.14 2007/08/23 14:10:29 hauke Exp $
 #
 
-DISTNAME=	radmind-1.8.0
+DISTNAME=	radmind-1.9.0
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=radmind/}
 
diff --git a/sysutils/radmind/distinfo b/sysutils/radmind/distinfo
index 871f6b5e276..4ca1b619a65 100644
--- a/sysutils/radmind/distinfo
+++ b/sysutils/radmind/distinfo
@@ -1,12 +1,10 @@
-$NetBSD: distinfo,v 1.11 2007/05/07 14:14:06 hauke Exp $
+$NetBSD: distinfo,v 1.12 2007/08/23 14:10:29 hauke Exp $
 
-SHA1 (radmind-1.8.0.tar.gz) = 2d775ee01ac47ad47f6129b6282bb533600c7df7
-RMD160 (radmind-1.8.0.tar.gz) = e6e8f0ac067b6c96a7a397d0fd3b540cc707bd2b
-Size (radmind-1.8.0.tar.gz) = 387738 bytes
-SHA1 (patch-aa) = 46c1e6b29980712382180c856f389357d6bbee70
-SHA1 (patch-ab) = 444b151795499cb09ceb7cf1722b6cbd45e8998f
+SHA1 (radmind-1.9.0.tar.gz) = 563247e6f9e795a3d8f0868aa261ba18a4a24d5a
+RMD160 (radmind-1.9.0.tar.gz) = 1648f5b423fe87e1396af7d3b24021910671864c
+Size (radmind-1.9.0.tar.gz) = 389258 bytes
+SHA1 (patch-aa) = e82fdc59bfc79f736ca135af9ed9923c09de488f
+SHA1 (patch-ab) = 0b397d1838ed8687927f5503589f91f1faec366b
 SHA1 (patch-ac) = c1ea9930b9c2fee94a0b0d43e8aeec1925e454e7
 SHA1 (patch-ad) = 40974d0b41be44c2ebd0d29dca31bcc42837328a
 SHA1 (patch-ae) = 58b15301aa1df00e6e5bab9f21db8ddc99461f2a
-SHA1 (patch-af) = fa7141a81abbfd05f094af1dd30d8810f73c948e
-SHA1 (patch-ag) = 9afe823cad9efd94a06243a0eef8361882a23d16
diff --git a/sysutils/radmind/patches/patch-aa b/sysutils/radmind/patches/patch-aa
index 1ef6a7caca8..e278bb6e037 100644
--- a/sysutils/radmind/patches/patch-aa
+++ b/sysutils/radmind/patches/patch-aa
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.4 2006/10/05 02:49:30 rillig Exp $
+$NetBSD: patch-aa,v 1.5 2007/08/23 14:10:29 hauke Exp $
 
---- Makefile.in.orig	2006-05-24 19:45:15.000000000 +0200
-+++ Makefile.in	2006-10-05 04:45:05.000000000 +0200
-@@ -236,6 +236,8 @@ rash : FRC
+--- Makefile.in.orig	2007-06-18 23:02:05.000000000 +0200
++++ Makefile.in
+@@ -253,6 +253,8 @@ rash : FRC
  	    -e 's@_RADMIND_MAIL_DOMAIN@${RADMIND_MAIL_DOMAIN}@g' \
  	    -e 's@_RADMIND_COMMANDFILE@${COMMANDFILE}@g' \
  	    -e 's@_RADMIND_VERSION@$(shell cat VERSION)@g' \
 +	    -e 's@_PKG_SYSCONFDIR@${PKG_SYSCONFDIR}@g' \
 +	    -e 's@_LOCALBASE@${LOCALBASE}@g' \
+ 	    -e 's@_RADMIND_ECHO_PATH@${ECHO}@g' \
  	    ${srcdir}/ra.sh > tmp/ra.sh; 
  
- man : FRC
diff --git a/sysutils/radmind/patches/patch-ab b/sysutils/radmind/patches/patch-ab
index 47667760537..22393b1a495 100644
--- a/sysutils/radmind/patches/patch-ab
+++ b/sysutils/radmind/patches/patch-ab
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.6 2007/05/07 14:14:06 hauke Exp $
+$NetBSD: patch-ab,v 1.7 2007/08/23 14:10:29 hauke Exp $
 
---- ra.sh.orig	2007-02-27 16:20:09.000000000 +0100
+--- ra.sh.orig	2007-06-18 23:01:07.000000000 +0200
 +++ ra.sh
 @@ -29,7 +29,7 @@ TLSLEVEL="_RADMIND_AUTHLEVEL"
  EDITOR=${EDITOR:-vi}
@@ -11,7 +11,7 @@ $NetBSD: patch-ab,v 1.6 2007/05/07 14:14:06 hauke Exp $
  FSDIFFROOT="."
  FLAG="_RADMIND_DIR/client/.RadmindRunning"
  CHECKEDOUT="_RADMIND_DIR/client/.CheckedOut"
-@@ -39,7 +39,7 @@ VERSION=_RADMIND_VERSION
+@@ -40,7 +40,7 @@ VERSION=_RADMIND_VERSION
  PREAPPLY="_RADMIND_PREAPPLY"
  POSTAPPLY="_RADMIND_POSTAPPLY"
  
@@ -20,7 +20,7 @@ $NetBSD: patch-ab,v 1.6 2007/05/07 14:14:06 hauke Exp $
  RETRY=10
  
  MKTEMP="_RADMIND_MKTEMP"
-@@ -55,14 +55,6 @@ fi
+@@ -56,14 +56,6 @@ fi
  LTMP="${RASHTMP}/lapply.out"
  FTMP="${RASHTMP}/fsdiff.out"
  
@@ -33,5 +33,5 @@ $NetBSD: patch-ab,v 1.6 2007/05/07 14:14:06 hauke Exp $
 -fi
 -
  Yn() {
-     echo -n "$*" "[Yn] "
+     $ECHO -n "$*" "[Yn] "
      read ans
diff --git a/sysutils/radmind/patches/patch-af b/sysutils/radmind/patches/patch-af
deleted file mode 100644
index 2926e3e4dda..00000000000
--- a/sysutils/radmind/patches/patch-af
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-af,v 1.1 2006/10/05 02:49:59 rillig Exp $
-
---- configure.orig	2006-10-05 04:38:33.000000000 +0200
-+++ configure	2006-10-05 04:40:07.000000000 +0200
-@@ -5039,7 +5039,7 @@ fi;
- 			break;
- 		fi
- 	done
--	if test x_$found_zlib == x_yes; then
-+	if test x_$found_zlib = x_yes; then
- 		if test "$dir" != "/usr"; then
- 			CPPFLAGS="$CPPFLAGS -I$zlibdir/include";
- 			LDFLAGS="$LDFLAGS -L$zlibdir/lib";
diff --git a/sysutils/radmind/patches/patch-ag b/sysutils/radmind/patches/patch-ag
deleted file mode 100644
index 5e1b07bc63e..00000000000
--- a/sysutils/radmind/patches/patch-ag
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2006/10/06 20:55:46 rillig Exp $
-
---- libsnet/configure.orig	2006-05-23 18:01:49.000000000 +0200
-+++ libsnet/configure
-@@ -2549,7 +2549,7 @@ fi;
- 			break;
- 		fi
- 	done
--	if test x_$found_zlib == x_yes; then
-+	if test x_$found_zlib = x_yes; then
- 		if test "$dir" != "/usr"; then
- 			CPPFLAGS="$CPPFLAGS -I$zlibdir/include";
- 	    fi
-@@ -2828,7 +2828,7 @@ fi;
- 		break
- 	    fi
- 	done
--	if test x_$found_sasl == x_yes; then
-+	if test x_$found_sasl = x_yes; then
- 	    cat >>confdefs.h <<\_ACEOF
- #define HAVE_LIBSASL 1
- _ACEOF