Make this package build with gcc-4.

5 files changed, 52 insertions, 9 deletions

diff --git a/audio/mpegaudio/distinfo b/audio/mpegaudio/distinfo
index 9037ffe4d70..52a5126fe4b 100644
--- a/audio/mpegaudio/distinfo
+++ b/audio/mpegaudio/distinfo
@@ -1,9 +1,11 @@
-$NetBSD: distinfo,v 1.2 2005/02/23 20:39:49 agc Exp $
+$NetBSD: distinfo,v 1.3 2006/06/09 15:08:08 minskim Exp $
 
 SHA1 (mpegaudio.tar.Z) = 75a801c4aff290b4e0c7cdb2b07991c630955fbf
 RMD160 (mpegaudio.tar.Z) = 3e40fa6629e0bb88046ac882bbfcc263925f7006
 Size (mpegaudio.tar.Z) = 144707 bytes
 SHA1 (patch-aa) = 7b61fd9effe57086d2d2f669fd5b5235a8854e03
 SHA1 (patch-ab) = 67758b144d384aea66509e508e79112a052b8369
-SHA1 (patch-ac) = f6d43ceaf9640289c6cdf0ff8db6f2ca9bc02ca1
-SHA1 (patch-ad) = 1fb96e8132ae322f377184f119a0e519dee9f21d
+SHA1 (patch-ac) = 389d7973e317362d5927be96ab3222f011410b40
+SHA1 (patch-ad) = f81fb4c7557d9fe96d9164c0df4367389df6b2e4
+SHA1 (patch-ae) = 65bc956b1cc3a97ca3569c3943760d41b63f10e8
+SHA1 (patch-af) = f9dda45daeb250734178fc8c4626c0112d5fefbd
diff --git a/audio/mpegaudio/patches/patch-ac b/audio/mpegaudio/patches/patch-ac
index 47c96cb5f32..fa690cb02b7 100644
--- a/audio/mpegaudio/patches/patch-ac
+++ b/audio/mpegaudio/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.1.1.1 2002/05/12 00:54:04 wiz Exp $
+$NetBSD: patch-ac,v 1.2 2006/06/09 15:08:08 minskim Exp $
 
---- musicin.c.orig	Wed Jan  5 02:13:44 1994
+--- musicin.c.orig	1994-01-05 01:13:44.000000000 +0000
 +++ musicin.c
-@@ -101,6 +101,8 @@
+@@ -101,12 +101,16 @@ musicin.c
  #include "common.h"
  #include "encoder.h"
  
@@ -11,3 +11,11 @@ $NetBSD: patch-ac,v 1.1.1.1 2002/05/12 00:54:04 wiz Exp $
  /* Global variable definitions for "musicin.c" */
  
  FILE               *musicin;
+ Bit_stream_struc   bs;
+ char               *programName;
+ 
++static void usage();
++
+ /* Implementations */
+ 
+ /************************************************************************
diff --git a/audio/mpegaudio/patches/patch-ad b/audio/mpegaudio/patches/patch-ad
index 06caa7a3fd9..2c0cdedce63 100644
--- a/audio/mpegaudio/patches/patch-ad
+++ b/audio/mpegaudio/patches/patch-ad
@@ -1,13 +1,15 @@
-$NetBSD: patch-ad,v 1.1.1.1 2002/05/12 00:54:04 wiz Exp $
+$NetBSD: patch-ad,v 1.2 2006/06/09 15:08:08 minskim Exp $
 
---- musicout.c.orig	Wed Jan  5 05:39:27 1994
+--- musicout.c.orig	1994-01-05 04:39:27.000000000 +0000
 +++ musicout.c
-@@ -58,6 +58,8 @@
+@@ -58,6 +58,10 @@ musicout.c
  #include        "common.h"
  #include        "decoder.h"
  
 +#include <stdlib.h>
 +
++static void usage();
++
  /********************************************************************
  /*
  /*        This part contains the MPEG I decoder for Layers I & II.
diff --git a/audio/mpegaudio/patches/patch-ae b/audio/mpegaudio/patches/patch-ae
new file mode 100644
index 00000000000..697e18d181e
--- /dev/null
+++ b/audio/mpegaudio/patches/patch-ae
@@ -0,0 +1,12 @@
+$NetBSD: patch-ae,v 1.1 2006/06/09 15:08:08 minskim Exp $
+
+--- encoder.h.orig	1994-01-05 01:13:26.000000000 +0000
++++ encoder.h
+@@ -150,7 +150,6 @@ extern void   parse_args(int, char**, fr
+                            char[MAX_NAME_SIZE], char[MAX_NAME_SIZE]);
+ extern void   print_config(frame_params*, int*, unsigned long*,
+                            char[MAX_NAME_SIZE], char[MAX_NAME_SIZE]);
+-extern void   usage(void);
+ extern void   aiff_check(char*, IFF_AIFF*);
+ #else
+ extern void   obtain_parameters();
diff --git a/audio/mpegaudio/patches/patch-af b/audio/mpegaudio/patches/patch-af
new file mode 100644
index 00000000000..848c23a4b06
--- /dev/null
+++ b/audio/mpegaudio/patches/patch-af
@@ -0,0 +1,19 @@
+$NetBSD: patch-af,v 1.1 2006/06/09 15:08:08 minskim Exp $
+
+--- decoder.h.orig	1994-01-05 01:12:50.000000000 +0000
++++ decoder.h
+@@ -92,14 +92,6 @@ decoder.h
+ *
+ ***********************************************************************/
+ 
+-/* The following functions are in the file "musicout.c" */
+-
+-#ifdef   PROTO_ARGS
+-extern void   usage(void);
+-#else
+-extern void   usage();
+-#endif
+-
+ /* The following functions are in the file "decode.c" */
+ 
+ #ifdef   PROTO_ARGS