3 files changed, 28 insertions, 29 deletions
diff --git a/net/zabbix/scripts/dbsetup.sh b/net/zabbix/scripts/dbsetup.sh
index 4ae8e4381893..240f46157640 100644
--- a/net/zabbix/scripts/dbsetup.sh
+++ b/net/zabbix/scripts/dbsetup.sh
@@ -1,5 +1,6 @@
 #!/bin/sh
 
-echo "create database zabbix;" | mysql
-cat mysql/schema.sql | mysql zabbix
-cat data/data.sql | mysql zabbix
+{
+	echo "create database zabbix; use zabbix;"
+	cat mysql/schema.sql data/data.sql
+} | mysql ${*}
diff --git a/net/zabbix/scripts/zabbix-agent.sh.sample b/net/zabbix/scripts/zabbix-agent.sh.sample
index e5728bd24051..1001c6cb694f 100644
--- a/net/zabbix/scripts/zabbix-agent.sh.sample
+++ b/net/zabbix/scripts/zabbix-agent.sh.sample
@@ -1,14 +1,14 @@
 #!/bin/sh
 
-case "${1}" in
-	start)
-		echo -n "zabbix-agent "
-		zabbix_agentd
-		;;
-	stop)
-		killall zabbix_agentd
-		;;
-	*)
-		echo Usage: `basename ${0}` "{start|stop}"
-		;;
-esac
+prefix=%PREFIX%
+
+zabbix_agentd_enable="YES"
+
+. %LOCALBASE%/etc/rc.subr
+
+name="zabbix_agentd"
+rcvar=`set_rcvar`
+command="${prefix}/bin/${name}"
+required_files="/etc/zabbix/${name}.conf"
+
+run_rc_command "$1"
diff --git a/net/zabbix/scripts/zabbix.sh.sample b/net/zabbix/scripts/zabbix.sh.sample
index 58c0529b4099..01a0fbce27ef 100644
--- a/net/zabbix/scripts/zabbix.sh.sample
+++ b/net/zabbix/scripts/zabbix.sh.sample
@@ -1,16 +1,14 @@
 #!/bin/sh
 
-case "${1}" in
-	start)
-		echo -n "zabbix "
-		zabbix_suckerd
-		zabbix_trapperd
-		;;
-	stop)
-		killall zabbix_suckerd
-		killall zabbix_trapperd
-		;;
-	*)
-		echo Usage: `basename ${0}` "{start|stop}"
-		;;
-esac
+prefix=%PREFIX%
+
+zabbix_suckerd_enable="YES"
+
+. %LOCALBASE%/etc/rc.subr
+
+name="zabbix_suckerd"
+rcvar=`set_rcvar`
+command="${prefix}/bin/${name}"
+required_files="/etc/zabbix/${name}.conf"
+
+run_rc_command "$1"