Version bump. Added nls flag again, bug #225753, thank Mart Raudsepp for report. Changed to use eatoreconf, bug #226541 in hunspell-1.1.9, thank Diego Pettenò for report. Removed old versions.

(Portage version: 2.1.4.4)

5 files changed, 0 insertions, 452 deletions

diff --git a/app-text/hunspell/files/hunspell-1.1.3-renameexes.patch b/app-text/hunspell/files/hunspell-1.1.3-renameexes.patch
deleted file mode 100644
index 4b1b3aec4372..000000000000
--- a/app-text/hunspell/files/hunspell-1.1.3-renameexes.patch
+++ /dev/null
@@ -1,114 +0,0 @@
-diff -u -ur hunspell-1.1.3.orig/src/tools/Makefile.am hunspell-1.1.3/src/tools/Makefile.am
---- hunspell-1.1.3.orig/src/tools/Makefile.am	2006-01-27 19:32:19.000000000 +0100
-+++ hunspell-1.1.3/src/tools/Makefile.am	2006-01-27 19:33:05.000000000 +0100
-@@ -1,13 +1,13 @@
--bin_PROGRAMS=munch unmunch example hunspell hunmorph hunstem
-+bin_PROGRAMS=hunspell-munch hunspell-unmunch hunspell-example hunspell hunmorph hunstem
- 
- INCLUDES=-I${top_srcdir}/src/hunspell -I${top_srcdir}/src/parsers
- 
--munch_SOURCES=munch.c
--unmunch_SOURCES=unmunch.c
-+hunspell_munch_SOURCES=munch.c
-+hunspell_unmunch_SOURCES=unmunch.c
- include_HEADERS=munch.h unmunch.h
- 
--example_SOURCES=example.cxx
--example_LDADD = ../hunspell/libhunspell.a
-+hunspell_example_SOURCES=example.cxx
-+hunspell_example_LDADD = ../hunspell/libhunspell.a
- 
- hunspell_SOURCES=hunspell.cxx
- hunspell_LDADD = @LIBINTL@ ../hunspell/libhunspell.a \
-diff -u -ur hunspell-1.1.3.orig/src/tools/example.cxx hunspell-1.1.3/src/tools/example.cxx
---- hunspell-1.1.3.orig/src/tools/example.cxx	2006-01-27 19:32:19.000000000 +0100
-+++ hunspell-1.1.3/src/tools/example.cxx	2006-01-27 19:33:31.000000000 +0100
-@@ -24,21 +24,21 @@
-        af = mystrdup(argv[1]);
-   } else {
-     fprintf(stderr,"correct syntax is:\n"); 
--    fprintf(stderr,"example affix_file dictionary_file file_of_words_to_check\n");
-+    fprintf(stderr,"hunspell-example affix_file dictionary_file file_of_words_to_check\n");
-     exit(1);
-   }
-   if (argv[2]) {
-        df = mystrdup(argv[2]);
-   } else {
-     fprintf(stderr,"correct syntax is:\n"); 
--    fprintf(stderr,"example affix_file dictionary_file file_of_words_to_check\n");
-+    fprintf(stderr,"hunspell-example affix_file dictionary_file file_of_words_to_check\n");
-     exit(1);
-   }
-   if (argv[3]) {
-        wtc = mystrdup(argv[3]);
-   } else {
-     fprintf(stderr,"correct syntax is:\n"); 
--    fprintf(stderr,"example affix_file dictionary_file file_of_words_to_check\n");
-+    fprintf(stderr,"hunspell-example affix_file dictionary_file file_of_words_to_check\n");
-     exit(1);
-   }
- 
-diff -u -ur hunspell-1.1.3.orig/src/tools/hunmorph.cxx hunspell-1.1.3/src/tools/hunmorph.cxx
---- hunspell-1.1.3.orig/src/tools/hunmorph.cxx	2006-01-27 19:32:19.000000000 +0100
-+++ hunspell-1.1.3/src/tools/hunmorph.cxx	2006-01-27 19:35:18.000000000 +0100
-@@ -26,7 +26,7 @@
- 
-     for (i = 1; i < 3; i++)
- 	if (!argv[i]) {
--	    fprintf(stderr, "correct syntax is:\nexample affix_file");
-+	    fprintf(stderr, "correct syntax is:\nhunmorph affix_file");
- 	    fprintf(stderr, " dictionary_file file_of_words_to_check\n");
- 	    exit(1);
- 	}
-diff -u -ur hunspell-1.1.3.orig/src/tools/hunstem.cxx hunspell-1.1.3/src/tools/hunstem.cxx
---- hunspell-1.1.3.orig/src/tools/hunstem.cxx	2006-01-27 19:32:19.000000000 +0100
-+++ hunspell-1.1.3/src/tools/hunstem.cxx	2006-01-27 19:35:28.000000000 +0100
-@@ -25,7 +25,7 @@
- 
-     for (i = 1; i < 3; i++)
- 	if (!argv[i]) {
--	    fprintf(stderr, "correct syntax is:\nexample affix_file");
-+	    fprintf(stderr, "correct syntax is:\nhunstem affix_file");
- 	    fprintf(stderr, " dictionary_file file_of_words_to_check\n");
- 	    exit(1);
- 	}
-diff -u -ur hunspell-1.1.3.orig/src/tools/munch.c hunspell-1.1.3/src/tools/munch.c
---- hunspell-1.1.3.orig/src/tools/munch.c	2006-01-27 19:32:19.000000000 +0100
-+++ hunspell-1.1.3/src/tools/munch.c	2006-01-27 19:33:56.000000000 +0100
-@@ -42,14 +42,14 @@
-        wf = mystrdup(argv[1]);
-   } else {
-     fprintf(stderr,"correct syntax is:\n"); 
--    fprintf(stderr,"munch word_list_file affix_file\n");
-+    fprintf(stderr,"hunspell-munch word_list_file affix_file\n");
-     exit(1);
-   }
-   if (argv[2]) {
-        af = mystrdup(argv[2]);
-   } else {
-     fprintf(stderr,"correct syntax is:\n"); 
--    fprintf(stderr,"munch word_list_file affix_file\n");
-+    fprintf(stderr,"hunspell-munch word_list_file affix_file\n");
-     exit(1);
-   }
- 
-diff -u -ur hunspell-1.1.3.orig/src/tools/unmunch.c hunspell-1.1.3/src/tools/unmunch.c
---- hunspell-1.1.3.orig/src/tools/unmunch.c	2006-01-27 19:32:19.000000000 +0100
-+++ hunspell-1.1.3/src/tools/unmunch.c	2006-01-27 19:34:10.000000000 +0100
-@@ -39,14 +39,14 @@
-        wf = mystrdup(argv[1]);
-   } else {
-     fprintf(stderr,"correct syntax is:\n"); 
--    fprintf(stderr,"unmunch dic_file affix_file\n");
-+    fprintf(stderr,"hunspell-unmunch dic_file affix_file\n");
-     exit(1);
-   }
-   if (argv[2]) {
-        af = mystrdup(argv[2]);
-   } else {
-     fprintf(stderr,"correct syntax is:\n"); 
--    fprintf(stderr,"unmunch dic_file affix_file\n");
-+    fprintf(stderr,"hunspell-unmunch dic_file affix_file\n");
-     exit(1);
-   }
- 
diff --git a/app-text/hunspell/files/hunspell-1.1.4-gettext.patch b/app-text/hunspell/files/hunspell-1.1.4-gettext.patch
deleted file mode 100644
index 2a726b8abedc..000000000000
--- a/app-text/hunspell/files/hunspell-1.1.4-gettext.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-fix Makefile.in.in rather than running `autopoint` as that requires cvs
-
-http://bugs.gentoo.org/142565
-http://bugs.gentoo.org/142997
-
---- po/Makefile.in.in
-+++ po/Makefile.in.in
-@@ -27,7 +27,7 @@
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- MKINSTALLDIRS = @MKINSTALLDIRS@
--mkinstalldirs = @MKINSTALLDIRS@
-+mkinstalldirs = $(SHELL) `case "$(MKINSTALLDIRS)" in /*) echo "$(MKINSTALLDIRS)" ;; *) echo "$(top_builddir)/$(MKINSTALLDIRS)" ;; esac`
- 
- GMSGFMT = @GMSGFMT@
- MSGFMT = @MSGFMT@
diff --git a/app-text/hunspell/files/hunspell-1.1.4-libtool.patch b/app-text/hunspell/files/hunspell-1.1.4-libtool.patch
deleted file mode 100644
index e7915e032b11..000000000000
--- a/app-text/hunspell/files/hunspell-1.1.4-libtool.patch
+++ /dev/null
@@ -1,103 +0,0 @@
-Index: hunspell-1.1.4/configure.ac
-===================================================================
---- hunspell-1.1.4.orig/configure.ac
-+++ hunspell-1.1.4/configure.ac
-@@ -23,7 +23,7 @@ AC_CONFIG_HEADER([config.h])
- # Checks for programs.
- AC_PROG_CXX
- AC_PROG_CC
--AC_PROG_RANLIB
-+AC_PROG_LIBTOOL
- 
- # Checks for libraries.
- 
-Index: hunspell-1.1.4/src/hunspell/Makefile.am
-===================================================================
---- hunspell-1.1.4.orig/src/hunspell/Makefile.am
-+++ hunspell-1.1.4/src/hunspell/Makefile.am
-@@ -1,5 +1,5 @@
--lib_LIBRARIES = libhunspell.a
--libhunspell_a_SOURCES=affentry.cxx affixmgr.cxx csutil.cxx \
-+lib_LTLIBRARIES = libhunspell.la
-+libhunspell_la_SOURCES=affentry.cxx affixmgr.cxx csutil.cxx \
- 		     dictmgr.cxx hashmgr.cxx hunspell.cxx \
- 	             suggestmgr.cxx utf_info.cxx license.myspell license.hunspell
- 
-Index: hunspell-1.1.4/src/hunspell/utf_info.cxx
-===================================================================
---- hunspell-1.1.4.orig/src/hunspell/utf_info.cxx
-+++ hunspell-1.1.4/src/hunspell/utf_info.cxx
-@@ -1,6 +1,6 @@
- #include "csutil.hxx"
- /* fields: Unicode letter, toupper, tolower */
--struct unicode_info utf_lst[] = {
-+static struct unicode_info utf_lst[] = {
- { 0x0041, 0x0041, 0x0061 },
- { 0x0042, 0x0042, 0x0062 },
- { 0x0043, 0x0043, 0x0063 },
-Index: hunspell-1.1.4/src/parsers/Makefile.am
-===================================================================
---- hunspell-1.1.4.orig/src/parsers/Makefile.am
-+++ hunspell-1.1.4/src/parsers/Makefile.am
-@@ -1,7 +1,8 @@
--lib_LIBRARIES=libparsers.a
--libparsers_a_SOURCES=firstparser.cxx htmlparser.cxx \
-+lib_LTLIBRARIES=libparsers.la
-+libparsers_la_SOURCES=firstparser.cxx htmlparser.cxx \
- 		      latexparser.cxx  manparser.cxx \
- 		      textparser.cxx 
-+libparsers_la_LIBADD = ../hunspell/libhunspell.la
- 
- #include_hunspelldir
- include_HEADERS = firstparser.hxx \
-@@ -11,7 +12,6 @@ include_HEADERS = firstparser.hxx \
- 		  textparser.hxx
- 
- noinst_PROGRAMS=testparser
--testparser_SOURCES=firstparser.cxx firstparser.hxx htmlparser.cxx htmlparser.hxx latexparser.cxx latexparser.hxx manparser.cxx manparser.hxx testparser.cxx textparser.cxx textparser.hxx
-+testparser_SOURCES=testparser.cxx
-+testparser_LDADD = libparsers.la
- 
--# need mystrdup()
--LDADD = ../hunspell/libhunspell.a
-Index: hunspell-1.1.4/src/tools/Makefile.am
-===================================================================
---- hunspell-1.1.4.orig/src/tools/Makefile.am
-+++ hunspell-1.1.4/src/tools/Makefile.am
-@@ -7,18 +7,18 @@ unmunch_SOURCES=unmunch.c
- include_HEADERS=munch.h unmunch.h
- 
- example_SOURCES=example.cxx
--example_LDADD = ../hunspell/libhunspell.a
-+example_LDADD = ../hunspell/libhunspell.la
- 
- hunspell_SOURCES=hunspell.cxx
--hunspell_LDADD = @LIBINTL@ ../hunspell/libhunspell.a \
--	../parsers/libparsers.a @CURSESLIB@ @READLINELIB@
-+hunspell_LDADD = @LIBINTL@ ../hunspell/libhunspell.la \
-+	../parsers/libparsers.la @CURSESLIB@ @READLINELIB@
- 
- hunmorph_SOURCES=hunmorph.cxx
--hunmorph_LDADD = ../hunspell/libhunspell.a
-+hunmorph_LDADD = ../hunspell/libhunspell.la
- #hunmorph_INCLUDES=-I${top_srcdir}/src/hunspell
- 
- hunstem_SOURCES=hunstem.cxx
--hunstem_LDADD = ../hunspell/libhunspell.a
-+hunstem_LDADD = ../hunspell/libhunspell.la
- #hunstem_INCLUDES=-I${top_srcdir}/src/hunspell
- 
- EXTRA_DIST=makealias
-Index: hunspell-1.1.4/po/Makefile.in.in
-===================================================================
---- hunspell-1.1.4.orig/po/Makefile.in.in
-+++ hunspell-1.1.4/po/Makefile.in.in
-@@ -27,7 +27,7 @@ gettextsrcdir = $(datadir)/gettext/po
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- MKINSTALLDIRS = @MKINSTALLDIRS@
--mkinstalldirs = $(SHELL) `case "$(MKINSTALLDIRS)" in /*) echo "$(MKINSTALLDIRS)" ;; *) echo "$(top_builddir)/$(MKINSTALLDIRS)" ;; esac`
-+mkinstalldirs = @MKINSTALLDIRS@
- 
- GMSGFMT = @GMSGFMT@
- MSGFMT = @MSGFMT@
diff --git a/app-text/hunspell/files/hunspell-1.1.4-renameexes.patch b/app-text/hunspell/files/hunspell-1.1.4-renameexes.patch
deleted file mode 100644
index 2e5c45cd7d46..000000000000
--- a/app-text/hunspell/files/hunspell-1.1.4-renameexes.patch
+++ /dev/null
@@ -1,114 +0,0 @@
-diff -u -ur hunspell-1.1.3.orig/src/tools/Makefile.am hunspell-1.1.3/src/tools/Makefile.am
---- hunspell-1.1.3.orig/src/tools/Makefile.am	2006-01-27 19:32:19.000000000 +0100
-+++ hunspell-1.1.3/src/tools/Makefile.am	2006-01-27 19:33:05.000000000 +0100
-@@ -1,13 +1,13 @@
--bin_PROGRAMS=munch unmunch example hunspell hunmorph hunstem
-+bin_PROGRAMS=hunspell-munch hunspell-unmunch hunspell-example hunspell hunmorph hunstem
- 
- INCLUDES=-I${top_srcdir}/src/hunspell -I${top_srcdir}/src/parsers
- 
--munch_SOURCES=munch.c
--unmunch_SOURCES=unmunch.c
-+hunspell_munch_SOURCES=munch.c
-+hunspell_unmunch_SOURCES=unmunch.c
- include_HEADERS=munch.h unmunch.h
- 
--example_SOURCES=example.cxx
--example_LDADD = ../hunspell/libhunspell.la
-+hunspell_example_SOURCES=example.cxx
-+hunspell_example_LDADD = ../hunspell/libhunspell.la
- 
- hunspell_SOURCES=hunspell.cxx
- hunspell_LDADD = @LIBINTL@ ../hunspell/libhunspell.la \
-diff -u -ur hunspell-1.1.3.orig/src/tools/example.cxx hunspell-1.1.3/src/tools/example.cxx
---- hunspell-1.1.3.orig/src/tools/example.cxx	2006-01-27 19:32:19.000000000 +0100
-+++ hunspell-1.1.3/src/tools/example.cxx	2006-01-27 19:33:31.000000000 +0100
-@@ -24,21 +24,21 @@
-        af = mystrdup(argv[1]);
-   } else {
-     fprintf(stderr,"correct syntax is:\n"); 
--    fprintf(stderr,"example affix_file dictionary_file file_of_words_to_check\n");
-+    fprintf(stderr,"hunspell-example affix_file dictionary_file file_of_words_to_check\n");
-     exit(1);
-   }
-   if (argv[2]) {
-        df = mystrdup(argv[2]);
-   } else {
-     fprintf(stderr,"correct syntax is:\n"); 
--    fprintf(stderr,"example affix_file dictionary_file file_of_words_to_check\n");
-+    fprintf(stderr,"hunspell-example affix_file dictionary_file file_of_words_to_check\n");
-     exit(1);
-   }
-   if (argv[3]) {
-        wtc = mystrdup(argv[3]);
-   } else {
-     fprintf(stderr,"correct syntax is:\n"); 
--    fprintf(stderr,"example affix_file dictionary_file file_of_words_to_check\n");
-+    fprintf(stderr,"hunspell-example affix_file dictionary_file file_of_words_to_check\n");
-     exit(1);
-   }
- 
-diff -u -ur hunspell-1.1.3.orig/src/tools/hunmorph.cxx hunspell-1.1.3/src/tools/hunmorph.cxx
---- hunspell-1.1.3.orig/src/tools/hunmorph.cxx	2006-01-27 19:32:19.000000000 +0100
-+++ hunspell-1.1.3/src/tools/hunmorph.cxx	2006-01-27 19:35:18.000000000 +0100
-@@ -26,7 +26,7 @@
- 
-     for (i = 1; i < 3; i++)
- 	if (!argv[i]) {
--	    fprintf(stderr, "correct syntax is:\nexample affix_file");
-+	    fprintf(stderr, "correct syntax is:\nhunmorph affix_file");
- 	    fprintf(stderr, " dictionary_file file_of_words_to_check\n");
- 	    exit(1);
- 	}
-diff -u -ur hunspell-1.1.3.orig/src/tools/hunstem.cxx hunspell-1.1.3/src/tools/hunstem.cxx
---- hunspell-1.1.3.orig/src/tools/hunstem.cxx	2006-01-27 19:32:19.000000000 +0100
-+++ hunspell-1.1.3/src/tools/hunstem.cxx	2006-01-27 19:35:28.000000000 +0100
-@@ -25,7 +25,7 @@
- 
-     for (i = 1; i < 3; i++)
- 	if (!argv[i]) {
--	    fprintf(stderr, "correct syntax is:\nexample affix_file");
-+	    fprintf(stderr, "correct syntax is:\nhunstem affix_file");
- 	    fprintf(stderr, " dictionary_file file_of_words_to_check\n");
- 	    exit(1);
- 	}
-diff -u -ur hunspell-1.1.3.orig/src/tools/munch.c hunspell-1.1.3/src/tools/munch.c
---- hunspell-1.1.3.orig/src/tools/munch.c	2006-01-27 19:32:19.000000000 +0100
-+++ hunspell-1.1.3/src/tools/munch.c	2006-01-27 19:33:56.000000000 +0100
-@@ -42,14 +42,14 @@
-        wf = mystrdup(argv[1]);
-   } else {
-     fprintf(stderr,"correct syntax is:\n"); 
--    fprintf(stderr,"munch word_list_file affix_file\n");
-+    fprintf(stderr,"hunspell-munch word_list_file affix_file\n");
-     exit(1);
-   }
-   if (argv[2]) {
-        af = mystrdup(argv[2]);
-   } else {
-     fprintf(stderr,"correct syntax is:\n"); 
--    fprintf(stderr,"munch word_list_file affix_file\n");
-+    fprintf(stderr,"hunspell-munch word_list_file affix_file\n");
-     exit(1);
-   }
- 
-diff -u -ur hunspell-1.1.3.orig/src/tools/unmunch.c hunspell-1.1.3/src/tools/unmunch.c
---- hunspell-1.1.3.orig/src/tools/unmunch.c	2006-01-27 19:32:19.000000000 +0100
-+++ hunspell-1.1.3/src/tools/unmunch.c	2006-01-27 19:34:10.000000000 +0100
-@@ -39,14 +39,14 @@
-        wf = mystrdup(argv[1]);
-   } else {
-     fprintf(stderr,"correct syntax is:\n"); 
--    fprintf(stderr,"unmunch dic_file affix_file\n");
-+    fprintf(stderr,"hunspell-unmunch dic_file affix_file\n");
-     exit(1);
-   }
-   if (argv[2]) {
-        af = mystrdup(argv[2]);
-   } else {
-     fprintf(stderr,"correct syntax is:\n"); 
--    fprintf(stderr,"unmunch dic_file affix_file\n");
-+    fprintf(stderr,"hunspell-unmunch dic_file affix_file\n");
-     exit(1);
-   }
- 
diff --git a/app-text/hunspell/files/hunspell-1.2.2b-renameexes.patch b/app-text/hunspell/files/hunspell-1.2.2b-renameexes.patch
deleted file mode 100644
index db70de00e29b..000000000000
--- a/app-text/hunspell/files/hunspell-1.2.2b-renameexes.patch
+++ /dev/null
@@ -1,105 +0,0 @@
-diff -Naur hunspell-1.2.2b.orig/src/tools/example.cxx hunspell-1.2.2b/src/tools/example.cxx
---- hunspell-1.2.2b.orig/src/tools/example.cxx	2008-01-16 11:33:31.000000000 +0100
-+++ hunspell-1.2.2b/src/tools/example.cxx	2008-02-10 19:20:39.000000000 +0100
-@@ -17,8 +17,8 @@
-     /* first parse the command line options */
- 
-     if (argc < 4) {
--        fprintf(stderr,"example (multiple dictionary version.:\n"); 
--        fprintf(stderr,"example affix_file dictionary_file(s) file_of_words_to_check\n");
-+        fprintf(stderr,"hunspell-example (multiple dictionary version.:\n"); 
-+        fprintf(stderr,"hunspell-example affix_file dictionary_file(s) file_of_words_to_check\n");
-         exit(1);
-     }
-   
-diff -Naur hunspell-1.2.2b.orig/src/tools/Makefile.am hunspell-1.2.2b/src/tools/Makefile.am
---- hunspell-1.2.2b.orig/src/tools/Makefile.am	2008-01-09 12:27:42.000000000 +0100
-+++ hunspell-1.2.2b/src/tools/Makefile.am	2008-02-10 19:17:47.000000000 +0100
-@@ -1,4 +1,4 @@
--bin_PROGRAMS=analyze chmorph example hunspell munch unmunch hzip hunzip
-+bin_PROGRAMS=hunspell-analyze hunspell-chmorph hunspell-example hunspell hunspell-munch hunspell-unmunch hzip hunzip
- 
- INCLUDES=-I${top_srcdir}/src/hunspell -I${top_srcdir}/src/parsers
- 
-@@ -6,21 +6,21 @@
- hunzip_SOURCES=hunzip.cxx
- hunzip_LDADD = ../hunspell/libhunspell-1.2.la
- 
--munch_SOURCES=munch.c
--unmunch_SOURCES=unmunch.c
-+hunspell_munch_SOURCES=munch.c
-+hunspell_unmunch_SOURCES=unmunch.c
- include_HEADERS=munch.h unmunch.h
- 
--example_SOURCES=example.cxx
--example_LDADD = ../hunspell/libhunspell-1.2.la
-+hunspell_example_SOURCES=example.cxx
-+hunspell_example_LDADD = ../hunspell/libhunspell-1.2.la
- 
- hunspell_SOURCES=hunspell.cxx
- hunspell_LDADD = @LIBINTL@ ../hunspell/libhunspell-1.2.la \
- 	../parsers/libparsers.a @CURSESLIB@ @READLINELIB@
- 
--analyze_SOURCES=analyze.cxx
--analyze_LDADD = ../hunspell/libhunspell-1.2.la
-+hunspell_analyze_SOURCES=analyze.cxx
-+hunspell_analyze_LDADD = ../hunspell/libhunspell-1.2.la
- 
--chmorph_SOURCES=chmorph.cxx
--chmorph_LDADD = ../hunspell/libhunspell-1.2.la ../parsers/libparsers.a
-+hunspell_chmorph_SOURCES=chmorph.cxx
-+hunspell_chmorph_LDADD = ../hunspell/libhunspell-1.2.la ../parsers/libparsers.a
- 
- EXTRA_DIST=makealias affixcompress
-diff -Naur hunspell-1.2.2b.orig/src/tools/munch.c hunspell-1.2.2b/src/tools/munch.c
---- hunspell-1.2.2b.orig/src/tools/munch.c	2007-04-06 10:05:28.000000000 +0200
-+++ hunspell-1.2.2b/src/tools/munch.c	2008-02-10 19:24:19.000000000 +0100
-@@ -42,14 +42,14 @@
-        wf = mystrdup(argv[1]);
-   } else {
-     fprintf(stderr,"correct syntax is:\n"); 
--    fprintf(stderr,"munch word_list_file affix_file\n");
-+    fprintf(stderr,"hunspell-munch word_list_file affix_file\n");
-     exit(1);
-   }
-   if (argv[2]) {
-        af = mystrdup(argv[2]);
-   } else {
-     fprintf(stderr,"correct syntax is:\n"); 
--    fprintf(stderr,"munch word_list_file affix_file\n");
-+    fprintf(stderr,"hunspell-munch word_list_file affix_file\n");
-     exit(1);
-   }
- 
-diff -Naur hunspell-1.2.2b.orig/src/tools/unmunch.c hunspell-1.2.2b/src/tools/unmunch.c
---- hunspell-1.2.2b.orig/src/tools/unmunch.c	2007-04-06 10:05:28.000000000 +0200
-+++ hunspell-1.2.2b/src/tools/unmunch.c	2008-02-10 19:24:57.000000000 +0100
-@@ -39,14 +39,14 @@
-        wf = mystrdup(argv[1]);
-   } else {
-     fprintf(stderr,"correct syntax is:\n"); 
--    fprintf(stderr,"unmunch dic_file affix_file\n");
-+    fprintf(stderr,"hunspell-unmunch dic_file affix_file\n");
-     exit(1);
-   }
-   if (argv[2]) {
-        af = mystrdup(argv[2]);
-   } else {
-     fprintf(stderr,"correct syntax is:\n"); 
--    fprintf(stderr,"unmunch dic_file affix_file\n");
-+    fprintf(stderr,"hunspell-unmunch dic_file affix_file\n");
-     exit(1);
-   }
- 
-diff -Naur hunspell-1.2.2b.orig/tests/test.sh hunspell-1.2.2b/tests/test.sh
---- hunspell-1.2.2b.orig/tests/test.sh	2008-02-10 19:29:21.000000000 +0100
-+++ hunspell-1.2.2b/tests/test.sh	2008-02-10 19:34:13.000000000 +0100
-@@ -34,7 +34,7 @@
- shopt -s expand_aliases
- 
- alias hunspell='../src/tools/hunspell'
--alias analyze='../src/tools/analyze'
-+alias analyze='../src/tools/hunspell-analyze'
- 
- if [ "$VALGRIND" != "" ]; then
-   rm -f $TEMPDIR/test.pid*