From owner-freebsd-ports-bugs@FreeBSD.ORG Wed May 2 20:10:10 2012 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id CAEBB1065673 for ; Wed, 2 May 2012 20:10:10 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id A315B8FC1A for ; Wed, 2 May 2012 20:10:10 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id q42KAANH019389 for ; Wed, 2 May 2012 20:10:10 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q42KAAHL019388; Wed, 2 May 2012 20:10:10 GMT (envelope-from gnats) Resent-Date: Wed, 2 May 2012 20:10:10 GMT Resent-Message-Id: <201205022010.q42KAAHL019388@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, David Demelier Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id ABA8D106566C for ; Wed, 2 May 2012 20:07:37 +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 7CF4D8FC08 for ; Wed, 2 May 2012 20:07:37 +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 q42K7bAI013597 for ; Wed, 2 May 2012 20:07:37 GMT (envelope-from nobody@red.freebsd.org) Received: (from nobody@localhost) by red.freebsd.org (8.14.4/8.14.4/Submit) id q42K7bcO013596; Wed, 2 May 2012 20:07:37 GMT (envelope-from nobody) Message-Id: <201205022007.q42K7bcO013596@red.freebsd.org> Date: Wed, 2 May 2012 20:07:37 GMT From: David Demelier To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: ports/167533: [patch] x11-drivers/xf86-input-synaptics option for hal dependency X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 May 2012 20:10:10 -0000 >Number: 167533 >Category: ports >Synopsis: [patch] x11-drivers/xf86-input-synaptics option for hal dependency >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Wed May 02 20:10:10 UTC 2012 >Closed-Date: >Last-Modified: >Originator: David Demelier >Release: 9.0-RELEASE >Organization: >Environment: FreeBSD Melon.malikania.fr 9.0-RELEASE FreeBSD 9.0-RELEASE #0: Tue May 1 09:33:50 CEST 2012 root@Melon:/usr/obj/usr/src/sys/Melon amd64 >Description: The X.org synaptics driver may works very well without the hal distribution (used it for 2 years without it) so I just added an option to enable/disable this dependency. >How-To-Repeat: >Fix: --- xf86-input-synaptics.diff begins here --- --- Makefile.orig 2012-05-01 14:37:14.000000000 +0200 +++ Makefile 2012-05-02 20:25:48.000000000 +0200 @@ -14,7 +14,13 @@ CONFLICTS= synaptics-[0-9]* -LIB_DEPENDS+= hal.1:${PORTSDIR}/sysutils/hal +OPTIONS= HAL "Adds support for HAL" Off + +.include + +.if defined(WITH_HAL) +LIB_DEPENDS+= hal.1:${PORTSDIR}/sysutils/hal +.endif USE_GNOME= gnomehack USE_XORG= x11 xextproto videoproto @@ -25,14 +31,22 @@ MAN4= synaptics.4x post-install: +.if defined(WITH_HAL) ${MKDIR} ${PREFIX}/share/hal/fdi/policy/10osvendor ${INSTALL_DATA} ${WRKSRC}/conf/11-x11-synaptics.fdi \ ${PREFIX}/share/hal/fdi/policy/10osvendor/ +.endif .if defined(WITH_NEW_XORG) -PLIST_SUB+= NEW="" OLD="@comment " +PLIST_SUB+= NEW="" +.else +PLIST_SUB+= NEW="@comment " +.endif + +.if defined(WITH_HAL) +PLIST_SUB+= HAL"" .else -PLIST_SUB+= NEW="@comment " OLD="" +PLIST_SUB+= HAL="@comment " .endif .include --- pkg-plist.orig 2012-05-01 14:37:06.000000000 +0200 +++ pkg-plist 2012-05-02 20:23:26.000000000 +0200 @@ -6,8 +6,7 @@ lib/xorg/modules/input/synaptics_drv.so libdata/pkgconfig/xorg-synaptics.pc %%NEW%%share/X11/xorg.conf.d/50-synaptics.conf -share/hal/fdi/policy/10osvendor/11-x11-synaptics.fdi -%%OLD%%share/hal/fdi/policy/20thirdparty/11-x11-synaptics.fdi +%%HAL%%share/hal/fdi/policy/10osvendor/11-x11-synaptics.fdi @dirrmtry lib/xorg/modules/input @dirrmtry lib/xorg/modules @dirrmtry lib/xorg --- xf86-input-synaptics.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: