Attachment #246714 for bug #275204




PORTNAME=	c-ares
DISTVERSION=	1.23.0
CATEGORIES=	dns
MASTER_SITES=	https://github.com/${PORTNAME}/${PORTNAME}/releases/download/cares-${DISTVERSION:S/./_/g}/ \
		https://c-ares.org/download/


OPTIONS_DEFINE=		TEST

TEST_USES=		compiler:c++14-lang localbase:ldflags
TEST_BUILD_DEPENDS=	googletest>0:devel/googletest
TEST_USES=		compiler:c++14-lang localbase:ldflags
TEST_USE_CXXSTD=	c++14
TEST_TEST_TARGET=	test
TEST_CMAKE_BOOL=	CARES_BUILD_TESTS


post-patch:
	@${REINPLACE_CMD} -e 's|ares-test-live.cc||g' \
		${PATCH_WRKSRC}/test/Makefile.inc

Lines 1-3 Link Here

(-)b/dns/c-ares/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1700165043	1	TIMESTAMP = 1701376544
2	SHA256 (c-ares-1.22.0.tar.gz) = ad2e205088083317147c9f9eab5f24b82c3d50927c381a7c963deeb1182dbc21	2	SHA256 (c-ares-1.23.0.tar.gz) = cb614ecf78b477d35963ebffcf486fc9d55cc3d3216f00700e71b7d4868f79f5
3	SIZE (c-ares-1.22.0.tar.gz) = 1662808	3	SIZE (c-ares-1.23.0.tar.gz) = 1681336

Added Link Here

(-)b/dns/c-ares/files/patch-CMakeLists.txt (+11 lines)
1	--- CMakeLists.txt.orig 2023-11-30 20:53:51 UTC
2	+++ CMakeLists.txt
3	@@ -47,7 +47,7 @@ IF (CARES_BUILD_TESTS OR CARES_BUILD_CONTAINER_TESTS)
4
5	# Tests require a C++ compiler
6	IF (CARES_BUILD_TESTS OR CARES_BUILD_CONTAINER_TESTS)
7	- set(CMAKE_CXX_STANDARD 11)
8	+ set(CMAKE_CXX_STANDARD 14)
9	set(CMAKE_CXX_STANDARD_REQUIRED TRUE)
10	set(CMAKE_CXX_EXTENSIONS FALSE)
11	enable_language(CXX)




--- test/CMakeLists.txt.orig	2023-11-30 20:29:02 UTC
+++ test/CMakeLists.txt
@@ -27,14 +27,14 @@ ENDIF ()
-set(CMAKE_CXX_STANDARD 11)
+set(CMAKE_CXX_STANDARD 14)
 set(CMAKE_CXX_STANDARD_REQUIRED TRUE)
 set(CMAKE_CXX_EXTENSIONS FALSE)
 
@@ -25,14 +25,14 @@ ELSE ()
 ENDIF ()
 
 # Google Test and Mock

-)
-target_include_directories(gmock PUBLIC SYSTEM ${GMOCK_DIR})
-target_link_libraries(gmock PRIVATE ${CMAKE_THREAD_LIBS_INIT})
+#set(GMOCK_DIR gmock-1.11.0)
+#add_library(gmock STATIC
+#  ${GMOCK_DIR}/gmock-gtest-all.cc
+#  ${GMOCK_DIR}/gmock/gmock.h
+#  ${GMOCK_DIR}/gtest/gtest.h
+#)
+#target_include_directories(gmock PUBLIC SYSTEM ${GMOCK_DIR})
+#target_link_libraries(gmock PRIVATE ${CMAKE_THREAD_LIBS_INIT})
 
 # test targets
 
 transform_makefile_inc("Makefile.inc" "${CMAKE_CURRENT_BINARY_DIR}/Makefile.inc.cmake")
@@ -44,7 +44,7 @@ target_include_directories(arestest PRIVATE ${CMAKE_CU
 
 add_executable(arestest ${TESTSOURCES} ${TESTHEADERS})
 target_include_directories(arestest PRIVATE ${CMAKE_CURRENT_BINARY_DIR})

Lines 13-19 lib/cmake/c-ares/c-ares-targets-%%CMAKE_BUILD_TYPE%%.cmake Link Here

(-)b/dns/c-ares/pkg-plist (-1 / +2 lines)
13	lib/cmake/c-ares/c-ares-targets.cmake	13	lib/cmake/c-ares/c-ares-targets.cmake
14	lib/libcares.so	14	lib/libcares.so
15	lib/libcares.so.2	15	lib/libcares.so.2
16	lib/libcares.so.2.8.0	16	lib/libcares.so.2.9.0
17	libdata/pkgconfig/libcares.pc	17	libdata/pkgconfig/libcares.pc
18	man/man1/adig.1.gz	18	man/man1/adig.1.gz
19	man/man1/ahost.1.gz	19	man/man1/ahost.1.gz
Lines 138-143 man/man3/ares_set_socket_functions.3.gz Link Here
138	man/man3/ares_set_sortlist.3.gz	138	man/man3/ares_set_sortlist.3.gz
139	man/man3/ares_strerror.3.gz	139	man/man3/ares_strerror.3.gz
140	man/man3/ares_svcb_param_t.3.gz	140	man/man3/ares_svcb_param_t.3.gz
		141	man/man3/ares_threadsafety.3.gz
141	man/man3/ares_timeout.3.gz	142	man/man3/ares_timeout.3.gz
142	man/man3/ares_tlsa_match_t.3.gz	143	man/man3/ares_tlsa_match_t.3.gz
143	man/man3/ares_tlsa_selector_t.3.gz	144	man/man3/ares_tlsa_selector_t.3.gz

Return to bug 275204

Lines 1-5 Link Here

(-)b/dns/c-ares/Makefile (-2 / +4 lines)
1	PORTNAME= c-ares	1	PORTNAME= c-ares
2	DISTVERSION= 1.22.0	2	DISTVERSION= 1.23.0
3	CATEGORIES= dns	3	CATEGORIES= dns
4	MASTER_SITES= https://github.com/${PORTNAME}/${PORTNAME}/releases/download/cares-${DISTVERSION:S/./_/g}/ \	4	MASTER_SITES= https://github.com/${PORTNAME}/${PORTNAME}/releases/download/cares-${DISTVERSION:S/./_/g}/ \
5	https://c-ares.org/download/	5	https://c-ares.org/download/
Lines 20-30 CMAKE_ARGS= -DCMAKE_INSTALL_MANDIR:PATH=${MANPREFIX}/man Link Here
20		20
21	OPTIONS_DEFINE= TEST	21	OPTIONS_DEFINE= TEST
22		22
23	TEST_USES= compiler:c++14-lang localbase:ldflags
24	TEST_BUILD_DEPENDS= googletest>0:devel/googletest	23	TEST_BUILD_DEPENDS= googletest>0:devel/googletest
		24	TEST_USES= compiler:c++14-lang localbase:ldflags
		25	TEST_USE_CXXSTD= c++14
25	TEST_TEST_TARGET= test	26	TEST_TEST_TARGET= test
26	TEST_CMAKE_BOOL= CARES_BUILD_TESTS	27	TEST_CMAKE_BOOL= CARES_BUILD_TESTS
27		28
		29
28	post-patch:	30	post-patch:
29	@${REINPLACE_CMD} -e 's\|ares-test-live.cc\|\|g' \	31	@${REINPLACE_CMD} -e 's\|ares-test-live.cc\|\|g' \
30	${PATCH_WRKSRC}/test/Makefile.inc	32	${PATCH_WRKSRC}/test/Makefile.inc

Lines 1-12 Link Here

(-)b/dns/c-ares/files/patch-test_CMakeLists.txt (-18 / +12 lines)
1	--- test/CMakeLists.txt.orig 2023-05-22 11:33:56 UTC	1	--- test/CMakeLists.txt.orig 2023-11-30 20:29:02 UTC
2	+++ test/CMakeLists.txt	2	+++ test/CMakeLists.txt
3	@@ -1,4 +1,4 @@	3	@@ -27,14 +27,14 @@ ENDIF ()
4	-set(CMAKE_CXX_STANDARD 11)
5	+set(CMAKE_CXX_STANDARD 14)
6	set(CMAKE_CXX_STANDARD_REQUIRED TRUE)
7	set(CMAKE_CXX_EXTENSIONS FALSE)
8
9	@@ -25,14 +25,14 @@ ELSE ()
10	ENDIF ()	4	ENDIF ()
11		5
12	# Google Test and Mock	6	# Google Test and Mock
Lines 18-35 Link Here
18	-)	12	-)
19	-target_include_directories(gmock PUBLIC SYSTEM ${GMOCK_DIR})	13	-target_include_directories(gmock PUBLIC SYSTEM ${GMOCK_DIR})
20	-target_link_libraries(gmock PRIVATE ${CMAKE_THREAD_LIBS_INIT})	14	-target_link_libraries(gmock PRIVATE ${CMAKE_THREAD_LIBS_INIT})
21	+# set(GMOCK_DIR gmock-1.11.0)	15	+#set(GMOCK_DIR gmock-1.11.0)
22	+# add_library(gmock STATIC	16	+#add_library(gmock STATIC
23	+# ${GMOCK_DIR}/gmock-gtest-all.cc	17	+# ${GMOCK_DIR}/gmock-gtest-all.cc
24	+# ${GMOCK_DIR}/gmock/gmock.h	18	+# ${GMOCK_DIR}/gmock/gmock.h
25	+# ${GMOCK_DIR}/gtest/gtest.h	19	+# ${GMOCK_DIR}/gtest/gtest.h
26	+# )	20	+#)
27	+# target_include_directories(gmock PUBLIC SYSTEM ${GMOCK_DIR})	21	+#target_include_directories(gmock PUBLIC SYSTEM ${GMOCK_DIR})
28	+# target_link_libraries(gmock PRIVATE ${CMAKE_THREAD_LIBS_INIT})	22	+#target_link_libraries(gmock PRIVATE ${CMAKE_THREAD_LIBS_INIT})
29
30	# test targets	23	# test targets
31		24
32	@@ -43,7 +43,7 @@ configure_file(${CARES_TOPLEVEL_DIR}/src/lib/ares_conf	25	transform_makefile_inc("Makefile.inc" "${CMAKE_CURRENT_BINARY_DIR}/Makefile.inc.cmake")
		26	@@ -44,7 +44,7 @@ target_include_directories(arestest PRIVATE ${CMAKE_CU
33		27
34	add_executable(arestest ${TESTSOURCES} ${TESTHEADERS})	28	add_executable(arestest ${TESTSOURCES} ${TESTHEADERS})
35	target_include_directories(arestest PRIVATE ${CMAKE_CURRENT_BINARY_DIR})	29	target_include_directories(arestest PRIVATE ${CMAKE_CURRENT_BINARY_DIR})