git: 01a084e79370 - main - cad/uhdm: update 1.73 → 1.74

The branch main has been updated by yuri:

URL: https://cgit.FreeBSD.org/ports/commit/?id=01a084e79370b28b817bc8315162bc9ccaf2da31

commit 01a084e79370b28b817bc8315162bc9ccaf2da31
Author:     Yuri Victorovich <yuri@FreeBSD.org>
AuthorDate: 2023-09-01 07:20:30 +0000
Commit:     Yuri Victorovich <yuri@FreeBSD.org>
CommitDate: 2023-09-01 08:26:24 +0000

    cad/uhdm: update 1.73 → 1.74
    
    Reported by:    portscout
---
 cad/uhdm/Makefile                                            | 12 +++++++-----
 cad/uhdm/distinfo                                            |  6 +++---
 .../files/patch-third__party_capnproto_c++_src_kj_cidr.c++   | 11 -----------
 cad/uhdm/pkg-plist                                           |  9 +++------
 4 files changed, 13 insertions(+), 25 deletions(-)

diff --git a/cad/uhdm/Makefile b/cad/uhdm/Makefile
index fd301414a2c5..da59e2677b63 100644
--- a/cad/uhdm/Makefile
+++ b/cad/uhdm/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	uhdm
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.73
+DISTVERSION=	1.74
 CATEGORIES=	cad
 
 MAINTAINER=	yuri@FreeBSD.org
@@ -11,17 +11,19 @@ LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}orderedmultidict>0:devel/py-orderedmultidict@${PY_FLAVOR}
+LIB_DEPENDS=	libcapnp.so:devel/capnproto
+TEST_DEPENDS=	googletest>0:devel/googletest
 
 USES=		cmake:testing compiler:c++17-lang python:build tcl:86,build
-USE_LDCONFIG=	${PREFIX}/lib/uhdm
+USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	chipsalliance
 GH_PROJECT=	${PORTNAME:tu}
-GH_TUPLE=	capnproto:capnproto:928c839:capnproto/third_party/capnproto \
-		google:googletest:58d77fa:googletest/third_party/googletest
 
-CMAKE_ON=	BUILD_SHARED_LIBS
+CMAKE_ON=	BUILD_SHARED_LIBS \
+		UHDM_USE_HOST_CAPNP \
+		UHDM_USE_HOST_GTEST
 CMAKE_OFF=	UHDM_BUILD_TESTS
 CMAKE_ARGS=	-DPython_EXECUTABLE=${PYTHON_CMD} -DPython3_EXECUTABLE=${PYTHON_CMD}
 CMAKE_TESTING_ON=	UHDM_BUILD_TESTS
diff --git a/cad/uhdm/distinfo b/cad/uhdm/distinfo
index 00be09856570..89251f0a2031 100644
--- a/cad/uhdm/distinfo
+++ b/cad/uhdm/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1692896466
-SHA256 (chipsalliance-UHDM-v1.73_GH0.tar.gz) = d08869fcee50cab80102384b6405af5a9014500f355f736131085b0b6c9e192d
-SIZE (chipsalliance-UHDM-v1.73_GH0.tar.gz) = 1764174
+TIMESTAMP = 1693545700
+SHA256 (chipsalliance-UHDM-v1.74_GH0.tar.gz) = 92cefa641610457772c91d45864e3f4d65bfa0bf300886dc3067a561358a8eed
+SIZE (chipsalliance-UHDM-v1.74_GH0.tar.gz) = 1748571
 SHA256 (capnproto-capnproto-928c839_GH0.tar.gz) = f17ec33d4962a8e22674bf91e80b8b30ec02d01d5b0b99fe2070ee98f358d8c1
 SIZE (capnproto-capnproto-928c839_GH0.tar.gz) = 2411539
 SHA256 (google-googletest-58d77fa_GH0.tar.gz) = a55ceaae12e0ea65fee295b8d807bab5c06a719e98d9ac15af7f7c42a8d5000e
diff --git a/cad/uhdm/files/patch-third__party_capnproto_c++_src_kj_cidr.c++ b/cad/uhdm/files/patch-third__party_capnproto_c++_src_kj_cidr.c++
deleted file mode 100644
index 69bca64c8231..000000000000
--- a/cad/uhdm/files/patch-third__party_capnproto_c++_src_kj_cidr.c++
+++ /dev/null
@@ -1,11 +0,0 @@
---- third_party/capnproto/c++/src/kj/cidr.c++.orig	2023-07-23 06:08:18 UTC
-+++ third_party/capnproto/c++/src/kj/cidr.c++
-@@ -34,6 +34,8 @@
- #else
- #include <sys/socket.h>
- #include <arpa/inet.h>
-+#include <sys/types.h>
-+#include <netinet/in.h>
- #endif
- 
- namespace kj {
diff --git a/cad/uhdm/pkg-plist b/cad/uhdm/pkg-plist
index 262ab10ae6be..7bf13e6d9bd2 100644
--- a/cad/uhdm/pkg-plist
+++ b/cad/uhdm/pkg-plist
@@ -299,14 +299,11 @@ include/uhdm/wait_fork.h
 include/uhdm/wait_stmt.h
 include/uhdm/waits.h
 include/uhdm/while_stmt.h
+lib/UHDM.capnp
 lib/cmake/UHDM/UHDMConfig.cmake
 lib/cmake/UHDM/UHDMConfigVersion.cmake
 lib/cmake/UHDM/UHDMTargets-%%CMAKE_BUILD_TYPE%%.cmake
 lib/cmake/UHDM/UHDMTargets.cmake
-lib/uhdm/UHDM.capnp
-lib/uhdm/libcapnp.so
-lib/uhdm/libcapnp.so.1.0.0
-lib/uhdm/libkj.so
-lib/uhdm/libkj.so.1.0.0
-lib/uhdm/libuhdm.so
+lib/libuhdm.so
+lib/libuhdm.so.1.74
 libdata/pkgconfig/UHDM.pc