Index: branches/2019Q2/sysutils/cbsd/Makefile
===================================================================
--- branches/2019Q2/sysutils/cbsd/Makefile	(revision 504846)
+++ branches/2019Q2/sysutils/cbsd/Makefile	(revision 504847)
@@ -1,54 +1,54 @@
 # $FreeBSD$
 
 PORTNAME=	cbsd
-DISTVERSION=	12.0.7
+DISTVERSION=	12.0.12
 CATEGORIES=	sysutils
 
 MAINTAINER=	olevole@olevole.ru
-COMMENT=	Yet another FreeBSD Jail and Bhyve Management Utility
+COMMENT=	Yet another FreeBSD Jail, XEN 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: branches/2019Q2/sysutils/cbsd/distinfo
===================================================================
--- branches/2019Q2/sysutils/cbsd/distinfo	(revision 504846)
+++ branches/2019Q2/sysutils/cbsd/distinfo	(revision 504847)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1553094215
-SHA256 (cbsd-cbsd-12.0.7_GH0.tar.gz) = 5e5502ac5b3f344db3c19fd46652a9677169defc974b07a6dd4f7e7182b38ee3
-SIZE (cbsd-cbsd-12.0.7_GH0.tar.gz) = 5802413
+TIMESTAMP = 1561159892
+SHA256 (cbsd-cbsd-12.0.12_GH0.tar.gz) = 9874d8956bb6eacf9d6f95370403d86f6ecd0902c6b0fc51a77e1d30348854de
+SIZE (cbsd-cbsd-12.0.12_GH0.tar.gz) = 5823712
Index: branches/2019Q2
===================================================================
--- branches/2019Q2	(revision 504846)
+++ branches/2019Q2	(revision 504847)

Property changes on: branches/2019Q2
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r504846