Upgrade to 0.60.4.

Changelog at <http://aspell.sourceforge.net/aspell-0.60.4.txt>.

5 files changed, 26 insertions, 41 deletions

diff --git a/textproc/aspell/Makefile b/textproc/aspell/Makefile
index 638d5e29a624..de7a37712dcd 100644
--- a/textproc/aspell/Makefile
+++ b/textproc/aspell/Makefile
@@ -6,12 +6,12 @@
 #
 
 PORTNAME?=	aspell
-PORTVERSION=	0.60.3
+PORTVERSION=	0.60.4
 CATEGORIES+=	textproc
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	aspell
-DISTFILES=	aspell-0.60.3.tar.gz	# needed for slave ports / options
-EXTRACT_ONLY=	aspell-0.60.3.tar.gz
+DISTFILES=	aspell-0.60.4.tar.gz	# needed for slave ports / options
+EXTRACT_ONLY=	aspell-0.60.4.tar.gz
 
 MAINTAINER?=	thierry@FreeBSD.org
 COMMENT?=	Spelling checker with better suggestion logic than ispell
@@ -55,8 +55,8 @@ PLIST_SUB+=		NLS=""
 .endif
 
 .if !defined(NOPORTDOCS)
-MAN1=			aspell-import.1 aspell.1 pspell-config.1	\
-			run-with-aspell.1 word-list-compress.1
+MAN1=			aspell-import.1 aspell.1 pspell-config.1		\
+			run-with-aspell.1 word-list-compress.1 prezip-bin.1
 INFO=			aspell-dev aspell
 .endif
 
diff --git a/textproc/aspell/distinfo b/textproc/aspell/distinfo
index 38ed26d62747..ac4dc29b1b7b 100644
--- a/textproc/aspell/distinfo
+++ b/textproc/aspell/distinfo
@@ -1,5 +1,5 @@
-MD5 (aspell-0.60.3.tar.gz) = ca44ac2fcfdc7213e03d3b5610ce141a
-SIZE (aspell-0.60.3.tar.gz) = 1635824
+MD5 (aspell-0.60.4.tar.gz) = 4f1737e726d66476b9c7388831305510
+SIZE (aspell-0.60.4.tar.gz) = 1676825
 MD5 (aspell-af-0.50-0.tar.bz2) = bde617a195e70364f96eea71cf71a333
 SIZE (aspell-af-0.50-0.tar.bz2) = 256111
 MD5 (aspell6-am-0.03-1.tar.bz2) = 7e28708b53bd4bc3008dfb04237413ac
diff --git a/textproc/aspell/files/patch-Makefile.in b/textproc/aspell/files/patch-Makefile.in
index 10b80cb17d26..5b3d6af88b1f 100644
--- a/textproc/aspell/files/patch-Makefile.in
+++ b/textproc/aspell/files/patch-Makefile.in
@@ -1,6 +1,6 @@
---- Makefile.in.orig	Mon Jun 27 11:54:58 2005
-+++ Makefile.in	Tue Jun 28 21:37:39 2005
-@@ -447,7 +447,12 @@
+--- Makefile.in.orig	Wed Oct 19 11:14:24 2005
++++ Makefile.in	Wed Oct 19 18:12:26 2005
+@@ -446,7 +446,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}
-@@ -536,7 +541,7 @@
+@@ -535,7 +540,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:3:1 -no-undefined
- @INCREMENTED_SONAME_TRUE@libaspell_la_LDFLAGS = -version-info 16:3:0 -no-undefined
+ @INCREMENTED_SONAME_FALSE@libaspell_la_LDFLAGS = -version-info 16:4:1 -no-undefined
+ @INCREMENTED_SONAME_TRUE@libaspell_la_LDFLAGS = -version-info 16:4:0 -no-undefined
  @PSPELL_COMPATIBILITY_TRUE@libpspell_la_SOURCES = lib/dummy.cpp
-@@ -545,7 +550,7 @@
- @INCREMENTED_SONAME_TRUE@@PSPELL_COMPATIBILITY_TRUE@libpspell_la_LDFLAGS = -version-info 16:3:0 -no-undefined
+@@ -544,7 +549,7 @@
+ @INCREMENTED_SONAME_TRUE@@PSPELL_COMPATIBILITY_TRUE@libpspell_la_LDFLAGS = -version-info 16:4: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)
diff --git a/textproc/aspell/files/patch-configure b/textproc/aspell/files/patch-configure
index 7fc5b944da08..3b4333f295d1 100644
--- a/textproc/aspell/files/patch-configure
+++ b/textproc/aspell/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	Mon Nov  8 02:12:49 2004
-+++ configure	Mon Nov  8 13:47:08 2004
-@@ -2902,7 +2902,7 @@
+--- configure.orig	Wed Oct 19 10:36:26 2005
++++ configure	Wed Oct 19 18:13:12 2005
+@@ -2916,7 +2916,7 @@
  fi
  
  
@@ -9,7 +9,7 @@
  then
    CXXFLAGS="$CXXFLAGS -fno-exceptions"
  fi
-@@ -9830,13 +9830,6 @@
+@@ -9975,13 +9975,6 @@
  	;;
      esac
  
@@ -23,7 +23,7 @@
      # Update the list of available tags.
      if test -n "$tagname"; then
        echo appending configuration tag \"$tagname\" to $ofile
-@@ -19388,6 +19381,10 @@
+@@ -19872,6 +19865,10 @@
  
  # This can be used to rebuild libtool when needed
  LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
@@ -34,26 +34,7 @@
  
  # Always use our own libtool.
  LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -21283,16 +21280,16 @@
- /* end confdefs.h.  */
- #include <libintl.h>
- extern int _nl_msg_cat_cntr;
-+extern int *libintl_nl_domain_bindings;
- extern
- #ifdef __cplusplus
- "C"
- #endif
--const char *_nl_expand_alias ();
- int
- main ()
- {
- bindtextdomain ("", "");
--return (int) gettext ("") + _nl_msg_cat_cntr + *_nl_expand_alias (0)
-+return (int) gettext ("") + _nl_msg_cat_cntr + *libintl_nl_domain_bindings
-   ;
-   return 0;
- }
-@@ -22406,7 +22403,7 @@
+@@ -23160,7 +23157,7 @@
    CURSES_LIB=-lncurses
  
  cat >>confdefs.h <<\_ACEOF
@@ -62,7 +43,7 @@
  _ACEOF
  
  else
-@@ -22589,7 +22586,7 @@
+@@ -23341,7 +23338,7 @@
  
  
  cat >>confdefs.h <<\_ACEOF
diff --git a/textproc/aspell/pkg-plist b/textproc/aspell/pkg-plist
index 642536060e85..5be071135b40 100644
--- a/textproc/aspell/pkg-plist
+++ b/textproc/aspell/pkg-plist
@@ -99,6 +99,8 @@ lib/libpspell.so.16
 %%NLS%%share/locale/pt_BR/LC_MESSAGES/aspell.mo
 %%NLS%%share/locale/ro/LC_MESSAGES/aspell.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/aspell.mo
+%%NLS%%share/locale/rw/LC_MESSAGES/aspell.mo
+%%NLS%%share/locale/sl/LC_MESSAGES/aspell.mo
 %%NLS%%share/locale/sr/LC_MESSAGES/aspell.mo
 %%NLS%%share/locale/tg/LC_MESSAGES/aspell.mo
 %%NLS%%share/locale/uk/LC_MESSAGES/aspell.mo
@@ -111,6 +113,8 @@ lib/libpspell.so.16
 %%NLS%%@unexec rmdir %D/share/locale/cs 2>/dev/null || true
 %%NLS%%@unexec rmdir %D/share/locale/pt/LC_MESSAGES 2>/dev/null || true
 %%NLS%%@unexec rmdir %D/share/locale/pt 2>/dev/null || true
+%%NLS%%@unexec rmdir %D/share/locale/rw/LC_MESSAGES 2>/dev/null || true
+%%NLS%%@unexec rmdir %D/share/locale/rw 2>/dev/null || true
 %%NLS%%@unexec rmdir %D/share/locale/ro/LC_MESSAGES 2>/dev/null || true
 %%NLS%%@unexec rmdir %D/share/locale/ro 2>/dev/null || true
 %%NLS%%@unexec rmdir %D/share/locale/sr/LC_MESSAGES 2>/dev/null || true