[pkgsrc/trunk]: pkgsrc/sysutils/hal * Make it work on DragonFly with FreeBSD ...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/71a8af9e8762
branches:  trunk
changeset: 550629:71a8af9e8762
user:      hasso <hasso%pkgsrc.org@localhost>
date:      Mon Nov 24 21:13:19 2008 +0000

description:
* Make it work on DragonFly with FreeBSD backend. It's largely untested,
  but certainly already usable.
* Fix paths to [pci|usb].ids files.
* Bump PKGREVISION.

diffstat:

 sysutils/hal/Makefile         |  10 ++++++----
 sysutils/hal/PLIST.FreeBSD    |  15 +++++++++++++++
 sysutils/hal/distinfo         |   8 +++++++-
 sysutils/hal/patches/patch-aj |  14 ++++++++++++++
 sysutils/hal/patches/patch-ak |  43 +++++++++++++++++++++++++++++++++++++++++++
 sysutils/hal/patches/patch-al |  18 ++++++++++++++++++
 sysutils/hal/patches/patch-am |  16 ++++++++++++++++
 sysutils/hal/patches/patch-an |  16 ++++++++++++++++
 sysutils/hal/patches/patch-ao |  16 ++++++++++++++++
 9 files changed, 151 insertions(+), 5 deletions(-)

diffs (219 lines):

diff -r 1f27d4c7085e -r 71a8af9e8762 sysutils/hal/Makefile
--- a/sysutils/hal/Makefile     Mon Nov 24 21:06:15 2008 +0000
+++ b/sysutils/hal/Makefile     Mon Nov 24 21:13:19 2008 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2008/11/24 01:23:12 jmcneill Exp $
+# $NetBSD: Makefile,v 1.4 2008/11/24 21:13:19 hasso Exp $
 #
 
 DISTNAME=              hal-0.5.11
-PKGREVISION=           2
+PKGREVISION=           3
 CATEGORIES=            sysutils
 MASTER_SITES=          http://hal.freedesktop.org/releases/
 EXTRACT_SUFX=          .tar.bz2
@@ -30,8 +30,8 @@
 CONF_FILES=            ${EGDIR}/hal.conf ${PREFIX}/etc/dbus-1/system.d/hal.conf
 
 CONFIGURE_ARGS+=       --localstatedir=${VARBASE}
-CONFIGURE_ARGS+=       --with-pci-ids=${PREFIX}/share/pciids/pci.ids
-CONFIGURE_ARGS+=       --with-usb-ids=${PREFIX}/share/usbids/usb.ids
+CONFIGURE_ARGS+=       --with-pci-ids=${PREFIX}/share/pciids
+CONFIGURE_ARGS+=       --with-usb-ids=${PREFIX}/share/usbids
 CONFIGURE_ARGS+=       --with-hal-user=${HAL_USER}
 CONFIGURE_ARGS+=       --with-hal-group=${HAL_GROUP}
 
@@ -39,6 +39,8 @@
 
 .if ${OPSYS} == "FreeBSD" || ${OPSYS} == "DragonFly"
 CONFIGURE_ARGS+=       --with-eject=/usr/sbin/cdcontrol
+CONFIGURE_ARGS+=       --with-backend=freebsd
+PLIST_SRC=             PLIST.FreeBSD PLIST
 .endif
 
 REPLACE_INTERPRETER+=  bash
diff -r 1f27d4c7085e -r 71a8af9e8762 sysutils/hal/PLIST.FreeBSD
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sysutils/hal/PLIST.FreeBSD        Mon Nov 24 21:13:19 2008 +0000
@@ -0,0 +1,15 @@
+@comment $NetBSD: PLIST.FreeBSD,v 1.1 2008/11/24 21:13:19 hasso Exp $
+lib/hal/scripts/freebsd/hal-system-lcd-get-brightness-freebsd
+lib/hal/scripts/freebsd/hal-system-lcd-set-brightness-freebsd
+lib/hal/scripts/freebsd/hal-system-power-reboot-freebsd
+lib/hal/scripts/freebsd/hal-system-power-set-power-save-freebsd
+lib/hal/scripts/freebsd/hal-system-power-shutdown-freebsd
+lib/hal/scripts/freebsd/hal-system-power-suspend-freebsd
+lib/libhald_freebsd_probe.la
+libexec/hald-addon-storage
+libexec/hald-probe-hiddev
+libexec/hald-probe-scsi
+libexec/hald-probe-smbios
+libexec/hald-probe-storage
+libexec/hald-probe-volume
+@dirrm lib/hal/scripts/freebsd
diff -r 1f27d4c7085e -r 71a8af9e8762 sysutils/hal/distinfo
--- a/sysutils/hal/distinfo     Mon Nov 24 21:06:15 2008 +0000
+++ b/sysutils/hal/distinfo     Mon Nov 24 21:13:19 2008 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2008/11/24 01:48:31 jmcneill Exp $
+$NetBSD: distinfo,v 1.4 2008/11/24 21:13:19 hasso Exp $
 
 SHA1 (hal-0.5.11.tar.bz2) = 1ddb7895d2ddc2464b553ad11f7ba38860478ae9
 RMD160 (hal-0.5.11.tar.bz2) = 741cfe82f0bc2d67106b24cfe526a754ab36e45f
@@ -12,3 +12,9 @@
 SHA1 (patch-ag) = 39b79fbcd99f9172afd492772c120161bb63a378
 SHA1 (patch-ah) = 6d801a2c30cee6199b25acf46d7e9866f6004182
 SHA1 (patch-ai) = 2e11ee437e778f540f401335b4f022fe6e8e8fee
+SHA1 (patch-aj) = 533289d4e1328a89ad9e4ce6c1b28e32139b70db
+SHA1 (patch-ak) = 2a83d09cad7b33c0370c6318f095e878f1cd7e96
+SHA1 (patch-al) = 8279947ecb720f3e99777dae8c20d4afe0e19039
+SHA1 (patch-am) = 6a4940006e583300d9a983511bdcb05268f74b1a
+SHA1 (patch-an) = 0307b2f0f6bb5e4a6d7bf837163e74749b7d24b2
+SHA1 (patch-ao) = 9099fa4783921a0389b874b8f6d3f7b890810b34
diff -r 1f27d4c7085e -r 71a8af9e8762 sysutils/hal/patches/patch-aj
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sysutils/hal/patches/patch-aj     Mon Nov 24 21:13:19 2008 +0000
@@ -0,0 +1,14 @@
+$NetBSD: patch-aj,v 1.1 2008/11/24 21:13:19 hasso Exp $
+
+--- hald/freebsd/hf-storage.c.orig     2008-11-24 14:16:45 +0200
++++ hald/freebsd/hf-storage.c  2008-11-24 07:16:09 +0200
+@@ -32,6 +32,9 @@
+ #include <string.h>
+ #include <sys/types.h>
+ #include <sys/disklabel.h>
++#ifdef __DragonFly__
++#include <sys/dtype.h>
++#endif
+ 
+ #include "../logger.h"
+ #include "../osspec.h"
diff -r 1f27d4c7085e -r 71a8af9e8762 sysutils/hal/patches/patch-ak
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sysutils/hal/patches/patch-ak     Mon Nov 24 21:13:19 2008 +0000
@@ -0,0 +1,43 @@
+$NetBSD: patch-ak,v 1.1 2008/11/24 21:13:19 hasso Exp $
+
+--- hald/freebsd/probing/probe-volume.c.orig   2008-05-08 02:24:07 +0300
++++ hald/freebsd/probing/probe-volume.c        2008-11-24 21:30:08 +0200
+@@ -33,7 +33,9 @@
+ #include <fcntl.h>
+ #include <unistd.h>
+ #include <sys/ioctl.h>
++#ifndef __DragonFly__
+ #include <sys/disk.h>
++#endif
+ #include <sys/cdio.h>
+ #include <sys/param.h>
+ #include <sys/types.h>
+@@ -366,6 +368,7 @@ main (int argc, char **argv)
+       is_blank = (! has_audio && ! has_data);
+     }
+ 
++#ifndef __DragonFly__
+   ioctl(fd, DIOCGMEDIASIZE, &media_size);
+ 
+   /*
+@@ -391,6 +394,7 @@ main (int argc, char **argv)
+           }
+       }
+     }
++#endif
+ 
+   if (! has_children && ! is_swap && ! has_audio && ! has_data && ! is_blank)
+     goto end;
+@@ -582,10 +586,12 @@ main (int argc, char **argv)
+ 
+   libhal_device_set_property_string(hfp_ctx, hfp_udi, "volume.uuid", vid ? vid->uuid : "", &hfp_error);
+ 
++#ifndef __DragonFly__
+   ioctl(fd, DIOCGSECTORSIZE, &sector_size);
+ 
+   if (sector_size != 0)
+     libhal_device_set_property_uint64(hfp_ctx, hfp_udi, "volume.block_size", sector_size, &hfp_error);
++#endif
+   if (media_size != 0)
+     libhal_device_set_property_uint64(hfp_ctx, hfp_udi, "volume.size", media_size, &hfp_error);
+   if (sector_size != 0 && media_size != 0)
diff -r 1f27d4c7085e -r 71a8af9e8762 sysutils/hal/patches/patch-al
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sysutils/hal/patches/patch-al     Mon Nov 24 21:13:19 2008 +0000
@@ -0,0 +1,18 @@
+$NetBSD: patch-al,v 1.1 2008/11/24 21:13:19 hasso Exp $
+
+--- hald/freebsd/probing/probe-hiddev.c.orig   2008-11-24 14:22:45 +0200
++++ hald/freebsd/probing/probe-hiddev.c        2008-11-24 14:21:24 +0200
+@@ -29,8 +29,13 @@
+ #include <stdlib.h>
+ #include <fcntl.h>
+ #include <sys/ioctl.h>
++#ifdef __DragonFly__
++#include <bus/usb/usb.h>
++#include <bus/usb/usbhid.h>
++#else
+ #include <dev/usb/usb.h>
+ #include <dev/usb/usbhid.h>
++#endif
+ #include <usbhid.h>
+ 
+ #include "../libprobe/hfp.h"
diff -r 1f27d4c7085e -r 71a8af9e8762 sysutils/hal/patches/patch-am
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sysutils/hal/patches/patch-am     Mon Nov 24 21:13:19 2008 +0000
@@ -0,0 +1,16 @@
+$NetBSD: patch-am,v 1.1 2008/11/24 21:13:19 hasso Exp $
+
+--- hald/freebsd/libprobe/hfp-cdrom.c.orig     2008-11-24 14:23:52 +0200
++++ hald/freebsd/libprobe/hfp-cdrom.c  2008-11-23 19:36:53 +0200
+@@ -32,7 +32,11 @@
+ #include <unistd.h>
+ #include <sys/ioctl.h>
+ #include <sys/types.h>
++#ifdef __DragonFly__
++#include <sys/nata.h>
++#else
+ #include <sys/ata.h>
++#endif
+ #include <stdio.h>
+ #include <camlib.h>
+ #include <cam/scsi/scsi_message.h>
diff -r 1f27d4c7085e -r 71a8af9e8762 sysutils/hal/patches/patch-an
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sysutils/hal/patches/patch-an     Mon Nov 24 21:13:19 2008 +0000
@@ -0,0 +1,16 @@
+$NetBSD: patch-an,v 1.1 2008/11/24 21:13:19 hasso Exp $
+
+--- hald/freebsd/hf-ata.c.orig 2008-11-24 21:32:34 +0200
++++ hald/freebsd/hf-ata.c      2008-11-24 21:33:08 +0200
+@@ -30,7 +30,11 @@
+ #include <unistd.h>
+ #include <errno.h>
+ #include <sys/ioctl.h>
++#ifdef __DragonFly__
++#include <sys/nata.h>
++#else
+ #include <sys/ata.h>
++#endif
+ 
+ #include "../logger.h"
+ 
diff -r 1f27d4c7085e -r 71a8af9e8762 sysutils/hal/patches/patch-ao
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sysutils/hal/patches/patch-ao     Mon Nov 24 21:13:19 2008 +0000
@@ -0,0 +1,16 @@
+$NetBSD: patch-ao,v 1.1 2008/11/24 21:13:19 hasso Exp $
+
+--- hald/freebsd/hf-usb.c.orig 2008-11-24 14:15:42 +0200
++++ hald/freebsd/hf-usb.c      2008-11-24 07:18:17 +0200
+@@ -31,7 +31,11 @@
+ #include <fcntl.h>
+ #include <sys/ioctl.h>
+ #include <unistd.h>
++#ifdef __DragonFly__
++#include <bus/usb/usb.h>
++#else
+ #include <dev/usb/usb.h>
++#endif
+ 
+ #include "../logger.h"
+ #include "../osspec.h"