fix getline(3) conflicts, "getline" -> "cmp3_getline"

4 files changed, 66 insertions, 6 deletions

diff --git a/audio/cmp3/distinfo b/audio/cmp3/distinfo
index 074687e09f7..d618f02fd69 100644
--- a/audio/cmp3/distinfo
+++ b/audio/cmp3/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2007/02/16 14:54:16 joerg Exp $
+$NetBSD: distinfo,v 1.8 2010/10/24 11:28:42 plunky Exp $
 
 SHA1 (cmp3-2.0pre6.tar.gz) = 5c1454117be282cf673de7a701f8d08f6224d2f8
 RMD160 (cmp3-2.0pre6.tar.gz) = c7d5f774c05734e8fca8ec8d536b2843cb99ad80
@@ -8,4 +8,6 @@ SHA1 (patch-ab) = 9a4a87691727a2ee4b63961415d137da08502edb
 SHA1 (patch-ac) = 03a9b0660a6167dd2b8ef3c58f16ec0c95a9921a
 SHA1 (patch-ad) = a50d87140e557eb3bef1a5d68ad3e18bba73e03e
 SHA1 (patch-ae) = 4ddb74587d34dc2698c2a49ca7c476b5b90540d9
-SHA1 (patch-af) = f15c60207248248f5cb7efa4c046cd246e247018
+SHA1 (patch-af) = 7e86121df7b5145a9dc8b62f4905c5dae24caea3
+SHA1 (patch-ag) = 820e507fca1519399e541e9621ae2ad7575b8e25
+SHA1 (patch-ah) = 0ade664826997324bc42875748a0abf9b84bbb9f
diff --git a/audio/cmp3/patches/patch-af b/audio/cmp3/patches/patch-af
index fc6bbdd3df7..91b9f9d4c54 100644
--- a/audio/cmp3/patches/patch-af
+++ b/audio/cmp3/patches/patch-af
@@ -1,6 +1,6 @@
-$NetBSD: patch-af,v 1.1 2004/01/02 16:17:40 cjep Exp $
---- cmp3listfiles.c.orig	2000-03-17 00:06:25.000000000 +0000
-+++ cmp3listfiles.c	2004-01-02 16:12:02.000000000 +0000
+$NetBSD: patch-af,v 1.2 2010/10/24 11:28:42 plunky Exp $
+--- cmp3listfiles.c.orig	2001-06-13 20:13:16.000000000 +0000
++++ cmp3listfiles.c
 @@ -7,7 +7,7 @@
  #include <stdio.h>
  #include <string.h>
@@ -10,7 +10,25 @@ $NetBSD: patch-af,v 1.1 2004/01/02 16:17:40 cjep Exp $
  
  typedef struct {
      char dirLetter;
-@@ -269,15 +269,14 @@
+@@ -121,7 +121,7 @@ void readm3u(FILE *infile)
+ {
+     char buffer[MAX_FULL];
+     
+-    while (getline(buffer, MAX_FULL, infile) == 1) {
++    while (cmp3_getline(buffer, MAX_FULL, infile) == 1) {
+         if (buffer[0] == '#')
+             continue;
+         if (doConversions(buffer) == 1)
+@@ -134,7 +134,7 @@ void readpls(FILE *infile)
+     char buffer[MAX_FULL],
+          *filename;
+     
+-    while (getline(buffer, MAX_FULL, infile) == 1) {
++    while (cmp3_getline(buffer, MAX_FULL, infile) == 1) {
+         if ((buffer[0] == '[') || (buffer[0] == '#'))
+             continue;
+         if (!Strncmp(buffer, "file", 4)) {
+@@ -269,15 +269,14 @@ void writelist(char *filepath)
      if (outfile == NULL)
  /*         XXX - alert person */
          return;
diff --git a/audio/cmp3/patches/patch-ag b/audio/cmp3/patches/patch-ag
new file mode 100644
index 00000000000..a04e11ede4e
--- /dev/null
+++ b/audio/cmp3/patches/patch-ag
@@ -0,0 +1,20 @@
+$NetBSD: patch-ag,v 1.1 2010/10/24 11:28:42 plunky Exp $
+
+--- cmp3common.c.orig	2001-06-13 20:13:13.000000000 +0000
++++ cmp3common.c
+@@ -102,7 +102,7 @@ int Strncmp(const char *str1,    /* Firs
+     return(i);
+ }
+ 
+-int getline(char *var,         /* Buffer to copy line into */
++int cmp3_getline(char *var,         /* Buffer to copy line into */
+             int  maxbuf,       /* MAX to send to fgets */
+             FILE *input        /* File descriptor to get line from */)
+ {
+@@ -142,4 +142,4 @@ void *Malloc(size_t size)
+ }
+ 
+ 
+-/* EOF */
+\ No newline at end of file
++/* EOF */
diff --git a/audio/cmp3/patches/patch-ah b/audio/cmp3/patches/patch-ah
new file mode 100644
index 00000000000..a59fb3e11ea
--- /dev/null
+++ b/audio/cmp3/patches/patch-ah
@@ -0,0 +1,20 @@
+$NetBSD: patch-ah,v 1.1 2010/10/24 11:28:42 plunky Exp $
+
+--- cmp3funcs.h.orig	2001-06-13 20:13:27.000000000 +0000
++++ cmp3funcs.h
+@@ -64,7 +64,7 @@ extern Sigfunc *Signal(int signo, Sigfun
+ extern char *Strdup(const char *string);
+ extern int Strcmp(const char *str1, const char *str2);
+ extern int Strncmp(const char *str1, const char *str2, int num);
+-extern int getline(char *var, int  maxbuf, FILE *input);
++extern int cmp3_getline(char *var, int  maxbuf, FILE *input);
+ 
+ extern void *Malloc(size_t size);
+ 
+@@ -86,4 +86,4 @@ extern void voldown();
+ /* cmp3id3.c */
+ extern int readid3(id3info_t *songinfo, char *songfilename);
+ 
+-/* EOF */
+\ No newline at end of file
++/* EOF */