CVS commit: pkgsrc/devel/spdlog

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Mon Oct 10 12:46:32 UTC 2022

Modified Files:
        pkgsrc/devel/spdlog: Makefile PLIST

Log Message:
spdlog: use external fmtlib to avoid conflict between fmtlib v8 and v9; remove dylb madness; bump revision


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 pkgsrc/devel/spdlog/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/devel/spdlog/PLIST

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/spdlog/Makefile
diff -u pkgsrc/devel/spdlog/Makefile:1.10 pkgsrc/devel/spdlog/Makefile:1.11
--- pkgsrc/devel/spdlog/Makefile:1.10   Sun Apr 24 19:53:22 2022
+++ pkgsrc/devel/spdlog/Makefile        Mon Oct 10 12:46:32 2022
@@ -1,40 +1,26 @@
-# $NetBSD: Makefile,v 1.10 2022/04/24 19:53:22 tnn Exp $
+# $NetBSD: Makefile,v 1.11 2022/10/10 12:46:32 adam Exp $
 
-DISTNAME=              spdlog-1.10.0
-CATEGORIES=            devel
-MASTER_SITES=          ${MASTER_SITE_GITHUB:=gabime/}
-GITHUB_PROJECT=                spdlog
-GITHUB_TAG=            v${PKGVERSION_NOREV}
-
-MAINTAINER=            ryoon%NetBSD.org@localhost
-HOMEPAGE=              https://github.com/gabime/spdlog
-COMMENT=               Fast C++ logging library
-LICENSE=               mit
-
-USE_LANGUAGES=         c c++
-USE_TOOLS+=            pkg-config
-USE_CMAKE=             yes
-CMAKE_ARGS+=           -DSPDLOG_BUILD_SHARED=ON
+DISTNAME=      spdlog-1.10.0
+PKGREVISION=   1
+CATEGORIES=    devel
+MASTER_SITES=  ${MASTER_SITE_GITHUB:=gabime/}
+GITHUB_TAG=    v${PKGVERSION_NOREV}
+
+MAINTAINER=    ryoon%NetBSD.org@localhost
+HOMEPAGE=      https://github.com/gabime/spdlog
+COMMENT=       Fast C++ logging library
+LICENSE=       mit
+
+USE_CMAKE=     yes
+USE_LANGUAGES= c c++11
+USE_TOOLS+=    pkg-config
+CMAKE_ARGS+=   -DSPDLOG_BUILD_SHARED=ON
+CMAKE_ARGS+=   -DSPDLOG_FMT_EXTERNAL=ON
 
 PKGCONFIG_OVERRIDE+=   cmake/spdlog.pc.in
 
 LDFLAGS.SunOS+=                -lsocket
 
-# This doesn't work due to mk/plist bug. See tech-pkg@
-#PLIST_VARS+=          dylib notdylib
-#PLIST.dylib.Darwin=   yes
-#PLIST.dylib.Darwin=
-#PLIST.nodylib.Darwin=
-#PLIST.notdylib.*=     yes
-
-OPSYSVARS+=            SOEXT DYLIB NOTDYLIB
-PLIST_SUBST+=          SOEXT=${SOEXT} PLIST.dylib=${DYLIB} PLIST.notdylib=${NOTDYLIB}
-SOEXT.Darwin=          dylib
-SOEXT.*=               so
-DYLIB.Darwin=
-DYLIB.*=               @comment
-NOTDYLIB.Darwin=       @comment
-NOTDYLIB.*=
-
 .include "../../lang/python/tool.mk"
+.include "../../textproc/fmtlib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/devel/spdlog/PLIST
diff -u pkgsrc/devel/spdlog/PLIST:1.7 pkgsrc/devel/spdlog/PLIST:1.8
--- pkgsrc/devel/spdlog/PLIST:1.7       Wed Apr 20 20:42:45 2022
+++ pkgsrc/devel/spdlog/PLIST   Mon Oct 10 12:46:32 2022
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2022/04/20 20:42:45 wiz Exp $
+@comment $NetBSD: PLIST,v 1.8 2022/10/10 12:46:32 adam Exp $
 include/spdlog/async.h
 include/spdlog/async_logger-inl.h
 include/spdlog/async_logger.h
@@ -36,20 +36,6 @@ include/spdlog/details/udp_client-window
 include/spdlog/details/udp_client.h
 include/spdlog/details/windows_include.h
 include/spdlog/fmt/bin_to_hex.h
-include/spdlog/fmt/bundled/args.h
-include/spdlog/fmt/bundled/chrono.h
-include/spdlog/fmt/bundled/color.h
-include/spdlog/fmt/bundled/compile.h
-include/spdlog/fmt/bundled/core.h
-include/spdlog/fmt/bundled/fmt.license.rst
-include/spdlog/fmt/bundled/format-inl.h
-include/spdlog/fmt/bundled/format.h
-include/spdlog/fmt/bundled/locale.h
-include/spdlog/fmt/bundled/os.h
-include/spdlog/fmt/bundled/ostream.h
-include/spdlog/fmt/bundled/printf.h
-include/spdlog/fmt/bundled/ranges.h
-include/spdlog/fmt/bundled/xchar.h
 include/spdlog/fmt/chrono.h
 include/spdlog/fmt/compile.h
 include/spdlog/fmt/fmt.h
@@ -103,9 +89,7 @@ lib/cmake/spdlog/spdlogConfig.cmake
 lib/cmake/spdlog/spdlogConfigTargets-release.cmake
 lib/cmake/spdlog/spdlogConfigTargets.cmake
 lib/cmake/spdlog/spdlogConfigVersion.cmake
-lib/libspdlog.${SOEXT}
-${PLIST.dylib}lib/libspdlog.1.${SOEXT}
-${PLIST.dylib}lib/libspdlog.${PKGVERSION}.${SOEXT}
-${PLIST.notdylib}lib/libspdlog.${SOEXT}.1
-${PLIST.notdylib}lib/libspdlog.${SOEXT}.${PKGVERSION}
+lib/libspdlog.so
+lib/libspdlog.so.${PKGVERSION}
+lib/libspdlog.so.1
 lib/pkgconfig/spdlog.pc