[Midnightbsd-cvs] mports [23562] trunk/textproc/hunspell: update
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Sat Jun 2 08:27:53 EDT 2018
Revision: 23562
http://svnweb.midnightbsd.org/mports/?rev=23562
Author: laffer1
Date: 2018-06-02 08:27:52 -0400 (Sat, 02 Jun 2018)
Log Message:
-----------
update
Modified Paths:
--------------
trunk/textproc/hunspell/Makefile
trunk/textproc/hunspell/distinfo
trunk/textproc/hunspell/files/patch-src_tools_hunspell.cxx
trunk/textproc/hunspell/pkg-descr
trunk/textproc/hunspell/pkg-plist
Added Paths:
-----------
trunk/textproc/hunspell/files/patch-add-const
Removed Paths:
-------------
trunk/textproc/hunspell/files/patch-configure
Property Changed:
----------------
trunk/textproc/hunspell/files/patch-src_tools_hunspell.cxx
Modified: trunk/textproc/hunspell/Makefile
===================================================================
--- trunk/textproc/hunspell/Makefile 2018-06-02 12:23:41 UTC (rev 23561)
+++ trunk/textproc/hunspell/Makefile 2018-06-02 12:27:52 UTC (rev 23562)
@@ -2,9 +2,9 @@
# $FreeBSD: ports/textproc/hunspell/Makefile,v 1.30 2011/11/09 15:25:45 miwi Exp $
PORTNAME= hunspell
-PORTVERSION= 1.3.3
+PORTVERSION= 1.6.2
+DISTVERSIONPREFIX= v
CATEGORIES= textproc
-MASTER_SITES= SF/${PORTNAME}/Hunspell/${PORTVERSION}
DIST_SUBDIR= ${PORTNAME}
MAINTAINER= ports at MidnightBSD.org
@@ -16,16 +16,23 @@
CONFLICTS_INSTALL= tinker-[0-9]*
CONFIGURE_ARGS= --disable-nls ${ICONV_CONFIGURE_ARG} --with-readline --with-ui
GNU_CONFIGURE= yes
-USES= libtool:keepla pathfix iconv ncurses readline shebangfix perl5
+USES= autoreconf compiler:c++11-lib libtool:keepla pathfix \
+ iconv ncurses readline shebangfix perl5
+USE_GITHUB= yes
SHEBANG_FILES= src/tools/ispellaff2myspell
USE_LDCONFIG= yes
USE_PERL5= run
INSTALL_TARGET= install-strip
+PLIST_SUB= SHLIB_VER=${PORTVERSION:R}
+
post-patch:
@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/src/tools/hunspell.cxx
-post-configure:
- @${REINPLACE_CMD} -e 's|444|644|g' ${WRKSRC}/src/parsers/Makefile
+makepatch-clean:
+ @${RM} ${WRKSRC}/tests/suggestiontest/Makefile.orig
.include <bsd.port.mk>
+
+# XXX Don't override definition in Mk/bsd.port.mk
+makepatch: makepatch-clean
Modified: trunk/textproc/hunspell/distinfo
===================================================================
--- trunk/textproc/hunspell/distinfo 2018-06-02 12:23:41 UTC (rev 23561)
+++ trunk/textproc/hunspell/distinfo 2018-06-02 12:27:52 UTC (rev 23562)
@@ -1,2 +1,3 @@
-SHA256 (hunspell/hunspell-1.3.3.tar.gz) = a7b2c0de0e2ce17426821dc1ac8eb115029959b3ada9d80a81739fa19373246c
-SIZE (hunspell/hunspell-1.3.3.tar.gz) = 986081
+TIMESTAMP = 1527942332
+SHA256 (hunspell/hunspell-v1.6.2_GH0.tar.gz) = 3cd9ceb062fe5814f668e4f22b2fa6e3ba0b339b921739541ce180cac4d6f4c4
+SIZE (hunspell/hunspell-v1.6.2_GH0.tar.gz) = 721165
Added: trunk/textproc/hunspell/files/patch-add-const
===================================================================
--- trunk/textproc/hunspell/files/patch-add-const (rev 0)
+++ trunk/textproc/hunspell/files/patch-add-const 2018-06-02 12:27:52 UTC (rev 23562)
@@ -0,0 +1,68 @@
+Add back `const` keyword to keep consumers forward compatible by
+reverting https://github.com/hunspell/hunspell/commit/dd4b14899bfb
+
+--- src/hunspell/hunspell.cxx.orig 2016-11-28 10:34:55 UTC
++++ src/hunspell/hunspell.cxx
+@@ -110,7 +110,7 @@ public:
+ int remove(const std::string& word);
+ const std::string& get_version() const;
+ struct cs_info* get_csconv();
+- std::vector<char> dic_encoding_vec;
++
+
+ private:
+ AffixMgr* pAMgr;
+@@ -181,9 +181,6 @@ HunspellImpl::HunspellImpl(const char* a
+ complexprefixes = pAMgr->get_complexprefixes();
+ wordbreak = pAMgr->get_breaktable();
+
+- dic_encoding_vec.resize(encoding.size()+1);
+- strcpy(&dic_encoding_vec[0], encoding.c_str());
+-
+ /* and finally set up the suggestion manager */
+ pSMgr = new SuggestMgr(try_string, MAXSUGGESTION, pAMgr);
+ if (try_string)
+@@ -1850,8 +1847,8 @@ int Hunspell::suffix_suggest(char*** sls
+ return munge_vector(slst, stems);
+ }
+
+-char* Hunspell::get_dic_encoding() {
+- return &(m_Impl->dic_encoding_vec[0]);
++const char* Hunspell::get_dic_encoding() const {
++ return Hunspell_get_dic_encoding((Hunhandle*)(this));
+ }
+
+ int Hunspell::stem(char*** slst, char** desc, int n) {
+@@ -1896,8 +1893,8 @@ int Hunspell_spell(Hunhandle* pHunspell,
+ return reinterpret_cast<Hunspell*>(pHunspell)->spell(std::string(word));
+ }
+
+-char* Hunspell_get_dic_encoding(Hunhandle* pHunspell) {
+- return reinterpret_cast<Hunspell*>(pHunspell)->get_dic_encoding();
++const char* Hunspell_get_dic_encoding(Hunhandle* pHunspell) {
++ return (reinterpret_cast<Hunspell*>(pHunspell)->get_dict_encoding()).c_str();
+ }
+
+ int Hunspell_suggest(Hunhandle* pHunspell, char*** slst, const char* word) {
+--- src/hunspell/hunspell.h.orig 2016-11-28 10:34:55 UTC
++++ src/hunspell/hunspell.h
+@@ -68,7 +68,7 @@ LIBHUNSPELL_DLL_EXPORTED int Hunspell_ad
+ */
+ LIBHUNSPELL_DLL_EXPORTED int Hunspell_spell(Hunhandle* pHunspell, const char*);
+
+-LIBHUNSPELL_DLL_EXPORTED char* Hunspell_get_dic_encoding(Hunhandle* pHunspell);
++LIBHUNSPELL_DLL_EXPORTED const char* Hunspell_get_dic_encoding(Hunhandle* pHunspell);
+
+ /* suggest(suggestions, word) - search suggestions
+ * input: pointer to an array of strings pointer and the (bad) word
+--- src/hunspell/hunspell.hxx.orig 2016-11-28 10:34:55 UTC
++++ src/hunspell/hunspell.hxx
+@@ -155,7 +155,7 @@ class LIBHUNSPELL_DLL_EXPORTED Hunspell
+ H_DEPRECATED void free_list(char*** slst, int n);
+
+ const std::string& get_dict_encoding() const;
+- char* get_dic_encoding();
++ H_DEPRECATED const char* get_dic_encoding() const;
+
+ /* morphological functions */
+
Property changes on: trunk/textproc/hunspell/files/patch-add-const
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Deleted: trunk/textproc/hunspell/files/patch-configure
===================================================================
--- trunk/textproc/hunspell/files/patch-configure 2018-06-02 12:23:41 UTC (rev 23561)
+++ trunk/textproc/hunspell/files/patch-configure 2018-06-02 12:27:52 UTC (rev 23562)
@@ -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
Modified: trunk/textproc/hunspell/files/patch-src_tools_hunspell.cxx
===================================================================
--- trunk/textproc/hunspell/files/patch-src_tools_hunspell.cxx 2018-06-02 12:23:41 UTC (rev 23561)
+++ trunk/textproc/hunspell/files/patch-src_tools_hunspell.cxx 2018-06-02 12:27:52 UTC (rev 23562)
@@ -1,42 +1,47 @@
---- ./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 2017-03-25 21:20:45 UTC
++++ src/tools/hunspell.cxx
+@@ -115,29 +115,23 @@
+ #include "xmlparser.hxx"
+ #include "odfparser.hxx"
- #define LIBDIR \
-- "/usr/share/hunspell:" \
-- "/usr/share/myspell:" \
-- "/usr/share/myspell/dicts:" \
-- "/Library/Spelling"
-+ "%%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"
-+ "%%PREFIX%%/openoffice.org3/share/dict/ooo:" \
-+ "%%PREFIX%%/openoffice.org-3.0.0/share/dict/ooo:" \
-+ "%%PREFIX%%/openoffice.org-2.4.2/share/dict/ooo:" \
-+ "%%PREFIX%%/openoffice.org-2.4.1/share/dict/ooo:" \
-+ "%%PREFIX%%/openoffice.org-2.4/share/dict/ooo:" \
-+ "%%PREFIX%%/openoffice.org-2.2/share/dict/ooo:" \
-+ "%%PREFIX%%/openoffice.org-2.1/share/dict/ooo:" \
-+ "%%PREFIX%%/openoffice.org2.0/share/dict/ooo:"
+-#define LIBDIR \
+- "/usr/share/hunspell:" \
+- "/usr/share/myspell:" \
+- "/usr/share/myspell/dicts:" \
++#define LIBDIR \
++ "%%PREFIX%%/share/hunspell:" \
++ "%%PREFIX%%/share/myspell:" \
++ "%%PREFIX%%/share/myspell/dicts:" \
+ "/Library/Spelling"
+-#define USEROOODIR { \
+- ".openoffice.org/3/user/wordbook", \
+- ".openoffice.org2/user/wordbook", \
+- ".openoffice.org2.0/user/wordbook",\
++#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 OOODIR \
++ "%%PREFIX%%/openoffice.org/basis3.0/share/dict/ooo:" \
++ "%%PREFIX%%/openoffice.org2.4/share/dict/ooo:" \
++ "%%PREFIX%%/openoffice.org2.3/share/dict/ooo:" \
++ "%%PREFIX%%/openoffice.org2.2/share/dict/ooo:" \
++ "%%PREFIX%%/openoffice.org2.1/share/dict/ooo:" \
++ "%%PREFIX%%/openoffice.org2.0/share/dict/ooo"
#define HOME getenv("HOME")
#define DICBASENAME ".hunspell_"
#define LOGFILE "/tmp/hunspell.log"
Property changes on: trunk/textproc/hunspell/files/patch-src_tools_hunspell.cxx
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Modified: trunk/textproc/hunspell/pkg-descr
===================================================================
--- trunk/textproc/hunspell/pkg-descr 2018-06-02 12:23:41 UTC (rev 23561)
+++ trunk/textproc/hunspell/pkg-descr 2018-06-02 12:27:52 UTC (rev 23562)
@@ -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 @@
- 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/
Modified: trunk/textproc/hunspell/pkg-plist
===================================================================
--- trunk/textproc/hunspell/pkg-plist 2018-06-02 12:23:41 UTC (rev 23561)
+++ trunk/textproc/hunspell/pkg-plist 2018-06-02 12:27:52 UTC (rev 23562)
@@ -10,29 +10,18 @@
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-%%SHLIB_VER%%.a
+lib/libhunspell-%%SHLIB_VER%%.la
+lib/libhunspell-%%SHLIB_VER%%.so
+lib/libhunspell-%%SHLIB_VER%%.so.0
+lib/libhunspell-%%SHLIB_VER%%.so.0.0.1
libdata/pkgconfig/hunspell.pc
man/hu/man1/hunspell.1.gz
man/man1/hunspell.1.gz
More information about the Midnightbsd-cvs
mailing list