diff -ruN cbsd.bak/Makefile cbsd/Makefile
--- cbsd.bak/Makefile	2019-04-19 21:17:11.953072000 +0300
+++ cbsd/Makefile	2019-04-19 21:20:51.753708000 +0300
@@ -1,8 +1,7 @@
 # $FreeBSD: head/sysutils/cbsd/Makefile 497567 2019-04-02 17:13:23Z krion $
 
 PORTNAME=	cbsd
-DISTVERSION=	12.0.8
-PORTREVISION=	1
+DISTVERSION=	12.0.9
 CATEGORIES=	sysutils
 
 MAINTAINER=	olevole@olevole.ru
diff -ruN cbsd.bak/distinfo cbsd/distinfo
--- cbsd.bak/distinfo	2019-04-19 21:17:11.992789000 +0300
+++ cbsd/distinfo	2019-04-19 21:21:08.023436000 +0300
@@ -1,3 +1,3 @@
-TIMESTAMP = 1554152513
-SHA256 (cbsd-cbsd-12.0.8_GH0.tar.gz) = 67b29a51eb2617ef731673e6b17f3defedf2b4bb9b8e2c394b3eb5ed82dbeefd
-SIZE (cbsd-cbsd-12.0.8_GH0.tar.gz) = 5802841
+TIMESTAMP = 1555698068
+SHA256 (cbsd-cbsd-12.0.9_GH0.tar.gz) = ccaa127065293375d483ac4e6562e03b01c8c1b15e16d469d49fa1fe7fcd1c30
+SIZE (cbsd-cbsd-12.0.9_GH0.tar.gz) = 5807366
diff -ruN cbsd.bak/files/cbsd-statsd-bhyve.in cbsd/files/cbsd-statsd-bhyve.in
--- cbsd.bak/files/cbsd-statsd-bhyve.in	2019-04-19 21:17:12.040427000 +0300
+++ cbsd/files/cbsd-statsd-bhyve.in	2019-04-19 21:19:34.146557000 +0300
@@ -17,13 +17,13 @@
 : ${cbsd_statsd_bhyve_enable:="NO"}
 
 export workdir="${cbsd_workdir}"
-globalconf=${cbsd_globalconf:-"${workdir}/cbsd.conf"}
+globalconf=${cbsd_globalconf:-"%%PREFIX%%/cbsd/cbsd.conf"}
 
 start_cmd=${name}_start
 restart_cmd=${name}_restart
 extra_commands="restart"
 
-command="${cbsd_workdir}/tools/racct-bhyve-statsd"
+command="%%PREFIX%%/cbsd/tools/racct-bhyve-statsd"
 pidfile="/var/run/$name.pid"
 command_args="&"
 
@@ -84,7 +84,7 @@
 			;;
 	esac
 
-	exec env workdir=${cbsd_workdir} ${cbsd_workdir}/tools/racct-bhyve-statsd ${args}
+	exec env workdir=${cbsd_workdir} %%PREFIX%%/cbsd/tools/racct-bhyve-statsd ${args}
 }
 
 cbsd_statsd_bhyve_restart()
diff -ruN cbsd.bak/files/cbsd-statsd-hoster.in cbsd/files/cbsd-statsd-hoster.in
--- cbsd.bak/files/cbsd-statsd-hoster.in	2019-04-19 21:17:12.052416000 +0300
+++ cbsd/files/cbsd-statsd-hoster.in	2019-04-19 21:19:38.290526000 +0300
@@ -17,13 +17,13 @@
 : ${cbsd_statsd_hoster_enable:="NO"}
 
 export workdir="${cbsd_workdir}"
-globalconf=${cbsd_globalconf:-"${workdir}/cbsd.conf"}
+globalconf=${cbsd_globalconf:-"%%PREFIX%%/cbsd/cbsd.conf"}
 
 start_cmd=${name}_start
 restart_cmd=${name}_restart
 extra_commands="restart"
 
-command="${cbsd_workdir}/tools/racct-hoster-statsd"
+command="%%PREFIX%%/cbsd/tools/racct-hoster-statsd"
 pidfile="/var/run/$name.pid"
 command_args="&"
 
@@ -84,7 +84,7 @@
 			;;
 	esac
 
-	exec env workdir=${cbsd_workdir} ${cbsd_workdir}/tools/racct-hoster-statsd ${args}
+	exec env workdir=${cbsd_workdir} %%PREFIX%%/cbsd/tools/racct-hoster-statsd ${args}
 }
 
 cbsd_statsd_hoster_restart()
diff -ruN cbsd.bak/files/cbsd-statsd-jail.in cbsd/files/cbsd-statsd-jail.in
--- cbsd.bak/files/cbsd-statsd-jail.in	2019-04-19 21:17:12.047182000 +0300
+++ cbsd/files/cbsd-statsd-jail.in	2019-04-19 21:19:42.866470000 +0300
@@ -17,13 +17,13 @@
 : ${cbsd_statsd_jail_enable:="NO"}
 
 export workdir="${cbsd_workdir}"
-globalconf=${cbsd_globalconf:-"${workdir}/cbsd.conf"}
+globalconf=${cbsd_globalconf:-"%%PREFIX%%/cbsd/cbsd.conf"}
 
 start_cmd=${name}_start
 restart_cmd=${name}_restart
 extra_commands="restart"
 
-command="${cbsd_workdir}/tools/racct-jail-statsd"
+command="%%PREFIX%%/cbsd/tools/racct-jail-statsd"
 pidfile="/var/run/$name.pid"
 command_args="&"
 
@@ -84,7 +84,7 @@
 			;;
 	esac
 
-	exec env workdir=${cbsd_workdir} ${cbsd_workdir}/tools/racct-jail-statsd ${args}
+	exec env workdir=${cbsd_workdir} %%PREFIX%%/cbsd/tools/racct-jail-statsd ${args}
 }
 
 cbsd_statsd_jail_restart()
diff -ruN cbsd.bak/files/patch-nc.subr cbsd/files/patch-nc.subr
--- cbsd.bak/files/patch-nc.subr	2019-04-19 21:17:12.007028000 +0300
+++ cbsd/files/patch-nc.subr	1970-01-01 03:00:00.000000000 +0300
@@ -1,15 +0,0 @@
---- nc.subr.orig	2019-04-01 20:14:44 UTC
-+++ nc.subr
-@@ -139,9 +139,10 @@ init() {
- 		VAL=$( substr --pos=$(( ${_pos} +2 )) --len=${_pref} --str="${1}" )
- 		IFS=" "
- 		VAL=$( echo ${VAL} | /usr/bin/tr -d '"' )		# strip extra quotes
--		if [ ${double_args} -eq 0 -a -n "${VAL}" ]; then
-+		if [ ${double_args} -eq 0 ]; then
- 			shift
--			continue	# value already set, skip
-+			eval T="\$$ARG"
-+			[ -n "${T}" ] && continue	# value already set, skip
- 		fi
- 		i=$(( i + 1 ))
- 		eval "${ARG}='${VAL}'";