CVS commit: pkgsrc/devel/cmake

["Patrick Welche" <prlw1%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   prlw1
Date:           Wed Aug  3 15:53:38 UTC 2016

Modified Files:
        pkgsrc/devel/cmake: Makefile distinfo
        pkgsrc/devel/cmake/patches: patch-Source_kwsys_SystemInformation.cxx

Log Message:
According to Brad King, cmake developer, who kindly reviewed our patches:

The SIZEOF_VOID_P macro is defined by code in CMakeLists.txt using
the value of CMAKE_SIZEOF_VOID_P.  The former is a C++ preprocessor
macro.  The latter is only visible in CMake code.


To generate a diff of this commit:
cvs rdiff -u -r1.120 -r1.121 pkgsrc/devel/cmake/Makefile
cvs rdiff -u -r1.89 -r1.90 pkgsrc/devel/cmake/distinfo
cvs rdiff -u -r1.9 -r1.10 \
    pkgsrc/devel/cmake/patches/patch-Source_kwsys_SystemInformation.cxx

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/cmake/Makefile
diff -u pkgsrc/devel/cmake/Makefile:1.120 pkgsrc/devel/cmake/Makefile:1.121
--- pkgsrc/devel/cmake/Makefile:1.120   Thu Jul 28 17:44:43 2016
+++ pkgsrc/devel/cmake/Makefile Wed Aug  3 15:53:38 2016
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.120 2016/07/28 17:44:43 prlw1 Exp $
+# $NetBSD: Makefile,v 1.121 2016/08/03 15:53:38 prlw1 Exp $
 
 .include "Makefile.version"
 
 DISTNAME=      cmake-${CMAKE_VERSION}
+PKGREVISION=   1
 CATEGORIES=    devel
 MASTER_SITES=  https://cmake.org/files/v${CMAKE_API}/
 

Index: pkgsrc/devel/cmake/distinfo
diff -u pkgsrc/devel/cmake/distinfo:1.89 pkgsrc/devel/cmake/distinfo:1.90
--- pkgsrc/devel/cmake/distinfo:1.89    Thu Jul 28 17:44:43 2016
+++ pkgsrc/devel/cmake/distinfo Wed Aug  3 15:53:38 2016
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.89 2016/07/28 17:44:43 prlw1 Exp $
+$NetBSD: distinfo,v 1.90 2016/08/03 15:53:38 prlw1 Exp $
 
 SHA1 (cmake-3.6.1.tar.gz) = a37785b3f256a31ee21a047569bc74a8f57067bb
 RMD160 (cmake-3.6.1.tar.gz) = 87a0bc724cd853177f5568d488c3b63ab9e46709
@@ -9,7 +9,7 @@ SHA1 (patch-Modules_FindX11.cmake) = 124
 SHA1 (patch-Modules_Platform_SCO__SV.cmake) = 3ed230b3a06ea693812db8f57bc73aebec12b99f
 SHA1 (patch-Source_CursesDialog_ccmake.cxx) = e1b6feca837013c715b4268f2ccb134f956f3193
 SHA1 (patch-Source_cmELF.cxx) = f75ddc1b1b3e83169d9a99094bcb6042fabb4da3
-SHA1 (patch-Source_kwsys_SystemInformation.cxx) = 5e8c8ff7875c329e48c54ee03570ea4a6d52953a
+SHA1 (patch-Source_kwsys_SystemInformation.cxx) = 90d171db18f6d0a8aa6c4c57e0f7d3ba02675e29
 SHA1 (patch-Source_kwsys_SystemTools.cxx) = 634348b9bc8ccf8c72f23837baa6ba0bcacf5961
 SHA1 (patch-Utilities_KWIML_CMakeLists.txt) = e4bdf9fc58757e87bf7e3e3e195839eededbc796
 SHA1 (patch-aa) = bab24334e025b7c1bf7caa2e69d6a439cc421ea9

Index: pkgsrc/devel/cmake/patches/patch-Source_kwsys_SystemInformation.cxx
diff -u pkgsrc/devel/cmake/patches/patch-Source_kwsys_SystemInformation.cxx:1.9 pkgsrc/devel/cmake/patches/patch-Source_kwsys_SystemInformation.cxx:1.10
--- pkgsrc/devel/cmake/patches/patch-Source_kwsys_SystemInformation.cxx:1.9     Tue Nov 17 12:12:11 2015
+++ pkgsrc/devel/cmake/patches/patch-Source_kwsys_SystemInformation.cxx Wed Aug  3 15:53:38 2016
@@ -1,9 +1,8 @@
-$NetBSD: patch-Source_kwsys_SystemInformation.cxx,v 1.9 2015/11/17 12:12:11 wiz Exp $
+$NetBSD: patch-Source_kwsys_SystemInformation.cxx,v 1.10 2016/08/03 15:53:38 prlw1 Exp $
 
 * Add more conditional handling for NetBSD, same as others.
 * Treat FreeBSD and DragonFly the same way as NetBSD and OpenBSD.
 * Treat Solaris same as Linux.
-* Use correct cmake define.
 
 --- Source/kwsys/SystemInformation.cxx.orig    2015-11-12 15:39:51.000000000 +0000
 +++ Source/kwsys/SystemInformation.cxx
@@ -49,12 +48,3 @@ $NetBSD: patch-Source_kwsys_SystemInform
  # include <fenv.h>
  # include <sys/socket.h>
  # include <netdb.h>
-@@ -4741,7 +4745,7 @@ bool SystemInformationImplementation::Qu
-   // a 32 bit process on a 64 bit host the returned memory will be
-   // limited to 4GiB. So if this is a 32 bit process or if the sysconf
-   // method fails use the kstat interface.
--#if SIZEOF_VOID_P == 8
-+#if CMAKE_SIZEOF_VOID_P == 8
-   if (this->QueryMemoryBySysconf())
-     {
-     return true;