- update cs, da, en, fo, it, pl, sk, sv, and uk dictionnaries;

	- add af, bg, ga, gl, hr, id, is, mi, ms, and sl dictionnaries;

	- bump portrevision;

	- simplify this port.

PR:		ports/64186
Submitted by:	maintainer
Approved by:	mat (mentor).

1 files changed, 96 insertions, 135 deletions

diff --git a/textproc/aspell/Makefile b/textproc/aspell/Makefile
index 994e67b6970c..9f33b1fba593 100644
--- a/textproc/aspell/Makefile
+++ b/textproc/aspell/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME?=	aspell
 PORTVERSION=	0.50.5
+PORTREVISION=	1
 CATEGORIES+=	textproc
 MASTER_SITES=	http://aspell.net/	\
 		${MASTER_SITE_GNU}
@@ -42,17 +43,32 @@ DESCR=		${.CURDIR}/pkg-descr
 
 CONF_DICT_ENV=	ASPELL="${PREFIX}/bin/aspell"	\
 		WORD_LIST_COMPRESS="${PREFIX}/bin/word-list-compress"
-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
-DICTVERSION2=	0.51
-DICTREVISION=	2
-DICTREVISION2=	3
-DICTREVISION3=	0
-UDICT1=		cy
-UDICT2=		el
-UDICT3=		fr
-UDICT4=		uk
-UDICT5=		en
+AVAIL_DICT=	af bg br ca cs cy da de el en eo es fo fr hr id it ga gl is mi ms \
+		nl no pl pt ro ru sk sl sv uk
+SPECDICTS=	af bg cs cy da el en fo fr ga gl hr id is it mi ms pl sk sl sv uk
+DICTVERSION=	0.50-2
+DICTVER_AF=	0.50-0
+DICTVER_BG=	0.50-0
+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_FO=	0.51-0
+DICTVER_FR=	0.50-3
+DICTVER_GA=	0.50-4
+DICTVER_GL=	0.50-0
+DICTVER_HR=	0.50-0
+DICTVER_ID=	0.50-0
+DICTVER_IS=	0.51-0
+DICTVER_IT=	0.52-0
+DICTVER_MI=	0.50-0
+DICTVER_MS=	0.50-0
+DICTVER_PL=	0.51-0
+DICTVER_SK=	0.51-1
+DICTVER_SL=	0.50-0
+DICTVER_SV=	0.51-0
+DICTVER_UK=	0.51-0
 DICT_SUFFIX=	.tar.bz2
 
 .include <bsd.port.pre.mk>
@@ -67,12 +83,46 @@ DEF_DICT=	${i}
 DEF_DICT?=	en
 
 pre-everything::
-.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))
+.if (!defined(ASPELL_AF) \
+  && !defined(ASPELL_BG) \
+  && !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_GA) \
+  && !defined(ASPELL_GL) \
+  && !defined(ASPELL_HR) \
+  && !defined(ASPELL_ID) \
+  && !defined(ASPELL_IS) \
+  && !defined(ASPELL_IT) \
+  && !defined(ASPELL_MI) \
+  && !defined(ASPELL_MS) \
+  && !defined(ASPELL_NL) \
+  && !defined(ASPELL_NO) \
+  && !defined(ASPELL_PL) \
+  && !defined(ASPELL_PT) \
+  && !defined(ASPELL_RO) \
+  && !defined(ASPELL_RU) \
+  && !defined(ASPELL_SK) \
+  && !defined(ASPELL_SL) \
+  && !defined(ASPELL_SV) \
+  && !defined(ASPELL_UK))
 	@${ECHO_MSG} '*********************************************************'
 	@${ECHO_MSG} '* You can add further dictionaries:                     *'
 	@${ECHO_MSG} '*                                 Use make-flag:        *'
+	@${ECHO_MSG} '*  - Afrikaans                    ASPELL_AF=yes         *'
+	@${ECHO_MSG} '*  - Bulgarian                    ASPELL_BG=yes         *'
 	@${ECHO_MSG} '*  - Breton                       ASPELL_BR=yes         *'
 	@${ECHO_MSG} '*  - Catalan                      ASPELL_CA=yes         *'
+	@${ECHO_MSG} '*  - Croatian                     ASPELL_HR=yes         *'
 	@${ECHO_MSG} '*  - Czech                        ASPELL_CS=yes         *'
 	@${ECHO_MSG} '*  - Danish                       ASPELL_DA=yes         *'
 	@${ECHO_MSG} '*  - Dutch                        ASPELL_NL=yes         *'
@@ -80,15 +130,22 @@ pre-everything::
 	@${ECHO_MSG} '*  - Esperanto                    ASPELL_EO=yes         *'
 	@${ECHO_MSG} '*  - Faroese                      ASPELL_FO=yes         *'
 	@${ECHO_MSG} '*  - French                       ASPELL_FR=yes         *'
+	@${ECHO_MSG} '*  - Galician                     ASPELL_GL=yes         *'
 	@${ECHO_MSG} '*  - German                       ASPELL_DE=yes         *'
 	@${ECHO_MSG} '*  - Greek                        ASPELL_EL=yes         *'
+	@${ECHO_MSG} '*  - Icelandic                    ASPELL_IS=yes         *'
+	@${ECHO_MSG} '*  - Indonesian                   ASPELL_ID=yes         *'
+	@${ECHO_MSG} '*  - Irish (Gaelic)               ASPELL_GA=yes         *'
 	@${ECHO_MSG} '*  - Italian                      ASPELL_IT=yes         *'
+	@${ECHO_MSG} '*  - Maori                        ASPELL_MI=yes         *'
+	@${ECHO_MSG} '*  - Malay                        ASPELL_MS=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} '*  - Slovenian                    ASPELL_SL=yes         *'
 	@${ECHO_MSG} '*  - Spanish                      ASPELL_ES=yes         *'
 	@${ECHO_MSG} '*  - Swedish                      ASPELL_SV=yes         *'
 	@${ECHO_MSG} '*  - Ukrainian                    ASPELL_UK=yes         *'
@@ -97,147 +154,51 @@ pre-everything::
 	@${ECHO_MSG} '* Example: "make ASPELL_FR=yes ASPELL_EN=yes install"   *'
 	@${ECHO_MSG} '*********************************************************'
 .else
-.if defined(ASPELL_BR)
-DICTS+=		br
-.endif
-.if defined(ASPELL_CA)
-DICTS+=		ca
-.endif
-.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
-.if defined(ASPELL_EO)
-DICTS+=		eo
-.endif
-.if defined(ASPELL_ES)
-DICTS+=		es
-.endif
-.if defined(ASPELL_FO)
-DICTS+=		fo
-.endif
-.if defined(ASPELL_FR)
-DICTS+=		fr
-.endif
-.if defined(ASPELL_IT)
-DICTS+=		it
-.endif
-.if defined(ASPELL_NL)
-DICTS+=		nl
-.endif
-.if defined(ASPELL_NO)
-DICTS+=		no
-.endif
-.if defined(ASPELL_PL)
-DICTS+=		pl
-.endif
-.if defined(ASPELL_PT)
-DICTS+=		pt
-.endif
-.if defined(ASPELL_RO)
-DICTS+=		ro
-.endif
-.if defined(ASPELL_RU)
-DICTS+=		ru
-.endif
-.if defined(ASPELL_SK)
-DICTS+=		sk
-.endif
-.if defined(ASPELL_SV)
-DICTS+=		sv
-.endif
-.if defined(ASPELL_UK)
-DICTS+=		uk
-.endif
+. for LG in ${AVAIL_DICT}
+.  if defined(ASPELL_${LG:U})
+DICTS+=		${LG}
+.  endif
+. endfor
 .endif
 .if !defined(DICTS)
-.for LG in ${AVAIL_DICT}
-.if (${DEF_DICT} == ${LG})
+. for LG in ${AVAIL_DICT}
+.  if (${DEF_DICT} == ${LG})
 DICTS=	${LG}
-.endif
-.endfor
+.  endif
+. endfor
 .endif
 .for DICO in ${DICTS}
-.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}
-.elif (${UDICT5} == ${DICO})
-DISTFILES+=	aspell-${DICO}-${DICTVERSION2}-${DICTREVISION3}${DICT_SUFFIX}
-.else
-DISTFILES+=	aspell-${DICO}-${DICTVERSION}-${DICTREVISION}${DICT_SUFFIX}
-.endif
+MASTER_SITES+=	ftp://ftp.gnu.org/gnu/aspell/dict/${DICO}/:dict${DICO}
+. if (${SPECDICTS:M${DICO}*} != "")
+DISTFILES+=	aspell-${DICO}-${DICTVER_${DICO:U}}${DICT_SUFFIX}:dict${DICO}
+. else
+DISTFILES+=	aspell-${DICO}-${DICTVERSION}${DICT_SUFFIX}:dict${DICO}
+. 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})
+. if (${SPECDICTS:M${DICO}*} != "")
 	@cd ${WRKDIR} && \
-	 ${TAR} -xjf ${DISTDIR}/aspell-${DICO}-${DICTVERSION}-${DICTREVISION2}${DICT_SUFFIX}
-.elif (${UDICT5} == ${DICO})
+	 ${TAR} -xjf ${DISTDIR}/aspell-${DICO}-${DICTVER_${DICO:U}}${DICT_SUFFIX}
+. else
 	@cd ${WRKDIR} && \
-	 ${TAR} -xjf ${DISTDIR}/aspell-${DICO}-${DICTVERSION2}-${DICTREVISION3}${DICT_SUFFIX}
-.else
-	@cd ${WRKDIR} && \
-	 ${TAR} -xjf ${DISTDIR}/aspell-${DICO}-${DICTVERSION}-${DICTREVISION}${DICT_SUFFIX}
-.endif
+	 ${TAR} -xjf ${DISTDIR}/aspell-${DICO}-${DICTVERSION}${DICT_SUFFIX}
+. endif
 .endfor
 
 post-install:
 .for DICO in ${DICTS}
 	@${ECHO_MSG} "===>   Installing for ${DICO} dictionaries"
-.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} && \
+. if (${SPECDICTS:M${DICO}*} != "")
+	@cd ${WRKDIR}/aspell-${DICO}-${DICTVER_${DICO:U}} &&	\
+	 ${CONF_DICT_ENV} ./${CONFIGURE_SCRIPT} &&		\
 	 ${GMAKE} install
-.elif (${UDICT4} == ${DICO})
-	@cd ${WRKDIR}/aspell-${DICO}-${DICTVERSION}-${DICTREVISION2} && \
-	 ${CONF_DICT_ENV} ./${CONFIGURE_SCRIPT} && \
+. else
+	@cd ${WRKDIR}/aspell-${DICO}-${DICTVERSION} &&		\
+	 ${CONF_DICT_ENV} ./${CONFIGURE_SCRIPT} &&		\
 	 ${GMAKE} install
-.elif (${UDICT5} == ${DICO})
-	@cd ${WRKDIR}/aspell-${DICO}-${DICTVERSION2}-${DICTREVISION3} && \
-	 ${CONF_DICT_ENV} ./${CONFIGURE_SCRIPT} && \
-	 ${GMAKE} install
-.else
-	@cd ${WRKDIR}/aspell-${DICO}-${DICTVERSION}-${DICTREVISION} && \
-	 ${CONF_DICT_ENV} ./${CONFIGURE_SCRIPT} && \
-	 ${GMAKE} install
-.endif
+. endif
 	@${CAT} ${MASTERDIR}/pkg-plist.${DICO} >> ${TMPPLIST}
 .endfor
 	@${ECHO_CMD} "@dirrm share/aspell" >> ${TMPPLIST}