Re: UPDATE: yaml-cpp 0.7.0

On Tue, May 30, 2023 at 10:14:43AM -0400, Brad Smith wrote:
> Here is an update to yaml-cpp 0.7.0.
>
>
> - CMake improvements
> - Adopts many modern C++ syntaxes
> - Bug fixes

Looking through some of the newer commits I noticed two that were
pretty important. So I rolled them in.


Index: Makefile
===================================================================
RCS file: /home/cvs/ports/devel/yaml-cpp/Makefile,v
retrieving revision 1.19
diff -u -p -u -p -r1.19 Makefile
--- Makefile 11 Mar 2022 18:53:39 -0000 1.19
+++ Makefile 29 May 2023 18:22:35 -0000
@@ -1,12 +1,12 @@
COMMENT = YAML parser and emitter in C++

-V= 0.6.3
+V= 0.7.0
GH_ACCOUNT= jbeder
GH_PROJECT= yaml-cpp
GH_TAGNAME= yaml-cpp-$V
DISTNAME = yaml-cpp-$V

-SHARED_LIBS = yaml-cpp 3.0 # 0.5
+SHARED_LIBS = yaml-cpp 4.0 # 0.5

CATEGORIES = devel

Index: distinfo
===================================================================
RCS file: /home/cvs/ports/devel/yaml-cpp/distinfo,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 distinfo
--- distinfo 14 Dec 2020 06:26:27 -0000 1.5
+++ distinfo 29 May 2023 18:14:30 -0000
@@ -1,2 +1,2 @@
-SHA256 (yaml-cpp-0.6.3.tar.gz) = d+obkLNxiqDDJCB8spQY9bztI1TC5IOpUj2Yw0YK8e0=
-SIZE (yaml-cpp-0.6.3.tar.gz) = 1398768
+SHA256 (yaml-cpp-0.7.0.tar.gz) = Q+ap/LFGrYcVFfDQhzlH5dSXocnGDFjLECqXtHIIt8M=
+SIZE (yaml-cpp-0.7.0.tar.gz) = 1033237
Index: patches/patch-CMakeLists_txt
===================================================================
RCS file: patches/patch-CMakeLists_txt
diff -N patches/patch-CMakeLists_txt
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-CMakeLists_txt 31 May 2023 01:52:33 -0000
@@ -0,0 +1,67 @@
+- Fix CMake export files (#1077)
+ 4aad2b1666a4742743b04e765a34742512915674
+- Install pkgconfig and cmake files into arch-dependent locations (#1055)
+ 255bf1f9bccfb8cac5fc9ea70fe528423f2e58b9
+
+Index: CMakeLists.txt
+--- CMakeLists.txt.orig
++++ CMakeLists.txt
+@@ -127,10 +127,14 @@ set_target_properties(yaml-cpp PROPERTIES
+ PROJECT_LABEL "yaml-cpp ${yaml-cpp-label-postfix}"
+ DEBUG_POSTFIX "${CMAKE_DEBUG_POSTFIX}")
+
++set(CONFIG_EXPORT_DIR "${CMAKE_INSTALL_LIBDIR}/cmake/yaml-cpp")
++set(EXPORT_TARGETS yaml-cpp)
+ configure_package_config_file(
+ "${PROJECT_SOURCE_DIR}/yaml-cpp-config.cmake.in"
+ "${PROJECT_BINARY_DIR}/yaml-cpp-config.cmake"
+- INSTALL_DESTINATION "${CMAKE_INSTALL_DATADIR}/cmake/yaml-cpp")
++ INSTALL_DESTINATION "${CONFIG_EXPORT_DIR}"
++ PATH_VARS CMAKE_INSTALL_INCLUDEDIR CONFIG_EXPORT_DIR)
++unset(EXPORT_TARGETS)
+
+ write_basic_package_version_file(
+ "${PROJECT_BINARY_DIR}/yaml-cpp-config-version.cmake"
+@@ -139,30 +143,31 @@ write_basic_package_version_file(
+ configure_file(yaml-cpp.pc.in yaml-cpp.pc @ONLY)
+
+ if (YAML_CPP_INSTALL)
+- install(TARGETS yaml-cpp
++ install(TARGETS yaml-cpp
+ EXPORT yaml-cpp-targets
+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
+- install(DIRECTORY ${PROJECT_SOURCE_DIR}/include/
++ install(DIRECTORY ${PROJECT_SOURCE_DIR}/include/
+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
+- FILES_MATCHING PATTERN "*.h")
++ FILES_MATCHING PATTERN "*.h")
+ install(EXPORT yaml-cpp-targets
+- DESTINATION "${CMAKE_INSTALL_DATADIR}/cmake/yaml-cpp")
+- install(FILES
+- "${PROJECT_BINARY_DIR}/yaml-cpp-config.cmake"
+- "${PROJECT_BINARY_DIR}/yaml-cpp-config-version.cmake"
+- DESTINATION "${CMAKE_INSTALL_DATADIR}/cmake/yaml-cpp")
++ DESTINATION "${CONFIG_EXPORT_DIR}")
++ install(FILES
++ "${PROJECT_BINARY_DIR}/yaml-cpp-config.cmake"
++ "${PROJECT_BINARY_DIR}/yaml-cpp-config-version.cmake"
++ DESTINATION "${CONFIG_EXPORT_DIR}")
+ install(FILES "${PROJECT_BINARY_DIR}/yaml-cpp.pc"
+- DESTINATION ${CMAKE_INSTALL_DATADIR}/pkgconfig)
++ DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
+ endif()
++unset(CONFIG_EXPORT_DIR)
+
+ if(YAML_CPP_BUILD_TESTS)
+- add_subdirectory(test)
++ add_subdirectory(test)
+ endif()
+
+ if(YAML_CPP_BUILD_TOOLS)
+- add_subdirectory(util)
++ add_subdirectory(util)
+ endif()
+
+ if (YAML_CPP_CLANG_FORMAT_EXE)
Index: patches/patch-yaml-cpp-config_cmake_in
===================================================================
RCS file: patches/patch-yaml-cpp-config_cmake_in
diff -N patches/patch-yaml-cpp-config_cmake_in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-yaml-cpp-config_cmake_in 31 May 2023 01:52:39 -0000
@@ -0,0 +1,25 @@
+- Fix CMake export files (#1077)
+ 4aad2b1666a4742743b04e765a34742512915674
+
+Index: yaml-cpp-config.cmake.in
+--- yaml-cpp-config.cmake.in.orig
++++ yaml-cpp-config.cmake.in
+@@ -3,12 +3,14 @@
+ # YAML_CPP_INCLUDE_DIR - include directory
+ # YAML_CPP_LIBRARIES - libraries to link against
+
+-# Compute paths
+-get_filename_component(YAML_CPP_CMAKE_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
+-set(YAML_CPP_INCLUDE_DIR "@CONFIG_INCLUDE_DIRS@")
++@PACKAGE_INIT@
+
++set_and_check(YAML_CPP_INCLUDE_DIR "@PACKAGE_CMAKE_INSTALL_INCLUDEDIR@")
++
+ # Our library dependencies (contains definitions for IMPORTED targets)
+-include("${YAML_CPP_CMAKE_DIR}/yaml-cpp-targets.cmake")
++include(@PACKAGE_CONFIG_EXPORT_DIR@/yaml-cpp-targets.cmake)
+
+ # These are IMPORTED targets created by yaml-cpp-targets.cmake
+ set(YAML_CPP_LIBRARIES "@EXPORT_TARGETS@")
++
++check_required_components(@EXPORT_TARGETS@)
Index: pkg/PLIST
===================================================================
RCS file: /home/cvs/ports/devel/yaml-cpp/pkg/PLIST,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 PLIST
--- pkg/PLIST 11 Mar 2022 18:53:39 -0000 1.6
+++ pkg/PLIST 31 May 2023 01:54:52 -0000
@@ -4,6 +4,7 @@ include/yaml-cpp/binary.h
include/yaml-cpp/contrib/
include/yaml-cpp/contrib/anchordict.h
include/yaml-cpp/contrib/graphbuilder.h
+include/yaml-cpp/depthguard.h
include/yaml-cpp/dll.h
include/yaml-cpp/emitfromevents.h
include/yaml-cpp/emitter.h
@@ -16,7 +17,6 @@ include/yaml-cpp/mark.h
include/yaml-cpp/node/
include/yaml-cpp/node/convert.h
include/yaml-cpp/node/detail/
-include/yaml-cpp/node/detail/bool_type.h
include/yaml-cpp/node/detail/impl.h
include/yaml-cpp/node/detail/iterator.h
include/yaml-cpp/node/detail/iterator_fwd.h
@@ -32,6 +32,7 @@ include/yaml-cpp/node/node.h
include/yaml-cpp/node/parse.h
include/yaml-cpp/node/ptr.h
include/yaml-cpp/node/type.h
+include/yaml-cpp/noexcept.h
include/yaml-cpp/null.h
include/yaml-cpp/ostream_wrapper.h
include/yaml-cpp/parser.h