CVS commit: pkgsrc/devel/cmake

[Frédéric Fauberteau <triaxx%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   triaxx
Date:           Fri Jan  4 17:47:12 UTC 2019

Modified Files:
        pkgsrc/devel/cmake: Makefile distinfo
        pkgsrc/devel/cmake/patches: patch-Modules_FindCurses.cmake
Added Files:
        pkgsrc/devel/cmake/patches: patch-Modules_FindGTK2.cmake

Log Message:
Fix PR pkg/53816.

* Fix from upstream: https://gitlab.kitware.com/cmake/cmake/issues/17614
* Patch comment to appease pkglint
* Bump revision


To generate a diff of this commit:
cvs rdiff -u -r1.156 -r1.157 pkgsrc/devel/cmake/Makefile
cvs rdiff -u -r1.132 -r1.133 pkgsrc/devel/cmake/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/devel/cmake/patches/patch-Modules_FindCurses.cmake
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/devel/cmake/patches/patch-Modules_FindGTK2.cmake

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.156 pkgsrc/devel/cmake/Makefile:1.157
--- pkgsrc/devel/cmake/Makefile:1.156   Sat Dec 15 23:23:14 2018
+++ pkgsrc/devel/cmake/Makefile Fri Jan  4 17:47:12 2019
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.156 2018/12/15 23:23:14 adam Exp $
+# $NetBSD: Makefile,v 1.157 2019/01/04 17:47:12 triaxx Exp $
 
 .include "Makefile.version"
 
 DISTNAME=      cmake-${CMAKE_VERSION}
+PKGREVISION=   1
 CATEGORIES=    devel
 MASTER_SITES=  https://cmake.org/files/v${CMAKE_API}/
 
@@ -12,7 +13,7 @@ COMMENT=      Cross platform make
 LICENSE=       modified-bsd
 
 USE_TOOLS+=            gmake
-USE_LANGUAGES=         c c++11
+USE_LANGUAGES=         c c++11 fortran
 GCC_REQD+=             4.8
 HAS_CONFIGURE=         yes
 CONFIGURE_SCRIPT=      bootstrap

Index: pkgsrc/devel/cmake/distinfo
diff -u pkgsrc/devel/cmake/distinfo:1.132 pkgsrc/devel/cmake/distinfo:1.133
--- pkgsrc/devel/cmake/distinfo:1.132   Sat Dec 15 23:23:14 2018
+++ pkgsrc/devel/cmake/distinfo Fri Jan  4 17:47:12 2019
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.132 2018/12/15 23:23:14 adam Exp $
+$NetBSD: distinfo,v 1.133 2019/01/04 17:47:12 triaxx Exp $
 
 SHA1 (cmake-3.13.2.tar.gz) = 101b8599b5ddd4df9127e227c3fe13ed3d8e266a
 RMD160 (cmake-3.13.2.tar.gz) = a209af76297433cc58f084281a94594281a3fca0
@@ -6,7 +6,8 @@ SHA512 (cmake-3.13.2.tar.gz) = da095d483
 Size (cmake-3.13.2.tar.gz) = 8614687 bytes
 SHA1 (patch-CMakeLists.txt) = 01329182725814e27bc3945d1d62555b3a4a4033
 SHA1 (patch-Modules_Compiler_GNU.cmake) = e091c53ac3f3a6cd811119d3231563df32e76bf9
-SHA1 (patch-Modules_FindCurses.cmake) = 09fcd7adfbc2dfc2cd8af4e047d870a5243d77dc
+SHA1 (patch-Modules_FindCurses.cmake) = 1372faaf1b7a1b5f5f592c797f39e1a9002a24a6
+SHA1 (patch-Modules_FindGTK2.cmake) = 51b7520d35fdec2a7bfcf494fe35ce0e3863e4ee
 SHA1 (patch-Modules_FindPythonInterp.cmake) = d1b39bdcd654f2a4fc63463cd20de656cce3cf8f
 SHA1 (patch-Modules_FindPythonLibs.cmake) = b5cedc6a2354beaf08e06d416c150154a7dc1f05
 SHA1 (patch-Modules_FindX11.cmake) = 124a2d51155cb4455e8b829dc74598cbd50a4e1c

Index: pkgsrc/devel/cmake/patches/patch-Modules_FindCurses.cmake
diff -u pkgsrc/devel/cmake/patches/patch-Modules_FindCurses.cmake:1.1 pkgsrc/devel/cmake/patches/patch-Modules_FindCurses.cmake:1.2
--- pkgsrc/devel/cmake/patches/patch-Modules_FindCurses.cmake:1.1       Thu Jan  5 22:34:25 2017
+++ pkgsrc/devel/cmake/patches/patch-Modules_FindCurses.cmake   Fri Jan  4 17:47:12 2019
@@ -1,4 +1,8 @@
-$NetBSD: patch-Modules_FindCurses.cmake,v 1.1 2017/01/05 22:34:25 joerg Exp $
+$NetBSD: patch-Modules_FindCurses.cmake,v 1.2 2019/01/04 17:47:12 triaxx Exp $
+
+Recognize libgnuform as valid implementation of a form library to match
+devel/ncurses. This is necessary due to cmake's insistance of scanning
+PREFIX/lib directly.
 
 --- Modules/FindCurses.cmake.orig      2017-01-05 22:24:12.384738412 +0000
 +++ Modules/FindCurses.cmake

Added files:

Index: pkgsrc/devel/cmake/patches/patch-Modules_FindGTK2.cmake
diff -u /dev/null pkgsrc/devel/cmake/patches/patch-Modules_FindGTK2.cmake:1.1
--- /dev/null   Fri Jan  4 17:47:12 2019
+++ pkgsrc/devel/cmake/patches/patch-Modules_FindGTK2.cmake     Fri Jan  4 17:47:12 2019
@@ -0,0 +1,16 @@
+$NetBSD: patch-Modules_FindGTK2.cmake,v 1.1 2019/01/04 17:47:12 triaxx Exp $
+
+Test not enough robust. Open ticket on upstream:
+https://gitlab.kitware.com/cmake/cmake/issues/17614
+
+--- Modules/FindGTK2.cmake.orig        2018-12-13 11:57:40.000000000 +0000
++++ Modules/FindGTK2.cmake
+@@ -762,7 +762,7 @@ foreach(_GTK2_component ${GTK2_FIND_COMP
+         _GTK2_FIND_LIBRARY    (SIGC++ sigc true true)
+         _GTK2_ADD_TARGET      (SIGC++)
+         # Since sigc++ 2.5.1 c++11 support is required
+-        if(GTK2_SIGC++CONFIG_INCLUDE_DIR)
++        if(GTK2_SIGC++_FOUND)
+             _GTK2_SIGCXX_GET_VERSION(GTK2_SIGC++_VERSION_MAJOR
+                                      GTK2_SIGC++_VERSION_MINOR
+                                      GTK2_SIGC++_VERSION_MICRO