Index: branches/2020Q4/sysutils/cbsd/Makefile
===================================================================
--- branches/2020Q4/sysutils/cbsd/Makefile	(revision 555500)
+++ branches/2020Q4/sysutils/cbsd/Makefile	(revision 555501)
@@ -1,59 +1,59 @@
 # $FreeBSD$
 
 PORTNAME=	cbsd
-DISTVERSION=	12.2.1
+DISTVERSION=	12.2.2
 CATEGORIES=	sysutils
 
 MAINTAINER=	olevole@olevole.ru
 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=		compiler:c++11-lang libedit pkgconfig:both
 USE_GITHUB=	yes
 USE_RC_SUBR=	cbsdd cbsdrsyncd cbsd-statsd-bhyve cbsd-statsd-hoster cbsd-statsd-jail
 
 SUB_FILES=	pkg-message pkg-deinstall
 
 CBSD_HOME?=	${PREFIX}/cbsd
 
 USERS=	${PORTNAME}
 GROUPS=	${PORTNAME}
 
 BIN_FILES=	\
 		bin/cbsdsh/mknodes \
 		bin/cbsdsh/mksyntax
 
 .include <bsd.port.options.mk>
 
 .if ${ARCH} != amd64 && ${ARCH} != i386
 EXTRA_PATCHES=	${FILESDIR}/extra-patch-Makefile \
 		${FILESDIR}/extra-patch-sudoexec_initenv
 .endif
 
 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/2020Q4/sysutils/cbsd/distinfo
===================================================================
--- branches/2020Q4/sysutils/cbsd/distinfo	(revision 555500)
+++ branches/2020Q4/sysutils/cbsd/distinfo	(revision 555501)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1605026717
-SHA256 (cbsd-cbsd-12.2.1_GH0.tar.gz) = 324df410029374c17a8d8f70591f798ad20367d2257fcf2139ecbb319e31ee38
-SIZE (cbsd-cbsd-12.2.1_GH0.tar.gz) = 5899098
+TIMESTAMP = 1605547100
+SHA256 (cbsd-cbsd-12.2.2_GH0.tar.gz) = 9032a833297b4cd35d2c94c8c60039ee2eceef79f07e0b64a580af5fbee8a23d
+SIZE (cbsd-cbsd-12.2.2_GH0.tar.gz) = 5902135
Index: branches/2020Q4
===================================================================
--- branches/2020Q4	(revision 555500)
+++ branches/2020Q4	(revision 555501)

Property changes on: branches/2020Q4
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r555500