diff options
-rw-r--r-- | devel/cmake/Makefile | 3 | ||||
-rw-r--r-- | devel/cmake/distinfo | 5 | ||||
-rw-r--r-- | devel/cmake/patches/patch-Modules_FindX11.cmake | 14 | ||||
-rw-r--r-- | devel/cmake/patches/patch-Utilities_cmjsoncpp_src_lib__json_json__writer.cpp | 17 |
4 files changed, 28 insertions, 11 deletions
diff --git a/devel/cmake/Makefile b/devel/cmake/Makefile index 82b6f2350c8..ff75ce66618 100644 --- a/devel/cmake/Makefile +++ b/devel/cmake/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.98 2015/06/09 08:21:40 adam Exp $ +# $NetBSD: Makefile,v 1.99 2015/06/12 18:42:25 richard Exp $ DISTNAME= cmake-${CMAKE_API}.3 +PKGREVISION= 1 CATEGORIES= devel MASTER_SITES= http://www.cmake.org/files/v${CMAKE_API}/ diff --git a/devel/cmake/distinfo b/devel/cmake/distinfo index 36a143de4db..2f0f1f2e061 100644 --- a/devel/cmake/distinfo +++ b/devel/cmake/distinfo @@ -1,15 +1,16 @@ -$NetBSD: distinfo,v 1.71 2015/06/09 08:21:40 adam Exp $ +$NetBSD: distinfo,v 1.72 2015/06/12 18:42:25 richard Exp $ SHA1 (cmake-3.2.3.tar.gz) = fa176cc5b1ccf2e98196b50908432d0268323501 RMD160 (cmake-3.2.3.tar.gz) = 7cd30ba8d58d1d312fb59f6f02c34d3842123fab Size (cmake-3.2.3.tar.gz) = 6438938 bytes -SHA1 (patch-Modules_FindX11.cmake) = 07a831744fc1de15d2fe4f57399339200e572dc5 +SHA1 (patch-Modules_FindX11.cmake) = d616d5ad370b115ecd3c735e268dd03199c09a30 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_SystemInformation.cxx) = e259da70601cf1b4641f253de3d4f3aaec5e68f6 SHA1 (patch-Source_kwsys_SystemTools.cxx) = 634348b9bc8ccf8c72f23837baa6ba0bcacf5961 SHA1 (patch-Utilities_KWIML_CMakeLists.txt) = 4e8cef0eab2ad8cb27cd7076e077bb5e7425a95c +SHA1 (patch-Utilities_cmjsoncpp_src_lib__json_json__writer.cpp) = 693873cad588dd7e0233d5eeabace18c4f66e734 SHA1 (patch-aa) = bab24334e025b7c1bf7caa2e69d6a439cc421ea9 SHA1 (patch-ab) = d1b39bdcd654f2a4fc63463cd20de656cce3cf8f SHA1 (patch-ac) = b5cedc6a2354beaf08e06d416c150154a7dc1f05 diff --git a/devel/cmake/patches/patch-Modules_FindX11.cmake b/devel/cmake/patches/patch-Modules_FindX11.cmake index fa241516964..a61e7c468ee 100644 --- a/devel/cmake/patches/patch-Modules_FindX11.cmake +++ b/devel/cmake/patches/patch-Modules_FindX11.cmake @@ -1,26 +1,24 @@ -$NetBSD: patch-Modules_FindX11.cmake,v 1.6 2015/01/17 13:29:55 adam Exp $ +$NetBSD: patch-Modules_FindX11.cmake,v 1.7 2015/06/12 18:42:25 richard Exp $ Patch in pkgsrc paths for finding X. ---- Modules/FindX11.cmake.orig 2014-12-15 20:07:43.000000000 +0000 +--- Modules/FindX11.cmake.orig 2015-06-01 15:56:08.000000000 +0000 +++ Modules/FindX11.cmake -@@ -73,7 +73,8 @@ if (UNIX) +@@ -73,7 +73,7 @@ if (UNIX) set(CMAKE_REQUIRED_QUIET_SAVE ${CMAKE_REQUIRED_QUIET}) set(CMAKE_REQUIRED_QUIET ${X11_FIND_QUIETLY}) set(X11_INC_SEARCH_PATH - /usr/pkg/xorg/include -+ @LOCALBASE@/xorg/include -+ @X11BASE@/xorg/include ++ @X11BASE@/include /usr/X11R6/include /usr/X11R7/include /usr/include/X11 -@@ -84,7 +85,8 @@ if (UNIX) +@@ -84,7 +84,7 @@ if (UNIX) ) set(X11_LIB_SEARCH_PATH - /usr/pkg/xorg/lib -+ @LOCALBASE@/xorg/lib -+ @X11BASE@/xorg/lib ++ @X11BASE@/lib /usr/X11R6/lib /usr/X11R7/lib /usr/openwin/lib diff --git a/devel/cmake/patches/patch-Utilities_cmjsoncpp_src_lib__json_json__writer.cpp b/devel/cmake/patches/patch-Utilities_cmjsoncpp_src_lib__json_json__writer.cpp new file mode 100644 index 00000000000..0e486f3c1dd --- /dev/null +++ b/devel/cmake/patches/patch-Utilities_cmjsoncpp_src_lib__json_json__writer.cpp @@ -0,0 +1,17 @@ +$NetBSD: patch-Utilities_cmjsoncpp_src_lib__json_json__writer.cpp,v 1.1 2015/06/12 18:42:25 richard Exp $ + +iso/math_c99.h defines isfinite already on SunOS. + +--- Utilities/cmjsoncpp/src/lib_json/json_writer.cpp.orig 2015-06-01 15:56:11.000000000 +0000 ++++ Utilities/cmjsoncpp/src/lib_json/json_writer.cpp +@@ -24,7 +24,9 @@ + // Solaris + #if defined(__sun) + # include <ieeefp.h> +-# define isfinite finite ++# if !defined(isfinite) ++# define isfinite finite ++# endif + #endif + + // Ancient glibc |