- Update the german dictionary;

- Add two new dictionaries: Persian (Farsi) and alt-de (German using the
original spelling rules);

- A new slave port has been created for the Persian dictionary.

Remark: no new slave port for alt-de, because (1) it might get merged
with the normal de dictionary and (2) Serge Gagnon is working on a
reorganization of all these slaves-ports. To install it use the port
textproc/aspell.

9 files changed, 57 insertions, 9 deletions

diff --git a/textproc/Makefile b/textproc/Makefile
index fbe7df65a018..c9f2499fdc92 100644
--- a/textproc/Makefile
+++ b/textproc/Makefile
@@ -102,6 +102,7 @@
     SUBDIR += et-aspell
     SUBDIR += expat2
     SUBDIR += exslt
+    SUBDIR += fa-aspell
     SUBDIR += fdp-tools
     SUBDIR += fi-aspell
     SUBDIR += filepp
diff --git a/textproc/aspell/Makefile b/textproc/aspell/Makefile
index 7f7b876d9589..5b44625e01d4 100644
--- a/textproc/aspell/Makefile
+++ b/textproc/aspell/Makefile
@@ -71,9 +71,10 @@ DESCR=		${.CURDIR}/pkg-descr
 
 CONF_DICT_ENV=	ASPELL="${PREFIX}/bin/aspell"	\
 		WORD_LIST_COMPRESS="${PREFIX}/bin/word-list-compress"
-AVAIL_DICT=	af az be bg bn br ca cs cy da de el en eo es et fi fo fr ga gd gl \
-		gv he hr hsb hu ia id is it la lt lv mi mk mn ms mt nb nl nn ny pl \
-		pt qu ro ru rw sc sk sl sv sw ta tet tl tn tr uk uz vi wa yi zu
+AVAIL_DICT=	af az be bg bn br ca cs cy da de de-alt el en eo es et fa fi fo fr \
+		ga gd gl gv he hr hsb hu ia id is it la lt lv mi mk mn ms mt nb nl \
+		nn ny pl pt qu ro ru rw sc sk sl sv sw ta tet tl tn tr uk uz vi wa \
+		yi zu
 DICT_SUFFIX=	.tar.bz2
 
 .include <bsd.port.pre.mk>
@@ -140,6 +141,7 @@ DICTS+=		${LG}
 	@${ECHO_MSG} '*  - French                       ASPELL_FR=yes         *'
 	@${ECHO_MSG} '*  - Galician                     ASPELL_GL=yes         *'
 	@${ECHO_MSG} '*  - German                       ASPELL_DE=yes         *'
+	@${ECHO_MSG} '*  - German (orig spelling rules) ASPELL_DE-ALT=yes     *'
 	@${ECHO_MSG} '*  - Greek                        ASPELL_EL=yes         *'
 	@${ECHO_MSG} '*  - Hebrew                       ASPELL_HE=yes         *'
 	@${ECHO_MSG} '*  - Hungarian                    ASPELL_HU=yes         *'
@@ -161,6 +163,7 @@ DICTS+=		${LG}
 	@${ECHO_MSG} '*  - Norwegian Bokmal             ASPELL_NB=yes         *'
 	@${ECHO_MSG} '*  - Norwegian Nynorsk            ASPELL_NN=yes         *'
 	@${ECHO_MSG} '*  - Nyanja (Chichewa)            ASPELL_NY=yes         *'
+	@${ECHO_MSG} '*  - Persian (Farsi)              ASPELL_FA=yes         *'
 	@${ECHO_MSG} '*  - Polish                       ASPELL_PL=yes         *'
 	@${ECHO_MSG} '*  - Portuguese                   ASPELL_PT=yes         *'
 	@${ECHO_MSG} '*  - Quechua                      ASPELL_QU=yes         *'
@@ -197,9 +200,10 @@ DICTS=	${LG}
 .  endif
 . endfor
 .endif
+
 .for DICO in ${DICTS}
-MASTER_SITES+=	ftp://ftp.gnu.org/gnu/aspell/dict/${DICO}/:dict${DICO}
-DISTFILES+=	aspell${VERDICT_${DICO:U}}${DICT_SUFFIX}:dict${DICO}
+MASTER_SITES+=	ftp://ftp.gnu.org/gnu/aspell/dict/${DICO:S/-alt//}/:dict${DICO:S/-//}
+DISTFILES+=	aspell${VERDICT_${DICO:U}}${DICT_SUFFIX}:dict${DICO:S/-//}
 .endfor
 
 post-extract:
diff --git a/textproc/aspell/distinfo b/textproc/aspell/distinfo
index 1e01a88313e6..a48e5bf26c16 100644
--- a/textproc/aspell/distinfo
+++ b/textproc/aspell/distinfo
@@ -20,8 +20,10 @@ MD5 (aspell-cy-0.50-3.tar.bz2) = d59fee193dba87973b38ac2862a090bb
 SIZE (aspell-cy-0.50-3.tar.bz2) = 117652
 MD5 (aspell5-da-1.4.42-1.tar.bz2) = d14c03dca23b572606279d7317b022d0
 SIZE (aspell5-da-1.4.42-1.tar.bz2) = 317688
-MD5 (aspell-de-0.50-2.tar.bz2) = 204a9737ff0110fb8c7d284bd7200f7d
-SIZE (aspell-de-0.50-2.tar.bz2) = 304820
+MD5 (aspell6-de-20030222-1.tar.bz2) = 5950c5c8a36fc93d4d7616591bace6a6
+SIZE (aspell6-de-20030222-1.tar.bz2) = 274407
+MD5 (aspell6-de-alt-2.1-1.tar.bz2) = 13245374b03088608d729fd15c58cd7a
+SIZE (aspell6-de-alt-2.1-1.tar.bz2) = 247116
 MD5 (aspell-el-0.50-3.tar.bz2) = 0ea2c42ceb9b91f7f5de2c017234ad37
 SIZE (aspell-el-0.50-3.tar.bz2) = 328225
 MD5 (aspell6-en-6.0-0.tar.bz2) = 16449e0a266e1ecc526b2f3cd39d4bc2
@@ -32,6 +34,8 @@ MD5 (aspell-es-0.50-2.tar.bz2) = 4a8583e9ef9f4aed03f5a7fe09d40060
 SIZE (aspell-es-0.50-2.tar.bz2) = 157809
 MD5 (aspell6-et-0.1.21-1.tar.bz2) = 82929f49ddc1149b6ef2bde4c3c12bcd
 SIZE (aspell6-et-0.1.21-1.tar.bz2) = 338155
+MD5 (aspell6-fa-0.02-0.tar.bz2) = 4583ef4b8b2456f737e3d60ede1e9034
+SIZE (aspell6-fa-0.02-0.tar.bz2) = 97168
 MD5 (aspell6-fi-0.7-0.tar.bz2) = 6d1032116982c0efab1af8fce83259c0
 SIZE (aspell6-fi-0.7-0.tar.bz2) = 209249
 MD5 (aspell5-fo-0.2.16-1.tar.bz2) = a57e8870c272931da41cd1fc5a291f3d
diff --git a/textproc/aspell/files/verdict b/textproc/aspell/files/verdict
index 5afb33ba1d37..1ed77c76096d 100644
--- a/textproc/aspell/files/verdict
+++ b/textproc/aspell/files/verdict
@@ -8,12 +8,14 @@ VERDICT_CA=	6-ca-20040130-1
 VERDICT_CS=	-cs-0.51-0
 VERDICT_CY=	-cy-0.50-3
 VERDICT_DA=	5-da-1.4.42-1
-VERDICT_DE=	-de-0.50-2
+VERDICT_DE=	6-de-20030222-1
+VERDICT_DE-ALT=	6-de-alt-2.1-1
 VERDICT_EL=	-el-0.50-3
 VERDICT_EN=	6-en-6.0-0
 VERDICT_EO=	-eo-0.50-2
 VERDICT_ES=	-es-0.50-2
 VERDICT_ET=	6-et-0.1.21-1
+VERDICT_FA=	6-fa-0.02-0
 VERDICT_FI=	6-fi-0.7-0
 VERDICT_FO=	5-fo-0.2.16-1
 VERDICT_FR=	-fr-0.50-3
diff --git a/textproc/aspell/pkg-plist.de b/textproc/aspell/pkg-plist.de
index e68d47ed9f21..e11f30c6942d 100644
--- a/textproc/aspell/pkg-plist.de
+++ b/textproc/aspell/pkg-plist.de
@@ -1,7 +1,10 @@
+lib/aspell-%%VER%%/de_affix.dat
 lib/aspell-%%VER%%/de_phonet.dat
 lib/aspell-%%VER%%/de.dat
-share/aspell/de-only.rws
+share/aspell/de-common.rws
 share/aspell/de.multi
+share/aspell/de_AT-only.rws
+share/aspell/de_AT.multi
 share/aspell/de_CH-only.rws
 share/aspell/de_CH.multi
 share/aspell/de_DE-only.rws
diff --git a/textproc/aspell/pkg-plist.de-alt b/textproc/aspell/pkg-plist.de-alt
new file mode 100644
index 000000000000..470cbdb016d9
--- /dev/null
+++ b/textproc/aspell/pkg-plist.de-alt
@@ -0,0 +1,7 @@
+lib/aspell-%%VER%%/de-alt.dat
+lib/aspell-%%VER%%/de-alt_affix.dat
+lib/aspell-%%VER%%/de-alt_phonet.dat
+share/aspell/de-alt.multi
+share/aspell/de-alt.rws
+share/aspell/deutsch-alt.alias
+share/aspell/german-old.alias
diff --git a/textproc/aspell/pkg-plist.fa b/textproc/aspell/pkg-plist.fa
new file mode 100644
index 000000000000..2367ddbd2dad
--- /dev/null
+++ b/textproc/aspell/pkg-plist.fa
@@ -0,0 +1,7 @@
+lib/aspell-%%VER%%/fa.dat
+lib/aspell-%%VER%%/l-fa.cmap
+lib/aspell-%%VER%%/l-fa.cset
+share/aspell/fa.multi
+share/aspell/fa.rws
+share/aspell/farsi.alias
+share/aspell/persian.alias
diff --git a/textproc/fa-aspell/Makefile b/textproc/fa-aspell/Makefile
new file mode 100644
index 000000000000..9578c58e157e
--- /dev/null
+++ b/textproc/fa-aspell/Makefile
@@ -0,0 +1,17 @@
+# New ports collection makefile for:    fa-aspell
+# Date created:                         16 November 2004
+# Whom:                                 Thierry Thomas <thierry@pompo.net>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	fa-aspell
+
+MAINTAINER=	ports@FreeBSD.org
+COMMENT=	Aspell with Persian (Farsi) dictionary
+
+MASTERDIR=	${.CURDIR}/../aspell
+
+ASPELL_FA=	bale
+
+.include "${MASTERDIR}/Makefile"
diff --git a/textproc/fa-aspell/pkg-descr b/textproc/fa-aspell/pkg-descr
new file mode 100644
index 000000000000..e7897b1521e0
--- /dev/null
+++ b/textproc/fa-aspell/pkg-descr
@@ -0,0 +1,3 @@
+Aspell with Persian (Farsi) dictionary.
+
+WWW: http://aspell.net/