Fri Oct 25 10:49:23 2013 UTC ()
Add conditions for NetBSD, especially fixes build on NetBSD-current.


(obache)
diff -r1.52 -r1.53 pkgsrc/devel/cmake/distinfo
diff -r1.4 -r1.5 pkgsrc/devel/cmake/patches/patch-Source_kwsys_SystemInformation.cxx
cvs diff -r1.52 -r1.53 pkgsrc/devel/cmake/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/cmake/distinfo 2013/10/24 04:50:57 1.52
+++ pkgsrc/devel/cmake/distinfo 2013/10/25 10:49:23 1.53
@@ -1,13 +1,13 @@ @@ -1,13 +1,13 @@
1$NetBSD: distinfo,v 1.52 2013/10/24 04:50:57 obache Exp $ 1$NetBSD: distinfo,v 1.53 2013/10/25 10:49:23 obache Exp $
2 2
3SHA1 (cmake-2.8.12.tar.gz) = 93c93d556e702f8c967acf139fd716268ce69f39 3SHA1 (cmake-2.8.12.tar.gz) = 93c93d556e702f8c967acf139fd716268ce69f39
4RMD160 (cmake-2.8.12.tar.gz) = cf9853a662806747a3a2b4615df6dea6f7001632 4RMD160 (cmake-2.8.12.tar.gz) = cf9853a662806747a3a2b4615df6dea6f7001632
5Size (cmake-2.8.12.tar.gz) = 6064138 bytes 5Size (cmake-2.8.12.tar.gz) = 6064138 bytes
6SHA1 (patch-CMakeLists.txt) = a37825ad9d1704b9cb716a52148c637d26733898 6SHA1 (patch-CMakeLists.txt) = a37825ad9d1704b9cb716a52148c637d26733898
7SHA1 (patch-Modules_FindX11.cmake) = e5c9f5fd382effb85ae75fe603de00e5e58d788a 7SHA1 (patch-Modules_FindX11.cmake) = e5c9f5fd382effb85ae75fe603de00e5e58d788a
8SHA1 (patch-Modules_Platform_SunOS.cmake) = 7a53ae3c902dd69ee22ef9fe0ae2a022d5284f16 8SHA1 (patch-Modules_Platform_SunOS.cmake) = 7a53ae3c902dd69ee22ef9fe0ae2a022d5284f16
9SHA1 (patch-Source_kwsys_SystemInformation.cxx) = 760266029d4264b3fa7d1d6105cae799768bdb41 9SHA1 (patch-Source_kwsys_SystemInformation.cxx) = ee7f56c0f9c4c096e8b7488c7f34cb32ae02a047
10SHA1 (patch-Utilities_KWIML_CMakeLists.txt) = 4e8cef0eab2ad8cb27cd7076e077bb5e7425a95c 10SHA1 (patch-Utilities_KWIML_CMakeLists.txt) = 4e8cef0eab2ad8cb27cd7076e077bb5e7425a95c
11SHA1 (patch-aa) = 97bfad3d2c357e9af01677ba86057b78f0661b9b 11SHA1 (patch-aa) = 97bfad3d2c357e9af01677ba86057b78f0661b9b
12SHA1 (patch-ab) = aee3fb2f908aed1ce6e92b7c7ccf5b06f0596502 12SHA1 (patch-ab) = aee3fb2f908aed1ce6e92b7c7ccf5b06f0596502
13SHA1 (patch-ac) = fe679b28793d6a7b9fd41cbcb7288295a4c4a508 13SHA1 (patch-ac) = fe679b28793d6a7b9fd41cbcb7288295a4c4a508
cvs diff -r1.4 -r1.5 pkgsrc/devel/cmake/patches/Attic/patch-Source_kwsys_SystemInformation.cxx (expand / switch to unified diff)

--- pkgsrc/devel/cmake/patches/Attic/patch-Source_kwsys_SystemInformation.cxx 2013/10/24 04:50:57 1.4
+++ pkgsrc/devel/cmake/patches/Attic/patch-Source_kwsys_SystemInformation.cxx 2013/10/25 10:49:23 1.5
@@ -1,24 +1,49 @@ @@ -1,24 +1,49 @@
1$NetBSD: patch-Source_kwsys_SystemInformation.cxx,v 1.4 2013/10/24 04:50:57 obache Exp $ 1$NetBSD: patch-Source_kwsys_SystemInformation.cxx,v 1.5 2013/10/25 10:49:23 obache Exp $
2 2
3Use correct cmake define. 3* Add more conditional handling for NetBSD, same as others.
 4* Treat Solaris same as Linux.
 5* Use correct cmake define.
4 6
5--- Source/kwsys/SystemInformation.cxx.orig 2013-10-07 15:31:00.000000000 +0000 7--- Source/kwsys/SystemInformation.cxx.orig 2013-10-07 15:31:00.000000000 +0000
6+++ Source/kwsys/SystemInformation.cxx 8+++ Source/kwsys/SystemInformation.cxx
7@@ -130,7 +130,7 @@ typedef int siginfo_t; 9@@ -93,6 +93,22 @@ typedef int siginfo_t;
 10 #if defined(__OpenBSD__) || defined(__NetBSD__)
 11 # include <sys/param.h>
 12 # include <sys/sysctl.h>
 13+# include <sys/socket.h>
 14+# include <netdb.h>
 15+# include <netinet/in.h>
 16+# if defined(KWSYS_SYS_HAS_IFADDRS_H)
 17+# include <ifaddrs.h>
 18+# define KWSYS_SYSTEMINFORMATION_IMPLEMENT_FQDN
 19+# endif
 20+# if defined(KWSYS_SYSTEMINFORMATION_HAS_BACKTRACE)
 21+# include <execinfo.h>
 22+# if defined(KWSYS_SYSTEMINFORMATION_HAS_CPP_DEMANGLE)
 23+# include <cxxabi.h>
 24+# endif
 25+# if defined(KWSYS_SYSTEMINFORMATION_HAS_SYMBOL_LOOKUP)
 26+# include <dlfcn.h>
 27+# endif
 28+# endif
 29 #endif
 30
 31 #if defined(KWSYS_SYS_HAS_MACHINE_CPU_H)
 32@@ -130,7 +146,7 @@ typedef int siginfo_t;
8 # endif 33 # endif
9 #endif 34 #endif
10  35
11-#ifdef __linux 36-#ifdef __linux
12+#if defined(__linux) || defined (__sun) 37+#if defined(__linux) || defined (__sun)
13 # include <fenv.h> 38 # include <fenv.h>
14 # include <sys/socket.h> 39 # include <sys/socket.h>
15 # include <netdb.h> 40 # include <netdb.h>
16@@ -4616,7 +4616,7 @@ bool SystemInformationImplementation::Qu 41@@ -4616,7 +4632,7 @@ bool SystemInformationImplementation::Qu
17 // a 32 bit process on a 64 bit host the returned memory will be 42 // a 32 bit process on a 64 bit host the returned memory will be
18 // limited to 4GiB. So if this is a 32 bit process or if the sysconf 43 // limited to 4GiB. So if this is a 32 bit process or if the sysconf
19 // method fails use the kstat interface. 44 // method fails use the kstat interface.
20-#if SIZEOF_VOID_P == 8 45-#if SIZEOF_VOID_P == 8
21+#if CMAKE_SIZEOF_VOID_P == 8 46+#if CMAKE_SIZEOF_VOID_P == 8
22 if (this->QueryMemoryBySysconf()) 47 if (this->QueryMemoryBySysconf())
23 { 48 {
24 return true; 49 return true;