diff options
| author | wiz <wiz> | 2009-09-03 11:58:44 +0000 |
|---|---|---|
| committer | wiz <wiz> | 2009-09-03 11:58:44 +0000 |
| commit | 59e81e45a3aaf0e1b223864e608648ec8f056fae (patch) | |
| tree | 6462aaca640b8e3f9f2674cf15d8acc8ce6c7244 /devel | |
| parent | 1d1fb3489360267e321bfea0b35a7ef31628d5fc (diff) | |
| download | pkgsrc-59e81e45a3aaf0e1b223864e608648ec8f056fae.tar.gz | |
Improve getline handling.
Diffstat (limited to 'devel')
| -rw-r--r-- | devel/kdevelop-base/distinfo | 4 | ||||
| -rw-r--r-- | devel/kdevelop-base/patches/patch-ai | 25 |
2 files changed, 10 insertions, 19 deletions
diff --git a/devel/kdevelop-base/distinfo b/devel/kdevelop-base/distinfo index aaae587bdca..9cda6ed52f2 100644 --- a/devel/kdevelop-base/distinfo +++ b/devel/kdevelop-base/distinfo @@ -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-aa) = ea4ceb43d826297610b19c1cd2c538fa486b2b22 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 --git a/devel/kdevelop-base/patches/patch-ai b/devel/kdevelop-base/patches/patch-ai index 8642c3dee02..cdf897ac083 100644 --- a/devel/kdevelop-base/patches/patch-ai +++ b/devel/kdevelop-base/patches/patch-ai @@ -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) |