From nobody@FreeBSD.org  Sat Jun 11 19:06:49 2011
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 2DEA7106566C
	for <freebsd-gnats-submit@FreeBSD.org>; Sat, 11 Jun 2011 19:06:49 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22])
	by mx1.freebsd.org (Postfix) with ESMTP id 04E478FC12
	for <freebsd-gnats-submit@FreeBSD.org>; Sat, 11 Jun 2011 19:06:49 +0000 (UTC)
Received: from red.freebsd.org (localhost [127.0.0.1])
	by red.freebsd.org (8.14.4/8.14.4) with ESMTP id p5BJ6mWh067402
	for <freebsd-gnats-submit@FreeBSD.org>; Sat, 11 Jun 2011 19:06:48 GMT
	(envelope-from nobody@red.freebsd.org)
Received: (from nobody@localhost)
	by red.freebsd.org (8.14.4/8.14.4/Submit) id p5BJ6mN6067401;
	Sat, 11 Jun 2011 19:06:48 GMT
	(envelope-from nobody)
Message-Id: <201106111906.p5BJ6mN6067401@red.freebsd.org>
Date: Sat, 11 Jun 2011 19:06:48 GMT
From: Warren Block <wblock@wonkity.com>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [patch]devel/gvfs: make HAL support options more friendly
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         157774
>Category:       ports
>Synopsis:       [patch]devel/gvfs: make HAL support options more friendly
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    gnome
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Jun 11 19:10:08 UTC 2011
>Closed-Date:    Fri Jun 24 03:02:48 UTC 2011
>Last-Modified:  Fri Jun 24 03:02:48 UTC 2011
>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@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:
Responsible-Changed-From-To: freebsd-ports-bugs->gnome 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Sat Jun 11 19:10:18 UTC 2011 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=157774 
State-Changed-From-To: open->closed 
State-Changed-By: mezz 
State-Changed-When: Fri Jun 24 03:00:34 UTC 2011 
State-Changed-Why:  
I am not fan of stop in the middle of install something. The comments in 
OPTIONS are self explained about that both require HAL. I have committed 
the grammar fix in MarcusCom CVS for required -> requires. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=157774 
>Unformatted:
