Attachment 195032 Details for Bug 229677 – patch to update the port

[patch] patch to update the port

jsoncpp.patch (text/plain), 3.87 KB, created by Sergei Vyshenski on 2018-07-10 16:19:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Sergei Vyshenski

Created: 2018-07-10 16:19:01 UTC

Size: 3.87 KB

patch

obsolete

>diff -ur devel/jsoncpp.orig/Makefile devel/jsoncpp/Makefile
>--- devel/jsoncpp.orig/Makefile	2018-02-20 01:25:14.000000000 +0300
>+++ devel/jsoncpp/Makefile	2018-07-10 18:38:04.921947000 +0300
>@@ -2,8 +2,7 @@
> # $FreeBSD: head/devel/jsoncpp/Makefile 462353 2018-02-19 22:25:14Z yuri $
> 
> PORTNAME=	jsoncpp
>-PORTVERSION=	1.8.1
>-PORTREVISION=	3
>+PORTVERSION=	1.8.4
> CATEGORIES=	devel
> 
> MAINTAINER=	yuri@FreeBSD.org
>@@ -12,48 +11,10 @@
> LICENSE=	MIT
> LICENSE_FILE=	${WRKSRC}/LICENSE
> 
>-USE_GITHUB=	yes
>-GH_ACCOUNT=	open-source-parsers
>-
>-USES=		compiler:c++11-lang dos2unix scons
>+USES=		compiler:c++11-lang dos2unix meson ninja
> USE_LDCONFIG=	yes
> 
>-PLATFORM=	linux-gcc-FreeBSD
>-MAKE_ARGS=	platform=${PLATFORM}
>-
>-.include <bsd.port.pre.mk>
>-
>-.if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 33 || \
>-    ${COMPILER_TYPE} == gcc   && ${COMPILER_VERSION} >= 48
>-# Certain new compiler features unlock parts of jsoncpp API (ex. see JSON_HAS_RVALUE_REFERENCES).
>-# Use c++11 above to be the most inclusive.
>-USES+=		compiler:c++11-lang
>-# lang/gcc5 fix
>-.if ${COMPILER_TYPE} == clang
>-CXXFLAGS+=	--std=c++11
>-.else
>-CXXFLAGS+=	--std=gnu++11 -D_GLIBCXX_USE_C99=1
>-.endif
>-.endif
>-
>-do-install:
>-	@${MKDIR} ${STAGEDIR}${PREFIX}/include/jsoncpp
>-	(cd ${WRKSRC}/include/ && ${COPYTREE_SHARE} json/ ${STAGEDIR}${PREFIX}/include/jsoncpp/)
>-	${INSTALL_DATA} ${WRKSRC}/libs/${PLATFORM}/libjsoncpp.a \
>-		${STAGEDIR}${PREFIX}/lib
>-	${INSTALL_LIB} ${WRKSRC}/libs/${PLATFORM}/libjsoncpp.so.${DISTVERSION} \
>-		${STAGEDIR}${PREFIX}/lib
>-	${LN} -s libjsoncpp.so.${DISTVERSION} ${STAGEDIR}${PREFIX}/lib/libjsoncpp.so.1
>-	${LN} -s libjsoncpp.so.${DISTVERSION} ${STAGEDIR}${PREFIX}/lib/libjsoncpp.so
>-	${CP} ${WRKSRC}/pkg-config/jsoncpp.pc.in ${STAGEDIR}${PREFIX}/libdata/pkgconfig/jsoncpp.pc
>-	@${REINPLACE_CMD} -i '' \
>-		-e 's|@CMAKE_INSTALL_FULL_LIBDIR@|${PREFIX}/lib|g' \
>-		-e 's|@CMAKE_INSTALL_FULL_INCLUDEDIR@|${PREFIX}/include/jsoncpp|g' \
>-		-e 's|@JSONCPP_VERSION@|${DISTVERSION}|g' \
>-		${STAGEDIR}${PREFIX}/libdata/pkgconfig/jsoncpp.pc
>-
>-do-test:
>-	@${ECHO} "Please note that 3 testcases are known to fail: https://github.com/open-source-parsers/jsoncpp/issues/628"
>-	@cd ${WRKSRC} && CXX=${CXX} ${SCONS} platform=${PLATFORM} check
>+USE_GITHUB=	yes
>+GH_ACCOUNT=	open-source-parsers
> 
>-.include <bsd.port.post.mk>
>+.include <bsd.port.mk>
>diff -ur devel/jsoncpp.orig/distinfo devel/jsoncpp/distinfo
>--- devel/jsoncpp.orig/distinfo	2017-06-29 12:55:37.000000000 +0300
>+++ devel/jsoncpp/distinfo	2018-07-10 12:40:12.718550000 +0300
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1498626054
>-SHA256 (open-source-parsers-jsoncpp-1.8.1_GH0.tar.gz) = 858db2faf348f89fdf1062bd3e79256772e897e7f17df73e0624edf004f2f9ac
>-SIZE (open-source-parsers-jsoncpp-1.8.1_GH0.tar.gz) = 210629
>+TIMESTAMP = 1531215612
>+SHA256 (open-source-parsers-jsoncpp-1.8.4_GH0.tar.gz) = c49deac9e0933bcb7044f08516861a2d560988540b23de2ac1ad443b219afdb6
>+SIZE (open-source-parsers-jsoncpp-1.8.4_GH0.tar.gz) = 200226
>Only in devel/jsoncpp.orig: files
>diff -ur devel/jsoncpp.orig/pkg-plist devel/jsoncpp/pkg-plist
>--- devel/jsoncpp.orig/pkg-plist	2017-06-29 12:55:37.000000000 +0300
>+++ devel/jsoncpp/pkg-plist	2018-07-10 17:15:23.500732000 +0300
>@@ -1,16 +1,14 @@
>-include/jsoncpp/json/allocator.h
>-include/jsoncpp/json/assertions.h
>-include/jsoncpp/json/autolink.h
>-include/jsoncpp/json/config.h
>-include/jsoncpp/json/features.h
>-include/jsoncpp/json/forwards.h
>-include/jsoncpp/json/json.h
>-include/jsoncpp/json/reader.h
>-include/jsoncpp/json/value.h
>-include/jsoncpp/json/version.h
>-include/jsoncpp/json/writer.h
>-lib/libjsoncpp.a
>+include/json/allocator.h
>+include/json/assertions.h
>+include/json/autolink.h
>+include/json/config.h
>+include/json/features.h
>+include/json/forwards.h
>+include/json/json.h
>+include/json/reader.h
>+include/json/value.h
>+include/json/version.h
>+include/json/writer.h
> lib/libjsoncpp.so
>-lib/libjsoncpp.so.1
>-lib/libjsoncpp.so.1.8.1
>+lib/libjsoncpp.so.20
> libdata/pkgconfig/jsoncpp.pc

Actions: View | Diff

Attachments on bug 229677: 195032