On Fri, Jun 25, 2010 at 10:31:20AM +0200, LEVAI Daniel wrote:
> On Fri, Jun 25, 2010 at 09:03:22 +0100, Edd Barrett wrote:
> > On Fri, Jun 25, 2010 at 07:49:25AM +0200, Antoine Jacoutot wrote:
> > Not intentionally. Looks like a ran 'make update-patches' at the wrong time.
> >
> > I will make a new diff - sorry, that sucked.
>
> Nevertheless I've tested it, and it doesn't segfault when specifying a
> file to check.
OK Good.
>
> Only thing I've noticed so far is when I use the Hungarian dictionary
> from the mozzila-dicts-hu package, hunspell writes these messages:
>
> $ hunspell -d hu textfile
> error: line 214289: bad flagvector
I don't know what this means, but will take a look. Do you have any idea aja?
In the meanwhile, here is a new diff with aja's observations corrected:
Index: Makefile
===================================================================
RCS file: /cvs/ports/textproc/hunspell/Makefile,v
retrieving revision 1.2
diff -u -p -u -r1.2 Makefile
--- Makefile 11 Oct 2009 14:06:20 -0000 1.2
+++ Makefile 25 Jun 2010 08:57:53 -0000
@@ -2,8 +2,7 @@
COMMENT = spelling, stemming, morphological analysis and generation
-DISTNAME = hunspell-1.2.8
-PKGNAME = ${DISTNAME}p0
+DISTNAME = hunspell-1.2.11
SHARED_LIBS = hunspell-1.2 0.0 # .0.0
@@ -27,7 +26,7 @@ MODULES = devel/gettext
CONFIGURE_STYLE = gnu
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+ LDFLAGS="-L${LOCALBASE}/lib
-L${WRKBUILD}/src/hunspell/.libs"
CONFIGURE_ARGS = ${CONFIGURE_SHARED} \
--with-ui \
--with-readline
Index: distinfo
===================================================================
RCS file: /cvs/ports/textproc/hunspell/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -u -r1.1.1.1 distinfo
--- distinfo 13 Jun 2009 07:48:53 -0000 1.1.1.1
+++ distinfo 25 Jun 2010 08:57:53 -0000
@@ -1,5 +1,5 @@
-MD5 (hunspell-1.2.8.tar.gz) = EXevVKCeMg0sJAFfKcOpPg==
-RMD160 (hunspell-1.2.8.tar.gz) = 5P055frfltoTEfKqcWPsF+rPD4M=
-SHA1 (hunspell-1.2.8.tar.gz) = 6qdvgvzwhnjkn3owr9qiaLzHUjU=
-SHA256 (hunspell-1.2.8.tar.gz) = r1Y+E2RmIOYIBStGl04Q0Pw+TUixuZb5dxy/rG38PDg=
-SIZE (hunspell-1.2.8.tar.gz) = 784360
+MD5 (hunspell-1.2.11.tar.gz) = j1fNxNsJHWnh9oLtTYqygg==
+RMD160 (hunspell-1.2.11.tar.gz) = +meiQTGouk2c39W07Pucco+D/iM=
+SHA1 (hunspell-1.2.11.tar.gz) = CvfPk6mRR5BwW2cEZNL5WkvqY0E=
+SHA256 (hunspell-1.2.11.tar.gz) = P5dcBW4OiIOzjr518Eoy45g+qdlRr6A1GBgGsHDQbpM=
+SIZE (hunspell-1.2.11.tar.gz) = 926658
Index: patches/patch-man_hu_hunspell_1
===================================================================
RCS file: /cvs/ports/textproc/hunspell/patches/patch-man_hu_hunspell_1,v
retrieving revision 1.1.1.1
diff -u -p -u -r1.1.1.1 patch-man_hu_hunspell_1
--- patches/patch-man_hu_hunspell_1 13 Jun 2009 07:48:53 -0000 1.1.1.1
+++ patches/patch-man_hu_hunspell_1 25 Jun 2010 08:57:53 -0000
@@ -1,6 +1,6 @@
$OpenBSD: patch-man_hu_hunspell_1,v 1.1.1.1 2009/06/13 07:48:53 ajacoutot Exp $
---- man/hu/hunspell.1.orig Mon May 26 11:42:10 2008
-+++ man/hu/hunspell.1 Fri Jun 5 20:41:01 2009
+--- man/hu/hunspell.1.orig Tue Feb 23 09:08:52 2010
++++ man/hu/hunspell.1 Fri Jun 25 09:56:36 2010
@@ -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
Index: patches/patch-man_hunspell_1
===================================================================
RCS file: /cvs/ports/textproc/hunspell/patches/patch-man_hunspell_1,v
retrieving revision 1.1.1.1
diff -u -p -u -r1.1.1.1 patch-man_hunspell_1
--- patches/patch-man_hunspell_1 13 Jun 2009 07:48:53 -0000 1.1.1.1
+++ patches/patch-man_hunspell_1 25 Jun 2010 08:57:53 -0000
@@ -1,10 +1,10 @@
-$OpenBSD: patch-man_hunspell_1,v 1.1.1.1 2009/06/13 07:48:53 ajacoutot Exp $
---- man/hunspell.1.orig Fri Jun 5 20:03:16 2009
-+++ man/hunspell.1 Fri Jun 5 20:04:20 2009
-@@ -360,10 +360,10 @@ Dictionary path.
- Equivalent to
- .I \-p.
- .SH FILES
+$OpenBSD$
+--- man/hunspell.1.orig Thu Jun 24 20:23:47 2010
++++ man/hunspell.1 Thu Jun 24 20:24:53 2010
+@@ -366,10 +366,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).
Index: patches/patch-src_tools_hunspell_cxx
===================================================================
RCS file: /cvs/ports/textproc/hunspell/patches/patch-src_tools_hunspell_cxx,v
retrieving revision 1.1.1.1
diff -u -p -u -r1.1.1.1 patch-src_tools_hunspell_cxx
--- patches/patch-src_tools_hunspell_cxx 13 Jun 2009 07:48:53 -0000
1.1.1.1
+++ patches/patch-src_tools_hunspell_cxx 25 Jun 2010 08:57:53 -0000
@@ -1,7 +1,7 @@
-$OpenBSD: patch-src_tools_hunspell_cxx,v 1.1.1.1 2009/06/13 07:48:53 ajacoutot
Exp $
---- src/tools/hunspell.cxx.orig Thu Sep 4 15:44:19 2008
-+++ src/tools/hunspell.cxx Fri Jun 5 20:47:05 2009
-@@ -63,25 +63,16 @@
+$OpenBSD$
+--- src/tools/hunspell.cxx.orig Fri Apr 16 12:44:16 2010
++++ src/tools/hunspell.cxx Fri Jun 25 09:57:31 2010
+@@ -61,26 +61,18 @@
#include "firstparser.hxx"
#define LIBDIR \
@@ -13,10 +13,9 @@ $OpenBSD: patch-src_tools_hunspell_cxx,v
+ "${LOCALBASE}/share/myspell/dicts:" \
+ "${LOCALBASE}/share/mozilla-dicts"
#define USEROOODIR \
-- ".openoffice.org2/user/wordbook:" \
-- ".openoffice.org2.0/user/wordbook"
-+ ".openoffice.org/3/user/wordbook:" \
-+ ".openoffice.org2/user/wordbook"
+ ".openoffice.org/3/user/wordbook:" \
+ ".openoffice.org2/user/wordbook:" \
+ ".openoffice.org2.0/user/wordbook"
#define OOODIR \
- "/opt/openoffice.org/basis3.0/share/dict/ooo:" \
- "/usr/lib/openoffice.org/basis3.0/share/dict/ooo:" \
@@ -32,15 +31,25 @@ $OpenBSD: patch-src_tools_hunspell_cxx,v
- "/usr/lib/openoffice.org2.0/share/dict/ooo"
+ "${LOCALBASE}/openoffice.org3/share/extension/install:" \
+ "${LOCALBASE}/openoffice/share/dict/ooo"
++
#define HOME getenv("HOME")
#define DICBASENAME ".hunspell_"
#define LOGFILE "/tmp/hunspell.log"
-@@ -1382,7 +1373,7 @@ int main(int argc, char** argv)
+@@ -95,7 +87,7 @@ char text_conv[MAXLNLEN];
+ #endif
+
+ #if ENABLE_NLS
+-# ifdef HAVE_LOCALE_H
++# if defined HAVE_LOCALE_H && !defined __OpenBSD__ // We use C in OpenBSD
+ # include <locale.h>
+ # ifdef HAVE_LANGINFO_CODESET
+ # include <langinfo.h>
+@@ -1430,7 +1422,7 @@ int main(int argc, char** argv)
int argstate = 0;
#ifdef ENABLE_NLS
--#ifdef HAVE_LOCALE_H
-+#if defined HAVE_LOCALE_H && !defined __OpenBSD__ // native environment is "C"
- ui_lang = setlocale(LC_ALL, "");
+-# ifdef HAVE_LOCALE_H
++# if defined HAVE_LOCALE_H && !defined __OpenBSD__ // We use C in OpenBSD
+ setlocale(LC_ALL, "");
textdomain("hunspell");
- ui_enc = nl_langinfo(CODESET);
+ # ifdef HAVE_LANGINFO_CODESET
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 -p -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 25 Jun 2010 08:57:53 -0000
@@ -1,6 +1,6 @@
$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 Tue Feb 23 12:19:51 2010
++++ tests/test.sh Thu Jun 24 19:45:06 2010
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!${LOCALBASE}/bin/bash
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/textproc/hunspell/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -u -r1.1.1.1 PLIST
--- pkg/PLIST 13 Jun 2009 07:48:53 -0000 1.1.1.1
+++ pkg/PLIST 25 Jun 2010 08:57:53 -0000
@@ -1,13 +1,17 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2009/06/13 07:48:53 ajacoutot Exp $
%%SHARED%%
+bin/affixcompress
@bin bin/analyze
@bin bin/chmorph
-...@bin bin/example
@bin bin/hunspell
@bin bin/hunzip
@bin bin/hzip
+bin/ispellaff2myspell
+bin/makealias
@bin bin/munch
@bin bin/unmunch
+bin/wordforms
+bin/wordlist2hunspell
include/hunspell/
include/hunspell/affentry.hxx
include/hunspell/affixmgr.hxx
@@ -20,14 +24,13 @@ 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
-include/munch.h
-include/unmunch.h
lib/libhunspell-1.2.a
lib/libhunspell-1.2.la
lib/libparsers.a
@@ -47,3 +50,4 @@ share/hunspell/
share/hunspell/default.aff
share/hunspell/default.dic
share/locale/hu/LC_MESSAGES/hunspell.mo
+share/locale/it/LC_MESSAGES/hunspell.mo
--
Best Regards
Edd Barrett
http://www.theunixzoo.co.uk
