Update to 12.0.9

PR:		237394
Submitted by:	maintainer

6 files changed, 13 insertions, 29 deletions

diff --git a/sysutils/cbsd/Makefile b/sysutils/cbsd/Makefile
index de0fbe1ed143..68e179d34af7 100644
--- a/sysutils/cbsd/Makefile
+++ b/sysutils/cbsd/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	cbsd
-DISTVERSION=	12.0.8
-PORTREVISION=	1
+DISTVERSION=	12.0.9
 CATEGORIES=	sysutils
 
 MAINTAINER=	olevole@olevole.ru
diff --git a/sysutils/cbsd/distinfo b/sysutils/cbsd/distinfo
index c5c44da472d0..ed0483b71946 100644
--- a/sysutils/cbsd/distinfo
+++ b/sysutils/cbsd/distinfo
@@ -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 --git a/sysutils/cbsd/files/cbsd-statsd-bhyve.in b/sysutils/cbsd/files/cbsd-statsd-bhyve.in
index 3da82bc1fc4b..6aa40abc7f8f 100644
--- a/sysutils/cbsd/files/cbsd-statsd-bhyve.in
+++ b/sysutils/cbsd/files/cbsd-statsd-bhyve.in
@@ -17,13 +17,13 @@ load_rc_config $name
 : ${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 @@ cbsd_statsd_bhyve_start()
 			;;
 	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 --git a/sysutils/cbsd/files/cbsd-statsd-hoster.in b/sysutils/cbsd/files/cbsd-statsd-hoster.in
index 28aacfd16334..ae09eaae83ff 100644
--- a/sysutils/cbsd/files/cbsd-statsd-hoster.in
+++ b/sysutils/cbsd/files/cbsd-statsd-hoster.in
@@ -17,13 +17,13 @@ load_rc_config $name
 : ${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 @@ cbsd_statsd_hoster_start()
 			;;
 	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 --git a/sysutils/cbsd/files/cbsd-statsd-jail.in b/sysutils/cbsd/files/cbsd-statsd-jail.in
index fda4ffbbe273..e650b07ab252 100644
--- a/sysutils/cbsd/files/cbsd-statsd-jail.in
+++ b/sysutils/cbsd/files/cbsd-statsd-jail.in
@@ -17,13 +17,13 @@ load_rc_config $name
 : ${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 @@ cbsd_statsd_jail_start()
 			;;
 	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 --git a/sysutils/cbsd/files/patch-nc.subr b/sysutils/cbsd/files/patch-nc.subr
deleted file mode 100644
index 8f03ed265b9b..000000000000
--- a/sysutils/cbsd/files/patch-nc.subr
+++ /dev/null
@@ -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}'";