52 files changed, 22 insertions, 26 deletions
diff --git a/archivers/9e/files/patch-ab b/archivers/9e/files/patch-9e.c
index 6333e3868512..6333e3868512 100644
--- a/archivers/9e/files/patch-ab
+++ b/archivers/9e/files/patch-9e.c
diff --git a/archivers/arc/files/patch-aa b/archivers/arc/files/patch-Makefile
index 39dc54bd7d4a..39dc54bd7d4a 100644
--- a/archivers/arc/files/patch-aa
+++ b/archivers/arc/files/patch-Makefile
diff --git a/archivers/arc/files/patch-ad b/archivers/arc/files/patch-arc.c
index 63954d8d2317..63954d8d2317 100644
--- a/archivers/arc/files/patch-ad
+++ b/archivers/arc/files/patch-arc.c
diff --git a/archivers/arc/files/patch-ae b/archivers/arc/files/patch-arc.h
index a228e9d11dfd..a228e9d11dfd 100644
--- a/archivers/arc/files/patch-ae
+++ b/archivers/arc/files/patch-arc.h
diff --git a/archivers/arc/files/patch-af b/archivers/arc/files/patch-arcadd.c
index 8a5597cfc6f5..8a5597cfc6f5 100644
--- a/archivers/arc/files/patch-af
+++ b/archivers/arc/files/patch-arcadd.c
diff --git a/archivers/arc/files/patch-ag b/archivers/arc/files/patch-arccvt.c
index 1f496113cbb2..1f496113cbb2 100644
--- a/archivers/arc/files/patch-ag
+++ b/archivers/arc/files/patch-arccvt.c
diff --git a/archivers/arc/files/patch-ah b/archivers/arc/files/patch-arcdata.c
index f9e7a9067de8..f9e7a9067de8 100644
--- a/archivers/arc/files/patch-ah
+++ b/archivers/arc/files/patch-arcdata.c
diff --git a/archivers/arc/files/patch-ab b/archivers/arc/files/patch-arcdos.c
index 52bf11b472f3..52bf11b472f3 100644
--- a/archivers/arc/files/patch-ab
+++ b/archivers/arc/files/patch-arcdos.c
diff --git a/archivers/arc/files/patch-ai b/archivers/arc/files/patch-arcext.c
index eae8495ed002..eae8495ed002 100644
--- a/archivers/arc/files/patch-ai
+++ b/archivers/arc/files/patch-arcext.c
diff --git a/archivers/arc/files/patch-aj b/archivers/arc/files/patch-arcio.c
index 7034aeaf6cb0..7034aeaf6cb0 100644
--- a/archivers/arc/files/patch-aj
+++ b/archivers/arc/files/patch-arcio.c
diff --git a/archivers/arc/files/patch-ak b/archivers/arc/files/patch-arclzw.c
index 7933c26409d1..7933c26409d1 100644
--- a/archivers/arc/files/patch-ak
+++ b/archivers/arc/files/patch-arclzw.c
diff --git a/archivers/arc/files/patch-al b/archivers/arc/files/patch-arcrun.c
index 207e33531b82..207e33531b82 100644
--- a/archivers/arc/files/patch-al
+++ b/archivers/arc/files/patch-arcrun.c
diff --git a/archivers/arc/files/patch-am b/archivers/arc/files/patch-arcunp.c
index 08e091f2462e..08e091f2462e 100644
--- a/archivers/arc/files/patch-am
+++ b/archivers/arc/files/patch-arcunp.c
diff --git a/archivers/bzip2/files/patch-aa b/archivers/bzip2/files/patch-Makefile
index 3cb244c9242e..3cb244c9242e 100644
--- a/archivers/bzip2/files/patch-aa
+++ b/archivers/bzip2/files/patch-Makefile
diff --git a/archivers/ha/files/patch-aa b/archivers/ha/files/patch-nix_machine.c
index 0bdd3610fb1a..0bdd3610fb1a 100644
--- a/archivers/ha/files/patch-aa
+++ b/archivers/ha/files/patch-nix_machine.c
diff --git a/archivers/hpack.non-usa.only/files/patch-al b/archivers/hpack.non-usa.only/files/patch-archive.c
index 31c668f04727..31c668f04727 100644
--- a/archivers/hpack.non-usa.only/files/patch-al
+++ b/archivers/hpack.non-usa.only/files/patch-archive.c
diff --git a/archivers/hpack.non-usa.only/files/patch-ak b/archivers/hpack.non-usa.only/files/patch-cli.c
index 92f804937070..92f804937070 100644
--- a/archivers/hpack.non-usa.only/files/patch-ak
+++ b/archivers/hpack.non-usa.only/files/patch-cli.c
diff --git a/archivers/hpack.non-usa.only/files/patch-ab b/archivers/hpack.non-usa.only/files/patch-crypt_keymgmt.c
index 689ba37f6b94..689ba37f6b94 100644
--- a/archivers/hpack.non-usa.only/files/patch-ab
+++ b/archivers/hpack.non-usa.only/files/patch-crypt_keymgmt.c
diff --git a/archivers/hpack.non-usa.only/files/patch-ag b/archivers/hpack.non-usa.only/files/patch-defs.h
index c993b1058dba..c993b1058dba 100644
--- a/archivers/hpack.non-usa.only/files/patch-ag
+++ b/archivers/hpack.non-usa.only/files/patch-defs.h
diff --git a/archivers/hpack.non-usa.only/files/patch-ah b/archivers/hpack.non-usa.only/files/patch-hpacklib.h
index cc178b89f5d3..cc178b89f5d3 100644
--- a/archivers/hpack.non-usa.only/files/patch-ah
+++ b/archivers/hpack.non-usa.only/files/patch-hpacklib.h
diff --git a/archivers/hpack.non-usa.only/files/patch-ad b/archivers/hpack.non-usa.only/files/patch-keycvt_keycvt.c
index 2ef0a9d78471..2ef0a9d78471 100644
--- a/archivers/hpack.non-usa.only/files/patch-ad
+++ b/archivers/hpack.non-usa.only/files/patch-keycvt_keycvt.c
diff --git a/archivers/hpack.non-usa.only/files/patch-ac b/archivers/hpack.non-usa.only/files/patch-keycvt_makefile
index 7d6de4115cda..7d6de4115cda 100644
--- a/archivers/hpack.non-usa.only/files/patch-ac
+++ b/archivers/hpack.non-usa.only/files/patch-keycvt_makefile
diff --git a/archivers/hpack.non-usa.only/files/patch-ae b/archivers/hpack.non-usa.only/files/patch-language_language.c
index c4d33be961a9..c4d33be961a9 100644
--- a/archivers/hpack.non-usa.only/files/patch-ae
+++ b/archivers/hpack.non-usa.only/files/patch-language_language.c
diff --git a/archivers/hpack.non-usa.only/files/patch-aj b/archivers/hpack.non-usa.only/files/patch-makefile
index 3e63a463d3eb..3e63a463d3eb 100644
--- a/archivers/hpack.non-usa.only/files/patch-aj
+++ b/archivers/hpack.non-usa.only/files/patch-makefile
diff --git a/archivers/hpack.non-usa.only/files/patch-ai b/archivers/hpack.non-usa.only/files/patch-system.h
index 5988653572d8..5988653572d8 100644
--- a/archivers/hpack.non-usa.only/files/patch-ai
+++ b/archivers/hpack.non-usa.only/files/patch-system.h
diff --git a/archivers/hpack.non-usa.only/files/patch-af b/archivers/hpack.non-usa.only/files/patch-system_unix.c
index 0e67e42e5cb6..0e67e42e5cb6 100644
--- a/archivers/hpack.non-usa.only/files/patch-af
+++ b/archivers/hpack.non-usa.only/files/patch-system_unix.c
diff --git a/archivers/lha/files/patch-aa b/archivers/lha/files/patch-Makefile
index 8c417a47d209..8c417a47d209 100644
--- a/archivers/lha/files/patch-aa
+++ b/archivers/lha/files/patch-Makefile
diff --git a/archivers/lha/files/patch-af b/archivers/lha/files/patch-src_lha.h
index e1f9026a5abe..e1f9026a5abe 100644
--- a/archivers/lha/files/patch-af
+++ b/archivers/lha/files/patch-src_lha.h
diff --git a/archivers/lha/files/patch-ae b/archivers/lha/files/patch-src_lhadd.c
index 225ac6e50993..225ac6e50993 100644
--- a/archivers/lha/files/patch-ae
+++ b/archivers/lha/files/patch-src_lhadd.c
diff --git a/archivers/libarc/files/patch-aa b/archivers/libarc/files/patch-Makefile
index 6601419ad2df..6601419ad2df 100644
--- a/archivers/libarc/files/patch-aa
+++ b/archivers/libarc/files/patch-Makefile
diff --git a/archivers/libcabinet/files/patch-ab b/archivers/libcabinet/files/patch-ab
deleted file mode 100644
index b36dca6cc36a..000000000000
--- a/archivers/libcabinet/files/patch-ab
+++ /dev/null
@@ -1,11 +0,0 @@
---- bstring.cpp	2000/11/30 14:50:57	1.1
-+++ bstring.cpp	2000/11/30 14:57:48
-@@ -150,7 +150,7 @@
- 		if(strlen(str) < strlen(s))	// If more memory is needed
- 			*this = s;			// Use assign function
- 		else						// If stpcpy can be used
--			stpcpy(str, s);		// Copy s into str
-+			strcpy(str, s);		// Copy s into str
- 	}
- 
- 	return *this;					// Return a refrence to this object
diff --git a/archivers/libcabinet/files/patch-bstring.cpp b/archivers/libcabinet/files/patch-bstring.cpp
index 3eabf052ae84..c4f88c8138f2 100644
--- a/archivers/libcabinet/files/patch-bstring.cpp
+++ b/archivers/libcabinet/files/patch-bstring.cpp
@@ -1,5 +1,5 @@
---- bstring.cpp.orig	2014-02-21 15:40:03.760303112 -0500
-+++ bstring.cpp	2014-02-21 15:41:19.474297650 -0500
+--- bstring.cpp.orig	2014-07-27 11:17:34.000000000 -0400
++++ bstring.cpp	2014-07-27 11:17:37.000000000 -0400
 @@ -15,7 +15,7 @@
  
  #include "bstring.h"
@@ -18,6 +18,15 @@
  	return temp += s;
  }
  
+@@ -150,7 +150,7 @@
+ 		if(strlen(str) < strlen(s))	// If more memory is needed
+ 			*this = s;			// Use assign function
+ 		else						// If stpcpy can be used
+-			stpcpy(str, s);		// Copy s into str
++			strcpy(str, s);		// Copy s into str
+ 	}
+ 
+ 	return *this;					// Return a refrence to this object
 @@ -217,4 +217,4 @@
  
  //*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/
diff --git a/archivers/macutils/files/patch-ag b/archivers/macutils/files/patch-ag
deleted file mode 100644
index 335cc473ff00..000000000000
--- a/archivers/macutils/files/patch-ag
+++ /dev/null
@@ -1,11 +0,0 @@
---- macunpack/lzh.c.orig	Fri Apr 16 00:23:03 1999
-+++ macunpack/lzh.c	Fri Apr 16 00:23:13 1999
-@@ -23,7 +23,7 @@
- extern unsigned char (*lzah_getbyte)();
- extern void de_lzh();
- 
--typedef struct methodinfo {
-+struct methodinfo {
- 	char *name;
- 	int number;
- };
diff --git a/archivers/macutils/files/patch-ao b/archivers/macutils/files/patch-crc_makefile
index c053bcbb1716..c053bcbb1716 100644
--- a/archivers/macutils/files/patch-ao
+++ b/archivers/macutils/files/patch-crc_makefile
diff --git a/archivers/macutils/files/patch-ak b/archivers/macutils/files/patch-hexbin_globals.h
index b5ec39483f06..b5ec39483f06 100644
--- a/archivers/macutils/files/patch-ak
+++ b/archivers/macutils/files/patch-hexbin_globals.h
diff --git a/archivers/macutils/files/patch-am b/archivers/macutils/files/patch-macunpack_cpt.h
index 0fbd808f7db8..0fbd808f7db8 100644
--- a/archivers/macutils/files/patch-am
+++ b/archivers/macutils/files/patch-macunpack_cpt.h
diff --git a/archivers/macutils/files/patch-aj b/archivers/macutils/files/patch-macunpack_dd.c
index 83ae8b721f64..83ae8b721f64 100644
--- a/archivers/macutils/files/patch-aj
+++ b/archivers/macutils/files/patch-macunpack_dd.c
diff --git a/archivers/macutils/files/patch-ai b/archivers/macutils/files/patch-macunpack_dd.h
index 1e60f45f1515..1e60f45f1515 100644
--- a/archivers/macutils/files/patch-ai
+++ b/archivers/macutils/files/patch-macunpack_dd.h
diff --git a/archivers/macutils/files/patch-ac b/archivers/macutils/files/patch-macunpack_jdw.h
index 4eca92c2636b..4eca92c2636b 100644
--- a/archivers/macutils/files/patch-ac
+++ b/archivers/macutils/files/patch-macunpack_jdw.h
diff --git a/archivers/macutils/files/patch-al b/archivers/macutils/files/patch-macunpack_lzc.h
index d68cac214f63..d68cac214f63 100644
--- a/archivers/macutils/files/patch-al
+++ b/archivers/macutils/files/patch-macunpack_lzc.h
diff --git a/archivers/macutils/files/patch-lzh.c b/archivers/macutils/files/patch-macunpack_lzh.c
index 7580345bc94b..d52b1ed742e7 100644
--- a/archivers/macutils/files/patch-lzh.c
+++ b/archivers/macutils/files/patch-macunpack_lzh.c
@@ -1,5 +1,14 @@
---- macunpack/lzh.c.orig	Thu Sep 28 13:10:04 2006
-+++ macunpack/lzh.c	Thu Sep 28 13:11:27 2006
+--- macunpack/lzh.c.orig	2014-07-27 11:11:36.000000000 -0400
++++ macunpack/lzh.c	2014-07-27 11:11:39.000000000 -0400
+@@ -23,7 +23,7 @@
+ extern unsigned char (*lzah_getbyte)();
+ extern void de_lzh();
+ 
+-typedef struct methodinfo {
++struct methodinfo {
+ 	char *name;
+ 	int number;
+ };
 @@ -40,13 +40,13 @@
      {"-lzs-", lzs}
  };
diff --git a/archivers/macutils/files/patch-ah b/archivers/macutils/files/patch-macunpack_lzh.h
index 902138b785ff..902138b785ff 100644
--- a/archivers/macutils/files/patch-ah
+++ b/archivers/macutils/files/patch-macunpack_lzh.h
diff --git a/archivers/macutils/files/patch-ae b/archivers/macutils/files/patch-macunpack_sit.c
index b5574ae7b748..b5574ae7b748 100644
--- a/archivers/macutils/files/patch-ae
+++ b/archivers/macutils/files/patch-macunpack_sit.c
diff --git a/archivers/macutils/files/patch-ad b/archivers/macutils/files/patch-macunpack_sit.h
index 8cfc5459da91..8cfc5459da91 100644
--- a/archivers/macutils/files/patch-ad
+++ b/archivers/macutils/files/patch-macunpack_sit.h
diff --git a/archivers/macutils/files/patch-af b/archivers/macutils/files/patch-macunpack_stf.h
index 20c7d02dea73..20c7d02dea73 100644
--- a/archivers/macutils/files/patch-af
+++ b/archivers/macutils/files/patch-macunpack_stf.h
diff --git a/archivers/macutils/files/patch-an b/archivers/macutils/files/patch-macunpack_zma.h
index 6dac05bda456..6dac05bda456 100644
--- a/archivers/macutils/files/patch-an
+++ b/archivers/macutils/files/patch-macunpack_zma.h
diff --git a/archivers/macutils/files/patch-aa b/archivers/macutils/files/patch-makefile
index 080da53c7ae2..080da53c7ae2 100644
--- a/archivers/macutils/files/patch-aa
+++ b/archivers/macutils/files/patch-makefile
diff --git a/archivers/macutils/files/patch-ab b/archivers/macutils/files/patch-util_transname.c
index 325ecdab60bd..325ecdab60bd 100644
--- a/archivers/macutils/files/patch-ab
+++ b/archivers/macutils/files/patch-util_transname.c
diff --git a/archivers/ppunpack/files/patch-aa b/archivers/ppunpack/files/patch-depack.h
index 358db5625743..358db5625743 100644
--- a/archivers/ppunpack/files/patch-aa
+++ b/archivers/ppunpack/files/patch-depack.h
diff --git a/archivers/squsq/files/patch-aa b/archivers/squsq/files/patch-usq.c
index 496a192ae68f..496a192ae68f 100644
--- a/archivers/squsq/files/patch-aa
+++ b/archivers/squsq/files/patch-usq.c
diff --git a/archivers/zip/files/patch-ab b/archivers/zip/files/patch-unix_Makefile
index c466c97973f2..c466c97973f2 100644
--- a/archivers/zip/files/patch-ab
+++ b/archivers/zip/files/patch-unix_Makefile
diff --git a/archivers/zip/files/patch-aa b/archivers/zip/files/patch-unix_configure
index adcc2c41e3cf..adcc2c41e3cf 100644
--- a/archivers/zip/files/patch-aa
+++ b/archivers/zip/files/patch-unix_configure