Cleanup patches, a* categories.

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

With hat:	portmgr
Sponsored by:	Absolight

5 files changed, 77 insertions, 104 deletions

diff --git a/audio/nspmod/files/patch-Makefile b/audio/nspmod/files/patch-Makefile
index 07273f38949f..9e9c4f038938 100644
--- a/audio/nspmod/files/patch-Makefile
+++ b/audio/nspmod/files/patch-Makefile
@@ -1,21 +1,13 @@
-*** Makefile.orig	Sun Sep 17 06:18:20 1995
---- Makefile	Tue Jun  3 02:48:46 1997
-***************
-*** 25,32 ****
-  
-  #}
-  
-! CFLAGS	= $(CFLAGS_OS) $(CFLAGS_OPT) $(CFLAGS_EXT)
-! CFLAGS_HIOPT_ = $(CFLAGS_OS) $(CFLAGS_HIOPT) $(CFLAGS_EXT)
-  LDFLAGS	= $(LDFLAGS_OS) $(LDFLAGS_EXT)
-  LIBS	= $(LIBS_EXT) $(LIBS_OS)
-  
---- 25,32 ----
-  
-  #}
-  
-! #CFLAGS	= $(CFLAGS_OS) $(CFLAGS_OPT) $(CFLAGS_EXT)
-! CFLAGS_HIOPT_ = $(CFLAGS) $(CFLAGS_HIOPT)
-  LDFLAGS	= $(LDFLAGS_OS) $(LDFLAGS_EXT)
-  LIBS	= $(LIBS_EXT) $(LIBS_OS)
-  
+--- Makefile.orig	1995-09-17 13:18:20 UTC
++++ Makefile
+@@ -25,8 +25,8 @@ DACIO_ARCH = dacio-linux.c
+ 
+ #}
+ 
+-CFLAGS	= $(CFLAGS_OS) $(CFLAGS_OPT) $(CFLAGS_EXT)
+-CFLAGS_HIOPT_ = $(CFLAGS_OS) $(CFLAGS_HIOPT) $(CFLAGS_EXT)
++#CFLAGS	= $(CFLAGS_OS) $(CFLAGS_OPT) $(CFLAGS_EXT)
++CFLAGS_HIOPT_ = $(CFLAGS) $(CFLAGS_HIOPT)
+ LDFLAGS	= $(LDFLAGS_OS) $(LDFLAGS_EXT)
+ LIBS	= $(LIBS_EXT) $(LIBS_OS)
+ 
diff --git a/audio/nspmod/files/patch-dacio-linux.c b/audio/nspmod/files/patch-dacio-linux.c
index f31c4efea135..c81ebe12ee3a 100644
--- a/audio/nspmod/files/patch-dacio-linux.c
+++ b/audio/nspmod/files/patch-dacio-linux.c
@@ -1,5 +1,5 @@
---- dacio-linux.c.orig	Sun Sep 17 05:51:43 1995
-+++ dacio-linux.c	Thu Aug 22 20:42:04 2002
+--- dacio-linux.c.orig	1995-09-17 12:51:43 UTC
++++ dacio-linux.c
 @@ -3,7 +3,11 @@
  #include <fcntl.h>	/*O_WRONLY*/
  #include <sys/ioctl.h>	/*(ioctl)*/
@@ -12,7 +12,7 @@
  #include <errno.h>	/*EINTR*/
  #include "defs.h"	/*u8,u16*/
  #include "dacio.h"	/*(dacioXXX)*/
-@@ -47,7 +51,7 @@
+@@ -47,7 +51,7 @@ dacioInit(void)
  static struct {
      union {
  	u8 *p8;
@@ -21,7 +21,7 @@
      } p;
      u8 *top;
      u8 *bot;
-@@ -67,11 +71,39 @@
+@@ -67,11 +71,39 @@ dacioConf(DacioConfInfo *dcp)
  	exit(1);
      }
  #endif
@@ -62,7 +62,7 @@
      /*fprintf(stderr, "fmt = 0x%x\n", tmp);*/
  
      if (ioctl(fd, SNDCTL_DSP_STEREO, &dcp->stereo) < 0) {
-@@ -90,10 +122,15 @@
+@@ -90,10 +122,15 @@ dacioConf(DacioConfInfo *dcp)
  	perror("dacioConf");
  	exit(1);
      }
@@ -79,7 +79,7 @@
      buf.p.p8 = buf.top;
      buf.bot = buf.top + buf.size;
  }
-@@ -115,7 +152,14 @@
+@@ -115,7 +152,14 @@ dacioFlush(void)
      int s;
  
      if (buf.p.p8 <= buf.top) return;
@@ -95,7 +95,7 @@
   RETRY:
      s = write(fd, buf.top, buf.size);
      if (s < buf.size) {
-@@ -179,6 +223,8 @@
+@@ -179,6 +223,8 @@ dacioGlobalVol(i15x v)
       (tmpvar & ~255)? ~tmpvar >> 16 : tmpvar ) /* 16 will be OK */
  /*                   ~(tmpvar >> 16) makes longer asm */
  #endif
@@ -104,7 +104,7 @@
  
  /* stereo */
  static void
-@@ -186,14 +232,26 @@
+@@ -186,14 +232,26 @@ dacioOutHirevS(i15x n)
  {
      const i31 *inbufp = inbuf.p;
      u8 *u8p = buf.p.p8;
@@ -136,7 +136,7 @@
  }
  
  /* mono */
-@@ -202,19 +260,31 @@
+@@ -202,19 +260,31 @@ dacioOutHirevM(i15x n)
  {
      const i31 *inbufp = inbuf.p;
      u8 *u8p = buf.p.p8;
diff --git a/audio/nspmod/files/patch-dacio.h b/audio/nspmod/files/patch-dacio.h
index eaf68819e358..6f4e2379debc 100644
--- a/audio/nspmod/files/patch-dacio.h
+++ b/audio/nspmod/files/patch-dacio.h
@@ -1,12 +1,10 @@
-*** dacio.h.orig	Wed Sep  3 14:58:39 1997
---- dacio.h	Wed Sep  3 13:49:32 1997
-***************
-*** 3,8 ****
---- 3,9 ----
-  #endif
-  
-  typedef struct {
-+     int bits;
-      int speed;
-      int stereo;
-  } DacioConfInfo;
+--- dacio.h.orig	1995-09-16 07:01:08 UTC
++++ dacio.h
+@@ -3,6 +3,7 @@
+ #endif
+ 
+ typedef struct {
++    int bits;
+     int speed;
+     int stereo;
+ } DacioConfInfo;
diff --git a/audio/nspmod/files/patch-nspmod.c b/audio/nspmod/files/patch-nspmod.c
index e031445d0fdd..ed4bb6938760 100644
--- a/audio/nspmod/files/patch-nspmod.c
+++ b/audio/nspmod/files/patch-nspmod.c
@@ -1,50 +1,35 @@
-*** nspmod.c.orig	Wed Sep  3 14:58:19 1997
---- nspmod.c	Wed Sep  3 14:55:06 1997
-***************
-*** 1,4 ****
---- 1,5 ----
-  #include <stdio.h>	/*(perror)*/
-+ #include <sys/types.h>
-  #include <sys/mman.h>	/*PROT_READ,MAP_xxx*/
-  #include <fcntl.h>	/*O_RDONLY*/
-  #include <sys/stat.h>	/*stat*/
-***************
-*** 35,40 ****
---- 36,42 ----
-      printf("NSPmod version " LIT(VERSION_MAJOR) "." LIT(VERSION_MINOR) "\n");
-      printf("Usage: %s [options] modfile\n", argv0);
-      printf("Options:\n");
-+     printf(" -b #  number of bits to output (8 or 16)\n");
-      printf(" -c #  play only the channel\n");
-      printf(" -e    show events\n");
-      printf(" -f #  output sample rate\n");
-***************
-*** 62,69 ****
-      oi.outRate = DEF_OUTRATE;
-      oi.ovsFreq = -1;
-      /*oi.repLimit = 1;*/
-!     while ((optChar = getopt(argc, argv, "c:ef:il:mo:rs:v:")) > 0) {
-  	switch (optChar) {
-  	case 'c': oi.onlyCh = (i15x)strtol(optarg, NULL, 0) | 0x100; break;
-  	case 'e': oi.showEvents++; break;
-  	case 'f': oi.outRate = (u16x)strtol(optarg, NULL, 0); break;
---- 64,72 ----
-      oi.outRate = DEF_OUTRATE;
-      oi.ovsFreq = -1;
-      /*oi.repLimit = 1;*/
-!     while ((optChar = getopt(argc, argv, "b:c:ef:il:mo:rs:v:")) > 0) {
-  	switch (optChar) {
-+ 	case 'b': oi.bits = (i15x)strtol(optarg, NULL, 0); break;
-  	case 'c': oi.onlyCh = (i15x)strtol(optarg, NULL, 0) | 0x100; break;
-  	case 'e': oi.showEvents++; break;
-  	case 'f': oi.outRate = (u16x)strtol(optarg, NULL, 0); break;
-***************
-*** 116,121 ****
---- 119,125 ----
-  
-      lookOverFile(p, statbuf.st_size);
-      dacioInit();
-+     dci.bits = oi.bits;
-      dci.speed = oi.outRate;
-      dci.stereo = !oi.mono;
-      dacioConf(&dci);
+--- nspmod.c.orig	1995-09-16 08:10:37 UTC
++++ nspmod.c
+@@ -1,4 +1,5 @@
+ #include <stdio.h>	/*(perror)*/
++#include <sys/types.h>
+ #include <sys/mman.h>	/*PROT_READ,MAP_xxx*/
+ #include <fcntl.h>	/*O_RDONLY*/
+ #include <sys/stat.h>	/*stat*/
+@@ -35,6 +36,7 @@ help(const char *argv0)
+     printf("NSPmod version " LIT(VERSION_MAJOR) "." LIT(VERSION_MINOR) "\n");
+     printf("Usage: %s [options] modfile\n", argv0);
+     printf("Options:\n");
++    printf(" -b #  number of bits to output (8 or 16)\n");
+     printf(" -c #  play only the channel\n");
+     printf(" -e    show events\n");
+     printf(" -f #  output sample rate\n");
+@@ -62,8 +64,9 @@ main(int argc, char *argv[])
+     oi.outRate = DEF_OUTRATE;
+     oi.ovsFreq = -1;
+     /*oi.repLimit = 1;*/
+-    while ((optChar = getopt(argc, argv, "c:ef:il:mo:rs:v:")) > 0) {
++    while ((optChar = getopt(argc, argv, "b:c:ef:il:mo:rs:v:")) > 0) {
+ 	switch (optChar) {
++	case 'b': oi.bits = (i15x)strtol(optarg, NULL, 0); break;
+ 	case 'c': oi.onlyCh = (i15x)strtol(optarg, NULL, 0) | 0x100; break;
+ 	case 'e': oi.showEvents++; break;
+ 	case 'f': oi.outRate = (u16x)strtol(optarg, NULL, 0); break;
+@@ -116,6 +119,7 @@ main(int argc, char *argv[])
+ 
+     lookOverFile(p, statbuf.st_size);
+     dacioInit();
++    dci.bits = oi.bits;
+     dci.speed = oi.outRate;
+     dci.stereo = !oi.mono;
+     dacioConf(&dci);
diff --git a/audio/nspmod/files/patch-nspmod.h b/audio/nspmod/files/patch-nspmod.h
index 687f69484bf2..460df995f714 100644
--- a/audio/nspmod/files/patch-nspmod.h
+++ b/audio/nspmod/files/patch-nspmod.h
@@ -1,12 +1,10 @@
-*** nspmod.h.orig	Wed Sep  3 14:58:53 1997
---- nspmod.h	Wed Sep  3 13:47:40 1997
-***************
-*** 3,8 ****
---- 3,9 ----
-  #endif
-  
-  typedef struct {
-+     i15x bits;		/* -b # */
-      i15x onlyCh;	/* -c # */
-      i15x showEvents;	/* -e, -ee */
-      u16x outRate;	/* -f # */
+--- nspmod.h.orig	1995-09-16 06:50:32 UTC
++++ nspmod.h
+@@ -3,6 +3,7 @@
+ #endif
+ 
+ typedef struct {
++    i15x bits;		/* -b # */
+     i15x onlyCh;	/* -c # */
+     i15x showEvents;	/* -e, -ee */
+     u16x outRate;	/* -f # */