sysutils/accountsservice: Switch to my fork and update to 23.13.9

My fork incorporates adapted patches from Olivier Duchateau.

PR:		270881
Sponsored by:	Serenity Cybersecurity, LLC

sysutils/accountsservice/Makefile

@@ -1,30 +1,34 @@
 PORTNAME=	accountsservice
-PORTVERSION=	0.6.55
-PORTREVISION=	5
+PORTVERSION=	23.13.9
 CATEGORIES=	sysutils devel
-MASTER_SITES=	http://www.freedesktop.org/software/${PORTNAME}/
+MASTER_SITES=	https://www.freedesktop.org/software/${PORTNAME}/
 
-PATCH_SITES=	https://gitlab.freedesktop.org/${PORTNAME}/${PORTNAME}/-/commit/
-PATCHFILES+=	ac9b14f1c1bb.patch:-p1 # https://gitlab.freedesktop.org/accountsservice/accountsservice/-/merge_requests/82
-
-MAINTAINER=	kwm@FreeBSD.org
+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
+LIB_DEPENDS=	libpolkit-gobject-1.so:sysutils/polkit \
+		libconsolekit.so:sysutils/consolekit2
 
 USES=		cpe gettext gnome localbase:ldflags meson pkgconfig tar:xz
 CPE_VENDOR=	freedesktop
 USE_GNOME=	glib20 intltool libxslt introspection:build
 USE_LDCONFIG=	yes
-MESON_ARGS=	-Delogind=false \
+MESON_ARGS=	-Dconsolekit=true \
 		-Dgdmconffile=${LOCALBASE}/etc/gdm/custom.conf \
+		-Dlightdmconffile=${LOCALBASE}/etc/lightdm/lightdm.conf \
 		-Dlocalstatedir=/var \
-		-Dsystemd=false \
-		-Dsystemdsystemunitdir=no
+		-Dsystemdsystemunitdir=no \
+		-Dvapi=false \
+		-Dtests=false
+
+USE_GITLAB=	yes
+GL_SITE=	https://gitlab.freedesktop.org
+GL_ACCOUNT=	arrowd
+GL_TAGNAME=	1ad459450480baa3e2024db4edee0a30ca0edc20
 
 .include <bsd.port.mk>

sysutils/accountsservice/distinfo

@@ -1,5 +1,3 @@
-TIMESTAMP = 1600462353
-SHA256 (accountsservice-0.6.55.tar.xz) = ff2b2419a7e06bd9cb335ffe391c7409b49a0f0130b890bd54692a3986699c9b
-SIZE (accountsservice-0.6.55.tar.xz) = 97972
-SHA256 (ac9b14f1c1bb.patch) = 2a369203c0f9d091ab1d6ff46c3b9ab88c345ed27e314f04a867ccc4b33e2be2
-SIZE (ac9b14f1c1bb.patch) = 723
+TIMESTAMP = 1691866961
+SHA256 (arrowd-accountsservice-1ad459450480baa3e2024db4edee0a30ca0edc20_GL0.tar.gz) = 0e6c21e99c117f1e233d91863c89fb71f97b10602145003ac8a50a48d34cfc16
+SIZE (arrowd-accountsservice-1ad459450480baa3e2024db4edee0a30ca0edc20_GL0.tar.gz) = 669339

sysutils/accountsservice/files/patch-generate-version.sh

@@ -0,0 +1,11 @@
+--- generate-version.sh.orig	2023-08-12 19:01:30 UTC
++++ generate-version.sh
+@@ -7,7 +7,7 @@ exec 2>&3
+ exec 2>&3
+
+ # If it's not from a git checkout, assume it's from a tarball
+-if ! git rev-parse --is-inside-git-dir > /dev/null 2>&1; then
++if ! false > /dev/null 2>&1; then
+     VERSION_FROM_DIR_NAME=$(basename "$CWD" | sed -n 's/^accountsservice-\([^-]*\)$/\1/p')
+
+     if [ -n "$VERSION_FROM_DIR_NAME" ]; then

sysutils/accountsservice/files/patch-meson.build

@@ -1,16 +1,10 @@
---- meson.build.orig	2018-09-29 12:54:53 UTC
+--- meson.build.orig	2023-08-12 19:01:30 UTC
 +++ meson.build
-@@ -82,8 +82,11 @@ if cc.has_header_symbol('utmpx.h', 'WTMPX_FILENAME', p
- elif cc.has_header_symbol('paths.h', '_PATH_WTMPX')
+@@ -105,7 +105,6 @@ else
    config_h.set('PATH_WTMP', '_PATH_WTMPX')
  else
--  assert(run_command('test', '-e', '/var/log/utx.log').returncode() == 0, 'Do not know which filename to watch for wtmp changes')
--  config_h.set_quoted('PATH_WTMP', '/var/log/utx.log')
-+  # Ugly hack for jails builders!
-+  _system = host_machine.system().to_lower()
-+  if _system.contains('freebsd')
-+    config_h.set_quoted('PATH_WTMP', '/var/log/utx.log')
-+  endif
+   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
 
- # compiler flags

sysutils/accountsservice/files/patch-meson__post__install.py

@@ -1,11 +1,13 @@
---- meson_post_install.py.orig	2019-04-23 15:16:09 UTC
+--- meson_post_install.py.orig	2022-02-15 21:53:55 UTC
 +++ meson_post_install.py
-@@ -9,8 +9,8 @@ localstatedir = os.path.normpath(destdir + os.sep + sy
+@@ -9,9 +9,9 @@ localstatedir = os.path.normpath(destdir + os.sep + sy
  # FIXME: meson will not track the creation of these directories
  #        https://github.com/mesonbuild/meson/blob/master/mesonbuild/scripts/uninstall.py#L39
  dst_dirs = [
+-  (os.path.join(localstatedir, 'lib'), 0o755),
 -  (os.path.join(localstatedir, 'lib', 'AccountsService', 'icons'), 0o775),
 -  (os.path.join(localstatedir, 'lib', 'AccountsService', 'users'), 0o700),
++  (os.path.join(localstatedir, 'db'), 0o755),
 +  (os.path.join(localstatedir, 'db', 'AccountsService', 'icons'), 0o775),
 +  (os.path.join(localstatedir, 'db', 'AccountsService', 'users'), 0o700),
  ]