[pkgsrc/trunk]: pkgsrc/sysutils/hal make this work on non-x86

[macallan <macallan%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/1fd365e855dd
branches:  trunk
changeset: 570149:1fd365e855dd
user:      macallan <macallan%pkgsrc.org@localhost>
date:      Tue Jan 26 01:12:02 2010 +0000

description:
make this work on non-x86
OKed long, long ago by jmcneill

diffstat:

 sysutils/hal/distinfo         |   3 ++-
 sysutils/hal/patches/patch-ax |  20 ++++++++++++++++++++
 2 files changed, 22 insertions(+), 1 deletions(-)

diffs (41 lines):

diff -r 980ba6a537b7 -r 1fd365e855dd sysutils/hal/distinfo
--- a/sysutils/hal/distinfo     Tue Jan 26 01:05:04 2010 +0000
+++ b/sysutils/hal/distinfo     Tue Jan 26 01:12:02 2010 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.15 2009/12/27 16:17:33 abs Exp $
+$NetBSD: distinfo,v 1.16 2010/01/26 01:12:02 macallan Exp $
 
 SHA1 (hal-0.5.11.tar.bz2) = 1ddb7895d2ddc2464b553ad11f7ba38860478ae9
 RMD160 (hal-0.5.11.tar.bz2) = 741cfe82f0bc2d67106b24cfe526a754ab36e45f
@@ -20,6 +20,7 @@
 SHA1 (patch-ao) = 9099fa4783921a0389b874b8f6d3f7b890810b34
 SHA1 (patch-ap) = 4846d30f51239cca5ea895c700d7a7b15efd948e
 SHA1 (patch-aq) = 7d0b224b4b1e6052983a6512217eee4f530e0720
+SHA1 (patch-ax) = 278cbf10dd288f7a4aeedd7545b325c1a82715db
 SHA1 (patch-na) = eff415fbf9b591f4be7b7a45ee8996e20eaf28ea
 SHA1 (patch-nb) = 1693b7a2faa5bee20a594f0b60b8ff6caea0efdc
 SHA1 (patch-nc) = 32453e49734902749ce24eb4364fc7f531986227
diff -r 980ba6a537b7 -r 1fd365e855dd sysutils/hal/patches/patch-ax
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sysutils/hal/patches/patch-ax     Tue Jan 26 01:12:02 2010 +0000
@@ -0,0 +1,20 @@
+$NetBSD: patch-ax,v 1.1 2010/01/26 01:12:02 macallan Exp $
+
+--- hald/device_info.c.orig    2010-01-24 19:45:40.000000000 -0500
++++ hald/device_info.c
+@@ -1083,8 +1083,15 @@ rules_match_and_merge_device (void *fdi_
+                               /*HAL_INFO(("no match, skip to rule (%llx)", rule->jump_position));*/
+                               rule = di_jump(rule);
+ 
++#if 0
++                              /*
++                               * XXX
++                               * this fires when a node has a single child
++                               * which happens on some non-x86 machines
++                               */
+                               if(rule == NULL)
+                                       DIE(("Rule is NULL on jump"));
++#endif
+ 
+                               continue;
+                       }