Fix getline conflict.

6 files changed, 87 insertions, 1 deletions

diff --git a/print/abc2ps/distinfo b/print/abc2ps/distinfo
index f7ba160a374..19d21307074 100644
--- a/print/abc2ps/distinfo
+++ b/print/abc2ps/distinfo
@@ -1,6 +1,11 @@
-$NetBSD: distinfo,v 1.1.1.1 2006/04/01 14:32:48 ben Exp $
+$NetBSD: distinfo,v 1.2 2011/08/02 17:04:34 joerg Exp $
 
 SHA1 (ABC2PS-1.3.3.tar.Z) = 0596e3c1c357767407d984b33103549b70009d93
 RMD160 (ABC2PS-1.3.3.tar.Z) = bd73aee0443e34e95377b6f3b036e3f83cd63b1c
 Size (ABC2PS-1.3.3.tar.Z) = 186611 bytes
 SHA1 (patch-aa) = 8f128d6ea0ef91cbe67126febf1d7959e63604f7
+SHA1 (patch-ab) = f64532dea945682960d2809257c6809158674165
+SHA1 (patch-ac) = edbdbb2d2030b929182a4f55be82ba3226eb2163
+SHA1 (patch-ad) = 478d0cdeb099d2b5658a89e9bb217d48a657d187
+SHA1 (patch-ae) = f2f26a07ef48039a73460c31cb7ddfba1010990c
+SHA1 (patch-af) = 844f8bc5049c2f2c7b5b49f0cdddb574062237e1
diff --git a/print/abc2ps/patches/patch-ab b/print/abc2ps/patches/patch-ab
new file mode 100644
index 00000000000..15c87e0f0f7
--- /dev/null
+++ b/print/abc2ps/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.1 2011/08/02 17:04:34 joerg Exp $
+
+--- abc2ps.c.orig	2011-08-02 14:08:15.000000000 +0000
++++ abc2ps.c
+@@ -649,7 +649,7 @@ char *argv[];
+       printf ("\nSelect tunes: ");
+ /*|   gets (aaa); |*/
+ /*|   fgets (aaa, sizeof(aaa), stdin); |*/
+-      getline(aaa,500,stdin);
++      my_getline(aaa,500,stdin);
+       if (isblank(aaa)) break;
+       sscanf(aaa,"%s",ccc);
+       if (ccc[0]=='?') {
diff --git a/print/abc2ps/patches/patch-ac b/print/abc2ps/patches/patch-ac
new file mode 100644
index 00000000000..2d777dcc3a9
--- /dev/null
+++ b/print/abc2ps/patches/patch-ac
@@ -0,0 +1,20 @@
+$NetBSD: patch-ac,v 1.1 2011/08/02 17:04:34 joerg Exp $
+
+--- format.h.orig	2011-08-02 14:08:18.000000000 +0000
++++ format.h
+@@ -474,13 +474,13 @@ struct FORMAT *f;
+   if (vb>=4) printf ("Reading format file %s:\n", fname);
+   printf ("%s .. ", fname);
+   strcpy (line, "");
+-  getline(line, BSIZE, fp);
++  my_getline(line, BSIZE, fp);
+   for (i=0;i<200;i++) {
+     end=interpret_format_line (line,f);
+     if (end==1) return 1;
+     strcpy (line, "");
+     if (feof(fp)) return 1;
+-    if (!getline(line, BSIZE, fp)) return 1 ;
++    if (!my_getline(line, BSIZE, fp)) return 1 ;
+   }
+   fclose (fp);
+   return 1;
diff --git a/print/abc2ps/patches/patch-ad b/print/abc2ps/patches/patch-ad
new file mode 100644
index 00000000000..874fc8f0903
--- /dev/null
+++ b/print/abc2ps/patches/patch-ad
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.1 2011/08/02 17:04:34 joerg Exp $
+
+--- music.h.orig	2011-08-02 14:08:20.000000000 +0000
++++ music.h
+@@ -4126,7 +4126,7 @@ int  job;
+   for (i=0;i<100;i++) {
+     if (feof(fpin)) rx("EOF reached scanning text block","");
+     strcpy (ln, "");
+-    getline(ln, BSIZE, fpin);
++    my_getline(ln, BSIZE, fpin);
+     ll=strlen(ln);
+     linenum++;
+     if ((verbose>=5) || (vb>=10) ) printf ("%3d  %s \n", linenum, ln);
diff --git a/print/abc2ps/patches/patch-ae b/print/abc2ps/patches/patch-ae
new file mode 100644
index 00000000000..e466d487c0e
--- /dev/null
+++ b/print/abc2ps/patches/patch-ae
@@ -0,0 +1,13 @@
+$NetBSD: patch-ae,v 1.1 2011/08/02 17:04:34 joerg Exp $
+
+--- parse.h.orig	2011-08-02 14:08:23.000000000 +0000
++++ parse.h
+@@ -2325,7 +2325,7 @@ char ln[];
+   strcpy (ln, "");
+   if (feof(fp)) return 0;
+ 
+-  getline(ln, BSIZE, fp);
++  my_getline(ln, BSIZE, fp);
+ /*|   fgets(ln, BSIZE, fp); |*/
+   linenum++;
+   l=strlen(ln);
diff --git a/print/abc2ps/patches/patch-af b/print/abc2ps/patches/patch-af
new file mode 100644
index 00000000000..6e4ed8b8cd0
--- /dev/null
+++ b/print/abc2ps/patches/patch-af
@@ -0,0 +1,22 @@
+$NetBSD: patch-af,v 1.1 2011/08/02 17:04:34 joerg Exp $
+
+--- util.h.orig	2011-08-02 14:08:26.000000000 +0000
++++ util.h
+@@ -70,7 +70,7 @@ float x1,x2;
+ }
+ 
+ 
+-/* ----- getline ----- */
++/* ----- my_getline ----- */
+ /*
+ * Added by jc:
+ * This routine reads a line from fp into  buf,  and  trims  away  any
+@@ -78,7 +78,7 @@ float x1,x2;
+ * returns true for CR, so this routine should work even if the  input
+ * came from a DOS system.
+ */
+-char * getline(buf,len,fp)
++char * my_getline(buf,len,fp)
+ 	char* buf;
+ 	int   len;
+ 	FILE* fp;