Sat Nov 4 17:23:20 2017 UTC ()
weechat: ...and don't expand unrelated things in CMakeLists.txt


(maya)
diff -r1.45 -r1.46 pkgsrc/chat/weechat/distinfo
diff -r1.1 -r1.2 pkgsrc/chat/weechat/patches/patch-CMakeLists.txt
cvs diff -r1.45 -r1.46 pkgsrc/chat/weechat/distinfo (expand / switch to unified diff)

--- pkgsrc/chat/weechat/distinfo 2017/11/04 17:16:58 1.45
+++ pkgsrc/chat/weechat/distinfo 2017/11/04 17:23:20 1.46
@@ -1,11 +1,11 @@ @@ -1,11 +1,11 @@
1$NetBSD: distinfo,v 1.45 2017/11/04 17:16:58 maya Exp $ 1$NetBSD: distinfo,v 1.46 2017/11/04 17:23:20 maya Exp $
2 2
3SHA1 (weechat-1.9.1.tar.bz2) = caebc05c4a8627625d2688534fbba624555e5a8e 3SHA1 (weechat-1.9.1.tar.bz2) = caebc05c4a8627625d2688534fbba624555e5a8e
4RMD160 (weechat-1.9.1.tar.bz2) = ea3e14d979c94fa5554f057ea210f0021abcb28d 4RMD160 (weechat-1.9.1.tar.bz2) = ea3e14d979c94fa5554f057ea210f0021abcb28d
5SHA512 (weechat-1.9.1.tar.bz2) = dd535845b61430be212c973deab745d5829ef46971c84118e14689073f3d83bcbc1d85856e3e5110b78efb6ee6ccf64201bb6b77573a295aa9dc7f5d1dab3d3e 5SHA512 (weechat-1.9.1.tar.bz2) = dd535845b61430be212c973deab745d5829ef46971c84118e14689073f3d83bcbc1d85856e3e5110b78efb6ee6ccf64201bb6b77573a295aa9dc7f5d1dab3d3e
6Size (weechat-1.9.1.tar.bz2) = 2658824 bytes 6Size (weechat-1.9.1.tar.bz2) = 2658824 bytes
7SHA1 (patch-CMakeLists.txt) = b3c4c6baa5898099e4448be4384437766f344cf2 7SHA1 (patch-CMakeLists.txt) = 493e49c0c698ff7b2685ba489d693fc1d388318d
8SHA1 (patch-ab) = 2a4583e0f5b0336e8c42ad9eb5a65bbec4730207 8SHA1 (patch-ab) = 2a4583e0f5b0336e8c42ad9eb5a65bbec4730207
9SHA1 (patch-po_CMakeLists.txt) = 9b97a4a4da4175e31ea53352fd0b95e1c985ba1e 9SHA1 (patch-po_CMakeLists.txt) = 9b97a4a4da4175e31ea53352fd0b95e1c985ba1e
10SHA1 (patch-src_gui_curses_CMakeLists_txt) = 28a1b3b9920cc130d0454a18b111d37b8090038b 10SHA1 (patch-src_gui_curses_CMakeLists_txt) = 28a1b3b9920cc130d0454a18b111d37b8090038b
11SHA1 (patch-src_plugins_charset_charset.c) = f0b6e5268908caab5efa8048c8a55b0083ec0ca4 11SHA1 (patch-src_plugins_charset_charset.c) = f0b6e5268908caab5efa8048c8a55b0083ec0ca4
cvs diff -r1.1 -r1.2 pkgsrc/chat/weechat/patches/Attic/patch-CMakeLists.txt (expand / switch to unified diff)

--- pkgsrc/chat/weechat/patches/Attic/patch-CMakeLists.txt 2017/11/04 17:16:58 1.1
+++ pkgsrc/chat/weechat/patches/Attic/patch-CMakeLists.txt 2017/11/04 17:23:20 1.2
@@ -1,26 +1,19 @@ @@ -1,26 +1,19 @@
1$NetBSD: patch-CMakeLists.txt,v 1.1 2017/11/04 17:16:58 maya Exp $ 1$NetBSD: patch-CMakeLists.txt,v 1.2 2017/11/04 17:23:20 maya Exp $
 2
 3Check that eat_newline_glitch can be assigned to
2 4
3--- CMakeLists.txt.orig 2017-09-23 11:08:45.000000000 +0000 5--- CMakeLists.txt.orig 2017-09-23 11:08:45.000000000 +0000
4+++ CMakeLists.txt 6+++ CMakeLists.txt
5@@ -25,7 +25,7 @@ project(weechat C) 
6  
7 # CMake options 
8 set(CMAKE_VERBOSE_MAKEFILE OFF) 
9-set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake ${CMAKE_MODULE_PATH}) 
10+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}) 
11 set(CMAKE_SKIP_RPATH ON) 
12 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Werror-implicit-function-declaration") 
13 set(CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Werror-implicit-function-declaration") 
14@@ -150,7 +150,33 @@ check_include_files("sys/resource.h" HAV 7@@ -150,7 +150,33 @@ check_include_files("sys/resource.h" HAV
15  8
16 check_function_exists(mallinfo HAVE_MALLINFO) 9 check_function_exists(mallinfo HAVE_MALLINFO)
17  10
18-check_symbol_exists("eat_newline_glitch" "term.h" HAVE_EAT_NEWLINE_GLITCH) 11-check_symbol_exists("eat_newline_glitch" "term.h" HAVE_EAT_NEWLINE_GLITCH)
19+include(CheckCSourceCompiles) 12+include(CheckCSourceCompiles)
20+find_package(Ncurses) 13+find_package(Ncurses)
21+check_include_files(ncursesw/term.h HAVE_NCURSESW_TERM_H) 14+check_include_files(ncursesw/term.h HAVE_NCURSESW_TERM_H)
22+check_include_files(ncurses/term.h HAVE_NCURSES_TERM_H) 15+check_include_files(ncurses/term.h HAVE_NCURSES_TERM_H)
23+ 16+
24+ 17+
25+set(OLD_CMAKE_REQUIRED_LIBRARIES "${CMAKE_REQUIRED_LIBRARIES}") 18+set(OLD_CMAKE_REQUIRED_LIBRARIES "${CMAKE_REQUIRED_LIBRARIES}")
26+ 19+