ports/167533: [patch] x11-drivers/xf86-input-synaptics option for hal dependency

[David Demelier]

>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 at 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 <bsd.port.options.mk>
+
+.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 <bsd.port.mk>
--- 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: