CVS commit: pkgsrc/devel/cmake

["Joerg Sonnenberger" <joerg%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   joerg
Date:           Thu Jan  5 22:34:25 UTC 2017

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

Log Message:
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. Bump revision.


To generate a diff of this commit:
cvs rdiff -u -r1.128 -r1.129 pkgsrc/devel/cmake/Makefile
cvs rdiff -u -r1.94 -r1.95 pkgsrc/devel/cmake/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/devel/cmake/patches/patch-Modules_FindCurses.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.128 pkgsrc/devel/cmake/Makefile:1.129
--- pkgsrc/devel/cmake/Makefile:1.128   Sun Jan  1 16:06:08 2017
+++ pkgsrc/devel/cmake/Makefile Thu Jan  5 22:34:25 2017
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.128 2017/01/01 16:06:08 adam Exp $
+# $NetBSD: Makefile,v 1.129 2017/01/05 22:34:25 joerg Exp $
 
 .include "Makefile.version"
 
 DISTNAME=      cmake-${CMAKE_VERSION}
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    devel
 MASTER_SITES=  https://cmake.org/files/v${CMAKE_API}/
 

Index: pkgsrc/devel/cmake/distinfo
diff -u pkgsrc/devel/cmake/distinfo:1.94 pkgsrc/devel/cmake/distinfo:1.95
--- pkgsrc/devel/cmake/distinfo:1.94    Sun Dec  4 08:52:56 2016
+++ pkgsrc/devel/cmake/distinfo Thu Jan  5 22:34:25 2017
@@ -1,10 +1,11 @@
-$NetBSD: distinfo,v 1.94 2016/12/04 08:52:56 adam Exp $
+$NetBSD: distinfo,v 1.95 2017/01/05 22:34:25 joerg Exp $
 
 SHA1 (cmake-3.7.1.tar.gz) = d00c720847c0a2aff817c36377569efbb677fb08
 RMD160 (cmake-3.7.1.tar.gz) = 6a1b7bfb15d882826ecafa5c74d5e4ae2f0530a4
 SHA512 (cmake-3.7.1.tar.gz) = 0539d70ce3ac77042a45d638443b09fbf368e253622db980bc6fb15988743eacd031ab850a45c821ec3e9f0f5f886b9c9cb0668aeda184cd457b78abbfe7b629
 Size (cmake-3.7.1.tar.gz) = 7361172 bytes
 SHA1 (patch-CMakeLists.txt) = a0b03f2fad5ea174095c4fe52cea67d94cf46e2d
+SHA1 (patch-Modules_FindCurses.cmake) = 09fcd7adfbc2dfc2cd8af4e047d870a5243d77dc
 SHA1 (patch-Modules_FindX11.cmake) = 124a2d51155cb4455e8b829dc74598cbd50a4e1c
 SHA1 (patch-Source_CursesDialog_ccmake.cxx) = e1b6feca837013c715b4268f2ccb134f956f3193
 SHA1 (patch-Utilities_KWIML_CMakeLists.txt) = e4bdf9fc58757e87bf7e3e3e195839eededbc796

Added files:

Index: pkgsrc/devel/cmake/patches/patch-Modules_FindCurses.cmake
diff -u /dev/null pkgsrc/devel/cmake/patches/patch-Modules_FindCurses.cmake:1.1
--- /dev/null   Thu Jan  5 22:34:25 2017
+++ pkgsrc/devel/cmake/patches/patch-Modules_FindCurses.cmake   Thu Jan  5 22:34:25 2017
@@ -0,0 +1,15 @@
+$NetBSD: patch-Modules_FindCurses.cmake,v 1.1 2017/01/05 22:34:25 joerg Exp $
+
+--- Modules/FindCurses.cmake.orig      2017-01-05 22:24:12.384738412 +0000
++++ Modules/FindCurses.cmake
+@@ -167,8 +167,8 @@ if(NOT DEFINED CURSES_HAVE_CURSES_H)
+   endif()
+ endif()
+ 
+-find_library(CURSES_FORM_LIBRARY form HINTS "${_cursesLibDir}")
+-find_library(CURSES_FORM_LIBRARY form )
++find_library(CURSES_FORM_LIBRARY form gnuform HINTS "${_cursesLibDir}")
++find_library(CURSES_FORM_LIBRARY form gnuform)
+ 
+ # Previous versions of FindCurses provided these values.
+ if(NOT DEFINED FORM_LIBRARY)