Better INSTALL_* fix for PR pkg/22234 by Jonathan Perkin.

Use buildlink2.
ONLY_FOR_PLATFORM -> NOT_FOR_PLATFORM (*BSD have skey in base system.)
Workaround a bug in GCC on sparc64.
Whitespace.

4 files changed, 53 insertions, 14 deletions

diff --git a/security/skey/Makefile b/security/skey/Makefile
index c75eb0ea4eb..8a9ae844b33 100644
--- a/security/skey/Makefile
+++ b/security/skey/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2003/07/17 22:53:15 grant Exp $
+# $NetBSD: Makefile,v 1.5 2003/07/23 16:03:55 salo Exp $
 #
 
 DISTNAME=		skey-1.1.5
@@ -10,12 +10,15 @@ MAINTAINER=		tech-pkg@NetBSD.org
 HOMEPAGE=		${MASTER_SITES}
 COMMENT=		Port of OpenBSD s/key implementation
 
-ONLY_FOR_PLATFORM=	Darwin-*-* SunOS-*-*	# in NetBSD base system
+NOT_FOR_PLATFORM=	NetBSD-*-* FreeBSD-*-* OpenBSD-*-* # in base system
 
 USE_PERL5=		build
+USE_BUIDLINK2=		YES
 USE_GMAKE=		YES
 GNU_CONFIGURE=		YES
+
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
 
-.include "../../mk/bsd.pkg.mk"
+.include "../../lang/perl5/buildlink2.mk"
 
+.include "../../mk/bsd.pkg.mk"
diff --git a/security/skey/distinfo b/security/skey/distinfo
index 66fa89c2460..66d0a61a712 100644
--- a/security/skey/distinfo
+++ b/security/skey/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.2 2003/07/23 14:34:27 jmmv Exp $
+$NetBSD: distinfo,v 1.3 2003/07/23 16:03:56 salo Exp $
 
 SHA1 (skey-1.1.5.tar.bz2) = d55fb286098900cdf3eb6b174a720a06c722312a
 Size (skey-1.1.5.tar.bz2) = 61911 bytes
-SHA1 (patch-aa) = c4e5aa66177a2e8ab5598aaaeefcd2822acd0d03
+SHA1 (patch-aa) = ab3dd6d56ee0c8d031d110815f5ef7c0edd84fac
+SHA1 (patch-ab) = 69d8f92968b3ebffc9b05fe7af1cde7e9d116587
diff --git a/security/skey/patches/patch-aa b/security/skey/patches/patch-aa
index 1685ca25adf..042371917fb 100644
--- a/security/skey/patches/patch-aa
+++ b/security/skey/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.1 2003/07/23 14:34:29 jmmv Exp $
+$NetBSD: patch-aa,v 1.2 2003/07/23 16:03:56 salo Exp $
 
---- Makefile.in.orig   Thu May 10 17:10:49 2001
-+++ Makefile.in        Wed Jul 23 12:31:50 2003
-@@ -18,10 +18,10 @@
+--- Makefile.in.orig	Thu May 10 18:10:49 2001
++++ Makefile.in	Wed Jul 23 17:18:18 2003
+@@ -18,15 +18,18 @@
  AR=@AR@
  RANLIB=@RANLIB@
  INSTALL=@INSTALL@
@@ -10,14 +10,36 @@ $NetBSD: patch-aa,v 1.1 2003/07/23 14:34:29 jmmv Exp $
 -INSTALL_MAN=${INSTALL} -c -m 444
 -INSTALL_SCRIPT=${INSTALL} -c -m 555
 -INSTALL_DATA=${INSTALL} -c -m 444
-+INSTALL_PROGRAM=@INSTALL_PROGRAM@
-+INSTALL_MAN=@INSTALL_DATA@
-+INSTALL_SCRIPT=@INSTALL_SCRIPT@
-+INSTALL_DATA=@INSTALL_DATA@
++INSTALL_PROGRAM=${BSD_INSTALL_PROGRAM}
++INSTALL_MAN=${BSD_INSTALL_MAN}
++INSTALL_SCRIPT=${BSD_INSTALL_SCRIPT}
++INSTALL_DATA=${BSD_INSTALL_DATA}
  PERL=@PERL@
  SENDMAIL=@SENDMAIL@
  TOUCH=@TOUCH@
-@@ -88,14 +88,6 @@
+ LDFLAGS=-L. @LDFLAGS@
+ 
++GCC=@GCC@
++host=@host@
++
+ TARGETS=skey skeyinit skeyinfo skeyaudit
+ LIBOBJS=skeylogin.o skeysubr.o put.o errx.o md4c.o md5c.o rmd160.o rmd160hl.o sha1.o sha1hl.o flock.o strlcpy.o login_cap.o
+ SKEYOBJS=skey.o
+@@ -49,6 +52,13 @@
+ 
+ all: ${TARGETS} ${MANPAGES}
+ 
++ifeq (sparc64, $(findstring sparc64, $(host)))
++ifdef GCC
++sha1.o: config.h
++	${CC} ${CFLAGS:-O%=-O0} -c -o $@ sha1.c
++endif
++endif
++
+ ${LIBOBJS}: config.h
+ 
+ libskey.a: ${LIBOBJS}
+@@ -88,14 +98,6 @@
  	done
  
  install: ${TARGETS}
diff --git a/security/skey/patches/patch-ab b/security/skey/patches/patch-ab
new file mode 100644
index 00000000000..0caabe4e7c3
--- /dev/null
+++ b/security/skey/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.1 2003/07/23 16:03:57 salo Exp $
+
+--- configure.orig	Thu May 10 18:10:49 2001
++++ configure	Wed Jul 23 17:06:22 2003
+@@ -2533,6 +2533,8 @@
+ s%@MANTYPE@%$MANTYPE%g
+ s%@mansubdir@%$mansubdir%g
+ s%@LIBOBJS@%$LIBOBJS%g
++s%@GCC@%$GCC%g
++s%@host@%$host%g
+ 
+ CEOF
+ EOF