Tue Sep 27 12:43:21 2011 UTC ()
Fix PR pkg/45408.

Treat getine as like as getopt.

Thank you, obache@.


(ryoon)
diff -r1.6 -r1.7 pkgsrc/devel/scmcvs/distinfo
diff -r0 -r1.1 pkgsrc/devel/scmcvs/patches/patch-config.h.in
diff -r0 -r1.1 pkgsrc/devel/scmcvs/patches/patch-configure
diff -r1.1 -r1.2 pkgsrc/devel/scmcvs/patches/patch-lib_getline.c
diff -r1.1 -r1.2 pkgsrc/devel/scmcvs/patches/patch-lib_getline.h
cvs diff -r1.6 -r1.7 pkgsrc/devel/scmcvs/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/scmcvs/distinfo 2011/09/22 15:16:26 1.6
+++ pkgsrc/devel/scmcvs/distinfo 2011/09/27 12:43:20 1.7
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: distinfo,v 1.6 2011/09/22 15:16:26 ryoon Exp $ 1$NetBSD: distinfo,v 1.7 2011/09/27 12:43:20 ryoon Exp $
2 2
3SHA1 (cvs-1.11.23.tar.bz2) = a51c531eebaff2dfdcc0fb6d94c8c6e509e06d7d 3SHA1 (cvs-1.11.23.tar.bz2) = a51c531eebaff2dfdcc0fb6d94c8c6e509e06d7d
4RMD160 (cvs-1.11.23.tar.bz2) = ff8c5c6777f1c12ee9134a3cf59e00c2ebaad279 4RMD160 (cvs-1.11.23.tar.bz2) = ff8c5c6777f1c12ee9134a3cf59e00c2ebaad279
5Size (cvs-1.11.23.tar.bz2) = 2942652 bytes 5Size (cvs-1.11.23.tar.bz2) = 2942652 bytes
6SHA1 (patch-aa) = 948f78730d1e7755371838e7915d2706def3b539 6SHA1 (patch-aa) = 948f78730d1e7755371838e7915d2706def3b539
7SHA1 (patch-ab) = 2864d35dfcdea456537d296a8efb4ade006913cf 7SHA1 (patch-ab) = 2864d35dfcdea456537d296a8efb4ade006913cf
8SHA1 (patch-ac) = 6a93eec69346691e7a442407a906aac30c7c3341 8SHA1 (patch-ac) = 6a93eec69346691e7a442407a906aac30c7c3341
9SHA1 (patch-ad) = 984dc49845ee6d43dead1c54ae1f8371844fa6eb 9SHA1 (patch-ad) = 984dc49845ee6d43dead1c54ae1f8371844fa6eb
10SHA1 (patch-ae) = 0e763fe3f62714f094a35482f5e99477adf83784 10SHA1 (patch-ae) = 0e763fe3f62714f094a35482f5e99477adf83784
11SHA1 (patch-af) = 1ea3769fc5c93ad2c8126aea5c68b98c5174e36b 11SHA1 (patch-af) = 1ea3769fc5c93ad2c8126aea5c68b98c5174e36b
12SHA1 (patch-ag) = 7821cee0571c9fb5a35b92bfdb7f65a86f8ce87d 12SHA1 (patch-ag) = 7821cee0571c9fb5a35b92bfdb7f65a86f8ce87d
13SHA1 (patch-ah) = 6153bc9bd46ef7632afb2665e2c21a21baa50556 13SHA1 (patch-ah) = 6153bc9bd46ef7632afb2665e2c21a21baa50556
14SHA1 (patch-ai) = d34d353860bffe774fcae87f8f93b4e125d78ccd 14SHA1 (patch-ai) = d34d353860bffe774fcae87f8f93b4e125d78ccd
@@ -16,16 +16,18 @@ SHA1 (patch-ak) = 471c3a057263e94e372811 @@ -16,16 +16,18 @@ SHA1 (patch-ak) = 471c3a057263e94e372811
16SHA1 (patch-al) = 36429c9a80bee21cc797ceb49e1a15caae925c3c 16SHA1 (patch-al) = 36429c9a80bee21cc797ceb49e1a15caae925c3c
17SHA1 (patch-am) = 35df79307083caf3c77fcc58144cd4b34ee18db0 17SHA1 (patch-am) = 35df79307083caf3c77fcc58144cd4b34ee18db0
18SHA1 (patch-an) = 2e927f99e27d09e3e9ab8aacce93e251862e436e 18SHA1 (patch-an) = 2e927f99e27d09e3e9ab8aacce93e251862e436e
19SHA1 (patch-ao) = 70f8db86bafeb1102c634e11046c1823ac78eefd 19SHA1 (patch-ao) = 70f8db86bafeb1102c634e11046c1823ac78eefd
20SHA1 (patch-ap) = 2b8892118b768f677071194494d6bb0a0e8925d0 20SHA1 (patch-ap) = 2b8892118b768f677071194494d6bb0a0e8925d0
21SHA1 (patch-aq) = add508a6cf8dd6aea8137f74da13576996c4f49d 21SHA1 (patch-aq) = add508a6cf8dd6aea8137f74da13576996c4f49d
22SHA1 (patch-ar) = 7d71ba10285ccaa58b0a2c55a21bd8716fa58ad5 22SHA1 (patch-ar) = 7d71ba10285ccaa58b0a2c55a21bd8716fa58ad5
23SHA1 (patch-at) = 1f77fd66babb386d6cbddc6cb34074f7ac7f07bb 23SHA1 (patch-at) = 1f77fd66babb386d6cbddc6cb34074f7ac7f07bb
24SHA1 (patch-au) = 137b12b879522ce64ecd506a8fbe8d344ef72d52 24SHA1 (patch-au) = 137b12b879522ce64ecd506a8fbe8d344ef72d52
25SHA1 (patch-av) = f638f5bf5489c35c493885af5f7dfd7708660199 25SHA1 (patch-av) = f638f5bf5489c35c493885af5f7dfd7708660199
26SHA1 (patch-ay) = ec49abaa286e6be440a0efd910cf26c86835fe20 26SHA1 (patch-ay) = ec49abaa286e6be440a0efd910cf26c86835fe20
27SHA1 (patch-az) = 8000247fb946b4ac07261b1dedae4581a29476d7 27SHA1 (patch-az) = 8000247fb946b4ac07261b1dedae4581a29476d7
28SHA1 (patch-ba) = 7153e12e5da86effd4285e147f9f534011982e07 28SHA1 (patch-ba) = 7153e12e5da86effd4285e147f9f534011982e07
29SHA1 (patch-lib_getline.c) = 2b21ebe8a9601723a12dfc18f124ed333c93b90b 29SHA1 (patch-config.h.in) = 5a9ba2d2ec2eac8e1a1b4480d5ebe62d72987559
30SHA1 (patch-lib_getline.h) = b1d41a81f63b5dea6dd5754de1dd898ae0d85fcc 30SHA1 (patch-configure) = a264244219f583e072a3ec7c04945eb3b8cc5221
 31SHA1 (patch-lib_getline.c) = e1bb8ac852abd8a25ea3b84455d09e1b4ba728e5
 32SHA1 (patch-lib_getline.h) = 1d91f3f22e4e5aad9f8941f88855d4f41ba25dfe
31SHA1 (patch-lib_xsize.h) = d16bd33322fb7e3750f425d5ea58fbc3413b910b 33SHA1 (patch-lib_xsize.h) = d16bd33322fb7e3750f425d5ea58fbc3413b910b
File Added: pkgsrc/devel/scmcvs/patches/Attic/patch-config.h.in
$NetBSD: patch-config.h.in,v 1.1 2011/09/27 12:43:21 ryoon Exp $

--- config.h.in.orig	2008-05-07 20:13:06.000000000 +0000
+++ config.h.in
@@ -115,6 +115,9 @@
 /* Define to 1 if you have the `gethostname' function. */
 #undef HAVE_GETHOSTNAME
 
+/* Define to 1 if you have the `getline' function. */
+#undef HAVE_GETLINE
+
 /* Define to 1 if you have the `getopt' function. */
 #undef HAVE_GETOPT
File Added: pkgsrc/devel/scmcvs/patches/Attic/patch-configure
$NetBSD: patch-configure,v 1.1 2011/09/27 12:43:21 ryoon Exp $

--- configure.orig	2008-05-07 20:12:30.000000000 +0000
+++ configure
@@ -8098,6 +8098,7 @@ for ac_func in \
 	ftime \
 	geteuid \
 	getgroups \
+	getline \
 	getopt \
 	getpagesize \
 	getpid \
cvs diff -r1.1 -r1.2 pkgsrc/devel/scmcvs/patches/Attic/patch-lib_getline.c (expand / switch to unified diff)

--- pkgsrc/devel/scmcvs/patches/Attic/patch-lib_getline.c 2011/09/22 15:16:26 1.1
+++ pkgsrc/devel/scmcvs/patches/Attic/patch-lib_getline.c 2011/09/27 12:43:21 1.2
@@ -1,15 +1,22 @@ @@ -1,15 +1,22 @@
1$NetBSD: patch-lib_getline.c,v 1.1 2011/09/22 15:16:26 ryoon Exp $ 1$NetBSD: patch-lib_getline.c,v 1.2 2011/09/27 12:43:21 ryoon Exp $
2 2
3* Avoid getline conflict 3* Avoid getline conflict
4 4
5--- lib/getline.c.orig 2005-04-04 20:46:05.000000000 +0000 5--- lib/getline.c.orig 2005-04-04 20:46:05.000000000 +0000
6+++ lib/getline.c 6+++ lib/getline.c
7@@ -155,7 +155,7 @@ getstr (lineptr, n, stream, terminator,  7@@ -154,6 +154,7 @@ getstr (lineptr, n, stream, terminator,
 8 return ret;
8 } 9 }
9  10
 11+#ifndef HAVE_GETLINE
10 int 12 int
11-getline (lineptr, n, stream) 13 getline (lineptr, n, stream)
12+getline_cvs (lineptr, n, stream) 
13 char **lineptr; 14 char **lineptr;
14 size_t *n; 15@@ -162,6 +163,7 @@ getline (lineptr, n, stream)
15 FILE *stream; 16 {
 17 return getstr (lineptr, n, stream, '\n', 0, GETLINE_NO_LIMIT);
 18 }
 19+#endif
 20
 21 int
 22 getline_safe (lineptr, n, stream, limit)
cvs diff -r1.1 -r1.2 pkgsrc/devel/scmcvs/patches/Attic/patch-lib_getline.h (expand / switch to unified diff)

--- pkgsrc/devel/scmcvs/patches/Attic/patch-lib_getline.h 2011/09/22 15:16:26 1.1
+++ pkgsrc/devel/scmcvs/patches/Attic/patch-lib_getline.h 2011/09/27 12:43:21 1.2
@@ -1,15 +1,17 @@ @@ -1,15 +1,17 @@
1$NetBSD: patch-lib_getline.h,v 1.1 2011/09/22 15:16:26 ryoon Exp $ 1$NetBSD: patch-lib_getline.h,v 1.2 2011/09/27 12:43:21 ryoon Exp $
2 2
3* Avoid getline conflict 3* Avoid getline conflict
4 4
5--- lib/getline.h.orig 2005-04-04 20:46:05.000000000 +0000 5--- lib/getline.h.orig 2005-04-04 20:46:05.000000000 +0000
6+++ lib/getline.h 6+++ lib/getline.h
7@@ -12,7 +12,7 @@ 7@@ -11,8 +11,10 @@
 8
8 #define GETLINE_NO_LIMIT -1 9 #define GETLINE_NO_LIMIT -1
9  10
 11+#ifndef HAVE_GETLINE
10 int 12 int
11- getline __PROTO ((char **_lineptr, size_t *_n, FILE *_stream)); 13 getline __PROTO ((char **_lineptr, size_t *_n, FILE *_stream));
12+ getline_cvs __PROTO ((char **_lineptr, size_t *_n, FILE *_stream)); 14+#endif
13 int 15 int
14 getline_safe __PROTO ((char **_lineptr, size_t *_n, FILE *_stream, 16 getline_safe __PROTO ((char **_lineptr, size_t *_n, FILE *_stream,
15 int limit)); 17 int limit));