5 files changed, 19 insertions, 11 deletions

diff --git a/sysutils/hfm/Makefile b/sysutils/hfm/Makefile
index 4e4d0563d0da..be7bc1d44e44 100644
--- a/sysutils/hfm/Makefile
+++ b/sysutils/hfm/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	hfm
-PORTVERSION=	1.1.3
+PORTVERSION=	1.2.1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	sysutils
 
diff --git a/sysutils/hfm/distinfo b/sysutils/hfm/distinfo
index 11a1c39c14a3..da6427d7170e 100644
--- a/sysutils/hfm/distinfo
+++ b/sysutils/hfm/distinfo
@@ -1,5 +1,5 @@
-SHA256 (derekmarcotte-hfm-v1.1.3_GH0.tar.gz) = 8e00fbb4a640ac5cd6473f4705043af4067be731cdabc5aeb882121a0ccae743
-SIZE (derekmarcotte-hfm-v1.1.3_GH0.tar.gz) = 33915
+SHA256 (derekmarcotte-hfm-v1.2.1_GH0.tar.gz) = 2d8e9063d4bc3543316cb8c7e0464ce05cc61361733f0d2e2c9ae5ff5db83ed9
+SIZE (derekmarcotte-hfm-v1.2.1_GH0.tar.gz) = 37040
 SHA256 (mitchellh-go-libucl-f9d0e55_GH0.tar.gz) = 955e56fa334e7131ca313098fcf0a91ce89270cf1294d2a07830aa1c17b58fc0
 SIZE (mitchellh-go-libucl-f9d0e55_GH0.tar.gz) = 9426
 SHA256 (op-go-logging-dfaf3df_GH0.tar.gz) = d34d3afbdb07ad92f51d2a0a9f2682a4c0fcece733618a4ad27013e5ab6c8b60
diff --git a/sysutils/hfm/files/hfm.in b/sysutils/hfm/files/hfm.in
index 74e216fe9679..17ca964d76fc 100644
--- a/sysutils/hfm/files/hfm.in
+++ b/sysutils/hfm/files/hfm.in
@@ -17,20 +17,26 @@
 
 . /etc/rc.subr
 
-name=hfm
-rcvar=hfm_enable
+name="hfm"
+rcvar="hfm_enable"
 
 command="%%PREFIX%%/bin/${name}"
 
-hfm_user=_hfm
-hfm_flags=${hfm_flags:-"-config %%ETCDIR%%/${name}.conf -facility local0 -log syslog"}
+hfm_user="_hfm"
+hfm_flags="${hfm_flags:-"-config %%ETCDIR%%/${name}.conf -facility local0 -log syslog"}"
 
 pidfile="/var/run/${name}.pid"
 
 required_files="%%ETCDIR%%/${name}.conf"
 
-start_cmd=hfm_start
-stop_postcmd=hfm_postcmd
+start_cmd="hfm_start"
+restart_precmd="hfm_checkconfig"
+configtest_cmd="hfm_checkconfig"
+stop_postcmd="hfm_postcmd"
+
+hfm_checkconfig() {
+        eval ${command} ${hfm_flags} -n
+}
 
 hfm_start() {
 	echo "Staring ${name}."
@@ -42,6 +48,7 @@ hfm_postcmd() {
 	[ -f ${pidfile} ] && rm ${pidfile}
 }
 
-load_rc_config $name
+extra_commands="configtest"
+load_rc_config "${name}"
 run_rc_command "$1"
 
diff --git a/sysutils/hfm/pkg-message b/sysutils/hfm/pkg-message
index 52dc919ad1bb..d56d78df9890 100644
--- a/sysutils/hfm/pkg-message
+++ b/sysutils/hfm/pkg-message
@@ -1,5 +1,5 @@
 hfm includes an rc.d script to control a daemon mode.  Use:
 
-sysrc hfh_enable=yes
+sysrc hfm_enable=yes
 
 to enable.
diff --git a/sysutils/hfm/pkg-plist b/sysutils/hfm/pkg-plist
index a6359bce5f99..ad646a0222b5 100644
--- a/sysutils/hfm/pkg-plist
+++ b/sysutils/hfm/pkg-plist
@@ -2,6 +2,7 @@ bin/hfm
 %%PORTDOCS%%%%DOCSDIR%%/README.md
 %%PORTDOCS%%%%DOCSDIR%%/architecture-90dpi.png
 %%PORTDOCS%%%%DOCSDIR%%/architecture.svg
+%%PORTDOCS%%%%DOCSDIR%%/hfm-mascot.png
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/hfm-test-fast.conf
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/hfm-test-start-delay.conf
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/hfm.conf.sample