From nobody Sun Aug 28 20:56:29 2022 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 4MG5TV0qNNz4bLX1; Sun, 28 Aug 2022 20:56:30 +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 4MG5TT6nfVz3hjG; Sun, 28 Aug 2022 20:56:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661720190; 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=XGXLEEklo/gc4HoN0k01rPmkf5sLWkibpYwMfUEGKho=; b=mTxGGMobn+J6VX10bq1q0SBViH+GvN/szQTFxNOncQKh83nASmubLLKamHjC5qgRfv/BVb IlIaqHcpaymDwODFs6p3Gx7NzASK7N/kvgm8clI60t1ZFOVsSmHlK4qtaby3UkTlzcC3VT b9ZA8kEephAbds5YyHzUARJJiJHfJkVAFgc9LJDJySkJQJXe2nwnw3ewcekzj0pL4wxvR5 DRBe6ATAYhtAX9FG9oBGCQJIpSJunNoiqT41A2BkitooJPwe9PJJjkfXf54QtGg1/ty7G4 Ab5br6+AxJh8E+14w2kAdmvE9TO8UeZ0YqJF/3M7mGMGzUJafQ1a5t1c5xXBng== 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 4MG5TT5slqz1C29; Sun, 28 Aug 2022 20:56:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 27SKuT3U007952; Sun, 28 Aug 2022 20:56:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27SKuTU6007951; Sun, 28 Aug 2022 20:56:29 GMT (envelope-from git) Date: Sun, 28 Aug 2022 20:56:29 GMT Message-Id: <202208282056.27SKuTU6007951@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yuri Victorovich Subject: git: 35a4e4fc36b0 - main - sysutils/daggy: Update 2.0.2 -> 2.1.3 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: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 35a4e4fc36b002dc1db7bf1dc7e17c067c7ec54c Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661720190; 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=XGXLEEklo/gc4HoN0k01rPmkf5sLWkibpYwMfUEGKho=; b=GRkyzCw1u20rfGhkdf1RAQwgOqU8SGGHhkc4owqXcNk1F9uWPZc1wVG+CUgXXrxtu1ZhSf 7HY5O312/AcTlI7wNoE+CF+me9DEFUCp94xzCIprbK4J+LNPnYWf8plb/Ppg+/eYmRgZ79 fE1OOVcdGlOaSOvczcDlVhmRYim1rkqSVBWa7iAaQ+O1SYXFZNI/oddc3UHbjgVcxhm5Lo 8JMGcIQxn0Xn2Om9WS9ojtwwLtkTckCzVZRyCNhw3Fr/788++pWqO1rxuu4UzwweGUKmGM f153q7JvdISoKQns3KWK3XQMUFim8TTOp5V+nAuJbnPAO47NtCrL11JkjafSbg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1661720190; a=rsa-sha256; cv=none; b=IMPgrSZ7jOnvpPgrXFmksgnlvG6AvilhE6uh5lbCj4P4ShYZjyDAjXRCRZymzrG8RH32O9 SZvxbGPC/Q6e8wUyzBw55gXksws5H84pCYnLbk9FyXsADGMdAL7u6b1bzICeHdT9WtkrGy HpugRKJfVM+HHW8SkhSNCA5+1GKIhrj/Y/5Ah6ODr2ItL9rs1dnwwQhbhC05Qc+ESoWHm/ nah2XxeQAtK2mnbObYKnBDXcW5d4w4+rXp4S/5uCm6SHWI0jqqGhGNizSvTIKKZ4amnI+4 63zeG3rAmSzHxXW89iF52RypoNN2pXI2r5ono64x7lyroqA6NiXRwRfijF4nlQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=35a4e4fc36b002dc1db7bf1dc7e17c067c7ec54c commit 35a4e4fc36b002dc1db7bf1dc7e17c067c7ec54c Author: Yuri Victorovich AuthorDate: 2022-08-28 20:55:09 +0000 Commit: Yuri Victorovich CommitDate: 2022-08-28 20:56:19 +0000 sysutils/daggy: Update 2.0.2 -> 2.1.3 Reported by: portscout --- sysutils/daggy/Makefile | 25 ++++++++++++++----------- sysutils/daggy/distinfo | 6 +++--- sysutils/daggy/files/patch-CMakeLists.txt | 13 ------------- sysutils/daggy/files/patch-src_CMakeLists.txt | 11 ----------- sysutils/daggy/pkg-descr | 2 +- sysutils/daggy/pkg-plist | 24 +++++++++++++----------- 6 files changed, 31 insertions(+), 50 deletions(-) diff --git a/sysutils/daggy/Makefile b/sysutils/daggy/Makefile index 0e47623a0a5f..e08c8c3387a5 100644 --- a/sysutils/daggy/Makefile +++ b/sysutils/daggy/Makefile @@ -1,29 +1,32 @@ PORTNAME= daggy -DISTVERSION= 2.0.2 -PORTREVISION= 4 +DISTVERSIONPREFIX= v +DISTVERSION= 2.1.3 CATEGORIES= sysutils MAINTAINER= yuri@FreeBSD.org COMMENT= Data Aggregation Utility: runs commands on remote hosts simultaneously LICENSE= MIT -LICENSE_FILE= ${WRKSRC}/LICENSE +LICENSE_FILE= ${WRKSRC}/../LICENSE -BUILD_DEPENDS= mustache>0:devel/mustache +BUILD_DEPENDS= ${LOCALBASE}/include/kainjow/mustache.hpp:devel/mustache LIB_DEPENDS= libbotan-2.so:security/botan2 \ libssh2.so:security/libssh2 \ libyaml-cpp.so:devel/yaml-cpp -USES= compiler:c++17-lang gl localbase:ldflags pkgconfig cmake qt:5 -USE_GITHUB= yes -GH_ACCOUNT= synacker -USE_QT= core gui network buildtools_build qmake_build +USES= gl cmake compiler:c++17-lang localbase:ldflags pkgconfig qt:6 ssl +USE_QT= base tools_build USE_GL= gl USE_LDCONFIG= yes -CMAKE_OFF= CONAN_BUILD +USE_GITHUB= yes +GH_ACCOUNT= synacker + +CMAKE_ARGS= -DVERSION=${DISTVERSION} +CMAKE_ON= BUILD_SHARED_LIBS + +CXXFLAGS+= -I${LOCALBASE}/include/kainjow -post-patch: - @${REINPLACE_CMD} -e 's|VERSION_STR|"${DISTVERSION}"|' ${WRKSRC}/src/Daggy/CConsoleDaggy.cpp +WRKSRC_SUBDIR= src .include diff --git a/sysutils/daggy/distinfo b/sysutils/daggy/distinfo index dae3c4bdb34b..aa30af897cfb 100644 --- a/sysutils/daggy/distinfo +++ b/sysutils/daggy/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1592965303 -SHA256 (synacker-daggy-2.0.2_GH0.tar.gz) = 52533067684db505b567a794bbefc688684ce64db8a7e4726976125cd26534b4 -SIZE (synacker-daggy-2.0.2_GH0.tar.gz) = 330858 +TIMESTAMP = 1661708767 +SHA256 (synacker-daggy-v2.1.3_GH0.tar.gz) = f96419b2199402eef31dd5fc8b4d15f64948bbdd350728549c890fdb8f0d2805 +SIZE (synacker-daggy-v2.1.3_GH0.tar.gz) = 498338 diff --git a/sysutils/daggy/files/patch-CMakeLists.txt b/sysutils/daggy/files/patch-CMakeLists.txt deleted file mode 100644 index d6ced4cfa67a..000000000000 --- a/sysutils/daggy/files/patch-CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ ---- CMakeLists.txt.orig 2020-04-10 04:02:12 UTC -+++ CMakeLists.txt -@@ -4,8 +4,8 @@ project(daggy) - set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake) - set(CMAKE_PREFIX_PATH ${CONAN_QT_ROOT}) - --include(conan) -+#include(conan) - --set(CONAN_BUILD ON) -+#set(CONAN_BUILD ON) - - add_subdirectory(src) diff --git a/sysutils/daggy/files/patch-src_CMakeLists.txt b/sysutils/daggy/files/patch-src_CMakeLists.txt deleted file mode 100644 index 2cbe9a259e9d..000000000000 --- a/sysutils/daggy/files/patch-src_CMakeLists.txt +++ /dev/null @@ -1,11 +0,0 @@ ---- src/CMakeLists.txt.orig 2020-04-10 04:30:55 UTC -+++ src/CMakeLists.txt -@@ -27,7 +27,7 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CUR - include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_BINARY_DIR}/exports) - - include(compiler) --include(version) -+#include(version) - - add_subdirectory(DaggyCore) - if(DAGGY_CONSOLE) diff --git a/sysutils/daggy/pkg-descr b/sysutils/daggy/pkg-descr index 9239e5125d32..30ecbb14d9de 100644 --- a/sysutils/daggy/pkg-descr +++ b/sysutils/daggy/pkg-descr @@ -12,4 +12,4 @@ Daggy is serverless, cross-platform solution and don't require installation on remote servers. Commands execution work under SSH transport protocol or via local terminal. -WWW: https://docs.daggy.dev/ +WWW: https://daggy.dev/ diff --git a/sysutils/daggy/pkg-plist b/sysutils/daggy/pkg-plist index ba74d5336a7f..7294820be33f 100644 --- a/sysutils/daggy/pkg-plist +++ b/sysutils/daggy/pkg-plist @@ -1,14 +1,16 @@ bin/daggy -include/DaggyCore/CJsonDataSourcesConvertor.h -include/DaggyCore/CLocalDataProvider.h -include/DaggyCore/CSsh2DataProviderFabric.h -include/DaggyCore/CYamlDataSourcesConvertor.h -include/DaggyCore/Command.h -include/DaggyCore/Common.h -include/DaggyCore/DaggyCore.h -include/DaggyCore/IDataAggregator.h -include/DaggyCore/IDataProviderFabric.h -include/DaggyCore/IDataSourceConvertor.h -include/DaggyCore/Result.h +include/DaggyCore/Core.h +include/DaggyCore/Core.hpp +include/DaggyCore/Errors.h +include/DaggyCore/Errors.hpp +include/DaggyCore/Result.hpp +include/DaggyCore/Sources.hpp +include/DaggyCore/Types.h +include/DaggyCore/Types.hpp +include/DaggyCore/aggregators/CConsole.hpp +include/DaggyCore/aggregators/CFile.hpp +include/DaggyCore/aggregators/IAggregator.hpp include/DaggyCore/daggycore_export.h +include/DaggyCore/providers/IFabric.hpp +include/DaggyCore/providers/IProvider.hpp lib/libDaggyCore.so