Index: head/lang/solidity/Makefile =================================================================== --- head/lang/solidity/Makefile (revision 476724) +++ head/lang/solidity/Makefile (revision 476725) @@ -1,38 +1,35 @@ # Created by: Alex Dupre # $FreeBSD$ PORTNAME= solidity -PORTVERSION= 0.4.23 -PORTREVISION= 1 +PORTVERSION= 0.4.24 CATEGORIES= lang MASTER_SITES= https://github.com/ethereum/solidity/releases/download/v${PORTVERSION}/ DISTNAME= ${PORTNAME}_${PORTVERSION} MAINTAINER= ale@FreeBSD.org COMMENT= Solidity Contract-Oriented Programming Language LICENSE= GPLv3 - -BROKEN= fails to build with boost 1.68, see bug 230392 BUILD_DEPENDS= boost-libs>=0:devel/boost-libs LIB_DEPENDS= libjsoncpp.so:devel/jsoncpp OPTIONS_DEFINE= SMT SMT_DESC= SMT Checker SMT_LIB_DEPENDS=libz3.so:math/z3 USES= cmake compiler:c++14-lang CMAKE_ARGS+= -DUSE_LD_GOLD=OFF -DTESTS=OFF \ -DJSONCPP_INCLUDE_DIR:STRING="${LOCALBASE}/include/jsoncpp" \ -DJSONCPP_LIB_DIR:STRING="${LOCALBASE}/lib" PLIST_FILES= bin/solc pre-patch: @${CP} ${FILESDIR}/jsoncpp.cmake ${WRKSRC}/cmake/ @${REINPLACE_CMD} '/EthCcache/d' ${WRKSRC}/CMakeLists.txt @${REINPLACE_CMD} '/-Werror/d' ${WRKSRC}/cmake/EthCompilerSettings.cmake .include Index: head/lang/solidity/distinfo =================================================================== --- head/lang/solidity/distinfo (revision 476724) +++ head/lang/solidity/distinfo (revision 476725) @@ -1,3 +1,3 @@ -TIMESTAMP = 1524729659 -SHA256 (solidity_0.4.23.tar.gz) = 1a01dfd0f19617c543a9dc012d4ae99aecc38bb3931e0c7af88007005e60413f -SIZE (solidity_0.4.23.tar.gz) = 1136930 +TIMESTAMP = 1533799823 +SHA256 (solidity_0.4.24.tar.gz) = b6828266d9b108a035f44127a6107c9fbc516018b0fcf5de370196306cddb2a8 +SIZE (solidity_0.4.24.tar.gz) = 1154386 Index: head/lang/solidity/files/patch-libdevcore_JSON.cpp =================================================================== --- head/lang/solidity/files/patch-libdevcore_JSON.cpp (revision 476724) +++ head/lang/solidity/files/patch-libdevcore_JSON.cpp (revision 476725) @@ -1,15 +1,15 @@ ---- libdevcore/JSON.cpp.orig 2018-04-19 21:36:04 UTC +--- libdevcore/JSON.cpp.orig 2018-05-16 14:30:44 UTC +++ libdevcore/JSON.cpp @@ -27,10 +27,12 @@ using namespace std; +/* static_assert( - (JSONCPP_VERSION_MAJOR == 1) && (JSONCPP_VERSION_MINOR == 7) && (JSONCPP_VERSION_PATCH == 7), - "Unexpected jsoncpp version: " JSONCPP_VERSION_STRING ". Expecting 1.7.7." + (JSONCPP_VERSION_MAJOR == 1) && (JSONCPP_VERSION_MINOR == 8) && (JSONCPP_VERSION_PATCH == 4), + "Unexpected jsoncpp version: " JSONCPP_VERSION_STRING ". Expecting 1.8.4." ); +*/ namespace dev { Index: head/lang/solidity/files/patch-libevmasm_Assembly.cpp =================================================================== --- head/lang/solidity/files/patch-libevmasm_Assembly.cpp (nonexistent) +++ head/lang/solidity/files/patch-libevmasm_Assembly.cpp (revision 476725) @@ -0,0 +1,20 @@ +--- libevmasm/Assembly.cpp.orig 2018-05-16 14:30:44 UTC ++++ libevmasm/Assembly.cpp +@@ -264,7 +264,7 @@ Json::Value Assembly::assemblyJSON(Strin + createJsonValue("PUSH [ErrorTag]", i.location().start, i.location().end, "")); + else + collection.append( +- createJsonValue("PUSH [tag]", i.location().start, i.location().end, string(i.data()))); ++ createJsonValue("PUSH [tag]", i.location().start, i.location().end, dev::toString(i.data()))); + break; + case PushSub: + collection.append( +@@ -290,7 +290,7 @@ Json::Value Assembly::assemblyJSON(Strin + break; + case Tag: + collection.append( +- createJsonValue("tag", i.location().start, i.location().end, string(i.data()))); ++ createJsonValue("tag", i.location().start, i.location().end, dev::toString(i.data()))); + collection.append( + createJsonValue("JUMPDEST", i.location().start, i.location().end)); + break; Property changes on: head/lang/solidity/files/patch-libevmasm_Assembly.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