git: b2a29737c545 - main - www/cpp-httplib: Fix tests

The branch main has been updated by yuri:

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

commit b2a29737c545d8554c4c95e1a5096b6b0b1a3a95
Author:     Yuri Victorovich <yuri@FreeBSD.org>
AuthorDate: 2022-07-30 17:37:03 +0000
Commit:     Yuri Victorovich <yuri@FreeBSD.org>
CommitDate: 2022-07-30 17:37:23 +0000

    www/cpp-httplib: Fix tests
---
 www/cpp-httplib/Makefile | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/www/cpp-httplib/Makefile b/www/cpp-httplib/Makefile
index 9eec780292e4..82a8c4c6e4ba 100644
--- a/www/cpp-httplib/Makefile
+++ b/www/cpp-httplib/Makefile
@@ -9,8 +9,7 @@ COMMENT=	C++ header-only HTTP/HTTPS server and client library
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-TEST_DEPENDS=	gmake:devel/gmake \
-		googletest>0:devel/googletest
+TEST_DEPENDS=	gmake:devel/gmake
 
 USES=		cmake localbase:ldflags python:test # localbase only for tests
 
@@ -29,6 +28,8 @@ PLIST_FILES=	include/httplib.h \
 		lib/cmake/httplib/httplibConfigVersion.cmake \
 		lib/cmake/httplib/httplibTargets.cmake
 
+CONFLICTS_BUILD=	googletest # should be CONFLICTS_TEST
+
 OPTIONS_DEFINE=		BROTLI SSL
 OPTIONS_DEFAULT=	BROTLI SSL
 
@@ -39,7 +40,7 @@ BROTLI_RUN_DEPENDS=	brotli>0:archivers/brotli
 SSL_USES=		ssl
 SSL_CMAKE_BOOL=		HTTPLIB_REQUIRE_OPENSSL HTTPLIB_USE_OPENSSL_IF_AVAILABLE
 
-do-test: install # some tests fail to compile, see https://github.com/yhirose/cpp-httplib/issues/1338
-	@cd ${WRKSRC}/test && ${SETENV} ${MAKE_ENV} ${GMAKE} CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS}"
+do-test: # one test fails, see https://github.com/yhirose/cpp-httplib/issues/1339
+	@cd ${WRKSRC}/test && ${SETENV} ${MAKE_ENV} ${GMAKE} CXXFLAGS="${CXXFLAGS} -I${WRKSRC}/test" LDFLAGS="${LDFLAGS}"
 
 .include <bsd.port.mk>