aboutsummaryrefslogtreecommitdiffstats
path: root/x11
diff options
context:
space:
mode:
authorcrees <crees@FreeBSD.org>2013-05-31 19:54:01 +0800
committercrees <crees@FreeBSD.org>2013-05-31 19:54:01 +0800
commitae58b89b497a0301c6a58479de4b5ddb16deb9e8 (patch)
tree0b5233ed2a1bc25f12dc9d56da8b18ad62e8ca06 /x11
parent13191723730822c675392ffc431470eb8ac4e095 (diff)
downloadfreebsd-ports-gnome-ae58b89b497a0301c6a58479de4b5ddb16deb9e8.tar.gz
freebsd-ports-gnome-ae58b89b497a0301c6a58479de4b5ddb16deb9e8.tar.zst
freebsd-ports-gnome-ae58b89b497a0301c6a58479de4b5ddb16deb9e8.zip
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
Diffstat (limited to 'x11')
-rw-r--r--x11/slim/files/slim.in18
1 files changed, 8 insertions, 10 deletions
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