Date: Thu, 11 Sep 2014 17:49:38 +0000 (UTC) From: Dmitry Marakasov <amdmi3@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r367957 - in head/devel: . yaml-cpp03 yaml-cpp03/files Message-ID: <201409111749.s8BHnc0V059339@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: amdmi3 Date: Thu Sep 11 17:49:37 2014 New Revision: 367957 URL: http://svnweb.freebsd.org/changeset/ports/367957 QAT: https://qat.redports.org/buildarchive/r367957/ Log: - Preserve devel/yaml-cpp as devel/yaml-cpp03 in preparation to update to 0.5 - Introduce changes necessary to allow both versions to coexist PR: 192330 Submitted by: madpilot@FreeBSD.org Approved by: maintainer timeout Added: head/devel/yaml-cpp03/ - copied from r367956, head/devel/yaml-cpp/ Modified: head/devel/Makefile head/devel/yaml-cpp03/Makefile head/devel/yaml-cpp03/files/patch-CMakeLists.txt head/devel/yaml-cpp03/pkg-plist Modified: head/devel/Makefile ============================================================================== --- head/devel/Makefile Thu Sep 11 17:11:06 2014 (r367956) +++ head/devel/Makefile Thu Sep 11 17:49:37 2014 (r367957) @@ -4744,6 +4744,7 @@ SUBDIR += yajl SUBDIR += yajl-tcl SUBDIR += yaml-cpp + SUBDIR += yaml-cpp03 SUBDIR += yasm SUBDIR += yasm-devel SUBDIR += z80-asm Modified: head/devel/yaml-cpp03/Makefile ============================================================================== --- head/devel/yaml-cpp/Makefile Thu Sep 11 17:11:06 2014 (r367956) +++ head/devel/yaml-cpp03/Makefile Thu Sep 11 17:49:37 2014 (r367957) @@ -3,9 +3,9 @@ PORTNAME= yaml-cpp PORTVERSION= 0.3.0 -PORTREVISION= 1 CATEGORIES= devel -MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} +MASTER_SITES= GOOGLE_CODE +PKGNAMESUFFIX= 03 MAINTAINER= tim@niemueller.de COMMENT= YAML parser and emitter in C++ matching the YAML 1.2 spec @@ -17,8 +17,10 @@ USES= cmake USE_LDCONFIG= yes CMAKE_ARGS+= -DBUILD_SHARED_LIBS:BOOL=ON -DYAML_CPP_BUILD_TOOLS=0 -post-patch: .SILENT - ${REINPLACE_CMD} 's|$${LIB_INSTALL_DIR}/pkgconfig|${LOCALBASE}/libdata/pkgconfig|' \ - ${WRKSRC}/CMakeLists.txt +post-patch: .SILENT + ${FIND} ${WRKSRC} -name '*.[hc]*' -o -name CMakeLists.txt | \ + ${XARGS} ${REINPLACE_CMD} -e 's|yaml-cpp|yaml-cpp${PKGNAMESUFFIX}|g' + ${MV} ${WRKSRC}/include/yaml-cpp ${WRKSRC}/include/yaml-cpp${PKGNAMESUFFIX} + ${MV} ${WRKSRC}/yaml-cpp.pc.cmake ${WRKSRC}/yaml-cpp${PKGNAMESUFFIX}.pc.cmake .include <bsd.port.mk> Modified: head/devel/yaml-cpp03/files/patch-CMakeLists.txt ============================================================================== --- head/devel/yaml-cpp/files/patch-CMakeLists.txt Thu Sep 11 17:11:06 2014 (r367956) +++ head/devel/yaml-cpp03/files/patch-CMakeLists.txt Thu Sep 11 17:49:37 2014 (r367957) @@ -1,6 +1,6 @@ ---- CMakeLists.txt.orig 2012-10-20 09:02:48.000000000 +0800 -+++ CMakeLists.txt 2012-10-20 09:03:35.000000000 +0800 -@@ -237,7 +237,7 @@ +--- CMakeLists.txt.orig 2013-04-14 03:37:53.000000000 +0400 ++++ CMakeLists.txt 2014-09-11 17:37:09.000000000 +0400 +@@ -240,7 +240,7 @@ set_target_properties(yaml-cpp PROPERTIES VERSION "${YAML_CPP_VERSION}" @@ -9,3 +9,12 @@ PROJECT_LABEL "yaml-cpp ${LABEL_SUFFIX}" ) +@@ -272,7 +272,7 @@ + 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() + + Modified: head/devel/yaml-cpp03/pkg-plist ============================================================================== --- head/devel/yaml-cpp/pkg-plist Thu Sep 11 17:11:06 2014 (r367956) +++ head/devel/yaml-cpp03/pkg-plist Thu Sep 11 17:49:37 2014 (r367957) @@ -1,33 +1,33 @@ -include/yaml-cpp/aliasmanager.h -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/conversion.h -include/yaml-cpp/dll.h -include/yaml-cpp/emitfromevents.h -include/yaml-cpp/emitter.h -include/yaml-cpp/emittermanip.h -include/yaml-cpp/eventhandler.h -include/yaml-cpp/exceptions.h -include/yaml-cpp/iterator.h -include/yaml-cpp/ltnode.h -include/yaml-cpp/mark.h -include/yaml-cpp/node.h -include/yaml-cpp/nodeimpl.h -include/yaml-cpp/nodereadimpl.h -include/yaml-cpp/nodeutil.h -include/yaml-cpp/noncopyable.h -include/yaml-cpp/null.h -include/yaml-cpp/ostream.h -include/yaml-cpp/parser.h -include/yaml-cpp/stlemitter.h -include/yaml-cpp/stlnode.h -include/yaml-cpp/traits.h -include/yaml-cpp/yaml.h -lib/libyaml-cpp.so -lib/libyaml-cpp.so.0 -lib/libyaml-cpp.so.0.3.0 -libdata/pkgconfig/yaml-cpp.pc -@dirrm include/yaml-cpp/contrib -@dirrm include/yaml-cpp +include/yaml-cpp03/aliasmanager.h +include/yaml-cpp03/anchor.h +include/yaml-cpp03/binary.h +include/yaml-cpp03/contrib/anchordict.h +include/yaml-cpp03/contrib/graphbuilder.h +include/yaml-cpp03/conversion.h +include/yaml-cpp03/dll.h +include/yaml-cpp03/emitfromevents.h +include/yaml-cpp03/emitter.h +include/yaml-cpp03/emittermanip.h +include/yaml-cpp03/eventhandler.h +include/yaml-cpp03/exceptions.h +include/yaml-cpp03/iterator.h +include/yaml-cpp03/ltnode.h +include/yaml-cpp03/mark.h +include/yaml-cpp03/node.h +include/yaml-cpp03/nodeimpl.h +include/yaml-cpp03/nodereadimpl.h +include/yaml-cpp03/nodeutil.h +include/yaml-cpp03/noncopyable.h +include/yaml-cpp03/null.h +include/yaml-cpp03/ostream.h +include/yaml-cpp03/parser.h +include/yaml-cpp03/stlemitter.h +include/yaml-cpp03/stlnode.h +include/yaml-cpp03/traits.h +include/yaml-cpp03/yaml.h +lib/libyaml-cpp03.so +lib/libyaml-cpp03.so.0 +lib/libyaml-cpp03.so.0.3.0 +libdata/pkgconfig/yaml-cpp03.pc +@dirrm include/yaml-cpp03/contrib +@dirrm include/yaml-cpp03
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201409111749.s8BHnc0V059339>