On Wed, Mar 08, 2017 at 10:17:36PM +0100, Landry Breuil wrote:
> Hi,
> 
> firefox 53beta updated its internal copy of hunspell to 1.5.4, and to
> 1.6.0 in 54/55. So it fails to build using --with-system-hunspell - out
> 1.3.2 version is from 2011. I gave a quick shot at updating it, and
> here's the WIP as a starting point:
> 
> - --enable-nls=no is gross, but otherwise potfiles arent build under po/
>   - to investigate
> - fetch the source from github, the stuff on sourceforge isnt updated
>   anymore, homepage moved to github too. Sad thing is that ./configure
> isnt generated anymore, so we have to run the autofuckery, and maybe
> that's why it messes up the gettext shit.
> - update patches, point at LO 4 wordlist

And here's 1.6.1, i still disable NLS (freebsd does the same in their
ports), all tests pass, and a bulk with it is ongoing. kde4/libs needs a
patch for a cmake module, all ports using it need a wantlib fix; but so
far so good.

ok's welcome.

Landry
Index: Makefile
===================================================================
RCS file: /cvs/ports/textproc/hunspell/Makefile,v
retrieving revision 1.13
diff -u -r1.13 Makefile
--- Makefile    11 Mar 2016 20:28:32 -0000      1.13
+++ Makefile    8 Apr 2017 17:28:02 -0000
@@ -2,14 +2,17 @@
 
 COMMENT =      spelling, stemming, morphological analysis and generation
 
-DISTNAME =     hunspell-1.3.2
-REVISION =     2
 
-SHARED_LIBS =  hunspell-1.3    0.0 #   .0.0
+GH_ACCOUNT =   hunspell
+GH_PROJECT =   hunspell
+GH_TAGNAME =   v1.6.1
+DISTNAME =     hunspell-1.6.1
+
+SHARED_LIBS =  hunspell-1.6    0.0 #   .0.0
 
 CATEGORIES =   textproc
 
-HOMEPAGE =     http://hunspell.sourceforge.net/
+HOMEPAGE =     http://hunspell.github.io/
 
 MAINTAINER =   Edd Barrett <[email protected]>
 
@@ -18,14 +21,20 @@
 
 WANTLIB += c m ncurses ncursesw readline stdc++
 
-MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=hunspell/}
-
 MODULES =              devel/gettext
 
+AUTOCONF_VERSION=      2.69
+AUTOMAKE_VERSION=      1.15
+
+BUILD_DEPENDS =        ${MODGNU_AUTOCONF_DEPENDS} \
+               ${MODGNU_AUTOMAKE_DEPENDS} \
+               devel/libtool
+
 CONFIGURE_STYLE =      gnu
 CONFIGURE_ENV=         CPPFLAGS="-I${LOCALBASE}/include" \
                        LDFLAGS="-L${LOCALBASE}/lib 
-L${WRKBUILD}/src/hunspell/.libs"
 CONFIGURE_ARGS =       --with-ui \
+                       --disable-nls \
                        --with-readline
 
 # default dictionary
@@ -38,6 +47,10 @@
                ${WRKSRC}/src/tools/hunspell.cxx \
                ${WRKSRC}/man/hu/hunspell.1 \
                ${WRKSRC}/man/hunspell.1
+       cd ${WRKSRC} && env ${MAKE_ENV} \
+               AUTOCONF_VERSION=${AUTOCONF_VERSION} \
+               AUTOMAKE_VERSION=${AUTOMAKE_VERSION} \
+               autoreconf -vif
 
 post-install:
        ${INSTALL_DATA_DIR} ${PREFIX}/share/hunspell
Index: distinfo
===================================================================
RCS file: /cvs/ports/textproc/hunspell/distinfo,v
retrieving revision 1.3
diff -u -r1.3 distinfo
--- distinfo    21 Mar 2013 08:57:49 -0000      1.3
+++ distinfo    8 Apr 2017 17:28:02 -0000
@@ -1,2 +1,2 @@
-SHA256 (hunspell-1.3.2.tar.gz) = tO3UpO6UTLn0hbNUc+Rrcp7XaOnSTajnjkxMbKVq3b0=
-SIZE (hunspell-1.3.2.tar.gz) = 975917
+SHA256 (hunspell-1.6.1.tar.gz) = MPWTczxQt5QBa7A9Mf0qIHHkYQxvpHCOM+2tIzUQLEk=
+SIZE (hunspell-1.6.1.tar.gz) = 706893
Index: patches/patch-man_hu_hunspell_1
===================================================================
RCS file: /cvs/ports/textproc/hunspell/patches/patch-man_hu_hunspell_1,v
retrieving revision 1.2
diff -u -r1.2 patch-man_hu_hunspell_1
--- patches/patch-man_hu_hunspell_1     14 Nov 2010 14:25:23 -0000      1.2
+++ patches/patch-man_hu_hunspell_1     8 Apr 2017 17:28:02 -0000
@@ -1,40 +1,40 @@
 $OpenBSD: patch-man_hu_hunspell_1,v 1.2 2010/11/14 14:25:23 sthen Exp $
---- man/hu/hunspell.1.orig     Tue Feb 23 10:08:52 2010
-+++ man/hu/hunspell.1  Sat Sep 25 11:39:53 2010
+--- man/hu/hunspell.1.orig     Sat Mar 25 22:20:45 2017
++++ man/hu/hunspell.1  Sat Apr  8 19:13:44 2017
 @@ -65,12 +65,12 @@ a javaslattevést). Az első szótár mindig alapszót
  .PP
  Az alapértelmezett szótár a környezet nyelvi beállításától függ
  az Unix rendszereken. Locale hiányában a
 -.BR /usr/share/hunspell/default
-+.BR ${PREFIX}/share/hunspell/default
++.BR ${LOCALBASE}/share/hunspell/default
  az alapértelmezett szótár. 
  .PP
  A megadott útvonal lehet abszolút és relatív is. Relatív
  útvonal esetén először az aktuális, majd a
 -.BR /usr/share/hunspell
-+.BR ${PREFIX}/share/hunspell
++.BR ${LOCALBASE}/share/hunspell
  és még több más könyvtárban keresi a szótárt a program. L. \-D és a
  .BR PÉLDÁK.
  .TP
-@@ -307,7 +307,7 @@ macka
+@@ -317,7 +317,7 @@ macka
  .TP
  .B hunspell \-d en_US english.html
  Az amerikai angol helyesírási szótár kiválasztása (aktuális, vagy a
 -.BR /usr/share/hunspell
-+.BR ${PREFIX}/share/hunspell
++.BR ${LOCALBASE}/share/hunspell
  könyvtárból.
  .TP
- .B hunspell \-d /opt/OpenOffice.org1.0.1/share/dict/ooo/de_DE
-@@ -335,10 +335,10 @@ A saját szótár helyének megadására szolgál. Sze
+ .B hunspell -l szöveg.html
+@@ -347,10 +347,10 @@ A saját szótár helyének megadására szolgál. Sze
  .I \-p
  kapcsolóval.
  .SH ÁLLOMÁNYOK
 -.BI /usr/share/default.aff
-+.BI ${PREFIX}/share/default.aff
++.BI ${LOCALBASE}/share/default.aff
  Az alapértelmezett ragozási táblázat. Lásd hunspell(4).
  .PP
 -.BI /usr/share/default.dic
-+.BI ${PREFIX}/share/default.dic
++.BI ${LOCALBASE}/share/default.dic
  Az alapértelmezett szótár az előző ragozási táblázathoz.
  Lásd hunspell(4).
  .BI $HOME/.hunspell_default
Index: patches/patch-man_hunspell_1
===================================================================
RCS file: /cvs/ports/textproc/hunspell/patches/patch-man_hunspell_1,v
retrieving revision 1.3
diff -u -r1.3 patch-man_hunspell_1
--- patches/patch-man_hunspell_1        21 Mar 2013 08:57:49 -0000      1.3
+++ patches/patch-man_hunspell_1        8 Apr 2017 17:28:02 -0000
@@ -1,16 +1,16 @@
 $OpenBSD: patch-man_hunspell_1,v 1.3 2013/03/21 08:57:49 fgsch Exp $
---- man/hunspell.1.orig        Fri Jan 21 16:53:05 2011
-+++ man/hunspell.1     Tue Mar  5 20:17:54 2013
-@@ -369,10 +369,10 @@ following environment variables are searched: LC_ALL,
+--- man/hunspell.1.orig        Sat Mar 25 22:20:45 2017
++++ man/hunspell.1     Sat Apr  8 19:13:44 2017
+@@ -394,10 +394,10 @@ following environment variables are searched: LC_ALL,
  LC_MESSAGES, and LANG. If none are set then the following
  fallbacks are used:
  
 -.BI /usr/share/myspell/default.aff
-+.BI ${PREFIX}/share/myspell/default.aff
- Path of default affix file. See hunspell(4).
++.BI ${LOCALBASE}/share/myspell/default.aff
+ Path of default affix file. See hunspell(5).
  .PP
 -.BI /usr/share/myspell/default.dic
-+.BI ${PREFIX}/share/myspell/default.dic
++.BI ${LOCALBASE}/share/myspell/default.dic
  Path of default dictionary file.
- See hunspell(4).
+ See hunspell(5).
  .PP
Index: patches/patch-src_tools_hunspell_cxx
===================================================================
RCS file: /cvs/ports/textproc/hunspell/patches/patch-src_tools_hunspell_cxx,v
retrieving revision 1.3
diff -u -r1.3 patch-src_tools_hunspell_cxx
--- patches/patch-src_tools_hunspell_cxx        21 Mar 2013 08:57:49 -0000      
1.3
+++ patches/patch-src_tools_hunspell_cxx        8 Apr 2017 17:28:02 -0000
@@ -1,38 +1,38 @@
 $OpenBSD: patch-src_tools_hunspell_cxx,v 1.3 2013/03/21 08:57:49 fgsch Exp $
---- src/tools/hunspell.cxx.orig        Fri Jan 21 17:01:29 2011
-+++ src/tools/hunspell.cxx     Tue Mar  5 22:56:02 2013
-@@ -61,28 +61,14 @@
- #include "firstparser.hxx"
+--- src/tools/hunspell.cxx.orig        Sat Mar 25 22:20:45 2017
++++ src/tools/hunspell.cxx     Sat Apr  8 19:17:14 2017
+@@ -116,28 +116,14 @@
+ #include "odfparser.hxx"
  
- #define LIBDIR \
--    "/usr/share/hunspell:" \
--    "/usr/share/myspell:" \
--    "/usr/share/myspell/dicts:" \
--    "/Library/Spelling"
-+    "${PREFIX}/share/hunspell:" \
-+    "${LOCALBASE}/share/myspell:" \
-+    "${LOCALBASE}/share/myspell/dicts:" \
-+    "${LOCALBASE}/share/mozilla-dicts"
- #define USEROOODIR \
--    ".openoffice.org/3/user/wordbook:" \
--    ".openoffice.org2/user/wordbook:" \
--    ".openoffice.org2.0/user/wordbook:" \
--    "Library/Spelling"
-+    ".config/libreoffice/3/user/wordbook"
- #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"
-+    "${LOCALBASE}/lib/libreoffice/share/wordbook"
+ #define LIBDIR                \
+-  "/usr/share/hunspell:"      \
+-  "/usr/share/myspell:"       \
+-  "/usr/share/myspell/dicts:" \
+-  "/Library/Spelling"
++  "${LOCALBASE}/share/hunspell:" \
++  "${LOCALBASE}/share/myspell:" \
++  "${LOCALBASE}/share/myspell/dicts:" \
++  "${LOCALBASE}/share/mozilla-dicts"
+ #define USEROOODIR {                  \
+-  ".openoffice.org/3/user/wordbook", \
+-  ".openoffice.org2/user/wordbook",  \
+-  ".openoffice.org2.0/user/wordbook",\
+-  "Library/Spelling" }
++  ".config/libreoffice/4/user/wordbook" }
+ #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"
++  "${LOCALBASE}/lib/libreoffice/share/wordbook"
  #define HOME getenv("HOME")
  #define DICBASENAME ".hunspell_"
  #define LOGFILE "/tmp/hunspell.log"
Index: patches/patch-tests_test_sh
===================================================================
RCS file: /cvs/ports/textproc/hunspell/patches/patch-tests_test_sh,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 patch-tests_test_sh
--- patches/patch-tests_test_sh 13 Jun 2009 07:48:53 -0000      1.1.1.1
+++ patches/patch-tests_test_sh 8 Apr 2017 17:28:02 -0000
@@ -1,9 +1,9 @@
 $OpenBSD: patch-tests_test_sh,v 1.1.1.1 2009/06/13 07:48:53 ajacoutot Exp $
---- tests/test.sh.orig Fri Jun  5 17:37:50 2009
-+++ tests/test.sh      Fri Jun  5 17:37:58 2009
+--- tests/test.sh.orig Sat Mar 25 22:20:45 2017
++++ tests/test.sh      Sat Apr  8 19:25:56 2017
 @@ -1,4 +1,4 @@
 -#!/bin/bash
 +#!${LOCALBASE}/bin/bash
- export LC_ALL="C"
- 
- function check_valgrind_log () {
+ # ***** BEGIN LICENSE BLOCK *****
+ # Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ #
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/textproc/hunspell/pkg/PLIST,v
retrieving revision 1.4
diff -u -r1.4 PLIST
--- pkg/PLIST   22 May 2015 11:31:18 -0000      1.4
+++ pkg/PLIST   8 Apr 2017 17:28:02 -0000
@@ -12,41 +12,25 @@
 bin/wordforms
 bin/wordlist2hunspell
 include/hunspell/
-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 lib/libhunspell-1.3.so.${LIBhunspell-1.3_VERSION}
-lib/libparsers.a
+lib/libhunspell-1.6.a
+lib/libhunspell-1.6.la
+@lib lib/libhunspell-1.6.so.${LIBhunspell-1.6_VERSION}
 lib/pkgconfig/hunspell.pc
 man/hu/
 man/hu/man1/
 @man man/hu/man1/hunspell.1
-man/hu/man4/
-@man man/hu/man4/hunspell.4
 @man man/man1/hunspell.1
 @man man/man1/hunzip.1
 @man man/man1/hzip.1
 @man man/man3/hunspell.3
-@man man/man4/hunspell.4
+@man man/man5/hunspell.5
 share/hunspell/
 share/hunspell/default.aff
 share/hunspell/default.dic
-share/locale/hu/LC_MESSAGES/hunspell.mo
-share/locale/it/LC_MESSAGES/hunspell.mo

Reply via email to