[pkgsrc/trunk]: pkgsrc/multimedia/gnome2-media Fix build in NetBSD. I don't ...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/7c7f4465e51b
branches:  trunk
changeset: 473204:7c7f4465e51b
user:      jmmv <jmmv%pkgsrc.org@localhost>
date:      Sat Apr 17 15:04:31 2004 +0000

description:
Fix build in NetBSD.  I don't know how the previous change was supposed to
fix it under FreeBSD, because it only modified code inside conditionals for
NetBSD only.

diffstat:

 multimedia/gnome2-media/distinfo         |  4 ++--
 multimedia/gnome2-media/patches/patch-ag |  6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diffs (40 lines):

diff -r ebaa6004ad4d -r 7c7f4465e51b multimedia/gnome2-media/distinfo
--- a/multimedia/gnome2-media/distinfo  Sat Apr 17 14:52:19 2004 +0000
+++ b/multimedia/gnome2-media/distinfo  Sat Apr 17 15:04:31 2004 +0000
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.3 2004/04/15 13:16:35 xtraeme Exp $
+$NetBSD: distinfo,v 1.4 2004/04/17 15:04:31 jmmv Exp $
 
 SHA1 (gnome-media-2.6.0.tar.bz2) = 41f64e9c800df461133a1eac8853954c1bdb5da2
 Size (gnome-media-2.6.0.tar.bz2) = 2943852 bytes
 SHA1 (patch-aa) = 8ba862f280caec8295b95f84b7f53c0fbd2f04a7
-SHA1 (patch-ag) = 29ba5f797b0c4457bb76297b0465d67939eaef14
+SHA1 (patch-ag) = 114ddd8d95bf4b2e471d3bc13308aa03cef7dd1a
 SHA1 (patch-ai) = 5eb11da18015ac4d4c3a85bc38b75e59f1890a7e
diff -r ebaa6004ad4d -r 7c7f4465e51b multimedia/gnome2-media/patches/patch-ag
--- a/multimedia/gnome2-media/patches/patch-ag  Sat Apr 17 14:52:19 2004 +0000
+++ b/multimedia/gnome2-media/patches/patch-ag  Sat Apr 17 15:04:31 2004 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-ag,v 1.3 2004/04/15 13:16:35 xtraeme Exp $
+$NetBSD: patch-ag,v 1.4 2004/04/17 15:04:31 jmmv Exp $
 
 --- gnome-cd/freebsd-cdrom.c.orig      Thu Apr 15 15:03:50 2004
 +++ gnome-cd/freebsd-cdrom.c   Thu Apr 15 15:11:36 2004
@@ -34,7 +34,7 @@
 +#ifdef __FreeBSD__
                if (ioctl (cdrom->fd, CDIOREADTOCENTRY, &tocentry) < 0) {
 +#else
-+              if (ioctl (cdrom->fd, CDIOREADTOCENTRY, &tocentries) < 0) {
++              if (ioctl (cdrom->fd, CDIOREADTOCENTRYS, &tocentries) < 0) {
 +#endif
                        g_warning ("IOCtl failed");
                        continue;
@@ -68,7 +68,7 @@
 +#ifdef __FreeBSD__
        ASSIGN_MSF (priv->track_info[priv->number_tracks].address, tocentry.entry.addr.msf);
 +#else
-+      ASSIGN_MSF (priv->track_info[priv->number_tracks].address, tocentries.addr.msf);
++      ASSIGN_MSF (priv->track_info[priv->number_tracks].address, tocentry.addr.msf);
 +#endif
        calculate_track_lengths (lcd);