Index: head/cad/kicad-devel/Makefile
===================================================================
--- head/cad/kicad-devel/Makefile
+++ head/cad/kicad-devel/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	kicad
 DISTVERSION=	r${GIT_SRC_DATE}
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	cad
 PKGNAMESUFFIX=	-devel
 DIST_SUBDIR=		${PORTNAME}
@@ -83,6 +83,12 @@
 
 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
 
 post-configure:
 	${REINPLACE_CMD} -e 's|#define HAVE_ISO646_H|//#define HAVE_ISO646_H|'     \
Index: head/cad/kicad/Makefile
===================================================================
--- head/cad/kicad/Makefile
+++ head/cad/kicad/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	kicad
 PORTVERSION=	4.0.7
-PORTREVISION=	6
+PORTREVISION=	7
 PORTEPOCH=	2
 CATEGORIES=	cad
 
@@ -58,6 +58,12 @@
 DOXYGEN_IMPLIES=	DOCS
 DOXYGEN_ALL_TARGET=	all doxygen-docs
 DOXYGEN_PORTDOCS=	doxygen
+
+# 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}|'		\