[pkgsrc/trunk]: pkgsrc/multimedia/libdvdread add DragonFly support, from Joer...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/29a4e235d2b7
branches:  trunk
changeset: 494569:29a4e235d2b7
user:      drochner <drochner%pkgsrc.org@localhost>
date:      Wed May 25 17:11:52 2005 +0000

description:
add DragonFly support, from Joerg Sonnenberger per PR pkg/30314

diffstat:

 multimedia/libdvdread/distinfo         |   6 +++---
 multimedia/libdvdread/patches/patch-aa |  22 ++++++++++++++++------
 multimedia/libdvdread/patches/patch-ab |  11 ++++++++++-
 3 files changed, 29 insertions(+), 10 deletions(-)

diffs (81 lines):

diff -r d455b17ac4f4 -r 29a4e235d2b7 multimedia/libdvdread/distinfo
--- a/multimedia/libdvdread/distinfo    Wed May 25 17:10:40 2005 +0000
+++ b/multimedia/libdvdread/distinfo    Wed May 25 17:11:52 2005 +0000
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.6 2005/05/25 17:07:53 drochner Exp $
+$NetBSD: distinfo,v 1.7 2005/05/25 17:11:52 drochner Exp $
 
 SHA1 (libdvdread-0.9.4.tar.gz) = a4b626e49ba8bd33857693c3abe8b34196bc3360
 RMD160 (libdvdread-0.9.4.tar.gz) = 9f7f82e14fb5d458686e5cb2e5f364bad19dd08e
 Size (libdvdread-0.9.4.tar.gz) = 256858 bytes
-SHA1 (patch-aa) = d97d18c6e1ad445ed7d8e1cdb990ca58ed2d3ef9
-SHA1 (patch-ab) = a86a639adf22fe17c98db059e3fa542d0424d468
+SHA1 (patch-aa) = 2b5a308a24e2ba17109f8c4978d0a972864d2a72
+SHA1 (patch-ab) = 52416442f5988b28c109d623d2ac4ee61a802db2
 SHA1 (patch-ac) = 971dc8802bf8f815821e8ad5f279a5148fcf26f7
 SHA1 (patch-ad) = f6d44ffc3434e79499a807daa8daa7f22eba54ab
 SHA1 (patch-ae) = 99d296d4c1c49f1ff4747109dfc8b3d07647ffc4
diff -r d455b17ac4f4 -r 29a4e235d2b7 multimedia/libdvdread/patches/patch-aa
--- a/multimedia/libdvdread/patches/patch-aa    Wed May 25 17:10:40 2005 +0000
+++ b/multimedia/libdvdread/patches/patch-aa    Wed May 25 17:11:52 2005 +0000
@@ -1,12 +1,22 @@
-$NetBSD: patch-aa,v 1.2 2005/03/10 14:21:45 tv Exp $
+$NetBSD: patch-aa,v 1.3 2005/05/25 17:11:52 drochner Exp $
 
---- dvdread/bswap.h.orig       2002-12-14 19:09:12.000000000 -0500
+--- dvdread/bswap.h.orig       2002-12-15 01:09:12.000000000 +0100
 +++ dvdread/bswap.h
-@@ -57,7 +57,15 @@
+@@ -53,19 +53,33 @@
+ #define B2N_32(x) x = swap32(x)
+ #define B2N_64(x) x = swap64(x)
+ 
+-#elif defined(__FreeBSD__) && __FreeBSD_version >= 470000
++#elif defined(__DragonFly__)
  #include <sys/endian.h>
  #define B2N_16(x) x = be16toh(x)
  #define B2N_32(x) x = be32toh(x)
--#define B2N_64(x) x = be64toh(x)
+ #define B2N_64(x) x = be64toh(x)
+ 
++#elif defined(__FreeBSD__) && __FreeBSD_version >= 470000
++#include <sys/endian.h>
++#define B2N_16(x) x = be16toh(x)
++#define B2N_32(x) x = be32toh(x)
 +#define B2N_64(x) x = \
 +     ((((x) & 0xff00000000000000) >> 56) | \
 +      (((x) & 0x00ff000000000000) >> 40) | \
@@ -16,10 +26,10 @@
 +      (((x) & 0x0000000000ff0000) << 24) | \
 +      (((x) & 0x000000000000ff00) << 40) | \
 +      (((x) & 0x00000000000000ff) << 56))
- 
++
  /* This is a slow but portable implementation, it has multiple evaluation 
   * problems so beware.
-@@ -65,7 +73,7 @@
+  * Old FreeBSD's and Solaris don't have <byteswap.h> or any other such 
   * functionality! 
   */
  
diff -r d455b17ac4f4 -r 29a4e235d2b7 multimedia/libdvdread/patches/patch-ab
--- a/multimedia/libdvdread/patches/patch-ab    Wed May 25 17:10:40 2005 +0000
+++ b/multimedia/libdvdread/patches/patch-ab    Wed May 25 17:11:52 2005 +0000
@@ -1,7 +1,16 @@
-$NetBSD: patch-ab,v 1.2 2004/06/21 16:14:14 drochner Exp $
+$NetBSD: patch-ab,v 1.3 2005/05/25 17:11:52 drochner Exp $
 
 --- dvdread/dvd_reader.c.orig  2003-02-13 23:31:21.000000000 +0100
 +++ dvdread/dvd_reader.c
+@@ -32,7 +32,7 @@
+ #include <limits.h>
+ #include <dirent.h>
+  
+-#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__bsdi__)|| defined(__DARWIN__)
++#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__bsdi__)|| defined(__DARWIN__) || defined(__DragonFly__)
+ #define SYS_BSD 1
+ #endif
+ 
 @@ -282,7 +282,7 @@ static char *bsd_block2char( const char 
      char *new_path;