From 25ea7cceab81d01f7d5495daacab5c1cbce57f8b Mon Sep 17 00:00:00 2001
From: Ben Woods <woodsb02@FreeBSD.org>
Date: Sun, 12 Feb 2017 16:36:59 +0000
Subject: [PATCH] x11/lightdm: Improve rc script to use daemon(8)

This fixes an issue noticed when sysutils/bsdstats was installed and
enabled at runtime in /etc/rc.conf, but for whatever reason was failing
to send the updated statistics. Upon failing, the lightdm process would
receive a SIGHUP, causing it to stop seconds after the login screen was
displayed (before the user even had a chance to login).
---
 x11/lightdm/Makefile         | 2 +-
 x11/lightdm/files/lightdm.in | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/x11/lightdm/Makefile b/x11/lightdm/Makefile
index 9017e1a05399..4557667482d7 100644
--- a/x11/lightdm/Makefile
+++ b/x11/lightdm/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	lightdm
 PORTVERSION=	1.20.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11
 MASTER_SITES=	https://launchpad.net/${PORTNAME}/${PORTVERSION:R}/${PORTVERSION}/+download/
 
diff --git a/x11/lightdm/files/lightdm.in b/x11/lightdm/files/lightdm.in
index 227abd106976..734276d218b0 100644
--- a/x11/lightdm/files/lightdm.in
+++ b/x11/lightdm/files/lightdm.in
@@ -22,8 +22,9 @@ load_rc_config ${name}
 
 : ${lightdm_enable:="NO"}
 
-command="%%PREFIX%%/sbin/${name}"
+command="/usr/sbin/daemon"
+procname="%%PREFIX%%/sbin/${name}"
 pidfile="/var/run/${name}.pid"
-command_args="--pid-file=${pidfile} > /dev/null 2>&1 &"
+command_args="-f ${procname} --pid-file=${pidfile}"
 
 run_rc_command "$1"