Moving ispell-* packages as discussed on tech-pkg@. Reasons being:

1) Shorter package name;
2) Be consistent with kde3-l18n-*, kde4-l10n-*, hunspell-*, aspell-*,
lang-* PKG_OPTIONS;
3) Simplify modifications to PKGNAME in some Makefiles;
4) Accordance with international language naming standards;

and rename the ispell-base package to ispell, to be consistent with aspell
and hunspell. Bump PKGREVISION where necessary.

86 files changed, 112 insertions, 117 deletions

diff --git a/meta-pkgs/bulk-medium/Makefile b/meta-pkgs/bulk-medium/Makefile
index f45d51f39fa..a1fb13f5932 100644
--- a/meta-pkgs/bulk-medium/Makefile
+++ b/meta-pkgs/bulk-medium/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2013/03/16 22:59:06 dholland Exp $
+# $NetBSD: Makefile,v 1.7 2013/04/24 02:20:36 rodent Exp $
 
 DISTNAME=	bulk-medium-20130316
 CATEGORIES=	meta-pkgs
@@ -126,7 +126,7 @@ BUILD_DEPENDS+=	desktop-file-utils-[0-9]*:../../sysutils/desktop-file-utils
 BUILD_DEPENDS+=	xe-guest-utilities-[0-9]*:../../sysutils/xe-guest-utilities
 BUILD_DEPENDS+=	xenkernel41-[0-9]*:../../sysutils/xenkernel41
 BUILD_DEPENDS+=	xentools41-[0-9]*:../../sysutils/xentools41
-BUILD_DEPENDS+=	ispell-base-[0-9]*:../../textproc/ispell-base
+BUILD_DEPENDS+=	ispell-[0-9]*:../../textproc/ispell
 BUILD_DEPENDS+=	firefox10-[0-9]*:../../www/firefox10
 BUILD_DEPENDS+=	seamonkey-[0-9]*:../../www/seamonkey
 BUILD_DEPENDS+=	xlockmore-[0-9]*:../../x11/xlockmore
diff --git a/textproc/Makefile b/textproc/Makefile
index 235de8006ee..4ff4f6219dd 100644
--- a/textproc/Makefile
+++ b/textproc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.721 2013/04/21 12:33:34 obache Exp $
+# $NetBSD: Makefile,v 1.722 2013/04/24 02:20:36 rodent Exp $
 #
 
 COMMENT=	Text processing utilities (does not include desktop publishing)
@@ -250,20 +250,20 @@ SUBDIR+=	isearch
 SUBDIR+=	iso-codes
 SUBDIR+=	iso12083
 SUBDIR+=	iso8879
-SUBDIR+=	ispell-base
-SUBDIR+=	ispell-british
-SUBDIR+=	ispell-catalan
+SUBDIR+=	ispell
+SUBDIR+=	ispell-ca
+SUBDIR+=	ispell-de
+SUBDIR+=	ispell-en_GB
 SUBDIR+=	ispell-emacs
-SUBDIR+=	ispell-francais
-SUBDIR+=	ispell-gaeilge
-SUBDIR+=	ispell-german
-SUBDIR+=	ispell-polski
-SUBDIR+=	ispell-romanian
-SUBDIR+=	ispell-russian
-SUBDIR+=	ispell-russian-io
-SUBDIR+=	ispell-slovak
-SUBDIR+=	ispell-spanish
-SUBDIR+=	ispell-svenska
+SUBDIR+=	ispell-es
+SUBDIR+=	ispell-fr
+SUBDIR+=	ispell-ga
+SUBDIR+=	ispell-pl
+SUBDIR+=	ispell-ro
+SUBDIR+=	ispell-ru
+SUBDIR+=	ispell-ru-io
+SUBDIR+=	ispell-sk
+SUBDIR+=	ispell-sv
 SUBDIR+=	itex2MML
 SUBDIR+=	itstool
 SUBDIR+=	ja-grep
diff --git a/textproc/hunspell-de/Makefile b/textproc/hunspell-de/Makefile
index cc7f8626c6e..0b4d58f7b0f 100644
--- a/textproc/hunspell-de/Makefile
+++ b/textproc/hunspell-de/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.11 2012/10/25 06:55:55 asau Exp $
+# $NetBSD: Makefile,v 1.12 2013/04/24 02:20:36 rodent Exp $
 #
 
 DISTNAME=	igerman98-20120607
 PKGNAME=	${DISTNAME:S/igerman98/hunspell-de/}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	textproc
 MASTER_SITES=	http://www.j3e.de/ispell/igerman98/dict/
 EXTRACT_SUFX=	.tar.bz2
@@ -13,7 +13,7 @@ HOMEPAGE=	http://www.j3e.de/ispell/igerman98/
 COMMENT=	German dictionaries for hunspell
 LICENSE=	gnu-gpl-v2 OR gnu-gpl-v3
 
-BUILD_DEPENDS+=	ispell-base>=3.1.20nb1:../../textproc/ispell-base
+BUILD_DEPENDS+=	ispell>=3.1.20nb1:../../textproc/ispell
 DEPENDS+=	hunspell>=1.1.5:../../textproc/hunspell
 
 USE_LANGUAGES=	# none
diff --git a/textproc/ispell-british/PLIST b/textproc/ispell-british/PLIST
deleted file mode 100644
index 347d0e41ab8..00000000000
--- a/textproc/ispell-british/PLIST
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:57:03 zuntum Exp $
-lib/britishxlg.hash
-lib/british.hash
diff --git a/textproc/ispell-catalan/DESCR b/textproc/ispell-ca/DESCR
index 089bd580d20..089bd580d20 100644
--- a/textproc/ispell-catalan/DESCR
+++ b/textproc/ispell-ca/DESCR
diff --git a/textproc/ispell-catalan/Makefile b/textproc/ispell-ca/Makefile
index 372cfdeea09..1c2b035768a 100644
--- a/textproc/ispell-catalan/Makefile
+++ b/textproc/ispell-ca/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2012/10/25 06:55:58 asau Exp $
+# $NetBSD: Makefile,v 1.1 2013/04/24 02:20:37 rodent Exp $
 #
 
 DISTNAME=	ispell-sc-ca
 PKGNAME=	ispell-catalan-1.0
-PKGREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	http://www.softcatala.org/cgi-bin/gaudi/contadorb/load.cgi?/fitxers/linux/
 EXTRACT_SUFX=	.zip
@@ -12,7 +11,7 @@ MAINTAINER=	jmmv@NetBSD.org
 HOMEPAGE=	http://www.softcatala.org/projectes/myspell/
 COMMENT=	Catalan dictionary for interactive spelling checker
 
-DEPENDS+=	ispell-base>=3.1.20:../../textproc/ispell-base
+DEPENDS+=	ispell>=3.1.20:../../textproc/ispell
 
 WRKSRC=		${WRKDIR}
 
diff --git a/textproc/ispell-ca/PLIST b/textproc/ispell-ca/PLIST
new file mode 100644
index 00000000000..933adcd433b
--- /dev/null
+++ b/textproc/ispell-ca/PLIST
@@ -0,0 +1,3 @@
+@comment $NetBSD: PLIST,v 1.1 2013/04/24 02:20:37 rodent Exp $
+lib/catala.aff
+lib/catala.hash
diff --git a/textproc/ispell-catalan/distinfo b/textproc/ispell-ca/distinfo
index 8bd0d716a71..3327a0e0377 100644
--- a/textproc/ispell-catalan/distinfo
+++ b/textproc/ispell-ca/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2005/02/24 14:48:43 agc Exp $
+$NetBSD: distinfo,v 1.1 2013/04/24 02:20:37 rodent Exp $
 
 SHA1 (ispell-sc-ca.zip) = 8b9afbf6df125d3cca72271929727db1c2484da2
 RMD160 (ispell-sc-ca.zip) = f3ad88e16efa5e87e1854643e78b7527ebefce4c
diff --git a/textproc/ispell-catalan/PLIST b/textproc/ispell-catalan/PLIST
deleted file mode 100644
index eab8a5dda9a..00000000000
--- a/textproc/ispell-catalan/PLIST
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/08/02 01:54:12 jschauma Exp $
-lib/catala.aff
-lib/catala.hash
diff --git a/textproc/ispell-german/DESCR b/textproc/ispell-de/DESCR
index 4d73b967ed5..4d73b967ed5 100644
--- a/textproc/ispell-german/DESCR
+++ b/textproc/ispell-de/DESCR
diff --git a/textproc/ispell-german/Makefile b/textproc/ispell-de/Makefile
index 313d6e7f36a..b9027cdd481 100644
--- a/textproc/ispell-german/Makefile
+++ b/textproc/ispell-de/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.18 2012/10/25 06:55:58 asau Exp $
+# $NetBSD: Makefile,v 1.1 2013/04/24 02:20:38 rodent Exp $
 #
 
 DISTNAME=	igerman98-20120607
 PKGNAME=	ispell-german-20120607
-PKGREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	http://j3e.de/ispell/igerman98/dict/
 EXTRACT_SUFX=	.tar.bz2
@@ -12,7 +11,7 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://j3e.de/ispell/igerman98/
 COMMENT=	German dictionary for interactive spelling checker
 
-DEPENDS+=	ispell-base>=3.1.20nb1:../../textproc/ispell-base
+DEPENDS+=	ispell>=3.1.20nb1:../../textproc/ispell
 
 BUILD_TARGET=	ispell/de_DE.aff ispell/de_DE.hash ispell/de_AT.aff ispell/de_AT.hash ispell/de_CH.aff ispell/de_CH.hash
 USE_TOOLS+=	gmake perl
diff --git a/textproc/ispell-german/PLIST b/textproc/ispell-de/PLIST
index 9c66cb6968d..b8a79431589 100644
--- a/textproc/ispell-german/PLIST
+++ b/textproc/ispell-de/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2008/11/10 18:15:05 wiz Exp $
+@comment $NetBSD: PLIST,v 1.1 2013/04/24 02:20:38 rodent Exp $
 lib/de_AT.aff
 lib/de_AT.hash
 lib/de_CH.aff
diff --git a/textproc/ispell-german/distinfo b/textproc/ispell-de/distinfo
index c71304c823d..85aa5c4b678 100644
--- a/textproc/ispell-german/distinfo
+++ b/textproc/ispell-de/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.10 2012/08/15 20:28:05 wiz Exp $
+$NetBSD: distinfo,v 1.1 2013/04/24 02:20:38 rodent Exp $
 
 SHA1 (igerman98-20120607.tar.bz2) = 2cb42608727a13c877db98f19fe43b5cae2d4e73
 RMD160 (igerman98-20120607.tar.bz2) = 0756833bcda3b67f430b6b5dbfc5db9956960eae
diff --git a/textproc/ispell-german/patches/patch-aa b/textproc/ispell-de/patches/patch-aa
index ea66ef52528..05b684b5490 100644
--- a/textproc/ispell-german/patches/patch-aa
+++ b/textproc/ispell-de/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.6 2012/08/15 20:28:05 wiz Exp $
+$NetBSD: patch-aa,v 1.1 2013/04/24 02:20:38 rodent Exp $
 
 --- Makefile.orig	2010-01-18 09:07:38.000000000 +0000
 +++ Makefile
diff --git a/textproc/ispell-emacs/Makefile b/textproc/ispell-emacs/Makefile
index 84b66c77264..83d8ae6ffb1 100644
--- a/textproc/ispell-emacs/Makefile
+++ b/textproc/ispell-emacs/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.13 2013/02/17 19:18:09 dholland Exp $
+# $NetBSD: Makefile,v 1.14 2013/04/24 02:20:38 rodent Exp $
 #
 
 DISTNAME=	ispell.el
 PKGNAME=	${EMACS_PKGNAME_PREFIX}ispell-emacs-3.6
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	textproc
 MASTER_SITES=	ftp://kdstevens.com/pub/stevens/
 EXTRACT_SUFX=	.gz
@@ -14,7 +14,7 @@ COMMENT=	Emacs interface for ispell spell checker
 
 INSTALLATION_DIRS=	${EMACS_LISPPREFIX:C|^${PREFIX}/||}/ispell
 
-DEPENDS+=	ispell-base-[0-9]*:../../textproc/ispell-base
+DEPENDS+=	ispell-[0-9]*:../../textproc/ispell
 
 DIST_SUBDIR=	${PKGNAME_NOREV:C|^xemacs-||}
 WRKSRC=		${WRKDIR}
diff --git a/textproc/ispell-british/DESCR b/textproc/ispell-en_GB/DESCR
index 84787b82b80..84787b82b80 100644
--- a/textproc/ispell-british/DESCR
+++ b/textproc/ispell-en_GB/DESCR
diff --git a/textproc/ispell-british/Makefile b/textproc/ispell-en_GB/Makefile
index 45ea5ca6094..c4151733753 100644
--- a/textproc/ispell-british/Makefile
+++ b/textproc/ispell-en_GB/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2012/10/25 06:55:57 asau Exp $
+# $NetBSD: Makefile,v 1.1 2013/04/24 02:20:38 rodent Exp $
 #
 
 DISTNAME=	ispell-3.3.02
@@ -10,7 +10,7 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://ficus-www.cs.ucla.edu/geoff/ispell.html
 COMMENT=	British dictionary for interactive spelling checker
 
-DEPENDS+=	ispell-base>=3.3.02:../../textproc/ispell-base
+DEPENDS+=	ispell>=3.3.02:../../textproc/ispell
 
 BUILD_TARGET=	config.sh all-languages
 
diff --git a/textproc/ispell-en_GB/PLIST b/textproc/ispell-en_GB/PLIST
new file mode 100644
index 00000000000..2205163b2b7
--- /dev/null
+++ b/textproc/ispell-en_GB/PLIST
@@ -0,0 +1,3 @@
+@comment $NetBSD: PLIST,v 1.1 2013/04/24 02:20:38 rodent Exp $
+lib/britishxlg.hash
+lib/british.hash
diff --git a/textproc/ispell-british/distinfo b/textproc/ispell-en_GB/distinfo
index d1981e3e307..bf4584defea 100644
--- a/textproc/ispell-british/distinfo
+++ b/textproc/ispell-en_GB/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2005/07/07 12:44:44 markd Exp $
+$NetBSD: distinfo,v 1.1 2013/04/24 02:20:38 rodent Exp $
 
 SHA1 (ispell-3.3.02.tar.gz) = c0d98e1af3afb8e0b642717c03439ff8881e3d60
 RMD160 (ispell-3.3.02.tar.gz) = 12edc94ebb7c1f4040bd8f5b0dbb8f40326aa781
diff --git a/textproc/ispell-british/patches/patch-aa b/textproc/ispell-en_GB/patches/patch-aa
index 4113eb1cdc2..b1aeef2a335 100644
--- a/textproc/ispell-british/patches/patch-aa
+++ b/textproc/ispell-en_GB/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.1.1.1 2001/03/14 12:12:21 agc Exp $
+$NetBSD: patch-aa,v 1.1 2013/04/24 02:20:38 rodent Exp $
 
 --- languages/english/english.2-orig	Mon Jan 23 19:28:44 1995
 +++ languages/english/english.2	Thu Apr 16 14:34:21 1998
diff --git a/textproc/ispell-british/patches/patch-ab b/textproc/ispell-en_GB/patches/patch-ab
index 5776eecf8d9..4638321c517 100644
--- a/textproc/ispell-british/patches/patch-ab
+++ b/textproc/ispell-en_GB/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.1.1.1 2001/03/14 12:12:21 agc Exp $
+$NetBSD: patch-ab,v 1.1 2013/04/24 02:20:38 rodent Exp $
 --- languages/english/english.3.orig	Tue Oct 27 22:26:48 1998
 +++ languages/english/english.3	Tue Oct 27 22:27:35 1998
 @@ -5202,6 +5202,7 @@
diff --git a/textproc/ispell-british/patches/patch-ac b/textproc/ispell-en_GB/patches/patch-ac
index 122b387e4fd..f80dcfd28e9 100644
--- a/textproc/ispell-british/patches/patch-ac
+++ b/textproc/ispell-en_GB/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.1.1.1 2001/03/14 12:12:21 agc Exp $
+$NetBSD: patch-ac,v 1.1 2013/04/24 02:20:38 rodent Exp $
 
 Use the buildhash program from the base installation
 
diff --git a/textproc/ispell-british/patches/patch-ad b/textproc/ispell-en_GB/patches/patch-ad
index 31a2ec35656..c9b8ec50211 100644
--- a/textproc/ispell-british/patches/patch-ad
+++ b/textproc/ispell-en_GB/patches/patch-ad
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.3 2005/07/07 12:44:44 markd Exp $
+$NetBSD: patch-ad,v 1.1 2013/04/24 02:20:38 rodent Exp $
 
 Don't build the programs - use the ones from the base system.
 
diff --git a/textproc/ispell-spanish/DESCR b/textproc/ispell-es/DESCR
index c965b7bdcbe..c965b7bdcbe 100644
--- a/textproc/ispell-spanish/DESCR
+++ b/textproc/ispell-es/DESCR
diff --git a/textproc/ispell-spanish/Makefile b/textproc/ispell-es/Makefile
index c925c2dd5f8..5c761e43458 100644
--- a/textproc/ispell-spanish/Makefile
+++ b/textproc/ispell-es/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2012/10/25 06:56:00 asau Exp $
+# $NetBSD: Makefile,v 1.1 2013/04/24 02:20:39 rodent Exp $
 #
 
 DISTNAME=	espa~nol-1.7
@@ -10,7 +10,7 @@ MAINTAINER=	jmmv@NetBSD.org
 HOMEPAGE=	http://es.tldp.org/htmls/coes.html
 COMMENT=	Spanish dictionary for interactive spelling checker
 
-DEPENDS+=	ispell-base>=3.1.20:../../textproc/ispell-base
+DEPENDS+=	ispell>=3.1.20:../../textproc/ispell
 
 MAKE_FLAGS+=	TMPDIR=${WRKDIR:Q}
 
diff --git a/textproc/ispell-es/PLIST b/textproc/ispell-es/PLIST
new file mode 100644
index 00000000000..8bcaa49cb29
--- /dev/null
+++ b/textproc/ispell-es/PLIST
@@ -0,0 +1,3 @@
+@comment $NetBSD: PLIST,v 1.1 2013/04/24 02:20:39 rodent Exp $
+lib/castellano.aff
+lib/castellano.hash
diff --git a/textproc/ispell-spanish/distinfo b/textproc/ispell-es/distinfo
index 614634740e7..321ba5c4905 100644
--- a/textproc/ispell-spanish/distinfo
+++ b/textproc/ispell-es/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2009/03/05 11:56:00 jmmv Exp $
+$NetBSD: distinfo,v 1.1 2013/04/24 02:20:39 rodent Exp $
 
 SHA1 (espa~nol-1.7.tar.gz) = de8a2f2dbab0d3658aecd7ef109e91773da23dd7
 RMD160 (espa~nol-1.7.tar.gz) = be9692aa6c97f0ecefc1143bffd8edc5ac22f019
diff --git a/textproc/ispell-francais/DESCR b/textproc/ispell-fr/DESCR
index 73925c9cd95..73925c9cd95 100644
--- a/textproc/ispell-francais/DESCR
+++ b/textproc/ispell-fr/DESCR
diff --git a/textproc/ispell-francais/Makefile b/textproc/ispell-fr/Makefile
index e2a94d532f3..b23833fb258 100644
--- a/textproc/ispell-francais/Makefile
+++ b/textproc/ispell-fr/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2012/10/25 06:55:58 asau Exp $
+# $NetBSD: Makefile,v 1.1 2013/04/24 02:20:39 rodent Exp $
 #
 
 DISTNAME=	francais-IREQ-1.4
@@ -10,7 +10,7 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.gnu.org/software/ispell/ispell.html
 COMMENT=	French dictionary for interactive spelling checker
 
-DEPENDS+=	ispell-base>=3.1.20:../../textproc/ispell-base
+DEPENDS+=	ispell>=3.1.20:../../textproc/ispell
 
 INSTALLATION_DIRS=	lib
 
diff --git a/textproc/ispell-fr/PLIST b/textproc/ispell-fr/PLIST
new file mode 100644
index 00000000000..6ae771b1bc8
--- /dev/null
+++ b/textproc/ispell-fr/PLIST
@@ -0,0 +1,3 @@
+@comment $NetBSD: PLIST,v 1.1 2013/04/24 02:20:39 rodent Exp $
+lib/francais.aff
+lib/francais.hash
diff --git a/textproc/ispell-francais/distinfo b/textproc/ispell-fr/distinfo
index 003f2247deb..ea6635c342a 100644
--- a/textproc/ispell-francais/distinfo
+++ b/textproc/ispell-fr/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2009/07/07 21:52:41 joerg Exp $
+$NetBSD: distinfo,v 1.1 2013/04/24 02:20:39 rodent Exp $
 
 SHA1 (francais-IREQ-1.4.tar.gz) = 940712167cd2d40c27e673246b8ce9f99595a309
 RMD160 (francais-IREQ-1.4.tar.gz) = 9f11a627d84488c9cbbd37b75fbeae9060803f3d
diff --git a/textproc/ispell-francais/patches/patch-aa b/textproc/ispell-fr/patches/patch-aa
index 13682b9bf19..69a93d1206e 100644
--- a/textproc/ispell-francais/patches/patch-aa
+++ b/textproc/ispell-fr/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.2 2009/07/07 21:52:41 joerg Exp $
+$NetBSD: patch-aa,v 1.1 2013/04/24 02:20:39 rodent Exp $
 
 Use the buildhash program from the base installation
 
diff --git a/textproc/ispell-francais/PLIST b/textproc/ispell-francais/PLIST
deleted file mode 100644
index 2c60777a383..00000000000
--- a/textproc/ispell-francais/PLIST
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:57:04 zuntum Exp $
-lib/francais.aff
-lib/francais.hash
diff --git a/textproc/ispell-gaeilge/DESCR b/textproc/ispell-ga/DESCR
index 7b033de84e7..7b033de84e7 100644
--- a/textproc/ispell-gaeilge/DESCR
+++ b/textproc/ispell-ga/DESCR
diff --git a/textproc/ispell-gaeilge/Makefile b/textproc/ispell-ga/Makefile
index 30e79b2297d..5557ca39632 100644
--- a/textproc/ispell-gaeilge/Makefile
+++ b/textproc/ispell-ga/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2012/10/25 06:55:58 asau Exp $
+# $NetBSD: Makefile,v 1.1 2013/04/24 02:20:39 rodent Exp $
 
 DISTNAME=	ispell-gaeilge-2.0
 CATEGORIES=	textproc
@@ -8,7 +8,7 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://borel.slu.edu/~kps/ispell/
 COMMENT=	Irish language support for ispell
 
-DEPENDS+=	ispell-base>=3.1.20:../../textproc/ispell-base
+DEPENDS+=	ispell>=3.1.20:../../textproc/ispell
 
 INSTALLATION_DIRS=	lib
 
diff --git a/textproc/ispell-ga/PLIST b/textproc/ispell-ga/PLIST
new file mode 100644
index 00000000000..d3a0c67127c
--- /dev/null
+++ b/textproc/ispell-ga/PLIST
@@ -0,0 +1,3 @@
+@comment $NetBSD: PLIST,v 1.1 2013/04/24 02:20:39 rodent Exp $
+lib/gaeilge.aff
+lib/gaeilge.hash
diff --git a/textproc/ispell-gaeilge/distinfo b/textproc/ispell-ga/distinfo
index e38d7417a12..f68f647bbaa 100644
--- a/textproc/ispell-gaeilge/distinfo
+++ b/textproc/ispell-ga/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2012/03/09 15:18:00 fhajny Exp $
+$NetBSD: distinfo,v 1.1 2013/04/24 02:20:39 rodent Exp $
 
 SHA1 (ispell-gaeilge-2.0.tar.gz) = 66091937e88ceff648d5cb15752ec2a25b989ea7
 RMD160 (ispell-gaeilge-2.0.tar.gz) = c9c690c617b874037cdf3c365896af68b73c1396
diff --git a/textproc/ispell-gaeilge/patches/patch-aa b/textproc/ispell-ga/patches/patch-aa
index 62f72e6799a..44ef664b973 100644
--- a/textproc/ispell-gaeilge/patches/patch-aa
+++ b/textproc/ispell-ga/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.4 2012/03/09 15:18:00 fhajny Exp $
+$NetBSD: patch-aa,v 1.1 2013/04/24 02:20:40 rodent Exp $
 
 --- Makefile.orig	2002-07-31 16:37:34.000000000 +0000
 +++ Makefile
diff --git a/textproc/ispell-gaeilge/PLIST b/textproc/ispell-gaeilge/PLIST
deleted file mode 100644
index 090074e12ed..00000000000
--- a/textproc/ispell-gaeilge/PLIST
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:57:06 zuntum Exp $
-lib/gaeilge.aff
-lib/gaeilge.hash
diff --git a/textproc/ispell-polski/DESCR b/textproc/ispell-pl/DESCR
index 45e5c538df8..45e5c538df8 100644
--- a/textproc/ispell-polski/DESCR
+++ b/textproc/ispell-pl/DESCR
diff --git a/textproc/ispell-polski/Makefile b/textproc/ispell-pl/Makefile
index 60d4812823f..35c180222e9 100644
--- a/textproc/ispell-polski/Makefile
+++ b/textproc/ispell-pl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2012/10/25 06:55:58 asau Exp $
+# $NetBSD: Makefile,v 1.1 2013/04/24 02:20:40 rodent Exp $
 #
 
 DISTNAME=	ispell-pl-20021127
@@ -10,7 +10,7 @@ MAINTAINER=	adam@NetBSD.org
 HOMEPAGE=	http://ispell-pl.sourceforge.net/
 COMMENT=	Polish dictionary for interactive spelling checker
 
-DEPENDS+=	ispell-base>=3.1.20:../../textproc/ispell-base
+DEPENDS+=	ispell>=3.1.20:../../textproc/ispell
 
 INSTALLATION_DIRS=	lib
 
diff --git a/textproc/ispell-pl/PLIST b/textproc/ispell-pl/PLIST
new file mode 100644
index 00000000000..658b37e1f12
--- /dev/null
+++ b/textproc/ispell-pl/PLIST
@@ -0,0 +1,3 @@
+@comment $NetBSD: PLIST,v 1.1 2013/04/24 02:20:40 rodent Exp $
+lib/polish.aff
+lib/polish.hash
diff --git a/textproc/ispell-polski/distinfo b/textproc/ispell-pl/distinfo
index 094f6e9bc92..892037caa4f 100644
--- a/textproc/ispell-polski/distinfo
+++ b/textproc/ispell-pl/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2005/02/24 14:48:43 agc Exp $
+$NetBSD: distinfo,v 1.1 2013/04/24 02:20:40 rodent Exp $
 
 SHA1 (ispell-pl-20021127.tar.gz) = 9e5efd7656f6f0747130380750fc93c9ab4b1e3e
 RMD160 (ispell-pl-20021127.tar.gz) = 010031d0c9b57c8c8bbb759886d1e13b377a644c
diff --git a/textproc/ispell-polski/PLIST b/textproc/ispell-polski/PLIST
deleted file mode 100644
index 32fb668dbb3..00000000000
--- a/textproc/ispell-polski/PLIST
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2003/09/30 13:43:17 adam Exp $
-lib/polish.aff
-lib/polish.hash
diff --git a/textproc/ispell-romanian/DESCR b/textproc/ispell-ro/DESCR
index 865abfbb55c..865abfbb55c 100644
--- a/textproc/ispell-romanian/DESCR
+++ b/textproc/ispell-ro/DESCR
diff --git a/textproc/ispell-romanian/Makefile b/textproc/ispell-ro/Makefile
index 3ccf96296b9..2e383419a59 100644
--- a/textproc/ispell-romanian/Makefile
+++ b/textproc/ispell-ro/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2012/10/25 06:55:59 asau Exp $
+# $NetBSD: Makefile,v 1.1 2013/04/24 02:20:41 rodent Exp $
 #
 
 DISTNAME=	rom-spell
@@ -10,7 +10,7 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://fmg-www.cs.ucla.edu/fmg-members/geoff/ispell-dictionaries.html#Romanian-dicts
 COMMENT=	Romanian dictionary for ispell
 
-DEPENDS+=	ispell-base>=3.1.20:../../textproc/ispell-base
+DEPENDS+=	ispell>=3.1.20:../../textproc/ispell
 
 DIST_SUBDIR=	${PKGNAME_NOREV}
 
diff --git a/textproc/ispell-romanian/PLIST b/textproc/ispell-ro/PLIST
index 3183d200c88..79d9f7cc48b 100644
--- a/textproc/ispell-romanian/PLIST
+++ b/textproc/ispell-ro/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/08/19 21:20:38 jwise Exp $
+@comment $NetBSD: PLIST,v 1.1 2013/04/24 02:20:41 rodent Exp $
 lib/romanian.aff
 lib/romanian.hash
 lib/romanian-signs.aff
diff --git a/textproc/ispell-romanian/distinfo b/textproc/ispell-ro/distinfo
index 5e115c992cd..ef74e128077 100644
--- a/textproc/ispell-romanian/distinfo
+++ b/textproc/ispell-ro/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2005/02/24 14:48:43 agc Exp $
+$NetBSD: distinfo,v 1.1 2013/04/24 02:20:41 rodent Exp $
 
 SHA1 (ispell-romanian-20031216/rom-spell.tar.gz) = 9a500dff38a2628d8cd945bdb03b4b6b5fda24c4
 RMD160 (ispell-romanian-20031216/rom-spell.tar.gz) = 8b557981dd6388ef32216f65563ff7a18ef30e68
diff --git a/textproc/ispell-russian-io/DESCR b/textproc/ispell-ru-io/DESCR
index 90785860ef6..90785860ef6 100644
--- a/textproc/ispell-russian-io/DESCR
+++ b/textproc/ispell-ru-io/DESCR
diff --git a/textproc/ispell-russian-io/Makefile b/textproc/ispell-ru-io/Makefile
index c94f1bf6c12..3c1225994d4 100644
--- a/textproc/ispell-russian-io/Makefile
+++ b/textproc/ispell-ru-io/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2012/10/25 06:55:59 asau Exp $
+# $NetBSD: Makefile,v 1.1 2013/04/24 02:20:41 rodent Exp $
 
 PKGNAME=	ispell-russian-io-${RUS_ISPELL_VERSION}
 
diff --git a/textproc/ispell-ru-io/PLIST b/textproc/ispell-ru-io/PLIST
new file mode 100644
index 00000000000..6bc15bac5be
--- /dev/null
+++ b/textproc/ispell-ru-io/PLIST
@@ -0,0 +1,3 @@
+@comment $NetBSD: PLIST,v 1.1 2013/04/24 02:20:41 rodent Exp $
+lib/russian-io.aff
+lib/russian-io.hash
diff --git a/textproc/ispell-russian/DESCR b/textproc/ispell-ru/DESCR
index ceb1b1a2ce4..ceb1b1a2ce4 100644
--- a/textproc/ispell-russian/DESCR
+++ b/textproc/ispell-ru/DESCR
diff --git a/textproc/ispell-russian/Makefile b/textproc/ispell-ru/Makefile
index fb336d637c5..7484610c423 100644
--- a/textproc/ispell-russian/Makefile
+++ b/textproc/ispell-ru/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2012/10/25 06:55:59 asau Exp $
+# $NetBSD: Makefile,v 1.1 2013/04/24 02:20:41 rodent Exp $
 
 PKGNAME=	ispell-russian-${RUS_ISPELL_VERSION}
 
diff --git a/textproc/ispell-russian/Makefile.common b/textproc/ispell-ru/Makefile.common
index 340d56eb5b3..b247933ec3a 100644
--- a/textproc/ispell-russian/Makefile.common
+++ b/textproc/ispell-ru/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.6 2009/07/07 21:50:16 joerg Exp $
+# $NetBSD: Makefile.common,v 1.1 2013/04/24 02:20:41 rodent Exp $
 
 RUS_ISPELL_VERSION=	0.99g4
 
@@ -9,7 +9,7 @@ MASTER_SITES=	ftp://scon155.phys.msu.su/pub/russian/ispell/
 MAINTAINER=	mishka@NetBSD.org
 COMMENT=	Russian (KOI8-R) ispell dictonary from Alexander Lebedev
 
-DEPENDS+=	ispell-base>=3.1.20:../../textproc/ispell-base
+DEPENDS+=	ispell>=3.1.20:../../textproc/ispell
 
 FILESDIR=	${.CURDIR}/../../textproc/ispell-russian/files
 PATCHDIR=	${.CURDIR}/../../textproc/ispell-russian/patches
diff --git a/textproc/ispell-ru/PLIST b/textproc/ispell-ru/PLIST
new file mode 100644
index 00000000000..98f0cdaedd6
--- /dev/null
+++ b/textproc/ispell-ru/PLIST
@@ -0,0 +1,3 @@
+@comment $NetBSD: PLIST,v 1.1 2013/04/24 02:20:41 rodent Exp $
+lib/russian.aff
+lib/russian.hash
diff --git a/textproc/ispell-russian/distinfo b/textproc/ispell-ru/distinfo
index 7237a9250c6..1fb3500561c 100644
--- a/textproc/ispell-russian/distinfo
+++ b/textproc/ispell-ru/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2009/07/07 21:50:16 joerg Exp $
+$NetBSD: distinfo,v 1.1 2013/04/24 02:20:41 rodent Exp $
 
 SHA1 (rus-ispell-0.99g4.tar.gz) = a1f178b8e51abe812a69209f58e4f583e4e7bc39
 RMD160 (rus-ispell-0.99g4.tar.gz) = 6c2d74b22c488e6372615b98c727f84011dea1be
diff --git a/textproc/ispell-russian/patches/patch-aa b/textproc/ispell-ru/patches/patch-aa
index 4b146b6a2a6..0d384f115a6 100644
--- a/textproc/ispell-russian/patches/patch-aa
+++ b/textproc/ispell-ru/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.3 2009/07/07 21:50:17 joerg Exp $
+$NetBSD: patch-aa,v 1.1 2013/04/24 02:20:41 rodent Exp $
 
 --- Makefile.orig	2002-10-09 23:35:54.000000000 +0100
 +++ Makefile	2004-01-23 14:49:03.000000000 +0000
diff --git a/textproc/ispell-russian-io/PLIST b/textproc/ispell-russian-io/PLIST
deleted file mode 100644
index 29c123067ff..00000000000
--- a/textproc/ispell-russian-io/PLIST
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/01/23 15:00:02 agc Exp $
-lib/russian-io.aff
-lib/russian-io.hash
diff --git a/textproc/ispell-russian/PLIST b/textproc/ispell-russian/PLIST
deleted file mode 100644
index 99c77ab1cf7..00000000000
--- a/textproc/ispell-russian/PLIST
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/11/19 15:53:25 jschauma Exp $
-lib/russian.aff
-lib/russian.hash
diff --git a/textproc/ispell-slovak/DESCR b/textproc/ispell-sk/DESCR
index eeb60e396ce..eeb60e396ce 100644
--- a/textproc/ispell-slovak/DESCR
+++ b/textproc/ispell-sk/DESCR
diff --git a/textproc/ispell-slovak/Makefile b/textproc/ispell-sk/Makefile
index eecc5c6755e..716f06951e8 100644
--- a/textproc/ispell-slovak/Makefile
+++ b/textproc/ispell-sk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2012/10/25 06:56:00 asau Exp $
+# $NetBSD: Makefile,v 1.1 2013/04/24 02:20:42 rodent Exp $
 #
 
 DISTNAME=	ispell-sk-0.2.2
@@ -10,7 +10,7 @@ MAINTAINER=	salo@NetBSD.org
 HOMEPAGE=	http://sk-spell.sk.cx/?id=4
 COMMENT=	Slovak dictionary for ispell
 
-DEPENDS+=	ispell-base>=3.1.20:../../textproc/ispell-base
+DEPENDS+=	ispell>=3.1.20:../../textproc/ispell
 
 MAKE_ENV+=	CAT=${CAT:Q} SORT=${SORT:Q}
 
diff --git a/textproc/ispell-sk/PLIST b/textproc/ispell-sk/PLIST
new file mode 100644
index 00000000000..ff69f7f181a
--- /dev/null
+++ b/textproc/ispell-sk/PLIST
@@ -0,0 +1,3 @@
+@comment $NetBSD: PLIST,v 1.1 2013/04/24 02:20:42 rodent Exp $
+lib/slovak.aff
+lib/slovak.hash
diff --git a/textproc/ispell-slovak/distinfo b/textproc/ispell-sk/distinfo
index 89a3979a8a6..bec7b87acc4 100644
--- a/textproc/ispell-slovak/distinfo
+++ b/textproc/ispell-sk/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.10 2009/07/07 21:48:22 joerg Exp $
+$NetBSD: distinfo,v 1.1 2013/04/24 02:20:42 rodent Exp $
 
 SHA1 (ispell-sk-0.2.2.tar.gz) = e30fe88dd7cc0d0b318e20870649bc24245624f3
 RMD160 (ispell-sk-0.2.2.tar.gz) = 55ba2884e5f4b644672fee23635d8b5fd48c3b96
diff --git a/textproc/ispell-slovak/patches/patch-aa b/textproc/ispell-sk/patches/patch-aa
index cd290493d9b..79897fe1841 100644
--- a/textproc/ispell-slovak/patches/patch-aa
+++ b/textproc/ispell-sk/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.5 2009/07/07 21:48:22 joerg Exp $
+$NetBSD: patch-aa,v 1.1 2013/04/24 02:20:42 rodent Exp $
 
 --- Makefile.orig	2004-02-27 14:50:43.000000000 +0100
 +++ Makefile	2004-09-12 22:50:13.000000000 +0200
diff --git a/textproc/ispell-slovak/PLIST b/textproc/ispell-slovak/PLIST
deleted file mode 100644
index 790d7536703..00000000000
--- a/textproc/ispell-slovak/PLIST
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/08/02 03:19:52 jschauma Exp $
-lib/slovak.aff
-lib/slovak.hash
diff --git a/textproc/ispell-spanish/PLIST b/textproc/ispell-spanish/PLIST
deleted file mode 100644
index c2e343d99b7..00000000000
--- a/textproc/ispell-spanish/PLIST
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/07/22 11:31:46 agc Exp $
-lib/castellano.aff
-lib/castellano.hash
diff --git a/textproc/ispell-svenska/DESCR b/textproc/ispell-sv/DESCR
index ea7c9909f82..ea7c9909f82 100644
--- a/textproc/ispell-svenska/DESCR
+++ b/textproc/ispell-sv/DESCR
diff --git a/textproc/ispell-svenska/Makefile b/textproc/ispell-sv/Makefile
index 35bb03132f6..1084ea801f0 100644
--- a/textproc/ispell-svenska/Makefile
+++ b/textproc/ispell-sv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2012/10/25 06:56:00 asau Exp $
+# $NetBSD: Makefile,v 1.1 2013/04/24 02:20:43 rodent Exp $
 #
 
 DISTNAME=	iswedish-1.2.1
@@ -12,6 +12,6 @@ COMMENT=	Swedish dictionary for interactive spelling checker
 
 INSTALLATION_DIRS=	lib
 
-DEPENDS+=	ispell-base>=3.1.20:../../textproc/ispell-base
+DEPENDS+=	ispell>=3.1.20:../../textproc/ispell
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/ispell-sv/PLIST b/textproc/ispell-sv/PLIST
new file mode 100644
index 00000000000..a002976fe4b
--- /dev/null
+++ b/textproc/ispell-sv/PLIST
@@ -0,0 +1,3 @@
+@comment $NetBSD: PLIST,v 1.1 2013/04/24 02:20:43 rodent Exp $
+lib/svenska.aff
+lib/svenska.hash
diff --git a/textproc/ispell-svenska/distinfo b/textproc/ispell-sv/distinfo
index 863fdb4aa8a..21d5abe5e5a 100644
--- a/textproc/ispell-svenska/distinfo
+++ b/textproc/ispell-sv/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2009/07/07 21:48:25 joerg Exp $
+$NetBSD: distinfo,v 1.1 2013/04/24 02:20:43 rodent Exp $
 
 SHA1 (iswedish-1.2.1.tar.gz) = c26c851123a427b495ca9ac10c443ec23efa8e3a
 RMD160 (iswedish-1.2.1.tar.gz) = 4d5a040018b12d06f4d8f45f89eb775ba6f88aab
diff --git a/textproc/ispell-svenska/patches/patch-aa b/textproc/ispell-sv/patches/patch-aa
index cc648e2724c..3121d5d1d33 100644
--- a/textproc/ispell-svenska/patches/patch-aa
+++ b/textproc/ispell-sv/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.2 2009/07/07 21:48:26 joerg Exp $
+$NetBSD: patch-aa,v 1.1 2013/04/24 02:20:43 rodent Exp $
 
 --- Makefile.orig	Thu Jan 29 16:06:32 1998
 +++ Makefile	Sat Apr 28 17:21:54 2001
diff --git a/textproc/ispell-svenska/PLIST b/textproc/ispell-svenska/PLIST
deleted file mode 100644
index 72ff91c3177..00000000000
--- a/textproc/ispell-svenska/PLIST
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:57:10 zuntum Exp $
-lib/svenska.aff
-lib/svenska.hash
diff --git a/textproc/ispell-base/DESCR b/textproc/ispell/DESCR
index 9ede40c46b7..9ede40c46b7 100644
--- a/textproc/ispell-base/DESCR
+++ b/textproc/ispell/DESCR
diff --git a/textproc/ispell-base/Makefile b/textproc/ispell/Makefile
index c4354296659..592bc2f6b0f 100644
--- a/textproc/ispell-base/Makefile
+++ b/textproc/ispell/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.37 2012/10/25 06:55:57 asau Exp $
+# $NetBSD: Makefile,v 1.25 2013/04/24 02:20:36 rodent Exp $
 #
 
 DISTNAME=	ispell-3.3.02
-PKGNAME=	ispell-base-3.3.02
 CATEGORIES=	textproc
 MASTER_SITES=	http://fmg-www.cs.ucla.edu/geoff/tars/
 
@@ -10,8 +9,6 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://ficus-www.cs.ucla.edu/geoff/ispell.html
 COMMENT=	Interactive spelling checker
 
-CONFLICTS+=	ispell-[0-9]*
-
 USE_TOOLS+=	mktemp:run yacc
 INSTALLATION_DIRS=	bin lib ${PKGMANDIR}/man1 ${PKGMANDIR}/man5
 
diff --git a/textproc/ispell-base/PLIST b/textproc/ispell/PLIST
index b6c46433d44..5a26733b008 100644
--- a/textproc/ispell-base/PLIST
+++ b/textproc/ispell/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2005/07/07 12:42:20 markd Exp $
+@comment $NetBSD: PLIST,v 1.1 2013/04/24 02:20:36 rodent Exp $
 bin/buildhash
 bin/defmt-c
 bin/defmt-sh
diff --git a/textproc/ispell-base/distinfo b/textproc/ispell/distinfo
index add51fbd483..fec96c9d8b1 100644
--- a/textproc/ispell-base/distinfo
+++ b/textproc/ispell/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.13 2009/07/17 08:19:29 roy Exp $
+$NetBSD: distinfo,v 1.1 2013/04/24 02:20:36 rodent Exp $
 
 SHA1 (ispell-3.3.02.tar.gz) = c0d98e1af3afb8e0b642717c03439ff8881e3d60
 RMD160 (ispell-3.3.02.tar.gz) = 12edc94ebb7c1f4040bd8f5b0dbb8f40326aa781
diff --git a/textproc/ispell-base/patches/patch-aa b/textproc/ispell/patches/patch-aa
index 626160a0f30..9400e998cf3 100644
--- a/textproc/ispell-base/patches/patch-aa
+++ b/textproc/ispell/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.1.1.1 2001/03/14 12:10:22 agc Exp $
+$NetBSD: patch-aa,v 1.4 2013/04/24 02:20:36 rodent Exp $
 
 --- languages/english/english.2-orig	Mon Jan 23 19:28:44 1995
 +++ languages/english/english.2	Thu Apr 16 14:34:21 1998
diff --git a/textproc/ispell-base/patches/patch-ab b/textproc/ispell/patches/patch-ab
index e885320c097..fdaac685a92 100644
--- a/textproc/ispell-base/patches/patch-ab
+++ b/textproc/ispell/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.5 2009/02/12 16:06:32 joerg Exp $
+$NetBSD: patch-ab,v 1.8 2013/04/24 02:20:36 rodent Exp $
 
 --- Makefile.orig	2005-05-25 15:57:02.000000000 +0200
 +++ Makefile
diff --git a/textproc/ispell-base/patches/patch-ac b/textproc/ispell/patches/patch-ac
index 7752d30dcef..e930cd2094e 100644
--- a/textproc/ispell-base/patches/patch-ac
+++ b/textproc/ispell/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.3 2005/07/07 12:42:20 markd Exp $
+$NetBSD: patch-ac,v 1.3 2013/04/24 02:20:36 rodent Exp $
 
 --- ispell.h.orig	2005-04-29 02:46:51.000000000 +1200
 +++ ispell.h
diff --git a/textproc/ispell-base/patches/patch-ad b/textproc/ispell/patches/patch-ad
index 94407d9e849..2ae6ef107a8 100644
--- a/textproc/ispell-base/patches/patch-ad
+++ b/textproc/ispell/patches/patch-ad
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.3 2005/07/07 12:42:20 markd Exp $
+$NetBSD: patch-ad,v 1.3 2013/04/24 02:20:36 rodent Exp $
 
 --- buildhash.c.orig	2005-04-28 12:26:06.000000000 +1200
 +++ buildhash.c
diff --git a/textproc/ispell-base/patches/patch-ae b/textproc/ispell/patches/patch-ae
index 52ca23dacca..9a952c6f70b 100644
--- a/textproc/ispell-base/patches/patch-ae
+++ b/textproc/ispell/patches/patch-ae
@@ -1,4 +1,4 @@
-$NetBSD: patch-ae,v 1.3 2005/07/07 12:42:20 markd Exp $
+$NetBSD: patch-ae,v 1.3 2013/04/24 02:20:36 rodent Exp $
 
 --- lookup.c.orig	2005-04-15 09:25:52.000000000 +1200
 +++ lookup.c
diff --git a/textproc/ispell-base/patches/patch-ai b/textproc/ispell/patches/patch-ai
index 6e13f1149c4..418a4ae18d7 100644
--- a/textproc/ispell-base/patches/patch-ai
+++ b/textproc/ispell/patches/patch-ai
@@ -1,4 +1,4 @@
-$NetBSD: patch-ai,v 1.1.1.1 2001/03/14 12:10:22 agc Exp $
+$NetBSD: patch-ai,v 1.3 2013/04/24 02:20:36 rodent Exp $
 --- languages/english/english.3.orig	Tue Oct 27 22:26:48 1998
 +++ languages/english/english.3	Tue Oct 27 22:27:35 1998
 @@ -5202,6 +5202,7 @@
diff --git a/textproc/ispell-base/patches/patch-ak b/textproc/ispell/patches/patch-ak
index 23a607a0e40..23986765c9f 100644
--- a/textproc/ispell-base/patches/patch-ak
+++ b/textproc/ispell/patches/patch-ak
@@ -1,4 +1,4 @@
-$NetBSD: patch-ak,v 1.5 2005/07/07 12:42:20 markd Exp $
+$NetBSD: patch-ak,v 1.1 2013/04/24 02:20:36 rodent Exp $
 
 --- term.c.orig	2005-04-15 11:11:36.000000000 +1200
 +++ term.c
diff --git a/textproc/ispell-base/patches/patch-al b/textproc/ispell/patches/patch-al
index a4d9b06409f..83411fb67ce 100644
--- a/textproc/ispell-base/patches/patch-al
+++ b/textproc/ispell/patches/patch-al
@@ -1,4 +1,4 @@
-$NetBSD: patch-al,v 1.3 2005/07/07 12:42:20 markd Exp $
+$NetBSD: patch-al,v 1.1 2013/04/24 02:20:36 rodent Exp $
 
 --- config.X.orig	2005-05-26 02:13:53.000000000 +1200
 +++ config.X
diff --git a/textproc/ispell-base/patches/patch-ar b/textproc/ispell/patches/patch-ar
index 6d88b8a7e08..b2b1d650d77 100644
--- a/textproc/ispell-base/patches/patch-ar
+++ b/textproc/ispell/patches/patch-ar
@@ -1,4 +1,4 @@
-$NetBSD: patch-ar,v 1.1 2004/03/19 06:20:21 uebayasi Exp $
+$NetBSD: patch-ar,v 1.1 2013/04/24 02:20:37 rodent Exp $
 
 --- ijoin.c.orig	Fri Mar 19 15:00:19 2004
 +++ ijoin.c	Fri Mar 19 15:01:51 2004
diff --git a/textproc/ispell-base/patches/patch-as b/textproc/ispell/patches/patch-as
index afc4e8ff90a..95245e3bc14 100644
--- a/textproc/ispell-base/patches/patch-as
+++ b/textproc/ispell/patches/patch-as
@@ -1,4 +1,4 @@
-$NetBSD: patch-as,v 1.1 2009/07/17 08:19:29 roy Exp $
+$NetBSD: patch-as,v 1.1 2013/04/24 02:20:37 rodent Exp $
 
 Avoid conflit with system getline.
 Fixes PR pkg/41746, thanks to Tom Stejskal.