Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 12 Oct 2019 18:55:50 +0000 (UTC)
From:      Gleb Popov <arrowd@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r514350 - in head/sysutils: . libudisks libudisks/files
Message-ID:  <201910121855.x9CItost020130@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: arrowd
Date: Sat Oct 12 18:55:49 2019
New Revision: 514350
URL: https://svnweb.freebsd.org/changeset/ports/514350

Log:
  sysutils/libudisks: New port. A client library to UDisks daemon, which some applications are using to interface with UDisks.
  
  PR:		240138

Added:
  head/sysutils/libudisks/
  head/sysutils/libudisks/Makefile   (contents, props changed)
  head/sysutils/libudisks/distinfo   (contents, props changed)
  head/sysutils/libudisks/files/
  head/sysutils/libudisks/files/patch-Makefile.am   (contents, props changed)
  head/sysutils/libudisks/files/patch-configure.ac   (contents, props changed)
  head/sysutils/libudisks/files/patch-data_Makefile.am   (contents, props changed)
  head/sysutils/libudisks/files/patch-doc_Makefile.am   (contents, props changed)
  head/sysutils/libudisks/files/patch-doc_man_Makefile.am   (contents, props changed)
  head/sysutils/libudisks/files/patch-doc_udisks2-docs.xml.daemon.man.in   (contents, props changed)
  head/sysutils/libudisks/files/patch-doc_udisks2-docs.xml.daemon.part.in   (contents, props changed)
  head/sysutils/libudisks/files/patch-doc_udisks2-docs.xml.daemon.sed   (contents, props changed)
  head/sysutils/libudisks/files/patch-doc_udisks2-docs.xml.in.in   (contents, props changed)
  head/sysutils/libudisks/files/patch-doc_udisks2-sections.txt.daemon.sections.in   (contents, props changed)
  head/sysutils/libudisks/files/patch-doc_udisks2-sections.txt.daemon.sed   (contents, props changed)
  head/sysutils/libudisks/files/patch-doc_udisks2-sections.txt.in.in   (contents, props changed)
  head/sysutils/libudisks/files/patch-doc_udisks2.types.daemon.in   (contents, props changed)
  head/sysutils/libudisks/files/patch-doc_udisks2.types.daemon.sed   (contents, props changed)
  head/sysutils/libudisks/files/patch-doc_udisks2.types.in.in   (contents, props changed)
  head/sysutils/libudisks/files/patch-tools_Makefile.am   (contents, props changed)
  head/sysutils/libudisks/files/patch-udisks_Makefile.am   (contents, props changed)
  head/sysutils/libudisks/files/patch-udisks_udisksclient.c   (contents, props changed)
  head/sysutils/libudisks/pkg-descr   (contents, props changed)
  head/sysutils/libudisks/pkg-plist   (contents, props changed)
Modified:
  head/sysutils/Makefile

Modified: head/sysutils/Makefile
==============================================================================
--- head/sysutils/Makefile	Sat Oct 12 18:12:36 2019	(r514349)
+++ head/sysutils/Makefile	Sat Oct 12 18:55:49 2019	(r514350)
@@ -581,6 +581,7 @@
     SUBDIR += libretto-config
     SUBDIR += libsunacl
     SUBDIR += libsysstat
+    SUBDIR += libudisks
     SUBDIR += liburcu
     SUBDIR += life-preserver
     SUBDIR += lineak-defaultplugin

Added: head/sysutils/libudisks/Makefile
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sysutils/libudisks/Makefile	Sat Oct 12 18:55:49 2019	(r514350)
@@ -0,0 +1,64 @@
+# $FreeBSD$
+
+PORTNAME=	libudisks
+PORTVERSION=	2.8.4
+# Obviates the need to specify GH_TAGNAME and repeat the version number later
+DISTVERSIONPREFIX=	udisks-
+CATEGORIES=	sysutils
+
+MAINTAINER=	pauamma@gundo.com
+COMMENT=	Library to manipulate storage devices, from udisks
+
+LICENSE=	LGPL20+
+LICENSE_FILE=	${WRKSRC}/COPYING
+
+# pkaction takes care of libpolkit-agent-1 and libpolkit-gobject-1
+# which are what we really want (see UDISKSCTL_LIB_DEPENDS).
+BUILD_DEPENDS=	bash:shells/bash \
+		gtkdocize:textproc/gtk-doc \
+		pkaction:sysutils/polkit
+
+# For some reason, configure wants autopoint from gettext-tools even when
+# NLS is disabled.
+USES=		autoreconf:build gettext-tools:build gmake gnome \
+		libtool:build pkgconfig
+
+USE_GITHUB=	yes
+GH_ACCOUNT=	storaged-project
+GH_PROJECT=	udisks
+
+USE_GNOME=	glib20 introspection
+
+USE_LDCONFIG=	yes
+
+GNU_CONFIGURE=	yes
+# config.status errors out without --disable-dependency-tracking, with or
+# without USES=gmake. --with-libintl-prefix is needed because otherwise
+# configure won't find libintl when PREFIX != LOCALBASE.
+CONFIGURE_ARGS=	--disable-daemon --disable-dependency-tracking \
+		--with-libintl-prefix=${LOCALBASE}
+
+OPTIONS_DEFINE=	UDISKSCTL NLS DOCS
+OPTIONS_DEFAULT=	UDISKSCTL NLS DOCS
+OPTIONS_SUB=	yes
+DOCS_CONFIGURE_ENABLE=	gtk-doc
+NLS_CONFIGURE_ENABLE=	nls
+NLS_USES=	gettext-runtime
+UDISKSCTL_DESC=	Install udisksctl command line utility
+UDISKSCTL_LIB_DEPENDS=	libpolkit-agent-1.so:sysutils/polkit \
+			libpolkit-gobject-1.so:sysutils/polkit
+
+pre-configure:
+	cd ${WRKSRC} && ${SETENV} NOCONFIGURE=1 ./autogen.sh
+
+post-install:
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libudisks2.so.0.0.0
+
+post-install-UDISKSCTL-on:
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/udisksctl
+
+# Pacify "make stage-qa".
+post-install-UDISKSCTL-off:
+	${RM} ${STAGEDIR}${PREFIX}/bin/udisksctl
+
+.include <bsd.port.mk>

Added: head/sysutils/libudisks/distinfo
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sysutils/libudisks/distinfo	Sat Oct 12 18:55:49 2019	(r514350)
@@ -0,0 +1,3 @@
+TIMESTAMP = 1567127492
+SHA256 (storaged-project-udisks-udisks-2.8.4_GH0.tar.gz) = 46cc88f26d26818b719a0070587f9d3fe13828b063edb1f0dfc8443d86b94d97
+SIZE (storaged-project-udisks-udisks-2.8.4_GH0.tar.gz) = 1377390

Added: head/sysutils/libudisks/files/patch-Makefile.am
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sysutils/libudisks/files/patch-Makefile.am	Sat Oct 12 18:55:49 2019	(r514350)
@@ -0,0 +1,24 @@
+--- Makefile.am.orig	2019-07-22 16:24:44 UTC
++++ Makefile.am
+@@ -1,13 +1,19 @@
+ ## Process this file with automake to produce Makefile.in
+ 
+-SHELL = /bin/bash
++SHELL = @BASH@
+ .SHELLFLAGS = -o pipefail -c
+ 
+ PYTHON ?= python3
+ 
+ NULL =
+ 
+-SUBDIRS = data udisks src tools modules po doc
++SUBDIRS = data udisks
++
++if ENABLE_DAEMON
++SUBDIRS += src
++endif
++
++SUBDIRS += tools modules po doc
+ 
+ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
+ 

Added: head/sysutils/libudisks/files/patch-configure.ac
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sysutils/libudisks/files/patch-configure.ac	Sat Oct 12 18:55:49 2019	(r514350)
@@ -0,0 +1,388 @@
+--- configure.ac.orig	2019-07-22 16:24:44 UTC
++++ configure.ac
+@@ -33,6 +33,10 @@ AC_ISC_POSIX
+ AC_HEADER_STDC
+ AC_PROG_LIBTOOL
+ 
++AC_PATH_PROG([BASH], [bash])
++if test -z "$BASH"; then
++  AC_MSG_ERROR([bash is required to run Makefile])
++fi
+ 
+ # Compilation
+ #
+@@ -113,6 +117,12 @@ AS_IF([test "$enable_man" != no], [
+ ])
+ AM_CONDITIONAL(ENABLE_MAN, test "$enable_man" != no)
+ 
++AC_ARG_ENABLE(daemon,
++              [AS_HELP_STRING([--enable-daemon],
++                              [build udisks daemon [default=yes]])],,
++              enable_daemon=yes)
++AM_CONDITIONAL(ENABLE_DAEMON, test "$enable_daemon" != no)
++
+ GOBJECT_INTROSPECTION_CHECK([0.6.2])
+ 
+ # Behavior
+@@ -132,10 +142,6 @@ fi
+ # Libraries
+ #
+ 
+-PKG_CHECK_MODULES(GUDEV, [gudev-1.0 >= 165])
+-AC_SUBST(GUDEV_CFLAGS)
+-AC_SUBST(GUDEV_LIBS)
+-
+ PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.50])
+ AC_SUBST(GLIB_CFLAGS)
+ AC_SUBST(GLIB_LIBS)
+@@ -144,14 +150,6 @@ PKG_CHECK_MODULES(GIO, [gio-unix-2.0 >= 2.50])
+ AC_SUBST(GIO_CFLAGS)
+ AC_SUBST(GIO_LIBS)
+ 
+-PKG_CHECK_MODULES(GMODULE, [gmodule-2.0])
+-AC_SUBST(GMODULE_CFLAGS)
+-AC_SUBST(GMODULE_LIBS)
+-
+-PKG_CHECK_MODULES(BLOCKDEV, [blockdev >= 2.19])
+-AC_SUBST(BLOCKDEV_CFLAGS)
+-AC_SUBST(BLOCKDEV_LIBS)
+-
+ PKG_CHECK_MODULES(POLKIT_GOBJECT_1, [polkit-gobject-1 >= 0.102])
+ AC_SUBST(POLKIT_GOBJECT_1_CFLAGS)
+ AC_SUBST(POLKIT_GOBJECT_1_LIBS)
+@@ -160,43 +158,61 @@ PKG_CHECK_MODULES(POLKIT_AGENT_1, [polkit-agent-1 >= 0
+ AC_SUBST(POLKIT_AGENT_1_CFLAGS)
+ AC_SUBST(POLKIT_AGENT_1_LIBS)
+ 
+-PKG_CHECK_MODULES(LIBATASMART, [libatasmart >= 0.17])
+-AC_SUBST(LIBATASMART_CFLAGS)
+-AC_SUBST(LIBATASMART_LIBS)
++if test "x$enable_daemon" = "xyes"; then
++  PKG_CHECK_MODULES(GUDEV, [gudev-1.0 >= 165])
++  AC_SUBST(GUDEV_CFLAGS)
++  AC_SUBST(GUDEV_LIBS)
+ 
+-PKG_CHECK_MODULES(LIBMOUNT, [mount >= 2.30],
+-                  [have_libmount=yes],
+-                  [have_libmount=no])
+-AM_CONDITIONAL(HAVE_LIBMOUNT, test x$have_libmount = xyes)
+-if test "x$have_libmount" = "xyes"; then
+-  AC_DEFINE([HAVE_LIBMOUNT], 1, [Define to 1 if libmount >= 2.30 is available])
+-fi
+-AC_SUBST(HAVE_LIBMOUNT)
+-AC_SUBST(LIBMOUNT_CFLAGS)
+-AC_SUBST(LIBMOUNT_LIBS)
++  PKG_CHECK_MODULES(GMODULE, [gmodule-2.0])
++  AC_SUBST(GMODULE_CFLAGS)
++  AC_SUBST(GMODULE_LIBS)
+ 
+-PKG_CHECK_MODULES(LIBSYSTEMD_LOGIN, [libsystemd >= 209], [have_libsystemd_login=yes],
+-                  [PKG_CHECK_MODULES(LIBSYSTEMD_LOGIN, [libsystemd-login >= 44 libsystemd-daemon],
+-                  [have_libsystemd_login=yes],
+-                  [have_libsystemd_login=no])])
+-AM_CONDITIONAL(HAVE_LIBSYSTEMD_LOGIN, test x$have_libsystemd_login = xyes)
+-if test "x$have_libsystemd_login" = "xyes"; then
+-  AC_DEFINE([HAVE_LIBSYSTEMD_LOGIN], 1, [Define to 1 if libsystemd-login is available])
+-fi
+-AC_SUBST(HAVE_LIBSYSTEMD_LOGIN)
+-AC_SUBST(LIBSYSTEMD_LOGIN_CFLAGS)
+-AC_SUBST(LIBSYSTEMD_LOGIN_LIBS)
++  PKG_CHECK_MODULES(BLOCKDEV, [blockdev >= 2.19])
++  AC_SUBST(BLOCKDEV_CFLAGS)
++  AC_SUBST(BLOCKDEV_LIBS)
+ 
+-PKG_CHECK_MODULES(LIBELOGIND, [libelogind >= 219],
+-                  [have_libelogind=yes],
+-                  [have_libelogins=no])
+-AM_CONDITIONAL(HAVE_LIBELOGIND, test x$have_libelogind = xyes)
+-if test "x$have_libelogind" = "xyes"; then
+-  AC_DEFINE([HAVE_LIBELOGIND], 1, [Define to 1 if libelogind is available])
++  PKG_CHECK_MODULES(LIBATASMART, [libatasmart >= 0.17])
++  AC_SUBST(LIBATASMART_CFLAGS)
++  AC_SUBST(LIBATASMART_LIBS)
++
++  PKG_CHECK_MODULES(LIBMOUNT, [mount >= 2.30],
++                    [have_libmount=yes],
++                    [have_libmount=no])
++  if test "x$have_libmount" = "xyes"; then
++    AC_DEFINE([HAVE_LIBMOUNT], 1, [Define to 1 if libmount >= 2.30 is available])
++  fi
++  AC_SUBST(HAVE_LIBMOUNT)
++  AC_SUBST(LIBMOUNT_CFLAGS)
++  AC_SUBST(LIBMOUNT_LIBS)
++
++  PKG_CHECK_MODULES(LIBSYSTEMD_LOGIN, [libsystemd >= 209], [have_libsystemd_login=yes],
++                    [PKG_CHECK_MODULES(LIBSYSTEMD_LOGIN, [libsystemd-login >= 44 libsystemd-daemon],
++                    [have_libsystemd_login=yes],
++                    [have_libsystemd_login=no])])
++  if test "x$have_libsystemd_login" = "xyes"; then
++    AC_DEFINE([HAVE_LIBSYSTEMD_LOGIN], 1, [Define to 1 if libsystemd-login is available])
++  fi
++  AC_SUBST(HAVE_LIBSYSTEMD_LOGIN)
++  AC_SUBST(LIBSYSTEMD_LOGIN_CFLAGS)
++  AC_SUBST(LIBSYSTEMD_LOGIN_LIBS)
++
++  PKG_CHECK_MODULES(LIBELOGIND, [libelogind >= 219],
++                    [have_libelogind=yes],
++                    [have_libelogind=no])
++  if test "x$have_libelogind" = "xyes"; then
++    AC_DEFINE([HAVE_LIBELOGIND], 1, [Define to 1 if libelogind is available])
++  fi
++  AC_SUBST(HAVE_LIBELOGIND)
++  AC_SUBST(LIBELOGIND_CFLAGS)
++  AC_SUBST(LIBELOGIND_LIBS)
++else
++  have_libmount=no
++  have_libsystemd_login=no
++  have_libelogind=no
+ fi
+-AC_SUBST(HAVE_LIBELOGIND)
+-AC_SUBST(LIBELOGIND_CFLAGS)
+-AC_SUBST(LIBELOGIND_LIBS)
++AM_CONDITIONAL(HAVE_LIBMOUNT, test x$have_libmount = xyes)
++AM_CONDITIONAL(HAVE_LIBSYSTEMD_LOGIN, test x$have_libsystemd_login = xyes)
++AM_CONDITIONAL(HAVE_LIBELOGIND, test x$have_libelogind = xyes)
+ 
+ # udevdir
+ AC_ARG_WITH([udevdir],
+@@ -537,124 +553,126 @@ if test "x$enable_vdo" = "xyes" \
+ fi
+ AM_CONDITIONAL(HAVE_VDO, [test "x$have_vdo" = "xyes"])
+ 
+-# libblockdev part
+-SAVE_CFLAGS=$CFLAGS
+-SAVE_LDFLAGS=$LDFLAGS
++if test "x$enable_daemon" = "xyes"; then
++  # libblockdev part
++  SAVE_CFLAGS=$CFLAGS
++  SAVE_LDFLAGS=$LDFLAGS
+ 
+-CFLAGS="$GLIB_CFLAGS"
+-LDFLAGS="$GLIB_LIBS"
+-AC_MSG_CHECKING([libblockdev-part presence])
+-AC_TRY_COMPILE([#include <blockdev/part.h>], [],
+-               [AC_MSG_RESULT([yes])
+-               have_part=yes],
+-               [AC_MSG_RESULT([no])
+-               have_part=no])
++  CFLAGS="$GLIB_CFLAGS"
++  LDFLAGS="$GLIB_LIBS"
++  AC_MSG_CHECKING([libblockdev-part presence])
++  AC_TRY_COMPILE([#include <blockdev/part.h>], [],
++                 [AC_MSG_RESULT([yes])
++                 have_part=yes],
++                 [AC_MSG_RESULT([no])
++                 have_part=no])
+ 
+-CFLAGS=$SAVE_CFLAGS
+-LDFLAGS=$SAVE_LDFLAGS
++  CFLAGS=$SAVE_CFLAGS
++  LDFLAGS=$SAVE_LDFLAGS
+ 
+-if test "x$have_part" = "xno"; then
+-  AC_MSG_ERROR([BlockDev part support requested but header or library not found])
+-fi
++  if test "x$have_part" = "xno"; then
++    AC_MSG_ERROR([BlockDev part support requested but header or library not found])
++  fi
+ 
+-# libblockdev loop
+-SAVE_CFLAGS=$CFLAGS
+-SAVE_LDFLAGS=$LDFLAGS
++  # libblockdev loop
++  SAVE_CFLAGS=$CFLAGS
++  SAVE_LDFLAGS=$LDFLAGS
+ 
+-CFLAGS="$GLIB_CFLAGS"
+-LDFLAGS="$GLIB_LIBS"
+-AC_MSG_CHECKING([libblockdev-loop presence])
+-AC_TRY_COMPILE([#include <blockdev/loop.h>], [],
+-               [AC_MSG_RESULT([yes])
+-               have_loop=yes],
+-               [AC_MSG_RESULT([no])
+-               have_loop=no])
++  CFLAGS="$GLIB_CFLAGS"
++  LDFLAGS="$GLIB_LIBS"
++  AC_MSG_CHECKING([libblockdev-loop presence])
++  AC_TRY_COMPILE([#include <blockdev/loop.h>], [],
++                 [AC_MSG_RESULT([yes])
++                 have_loop=yes],
++                 [AC_MSG_RESULT([no])
++                 have_loop=no])
+ 
+-CFLAGS=$SAVE_CFLAGS
+-LDFLAGS=$SAVE_LDFLAGS
++  CFLAGS=$SAVE_CFLAGS
++  LDFLAGS=$SAVE_LDFLAGS
+ 
+-if test "x$have_loop" = "xno"; then
+-  AC_MSG_ERROR([Loop support requested but header or library not found])
+-fi
++  if test "x$have_loop" = "xno"; then
++    AC_MSG_ERROR([Loop support requested but header or library not found])
++  fi
+ 
+-# libblockdev swap
+-SAVE_CFLAGS=$CFLAGS
+-SAVE_LDFLAGS=$LDFLAGS
++  # libblockdev swap
++  SAVE_CFLAGS=$CFLAGS
++  SAVE_LDFLAGS=$LDFLAGS
+ 
+-CFLAGS="$GLIB_CFLAGS"
+-LDFLAGS="$GLIB_LIBS"
+-AC_MSG_CHECKING([libblockdev-swap presence])
+-AC_TRY_COMPILE([#include <blockdev/swap.h>], [],
+-               [AC_MSG_RESULT([yes])
+-               have_swap=yes],
+-               [AC_MSG_RESULT([no])
+-               have_swap=no])
++  CFLAGS="$GLIB_CFLAGS"
++  LDFLAGS="$GLIB_LIBS"
++  AC_MSG_CHECKING([libblockdev-swap presence])
++  AC_TRY_COMPILE([#include <blockdev/swap.h>], [],
++                 [AC_MSG_RESULT([yes])
++                 have_swap=yes],
++                 [AC_MSG_RESULT([no])
++                 have_swap=no])
+ 
+-CFLAGS=$SAVE_CFLAGS
+-LDFLAGS=$SAVE_LDFLAGS
++  CFLAGS=$SAVE_CFLAGS
++  LDFLAGS=$SAVE_LDFLAGS
+ 
+-if test "x$have_swap" = "xno"; then
+-  AC_MSG_ERROR([SWAP support requested but header or library not found])
+-fi
++  if test "x$have_swap" = "xno"; then
++    AC_MSG_ERROR([SWAP support requested but header or library not found])
++  fi
+ 
+-# libblockdev mdraid
+-SAVE_CFLAGS=$CFLAGS
+-SAVE_LDFLAGS=$LDFLAGS
++  # libblockdev mdraid
++  SAVE_CFLAGS=$CFLAGS
++  SAVE_LDFLAGS=$LDFLAGS
+ 
+-CFLAGS="$GLIB_CFLAGS"
+-LDFLAGS="$GLIB_LIBS"
+-AC_MSG_CHECKING([libblockdev-mdraid presence])
+-AC_TRY_COMPILE([#include <blockdev/mdraid.h>], [],
+-               [AC_MSG_RESULT([yes])
+-               have_mdraid=yes],
+-               [AC_MSG_RESULT([no])
+-               have_mdraid=no])
++  CFLAGS="$GLIB_CFLAGS"
++  LDFLAGS="$GLIB_LIBS"
++  AC_MSG_CHECKING([libblockdev-mdraid presence])
++  AC_TRY_COMPILE([#include <blockdev/mdraid.h>], [],
++                 [AC_MSG_RESULT([yes])
++                 have_mdraid=yes],
++                 [AC_MSG_RESULT([no])
++                 have_mdraid=no])
+ 
+-CFLAGS=$SAVE_CFLAGS
+-LDFLAGS=$SAVE_LDFLAGS
++  CFLAGS=$SAVE_CFLAGS
++  LDFLAGS=$SAVE_LDFLAGS
+ 
+-if test "x$have_mdraid" = "xno"; then
+-  AC_MSG_ERROR([BLOCKDEV MDRAID support requested but header or library not found])
+-fi
++  if test "x$have_mdraid" = "xno"; then
++    AC_MSG_ERROR([BLOCKDEV MDRAID support requested but header or library not found])
++  fi
+ 
+-# libblockdev fs
+-SAVE_CFLAGS=$CFLAGS
+-SAVE_LDFLAGS=$LDFLAGS
++  # libblockdev fs
++  SAVE_CFLAGS=$CFLAGS
++  SAVE_LDFLAGS=$LDFLAGS
+ 
+-CFLAGS="$GLIB_CFLAGS"
+-LDFLAGS="$GLIB_LIBS"
+-AC_MSG_CHECKING([libblockdev-fs presence])
+-AC_TRY_COMPILE([#include <blockdev/fs.h>], [],
+-               [AC_MSG_RESULT([yes])
+-               have_fs=yes],
+-               [AC_MSG_RESULT([no])
+-               have_fs=no])
++  CFLAGS="$GLIB_CFLAGS"
++  LDFLAGS="$GLIB_LIBS"
++  AC_MSG_CHECKING([libblockdev-fs presence])
++  AC_TRY_COMPILE([#include <blockdev/fs.h>], [],
++                 [AC_MSG_RESULT([yes])
++                 have_fs=yes],
++                 [AC_MSG_RESULT([no])
++                 have_fs=no])
+ 
+-CFLAGS=$SAVE_CFLAGS
+-LDFLAGS=$SAVE_LDFLAGS
++  CFLAGS=$SAVE_CFLAGS
++  LDFLAGS=$SAVE_LDFLAGS
+ 
+-if test "x$have_fs" = "xno"; then
+-  AC_MSG_ERROR([BLOCKDEV FS support requested but header or library not found])
+-fi
++  if test "x$have_fs" = "xno"; then
++    AC_MSG_ERROR([BLOCKDEV FS support requested but header or library not found])
++  fi
+ 
+-# libblockdev crypto
+-SAVE_CFLAGS=$CFLAGS
+-SAVE_LDFLAGS=$LDFLAGS
++  # libblockdev crypto
++  SAVE_CFLAGS=$CFLAGS
++  SAVE_LDFLAGS=$LDFLAGS
+ 
+-CFLAGS="$GLIB_CFLAGS"
+-LDFLAGS="$GLIB_LIBS"
+-AC_MSG_CHECKING([libblockdev-crypto presence])
+-AC_TRY_COMPILE([#include <blockdev/crypto.h>], [],
+-               [AC_MSG_RESULT([yes])
+-               have_crypto=yes],
+-               [AC_MSG_RESULT([no])
+-               have_crypto=no])
++  CFLAGS="$GLIB_CFLAGS"
++  LDFLAGS="$GLIB_LIBS"
++  AC_MSG_CHECKING([libblockdev-crypto presence])
++  AC_TRY_COMPILE([#include <blockdev/crypto.h>], [],
++                 [AC_MSG_RESULT([yes])
++                 have_crypto=yes],
++                 [AC_MSG_RESULT([no])
++                 have_crypto=no])
+ 
+-CFLAGS=$SAVE_CFLAGS
+-LDFLAGS=$SAVE_LDFLAGS
++  CFLAGS=$SAVE_CFLAGS
++  LDFLAGS=$SAVE_LDFLAGS
+ 
+-if test "x$have_crypto" = "xno"; then
+-  AC_MSG_ERROR([BLOCKDEV CRYPTO support requested but header or library not found])
++  if test "x$have_crypto" = "xno"; then
++    AC_MSG_ERROR([BLOCKDEV CRYPTO support requested but header or library not found])
++  fi
+ fi
+ 
+ 
+@@ -721,6 +739,10 @@ doc/man/udisksctl.xml
+ doc/man/umount.udisks2.xml
+ doc/man/udisks2.conf.5.xml.in
+ doc/man/udisks2_lsm.conf.5.xml.in
++doc/udisks2-docs.xml.daemon.man
++doc/udisks2-docs.xml.daemon.part
++doc/udisks2-sections.txt.daemon.sections
++doc/udisks2.types.daemon
+ doc/udisks2-docs.xml.iscsi.dbus
+ doc/udisks2-docs.xml.iscsi.generated
+ doc/udisks2-sections.txt.iscsi.sections
+@@ -787,6 +809,7 @@ echo "
+         Building api docs:          ${enable_gtk_doc}
+         Building man pages:         ${enable_man}
+ 
++        Enable daemon:              ${enable_daemon}
+         Enable modules:             ${enable_modules_info}
+ 
+         BTRFS module:               ${have_btrfs}

Added: head/sysutils/libudisks/files/patch-data_Makefile.am
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sysutils/libudisks/files/patch-data_Makefile.am	Sat Oct 12 18:55:49 2019	(r514350)
@@ -0,0 +1,18 @@
+--- data/Makefile.am.orig	2019-07-22 16:24:44 UTC
++++ data/Makefile.am
+@@ -1,6 +1,7 @@
+ 
+ NULL =
+ 
++if ENABLE_DAEMON
+ SUBDIRS = tmpfiles.d
+ 
+ dbusservicedir       = $(datadir)/dbus-1/system-services
+@@ -36,6 +37,7 @@ polkit_DATA      = $(polkit_in_files:.policy.in=.polic
+ 
+ $(polkit_DATA): $(polkit_in_files)
+ 	$(AM_V_GEN) $(MSGFMT) --xml --template $< -d $(top_srcdir)/po -o $@
++endif
+ 
+ completionsdir = $(datadir)/bash-completion/completions
+ completions_DATA =                                                             \

Added: head/sysutils/libudisks/files/patch-doc_Makefile.am
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sysutils/libudisks/files/patch-doc_Makefile.am	Sat Oct 12 18:55:49 2019	(r514350)
@@ -0,0 +1,213 @@
+--- doc/Makefile.am.orig	2019-07-22 16:24:44 UTC
++++ doc/Makefile.am
+@@ -21,17 +21,29 @@ UDISKS_TYPES=$(DOC_MODULE).types
+ UDISKS_SECTIONS=$(DOC_MODULE)-sections.txt
+ 
+ # The directory containing the source code. Relative to $(srcdir)
+-DOC_SOURCE_DIR = $(top_srcdir)
++DOC_SOURCE_DIR = $(top_srcdir) $(top_builddir)
+ 
+ HFILE_GLOB =                                                                   \
+ 	$(top_srcdir)/udisks/*.h                                               \
+-	$(top_srcdir)/src/*.h                                                  \
+-	$(top_srcdir)/modules/*.h
++	$(top_builddir)/udisks/*.h                                             \
++	$(NULL)
+ 
+ CFILE_GLOB =                                                                   \
+ 	$(top_srcdir)/udisks/*.c                                               \
++	$(top_builddir)/udisks/*.c                                             \
++	$(NULL)
++
++if ENABLE_DAEMON
++HFILE_GLOB +=                                                                  \
++	$(top_srcdir)/src/*.h                                                  \
++	$(top_srcdir)/modules/*.h                                              \
++	$(NULL)
++
++CFILE_GLOB +=                                                                  \
+ 	$(top_srcdir)/src/*.c                                                  \
+-	$(top_srcdir)/modules/*.c
++	$(top_srcdir)/modules/*.c                                              \
++	$(NULL)
++endif # ENABLE_DAEMON
+ 
+ # Headers to ignore
+ IGNORE_HFILES=                                                                 \
+@@ -52,8 +64,13 @@ GTKDOC_LIBS =                                         
+ 	$(GLIB_LIBS)                                                           \
+ 	$(GIO_LIBS)                                                            \
+ 	$(top_builddir)/udisks/libudisks2.la                                   \
++	$(NULL)
++
++if ENABLE_DAEMON
++GTKDOC_LIBS +=                                                                 \
+ 	$(top_builddir)/src/libudisks-daemon.la                                \
+ 	$(NULL)
++endif # ENABLE_DAEMON
+ 
+ # Extra options to supply to gtkdoc-mkdb
+ MKDB_OPTIONS = --output-format=xml --sgml-mode --name-space=udisks
+@@ -73,7 +90,9 @@ extra_files =                                         
+ 
+ # ------------------------------------------------------------------------------
+ 
++if ENABLE_GTK_DOC
+ all-local: generate-main-sgml-file
++endif
+ 
+ # New gtk-doc 2.16 for some reason automatically creates a no-op
+ # "$(DOC_MAIN_SGML_FILE)" make target that overrides our target
+@@ -85,61 +104,69 @@ generate-main-sgml-file: $(DOC_MAIN_SGML_FILE).in $(UD
+ 	cp $(DOC_MAIN_SGML_FILE).in $(builddir)/$(DOC_MAIN_SGML_FILE) && \
+ 	cp $(UDISKS_SECTIONS).in $(builddir)/$(UDISKS_SECTIONS) && \
+ 	cp $(UDISKS_TYPES).in $(builddir)/$(UDISKS_TYPES)
++if ENABLE_DAEMON
++	$(AM_V_at) $(SED) -f $(DOC_DIR)/$(DOC_MAIN_SGML_FILE).daemon.sed $(builddir)/$(DOC_MAIN_SGML_FILE) > $(builddir)/$(DOC_MAIN_SGML_FILE).tmp && mv -f $(builddir)/$(DOC_MAIN_SGML_FILE).tmp $(builddir)/$(DOC_MAIN_SGML_FILE)
++	$(AM_V_at) $(SED) -f $(DOC_DIR)/$(UDISKS_SECTIONS).daemon.sed $(builddir)/$(UDISKS_SECTIONS) > $(builddir)/$(UDISKS_SECTIONS).tmp && mv -f $(builddir)/$(UDISKS_SECTIONS).tmp $(builddir)/$(UDISKS_SECTIONS)
++	$(AM_V_at) $(SED) -f $(DOC_DIR)/$(UDISKS_TYPES).daemon.sed $(builddir)/$(UDISKS_TYPES) > $(builddir)/$(UDISKS_TYPES).tmp && mv -f $(builddir)/$(UDISKS_TYPES).tmp $(builddir)/$(UDISKS_TYPES)
++else
++	$(AM_V_at) $(SED) "/<\!-- DAEMON_GENERATED_SECTIONS -->/d" $(builddir)/$(UDISKS_SECTIONS) > $(builddir)/$(UDISKS_SECTIONS).tmp && mv -f $(builddir)/$(UDISKS_SECTIONS).tmp $(builddir)/$(UDISKS_SECTIONS)
++	$(AM_V_at) $(SED) "/\# DAEMON_TYPES/d" $(builddir)/$(UDISKS_TYPES) > $(builddir)/$(UDISKS_TYPES).tmp && mv -f $(builddir)/$(UDISKS_TYPES).tmp $(builddir)/$(UDISKS_TYPES)
++endif # ENABLE_DAEMON
+ if HAVE_LVM2
+-	$(AM_V_at) $(SED) -i -f $(DOC_DIR)/$(DOC_MAIN_SGML_FILE).lvm2.sed $(builddir)/$(DOC_MAIN_SGML_FILE)
+-	$(AM_V_at) $(SED) -i -f $(DOC_DIR)/$(UDISKS_SECTIONS).lvm2.sed $(builddir)/$(UDISKS_SECTIONS)
+-	$(AM_V_at) $(SED) -i -f $(DOC_DIR)/$(UDISKS_TYPES).lvm2.sed $(builddir)/$(UDISKS_TYPES)
++	$(AM_V_at) $(SED) -f $(DOC_DIR)/$(DOC_MAIN_SGML_FILE).lvm2.sed $(builddir)/$(DOC_MAIN_SGML_FILE) > $(builddir)/$(DOC_MAIN_SGML_FILE).tmp && mv -f $(builddir)/$(DOC_MAIN_SGML_FILE).tmp $(builddir)/$(DOC_MAIN_SGML_FILE)
++	$(AM_V_at) $(SED) -f $(DOC_DIR)/$(UDISKS_SECTIONS).lvm2.sed $(builddir)/$(UDISKS_SECTIONS) > $(builddir)/$(UDISKS_SECTIONS).tmp && mv -f $(builddir)/$(UDISKS_SECTIONS).tmp $(builddir)/$(UDISKS_SECTIONS)
++	$(AM_V_at) $(SED) -f $(DOC_DIR)/$(UDISKS_TYPES).lvm2.sed $(builddir)/$(UDISKS_TYPES) > $(builddir)/$(UDISKS_TYPES).tmp && mv -f $(builddir)/$(UDISKS_TYPES).tmp $(builddir)/$(UDISKS_TYPES)
+ else
+-	$(AM_V_at) $(SED) -i "/<\!-- LVM2_GENERATED_SECTIONS -->/d" $(builddir)/$(UDISKS_SECTIONS)
+-	$(AM_V_at) $(SED) -i "/\# LVM2_TYPES/d" $(builddir)/$(UDISKS_TYPES)
++	$(AM_V_at) $(SED) "/<\!-- LVM2_GENERATED_SECTIONS -->/d" $(builddir)/$(UDISKS_SECTIONS) > $(builddir)/$(UDISKS_SECTIONS).tmp && mv -f $(builddir)/$(UDISKS_SECTIONS).tmp $(builddir)/$(UDISKS_SECTIONS)
++	$(AM_V_at) $(SED) "/\# LVM2_TYPES/d" $(builddir)/$(UDISKS_TYPES) > $(builddir)/$(UDISKS_TYPES).tmp && mv -f $(builddir)/$(UDISKS_TYPES).tmp $(builddir)/$(UDISKS_TYPES)
+ endif # HAVE_LVM2
+ if HAVE_LSM
+-	$(AM_V_at) $(SED) -i -f $(DOC_DIR)/$(DOC_MAIN_SGML_FILE).lsm.sed $(builddir)/$(DOC_MAIN_SGML_FILE)
+-	$(AM_V_at) $(SED) -i -f $(DOC_DIR)/$(UDISKS_SECTIONS).lsm.sed $(builddir)/$(UDISKS_SECTIONS)
+-	$(AM_V_at) $(SED) -i -f $(DOC_DIR)/$(UDISKS_TYPES).lsm.sed $(builddir)/$(UDISKS_TYPES)
++	$(AM_V_at) $(SED) -f $(DOC_DIR)/$(DOC_MAIN_SGML_FILE).lsm.sed $(builddir)/$(DOC_MAIN_SGML_FILE) > $(builddir)/$(DOC_MAIN_SGML_FILE).tmp && mv -f $(builddir)/$(DOC_MAIN_SGML_FILE).tmp $(builddir)/$(DOC_MAIN_SGML_FILE)
++	$(AM_V_at) $(SED) -f $(DOC_DIR)/$(UDISKS_SECTIONS).lsm.sed $(builddir)/$(UDISKS_SECTIONS) > $(builddir)/$(UDISKS_SECTIONS).tmp && mv -f $(builddir)/$(UDISKS_SECTIONS).tmp $(builddir)/$(UDISKS_SECTIONS)
++	$(AM_V_at) $(SED) -f $(DOC_DIR)/$(UDISKS_TYPES).lsm.sed $(builddir)/$(UDISKS_TYPES) > $(builddir)/$(UDISKS_TYPES).tmp && mv -f $(builddir)/$(UDISKS_TYPES).tmp $(builddir)/$(UDISKS_TYPES)
+ else
+-	$(AM_V_at) $(SED) -i "/<\!-- LSM_GENERATED_SECTIONS -->/d" $(builddir)/$(UDISKS_SECTIONS)
+-	$(AM_V_at) $(SED) -i "/\# LSM_TYPES/d" $(builddir)/$(UDISKS_TYPES)
++	$(AM_V_at) $(SED) "/<\!-- LSM_GENERATED_SECTIONS -->/d" $(builddir)/$(UDISKS_SECTIONS) > $(builddir)/$(UDISKS_SECTIONS).tmp && mv -f $(builddir)/$(UDISKS_SECTIONS).tmp $(builddir)/$(UDISKS_SECTIONS)
++	$(AM_V_at) $(SED) "/\# LSM_TYPES/d" $(builddir)/$(UDISKS_TYPES) > $(builddir)/$(UDISKS_TYPES).tmp && mv -f $(builddir)/$(UDISKS_TYPES).tmp $(builddir)/$(UDISKS_TYPES)
+ endif # HAVE_LSM
+ if HAVE_ISCSI
+-	$(AM_V_at) $(SED) -i -f $(DOC_DIR)/$(DOC_MAIN_SGML_FILE).iscsi.sed $(builddir)/$(DOC_MAIN_SGML_FILE)
+-	$(AM_V_at) $(SED) -i -f $(DOC_DIR)/$(UDISKS_SECTIONS).iscsi.sed $(builddir)/$(UDISKS_SECTIONS)
+-	$(AM_V_at) $(SED) -i -f $(DOC_DIR)/$(UDISKS_TYPES).iscsi.sed $(builddir)/$(UDISKS_TYPES)
++	$(AM_V_at) $(SED) -f $(DOC_DIR)/$(DOC_MAIN_SGML_FILE).iscsi.sed $(builddir)/$(DOC_MAIN_SGML_FILE) > $(builddir)/$(DOC_MAIN_SGML_FILE).tmp && mv -f $(builddir)/$(DOC_MAIN_SGML_FILE).tmp $(builddir)/$(DOC_MAIN_SGML_FILE)
++	$(AM_V_at) $(SED) -f $(DOC_DIR)/$(UDISKS_SECTIONS).iscsi.sed $(builddir)/$(UDISKS_SECTIONS) > $(builddir)/$(UDISKS_SECTIONS).tmp && mv -f $(builddir)/$(UDISKS_SECTIONS).tmp $(builddir)/$(UDISKS_SECTIONS)
++	$(AM_V_at) $(SED) -f $(DOC_DIR)/$(UDISKS_TYPES).iscsi.sed $(builddir)/$(UDISKS_TYPES) > $(builddir)/$(UDISKS_TYPES).tmp && mv -f $(builddir)/$(UDISKS_TYPES).tmp $(builddir)/$(UDISKS_TYPES)
+ else
+-	$(AM_V_at) $(SED) -i "/<\!-- ISCSI_GENERATED_SECTIONS -->/d" $(builddir)/$(UDISKS_SECTIONS)
+-	$(AM_V_at) $(SED) -i "/\# ISCSI_TYPES/d" $(builddir)/$(UDISKS_TYPES)
++	$(AM_V_at) $(SED) "/<\!-- ISCSI_GENERATED_SECTIONS -->/d" $(builddir)/$(UDISKS_SECTIONS) > $(builddir)/$(UDISKS_SECTIONS).tmp && mv -f $(builddir)/$(UDISKS_SECTIONS).tmp $(builddir)/$(UDISKS_SECTIONS)
++	$(AM_V_at) $(SED) "/\# ISCSI_TYPES/d" $(builddir)/$(UDISKS_TYPES) > $(builddir)/$(UDISKS_TYPES).tmp && mv -f $(builddir)/$(UDISKS_TYPES).tmp $(builddir)/$(UDISKS_TYPES)
+ endif # HAVE_ISCSI
+ if HAVE_BTRFS
+-	$(AM_V_at) $(SED) -i -f $(DOC_DIR)/$(DOC_MAIN_SGML_FILE).btrfs.sed $(builddir)/$(DOC_MAIN_SGML_FILE)
+-	$(AM_V_at) $(SED) -i -f $(DOC_DIR)/$(UDISKS_SECTIONS).btrfs.sed $(builddir)/$(UDISKS_SECTIONS)
+-	$(AM_V_at) $(SED) -i -f $(DOC_DIR)/$(UDISKS_TYPES).btrfs.sed $(builddir)/$(UDISKS_TYPES)
++	$(AM_V_at) $(SED) -f $(DOC_DIR)/$(DOC_MAIN_SGML_FILE).btrfs.sed $(builddir)/$(DOC_MAIN_SGML_FILE) > $(builddir)/$(DOC_MAIN_SGML_FILE).tmp && mv -f $(builddir)/$(DOC_MAIN_SGML_FILE).tmp $(builddir)/$(DOC_MAIN_SGML_FILE)
++	$(AM_V_at) $(SED) -f $(DOC_DIR)/$(UDISKS_SECTIONS).btrfs.sed $(builddir)/$(UDISKS_SECTIONS) > $(builddir)/$(UDISKS_SECTIONS).tmp && mv -f $(builddir)/$(UDISKS_SECTIONS).tmp $(builddir)/$(UDISKS_SECTIONS)
++	$(AM_V_at) $(SED) -f $(DOC_DIR)/$(UDISKS_TYPES).btrfs.sed $(builddir)/$(UDISKS_TYPES) > $(builddir)/$(UDISKS_TYPES).tmp && mv -f $(builddir)/$(UDISKS_TYPES).tmp $(builddir)/$(UDISKS_TYPES)
+ else
+-	$(AM_V_at) $(SED) -i "/<\!-- BTRFS_GENERATED_SECTIONS -->/d" $(builddir)/$(UDISKS_SECTIONS)
+-	$(AM_V_at) $(SED) -i "/\# BTRFS_TYPES/d" $(builddir)/$(UDISKS_TYPES)
++	$(AM_V_at) $(SED) "/<\!-- BTRFS_GENERATED_SECTIONS -->/d" $(builddir)/$(UDISKS_SECTIONS) > $(builddir)/$(UDISKS_SECTIONS).tmp && mv -f $(builddir)/$(UDISKS_SECTIONS).tmp $(builddir)/$(UDISKS_SECTIONS)
++	$(AM_V_at) $(SED) "/\# BTRFS_TYPES/d" $(builddir)/$(UDISKS_TYPES) > $(builddir)/$(UDISKS_TYPES).tmp && mv -f $(builddir)/$(UDISKS_TYPES).tmp $(builddir)/$(UDISKS_TYPES)
+ endif # HAVE_BTRFS
+ if HAVE_ZRAM
+-	$(AM_V_at) $(SED) -i -f $(DOC_DIR)/$(DOC_MAIN_SGML_FILE).zram.sed $(builddir)/$(DOC_MAIN_SGML_FILE)
+-	$(AM_V_at) $(SED) -i -f $(DOC_DIR)/$(UDISKS_SECTIONS).zram.sed $(builddir)/$(UDISKS_SECTIONS)
+-	$(AM_V_at) $(SED) -i -f $(DOC_DIR)/$(UDISKS_TYPES).zram.sed $(builddir)/$(UDISKS_TYPES)
++	$(AM_V_at) $(SED) -f $(DOC_DIR)/$(DOC_MAIN_SGML_FILE).zram.sed $(builddir)/$(DOC_MAIN_SGML_FILE) > $(builddir)/$(DOC_MAIN_SGML_FILE).tmp && mv -f $(builddir)/$(DOC_MAIN_SGML_FILE).tmp $(builddir)/$(DOC_MAIN_SGML_FILE)
++	$(AM_V_at) $(SED) -f $(DOC_DIR)/$(UDISKS_SECTIONS).zram.sed $(builddir)/$(UDISKS_SECTIONS) > $(builddir)/$(UDISKS_SECTIONS).tmp && mv -f $(builddir)/$(UDISKS_SECTIONS).tmp $(builddir)/$(UDISKS_SECTIONS)
++	$(AM_V_at) $(SED) -f $(DOC_DIR)/$(UDISKS_TYPES).zram.sed $(builddir)/$(UDISKS_TYPES) > $(builddir)/$(UDISKS_TYPES).tmp && mv -f $(builddir)/$(UDISKS_TYPES).tmp $(builddir)/$(UDISKS_TYPES)
+ else
+-	$(AM_V_at) $(SED) -i "/<\!-- ZRAM_GENERATED_SECTIONS -->/d" $(builddir)/$(UDISKS_SECTIONS)
+-	$(AM_V_at) $(SED) -i "/\# ZRAM_TYPES/d" $(builddir)/$(UDISKS_TYPES)
++	$(AM_V_at) $(SED) "/<\!-- ZRAM_GENERATED_SECTIONS -->/d" $(builddir)/$(UDISKS_SECTIONS) > $(builddir)/$(UDISKS_SECTIONS).tmp && mv -f $(builddir)/$(UDISKS_SECTIONS).tmp $(builddir)/$(UDISKS_SECTIONS)
++	$(AM_V_at) $(SED) "/\# ZRAM_TYPES/d" $(builddir)/$(UDISKS_TYPES) > $(builddir)/$(UDISKS_TYPES).tmp && mv -f $(builddir)/$(UDISKS_TYPES).tmp $(builddir)/$(UDISKS_TYPES)
+ endif # HAVE_ZRAM
+ if HAVE_BCACHE
+-	$(AM_V_at) $(SED) -i -f $(DOC_DIR)/$(DOC_MAIN_SGML_FILE).bcache.sed $(builddir)/$(DOC_MAIN_SGML_FILE)
+-	$(AM_V_at) $(SED) -i -f $(DOC_DIR)/$(UDISKS_SECTIONS).bcache.sed $(builddir)/$(UDISKS_SECTIONS)
+-	$(AM_V_at) $(SED) -i -f $(DOC_DIR)/$(UDISKS_TYPES).bcache.sed $(builddir)/$(UDISKS_TYPES)
++	$(AM_V_at) $(SED) -f $(DOC_DIR)/$(DOC_MAIN_SGML_FILE).bcache.sed $(builddir)/$(DOC_MAIN_SGML_FILE) > $(builddir)/$(DOC_MAIN_SGML_FILE).tmp && mv -f $(builddir)/$(DOC_MAIN_SGML_FILE).tmp $(builddir)/$(DOC_MAIN_SGML_FILE)
++	$(AM_V_at) $(SED) -f $(DOC_DIR)/$(UDISKS_SECTIONS).bcache.sed $(builddir)/$(UDISKS_SECTIONS) > $(builddir)/$(UDISKS_SECTIONS).tmp && mv -f $(builddir)/$(UDISKS_SECTIONS).tmp $(builddir)/$(UDISKS_SECTIONS)
++	$(AM_V_at) $(SED) -f $(DOC_DIR)/$(UDISKS_TYPES).bcache.sed $(builddir)/$(UDISKS_TYPES) > $(builddir)/$(UDISKS_TYPES).tmp && mv -f $(builddir)/$(UDISKS_TYPES).tmp $(builddir)/$(UDISKS_TYPES)
+ else
+-	$(AM_V_at) $(SED) -i "/<\!-- BCACHE_GENERATED_SECTIONS -->/d" $(builddir)/$(UDISKS_SECTIONS)
+-	$(AM_V_at) $(SED) -i "/\# BCACHE_TYPES/d" $(builddir)/$(UDISKS_TYPES)
++	$(AM_V_at) $(SED) "/<\!-- BCACHE_GENERATED_SECTIONS -->/d" $(builddir)/$(UDISKS_SECTIONS) > $(builddir)/$(UDISKS_SECTIONS).tmp && mv -f $(builddir)/$(UDISKS_SECTIONS).tmp $(builddir)/$(UDISKS_SECTIONS)
++	$(AM_V_at) $(SED) "/\# BCACHE_TYPES/d" $(builddir)/$(UDISKS_TYPES) > $(builddir)/$(UDISKS_TYPES).tmp && mv -f $(builddir)/$(UDISKS_TYPES).tmp $(builddir)/$(UDISKS_TYPES)
+ endif # HAVE_BCACHE
+ if HAVE_VDO
+-	$(AM_V_at) $(SED) -i -f $(DOC_DIR)/$(DOC_MAIN_SGML_FILE).vdo.sed $(builddir)/$(DOC_MAIN_SGML_FILE)
+-	$(AM_V_at) $(SED) -i -f $(DOC_DIR)/$(UDISKS_SECTIONS).vdo.sed $(builddir)/$(UDISKS_SECTIONS)
+-	$(AM_V_at) $(SED) -i -f $(DOC_DIR)/$(UDISKS_TYPES).vdo.sed $(builddir)/$(UDISKS_TYPES)
++	$(AM_V_at) $(SED) -f $(DOC_DIR)/$(DOC_MAIN_SGML_FILE).vdo.sed $(builddir)/$(DOC_MAIN_SGML_FILE) > $(builddir)/$(DOC_MAIN_SGML_FILE).tmp && mv -f $(builddir)/$(DOC_MAIN_SGML_FILE).tmp $(builddir)/$(DOC_MAIN_SGML_FILE)
++	$(AM_V_at) $(SED) -f $(DOC_DIR)/$(UDISKS_SECTIONS).vdo.sed $(builddir)/$(UDISKS_SECTIONS) > $(builddir)/$(UDISKS_SECTIONS).tmp && mv -f $(builddir)/$(UDISKS_SECTIONS).tmp $(builddir)/$(UDISKS_SECTIONS)
++	$(AM_V_at) $(SED) -f $(DOC_DIR)/$(UDISKS_TYPES).vdo.sed $(builddir)/$(UDISKS_TYPES) > $(builddir)/$(UDISKS_TYPES).tmp && mv -f $(builddir)/$(UDISKS_TYPES).tmp $(builddir)/$(UDISKS_TYPES)
+ else
+-	$(AM_V_at) $(SED) -i "/<\!-- VDO_GENERATED_SECTIONS -->/d" $(builddir)/$(UDISKS_SECTIONS)
+-	$(AM_V_at) $(SED) -i "/\# VDO_TYPES/d" $(builddir)/$(UDISKS_TYPES)
++	$(AM_V_at) $(SED) "/<\!-- VDO_GENERATED_SECTIONS -->/d" $(builddir)/$(UDISKS_SECTIONS) > $(builddir)/$(UDISKS_SECTIONS).tmp && mv -f $(builddir)/$(UDISKS_SECTIONS).tmp $(builddir)/$(UDISKS_SECTIONS)
++	$(AM_V_at) $(SED) "/\# VDO_TYPES/d" $(builddir)/$(UDISKS_TYPES) > $(builddir)/$(UDISKS_TYPES).tmp && mv -f $(builddir)/$(UDISKS_TYPES).tmp $(builddir)/$(UDISKS_TYPES)
+ endif # HAVE_VDO
+ 
+ # GTKDOC for LVM2
+@@ -212,12 +239,14 @@ include $(top_srcdir)/gtk-doc.make
+ EXTRA_DIST +=                                                                  \
+ 	$(DOC_MAIN_SGML_FILE).in.in                                            \
+ 	$(DOC_MAIN_SGML_FILE).in                                               \
+-        $(DOC_MAIN_SGML_FILE).bcache.dbus.in                                   \
+-        $(DOC_MAIN_SGML_FILE).bcache.generated.in                              \
+-        $(DOC_MAIN_SGML_FILE).bcache.sed                                       \
++	$(DOC_MAIN_SGML_FILE).bcache.dbus.in                                   \
++	$(DOC_MAIN_SGML_FILE).bcache.generated.in                              \
++	$(DOC_MAIN_SGML_FILE).bcache.sed                                       \
+ 	$(DOC_MAIN_SGML_FILE).btrfs.dbus.in                                    \
+ 	$(DOC_MAIN_SGML_FILE).btrfs.generated.in                               \
+ 	$(DOC_MAIN_SGML_FILE).btrfs.sed                                        \
++	$(DOC_MAIN_SGML_FILE).daemon.part.in                                   \
++	$(DOC_MAIN_SGML_FILE).daemon.sed                                       \
+ 	$(DOC_MAIN_SGML_FILE).iscsi.dbus.in                                    \
+ 	$(DOC_MAIN_SGML_FILE).iscsi.generated.in                               \
+ 	$(DOC_MAIN_SGML_FILE).iscsi.sed                                        \
+@@ -236,10 +265,12 @@ EXTRA_DIST +=                                         
+ 	$(DOC_MAIN_SGML_FILE).zram.sed                                         \
+ 	$(UDISKS_TYPES).in.in                                                  \
+ 	$(UDISKS_TYPES).in                                                     \
+-        $(UDISKS_TYPES).bcache.in                                              \
+-        $(UDISKS_TYPES).bcache.sed                                             \
++	$(UDISKS_TYPES).bcache.in                                              \
++	$(UDISKS_TYPES).bcache.sed                                             \
+ 	$(UDISKS_TYPES).btrfs.in                                               \
+ 	$(UDISKS_TYPES).btrfs.sed                                              \
++	$(UDISKS_TYPES).daemon.in                                              \
++	$(UDISKS_TYPES).daemon.sed                                             \
+ 	$(UDISKS_TYPES).iscsi.in                                               \
+ 	$(UDISKS_TYPES).iscsi.sed                                              \
+ 	$(UDISKS_TYPES).lsm.in                                                 \
+@@ -252,10 +283,12 @@ EXTRA_DIST +=                                         
+ 	$(UDISKS_TYPES).zram.sed                                               \
+ 	$(UDISKS_SECTIONS).in.in                                               \
+ 	$(UDISKS_SECTIONS).in                                                  \
+-        $(UDISKS_SECTIONS).bcache.sections.in                                  \
+-        $(UDISKS_SECTIONS).bcache.sed                                          \
++	$(UDISKS_SECTIONS).bcache.sections.in                                  \
++	$(UDISKS_SECTIONS).bcache.sed                                          \
+ 	$(UDISKS_SECTIONS).btrfs.sections.in                                   \
+ 	$(UDISKS_SECTIONS).btrfs.sed                                           \
++	$(UDISKS_SECTIONS).daemon.sections.in                                  \
++	$(UDISKS_SECTIONS).daemon.sed                                          \
+ 	$(UDISKS_SECTIONS).iscsi.sections.in                                   \
+ 	$(UDISKS_SECTIONS).iscsi.sed                                           \
+ 	$(UDISKS_SECTIONS).lsm.sections.in                                     \

Added: head/sysutils/libudisks/files/patch-doc_man_Makefile.am
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sysutils/libudisks/files/patch-doc_man_Makefile.am	Sat Oct 12 18:55:49 2019	(r514350)
@@ -0,0 +1,19 @@
+--- doc/man/Makefile.am.orig	2019-07-22 16:24:44 UTC
++++ doc/man/Makefile.am
+@@ -6,11 +6,16 @@ man_MANS =
+ if ENABLE_MAN
+ man_MANS +=                                                                    \
+ 	udisksctl.1                                                            \
++	$(NULL)
++
++if ENABLE_DAEMON
++man_MANS +=                                                                    \
+ 	udisksd.8                                                              \
+ 	udisks.8                                                               \
+ 	umount.udisks2.8                                                       \
+ 	udisks2.conf.5                                                         \
+ 	$(NULL)
++endif # ENABLE_DAEMON
+ 
+ if HAVE_LSM
+ man_MANS += udisks2_lsm.conf.5

Added: head/sysutils/libudisks/files/patch-doc_udisks2-docs.xml.daemon.man.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sysutils/libudisks/files/patch-doc_udisks2-docs.xml.daemon.man.in	Sat Oct 12 18:55:49 2019	(r514350)
@@ -0,0 +1,7 @@
+--- doc/udisks2-docs.xml.daemon.man.in.orig	2019-10-03 03:15:30 UTC
++++ doc/udisks2-docs.xml.daemon.man.in
+@@ -0,0 +1,4 @@
++    <xi:include href="man/udisksd.xml"/>
++    <xi:include href="man/udisks.xml"/>
++    <xi:include href="man/umount.udisks2.xml"/>
++    <xi:include href="man/udisks2.conf.5.xml"/>

Added: head/sysutils/libudisks/files/patch-doc_udisks2-docs.xml.daemon.part.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sysutils/libudisks/files/patch-doc_udisks2-docs.xml.daemon.part.in	Sat Oct 12 18:55:49 2019	(r514350)
@@ -0,0 +1,58 @@
+--- doc/udisks2-docs.xml.daemon.part.in.orig	2019-10-03 03:15:30 UTC
++++ doc/udisks2-docs.xml.daemon.part.in
+@@ -0,0 +1,55 @@
++  <part id="ref-daemon">
++    <title>Daemon Implementation Details</title>
++    <chapter id="ref-daemon-core">
++      <title>Core</title>
++      <xi:include href="xml/udisksdaemonutil.xml"/>
++      <xi:include href="xml/udiskslogging.xml"/>
++      <xi:include href="xml/udisksdaemon.xml"/>
++      <xi:include href="xml/udisksprovider.xml"/>
++      <xi:include href="xml/udisksstate.xml"/>
++      <xi:include href="xml/udisksata.xml"/>
++      <xi:include href="xml/UDisksModuleManager.xml"/>
++    </chapter>
++    <chapter id="ref-daemon-monitoring">
++      <title>State and Configuration</title>
++      <xi:include href="xml/udisksmountmonitor.xml"/>
++      <xi:include href="xml/udisksfstabmonitor.xml"/>
++      <xi:include href="xml/udiskscrypttabmonitor.xml"/>
++      <xi:include href="xml/udisksutabmonitor.xml"/>
++    </chapter>
++    <chapter id="ref-daemon-jobs">
++      <title>Jobs</title>
++      <xi:include href="xml/udisksbasejob.xml"/>
++      <xi:include href="xml/udiskssimplejob.xml"/>
++      <xi:include href="xml/udisksthreadedjob.xml"/>
++      <xi:include href="xml/udisksspawnedjob.xml"/>
++    </chapter>
++    <chapter id="ref-daemon-linux-types">
++      <title>Linux-specific types</title>
++      <xi:include href="xml/udiskslinuxmanager.xml"/>
++      <xi:include href="xml/udiskslinuxprovider.xml"/>
++      <xi:include href="xml/udiskslinuxdevice.xml"/>
++    </chapter>
++    <chapter id="ref-daemon-drives">
++      <title>Drives on Linux</title>
++      <xi:include href="xml/udiskslinuxdrive.xml"/>
++      <xi:include href="xml/udiskslinuxdriveata.xml"/>
++      <xi:include href="xml/udiskslinuxdriveobject.xml"/>
++    </chapter>
++    <chapter id="ref-daemon-mdraid">
++      <title>Linux RAID</title>
++      <xi:include href="xml/udiskslinuxmdraid.xml"/>
++      <xi:include href="xml/udiskslinuxmdraidobject.xml"/>
++    </chapter>
++    <chapter id="ref-daemon-block-devices">
++      <title>Block devices on Linux</title>
++      <xi:include href="xml/udiskslinuxblock.xml"/>
++      <xi:include href="xml/udiskslinuxpartition.xml"/>
++      <xi:include href="xml/udiskslinuxpartitiontable.xml"/>
++      <xi:include href="xml/udiskslinuxfilesystem.xml"/>
++      <xi:include href="xml/udiskslinuxencrypted.xml"/>
++      <xi:include href="xml/udiskslinuxswapspace.xml"/>
++      <xi:include href="xml/udiskslinuxloop.xml"/>
++      <xi:include href="xml/udiskslinuxblockobject.xml"/>
++    </chapter>
++  </part>

Added: head/sysutils/libudisks/files/patch-doc_udisks2-docs.xml.daemon.sed
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sysutils/libudisks/files/patch-doc_udisks2-docs.xml.daemon.sed	Sat Oct 12 18:55:49 2019	(r514350)
@@ -0,0 +1,10 @@
+--- doc/udisks2-docs.xml.daemon.sed.orig	2019-10-03 03:15:30 UTC
++++ doc/udisks2-docs.xml.daemon.sed
+@@ -0,0 +1,7 @@
++/<!-- DAEMON_MAN_PAGE -->/ {
++    r udisks2-docs.xml.daemon.man
++    d }
++
++/<!-- DAEMON_PART -->/ {
++    r udisks2-docs.xml.daemon.part
++    d }

Added: head/sysutils/libudisks/files/patch-doc_udisks2-docs.xml.in.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sysutils/libudisks/files/patch-doc_udisks2-docs.xml.in.in	Sat Oct 12 18:55:49 2019	(r514350)
@@ -0,0 +1,80 @@
+--- doc/udisks2-docs.xml.in.in.orig	2019-07-22 16:24:44 UTC
++++ doc/udisks2-docs.xml.in.in
+@@ -15,12 +15,9 @@
+ 
+   <part id="overview">
+     <title>Manual pages and Overview</title>
+-    <xi:include href="man/udisksd.xml"/>
+-    <!-- LVM2_MAN_PAGE -->
+-    <xi:include href="man/udisks.xml"/>
+     <xi:include href="man/udisksctl.xml"/>
+-    <xi:include href="man/umount.udisks2.xml"/>
+-    <xi:include href="man/udisks2.conf.5.xml"/>
++    <!-- DAEMON_MAN_PAGE -->
++    <!-- LVM2_MAN_PAGE -->
+     <!-- LSM_MAN_PAGE -->
+   </part>
+ 
+@@ -416,61 +413,7 @@
+     </chapter>
+   </part>
+ 
+-  <part id="ref-daemon">
+-    <title>Daemon Implementation Details</title>
+-    <chapter id="ref-daemon-core">
+-      <title>Core</title>
+-      <xi:include href="xml/udisksdaemonutil.xml"/>
+-      <xi:include href="xml/udiskslogging.xml"/>
+-      <xi:include href="xml/udisksdaemon.xml"/>
+-      <xi:include href="xml/udisksprovider.xml"/>
+-      <xi:include href="xml/udisksstate.xml"/>
+-      <xi:include href="xml/udisksata.xml"/>
+-      <xi:include href="xml/UDisksModuleManager.xml"/>
+-    </chapter>
+-    <chapter id="ref-daemon-monitoring">
+-      <title>State and Configuration</title>
+-      <xi:include href="xml/udisksmountmonitor.xml"/>
+-      <xi:include href="xml/udisksfstabmonitor.xml"/>
+-      <xi:include href="xml/udiskscrypttabmonitor.xml"/>
+-      <xi:include href="xml/udisksutabmonitor.xml"/>
+-    </chapter>
+-    <chapter id="ref-daemon-jobs">
+-      <title>Jobs</title>
+-      <xi:include href="xml/udisksbasejob.xml"/>
+-      <xi:include href="xml/udiskssimplejob.xml"/>
+-      <xi:include href="xml/udisksthreadedjob.xml"/>
+-      <xi:include href="xml/udisksspawnedjob.xml"/>
+-    </chapter>
+-    <chapter id="ref-daemon-linux-types">
+-      <title>Linux-specific types</title>
+-      <xi:include href="xml/udiskslinuxmanager.xml"/>
+-      <xi:include href="xml/udiskslinuxprovider.xml"/>
+-      <xi:include href="xml/udiskslinuxdevice.xml"/>
+-    </chapter>
+-    <chapter id="ref-daemon-drives">
+-      <title>Drives on Linux</title>
+-      <xi:include href="xml/udiskslinuxdrive.xml"/>
+-      <xi:include href="xml/udiskslinuxdriveata.xml"/>
+-      <xi:include href="xml/udiskslinuxdriveobject.xml"/>
+-    </chapter>
+-    <chapter id="ref-daemon-mdraid">
+-      <title>Linux RAID</title>
+-      <xi:include href="xml/udiskslinuxmdraid.xml"/>
+-      <xi:include href="xml/udiskslinuxmdraidobject.xml"/>
+-    </chapter>
+-    <chapter id="ref-daemon-block-devices">
+-      <title>Block devices on Linux</title>
+-      <xi:include href="xml/udiskslinuxblock.xml"/>
+-      <xi:include href="xml/udiskslinuxpartition.xml"/>
+-      <xi:include href="xml/udiskslinuxpartitiontable.xml"/>
+-      <xi:include href="xml/udiskslinuxfilesystem.xml"/>
+-      <xi:include href="xml/udiskslinuxencrypted.xml"/>
+-      <xi:include href="xml/udiskslinuxswapspace.xml"/>
+-      <xi:include href="xml/udiskslinuxloop.xml"/>
+-      <xi:include href="xml/udiskslinuxblockobject.xml"/>
+-    </chapter>
+-  </part>
++  <!-- DAEMON_PART -->
+ 
+   <index id="api-index">
+     <title>Index</title>

Added: head/sysutils/libudisks/files/patch-doc_udisks2-sections.txt.daemon.sections.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sysutils/libudisks/files/patch-doc_udisks2-sections.txt.daemon.sections.in	Sat Oct 12 18:55:49 2019	(r514350)
@@ -0,0 +1,563 @@
+--- doc/udisks2-sections.txt.daemon.sections.in.orig	2019-10-03 03:15:30 UTC
++++ doc/udisks2-sections.txt.daemon.sections.in
+@@ -0,0 +1,560 @@
++<SECTION>
++<FILE>udisksdaemon</FILE>
++<TITLE>UDisksDaemon</TITLE>
++UDisksDaemon
++udisks_daemon_new
++udisks_daemon_get_connection
++udisks_daemon_get_object_manager
++udisks_daemon_get_mount_monitor
++udisks_daemon_get_fstab_monitor
++udisks_daemon_get_crypttab_monitor
++udisks_daemon_get_linux_provider
++udisks_daemon_get_authority
++udisks_daemon_get_state
++UDisksDaemonWaitFunc
++udisks_daemon_wait_for_object_sync
++udisks_daemon_get_objects
++udisks_daemon_find_object
++udisks_daemon_find_block
++udisks_daemon_find_block_by_device_file
++udisks_daemon_find_block_by_sysfs_path
++udisks_daemon_launch_simple_job
++udisks_daemon_launch_spawned_job
++udisks_daemon_launch_spawned_job_sync
++udisks_daemon_launch_threaded_job
++udisks_daemon_get_disable_modules
++udisks_daemon_get_force_load_modules
++udisks_daemon_get_module_manager
++<SUBSECTION Standard>
++UDISKS_TYPE_DAEMON
++UDISKS_DAEMON
++UDISKS_IS_DAEMON
++<SUBSECTION Private>
++udisks_daemon_get_type
++udisks_daemon_marshal_BOOLEAN__BOOLEAN_BOXED
++udisks_daemon_marshal_BOOLEAN__BOXED_INT_BOXED_BOXED
++</SECTION>
++
++<SECTION>
++<FILE>udisksbasejob</FILE>
++<TITLE>UDisksBaseJob</TITLE>
++UDisksBaseJob
++UDisksBaseJobClass
++udisks_base_job_get_daemon
++udisks_base_job_get_cancellable
++udisks_base_job_get_auto_estimate
++udisks_base_job_set_auto_estimate
++udisks_base_job_add_object
++udisks_base_job_remove_object
++<SUBSECTION Standard>
++UDISKS_TYPE_BASE_JOB
++UDISKS_BASE_JOB
++UDISKS_IS_BASE_JOB
++UDISKS_BASE_JOB_CLASS
++UDISKS_BASE_JOB_GET_CLASS
++UDISKS_IS_BASE_JOB_CLASS
++UDisksBaseJobPrivate
++<SUBSECTION Private>
++udisks_base_job_get_type
++</SECTION>
++
++<SECTION>
++<FILE>udisksspawnedjob</FILE>
++<TITLE>UDisksSpawnedJob</TITLE>
++UDisksSpawnedJob
++udisks_spawned_job_new
++udisks_spawned_job_get_command_line
++udisks_spawned_job_start

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201910121855.x9CItost020130>