Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 11 Aug 2023 12:40:38 GMT
From:      Guido Falsi <madpilot@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: f2f163945ba3 - main - devel/yaml-cpp: Update to 0.8.0
Message-ID:  <202308111240.37BCecB9051554@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by madpilot:

URL: https://cgit.FreeBSD.org/ports/commit/?id=f2f163945ba3813dd6bba4f081abe9b7000174b6

commit f2f163945ba3813dd6bba4f081abe9b7000174b6
Author:     Guido Falsi <madpilot@FreeBSD.org>
AuthorDate: 2023-08-11 12:40:18 +0000
Commit:     Guido Falsi <madpilot@FreeBSD.org>
CommitDate: 2023-08-11 12:40:18 +0000

    devel/yaml-cpp: Update to 0.8.0
---
 devel/yaml-cpp/Makefile                            |  3 +--
 devel/yaml-cpp/distinfo                            |  6 ++---
 devel/yaml-cpp/files/patch-CMakeLists.txt          | 31 +++++++---------------
 .../yaml-cpp/files/patch-yaml-cpp-config.cmake.in  | 17 ------------
 devel/yaml-cpp/pkg-plist                           |  2 +-
 5 files changed, 15 insertions(+), 44 deletions(-)

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,6 +1,5 @@
 PORTNAME=	yaml-cpp
-PORTVERSION=	0.7.0
-DISTVERSIONPREFIX=	${PORTNAME}-
+PORTVERSION=	0.8.0
 CATEGORIES=	devel
 
 MAINTAINER=	madpilot@FreeBSD.org
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,6 +1,6 @@
---- 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}"
@@ -9,28 +9,17 @@
    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
@@ -41,5 +41,5 @@ 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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202308111240.37BCecB9051554>