irc/weechat: Update to 4.0.1

3 files changed, 37 insertions, 32 deletions

diff --git a/irc/weechat/Makefile b/irc/weechat/Makefile
index e7237a199adf..f603949e4254 100644
--- a/irc/weechat/Makefile
+++ b/irc/weechat/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	weechat
-DISTVERSION=	3.8
+DISTVERSION=	4.0.1
 CATEGORIES=	irc
 MASTER_SITES=	https://weechat.org/files/src/
 
@@ -16,7 +16,7 @@ LIB_DEPENDS+=	libcurl.so:ftp/curl \
 		libgpg-error.so:security/libgpg-error \
 		libzstd.so:archivers/zstd
 
-USES=		cmake cpe ncurses libtool pkgconfig tar:xz
+USES=		cmake cpe libtool ncurses pkgconfig tar:xz
 USE_LDCONFIG=	yes
 
 CMAKE_ARGS=	-DLIBDATADIR=${LOCALBASE}/libdata
@@ -24,7 +24,7 @@ CMAKE_ARGS=	-DLIBDATADIR=${LOCALBASE}/libdata
 OPTIONS_DEFINE=		BACKTRACE DOCS CA_BUNDLE HEADLESS ICON ICONV \
 			MANPAGES NLS
 OPTIONS_DEFAULT=	ASPELL BACKTRACE CA_BUNDLE CHARSET HEADLESS \
-			ICON LUA MANPAGES PERL PYTHON RUBY TCL TYPING
+			ICON LUA MANPAGES NLS PERL PYTHON RUBY TCL TYPING
 OPTIONS_SUB=		yes
 
 OPTIONS_GROUP=		PLUGINS
@@ -51,7 +51,7 @@ ASPELL_CMAKE_BOOL=	ENABLE_SPELL
 ASPELL_LIB_DEPENDS=	libaspell.so:textproc/aspell
 CA_BUNDLE_RUN_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss
 CHARSET_IMPLIES=	ICONV
-DOCS_CMAKE_BOOL=	ENABLE_DOC
+DOCS_CMAKE_BOOL=	ENABLE_DOC ENABLE_DOC_INCOMPLETE
 DOCS_BUILD_DEPENDS=	${LOCALBASE}/bin/asciidoctor:textproc/rubygem-asciidoctor
 GUILE_LIB_DEPENDS=	libguile-2.2.so:lang/guile2
 ICONV_USES=		iconv
@@ -60,6 +60,7 @@ LUA_USES=		lua pkgconfig
 MANPAGES_CMAKE_BOOL=	ENABLE_MAN
 MANPAGES_CMAKE_ON=	-DMANDIR=${MANPREFIX}/man
 MANPAGES_BUILD_DEPENDS=	${LOCALBASE}/bin/asciidoctor:textproc/rubygem-asciidoctor
+NLS_BROKEN_OFF=		NLS option error: "ld: error: undefined symbol: libintl_bindtextdomain"
 NLS_USES=		gettext
 PERL_USES=		perl5
 PHP_USES=		php:build,embed
diff --git a/irc/weechat/distinfo b/irc/weechat/distinfo
index 5e429b71bed4..5241042514cd 100644
--- a/irc/weechat/distinfo
+++ b/irc/weechat/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1673467265
-SHA256 (weechat-3.8.tar.xz) = f7cb65c200f8c090c56f2cf98c0b184051e516e5f7099a4308cacf86f174bf28
-SIZE (weechat-3.8.tar.xz) = 2777420
+TIMESTAMP = 1688208310
+SHA256 (weechat-4.0.1.tar.xz) = 1b9533123af427922b3d7fabede958dc85392d50881d97d0b7986d8f514556e9
+SIZE (weechat-4.0.1.tar.xz) = 2572104
diff --git a/irc/weechat/files/patch-CMakeLists.txt b/irc/weechat/files/patch-CMakeLists.txt
index 155d3bf4ea6f..5bfa52cd24b8 100644
--- a/irc/weechat/files/patch-CMakeLists.txt
+++ b/irc/weechat/files/patch-CMakeLists.txt
@@ -1,20 +1,20 @@
---- CMakeLists.txt.orig	2020-07-07 18:29:03 UTC
+--- CMakeLists.txt.orig	2023-06-24 20:00:30 UTC
 +++ CMakeLists.txt
-@@ -93,11 +97,13 @@ option(ENABLE_HEADLESS      "Compile the headless bina
- option(ENABLE_NLS           "Enable Native Language Support"              ON)
- option(ENABLE_LARGEFILE     "Enable Large File Support"                   ON)
- option(ENABLE_ALIAS         "Enable Alias plugin"                         ON)
-+option(ENABLE_BACKTRACE     "Enable backtraces (via libexecinfo)"         ON)
- option(ENABLE_BUFLIST       "Enable Buflist plugin"                       ON)
- option(ENABLE_CHARSET       "Enable Charset plugin"                       ON)
- option(ENABLE_EXEC          "Enable Exec plugin"                          ON)
- option(ENABLE_FIFO          "Enable FIFO plugin"                          ON)
- option(ENABLE_FSET          "Enable Fast Set plugin"                      ON)
-+option(ENABLE_ICONV         "Enable character conversion support"         ON)
- option(ENABLE_IRC           "Enable IRC plugin"                           ON)
- option(ENABLE_LOGGER        "Enable Logger plugin"                        ON)
- option(ENABLE_RELAY         "Enable Relay plugin"                         ON)
-@@ -195,6 +201,7 @@ endif()
+@@ -100,11 +100,13 @@ option(ENABLE_HEADLESS       "Compile the headless bin
+ option(ENABLE_NLS            "Enable Native Language Support"           ON)
+ option(ENABLE_LARGEFILE      "Enable Large File Support"                ON)
+ option(ENABLE_ALIAS          "Enable Alias plugin"                      ON)
++option(ENABLE_BACKTRACE      "Enable backtraces (via libexecinfo)"      ON)
+ option(ENABLE_BUFLIST        "Enable Buflist plugin"                    ON)
+ option(ENABLE_CHARSET        "Enable Charset plugin"                    ON)
+ option(ENABLE_EXEC           "Enable Exec plugin"                       ON)
+ option(ENABLE_FIFO           "Enable FIFO plugin"                       ON)
+ option(ENABLE_FSET           "Enable Fast Set plugin"                   ON)
++option(ENABLE_ICONV          "Enable character conversion support"      ON)
+ option(ENABLE_IRC            "Enable IRC plugin"                        ON)
+ option(ENABLE_LOGGER         "Enable Logger plugin"                     ON)
+ option(ENABLE_RELAY          "Enable Relay plugin"                      ON)
+@@ -217,6 +219,7 @@ endif()
  # Check for libgcrypt
  find_package(GCRYPT REQUIRED)
  add_definitions(-DHAVE_GCRYPT)
@@ -22,9 +22,9 @@
  list(APPEND EXTRA_LIBS ${GCRYPT_LDFLAGS})
  
  # Check for GnuTLS
-@@ -208,10 +215,12 @@ list(APPEND EXTRA_LIBS gnutls)
- find_package(ZLIB REQUIRED)
- add_definitions(-DHAVE_ZLIB)
+@@ -232,10 +235,12 @@ find_package(ZLIB REQUIRED)
+ # Check for zstd
+ pkg_check_modules(LIBZSTD REQUIRED libzstd)
  
 -# Check for iconv
 -find_package(Iconv)
@@ -39,12 +39,16 @@
  endif()
  
  # Check for CURL
-@@ -280,7 +289,7 @@ set(exec_prefix "\${prefix}")
- string(REPLACE "${CMAKE_INSTALL_PREFIX}" "\${prefix}" libdir "${LIBDIR}")
+@@ -304,10 +309,10 @@ add_custom_target(dist
+ set(PACKAGE "${PROJECT_NAME}")
+ set(prefix "${CMAKE_INSTALL_PREFIX}")
+ set(exec_prefix "\${prefix}")
+-string(REPLACE "${CMAKE_INSTALL_PREFIX}" "\${prefix}" libdir "${LIBDIR}")
++string(REPLACE "${CMAKE_INSTALL_PREFIX}" "\${prefix}" libdir "${LIBDATADIR}")
  set(includedir "\${prefix}/include")
- configure_file(${CMAKE_CURRENT_SOURCE_DIR}/weechat.pc.in ${CMAKE_CURRENT_BINARY_DIR}/weechat.pc @ONLY)
--install(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat.pc DESTINATION ${LIBDIR}/pkgconfig)
-+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat.pc DESTINATION ${LIBDATADIR}/pkgconfig)
+ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/weechat.pc.in" "${CMAKE_CURRENT_BINARY_DIR}/weechat.pc" @ONLY)
+-install(FILES "${CMAKE_CURRENT_BINARY_DIR}/weechat.pc" DESTINATION "${LIBDIR}/pkgconfig")
++install(FILES "${CMAKE_CURRENT_BINARY_DIR}/weechat.pc" DESTINATION "${LIBDATADIR}/pkgconfig")
  
  # cygport file (used to build Cygwin packages)
- configure_file(${CMAKE_CURRENT_SOURCE_DIR}/weechat.cygport.in ${CMAKE_CURRENT_BINARY_DIR}/weechat-${VERSION}-1.cygport @ONLY)
+ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/weechat.cygport.in" "${CMAKE_CURRENT_BINARY_DIR}/weechat-${VERSION}-1.cygport" @ONLY)