[pkgsrc/trunk]: pkgsrc/x11/kdelibs3 Use the NetBSD/OpenBSD shared library mag...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/07f3cb3eb38a
branches:  trunk
changeset: 518503:07f3cb3eb38a
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Mon Sep 11 09:10:01 2006 +0000

description:
Use the NetBSD/OpenBSD shared library magic on DragonFly as well
to fix SSL usage. Problem reported on DragonFly's user list.

diffstat:

 x11/kdelibs3/distinfo         |   4 ++--
 x11/kdelibs3/patches/patch-bd |  28 ++++++++++++++--------------
 2 files changed, 16 insertions(+), 16 deletions(-)

diffs (110 lines):

diff -r 6233ebdf472f -r 07f3cb3eb38a x11/kdelibs3/distinfo
--- a/x11/kdelibs3/distinfo     Mon Sep 11 08:33:11 2006 +0000
+++ b/x11/kdelibs3/distinfo     Mon Sep 11 09:10:01 2006 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.75 2006/08/02 13:42:16 markd Exp $
+$NetBSD: distinfo,v 1.76 2006/09/11 09:10:01 joerg Exp $
 
 SHA1 (kdelibs-3.5.4.tar.bz2) = 766d7579917e0296faf81f45a07ad1d9263afb6c
 RMD160 (kdelibs-3.5.4.tar.bz2) = a80ce24ee485bcfc7f2f06c3a798401b3188670d
@@ -13,7 +13,7 @@
 SHA1 (patch-ap) = 94037230bb3d12549195d52b98ffdd821f94f90d
 SHA1 (patch-aq) = 91d970b5c2fb129e5656cf4841972453c83ba088
 SHA1 (patch-bc) = 434a48d290aa9716b8c6e372419460ebd33cf8ea
-SHA1 (patch-bd) = 5500290544b51c8896607d90d3412656dd90156e
+SHA1 (patch-bd) = a6be267d04503fc0da4a4ffed359fe7821d7d2ba
 SHA1 (patch-bv) = 882355f9dd9cdbbbe14d54e5c59b630ef0347e1c
 SHA1 (patch-cc) = 5581849c63bfc219a8262e83c3c66c7df51fbc1f
 SHA1 (patch-ce) = e9f7a348b0e4be1475ba8f56a8b474f139eb7781
diff -r 6233ebdf472f -r 07f3cb3eb38a x11/kdelibs3/patches/patch-bd
--- a/x11/kdelibs3/patches/patch-bd     Mon Sep 11 08:33:11 2006 +0000
+++ b/x11/kdelibs3/patches/patch-bd     Mon Sep 11 09:10:01 2006 +0000
@@ -1,17 +1,17 @@
-$NetBSD: patch-bd,v 1.10 2005/12/11 10:53:54 markd Exp $
+$NetBSD: patch-bd,v 1.11 2006/09/11 09:10:01 joerg Exp $
 
---- kio/kssl/kopenssl.cc.orig  2005-10-11 04:05:44.000000000 +1300
+--- kio/kssl/kopenssl.cc.orig  2006-07-22 08:16:39.000000000 +0000
 +++ kio/kssl/kopenssl.cc
-@@ -216,7 +216,7 @@ void KOpenSSLProxy::destroy() {
+@@ -217,7 +217,7 @@ void KOpenSSLProxy::destroy() {
    _me = 0L;
  }
  
 -#ifdef __OpenBSD__
-+#if defined(__OpenBSD__) || defined(__NetBSD__)
++#if defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
  #include <qdir.h>
  #include <qstring.h>
  #include <qstringlist.h>
-@@ -279,42 +279,23 @@ KConfig *cfg;
+@@ -280,42 +280,23 @@ KConfig *cfg;
  
     delete cfg;
  
@@ -45,8 +45,8 @@
 -          #endif
 +#endif
            << "/usr/lib" KDELIBSUFF "/"
-+          << "@LOCALBASE@/lib/"
-+#if !defined(__NetBSD__) && !defined(__OpenBSD__)
++          << "/usr/pkg/lib/"
++#if !defined(__NetBSD__) && !defined(__OpenBSD__) && !defined(__DragonFly__)
            << "/usr/ssl/lib" KDELIBSUFF "/"
            << "/usr/local/lib" KDELIBSUFF "/"
              << "/usr/local/openssl/lib" KDELIBSUFF "/"
@@ -56,15 +56,15 @@
 +#endif
              << "";
      
-+#if !defined(__NetBSD__) && !defined(__OpenBSD__)
++#if !defined(__NetBSD__) && !defined(__OpenBSD__) && !defined(__DragonFly__)
  // FIXME: #define here for the various OS types to optimize
     libnamess
             #ifdef hpux
-@@ -354,6 +335,11 @@ KConfig *cfg;
+@@ -355,6 +336,11 @@ KConfig *cfg;
     for (QStringList::Iterator it = libpaths.begin();
                                it != libpaths.end();
                                ++it) {
-+#if defined(__NetBSD__) || defined(__OpenBSD__)
++#if defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
 +      QString libname = findMostRecentLib(*it, "crypto");
 +      if (!libname.isNull())
 +              _cryptoLib = ll->globalLibrary(libname.latin1());
@@ -72,7 +72,7 @@
        for (QStringList::Iterator shit = libnamesc.begin();
                                   shit != libnamesc.end();
                                   ++shit) {
-@@ -367,6 +353,7 @@ KConfig *cfg;
+@@ -368,6 +354,7 @@ KConfig *cfg;
              _cryptoLib = ll->globalLibrary(alib.latin1());
           if (_cryptoLib) break;
        }
@@ -80,7 +80,7 @@
        if (_cryptoLib) break;
     }
  
-@@ -496,16 +483,14 @@ KConfig *cfg;
+@@ -497,16 +484,14 @@ KConfig *cfg;
  #endif
     }
  
@@ -94,7 +94,7 @@
     for (QStringList::Iterator it = libpaths.begin();
                                it != libpaths.end();
                                ++it) {
-+#if defined(__OpenBSD__) || defined(__NetBSD__)
++#if defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
 +      QString libname = findMostRecentLib(*it, "ssl");
 +      if (!libname.isNull())
 +           _sslLib = ll->globalLibrary(libname.latin1());
@@ -102,7 +102,7 @@
        for (QStringList::Iterator shit = libnamess.begin();
                                   shit != libnamess.end();
                                   ++shit) {
-@@ -519,9 +504,9 @@ KConfig *cfg;
+@@ -520,9 +505,9 @@ KConfig *cfg;
                _sslLib = ll->globalLibrary(alib.latin1());
           if (_sslLib) break;
        }