gdm: Fix some configuration options

[Dan CÃirnat <cirnatdan%NetBSD.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Dan CÃirnat <cirnatdan%NetBSD.org@localhost>
Pushed By:	cirnatdan
Date:		Tue Apr 6 10:58:35 2021 +0200
Changeset:	2f7ed8354aba781d22af2cdcf1b4c6a6e7de9642

Modified Files:
	gdm/Makefile
	gdm/distinfo
	gdm/files/gdm.sh
	gdm/patches/patch-data_Init_in

Log Message:
gdm: Fix some configuration options

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

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

diffstat:
 gdm/Makefile                   | 9 ++++-----
 gdm/distinfo                   | 2 +-
 gdm/files/gdm.sh               | 2 +-
 gdm/patches/patch-data_Init_in | 2 +-
 4 files changed, 7 insertions(+), 8 deletions(-)

diffs:
diff --git a/gdm/Makefile b/gdm/Makefile
index 3cac682efc..13fbed909b 100644
--- a/gdm/Makefile
+++ b/gdm/Makefile
@@ -1,6 +1,7 @@
 # $NetBSD: Makefile,v 1.6 2015/06/06 20:44:44 krytarowski Exp $
 
 DISTNAME=	gdm-40.0
+PKGREVISION=	1
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GITHUB:=GNOME/}
 
@@ -38,9 +39,7 @@ MESON_ARGS+=		-Ddbus-sys=${PREFIX}/etc/dbus-1/system.d
 MESON_ARGS+=		-Dinitial-vt=05
 MESON_ARGS+=		-Dgdm-xsession=true
 MESON_ARGS+=		-Dwayland-support=false
-MESON_ARGS+=		-Dwith-default-path="/usr/local/bin:/usr/local/sbin:${PREFIX}/bin:${PREFIX}/sbin:/usr/bin:/usr/sbin:/bin/sbin"
-CONFIGURE_ENV+=		PREFIX=${PREFIX}
-CONFIGURE_ENV+=		X11BASE=${X11BASE}
+MESON_ARGS+=		-Ddefault-path="/usr/local/bin:/usr/local/sbin:${PREFIX}/bin:${PREFIX}/sbin:/usr/bin:/usr/sbin:/bin/sbin"
 INSTALL_MAKE_FLAGS+=	${MAKE_FLAGS}
 INSTALL_MAKE_FLAGS+=	GDM_CUSTOM_CONF=${EGDIR}/custom.conf
 INSTALL_MAKE_FLAGS+=	sysconfdir=${EGDIR}
@@ -52,7 +51,7 @@ OWN_DIRS+=		${PKG_SYSCONFDIR}/PostSession
 OWN_DIRS+=		${PKG_SYSCONFDIR}/PreSession
 OWN_DIRS+=		${PKG_SYSCONFDIR}/dm
 OWN_DIRS+=		${PKG_SYSCONFDIR}/modules
-OWN_DIRS+=		${VARBASE}/gdm
+OWN_DIRS+=		${VARBASE}/lib/gdm
 OWN_DIRS+=		${VARBASE}/log/gdm
 
 PKG_SYSCONFSUBDIR=	gdm
@@ -89,7 +88,7 @@ GDMGRP=		daemon
 .if (${OPSYS} == "NetBSD" || ${OPSYS} == "OpenBSD") && \
     (${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" || \
      ${MACHINE_ARCH} == "aarch64")
-CONFIGURE_ARGS+=	X_SERVER_ARGS="vt05"
+MESON_ARGS+=	-Dinitial-vt=5
 .endif
 
 post-install:
diff --git a/gdm/distinfo b/gdm/distinfo
index 42a4962f14..ee201f4b69 100644
--- a/gdm/distinfo
+++ b/gdm/distinfo
@@ -24,7 +24,7 @@ SHA1 (patch-daemon_gdm-session_c) = 6cb462c9aebb6958624a6c11416a1dcdbdab0aa4
 SHA1 (patch-daemon_gdm-session_h) = b350278af12865e4f0565e69a0e52238ff9aa4b0
 SHA1 (patch-daemon_gdm-x-session.c) = a19222ac83f8b7bd9054a99885b487c36783ec76
 SHA1 (patch-daemon_main_c) = 95d05534528a22f66315dc4b0b841aab760fc3d2
-SHA1 (patch-data_Init_in) = 1e133a79fde3bd7a8c09f0a055cdc51d17aadbe4
+SHA1 (patch-data_Init_in) = 1db6a2d3c94cb1e31df566c994a2f07e85ca39f0
 SHA1 (patch-data_PostSession_in) = 0951d9c4e1404478c1ac9fba996bc96b41ed4d5b
 SHA1 (patch-data_PreSession_in) = cf1fec76b9555a911b0af6d3e32a838a94c57ca1
 SHA1 (patch-data_gdm.conf-custom.in) = 005a58326ab108f578c56c50768ae2ee164e3a5a
diff --git a/gdm/files/gdm.sh b/gdm/files/gdm.sh
index 5cceaa19ab..66f9e0fed3 100644
--- a/gdm/files/gdm.sh
+++ b/gdm/files/gdm.sh
@@ -22,7 +22,7 @@ extra_commands="reload"
 
 if [ -f /etc/rc.subr ]; then
 	load_rc_config ${name}
-	PATH=@PREFIX@/bin:$PATH run_rc_command "$1"
+	run_rc_command "$1"
 else
 	echo -n " ${name}"
 	${command} ${gdm_flags} ${command_args}
diff --git a/gdm/patches/patch-data_Init_in b/gdm/patches/patch-data_Init_in
index 11b5108bda..e09bbbe508 100644
--- a/gdm/patches/patch-data_Init_in
+++ b/gdm/patches/patch-data_Init_in
@@ -23,6 +23,6 @@ $OpenBSD: patch-data_Init_in,v 1.7 2015/04/15 14:47:00 ajacoutot Exp $
 +    /sbin/chown _gdm /dev/drm0
 +fi
 +# XXX OpenBSD needs an implementation of XDG_RUNTIME_DIR
-+rm -rf /var/db/gdm/.cache/gnome-shell/runtime-state-*
++rm -rf /var/lib/gdm/.cache/gnome-shell/runtime-state-*
 +
  exit 0