Received: by mail.netbsd.org (Postfix, from userid 605) id 565F384D8A; Sat, 4 Nov 2017 17:16:59 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id D667784D78 for ; Sat, 4 Nov 2017 17:16:58 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id oQapQKwFy8Wn for ; Sat, 4 Nov 2017 17:16:58 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 531A884CE1 for ; Sat, 4 Nov 2017 17:16:58 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 4E47DFBDE; Sat, 4 Nov 2017 17:16:58 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1509815818148660" MIME-Version: 1.0 Date: Sat, 4 Nov 2017 17:16:58 +0000 From: "Maya Rashish" Subject: CVS commit: pkgsrc/chat/weechat To: pkgsrc-changes@NetBSD.org Reply-To: maya@netbsd.org X-Mailer: log_accum Message-Id: <20171104171658.4E47DFBDE@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1509815818148660 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" 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. To generate a diff of this commit: cvs rdiff -u -r1.44 -r1.45 pkgsrc/chat/weechat/distinfo cvs rdiff -u -r0 -r1.1 pkgsrc/chat/weechat/patches/patch-CMakeLists.txt Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1509815818148660 Content-Disposition: inline Content-Length: 3399 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/chat/weechat/distinfo diff -u pkgsrc/chat/weechat/distinfo:1.44 pkgsrc/chat/weechat/distinfo:1.45 --- pkgsrc/chat/weechat/distinfo:1.44 Mon Sep 25 12:14:28 2017 +++ pkgsrc/chat/weechat/distinfo Sat Nov 4 17:16:58 2017 @@ -1,9 +1,10 @@ -$NetBSD: distinfo,v 1.44 2017/09/25 12:14:28 maya Exp $ +$NetBSD: distinfo,v 1.45 2017/11/04 17:16:58 maya 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) = b3c4c6baa5898099e4448be4384437766f344cf2 SHA1 (patch-ab) = 2a4583e0f5b0336e8c42ad9eb5a65bbec4730207 SHA1 (patch-po_CMakeLists.txt) = 9b97a4a4da4175e31ea53352fd0b95e1c985ba1e SHA1 (patch-src_gui_curses_CMakeLists_txt) = 28a1b3b9920cc130d0454a18b111d37b8090038b Added files: Index: pkgsrc/chat/weechat/patches/patch-CMakeLists.txt diff -u /dev/null pkgsrc/chat/weechat/patches/patch-CMakeLists.txt:1.1 --- /dev/null Sat Nov 4 17:16:58 2017 +++ pkgsrc/chat/weechat/patches/patch-CMakeLists.txt Sat Nov 4 17:16:58 2017 @@ -0,0 +1,48 @@ +$NetBSD: patch-CMakeLists.txt,v 1.1 2017/11/04 17:16:58 maya Exp $ + +--- CMakeLists.txt.orig 2017-09-23 11:08:45.000000000 +0000 ++++ CMakeLists.txt +@@ -25,7 +25,7 @@ project(weechat C) + + # CMake options + set(CMAKE_VERBOSE_MAKEFILE OFF) +-set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake ${CMAKE_MODULE_PATH}) ++set (CMAKE_MODULE_PATH "/usr/pkgsrc/chat/weechat/work/.buildlink/cmake-Modules" "/usr/pkgsrc/chat/weechat/work/.buildlink/cmake-Modules" "/usr/pkgsrc/chat/weechat/work/.buildlink/cmake-Modules" "/usr/pkgsrc/chat/weechat/work/.buildlink/cmake-Modules" "/usr/pkgsrc/chat/weechat/work/.buildlink/cmake-Modules" "/usr/pkgsrc/chat/weechat/work/.buildlink/cmake-Modules" "/usr/pkgsrc/chat/weechat/work/.buildlink/cmake-Modules" "/usr/pkgsrc/chat/weechat/work/.buildlink/cmake-Modules" "/usr/pkgsrc/chat/weechat/work/.buildlink/cmake-Modules" "/usr/pkgsrc/chat/weechat/work/.buildlink/cmake-Modules" ${CMAKE_SOURCE_DIR}/cmake ${CMAKE_MODULE_PATH}) + set(CMAKE_SKIP_RPATH ON) + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Werror-implicit-function-declaration") + set(CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Werror-implicit-function-declaration") +@@ -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 ++ #endif ++ #include ++ ++ 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) --_----------=_1509815818148660--