summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--textproc/aspell-br/Makefile3
-rw-r--r--textproc/aspell-ca/Makefile3
-rw-r--r--textproc/aspell-cs/Makefile3
-rw-r--r--textproc/aspell-cy/Makefile3
-rw-r--r--textproc/aspell-da/Makefile3
-rw-r--r--textproc/aspell-de/Makefile3
-rw-r--r--textproc/aspell-el/Makefile3
-rw-r--r--textproc/aspell-en/Makefile3
-rw-r--r--textproc/aspell-eo/Makefile3
-rw-r--r--textproc/aspell-es/Makefile3
-rw-r--r--textproc/aspell-fo/Makefile3
-rw-r--r--textproc/aspell-fr/Makefile3
-rw-r--r--textproc/aspell-ga/Makefile3
-rw-r--r--textproc/aspell-it/Makefile3
-rw-r--r--textproc/aspell-nb/Makefile3
-rw-r--r--textproc/aspell-nl/Makefile3
-rw-r--r--textproc/aspell-pl/Makefile3
-rw-r--r--textproc/aspell-pt_PT/Makefile3
-rw-r--r--textproc/aspell-ro/Makefile3
-rw-r--r--textproc/aspell-ru/Makefile3
-rw-r--r--textproc/aspell-sk/Makefile3
-rw-r--r--textproc/aspell-sv/Makefile3
-rw-r--r--textproc/aspell-uk/Makefile3
-rw-r--r--textproc/ispell-ca/Makefile5
-rw-r--r--textproc/ispell-de/Makefile5
-rw-r--r--textproc/ispell-en_GB/Makefile7
-rw-r--r--textproc/ispell-en_GB/PLIST6
-rw-r--r--textproc/ispell-es/Makefile5
-rw-r--r--textproc/ispell-fr/Makefile5
-rw-r--r--textproc/ispell-ga/Makefile4
-rw-r--r--textproc/ispell-pl/Makefile4
-rw-r--r--textproc/ispell-ro/Makefile5
-rw-r--r--textproc/ispell-ru-io/Makefile6
-rw-r--r--textproc/ispell-ru/Makefile5
-rw-r--r--textproc/ispell-sk/Makefile4
-rw-r--r--textproc/ispell-sv/Makefile5
-rw-r--r--textproc/ispell/Makefile3
37 files changed, 86 insertions, 52 deletions
diff --git a/textproc/aspell-br/Makefile b/textproc/aspell-br/Makefile
index dd9d26d2af3..74901d6eb5f 100644
--- a/textproc/aspell-br/Makefile
+++ b/textproc/aspell-br/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2013/04/09 02:33:36 rodent Exp $
+# $NetBSD: Makefile,v 1.2 2013/04/24 11:15:41 rodent Exp $
#
DISTNAME= aspell-br-0.50-2
@@ -11,6 +11,7 @@ MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://aspell.net/
COMMENT= Breton language support for aspell
+CONFLICTS+= aspell-breton-[0-9]*
HAS_CONFIGURE= yes
.include "../../textproc/aspell/buildlink3.mk"
diff --git a/textproc/aspell-ca/Makefile b/textproc/aspell-ca/Makefile
index b9f40866f6a..d7940e523f4 100644
--- a/textproc/aspell-ca/Makefile
+++ b/textproc/aspell-ca/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2013/04/09 02:33:36 rodent Exp $
+# $NetBSD: Makefile,v 1.2 2013/04/24 11:15:41 rodent Exp $
#
DISTNAME= aspell6-ca-20040130-1
@@ -11,6 +11,7 @@ MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://aspell.net/
COMMENT= Catalan language support for aspell
+CONFLICTS+= aspell-catalan-[0-9]*
HAS_CONFIGURE= yes
.include "../../textproc/aspell/buildlink3.mk"
diff --git a/textproc/aspell-cs/Makefile b/textproc/aspell-cs/Makefile
index 69363409d83..87338017faa 100644
--- a/textproc/aspell-cs/Makefile
+++ b/textproc/aspell-cs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2013/04/09 02:33:37 rodent Exp $
+# $NetBSD: Makefile,v 1.2 2013/04/24 11:15:42 rodent Exp $
#
DISTNAME= aspell6-cs-20040614-1
@@ -14,6 +14,7 @@ COMMENT= Czech language support for aspell
# earlier versions core-dumped on the input
BUILDLINK_API_DEPENDS.aspell+= aspell>=0.60.2nb1
+CONFLICTS+= aspell-czech-[0-9]*
HAS_CONFIGURE= yes
.include "../../textproc/aspell/buildlink3.mk"
diff --git a/textproc/aspell-cy/Makefile b/textproc/aspell-cy/Makefile
index 0284c635456..dbeec338a09 100644
--- a/textproc/aspell-cy/Makefile
+++ b/textproc/aspell-cy/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2013/04/09 02:33:38 rodent Exp $
+# $NetBSD: Makefile,v 1.2 2013/04/24 11:15:45 rodent Exp $
#
DISTNAME= aspell-cy-0.50-3
@@ -11,6 +11,7 @@ MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://aspell.net/
COMMENT= Welsh language support for aspell
+CONFLICTS+= aspell-welsh-[0-9]*
HAS_CONFIGURE= yes
.include "../../textproc/aspell/buildlink3.mk"
diff --git a/textproc/aspell-da/Makefile b/textproc/aspell-da/Makefile
index 94da9b005c1..5306f73437b 100644
--- a/textproc/aspell-da/Makefile
+++ b/textproc/aspell-da/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2013/04/09 02:33:38 rodent Exp $
+# $NetBSD: Makefile,v 1.2 2013/04/24 11:15:42 rodent Exp $
DISTNAME= aspell-da-1.7.30
CATEGORIES= textproc
@@ -9,6 +9,7 @@ MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://da.speling.org/
COMMENT= Danish language support for aspell
+CONFLICTS+= aspell-danish-[0-9]*
USE_TOOLS+= perl
REPLACE_PERL= unsq
diff --git a/textproc/aspell-de/Makefile b/textproc/aspell-de/Makefile
index 3f77bd0f293..0ebdf8de775 100644
--- a/textproc/aspell-de/Makefile
+++ b/textproc/aspell-de/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2013/04/09 02:33:39 rodent Exp $
+# $NetBSD: Makefile,v 1.2 2013/04/24 11:15:43 rodent Exp $
#
DISTNAME= aspell6-de-20030222-1
@@ -11,6 +11,7 @@ MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://aspell.net/
COMMENT= German language support for aspell
+CONFLICTS+= aspell-german-[0-9]*
HAS_CONFIGURE= yes
.include "../../textproc/aspell/buildlink3.mk"
diff --git a/textproc/aspell-el/Makefile b/textproc/aspell-el/Makefile
index 15076383634..ce709275411 100644
--- a/textproc/aspell-el/Makefile
+++ b/textproc/aspell-el/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2013/04/09 02:33:40 rodent Exp $
+# $NetBSD: Makefile,v 1.2 2013/04/24 11:15:43 rodent Exp $
#
DISTNAME= aspell-el-0.50-3
@@ -11,6 +11,7 @@ MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://aspell.net/
COMMENT= Greek language support for aspell
+CONFLICTS+= aspell-greek-[0-9]*
HAS_CONFIGURE= yes
.include "../../textproc/aspell/buildlink3.mk"
diff --git a/textproc/aspell-en/Makefile b/textproc/aspell-en/Makefile
index ed0e612d6bf..c27293fdd61 100644
--- a/textproc/aspell-en/Makefile
+++ b/textproc/aspell-en/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2013/04/09 02:33:40 rodent Exp $
+# $NetBSD: Makefile,v 1.2 2013/04/24 11:15:42 rodent Exp $
#
DISTNAME= aspell6-en-6.0-0
@@ -11,6 +11,7 @@ MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://aspell.net/
COMMENT= English language support for aspell
+CONFLICTS+= aspell-english-[0-9]*
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-eo/Makefile b/textproc/aspell-eo/Makefile
index 03e9f13c2b7..382c43fd61e 100644
--- a/textproc/aspell-eo/Makefile
+++ b/textproc/aspell-eo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2013/04/09 02:33:41 rodent Exp $
+# $NetBSD: Makefile,v 1.2 2013/04/24 11:15:42 rodent Exp $
#
DISTNAME= aspell-eo-0.50-2
@@ -11,6 +11,7 @@ MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://aspell.net/
COMMENT= Esperanto language support for aspell
+CONFLICTS+= aspell-esperanto-[0-9]*
HAS_CONFIGURE= yes
.include "../../textproc/aspell/buildlink3.mk"
diff --git a/textproc/aspell-es/Makefile b/textproc/aspell-es/Makefile
index 2e5bd99d77b..12af876b9c0 100644
--- a/textproc/aspell-es/Makefile
+++ b/textproc/aspell-es/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2013/04/09 02:33:41 rodent Exp $
+# $NetBSD: Makefile,v 1.2 2013/04/24 11:15:44 rodent Exp $
#
DISTNAME= aspell6-es-1.11-2
@@ -11,6 +11,7 @@ MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://aspell.net/
COMMENT= Spanish language support for aspell
+CONFLICTS+= aspell-spanish-[0-9]*
HAS_CONFIGURE= yes
.include "../../textproc/aspell/buildlink3.mk"
diff --git a/textproc/aspell-fo/Makefile b/textproc/aspell-fo/Makefile
index 0ca47606661..c684a73cb84 100644
--- a/textproc/aspell-fo/Makefile
+++ b/textproc/aspell-fo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2013/04/13 13:14:05 rodent Exp $
+# $NetBSD: Makefile,v 1.3 2013/04/24 11:15:42 rodent Exp $
DISTNAME= aspell-fo-0.4.2
CATEGORIES= textproc
@@ -9,6 +9,7 @@ HOMEPAGE= http://fo.speling.org/installation/aspell
COMMENT= Faroese language support for aspell
LICENSE= gnu-gpl-v2
+CONFLICTS+= aspell-faroese-[0-9]*
USE_TOOLS+= perl
REPLACE_PERL= unsq
diff --git a/textproc/aspell-fr/Makefile b/textproc/aspell-fr/Makefile
index f16bc43dec7..b22683cf9b5 100644
--- a/textproc/aspell-fr/Makefile
+++ b/textproc/aspell-fr/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2013/04/09 02:33:42 rodent Exp $
+# $NetBSD: Makefile,v 1.2 2013/04/24 11:15:43 rodent Exp $
#
DISTNAME= aspell-fr-0.50-3
@@ -11,6 +11,7 @@ MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://aspell.net/
COMMENT= French language support for aspell
+CONFLICTS+= aspell-francais-[0-9]*
HAS_CONFIGURE= yes
.include "../../textproc/aspell/buildlink3.mk"
diff --git a/textproc/aspell-ga/Makefile b/textproc/aspell-ga/Makefile
index cc0f967a2d0..8c78c8eff63 100644
--- a/textproc/aspell-ga/Makefile
+++ b/textproc/aspell-ga/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2013/04/09 02:33:43 rodent Exp $
+# $NetBSD: Makefile,v 1.2 2013/04/24 11:15:43 rodent Exp $
DISTNAME= aspell5-ga-3.5-0
PKGNAME= ${DISTNAME:S/5-/-/1:S/-0/.0/1}
@@ -10,6 +10,7 @@ MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://borel.slu.edu/~kps/ispell/
COMMENT= Irish language support for aspell
+CONFLICTS+= aspell-gaeilge-[0-9]*
HAS_CONFIGURE= yes
.include "../../textproc/aspell/buildlink3.mk"
diff --git a/textproc/aspell-it/Makefile b/textproc/aspell-it/Makefile
index bc6464e1e4f..4305c625bf2 100644
--- a/textproc/aspell-it/Makefile
+++ b/textproc/aspell-it/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2013/04/09 02:33:44 rodent Exp $
+# $NetBSD: Makefile,v 1.2 2013/04/24 11:15:43 rodent Exp $
#
DISTNAME= aspell-it-0.53-0
@@ -11,6 +11,7 @@ MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://aspell.net/
COMMENT= Italian language support for aspell
+CONFLICTS+= aspell-italian-[0-9]*
HAS_CONFIGURE= yes
.include "../../textproc/aspell/buildlink3.mk"
diff --git a/textproc/aspell-nb/Makefile b/textproc/aspell-nb/Makefile
index 06409dc0d2c..f5c48314630 100644
--- a/textproc/aspell-nb/Makefile
+++ b/textproc/aspell-nb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2013/04/09 02:33:45 rodent Exp $
+# $NetBSD: Makefile,v 1.2 2013/04/24 11:15:43 rodent Exp $
#
DISTNAME= aspell-nb-0.50.1-0
@@ -11,6 +11,7 @@ MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://aspell.net/
COMMENT= Norwegian (Bokmal) language support for aspell
+CONFLICTS+= aspell-norwegian-[0-9]*
HAS_CONFIGURE= yes
.include "../../mk/bsd.prefs.mk"
diff --git a/textproc/aspell-nl/Makefile b/textproc/aspell-nl/Makefile
index 406bd8d3491..a51184856fb 100644
--- a/textproc/aspell-nl/Makefile
+++ b/textproc/aspell-nl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2013/04/09 02:33:45 rodent Exp $
+# $NetBSD: Makefile,v 1.2 2013/04/24 11:15:42 rodent Exp $
#
DISTNAME= aspell-nl-0.50-2
@@ -11,6 +11,7 @@ MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://aspell.net/
COMMENT= Dutch language support for aspell
+CONFLICTS+= aspell-dutch-[0-9]*
HAS_CONFIGURE= yes
.include "../../textproc/aspell/buildlink3.mk"
diff --git a/textproc/aspell-pl/Makefile b/textproc/aspell-pl/Makefile
index e3f019539a7..afa2d2dfc9a 100644
--- a/textproc/aspell-pl/Makefile
+++ b/textproc/aspell-pl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2013/04/09 02:33:46 rodent Exp $
+# $NetBSD: Makefile,v 1.2 2013/04/24 11:15:43 rodent Exp $
#
DISTNAME= aspell-pl-0.51-0
@@ -11,6 +11,7 @@ MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://aspell.net/
COMMENT= Polish language support for aspell
+CONFLICTS+= aspell-polish-[0-9]*
HAS_CONFIGURE= yes
UNLIMIT_RESOURCES+= datasize
diff --git a/textproc/aspell-pt_PT/Makefile b/textproc/aspell-pt_PT/Makefile
index 83b92980822..63a43edc4a1 100644
--- a/textproc/aspell-pt_PT/Makefile
+++ b/textproc/aspell-pt_PT/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2013/04/09 02:35:05 rodent Exp $
+# $NetBSD: Makefile,v 1.2 2013/04/24 11:15:44 rodent Exp $
#
DISTNAME= aspell6-pt_PT-20070510-0
@@ -11,6 +11,7 @@ MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://aspell.net/
COMMENT= Portuguese language support for aspell
+CONFLICTS+= aspell-portuguese-[0-9]*
HAS_CONFIGURE= yes
.include "../../textproc/aspell/buildlink3.mk"
diff --git a/textproc/aspell-ro/Makefile b/textproc/aspell-ro/Makefile
index 957fe8c99a3..c0770f31b8e 100644
--- a/textproc/aspell-ro/Makefile
+++ b/textproc/aspell-ro/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2013/04/09 02:33:47 rodent Exp $
+# $NetBSD: Makefile,v 1.2 2013/04/24 11:15:44 rodent Exp $
#
DISTNAME= aspell5-ro-3.3-2
@@ -11,6 +11,7 @@ MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://aspell.net/
COMMENT= Romanian language support for aspell
+CONFLICTS+= aspell-romanian-[0-9]*
HAS_CONFIGURE= yes
.include "../../textproc/aspell/buildlink3.mk"
diff --git a/textproc/aspell-ru/Makefile b/textproc/aspell-ru/Makefile
index d5b356f523f..c12122c047c 100644
--- a/textproc/aspell-ru/Makefile
+++ b/textproc/aspell-ru/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2013/04/09 02:33:47 rodent Exp $
+# $NetBSD: Makefile,v 1.2 2013/04/24 11:15:44 rodent Exp $
#
DISTNAME= aspell6-ru-0.99f7-1
@@ -11,6 +11,7 @@ MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://aspell.net/
COMMENT= Russian language support for aspell
+CONFLICTS+= aspell-russian-[0-9]*
HAS_CONFIGURE= yes
.include "../../textproc/aspell/buildlink3.mk"
diff --git a/textproc/aspell-sk/Makefile b/textproc/aspell-sk/Makefile
index 2c0747d5f1a..f675705c675 100644
--- a/textproc/aspell-sk/Makefile
+++ b/textproc/aspell-sk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2013/04/09 02:33:48 rodent Exp $
+# $NetBSD: Makefile,v 1.2 2013/04/24 11:15:44 rodent Exp $
#
DISTNAME= aspell-sk-0.52-0
@@ -11,6 +11,7 @@ MAINTAINER= salo@NetBSD.org
HOMEPAGE= http://sk-spell.sk.cx/
COMMENT= Slovak language support for aspell
+CONFLICTS+= aspell-slovak-[0-9]*
HAS_CONFIGURE= yes
.include "../../textproc/aspell/buildlink3.mk"
diff --git a/textproc/aspell-sv/Makefile b/textproc/aspell-sv/Makefile
index bcc68b29c94..e63f53968cc 100644
--- a/textproc/aspell-sv/Makefile
+++ b/textproc/aspell-sv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2013/04/09 02:33:49 rodent Exp $
+# $NetBSD: Makefile,v 1.2 2013/04/24 11:15:44 rodent Exp $
#
DISTNAME= aspell-sv-0.51-0
@@ -11,6 +11,7 @@ MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://aspell.net/
COMMENT= Swedish language support for aspell
+CONFLICTS+= aspell-svenska-[0-9]*
HAS_CONFIGURE= yes
.include "../../textproc/aspell/buildlink3.mk"
diff --git a/textproc/aspell-uk/Makefile b/textproc/aspell-uk/Makefile
index 45449dd0fe6..74325b72999 100644
--- a/textproc/aspell-uk/Makefile
+++ b/textproc/aspell-uk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2013/04/09 02:33:50 rodent Exp $
+# $NetBSD: Makefile,v 1.2 2013/04/24 11:15:44 rodent Exp $
DISTNAME= aspell6-uk-1.4.0-0
PKGNAME= ${DISTNAME:S/6-/-/1:S/-0/.0/1}
@@ -10,6 +10,7 @@ MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://aspell.net/
COMMENT= Ukrainian language support for aspell
+CONFLICTS+= aspell-ukrainian-[0-9]*
HAS_CONFIGURE= yes
.include "../../textproc/aspell/buildlink3.mk"
diff --git a/textproc/ispell-ca/Makefile b/textproc/ispell-ca/Makefile
index 1c2b035768a..a942d590ab7 100644
--- a/textproc/ispell-ca/Makefile
+++ b/textproc/ispell-ca/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.1 2013/04/24 02:20:37 rodent Exp $
+# $NetBSD: Makefile,v 1.2 2013/04/24 11:15:45 rodent Exp $
#
DISTNAME= ispell-sc-ca
-PKGNAME= ispell-catalan-1.0
+PKGNAME= ${DISTNAME:S/-sc//1}-1.0
CATEGORIES= textproc
MASTER_SITES= http://www.softcatala.org/cgi-bin/gaudi/contadorb/load.cgi?/fitxers/linux/
EXTRACT_SUFX= .zip
@@ -11,6 +11,7 @@ MAINTAINER= jmmv@NetBSD.org
HOMEPAGE= http://www.softcatala.org/projectes/myspell/
COMMENT= Catalan dictionary for interactive spelling checker
+CONFLICTS+= ispell-catalan-[0-9]*
DEPENDS+= ispell>=3.1.20:../../textproc/ispell
WRKSRC= ${WRKDIR}
diff --git a/textproc/ispell-de/Makefile b/textproc/ispell-de/Makefile
index b9027cdd481..1b75a566712 100644
--- a/textproc/ispell-de/Makefile
+++ b/textproc/ispell-de/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.1 2013/04/24 02:20:38 rodent Exp $
+# $NetBSD: Makefile,v 1.2 2013/04/24 11:15:46 rodent Exp $
#
DISTNAME= igerman98-20120607
-PKGNAME= ispell-german-20120607
+PKGNAME= ${DISTNAME:S/german98/spell-de/1}
CATEGORIES= textproc
MASTER_SITES= http://j3e.de/ispell/igerman98/dict/
EXTRACT_SUFX= .tar.bz2
@@ -11,6 +11,7 @@ MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://j3e.de/ispell/igerman98/
COMMENT= German dictionary for interactive spelling checker
+CONFLICTS+= ispell-german-[0-9]*
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
diff --git a/textproc/ispell-en_GB/Makefile b/textproc/ispell-en_GB/Makefile
index c4151733753..6dcf9f1f9ec 100644
--- a/textproc/ispell-en_GB/Makefile
+++ b/textproc/ispell-en_GB/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.1 2013/04/24 02:20:38 rodent Exp $
+# $NetBSD: Makefile,v 1.2 2013/04/24 11:15:45 rodent Exp $
#
DISTNAME= ispell-3.3.02
-PKGNAME= ispell-${DICT_LANG}-3.3.02
+PKGNAME= ${DISTNAME:S/-/-${DICT_LANG}-/1}
CATEGORIES= textproc
MASTER_SITES= http://fmg-www.cs.ucla.edu/geoff/tars/
@@ -10,11 +10,12 @@ MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://ficus-www.cs.ucla.edu/geoff/ispell.html
COMMENT= British dictionary for interactive spelling checker
+CONFLICTS+= ispell-british-[0-9]*
DEPENDS+= ispell>=3.3.02:../../textproc/ispell
BUILD_TARGET= config.sh all-languages
-DICT_LANG= british
+DICT_LANG= en_GB
MAKE_FLAGS+= TMPDIR=${WRKDIR:Q}
diff --git a/textproc/ispell-en_GB/PLIST b/textproc/ispell-en_GB/PLIST
index 2205163b2b7..803edfda643 100644
--- a/textproc/ispell-en_GB/PLIST
+++ b/textproc/ispell-en_GB/PLIST
@@ -1,3 +1,3 @@
-@comment $NetBSD: PLIST,v 1.1 2013/04/24 02:20:38 rodent Exp $
-lib/britishxlg.hash
-lib/british.hash
+@comment $NetBSD: PLIST,v 1.2 2013/04/24 11:15:45 rodent Exp $
+lib/en_GBxlg.hash
+lib/en_GB.hash
diff --git a/textproc/ispell-es/Makefile b/textproc/ispell-es/Makefile
index 5c761e43458..14ee53f5a67 100644
--- a/textproc/ispell-es/Makefile
+++ b/textproc/ispell-es/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.1 2013/04/24 02:20:39 rodent Exp $
+# $NetBSD: Makefile,v 1.2 2013/04/24 11:15:47 rodent Exp $
#
DISTNAME= espa~nol-1.7
-PKGNAME= ispell-spanish-1.7
+PKGNAME= ispell-${DISTNAME:S/pa~nol//1}
CATEGORIES= textproc
MASTER_SITES= http://www.datsi.fi.upm.es/~coes/
@@ -10,6 +10,7 @@ MAINTAINER= jmmv@NetBSD.org
HOMEPAGE= http://es.tldp.org/htmls/coes.html
COMMENT= Spanish dictionary for interactive spelling checker
+CONFLICTS+= ispell-spanish-[0-9]*
DEPENDS+= ispell>=3.1.20:../../textproc/ispell
MAKE_FLAGS+= TMPDIR=${WRKDIR:Q}
diff --git a/textproc/ispell-fr/Makefile b/textproc/ispell-fr/Makefile
index b23833fb258..2834a4727de 100644
--- a/textproc/ispell-fr/Makefile
+++ b/textproc/ispell-fr/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.1 2013/04/24 02:20:39 rodent Exp $
+# $NetBSD: Makefile,v 1.2 2013/04/24 11:15:45 rodent Exp $
#
DISTNAME= francais-IREQ-1.4
-PKGNAME= ispell-francais-1.4
+PKGNAME= ispell-${DISTNAME:S/francais-IREQ/fr/1}
CATEGORIES= textproc
MASTER_SITES= ftp://ftp.robot.ireq.ca/pub/ispell/
@@ -10,6 +10,7 @@ MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.gnu.org/software/ispell/ispell.html
COMMENT= French dictionary for interactive spelling checker
+CONFLICTS+= ispell-francais-[0-9]*
DEPENDS+= ispell>=3.1.20:../../textproc/ispell
INSTALLATION_DIRS= lib
diff --git a/textproc/ispell-ga/Makefile b/textproc/ispell-ga/Makefile
index 5557ca39632..b38181835ba 100644
--- a/textproc/ispell-ga/Makefile
+++ b/textproc/ispell-ga/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.1 2013/04/24 02:20:39 rodent Exp $
+# $NetBSD: Makefile,v 1.2 2013/04/24 11:15:45 rodent Exp $
DISTNAME= ispell-gaeilge-2.0
+PKGNAME= ${DISTNAME:S/eilge//1}
CATEGORIES= textproc
MASTER_SITES= http://borel.slu.edu/~kps/ispell/
@@ -8,6 +9,7 @@ MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://borel.slu.edu/~kps/ispell/
COMMENT= Irish language support for ispell
+CONFLICTS+= ispell-gaeilge-[0-9]*
DEPENDS+= ispell>=3.1.20:../../textproc/ispell
INSTALLATION_DIRS= lib
diff --git a/textproc/ispell-pl/Makefile b/textproc/ispell-pl/Makefile
index 35c180222e9..369d7fa7553 100644
--- a/textproc/ispell-pl/Makefile
+++ b/textproc/ispell-pl/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.1 2013/04/24 02:20:40 rodent Exp $
+# $NetBSD: Makefile,v 1.2 2013/04/24 11:15:46 rodent Exp $
#
DISTNAME= ispell-pl-20021127
-PKGNAME= ${DISTNAME:S/-pl-/-polski-/}
CATEGORIES= textproc
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=ispell-pl/}
@@ -10,6 +9,7 @@ MAINTAINER= adam@NetBSD.org
HOMEPAGE= http://ispell-pl.sourceforge.net/
COMMENT= Polish dictionary for interactive spelling checker
+CONFLICTS+ ispell-polski-[0-9]*
DEPENDS+= ispell>=3.1.20:../../textproc/ispell
INSTALLATION_DIRS= lib
diff --git a/textproc/ispell-ro/Makefile b/textproc/ispell-ro/Makefile
index 2e383419a59..32c5f4e2415 100644
--- a/textproc/ispell-ro/Makefile
+++ b/textproc/ispell-ro/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.1 2013/04/24 02:20:41 rodent Exp $
+# $NetBSD: Makefile,v 1.2 2013/04/24 11:15:46 rodent Exp $
#
DISTNAME= rom-spell
-PKGNAME= ispell-romanian-20031216
+PKGNAME= ispell-ro-20031216
CATEGORIES= textproc
MASTER_SITES= http://www.cs.cmu.edu/~mihaib/ftp/
@@ -10,6 +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
+CONFLICTS+= ispell-romanian-[0-9]*
DEPENDS+= ispell>=3.1.20:../../textproc/ispell
DIST_SUBDIR= ${PKGNAME_NOREV}
diff --git a/textproc/ispell-ru-io/Makefile b/textproc/ispell-ru-io/Makefile
index 3c1225994d4..d5fd0466af8 100644
--- a/textproc/ispell-ru-io/Makefile
+++ b/textproc/ispell-ru-io/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.1 2013/04/24 02:20:41 rodent Exp $
-
-PKGNAME= ispell-russian-io-${RUS_ISPELL_VERSION}
+# $NetBSD: Makefile,v 1.2 2013/04/24 11:15:46 rodent Exp $
+PKGNAME= ispell-ru-io-${RUS_ISPELL_VERSION}
+CONFLICTS+= ispell-russian-io-[0-9]*
MAKE_ENV+= IO="defined"
.include "../../textproc/ispell-russian/Makefile.common"
diff --git a/textproc/ispell-ru/Makefile b/textproc/ispell-ru/Makefile
index 7484610c423..fb7318703a4 100644
--- a/textproc/ispell-ru/Makefile
+++ b/textproc/ispell-ru/Makefile
@@ -1,5 +1,6 @@
-# $NetBSD: Makefile,v 1.1 2013/04/24 02:20:41 rodent Exp $
+# $NetBSD: Makefile,v 1.2 2013/04/24 11:15:46 rodent Exp $
-PKGNAME= ispell-russian-${RUS_ISPELL_VERSION}
+PKGNAME= ispell-ru-${RUS_ISPELL_VERSION}
+CONFLICTS+= ispell-russian-[0-9]*
.include "../../textproc/ispell-russian/Makefile.common"
diff --git a/textproc/ispell-sk/Makefile b/textproc/ispell-sk/Makefile
index 716f06951e8..6a06714b3f3 100644
--- a/textproc/ispell-sk/Makefile
+++ b/textproc/ispell-sk/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.1 2013/04/24 02:20:42 rodent Exp $
+# $NetBSD: Makefile,v 1.2 2013/04/24 11:15:46 rodent Exp $
#
DISTNAME= ispell-sk-0.2.2
-PKGNAME= ${DISTNAME:S/sk/slovak/}
CATEGORIES= textproc
MASTER_SITES= http://sk-spell.sk.cx/
@@ -10,6 +9,7 @@ MAINTAINER= salo@NetBSD.org
HOMEPAGE= http://sk-spell.sk.cx/?id=4
COMMENT= Slovak dictionary for ispell
+CONFLICTS+= ispell-slovak-[0-9]*
DEPENDS+= ispell>=3.1.20:../../textproc/ispell
MAKE_ENV+= CAT=${CAT:Q} SORT=${SORT:Q}
diff --git a/textproc/ispell-sv/Makefile b/textproc/ispell-sv/Makefile
index 1084ea801f0..bb2b00c2ab0 100644
--- a/textproc/ispell-sv/Makefile
+++ b/textproc/ispell-sv/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.1 2013/04/24 02:20:43 rodent Exp $
+# $NetBSD: Makefile,v 1.2 2013/04/24 11:15:47 rodent Exp $
#
DISTNAME= iswedish-1.2.1
-PKGNAME= ispell-svenska-1.2.1
+PKGNAME= ${DISTNAME:S/wedish/pell-sv/1}
CATEGORIES= textproc
MASTER_SITES= http://sv.sslug.dk/locale/ispell/iswedish/
@@ -10,6 +10,7 @@ MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.gnu.org/software/ispell/ispell.html
COMMENT= Swedish dictionary for interactive spelling checker
+CONFLICTS+= ispell-svenska-[0-9]*
INSTALLATION_DIRS= lib
DEPENDS+= ispell>=3.1.20:../../textproc/ispell
diff --git a/textproc/ispell/Makefile b/textproc/ispell/Makefile
index 592bc2f6b0f..241638c39c7 100644
--- a/textproc/ispell/Makefile
+++ b/textproc/ispell/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2013/04/24 02:20:36 rodent Exp $
+# $NetBSD: Makefile,v 1.26 2013/04/24 11:15:45 rodent Exp $
#
DISTNAME= ispell-3.3.02
@@ -9,6 +9,7 @@ MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://ficus-www.cs.ucla.edu/geoff/ispell.html
COMMENT= Interactive spelling checker
+CONFLICTS+= ispell-base-[0-9]*
USE_TOOLS+= mktemp:run yacc
INSTALLATION_DIRS= bin lib ${PKGMANDIR}/man1 ${PKGMANDIR}/man5