Index: head/sysutils/cbsd/Makefile
===================================================================
--- head/sysutils/cbsd/Makefile	(revision 499380)
+++ head/sysutils/cbsd/Makefile	(revision 499381)
@@ -1,55 +1,54 @@
 # $FreeBSD$
 
 PORTNAME=	cbsd
-DISTVERSION=	12.0.8
-PORTREVISION=	1
+DISTVERSION=	12.0.9
 CATEGORIES=	sysutils
 
 MAINTAINER=	olevole@olevole.ru
 COMMENT=	Yet another FreeBSD Jail and Bhyve Management Utility
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	rsync:net/rsync \
 		sudo:security/sudo \
 		sqlite3:databases/sqlite3 \
 		${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss
 LIB_DEPENDS=	libssh2.so:security/libssh2 \
 		libsqlite3.so:databases/sqlite3
 
 USES=		libedit pkgconfig:both
 USE_GITHUB=	yes
 USE_RC_SUBR=	cbsdd cbsdrsyncd cbsd-statsd-bhyve cbsd-statsd-hoster cbsd-statsd-jail
 
 CFLAGS_powerpc64=	-mminimal-toc
 
 SUB_FILES=	pkg-message pkg-deinstall
 
 CBSD_HOME?=	${PREFIX}/cbsd
 
 USERS=	${PORTNAME}
 GROUPS=	${PORTNAME}
 
 BIN_FILES=	\
 		bin/cbsdsh/mknodes \
 		bin/cbsdsh/mksyntax
 
 do-install:
 	@${ECHO} "Installing in ${CBSD_HOME}"
 	${MKDIR} ${STAGEDIR}${CBSD_HOME}
 	${CP} -a ${WRKSRC}/ ${STAGEDIR}${CBSD_HOME}
 .for i in ${BIN_FILES}
 	${STRIP_CMD} ${STAGEDIR}${CBSD_HOME}/${i}
 .endfor
 	${INSTALL_MAN} ${WRKSRC}/man/cbsd.8 ${STAGEDIR}${PREFIX}/man/man8/cbsd.8
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/cbsdsh/cbsd ${STAGEDIR}${PREFIX}/bin
 
 post-install:
 	${CAT} ${PKGDIR}/pkg-plist-chunk > ${TMPPLIST} ;
 	@${FIND} -s ${STAGEDIR}${CBSD_HOME} -not -type d | ${SORT} | \
 	${SED} -e 's#^${STAGEDIR}${PREFIX}/##' >> ${TMPPLIST}
 	@${MKDIR} ${STAGEDIR}${PREFIX}/libexec/bsdconfig
 	@${LN} -sf ${CBSD_HOME}/share/bsdconfig/cbsd ${STAGEDIR}${PREFIX}/libexec/bsdconfig/cbsd
 
 .include <bsd.port.mk>
Index: head/sysutils/cbsd/distinfo
===================================================================
--- head/sysutils/cbsd/distinfo	(revision 499380)
+++ head/sysutils/cbsd/distinfo	(revision 499381)
@@ -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
Index: head/sysutils/cbsd/files/patch-nc.subr
===================================================================
--- head/sysutils/cbsd/files/patch-nc.subr	(revision 499380)
+++ head/sysutils/cbsd/files/patch-nc.subr	(nonexistent)
@@ -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}'";

Property changes on: head/sysutils/cbsd/files/patch-nc.subr
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/sysutils/cbsd/files/cbsd-statsd-bhyve.in
===================================================================
--- head/sysutils/cbsd/files/cbsd-statsd-bhyve.in	(revision 499380)
+++ head/sysutils/cbsd/files/cbsd-statsd-bhyve.in	(revision 499381)
@@ -1,96 +1,96 @@
 #!/bin/sh
 #
 # PROVIDE: cbsd_statsd_bhyve
 # REQUIRE: LOGIN FILESYSTEMS sshd
 # KEYWORD: shutdown
 #
 # cbsd_statsd_bhyve_enable="YES"
 #
 
 . /etc/rc.subr
 
 name=cbsd_statsd_bhyve
 rcvar=cbsd_statsd_bhyve_enable
 load_rc_config $name
 
 # Set defaults
 : ${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="&"
 
 pidfile=/var/run/racct-bhyve-statsd.pid
 
 if [ ! -f ${globalconf} ]; then
 	echo "cbsd: no such ${globalconf}";
 	exit 1
 fi
 
 if [ ! -f ${subr} ]; then
 	echo "cbsd: no such ${subr}";
 	exit 1
 fi
 
 . ${globalconf}
 . ${subr}
 
 cbsd_statsd_bhyve_start()
 {
 	local args= racct_enabled=
 
 	# RACCT enabled?
 	racct_enabled=$( /sbin/sysctl -qn kern.racct.enable )
 	[ $? -ne 0 ] && err 1 "cbsd-statsd-bhyve: RACCT not enabled"
 	[ "${racct_enabled}" != "1" ] && err 1 "cbsd-statsd-bhyve: RACCT not enabled"
 
 	readconf racct-bhyve-statsd.conf
 	[ -n "${log_file}" ] && args="${args} --log_file=${log_file}"
 	[ -n "${log_level}" ] && args="${args} --log_level=${log_level}"
 	[ -n "${loop_interval}" ] && args="${args} --loop_interval=${loop_interval}"
 	[ -n "${save_loop_count}" ] && args="${args} --save_loop_count=${save_loop_count}"
 
 	case "${prometheus_exporter_enable}" in
 		[Yy][Ee][Ss])
 			args="${args} --prometheus_exporter=1"
 			;;
 		[No][Oo])
 			args="${args} --prometheus_exporter=0"
 			;;
 	esac
 
 	case "${beanstald_enable}" in
 		[Yy][Ee][Ss])
 			args="${args} --save_beanstalkd=1"
 			;;
 		[No][Oo])
 			args="${args} --save_beanstalkd=0"
 			;;
 	esac
 
 	case "${sqlite3_enable}" in
 		[Yy][Ee][Ss])
 			args="${args} --save_sqlite=1"
 			;;
 		[No][Oo])
 			args="${args} --save_sqlite=0"
 			;;
 	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()
 {
 	cbsd_statsd_bhyve_stop
 	cbsd_statsd_bhyve_start
 }
 
 run_rc_command "$1"
Index: head/sysutils/cbsd/files/cbsd-statsd-hoster.in
===================================================================
--- head/sysutils/cbsd/files/cbsd-statsd-hoster.in	(revision 499380)
+++ head/sysutils/cbsd/files/cbsd-statsd-hoster.in	(revision 499381)
@@ -1,96 +1,96 @@
 #!/bin/sh
 #
 # PROVIDE: cbsd_statsd_hoster
 # REQUIRE: LOGIN FILESYSTEMS sshd
 # KEYWORD: shutdown
 #
 # cbsd_statsd_hoster_enable="YES"
 #
 
 . /etc/rc.subr
 
 name=cbsd_statsd_hoster
 rcvar=cbsd_statsd_hoster_enable
 load_rc_config $name
 
 # Set defaults
 : ${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="&"
 
 pidfile=/var/run/racct-hoster-statsd.pid
 
 if [ ! -f ${globalconf} ]; then
 	echo "cbsd: no such ${globalconf}";
 	exit 1
 fi
 
 if [ ! -f ${subr} ]; then
 	echo "cbsd: no such ${subr}";
 	exit 1
 fi
 
 . ${globalconf}
 . ${subr}
 
 cbsd_statsd_hoster_start()
 {
 	local args= racct_enabled=
 
 	# RACCT enabled?
 	racct_enabled=$( /sbin/sysctl -qn kern.racct.enable )
 	[ $? -ne 0 ] && err 1 "cbsd-statsd-hoster: RACCT not enabled"
 	[ "${racct_enabled}" != "1" ] && err 1 "cbsd-statsd-hoster: RACCT not enabled"
 
 	readconf racct-hoster-statsd.conf
 	[ -n "${log_file}" ] && args="${args} --log_file=${log_file}"
 	[ -n "${log_level}" ] && args="${args} --log_level=${log_level}"
 	[ -n "${loop_interval}" ] && args="${args} --loop_interval=${loop_interval}"
 	[ -n "${save_loop_count}" ] && args="${args} --save_loop_count=${save_loop_count}"
 
 	case "${prometheus_exporter_enable}" in
 		[Yy][Ee][Ss])
 			args="${args} --prometheus_exporter=1"
 			;;
 		[No][Oo])
 			args="${args} --prometheus_exporter=0"
 			;;
 	esac
 
 	case "${beanstald_enable}" in
 		[Yy][Ee][Ss])
 			args="${args} --save_beanstalkd=1"
 			;;
 		[No][Oo])
 			args="${args} --save_beanstalkd=0"
 			;;
 	esac
 
 	case "${sqlite3_enable}" in
 		[Yy][Ee][Ss])
 			args="${args} --save_sqlite=1"
 			;;
 		[No][Oo])
 			args="${args} --save_sqlite=0"
 			;;
 	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()
 {
 	cbsd_statsd_hoster_stop
 	cbsd_statsd_hoster_start
 }
 
 run_rc_command "$1"
Index: head/sysutils/cbsd/files/cbsd-statsd-jail.in
===================================================================
--- head/sysutils/cbsd/files/cbsd-statsd-jail.in	(revision 499380)
+++ head/sysutils/cbsd/files/cbsd-statsd-jail.in	(revision 499381)
@@ -1,96 +1,96 @@
 #!/bin/sh
 #
 # PROVIDE: cbsd_statsd_jail
 # REQUIRE: LOGIN FILESYSTEMS sshd
 # KEYWORD: shutdown
 #
 # cbsd_statsd_jail_enable="YES"
 #
 
 . /etc/rc.subr
 
 name=cbsd_statsd_jail
 rcvar=cbsd_statsd_jail_enable
 load_rc_config $name
 
 # Set defaults
 : ${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="&"
 
 pidfile=/var/run/racct-jail-statsd.pid
 
 if [ ! -f ${globalconf} ]; then
 	echo "cbsd: no such ${globalconf}";
 	exit 1
 fi
 
 if [ ! -f ${subr} ]; then
 	echo "cbsd: no such ${subr}";
 	exit 1
 fi
 
 . ${globalconf}
 . ${subr}
 
 cbsd_statsd_jail_start()
 {
 	local args= racct_enabled=
 
 	# RACCT enabled?
 	racct_enabled=$( /sbin/sysctl -qn kern.racct.enable )
 	[ $? -ne 0 ] && err 1 "cbsd-statsd-jail: RACCT not enabled"
 	[ "${racct_enabled}" != "1" ] && err 1 "cbsd-statsd-jail: RACCT not enabled"
 
 	readconf racct-jail-statsd.conf
 	[ -n "${log_file}" ] && args="${args} --log_file=${log_file}"
 	[ -n "${log_level}" ] && args="${args} --log_level=${log_level}"
 	[ -n "${loop_interval}" ] && args="${args} --loop_interval=${loop_interval}"
 	[ -n "${save_loop_count}" ] && args="${args} --save_loop_count=${save_loop_count}"
 
 	case "${prometheus_exporter_enable}" in
 		[Yy][Ee][Ss])
 			args="${args} --prometheus_exporter=1"
 			;;
 		[No][Oo])
 			args="${args} --prometheus_exporter=0"
 			;;
 	esac
 
 	case "${beanstald_enable}" in
 		[Yy][Ee][Ss])
 			args="${args} --save_beanstalkd=1"
 			;;
 		[No][Oo])
 			args="${args} --save_beanstalkd=0"
 			;;
 	esac
 
 	case "${sqlite3_enable}" in
 		[Yy][Ee][Ss])
 			args="${args} --save_sqlite=1"
 			;;
 		[No][Oo])
 			args="${args} --save_sqlite=0"
 			;;
 	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()
 {
 	cbsd_statsd_jail_stop
 	cbsd_statsd_jail_start
 }
 
 run_rc_command "$1"