Index: head/devel/spdlog/Makefile =================================================================== --- head/devel/spdlog/Makefile (revision 510678) +++ head/devel/spdlog/Makefile (revision 510679) @@ -1,22 +1,34 @@ # Created by: vanilla@ # $FreeBSD$ PORTNAME= spdlog PORTVERSION= 1.3.1 -PORTREVISION= 1 DISTVERSIONPREFIX= v +PORTREVISION= 2 CATEGORIES= devel +PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ +PATCHFILES+= b693d0cd915c.patch:-p1 + MAINTAINER= vanilla@FreeBSD.org COMMENT= Super fast C++ logging library LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE +LIB_DEPENDS= libfmt.so:devel/libfmt + USES= cmake compiler:c++11-lib pathfix USE_GITHUB= yes GH_ACCOUNT= gabime -CMAKE_ARGS= -DSPDLOG_BUILD_BENCH=off +CMAKE_ON= SPDLOG_FMT_EXTERNAL +CMAKE_OFF= SPDLOG_BUILD_BENCH + +post-extract: + ${RM} -r ${WRKSRC}/include/spdlog/fmt/bundled + +post-patch: + ${RM} ${WRKSRC}/include/spdlog/fmt/*.h.orig .include Index: head/devel/spdlog/distinfo =================================================================== --- head/devel/spdlog/distinfo (revision 510678) +++ head/devel/spdlog/distinfo (revision 510679) @@ -1,3 +1,5 @@ TIMESTAMP = 1548833457 SHA256 (gabime-spdlog-v1.3.1_GH0.tar.gz) = 160845266e94db1d4922ef755637f6901266731c4cb3b30b45bf41efa0e6ab70 SIZE (gabime-spdlog-v1.3.1_GH0.tar.gz) = 202634 +SHA256 (b693d0cd915c.patch) = a0dedc0dd6defe12dcd7f66a85da7ed0be6c0dad302515e8d832d904979be22e +SIZE (b693d0cd915c.patch) = 750 Index: head/devel/spdlog/files/patch-system-fmt =================================================================== --- head/devel/spdlog/files/patch-system-fmt (nonexistent) +++ head/devel/spdlog/files/patch-system-fmt (revision 510679) @@ -0,0 +1,34 @@ +- Only allow system fmtlib usage +- Preserve header-only API with system fmtlib + +--- include/spdlog/fmt/fmt.h.orig 2019-01-18 10:13:07 UTC ++++ include/spdlog/fmt/fmt.h +@@ -10,13 +10,13 @@ + // By default spdlog include its own copy. + // + +-#if !defined(SPDLOG_FMT_EXTERNAL) + #ifndef FMT_HEADER_ONLY + #define FMT_HEADER_ONLY + #endif + #ifndef FMT_USE_WINDOWS_H + #define FMT_USE_WINDOWS_H 0 + #endif ++#if 0 //!defined(SPDLOG_FMT_EXTERNAL) + #include "bundled/core.h" + #include "bundled/format.h" + #else // external fmtlib +--- include/spdlog/fmt/ostr.h.orig 2019-01-18 10:13:07 UTC ++++ include/spdlog/fmt/ostr.h +@@ -7,10 +7,10 @@ + // + // include bundled or external copy of fmtlib's ostream support + // +-#if !defined(SPDLOG_FMT_EXTERNAL) + #ifndef FMT_HEADER_ONLY + #define FMT_HEADER_ONLY + #endif ++#if 0 //!defined(SPDLOG_FMT_EXTERNAL) + #include "bundled/ostream.h" + #include "fmt.h" + #else Property changes on: head/devel/spdlog/files/patch-system-fmt ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/devel/spdlog/pkg-plist =================================================================== --- head/devel/spdlog/pkg-plist (revision 510678) +++ head/devel/spdlog/pkg-plist (revision 510679) @@ -1,56 +1,44 @@ include/spdlog/async.h include/spdlog/async_logger.h include/spdlog/common.h include/spdlog/details/async_logger_impl.h include/spdlog/details/circular_q.h include/spdlog/details/console_globals.h include/spdlog/details/file_helper.h include/spdlog/details/fmt_helper.h include/spdlog/details/log_msg.h include/spdlog/details/logger_impl.h include/spdlog/details/mpmc_blocking_q.h include/spdlog/details/null_mutex.h include/spdlog/details/os.h include/spdlog/details/pattern_formatter.h include/spdlog/details/periodic_worker.h 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 include/spdlog/logger.h include/spdlog/sinks/android_sink.h include/spdlog/sinks/ansicolor_sink.h include/spdlog/sinks/base_sink.h include/spdlog/sinks/basic_file_sink.h include/spdlog/sinks/daily_file_sink.h include/spdlog/sinks/dist_sink.h include/spdlog/sinks/msvc_sink.h include/spdlog/sinks/null_sink.h include/spdlog/sinks/ostream_sink.h include/spdlog/sinks/rotating_file_sink.h include/spdlog/sinks/sink.h include/spdlog/sinks/stdout_color_sinks.h include/spdlog/sinks/stdout_sinks.h include/spdlog/sinks/syslog_sink.h include/spdlog/sinks/wincolor_sink.h include/spdlog/spdlog.h include/spdlog/tweakme.h include/spdlog/version.h lib/cmake/spdlog/spdlogConfig.cmake lib/cmake/spdlog/spdlogConfigVersion.cmake lib/cmake/spdlog/spdlogTargets.cmake libdata/pkgconfig/spdlog.pc