Upgrade to 0.60.1.

This release adds a new Nroff and Texinfo filter and fixes a number
of bugs and portability problems.

Warning: aspell-0.60.1 is now incompatible with the base ncurses.
To keep the ncurses interfaces, please define WITH_NCURSES: aspell
will then depend on the port devel/ncurses.
Since devel/ncurses is not packageable, this is not the default.

2 files changed, 32 insertions, 14 deletions

diff --git a/textproc/aspell/files/patch-Makefile.in b/textproc/aspell/files/patch-Makefile.in
index bd3318b3..26c30cf 100644
--- a/textproc/aspell/files/patch-Makefile.in
+++ b/textproc/aspell/files/patch-Makefile.in
@@ -1,6 +1,6 @@
---- Makefile.in.orig	Mon Aug 23 03:22:41 2004
-+++ Makefile.in	Mon Aug 30 00:39:45 2004
-@@ -424,7 +424,12 @@
+--- Makefile.in.orig	Mon Nov  8 02:12:41 2004
++++ Makefile.in	Mon Nov  8 10:09:19 2004
+@@ -447,7 +447,12 @@
  target_os = @target_os@
  target_vendor = @target_vendor@
  AUTOMAKE_OPTIONS = foreign subdir-objects
@@ -14,17 +14,17 @@
  DIST_SUBDIRS = ${SUBDIRS} examples myspell lib5
  filterdir = ${pkglibdir}
  optdir = ${pkgdatadir}
-@@ -512,7 +517,7 @@
+@@ -536,7 +541,7 @@
  	lib/string_list-c.cpp lib/find_speller.cpp lib/speller-c.cpp \
  	lib/string_pair_enumeration-c.cpp lib/new_checker.cpp \
  	modules/filter/url.cpp $(am__append_3)
 -libaspell_la_LIBADD = $(LIBINTL) $(PTHREAD_LIB)
 +libaspell_la_LIBADD = $(LIBINTL) $(PTHREAD_LIB) $(LTLIBINTL)
- @INCREMENTED_SONAME_FALSE@libaspell_la_LDFLAGS = -version-info 16:0:1
- @INCREMENTED_SONAME_TRUE@libaspell_la_LDFLAGS = -version-info 16:0:0
+ @INCREMENTED_SONAME_FALSE@libaspell_la_LDFLAGS = -version-info 16:0:1 -no-undefined
+ @INCREMENTED_SONAME_TRUE@libaspell_la_LDFLAGS = -version-info 16:0:0 -no-undefined
  @PSPELL_COMPATIBILITY_TRUE@libpspell_la_SOURCES = lib/dummy.cpp
-@@ -521,7 +526,7 @@
- @INCREMENTED_SONAME_TRUE@@PSPELL_COMPATIBILITY_TRUE@libpspell_la_LDFLAGS = -version-info 16:0:0
+@@ -545,7 +550,7 @@
+ @INCREMENTED_SONAME_TRUE@@PSPELL_COMPATIBILITY_TRUE@libpspell_la_LDFLAGS = -version-info 16:0:0 -no-undefined
  word_list_compress_SOURCES = prog/compress.c
  aspell_SOURCES = prog/aspell.cpp prog/check_funs.cpp prog/checker_string.cpp
 -aspell_LDADD = libaspell.la $(CURSES_LIB)
@@ -32,7 +32,7 @@
  prezip_bin_SOURCES = prog/prezip.c
  static_optfiles = modules/filter/url-filter.info $(am__append_2)
  dynamic_optfiles = $(am__append_4)
-@@ -1259,6 +1264,1590 @@
+@@ -1335,6 +1340,1590 @@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
diff --git a/textproc/aspell/files/patch-configure b/textproc/aspell/files/patch-configure
index e508b39..7fc5b94 100644
--- a/textproc/aspell/files/patch-configure
+++ b/textproc/aspell/files/patch-configure
@@ -1,5 +1,5 @@
---- configure.orig	Mon Aug 23 03:22:42 2004
-+++ configure	Mon Oct 18 14:05:59 2004
+--- configure.orig	Mon Nov  8 02:12:49 2004
++++ configure	Mon Nov  8 13:47:08 2004
 @@ -2902,7 +2902,7 @@
  fi
  
@@ -9,7 +9,7 @@
  then
    CXXFLAGS="$CXXFLAGS -fno-exceptions"
  fi
-@@ -9825,13 +9825,6 @@
+@@ -9830,13 +9830,6 @@
  	;;
      esac
  
@@ -23,7 +23,7 @@
      # Update the list of available tags.
      if test -n "$tagname"; then
        echo appending configuration tag \"$tagname\" to $ofile
-@@ -19379,6 +19372,10 @@
+@@ -19388,6 +19381,10 @@
  
  # This can be used to rebuild libtool when needed
  LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
@@ -34,7 +34,7 @@
  
  # Always use our own libtool.
  LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -21274,16 +21271,16 @@
+@@ -21283,16 +21280,16 @@
  /* end confdefs.h.  */
  #include <libintl.h>
  extern int _nl_msg_cat_cntr;
@@ -53,3 +53,21 @@
    ;
    return 0;
  }
+@@ -22406,7 +22403,7 @@
+   CURSES_LIB=-lncurses
+ 
+ cat >>confdefs.h <<\_ACEOF
+-#define CURSES_HEADER <ncurses/curses.h>
++#define CURSES_HEADER <ncurses/ncurses.h>
+ _ACEOF
+ 
+ else
+@@ -22589,7 +22586,7 @@
+ 
+ 
+ cat >>confdefs.h <<\_ACEOF
+-#define CURSES_HEADER <curses.h>
++#define CURSES_HEADER <ncurses/ncurses.h>
+ _ACEOF
+ 
+