Add $LOCALBASE/lib to the path konqueror searches for libcrypto.

Makes https work on systems that don't have libcrypto in /usr/lib,
eg Solaris.
This commit is contained in:
markd 2003-05-13 10:01:54 +00:00
parent e83c04c5c4
commit f67fa2cab5
3 changed files with 14 additions and 12 deletions

View file

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.26 2003/05/02 11:57:27 wiz Exp $
# $NetBSD: Makefile,v 1.27 2003/05/13 10:01:54 markd Exp $
DISTNAME= kdelibs-3.1.1
PKGREVISION= 2
@ -44,7 +44,8 @@ FOO_MAIN_FILES= \
.include "../../x11/kde3/Makefile.foo_main"
FIXUP_FILES= \
kspell/ksconfig.cpp
kspell/ksconfig.cpp \
kio/kssl/kopenssl.cc
pre-configure:
@for i in ${FIXUP_FILES}; do \

View file

@ -1,4 +1,4 @@
$NetBSD: distinfo,v 1.18 2003/04/10 13:13:26 markd Exp $
$NetBSD: distinfo,v 1.19 2003/05/13 10:01:54 markd Exp $
SHA1 (kdelibs-3.1.1.tar.bz2) = fa0c556b78ae1310f5fabae2187bd2187452c67e
Size (kdelibs-3.1.1.tar.bz2) = 10313173 bytes
@ -25,7 +25,7 @@ SHA1 (patch-az) = 2d61015758a415eeafed9931da07c419b99cb710
SHA1 (patch-ba) = 25485d5e1e6c903f7e0f477774d4c51ee718c6a3
SHA1 (patch-bb) = 523ddde2389cc19b48a2216b78fabb5dbe1d01b6
SHA1 (patch-bc) = 434a48d290aa9716b8c6e372419460ebd33cf8ea
SHA1 (patch-bd) = 19945a5d1ce9fabd1d0e50a32affe3ef922a0ee0
SHA1 (patch-bd) = 255b89f21188945a36c8bc9580f2cc17cd8c3504
SHA1 (patch-bg) = 456c9f128deaeefea448c038feeb256b8a9837bd
SHA1 (patch-bh) = 368e98fe1172f0ff0c56abc2155f14126c95e2b7
SHA1 (patch-bk) = 62b9f296f7e0a0001c38daf3d862b35ba055e7eb

View file

@ -1,8 +1,8 @@
$NetBSD: patch-bd,v 1.5 2003/03/11 13:10:36 markd Exp $
$NetBSD: patch-bd,v 1.6 2003/05/13 10:01:54 markd Exp $
--- kio/kssl/kopenssl.cc.orig Fri Jan 3 17:58:50 2003
--- kio/kssl/kopenssl.cc.orig 2003-03-03 08:02:26.000000000 +1300
+++ kio/kssl/kopenssl.cc
@@ -177,7 +177,7 @@
@@ -177,7 +177,7 @@ void KOpenSSLProxy::destroy() {
_me = NULL;
}
@ -11,7 +11,7 @@ $NetBSD: patch-bd,v 1.5 2003/03/11 13:10:36 markd Exp $
#include <qdir.h>
#include <qstring.h>
#include <qstringlist.h>
@@ -240,26 +240,22 @@
@@ -240,26 +240,23 @@ KConfig *cfg;
delete cfg;
@ -29,6 +29,7 @@ $NetBSD: patch-bd,v 1.5 2003/03/11 13:10:36 markd Exp $
- #endif
+#endif
<< "/usr/lib/"
+ << "@LOCALBASE@/lib/"
+#if !defined(__NetBSD__) && !defined(__OpenBSD__)
<< "/usr/ssl/lib/"
<< "/usr/local/lib/"
@ -43,7 +44,7 @@ $NetBSD: patch-bd,v 1.5 2003/03/11 13:10:36 markd Exp $
// FIXME: #define here for the various OS types to optimize
libnamess
#ifdef hpux
@@ -294,10 +290,16 @@
@@ -294,10 +291,16 @@ KConfig *cfg;
<< "libcrypto.so.0.9.6"
#endif
;
@ -60,7 +61,7 @@ $NetBSD: patch-bd,v 1.5 2003/03/11 13:10:36 markd Exp $
for (QStringList::Iterator shit = libnamesc.begin();
shit != libnamesc.end();
++shit) {
@@ -311,9 +313,9 @@
@@ -311,9 +314,9 @@ KConfig *cfg;
_cryptoLib = ll->globalLibrary(alib.latin1());
if (_cryptoLib) break;
}
@ -71,7 +72,7 @@ $NetBSD: patch-bd,v 1.5 2003/03/11 13:10:36 markd Exp $
if (_cryptoLib) {
#ifdef KSSL_HAVE_SSL
@@ -413,16 +415,14 @@
@@ -413,16 +416,14 @@ KConfig *cfg;
#endif
}
@ -93,7 +94,7 @@ $NetBSD: patch-bd,v 1.5 2003/03/11 13:10:36 markd Exp $
for (QStringList::Iterator shit = libnamess.begin();
shit != libnamess.end();
++shit) {
@@ -436,9 +436,9 @@
@@ -436,9 +437,9 @@ KConfig *cfg;
_sslLib = ll->globalLibrary(alib.latin1());
if (_sslLib) break;
}