diff --git a/textproc/aspell/dicts/ar/Makefile b/textproc/aspell/dicts/ar/Makefile
index b8f47289832..626da6a1fff 100644
--- a/textproc/aspell/dicts/ar/Makefile
+++ b/textproc/aspell/dicts/ar/Makefile
@@ -1,9 +1,8 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2009/01/19 14:16:10 jasper Exp $
+# $OpenBSD: Makefile,v 1.2 2012/01/17 10:32:26 ajacoutot Exp $
 
 COMMENT=	aspell dictionary for Arabic
 CATEGORIES=	textproc
 DISTNAME=	aspell6-ar-1.2-0
-PKGNAME=	${DISTNAME:C/-([0-9])$/_\1/}
 MASTER_SITES=	${MASTER_SITE_GNU:=aspell/dict/ar/}
 
 .include <bsd.port.mk>
diff --git a/textproc/aspell/dicts/da/Makefile b/textproc/aspell/dicts/da/Makefile
index f86fba05ecc..8490441efc6 100644
--- a/textproc/aspell/dicts/da/Makefile
+++ b/textproc/aspell/dicts/da/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.4 2007/09/15 20:59:37 merdely Exp $
+# $OpenBSD: Makefile,v 1.5 2012/01/17 10:32:26 ajacoutot Exp $
 
 COMMENT=	aspell dictionary for Danish
 CATEGORIES=	textproc
-DISTNAME=	aspell-da-0.50.1-0
+DISTNAME=	aspell5-da-1.4.42-1
 MASTER_SITES=	${MASTER_SITE_GNU:=aspell/dict/da/}
 
 .include <bsd.port.mk>
diff --git a/textproc/aspell/dicts/es/Makefile b/textproc/aspell/dicts/es/Makefile
index 9dd3b3f4741..a13f6c8fc9c 100644
--- a/textproc/aspell/dicts/es/Makefile
+++ b/textproc/aspell/dicts/es/Makefile
@@ -1,9 +1,8 @@
-# $OpenBSD: Makefile,v 1.5 2010/11/20 19:56:47 espie Exp $
+# $OpenBSD: Makefile,v 1.6 2012/01/17 10:32:26 ajacoutot Exp $
 
 COMMENT=	aspell dictionary for Spanish
 CATEGORIES=	textproc
 DISTNAME=	aspell6-es-1.9a-1
-PKGNAME=	${DISTNAME:C/-([0-9])$/_\1/}
 REVISION =	1
 MASTER_SITES=	${MASTER_SITE_GNU:=aspell/dict/es/}
 
diff --git a/textproc/aspell/dicts/fa/Makefile b/textproc/aspell/dicts/fa/Makefile
index b797c007b3a..89f704b3911 100644
--- a/textproc/aspell/dicts/fa/Makefile
+++ b/textproc/aspell/dicts/fa/Makefile
@@ -1,9 +1,8 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2009/01/19 14:16:46 jasper Exp $
+# $OpenBSD: Makefile,v 1.2 2012/01/17 10:32:26 ajacoutot Exp $
 
 COMMENT=	aspell dictionary for Farsi
 CATEGORIES=	textproc
 DISTNAME=	aspell6-fa-0.11-0
-PKGNAME=	${DISTNAME:C/-([0-9])$/_\1/}
 MASTER_SITES=	${MASTER_SITE_GNU:=aspell/dict/fa/}
 
 .include <bsd.port.mk>
diff --git a/textproc/aspell/dicts/fo/Makefile b/textproc/aspell/dicts/fo/Makefile
index fb8b3cbbc53..2af78bb56f6 100644
--- a/textproc/aspell/dicts/fo/Makefile
+++ b/textproc/aspell/dicts/fo/Makefile
@@ -1,9 +1,8 @@
-# $OpenBSD: Makefile,v 1.5 2010/11/20 19:56:47 espie Exp $
+# $OpenBSD: Makefile,v 1.6 2012/01/17 10:32:26 ajacoutot Exp $
 
 COMMENT=	aspell dictionary for Faroese
 CATEGORIES=	textproc
 DISTNAME=	aspell-fo-0.51-0
-PKGNAME=	${DISTNAME:C/-([0-9])$/_\1/}
 REVISION =	1
 MASTER_SITES=	${MASTER_SITE_GNU:=aspell/dict/fo/}
 
diff --git a/textproc/aspell/dicts/he/Makefile b/textproc/aspell/dicts/he/Makefile
index 45bfd7b92ee..9039057c342 100644
--- a/textproc/aspell/dicts/he/Makefile
+++ b/textproc/aspell/dicts/he/Makefile
@@ -1,9 +1,8 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2010/12/02 13:08:29 jasper Exp $
+# $OpenBSD: Makefile,v 1.2 2012/01/17 10:32:26 ajacoutot Exp $
 
 COMMENT=	aspell dictionary for Hebrew
 CATEGORIES=	textproc
 DISTNAME=	aspell6-he-1.0-0
-PKGNAME=        ${DISTNAME:C/-([0-9])$/_\1/}
 MASTER_SITES=	${MASTER_SITE_GNU:=aspell/dict/he/}
 
 .include <bsd.port.mk>
diff --git a/textproc/aspell/dicts/is/Makefile b/textproc/aspell/dicts/is/Makefile
index ad25e15d167..ff5b983eb83 100644
--- a/textproc/aspell/dicts/is/Makefile
+++ b/textproc/aspell/dicts/is/Makefile
@@ -1,9 +1,8 @@
-# $OpenBSD: Makefile,v 1.5 2010/11/20 19:56:47 espie Exp $
+# $OpenBSD: Makefile,v 1.6 2012/01/17 10:32:26 ajacoutot Exp $
 
 COMMENT=	aspell dictionary for Icelandic
 CATEGORIES=	textproc
 DISTNAME=	aspell-is-0.51.1-0
-PKGNAME=	${DISTNAME:C/-([0-9])$/_\1/}
 REVISION =	1
 MASTER_SITES=	${MASTER_SITE_GNU:=aspell/dict/is/}
 
diff --git a/textproc/aspell/dicts/lt/Makefile b/textproc/aspell/dicts/lt/Makefile
index f9df5ed9a14..cf4d3ef95dd 100644
--- a/textproc/aspell/dicts/lt/Makefile
+++ b/textproc/aspell/dicts/lt/Makefile
@@ -1,9 +1,8 @@
-# $OpenBSD: Makefile,v 1.3 2010/11/20 19:56:47 espie Exp $
+# $OpenBSD: Makefile,v 1.4 2012/01/17 10:32:26 ajacoutot Exp $
 
 COMMENT=	aspell dictionary for Lithuanian
 CATEGORIES=	textproc
 DISTNAME=	aspell6-lt-1.2.1-0
-PKGNAME=	${DISTNAME:C/-([0-9])$/_\1/}
 REVISION =	2
 MASTER_SITES=	${MASTER_SITE_GNU:=aspell/dict/lt/}
 
diff --git a/textproc/aspell/dicts/nb/Makefile b/textproc/aspell/dicts/nb/Makefile
index 5da748f6910..45d112f352d 100644
--- a/textproc/aspell/dicts/nb/Makefile
+++ b/textproc/aspell/dicts/nb/Makefile
@@ -1,9 +1,8 @@
-# $OpenBSD: Makefile,v 1.4 2010/11/20 19:56:47 espie Exp $
+# $OpenBSD: Makefile,v 1.5 2012/01/17 10:32:26 ajacoutot Exp $
 
 COMMENT=	aspell dictionary for Norwegian Bokmal
 CATEGORIES=	textproc
 DISTNAME=	aspell-nb-0.50.1-0
-PKGNAME=	${DISTNAME:C/-([0-9])$/_\1/}
 REVISION =	1
 MASTER_SITES=	${MASTER_SITE_GNU:=aspell/dict/nb/}
 
diff --git a/textproc/aspell/dicts/pt/Makefile b/textproc/aspell/dicts/pt/Makefile
index 929cb77d025..7ed6495a551 100644
--- a/textproc/aspell/dicts/pt/Makefile
+++ b/textproc/aspell/dicts/pt/Makefile
@@ -1,9 +1,8 @@
-# $OpenBSD: Makefile,v 1.4 2010/11/20 19:56:47 espie Exp $
+# $OpenBSD: Makefile,v 1.5 2012/01/17 10:32:26 ajacoutot Exp $
 
 COMMENT=	aspell dictionary for Portuguese
 CATEGORIES=	textproc
 DISTNAME=	aspell-pt-0.50-2
-PKGNAME=	${DISTNAME:C/-([0-9])$/_\1/}
 REVISION =	1
 MASTER_SITES=	${MASTER_SITE_GNU:=aspell/dict/pt/}
 
diff --git a/textproc/aspell/dicts/ro/Makefile b/textproc/aspell/dicts/ro/Makefile
index a16ad6d2ef1..b3aac459cb6 100644
--- a/textproc/aspell/dicts/ro/Makefile
+++ b/textproc/aspell/dicts/ro/Makefile
@@ -1,9 +1,8 @@
-# $OpenBSD: Makefile,v 1.4 2010/11/20 19:56:47 espie Exp $
+# $OpenBSD: Makefile,v 1.5 2012/01/17 10:32:26 ajacoutot Exp $
 
 COMMENT=	aspell dictionary for Romanian
 CATEGORIES=	textproc
 DISTNAME=	aspell-ro-0.50-2
-PKGNAME=	${DISTNAME:C/-([0-9])$/_\1/}
 REVISION =	1
 MASTER_SITES=	${MASTER_SITE_GNU:=aspell/dict/ro/}