summaryrefslogtreecommitdiff
path: root/multimedia/libdvdread
diff options
context:
space:
mode:
authorjoerg <joerg>2006-04-12 17:19:36 +0000
committerjoerg <joerg>2006-04-12 17:19:36 +0000
commit217f1a0517ffc08243928dced4bcc637d3d2af04 (patch)
tree533d5a91f370ed6bf9b85a42c3879398bcd3c2fc /multimedia/libdvdread
parent7b94d253dc6461c1c466b461133ab00d56f23f82 (diff)
downloadpkgsrc-217f1a0517ffc08243928dced4bcc637d3d2af04.tar.gz
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 (limited to 'multimedia/libdvdread')
-rw-r--r--multimedia/libdvdread/distinfo4
-rw-r--r--multimedia/libdvdread/patches/patch-ab15
2 files changed, 15 insertions, 4 deletions
diff --git a/multimedia/libdvdread/distinfo b/multimedia/libdvdread/distinfo
index 8e4777ec29b..606707b6da2 100644
--- a/multimedia/libdvdread/distinfo
+++ b/multimedia/libdvdread/distinfo
@@ -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 --git a/multimedia/libdvdread/patches/patch-ab b/multimedia/libdvdread/patches/patch-ab
index c0eb90bc6b3..2dd7efde81b 100644
--- a/multimedia/libdvdread/patches/patch-ab
+++ b/multimedia/libdvdread/patches/patch-ab
@@ -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 @@ $NetBSD: patch-ab,v 1.4 2006/01/23 22:09:26 wiz Exp $
#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 );