pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/textproc/aspell Update to 0.60.6:
details: https://anonhg.NetBSD.org/pkgsrc/rev/9066dea16aa0
branches: trunk
changeset: 541992:9066dea16aa0
user: wiz <wiz%pkgsrc.org@localhost>
date: Tue Apr 29 11:40:50 2008 +0000
description:
Update to 0.60.6:
Complete list of changes from 0.60.5:
* Compile fixes for Gcc 4.3.
* Updated to Libtool 2.2.2 and Automake 1.10.1
* Minor tweak to suggestion code which improved suggestion results in
certain cases.
* Always line buffer stdout and stderr in the Aspell utility when
there is the potential for it to be used interactively through a
pipe.
* Removed debug output in `aspell munch-list'.
* Other minor updates and bug fixes.
diffstat:
textproc/aspell/Makefile | 21 +---------
textproc/aspell/PLIST | 3 +-
textproc/aspell/distinfo | 15 ++-----
textproc/aspell/options.mk | 18 +++++++++
textproc/aspell/patches/patch-ad | 21 +---------
textproc/aspell/patches/patch-ah | 15 -------
textproc/aspell/patches/patch-aj | 15 -------
textproc/aspell/patches/patch-ak | 19 ---------
textproc/aspell/patches/patch-al | 79 ----------------------------------------
textproc/aspell/patches/patch-am | 24 ------------
10 files changed, 31 insertions(+), 199 deletions(-)
diffs (truncated from 308 to 300 lines):
diff -r 21a4eef72a05 -r 9066dea16aa0 textproc/aspell/Makefile
--- a/textproc/aspell/Makefile Tue Apr 29 11:07:36 2008 +0000
+++ b/textproc/aspell/Makefile Tue Apr 29 11:40:50 2008 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.55 2008/04/12 22:43:13 jlam Exp $
+# $NetBSD: Makefile,v 1.56 2008/04/29 11:40:50 wiz Exp $
#
-DISTNAME= aspell-0.60.5
+DISTNAME= aspell-0.60.6
CATEGORIES= textproc
MASTER_SITES= ${MASTER_SITE_GNU:=aspell/}
@@ -37,22 +37,7 @@
CPPFLAGS+= -DHAVE_OLD_SIGNAL
.endif
-# Loadable filter currently don't work on NetBSD, see
-# https://sourceforge.net/tracker/?func=detail&atid=100245&aid=1336865&group_id=245
-# Disable dynamic loading of filters until it is fixed.
-PKG_OPTIONS_VAR= PKG_OPTIONS.aspell
-PKG_SUPPORTED_OPTIONS= # none
-#PKG_SUPPORTED_OPTIONS= aspell-loadable-filters
-
-.include "../../mk/bsd.options.mk"
-
-PLIST_VARS+= filters
-.if !empty(PKG_OPTIONS:Maspell-loadable-filters)
-CONFIGURE_ARGS+= --disable-compile-in-filters
-PLIST.filters= yes
-.else
-CONFIGURE_ARGS+= --enable-compile-in-filters
-.endif
+.include "options.mk"
REPLACE_PERL= scripts/aspell-import
diff -r 21a4eef72a05 -r 9066dea16aa0 textproc/aspell/PLIST
--- a/textproc/aspell/PLIST Tue Apr 29 11:07:36 2008 +0000
+++ b/textproc/aspell/PLIST Tue Apr 29 11:40:50 2008 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.13 2008/04/12 22:43:13 jlam Exp $
+@comment $NetBSD: PLIST,v 1.14 2008/04/29 11:40:50 wiz Exp $
bin/aspell
bin/aspell-import
bin/precat
@@ -117,6 +117,7 @@
share/locale/ro/LC_MESSAGES/aspell.mo
share/locale/ru/LC_MESSAGES/aspell.mo
share/locale/rw/LC_MESSAGES/aspell.mo
+share/locale/sk/LC_MESSAGES/aspell.mo
share/locale/sl/LC_MESSAGES/aspell.mo
share/locale/sr/LC_MESSAGES/aspell.mo
share/locale/sv/LC_MESSAGES/aspell.mo
diff -r 21a4eef72a05 -r 9066dea16aa0 textproc/aspell/distinfo
--- a/textproc/aspell/distinfo Tue Apr 29 11:07:36 2008 +0000
+++ b/textproc/aspell/distinfo Tue Apr 29 11:40:50 2008 +0000
@@ -1,18 +1,13 @@
-$NetBSD: distinfo,v 1.23 2007/01/06 22:07:42 wiz Exp $
+$NetBSD: distinfo,v 1.24 2008/04/29 11:40:50 wiz Exp $
-SHA1 (aspell-0.60.5.tar.gz) = 170ff906bd909dba32144c972d322cfc8fbff41b
-RMD160 (aspell-0.60.5.tar.gz) = 1efc56988a01e60d1fcff0143e910f5cb6618a76
-Size (aspell-0.60.5.tar.gz) = 1754865 bytes
+SHA1 (aspell-0.60.6.tar.gz) = 335bcb560e00f59d89ec9e4c4114c325fb0e65f4
+RMD160 (aspell-0.60.6.tar.gz) = 315638cc7cc4ce9d3dc09c7e15faf637855d504e
+Size (aspell-0.60.6.tar.gz) = 1777930 bytes
SHA1 (patch-ab) = 615a676128dab7d79e697f56330c8aaa6c901d3f
SHA1 (patch-ac) = 8adbd2b330830ba0fb3fc063bee0fac69b0a1f64
-SHA1 (patch-ad) = 0af066d4da0e4f6e69135a2d3bc58858b71cac8a
+SHA1 (patch-ad) = 5e525ed1e91b3271567f4255729e94159be86f58
SHA1 (patch-ae) = d35f3544f44464a36685903ade3cdeb59c5fd836
SHA1 (patch-af) = b34d98280c83f270f86ad3cf0f31e48688f53138
SHA1 (patch-ag) = 5aabf8d9a9a28db9dee073bdfcd62fbc3e2f38c0
-SHA1 (patch-ah) = b38fa850bb3ff3c62c020fb45ce388888f145286
SHA1 (patch-ai) = 4fbb25e3f09aa97bdcb12f325ef615e5a6f9f626
-SHA1 (patch-aj) = fcc8c03ed4d39b010f230c972529716b118abd1a
-SHA1 (patch-ak) = c4e228b8712c1e36bbeb8d268f83893cfeb4e620
-SHA1 (patch-al) = 2e39f1670f99c9267be2b2d214765a19a5390b9f
-SHA1 (patch-am) = 0bf35baa6cb325095ca113739329fdd06eeef251
SHA1 (patch-an) = 687cf83ad9be083da0a53e7a7b5cbaefe88f63a5
diff -r 21a4eef72a05 -r 9066dea16aa0 textproc/aspell/options.mk
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/textproc/aspell/options.mk Tue Apr 29 11:40:50 2008 +0000
@@ -0,0 +1,18 @@
+# $NetBSD: options.mk,v 1.1 2008/04/29 11:40:50 wiz Exp $
+
+# Loadable filter currently don't work on NetBSD, see
+# https://sourceforge.net/tracker/?func=detail&atid=100245&aid=1336865&group_id=245
+# Disable dynamic loading of filters until it is fixed.
+PKG_OPTIONS_VAR= PKG_OPTIONS.aspell
+PKG_SUPPORTED_OPTIONS= # none
+#PKG_SUPPORTED_OPTIONS= aspell-loadable-filters
+
+.include "../../mk/bsd.options.mk"
+
+PLIST_VARS+= filters
+.if !empty(PKG_OPTIONS:Maspell-loadable-filters)
+CONFIGURE_ARGS+= --disable-compile-in-filters
+PLIST.filters= yes
+.else
+CONFIGURE_ARGS+= --enable-compile-in-filters
+.endif
diff -r 21a4eef72a05 -r 9066dea16aa0 textproc/aspell/patches/patch-ad
--- a/textproc/aspell/patches/patch-ad Tue Apr 29 11:07:36 2008 +0000
+++ b/textproc/aspell/patches/patch-ad Tue Apr 29 11:40:50 2008 +0000
@@ -1,13 +1,7 @@
-$NetBSD: patch-ad,v 1.6 2006/11/24 16:31:48 rillig Exp $
-
-The second hunk is needed for Solaris with SunPro, but I don't have a
-clue why.
+$NetBSD: patch-ad,v 1.7 2008/04/29 11:40:50 wiz Exp $
-See also:
-* http://src.opensolaris.org/source/xref/jds/spec-files/trunk/patches/aspell-01-forte.diff
-
---- common/convert.cpp.orig 2006-09-17 19:24:05.000000000 +0200
-+++ common/convert.cpp 2006-09-17 19:24:46.000000000 +0200
+--- common/convert.cpp.orig 2007-12-03 07:55:45.000000000 +0100
++++ common/convert.cpp
@@ -24,6 +24,10 @@
#include "gettext.h"
@@ -19,12 +13,3 @@
namespace acommon {
typedef unsigned char byte;
-@@ -238,7 +242,7 @@ namespace acommon {
- }
-
- template <class T>
-- static void free_norm_table(NormTable<T> * d)
-+ void free_norm_table(NormTable<T> * d)
- {
- for (T * cur = d->data; cur != d->end; ++cur) {
- if (cur->sub_table)
diff -r 21a4eef72a05 -r 9066dea16aa0 textproc/aspell/patches/patch-ah
--- a/textproc/aspell/patches/patch-ah Tue Apr 29 11:07:36 2008 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-$NetBSD: patch-ah,v 1.1 2005/10/27 00:18:51 rillig Exp $
-
-The SunPro compiler does not like static inline template<>s.
-
---- common/string.hpp.orig Mon Nov 29 18:50:05 2004
-+++ common/string.hpp Tue Oct 25 03:45:20 2005
-@@ -492,7 +492,7 @@ namespace acommon {
-
- namespace std
- {
-- template<> static inline void swap(acommon::String & x, acommon::String & y) {return x.swap(y);}
-+ template<> inline void swap(acommon::String & x, acommon::String & y) {return x.swap(y);}
- }
-
- #endif
diff -r 21a4eef72a05 -r 9066dea16aa0 textproc/aspell/patches/patch-aj
--- a/textproc/aspell/patches/patch-aj Tue Apr 29 11:07:36 2008 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-$NetBSD: patch-aj,v 1.2 2007/01/06 22:07:43 wiz Exp $
-
-To understand recursion, you first have to understand recursion.
-
---- modules/speller/default/readonly_ws.cpp.orig 2006-11-18 09:17:19.000000000 +0000
-+++ modules/speller/default/readonly_ws.cpp
-@@ -726,7 +726,7 @@ namespace {
- struct WordLookupParms {
- const char * block_begin;
- WordLookupParms() {}
-- typedef Vector<u32int> Vector;
-+ typedef aspeller::Vector<u32int> Vector;
- typedef u32int Value;
- typedef const char * Key;
- static const bool is_multi = false;
diff -r 21a4eef72a05 -r 9066dea16aa0 textproc/aspell/patches/patch-ak
--- a/textproc/aspell/patches/patch-ak Tue Apr 29 11:07:36 2008 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-$NetBSD: patch-ak,v 1.1 2005/10/27 00:18:51 rillig Exp $
-
-What happens if you call two parameters by the same name? It's a
-compile-time error. What a surprise.
-
---- modules/speller/default/affix.hpp.orig 2004-11-29 18:50:06.000000000 +0100
-+++ modules/speller/default/affix.hpp 2005-10-27 02:11:29.724080400 +0200
-@@ -107,9 +107,9 @@ namespace aspeller {
- {
- return expand(word,aff,buf,0);
- }
-- WordAff * expand_suffix(ParmString word, const unsigned char * new_aff,
-+ WordAff * expand_suffix(ParmString word, const unsigned char *,
- ObjStack &, int limit = INT_MAX,
-- unsigned char * new_aff = 0, WordAff * * * l = 0,
-+ unsigned char * = 0, WordAff * * * l = 0,
- ParmString orig_word = 0) const;
-
- private:
diff -r 21a4eef72a05 -r 9066dea16aa0 textproc/aspell/patches/patch-al
--- a/textproc/aspell/patches/patch-al Tue Apr 29 11:07:36 2008 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,79 +0,0 @@
-$NetBSD: patch-al,v 1.1 2005/10/27 01:08:06 rillig Exp $
-
-The SunPro compiler does not like empty arrays, so let's not create C++
-source files that have them.
-
---- gen/mk-static-filter.pl.orig 2004-06-29 02:18:17.000000000 +0200
-+++ gen/mk-static-filter.pl 2005-10-27 02:45:45.784646500 +0200
-@@ -130,38 +130,44 @@ printf STATICFILTERS "\n };\n";
- printf STATICFILTERS "\n const unsigned int standard_filters_size = ".
- "sizeof(standard_filters)/sizeof(FilterEntry);\n";
-
-+my %empty_filters = ();
-
- #create KeyInfo structures for each static filter
- while ($filter = shift @filterhashes) {
-- printf STATICFILTERS "\n static KeyInfo ".${$filter}{"NAME"}."_options[] = {\n";
-+ my $txt = "\n static KeyInfo ".${$filter}{"NAME"}."_options[] = {\n";
-
- #create KeyInfo structs and begin end handles
- $firstopt = 1;
- while (($name,$option)=each %{$filter}) {
- ($name=~/(?:NAME|(?:DE|EN)CODER|FILTER|DESCRIPTION)/) && next;
-- ( $firstopt != 1 ) && ( printf STATICFILTERS ",\n" );
-+ ( $firstopt != 1 ) && ( $txt .= ",\n" );
- $firstopt = 0;
-- printf STATICFILTERS " {\n".
-+ $txt .= " {\n".
- " \"f-${$filter}{NAME}-$name\",\n";
- ( (lc ${$option}{"TYPE"}) eq "bool") &&
-- printf STATICFILTERS " KeyInfoBool,\n";
-+ ($txt .= " KeyInfoBool,\n");
- ( (lc ${$option}{"TYPE"}) eq "int") &&
-- printf STATICFILTERS " KeyInfoInt,\n";
-+ ($txt .= " KeyInfoInt,\n");
- ( (lc ${$option}{"TYPE"}) eq "string") &&
-- printf STATICFILTERS " KeyInfoString,\n";
-+ ($txt .= " KeyInfoString,\n");
- ( (lc ${$option}{"TYPE"}) eq "list") &&
-- printf STATICFILTERS " KeyInfoList,\n";
-- print STATICFILTERS " \"".${$option}{"DEFAULT"}."\",\n".
-+ ($txt .= " KeyInfoList,\n");
-+ $txt .= " \"".${$option}{"DEFAULT"}."\",\n".
- " \"".${$option}{"DESCRIPTION"}."\"\n".
- " }";
- }
-- printf STATICFILTERS "\n };\n";
-- printf STATICFILTERS "\n const KeyInfo * ".${$filter}{"NAME"}."_options_begin = ".
-+ $txt .= "\n };\n";
-+ $txt .= "\n const KeyInfo * ".${$filter}{"NAME"}."_options_begin = ".
- ${$filter}{"NAME"}."_options;\n";
-- printf STATICFILTERS "\n const KeyInfo * ".${$filter}{"NAME"}."_options_end = ".
-+ $txt .= "\n const KeyInfo * ".${$filter}{"NAME"}."_options_end = ".
- ${$filter}{"NAME"}."_options+sizeof(".
- ${$filter}{"NAME"}."_options)/".
- "sizeof(KeyInfo);\n";
-+ if ($firstopt != 1) {
-+ print STATICFILTERS $txt;
-+ } else {
-+ $empty_filters{$filter->{"NAME"}} = 1;
-+ }
- }
-
- #finally create filter modules list.
-@@ -170,6 +176,7 @@ printf STATICFILTERS "\n\n static Conf
- #printf STATICFILTERS " {\"fm\",0,modes_module_begin,modes_module_end}";
- $firstopt = 1;
- while ($filter = shift @rallfilters) {
-+ if (!exists($empty_filters{$filter})) {
- ( $firstopt != 1 ) && ( printf STATICFILTERS ",\n" );
- $firstopt = 0;
- printf STATICFILTERS " {\n".
-@@ -177,6 +184,7 @@ while ($filter = shift @rallfilters) {
- " \"".${${filters}{$filter}}{DESCRIPTION}."\",\n" .
- " ${filter}_options_begin,${filter}_options_end\n" .
- " }";
-+ }
- }
- printf STATICFILTERS "\n };\n";
- printf STATICFILTERS "\n const ConfigModule * filter_modules_begin = ".
diff -r 21a4eef72a05 -r 9066dea16aa0 textproc/aspell/patches/patch-am
--- a/textproc/aspell/patches/patch-am Tue Apr 29 11:07:36 2008 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-$NetBSD: patch-am,v 1.2 2007/01/06 22:07:43 wiz Exp $
-
-To understand recursion, you first have to understand recursion.
-
---- prog/aspell.cpp.orig 2006-12-19 10:51:08.000000000 +0000
-+++ prog/aspell.cpp
-@@ -1882,7 +1882,7 @@ struct SML_Parms {
- typedef SML_WordEntry Value;
- typedef const char * Key;
- static const bool is_multi = false;
-- hash<const char *> hash;
-+ acommon::hash<const char *> hash;
- bool equal(Key x, Key y) {return strcmp(x,y) == 0;}
- Key key(const Value & v) {return v.word;}
- };
-@@ -2033,7 +2033,7 @@ struct CML_Parms {
Home |
Main Index |
Thread Index |
Old Index