head 1.6; access; symbols pkgsrc-2026Q1:1.6.0.48 pkgsrc-2026Q1-base:1.6 pkgsrc-2025Q4:1.6.0.46 pkgsrc-2025Q4-base:1.6 pkgsrc-2025Q3:1.6.0.44 pkgsrc-2025Q3-base:1.6 pkgsrc-2025Q2:1.6.0.42 pkgsrc-2025Q2-base:1.6 pkgsrc-2025Q1:1.6.0.40 pkgsrc-2025Q1-base:1.6 pkgsrc-2024Q4:1.6.0.38 pkgsrc-2024Q4-base:1.6 pkgsrc-2024Q3:1.6.0.36 pkgsrc-2024Q3-base:1.6 pkgsrc-2024Q2:1.6.0.34 pkgsrc-2024Q2-base:1.6 pkgsrc-2024Q1:1.6.0.32 pkgsrc-2024Q1-base:1.6 pkgsrc-2023Q4:1.6.0.30 pkgsrc-2023Q4-base:1.6 pkgsrc-2023Q3:1.6.0.28 pkgsrc-2023Q3-base:1.6 pkgsrc-2023Q2:1.6.0.26 pkgsrc-2023Q2-base:1.6 pkgsrc-2023Q1:1.6.0.24 pkgsrc-2023Q1-base:1.6 pkgsrc-2022Q4:1.6.0.22 pkgsrc-2022Q4-base:1.6 pkgsrc-2022Q3:1.6.0.20 pkgsrc-2022Q3-base:1.6 pkgsrc-2022Q2:1.6.0.18 pkgsrc-2022Q2-base:1.6 pkgsrc-2022Q1:1.6.0.16 pkgsrc-2022Q1-base:1.6 pkgsrc-2021Q4:1.6.0.14 pkgsrc-2021Q4-base:1.6 pkgsrc-2021Q3:1.6.0.12 pkgsrc-2021Q3-base:1.6 pkgsrc-2021Q2:1.6.0.10 pkgsrc-2021Q2-base:1.6 pkgsrc-2021Q1:1.6.0.8 pkgsrc-2021Q1-base:1.6 pkgsrc-2020Q4:1.6.0.6 pkgsrc-2020Q4-base:1.6 pkgsrc-2020Q3:1.6.0.4 pkgsrc-2020Q3-base:1.6 pkgsrc-2020Q2:1.6.0.2 pkgsrc-2020Q2-base:1.6 pkgsrc-2020Q1:1.4.0.4 pkgsrc-2020Q1-base:1.4 pkgsrc-2019Q4:1.4.0.6 pkgsrc-2019Q4-base:1.4 pkgsrc-2019Q3:1.4.0.2 pkgsrc-2019Q3-base:1.4 pkgsrc-2019Q2:1.3.0.4 pkgsrc-2019Q2-base:1.3 pkgsrc-2019Q1:1.3.0.2 pkgsrc-2019Q1-base:1.3 pkgsrc-2018Q4:1.2.0.4 pkgsrc-2018Q4-base:1.2 pkgsrc-2018Q3:1.2.0.2 pkgsrc-2018Q3-base:1.2; locks; strict; comment @# @; 1.6 date 2020.04.01.14.58.50; author nia; state Exp; branches; next 1.5; commitid GdiaDjFFUfRs2H2C; 1.5 date 2020.03.30.11.07.18; author nia; state dead; branches; next 1.4; commitid 1xZjgwUHJqDXOp2C; 1.4 date 2019.09.17.11.30.27; author nia; state Exp; branches; next 1.3; commitid LRekjH3AdbxEdmDB; 1.3 date 2019.03.23.14.54.13; author nia; state Exp; branches; next 1.2; commitid CBKVbT7MIu6R3vgB; 1.2 date 2018.07.23.22.57.22; author maya; state Exp; branches; next 1.1; commitid YOMwgd4lebVgyjLA; 1.1 date 2018.07.22.21.32.34; author maya; state Exp; branches; next ; commitid e0fznoFxj2ee6bLA; desc @@ 1.6 log @weechat: Restore handling for NetBSD libcurses If it can't find ncurses.so it gives up. Allow FAKE_NCURSES to work properly when ncurses isn't installed. @ text @$NetBSD$ Find NetBSD libcurses. --- cmake/FindNcurses.cmake.orig 2020-03-29 07:39:36.000000000 +0000 +++ cmake/FindNcurses.cmake @@@@ -41,7 +41,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) @ 1.5 log @weechat: Drop patches that are no longer needed. @ text @d1 1 a1 1 $NetBSD: patch-cmake_FindNcurses.cmake,v 1.4 2019/09/17 11:30:27 nia Exp $ d3 1 a3 1 Don't try to look for ncurses.h, so FAKE_NCURSES works for netbsd curses. d5 1 a5 1 --- cmake/FindNcurses.cmake.orig 2019-09-08 06:13:58.000000000 +0000 a6 9 @@@@ -22,7 +22,7 @@@@ if(NCURSES_FOUND) endif() find_path(NCURSES_INCLUDE_PATH - NAMES ncurses.h curses.h + NAMES curses.h ncurses.h PATH_SUFFIXES ncursesw ncurses PATHS /usr/include /usr/local/include /usr/pkg/include ) @ 1.4 log @weechat: update to 2.6 == Version 2.6 (2019-09-08) New features:: * core: add support of 32767 color pairs (issue #1343, issue #1345) * core: add option "close" in command /window (issue #853) * api: add infos "term_colors" and "term_color_pairs" * api: add function list_user_data (issue #666) * api: add argument "strip_items" in function string_split * buflist: add infolist "buflist" with list of buffer pointers (issue #1375) * exec: evaluate option exec.command.shell, change default value to "${env:SHELL}" (issue #1356) * fset: add filters "h=xxx" and "he=xxx" to filter options by description (translated or in English) * irc: make command char optional in server option "command" (issue #615) * irc: add variables "user_max_length" and "host_max_length" in server structure (issue #1387) Bug fixes:: * core: use fixed-width integer for computing nick and hashtable DJB2 key hashes, add values "djb2_32" and "sum_32" for option weechat.look.nick_color_hash (issue #1394) * core: create or update option weechat.notify.xxx when function buffer_set is called with "notify" property (issue #1390) * core: fix memory leak in case of error when building content of bar item for display (issue #1384) * core: send command line parameter to plugins only if the name starts with the plugin name followed by a colon * core: auto disable upgrade process (command line option "--upgrade") if the file weechat.upgrade is not found * core: replace newlines by spaces in argument "completion" of function hook_command (issue #538) * core: replace char "," by "~" in color codes to separate foreground from background (issue #1264) * alias: remove default aliases /AME and /AMSG (issue #1355) * buflist: use extra variables in option buflist.look.display_conditions (issue #1393) * irc: fix parsing of messages 346 (invite list), 348 (exception list), 367 (ban list) and 728 (quiet list) when there is a colon before the timestamp (issue #1396) * irc: fix memory leak when removing a server * irc: fix length of user/nick/host in split of messages (issue #1387) * irc: quote NICK command argument sent to the server only if there's a ":" in the nick (issue #1376, issue #1319) * irc: return all arguments in the PONG response to a PING (issue #1369) * irc: disable server reconnection when the server buffer is closed (issue #236) * irc: strip spaces at beginning/end of addresses in server option "addresses" (issue #195) * irc: fix display of enabled/disabled client capabilities received in command CAP ACK (issue #151) * ruby: fix conversion of big integers on 32bit architecture (issue #1395) Tests:: * unit: add tests on IRC ignore, message and nick functions Build:: * core: fix compilation with autotools on FreeBSD 12.0 * debian: disable Javascript plugin on Debian Buster/Bullseye (issue #1374) * python: compile with Python 3 by default * python: use pkg-config to detect Python (issue #1382) @ text @d1 1 a1 1 $NetBSD: patch-cmake_FindNcurses.cmake,v 1.3 2019/03/23 14:54:13 nia Exp $ @ 1.3 log @chat/weechat: Search for libcurses when attempting to find a value for NCURSES_LIBRARY. Seems to help problems when configuring against netbsd curses. @ text @d1 1 a1 1 $NetBSD: patch-cmake_FindNcurses.cmake,v 1.2 2018/07/23 22:57:22 maya Exp $ d5 1 a5 1 --- cmake/FindNcurses.cmake.orig 2019-02-17 07:20:07.000000000 +0000 d12 5 a16 5 + NAMES curses.h 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) @ 1.2 log @weechat: minimal patch to allow using netbsd curses. Now uses fake ncurses. less likely to cause problems to people who try to hide their base curses. bump pkgrevision (again). @ text @d1 1 a1 1 $NetBSD: patch-cmake_FindNcurses.cmake,v 1.1 2018/07/22 21:32:34 maya Exp $ d5 1 a5 1 --- cmake/FindNcurses.cmake.orig 2018-03-18 06:41:40.000000000 +0000 d16 9 @ 1.1 log @weechat: make curses detection logic handle netbsd curses, at the possible expense of causing problems due to pkgsrc infrastructure not hiding a base curses well enough. We now search in the following order: ncursesw, curses, ncurses. With cmake under pkgsrc, it will search your /usr/lib, so I don't have a way to hide a base curses if requested to do so. if you're trying to use pkgsrc ncurses and have a base curses, this will use your base curses. bump pkgrevision. @ text @d1 1 a1 1 $NetBSD$ d3 1 a3 4 Try the following order: ncursesw, then plain curses, then ncurses. NCURSES_LIBRARY must be defined. (for netbsd curses) a15 49 @@@@ -33,6 +33,16 @@@@ find_library(NCURSESW_LIBRARY PATHS /lib /usr/lib /usr/local/lib /usr/pkg/lib ) +find_library(NCURSES_LIBRARY + NAMES ncurses + PATHS /lib /usr/lib /usr/local/lib /usr/pkg/lib +) + +find_library(CURSES_LIBRARY + NAMES curses + PATHS /lib /usr/lib /usr/local/lib /usr/pkg/lib +) + if(NCURSESW_LIBRARY) find_package(PkgConfig QUIET) if(PKG_CONFIG_FOUND) @@@@ -40,21 +50,21 @@@@ if(NCURSESW_LIBRARY) set(NCURSESW_LIBRARY ${NCURSES_LIBRARIES} ${NCURSES_CFLAGS_OTHER}) endif() set(NCURSES_LIBRARY ${NCURSESW_LIBRARY}) -else() - find_library(NCURSES_LIBRARY - NAMES ncurses - PATHS /lib /usr/lib /usr/local/lib /usr/pkg/lib - ) + + +elseif(CURSES_LIBRARY) + set(NCURSES_LIBRARY ${CURSES_LIBRARY}) + + +elseif(NCURSES_LIBRARY) find_package(PkgConfig QUIET) if(PKG_CONFIG_FOUND) pkg_search_module(NCURSES ncurses) set(NCURSES_LIBRARY ${NCURSES_LIBRARIES} ${NCURSES_CFLAGS_OTHER}) endif() - if(NCURSES_LIBRARY) - message("*** WARNING:\n" - "*** ncursesw library not found! Falling back to \"ncurses\"\n" - "*** Be careful, UTF-8 display may not work properly if your locale is UTF-8.") - endif() + message("*** WARNING:\n" + "*** ncursesw library not found! Falling back to \"ncurses\"\n" + "*** Be careful, UTF-8 display may not work properly if your locale is UTF-8.") endif() if(NCURSES_INCLUDE_PATH AND NCURSES_LIBRARY) @