summaryrefslogtreecommitdiff
path: root/sysutils/hal
diff options
context:
space:
mode:
authormacallan <macallan@pkgsrc.org>2010-01-26 01:12:02 +0000
committermacallan <macallan@pkgsrc.org>2010-01-26 01:12:02 +0000
commita0fde819ce5c8772c402bfde8430f510e60cd2c0 (patch)
treed3ea87fca54cb6d29cef40193d0e0ec9d8971d3b /sysutils/hal
parent80469316aef3b0214ce9db3afdc6f13a290746a2 (diff)
downloadpkgsrc-a0fde819ce5c8772c402bfde8430f510e60cd2c0.tar.gz
make this work on non-x86
OKed long, long ago by jmcneill
Diffstat (limited to 'sysutils/hal')
-rw-r--r--sysutils/hal/distinfo3
-rw-r--r--sysutils/hal/patches/patch-ax20
2 files changed, 22 insertions, 1 deletions
diff --git a/sysutils/hal/distinfo b/sysutils/hal/distinfo
index f70b789f408..d8dfad0f16c 100644
--- a/sysutils/hal/distinfo
+++ b/sysutils/hal/distinfo
@@ -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-an) = 0307b2f0f6bb5e4a6d7bf837163e74749b7d24b2
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 --git a/sysutils/hal/patches/patch-ax b/sysutils/hal/patches/patch-ax
new file mode 100644
index 00000000000..5f4fc848e4d
--- /dev/null
+++ b/sysutils/hal/patches/patch-ax
@@ -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;
+ }