From 340b57f8beb786be8990652b17d2e45f182346e6 Mon Sep 17 00:00:00 2001
From: Florent Thoumie <flz@FreeBSD.org>
Date: Fri, 23 Jan 2009 16:28:36 +0000
Subject: - Update X.org ports to 7.4+ (few ports are more recent than the
 katamari). - Bump PORTREVISION for all ports depending on libglut since the
 shlib version number went from 4 to 3. - Bump PORTREVISION for all ports
 depending on libXaw as libXaw.so.8 isn't installed anymore. - Couple of ports
 fixes (mostly missing xorg components added to USE_XORG).

---
 sysutils/hal/Makefile                                      |  2 +-
 .../hal/files/patch-fdi_policy_10osvendor_10-x11-input.fdi | 14 ++++++++++----
 2 files changed, 11 insertions(+), 5 deletions(-)

(limited to 'sysutils/hal')

diff --git a/sysutils/hal/Makefile b/sysutils/hal/Makefile
index 1acc47eee67a..d3372ff0fe02 100644
--- a/sysutils/hal/Makefile
+++ b/sysutils/hal/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	hal
 DISTVERSION=	0.5.11
-PORTREVISION=	11
+PORTREVISION=	12
 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 f7af321c0943..00781db1dd6d 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>
-- 
cgit v1.2.3