summaryrefslogtreecommitdiff
path: root/devel/cmake
diff options
context:
space:
mode:
authoradam <adam@pkgsrc.org>2015-02-05 17:45:22 +0000
committeradam <adam@pkgsrc.org>2015-02-05 17:45:22 +0000
commitb89f645262bb1aab4e6246a2aa88912980329e2e (patch)
tree02d6a885e9372ca35f9cc21903a0e98c8449bdb3 /devel/cmake
parent9aef033723bfffc206a813e2f09e0c74cab2287a (diff)
downloadpkgsrc-b89f645262bb1aab4e6246a2aa88912980329e2e.tar.gz
Changes 3.1.2:
* install: Fix regression in default configuration selection * CPack: Fix packaging of source tarballs with symbolic links * KWSys Directory: Check opendir return value before using it * Help: Clarify status of link_libraries command * Normalize OBJECT_DEPENDS paths to match custom commands * MSVC: Fix initialization of RelWithDebInfo shared library link flags * FeatureSummary: Fix bracket in documentation. * FindOpenSSL: fix detection of OpenSSL 1.0.2 * ctest_build: Update GNU make error message matching
Diffstat (limited to 'devel/cmake')
-rw-r--r--devel/cmake/Makefile4
-rw-r--r--devel/cmake/distinfo10
-rw-r--r--devel/cmake/patches/patch-Source_kwsys_Directory.cxx8
3 files changed, 11 insertions, 11 deletions
diff --git a/devel/cmake/Makefile b/devel/cmake/Makefile
index 2f0acadbd9d..e4acefa8de7 100644
--- a/devel/cmake/Makefile
+++ b/devel/cmake/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.93 2015/01/24 16:55:20 wiz Exp $
+# $NetBSD: Makefile,v 1.94 2015/02/05 17:45:22 adam Exp $
-DISTNAME= cmake-${CMAKE_API}.1
+DISTNAME= cmake-${CMAKE_API}.2
CATEGORIES= devel
MASTER_SITES= http://www.cmake.org/files/v${CMAKE_API}/
diff --git a/devel/cmake/distinfo b/devel/cmake/distinfo
index cc424f1d932..b11c8702915 100644
--- a/devel/cmake/distinfo
+++ b/devel/cmake/distinfo
@@ -1,13 +1,13 @@
-$NetBSD: distinfo,v 1.65 2015/01/24 16:55:20 wiz Exp $
+$NetBSD: distinfo,v 1.66 2015/02/05 17:45:22 adam Exp $
-SHA1 (cmake-3.1.1.tar.gz) = e96098e402903e09f56d0c4cfef516e591088d78
-RMD160 (cmake-3.1.1.tar.gz) = 718de85dd5c06d04e435d77ae2e03091b4cf12b4
-Size (cmake-3.1.1.tar.gz) = 5959421 bytes
+SHA1 (cmake-3.1.2.tar.gz) = 66c7b73d460daf2e26dc17da1d7e7dfd14bc48fc
+RMD160 (cmake-3.1.2.tar.gz) = 50caf6ff5de97390decf43446ef0733750a5862c
+Size (cmake-3.1.2.tar.gz) = 5959840 bytes
SHA1 (patch-Modules_FindX11.cmake) = 07a831744fc1de15d2fe4f57399339200e572dc5
SHA1 (patch-Modules_Platform_SCO__SV.cmake) = 3ed230b3a06ea693812db8f57bc73aebec12b99f
SHA1 (patch-Modules_Platform_SunOS.cmake) = 7a53ae3c902dd69ee22ef9fe0ae2a022d5284f16
SHA1 (patch-Source_cmELF.cxx) = 5eb9dc0b3567b5685596ddf0a03ca8e5c76e6f92
-SHA1 (patch-Source_kwsys_Directory.cxx) = 35eb0872636a3f0e20eb2169f101a0a540d79642
+SHA1 (patch-Source_kwsys_Directory.cxx) = 0417be593f3698ec9766b8b3d6f41a0deb07b4f8
SHA1 (patch-Source_kwsys_SystemInformation.cxx) = e259da70601cf1b4641f253de3d4f3aaec5e68f6
SHA1 (patch-Source_kwsys_SystemTools.cxx) = 634348b9bc8ccf8c72f23837baa6ba0bcacf5961
SHA1 (patch-Utilities_KWIML_CMakeLists.txt) = 4e8cef0eab2ad8cb27cd7076e077bb5e7425a95c
diff --git a/devel/cmake/patches/patch-Source_kwsys_Directory.cxx b/devel/cmake/patches/patch-Source_kwsys_Directory.cxx
index c28590e209e..18a63f79275 100644
--- a/devel/cmake/patches/patch-Source_kwsys_Directory.cxx
+++ b/devel/cmake/patches/patch-Source_kwsys_Directory.cxx
@@ -1,14 +1,14 @@
-$NetBSD: patch-Source_kwsys_Directory.cxx,v 1.1 2015/01/23 04:06:08 wiz Exp $
+$NetBSD: patch-Source_kwsys_Directory.cxx,v 1.2 2015/02/05 17:45:22 adam Exp $
When opendir() fails, readdir() is called with a NULL pointer, leading to
a segfault.
http://public.kitware.com/Bug/view.php?id=15367
---- Source/kwsys/Directory.cxx.orig 2014-12-15 20:07:43.000000000 +0000
+--- Source/kwsys/Directory.cxx.orig 2015-02-04 20:36:44.000000000 +0000
+++ Source/kwsys/Directory.cxx
-@@ -240,11 +240,14 @@ unsigned long Directory::GetNumberOfFile
- DIR* dir = opendir(name.c_str());
+@@ -245,11 +245,14 @@ unsigned long Directory::GetNumberOfFile
+ }
unsigned long count = 0;
- for (dirent* d = readdir(dir); d; d = readdir(dir) )