Index: head/devel/jsoncpp/Makefile =================================================================== --- head/devel/jsoncpp/Makefile (revision 425818) +++ head/devel/jsoncpp/Makefile (revision 425819) @@ -1,49 +1,54 @@ # Created by: Johan Str??m # $FreeBSD$ PORTNAME= jsoncpp DISTVERSION= 1.7.7 CATEGORIES= devel MAINTAINER= yuri@rawbw.com COMMENT= JSON reader and writer library for C++ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE USE_GITHUB= yes GH_ACCOUNT= open-source-parsers USES= compiler:features dos2unix scons USE_LDCONFIG= yes MAKE_ARGS= platform=linux-gcc .include .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/linux-gcc-FreeBSD/libjsoncpp.a \ ${STAGEDIR}${PREFIX}/lib ${INSTALL_LIB} ${WRKSRC}/libs/linux-gcc-FreeBSD/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_PREFIX@|${PREFIX}|g' \ -e 's|@LIBRARY_INSTALL_DIR@|lib|g' \ -e 's|@INCLUDE_INSTALL_DIR@|include/jsoncpp|g' \ -e 's|@JSONCPP_VERSION@|${DISTVERSION}|g' \ ${STAGEDIR}${PREFIX}/libdata/pkgconfig/jsoncpp.pc .include Index: head/devel/jsoncpp/files/patch-src_lib__json_json__reader.cpp =================================================================== --- head/devel/jsoncpp/files/patch-src_lib__json_json__reader.cpp (nonexistent) +++ head/devel/jsoncpp/files/patch-src_lib__json_json__reader.cpp (revision 425819) @@ -0,0 +1,14 @@ +--- src/lib_json/json_reader.cpp.orig 2016-10-30 21:28:16 UTC ++++ src/lib_json/json_reader.cpp +@@ -3,6 +3,11 @@ + // recognized in your jurisdiction. + // See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE + ++// fix for lang/gcc5+ ++#if __GNUC__ == 5 ++#include ++#endif ++ + #if !defined(JSON_IS_AMALGAMATION) + #include + #include Property changes on: head/devel/jsoncpp/files/patch-src_lib__json_json__reader.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/devel/jsoncpp/files/patch-src_lib__json_json__writer.cpp =================================================================== --- head/devel/jsoncpp/files/patch-src_lib__json_json__writer.cpp (nonexistent) +++ head/devel/jsoncpp/files/patch-src_lib__json_json__writer.cpp (revision 425819) @@ -0,0 +1,14 @@ +--- src/lib_json/json_writer.cpp.orig 2016-10-30 21:27:18 UTC ++++ src/lib_json/json_writer.cpp +@@ -3,6 +3,11 @@ + // recognized in your jurisdiction. + // See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE + ++// fix for lang/gcc5+ ++#if __GNUC__ == 5 ++#include ++#endif ++ + #if !defined(JSON_IS_AMALGAMATION) + #include + #include "json_tool.h" Property changes on: head/devel/jsoncpp/files/patch-src_lib__json_json__writer.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property