From 98b93ac0fa8d1558a8b9bd755642a36ec2115105 Mon Sep 17 00:00:00 2001 From: wiz Date: Sat, 6 Jan 2007 22:07:42 +0000 Subject: Update to 0.60.5: * Compile fix for gcc 4.1 * Updated to Gettext 0.16.1, Libtool 1.5.22, Automake 1.10, Autoconf 2.61 * Documentation improvements, including an updated `man' page. * Complain if more than one file is specified when checking files using the `aspell check' command, rather than ignoring the other files. * Large number of bug fixes. --- textproc/aspell/Makefile | 7 +++---- textproc/aspell/PLIST | 4 +++- textproc/aspell/buildlink3.mk | 6 +++--- textproc/aspell/distinfo | 17 ++++++++--------- textproc/aspell/patches/patch-aa | 13 ------------- textproc/aspell/patches/patch-ag | 8 ++++---- textproc/aspell/patches/patch-ai | 8 ++++---- textproc/aspell/patches/patch-aj | 8 ++++---- textproc/aspell/patches/patch-am | 10 +++++----- 9 files changed, 34 insertions(+), 47 deletions(-) delete mode 100644 textproc/aspell/patches/patch-aa (limited to 'textproc') diff --git a/textproc/aspell/Makefile b/textproc/aspell/Makefile index 450e91a164a..e82f3cd0a72 100644 --- a/textproc/aspell/Makefile +++ b/textproc/aspell/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.47 2006/11/24 16:31:48 rillig Exp $ +# $NetBSD: Makefile,v 1.48 2007/01/06 22:07:42 wiz Exp $ # -DISTNAME= aspell-0.60.4 -PKGREVISION= 2 +DISTNAME= aspell-0.60.5 CATEGORIES= textproc MASTER_SITES= ${MASTER_SITE_GNU:=aspell/} @@ -21,7 +20,7 @@ USE_TOOLS+= perl:run USE_LIBTOOL= yes USE_LANGUAGES= c c++ USE_PKGLOCALEDIR= yes -INFO_FILES= # PLIST +INFO_FILES= yes CONFIGURE_ARGS+= --enable-doc-dir=${PREFIX}/share/doc/aspell CONFIGURE_ARGS+= --enable-curses=ncurses diff --git a/textproc/aspell/PLIST b/textproc/aspell/PLIST index 904cce12d8e..7038427ec53 100644 --- a/textproc/aspell/PLIST +++ b/textproc/aspell/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.11 2006/05/05 03:11:53 minskim Exp $ +@comment $NetBSD: PLIST,v 1.12 2007/01/06 22:07:42 wiz Exp $ bin/aspell bin/aspell-import bin/precat @@ -102,6 +102,7 @@ share/aspell/standard.kbd ${FILTER}share/aspell/tex-filter.info ${FILTER}share/aspell/texinfo-filter.info share/locale/be/LC_MESSAGES/aspell.mo +share/locale/ca/LC_MESSAGES/aspell.mo share/locale/cs/LC_MESSAGES/aspell.mo share/locale/da/LC_MESSAGES/aspell.mo share/locale/de/LC_MESSAGES/aspell.mo @@ -118,6 +119,7 @@ share/locale/ru/LC_MESSAGES/aspell.mo share/locale/rw/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 share/locale/tg/LC_MESSAGES/aspell.mo share/locale/uk/LC_MESSAGES/aspell.mo share/locale/vi/LC_MESSAGES/aspell.mo diff --git a/textproc/aspell/buildlink3.mk b/textproc/aspell/buildlink3.mk index be4af468357..d69a126dead 100644 --- a/textproc/aspell/buildlink3.mk +++ b/textproc/aspell/buildlink3.mk @@ -1,9 +1,9 @@ -# $NetBSD: buildlink3.mk,v 1.13 2006/07/08 23:11:10 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.14 2007/01/06 22:07:42 wiz Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ ASPELL_BUILDLINK3_MK:= ${ASPELL_BUILDLINK3_MK}+ -.if !empty(BUILDLINK_DEPTH:M+) +.if ${BUILDLINK_DEPTH} == "+" BUILDLINK_DEPENDS+= aspell .endif @@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Naspell} BUILDLINK_PACKAGES+= aspell BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}aspell -.if !empty(ASPELL_BUILDLINK3_MK:M+) +.if ${ASPELL_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.aspell+= aspell>=0.50.3 BUILDLINK_ABI_DEPENDS.aspell+= aspell>=0.60.4nb1 BUILDLINK_PKGSRCDIR.aspell?= ../../textproc/aspell diff --git a/textproc/aspell/distinfo b/textproc/aspell/distinfo index 33a041f255e..3c77eb63705 100644 --- a/textproc/aspell/distinfo +++ b/textproc/aspell/distinfo @@ -1,19 +1,18 @@ -$NetBSD: distinfo,v 1.22 2006/11/24 16:31:48 rillig Exp $ +$NetBSD: distinfo,v 1.23 2007/01/06 22:07:42 wiz Exp $ -SHA1 (aspell-0.60.4.tar.gz) = 07353593eb89e64c49b1fd8dd405e3ee0ed86291 -RMD160 (aspell-0.60.4.tar.gz) = e0408acd4f3304c957aeea0b17a28d0c44e11064 -Size (aspell-0.60.4.tar.gz) = 1676825 bytes -SHA1 (patch-aa) = f68dd79ef2d3290b019d7588cadb4fdf53b3b988 +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 (patch-ab) = 615a676128dab7d79e697f56330c8aaa6c901d3f SHA1 (patch-ac) = 8adbd2b330830ba0fb3fc063bee0fac69b0a1f64 SHA1 (patch-ad) = 0af066d4da0e4f6e69135a2d3bc58858b71cac8a SHA1 (patch-ae) = d35f3544f44464a36685903ade3cdeb59c5fd836 SHA1 (patch-af) = b34d98280c83f270f86ad3cf0f31e48688f53138 -SHA1 (patch-ag) = 04b34f2b780a632a5045120ae408ceea591a66de +SHA1 (patch-ag) = 5aabf8d9a9a28db9dee073bdfcd62fbc3e2f38c0 SHA1 (patch-ah) = b38fa850bb3ff3c62c020fb45ce388888f145286 -SHA1 (patch-ai) = f5192b728bb9de6b5b0beeeaa8cc771bc3321aae -SHA1 (patch-aj) = 1bb74cbd4c6aaade00c0289e9f1ae5c992d2ea26 +SHA1 (patch-ai) = 4fbb25e3f09aa97bdcb12f325ef615e5a6f9f626 +SHA1 (patch-aj) = fcc8c03ed4d39b010f230c972529716b118abd1a SHA1 (patch-ak) = c4e228b8712c1e36bbeb8d268f83893cfeb4e620 SHA1 (patch-al) = 2e39f1670f99c9267be2b2d214765a19a5390b9f -SHA1 (patch-am) = a40d1f2e6f02c49143f04f316c992daf6f71c13f +SHA1 (patch-am) = 0bf35baa6cb325095ca113739329fdd06eeef251 SHA1 (patch-an) = 687cf83ad9be083da0a53e7a7b5cbaefe88f63a5 diff --git a/textproc/aspell/patches/patch-aa b/textproc/aspell/patches/patch-aa deleted file mode 100644 index 28cc13c21ef..00000000000 --- a/textproc/aspell/patches/patch-aa +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-aa,v 1.9 2006/06/14 19:21:54 adam Exp $ - ---- modules/filter/nroff.cpp.orig 2006-06-14 21:01:52.000000000 +0200 -+++ modules/filter/nroff.cpp -@@ -73,7 +73,7 @@ namespace { - return false; - } - -- bool NroffFilter::process_char (FilterChar::Chr c); -+ bool process_char (FilterChar::Chr c); - - public: - diff --git a/textproc/aspell/patches/patch-ag b/textproc/aspell/patches/patch-ag index 41bc73b0be1..11073bc2375 100644 --- a/textproc/aspell/patches/patch-ag +++ b/textproc/aspell/patches/patch-ag @@ -1,8 +1,8 @@ -$NetBSD: patch-ag,v 1.2 2004/12/24 02:55:53 wiz Exp $ +$NetBSD: patch-ag,v 1.3 2007/01/06 22:07:43 wiz Exp $ ---- examples/Makefile.in.orig 2004-08-23 03:22:40.000000000 +0200 +--- examples/Makefile.in.orig 2006-12-19 11:03:37.000000000 +0000 +++ examples/Makefile.in -@@ -86,7 +86,7 @@ AUTOCONF = @AUTOCONF@ +@@ -79,7 +79,7 @@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ @@ -10,4 +10,4 @@ $NetBSD: patch-ag,v 1.2 2004/12/24 02:55:53 wiz Exp $ +CC = @CXX@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ - COMPILE_IN_FILTERS_FALSE = @COMPILE_IN_FILTERS_FALSE@ + CPP = @CPP@ diff --git a/textproc/aspell/patches/patch-ai b/textproc/aspell/patches/patch-ai index 9f1e7dd794a..e18306d865a 100644 --- a/textproc/aspell/patches/patch-ai +++ b/textproc/aspell/patches/patch-ai @@ -1,9 +1,9 @@ -$NetBSD: patch-ai,v 1.1 2005/10/27 00:18:51 rillig Exp $ +$NetBSD: patch-ai,v 1.2 2007/01/06 22:07:43 wiz Exp $ The SunPro compiler does not like static inline template<>s. ---- common/lsort.hpp.orig 2005-10-27 01:57:11.515745500 +0200 -+++ common/lsort.hpp 2005-10-27 01:57:40.246031300 +0200 +--- common/lsort.hpp.orig 2006-11-18 08:42:24.000000000 +0000 ++++ common/lsort.hpp @@ -44,7 +44,7 @@ struct Less { @@ -38,7 +38,7 @@ The SunPro compiler does not like static inline template<>s. { return sort(x, y, Less(), Next()); } -@@ -133,20 +133,20 @@ N * sort(N * first, const LT & lt, const +@@ -135,20 +135,20 @@ N * sort(N * first, const LT & lt, const } template diff --git a/textproc/aspell/patches/patch-aj b/textproc/aspell/patches/patch-aj index fceb7df67a6..b327b323ab5 100644 --- a/textproc/aspell/patches/patch-aj +++ b/textproc/aspell/patches/patch-aj @@ -1,10 +1,10 @@ -$NetBSD: patch-aj,v 1.1 2005/10/27 00:18:51 rillig Exp $ +$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 2005-06-26 02:43:33.000000000 +0200 -+++ modules/speller/default/readonly_ws.cpp 2005-10-27 01:59:36.217186900 +0200 -@@ -721,7 +721,7 @@ namespace { +--- 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() {} diff --git a/textproc/aspell/patches/patch-am b/textproc/aspell/patches/patch-am index cf822de8e30..269fdf6ca0b 100644 --- a/textproc/aspell/patches/patch-am +++ b/textproc/aspell/patches/patch-am @@ -1,10 +1,10 @@ -$NetBSD: patch-am,v 1.1 2005/10/27 01:08:06 rillig Exp $ +$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 2005-06-19 13:58:59.000000000 +0200 -+++ prog/aspell.cpp 2005-10-27 02:53:09.018812500 +0200 -@@ -1878,7 +1878,7 @@ struct SML_Parms { +--- 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; @@ -13,7 +13,7 @@ To understand recursion, you first have to understand recursion. bool equal(Key x, Key y) {return strcmp(x,y) == 0;} Key key(const Value & v) {return v.word;} }; -@@ -2029,7 +2029,7 @@ struct CML_Parms { +@@ -2033,7 +2033,7 @@ struct CML_Parms { typedef CML_Entry Value; typedef const char * Key; static const bool is_multi = true; -- cgit v1.2.3