From owner-svn-ports-all@freebsd.org Thu Mar 22 09:53:06 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 81F4FF55C0A; Thu, 22 Mar 2018 09:53:06 +0000 (UTC) (envelope-from adridg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 387C46B43D; Thu, 22 Mar 2018 09:53:06 +0000 (UTC) (envelope-from adridg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 337927E24; Thu, 22 Mar 2018 09:53:06 +0000 (UTC) (envelope-from adridg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w2M9r6ht077271; Thu, 22 Mar 2018 09:53:06 GMT (envelope-from adridg@FreeBSD.org) Received: (from adridg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2M9r5Sa077269; Thu, 22 Mar 2018 09:53:05 GMT (envelope-from adridg@FreeBSD.org) Message-Id: <201803220953.w2M9r5Sa077269@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: adridg set sender to adridg@FreeBSD.org using -f From: Adriaan de Groot Date: Thu, 22 Mar 2018 09:53:05 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r465282 - in head/cad: kicad kicad-devel X-SVN-Group: ports-head X-SVN-Commit-Author: adridg X-SVN-Commit-Paths: in head/cad: kicad kicad-devel X-SVN-Commit-Revision: 465282 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 22 Mar 2018 09:53:06 -0000 Author: adridg Date: Thu Mar 22 09:53:05 2018 New Revision: 465282 URL: https://svnweb.freebsd.org/changeset/ports/465282 Log: 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 Modified: head/cad/kicad-devel/Makefile head/cad/kicad/Makefile Modified: head/cad/kicad-devel/Makefile ============================================================================== --- head/cad/kicad-devel/Makefile Thu Mar 22 09:41:10 2018 (r465281) +++ head/cad/kicad-devel/Makefile Thu Mar 22 09:53:05 2018 (r465282) @@ -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 @@ 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|' \ Modified: head/cad/kicad/Makefile ============================================================================== --- head/cad/kicad/Makefile Thu Mar 22 09:41:10 2018 (r465281) +++ head/cad/kicad/Makefile Thu Mar 22 09:53:05 2018 (r465282) @@ -3,7 +3,7 @@ PORTNAME= kicad PORTVERSION= 4.0.7 -PORTREVISION= 6 +PORTREVISION= 7 PORTEPOCH= 2 CATEGORIES= cad @@ -58,6 +58,12 @@ DOXYGEN_BUILD_DEPENDS= doxygen:devel/doxygen 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}|' \