--- Makefile.orig	2017-12-12 17:55:44 UTC

+++ Makefile

@@ -45,9 +45,7 @@ cbsd:

 	${CC} bin/cbsdssh6.c -o bin/cbsdssh6 -lssh2 -L/usr/local/lib -I/usr/local/include && ${STRIP} bin/cbsdssh6

 	${CC} bin/cfetch.c -o bin/cfetch -lfetch -L/usr/local/lib -I/usr/local/include && ${STRIP} bin/cfetch

 	${CC} sbin/netmask.c -o sbin/netmask && ${STRIP} sbin/netmask

-	${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 -static `pkg-config sqlite3 --cflags --libs --static` -lm -lc++ -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

--- bin/cbsdsh/Makefile.orig	2018-01-13 11:07:12 UTC

+++ bin/cbsdsh/Makefile

@@ -20,7 +20,7 @@ WITHOUT_MAN=	yes

 NOMAN=		yes

 DPADD= ${LIBEDIT} ${LIBTERMCAP}

-LDADD= -ledit -ltermcap -lsqlite3 -lm -pthread -ljail

+LDADD= -ledit -ltermcap -lm -pthread -ljail `pkg-config sqlite3 --libs --static` -lm -lc++

 #CFLAGS+=-DSHELL -I. -I${.CURDIR} -DCBSD -I/usr/local/include -L/usr/lib -L/usr/local/lib

 CFLAGS+=-DSHELL -static -I. -I${.CURDIR} -DCBSD -I/usr/local/include -L/usr/local/lib