head 1.13; access; symbols pkgsrc-2023Q3:1.12.0.22 pkgsrc-2023Q3-base:1.12 pkgsrc-2023Q2:1.12.0.20 pkgsrc-2023Q2-base:1.12 pkgsrc-2023Q1:1.12.0.18 pkgsrc-2023Q1-base:1.12 pkgsrc-2022Q4:1.12.0.16 pkgsrc-2022Q4-base:1.12 pkgsrc-2022Q3:1.12.0.14 pkgsrc-2022Q3-base:1.12 pkgsrc-2022Q2:1.12.0.12 pkgsrc-2022Q2-base:1.12 pkgsrc-2022Q1:1.12.0.10 pkgsrc-2022Q1-base:1.12 pkgsrc-2021Q4:1.12.0.8 pkgsrc-2021Q4-base:1.12 pkgsrc-2021Q3:1.12.0.6 pkgsrc-2021Q3-base:1.12 pkgsrc-2021Q2:1.12.0.4 pkgsrc-2021Q2-base:1.12 pkgsrc-2021Q1:1.12.0.2 pkgsrc-2021Q1-base:1.12 pkgsrc-2020Q4:1.11.0.74 pkgsrc-2020Q4-base:1.11 pkgsrc-2020Q3:1.11.0.72 pkgsrc-2020Q3-base:1.11 pkgsrc-2020Q2:1.11.0.68 pkgsrc-2020Q2-base:1.11 pkgsrc-2020Q1:1.11.0.48 pkgsrc-2020Q1-base:1.11 pkgsrc-2019Q4:1.11.0.70 pkgsrc-2019Q4-base:1.11 pkgsrc-2019Q3:1.11.0.66 pkgsrc-2019Q3-base:1.11 pkgsrc-2019Q2:1.11.0.64 pkgsrc-2019Q2-base:1.11 pkgsrc-2019Q1:1.11.0.62 pkgsrc-2019Q1-base:1.11 pkgsrc-2018Q4:1.11.0.60 pkgsrc-2018Q4-base:1.11 pkgsrc-2018Q3:1.11.0.58 pkgsrc-2018Q3-base:1.11 pkgsrc-2018Q2:1.11.0.56 pkgsrc-2018Q2-base:1.11 pkgsrc-2018Q1:1.11.0.54 pkgsrc-2018Q1-base:1.11 pkgsrc-2017Q4:1.11.0.52 pkgsrc-2017Q4-base:1.11 pkgsrc-2017Q3:1.11.0.50 pkgsrc-2017Q3-base:1.11 pkgsrc-2017Q2:1.11.0.46 pkgsrc-2017Q2-base:1.11 pkgsrc-2017Q1:1.11.0.44 pkgsrc-2017Q1-base:1.11 pkgsrc-2016Q4:1.11.0.42 pkgsrc-2016Q4-base:1.11 pkgsrc-2016Q3:1.11.0.40 pkgsrc-2016Q3-base:1.11 pkgsrc-2016Q2:1.11.0.38 pkgsrc-2016Q2-base:1.11 pkgsrc-2016Q1:1.11.0.36 pkgsrc-2016Q1-base:1.11 pkgsrc-2015Q4:1.11.0.34 pkgsrc-2015Q4-base:1.11 pkgsrc-2015Q3:1.11.0.32 pkgsrc-2015Q3-base:1.11 pkgsrc-2015Q2:1.11.0.30 pkgsrc-2015Q2-base:1.11 pkgsrc-2015Q1:1.11.0.28 pkgsrc-2015Q1-base:1.11 pkgsrc-2014Q4:1.11.0.26 pkgsrc-2014Q4-base:1.11 pkgsrc-2014Q3:1.11.0.24 pkgsrc-2014Q3-base:1.11 pkgsrc-2014Q2:1.11.0.22 pkgsrc-2014Q2-base:1.11 pkgsrc-2014Q1:1.11.0.20 pkgsrc-2014Q1-base:1.11 pkgsrc-2013Q4:1.11.0.18 pkgsrc-2013Q4-base:1.11 pkgsrc-2013Q3:1.11.0.16 pkgsrc-2013Q3-base:1.11 pkgsrc-2013Q2:1.11.0.14 pkgsrc-2013Q2-base:1.11 pkgsrc-2013Q1:1.11.0.12 pkgsrc-2013Q1-base:1.11 pkgsrc-2012Q4:1.11.0.10 pkgsrc-2012Q4-base:1.11 pkgsrc-2012Q3:1.11.0.8 pkgsrc-2012Q3-base:1.11 pkgsrc-2012Q2:1.11.0.6 pkgsrc-2012Q2-base:1.11 pkgsrc-2012Q1:1.11.0.4 pkgsrc-2012Q1-base:1.11 pkgsrc-2011Q4:1.11.0.2 pkgsrc-2011Q4-base:1.11 pkgsrc-2011Q3:1.10.0.6 pkgsrc-2011Q3-base:1.10 pkgsrc-2011Q2:1.10.0.4 pkgsrc-2011Q2-base:1.10 pkgsrc-2011Q1:1.10.0.2 pkgsrc-2011Q1-base:1.10 pkgsrc-2010Q4:1.9.0.2 pkgsrc-2010Q4-base:1.9 pkgsrc-2010Q3:1.5.0.10 pkgsrc-2010Q3-base:1.5 pkgsrc-2010Q2:1.5.0.8 pkgsrc-2010Q2-base:1.5 pkgsrc-2010Q1:1.5.0.6 pkgsrc-2010Q1-base:1.5 pkgsrc-2009Q4:1.5.0.4 pkgsrc-2009Q4-base:1.5 pkgsrc-2009Q3:1.5.0.2 pkgsrc-2009Q3-base:1.5 pkgsrc-2009Q2:1.4.0.6 pkgsrc-2009Q2-base:1.4 pkgsrc-2009Q1:1.4.0.4 pkgsrc-2009Q1-base:1.4 pkgsrc-2008Q4:1.4.0.2 pkgsrc-2008Q4-base:1.4; locks; strict; comment @# @; 1.13 date 2023.11.04.12.33.27; author wiz; state dead; branches; next 1.12; commitid ViEcksXq2cz24iLE; 1.12 date 2021.01.17.08.14.13; author wiz; state Exp; branches; next 1.11; commitid NRpKfQR1ep7Kr3EC; 1.11 date 2011.10.04.10.31.37; author dsainty; state Exp; branches; next 1.10; 1.10 date 2011.03.30.13.05.41; author obache; state Exp; branches; next 1.9; 1.9 date 2011.01.08.13.00.13; author obache; state Exp; branches; next 1.8; 1.8 date 2010.12.29.00.12.15; author tron; state Exp; branches; next 1.7; 1.7 date 2010.12.27.22.26.17; author tron; state Exp; branches; next 1.6; 1.6 date 2010.12.26.20.59.31; author markd; state Exp; branches; next 1.5; 1.5 date 2009.09.14.15.18.36; author joerg; state Exp; branches; next 1.4; 1.4 date 2009.01.03.01.28.34; author obache; state Exp; branches; next 1.3; 1.3 date 2008.12.20.21.11.05; author jmcneill; state Exp; branches; next 1.2; 1.2 date 2008.11.27.03.32.19; author jmcneill; state Exp; branches; next 1.1; 1.1 date 2008.11.25.23.10.23; author jmcneill; state Exp; branches; next ; desc @@ 1.13 log @hal{,-info}: remove Long obsolete. @ text @$NetBSD: patch-na,v 1.12 2021/01/17 08:14:13 wiz Exp $ * Remove gtk-doc support to fix build with autoconf 2.70. * Includes upstream patch to build on Linux systems without V4L1 support. http://cgit.freedesktop.org/hal/commit/?id=8f624253f0135ca77a893ad4e8168f51ef90d4da --- configure.in.orig 2009-08-24 12:42:29.000000000 +0000 +++ configure.in @@@@ -197,7 +197,7 @@@@ fi AC_SUBST(EJECT_PROGRAM) AC_DEFINE_UNQUOTED(EJECT_PROGRAM, "$EJECT_PROGRAM", [Eject program to use]) -GTK_DOC_CHECK([1.3]) +AM_CONDITIONAL([HAVE_GTK_DOC], false) # ACPI event source AC_ARG_ENABLE([acpi-acpid], @@@@ -479,12 +479,16 @@@@ if test "x$with_libpci" != xno ; then fi AM_CONDITIONAL([HAVE_LIBPCI], [test "x$USE_LIBPCI" = "xyes"]) +AC_CHECK_HEADERS([linux/videodev.h], [have_videodev_h=yes], []) +AM_CONDITIONAL(HAVE_V4L1, [test "x$have_videodev_h" = "xyes"]) + USE_LIBUSB20=no USE_LIBUSB=no LIBUSB20_LIBS="" +LIBUFS_LIBS="" AC_ARG_WITH([backend], AS_HELP_STRING([--with-backend=], - [backend to use (linux/solaris/freebsd/dummy)]), + [backend to use (linux/solaris/netbsd/freebsd/dummy)]), [backend=$withval]) if ! test -z "$with_backend" ; then HALD_BACKEND="$with_backend" @@@@ -493,6 +497,9 @@@@ else *-*-solaris*) HALD_BACKEND="solaris" ;; + *-*-netbsd*) + HALD_BACKEND="netbsd" + ;; *-*-freebsd* | *-*-kfreebsd*-gnu) HALD_BACKEND="freebsd" ;; @@@@ -508,8 +515,10 @@@@ AM_CONDITIONAL(HALD_COMPILE_DUMMY, [test AM_CONDITIONAL(HALD_COMPILE_LINUX, [test x$HALD_BACKEND = xlinux], [Compiling for Linux]) AM_CONDITIONAL(HALD_COMPILE_FREEBSD, [test x$HALD_BACKEND = xfreebsd], [Compiling for FreeBSD]) AM_CONDITIONAL(HALD_COMPILE_SOLARIS, [test x$HALD_BACKEND = xsolaris], [Compiling for Solaris]) +AM_CONDITIONAL(HALD_COMPILE_NETBSD, [test x$HALD_BACKEND = xnetbsd], [Compiling for NetBSD]) AC_SUBST(HALD_BACKEND) if test "x$HALD_BACKEND" = "xfreebsd"; then + AC_SEARCH_LIBS([ufs_disk_fillout], [ufs], [LIBUFS_LIBS="-lufs"], []) AC_CHECK_LIB([usb20], [libusb20_dev_get_info], [USE_LIBUSB20=yes], [USE_LIBUSB20=no]) fi if test "x$USE_LIBUSB20" = "xno"; then @@@@ -526,6 +535,8 @@@@ elif test "x$USE_LIBUSB" = "xyes"; then fi AC_SUBST(LIBUSB20_LIBS) +AC_SUBST(LIBUFS_LIBS) + dnl DBUS API is subject to changes AC_DEFINE_UNQUOTED(DBUS_API_SUBJECT_TO_CHANGE, [], [DBUS API is subject to change]) @@@@ -706,8 +717,8 @@@@ else fi AC_MSG_RESULT($have_glib_2_14) -case "$host" in - *-*-freebsd*) +case "$HALD_BACKEND" in + freebsd | netbsd) PKG_CHECK_MODULES(VOLUME_ID, [$volume_id_module]) AC_SUBST(VOLUME_ID_CFLAGS) AC_SUBST(VOLUME_ID_LIBS) @@@@ -718,14 +729,13 @@@@ esac # blkid (util-linux-ng) case "$host" in -*-*-freebsd*) - ;; -*-*-solaris*) - ;; -*) +*linux*) PKG_CHECK_MODULES(BLKID, [$blkid_module]) AC_SUBST(BLKID_CFLAGS) AC_SUBST(BLKID_LIBS) + ;; +*) + ;; esac # OS specific libs @@@@ -1086,6 +1096,9 @@@@ hald/linux/addons/Makefile hald/solaris/Makefile hald/solaris/probing/Makefile hald/solaris/addons/Makefile +hald/netbsd/Makefile +hald/netbsd/probing/Makefile +hald/netbsd/addons/Makefile hald/freebsd/Makefile hald/freebsd/probing/Makefile hald/freebsd/libprobe/Makefile @@@@ -1096,6 +1109,7 @@@@ libhal-storage/Makefile tools/Makefile tools/freebsd/Makefile tools/linux/Makefile +tools/netbsd/Makefile partutil/Makefile policy/Makefile fdi/Makefile @ 1.12 log @hal: remove gtk-doc documentation to fix build with autoconf 2.70 Remove unconditional libblkid include, it is already included for Linux and not needed on NetBSD. Bump PKGREVISION. @ text @d1 1 a1 1 $NetBSD: patch-na,v 1.11 2011/10/04 10:31:37 dsainty Exp $ @ 1.11 log @Upstream patch to build on Linux systems without V4L1 support. http://cgit.freedesktop.org/hal/commit/?id=ae13d96fa2a0612b6000f4b8f6ed9d3564035703 Fixes build on Ubuntu 11.04. @ text @d1 1 a1 1 $NetBSD: patch-na,v 1.10 2011/03/30 13:05:41 obache Exp $ d3 3 a5 1 Includes upstream patch to build on Linux systems without V4L1 support. d9 12 a20 3 --- configure.in.orig 2009-08-25 00:42:29.000000000 +1200 +++ configure.in 2011-10-04 22:56:25.700308098 +1300 @@@@ -479,12 +479,16 @@@@ d38 1 a38 1 @@@@ -493,6 +497,9 @@@@ d48 1 a48 1 @@@@ -508,8 +515,10 @@@@ d59 1 a59 1 @@@@ -526,6 +535,8 @@@@ d68 1 a68 1 @@@@ -706,8 +717,8 @@@@ d79 1 a79 1 @@@@ -718,14 +729,13 @@@@ d98 1 a98 1 @@@@ -1086,6 +1096,9 @@@@ d108 1 a108 1 @@@@ -1096,6 +1109,7 @@@@ @ 1.10 log @Change condition for check of libvolume_id. it depend on backend, not host. Fixes build with NetBSD-4 (dummy backend), PR#44794. @ text @d1 1 a1 1 $NetBSD: patch-na,v 1.9 2011/01/08 13:00:13 obache Exp $ d3 13 a15 3 --- configure.in.orig 2009-08-24 12:42:29.000000000 +0000 +++ configure.in @@@@ -482,9 +482,10 @@@@ AM_CONDITIONAL([HAVE_LIBPCI], [test "x$U d27 1 a27 1 @@@@ -493,6 +494,9 @@@@ else d37 1 a37 1 @@@@ -508,8 +512,10 @@@@ AM_CONDITIONAL(HALD_COMPILE_DUMMY, [test d48 1 a48 1 @@@@ -526,6 +532,8 @@@@ elif test "x$USE_LIBUSB" = "xyes"; then d57 1 a57 1 @@@@ -706,8 +714,8 @@@@ else d68 1 a68 1 @@@@ -718,14 +726,13 @@@@ esac d87 1 a87 1 @@@@ -1086,6 +1093,9 @@@@ hald/linux/addons/Makefile d97 1 a97 1 @@@@ -1096,6 +1106,7 @@@@ libhal-storage/Makefile @ 1.9 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-na,v 1.8 2010/12/29 00:12:15 tron Exp $ d47 2 a48 1 @@@@ -707,7 +715,7 @@@@ fi d51 1 a51 1 case "$host" in d53 2 a54 1 + *-*-freebsd* | *-*-netbsd* | *-*-dragonfly*) @ 1.8 log @Only look for "blkid" under Linux as we only use the Linux backend under that platform. This should fix the build under DragonFly BSD. Problem reported by Peter Avalos in private e-mail. @ text @d1 1 a1 1 $NetBSD: patch-na,v 1.7 2010/12/27 22:26:17 tron Exp $ d3 5 a7 3 --- configure.in.orig 2009-08-24 13:42:29.000000000 +0100 +++ configure.in 2010-12-29 00:07:13.000000000 +0000 @@@@ -484,7 +484,7 @@@@ d9 1 d17 1 a17 1 @@@@ -493,6 +493,9 @@@@ d27 1 a27 1 @@@@ -508,6 +511,7 @@@@ d34 1 d36 12 a47 1 @@@@ -707,7 +711,7 @@@@ d52 1 a52 1 + *-*-freebsd* | *-*-netbsd*) d56 1 a56 1 @@@@ -718,14 +722,13 @@@@ d75 1 a75 1 @@@@ -1086,6 +1089,9 @@@@ d85 1 a85 1 @@@@ -1096,6 +1102,7 @@@@ @ 1.7 log @Don't check for "blkid" under Mac OS X. It is not necessary and breaks the build. The according check in "configure.in" is probably broken. As far as I can tell it should only check for "blkid" if the "linux" backend is used. @ text @d1 1 a1 1 $NetBSD$ d4 1 a4 1 +++ configure.in 2010-12-27 22:18:55.000000000 +0000 d41 3 a43 1 @@@@ -720,8 +724,12 @@@@ d45 6 a50 9 *-*-freebsd*) ;; +*-*-netbsd*) + ;; *-*-solaris*) ;; +*-*-darwin*) + ;; *) d53 8 a60 1 @@@@ -1086,6 +1094,9 @@@@ d70 1 a70 1 @@@@ -1096,6 +1107,7 @@@@ @ 1.6 log @Update to 0.5.14. Many bugfixes and support for new features. @ text @d3 3 a5 3 --- configure.in.orig 2009-08-24 12:42:29.000000000 +0000 +++ configure.in @@@@ -484,7 +484,7 @@@@ USE_LIBUSB=no d14 1 a14 1 @@@@ -493,6 +493,9 @@@@ else d24 1 a24 1 @@@@ -508,6 +511,7 @@@@ AM_CONDITIONAL(HALD_COMPILE_DUMMY, [test d32 1 a32 1 @@@@ -707,7 +711,7 @@@@ fi d41 1 a41 1 @@@@ -720,6 +724,8 @@@@ esac d49 2 d52 3 a54 1 @@@@ -1086,6 +1092,9 @@@@ hald/linux/addons/Makefile d64 1 a64 1 @@@@ -1096,6 +1105,7 @@@@ libhal-storage/Makefile @ 1.5 log @Prepare configure for changes in the libtool m4 macros of libtool 2.2: - explicitly request finding the C++ compiler before trying to run it @ text @d3 1 a3 1 --- configure.in.orig 2008-05-08 01:24:31.000000000 +0200 d5 2 a6 10 @@@@ -30,6 +30,7 @@@@ AC_SUBST(LT_AGE) AC_ISC_POSIX AC_PROG_CC AM_PROG_CC_C_O +AC_PROG_CXX AC_HEADER_STDC AC_PROG_LIBTOOL AC_PROG_MAKE_SET @@@@ -448,7 +449,7 @@@@ AM_CONDITIONAL([HAVE_LIBPCI], [test "x$U d14 1 a14 1 @@@@ -457,6 +458,9 @@@@ else d19 1 a19 1 + HALD_BACKEND="netbsd" d21 1 a21 1 *-*-freebsd*) d24 1 a24 1 @@@@ -472,6 +476,7 @@@@ AM_CONDITIONAL(HALD_COMPILE_DUMMY, [test d30 3 a32 3 dnl DBUS API is subject to changes @@@@ -641,13 +646,14 @@@@ fi d35 4 a38 8 # volume_id -case "$host" in -*-*-solaris*) - ;; -*) +case "$HALD_BACKEND" in +linux|freebsd|netbsd) PKG_CHECK_MODULES(VOLUME_ID, [$volume_id_module]) d41 10 a50 7 + ;; +*) + ;; esac # OS specific libs @@@@ -1004,6 +1010,9 @@@@ hald/linux/addons/Makefile d60 1 a60 1 @@@@ -1014,6 +1023,7 @@@@ libhal-storage/Makefile @ 1.4 log @Restrict necessity of libvolume_id to using linux/freebsd/netbsd hald backends. Fixes build failure on platforms using dummy backend, as PR 40291. @ text @d1 1 a1 1 $NetBSD: patch-na,v 1.3 2008/12/20 21:11:05 jmcneill Exp $ d3 1 a3 1 --- configure.in.orig 2008-05-07 23:24:31.000000000 +0000 d5 9 a13 1 @@@@ -448,7 +448,7 @@@@ AM_CONDITIONAL([HAVE_LIBPCI], [test "x$U d22 1 a22 1 @@@@ -457,6 +457,9 @@@@ else d32 1 a32 1 @@@@ -472,6 +475,7 @@@@ AM_CONDITIONAL(HALD_COMPILE_DUMMY, [test d40 1 a40 1 @@@@ -641,13 +645,14 @@@@ fi d59 1 a59 1 @@@@ -1004,6 +1009,9 @@@@ hald/linux/addons/Makefile d69 1 a69 1 @@@@ -1014,6 +1022,7 @@@@ libhal-storage/Makefile @ 1.3 log @PR# pkg/40230: "libvolume_id" doesn't build under Mac OS X Fix HAL build on OS X. Tested on 10.5.6 powerpc. @ text @d1 1 a1 1 $NetBSD$ d3 3 a5 3 --- configure.in.orig 2008-05-07 19:24:31.000000000 -0400 +++ configure.in 2008-12-20 15:28:11.000000000 -0500 @@@@ -448,7 +448,7 @@@@ d14 1 a14 1 @@@@ -457,6 +457,9 @@@@ d24 1 a24 1 @@@@ -472,6 +475,7 @@@@ d32 10 a41 7 @@@@ -644,6 +648,8 @@@@ case "$host" in *-*-solaris*) ;; +*-*-darwin*) + ;; *) d44 8 a51 1 @@@@ -1004,6 +1010,9 @@@@ d61 1 a61 1 @@@@ -1014,6 +1023,7 @@@@ @ 1.2 log @Add reboot, shutdown, suspend support. Bump PKGREVISION. @ text @d4 1 a4 1 +++ configure.in 2008-11-26 21:32:46.000000000 -0500 d32 10 a41 1 @@@@ -1004,6 +1008,9 @@@@ d51 1 a51 1 @@@@ -1014,6 +1021,7 @@@@ @ 1.1 log @Initial import of NetBSD HAL backend. It doesn't do much useful yet, but keeping things here makes development easier. Bump PKGREVISION. @ text @d3 3 a5 3 --- configure.in.orig 2008-11-24 15:25:20.000000000 -0500 +++ configure.in @@@@ -448,7 +448,7 @@@@ AM_CONDITIONAL([HAVE_LIBPCI], [test "x$U d14 1 a14 1 @@@@ -457,6 +457,9 @@@@ else d24 1 a24 1 @@@@ -472,6 +475,7 @@@@ AM_CONDITIONAL(HALD_COMPILE_DUMMY, [test d32 1 a32 1 @@@@ -1004,6 +1008,9 @@@@ hald/linux/addons/Makefile d42 8 @