aspell-0.60.7.diff

diff --git a/textproc/aspell/Makefile b/textproc/aspell/Makefile
index 363af60b883..594b76f3889 100644
--- a/textproc/aspell/Makefile
+++ b/textproc/aspell/Makefile
@@ -1,8 +1,7 @@
 # $NetBSD: Makefile,v 1.72 2019/08/11 13:23:21 wiz Exp $
 #
 
-DISTNAME=		aspell-0.60.6.1
-PKGREVISION=		10
+DISTNAME=		aspell-0.60.7
 CATEGORIES=		textproc
 MASTER_SITES=		${MASTER_SITE_GNU:=aspell/}
 
diff --git a/textproc/aspell/PLIST b/textproc/aspell/PLIST
index a0586f915c8..82764f889d2 100644
--- a/textproc/aspell/PLIST
+++ b/textproc/aspell/PLIST
@@ -108,16 +108,21 @@ share/locale/cs/LC_MESSAGES/aspell.mo
 share/locale/da/LC_MESSAGES/aspell.mo
 share/locale/de/LC_MESSAGES/aspell.mo
 share/locale/en_GB/LC_MESSAGES/aspell.mo
+share/locale/eo/LC_MESSAGES/aspell.mo
 share/locale/es/LC_MESSAGES/aspell.mo
 share/locale/fi/LC_MESSAGES/aspell.mo
 share/locale/fr/LC_MESSAGES/aspell.mo
+share/locale/fur/LC_MESSAGES/aspell.mo
 share/locale/ga/LC_MESSAGES/aspell.mo
+share/locale/hr/LC_MESSAGES/aspell.mo
 share/locale/id/LC_MESSAGES/aspell.mo
 share/locale/it/LC_MESSAGES/aspell.mo
 share/locale/ja/LC_MESSAGES/aspell.mo
 share/locale/mn/LC_MESSAGES/aspell.mo
 share/locale/ms/LC_MESSAGES/aspell.mo
 share/locale/nl/LC_MESSAGES/aspell.mo
+share/locale/pl/LC_MESSAGES/aspell.mo
+share/locale/pt/LC_MESSAGES/aspell.mo
 share/locale/pt_BR/LC_MESSAGES/aspell.mo
 share/locale/ro/LC_MESSAGES/aspell.mo
 share/locale/ru/LC_MESSAGES/aspell.mo
diff --git a/textproc/aspell/distinfo b/textproc/aspell/distinfo
index ca6bcc1b3ff..bb638e68e48 100644
--- a/textproc/aspell/distinfo
+++ b/textproc/aspell/distinfo
@@ -1,11 +1,11 @@
 $NetBSD: distinfo,v 1.29 2017/05/24 09:13:09 jperkin Exp $
 
-SHA1 (aspell-0.60.6.1.tar.gz) = ff1190db8de279f950c242c6f4c5d5cdc2cbdc49
-RMD160 (aspell-0.60.6.1.tar.gz) = 6d4e29228e5c47cd4dbd780a73dbc1d2222e8266
-SHA512 (aspell-0.60.6.1.tar.gz) = f310c7590be98406589b5c26ca36a2ecfe4733f0b40fd6c176b96b7955ef2b5cd0ec9a3d770cf132146ae7a896042b4b698945112995ee1ae66adcfa5542247f
-Size (aspell-0.60.6.1.tar.gz) = 1878163 bytes
+SHA1 (aspell-0.60.7.tar.gz) = 80ef99a68e7e672f0eb06fac844387494e594948
+RMD160 (aspell-0.60.7.tar.gz) = 9463ce8f8f5db73e403cc8ee4ea9f4c66fb1ed25
+SHA512 (aspell-0.60.7.tar.gz) = 6f5fcd1c29164ee18f205594b66f382b51d19b17686293a931ca92c1442d3f7228627ca7d604d860551d0d367ac34dfb2ae34170a844f51e84e390fb1edc4535
+Size (aspell-0.60.7.tar.gz) = 2071890 bytes
 SHA1 (patch-ab) = 615a676128dab7d79e697f56330c8aaa6c901d3f
-SHA1 (patch-ac) = e483c9aa23472734d3ccb9611f6f49fb576f6fc1
+SHA1 (patch-ac) = e748877b22ca116454155d3659c16efaf02e7963
 SHA1 (patch-ad) = 5e525ed1e91b3271567f4255729e94159be86f58
 SHA1 (patch-ae) = d35f3544f44464a36685903ade3cdeb59c5fd836
 SHA1 (patch-af) = b34d98280c83f270f86ad3cf0f31e48688f53138
@@ -13,6 +13,5 @@ SHA1 (patch-ag) = 5aabf8d9a9a28db9dee073bdfcd62fbc3e2f38c0
 SHA1 (patch-ai) = 4fbb25e3f09aa97bdcb12f325ef615e5a6f9f626
 SHA1 (patch-an) = 687cf83ad9be083da0a53e7a7b5cbaefe88f63a5
 SHA1 (patch-interfaces_cc_aspell.h) = f824d0bb1e3c55faaf6ecae10b44169d91b41517
-SHA1 (patch-modules_filter_tex.cpp) = f10257c4c62efe39e15bbcd3dd2ee0b2744733f8
-SHA1 (patch-prog_aspell.cpp) = 5caf4556a48db8219e95d1ec0034efc81c4f7e34
+SHA1 (patch-prog_aspell.cpp) = 9bc6537cd0b9040fef56be202f0c5f6ab64fdf85
 SHA1 (patch-prog_checker__string.hpp) = b070e776a0998f17e4ff30cd004179585f70f3df
diff --git a/textproc/aspell/patches/patch-ac b/textproc/aspell/patches/patch-ac
index 070b51816a7..f1d146c1bcd 100644
--- a/textproc/aspell/patches/patch-ac
+++ b/textproc/aspell/patches/patch-ac
@@ -67,12 +67,3 @@ $NetBSD: patch-ac,v 1.7 2017/05/24 09:13:09 jperkin Exp $
    }
  #endif
    if (use_curses) {
-@@ -647,7 +654,7 @@ static void print_truncate(FILE * out, c
-     }
-   }
-   if (i == width-1) {
--    if (word == '\0')
-+    if (*word == '\0')
-       put(out,' ');
-     else if (word[len] == '\0')
-       put(out, word, len);
diff --git a/textproc/aspell/patches/patch-modules_filter_tex.cpp b/textproc/aspell/patches/patch-modules_filter_tex.cpp
deleted file mode 100644
index 20797013345..00000000000
--- a/textproc/aspell/patches/patch-modules_filter_tex.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-modules_filter_tex.cpp,v 1.1 2017/05/24 09:13:09 jperkin Exp $
-
-Pointer fixes.
-
---- modules/filter/tex.cpp.orig	2011-07-02 21:09:09.000000000 +0000
-+++ modules/filter/tex.cpp
-@@ -174,7 +174,7 @@ namespace {
- 
-     if (c == '{') {
- 
--      if (top.in_what == Parm || top.in_what == Opt || top.do_check == '\0')
-+      if (top.in_what == Parm || top.in_what == Opt || *top.do_check == '\0')
- 	push_command(Parm);
- 
-       top.in_what = Parm;
diff --git a/textproc/aspell/patches/patch-prog_aspell.cpp b/textproc/aspell/patches/patch-prog_aspell.cpp
index da9127909f6..cf9541c6405 100644
--- a/textproc/aspell/patches/patch-prog_aspell.cpp
+++ b/textproc/aspell/patches/patch-prog_aspell.cpp
@@ -9,8 +9,8 @@ $NetBSD: patch-prog_aspell.cpp,v 1.1 2013/08/17 11:19:03 joerg Exp $
 +#include "errors.hpp"
  #include "aspell.h"
  
- #ifdef USE_FILE_INO
-@@ -40,7 +41,6 @@
+ #include <sys/types.h>
+@@ -41,7 +42,6 @@
  #include "convert.hpp"
  #include "document_checker.hpp"
  #include "enumeration.hpp"