From 406bbdd1e78e67a8103bd0487a07f16f8f1eebd2 Mon Sep 17 00:00:00 2001
From: adridg <adridg@FreeBSD.org>
Date: Thu, 22 Mar 2018 09:53:05 +0000
Subject: Fix cad/kicad{-devel} in advance of CMake 3.11. Remove old duplicate
 CMake module.

The old modules use CMake internals that are going away in 3.11;
this particular module has been shipped with CMake since 3.0 at least,
so it's just not necessary except on silly ancient platforms.

Reviewed by:	thierry (maintainer)
Approved by:	tcberner (mentor)
Differential Revision:	https://reviews.freebsd.org/D14772
---
 cad/kicad-devel/Makefile | 8 +++++++-
 cad/kicad/Makefile       | 8 +++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

(limited to 'cad')

diff --git a/cad/kicad-devel/Makefile b/cad/kicad-devel/Makefile
index b414c9cbbd4c..fa7043050d82 100644
--- a/cad/kicad-devel/Makefile
+++ b/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}
@@ -84,6 +84,12 @@ showversions:
 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|'     \
 		${WRKSRC}/config.h
diff --git a/cad/kicad/Makefile b/cad/kicad/Makefile
index 034254e5c974..287814ed60ad 100644
--- a/cad/kicad/Makefile
+++ b/cad/kicad/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	kicad
 PORTVERSION=	4.0.7
-PORTREVISION=	6
+PORTREVISION=	7
 PORTEPOCH=	2
 CATEGORIES=	cad
 
@@ -59,6 +59,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}|'		\
 		-e 's|/usr/local|${PREFIX}|'				\
-- 
cgit