All consumers build with it, but qt-creator and opencolorio need their
custom .cmake code for finding the library to be removed.
net/powerdns
games/openxcom
devel/qt-creator
graphics/opencolorio
0.8.0 release notes mention major CMake changes, but I did not dig into
what exactly messes with consumer's custom .cmake files since they're of
no use for us, anyway.
Feedback? OK?
Index: devel/yaml-cpp/Makefile
===================================================================
RCS file: /cvs/ports/devel/yaml-cpp/Makefile,v
retrieving revision 1.20
diff -u -p -r1.20 Makefile
--- devel/yaml-cpp/Makefile 11 Jun 2023 07:54:27 -0000 1.20
+++ devel/yaml-cpp/Makefile 2 Sep 2023 11:37:19 -0000
@@ -1,16 +1,12 @@
COMMENT = YAML parser and emitter in C++
-V= 0.7.0
GH_ACCOUNT= jbeder
GH_PROJECT= yaml-cpp
-GH_TAGNAME= yaml-cpp-$V
-DISTNAME = yaml-cpp-$V
+GH_TAGNAME= 0.8.0
-SHARED_LIBS = yaml-cpp 4.0 # 0.5
+SHARED_LIBS = yaml-cpp 5.0 # 0.5
CATEGORIES = devel
-
-HOMEPAGE = https://github.com/jbeder/yaml-cpp
# MIT
PERMIT_PACKAGE = Yes
Index: devel/yaml-cpp/distinfo
===================================================================
RCS file: /cvs/ports/devel/yaml-cpp/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- devel/yaml-cpp/distinfo 11 Jun 2023 07:54:27 -0000 1.6
+++ devel/yaml-cpp/distinfo 2 Sep 2023 11:29:04 -0000
@@ -1,2 +1,2 @@
-SHA256 (yaml-cpp-0.7.0.tar.gz) = Q+ap/LFGrYcVFfDQhzlH5dSXocnGDFjLECqXtHIIt8M=
-SIZE (yaml-cpp-0.7.0.tar.gz) = 1033237
+SHA256 (yaml-cpp-0.8.0.tar.gz) = ++dLvc7iHWVnFWiHBto8i+z9lG2SzURwXMYJi7I7OhY=
+SIZE (yaml-cpp-0.8.0.tar.gz) = 1017151
Index: devel/yaml-cpp/patches/patch-CMakeLists_txt
===================================================================
RCS file: devel/yaml-cpp/patches/patch-CMakeLists_txt
diff -N devel/yaml-cpp/patches/patch-CMakeLists_txt
--- devel/yaml-cpp/patches/patch-CMakeLists_txt 11 Jun 2023 07:54:27 -0000
1.7
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,67 +0,0 @@
-- 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: devel/yaml-cpp/patches/patch-yaml-cpp-config_cmake_in
===================================================================
RCS file: devel/yaml-cpp/patches/patch-yaml-cpp-config_cmake_in
diff -N devel/yaml-cpp/patches/patch-yaml-cpp-config_cmake_in
--- devel/yaml-cpp/patches/patch-yaml-cpp-config_cmake_in 11 Jun 2023
07:54:27 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,25 +0,0 @@
-- 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: devel/qt-creator/Makefile
===================================================================
RCS file: /cvs/ports/devel/qt-creator/Makefile,v
retrieving revision 1.91
diff -u -p -r1.91 Makefile
--- devel/qt-creator/Makefile 24 Apr 2023 11:40:37 -0000 1.91
+++ devel/qt-creator/Makefile 2 Sep 2023 14:00:38 -0000
@@ -94,6 +94,8 @@ pre-configure:
cd ${WRKSRC}; sed -i 's,"gdb","egdb",g' ${GDB_ADJ_FILES}
# use system qbs/syntax-highlighting (qtcreator.pro)
rm -rf ${WRKSRC}/src/shared/qbs
+ # custom code fails to find yaml-cpp>=0.8.0
+ rm -f ${WRKSRC}/cmake/Findyaml-cpp.cmake
post-install:
.for _l _v in ${SHARED_LIBS}
Index: graphics/opencolorio/Makefile
===================================================================
RCS file: /cvs/ports/graphics/opencolorio/Makefile,v
retrieving revision 1.29
diff -u -p -r1.29 Makefile
--- graphics/opencolorio/Makefile 12 Jun 2023 21:29:25 -0000 1.29
+++ graphics/opencolorio/Makefile 2 Sep 2023 14:04:49 -0000
@@ -47,4 +47,8 @@ CONFIGURE_ARGS += -DOCIO_USE_SSE=ON
CONFIGURE_ARGS += -DOCIO_USE_SSE=OFF
.endif
+pre-configure:
+ # custom code fails to find yaml-cpp>=0.8.0
+ rm -f ${WRKSRC}/share/cmake/modules/Findyaml-cpp.cmake
+
.include <bsd.port.mk>
