>Number:         23864
>Category:       pkg
>Synopsis:       sysutils/gnome-vfs2 doesn't build on FreeBSD-STABLE; trival fix
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Tue Dec 23 23:23:00 UTC 2003
>Closed-Date:
>Last-Modified:
>Originator:     Michal Pasternak
>Release:        N/A
>Organization:
>Environment:
FreeBSD mainframe.w.lub.pl 4.9-STABLE FreeBSD 4.9-STABLE #0: Tue Dec 23 20:45:53 CET 2003     root@mainframe.w.lub.pl:/usr/obj/usr/src/sys/MP-UX  i386

>Description:
When building sysutils/gnome-vfs2, buidl breaks at:

cdda-method.c: In function `do_get_file_info':
cdda-method.c:626: structure has no member named `cdda_device_name'
cdda-method.c:626: structure has no member named `cdda_device_name'
cdda-method.c: In function `do_open_directory':
cdda-method.c:712: structure has no member named `cdda_device_name'
cdda-method.c:712: structure has no member named `cdda_device_name'
gmake[1]: *** [cdda-method.lo] Error 1
gmake[1]: Leaving directory `/usr/pkgsrc/sysutils/gnome-vfs2/work/gnome-vfs-2.4.1/modules'

>How-To-Repeat:
Obvious.
>Fix:
Almost the same as http://www.freebsd.org/cgi/cvsweb.cgi/ports/devel/gnomevfs2/files/patch-modules_cdda-method.c (thank you, FreeBSD Ports Collection), only modified a bit.

Please install it as sysutils/gnome-vfs2/patches/patch-aj:


$NetBSD$

--- modules/cdda-method.c.orig  Wed May  8 21:04:51 2002
+++ modules/cdda-method.c       Tue Dec 23 23:13:59 2003
@@ -623,7 +623,11 @@
        // 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 @@
        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);

>Release-Note:
>Audit-Trail:
>Unformatted: