ports/118936: sysutils/hal fails to compile on FreeBSD v6.0

[Alex Stangl]

>Number:         118936
>Category:       ports
>Synopsis:       sysutils/hal fails to compile on FreeBSD v6.0
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Fri Dec 21 18:50:00 UTC 2007
>Closed-Date:
>Last-Modified:
>Originator:     Alex Stangl
>Release:        6.0 (__FreeBSD_version 600034)
>Organization:
>Environment:
FreeBSD scout.stangl.us 6.0-RELEASE FreeBSD 6.0-RELEASE #0: Thu Nov  3 09:36:13 UTC 2005     root at x64.samsco.home:/usr/obj/usr/src/sys/GENERIC  i386

>Description:
Attempting to build sysutils/hal under FreeBSD 6.0 produces the following error.
#if guard block at line 62 doesn't seem to have the correct version number.

cc -O2 -fno-strict-aliasing -pipe -Wall -Wchar-subscripts -Wmissing-declarations -Wnested-externs -Wpointer-arith -Wcast-align -Wsign-compare -o .libs/hald-probe-volume hald_probe_volume-freebsd_dvd_rw_utils.o hald_probe_volume-probe-volume.o  -L/usr/local/lib /usr/local/lib/libglib-2.0.so -licui18n /usr/local/lib/libpcre.so -lvolume_id ../../../hald/freebsd/libprobe/.libs/libhald_freebsd_probe.so /usr/ports/sysutils/hal/work/hal-0.5.8.20071216/libhal/.libs/libhal.so /usr/local/lib/libdbus-1.so -pthread /usr/local/lib/libintl.so /usr/local/lib/libiconv.so -lcam  -Wl,--rpath -Wl,/usr/local/lib
hald_probe_volume-probe-volume.o(.text+0x592): In function `main':
: undefined reference to `isonum_731'
gmake[5]: *** [hald-probe-volume] Error 1



>How-To-Repeat:
in FreeBSD version 600034,

$ cd /usr/ports/sysutils/hal
$ make

>Fix:
Change hal-0.5.8.20071216/hald/freebsd/probing/probe-volume.c, 
line 62 guard for ISO number definition should be:

#if __FreeBSD_version < 600101

instead of 

#if __FreeBSD_version < 600000


(By my reckoning, the new ISO number definitions got added to iso.h between 600100 and 600101.)


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