From a0ad7eb01a488f15cb27dddb7702affa49cc4905 Mon Sep 17 00:00:00 2001
From: apb <apb@pkgsrc.org>
Date: Sun, 27 Sep 2009 22:27:22 +0000
Subject: Rename getline to get_line to avoid clash with libc function. No need
 to bump PKGREVISION.

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

(limited to 'devel/cdecl')

diff --git a/devel/cdecl/distinfo b/devel/cdecl/distinfo
index e2e3b6abc09..d8bc80ab830 100644
--- a/devel/cdecl/distinfo
+++ b/devel/cdecl/distinfo
@@ -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 --git a/devel/cdecl/patches/patch-aa b/devel/cdecl/patches/patch-aa
index dbcd37a7bc8..9980dd22362 100644
--- a/devel/cdecl/patches/patch-aa
+++ b/devel/cdecl/patches/patch-aa
@@ -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 @@ $NetBSD: patch-aa,v 1.9 2007/03/09 15:38:32 rillig Exp $
  		    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 @@ $NetBSD: patch-aa,v 1.9 2007/03/09 15:38:32 rillig Exp $
  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 */
-- 
cgit v1.2.3