Thu Sep 3 11:58:45 2009 UTC ()
Improve getline handling.


(wiz)
diff -r1.38 -r1.39 pkgsrc/devel/kdevelop-base/distinfo
diff -r1.6 -r1.7 pkgsrc/devel/kdevelop-base/patches/patch-ai
cvs diff -r1.38 -r1.39 pkgsrc/devel/kdevelop-base/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/kdevelop-base/Attic/distinfo 2009/08/15 21:28:12 1.38
+++ pkgsrc/devel/kdevelop-base/Attic/distinfo 2009/09/03 11:58:44 1.39
@@ -1,11 +1,11 @@ @@ -1,11 +1,11 @@
1$NetBSD: distinfo,v 1.38 2009/08/15 21:28:12 wiz Exp $ 1$NetBSD: distinfo,v 1.39 2009/09/03 11:58:44 wiz Exp $
2 2
3SHA1 (kdevelop_3.5.5.orig.tar.gz) = a28c7e4e9b5a7244a5a7063593c9713178a54bcd 3SHA1 (kdevelop_3.5.5.orig.tar.gz) = a28c7e4e9b5a7244a5a7063593c9713178a54bcd
4RMD160 (kdevelop_3.5.5.orig.tar.gz) = 5426fdff33ce32908141c098c8dfd5e4223c928a 4RMD160 (kdevelop_3.5.5.orig.tar.gz) = 5426fdff33ce32908141c098c8dfd5e4223c928a
5Size (kdevelop_3.5.5.orig.tar.gz) = 11886928 bytes 5Size (kdevelop_3.5.5.orig.tar.gz) = 11886928 bytes
6SHA1 (patch-aa) = ea4ceb43d826297610b19c1cd2c538fa486b2b22 6SHA1 (patch-aa) = ea4ceb43d826297610b19c1cd2c538fa486b2b22
7SHA1 (patch-ab) = 19d7b806fd3a5cd0c6cee76f434ea965ad3f01a9 7SHA1 (patch-ab) = 19d7b806fd3a5cd0c6cee76f434ea965ad3f01a9
8SHA1 (patch-ag) = 6ab90c041962bf999f3cfb2a704e91e2a2f205ba 8SHA1 (patch-ag) = 6ab90c041962bf999f3cfb2a704e91e2a2f205ba
9SHA1 (patch-ah) = fec4ba7d20ca75c2a4dc5942270cab899776a741 9SHA1 (patch-ah) = fec4ba7d20ca75c2a4dc5942270cab899776a741
10SHA1 (patch-ai) = 887f6378012853d2282c3c8c069043de32d02868 10SHA1 (patch-ai) = 79386e66fd512b9c963de6e3e0214e88fc367946
11SHA1 (patch-aj) = 49a8fa7b2061961f9a8a5993e2b8b06403798c08 11SHA1 (patch-aj) = 49a8fa7b2061961f9a8a5993e2b8b06403798c08
cvs diff -r1.6 -r1.7 pkgsrc/devel/kdevelop-base/patches/Attic/patch-ai (expand / switch to unified diff)

--- pkgsrc/devel/kdevelop-base/patches/Attic/patch-ai 2009/08/15 17:04:52 1.6
+++ pkgsrc/devel/kdevelop-base/patches/Attic/patch-ai 2009/09/03 11:58:45 1.7
@@ -1,26 +1,17 @@ @@ -1,26 +1,17 @@
1$NetBSD: patch-ai,v 1.6 2009/08/15 17:04:52 wiz Exp $ 1$NetBSD: patch-ai,v 1.7 2009/09/03 11:58:45 wiz Exp $
2 2
3--- vcs/clearcase/clearcasemanipulator.cpp.orig 2008-03-30 00:56:29.000000000 +0000 3--- vcs/clearcase/clearcasemanipulator.cpp.orig 2008-03-30 00:56:29.000000000 +0000
4+++ vcs/clearcase/clearcasemanipulator.cpp 4+++ vcs/clearcase/clearcasemanipulator.cpp
5@@ -20,10 +20,10 @@ 5@@ -19,8 +19,11 @@
 6 #include <stdlib.h>
6 #include <libgen.h> 7 #include <libgen.h>
7 #include <errno.h> 8 #include <errno.h>
 9+#ifdef __NetBSD__
 10+#include <sys/param.h>
 11+#endif
8  12
9-#if defined(Q_OS_MACX) || defined(MACOSX) || defined(Q_OS_SOLARIS) || defined(Q_OS_FREEBSD) 13-#if defined(Q_OS_MACX) || defined(MACOSX) || defined(Q_OS_SOLARIS) || defined(Q_OS_FREEBSD)
10+#if defined(Q_OS_MACX) || defined(MACOSX) || defined(Q_OS_SOLARIS) || defined(Q_OS_FREEBSD) || defined(__NetBSD__) || defined(__DragonFly__) 14+#if defined(Q_OS_MACX) || defined(MACOSX) || defined(Q_OS_SOLARIS) || defined(Q_OS_FREEBSD) || (defined(__NetBSD__) && (__NetBSD_Version__ < 599001500)) || defined(__DragonFly__)
11 //this function is taken from GNU libc 15 //this function is taken from GNU libc
12 //it does not exist on macos 16 //it does not exist on macos
13-int getline(char **lineptr, size_t *n, FILE *stream) 17 int getline(char **lineptr, size_t *n, FILE *stream)
14+int get_line(char **lineptr, size_t *n, FILE *stream) 
15 { 
16 static char line[256]; 
17 char *ptr; 
18@@ -95,7 +95,7 @@ VCSFileInfoMap* ClearcaseManipulator::re 
19 char* line = NULL; 
20 size_t numRead; 
21 while (!feof(outputFile)) { 
22- getline(&line,&numRead,outputFile); 
23+ get_line(&line,&numRead,outputFile); 
24  
25 if (numRead > 0) { 
26 int pos = 0;