Re: UPDATE: textproc/hunspell

You missed a couple of REVISION bumps, at least libreoffice and seamonkey.

--
Sent from a phone, apologies for poor formatting.
On 15 September 2020 05:44:18 Rafael Sadowski <rafael@sizeofvoid.org> wrote:

> I was a little surprised at the k2k20 that our hunspell version is so
> old. The latest version 1.7 is from 11.2018. Please find below a diff to
> update hunspell to 1.7 and bump/adjust all consumer.
>
> - s/hunspell-1.6/hunspell-1.7/g
> - REVISION bump
> - otter-browser needs a patch to find 1.7.
> - Adjust mozilla (MOZILLA_USE_BUNDLED_HUNSPELL) but it looks like
> nothing use it.
>
> Lightly tested at runtime. All portes checked with
> port-lib-depends-check.
>
> Rafael
>
> CC'ed maintainer
>
> diff --git a/devel/codeblocks/Makefile b/devel/codeblocks/Makefile
> old mode 100755
> new mode 100644
> index bc2afbbed70..1299368c35e
> --- a/devel/codeblocks/Makefile
> +++ b/devel/codeblocks/Makefile
> @@ -7,6 +7,7 @@ V= 20.03
> DISTNAME= codeblocks-${V}
> PKGNAME= codeblocks-${V}
> EXTRACT_SUFX= .tar.xz
> +REVISION= 0
>
> WRKDIST= ${WRKDIR}/codeblocks-${V}
>
> @@ -37,7 +38,7 @@ WANTLIB += atk-1.0 atk-bridge-2.0 boost_system bz2 c cairo
> WANTLIB += cairo-gobject epoxy expat ffi fontconfig freetype
> WANTLIB += fribidi gamin-1 gdk-3 gdk_pixbuf-2.0 gio-2.0 glib-2.0
> WANTLIB += gmodule-2.0 gobject-2.0 graphite2 gthread-2.0 gtk-3
> -WANTLIB += harfbuzz hunspell-1.6 iconv intl jpeg m mspack notify
> +WANTLIB += harfbuzz hunspell-1.7 iconv intl jpeg m mspack notify
> WANTLIB += pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre pixman-1
> WANTLIB += png samplerate sndio tiff usbhid wx_baseu-3.0 wx_baseu_net-3.0
> WANTLIB += wx_baseu_xml-3.0 wx_gtk3u_adv-3.0 wx_gtk3u_aui-3.0
> diff --git a/devel/kf5/sonnet/Makefile b/devel/kf5/sonnet/Makefile
> index 75acd79b1c5..080f72f2f82 100644
> --- a/devel/kf5/sonnet/Makefile
> +++ b/devel/kf5/sonnet/Makefile
> @@ -7,6 +7,7 @@ DISTNAME = sonnet-${VERSION}
> PKGNAME-main = ${DISTNAME}
> PKGNAME-aspell = sonnet-aspell-${VERSION}
> PKGNAME-hunspell = sonnet-hunspell-${VERSION}
> +REVISION-hunspell = 0
>
> SHARED_LIBS = KF5SonnetCore 5.0
> SHARED_LIBS += KF5SonnetUi 5.0
> @@ -15,7 +16,7 @@ MULTI_PACKAGES = -main -aspell -hunspell
>
> WANTLIB-main = ${WANTLIB} ${COMPILER_LIBCXX} Qt5Core Qt5Gui Qt5Widgets m c
> WANTLIB-aspell = ${WANTLIB} ${COMPILER_LIBCXX} KF5SonnetCore Qt5Core aspell m
> -WANTLIB-hunspell = ${WANTLIB} ${COMPILER_LIBCXX} KF5SonnetCore Qt5Core
> hunspell-1.6 m
> +WANTLIB-hunspell = ${WANTLIB} ${COMPILER_LIBCXX} KF5SonnetCore Qt5Core
> hunspell-1.7 m
>
> LIB_DEPENDS-aspell = ${LIB_DEPENDS} \
> ${BASE_PKGPATH},-main \
> diff --git a/editors/featherpad/Makefile b/editors/featherpad/Makefile
> index 4e22266ff6a..4d5d1013642 100644
> --- a/editors/featherpad/Makefile
> +++ b/editors/featherpad/Makefile
> @@ -3,6 +3,7 @@
> COMMENT = lightweight Qt5 plain-text editor
> PKGNAME = featherpad-${GH_TAGNAME:S/^V//}
> CATEGORIES = editors x11
> +REVISION = 0
>
> GH_ACCOUNT = tsujan
> GH_PROJECT = FeatherPad
> @@ -14,7 +15,7 @@ MAINTAINER = Brian Callahan <bcallah@openbsd.org>
> PERMIT_PACKAGE = Yes
>
> WANTLIB += ${COMPILER_LIBCXX} ICE Qt5Core Qt5Gui Qt5Network Qt5PrintSupport
> -WANTLIB += Qt5Svg Qt5Widgets Qt5X11Extras SM X11 Xext c hunspell-1.6
> +WANTLIB += Qt5Svg Qt5Widgets Qt5X11Extras SM X11 Xext c hunspell-1.7
> WANTLIB += m
>
> MODULES = devel/cmake \
> diff --git a/editors/focuswriter/Makefile b/editors/focuswriter/Makefile
> index a76c870bf17..e73626aef38 100644
> --- a/editors/focuswriter/Makefile
> +++ b/editors/focuswriter/Makefile
> @@ -5,6 +5,7 @@ COMMENT = simple, distraction-free writing environment
> DISTNAME = focuswriter-1.7.6
> CATEGORIES = editors
> EXTRACT_SUFX = -src.tar.bz2
> +REVISION = 0
>
> HOMEPAGE = https://gottcode.org/focuswriter/
>
> @@ -23,7 +24,7 @@ LIB_DEPENDS += textproc/hunspell \
>
> WANTLIB += ${COMPILER_LIBCXX} GL Qt5Concurrent Qt5Core Qt5Gui
> WANTLIB += Qt5Multimedia Qt5Network Qt5PrintSupport Qt5Widgets
> -WANTLIB += c hunspell-1.6 m z
> +WANTLIB += c hunspell-1.7 m z
>
> NO_TEST = Yes
>
> diff --git a/editors/ghostwriter/Makefile b/editors/ghostwriter/Makefile
> index 5e0a61bf360..12ae57d8f68 100644
> --- a/editors/ghostwriter/Makefile
> +++ b/editors/ghostwriter/Makefile
> @@ -8,7 +8,7 @@ COMMENT = distraction-free Markdown editor
> GH_ACCOUNT = wereturtle
> GH_PROJECT = ghostwriter
> GH_TAGNAME = v1.7.4
> -REVISION = 0
> +REVISION = 1
>
> CATEGORIES = editors
>
> @@ -21,7 +21,7 @@ PERMIT_PACKAGE = Yes
>
> WANTLIB += ${COMPILER_LIBCXX}
> WANTLIB += GL Qt5Concurrent Qt5Core Qt5Gui Qt5Network Qt5PrintSupport
> -WANTLIB += Qt5Svg Qt5WebKit Qt5WebKitWidgets Qt5Widgets c hunspell-1.6
> +WANTLIB += Qt5Svg Qt5WebKit Qt5WebKitWidgets Qt5Widgets c hunspell-1.7
> WANTLIB += m pthread
>
> MODULES = devel/qmake \
> diff --git a/editors/libreoffice/Makefile b/editors/libreoffice/Makefile
> index 3948e10f3d0..8eae7cb78fb 100644
> --- a/editors/libreoffice/Makefile
> +++ b/editors/libreoffice/Makefile
> @@ -224,7 +224,7 @@ WANTLIB-main+= Xext Xrandr Xrender atk-1.0 c cairo
> WANTLIB-main+= crypto expat fontconfig freetype gio-2.0 glib-2.0
> WANTLIB-main+= gobject-2.0 iconv intl util
> WANTLIB-main+= jpeg m pthread ssl xml2 z gdk_pixbuf-2.0 poppler
> -WANTLIB-main+= pango-1.0 pangocairo-1.0 hunspell-1.6
> +WANTLIB-main+= pango-1.0 pangocairo-1.0 hunspell-1.7
> WANTLIB-main+= clucene-contribs-lib clucene-core clucene-shared
> WANTLIB-main+= cups exslt lcms2 raptor2 harfbuzz harfbuzz-icu
> WANTLIB-main+= nspr4 nss3 nssutil3 plc4 plds4 smime3 ssl3
> diff --git a/editors/sigil/Makefile b/editors/sigil/Makefile
> index f7acb6f985a..c6b77dd0dff 100644
> --- a/editors/sigil/Makefile
> +++ b/editors/sigil/Makefile
> @@ -3,7 +3,7 @@
> COMMENT = EPUB ebook editor
>
> PKGNAME = sigil-${GH_TAGNAME}
> -REVISION = 0
> +REVISION = 1
>
> # newer versions require qtwebengine
> GH_ACCOUNT = Sigil-Ebook
> @@ -20,7 +20,7 @@ PERMIT_PACKAGE = Yes
> WANTLIB += ${COMPILER_LIBCXX} ${MODPY_WANTLIB}
> WANTLIB += Qt5Concurrent Qt5Core Qt5Gui Qt5Network Qt5PrintSupport
> WANTLIB += Qt5Svg Qt5WebKit Qt5WebKitWidgets Qt5Widgets Qt5Xml
> -WANTLIB += Qt5XmlPatterns c hunspell-1.6 m pcre16 z
> +WANTLIB += Qt5XmlPatterns c hunspell-1.7 m pcre16 z
>
> COMPILER = base-clang ports-gcc
> MODULES = devel/cmake \
> diff --git a/editors/teaqt/Makefile b/editors/teaqt/Makefile
> index 97beb8f3eb0..62da1260332 100644
> --- a/editors/teaqt/Makefile
> +++ b/editors/teaqt/Makefile
> @@ -6,6 +6,7 @@ GH_ACCOUNT = psemiletov
> GH_PROJECT = tea-qt
> GH_TAGNAME = 50.0.4
> PKGNAME = teaqt-${GH_TAGNAME}
> +REVISION = 0
>
> CATEGORIES = editors x11
>
> @@ -15,7 +16,7 @@ HOMEPAGE = http://semiletov.org/tea/
> PERMIT_PACKAGE = Yes
>
> WANTLIB += ${COMPILER_LIBCXX} Qt5Core Qt5Gui Qt5PrintSupport Qt5Widgets
> -WANTLIB += aspell c djvulibre hunspell-1.6 m poppler-qt5 z
> +WANTLIB += aspell c djvulibre hunspell-1.7 m poppler-qt5 z
>
> MODULES = devel/cmake \
> x11/qt5
> diff --git a/editors/texmaker/Makefile b/editors/texmaker/Makefile
> index e8fe218c1ad..f4527a47a64 100644
> --- a/editors/texmaker/Makefile
> +++ b/editors/texmaker/Makefile
> @@ -3,7 +3,7 @@
> COMMENT= LaTeX development environment
> DISTNAME= texmaker-5.0.2
> CATEGORIES= editors
> -REVISION= 1
> +REVISION= 2
>
> HOMEPAGE= http://www.xm1math.net/texmaker/
>
> @@ -15,7 +15,7 @@ EXTRACT_SUFX= .tar.bz2
>
> WANTLIB += ${COMPILER_LIBCXX}
> WANTLIB += GL Qt5Concurrent Qt5Core Qt5Gui Qt5Network Qt5PrintSupport
> -WANTLIB += Qt5Script Qt5Widgets Qt5Xml c hunspell-1.6 m
> +WANTLIB += Qt5Script Qt5Widgets Qt5Xml c hunspell-1.7 m
>
> # c++-11 for required for poppler
> COMPILER= base-clang ports-gcc
> diff --git a/editors/texworks/Makefile b/editors/texworks/Makefile
> index f6a341d30b3..4da5cd98d1b 100644
> --- a/editors/texworks/Makefile
> +++ b/editors/texworks/Makefile
> @@ -14,7 +14,7 @@ PKGNAME-lua = texworks-lua-${V}
> PKGNAME-python = texworks-python-${V}
> REVISION-lua = 0
> REVISION-python = 1
> -REVISION-main = 3
> +REVISION-main = 4
>
> EPOCH = 0
>
> @@ -34,7 +34,7 @@ MODULES = lang/python \
> COMPILER = base-clang ports-gcc
>
> WANTLIB += ${COMPILER_LIBCXX} Qt5Concurrent Qt5Core Qt5DBus Qt5Gui
> -WANTLIB += Qt5Script Qt5ScriptTools Qt5Widgets Qt5Xml c hunspell-1.6
> +WANTLIB += Qt5Script Qt5ScriptTools Qt5Widgets Qt5Xml c hunspell-1.7
> WANTLIB += m poppler poppler-qt5 synctex z
>
> WANTLIB-lua += ${COMPILER_LIBCXX} ${MODLUA_WANTLIB} Qt5Concurrent Qt5Core
> diff --git a/print/lyx/Makefile b/print/lyx/Makefile
> index 8e4e2bf8e81..bff54fd0b89 100644
> --- a/print/lyx/Makefile
> +++ b/print/lyx/Makefile
> @@ -5,6 +5,7 @@ PORTROACH= skipv:2.3.x
> COMMENT= graphical frontend for LaTeX (nearly WYSIWYG)
>
> DISTNAME= lyx-2.3.5.2
> +REVISION= 0
>
> CATEGORIES= print editors
>
> @@ -20,7 +21,7 @@ MASTER_SITES= https://ftp.lip6.fr/pub/lyx/stable/2.3.x/ \
> ftp://ftp.u-aizu.ac.jp/pub/tex/lyx/stable/2.3.x/
>
> WANTLIB+= ${COMPILER_LIBCXX} Qt5Concurrent Qt5Core Qt5Gui Qt5Svg
> -WANTLIB+= Qt5Widgets Qt5X11Extras aspell c enchant-2 hunspell-1.6
> +WANTLIB+= Qt5Widgets Qt5X11Extras aspell c enchant-2 hunspell-1.7
> WANTLIB+= iconv m magic xcb z
>
> COMPILER= base-clang ports-gcc
> diff --git a/print/scribus/Makefile b/print/scribus/Makefile
> index 82431dc6202..64856b3c508 100644
> --- a/print/scribus/Makefile
> +++ b/print/scribus/Makefile
> @@ -3,7 +3,7 @@
> COMMENT= desktop publishing program
> DISTNAME= scribus-1.5.5
> CATEGORIES= print
> -REVISION= 0
> +REVISION= 1
>
> HOMEPAGE= https://www.scribus.net/
>
> @@ -12,7 +12,7 @@ PERMIT_PACKAGE= Yes
>
> WANTLIB += ${COMPILER_LIBCXX} Qt5Core Qt5Gui Qt5Network Qt5OpenGL
> WANTLIB += Qt5PrintSupport Qt5Widgets Qt5Xml c cairo cups execinfo
> -WANTLIB += fontconfig freetype harfbuzz harfbuzz-icu hunspell-1.6
> +WANTLIB += fontconfig freetype harfbuzz harfbuzz-icu hunspell-1.7
> WANTLIB += icudata icuuc jpeg lcms2 m podofo poppler ${MODPY_WANTLIB}
> WANTLIB += tiff util xml2 z
>
> diff --git a/textproc/enchant/Makefile b/textproc/enchant/Makefile
> index 67c1771c73b..baa194b3f42 100755
> --- a/textproc/enchant/Makefile
> +++ b/textproc/enchant/Makefile
> @@ -8,7 +8,7 @@ V= 1.6.1
> GH_ACCOUNT= AbiWord
> GH_PROJECT= enchant
> GH_TAGNAME= enchant-${V:S/./-/g}
> -REVISION= 1
> +REVISION= 2
>
> # XXX needed for portroach (DISTNAME must match the GH_PROJECT-GH_TAGNAME)
> MASTER_SITES= https://github.com/AbiWord/enchant/releases/download/${GH_PROJECT}-${V:S/./-/g}/
> @@ -26,7 +26,7 @@ MAINTAINER= Antoine Jacoutot <ajacoutot@openbsd.org>
> # LGPLv2.1
> PERMIT_PACKAGE= Yes
>
> -WANTLIB += aspell c glib-2.0 gmodule-2.0 hunspell-1.6 iconv intl
> +WANTLIB += aspell c glib-2.0 gmodule-2.0 hunspell-1.7 iconv intl
> WANTLIB += m pcre pthread ${LIBCXX}
>
> # c++11
> diff --git a/textproc/enchant2/Makefile b/textproc/enchant2/Makefile
> index 2d65a823f40..af261d13a98 100644
> --- a/textproc/enchant2/Makefile
> +++ b/textproc/enchant2/Makefile
> @@ -5,6 +5,7 @@ COMMENT= generic spell checking library
> V= 2.2.11
> DISTNAME= enchant-${V}
> PKGNAME= enchant2-${V}
> +REVISION= 0
>
> SHARED_LIBS += enchant-2 0.1 # 4.11
>
> @@ -17,7 +18,7 @@ MAINTAINER= Antoine Jacoutot <ajacoutot@openbsd.org>
> # LGPLv2.1
> PERMIT_PACKAGE= Yes
>
> -WANTLIB += ${COMPILER_LIBCXX} aspell c glib-2.0 gmodule-2.0 hunspell-1.6
> +WANTLIB += ${COMPILER_LIBCXX} aspell c glib-2.0 gmodule-2.0 hunspell-1.7
> WANTLIB += iconv intl m pcre
>
> MASTER_SITES = https://github.com/AbiWord/enchant/releases/download/v${V}/
> diff --git a/textproc/hunspell/Makefile b/textproc/hunspell/Makefile
> index ad25941843f..46eed5dfd57 100644
> --- a/textproc/hunspell/Makefile
> +++ b/textproc/hunspell/Makefile
> @@ -2,17 +2,15 @@
>
> COMMENT = spelling, stemming, morphological analysis and generation
>
> -
> GH_ACCOUNT = hunspell
> GH_PROJECT = hunspell
> -GH_TAGNAME = v1.6.2
> -REVISION = 0
> +GH_TAGNAME = v1.7.0
>
> -SHARED_LIBS = hunspell-1.6 0.0 # .0.0
> +SHARED_LIBS = hunspell-1.7 0.0 # 0.0
>
> CATEGORIES = textproc
>
> -HOMEPAGE = http://hunspell.github.io/
> +HOMEPAGE = https://hunspell.github.io/
>
> # GPL/LGPL/MPL
> PERMIT_PACKAGE = Yes
> diff --git a/textproc/hunspell/distinfo b/textproc/hunspell/distinfo
> index 43463a26904..2264c5aaf9d 100644
> --- a/textproc/hunspell/distinfo
> +++ b/textproc/hunspell/distinfo
> @@ -1,2 +1,2 @@
> -SHA256 (hunspell-1.6.2.tar.gz) = PNnOsGL+WBT2aOTyKy+m47oLM5uSFzlUHOGAysTW9MQ=
> -SIZE (hunspell-1.6.2.tar.gz) = 721165
> +SHA256 (hunspell-1.7.0.tar.gz) = uye4brkQqChUB888oztiZDoCeYzy7vRowKdPbD7mvIo=
> +SIZE (hunspell-1.7.0.tar.gz) = 482156
> diff --git a/textproc/hunspell/patches/patch-src_tools_hunspell_cxx
> b/textproc/hunspell/patches/patch-src_tools_hunspell_cxx
> index 30d6971dfc8..a7e9ce360cc 100644
> --- a/textproc/hunspell/patches/patch-src_tools_hunspell_cxx
> +++ b/textproc/hunspell/patches/patch-src_tools_hunspell_cxx
> @@ -1,8 +1,9 @@
> $OpenBSD: patch-src_tools_hunspell_cxx,v 1.4 2017/04/12 18:09:01 landry Exp $
> ---- src/tools/hunspell.cxx.orig Sat Mar 25 22:20:45 2017
> -+++ src/tools/hunspell.cxx Sat Apr 8 19:17:14 2017
> +Index: src/tools/hunspell.cxx
> +--- src/tools/hunspell.cxx.orig
> ++++ src/tools/hunspell.cxx
> @@ -116,28 +116,14 @@
> - #include "odfparser.hxx"
> + #include "../parsers/odfparser.hxx"
>
> #define LIBDIR \
> - "/usr/share/hunspell:" \
> diff --git a/textproc/hunspell/patches/patch-tests_test_sh
> b/textproc/hunspell/patches/patch-tests_test_sh
> index 69c3586a64b..88003dd534d 100644
> --- a/textproc/hunspell/patches/patch-tests_test_sh
> +++ b/textproc/hunspell/patches/patch-tests_test_sh
> @@ -1,9 +1,10 @@
> $OpenBSD: patch-tests_test_sh,v 1.2 2017/04/12 18:09:01 landry Exp $
> ---- tests/test.sh.orig Sat Mar 25 22:20:45 2017
> -+++ tests/test.sh Sat Apr 8 19:25:56 2017
> +Index: tests/test.sh
> +--- tests/test.sh.orig
> ++++ tests/test.sh
> @@ -1,4 +1,4 @@
> -#!/bin/bash
> +#!${LOCALBASE}/bin/bash
> - # ***** BEGIN LICENSE BLOCK *****
> + # ##### BEGIN LICENSE BLOCK #####
> # Version: MPL 1.1/GPL 2.0/LGPL 2.1
> #
> diff --git a/textproc/hunspell/pkg/PLIST b/textproc/hunspell/pkg/PLIST
> index efbd92764b6..b6857433e58 100644
> --- a/textproc/hunspell/pkg/PLIST
> +++ b/textproc/hunspell/pkg/PLIST
> @@ -13,15 +13,13 @@ bin/wordforms
> bin/wordlist2hunspell
> include/hunspell/
> include/hunspell/atypes.hxx
> -include/hunspell/csutil.hxx
> -include/hunspell/htypes.hxx
> include/hunspell/hunspell.h
> include/hunspell/hunspell.hxx
> include/hunspell/hunvisapi.h
> include/hunspell/w_char.hxx
> -lib/libhunspell-1.6.a
> -lib/libhunspell-1.6.la
> -@lib lib/libhunspell-1.6.so.${LIBhunspell-1.6_VERSION}
> +@static-lib lib/libhunspell-1.7.a
> +lib/libhunspell-1.7.la
> +@lib lib/libhunspell-1.7.so.${LIBhunspell-1.7_VERSION}
> lib/pkgconfig/hunspell.pc
> man/hu/
> man/hu/man1/
> diff --git a/textproc/link-grammar/Makefile b/textproc/link-grammar/Makefile
> index e9da6d8df04..094ad51be2a 100644
> --- a/textproc/link-grammar/Makefile
> +++ b/textproc/link-grammar/Makefile
> @@ -9,11 +9,13 @@ COMMENT-python = Python bindings for link-grammar
>
> VERSION = 5.8.0
> DISTNAME = link-grammar-${VERSION}
> -REVISION-python = 0
> +REVISION-python = 1
>
> PKGNAME-main = ${DISTNAME}
> PKGNAME-java = link-grammar-java-${VERSION}
> PKGNAME-python = py3-link-grammar-${VERSION}
> +REVISION-java = 0
> +REVISION-main = 0
>
> SHARED_LIBS += link-grammar 8.0 # 12.0
> SHARED_LIBS += link-grammar-java 6.0 # 12.0
> @@ -25,7 +27,7 @@ HOMEPAGE = http://www.abisource.com/projects/link-grammar/
> # LGPLv2.1
> PERMIT_PACKAGE = Yes
>
> -WANTLIB += hunspell-1.6 m minisat pcre2-8 sqlite3 z ${COMPILER_LIBCXX}
> +WANTLIB += hunspell-1.7 m minisat pcre2-8 sqlite3 z ${COMPILER_LIBCXX}
>
> WANTLIB-main += ${WANTLIB} c perl pthread
>
> diff --git a/www/mozilla/mozilla.port.mk b/www/mozilla/mozilla.port.mk
> index e959cea9205..1c1b83578ed 100644
> --- a/www/mozilla/mozilla.port.mk
> +++ b/www/mozilla/mozilla.port.mk
> @@ -84,8 +84,8 @@ CONFIGURE_ARGS += --with-system-icu
> .endif
>
> .if !defined(MOZILLA_USE_BUNDLED_HUNSPELL)
> -MODMOZ_LIB_DEPENDS += textproc/hunspell>=1.6
> -MODMOZ_WANTLIB += hunspell-1.6
> +MODMOZ_LIB_DEPENDS += textproc/hunspell=1.7
> +MODMOZ_WANTLIB += hunspell-1.7
> CONFIGURE_ARGS += --with-system-hunspell
> .endif
>
> diff --git a/www/otter-browser/Makefile b/www/otter-browser/Makefile
> index 631489a48be..17f650e3bd3 100644
> --- a/www/otter-browser/Makefile
> +++ b/www/otter-browser/Makefile
> @@ -3,7 +3,7 @@
> COMMENT = browser aiming to recreate classic Opera (12.x) UI using Qt5
>
> DISTNAME = otter-browser-1.0.01
> -REVISION = 0
> +REVISION = 1
>
> CATEGORIES = www
>
> @@ -19,7 +19,7 @@ PERMIT_PACKAGE = Yes
>
> WANTLIB += ${COMPILER_LIBCXX} Qt5Core Qt5DBus Qt5Gui Qt5Multimedia
> WANTLIB += Qt5Network Qt5PrintSupport Qt5Qml Qt5Svg Qt5WebKit
> -WANTLIB += Qt5WebKitWidgets Qt5Widgets Qt5XmlPatterns c hunspell-1.6
> +WANTLIB += Qt5WebKitWidgets Qt5Widgets Qt5XmlPatterns c hunspell-1.7
> WANTLIB += m
>
> MODULES = devel/cmake x11/qt5
> diff --git a/www/otter-browser/patches/patch-cmake_FindHunspell_cmake
> b/www/otter-browser/patches/patch-cmake_FindHunspell_cmake
> new file mode 100644
> index 00000000000..63b304e28bd
> --- /dev/null
> +++ b/www/otter-browser/patches/patch-cmake_FindHunspell_cmake
> @@ -0,0 +1,14 @@
> +$OpenBSD$
> +
> +Index: cmake/FindHunspell.cmake
> +--- cmake/FindHunspell.cmake.orig
> ++++ cmake/FindHunspell.cmake
> +@@ -12,7 +12,7 @@ IF (HUNSPELL_INCLUDE_DIR AND HUNSPELL_LIBRARIES)
> + ENDIF (HUNSPELL_INCLUDE_DIR AND HUNSPELL_LIBRARIES)
> +
> + FIND_PATH(HUNSPELL_INCLUDE_DIR hunspell/hunspell.hxx)
> +-FIND_LIBRARY(HUNSPELL_LIBRARIES NAMES hunspell-1.6 hunspell-1.5 hunspell)
> ++FIND_LIBRARY(HUNSPELL_LIBRARIES NAMES hunspell-1.7 hunspell-1.6
> hunspell-1.5 hunspell)
> +
> + # handle the QUIETLY and REQUIRED arguments and set HUNSPELL_FOUND to TRUE if
> + # all listed variables are TRUE
> diff --git a/x11/qt5/qtvirtualkeyboard/Makefile
> b/x11/qt5/qtvirtualkeyboard/Makefile
> index 1f83be628e2..08692f4ab2c 100644
> --- a/x11/qt5/qtvirtualkeyboard/Makefile
> +++ b/x11/qt5/qtvirtualkeyboard/Makefile
> @@ -2,6 +2,7 @@
>
> QT5NAME = QtVirtualKeyboard
> COMMENT-main = Qt5 virtual keyboard plugin
> +REVISION = 0
>
> MULTI_PACKAGES = -main -examples
>
> @@ -9,7 +10,7 @@ SHARED_LIBS += Qt5HunspellInputMethod 0.0 # 5.13
> SHARED_LIBS += Qt5VirtualKeyboard 0.0 # 5.13
>
> WANTLIB += ${COMPILER_LIBCXX} GL Qt5Core Qt5Gui Qt5Network Qt5Qml
> -WANTLIB += Qt5Quick Qt5Svg Qt5Widgets hunspell-1.6 m xcb xcb-xfixes
> +WANTLIB += Qt5Quick Qt5Svg Qt5Widgets hunspell-1.7 m xcb xcb-xfixes
>
> LIB_DEPENDS = textproc/hunspell \
> x11/qt5/qtdeclarative>=${QT5_VERSION},<${QT5_NEXT_VERSION} \