accountservice: update, convert to meson, etc

[nia <nia%netbsd.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	nia <nia%netbsd.org@localhost>
Pushed By:	nee
Date:		Fri May 29 20:31:56 2020 +0100
Changeset:	892dc2b2243cbefcab6de643e57e733a4a510086

Modified Files:
	accountsservice/Makefile
	accountsservice/distinfo
Added Files:
	accountsservice/patches/patch-meson.build
Removed Files:
	accountsservice/patches/patch-data_Makefile.am
	accountsservice/patches/patch-src_wtmp-helper.c

Log Message:
accountservice: update, convert to meson, etc

does not build

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=892dc2b2243cbefcab6de643e57e733a4a510086

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 accountsservice/Makefile                        | 30 ++++++-------------------
 accountsservice/distinfo                        | 10 ++++-----
 accountsservice/patches/patch-data_Makefile.am  | 16 -------------
 accountsservice/patches/patch-meson.build       | 28 +++++++++++++++++++++++
 accountsservice/patches/patch-src_wtmp-helper.c | 17 --------------
 5 files changed, 40 insertions(+), 61 deletions(-)

diffs:
diff --git a/accountsservice/Makefile b/accountsservice/Makefile
index c9f2308b37..f123467f39 100644
--- a/accountsservice/Makefile
+++ b/accountsservice/Makefile
@@ -1,8 +1,8 @@
 # $NetBSD: Makefile,v 1.1 2015/06/06 13:52:41 krytarowski Exp $
 
-DISTNAME=	accountsservice-0.6.42
+DISTNAME=	accountsservice-0.6.55
 CATEGORIES=	sysutils
-MASTER_SITES=	http://www.freedesktop.org/software/accountsservice/
+MASTER_SITES=	https://www.freedesktop.org/software/accountsservice/
 EXTRACT_SUFX=	.tar.xz
 
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
@@ -10,30 +10,14 @@ HOMEPAGE=	https://www.freedesktop.org/software/accountsservice/
 COMMENT=	Set of D-Bus interfaces for accessing account information
 LICENSE=	gnu-gpl-v3
 
-GNU_CONFIGURE=	yes
-USE_LIBTOOL=	yes
-USE_TOOLS+=	pkg-config intltool gmake autoconf autoreconf automake
+USE_TOOLS+=	pkg-config
 
-EGDIR=		${PREFIX}/share/examples/accountsservice
-
-CONFIGURE_ARGS+=	--disable-systemd \
-			--sysconfdir=${EGDIR}
-
-ALL_ENV+=	EGDIR=${EGDIR}
-
-PKGCONFIG_OVERRIDE+=	src/libaccountsservice/accountsservice.pc.in
-
-MAKE_DIRS+=	${PKG_SYSCONFDIR}/dbus-1/system.d
-
-CONF_FILES+=	${EGDIR}/dbus-1/system.d/org.freedesktop.Accounts.conf \
-		${PKG_SYSCONFDIR}/dbus-1/system.d/org.freedesktop.Accounts.conf
-
-SUBST_CLASSES+=		gdm
-SUBST_FILES.gdm=	src/daemon.c
-SUBST_STAGE.gdm=	post-patch
-SUBST_SED.gdm=		-e 's,/etc/gdm/custom.conf,${PKG_SYSCONFDIR}/gdm/custom.conf,g'
+MESON_ARGS+=	-Dintrospection=false
+MESON_ARGS+=	-Dsystemdsystemunitdir=no
 
+.include "../../devel/meson/build.mk"
 .include "../../devel/gobject-introspection/buildlink3.mk"
 .include "../../security/polkit/buildlink3.mk"
+.include "../../sysutils/dbus/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/accountsservice/distinfo b/accountsservice/distinfo
index 7374112e43..1f0acddd45 100644
--- a/accountsservice/distinfo
+++ b/accountsservice/distinfo
@@ -1,8 +1,8 @@
 $NetBSD: distinfo,v 1.1 2015/06/06 13:52:41 krytarowski Exp $
 
-SHA1 (accountsservice-0.6.42.tar.xz) = 4461347acf3878e100afcc2e3f960fb2c9fd87f4
-RMD160 (accountsservice-0.6.42.tar.xz) = 72b3025468b855d50517729530a92e5cb31ca82e
-SHA512 (accountsservice-0.6.42.tar.xz) = b31d77b88793a8264d32963a98ad446537292a134a3f80fabb4e2ce30f796e5f3066d02a27515c993133fa493b511a6abba6ff1a7827b5a54ea6a4f62a7b6fc9
-Size (accountsservice-0.6.42.tar.xz) = 380500 bytes
-SHA1 (patch-data_Makefile.am) = b059cd214a346adb371e4a006f497d652c9d9234
+SHA1 (accountsservice-0.6.55.tar.xz) = bab4f37144196d8ba06195bc72b4a9937c62b9fd
+RMD160 (accountsservice-0.6.55.tar.xz) = 80144b2c703645e15cb59e8aa8f2966b70054484
+SHA512 (accountsservice-0.6.55.tar.xz) = c12e6a8e80f9b087f97238da4734d2d3a14a7c5cbd870a32a04b00116f176c818c39fb886f6dc72c3e93c136b0c2074ddf8f77e20431fa3bd54f138bea9d262d
+Size (accountsservice-0.6.55.tar.xz) = 97972 bytes
+SHA1 (patch-meson.build) = dc85949c195f43aba8697c09a8e367bda5f12e32
 SHA1 (patch-src_wtmp-helper.c) = eb32d598784f31e9baac44bd63ab248f5873c9c3
diff --git a/accountsservice/patches/patch-data_Makefile.am b/accountsservice/patches/patch-data_Makefile.am
deleted file mode 100644
index 5f51e35451..0000000000
--- a/accountsservice/patches/patch-data_Makefile.am
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-data_Makefile.am,v 1.1 2015/06/06 13:52:41 krytarowski Exp $
-
-Use the pkgsrc specific solution to handle /etc files with the CONF_FILES
-framework.
-
---- data/Makefile.am.orig	2014-11-04 03:46:00.000000000 +0000
-+++ data/Makefile.am
-@@ -4,7 +4,7 @@ dbusif_DATA = \
- 	org.freedesktop.Accounts.xml 		\
- 	org.freedesktop.Accounts.User.xml
- 
--dbusconfdir   = $(sysconfdir)/dbus-1/system.d
-+dbusconfdir   = ${EGDIR}/dbus-1/system.d
- dbusconf_DATA = org.freedesktop.Accounts.conf
- 
- servicedir       = $(datadir)/dbus-1/system-services
diff --git a/accountsservice/patches/patch-meson.build b/accountsservice/patches/patch-meson.build
new file mode 100644
index 0000000000..442316a46a
--- /dev/null
+++ b/accountsservice/patches/patch-meson.build
@@ -0,0 +1,28 @@
+$NetBSD$
+
+- Allow finding _PATH_WTMPX on NetBSD.
+- Allow building without systemd.
+
+--- meson.build.orig	2019-04-23 15:16:09.000000000 +0000
++++ meson.build
+@@ -79,6 +79,8 @@ endforeach
+ 
+ if cc.has_header_symbol('utmpx.h', 'WTMPX_FILENAME', prefix: '#define _GNU_SOURCE')
+   config_h.set('PATH_WTMP', 'WTMPX_FILENAME')
++elif cc.has_header_symbol('utmpx.h', '_PATH_WTMPX')
++  config_h.set('PATH_WTMP', '_PATH_WTMPX')
+ elif cc.has_header_symbol('paths.h', '_PATH_WTMPX')
+   config_h.set('PATH_WTMP', '_PATH_WTMPX')
+ else
+@@ -138,8 +140,9 @@ install_systemd_unit_dir = (systemd_syst
+ 
+ if install_systemd_unit_dir and systemd_system_unit_dir == ''
+   systemd_dep = dependency('systemd', required: false)
+-  assert(systemd_dep.found(), 'systemd required but not found, please provide a valid systemd user unit dir or disable it')
+-  systemd_system_unit_dir = systemd_dep.get_pkgconfig_variable('systemdsystemunitdir')
++  if systemd_dep.found()
++    systemd_system_unit_dir = systemd_dep.get_pkgconfig_variable('systemdsystemunitdir')
++  endif
+ endif
+ 
+ # Core configuration
diff --git a/accountsservice/patches/patch-src_wtmp-helper.c b/accountsservice/patches/patch-src_wtmp-helper.c
deleted file mode 100644
index ab44227f48..0000000000
--- a/accountsservice/patches/patch-src_wtmp-helper.c
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-NetBSD call WTMPX_FILENAME _PATH_WTMPX.
-
---- src/wtmp-helper.c.orig	2016-01-27 18:38:21.000000000 +0000
-+++ src/wtmp-helper.c
-@@ -27,6 +27,10 @@
- 
- #ifdef HAVE_UTMPX_H
- 
-+#ifdef __NetBSD__
-+#define WTMPX_FILENAME	_PATH_WTMPX
-+#endif
-+
- #include <utmpx.h>
- 
- typedef struct {