- made sure skeyprune uses the correct perl binary

- made sure that troff-style man pages are used on every platform
- some hacks to add IRIX 5 support in hacks.mk

4 files changed, 62 insertions, 2 deletions

diff --git a/security/skey/Makefile b/security/skey/Makefile
index 467a302c8ae..d81fd8e5350 100644
--- a/security/skey/Makefile
+++ b/security/skey/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2006/03/04 21:30:38 jlam Exp $
+# $NetBSD: Makefile,v 1.18 2006/07/09 13:39:06 schwarz Exp $
 #
 
 DISTNAME=		skey-1.1.5
@@ -17,6 +17,12 @@ CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
 CONF_FILES+=		${PREFIX}/share/examples/skey/skeykeys \
 			${PKG_SYSCONFDIR}/skeykeys
 
+SUBST_CLASSES+=		perl
+SUBST_MESSAGE.perl=	fixing perl path
+SUBST_STAGE.perl=	post-extract
+SUBST_FILES.perl=	skeyprune.pl
+SUBST_SED.perl=		-e "s,^\#!/usr/bin/perl,\#!${PERL5},"
+
 INSTALLATION_DIRS=	bin include lib man/man1 man/man8
 
 post-install:
diff --git a/security/skey/distinfo b/security/skey/distinfo
index c59f3c8cf73..bda6a5ea48f 100644
--- a/security/skey/distinfo
+++ b/security/skey/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.5 2005/06/30 04:06:39 minskim Exp $
+$NetBSD: distinfo,v 1.6 2006/07/09 13:39:06 schwarz 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) = c9c0cde8f648fae44bbfbffcb7da0d331fad537d
 SHA1 (patch-ab) = 69d8f92968b3ebffc9b05fe7af1cde7e9d116587
+SHA1 (patch-ac) = 7f0b69315ccec66c4c59da142bd919b46d4c8409
diff --git a/security/skey/hacks.mk b/security/skey/hacks.mk
new file mode 100644
index 00000000000..0db96ee7c88
--- /dev/null
+++ b/security/skey/hacks.mk
@@ -0,0 +1,38 @@
+# $NetBSD: hacks.mk,v 1.1 2006/07/09 13:39:06 schwarz Exp $
+
+.if !defined(SKEY_HACKS_MK)
+SKEY_HACKS_MK=	# defined
+
+### [Sun Jul  9 13:16:14 CDT 2006 : schwarz]
+### pkgsrc expects troff-style man pages on all platforms
+###
+PKG_HACKS+=		enforce-troff-style-man-pages
+# the following line is only to specify mansubdir
+CONFIGURE_ARGS+=	--with-catman=man
+SUBST_CLASSES+=		tsmp
+SUBST_MESSAGE.tsmp=	enforce use of troff style man pages
+SUBST_STAGE.tsmp=	post-patch
+SUBST_FILES.tsmp=	configure
+SUBST_SED.tsmp=		-e 's,$$(CATMAN),$$(TROFFMAN),g'
+
+### [Sun Jul  9 13:20:30 CDT 2006 : schwarz]
+### IRIX 5 does not have usleep()
+###
+.if !empty(LOWER_OPSYS:Mirix5*)
+PKG_HACKS+=		use-sginap-instead-of-usleep
+SUBST_CLASSES+=		sginap
+SUBST_MESSAGE.sginap=	use sginap() instead of usleep()
+SUBST_STAGE.sginap=	post-patch
+SUBST_FILES.sginap=	skeyinit.c skeylogin.c
+SUBST_SED.sginap=	-e 's,usleep(100000),sginap(CLK_TCK/10),g'
+.endif
+
+### [Sun Jul  9 14:11:23 CDT 2006 : schwarz]
+### IRIX 5 does not define 64 bit types in sys/types.h
+###
+.if !empty(LOWER_OPSYS:Mirix5*)
+PKG_HACKS+=		missing-u_int64_t
+CPPFLAGS+=		-DMISSING-U_INT64_T
+.endif
+
+.endif
diff --git a/security/skey/patches/patch-ac b/security/skey/patches/patch-ac
new file mode 100644
index 00000000000..6747d15364f
--- /dev/null
+++ b/security/skey/patches/patch-ac
@@ -0,0 +1,15 @@
+$NetBSD: patch-ac,v 1.1 2006/07/09 13:39:06 schwarz Exp $
+
+--- defines.h.orig	2006-07-09 14:03:48.000000000 +0200
++++ defines.h	2006-07-09 14:06:42.000000000 +0200
+@@ -64,6 +64,10 @@
+ # endif
+ #endif
+ 
++#ifdef MISSING-U_INT64_T
++typedef unsigned long long int  u_int64_t;
++#endif
++
+ /* If sys/types.h does not supply u_intXX_t, supply them ourselves */
+ #ifndef HAVE_U_INTXX_T
+ # ifdef HAVE_UINTXX_T