9 files changed, 171 insertions, 197 deletions

diff --git a/audio/wavplay/files/patch-Makefile b/audio/wavplay/files/patch-Makefile
index 15edb22eb07d..a89de13cd8f7 100644
--- a/audio/wavplay/files/patch-Makefile
+++ b/audio/wavplay/files/patch-Makefile
@@ -1,5 +1,5 @@
---- Makefile.orig	Sat Dec  4 09:06:42 1999
-+++ Makefile	Thu Jun 22 01:50:48 2000
+--- Makefile.orig	1999-12-04 00:06:42 UTC
++++ Makefile
 @@ -38,7 +38,7 @@
  #----------------------------------------------------------------------
  # If you are running a 386 you should comment this line out.
@@ -9,7 +9,7 @@
  
  #----------------------------------------------------------------------
  # If you are experiencing troubles (like core dumps!), then uncomment
-@@ -47,7 +47,7 @@
+@@ -47,7 +47,7 @@ CPU=-m486
  # adjust the STRIP option to suit compile mode:
  #
  #DEBUG=-g
@@ -18,7 +18,7 @@
  
  #----------------------------------------------------------------------
  # When using 'DEBUG=-g' above, then comment out the 'strip' line:
-@@ -59,7 +59,9 @@
+@@ -59,7 +59,9 @@ STRIP=strip
  # This parameter indicates where the program binaries should be
  # placed (wavplay, wavrec, and xltwavplay)
  #
@@ -29,7 +29,7 @@
  
  #----------------------------------------------------------------------
  # Uncomment this line if you want to install the xltwavplay.res resource
-@@ -81,14 +83,14 @@
+@@ -81,14 +83,14 @@ RESDIR=/usr/X11R6/lib/X11/app-defaults
  # to disable the EDITRES facility. If you're not compiling xltwavplay
  # then this setting can be left asis.
  #
@@ -46,7 +46,7 @@
  
  #----------------------------------------------------------------------
  # These are the non X load options (for wavplay/wavrec)
-@@ -106,7 +108,13 @@
+@@ -106,7 +108,13 @@ XLDOPTS=-L/usr/X11R6/lib/ -L/usr/local/l
  # only the standard getopt() routine. When commented out, the long options like --help
  # are recognized, with the help of the getopt_long() routine.
  #
@@ -61,7 +61,7 @@
  
  #----------------------------------------------------------------------
  # The next option specifies the pathname that the xltwavplay X client should exec
-@@ -133,7 +141,7 @@
+@@ -133,7 +141,7 @@ PLAYPATH= -DWAVPLAYPATH=\"$(INSTDIR)/wav
  # Environment variable DSPPATH will override this value at runtime, if
  # present.
  #
@@ -70,7 +70,7 @@
  
  #----------------------------------------------------------------------
  # Semaphore IPC Key for the Play & Record locks (Default is 0x33333333)
-@@ -163,19 +171,19 @@
+@@ -163,19 +171,19 @@ INSTALL=install
  # this should be unecessary if the appropriate symlinks are
  # installed).
  #
@@ -95,7 +95,7 @@
  CP=	g++
  
  HDRFIL= client.h server.h wavfile.h wavplay.h xltwavplay.h xmsprint.h
-@@ -189,9 +197,9 @@
+@@ -189,9 +197,9 @@ WVDMPO= wavdump.o
  .c.o:
  	$(CC) $(CFLAGS) $(INCL) $<
  
@@ -107,7 +107,7 @@
  
  # wavdump: $(WVDMPO)
  #	$(CP) $(WVDMPO) $(LDOPTS) $(DEBUG) -o wavdump -lRIFF
-@@ -209,18 +217,21 @@
+@@ -209,18 +217,21 @@ xltwavplay: $(CLNOBJ) xltwavplay.o
  	$(STRIP) xltwavplay
  	ls -l xltwavplay
  
@@ -134,7 +134,7 @@
  xltwavplay_test: wavplay xltwavplay
  	WAVPLAYPATH=./wavplay ./xltwavplay
  
-@@ -234,9 +245,9 @@
+@@ -234,9 +245,9 @@ setuid_root:
  	@echo
  
  install_xltwavplay: xltwavplay
diff --git a/audio/wavplay/files/patch-client.c b/audio/wavplay/files/patch-client.c
index 4985e3bdf967..2307cc352fc9 100644
--- a/audio/wavplay/files/patch-client.c
+++ b/audio/wavplay/files/patch-client.c
@@ -1,28 +1,24 @@
-*** client.c.orig	Sat Jan 15 13:05:07 2000
---- client.c	Sat Jan 15 13:08:42 2000
-***************
-*** 47,53 ****
---- 47,55 ----
-  #include <unistd.h>
-  #include <errno.h>
-  #include <time.h>
-+ #ifndef FREEBSD
-  #include <malloc.h>
-+ #endif
-  #include <string.h>
-  #include <memory.h>
-  #include <signal.h>
-***************
-*** 57,63 ****
---- 59,69 ----
-  #include <sys/wait.h>
-  #include <sys/stat.h>
-  #include <assert.h>
-+ #ifndef FREEBSD
-  #include <linux/soundcard.h>
-+ #else
-+ #include <sys/soundcard.h>
-+ #endif
-  #include "wavplay.h"
-  #include "client.h"
-  
+--- client.c.orig	1999-12-04 00:06:42 UTC
++++ client.c
+@@ -47,7 +47,9 @@ static const char rcsid[] = "@(#)client.
+ #include <unistd.h>
+ #include <errno.h>
+ #include <time.h>
++#ifndef FREEBSD
+ #include <malloc.h>
++#endif
+ #include <string.h>
+ #include <memory.h>
+ #include <signal.h>
+@@ -57,7 +59,11 @@ static const char rcsid[] = "@(#)client.
+ #include <sys/wait.h>
+ #include <sys/stat.h>
+ #include <assert.h>
++#ifndef FREEBSD
+ #include <linux/soundcard.h>
++#else
++#include <sys/soundcard.h>
++#endif
+ #include "wavplay.h"
+ #include "client.h"
+ 
diff --git a/audio/wavplay/files/patch-file.c b/audio/wavplay/files/patch-file.c
index 97163c03f663..d2b7a29f13cc 100644
--- a/audio/wavplay/files/patch-file.c
+++ b/audio/wavplay/files/patch-file.c
@@ -1,28 +1,24 @@
-*** file.c.orig	Sat Jan 15 12:55:46 2000
---- file.c	Sat Jan 15 13:15:38 2000
-***************
-*** 56,62 ****
---- 56,64 ----
-  #include <unistd.h>
-  #include <errno.h>
-  #include <fcntl.h>
-+ #ifndef FREEBSD
-  #include <malloc.h>
-+ #endif
-  #include <string.h>
-  #include <memory.h>
-  #include <signal.h>
-***************
-*** 64,70 ****
---- 66,76 ----
-  #include <sys/ipc.h>
-  #include <sys/ioctl.h>
-  #include <assert.h>
-+ #ifndef FREEBSD
-  #include <linux/soundcard.h>
-+ #else
-+ #include <sys/soundcard.h>
-+ #endif
-  #include "wavplay.h"
-  
-  extern int clntIPC;    /* Needed for message passing in PlayDSP */
+--- file.c.orig	1999-12-04 00:06:42 UTC
++++ file.c
+@@ -56,7 +56,9 @@ static const char rcsid[] = "@(#)file.c 
+ #include <unistd.h>
+ #include <errno.h>
+ #include <fcntl.h>
++#ifndef FREEBSD
+ #include <malloc.h>
++#endif
+ #include <string.h>
+ #include <memory.h>
+ #include <signal.h>
+@@ -64,7 +66,11 @@ static const char rcsid[] = "@(#)file.c 
+ #include <sys/ipc.h>
+ #include <sys/ioctl.h>
+ #include <assert.h>
++#ifndef FREEBSD
+ #include <linux/soundcard.h>
++#else
++#include <sys/soundcard.h>
++#endif
+ #include "wavplay.h"
+ 
+ extern int clntIPC;    /* Needed for message passing in PlayDSP */
diff --git a/audio/wavplay/files/patch-main.c b/audio/wavplay/files/patch-main.c
index 18cb2369239e..93df7bd55165 100644
--- a/audio/wavplay/files/patch-main.c
+++ b/audio/wavplay/files/patch-main.c
@@ -1,53 +1,45 @@
-*** main.c.orig	Sat Jan 15 12:51:14 2000
---- main.c	Sat Jan 15 14:14:54 2000
-***************
-*** 56,62 ****
---- 56,64 ----
-  #include <unistd.h>
-  #include <stdarg.h>
-  #include <string.h>
-+ #ifndef FREEBSD
-  #include <getopt.h>
-+ #endif
-  #include <fcntl.h>
-  #include <sys/types.h>
-  #include <sys/ipc.h>
-***************
-*** 82,88 ****
---- 84,94 ----
-  	else	printf("Usage:\t%s [options] [files...]\n\n",cmd);
-  
-  	puts("Options:");
-+ #ifndef FREEBSD
-  	printf("\t-%c\tThis info (or use --help)\n",OPF_HELP);
-+ #else
-+ 	printf("\t-%c\tThis info\n",OPF_HELP);
-+ #endif
-  	printf("\t-%c\tQuiet mode (no messages)\n",OPF_QUIET);
-  	printf("\t-%c rate\tSampling rate\n",OPF_SAMPRATE);
-  	printf("\t-%c\tDebug mode\n",OPF_DEBUG);
-***************
-*** 105,111 ****
---- 111,121 ----
-  	if ( opr_mode != OprRecord )
-  		printf("\t-%c\tDisplay info about wav file(s) only\n",OPF_INFO);
-  
-+ #ifndef FREEBSD
-  	printf("\n\t-%c\tDisplay version and Copyright info (or use --version)\n\n",OPF_VERSION);
-+ #else
-+ 	printf("\n\t-%c\tDisplay version and Copyright info\n\n",OPF_VERSION);
-+ #endif
-  
-  	puts("\nWAV parameters are normally taken from the input file(s),\n"
-  		"but command line options can override them if required.");
-***************
-*** 208,213 ****
---- 218,225 ----
-  	int rc;					/* Return code */
-  	int fd;					/* Temporary file descriptor */
-  	double d;				/* Temporary double value */
-+ 	char *cp;				/* Used for env var */
-+ 	uid_t uid;				
-  	static char cmdopts[] = {
-  		OPF_INFO, OPF_HELP, OPF_QUIET, OPF_SAMPRATE,':', OPF_STEREO, OPF_MONO,
-  		OPF_TIME,':', OPF_DATABITS,':', OPF_IPCKEY,':', OPF_RESET,
+--- main.c.orig	1999-12-04 00:06:42 UTC
++++ main.c
+@@ -56,7 +56,9 @@ static const char rcsid[] = "@(#)main.c 
+ #include <unistd.h>
+ #include <stdarg.h>
+ #include <string.h>
++#ifndef FREEBSD
+ #include <getopt.h>
++#endif
+ #include <fcntl.h>
+ #include <sys/types.h>
+ #include <sys/ipc.h>
+@@ -82,7 +84,11 @@ usage(const char *cmd,OprMode opr_mode) 
+ 	else	printf("Usage:\t%s [options] [files...]\n\n",cmd);
+ 
+ 	puts("Options:");
++#ifndef FREEBSD
+ 	printf("\t-%c\tThis info (or use --help)\n",OPF_HELP);
++#else
++	printf("\t-%c\tThis info\n",OPF_HELP);
++#endif
+ 	printf("\t-%c\tQuiet mode (no messages)\n",OPF_QUIET);
+ 	printf("\t-%c rate\tSampling rate\n",OPF_SAMPRATE);
+ 	printf("\t-%c\tDebug mode\n",OPF_DEBUG);
+@@ -105,7 +111,11 @@ usage(const char *cmd,OprMode opr_mode) 
+ 	if ( opr_mode != OprRecord )
+ 		printf("\t-%c\tDisplay info about wav file(s) only\n",OPF_INFO);
+ 
++#ifndef FREEBSD
+ 	printf("\n\t-%c\tDisplay version and Copyright info (or use --version)\n\n",OPF_VERSION);
++#else
++	printf("\n\t-%c\tDisplay version and Copyright info\n\n",OPF_VERSION);
++#endif
+ 
+ 	puts("\nWAV parameters are normally taken from the input file(s),\n"
+ 		"but command line options can override them if required.");
+@@ -208,6 +218,8 @@ main(int argc,char **argv) {
+ 	int rc;					/* Return code */
+ 	int fd;					/* Temporary file descriptor */
+ 	double d;				/* Temporary double value */
++	char *cp;				/* Used for env var */
++	uid_t uid;				
+ 	static char cmdopts[] = {
+ 		OPF_INFO, OPF_HELP, OPF_QUIET, OPF_SAMPRATE,':', OPF_STEREO, OPF_MONO,
+ 		OPF_TIME,':', OPF_DATABITS,':', OPF_IPCKEY,':', OPF_RESET,
diff --git a/audio/wavplay/files/patch-msg.c b/audio/wavplay/files/patch-msg.c
index 22167b098d98..6d8af4a35ded 100644
--- a/audio/wavplay/files/patch-msg.c
+++ b/audio/wavplay/files/patch-msg.c
@@ -1,28 +1,24 @@
-*** msg.c.orig	Sat Jan 15 12:58:40 2000
---- msg.c	Sat Jan 15 13:16:12 2000
-***************
-*** 47,53 ****
---- 47,55 ----
-  #include <unistd.h>
-  #include <errno.h>
-  #include <fcntl.h>
-+ #ifndef FREEBSD
-  #include <malloc.h>
-+ #endif
-  #include <string.h>
-  #include <memory.h>
-  #include <signal.h>
-***************
-*** 56,62 ****
---- 58,68 ----
-  #include <sys/msg.h>
-  #include <sys/ioctl.h>
-  #include <assert.h>
-+ #ifndef FREEBSD
-  #include <linux/soundcard.h>
-+ #else
-+ #include <sys/soundcard.h>
-+ #endif
-  #include "wavplay.h"
-  
-  /*
+--- msg.c.orig	1999-12-04 00:06:42 UTC
++++ msg.c
+@@ -47,7 +47,9 @@ static const char rcsid[] = "@(#)msg.c $
+ #include <unistd.h>
+ #include <errno.h>
+ #include <fcntl.h>
++#ifndef FREEBSD
+ #include <malloc.h>
++#endif
+ #include <string.h>
+ #include <memory.h>
+ #include <signal.h>
+@@ -56,7 +58,11 @@ static const char rcsid[] = "@(#)msg.c $
+ #include <sys/msg.h>
+ #include <sys/ioctl.h>
+ #include <assert.h>
++#ifndef FREEBSD
+ #include <linux/soundcard.h>
++#else
++#include <sys/soundcard.h>
++#endif
+ #include "wavplay.h"
+ 
+ /*
diff --git a/audio/wavplay/files/patch-recplay.c b/audio/wavplay/files/patch-recplay.c
index 6cb5bd7940a3..76c981ad01e8 100644
--- a/audio/wavplay/files/patch-recplay.c
+++ b/audio/wavplay/files/patch-recplay.c
@@ -1,6 +1,6 @@
---- recplay.c.orig	Sat Dec  4 09:06:42 1999
-+++ recplay.c	Sun Dec 11 12:56:34 2005
-@@ -52,12 +52,18 @@
+--- recplay.c.orig	1999-12-04 00:06:42 UTC
++++ recplay.c
+@@ -52,12 +52,18 @@ static const char rcsid[] = "@(#)recplay
  #include <stdio.h>
  #include <stdarg.h>
  #include <stdlib.h>
@@ -19,7 +19,7 @@
  #include "wavplay.h"
  #include "server.h"
  
-@@ -184,7 +190,7 @@
+@@ -184,7 +190,7 @@ wavrecd(WavPlayOpts *wavopts,char *Pathn
  		wfile = svr.wfile;		/* And the file is already opened */
  	}
  
diff --git a/audio/wavplay/files/patch-server.c b/audio/wavplay/files/patch-server.c
index bb362f08f92e..710fffcb8468 100644
--- a/audio/wavplay/files/patch-server.c
+++ b/audio/wavplay/files/patch-server.c
@@ -1,28 +1,24 @@
-*** server.c.orig	Sat Jan 15 12:59:19 2000
---- server.c	Sat Jan 15 13:17:07 2000
-***************
-*** 65,71 ****
---- 65,73 ----
-  #include <unistd.h>
-  #include <errno.h>
-  #include <fcntl.h>
-+ #ifndef FREEBSD
-  #include <malloc.h>
-+ #endif
-  #include <string.h>
-  #include <memory.h>
-  #include <signal.h>
-***************
-*** 79,85 ****
---- 81,91 ----
-  #ifdef SCHED_PRIORITY
-  #include <sched.h>
-  #endif
-+ #ifndef FREEBSD
-  #include <linux/soundcard.h>
-+ #else
-+ #include <sys/soundcard.h>
-+ #endif
-  #include "wavplay.h"
-  #include "server.h"
-  
+--- server.c.orig	1999-12-04 00:06:42 UTC
++++ server.c
+@@ -65,7 +65,9 @@ static const char rcsid[] = "@(#)server.
+ #include <unistd.h>
+ #include <errno.h>
+ #include <fcntl.h>
++#ifndef FREEBSD
+ #include <malloc.h>
++#endif
+ #include <string.h>
+ #include <memory.h>
+ #include <signal.h>
+@@ -79,7 +81,11 @@ static const char rcsid[] = "@(#)server.
+ #ifdef SCHED_PRIORITY
+ #include <sched.h>
+ #endif
++#ifndef FREEBSD
+ #include <linux/soundcard.h>
++#else
++#include <sys/soundcard.h>
++#endif
+ #include "wavplay.h"
+ #include "server.h"
+ 
diff --git a/audio/wavplay/files/patch-wavplay.h b/audio/wavplay/files/patch-wavplay.h
index ac3a9dd7ac08..ab4b0cd8f815 100644
--- a/audio/wavplay/files/patch-wavplay.h
+++ b/audio/wavplay/files/patch-wavplay.h
@@ -1,6 +1,6 @@
---- wavplay.h.orig	Thu Aug  5 17:24:45 2004
-+++ wavplay.h	Thu Aug  5 17:24:49 2004
-@@ -500,7 +500,7 @@
+--- wavplay.h.orig	1999-12-04 00:06:42 UTC
++++ wavplay.h
+@@ -500,7 +500,7 @@ extern int LockDSP(int ipc,int playrecx,
  extern int UnlockDSP(int ipc,int playrecx,ErrFunc erf);
  
  extern WAVFILE *WavOpenForRead(const char *Pathname,ErrFunc erf);
diff --git a/audio/wavplay/files/patch-xltwavplay.c b/audio/wavplay/files/patch-xltwavplay.c
index a9f6e89a470e..0e87c505e646 100644
--- a/audio/wavplay/files/patch-xltwavplay.c
+++ b/audio/wavplay/files/patch-xltwavplay.c
@@ -1,14 +1,12 @@
-*** xltwavplay.c.orig	Sat Jan 15 13:12:38 2000
---- xltwavplay.c	Sat Jan 15 13:13:02 2000
-***************
-*** 59,65 ****
---- 59,67 ----
-  #include <time.h>
-  #include <signal.h>
-  #include <string.h>
-+ #ifndef FREEBSD
-  #include <getopt.h>
-+ #endif
-  #include <errno.h>
-  #include <sys/types.h>
-  #include <sys/ipc.h>
+--- xltwavplay.c.orig	1999-12-04 00:06:42 UTC
++++ xltwavplay.c
+@@ -59,7 +59,9 @@
+ #include <time.h>
+ #include <signal.h>
+ #include <string.h>
++#ifndef FREEBSD
+ #include <getopt.h>
++#endif
+ #include <errno.h>
+ #include <sys/types.h>
+ #include <sys/ipc.h>