ports/157774: [patch]devel/gvfs: make HAL support options more friendly

[Warren Block]

>Number:         157774
>Category:       ports
>Synopsis:       [patch]devel/gvfs: make HAL support options more friendly
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Jun 11 19:10:08 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator:     Warren Block
>Release:        8-stable
>Organization:
>Environment:
FreeBSD lightning 8.2-STABLE FreeBSD 8.2-STABLE #0: Thu Jun  9 08:33:24 MDT 2011     root at lightning:/usr/obj/usr/src/sys/LIGHTNING  i386
>Description:
CDDA and GPHOTO2 options in devel/gvfs require HAL.  If the HAL option is disabled, these options will also be disabled, even if the user has enabled them on the options screen.  Fix that by stopping and warning the user.

Also change (required HAL) to (requires HAL) in the display of those options, and move the HAL option before them.
>How-To-Repeat:
cd /usr/ports/devel/gvfs
make config
disable HAL, enable GPHOTO2 and CDDA
build and CDDA and GPHOTO2 options will be silently disabled.
>Fix:
Apply patch.

Patch attached with submission follows:

--- devel/gvfs/Makefile.orig	2011-06-11 12:33:47.000000000 -0600
+++ devel/gvfs/Makefile	2011-06-11 12:58:02.000000000 -0600
@@ -32,9 +32,9 @@
 OPTIONS=	FUSE "Enable fuse" off \
 		AVAHI "Enable AVAHI" on \
 		SAMBA "Enable Samba" on \
-		GPHOTO2 "Enable Gphoto 2 camera support (required HAL)" on \
-		CDDA "Enable CDDA (required HAL)" on \
-		HAL "Enable HAL" on
+		HAL "Enable HAL" on \
+		GPHOTO2 "Enable Gphoto 2 camera support (requires HAL)" on \
+		CDDA "Enable CDDA (requires HAL)" on
 
 .include <bsd.port.pre.mk>
 
@@ -55,7 +55,10 @@
 PLIST_SUB+=	SMB="@comment "
 .endif
 
-.if defined(WITH_CDDA) && !defined(WITHOUT_HAL)
+.if defined(WITH_CDDA)
+.if defined(WITHOUT_HAL)
+IGNORE= CDDA requires HAL, but WITHOUT_HAL is set
+.endif
 LIB_DEPENDS+=	cdio_paranoia.0:${PORTSDIR}/sysutils/libcdio
 PLIST_SUB+=	CDDA=""
 .else
@@ -63,7 +66,10 @@
 PLIST_SUB+=	CDDA="@comment "
 .endif
 
-.if defined(WITH_GPHOTO2) && !defined(WITHOUT_HAL)
+.if defined(WITH_GPHOTO2)
+.if defined(WITHOUT_HAL)
+IGNORE= GPHOTO2 requires HAL, but WITHOUT_HAL is set
+.endif
 LIB_DEPENDS+=	gphoto2.2:${PORTSDIR}/graphics/libgphoto2
 PLIST_SUB+=	GPHOTO2=""
 .else


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