[pkgsrc/trunk]: pkgsrc/sysutils/hal Apply some bug fixes for the NetBSD hald ...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/a9e700d6ca71
branches:  trunk
changeset: 645236:a9e700d6ca71
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Sun Jan 25 18:46:09 2015 +0000

description:
Apply some bug fixes for the NetBSD hald from sergio lenzi in PR 49604.
Bump PKGREVISION.

diffstat:

 sysutils/hal/Makefile                         |  4 ++--
 sysutils/hal/files/hald-netbsd/devinfo_mass.c |  4 ++--
 sysutils/hal/files/hald-netbsd/devinfo_misc.c |  4 ++--
 sysutils/hal/files/hald-netbsd/drvctl.c       |  4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diffs (70 lines):

diff -r b396feefa6cb -r a9e700d6ca71 sysutils/hal/Makefile
--- a/sysutils/hal/Makefile     Sun Jan 25 18:38:00 2015 +0000
+++ b/sysutils/hal/Makefile     Sun Jan 25 18:46:09 2015 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.70 2014/08/28 10:58:18 jperkin Exp $
+# $NetBSD: Makefile,v 1.71 2015/01/25 18:46:09 wiz Exp $
 
 DISTNAME=              hal-0.5.14
-PKGREVISION=           13
+PKGREVISION=           14
 CATEGORIES=            sysutils
 MASTER_SITES=          http://hal.freedesktop.org/releases/
 EXTRACT_SUFX=          .tar.bz2
diff -r b396feefa6cb -r a9e700d6ca71 sysutils/hal/files/hald-netbsd/devinfo_mass.c
--- a/sysutils/hal/files/hald-netbsd/devinfo_mass.c     Sun Jan 25 18:38:00 2015 +0000
+++ b/sysutils/hal/files/hald-netbsd/devinfo_mass.c     Sun Jan 25 18:46:09 2015 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: devinfo_mass.c,v 1.4 2010/12/26 20:59:31 markd Exp $ */
+/* $NetBSD: devinfo_mass.c,v 1.5 2015/01/25 18:46:09 wiz Exp $ */
 
 /*-
  * Copyright (c) 2008 Jared D. McNeill <jmcneill%invisible.ca@localhost>
@@ -230,7 +230,7 @@
        }
        if (gparent_devnode && strstr (gparent_devnode, "umass") == gparent_devnode)
                hal_device_property_set_string (d, "storage.bus", "usb");
-       else if (strstr (parent_devnode, "atabus") == parent_devnode)
+       else if (parent_devnode && strstr (parent_devnode, "atabus") == parent_devnode)
                hal_device_property_set_string (d, "storage.bus", "ide");
        else
                hal_device_property_set_string (d, "storage.bus", "scsi");
diff -r b396feefa6cb -r a9e700d6ca71 sysutils/hal/files/hald-netbsd/devinfo_misc.c
--- a/sysutils/hal/files/hald-netbsd/devinfo_misc.c     Sun Jan 25 18:38:00 2015 +0000
+++ b/sysutils/hal/files/hald-netbsd/devinfo_misc.c     Sun Jan 25 18:46:09 2015 +0000
@@ -137,12 +137,12 @@
 
 /* acpiacad(4) */
        if (strncmp (devnode, "acpiacad", 8) == 0) {
-               HAL_INFO (("%s: applying acpiacad quirks"));
+               HAL_INFO (("%s: applying acpiacad quirks",devnode));
                hal_device_add_capability (d, "ac_adapter");
 
 /* acpibat(4) */
        } else if (strncmp (devnode, "acpibat", 7) == 0) {
-               HAL_INFO (("%s: applying acpibat quirks"));
+               HAL_INFO (("%s: applying acpibat quirks",devnode));
                hal_device_add_capability (d, "battery");
                hal_device_property_set_string (d, "battery.type", "primary");
        }
diff -r b396feefa6cb -r a9e700d6ca71 sysutils/hal/files/hald-netbsd/drvctl.c
--- a/sysutils/hal/files/hald-netbsd/drvctl.c   Sun Jan 25 18:38:00 2015 +0000
+++ b/sysutils/hal/files/hald-netbsd/drvctl.c   Sun Jan 25 18:46:09 2015 +0000
@@ -123,7 +123,7 @@
                parent = hal_device_store_match_key_value_string (
                    hald_get_gdl(), "netbsd.device", pdevnode);
                if (parent == NULL)
-                       HAL_INFO (("dev_add: name=%s but netbsd.device=%s not found", pdevnode));
+                       HAL_INFO (("dev_add: name=%s but netbsd.device=%s not found",name, pdevnode));
        }
 
        d = devinfo_add_node (parent, name);
@@ -245,7 +245,7 @@
        if (laa.l_childname)
                free(laa.l_childname);
 
-       /* HAL_INFO (("%s: couldn't find device with child %s", curnode, devnode)); */
+       HAL_INFO (("%s: couldn't find device with child %s", curnode, devnode));
        return FALSE;
 }