[pkgsrc/trunk]: pkgsrc/security/openssl Don't use sysctl to determine the mac...

[jlam <jlam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/ba841fcf8a33
branches:  trunk
changeset: 468871:ba841fcf8a33
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Tue Feb 17 14:26:47 2004 +0000

description:
Don't use sysctl to determine the machine arch when ${MACHINE_ARCH} already
has the correct value.  Fixes build on NetBSD-1.5.3/sparc, which doesn't
understand "sysctl hw.machine_arch", reported in PR 24448.

diffstat:

 security/openssl/Makefile         |  3 ++-
 security/openssl/distinfo         |  4 ++--
 security/openssl/patches/patch-aa |  4 ++--
 3 files changed, 6 insertions(+), 5 deletions(-)

diffs (49 lines):

diff -r 4195e9fbb53c -r ba841fcf8a33 security/openssl/Makefile
--- a/security/openssl/Makefile Tue Feb 17 13:44:34 2004 +0000
+++ b/security/openssl/Makefile Tue Feb 17 14:26:47 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.85 2004/01/05 22:39:11 jlam Exp $
+# $NetBSD: Makefile,v 1.86 2004/02/17 14:26:47 jlam Exp $
 
 DISTNAME=              openssl-0.9.6l
 SVR4_PKGNAME=          ossl
@@ -52,6 +52,7 @@
 
 CONFIGURE_ARGS+=       ${CFLAGS} ${LDFLAGS}
 CONFIGURE_ENV+=                PERL="${PERL5}"
+CONFIGURE_ENV+=                MACHINE_ARCH=${MACHINE_ARCH}
 
 PLIST_SRC=             ${PKGDIR}/PLIST.${LOWER_OPSYS:C/([.0-9]*)$//}
 PLIST_SRC+=            ${PLIST_RSAREF}
diff -r 4195e9fbb53c -r ba841fcf8a33 security/openssl/distinfo
--- a/security/openssl/distinfo Tue Feb 17 13:44:34 2004 +0000
+++ b/security/openssl/distinfo Tue Feb 17 14:26:47 2004 +0000
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.24 2003/11/12 03:35:46 jschauma Exp $
+$NetBSD: distinfo,v 1.25 2004/02/17 14:26:47 jlam Exp $
 
 SHA1 (openssl-0.9.6l.tar.gz) = 4fdd3c5f09b1276bf3c64140a38130c6dd49871c
 Size (openssl-0.9.6l.tar.gz) = 2183726 bytes
-SHA1 (patch-aa) = c4766edba4704374ae67d75c2f9454bc70782eea
+SHA1 (patch-aa) = 4f172db9ed515d9972883470bf33b694f9df835a
 SHA1 (patch-ab) = cfbcaa52bec88987b8a63725b84adfd58b324032
 SHA1 (patch-ac) = 3a5248b8b9fe6791b6c114f3b98f1b4fae93a183
 SHA1 (patch-ad) = 950d57633fcb494564641f9b7e6385b96912c05d
diff -r 4195e9fbb53c -r ba841fcf8a33 security/openssl/patches/patch-aa
--- a/security/openssl/patches/patch-aa Tue Feb 17 13:44:34 2004 +0000
+++ b/security/openssl/patches/patch-aa Tue Feb 17 14:26:47 2004 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.11 2002/08/25 19:23:18 jlam Exp $
+$NetBSD: patch-aa,v 1.12 2004/02/17 14:26:47 jlam Exp $
 
 --- config.orig        Sun Jun 16 05:32:14 2002
 +++ config
@@ -9,7 +9,7 @@
 -  sun3*-*-netbsd) OUT="NetBSD-m68" ;;
 -  *-*-netbsd) OUT="NetBSD-sparc" ;;
 +  sun3*-*-netbsd) OUT="NetBSD-m68k" ;;
-+  *-*-netbsd) OUT="NetBSD-`sysctl -n hw.machine_arch`" ;;
++  *-*-netbsd) OUT="NetBSD-${MACHINE_ARCH}" ;;
    *86*-*-openbsd) OUT="OpenBSD-x86" ;;
    alpha*-*-openbsd) OUT="OpenBSD-alpha" ;;
    pmax*-*-openbsd) OUT="OpenBSD-mips" ;;