4 files changed, 19 insertions, 16 deletions

diff --git a/textproc/aspell/Makefile b/textproc/aspell/Makefile
index d5ff494b8ce8..7ef365c1dff6 100644
--- a/textproc/aspell/Makefile
+++ b/textproc/aspell/Makefile
@@ -2,9 +2,11 @@
 # $FreeBSD$
 
 PORTNAME=	aspell
-PORTVERSION=	0.60.7
+DISTVERSION=	0.60.8-20190817
 CATEGORIES=	textproc
-MASTER_SITES=	GNU/aspell
+#MASTER_SITES=	GNU/aspell
+MASTER_SITES=	${MASTER_SITE_GNU_ALPHA}
+MASTER_SITE_SUBDIR=aspell
 
 MAINTAINER=	office@FreeBSD.org
 COMMENT=	Spelling checker with better suggestion logic than ispell
@@ -27,7 +29,7 @@ SHEBANG_FILES=	scripts/aspell-import
 CPE_VENDOR=	gnu
 
 INSTALL_TARGET=	install-strip
-VERINST=	${PORTVERSION:R}
+VERINST=	${PORTVERSION:R:R}
 SUB_FILES=	aspell.ver
 PLIST_SUB=	VER=${VERINST}
 SUB_LIST=	VERINST=${VERINST}
diff --git a/textproc/aspell/distinfo b/textproc/aspell/distinfo
index c1ddc2fec935..fa6f8fd2f281 100644
--- a/textproc/aspell/distinfo
+++ b/textproc/aspell/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1564430692
-SHA256 (aspell-0.60.7.tar.gz) = 5ca8fc8cb0370cc6c9eb5b64c6d1bc5d57b3750dbf17887726c3407d833b70e4
-SIZE (aspell-0.60.7.tar.gz) = 2071890
+TIMESTAMP = 1566848068
+SHA256 (aspell-0.60.8-20190817.tar.gz) = 92df8b464f4cb7efb374efd7962c51db2c57798323fa2b86c1a442f7c16c0d5b
+SIZE (aspell-0.60.8-20190817.tar.gz) = 27065381
diff --git a/textproc/aspell/files/patch-Makefile.in b/textproc/aspell/files/patch-Makefile.in
index 5151dc708bd9..b01be596c48f 100644
--- a/textproc/aspell/files/patch-Makefile.in
+++ b/textproc/aspell/files/patch-Makefile.in
@@ -1,6 +1,6 @@
---- Makefile.in.orig	2019-07-29 06:38:02 UTC
+--- Makefile.in.orig	2019-08-18 01:39:59 UTC
 +++ Makefile.in
-@@ -651,7 +651,12 @@ top_build_prefix = @top_build_prefix@
+@@ -666,7 +666,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}
-@@ -739,7 +744,7 @@ libaspell_la_SOURCES = common/cache.cpp common/string.
+@@ -766,7 +771,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 17:0:2 -no-undefined
- @INCREMENTED_SONAME_TRUE@libaspell_la_LDFLAGS = -version-info 18:0:2 -no-undefined
++libaspell_la_LIBADD = $(LTLIBINTL) $(PTHREAD_LIB)  $(LTLIBINTL)
+ @INCREMENTED_SONAME_FALSE@libaspell_la_LDFLAGS = -version-info 18:0:3 -no-undefined
+ @INCREMENTED_SONAME_TRUE@libaspell_la_LDFLAGS = -version-info 19:0:3 -no-undefined
  @PSPELL_COMPATIBILITY_TRUE@libpspell_la_SOURCES = lib/dummy.cpp
-@@ -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
+@@ -774,7 +779,7 @@ libaspell_la_LIBADD = $(LTLIBINTL) $(PTHREAD_LIB)
+ @PSPELL_COMPATIBILITY_TRUE@libpspell_la_LDFLAGS = $(libaspell_la_LDFLAGS)
  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/pkg-plist b/textproc/aspell/pkg-plist
index edf83e4984c9..a5a147dc1b96 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.2.0
+lib/libaspell.so.15.3.0
 lib/libpspell.a
 lib/libpspell.so
 lib/libpspell.so.15
-lib/libpspell.so.15.2.0
+lib/libpspell.so.15.3.0
 man/man1/aspell-import.1.gz
 man/man1/aspell.1.gz
 man/man1/prezip-bin.1.gz
@@ -85,6 +85,7 @@ man/man1/word-list-compress.1.gz
 %%DATADIR%%/comment.amf
 %%DATADIR%%/email.amf
 %%DATADIR%%/html.amf
+%%DATADIR%%/markdown.amf
 %%DATADIR%%/none.amf
 %%DATADIR%%/nroff.amf
 %%DATADIR%%/perl.amf