diff options
author | maya <maya@pkgsrc.org> | 2018-07-22 21:32:34 +0000 |
---|---|---|
committer | maya <maya@pkgsrc.org> | 2018-07-22 21:32:34 +0000 |
commit | 48b0384702b0d798a9a57a6a728dfef15d42bc87 (patch) | |
tree | 8cfb2201f22b99e6f031b9944b9db31f145f01d8 /chat/weechat | |
parent | 4334577ea335219eaa4758fd9c947f3a3b3119ff (diff) | |
download | pkgsrc-48b0384702b0d798a9a57a6a728dfef15d42bc87.tar.gz |
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.
Diffstat (limited to 'chat/weechat')
-rw-r--r-- | chat/weechat/Makefile | 5 | ||||
-rw-r--r-- | chat/weechat/distinfo | 3 | ||||
-rw-r--r-- | chat/weechat/patches/patch-cmake_FindNcurses.cmake | 67 |
3 files changed, 71 insertions, 4 deletions
diff --git a/chat/weechat/Makefile b/chat/weechat/Makefile index 2577d7a4460..305ad6f99af 100644 --- a/chat/weechat/Makefile +++ b/chat/weechat/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.86 2018/07/22 19:58:05 maya Exp $ +# $NetBSD: Makefile,v 1.87 2018/07/22 21:32:34 maya Exp $ DISTNAME= weechat-2.1 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= chat MASTER_SITES= https://www.weechat.org/files/src/ EXTRACT_SUFX= .tar.bz2 @@ -18,7 +18,6 @@ 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 cc4805de2a3..cba416f251c 100644 --- a/chat/weechat/distinfo +++ b/chat/weechat/distinfo @@ -1,9 +1,10 @@ -$NetBSD: distinfo,v 1.48 2018/05/25 10:16:03 maya Exp $ +$NetBSD: distinfo,v 1.49 2018/07/22 21:32:34 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-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 new file mode 100644 index 00000000000..d9f342671c6 --- /dev/null +++ b/chat/weechat/patches/patch-cmake_FindNcurses.cmake @@ -0,0 +1,67 @@ +$NetBSD: patch-cmake_FindNcurses.cmake,v 1.1 2018/07/22 21:32:34 maya Exp $ + +Try the following order: +ncursesw, then plain curses, then ncurses. +NCURSES_LIBRARY must be defined. +(for netbsd curses) + +--- cmake/FindNcurses.cmake.orig 2018-03-18 06:41:40.000000000 +0000 ++++ cmake/FindNcurses.cmake +@@ -22,7 +22,7 @@ if(NCURSES_FOUND) + endif() + + find_path(NCURSES_INCLUDE_PATH +- NAMES ncurses.h curses.h ++ 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 +@@ -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) |