svn commit: r422642 - in head/sysutils/hal: . files

[Steve Wills]

Author: swills
Date: Fri Sep 23 00:21:04 2016
New Revision: 422642
URL: https://svnweb.freebsd.org/changeset/ports/422642

Log:
  sysutils/hal: fix cd support
  
  PR:		210354
  Submitted by:	Ivan Klymenko <fidaj at ukr.net>
  Approved by:	gnome@ (kwm)

Modified:
  head/sysutils/hal/Makefile
  head/sysutils/hal/files/patch-hald_freebsd_hf-scsi.c

Modified: head/sysutils/hal/Makefile
==============================================================================
--- head/sysutils/hal/Makefile	Thu Sep 22 21:51:48 2016	(r422641)
+++ head/sysutils/hal/Makefile	Fri Sep 23 00:21:04 2016	(r422642)
@@ -4,7 +4,7 @@
 
 PORTNAME=	hal
 DISTVERSION=	0.5.14
-PORTREVISION=	30
+PORTREVISION=	31
 CATEGORIES=	sysutils
 MASTER_SITES=	http://hal.freedesktop.org/releases/
 

Modified: head/sysutils/hal/files/patch-hald_freebsd_hf-scsi.c
==============================================================================
--- head/sysutils/hal/files/patch-hald_freebsd_hf-scsi.c	Thu Sep 22 21:51:48 2016	(r422641)
+++ head/sysutils/hal/files/patch-hald_freebsd_hf-scsi.c	Fri Sep 23 00:21:04 2016	(r422642)
@@ -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"))
  		{