Received: by mail.netbsd.org (Postfix, from userid 605) id CB49284D6C; Sat, 8 Sep 2018 06:55:53 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id DA68D84D45 for ; Sat, 8 Sep 2018 06:55:52 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id vYiZdOGSAD6J for ; Sat, 8 Sep 2018 06:55:52 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id D807884CBC for ; Sat, 8 Sep 2018 06:55:51 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 80993FBF8; Sat, 8 Sep 2018 06:55:51 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1536389751185970" MIME-Version: 1.0 Date: Sat, 8 Sep 2018 06:55:51 +0000 From: "Adam Ciarcinski" Subject: CVS commit: pkgsrc/devel/cmake To: pkgsrc-changes@NetBSD.org Reply-To: adam@netbsd.org X-Mailer: log_accum Message-Id: <20180908065551.80993FBF8@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1536389751185970 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: adam Date: Sat Sep 8 06:55:51 UTC 2018 Modified Files: pkgsrc/devel/cmake: Makefile Makefile.version distinfo pkgsrc/devel/cmake/patches: patch-Source_Checks_Curses_CheckCurses.c Log Message: cmake: updated to 3.12.2 Changes in 3.12.2 since 3.12.1: * Android: Add support for NDK r18 * CheckIPOSupported: Simplify result reporting logic * CheckIPOSupported: Tolerate backslashes in output of failed checks * VS: Restore CMakeLists.txt references in each target * EXPORT_PROPERTIES: Add test for an undefined property * EXPORT_PROPERTIES: Prevent null dereference for undefined property * Help: Fix typo in clang-tidy example -checks option * FindBoost: Fix context discovery for 1.60 and below * FindCUDA: Do not find cublas_device on CUDA >= 9.2 * FindMatlab: Remove erroneous duplicate code * CUDA: Avoid using deprecated cublas_device to identify device lib dirs * cmState: Clear GlobVerificationManager state on Reset To generate a diff of this commit: cvs rdiff -u -r1.150 -r1.151 pkgsrc/devel/cmake/Makefile cvs rdiff -u -r1.29 -r1.30 pkgsrc/devel/cmake/Makefile.version cvs rdiff -u -r1.126 -r1.127 pkgsrc/devel/cmake/distinfo cvs rdiff -u -r1.1 -r1.2 \ pkgsrc/devel/cmake/patches/patch-Source_Checks_Curses_CheckCurses.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1536389751185970 Content-Disposition: inline Content-Length: 4306 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/devel/cmake/Makefile diff -u pkgsrc/devel/cmake/Makefile:1.150 pkgsrc/devel/cmake/Makefile:1.151 --- pkgsrc/devel/cmake/Makefile:1.150 Fri Aug 17 19:06:35 2018 +++ pkgsrc/devel/cmake/Makefile Sat Sep 8 06:55:51 2018 @@ -1,6 +1,5 @@ -# $NetBSD: Makefile,v 1.150 2018/08/17 19:06:35 abs Exp $ +# $NetBSD: Makefile,v 1.151 2018/09/08 06:55:51 adam Exp $ -PKGREVISION= 1 .include "Makefile.version" DISTNAME= cmake-${CMAKE_VERSION} Index: pkgsrc/devel/cmake/Makefile.version diff -u pkgsrc/devel/cmake/Makefile.version:1.29 pkgsrc/devel/cmake/Makefile.version:1.30 --- pkgsrc/devel/cmake/Makefile.version:1.29 Fri Aug 10 06:59:04 2018 +++ pkgsrc/devel/cmake/Makefile.version Sat Sep 8 06:55:51 2018 @@ -1,6 +1,6 @@ -# $NetBSD: Makefile.version,v 1.29 2018/08/10 06:59:04 adam Exp $ +# $NetBSD: Makefile.version,v 1.30 2018/09/08 06:55:51 adam Exp $ # # used by devel/cmake/Makefile # used by devel/cmake-fedora/Makefile -CMAKE_VERSION= 3.12.1 +CMAKE_VERSION= 3.12.2 CMAKE_API= ${CMAKE_VERSION:R} Index: pkgsrc/devel/cmake/distinfo diff -u pkgsrc/devel/cmake/distinfo:1.126 pkgsrc/devel/cmake/distinfo:1.127 --- pkgsrc/devel/cmake/distinfo:1.126 Fri Aug 10 06:59:04 2018 +++ pkgsrc/devel/cmake/distinfo Sat Sep 8 06:55:51 2018 @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.126 2018/08/10 06:59:04 adam Exp $ +$NetBSD: distinfo,v 1.127 2018/09/08 06:55:51 adam Exp $ -SHA1 (cmake-3.12.1.tar.gz) = 5359cd2e36051b0746580298d42518b0aef27979 -RMD160 (cmake-3.12.1.tar.gz) = f413aa86873dc420884a251d40d63aca488e2b8a -SHA512 (cmake-3.12.1.tar.gz) = 7a0a769ef060785a8dc8c6aa272435a90a07cc8079f6c83c916da0b79d8bcdefca0d7be21f55f408ab4dfa6a57caa9ff8dec4be993145f4e3337ff392481b692 -Size (cmake-3.12.1.tar.gz) = 8090272 bytes +SHA1 (cmake-3.12.2.tar.gz) = 25d3f4d2c9fe350170cc305625cc3d09f1f52da9 +RMD160 (cmake-3.12.2.tar.gz) = cc9e81815a6edfbd5e08d6a4f25bcf3488009853 +SHA512 (cmake-3.12.2.tar.gz) = a2f44b2d77d9a3aa62273dbdeb94ad336c7430f41a31f48b4b395d170577b2b296d598ed9d1d548df95758b3fbf3ced193e1398fd701bc99792580798ec2a99d +Size (cmake-3.12.2.tar.gz) = 8388114 bytes SHA1 (patch-CMakeLists.txt) = 933e640b89293754dc732167fc078a5656e02ec7 SHA1 (patch-Modules_Compiler_GNU.cmake) = e091c53ac3f3a6cd811119d3231563df32e76bf9 SHA1 (patch-Modules_FindCurses.cmake) = 09fcd7adfbc2dfc2cd8af4e047d870a5243d77dc @@ -12,7 +12,7 @@ SHA1 (patch-Modules_FindPythonLibs.cmake SHA1 (patch-Modules_FindX11.cmake) = 124a2d51155cb4455e8b829dc74598cbd50a4e1c SHA1 (patch-Modules_Platform_UnixPaths.cmake) = 38720e11b7b62cb702e80da19e044f070298f2db SHA1 (patch-Source_CMakeLists.txt) = 533667d43048b8bc2be17a766b5dc32f3101866e -SHA1 (patch-Source_Checks_Curses_CheckCurses.c) = 8c62f7717bd6badeaea119c1fdcf2e18a9f95cce +SHA1 (patch-Source_Checks_Curses_CheckCurses.c) = c86cae48f7b39fb735eba4788d4e9d595b2ccf3b SHA1 (patch-Source_Checks_cm__cxx17__check.cpp) = 37772f3e7edc2413cb2e294462312aff18e5c989 SHA1 (patch-Source_Checks_cm_cxx_features.cmake) = 3d6e3ac6ad25890d223601c15fb208b8e77ff77c SHA1 (patch-Source_CursesDialog_ccmake.cxx) = d7baafe6612b6ac9b0542ed10ffcf90cd8d1df87 Index: pkgsrc/devel/cmake/patches/patch-Source_Checks_Curses_CheckCurses.c diff -u pkgsrc/devel/cmake/patches/patch-Source_Checks_Curses_CheckCurses.c:1.1 pkgsrc/devel/cmake/patches/patch-Source_Checks_Curses_CheckCurses.c:1.2 --- pkgsrc/devel/cmake/patches/patch-Source_Checks_Curses_CheckCurses.c:1.1 Tue Jul 24 12:14:38 2018 +++ pkgsrc/devel/cmake/patches/patch-Source_Checks_Curses_CheckCurses.c Sat Sep 8 06:55:51 2018 @@ -1,8 +1,20 @@ -$NetBSD: patch-Source_Checks_Curses_CheckCurses.c,v 1.1 2018/07/24 12:14:38 ryoon Exp $ +$NetBSD: patch-Source_Checks_Curses_CheckCurses.c,v 1.2 2018/09/08 06:55:51 adam Exp $ ---- Source/Checks/Curses/CheckCurses.c.orig 2018-07-17 11:29:00.000000000 +0000 +Use curses.h provided by buildlink. + +--- Source/Checks/Curses/CheckCurses.c.orig 2018-08-09 12:14:07.000000000 +0000 +++ Source/Checks/Curses/CheckCurses.c -@@ -10,6 +10,6 @@ +@@ -1,15 +1,7 @@ +-#if defined(CURSES_HAVE_NCURSES_H) +-# include +-#elif defined(CURSES_HAVE_NCURSES_NCURSES_H) +-# include +-#elif defined(CURSES_HAVE_NCURSES_CURSES_H) +-# include +-#else +-# include +-#endif ++#include int main() { --_----------=_1536389751185970--