Cleanup patches, a* categories.

Rename them to follow the make makepatch naming, and regenerate them.

With hat:	portmgr
Sponsored by:	Absolight

15 files changed, 63 insertions, 63 deletions

diff --git a/audio/xwave/files/patch-FWF_Imakefile b/audio/xwave/files/patch-FWF_Imakefile
index 7876d1053ba3..37e7d4f5e052 100644
--- a/audio/xwave/files/patch-FWF_Imakefile
+++ b/audio/xwave/files/patch-FWF_Imakefile
@@ -13,9 +13,9 @@
    to do a final 'ar' of all OBJS after all of them are build. This
    can be done by adding an auxiliary target in FWF/Imakefile.
 
---- FWF/Imakefile.orig	Mon Nov  9 00:22:54 1998
-+++ FWF/Imakefile	Mon Jan  1 15:47:50 2001
-@@ -9,14 +9,25 @@
+--- FWF/Imakefile.orig	1998-11-08 23:22:54 UTC
++++ FWF/Imakefile
+@@ -9,14 +9,25 @@ ALLDIRS = $(INITIALDIRS) include/Xfwf li
  MakeDirectories(all,$(ALLDIRS))
  
  InitSubdirs($(SUBDIRS))
diff --git a/audio/xwave/files/patch-FWF_src_Imakefile b/audio/xwave/files/patch-FWF_src_Imakefile
index 67850726cd03..cb33d8e64b75 100644
--- a/audio/xwave/files/patch-FWF_src_Imakefile
+++ b/audio/xwave/files/patch-FWF_src_Imakefile
@@ -1,6 +1,6 @@
---- FWF/src/Imakefile.orig	Mon Nov  9 08:22:54 1998
-+++ FWF/src/Imakefile	Fri Jun 30 19:53:43 2000
-@@ -34,6 +34,7 @@
+--- FWF/src/Imakefile.orig	1998-11-08 23:22:54 UTC
++++ FWF/src/Imakefile
+@@ -34,6 +34,7 @@ SUBDIRS = Board Common Frame Group Radio
  
  
  InitSubdirs($(SUBDIRS))
diff --git a/audio/xwave/files/patch-config.site b/audio/xwave/files/patch-config.site
index 8e1de6f64c46..a252d949f93e 100644
--- a/audio/xwave/files/patch-config.site
+++ b/audio/xwave/files/patch-config.site
@@ -1,5 +1,5 @@
---- config.site.orig	Mon Nov  9 08:22:55 1998
-+++ config.site	Fri Jun 30 19:52:45 2000
+--- config.site.orig	1998-11-08 23:22:55 UTC
++++ config.site
 @@ -1,5 +1,5 @@
  
 -EXTRA_INCLUDES=-I../ -I../include
diff --git a/audio/xwave/files/patch-src_XWave b/audio/xwave/files/patch-src_XWave
index 22dff90eecff..367696d44fca 100644
--- a/audio/xwave/files/patch-src_XWave
+++ b/audio/xwave/files/patch-src_XWave
@@ -1,5 +1,5 @@
---- src/XWave.orig	Mon Nov  9 08:22:55 1998
-+++ src/XWave	Fri Jun 30 20:08:56 2000
+--- src/XWave.orig	1998-11-08 23:22:55 UTC
++++ src/XWave
 @@ -1,7 +1,7 @@
  ! My self defined Resources
  
diff --git a/audio/xwave/files/patch-src_aifc.c b/audio/xwave/files/patch-src_aifc.c
index 61d3ced30a6c..0e98fb8d9672 100644
--- a/audio/xwave/files/patch-src_aifc.c
+++ b/audio/xwave/files/patch-src_aifc.c
@@ -1,5 +1,5 @@
---- src/aifc.c.orig	Mon Nov  9 08:22:55 1998
-+++ src/aifc.c	Fri Jun 30 19:49:15 2000
+--- src/aifc.c.orig	1998-11-08 23:22:55 UTC
++++ src/aifc.c
 @@ -9,7 +9,7 @@
  
  #ifdef linux
diff --git a/audio/xwave/files/patch-src_au.c b/audio/xwave/files/patch-src_au.c
index 7f78582f832d..f73f43ae6bee 100644
--- a/audio/xwave/files/patch-src_au.c
+++ b/audio/xwave/files/patch-src_au.c
@@ -1,5 +1,5 @@
---- src/au.c.orig	Mon Nov  9 08:22:55 1998
-+++ src/au.c	Fri Jun 30 19:49:15 2000
+--- src/au.c.orig	1998-11-08 23:22:55 UTC
++++ src/au.c
 @@ -32,7 +32,7 @@
  
  #ifdef linux
diff --git a/audio/xwave/files/patch-src_audio.c b/audio/xwave/files/patch-src_audio.c
index 38e4f310a2de..18637b6f82fe 100644
--- a/audio/xwave/files/patch-src_audio.c
+++ b/audio/xwave/files/patch-src_audio.c
@@ -1,5 +1,5 @@
---- src/audio.c.orig	Sun Nov  8 15:22:55 1998
-+++ src/audio.c	Sun Sep  8 03:35:52 2002
+--- src/audio.c.orig	1998-11-08 23:22:55 UTC
++++ src/audio.c
 @@ -37,8 +37,8 @@
  #ifdef linux
  #include <linux/soundcard.h>
@@ -20,7 +20,7 @@
  static int set_dsp(int o_mode,int res,int channels,int freq,int *buf_size);
  #endif
  
-@@ -67,7 +67,7 @@
+@@ -67,7 +67,7 @@ extern AppResources app_resources;
  static Audio_File af;
  static int stop_record;
  
@@ -29,7 +29,7 @@
  int set_dsp(int o_mode,int res, int channels, int freq, int *buf_size)
  {
      int check;
-@@ -369,7 +369,7 @@
+@@ -369,7 +369,7 @@ int get_samples(byte* audio_buffer,int m
  
  void play_file(char *fname,Main_Bool *mb)
  {
@@ -38,7 +38,7 @@
      int audio;
  #elif defined(sgi)
      ALport port;
-@@ -383,7 +383,7 @@
+@@ -383,7 +383,7 @@ void play_file(char *fname,Main_Bool *mb
  	return;
      }
      
@@ -47,7 +47,7 @@
      if ((audio=set_dsp(O_WRONLY,af.bps,af.channels,af.freq,&buf_size))==-1) {
  	fprintf(stderr,"XWave: Error ! Cannot set dsp !\n");
  	close(af.fd);
-@@ -403,7 +403,7 @@
+@@ -403,7 +403,7 @@ void play_file(char *fname,Main_Bool *mb
      if ((buffer=malloc(buf_size))==NULL) {
  	fprintf(stderr,"XWave: Error ! Cannot alloc mem !\n");
  	close(af.fd);
@@ -56,7 +56,7 @@
  	close(audio);
  #elif defined(sgi)
  	ALcloseport(port);
-@@ -412,7 +412,7 @@
+@@ -412,7 +412,7 @@ void play_file(char *fname,Main_Bool *mb
  	return;
      }
      
@@ -65,7 +65,7 @@
      while ((length=af_read(af,buffer,buf_size))>0) {
  	if (write(audio, buffer, length)==-1) break;
      }
-@@ -439,7 +439,7 @@
+@@ -439,7 +439,7 @@ void OLD_play_buffer(Main_Data *md)
      int offset=0,playlength,length;
  #ifdef sgi
      ALport port;
@@ -74,7 +74,7 @@
      int audio;
      
      if ((audio=set_dsp(O_WRONLY,wd->res,wd->channels,wd->freq,&buf_size))==-1) {
-@@ -472,7 +472,7 @@
+@@ -472,7 +472,7 @@ void OLD_play_buffer(Main_Data *md)
          buffer=wd->buffer+offset;
          while (playlength>0) {
              if (playlength<buf_size) buf_size=playlength;
@@ -83,7 +83,7 @@
              if (write(audio, buffer, buf_size)==-1) {
                  close(audio);
                  kill((pid_t) getppid(),SIGUSR1);
-@@ -497,7 +497,7 @@
+@@ -497,7 +497,7 @@ void OLD_play_buffer(Main_Data *md)
          wd2af(wd,&af);
          af_rewind(af);
          if (af_seek(af,offset,SEEK_CUR)==AF_ERROR) {
@@ -92,7 +92,7 @@
              close(audio);
  #elif defined(sgi)
              ALcloseport(port);
-@@ -510,7 +510,7 @@
+@@ -510,7 +510,7 @@ void OLD_play_buffer(Main_Data *md)
          while (playlength>0) {
              if (playlength<buf_size) buf_size=playlength;
              if ((length=af_read(af,(char*) md->mg->fbuf,buf_size))==-1) {
@@ -101,7 +101,7 @@
                  close(audio);
  #elif defined(sgi)
                  ALcloseport(port);
-@@ -518,7 +518,7 @@
+@@ -518,7 +518,7 @@ void OLD_play_buffer(Main_Data *md)
                  kill((pid_t) getppid(),SIGUSR1);
                  return;
              }
@@ -110,7 +110,7 @@
              if (write(audio,(char*) md->mg->fbuf,length)==-1) {
                  close(audio);
                  kill((pid_t) getppid(),SIGUSR1);
-@@ -537,7 +537,7 @@
+@@ -537,7 +537,7 @@ void OLD_play_buffer(Main_Data *md)
          }
      }
      
@@ -119,7 +119,7 @@
      close(audio);
  #elif defined(sgi)
      while (ALgetfilled(port)) sginap(2);
-@@ -558,7 +558,7 @@
+@@ -558,7 +558,7 @@ void play_buffer(Main_Data *md)
      int offset=0,playlength,length;
  #ifdef sgi
      ALport port;
@@ -128,7 +128,7 @@
      int audio;
      
      if ((audio=set_dsp(O_WRONLY,wd->res,wd->channels,wd->freq,&buf_size))==-1) {
-@@ -593,7 +593,7 @@
+@@ -593,7 +593,7 @@ void play_buffer(Main_Data *md)
  	((int *)shared_playpos)[0] = wd->playbeg*wd->bpspl;
  	while (playlength>0) {
  	    if (playlength<buf_size) buf_size=playlength;
@@ -137,7 +137,7 @@
  	    if (write(audio, buffer, buf_size)==-1) {
  		((int *)shared_playpos)[0] = -1;
  		close(audio);
-@@ -621,7 +621,7 @@
+@@ -621,7 +621,7 @@ void play_buffer(Main_Data *md)
  	af_rewind(af);
  	if (af_seek(af,offset,SEEK_CUR)==AF_ERROR) {
  	    ((int *)shared_playpos)[0] = -1;
@@ -146,7 +146,7 @@
  	    close(audio);
  #elif defined(sgi)
  	    ALcloseport(port);
-@@ -636,7 +636,7 @@
+@@ -636,7 +636,7 @@ void play_buffer(Main_Data *md)
  	    if (playlength<buf_size) buf_size=playlength;
  	    if ((length=af_read(af,(char*) md->mg->fbuf,buf_size))==-1) {
  		((int *)shared_playpos)[0] = -1;
@@ -155,7 +155,7 @@
  		close(audio);
  #elif defined(sgi)
  		ALcloseport(port);
-@@ -644,7 +644,7 @@
+@@ -644,7 +644,7 @@ void play_buffer(Main_Data *md)
  		kill((pid_t) getppid(),SIGUSR1);
  		return;
  	    }
@@ -164,7 +164,7 @@
  	    if (write(audio,(char*) md->mg->fbuf,length)==-1) {
  		((int *)shared_playpos)[0] = -1;
  		close(audio);
-@@ -666,7 +666,7 @@
+@@ -666,7 +666,7 @@ void play_buffer(Main_Data *md)
      }
      
      ((int *)shared_playpos)[0] = -1;
@@ -173,7 +173,7 @@
      close(audio);
  #elif defined(sgi)
      while (ALgetfilled(port)) sginap(2);
-@@ -686,7 +686,7 @@
+@@ -686,7 +686,7 @@ void rec_file(byte res,byte mode,int fre
      void write_length();
      byte *data=NULL;
      int abuf_size,count;
@@ -182,7 +182,7 @@
      int audio;
      
      if ((audio=set_dsp(O_RDONLY,res,mode,freq,&abuf_size))==-1) {
-@@ -707,7 +707,7 @@
+@@ -707,7 +707,7 @@ void rec_file(byte res,byte mode,int fre
      
      if ((data = (byte *) malloc(abuf_size)) == NULL) {
  	fprintf(stderr,"XWave: Error while alloc mem for audio_buffer !\n");
@@ -191,7 +191,7 @@
  	close(audio);
  #elif defined(sgi)
  	ALcloseport(port);
-@@ -725,7 +725,7 @@
+@@ -725,7 +725,7 @@ void rec_file(byte res,byte mode,int fre
      
      if (af_open(fname,&af,AF_NEW)==AF_ERROR) {
  	free(data);
@@ -200,7 +200,7 @@
  	close(audio);
  #elif defined(sgi)
  	ALcloseport(port);
-@@ -738,7 +738,7 @@
+@@ -738,7 +738,7 @@ void rec_file(byte res,byte mode,int fre
      signal(SIGUSR1,write_length);
      
      while(1) {
@@ -209,7 +209,7 @@
  	if ((count=read(audio, data, abuf_size))==-1) {
  	    close(audio);
  	    af_close(af);
-@@ -762,7 +762,7 @@
+@@ -762,7 +762,7 @@ void rec_file(byte res,byte mode,int fre
  	    return;
  	}
  	if ((count=af_write(af,(char*)data,count))==AF_ERROR) {
diff --git a/audio/xwave/files/patch-src_button.c b/audio/xwave/files/patch-src_button.c
index 1b1c114c1280..5f84bced7d16 100644
--- a/audio/xwave/files/patch-src_button.c
+++ b/audio/xwave/files/patch-src_button.c
@@ -1,6 +1,6 @@
---- src/button.c.orig	Mon Nov  9 08:22:55 1998
-+++ src/button.c	Fri Jun 30 19:49:16 2000
-@@ -679,7 +679,7 @@
+--- src/button.c.orig	1998-11-08 23:22:55 UTC
++++ src/button.c
+@@ -679,7 +679,7 @@ Boolean set_playline(XtPointer client_da
      now_clock=clock();
      sample_time=(float)md->wd->tlength/(float)md->wd->freq;
  
diff --git a/audio/xwave/files/patch-src_edit.c b/audio/xwave/files/patch-src_edit.c
index 111c5802e7d1..78886ceb697b 100644
--- a/audio/xwave/files/patch-src_edit.c
+++ b/audio/xwave/files/patch-src_edit.c
@@ -1,6 +1,6 @@
---- src/edit.c.orig	Mon Nov  9 08:22:55 1998
-+++ src/edit.c	Fri Jun 30 20:48:28 2000
-@@ -54,6 +54,7 @@
+--- src/edit.c.orig	1998-11-08 23:22:55 UTC
++++ src/edit.c
+@@ -54,6 +54,7 @@ extern char begin_text[MAX_NUMLENGTH];
  extern bool button_2;
  
  /* these conversion routines are also in graphics.c */
@@ -8,7 +8,7 @@
  int mg_sel_leftsample(float step,int x)
  {
    return(ceil(step*x-0.5));
-@@ -73,7 +74,7 @@
+@@ -73,7 +74,7 @@ int mg_sel_rightpixel(float step,int x)
  {
    return((int)(((float)x+0.5)/step));
  } 
diff --git a/audio/xwave/files/patch-src_effects.c b/audio/xwave/files/patch-src_effects.c
index d36c98bd3663..6f5c9d94e720 100644
--- a/audio/xwave/files/patch-src_effects.c
+++ b/audio/xwave/files/patch-src_effects.c
@@ -1,6 +1,6 @@
---- src/effects.c.orig	Mon Nov  9 08:22:55 1998
-+++ src/effects.c	Fri Jun 30 19:49:16 2000
-@@ -348,7 +348,7 @@
+--- src/effects.c.orig	1998-11-08 23:22:55 UTC
++++ src/effects.c
+@@ -348,7 +348,7 @@ void props_return(Sample_Return *sr)
  	
  	switch (sr->res) {
  	 case 8: {
@@ -9,7 +9,7 @@
  	     for (i=0;i<newlength;i++) newbuf[i]=obuf[(i<<1)+1]+128;
  #elif defined (sgi) || defined (sun)
  	     for (i=0;i<newlength;i++) newbuf[i]=obuf[(i<<1)]+128;
-@@ -356,7 +356,7 @@
+@@ -356,7 +356,7 @@ void props_return(Sample_Return *sr)
  	     break;
  	 }
  	 case 16: {
diff --git a/audio/xwave/files/patch-src_endian.c b/audio/xwave/files/patch-src_endian.h
index 4615100a8841..c57beff6669d 100644
--- a/audio/xwave/files/patch-src_endian.c
+++ b/audio/xwave/files/patch-src_endian.h
@@ -1,6 +1,6 @@
---- src/endian.h.orig	Mon Nov  9 08:22:55 1998
-+++ src/endian.h	Fri Jun 30 19:49:16 2000
-@@ -16,7 +16,7 @@
+--- src/endian.h.orig	1998-11-08 23:22:55 UTC
++++ src/endian.h
+@@ -16,7 +16,7 @@ typedef unsigned short u_int16_t;
  #define big_endian 1
  #endif
  
diff --git a/audio/xwave/files/patch-src_graphics.c b/audio/xwave/files/patch-src_graphics.c
index b66afe7118f8..81bfedcc5045 100644
--- a/audio/xwave/files/patch-src_graphics.c
+++ b/audio/xwave/files/patch-src_graphics.c
@@ -1,5 +1,5 @@
---- src/graphics.c.orig	Mon Nov  9 08:22:55 1998
-+++ src/graphics.c	Fri Jun 30 19:49:18 2000
+--- src/graphics.c.orig	1998-11-08 23:22:55 UTC
++++ src/graphics.c
 @@ -30,7 +30,7 @@
  
  #ifdef linux
@@ -9,7 +9,7 @@
  #include <machine/endian.h>
  #elif defined (sgi)
  #include <sys/endian.h>
-@@ -1476,7 +1476,7 @@
+@@ -1476,7 +1476,7 @@ void expose_action (Widget w, Main_Data 
      if (md->mb->exposing) return;
      */
      
@@ -18,7 +18,7 @@
      if (resizing) {
  	resizing=FALSE;
  	return;
-@@ -1532,7 +1532,7 @@
+@@ -1532,7 +1532,7 @@ Next_Wave *get_nw(Main_Data *md,Widget w
  
  void expose_canvas (Widget w, Main_Data *md, XExposeEvent *event, Boolean *flg)
  {
diff --git a/audio/xwave/files/patch-src__record_dialog.c b/audio/xwave/files/patch-src_record__dialog.c
index e0b54f66cdc1..2ff820c743f3 100644
--- a/audio/xwave/files/patch-src__record_dialog.c
+++ b/audio/xwave/files/patch-src_record__dialog.c
@@ -1,6 +1,6 @@
---- src/record_dialog.c.orig	Mon Nov  9 08:22:55 1998
-+++ src/record_dialog.c	Fri Jun 30 19:49:18 2000
-@@ -524,7 +524,7 @@
+--- src/record_dialog.c.orig	1998-11-08 23:22:55 UTC
++++ src/record_dialog.c
+@@ -524,7 +524,7 @@ Boolean update_record(XtPointer client_d
      sprintf(MD->mw->messages,"%.2lf kbytes (%.2lfs)",
  	    (double)playsize/1024,recordtime);
      XtVaSetValues(label5,XtNlabel, MD->mw->messages, NULL);
diff --git a/audio/xwave/files/patch-src_riff.c b/audio/xwave/files/patch-src_riff.c
index 994c277585c3..48fec19b6e6c 100644
--- a/audio/xwave/files/patch-src_riff.c
+++ b/audio/xwave/files/patch-src_riff.c
@@ -1,5 +1,5 @@
---- src/riff.c.orig	Mon Nov  9 08:22:55 1998
-+++ src/riff.c	Fri Jun 30 19:49:19 2000
+--- src/riff.c.orig	1998-11-08 23:22:55 UTC
++++ src/riff.c
 @@ -33,7 +33,7 @@
  
  #ifdef linux
diff --git a/audio/xwave/files/patch-src_types.h b/audio/xwave/files/patch-src_types.h
index 545954c92aa9..2c639e0818d7 100644
--- a/audio/xwave/files/patch-src_types.h
+++ b/audio/xwave/files/patch-src_types.h
@@ -1,5 +1,5 @@
---- src/types.h.orig	Mon Nov  9 08:22:55 1998
-+++ src/types.h	Fri Jun 30 19:49:19 2000
+--- src/types.h.orig	1998-11-08 23:22:55 UTC
++++ src/types.h
 @@ -27,7 +27,7 @@
  typedef unsigned char byte;
  typedef byte bool;