Update aspell to 0.60.8. Would like to here feedback.
I know this affects a lot of ports but I wanted to make a push and
update this port. If it is committed, I would take care of the dicts.
Is this a candidate for a bulk build?
Cheers Rafael
Index: Makefile
===================================================================
RCS file: /cvs/ports/textproc/aspell/core/Makefile,v
retrieving revision 1.50
diff -u -p -u -p -r1.50 Makefile
--- Makefile 11 Mar 2022 20:02:20 -0000 1.50
+++ Makefile 29 Aug 2023 08:31:21 -0000
@@ -1,13 +1,13 @@
-COMMENT= spell checker designed to eventually replace Ispell
+COMMENT= spell checker with multi-language support
-DISTNAME= aspell-0.60.6.1
-REVISION= 11
-SHARED_LIBS += aspell 17.0 # .16.4
-SHARED_LIBS += pspell 17.0 # .16.4
+DISTNAME= aspell-0.60.8
DIST_SUBDIR= aspell
CATEGORIES= textproc
-DIST_EN= aspell6-en-7.1-0
+SHARED_LIBS += aspell 18.0 # .16.4
+SHARED_LIBS += pspell 17.0 # .16.4
+
+DIST_EN= aspell6-en-2020.12.07-0
MASTER_SITES0= ${MASTER_SITE_GNU:=aspell/}
MASTER_SITES1= ${MASTER_SITE_GNU:=aspell/dict/en/}
@@ -20,9 +20,9 @@ HOMEPAGE= http://aspell.net/
# LGPLv2.1
PERMIT_PACKAGE= Yes
-WANTLIB= c iconv intl m curses pthread ${COMPILER_LIBCXX}
+WANTLIB += ${COMPILER_LIBCXX} c curses iconv intl m
-COMPILER = base-clang ports-gcc base-gcc
+COMPILER = base-clang ports-gcc base-gcc
# use ld.lld on mips64 to avoid ld.bfd ICE:
# /usr/bin/ld: BFD 2.17 internal error, aborting at
/usr/src/gnu/usr.bin/binutils-2.17/bfd/elfxx-mips.c line 4797 in
mips_elf_create_dynamic_relocation
@@ -30,11 +30,15 @@ COMPILER = base-clang ports-gcc base-gc
USE_LLD = Yes
.endif
+USE_GMAKE = Yes
+
LIB_DEPENDS= devel/gettext,-runtime
CONFIGURE_STYLE= gnu
+
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
+
CONFIGURE_ARGS+= --enable-static \
--enable-curses=ncursesw \
--enable-dict-dir=${PREFIX}/share/aspell \
Index: distinfo
===================================================================
RCS file: /cvs/ports/textproc/aspell/core/distinfo,v
retrieving revision 1.7
diff -u -p -u -p -r1.7 distinfo
--- distinfo 18 Jan 2015 03:15:17 -0000 1.7
+++ distinfo 29 Aug 2023 08:31:21 -0000
@@ -1,4 +1,4 @@
-SHA256 (aspell/aspell-0.60.6.1.tar.gz) =
9SWDqDpjYzcBxfcds9xAqrh7f3aylyOusnlB7/Qt9uE=
-SHA256 (aspell/aspell6-en-7.1-0.tar.bz2) =
/53zwujFuxnGpmB4s2oO9MTfsPy5aeKfe1NF4m10jQo=
-SIZE (aspell/aspell-0.60.6.1.tar.gz) = 1878163
-SIZE (aspell/aspell6-en-7.1-0.tar.bz2) = 175360
+SHA256 (aspell/aspell-0.60.8.tar.gz) =
+bd+UVM0p1Gy5g2qtdsjSZ4mySCfXnt0Q7BSNa0CJvI=
+SHA256 (aspell/aspell6-en-2020.12.07-0.tar.bz2) =
TI9zSiigiLiLtkgfz5ctCyw9yNqUT3ZzKDzkh+rEn7M=
+SIZE (aspell/aspell-0.60.8.tar.gz) = 3486448
+SIZE (aspell/aspell6-en-2020.12.07-0.tar.bz2) = 188972
Index: patches/patch-Makefile_in
===================================================================
RCS file: /cvs/ports/textproc/aspell/core/patches/patch-Makefile_in,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 patch-Makefile_in
--- patches/patch-Makefile_in 11 Mar 2022 20:02:20 -0000 1.5
+++ patches/patch-Makefile_in 29 Aug 2023 08:31:21 -0000
@@ -1,6 +1,7 @@
---- Makefile.in.orig Mon Jul 4 10:58:49 2011
-+++ Makefile.in Tue Jan 17 10:55:18 2012
-@@ -482,7 +482,7 @@ top_builddir = @top_builddir@
+Index: Makefile.in
+--- Makefile.in.orig
++++ Makefile.in
+@@ -667,7 +667,7 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign subdir-objects
SUBDIRS = . po manual
Index: patches/patch-common_cache-t_hpp
===================================================================
RCS file: patches/patch-common_cache-t_hpp
diff -N patches/patch-common_cache-t_hpp
--- patches/patch-common_cache-t_hpp 11 Mar 2022 20:02:20 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-Fix segfault when building dictionaries on macppc
-see https://github.com/GNUAspell/aspell/pull/532
-
-Index: common/cache-t.hpp
---- common/cache-t.hpp.orig
-+++ common/cache-t.hpp
-@@ -16,6 +16,7 @@ class GlobalCacheBase (public)
- const char * name;
- GlobalCacheBase * next;
- GlobalCacheBase * * prev;
-+ static Mutex global_cache_lock;
- protected:
- Cacheable * first;
- void del(Cacheable * d);
Index: patches/patch-common_cache_cpp
===================================================================
RCS file: patches/patch-common_cache_cpp
diff -N patches/patch-common_cache_cpp
--- patches/patch-common_cache_cpp 11 Mar 2022 20:02:20 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,42 +0,0 @@
-Fix segfaults while building dictionaries on macppc
-see https://github.com/GNUAspell/aspell/pull/532
-
-Index: common/cache.cpp
---- common/cache.cpp.orig
-+++ common/cache.cpp
-@@ -5,8 +5,8 @@
-
- namespace acommon {
-
--static StackPtr<Mutex> global_cache_lock(new Mutex);
- static GlobalCacheBase * first_cache = 0;
-+Mutex GlobalCacheBase::global_cache_lock;
-
- void Cacheable::copy() const
- {
-@@ -70,7 +70,7 @@ void release_cache_data(GlobalCacheBase * cache, const
- GlobalCacheBase::GlobalCacheBase(const char * n)
- : name (n)
- {
-- LOCK(global_cache_lock);
-+ LOCK(&global_cache_lock);
- next = first_cache;
- prev = &first_cache;
- if (first_cache) first_cache->prev = &next;
-@@ -80,14 +80,14 @@ GlobalCacheBase::GlobalCacheBase(const char * n)
- GlobalCacheBase::~GlobalCacheBase()
- {
- detach_all();
-- LOCK(global_cache_lock);
-+ LOCK(&global_cache_lock);
- *prev = next;
- if (next) next->prev = prev;
- }
-
- bool reset_cache(const char * which)
- {
-- LOCK(global_cache_lock);
-+ LOCK(&GlobalCacheBase::global_cache_lock);
- bool any = false;
- for (GlobalCacheBase * i = first_cache; i; i = i->next)
- {
Index: patches/patch-common_lock_hpp
===================================================================
RCS file: patches/patch-common_lock_hpp
diff -N patches/patch-common_lock_hpp
--- patches/patch-common_lock_hpp 11 Mar 2022 20:02:20 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-common/lock.hpp:63: error: 'NULL' was not declared in this scope
-
---- common/lock.hpp.orig Tue Jan 17 11:20:03 2012
-+++ common/lock.hpp Tue Jan 17 11:20:13 2012
-@@ -16,6 +16,7 @@
- #define DISTRIBNET_LOCK__HPP
-
- #include <assert.h>
-+#include <cstddef>
-
- #include "settings.h"
-
Index: patches/patch-configure
===================================================================
RCS file: /cvs/ports/textproc/aspell/core/patches/patch-configure,v
retrieving revision 1.8
diff -u -p -u -p -r1.8 patch-configure
--- patches/patch-configure 11 Mar 2022 20:02:20 -0000 1.8
+++ patches/patch-configure 29 Aug 2023 08:31:21 -0000
@@ -1,6 +1,7 @@
---- configure.orig Mon Jul 4 09:58:50 2011
-+++ configure Mon Apr 17 22:05:04 2017
-@@ -2645,7 +2645,7 @@ fi
+Index: configure
+--- configure.orig
++++ configure
+@@ -3308,7 +3308,7 @@ fi
if test "$pkgdatadir" = "undef"
then
@@ -9,17 +10,12 @@
fi
-@@ -20216,10 +20216,10 @@ XGETTEXT!$XGETTEXT$ac_delim
- XGETTEXT_015!$XGETTEXT_015$ac_delim
- MSGMERGE!$MSGMERGE$ac_delim
- INTL_MACOSX_LIBS!$INTL_MACOSX_LIBS$ac_delim
--LIBICONV!$LIBICONV$ac_delim
-+LIBICONV!$LTLIBICONV$ac_delim
- LTLIBICONV!$LTLIBICONV$ac_delim
--INTLLIBS!$INTLLIBS$ac_delim
--LIBINTL!$LIBINTL$ac_delim
-+INTLLIBS!$LTLIBINTL$ac_delim
-+LIBINTL!$LTLIBINTL$ac_delim
- LTLIBINTL!$LTLIBINTL$ac_delim
- POSUB!$POSUB$ac_delim
- PTHREAD_LIB!$PTHREAD_LIB$ac_delim
+@@ -3329,7 +3329,7 @@ fi
+
+ if test "$pkglibdir" = "undef"
+ then
+- pkglibdir=\${libdir}/aspell-0.60
++ pkglibdir=\${libdir}/aspell
+ fi
+
+
Index: patches/patch-interfaces_cc_aspell_h
===================================================================
RCS file: patches/patch-interfaces_cc_aspell_h
diff -N patches/patch-interfaces_cc_aspell_h
--- patches/patch-interfaces_cc_aspell_h 11 Mar 2022 20:02:20 -0000
1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,25 +0,0 @@
-fix with clang; from
https://svnweb.freebsd.org/ports?view=revision&revision=343830
-
-should be obsoleted by upstream patch targetted for 0.60.7
-https://github.com/GNUAspell/aspell/commit/502e8f99a9c7c63344f5acdcb96ddecd30ee32f1
-
---- interfaces/cc/aspell.h.orig Sat Jul 2 22:53:27 2011
-+++ interfaces/cc/aspell.h Mon Apr 17 22:05:44 2017
-@@ -236,7 +236,7 @@ void delete_aspell_can_have_error(struct AspellCanHave
-
- /******************************** errors ********************************/
-
--
-+#ifndef ASPELL_ERRORS__HPP
- extern const struct AspellErrorInfo * const aerror_other;
- extern const struct AspellErrorInfo * const aerror_operation_not_supported;
- extern const struct AspellErrorInfo * const aerror_cant_copy;
-@@ -322,7 +322,7 @@ extern const struct AspellErrorInfo * const aerror_m
- extern const struct AspellErrorInfo * const aerror_bad_magic;
- extern const struct AspellErrorInfo * const aerror_expression;
- extern const struct AspellErrorInfo * const aerror_invalid_expression;
--
-+#endif
-
- /******************************* speller *******************************/
-
Index: patches/patch-modules_filter_tex_cpp
===================================================================
RCS file: patches/patch-modules_filter_tex_cpp
diff -N patches/patch-modules_filter_tex_cpp
--- patches/patch-modules_filter_tex_cpp 11 Mar 2022 20:02:20 -0000
1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,15 +0,0 @@
-Fix compilation with clang 6.
-https://git.savannah.gnu.org/cgit/aspell.git/patch/?id=8089fa02122fed0a6394eba14bbedcb1d18e2384
-
-Index: modules/filter/tex.cpp
---- modules/filter/tex.cpp.orig
-+++ 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;
Index: patches/patch-prog_aspell_cpp
===================================================================
RCS file: patches/patch-prog_aspell_cpp
diff -N patches/patch-prog_aspell_cpp
--- patches/patch-prog_aspell_cpp 11 Mar 2022 20:02:20 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,23 +0,0 @@
-fix with clang; from
https://svnweb.freebsd.org/ports?view=revision&revision=343830
-
-should be obsoleted by upstream patch targetted for 0.60.7
-https://github.com/GNUAspell/aspell/commit/502e8f99a9c7c63344f5acdcb96ddecd30ee32f1
-
---- prog/aspell.cpp.orig Mon Jul 4 10:13:58 2011
-+++ prog/aspell.cpp Mon Apr 17 22:06:01 2017
-@@ -25,6 +25,7 @@
- # include <langinfo.h>
- #endif
-
-+#include "errors.hpp"
- #include "aspell.h"
-
- #ifdef USE_FILE_INO
-@@ -40,7 +41,6 @@
- #include "convert.hpp"
- #include "document_checker.hpp"
- #include "enumeration.hpp"
--#include "errors.hpp"
- #include "file_util.hpp"
- #include "fstream.hpp"
- #include "info.hpp"
Index: patches/patch-prog_check_funs_cpp
===================================================================
RCS file: patches/patch-prog_check_funs_cpp
diff -N patches/patch-prog_check_funs_cpp
--- patches/patch-prog_check_funs_cpp 11 Mar 2022 20:02:20 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,15 +0,0 @@
-Fix compilation with clang 6.
-https://git.savannah.gnu.org/cgit/aspell.git/patch/?id=8089fa02122fed0a6394eba14bbedcb1d18e2384
-
-Index: prog/check_funs.cpp
---- prog/check_funs.cpp.orig
-+++ prog/check_funs.cpp
-@@ -647,7 +647,7 @@ static void print_truncate(FILE * out, const char * wo
- }
- }
- if (i == width-1) {
-- if (word == '\0')
-+ if (*word == '\0')
- put(out,' ');
- else if (word[len] == '\0')
- put(out, word, len);
Index: patches/patch-prog_checker_string_hpp
===================================================================
RCS file: patches/patch-prog_checker_string_hpp
diff -N patches/patch-prog_checker_string_hpp
--- patches/patch-prog_checker_string_hpp 11 Mar 2022 20:02:20 -0000
1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,15 +0,0 @@
-fix with clang; from
https://svnweb.freebsd.org/ports?view=revision&revision=343830
-
-should be obsoleted by upstream patch targetted for 0.60.7
-https://github.com/GNUAspell/aspell/commit/502e8f99a9c7c63344f5acdcb96ddecd30ee32f1
-
---- prog/checker_string.hpp.orig Sat Jul 2 22:09:09 2011
-+++ prog/checker_string.hpp Mon Apr 17 22:06:23 2017
-@@ -6,6 +6,7 @@
-
- #include <stdio.h>
-
-+#include "errors.hpp"
- #include "aspell.h"
-
- #include "vector.hpp"
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/textproc/aspell/core/pkg/PLIST,v
retrieving revision 1.9
diff -u -p -u -p -r1.9 PLIST
--- pkg/PLIST 11 Mar 2022 20:02:20 -0000 1.9
+++ pkg/PLIST 29 Aug 2023 08:31:21 -0000
@@ -73,10 +73,10 @@ lib/aspell/koi8-u.cset
lib/aspell/spell
lib/aspell/split.kbd
lib/aspell/standard.kbd
-lib/libaspell.a
+@static-lib lib/libaspell.a
lib/libaspell.la
@lib lib/libaspell.so.${LIBaspell_VERSION}
-lib/libpspell.a
+@static-lib lib/libpspell.a
lib/libpspell.la
@lib lib/libpspell.so.${LIBpspell_VERSION}
@man man/man1/aspell-import.1
@@ -91,6 +91,11 @@ share/aspell/american-variant_1.alias
share/aspell/american-w_accents.alias
share/aspell/american-wo_accents.alias
share/aspell/american.alias
+share/aspell/australian-variant_0.alias
+share/aspell/australian-variant_1.alias
+share/aspell/australian-w_accents.alias
+share/aspell/australian-wo_accents.alias
+share/aspell/australian.alias
share/aspell/british-ise-w_accents.alias
share/aspell/british-ise-wo_accents.alias
share/aspell/british-ise.alias
@@ -122,6 +127,15 @@ share/aspell/en-w_accents.multi
share/aspell/en-wo_accents-only.rws
share/aspell/en-wo_accents.multi
share/aspell/en.multi
+share/aspell/en_AU-variant_0.multi
+share/aspell/en_AU-variant_0.rws
+share/aspell/en_AU-variant_1.multi
+share/aspell/en_AU-variant_1.rws
+share/aspell/en_AU-w_accents-only.rws
+share/aspell/en_AU-w_accents.multi
+share/aspell/en_AU-wo_accents-only.rws
+share/aspell/en_AU-wo_accents.multi
+share/aspell/en_AU.multi
share/aspell/en_CA-variant_0.multi
share/aspell/en_CA-variant_0.rws
share/aspell/en_CA-variant_1.multi
@@ -162,6 +176,7 @@ share/aspell/english-w_accents.alias
share/aspell/english-wo_accents.alias
share/aspell/english.alias
share/aspell/html.amf
+share/aspell/markdown.amf
share/aspell/none.amf
share/aspell/nroff.amf
share/aspell/perl.amf
@@ -169,8 +184,6 @@ share/aspell/sgml.amf
share/aspell/tex.amf
share/aspell/texinfo.amf
share/aspell/url.amf
-share/locale/ast/
-share/locale/ast/LC_MESSAGES/
share/locale/ast/LC_MESSAGES/aspell.mo
share/locale/be/LC_MESSAGES/aspell.mo
share/locale/ca/LC_MESSAGES/aspell.mo
@@ -180,10 +193,15 @@ share/locale/de/LC_MESSAGES/aspell.mo
share/locale/en_GB/
share/locale/en_GB/LC_MESSAGES/
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/
+share/locale/fur/LC_MESSAGES/
+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
@@ -194,6 +212,8 @@ share/locale/ms/
share/locale/ms/LC_MESSAGES/
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
