diff --git a/www/cpp-httplib/Makefile b/www/cpp-httplib/Makefile index 6e63927edf6d..b1613da68011 100644 --- a/www/cpp-httplib/Makefile +++ b/www/cpp-httplib/Makefile @@ -1,45 +1,45 @@ PORTNAME= cpp-httplib DISTVERSIONPREFIX= v -DISTVERSION= 0.9.7 +DISTVERSION= 0.9.10 CATEGORIES= www devel MAINTAINER= yuri@FreeBSD.org 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 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 \ lib/cmake/httplib/httplibConfig.cmake \ lib/cmake/httplib/httplibConfigVersion.cmake \ lib/cmake/httplib/httplibTargets.cmake 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: install @cd ${WRKSRC}/test && ${SETENV} ${MAKE_ENV} ${GMAKE} CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS}" .include diff --git a/www/cpp-httplib/distinfo b/www/cpp-httplib/distinfo index ad816b931789..fa646ef47a8c 100644 --- a/www/cpp-httplib/distinfo +++ b/www/cpp-httplib/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1634884150 -SHA256 (yhirose-cpp-httplib-v0.9.7_GH0.tar.gz) = c8ef7d19842c63747eaa844d25732eb999250716bdf658b876a9c34b274af22c -SIZE (yhirose-cpp-httplib-v0.9.7_GH0.tar.gz) = 605134 +TIMESTAMP = 1640077218 +SHA256 (yhirose-cpp-httplib-v0.9.10_GH0.tar.gz) = 49dfa101ced75f8536ec7c865f872ab8fca157c8b49e29be5ef2d2aa11f716e8 +SIZE (yhirose-cpp-httplib-v0.9.10_GH0.tar.gz) = 605168 diff --git a/www/cpp-httplib/files/patch-test_Makefile b/www/cpp-httplib/files/patch-test_Makefile index 20daf919ce67..059062c90e6b 100644 --- a/www/cpp-httplib/files/patch-test_Makefile +++ b/www/cpp-httplib/files/patch-test_Makefile @@ -1,28 +1,28 @@ ---- test/Makefile.orig 2021-10-15 11:13:16 UTC +--- test/Makefile.orig 2021-12-12 00:26:22 UTC +++ test/Makefile @@ -1,5 +1,5 @@ - #CXX = clang++ --CXXFLAGS = -g -std=c++11 -I. -Wall -Wextra -Wtype-limits -Wconversion #-fsanitize=address -+CXXFLAGS += -g -std=c++11 -I. -Wall -Wextra -Wtype-limits -Wconversion #-fsanitize=address + CXX = clang++ +-CXXFLAGS = -g -std=c++11 -I. -Wall -Wextra -Wtype-limits -Wconversion # -fno-exceptions -DCPPHTTPLIB_NO_EXCEPTIONS -fsanitize=address ++CXXFLAGS += -g -std=c++11 -I. -Wall -Wextra -Wtype-limits -Wconversion # -fno-exceptions -DCPPHTTPLIB_NO_EXCEPTIONS -fsanitize=address - OPENSSL_DIR = /usr/local/opt/openssl@1.1 - OPENSSL_SUPPORT = -DCPPHTTPLIB_OPENSSL_SUPPORT -I$(OPENSSL_DIR)/include -L$(OPENSSL_DIR)/lib -lssl -lcrypto -@@ -26,15 +26,15 @@ proxy : test_proxy + PREFIX = /usr/local + #PREFIX = $(shell brew --prefix) +@@ -30,15 +30,15 @@ proxy : test_proxy ./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