Attachment #247107 for bug #275813

View | Details | Raw Unified | Return to bug 275813
Collapse All | Expand All

Lines 1-9 Link Here

(-)b/dns/c-ares/Makefile (-2 / +4 lines)
1	PORTNAME= c-ares	1	PORTNAME= c-ares
2	DISTVERSION= 1.23.0	2	DISTVERSION= 1.24.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/
6		6
		7	PATCH_SITES= https://github.com/${PORTNAME}/${PORTNAME}/commit/
		8	PATCHFILES= 7dd384a99cc385e408e64c3e0af4e0e2136ed034.patch:-p1
		9
7	MAINTAINER= zi@FreeBSD.org	10	MAINTAINER= zi@FreeBSD.org
8	COMMENT= Asynchronous DNS resolver library	11	COMMENT= Asynchronous DNS resolver library
9	WWW= https://c-ares.haxx.se/	12	WWW= https://c-ares.haxx.se/
Lines 22-28 OPTIONS_DEFINE= TEST Link Here
22		25
23	TEST_BUILD_DEPENDS= googletest>0:devel/googletest	26	TEST_BUILD_DEPENDS= googletest>0:devel/googletest
24	TEST_USES= compiler:c++14-lang localbase:ldflags	27	TEST_USES= compiler:c++14-lang localbase:ldflags
25	TEST_USE_CXXSTD= c++14
26	TEST_TEST_TARGET= test	28	TEST_TEST_TARGET= test
27	TEST_CMAKE_BOOL= CARES_BUILD_TESTS	29	TEST_CMAKE_BOOL= CARES_BUILD_TESTS
28		30

Lines 1-3 Link Here

(-)b/dns/c-ares/distinfo (-3 / +5 lines)
1	TIMESTAMP = 1701376544	1	TIMESTAMP = 1702828727
2	SHA256 (c-ares-1.23.0.tar.gz) = cb614ecf78b477d35963ebffcf486fc9d55cc3d3216f00700e71b7d4868f79f5	2	SHA256 (c-ares-1.24.0.tar.gz) = c517de6d5ac9cd55a9b72c1541c3e25b84588421817b5f092850ac09a8df5103
3	SIZE (c-ares-1.23.0.tar.gz) = 1681336	3	SIZE (c-ares-1.24.0.tar.gz) = 1368749
		4	SHA256 (7dd384a99cc385e408e64c3e0af4e0e2136ed034.patch) = 0e8b2aa7c199998977a8b1bc4acf40416acea55c9d16d7186a4022c8fab2c694
		5	SIZE (7dd384a99cc385e408e64c3e0af4e0e2136ed034.patch) = 3279

Removed Link Here

(-)a/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 ()
 ENDIF ()
 
 # Google Test and Mock
-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})
+#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})
-target_link_libraries(arestest PRIVATE caresinternal gmock)
+target_link_libraries(arestest PRIVATE caresinternal gtest gmock)
 
 IF (CARES_BUILD_CONTAINER_TESTS)
   target_compile_definitions(arestest PRIVATE HAVE_USER_NAMESPACE HAVE_UTS_NAMESPACE)

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.9.0	16	lib/libcares.so.2.10.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 91-96 man/man3/ares_free_hostent.3.gz Link Here
91	man/man3/ares_free_string.3.gz	91	man/man3/ares_free_string.3.gz
92	man/man3/ares_freeaddrinfo.3.gz	92	man/man3/ares_freeaddrinfo.3.gz
93	man/man3/ares_get_servers.3.gz	93	man/man3/ares_get_servers.3.gz
		94	man/man3/ares_get_servers_csv.3.gz
94	man/man3/ares_get_servers_ports.3.gz	95	man/man3/ares_get_servers_ports.3.gz
95	man/man3/ares_getaddrinfo.3.gz	96	man/man3/ares_getaddrinfo.3.gz
96	man/man3/ares_gethostbyaddr.3.gz	97	man/man3/ares_gethostbyaddr.3.gz

Return to bug 275813

Removed Link Here

(-)a/dns/c-ares/files/patch-test_CMakeLists.txt (-34 lines)
1	--- test/CMakeLists.txt.orig 2023-11-30 20:29:02 UTC
2	+++ test/CMakeLists.txt
3	@@ -27,14 +27,14 @@ ENDIF ()
4	ENDIF ()
5
6	# Google Test and Mock
7	-set(GMOCK_DIR gmock-1.11.0)
8	-add_library(gmock STATIC
9	- ${GMOCK_DIR}/gmock-gtest-all.cc
10	- ${GMOCK_DIR}/gmock/gmock.h
11	- ${GMOCK_DIR}/gtest/gtest.h
12	-)
13	-target_include_directories(gmock PUBLIC SYSTEM ${GMOCK_DIR})
14	-target_link_libraries(gmock PRIVATE ${CMAKE_THREAD_LIBS_INIT})
15	+#set(GMOCK_DIR gmock-1.11.0)
16	+#add_library(gmock STATIC
17	+# ${GMOCK_DIR}/gmock-gtest-all.cc
18	+# ${GMOCK_DIR}/gmock/gmock.h
19	+# ${GMOCK_DIR}/gtest/gtest.h
20	+#)
21	+#target_include_directories(gmock PUBLIC SYSTEM ${GMOCK_DIR})
22	+#target_link_libraries(gmock PRIVATE ${CMAKE_THREAD_LIBS_INIT})
23	# test targets
24
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
27
28	add_executable(arestest ${TESTSOURCES} ${TESTHEADERS})
29	target_include_directories(arestest PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
30	-target_link_libraries(arestest PRIVATE caresinternal gmock)
31	+target_link_libraries(arestest PRIVATE caresinternal gtest gmock)
32
33	IF (CARES_BUILD_CONTAINER_TESTS)
34	target_compile_definitions(arestest PRIVATE HAVE_USER_NAMESPACE HAVE_UTS_NAMESPACE)