Update to 6.0.0: adapt to aspell-0.60 series.

3 files changed, 54 insertions, 21 deletions

diff --git a/textproc/aspell-english/Makefile b/textproc/aspell-english/Makefile
index 1304259189b..50f1030fe42 100644
--- a/textproc/aspell-english/Makefile
+++ b/textproc/aspell-english/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2004/10/03 00:18:18 tv Exp $
+# $NetBSD: Makefile,v 1.9 2004/12/24 03:06:43 wiz Exp $
 #
 
-DISTNAME=	aspell-en-0.51-0
-PKGNAME=	${DISTNAME:C/en-(.*)-(.*)$/english-\1.\2/}
-PKGREVISION=	2
+DISTNAME=	aspell6-en-6.0-0
+PKGNAME=	aspell-english-6.0.0
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_GNU:=aspell/dict/en/}
 EXTRACT_SUFX=	.tar.bz2
@@ -15,8 +14,5 @@ COMMENT=	English language support for aspell
 USE_BUILDLINK3=	YES
 HAS_CONFIGURE=	YES
 
-CONFIGURE_ENV+=	ASPELL=${PREFIX}/bin/aspell
-CONFIGURE_ENV+=	WORD_LIST_COMPRESS=${PREFIX}/bin/word-list-compress
-
 .include "../../textproc/aspell/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/aspell-english/PLIST b/textproc/aspell-english/PLIST
index f51b600943c..2348c861146 100644
--- a/textproc/aspell-english/PLIST
+++ b/textproc/aspell-english/PLIST
@@ -1,21 +1,58 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2003/01/15 00:31:54 salo Exp $
-lib/aspell/american-w-accents.alias
+@comment $NetBSD: PLIST,v 1.2 2004/12/24 03:06:43 wiz Exp $
+lib/aspell/american-w_accents.alias
+lib/aspell/american-wo_accents.alias
 lib/aspell/american.alias
-lib/aspell/british-w-accents.alias
+lib/aspell/british-ise-w_accents.alias
+lib/aspell/british-ise-wo_accents.alias
+lib/aspell/british-ise.alias
+lib/aspell/british-ize-w_accents.alias
+lib/aspell/british-ize-wo_accents.alias
+lib/aspell/british-ize.alias
+lib/aspell/british-w_accents.alias
+lib/aspell/british-wo_accents.alias
 lib/aspell/british.alias
-lib/aspell/canadian-w-accents.alias
+lib/aspell/canadian-w_accents.alias
+lib/aspell/canadian-wo_accents.alias
 lib/aspell/canadian.alias
-lib/aspell/en-only.rws
+lib/aspell/en-common.rws
+lib/aspell/en-variant_0.multi
+lib/aspell/en-variant_0.rws
+lib/aspell/en-variant_1.multi
+lib/aspell/en-variant_1.rws
+lib/aspell/en-variant_2.multi
+lib/aspell/en-variant_2.rws
+lib/aspell/en-w_accents.multi
+lib/aspell/en-wo_accents.multi
 lib/aspell/en.multi
-lib/aspell/en_CA-only.rws
-lib/aspell/en_CA-w-accents.multi
+lib/aspell/en_CA-w_accents-only.rws
+lib/aspell/en_CA-w_accents.multi
+lib/aspell/en_CA-wo_accents-only.rws
+lib/aspell/en_CA-wo_accents.multi
 lib/aspell/en_CA.multi
-lib/aspell/en_GB-only.rws
-lib/aspell/en_GB-w-accents.multi
+lib/aspell/en_GB-ise-w_accents-only.rws
+lib/aspell/en_GB-ise-w_accents.multi
+lib/aspell/en_GB-ise-wo_accents-only.rws
+lib/aspell/en_GB-ise-wo_accents.multi
+lib/aspell/en_GB-ise.multi
+lib/aspell/en_GB-ize-w_accents-only.rws
+lib/aspell/en_GB-ize-w_accents.multi
+lib/aspell/en_GB-ize-wo_accents-only.rws
+lib/aspell/en_GB-ize-wo_accents.multi
+lib/aspell/en_GB-ize.multi
+lib/aspell/en_GB-w_accents.multi
+lib/aspell/en_GB-wo_accents.multi
 lib/aspell/en_GB.multi
-lib/aspell/en_US-only.rws
-lib/aspell/en_US-w-accents.multi
+lib/aspell/en_US-w_accents-only.rws
+lib/aspell/en_US-w_accents.multi
+lib/aspell/en_US-wo_accents-only.rws
+lib/aspell/en_US-wo_accents.multi
 lib/aspell/en_US.multi
+lib/aspell/english-variant_0.alias
+lib/aspell/english-variant_1.alias
+lib/aspell/english-variant_2.alias
+lib/aspell/english-w_accents.alias
+lib/aspell/english-wo_accents.alias
 lib/aspell/english.alias
 share/aspell/en.dat
+share/aspell/en_affix.dat
 share/aspell/en_phonet.dat
diff --git a/textproc/aspell-english/distinfo b/textproc/aspell-english/distinfo
index e866cf4a956..129bef9a045 100644
--- a/textproc/aspell-english/distinfo
+++ b/textproc/aspell-english/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2003/01/19 06:35:46 salo Exp $
+$NetBSD: distinfo,v 1.3 2004/12/24 03:06:43 wiz Exp $
 
-SHA1 (aspell-en-0.51-0.tar.bz2) = a1420be50b8d6e4d619e40a58c34fa94ce60d83e
-Size (aspell-en-0.51-0.tar.bz2) = 172819 bytes
+SHA1 (aspell6-en-6.0-0.tar.bz2) = 9723820a22340bcc3a12aae45df26d9ff0608829
+Size (aspell6-en-6.0-0.tar.bz2) = 182442 bytes
 SHA1 (patch-aa) = e22211d1b77a79d16e2334630dc171245bb15677