ports/127399: [UPDATE] security/gnome-keyring: add option to disable HAL

[aZ]

>Number:         127399
>Category:       ports
>Synopsis:       [UPDATE] security/gnome-keyring: add option to disable HAL
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Sep 15 14:10:00 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator:     aZ
>Release:        7.1-PRERELEASE
>Organization:
>Environment:
FreeBSD localhost 7.1-PRERELEASE FreeBSD 7.1-PRERELEASE #2: Sun Sep 14 23:05:22 EEST 2008     az at localhost:/usr/obj/usr/src/sys/localhost  i386
>Description:
[UPDATE] security/gnome-keyring: add option to disable HAL
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

--- Makefile-old	2008-07-27 23:11:10.000000000 +0300
+++ Makefile-new	2008-09-15 16:48:34.000000000 +0300
@@ -2,13 +2,13 @@
 # Date Created:			08 December 2003
 # Whom:				Joe Marcus Clarke <marcus at FreeBSD.org>
 #
-# $FreeBSD: ports/security/gnome-keyring/Makefile,v 1.36 2008/07/27 20:11:10 marcus Exp $
-#   $MCom: ports/security/gnome-keyring/Makefile,v 1.59 2008/03/09 18:30:40 mezz Exp $
+# $FreeBSD: $
+#   $MCom: $
 #
 
 PORTNAME=	gnome-keyring
 PORTVERSION=	2.22.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -16,8 +16,7 @@
 MAINTAINER=	gnome at FreeBSD.org
 COMMENT=	A program that keeps passwords and other secrets
 
-LIB_DEPENDS=	hal.1:${PORTSDIR}/sysutils/hal \
-		tasn1.3:${PORTSDIR}/security/libtasn1 \
+LIB_DEPENDS=	tasn1.3:${PORTSDIR}/security/libtasn1 \
     		gcrypt.15:${PORTSDIR}/security/libgcrypt
 
 USE_BZIP2=	yes
@@ -31,4 +30,14 @@
 		LDFLAGS="-L${LOCALBASE}/lib"
 GCONF_SCHEMAS=	gnome-keyring.schemas
 
-.include <bsd.port.mk>
+OPTIONS=	HAL	"Use HAL for keys on removable drives"	on
+
+.include <bsd.port.pre.mk>
+
+.ifdef WITHOUT_HAL
+CONFIGURE_ARGS+=	--disable-hal
+.else
+LIB_DEPENDS+=	hal.1:${PORTSDIR}/sysutils/hal
+.endif
+
+.include <bsd.port.post.mk>


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