[pkgsrc/trunk]: pkgsrc/devel/libvolume_id Fix build under OpenBSD

[ryoon <ryoon%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/ba1116d1bdcc
branches:  trunk
changeset: 633969:ba1116d1bdcc
user:      ryoon <ryoon%pkgsrc.org@localhost>
date:      Mon May 05 21:13:16 2014 +0000

description:
Fix build under OpenBSD

* Treat OpenBSD like other *BSD

diffstat:

 devel/libvolume_id/distinfo         |  10 +++++-----
 devel/libvolume_id/patches/patch-aa |   8 ++++----
 devel/libvolume_id/patches/patch-ab |   8 ++++----
 devel/libvolume_id/patches/patch-ac |   4 ++--
 devel/libvolume_id/patches/patch-ad |   8 ++++----
 5 files changed, 19 insertions(+), 19 deletions(-)

diffs (100 lines):

diff -r 0e75ee69c3f5 -r ba1116d1bdcc devel/libvolume_id/distinfo
--- a/devel/libvolume_id/distinfo       Mon May 05 21:11:25 2014 +0000
+++ b/devel/libvolume_id/distinfo       Mon May 05 21:13:16 2014 +0000
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.10 2012/06/27 09:24:26 bsiegert Exp $
+$NetBSD: distinfo,v 1.11 2014/05/05 21:13:16 ryoon Exp $
 
 SHA1 (libvolume_id-0.81.1.tar.bz2) = 3d2f22654042e5995d119d61d2aecf4b5d8efb8a
 RMD160 (libvolume_id-0.81.1.tar.bz2) = 222fbe2ff595eeedafe41c9c47987ead34aa455e
 Size (libvolume_id-0.81.1.tar.bz2) = 23399 bytes
-SHA1 (patch-aa) = 68b3030ef498ab9ff27c0b62058ddb23e76d6593
-SHA1 (patch-ab) = 709986c593edb4f429b23db15dc394b82e897537
-SHA1 (patch-ac) = 1c4e5607bc185a1727981379285ef411877c4e43
-SHA1 (patch-ad) = eaeec1ae864eda190a53f2d177113abc6283b430
+SHA1 (patch-aa) = d6fe419f1c79823f87d927ecfcc057f9c0e6009e
+SHA1 (patch-ab) = 6ef5cf4559578c30bc19db3bca896110374b348b
+SHA1 (patch-ac) = d27cb6f0275e06d9a75290328d4f66f68a2b8d9a
+SHA1 (patch-ad) = 894b565d3fcf03dd0fee8722066a0730c62a7af9
 SHA1 (patch-ae) = 9382586dab03ed7691d26b029d930940dc3e7302
diff -r 0e75ee69c3f5 -r ba1116d1bdcc devel/libvolume_id/patches/patch-aa
--- a/devel/libvolume_id/patches/patch-aa       Mon May 05 21:11:25 2014 +0000
+++ b/devel/libvolume_id/patches/patch-aa       Mon May 05 21:13:16 2014 +0000
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.5 2012/06/27 09:24:26 bsiegert Exp $
+$NetBSD: patch-aa,v 1.6 2014/05/05 21:13:16 ryoon Exp $
 
---- ddf_raid.c.orig    2007-12-27 02:05:32.000000000 +0100
-+++ ddf_raid.c 2011-07-26 16:09:33.749829676 +0200
+--- ddf_raid.c.orig    2007-12-27 01:05:32.000000000 +0000
++++ ddf_raid.c
 @@ -22,9 +22,9 @@
  #include <string.h>
  #include <errno.h>
  #include <ctype.h>
 -#ifdef __FreeBSD__
-+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__) || defined(__MirBSD__)
++#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__) || defined(__MirBSD__) || defined(__OpenBSD__)
  #include <sys/endian.h>
 -#else
 +#elif !defined(__APPLE__) && !defined(__sun)
diff -r 0e75ee69c3f5 -r ba1116d1bdcc devel/libvolume_id/patches/patch-ab
--- a/devel/libvolume_id/patches/patch-ab       Mon May 05 21:11:25 2014 +0000
+++ b/devel/libvolume_id/patches/patch-ab       Mon May 05 21:13:16 2014 +0000
@@ -1,13 +1,13 @@
-$NetBSD: patch-ab,v 1.5 2012/06/27 09:24:26 bsiegert Exp $
+$NetBSD: patch-ab,v 1.6 2014/05/05 21:13:16 ryoon Exp $
 
---- linux_raid.c.orig  2007-12-27 02:03:43.000000000 +0100
-+++ linux_raid.c       2011-07-26 16:10:13.635691474 +0200
+--- linux_raid.c.orig  2007-12-27 01:03:43.000000000 +0000
++++ linux_raid.c
 @@ -22,9 +22,9 @@
  #include <string.h>
  #include <errno.h>
  #include <ctype.h>
 -#ifdef __FreeBSD__
-+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__) || defined(__MirBSD__)
++#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__) || defined(__MirBSD__) || defined(__OpenBSD__)
  #include <sys/endian.h>
 -#else
 +#elif !defined(__APPLE__) && !defined(__sun)
diff -r 0e75ee69c3f5 -r ba1116d1bdcc devel/libvolume_id/patches/patch-ac
--- a/devel/libvolume_id/patches/patch-ac       Mon May 05 21:11:25 2014 +0000
+++ b/devel/libvolume_id/patches/patch-ac       Mon May 05 21:13:16 2014 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.8 2012/06/27 09:24:26 bsiegert Exp $
+$NetBSD: patch-ac,v 1.9 2014/05/05 21:13:16 ryoon Exp $
 
 --- util.c.orig        2009-03-02 18:17:35.000000000 +0000
 +++ util.c
@@ -10,7 +10,7 @@
 +#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__) || defined(__APPLE__) || defined(__MirBSD__)
  #include <sys/param.h>
 -#if __FreeBSD_version < 800067
-+#if __FreeBSD_version < 800067 && __DragonFly_version < 200202 && __NetBSD_Version__ < 599001100 && __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ < 1070
++#if __FreeBSD_version < 800067 && __DragonFly_version < 200202 && __NetBSD_Version__ < 599001100 && __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ < 1070 && __OpenBSD__
  static size_t strnlen (const char *s, size_t maxlen)
  {
        size_t i;
diff -r 0e75ee69c3f5 -r ba1116d1bdcc devel/libvolume_id/patches/patch-ad
--- a/devel/libvolume_id/patches/patch-ad       Mon May 05 21:11:25 2014 +0000
+++ b/devel/libvolume_id/patches/patch-ad       Mon May 05 21:13:16 2014 +0000
@@ -1,13 +1,13 @@
-$NetBSD: patch-ad,v 1.5 2012/06/27 09:24:26 bsiegert Exp $
+$NetBSD: patch-ad,v 1.6 2014/05/05 21:13:16 ryoon Exp $
 
---- util.h.orig        2007-12-27 01:51:05.000000000 +0100
-+++ util.h     2011-07-26 16:07:46.734800140 +0200
+--- util.h.orig        2007-12-27 00:51:05.000000000 +0000
++++ util.h
 @@ -19,7 +19,7 @@
  #  include <config.h>
  #endif
  
 -#ifdef __FreeBSD__
-+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__) || defined(__MirBSD__)
++#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__) || defined(__MirBSD__) || defined(__OpenBSD__)
  #include <sys/endian.h>
  
  #define __BYTE_ORDER            _BYTE_ORDER