diff options
author | maya <maya@pkgsrc.org> | 2018-07-23 22:57:22 +0000 |
---|---|---|
committer | maya <maya@pkgsrc.org> | 2018-07-23 22:57:22 +0000 |
commit | a12b4f2e55a3eca834ad2867335c53daafb90ecf (patch) | |
tree | 38c717c1db67e26a6e286e7cdb248f9cdb7cdcad /chat | |
parent | b0f708d1ac9fec4b088e38d3d4e6aa4ed42ca5f3 (diff) | |
download | pkgsrc-a12b4f2e55a3eca834ad2867335c53daafb90ecf.tar.gz |
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).
Diffstat (limited to 'chat')
-rw-r--r-- | chat/weechat/Makefile | 5 | ||||
-rw-r--r-- | chat/weechat/distinfo | 4 | ||||
-rw-r--r-- | chat/weechat/patches/patch-cmake_FindNcurses.cmake | 56 |
3 files changed, 7 insertions, 58 deletions
diff --git a/chat/weechat/Makefile b/chat/weechat/Makefile index 305ad6f99af..bd6ae6977f3 100644 --- a/chat/weechat/Makefile +++ b/chat/weechat/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.87 2018/07/22 21:32:34 maya Exp $ +# $NetBSD: Makefile,v 1.88 2018/07/23 22:57:22 maya Exp $ DISTNAME= weechat-2.1 -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= chat MASTER_SITES= https://www.weechat.org/files/src/ EXTRACT_SUFX= .tar.bz2 @@ -18,6 +18,7 @@ USE_TOOLS+= msgfmt pkg-config USE_LANGUAGES= c99 USE_LIBTOOL= yes USE_CMAKE= yes +FAKE_NCURSES= yes CMAKE_ARGS+= -DENABLE_ASPELL:BOOL=OFF CMAKE_ARGS+= -DENABLE_GUILE:BOOL=OFF diff --git a/chat/weechat/distinfo b/chat/weechat/distinfo index cba416f251c..86685a4feba 100644 --- a/chat/weechat/distinfo +++ b/chat/weechat/distinfo @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.49 2018/07/22 21:32:34 maya Exp $ +$NetBSD: distinfo,v 1.50 2018/07/23 22:57:22 maya Exp $ SHA1 (weechat-2.1.tar.bz2) = a537358336beef9391d668a6149bea1953c7b1d0 RMD160 (weechat-2.1.tar.bz2) = 63c4e9f7ffb772ea81076454f0d653126750e987 SHA512 (weechat-2.1.tar.bz2) = f49eb7d7a05edc8ada71a48e6dc190227daaec971d2386bee86fdd6151216a9e035bd2c682666f3a57582f8d63614bb92e69f3db5410c01cc5ff508483e6df1d Size (weechat-2.1.tar.bz2) = 2865960 bytes SHA1 (patch-CMakeLists.txt) = 493e49c0c698ff7b2685ba489d693fc1d388318d -SHA1 (patch-cmake_FindNcurses.cmake) = 18cc0f7582b1dfc0d79ec4824d924abf6eabef64 +SHA1 (patch-cmake_FindNcurses.cmake) = bcc15b2c968a5850f1161608a83f38a03296b2a8 SHA1 (patch-po_CMakeLists.txt) = 9b97a4a4da4175e31ea53352fd0b95e1c985ba1e SHA1 (patch-src_plugins_charset_charset.c) = f0b6e5268908caab5efa8048c8a55b0083ec0ca4 diff --git a/chat/weechat/patches/patch-cmake_FindNcurses.cmake b/chat/weechat/patches/patch-cmake_FindNcurses.cmake index d9f342671c6..a20b0dbbd85 100644 --- a/chat/weechat/patches/patch-cmake_FindNcurses.cmake +++ b/chat/weechat/patches/patch-cmake_FindNcurses.cmake @@ -1,9 +1,6 @@ -$NetBSD: patch-cmake_FindNcurses.cmake,v 1.1 2018/07/22 21:32:34 maya Exp $ +$NetBSD: patch-cmake_FindNcurses.cmake,v 1.2 2018/07/23 22:57:22 maya Exp $ -Try the following order: -ncursesw, then plain curses, then ncurses. -NCURSES_LIBRARY must be defined. -(for netbsd curses) +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 @@ -16,52 +13,3 @@ NCURSES_LIBRARY must be defined. 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 -@@ -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) |