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.

2 files changed, 2 insertions, 2 deletions

diff --git a/sysutils/smartmontools-devel/Makefile b/sysutils/smartmontools-devel/Makefile
index be6a62172c96..0788b7818ca2 100644
--- a/sysutils/smartmontools-devel/Makefile
+++ b/sysutils/smartmontools-devel/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	smartmontools
 PORTVERSION=	5.33
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/sysutils/smartmontools-devel/files/smartd.sh b/sysutils/smartmontools-devel/files/smartd.sh
index a280b53cf1db..7610b0d6b059 100644
--- a/sysutils/smartmontools-devel/files/smartd.sh
+++ b/sysutils/smartmontools-devel/files/smartd.sh
@@ -13,7 +13,7 @@
 #
 # DO NOT CHANGE THESE DEFAULT VALUES HERE
 #
-smartd_enable="NO"
+smartd_enable="${smartd_enable-NO}"
 smartd_pidfile="/var/run/smartd.pid"
 
 . %%RC_SUBR%%