[pkgsrc/trunk]: pkgsrc/x11/kdelibs3 Fix another instance of finding the path ...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/2d1dac4a1687
branches:  trunk
changeset: 469807:2d1dac4a1687
user:      markd <markd%pkgsrc.org@localhost>
date:      Sun Feb 29 12:00:56 2004 +0000

description:
Fix another instance of finding the path for ispell/aspell.
Bump PKGREVISION.

diffstat:

 x11/kdelibs3/Makefile         |   3 ++-
 x11/kdelibs3/distinfo         |   4 ++--
 x11/kdelibs3/patches/patch-cc |  32 +++++++++++++++++++++++++-------
 3 files changed, 29 insertions(+), 10 deletions(-)

diffs (80 lines):

diff -r c1d2f5c98088 -r 2d1dac4a1687 x11/kdelibs3/Makefile
--- a/x11/kdelibs3/Makefile     Sun Feb 29 11:49:54 2004 +0000
+++ b/x11/kdelibs3/Makefile     Sun Feb 29 12:00:56 2004 +0000
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.51 2004/02/25 22:11:23 markd Exp $
+# $NetBSD: Makefile,v 1.52 2004/02/29 12:00:56 markd Exp $
 
 DISTNAME=      kdelibs-3.2.0
 CATEGORIES=    x11
 COMMENT=       Support libraries for the KDE integrated X11 desktop
+PKGREVISION=   1
 
 .include "../../meta-pkgs/kde3/Makefile.kde3"
 
diff -r c1d2f5c98088 -r 2d1dac4a1687 x11/kdelibs3/distinfo
--- a/x11/kdelibs3/distinfo     Sun Feb 29 11:49:54 2004 +0000
+++ b/x11/kdelibs3/distinfo     Sun Feb 29 12:00:56 2004 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.31 2004/02/05 10:05:58 markd Exp $
+$NetBSD: distinfo,v 1.32 2004/02/29 12:00:56 markd Exp $
 
 SHA1 (kdelibs-3.2.0.tar.bz2) = 64780c60e66b954ba9cddfd10f1c7c20772ce4cb
 Size (kdelibs-3.2.0.tar.bz2) = 12453641 bytes
@@ -10,5 +10,5 @@
 SHA1 (patch-bd) = f233a73d0a8148e1ae7f4e777c3f5d50b56d768f
 SHA1 (patch-bu) = 65aca46f30be04c0d8177498eac149437b21ba56
 SHA1 (patch-bv) = 882355f9dd9cdbbbe14d54e5c59b630ef0347e1c
-SHA1 (patch-cc) = 607452fb8c4e163ef634d1624fae89bde4563ed5
+SHA1 (patch-cc) = d52e3beff19ed287a4635c8da5ab7a69a8e3c0f3
 SHA1 (patch-ce) = d3e380f42beae1006ad3aea593feb10039c41f1f
diff -r c1d2f5c98088 -r 2d1dac4a1687 x11/kdelibs3/patches/patch-cc
--- a/x11/kdelibs3/patches/patch-cc     Sun Feb 29 11:49:54 2004 +0000
+++ b/x11/kdelibs3/patches/patch-cc     Sun Feb 29 12:00:56 2004 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-cc,v 1.4 2004/02/04 13:58:40 markd Exp $
+$NetBSD: patch-cc,v 1.5 2004/02/29 12:00:57 markd Exp $
 
---- kdeui/ksconfig.cpp.orig    Wed Jan 15 12:18:30 2003
+--- kdeui/ksconfig.cpp.orig    2003-11-30 22:46:51.000000000 +1300
 +++ kdeui/ksconfig.cpp
-@@ -360,6 +360,8 @@ void KSpellConfig::getAvailDictsIspell (
+@@ -432,6 +432,8 @@ void KSpellConfig::getAvailDictsIspell (
    // dictionary path
    QFileInfo dir ("/usr/lib/ispell");
    if (!dir.exists() || !dir.isDir())
@@ -11,12 +11,30 @@
      dir.setFile ("/usr/local/lib/ispell");
    if (!dir.exists() || !dir.isDir())
      dir.setFile ("/usr/local/share/ispell");
-@@ -422,6 +424,8 @@ void KSpellConfig::getAvailDictsAspell (
-   // dictionary path
+@@ -495,6 +497,8 @@ void KSpellConfig::getAvailDictsAspell (
    // FIXME: use "aspell dump config" to find out the dict-dir
    QFileInfo dir ("/usr/lib/aspell");
-+  if (!dir.exists() || !dir.isDir())
+   if (!dir.exists() || !dir.isDir())
 +    dir.setFile ("@LOCALBASE@/lib");
-   if (!dir.exists() || !dir.isDir())
++  if (!dir.exists() || !dir.isDir())
      dir.setFile ("/usr/local/lib/aspell");
    if (!dir.exists() || !dir.isDir())
+     dir.setFile ("/usr/share/aspell");
+@@ -559,6 +563,8 @@ KSpellConfig::fillDicts( QComboBox* box,
+       // dictionary path
+       QFileInfo dir ("/usr/lib/ispell");
+       if (!dir.exists() || !dir.isDir())
++        dir.setFile ("@LOCALBASE@/lib");
++      if (!dir.exists() || !dir.isDir())
+         dir.setFile ("/usr/local/lib/ispell");
+       if (!dir.exists() || !dir.isDir())
+         dir.setFile ("/usr/local/share/ispell");
+@@ -623,6 +629,8 @@ KSpellConfig::fillDicts( QComboBox* box,
+       // FIXME: use "aspell dump config" to find out the dict-dir
+       QFileInfo dir ("/usr/lib/aspell");
+       if (!dir.exists() || !dir.isDir())
++        dir.setFile ("@LOCALBASE@/lib");
++      if (!dir.exists() || !dir.isDir())
+         dir.setFile ("/usr/local/lib/aspell");
+       if (!dir.exists() || !dir.isDir())
+         dir.setFile ("/usr/share/aspell");