diff --git a/chat/weechat/Makefile b/chat/weechat/Makefile
index c8efb6ea0483..96f536aa96d8 100644
--- a/chat/weechat/Makefile
+++ b/chat/weechat/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.137 2023/07/06 09:38:12 wiz Exp $
+# $NetBSD: Makefile,v 1.138 2023/07/10 08:16:59 jperkin Exp $
 
-DISTNAME=	weechat-3.8
-PKGREVISION=	2
+DISTNAME=	weechat-4.0.1
 CATEGORIES=	chat
 MASTER_SITES=	https://www.weechat.org/files/src/
 EXTRACT_SUFX=	.tar.xz
@@ -48,7 +47,7 @@ BUILDLINK_TRANSFORM+=	rm:-Werror-implicit-function-declaration
 SUBST_CLASSES+=		python
 SUBST_STAGE.python=	pre-configure
 SUBST_MESSAGE.python=	Adjusting pkg-config python checks
-SUBST_FILES.python=	configure.ac cmake/FindPython.cmake
+SUBST_FILES.python=	cmake/FindPython.cmake
 SUBST_SED.python=	-e 's,python3,python-${PYVERSSUFFIX},g'
 .endif
 
diff --git a/chat/weechat/distinfo b/chat/weechat/distinfo
index 35651ddb1fb2..cb7c24b003a7 100644
--- a/chat/weechat/distinfo
+++ b/chat/weechat/distinfo
@@ -1,11 +1,10 @@
-$NetBSD: distinfo,v 1.77 2023/07/06 13:40:39 jperkin Exp $
+$NetBSD: distinfo,v 1.78 2023/07/10 08:16:59 jperkin Exp $
 
-BLAKE2s (weechat-3.8.tar.xz) = 3f9ac7305d5514124e00e48b146112fd8fde0cf215585cec5e6f9c7bfe620642
-SHA512 (weechat-3.8.tar.xz) = f2fe125d03e9c8f8b5b03e2cdd340c6cd65c463187bd213c9128a3df19da56ae38f1a6d20a47c09606d1504448e3d554de042e33cc57b73753ce8491595ef516
-Size (weechat-3.8.tar.xz) = 2777420 bytes
+BLAKE2s (weechat-4.0.1.tar.xz) = 962975b4e64510990719052e6e17c0eaa164320d3163f8129eb60a9d6e94f97b
+SHA512 (weechat-4.0.1.tar.xz) = d21586771c096f3fe3c702f3db7caa50ca0e5f40448bf7150180eeee0d198014c6484eea13000596c8f1f3c369252a76727e11869b430f4f02956c0192c3db26
+Size (weechat-4.0.1.tar.xz) = 2572104 bytes
 SHA1 (patch-cmake_FindNcurses.cmake) = 73d4bc9551c79ee967abe06eba09cfe1b10129d4
-SHA1 (patch-po_CMakeLists.txt) = 014b42ff303a4e4213de95339ab97f029f38a068
-SHA1 (patch-po_cs.po) = 79cb7a9905d4c4b91c08c6719b3fd3eaee58d52c
-SHA1 (patch-src_plugins_lua_CMakeLists.txt) = 307dcba1a072411ec2b59c4e680a930e31d6d541
+SHA1 (patch-po_CMakeLists.txt) = 27dd84961ef725857ad12d6926111e97202c9029
+SHA1 (patch-src_plugins_lua_CMakeLists.txt) = 08a1b7dfca5dbbdf45a10b466eeac42671fe9edc
 SHA1 (patch-src_plugins_perl_weechat-perl.c) = 49e61419ea82157fa54a7847a653625944d3b341
-SHA1 (patch-src_plugins_ruby_CMakeLists.txt) = 84e7e348985fe047ac80884ad4a4a9b32066d733
+SHA1 (patch-src_plugins_ruby_CMakeLists.txt) = e4dc80bd1f8a0b6ba10802fea9d121c4c9faaa15
diff --git a/chat/weechat/patches/patch-po_CMakeLists.txt b/chat/weechat/patches/patch-po_CMakeLists.txt
index 7f5c8a122154..70be2d42b06e 100644
--- a/chat/weechat/patches/patch-po_CMakeLists.txt
+++ b/chat/weechat/patches/patch-po_CMakeLists.txt
@@ -1,15 +1,25 @@
-$NetBSD: patch-po_CMakeLists.txt,v 1.5 2019/12/10 13:04:06 nia Exp $
+$NetBSD: patch-po_CMakeLists.txt,v 1.6 2023/07/10 08:16:59 jperkin Exp $
 
 Drop package-name and package-version args to xgettext.
+Don't run --statistics to /dev/null, it tries to handle it as a regular file
+and aborts.
 
---- po/CMakeLists.txt.orig	2019-12-08 08:48:53.000000000 +0000
+--- po/CMakeLists.txt.orig	2023-06-30 19:18:01.000000000 +0000
 +++ po/CMakeLists.txt
-@@ -57,7 +57,7 @@ if(XGETTEXT_EXECUTABLE AND MSGMERGE_EXEC
+@@ -58,7 +58,7 @@ if(XGETTEXT_EXECUTABLE AND MSGMERGE_EXEC
    add_custom_command(
-     OUTPUT ${POT_FILE_PATH}
-     COMMAND ${XGETTEXT_EXECUTABLE}
--    ARGS -o ${POT_FILE_PATH} --add-comments='TRANSLATORS:' --keyword='_' --keyword='weechat_gettext' --keyword='N_' --keyword='NG_:1,2' --keyword='weechat_ngettext:1,2' --no-location --from-code=UTF-8 --directory=${CMAKE_SOURCE_DIR} --package-name='WeeChat' --package-version=${VERSION} --msgid-bugs-address=${BUGS_ADDRESS} --copyright-holder='NAME' ${SRC_FILES}
-+    ARGS -o ${POT_FILE_PATH} --add-comments='TRANSLATORS:' --keyword='_' --keyword='weechat_gettext' --keyword='N_' --keyword='NG_:1,2' --keyword='weechat_ngettext:1,2' --no-location --from-code=UTF-8 --directory=${CMAKE_SOURCE_DIR} --msgid-bugs-address=${BUGS_ADDRESS} --copyright-holder='NAME' ${SRC_FILES}
+     OUTPUT "${POT_FILE_PATH}"
+     COMMAND "${XGETTEXT_EXECUTABLE}"
+-    ARGS -o "${POT_FILE_PATH}" --add-comments='TRANSLATORS:' --keyword='_' --keyword='weechat_gettext' --keyword='N_' --keyword='NG_:1,2' --keyword='weechat_ngettext:1,2' --no-location --from-code=UTF-8 --directory="${CMAKE_SOURCE_DIR}" --package-name='WeeChat' --package-version=${VERSION} --msgid-bugs-address=${BUGS_ADDRESS} --copyright-holder='NAME' ${SRC_FILES}
++    ARGS -o "${POT_FILE_PATH}" --add-comments='TRANSLATORS:' --keyword='_' --keyword='weechat_gettext' --keyword='N_' --keyword='NG_:1,2' --keyword='weechat_ngettext:1,2' --no-location --from-code=UTF-8 --directory="${CMAKE_SOURCE_DIR}" --msgid-bugs-address=${BUGS_ADDRESS} --copyright-holder='NAME' ${SRC_FILES}
      DEPENDS ${POT_DEPENDS}
      COMMENT "Generating ${POT_FILE}"
    )
+@@ -76,7 +76,6 @@ if(XGETTEXT_EXECUTABLE AND MSGMERGE_EXEC
+       OUTPUT "${mofile}"
+       COMMAND "${MSGMERGE_EXECUTABLE}" ARGS --quiet -o "${CMAKE_CURRENT_BINARY_DIR}/${pofile}" "${CMAKE_CURRENT_SOURCE_DIR}/${pofile}" ${POT_FILE_PATH}
+       COMMAND "${MSGFMT_EXECUTABLE}" ARGS -o "${mofile}" "${CMAKE_CURRENT_BINARY_DIR}/${pofile}"
+-      COMMAND "${MSGFMT_EXECUTABLE}" ARGS -c --statistics --verbose --output-file=/dev/null "${CMAKE_CURRENT_BINARY_DIR}/${pofile}"
+       DEPENDS "${POT_FILE_PATH}" "${CMAKE_CURRENT_SOURCE_DIR}/${pofile}"
+       COMMENT "Compiling ${polang}.po"
+     )
diff --git a/chat/weechat/patches/patch-po_cs.po b/chat/weechat/patches/patch-po_cs.po
deleted file mode 100644
index b37532e8f1de..000000000000
--- a/chat/weechat/patches/patch-po_cs.po
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-po_cs.po,v 1.1 2023/07/06 13:40:39 jperkin Exp $
-
-Fix format string.
-
---- po/cs.po.orig	2023-07-06 13:29:56.000000000 +0000
-+++ po/cs.po
-@@ -136,9 +136,9 @@ msgstr "%sChyba: příkaz \"%s\" již ex
- msgid "%sBad file descriptor (%d) used in hook_fd"
- msgstr ""
- 
--#, c-format
-+#, fuzzy, c-format
- msgid "End of command '%s', timeout reached (%.1fs)"
--msgstr "Konec příkazu '%s', vypršel časový limit (%.lfs)"
-+msgstr "Konec příkazu '%s', vypršel časový limit (%.ls)"
- 
- #, c-format
- msgid "System clock skew detected (%+ld seconds), reinitializing all timers"
diff --git a/chat/weechat/patches/patch-src_plugins_lua_CMakeLists.txt b/chat/weechat/patches/patch-src_plugins_lua_CMakeLists.txt
index fc05b15fd26f..16ac205bc493 100644
--- a/chat/weechat/patches/patch-src_plugins_lua_CMakeLists.txt
+++ b/chat/weechat/patches/patch-src_plugins_lua_CMakeLists.txt
@@ -1,8 +1,8 @@
-$NetBSD: patch-src_plugins_lua_CMakeLists.txt,v 1.1 2020/07/26 23:10:21 nia Exp $
+$NetBSD: patch-src_plugins_lua_CMakeLists.txt,v 1.2 2023/07/10 08:16:59 jperkin Exp $
 
 Use the standard variables defined by cmake's own FindLua.
 
---- src/plugins/lua/CMakeLists.txt.orig	2020-07-18 11:59:02.000000000 +0000
+--- src/plugins/lua/CMakeLists.txt.orig	2023-06-30 19:18:01.000000000 +0000
 +++ src/plugins/lua/CMakeLists.txt
 @@ -25,8 +25,8 @@ add_library(lua MODULE
  set_target_properties(lua PROPERTIES PREFIX "")
@@ -14,4 +14,4 @@ Use the standard variables defined by cmake's own FindLua.
 +  target_link_libraries(lua ${LUA_LIBRARIES} weechat_plugins_scripts coverage_config)
  endif()
  
- install(TARGETS lua LIBRARY DESTINATION ${WEECHAT_LIBDIR}/plugins)
+ install(TARGETS lua LIBRARY DESTINATION "${WEECHAT_LIBDIR}/plugins")
diff --git a/chat/weechat/patches/patch-src_plugins_ruby_CMakeLists.txt b/chat/weechat/patches/patch-src_plugins_ruby_CMakeLists.txt
index e0c83b534c19..5a716c1e0bed 100644
--- a/chat/weechat/patches/patch-src_plugins_ruby_CMakeLists.txt
+++ b/chat/weechat/patches/patch-src_plugins_ruby_CMakeLists.txt
@@ -1,16 +1,16 @@
-$NetBSD: patch-src_plugins_ruby_CMakeLists.txt,v 1.1 2022/02/24 09:55:40 jperkin Exp $
+$NetBSD: patch-src_plugins_ruby_CMakeLists.txt,v 1.2 2023/07/10 08:16:59 jperkin Exp $
 
 RUBY_LDFLAGS may contain strings unsuitable for target_link_libraries(), for
 example "-arch arm64" will get converted to "-arch -larm64".
 
---- src/plugins/ruby/CMakeLists.txt.orig	2021-12-18 07:57:32.000000000 +0000
+--- src/plugins/ruby/CMakeLists.txt.orig	2023-06-30 19:18:01.000000000 +0000
 +++ src/plugins/ruby/CMakeLists.txt
-@@ -25,7 +25,7 @@ set_target_properties(ruby PROPERTIES PR
- 
- if(RUBY_FOUND)
+@@ -29,7 +29,7 @@ if(RUBY_FOUND)
+   # see: https://github.com/ruby/ruby/pull/7085
+   add_definitions(-Wno-unused-parameter)
    include_directories(${RUBY_INCLUDE_DIRS})
 -  target_link_libraries(ruby ${RUBY_LDFLAGS} weechat_plugins_scripts coverage_config)
 +  target_link_libraries(ruby ${RUBY_LIBRARIES} weechat_plugins_scripts coverage_config)
  endif(RUBY_FOUND)
  
- install(TARGETS ruby LIBRARY DESTINATION ${WEECHAT_LIBDIR}/plugins)
+ install(TARGETS ruby LIBRARY DESTINATION "${WEECHAT_LIBDIR}/plugins")