Cleanup patches, a* categories.

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

With hat:	portmgr
Sponsored by:	Absolight

12 files changed, 69 insertions, 71 deletions

diff --git a/archivers/arc/files/patch-Makefile b/archivers/arc/files/patch-Makefile
index 39dc54bd7d4a..bc67c7a69791 100644
--- a/archivers/arc/files/patch-Makefile
+++ b/archivers/arc/files/patch-Makefile
@@ -1,7 +1,7 @@
---- Makefile.orig	Fri Oct 31 05:32:51 2003
-+++ Makefile	Wed Nov  5 13:53:51 2003
-@@ -38,14 +38,14 @@
- OPT = -O
+--- Makefile.orig	2010-08-07 13:06:42 UTC
++++ Makefile
+@@ -44,14 +44,14 @@ SYSTEM = -DSYSV=1
+ OPT = -O -Wall
  # For MWC 3.0 on the Atari ST, use:
  #CFLAGS = -VCOMPAC -VPEEP
 -CFLAGS = $(OPT) $(SYSTEM)
diff --git a/archivers/arc/files/patch-arc.c b/archivers/arc/files/patch-arc.c
index 63954d8d2317..446149131503 100644
--- a/archivers/arc/files/patch-arc.c
+++ b/archivers/arc/files/patch-arc.c
@@ -1,6 +1,6 @@
---- arc.c.orig	Sun Oct  9 03:38:22 2005
-+++ arc.c	Fri Oct 14 14:22:38 2005
-@@ -290,7 +290,7 @@
+--- arc.c.orig	2010-08-07 13:06:42 UTC
++++ arc.c
+@@ -298,7 +298,7 @@ main(num, arg)			/* system entry point *
  			keepbak = 1;
  
  		else if (*a == 'W')	/* suppress warnings */
@@ -9,7 +9,7 @@
  #if	!DOS
  		else if (*a == 'I')	/* image mode, no ASCII/EBCDIC x-late */
  			image = !image;
-@@ -426,7 +426,7 @@
+@@ -434,7 +434,7 @@ static	VOID
  expandlst(n)			/* expand an indirect reference */
  	int		n;	/* number of entry to expand */
  {
diff --git a/archivers/arc/files/patch-arc.h b/archivers/arc/files/patch-arc.h
index a228e9d11dfd..0ba371b9f874 100644
--- a/archivers/arc/files/patch-arc.h
+++ b/archivers/arc/files/patch-arc.h
@@ -1,6 +1,6 @@
---- ./arc.h.orig	Tue Aug 10 23:03:24 1999
-+++ ./arc.h	Tue Aug 10 23:01:55 1999
-@@ -106,7 +106,7 @@
+--- arc.h.orig	2010-08-07 13:06:42 UTC
++++ arc.h
+@@ -106,7 +106,7 @@ extern char     tmpchr[2];	/* Temporary 
  #if	GEMDOS
  extern int      hold;		/* hold screen before exiting */
  #endif
diff --git a/archivers/arc/files/patch-arcadd.c b/archivers/arc/files/patch-arcadd.c
index 8a5597cfc6f5..2c10334c08a0 100644
--- a/archivers/arc/files/patch-arcadd.c
+++ b/archivers/arc/files/patch-arcadd.c
@@ -1,6 +1,6 @@
---- ./arcadd.c.orig	Tue Aug 10 23:03:24 1999
-+++ ./arcadd.c	Tue Aug 10 23:01:55 1999
-@@ -119,7 +119,7 @@
+--- arcadd.c.orig	2010-08-07 13:06:42 UTC
++++ arcadd.c
+@@ -119,7 +119,7 @@ int             fresh;		/* true if fresh
  			}
  #endif
  		}
@@ -9,7 +9,7 @@
  			printf("No files match: %s\n", arg[n]);
  	}
  
-@@ -133,7 +133,7 @@
+@@ -133,7 +133,7 @@ int             fresh;		/* true if fresh
  		free(path);
  		free(name);
  	}
@@ -18,7 +18,7 @@
  		printf("No files were added.\n");
  }
  
-@@ -227,7 +227,7 @@
+@@ -227,7 +227,7 @@ addbunch(nfiles, path, name, move, updat
  	if (move) {		/* if this was a move */
  		for (n = 0; n < nfiles; n++) {	/* then delete each file
  						 * added */
@@ -27,7 +27,7 @@
  				printf("Cannot unsave %s\n", path[n]);
  				nerrs++;
  			}
-@@ -259,7 +259,7 @@
+@@ -259,7 +259,7 @@ addfile(path, name, update, fresh)	/* ad
  	if (!f)
  #endif
  	{
@@ -36,7 +36,7 @@
  			printf("Cannot read file: %s\n", path);
  			nerrs++;
  		}
-@@ -267,7 +267,7 @@
+@@ -267,7 +267,7 @@ addfile(path, name, update, fresh)	/* ad
  	}
  #if	!DOS
  	if (strlen(name) >= FNLEN) {
diff --git a/archivers/arc/files/patch-arccvt.c b/archivers/arc/files/patch-arccvt.c
index 1f496113cbb2..54fe714c5b57 100644
--- a/archivers/arc/files/patch-arccvt.c
+++ b/archivers/arc/files/patch-arccvt.c
@@ -1,6 +1,6 @@
---- ./arccvt.c.orig	Tue Aug 10 23:03:24 1999
-+++ ./arccvt.c	Tue Aug 10 23:01:55 1999
-@@ -120,7 +120,7 @@
+--- arccvt.c.orig	2010-08-07 13:06:42 UTC
++++ arccvt.c
+@@ -120,7 +120,7 @@ cvtfile(hdr)			/* convert a file */
  	writehdr(hdr, new);	/* write out real header */
  	fseek(new, hdr->size, 1);	/* skip over data to next header */
  	fclose(tmp);		/* all done with the file */
diff --git a/archivers/arc/files/patch-arcdata.c b/archivers/arc/files/patch-arcdata.c
index f9e7a9067de8..386eb235c141 100644
--- a/archivers/arc/files/patch-arcdata.c
+++ b/archivers/arc/files/patch-arcdata.c
@@ -1,6 +1,6 @@
---- ./arcdata.c.orig	Tue Aug 10 23:03:24 1999
-+++ ./arcdata.c	Tue Aug 10 23:01:56 1999
-@@ -35,7 +35,7 @@
+--- arcdata.c.orig	2010-08-07 13:06:42 UTC
++++ arcdata.c
+@@ -35,7 +35,7 @@ char            tmpchr[2] = "-";/* Tempo
  #if	GEMDOS
  int		hold = 0;	/* true to pause before exit */
  #endif
diff --git a/archivers/arc/files/patch-arcdos.c b/archivers/arc/files/patch-arcdos.c
index 52bf11b472f3..28cec121b0f3 100644
--- a/archivers/arc/files/patch-arcdos.c
+++ b/archivers/arc/files/patch-arcdos.c
@@ -1,25 +1,23 @@
-*** arcdos.c.old	Wed Apr 15 02:58:21 1992
---- arcdos.c	Sat Dec 31 20:32:25 1994
-***************
-*** 173,186 ****
---- 173,192 ----
-  	struct tm	tm;
-  	struct timeval  tvp[2];
-  	int	utimes();
-+ #if !defined(__FreeBSD__) && !defined(__OpenBSD__)
-  	long	tmclock();
-+ #endif
-  	tm.tm_sec = (time & 31) * 2;
-  	tm.tm_min = (time >> 5) & 63;
-  	tm.tm_hour = (time >> 11);
-  	tm.tm_mday = date & 31;
-  	tm.tm_mon = ((date >> 5) & 15) - 1;
-  	tm.tm_year = (date >> 9) + 80;
-+ #if !defined(__FreeBSD__) && !defined(__OpenBSD__) && !defined(__NetBSD__)
-  	tvp[0].tv_sec = tmclock(&tm);
-+ #else
-+ 	tvp[0].tv_sec = timelocal(&tm);
-+ #endif
-  	tvp[1].tv_sec = tvp[0].tv_sec;
-  	tvp[0].tv_usec = tvp[1].tv_usec = 0;
-  	utimes(f, tvp);
+--- arcdos.c.orig	2010-08-07 13:06:42 UTC
++++ arcdos.c
+@@ -175,14 +175,20 @@ setstamp(f, date, time)		/* set a file's
+ 	struct tm	tm;
+ 	struct timeval  tvp[2];
+ 	int	utimes();
++#if !defined(__FreeBSD__) && !defined(__OpenBSD__)
+ 	long	tmclock();
++#endif
+ 	tm.tm_sec = (time & 31) * 2;
+ 	tm.tm_min = (time >> 5) & 63;
+ 	tm.tm_hour = (time >> 11);
+ 	tm.tm_mday = date & 31;
+ 	tm.tm_mon = ((date >> 5) & 15) - 1;
+ 	tm.tm_year = (date >> 9) + 80;
++#if !defined(__FreeBSD__) && !defined(__OpenBSD__) && !defined(__NetBSD__)
+ 	tvp[0].tv_sec = tmclock(&tm);
++#else
++	tvp[0].tv_sec = timelocal(&tm);
++#endif
+ 	tvp[1].tv_sec = tvp[0].tv_sec;
+ 	tvp[0].tv_usec = tvp[1].tv_usec = 0;
+ 	utimes(f, tvp);
diff --git a/archivers/arc/files/patch-arcext.c b/archivers/arc/files/patch-arcext.c
index eae8495ed002..7e8f1434ea04 100644
--- a/archivers/arc/files/patch-arcext.c
+++ b/archivers/arc/files/patch-arcext.c
@@ -1,6 +1,6 @@
---- arcext.c.orig	Sat Oct  8 22:24:37 2005
-+++ arcext.c	Fri Oct 14 00:52:14 2005
-@@ -143,7 +143,7 @@
+--- arcext.c.orig	2010-08-07 13:06:42 UTC
++++ arcext.c
+@@ -143,7 +143,7 @@ extfile(hdr, path, prt)		/* extract a fi
  	if (note)
  		printf("Extracting file: %s\n", fix);
  
@@ -9,7 +9,7 @@
  		if ((f = fopen(fix, "r"))) {	/* see if it exists */
  				fclose(f);
  				printf("WARNING: File %s already exists!", fix);
-@@ -190,7 +190,7 @@
+@@ -191,7 +191,7 @@ extfile(hdr, path, prt)		/* extract a fi
  	if (!f)
  #endif
  	{
diff --git a/archivers/arc/files/patch-arcio.c b/archivers/arc/files/patch-arcio.c
index 7034aeaf6cb0..be27ece679a4 100644
--- a/archivers/arc/files/patch-arcio.c
+++ b/archivers/arc/files/patch-arcio.c
@@ -1,6 +1,6 @@
---- arcio.c.orig	Wed Apr 15 02:58:26 1992
-+++ arcio.c	Sat Aug 11 22:10:55 2001
-@@ -46,7 +46,7 @@
+--- arcio.c.orig	2010-08-07 13:06:42 UTC
++++ arcio.c
+@@ -46,7 +46,7 @@ readhdr(hdr, f)			/* read a header from 
  		return 0;	/* then signal end of archive */
  
  	if (hdrver != ARCMARK) {	/* check archive validity */
@@ -9,7 +9,7 @@
  			printf("An entry in %s has a bad header.\n", arcname);
  			nerrs++;
  		}
-@@ -63,10 +63,10 @@
+@@ -67,10 +67,10 @@ readhdr(hdr, f)			/* read a header from 
  		if (feof(f) && first)
  			arcdie("%s is not an archive", arcname);
  
@@ -22,7 +22,7 @@
  			printf("  %d bytes skipped.\n", try);
  
  		if (feof(f))
-@@ -110,7 +110,8 @@
+@@ -118,7 +118,8 @@ readhdr(hdr, f)			/* read a header from 
  	hdr->crc = (short) ((dummy[22] << 8) + dummy[21]);
  	for (i = 0, hdr->length=0; i<4; hdr->length<<=8, hdr->length += dummy[26-i], i++);
  #endif
diff --git a/archivers/arc/files/patch-arclzw.c b/archivers/arc/files/patch-arclzw.c
index 7933c26409d1..c0f1c8996403 100644
--- a/archivers/arc/files/patch-arclzw.c
+++ b/archivers/arc/files/patch-arclzw.c
@@ -1,6 +1,6 @@
---- ./arclzw.c.orig	Tue Aug 10 23:03:25 1999
-+++ ./arclzw.c	Tue Aug 10 23:01:57 1999
-@@ -546,7 +546,7 @@
+--- arclzw.c.orig	2010-08-07 13:06:42 UTC
++++ arclzw.c
+@@ -560,7 +560,7 @@ decomp(squash, f, t)		/* decompress a fi
  		 */
  		if (code >= free_ent) {
  			if (code > free_ent) {
diff --git a/archivers/arc/files/patch-arcrun.c b/archivers/arc/files/patch-arcrun.c
index 207e33531b82..42b1985b4bd8 100644
--- a/archivers/arc/files/patch-arcrun.c
+++ b/archivers/arc/files/patch-arcrun.c
@@ -1,6 +1,6 @@
---- arcrun.c.orig	Wed Oct 12 19:22:18 2005
-+++ arcrun.c	Sat May 27 03:47:30 2006
-@@ -98,7 +98,7 @@
+--- arcrun.c.orig	2010-08-07 13:06:42 UTC
++++ arcrun.c
+@@ -98,7 +98,7 @@ runfile(hdr, num, arg)		/* run a file */
  		strcpy(sys, buf);
  
  	else {
@@ -9,7 +9,7 @@
  			printf("File %s is not a .BAS, .BAT, .COM, or .EXE\n",
  			       hdr->name);
  			nerrs++;
-@@ -112,7 +112,7 @@
+@@ -112,7 +112,7 @@ runfile(hdr, num, arg)		/* run a file */
                && strcmp(i, ".TTP")
                && strcmp(i, ".TOS"))
        {
@@ -18,7 +18,7 @@
                        printf("File %s is not a .PRG, .TOS, or .TTP\n",
                                hdr->name);
                        nerrs++;
-@@ -122,7 +122,7 @@
+@@ -122,7 +122,7 @@ runfile(hdr, num, arg)		/* run a file */
        }
  #endif
  
@@ -27,7 +27,7 @@
  		if ((tmp = fopen(buf, "r")))
  			arcdie("Temporary file %s already exists", buf);
  	if (!(tmp = tmpopen(buf)))
-@@ -146,7 +146,7 @@
+@@ -146,7 +146,7 @@ runfile(hdr, num, arg)		/* run a file */
  	if (system(buf))		/* try to invoke it */
  		arcdie("Execution failed for %s", buf);
  #endif
diff --git a/archivers/arc/files/patch-arcunp.c b/archivers/arc/files/patch-arcunp.c
index 08e091f2462e..ed3f7191d744 100644
--- a/archivers/arc/files/patch-arcunp.c
+++ b/archivers/arc/files/patch-arcunp.c
@@ -1,6 +1,6 @@
---- ./arcunp.c.orig	Tue Aug 10 23:03:25 1999
-+++ ./arcunp.c	Tue Aug 10 23:01:57 1999
-@@ -123,7 +123,7 @@
+--- arcunp.c.orig	2010-08-07 13:06:42 UTC
++++ arcunp.c
+@@ -122,7 +122,7 @@ unpack(f, t, hdr)		/* unpack an archive 
  		break;
  
  	default:		/* unknown method */
@@ -9,7 +9,7 @@
  			printf("I don't know how to unpack file %s\n", hdr->name);
  			printf("I think you need a newer version of ARC\n");
  			nerrs++;
-@@ -135,7 +135,7 @@
+@@ -134,7 +134,7 @@ unpack(f, t, hdr)		/* unpack an archive 
  	/* cleanups common to all methods */
  
  	if (crcval != hdr->crc) {