Upgrade to 0.60.7.

Changelog at <http://aspell.net/man-html/ChangeLog.html>.

6 files changed, 38 insertions, 47 deletions

diff --git a/textproc/aspell/Makefile b/textproc/aspell/Makefile
index de39dcd6f8c3..d5ff494b8ce8 100644
--- a/textproc/aspell/Makefile
+++ b/textproc/aspell/Makefile
@@ -2,19 +2,17 @@
 # $FreeBSD$
 
 PORTNAME=	aspell
-PORTVERSION=	0.60.6.1
-PORTREVISION=	8
+PORTVERSION=	0.60.7
 CATEGORIES=	textproc
 MASTER_SITES=	GNU/aspell
 
-PATCH_SITES=	https://github.com/GNUAspell/aspell/commit/
-PATCHFILES=	8089fa02122f.patch:-p1
-
 MAINTAINER=	office@FreeBSD.org
 COMMENT=	Spelling checker with better suggestion logic than ispell
 
 LICENSE=	LGPL21
 
+USES=		cpe gmake iconv libtool ncurses perl5 shebangfix
+
 OPTIONS_DEFINE=	NLS DOCS
 OPTIONS_SUB=	yes
 
@@ -24,13 +22,12 @@ CONFIGURE_ARGS=	--enable-dict-dir=${DATADIR}	\
 		--enable-curses=ncursesw \
 		--enable-static
 
-USES=		cpe gmake iconv libtool ncurses perl5 shebangfix
 USE_LDCONFIG=	yes
 SHEBANG_FILES=	scripts/aspell-import
 CPE_VENDOR=	gnu
 
 INSTALL_TARGET=	install-strip
-VERINST=	${PORTVERSION:R:R}
+VERINST=	${PORTVERSION:R}
 SUB_FILES=	aspell.ver
 PLIST_SUB=	VER=${VERINST}
 SUB_LIST=	VERINST=${VERINST}
@@ -47,6 +44,6 @@ CFLAGS+=		-O
 .endif
 
 post-install:
-	@${INSTALL_DATA} ${WRKDIR}/aspell.ver ${STAGEDIR}${PREFIX}/etc
+	${INSTALL_DATA} ${WRKDIR}/aspell.ver ${STAGEDIR}${PREFIX}/etc
 
 .include <bsd.port.mk>
diff --git a/textproc/aspell/distinfo b/textproc/aspell/distinfo
index aea7e209146c..c1ddc2fec935 100644
--- a/textproc/aspell/distinfo
+++ b/textproc/aspell/distinfo
@@ -1,5 +1,3 @@
-TIMESTAMP = 1309773190
-SHA256 (aspell-0.60.6.1.tar.gz) = f52583a83a63633701c5f71db3dc40aab87b7f76b29723aeb27941eff42df6e1
-SIZE (aspell-0.60.6.1.tar.gz) = 1878163
-SHA256 (8089fa02122f.patch) = 28f7738df694bf5972339415d09933297f8144ee3b8e578e1f2ad5cb7697a2c4
-SIZE (8089fa02122f.patch) = 1126
+TIMESTAMP = 1564430692
+SHA256 (aspell-0.60.7.tar.gz) = 5ca8fc8cb0370cc6c9eb5b64c6d1bc5d57b3750dbf17887726c3407d833b70e4
+SIZE (aspell-0.60.7.tar.gz) = 2071890
diff --git a/textproc/aspell/files/patch-Makefile.in b/textproc/aspell/files/patch-Makefile.in
index 1bf3776d60d2..5151dc708bd9 100644
--- a/textproc/aspell/files/patch-Makefile.in
+++ b/textproc/aspell/files/patch-Makefile.in
@@ -1,6 +1,6 @@
---- Makefile.in.orig	2011-07-04 10:58:49.000000000 +0200
-+++ Makefile.in	2011-07-04 21:17:31.000000000 +0200
-@@ -481,7 +481,12 @@
+--- Makefile.in.orig	2019-07-29 06:38:02 UTC
++++ Makefile.in
+@@ -651,7 +651,12 @@ top_build_prefix = @top_build_prefix@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
  AUTOMAKE_OPTIONS = foreign subdir-objects
@@ -14,17 +14,17 @@
  DIST_SUBDIRS = ${SUBDIRS} examples myspell lib5
  filterdir = ${pkglibdir}
  optdir = ${pkgdatadir}
-@@ -569,7 +574,7 @@
+@@ -739,7 +744,7 @@ libaspell_la_SOURCES = common/cache.cpp common/string.
  	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 = $(LTLIBINTL) $(PTHREAD_LIB)
 +libaspell_la_LIBADD = $(LTLIBINTL) $(PTHREAD_LIB) $(LTLIBINTL)
- @INCREMENTED_SONAME_FALSE@libaspell_la_LDFLAGS = -version-info 16:5:1 -no-undefined
- @INCREMENTED_SONAME_TRUE@libaspell_la_LDFLAGS = -version-info 16:5:0 -no-undefined
+ @INCREMENTED_SONAME_FALSE@libaspell_la_LDFLAGS = -version-info 17:0:2 -no-undefined
+ @INCREMENTED_SONAME_TRUE@libaspell_la_LDFLAGS = -version-info 18:0:2 -no-undefined
  @PSPELL_COMPATIBILITY_TRUE@libpspell_la_SOURCES = lib/dummy.cpp
-@@ -578,7 +583,7 @@
- @INCREMENTED_SONAME_TRUE@@PSPELL_COMPATIBILITY_TRUE@libpspell_la_LDFLAGS = -version-info 16:5:0 -no-undefined
+@@ -748,7 +753,7 @@ libaspell_la_LIBADD = $(LTLIBINTL) $(PTHREAD_LIB)
+ @INCREMENTED_SONAME_TRUE@@PSPELL_COMPATIBILITY_TRUE@libpspell_la_LDFLAGS = -version-info 18:0:2 -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 66aaa5e2b6a2..bc76a92d3af9 100644
--- a/textproc/aspell/files/patch-configure
+++ b/textproc/aspell/files/patch-configure
@@ -1,31 +1,22 @@
---- configure.orig	2008-04-07 06:31:31.000000000 +0200
-+++ configure	2008-04-16 20:55:32.000000000 +0200
-@@ -3505,7 +3505,7 @@
- fi
- 
- 
--if test "$GXX" = "yes" && expr "$CXXFLAGS" : '.*-O' > /dev/null
-+if test "$GXX" = "yes" && expr -- "$CXXFLAGS" : '.*-O' > /dev/null
- then
-   CXXFLAGS="$CXXFLAGS -fno-exceptions"
- fi
-@@ -18179,7 +18179,7 @@
+--- configure.orig	2019-07-29 06:38:03 UTC
++++ configure
+@@ -18289,7 +18289,7 @@ _ACEOF
+ if ac_fn_cxx_try_link "$LINENO"; then :
    CURSES_LIB=-lncurses
  
- cat >>confdefs.h <<\_ACEOF
--#define CURSES_HEADER <ncurses/curses.h>
-+#define CURSES_HEADER <ncurses/ncurses.h>
- _ACEOF
+-$as_echo "#define CURSES_HEADER <ncurses/curses.h>" >>confdefs.h
++$as_echo "#define CURSES_HEADER <ncurses/ncurses.h>" >>confdefs.h
+ 
  
- else
-@@ -18366,8 +18366,8 @@
+ $as_echo "#define TERM_HEADER <ncurses/term.h>" >>confdefs.h
+@@ -18401,8 +18401,8 @@ $as_echo "#define TERM_HEADER <term.h>" >>confdefs.h
       if test "$enable_wide_curses" != "no"
       then
  
--       { echo "$as_me:$LINENO: checking for wide character support in curses libraray" >&5
--echo $ECHO_N "checking for wide character support in curses libraray... $ECHO_C" >&6; }
-+       { echo "$as_me:$LINENO: checking for wide character support in curses library" >&5
-+echo $ECHO_N "checking for wide character support in curses library... $ECHO_C" >&6; }
+-       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for wide character support in curses libraray" >&5
+-$as_echo_n "checking for wide character support in curses libraray... " >&6; }
++       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for wide character support in curses library" >&5
++$as_echo_n "checking for wide character support in curses library... " >&6; }
         if test -n "$have_mblen"
         then
-          cat >conftest.$ac_ext <<_ACEOF
+          cat confdefs.h - <<_ACEOF >conftest.$ac_ext
diff --git a/textproc/aspell/pkg-descr b/textproc/aspell/pkg-descr
index 7e3ff185e588..6a0957ab2a34 100644
--- a/textproc/aspell/pkg-descr
+++ b/textproc/aspell/pkg-descr
@@ -5,4 +5,4 @@ job of coming up with possible suggestions than ispell. Aspell
 also includes a powerful C++ library with C and Perl interfaces
 in the works.
 
-WWW: http://aspell.sourceforge.net/
+WWW: http://aspell.net/
diff --git a/textproc/aspell/pkg-plist b/textproc/aspell/pkg-plist
index 5151eb3a8684..edf83e4984c9 100644
--- a/textproc/aspell/pkg-plist
+++ b/textproc/aspell/pkg-plist
@@ -70,11 +70,11 @@ lib/aspell-%%VER%%/standard.kbd
 lib/libaspell.a
 lib/libaspell.so
 lib/libaspell.so.15
-lib/libaspell.so.15.1.5
+lib/libaspell.so.15.2.0
 lib/libpspell.a
 lib/libpspell.so
 lib/libpspell.so.15
-lib/libpspell.so.15.1.5
+lib/libpspell.so.15.2.0
 man/man1/aspell-import.1.gz
 man/man1/aspell.1.gz
 man/man1/prezip-bin.1.gz
@@ -99,16 +99,21 @@ man/man1/word-list-compress.1.gz
 %%NLS%%share/locale/da/LC_MESSAGES/aspell.mo
 %%NLS%%share/locale/de/LC_MESSAGES/aspell.mo
 %%NLS%%share/locale/en_GB/LC_MESSAGES/aspell.mo
+%%NLS%%share/locale/eo/LC_MESSAGES/aspell.mo
 %%NLS%%share/locale/es/LC_MESSAGES/aspell.mo
 %%NLS%%share/locale/fi/LC_MESSAGES/aspell.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/aspell.mo
+%%NLS%%share/locale/fur/LC_MESSAGES/aspell.mo
 %%NLS%%share/locale/ga/LC_MESSAGES/aspell.mo
+%%NLS%%share/locale/hr/LC_MESSAGES/aspell.mo
 %%NLS%%share/locale/id/LC_MESSAGES/aspell.mo
 %%NLS%%share/locale/it/LC_MESSAGES/aspell.mo
 %%NLS%%share/locale/ja/LC_MESSAGES/aspell.mo
 %%NLS%%share/locale/mn/LC_MESSAGES/aspell.mo
 %%NLS%%share/locale/ms/LC_MESSAGES/aspell.mo
 %%NLS%%share/locale/nl/LC_MESSAGES/aspell.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/aspell.mo
+%%NLS%%share/locale/pt/LC_MESSAGES/aspell.mo
 %%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