The dictionary is named british, not en_GB. Add missing (n)curses

dependency. Don't use getline as function name. Bump revision.

4 files changed, 58 insertions, 6 deletions

diff --git a/textproc/ispell-en_GB/Makefile b/textproc/ispell-en_GB/Makefile
index 6dcf9f1f9ec..de981c6b4dd 100644
--- a/textproc/ispell-en_GB/Makefile
+++ b/textproc/ispell-en_GB/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2013/04/24 11:15:45 rodent Exp $
+# $NetBSD: Makefile,v 1.3 2013/05/25 23:46:51 joerg Exp $
 #
 
 DISTNAME=	ispell-3.3.02
 PKGNAME=	${DISTNAME:S/-/-${DICT_LANG}-/1}
+PKGREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	http://fmg-www.cs.ucla.edu/geoff/tars/
 
@@ -15,7 +16,7 @@ DEPENDS+=	ispell>=3.3.02:../../textproc/ispell
 
 BUILD_TARGET=	config.sh all-languages
 
-DICT_LANG=	en_GB
+DICT_LANG=	british
 
 MAKE_FLAGS+=	TMPDIR=${WRKDIR:Q}
 
@@ -43,4 +44,5 @@ do-install:
 	${RM} -f ${DICT_LANG}.hash;					\
 	${LN} ${DICT_LANG}xlg.hash ${DICT_LANG}.hash
 
+.include "../../devel/ncurses/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/ispell-en_GB/PLIST b/textproc/ispell-en_GB/PLIST
index 803edfda643..27514f360c1 100644
--- a/textproc/ispell-en_GB/PLIST
+++ b/textproc/ispell-en_GB/PLIST
@@ -1,3 +1,3 @@
-@comment $NetBSD: PLIST,v 1.2 2013/04/24 11:15:45 rodent Exp $
-lib/en_GBxlg.hash
-lib/en_GB.hash
+@comment $NetBSD: PLIST,v 1.3 2013/05/25 23:46:51 joerg Exp $
+lib/british.hash
+lib/britishxlg.hash
diff --git a/textproc/ispell-en_GB/distinfo b/textproc/ispell-en_GB/distinfo
index bf4584defea..d405ef30a10 100644
--- a/textproc/ispell-en_GB/distinfo
+++ b/textproc/ispell-en_GB/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.1 2013/04/24 02:20:38 rodent Exp $
+$NetBSD: distinfo,v 1.2 2013/05/25 23:46:51 joerg Exp $
 
 SHA1 (ispell-3.3.02.tar.gz) = c0d98e1af3afb8e0b642717c03439ff8881e3d60
 RMD160 (ispell-3.3.02.tar.gz) = 12edc94ebb7c1f4040bd8f5b0dbb8f40326aa781
@@ -7,3 +7,4 @@ SHA1 (patch-aa) = cf8e0863e62103526d75ba5f0f25c760d4ee8e32
 SHA1 (patch-ab) = 210d80ca55fc1d4fb5aa308205d8630a7f4bfb67
 SHA1 (patch-ac) = a3474192676a326f33e10266e57ace5dfb1ba7eb
 SHA1 (patch-ad) = b3edb0466b306ecf1d59cfba46ec3f74e01db6ff
+SHA1 (patch-correct.c) = fccbda8d49dd52bcd1318e025d523fd366de678d
diff --git a/textproc/ispell-en_GB/patches/patch-correct.c b/textproc/ispell-en_GB/patches/patch-correct.c
new file mode 100644
index 00000000000..6b13a48071f
--- /dev/null
+++ b/textproc/ispell-en_GB/patches/patch-correct.c
@@ -0,0 +1,49 @@
+$NetBSD: patch-correct.c,v 1.1 2013/05/25 23:46:51 joerg Exp $
+
+--- correct.c.orig	2013-05-25 18:03:03.000000000 +0000
++++ correct.c
+@@ -245,7 +245,7 @@ static void	save_root_cap P ((ichar_t * 
+ 		  struct flagent * sufent,
+ 		  ichar_t savearea[MAX_CAPS][INPUTWORDLEN + MAXAFFIXLEN],
+ 		  int * nsaved));
+-static char *	getline P ((char * buf, int bufsize));
++static char *	my_getline P ((char * buf, int bufsize));
+ void		askmode P ((void));
+ void		copyout P ((unsigned char ** cc, int cnt));
+ static void	lookharder P ((unsigned char * string));
+@@ -571,7 +571,7 @@ checkagain:
+ 
+ 		imove (li - 1, 0);
+ 		(void) putchar ('!');
+-		if (getline ((char *) buf, sizeof buf) == NULL)
++		if (my_getline ((char *) buf, sizeof buf) == NULL)
+ 		    {
+ 		    (void) putchar (7);
+ 		    ierase ();
+@@ -596,7 +596,7 @@ checkagain:
+ 		    (void) printf ("%s ", CORR_C_READONLY);
+ 		    }
+ 		(void) printf (CORR_C_REPLACE_WITH);
+-		if (getline ((char *) ctok, ctokl) == NULL)
++		if (my_getline ((char *) ctok, ctokl) == NULL)
+ 		    {
+ 		    (void) putchar (7);
+ 		    /* Put it back */
+@@ -664,7 +664,7 @@ checkagain:
+ 		unsigned char	buf[100];
+ 		imove (li - 1, 0);
+ 		(void) printf (CORR_C_LOOKUP_PROMPT);
+-		if (getline ((char *) buf, sizeof buf) == NULL)
++		if (my_getline ((char *) buf, sizeof buf) == NULL)
+ 		    {
+ 		    (void) putchar (7);
+ 		    ierase ();
+@@ -1583,7 +1583,7 @@ static void save_root_cap (word, pattern
+     return;
+     }
+ 
+-static char * getline (s, len)
++static char * my_getline (s, len)
+     register char *	s;
+     register int	len;
+     {