Cleanup patches, a* categories.

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

With hat:	portmgr
Sponsored by:	Absolight

5 files changed, 57 insertions, 88 deletions

diff --git a/audio/tosha/files/patch-Makefile b/audio/tosha/files/patch-Makefile
index a2dae8165ea7..320b9ddbc14e 100644
--- a/audio/tosha/files/patch-Makefile
+++ b/audio/tosha/files/patch-Makefile
@@ -1,6 +1,6 @@
 --- Makefile.orig	1998-12-16 12:34:09 UTC
 +++ Makefile
-@@ -53,15 +53,10 @@
+@@ -53,15 +53,10 @@ pcmfade:	pcmfade.o utils.o
  	$(CC) $(CFLAGS) -o pcmfade pcmfade.o utils.o
  
  install:	$(BINS)
diff --git a/audio/tosha/files/patch-pcmplay.c b/audio/tosha/files/patch-pcmplay.c
index 5e46e05837e0..d2e904255f35 100644
--- a/audio/tosha/files/patch-pcmplay.c
+++ b/audio/tosha/files/patch-pcmplay.c
@@ -1,6 +1,6 @@
---- pcmplay.c.old	Sat Jan  2 08:57:41 1999
-+++ pcmplay.c	Thu Apr 11 08:00:07 2002
-@@ -44,7 +44,7 @@
+--- pcmplay.c.orig	1999-01-01 23:57:41 UTC
++++ pcmplay.c
+@@ -44,7 +44,7 @@ static const char cvsid[]
  #include <sys/types.h>
  #include <sys/uio.h>
  #include <unistd.h>
diff --git a/audio/tosha/files/patch-tosha.c b/audio/tosha/files/patch-tosha.c
index d8a03754384f..dae5a18859b0 100644
--- a/audio/tosha/files/patch-tosha.c
+++ b/audio/tosha/files/patch-tosha.c
@@ -1,76 +1,45 @@
-*** tosha.c.orig	Fri Jan  1 16:57:49 1999
---- tosha.c	Wed Feb  7 13:29:21 2001
-***************
-*** 240,247 ****
-  		return template;
-  	if (!(tmpstr = malloc(strlen(template) + strlen(formatspec->ext) - 1)))
-  		out_of_memory();
-! 	if ((prefix = cptr - template))
-  		strncpy (tmpstr, template, prefix);
-  	strcat (tmpstr + prefix, formatspec->ext);
-  	prefix += strlen(formatspec->ext);
-  	strcat (tmpstr + prefix, cptr + 2);
---- 240,249 ----
-  		return template;
-  	if (!(tmpstr = malloc(strlen(template) + strlen(formatspec->ext) - 1)))
-  		out_of_memory();
-! 	if ((prefix = cptr - template)) {
-  		strncpy (tmpstr, template, prefix);
-+ 		tmpstr[prefix] = '\0';
-+ 	}
-  	strcat (tmpstr + prefix, formatspec->ext);
-  	prefix += strlen(formatspec->ext);
-  	strcat (tmpstr + prefix, cptr + 2);
-***************
-*** 369,379 ****
-  				frmctl = trackctl[i];
-  				break;
-  			}
-! 		if (frmctl < 0) /* Ugh! */
-  			if (numtracks >= 1 && start >= trackstart[1])
-  				frmctl = trackctl[numtracks - 1];
-  			else
-  				frmctl = trackctl[0];
-  	}
-  	if ((frmctl & 4) == 0)
-  		return 1;
---- 371,382 ----
-  				frmctl = trackctl[i];
-  				break;
-  			}
-! 		if (frmctl < 0) { /* Ugh! */
-  			if (numtracks >= 1 && start >= trackstart[1])
-  				frmctl = trackctl[numtracks - 1];
-  			else
-  				frmctl = trackctl[0];
-+ 		}
-  	}
-  	if ((frmctl & 4) == 0)
-  		return 1;
-***************
-*** 698,704 ****
-  	 *   Now get us the stuff!
-  	 */
-  
-! 	if (!indexonly && (singlefile = startsec >= 0 || !strchr(outname, '%')))
-  		if (!strcmp(outname, "-"))
-  			pcmfd = 1;
-  		else {
---- 701,707 ----
-  	 *   Now get us the stuff!
-  	 */
-  
-! 	if (!indexonly && (singlefile = startsec >= 0 || !strchr(outname, '%'))){
-  		if (!strcmp(outname, "-"))
-  			pcmfd = 1;
-  		else {
-***************
-*** 710,715 ****
---- 713,719 ----
-  					O_TRUNC, 0644)) < 0)
-  				die ("open(output file)");
-  		}
-+ 	}
-  	if (!quiet)
-  		print_head();
-  	get_time (&starttime);
+--- tosha.c.orig	1999-01-01 23:57:49 UTC
++++ tosha.c
+@@ -240,8 +240,10 @@ resolve_extension (char *template)
+ 		return template;
+ 	if (!(tmpstr = malloc(strlen(template) + strlen(formatspec->ext) - 1)))
+ 		out_of_memory();
+-	if ((prefix = cptr - template))
++	if ((prefix = cptr - template)) {
+ 		strncpy (tmpstr, template, prefix);
++		tmpstr[prefix] = '\0';
++	}
+ 	strcat (tmpstr + prefix, formatspec->ext);
+ 	prefix += strlen(formatspec->ext);
+ 	strcat (tmpstr + prefix, cptr + 2);
+@@ -369,11 +371,12 @@ is_audio (int track, ulong start)
+ 				frmctl = trackctl[i];
+ 				break;
+ 			}
+-		if (frmctl < 0) /* Ugh! */
++		if (frmctl < 0) { /* Ugh! */
+ 			if (numtracks >= 1 && start >= trackstart[1])
+ 				frmctl = trackctl[numtracks - 1];
+ 			else
+ 				frmctl = trackctl[0];
++		}
+ 	}
+ 	if ((frmctl & 4) == 0)
+ 		return 1;
+@@ -698,7 +701,7 @@ main (int argc, char *argv[])
+ 	 *   Now get us the stuff!
+ 	 */
+ 
+-	if (!indexonly && (singlefile = startsec >= 0 || !strchr(outname, '%')))
++	if (!indexonly && (singlefile = startsec >= 0 || !strchr(outname, '%'))){
+ 		if (!strcmp(outname, "-"))
+ 			pcmfd = 1;
+ 		else {
+@@ -710,6 +713,7 @@ main (int argc, char *argv[])
+ 					O_TRUNC, 0644)) < 0)
+ 				die ("open(output file)");
+ 		}
++	}
+ 	if (!quiet)
+ 		print_head();
+ 	get_time (&starttime);
diff --git a/audio/tosha/files/patch-utils.c b/audio/tosha/files/patch-utils.c
index 4b34b37e9d3e..f93d6c651dad 100644
--- a/audio/tosha/files/patch-utils.c
+++ b/audio/tosha/files/patch-utils.c
@@ -1,6 +1,6 @@
---- utils.c.orig	2009-02-24 14:41:16.000000000 +0100
-+++ utils.c	2009-02-24 14:41:55.000000000 +0100
-@@ -59,6 +59,9 @@
+--- utils.c.orig	1999-01-01 23:57:50 UTC
++++ utils.c
+@@ -59,6 +59,9 @@ void *tmalloc (size_t size)
  	return (mem);
  }
  
@@ -10,7 +10,7 @@
  char *strndup (char *src, int num)
  {
  	char *dst;
-@@ -68,6 +71,8 @@
+@@ -68,6 +71,8 @@ char *strndup (char *src, int num)
  	dst[num] = '\0';
  	return (strncpy(dst, src, num));
  }
diff --git a/audio/tosha/files/patch-utils.h b/audio/tosha/files/patch-utils.h
index 32b32cbee6ab..4062a9b1daad 100644
--- a/audio/tosha/files/patch-utils.h
+++ b/audio/tosha/files/patch-utils.h
@@ -1,6 +1,6 @@
---- utils.h.orig	2009-02-24 14:41:21.000000000 +0100
-+++ utils.h	2009-02-24 14:42:08.000000000 +0100
-@@ -63,6 +63,9 @@
+--- utils.h.orig	1999-01-01 23:57:51 UTC
++++ utils.h
+@@ -63,6 +63,9 @@ void *tmalloc (size_t size);
   *   allocated.
   */
  
@@ -10,7 +10,7 @@
  char *strndup (char *src, int num);
  /*
   *   Like strdup(), but limits the string length to at most
-@@ -71,6 +74,8 @@
+@@ -71,6 +74,8 @@ char *strndup (char *src, int num);
   *   Always allocates <num>+1 bytes, even if less space would
   *   be sufficient to store <src>.
   */