Fix build for OpenBSD. Defuzz patches (casuality of mkpatches).

9 files changed, 41 insertions, 23 deletions

diff --git a/archivers/arj/distinfo b/archivers/arj/distinfo
index 7c5bbd9392e..9d23bff0bdc 100644
--- a/archivers/arj/distinfo
+++ b/archivers/arj/distinfo
@@ -1,13 +1,14 @@
-$NetBSD: distinfo,v 1.15 2013/11/04 16:41:43 joerg Exp $
+$NetBSD: distinfo,v 1.16 2014/05/11 20:56:16 rodent Exp $
 
 SHA1 (arj-3.10.22.tar.gz) = e8470f480e9eee14906e5485a8898e5c24738c8b
 RMD160 (arj-3.10.22.tar.gz) = 80f8a1a8cd203f73def8e957d96563a4dba80153
 Size (arj-3.10.22.tar.gz) = 431467 bytes
-SHA1 (patch-aa) = 7dc0000f3d0c0974a40bbea7d9103449cb89b4b9
-SHA1 (patch-ab) = da21aae85f1bf4b9c8cac78d45ad33c44fcd5d3d
+SHA1 (patch-aa) = 02a45f1365121b63020f3714cea142f9571d8f72
+SHA1 (patch-ab) = 062f3dc1eee6f009dfdfa432bb3c138a9c28a829
 SHA1 (patch-ac) = db8a0afa61f49242e9fd601d5fc3167cf75f748b
-SHA1 (patch-ad) = 186b05ec694daa25504123690f9b7bba9f22a7f4
-SHA1 (patch-ae) = 46181177d4a42b510a02ce8e138275dca453f1de
-SHA1 (patch-af) = c4e5a0dc8a2b42af471fd065ab28f162d94bd0b7
-SHA1 (patch-ag) = ce4d0fefed6ccf7ab7fad864a7cb7faa36e4e4ac
-SHA1 (patch-integr.c) = 8c3f9fd4db4d4b1323cceccd6cfa31dc09ab39af
+SHA1 (patch-ad) = 2cf609a6c7cb4e32441a433db3dc9cc04c23ae2a
+SHA1 (patch-ae) = 5bc829e43a4d45354905f061905e2810408847f1
+SHA1 (patch-af) = cbde8eccfa95e934714591974786fe94d7b4f19f
+SHA1 (patch-ag) = 898539d86abd3747b60d9f95a5a797f709f6360d
+SHA1 (patch-exe__sear.c) = 6d8db5a2cdb8f2452b96cf4d09687ae9d45d3e17
+SHA1 (patch-integr.c) = 67ae3fc4149a7b71a185bf45d2a457a109bcef9b
diff --git a/archivers/arj/patches/patch-aa b/archivers/arj/patches/patch-aa
index 5ecd5049ad6..1343cb54d34 100644
--- a/archivers/arj/patches/patch-aa
+++ b/archivers/arj/patches/patch-aa
@@ -1,4 +1,6 @@
-$NetBSD: patch-aa,v 1.8 2005/10/07 16:52:06 joerg Exp $
+$NetBSD: patch-aa,v 1.9 2014/05/11 20:56:16 rodent Exp $
+
+Add support for various OSes.
 
 --- environ.c.orig	2004-06-18 16:19:36.000000000 +0000
 +++ environ.c
@@ -7,7 +9,7 @@ $NetBSD: patch-aa,v 1.8 2005/10/07 16:52:06 joerg Exp $
    #include <sys/statfs.h>
    #include <sys/statvfs.h>
 - #elif defined(__FreeBSD__)||defined(__NetBSD__)
-+ #elif defined(__FreeBSD__)||defined(__NetBSD__)||defined(__APPLE__) || defined(__DragonFly__)
++ #elif defined(__FreeBSD__)||defined(__NetBSD__)||defined(__APPLE__) || defined(__DragonFly__) || defined(__OpenBSD__) || defined(__OpenBSD__)
    #include <sys/param.h>
    #include <sys/mount.h>
 - #elif defined(__QNXNTO__)
diff --git a/archivers/arj/patches/patch-ab b/archivers/arj/patches/patch-ab
index e9f0320a564..fbacce74395 100644
--- a/archivers/arj/patches/patch-ab
+++ b/archivers/arj/patches/patch-ab
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.7 2006/03/05 21:40:57 adam Exp $
+$NetBSD: patch-ab,v 1.8 2014/05/11 20:56:16 rodent Exp $
 
---- gnu/configure.in.orig	2005-06-21 20:27:20.000000000 +0200
+--- gnu/configure.in.orig	2005-06-21 18:27:20.000000000 +0000
 +++ gnu/configure.in
 @@ -12,13 +12,23 @@ dnl Installation script (let it be, temp
  AC_PROG_INSTALL([e:/os2apps/autoconf/install-sh])
diff --git a/archivers/arj/patches/patch-ad b/archivers/arj/patches/patch-ad
index 2b341ad077a..5584af2af2b 100644
--- a/archivers/arj/patches/patch-ad
+++ b/archivers/arj/patches/patch-ad
@@ -1,6 +1,6 @@
-$NetBSD: patch-ad,v 1.1 2005/03/22 16:24:13 minskim Exp $
+$NetBSD: patch-ad,v 1.2 2014/05/11 20:56:16 rodent Exp $
 
---- gnu/config.h.in.orig	Sat Apr 17 05:33:38 2004
+--- gnu/config.h.in.orig	2004-04-17 10:33:38.000000000 +0000
 +++ gnu/config.h.in
 @@ -4,6 +4,7 @@
  #undef LIBC
diff --git a/archivers/arj/patches/patch-ae b/archivers/arj/patches/patch-ae
index 62cf8281dbe..acc2a3d047f 100644
--- a/archivers/arj/patches/patch-ae
+++ b/archivers/arj/patches/patch-ae
@@ -1,6 +1,6 @@
-$NetBSD: patch-ae,v 1.1 2005/03/22 16:24:13 minskim Exp $
+$NetBSD: patch-ae,v 1.2 2014/05/11 20:56:16 rodent Exp $
 
---- uxspec.c.orig	Sat Apr 17 06:39:42 2004
+--- uxspec.c.orig	2004-04-17 11:39:42.000000000 +0000
 +++ uxspec.c
 @@ -13,6 +13,11 @@
   #include <unistd.h>
diff --git a/archivers/arj/patches/patch-af b/archivers/arj/patches/patch-af
index d1d33f5605b..f0e8794ed6e 100644
--- a/archivers/arj/patches/patch-af
+++ b/archivers/arj/patches/patch-af
@@ -1,7 +1,7 @@
-$NetBSD: patch-af,v 1.2 2009/05/13 14:26:24 hasso Exp $
+$NetBSD: patch-af,v 1.3 2014/05/11 20:56:16 rodent Exp $
 
---- fardata.c.orig	2004-04-17 14:39:42 +0300
-+++ fardata.c	2009-05-03 08:53:46 +0300
+--- fardata.c.orig	2004-04-17 11:39:42.000000000 +0000
++++ fardata.c
 @@ -190,7 +190,7 @@ int msg_sprintf(char *str, FMSG *fmt, ..
  
  /* Length-limited strlen() */
diff --git a/archivers/arj/patches/patch-ag b/archivers/arj/patches/patch-ag
index b57e9571238..88dbc9d2172 100644
--- a/archivers/arj/patches/patch-ag
+++ b/archivers/arj/patches/patch-ag
@@ -1,6 +1,6 @@
-$NetBSD: patch-ag,v 1.1 2005/10/07 16:52:06 joerg Exp $
+$NetBSD: patch-ag,v 1.2 2014/05/11 20:56:16 rodent Exp $
 
---- arjdata.c.orig	2005-07-22 13:51:08.000000000 +0000
+--- arjdata.c.orig	2004-04-17 11:44:46.000000000 +0000
 +++ arjdata.c
 @@ -64,6 +64,8 @@ static char *resources[][2]=
    #elif TARGET==UNIX
diff --git a/archivers/arj/patches/patch-exe__sear.c b/archivers/arj/patches/patch-exe__sear.c
new file mode 100644
index 00000000000..d45926b2e51
--- /dev/null
+++ b/archivers/arj/patches/patch-exe__sear.c
@@ -0,0 +1,15 @@
+$NetBSD: patch-exe__sear.c,v 1.1 2014/05/11 20:56:16 rodent Exp $
+
+Include elf_abi.h instead of elf.h for OpenBSD.
+
+--- exe_sear.c.orig	2003-10-16 10:32:46.000000000 +0000
++++ exe_sear.c
+@@ -10,6 +10,8 @@
+ #ifdef ELF_EXECUTABLES
+  #ifdef __QNXNTO__
+     #include <libelf.h>
++ #elif defined(__OpenBSD__)
++    #include <elf_abi.h>
+  #else
+     #include <elf.h>
+  #endif /* __QNXNTO__ */
diff --git a/archivers/arj/patches/patch-integr.c b/archivers/arj/patches/patch-integr.c
index fa27283fb2c..f91af75b34d 100644
--- a/archivers/arj/patches/patch-integr.c
+++ b/archivers/arj/patches/patch-integr.c
@@ -1,6 +1,6 @@
-$NetBSD: patch-integr.c,v 1.1 2013/11/04 16:41:43 joerg Exp $
+$NetBSD: patch-integr.c,v 1.2 2014/05/11 20:56:16 rodent Exp $
 
---- integr.c.orig	2013-11-04 16:18:17.000000000 +0000
+--- integr.c.orig	2005-06-21 18:27:18.000000000 +0000
 +++ integr.c
 @@ -5,7 +5,7 @@
   *