CVS commit: pkgsrc/devel/cmake

["Leonardo Taccari" <leot%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   leot
Date:           Tue Oct 16 16:37:21 UTC 2018

Modified Files:
        pkgsrc/devel/cmake: Makefile distinfo
        pkgsrc/devel/cmake/patches: patch-CMakeLists.txt
Added Files:
        pkgsrc/devel/cmake/patches: patch-Source_Checks_Curses_CMakeLists.txt

Log Message:
cmake: Use NetBSD curses(3) when possible

ccmake needs wsyncup(3) and since NetBSD 8.0 it is present on NetBSD.
Handle that via `USE_CURSES= wsyncup' and remove enforcements about
ncurses in CMakeLists.txt and Source/Checks/Curses/CMakeLists.txt.

Bump PKGREVISION


To generate a diff of this commit:
cvs rdiff -u -r1.151 -r1.152 pkgsrc/devel/cmake/Makefile
cvs rdiff -u -r1.128 -r1.129 pkgsrc/devel/cmake/distinfo
cvs rdiff -u -r1.6 -r1.7 pkgsrc/devel/cmake/patches/patch-CMakeLists.txt
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/devel/cmake/patches/patch-Source_Checks_Curses_CMakeLists.txt

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.151 pkgsrc/devel/cmake/Makefile:1.152
--- pkgsrc/devel/cmake/Makefile:1.151   Sat Sep  8 06:55:51 2018
+++ pkgsrc/devel/cmake/Makefile Tue Oct 16 16:37:21 2018
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.151 2018/09/08 06:55:51 adam Exp $
+# $NetBSD: Makefile,v 1.152 2018/10/16 16:37:21 leot Exp $
 
 .include "Makefile.version"
 
 DISTNAME=      cmake-${CMAKE_VERSION}
+PKGREVISION=   1
 CATEGORIES=    devel
 MASTER_SITES=  https://cmake.org/files/v${CMAKE_API}/
 
@@ -59,7 +60,7 @@ pre-configure:
            ${WRKSRC}/Modules/Platform/SunOS-Clang-${lang}.cmake
 .endfor
 
-INCOMPAT_CURSES=       NetBSD-[0-8].*-*
+USE_CURSES=            wsyncup
 
 BUILDLINK_API_DEPENDS.libarchive+=     libarchive>=3.0.0
 .include "../../archivers/libarchive/buildlink3.mk"

Index: pkgsrc/devel/cmake/distinfo
diff -u pkgsrc/devel/cmake/distinfo:1.128 pkgsrc/devel/cmake/distinfo:1.129
--- pkgsrc/devel/cmake/distinfo:1.128   Thu Oct  4 13:09:54 2018
+++ pkgsrc/devel/cmake/distinfo Tue Oct 16 16:37:21 2018
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.128 2018/10/04 13:09:54 adam Exp $
+$NetBSD: distinfo,v 1.129 2018/10/16 16:37:21 leot Exp $
 
 SHA1 (cmake-3.12.3.tar.gz) = 73d2447b5550e734f794b42ab7831349f993f0ff
 RMD160 (cmake-3.12.3.tar.gz) = e964e54a5776dccee8cc3f786c2b050ca30172bb
 SHA512 (cmake-3.12.3.tar.gz) = 2b5b006bd0fa09431eb525a7f419c64b811afbe1cc81d34e6167e04112966d9f48f28652b21b5a04c889de6227315db57dd2099a17ea6329e27f3e97eac9051c
 Size (cmake-3.12.3.tar.gz) = 8388552 bytes
-SHA1 (patch-CMakeLists.txt) = 933e640b89293754dc732167fc078a5656e02ec7
+SHA1 (patch-CMakeLists.txt) = 01329182725814e27bc3945d1d62555b3a4a4033
 SHA1 (patch-Modules_Compiler_GNU.cmake) = e091c53ac3f3a6cd811119d3231563df32e76bf9
 SHA1 (patch-Modules_FindCurses.cmake) = 09fcd7adfbc2dfc2cd8af4e047d870a5243d77dc
 SHA1 (patch-Modules_FindPythonInterp.cmake) = d1b39bdcd654f2a4fc63463cd20de656cce3cf8f
@@ -12,6 +12,7 @@ SHA1 (patch-Modules_FindPythonLibs.cmake
 SHA1 (patch-Modules_FindX11.cmake) = 124a2d51155cb4455e8b829dc74598cbd50a4e1c
 SHA1 (patch-Modules_Platform_UnixPaths.cmake) = 38720e11b7b62cb702e80da19e044f070298f2db
 SHA1 (patch-Source_CMakeLists.txt) = 533667d43048b8bc2be17a766b5dc32f3101866e
+SHA1 (patch-Source_Checks_Curses_CMakeLists.txt) = 37d95c6162cc1f4c0e47b537ac8204cb9fe75b8c
 SHA1 (patch-Source_Checks_Curses_CheckCurses.c) = c86cae48f7b39fb735eba4788d4e9d595b2ccf3b
 SHA1 (patch-Source_Checks_cm__cxx17__check.cpp) = 37772f3e7edc2413cb2e294462312aff18e5c989
 SHA1 (patch-Source_Checks_cm_cxx_features.cmake) = 3d6e3ac6ad25890d223601c15fb208b8e77ff77c

Index: pkgsrc/devel/cmake/patches/patch-CMakeLists.txt
diff -u pkgsrc/devel/cmake/patches/patch-CMakeLists.txt:1.6 pkgsrc/devel/cmake/patches/patch-CMakeLists.txt:1.7
--- pkgsrc/devel/cmake/patches/patch-CMakeLists.txt:1.6 Sat Jul 21 06:52:55 2018
+++ pkgsrc/devel/cmake/patches/patch-CMakeLists.txt     Tue Oct 16 16:37:21 2018
@@ -1,8 +1,9 @@
-$NetBSD: patch-CMakeLists.txt,v 1.6 2018/07/21 06:52:55 ryoon Exp $
+$NetBSD: patch-CMakeLists.txt,v 1.7 2018/10/16 16:37:21 leot Exp $
 
-Don't insist on ncurses.
+- Don't insist on ncurses.
+- NetBSD curses has wsyncup(3).
 
---- CMakeLists.txt.orig        2018-07-17 11:28:59.000000000 +0000
+--- CMakeLists.txt.orig        2018-10-03 12:35:51.000000000 +0000
 +++ CMakeLists.txt
 @@ -581,7 +581,6 @@ macro (CMAKE_BUILD_UTILITIES)
      set(BUILD_CursesDialog 0)
@@ -12,3 +13,23 @@ Don't insist on ncurses.
      find_package(Curses)
      if(NOT CURSES_FOUND)
        message(WARNING
+@@ -683,19 +682,6 @@ if(NOT CMake_TEST_EXTERNAL_CMAKE)
+   # build the utilities (a macro defined in this file)
+   CMAKE_BUILD_UTILITIES()
+ 
+-  # On NetBSD ncurses is required, since curses doesn't have the wsyncup()
+-  # function. ncurses is installed via pkgsrc, so the library is in /usr/pkg/lib,
+-  # which isn't in the default linker search path. So without RPATH ccmake
+-  # doesn't run and the build doesn't succeed since ccmake is executed for
+-  # generating the documentation.
+-  if(BUILD_CursesDialog)
+-    get_filename_component(_CURSES_DIR "${CURSES_LIBRARY}" PATH)
+-    set(CURSES_NEED_RPATH FALSE)
+-    if(NOT "${_CURSES_DIR}" STREQUAL "/lib" AND NOT "${_CURSES_DIR}" STREQUAL "/usr/lib" AND NOT "${_CURSES_DIR}" STREQUAL "/lib64" AND NOT "${_CURSES_DIR}" STREQUAL "/usr/lib64")
+-      set(CURSES_NEED_RPATH TRUE)
+-    endif()
+-  endif()
+-
+   if(BUILD_QtDialog)
+     if(APPLE)
+       set(CMAKE_BUNDLE_VERSION

Added files:

Index: pkgsrc/devel/cmake/patches/patch-Source_Checks_Curses_CMakeLists.txt
diff -u /dev/null pkgsrc/devel/cmake/patches/patch-Source_Checks_Curses_CMakeLists.txt:1.1
--- /dev/null   Tue Oct 16 16:37:21 2018
+++ pkgsrc/devel/cmake/patches/patch-Source_Checks_Curses_CMakeLists.txt        Tue Oct 16 16:37:21 2018
@@ -0,0 +1,14 @@
+$NetBSD: patch-Source_Checks_Curses_CMakeLists.txt,v 1.1 2018/10/16 16:37:21 leot Exp $
+
+- Don't insist on ncurses
+
+--- Source/Checks/Curses/CMakeLists.txt.orig   2018-10-03 12:35:51.000000000 +0000
++++ Source/Checks/Curses/CMakeLists.txt
+@@ -4,7 +4,6 @@ if(POLICY CMP0060)
+ endif()
+ project(CheckCurses C)
+ 
+-set(CURSES_NEED_NCURSES TRUE)
+ find_package(Curses)
+ if(NOT CURSES_FOUND)
+   return()