CVS commit: pkgsrc/chat/weechat

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Sat Mar 23 14:54:13 UTC 2019

Modified Files:
        pkgsrc/chat/weechat: distinfo
        pkgsrc/chat/weechat/patches: patch-cmake_FindNcurses.cmake

Log Message:
chat/weechat: Search for libcurses when attempting to find a value for
NCURSES_LIBRARY. Seems to help problems when configuring against netbsd
curses.


To generate a diff of this commit:
cvs rdiff -u -r1.53 -r1.54 pkgsrc/chat/weechat/distinfo
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/chat/weechat/patches/patch-cmake_FindNcurses.cmake

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/chat/weechat/distinfo
diff -u pkgsrc/chat/weechat/distinfo:1.53 pkgsrc/chat/weechat/distinfo:1.54
--- pkgsrc/chat/weechat/distinfo:1.53   Thu Mar  7 18:09:24 2019
+++ pkgsrc/chat/weechat/distinfo        Sat Mar 23 14:54:13 2019
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.53 2019/03/07 18:09:24 jperkin Exp $
+$NetBSD: distinfo,v 1.54 2019/03/23 14:54:13 nia Exp $
 
 SHA1 (weechat-2.4.tar.bz2) = a7a0ced72ee5428dc92502b6688fb2c287359a54
 RMD160 (weechat-2.4.tar.bz2) = eed25333e05725fd2d1be1b08ac350d688be12fc
 SHA512 (weechat-2.4.tar.bz2) = f69231973c7461c22e0e3b3bc11a29feaeead0dc47e8c7d29f381d37f183c70f73712645391eda7c749e7da61512d82cf2bf3b98ab4547ea1ccf56a02e01a207
 Size (weechat-2.4.tar.bz2) = 2944811 bytes
 SHA1 (patch-CMakeLists.txt) = 493e49c0c698ff7b2685ba489d693fc1d388318d
-SHA1 (patch-cmake_FindNcurses.cmake) = bcc15b2c968a5850f1161608a83f38a03296b2a8
+SHA1 (patch-cmake_FindNcurses.cmake) = 0262cc58469e53c26dcc17ac862de12118fadc44
 SHA1 (patch-po_CMakeLists.txt) = 9b97a4a4da4175e31ea53352fd0b95e1c985ba1e
 SHA1 (patch-src_core_weechat.c) = 062cd7443a756edbdf60289a7847b4278d520105
 SHA1 (patch-src_plugins_charset_charset.c) = f0b6e5268908caab5efa8048c8a55b0083ec0ca4

Index: pkgsrc/chat/weechat/patches/patch-cmake_FindNcurses.cmake
diff -u pkgsrc/chat/weechat/patches/patch-cmake_FindNcurses.cmake:1.2 pkgsrc/chat/weechat/patches/patch-cmake_FindNcurses.cmake:1.3
--- pkgsrc/chat/weechat/patches/patch-cmake_FindNcurses.cmake:1.2       Mon Jul 23 22:57:22 2018
+++ pkgsrc/chat/weechat/patches/patch-cmake_FindNcurses.cmake   Sat Mar 23 14:54:13 2019
@@ -1,8 +1,8 @@
-$NetBSD: patch-cmake_FindNcurses.cmake,v 1.2 2018/07/23 22:57:22 maya Exp $
+$NetBSD: patch-cmake_FindNcurses.cmake,v 1.3 2019/03/23 14:54:13 nia Exp $
 
 Don't try to look for ncurses.h, so FAKE_NCURSES works for netbsd curses.
 
---- cmake/FindNcurses.cmake.orig       2018-03-18 06:41:40.000000000 +0000
+--- cmake/FindNcurses.cmake.orig       2019-02-17 07:20:07.000000000 +0000
 +++ cmake/FindNcurses.cmake
 @@ -22,7 +22,7 @@ if(NCURSES_FOUND)
  endif()
@@ -13,3 +13,12 @@ Don't try to look for ncurses.h, so FAKE
    PATHS /usr/include/ncursesw /usr/include/ncurses /usr/include
    /usr/local/include/ncursesw /usr/local/include/ncurses /usr/local/include
    /usr/pkg/include/ncursesw /usr/pkg/include/ncurses /usr/pkg/include
+@@ -42,7 +42,7 @@ if(NCURSESW_LIBRARY)
+   set(NCURSES_LIBRARY ${NCURSESW_LIBRARY})
+ else()
+   find_library(NCURSES_LIBRARY
+-    NAMES ncurses
++    NAMES curses ncurses
+     PATHS /lib /usr/lib /usr/local/lib /usr/pkg/lib
+   )
+   find_package(PkgConfig QUIET)