Update weechat to 2.7 with some Makefile tweaks. Changelog: https://weechat.org/news/108/20191208-Version-2.7/
OK? Rafael Index: Makefile =================================================================== RCS file: /cvs/ports/net/weechat/Makefile,v retrieving revision 1.44 diff -u -p -u -p -r1.44 Makefile --- Makefile 22 Sep 2019 19:34:56 -0000 1.44 +++ Makefile 9 Jan 2020 05:45:29 -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.6 +V= 2.7 DISTNAME= weechat-${V} PKGNAME-main= weechat-${V} @@ -46,15 +46,20 @@ MODPY_RUNDEP= No MODRUBY_RUNDEP= No BUILD_DEPENDS= devel/gettext,-tools \ - devel/cpputest + devel/cpputest \ + sysutils/flock + +RUN_DEPENDS= sysutils/flock LIB_DEPENDS= devel/gettext,-runtime \ - security/libgcrypt \ - security/gnutls \ net/curl \ + security/gnutls \ + security/libgcrypt \ textproc/aspell/core -MODPY_VERSION = ${MODPY_DEFAULT_VERSION_3} +TEST_DEPENDS= devel/cpputest + +MODPY_VERSION= ${MODPY_DEFAULT_VERSION_3} LIB_DEPENDS-lua= ${MODLUA_LIB_DEPENDS} RUN_DEPENDS-lua= net/weechat,-main ${MODLUA_RUN_DEPENDS} @@ -68,22 +73,22 @@ RUN_DEPENDS-ruby= net/weechat,-main ${MO LIB_DEPENDS-tcl= ${MODTCL_LIB_DEPENDS} RUN_DEPENDS-tcl= net/weechat,-main ${MODTCL_RUN_DEPENDS} -TEST_DEPENDS += devel/cpputest - -CONFIGURE_ARGS+=-DENABLE_SPELL=ON \ - -DENABLE_GUILE=OFF \ - -DENABLE_RUBY=ON \ - -DENABLE_LUA=ON \ - -DENABLE_TCL=ON \ - -DENABLE_PHP=OFF \ - -DENABLE_PYTHON=ON \ - -DENABLE_JAVASCRIPT=OFF \ - -DHAVE_BACKTRACE=OFF \ - -DENABLE_TESTS=ON \ - -DCA_FILE=/etc/ssl/cert.pem \ - -DTCL_TCLSH=${MODTCL_BIN} \ - -DTCL_INCLUDE_PATH=${MODTCL_INCDIR} \ - -DMODTCL_LIB=${MODTCL_LIB} +CONFIGURE_ARGS= -DENABLE_SPELL=ON \ + -DENABLE_RUBY=ON \ + -DENABLE_LUA=ON \ + -DENABLE_TCL=ON \ + -DENABLE_PYTHON=ON \ + -DENABLE_TESTS=ON + +CONFIGURE_ARGS+= -DENABLE_GUILE=OFF \ + -DENABLE_PHP=OFF \ + -DENABLE_JAVASCRIPT=OFF \ + -DHAVE_BACKTRACE=OFF + +CONFIGURE_ARGS+= -DCA_FILE=/etc/ssl/cert.pem \ + -DTCL_TCLSH=${MODTCL_BIN} \ + -DTCL_INCLUDE_PATH=${MODTCL_INCDIR} \ + -DMODTCL_LIB=${MODTCL_LIB} pre-configure: rm -f ${WRKSRC}/cmake/{FindLua,FindRuby,FindTCL}.cmake Index: distinfo =================================================================== RCS file: /cvs/ports/net/weechat/distinfo,v retrieving revision 1.23 diff -u -p -u -p -r1.23 distinfo --- distinfo 22 Sep 2019 19:34:56 -0000 1.23 +++ distinfo 9 Jan 2020 05:45:29 -0000 @@ -1,2 +1,2 @@ -SHA256 (weechat-2.6.tar.gz) = 76n/U7eM+6S/HEnsrBZRg4po0RCfdlM7cD7JCSBhn8I= -SIZE (weechat-2.6.tar.gz) = 4212612 +SHA256 (weechat-2.7.tar.gz) = UDikfG6H5W/Nk3rMFZ2J92hFpBKJI8EAcAq6p8Xbeu0= +SIZE (weechat-2.7.tar.gz) = 4393859 Index: patches/patch-doc_CMakeLists_txt =================================================================== RCS file: /cvs/ports/net/weechat/patches/patch-doc_CMakeLists_txt,v retrieving revision 1.7 diff -u -p -u -p -r1.7 patch-doc_CMakeLists_txt --- patches/patch-doc_CMakeLists_txt 23 Mar 2017 01:46:23 -0000 1.7 +++ patches/patch-doc_CMakeLists_txt 9 Jan 2020 05:45:29 -0000 @@ -1,10 +1,11 @@ $OpenBSD: patch-doc_CMakeLists_txt,v 1.7 2017/03/23 01:46:23 danj Exp $ ---- doc/CMakeLists.txt.orig Sun Jan 15 01:41:25 2017 -+++ doc/CMakeLists.txt Sun Mar 12 20:36:40 2017 -@@ -26,15 +26,15 @@ if(ENABLE_MAN OR ENABLE_DOC) - +Index: doc/CMakeLists.txt +--- doc/CMakeLists.txt.orig ++++ doc/CMakeLists.txt +@@ -22,15 +22,15 @@ if(ENABLE_MAN OR ENABLE_DOC) + find_package(Asciidoctor) + if(ASCIIDOCTOR_FOUND) set(ASCIIDOCTOR_ARGS -a experimental -a icons=font -a revnumber="${VERSION}" -a sectanchors -a source-highlighter=prettify) - - add_subdirectory(cs) - add_subdirectory(de) - add_subdirectory(en) @@ -22,7 +23,7 @@ $OpenBSD: patch-doc_CMakeLists_txt,v 1.7 +# add_subdirectory(it) +# add_subdirectory(ja) +# add_subdirectory(pl) -+# #add_subdirectory(ru) - ++# add_subdirectory(ru) + else() + message(SEND_ERROR "Asciidoctor not found") endif() - 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.2 diff -u -p -u -p -r1.2 patch-src_plugins_lua_CMakeLists_txt --- patches/patch-src_plugins_lua_CMakeLists_txt 12 Jul 2019 04:42:34 -0000 1.2 +++ patches/patch-src_plugins_lua_CMakeLists_txt 9 Jan 2020 05:45:29 -0000 @@ -2,7 +2,7 @@ $OpenBSD: patch-src_plugins_lua_CMakeLis 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) +@@ -25,8 +25,8 @@ add_library(lua MODULE set_target_properties(lua PROPERTIES PREFIX "") if(LUA_FOUND) 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.2 diff -u -p -u -p -r1.2 patch-src_plugins_ruby_CMakeLists_txt --- patches/patch-src_plugins_ruby_CMakeLists_txt 12 Jul 2019 04:42:34 -0000 1.2 +++ patches/patch-src_plugins_ruby_CMakeLists_txt 9 Jan 2020 05:45:29 -0000 @@ -2,7 +2,7 @@ $OpenBSD: patch-src_plugins_ruby_CMakeLi 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 "") +@@ -25,9 +25,7 @@ set_target_properties(ruby PROPERTIES PREFIX "") if(RUBY_FOUND) include_directories(${RUBY_INCLUDE_DIRS}) Index: patches/patch-tests_CMakeLists_txt =================================================================== RCS file: /cvs/ports/net/weechat/patches/patch-tests_CMakeLists_txt,v retrieving revision 1.2 diff -u -p -u -p -r1.2 patch-tests_CMakeLists_txt --- patches/patch-tests_CMakeLists_txt 22 Sep 2019 19:34:56 -0000 1.2 +++ patches/patch-tests_CMakeLists_txt 9 Jan 2020 05:45:29 -0000 @@ -3,7 +3,7 @@ $OpenBSD: patch-tests_CMakeLists_txt,v 1 Index: tests/CMakeLists.txt --- tests/CMakeLists.txt.orig +++ tests/CMakeLists.txt -@@ -59,7 +59,7 @@ if(ICONV_LIBRARY) +@@ -61,7 +61,7 @@ if(ICONV_LIBRARY) list(APPEND EXTRA_LIBS ${ICONV_LIBRARY}) endif() Index: pkg/PLIST-lua =================================================================== RCS file: /cvs/ports/net/weechat/pkg/PLIST-lua,v retrieving revision 1.1.1.1 diff -u -p -u -p -r1.1.1.1 PLIST-lua --- pkg/PLIST-lua 26 Jun 2012 15:06:42 -0000 1.1.1.1 +++ pkg/PLIST-lua 9 Jan 2020 05:45:29 -0000 @@ -1,2 +1,2 @@ @comment $OpenBSD: PLIST-lua,v 1.1.1.1 2012/06/26 15:06:42 sthen Exp $ -lib/weechat/plugins/lua.so +@so lib/weechat/plugins/lua.so Index: pkg/PLIST-main =================================================================== RCS file: /cvs/ports/net/weechat/pkg/PLIST-main,v retrieving revision 1.12 diff -u -p -u -p -r1.12 PLIST-main --- pkg/PLIST-main 12 Jul 2019 04:42:35 -0000 1.12 +++ pkg/PLIST-main 9 Jan 2020 05:45:29 -0000 @@ -7,20 +7,22 @@ include/weechat/weechat-plugin.h lib/pkgconfig/weechat.pc lib/weechat/ lib/weechat/plugins/ -lib/weechat/plugins/alias.so -lib/weechat/plugins/buflist.so -lib/weechat/plugins/charset.so -lib/weechat/plugins/exec.so -lib/weechat/plugins/fifo.so -lib/weechat/plugins/fset.so -lib/weechat/plugins/irc.so -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 +@so lib/weechat/plugins/alias.so +@so lib/weechat/plugins/buflist.so +@so lib/weechat/plugins/charset.so +@so lib/weechat/plugins/exec.so +@so lib/weechat/plugins/fifo.so +@so lib/weechat/plugins/fset.so +@so lib/weechat/plugins/irc.so +@so lib/weechat/plugins/logger.so +@so lib/weechat/plugins/perl.so +@so lib/weechat/plugins/relay.so +@so lib/weechat/plugins/script.so +@so lib/weechat/plugins/spell.so +@so lib/weechat/plugins/trigger.so +@so lib/weechat/plugins/xfer.so +@comment share/applications/ +@comment share/applications/weechat.desktop share/doc/weechat/ share/doc/weechat/weechat_dev.en.adoc share/doc/weechat/weechat_faq.en.adoc @@ -32,9 +34,21 @@ share/doc/weechat/weechat_tester.en.adoc share/doc/weechat/weechat_user.en.adoc @comment share/icons/ @comment share/icons/hicolor/ -@comment share/icons/hicolor/32x32/ -@comment share/icons/hicolor/32x32/apps/ -@comment share/icons/hicolor/32x32/apps/weechat.png +@comment share/icons/hicolor/128x128/ +@comment share/icons/hicolor/128x128/apps/ +@comment share/icons/hicolor/128x128/apps/weechat.png +@comment share/icons/hicolor/16x16/ +@comment share/icons/hicolor/16x16/apps/ +@comment share/icons/hicolor/16x16/apps/weechat.png +@comment share/icons/hicolor/256x256/ +@comment share/icons/hicolor/256x256/apps/ +@comment share/icons/hicolor/256x256/apps/weechat.png +@comment share/icons/hicolor/512x512/ +@comment share/icons/hicolor/512x512/apps/ +@comment share/icons/hicolor/512x512/apps/weechat.png +@comment share/icons/hicolor/64x64/ +@comment share/icons/hicolor/64x64/apps/ +@comment share/icons/hicolor/64x64/apps/weechat.png share/locale/cs/LC_MESSAGES/weechat.mo share/locale/de/LC_MESSAGES/weechat.mo share/locale/es/LC_MESSAGES/weechat.mo Index: pkg/PLIST-python =================================================================== RCS file: /cvs/ports/net/weechat/pkg/PLIST-python,v retrieving revision 1.1.1.1 diff -u -p -u -p -r1.1.1.1 PLIST-python --- pkg/PLIST-python 26 Jun 2012 15:06:42 -0000 1.1.1.1 +++ pkg/PLIST-python 9 Jan 2020 05:45:29 -0000 @@ -1,2 +1,2 @@ @comment $OpenBSD: PLIST-python,v 1.1.1.1 2012/06/26 15:06:42 sthen Exp $ -lib/weechat/plugins/python.so +@so lib/weechat/plugins/python.so Index: pkg/PLIST-ruby =================================================================== RCS file: /cvs/ports/net/weechat/pkg/PLIST-ruby,v retrieving revision 1.1.1.1 diff -u -p -u -p -r1.1.1.1 PLIST-ruby --- pkg/PLIST-ruby 26 Jun 2012 15:06:42 -0000 1.1.1.1 +++ pkg/PLIST-ruby 9 Jan 2020 05:45:29 -0000 @@ -1,2 +1,2 @@ @comment $OpenBSD: PLIST-ruby,v 1.1.1.1 2012/06/26 15:06:42 sthen Exp $ -lib/weechat/plugins/ruby.so +@so lib/weechat/plugins/ruby.so Index: pkg/PLIST-tcl =================================================================== RCS file: /cvs/ports/net/weechat/pkg/PLIST-tcl,v retrieving revision 1.1.1.1 diff -u -p -u -p -r1.1.1.1 PLIST-tcl --- pkg/PLIST-tcl 26 Jun 2012 15:06:42 -0000 1.1.1.1 +++ pkg/PLIST-tcl 9 Jan 2020 05:45:29 -0000 @@ -1,2 +1,2 @@ @comment $OpenBSD: PLIST-tcl,v 1.1.1.1 2012/06/26 15:06:42 sthen Exp $ -lib/weechat/plugins/tcl.so +@so lib/weechat/plugins/tcl.so