diff options
author | Jan Beich <jbeich@FreeBSD.org> | 2016-12-03 22:24:36 +0000 |
---|---|---|
committer | Jan Beich <jbeich@FreeBSD.org> | 2016-12-03 22:24:36 +0000 |
commit | 70b03eae74a269dd8c450c0414ae8c27e719b128 (patch) | |
tree | a8ed8d1d00fc9115ded6faf82f4509c256a9166a | |
parent | ae0db8070bc48689b61fd5dee8d3b330366634ae (diff) | |
download | ports-70b03eae74a269dd8c450c0414ae8c27e719b128.tar.gz ports-70b03eae74a269dd8c450c0414ae8c27e719b128.zip |
Notes
42 files changed, 193 insertions, 123 deletions
diff --git a/Mk/bsd.gecko.mk b/Mk/bsd.gecko.mk index f7e0615acabc..90ec0b4ee66c 100644 --- a/Mk/bsd.gecko.mk +++ b/Mk/bsd.gecko.mk @@ -183,7 +183,7 @@ harfbuzz_LIB_DEPENDS= libharfbuzz.so:print/harfbuzz harfbuzz_MOZ_OPTIONS= --with-system-harfbuzz .endif -hunspell_LIB_DEPENDS= libhunspell-1.3.so:textproc/hunspell +hunspell_LIB_DEPENDS= libhunspell-1.5.so:textproc/hunspell hunspell_MOZ_OPTIONS= --enable-system-hunspell icu_LIB_DEPENDS= libicui18n.so:devel/icu diff --git a/devel/codeblocks/Makefile b/devel/codeblocks/Makefile index dfdbb8ece00b..3b68005e1ac7 100644 --- a/devel/codeblocks/Makefile +++ b/devel/codeblocks/Makefile @@ -3,7 +3,7 @@ PORTNAME= codeblocks PORTVERSION= 16.01 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel MASTER_SITES= SF/${PORTNAME}/Sources/${PORTVERSION} DISTNAME= ${PORTNAME}_${PORTVERSION} @@ -18,7 +18,7 @@ BUILD_DEPENDS= zip:archivers/zip LIB_DEPENDS= libboost_system.so:devel/boost-libs \ libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 \ - libhunspell-1.3.so:textproc/hunspell + libhunspell-1.5.so:textproc/hunspell USES= autoreconf compiler desktop-file-utils fam:gamin localbase \ gettext-runtime libtool pathfix pkgconfig shared-mime-info diff --git a/devel/lokalize/Makefile b/devel/lokalize/Makefile index 13e0e0ea85d4..f6fb0401901f 100644 --- a/devel/lokalize/Makefile +++ b/devel/lokalize/Makefile @@ -2,12 +2,13 @@ PORTNAME= lokalize PORTVERSION= ${KDE4_VERSION} +PORTREVISION= 1 CATEGORIES= devel kde kde-kde4 MAINTAINER= kde@FreeBSD.org COMMENT= Computer-aided translation system -LIB_DEPENDS= libhunspell-1.3.so:textproc/hunspell +LIB_DEPENDS= libhunspell-1.5.so:textproc/hunspell USES= cmake:outsource kde:4 tar:xz USE_KDE= kdelibs automoc4 diff --git a/editors/codelite/Makefile b/editors/codelite/Makefile index 2bd403b7e5f9..d73ebfdd6206 100644 --- a/editors/codelite/Makefile +++ b/editors/codelite/Makefile @@ -3,7 +3,7 @@ PORTNAME= codelite PORTVERSION= 9.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= editors devel MAINTAINER= mokhi64@gmail.com @@ -12,7 +12,7 @@ COMMENT= Open Source IDE for C/C++ LICENSE= GPLv2+ RUN_DEPENDS= xterm:x11/xterm -LIB_DEPENDS+= libhunspell-1.3.so:textproc/hunspell +LIB_DEPENDS+= libhunspell-1.5.so:textproc/hunspell USE_GITHUB= yes GH_ACCOUNT= eranif diff --git a/editors/focuswriter/Makefile b/editors/focuswriter/Makefile index d88a9dd73108..71a9361ff61b 100644 --- a/editors/focuswriter/Makefile +++ b/editors/focuswriter/Makefile @@ -4,6 +4,7 @@ PORTNAME= focuswriter PORTVERSION= 1.5.7 DISTVERSIONPREFIX= v +PORTREVISION= 1 CATEGORIES= editors MAINTAINER= lightside@gmx.com @@ -14,7 +15,7 @@ LICENSE_COMB= multi LICENSE_FILE_GPLv3= ${WRKSRC}/COPYING LICENSE_FILE_LGPL3= ${WRKSRC}/resources/images/icons/oxygen/COPYING -LIB_DEPENDS= libhunspell-1.3.so:textproc/hunspell +LIB_DEPENDS= libhunspell-1.5.so:textproc/hunspell USE_GITHUB= yes GH_ACCOUNT= gottcode diff --git a/editors/libreoffice/Makefile b/editors/libreoffice/Makefile index aeec48e5be3d..a4f41c4f7e4e 100644 --- a/editors/libreoffice/Makefile +++ b/editors/libreoffice/Makefile @@ -54,7 +54,7 @@ LIB_DEPENDS= libapr-1.so:devel/apr1 \ libnss3.so:security/nss \ libclucene-core.so:textproc/clucene \ libexpat.so:textproc/expat2 \ - libhunspell-1.3.so:textproc/hunspell \ + libhunspell-1.5.so:textproc/hunspell \ libhyphen.so:textproc/hyphen \ libabw-0.1.so:textproc/libabw \ libe-book-0.1.so:textproc/libe-book \ diff --git a/editors/libreoffice/Makefile.common b/editors/libreoffice/Makefile.common index 6a26d6256d69..761a19f4ce2f 100644 --- a/editors/libreoffice/Makefile.common +++ b/editors/libreoffice/Makefile.common @@ -2,7 +2,7 @@ PORTNAME= libreoffice PORTVERSION= 5.2.3 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES+= editors MAINTAINER= office@FreeBSD.org diff --git a/editors/libreoffice4/Makefile b/editors/libreoffice4/Makefile index bba6021e486a..6cef39e47533 100644 --- a/editors/libreoffice4/Makefile +++ b/editors/libreoffice4/Makefile @@ -2,7 +2,7 @@ PORTNAME= libreoffice PORTVERSION= 4.3.7 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= editors MASTER_SITES= http://download.documentfoundation.org/libreoffice/src/${PORTVERSION}/ \ http://dev-www.libreoffice.org/extern/:ext \ @@ -55,7 +55,7 @@ LIB_DEPENDS= libapr-1.so:devel/apr1 \ libnss3.so:security/nss \ libclucene-core.so:textproc/clucene \ libexpat.so:textproc/expat2 \ - libhunspell-1.3.so:textproc/hunspell \ + libhunspell-1.5.so:textproc/hunspell \ libhyphen.so:textproc/hyphen \ libabw-0.1.so:textproc/libabw \ libe-book-0.1.so:textproc/libe-book \ diff --git a/editors/openoffice-4/Makefile b/editors/openoffice-4/Makefile index cf437c845f26..642bac9e1c74 100644 --- a/editors/openoffice-4/Makefile +++ b/editors/openoffice-4/Makefile @@ -3,7 +3,7 @@ PORTNAME= apache-openoffice PORTVERSION= ${AOOVERSION} -PORTREVISION= 1 +PORTREVISION= 2 #PORTREVISION= 1 CATEGORIES= editors java MASTER_SITES= APACHE/openoffice/${PORTVERSION}/source \ @@ -82,7 +82,7 @@ LIB_DEPENDS= \ libfreetype.so:print/freetype2 \ libnss3.so:security/nss \ libexpat.so:textproc/expat2 \ - libhunspell-1.3.so:textproc/hunspell \ + libhunspell-1.5.so:textproc/hunspell \ libhyphen.so:textproc/hyphen \ libtextcat.so:textproc/libtextcat \ libmythes-1.2.so:textproc/mythes \ diff --git a/editors/openoffice-devel/Makefile b/editors/openoffice-devel/Makefile index 3e19b7e2acb3..0578390e23ee 100644 --- a/editors/openoffice-devel/Makefile +++ b/editors/openoffice-devel/Makefile @@ -3,7 +3,7 @@ PORTNAME= apache-openoffice PORTVERSION= ${AOOVERSION1}.${AOOVERSION2}.${SVNREVISION} -PORTREVISION= 3 +PORTREVISION= 4 PORTEPOCH= 4 CATEGORIES= editors java MASTER_SITES= https://dist.apache.org/repos/dist/dev/openoffice/${AOOVERSION}-${AOORC}-r${SVNREVISION}/source/ \ @@ -82,7 +82,7 @@ LIB_DEPENDS= \ libfreetype.so:print/freetype2 \ libnss3.so:security/nss \ libexpat.so:textproc/expat2 \ - libhunspell-1.3.so:textproc/hunspell \ + libhunspell-1.5.so:textproc/hunspell \ libhyphen.so:textproc/hyphen \ libtextcat.so:textproc/libtextcat \ libmythes-1.2.so:textproc/mythes \ diff --git a/editors/tea/Makefile b/editors/tea/Makefile index f96a35ff44dc..00ab12650fe8 100644 --- a/editors/tea/Makefile +++ b/editors/tea/Makefile @@ -3,6 +3,7 @@ PORTNAME= tea PORTVERSION= 43.1.0 +PORTREVISION= 1 CATEGORIES= editors MASTER_SITES= http://semiletov.org/tea/dloads/ @@ -32,7 +33,7 @@ DESKTOP_ENTRIES="TEA" "" "${PREFIX}/share/pixmaps/tea_icon_v2.png" \ ASPELL_LIB_DEPENDS= libaspell.so:textproc/aspell ASPELL_QMAKE_ON= CONFIG+=nohunspell -HUNSPELL_LIB_DEPENDS= libhunspell-1.3.so:textproc/hunspell +HUNSPELL_LIB_DEPENDS= libhunspell-1.5.so:textproc/hunspell HUNSPELL_QMAKE_ON= CONFIG+=noaspell post-patch: diff --git a/editors/texmaker/Makefile b/editors/texmaker/Makefile index 1a499d38876b..ed181b524304 100644 --- a/editors/texmaker/Makefile +++ b/editors/texmaker/Makefile @@ -3,7 +3,7 @@ PORTNAME= texmaker PORTVERSION= 4.5 -PORTREVISION= 5 +PORTREVISION= 6 PORTEPOCH= 3 CATEGORIES= editors MASTER_SITES= http://www.xm1math.net/texmaker/ @@ -11,7 +11,7 @@ MASTER_SITES= http://www.xm1math.net/texmaker/ MAINTAINER= ports@FreeBSD.org COMMENT= LaTeX Development Environment -LIB_DEPENDS= libhunspell-1.3.so:textproc/hunspell \ +LIB_DEPENDS= libhunspell-1.5.so:textproc/hunspell \ libpoppler.so:graphics/poppler USES= desktop-file-utils ghostscript:x11,run pkgconfig qmake tar:bzip2 diff --git a/editors/texstudio/Makefile b/editors/texstudio/Makefile index e201c70474bb..daed4d24bdde 100644 --- a/editors/texstudio/Makefile +++ b/editors/texstudio/Makefile @@ -2,14 +2,14 @@ PORTNAME= texstudio PORTVERSION= 2.11.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= editors MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/TeXstudio%20${PORTVERSION} MAINTAINER= abiliojr@gmail.com COMMENT= Integrated writing environment for LaTeX documents -LIB_DEPENDS= libhunspell-1.3.so:textproc/hunspell \ +LIB_DEPENDS= libhunspell-1.5.so:textproc/hunspell \ libpoppler.so:graphics/poppler USES= desktop-file-utils dos2unix execinfo ghostscript:run \ diff --git a/editors/textroom/Makefile b/editors/textroom/Makefile index 1a20598257ba..e770a17961ef 100644 --- a/editors/textroom/Makefile +++ b/editors/textroom/Makefile @@ -3,7 +3,7 @@ PORTNAME= textroom PORTVERSION= 0.8.2 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= editors MASTER_SITES= SF @@ -13,7 +13,7 @@ COMMENT= Full screen text editor LICENSE= GPLv3 LIB_DEPENDS= libcurl.so:ftp/curl \ - libhunspell-1.3.so:textproc/hunspell \ + libhunspell-1.5.so:textproc/hunspell \ libxml++-2.6.so:textproc/libxml++26 USES= desktop-file-utils pkgconfig qmake diff --git a/editors/texworks/Makefile b/editors/texworks/Makefile index 098f14bb0aa2..bfbe0928cd1a 100644 --- a/editors/texworks/Makefile +++ b/editors/texworks/Makefile @@ -3,8 +3,8 @@ PORTNAME= texworks PORTVERSION= 0.4.6 -PORTREVISION= 2 DISTVERSIONPREFIX= release- +PORTREVISION= 3 CATEGORIES= editors MAINTAINER= hrs@FreeBSD.org diff --git a/german/hunspell/Makefile b/german/hunspell/Makefile index 0b7405976ee6..e45c059b0add 100644 --- a/german/hunspell/Makefile +++ b/german/hunspell/Makefile @@ -2,6 +2,7 @@ PORTNAME= hunspell PORTVERSION= 20160407 +PORTREVISION= 1 CATEGORIES= german textproc MASTER_SITES= http://www.j3e.de/ispell/igerman98/dict/ \ LOCAL/sunpoet/${PORTNAME} diff --git a/korean/hunspell/Makefile b/korean/hunspell/Makefile index 9f87e699b079..81b5c9a496d6 100644 --- a/korean/hunspell/Makefile +++ b/korean/hunspell/Makefile @@ -2,7 +2,7 @@ PORTNAME= hunspell PORTVERSION= 0.5.6 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= korean textproc MAINTAINER= jkim@FreeBSD.org diff --git a/mail/thunderbird/Makefile b/mail/thunderbird/Makefile index 49d0938e1135..abc2e3a6b853 100644 --- a/mail/thunderbird/Makefile +++ b/mail/thunderbird/Makefile @@ -3,7 +3,7 @@ PORTNAME= thunderbird DISTVERSION= 45.5.1 -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= mail news net-im ipv6 MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/source diff --git a/multimedia/aegisub/Makefile b/multimedia/aegisub/Makefile index 32a05867f26e..23d5dc59e2ba 100644 --- a/multimedia/aegisub/Makefile +++ b/multimedia/aegisub/Makefile @@ -3,7 +3,7 @@ PORTNAME= aegisub PORTVERSION= 3.2.2 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= multimedia MASTER_SITES= http://ftp.aegisub.org/pub/archives/releases/source/ \ ftp://ftp.aegisub.org/pub/archives/releases/source/ \ @@ -53,7 +53,7 @@ FFMPEG_LIB_DEPENDS= libffms2.so:multimedia/ffms2 FFMPEG_CONFIGURE_OFF= --without-ffms FFTW_LIB_DEPENDS= libfftw3.so:math/fftw3 FFTW_CONFIGURE_OFF= --without-fftw3 -HUNSPELL_LIB_DEPENDS= libhunspell-1.3.so:textproc/hunspell +HUNSPELL_LIB_DEPENDS= libhunspell-1.5.so:textproc/hunspell HUNSPELL_CONFIGURE_OFF= --without-hunspell OPENAL_USES= openal OPENAL_CONFIGURE_OFF= --without-openal diff --git a/net-im/licq-qt-gui/Makefile b/net-im/licq-qt-gui/Makefile index b384b25a8d08..2bb3fd3724e1 100644 --- a/net-im/licq-qt-gui/Makefile +++ b/net-im/licq-qt-gui/Makefile @@ -3,7 +3,7 @@ PORTNAME= qt4-gui PORTVERSION= 1.8.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= net-im PKGNAMESUFFIX?= ${KDE_SUFFIX}${PKGNAMESUFFIX2} @@ -25,9 +25,9 @@ OPTIONS_DEFAULT=HUNSPELL LICQ_PORT?= net-im/licq -HUNSPELL_LIB_DEPENDS= libhunspell-1.3.so:textproc/hunspell +HUNSPELL_LIB_DEPENDS= libhunspell-1.5.so:textproc/hunspell HUNSPELL_CMAKE_ON= -DHUNSPELL_INCLUDE_DIRS=${LOCALBASE}/include/hunspell \ - -DHUNSPELL_LIBRARIES=${LOCALBASE}/lib/libhunspell-1.3.so \ + -DHUNSPELL_LIBRARIES=${LOCALBASE}/lib/libhunspell-1.5.so \ -DHUNSPELL_FOUND:BOOL=ON HUNSPELL_CMAKE_OFF= -DHUNSPELL_FOUND:BOOL=OFF diff --git a/print/lyx/Makefile b/print/lyx/Makefile index 15fbc302d8f1..3b7bd2d39cfd 100644 --- a/print/lyx/Makefile +++ b/print/lyx/Makefile @@ -3,7 +3,7 @@ PORTNAME= lyx PORTVERSION= ${MAJOR_VERSION}.${MINOR_VERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= print editors MASTER_SITES= ftp://ftp.lyx.org/pub/lyx/stable/${MAJOR_VERSION}.x/ \ http://www-ftp.lip6.fr/ftp/pub/lyx/stable/${MAJOR_VERSION}.x/ \ @@ -46,7 +46,7 @@ ASPELL_LIB_DEPENDS= libaspell.so:textproc/aspell ENCHANT_CONFIGURE_OFF= --without-enchant ENCHANT_LIB_DEPENDS= libenchant.so:textproc/enchant HUNSPELL_CONFIGURE_OFF= --without-hunspell -HUNSPELL_LIB_DEPENDS= libhunspell-1.3.so:textproc/hunspell +HUNSPELL_LIB_DEPENDS= libhunspell-1.5.so:textproc/hunspell NLS_CONFIGURE_OFF= --disable-nls NLS_USES= gettext diff --git a/print/scribus/Makefile b/print/scribus/Makefile index 8a839ed28721..1b803bd22316 100644 --- a/print/scribus/Makefile +++ b/print/scribus/Makefile @@ -3,7 +3,7 @@ PORTNAME= scribus PORTVERSION= 1.4.6 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= print editors MASTER_SITES= SF \ http://www.scribus.net/downloads/${PORTVERSION}/ @@ -18,7 +18,7 @@ LIB_DEPENDS= liblcms.so:graphics/lcms \ libfreetype.so:print/freetype2 \ libpodofo.so:graphics/podofo \ libboost_thread.so:devel/boost-libs \ - libhunspell-1.3.so:textproc/hunspell \ + libhunspell-1.5.so:textproc/hunspell \ libcairo.so:graphics/cairo \ libhyphen.so:textproc/hyphen \ libfontconfig.so:x11-fonts/fontconfig diff --git a/textproc/enchant/Makefile b/textproc/enchant/Makefile index e3101e37eda8..29a6f6ed5bbf 100644 --- a/textproc/enchant/Makefile +++ b/textproc/enchant/Makefile @@ -3,7 +3,7 @@ PORTNAME= enchant PORTVERSION= 1.6.0 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= textproc gnome MASTER_SITES= http://www.abisource.com/downloads/${PORTNAME}/${PORTVERSION}/ DIST_SUBDIR= gnome2 @@ -39,7 +39,7 @@ HSPELL_BUILD_DEPENDS= ${LOCALBASE}/lib/libhspell.a:hebrew/hspell HSPELL_CONFIGURE_ENABLE= hspell HSPELL_CONFIGURE_ON= --with-hspell-prefix=${LOCALBASE} -HUNSPELL_LIB_DEPENDS= libhunspell-1.3.so:textproc/hunspell +HUNSPELL_LIB_DEPENDS= libhunspell-1.5.so:textproc/hunspell HUNSPELL_CONFIGURE_ENABLE= myspell HUNSPELL_CONFIGURE_ON= --with-system-myspell=yes \ --with-myspell-dir=${LOCALBASE}/share/hunspell diff --git a/textproc/goldendict/Makefile b/textproc/goldendict/Makefile index c8088b151b0e..4473f1deabcb 100644 --- a/textproc/goldendict/Makefile +++ b/textproc/goldendict/Makefile @@ -3,7 +3,7 @@ PORTNAME= goldendict PORTVERSION= 1.0.1 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= textproc MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION:C|(.*)\.[0-9]*$|\1|}/ DISTNAME= ${PORTNAME}-${PORTVERSION}-src @@ -13,7 +13,7 @@ COMMENT= Feature-rich Qt4 based dictionary lookup program LICENSE= GPLv3 -LIB_DEPENDS= libhunspell-1.3.so:textproc/hunspell \ +LIB_DEPENDS= libhunspell-1.5.so:textproc/hunspell \ libvorbis.so:audio/libvorbis NO_WRKSUBDIR= yes diff --git a/textproc/hunspell/Makefile b/textproc/hunspell/Makefile index 4028bbb4575d..bed986105b3d 100644 --- a/textproc/hunspell/Makefile +++ b/textproc/hunspell/Makefile @@ -2,10 +2,9 @@ # $FreeBSD$ PORTNAME= hunspell -PORTVERSION= 1.3.3 +PORTVERSION= 1.5.4 +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 @@ -19,6 +18,7 @@ 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 +USE_GITHUB= yes SHEBANG_FILES= src/tools/ispellaff2myspell USE_LDCONFIG= yes USE_PERL5= run diff --git a/textproc/hunspell/distinfo b/textproc/hunspell/distinfo index eede83d80686..78b26ff658c3 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 = 1480524200 +SHA256 (hunspell-hunspell-v1.5.4_GH0.tar.gz) = 852c01a2e3b87eb1f2adb5261466608ba79f1f950202e18a2a1735de5098fc59 +SIZE (hunspell-hunspell-v1.5.4_GH0.tar.gz) = 1110858 diff --git a/textproc/hunspell/files/patch-add-const b/textproc/hunspell/files/patch-add-const new file mode 100644 index 000000000000..d8c7bd38cf37 --- /dev/null +++ b/textproc/hunspell/files/patch-add-const @@ -0,0 +1,90 @@ +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 */ + +--- src/win_api/hunspelldll.c.orig 2016-11-28 10:34:55 UTC ++++ src/win_api/hunspelldll.c +@@ -73,7 +73,7 @@ LIBHUNSPELL_DLL_EXPORTED void hunspell_f + pMS->free_list(slst, len); + } + +-LIBHUNSPELL_DLL_EXPORTED char* hunspell_get_dic_encoding(Hunspell* pMS) { ++LIBHUNSPELL_DLL_EXPORTED const char* hunspell_get_dic_encoding(Hunspell* pMS) { + return pMS->get_dic_encoding(); + } + +--- src/win_api/hunspelldll.h.orig 2016-11-28 10:34:55 UTC ++++ src/win_api/hunspelldll.h +@@ -59,7 +59,7 @@ LIBHUNSPELL_DLL_EXPORTED void hunspell_f + char*** slst,
+ int len);
+ // make local copy of returned string!!
+-LIBHUNSPELL_DLL_EXPORTED char* hunspell_get_dic_encoding(Hunspell* pMS);
++LIBHUNSPELL_DLL_EXPORTED const char* hunspell_get_dic_encoding(Hunspell* pMS);
+
+ // add word to dict (word is valid until spell object is not destroyed)
+ LIBHUNSPELL_DLL_EXPORTED int hunspell_add(Hunspell* pMS, char* word);
diff --git a/textproc/hunspell/files/patch-configure b/textproc/hunspell/files/patch-configure deleted file mode 100644 index 2c62f4863229..000000000000 --- 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 e0470da14663..f733b4c55b0f 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-28 10:34:55 UTC ++++ src/tools/hunspell.cxx +@@ -112,28 +112,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 b897d3ed8604..30140bf7a36b 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, diff --git a/textproc/hunspell/pkg-plist b/textproc/hunspell/pkg-plist index 52ab40e754d1..74844953ea72 100644 --- a/textproc/hunspell/pkg-plist +++ b/textproc/hunspell/pkg-plist @@ -10,23 +10,12 @@ 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-%%SHLIB_VER%%.a lib/libhunspell-%%SHLIB_VER%%.la diff --git a/textproc/kf5-sonnet/Makefile b/textproc/kf5-sonnet/Makefile index badbafcc2968..ccadea955441 100644 --- a/textproc/kf5-sonnet/Makefile +++ b/textproc/kf5-sonnet/Makefile @@ -3,13 +3,14 @@ PORTNAME= sonnet PORTVERSION= ${KDE_FRAMEWORKS_VERSION} +PORTREVISION= 1 CATEGORIES= textproc kde kde-frameworks MAINTAINER= kde@FreeBSD.org COMMENT= KF5 plugin-based spell checking library LIB_DEPENDS= libaspell.so:textproc/aspell \ - libhunspell-1.3.so:textproc/hunspell + libhunspell-1.5.so:textproc/hunspell USES= cmake:outsource compiler:c++11-lib kde:5 tar:xz USE_KDE= ecm diff --git a/textproc/mythes/Makefile b/textproc/mythes/Makefile index da8e0cc4a555..5f68a665351d 100644 --- a/textproc/mythes/Makefile +++ b/textproc/mythes/Makefile @@ -2,7 +2,7 @@ PORTNAME= mythes PORTVERSION= 1.2.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= textproc MASTER_SITES= SF/hunspell/MyThes/${PORTVERSION}/ DIST_SUBDIR= ${PORTNAME} @@ -13,7 +13,7 @@ COMMENT= Simple thesaurus library LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/COPYING -LIB_DEPENDS= libhunspell-1.3.so:textproc/hunspell +LIB_DEPENDS= libhunspell-1.5.so:textproc/hunspell USES= libtool pathfix perl5 pkgconfig shebangfix USE_LDCONFIG= yes diff --git a/textproc/sigil/Makefile b/textproc/sigil/Makefile index ec6a7f0f96a9..a37f21589a88 100644 --- a/textproc/sigil/Makefile +++ b/textproc/sigil/Makefile @@ -3,7 +3,7 @@ PORTNAME= sigil PORTVERSION= 0.9.7 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= textproc MAINTAINER= ports@FreeBSD.org @@ -13,7 +13,7 @@ LICENSE= GPLv3+ LIB_DEPENDS= libminizip.so:archivers/minizip \ libpcre.so:devel/pcre \ - libhunspell-1.3.so:textproc/hunspell + libhunspell-1.5.so:textproc/hunspell RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py3-lxml USE_GITHUB= yes @@ -32,7 +32,7 @@ CMAKE_ARGS= -DUSE_SYSTEM_LIBS:BOOL=1 \ -DINSTALL_BUNDLED_DICTS:BOOL=0 USE_LDCONFIG= ${PREFIX}/lib/sigil -# Upstream uses pkg-config output to pass libhunspell-1.3.so and +# Upstream uses pkg-config output to pass libhunspell-1.5.so and # libpcre16.so to the linker. pkg-config output does not include full # paths, so add a workaround to keep the port linking for now. LDFLAGS+= -L${LOCALBASE}/lib diff --git a/textproc/te-hunspell/Makefile b/textproc/te-hunspell/Makefile index c4ef8b5e29b3..44ac453894a0 100644 --- a/textproc/te-hunspell/Makefile +++ b/textproc/te-hunspell/Makefile @@ -2,7 +2,7 @@ PORTNAME= hunspell DISTVERSION= 0.01-2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= textproc MASTER_SITES= GNU/aspell/dict/te PKGNAMEPREFIX= te- diff --git a/www/firefox-esr/Makefile b/www/firefox-esr/Makefile index ae4f955244f0..eec75bacd24a 100644 --- a/www/firefox-esr/Makefile +++ b/www/firefox-esr/Makefile @@ -4,7 +4,7 @@ PORTNAME= firefox DISTVERSION= 45.5.1 DISTVERSIONSUFFIX=esr.source -PORTREVISION= 0 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= www ipv6 MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}esr/source \ diff --git a/www/firefox/Makefile b/www/firefox/Makefile index 25387a687b77..d7910b626d30 100644 --- a/www/firefox/Makefile +++ b/www/firefox/Makefile @@ -4,7 +4,7 @@ PORTNAME= firefox DISTVERSION= 50.0.2 DISTVERSIONSUFFIX=.source -PORTREVISION= 0 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= www ipv6 MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ diff --git a/www/libxul/Makefile b/www/libxul/Makefile index 6dc49af392fe..e88f3f4e1c24 100644 --- a/www/libxul/Makefile +++ b/www/libxul/Makefile @@ -3,7 +3,7 @@ PORTNAME= libxul DISTVERSION= 45.5.1 -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES?= www devel MASTER_SITES= MOZILLA/firefox/releases/${DISTVERSION}esr/source \ MOZILLA/firefox/candidates/${DISTVERSION}esr-candidates/build1/source diff --git a/www/qupzilla-qt4/Makefile b/www/qupzilla-qt4/Makefile index 0b8061a9140b..eb61f153107e 100644 --- a/www/qupzilla-qt4/Makefile +++ b/www/qupzilla-qt4/Makefile @@ -2,6 +2,7 @@ PORTNAME= qupzilla PORTVERSION= 1.8.9 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= https://github.com/QupZilla/${PORTNAME}/releases/download/v${PORTVERSION}/ PKGNAMESUFFIX= -qt4 @@ -12,7 +13,7 @@ COMMENT= Web browser based on WebKit engine and Qt Framework LICENSE= GPLv3 -LIB_DEPENDS= libhunspell-1.3.so:textproc/hunspell +LIB_DEPENDS= libhunspell-1.5.so:textproc/hunspell CONFLICTS_INSTALL= ${PORTNAME}-qt5* diff --git a/www/qupzilla-qt5/Makefile b/www/qupzilla-qt5/Makefile index 461cd19e3681..004e330fe029 100644 --- a/www/qupzilla-qt5/Makefile +++ b/www/qupzilla-qt5/Makefile @@ -2,6 +2,7 @@ PORTNAME= qupzilla PORTVERSION= 1.8.9 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= https://github.com/QupZilla/${PORTNAME}/releases/download/v${PORTVERSION}/ PKGNAMESUFFIX= -qt5 @@ -12,7 +13,7 @@ COMMENT= Web browser based on WebKit engine and Qt Framework LICENSE= GPLv3 -LIB_DEPENDS= libhunspell-1.3.so:textproc/hunspell +LIB_DEPENDS= libhunspell-1.5.so:textproc/hunspell CONFLICTS_INSTALL= ${PORTNAME}-qt4* diff --git a/www/seamonkey/Makefile b/www/seamonkey/Makefile index f9f8e277afa8..5c8f4b399f35 100644 --- a/www/seamonkey/Makefile +++ b/www/seamonkey/Makefile @@ -4,7 +4,7 @@ PORTNAME= seamonkey DISTVERSION= 2.40 MOZILLA_VER= 43 # above + 3 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES?= www mail news editors irc ipv6 MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/source diff --git a/x11/leechcraft/Makefile b/x11/leechcraft/Makefile index 4bdf5f2f4091..fbb2e93f9394 100644 --- a/x11/leechcraft/Makefile +++ b/x11/leechcraft/Makefile @@ -3,7 +3,7 @@ PORTNAME= leechcraft PORTVERSION= 0.6.70 -PORTREVISION= 13 +PORTREVISION= 14 CATEGORIES= x11 MASTER_SITES= http://dist.leechcraft.org/LeechCraft/0.6.70/ @@ -287,7 +287,7 @@ QROSP_LIB_DEPENDS= libqrosscore.so:devel/qross ROSENTHAL_DESC= Spellchecking support ROSENTHAL_CMAKE_ON= -DENABLE_ROSENTHAL:BOOL=true ROSENTHAL_CMAKE_OFF= -DENABLE_ROSENTHAL:BOOL=false -ROSENTHAL_LIB_DEPENDS= libhunspell-1.3.so:textproc/hunspell +ROSENTHAL_LIB_DEPENDS= libhunspell-1.5.so:textproc/hunspell SB2_DESC= Sidebar for LeechCraft with combined launcher and tab switcher SB2_CMAKE_ON= -DENABLE_SB2:BOOL=true |