- upgrade French dictionary to fix problem

- add three new dictionaries
PR:	ports/44244
Submitted by:	maintainer

7 files changed, 89 insertions, 14 deletions

diff --git a/textproc/aspell/Makefile b/textproc/aspell/Makefile
index 70732ed7adb2..bdec8184fbc5 100644
--- a/textproc/aspell/Makefile
+++ b/textproc/aspell/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME?=	aspell
 PORTVERSION=	0.50.2
+PORTREVISION=	1
 CATEGORIES+=	textproc
 MASTER_SITES=	http://savannah.gnu.org/download/${PORTNAME}/rel/	\
 		${MASTER_SITE_GNU}
@@ -39,11 +40,15 @@ DESCR=		${.CURDIR}/pkg-descr
 
 CONF_DICT_ENV=	ASPELL="${PREFIX}/bin/aspell"	\
 		WORD_LIST_COMPRESS="${PREFIX}/bin/word-list-compress"
-DICT_DIR=	-${DICTVERSION}-${DICTREVISION}
-DICT_SUFFIX=	${DICT_DIR}.tar.bz2
-AVAIL_DICT=	br ca cs da de en eo es fo fr it nl no pl pt ro ru sk sv
+AVAIL_DICT=	br ca cs cy da de el en eo es fo fr it nl no pl pt ro ru sk sv uk
 DICTVERSION=	0.50
 DICTREVISION=	2
+DICTREVISION2=	3
+UDICT1=		cy
+UDICT2=		el
+UDICT3=		fr
+UDICT4=		uk
+DICT_SUFFIX=	.tar.bz2
 
 .include <bsd.port.pre.mk>
 
@@ -57,7 +62,7 @@ DEF_DICT=	${i}
 DEF_DICT?=	en
 
 pre-everything::
-.if (!defined(ASPELL_BR) && !defined(ASPELL_CA) && !defined(ASPELL_CS) && !defined(ASPELL_DA) && !defined(ASPELL_DE) && !defined(ASPELL_EN) && !defined(ASPELL_EO) && !defined(ASPELL_ES) && !defined(ASPELL_FO) && !defined(ASPELL_FR) && !defined(ASPELL_IT) && !defined(ASPELL_NL) && !defined(ASPELL_NO) && !defined(ASPELL_PL) && !defined(ASPELL_PT) && !defined(ASPELL_RO) && !defined(ASPELL_RU) && !defined(ASPELL_SK) && !defined(ASPELL_SV))
+.if (!defined(ASPELL_BR) && !defined(ASPELL_CA) && !defined(ASPELL_CS) && !defined(ASPELL_CY) && !defined(ASPELL_DA) && !defined(ASPELL_DE) && !defined(ASPELL_EL) && !defined(ASPELL_EN) && !defined(ASPELL_EO) && !defined(ASPELL_ES) && !defined(ASPELL_FO) && !defined(ASPELL_FR) && !defined(ASPELL_IT) && !defined(ASPELL_NL) && !defined(ASPELL_NO) && !defined(ASPELL_PL) && !defined(ASPELL_PT) && !defined(ASPELL_RO) && !defined(ASPELL_RU) && !defined(ASPELL_SK) && !defined(ASPELL_SV) && !defined(ASPELL_UK))
 	@${ECHO_MSG} '*********************************************************'
 	@${ECHO_MSG} '* You can add further dictionaries:                     *'
 	@${ECHO_MSG} '*                                 Use make-flag:        *'
@@ -65,21 +70,24 @@ pre-everything::
 	@${ECHO_MSG} '*  - Catalan                      ASPELL_CA=yes         *'
 	@${ECHO_MSG} '*  - Czech                        ASPELL_CS=yes         *'
 	@${ECHO_MSG} '*  - Danish                       ASPELL_DA=yes         *'
-	@${ECHO_MSG} '*  - German                       ASPELL_DE=yes         *'
+	@${ECHO_MSG} '*  - Dutch                        ASPELL_NL=yes         *'
 	@${ECHO_MSG} '*  - English                      ASPELL_EN=yes         *'
 	@${ECHO_MSG} '*  - Esperanto                    ASPELL_EO=yes         *'
-	@${ECHO_MSG} '*  - Spanish                      ASPELL_ES=yes         *'
 	@${ECHO_MSG} '*  - Faroese                      ASPELL_FO=yes         *'
 	@${ECHO_MSG} '*  - French                       ASPELL_FR=yes         *'
+	@${ECHO_MSG} '*  - German                       ASPELL_DE=yes         *'
+	@${ECHO_MSG} '*  - Greek                        ASPELL_EL=yes         *'
 	@${ECHO_MSG} '*  - Italian                      ASPELL_IT=yes         *'
-	@${ECHO_MSG} '*  - Dutch                        ASPELL_NL=yes         *'
 	@${ECHO_MSG} '*  - Norwegian                    ASPELL_NO=yes         *'
 	@${ECHO_MSG} '*  - Polish                       ASPELL_PL=yes         *'
 	@${ECHO_MSG} '*  - Portuguese                   ASPELL_PT=yes         *'
 	@${ECHO_MSG} '*  - Romanian                     ASPELL_RO=yes         *'
 	@${ECHO_MSG} '*  - Russian                      ASPELL_RU=yes         *'
 	@${ECHO_MSG} '*  - Slovak                       ASPELL_SK=yes         *'
+	@${ECHO_MSG} '*  - Spanish                      ASPELL_ES=yes         *'
 	@${ECHO_MSG} '*  - Swedish                      ASPELL_SV=yes         *'
+	@${ECHO_MSG} '*  - Ukrainian                    ASPELL_UK=yes         *'
+	@${ECHO_MSG} '*  - Welsh                        ASPELL_CY=yes         *'
 	@${ECHO_MSG} '*                                                       *'
 	@${ECHO_MSG} '* Example: "make ASPELL_FR=yes ASPELL_EN=yes install"   *'
 	@${ECHO_MSG} '*********************************************************'
@@ -93,12 +101,18 @@ DICTS+=		ca
 .if defined(ASPELL_CS)
 DICTS+=		cs
 .endif
+.if defined(ASPELL_CY)
+DICTS+=		cy
+.endif
 .if defined(ASPELL_DA)
 DICTS+=		da
 .endif
 .if defined(ASPELL_DE)
 DICTS+=		de
 .endif
+.if defined(ASPELL_EL)
+DICTS+=		el
+.endif
 .if defined(ASPELL_EN)
 DICTS+=		en
 .endif
@@ -141,6 +155,9 @@ DICTS+=		sk
 .if defined(ASPELL_SV)
 DICTS+=		sv
 .endif
+.if defined(ASPELL_UK)
+DICTS+=		uk
+.endif
 .endif
 .if !defined(DICTS)
 .for LG in ${AVAIL_DICT}
@@ -150,21 +167,63 @@ DICTS=	${LG}
 .endfor
 .endif
 .for DICO in ${DICTS}
-DISTFILES+=	aspell-${DICO}${DICT_SUFFIX}
+.if (${UDICT1} == ${DICO})
+DISTFILES+=	aspell-${DICO}-${DICTVERSION}-${DICTREVISION2}${DICT_SUFFIX}
+.elif (${UDICT2} == ${DICO})
+DISTFILES+=	aspell-${DICO}-${DICTVERSION}-${DICTREVISION2}${DICT_SUFFIX}
+.elif (${UDICT3} == ${DICO})
+DISTFILES+=	aspell-${DICO}-${DICTVERSION}-${DICTREVISION2}${DICT_SUFFIX}
+.elif (${UDICT4} == ${DICO})
+DISTFILES+=	aspell-${DICO}-${DICTVERSION}-${DICTREVISION2}${DICT_SUFFIX}
+.else
+DISTFILES+=	aspell-${DICO}-${DICTVERSION}-${DICTREVISION}${DICT_SUFFIX}
+.endif
 .endfor
 
 post-extract:
 .for DICO in ${DICTS}
+.if (${UDICT1} == ${DICO})
+	@cd ${WRKDIR} && \
+	 ${TAR} -xjf ${DISTDIR}/aspell-${DICO}-${DICTVERSION}-${DICTREVISION2}${DICT_SUFFIX}
+.elif (${UDICT2} == ${DICO})
+	@cd ${WRKDIR} && \
+	 ${TAR} -xjf ${DISTDIR}/aspell-${DICO}-${DICTVERSION}-${DICTREVISION2}${DICT_SUFFIX}
+.elif (${UDICT3} == ${DICO})
+	@cd ${WRKDIR} && \
+	 ${TAR} -xjf ${DISTDIR}/aspell-${DICO}-${DICTVERSION}-${DICTREVISION2}${DICT_SUFFIX}
+.elif (${UDICT4} == ${DICO})
 	@cd ${WRKDIR} && \
-	 ${TAR} -xjf ${DISTDIR}/aspell-${DICO}${DICT_SUFFIX}
+	 ${TAR} -xjf ${DISTDIR}/aspell-${DICO}-${DICTVERSION}-${DICTREVISION2}${DICT_SUFFIX}
+.else
+	@cd ${WRKDIR} && \
+	 ${TAR} -xjf ${DISTDIR}/aspell-${DICO}-${DICTVERSION}-${DICTREVISION}${DICT_SUFFIX}
+.endif
 .endfor
 
 post-install:
 .for DICO in ${DICTS}
 	@${ECHO_MSG} "===>   Installing for ${DICO} dictionaries"
-	@cd ${WRKDIR}/aspell-${DICO}${DICT_DIR} && \
+.if (${UDICT1} == ${DICO})
+	@cd ${WRKDIR}/aspell-${DICO}-${DICTVERSION}-${DICTREVISION2} && \
+	 ${CONF_DICT_ENV} ./${CONFIGURE_SCRIPT} && \
+	 ${GMAKE} install
+.elif (${UDICT2} == ${DICO})
+	@cd ${WRKDIR}/aspell-${DICO}-${DICTVERSION}-${DICTREVISION2} && \
+	 ${CONF_DICT_ENV} ./${CONFIGURE_SCRIPT} && \
+	 ${GMAKE} install
+.elif (${UDICT3} == ${DICO})
+	@cd ${WRKDIR}/aspell-${DICO}-${DICTVERSION}-${DICTREVISION2} && \
 	 ${CONF_DICT_ENV} ./${CONFIGURE_SCRIPT} && \
 	 ${GMAKE} install
+.elif (${UDICT4} == ${DICO})
+	@cd ${WRKDIR}/aspell-${DICO}-${DICTVERSION}-${DICTREVISION2} && \
+	 ${CONF_DICT_ENV} ./${CONFIGURE_SCRIPT} && \
+	 ${GMAKE} install
+.else
+	@cd ${WRKDIR}/aspell-${DICO}-${DICTVERSION}-${DICTREVISION} && \
+	 ${CONF_DICT_ENV} ./${CONFIGURE_SCRIPT} && \
+	 ${GMAKE} install
+.endif
 	@${CAT} ${MASTERDIR}/pkg-plist.${DICO} >> ${TMPPLIST}
 .endfor
 	@${ECHO_CMD} "@dirrm share/aspell" >> ${TMPPLIST}
diff --git a/textproc/aspell/distinfo b/textproc/aspell/distinfo
index f82ede325a77..16a9943050cb 100644
--- a/textproc/aspell/distinfo
+++ b/textproc/aspell/distinfo
@@ -2,13 +2,15 @@ MD5 (aspell-0.50.2.tar.gz) = d6c3d50c355bc2e6b2f253a1f7209b92
 MD5 (aspell-br-0.50-2.tar.bz2) = 800c7a28e09bd7734d1501cb7a91ad8f
 MD5 (aspell-ca-0.50-2.tar.bz2) = c593ae266d3e48e4d482ff9b9a52acdd
 MD5 (aspell-cs-0.50-2.tar.bz2) = ac4ea210149e6b312b63a862c27df5b4
+MD5 (aspell-cy-0.50-3.tar.bz2) = d59fee193dba87973b38ac2862a090bb
 MD5 (aspell-da-0.50-2.tar.bz2) = c023f246ef448128e6a3b93388ed57e7
 MD5 (aspell-de-0.50-2.tar.bz2) = 204a9737ff0110fb8c7d284bd7200f7d
+MD5 (aspell-el-0.50-3.tar.bz2) = 0ea2c42ceb9b91f7f5de2c017234ad37
 MD5 (aspell-en-0.50-2.tar.bz2) = 9cee7464f9e6e2eae42443048cd3c855
 MD5 (aspell-eo-0.50-2.tar.bz2) = f84147f5909e1a5f7adb86f27c71eb8c
 MD5 (aspell-es-0.50-2.tar.bz2) = 4a8583e9ef9f4aed03f5a7fe09d40060
 MD5 (aspell-fo-0.50-2.tar.bz2) = 9a1031062c72ffce7dac284ed0006a02
-MD5 (aspell-fr-0.50-2.tar.bz2) = 10da01938ec743b16e1dbf0d9abaffbf
+MD5 (aspell-fr-0.50-3.tar.bz2) = 53a2d05c4e8f7fabd3cefe24db977be7
 MD5 (aspell-it-0.50-2.tar.bz2) = efa602e47fc49db2cc670f7e5c1628e1
 MD5 (aspell-nl-0.50-2.tar.bz2) = c3ef9fd7dc4c47d816eee9ef5149c76a
 MD5 (aspell-no-0.50-2.tar.bz2) = b24b20ad02ce2a569f71f949b48823cc
@@ -18,3 +20,4 @@ MD5 (aspell-ro-0.50-2.tar.bz2) = 96d97a79a0a0e04c580e0d0671d650c9
 MD5 (aspell-ru-0.50-2.tar.bz2) = d7add85adeef2ea36457ea811d52c295
 MD5 (aspell-sk-0.50-2.tar.bz2) = 8f4db7bf8ffe8c49cd16621620a43240
 MD5 (aspell-sv-0.50-2.tar.bz2) = 8d50ddf72f750d187b0ffc440328db84
+MD5 (aspell-uk-0.50-3.tar.bz2) = 0b37b59539424a6980814ce5392725a8
diff --git a/textproc/aspell/pkg-message b/textproc/aspell/pkg-message
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/textproc/aspell/pkg-message
+++ /dev/null
diff --git a/textproc/aspell/pkg-plist.cy b/textproc/aspell/pkg-plist.cy
new file mode 100644
index 000000000000..fbc649af0c13
--- /dev/null
+++ b/textproc/aspell/pkg-plist.cy
@@ -0,0 +1,4 @@
+share/aspell/cy.dat
+share/aspell/cy.multi
+share/aspell/cy.rws
+share/aspell/welsh.alias
diff --git a/textproc/aspell/pkg-plist.el b/textproc/aspell/pkg-plist.el
new file mode 100644
index 000000000000..658ab4cb85dd
--- /dev/null
+++ b/textproc/aspell/pkg-plist.el
@@ -0,0 +1,5 @@
+share/aspell/el.dat
+share/aspell/el_phonet.dat
+share/aspell/el.multi
+share/aspell/el.rws
+share/aspell/greek.alias
diff --git a/textproc/aspell/pkg-plist.fr b/textproc/aspell/pkg-plist.fr
index 7bb770aa6e8b..aa0ba56f0b8f 100644
--- a/textproc/aspell/pkg-plist.fr
+++ b/textproc/aspell/pkg-plist.fr
@@ -7,7 +7,7 @@ share/aspell/fr-80.multi
 share/aspell/fr-lrg.alias
 share/aspell/fr-med.alias
 share/aspell/fr-sml.alias
-share/aspell/fr.alias
+share/aspell/fr.multi
 share/aspell/fr.dat
 share/aspell/fr_CH-40.multi
 share/aspell/fr_CH-60.multi
@@ -16,14 +16,14 @@ share/aspell/fr_CH-lrg.alias
 share/aspell/fr_CH-med.alias
 share/aspell/fr_CH-only.rws
 share/aspell/fr_CH-sml.alias
-share/aspell/fr_CH.alias
+share/aspell/fr_CH.multi
 share/aspell/fr_FR-40.multi
 share/aspell/fr_FR-60.multi
 share/aspell/fr_FR-80.multi
 share/aspell/fr_FR-lrg.alias
 share/aspell/fr_FR-med.alias
 share/aspell/fr_FR-sml.alias
-share/aspell/fr_FR.alias
+share/aspell/fr_FR.multi
 share/aspell/fr_phonet.dat
 share/aspell/francais-40.alias
 share/aspell/francais-60.alias
diff --git a/textproc/aspell/pkg-plist.uk b/textproc/aspell/pkg-plist.uk
new file mode 100644
index 000000000000..67e8a324657c
--- /dev/null
+++ b/textproc/aspell/pkg-plist.uk
@@ -0,0 +1,4 @@
+share/aspell/uk.dat
+share/aspell/uk.multi
+share/aspell/uk.rws
+share/aspell/ukrainian.alias