[pkgsrc/trunk]: pkgsrc/multimedia/libdvdread Short-cut block2device on Dragon...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/b260fe91edfb
branches:  trunk
changeset: 511258:b260fe91edfb
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Wed Apr 12 17:19:36 2006 +0000

description:
Short-cut block2device on DragonFly and FreeBSD, it is not needed.
Slightly modified version of Steve O'Hara-Smith's patch on pkgsrc-users.

diffstat:

 multimedia/libdvdread/distinfo         |   4 ++--
 multimedia/libdvdread/patches/patch-ab |  15 +++++++++++++--
 2 files changed, 15 insertions(+), 4 deletions(-)

diffs (40 lines):

diff -r d0056bc6843b -r b260fe91edfb multimedia/libdvdread/distinfo
--- a/multimedia/libdvdread/distinfo    Wed Apr 12 17:16:37 2006 +0000
+++ b/multimedia/libdvdread/distinfo    Wed Apr 12 17:19:36 2006 +0000
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.10 2006/02/17 15:39:21 rillig Exp $
+$NetBSD: distinfo,v 1.11 2006/04/12 17:19:36 joerg Exp $
 
 SHA1 (libdvdread-0.9.5.tar.gz) = 7f10287953edb6f00667e12fee3a8b101be9f1cd
 RMD160 (libdvdread-0.9.5.tar.gz) = a558dad42487fb39771c89862075bc29c2d054ca
 Size (libdvdread-0.9.5.tar.gz) = 381006 bytes
 SHA1 (patch-aa) = 44a947081081cfd5634a57d57b5b871ca17daf9d
-SHA1 (patch-ab) = 9aef0b8418a947df46ee66439bed4690a6b3633d
+SHA1 (patch-ab) = 62943ac3f5f017f7715ac6b8907a466b10a24ab8
diff -r d0056bc6843b -r b260fe91edfb multimedia/libdvdread/patches/patch-ab
--- a/multimedia/libdvdread/patches/patch-ab    Wed Apr 12 17:16:37 2006 +0000
+++ b/multimedia/libdvdread/patches/patch-ab    Wed Apr 12 17:19:36 2006 +0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.4 2006/01/23 22:09:26 wiz Exp $
+$NetBSD: patch-ab,v 1.5 2006/04/12 17:19:36 joerg Exp $
 
---- dvdread/dvd_reader.c.orig  2006-01-22 16:45:29.000000000 +0100
+--- dvdread/dvd_reader.c.orig  2006-01-22 15:45:29.000000000 +0000
 +++ dvdread/dvd_reader.c
 @@ -33,7 +33,7 @@
  #include <limits.h>
@@ -11,3 +11,14 @@
  #define SYS_BSD 1
  #endif
  
+@@ -404,7 +404,9 @@ static char *sun_block2char( const char 
+ static char *bsd_block2char( const char *path )
+ {
+   char *new_path;
+-
++#if defined(__DragonFly__) || defined(__FreeBSD__)
++  return (char *) strdup( path ); /* Do not add an r for DragonFly and FreeBSD */
++#endif
+   /* If it doesn't start with "/dev/" or does start with "/dev/r" exit */ 
+   if( strncmp( path, "/dev/",  5 ) || !strncmp( path, "/dev/r", 6 ) ) 
+     return (char *) strdup( path );