From nobody Sat Jul 1 10:57:17 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QtTfP62q0z4jvn2; Sat, 1 Jul 2023 10:57:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QtTfP4R0Qz3jrR; Sat, 1 Jul 2023 10:57:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688209037; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Xp5Z4FyMCQyKL3mzXqKP4s7B3GXjhR7DYXrK8Cwbl4I=; b=uSh1ivJvEiBOb9jvuGcf9APOiRTK0As/mWVYSqzMOgMkpViKhMFnsBopS0tvqg9LpM3q4r DthOO9ttdVIs1sJv3freE0bbuaDOAKAPxjtoN1haqOlHRHr2zGIg9RDi76YMI9P6e2uy0c qyKtjtrfa01GpK+qn1+5vRGAEoAu5e4MEH5SJYmKhKkqJJM2Ex/PMldITD6vvVhHJ1AZLH pqDQAbG60aghSpDs8KRh+QhvhkRBPAmJ9gsLMw7FNlkBinaz4XPIM6cytEB90O+XIkTU5/ FLIREtSuUo2SXRoJV0nlz4JwMrcsRUSU+aSvY1O+mbbJDjyCqJiwpg6zTx4dLA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688209037; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Xp5Z4FyMCQyKL3mzXqKP4s7B3GXjhR7DYXrK8Cwbl4I=; b=JAAgpzaC3Xxnr2d7CiEvkDdkEJtktudMb03lroedxWqUCQjW/IS8YgLXwcVsTh3VKDyCtP JzMx1I/7D6M6zZnVjZO7EMWOb7hNSinjuP8TkPweJ8QJbMmJqBp+VEBq7yDE+3qlk0Pxa7 kKOQk3ZBnPmbrR1F7bwCQR8tI0SupsOhaVWfoXSYr1AQdIQzl4dOZ4wF+PINQbYXLuk1b/ xLQUJmMj7R+ymMflqJ+LPDf1jcmU2nT8MEoEE5+ddRnxnaKt+FmkceIxGjVn7xTfMFA/Tr 6uD4ot8hjmREhfYf5PQMU50HamHR5CdM3B6tsa1jk/ct9DuV0sl6DbEaOceeRQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688209037; a=rsa-sha256; cv=none; b=Mya6PN69WwrnXn99h7TCJFfBJd4u49xU1OsF2kLoP3fzNubS/EkBu2PRz9ogYy10ebPcUl 4mbk9Tu6bGTkWg55/IZKaCWUPmdjysml4sEGOoiH6kF2dmoXJsroO4gSzOf9edT/8q7x3R dy6cmvhOTYQ1AmGA/WmzULlAWV6bd5NshIq0rFpMjcYHaJ0jo/53TgiKWxz8QHGt7NtLrn 6DpM8sNL3ggSnjN5DmCgoA2uCbbhM/fYUWNhLn+ZdAD/b1zc8lz0knFfAVZq0iPmbxqTO1 WzhSbTwRjOVnTDOVyDRXVCA+Q7mhWf24uWjsjtInbCyu5OnrQUKnpqYiGs97qg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QtTfP3TxkzN3x; Sat, 1 Jul 2023 10:57:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 361AvH8q022593; Sat, 1 Jul 2023 10:57:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 361AvHGt022592; Sat, 1 Jul 2023 10:57:17 GMT (envelope-from git) Date: Sat, 1 Jul 2023 10:57:17 GMT Message-Id: <202307011057.361AvHGt022592@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Bernard Spil Subject: git: a6a761e4ef6b - main - irc/weechat: Update to 4.0.1 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brnrd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a6a761e4ef6b43c67a1f5f2c1d6124ad1fe47d5e Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by brnrd: URL: https://cgit.FreeBSD.org/ports/commit/?id=a6a761e4ef6b43c67a1f5f2c1d6124ad1fe47d5e commit a6a761e4ef6b43c67a1f5f2c1d6124ad1fe47d5e Author: Bernard Spil AuthorDate: 2023-07-01 10:57:11 +0000 Commit: Bernard Spil CommitDate: 2023-07-01 10:57:11 +0000 irc/weechat: Update to 4.0.1 --- irc/weechat/Makefile | 9 +++--- irc/weechat/distinfo | 6 ++-- irc/weechat/files/patch-CMakeLists.txt | 54 ++++++++++++++++++---------------- 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)