textproc/hunspell: update to 1.6.0

- Restore DIST_SUBDIR from r305651
- Adjust license for "or later" clause
- Restore GPLv2+/LGPL21+ license files removed upstream as
  GPLv3+/LGPL3+ only affects Hunspell 2.0 (not currently built)
- Unbreak |make makepatch|

Changes:	https://github.com/hunspell/hunspell/releases/tag/v1.6.0
PR:		215714
Submitted by:	sunpoet (based on)
Exp-run by:	antoine
MFH:		2017Q1
Differential Revision:	https://reviews.freebsd.org/D8887
This commit is contained in:
Jan Beich 2017-01-07 14:43:11 +00:00
parent 2018ddae97
commit 24bce6e056
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=430796
45 changed files with 109 additions and 92 deletions

View file

@ -183,7 +183,7 @@ harfbuzz_LIB_DEPENDS= libharfbuzz.so:print/harfbuzz
harfbuzz_MOZ_OPTIONS= --with-system-harfbuzz harfbuzz_MOZ_OPTIONS= --with-system-harfbuzz
.endif .endif
hunspell_LIB_DEPENDS= libhunspell-1.5.so:textproc/hunspell hunspell_LIB_DEPENDS= libhunspell-1.6.so:textproc/hunspell
hunspell_MOZ_OPTIONS= --enable-system-hunspell hunspell_MOZ_OPTIONS= --enable-system-hunspell
icu_LIB_DEPENDS= libicui18n.so:devel/icu icu_LIB_DEPENDS= libicui18n.so:devel/icu

View file

@ -3,7 +3,7 @@
PORTNAME= codeblocks PORTNAME= codeblocks
PORTVERSION= 16.01 PORTVERSION= 16.01
PORTREVISION= 4 PORTREVISION= 5
CATEGORIES= devel CATEGORIES= devel
MASTER_SITES= SF/${PORTNAME}/Sources/${PORTVERSION} MASTER_SITES= SF/${PORTNAME}/Sources/${PORTVERSION}
DISTNAME= ${PORTNAME}_${PORTVERSION} DISTNAME= ${PORTNAME}_${PORTVERSION}
@ -18,7 +18,7 @@ BUILD_DEPENDS= zip:archivers/zip
LIB_DEPENDS= libboost_system.so:devel/boost-libs \ LIB_DEPENDS= libboost_system.so:devel/boost-libs \
libfontconfig.so:x11-fonts/fontconfig \ libfontconfig.so:x11-fonts/fontconfig \
libfreetype.so:print/freetype2 \ libfreetype.so:print/freetype2 \
libhunspell-1.5.so:textproc/hunspell libhunspell-1.6.so:textproc/hunspell
USES= autoreconf compiler desktop-file-utils fam:gamin localbase \ USES= autoreconf compiler desktop-file-utils fam:gamin localbase \
gettext-runtime libtool pathfix pkgconfig shared-mime-info gettext-runtime libtool pathfix pkgconfig shared-mime-info

View file

@ -2,13 +2,13 @@
PORTNAME= lokalize PORTNAME= lokalize
PORTVERSION= ${KDE4_VERSION} PORTVERSION= ${KDE4_VERSION}
PORTREVISION= 1 PORTREVISION= 2
CATEGORIES= devel kde kde-kde4 CATEGORIES= devel kde kde-kde4
MAINTAINER= kde@FreeBSD.org MAINTAINER= kde@FreeBSD.org
COMMENT= Computer-aided translation system COMMENT= Computer-aided translation system
LIB_DEPENDS= libhunspell-1.5.so:textproc/hunspell LIB_DEPENDS= libhunspell-1.6.so:textproc/hunspell
USES= cmake:outsource kde:4 tar:xz USES= cmake:outsource kde:4 tar:xz
USE_KDE= kdelibs automoc4 USE_KDE= kdelibs automoc4

View file

@ -3,7 +3,7 @@
PORTNAME= codelite PORTNAME= codelite
PORTVERSION= 9.2 PORTVERSION= 9.2
PORTREVISION= 2 PORTREVISION= 3
CATEGORIES= editors devel CATEGORIES= editors devel
MAINTAINER= mokhi64@gmail.com MAINTAINER= mokhi64@gmail.com
@ -12,7 +12,7 @@ COMMENT= Open Source IDE for C/C++
LICENSE= GPLv2+ LICENSE= GPLv2+
RUN_DEPENDS= xterm:x11/xterm RUN_DEPENDS= xterm:x11/xterm
LIB_DEPENDS+= libhunspell-1.5.so:textproc/hunspell LIB_DEPENDS+= libhunspell-1.6.so:textproc/hunspell
USE_GITHUB= yes USE_GITHUB= yes
GH_ACCOUNT= eranif GH_ACCOUNT= eranif

View file

@ -5,7 +5,7 @@
find_library(LIBHUNSPELL find_library(LIBHUNSPELL
# Fedora doesn't create a hunspell->hunspell-1.3 symlink, so explicitly look for (the current) full name # Fedora doesn't create a hunspell->hunspell-1.3 symlink, so explicitly look for (the current) full name
- NAMES hunspell hunspell-1.3 - NAMES hunspell hunspell-1.3
+ NAMES hunspell hunspell-1.5 hunspell-1.4 hunspell-1.3 + NAMES hunspell-1.6 hunspell-1.5 hunspell-1.4 hunspell-1.3 hunspell
PATH_SUFFIXES lib) PATH_SUFFIXES lib)
find_path( HUNSPELL_H find_path( HUNSPELL_H

View file

@ -4,6 +4,7 @@
PORTNAME= focuswriter PORTNAME= focuswriter
PORTVERSION= 1.6.3 PORTVERSION= 1.6.3
DISTVERSIONPREFIX= v DISTVERSIONPREFIX= v
PORTREVISION= 1
CATEGORIES= editors CATEGORIES= editors
MAINTAINER= lightside@gmx.com MAINTAINER= lightside@gmx.com
@ -14,7 +15,7 @@ LICENSE_COMB= multi
LICENSE_FILE_GPLv3= ${WRKSRC}/COPYING LICENSE_FILE_GPLv3= ${WRKSRC}/COPYING
LICENSE_FILE_LGPL3= ${WRKSRC}/resources/images/icons/oxygen/COPYING LICENSE_FILE_LGPL3= ${WRKSRC}/resources/images/icons/oxygen/COPYING
LIB_DEPENDS= libhunspell-1.5.so:textproc/hunspell LIB_DEPENDS= libhunspell-1.6.so:textproc/hunspell
USE_GITHUB= yes USE_GITHUB= yes
GH_ACCOUNT= gottcode GH_ACCOUNT= gottcode

View file

@ -54,7 +54,7 @@ LIB_DEPENDS= libapr-1.so:devel/apr1 \
libnss3.so:security/nss \ libnss3.so:security/nss \
libclucene-core.so:textproc/clucene \ libclucene-core.so:textproc/clucene \
libexpat.so:textproc/expat2 \ libexpat.so:textproc/expat2 \
libhunspell-1.5.so:textproc/hunspell \ libhunspell-1.6.so:textproc/hunspell \
libhyphen.so:textproc/hyphen \ libhyphen.so:textproc/hyphen \
libabw-0.1.so:textproc/libabw \ libabw-0.1.so:textproc/libabw \
libe-book-0.1.so:textproc/libe-book \ libe-book-0.1.so:textproc/libe-book \

View file

@ -2,7 +2,7 @@
PORTNAME= libreoffice PORTNAME= libreoffice
PORTVERSION= 5.2.4 PORTVERSION= 5.2.4
PORTREVISION= 2 PORTREVISION= 3
CATEGORIES+= editors CATEGORIES+= editors
MAINTAINER= office@FreeBSD.org MAINTAINER= office@FreeBSD.org

View file

@ -2,7 +2,7 @@
PORTNAME= libreoffice PORTNAME= libreoffice
PORTVERSION= 4.3.7 PORTVERSION= 4.3.7
PORTREVISION= 13 PORTREVISION= 14
CATEGORIES= editors CATEGORIES= editors
MASTER_SITES= http://download.documentfoundation.org/libreoffice/src/${PORTVERSION}/ \ MASTER_SITES= http://download.documentfoundation.org/libreoffice/src/${PORTVERSION}/ \
http://dev-www.libreoffice.org/extern/:ext \ http://dev-www.libreoffice.org/extern/:ext \
@ -55,7 +55,7 @@ LIB_DEPENDS= libapr-1.so:devel/apr1 \
libnss3.so:security/nss \ libnss3.so:security/nss \
libclucene-core.so:textproc/clucene \ libclucene-core.so:textproc/clucene \
libexpat.so:textproc/expat2 \ libexpat.so:textproc/expat2 \
libhunspell-1.5.so:textproc/hunspell \ libhunspell-1.6.so:textproc/hunspell \
libhyphen.so:textproc/hyphen \ libhyphen.so:textproc/hyphen \
libabw-0.1.so:textproc/libabw \ libabw-0.1.so:textproc/libabw \
libe-book-0.1.so:textproc/libe-book \ libe-book-0.1.so:textproc/libe-book \

View file

@ -3,7 +3,7 @@
PORTNAME= apache-openoffice PORTNAME= apache-openoffice
PORTVERSION= ${AOOVERSION} PORTVERSION= ${AOOVERSION}
PORTREVISION= 4 PORTREVISION= 5
#PORTREVISION= 1 #PORTREVISION= 1
CATEGORIES= editors java CATEGORIES= editors java
MASTER_SITES= APACHE/openoffice/${PORTVERSION}/source \ MASTER_SITES= APACHE/openoffice/${PORTVERSION}/source \
@ -82,7 +82,7 @@ LIB_DEPENDS= \
libfreetype.so:print/freetype2 \ libfreetype.so:print/freetype2 \
libnss3.so:security/nss \ libnss3.so:security/nss \
libexpat.so:textproc/expat2 \ libexpat.so:textproc/expat2 \
libhunspell-1.5.so:textproc/hunspell \ libhunspell-1.6.so:textproc/hunspell \
libhyphen.so:textproc/hyphen \ libhyphen.so:textproc/hyphen \
libtextcat.so:textproc/libtextcat \ libtextcat.so:textproc/libtextcat \
libmythes-1.2.so:textproc/mythes \ libmythes-1.2.so:textproc/mythes \

View file

@ -3,7 +3,7 @@
PORTNAME= apache-openoffice PORTNAME= apache-openoffice
PORTVERSION= ${AOOVERSION1}.${AOOVERSION2}.${SVNREVISION} PORTVERSION= ${AOOVERSION1}.${AOOVERSION2}.${SVNREVISION}
PORTREVISION= 6 PORTREVISION= 7
PORTEPOCH= 4 PORTEPOCH= 4
CATEGORIES= editors java CATEGORIES= editors java
MASTER_SITES= https://dist.apache.org/repos/dist/dev/openoffice/${AOOVERSION}-${AOORC}-r${SVNREVISION}/source/ \ 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 \ libfreetype.so:print/freetype2 \
libnss3.so:security/nss \ libnss3.so:security/nss \
libexpat.so:textproc/expat2 \ libexpat.so:textproc/expat2 \
libhunspell-1.5.so:textproc/hunspell \ libhunspell-1.6.so:textproc/hunspell \
libhyphen.so:textproc/hyphen \ libhyphen.so:textproc/hyphen \
libtextcat.so:textproc/libtextcat \ libtextcat.so:textproc/libtextcat \
libmythes-1.2.so:textproc/mythes \ libmythes-1.2.so:textproc/mythes \

View file

@ -3,7 +3,7 @@
PORTNAME= tea PORTNAME= tea
PORTVERSION= 43.1.0 PORTVERSION= 43.1.0
PORTREVISION= 1 PORTREVISION= 2
CATEGORIES= editors CATEGORIES= editors
MASTER_SITES= http://semiletov.org/tea/dloads/ MASTER_SITES= http://semiletov.org/tea/dloads/
@ -33,7 +33,7 @@ DESKTOP_ENTRIES="TEA" "" "${PREFIX}/share/pixmaps/tea_icon_v2.png" \
ASPELL_LIB_DEPENDS= libaspell.so:textproc/aspell ASPELL_LIB_DEPENDS= libaspell.so:textproc/aspell
ASPELL_QMAKE_ON= CONFIG+=nohunspell ASPELL_QMAKE_ON= CONFIG+=nohunspell
HUNSPELL_LIB_DEPENDS= libhunspell-1.5.so:textproc/hunspell HUNSPELL_LIB_DEPENDS= libhunspell-1.6.so:textproc/hunspell
HUNSPELL_QMAKE_ON= CONFIG+=noaspell HUNSPELL_QMAKE_ON= CONFIG+=noaspell
post-patch: post-patch:

View file

@ -3,7 +3,7 @@
PORTNAME= texmaker PORTNAME= texmaker
PORTVERSION= 4.5 PORTVERSION= 4.5
PORTREVISION= 8 PORTREVISION= 9
PORTEPOCH= 3 PORTEPOCH= 3
CATEGORIES= editors CATEGORIES= editors
MASTER_SITES= http://www.xm1math.net/texmaker/ MASTER_SITES= http://www.xm1math.net/texmaker/
@ -13,7 +13,7 @@ COMMENT= LaTeX Development Environment
LICENSE= GPLv2 LICENSE= GPLv2
LIB_DEPENDS= libhunspell-1.5.so:textproc/hunspell \ LIB_DEPENDS= libhunspell-1.6.so:textproc/hunspell \
libpoppler.so:graphics/poppler libpoppler.so:graphics/poppler
USES= desktop-file-utils ghostscript:x11,run pkgconfig qmake tar:bzip2 USES= desktop-file-utils ghostscript:x11,run pkgconfig qmake tar:bzip2

View file

@ -2,14 +2,14 @@
PORTNAME= texstudio PORTNAME= texstudio
PORTVERSION= 2.11.0 PORTVERSION= 2.11.0
PORTREVISION= 4 PORTREVISION= 5
CATEGORIES= editors CATEGORIES= editors
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/TeXstudio%20${PORTVERSION} MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/TeXstudio%20${PORTVERSION}
MAINTAINER= abiliojr@gmail.com MAINTAINER= abiliojr@gmail.com
COMMENT= Integrated writing environment for LaTeX documents COMMENT= Integrated writing environment for LaTeX documents
LIB_DEPENDS= libhunspell-1.5.so:textproc/hunspell \ LIB_DEPENDS= libhunspell-1.6.so:textproc/hunspell \
libpoppler.so:graphics/poppler libpoppler.so:graphics/poppler
USES= desktop-file-utils dos2unix execinfo ghostscript:run \ USES= desktop-file-utils dos2unix execinfo ghostscript:run \

View file

@ -3,7 +3,7 @@
PORTNAME= textroom PORTNAME= textroom
PORTVERSION= 0.8.2 PORTVERSION= 0.8.2
PORTREVISION= 8 PORTREVISION= 9
CATEGORIES= editors CATEGORIES= editors
MASTER_SITES= SF MASTER_SITES= SF
@ -13,7 +13,7 @@ COMMENT= Full screen text editor
LICENSE= GPLv3 LICENSE= GPLv3
LIB_DEPENDS= libcurl.so:ftp/curl \ LIB_DEPENDS= libcurl.so:ftp/curl \
libhunspell-1.5.so:textproc/hunspell \ libhunspell-1.6.so:textproc/hunspell \
libxml++-2.6.so:textproc/libxml++26 libxml++-2.6.so:textproc/libxml++26
USES= desktop-file-utils pkgconfig qmake USES= desktop-file-utils pkgconfig qmake

View file

@ -4,7 +4,7 @@
PORTNAME= texworks PORTNAME= texworks
PORTVERSION= 0.4.6 PORTVERSION= 0.4.6
DISTVERSIONPREFIX= release- DISTVERSIONPREFIX= release-
PORTREVISION= 4 PORTREVISION= 5
CATEGORIES= editors CATEGORIES= editors
MAINTAINER= hrs@FreeBSD.org MAINTAINER= hrs@FreeBSD.org

View file

@ -2,6 +2,7 @@
PORTNAME= hunspell PORTNAME= hunspell
PORTVERSION= 20161207 PORTVERSION= 20161207
PORTREVISION= 1
CATEGORIES= german textproc CATEGORIES= german textproc
MASTER_SITES= http://www.j3e.de/ispell/igerman98/dict/ \ MASTER_SITES= http://www.j3e.de/ispell/igerman98/dict/ \
LOCAL/sunpoet/${PORTNAME} LOCAL/sunpoet/${PORTNAME}

View file

@ -2,7 +2,7 @@
PORTNAME= hunspell PORTNAME= hunspell
PORTVERSION= 0.5.6 PORTVERSION= 0.5.6
PORTREVISION= 2 PORTREVISION= 3
CATEGORIES= korean textproc CATEGORIES= korean textproc
MAINTAINER= jkim@FreeBSD.org MAINTAINER= jkim@FreeBSD.org

View file

@ -3,7 +3,7 @@
PORTNAME= thunderbird PORTNAME= thunderbird
DISTVERSION= 45.6.0 DISTVERSION= 45.6.0
PORTREVISION= 0 PORTREVISION= 1
CATEGORIES= mail news net-im ipv6 CATEGORIES= mail news net-im ipv6
MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \
MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/source MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/source

View file

@ -3,7 +3,7 @@
PORTNAME= aegisub PORTNAME= aegisub
PORTVERSION= 3.2.2 PORTVERSION= 3.2.2
PORTREVISION= 12 PORTREVISION= 13
CATEGORIES= multimedia CATEGORIES= multimedia
MASTER_SITES= http://ftp.aegisub.org/pub/archives/releases/source/ \ MASTER_SITES= http://ftp.aegisub.org/pub/archives/releases/source/ \
ftp://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 FFMPEG_CONFIGURE_OFF= --without-ffms
FFTW_LIB_DEPENDS= libfftw3.so:math/fftw3 FFTW_LIB_DEPENDS= libfftw3.so:math/fftw3
FFTW_CONFIGURE_OFF= --without-fftw3 FFTW_CONFIGURE_OFF= --without-fftw3
HUNSPELL_LIB_DEPENDS= libhunspell-1.5.so:textproc/hunspell HUNSPELL_LIB_DEPENDS= libhunspell-1.6.so:textproc/hunspell
HUNSPELL_CONFIGURE_OFF= --without-hunspell HUNSPELL_CONFIGURE_OFF= --without-hunspell
OPENAL_USES= openal OPENAL_USES= openal
OPENAL_CONFIGURE_OFF= --without-openal OPENAL_CONFIGURE_OFF= --without-openal

View file

@ -3,7 +3,7 @@
PORTNAME= qt4-gui PORTNAME= qt4-gui
PORTVERSION= 1.8.2 PORTVERSION= 1.8.2
PORTREVISION= 4 PORTREVISION= 5
CATEGORIES= net-im CATEGORIES= net-im
PKGNAMESUFFIX?= ${KDE_SUFFIX}${PKGNAMESUFFIX2} PKGNAMESUFFIX?= ${KDE_SUFFIX}${PKGNAMESUFFIX2}
@ -25,9 +25,9 @@ OPTIONS_DEFAULT=HUNSPELL
LICQ_PORT?= net-im/licq LICQ_PORT?= net-im/licq
HUNSPELL_LIB_DEPENDS= libhunspell-1.5.so:textproc/hunspell HUNSPELL_LIB_DEPENDS= libhunspell-1.6.so:textproc/hunspell
HUNSPELL_CMAKE_ON= -DHUNSPELL_INCLUDE_DIRS=${LOCALBASE}/include/hunspell \ HUNSPELL_CMAKE_ON= -DHUNSPELL_INCLUDE_DIRS=${LOCALBASE}/include/hunspell \
-DHUNSPELL_LIBRARIES=${LOCALBASE}/lib/libhunspell-1.5.so \ -DHUNSPELL_LIBRARIES=${LOCALBASE}/lib/libhunspell-1.6.so \
-DHUNSPELL_FOUND:BOOL=ON -DHUNSPELL_FOUND:BOOL=ON
HUNSPELL_CMAKE_OFF= -DHUNSPELL_FOUND:BOOL=OFF HUNSPELL_CMAKE_OFF= -DHUNSPELL_FOUND:BOOL=OFF

View file

@ -3,7 +3,7 @@
PORTNAME= lyx PORTNAME= lyx
PORTVERSION= ${MAJOR_VERSION}.${MINOR_VERSION} PORTVERSION= ${MAJOR_VERSION}.${MINOR_VERSION}
PORTREVISION= 3 PORTREVISION= 4
CATEGORIES= print editors CATEGORIES= print editors
MASTER_SITES= ftp://ftp.lyx.org/pub/lyx/stable/${MAJOR_VERSION}.x/ \ MASTER_SITES= ftp://ftp.lyx.org/pub/lyx/stable/${MAJOR_VERSION}.x/ \
http://www-ftp.lip6.fr/ftp/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_CONFIGURE_OFF= --without-enchant
ENCHANT_LIB_DEPENDS= libenchant.so:textproc/enchant ENCHANT_LIB_DEPENDS= libenchant.so:textproc/enchant
HUNSPELL_CONFIGURE_OFF= --without-hunspell HUNSPELL_CONFIGURE_OFF= --without-hunspell
HUNSPELL_LIB_DEPENDS= libhunspell-1.5.so:textproc/hunspell HUNSPELL_LIB_DEPENDS= libhunspell-1.6.so:textproc/hunspell
NLS_CONFIGURE_OFF= --disable-nls NLS_CONFIGURE_OFF= --disable-nls
NLS_USES= gettext NLS_USES= gettext

View file

@ -3,7 +3,7 @@
PORTNAME= scribus PORTNAME= scribus
PORTVERSION= 1.4.6 PORTVERSION= 1.4.6
PORTREVISION= 5 PORTREVISION= 6
CATEGORIES= print editors CATEGORIES= print editors
MASTER_SITES= SF \ MASTER_SITES= SF \
http://www.scribus.net/downloads/${PORTVERSION}/ http://www.scribus.net/downloads/${PORTVERSION}/
@ -18,7 +18,7 @@ LIB_DEPENDS= liblcms.so:graphics/lcms \
libfreetype.so:print/freetype2 \ libfreetype.so:print/freetype2 \
libpodofo.so:graphics/podofo \ libpodofo.so:graphics/podofo \
libboost_thread.so:devel/boost-libs \ libboost_thread.so:devel/boost-libs \
libhunspell-1.5.so:textproc/hunspell \ libhunspell-1.6.so:textproc/hunspell \
libcairo.so:graphics/cairo \ libcairo.so:graphics/cairo \
libhyphen.so:textproc/hyphen \ libhyphen.so:textproc/hyphen \
libfontconfig.so:x11-fonts/fontconfig libfontconfig.so:x11-fonts/fontconfig

View file

@ -1,11 +1,12 @@
--- cmake/modules/FindHUNSPELL.cmake.orig 2012-04-10 20:15:53 UTC --- cmake/modules/FindHUNSPELL.cmake.orig 2012-04-10 20:15:53 UTC
+++ cmake/modules/FindHUNSPELL.cmake +++ cmake/modules/FindHUNSPELL.cmake
@@ -9,7 +9,8 @@ @@ -9,7 +9,9 @@
#Based on examples at http://www.vtk.org/Wiki/CMake:How_To_Find_Libraries #Based on examples at http://www.vtk.org/Wiki/CMake:How_To_Find_Libraries
FIND_PATH(HUNSPELL_INCLUDE_DIR hunspell/hunspell.hxx ) FIND_PATH(HUNSPELL_INCLUDE_DIR hunspell/hunspell.hxx )
-FIND_LIBRARY(HUNSPELL_LIBRARIES NAMES hunspell-1.3 hunspell-1.2 PATHS /opt/local/lib /usr/local/lib /usr/lib ) -FIND_LIBRARY(HUNSPELL_LIBRARIES NAMES hunspell-1.3 hunspell-1.2 PATHS /opt/local/lib /usr/local/lib /usr/lib )
+FIND_LIBRARY(HUNSPELL_LIBRARIES NAMES hunspell-1.5 hunspell-1.4 hunspell-1.3 hunspell-1.2 +FIND_LIBRARY(HUNSPELL_LIBRARIES NAMES hunspell-1.6
+ hunspell-1.5 hunspell-1.4 hunspell-1.3 hunspell-1.2 hunspell
+ PATHS /opt/local/lib /usr/local/lib /usr/lib ) + PATHS /opt/local/lib /usr/local/lib /usr/lib )
INCLUDE(FindPackageHandleStandardArgs) INCLUDE(FindPackageHandleStandardArgs)

View file

@ -3,7 +3,7 @@
PORTNAME= enchant PORTNAME= enchant
PORTVERSION= 1.6.0 PORTVERSION= 1.6.0
PORTREVISION= 6 PORTREVISION= 7
CATEGORIES= textproc gnome CATEGORIES= textproc gnome
MASTER_SITES= http://www.abisource.com/downloads/${PORTNAME}/${PORTVERSION}/ MASTER_SITES= http://www.abisource.com/downloads/${PORTNAME}/${PORTVERSION}/
DIST_SUBDIR= gnome2 DIST_SUBDIR= gnome2
@ -39,7 +39,7 @@ HSPELL_BUILD_DEPENDS= ${LOCALBASE}/lib/libhspell.a:hebrew/hspell
HSPELL_CONFIGURE_ENABLE= hspell HSPELL_CONFIGURE_ENABLE= hspell
HSPELL_CONFIGURE_ON= --with-hspell-prefix=${LOCALBASE} HSPELL_CONFIGURE_ON= --with-hspell-prefix=${LOCALBASE}
HUNSPELL_LIB_DEPENDS= libhunspell-1.5.so:textproc/hunspell HUNSPELL_LIB_DEPENDS= libhunspell-1.6.so:textproc/hunspell
HUNSPELL_CONFIGURE_ENABLE= myspell HUNSPELL_CONFIGURE_ENABLE= myspell
HUNSPELL_CONFIGURE_ON= --with-system-myspell=yes \ HUNSPELL_CONFIGURE_ON= --with-system-myspell=yes \
--with-myspell-dir=${LOCALBASE}/share/hunspell --with-myspell-dir=${LOCALBASE}/share/hunspell

View file

@ -3,7 +3,7 @@
PORTNAME= goldendict PORTNAME= goldendict
PORTVERSION= 1.0.1 PORTVERSION= 1.0.1
PORTREVISION= 9 PORTREVISION= 10
CATEGORIES= textproc CATEGORIES= textproc
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION:C|(.*)\.[0-9]*$|\1|}/ MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION:C|(.*)\.[0-9]*$|\1|}/
DISTNAME= ${PORTNAME}-${PORTVERSION}-src DISTNAME= ${PORTNAME}-${PORTVERSION}-src
@ -13,7 +13,7 @@ COMMENT= Feature-rich Qt4 based dictionary lookup program
LICENSE= GPLv3 LICENSE= GPLv3
LIB_DEPENDS= libhunspell-1.5.so:textproc/hunspell \ LIB_DEPENDS= libhunspell-1.6.so:textproc/hunspell \
libvorbis.so:audio/libvorbis libvorbis.so:audio/libvorbis
NO_WRKSUBDIR= yes NO_WRKSUBDIR= yes

View file

@ -2,22 +2,25 @@
# $FreeBSD$ # $FreeBSD$
PORTNAME= hunspell PORTNAME= hunspell
PORTVERSION= 1.5.4 PORTVERSION= 1.6.0
DISTVERSIONPREFIX= v DISTVERSIONPREFIX= v
CATEGORIES= textproc CATEGORIES= textproc
DIST_SUBDIR= ${PORTNAME}
MAINTAINER= office@FreeBSD.org MAINTAINER= office@FreeBSD.org
COMMENT= Improved spell-checker for Hungarian and other languages COMMENT= Improved spell-checker for Hungarian and other languages
LICENSE= GPLv2 LGPL21 MPL LICENSE= GPLv2+ LGPL21+ MPL
LICENSE_COMB= dual LICENSE_COMB= dual
LICENSE_FILE_LGPL21= ${WRKSRC}/COPYING.LGPL LICENSE_FILE_GPLv2+ = ${_LICENSE_STORE}/GPLv2
LICENSE_FILE_LGPL21+ = ${_LICENSE_STORE}/LGPL21
LICENSE_FILE_MPL= ${WRKSRC}/COPYING.MPL LICENSE_FILE_MPL= ${WRKSRC}/COPYING.MPL
CONFLICTS_INSTALL= tinker-[0-9]* CONFLICTS_INSTALL= tinker-[0-9]*
CONFIGURE_ARGS= --disable-nls ${ICONV_CONFIGURE_ARG} --with-readline --with-ui CONFIGURE_ARGS= --disable-nls ${ICONV_CONFIGURE_ARG} --with-readline --with-ui
GNU_CONFIGURE= yes GNU_CONFIGURE= yes
USES= libtool:keepla pathfix iconv ncurses readline shebangfix perl5 USES= autoreconf libtool:keepla pathfix iconv ncurses \
readline shebangfix perl5
USE_GITHUB= yes USE_GITHUB= yes
SHEBANG_FILES= src/tools/ispellaff2myspell SHEBANG_FILES= src/tools/ispellaff2myspell
USE_LDCONFIG= yes USE_LDCONFIG= yes
@ -29,4 +32,10 @@ PLIST_SUB= SHLIB_VER=${PORTVERSION:R}
post-patch: post-patch:
@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/src/tools/hunspell.cxx @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/src/tools/hunspell.cxx
makepatch-clean:
@${RM} ${WRKSRC}/tests/suggestiontest/Makefile.orig
.include <bsd.port.mk> .include <bsd.port.mk>
# XXX Don't override definition in Mk/bsd.port.mk
makepatch: makepatch-clean

View file

@ -1,3 +1,3 @@
TIMESTAMP = 1480524200 TIMESTAMP = 1482369634
SHA256 (hunspell-hunspell-v1.5.4_GH0.tar.gz) = 852c01a2e3b87eb1f2adb5261466608ba79f1f950202e18a2a1735de5098fc59 SHA256 (hunspell/hunspell-hunspell-v1.6.0_GH0.tar.gz) = 512e7d2ee69dad0b35ca011076405e56e0f10963a02d4859dbcc4faf53ca68e2
SIZE (hunspell-hunspell-v1.5.4_GH0.tar.gz) = 1110858 SIZE (hunspell/hunspell-hunspell-v1.6.0_GH0.tar.gz) = 699377

View file

@ -66,25 +66,3 @@ reverting https://github.com/hunspell/hunspell/commit/dd4b14899bfb
/* morphological functions */ /* 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);

View file

@ -3,13 +3,14 @@
PORTNAME= sonnet PORTNAME= sonnet
PORTVERSION= ${KDE_FRAMEWORKS_VERSION} PORTVERSION= ${KDE_FRAMEWORKS_VERSION}
PORTREVISION= 1
CATEGORIES= textproc kde kde-frameworks CATEGORIES= textproc kde kde-frameworks
MAINTAINER= kde@FreeBSD.org MAINTAINER= kde@FreeBSD.org
COMMENT= KF5 plugin-based spell checking library COMMENT= KF5 plugin-based spell checking library
LIB_DEPENDS= libaspell.so:textproc/aspell \ LIB_DEPENDS= libaspell.so:textproc/aspell \
libhunspell-1.5.so:textproc/hunspell libhunspell-1.6.so:textproc/hunspell
USES= cmake:outsource compiler:c++11-lib kde:5 tar:xz USES= cmake:outsource compiler:c++11-lib kde:5 tar:xz
USE_KDE= ecm USE_KDE= ecm

View file

@ -0,0 +1,12 @@
--- cmake/FindHUNSPELL.cmake.orig 2016-12-03 21:15:34 UTC
+++ cmake/FindHUNSPELL.cmake
@@ -14,7 +14,8 @@ ENDIF (HUNSPELL_INCLUDE_DIR AND HUNSPELL
FIND_PATH(HUNSPELL_INCLUDE_DIR hunspell/hunspell.hxx )
-FIND_LIBRARY(HUNSPELL_LIBRARIES NAMES hunspell-1.5 hunspell-1.4 hunspell-1.3 hunspell-1.2)
+FIND_LIBRARY(HUNSPELL_LIBRARIES NAMES hunspell-1.6
+ hunspell-1.5 hunspell-1.4 hunspell-1.3 hunspell-1.2 hunspell)
# handle the QUIETLY and REQUIRED arguments and set HUNSPELL_FOUND to TRUE if
# all listed variables are TRUE

View file

@ -2,7 +2,7 @@
PORTNAME= mythes PORTNAME= mythes
PORTVERSION= 1.2.4 PORTVERSION= 1.2.4
PORTREVISION= 2 PORTREVISION= 3
CATEGORIES= textproc CATEGORIES= textproc
MASTER_SITES= SF/hunspell/MyThes/${PORTVERSION}/ MASTER_SITES= SF/hunspell/MyThes/${PORTVERSION}/
DIST_SUBDIR= ${PORTNAME} DIST_SUBDIR= ${PORTNAME}
@ -13,7 +13,7 @@ COMMENT= Simple thesaurus library
LICENSE= BSD3CLAUSE LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/COPYING LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libhunspell-1.5.so:textproc/hunspell LIB_DEPENDS= libhunspell-1.6.so:textproc/hunspell
USES= libtool pathfix perl5 pkgconfig shebangfix USES= libtool pathfix perl5 pkgconfig shebangfix
USE_LDCONFIG= yes USE_LDCONFIG= yes

View file

@ -3,6 +3,7 @@
PORTNAME= hunspell PORTNAME= hunspell
PORTVERSION= 0.4.1 PORTVERSION= 0.4.1
PORTREVISION= 1
CATEGORIES= textproc devel python CATEGORIES= textproc devel python
MASTER_SITES= CHEESESHOP MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
@ -18,7 +19,7 @@ USES?= python
USES+= localbase USES+= localbase
USE_PYTHON= distutils USE_PYTHON= distutils
HSPLVER= 1.5 HSPLVER= 1.6
PLIST_FILES= %%PYTHON_SITELIBDIR%%/hunspell.so PLIST_FILES= %%PYTHON_SITELIBDIR%%/hunspell.so
pre-configure: pre-configure:

View file

@ -3,7 +3,7 @@
PORTNAME= sigil PORTNAME= sigil
PORTVERSION= 0.9.7 PORTVERSION= 0.9.7
PORTREVISION= 2 PORTREVISION= 3
CATEGORIES= textproc CATEGORIES= textproc
MAINTAINER= ports@FreeBSD.org MAINTAINER= ports@FreeBSD.org
@ -13,7 +13,7 @@ LICENSE= GPLv3+
LIB_DEPENDS= libminizip.so:archivers/minizip \ LIB_DEPENDS= libminizip.so:archivers/minizip \
libpcre.so:devel/pcre \ libpcre.so:devel/pcre \
libhunspell-1.5.so:textproc/hunspell libhunspell-1.6.so:textproc/hunspell
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py3-lxml RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py3-lxml
USE_GITHUB= yes USE_GITHUB= yes
@ -32,7 +32,7 @@ CMAKE_ARGS= -DUSE_SYSTEM_LIBS:BOOL=1 \
-DINSTALL_BUNDLED_DICTS:BOOL=0 -DINSTALL_BUNDLED_DICTS:BOOL=0
USE_LDCONFIG= ${PREFIX}/lib/sigil USE_LDCONFIG= ${PREFIX}/lib/sigil
# Upstream uses pkg-config output to pass libhunspell-1.5.so and # Upstream uses pkg-config output to pass libhunspell-1.6.so and
# libpcre16.so to the linker. pkg-config output does not include full # libpcre16.so to the linker. pkg-config output does not include full
# paths, so add a workaround to keep the port linking for now. # paths, so add a workaround to keep the port linking for now.
LDFLAGS+= -L${LOCALBASE}/lib LDFLAGS+= -L${LOCALBASE}/lib

View file

@ -2,7 +2,7 @@
PORTNAME= hunspell PORTNAME= hunspell
DISTVERSION= 0.01-2 DISTVERSION= 0.01-2
PORTREVISION= 2 PORTREVISION= 3
CATEGORIES= textproc CATEGORIES= textproc
MASTER_SITES= GNU/aspell/dict/te MASTER_SITES= GNU/aspell/dict/te
PKGNAMEPREFIX= te- PKGNAMEPREFIX= te-

View file

@ -4,7 +4,7 @@
PORTNAME= firefox PORTNAME= firefox
DISTVERSION= 45.6.0 DISTVERSION= 45.6.0
DISTVERSIONSUFFIX=esr.source DISTVERSIONSUFFIX=esr.source
PORTREVISION= 3 PORTREVISION= 4
PORTEPOCH= 1 PORTEPOCH= 1
CATEGORIES= www ipv6 CATEGORIES= www ipv6
MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}esr/source \ MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}esr/source \

View file

@ -4,7 +4,7 @@
PORTNAME= firefox PORTNAME= firefox
DISTVERSION= 50.1.0 DISTVERSION= 50.1.0
DISTVERSIONSUFFIX=.source DISTVERSIONSUFFIX=.source
PORTREVISION= 4 PORTREVISION= 5
PORTEPOCH= 1 PORTEPOCH= 1
CATEGORIES= www ipv6 CATEGORIES= www ipv6
MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \

View file

@ -3,7 +3,7 @@
PORTNAME= libxul PORTNAME= libxul
DISTVERSION= 45.6.0 DISTVERSION= 45.6.0
PORTREVISION= 3 PORTREVISION= 4
CATEGORIES?= www devel CATEGORIES?= www devel
MASTER_SITES= MOZILLA/firefox/releases/${DISTVERSION}esr/source \ MASTER_SITES= MOZILLA/firefox/releases/${DISTVERSION}esr/source \
MOZILLA/firefox/candidates/${DISTVERSION}esr-candidates/build1/source MOZILLA/firefox/candidates/${DISTVERSION}esr-candidates/build1/source

View file

@ -3,6 +3,7 @@
PORTNAME= otter-browser PORTNAME= otter-browser
PORTVERSION= 0.9.12 PORTVERSION= 0.9.12
DISTVERSIONPREFIX= v DISTVERSIONPREFIX= v
PORTREVISION= 1
CATEGORIES= www CATEGORIES= www
MAINTAINER= kde@FreeBSD.org MAINTAINER= kde@FreeBSD.org
@ -11,7 +12,7 @@ COMMENT= Browser based on Qt 5
LICENSE= GPLv3 LICENSE= GPLv3
LICENSE_FILE= ${WRKSRC}/COPYING LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libhunspell-1.5.so:textproc/hunspell LIB_DEPENDS= libhunspell-1.6.so:textproc/hunspell
USES= cmake:outsource compiler:c++11-lib desktop-file-utils USES= cmake:outsource compiler:c++11-lib desktop-file-utils
USE_QT5= concurrent core dbus gui multimedia network printsupport \ USE_QT5= concurrent core dbus gui multimedia network printsupport \

View file

@ -2,7 +2,7 @@
PORTNAME= qupzilla PORTNAME= qupzilla
PORTVERSION= 1.8.9 PORTVERSION= 1.8.9
PORTREVISION= 1 PORTREVISION= 2
CATEGORIES= www CATEGORIES= www
MASTER_SITES= https://github.com/QupZilla/${PORTNAME}/releases/download/v${PORTVERSION}/ MASTER_SITES= https://github.com/QupZilla/${PORTNAME}/releases/download/v${PORTVERSION}/
PKGNAMESUFFIX= -qt4 PKGNAMESUFFIX= -qt4
@ -13,7 +13,7 @@ COMMENT= Web browser based on WebKit engine and Qt Framework
LICENSE= GPLv3 LICENSE= GPLv3
LIB_DEPENDS= libhunspell-1.5.so:textproc/hunspell LIB_DEPENDS= libhunspell-1.6.so:textproc/hunspell
CONFLICTS_INSTALL= ${PORTNAME}-qt5* CONFLICTS_INSTALL= ${PORTNAME}-qt5*

View file

@ -2,7 +2,7 @@
PORTNAME= qupzilla PORTNAME= qupzilla
PORTVERSION= 1.8.9 PORTVERSION= 1.8.9
PORTREVISION= 1 PORTREVISION= 2
CATEGORIES= www CATEGORIES= www
MASTER_SITES= https://github.com/QupZilla/${PORTNAME}/releases/download/v${PORTVERSION}/ MASTER_SITES= https://github.com/QupZilla/${PORTNAME}/releases/download/v${PORTVERSION}/
PKGNAMESUFFIX= -qt5 PKGNAMESUFFIX= -qt5
@ -13,7 +13,7 @@ COMMENT= Web browser based on WebKit engine and Qt Framework
LICENSE= GPLv3 LICENSE= GPLv3
LIB_DEPENDS= libhunspell-1.5.so:textproc/hunspell LIB_DEPENDS= libhunspell-1.6.so:textproc/hunspell
CONFLICTS_INSTALL= ${PORTNAME}-qt4* CONFLICTS_INSTALL= ${PORTNAME}-qt4*

View file

@ -4,7 +4,7 @@
PORTNAME= seamonkey PORTNAME= seamonkey
DISTVERSION= 2.46 DISTVERSION= 2.46
MOZILLA_VER= 49 # above + 3 MOZILLA_VER= 49 # above + 3
PORTREVISION= 2 PORTREVISION= 3
CATEGORIES?= www mail news editors irc ipv6 CATEGORIES?= www mail news editors irc ipv6
MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \
MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build9/source MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build9/source

View file

@ -0,0 +1,12 @@
--- cmake/modules/FindHUNSPELL.cmake.orig 2015-06-26 03:14:18 UTC
+++ cmake/modules/FindHUNSPELL.cmake
@@ -14,7 +14,8 @@ ENDIF (HUNSPELL_INCLUDE_DIR AND HUNSPELL
FIND_PATH(HUNSPELL_INCLUDE_DIR hunspell/hunspell.hxx )
-FIND_LIBRARY(HUNSPELL_LIBRARIES NAMES hunspell-2.0 hunspell-1.5 hunspell-1.4 hunspell-1.3 hunspell-1.2)
+FIND_LIBRARY(HUNSPELL_LIBRARIES NAMES hunspell-2.0 hunspell-1.6
+ hunspell-1.5 hunspell-1.4 hunspell-1.3 hunspell-1.2 hunspell)
# handle the QUIETLY and REQUIRED arguments and set HUNSPELL_FOUND to TRUE if
# all listed variables are TRUE

View file

@ -3,7 +3,7 @@
PORTNAME= leechcraft PORTNAME= leechcraft
PORTVERSION= 0.6.70 PORTVERSION= 0.6.70
PORTREVISION= 18 PORTREVISION= 19
CATEGORIES= x11 CATEGORIES= x11
MASTER_SITES= http://dist.leechcraft.org/LeechCraft/0.6.70/ 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_DESC= Spellchecking support
ROSENTHAL_CMAKE_ON= -DENABLE_ROSENTHAL:BOOL=true ROSENTHAL_CMAKE_ON= -DENABLE_ROSENTHAL:BOOL=true
ROSENTHAL_CMAKE_OFF= -DENABLE_ROSENTHAL:BOOL=false ROSENTHAL_CMAKE_OFF= -DENABLE_ROSENTHAL:BOOL=false
ROSENTHAL_LIB_DEPENDS= libhunspell-1.5.so:textproc/hunspell ROSENTHAL_LIB_DEPENDS= libhunspell-1.6.so:textproc/hunspell
SB2_DESC= Sidebar for LeechCraft with combined launcher and tab switcher SB2_DESC= Sidebar for LeechCraft with combined launcher and tab switcher
SB2_CMAKE_ON= -DENABLE_SB2:BOOL=true SB2_CMAKE_ON= -DENABLE_SB2:BOOL=true

View file

@ -5,7 +5,7 @@
endif () endif ()
-find_library (HUNSPELL_LIBRARIES NAMES hunspell-1.3 hunspell-1.2 libhunspell HINTS ${HUNSPELL_DIR} ${PROBE_DIR}) -find_library (HUNSPELL_LIBRARIES NAMES hunspell-1.3 hunspell-1.2 libhunspell HINTS ${HUNSPELL_DIR} ${PROBE_DIR})
+find_library (HUNSPELL_LIBRARIES NAMES hunspell-1.5 hunspell-1.4 +find_library (HUNSPELL_LIBRARIES NAMES hunspell-1.6 hunspell-1.5 hunspell-1.4
+ hunspell-1.3 hunspell-1.2 libhunspell HINTS ${HUNSPELL_DIR} ${PROBE_DIR}) + hunspell-1.3 hunspell-1.2 libhunspell HINTS ${HUNSPELL_DIR} ${PROBE_DIR})
find_path (HUNSPELL_INCLUDE_DIR hunspell/hunspell.hxx HINTS ${HUNSPELL_DIR} ${HUNSPELL_INCLUDE_WIN32}) find_path (HUNSPELL_INCLUDE_DIR hunspell/hunspell.hxx HINTS ${HUNSPELL_DIR} ${HUNSPELL_INCLUDE_WIN32})