Rename log to avoid conflicting with the system function.

8 files changed, 88 insertions, 8 deletions

diff --git a/audio/mp3asm/distinfo b/audio/mp3asm/distinfo
index dda5fde9326..07389e1239f 100644
--- a/audio/mp3asm/distinfo
+++ b/audio/mp3asm/distinfo
@@ -1,7 +1,12 @@
-$NetBSD: distinfo,v 1.4 2005/02/23 20:39:49 agc Exp $
+$NetBSD: distinfo,v 1.5 2012/08/10 18:01:48 joerg Exp $
 
 SHA1 (mp3asm-0.1.3-1.tar.bz2) = 78d70be0a05f4357175a094d39f88ef74e5ccbfc
 RMD160 (mp3asm-0.1.3-1.tar.bz2) = 6f3be47630afd324d4eacf01b71a1d50d541b44d
 Size (mp3asm-0.1.3-1.tar.bz2) = 46530 bytes
-SHA1 (patch-aa) = 3e4f9ca6f746b5664d77b2342dc9b787e601af83
-SHA1 (patch-ab) = f397eafdfe95040104ec33ea3065d22ba05af6cf
+SHA1 (patch-aa) = 98be6eddd5c8e1eb3843a3b8662bf3d7a1bdc71a
+SHA1 (patch-ab) = 6abc77e75341bb11cbc3ab7fc84d56daf74b5d4c
+SHA1 (patch-src_frame.c) = c7501595e148b65874befa24e72449a625cff707
+SHA1 (patch-src_mp3asm.c) = cf8ca39bc8304db00abf05f74da0e35f1c1ab62f
+SHA1 (patch-src_parse.c) = 575d9c22aa4180adb3075e05c79161ea6d1abf2a
+SHA1 (patch-src_stream.c) = 79fcc0a6b6cca51286de8e35c96b4960f27b22ff
+SHA1 (patch-src_tag.c) = 7d59259f4e6fb3f5a8e2053e92ee5db49547c68a
diff --git a/audio/mp3asm/patches/patch-aa b/audio/mp3asm/patches/patch-aa
index 2c9cc6a927c..88b26bbe594 100644
--- a/audio/mp3asm/patches/patch-aa
+++ b/audio/mp3asm/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/04/28 16:51:05 zuntum Exp $
+$NetBSD: patch-aa,v 1.2 2012/08/10 18:01:48 joerg Exp $
 
---- src/mp3asm.h.orig	Tue Mar 20 09:45:48 2001
+--- src/mp3asm.h.orig	2001-03-20 01:45:48.000000000 +0000
 +++ src/mp3asm.h
 @@ -30,7 +30,6 @@
  #include <stdlib.h>
@@ -10,3 +10,12 @@ $NetBSD: patch-aa,v 1.1.1.1 2002/04/28 16:51:05 zuntum Exp $
  #include <ctype.h>
  
  #define LOGBUFSIZE 4096
+@@ -46,7 +45,7 @@ extern int verbosity;
+ extern int quiet;
+ extern int info; /* if set to 1 -> print header info on all files and exit */
+ extern char *me; /* name of the executable */
+-extern logfile_t log; /* file to log to */
++extern logfile_t logfile; /* file to log to */
+ extern int inputs;
+ 
+ #endif /* HAVE_MP3ASM_H */
diff --git a/audio/mp3asm/patches/patch-ab b/audio/mp3asm/patches/patch-ab
index 672970604e8..35131bea0ac 100644
--- a/audio/mp3asm/patches/patch-ab
+++ b/audio/mp3asm/patches/patch-ab
@@ -1,12 +1,14 @@
-$NetBSD: patch-ab,v 1.1.1.1 2002/04/28 16:51:05 zuntum Exp $
+$NetBSD: patch-ab,v 1.2 2012/08/10 18:01:48 joerg Exp $
 
---- src/utils.c.orig	Sat Aug 18 04:44:09 2001
+--- src/utils.c.orig	2001-08-17 20:44:09.000000000 +0000
 +++ src/utils.c
-@@ -25,6 +25,7 @@
+@@ -25,6 +25,9 @@
  #include "utils.h"
  #include <unistd.h>
  #include <stdio.h>
 +#include <errno.h>
++
++#define log logfile
  
  /*
   * tmalloc: mallocs cleanly
diff --git a/audio/mp3asm/patches/patch-src_frame.c b/audio/mp3asm/patches/patch-src_frame.c
new file mode 100644
index 00000000000..0b8dd31172e
--- /dev/null
+++ b/audio/mp3asm/patches/patch-src_frame.c
@@ -0,0 +1,13 @@
+$NetBSD: patch-src_frame.c,v 1.1 2012/08/10 18:01:48 joerg Exp $
+
+--- src/frame.c.orig	2012-08-10 13:07:17.000000000 +0000
++++ src/frame.c
+@@ -60,6 +60,8 @@ extern int print_data (unsigned char *da
+ /* tag.c */
+ extern int write_tag_v1 (stream_t *stream, FILE *file);
+ 
++#define log logfile
++
+ /*
+  * isheader: 
+  *
diff --git a/audio/mp3asm/patches/patch-src_mp3asm.c b/audio/mp3asm/patches/patch-src_mp3asm.c
new file mode 100644
index 00000000000..3332f8f3e9b
--- /dev/null
+++ b/audio/mp3asm/patches/patch-src_mp3asm.c
@@ -0,0 +1,13 @@
+$NetBSD: patch-src_mp3asm.c,v 1.1 2012/08/10 18:01:48 joerg Exp $
+
+--- src/mp3asm.c.orig	2012-08-10 13:07:47.000000000 +0000
++++ src/mp3asm.c
+@@ -25,6 +25,8 @@
+ #include "parse.h"
+ #include "utils.h"
+ 
++#define log logfile
++
+ /* stream.c */
+ 
+ extern stream_t *read_stream (FILE *file);
diff --git a/audio/mp3asm/patches/patch-src_parse.c b/audio/mp3asm/patches/patch-src_parse.c
new file mode 100644
index 00000000000..4d40cadc47b
--- /dev/null
+++ b/audio/mp3asm/patches/patch-src_parse.c
@@ -0,0 +1,13 @@
+$NetBSD: patch-src_parse.c,v 1.1 2012/08/10 18:01:48 joerg Exp $
+
+--- src/parse.c.orig	2012-08-10 13:06:54.000000000 +0000
++++ src/parse.c
+@@ -26,6 +26,8 @@
+ #include "parse.h"
+ #include "utils.h"
+ 
++#define log logfile
++
+ /* mp3asm.c */
+ extern void new_input (void);
+ 
diff --git a/audio/mp3asm/patches/patch-src_stream.c b/audio/mp3asm/patches/patch-src_stream.c
new file mode 100644
index 00000000000..048d221d8ea
--- /dev/null
+++ b/audio/mp3asm/patches/patch-src_stream.c
@@ -0,0 +1,13 @@
+$NetBSD: patch-src_stream.c,v 1.1 2012/08/10 18:01:48 joerg Exp $
+
+--- src/stream.c.orig	2012-08-10 13:07:34.000000000 +0000
++++ src/stream.c
+@@ -26,6 +26,8 @@
+ #include "stream.h"
+ #include "frame.h"
+ 
++#define log logfile
++
+ /* utils.c */
+ 
+ extern void *tmalloc (size_t size);
diff --git a/audio/mp3asm/patches/patch-src_tag.c b/audio/mp3asm/patches/patch-src_tag.c
new file mode 100644
index 00000000000..d054cb593a0
--- /dev/null
+++ b/audio/mp3asm/patches/patch-src_tag.c
@@ -0,0 +1,12 @@
+$NetBSD: patch-src_tag.c,v 1.1 2012/08/10 18:01:49 joerg Exp $
+
+--- src/tag.c.orig	2012-08-10 13:07:07.000000000 +0000
++++ src/tag.c
+@@ -25,6 +25,7 @@
+ #include "utils.h"
+ #include "frame.h"
+ 
++#define log logfile
+ 
+ /* utils.c */
+ extern void *tmalloc (size_t size);