Index: head/textproc/hunspell/Makefile =================================================================== --- head/textproc/hunspell/Makefile (revision 437003) +++ head/textproc/hunspell/Makefile (revision 437004) @@ -1,41 +1,41 @@ # Created by: janos.mohacsi@bsd.hu # $FreeBSD$ PORTNAME= hunspell -PORTVERSION= 1.6.0 +PORTVERSION= 1.6.1 DISTVERSIONPREFIX= v CATEGORIES= textproc DIST_SUBDIR= ${PORTNAME} MAINTAINER= office@FreeBSD.org COMMENT= Improved spell-checker for Hungarian and other languages LICENSE= GPLv2+ LGPL21+ MPL LICENSE_COMB= dual LICENSE_FILE_GPLv2+ = ${_LICENSE_STORE}/GPLv2 LICENSE_FILE_LGPL21+ = ${_LICENSE_STORE}/LGPL21 LICENSE_FILE_MPL= ${WRKSRC}/COPYING.MPL CONFLICTS_INSTALL= tinker-[0-9]* CONFIGURE_ARGS= --disable-nls ${ICONV_CONFIGURE_ARG} --with-readline --with-ui GNU_CONFIGURE= yes USES= autoreconf 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 makepatch-clean: @${RM} ${WRKSRC}/tests/suggestiontest/Makefile.orig .include # XXX Don't override definition in Mk/bsd.port.mk makepatch: makepatch-clean Index: head/textproc/hunspell/distinfo =================================================================== --- head/textproc/hunspell/distinfo (revision 437003) +++ head/textproc/hunspell/distinfo (revision 437004) @@ -1,3 +1,3 @@ -TIMESTAMP = 1482369634 -SHA256 (hunspell/hunspell-hunspell-v1.6.0_GH0.tar.gz) = 512e7d2ee69dad0b35ca011076405e56e0f10963a02d4859dbcc4faf53ca68e2 -SIZE (hunspell/hunspell-hunspell-v1.6.0_GH0.tar.gz) = 699377 +TIMESTAMP = 1490542682 +SHA256 (hunspell/hunspell-hunspell-v1.6.1_GH0.tar.gz) = 30f593733c50b794016bb03d31fd2a2071e4610c6fa4708e33edad2335102c49 +SIZE (hunspell/hunspell-hunspell-v1.6.1_GH0.tar.gz) = 706893 Index: head/textproc/hunspell/files/patch-src_tools_hunspell.cxx =================================================================== --- head/textproc/hunspell/files/patch-src_tools_hunspell.cxx (revision 437003) +++ head/textproc/hunspell/files/patch-src_tools_hunspell.cxx (revision 437004) @@ -1,48 +1,47 @@ ---- src/tools/hunspell.cxx.orig 2016-11-28 10:34:55 UTC +--- src/tools/hunspell.cxx.orig 2017-03-25 21:20:45 UTC +++ src/tools/hunspell.cxx -@@ -112,28 +112,23 @@ +@@ -115,29 +115,23 @@ + #include "xmlparser.hxx" #include "odfparser.hxx" - #define LIBDIR \ +-#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 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" -+ "%%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 \ -+ "%%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 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" Index: head/textproc/hunspell/pkg-plist =================================================================== --- head/textproc/hunspell/pkg-plist (revision 437003) +++ head/textproc/hunspell/pkg-plist (revision 437004) @@ -1,31 +1,31 @@ bin/affixcompress bin/analyze bin/chmorph bin/hunspell bin/hunzip bin/hzip bin/ispellaff2myspell bin/makealias bin/munch bin/unmunch bin/wordforms bin/wordlist2hunspell 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-%%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.0 +lib/libhunspell-%%SHLIB_VER%%.so.0.0.1 libdata/pkgconfig/hunspell.pc man/hu/man1/hunspell.1.gz man/man1/hunspell.1.gz man/man1/hunzip.1.gz man/man1/hzip.1.gz man/man3/hunspell.3.gz man/man5/hunspell.5.gz