From owner-svn-ports-all@freebsd.org Thu May 17 15:37:35 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 9DE15EAD6B9; Thu, 17 May 2018 15:37:35 +0000 (UTC) (envelope-from yuri@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4E49C85AC0; Thu, 17 May 2018 15:37:35 +0000 (UTC) (envelope-from yuri@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 0E5E0314B; Thu, 17 May 2018 15:37:35 +0000 (UTC) (envelope-from yuri@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w4HFbYow098610; Thu, 17 May 2018 15:37:34 GMT (envelope-from yuri@FreeBSD.org) Received: (from yuri@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w4HFbYnM098609; Thu, 17 May 2018 15:37:34 GMT (envelope-from yuri@FreeBSD.org) Message-Id: <201805171537.w4HFbYnM098609@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: yuri set sender to yuri@FreeBSD.org using -f From: Yuri Victorovich Date: Thu, 17 May 2018 15:37:34 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r470225 - head/devel/nlohmann-json X-SVN-Group: ports-head X-SVN-Commit-Author: yuri X-SVN-Commit-Paths: head/devel/nlohmann-json X-SVN-Commit-Revision: 470225 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 May 2018 15:37:36 -0000 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 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