[pkgsrc/trunk]: pkgsrc/x11/kdelibs3 Improve findMostRecent: when no minor ver...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/90f3005f404c
branches:  trunk
changeset: 518526:90f3005f404c
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Mon Sep 11 19:03:50 2006 +0000

description:
Improve findMostRecent: when no minor version is available, assume it
is -1 and continue the comparision.

diffstat:

 x11/kdelibs3/distinfo         |   4 ++--
 x11/kdelibs3/patches/patch-bd |  40 +++++++++++++++++++++++++++++++++-------
 2 files changed, 35 insertions(+), 9 deletions(-)

diffs (106 lines):

diff -r ed80d857c3ab -r 90f3005f404c x11/kdelibs3/distinfo
--- a/x11/kdelibs3/distinfo     Mon Sep 11 18:57:11 2006 +0000
+++ b/x11/kdelibs3/distinfo     Mon Sep 11 19:03:50 2006 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.76 2006/09/11 09:10:01 joerg Exp $
+$NetBSD: distinfo,v 1.77 2006/09/11 19:03:50 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) = a6be267d04503fc0da4a4ffed359fe7821d7d2ba
+SHA1 (patch-bd) = 2c139b81ff96d1762c14af0bb29275cf66ee8f8d
 SHA1 (patch-bv) = 882355f9dd9cdbbbe14d54e5c59b630ef0347e1c
 SHA1 (patch-cc) = 5581849c63bfc219a8262e83c3c66c7df51fbc1f
 SHA1 (patch-ce) = e9f7a348b0e4be1475ba8f56a8b474f139eb7781
diff -r ed80d857c3ab -r 90f3005f404c x11/kdelibs3/patches/patch-bd
--- a/x11/kdelibs3/patches/patch-bd     Mon Sep 11 18:57:11 2006 +0000
+++ b/x11/kdelibs3/patches/patch-bd     Mon Sep 11 19:03:50 2006 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-bd,v 1.11 2006/09/11 09:10:01 joerg Exp $
+$NetBSD: patch-bd,v 1.12 2006/09/11 19:03:50 joerg Exp $
 
 --- kio/kssl/kopenssl.cc.orig  2006-07-22 08:16:39.000000000 +0000
 +++ kio/kssl/kopenssl.cc
@@ -11,7 +11,31 @@
  #include <qdir.h>
  #include <qstring.h>
  #include <qstringlist.h>
-@@ -280,42 +280,23 @@ KConfig *cfg;
+@@ -240,10 +240,20 @@ static QString findMostRecentLib(QString
+        for (QStringList::Iterator it = l.begin(); it != l.end(); ++it) {
+                QString numberpart = (*it).mid(s);
+                uint endmaj = numberpart.find('.');
+-               if (endmaj == -1)
+-                       continue;
+                bool ok;
+-               int maj = numberpart.left(endmaj).toInt(&ok);
++             int maj;
++               if (endmaj == -1) {
++                     int maj = numberpart.toInt(&ok);
++                     if (!ok)
++                             continue;
++                     if (maj <= bestmaj)
++                             continue;
++                     bestmaj = maj;
++                     bestmin = -1;
++                       best = (*it);
++                       continue;
++               }
++               maj = numberpart.left(endmaj).toInt(&ok);
+                if (!ok)
+                        continue;
+                int min = numberpart.mid(endmaj+1).toInt(&ok);
+@@ -280,42 +290,23 @@ KConfig *cfg;
  
     delete cfg;
  
@@ -60,7 +84,7 @@
  // FIXME: #define here for the various OS types to optimize
     libnamess
             #ifdef hpux
-@@ -355,6 +336,11 @@ KConfig *cfg;
+@@ -355,6 +346,11 @@ KConfig *cfg;
     for (QStringList::Iterator it = libpaths.begin();
                                it != libpaths.end();
                                ++it) {
@@ -72,7 +96,7 @@
        for (QStringList::Iterator shit = libnamesc.begin();
                                   shit != libnamesc.end();
                                   ++shit) {
-@@ -368,6 +354,7 @@ KConfig *cfg;
+@@ -368,6 +364,7 @@ KConfig *cfg;
              _cryptoLib = ll->globalLibrary(alib.latin1());
           if (_cryptoLib) break;
        }
@@ -80,7 +104,7 @@
        if (_cryptoLib) break;
     }
  
-@@ -497,16 +484,14 @@ KConfig *cfg;
+@@ -497,16 +494,14 @@ KConfig *cfg;
  #endif
     }
  
@@ -102,7 +126,7 @@
        for (QStringList::Iterator shit = libnamess.begin();
                                   shit != libnamess.end();
                                   ++shit) {
-@@ -520,9 +505,9 @@ KConfig *cfg;
+@@ -520,10 +515,10 @@ KConfig *cfg;
                _sslLib = ll->globalLibrary(alib.latin1());
           if (_sslLib) break;
        }
@@ -110,6 +134,8 @@
        if (_sslLib) break;
     }
 -#endif
- 
+-
++   
     if (_sslLib) {
  #ifdef KSSL_HAVE_SSL
+       // stand back from your monitor and look at this.  it's fun! :)