[pkgsrc/trunk]: pkgsrc/security/mit-krb5 Ensure we can find OpenSSL after rpa...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/5b6d4df49091
branches:  trunk
changeset: 652164:5b6d4df49091
user:      jperkin <jperkin%pkgsrc.org@localhost>
date:      Tue May 26 13:56:16 2015 +0000

description:
Ensure we can find OpenSSL after rpath changes.

diffstat:

 security/mit-krb5/Makefile                   |   3 ++-
 security/mit-krb5/distinfo                   |   3 ++-
 security/mit-krb5/patches/patch-configure.in |  15 +++++++++++++++
 3 files changed, 19 insertions(+), 2 deletions(-)

diffs (53 lines):

diff -r 467548b67667 -r 5b6d4df49091 security/mit-krb5/Makefile
--- a/security/mit-krb5/Makefile        Tue May 26 13:38:20 2015 +0000
+++ b/security/mit-krb5/Makefile        Tue May 26 13:56:16 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.82 2015/03/22 20:09:09 joerg Exp $
+# $NetBSD: Makefile,v 1.83 2015/05/26 13:56:16 jperkin Exp $
 
 DISTNAME=      krb5-1.10.7
 PKGNAME=       mit-${DISTNAME}
@@ -45,6 +45,7 @@
 CONFIGURE_ARGS+=       --disable-thread-support
 CONFIGURE_ARGS+=       --without-tcl
 CONFIGURE_ARGS+=       --enable-pkgsrc-libtool
+CONFIGURE_ENV+=                BUILDLINK_PREFIX_OPENSSL=${BUILDLINK_PREFIX.openssl:Q}
 MAKE_ENV+=             ROOT_USER=${ROOT_USER}
 LIBS.SunOS=            -lrt
 
diff -r 467548b67667 -r 5b6d4df49091 security/mit-krb5/distinfo
--- a/security/mit-krb5/distinfo        Tue May 26 13:38:20 2015 +0000
+++ b/security/mit-krb5/distinfo        Tue May 26 13:56:16 2015 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.52 2015/03/22 20:09:09 joerg Exp $
+$NetBSD: distinfo,v 1.53 2015/05/26 13:56:16 jperkin Exp $
 
 SHA1 (2014-001-patch.txt) = 919402bf3b7c289e847e9adc03a7c30f26966769
 RMD160 (2014-001-patch.txt) = a39c8e12e79ab273d562b04c1e7811c414dd70e8
@@ -28,6 +28,7 @@
 SHA1 (patch-ci) = 4e310f0a4dfe27cf94d0e63d623590691b6c5970
 SHA1 (patch-cj) = 78342f649f8e9d3a3b5a4f83e65b6c46f589586b
 SHA1 (patch-ck) = 6a483684c68f045bf6f8e165a8935338af7422db
+SHA1 (patch-configure.in) = 66fc241ec9d6339268dc37548494ef87b09bc521
 SHA1 (patch-kadmin_dbutil_dump.c) = 4b49c116dbed9e6be4a0bf0a731c3ae82808d82e
 SHA1 (patch-lib_apputils_net-server.c) = 4f54924cca60e75b1b835d35c5eeb96d9f95a90e
 SHA1 (patch-lib_krb5_asn.1_asn1buf.h) = a1e46ca9256aea4facc1d41841b1707b044a69e7
diff -r 467548b67667 -r 5b6d4df49091 security/mit-krb5/patches/patch-configure.in
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/security/mit-krb5/patches/patch-configure.in      Tue May 26 13:56:16 2015 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-configure.in,v 1.1 2015/05/26 13:56:16 jperkin Exp $
+
+Find the correct libcrypto.
+
+--- configure.in.orig  2013-11-06 20:52:23.000000000 +0000
++++ configure.in
+@@ -202,7 +202,7 @@ AC_MSG_RESULT("pkinit will use \'$withva
+ ], withval=$PKINIT_CRYPTO_IMPL)
+ case "$withval" in
+ builtin|openssl)
+-  AC_CHECK_LIB(crypto, PKCS7_get_signer_info, PKINIT_CRYPTO_IMPL_LIBS=-lcrypto)
++  AC_CHECK_LIB(crypto, PKCS7_get_signer_info, PKINIT_CRYPTO_IMPL_LIBS="-L${BUILDLINK_PREFIX_OPENSSL}/lib -lcrypto")
+   PKINIT_CRYPTO_IMPL=openssl
+   ;;
+ nss)