Cleanup patches, a* categories.

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

With hat:	portmgr
Sponsored by:	Absolight

5 files changed, 23 insertions, 24 deletions

diff --git a/archivers/arj/files/patch-arj_arcv.c b/archivers/arj/files/patch-arj__arcv.c
index e65faa41f9cc..2bfbab86c1e0 100644
--- a/archivers/arj/files/patch-arj_arcv.c
+++ b/archivers/arj/files/patch-arj__arcv.c
@@ -1,6 +1,6 @@
---- arj_arcv.c	2005-06-21 22:53:12.000000000 +0300
-+++ arj_arcv.c	2005-11-24 02:50:31.000000000 +0200
-@@ -59,27 +59,27 @@
+--- arj_arcv.c.orig	2005-06-21 19:53:12 UTC
++++ arj_arcv.c
+@@ -59,27 +59,27 @@ static char idxid_fault[]="?";
  #define setup_hput(ptr) (tmp_hptr=(ptr))
  
  #define hget_byte() (*(tmp_hptr++)&0xFF)
@@ -35,7 +35,7 @@
   return result;
  }
  
-@@ -87,18 +87,18 @@
+@@ -87,18 +87,18 @@ static unsigned long hget_longword()
  
  /* Writes two bytes to the header, incrementing the pointer */
  
@@ -58,4 +58,3 @@
  }
  
  /* Calculates and stores the basic header size */
-diff -Naur -x .svn -x CVS arj-3.10.22.orig/arj_proc.c arj-3.10.22/arj_proc.c
diff --git a/archivers/arj/files/patch-arj_proc.c b/archivers/arj/files/patch-arj__proc.c
index c8a27fcf44cc..b6b733254d00 100644
--- a/archivers/arj/files/patch-arj_proc.c
+++ b/archivers/arj/files/patch-arj__proc.c
@@ -1,6 +1,6 @@
---- arj_proc.c	2005-11-24 02:50:19.000000000 +0200
-+++ arj_proc.c	2005-11-24 02:50:31.000000000 +0200
-@@ -585,7 +585,7 @@
+--- arj_proc.c.orig	2005-06-21 19:53:12 UTC
++++ arj_proc.c
+@@ -585,7 +585,7 @@ int search_for_extension(char *name, cha
  /* Returns the exact amount of data that could be safely written to the
     destination volume */
  
@@ -9,7 +9,7 @@
  {
   unsigned long pvol;
   unsigned int arjsec_overhead;
-@@ -605,7 +605,7 @@
+@@ -605,7 +605,7 @@ unsigned long get_volfree(unsigned int i
   remain=volume_limit-ftell(aostream)-pvol-(long)arjsec_overhead-
          (long)out_bytes-(long)cpos-(long)ext_voldata-
          MULTIVOLUME_RESERVE-t_volume_offset;
@@ -18,7 +18,7 @@
  }
  
  /* Performs various checks when multivolume data is packed to predict an
-@@ -2466,14 +2466,14 @@
+@@ -2466,14 +2466,14 @@ static int get_str_from_jq()
      *tsptr='\0';
    endptr=tsptr;
    tsptr=sptr;
@@ -36,8 +36,8 @@
       tsptr++;
     }
    }
-@@ -2901,9 +2901,9 @@
- #if (defined(WORDS_BIGENDIAN) || defined(ALIGN_POINTERS)) && !defined(ARJDISP) && !defined(REGISTER)
+@@ -2901,9 +2901,9 @@ char *ltrim(char *str)
+ #if defined(WORDS_BIGENDIAN)&&!defined(ARJDISP)&&!defined(REGISTER)
  /* Model-independent routine to get 2 bytes from far RAM */
  
 -unsigned int mget_word(char FAR *p)
@@ -48,7 +48,7 @@
  
   b0=mget_byte(p);
   b1=mget_byte(p+1);
-@@ -2912,9 +2912,9 @@
+@@ -2912,9 +2912,9 @@ unsigned int mget_word(char FAR *p)
  
  /* Model-independent routine to get 4 bytes from far RAM */
  
@@ -60,7 +60,7 @@
  
   w0=mget_word(p);
   w1=mget_word(p+2);
-@@ -2923,7 +2923,7 @@
+@@ -2923,7 +2923,7 @@ unsigned long mget_dword(char FAR *p)
  
  /* Model-independent routine to store 2 bytes in far RAM */
  
@@ -69,7 +69,7 @@
  {
   mput_byte(w&0xFF, p);
   mput_byte(w>>8  , p+1);
-@@ -2931,7 +2931,7 @@
+@@ -2931,7 +2931,7 @@ void mput_word(unsigned int w, char FAR 
  
  /* Model-independent routine to store 4 bytes in far RAM */
  
diff --git a/archivers/arj/files/patch-arj_proc.h b/archivers/arj/files/patch-arj__proc.h
index 9501e70c08af..11dda85fa14d 100644
--- a/archivers/arj/files/patch-arj_proc.h
+++ b/archivers/arj/files/patch-arj__proc.h
@@ -1,5 +1,5 @@
---- arj_proc.h.orig	2004-01-25 08:39:30.000000000 -0200
-+++ arj_proc.h	2010-02-19 08:35:05.000000000 -0200
+--- arj_proc.h.orig	2004-01-25 10:39:30 UTC
++++ arj_proc.h
 @@ -8,15 +8,17 @@
  #ifndef ARJ_PROC_INCLUDED
  #define ARJ_PROC_INCLUDED
@@ -24,7 +24,7 @@
  #endif
  
  /* Prototypes */
-@@ -31,7 +33,7 @@
+@@ -31,7 +33,7 @@ void copy_bytes(unsigned long nbytes);
  int translate_path(char *name);
  void restart_proc(char *dest);
  int search_for_extension(char *name, char *ext_list);
@@ -33,7 +33,7 @@
  unsigned int check_multivolume(unsigned int increment);
  void store();
  void hollow_encode();
-@@ -61,10 +63,10 @@
+@@ -61,10 +63,10 @@ void unpack_mem(struct mempack *mempack)
  void strip_lf(char *str);
  char *ltrim(char *str);
  #ifdef WORDS_BIGENDIAN
diff --git a/archivers/arj/files/patch-environ.c b/archivers/arj/files/patch-environ.c
index f4cbb1d89387..d1bedb05e458 100644
--- a/archivers/arj/files/patch-environ.c
+++ b/archivers/arj/files/patch-environ.c
@@ -1,6 +1,6 @@
---- environ.c.orig	2010-10-28 13:11:54.000000000 -0200
-+++ environ.c	2010-10-28 13:13:10.000000000 -0200
-@@ -2058,7 +2058,7 @@
+--- environ.c.orig	2004-06-18 16:19:36 UTC
++++ environ.c
+@@ -2058,7 +2058,7 @@ FILE *file_open(char *name, char *mode)
        /* ASR fix 01/10/2003 -- re-fix to handle umask 022 correctly */
        if((handle=open(name, oflag, 0644))==-1)
         return(NULL);
diff --git a/archivers/arj/files/patch-fardata.c b/archivers/arj/files/patch-fardata.c
index 0b9163f954f2..1ce033fd6123 100644
--- a/archivers/arj/files/patch-fardata.c
+++ b/archivers/arj/files/patch-fardata.c
@@ -1,5 +1,5 @@
---- fardata.c.orig	2010-01-18 10:06:57.000000000 -0200
-+++ fardata.c	2010-01-18 10:08:24.000000000 -0200
+--- fardata.c.orig	2004-04-17 11:39:42 UTC
++++ fardata.c
 @@ -190,7 +190,7 @@ int msg_sprintf(char *str, FMSG *fmt, ..
  
  /* Length-limited strlen() */