diff --git a/sysutils/accountsservice/Makefile b/sysutils/accountsservice/Makefile index e4b92dbde119..734b439d2b9a 100644 --- a/sysutils/accountsservice/Makefile +++ b/sysutils/accountsservice/Makefile @@ -1,34 +1,35 @@ PORTNAME= accountsservice PORTVERSION= 23.13.9 +PORTREVISION= 1 CATEGORIES= sysutils devel MASTER_SITES= https://www.freedesktop.org/software/${PORTNAME}/ MAINTAINER= desktop@FreeBSD.org COMMENT= D-Bus interface for user account query and manipulation WWW= https://gitlab.freedesktop.org/accountsservice/accountsservice LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= dbus>0:devel/dbus LIB_DEPENDS= libpolkit-gobject-1.so:sysutils/polkit \ libconsolekit.so:sysutils/consolekit2 -USES= cpe gettext gnome localbase:ldflags meson pkgconfig tar:xz +USES= cpe gettext gnome meson pkgconfig tar:xz CPE_VENDOR= freedesktop USE_GNOME= glib20 intltool libxslt introspection:build USE_LDCONFIG= yes MESON_ARGS= -Dconsolekit=true \ -Dgdmconffile=${LOCALBASE}/etc/gdm/custom.conf \ -Dlightdmconffile=${LOCALBASE}/etc/lightdm/lightdm.conf \ -Dlocalstatedir=/var \ -Dsystemdsystemunitdir=no \ -Dvapi=false \ -Dtests=false USE_GITLAB= yes GL_SITE= https://gitlab.freedesktop.org GL_ACCOUNT= arrowd GL_TAGNAME= 1ad459450480baa3e2024db4edee0a30ca0edc20 .include diff --git a/sysutils/accountsservice/files/patch-meson.build b/sysutils/accountsservice/files/patch-meson.build index 0c44fe80183b..4149f6c07630 100644 --- a/sysutils/accountsservice/files/patch-meson.build +++ b/sysutils/accountsservice/files/patch-meson.build @@ -1,10 +1,23 @@ --- meson.build.orig 2023-08-12 19:01:30 UTC +++ meson.build @@ -105,7 +105,6 @@ else config_h.set('PATH_WTMP', '_PATH_WTMPX') else path_wtmp = '/var/log/utx.log' - assert(run_command('test', '-e', path_wtmp, check: false).returncode() == 0, 'Do not know which filename to watch for wtmp changes') config_h.set_quoted('PATH_WTMP', path_wtmp) endif +@@ -159,11 +158,7 @@ polkit_gobject_dep = dependency('polkit-gobject-1') + # salt drawn from secure system ressources with at least 128 bits. + # (96 bits for sha512crypt, as more is not supported by this method, since + # the effectively used maximum is 16 base64-encoded characters) +-crypt_dep = dependency('libxcrypt', required: false, version: '>= 4') +-config_h.set('HAVE_CRYPT_GENSALT', crypt_dep.found()) +-if not crypt_dep.found() +- crypt_dep = cc.find_library('crypt') +-endif ++crypt_dep = cc.find_library('crypt') + + dbus_dep = dependency('dbus-1') + if dbus_dep.version().version_compare('>=1.9.18')