Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 17 May 2011 00:05:17 GMT
From:      Warren Block <wblock@wonkity.com>
To:        freebsd-gnats-submit@FreeBSD.org
Subject:   ports/157097: [patch] x11-wm/xfce4-session: make HAL support optional
Message-ID:  <201105170005.p4H05HS4096957@red.freebsd.org>
Resent-Message-ID: <201105170010.p4H0A8nq087513@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         157097
>Category:       ports
>Synopsis:       [patch] x11-wm/xfce4-session: make HAL support optional
>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:   Tue May 17 00: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: Sun May 15 21:02:21 MDT 2011     root@lightning:/usr/obj/usr/src/sys/LIGHTNING  i386
>Description:
Add user option to build x11-wm/xfce4-session without HAL support.  Lightly tested, may require other updates to the port, like pkg-plist.
>How-To-Repeat:
Try to build xfce4-session without HAL.
>Fix:
Apply patch.

Patch attached with submission follows:

--- x11-wm/xfce4-session/Makefile.orig	2011-05-16 17:14:33.000000000 -0600
+++ x11-wm/xfce4-session/Makefile	2011-05-16 17:39:31.000000000 -0600
@@ -20,7 +20,6 @@
 		console-kit-daemon:${PORTSDIR}/sysutils/consolekit
 LIB_DEPENDS=	wnck-1.22:${PORTSDIR}/x11-toolkits/libwnck \
 		dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
-		hal.1:${PORTSDIR}/sysutils/hal \
 		upower-glib.1:${PORTSDIR}/sysutils/upower \
 		polkit.2:${PORTSDIR}/sysutils/policykit
 
@@ -40,7 +39,10 @@
 		--disable-gnome \
 		--disable-libgnome-keyring
 
-OPTIONS=	NLS "Enable Native Language Support" on
+OPTIONS=	NLS "Enable Native Language Support" on \
+		HAL "Enable HAL Support" on
+
+.include <bsd.port.options.mk>
 
 MAN1=		xfce4-session.1 xfce4-session-logout.1
 
@@ -55,6 +57,12 @@
 PLIST_SUB+=	NLS="@comment "
 .endif
 
+.if !defined(WITHOUT_HAL)
+LIB_DEPENDS+=	hal.1:${PORTSDIR}/sysutils/hal
+.else
+CONFIGURE_ARGS+=	--disable-hal
+.endif
+
 post-install:
 	@${SED} 's|%%LOCALBASE%%|${LOCALBASE}|g' ${PKGMESSAGE}
 


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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201105170005.p4H05HS4096957>