From 3ed820108daf4b3f5b93d2eec85ce13d4bfed282 Mon Sep 17 00:00:00 2001 From: Guido Falsi Date: Tue, 13 Jul 2021 11:01:12 +0200 Subject: [PATCH] devel/yaml-cpp: Update to 0.7.0 - Patch cmake include to actually work - Bump PORTREVISION on consumers, testing shows it is not completely binary compatible --- audio/mpz/Makefile | 1 + audio/supercollider/Makefile | 2 +- chinese/librime/Makefile | 1 + devel/RStudio/Makefile | 1 + devel/yaml-cpp/Makefile | 6 ++- devel/yaml-cpp/distinfo | 6 +-- devel/yaml-cpp/files/patch-CMakeLists.txt | 44 +++++++++++++------ .../files/patch-yaml-cpp-config.cmake.in | 17 +++++++ devel/yaml-cpp/pkg-plist | 5 ++- devel/yaml2argdata/Makefile | 1 + dns/powerdns/Makefile | 1 + games/openxcom/Makefile | 2 +- net-mgmt/openbmp/Makefile | 2 +- net/astron/Makefile | 1 + sysutils/cloudabi-utils/Makefile | 2 +- sysutils/crate/Makefile | 2 +- sysutils/daggy/Makefile | 2 +- sysutils/facter/Makefile | 1 + www/envoy/Makefile | 2 +- 19 files changed, 72 insertions(+), 27 deletions(-) create mode 100644 devel/yaml-cpp/files/patch-yaml-cpp-config.cmake.in diff --git a/audio/mpz/Makefile b/audio/mpz/Makefile index 657b60f6bfce..d7cb86f7e02b 100644 --- a/audio/mpz/Makefile +++ b/audio/mpz/Makefile @@ -2,6 +2,7 @@ PORTNAME= mpz PORTVERSION= 1.0.13 +PORTREVISION= 1 CATEGORIES= audio MAINTAINER= danfe@FreeBSD.org diff --git a/audio/supercollider/Makefile b/audio/supercollider/Makefile index 8c245efbaf65..5a170ed076ca 100644 --- a/audio/supercollider/Makefile +++ b/audio/supercollider/Makefile @@ -1,6 +1,6 @@ PORTNAME= supercollider DISTVERSION= 3.11.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= audio MASTER_SITES= https://github.com/supercollider/supercollider/releases/download/Version-${PORTVERSION}/ DISTNAME= SuperCollider-${PORTVERSION}-Source diff --git a/chinese/librime/Makefile b/chinese/librime/Makefile index d0616e75ff03..9772c1d3e4b1 100644 --- a/chinese/librime/Makefile +++ b/chinese/librime/Makefile @@ -2,6 +2,7 @@ PORTNAME= librime PORTVERSION= 1.7.2 +PORTREVISION= 1 CATEGORIES= chinese textproc MAINTAINER= khng300@gmail.com diff --git a/devel/RStudio/Makefile b/devel/RStudio/Makefile index d0067d59bdae..9b17c8aa72ed 100644 --- a/devel/RStudio/Makefile +++ b/devel/RStudio/Makefile @@ -4,6 +4,7 @@ PORTNAME= RStudio DISTVERSIONPREFIX= v DISTVERSION= 1.4.1717 +PORTREVISION= 1 CATEGORIES= devel math java MASTER_SITES= https://s3.amazonaws.com/rstudio-buildtools/dictionaries/:dictionaries \ https://s3.amazonaws.com/rstudio-buildtools/:buildtools diff --git a/devel/yaml-cpp/Makefile b/devel/yaml-cpp/Makefile index 84b9976bd1ab..52415bb10667 100644 --- a/devel/yaml-cpp/Makefile +++ b/devel/yaml-cpp/Makefile @@ -1,7 +1,7 @@ # Created by: Tim Niemueller PORTNAME= yaml-cpp -PORTVERSION= 0.6.3 +PORTVERSION= 0.7.0 DISTVERSIONPREFIX= ${PORTNAME}- CATEGORIES= devel @@ -20,4 +20,8 @@ CMAKE_ARGS+= -DYAML_BUILD_SHARED_LIBS:BOOL=ON \ 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 cf48f76baa56..aa7b71474b67 100644 --- a/devel/yaml-cpp/distinfo +++ b/devel/yaml-cpp/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1569483448 -SHA256 (jbeder-yaml-cpp-yaml-cpp-0.6.3_GH0.tar.gz) = 77ea1b90b3718aa0c324207cb29418f5bced2354c2e483a9523d98c3460af1ed -SIZE (jbeder-yaml-cpp-yaml-cpp-0.6.3_GH0.tar.gz) = 1398768 +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 diff --git a/devel/yaml-cpp/files/patch-CMakeLists.txt b/devel/yaml-cpp/files/patch-CMakeLists.txt index 0471011527bc..8c8c8e21b516 100644 --- a/devel/yaml-cpp/files/patch-CMakeLists.txt +++ b/devel/yaml-cpp/files/patch-CMakeLists.txt @@ -1,20 +1,36 @@ ---- CMakeLists.txt.orig 2019-09-25 16:56:00 UTC +--- CMakeLists.txt.orig 2021-07-10 15:53:22 UTC +++ CMakeLists.txt -@@ -276,7 +276,7 @@ set_target_properties(yaml-cpp PROPERTIES +@@ -123,14 +123,14 @@ endif() set_target_properties(yaml-cpp PROPERTIES - VERSION "${YAML_CPP_VERSION}" -- SOVERSION "${YAML_CPP_VERSION_MAJOR}.${YAML_CPP_VERSION_MINOR}" -+ SOVERSION "${YAML_CPP_VERSION_MAJOR}" - PROJECT_LABEL "yaml-cpp ${LABEL_SUFFIX}" - ) + 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}") -@@ -342,7 +342,7 @@ if (YAML_CPP_INSTALL) - if(UNIX) - set(PC_FILE ${CMAKE_BINARY_DIR}/yaml-cpp.pc) - configure_file("yaml-cpp.pc.cmake" ${PC_FILE} @ONLY) -- install(FILES ${PC_FILE} DESTINATION ${LIB_INSTALL_DIR}/pkgconfig) -+ install(FILES ${PC_FILE} DESTINATION libdata/pkgconfig) - endif() + 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") + install(FILES "${PROJECT_BINARY_DIR}/yaml-cpp.pc" +- DESTINATION ${CMAKE_INSTALL_DATADIR}/pkgconfig) ++ DESTINATION libdata/pkgconfig) endif() + + 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 new file mode 100644 index 000000000000..4b85175be382 --- /dev/null +++ b/devel/yaml-cpp/files/patch-yaml-cpp-config.cmake.in @@ -0,0 +1,17 @@ +--- 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 a3bc8c217690..6e556b1fa809 100644 --- a/devel/yaml-cpp/pkg-plist +++ b/devel/yaml-cpp/pkg-plist @@ -2,6 +2,7 @@ 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 @@ -12,7 +13,6 @@ 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/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 @@ -28,6 +28,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 @@ -40,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.6.3 +lib/libyaml-cpp.so.0.7.0 libdata/pkgconfig/yaml-cpp.pc diff --git a/devel/yaml2argdata/Makefile b/devel/yaml2argdata/Makefile index 45cc853d3a58..4285c6bd7323 100644 --- a/devel/yaml2argdata/Makefile +++ b/devel/yaml2argdata/Makefile @@ -3,6 +3,7 @@ PORTNAME= yaml2argdata DISTVERSIONPREFIX= v DISTVERSION= 0.4 +PORTREVISION= 1 CATEGORIES= devel MAINTAINER= ed@FreeBSD.org diff --git a/dns/powerdns/Makefile b/dns/powerdns/Makefile index 112861731120..1ec13e3002ab 100644 --- a/dns/powerdns/Makefile +++ b/dns/powerdns/Makefile @@ -1,5 +1,6 @@ PORTNAME= powerdns DISTVERSION= 4.4.1 +PORTREVISION= 1 CATEGORIES= dns MASTER_SITES= https://downloads.powerdns.com/releases/ DISTNAME= pdns-${DISTVERSION} diff --git a/games/openxcom/Makefile b/games/openxcom/Makefile index 339a6117d880..8bd214134fd0 100644 --- a/games/openxcom/Makefile +++ b/games/openxcom/Makefile @@ -1,7 +1,7 @@ PORTNAME= openxcom PORTVERSION= 1.0 DISTVERSIONPREFIX= v -PORTREVISION= 11 +PORTREVISION= 12 CATEGORIES= games MAINTAINER= amdmi3@FreeBSD.org diff --git a/net-mgmt/openbmp/Makefile b/net-mgmt/openbmp/Makefile index adb3eec106c5..e0beaa760d4c 100644 --- a/net-mgmt/openbmp/Makefile +++ b/net-mgmt/openbmp/Makefile @@ -3,7 +3,7 @@ PORTNAME= openbmp DISTVERSIONPREFIX= v DISTVERSION= 0.14.0 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= net-mgmt MAINTAINER= pizzamig@FreeBSD.org diff --git a/net/astron/Makefile b/net/astron/Makefile index 7124bb487cfb..b5ba0ca1dfd9 100644 --- a/net/astron/Makefile +++ b/net/astron/Makefile @@ -1,5 +1,6 @@ PORTNAME= astron PORTVERSION= 0.0.20200521 +PORTREVISION= 1 CATEGORIES= net MAINTAINER= nc@FreeBSD.org diff --git a/sysutils/cloudabi-utils/Makefile b/sysutils/cloudabi-utils/Makefile index 50964d3c94c9..1c25ea5158ea 100644 --- a/sysutils/cloudabi-utils/Makefile +++ b/sysutils/cloudabi-utils/Makefile @@ -3,7 +3,7 @@ PORTNAME= cloudabi-utils DISTVERSIONPREFIX= v DISTVERSION= 0.38 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= sysutils MAINTAINER= ed@FreeBSD.org diff --git a/sysutils/crate/Makefile b/sysutils/crate/Makefile index 211991704429..88d739888da0 100644 --- a/sysutils/crate/Makefile +++ b/sysutils/crate/Makefile @@ -1,6 +1,6 @@ PORTNAME= crate DISTVERSION= 0.1.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= sysutils emulators MAINTAINER= yuri@FreeBSD.org diff --git a/sysutils/daggy/Makefile b/sysutils/daggy/Makefile index d7dde777da6b..6fc7e6497160 100644 --- a/sysutils/daggy/Makefile +++ b/sysutils/daggy/Makefile @@ -1,6 +1,6 @@ PORTNAME= daggy DISTVERSION= 2.0.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= sysutils MAINTAINER= yuri@FreeBSD.org diff --git a/sysutils/facter/Makefile b/sysutils/facter/Makefile index d5362e923ab8..8ef230b81605 100644 --- a/sysutils/facter/Makefile +++ b/sysutils/facter/Makefile @@ -1,5 +1,6 @@ PORTNAME= facter PORTVERSION= 3.14.18 +PORTREVISION= 1 CATEGORIES?= sysutils MASTER_SITES= https://downloads.puppetlabs.com/facter/ diff --git a/www/envoy/Makefile b/www/envoy/Makefile index cc5e3e3c7fa8..cbbd60114324 100644 --- a/www/envoy/Makefile +++ b/www/envoy/Makefile @@ -3,7 +3,7 @@ PORTNAME= envoy PORTVERSION= 1.10.0 DISTVERSIONPREFIX= v -PORTREVISION= 20 +PORTREVISION= 21 CATEGORIES= www MAINTAINER= danfe@FreeBSD.org