summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordholland <dholland@pkgsrc.org>2011-10-01 12:08:55 +0000
committerdholland <dholland@pkgsrc.org>2011-10-01 12:08:55 +0000
commitb65061febf74554b69b6b745b0ebadbdb4c3883c (patch)
tree0ac166458bb2fea45fbaa4f37d4066d9a11e1880
parent1b190b21c5902274d6dea47b0e697933df7f0356 (diff)
downloadpkgsrc-b65061febf74554b69b6b745b0ebadbdb4c3883c.tar.gz
patch getline to avoid conflict with new standard getline
-rw-r--r--textproc/uni2ascii/distinfo3
-rw-r--r--textproc/uni2ascii/patches/patch-ascii2uni_c25
2 files changed, 27 insertions, 1 deletions
diff --git a/textproc/uni2ascii/distinfo b/textproc/uni2ascii/distinfo
index 00d4a7e5b44..4495b52dd51 100644
--- a/textproc/uni2ascii/distinfo
+++ b/textproc/uni2ascii/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.1.1.1 2010/05/17 22:27:26 morr Exp $
+$NetBSD: distinfo,v 1.2 2011/10/01 12:08:55 dholland Exp $
SHA1 (uni2ascii-4.14.tar.bz2) = efe31a88499544f60a19994556e6bdea0e0f95be
RMD160 (uni2ascii-4.14.tar.bz2) = fdd9cdd79c05d82ddfece91c384852aea5f79f0b
Size (uni2ascii-4.14.tar.bz2) = 120087 bytes
+SHA1 (patch-ascii2uni_c) = fea75b8677d335709039b55fe1d79049f181b88e
diff --git a/textproc/uni2ascii/patches/patch-ascii2uni_c b/textproc/uni2ascii/patches/patch-ascii2uni_c
new file mode 100644
index 00000000000..af67d41a18e
--- /dev/null
+++ b/textproc/uni2ascii/patches/patch-ascii2uni_c
@@ -0,0 +1,25 @@
+$NetBSD: patch-ascii2uni_c,v 1.1 2011/10/01 12:08:55 dholland Exp $
+
+avoid conflict with new posix getline (usage may be compatible, might
+be worth checking sometime)
+
+--- ascii2uni.c~ 2009-08-05 03:08:52.000000000 +0000
++++ ascii2uni.c
+@@ -463,7 +463,7 @@ int main (int ac, char *av[])
+ fprintf(stderr,"Failed to allocate buffer for input line.\n");
+ exit(2);
+ }
+- while ((read = getline(&lbuf, &len, infp)) != -1) {
++ while ((read = get_line(&lbuf, &len, infp)) != -1) {
+ AddNewlineP = 1;
+ LineNo++;
+ last = read - 1;
+@@ -848,7 +848,7 @@ getstr (lineptr, n, stream, terminator,
+ }
+
+ int
+-getline (lineptr, n, stream)
++get_line (lineptr, n, stream)
+ char **lineptr;
+ size_t *n;
+ FILE *stream;