sysutils/daggy: Update 2.0.2 -> 2.1.3

Reported by:	portscout

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 <bsd.port.mk>
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