Cleanup patches, a* categories.

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

With hat:	portmgr
Sponsored by:	Absolight

21 files changed, 63 insertions, 63 deletions

diff --git a/archivers/libcabinet/files/patch-Makefile b/archivers/libcabinet/files/patch-Makefile
index 01e67ad0e9fc..cdf7152ad4fc 100644
--- a/archivers/libcabinet/files/patch-Makefile
+++ b/archivers/libcabinet/files/patch-Makefile
@@ -1,5 +1,5 @@
---- Makefile.orig	Tue Aug 19 18:15:11 2003
-+++ Makefile	Tue Aug 19 18:33:06 2003
+--- Makefile.orig	2016-07-26 12:03:27 UTC
++++ Makefile
 @@ -0,0 +1,16 @@
 +NO_PROFILE=	true
 +CXXFLAGS+=	-Wno-deprecated 
diff --git a/archivers/libcabinet/files/patch-bstring.cpp b/archivers/libcabinet/files/patch-bstring.cpp
index c4f88c8138f2..b37512ddc7b3 100644
--- a/archivers/libcabinet/files/patch-bstring.cpp
+++ b/archivers/libcabinet/files/patch-bstring.cpp
@@ -1,5 +1,5 @@
---- bstring.cpp.orig	2014-07-27 11:17:34.000000000 -0400
-+++ bstring.cpp	2014-07-27 11:17:37.000000000 -0400
+--- bstring.cpp.orig	1999-10-24 11:29:53 UTC
++++ bstring.cpp
 @@ -15,7 +15,7 @@
  
  #include "bstring.h"
@@ -9,7 +9,7 @@
  
  ///////////////////////////////////////***************************************
  
-@@ -91,7 +91,7 @@
+@@ -91,7 +91,7 @@ b_string& b_string::operator += (const c
  
  b_string b_string::operator + (const char* s)
  {
@@ -18,7 +18,7 @@
  	return temp += s;
  }
  
-@@ -150,7 +150,7 @@
+@@ -150,7 +150,7 @@ b_string& b_string::StpCpy(const char* s
  		if(strlen(str) < strlen(s))	// If more memory is needed
  			*this = s;			// Use assign function
  		else						// If stpcpy can be used
@@ -27,7 +27,7 @@
  	}
  
  	return *this;					// Return a refrence to this object
-@@ -217,4 +217,4 @@
+@@ -217,4 +217,4 @@ istream& operator >> (istream& input, b_
  
  //*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/
  
diff --git a/archivers/libcabinet/files/patch-bstring.h b/archivers/libcabinet/files/patch-bstring.h
index 77047321f149..ff19e14260b7 100644
--- a/archivers/libcabinet/files/patch-bstring.h
+++ b/archivers/libcabinet/files/patch-bstring.h
@@ -1,5 +1,5 @@
---- bstring.h.orig	1999-10-24 07:29:53.000000000 -0400
-+++ bstring.h	2014-02-21 16:09:56.194556928 -0500
+--- bstring.h.orig	1999-10-24 11:29:53 UTC
++++ bstring.h
 @@ -21,13 +21,15 @@
  #ifndef __BSTRING_HPP__
  #define __BSTRING_HPP__
diff --git a/archivers/libcabinet/files/patch-cfcreate.cpp b/archivers/libcabinet/files/patch-cfcreate.cpp
index 029861262d78..2dd4b65325d6 100644
--- a/archivers/libcabinet/files/patch-cfcreate.cpp
+++ b/archivers/libcabinet/files/patch-cfcreate.cpp
@@ -1,5 +1,5 @@
---- cfcreate.cpp.orig	1999-10-24 07:29:53.000000000 -0400
-+++ cfcreate.cpp	2014-02-21 15:48:26.812268415 -0500
+--- cfcreate.cpp.orig	1999-10-24 11:29:53 UTC
++++ cfcreate.cpp
 @@ -29,6 +29,10 @@
  #include <unistd.h>
  #endif
@@ -11,7 +11,7 @@
  ///////////////////////////////////////***************************************
  
  int cfc_fileinfo::write_entry(ostream& out)
-@@ -129,7 +133,7 @@
+@@ -129,7 +133,7 @@ int cfc_folderinfo::add_file(const char*
  		}
  	}
  
@@ -20,7 +20,7 @@
  #ifndef unix
  	if(getftime(in.rdbuf()->fd(), &datetime) != 0) return GETTIME_FAILURE;
  #endif
-@@ -194,7 +198,7 @@
+@@ -194,7 +198,7 @@ int cfc_folderinfo::read_block(istream& 
  	unprocessed_data = NULL;				// Reset buffer holder
  	unprocessed_data_len = 0u;
  
@@ -29,7 +29,7 @@
  	{
  		delete[] buf;
  		buf = NULL;
-@@ -272,7 +276,7 @@
+@@ -272,7 +276,7 @@ int cfc_folderinfo::process_block(const 
  		return WRITE_ERROR;
  	}
  
diff --git a/archivers/libcabinet/files/patch-cfcreate.h b/archivers/libcabinet/files/patch-cfcreate.h
index 023e4a6b9602..de0dc7e5ed41 100644
--- a/archivers/libcabinet/files/patch-cfcreate.h
+++ b/archivers/libcabinet/files/patch-cfcreate.h
@@ -1,5 +1,5 @@
---- cfcreate.h.orig	1999-10-24 07:29:53.000000000 -0400
-+++ cfcreate.h	2014-02-21 15:47:18.116272433 -0500
+--- cfcreate.h.orig	1999-10-24 11:29:53 UTC
++++ cfcreate.h
 @@ -20,6 +20,8 @@
  #include "cffile.h"
  #include "zlib.h"
@@ -9,7 +9,7 @@
  #ifdef unix
  #include <unistd.h>
  #endif
-@@ -211,7 +213,7 @@
+@@ -211,7 +213,7 @@ class cfc_folderinfo : public ObjectBase
  		int process_block(const byte* data, word datalen);
  		int read_block(istream& in, byte* &buf, int& bytesread);
  		int compress_block(byte* &dest, word &destlen, byte* src, word srclen);
diff --git a/archivers/libcabinet/files/patch-cfdblock.cpp b/archivers/libcabinet/files/patch-cfdblock.cpp
index 63e1ebde2a80..b11eb74a96db 100644
--- a/archivers/libcabinet/files/patch-cfdblock.cpp
+++ b/archivers/libcabinet/files/patch-cfdblock.cpp
@@ -1,5 +1,5 @@
---- cfdblock.cpp.orig	1999-10-24 02:13:29.000000000 -0400
-+++ cfdblock.cpp	2014-02-21 15:49:13.695264850 -0500
+--- cfdblock.cpp.orig	1999-10-24 06:13:29 UTC
++++ cfdblock.cpp
 @@ -17,7 +17,7 @@
  #ifndef __CFDBLOCK_CPP__
  #define __CFDBLOCK_CPP__
@@ -9,7 +9,7 @@
  #include "cftypes.h"
  #include "cfdblock.h"
  #include "cfheader.h"
-@@ -124,7 +124,7 @@
+@@ -124,7 +124,7 @@ int cabinet_datablock::read(istream& in,
  		ra_size = cab_header.get_datablock_ra_size();
  		reserved_area = new byte[ra_size];
  
@@ -18,7 +18,7 @@
  		{
  			return (in.fail()) ? READ_ERROR : UNEXPECTED_EOF;
  		}
-@@ -154,7 +154,7 @@
+@@ -154,7 +154,7 @@ int cabinet_datablock::write(ostream& ou
  
  	if(ra_size)		 				// If reserve area, write it
  	{
diff --git a/archivers/libcabinet/files/patch-cfdblock.h b/archivers/libcabinet/files/patch-cfdblock.h
index 05fa803caccd..7de70e3720fb 100644
--- a/archivers/libcabinet/files/patch-cfdblock.h
+++ b/archivers/libcabinet/files/patch-cfdblock.h
@@ -1,5 +1,5 @@
---- cfdblock.h.orig	2014-02-21 15:49:53.526262379 -0500
-+++ cfdblock.h	2014-02-21 15:50:02.511261600 -0500
+--- cfdblock.h.orig	1999-10-24 06:13:29 UTC
++++ cfdblock.h
 @@ -14,7 +14,7 @@
  #ifndef __CFDBLOCK_H__
  #define __CFDBLOCK_H__
diff --git a/archivers/libcabinet/files/patch-cffdrmgr.cpp b/archivers/libcabinet/files/patch-cffdrmgr.cpp
index 88210e589287..a592124c1f34 100644
--- a/archivers/libcabinet/files/patch-cffdrmgr.cpp
+++ b/archivers/libcabinet/files/patch-cffdrmgr.cpp
@@ -1,5 +1,5 @@
---- cffdrmgr.cpp.orig	2014-02-21 15:50:45.048258834 -0500
-+++ cffdrmgr.cpp	2014-02-21 15:50:53.033257685 -0500
+--- cffdrmgr.cpp.orig	1999-10-24 11:29:53 UTC
++++ cffdrmgr.cpp
 @@ -12,7 +12,7 @@
  #ifndef __CFFDRMGR_CPP__
  #define __CFFDRMGR_CPP__
diff --git a/archivers/libcabinet/files/patch-cffdrmgr.h b/archivers/libcabinet/files/patch-cffdrmgr.h
index 5d44fcd11ad5..9c879ee68c8e 100644
--- a/archivers/libcabinet/files/patch-cffdrmgr.h
+++ b/archivers/libcabinet/files/patch-cffdrmgr.h
@@ -1,5 +1,5 @@
---- cffdrmgr.h.orig	2014-02-21 15:51:05.912257936 -0500
-+++ cffdrmgr.h	2014-02-21 15:51:13.426256130 -0500
+--- cffdrmgr.h.orig	1999-10-24 06:13:29 UTC
++++ cffdrmgr.h
 @@ -9,7 +9,7 @@
  #ifndef __CFFDRMGR_H__
  #define __CFFDRMGR_H__
diff --git a/archivers/libcabinet/files/patch-cffile.cpp b/archivers/libcabinet/files/patch-cffile.cpp
index 4ccda8e072fe..b9c2414d93df 100644
--- a/archivers/libcabinet/files/patch-cffile.cpp
+++ b/archivers/libcabinet/files/patch-cffile.cpp
@@ -1,5 +1,5 @@
---- cffile.cpp.orig	2014-02-21 15:52:54.235249989 -0500
-+++ cffile.cpp	2014-02-21 15:53:02.965814752 -0500
+--- cffile.cpp.orig	1999-10-24 06:13:29 UTC
++++ cffile.cpp
 @@ -17,7 +17,7 @@
  #ifndef __CFFILE_CPP__
  #define __CFFILE_CPP__
diff --git a/archivers/libcabinet/files/patch-cffile.h b/archivers/libcabinet/files/patch-cffile.h
index 6bbe343a01e8..9be0bb42337f 100644
--- a/archivers/libcabinet/files/patch-cffile.h
+++ b/archivers/libcabinet/files/patch-cffile.h
@@ -1,5 +1,5 @@
---- cffile.h.orig	1999-10-24 02:13:29.000000000 -0400
-+++ cffile.h	2014-02-21 16:12:05.824389036 -0500
+--- cffile.h.orig	1999-10-24 06:13:29 UTC
++++ cffile.h
 @@ -15,7 +15,7 @@
  #define __CFFILE_H__
  
@@ -9,7 +9,7 @@
  #include "bstring.h"
  #include "cftypes.h"
  
-@@ -161,4 +161,4 @@
+@@ -161,4 +161,4 @@ class cabinet_file_header : public cabin
  
  ////////////////////////////////////////////////////////////////////////////////
  
diff --git a/archivers/libcabinet/files/patch-cffolder.cpp b/archivers/libcabinet/files/patch-cffolder.cpp
index 8eed0dea64a9..d9b15c0fbb17 100644
--- a/archivers/libcabinet/files/patch-cffolder.cpp
+++ b/archivers/libcabinet/files/patch-cffolder.cpp
@@ -1,5 +1,5 @@
---- cffolder.cpp.orig	1999-10-24 02:13:29.000000000 -0400
-+++ cffolder.cpp	2014-02-21 15:53:49.255245183 -0500
+--- cffolder.cpp.orig	1999-10-24 06:13:29 UTC
++++ cffolder.cpp
 @@ -17,7 +17,7 @@
  #ifndef __CFFOLDER_CPP__
  #define __CFFOLDER_CPP__
@@ -9,7 +9,7 @@
  #include "cftypes.h"
  #include "cfheader.h"
  #include "cffolder.h"
-@@ -70,7 +70,7 @@
+@@ -70,7 +70,7 @@ Error cabinet_folder_header::read(istrea
  			ra_size = cab_header.get_folder_ra_size();
  			reserved_area = new byte[ra_size];
  
@@ -18,7 +18,7 @@
  			{
  				return (in.fail()) ? READ_ERROR : UNEXPECTED_EOF;
  			}
-@@ -90,7 +90,7 @@
+@@ -90,7 +90,7 @@ Error cabinet_folder_header::write(ostre
  
  	if(ra_size)					// If reserved area present
  	{
diff --git a/archivers/libcabinet/files/patch-cffolder.h b/archivers/libcabinet/files/patch-cffolder.h
index 8aeac9d936e2..513bbdebaba0 100644
--- a/archivers/libcabinet/files/patch-cffolder.h
+++ b/archivers/libcabinet/files/patch-cffolder.h
@@ -1,5 +1,5 @@
---- cffolder.h.orig	1999-10-24 02:13:29.000000000 -0400
-+++ cffolder.h	2014-02-21 15:52:05.724747639 -0500
+--- cffolder.h.orig	1999-10-24 06:13:29 UTC
++++ cffolder.h
 @@ -15,7 +15,7 @@
  #define __CFFOLDER_H__
  
@@ -9,7 +9,7 @@
  #include "cftypes.h"
  #include "cfheader.h"
  
-@@ -89,4 +89,5 @@
+@@ -89,4 +89,5 @@ class cabinet_folder_header : public cab
  
  ////////////////////////////////////////////////////////////////////////////////
  
diff --git a/archivers/libcabinet/files/patch-cfheader.cpp b/archivers/libcabinet/files/patch-cfheader.cpp
index 4d026b5e760a..ffa18a9dbde2 100644
--- a/archivers/libcabinet/files/patch-cfheader.cpp
+++ b/archivers/libcabinet/files/patch-cfheader.cpp
@@ -1,5 +1,5 @@
---- cfheader.cpp.orig	1999-10-24 02:13:29.000000000 -0400
-+++ cfheader.cpp	2014-02-21 16:02:37.285291121 -0500
+--- cfheader.cpp.orig	1999-10-24 06:13:29 UTC
++++ cfheader.cpp
 @@ -18,17 +18,23 @@
  #define __CFHEADER_CPP__
  
@@ -26,7 +26,7 @@
  ////////////////////////////////////////****************************************
  
  // Initializes a valid fixed cabinet header
-@@ -127,7 +133,7 @@
+@@ -127,7 +133,7 @@ Error cabinet_header::read(istream& in)
  		{
  			reserved_area = new byte[cabinet_ra_size];
  
@@ -35,7 +35,7 @@
  			{
  				return (in.fail()) ? READ_ERROR : UNEXPECTED_EOF;
  			}
-@@ -172,7 +178,7 @@
+@@ -172,7 +178,7 @@ Error cabinet_header::write(ostream& out
  
  		if(cabinet_ra_size > 0)			// If has cabinet reserved area
  		{
@@ -44,7 +44,7 @@
  			{
  				return WRITE_ERROR;
  			}
-@@ -210,4 +216,4 @@
+@@ -210,4 +216,4 @@ Error cabinet_header::write(ostream& out
  
  ////////////////////////////////////////****************************************
  
diff --git a/archivers/libcabinet/files/patch-cfheader.h b/archivers/libcabinet/files/patch-cfheader.h
index 9baa26596835..c794c265e38c 100644
--- a/archivers/libcabinet/files/patch-cfheader.h
+++ b/archivers/libcabinet/files/patch-cfheader.h
@@ -1,5 +1,5 @@
---- cfheader.h.orig	2014-02-21 15:42:52.379291286 -0500
-+++ cfheader.h	2014-02-21 16:02:51.918208148 -0500
+--- cfheader.h.orig	1999-10-24 06:13:29 UTC
++++ cfheader.h
 @@ -15,10 +15,12 @@
  #define __CFHEADER_H__
  
diff --git a/archivers/libcabinet/files/patch-cfreader.cpp b/archivers/libcabinet/files/patch-cfreader.cpp
index e68813fdf8a1..bebea6172356 100644
--- a/archivers/libcabinet/files/patch-cfreader.cpp
+++ b/archivers/libcabinet/files/patch-cfreader.cpp
@@ -1,5 +1,5 @@
---- cfreader.cpp.orig	1999-10-24 02:13:29.000000000 -0400
-+++ cfreader.cpp	2014-02-21 15:55:15.698239494 -0500
+--- cfreader.cpp.orig	1999-10-24 06:13:29 UTC
++++ cfreader.cpp
 @@ -22,7 +22,7 @@
  #include <errno.h>
  #include <stdlib.h>
diff --git a/archivers/libcabinet/files/patch-cfreader.h b/archivers/libcabinet/files/patch-cfreader.h
index 1dba9a5085b8..af8c9703b4e3 100644
--- a/archivers/libcabinet/files/patch-cfreader.h
+++ b/archivers/libcabinet/files/patch-cfreader.h
@@ -1,5 +1,5 @@
---- cfreader.h.orig	2014-02-21 16:11:11.770180090 -0500
-+++ cfreader.h	2014-02-21 16:10:41.259844074 -0500
+--- cfreader.h.orig	1999-10-24 06:13:29 UTC
++++ cfreader.h
 @@ -11,7 +11,7 @@
  #ifndef __CFREADER_H__
  #define __CFREADER_H__
diff --git a/archivers/libcabinet/files/patch-cftypes.cpp b/archivers/libcabinet/files/patch-cftypes.cpp
index 437a41632e84..c3285a7b4951 100644
--- a/archivers/libcabinet/files/patch-cftypes.cpp
+++ b/archivers/libcabinet/files/patch-cftypes.cpp
@@ -1,5 +1,5 @@
---- cftypes.cpp.orig	1999-10-24 02:13:29.000000000 -0400
-+++ cftypes.cpp	2014-02-21 16:06:43.971192116 -0500
+--- cftypes.cpp.orig	1999-10-24 06:13:29 UTC
++++ cftypes.cpp
 @@ -10,11 +10,20 @@
  #ifndef __CFTYPES_CPP__
  #define __CFTYPES_CPP__
@@ -23,7 +23,7 @@
  /******************************************************************************/
  
  int convert_z_error_code(int code)
-@@ -138,15 +147,20 @@
+@@ -138,15 +147,20 @@ const char* get_cabinet_error_string(int
  
  int io_read(istream& in, byte* buf, word len)
  {
@@ -49,7 +49,7 @@
  		? (in.fail()) ? READ_ERROR : UNEXPECTED_EOF : OK;
  }
  
-@@ -154,14 +168,19 @@
+@@ -154,14 +168,19 @@ int io_read(istream& in, byte* buf, word
  
  int io_write(ostream& out, const byte* buf, word len)
  {
diff --git a/archivers/libcabinet/files/patch-cftypes.h b/archivers/libcabinet/files/patch-cftypes.h
index dd814b0dfab1..0c393d281208 100644
--- a/archivers/libcabinet/files/patch-cftypes.h
+++ b/archivers/libcabinet/files/patch-cftypes.h
@@ -1,5 +1,5 @@
---- cftypes.h.orig	1999-10-24 02:13:29.000000000 -0400
-+++ cftypes.h	2014-02-21 15:42:11.491293648 -0500
+--- cftypes.h.orig	1999-10-24 06:13:29 UTC
++++ cftypes.h
 @@ -16,7 +16,10 @@
  #ifndef __CFTYPES_H__
  #define __CFTYPES_H__
diff --git a/archivers/libcabinet/files/patch-darray.h b/archivers/libcabinet/files/patch-darray.h
index 2e28f3f879f1..3687c2748494 100644
--- a/archivers/libcabinet/files/patch-darray.h
+++ b/archivers/libcabinet/files/patch-darray.h
@@ -1,6 +1,6 @@
---- darray.h.orig	Sun Aug 31 05:55:31 2003
-+++ darray.h	Sun Aug 31 05:55:32 2003
-@@ -155,4 +155,4 @@
+--- darray.h.orig	1999-10-24 11:29:53 UTC
++++ darray.h
+@@ -155,4 +155,4 @@ void dynamic_array<ObjectType>::reset(si
  
  ///////////////////////////////////////***************************************
  
diff --git a/archivers/libcabinet/files/patch-listcab.cpp b/archivers/libcabinet/files/patch-listcab.cpp
index b8c491785904..c46f051b7ae8 100644
--- a/archivers/libcabinet/files/patch-listcab.cpp
+++ b/archivers/libcabinet/files/patch-listcab.cpp
@@ -1,5 +1,5 @@
---- listcab.cpp.orig	1999-10-24 08:11:38.000000000 -0400
-+++ listcab.cpp	2014-02-21 16:14:29.246853465 -0500
+--- listcab.cpp.orig	1999-10-24 12:11:38 UTC
++++ listcab.cpp
 @@ -8,8 +8,8 @@
  #include <stdio.h>
  #include <string.h>
@@ -22,7 +22,7 @@
  ////////////////////////////////////////****************************************
  
  void display_header_info(cabinet_header& cfh);
-@@ -47,13 +51,19 @@
+@@ -47,13 +51,19 @@ int main(int argc, char *argv[])
  			cerr << "New Folder Error: " << retval << endl;
  			return 1;
  		}
@@ -46,7 +46,7 @@
  				if((retval = cab.add_file(filename)) != OK)
  				{
  					perror("read");
-@@ -62,10 +72,13 @@
+@@ -62,10 +72,13 @@ int main(int argc, char *argv[])
  					return 1;
  				}
  			}