[pkgsrc/trunk]: pkgsrc/security/qca-tls - when creating binaries during the c...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/3f3c4cd732df
branches:  trunk
changeset: 499180:3f3c4cd732df
user:      dmcmahill <dmcmahill%pkgsrc.org@localhost>
date:      Tue Sep 13 04:27:21 2005 +0000

description:
- when creating binaries during the configure phase, be sure to add
the required -Rpath options or the openssl version will not be
correctly determined when using pkgsrc openssl.

- when running qmake as part of the configure stage, be sure to
run in the configure environment so that QMAKESPEC is picked up.

diffstat:

 security/qca-tls/Makefile         |   4 ++--
 security/qca-tls/distinfo         |   4 ++--
 security/qca-tls/patches/patch-aa |  17 +++++++++++++----
 3 files changed, 17 insertions(+), 8 deletions(-)

diffs (59 lines):

diff -r 3bc93e7b3dc3 -r 3f3c4cd732df security/qca-tls/Makefile
--- a/security/qca-tls/Makefile Tue Sep 13 04:24:35 2005 +0000
+++ b/security/qca-tls/Makefile Tue Sep 13 04:27:21 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/06/01 18:03:21 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2005/09/13 04:27:21 dmcmahill Exp $
 
 DISTNAME=      qca-tls-1.0
 PKGREVISION=   # empty
@@ -20,7 +20,7 @@
 # XXX the -rpath filter is somewhat ugly, and this should be eventually
 # fixed in NetBSD qmake template to not be necessary.
 post-configure:
-       cd ${WRKSRC} && (       \
+       cd ${WRKSRC} && ( ${SETENV} ${CONFIGURE_ENV}                    \
                ${QTDIR}/bin/qmake qca-tls.pro -o Makefile.orig;        \
                ${SED} -e "s,-rpath .*,-rpath ${QTDIR}/lib," Makefile.orig > Makefile;  \
        )
diff -r 3bc93e7b3dc3 -r 3f3c4cd732df security/qca-tls/distinfo
--- a/security/qca-tls/distinfo Tue Sep 13 04:24:35 2005 +0000
+++ b/security/qca-tls/distinfo Tue Sep 13 04:27:21 2005 +0000
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.3 2005/02/24 13:10:12 agc Exp $
+$NetBSD: distinfo,v 1.4 2005/09/13 04:27:21 dmcmahill Exp $
 
 SHA1 (qca-tls-1.0.tar.bz2) = 775e764c5be342048eba11dae5c5fd3b636d23c5
 RMD160 (qca-tls-1.0.tar.bz2) = c553782e77ab54edde7e4f0676a3caad74dfa910
 Size (qca-tls-1.0.tar.bz2) = 23489 bytes
-SHA1 (patch-aa) = a584ccd423a621b57a17274e675d7ed5ee39c125
+SHA1 (patch-aa) = 2c28782e3af7ecffa0b5758f1671c0773bc9af03
diff -r 3bc93e7b3dc3 -r 3f3c4cd732df security/qca-tls/patches/patch-aa
--- a/security/qca-tls/patches/patch-aa Tue Sep 13 04:24:35 2005 +0000
+++ b/security/qca-tls/patches/patch-aa Tue Sep 13 04:27:21 2005 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.1 2004/12/19 09:29:16 jdolecek Exp $
+$NetBSD: patch-aa,v 1.2 2005/09/13 04:27:21 dmcmahill Exp $
 
---- configure.orig     2004-12-19 09:10:21.000000000 +0000
-+++ configure  2004-12-19 09:20:50.000000000 +0000
-@@ -144,8 +144,10 @@
+--- configure.orig     2003-12-17 17:54:50.000000000 -0500
++++ configure
+@@ -144,8 +144,10 @@ public:
  
                s = conf->getenv("QC_WITH_OPENSSL_LIB");
                if(!s.isEmpty()) {
@@ -13,3 +13,12 @@
                        lib = s;
                }
                else {
+@@ -168,7 +170,7 @@ public:
+               if(kb)
+                       ext += QString("-I") + kbdir + ' ';
+               if(!lib.isEmpty())
+-                      ext += QString("-L") + lib + " -lssl -lcrypto ";
++                      ext += QString("-L") + lib + " " + QString("-R") + lib + " -lssl -lcrypto ";
+               int ret;
+               if(!conf->doCompileAndLink(str, ext, &ret))
+                       return false;