[pkgsrc/trunk]: pkgsrc/sysutils/hal * Make it build in DragonFly

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/sysutils/hal * Make it build in DragonFly
From: hasso <hasso%pkgsrc.org@localhost>
Date: Thu, 14 Oct 2021 06:55:55 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/aeaf9e98acf8
branches:  trunk
changeset: 550527:aeaf9e98acf8
user:      hasso <hasso%pkgsrc.org@localhost>
date:      Sun Nov 23 21:50:51 2008 +0000

description:
* Make it build in DragonFly
* Fix PLIST
* Bump PKGREVISION

diffstat:

 sysutils/hal/Makefile         |  11 +++++--
 sysutils/hal/PLIST            |  10 ++++++-
 sysutils/hal/distinfo         |  10 +++---
 sysutils/hal/patches/patch-aa |  31 ++++++++++++++++++--
 sysutils/hal/patches/patch-ab |  62 ++++++++++++++++++++++++++++++------------
 sysutils/hal/patches/patch-ac |  16 ++++++++--
 sysutils/hal/patches/patch-ad |  18 ++++++++----
 7 files changed, 117 insertions(+), 41 deletions(-)

diffs (truncated from 351 to 300 lines):

diff -r 67669f3a9642 -r aeaf9e98acf8 sysutils/hal/Makefile
--- a/sysutils/hal/Makefile     Sun Nov 23 21:25:48 2008 +0000
+++ b/sysutils/hal/Makefile     Sun Nov 23 21:50:51 2008 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2008/11/22 15:20:51 jmcneill Exp $
+# $NetBSD: Makefile,v 1.2 2008/11/23 21:50:51 hasso Exp $
 #
 
 DISTNAME=              hal-0.5.11
+PKGREVISION=           1
 CATEGORIES=            sysutils
 MASTER_SITES=          http://hal.freedesktop.org/releases/
 EXTRACT_SUFX=          .tar.bz2
@@ -34,6 +35,12 @@
 CONFIGURE_ARGS+=       --with-hal-user=${HAL_USER}
 CONFIGURE_ARGS+=       --with-hal-group=${HAL_GROUP}
 
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == "FreeBSD" || ${OPSYS} == "DragonFly"
+CONFIGURE_ARGS+=       --with-eject=/usr/sbin/cdcontrol
+.endif
+
 REPLACE_INTERPRETER+=  bash
 REPLACE.bash.old=      /bin/bash
 REPLACE.bash.new=      ${SH}
@@ -50,8 +57,6 @@
 FILES_SUBST+=          HAL_USER=${HAL_USER}
 FILES_SUBST+=          HAL_GROUP=${HAL_GROUP}
 
-.include "../../mk/bsd.prefs.mk"
-
 .if ${OPSYS} == "Linux"
 .include "../../devel/libusb/buildlink3.mk"
 .include "../../sysutils/pciutils/buildlink3.mk"
diff -r 67669f3a9642 -r aeaf9e98acf8 sysutils/hal/PLIST
--- a/sysutils/hal/PLIST        Sun Nov 23 21:25:48 2008 +0000
+++ b/sysutils/hal/PLIST        Sun Nov 23 21:50:51 2008 +0000
@@ -1,10 +1,11 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2008/11/22 15:20:51 jmcneill Exp $
+@comment $NetBSD: PLIST,v 1.2 2008/11/23 21:50:51 hasso Exp $
 bin/hal-device
 bin/hal-disable-polling
 bin/hal-find-by-capability
 bin/hal-find-by-property
 bin/hal-get-property
 bin/hal-is-caller-locked-out
+bin/hal-is-caller-privileged
 bin/hal-lock
 bin/hal-set-property
 bin/lshal
@@ -48,6 +49,7 @@
 man/man1/hal-find-by-property.1
 man/man1/hal-get-property.1
 man/man1/hal-is-caller-locked-out.1
+man/man1/hal-is-caller-privileged.1
 man/man1/hal-lock.1
 man/man1/hal-set-property.1
 man/man1/lshal.1
@@ -93,6 +95,12 @@
 share/hal/fdi/policy/10osvendor/15-storage-luks.fdi
 share/hal/fdi/policy/10osvendor/20-storage-methods.fdi
 share/hal/fdi/policy/10osvendor/30-wol.fdi
+share/PolicyKit/policy/org.freedesktop.hal.dockstation.policy
+share/PolicyKit/policy/org.freedesktop.hal.killswitch.policy
+share/PolicyKit/policy/org.freedesktop.hal.policy
+share/PolicyKit/policy/org.freedesktop.hal.power-management.policy
+share/PolicyKit/policy/org.freedesktop.hal.storage.policy
+share/PolicyKit/policy/org.freedesktop.hal.wol.policy
 @dirrm share/gtk-doc/html/libhal-storage
 @dirrm share/gtk-doc/html/libhal
 @dirrm lib/hal/scripts
diff -r 67669f3a9642 -r aeaf9e98acf8 sysutils/hal/distinfo
--- a/sysutils/hal/distinfo     Sun Nov 23 21:25:48 2008 +0000
+++ b/sysutils/hal/distinfo     Sun Nov 23 21:50:51 2008 +0000
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.1.1.1 2008/11/22 15:20:51 jmcneill Exp $
+$NetBSD: distinfo,v 1.2 2008/11/23 21:50:51 hasso Exp $
 
 SHA1 (hal-0.5.11.tar.bz2) = 1ddb7895d2ddc2464b553ad11f7ba38860478ae9
 RMD160 (hal-0.5.11.tar.bz2) = 741cfe82f0bc2d67106b24cfe526a754ab36e45f
 Size (hal-0.5.11.tar.bz2) = 1281251 bytes
-SHA1 (patch-aa) = 5b61b2eb10180e7e401088cb50b567bb3a596cd4
-SHA1 (patch-ab) = b346c0bc21b428185a0fb3240791094506d33ff0
-SHA1 (patch-ac) = 7643d4543bd3e07b03caeb74013da5d2d830c5f6
-SHA1 (patch-ad) = d69b97031b2297b2f3a3963f9ab28870a8724934
+SHA1 (patch-aa) = 120079700424a3c199b58f87bb3f160263f84ce1
+SHA1 (patch-ab) = 8712f8bd3ab5d4f7f6d4ea2c30c11f8384615772
+SHA1 (patch-ac) = cffdb9caa947366ff88310a750ab502bd2d98db8
+SHA1 (patch-ad) = 2a2732f82a4fd8d7ffa311b4a0e747208dc9ad1c
 SHA1 (patch-ae) = ebc98ede0b6e9535825434f2dc6185193d837f36
 SHA1 (patch-af) = 161b59ee30d59dbc9e0c79f7f3162bcec5480d99
 SHA1 (patch-ag) = 39b79fbcd99f9172afd492772c120161bb63a378
diff -r 67669f3a9642 -r aeaf9e98acf8 sysutils/hal/patches/patch-aa
--- a/sysutils/hal/patches/patch-aa     Sun Nov 23 21:25:48 2008 +0000
+++ b/sysutils/hal/patches/patch-aa     Sun Nov 23 21:50:51 2008 +0000
@@ -1,7 +1,16 @@
-$NetBSD: patch-aa,v 1.1.1.1 2008/11/22 15:20:51 jmcneill Exp $
+$NetBSD: patch-aa,v 1.2 2008/11/23 21:50:51 hasso Exp $
 
---- tools/hal-storage-mount.c.orig     2008-05-07 19:24:23.000000000 -0400
-+++ tools/hal-storage-mount.c
+--- tools/hal-storage-mount.c.orig     2008-05-08 02:24:23 +0300
++++ tools/hal-storage-mount.c  2008-11-23 13:25:17 +0200
+@@ -31,7 +31,7 @@
+ #include <string.h>
+ #include <glib.h>
+ #include <glib/gstdio.h>
+-#ifdef __FreeBSD__
++#if defined(__FreeBSD__) || defined(__DragonFly__)
+ #include <fstab.h>
+ #include <sys/param.h>
+ #include <sys/ucred.h>
 @@ -41,6 +41,10 @@
  #elif sun
  #include <sys/mnttab.h>
@@ -13,7 +22,12 @@
  #else
  #include <mntent.h>
  #endif
-@@ -58,6 +62,10 @@
+@@ -54,10 +58,14 @@
+ 
+ #include "hal-storage-shared.h"
+ 
+-#ifdef __FreeBSD__
++#if defined(__FreeBSD__) || defined(__DragonFly__)
  #define MOUNT         "/sbin/mount"
  #define MOUNT_OPTIONS "noexec,nosuid"
  #define MOUNT_TYPE_OPT        "-t"
@@ -24,6 +38,15 @@
  #elif sun
  #define MOUNT         "/sbin/mount"
  #define MOUNT_OPTIONS "noexec,nosuid"
+@@ -421,7 +429,7 @@ device_is_mounted (const char *device, c
+ static const char *
+ map_fstype (const char *fstype)
+ {
+-#ifdef __FreeBSD__
++#if defined(__FreeBSD__) || defined(__DragonFly__)
+       if (! strcmp (fstype, "iso9660"))
+               return "cd9660";
+       else if (! strcmp (fstype, "ext2"))
 @@ -430,6 +438,13 @@ map_fstype (const char *fstype)
                return "ext2fs";
        else if (! strcmp (fstype, "vfat"))
diff -r 67669f3a9642 -r aeaf9e98acf8 sysutils/hal/patches/patch-ab
--- a/sysutils/hal/patches/patch-ab     Sun Nov 23 21:25:48 2008 +0000
+++ b/sysutils/hal/patches/patch-ab     Sun Nov 23 21:50:51 2008 +0000
@@ -1,7 +1,16 @@
-$NetBSD: patch-ab,v 1.1.1.1 2008/11/22 15:20:51 jmcneill Exp $
+$NetBSD: patch-ab,v 1.2 2008/11/23 21:50:51 hasso Exp $
 
---- tools/hal-storage-shared.c.orig    2008-05-07 19:24:24.000000000 -0400
-+++ tools/hal-storage-shared.c
+--- tools/hal-storage-shared.c.orig    2008-05-08 02:24:24 +0300
++++ tools/hal-storage-shared.c 2008-11-23 13:38:53 +0200
+@@ -31,7 +31,7 @@
+ #include <string.h>
+ #include <glib.h>
+ #include <glib/gstdio.h>
+-#ifdef __FreeBSD__
++#if defined(__FreeBSD__) || defined(__DragonFly__)
+ #include <fstab.h>
+ #include <sys/param.h>
+ #include <sys/ucred.h>
 @@ -42,6 +42,10 @@
  #include <fcntl.h>
  #include <sys/mnttab.h>
@@ -13,7 +22,15 @@
  #else
  #include <mntent.h>
  #endif
-@@ -60,13 +64,20 @@ struct mtab_handle
+@@ -53,20 +57,27 @@
+ 
+ #include "hal-storage-shared.h"
+ 
+-#ifdef __FreeBSD__
++#if defined(__FreeBSD__) || defined(__DragonFly__)
+ struct mtab_handle
+ {
+   struct statfs       *mounts;
    int         n_mounts;
    int         iter;
  };
@@ -31,7 +48,7 @@
  mtab_open (gpointer *handle)
  {
 -#ifdef __FreeBSD__
-+#if defined(__FreeBSD__) || defined(__NetBSD__)
++#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
        struct mtab_handle *mtab;
  
        mtab = g_new0 (struct mtab_handle, 1);
@@ -40,7 +57,7 @@
  mtab_next (gpointer handle, char **mount_point)
  {
 -#ifdef __FreeBSD__
-+#if defined(__FreeBSD__) || defined(__NetBSD__)
++#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
        struct mtab_handle *mtab = handle;
  
        if (mtab->iter < mtab->n_mounts) {
@@ -49,7 +66,7 @@
  mtab_close (gpointer handle)
  {
 -#ifdef __FreeBSD__
-+#if defined(__FreeBSD__) || defined(__NetBSD__)
++#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
        g_free (handle);
  #else
        fclose (handle);
@@ -58,7 +75,7 @@
  fstab_open (gpointer *handle)
  {
 -#ifdef __FreeBSD__
-+#if defined(__FreeBSD__) || defined(__NetBSD__)
++#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
        return setfsent () == 1;
  #elif sun
        *handle = fopen (VFSTAB, "r");
@@ -67,38 +84,47 @@
  fstab_next (gpointer handle, char **mount_point)
  {
 -#ifdef __FreeBSD__
-+#if defined(__FreeBSD__) || defined(__NetBSD__)
++#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
        struct fstab *fstab;
  
        fstab = getfsent ();
-@@ -188,7 +199,7 @@ fstab_next (gpointer handle, char **moun
+@@ -188,14 +199,16 @@ fstab_next (gpointer handle, char **moun
  void
  fstab_close (gpointer handle)
  {
 -#ifdef __FreeBSD__
-+#if defined(__FreeBSD__) || defined(__NetBSD__)
++#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
        endfsent ();
  #else
        fclose (handle);
-@@ -197,6 +208,8 @@ fstab_close (gpointer handle)
+ #endif
+ }
  
- #ifdef __FreeBSD__
+-#ifdef __FreeBSD__
++#if defined(__FreeBSD__) || defined(__DragonFly__)
++#define UMOUNT                "/sbin/umount"
++#elif __NetBSD__
  #define UMOUNT                "/sbin/umount"
-+#elif __NetBSD__
-+#define UMOUNT                "/sbin/umount"
  #elif sun
  #define UMOUNT                "/sbin/umount"
- #else
 @@ -467,7 +480,7 @@ line_found:
        /* construct arguments to /bin/umount */
        na = 0;
        args[na++] = UMOUNT;
 -#ifndef __FreeBSD__
-+#if !defined(__FreeBSD__) && !defined(__NetBSD__)
++#if !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__DragonFly__)
        if (option_lazy)
                args[na++] = "-l";
  #endif
-@@ -632,6 +645,11 @@ try_open_excl_again:
+@@ -625,13 +638,18 @@ try_open_excl_again:
+       /* construct arguments to EJECT_PROGRAM (e.g. /usr/bin/eject) */
+       na = 0;
+       args[na++] = EJECT_PROGRAM;
+-#ifdef __FreeBSD__
++#if defined(__FreeBSD__) || defined(__DragonFly__)
+       args[na++] = "-f";
+       args[na++] = (char *) device;
+       if (closetray)
                args[na++] = "close";
        else
                args[na++] = "eject";
diff -r 67669f3a9642 -r aeaf9e98acf8 sysutils/hal/patches/patch-ac
--- a/sysutils/hal/patches/patch-ac     Sun Nov 23 21:25:48 2008 +0000
+++ b/sysutils/hal/patches/patch-ac     Sun Nov 23 21:50:51 2008 +0000
@@ -1,8 +1,16 @@
-$NetBSD: patch-ac,v 1.1.1.1 2008/11/22 15:20:51 jmcneill Exp $
+$NetBSD: patch-ac,v 1.2 2008/11/23 21:50:51 hasso Exp $
 
---- tools/hal-storage-unmount.c.orig   2008-05-07 19:24:17.000000000 -0400
-+++ tools/hal-storage-unmount.c
-@@ -38,6 +38,10 @@
+--- tools/hal-storage-unmount.c.orig   2008-05-08 02:24:17 +0300
++++ tools/hal-storage-unmount.c        2008-11-23 13:40:23 +0200
+@@ -31,13 +31,17 @@
+ #include <string.h>
+ #include <glib.h>
+ #include <glib/gstdio.h>
+-#ifdef __FreeBSD__
++#if defined(__FreeBSD__) || defined(__DragonFly__)
+ #include <fstab.h>
+ #include <sys/param.h>
Prev by Date: [pkgsrc/trunk]: pkgsrc/graphics/imlib2 Add Debian patch to fix a buffer overf...
Next by Date: [pkgsrc/trunk]: pkgsrc/security/policykit From FreeBSD:
Previous by Thread: [pkgsrc/trunk]: pkgsrc/graphics/imlib2 Add Debian patch to fix a buffer overf...
Next by Thread: [pkgsrc/trunk]: pkgsrc/security/policykit From FreeBSD:
Indexes:
Home | Main Index | Thread Index | Old Index