[pkgsrc/trunk]: pkgsrc/sysutils/gnome-vfs2 Fix gnome-vfs2-cdda build under Dr...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/a6459731edfc
branches:  trunk
changeset: 495099:a6459731edfc
user:      jmmv <jmmv%pkgsrc.org@localhost>
date:      Thu Jun 02 17:10:10 2005 +0000

description:
Fix gnome-vfs2-cdda build under Dragonfly.  Patch from Joerg Sonnenberger.

diffstat:

 sysutils/gnome-vfs2/distinfo         |  4 ++--
 sysutils/gnome-vfs2/patches/patch-ad |  8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diffs (50 lines):

diff -r 9594ee846afd -r a6459731edfc sysutils/gnome-vfs2/distinfo
--- a/sysutils/gnome-vfs2/distinfo      Thu Jun 02 16:13:19 2005 +0000
+++ b/sysutils/gnome-vfs2/distinfo      Thu Jun 02 17:10:10 2005 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.38 2005/05/31 18:28:44 jmmv Exp $
+$NetBSD: distinfo,v 1.39 2005/06/02 17:10:10 jmmv Exp $
 
 SHA1 (gnome-vfs-2.10.1.tar.bz2) = e5dc34cc9ea4a570c1fda31e0adadfa2271a5aaa
 RMD160 (gnome-vfs-2.10.1.tar.bz2) = 4336a26eab0558759b0b099ed8bb2c7f3342b0d4
@@ -6,7 +6,7 @@
 SHA1 (patch-aa) = a5a3ac6be3e2a888eaaab108807d2aff651e62db
 SHA1 (patch-ab) = 6320180870f234a150dfe40f8f990deec7a2a0b5
 SHA1 (patch-ac) = 6c9604b57eab2429935dffac8c17e09fa6e3e53a
-SHA1 (patch-ad) = 326e835c7fd1d2e25ac2ae4736347d38ffe8ea06
+SHA1 (patch-ad) = 2e8159aa2fdf6a01ee46a450054dd329669af0b5
 SHA1 (patch-ae) = 32fe1a4e82d96bf80f3364704e7369a4ee778e0f
 SHA1 (patch-af) = ebbd81c92403cd429a807f9a89c81971d1c4fb88
 SHA1 (patch-ag) = 78f7d50beaeab8b33c554e6cfaf510cdba3b00ba
diff -r 9594ee846afd -r a6459731edfc sysutils/gnome-vfs2/patches/patch-ad
--- a/sysutils/gnome-vfs2/patches/patch-ad      Thu Jun 02 16:13:19 2005 +0000
+++ b/sysutils/gnome-vfs2/patches/patch-ad      Thu Jun 02 17:10:10 2005 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.3 2004/04/01 18:21:20 jmmv Exp $
+$NetBSD: patch-ad,v 1.4 2005/06/02 17:10:10 jmmv Exp $
 
 http://bugzilla.gnome.org/show_bug.cgi?id=134276
 
---- modules/cdda-method.c.orig 2004-01-22 15:28:47.000000000 +0000
+--- modules/cdda-method.c.orig 2004-01-22 13:29:10.000000000 +0100
 +++ modules/cdda-method.c
 @@ -623,10 +623,10 @@ do_get_file_info (GnomeVFSMethod *method
        /* Check and see if we already have opened and stashed this drive */
@@ -11,7 +11,7 @@
 -#ifdef __linux__
 -                      if (strcmp (drive->cdda_device_name, global_context->drive->cdda_device_name) == 0) {
 -#elif defined(__FreeBSD__)
-+#if defined(__FreeBSD__)
++#if defined(__FreeBSD__) || defined(__DragonFly__)
                        if (strcmp (drive->dev->device_path, global_context->drive->dev->device_path) == 0) {
 +#else
 +                      if (strcmp (drive->cdda_device_name, global_context->drive->cdda_device_name) == 0) {
@@ -25,7 +25,7 @@
 -#ifdef __linux__
 -                              if (strcmp (drive->cdda_device_name, global_context->drive->cdda_device_name) != 0) {
 -#elif defined(__FreeBSD__)
-+#if defined(__FreeBSD__)
++#if defined(__FreeBSD__) || defined(__DragonFly__)
                                if (strcmp (drive->dev->device_path, global_context->drive->dev->device_path) != 0) {
 +#else
 +                              if (strcmp (drive->cdda_device_name, global_context->drive->cdda_device_name) != 0) {