On Sat Sep 14, 2019 at 09:52:33AM +0200, Rafael Sadowski wrote: > Update weechat to the latest stable version. Upstream switched to python > 3 as default python version. Changlog here: > > https://weechat.org/news/ > > OK?
Nobody? > > RS > > Index: Makefile > =================================================================== > RCS file: /cvs/ports/net/weechat/Makefile,v > retrieving revision 1.43 > diff -u -p -u -p -r1.43 Makefile > --- Makefile 12 Jul 2019 04:42:34 -0000 1.43 > +++ Makefile 14 Sep 2019 07:48:41 -0000 > @@ -6,7 +6,7 @@ COMMENT-python= Python bindings for weec > COMMENT-ruby= Ruby bindings for weechat > COMMENT-tcl= Tcl bindings for weechat > > -V= 2.5 > +V= 2.6 > DISTNAME= weechat-${V} > > PKGNAME-main= weechat-${V} > @@ -53,6 +53,8 @@ LIB_DEPENDS= devel/gettext,-runtime \ > security/gnutls \ > net/curl \ > textproc/aspell/core > + > +MODPY_VERSION = ${MODPY_DEFAULT_VERSION_3} > > LIB_DEPENDS-lua= ${MODLUA_LIB_DEPENDS} > RUN_DEPENDS-lua= net/weechat,-main ${MODLUA_RUN_DEPENDS} > Index: distinfo > =================================================================== > RCS file: /cvs/ports/net/weechat/distinfo,v > retrieving revision 1.22 > diff -u -p -u -p -r1.22 distinfo > --- distinfo 12 Jul 2019 04:42:34 -0000 1.22 > +++ distinfo 14 Sep 2019 07:48:41 -0000 > @@ -1,2 +1,2 @@ > -SHA256 (weechat-2.5.tar.gz) = PXfrWnz6dfldccDkR6gx0Dm8f/p3lyy2d4Atchi9Vx4= > -SIZE (weechat-2.5.tar.gz) = 4185185 > +SHA256 (weechat-2.6.tar.gz) = 76n/U7eM+6S/HEnsrBZRg4po0RCfdlM7cD7JCSBhn8I= > +SIZE (weechat-2.6.tar.gz) = 4212612 > Index: patches/patch-src_core_hook_wee-hook-timer_h > =================================================================== > RCS file: patches/patch-src_core_hook_wee-hook-timer_h > diff -N patches/patch-src_core_hook_wee-hook-timer_h > --- patches/patch-src_core_hook_wee-hook-timer_h 12 Jul 2019 04:42:34 > -0000 1.1 > +++ /dev/null 1 Jan 1970 00:00:00 -0000 > @@ -1,14 +0,0 @@ > -$OpenBSD: patch-src_core_hook_wee-hook-timer_h,v 1.1 2019/07/12 04:42:34 > rsadowski Exp $ > - > -Index: src/core/hook/wee-hook-timer.h > ---- src/core/hook/wee-hook-timer.h.orig > -+++ src/core/hook/wee-hook-timer.h > -@@ -20,7 +20,7 @@ > - #ifndef WEECHAT_HOOK_TIMER_H > - #define WEECHAT_HOOK_TIMER_H > - > --#include <time.h> > -+#include <sys/time.h> > - > - struct t_weechat_plugin; > - struct t_infolist_item; > Index: patches/patch-src_plugins_CMakeLists_txt > =================================================================== > RCS file: patches/patch-src_plugins_CMakeLists_txt > diff -N patches/patch-src_plugins_CMakeLists_txt > --- patches/patch-src_plugins_CMakeLists_txt 12 Jul 2019 04:42:34 -0000 > 1.7 > +++ /dev/null 1 Jan 1970 00:00:00 -0000 > @@ -1,15 +0,0 @@ > -$OpenBSD: patch-src_plugins_CMakeLists_txt,v 1.7 2019/07/12 04:42:34 > rsadowski Exp $ > -Index: src/plugins/CMakeLists.txt > ---- src/plugins/CMakeLists.txt.orig > -+++ src/plugins/CMakeLists.txt > -@@ -97,8 +97,8 @@ if(ENABLE_SCRIPTS AND ENABLE_PERL) > - endif() > - > - if(ENABLE_SCRIPTS AND ENABLE_PYTHON) > -- find_package(Python) > -- if(PYTHON_FOUND) > -+ find_package(PythonLibs) > -+ if(PYTHONLIBS_FOUND) > - add_subdirectory(python) > - endif() > - endif() > Index: patches/patch-src_plugins_python_CMakeLists_txt > =================================================================== > RCS file: patches/patch-src_plugins_python_CMakeLists_txt > diff -N patches/patch-src_plugins_python_CMakeLists_txt > --- patches/patch-src_plugins_python_CMakeLists_txt 12 Jul 2019 04:42:34 > -0000 1.2 > +++ /dev/null 1 Jan 1970 00:00:00 -0000 > @@ -1,18 +0,0 @@ > -$OpenBSD: patch-src_plugins_python_CMakeLists_txt,v 1.2 2019/07/12 04:42:34 > rsadowski Exp $ > -Index: src/plugins/python/CMakeLists.txt > ---- src/plugins/python/CMakeLists.txt.orig > -+++ src/plugins/python/CMakeLists.txt > -@@ -22,10 +22,9 @@ weechat-python-api.c weechat-python-api.h) > - > - set_target_properties(python PROPERTIES PREFIX "") > - > --if(PYTHON_FOUND) > -- include_directories(${PYTHON_INCLUDE_PATH}) > -- set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} > ${PYTHON_LFLAGS}") > -- target_link_libraries(python ${PYTHON_LIBRARY} weechat_plugins_scripts > coverage_config) > -+if(PYTHONLIBS_FOUND) > -+ include_directories(${PYTHON_INCLUDE_DIRS}) > -+ target_link_libraries(python ${PYTHON_LIBRARIES} weechat_plugins_scripts > coverage_config) > - endif() > - > - install(TARGETS python LIBRARY DESTINATION ${WEECHAT_LIBDIR}/plugins) > Index: patches/patch-tests_CMakeLists_txt > =================================================================== > RCS file: /cvs/ports/net/weechat/patches/patch-tests_CMakeLists_txt,v > retrieving revision 1.1 > diff -u -p -u -p -r1.1 patch-tests_CMakeLists_txt > --- patches/patch-tests_CMakeLists_txt 12 Jul 2019 04:42:34 -0000 > 1.1 > +++ patches/patch-tests_CMakeLists_txt 14 Sep 2019 07:48:41 -0000 > @@ -3,7 +3,7 @@ $OpenBSD: patch-tests_CMakeLists_txt,v 1 > Index: tests/CMakeLists.txt > --- tests/CMakeLists.txt.orig > +++ tests/CMakeLists.txt > -@@ -55,7 +55,7 @@ if(ICONV_LIBRARY) > +@@ -59,7 +59,7 @@ if(ICONV_LIBRARY) > list(APPEND EXTRA_LIBS ${ICONV_LIBRARY}) > endif() > >