ports/76378: Typo in vobcopy breaks device detection

[Nate Eldredge]

>Number:         76378
>Category:       ports
>Synopsis:       Typo in vobcopy breaks device detection
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Mon Jan 17 22:30:24 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     Nate Eldredge
>Release:        5.3-RELEASE-p2
>Organization:
>Environment:
FreeBSD mercury.lan 5.3-RELEASE-p2 FreeBSD 5.3-RELEASE-p2 #2: Wed Dec  1 17:26:26 PST 2004     nate at mercury.lan:/medium/obj/medium/src/sys/MERCURY  i386    
>Description:
The sysutils/vobcopy port has code to detect the DVD device, given the mount point.  It has an #ifdef to do this right for FreeBSD 5.x.  However,  in checking the FreeBSD version, it uses the nonexistent macro __FreeBSD_Version instead of the correct __FreeBSD_version.  Thus, when built, it does the wrong thing and tries to read from the wrong device.
>How-To-Repeat:
$ vobcopy -m -i /cdrom   
[Hint] You use -i. Normally this is not necessary, vobcopy finds the input dir by itself. This option is only there if vobcopy makes trouble.
[Hint] If vobcopy makes trouble, please mail me so that I can fix this (robos at muon.de). Thanks
Vobcopy 0.5.14 - GPL Copyright (c) 2001 - 2004 robos at muon.de
[Hint] All lines starting with "libdvdread:" are not from vobcopy but from the libdvdread-library

path to dvd: /dev/racd0
libdvdread: Can't stat /dev/racd0
No such file or directory

[Error] Path thingy didn't work '(null)'
[Error] Try someting like -i /cdrom, /dvd  or /mnt/dvd 

>Fix:
(tabs may be broken here, but the fix is one byte anyway...)

--- dvd.c.orig  Mon Jan 17 14:17:21 2005
+++ dvd.c       Mon Jan 17 14:17:38 2005
@@ -199,7 +199,7 @@
        if( !strcmp( path, buf.f_mntonname ) )
          { 
            mounted = TRUE;
-#if defined(__FreeBSD__) && (__FreeBSD_Version > 500000)
+#if defined(__FreeBSD__) && (__FreeBSD_version > 500000)
           strcpy(device, buf.f_mntfromname);
 #else
           strcpy(device, "/dev/r");

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