[pkgsrc/trunk]: pkgsrc/textproc/ispell-base Avoid conflit with system getline.

[roy <roy%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/6b1cf8ef364e
branches:  trunk
changeset: 561847:6b1cf8ef364e
user:      roy <roy%pkgsrc.org@localhost>
date:      Fri Jul 17 08:19:29 2009 +0000

description:
Avoid conflit with system getline.
Fixes PR pkg/41746, thanks to Tom Stejskal.

diffstat:

 textproc/ispell-base/distinfo         |   3 +-
 textproc/ispell-base/patches/patch-as |  52 +++++++++++++++++++++++++++++++++++
 2 files changed, 54 insertions(+), 1 deletions(-)

diffs (70 lines):

diff -r 4a7d22f0d792 -r 6b1cf8ef364e textproc/ispell-base/distinfo
--- a/textproc/ispell-base/distinfo     Fri Jul 17 06:58:51 2009 +0000
+++ b/textproc/ispell-base/distinfo     Fri Jul 17 08:19:29 2009 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.12 2009/02/14 16:20:54 joerg Exp $
+$NetBSD: distinfo,v 1.13 2009/07/17 08:19:29 roy Exp $
 
 SHA1 (ispell-3.3.02.tar.gz) = c0d98e1af3afb8e0b642717c03439ff8881e3d60
 RMD160 (ispell-3.3.02.tar.gz) = 12edc94ebb7c1f4040bd8f5b0dbb8f40326aa781
@@ -12,3 +12,4 @@
 SHA1 (patch-ak) = aed34699d30d05a61bc2bd4d2ebf88e170ccd65c
 SHA1 (patch-al) = 27d87b52dc5507e9dbab73bb9643fa490920216d
 SHA1 (patch-ar) = 872cfc47e3652716afab9561fcf4a1bda2cee61a
+SHA1 (patch-as) = fd3b2ec1788a7ffc4c871f5564742aad41fadda9
diff -r 4a7d22f0d792 -r 6b1cf8ef364e textproc/ispell-base/patches/patch-as
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/textproc/ispell-base/patches/patch-as     Fri Jul 17 08:19:29 2009 +0000
@@ -0,0 +1,52 @@
+$NetBSD: patch-as,v 1.1 2009/07/17 08:19:29 roy Exp $
+
+Avoid conflit with system getline.
+Fixes PR pkg/41746, thanks to Tom Stejskal.
+
+--- correct.c.orig     2009-07-17 09:14:29.000000000 +0100
++++ correct.c  2009-07-17 09:14:46.000000000 +0100
+@@ -245,7 +245,7 @@
+                 struct flagent * sufent,
+                 ichar_t savearea[MAX_CAPS][INPUTWORDLEN + MAXAFFIXLEN],
+                 int * nsaved));
+-static char * getline P ((char * buf, int bufsize));
++static char * get_line 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 @@
+ 
+               imove (li - 1, 0);
+               (void) putchar ('!');
+-              if (getline ((char *) buf, sizeof buf) == NULL)
++              if (get_line ((char *) buf, sizeof buf) == NULL)
+                   {
+                   (void) putchar (7);
+                   ierase ();
+@@ -596,7 +596,7 @@
+                   (void) printf ("%s ", CORR_C_READONLY);
+                   }
+               (void) printf (CORR_C_REPLACE_WITH);
+-              if (getline ((char *) ctok, ctokl) == NULL)
++              if (get_line ((char *) ctok, ctokl) == NULL)
+                   {
+                   (void) putchar (7);
+                   /* Put it back */
+@@ -664,7 +664,7 @@
+               unsigned char   buf[100];
+               imove (li - 1, 0);
+               (void) printf (CORR_C_LOOKUP_PROMPT);
+-              if (getline ((char *) buf, sizeof buf) == NULL)
++              if (get_line ((char *) buf, sizeof buf) == NULL)
+                   {
+                   (void) putchar (7);
+                   ierase ();
+@@ -1583,7 +1583,7 @@
+     return;
+     }
+ 
+-static char * getline (s, len)
++static char * get_line (s, len)
+     register char *   s;
+     register int      len;
+     {