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

cvs diff -r1.8 -r1.9 pkgsrc/devel/gcvs/distinfo (expand / switch to unified diff)

--- 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,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: distinfo,v 1.8 2010/02/01 00:24:37 joerg Exp $ 1$NetBSD: distinfo,v 1.9 2011/10/02 02:25:42 dholland Exp $
2 2
3SHA1 (gcvs-1.0.tar.gz) = 42b2469d0a9acc0e69a127b44000cd1b11bb895e 3SHA1 (gcvs-1.0.tar.gz) = 42b2469d0a9acc0e69a127b44000cd1b11bb895e
4RMD160 (gcvs-1.0.tar.gz) = 195698283848cd1f22d00eb37df7dd0f6b52cffc 4RMD160 (gcvs-1.0.tar.gz) = 195698283848cd1f22d00eb37df7dd0f6b52cffc
5Size (gcvs-1.0.tar.gz) = 2917708 bytes 5Size (gcvs-1.0.tar.gz) = 2917708 bytes
6SHA1 (gcvs-1.0-configure.tar.gz) = dba59b415ffc71645221e4b9c91065cd0f13ee69 6SHA1 (gcvs-1.0-configure.tar.gz) = dba59b415ffc71645221e4b9c91065cd0f13ee69
7RMD160 (gcvs-1.0-configure.tar.gz) = 290cce4644d71d8cac27f7ea9a93f7d7124b52a5 7RMD160 (gcvs-1.0-configure.tar.gz) = 290cce4644d71d8cac27f7ea9a93f7d7124b52a5
8Size (gcvs-1.0-configure.tar.gz) = 42627 bytes 8Size (gcvs-1.0-configure.tar.gz) = 42627 bytes
9SHA1 (patch-aa) = cc838bca770a00fb40fa1f613e46bcfc8dd001fa 9SHA1 (patch-aa) = cc838bca770a00fb40fa1f613e46bcfc8dd001fa
10SHA1 (patch-ab) = 3f9764eb2e67ecc33cbfb5fac27eadb4b120434d 10SHA1 (patch-ab) = 3f9764eb2e67ecc33cbfb5fac27eadb4b120434d
11SHA1 (patch-ac) = d3aea42a044fab09542cbda6956f4bdcb5a05f0b 11SHA1 (patch-ac) = d3aea42a044fab09542cbda6956f4bdcb5a05f0b
12SHA1 (patch-ad) = 595277d9fcf9f4bc62637beae6bf5b9e70a0fb7d 12SHA1 (patch-ad) = 595277d9fcf9f4bc62637beae6bf5b9e70a0fb7d
13SHA1 (patch-ae) = acc2f668834409f379403b08e67ccc0ce4e1ff18 13SHA1 (patch-ae) = acc2f668834409f379403b08e67ccc0ce4e1ff18
14SHA1 (patch-af) = 6048ade2cb3fe3fda6332159099190e5d8377e23 14SHA1 (patch-af) = 6048ade2cb3fe3fda6332159099190e5d8377e23
@@ -17,13 +17,17 @@ SHA1 (patch-ah) = fa23ed2155af00d85cfe62 @@ -17,13 +17,17 @@ SHA1 (patch-ah) = fa23ed2155af00d85cfe62
17SHA1 (patch-ai) = c349a5c49d8e0a481a4dd7eb56b713475b3c9e67 17SHA1 (patch-ai) = c349a5c49d8e0a481a4dd7eb56b713475b3c9e67
18SHA1 (patch-aj) = 5d02a8fa2e1dedecb19dd61771d4c1992b5560f4 18SHA1 (patch-aj) = 5d02a8fa2e1dedecb19dd61771d4c1992b5560f4
19SHA1 (patch-ak) = e728c8d78a72b0633118776334fcca683ede6159 19SHA1 (patch-ak) = e728c8d78a72b0633118776334fcca683ede6159
20SHA1 (patch-al) = 96cdce89fd0b32fc20f8cff198b2b31ee242e50b 20SHA1 (patch-al) = 96cdce89fd0b32fc20f8cff198b2b31ee242e50b
21SHA1 (patch-am) = af0098e91aa030a8ba09c520ecff86341fc573ff 21SHA1 (patch-am) = af0098e91aa030a8ba09c520ecff86341fc573ff
22SHA1 (patch-an) = 039dac4df56f922c1611b6e00382558496613d2f 22SHA1 (patch-an) = 039dac4df56f922c1611b6e00382558496613d2f
23SHA1 (patch-ao) = 0c34855297bd4c8aa32d5f6ef14695c58f6d3e8c 23SHA1 (patch-ao) = 0c34855297bd4c8aa32d5f6ef14695c58f6d3e8c
24SHA1 (patch-ap) = c14228e74fc433b06cf25b23aece71dfe74587aa 24SHA1 (patch-ap) = c14228e74fc433b06cf25b23aece71dfe74587aa
25SHA1 (patch-aq) = 544d6b2d44cba7ab31fea66c13ff391d0cd81932 25SHA1 (patch-aq) = 544d6b2d44cba7ab31fea66c13ff391d0cd81932
26SHA1 (patch-ar) = 05244267342a031e5470e4c2641ac359985c6334 26SHA1 (patch-ar) = 05244267342a031e5470e4c2641ac359985c6334
27SHA1 (patch-as) = db6412aee518e989cca0d3b288513a718d6eee8c 27SHA1 (patch-as) = db6412aee518e989cca0d3b288513a718d6eee8c
28SHA1 (patch-at) = 02343059426fabe3ef50bfe7bc61bb6214b10a47 28SHA1 (patch-at) = 02343059426fabe3ef50bfe7bc61bb6214b10a47
29SHA1 (patch-au) = f413e66cd0bf438c1fba83dc1632543a84507f8d 29SHA1 (patch-au) = f413e66cd0bf438c1fba83dc1632543a84507f8d
 30SHA1 (patch-common_getline_c) = 038fb5200c692e4b4d82041008b762a2bec55be2
 31SHA1 (patch-common_getline_h) = ea1153a559b349da6083de7cd913840802c8caa9
 32SHA1 (patch-cvsunix_lib_getline_c) = 502b5967beb579bbbd5ebab7ee8824136e24f3fd
 33SHA1 (patch-cvsunix_lib_getline_h) = c717385903f2f36e992213cbc8f010d683858d5a

File Added: pkgsrc/devel/gcvs/patches/patch-common_getline_c
$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);

File Added: pkgsrc/devel/gcvs/patches/patch-common_getline_h
$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,

File Added: pkgsrc/devel/gcvs/patches/patch-cvsunix_lib_getline_c
$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;

File Added: pkgsrc/devel/gcvs/patches/patch-cvsunix_lib_getline_h
$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,