On Wed, Nov 03, 2010 at 11:24:23 +0000, Stuart Henderson wrote: > On 2010/11/03 11:57, LEVAI Daniel wrote: > > However, there are some warnings when loading the hungarian > > spell files, because the dictionaries in the tree are very old. I've > > tried to contact Martynas regarding this, but got no reply. The warnings > > are harmless, but if this is blocking this hunspell update, then please > > help me resolve this issue. I'm willing to post updates for the new > > hungarian ispell dictionaries, but currently this is not possible, > > because the dist files are on some self-maintained mirror. How can we > > update this/these packages? > > Please post what you have for the dictionaries, there is probably > someone who can mirror the distfiles. I meant that the current port's Makefile contains some self-maintained MASTER_SITES. Sorry, English is my second language :)
Anyway, I've attached the new port for magyarispell, which is the
Hungarian dictionary package.
> > @@ -35,12 +34,12 @@ $OpenBSD: patch-src_tools_hunspell_cxx,v
> > #define HOME getenv("HOME")
> > #define DICBASENAME ".hunspell_"
> > #define LOGFILE "/tmp/hunspell.log"
> > -@@ -1382,7 +1373,7 @@ int main(int argc, char** argv)
> > +@@ -1430,7 +1421,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__ // native environment
> > is "C"
> > + setlocale(LC_ALL, "");
> > textdomain("hunspell");
>
> Is this still needed/wanted?
You're right, this is not needed. Attached the new diff for hunspell.
Thanks,
Daniel
--
LÉVAI Dániel
PGP key ID = 0x83B63A8F
Key fingerprint = DBEC C66B A47A DFA2 792D 650C C69B BE4C 83B6 3A8F
magyarispell.tar.gz
Description: application/tar-gz
Index: Makefile
===================================================================
RCS file: /cvs/ports/textproc/hunspell/Makefile,v
retrieving revision 1.4
diff -p -u -r1.4 Makefile
--- Makefile 19 Oct 2010 07:54:22 -0000 1.4
+++ Makefile 3 Nov 2010 12:43:40 -0000
@@ -2,8 +2,7 @@
COMMENT = spelling, stemming, morphological analysis and generation
-DISTNAME = hunspell-1.2.8
-REVISION = 0
+DISTNAME = hunspell-1.2.12
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 -p -u -r1.1.1.1 distinfo
--- distinfo 13 Jun 2009 07:48:53 -0000 1.1.1.1
+++ distinfo 3 Nov 2010 12:43:40 -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.12.tar.gz) = XvLcECZmDQ/7fq57URruIw==
+RMD160 (hunspell-1.2.12.tar.gz) = Q733wG0G6PmDt8zojnHfgzwizRM=
+SHA1 (hunspell-1.2.12.tar.gz) = Ciq0seFcPa0/BfR00a4V7jYcNfg=
+SHA256 (hunspell-1.2.12.tar.gz) = X1kqcRLfIRTOx3JXTyg3y53kmea/nTXfMnpCqz6CDmk=
+SIZE (hunspell-1.2.12.tar.gz) = 969894
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 -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 3 Nov 2010 12:43:40 -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 10:08:52 2010
++++ man/hu/hunspell.1 Sat Sep 25 11:39:53 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 -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 3 Nov 2010 12:43:40 -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
+--- man/hunspell.1.orig Tue Feb 23 11:02:17 2010
++++ man/hunspell.1 Sat Sep 25 11:47:18 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 -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 3 Nov 2010 12:43:40 -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 @@
+--- src/tools/hunspell.cxx.orig Mon Jul 5 11:06:21 2010
++++ src/tools/hunspell.cxx Sat Sep 25 11:45:07 2010
+@@ -61,26 +61,17 @@
#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:" \
@@ -35,12 +34,3 @@ $OpenBSD: patch-src_tools_hunspell_cxx,v
#define HOME getenv("HOME")
#define DICBASENAME ".hunspell_"
#define LOGFILE "/tmp/hunspell.log"
-@@ -1382,7 +1373,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, "");
- textdomain("hunspell");
- ui_enc = nl_langinfo(CODESET);
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/textproc/hunspell/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -p -u -r1.1.1.1 PLIST
--- pkg/PLIST 13 Jun 2009 07:48:53 -0000 1.1.1.1
+++ pkg/PLIST 3 Nov 2010 12:43:40 -0000
@@ -1,13 +1,17 @@
-...@comment $OpenBSD: PLIST,v 1.1.1.1 2009/06/13 07:48:53 ajacoutot Exp $
+...@comment $OpenBSD$
%%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
