diff --git a/devel/yaml-cpp/Makefile b/devel/yaml-cpp/Makefile index 81b005d4fad9..2cbf48072602 100644 --- a/devel/yaml-cpp/Makefile +++ b/devel/yaml-cpp/Makefile @@ -1,26 +1,25 @@ PORTNAME= yaml-cpp -PORTVERSION= 0.7.0 -DISTVERSIONPREFIX= ${PORTNAME}- +PORTVERSION= 0.8.0 CATEGORIES= devel MAINTAINER= madpilot@FreeBSD.org COMMENT= YAML parser and emitter in C++ matching the YAML 1.2 spec WWW= https://github.com/jbeder/yaml-cpp LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE USES= cmake compiler:c++11-lang USE_LDCONFIG= yes CMAKE_ARGS+= -DYAML_BUILD_SHARED_LIBS:BOOL=ON \ -DYAML_CPP_BUILD_TOOLS=OFF \ -DYAML_CPP_BUILD_TESTS=OFF USE_GITHUB= yes GH_ACCOUNT= jbeder post-patch: @${REINPLACE_CMD} "s|%%PREFIX%%|${PREFIX}|" \ ${WRKSRC}/yaml-cpp-config.cmake.in .include diff --git a/devel/yaml-cpp/distinfo b/devel/yaml-cpp/distinfo index aa7b71474b67..9e42f9c68d36 100644 --- a/devel/yaml-cpp/distinfo +++ b/devel/yaml-cpp/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1625933602 -SHA256 (jbeder-yaml-cpp-yaml-cpp-0.7.0_GH0.tar.gz) = 43e6a9fcb146ad871515f0d0873947e5d497a1c9c60c58cb102a97b47208b7c3 -SIZE (jbeder-yaml-cpp-yaml-cpp-0.7.0_GH0.tar.gz) = 1033237 +TIMESTAMP = 1691697492 +SHA256 (jbeder-yaml-cpp-0.8.0_GH0.tar.gz) = fbe74bbdcee21d656715688706da3c8becfd946d92cd44705cc6098bb23b3a16 +SIZE (jbeder-yaml-cpp-0.8.0_GH0.tar.gz) = 1017151 diff --git a/devel/yaml-cpp/files/patch-CMakeLists.txt b/devel/yaml-cpp/files/patch-CMakeLists.txt index 8c8c8e21b516..a111495208fb 100644 --- a/devel/yaml-cpp/files/patch-CMakeLists.txt +++ b/devel/yaml-cpp/files/patch-CMakeLists.txt @@ -1,36 +1,25 @@ ---- CMakeLists.txt.orig 2021-07-10 15:53:22 UTC +--- CMakeLists.txt.orig 2023-08-10 19:27:56 UTC +++ CMakeLists.txt -@@ -123,14 +123,14 @@ endif() +@@ -139,11 +139,11 @@ set_target_properties(yaml-cpp PROPERTIES set_target_properties(yaml-cpp PROPERTIES VERSION "${PROJECT_VERSION}" - SOVERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}" + SOVERSION "${PROJECT_VERSION_MAJOR}" PROJECT_LABEL "yaml-cpp ${yaml-cpp-label-postfix}" DEBUG_POSTFIX "${CMAKE_DEBUG_POSTFIX}") +-set(CONFIG_EXPORT_DIR "${CMAKE_INSTALL_LIBDIR}/cmake/yaml-cpp") ++set(CONFIG_EXPORT_DIR "lib/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 "lib/cmake/yaml-cpp") - - write_basic_package_version_file( - "${PROJECT_BINARY_DIR}/yaml-cpp-config-version.cmake" -@@ -148,13 +148,13 @@ if (YAML_CPP_INSTALL) - DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} - FILES_MATCHING PATTERN "*.h") - install(EXPORT yaml-cpp-targets -- DESTINATION "${CMAKE_INSTALL_DATADIR}/cmake/yaml-cpp") -+ DESTINATION "lib/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 "lib/cmake/yaml-cpp") +@@ -175,7 +175,7 @@ if (YAML_CPP_INSTALL) + "${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) + DESTINATION libdata/pkgconfig) endif() + unset(CONFIG_EXPORT_DIR) - if(YAML_CPP_BUILD_TESTS) diff --git a/devel/yaml-cpp/files/patch-yaml-cpp-config.cmake.in b/devel/yaml-cpp/files/patch-yaml-cpp-config.cmake.in deleted file mode 100644 index 4b85175be382..000000000000 --- a/devel/yaml-cpp/files/patch-yaml-cpp-config.cmake.in +++ /dev/null @@ -1,17 +0,0 @@ ---- yaml-cpp-config.cmake.in.orig 2021-07-10 15:53:22 UTC -+++ yaml-cpp-config.cmake.in -@@ -3,12 +3,5 @@ - # 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@") -- --# Our library dependencies (contains definitions for IMPORTED targets) --include("${YAML_CPP_CMAKE_DIR}/yaml-cpp-targets.cmake") -- --# These are IMPORTED targets created by yaml-cpp-targets.cmake --set(YAML_CPP_LIBRARIES "@EXPORT_TARGETS@") -+set(YAML_CPP_INCLUDE_DIR "%%PREFIX%%/include") -+set(YAML_CPP_LIBRARIES "yaml-cpp") diff --git a/devel/yaml-cpp/pkg-plist b/devel/yaml-cpp/pkg-plist index 6e556b1fa809..b925af95317f 100644 --- a/devel/yaml-cpp/pkg-plist +++ b/devel/yaml-cpp/pkg-plist @@ -1,45 +1,45 @@ include/yaml-cpp/anchor.h include/yaml-cpp/binary.h 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 include/yaml-cpp/emitterdef.h include/yaml-cpp/emittermanip.h include/yaml-cpp/emitterstyle.h include/yaml-cpp/eventhandler.h include/yaml-cpp/exceptions.h include/yaml-cpp/mark.h include/yaml-cpp/node/convert.h include/yaml-cpp/node/detail/impl.h include/yaml-cpp/node/detail/iterator.h include/yaml-cpp/node/detail/iterator_fwd.h include/yaml-cpp/node/detail/memory.h include/yaml-cpp/node/detail/node.h include/yaml-cpp/node/detail/node_data.h include/yaml-cpp/node/detail/node_iterator.h include/yaml-cpp/node/detail/node_ref.h include/yaml-cpp/node/emit.h include/yaml-cpp/node/impl.h include/yaml-cpp/node/iterator.h 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 include/yaml-cpp/stlemitter.h include/yaml-cpp/traits.h include/yaml-cpp/yaml.h lib/cmake/yaml-cpp/yaml-cpp-config-version.cmake lib/cmake/yaml-cpp/yaml-cpp-config.cmake lib/cmake/yaml-cpp/yaml-cpp-targets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/yaml-cpp/yaml-cpp-targets.cmake lib/libyaml-cpp.so lib/libyaml-cpp.so.0 -lib/libyaml-cpp.so.0.7.0 +lib/libyaml-cpp.so.0.8.0 libdata/pkgconfig/yaml-cpp.pc