Date: Thu, 17 May 2018 15:37:34 +0000 (UTC) From: Yuri Victorovich <yuri@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r470225 - head/devel/nlohmann-json Message-ID: <201805171537.w4HFbYnM098609@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: yuri Date: Thu May 17 15:37:34 2018 New Revision: 470225 URL: https://svnweb.freebsd.org/changeset/ports/470225 Log: devel/nlohmann-json: Update 2.1.1 -> 3.1.2 Port changes: * Change to DISTVERSION * Change license to MIT (it changed?) * Sort USES * Preserve the cmake file location set in CMakeLists.txt * Remove the TEST option, because it can be tested without such option. * Add the do-test target that builds tests and tests in one step PR: 227145 Approved by: SlavaMikerov@gmail.com (maintainer's timeout; 48 days) Modified: head/devel/nlohmann-json/Makefile head/devel/nlohmann-json/distinfo Modified: head/devel/nlohmann-json/Makefile ============================================================================== --- head/devel/nlohmann-json/Makefile Thu May 17 15:15:55 2018 (r470224) +++ head/devel/nlohmann-json/Makefile Thu May 17 15:37:34 2018 (r470225) @@ -2,38 +2,34 @@ # $FreeBSD$ PORTNAME= json -PORTVERSION= 2.1.1 -PORTREVISION= 1 DISTVERSIONPREFIX= v +DISTVERSION= 3.1.2 CATEGORIES= devel PKGNAMEPREFIX= nlohmann- MAINTAINER= SlavaMikerov@gmail.com COMMENT= JSON library for Modern C++ -LICENSE= BSD2CLAUSE +LICENSE= MIT +LICENSE_FILE= ${WRKSRC}/LICENSE.MIT -NO_ARCH= yes - +USES= cmake:outsource compiler:c++11-lib USE_GITHUB= yes GH_ACCOUNT= nlohmann -GH_PROJECT= json +NO_BUILD= yes +NO_ARCH= yes -PLIST_FILES= share/cmake/Modules/nlohmann_jsonConfig.cmake \ - share/cmake/Modules/nlohmann_jsonConfigVersion.cmake \ - share/cmake/Modules/nlohmann_jsonTargets.cmake \ +CMAKE_OFF= JSON_BuildTests + +PLIST_FILES= lib/cmake/nlohmann_json/nlohmann_jsonConfig.cmake \ + lib/cmake/nlohmann_json/nlohmann_jsonConfigVersion.cmake \ + lib/cmake/nlohmann_json/nlohmann_jsonTargets.cmake \ include/nlohmann/json.hpp -USES= compiler:c++11-lib cmake:outsource -OPTIONS_DEFINE= TEST -TEST_CMAKE_OFF= -DBuildTests=OFF - -post-patch: - @${REINPLACE_CMD} -e \ - 's|set(JSON_CONFIG_DESTINATION "cmake")|set(JSON_CONFIG_DESTINATION "share/cmake/Modules")|g' \ - ${WRKSRC}/CMakeLists.txt - -do-test-TEST-on: - @cd ${WRKDIR}/.build && ${MAKE_CMD} test +do-test: + @cd ${BUILD_WRKSRC} && \ + ${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -DJSON_BuildTests:BOOL=ON ${CMAKE_SOURCE_PATH} && \ + ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \ + ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} test .include <bsd.port.mk> Modified: head/devel/nlohmann-json/distinfo ============================================================================== --- head/devel/nlohmann-json/distinfo Thu May 17 15:15:55 2018 (r470224) +++ head/devel/nlohmann-json/distinfo Thu May 17 15:37:34 2018 (r470225) @@ -1,3 +1,3 @@ -TIMESTAMP = 1490609142 -SHA256 (nlohmann-json-v2.1.1_GH0.tar.gz) = 59b85ebe61d9dcbd24946f2082ce5943e276f05b4ef1baeb3c6c10d324333053 -SIZE (nlohmann-json-v2.1.1_GH0.tar.gz) = 108615607 +TIMESTAMP = 1522527522 +SHA256 (nlohmann-json-v3.1.2_GH0.tar.gz) = e8fffa6cbdb3c15ecdff32eebf958b6c686bc188da8ad5c6489462d16f83ae54 +SIZE (nlohmann-json-v3.1.2_GH0.tar.gz) = 114293094
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201805171537.w4HFbYnM098609>