[pkgsrc/trunk]: pkgsrc/misc/kdrill Add patch-a{b,c} to avoid conflict with ge...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/300d84a8f102
branches:  trunk
changeset: 569126:300d84a8f102
user:      obache <obache%pkgsrc.org@localhost>
date:      Sat Jan 09 12:03:03 2010 +0000

description:
Add patch-a{b,c} to avoid conflict with getline(3) defined in IEEE Std 1003.1-2008.
PR#42595.

diffstat:

 misc/kdrill/distinfo         |   4 +++-
 misc/kdrill/patches/patch-ab |  15 +++++++++++++++
 misc/kdrill/patches/patch-ac |  42 ++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 60 insertions(+), 1 deletions(-)

diffs (78 lines):

diff -r 007025bf1bc8 -r 300d84a8f102 misc/kdrill/distinfo
--- a/misc/kdrill/distinfo      Sat Jan 09 11:55:35 2010 +0000
+++ b/misc/kdrill/distinfo      Sat Jan 09 12:03:03 2010 +0000
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.4 2005/02/24 11:02:54 agc Exp $
+$NetBSD: distinfo,v 1.5 2010/01/09 12:03:03 obache Exp $
 
 SHA1 (kdrill5.11.6.tar.gz) = 8ce3594c81f717a4fd1488a952b0a05111679cd0
 RMD160 (kdrill5.11.6.tar.gz) = a2c81fe9490f549940a4eea793af37b56dd2b7e6
 Size (kdrill5.11.6.tar.gz) = 182956 bytes
 SHA1 (patch-aa) = 42fc93ca33c380cc947a526c97cb887c2e778ebb
+SHA1 (patch-ab) = bacf2be816f63ec072f0a4f4ba4d132691518dab
+SHA1 (patch-ac) = 2f1a6216be59b5fccaa19f7ea124822f412c4317
diff -r 007025bf1bc8 -r 300d84a8f102 misc/kdrill/patches/patch-ab
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/misc/kdrill/patches/patch-ab      Sat Jan 09 12:03:03 2010 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-ab,v 1.1 2010/01/09 12:03:04 obache Exp $
+
+Avoid to conflict with getline(3) defined in IEEE Std 1003.1-2008.
+
+--- externs.h.orig     2001-08-30 22:27:01.000000000 +0000
++++ externs.h
+@@ -30,7 +30,7 @@ extern void SetWidgetHexval(Widget,int);
+ 
+ /* other "usefull" general functions */
+ extern int xtoi(char *);
+-extern int getline(FILE *, unsigned char *);
++extern int get_line(FILE *, unsigned char *);
+ extern void setstatus(char *);
+ 
+ extern int FindIndex(char *);
diff -r 007025bf1bc8 -r 300d84a8f102 misc/kdrill/patches/patch-ac
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/misc/kdrill/patches/patch-ac      Sat Jan 09 12:03:03 2010 +0000
@@ -0,0 +1,42 @@
+$NetBSD: patch-ac,v 1.1 2010/01/09 12:03:04 obache Exp $
+
+Avoid to conflict with getline(3) defined in IEEE Std 1003.1-2008.
+
+--- readfile.c.orig    2001-08-30 22:27:37.000000000 +0000
++++ readfile.c
+@@ -31,7 +31,7 @@ int numberofkanji=0, highestkanji=0, low
+ static char *dictname=NULL;
+ static char *edictname=NULL;
+ 
+-/* getline:
++/* get_line:
+  *    reads a line (from dictionary).
+  *    Deals with 8-bit char reads (or attempts to)
+  *    Also attempts to deal with the problem of variable line length.
+@@ -50,7 +50,7 @@ static char *edictname=NULL;
+  *    if we have just started reading a stream;
+  */
+ 
+-int getline(FILE *fp,unsigned char *s)
++int get_line(FILE *fp,unsigned char *s)
+ {
+       char * val;
+       char *endparse;
+@@ -451,7 +451,7 @@ void readedict()
+               lowestkanji = nextindex;
+       }
+ 
+-      while(getline(fp, instring) != 0)
++      while(get_line(fp, instring) != 0)
+       {
+               int instrlen;
+ 
+@@ -653,7 +653,7 @@ void readstructs(){
+               exit(-1);
+       }
+ 
+-      while (getline(fp,instring) != 0) {
++      while (get_line(fp,instring) != 0) {
+               int Kanji;
+               int freq,grade,N,U,H,Q,SKIP;
+               unsigned char *parse;