Update weechat to 2.5. Release notes:
https://weechat.org/news/103/20190606-Version-2.5/ Notable Port changes: - Spell checking is now default - Simplify pre-configure - Enable tests: When I run "make test" from the ports folder I see the following results: "0% tests passed, 1 tests failed out of 1" A deep look into the test shows just one real tests fails (The guile test also fails but we are not supporting guile): $ cd `make show=WRKBUILD` && ctest -VV 1: TEST(Scripts, API)__weechat_plugin__: [BUG] Bus Error at 0x00000168c73cccd0 1: ruby 2.6.3p62 (2019-04-16 revision 67580) [x86_64-openbsd] 1: 1: -- Control frame information ----------------------------------------------- 1: c:0001 p:0000 s:0003 E:000ed0 (none) [FINISH] 1: 1: 1: -- Other runtime information ----------------------------------------------- 1: 1: * Loaded script: __weechat_plugin__ 1: 1: * Loaded features: 1: 1: 0 enumerator.so 1: 1 thread.rb 1: 2 rational.so 1: 3 complex.so 1: 1: [NOTE] 1: You may have encountered a bug in the Ruby interpreter or extension libraries. 1: Bug reports are welcome. 1: For details: https://www.ruby-lang.org/bugreport.html I have no clue. The ruby weechat backend is not broken for me. I ran a simple example script in weechat 2.4 and 2.5: def weechat_init Weechat.register("test_ruby", "FlashCode", "1.0", "GPL3", "Test Skript", "", "") Weechat.print("", "Hallo, weechat+ruby+openbsd!") return Weechat::WEECHAT_RC_OK end So I don't think there's a big issue or showstopper, is there? It's going to be exciting! When I run the following command from hand `make show=MODCMAKE_TEST_TARGET` in an xterm it going to crash my whole xterm. Has ever seen anything like it before? However weechat itself works fine form me on amd64. Happy to see feedback. RS Index: Makefile =================================================================== RCS file: /cvs/ports/net/weechat/Makefile,v retrieving revision 1.42 diff -u -p -u -p -r1.42 Makefile --- Makefile 20 May 2019 22:15:20 -0000 1.42 +++ Makefile 21 Jun 2019 21:39:45 -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.4 +V= 2.5 DISTNAME= weechat-${V} PKGNAME-main= weechat-${V} @@ -15,9 +15,6 @@ PKGNAME-python= weechat-python-${V} PKGNAME-ruby= weechat-ruby-${V} PKGNAME-tcl= weechat-tcl-${V} -REVISION-main= 0 -REVISION-ruby= 0 - CATEGORIES= net HOMEPAGE= https://www.weechat.org/ @@ -48,7 +45,8 @@ MODLUA_RUNDEP= No MODPY_RUNDEP= No MODRUBY_RUNDEP= No -BUILD_DEPENDS= devel/gettext,-tools +BUILD_DEPENDS= devel/gettext,-tools \ + devel/cpputest LIB_DEPENDS= devel/gettext,-runtime \ security/libgcrypt \ @@ -68,7 +66,9 @@ RUN_DEPENDS-ruby= net/weechat,-main ${MO LIB_DEPENDS-tcl= ${MODTCL_LIB_DEPENDS} RUN_DEPENDS-tcl= net/weechat,-main ${MODTCL_RUN_DEPENDS} -CONFIGURE_ARGS+=-DENABLE_ASPELL=yes \ +TEST_DEPENDS += devel/cpputest + +CONFIGURE_ARGS+=-DENABLE_SPELL=yes \ -DENABLE_GUILE=no \ -DENABLE_RUBY=yes \ -DENABLE_LUA=yes \ @@ -77,22 +77,18 @@ CONFIGURE_ARGS+=-DENABLE_ASPELL=yes \ -DENABLE_PYTHON=yes \ -DENABLE_JAVASCRIPT=no \ -DHAVE_BACKTRACE=no \ + -DENABLE_TESTS=yes \ -DCA_FILE=/etc/ssl/cert.pem \ -DTCL_TCLSH=${MODTCL_BIN} \ -DTCL_INCLUDE_PATH=${MODTCL_INCDIR} \ -DMODTCL_LIB=${MODTCL_LIB} -NO_TEST= Yes - pre-configure: - rm -f ${WRKSRC}/cmake/FindLua.cmake \ - ${WRKSRC}/cmake/FindRuby.cmake \ - ${WRKSRC}/cmake/FindTCL.cmake + rm -f ${WRKSRC}/cmake/{FindLua,FindRuby,FindTCL}.cmake post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/weechat ${INSTALL_DATA} ${WRKSRC}/doc/en/weechat_*.en.adoc \ ${PREFIX}/share/doc/weechat/ - .include <bsd.port.mk> Index: distinfo =================================================================== RCS file: /cvs/ports/net/weechat/distinfo,v retrieving revision 1.21 diff -u -p -u -p -r1.21 distinfo --- distinfo 28 Mar 2019 20:39:15 -0000 1.21 +++ distinfo 21 Jun 2019 21:39:45 -0000 @@ -1,2 +1,2 @@ -SHA256 (weechat-2.4.tar.gz) = lj/s3fVcTI1slpONGpB+RIZ5gXcG59ILxq8keXCFp0w= -SIZE (weechat-2.4.tar.gz) = 4130604 +SHA256 (weechat-2.5.tar.gz) = PXfrWnz6dfldccDkR6gx0Dm8f/p3lyy2d4Atchi9Vx4= +SIZE (weechat-2.5.tar.gz) = 4185185 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 --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-src_core_hook_wee-hook-timer_h 21 Jun 2019 21:39:45 -0000 @@ -0,0 +1,14 @@ +$OpenBSD$ + +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: /cvs/ports/net/weechat/patches/patch-src_plugins_CMakeLists_txt,v retrieving revision 1.6 diff -u -p -u -p -r1.6 patch-src_plugins_CMakeLists_txt --- patches/patch-src_plugins_CMakeLists_txt 26 Apr 2018 16:06:09 -0000 1.6 +++ patches/patch-src_plugins_CMakeLists_txt 21 Jun 2019 21:39:45 -0000 @@ -2,7 +2,7 @@ $OpenBSD: patch-src_plugins_CMakeLists_t Index: src/plugins/CMakeLists.txt --- src/plugins/CMakeLists.txt.orig +++ src/plugins/CMakeLists.txt -@@ -117,8 +117,8 @@ if(ENABLE_SCRIPTS AND ENABLE_PERL) +@@ -97,8 +97,8 @@ if(ENABLE_SCRIPTS AND ENABLE_PERL) endif() if(ENABLE_SCRIPTS AND ENABLE_PYTHON) Index: patches/patch-src_plugins_lua_CMakeLists_txt =================================================================== RCS file: /cvs/ports/net/weechat/patches/patch-src_plugins_lua_CMakeLists_txt,v retrieving revision 1.1 diff -u -p -u -p -r1.1 patch-src_plugins_lua_CMakeLists_txt --- patches/patch-src_plugins_lua_CMakeLists_txt 19 Jan 2015 12:28:46 -0000 1.1 +++ patches/patch-src_plugins_lua_CMakeLists_txt 21 Jun 2019 21:39:45 -0000 @@ -1,14 +1,15 @@ $OpenBSD: patch-src_plugins_lua_CMakeLists_txt,v 1.1 2015/01/19 12:28:46 dcoppa Exp $ ---- src/plugins/lua/CMakeLists.txt.orig Mon Jan 19 03:45:59 2015 -+++ src/plugins/lua/CMakeLists.txt Mon Jan 19 03:46:40 2015 +Index: src/plugins/lua/CMakeLists.txt +--- src/plugins/lua/CMakeLists.txt.orig ++++ src/plugins/lua/CMakeLists.txt @@ -24,8 +24,8 @@ weechat-lua-api.h) set_target_properties(lua PROPERTIES PREFIX "") if(LUA_FOUND) - include_directories(${LUA_INCLUDE_DIRS}) -- target_link_libraries(lua ${LUA_LDFLAGS} weechat_plugins_scripts) +- target_link_libraries(lua ${LUA_LDFLAGS} weechat_plugins_scripts coverage_config) + include_directories(${LUA_INCLUDE_DIR}) -+ target_link_libraries(lua ${LUA_LIBRARIES} weechat_plugins_scripts) ++ target_link_libraries(lua ${LUA_LIBRARIES} weechat_plugins_scripts coverage_config) endif() - install(TARGETS lua LIBRARY DESTINATION ${LIBDIR}/plugins) + install(TARGETS lua LIBRARY DESTINATION ${WEECHAT_LIBDIR}/plugins) Index: patches/patch-src_plugins_python_CMakeLists_txt =================================================================== RCS file: /cvs/ports/net/weechat/patches/patch-src_plugins_python_CMakeLists_txt,v retrieving revision 1.1 diff -u -p -u -p -r1.1 patch-src_plugins_python_CMakeLists_txt --- patches/patch-src_plugins_python_CMakeLists_txt 19 Jan 2015 12:28:46 -0000 1.1 +++ patches/patch-src_plugins_python_CMakeLists_txt 21 Jun 2019 21:39:45 -0000 @@ -1,6 +1,7 @@ $OpenBSD: patch-src_plugins_python_CMakeLists_txt,v 1.1 2015/01/19 12:28:46 dcoppa Exp $ ---- src/plugins/python/CMakeLists.txt.orig Mon Jan 19 04:44:30 2015 -+++ src/plugins/python/CMakeLists.txt Mon Jan 19 04:45:43 2015 +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 "") @@ -8,10 +9,10 @@ $OpenBSD: patch-src_plugins_python_CMake -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) +- 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) ++ target_link_libraries(python ${PYTHON_LIBRARIES} weechat_plugins_scripts coverage_config) endif() - install(TARGETS python LIBRARY DESTINATION ${LIBDIR}/plugins) + install(TARGETS python LIBRARY DESTINATION ${WEECHAT_LIBDIR}/plugins) Index: patches/patch-src_plugins_ruby_CMakeLists_txt =================================================================== RCS file: /cvs/ports/net/weechat/patches/patch-src_plugins_ruby_CMakeLists_txt,v retrieving revision 1.1 diff -u -p -u -p -r1.1 patch-src_plugins_ruby_CMakeLists_txt --- patches/patch-src_plugins_ruby_CMakeLists_txt 19 Jan 2015 12:28:46 -0000 1.1 +++ patches/patch-src_plugins_ruby_CMakeLists_txt 21 Jun 2019 21:39:45 -0000 @@ -1,14 +1,15 @@ $OpenBSD: patch-src_plugins_ruby_CMakeLists_txt,v 1.1 2015/01/19 12:28:46 dcoppa Exp $ ---- src/plugins/ruby/CMakeLists.txt.orig Mon Jan 19 03:50:14 2015 -+++ src/plugins/ruby/CMakeLists.txt Mon Jan 19 03:51:43 2015 +Index: src/plugins/ruby/CMakeLists.txt +--- src/plugins/ruby/CMakeLists.txt.orig ++++ src/plugins/ruby/CMakeLists.txt @@ -24,9 +24,7 @@ set_target_properties(ruby PROPERTIES PREFIX "") if(RUBY_FOUND) include_directories(${RUBY_INCLUDE_DIRS}) - set(LINK_LIBS) - list(APPEND LINK_LIBS ${RUBY_LDFLAGS}) -- target_link_libraries(ruby ${LINK_LIBS} ${RUBY_LIB} weechat_plugins_scripts) -+ target_link_libraries(ruby ${RUBY_LIBRARY} weechat_plugins_scripts) +- target_link_libraries(ruby ${LINK_LIBS} ${RUBY_LIB} weechat_plugins_scripts coverage_config) ++ target_link_libraries(ruby ${RUBY_LIBRARY} weechat_plugins_scripts coverage_config) endif(RUBY_FOUND) - install(TARGETS ruby LIBRARY DESTINATION ${LIBDIR}/plugins) + install(TARGETS ruby LIBRARY DESTINATION ${WEECHAT_LIBDIR}/plugins) Index: patches/patch-tests_CMakeLists_txt =================================================================== RCS file: patches/patch-tests_CMakeLists_txt diff -N patches/patch-tests_CMakeLists_txt --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-tests_CMakeLists_txt 21 Jun 2019 21:39:45 -0000 @@ -0,0 +1,14 @@ +$OpenBSD$ + +Index: tests/CMakeLists.txt +--- tests/CMakeLists.txt.orig ++++ tests/CMakeLists.txt +@@ -55,7 +55,7 @@ if(ICONV_LIBRARY) + list(APPEND EXTRA_LIBS ${ICONV_LIBRARY}) + endif() + +-if(${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD") ++if(${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD" OR ${CMAKE_SYSTEM_NAME} STREQUAL "OpenBSD") + list(APPEND EXTRA_LIBS "intl") + if(HAVE_BACKTRACE) + list(APPEND EXTRA_LIBS "execinfo") Index: pkg/PLIST-main =================================================================== RCS file: /cvs/ports/net/weechat/pkg/PLIST-main,v retrieving revision 1.11 diff -u -p -u -p -r1.11 PLIST-main --- pkg/PLIST-main 28 Jul 2018 08:08:11 -0000 1.11 +++ pkg/PLIST-main 21 Jun 2019 21:39:45 -0000 @@ -8,7 +8,6 @@ lib/pkgconfig/weechat.pc lib/weechat/ lib/weechat/plugins/ lib/weechat/plugins/alias.so -lib/weechat/plugins/aspell.so lib/weechat/plugins/buflist.so lib/weechat/plugins/charset.so lib/weechat/plugins/exec.so @@ -19,6 +18,7 @@ lib/weechat/plugins/logger.so lib/weechat/plugins/perl.so lib/weechat/plugins/relay.so lib/weechat/plugins/script.so +lib/weechat/plugins/spell.so lib/weechat/plugins/trigger.so lib/weechat/plugins/xfer.so share/doc/weechat/
