From 9ffcbd414935bcfc9f2c7b08132694ab9b703ca4 Mon Sep 17 00:00:00 2001 From: Jan Beich Date: Sat, 26 Nov 2016 05:57:01 +0000 Subject: textproc/hunspell: update to 1.5.0 Changes: https://github.com/hunspell/hunspell/blob/v1.5.0/ChangeLog PR: 214837 Exp-run by: ??? Approved by: office (???) --- textproc/hunspell/Makefile | 9 ++-- textproc/hunspell/distinfo | 5 +- textproc/hunspell/files/patch-configure | 26 ---------- .../hunspell/files/patch-src_tools_hunspell.cxx | 60 ++++++++++++---------- textproc/hunspell/pkg-descr | 7 ++- textproc/hunspell/pkg-plist | 24 ++------- 6 files changed, 51 insertions(+), 80 deletions(-) delete mode 100644 textproc/hunspell/files/patch-configure diff --git a/textproc/hunspell/Makefile b/textproc/hunspell/Makefile index fc324e1..e3c9d33 100644 --- a/textproc/hunspell/Makefile +++ b/textproc/hunspell/Makefile @@ -2,10 +2,9 @@ # $FreeBSD$ PORTNAME= hunspell -PORTVERSION= 1.3.3 +PORTVERSION= 1.5.0 +DISTVERSIONPREFIX= v CATEGORIES= textproc -MASTER_SITES= SF/${PORTNAME}/Hunspell/${PORTVERSION} -DIST_SUBDIR= ${PORTNAME} MAINTAINER= office@FreeBSD.org COMMENT= Improved spell-checker for Hungarian and other languages @@ -14,9 +13,11 @@ LICENSE= GPLv2 LGPL21 MPL LICENSE_COMB= dual CONFLICTS_INSTALL= tinker-[0-9]* + +USES= autoreconf iconv libtool:keepla ncurses pathfix perl5 readline shebangfix +USE_GITHUB= yes CONFIGURE_ARGS= --disable-nls ${ICONV_CONFIGURE_ARG} --with-readline --with-ui GNU_CONFIGURE= yes -USES= libtool:keepla pathfix iconv ncurses readline shebangfix perl5 SHEBANG_FILES= src/tools/ispellaff2myspell USE_LDCONFIG= yes USE_PERL5= run diff --git a/textproc/hunspell/distinfo b/textproc/hunspell/distinfo index eede83d..8f95442 100644 --- a/textproc/hunspell/distinfo +++ b/textproc/hunspell/distinfo @@ -1,2 +1,3 @@ -SHA256 (hunspell/hunspell-1.3.3.tar.gz) = a7b2c0de0e2ce17426821dc1ac8eb115029959b3ada9d80a81739fa19373246c -SIZE (hunspell/hunspell-1.3.3.tar.gz) = 986081 +TIMESTAMP = 1479584668 +SHA256 (hunspell-hunspell-v1.5.0_GH0.tar.gz) = b74f2df1aafdbc1f0941d721d7895da4b27b85bba7a4c699a9209477cbbf1f59 +SIZE (hunspell-hunspell-v1.5.0_GH0.tar.gz) = 1110171 diff --git a/textproc/hunspell/files/patch-configure b/textproc/hunspell/files/patch-configure deleted file mode 100644 index 2c62f48..0000000 --- a/textproc/hunspell/files/patch-configure +++ /dev/null @@ -1,26 +0,0 @@ ---- configure.orig 2013-05-17 01:18:45.000000000 +0300 -+++ configure 2013-05-17 01:26:35.000000000 +0300 -@@ -11880,6 +11880,7 @@ - - # Allow CC to be a program name with arguments. - lt_save_CC=$CC -+ lt_save_CFLAGS=$CFLAGS - lt_save_LD=$LD - lt_save_GCC=$GCC - GCC=$GXX -@@ -11897,6 +11898,7 @@ - fi - test -z "${LDCXX+set}" || LD=$LDCXX - CC=${CXX-"c++"} -+ CFLAGS=$CXXFLAGS - compiler=$CC - compiler_CXX=$CC - for cc_temp in $compiler""; do -@@ -14618,6 +14620,7 @@ - fi # test -n "$compiler" - - CC=$lt_save_CC -+ CFLAGS=$lt_save_CFLAGS - LDCXX=$LD - LD=$lt_save_LD - GCC=$lt_save_GCC diff --git a/textproc/hunspell/files/patch-src_tools_hunspell.cxx b/textproc/hunspell/files/patch-src_tools_hunspell.cxx index e0470da..09565bc 100644 --- a/textproc/hunspell/files/patch-src_tools_hunspell.cxx +++ b/textproc/hunspell/files/patch-src_tools_hunspell.cxx @@ -1,34 +1,40 @@ ---- ./src/tools/hunspell.cxx.orig 2011-01-21 18:01:29.000000000 +0100 -+++ ./src/tools/hunspell.cxx 2011-07-19 07:16:58.346225286 +0200 -@@ -61,28 +61,23 @@ - #include "firstparser.hxx" +--- src/tools/hunspell.cxx.orig 2016-11-19 19:44:28 UTC ++++ src/tools/hunspell.cxx +@@ -111,28 +111,23 @@ + #include "odfparser.hxx" - #define LIBDIR \ -- "/usr/share/hunspell:" \ -- "/usr/share/myspell:" \ -- "/usr/share/myspell/dicts:" \ -- "/Library/Spelling" + #define LIBDIR \ +- "/usr/share/hunspell:" \ +- "/usr/share/myspell:" \ +- "/usr/share/myspell/dicts:" \ +- "/Library/Spelling" +-#define USEROOODIR \ +- ".openoffice.org/3/user/wordbook:" \ +- ".openoffice.org2/user/wordbook:" \ +- ".openoffice.org2.0/user/wordbook:" \ +- "Library/Spelling" +-#define OOODIR \ +- "/opt/openoffice.org/basis3.0/share/dict/ooo:" \ +- "/usr/lib/openoffice.org/basis3.0/share/dict/ooo:" \ +- "/opt/openoffice.org2.4/share/dict/ooo:" \ +- "/usr/lib/openoffice.org2.4/share/dict/ooo:" \ +- "/opt/openoffice.org2.3/share/dict/ooo:" \ +- "/usr/lib/openoffice.org2.3/share/dict/ooo:" \ +- "/opt/openoffice.org2.2/share/dict/ooo:" \ +- "/usr/lib/openoffice.org2.2/share/dict/ooo:" \ +- "/opt/openoffice.org2.1/share/dict/ooo:" \ +- "/usr/lib/openoffice.org2.1/share/dict/ooo:" \ +- "/opt/openoffice.org2.0/share/dict/ooo:" \ +- "/usr/lib/openoffice.org2.0/share/dict/ooo" + "%%PREFIX%%/share/hunspell:" \ + "%%PREFIX%%/share/myspell:" \ + "%%PREFIX%%/share/myspell/dicts:" - #define USEROOODIR \ - ".openoffice.org/3/user/wordbook:" \ - ".openoffice.org2/user/wordbook:" \ - ".openoffice.org2.0/user/wordbook:" \ - "Library/Spelling" - #define OOODIR \ -- "/opt/openoffice.org/basis3.0/share/dict/ooo:" \ -- "/usr/lib/openoffice.org/basis3.0/share/dict/ooo:" \ -- "/opt/openoffice.org2.4/share/dict/ooo:" \ -- "/usr/lib/openoffice.org2.4/share/dict/ooo:" \ -- "/opt/openoffice.org2.3/share/dict/ooo:" \ -- "/usr/lib/openoffice.org2.3/share/dict/ooo:" \ -- "/opt/openoffice.org2.2/share/dict/ooo:" \ -- "/usr/lib/openoffice.org2.2/share/dict/ooo:" \ -- "/opt/openoffice.org2.1/share/dict/ooo:" \ -- "/usr/lib/openoffice.org2.1/share/dict/ooo:" \ -- "/opt/openoffice.org2.0/share/dict/ooo:" \ -- "/usr/lib/openoffice.org2.0/share/dict/ooo" ++#define USEROOODIR \ ++ ".openoffice.org/3/user/wordbook:" \ ++ ".openoffice.org2/user/wordbook:" \ ++ ".openoffice.org2.0/user/wordbook:" \ ++ "Library/Spelling" ++#define OOODIR \ + "%%PREFIX%%/openoffice.org3/share/dict/ooo:" \ + "%%PREFIX%%/openoffice.org-3.0.0/share/dict/ooo:" \ + "%%PREFIX%%/openoffice.org-2.4.2/share/dict/ooo:" \ diff --git a/textproc/hunspell/pkg-descr b/textproc/hunspell/pkg-descr index 420f987..30140bf 100644 --- a/textproc/hunspell/pkg-descr +++ b/textproc/hunspell/pkg-descr @@ -1,4 +1,7 @@ -Hunspell is a widely used spell checker +Hunspell is the spell checker of LibreOffice, OpenOffice.org, Mozilla +Firefox 3 & Thunderbird, Google Chrome, and it is also used by +proprietary software packages, like Mac OS X, InDesign, memoQ, Opera +and SDL Trados. Main features: - Extended support for language peculiarities; Unicode character encoding, @@ -9,4 +12,4 @@ Main features: - Hunspell is based on MySpell and works also with MySpell dictionaries. - C++ library under GPL/LGPL/MPL tri-license. -WWW: http://hunspell.sourceforge.net/ +WWW: https://hunspell.github.io/ diff --git a/textproc/hunspell/pkg-plist b/textproc/hunspell/pkg-plist index 18ecc61..16a106f 100644 --- a/textproc/hunspell/pkg-plist +++ b/textproc/hunspell/pkg-plist @@ -10,29 +10,15 @@ bin/munch bin/unmunch bin/wordforms bin/wordlist2hunspell -include/hunspell/affentry.hxx -include/hunspell/affixmgr.hxx -include/hunspell/atypes.hxx -include/hunspell/baseaffix.hxx -include/hunspell/csutil.hxx -include/hunspell/dictmgr.hxx -include/hunspell/filemgr.hxx -include/hunspell/hashmgr.hxx -include/hunspell/htypes.hxx include/hunspell/hunspell.h include/hunspell/hunspell.hxx include/hunspell/hunvisapi.h -include/hunspell/hunzip.hxx -include/hunspell/langnum.hxx -include/hunspell/phonet.hxx -include/hunspell/replist.hxx -include/hunspell/suggestmgr.hxx include/hunspell/w_char.hxx -lib/libhunspell-1.3.a -lib/libhunspell-1.3.la -lib/libhunspell-1.3.so -lib/libhunspell-1.3.so.0 -lib/libhunspell-1.3.so.0.0.0 +lib/libhunspell-1.5.a +lib/libhunspell-1.5.la +lib/libhunspell-1.5.so +lib/libhunspell-1.5.so.0 +lib/libhunspell-1.5.so.0.0.0 libdata/pkgconfig/hunspell.pc man/hu/man1/hunspell.1.gz man/man1/hunspell.1.gz