summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sysutils/hal/Makefile6
-rw-r--r--sysutils/hal/distinfo6
-rw-r--r--sysutils/hal/files/patch-hald_freebsd_hf-acpi.c24
-rw-r--r--sysutils/hal/files/patch-hald_freebsd_hf-ata.c94
-rw-r--r--sysutils/hal/files/patch-hald_freebsd_libprobe_hfp-cdrom.c49
5 files changed, 6 insertions, 173 deletions
diff --git a/sysutils/hal/Makefile b/sysutils/hal/Makefile
index 8ee628316..a0f7cba6d 100644
--- a/sysutils/hal/Makefile
+++ b/sysutils/hal/Makefile
@@ -3,12 +3,12 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/sysutils/hal/Makefile,v 1.20 2006/08/08 02:00:07 ahze Exp $
+# $MCom: ports/sysutils/hal/Makefile,v 1.21 2006/09/10 00:51:13 mezz Exp $
#
PORTNAME= hal
PORTVERSION= ${HALVERSION}.${SNAPVERSION}
-PORTREVISION?= 3
+PORTREVISION?= 0
CATEGORIES?= sysutils
MASTER_SITES= http://www.marcuscom.com/downloads/
@@ -38,7 +38,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
GTKDOC="false"
HALVERSION= 0.5.8
-SNAPVERSION= 20060528
+SNAPVERSION= 20060916
.if !defined(HAL_SLAVE)
USE_RC_SUBR= hald
diff --git a/sysutils/hal/distinfo b/sysutils/hal/distinfo
index be6fd4534..86cb5fd68 100644
--- a/sysutils/hal/distinfo
+++ b/sysutils/hal/distinfo
@@ -1,3 +1,3 @@
-MD5 (hal-0.5.8.20060528.tar.bz2) = 6db7671c83a48d7b2a57f52ee7fbbe28
-SHA256 (hal-0.5.8.20060528.tar.bz2) = 0a48f410b968227248502c6285b1869144164150214007512491ecfd227b3a1d
-SIZE (hal-0.5.8.20060528.tar.bz2) = 1385708
+MD5 (hal-0.5.8.20060916.tar.bz2) = 305af717e9e7160d1c05c5f61d0f5762
+SHA256 (hal-0.5.8.20060916.tar.bz2) = 115f852ec8a51a48ab0860f5664ce62c7be9228065d43adcf4ae2d55bcc626aa
+SIZE (hal-0.5.8.20060916.tar.bz2) = 1390667
diff --git a/sysutils/hal/files/patch-hald_freebsd_hf-acpi.c b/sysutils/hal/files/patch-hald_freebsd_hf-acpi.c
deleted file mode 100644
index 546402294..000000000
--- a/sysutils/hal/files/patch-hald_freebsd_hf-acpi.c
+++ /dev/null
@@ -1,24 +0,0 @@
---- hald/freebsd/hf-acpi.c 4 May 2006 23:14:44 -0000 1.50
-+++ hald/freebsd/hf-acpi.c 2 Jul 2006 04:38:34 -0000
-@@ -114,13 +114,21 @@
- return;
- }
-
-+#ifdef ACPIIO_BATT_GET_BIF
- if (ioctl(fd, ACPIIO_BATT_GET_BIF, &battif) == -1)
-+#else
-+ if (ioctl(fd, ACPIIO_CMBAT_GET_BIF, &battif) == -1)
-+#endif
- {
- HAL_WARNING(("ioctl ACPIIO_BATT_GET_BIF failed for battery %d: %s",
- battif.unit, g_strerror(errno)));
- goto end;
- }
-+#ifdef ACPIIO_BATT_GET_BST
- if (ioctl(fd, ACPIIO_BATT_GET_BST, &battst) == -1)
-+#else
-+ if (ioctl(fd, ACPIIO_CMBAT_GET_BST, &battst) == -1)
-+#endif
- {
- HAL_WARNING(("ioctl ACPIIO_BATT_GET_BST failed for battery %d: %s",
- battst.unit, g_strerror(errno)));
diff --git a/sysutils/hal/files/patch-hald_freebsd_hf-ata.c b/sysutils/hal/files/patch-hald_freebsd_hf-ata.c
deleted file mode 100644
index eabb4f1b0..000000000
--- a/sysutils/hal/files/patch-hald_freebsd_hf-ata.c
+++ /dev/null
@@ -1,94 +0,0 @@
---- hald/freebsd/hf-ata.c 7 May 2006 00:27:55 -0000 1.35
-+++ hald/freebsd/hf-ata.c 2 Jul 2006 05:15:18 -0000
-@@ -87,7 +87,11 @@
- static HalDevice *
- hf_ata_block_device_new (HalDevice *parent,
- int ms,
-+#ifdef IOCATADEVICES
- const struct ata_ioc_devices *devices)
-+#else
-+ const struct ata_cmd *devices)
-+#endif
- {
- HalDevice *device;
- const struct ata_params *params;
-@@ -96,14 +100,26 @@
- g_return_val_if_fail(HAL_IS_DEVICE(parent), NULL);
- g_return_val_if_fail(devices != NULL, NULL);
-
-+#ifdef IOCATADEVICES
- params = &devices->params[ms];
-+#else
-+ params = &devices->u.param.params[ms];
-+#endif
- vendor = hf_ata_get_vendor(params->model);
-
- device = hf_device_new(parent);
-
-+#ifdef IOCATADEVICES
- hf_devtree_device_set_name(device, devices->name[ms]);
-+#else
-+ hf_devtree_device_set_name(device, devices->u.param.name[ms]);
-+#endif
-
-+#ifdef IOCATADEVICES
- hf_block_device_enable(device, devices->name[ms]);
-+#else
-+ hf_block_device_enable(device, devices->u.param.name[ms]);
-+#endif
- hf_storage_device_enable(device);
-
- hal_device_property_set_string(device, "info.product", params->model);
-@@ -148,20 +164,40 @@
- static void
- hf_ata_probe_devices (HalDevice *ide_host)
- {
-+#ifdef IOCATADEVICES
- struct ata_ioc_devices devices;
-+#else
-+ struct ata_cmd devices;
-+#endif
- int i;
-
- g_return_if_fail(HAL_IS_DEVICE(ide_host));
-
-+#ifdef IOCATADEVICES
- devices.channel = hal_device_property_get_int(ide_host, "ide_host.number");
- if (ioctl(hf_ata_fd, IOCATADEVICES, &devices) < 0)
- {
- HAL_WARNING(("unable to probe devices of ATA channel %i: %s", devices.channel, g_strerror(errno)));
- return;
- }
-+#else
-+ memset(&devices, 0, sizeof(devices));
-+ devices.cmd = ATAGPARM;
-+ devices.device = -1;
-+ devices.channel = hal_device_property_get_int(ide_host, "ide_host.number");
-+ if (ioctl(hf_ata_fd, IOCATA, &devices) < 0)
-+ {
-+ HAL_WARNING(("unable to probe devices of ATA channel %i: %s", devices.channel, g_strerror(errno)));
-+ return;
-+ }
-+#endif
-
- for (i = 0; i < 2; i++)
-+#ifdef IOCATADEVICES
- if (*devices.name[i])
-+#else
-+ if (*devices.u.param.name[i])
-+#endif
- {
- HalDevice *ide_device;
-
-@@ -176,7 +212,11 @@
- }
-
- if (! hal_device_property_get_bool(ide_device, "info.ignore")
-+#ifdef IOCATADEVICES
- && ! hf_devtree_find_from_name(hald_get_gdl(), devices.name[i]))
-+#else
-+ && ! hf_devtree_find_from_name(hald_get_gdl(), devices.u.param.name[i]))
-+#endif
- {
- HalDevice *block_device;
-
diff --git a/sysutils/hal/files/patch-hald_freebsd_libprobe_hfp-cdrom.c b/sysutils/hal/files/patch-hald_freebsd_libprobe_hfp-cdrom.c
deleted file mode 100644
index 5fad5f5b4..000000000
--- a/sysutils/hal/files/patch-hald_freebsd_libprobe_hfp-cdrom.c
+++ /dev/null
@@ -1,49 +0,0 @@
---- hald/freebsd/libprobe/hfp-cdrom.c 7 May 2006 00:27:55 -0000 1.4
-+++ hald/freebsd/libprobe/hfp-cdrom.c 2 Jul 2006 05:08:24 -0000 1.6
-@@ -112,6 +112,7 @@
-
- if (cdrom->fd >= 0) /* ATAPI transport */
- {
-+#ifdef IOCATAREQUEST
- struct ata_ioc_request req;
-
- memset(&req, 0, sizeof(req));
-@@ -140,6 +141,38 @@
- *err = hfp_strdup_printf("ATAPI error %i", req.error);
- return FALSE;
- }
-+#else
-+ struct ata_cmd iocmd;
-+
-+ memset(&iocmd, 0, sizeof(iocmd));
-+ iocmd.u.request.flags = ATA_CMD_ATAPI;
-+ iocmd.u.request.timeout = timeout;
-+ iocmd.cmd = ATAREQUEST;
-+ iocmd.device = -1;
-+ memcpy(iocmd.u.request.u.atapi.ccb, ccb, 16);
-+
-+ if (data)
-+ {
-+ static int atapi_direction[] = { 0, ATA_CMD_READ, ATA_CMD_WRITE };
-+
-+ iocmd.u.request.flags |= atapi_direction[direction];
-+ iocmd.u.request.data = data;
-+ iocmd.u.request.count = len;
-+ }
-+
-+ if (ioctl(cdrom->fd, IOCATA, &iocmd) < 0)
-+ {
-+ if (err)
-+ *err = hfp_strdup_printf("IOCATA failure: %s", strerror(errno));
-+ return FALSE;
-+ }
-+ if (iocmd.u.request.error != 0)
-+ {
-+ if (err)
-+ *err = hfp_strdup_printf("ATAPI error %i", iocmd.u.request.error);
-+ return FALSE;
-+ }
-+#endif
- }
- else /* SCSI transport */
- {
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-12 23:13:37 +0800