Moved aspell-* packages as discussed. Reasons being:

1) Shorter package name;
2) Be consistent with kde3-i18n-*, kde4-l10n-*, hunspell-*, lang-*
   PKG_OPTIONS;
3) Simplify modifications to PKGNAME in their Makefiles;
4) Accordance with international language naming standards;
5) Facilitate the addition of other dictionaries which are variants of the
   same language (ex. Portuguese and Norwegian);

May this commit not cause anything to explode, hairs to gray, nerds to rage

126 files changed, 394 insertions, 447 deletions

diff --git a/textproc/Makefile b/textproc/Makefile
index f55e91c87f9..c2fcf899730 100644
--- a/textproc/Makefile
+++ b/textproc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.655 2013/04/04 09:42:53 wiz Exp $
+# $NetBSD: Makefile,v 1.656 2013/04/09 02:33:36 rodent Exp $
 #
 
 COMMENT=	Text processing utilities (does not include desktop publishing)
@@ -13,29 +13,29 @@ SUBDIR+=	aiksaurus
 SUBDIR+=	antiword
 SUBDIR+=	asciidoc
 SUBDIR+=	aspell
-SUBDIR+=	aspell-breton
-SUBDIR+=	aspell-catalan
-SUBDIR+=	aspell-czech
-SUBDIR+=	aspell-danish
-SUBDIR+=	aspell-dutch
-SUBDIR+=	aspell-english
-SUBDIR+=	aspell-esperanto
-SUBDIR+=	aspell-faroese
-SUBDIR+=	aspell-francais
-SUBDIR+=	aspell-gaeilge
-SUBDIR+=	aspell-german
-SUBDIR+=	aspell-greek
-SUBDIR+=	aspell-italian
-SUBDIR+=	aspell-norwegian
-SUBDIR+=	aspell-polish
-SUBDIR+=	aspell-portuguese
-SUBDIR+=	aspell-romanian
-SUBDIR+=	aspell-russian
-SUBDIR+=	aspell-slovak
-SUBDIR+=	aspell-spanish
-SUBDIR+=	aspell-svenska
-SUBDIR+=	aspell-ukrainian
-SUBDIR+=	aspell-welsh
+SUBDIR+=	aspell-br
+SUBDIR+=	aspell-ca
+SUBDIR+=	aspell-cs
+SUBDIR+=	aspell-cy
+SUBDIR+=	aspell-da
+SUBDIR+=	aspell-de
+SUBDIR+=	aspell-el
+SUBDIR+=	aspell-en
+SUBDIR+=	aspell-eo
+SUBDIR+=	aspell-es
+SUBDIR+=	aspell-fo
+SUBDIR+=	aspell-fr
+SUBDIR+=	aspell-ga
+SUBDIR+=	aspell-it
+SUBDIR+=	aspell-nb
+SUBDIR+=	aspell-nl
+SUBDIR+=	aspell-pl
+SUBDIR+=	aspell-pt_PT
+SUBDIR+=	aspell-ro
+SUBDIR+=	aspell-ru
+SUBDIR+=	aspell-sk
+SUBDIR+=	aspell-sv
+SUBDIR+=	aspell-uk
 SUBDIR+=	awf
 SUBDIR+=	bibclean
 SUBDIR+=	biblook
diff --git a/textproc/aspell-breton/DESCR b/textproc/aspell-br/DESCR
index 3b981db83f7..3b981db83f7 100644
--- a/textproc/aspell-breton/DESCR
+++ b/textproc/aspell-br/DESCR
diff --git a/textproc/aspell-breton/Makefile b/textproc/aspell-br/Makefile
index 8dae91f6bdf..dd9d26d2af3 100644
--- a/textproc/aspell-breton/Makefile
+++ b/textproc/aspell-br/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.16 2012/10/25 06:55:39 asau Exp $
+# $NetBSD: Makefile,v 1.1 2013/04/09 02:33:36 rodent Exp $
 #
 
 DISTNAME=	aspell-br-0.50-2
-PKGNAME=	${DISTNAME:C/br-(.*)-(.*)$/breton-\1.\2/}
-PKGREVISION=	5
+PKGNAME=	${DISTNAME:S/-2/.2/1}
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_GNU:=aspell/dict/br/}
 EXTRACT_SUFX=	.tar.bz2
@@ -12,7 +11,7 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://aspell.net/
 COMMENT=	Breton language support for aspell
 
-HAS_CONFIGURE=	YES
+HAS_CONFIGURE=	yes
 
 .include "../../textproc/aspell/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/aspell-breton/PLIST b/textproc/aspell-br/PLIST
index 9276a2c3c8b..bbf21aca1b6 100644
--- a/textproc/aspell-breton/PLIST
+++ b/textproc/aspell-br/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2003/01/17 06:45:16 salo Exp $
+@comment $NetBSD: PLIST,v 1.1 2013/04/09 02:33:36 rodent Exp $
 lib/aspell/br.multi
 lib/aspell/br.rws
 lib/aspell/breton.alias
diff --git a/textproc/aspell-breton/distinfo b/textproc/aspell-br/distinfo
index 8e22948156d..259345e063f 100644
--- a/textproc/aspell-breton/distinfo
+++ b/textproc/aspell-br/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2005/02/24 14:48:39 agc Exp $
+$NetBSD: distinfo,v 1.1 2013/04/09 02:33:36 rodent Exp $
 
 SHA1 (aspell-br-0.50-2.tar.bz2) = e6cbb638d7704e88c6d59b794829267b41a7e536
 RMD160 (aspell-br-0.50-2.tar.bz2) = 6ba96ddb2b9f56decbc06e821844d849b90bc57b
diff --git a/textproc/aspell-czech/patches/patch-aa b/textproc/aspell-br/patches/patch-aa
index d6f1141c65e..c0c612096aa 100644
--- a/textproc/aspell-czech/patches/patch-aa
+++ b/textproc/aspell-br/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.2 2003/01/19 06:35:45 salo Exp $
+$NetBSD: patch-aa,v 1.1 2013/04/09 02:33:36 rodent Exp $
 
 --- Makefile.pre.orig	Fri Jan  3 18:39:33 2003
 +++ Makefile.pre	Wed Jan 15 00:48:39 2003
diff --git a/textproc/aspell-catalan/DESCR b/textproc/aspell-ca/DESCR
index bdc1d8c5b1c..bdc1d8c5b1c 100644
--- a/textproc/aspell-catalan/DESCR
+++ b/textproc/aspell-ca/DESCR
diff --git a/textproc/aspell-catalan/Makefile b/textproc/aspell-ca/Makefile
index 93a6e0c39f5..b9f40866f6a 100644
--- a/textproc/aspell-catalan/Makefile
+++ b/textproc/aspell-ca/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.15 2012/10/25 06:55:39 asau Exp $
+# $NetBSD: Makefile,v 1.1 2013/04/09 02:33:36 rodent Exp $
 #
 
 DISTNAME=	aspell6-ca-20040130-1
-PKGNAME=	${DISTNAME:C/6-ca-(.*)-(.*)$/-catalan-\1.\2/}
-PKGREVISION=	2
+PKGNAME=	${DISTNAME:S/6-/-/1:S/-1/.1/1}
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_GNU:=aspell/dict/ca/}
 EXTRACT_SUFX=	.tar.bz2
@@ -12,7 +11,7 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://aspell.net/
 COMMENT=	Catalan language support for aspell
 
-HAS_CONFIGURE=	YES
+HAS_CONFIGURE=	yes
 
 .include "../../textproc/aspell/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/aspell-catalan/PLIST b/textproc/aspell-ca/PLIST
index 3ce6769b198..79802500e79 100644
--- a/textproc/aspell-catalan/PLIST
+++ b/textproc/aspell-ca/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2004/12/24 03:03:46 wiz Exp $
+@comment $NetBSD: PLIST,v 1.1 2013/04/09 02:33:37 rodent Exp $
 lib/aspell/ca.multi
 lib/aspell/ca.rws
 lib/aspell/catalan.alias
diff --git a/textproc/aspell-catalan/distinfo b/textproc/aspell-ca/distinfo
index 05afa440230..81ddb8a77e0 100644
--- a/textproc/aspell-catalan/distinfo
+++ b/textproc/aspell-ca/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2005/02/24 14:48:39 agc Exp $
+$NetBSD: distinfo,v 1.1 2013/04/09 02:33:37 rodent Exp $
 
 SHA1 (aspell6-ca-20040130-1.tar.bz2) = 8704bd9f3b600b581f5a642c27752538a7a953ac
 RMD160 (aspell6-ca-20040130-1.tar.bz2) = cafc870c5c0639b5e5839c060a762252bf658e14
diff --git a/textproc/aspell-dutch/patches/patch-aa b/textproc/aspell-ca/patches/patch-aa
index fd845386200..4e7d1099dcc 100644
--- a/textproc/aspell-dutch/patches/patch-aa
+++ b/textproc/aspell-ca/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.2 2003/01/19 06:35:46 salo Exp $
+$NetBSD: patch-aa,v 1.1 2013/04/09 02:33:37 rodent Exp $
 
 --- Makefile.pre.orig	Fri Jan  3 18:39:33 2003
 +++ Makefile.pre	Wed Jan 15 00:48:39 2003
diff --git a/textproc/aspell-czech/DESCR b/textproc/aspell-cs/DESCR
index 1e1985ea1d0..1e1985ea1d0 100644
--- a/textproc/aspell-czech/DESCR
+++ b/textproc/aspell-cs/DESCR
diff --git a/textproc/aspell-czech/Makefile b/textproc/aspell-cs/Makefile
index bbcac385872..69363409d83 100644
--- a/textproc/aspell-czech/Makefile
+++ b/textproc/aspell-cs/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.17 2012/10/25 06:55:39 asau Exp $
+# $NetBSD: Makefile,v 1.1 2013/04/09 02:33:37 rodent Exp $
 #
 
 DISTNAME=	aspell6-cs-20040614-1
-PKGNAME=	${DISTNAME:C/6-cs-(.*)-(.*)$/-czech-\1.\2/}
-PKGREVISION=	2
+PKGNAME=	${DISTNAME:S/6-/-/1:S/-1/.1/1}
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_GNU:=aspell/dict/cs/}
 EXTRACT_SUFX=	.tar.bz2
@@ -15,7 +14,7 @@ COMMENT=	Czech language support for aspell
 # earlier versions core-dumped on the input
 BUILDLINK_API_DEPENDS.aspell+=	aspell>=0.60.2nb1
 
-HAS_CONFIGURE=	YES
+HAS_CONFIGURE=	yes
 
 .include "../../textproc/aspell/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/aspell-czech/PLIST b/textproc/aspell-cs/PLIST
index c10e04bee96..49743b43f31 100644
--- a/textproc/aspell-czech/PLIST
+++ b/textproc/aspell-cs/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2005/06/26 05:20:07 wiz Exp $
+@comment $NetBSD: PLIST,v 1.1 2013/04/09 02:33:37 rodent Exp $
 lib/aspell/cs.multi
 lib/aspell/cs.rws
 lib/aspell/czech.alias
diff --git a/textproc/aspell-czech/distinfo b/textproc/aspell-cs/distinfo
index d2a16ca12b6..f295028ae16 100644
--- a/textproc/aspell-czech/distinfo
+++ b/textproc/aspell-cs/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2005/05/25 13:42:18 wiz Exp $
+$NetBSD: distinfo,v 1.1 2013/04/09 02:33:37 rodent Exp $
 
 SHA1 (aspell6-cs-20040614-1.tar.bz2) = 83756c070c1444f06c779a350d0bdad1d31e2b98
 RMD160 (aspell6-cs-20040614-1.tar.bz2) = a1d285ef6438fa164f837c7d07aea7ca35365035
diff --git a/textproc/aspell-catalan/patches/patch-aa b/textproc/aspell-cs/patches/patch-aa
index d0c4640eb2b..4e7d1099dcc 100644
--- a/textproc/aspell-catalan/patches/patch-aa
+++ b/textproc/aspell-cs/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.2 2003/01/19 06:35:44 salo Exp $
+$NetBSD: patch-aa,v 1.1 2013/04/09 02:33:37 rodent Exp $
 
 --- Makefile.pre.orig	Fri Jan  3 18:39:33 2003
 +++ Makefile.pre	Wed Jan 15 00:48:39 2003
diff --git a/textproc/aspell-welsh/DESCR b/textproc/aspell-cy/DESCR
index 67c1ae4acbc..67c1ae4acbc 100644
--- a/textproc/aspell-welsh/DESCR
+++ b/textproc/aspell-cy/DESCR
diff --git a/textproc/aspell-welsh/Makefile b/textproc/aspell-cy/Makefile
index a8f9f44d6ef..0284c635456 100644
--- a/textproc/aspell-welsh/Makefile
+++ b/textproc/aspell-cy/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.16 2012/10/25 06:55:42 asau Exp $
+# $NetBSD: Makefile,v 1.1 2013/04/09 02:33:38 rodent Exp $
 #
 
 DISTNAME=	aspell-cy-0.50-3
-PKGNAME=	${DISTNAME:C/cy-(.*)-(.*)$/welsh-\1.\2/}
-PKGREVISION=	5
+PKGNAME=	${DISTNAME:S/-3/.3/1}
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_GNU:=aspell/dict/cy/}
 EXTRACT_SUFX=	.tar.bz2
@@ -12,7 +11,7 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://aspell.net/
 COMMENT=	Welsh language support for aspell
 
-HAS_CONFIGURE=	YES
+HAS_CONFIGURE=	yes
 
 .include "../../textproc/aspell/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/aspell-welsh/PLIST b/textproc/aspell-cy/PLIST
index 8576d9b1e45..3f368d739df 100644
--- a/textproc/aspell-welsh/PLIST
+++ b/textproc/aspell-cy/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2003/01/17 06:47:05 salo Exp $
+@comment $NetBSD: PLIST,v 1.1 2013/04/09 02:33:38 rodent Exp $
 lib/aspell/cy.multi
 lib/aspell/cy.rws
 lib/aspell/welsh.alias
diff --git a/textproc/aspell-welsh/distinfo b/textproc/aspell-cy/distinfo
index 90986c78baf..5c6959fc069 100644
--- a/textproc/aspell-welsh/distinfo
+++ b/textproc/aspell-cy/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2005/02/24 14:48:40 agc Exp $
+$NetBSD: distinfo,v 1.1 2013/04/09 02:33:38 rodent Exp $
 
 SHA1 (aspell-cy-0.50-3.tar.bz2) = 8a62c649cf99cd239449961a0d5f8942b1c02116
 RMD160 (aspell-cy-0.50-3.tar.bz2) = 981fc9aef481cea7aedd36415fc00d525ac01873
diff --git a/textproc/aspell-breton/patches/patch-aa b/textproc/aspell-cy/patches/patch-aa
index d0c4640eb2b..2706b33b7fb 100644
--- a/textproc/aspell-breton/patches/patch-aa
+++ b/textproc/aspell-cy/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.2 2003/01/19 06:35:44 salo Exp $
+$NetBSD: patch-aa,v 1.1 2013/04/09 02:33:38 rodent Exp $
 
 --- Makefile.pre.orig	Fri Jan  3 18:39:33 2003
 +++ Makefile.pre	Wed Jan 15 00:48:39 2003
diff --git a/textproc/aspell-danish/DESCR b/textproc/aspell-da/DESCR
index 7828300e10a..7828300e10a 100644
--- a/textproc/aspell-danish/DESCR
+++ b/textproc/aspell-da/DESCR
diff --git a/textproc/aspell-danish/Makefile b/textproc/aspell-da/Makefile
index 453e59fad75..94da9b005c1 100644
--- a/textproc/aspell-danish/Makefile
+++ b/textproc/aspell-da/Makefile
@@ -1,8 +1,6 @@
-# $NetBSD: Makefile,v 1.18 2012/10/25 06:55:39 asau Exp $
+# $NetBSD: Makefile,v 1.1 2013/04/09 02:33:38 rodent Exp $
 
 DISTNAME=	aspell-da-1.7.30
-PKGNAME=	${DISTNAME:C/-da-/-danish-/}
-PKGREVISION=	2
 CATEGORIES=	textproc
 MASTER_SITES=	http://da.speling.org/filer/
 EXTRACT_SUFX=	.tar.bz2
@@ -14,7 +12,7 @@ COMMENT=	Danish language support for aspell
 USE_TOOLS+=	perl
 REPLACE_PERL=	unsq
 
-INSTALLATION_DIRS=	lib/aspell share/aspell
+INSTALLATION_DIRS+=	lib/aspell share/aspell
 
 .include "../../textproc/aspell/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/aspell-danish/PLIST b/textproc/aspell-da/PLIST
index 0a93db29db1..acf08f0925e 100644
--- a/textproc/aspell-danish/PLIST
+++ b/textproc/aspell-da/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2006/01/29 01:42:27 wiz Exp $
+@comment $NetBSD: PLIST,v 1.1 2013/04/09 02:33:38 rodent Exp $
 lib/aspell/da_DK
 lib/aspell/danish
 lib/aspell/dansk
diff --git a/textproc/aspell-danish/distinfo b/textproc/aspell-da/distinfo
index 247373cbb62..9c6c30ee99b 100644
--- a/textproc/aspell-danish/distinfo
+++ b/textproc/aspell-da/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2009/12/02 17:51:25 snj Exp $
+$NetBSD: distinfo,v 1.1 2013/04/09 02:33:38 rodent Exp $
 
 SHA1 (aspell-da-1.7.30.tar.bz2) = 7b629f8a87840571ef29bbf312210f8a0e6bcbe2
 RMD160 (aspell-da-1.7.30.tar.bz2) = 278335a74a65d0b18d4e7e57400f4afa7552257c
diff --git a/textproc/aspell-danish/patches/patch-aa b/textproc/aspell-da/patches/patch-aa
index 8ff672e09cf..1b67c07c142 100644
--- a/textproc/aspell-danish/patches/patch-aa
+++ b/textproc/aspell-da/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.5 2009/12/02 17:51:25 snj Exp $
+$NetBSD: patch-aa,v 1.1 2013/04/09 02:33:38 rodent Exp $
 
 --- Makefile.orig	2009-11-04 13:52:19.000000000 -0800
 +++ Makefile	2009-12-02 09:45:44.000000000 -0800
diff --git a/textproc/aspell-german/DESCR b/textproc/aspell-de/DESCR
index 0d23d830187..0d23d830187 100644
--- a/textproc/aspell-german/DESCR
+++ b/textproc/aspell-de/DESCR
diff --git a/textproc/aspell-german/Makefile b/textproc/aspell-de/Makefile
index 2b34556f03e..3f77bd0f293 100644
--- a/textproc/aspell-german/Makefile
+++ b/textproc/aspell-de/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.15 2012/10/25 06:55:41 asau Exp $
+# $NetBSD: Makefile,v 1.1 2013/04/09 02:33:39 rodent Exp $
 #
 
 DISTNAME=	aspell6-de-20030222-1
-PKGNAME=	${DISTNAME:C/6-de-(.*)-(.*)$/-german-\1.\2/}
-PKGREVISION=	2
+PKGNAME=	${DISTNAME:S/6-/-/1:S/-1/.1/1}
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_GNU:=aspell/dict/de/}
 EXTRACT_SUFX=	.tar.bz2
@@ -12,7 +11,7 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://aspell.net/
 COMMENT=	German language support for aspell
 
-HAS_CONFIGURE=	YES
+HAS_CONFIGURE=	yes
 
 .include "../../textproc/aspell/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/aspell-german/PLIST b/textproc/aspell-de/PLIST
index 18739bd3c40..9a3c3b926eb 100644
--- a/textproc/aspell-german/PLIST
+++ b/textproc/aspell-de/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2004/12/24 03:09:17 wiz Exp $
+@comment $NetBSD: PLIST,v 1.1 2013/04/09 02:33:39 rodent Exp $
 lib/aspell/de-common.rws
 lib/aspell/de.multi
 lib/aspell/de_AT-only.rws
diff --git a/textproc/aspell-german/distinfo b/textproc/aspell-de/distinfo
index b39b1d4483a..7eb6a2fbd8a 100644
--- a/textproc/aspell-german/distinfo
+++ b/textproc/aspell-de/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2005/02/24 14:48:39 agc Exp $
+$NetBSD: distinfo,v 1.1 2013/04/09 02:33:39 rodent Exp $
 
 SHA1 (aspell6-de-20030222-1.tar.bz2) = a06b1153404f6d1f9bd8aa03d596c14093e561c7
 RMD160 (aspell6-de-20030222-1.tar.bz2) = e590afd004f64329688eb7ef57455db1b2515683
diff --git a/textproc/aspell-de/patches/patch-aa b/textproc/aspell-de/patches/patch-aa
new file mode 100644
index 00000000000..c5a50d23c77
--- /dev/null
+++ b/textproc/aspell-de/patches/patch-aa
@@ -0,0 +1,21 @@
+$NetBSD: patch-aa,v 1.1 2013/04/09 02:33:39 rodent Exp $
+
+--- Makefile.pre.orig	Fri Jan  3 18:39:33 2003
++++ Makefile.pre	Wed Jan 15 00:48:39 2003
+@@ -16,12 +16,10 @@
+ all: ${rws_files} ${data_files}
+ 
+ install: all
+-	mkdir -p ${DESTDIR}${dictdir}/
+-	cp ${rws_files} ${multi_files} ${DESTDIR}${dictdir}/
+-	cd ${DESTDIR}${dictdir}/ && chmod 644 ${rws_files} ${multi_files}
+-	mkdir -p ${DESTDIR}${datadir}/
+-	cp ${data_files} ${DESTDIR}${datadir}/
+-	cd ${DESTDIR}${datadir}/ && chmod 644 ${data_files}
++	${BSD_INSTALL_DATA_DIR} ${DESTDIR}${dictdir}/
++	${BSD_INSTALL_DATA} ${rws_files} ${multi_files} ${DESTDIR}${dictdir}/
++	${BSD_INSTALL_DATA_DIR} ${DESTDIR}${datadir}/
++	${BSD_INSTALL_DATA} ${data_files} ${DESTDIR}${datadir}/
+ 
+ clean:
+ 	rm -f ${rws_files}
diff --git a/textproc/aspell-greek/DESCR b/textproc/aspell-el/DESCR
index a253db568b6..a253db568b6 100644
--- a/textproc/aspell-greek/DESCR
+++ b/textproc/aspell-el/DESCR
diff --git a/textproc/aspell-greek/Makefile b/textproc/aspell-el/Makefile
index 6beeb042e84..15076383634 100644
--- a/textproc/aspell-greek/Makefile
+++ b/textproc/aspell-el/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.16 2012/10/25 06:55:41 asau Exp $
+# $NetBSD: Makefile,v 1.1 2013/04/09 02:33:40 rodent Exp $
 #
 
 DISTNAME=	aspell-el-0.50-3
-PKGNAME=	${DISTNAME:C/el-(.*)-(.*)$/greek-\1.\2/}
-PKGREVISION=	5
+PKGNAME=	${DISTNAME:S/-3/.3/1}
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_GNU:=aspell/dict/el/}
 EXTRACT_SUFX=	.tar.bz2
@@ -12,7 +11,7 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://aspell.net/
 COMMENT=	Greek language support for aspell
 
-HAS_CONFIGURE=	YES
+HAS_CONFIGURE=	yes
 
 .include "../../textproc/aspell/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/aspell-greek/PLIST b/textproc/aspell-el/PLIST
index f82281658b5..7a384d078f6 100644
--- a/textproc/aspell-greek/PLIST
+++ b/textproc/aspell-el/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2003/01/17 03:52:04 salo Exp $
+@comment $NetBSD: PLIST,v 1.1 2013/04/09 02:33:40 rodent Exp $
 lib/aspell/el.multi
 lib/aspell/el.rws
 lib/aspell/greek.alias
diff --git a/textproc/aspell-greek/distinfo b/textproc/aspell-el/distinfo
index 4a7d954295d..ca3098ca489 100644
--- a/textproc/aspell-greek/distinfo
+++ b/textproc/aspell-el/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2005/02/24 14:48:39 agc Exp $
+$NetBSD: distinfo,v 1.1 2013/04/09 02:33:40 rodent Exp $
 
 SHA1 (aspell-el-0.50-3.tar.bz2) = f0242d02e45956f8fe5d8321d737ee4dc5d18931
 RMD160 (aspell-el-0.50-3.tar.bz2) = df6b86825ad3b3b448287c07cf4eaee986aa1320
diff --git a/textproc/aspell-el/patches/patch-aa b/textproc/aspell-el/patches/patch-aa
new file mode 100644
index 00000000000..751d605d3b2
--- /dev/null
+++ b/textproc/aspell-el/patches/patch-aa
@@ -0,0 +1,21 @@
+$NetBSD: patch-aa,v 1.1 2013/04/09 02:33:40 rodent Exp $
+
+--- Makefile.pre.orig	Fri Jan  3 18:39:33 2003
++++ Makefile.pre	Wed Jan 15 00:48:39 2003
+@@ -16,12 +16,10 @@
+ all: ${rws_files} ${data_files}
+ 
+ install: all
+-	mkdir -p ${DESTDIR}${dictdir}/
+-	cp ${rws_files} ${multi_files} ${DESTDIR}${dictdir}/
+-	cd ${DESTDIR}${dictdir}/ && chmod 644 ${rws_files} ${multi_files}
+-	mkdir -p ${DESTDIR}${datadir}/
+-	cp ${data_files} ${DESTDIR}${datadir}/
+-	cd ${DESTDIR}${datadir}/ && chmod 644 ${data_files}
++	${BSD_INSTALL_DATA_DIR} ${DESTDIR}${dictdir}/
++	${BSD_INSTALL_DATA} ${rws_files} ${multi_files} ${DESTDIR}${dictdir}/
++	${BSD_INSTALL_DATA_DIR} ${DESTDIR}${datadir}/
++	${BSD_INSTALL_DATA} ${data_files} ${DESTDIR}${datadir}/
+ 
+ clean:
+ 	rm -f ${rws_files}
diff --git a/textproc/aspell-english/DESCR b/textproc/aspell-en/DESCR
index b763df7da1d..b763df7da1d 100644
--- a/textproc/aspell-english/DESCR
+++ b/textproc/aspell-en/DESCR
diff --git a/textproc/aspell-english/Makefile b/textproc/aspell-en/Makefile
index e6a7a0d36ef..ed0e612d6bf 100644
--- a/textproc/aspell-english/Makefile
+++ b/textproc/aspell-en/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.18 2012/10/25 06:55:40 asau Exp $
+# $NetBSD: Makefile,v 1.1 2013/04/09 02:33:40 rodent Exp $
 #
 
 DISTNAME=	aspell6-en-6.0-0
-PKGNAME=	aspell-english-6.0.0
-PKGREVISION=	2
+PKGNAME=	${DISTNAME:S/6-/-/1:S/-0/.0/1}
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_GNU:=aspell/dict/en/}
 EXTRACT_SUFX=	.tar.bz2
@@ -12,7 +11,7 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://aspell.net/
 COMMENT=	English language support for aspell
 
-HAS_CONFIGURE=	YES
+HAS_CONFIGURE=	yes
 CONFIGURE_ENV+=	ASPELL=${BUILDLINK_PREFIX.aspell}/bin/aspell
 CONFIGURE_ENV+=	PREZIP=${BUILDLINK_PREFIX.aspell}/bin/prezip-bin
 
diff --git a/textproc/aspell-english/PLIST b/textproc/aspell-en/PLIST
index 2348c861146..3de3798a7a8 100644
--- a/textproc/aspell-english/PLIST
+++ b/textproc/aspell-en/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2004/12/24 03:06:43 wiz Exp $
+@comment $NetBSD: PLIST,v 1.1 2013/04/09 02:33:40 rodent Exp $
 lib/aspell/american-w_accents.alias
 lib/aspell/american-wo_accents.alias
 lib/aspell/american.alias
diff --git a/textproc/aspell-english/distinfo b/textproc/aspell-en/distinfo
index 653f07c38df..c3f693c5733 100644
--- a/textproc/aspell-english/distinfo
+++ b/textproc/aspell-en/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2005/08/23 21:37:24 reed Exp $
+$NetBSD: distinfo,v 1.1 2013/04/09 02:33:40 rodent Exp $
 
 SHA1 (aspell6-en-6.0-0.tar.bz2) = 9723820a22340bcc3a12aae45df26d9ff0608829
 RMD160 (aspell6-en-6.0-0.tar.bz2) = 54eafdae618b241ca8fcc76898ddfcb3d04ee5b2
diff --git a/textproc/aspell-en/patches/patch-aa b/textproc/aspell-en/patches/patch-aa
new file mode 100644
index 00000000000..751d605d3b2
--- /dev/null
+++ b/textproc/aspell-en/patches/patch-aa
@@ -0,0 +1,21 @@
+$NetBSD: patch-aa,v 1.1 2013/04/09 02:33:40 rodent Exp $
+
+--- Makefile.pre.orig	Fri Jan  3 18:39:33 2003
++++ Makefile.pre	Wed Jan 15 00:48:39 2003
+@@ -16,12 +16,10 @@
+ all: ${rws_files} ${data_files}
+ 
+ install: all
+-	mkdir -p ${DESTDIR}${dictdir}/
+-	cp ${rws_files} ${multi_files} ${DESTDIR}${dictdir}/
+-	cd ${DESTDIR}${dictdir}/ && chmod 644 ${rws_files} ${multi_files}
+-	mkdir -p ${DESTDIR}${datadir}/
+-	cp ${data_files} ${DESTDIR}${datadir}/
+-	cd ${DESTDIR}${datadir}/ && chmod 644 ${data_files}
++	${BSD_INSTALL_DATA_DIR} ${DESTDIR}${dictdir}/
++	${BSD_INSTALL_DATA} ${rws_files} ${multi_files} ${DESTDIR}${dictdir}/
++	${BSD_INSTALL_DATA_DIR} ${DESTDIR}${datadir}/
++	${BSD_INSTALL_DATA} ${data_files} ${DESTDIR}${datadir}/
+ 
+ clean:
+ 	rm -f ${rws_files}
diff --git a/textproc/aspell-english/patches/patch-ab b/textproc/aspell-en/patches/patch-ab
index d1b82d60fad..d65a1a535d4 100644
--- a/textproc/aspell-english/patches/patch-ab
+++ b/textproc/aspell-en/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.1 2005/08/23 21:37:24 reed Exp $
+$NetBSD: patch-ab,v 1.1 2013/04/09 02:33:40 rodent Exp $
 
 --- configure.orig	2004-08-10 09:01:33.000000000 +0000
 +++ configure	2005-08-23 21:25:25.184621000 +0000
diff --git a/textproc/aspell-english/patches/patch-aa b/textproc/aspell-english/patches/patch-aa
deleted file mode 100644
index 2ae29ed5c32..00000000000
--- a/textproc/aspell-english/patches/patch-aa
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2003/01/19 06:35:47 salo Exp $
-
---- Makefile.pre.orig	Fri Jan  3 18:39:33 2003
-+++ Makefile.pre	Wed Jan 15 00:48:39 2003
-@@ -16,12 +16,10 @@
- all: ${rws_files} ${data_files}
- 
- install: all
--	mkdir -p ${DESTDIR}${dictdir}/
--	cp ${rws_files} ${multi_files} ${DESTDIR}${dictdir}/
--	cd ${DESTDIR}${dictdir}/ && chmod 644 ${rws_files} ${multi_files}
--	mkdir -p ${DESTDIR}${datadir}/
--	cp ${data_files} ${DESTDIR}${datadir}/
--	cd ${DESTDIR}${datadir}/ && chmod 644 ${data_files}
-+	${BSD_INSTALL_DATA_DIR} ${DESTDIR}${dictdir}/
-+	${BSD_INSTALL_DATA} ${rws_files} ${multi_files} ${DESTDIR}${dictdir}/
-+	${BSD_INSTALL_DATA_DIR} ${DESTDIR}${datadir}/
-+	${BSD_INSTALL_DATA} ${data_files} ${DESTDIR}${datadir}/
- 
- clean:
- 	rm -f ${rws_files}
diff --git a/textproc/aspell-esperanto/DESCR b/textproc/aspell-eo/DESCR
index 60972d36387..60972d36387 100644
--- a/textproc/aspell-esperanto/DESCR
+++ b/textproc/aspell-eo/DESCR
diff --git a/textproc/aspell-esperanto/Makefile b/textproc/aspell-eo/Makefile
index d5c8e20168c..03e9f13c2b7 100644
--- a/textproc/aspell-esperanto/Makefile
+++ b/textproc/aspell-eo/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.16 2012/10/25 06:55:40 asau Exp $
+# $NetBSD: Makefile,v 1.1 2013/04/09 02:33:41 rodent Exp $
 #
 
 DISTNAME=	aspell-eo-0.50-2
-PKGNAME=	${DISTNAME:C/eo-(.*)-(.*)$/esperanto-\1.\2/}
-PKGREVISION=	5
+PKGNAME=	${DISTNAME:S/-2/.2/1}
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_GNU:=aspell/dict/eo/}
 EXTRACT_SUFX=	.tar.bz2
@@ -12,7 +11,7 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://aspell.net/
 COMMENT=	Esperanto language support for aspell
 
-HAS_CONFIGURE=	YES
+HAS_CONFIGURE=	yes
 
 .include "../../textproc/aspell/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/aspell-esperanto/PLIST b/textproc/aspell-eo/PLIST
index dfe31b74e88..5ef777626bf 100644
--- a/textproc/aspell-esperanto/PLIST
+++ b/textproc/aspell-eo/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2003/01/17 06:45:53 salo Exp $
+@comment $NetBSD: PLIST,v 1.1 2013/04/09 02:33:41 rodent Exp $
 lib/aspell/eo.multi
 lib/aspell/eo.rws
 lib/aspell/esperanto.alias
diff --git a/textproc/aspell-esperanto/distinfo b/textproc/aspell-eo/distinfo
index 520c2a4313a..ee86ef4fd86 100644
--- a/textproc/aspell-esperanto/distinfo
+++ b/textproc/aspell-eo/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2005/02/24 14:48:39 agc Exp $
+$NetBSD: distinfo,v 1.1 2013/04/09 02:33:41 rodent Exp $
 
 SHA1 (aspell-eo-0.50-2.tar.bz2) = 51d73239d0c2253b962e7caa1563ee7abcbc443d
 RMD160 (aspell-eo-0.50-2.tar.bz2) = 9f392cb057a7774b4605a0498ebd6a34208b437c
diff --git a/textproc/aspell-eo/patches/patch-aa b/textproc/aspell-eo/patches/patch-aa
new file mode 100644
index 00000000000..816e8721bf8
--- /dev/null
+++ b/textproc/aspell-eo/patches/patch-aa
@@ -0,0 +1,21 @@
+$NetBSD: patch-aa,v 1.1 2013/04/09 02:33:41 rodent Exp $
+
+--- Makefile.pre.orig	Fri Jan  3 18:39:33 2003
++++ Makefile.pre	Wed Jan 15 00:48:39 2003
+@@ -16,12 +16,10 @@
+ all: ${rws_files} ${data_files}
+ 
+ install: all
+-	mkdir -p ${DESTDIR}${dictdir}/
+-	cp ${rws_files} ${multi_files} ${DESTDIR}${dictdir}/
+-	cd ${DESTDIR}${dictdir}/ && chmod 644 ${rws_files} ${multi_files}
+-	mkdir -p ${DESTDIR}${datadir}/
+-	cp ${data_files} ${DESTDIR}${datadir}/
+-	cd ${DESTDIR}${datadir}/ && chmod 644 ${data_files}
++	${BSD_INSTALL_DATA_DIR} ${DESTDIR}${dictdir}/
++	${BSD_INSTALL_DATA} ${rws_files} ${multi_files} ${DESTDIR}${dictdir}/
++	${BSD_INSTALL_DATA_DIR} ${DESTDIR}${datadir}/
++	${BSD_INSTALL_DATA} ${data_files} ${DESTDIR}${datadir}/
+ 
+ clean:
+ 	rm -f ${rws_files}
diff --git a/textproc/aspell-spanish/DESCR b/textproc/aspell-es/DESCR
index d055426ae7c..d055426ae7c 100644
--- a/textproc/aspell-spanish/DESCR
+++ b/textproc/aspell-es/DESCR
diff --git a/textproc/aspell-spanish/Makefile b/textproc/aspell-es/Makefile
index e64aa862144..2e5bd99d77b 100644
--- a/textproc/aspell-spanish/Makefile
+++ b/textproc/aspell-es/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.18 2012/10/25 06:55:42 asau Exp $
+# $NetBSD: Makefile,v 1.1 2013/04/09 02:33:41 rodent Exp $
 #
 
 DISTNAME=	aspell6-es-1.11-2
-PKGNAME=	aspell-spanish-1.11.2
+PKGNAME=	${DISTNAME:S/6-/-/1:S/-2/.2/1}
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_GNU:=aspell/dict/es/}
 EXTRACT_SUFX=	.tar.bz2
@@ -11,7 +11,7 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://aspell.net/
 COMMENT=	Spanish language support for aspell
 
-HAS_CONFIGURE=	YES
+HAS_CONFIGURE=	yes
 
 .include "../../textproc/aspell/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/aspell-spanish/PLIST b/textproc/aspell-es/PLIST
index 0ad5d47b677..5ecf85b69e7 100644
--- a/textproc/aspell-spanish/PLIST
+++ b/textproc/aspell-es/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2012/05/21 09:52:11 marino Exp $
+@comment $NetBSD: PLIST,v 1.1 2013/04/09 02:33:41 rodent Exp $
 lib/aspell/castellano.alias
 lib/aspell/es.multi
 lib/aspell/es.rws
diff --git a/textproc/aspell-spanish/distinfo b/textproc/aspell-es/distinfo
index e93af3e7ded..e688d088077 100644
--- a/textproc/aspell-spanish/distinfo
+++ b/textproc/aspell-es/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2012/05/21 09:52:11 marino Exp $
+$NetBSD: distinfo,v 1.1 2013/04/09 02:33:41 rodent Exp $
 
 SHA1 (aspell6-es-1.11-2.tar.bz2) = 18acfa4bc08433e920bb015b158e43643e5125cf
 RMD160 (aspell6-es-1.11-2.tar.bz2) = 84f34f730a7a68f0e9fbe9d318fe0c550c851a47
diff --git a/textproc/aspell-esperanto/patches/patch-aa b/textproc/aspell-esperanto/patches/patch-aa
deleted file mode 100644
index 2ae29ed5c32..00000000000
--- a/textproc/aspell-esperanto/patches/patch-aa
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2003/01/19 06:35:47 salo Exp $
-
---- Makefile.pre.orig	Fri Jan  3 18:39:33 2003
-+++ Makefile.pre	Wed Jan 15 00:48:39 2003
-@@ -16,12 +16,10 @@
- all: ${rws_files} ${data_files}
- 
- install: all
--	mkdir -p ${DESTDIR}${dictdir}/
--	cp ${rws_files} ${multi_files} ${DESTDIR}${dictdir}/
--	cd ${DESTDIR}${dictdir}/ && chmod 644 ${rws_files} ${multi_files}
--	mkdir -p ${DESTDIR}${datadir}/
--	cp ${data_files} ${DESTDIR}${datadir}/
--	cd ${DESTDIR}${datadir}/ && chmod 644 ${data_files}
-+	${BSD_INSTALL_DATA_DIR} ${DESTDIR}${dictdir}/
-+	${BSD_INSTALL_DATA} ${rws_files} ${multi_files} ${DESTDIR}${dictdir}/
-+	${BSD_INSTALL_DATA_DIR} ${DESTDIR}${datadir}/
-+	${BSD_INSTALL_DATA} ${data_files} ${DESTDIR}${datadir}/
- 
- clean:
- 	rm -f ${rws_files}
diff --git a/textproc/aspell-faroese/DESCR b/textproc/aspell-fo/DESCR
index d0da2725e7c..d0da2725e7c 100644
--- a/textproc/aspell-faroese/DESCR
+++ b/textproc/aspell-fo/DESCR
diff --git a/textproc/aspell-faroese/Makefile b/textproc/aspell-fo/Makefile
index a5329adf449..cc9a3599258 100644
--- a/textproc/aspell-faroese/Makefile
+++ b/textproc/aspell-fo/Makefile
@@ -1,8 +1,6 @@
-# $NetBSD: Makefile,v 1.19 2012/10/25 06:55:40 asau Exp $
+# $NetBSD: Makefile,v 1.1 2013/04/09 02:33:42 rodent Exp $
 
 DISTNAME=	aspell-fo-0.2.38
-PKGNAME=	${DISTNAME:C/-fo-/-faroese-/}
-PKGREVISION=	2
 CATEGORIES=	textproc
 MASTER_SITES=	http://fo.speling.org/filer/
 EXTRACT_SUFX=	.tar.bz2
@@ -14,7 +12,7 @@ COMMENT=	Faroese language support for aspell
 USE_TOOLS+=	perl
 REPLACE_PERL=	unsq
 
-INSTALLATION_DIRS=	lib/aspell share/aspell
+INSTALLATION_DIRS+=	lib/aspell share/aspell
 
 .include "../../mk/bsd.prefs.mk"
 .if ${PKG_FORMAT} == "pkg" && ${OPSYS} == "Linux"
diff --git a/textproc/aspell-faroese/PLIST b/textproc/aspell-fo/PLIST
index 975fb0834c4..1d8ed6635a2 100644
--- a/textproc/aspell-faroese/PLIST
+++ b/textproc/aspell-fo/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2006/01/29 01:59:02 wiz Exp $
+@comment $NetBSD: PLIST,v 1.1 2013/04/09 02:33:42 rodent Exp $
 lib/aspell/faroese
 lib/aspell/fo_FO
 lib/aspell/føroyskt
diff --git a/textproc/aspell-faroese/distinfo b/textproc/aspell-fo/distinfo
index 584d060b69a..4bcfe1289a0 100644
--- a/textproc/aspell-faroese/distinfo
+++ b/textproc/aspell-fo/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2009/12/02 17:56:26 snj Exp $
+$NetBSD: distinfo,v 1.1 2013/04/09 02:33:42 rodent Exp $
 
 SHA1 (aspell-fo-0.2.38.tar.bz2) = 3191d86991d1281e322d2576325dd5c6f97408ea
 RMD160 (aspell-fo-0.2.38.tar.bz2) = f9816f44f645c9902dfe2a0761284e40fabcddfe
diff --git a/textproc/aspell-faroese/patches/patch-aa b/textproc/aspell-fo/patches/patch-aa
index 60fdfeca80f..2b1ef74d8fa 100644
--- a/textproc/aspell-faroese/patches/patch-aa
+++ b/textproc/aspell-fo/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.5 2009/12/02 17:56:26 snj Exp $
+$NetBSD: patch-aa,v 1.1 2013/04/09 02:33:42 rodent Exp $
 
 --- Makefile.orig	2009-11-04 12:38:50.000000000 -0800
 +++ Makefile	2009-12-02 09:53:27.000000000 -0800
diff --git a/textproc/aspell-francais/DESCR b/textproc/aspell-fr/DESCR
index 0709e2b80a4..0709e2b80a4 100644
--- a/textproc/aspell-francais/DESCR
+++ b/textproc/aspell-fr/DESCR
diff --git a/textproc/aspell-francais/Makefile b/textproc/aspell-fr/Makefile
index 6213d832bd3..f16bc43dec7 100644
--- a/textproc/aspell-francais/Makefile
+++ b/textproc/aspell-fr/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.16 2012/10/25 06:55:40 asau Exp $
+# $NetBSD: Makefile,v 1.1 2013/04/09 02:33:42 rodent Exp $
 #
 
 DISTNAME=	aspell-fr-0.50-3
-PKGNAME=	${DISTNAME:C/fr-(.*)-(.*)$/francais-\1.\2/}
-PKGREVISION=	5
+PKGNAME=	${DISTNAME:S/-3/.3/1}
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_GNU:=aspell/dict/fr/}
 EXTRACT_SUFX=	.tar.bz2
@@ -12,7 +11,7 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://aspell.net/
 COMMENT=	French language support for aspell
 
-HAS_CONFIGURE=	YES
+HAS_CONFIGURE=	yes
 
 .include "../../textproc/aspell/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/aspell-francais/PLIST b/textproc/aspell-fr/PLIST
index cd331bd577d..15a349a5ff7 100644
--- a/textproc/aspell-francais/PLIST
+++ b/textproc/aspell-fr/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2003/01/17 03:51:36 salo Exp $
+@comment $NetBSD: PLIST,v 1.1 2013/04/09 02:33:42 rodent Exp $
 lib/aspell/fr-40-only.rws
 lib/aspell/fr-40.multi
 lib/aspell/fr-60-only.rws
diff --git a/textproc/aspell-francais/distinfo b/textproc/aspell-fr/distinfo
index 9f2d986bb44..3ae17fa682c 100644
--- a/textproc/aspell-francais/distinfo
+++ b/textproc/aspell-fr/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2005/02/24 14:48:39 agc Exp $
+$NetBSD: distinfo,v 1.1 2013/04/09 02:33:42 rodent Exp $
 
 SHA1 (aspell-fr-0.50-3.tar.bz2) = 4712f81069eb20763aaf855f73b2819f4805f132
 RMD160 (aspell-fr-0.50-3.tar.bz2) = 4072f990bc56871e6aaa842f7636969a4cd60960
diff --git a/textproc/aspell-fr/patches/patch-aa b/textproc/aspell-fr/patches/patch-aa
new file mode 100644
index 00000000000..ff8ee475e85
--- /dev/null
+++ b/textproc/aspell-fr/patches/patch-aa
@@ -0,0 +1,21 @@
+$NetBSD: patch-aa,v 1.1 2013/04/09 02:33:42 rodent Exp $
+
+--- Makefile.pre.orig	Fri Jan  3 18:39:33 2003
++++ Makefile.pre	Wed Jan 15 00:48:39 2003
+@@ -16,12 +16,10 @@
+ all: ${rws_files} ${data_files}
+ 
+ install: all
+-	mkdir -p ${DESTDIR}${dictdir}/
+-	cp ${rws_files} ${multi_files} ${DESTDIR}${dictdir}/
+-	cd ${DESTDIR}${dictdir}/ && chmod 644 ${rws_files} ${multi_files}
+-	mkdir -p ${DESTDIR}${datadir}/
+-	cp ${data_files} ${DESTDIR}${datadir}/
+-	cd ${DESTDIR}${datadir}/ && chmod 644 ${data_files}
++	${BSD_INSTALL_DATA_DIR} ${DESTDIR}${dictdir}/
++	${BSD_INSTALL_DATA} ${rws_files} ${multi_files} ${DESTDIR}${dictdir}/
++	${BSD_INSTALL_DATA_DIR} ${DESTDIR}${datadir}/
++	${BSD_INSTALL_DATA} ${data_files} ${DESTDIR}${datadir}/
+ 
+ clean:
+ 	rm -f ${rws_files}
diff --git a/textproc/aspell-francais/patches/patch-aa b/textproc/aspell-francais/patches/patch-aa
deleted file mode 100644
index f2f944f7bb3..00000000000
--- a/textproc/aspell-francais/patches/patch-aa
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2003/01/19 06:35:48 salo Exp $
-
---- Makefile.pre.orig	Fri Jan  3 18:39:33 2003
-+++ Makefile.pre	Wed Jan 15 00:48:39 2003
-@@ -16,12 +16,10 @@
- all: ${rws_files} ${data_files}
- 
- install: all
--	mkdir -p ${DESTDIR}${dictdir}/
--	cp ${rws_files} ${multi_files} ${DESTDIR}${dictdir}/
--	cd ${DESTDIR}${dictdir}/ && chmod 644 ${rws_files} ${multi_files}
--	mkdir -p ${DESTDIR}${datadir}/
--	cp ${data_files} ${DESTDIR}${datadir}/
--	cd ${DESTDIR}${datadir}/ && chmod 644 ${data_files}
-+	${BSD_INSTALL_DATA_DIR} ${DESTDIR}${dictdir}/
-+	${BSD_INSTALL_DATA} ${rws_files} ${multi_files} ${DESTDIR}${dictdir}/
-+	${BSD_INSTALL_DATA_DIR} ${DESTDIR}${datadir}/
-+	${BSD_INSTALL_DATA} ${data_files} ${DESTDIR}${datadir}/
- 
- clean:
- 	rm -f ${rws_files}
diff --git a/textproc/aspell-gaeilge/DESCR b/textproc/aspell-ga/DESCR
index c5d0f4ea972..c5d0f4ea972 100644
--- a/textproc/aspell-gaeilge/DESCR
+++ b/textproc/aspell-ga/DESCR
diff --git a/textproc/aspell-gaeilge/Makefile b/textproc/aspell-ga/Makefile
index 16d6e117096..cc0f967a2d0 100644
--- a/textproc/aspell-gaeilge/Makefile
+++ b/textproc/aspell-ga/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.18 2012/10/25 06:55:40 asau Exp $
+# $NetBSD: Makefile,v 1.1 2013/04/09 02:33:43 rodent Exp $
 
 DISTNAME=	aspell5-ga-3.5-0
-PKGNAME=	aspell-gaeilge-3.5.0
-PKGREVISION=	2
+PKGNAME=	${DISTNAME:S/5-/-/1:S/-0/.0/1}
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_GNU:=aspell/dict/ga/}
 EXTRACT_SUFX=	.tar.bz2
@@ -11,7 +10,7 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://borel.slu.edu/~kps/ispell/
 COMMENT=	Irish language support for aspell
 
-HAS_CONFIGURE=	YES
+HAS_CONFIGURE=	yes
 
 .include "../../textproc/aspell/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/aspell-gaeilge/PLIST b/textproc/aspell-ga/PLIST
index dba64d6fad0..54316ea5d75 100644
--- a/textproc/aspell-gaeilge/PLIST
+++ b/textproc/aspell-ga/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2004/12/24 03:08:39 wiz Exp $
+@comment $NetBSD: PLIST,v 1.1 2013/04/09 02:33:43 rodent Exp $
 lib/aspell/ga.multi
 lib/aspell/ga.rws
 lib/aspell/gaeilge.alias
diff --git a/textproc/aspell-gaeilge/distinfo b/textproc/aspell-ga/distinfo
index c9af08110c0..e787660cdec 100644
--- a/textproc/aspell-gaeilge/distinfo
+++ b/textproc/aspell-ga/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2005/02/24 14:48:39 agc Exp $
+$NetBSD: distinfo,v 1.1 2013/04/09 02:33:43 rodent Exp $
 
 SHA1 (aspell5-ga-3.5-0.tar.bz2) = 88653e391449b647c406b9e133eb313b04c944f9
 RMD160 (aspell5-ga-3.5-0.tar.bz2) = 4d86d6c34ba8228c092d69a68bdcf2e0a16b548f
diff --git a/textproc/aspell-german/patches/patch-aa b/textproc/aspell-german/patches/patch-aa
deleted file mode 100644
index f2f944f7bb3..00000000000
--- a/textproc/aspell-german/patches/patch-aa
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2003/01/19 06:35:48 salo Exp $
-
---- Makefile.pre.orig	Fri Jan  3 18:39:33 2003
-+++ Makefile.pre	Wed Jan 15 00:48:39 2003
-@@ -16,12 +16,10 @@
- all: ${rws_files} ${data_files}
- 
- install: all
--	mkdir -p ${DESTDIR}${dictdir}/
--	cp ${rws_files} ${multi_files} ${DESTDIR}${dictdir}/
--	cd ${DESTDIR}${dictdir}/ && chmod 644 ${rws_files} ${multi_files}
--	mkdir -p ${DESTDIR}${datadir}/
--	cp ${data_files} ${DESTDIR}${datadir}/
--	cd ${DESTDIR}${datadir}/ && chmod 644 ${data_files}
-+	${BSD_INSTALL_DATA_DIR} ${DESTDIR}${dictdir}/
-+	${BSD_INSTALL_DATA} ${rws_files} ${multi_files} ${DESTDIR}${dictdir}/
-+	${BSD_INSTALL_DATA_DIR} ${DESTDIR}${datadir}/
-+	${BSD_INSTALL_DATA} ${data_files} ${DESTDIR}${datadir}/
- 
- clean:
- 	rm -f ${rws_files}
diff --git a/textproc/aspell-greek/patches/patch-aa b/textproc/aspell-greek/patches/patch-aa
deleted file mode 100644
index f55997a2a70..00000000000
--- a/textproc/aspell-greek/patches/patch-aa
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2003/01/19 06:35:49 salo Exp $
-
---- Makefile.pre.orig	Fri Jan  3 18:39:33 2003
-+++ Makefile.pre	Wed Jan 15 00:48:39 2003
-@@ -16,12 +16,10 @@
- all: ${rws_files} ${data_files}
- 
- install: all
--	mkdir -p ${DESTDIR}${dictdir}/
--	cp ${rws_files} ${multi_files} ${DESTDIR}${dictdir}/
--	cd ${DESTDIR}${dictdir}/ && chmod 644 ${rws_files} ${multi_files}
--	mkdir -p ${DESTDIR}${datadir}/
--	cp ${data_files} ${DESTDIR}${datadir}/
--	cd ${DESTDIR}${datadir}/ && chmod 644 ${data_files}
-+	${BSD_INSTALL_DATA_DIR} ${DESTDIR}${dictdir}/
-+	${BSD_INSTALL_DATA} ${rws_files} ${multi_files} ${DESTDIR}${dictdir}/
-+	${BSD_INSTALL_DATA_DIR} ${DESTDIR}${datadir}/
-+	${BSD_INSTALL_DATA} ${data_files} ${DESTDIR}${datadir}/
- 
- clean:
- 	rm -f ${rws_files}
diff --git a/textproc/aspell-italian/DESCR b/textproc/aspell-it/DESCR
index 3b24484dafd..3b24484dafd 100644
--- a/textproc/aspell-italian/DESCR
+++ b/textproc/aspell-it/DESCR
diff --git a/textproc/aspell-italian/Makefile b/textproc/aspell-it/Makefile
index bea36ad1a39..bc6464e1e4f 100644
--- a/textproc/aspell-italian/Makefile
+++ b/textproc/aspell-it/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.16 2012/10/25 06:55:41 asau Exp $
+# $NetBSD: Makefile,v 1.1 2013/04/09 02:33:44 rodent Exp $
 #
 
 DISTNAME=	aspell-it-0.53-0
-PKGNAME=	${DISTNAME:C/it-(.*)-(.*)$/italian-\1.\2/}
-PKGREVISION=	2
+PKGNAME=	${DISTNAME:S/-0$/.0/1}
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_GNU:=aspell/dict/it/}
 EXTRACT_SUFX=	.tar.bz2
@@ -12,7 +11,7 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://aspell.net/
 COMMENT=	Italian language support for aspell
 
-HAS_CONFIGURE=	YES
+HAS_CONFIGURE=	yes
 
 .include "../../textproc/aspell/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/aspell-italian/PLIST b/textproc/aspell-it/PLIST
index b0abfb3adea..7a9ddeefb97 100644
--- a/textproc/aspell-italian/PLIST
+++ b/textproc/aspell-it/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2004/12/24 03:10:45 wiz Exp $
+@comment $NetBSD: PLIST,v 1.1 2013/04/09 02:33:44 rodent Exp $
 lib/aspell/it.multi
 lib/aspell/it.rws
 lib/aspell/italian.alias
diff --git a/textproc/aspell-italian/distinfo b/textproc/aspell-it/distinfo
index 9631d9d1f58..0f9de6920e0 100644
--- a/textproc/aspell-italian/distinfo
+++ b/textproc/aspell-it/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2005/02/24 14:48:40 agc Exp $
+$NetBSD: distinfo,v 1.1 2013/04/09 02:33:44 rodent Exp $
 
 SHA1 (aspell-it-0.53-0.tar.bz2) = 70388d5ee01e27215602bde9e74e2c76bead97b4
 RMD160 (aspell-it-0.53-0.tar.bz2) = 33010131e045b52c9e4fea4d91e200e6f4427b21
diff --git a/textproc/aspell-it/patches/patch-aa b/textproc/aspell-it/patches/patch-aa
new file mode 100644
index 00000000000..271fa31eb5d
--- /dev/null
+++ b/textproc/aspell-it/patches/patch-aa
@@ -0,0 +1,21 @@
+$NetBSD: patch-aa,v 1.1 2013/04/09 02:33:44 rodent Exp $
+
+--- Makefile.pre.orig	Fri Jan  3 18:39:33 2003
++++ Makefile.pre	Wed Jan 15 00:48:39 2003
+@@ -16,12 +16,10 @@
+ all: ${rws_files} ${data_files}
+ 
+ install: all
+-	mkdir -p ${DESTDIR}${dictdir}/
+-	cp ${rws_files} ${multi_files} ${DESTDIR}${dictdir}/
+-	cd ${DESTDIR}${dictdir}/ && chmod 644 ${rws_files} ${multi_files}
+-	mkdir -p ${DESTDIR}${datadir}/
+-	cp ${data_files} ${DESTDIR}${datadir}/
+-	cd ${DESTDIR}${datadir}/ && chmod 644 ${data_files}
++	${BSD_INSTALL_DATA_DIR} ${DESTDIR}${dictdir}/
++	${BSD_INSTALL_DATA} ${rws_files} ${multi_files} ${DESTDIR}${dictdir}/
++	${BSD_INSTALL_DATA_DIR} ${DESTDIR}${datadir}/
++	${BSD_INSTALL_DATA} ${data_files} ${DESTDIR}${datadir}/
+ 
+ clean:
+ 	rm -f ${rws_files}
diff --git a/textproc/aspell-italian/patches/patch-aa b/textproc/aspell-italian/patches/patch-aa
deleted file mode 100644
index f55997a2a70..00000000000
--- a/textproc/aspell-italian/patches/patch-aa
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2003/01/19 06:35:49 salo Exp $
-
---- Makefile.pre.orig	Fri Jan  3 18:39:33 2003
-+++ Makefile.pre	Wed Jan 15 00:48:39 2003
-@@ -16,12 +16,10 @@
- all: ${rws_files} ${data_files}
- 
- install: all
--	mkdir -p ${DESTDIR}${dictdir}/
--	cp ${rws_files} ${multi_files} ${DESTDIR}${dictdir}/
--	cd ${DESTDIR}${dictdir}/ && chmod 644 ${rws_files} ${multi_files}
--	mkdir -p ${DESTDIR}${datadir}/
--	cp ${data_files} ${DESTDIR}${datadir}/
--	cd ${DESTDIR}${datadir}/ && chmod 644 ${data_files}
-+	${BSD_INSTALL_DATA_DIR} ${DESTDIR}${dictdir}/
-+	${BSD_INSTALL_DATA} ${rws_files} ${multi_files} ${DESTDIR}${dictdir}/
-+	${BSD_INSTALL_DATA_DIR} ${DESTDIR}${datadir}/
-+	${BSD_INSTALL_DATA} ${data_files} ${DESTDIR}${datadir}/
- 
- clean:
- 	rm -f ${rws_files}
diff --git a/textproc/aspell-norwegian/DESCR b/textproc/aspell-nb/DESCR
index c5ee1648487..c5ee1648487 100644
--- a/textproc/aspell-norwegian/DESCR
+++ b/textproc/aspell-nb/DESCR
diff --git a/textproc/aspell-norwegian/Makefile b/textproc/aspell-nb/Makefile
index 622541457bc..06409dc0d2c 100644
--- a/textproc/aspell-norwegian/Makefile
+++ b/textproc/aspell-nb/Makefile
@@ -1,18 +1,17 @@
-# $NetBSD: Makefile,v 1.16 2012/10/25 06:55:41 asau Exp $
+# $NetBSD: Makefile,v 1.1 2013/04/09 02:33:45 rodent Exp $
 #
 
 DISTNAME=	aspell-nb-0.50.1-0
-PKGNAME=	${DISTNAME:C/nb-(.*)-(.*)$/norwegian-\1.\2/}
-PKGREVISION=	2
+PKGNAME=	${DISTNAME:S/-0$/.0/1}
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_GNU:=aspell/dict/nb/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://aspell.net/
-COMMENT=	Norwegian language support for aspell
+COMMENT=	Norwegian (Bokmal) language support for aspell
 
-HAS_CONFIGURE=	YES
+HAS_CONFIGURE=	yes
 
 .include "../../mk/bsd.prefs.mk"
 .if ${PKG_FORMAT} == "pkg" && ${OPSYS} == "Linux"
diff --git a/textproc/aspell-norwegian/PLIST b/textproc/aspell-nb/PLIST
index 1624861c0a4..052684eea6b 100644
--- a/textproc/aspell-norwegian/PLIST
+++ b/textproc/aspell-nb/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2004/12/24 03:11:36 wiz Exp $
+@comment $NetBSD: PLIST,v 1.1 2013/04/09 02:33:45 rodent Exp $
 lib/aspell/bokmal.alias
 lib/aspell/bokmål.alias
 lib/aspell/nb.multi
diff --git a/textproc/aspell-norwegian/distinfo b/textproc/aspell-nb/distinfo
index 26008ef9940..047ab497b2a 100644
--- a/textproc/aspell-norwegian/distinfo
+++ b/textproc/aspell-nb/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2005/02/24 14:48:40 agc Exp $
+$NetBSD: distinfo,v 1.1 2013/04/09 02:33:45 rodent Exp $
 
 SHA1 (aspell-nb-0.50.1-0.tar.bz2) = 40e2549973c192b82f782b9e0b1159e6b51464b3
 RMD160 (aspell-nb-0.50.1-0.tar.bz2) = 5f2fd214608c9a80d318690912efd3aae02d5cd3
diff --git a/textproc/aspell-nb/patches/patch-aa b/textproc/aspell-nb/patches/patch-aa
new file mode 100644
index 00000000000..9bb9632bc73
--- /dev/null
+++ b/textproc/aspell-nb/patches/patch-aa
@@ -0,0 +1,21 @@
+$NetBSD: patch-aa,v 1.1 2013/04/09 02:33:45 rodent Exp $
+
+--- Makefile.pre.orig	Fri Jan  3 18:39:33 2003
++++ Makefile.pre	Wed Jan 15 00:48:39 2003
+@@ -16,12 +16,10 @@
+ all: ${rws_files} ${data_files}
+ 
+ install: all
+-	mkdir -p ${DESTDIR}${dictdir}/
+-	cp ${rws_files} ${multi_files} ${DESTDIR}${dictdir}/
+-	cd ${DESTDIR}${dictdir}/ && chmod 644 ${rws_files} ${multi_files}
+-	mkdir -p ${DESTDIR}${datadir}/
+-	cp ${data_files} ${DESTDIR}${datadir}/
+-	cd ${DESTDIR}${datadir}/ && chmod 644 ${data_files}
++	${BSD_INSTALL_DATA_DIR} ${DESTDIR}${dictdir}/
++	${BSD_INSTALL_DATA} ${rws_files} ${multi_files} ${DESTDIR}${dictdir}/
++	${BSD_INSTALL_DATA_DIR} ${DESTDIR}${datadir}/
++	${BSD_INSTALL_DATA} ${data_files} ${DESTDIR}${datadir}/
+ 
+ clean:
+ 	rm -f ${rws_files}
diff --git a/textproc/aspell-dutch/DESCR b/textproc/aspell-nl/DESCR
index ffd8de1d80c..ffd8de1d80c 100644
--- a/textproc/aspell-dutch/DESCR
+++ b/textproc/aspell-nl/DESCR
diff --git a/textproc/aspell-dutch/Makefile b/textproc/aspell-nl/Makefile
index 09a69f55a9e..406bd8d3491 100644
--- a/textproc/aspell-dutch/Makefile
+++ b/textproc/aspell-nl/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.16 2012/10/25 06:55:39 asau Exp $
+# $NetBSD: Makefile,v 1.1 2013/04/09 02:33:45 rodent Exp $
 #
 
 DISTNAME=	aspell-nl-0.50-2
-PKGNAME=	${DISTNAME:C/nl-(.*)-(.*)$/dutch-\1.\2/}
-PKGREVISION=	5
+PKGNAME=	${DISTNAME:S/-2/.2/1}
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_GNU:=aspell/dict/nl/}
 EXTRACT_SUFX=	.tar.bz2
@@ -12,7 +11,7 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://aspell.net/
 COMMENT=	Dutch language support for aspell
 
-HAS_CONFIGURE=	YES
+HAS_CONFIGURE=	yes
 
 .include "../../textproc/aspell/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/aspell-dutch/PLIST b/textproc/aspell-nl/PLIST
index 0fc0476cec1..44a5d6dded6 100644
--- a/textproc/aspell-dutch/PLIST
+++ b/textproc/aspell-nl/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2003/01/17 03:50:54 salo Exp $
+@comment $NetBSD: PLIST,v 1.1 2013/04/09 02:33:45 rodent Exp $
 lib/aspell/dutch.alias
 lib/aspell/nl.multi
 lib/aspell/nl.rws
diff --git a/textproc/aspell-dutch/distinfo b/textproc/aspell-nl/distinfo
index 606d1841e23..ce776d96039 100644
--- a/textproc/aspell-dutch/distinfo
+++ b/textproc/aspell-nl/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2005/02/24 14:48:39 agc Exp $
+$NetBSD: distinfo,v 1.1 2013/04/09 02:33:45 rodent Exp $
 
 SHA1 (aspell-nl-0.50-2.tar.bz2) = 651ac98c63ce342b19dd9c1a74a961500234bc0a
 RMD160 (aspell-nl-0.50-2.tar.bz2) = b01cc46fe6afff822c4b393ac2f0cb9d97d8eab3
diff --git a/textproc/aspell-nl/patches/patch-aa b/textproc/aspell-nl/patches/patch-aa
new file mode 100644
index 00000000000..2cad4a6c43a
--- /dev/null
+++ b/textproc/aspell-nl/patches/patch-aa
@@ -0,0 +1,21 @@
+$NetBSD: patch-aa,v 1.1 2013/04/09 02:33:46 rodent Exp $
+
+--- Makefile.pre.orig	Fri Jan  3 18:39:33 2003
++++ Makefile.pre	Wed Jan 15 00:48:39 2003
+@@ -16,12 +16,10 @@
+ all: ${rws_files} ${data_files}
+ 
+ install: all
+-	mkdir -p ${DESTDIR}${dictdir}/
+-	cp ${rws_files} ${multi_files} ${DESTDIR}${dictdir}/
+-	cd ${DESTDIR}${dictdir}/ && chmod 644 ${rws_files} ${multi_files}
+-	mkdir -p ${DESTDIR}${datadir}/
+-	cp ${data_files} ${DESTDIR}${datadir}/
+-	cd ${DESTDIR}${datadir}/ && chmod 644 ${data_files}
++	${BSD_INSTALL_DATA_DIR} ${DESTDIR}${dictdir}/
++	${BSD_INSTALL_DATA} ${rws_files} ${multi_files} ${DESTDIR}${dictdir}/
++	${BSD_INSTALL_DATA_DIR} ${DESTDIR}${datadir}/
++	${BSD_INSTALL_DATA} ${data_files} ${DESTDIR}${datadir}/
+ 
+ clean:
+ 	rm -f ${rws_files}
diff --git a/textproc/aspell-norwegian/patches/patch-aa b/textproc/aspell-norwegian/patches/patch-aa
deleted file mode 100644
index b80b98c37f3..00000000000
--- a/textproc/aspell-norwegian/patches/patch-aa
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2003/01/19 06:35:50 salo Exp $
-
---- Makefile.pre.orig	Fri Jan  3 18:39:33 2003
-+++ Makefile.pre	Wed Jan 15 00:48:39 2003
-@@ -16,12 +16,10 @@
- all: ${rws_files} ${data_files}
- 
- install: all
--	mkdir -p ${DESTDIR}${dictdir}/
--	cp ${rws_files} ${multi_files} ${DESTDIR}${dictdir}/
--	cd ${DESTDIR}${dictdir}/ && chmod 644 ${rws_files} ${multi_files}
--	mkdir -p ${DESTDIR}${datadir}/
--	cp ${data_files} ${DESTDIR}${datadir}/
--	cd ${DESTDIR}${datadir}/ && chmod 644 ${data_files}
-+	${BSD_INSTALL_DATA_DIR} ${DESTDIR}${dictdir}/
-+	${BSD_INSTALL_DATA} ${rws_files} ${multi_files} ${DESTDIR}${dictdir}/
-+	${BSD_INSTALL_DATA_DIR} ${DESTDIR}${datadir}/
-+	${BSD_INSTALL_DATA} ${data_files} ${DESTDIR}${datadir}/
- 
- clean:
- 	rm -f ${rws_files}
diff --git a/textproc/aspell-polish/DESCR b/textproc/aspell-pl/DESCR
index cf1607822e3..cf1607822e3 100644
--- a/textproc/aspell-polish/DESCR
+++ b/textproc/aspell-pl/DESCR
diff --git a/textproc/aspell-polish/Makefile b/textproc/aspell-pl/Makefile
index 14ca719fcc8..e3f019539a7 100644
--- a/textproc/aspell-polish/Makefile
+++ b/textproc/aspell-pl/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.15 2012/10/25 06:55:41 asau Exp $
+# $NetBSD: Makefile,v 1.1 2013/04/09 02:33:46 rodent Exp $
 #
 
 DISTNAME=	aspell-pl-0.51-0
-PKGNAME=	${DISTNAME:C/pl-(.*)-(.*)$/polish-\1.\2/}
-PKGREVISION=	2
+PKGNAME=	${DISTNAME:S/-0$/.0/1}
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_GNU:=aspell/dict/pl/}
 EXTRACT_SUFX=	.tar.bz2
@@ -12,7 +11,7 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://aspell.net/
 COMMENT=	Polish language support for aspell
 
-HAS_CONFIGURE=	YES
+HAS_CONFIGURE=	yes
 
 UNLIMIT_RESOURCES+=	datasize
 
diff --git a/textproc/aspell-polish/PLIST b/textproc/aspell-pl/PLIST
index 5ac612abbc6..17f82cfa796 100644
--- a/textproc/aspell-polish/PLIST
+++ b/textproc/aspell-pl/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2003/01/17 03:53:29 salo Exp $
+@comment $NetBSD: PLIST,v 1.1 2013/04/09 02:33:46 rodent Exp $
 lib/aspell/pl.multi
 lib/aspell/pl.rws
 lib/aspell/polish.alias
diff --git a/textproc/aspell-polish/distinfo b/textproc/aspell-pl/distinfo
index 0e286b50cb3..5ae1bf1d515 100644
--- a/textproc/aspell-polish/distinfo
+++ b/textproc/aspell-pl/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2005/02/24 14:48:40 agc Exp $
+$NetBSD: distinfo,v 1.1 2013/04/09 02:33:46 rodent Exp $
 
 SHA1 (aspell-pl-0.51-0.tar.bz2) = 66342fff4aaeded872e8aad65d707941a2150e88
 RMD160 (aspell-pl-0.51-0.tar.bz2) = 495787dd0daf92981f05428764eb3d601353c67e
diff --git a/textproc/aspell-pl/patches/patch-aa b/textproc/aspell-pl/patches/patch-aa
new file mode 100644
index 00000000000..2cad4a6c43a
--- /dev/null
+++ b/textproc/aspell-pl/patches/patch-aa
@@ -0,0 +1,21 @@
+$NetBSD: patch-aa,v 1.1 2013/04/09 02:33:46 rodent Exp $
+
+--- Makefile.pre.orig	Fri Jan  3 18:39:33 2003
++++ Makefile.pre	Wed Jan 15 00:48:39 2003
+@@ -16,12 +16,10 @@
+ all: ${rws_files} ${data_files}
+ 
+ install: all
+-	mkdir -p ${DESTDIR}${dictdir}/
+-	cp ${rws_files} ${multi_files} ${DESTDIR}${dictdir}/
+-	cd ${DESTDIR}${dictdir}/ && chmod 644 ${rws_files} ${multi_files}
+-	mkdir -p ${DESTDIR}${datadir}/
+-	cp ${data_files} ${DESTDIR}${datadir}/
+-	cd ${DESTDIR}${datadir}/ && chmod 644 ${data_files}
++	${BSD_INSTALL_DATA_DIR} ${DESTDIR}${dictdir}/
++	${BSD_INSTALL_DATA} ${rws_files} ${multi_files} ${DESTDIR}${dictdir}/
++	${BSD_INSTALL_DATA_DIR} ${DESTDIR}${datadir}/
++	${BSD_INSTALL_DATA} ${data_files} ${DESTDIR}${datadir}/
+ 
+ clean:
+ 	rm -f ${rws_files}
diff --git a/textproc/aspell-polish/patches/patch-aa b/textproc/aspell-polish/patches/patch-aa
deleted file mode 100644
index b80b98c37f3..00000000000
--- a/textproc/aspell-polish/patches/patch-aa
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2003/01/19 06:35:50 salo Exp $
-
---- Makefile.pre.orig	Fri Jan  3 18:39:33 2003
-+++ Makefile.pre	Wed Jan 15 00:48:39 2003
-@@ -16,12 +16,10 @@
- all: ${rws_files} ${data_files}
- 
- install: all
--	mkdir -p ${DESTDIR}${dictdir}/
--	cp ${rws_files} ${multi_files} ${DESTDIR}${dictdir}/
--	cd ${DESTDIR}${dictdir}/ && chmod 644 ${rws_files} ${multi_files}
--	mkdir -p ${DESTDIR}${datadir}/
--	cp ${data_files} ${DESTDIR}${datadir}/
--	cd ${DESTDIR}${datadir}/ && chmod 644 ${data_files}
-+	${BSD_INSTALL_DATA_DIR} ${DESTDIR}${dictdir}/
-+	${BSD_INSTALL_DATA} ${rws_files} ${multi_files} ${DESTDIR}${dictdir}/
-+	${BSD_INSTALL_DATA_DIR} ${DESTDIR}${datadir}/
-+	${BSD_INSTALL_DATA} ${data_files} ${DESTDIR}${datadir}/
- 
- clean:
- 	rm -f ${rws_files}
diff --git a/textproc/aspell-portuguese/DESCR b/textproc/aspell-portuguese/DESCR
deleted file mode 100644
index deaa192ac60..00000000000
--- a/textproc/aspell-portuguese/DESCR
+++ /dev/null
@@ -1,3 +0,0 @@
-Portuguese language support for aspell,
-e.g. `aspell -d portuguese -c $myfile'.
-Other sub-dictionary available in this package: brazilian.
diff --git a/textproc/aspell-portuguese/Makefile b/textproc/aspell-portuguese/Makefile
deleted file mode 100644
index 8b35ced4c79..00000000000
--- a/textproc/aspell-portuguese/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-# $NetBSD: Makefile,v 1.18 2012/10/25 06:55:41 asau Exp $
-#
-
-DISTNAME=	aspell6-pt_PT-20070510-0
-PKGNAME=	aspell-portuguese-20070510.0
-CATEGORIES=	textproc
-MASTER_SITES=	${MASTER_SITE_GNU:=aspell/dict/pt_PT/}
-EXTRACT_SUFX=	.tar.bz2
-
-MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://aspell.net/
-COMMENT=	Portuguese language support for aspell
-
-HAS_CONFIGURE=	YES
-
-.include "../../textproc/aspell/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/textproc/aspell-portuguese/PLIST b/textproc/aspell-portuguese/PLIST
deleted file mode 100644
index 049f9e1a176..00000000000
--- a/textproc/aspell-portuguese/PLIST
+++ /dev/null
@@ -1,6 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2012/05/21 10:09:11 marino Exp $
-lib/aspell/pt_PT.rws
-lib/aspell/pt_PT.multi
-share/aspell/pt_PT.dat
-share/aspell/pt_PT_affix.dat
-share/aspell/pt_PT_repl.dat
diff --git a/textproc/aspell-portuguese/distinfo b/textproc/aspell-portuguese/distinfo
deleted file mode 100644
index 9da401ea9fb..00000000000
--- a/textproc/aspell-portuguese/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.4 2012/05/21 10:09:11 marino Exp $
-
-SHA1 (aspell6-pt_PT-20070510-0.tar.bz2) = e136c2f411b582897437b06b9068c98ee333be41
-RMD160 (aspell6-pt_PT-20070510-0.tar.bz2) = ea4364131c2696054e529143193bc50a561d9d72
-Size (aspell6-pt_PT-20070510-0.tar.bz2) = 97141 bytes
diff --git a/textproc/aspell-romanian/DESCR b/textproc/aspell-ro/DESCR
index c15a2eddaf9..c15a2eddaf9 100644
--- a/textproc/aspell-romanian/DESCR
+++ b/textproc/aspell-ro/DESCR
diff --git a/textproc/aspell-romanian/Makefile b/textproc/aspell-ro/Makefile
index 85ad3805992..957fe8c99a3 100644
--- a/textproc/aspell-romanian/Makefile
+++ b/textproc/aspell-ro/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.18 2012/10/25 06:55:41 asau Exp $
+# $NetBSD: Makefile,v 1.1 2013/04/09 02:33:47 rodent Exp $
 #
 
 DISTNAME=	aspell5-ro-3.3-2
-PKGNAME=	aspell-romanian-3.3.2
+PKGNAME=	${DISTNAME:S/5-/-/1:S/-2/.2/1}
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_GNU:=aspell/dict/ro/}
 EXTRACT_SUFX=	.tar.bz2
@@ -11,7 +11,7 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://aspell.net/
 COMMENT=	Romanian language support for aspell
 
-HAS_CONFIGURE=	YES
+HAS_CONFIGURE=	yes
 
 .include "../../textproc/aspell/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/aspell-romanian/PLIST b/textproc/aspell-ro/PLIST
index ac0f1e77675..1505fce73ef 100644
--- a/textproc/aspell-romanian/PLIST
+++ b/textproc/aspell-ro/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2012/05/21 09:52:55 marino Exp $
+@comment $NetBSD: PLIST,v 1.1 2013/04/09 02:33:47 rodent Exp $
 lib/aspell/ro-classic-only.rws
 lib/aspell/ro-classic.multi
 lib/aspell/ro-common.rws
diff --git a/textproc/aspell-romanian/distinfo b/textproc/aspell-ro/distinfo
index 1a4751e88d7..731cfcc666f 100644
--- a/textproc/aspell-romanian/distinfo
+++ b/textproc/aspell-ro/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2012/05/21 09:52:55 marino Exp $
+$NetBSD: distinfo,v 1.1 2013/04/09 02:33:47 rodent Exp $
 
 SHA1 (aspell5-ro-3.3-2.tar.bz2) = 98a64f2dade68bcff050b06567d09d40e727a2a2
 RMD160 (aspell5-ro-3.3-2.tar.bz2) = 7fc1ea1f7a047ac4aca6c1237bc214fbb8ed6c16
diff --git a/textproc/aspell-russian/DESCR b/textproc/aspell-ru/DESCR
index 9939611c097..9939611c097 100644
--- a/textproc/aspell-russian/DESCR
+++ b/textproc/aspell-ru/DESCR
diff --git a/textproc/aspell-russian/Makefile b/textproc/aspell-ru/Makefile
index ed38340e191..d5b356f523f 100644
--- a/textproc/aspell-russian/Makefile
+++ b/textproc/aspell-ru/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.15 2012/10/25 06:55:41 asau Exp $
+# $NetBSD: Makefile,v 1.1 2013/04/09 02:33:47 rodent Exp $
 #
 
 DISTNAME=	aspell6-ru-0.99f7-1
-PKGNAME=	${DISTNAME:C/6-ru-(.*)-(.*)$/-russian-\1.\2/}
-PKGREVISION=	2
+PKGNAME=	${DISTNAME:S/6-/-/1:S/-1/.1/1}
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_GNU:=aspell/dict/ru/}
 EXTRACT_SUFX=	.tar.bz2
@@ -12,7 +11,7 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://aspell.net/
 COMMENT=	Russian language support for aspell
 
-HAS_CONFIGURE=	YES
+HAS_CONFIGURE=	yes
 
 .include "../../textproc/aspell/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/aspell-russian/PLIST b/textproc/aspell-ru/PLIST
index ecb10853e09..2ba7629f1fe 100644
--- a/textproc/aspell-russian/PLIST
+++ b/textproc/aspell-ru/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2004/12/24 03:13:38 wiz Exp $
+@comment $NetBSD: PLIST,v 1.1 2013/04/09 02:33:47 rodent Exp $
 lib/aspell/ru-ye.multi
 lib/aspell/ru-ye.rws
 lib/aspell/ru-yeyo.multi
diff --git a/textproc/aspell-russian/distinfo b/textproc/aspell-ru/distinfo
index 007f30287c7..6ec61f6499b 100644
--- a/textproc/aspell-russian/distinfo
+++ b/textproc/aspell-ru/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2005/02/24 14:48:40 agc Exp $
+$NetBSD: distinfo,v 1.1 2013/04/09 02:33:47 rodent Exp $
 
 SHA1 (aspell6-ru-0.99f7-1.tar.bz2) = e012fa03645f4ff1f5ba9df6b215ea4ffc6fd9cf
 RMD160 (aspell6-ru-0.99f7-1.tar.bz2) = ad9a6d5ce1847486649d23eb8e255e3c8e5765d3
diff --git a/textproc/aspell-ru/patches/patch-aa b/textproc/aspell-ru/patches/patch-aa
new file mode 100644
index 00000000000..15fec9898f1
--- /dev/null
+++ b/textproc/aspell-ru/patches/patch-aa
@@ -0,0 +1,21 @@
+$NetBSD: patch-aa,v 1.1 2013/04/09 02:33:48 rodent Exp $
+
+--- Makefile.pre.orig	Fri Jan  3 18:39:33 2003
++++ Makefile.pre	Wed Jan 15 00:48:39 2003
+@@ -16,12 +16,10 @@
+ all: ${rws_files} ${data_files}
+ 
+ install: all
+-	mkdir -p ${DESTDIR}${dictdir}/
+-	cp ${rws_files} ${multi_files} ${DESTDIR}${dictdir}/
+-	cd ${DESTDIR}${dictdir}/ && chmod 644 ${rws_files} ${multi_files}
+-	mkdir -p ${DESTDIR}${datadir}/
+-	cp ${data_files} ${DESTDIR}${datadir}/
+-	cd ${DESTDIR}${datadir}/ && chmod 644 ${data_files}
++	${BSD_INSTALL_DATA_DIR} ${DESTDIR}${dictdir}/
++	${BSD_INSTALL_DATA} ${rws_files} ${multi_files} ${DESTDIR}${dictdir}/
++	${BSD_INSTALL_DATA_DIR} ${DESTDIR}${datadir}/
++	${BSD_INSTALL_DATA} ${data_files} ${DESTDIR}${datadir}/
+ 
+ clean:
+ 	rm -f ${rws_files}
diff --git a/textproc/aspell-russian/patches/patch-aa b/textproc/aspell-russian/patches/patch-aa
deleted file mode 100644
index b177ef1ec44..00000000000
--- a/textproc/aspell-russian/patches/patch-aa
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2003/01/19 06:35:51 salo Exp $
-
---- Makefile.pre.orig	Fri Jan  3 18:39:33 2003
-+++ Makefile.pre	Wed Jan 15 00:48:39 2003
-@@ -16,12 +16,10 @@
- all: ${rws_files} ${data_files}
- 
- install: all
--	mkdir -p ${DESTDIR}${dictdir}/
--	cp ${rws_files} ${multi_files} ${DESTDIR}${dictdir}/
--	cd ${DESTDIR}${dictdir}/ && chmod 644 ${rws_files} ${multi_files}
--	mkdir -p ${DESTDIR}${datadir}/
--	cp ${data_files} ${DESTDIR}${datadir}/
--	cd ${DESTDIR}${datadir}/ && chmod 644 ${data_files}
-+	${BSD_INSTALL_DATA_DIR} ${DESTDIR}${dictdir}/
-+	${BSD_INSTALL_DATA} ${rws_files} ${multi_files} ${DESTDIR}${dictdir}/
-+	${BSD_INSTALL_DATA_DIR} ${DESTDIR}${datadir}/
-+	${BSD_INSTALL_DATA} ${data_files} ${DESTDIR}${datadir}/
- 
- clean:
- 	rm -f ${rws_files}
diff --git a/textproc/aspell-slovak/DESCR b/textproc/aspell-sk/DESCR
index 58b615fe116..58b615fe116 100644
--- a/textproc/aspell-slovak/DESCR
+++ b/textproc/aspell-sk/DESCR
diff --git a/textproc/aspell-slovak/Makefile b/textproc/aspell-sk/Makefile
index 4e61a9386cc..2c0747d5f1a 100644
--- a/textproc/aspell-slovak/Makefile
+++ b/textproc/aspell-sk/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.18 2012/10/25 06:55:42 asau Exp $
+# $NetBSD: Makefile,v 1.1 2013/04/09 02:33:48 rodent Exp $
 #
 
 DISTNAME=	aspell-sk-0.52-0
-PKGNAME=	${DISTNAME:C/sk-(.*)-(.*)/slovak-\1.\2/}
-PKGREVISION=	4
+PKGNAME=	${DISTNAME:S/-0$/.0/1}
 CATEGORIES=	textproc
 MASTER_SITES=	http://sk-spell.sk.cx/
 EXTRACT_SUFX=	.tar.bz2
@@ -12,7 +11,7 @@ MAINTAINER=	salo@NetBSD.org
 HOMEPAGE=	http://sk-spell.sk.cx/
 COMMENT=	Slovak language support for aspell
 
-HAS_CONFIGURE=	YES
+HAS_CONFIGURE=	yes
 
 .include "../../textproc/aspell/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/aspell-slovak/PLIST b/textproc/aspell-sk/PLIST
index 23b80b378ee..0457fe73d45 100644
--- a/textproc/aspell-slovak/PLIST
+++ b/textproc/aspell-sk/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2004/04/21 08:42:34 salo Exp $
+@comment $NetBSD: PLIST,v 1.1 2013/04/09 02:33:48 rodent Exp $
 lib/aspell/sk-extend.rws
 lib/aspell/sk-extended.multi
 lib/aspell/sk.multi
diff --git a/textproc/aspell-slovak/distinfo b/textproc/aspell-sk/distinfo
index e339befd0be..2e0ebbecef3 100644
--- a/textproc/aspell-slovak/distinfo
+++ b/textproc/aspell-sk/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2005/02/24 14:48:40 agc Exp $
+$NetBSD: distinfo,v 1.1 2013/04/09 02:33:48 rodent Exp $
 
 SHA1 (aspell-sk-0.52-0.tar.bz2) = 2c9ebbc82cb8eee4967fb4961e85800814935a0f
 RMD160 (aspell-sk-0.52-0.tar.bz2) = 665ab6d7e90b2f21b8a0dc52889ccd210f7c607d
diff --git a/textproc/aspell-slovak/patches/patch-aa b/textproc/aspell-sk/patches/patch-aa
index 3d618589a3b..41c0cbeec4d 100644
--- a/textproc/aspell-slovak/patches/patch-aa
+++ b/textproc/aspell-sk/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.5 2004/04/21 08:42:34 salo Exp $
+$NetBSD: patch-aa,v 1.1 2013/04/09 02:33:48 rodent Exp $
 
 --- Makefile.pre.in	2004-03-20 19:36:01.000000000 +0100
 +++ Makefile.pre	2004-04-18 01:04:21.000000000 +0200
diff --git a/textproc/aspell-slovak/patches/patch-ab b/textproc/aspell-sk/patches/patch-ab
index 714b4844dbe..24996393ce6 100644
--- a/textproc/aspell-slovak/patches/patch-ab
+++ b/textproc/aspell-sk/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.4 2004/04/21 08:42:34 salo Exp $
+$NetBSD: patch-ab,v 1.1 2013/04/09 02:33:48 rodent Exp $
 
 --- configure.orig	2004-04-18 01:09:33.000000000 +0200
 +++ configure	2004-04-18 01:11:43.000000000 +0200
diff --git a/textproc/aspell-svenska/DESCR b/textproc/aspell-sv/DESCR
index f22c664f0ec..f22c664f0ec 100644
--- a/textproc/aspell-svenska/DESCR
+++ b/textproc/aspell-sv/DESCR
diff --git a/textproc/aspell-svenska/Makefile b/textproc/aspell-sv/Makefile
index a7cd8e0fe6e..bcc68b29c94 100644
--- a/textproc/aspell-svenska/Makefile
+++ b/textproc/aspell-sv/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.15 2012/10/25 06:55:42 asau Exp $
+# $NetBSD: Makefile,v 1.1 2013/04/09 02:33:49 rodent Exp $
 #
 
 DISTNAME=	aspell-sv-0.51-0
-PKGNAME=	${DISTNAME:C/sv-(.*)-(.*)$/svenska-\1.\2/}
-PKGREVISION=	2
+PKGNAME=	${DISTNAME:S/-0$/.0/1}
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_GNU:=aspell/dict/sv/}
 EXTRACT_SUFX=	.tar.bz2
@@ -12,7 +11,7 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://aspell.net/
 COMMENT=	Swedish language support for aspell
 
-HAS_CONFIGURE=	YES
+HAS_CONFIGURE=	yes
 
 .include "../../textproc/aspell/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/aspell-svenska/PLIST b/textproc/aspell-sv/PLIST
index c0592a304ca..a539a2ef50c 100644
--- a/textproc/aspell-svenska/PLIST
+++ b/textproc/aspell-sv/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2003/01/17 03:56:26 salo Exp $
+@comment $NetBSD: PLIST,v 1.1 2013/04/09 02:33:49 rodent Exp $
 lib/aspell/sv.multi
 lib/aspell/sv.rws
 lib/aspell/svenska.alias
diff --git a/textproc/aspell-svenska/distinfo b/textproc/aspell-sv/distinfo
index dc4f461906c..92276a99fb1 100644
--- a/textproc/aspell-svenska/distinfo
+++ b/textproc/aspell-sv/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2005/02/24 14:48:40 agc Exp $
+$NetBSD: distinfo,v 1.1 2013/04/09 02:33:49 rodent Exp $
 
 SHA1 (aspell-sv-0.51-0.tar.bz2) = bcae409db1b26387e7a1b552fb135b07c5c85f73
 RMD160 (aspell-sv-0.51-0.tar.bz2) = f6da78da89d35787f2bfd1076e941415dd009e54
diff --git a/textproc/aspell-sv/patches/patch-aa b/textproc/aspell-sv/patches/patch-aa
new file mode 100644
index 00000000000..272f36978d3
--- /dev/null
+++ b/textproc/aspell-sv/patches/patch-aa
@@ -0,0 +1,21 @@
+$NetBSD: patch-aa,v 1.1 2013/04/09 02:33:49 rodent Exp $
+
+--- Makefile.pre.orig	Fri Jan  3 18:39:33 2003
++++ Makefile.pre	Wed Jan 15 00:48:39 2003
+@@ -16,12 +16,10 @@
+ all: ${rws_files} ${data_files}
+ 
+ install: all
+-	mkdir -p ${DESTDIR}${dictdir}/
+-	cp ${rws_files} ${multi_files} ${DESTDIR}${dictdir}/
+-	cd ${DESTDIR}${dictdir}/ && chmod 644 ${rws_files} ${multi_files}
+-	mkdir -p ${DESTDIR}${datadir}/
+-	cp ${data_files} ${DESTDIR}${datadir}/
+-	cd ${DESTDIR}${datadir}/ && chmod 644 ${data_files}
++	${BSD_INSTALL_DATA_DIR} ${DESTDIR}${dictdir}/
++	${BSD_INSTALL_DATA} ${rws_files} ${multi_files} ${DESTDIR}${dictdir}/
++	${BSD_INSTALL_DATA_DIR} ${DESTDIR}${datadir}/
++	${BSD_INSTALL_DATA} ${data_files} ${DESTDIR}${datadir}/
+ 
+ clean:
+ 	rm -f ${rws_files}
diff --git a/textproc/aspell-svenska/patches/patch-aa b/textproc/aspell-svenska/patches/patch-aa
deleted file mode 100644
index 48d07a7768c..00000000000
--- a/textproc/aspell-svenska/patches/patch-aa
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2003/01/19 06:35:52 salo Exp $
-
---- Makefile.pre.orig	Fri Jan  3 18:39:33 2003
-+++ Makefile.pre	Wed Jan 15 00:48:39 2003
-@@ -16,12 +16,10 @@
- all: ${rws_files} ${data_files}
- 
- install: all
--	mkdir -p ${DESTDIR}${dictdir}/
--	cp ${rws_files} ${multi_files} ${DESTDIR}${dictdir}/
--	cd ${DESTDIR}${dictdir}/ && chmod 644 ${rws_files} ${multi_files}
--	mkdir -p ${DESTDIR}${datadir}/
--	cp ${data_files} ${DESTDIR}${datadir}/
--	cd ${DESTDIR}${datadir}/ && chmod 644 ${data_files}
-+	${BSD_INSTALL_DATA_DIR} ${DESTDIR}${dictdir}/
-+	${BSD_INSTALL_DATA} ${rws_files} ${multi_files} ${DESTDIR}${dictdir}/
-+	${BSD_INSTALL_DATA_DIR} ${DESTDIR}${datadir}/
-+	${BSD_INSTALL_DATA} ${data_files} ${DESTDIR}${datadir}/
- 
- clean:
- 	rm -f ${rws_files}
diff --git a/textproc/aspell-ukrainian/DESCR b/textproc/aspell-uk/DESCR
index a019ce42e7d..a019ce42e7d 100644
--- a/textproc/aspell-ukrainian/DESCR
+++ b/textproc/aspell-uk/DESCR
diff --git a/textproc/aspell-ukrainian/Makefile b/textproc/aspell-uk/Makefile
index e0a1842c5d1..45449dd0fe6 100644
--- a/textproc/aspell-ukrainian/Makefile
+++ b/textproc/aspell-uk/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.17 2012/10/25 06:55:42 asau Exp $
+# $NetBSD: Makefile,v 1.1 2013/04/09 02:33:50 rodent Exp $
 
 DISTNAME=	aspell6-uk-1.4.0-0
-PKGNAME=	${DISTNAME:C/6-uk-(.*)-(.*)$/-ukrainian-\1.\2/}
-PKGREVISION=	1
+PKGNAME=	${DISTNAME:S/6-/-/1:S/-0/.0/1}
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_GNU:=aspell/dict/uk/}
 EXTRACT_SUFX=	.tar.bz2
@@ -11,7 +10,7 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://aspell.net/
 COMMENT=	Ukrainian language support for aspell
 
-HAS_CONFIGURE=	YES
+HAS_CONFIGURE=	yes
 
 .include "../../textproc/aspell/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/aspell-ukrainian/PLIST b/textproc/aspell-uk/PLIST
index 8b0dbfa5592..73fa4a9328a 100644
--- a/textproc/aspell-ukrainian/PLIST
+++ b/textproc/aspell-uk/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2006/01/29 02:13:47 wiz Exp $
+@comment $NetBSD: PLIST,v 1.1 2013/04/09 02:33:50 rodent Exp $
 lib/aspell/uk.multi
 lib/aspell/uk.rws
 lib/aspell/ukrainian.alias
diff --git a/textproc/aspell-ukrainian/distinfo b/textproc/aspell-uk/distinfo
index 6518de8a4ce..4f6a51c7d35 100644
--- a/textproc/aspell-ukrainian/distinfo
+++ b/textproc/aspell-uk/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2009/12/02 18:10:33 snj Exp $
+$NetBSD: distinfo,v 1.1 2013/04/09 02:33:50 rodent Exp $
 
 SHA1 (aspell6-uk-1.4.0-0.tar.bz2) = b4697fa6c8879aa54364839b0dceae5d9dc46b89
 RMD160 (aspell6-uk-1.4.0-0.tar.bz2) = 2bb5360abcc37b7ad7fc82ee426a0c6fc9630a65
diff --git a/textproc/aspell-uk/patches/patch-aa b/textproc/aspell-uk/patches/patch-aa
new file mode 100644
index 00000000000..c8f089b7994
--- /dev/null
+++ b/textproc/aspell-uk/patches/patch-aa
@@ -0,0 +1,21 @@
+$NetBSD: patch-aa,v 1.1 2013/04/09 02:33:50 rodent Exp $
+
+--- Makefile.pre.orig	Fri Jan  3 18:39:33 2003
++++ Makefile.pre	Wed Jan 15 00:48:39 2003
+@@ -16,12 +16,10 @@
+ all: ${rws_files} ${data_files}
+ 
+ install: all
+-	mkdir -p ${DESTDIR}${dictdir}/
+-	cp ${rws_files} ${multi_files} ${DESTDIR}${dictdir}/
+-	cd ${DESTDIR}${dictdir}/ && chmod 644 ${rws_files} ${multi_files}
+-	mkdir -p ${DESTDIR}${datadir}/
+-	cp ${data_files} ${DESTDIR}${datadir}/
+-	cd ${DESTDIR}${datadir}/ && chmod 644 ${data_files}
++	${BSD_INSTALL_DATA_DIR} ${DESTDIR}${dictdir}/
++	${BSD_INSTALL_DATA} ${rws_files} ${multi_files} ${DESTDIR}${dictdir}/
++	${BSD_INSTALL_DATA_DIR} ${DESTDIR}${datadir}/
++	${BSD_INSTALL_DATA} ${data_files} ${DESTDIR}${datadir}/
+ 
+ clean:
+ 	rm -f ${rws_files}
diff --git a/textproc/aspell-ukrainian/patches/patch-aa b/textproc/aspell-ukrainian/patches/patch-aa
deleted file mode 100644
index 8bce0bb5389..00000000000
--- a/textproc/aspell-ukrainian/patches/patch-aa
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2003/01/19 06:35:53 salo Exp $
-
---- Makefile.pre.orig	Fri Jan  3 18:39:33 2003
-+++ Makefile.pre	Wed Jan 15 00:48:39 2003
-@@ -16,12 +16,10 @@
- all: ${rws_files} ${data_files}
- 
- install: all
--	mkdir -p ${DESTDIR}${dictdir}/
--	cp ${rws_files} ${multi_files} ${DESTDIR}${dictdir}/
--	cd ${DESTDIR}${dictdir}/ && chmod 644 ${rws_files} ${multi_files}
--	mkdir -p ${DESTDIR}${datadir}/
--	cp ${data_files} ${DESTDIR}${datadir}/
--	cd ${DESTDIR}${datadir}/ && chmod 644 ${data_files}
-+	${BSD_INSTALL_DATA_DIR} ${DESTDIR}${dictdir}/
-+	${BSD_INSTALL_DATA} ${rws_files} ${multi_files} ${DESTDIR}${dictdir}/
-+	${BSD_INSTALL_DATA_DIR} ${DESTDIR}${datadir}/
-+	${BSD_INSTALL_DATA} ${data_files} ${DESTDIR}${datadir}/
- 
- clean:
- 	rm -f ${rws_files}
diff --git a/textproc/aspell-welsh/patches/patch-aa b/textproc/aspell-welsh/patches/patch-aa
deleted file mode 100644
index 8bce0bb5389..00000000000
--- a/textproc/aspell-welsh/patches/patch-aa
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2003/01/19 06:35:53 salo Exp $
-
---- Makefile.pre.orig	Fri Jan  3 18:39:33 2003
-+++ Makefile.pre	Wed Jan 15 00:48:39 2003
-@@ -16,12 +16,10 @@
- all: ${rws_files} ${data_files}
- 
- install: all
--	mkdir -p ${DESTDIR}${dictdir}/
--	cp ${rws_files} ${multi_files} ${DESTDIR}${dictdir}/
--	cd ${DESTDIR}${dictdir}/ && chmod 644 ${rws_files} ${multi_files}
--	mkdir -p ${DESTDIR}${datadir}/
--	cp ${data_files} ${DESTDIR}${datadir}/
--	cd ${DESTDIR}${datadir}/ && chmod 644 ${data_files}
-+	${BSD_INSTALL_DATA_DIR} ${DESTDIR}${dictdir}/
-+	${BSD_INSTALL_DATA} ${rws_files} ${multi_files} ${DESTDIR}${dictdir}/
-+	${BSD_INSTALL_DATA_DIR} ${DESTDIR}${datadir}/
-+	${BSD_INSTALL_DATA} ${data_files} ${DESTDIR}${datadir}/
- 
- clean:
- 	rm -f ${rws_files}