sysutils/cbsd: update to 12.0.0

PR:		232508
Submitted by:	olevole@olevole.ru (maintainer)

5 files changed, 4 insertions, 37 deletions

diff --git a/sysutils/cbsd/Makefile b/sysutils/cbsd/Makefile
index e203c0b564a6..6ead02c5f8bf 100644
--- a/sysutils/cbsd/Makefile
+++ b/sysutils/cbsd/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	cbsd
-DISTVERSION=	11.2.1
+DISTVERSION=	12.0.0
 CATEGORIES=	sysutils
 
 MAINTAINER=	olevole@olevole.ru
diff --git a/sysutils/cbsd/distinfo b/sysutils/cbsd/distinfo
index 27bb47997f27..38101d2ffbe3 100644
--- a/sysutils/cbsd/distinfo
+++ b/sysutils/cbsd/distinfo
@@ -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 = 1540505309
+SHA256 (cbsd-cbsd-12.0.0_GH0.tar.gz) = 61c784260099ff15a7671493f647c33c4dde38c81e56a8c47fae6040dfc26f0c
+SIZE (cbsd-cbsd-12.0.0_GH0.tar.gz) = 5743751
diff --git a/sysutils/cbsd/files/patch-Makefile b/sysutils/cbsd/files/patch-Makefile
deleted file mode 100644
index 4c3e7a129e18..000000000000
--- a/sysutils/cbsd/files/patch-Makefile
+++ /dev/null
@@ -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 --git a/sysutils/cbsd/files/patch-bin_cbsdsh_Makefile b/sysutils/cbsd/files/patch-bin_cbsdsh_Makefile
deleted file mode 100644
index cce045701e5b..000000000000
--- a/sysutils/cbsd/files/patch-bin_cbsdsh_Makefile
+++ /dev/null
@@ -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 --git a/sysutils/cbsd/files/patch-sudoexec_initenv b/sysutils/cbsd/files/patch-sudoexec_initenv
deleted file mode 100644
index b637af3a1aa9..000000000000
--- a/sysutils/cbsd/files/patch-sudoexec_initenv
+++ /dev/null
@@ -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