Cleanup patches, a* categories.

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

With hat:	portmgr
Sponsored by:	Absolight

12 files changed, 36 insertions, 36 deletions

diff --git a/audio/s3mod/Makefile b/audio/s3mod/Makefile
index 762ff8fcbe32..453dd517b62b 100644
--- a/audio/s3mod/Makefile
+++ b/audio/s3mod/Makefile
@@ -14,7 +14,7 @@ COMMENT=	MOD/S3M player
 ALL_TARGET=	freebsd
 PLIST_FILES=	bin/s3mod
 
-pre-patch:
+post-extract:
 	@${CP} ${WRKSRC}/DspDrivers/linux_dsp.c ${WRKSRC}/dsp.c
 
 do-install:
diff --git a/audio/s3mod/files/patch-Makefile b/audio/s3mod/files/patch-Makefile
index ef5edb95f918..87bea037260d 100644
--- a/audio/s3mod/files/patch-Makefile
+++ b/audio/s3mod/files/patch-Makefile
@@ -1,5 +1,5 @@
---- Makefile.orig	Sun Oct 22 04:48:51 1995
-+++ Makefile	Sat Jan 27 15:52:13 2001
+--- Makefile.orig	1995-10-21 19:48:51 UTC
++++ Makefile
 @@ -5,11 +5,11 @@
  #
  ########
@@ -14,7 +14,7 @@
  LFLAGS  = 
  
  OBJS	= mod.o s3m.o main.o play.o mix.o cmdline.o dsp.o gus.o
-@@ -24,6 +24,7 @@
+@@ -24,6 +24,7 @@ all: 
  	@echo "     make sun              - SunOS/Solaris"
  	@echo "     make sgi              - SGI Irix"
  	@echo "     make linux            - Voxware DSP/GUS"
@@ -22,13 +22,13 @@
  	@echo "     make dec              - Dec OSF/1"
  	@echo "     make clean            - remove all .o files"
  	@echo "     make clobber          - remove all .o and targets"
-@@ -50,6 +51,9 @@
- 	$(RM) -f dsp.c
+@@ -51,6 +52,9 @@ linux:
  	$(LN) DspDrivers/linux_dsp.c dsp.c
  	make CC=gcc CFLAGS=-O2 DEFINES="-DLINUX -DGUS" s3mod
-+
+ 
 +freebsd:
 +	$(MAKE) CFLAGS="$(CFLAGS)" DEFINES="" s3mod
- 
++
  s3mod:	$(OBJS)
  	$(CC) $(CFLAGS) -o s3mod $(OBJS) $(LFLAGS) $(LIBS)
+ 
diff --git a/audio/s3mod/files/patch-config.h b/audio/s3mod/files/patch-config.h
index a625e2cbdc03..7e71c5a78b10 100644
--- a/audio/s3mod/files/patch-config.h
+++ b/audio/s3mod/files/patch-config.h
@@ -1,5 +1,5 @@
---- config.h.orig	Sat Oct 21 20:59:55 1995
-+++ config.h	Sun Dec 29 10:50:41 2002
+--- config.h.orig	1995-10-21 19:59:55 UTC
++++ config.h
 @@ -64,6 +64,11 @@
  #define GUS
  #endif /* GUS */
diff --git a/audio/s3mod/files/patch-dsp.c b/audio/s3mod/files/patch-dsp.c
index 3ebf20cead1f..5cf09892284c 100644
--- a/audio/s3mod/files/patch-dsp.c
+++ b/audio/s3mod/files/patch-dsp.c
@@ -1,5 +1,5 @@
---- dsp.c.orig	2012-10-10 23:29:01.000000000 +0800
-+++ dsp.c	2012-10-10 23:30:54.000000000 +0800
+--- dsp.c.orig	2016-07-26 15:51:01 UTC
++++ dsp.c
 @@ -22,20 +22,20 @@
   *  linux_dsp.c - Support for the Linux DSP driver from the Voxware(C) Drivers.
   */
diff --git a/audio/s3mod/files/patch-dsp.h b/audio/s3mod/files/patch-dsp.h
index f1c0a1a4eb8b..12936268219c 100644
--- a/audio/s3mod/files/patch-dsp.h
+++ b/audio/s3mod/files/patch-dsp.h
@@ -1,5 +1,5 @@
---- dsp.h.orig	2012-10-10 23:31:11.000000000 +0800
-+++ dsp.h	2012-10-10 23:31:22.000000000 +0800
+--- dsp.h.orig	1995-10-21 06:52:31 UTC
++++ dsp.h
 @@ -34,7 +34,7 @@ extern uint8                  *audio_sta
  extern uint8                  *audio_end_buffer;
  extern uint8                  *audio_curptr;
diff --git a/audio/s3mod/files/patch-gus.c b/audio/s3mod/files/patch-gus.c
index 747c31266b76..5bc720cdcea3 100644
--- a/audio/s3mod/files/patch-gus.c
+++ b/audio/s3mod/files/patch-gus.c
@@ -1,5 +1,5 @@
---- gus.c.orig	Sat Oct 21 12:14:33 1995
-+++ gus.c	Thu Aug 22 20:55:06 2002
+--- gus.c.orig	1995-10-21 19:14:33 UTC
++++ gus.c
 @@ -26,7 +26,7 @@
  #ifdef GUS
  
diff --git a/audio/s3mod/files/patch-gus.h b/audio/s3mod/files/patch-gus.h
index 291c9b942e69..df5fa0c4839d 100644
--- a/audio/s3mod/files/patch-gus.h
+++ b/audio/s3mod/files/patch-gus.h
@@ -1,6 +1,6 @@
---- gus.h.orig	Sat Oct 21 13:06:38 1995
-+++ gus.h	Thu Aug 22 20:53:57 2002
-@@ -41,7 +41,7 @@
+--- gus.h.orig	1995-10-21 20:06:38 UTC
++++ gus.h
+@@ -41,7 +41,7 @@ void sync_time(void);
  
  extern unsigned char _seqbuf[];
  extern int _seqbuflen, _seqbufptr;
diff --git a/audio/s3mod/files/patch-main.c b/audio/s3mod/files/patch-main.c
index eddf50ee01c3..c0f43f1748ce 100644
--- a/audio/s3mod/files/patch-main.c
+++ b/audio/s3mod/files/patch-main.c
@@ -1,6 +1,6 @@
---- main.c.orig	Sun Oct 22 04:13:23 1995
-+++ main.c	Sat Jan 27 15:22:17 2001
-@@ -56,6 +56,10 @@
+--- main.c.orig	1995-10-21 19:13:23 UTC
++++ main.c
+@@ -56,6 +56,10 @@ void help(void)
    printf("         Linux Support by Daniel Marks \n");
    printf("           GUS Support by David Jeske (jeske@uiuc.edu)\n");
  #endif /* LINUX */
@@ -11,7 +11,7 @@
  #if defined(__sgi)
    printf("           SGI Support by Mike Muuss (Mike@arl.mil)\n\n");
  #endif /* __sgi */
-@@ -69,6 +73,9 @@
+@@ -69,6 +73,9 @@ void help(void)
  #ifdef LINUX
    printf("     -b 16 bit samples\n");
  #endif /* ?LINUX */
@@ -21,7 +21,7 @@
    printf("     -f set frequency\n");
    printf("     -q quiet (don't print anything)\n");
    printf("     -n don't loop\n");
-@@ -76,6 +83,9 @@
+@@ -76,6 +83,9 @@ void help(void)
  #ifdef LINUX
    printf("     -g do NOT use GUS native mode\n");
  #endif /* ?LINUX */
@@ -31,7 +31,7 @@
    printf("     -p PAL speed adjustment (145bpm start)\n");
    printf("s3mod -sbf 44100 foobar.mod\n");
    printf("   plays in stereo, 16 bits, 44.1 kHz\n\n");
-@@ -109,7 +119,7 @@
+@@ -109,7 +119,7 @@ void get_audio_device(void)
  }
  
  
@@ -40,7 +40,7 @@
  {
    uint32 j;
    char *filename;
-@@ -241,6 +251,7 @@
+@@ -241,6 +251,7 @@ bit16 = 1;
    
    close_dsp_device();
    free(audio_start_buffer);
diff --git a/audio/s3mod/files/patch-main.h b/audio/s3mod/files/patch-main.h
index dd5881d1d985..048263ffdbde 100644
--- a/audio/s3mod/files/patch-main.h
+++ b/audio/s3mod/files/patch-main.h
@@ -1,6 +1,6 @@
---- main.h.orig	Sat Oct 21 15:56:32 1995
-+++ main.h	Sat Jan 27 15:30:30 2001
-@@ -43,7 +43,7 @@
+--- main.h.orig	1995-10-21 06:56:32 UTC
++++ main.h
+@@ -43,7 +43,7 @@ extern uint32 mixspeed;
  
  void help(void);
  void get_audio_device(void);
diff --git a/audio/s3mod/files/patch-mod.c b/audio/s3mod/files/patch-mod.c
index f31016c94442..3e8802d05424 100644
--- a/audio/s3mod/files/patch-mod.c
+++ b/audio/s3mod/files/patch-mod.c
@@ -1,5 +1,5 @@
---- mod.c.orig	Sun Oct 22 04:13:23 1995
-+++ mod.c	Sat Jan 27 15:04:15 2001
+--- mod.c.orig	1995-10-21 19:13:23 UTC
++++ mod.c
 @@ -11,7 +11,7 @@
  
  
@@ -9,7 +9,7 @@
  #include "gus.h"
  #endif /* GUS */
  
-@@ -130,8 +130,10 @@
+@@ -130,8 +130,10 @@ void beattrack(register track_info_ptr t
      /* Portamento Down */
      if ((track->period += track->port_down) > track->period_high_limit)
        track->period = track->period_high_limit;
diff --git a/audio/s3mod/files/patch-play.c b/audio/s3mod/files/patch-play.c
index 900d668bbecb..42aee42274f6 100644
--- a/audio/s3mod/files/patch-play.c
+++ b/audio/s3mod/files/patch-play.c
@@ -1,5 +1,5 @@
---- play.c.orig	Sun Oct 22 04:13:35 1995
-+++ play.c	Sat Jan 27 15:04:15 2001
+--- play.c.orig	1995-10-21 19:13:35 UTC
++++ play.c
 @@ -36,7 +36,7 @@
  #include "dsp.h"
  
diff --git a/audio/s3mod/files/patch-tables.h b/audio/s3mod/files/patch-tables.h
index 7bb5ff7e9925..8de857f48f38 100644
--- a/audio/s3mod/files/patch-tables.h
+++ b/audio/s3mod/files/patch-tables.h
@@ -1,5 +1,5 @@
---- tables.h.orig	Sat Oct 21 15:59:26 1995
-+++ tables.h	Sat Jan 27 15:31:20 2001
+--- tables.h.orig	1995-10-21 06:59:26 UTC
++++ tables.h
 @@ -13,7 +13,8 @@
  unsigned short base_freq_table[] =
  {