summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorswills <swills@FreeBSD.org>2016-09-23 00:21:04 +0000
committerswills <swills@FreeBSD.org>2016-09-23 00:21:04 +0000
commit28dd090ce47c6e7e6027560ce6808b6111d0d797 (patch)
treee00c6258da28243f25be0d7cdda51a3cb6434f63
parente8cb18b1e81a3fc9613de81decd5a50ea8a4aa2a (diff)
downloadFreeBSD-ports-28dd090ce47c6e7e6027560ce6808b6111d0d797.zip
FreeBSD-ports-28dd090ce47c6e7e6027560ce6808b6111d0d797.tar.gz
sysutils/hal: fix cd support
PR: 210354 Submitted by: Ivan Klymenko <fidaj@ukr.net> Approved by: gnome@ (kwm)
-rw-r--r--sysutils/hal/Makefile2
-rw-r--r--sysutils/hal/files/patch-hald_freebsd_hf-scsi.c9
2 files changed, 10 insertions, 1 deletions
diff --git a/sysutils/hal/Makefile b/sysutils/hal/Makefile
index 539fecb..6d352fe 100644
--- a/sysutils/hal/Makefile
+++ b/sysutils/hal/Makefile
@@ -4,7 +4,7 @@
PORTNAME= hal
DISTVERSION= 0.5.14
-PORTREVISION= 30
+PORTREVISION= 31
CATEGORIES= sysutils
MASTER_SITES= http://hal.freedesktop.org/releases/
diff --git a/sysutils/hal/files/patch-hald_freebsd_hf-scsi.c b/sysutils/hal/files/patch-hald_freebsd_hf-scsi.c
index 02c2878..f3c17f7 100644
--- a/sysutils/hal/files/patch-hald_freebsd_hf-scsi.c
+++ b/sysutils/hal/files/patch-hald_freebsd_hf-scsi.c
@@ -9,6 +9,15 @@
{
hal_device_property_set_string(device, "storage.bus", "usb");
hal_device_property_set_string(device, "storage.originating_device", hal_device_get_udi(parent));
+@@ -301,7 +301,7 @@
+
+ driver = hal_device_property_get_string(child, "freebsd.driver");
+ /* ATAPI devices: CD-ROM (acd), tape (ast) or floppy (afd) */
+- if (! driver || (strcmp(driver, "acd") && strcmp(driver, "ast") && strcmp(driver, "afd")))
++ if (! driver || (strcmp(driver, "acd") && strcmp(driver, "ast") && strcmp(driver, "afd") && strcmp(driver, "cd")))
+ continue;
+
+ phys_device = hal_device_property_get_string(child, "storage.originating_device");
@@ -508,6 +508,16 @@
if (! parent || ! hal_device_property_get_bool(parent, "info.ignore"))
{
OpenPOWER on IntegriCloud