[pkgsrc/trunk]: pkgsrc/sysutils/gnome-vfs2 modules/cdda-cdrom-extensions.h al...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/dc06a6c70e53
branches:  trunk
changeset: 483235:dc06a6c70e53
user:      sketch <sketch%pkgsrc.org@localhost>
date:      Tue Nov 09 16:04:52 2004 +0000

description:
modules/cdda-cdrom-extensions.h also clashes with a Solaris header, so as it
was only added for Darwin support, only include it on that platform.

diffstat:

 sysutils/gnome-vfs2/distinfo         |  4 ++--
 sysutils/gnome-vfs2/patches/patch-af |  4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diffs (35 lines):

diff -r 4fe576be4df5 -r dc06a6c70e53 sysutils/gnome-vfs2/distinfo
--- a/sysutils/gnome-vfs2/distinfo      Tue Nov 09 15:44:33 2004 +0000
+++ b/sysutils/gnome-vfs2/distinfo      Tue Nov 09 16:04:52 2004 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.26 2004/10/26 21:01:06 jmmv Exp $
+$NetBSD: distinfo,v 1.27 2004/11/09 16:04:52 sketch Exp $
 
 SHA1 (gnome-vfs-2.8.2.tar.bz2) = 6e0e1985fa539267cbe9d67e9b8911bfeaeda945
 Size (gnome-vfs-2.8.2.tar.bz2) = 1904430 bytes
@@ -6,7 +6,7 @@
 SHA1 (patch-ab) = 9fc885b1ef1e9dd05f4b3041963df298dbfba582
 SHA1 (patch-ad) = 326e835c7fd1d2e25ac2ae4736347d38ffe8ea06
 SHA1 (patch-ae) = 68d455dce03aac6d5372ae193c7cdaea3fceddbf
-SHA1 (patch-af) = 8664dd65a380460ff20320d13d1cff58e42011d0
+SHA1 (patch-af) = 2bfce4e7612e8e1322f870e256d2ba9b587d79ff
 SHA1 (patch-ag) = 0bec8918c71b2aa470c96c4512b11f42550484c4
 SHA1 (patch-ai) = 3a45cd84dfa025a52c7db3aab2cca85b540078a6
 SHA1 (patch-am) = 3b48df60dc1cb53f45358ac47fccb62b776adfbb
diff -r 4fe576be4df5 -r dc06a6c70e53 sysutils/gnome-vfs2/patches/patch-af
--- a/sysutils/gnome-vfs2/patches/patch-af      Tue Nov 09 15:44:33 2004 +0000
+++ b/sysutils/gnome-vfs2/patches/patch-af      Tue Nov 09 16:04:52 2004 +0000
@@ -1,10 +1,12 @@
+$NetBSD: patch-af,v 1.6 2004/11/09 16:04:52 sketch Exp $
+
 --- libgnomevfs/gnome-vfs-cdrom.c.orig Sun Oct 24 16:56:46 2004
 +++ libgnomevfs/gnome-vfs-cdrom.c      Sun Oct 24 16:56:17 2004
 @@ -37,6 +37,8 @@
  
  #ifdef __linux__
  #include <linux/cdrom.h>
-+#else
++#elif defined(__APPLE__)
 +#include <modules/cdda-cdrom-extensions.h>
  #endif