[pkgsrc/trunk]: pkgsrc/devel/kdevelop-base Improve getline handling.

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/05f2f64f96a2
branches:  trunk
changeset: 398594:05f2f64f96a2
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Thu Sep 03 11:58:44 2009 +0000

description:
Improve getline handling.

diffstat:

 devel/kdevelop-base/distinfo         |   4 ++--
 devel/kdevelop-base/patches/patch-ai |  25 ++++++++-----------------
 2 files changed, 10 insertions(+), 19 deletions(-)

diffs (54 lines):

diff -r d29387703590 -r 05f2f64f96a2 devel/kdevelop-base/distinfo
--- a/devel/kdevelop-base/distinfo      Thu Sep 03 11:50:52 2009 +0000
+++ b/devel/kdevelop-base/distinfo      Thu Sep 03 11:58:44 2009 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.38 2009/08/15 21:28:12 wiz Exp $
+$NetBSD: distinfo,v 1.39 2009/09/03 11:58:44 wiz Exp $
 
 SHA1 (kdevelop_3.5.5.orig.tar.gz) = a28c7e4e9b5a7244a5a7063593c9713178a54bcd
 RMD160 (kdevelop_3.5.5.orig.tar.gz) = 5426fdff33ce32908141c098c8dfd5e4223c928a
@@ -7,5 +7,5 @@
 SHA1 (patch-ab) = 19d7b806fd3a5cd0c6cee76f434ea965ad3f01a9
 SHA1 (patch-ag) = 6ab90c041962bf999f3cfb2a704e91e2a2f205ba
 SHA1 (patch-ah) = fec4ba7d20ca75c2a4dc5942270cab899776a741
-SHA1 (patch-ai) = 887f6378012853d2282c3c8c069043de32d02868
+SHA1 (patch-ai) = 79386e66fd512b9c963de6e3e0214e88fc367946
 SHA1 (patch-aj) = 49a8fa7b2061961f9a8a5993e2b8b06403798c08
diff -r d29387703590 -r 05f2f64f96a2 devel/kdevelop-base/patches/patch-ai
--- a/devel/kdevelop-base/patches/patch-ai      Thu Sep 03 11:50:52 2009 +0000
+++ b/devel/kdevelop-base/patches/patch-ai      Thu Sep 03 11:58:44 2009 +0000
@@ -1,26 +1,17 @@
-$NetBSD: patch-ai,v 1.6 2009/08/15 17:04:52 wiz Exp $
+$NetBSD: patch-ai,v 1.7 2009/09/03 11:58:45 wiz Exp $
 
 --- vcs/clearcase/clearcasemanipulator.cpp.orig        2008-03-30 00:56:29.000000000 +0000
 +++ vcs/clearcase/clearcasemanipulator.cpp
-@@ -20,10 +20,10 @@
+@@ -19,8 +19,11 @@
+ #include <stdlib.h>
  #include <libgen.h>
  #include <errno.h>
++#ifdef __NetBSD__
++#include <sys/param.h>
++#endif
  
 -#if defined(Q_OS_MACX) || defined(MACOSX) || defined(Q_OS_SOLARIS) || defined(Q_OS_FREEBSD)
-+#if defined(Q_OS_MACX) || defined(MACOSX) || defined(Q_OS_SOLARIS) || defined(Q_OS_FREEBSD) || defined(__NetBSD__) || defined(__DragonFly__)
++#if defined(Q_OS_MACX) || defined(MACOSX) || defined(Q_OS_SOLARIS) || defined(Q_OS_FREEBSD) || (defined(__NetBSD__) && (__NetBSD_Version__ < 599001500)) || defined(__DragonFly__)
  //this function is taken from GNU libc
  //it does not exist on macos
--int getline(char **lineptr, size_t *n, FILE *stream)
-+int get_line(char **lineptr, size_t *n, FILE *stream)
- {
-     static char line[256];
-     char *ptr;
-@@ -95,7 +95,7 @@ VCSFileInfoMap* ClearcaseManipulator::re
-   char* line = NULL;
-   size_t numRead;
-   while (!feof(outputFile)) {
--    getline(&line,&numRead,outputFile);
-+    get_line(&line,&numRead,outputFile);
- 
-     if (numRead > 0) {
-       int pos = 0;
+ int getline(char **lineptr, size_t *n, FILE *stream)