diff --git a/irc/weechat/Makefile b/irc/weechat/Makefile index 043194548dc1..e28a8bbd4928 100644 --- a/irc/weechat/Makefile +++ b/irc/weechat/Makefile @@ -1,89 +1,89 @@ PORTNAME= weechat -PORTVERSION= 4.4.4 +PORTVERSION= 4.5.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 @${REINPLACE_CMD} 's|python${PYTHON_MAJOR_VER}|python-${PYTHON_VER}|' \ ${WRKSRC}/cmake/FindPython.cmake 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 6acfa6dfcdaf..63a44fcae54b 100644 --- a/irc/weechat/distinfo +++ b/irc/weechat/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1732970874 -SHA256 (weechat-4.4.4.tar.xz) = a8f4bb768c3d6ac3ea1eb4e6dc7a7bb2ee19b734a72cc58e063476dae8f3d077 -SIZE (weechat-4.4.4.tar.xz) = 2730520 +TIMESTAMP = 1734372543 +SHA256 (weechat-4.5.0.tar.xz) = b85e800af0f7c9f2d60d72c0f7e56abbaa60274a4d47be17407907292da30398 +SIZE (weechat-4.5.0.tar.xz) = 2745516 diff --git a/irc/weechat/files/patch-CMakeLists.txt b/irc/weechat/files/patch-CMakeLists.txt index 0e66921cdef3..34859ef0afb6 100644 --- a/irc/weechat/files/patch-CMakeLists.txt +++ b/irc/weechat/files/patch-CMakeLists.txt @@ -1,54 +1,46 @@ --- CMakeLists.txt.orig 2024-05-31 11:34:43 UTC +++ CMakeLists.txt @@ -102,11 +102,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) -@@ -208,6 +210,7 @@ add_definitions(-DHAVE_GCRYPT) - # Check for libgcrypt - pkg_check_modules(LIBGCRYPT REQUIRED libgcrypt) - add_definitions(-DHAVE_GCRYPT) -+add_definitions(${GCRYPT_CFLAGS}) - include_directories(${LIBGCRYPT_INCLUDE_DIRS}) - list(APPEND EXTRA_LIBS ${LIBGCRYPT_LDFLAGS}) - @@ -233,10 +236,12 @@ endif() add_definitions(-DHAVE_CJSON) endif() -# Check for iconv -find_package(Iconv) -if(ICONV_FOUND) - add_definitions(-DHAVE_ICONV) +if (ENABLE_ICONV) + # Check for iconv + find_package(Iconv) + if(ICONV_FOUND) + add_definitions(-DHAVE_ICONV) + endif() endif() # Check for CURL @@ -311,10 +316,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)