[pkgsrc/trunk]: pkgsrc/devel/cmake Bug was fixed slightly differently upstrea...

[wiz <wiz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/90211781720c
branches:  trunk
changeset: 646241:90211781720c
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Thu Feb 05 18:20:06 2015 +0000

description:
Bug was fixed slightly differently upstream, remove unnecessary patch.

diffstat:

 devel/cmake/distinfo                                 |   3 +-
 devel/cmake/patches/patch-Source_kwsys_Directory.cxx |  27 --------------------
 2 files changed, 1 insertions(+), 29 deletions(-)

diffs (48 lines):

diff -r 881b457d0ee0 -r 90211781720c devel/cmake/distinfo
--- a/devel/cmake/distinfo      Thu Feb 05 17:46:06 2015 +0000
+++ b/devel/cmake/distinfo      Thu Feb 05 18:20:06 2015 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.66 2015/02/05 17:45:22 adam Exp $
+$NetBSD: distinfo,v 1.67 2015/02/05 18:20:06 wiz Exp $
 
 SHA1 (cmake-3.1.2.tar.gz) = 66c7b73d460daf2e26dc17da1d7e7dfd14bc48fc
 RMD160 (cmake-3.1.2.tar.gz) = 50caf6ff5de97390decf43446ef0733750a5862c
@@ -7,7 +7,6 @@
 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) = 0417be593f3698ec9766b8b3d6f41a0deb07b4f8
 SHA1 (patch-Source_kwsys_SystemInformation.cxx) = e259da70601cf1b4641f253de3d4f3aaec5e68f6
 SHA1 (patch-Source_kwsys_SystemTools.cxx) = 634348b9bc8ccf8c72f23837baa6ba0bcacf5961
 SHA1 (patch-Utilities_KWIML_CMakeLists.txt) = 4e8cef0eab2ad8cb27cd7076e077bb5e7425a95c
diff -r 881b457d0ee0 -r 90211781720c devel/cmake/patches/patch-Source_kwsys_Directory.cxx
--- a/devel/cmake/patches/patch-Source_kwsys_Directory.cxx      Thu Feb 05 17:46:06 2015 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-$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    2015-02-04 20:36:44.000000000 +0000
-+++ Source/kwsys/Directory.cxx
-@@ -245,11 +245,14 @@ unsigned long Directory::GetNumberOfFile
-     }
- 
-   unsigned long count = 0;
--  for (dirent* d = readdir(dir); d; d = readdir(dir) )
-+  if (dir)
-     {
--    count++;
-+    for (dirent* d = readdir(dir); d; d = readdir(dir) )
-+      {
-+      count++;
-+      }
-+    closedir(dir);
-     }
--  closedir(dir);
-   return count;
- }
-