diff options
author | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2008-09-29 07:30:41 +0800 |
---|---|---|
committer | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2008-09-29 07:30:41 +0800 |
commit | 5b6527dabf7f945398aa80f5f490f258f7387160 (patch) | |
tree | d6543ebb33fd3031019e8761ba06e1b95fcb2538 | |
parent | 30ea72f1f2923ab64b0644102279c7edd18f84d1 (diff) | |
download | marcuscom-ports-5b6527dabf7f945398aa80f5f490f258f7387160.tar marcuscom-ports-5b6527dabf7f945398aa80f5f490f258f7387160.tar.gz marcuscom-ports-5b6527dabf7f945398aa80f5f490f258f7387160.tar.bz2 marcuscom-ports-5b6527dabf7f945398aa80f5f490f258f7387160.tar.lz marcuscom-ports-5b6527dabf7f945398aa80f5f490f258f7387160.tar.xz marcuscom-ports-5b6527dabf7f945398aa80f5f490f258f7387160.tar.zst marcuscom-ports-5b6527dabf7f945398aa80f5f490f258f7387160.zip |
Allow X.org 7.4 to find HAL keyboards.
Submitted by: flz
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@11646 df743ca5-7f9a-e211-a948-0013205c9059
-rw-r--r-- | sysutils/hal/Makefile | 4 | ||||
-rw-r--r-- | sysutils/hal/files/patch-fdi_policy_10osvendor_10-x11-input.fdi | 14 |
2 files changed, 12 insertions, 6 deletions
diff --git a/sysutils/hal/Makefile b/sysutils/hal/Makefile index 798e508b3..8aadf6d5c 100644 --- a/sysutils/hal/Makefile +++ b/sysutils/hal/Makefile @@ -3,12 +3,12 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/sysutils/hal/Makefile,v 1.45 2008/08/21 16:04:47 mezz Exp $ +# $MCom: ports/sysutils/hal/Makefile,v 1.46 2008/08/21 21:52:59 mezz Exp $ # PORTNAME= hal DISTVERSION= 0.5.11 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= sysutils MASTER_SITES= http://hal.freedesktop.org/releases/ diff --git a/sysutils/hal/files/patch-fdi_policy_10osvendor_10-x11-input.fdi b/sysutils/hal/files/patch-fdi_policy_10osvendor_10-x11-input.fdi index f7af321c0..00781db1d 100644 --- a/sysutils/hal/files/patch-fdi_policy_10osvendor_10-x11-input.fdi +++ b/sysutils/hal/files/patch-fdi_policy_10osvendor_10-x11-input.fdi @@ -1,6 +1,6 @@ ---- fdi/policy/10osvendor/10-x11-input.fdi.orig 2008-03-27 13:42:31.000000000 -0400 -+++ fdi/policy/10osvendor/10-x11-input.fdi 2008-03-27 13:48:06.000000000 -0400 -@@ -1,15 +1,6 @@ +--- fdi/policy/10osvendor/10-x11-input.fdi.orig 2008-09-24 14:32:26.000000000 +0100 ++++ fdi/policy/10osvendor/10-x11-input.fdi 2008-09-24 14:34:22.000000000 +0100 +@@ -1,19 +1,10 @@ <?xml version="1.0" encoding="ISO-8859-1"?> <deviceinfo version="0.2"> <device> @@ -13,6 +13,12 @@ - </match> - </match> - - <match key="info.capabilities" contains="input.keys"> +- <match key="info.capabilities" contains="input.keys"> ++ <match key="info.capabilities" contains="input.keyboard"> <!-- If we're using Linux, we use evdev by default (falling back to keyboard otherwise). --> +- <merge key="input.x11_driver" type="string">keyboard</merge> ++ <merge key="input.x11_driver" type="string">kbd</merge> + <match key="/org/freedesktop/Hal/devices/computer:system.kernel.name" + string="Linux"> + <merge key="input.x11_driver" type="string">evdev</merge> |