Update to 0.60.3.

Complete list of changes from 0.60.2:

   * Fixed bugs involving several of the C API functions.

   * Fixed bug where `ultra' or `fast' mode will not return any
     suggestions when soundslike lookup is not used.

   * Made a minor, yet significant, optimization to the suggestion code.
     This speed things up by an order of magnitude in some cases.

   * Avoid using the slow ngram scan except when the `sug-mode' is
     `slow' or `bad-speller'.

   * Fixed a bug in curses mode which causes word-wrap to not work
     correctly in some cases.

   * Fixed a bug in pipe mode with a missing newline.

   * Fixed the `spell' compatibility script.

   * Several other minor bugs fixed.

   * Made note about the change in behavior of the `-l' command line
     switch.

   * Other manual update/fixes.

   * Updated to Libtool 1.5.18, Automake 1.9.6, and Makeinfo 4.8.

5 files changed, 10 insertions, 39 deletions

diff --git a/textproc/aspell/Makefile b/textproc/aspell/Makefile
index ba0dd89b34f..292c21ed8da 100644
--- a/textproc/aspell/Makefile
+++ b/textproc/aspell/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.32 2005/06/26 05:19:10 wiz Exp $
+# $NetBSD: Makefile,v 1.33 2005/06/28 14:17:49 wiz Exp $
 #
 
-DISTNAME=		aspell-0.60.2
-PKGREVISION=		1
+DISTNAME=		aspell-0.60.3
 CATEGORIES=		textproc
 MASTER_SITES=		${MASTER_SITE_GNU:=aspell/}
 
diff --git a/textproc/aspell/distinfo b/textproc/aspell/distinfo
index 15e41a7444e..628f4aba314 100644
--- a/textproc/aspell/distinfo
+++ b/textproc/aspell/distinfo
@@ -1,9 +1,7 @@
-$NetBSD: distinfo,v 1.14 2005/06/26 05:19:10 wiz Exp $
+$NetBSD: distinfo,v 1.15 2005/06/28 14:17:49 wiz Exp $
 
-SHA1 (aspell-0.60.2.tar.gz) = 2429ceeddc5ad68e11aaca404d1eaa2e4997bef1
-RMD160 (aspell-0.60.2.tar.gz) = ce5b5ef1f7ae4d7434200202bd23b8076a38ba90
-Size (aspell-0.60.2.tar.gz) = 1577570 bytes
-SHA1 (patch-aa) = d6446a8ec87ffb6cb76d59927b407c97716bf771
-SHA1 (patch-ab) = 505bdb239beec03d21ee372e50a165d3067e3755
-SHA1 (patch-ac) = 659fac33603b1b56c4c8149c7d8e94811e22f4b6
+SHA1 (aspell-0.60.3.tar.gz) = 90f9414947550b92f2a113b131d8c628cb7e7887
+RMD160 (aspell-0.60.3.tar.gz) = 92e0dd8e271a48f73407e23c2d0246f2827e1789
+Size (aspell-0.60.3.tar.gz) = 1635824 bytes
+SHA1 (patch-ac) = 4d20eebd29932f1ba970a9d85793fb8611d76ba8
 SHA1 (patch-ag) = 04b34f2b780a632a5045120ae408ceea591a66de
diff --git a/textproc/aspell/patches/patch-aa b/textproc/aspell/patches/patch-aa
deleted file mode 100644
index 1faa552f50c..00000000000
--- a/textproc/aspell/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.7 2005/02/20 23:06:17 wiz Exp $
-
---- modules/filter/nroff.cpp.orig	Mon Feb  7 18:18:29 2005
-+++ modules/filter/nroff.cpp	Mon Feb  7 18:18:42 2005
-@@ -73,7 +73,7 @@
-       return false;
-     }
-     
--    bool inline NroffFilter::process_char (FilterChar::Chr c);
-+    bool NroffFilter::process_char (FilterChar::Chr c);
-       
-   public:
- 
diff --git a/textproc/aspell/patches/patch-ab b/textproc/aspell/patches/patch-ab
deleted file mode 100644
index fc285cf229d..00000000000
--- a/textproc/aspell/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.5 2005/06/26 05:19:10 wiz Exp $
-
---- modules/speller/default/readonly_ws.cpp.orig	2004-11-10 07:18:45.000000000 +0100
-+++ modules/speller/default/readonly_ws.cpp
-@@ -921,7 +921,7 @@ namespace {
-           prev->aff = aff;
-           aff += l1;
-           for (const char * p = cur->aff; *p; ++p) {
--            if (memchr(prev->aff, l1, *p)) continue;
-+            if (memchr(prev->aff, *p, l1)) continue;
-             *aff = *p;
-             ++aff;
-           }
diff --git a/textproc/aspell/patches/patch-ac b/textproc/aspell/patches/patch-ac
index 13fa100108e..2cb2e5e86bf 100644
--- a/textproc/aspell/patches/patch-ac
+++ b/textproc/aspell/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.4 2004/12/24 02:55:53 wiz Exp $
+$NetBSD: patch-ac,v 1.5 2005/06/28 14:17:50 wiz Exp $
 
---- prog/check_funs.cpp.orig	2004-08-08 07:04:57.000000000 +0200
+--- prog/check_funs.cpp.orig	2005-06-01 05:06:23.000000000 +0200
 +++ prog/check_funs.cpp
-@@ -210,7 +210,8 @@ static void layout_screen() {
+@@ -216,7 +216,8 @@ static void layout_screen() {
    choice_w = 0;
    nonl();
    noecho();