From e1bc24f3bce87dee04fc1b9a9da63529ab9159de Mon Sep 17 00:00:00 2001
From: dmcmahill <dmcmahill>
Date: Tue, 13 Sep 2005 04:27:21 +0000
Subject: - 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.
---
 security/qca-tls/Makefile         |  4 ++--
 security/qca-tls/distinfo         |  4 ++--
 security/qca-tls/patches/patch-aa | 17 +++++++++++++----
 3 files changed, 17 insertions(+), 8 deletions(-)

(limited to 'security/qca-tls')

diff --git a/security/qca-tls/Makefile b/security/qca-tls/Makefile
index 45280ecf711..80509310164 100644
--- a/security/qca-tls/Makefile
+++ b/security/qca-tls/Makefile
@@ -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 @@ CONFIGURE_ARGS+=        --with-openssl-lib=${SSLBASE}/lib
 # 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 --git a/security/qca-tls/distinfo b/security/qca-tls/distinfo
index 0605eeb81ca..e9115356f76 100644
--- a/security/qca-tls/distinfo
+++ b/security/qca-tls/distinfo
@@ -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 --git a/security/qca-tls/patches/patch-aa b/security/qca-tls/patches/patch-aa
index 8f25050fb3e..ce3db04262e 100644
--- a/security/qca-tls/patches/patch-aa
+++ b/security/qca-tls/patches/patch-aa
@@ -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 @@ $NetBSD: patch-aa,v 1.1 2004/12/19 09:29:16 jdolecek Exp $
  			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;
-- 
cgit v1.2.3