* Fixed patches not to change one file twice

* Rearrenged build target

PR:		15378
Submitted by:	KATO Tsuguru <tkato@prontomail.ne.jp>

15 files changed, 743 insertions, 33 deletions

diff --git a/audio/maplay/Makefile b/audio/maplay/Makefile
index e954b1b5abc8..2e4d65a80ce9 100644
--- a/audio/maplay/Makefile
+++ b/audio/maplay/Makefile
@@ -15,15 +15,9 @@ EXTRACT_SUFX=	.tar.Z
 MAINTAINER=	ports@FreeBSD.org
 
 NO_WRKSUBDIR=	yes
-PATCH_STRIP=	-p2
-
-do-build:
-	@(cd ${WRKSRC}; make pre-install)
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/maplay ${PREFIX}/bin
-
-post-install:
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${PREFIX}/share/doc/maplay
 	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/maplay
diff --git a/audio/maplay/files/patch-ab b/audio/maplay/files/patch-ab
index a2199cbe6f6e..2b8bd0fe7c96 100644
--- a/audio/maplay/files/patch-ab
+++ b/audio/maplay/files/patch-ab
@@ -1,5 +1,5 @@
 *** Makefile.orig	Thu Jun 23 21:14:46 1994
---- Makefile	Thu Nov 25 02:59:22 1999
+--- Makefile	Thu Dec  9 06:09:27 1999
 ***************
 *** 27,33 ****
   #
@@ -18,19 +18,30 @@
   # profiling: -pg (gprof) or -p (prof)
   # strip command has to be removed for debugging or profiling
 ***************
-*** 39,45 ****
+*** 39,52 ****
   
   .SUFFIXES:	.cc
   
 ! install:
   		@./configuration.sh
   
-  all:		maplay
---- 39,45 ----
+- all:		maplay
+- 
+  maplay:		$(OBJS)
+  		$(COMPILER) $(CFLAGS) $(OBJS) -o $@ $(LIBRARIES) -lm
+- 		-strip $@
+  
+  .cc.o:
+  		$(COMPILER) -c $(CFLAGS) $(INCLUDEDIRS) $*.cc -o $@
+--- 39,49 ----
   
   .SUFFIXES:	.cc
   
-! pre-install:
+! all:
   		@./configuration.sh
   
-  all:		maplay
+  maplay:		$(OBJS)
+  		$(COMPILER) $(CFLAGS) $(OBJS) -o $@ $(LIBRARIES) -lm
+  
+  .cc.o:
+  		$(COMPILER) -c $(CFLAGS) $(INCLUDEDIRS) $*.cc -o $@
diff --git a/audio/maplay/files/patch-ac b/audio/maplay/files/patch-ac
index 3a6e29c92ce1..73118abbe703 100644
--- a/audio/maplay/files/patch-ac
+++ b/audio/maplay/files/patch-ac
@@ -1,5 +1,49 @@
-*** obuffer.cc.orig	Thu Jun 23 05:14:36 1994
---- obuffer.cc	Tue Feb 14 04:17:17 1995
+*** obuffer.cc.orig	Thu Jun 23 21:14:36 1994
+--- obuffer.cc	Thu Dec  9 05:10:51 1999
+***************
+*** 217,226 ****
+  int SparcObuffer::audio_fd = -1;
+  
+  #ifdef ULAW
+! SparcObuffer::SparcObuffer (Header *header, bool use_speaker, bool use_headphone, bool use_line_out)
+  #else
+  SparcObuffer::SparcObuffer (uint32 number_of_channels, Header *header,
+! 			    bool use_speaker, bool use_headphone, bool use_line_out)
+  #endif
+  {
+  #ifndef ULAW
+--- 217,226 ----
+  int SparcObuffer::audio_fd = -1;
+  
+  #ifdef ULAW
+! SparcObuffer::SparcObuffer (Header *header, boolean use_speaker, boolean use_headphone, boolean use_line_out)
+  #else
+  SparcObuffer::SparcObuffer (uint32 number_of_channels, Header *header,
+! 			    boolean use_speaker, boolean use_headphone, boolean use_line_out)
+  #endif
+  {
+  #ifndef ULAW
+***************
+*** 406,414 ****
+  
+  
+  #ifdef ULAW
+! bool SparcObuffer::class_suitable (uint32 number_of_channels, bool force_amd)
+  #else
+! bool SparcObuffer::class_suitable (void)
+  #endif
+  {
+  #ifdef ULAW
+--- 406,414 ----
+  
+  
+  #ifdef ULAW
+! boolean SparcObuffer::class_suitable (uint32 number_of_channels, boolean force_amd)
+  #else
+! boolean SparcObuffer::class_suitable (void)
+  #endif
+  {
+  #ifdef ULAW
 ***************
 *** 537,542 ****
 --- 537,543 ----
@@ -20,3 +64,20 @@
     return fd;
   }
   
+***************
+*** 629,635 ****
+  }
+  
+  
+! bool LinuxObuffer::class_suitable (uint32 number_of_channels)
+  {
+    // open the dsp audio device:
+    audio_fd = open_audio_device ();
+--- 631,637 ----
+  }
+  
+  
+! boolean LinuxObuffer::class_suitable (uint32 number_of_channels)
+  {
+    // open the dsp audio device:
+    audio_fd = open_audio_device ();
diff --git a/audio/maplay/files/patch-ad b/audio/maplay/files/patch-ad
index bb62d8b11cce..3829d864a091 100644
--- a/audio/maplay/files/patch-ad
+++ b/audio/maplay/files/patch-ad
@@ -1,19 +1,32 @@
---- configuration.sh.orig	Thu Jun 23 07:14:46 1994
-+++ configuration.sh	Thu Nov 25 02:53:40 1999
-@@ -72,6 +72,16 @@
-      INCLUDEDIRS=
-      LIBRARIES=
-      AUDIO_INCLUDES='#include <sys/audioio.h>' ;;
-+  FreeBSD*)
-+     COMPILER='${CXX}'
-+     if [ `uname -m` = "alpha" ]; then
-+       COMPILERFLAGS='-DLINUX'
-+     else
-+       COMPILERFLAGS='-m486 -DLINUX -DDAMN_INTEL_BYTE_ORDER'
-+     fi
-+     INCLUDEDIRS=
-+     LIBRARIES= 
-+     AUDIO_INCLUDES='#include <machine/soundcard.h>' ;;
-   Linux*)
-      COMPILER=g++
-      COMPILERFLAGS='-O2 -m486 -funroll-loops -DLINUX -DDAMN_INTEL_BYTE_ORDER'
+*** configuration.sh.orig	Thu Jun 23 21:14:46 1994
+--- configuration.sh	Thu Dec  9 05:21:02 1999
+***************
+*** 72,77 ****
+--- 72,87 ----
+       INCLUDEDIRS=
+       LIBRARIES=
+       AUDIO_INCLUDES='#include <sys/audioio.h>' ;;
++   FreeBSD*)
++      COMPILER='${CXX}'
++      if [ ${ARCH} = "i386" ]; then
++        COMPILERFLAGS='-m486 -DLINUX -DDAMN_INTEL_BYTE_ORDER'
++      else
++        COMPILERFLAGS='-DLINUX'
++      fi
++      INCLUDEDIRS=
++      LIBRARIES= 
++      AUDIO_INCLUDES='#include <machine/soundcard.h>' ;;
+    Linux*)
+       COMPILER=g++
+       COMPILERFLAGS='-O2 -m486 -funroll-loops -DLINUX -DDAMN_INTEL_BYTE_ORDER'
+***************
+*** 95,98 ****
+    echo $AUDIO_INCLUDES >audio_includes.h
+  fi
+  
+! make all
+--- 105,108 ----
+    echo $AUDIO_INCLUDES >audio_includes.h
+  fi
+  
+! make maplay
diff --git a/audio/maplay/files/patch-af b/audio/maplay/files/patch-af
new file mode 100644
index 000000000000..342deecaf589
--- /dev/null
+++ b/audio/maplay/files/patch-af
@@ -0,0 +1,61 @@
+*** header.h.orig	Thu Jun 23 21:14:40 1994
+--- header.h	Thu Dec  9 05:45:44 1999
+***************
+*** 39,45 ****
+    e_mode		h_mode;
+    e_sample_frequency	h_sample_frequency;
+    uint32		h_number_of_subbands, h_intensity_stereo_bound;
+!   bool			h_copyright, h_original;
+    Crc16			*crc;
+    uint16		checksum;
+  
+--- 39,45 ----
+    e_mode		h_mode;
+    e_sample_frequency	h_sample_frequency;
+    uint32		h_number_of_subbands, h_intensity_stereo_bound;
+!   boolean			h_copyright, h_original;
+    Crc16			*crc;
+    uint16		checksum;
+  
+***************
+*** 48,54 ****
+  public:
+  			Header (void) { crc = (Crc16 *)0; }
+  		       ~Header (void) { if (crc) delete crc; }
+!   bool			read_header (Ibitstream *, Crc16 **);
+  			// read a 32-bit header from the bitstream
+  
+    // functions to query header contents:
+--- 48,54 ----
+  public:
+  			Header (void) { crc = (Crc16 *)0; }
+  		       ~Header (void) { if (crc) delete crc; }
+!   boolean			read_header (Ibitstream *, Crc16 **);
+  			// read a 32-bit header from the bitstream
+  
+    // functions to query header contents:
+***************
+*** 58,68 ****
+    uint32		frequency (void) { return frequencies[h_sample_frequency]; }
+    static uint32	frequency (e_sample_frequency rate) { return frequencies[rate]; }
+    e_mode		mode (void) { return h_mode; };
+!   bool			checksums (void) { return !h_protection_bit; }
+!   bool			copyright (void) { return h_copyright; }
+!   bool			original (void) { return h_original; }
+  
+!   bool			checksum_ok (void) { return checksum == crc->checksum (); }
+  			// compares computed checksum with stream checksum
+  
+    // functions which return header informations as strings:
+--- 58,68 ----
+    uint32		frequency (void) { return frequencies[h_sample_frequency]; }
+    static uint32	frequency (e_sample_frequency rate) { return frequencies[rate]; }
+    e_mode		mode (void) { return h_mode; };
+!   boolean			checksums (void) { return !h_protection_bit; }
+!   boolean			copyright (void) { return h_copyright; }
+!   boolean			original (void) { return h_original; }
+  
+!   boolean			checksum_ok (void) { return checksum == crc->checksum (); }
+  			// compares computed checksum with stream checksum
+  
+    // functions which return header informations as strings:
diff --git a/audio/maplay/files/patch-ag b/audio/maplay/files/patch-ag
new file mode 100644
index 000000000000..d84cac8d4286
--- /dev/null
+++ b/audio/maplay/files/patch-ag
@@ -0,0 +1,36 @@
+*** ibitstream.cc.orig	Thu Jun 23 21:14:35 1994
+--- ibitstream.cc	Thu Dec  9 05:32:18 1999
+***************
+*** 64,70 ****
+  }
+  
+  
+! bool Ibitstream::get_header (uint32 *headerstring)
+  {
+    int readvalue;
+  
+--- 64,70 ----
+  }
+  
+  
+! boolean Ibitstream::get_header (uint32 *headerstring)
+  {
+    int readvalue;
+  
+***************
+*** 102,108 ****
+  }
+  
+  
+! bool Ibitstream::read_frame (uint32 bytesize)
+  {
+    int readvalue;
+  
+--- 102,108 ----
+  }
+  
+  
+! boolean Ibitstream::read_frame (uint32 bytesize)
+  {
+    int readvalue;
+  
diff --git a/audio/maplay/files/patch-ah b/audio/maplay/files/patch-ah
new file mode 100644
index 000000000000..fb92627bd6e6
--- /dev/null
+++ b/audio/maplay/files/patch-ah
@@ -0,0 +1,25 @@
+*** ibitstream.h.orig	Thu Jun 23 21:14:40 1994
+--- ibitstream.h	Thu Dec  9 05:32:18 1999
+***************
+*** 43,52 ****
+  		~Ibitstream (void);
+    int		filedescriptor (void) { return fd; };
+  
+!   bool		get_header (uint32 *);
+  		// get next 32 bits from bitstream in an unsigned int,
+  		// returned value False => end of stream
+!   bool		read_frame (uint32 bytesize);
+  		// fill buffer with data from bitstream, returned value False => end of stream
+    uint32	get_bits (uint32 number_of_bits);
+  		// read bits (1 <= number_of_bits <= 16) from buffer into the lower bits
+--- 43,52 ----
+  		~Ibitstream (void);
+    int		filedescriptor (void) { return fd; };
+  
+!   boolean		get_header (uint32 *);
+  		// get next 32 bits from bitstream in an unsigned int,
+  		// returned value False => end of stream
+!   boolean		read_frame (uint32 bytesize);
+  		// fill buffer with data from bitstream, returned value False => end of stream
+    uint32	get_bits (uint32 number_of_bits);
+  		// read bits (1 <= number_of_bits <= 16) from buffer into the lower bits
diff --git a/audio/maplay/files/patch-ai b/audio/maplay/files/patch-ai
new file mode 100644
index 000000000000..a8dc5e4b5a2d
--- /dev/null
+++ b/audio/maplay/files/patch-ai
@@ -0,0 +1,72 @@
+*** maplay.cc.orig	Thu Jun 23 21:14:36 1994
+--- maplay.cc	Thu Dec  9 05:32:18 1999
+***************
+*** 54,67 ****
+  
+  // data extracted from commandline arguments:
+  static char *filename;
+! static bool verbose_mode = False, filter_check = False;
+! static bool stdout_mode = False;
+  static enum e_channels which_channels = both;
+! static bool use_speaker = False, use_headphone = False, use_line_out = False;
+  #ifdef ULAW
+! static bool force_amd = False;
+  #endif
+! static bool use_own_scalefactor = False;
+  static real scalefactor;
+  
+  // data extracted from header of first frame:
+--- 54,67 ----
+  
+  // data extracted from commandline arguments:
+  static char *filename;
+! static boolean verbose_mode = False, filter_check = False;
+! static boolean stdout_mode = False;
+  static enum e_channels which_channels = both;
+! static boolean use_speaker = False, use_headphone = False, use_line_out = False;
+  #ifdef ULAW
+! static boolean force_amd = False;
+  #endif
+! static boolean use_own_scalefactor = False;
+  static real scalefactor;
+  
+  // data extracted from header of first frame:
+***************
+*** 93,99 ****
+  main (int argc, char *argv[])
+  {
+    int i;
+!   bool read_ready = False, write_ready = False;
+  
+    if (argc < 2 || !strncmp (argv[1], "-h", 2))
+    {
+--- 93,99 ----
+  main (int argc, char *argv[])
+  {
+    int i;
+!   boolean read_ready = False, write_ready = False;
+  
+    if (argc < 2 || !strncmp (argv[1], "-h", 2))
+    {
+***************
+*** 146,151 ****
+--- 146,154 ----
+  #ifdef Solaris
+  	    "SPARC Solaris 2.x"
+  #else
++ #ifdef __FreeBSD__
++ 	    "FreeBSD"
++ #else
+  #ifdef LINUX
+  	    "Linux"
+  #else
+***************
+*** 153,158 ****
+--- 156,162 ----
+  	    "RISC ULTRIX 4.x"
+  #else
+  	    "unknown"
++ #endif
+  #endif
+  #endif
+  #endif
diff --git a/audio/maplay/files/patch-aj b/audio/maplay/files/patch-aj
new file mode 100644
index 000000000000..f8b919e3fc01
--- /dev/null
+++ b/audio/maplay/files/patch-aj
@@ -0,0 +1,62 @@
+*** obuffer.h.orig	Thu Jun 23 21:14:40 1994
+--- obuffer.h	Thu Dec  9 05:32:18 1999
+***************
+*** 123,142 ****
+  
+  public:
+  #ifdef ULAW
+! 	SparcObuffer (Header *, bool use_speaker, bool use_headphone, bool use_line_out);
+  #else
+  	SparcObuffer (uint32 number_of_channels, Header *,
+!  		      bool use_speaker, bool use_headphone, bool use_line_out);
+  #endif
+         ~SparcObuffer (void);
+    void	append (uint32 channel, int16 value);
+    void	write_buffer (int dummy);
+  
+  #ifdef ULAW
+!   static bool class_suitable (uint32 number_of_channels, bool force_amd);
+  	// returnvalue == False: no u-law output possible (class unsuitable)
+  #else
+!   static bool class_suitable (void);
+  	// returnvalue == False: no 16-bit output possible (class unsuitable)
+  #endif
+  };
+--- 123,142 ----
+  
+  public:
+  #ifdef ULAW
+! 	SparcObuffer (Header *, boolean use_speaker, boolean use_headphone, boolean use_line_out);
+  #else
+  	SparcObuffer (uint32 number_of_channels, Header *,
+!  		      boolean use_speaker, boolean use_headphone, boolean use_line_out);
+  #endif
+         ~SparcObuffer (void);
+    void	append (uint32 channel, int16 value);
+    void	write_buffer (int dummy);
+  
+  #ifdef ULAW
+!   static boolean class_suitable (uint32 number_of_channels, boolean force_amd);
+  	// returnvalue == False: no u-law output possible (class unsuitable)
+  #else
+!   static boolean class_suitable (void);
+  	// returnvalue == False: no 16-bit output possible (class unsuitable)
+  #endif
+  };
+***************
+*** 159,165 ****
+    void	append (uint32 channel, int16 value);
+    void	write_buffer (int dummy);
+  
+!   static bool class_suitable (uint32 number_of_channels);
+  };
+  #endif	// LINUX
+  
+--- 159,165 ----
+    void	append (uint32 channel, int16 value);
+    void	write_buffer (int dummy);
+  
+!   static boolean class_suitable (uint32 number_of_channels);
+  };
+  #endif	// LINUX
+  
diff --git a/audio/maplay/files/patch-ak b/audio/maplay/files/patch-ak
new file mode 100644
index 000000000000..cca6875c8c00
--- /dev/null
+++ b/audio/maplay/files/patch-ak
@@ -0,0 +1,21 @@
+*** subband.h.orig	Thu Jun 23 21:14:40 1994
+--- subband.h	Thu Dec  9 05:45:45 1999
+***************
+*** 35,42 ****
+  public:
+    virtual void read_allocation (Ibitstream *, Header *, Crc16 *) = 0;
+    virtual void read_scalefactor (Ibitstream *, Header *) = 0;
+!   virtual bool read_sampledata (Ibitstream *) = 0;
+!   virtual bool put_next_sample (e_channels, SynthesisFilter *, SynthesisFilter *) = 0;
+  };
+  
+  #endif
+--- 35,42 ----
+  public:
+    virtual void read_allocation (Ibitstream *, Header *, Crc16 *) = 0;
+    virtual void read_scalefactor (Ibitstream *, Header *) = 0;
+!   virtual boolean read_sampledata (Ibitstream *) = 0;
+!   virtual boolean put_next_sample (e_channels, SynthesisFilter *, SynthesisFilter *) = 0;
+  };
+  
+  #endif
diff --git a/audio/maplay/files/patch-al b/audio/maplay/files/patch-al
new file mode 100644
index 000000000000..f4920dd7700e
--- /dev/null
+++ b/audio/maplay/files/patch-al
@@ -0,0 +1,91 @@
+*** subband_layer_1.cc.orig	Thu Jun 23 21:14:36 1994
+--- subband_layer_1.cc	Thu Dec  9 05:32:19 1999
+***************
+*** 86,92 ****
+  }
+  
+  
+! bool SubbandLayer1::read_sampledata (Ibitstream *stream)
+  {
+    if (allocation)
+    {
+--- 86,92 ----
+  }
+  
+  
+! boolean SubbandLayer1::read_sampledata (Ibitstream *stream)
+  {
+    if (allocation)
+    {
+***************
+*** 105,111 ****
+  }
+  
+  
+! bool SubbandLayer1::put_next_sample (e_channels channels,
+  				     SynthesisFilter *filter1, SynthesisFilter *)
+  {
+    if (allocation && channels != right)
+--- 105,111 ----
+  }
+  
+  
+! boolean SubbandLayer1::put_next_sample (e_channels channels,
+  				     SynthesisFilter *filter1, SynthesisFilter *)
+  {
+    if (allocation && channels != right)
+***************
+*** 142,148 ****
+  }
+  
+  
+! bool SubbandLayer1IntensityStereo::put_next_sample (e_channels channels,
+  	SynthesisFilter *filter1, SynthesisFilter *filter2)
+  {
+    if (allocation)
+--- 142,148 ----
+  }
+  
+  
+! boolean SubbandLayer1IntensityStereo::put_next_sample (e_channels channels,
+  	SynthesisFilter *filter1, SynthesisFilter *filter2)
+  {
+    if (allocation)
+***************
+*** 231,239 ****
+  }
+  
+  
+! bool SubbandLayer1Stereo::read_sampledata (Ibitstream *stream)
+  {
+!   bool returnvalue = SubbandLayer1::read_sampledata (stream);
+    if (channel2_allocation)
+    {
+      channel2_sample = real (stream->get_bits (channel2_samplelength));
+--- 231,239 ----
+  }
+  
+  
+! boolean SubbandLayer1Stereo::read_sampledata (Ibitstream *stream)
+  {
+!   boolean returnvalue = SubbandLayer1::read_sampledata (stream);
+    if (channel2_allocation)
+    {
+      channel2_sample = real (stream->get_bits (channel2_samplelength));
+***************
+*** 246,252 ****
+  }
+  
+  
+! bool SubbandLayer1Stereo::put_next_sample (e_channels channels,
+  					   SynthesisFilter *filter1, SynthesisFilter *filter2)
+  {
+    SubbandLayer1::put_next_sample (channels, filter1, filter2);
+--- 246,252 ----
+  }
+  
+  
+! boolean SubbandLayer1Stereo::put_next_sample (e_channels channels,
+  					   SynthesisFilter *filter1, SynthesisFilter *filter2)
+  {
+    SubbandLayer1::put_next_sample (channels, filter1, filter2);
diff --git a/audio/maplay/files/patch-am b/audio/maplay/files/patch-am
new file mode 100644
index 000000000000..d92c2f421598
--- /dev/null
+++ b/audio/maplay/files/patch-am
@@ -0,0 +1,65 @@
+*** subband_layer_1.h.orig	Thu Jun 23 21:14:40 1994
+--- subband_layer_1.h	Thu Dec  9 05:32:19 1999
+***************
+*** 42,49 ****
+         SubbandLayer1 (uint32 subbandnumber);
+    void read_allocation (Ibitstream *, Header *, Crc16 *);
+    void read_scalefactor (Ibitstream *, Header *);
+!   bool read_sampledata (Ibitstream *);
+!   bool put_next_sample (e_channels, SynthesisFilter *, SynthesisFilter *);
+  };
+  
+  
+--- 42,49 ----
+         SubbandLayer1 (uint32 subbandnumber);
+    void read_allocation (Ibitstream *, Header *, Crc16 *);
+    void read_scalefactor (Ibitstream *, Header *);
+!   boolean read_sampledata (Ibitstream *);
+!   boolean put_next_sample (e_channels, SynthesisFilter *, SynthesisFilter *);
+  };
+  
+  
+***************
+*** 60,70 ****
+      SubbandLayer1::read_allocation (stream, header, crc);
+    }
+    void read_scalefactor (Ibitstream *, Header *);
+!   bool read_sampledata (Ibitstream *stream)
+    {
+      return SubbandLayer1::read_sampledata (stream);
+    }
+!   bool put_next_sample (e_channels, SynthesisFilter *, SynthesisFilter *);
+  };
+  
+  
+--- 60,70 ----
+      SubbandLayer1::read_allocation (stream, header, crc);
+    }
+    void read_scalefactor (Ibitstream *, Header *);
+!   boolean read_sampledata (Ibitstream *stream)
+    {
+      return SubbandLayer1::read_sampledata (stream);
+    }
+!   boolean put_next_sample (e_channels, SynthesisFilter *, SynthesisFilter *);
+  };
+  
+  
+***************
+*** 82,89 ****
+         SubbandLayer1Stereo (uint32 subbandnumber);
+    void read_allocation (Ibitstream *, Header *, Crc16 *);
+    void read_scalefactor (Ibitstream *, Header *);
+!   bool read_sampledata (Ibitstream *);
+!   bool put_next_sample (e_channels, SynthesisFilter *, SynthesisFilter *);
+  };
+  
+  #endif
+--- 82,89 ----
+         SubbandLayer1Stereo (uint32 subbandnumber);
+    void read_allocation (Ibitstream *, Header *, Crc16 *);
+    void read_scalefactor (Ibitstream *, Header *);
+!   boolean read_sampledata (Ibitstream *);
+!   boolean put_next_sample (e_channels, SynthesisFilter *, SynthesisFilter *);
+  };
+  
+  #endif
diff --git a/audio/maplay/files/patch-an b/audio/maplay/files/patch-an
new file mode 100644
index 000000000000..b30d8ad479a6
--- /dev/null
+++ b/audio/maplay/files/patch-an
@@ -0,0 +1,97 @@
+*** subband_layer_2.cc.orig	Thu Jun 23 21:14:36 1994
+--- subband_layer_2.cc	Thu Dec  9 05:32:19 1999
+***************
+*** 591,597 ****
+  }
+  
+  
+! bool SubbandLayer2::read_sampledata (Ibitstream *stream)
+  {
+    if (allocation)
+      if (groupingtable)
+--- 591,597 ----
+  }
+  
+  
+! boolean SubbandLayer2::read_sampledata (Ibitstream *stream)
+  {
+    if (allocation)
+      if (groupingtable)
+***************
+*** 633,639 ****
+  }
+  
+  
+! bool SubbandLayer2::put_next_sample (e_channels channels,
+  				     SynthesisFilter *filter1, SynthesisFilter *)
+  {
+  #ifdef DEBUG
+--- 633,639 ----
+  }
+  
+  
+! boolean SubbandLayer2::put_next_sample (e_channels channels,
+  				     SynthesisFilter *filter1, SynthesisFilter *)
+  {
+  #ifdef DEBUG
+***************
+*** 726,732 ****
+  }
+  
+  
+! bool SubbandLayer2IntensityStereo::put_next_sample (e_channels channels,
+  	SynthesisFilter *filter1, SynthesisFilter *filter2)
+  {
+  #ifdef DEBUG
+--- 726,732 ----
+  }
+  
+  
+! boolean SubbandLayer2IntensityStereo::put_next_sample (e_channels channels,
+  	SynthesisFilter *filter1, SynthesisFilter *filter2)
+  {
+  #ifdef DEBUG
+***************
+*** 880,888 ****
+  }
+  
+  
+! bool SubbandLayer2Stereo::read_sampledata (Ibitstream *stream)
+  {
+!   bool returnvalue = SubbandLayer2::read_sampledata (stream);
+  
+    if (channel2_allocation)
+      if (channel2_groupingtable)
+--- 880,888 ----
+  }
+  
+  
+! boolean SubbandLayer2Stereo::read_sampledata (Ibitstream *stream)
+  {
+!   boolean returnvalue = SubbandLayer2::read_sampledata (stream);
+  
+    if (channel2_allocation)
+      if (channel2_groupingtable)
+***************
+*** 919,928 ****
+  }
+  
+  
+! bool SubbandLayer2Stereo::put_next_sample (e_channels channels,
+  					   SynthesisFilter *filter1, SynthesisFilter *filter2)
+  {
+!   bool returnvalue = SubbandLayer2::put_next_sample (channels, filter1, filter2);
+    if (channel2_allocation && channels != left)
+    {
+      register real sample = channel2_samples[samplenumber - 1];
+--- 919,928 ----
+  }
+  
+  
+! boolean SubbandLayer2Stereo::put_next_sample (e_channels channels,
+  					   SynthesisFilter *filter1, SynthesisFilter *filter2)
+  {
+!   boolean returnvalue = SubbandLayer2::put_next_sample (channels, filter1, filter2);
+    if (channel2_allocation && channels != left)
+    {
+      register real sample = channel2_samples[samplenumber - 1];
diff --git a/audio/maplay/files/patch-ao b/audio/maplay/files/patch-ao
new file mode 100644
index 000000000000..313ab9b2c1fb
--- /dev/null
+++ b/audio/maplay/files/patch-ao
@@ -0,0 +1,82 @@
+*** subband_layer_2.h.orig	Thu Jun 23 21:14:40 1994
+--- subband_layer_2.h	Thu Dec  9 05:32:19 1999
+***************
+*** 55,62 ****
+    void		read_allocation (Ibitstream *, Header *, Crc16 *);
+    virtual void	read_scalefactor_selection (Ibitstream *, Crc16 *);
+    void		read_scalefactor (Ibitstream *, Header *);
+!   bool		read_sampledata (Ibitstream *);
+!   bool		put_next_sample (e_channels, SynthesisFilter *, SynthesisFilter * = NULL);
+  };
+  
+  
+--- 55,62 ----
+    void		read_allocation (Ibitstream *, Header *, Crc16 *);
+    virtual void	read_scalefactor_selection (Ibitstream *, Crc16 *);
+    void		read_scalefactor (Ibitstream *, Header *);
+!   boolean		read_sampledata (Ibitstream *);
+!   boolean		put_next_sample (e_channels, SynthesisFilter *, SynthesisFilter * = NULL);
+  };
+  
+  
+***************
+*** 75,85 ****
+    }
+    void read_scalefactor_selection (Ibitstream *, Crc16 *);
+    void read_scalefactor (Ibitstream *, Header *);
+!   bool read_sampledata (Ibitstream *stream)
+    {
+      return SubbandLayer2::read_sampledata (stream);
+    }
+!   bool put_next_sample (e_channels, SynthesisFilter *, SynthesisFilter *);
+  };
+  
+  
+--- 75,85 ----
+    }
+    void read_scalefactor_selection (Ibitstream *, Crc16 *);
+    void read_scalefactor (Ibitstream *, Header *);
+!   boolean read_sampledata (Ibitstream *stream)
+    {
+      return SubbandLayer2::read_sampledata (stream);
+    }
+!   boolean put_next_sample (e_channels, SynthesisFilter *, SynthesisFilter *);
+  };
+  
+  
+***************
+*** 90,96 ****
+    uint32 channel2_allocation;
+    uint32 channel2_scfsi;
+    real	 channel2_scalefactor1, channel2_scalefactor2, channel2_scalefactor3;
+!   bool	 channel2_grouping;
+    uint32 channel2_codelength;
+    const real *channel2_groupingtable;
+    real	 channel2_factor;
+--- 90,96 ----
+    uint32 channel2_allocation;
+    uint32 channel2_scfsi;
+    real	 channel2_scalefactor1, channel2_scalefactor2, channel2_scalefactor3;
+!   boolean	 channel2_grouping;
+    uint32 channel2_codelength;
+    const real *channel2_groupingtable;
+    real	 channel2_factor;
+***************
+*** 102,109 ****
+    void read_allocation (Ibitstream *, Header *, Crc16 *);
+    void read_scalefactor_selection (Ibitstream *, Crc16 *);
+    void read_scalefactor (Ibitstream *, Header *);
+!   bool read_sampledata (Ibitstream *);
+!   bool put_next_sample (e_channels, SynthesisFilter *, SynthesisFilter *);
+  };
+  
+  #endif
+--- 102,109 ----
+    void read_allocation (Ibitstream *, Header *, Crc16 *);
+    void read_scalefactor_selection (Ibitstream *, Crc16 *);
+    void read_scalefactor (Ibitstream *, Header *);
+!   boolean read_sampledata (Ibitstream *);
+!   boolean put_next_sample (e_channels, SynthesisFilter *, SynthesisFilter *);
+  };
+  
+  #endif
diff --git a/audio/maplay/files/patch-ap b/audio/maplay/files/patch-ap
new file mode 100644
index 000000000000..05e126e58b21
--- /dev/null
+++ b/audio/maplay/files/patch-ap
@@ -0,0 +1,19 @@
+*** all.h.orig	Thu Jun 23 21:14:39 1994
+--- all.h	Thu Dec  9 05:32:18 1999
+***************
+*** 22,28 ****
+  #define ALL_H
+  
+  typedef float		real;		// float should be enough
+! typedef short		bool;
+  typedef unsigned	uint32;		// 32 Bit unsigned integer
+  	// some compilers may need "typedef unsigned long uint32" instead
+  typedef int		int32;		// 32 Bit signed integer
+--- 22,28 ----
+  #define ALL_H
+  
+  typedef float		real;		// float should be enough
+! typedef short		boolean;
+  typedef unsigned	uint32;		// 32 Bit unsigned integer
+  	// some compilers may need "typedef unsigned long uint32" instead
+  typedef int		int32;		// 32 Bit signed integer