Cleanup patches, a* categories.

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

With hat:	portmgr
Sponsored by:	Absolight

10 files changed, 43 insertions, 43 deletions

diff --git a/archivers/hpack.non-usa.only/files/patch-archive.c b/archivers/hpack.non-usa.only/files/patch-archive.c
index 31c668f0472..7d7c6bd93ae 100644
--- a/archivers/hpack.non-usa.only/files/patch-archive.c
+++ b/archivers/hpack.non-usa.only/files/patch-archive.c
@@ -1,6 +1,6 @@
---- archive.c.orig	Tue Jun 29 05:27:52 1993
-+++ archive.c	Tue Dec 28 20:01:38 1999
-@@ -326,12 +326,22 @@
+--- archive.c.orig	1993-06-29 10:27:52 UTC
++++ archive.c
+@@ -326,12 +326,22 @@ BOOLEAN confirmSkip( const char *str1, c
  
  void getFileName( char *fileName )
  	{
diff --git a/archivers/hpack.non-usa.only/files/patch-cli.c b/archivers/hpack.non-usa.only/files/patch-cli.c
index 92f80493707..0693258803b 100644
--- a/archivers/hpack.non-usa.only/files/patch-cli.c
+++ b/archivers/hpack.non-usa.only/files/patch-cli.c
@@ -1,6 +1,6 @@
---- cli.c.orig	Sat Sep  4 22:23:48 1993
-+++ cli.c	Tue Dec 28 20:01:38 1999
-@@ -724,12 +724,18 @@
+--- cli.c.orig	1993-09-05 03:23:48 UTC
++++ cli.c
+@@ -724,12 +724,18 @@ static BOOLEAN checkStealthMode( char *a
  
  void doConfigFile( void )
  	{
diff --git a/archivers/hpack.non-usa.only/files/patch-crypt_keymgmt.c b/archivers/hpack.non-usa.only/files/patch-crypt_keymgmt.c
index 689ba37f6b9..9c951c3e4b4 100644
--- a/archivers/hpack.non-usa.only/files/patch-crypt_keymgmt.c
+++ b/archivers/hpack.non-usa.only/files/patch-crypt_keymgmt.c
@@ -1,6 +1,6 @@
---- crypt/keymgmt.c.orig	Tue Aug 17 16:56:14 1993
-+++ crypt/keymgmt.c	Tue Dec 28 20:01:38 1999
-@@ -495,11 +495,24 @@
+--- crypt/keymgmt.c.orig	1993-08-17 21:56:14 UTC
++++ crypt/keymgmt.c
+@@ -495,11 +495,24 @@ BOOLEAN getKey( const BOOLEAN isPemKey, 
  	FD keyFileFD, savedInFD = getInputFD();
  	BOOLEAN matched, firstTime = TRUE;
  	char *matchID, firstChar;
diff --git a/archivers/hpack.non-usa.only/files/patch-defs.h b/archivers/hpack.non-usa.only/files/patch-defs.h
index c993b1058db..4b885846d01 100644
--- a/archivers/hpack.non-usa.only/files/patch-defs.h
+++ b/archivers/hpack.non-usa.only/files/patch-defs.h
@@ -1,6 +1,6 @@
---- defs.h.orig	Mon May 31 10:17:00 1993
-+++ defs.h	Tue Dec 28 20:01:38 1999
-@@ -43,7 +43,7 @@
+--- defs.h.orig	1993-05-31 15:17:00 UTC
++++ defs.h
+@@ -43,7 +43,7 @@ typedef int		BOOLEAN;
  
  /* 'inline' patch for compilers which can't handle this */
  
diff --git a/archivers/hpack.non-usa.only/files/patch-hpacklib.h b/archivers/hpack.non-usa.only/files/patch-hpacklib.h
index cc178b89f5d..5779136c41f 100644
--- a/archivers/hpack.non-usa.only/files/patch-hpacklib.h
+++ b/archivers/hpack.non-usa.only/files/patch-hpacklib.h
@@ -1,5 +1,5 @@
---- hpacklib.h.orig	Thu Aug  5 04:10:40 1993
-+++ hpacklib.h	Tue Dec 28 20:01:38 1999
+--- hpacklib.h.orig	1993-08-05 09:10:40 UTC
++++ hpacklib.h
 @@ -26,12 +26,12 @@
  
  #include <stdio.h>					/* Prototypes for generic functions */
diff --git a/archivers/hpack.non-usa.only/files/patch-keycvt_keycvt.c b/archivers/hpack.non-usa.only/files/patch-keycvt_keycvt.c
index 2ef0a9d7847..3a601cc17db 100644
--- a/archivers/hpack.non-usa.only/files/patch-keycvt_keycvt.c
+++ b/archivers/hpack.non-usa.only/files/patch-keycvt_keycvt.c
@@ -1,6 +1,6 @@
---- keycvt/keycvt.c.orig	Fri Aug 13 15:06:28 1993
-+++ keycvt/keycvt.c	Tue Dec 28 20:01:38 1999
-@@ -582,11 +582,21 @@
+--- keycvt/keycvt.c.orig	1993-08-13 20:06:28 UTC
++++ keycvt/keycvt.c
+@@ -582,11 +582,21 @@ static void byteReverse( BYTE *regPtr, i
  
  static void getPassword( void )
  	{
@@ -22,7 +22,7 @@
  	}
  
  void initCrypt( void )
-@@ -1020,27 +1030,46 @@
+@@ -1020,27 +1030,46 @@ int main( const int argc, const char *ar
  
  	/* Try and find the PGP seed file */
  	if( ( pgpPath = getenv( "PGPPATH" ) ) == NULL )
diff --git a/archivers/hpack.non-usa.only/files/patch-keycvt_makefile b/archivers/hpack.non-usa.only/files/patch-keycvt_makefile
index 7d6de4115cd..09e76e37046 100644
--- a/archivers/hpack.non-usa.only/files/patch-keycvt_makefile
+++ b/archivers/hpack.non-usa.only/files/patch-keycvt_makefile
@@ -1,6 +1,6 @@
---- keycvt/makefile.orig	Tue May 18 00:43:30 1993
-+++ keycvt/makefile	Sun Jul 21 17:32:13 2002
-@@ -48,7 +48,7 @@
+--- keycvt/makefile.orig	1993-05-17 21:43:30 UTC
++++ keycvt/makefile
+@@ -48,7 +48,7 @@ DEFINES		= $(OS)
  
  PROJ	= keycvt
  
@@ -9,7 +9,7 @@
  
  LFLAGS	= -o $(PROJ) $(CMDL)			# Flags for linker
  
-@@ -60,6 +60,7 @@
+@@ -60,6 +60,7 @@ LD		= $(CC)				# Linker (just use the C 
  LS		= ls -l				# Directory command
  ECHO	= echo				# Echo to screen command
  MAKE	= make				# The make command
@@ -17,7 +17,7 @@
  
  #****************************************************************************
  #*																			*
-@@ -71,7 +72,7 @@
+@@ -71,7 +72,7 @@ default:
  		@$(ECHO)
  		@$(ECHO) "To create KEYCVT you have to enter the Unix system type you want to build"
  		@$(ECHO) "KEYCVT for.  Possible options are: aix (RS6000), aix370, aix386, convex,"
@@ -26,16 +26,16 @@
  		@$(ECHO) "(Ultrix 3.x or earlier), and uts4.  If none of the above fit, try"
  		@$(ECHO) "'make generic', and send a copy of any changes necessary to the author,"
  		@$(ECHO) "pgut1@cs.aukuni.ac.nz"
-@@ -128,6 +129,12 @@
- 
+@@ -129,6 +130,12 @@ aix386:
  convex:
  		@$(MAKE) keycvt CC="cc"
-+
+ 
 +freebsd:
 +		@$(MAKE) $(PROJ)
 +
 +freebsd.install:
 +		$(BSD_INSTALL_PROGRAM) $(PROJ) $(PREFIX)/bin
- 
++
  # Generic: Generic BSD-ish system running gcc.  Can't continue, we really
  # need user intervention here.
+ 
diff --git a/archivers/hpack.non-usa.only/files/patch-language_language.c b/archivers/hpack.non-usa.only/files/patch-language_language.c
index c4d33be961a..c052f184d3a 100644
--- a/archivers/hpack.non-usa.only/files/patch-language_language.c
+++ b/archivers/hpack.non-usa.only/files/patch-language_language.c
@@ -1,6 +1,6 @@
---- language/language.c.orig	Wed Sep 22 21:23:20 1993
-+++ language/language.c	Tue Dec 28 20:01:38 1999
-@@ -188,7 +188,7 @@
+--- language/language.c.orig	1993-09-23 02:23:20 UTC
++++ language/language.c
+@@ -188,7 +188,7 @@ void showHelp( void )
  				/* Process user response */
  				response = hgetch();
  				response = toupper( response );	/* Damn macros */
@@ -9,7 +9,7 @@
  				if( response == RESPONSE_QUIT )
  					return;
  				lineNo -= ( response == ' ' ) ? screenHeight : 1;
-@@ -268,6 +268,9 @@
+@@ -268,6 +268,9 @@ int initMessages( const char *path, cons
  	if( ( inFD = hopen( fileNamePtr, O_RDONLY | S_DENYWR | A_RANDSEQ ) ) == ERROR )
  		return( ERROR );
  #elif defined( __UNIX__ )
@@ -19,7 +19,7 @@
  	/* Build path to language file and try and process it */
  	fileNamePtr = getFirstKeyPath( getenv( "PATH" ), DATA_FILENAME );
  	while( fileNamePtr != NULL )
-@@ -290,6 +293,9 @@
+@@ -290,6 +293,9 @@ int initMessages( const char *path, cons
  			return( ERROR );		/* Couldn't find/open input file */
  		}
  #endif /* System-specific handling of how to find language defn.file */
diff --git a/archivers/hpack.non-usa.only/files/patch-system.h b/archivers/hpack.non-usa.only/files/patch-system.h
index 5988653572d..91bba18dd6d 100644
--- a/archivers/hpack.non-usa.only/files/patch-system.h
+++ b/archivers/hpack.non-usa.only/files/patch-system.h
@@ -1,6 +1,6 @@
---- system.h.orig	Fri Aug 27 12:16:40 1993
-+++ system.h	Tue Dec 28 20:01:38 1999
-@@ -788,7 +788,10 @@
+--- system.h.orig	1993-08-27 17:16:40 UTC
++++ system.h
+@@ -788,7 +788,10 @@ void strlwr( char *string );
  #elif defined( CONVEX )
    #define MAX_PATH          ( _POSIX_PATH_MAX + 1 )
    #define MAX_FILENAME		( 254 + 1 )
@@ -12,7 +12,7 @@
    #define MAX_PATH          ( _POSIX_PATH_MAX + 1 )
    #define MAX_FILENAME		( NAME_MAX + 1 )
  #elif defined( SVR4 )
-@@ -875,7 +878,8 @@
+@@ -875,7 +878,8 @@ typedef struct {
  #if defined( AIX ) || defined( AIX386 ) || defined( AIX370 ) || \
  	defined( BSD386 ) || defined( GENERIC ) || defined( HPUX ) || \
  	defined( IRIX ) || defined( NEXT ) || defined( OSF1 ) || \
@@ -22,7 +22,7 @@
    #define SPACE_OK		TRUE
  #else
    #define SPACE_OK		FALSE
-@@ -948,6 +952,13 @@
+@@ -948,6 +952,13 @@ typedef struct {
  #elif defined( UTS4 )					/* Amdahl UTS4 */
    #define NEED_STRLWR
    #define NEED_STRICMP
diff --git a/archivers/hpack.non-usa.only/files/patch-system_unix.c b/archivers/hpack.non-usa.only/files/patch-system_unix.c
index 0e67e42e5cb..bedab817934 100644
--- a/archivers/hpack.non-usa.only/files/patch-system_unix.c
+++ b/archivers/hpack.non-usa.only/files/patch-system_unix.c
@@ -1,6 +1,6 @@
---- system/unix.c.orig	Fri Aug 27 12:20:56 1993
-+++ system/unix.c	Tue Dec 28 20:01:38 1999
-@@ -123,7 +123,7 @@
+--- system/unix.c.orig	1993-08-27 17:20:56 UTC
++++ system/unix.c
+@@ -123,7 +123,7 @@ static int randomBufferPos = 0;
  
  #if defined( BSD386 ) || defined( CONVEX ) || defined( HPUX ) || \
  	defined( IRIX ) || defined( LINUX ) || defined( POSIX ) || \
@@ -9,7 +9,7 @@
  
  #include <termios.h>
  
-@@ -144,7 +144,7 @@
+@@ -144,7 +144,7 @@ int hgetch( void )
  		tcgetattr( ttyFD, &ttyInfo );
  #if defined( BSD386 ) || defined( CONVEX ) || defined( HPUX ) || \
  	defined( IRIX ) || defined( LINUX ) || defined( POSIX ) || \
@@ -18,7 +18,7 @@
  		ttyInfo.c_lflag &= ~ECHO;
  		ttyInfo.c_lflag &= ~ICANON;
  #else
-@@ -183,7 +183,7 @@
+@@ -183,7 +183,7 @@ int hgetch( void )
  		tcgetattr( ttyFD, &ttyInfo );
  #if defined( BSD386 ) || defined( CONVEX ) || defined( HPUX ) || \
  	defined( IRIX ) || defined( LINUX ) || defined( POSIX ) || \
@@ -27,7 +27,7 @@
  		ttyInfo.c_lflag |= ECHO;
  		ttyInfo.c_lflag |= ICANON;
  #else
-@@ -728,7 +728,7 @@
+@@ -728,7 +728,7 @@ int getCountry( void )
  	defined( HPUX ) || defined( IRIX ) || defined( LINUX ) || \
  	defined( NEXT ) || defined( OSF1 ) || defined( SUNOS ) || \
  	defined( SVR4 ) || defined( ULTRIX ) || defined( ULTRIX_OLD ) || \