[pkgsrc/trunk]: pkgsrc/devel/cdecl Rename getline to get_line to avoid clash ...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/71f01125208a
branches:  trunk
changeset: 565578:71f01125208a
user:      apb <apb%pkgsrc.org@localhost>
date:      Sun Sep 27 22:27:22 2009 +0000

description:
Rename getline to get_line to avoid clash with libc function.
No need to bump PKGREVISION.

diffstat:

 devel/cdecl/distinfo         |   4 ++--
 devel/cdecl/patches/patch-aa |  24 +++++++++++++++++++++---
 2 files changed, 23 insertions(+), 5 deletions(-)

diffs (59 lines):

diff -r 3acd8f4129ef -r 71f01125208a devel/cdecl/distinfo
--- a/devel/cdecl/distinfo      Sun Sep 27 20:06:52 2009 +0000
+++ b/devel/cdecl/distinfo      Sun Sep 27 22:27:22 2009 +0000
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.10 2007/03/09 15:38:32 rillig Exp $
+$NetBSD: distinfo,v 1.11 2009/09/27 22:27:22 apb Exp $
 
 SHA1 (cdecl-2.5.tar.gz) = b955a0b95b635090360b19de888cb29d5c005296
 RMD160 (cdecl-2.5.tar.gz) = 351c36dcc7f18e4d143f2559460025d2de9a83c4
 Size (cdecl-2.5.tar.gz) = 21435 bytes
-SHA1 (patch-aa) = 4d2d8c2bd163b37f5ea2f6d397de6367dbcf5b3e
+SHA1 (patch-aa) = cf6f5821c1856104841c60075111f6eecb30da2e
 SHA1 (patch-ab) = e8c9f70894ed5613234ed17b8c1c95c9b12afd7b
diff -r 3acd8f4129ef -r 71f01125208a devel/cdecl/patches/patch-aa
--- a/devel/cdecl/patches/patch-aa      Sun Sep 27 20:06:52 2009 +0000
+++ b/devel/cdecl/patches/patch-aa      Sun Sep 27 22:27:22 2009 +0000
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.9 2007/03/09 15:38:32 rillig Exp $
+$NetBSD: patch-aa,v 1.10 2009/09/27 22:27:23 apb Exp $
 
---- cdecl.c.orig       1996-01-16 04:54:46.000000000 +0100
-+++ cdecl.c    2007-03-09 16:36:18.000000000 +0100
+--- cdecl.c.orig       1996-01-16 03:54:46.000000000 +0000
++++ cdecl.c
 @@ -59,7 +59,9 @@
   */
  
@@ -125,6 +125,15 @@
                    exit(1); /* NOTREACHED */
                    }
                }
+@@ -375,7 +381,7 @@ char *options[] = {
+ static char *line_read = NULL;
+ 
+ /* Read a string, and return a pointer to it.  Returns NULL on EOF. */
+-char * getline ()
++char * get_line ()
+ {
+   /* If the buffer has already been allocated, return the memory
+      to the free pool. */
 @@ -399,12 +405,12 @@ char ** attempt_completion(char *text, i
  {
    char **matches = NULL;
@@ -158,6 +167,15 @@
  char *argv0;
  {
  #ifdef DOS
+@@ -887,7 +893,7 @@ int dostdin()
+ 
+       if (!quiet) (void) printf("Type `help' or `?' for help\n");
+       ret = 0;
+-      while ((line = getline())) {
++      while ((line = get_line())) {
+           if (!strcmp(line, "quit") || !strcmp(line, "exit")) {
+               free(line);
+               return ret;
 @@ -1252,10 +1258,10 @@ char **argv;
  #ifdef USE_READLINE
      /* install completion handlers */