1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-19 00:13:33 +00:00

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
This commit is contained in:
Guido Falsi 2021-07-13 11:01:12 +02:00
parent e3163eef65
commit 3ed820108d
19 changed files with 72 additions and 27 deletions

View File

@ -2,6 +2,7 @@
PORTNAME= mpz
PORTVERSION= 1.0.13
PORTREVISION= 1
CATEGORIES= audio
MAINTAINER= danfe@FreeBSD.org

View File

@ -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

View File

@ -2,6 +2,7 @@
PORTNAME= librime
PORTVERSION= 1.7.2
PORTREVISION= 1
CATEGORIES= chinese textproc
MAINTAINER= khng300@gmail.com

View File

@ -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

View File

@ -1,7 +1,7 @@
# Created by: Tim Niemueller <tim@niemueller.de>
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 <bsd.port.mk>

View File

@ -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

View File

@ -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)

View File

@ -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")

View File

@ -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

View File

@ -3,6 +3,7 @@
PORTNAME= yaml2argdata
DISTVERSIONPREFIX= v
DISTVERSION= 0.4
PORTREVISION= 1
CATEGORIES= devel
MAINTAINER= ed@FreeBSD.org

View File

@ -1,5 +1,6 @@
PORTNAME= powerdns
DISTVERSION= 4.4.1
PORTREVISION= 1
CATEGORIES= dns
MASTER_SITES= https://downloads.powerdns.com/releases/
DISTNAME= pdns-${DISTVERSION}

View File

@ -1,7 +1,7 @@
PORTNAME= openxcom
PORTVERSION= 1.0
DISTVERSIONPREFIX= v
PORTREVISION= 11
PORTREVISION= 12
CATEGORIES= games
MAINTAINER= amdmi3@FreeBSD.org

View File

@ -3,7 +3,7 @@
PORTNAME= openbmp
DISTVERSIONPREFIX= v
DISTVERSION= 0.14.0
PORTREVISION= 9
PORTREVISION= 10
CATEGORIES= net-mgmt
MAINTAINER= pizzamig@FreeBSD.org

View File

@ -1,5 +1,6 @@
PORTNAME= astron
PORTVERSION= 0.0.20200521
PORTREVISION= 1
CATEGORIES= net
MAINTAINER= nc@FreeBSD.org

View File

@ -3,7 +3,7 @@
PORTNAME= cloudabi-utils
DISTVERSIONPREFIX= v
DISTVERSION= 0.38
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= sysutils
MAINTAINER= ed@FreeBSD.org

View File

@ -1,6 +1,6 @@
PORTNAME= crate
DISTVERSION= 0.1.3
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= sysutils emulators
MAINTAINER= yuri@FreeBSD.org

View File

@ -1,6 +1,6 @@
PORTNAME= daggy
DISTVERSION= 2.0.2
PORTREVISION= 2
PORTREVISION= 3
CATEGORIES= sysutils
MAINTAINER= yuri@FreeBSD.org

View File

@ -1,5 +1,6 @@
PORTNAME= facter
PORTVERSION= 3.14.18
PORTREVISION= 1
CATEGORIES?= sysutils
MASTER_SITES= https://downloads.puppetlabs.com/facter/

View File

@ -3,7 +3,7 @@
PORTNAME= envoy
PORTVERSION= 1.10.0
DISTVERSIONPREFIX= v
PORTREVISION= 20
PORTREVISION= 21
CATEGORIES= www
MAINTAINER= danfe@FreeBSD.org