CVS commit: pkgsrc/devel/cmake

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/devel/cmake
From: "Adam Ciarcinski" <adam%netbsd.org@localhost>
Date: Wed, 19 Jul 2017 17:44:34 +0000

Module Name:    pkgsrc
Committed By:   adam
Date:           Wed Jul 19 17:44:34 UTC 2017

Modified Files:
        pkgsrc/devel/cmake: Makefile.version PLIST distinfo
        pkgsrc/devel/cmake/patches: patch-Source_CursesDialog_ccmake.cxx
Added Files:
        pkgsrc/devel/cmake/patches: patch-Modules_FindPythonInterp.cmake
            patch-Modules_FindPythonLibs.cmake
            patch-Modules_Platform_UnixPaths.cmake
Removed Files:
        pkgsrc/devel/cmake/patches: patch-Source_cmELF.cxx patch-aa patch-ab
            patch-ac

Log Message:
3.9.0:
* The “Visual Studio 14 2015” generator has been taught about a
change to the “v140” toolset made by a VS 2015 update. VS changed
the set of values it understands for the “GenerateDebugInformation”
linker setting that produces the “-DEBUG” linker flag variants.

* “CUDA” is now supported by the Visual Studio Generators for VS
2010 and above. This complements the existing support by the
Makefile Generators and the “Ninja” generator. CUDA 8.0.61 or higher
is recommended due to known bugs in the VS integration by earlier
versions.

* CMake is now aware of the “C++ standards” and “C standards” and
their associated meta-features for the following “compiler ids”:
“Cray”, “PGI”, and “XL”.

* The “add_library()” command “IMPORTED” option learned to support
Object Libraries.

* All “find_” commands now have a “PACKAGE_ROOT” search path group
that is first in the search heuristics. If a “find_” command is
called from inside a find module, then the CMake variable and
environment variable named “_ROOT” are used as prefixes
and are the first set of paths to be searched.

* The “install(TARGETS)” command learned a new “OBJECTS” option to
specify where to install Object Libraries.

* The “install(EXPORT)” command learned how to export Object
Libraries.

* A “BUILD_WITH_INSTALL_NAME_DIR” target property and corresponding
“CMAKE_BUILD_WITH_INSTALL_NAME_DIR” variable were added to control
whether to use the “INSTALL_NAME_DIR” target property value for
binaries in the build tree. This is for macOS “install_name” as
“BUILD_WITH_INSTALL_RPATH” is for “RPATH”.
* A “CUDA_PTX_COMPILATION” target property was added to Object
Libraries to support compiling to “.ptx” files instead of host
object files.

* A new “GoogleTest” module was added to provide the
“gtest_add_tests()” function independently of the “FindGTest”
module. The function was also updated to support keyword arguments,
with functionality expanded to allow a test name prefix and suffix
to be specified, the dependency on the source files to be optional
and the list of discovered test cases to be returned to the caller.

* The “Ninja” generator has loosened the dependencies of object
compilation. Object compilation now depends only on custom targets
and custom commands associated with libraries on which the object’s
target depends and no longer depends on the libraries themselves.
Source files in dependent targets may now compile without waiting
for their targets’ dependencies to link.
* Interprocedural optimization (IPO) is now supported for GNU and
Clang compilers using link time optimization (LTO) flags. See the
“INTERPROCEDURAL_OPTIMIZATION” target property and
“CheckIPOSupported” module.

* The “TARGET_OBJECTS” “generator expression” is now supported by
the “add_custom_command()” and “file(GENERATE)” commands.


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 pkgsrc/devel/cmake/Makefile.version
cvs rdiff -u -r1.45 -r1.46 pkgsrc/devel/cmake/PLIST
cvs rdiff -u -r1.101 -r1.102 pkgsrc/devel/cmake/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/devel/cmake/patches/patch-Modules_FindPythonInterp.cmake \
    pkgsrc/devel/cmake/patches/patch-Modules_FindPythonLibs.cmake \
    pkgsrc/devel/cmake/patches/patch-Modules_Platform_UnixPaths.cmake
cvs rdiff -u -r1.4 -r1.5 \
    pkgsrc/devel/cmake/patches/patch-Source_CursesDialog_ccmake.cxx
cvs rdiff -u -r1.7 -r0 pkgsrc/devel/cmake/patches/patch-Source_cmELF.cxx
cvs rdiff -u -r1.11 -r0 pkgsrc/devel/cmake/patches/patch-aa \
    pkgsrc/devel/cmake/patches/patch-ac
cvs rdiff -u -r1.15 -r0 pkgsrc/devel/cmake/patches/patch-ab

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.version
diff -u pkgsrc/devel/cmake/Makefile.version:1.10 pkgsrc/devel/cmake/Makefile.version:1.11
--- pkgsrc/devel/cmake/Makefile.version:1.10    Thu Jun  1 20:47:25 2017
+++ pkgsrc/devel/cmake/Makefile.version Wed Jul 19 17:44:34 2017
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile.version,v 1.10 2017/06/01 20:47:25 adam Exp $
+# $NetBSD: Makefile.version,v 1.11 2017/07/19 17:44:34 adam Exp $
 #
 # used by devel/cmake/Makefile
 # used by devel/cmake-fedora/Makefile
-CMAKE_VERSION= 3.8.2
+CMAKE_VERSION= 3.9.0
 CMAKE_API=     ${CMAKE_VERSION:R}

Index: pkgsrc/devel/cmake/PLIST
diff -u pkgsrc/devel/cmake/PLIST:1.45 pkgsrc/devel/cmake/PLIST:1.46
--- pkgsrc/devel/cmake/PLIST:1.45       Tue Apr 11 20:18:54 2017
+++ pkgsrc/devel/cmake/PLIST    Wed Jul 19 17:44:34 2017
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.45 2017/04/11 20:18:54 adam Exp $
+@comment $NetBSD: PLIST,v 1.46 2017/07/19 17:44:34 adam Exp $
 bin/ccmake
 bin/cmake
 bin/cpack
@@ -198,6 +198,7 @@ share/cmake-${CMAKE_API}/Help/module/CMa
 share/cmake-${CMAKE_API}/Help/module/CMakePushCheckState.rst
 share/cmake-${CMAKE_API}/Help/module/CMakeVerifyManifest.rst
 share/cmake-${CMAKE_API}/Help/module/CPack.rst
+share/cmake-${CMAKE_API}/Help/module/CPackArchive.rst
 share/cmake-${CMAKE_API}/Help/module/CPackBundle.rst
 share/cmake-${CMAKE_API}/Help/module/CPackComponent.rst
 share/cmake-${CMAKE_API}/Help/module/CPackCygwin.rst
@@ -226,6 +227,7 @@ share/cmake-${CMAKE_API}/Help/module/Che
 share/cmake-${CMAKE_API}/Help/module/CheckFortranFunctionExists.rst
 share/cmake-${CMAKE_API}/Help/module/CheckFortranSourceCompiles.rst
 share/cmake-${CMAKE_API}/Help/module/CheckFunctionExists.rst
+share/cmake-${CMAKE_API}/Help/module/CheckIPOSupported.rst
 share/cmake-${CMAKE_API}/Help/module/CheckIncludeFile.rst
 share/cmake-${CMAKE_API}/Help/module/CheckIncludeFileCXX.rst
 share/cmake-${CMAKE_API}/Help/module/CheckIncludeFiles.rst
@@ -394,6 +396,7 @@ share/cmake-${CMAKE_API}/Help/module/For
 share/cmake-${CMAKE_API}/Help/module/GNUInstallDirs.rst
 share/cmake-${CMAKE_API}/Help/module/GenerateExportHeader.rst
 share/cmake-${CMAKE_API}/Help/module/GetPrerequisites.rst
+share/cmake-${CMAKE_API}/Help/module/GoogleTest.rst
 share/cmake-${CMAKE_API}/Help/module/InstallRequiredSystemLibraries.rst
 share/cmake-${CMAKE_API}/Help/module/MacroAddFileDependencies.rst
 share/cmake-${CMAKE_API}/Help/module/ProcessorCount.rst
@@ -483,6 +486,8 @@ share/cmake-${CMAKE_API}/Help/policy/CMP
 share/cmake-${CMAKE_API}/Help/policy/CMP0065.rst
 share/cmake-${CMAKE_API}/Help/policy/CMP0066.rst
 share/cmake-${CMAKE_API}/Help/policy/CMP0067.rst
+share/cmake-${CMAKE_API}/Help/policy/CMP0068.rst
+share/cmake-${CMAKE_API}/Help/policy/CMP0069.rst
 share/cmake-${CMAKE_API}/Help/policy/DEPRECATED.txt
 share/cmake-${CMAKE_API}/Help/policy/DISALLOWED_COMMAND.txt
 share/cmake-${CMAKE_API}/Help/prop_cache/ADVANCED.rst
@@ -522,8 +527,11 @@ share/cmake-${CMAKE_API}/Help/prop_dir/V
 share/cmake-${CMAKE_API}/Help/prop_dir/VS_GLOBAL_SECTION_PRE_section.rst
 share/cmake-${CMAKE_API}/Help/prop_dir/VS_STARTUP_PROJECT.rst
 share/cmake-${CMAKE_API}/Help/prop_gbl/ALLOW_DUPLICATE_CUSTOM_TARGETS.rst
+share/cmake-${CMAKE_API}/Help/prop_gbl/AUTOGEN_SOURCE_GROUP.rst
 share/cmake-${CMAKE_API}/Help/prop_gbl/AUTOGEN_TARGETS_FOLDER.rst
+share/cmake-${CMAKE_API}/Help/prop_gbl/AUTOMOC_SOURCE_GROUP.rst
 share/cmake-${CMAKE_API}/Help/prop_gbl/AUTOMOC_TARGETS_FOLDER.rst
+share/cmake-${CMAKE_API}/Help/prop_gbl/AUTORCC_SOURCE_GROUP.rst
 share/cmake-${CMAKE_API}/Help/prop_gbl/CMAKE_CXX_KNOWN_FEATURES.rst
 share/cmake-${CMAKE_API}/Help/prop_gbl/CMAKE_C_KNOWN_FEATURES.rst
 share/cmake-${CMAKE_API}/Help/prop_gbl/DEBUG_CONFIGURATIONS.rst
@@ -533,7 +541,9 @@ share/cmake-${CMAKE_API}/Help/prop_gbl/E
 share/cmake-${CMAKE_API}/Help/prop_gbl/ENABLED_LANGUAGES.rst
 share/cmake-${CMAKE_API}/Help/prop_gbl/FIND_LIBRARY_USE_LIB32_PATHS.rst
 share/cmake-${CMAKE_API}/Help/prop_gbl/FIND_LIBRARY_USE_LIB64_PATHS.rst
+share/cmake-${CMAKE_API}/Help/prop_gbl/FIND_LIBRARY_USE_LIBX32_PATHS.rst
 share/cmake-${CMAKE_API}/Help/prop_gbl/FIND_LIBRARY_USE_OPENBSD_VERSIONING.rst
+share/cmake-${CMAKE_API}/Help/prop_gbl/GENERATOR_IS_MULTI_CONFIG.rst
 share/cmake-${CMAKE_API}/Help/prop_gbl/GLOBAL_DEPENDS_DEBUG_MODE.rst
 share/cmake-${CMAKE_API}/Help/prop_gbl/GLOBAL_DEPENDS_NO_CYCLES.rst
 share/cmake-${CMAKE_API}/Help/prop_gbl/IN_TRY_COMPILE.rst
@@ -599,6 +609,7 @@ share/cmake-${CMAKE_API}/Help/prop_test/
 share/cmake-${CMAKE_API}/Help/prop_test/ATTACHED_FILES_ON_FAIL.rst
 share/cmake-${CMAKE_API}/Help/prop_test/COST.rst
 share/cmake-${CMAKE_API}/Help/prop_test/DEPENDS.rst
+share/cmake-${CMAKE_API}/Help/prop_test/DISABLED.rst
 share/cmake-${CMAKE_API}/Help/prop_test/ENVIRONMENT.rst
 share/cmake-${CMAKE_API}/Help/prop_test/FAIL_REGULAR_EXPRESSION.rst
 share/cmake-${CMAKE_API}/Help/prop_test/FIXTURES_CLEANUP.rst
@@ -638,15 +649,19 @@ share/cmake-${CMAKE_API}/Help/prop_tgt/A
 share/cmake-${CMAKE_API}/Help/prop_tgt/ARCHIVE_OUTPUT_DIRECTORY_CONFIG.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/ARCHIVE_OUTPUT_NAME.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/ARCHIVE_OUTPUT_NAME_CONFIG.rst
+share/cmake-${CMAKE_API}/Help/prop_tgt/AUTOGEN_BUILD_DIR.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/AUTOGEN_TARGET_DEPENDS.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/AUTOMOC.rst
+share/cmake-${CMAKE_API}/Help/prop_tgt/AUTOMOC_DEPEND_FILTERS.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/AUTOMOC_MOC_OPTIONS.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/AUTORCC.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/AUTORCC_OPTIONS.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/AUTOUIC.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/AUTOUIC_OPTIONS.rst
+share/cmake-${CMAKE_API}/Help/prop_tgt/AUTOUIC_SEARCH_PATHS.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/BINARY_DIR.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/BUILD_RPATH.rst
+share/cmake-${CMAKE_API}/Help/prop_tgt/BUILD_WITH_INSTALL_NAME_DIR.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/BUILD_WITH_INSTALL_RPATH.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/BUNDLE.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/BUNDLE_EXTENSION.rst
@@ -668,6 +683,8 @@ share/cmake-${CMAKE_API}/Help/prop_tgt/C
 share/cmake-${CMAKE_API}/Help/prop_tgt/CONFIG_POSTFIX.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/CROSSCOMPILING_EMULATOR.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/CUDA_EXTENSIONS.rst
+share/cmake-${CMAKE_API}/Help/prop_tgt/CUDA_PTX_COMPILATION.rst
+share/cmake-${CMAKE_API}/Help/prop_tgt/CUDA_RESOLVE_DEVICE_SYMBOLS.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/CUDA_SEPARABLE_COMPILATION.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/CUDA_STANDARD.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/CUDA_STANDARD_REQUIRED.rst
@@ -713,6 +730,8 @@ share/cmake-${CMAKE_API}/Help/prop_tgt/I
 share/cmake-${CMAKE_API}/Help/prop_tgt/IMPORTED_LOCATION_CONFIG.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/IMPORTED_NO_SONAME.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/IMPORTED_NO_SONAME_CONFIG.rst
+share/cmake-${CMAKE_API}/Help/prop_tgt/IMPORTED_OBJECTS.rst
+share/cmake-${CMAKE_API}/Help/prop_tgt/IMPORTED_OBJECTS_CONFIG.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/IMPORTED_SONAME.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/IMPORTED_SONAME_CONFIG.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/IMPORT_PREFIX.rst
@@ -846,6 +865,7 @@ share/cmake-${CMAKE_API}/Help/release/3.
 share/cmake-${CMAKE_API}/Help/release/${CMAKE_API}.rst
 share/cmake-${CMAKE_API}/Help/release/3.6.rst
 share/cmake-${CMAKE_API}/Help/release/3.7.rst
+share/cmake-${CMAKE_API}/Help/release/3.8.rst
 share/cmake-${CMAKE_API}/Help/release/dev.txt
 share/cmake-${CMAKE_API}/Help/release/index.rst
 share/cmake-${CMAKE_API}/Help/variable/ANDROID.rst
@@ -868,6 +888,7 @@ share/cmake-${CMAKE_API}/Help/variable/C
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_ANDROID_NATIVE_LIB_DEPENDENCIES.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_ANDROID_NATIVE_LIB_DIRECTORIES.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_ANDROID_NDK.rst
+share/cmake-${CMAKE_API}/Help/variable/CMAKE_ANDROID_NDK_DEPRECATED_HEADERS.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_ANDROID_NDK_TOOLCHAIN_HOST_TAG.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_ANDROID_NDK_TOOLCHAIN_VERSION.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_ANDROID_PROCESS_MAX.rst
@@ -884,17 +905,20 @@ share/cmake-${CMAKE_API}/Help/variable/C
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_ARGC.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_ARGV0.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_AUTOMOC.rst
+share/cmake-${CMAKE_API}/Help/variable/CMAKE_AUTOMOC_DEPEND_FILTERS.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_AUTOMOC_MOC_OPTIONS.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_AUTOMOC_RELAXED_MODE.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_AUTORCC.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_AUTORCC_OPTIONS.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_AUTOUIC.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_AUTOUIC_OPTIONS.rst
+share/cmake-${CMAKE_API}/Help/variable/CMAKE_AUTOUIC_SEARCH_PATHS.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_BACKWARDS_COMPATIBILITY.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_BINARY_DIR.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_BUILD_RPATH.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_BUILD_TOOL.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_BUILD_TYPE.rst
+share/cmake-${CMAKE_API}/Help/variable/CMAKE_BUILD_WITH_INSTALL_NAME_DIR.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_BUILD_WITH_INSTALL_RPATH.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_CACHEFILE_DIR.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_CACHE_MAJOR_VERSION.rst
@@ -957,6 +981,7 @@ share/cmake-${CMAKE_API}/Help/variable/C
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_EXTRA_SHARED_LIBRARY_SUFFIXES.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_FIND_APPBUNDLE.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_FIND_FRAMEWORK.rst
+share/cmake-${CMAKE_API}/Help/variable/CMAKE_FIND_LIBRARY_CUSTOM_LIB_SUFFIX.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_FIND_LIBRARY_PREFIXES.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_FIND_LIBRARY_SUFFIXES.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_FIND_NO_INSTALL_PREFIX.rst
@@ -1007,6 +1032,8 @@ share/cmake-${CMAKE_API}/Help/variable/C
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_INSTALL_RPATH.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_INSTALL_RPATH_USE_LINK_PATH.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_INTERNAL_PLATFORM_ABI.rst
+share/cmake-${CMAKE_API}/Help/variable/CMAKE_INTERPROCEDURAL_OPTIMIZATION.rst
+share/cmake-${CMAKE_API}/Help/variable/CMAKE_INTERPROCEDURAL_OPTIMIZATION_CONFIG.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_IOS_INSTALL_COMBINED.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_JOB_POOL_COMPILE.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_JOB_POOL_LINK.rst
@@ -1019,10 +1046,12 @@ share/cmake-${CMAKE_API}/Help/variable/C
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_LANG_CLANG_TIDY.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_LANG_COMPILER.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_LANG_COMPILER_ABI.rst
+share/cmake-${CMAKE_API}/Help/variable/CMAKE_LANG_COMPILER_AR.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_LANG_COMPILER_EXTERNAL_TOOLCHAIN.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_LANG_COMPILER_ID.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_LANG_COMPILER_LAUNCHER.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_LANG_COMPILER_LOADED.rst
+share/cmake-${CMAKE_API}/Help/variable/CMAKE_LANG_COMPILER_RANLIB.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_LANG_COMPILER_TARGET.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_LANG_COMPILER_VERSION.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_LANG_COMPILE_OBJECT.rst
@@ -1084,6 +1113,7 @@ share/cmake-${CMAKE_API}/Help/variable/C
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_MAKE_PROGRAM.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_MAP_IMPORTED_CONFIG_CONFIG.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_MATCH_COUNT.rst
+share/cmake-${CMAKE_API}/Help/variable/CMAKE_MATCH_n.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_MFC_FLAG.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_MINIMUM_REQUIRED_VERSION.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_MINOR_VERSION.rst
@@ -1110,6 +1140,7 @@ share/cmake-${CMAKE_API}/Help/variable/C
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_POSITION_INDEPENDENT_CODE.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_PREFIX_PATH.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_PROGRAM_PATH.rst
+share/cmake-${CMAKE_API}/Help/variable/CMAKE_PROJECT_DESCRIPTION.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_PROJECT_NAME.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_PROJECT_PROJECT-NAME_INCLUDE.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_RANLIB.rst
@@ -1142,6 +1173,8 @@ share/cmake-${CMAKE_API}/Help/variable/C
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_SUBLIME_TEXT_2_ENV_SETTINGS.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_SUBLIME_TEXT_2_EXCLUDE_BUILD_TREE.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_SYSROOT.rst
+share/cmake-${CMAKE_API}/Help/variable/CMAKE_SYSROOT_COMPILE.rst
+share/cmake-${CMAKE_API}/Help/variable/CMAKE_SYSROOT_LINK.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_SYSTEM.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_SYSTEM_APPBUNDLE_PATH.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_SYSTEM_FRAMEWORK_PATH.rst
@@ -1173,6 +1206,7 @@ share/cmake-${CMAKE_API}/Help/variable/C
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_VS_NsightTegra_VERSION.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_VS_PLATFORM_NAME.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_VS_PLATFORM_TOOLSET.rst
+share/cmake-${CMAKE_API}/Help/variable/CMAKE_VS_PLATFORM_TOOLSET_CUDA.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_VS_PLATFORM_TOOLSET_HOST_ARCHITECTURE.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_WARN_DEPRECATED.rst
@@ -1180,6 +1214,7 @@ share/cmake-${CMAKE_API}/Help/variable/C
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_WIN32_EXECUTABLE.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_XCODE_ATTRIBUTE_an-attribute.rst
+share/cmake-${CMAKE_API}/Help/variable/CMAKE_XCODE_GENERATE_SCHEME.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_XCODE_PLATFORM_TOOLSET.rst
 share/cmake-${CMAKE_API}/Help/variable/CPACK_ABSOLUTE_DESTINATION_FILES.rst
 share/cmake-${CMAKE_API}/Help/variable/CPACK_COMPONENT_INCLUDE_TOPLEVEL_DIRECTORY.rst
@@ -1284,6 +1319,7 @@ share/cmake-${CMAKE_API}/Help/variable/P
 share/cmake-${CMAKE_API}/Help/variable/PROJECT-NAME_VERSION_PATCH.rst
 share/cmake-${CMAKE_API}/Help/variable/PROJECT-NAME_VERSION_TWEAK.rst
 share/cmake-${CMAKE_API}/Help/variable/PROJECT_BINARY_DIR.rst
+share/cmake-${CMAKE_API}/Help/variable/PROJECT_DESCRIPTION.rst
 share/cmake-${CMAKE_API}/Help/variable/PROJECT_NAME.rst
 share/cmake-${CMAKE_API}/Help/variable/PROJECT_SOURCE_DIR.rst
 share/cmake-${CMAKE_API}/Help/variable/PROJECT_VERSION.rst
@@ -1420,7 +1456,6 @@ share/cmake-${CMAKE_API}/Modules/CMakeTe
 share/cmake-${CMAKE_API}/Modules/CMakeTestRCCompiler.cmake
 share/cmake-${CMAKE_API}/Modules/CMakeTestSwiftCompiler.cmake
 share/cmake-${CMAKE_API}/Modules/CMakeUnixFindMake.cmake
-share/cmake-${CMAKE_API}/Modules/CMakeVS7BackwardCompatibility.cmake
 share/cmake-${CMAKE_API}/Modules/CMakeVerifyManifest.cmake
 share/cmake-${CMAKE_API}/Modules/CPack.DS_Store.in
 share/cmake-${CMAKE_API}/Modules/CPack.Description.plist.in
@@ -1435,6 +1470,7 @@ share/cmake-${CMAKE_API}/Modules/CPack.V
 share/cmake-${CMAKE_API}/Modules/CPack.background.png.in
 share/cmake-${CMAKE_API}/Modules/CPack.cmake
 share/cmake-${CMAKE_API}/Modules/CPack.distribution.dist.in
+share/cmake-${CMAKE_API}/Modules/CPackArchive.cmake
 share/cmake-${CMAKE_API}/Modules/CPackBundle.cmake
 share/cmake-${CMAKE_API}/Modules/CPackComponent.cmake
 share/cmake-${CMAKE_API}/Modules/CPackCygwin.cmake
@@ -1467,6 +1503,16 @@ share/cmake-${CMAKE_API}/Modules/CheckFo
 share/cmake-${CMAKE_API}/Modules/CheckFortranSourceCompiles.cmake
 share/cmake-${CMAKE_API}/Modules/CheckFunctionExists.c
 share/cmake-${CMAKE_API}/Modules/CheckFunctionExists.cmake
+share/cmake-${CMAKE_API}/Modules/CheckIPOSupported.cmake
+share/cmake-${CMAKE_API}/Modules/CheckIPOSupported/CMakeLists-C.txt.in
+share/cmake-${CMAKE_API}/Modules/CheckIPOSupported/CMakeLists-CXX.txt.in
+share/cmake-${CMAKE_API}/Modules/CheckIPOSupported/CMakeLists-Fortran.txt.in
+share/cmake-${CMAKE_API}/Modules/CheckIPOSupported/foo.c
+share/cmake-${CMAKE_API}/Modules/CheckIPOSupported/foo.cpp
+share/cmake-${CMAKE_API}/Modules/CheckIPOSupported/foo.f
+share/cmake-${CMAKE_API}/Modules/CheckIPOSupported/main.c
+share/cmake-${CMAKE_API}/Modules/CheckIPOSupported/main.cpp
+share/cmake-${CMAKE_API}/Modules/CheckIPOSupported/main.f
 share/cmake-${CMAKE_API}/Modules/CheckIncludeFile.c.in
 share/cmake-${CMAKE_API}/Modules/CheckIncludeFile.cmake
 share/cmake-${CMAKE_API}/Modules/CheckIncludeFile.cxx.in
@@ -1502,6 +1548,7 @@ share/cmake-${CMAKE_API}/Modules/Compile
 share/cmake-${CMAKE_API}/Modules/Compiler/Bruce-C-DetermineCompiler.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/Bruce-C.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/CCur-Fortran.cmake
+share/cmake-${CMAKE_API}/Modules/Compiler/CMakeCommonCompilerMacros.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/Clang-ASM.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/Clang-C-FeatureTests.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/Clang-C.cmake
@@ -1510,6 +1557,7 @@ share/cmake-${CMAKE_API}/Modules/Compile
 share/cmake-${CMAKE_API}/Modules/Compiler/Clang-CXX.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/Clang-DetermineCompiler.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/Clang-DetermineCompilerInternal.cmake
+share/cmake-${CMAKE_API}/Modules/Compiler/Clang-FindBinUtils.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/Clang.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/Comeau-CXX-DetermineCompiler.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/Compaq-C-DetermineCompiler.cmake
@@ -1518,6 +1566,7 @@ share/cmake-${CMAKE_API}/Modules/Compile
 share/cmake-${CMAKE_API}/Modules/Compiler/Cray-CXX.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/Cray-DetermineCompiler.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/Cray-Fortran.cmake
+share/cmake-${CMAKE_API}/Modules/Compiler/Cray.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/CrayPrgEnv-C.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/CrayPrgEnv-CXX.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/CrayPrgEnv-Cray-C.cmake
@@ -1548,6 +1597,7 @@ share/cmake-${CMAKE_API}/Modules/Compile
 share/cmake-${CMAKE_API}/Modules/Compiler/GNU-CXX-DetermineCompiler.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/GNU-CXX-FeatureTests.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/GNU-CXX.cmake
+share/cmake-${CMAKE_API}/Modules/Compiler/GNU-FindBinUtils.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/GNU-Fortran.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/GNU.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/HP-ASM.cmake
@@ -1602,11 +1652,13 @@ share/cmake-${CMAKE_API}/Modules/Compile
 share/cmake-${CMAKE_API}/Modules/Compiler/SDCC-C-DetermineCompiler.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/SunPro-ASM.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/SunPro-C-DetermineCompiler.cmake
+share/cmake-${CMAKE_API}/Modules/Compiler/SunPro-C-FeatureTests.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/SunPro-C.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/SunPro-CXX-DetermineCompiler.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/SunPro-CXX-FeatureTests.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/SunPro-CXX.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/SunPro-Fortran.cmake
+share/cmake-${CMAKE_API}/Modules/Compiler/SunPro.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/TI-ASM.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/TI-C.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/TI-CXX.cmake
@@ -1633,8 +1685,6 @@ share/cmake-${CMAKE_API}/Modules/Compile
 share/cmake-${CMAKE_API}/Modules/CompilerId/VS-7.vcproj.in
 share/cmake-${CMAKE_API}/Modules/CompilerId/VS-Intel.vfproj.in
 share/cmake-${CMAKE_API}/Modules/CompilerId/VS-NsightTegra.vcxproj.in
-share/cmake-${CMAKE_API}/Modules/CompilerId/Xcode-1.pbxproj.in
-share/cmake-${CMAKE_API}/Modules/CompilerId/Xcode-2.pbxproj.in
 share/cmake-${CMAKE_API}/Modules/CompilerId/Xcode-3.pbxproj.in
 share/cmake-${CMAKE_API}/Modules/CompilerId/main.swift.in
 share/cmake-${CMAKE_API}/Modules/Dart.cmake
@@ -1804,6 +1854,8 @@ share/cmake-${CMAKE_API}/Modules/Fortran
 share/cmake-${CMAKE_API}/Modules/FortranCInterface/CMakeLists.txt
 share/cmake-${CMAKE_API}/Modules/FortranCInterface/Detect.cmake
 share/cmake-${CMAKE_API}/Modules/FortranCInterface/Input.cmake.in
+share/cmake-${CMAKE_API}/Modules/FortranCInterface/MYMODULE.c
+share/cmake-${CMAKE_API}/Modules/FortranCInterface/MY_MODULE.c
 share/cmake-${CMAKE_API}/Modules/FortranCInterface/Macro.h.in
 share/cmake-${CMAKE_API}/Modules/FortranCInterface/Output.cmake.in
 share/cmake-${CMAKE_API}/Modules/FortranCInterface/Verify/CMakeLists.txt
@@ -1824,6 +1876,7 @@ share/cmake-${CMAKE_API}/Modules/Fortran
 share/cmake-${CMAKE_API}/Modules/GNUInstallDirs.cmake
 share/cmake-${CMAKE_API}/Modules/GenerateExportHeader.cmake
 share/cmake-${CMAKE_API}/Modules/GetPrerequisites.cmake
+share/cmake-${CMAKE_API}/Modules/GoogleTest.cmake
 share/cmake-${CMAKE_API}/Modules/ITKCompatibility.cmake
 share/cmake-${CMAKE_API}/Modules/InstallRequiredSystemLibraries.cmake
 share/cmake-${CMAKE_API}/Modules/IntelVSImplicitPath/CMakeLists.txt
@@ -2092,6 +2145,9 @@ share/cmake-${CMAKE_API}/Modules/Platfor
 share/cmake-${CMAKE_API}/Modules/Platform/Windows-OpenWatcom-C.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/Windows-OpenWatcom-CXX.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/Windows-OpenWatcom.cmake
+share/cmake-${CMAKE_API}/Modules/Platform/Windows-PGI-C.cmake
+share/cmake-${CMAKE_API}/Modules/Platform/Windows-PGI-Fortran.cmake
+share/cmake-${CMAKE_API}/Modules/Platform/Windows-PGI.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/Windows-Watcom-C.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/Windows-Watcom-CXX.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/Windows-df.cmake
@@ -2162,6 +2218,9 @@ share/cmake-${CMAKE_API}/Templates/CPack
 share/cmake-${CMAKE_API}/Templates/CPack.GenericWelcome.txt
 share/cmake-${CMAKE_API}/Templates/CPackConfig.cmake.in
 share/cmake-${CMAKE_API}/Templates/CTestScript.cmake.in
+share/cmake-${CMAKE_API}/Templates/MSBuild/nasm.props.in
+share/cmake-${CMAKE_API}/Templates/MSBuild/nasm.targets
+share/cmake-${CMAKE_API}/Templates/MSBuild/nasm.xml
 share/cmake-${CMAKE_API}/Templates/TestDriver.cxx.in
 share/cmake-${CMAKE_API}/Templates/Windows/ApplicationIcon.png
 share/cmake-${CMAKE_API}/Templates/Windows/Logo.png

Index: pkgsrc/devel/cmake/distinfo
diff -u pkgsrc/devel/cmake/distinfo:1.101 pkgsrc/devel/cmake/distinfo:1.102
--- pkgsrc/devel/cmake/distinfo:1.101   Thu Jun  1 20:47:25 2017
+++ pkgsrc/devel/cmake/distinfo Wed Jul 19 17:44:34 2017
@@ -1,15 +1,14 @@
-$NetBSD: distinfo,v 1.101 2017/06/01 20:47:25 adam Exp $
+$NetBSD: distinfo,v 1.102 2017/07/19 17:44:34 adam Exp $
 
-SHA1 (cmake-3.8.2.tar.gz) = c38aad7406d6cbd99a6c71922c6c3406f745c583
-RMD160 (cmake-3.8.2.tar.gz) = 369ed02b2a69a47d0792b7ee964907afedbd669d
-SHA512 (cmake-3.8.2.tar.gz) = 49ea6f74a81dfa8ed8336c94ed50e0a483b796132c260f4bef159f9c389d99cc7b26ecfcccdd8b0a8f5b52fddd277c17c547d2a2e8848da9912c464ada1cbe3f
-Size (cmake-3.8.2.tar.gz) = 7504706 bytes
+SHA1 (cmake-3.9.0.tar.gz) = a74479a41e389e61a1eea3b408a1d8ce66b2ef3c
+RMD160 (cmake-3.9.0.tar.gz) = 5ac047b24806642d999fd1a460935274a3238f95
+SHA512 (cmake-3.9.0.tar.gz) = 151c5531dec2c9d3170d95c06b9cc92d22285555cb9c074837ff2d0d0bee2ea285726323fa11c59d2290b1a9586492571d34e49709e35481478c403bf1ca9c48
+Size (cmake-3.9.0.tar.gz) = 7691313 bytes
 SHA1 (patch-CMakeLists.txt) = a0b03f2fad5ea174095c4fe52cea67d94cf46e2d
 SHA1 (patch-Modules_FindCurses.cmake) = 09fcd7adfbc2dfc2cd8af4e047d870a5243d77dc
+SHA1 (patch-Modules_FindPythonInterp.cmake) = d1b39bdcd654f2a4fc63463cd20de656cce3cf8f
+SHA1 (patch-Modules_FindPythonLibs.cmake) = b5cedc6a2354beaf08e06d416c150154a7dc1f05
 SHA1 (patch-Modules_FindX11.cmake) = 124a2d51155cb4455e8b829dc74598cbd50a4e1c
-SHA1 (patch-Source_CursesDialog_ccmake.cxx) = 1685973706bd2041422e5f8da12634c6c0695714
-SHA1 (patch-Source_cmELF.cxx) = 180212c2f4225fd1163fe00639f70f55cac2cad6
+SHA1 (patch-Modules_Platform_UnixPaths.cmake) = 38720e11b7b62cb702e80da19e044f070298f2db
+SHA1 (patch-Source_CursesDialog_ccmake.cxx) = d7baafe6612b6ac9b0542ed10ffcf90cd8d1df87
 SHA1 (patch-Utilities_KWIML_CMakeLists.txt) = e4bdf9fc58757e87bf7e3e3e195839eededbc796
-SHA1 (patch-aa) = bab24334e025b7c1bf7caa2e69d6a439cc421ea9
-SHA1 (patch-ab) = d1b39bdcd654f2a4fc63463cd20de656cce3cf8f
-SHA1 (patch-ac) = b5cedc6a2354beaf08e06d416c150154a7dc1f05

Index: pkgsrc/devel/cmake/patches/patch-Source_CursesDialog_ccmake.cxx
diff -u pkgsrc/devel/cmake/patches/patch-Source_CursesDialog_ccmake.cxx:1.4 pkgsrc/devel/cmake/patches/patch-Source_CursesDialog_ccmake.cxx:1.5
--- pkgsrc/devel/cmake/patches/patch-Source_CursesDialog_ccmake.cxx:1.4 Mon Apr 24 22:48:48 2017
+++ pkgsrc/devel/cmake/patches/patch-Source_CursesDialog_ccmake.cxx     Wed Jul 19 17:44:34 2017
@@ -1,14 +1,14 @@
-$NetBSD: patch-Source_CursesDialog_ccmake.cxx,v 1.4 2017/04/24 22:48:48 maya Exp $
+$NetBSD: patch-Source_CursesDialog_ccmake.cxx,v 1.5 2017/07/19 17:44:34 adam Exp $
 
 initscr() error path
 include cstdlib for exit
 
---- Source/CursesDialog/ccmake.cxx.orig        2017-04-10 15:23:06.000000000 +0000
+--- Source/CursesDialog/ccmake.cxx.orig        2017-07-18 15:22:54.000000000 +0000
 +++ Source/CursesDialog/ccmake.cxx
 @@ -11,6 +11,7 @@
  #include "cmake.h"
  
- #include <cmsys/Encoding.hxx>
+ #include "cmsys/Encoding.hxx"
 +#include <cstdlib>
  #include <iostream>
  #include <signal.h>

Added files:

Index: pkgsrc/devel/cmake/patches/patch-Modules_FindPythonInterp.cmake
diff -u /dev/null pkgsrc/devel/cmake/patches/patch-Modules_FindPythonInterp.cmake:1.1
--- /dev/null   Wed Jul 19 17:44:34 2017
+++ pkgsrc/devel/cmake/patches/patch-Modules_FindPythonInterp.cmake     Wed Jul 19 17:44:34 2017
@@ -0,0 +1,31 @@
+$NetBSD: patch-Modules_FindPythonInterp.cmake,v 1.1 2017/07/19 17:44:34 adam Exp $
+
+Insist on select python version for pkgsrc.
+
+--- Modules/FindPythonInterp.cmake.orig        2014-12-15 20:07:43.000000000 +0000
++++ Modules/FindPythonInterp.cmake
+@@ -75,7 +75,14 @@ if(PythonInterp_FIND_VERSION)
+ else()
+     set(_PYTHON_FIND_OTHER_VERSIONS ${_PYTHON3_VERSIONS} ${_PYTHON2_VERSIONS} ${_PYTHON1_VERSIONS})
+ endif()
+-find_program(PYTHON_EXECUTABLE NAMES ${_Python_NAMES})
++# for pkgsrc: force Python version (set in pyversion.mk)
++IF(DEFINED PYVERSSUFFIX)
++  SET(_VERSIONS ${PYVERSSUFFIX})
++ELSE(DEFINED PYVERSSUFFIX)
++  SET(_VERSIONS ${_PYTHON2_VERSIONS} ${_PYTHON3_VERSIONS})
++  # Search for the current active python version first
++  find_program(PYTHON_EXECUTABLE NAMES python)
++ENDIF(DEFINED PYVERSSUFFIX)
+ 
+ # Set up the versions we know about, in the order we will search. Always add
+ # the user supplied additional versions to the front.
+@@ -91,7 +98,7 @@ if(DEFINED PYTHONLIBS_VERSION_STRING)
+ endif()
+ # Search for the current active python version first
+ list(APPEND _Python_VERSIONS ";")
+-list(APPEND _Python_VERSIONS ${_PYTHON_FIND_OTHER_VERSIONS})
++list(APPEND _Python_VERSIONS ${_VERSIONS})
+ 
+ unset(_PYTHON_FIND_OTHER_VERSIONS)
+ unset(_PYTHON1_VERSIONS)
Index: pkgsrc/devel/cmake/patches/patch-Modules_FindPythonLibs.cmake
diff -u /dev/null pkgsrc/devel/cmake/patches/patch-Modules_FindPythonLibs.cmake:1.1
--- /dev/null   Wed Jul 19 17:44:34 2017
+++ pkgsrc/devel/cmake/patches/patch-Modules_FindPythonLibs.cmake       Wed Jul 19 17:44:34 2017
@@ -0,0 +1,29 @@
+$NetBSD: patch-Modules_FindPythonLibs.cmake,v 1.1 2017/07/19 17:44:34 adam Exp $
+
+Insist on select python version for pkgsrc.
+
+--- Modules/FindPythonLibs.cmake.orig  2014-12-15 20:07:43.000000000 +0000
++++ Modules/FindPythonLibs.cmake
+@@ -82,6 +82,13 @@ else()
+     set(_PYTHON_FIND_OTHER_VERSIONS ${_PYTHON3_VERSIONS} ${_PYTHON2_VERSIONS} ${_PYTHON1_VERSIONS})
+ endif()
+ 
++# for pkgsrc: force Python version (set in pyversion.mk)
++if(DEFINED PYVERSSUFFIX)
++  set(_VERSIONS ${PYVERSSUFFIX})
++else()
++  set(_VERSIONS ${_PYTHON2_VERSIONS} ${_PYTHON3_VERSIONS})
++endif()
++
+ # Set up the versions we know about, in the order we will search. Always add
+ # the user supplied additional versions to the front.
+ # If FindPythonInterp has already found the major and minor version,
+@@ -91,7 +98,7 @@ set(_Python_VERSIONS ${Python_ADDITIONAL
+ if(DEFINED PYTHON_VERSION_MAJOR AND DEFINED PYTHON_VERSION_MINOR)
+   list(APPEND _Python_VERSIONS ${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR})
+ endif()
+-list(APPEND _Python_VERSIONS ${_PYTHON_FIND_OTHER_VERSIONS})
++list(APPEND _Python_VERSIONS ${_VERSIONS})
+ 
+ unset(_PYTHON_FIND_OTHER_VERSIONS)
+ unset(_PYTHON1_VERSIONS)
Index: pkgsrc/devel/cmake/patches/patch-Modules_Platform_UnixPaths.cmake
diff -u /dev/null pkgsrc/devel/cmake/patches/patch-Modules_Platform_UnixPaths.cmake:1.1
--- /dev/null   Wed Jul 19 17:44:34 2017
+++ pkgsrc/devel/cmake/patches/patch-Modules_Platform_UnixPaths.cmake   Wed Jul 19 17:44:34 2017
@@ -0,0 +1,40 @@
+$NetBSD: patch-Modules_Platform_UnixPaths.cmake,v 1.1 2017/07/19 17:44:34 adam Exp $
+
+Patch in pkgsrc paths for finding stuff.
+
+--- Modules/Platform/UnixPaths.cmake.orig      2017-07-18 15:22:54.000000000 +0000
++++ Modules/Platform/UnixPaths.cmake
+@@ -23,7 +23,7 @@ get_filename_component(_CMAKE_INSTALL_DI
+ # search types.
+ list(APPEND CMAKE_SYSTEM_PREFIX_PATH
+   # Standard
+-  /usr/local /usr /
++  @LOCALBASE@ /usr/local /usr /
+ 
+   # CMake install location
+   "${_CMAKE_INSTALL_DIR}"
+@@ -43,20 +43,20 @@ endif()
+ 
+ # Non "standard" but common install prefixes
+ list(APPEND CMAKE_SYSTEM_PREFIX_PATH
+-  /usr/X11R6
+-  /usr/pkg
++  @X11BASE@ 
++  @LOCALBASE@
+   /opt
+   )
+ 
+ # List common include file locations not under the common prefixes.
+ list(APPEND CMAKE_SYSTEM_INCLUDE_PATH
+   # X11
+-  /usr/include/X11
++  @X11BASE@/include
+   )
+ 
+ list(APPEND CMAKE_SYSTEM_LIBRARY_PATH
+   # X11
+-  /usr/lib/X11
++  @X11BASE@/lib
+   )
+ 
+ list(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES

Prev by Date: CVS commit: pkgsrc/www/py-cherrypy
Next by Date: Re: CVS commit: pkgsrc/devel/py-faker
Previous by Thread: CVS commit: pkgsrc/www/py-cherrypy
Next by Thread: CVS commit: pkgsrc/databases
Indexes:

Home | Main Index | Thread Index | Old Index