Index: Makefile
===================================================================
--- Makefile	(revision 395580)
+++ Makefile	(working copy)
@@ -1,23 +1,20 @@
 # $FreeBSD$
 
 PORTNAME=	hunspell
-PORTVERSION=	7.1
-PORTREVISION=	1
+PORTVERSION=	2015.08.24
 CATEGORIES=	textproc
-MASTER_SITES=	SF/wordlist/Hunspell%20en_US/${PORTVERSION}-0/ \
-		SF/wordlist/Hunspell%20en_CA/${PORTVERSION}-0/:CA \
-		LOCAL/sunpoet/${PORTNAME}/:GB
+MASTER_SITES=	SF/wordlist/speller/${PORTVERSION}/ \
+		LOCAL/sunpoet/${PORTNAME}/
 PKGNAMEPREFIX=	en-
-DISTFILES=	hunspell-en_US-${PORTVERSION}-0${EXTRACT_SUFX} \
-		hunspell-en_CA-${PORTVERSION}-0${EXTRACT_SUFX}:CA \
-		en_GB-1.20.zip:GB
+DISTFILES=	hunspell-en_US-${PORTVERSION}${EXTRACT_SUFX} \
+		hunspell-en_CA-${PORTVERSION}${EXTRACT_SUFX} \
+		hunspell-en_GB-ise-${PORTVERSION}${EXTRACT_SUFX} \
+		hunspell-en_GB-ize-${PORTVERSION}${EXTRACT_SUFX}
 DIST_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	office@FreeBSD.org
 COMMENT=	English hunspell dictionaries
 
-# en_CA and en_US are licensed under BSD
-# en_GB is licensed under LGPL3
 LICENSE=	BSD3CLAUSE LGPL3
 LICENSE_COMB=	multi
 
@@ -26,13 +23,31 @@
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
 
+OPTIONS_DEFINE= GB_IZE
+GB_IZE_DESC=	Install en_GB dictionary with -ize instead of -ise spelling
+
 PLIST_FILES=	%%DATADIR%%/en_CA.aff \
 		%%DATADIR%%/en_CA.dic \
+		%%DATADIR%%/README_en_CA.txt \
+		%%DATADIR%%/en_GB-ise.dic \
+		%%DATADIR%%/en_GB-ise.aff \
+		%%DATADIR%%/README_en_GB-ise.txt \
+		%%DATADIR%%/en_GB-ize.dic \
+		%%DATADIR%%/en_GB-ize.aff \
+		%%DATADIR%%/README_en_GB-ize.txt \
 		%%DATADIR%%/en_GB.dic \
 		%%DATADIR%%/en_GB.aff \
 		%%DATADIR%%/en_US.aff \
-		%%DATADIR%%/en_US.dic
+		%%DATADIR%%/en_US.dic \
+		%%DATADIR%%/README_en_US.txt
 
+.include <bsd.port.options.mk>
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|UTF8|UTF-8|' \
+	-e "s|WORDCHARS 0123456789|WORDCHARS 0123456789'-|" \
+	${WRKSRC}/en_CA.aff ${WRKSRC}/en_GB-ise.aff ${WRKSRC}/en_GB-ize.aff \
+	${WRKSRC}/en_US.aff
 GBALIASES=	en_AG en_AU en_BS en_BW en_BZ en_DK en_GH en_HK en_IE en_IN \
 		en_JM en_NA en_NG en_NZ en_SG en_TT en_ZA en_ZW
 USALIASES=	en_PH
@@ -44,6 +59,14 @@
 do-install:
 	${MKDIR} ${STAGEDIR}${DATADIR}/
 	${INSTALL_DATA} ${WRKSRC}/*.aff ${WRKSRC}/*.dic ${STAGEDIR}${DATADIR}/
+	${INSTALL_DATA} ${WRKSRC}/README_*.txt ${STAGEDIR}${DATADIR}/
+.if ${PORT_OPTIONS:MGB_IZE}
+	${LN} -s en_GB-ize.aff ${STAGEDIR}${DATADIR}/en_GB.aff
+	${LN} -s en_GB-ize.dic ${STAGEDIR}${DATADIR}/en_GB.dic
+.else
+	${LN} -s en_GB-ise.aff ${STAGEDIR}${DATADIR}/en_GB.aff
+	${LN} -s en_GB-ise.dic ${STAGEDIR}${DATADIR}/en_GB.dic
+.endif
 .for ALIAS in ${GBALIASES}
 	${LN} -s en_GB.aff ${STAGEDIR}${DATADIR}/${ALIAS}.aff
 	${LN} -s en_GB.dic ${STAGEDIR}${DATADIR}/${ALIAS}.dic
Index: distinfo
===================================================================
--- distinfo	(revision 395580)
+++ distinfo	(working copy)
@@ -1,6 +1,8 @@
-SHA256 (hunspell/hunspell-en_US-7.1-0.zip) = e1f341803f0aedb1a0d00ca1db988506fd6fe216758367e4bed66e2f2d22a198
-SIZE (hunspell/hunspell-en_US-7.1-0.zip) = 192842
-SHA256 (hunspell/hunspell-en_CA-7.1-0.zip) = 9229ffb96f6cdfd72dd03db4477c7416e9b90166498be2a5f487cc42e23f3223
-SIZE (hunspell/hunspell-en_CA-7.1-0.zip) = 193289
-SHA256 (hunspell/en_GB-1.20.zip) = 5869d8bd80eb2eb328ebe36b356348de4ae2acb1db6df39d1717d33f89f63728
-SIZE (hunspell/en_GB-1.20.zip) = 250182
+SHA256 (hunspell/hunspell-en_US-2015.08.24.zip) = 780a17ac492088b7ce45efba1b689139f84e53557347c67ffb9ecc9ac20f71a1
+SIZE (hunspell/hunspell-en_US-2015.08.24.zip) = 195031
+SHA256 (hunspell/hunspell-en_CA-2015.08.24.zip) = 8b92234392fad90af52afddc762a002c6415e3c3e4e845b303ac758acd5e6ee0
+SIZE (hunspell/hunspell-en_CA-2015.08.24.zip) = 195501
+SHA256 (hunspell/hunspell-en_GB-ise-2015.08.24.zip) = 8d91b98799e37bbb8c69229df8f3e67ff8fd606a15cb3da59a1ae7fc4775bae7
+SIZE (hunspell/hunspell-en_GB-ise-2015.08.24.zip) = 195663
+SHA256 (hunspell/hunspell-en_GB-ize-2015.08.24.zip) = 7474db3cb90879a0845b24073339c9b7c197186b07ff14881c37ead9a2ce787a
+SIZE (hunspell/hunspell-en_GB-ize-2015.08.24.zip) = 195607
Index: pkg-descr
===================================================================
--- pkg-descr	(revision 395580)
+++ pkg-descr	(working copy)
@@ -1,4 +1,3 @@
 English hunspell dictionaries
 
-WWW: http://wordlist.sourceforge.net/
-WWW: http://en-gb.pyxidium.co.uk/dictionary/
+WWW: http://wordlist.aspell.net/