[pkgsrc/trunk]: pkgsrc/sysutils/gnome-vfs2 Fix build on FreeBSD 4.9-STABLE. ...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/899a0e7bd8bf
branches:  trunk
changeset: 468762:899a0e7bd8bf
user:      snj <snj%pkgsrc.org@localhost>
date:      Mon Feb 16 20:36:04 2004 +0000

description:
Fix build on FreeBSD 4.9-STABLE.  From Michal Pasternak in PR pkg/23864.
While here, move PKGREVISION to silence pkglint.

Okayed by jmmv.

diffstat:

 sysutils/gnome-vfs2/Makefile         |   4 ++--
 sysutils/gnome-vfs2/distinfo         |   3 ++-
 sysutils/gnome-vfs2/patches/patch-aa |  28 ++++++++++++++++++++++++++++
 3 files changed, 32 insertions(+), 3 deletions(-)

diffs (60 lines):

diff -r a7242a9b8985 -r 899a0e7bd8bf sysutils/gnome-vfs2/Makefile
--- a/sysutils/gnome-vfs2/Makefile      Mon Feb 16 20:25:35 2004 +0000
+++ b/sysutils/gnome-vfs2/Makefile      Mon Feb 16 20:36:04 2004 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.31 2004/02/14 18:26:29 jmmv Exp $
+# $NetBSD: Makefile,v 1.32 2004/02/16 20:36:04 snj Exp $
 #
 
 DISTNAME=              gnome-vfs-2.4.2
+PKGNAME=               ${DISTNAME:S/vfs/vfs2/}
 PKGREVISION=           3
-PKGNAME=               ${DISTNAME:S/vfs/vfs2/}
 CATEGORIES=            sysutils gnome
 MASTER_SITES=          ${MASTER_SITE_GNOME:=sources/gnome-vfs/2.4/}
 EXTRACT_SUFX=          .tar.bz2
diff -r a7242a9b8985 -r 899a0e7bd8bf sysutils/gnome-vfs2/distinfo
--- a/sysutils/gnome-vfs2/distinfo      Mon Feb 16 20:25:35 2004 +0000
+++ b/sysutils/gnome-vfs2/distinfo      Mon Feb 16 20:36:04 2004 +0000
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.13 2004/02/09 18:45:52 jmmv Exp $
+$NetBSD: distinfo,v 1.14 2004/02/16 20:36:04 snj Exp $
 
 SHA1 (gnome-vfs-2.4.2.tar.bz2) = a5439bdabc10b6ec8c8dbe01f90c772aa2d3e0f8
 Size (gnome-vfs-2.4.2.tar.bz2) = 1067445 bytes
+SHA1 (patch-aa) = 88cefbcb5cadf275c6be00c34b5e5b5c5fd6976e
 SHA1 (patch-ab) = a162ffe1e0b396599d57af2c50a7843e75d9dbc1
 SHA1 (patch-ag) = 8dda137fe56462ee2336678a872a43611b11984f
 SHA1 (patch-ai) = d89edb0dc089818191c12360ae542c0edc9fe414
diff -r a7242a9b8985 -r 899a0e7bd8bf sysutils/gnome-vfs2/patches/patch-aa
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sysutils/gnome-vfs2/patches/patch-aa      Mon Feb 16 20:36:04 2004 +0000
@@ -0,0 +1,28 @@
+$NetBSD: patch-aa,v 1.8 2004/02/16 20:36:04 snj Exp $
+
+--- modules/cdda-method.c.orig 2004-02-16 11:08:48.000000000 -0800
++++ modules/cdda-method.c      2004-02-16 11:11:24.000000000 -0800
+@@ -623,7 +623,11 @@ do_get_file_info (GnomeVFSMethod *method
+       /* Check and see if we already have opened and stashed this drive */
+       if (!use_base) {
+               if (global_context != NULL) {
++#ifndef __FreeBSD__
+                       if (strcmp (drive->cdda_device_name, global_context->drive->cdda_device_name) == 0) {
++#else
++                      if (strcmp (drive->dev->device_path, global_context->drive->dev->device_path) == 0) {
++#endif
+                               use_cache = TRUE;
+                               cdda_close (drive);
+                               gnome_vfs_file_info_copy (file_info, global_context->file_info);
+@@ -709,7 +713,11 @@ do_open_directory (GnomeVFSMethod *metho
+       if (!use_base) {
+               /* Check for cache */
+               if (global_context != NULL) {
++#ifndef __FreeBSD__
+                               if (strcmp (drive->cdda_device_name, global_context->drive->cdda_device_name) != 0) {
++#else
++                              if (strcmp (drive->dev->device_path, global_context->drive->dev->device_path) != 0) {
++#endif
+                                       /*      Clear old cache */
+                                       cdda_context_free (global_context);
+                                       global_context = cdda_context_new (drive, uri);