diff -ruN cbsd.bak/Makefile cbsd/Makefile
--- cbsd.bak/Makefile	2018-10-21 18:25:44.109626000 +0300
+++ cbsd/Makefile	2018-10-21 18:26:51.997075000 +0300
@@ -1,7 +1,7 @@
 # $FreeBSD: head/sysutils/cbsd/Makefile 481034 2018-10-01 14:22:37Z 0mp $
 
 PORTNAME=	cbsd
-DISTVERSION=	11.2.1
+DISTVERSION=	12.0.0
 CATEGORIES=	sysutils
 
 MAINTAINER=	olevole@olevole.ru
diff -ruN cbsd.bak/distinfo cbsd/distinfo
--- cbsd.bak/distinfo	2018-10-21 18:25:44.128888000 +0300
+++ cbsd/distinfo	2018-10-21 18:27:04.339232000 +0300
@@ -1,3 +1,3 @@
-TIMESTAMP = 1532783608
-SHA256 (cbsd-cbsd-11.2.1_GH0.tar.gz) = 6b3db975624fbd007bd08df8dd339048f7e7767b77e46eed910fcfbc7a68af61
-SIZE (cbsd-cbsd-11.2.1_GH0.tar.gz) = 5600235
+TIMESTAMP = 1540135624
+SHA256 (cbsd-cbsd-12.0.0_GH0.tar.gz) = 2d35e8ab9d1fdf392faed3df35adda385dccde35da0224303d6cf80189ae8e9a
+SIZE (cbsd-cbsd-12.0.0_GH0.tar.gz) = 5743711
diff -ruN cbsd.bak/files/patch-Makefile cbsd/files/patch-Makefile
--- cbsd.bak/files/patch-Makefile	2018-10-21 18:25:44.255738000 +0300
+++ cbsd/files/patch-Makefile	1970-01-01 03:00:00.000000000 +0300
@@ -1,11 +0,0 @@
---- Makefile.orig	2018-09-28 16:15:34 UTC
-+++ Makefile
-@@ -76,7 +76,7 @@ cbsd: pkg-config-check
- 	#${CC} misc/src/sqlcli.c -static -pthread -lsqlite3 -lm -L/usr/local/lib -I/usr/local/include -o misc/sqlcli && ${STRIP} misc/sqlcli
- 	# ICU?
- 	#${CC} misc/src/sqlcli.c -static -pthread -lsqlite3 -lpthread -licui18n -licuuc -licudata -lm -L/usr/local/lib -I/usr/local/include -o misc/sqlcli && ${STRIP} misc/sqlcli
--	${CC} misc/src/sqlcli.c `pkg-config sqlite3 --cflags --libs` -lm -lc++ -o misc/sqlcli && ${STRIP} misc/sqlcli
-+	${CC} misc/src/sqlcli.c `pkg-config sqlite3 --cflags --libs` -lm -o misc/sqlcli && ${STRIP} misc/sqlcli
- 	${CC} misc/src/cbsdlogtail.c -o misc/cbsdlogtail && ${STRIP} misc/cbsdlogtail
- 	${CC} misc/src/pwcrypt.c -lcrypt -o misc/pwcrypt && ${STRIP} misc/pwcrypt
- 	${CC} misc/src/chk_arp_byip.c -o misc/chk_arp_byip && ${STRIP} misc/chk_arp_byip
diff -ruN cbsd.bak/files/patch-bin_cbsdsh_Makefile cbsd/files/patch-bin_cbsdsh_Makefile
--- cbsd.bak/files/patch-bin_cbsdsh_Makefile	2018-10-21 18:25:44.202697000 +0300
+++ cbsd/files/patch-bin_cbsdsh_Makefile	1970-01-01 03:00:00.000000000 +0300
@@ -1,11 +0,0 @@
---- bin/cbsdsh/Makefile.orig	2018-09-28 16:10:13 UTC
-+++ bin/cbsdsh/Makefile
-@@ -21,7 +21,7 @@ NOMAN=		yes
- 
- DPADD= ${LIBEDIT} ${LIBTERMCAP}
- #LDADD= -ledit -ltermcap -lsqlite3 -lm -pthread -ljail
--LDADD= -ledit -ltermcap -lm -pthread -ljail `pkg-config sqlite3 --libs` -lm -lc++
-+LDADD= -ledit -ltermcap -lm -pthread -ljail `pkg-config sqlite3 --libs` -lm
- 
- #CFLAGS+=-DSHELL -I. -I${.CURDIR} -DCBSD -I/usr/local/include -L/usr/lib -L/usr/local/lib
- CFLAGS+=-DSHELL -I. -I${.CURDIR} -DCBSD -I/usr/local/include -L/usr/local/lib
diff -ruN cbsd.bak/files/patch-sudoexec_initenv cbsd/files/patch-sudoexec_initenv
--- cbsd.bak/files/patch-sudoexec_initenv	2018-10-21 18:25:44.221447000 +0300
+++ cbsd/files/patch-sudoexec_initenv	1970-01-01 03:00:00.000000000 +0300
@@ -1,11 +0,0 @@
---- sudoexec/initenv.orig	2018-09-28 16:11:43 UTC
-+++ sudoexec/initenv
-@@ -264,7 +264,7 @@ phase2()
- 			echo "pkg-config must be present on the system to build CBSD from the source. Please install it first: pkg install pkgconf";
- 			exit 1
- 		fi
--		${CC_CMD} ${distdir}/misc/src/sqlcli.c $( pkg-config sqlite3 --cflags --libs ) -lm -lc++ -o ${distdir}/misc/sqlcli
-+		${CC_CMD} ${distdir}/misc/src/sqlcli.c $( pkg-config sqlite3 --cflags --libs ) -lm -o ${distdir}/misc/sqlcli
- 	fi
- 	installne "-s -o ${cbsduser} -g ${cbsduser} -m 500" ${distdir}/misc/sqlcli ${miscdir}/sqlcli
- 	[ -f ${distdir}/misc/sqlcli ] && /bin/rm -f ${distdir}/misc/sqlcli