From 6e74eee0cb5ebee59f81f722a0176d30783b1ef6 Mon Sep 17 00:00:00 2001 From: nia Date: Mon, 30 Mar 2020 11:07:18 +0000 Subject: weechat: Drop patches that are no longer needed. --- chat/weechat/Makefile | 12 ++++--- chat/weechat/distinfo | 8 ++--- chat/weechat/options.mk | 8 +---- chat/weechat/patches/patch-CMakeLists.txt | 41 ---------------------- chat/weechat/patches/patch-cmake_FindNcurses.cmake | 24 ------------- chat/weechat/patches/patch-src_core_weechat.c | 4 +-- .../patches/patch-src_plugins_charset_charset.c | 14 -------- .../patch-src_plugins_python_CMakeLists.txt | 15 -------- 8 files changed, 12 insertions(+), 114 deletions(-) delete mode 100644 chat/weechat/patches/patch-CMakeLists.txt delete mode 100644 chat/weechat/patches/patch-cmake_FindNcurses.cmake delete mode 100644 chat/weechat/patches/patch-src_plugins_charset_charset.c delete mode 100644 chat/weechat/patches/patch-src_plugins_python_CMakeLists.txt diff --git a/chat/weechat/Makefile b/chat/weechat/Makefile index 0d39e379335..6eaf69ed372 100644 --- a/chat/weechat/Makefile +++ b/chat/weechat/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.112 2020/03/30 09:31:52 nia Exp $ +# $NetBSD: Makefile,v 1.113 2020/03/30 11:07:18 nia Exp $ DISTNAME= weechat-2.8 CATEGORIES= chat @@ -35,12 +35,14 @@ LDFLAGS.SunOS+= -lresolv BUILDLINK_TRANSFORM+= rm:-Werror-implicit-function-declaration -# use standard cmake mechanisms for detecting python -# works better with pkgsrc. +.include "options.mk" + pre-configure: - ${RM} -f ${WRKSRC}/cmake/FindPython.cmake +.if !empty(PKG_OPTIONS:Mpython) + ${LN} -sf ${BUILDLINK_DIR}/lib/pkgconfig/python-${PYVERSSUFFIX}.pc \ + ${BUILDLINK_DIR}/lib/pkgconfig/python3.pc +.endif -.include "options.mk" .include "../../graphics/hicolor-icon-theme/buildlink3.mk" .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" diff --git a/chat/weechat/distinfo b/chat/weechat/distinfo index 33602aead36..e63e3bfdd1b 100644 --- a/chat/weechat/distinfo +++ b/chat/weechat/distinfo @@ -1,13 +1,9 @@ -$NetBSD: distinfo,v 1.60 2020/03/30 09:31:52 nia Exp $ +$NetBSD: distinfo,v 1.61 2020/03/30 11:07:18 nia Exp $ SHA1 (weechat-2.8.tar.xz) = fec7018168f2fa973b1a4d8224fdac8b59617ada RMD160 (weechat-2.8.tar.xz) = 6c1453c5b97ba061bc2539033e62eb7f07ee52c8 SHA512 (weechat-2.8.tar.xz) = 3bebb42118fca6b601f1de8f4d52378619a10e5c490f5b46f86d27a9680f00a56d48a1ade729e78d965cae589e6c80647c22414393000c7d3cfcc94a1e41c4df Size (weechat-2.8.tar.xz) = 2248868 bytes -SHA1 (patch-CMakeLists.txt) = 493e49c0c698ff7b2685ba489d693fc1d388318d -SHA1 (patch-cmake_FindNcurses.cmake) = 93969b86538f1b707903dce4691af99a67ede6ce SHA1 (patch-po_CMakeLists.txt) = 014b42ff303a4e4213de95339ab97f029f38a068 -SHA1 (patch-src_core_weechat.c) = 062cd7443a756edbdf60289a7847b4278d520105 -SHA1 (patch-src_plugins_charset_charset.c) = f0b6e5268908caab5efa8048c8a55b0083ec0ca4 +SHA1 (patch-src_core_weechat.c) = aeb3cb052976e6b4603d3515ffc40bed98434a9f SHA1 (patch-src_plugins_perl_weechat-perl.c) = 49e61419ea82157fa54a7847a653625944d3b341 -SHA1 (patch-src_plugins_python_CMakeLists.txt) = 1f425f6c852c5973f84eea0add3c63bb6fcfa772 diff --git a/chat/weechat/options.mk b/chat/weechat/options.mk index 6eca8423d17..9a8824aeb8d 100644 --- a/chat/weechat/options.mk +++ b/chat/weechat/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.23 2019/12/06 15:39:06 jperkin Exp $ +# $NetBSD: options.mk,v 1.24 2020/03/30 11:07:18 nia Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.weechat # mk/curses will handle wide-curses @@ -18,12 +18,6 @@ PLIST_VARS+= lua plugin python perl ruby PYTHON_VERSIONS_INCOMPATIBLE= 27 .include "../../lang/python/extension.mk" CMAKE_ARGS+= -DENABLE_PYTHON=ON -CMAKE_ARGS+= -DPython_EXECUTABLE=${PYTHONBIN} -. if ${OPSYS} == "Darwin" -CMAKE_ARGS+= -DPYTHON_LIBRARIES=${PREFIX}/lib/libpython${PYVERSSUFFIX}.dylib -. else -CMAKE_ARGS+= -DPYTHON_LIBRARIES=${PREFIX}/lib/libpython${PYVERSSUFFIX}.so -. endif PLIST.python= yes .else CMAKE_ARGS+= -DENABLE_PYTHON=OFF diff --git a/chat/weechat/patches/patch-CMakeLists.txt b/chat/weechat/patches/patch-CMakeLists.txt deleted file mode 100644 index 104c74cc3a9..00000000000 --- a/chat/weechat/patches/patch-CMakeLists.txt +++ /dev/null @@ -1,41 +0,0 @@ -$NetBSD: patch-CMakeLists.txt,v 1.2 2017/11/04 17:23:20 maya Exp $ - -Check that eat_newline_glitch can be assigned to - ---- CMakeLists.txt.orig 2017-09-23 11:08:45.000000000 +0000 -+++ CMakeLists.txt -@@ -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) diff --git a/chat/weechat/patches/patch-cmake_FindNcurses.cmake b/chat/weechat/patches/patch-cmake_FindNcurses.cmake deleted file mode 100644 index c107639852d..00000000000 --- a/chat/weechat/patches/patch-cmake_FindNcurses.cmake +++ /dev/null @@ -1,24 +0,0 @@ -$NetBSD: patch-cmake_FindNcurses.cmake,v 1.4 2019/09/17 11:30:27 nia Exp $ - -Don't try to look for ncurses.h, so FAKE_NCURSES works for netbsd curses. - ---- cmake/FindNcurses.cmake.orig 2019-09-08 06:13:58.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 ncurses.h - PATH_SUFFIXES ncursesw ncurses - PATHS /usr/include /usr/local/include /usr/pkg/include - ) -@@ -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) diff --git a/chat/weechat/patches/patch-src_core_weechat.c b/chat/weechat/patches/patch-src_core_weechat.c index 672f57aac0a..7d7b48c5f79 100644 --- a/chat/weechat/patches/patch-src_core_weechat.c +++ b/chat/weechat/patches/patch-src_core_weechat.c @@ -1,6 +1,6 @@ -$NetBSD: patch-src_core_weechat.c,v 1.1 2019/03/07 18:09:24 jperkin Exp $ +$NetBSD: patch-src_core_weechat.c,v 1.2 2020/03/30 11:07:18 nia Exp $ -Need unistd.h for mkdtemp(3). +Need unistd.h for mkdtemp(3) (on what platform?) --- src/core/weechat.c.orig 2019-02-17 07:20:07.000000000 +0000 +++ src/core/weechat.c diff --git a/chat/weechat/patches/patch-src_plugins_charset_charset.c b/chat/weechat/patches/patch-src_plugins_charset_charset.c deleted file mode 100644 index fd331ee7d75..00000000000 --- a/chat/weechat/patches/patch-src_plugins_charset_charset.c +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-src_plugins_charset_charset.c,v 1.1 2013/12/12 20:17:56 jperkin Exp $ - -Need strings.h for strcasecmp() - ---- src/plugins/charset/charset.c.orig 2013-05-20 08:06:14.000000000 +0000 -+++ src/plugins/charset/charset.c -@@ -25,6 +25,7 @@ - #define __USE_GNU - #endif - #include -+#include - #include - - #include "../weechat-plugin.h" diff --git a/chat/weechat/patches/patch-src_plugins_python_CMakeLists.txt b/chat/weechat/patches/patch-src_plugins_python_CMakeLists.txt deleted file mode 100644 index 2c91e47799e..00000000000 --- a/chat/weechat/patches/patch-src_plugins_python_CMakeLists.txt +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-src_plugins_python_CMakeLists.txt,v 1.1 2019/12/10 13:04:06 nia Exp $ - -We do not ship pkg-config files for python. - ---- src/plugins/python/CMakeLists.txt.orig 2019-12-08 08:48:53.000000000 +0000 -+++ src/plugins/python/CMakeLists.txt -@@ -24,7 +24,7 @@ add_library(python MODULE - set_target_properties(python PROPERTIES PREFIX "") - - if(PYTHON_FOUND) -- target_link_libraries(python PkgConfig::PYTHON weechat_plugins_scripts coverage_config) -+ target_link_libraries(python ${PYTHON_LIBRARIES} weechat_plugins_scripts coverage_config) - endif() - - install(TARGETS python LIBRARY DESTINATION ${WEECHAT_LIBDIR}/plugins) -- cgit v1.2.3