Attachment 192018 Details for Bug 227145 – patch

[patch] patch

nlohmann-json.patch (text/plain), 2.25 KB, created by Yuri Victorovich on 2018-03-31 20:39:33 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Yuri Victorovich

Created: 2018-03-31 20:39:33 UTC

Size: 2.25 KB

patch

obsolete

>Index: devel/nlohmann-json/Makefile
>===================================================================
>--- devel/nlohmann-json/Makefile	(revision 465900)
>+++ devel/nlohmann-json/Makefile	(working copy)
>@@ -2,9 +2,8 @@
> # $FreeBSD$
> 
> PORTNAME=	json
>-PORTVERSION=	2.1.1
>-PORTREVISION=	1
> DISTVERSIONPREFIX=	v
>+DISTVERSION=	3.1.2
> CATEGORIES=	devel
> PKGNAMEPREFIX=	nlohmann-
> 
>@@ -11,29 +10,25 @@
> 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_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
>+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
> 
>-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
>-
> .include <bsd.port.mk>
>Index: devel/nlohmann-json/distinfo
>===================================================================
>--- devel/nlohmann-json/distinfo	(revision 465900)
>+++ devel/nlohmann-json/distinfo	(working copy)
>@@ -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

Flags:

yuri: maintainer-approval? (SlavaMikerov)

Actions: View | Diff

Attachments on bug 227145: 192018