diff --git a/www/cpp-httplib/Makefile b/www/cpp-httplib/Makefile index 3e0716280dc6..908dab3df798 100644 --- a/www/cpp-httplib/Makefile +++ b/www/cpp-httplib/Makefile @@ -1,49 +1,50 @@ PORTNAME= cpp-httplib DISTVERSIONPREFIX= v -DISTVERSION= 0.15.3 +DISTVERSION= 0.16.0 CATEGORIES= www devel MAINTAINER= yuri@FreeBSD.org COMMENT= C++ header-only HTTP/HTTPS server and client library WWW= https://github.com/yhirose/cpp-httplib LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE BROKEN_FreeBSD_13= configure fails: OpenSSL is too old: Found unsuitable version "1.1.1t", but required is at least "3.0.0" TEST_DEPENDS= gmake:devel/gmake USES= cmake localbase:ldflags python:test # localbase only for tests USE_GITHUB= yes GH_ACCOUNT= yhirose CMAKE_ON= HTTPLIB_REQUIRE_ZLIB NO_ARCH= yes BINARY_ALIAS= python3=${PYTHON_CMD} # only for tests PLIST_FILES= include/httplib.h \ lib/cmake/httplib/FindBrotli.cmake \ + share/doc/httplib/README.md \ lib/cmake/httplib/httplibConfig.cmake \ 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 BROTLI_CMAKE_BOOL= HTTPLIB_REQUIRE_BROTLI HTTPLIB_USE_BROTLI_IF_AVAILABLE BROTLI_BUILD_DEPENDS= brotli>0:archivers/brotli BROTLI_RUN_DEPENDS= brotli>0:archivers/brotli SSL_USES= ssl SSL_CMAKE_BOOL= HTTPLIB_REQUIRE_OPENSSL HTTPLIB_USE_OPENSSL_IF_AVAILABLE do-test: # 5 test fail, see https://github.com/yhirose/cpp-httplib/issues/1339 @cd ${WRKSRC}/test && ${SETENV} ${MAKE_ENV} ${GMAKE} CXXFLAGS="${CXXFLAGS} -I${WRKSRC}/test" LDFLAGS="${LDFLAGS}" .include diff --git a/www/cpp-httplib/distinfo b/www/cpp-httplib/distinfo index 80338b2a7fdf..2187ebc5bb34 100644 --- a/www/cpp-httplib/distinfo +++ b/www/cpp-httplib/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1708882457 -SHA256 (yhirose-cpp-httplib-v0.15.3_GH0.tar.gz) = 2121bbf38871bb2aafb5f7f2b9b94705366170909f434428352187cb0216124e -SIZE (yhirose-cpp-httplib-v0.15.3_GH0.tar.gz) = 1151398 +TIMESTAMP = 1718410552 +SHA256 (yhirose-cpp-httplib-v0.16.0_GH0.tar.gz) = c125022eb85eaa12235518dc4638be93b62c3216d0f87b655af7b17b71b38851 +SIZE (yhirose-cpp-httplib-v0.16.0_GH0.tar.gz) = 1156790 diff --git a/www/cpp-httplib/files/patch-test_Makefile b/www/cpp-httplib/files/patch-test_Makefile index 20dc22f42036..4088a49ddb46 100644 --- a/www/cpp-httplib/files/patch-test_Makefile +++ b/www/cpp-httplib/files/patch-test_Makefile @@ -1,28 +1,28 @@ ---- test/Makefile.orig 2022-06-07 13:52:08 UTC +--- test/Makefile.orig 2024-06-11 22:20:47 UTC +++ test/Makefile -@@ -1,5 +1,5 @@ +@@ -1,5 +1,5 @@ CXX = clang++ CXX = clang++ -CXXFLAGS = -g -std=c++11 -I. -Wall -Wextra -Wtype-limits -Wconversion -Wshadow # -fno-exceptions -DCPPHTTPLIB_NO_EXCEPTIONS -fsanitize=address +CXXFLAGS += -g -std=c++11 -I. -Wall -Wextra -Wtype-limits -Wconversion -Wshadow # -fno-exceptions -DCPPHTTPLIB_NO_EXCEPTIONS -fsanitize=address - PREFIX = /usr/local - #PREFIX = $(shell brew --prefix) -@@ -30,15 +30,15 @@ proxy : test_proxy + PREFIX ?= $(shell brew --prefix) + +@@ -35,15 +35,15 @@ test : test.cc include_httplib.cc ../httplib.h Makefil ./test_proxy test : test.cc include_httplib.cc ../httplib.h Makefile cert.pem - $(CXX) -o $@ -I.. $(CXXFLAGS) test.cc include_httplib.cc $(TEST_ARGS) + $(CXX) -o $@ -I.. $(CXXFLAGS) test.cc include_httplib.cc ${LDFLAGS} $(TEST_ARGS) # Note: The intention of test_split is to verify that it works to compile and # link the split httplib.h, so there is normally no need to execute it. test_split : test.cc ../httplib.h httplib.cc Makefile cert.pem - $(CXX) -o $@ $(CXXFLAGS) test.cc httplib.cc $(TEST_ARGS) + $(CXX) -o $@ $(CXXFLAGS) test.cc httplib.cc ${LDFLAGS} $(TEST_ARGS) test_proxy : test_proxy.cc ../httplib.h Makefile cert.pem - $(CXX) -o $@ -I.. $(CXXFLAGS) test_proxy.cc $(TEST_ARGS) + $(CXX) -o $@ -I.. $(CXXFLAGS) test_proxy.cc ${LDFLAGS} $(TEST_ARGS) # Runs server_fuzzer.cc based on value of $(LIB_FUZZING_ENGINE). # Usage: make fuzz_test LIB_FUZZING_ENGINE=/path/to/libFuzzer