* Fixes mismatch between the section and extension of skeyprune.

* skeyprune is perl script, need runtime dependency on perl5.
* Fixes mis-use of config.h (patch-a[d-i]), avoid to use a mixture of
  local hash function with system RMD header.
  Fixes build failure reported by PR 39872 and PR 39953.

Bump PKGREVISION.

10 files changed, 169 insertions, 11 deletions

diff --git a/security/skey/Makefile b/security/skey/Makefile
index bcc2def7201..350740e664f 100644
--- a/security/skey/Makefile
+++ b/security/skey/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.21 2008/12/13 13:26:19 obache Exp $
+# $NetBSD: Makefile,v 1.22 2008/12/13 13:58:31 obache Exp $
 #
 
 DISTNAME=		skey-1.1.5
-PKGREVISION=		2
+PKGREVISION=		3
 CATEGORIES=		security
 MASTER_SITES=		http://www.sparc.spb.su/solaris/skey/
 EXTRACT_SUFX=		.tar.bz2
@@ -13,7 +13,7 @@ COMMENT=		Port of OpenBSD s/key implementation
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-USE_TOOLS+=		gmake perl
+USE_TOOLS+=		gmake perl:run
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
 CONF_FILES+=		${PREFIX}/share/examples/skey/skeykeys \
diff --git a/security/skey/PLIST b/security/skey/PLIST
index a43c317a0f4..b48021ea792 100644
--- a/security/skey/PLIST
+++ b/security/skey/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2005/06/30 04:06:39 minskim Exp $
+@comment $NetBSD: PLIST,v 1.3 2008/12/13 13:58:31 obache Exp $
 bin/skey
 bin/skeyaudit
 bin/skeyinfo
@@ -12,6 +12,6 @@ man/man1/skey.1
 man/man1/skeyaudit.1
 man/man1/skeyinfo.1
 man/man1/skeyinit.1
-man/man8/skeyprune.1
+man/man8/skeyprune.8
 share/examples/skey/skeykeys
 @dirrm share/examples/skey
diff --git a/security/skey/distinfo b/security/skey/distinfo
index 9d95a0b2712..6da0a7e1fc3 100644
--- a/security/skey/distinfo
+++ b/security/skey/distinfo
@@ -1,8 +1,14 @@
-$NetBSD: distinfo,v 1.8 2008/12/13 13:26:19 obache Exp $
+$NetBSD: distinfo,v 1.9 2008/12/13 13:58:31 obache Exp $
 
 SHA1 (skey-1.1.5.tar.bz2) = d55fb286098900cdf3eb6b174a720a06c722312a
 RMD160 (skey-1.1.5.tar.bz2) = 33d97cbcd6dbc91bdca5b27056d51d1f5d06b68d
 Size (skey-1.1.5.tar.bz2) = 61911 bytes
-SHA1 (patch-aa) = 9ffb4f7c3b562ff5d50ea396ac130d7056b4a216
+SHA1 (patch-aa) = 78a4f791c5378d0ce2df8a92203859a34bc92bfe
 SHA1 (patch-ab) = 69d8f92968b3ebffc9b05fe7af1cde7e9d116587
 SHA1 (patch-ac) = f3e9a6ebb7ac22116c8d8e6fe8ca0db7f8d37051
+SHA1 (patch-ad) = d1c43f17b52a82679ec554296a853196d8469bc7
+SHA1 (patch-ae) = 344026ab4acffe57aa4d0545a791f845ecafda4b
+SHA1 (patch-af) = a2f46213568bb61cebbca658cf8bdb17e4150361
+SHA1 (patch-ag) = 43db09ab58733b773ed30015984f724ba80d0e11
+SHA1 (patch-ah) = dec25286d50cbe0181b9b4bc99bd92556e573b5e
+SHA1 (patch-ai) = ad90b480047a22b25bc2c6e416a224e892e501c9
diff --git a/security/skey/patches/patch-aa b/security/skey/patches/patch-aa
index 7bdc6a539da..b25e7220459 100644
--- a/security/skey/patches/patch-aa
+++ b/security/skey/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.4 2008/12/13 13:26:19 obache Exp $
+$NetBSD: patch-aa,v 1.5 2008/12/13 13:58:31 obache Exp $
 
---- Makefile.in.orig	2001-05-10 11:10:49.000000000 -0500
+--- Makefile.in.orig	2001-05-10 16:10:49.000000000 +0000
 +++ Makefile.in
 @@ -18,15 +18,18 @@ LIBS=@LIBS@
  AR=@AR@
@@ -55,11 +55,13 @@ $NetBSD: patch-aa,v 1.4 2008/12/13 13:26:19 obache Exp $
  	${INSTALL_DATA} libskey.a $(DESTDIR)$(libdir)
  	${INSTALL_DATA} ${HDRS} $(DESTDIR)$(includedir)
  	@for target in ${TARGETS}; do \
-@@ -107,7 +110,7 @@ install: ${TARGETS}
+@@ -106,8 +109,8 @@ install: ${TARGETS}
+ 	${INSTALL_MAN} skeyinit.[01].out $(DESTDIR)$(mandir)/$(mansubdir)1/skeyinit.1
  	${INSTALL_MAN} skeyinfo.[01].out $(DESTDIR)$(mandir)/$(mansubdir)1/skeyinfo.1
  	${INSTALL_MAN} skeyaudit.[01].out $(DESTDIR)$(mandir)/$(mansubdir)1/skeyaudit.1
- 	${INSTALL_MAN} skeyprune.[08].out $(DESTDIR)$(mandir)/$(mansubdir)8/skeyprune.1
+-	${INSTALL_MAN} skeyprune.[08].out $(DESTDIR)$(mandir)/$(mansubdir)8/skeyprune.1
 -	${TOUCH} ${DESTDIR}${sysconfdir}/skeykeys
++	${INSTALL_MAN} skeyprune.[08].out $(DESTDIR)$(mandir)/$(mansubdir)8/skeyprune.8
 +	${TOUCH} ${DESTDIR}$(prefix)/share/examples/skey/skeykeys
  
  uninstallall: uninstall
diff --git a/security/skey/patches/patch-ad b/security/skey/patches/patch-ad
new file mode 100644
index 00000000000..117daa5a1bf
--- /dev/null
+++ b/security/skey/patches/patch-ad
@@ -0,0 +1,23 @@
+$NetBSD: patch-ad,v 1.1 2008/12/13 13:58:31 obache Exp $
+
+include "config.h" before using HAVE_* macro.
+
+--- md4c.c.orig	2001-05-10 16:10:49.000000000 +0000
++++ md4c.c
+@@ -21,6 +21,8 @@
+    documentation and/or software.
+  */
+ 
++#include "config.h"
++
+ #ifndef HAVE_MD4_H
+ 
+ #if defined(LIBC_SCCS) && !defined(lint)
+@@ -29,7 +31,6 @@ static char rcsid[] = "$OpenBSD: md4c.c,
+ 
+ #include <string.h>
+ #include <sys/types.h>
+-#include "config.h"
+ #include "md4.h"
+ 
+ /* POINTER defines a generic pointer type */
diff --git a/security/skey/patches/patch-ae b/security/skey/patches/patch-ae
new file mode 100644
index 00000000000..d1100580d2f
--- /dev/null
+++ b/security/skey/patches/patch-ae
@@ -0,0 +1,23 @@
+$NetBSD: patch-ae,v 1.1 2008/12/13 13:58:31 obache Exp $
+
+include "config.h" before using HAVE_* macro.
+
+--- md5c.c.orig	2001-05-10 16:10:49.000000000 +0000
++++ md5c.c
+@@ -22,6 +22,8 @@ These notices must be retained in any co
+ documentation and/or software.
+  */
+ 
++#include "config.h"
++
+ #ifndef HAVE_MD5_H
+ 
+ #if defined(LIBC_SCCS) && !defined(lint)
+@@ -30,7 +32,6 @@ static char rcsid[] = "$OpenBSD: md5c.c,
+ 
+ #include <string.h>
+ #include <sys/types.h>
+-#include "config.h"
+ #include "md5.h"
+ 
+ 
diff --git a/security/skey/patches/patch-af b/security/skey/patches/patch-af
new file mode 100644
index 00000000000..06a457857a9
--- /dev/null
+++ b/security/skey/patches/patch-af
@@ -0,0 +1,23 @@
+$NetBSD: patch-af,v 1.1 2008/12/13 13:58:31 obache Exp $
+
+include "config.h" before using HAVE_* macro.
+
+--- rmd160.c.orig	2001-05-10 16:10:49.000000000 +0000
++++ rmd160.c
+@@ -15,6 +15,8 @@
+  *      1996, All Rights Reserved
+  *
+ \********************************************************************/
++#include "config.h"
++
+ #ifndef HAVE_RMD160_H
+ 
+ /* header files */
+@@ -22,7 +24,6 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <sys/types.h>
+-#include "config.h"
+ #include "rmd160.h"
+ 
+ /********************************************************************/
diff --git a/security/skey/patches/patch-ag b/security/skey/patches/patch-ag
new file mode 100644
index 00000000000..c1b40960151
--- /dev/null
+++ b/security/skey/patches/patch-ag
@@ -0,0 +1,36 @@
+$NetBSD: patch-ag,v 1.1 2008/12/13 13:58:31 obache Exp $
+
+Change to same as other *.c for hash functions.
+Avoid to use a mixture of local RMD160 functions with system RMD160 header.
+
+--- rmd160hl.c.orig	2001-05-10 16:10:49.000000000 +0000
++++ rmd160hl.c
+@@ -7,6 +7,10 @@
+  * ----------------------------------------------------------------------------
+  */
+ 
++#include "config.h"
++
++#ifndef HAVE_RMD160_H
++
+ #if defined(LIBC_SCCS) && !defined(lint)
+ static char rcsid[] = "$OpenBSD: rmd160hl.c,v 1.2 1999/08/17 09:13:12 millert Exp $";
+ #endif /* LIBC_SCCS and not lint */
+@@ -18,12 +22,7 @@ static char rcsid[] = "$OpenBSD: rmd160h
+ #include <sys/types.h>
+ #include <sys/uio.h>
+ #include <unistd.h>
+-#include "config.h"
+-#ifdef HAVE_RMD160_H
+-#include <rmd160.h>
+-#else
+ #include "rmd160.h"
+-#endif
+ 
+ /* ARGSUSED */
+ char *
+@@ -83,3 +82,4 @@ RMD160Data (data, len, buf)
+     RMD160Update(&ctx, data, len);
+     return(RMD160End(&ctx, buf));
+ }
++#endif
diff --git a/security/skey/patches/patch-ah b/security/skey/patches/patch-ah
new file mode 100644
index 00000000000..45eeb4d3c46
--- /dev/null
+++ b/security/skey/patches/patch-ah
@@ -0,0 +1,22 @@
+$NetBSD: patch-ah,v 1.1 2008/12/13 13:58:31 obache Exp $
+
+include "config.h" before using HAVE_* macro.
+
+--- sha1.c.orig	2001-05-10 16:10:49.000000000 +0000
++++ sha1.c
+@@ -13,13 +13,14 @@
+  * A million repetitions of "a"
+  *   34AA973C D4C4DAA4 F61EEB2B DBAD2731 6534016F
+  */
++#include "config.h"
++
+ #ifndef HAVE_SHA1_H
+ 
+ #define SHA1HANDSOFF		/* Copies data before messing with it. */
+ 
+ #include <sys/param.h>
+ #include <string.h>
+-#include "config.h"
+ #include "sha1.h"
+ 
+ #define rol(value, bits) (((value) << (bits)) | ((value) >> (32 - (bits))))
diff --git a/security/skey/patches/patch-ai b/security/skey/patches/patch-ai
new file mode 100644
index 00000000000..84001aaa6af
--- /dev/null
+++ b/security/skey/patches/patch-ai
@@ -0,0 +1,23 @@
+$NetBSD: patch-ai,v 1.1 2008/12/13 13:58:31 obache Exp $
+
+include "config.h" before using HAVE_* macro.
+
+--- sha1hl.c.orig	2001-05-10 16:10:49.000000000 +0000
++++ sha1hl.c
+@@ -6,6 +6,8 @@
+  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
+  * ----------------------------------------------------------------------------
+  */
++#include "config.h"
++
+ #ifndef HAVE_SHA1_H
+ 
+ #if defined(LIBC_SCCS) && !defined(lint)
+@@ -19,7 +21,6 @@ static char rcsid[] = "$OpenBSD: sha1hl.
+ #include <sys/types.h>
+ #include <sys/uio.h>
+ #include <unistd.h>
+-#include "config.h"
+ #include "sha1.h"
+ 
+ /* ARGSUSED */