head 1.5; access; symbols pkgsrc-2023Q3:1.4.0.94 pkgsrc-2023Q3-base:1.4 pkgsrc-2023Q2:1.4.0.92 pkgsrc-2023Q2-base:1.4 pkgsrc-2023Q1:1.4.0.90 pkgsrc-2023Q1-base:1.4 pkgsrc-2022Q4:1.4.0.88 pkgsrc-2022Q4-base:1.4 pkgsrc-2022Q3:1.4.0.86 pkgsrc-2022Q3-base:1.4 pkgsrc-2022Q2:1.4.0.84 pkgsrc-2022Q2-base:1.4 pkgsrc-2022Q1:1.4.0.82 pkgsrc-2022Q1-base:1.4 pkgsrc-2021Q4:1.4.0.80 pkgsrc-2021Q4-base:1.4 pkgsrc-2021Q3:1.4.0.78 pkgsrc-2021Q3-base:1.4 pkgsrc-2021Q2:1.4.0.76 pkgsrc-2021Q2-base:1.4 pkgsrc-2021Q1:1.4.0.74 pkgsrc-2021Q1-base:1.4 pkgsrc-2020Q4:1.4.0.72 pkgsrc-2020Q4-base:1.4 pkgsrc-2020Q3:1.4.0.70 pkgsrc-2020Q3-base:1.4 pkgsrc-2020Q2:1.4.0.66 pkgsrc-2020Q2-base:1.4 pkgsrc-2020Q1:1.4.0.46 pkgsrc-2020Q1-base:1.4 pkgsrc-2019Q4:1.4.0.68 pkgsrc-2019Q4-base:1.4 pkgsrc-2019Q3:1.4.0.64 pkgsrc-2019Q3-base:1.4 pkgsrc-2019Q2:1.4.0.62 pkgsrc-2019Q2-base:1.4 pkgsrc-2019Q1:1.4.0.60 pkgsrc-2019Q1-base:1.4 pkgsrc-2018Q4:1.4.0.58 pkgsrc-2018Q4-base:1.4 pkgsrc-2018Q3:1.4.0.56 pkgsrc-2018Q3-base:1.4 pkgsrc-2018Q2:1.4.0.54 pkgsrc-2018Q2-base:1.4 pkgsrc-2018Q1:1.4.0.52 pkgsrc-2018Q1-base:1.4 pkgsrc-2017Q4:1.4.0.50 pkgsrc-2017Q4-base:1.4 pkgsrc-2017Q3:1.4.0.48 pkgsrc-2017Q3-base:1.4 pkgsrc-2017Q2:1.4.0.44 pkgsrc-2017Q2-base:1.4 pkgsrc-2017Q1:1.4.0.42 pkgsrc-2017Q1-base:1.4 pkgsrc-2016Q4:1.4.0.40 pkgsrc-2016Q4-base:1.4 pkgsrc-2016Q3:1.4.0.38 pkgsrc-2016Q3-base:1.4 pkgsrc-2016Q2:1.4.0.36 pkgsrc-2016Q2-base:1.4 pkgsrc-2016Q1:1.4.0.34 pkgsrc-2016Q1-base:1.4 pkgsrc-2015Q4:1.4.0.32 pkgsrc-2015Q4-base:1.4 pkgsrc-2015Q3:1.4.0.30 pkgsrc-2015Q3-base:1.4 pkgsrc-2015Q2:1.4.0.28 pkgsrc-2015Q2-base:1.4 pkgsrc-2015Q1:1.4.0.26 pkgsrc-2015Q1-base:1.4 pkgsrc-2014Q4:1.4.0.24 pkgsrc-2014Q4-base:1.4 pkgsrc-2014Q3:1.4.0.22 pkgsrc-2014Q3-base:1.4 pkgsrc-2014Q2:1.4.0.20 pkgsrc-2014Q2-base:1.4 pkgsrc-2014Q1:1.4.0.18 pkgsrc-2014Q1-base:1.4 pkgsrc-2013Q4:1.4.0.16 pkgsrc-2013Q4-base:1.4 pkgsrc-2013Q3:1.4.0.14 pkgsrc-2013Q3-base:1.4 pkgsrc-2013Q2:1.4.0.12 pkgsrc-2013Q2-base:1.4 pkgsrc-2013Q1:1.4.0.10 pkgsrc-2013Q1-base:1.4 pkgsrc-2012Q4:1.4.0.8 pkgsrc-2012Q4-base:1.4 pkgsrc-2012Q3:1.4.0.6 pkgsrc-2012Q3-base:1.4 pkgsrc-2012Q2:1.4.0.4 pkgsrc-2012Q2-base:1.4 pkgsrc-2012Q1:1.4.0.2 pkgsrc-2012Q1-base:1.4 pkgsrc-2011Q4:1.3.0.10 pkgsrc-2011Q4-base:1.3 pkgsrc-2011Q3:1.3.0.8 pkgsrc-2011Q3-base:1.3 pkgsrc-2011Q2:1.3.0.6 pkgsrc-2011Q2-base:1.3 pkgsrc-2011Q1:1.3.0.4 pkgsrc-2011Q1-base:1.3 pkgsrc-2010Q4:1.3.0.2 pkgsrc-2010Q4-base:1.3 pkgsrc-2010Q3:1.1.0.16 pkgsrc-2010Q3-base:1.1 pkgsrc-2010Q2:1.1.0.14 pkgsrc-2010Q2-base:1.1 pkgsrc-2010Q1:1.1.0.12 pkgsrc-2010Q1-base:1.1 pkgsrc-2009Q4:1.1.0.10 pkgsrc-2009Q4-base:1.1 pkgsrc-2009Q3:1.1.0.8 pkgsrc-2009Q3-base:1.1 pkgsrc-2009Q2:1.1.0.6 pkgsrc-2009Q2-base:1.1 pkgsrc-2009Q1:1.1.0.4 pkgsrc-2009Q1-base:1.1 pkgsrc-2008Q4:1.1.0.2 pkgsrc-2008Q4-base:1.1; locks; strict; comment @# @; 1.5 date 2023.11.04.12.33.27; author wiz; state dead; branches; next 1.4; commitid ViEcksXq2cz24iLE; 1.4 date 2012.03.31.16.06.56; author ryoon; state Exp; branches; next 1.3; 1.3 date 2011.01.08.13.00.13; author obache; state Exp; branches; next 1.2; 1.2 date 2010.12.26.20.59.31; author markd; state Exp; branches; next 1.1; 1.1 date 2008.11.24.21.13.19; author hasso; state Exp; branches; next ; desc @@ 1.5 log @hal{,-info}: remove Long obsolete. @ text @$NetBSD: patch-ak,v 1.4 2012/03/31 16:06:56 ryoon Exp $ --- hald/freebsd/probing/probe-volume.c.orig 2009-09-17 13:45:09.000000000 +0000 +++ hald/freebsd/probing/probe-volume.c @@@@ -33,7 +33,11 @@@@ #include #include #include +#ifdef __DragonFly__ +#include +#else #include +#endif #include #include #include @@@@ -41,7 +45,11 @@@@ #include #include #include +#ifdef __DragonFly__ +#include +#else #include +#endif #include #include #include @@@@ -332,6 +340,9 @@@@ main (int argc, char **argv) gboolean is_blank = FALSE; const char *usage; char *label; +#ifdef __DragonFly__ + struct partinfo device_info; +#endif unsigned int sector_size = 0; off_t media_size = 0; @@@@ -371,7 +382,12 @@@@ main (int argc, char **argv) is_blank = (! has_audio && ! has_data); } +#ifdef __DragonFly__ + ioctl(fd, DIOCGPART, &device_info); + media_size = device_info.media_size; +#else ioctl(fd, DIOCGMEDIASIZE, &media_size); +#endif /* * We only check for filesystems if the volume has no children, @@@@ -563,16 +579,35 @@@@ main (int argc, char **argv) if (vid && ! strcmp (vid->type, "ufs")) { +#ifdef __DragonFly__ + struct fs fs; + int rfd; + ssize_t nr; + + if ((rfd = open(device_file, O_RDONLY)) >= 0) { + lseek(rfd, (off_t) SBOFF, SEEK_SET); + + nr = read(rfd, &fs, (size_t) SBSIZE); + close(rfd); + } + + if (nr == (ssize_t) SBSIZE) +#else struct uufsd ufsdisk; if (ufs_disk_fillout(&ufsdisk, device_file) == 0) +#endif { char ufsid[64]; char **ufs_devs = NULL; int num_udis; int i; +#ifdef __DragonFly__ + snprintf(ufsid, sizeof(ufsid), "%08x%08x", fs.fs_id[0], fs.fs_id[1]); +#else snprintf(ufsid, sizeof(ufsid), "%08x%08x", ufsdisk.d_fs.fs_id[0], ufsdisk.d_fs.fs_id[1]); +#endif libhal_device_set_property_string(hfp_ctx, hfp_udi, "volume.freebsd.ufsid", ufsid, &hfp_error); ufs_devs = libhal_manager_find_device_string_match(hfp_ctx, "volume.freebsd.ufsid", @@@@ -582,7 +617,11 @@@@ main (int argc, char **argv) dbus_error_free(&hfp_error); for (i = 0; i < num_udis; i++) { +#if defined(__FreeBSD__) + if (ufs_devs[i] != NULL && strcmp(ufs_devs[i], hfp_udi)) +#else if (ufs_devs[i] != NULL) +#endif { gboolean mounted; @@@@ -592,12 +631,15 @@@@ main (int argc, char **argv) { libhal_device_set_property_bool(hfp_ctx, hfp_udi, "volume.ignore", TRUE, &hfp_error); dbus_error_free(&hfp_error); + break; } } } if (ufs_devs) libhal_free_string_array(ufs_devs); +#ifndef __DragonFly__ ufs_disk_close(&ufsdisk); +#endif } } @@@@ -628,7 +670,11 @@@@ main (int argc, char **argv) libhal_device_set_property_string(hfp_ctx, hfp_udi, "volume.uuid", vid ? vid->uuid : "", &hfp_error); +#ifdef __DragonFly__ + sector_size = device_info.media_blksize; +#else ioctl(fd, DIOCGSECTORSIZE, §or_size); +#endif if (sector_size != 0) libhal_device_set_property_uint64(hfp_ctx, hfp_udi, "volume.block_size", sector_size, &hfp_error); @ 1.4 log @Bump PKGREVISION * Fix build on FreeBSD 9.0 ** Patches are borrowed from FreeBSD ports ** Split FreeBSD support from DragonFly/FreeBSD support @ text @d1 1 a1 1 $NetBSD: patch-ak,v 1.3 2011/01/08 13:00:13 obache Exp $ @ 1.3 log @Bring back DragonFly BSD support. Based on PR#44338 from Rumko, also fixes PLIST.FreeBSD and self-tests by me. @ text @d1 1 a1 1 $NetBSD: patch-ak,v 1.2 2010/12/26 20:59:31 markd Exp $ d88 19 a106 1 @@@@ -597,7 +632,9 @@@@ main (int argc, char **argv) d116 1 a116 1 @@@@ -628,7 +665,11 @@@@ main (int argc, char **argv) @ 1.2 log @Update to 0.5.14. Many bugfixes and support for new features. @ text @d1 1 a1 1 $NetBSD$ d5 1 a5 1 @@@@ -33,7 +33,9 @@@@ d9 3 a11 1 +#ifndef __DragonFly__ d17 23 a39 1 @@@@ -371,6 +373,7 @@@@ main (int argc, char **argv) d43 4 a46 1 +#ifndef __DragonFly__ d48 1 d51 38 a88 1 @@@@ -396,6 +399,7 @@@@ main (int argc, char **argv) d90 5 a96 1 +#endif d98 1 a98 3 if (! has_children && ! is_swap && ! has_audio && ! has_data && ! is_blank) goto end; @@@@ -628,10 +632,12 @@@@ main (int argc, char **argv) d102 3 a104 1 +#ifndef __DragonFly__ d106 1 a109 4 +#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) @ 1.1 log @* 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. @ text @d3 2 a4 2 --- 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 d14 2 a15 2 #include @@@@ -366,6 +368,7 @@@@ main (int argc, char **argv) d23 1 a23 1 @@@@ -391,6 +394,7 @@@@ main (int argc, char **argv) d31 1 a31 1 @@@@ -582,10 +586,12 @@@@ main (int argc, char **argv) @