Sun Oct 2 02:25:42 2011 UTC ()
As a sleazy hack to get this to build, patch the included gnu getline
(for some reason there are two separate copies of it) to match the
POSIX definition.
Fixing this "right" would be a lot of work and does not seem
worthwhile, especially since this package looks to be more or less
dead upstream and is probably a good candidate for removal.
(dholland)
diff -r1.8 -r1.9 pkgsrc/devel/gcvs/distinfo
diff -r0 -r1.1 pkgsrc/devel/gcvs/patches/patch-common_getline_c
diff -r0 -r1.1 pkgsrc/devel/gcvs/patches/patch-common_getline_h
diff -r0 -r1.1 pkgsrc/devel/gcvs/patches/patch-cvsunix_lib_getline_c
diff -r0 -r1.1 pkgsrc/devel/gcvs/patches/patch-cvsunix_lib_getline_h
--- pkgsrc/devel/gcvs/distinfo 2010/02/01 00:24:37 1.8
+++ pkgsrc/devel/gcvs/distinfo 2011/10/02 02:25:42 1.9
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.8 2010/02/01 00:24:37 joerg Exp $
+$NetBSD: distinfo,v 1.9 2011/10/02 02:25:42 dholland Exp $
SHA1 (gcvs-1.0.tar.gz) = 42b2469d0a9acc0e69a127b44000cd1b11bb895e
RMD160 (gcvs-1.0.tar.gz) = 195698283848cd1f22d00eb37df7dd0f6b52cffc
@@ -27,3 +27,7 @@
SHA1 (patch-as) = db6412aee518e989cca0d3b288513a718d6eee8c
SHA1 (patch-at) = 02343059426fabe3ef50bfe7bc61bb6214b10a47
SHA1 (patch-au) = f413e66cd0bf438c1fba83dc1632543a84507f8d
+SHA1 (patch-common_getline_c) = 038fb5200c692e4b4d82041008b762a2bec55be2
+SHA1 (patch-common_getline_h) = ea1153a559b349da6083de7cd913840802c8caa9
+SHA1 (patch-cvsunix_lib_getline_c) = 502b5967beb579bbbd5ebab7ee8824136e24f3fd
+SHA1 (patch-cvsunix_lib_getline_h) = c717385903f2f36e992213cbc8f010d683858d5a
$NetBSD: patch-common_getline_c,v 1.1 2011/10/02 02:25:42 dholland Exp $
hack this to match the new POSIX definition, as a sleazy way of making
it build again.
--- common/getline.c~ 2002-02-18 03:45:22.000000000 +0000
+++ common/getline.c
@@ -142,7 +142,7 @@ getstr (char **lineptr, size_t *n, FILE
return ret;
}
-int
+ssize_t
getline (char **lineptr, size_t *n, FILE *stream)
{
return getstr (lineptr, n, stream, '\n', 0);
$NetBSD: patch-common_getline_h,v 1.1 2011/10/02 02:25:42 dholland Exp $
hack this to match the new POSIX definition, as a sleazy way of making
it build again.
--- common/getline.h~ 2000-02-07 03:19:42.000000000 +0000
+++ common/getline.h
@@ -33,7 +33,7 @@ extern "C" {
#define __PROTO(args) ()
#endif /* GCC. */
-int
+ssize_t
getline __PROTO ((char **_lineptr, size_t *_n, FILE *_stream));
int
getstr __PROTO ((char **_lineptr, size_t *_n, FILE *_stream,
$NetBSD: patch-cvsunix_lib_getline_c,v 1.1 2011/10/02 02:25:42 dholland Exp $
hack this to match the new POSIX definition, as a sleazy way of making
it build again.
--- cvsunix/lib/getline.c~ 2011-10-02 02:15:27.000000000 +0000
+++ cvsunix/lib/getline.c
@@ -153,7 +153,7 @@ getstr (lineptr, n, stream, terminator,
return ret;
}
-int
+ssize_t
getline (lineptr, n, stream)
char **lineptr;
size_t *n;
$NetBSD: patch-cvsunix_lib_getline_h,v 1.1 2011/10/02 02:25:42 dholland Exp $
hack this to match the new POSIX definition, as a sleazy way of making
it build again.
--- cvsunix/lib/getline.h~ 2011-10-02 02:15:27.000000000 +0000
+++ cvsunix/lib/getline.h
@@ -11,7 +11,7 @@
#define GETLINE_NO_LIMIT -1
-int
+ssize_t
getline __PROTO ((char **_lineptr, size_t *_n, FILE *_stream));
int
getline_safe __PROTO ((char **_lineptr, size_t *_n, FILE *_stream,