From a2b36fdc4905f01a9f6719445208176497716a39 Mon Sep 17 00:00:00 2001
From: Marcel Telka <marcel@telka.sk>
Date: Sat, 16 Nov 2024 12:50:16 +0100
Subject: [PATCH] yaml-cpp: update to 0.8.0; keep yaml-cpp 0.7.0

---
 .../library/{yaml-cpp => yaml-cpp-7}/Makefile      |  2 +-
 .../manifests/sample-manifest.p5m                  |  0
 components/library/{yaml-cpp => yaml-cpp-7}/pkg5   |  0
 components/library/yaml-cpp-7/yaml-cpp.p5m         | 28 ++++++++++++++++++++++
 components/library/yaml-cpp/Makefile               | 17 +++++++------
 .../library/yaml-cpp/manifests/sample-manifest.p5m |  4 ++--
 components/library/yaml-cpp/pkg5                   |  2 +-
 components/library/yaml-cpp/yaml-cpp.p5m           |  4 ++--
 8 files changed, 42 insertions(+), 15 deletions(-)
 copy components/library/{yaml-cpp => yaml-cpp-7}/Makefile (98%)
 copy components/library/{yaml-cpp => yaml-cpp-7}/manifests/sample-manifest.p5m (100%)
 copy components/library/{yaml-cpp => yaml-cpp-7}/pkg5 (100%)
 create mode 100644 components/library/yaml-cpp-7/yaml-cpp.p5m

diff --git a/components/library/yaml-cpp/Makefile b/components/library/yaml-cpp-7/Makefile
similarity index 98%
copy from components/library/yaml-cpp/Makefile
copy to components/library/yaml-cpp-7/Makefile
index d7a6f78a99..bd726b603d 100644
--- a/components/library/yaml-cpp/Makefile
+++ b/components/library/yaml-cpp-7/Makefile
@@ -28,7 +28,7 @@ include ../../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		yaml-cpp
 COMPONENT_VERSION=	0.7.0
-COMPONENT_REVISION=	3
+COMPONENT_REVISION=	4
 COMPONENT_SUMMARY= A YAML parser and emitter in C++ matching the YAML 1.2 spec
 COMPONENT_PROJECT_URL=	https://github.com/jbeder/$(COMPONENT_SRC_NAME)
 COMPONENT_SRC=			$(COMPONENT_NAME)-$(COMPONENT_NAME)-$(COMPONENT_VERSION)
diff --git a/components/library/yaml-cpp/manifests/sample-manifest.p5m b/components/library/yaml-cpp-7/manifests/sample-manifest.p5m
similarity index 100%
copy from components/library/yaml-cpp/manifests/sample-manifest.p5m
copy to components/library/yaml-cpp-7/manifests/sample-manifest.p5m
diff --git a/components/library/yaml-cpp/pkg5 b/components/library/yaml-cpp-7/pkg5
similarity index 100%
copy from components/library/yaml-cpp/pkg5
copy to components/library/yaml-cpp-7/pkg5
diff --git a/components/library/yaml-cpp-7/yaml-cpp.p5m b/components/library/yaml-cpp-7/yaml-cpp.p5m
new file mode 100644
index 0000000000..a0dc7878a3
--- /dev/null
+++ b/components/library/yaml-cpp-7/yaml-cpp.p5m
@@ -0,0 +1,28 @@
+#
+# This file and its contents are supplied under the terms of the
+# Common Development and Distribution License ("CDDL"), version 1.0.
+# You may only use this file in accordance with the terms of version
+# 1.0 of the CDDL.
+#
+# A full copy of the text of the CDDL should have accompanied this
+# source.  A copy of the CDDL is also available via the Internet at
+# http://www.illumos.org/license/CDDL.
+#
+
+#
+# Copyright 2022 Daniel Chan
+#
+
+set name=pkg.fmri value=pkg:/$(COMPONENT_FMRI)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.human-version value=$(HUMAN_VERSION)
+set name=pkg.summary value="$(COMPONENT_SUMMARY)"
+set name=info.classification value="$(COMPONENT_CLASSIFICATION)"
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+
+license $(COMPONENT_LICENSE_FILE) license='$(COMPONENT_LICENSE)'
+
+file path=usr/lib/$(MACH64)/libyaml-cpp.so.$(HUMAN_VERSION)
+link path=usr/lib/$(MACH64)/libyaml-cpp.so.0.7 \
+    target=libyaml-cpp.so.$(HUMAN_VERSION)
diff --git a/components/library/yaml-cpp/Makefile b/components/library/yaml-cpp/Makefile
index d7a6f78a99..5ff62f49dd 100644
--- a/components/library/yaml-cpp/Makefile
+++ b/components/library/yaml-cpp/Makefile
@@ -27,15 +27,14 @@ USE_PARALLEL_BUILD = yes
 include ../../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		yaml-cpp
-COMPONENT_VERSION=	0.7.0
-COMPONENT_REVISION=	3
+COMPONENT_VERSION=		0.8.0
 COMPONENT_SUMMARY= A YAML parser and emitter in C++ matching the YAML 1.2 spec
 COMPONENT_PROJECT_URL=	https://github.com/jbeder/$(COMPONENT_SRC_NAME)
-COMPONENT_SRC=			$(COMPONENT_NAME)-$(COMPONENT_NAME)-$(COMPONENT_VERSION)
-COMPONENT_ARCHIVE=      $(COMPONENT_NAME)-$(COMPONENT_VERSION).tar.gz
-COMPONENT_ARCHIVE_HASH=	sha256:43e6a9fcb146ad871515f0d0873947e5d497a1c9c60c58cb102a97b47208b7c3
-COMPONENT_ARCHIVE_URL=  $(COMPONENT_PROJECT_URL)/archive/refs/tags/$(COMPONENT_ARCHIVE)
-COMPONENT_FMRI=	library/yaml-cpp
+COMPONENT_SRC=			$(COMPONENT_NAME)-$(COMPONENT_VERSION)
+COMPONENT_ARCHIVE=		$(COMPONENT_SRC).tar.gz
+COMPONENT_ARCHIVE_HASH=		sha256:fbe74bbdcee21d656715688706da3c8becfd946d92cd44705cc6098bb23b3a16
+COMPONENT_ARCHIVE_URL=		$(COMPONENT_PROJECT_URL)/archive/refs/tags/$(COMPONENT_VERSION).tar.gz
+COMPONENT_FMRI=			library/yaml-cpp-8
 COMPONENT_CLASSIFICATION= System/Libraries
 COMPONENT_LICENSE= 	MIT
 COMPONENT_LICENSE_FILE=	LICENSE
@@ -43,8 +42,8 @@ COMPONENT_LICENSE_FILE=	LICENSE
 include $(WS_MAKE_RULES)/common.mk
 
 CMAKE_OPTIONS += -DCMAKE_BUILD_TYPE=Release
-CMAKE_OPTIONS += -DCMAKE_INSTALL_DATADIR=lib/amd64
-CMAKE_OPTIONS += -DYAML_BUILD_SHARED_LIBS=ON
+CMAKE_OPTIONS += -DBUILD_SHARED_LIBS=ON
+CMAKE_OPTIONS += -DYAML_CPP_BUILD_TESTS=ON
 # Do not install GoogleTest
 CMAKE_OPTIONS += -DINSTALL_GTEST=OFF
 
diff --git a/components/library/yaml-cpp/manifests/sample-manifest.p5m b/components/library/yaml-cpp/manifests/sample-manifest.p5m
index ac0a619f24..4157428e64 100644
--- a/components/library/yaml-cpp/manifests/sample-manifest.p5m
+++ b/components/library/yaml-cpp/manifests/sample-manifest.p5m
@@ -64,8 +64,8 @@ file path=usr/lib/$(MACH64)/cmake/yaml-cpp/yaml-cpp-config-version.cmake
 file path=usr/lib/$(MACH64)/cmake/yaml-cpp/yaml-cpp-config.cmake
 file path=usr/lib/$(MACH64)/cmake/yaml-cpp/yaml-cpp-targets-release.cmake
 file path=usr/lib/$(MACH64)/cmake/yaml-cpp/yaml-cpp-targets.cmake
-link path=usr/lib/$(MACH64)/libyaml-cpp.so target=libyaml-cpp.so.0.7
+link path=usr/lib/$(MACH64)/libyaml-cpp.so target=libyaml-cpp.so.0.8
 file path=usr/lib/$(MACH64)/libyaml-cpp.so.$(HUMAN_VERSION)
-link path=usr/lib/$(MACH64)/libyaml-cpp.so.0.7 \
+link path=usr/lib/$(MACH64)/libyaml-cpp.so.0.8 \
     target=libyaml-cpp.so.$(HUMAN_VERSION)
 file path=usr/lib/$(MACH64)/pkgconfig/yaml-cpp.pc
diff --git a/components/library/yaml-cpp/pkg5 b/components/library/yaml-cpp/pkg5
index a084062ab2..117944d3d5 100644
--- a/components/library/yaml-cpp/pkg5
+++ b/components/library/yaml-cpp/pkg5
@@ -5,7 +5,7 @@
         "system/library/gcc-13-runtime"
     ],
     "fmris": [
-        "library/yaml-cpp"
+        "library/yaml-cpp-8"
     ],
     "name": "yaml-cpp"
 }
diff --git a/components/library/yaml-cpp/yaml-cpp.p5m b/components/library/yaml-cpp/yaml-cpp.p5m
index eaaaafb891..34ddc5565d 100644
--- a/components/library/yaml-cpp/yaml-cpp.p5m
+++ b/components/library/yaml-cpp/yaml-cpp.p5m
@@ -64,8 +64,8 @@ file path=usr/lib/$(MACH64)/cmake/yaml-cpp/yaml-cpp-config-version.cmake
 file path=usr/lib/$(MACH64)/cmake/yaml-cpp/yaml-cpp-config.cmake
 file path=usr/lib/$(MACH64)/cmake/yaml-cpp/yaml-cpp-targets-release.cmake
 file path=usr/lib/$(MACH64)/cmake/yaml-cpp/yaml-cpp-targets.cmake
-link path=usr/lib/$(MACH64)/libyaml-cpp.so target=libyaml-cpp.so.0.7
+link path=usr/lib/$(MACH64)/libyaml-cpp.so target=libyaml-cpp.so.0.8
 file path=usr/lib/$(MACH64)/libyaml-cpp.so.$(HUMAN_VERSION)
-link path=usr/lib/$(MACH64)/libyaml-cpp.so.0.7 \
+link path=usr/lib/$(MACH64)/libyaml-cpp.so.0.8 \
     target=libyaml-cpp.so.$(HUMAN_VERSION)
 file path=usr/lib/$(MACH64)/pkgconfig/yaml-cpp.pc
-- 
2.11.4.GIT