3 files changed, 63 insertions, 21 deletions

diff --git a/textproc/aspell/Makefile b/textproc/aspell/Makefile
index 1a8503025c1c..d465a5f8c3b5 100644
--- a/textproc/aspell/Makefile
+++ b/textproc/aspell/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME?=	aspell
 PORTVERSION=	0.50.5
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES+=	textproc
 MASTER_SITES=	http://aspell.net/	\
 		${MASTER_SITE_GNU}
@@ -56,7 +56,7 @@ DICTVER_CS=	0.51-0
 DICTVER_CY=	0.50-3
 DICTVER_DA=	0.50.1-0
 DICTVER_EL=	0.50-3
-DICTVER_EN=	0.51-1
+DICTVER_EN=	6.0-0
 DICTVER_FO=	0.51-0
 DICTVER_FR=	0.50-3
 DICTVER_GA=	0.50.1-0
@@ -84,6 +84,7 @@ DICTVER_UK=	0.51-0
 DICTVER_WA=	0.50-0
 DICTVER_ZU=	0.50-0
 DICT_SUFFIX=	.tar.bz2
+D5=		en
 
 .include <bsd.port.pre.mk>
 
@@ -170,7 +171,9 @@ DICTS=	${LG}
 .endif
 .for DICO in ${DICTS}
 MASTER_SITES+=	ftp://ftp.gnu.org/gnu/aspell/dict/${DICO}/:dict${DICO}
-. if (${SPECDICTS:M${DICO}*} != "")
+. if ${D5} == ${DICO}
+DISTFILES+=	aspell5-${DICO}-${DICTVER_${DICO:U}}${DICT_SUFFIX}:dict${DICO}
+. elif (${SPECDICTS:M${DICO}*} != "")
 DISTFILES+=	aspell-${DICO}-${DICTVER_${DICO:U}}${DICT_SUFFIX}:dict${DICO}
 . else
 DISTFILES+=	aspell-${DICO}-${DICTVERSION}${DICT_SUFFIX}:dict${DICO}
@@ -179,7 +182,10 @@ DISTFILES+=	aspell-${DICO}-${DICTVERSION}${DICT_SUFFIX}:dict${DICO}
 
 post-extract:
 .for DICO in ${DICTS}
-. if (${SPECDICTS:M${DICO}*} != "")
+. if ${D5} == ${DICO}
+	@cd ${WRKDIR} && \
+	 ${TAR} -xjf ${DISTDIR}/aspell5-${DICO}-${DICTVER_${DICO:U}}${DICT_SUFFIX}
+. elif (${SPECDICTS:M${DICO}*} != "")
 	@cd ${WRKDIR} && \
 	 ${TAR} -xjf ${DISTDIR}/aspell-${DICO}-${DICTVER_${DICO:U}}${DICT_SUFFIX}
 . else
@@ -188,14 +194,14 @@ post-extract:
 . endif
 .endfor
 
-post-patch:	# To be removed after commit of PR ports/63944
-	${REINPLACE_CMD} -e '/^LIBTOOL=/s^\$$(top_builddir)/libtool^${LIBTOOL}^' \
-		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
-
 post-install:
 .for DICO in ${DICTS}
 	@${ECHO_MSG} "===>   Installing for ${DICO} dictionaries"
-. if (${SPECDICTS:M${DICO}*} != "")
+. if ${D5} == ${DICO}
+	@cd ${WRKDIR}/aspell5-${DICO}-${DICTVER_${DICO:U}} &&	\
+	 ${CONF_DICT_ENV} ./${CONFIGURE_SCRIPT} &&		\
+	 ${GMAKE} install
+. elif (${SPECDICTS:M${DICO}*} != "")
 	@cd ${WRKDIR}/aspell-${DICO}-${DICTVER_${DICO:U}} &&	\
 	 ${CONF_DICT_ENV} ./${CONFIGURE_SCRIPT} &&		\
 	 ${GMAKE} install
diff --git a/textproc/aspell/distinfo b/textproc/aspell/distinfo
index b4a2d886d4d7..141f2ec522a2 100644
--- a/textproc/aspell/distinfo
+++ b/textproc/aspell/distinfo
@@ -18,8 +18,8 @@ MD5 (aspell-de-0.50-2.tar.bz2) = 204a9737ff0110fb8c7d284bd7200f7d
 SIZE (aspell-de-0.50-2.tar.bz2) = 304820
 MD5 (aspell-el-0.50-3.tar.bz2) = 0ea2c42ceb9b91f7f5de2c017234ad37
 SIZE (aspell-el-0.50-3.tar.bz2) = 328225
-MD5 (aspell-en-0.51-1.tar.bz2) = aabb933daee93be446c71e79babf8da4
-SIZE (aspell-en-0.51-1.tar.bz2) = 172874
+MD5 (aspell5-en-6.0-0.tar.bz2) = cf3ed669bc15a4a9360c0498eca27507
+SIZE (aspell5-en-6.0-0.tar.bz2) = 180932
 MD5 (aspell-eo-0.50-2.tar.bz2) = f84147f5909e1a5f7adb86f27c71eb8c
 SIZE (aspell-eo-0.50-2.tar.bz2) = 89703
 MD5 (aspell-es-0.50-2.tar.bz2) = 4a8583e9ef9f4aed03f5a7fe09d40060
diff --git a/textproc/aspell/pkg-plist.en b/textproc/aspell/pkg-plist.en
index 96fab462af42..4355a825e110 100644
--- a/textproc/aspell/pkg-plist.en
+++ b/textproc/aspell/pkg-plist.en
@@ -1,20 +1,56 @@
-share/aspell/american-w-accents.alias
+share/aspell/american-w_accents.alias
+share/aspell/american-wo_accents.alias
 share/aspell/american.alias
-share/aspell/british-w-accents.alias
+share/aspell/british-ise-w_accents.alias
+share/aspell/british-ise-wo_accents.alias
+share/aspell/british-ise.alias
+share/aspell/british-ize-w_accents.alias
+share/aspell/british-ize-wo_accents.alias
+share/aspell/british-ize.alias
+share/aspell/british-w_accents.alias
+share/aspell/british-wo_accents.alias
 share/aspell/british.alias
-share/aspell/canadian-w-accents.alias
+share/aspell/canadian-w_accents.alias
+share/aspell/canadian-wo_accents.alias
 share/aspell/canadian.alias
-share/aspell/en-only.rws
+share/aspell/en-common.rws
+share/aspell/en-variant_0.multi
+share/aspell/en-variant_0.rws
+share/aspell/en-variant_1.multi
+share/aspell/en-variant_1.rws
+share/aspell/en-variant_2.multi
+share/aspell/en-variant_2.rws
+share/aspell/en-w_accents.multi
+share/aspell/en-wo_accents.multi
 share/aspell/en.dat
 share/aspell/en.multi
-share/aspell/en_CA-only.rws
-share/aspell/en_CA-w-accents.multi
+share/aspell/en_CA-w_accents-only.rws
+share/aspell/en_CA-w_accents.multi
+share/aspell/en_CA-wo_accents-only.rws
+share/aspell/en_CA-wo_accents.multi
 share/aspell/en_CA.multi
-share/aspell/en_GB-only.rws
-share/aspell/en_GB-w-accents.multi
+share/aspell/en_GB-ise-w_accents-only.rws
+share/aspell/en_GB-ise-w_accents.multi
+share/aspell/en_GB-ise-wo_accents-only.rws
+share/aspell/en_GB-ise-wo_accents.multi
+share/aspell/en_GB-ise.multi
+share/aspell/en_GB-ize-w_accents-only.rws
+share/aspell/en_GB-ize-w_accents.multi
+share/aspell/en_GB-ize-wo_accents-only.rws
+share/aspell/en_GB-ize-wo_accents.multi
+share/aspell/en_GB-ize.multi
+share/aspell/en_GB-w_accents.multi
+share/aspell/en_GB-wo_accents.multi
 share/aspell/en_GB.multi
-share/aspell/en_US-only.rws
-share/aspell/en_US-w-accents.multi
+share/aspell/en_US-w_accents-only.rws
+share/aspell/en_US-w_accents.multi
+share/aspell/en_US-wo_accents-only.rws
+share/aspell/en_US-wo_accents.multi
 share/aspell/en_US.multi
 share/aspell/en_phonet.dat
+share/aspell/english-variant_0.alias
+share/aspell/english-variant_1.alias
+share/aspell/english-variant_2.alias
+share/aspell/english-w_accents.alias
+share/aspell/english-wo_accents.alias
 share/aspell/english.alias