Attachment #206981 for bug #240148

Lines 21-26 RUN_DEPENDS= catch>=0:devel/catch \ Link Here

(-)b/databases/tiledb/Makefile (+1 lines)
21		21
22	USES= cmake compiler:c++11-lang ssl	22	USES= cmake compiler:c++11-lang ssl
23		23
		24	CXXFLAGS+= -DFMT_HEADER_ONLY
24	CMAKE_ARGS= -DCATCH_INCLUDE_DIR=${LOCALBASE}/include/catch2	25	CMAKE_ARGS= -DCATCH_INCLUDE_DIR=${LOCALBASE}/include/catch2
25	CMAKE_OFF= TILEDB_CMAKE_IDE TILEDB_FORCE_ALL_DEPS TILEDB_HDFS TILEDB_S3 TILEDB_SUPERBUILD TILEDB_TESTS_AWS_S3_CONFIG TILEDB_VERBOSE	26	CMAKE_OFF= TILEDB_CMAKE_IDE TILEDB_FORCE_ALL_DEPS TILEDB_HDFS TILEDB_S3 TILEDB_SUPERBUILD TILEDB_TESTS_AWS_S3_CONFIG TILEDB_VERBOSE
26	CMAKE_ON= TILEDB_CPP_API TILEDB_STATIC TILEDB_STATS TILEDB_TBB TILEDB_TBB_SHARED TILEDB_TESTS TILEDB_TOOLS TILEDB_WERROR	27	CMAKE_ON= TILEDB_CPP_API TILEDB_STATIC TILEDB_STATS TILEDB_TBB TILEDB_TBB_SHARED TILEDB_TESTS TILEDB_TOOLS TILEDB_WERROR

Lines 3-10 Link Here

(-)b/devel/spdlog/Makefile (-2 / +13 lines)
3		3
4	PORTNAME= spdlog	4	PORTNAME= spdlog
5	PORTVERSION= 1.3.1	5	PORTVERSION= 1.3.1
6	PORTREVISION= 1
7	DISTVERSIONPREFIX= v	6	DISTVERSIONPREFIX= v
		7	PORTREVISION= 2
8	CATEGORIES= devel	8	CATEGORIES= devel
9		9
10	MAINTAINER= vanilla@FreeBSD.org	10	MAINTAINER= vanilla@FreeBSD.org
Lines 13-22 COMMENT= Super fast C++ logging library Link Here
13	LICENSE= MIT	13	LICENSE= MIT
14	LICENSE_FILE= ${WRKSRC}/LICENSE	14	LICENSE_FILE= ${WRKSRC}/LICENSE
15		15
		16	LIB_DEPENDS= libfmt.so:devel/libfmt
		17
16	USES= cmake compiler:c++11-lib pathfix	18	USES= cmake compiler:c++11-lib pathfix
17		19
18	USE_GITHUB= yes	20	USE_GITHUB= yes
19	GH_ACCOUNT= gabime	21	GH_ACCOUNT= gabime
20	CMAKE_ARGS= -DSPDLOG_BUILD_BENCH=off	22	CMAKE_ON= SPDLOG_FMT_EXTERNAL
		23	CMAKE_OFF= SPDLOG_BUILD_BENCH
		24
		25	post-extract:
		26	${RM} -r ${WRKSRC}/include/spdlog/fmt/bundled
		27
		28	post-patch:
		29	${RM} ${WRKSRC}/include/spdlog/fmt/bin_to_hex.h.orig
		30	${REINPLACE_CMD} -i '' -e 's,!defined(SPDLOG_FMT_EXTERNAL),0 //&,' \
		31	${WRKSRC}/include/spdlog/fmt/*.h
21		32
22	.include <bsd.port.mk>	33	.include <bsd.port.mk>




https://github.com/gabime/spdlog/issues/1195

--- include/spdlog/fmt/bin_to_hex.h.orig	2019-01-18 10:13:07 UTC
+++ include/spdlog/fmt/bin_to_hex.h
@@ -117,7 +117,7 @@ struct formatter<spdlog::details::bytes_range<T>>
 
         std::size_t pos = 0;
         std::size_t column = line_size;
-        auto inserter = ctx.begin();
+        auto inserter = ctx.out();
 
         for (auto &item : the_range)
         {




include/spdlog/details/registry.h
include/spdlog/details/thread_pool.h
include/spdlog/fmt/bin_to_hex.h
include/spdlog/fmt/bundled/LICENSE.rst
include/spdlog/fmt/bundled/chrono.h
include/spdlog/fmt/bundled/core.h
include/spdlog/fmt/bundled/color.h
include/spdlog/fmt/bundled/format-inl.h
include/spdlog/fmt/bundled/format.h
include/spdlog/fmt/bundled/locale.h
include/spdlog/fmt/bundled/ostream.h
include/spdlog/fmt/bundled/posix.h
include/spdlog/fmt/bundled/printf.h
include/spdlog/fmt/bundled/ranges.h
include/spdlog/fmt/bundled/time.h
include/spdlog/fmt/fmt.h
include/spdlog/fmt/ostr.h
include/spdlog/formatter.h

Lines 37-42 SHEBANG_FILES= src/cgi/cgiserv.py.in \ Link Here

(-)b/sysutils/lizardfs/Makefile (+1 lines)
37	USE_GITHUB= yes	37	USE_GITHUB= yes
38	USE_LDCONFIG= yes	38	USE_LDCONFIG= yes
39		39
		40	CXXFLAGS+= -DFMT_HEADER_ONLY
40	CMAKE_BUILD_TYPE= Release	41	CMAKE_BUILD_TYPE= Release
41	CMAKE_ARGS= -DMAN_SUBDIR=man \	42	CMAKE_ARGS= -DMAN_SUBDIR=man \
42	-DENABLE_WERROR=OFF \	43	-DENABLE_WERROR=OFF \

Return to bug 240148

Added Link Here

(-)b/devel/spdlog/files/patch-include_spdlog_fmt_bin__to__hex.h (+13 lines)
1	https://github.com/gabime/spdlog/issues/1195
2
3	--- include/spdlog/fmt/bin_to_hex.h.orig 2019-01-18 10:13:07 UTC
4	+++ include/spdlog/fmt/bin_to_hex.h
5	@@ -117,7 +117,7 @@ struct formatter<spdlog::details::bytes_range<T>>
6
7	std::size_t pos = 0;
8	std::size_t column = line_size;
9	- auto inserter = ctx.begin();
10	+ auto inserter = ctx.out();
11
12	for (auto &item : the_range)
13	{

Lines 16-33 include/spdlog/details/periodic_worker.h Link Here

(-)b/devel/spdlog/pkg-plist (-12 lines)
16	include/spdlog/details/registry.h	16	include/spdlog/details/registry.h
17	include/spdlog/details/thread_pool.h	17	include/spdlog/details/thread_pool.h
18	include/spdlog/fmt/bin_to_hex.h	18	include/spdlog/fmt/bin_to_hex.h
19	include/spdlog/fmt/bundled/LICENSE.rst
20	include/spdlog/fmt/bundled/chrono.h
21	include/spdlog/fmt/bundled/core.h
22	include/spdlog/fmt/bundled/color.h
23	include/spdlog/fmt/bundled/format-inl.h
24	include/spdlog/fmt/bundled/format.h
25	include/spdlog/fmt/bundled/locale.h
26	include/spdlog/fmt/bundled/ostream.h
27	include/spdlog/fmt/bundled/posix.h
28	include/spdlog/fmt/bundled/printf.h
29	include/spdlog/fmt/bundled/ranges.h
30	include/spdlog/fmt/bundled/time.h
31	include/spdlog/fmt/fmt.h	19	include/spdlog/fmt/fmt.h
32	include/spdlog/fmt/ostr.h	20	include/spdlog/fmt/ostr.h
33	include/spdlog/formatter.h	21	include/spdlog/formatter.h