ports/64186: textproc/aspell: updading and adding several dictionaries.
Thierry Thomas
thierry at pompo.net
Sat Mar 13 00:40:07 UTC 2004
>Number: 64186
>Category: ports
>Synopsis: textproc/aspell: updading and adding several dictionaries.
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Fri Mar 12 16:40:07 PST 2004
>Closed-Date:
>Last-Modified:
>Originator: Thierry Thomas
>Release: FreeBSD 4.9-STABLE i386
>Organization:
Kabbale Eros
>Environment:
System: FreeBSD graf.pompo.net 4.9-STABLE FreeBSD 4.9-STABLE #0: Sat Mar 6 18:18:24 CET 2004 thierry at graf.pompo.net:/usr/obj/mntsrc/src/sys/GRAF020727 i386
>Description:
- update da, en, it, pl, sk, sv, and uk dictionnaries;
- add ga, gl, and is dictionnaries;
- bump portrevision;
- simplify this port.
>How-To-Repeat:
N/A.
>Fix:
Please apply the following patch.
Remark: pkg-plist.ga, pkg-plist.gl & pkg-plist.is are new files.
--- aspell.diff begins here ---
diff -urN textproc/aspell.orig/Makefile textproc/aspell/Makefile
--- textproc/aspell.orig/Makefile Fri Feb 13 00:27:18 2004
+++ textproc/aspell/Makefile Sat Mar 13 01:12:09 2004
@@ -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,22 @@
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= br ca cs cy da de el en eo es fo fr it ga gl is nl no pl pt ro ru sk sv uk
+SPECDICTS= cy da el en fr ga gl is it pl sk sv uk
+DICTVERSION= 0.50-2
+DICTVER_CY= 0.50-3
+DICTVER_DA= 0.50.1-0
+DICTVER_EL= 0.50-3
+DICTVER_EN= 0.51-1
+DICTVER_FR= 0.50-3
+DICTVER_GA= 0.50-4
+DICTVER_GL= 0.50-0
+DICTVER_IS= 0.51-0
+DICTVER_IT= 0.52-0
+DICTVER_PL= 0.51-0
+DICTVER_SK= 0.51-0
+DICTVER_SV= 0.51-0
+DICTVER_UK= 0.51-0
DICT_SUFFIX= .tar.bz2
.include <bsd.port.pre.mk>
@@ -67,7 +73,31 @@
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_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_IS) \
+ && !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: *'
@@ -80,8 +110,11 @@
@${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} '* - Irish (Gaelic) ASPELL_GA=yes *'
@${ECHO_MSG} '* - Italian ASPELL_IT=yes *'
@${ECHO_MSG} '* - Norwegian ASPELL_NO=yes *'
@${ECHO_MSG} '* - Polish ASPELL_PL=yes *'
@@ -97,147 +130,51 @@
@${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})
+. if (${SPECDICTS:M${DICO}*} != "")
@cd ${WRKDIR} && \
- ${TAR} -xjf ${DISTDIR}/aspell-${DICO}-${DICTVERSION}-${DICTREVISION2}${DICT_SUFFIX}
-.elif (${UDICT4} == ${DICO})
+ ${TAR} -xjf ${DISTDIR}/aspell-${DICO}-${DICTVER_${DICO:U}}${DICT_SUFFIX}
+. else
@cd ${WRKDIR} && \
- ${TAR} -xjf ${DISTDIR}/aspell-${DICO}-${DICTVERSION}-${DICTREVISION2}${DICT_SUFFIX}
-.elif (${UDICT5} == ${DICO})
- @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} && \
- ${GMAKE} install
-.elif (${UDICT4} == ${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
+. 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}
diff -urN textproc/aspell.orig/distinfo textproc/aspell/distinfo
--- textproc/aspell.orig/distinfo Fri Feb 13 00:27:18 2004
+++ textproc/aspell/distinfo Sat Mar 13 00:19:37 2004
@@ -8,14 +8,14 @@
SIZE (aspell-cs-0.50-2.tar.bz2) = 457939
MD5 (aspell-cy-0.50-3.tar.bz2) = d59fee193dba87973b38ac2862a090bb
SIZE (aspell-cy-0.50-3.tar.bz2) = 117652
-MD5 (aspell-da-0.50-2.tar.bz2) = c023f246ef448128e6a3b93388ed57e7
-SIZE (aspell-da-0.50-2.tar.bz2) = 284049
+MD5 (aspell-da-0.50.1-0.tar.bz2) = 1bf582a9aa0e0f8007a2ba9d52964e7e
+SIZE (aspell-da-0.50.1-0.tar.bz2) = 304097
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-0.tar.bz2) = 8f1eab27d02e44b15c833d5a7b24f9cd
-SIZE (aspell-en-0.51-0.tar.bz2) = 172819
+MD5 (aspell-en-0.51-1.tar.bz2) = aabb933daee93be446c71e79babf8da4
+SIZE (aspell-en-0.51-1.tar.bz2) = 172874
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
@@ -24,23 +24,29 @@
SIZE (aspell-fo-0.50-2.tar.bz2) = 73174
MD5 (aspell-fr-0.50-3.tar.bz2) = 53a2d05c4e8f7fabd3cefe24db977be7
SIZE (aspell-fr-0.50-3.tar.bz2) = 283086
-MD5 (aspell-it-0.50-2.tar.bz2) = efa602e47fc49db2cc670f7e5c1628e1
-SIZE (aspell-it-0.50-2.tar.bz2) = 38409
+MD5 (aspell-it-0.52-0.tar.bz2) = 03e14dab69e0ecb132dda02fe0c220fc
+SIZE (aspell-it-0.52-0.tar.bz2) = 45138
+MD5 (aspell-ga-0.50-4.tar.bz2) = 6bc9da57557f6d63ecd1dd65b8a184a4
+SIZE (aspell-ga-0.50-4.tar.bz2) = 394776
+MD5 (aspell-gl-0.50-0.tar.bz2) = 0cd3c4e3e325e080689657f03eff8e8e
+SIZE (aspell-gl-0.50-0.tar.bz2) = 112313
+MD5 (aspell-is-0.51-0.tar.bz2) = fa61cbe8ec3594ec0190ad3e81c3a7aa
+SIZE (aspell-is-0.51-0.tar.bz2) = 323327
MD5 (aspell-nl-0.50-2.tar.bz2) = c3ef9fd7dc4c47d816eee9ef5149c76a
SIZE (aspell-nl-0.50-2.tar.bz2) = 428365
MD5 (aspell-no-0.50-2.tar.bz2) = b24b20ad02ce2a569f71f949b48823cc
SIZE (aspell-no-0.50-2.tar.bz2) = 286696
-MD5 (aspell-pl-0.50-2.tar.bz2) = a56f6f7e0ad8eb2dce9e8724b2c7496e
-SIZE (aspell-pl-0.50-2.tar.bz2) = 311840
+MD5 (aspell-pl-0.51-0.tar.bz2) = 5435be1c9c39326a02e2798d8b4d257b
+SIZE (aspell-pl-0.51-0.tar.bz2) = 624458
MD5 (aspell-pt-0.50-2.tar.bz2) = e4e15179f90b76ec0336b687d1293edd
SIZE (aspell-pt-0.50-2.tar.bz2) = 201341
MD5 (aspell-ro-0.50-2.tar.bz2) = 96d97a79a0a0e04c580e0d0671d650c9
SIZE (aspell-ro-0.50-2.tar.bz2) = 64110
MD5 (aspell-ru-0.50-2.tar.bz2) = d7add85adeef2ea36457ea811d52c295
SIZE (aspell-ru-0.50-2.tar.bz2) = 521827
-MD5 (aspell-sk-0.50-2.tar.bz2) = 8f4db7bf8ffe8c49cd16621620a43240
-SIZE (aspell-sk-0.50-2.tar.bz2) = 243884
-MD5 (aspell-sv-0.50-2.tar.bz2) = 8d50ddf72f750d187b0ffc440328db84
-SIZE (aspell-sv-0.50-2.tar.bz2) = 90602
-MD5 (aspell-uk-0.50-3.tar.bz2) = 0b37b59539424a6980814ce5392725a8
-SIZE (aspell-uk-0.50-3.tar.bz2) = 382364
+MD5 (aspell-sk-0.51-0.tar.bz2) = adde00ab5deb834f6bed1dd1d7c33139
+SIZE (aspell-sk-0.51-0.tar.bz2) = 379490
+MD5 (aspell-sv-0.51-0.tar.bz2) = d180c781f8986ea0f65b6b18f02a494e
+SIZE (aspell-sv-0.51-0.tar.bz2) = 93942
+MD5 (aspell-uk-0.51-0.tar.bz2) = 767bfca10c64b239b05cb8b68a78f4ad
+SIZE (aspell-uk-0.51-0.tar.bz2) = 382513
diff -urN textproc/aspell.orig/pkg-plist.da textproc/aspell/pkg-plist.da
--- textproc/aspell.orig/pkg-plist.da Tue Sep 10 05:05:27 2002
+++ textproc/aspell/pkg-plist.da Sat Mar 13 01:12:33 2004
@@ -2,5 +2,4 @@
share/aspell/da.multi
share/aspell/da.rws
share/aspell/da_phonet.dat
-share/aspell/danish.alias
share/aspell/dansk.alias
diff -urN textproc/aspell.orig/pkg-plist.ga textproc/aspell/pkg-plist.ga
--- textproc/aspell.orig/pkg-plist.ga Thu Jan 1 01:00:00 1970
+++ textproc/aspell/pkg-plist.ga Sat Mar 13 01:07:08 2004
@@ -0,0 +1,6 @@
+share/aspell/ga.dat
+share/aspell/ga.multi
+share/aspell/ga.rws
+share/aspell/ga_phonet.dat
+share/aspell/gaeilge.alias
+share/aspell/irish.alias
diff -urN textproc/aspell.orig/pkg-plist.gl textproc/aspell/pkg-plist.gl
--- textproc/aspell.orig/pkg-plist.gl Thu Jan 1 01:00:00 1970
+++ textproc/aspell/pkg-plist.gl Sat Mar 13 01:07:08 2004
@@ -0,0 +1,4 @@
+share/aspell/gl.dat
+share/aspell/gl.multi
+share/aspell/gl.rws
+share/aspell/gl_phonet.dat
diff -urN textproc/aspell.orig/pkg-plist.is textproc/aspell/pkg-plist.is
--- textproc/aspell.orig/pkg-plist.is Thu Jan 1 01:00:00 1970
+++ textproc/aspell/pkg-plist.is Sat Mar 13 01:07:08 2004
@@ -0,0 +1,6 @@
+share/aspell/icelandic.alias
+share/aspell/is.dat
+share/aspell/is.multi
+share/aspell/is.rws
+share/aspell/is_phonet.dat
+share/aspell/íslenska.alias
diff -urN textproc/aspell.orig/pkg-plist.it textproc/aspell/pkg-plist.it
--- textproc/aspell.orig/pkg-plist.it Tue Sep 10 05:05:27 2002
+++ textproc/aspell/pkg-plist.it Sat Mar 13 01:13:30 2004
@@ -2,3 +2,4 @@
share/aspell/it.multi
share/aspell/it.rws
share/aspell/italian.alias
+share/aspell/italiano.alias
diff -urN textproc/aspell.orig/pkg-plist.sk textproc/aspell/pkg-plist.sk
--- textproc/aspell.orig/pkg-plist.sk Tue Sep 10 05:05:27 2002
+++ textproc/aspell/pkg-plist.sk Sat Mar 13 01:14:20 2004
@@ -1,4 +1,7 @@
share/aspell/sk.dat
share/aspell/sk.multi
share/aspell/sk.rws
+share/aspell/sk-extend.multi
+share/aspell/sk-extend.rws
+share/aspell/slovak-extend.alias
share/aspell/slovak.alias
--- aspell.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list