From 16eb7c2ca089906fc35060aac00e8522c52a2fd9 Mon Sep 17 00:00:00 2001
From: Chris Rees <crees@FreeBSD.org>
Date: Fri, 31 May 2013 11:54:01 +0000
Subject: Stop checking for get_pidfile_from_conf function in rc.subr.
It is present in all supported versions of FreeBSD, and has had poor takeup.
I strongly suspect the strange-looking checks are partially to blame for
scaring maintainers off.
Go forth and please use it!
PR: ports/178269
Approved by: maintainers of all ports involved
---
x11/slim/files/slim.in | 18 ++++++++----------
1 file changed, 8 insertions(+), 10 deletions(-)
(limited to 'x11')
diff --git a/x11/slim/files/slim.in b/x11/slim/files/slim.in
index 040b3558aa5b..5fba5c27ecc6 100644
--- a/x11/slim/files/slim.in
+++ b/x11/slim/files/slim.in
@@ -19,28 +19,26 @@
name="slim"
rcvar=slim_enable
-start_precmd=${name}_rmfile
-stop_precmd=${name}_prestop
-stop_postcmd=${name}_rmfile
-
-load_rc_config $name
+load_rc_config slim
-: ${slim_enable="NO"}
+: ${slim_enable:="NO"}
command=%%PREFIX%%/bin/slim
command_args="-d"
+start_precmd=${name}_rmfile
+stop_precmd=${name}_prestop
+stop_postcmd=${name}_rmfile
find_pidfile()
{
- if type get_pidfile_from_conf >/dev/null 2>&1 &&
- get_pidfile_from_conf lockfile %%PREFIX%%/etc/${name}.conf; then
+ if get_pidfile_from_conf lockfile %%PREFIX%%/etc/${name}.conf; then
pidfile="$_pidfile_from_conf"
else
pidfile="/var/run/${name}.pid"
fi
}
-slim_rmfile ()
+slim_rmfile()
{
local file
@@ -54,7 +52,7 @@ slim_rmfile ()
return 0
}
-slim_prestop ()
+slim_prestop()
{
local xpid
--
cgit debian/1.2.3+git2.25.1-1-2-gaceb0