[src/trunk]: src/crypto/external/bsd/openssl use the version in the source tr...

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/ea541e5465d8
branches:  trunk
changeset: 784566:ea541e5465d8
user:      christos <christos%NetBSD.org@localhost>
date:      Fri Feb 01 21:02:48 2013 +0000

description:
use the version in the source tree, instead of the build host

diffstat:

 crypto/external/bsd/openssl/mkpc         |  18 +++++++++---------
 crypto/external/bsd/openssl/pkgconfig.mk |   4 ++--
 2 files changed, 11 insertions(+), 11 deletions(-)

diffs (58 lines):

diff -r fa60e4b3c3cc -r ea541e5465d8 crypto/external/bsd/openssl/mkpc
--- a/crypto/external/bsd/openssl/mkpc  Fri Feb 01 19:27:47 2013 +0000
+++ b/crypto/external/bsd/openssl/mkpc  Fri Feb 01 21:02:48 2013 +0000
@@ -1,15 +1,15 @@
 #!/bin/sh
-#      $NetBSD: mkpc,v 1.2 2013/01/22 13:51:45 christos Exp $
+#      $NetBSD: mkpc,v 1.3 2013/02/01 21:02:48 christos Exp $
 
 getversion() {
-       (echo '#include <openssl/opensslv.h>'; echo OPENSSL_VERSION_TEXT) |
-           cpp | grep OpenSSL | cut -d ' ' -f 2
+       (echo '#include "opensslv.h"'; echo OPENSSL_VERSION_TEXT) |
+           cpp -I$1 | grep OpenSSL | cut -d ' ' -f 2
 }
-VERSION="$(getversion)"
+VERSION="$(getversion $1)"
 
-sed -e "s/@VERSION@/${VERSION}/g" < "$1"
+sed -e "s/@VERSION@/${VERSION}/g" < "$2"
 
-case "$1" in
+case "$2" in
 libcrypto.pc)
        NAME="OpenSSL-libcrypto"
        LIBS="-lcrypto"
@@ -26,13 +26,13 @@
        DESCRIPTION="Sockets Layer and cryptography libraries and tools"
        ;;
 *)
-       echo "$0: I don't know about $1" 1>&2
+       echo "$0: I don't know about $2" 1>&2
        exit 1
        ;;
 esac
 
-cat << EOF > "$1"
-# \$NetBSD: mkpc,v 1.2 2013/01/22 13:51:45 christos Exp $
+cat << EOF > "$2"
+# \$NetBSD: mkpc,v 1.3 2013/02/01 21:02:48 christos Exp $
 prefix=/usr
 exec_prefix=/usr
 libdir=/usr/lib
diff -r fa60e4b3c3cc -r ea541e5465d8 crypto/external/bsd/openssl/pkgconfig.mk
--- a/crypto/external/bsd/openssl/pkgconfig.mk  Fri Feb 01 19:27:47 2013 +0000
+++ b/crypto/external/bsd/openssl/pkgconfig.mk  Fri Feb 01 21:02:48 2013 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: pkgconfig.mk,v 1.3 2013/01/19 21:57:55 apb Exp $
+# $NetBSD: pkgconfig.mk,v 1.4 2013/02/01 21:02:48 christos Exp $
 
 FILESDIR=/usr/lib/pkgconfig
 .for pkg in ${PKGCONFIG}
@@ -6,5 +6,5 @@
 FILESBUILD_${pkg}.pc=yes
 
 ${pkg}.pc: ${.CURDIR}/../../mkpc
-       ${.ALLSRC} ${.TARGET} > ${.TARGET}
+       ${.ALLSRC} ${OPENSSLSRC}/crypto ${.TARGET} > ${.TARGET}
 .endfor