[pkgsrc/pkgsrc-2017Q3]: pkgsrc/chat/weechat Pullup ticket #5617 - requested b...

[bsiegert <bsiegert%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/4a35c8f7dd18
branches:  pkgsrc-2017Q3
changeset: 408575:4a35c8f7dd18
user:      bsiegert <bsiegert%pkgsrc.org@localhost>
date:      Mon Nov 06 19:22:11 2017 +0000

description:
Pullup ticket #5617 - requested by maya
chat/weechat: build fix

Revisions pulled up:
- chat/weechat/distinfo                                         1.45-1.46
- chat/weechat/patches/patch-CMakeLists.txt                     1.1-1.2

---
   Module Name:    pkgsrc
   Committed By:   maya
   Date:           Sat Nov  4 17:16:58 UTC 2017

   Modified Files:
           pkgsrc/chat/weechat: distinfo
   Added Files:
           pkgsrc/chat/weechat/patches: patch-CMakeLists.txt

   Log Message:
   weechat: add configure check that eat_newline_glitch can be assigned to

   Fixes netbsd-7 build.

---
   Module Name:    pkgsrc
   Committed By:   maya
   Date:           Sat Nov  4 17:23:20 UTC 2017

   Modified Files:
           pkgsrc/chat/weechat: distinfo
           pkgsrc/chat/weechat/patches: patch-CMakeLists.txt

   Log Message:
   weechat: ...and don't expand unrelated things in CMakeLists.txt

diffstat:

 chat/weechat/distinfo                     |   3 +-
 chat/weechat/patches/patch-CMakeLists.txt |  41 +++++++++++++++++++++++++++++++
 2 files changed, 43 insertions(+), 1 deletions(-)

diffs (60 lines):

diff -r e133bc4967e8 -r 4a35c8f7dd18 chat/weechat/distinfo
--- a/chat/weechat/distinfo     Mon Nov 06 19:16:29 2017 +0000
+++ b/chat/weechat/distinfo     Mon Nov 06 19:22:11 2017 +0000
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.44 2017/09/25 12:14:28 maya Exp $
+$NetBSD: distinfo,v 1.44.4.1 2017/11/06 19:22:11 bsiegert Exp $
 
 SHA1 (weechat-1.9.1.tar.bz2) = caebc05c4a8627625d2688534fbba624555e5a8e
 RMD160 (weechat-1.9.1.tar.bz2) = ea3e14d979c94fa5554f057ea210f0021abcb28d
 SHA512 (weechat-1.9.1.tar.bz2) = dd535845b61430be212c973deab745d5829ef46971c84118e14689073f3d83bcbc1d85856e3e5110b78efb6ee6ccf64201bb6b77573a295aa9dc7f5d1dab3d3e
 Size (weechat-1.9.1.tar.bz2) = 2658824 bytes
+SHA1 (patch-CMakeLists.txt) = 493e49c0c698ff7b2685ba489d693fc1d388318d
 SHA1 (patch-ab) = 2a4583e0f5b0336e8c42ad9eb5a65bbec4730207
 SHA1 (patch-po_CMakeLists.txt) = 9b97a4a4da4175e31ea53352fd0b95e1c985ba1e
 SHA1 (patch-src_gui_curses_CMakeLists_txt) = 28a1b3b9920cc130d0454a18b111d37b8090038b
diff -r e133bc4967e8 -r 4a35c8f7dd18 chat/weechat/patches/patch-CMakeLists.txt
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/chat/weechat/patches/patch-CMakeLists.txt Mon Nov 06 19:22:11 2017 +0000
@@ -0,0 +1,41 @@
+$NetBSD: patch-CMakeLists.txt,v 1.2.2.2 2017/11/06 19:22:11 bsiegert Exp $
+
+Check that eat_newline_glitch can be assigned to
+
+--- CMakeLists.txt.orig        2017-09-23 11:08:45.000000000 +0000
++++ CMakeLists.txt
+@@ -150,7 +150,33 @@ check_include_files("sys/resource.h" HAV
+ 
+ check_function_exists(mallinfo HAVE_MALLINFO)
+ 
+-check_symbol_exists("eat_newline_glitch" "term.h" HAVE_EAT_NEWLINE_GLITCH)
++include(CheckCSourceCompiles)
++find_package(Ncurses)
++check_include_files(ncursesw/term.h HAVE_NCURSESW_TERM_H)
++check_include_files(ncurses/term.h HAVE_NCURSES_TERM_H)
++
++
++set(OLD_CMAKE_REQUIRED_LIBRARIES "${CMAKE_REQUIRED_LIBRARIES}")
++
++if(NCURSES_FOUND)
++  set(CMAKE_REQUIRED_LIBRARIES "ncurses")
++else()
++  set(CMAKE_REQUIRED_LIBRARIES "curses")
++endif()
++
++CHECK_C_SOURCE_COMPILES("
++      #ifdef HAVE_NCURSES_TERM_H
++      #include <ncurses/term.h>
++      #endif
++      #include <term.h>
++
++      int main() {
++              eat_newline_glitch = 1;
++              return 0;
++      }
++      " HAVE_EAT_NEWLINE_GLITCH)
++
++set(CMAKE_REQUIRED_LIBRARIES "${OLD_CMAKE_REQUIRED_LIBRARIES}")
+ 
+ # Check for Large File Support
+ if(ENABLE_LARGEFILE)