diff options
| author | jmcneill <jmcneill@pkgsrc.org> | 2011-02-17 12:11:57 +0000 |
|---|---|---|
| committer | jmcneill <jmcneill@pkgsrc.org> | 2011-02-17 12:11:57 +0000 |
| commit | c94cc34bec778254c6be06e3930f61727b7190b2 (patch) | |
| tree | 0af17c00e7a250b25b6c82ca36866c36398a3933 | |
| parent | 4b013449b59b812395580d17a83e750eff4aa69a (diff) | |
| download | pkgsrc-c94cc34bec778254c6be06e3930f61727b7190b2.tar.gz | |
somebody renamed hw.acpi.supported_states to hw.acpi.sleep.states, so
try the 2nd if the 1st fails
| -rw-r--r-- | sysutils/hal/Makefile | 4 | ||||
| -rw-r--r-- | sysutils/hal/files/hald-netbsd/devinfo_misc.c | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/sysutils/hal/Makefile b/sysutils/hal/Makefile index 560f26b9962..5f6f10f16be 100644 --- a/sysutils/hal/Makefile +++ b/sysutils/hal/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.51 2011/01/09 01:26:56 dsainty Exp $ +# $NetBSD: Makefile,v 1.52 2011/02/17 12:11:57 jmcneill Exp $ DISTNAME= hal-0.5.14 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= sysutils MASTER_SITES= http://hal.freedesktop.org/releases/ EXTRACT_SUFX= .tar.bz2 diff --git a/sysutils/hal/files/hald-netbsd/devinfo_misc.c b/sysutils/hal/files/hald-netbsd/devinfo_misc.c index 700c642c04b..6efa98140e6 100644 --- a/sysutils/hal/files/hald-netbsd/devinfo_misc.c +++ b/sysutils/hal/files/hald-netbsd/devinfo_misc.c @@ -88,7 +88,8 @@ devinfo_computer_add(HalDevice *parent, const char *devnode, char *devfs_path, c devinfo_add_enqueue (d, devfs_path, &devinfo_computer_handler); - if (sysctlbyname ("hw.acpi.supported_states", acpi_supported_states, &len, NULL, 0) == 0) { + if (sysctlbyname ("hw.acpi.supported_states", acpi_supported_states, &len, NULL, 0) == 0 || + sysctlbyname ("hw.acpi.sleep.states", acpi_supported_states, &len, NULL, 0) == 0) { hal_device_property_set_string (d, "power_management.type", "acpi"); if (strstr (acpi_supported_states, "S3") != NULL) hal_device_property_set_bool (d, "power_management.can_suspend", TRUE); |