diff --git a/cad/kicad-devel/Makefile b/cad/kicad-devel/Makefile
index 1026ffcebe9d..4802cb5a8bae 100644
--- a/cad/kicad-devel/Makefile
+++ b/cad/kicad-devel/Makefile
@@ -1,163 +1,166 @@
 PORTNAME=	kicad
 DISTVERSION=	r${GIT_SRC_DATE}
 PORTREVISION=	2
 CATEGORIES=	cad
 PKGNAMESUFFIX=	-devel
 DIST_SUBDIR=		${PORTNAME}
 
 MAINTAINER=		mr@FreeBSD.org
 COMMENT=		Schematic and PCB editing software
 WWW=		http://kicad-pcb.org/
 
 LICENSE=	GPLv3
 
 BUILD_DEPENDS=	${LOCALBASE}/bin/git:devel/git \
 		${LOCALBASE}/include/glm/glm.hpp:math/glm \
 		${LOCALBASE}/bin/swig:devel/swig
 LIB_DEPENDS=	libboost_thread.so:devel/boost-libs \
+		libfreetype.so:print/freetype2 \
+		libfontconfig.so:x11-fonts/fontconfig \
 		libharfbuzz.so:print/harfbuzz \
 		libngspice.so:cad/ngspice_rework@shlib \
 		libTKernel.so:cad/opencascade \
 		libpixman-1.so:x11/pixman \
 		libpng.so:graphics/png \
 		libcurl.so:ftp/curl \
-		libGLEW-wayland.so:graphics/glew-wayland
+		libGLEW-wayland.so:graphics/glew-wayland \
+		libodbc.so:databases/unixODBC
 
 CONFLICTS_INSTALL=	kicad # bin/_cvpcb.kiface
 
 BROKEN_aarch64=		Fails to compile: use of undeclared identifier builtin_ia32_emms
 
 OPTIONS_DEFINE=	DOCS
 
 PLIST_SUB=	OPSYS=${OPSYS}	\
 		DESKTOPDIR=${DESKTOPDIR:S|^${PREFIX}/||}
 
 USES=		desktop-file-utils shared-mime-info compiler:c++14-lang tar:bzip2 cmake:insource,noninja \
 		gettext pkgconfig python:3.5+ shebangfix ssl gl xorg gnome
 USE_GITLAB=	yes
 GL_ACCOUNT=	kicad/code
 GL_PROJECT=	kicad
 GL_COMMIT=	${GIT_SRC_HASH}
 USE_GL=		gl glew glu glut
 USE_WX=		3.1
 WX_COMPS=	wx python:lib
-USE_GNOME=	atk cairo	# Required by libwx_gtk2_aui-2.8.so
+USE_GNOME=	atk cairo gtk30 gdkpixbuf2 pango
 USE_XORG+=	ice pixman x11 xext
 BINS=		cvpcb eeschema gerbview kicad pcbnew
 EXTRAS2RM=	linux-non_unicode linux wings3d LINUX.README	\
 		contrib_makefiles.txt running_kicad_under_W98.txt
 SHEBANG_FILES=	pcbnew/python/plugins/touch_slider_wizard.py
 CXXFLAGS+=	-I${WRKSRC} -I${WRKSRC}/include -I${LOCALBASE}/include
 CMAKE_ARGS=	-DLOCALBASE="${LOCALBASE}" \
 		-DCMAKE_BUILD_TYPE="Debug" \
 		-DKICAD_TESTING_VERSION=ON \
 		-DKICAD_VERSION=${DISTVERSION} \
 		-DCMAKE_INCLUDE_PATH="${WRKSRC}/include ${LOCALBASE}/include" \
 		-DwxWidgets_CONFIG_EXECUTABLE="${WX_CONFIG}" \
 		-DwxWidgets_USE_DEBUG=ON \
 		-DwxWidgets_USE_USE_UNICODE=ON \
 		-DwxWidgets_wxrc_EXECUTABLE=${WXRC_CMD} \
 		-DKICAD_SCRIPTING=ON \
 		-DKICAD_SCRIPTING_MODULES=ON \
 		-DKICAD_SCRIPTING_PYTHON3=ON \
 		-DKICAD_SCRIPTING_WXPYTHON=ON \
 		-DKICAD_SCRIPTING_WXPYTHON_PHOENIX=ON \
 		-DKICAD_SKIP_BOOST=YES \
 		-DKICAD_SPICE=ON \
 		-DKICAD_USE_OCE=OFF \
 		-DKICAD_USE_OCC=ON \
 		-DKICAD_USE_EGL=ON \
 		-DOCC_INCLUDE_DIR=${LOCALBASE}/include/OpenCASCADE
 USE_LDCONFIG=	yes
 
 .include "Makefile.git_rev"
 
 showversions:
 	@${ECHO} "GIT_SRC_HASH: ${GIT_SRC_HASH}"
 	@${ECHO} "GIT_SRC_DATE: ${GIT_SRC_DATE}"
 	@${ECHO} "DISTDIR: ${DISTDIR}"
 	@${ECHO} "DIST_SUBDIR: ${DIST_SUBDIR}"
 	@${ECHO} "DISTNAME: ${DISTNAME}"
 	@${ECHO} "DISTVERSION: ${DISTVERSION}"
 
 # Updating to new rev:
 # sh files/newVersion.sh
 # make makesum && make clean
 # make install #breaks probably due to plist differences
 # make makeplist > pkg-plist #One has to edit/review the generated plist
 # make generate-plist && make check-plist
 # < Check PLIST_FILE_LIST below >
 
 tmp:
 	echo "${DATADIR} ${DATADIR:H}"
 
 # The CheckCXXSymbolExists module has been shipped with CMake since 3.0 times.
 # The ancient implementation that this bundled module uses, no longer works
 # because it uses CMake internals that have gone away in 3.11.
 post-extract:
 	${RM} ${WRKSRC}/CMakeModules/CheckCXXSymbolExists.cmake
 
 pre-configure:
 	${REINPLACE_CMD} -e 's|/usr/share/kicad|${DATADIR}|'            \
 		-e 's|/usr/local|${PREFIX}|'                            \
 		${WRKSRC}/common/gestfich.cpp
 	${REINPLACE_CMD} -e 's|/usr/bin/xdg-open|${LOCALBASE}/bin/xdg-open|' \
 		${WRKSRC}/common/pgm_base.cpp
 
 post-configure:
 	${REINPLACE_CMD} -e 's|#define HAVE_ISO646_H|//#define HAVE_ISO646_H|'     \
 		${WRKSRC}/config.h
 	for f in `${FIND} ${WRKSRC} -name \*.make -o -name link.txt` ; do				\
 		${REINPLACE_CMD}						\
 		-e 's|CC = gcc|#CC = gcc|'					\
 		-e 's|LD = gcc|LD = ${CC}|'					\
 		-e 's|LD = g++|LD = ${CXX}|'					\
 		-e 's|wx-config|${WX_CONFIG}|'					\
 		-e 's|CXX_FLAGS =|CXX_FLAGS = ${WRKSRC}/include -I${LOCALBASE}/include|'		\
 		-e 's|C_FLAGS =|C_FLAGS = ${WRKSRC}/include -I${LOCALBASE}/include|'		\
 		-e 's|LDFLAGS =|LDFLAGS += -L${LOCALBASE}/lib|'			\
 		-e 's|gcc -D|${CC} -D|'						\
 		-e 's/-pthread;-D_THREAD_SAFE/-pthread -D_THREAD_SAFE/g'	\
 		$$f ;								\
 	done
 
 pre-install:
 	@echo "${DATADIR}, ${DOCSDIR}"
 
 #post-install:
 #.for subdir in library modules template
 #	${CP} -Rp ${WRKDIR}/kicad-library-master/${subdir} ${STAGEDIR}${DATADIR}
 #.endfor
 #.for subdir in internat
 #	${CP} -Rp ${WRKDIR}/kicad-doc/${subdir} ${STAGEDIR}${DOCSDIR}
 #.endfor
 
 PLIST_FILE_LIST=	bin/freeroute.jnlp \
 			bin/cvpcb \
 			bin/eeschema \
 			bin/gerbview \
 			bin/kicad \
 			bin/pcbnew \
 			bin/pl_editor \
 			bin/bitmap2component \
 			bin/pcb_calculator \
 			share/mimelnk/application/x-kicad-schematic.desktop \
 			share/mimelnk/application/x-kicad-project.desktop \
 			share/icons/hicolor/24x24/mimetypes/application-x-kicad-project.png \
 			share/icons/hicolor/48x48/apps/kicad.png \
 			share/icons/hicolor/48x48/mimetypes/application-x-kicad-project.png \
 			share/icons/hicolor/scalable/apps/kicad.svg \
 			share/icons/hicolor/scalable/mimetypes/application-x-kicad-project.svg \
 			share/icons/hicolor/16x16/mimetypes/application-x-kicad-project.png \
 			share/icons/hicolor/32x32/mimetypes/application-x-kicad-project.png \
 			share/icons/hicolor/22x22/mimetypes/application-x-kicad-project.png \
 			share/mime/packages/kicad.xml \
 			share/applications/kicad.desktop \
 			share/applications/eeschema.desktop
 
 PLIST_DIR_LIST=		lib/kicad
 
 PLIST_SHAREDDIR_LIST=	share/mimelnk/application \
 			share/mimelnk
 
 .include <bsd.port.mk>