From de6a522b183f899515f3e75a56efa3ac697ff6ac Mon Sep 17 00:00:00 2001 From: Thierry Thomas Date: Mon, 4 Jul 2011 20:24:28 +0000 Subject: [PATCH] Upgrade to 0.60.6.1. Remark: this release includes a patch provided by rdivacky to build with clang. --- textproc/aspell/Makefile | 5 +- textproc/aspell/distinfo | 4 +- textproc/aspell/files/patch-Makefile.in | 16 ++--- textproc/aspell/files/patch-cxx-clang.patch | 58 ------------------- .../files/patch-gen_mk-static-filter.pl | 11 ---- textproc/aspell/pkg-plist | 12 ++++ 6 files changed, 24 insertions(+), 82 deletions(-) delete mode 100644 textproc/aspell/files/patch-cxx-clang.patch delete mode 100644 textproc/aspell/files/patch-gen_mk-static-filter.pl diff --git a/textproc/aspell/Makefile b/textproc/aspell/Makefile index 30b13f95e6e2..9155d0a09244 100644 --- a/textproc/aspell/Makefile +++ b/textproc/aspell/Makefile @@ -6,8 +6,7 @@ # PORTNAME= aspell -PORTVERSION= 0.60.6 -PORTREVISION= 5 +PORTVERSION= 0.60.6.1 CATEGORIES= textproc MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITE_SUBDIR= aspell @@ -38,7 +37,7 @@ USE_LDCONFIG= yes SLAVEDIRS= textproc/aspell-without-dicten MAKE_ARGS= NOPORTDOCS=${NOPORTDOCS} -VERINST= ${PORTVERSION:R} +VERINST= ${PORTVERSION:R:R} SUB_FILES= aspell.ver PLIST_SUB= VER=${VERINST} SUB_LIST= VERINST=${VERINST} diff --git a/textproc/aspell/distinfo b/textproc/aspell/distinfo index d6114e9ceb7c..bb8449f67eb5 100644 --- a/textproc/aspell/distinfo +++ b/textproc/aspell/distinfo @@ -1,4 +1,4 @@ -SHA256 (aspell-0.60.6.tar.gz) = 4f5b1520e26cf6bbb1b5ca8a2f9f22948c3ca38ac4c2dd9e02df042fee7c0e36 -SIZE (aspell-0.60.6.tar.gz) = 1777930 +SHA256 (aspell-0.60.6.1.tar.gz) = f52583a83a63633701c5f71db3dc40aab87b7f76b29723aeb27941eff42df6e1 +SIZE (aspell-0.60.6.1.tar.gz) = 1878163 SHA256 (aspell6-en-7.1-0.tar.bz2) = ff9df3c2e8c5bb19c6a66078b36a0ef4c4dfb0fcb969e29f7b5345e26d748d0a SIZE (aspell6-en-7.1-0.tar.bz2) = 175360 diff --git a/textproc/aspell/files/patch-Makefile.in b/textproc/aspell/files/patch-Makefile.in index d76e87bf44c9..1bf3776d60d2 100644 --- a/textproc/aspell/files/patch-Makefile.in +++ b/textproc/aspell/files/patch-Makefile.in @@ -1,6 +1,6 @@ ---- Makefile.in.orig Tue Dec 19 12:03:37 2006 -+++ Makefile.in Tue Dec 19 19:38:22 2006 -@@ -474,7 +474,12 @@ +--- Makefile.in.orig 2011-07-04 10:58:49.000000000 +0200 ++++ Makefile.in 2011-07-04 21:17:31.000000000 +0200 +@@ -481,7 +481,12 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = foreign subdir-objects @@ -14,17 +14,17 @@ DIST_SUBDIRS = ${SUBDIRS} examples myspell lib5 filterdir = ${pkglibdir} optdir = ${pkgdatadir} -@@ -562,7 +567,7 @@ +@@ -569,7 +574,7 @@ lib/string_list-c.cpp lib/find_speller.cpp lib/speller-c.cpp \ lib/string_pair_enumeration-c.cpp lib/new_checker.cpp \ modules/filter/url.cpp $(am__append_3) -libaspell_la_LIBADD = $(LTLIBINTL) $(PTHREAD_LIB) +libaspell_la_LIBADD = $(LTLIBINTL) $(PTHREAD_LIB) $(LTLIBINTL) - @INCREMENTED_SONAME_FALSE@libaspell_la_LDFLAGS = -version-info 16:4:1 -no-undefined - @INCREMENTED_SONAME_TRUE@libaspell_la_LDFLAGS = -version-info 16:4:0 -no-undefined + @INCREMENTED_SONAME_FALSE@libaspell_la_LDFLAGS = -version-info 16:5:1 -no-undefined + @INCREMENTED_SONAME_TRUE@libaspell_la_LDFLAGS = -version-info 16:5:0 -no-undefined @PSPELL_COMPATIBILITY_TRUE@libpspell_la_SOURCES = lib/dummy.cpp -@@ -571,7 +576,7 @@ - @INCREMENTED_SONAME_TRUE@@PSPELL_COMPATIBILITY_TRUE@libpspell_la_LDFLAGS = -version-info 16:4:0 -no-undefined +@@ -578,7 +583,7 @@ + @INCREMENTED_SONAME_TRUE@@PSPELL_COMPATIBILITY_TRUE@libpspell_la_LDFLAGS = -version-info 16:5:0 -no-undefined word_list_compress_SOURCES = prog/compress.c aspell_SOURCES = prog/aspell.cpp prog/check_funs.cpp prog/checker_string.cpp -aspell_LDADD = libaspell.la $(CURSES_LIB) diff --git a/textproc/aspell/files/patch-cxx-clang.patch b/textproc/aspell/files/patch-cxx-clang.patch deleted file mode 100644 index cf7d6c42c1a6..000000000000 --- a/textproc/aspell/files/patch-cxx-clang.patch +++ /dev/null @@ -1,58 +0,0 @@ ---- common/posib_err.hpp 2004-12-17 09:23:33.000000000 +0100 -+++ common/posib_err.hpp 2011-05-09 19:46:45.000000000 +0200 -@@ -158,6 +158,16 @@ - void del(); - }; - -+ template <> -+ class PosibErr : public PosibErrBase -+ { -+ public: -+ PosibErr(const PosibErrBase & other) -+ : PosibErrBase(other) {} -+ -+ PosibErr() {} -+ }; -+ - template - class PosibErr : public PosibErrBase - { -@@ -186,16 +196,6 @@ - Ret data; - }; - -- template <> -- class PosibErr : public PosibErrBase -- { -- public: -- PosibErr(const PosibErrBase & other) -- : PosibErrBase(other) {} -- -- PosibErr() {} -- }; -- - // - // - // ---- common/vector.hpp 2011-05-09 19:51:59.000000000 +0200 -+++ common/vector.hpp 2011-05-09 19:51:54.000000000 +0200 -@@ -24,7 +24,7 @@ - this->push_back(t); - } - void append(const T * begin, unsigned int size) { -- insert(this->end(), begin, begin+size); -+ this->insert(this->end(), begin, begin+size); - } - void append(const T * begin, const T * end) { - insert(this->end(), begin, end); ---- common/hash.hpp 2011-05-09 19:52:05.000000000 +0200 -+++ common/hash.hpp 2011-05-09 19:51:35.000000000 +0200 -@@ -318,7 +318,7 @@ - : Base(s, Parms(h,e)) {} - data_type & operator[](const key_type & k) - { -- return (*((insert(value_type(k, data_type()))).first)).second; -+ return (*((this->insert(value_type(k, data_type()))).first)).second; - } - }; - diff --git a/textproc/aspell/files/patch-gen_mk-static-filter.pl b/textproc/aspell/files/patch-gen_mk-static-filter.pl deleted file mode 100644 index 7ff663380b20..000000000000 --- a/textproc/aspell/files/patch-gen_mk-static-filter.pl +++ /dev/null @@ -1,11 +0,0 @@ ---- gen/mk-static-filter.pl.orig 2007-12-03 07:43:09.000000000 +0100 -+++ gen/mk-static-filter.pl 2008-04-18 22:34:26.000000000 +0200 -@@ -159,7 +159,7 @@ - printf STATICFILTERS "\n const KeyInfo * ".${$filter}{"NAME"}."_options_begin = ". - ${$filter}{"NAME"}."_options;\n"; - # If structure is empty, set options_end to same as options_begin. -- if (%{$filter}) { -+ if ($firstopt) { - printf STATICFILTERS "\n const KeyInfo * ".${$filter}{"NAME"}."_options_end = ". - ${$filter}{"NAME"}."_options;\n"; - } else { diff --git a/textproc/aspell/pkg-plist b/textproc/aspell/pkg-plist index 3d28eeca84db..045a4d7e588d 100644 --- a/textproc/aspell/pkg-plist +++ b/textproc/aspell/pkg-plist @@ -88,6 +88,7 @@ lib/libpspell.so.16 %%DATADIR%%/tex.amf %%DATADIR%%/texinfo.amf %%DATADIR%%/url.amf +%%NLS%%share/locale/ast/LC_MESSAGES/aspell.mo %%NLS%%share/locale/be/LC_MESSAGES/aspell.mo %%NLS%%share/locale/ca/LC_MESSAGES/aspell.mo %%NLS%%share/locale/cs/LC_MESSAGES/aspell.mo @@ -95,10 +96,14 @@ lib/libpspell.so.16 %%NLS%%share/locale/de/LC_MESSAGES/aspell.mo %%NLS%%share/locale/en_GB/LC_MESSAGES/aspell.mo %%NLS%%share/locale/es/LC_MESSAGES/aspell.mo +%%NLS%%share/locale/fi/LC_MESSAGES/aspell.mo %%NLS%%share/locale/fr/LC_MESSAGES/aspell.mo %%NLS%%share/locale/ga/LC_MESSAGES/aspell.mo +%%NLS%%share/locale/id/LC_MESSAGES/aspell.mo %%NLS%%share/locale/it/LC_MESSAGES/aspell.mo +%%NLS%%share/locale/ja/LC_MESSAGES/aspell.mo %%NLS%%share/locale/mn/LC_MESSAGES/aspell.mo +%%NLS%%share/locale/ms/LC_MESSAGES/aspell.mo %%NLS%%share/locale/nl/LC_MESSAGES/aspell.mo %%NLS%%share/locale/pt_BR/LC_MESSAGES/aspell.mo %%NLS%%share/locale/ro/LC_MESSAGES/aspell.mo @@ -112,6 +117,13 @@ lib/libpspell.so.16 %%NLS%%share/locale/uk/LC_MESSAGES/aspell.mo %%NLS%%share/locale/vi/LC_MESSAGES/aspell.mo %%NLS%%share/locale/wa/LC_MESSAGES/aspell.mo +%%NLS%%share/locale/zh_CN/LC_MESSAGES/aspell.mo @dirrm include/pspell +%%NLS%%@dirrmtry share/locale/zh_CN/LC_MESSAGES +%%NLS%%@dirrmtry share/locale/zh_CN %%NLS%%@dirrmtry share/locale/rw/LC_MESSAGES %%NLS%%@dirrmtry share/locale/rw +%%NLS%%@dirrmtry share/locale/fi/LC_MESSAGES +%%NLS%%@dirrmtry share/locale/fi +%%NLS%%@dirrmtry share/locale/ast/LC_MESSAGES +%%NLS%%@dirrmtry share/locale/ast