Update to 2.3.4. From the changelog:

* keychain 2.3.4 (24 Jul 2004)

  24 Jul 2004; Aron Griffis <agriffis@gentoo.org>;
  Fix bug 28599 reported by Bruno Pelaia; ignore defunct processes in
  ps output

* keychain 2.3.3 (30 Jun 2004)

  30 Jun 2004; Aron Griffis <agriffis@gentoo.org>;
  Fix bug reported by Matthew S. Moore in email; escape the backticks
  in --help output

  Fix bug reported by Herbie Ong in email; set pidf, cshpidf and lockf
  variables after parsing command-line to honor --dir setting

  Fix bug reported by Stephan Stahl in email; make spaces in filenames
  work throughout keychain, even in pure Bourne shell

  Fix operation on HP-UX with older OpenSSH by interpreting output of
  ssh-add as well as the error status

* keychain 2.3.2 (16 Jun 2004)

  16 Jun 2004; Aron Griffis <agriffis@gentoo.org>;
  Fix bug 53837 (keychain needs ssh-askpass) by unsetting SSH_ASKPASS
  when --nogui is specified

* keychain 2.3.1 (03 Jun 2004)

  03 Jun 2004; Aron Griffis <agriffis@gentoo.org>;
  Fix bug 52874: problems when the user is running csh

* keychain 2.3.0 (14 May 2004)

  14 May 2004; Aron Griffis <agriffis@gentoo.org>;
  Rewrite the locking code to avoid procmail

* keychain 2.2.2 (03 May 2004)

  03 May 2004; Aron Griffis <agriffis@gentoo.org>;
  Call loadagent prior to generating HOSTNAME-csh file so that
  variables are set.

* keychain 2.2.1 (27 Apr 2004)

  27 Apr 2004; Aron Griffis <agriffis@gentoo.org>;
  Find running ssh-agent processes by searching for /[s]sh-agen/
  instead of /[s]sh-agent/ for the sake of Solaris, which cuts off ps
  -u output at 8 characters.  Thanks to Clay England for reporting the
  problem and testing the fix.

* keychain 2.2.0 (21 Apr 2004)

  21 Apr 2004; Aron Griffis <agriffis@gentoo.org>;
  Rewrote most of the code, organized into functions, fixed speed
  issues involving ps, fixed compatibility issues for various UNIXes,
  hopefully didn't introduce too many bugs.  This version has a
  --quick option (for me) and a --timeout option (for carpaski).

  Also added a Makefile and converted the man-page to pod for easier
  editing.  See perlpod(1) for information on the format.  Note that
  the pod is sucked into keychain and colorized when you run make.

3 files changed, 6 insertions, 31 deletions

diff --git a/security/keychain/Makefile b/security/keychain/Makefile
index 0743bc06414..654dd85e294 100644
--- a/security/keychain/Makefile
+++ b/security/keychain/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.10 2004/03/29 03:29:46 schmonz Exp $
+# $NetBSD: Makefile,v 1.11 2004/07/26 19:02:10 schmonz Exp $
 
-DISTNAME=	keychain-2.0.3
-PKGNAME=	${DISTNAME}
+DISTNAME=	keychain-2.3.4
 CATEGORIES=	security
 MASTER_SITES=	http://www.ibiblio.org/gentoo/distfiles/
 EXTRACT_SUFX=	.tar.bz2
@@ -16,7 +15,7 @@ DEPENDS+=	openssh-[0-9]*:../../security/openssh
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-NO_BUILD=	# defined
+NO_BUILD=		# defined
 
 INSTALLATION_DIRS=	bin man/man1 share/doc/${PKGBASE}
 
diff --git a/security/keychain/distinfo b/security/keychain/distinfo
index 28942dbb240..323f44eb977 100644
--- a/security/keychain/distinfo
+++ b/security/keychain/distinfo
@@ -1,5 +1,4 @@
-$NetBSD: distinfo,v 1.7 2003/07/18 03:59:49 martti Exp $
+$NetBSD: distinfo,v 1.8 2004/07/26 19:02:10 schmonz Exp $
 
-SHA1 (keychain-2.0.3.tar.bz2) = 417ad52101ac5069f54fb6ddd66ad787026c0d1e
-Size (keychain-2.0.3.tar.bz2) = 16458 bytes
-SHA1 (patch-aa) = 1bce60e710bfaea0e0f0423d62ecc0561cd5643c
+SHA1 (keychain-2.3.4.tar.bz2) = 9181cfb2c002bf1e851759a117e83e3a2fe35052
+Size (keychain-2.3.4.tar.bz2) = 24430 bytes
diff --git a/security/keychain/patches/patch-aa b/security/keychain/patches/patch-aa
deleted file mode 100644
index 08e8c2cf0e3..00000000000
--- a/security/keychain/patches/patch-aa
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-aa,v 1.7 2003/07/18 03:59:50 martti Exp $
-
---- keychain.orig	Mon Apr 21 03:04:21 2003
-+++ keychain	Fri Jul 18 06:29:33 2003
-@@ -186,6 +186,9 @@
- elif [ -n "`echo $myuname | grep HP-UX`" ]
- then
- 	hpux="yes"
-+elif [ -n "`echo $myuname | grep NetBSD`" ]
-+then
-+	netbsd="yes"
- fi
- 
- # Query local host for SSH application, presently supporting only
-@@ -199,7 +202,7 @@
- 
- # Avoid trapping on signal names with Cygwin.
- trapint="INT"
--if [ "$cygwin" = "yes" ]
-+if [ "$cygwin" = "yes" -o "$netbsd" = "yes" ]
- then
- 	trapint=2
- fi