diff --git a/irc/weechat/Makefile b/irc/weechat/Makefile index bf979611a597..4b6386af02c2 100644 --- a/irc/weechat/Makefile +++ b/irc/weechat/Makefile @@ -1,87 +1,87 @@ PORTNAME= weechat -PORTVERSION= 4.8.2 +PORTVERSION= 4.9.0 CATEGORIES= irc MASTER_SITES= https://weechat.org/files/src/ MAINTAINER= brnrd@FreeBSD.org COMMENT= Lightweight and user friendly ncurses based IRC client WWW= https://weechat.org/ LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS+= libcurl.so:ftp/curl \ libgcrypt.so:security/libgcrypt \ libgnutls.so:security/gnutls \ libgpg-error.so:security/libgpg-error USES= cmake cpe ncurses pkgconfig tar:xz USE_LDCONFIG= yes CMAKE_ARGS= -DLIBDATADIR=${LOCALBASE}/libdata OPTIONS_DEFINE= API BACKTRACE DOCS HEADLESS ICON ICONV MANPAGES NLS ZSTD OPTIONS_DEFAULT= API ASPELL BACKTRACE CHARSET HEADLESS ICON LUA MANPAGES \ NLS PERL PYTHON RUBY TCL TYPING ZSTD OPTIONS_SUB= yes OPTIONS_GROUP= PLUGINS OPTIONS_GROUP_PLUGINS= ASPELL CHARSET GUILE JAVASCRIPT LUA PERL PHP PYTHON \ RUBY TCL TYPING API_DESC= HTTP REST API BACKTRACE_DESC= Provide crash backtraces CHARSET_DESC= Charset plugin (implies ICONV) GUILE_DESC= Guile script support HEADLESS_DESC= Build headless weechat as well ICON_DESC= Desktop icon JAVASCRIPT_DESC= Javascript script support PLUGINS_DESC= Weechat Plugins PYTHON_DESC= Python script support RUBY_DESC= Ruby script support TYPING_DESC= Typing status plugin .for _opt in ${OPTIONS_GROUP_PLUGINS} BACKTRACE HEADLESS ICONV GNUTLS NLS ZSTD ${_opt}_CMAKE_BOOL= ENABLE_${_opt} .endfor API_CMAKE_BOOL= ENABLE_CJSON API_LIB_DEPENDS= libcjson.so:devel/libcjson ASPELL_CMAKE_BOOL= ENABLE_SPELL ASPELL_LIB_DEPENDS= libaspell.so:textproc/aspell CHARSET_IMPLIES= ICONV DOCS_CMAKE_BOOL= ENABLE_DOC ENABLE_DOC_INCOMPLETE DOCS_BUILD_DEPENDS= ${LOCALBASE}/bin/asciidoctor:textproc/rubygem-asciidoctor GUILE_USES= guile:2.2,conflicts ICONV_USES= iconv JAVASCRIPT_LIB_DEPENDS= libv8.so:lang/v8 LUA_USES= lua pkgconfig MANPAGES_CMAKE_BOOL= ENABLE_MAN MANPAGES_CMAKE_ON= -DMANDIR=${PREFIX}/share/man MANPAGES_BUILD_DEPENDS= ${LOCALBASE}/bin/asciidoctor:textproc/rubygem-asciidoctor NLS_USES= gettext PERL_USES= perl5 PHP_USES= php:build,embed PYTHON_USES= python RUBY_USES= ruby TCL_CMAKE_ON= -DTCL_VERSION:STRING="${TCL_VER}" \ -DTCL_TCLSH:PATH="${TCLSH}" TCL_USES= tcl ZSTD_LIB_DEPENDS= libzstd.so:archivers/zstd .include post-patch: .if ${LOCALBASE} != "/usr/local" . for f in src/core/CMakeLists.txt cmake/*.cmake @${REINPLACE_CMD} 's|/usr/local|${LOCALBASE}|' ${WRKSRC}/$f . endfor .endif post-patch-ICON-off: @${REINPLACE_CMD} -e '/^# icon$$/,/^$$/d' ${WRKSRC}/CMakeLists.txt post-install: ${LN} -sf weechat ${STAGEDIR}${PREFIX}/bin/weechat-curses .include diff --git a/irc/weechat/distinfo b/irc/weechat/distinfo index 115b233b8ca4..61fc11d06f26 100644 --- a/irc/weechat/distinfo +++ b/irc/weechat/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1772873565 -SHA256 (weechat-4.8.2.tar.xz) = 7e2f619d4dcd28d9d86864763581a1b453499f8dd0652af863b54045a8964d6c -SIZE (weechat-4.8.2.tar.xz) = 2789868 +TIMESTAMP = 1774777846 +SHA256 (weechat-4.9.0.tar.xz) = 7cbb9b27f25a7d2f1d8c426a08f8e625eefbc1d3e59bbf775925444f72394b6f +SIZE (weechat-4.9.0.tar.xz) = 2792516 diff --git a/irc/weechat/files/patch-CMakeLists.txt b/irc/weechat/files/patch-CMakeLists.txt index 34859ef0afb6..80aeaac530bd 100644 --- a/irc/weechat/files/patch-CMakeLists.txt +++ b/irc/weechat/files/patch-CMakeLists.txt @@ -1,46 +1,72 @@ ---- CMakeLists.txt.orig 2024-05-31 11:34:43 UTC +--- CMakeLists.txt.orig 2026-03-29 08:20:23 UTC +++ CMakeLists.txt -@@ -102,11 +102,13 @@ option(ENABLE_ALIAS "Enable Alias plugin" +@@ -96,11 +96,13 @@ option(ENABLE_ALIAS "Enable Alias plugin" option(ENABLE_ZSTD "Enable Zstandard compression" ON) option(ENABLE_CJSON "Enable cJSON 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) -@@ -233,10 +236,12 @@ endif() +@@ -258,13 +260,15 @@ endif() add_definitions(-DHAVE_CJSON) endif() -# Check for iconv -find_package(Iconv) -if(ICONV_FOUND) -- add_definitions(-DHAVE_ICONV) -+if (ENABLE_ICONV) +- if(ICONV_LIBRARY) +- list(APPEND EXTRA_LIBS ${ICONV_LIBRARY}) ++if(ENABLE_ICONV) + # Check for iconv + find_package(Iconv) + if(ICONV_FOUND) ++ if(ICONV_LIBRARY) ++ list(APPEND EXTRA_LIBS ${ICONV_LIBRARY}) ++ endif() + add_definitions(-DHAVE_ICONV) -+ endif() + endif() +- add_definitions(-DHAVE_ICONV) endif() # Check for CURL -@@ -311,10 +316,10 @@ set(exec_prefix "\${prefix}") +@@ -290,12 +294,14 @@ endif() + add_custom_target(translations COMMAND true) + endif() + +-if(${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD") +- find_library(EXECINFO_LIB_PATH execinfo /usr/local/lib) +- check_function_exists(backtrace HAVE_BACKTRACE) +- list(APPEND EXTRA_LIBS "execinfo") +-else() +- check_symbol_exists(backtrace "execinfo.h" HAVE_BACKTRACE) ++if(ENABLE_BACKTRACE) ++ if(${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD") ++ find_library(EXECINFO_LIB_PATH execinfo /usr/local/lib) ++ check_function_exists(backtrace HAVE_BACKTRACE) ++ list(APPEND EXTRA_LIBS "execinfo") ++ else() ++ check_symbol_exists(backtrace "execinfo.h" HAVE_BACKTRACE) ++ endif() + endif() + + if(${CMAKE_SYSTEM_NAME} STREQUAL "Haiku") +@@ -343,10 +349,10 @@ set(exec_prefix "\${prefix}") 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") # 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) diff --git a/irc/weechat/files/patch-src_core_CMakeLists.txt b/irc/weechat/files/patch-src_core_CMakeLists.txt deleted file mode 100644 index 7ef963fb8326..000000000000 --- a/irc/weechat/files/patch-src_core_CMakeLists.txt +++ /dev/null @@ -1,23 +0,0 @@ ---- src/core/CMakeLists.txt.orig 2016-05-01 10:50:12 UTC -+++ src/core/CMakeLists.txt -@@ -51,12 +51,14 @@ wee-version.c wee-version.h) - include(CheckSymbolExists) - check_symbol_exists(flock "sys/file.h" HAVE_FLOCK) - --if(${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD") -- find_library(EXECINFO_LIB_PATH execinfo /usr/local/lib) -- set(CMAKE_REQUIRED_LIBRARIES "${EXECINFO_LIB_PATH}") -- check_function_exists(backtrace HAVE_BACKTRACE) --else() -- check_symbol_exists(backtrace "execinfo.h" HAVE_BACKTRACE) -+if(ENABLE_BACKTRACE) -+ if(${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD") -+ find_library(EXECINFO_LIB_PATH execinfo /usr/local/lib) -+ set(CMAKE_REQUIRED_LIBRARIES "${EXECINFO_LIB_PATH}") -+ check_function_exists(backtrace HAVE_BACKTRACE) -+ else() -+ check_symbol_exists(backtrace "execinfo.h" HAVE_BACKTRACE) -+ endif() - endif() - - if(GNUTLS_FOUND)