Attachment #206993 for bug #240148

Lines 3-22 Link Here

(-)b/devel/spdlog/Makefile (-2 / +14 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	PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
		11	PATCHFILES+= b693d0cd915c.patch:-p1
		12
10	MAINTAINER= vanilla@FreeBSD.org	13	MAINTAINER= vanilla@FreeBSD.org
11	COMMENT= Super fast C++ logging library	14	COMMENT= Super fast C++ logging library
12		15
13	LICENSE= MIT	16	LICENSE= MIT
14	LICENSE_FILE= ${WRKSRC}/LICENSE	17	LICENSE_FILE= ${WRKSRC}/LICENSE
15		18
		19	LIB_DEPENDS= libfmt.so:devel/libfmt
		20
16	USES= cmake compiler:c++11-lib pathfix	21	USES= cmake compiler:c++11-lib pathfix
17		22
18	USE_GITHUB= yes	23	USE_GITHUB= yes
19	GH_ACCOUNT= gabime	24	GH_ACCOUNT= gabime
20	CMAKE_ARGS= -DSPDLOG_BUILD_BENCH=off	25	CMAKE_ON= SPDLOG_FMT_EXTERNAL
		26	CMAKE_OFF= SPDLOG_BUILD_BENCH
		27
		28	post-extract:
		29	${RM} -r ${WRKSRC}/include/spdlog/fmt/bundled
		30
		31	post-patch:
		32	${RM} ${WRKSRC}/include/spdlog/fmt/*.h.orig
21		33
22	.include <bsd.port.mk>	34	.include <bsd.port.mk>

Lines 1-3 Link Here

(-)b/devel/spdlog/distinfo (+2 lines)
1	TIMESTAMP = 1548833457	1	TIMESTAMP = 1548833457
2	SHA256 (gabime-spdlog-v1.3.1_GH0.tar.gz) = 160845266e94db1d4922ef755637f6901266731c4cb3b30b45bf41efa0e6ab70	2	SHA256 (gabime-spdlog-v1.3.1_GH0.tar.gz) = 160845266e94db1d4922ef755637f6901266731c4cb3b30b45bf41efa0e6ab70
3	SIZE (gabime-spdlog-v1.3.1_GH0.tar.gz) = 202634	3	SIZE (gabime-spdlog-v1.3.1_GH0.tar.gz) = 202634
		4	SHA256 (b693d0cd915c.patch) = a0dedc0dd6defe12dcd7f66a85da7ed0be6c0dad302515e8d832d904979be22e
		5	SIZE (b693d0cd915c.patch) = 750




- 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




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

Return to bug 240148

Added Link Here

(-)b/devel/spdlog/files/patch-system-fmt (+34 lines)
1	- Only allow system fmtlib usage
2	- Preserve header-only API with system fmtlib
3
4	--- include/spdlog/fmt/fmt.h.orig 2019-01-18 10:13:07 UTC
5	+++ include/spdlog/fmt/fmt.h
6	@@ -10,13 +10,13 @@
7	// By default spdlog include its own copy.
8	//
9
10	-#if !defined(SPDLOG_FMT_EXTERNAL)
11	#ifndef FMT_HEADER_ONLY
12	#define FMT_HEADER_ONLY
13	#endif
14	#ifndef FMT_USE_WINDOWS_H
15	#define FMT_USE_WINDOWS_H 0
16	#endif
17	+#if 0 //!defined(SPDLOG_FMT_EXTERNAL)
18	#include "bundled/core.h"
19	#include "bundled/format.h"
20	#else // external fmtlib
21	--- include/spdlog/fmt/ostr.h.orig 2019-01-18 10:13:07 UTC
22	+++ include/spdlog/fmt/ostr.h
23	@@ -7,10 +7,10 @@
24	//
25	// include bundled or external copy of fmtlib's ostream support
26	//
27	-#if !defined(SPDLOG_FMT_EXTERNAL)
28	#ifndef FMT_HEADER_ONLY
29	#define FMT_HEADER_ONLY
30	#endif
31	+#if 0 //!defined(SPDLOG_FMT_EXTERNAL)
32	#include "bundled/ostream.h"
33	#include "fmt.h"
34	#else

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