From f22aefad354646e367125e29367738156d9ce45e Mon Sep 17 00:00:00 2001 From: dougb Date: Sat, 7 Jan 2006 06:29:57 +0000 Subject: Now that new style rc.d scripts are being run as part of the base rcorder, hard coded variable values in these scripts are overriding the values in /etc/rc.conf[.local] (due to the way that variables from the latter are read at boot time). Therefore, change the boot scripts to set default values only if the variable is unset in /etc/rc.conf[.local]. This will allow the service to start at boot time if it's been enabled as the user would expect. This change will be a noop for users who have systems that have not yet been upgraded to the new rc.d code in the base. In many cases there are other variables in the scripts that should get similar treatment, however I did not change anything other than the _enable lines. I'll leave the rest up to the maintainers to do as they see fit. Bump PORTREVISION to make sure that users and packages pick up this change. --- net-im/ejabberd/Makefile | 1 + net-im/ejabberd/files/ejabberd.sh.in | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'net-im') diff --git a/net-im/ejabberd/Makefile b/net-im/ejabberd/Makefile index 942ada5b55cd..ecbba9b15c76 100644 --- a/net-im/ejabberd/Makefile +++ b/net-im/ejabberd/Makefile @@ -7,6 +7,7 @@ PORTNAME= ejabberd PORTVERSION= 0.9.8 +PORTREVISION= 1 CATEGORIES= net-im MASTER_SITES= http://www.jabber.ru/files/ejabberd/ \ http://www.process-one.net/en/projects/ejabberd/download/${PORTVERSION}/ diff --git a/net-im/ejabberd/files/ejabberd.sh.in b/net-im/ejabberd/files/ejabberd.sh.in index d7e27e13b918..7404e258d6be 100644 --- a/net-im/ejabberd/files/ejabberd.sh.in +++ b/net-im/ejabberd/files/ejabberd.sh.in @@ -13,7 +13,7 @@ # # DO NOT CHANGE THESE DEFAULT VALUES HERE # -ejabberd_enable="NO" +ejabberd_enable="${ejabberd_enable-NO}" . %%RC_SUBR%% -- cgit