Index: head/lang/solidity/Makefile =================================================================== --- head/lang/solidity/Makefile (revision 524468) +++ head/lang/solidity/Makefile (revision 524469) @@ -1,44 +1,43 @@ # Created by: Alex Dupre # $FreeBSD$ PORTNAME= solidity -PORTVERSION= 0.6.0 -PORTREVISION= 1 +PORTVERSION= 0.6.2 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 NOT_FOR_ARCHS= powerpc powerpc64 powerpcspe sparc64 NOT_FOR_ARCHS_REASON= solidity currently does not support big endian systems BUILD_DEPENDS= boost-libs>=0:devel/boost-libs LIB_DEPENDS= libjsoncpp.so:devel/jsoncpp USES= cmake compiler:c++14-lang OPTIONS_DEFINE= Z3 CVC4 -OPTIONS_DEFAULT=CVC4 +OPTIONS_DEFAULT=Z3 CVC4 Z3_DESC= SMT Checker via Z3 CVC4_DESC= SMT Checker via CVC4 Z3_LIB_DEPENDS= libz3.so:math/z3 CVC4_LIB_DEPENDS= libcvc4.so:math/cvc4 libgmp.so:math/gmp Z3_CMAKE_OFF= USE_Z3 CVC4_CMAKE_OFF= USE_CVC4 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 524468) +++ head/lang/solidity/distinfo (revision 524469) @@ -1,3 +1,3 @@ -TIMESTAMP = 1576660212 -SHA256 (solidity_0.6.0.tar.gz) = 5f9e874199f6dd2d7dd6fa97232993cd762543a7bf6e3bf36a95d63cd0edbcdb -SIZE (solidity_0.6.0.tar.gz) = 1934622 +TIMESTAMP = 1580203577 +SHA256 (solidity_0.6.2.tar.gz) = 11384d00a9d6cd384810d53979c32194f3ef7d9a587265ba98b50891c9bf1196 +SIZE (solidity_0.6.2.tar.gz) = 1932920 Index: head/lang/solidity/files/patch-libdevcore_JSON.cpp =================================================================== --- head/lang/solidity/files/patch-libdevcore_JSON.cpp (revision 524468) +++ head/lang/solidity/files/patch-libdevcore_JSON.cpp (nonexistent) @@ -1,15 +0,0 @@ ---- 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 == 9) && (JSONCPP_VERSION_PATCH == 2), - "Unexpected jsoncpp version: " JSONCPP_VERSION_STRING ". Expecting 1.9.2." - ); -+*/ - - namespace dev - { Property changes on: head/lang/solidity/files/patch-libdevcore_JSON.cpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/lang/solidity/files/patch-libevmasm_Instruction.h =================================================================== --- head/lang/solidity/files/patch-libevmasm_Instruction.h (revision 524468) +++ head/lang/solidity/files/patch-libevmasm_Instruction.h (revision 524469) @@ -1,11 +1,11 @@ ---- libevmasm/Instruction.h.orig 2018-01-23 11:51:18 UTC +--- libevmasm/Instruction.h.orig 2020-01-28 10:08:51 UTC +++ libevmasm/Instruction.h @@ -26,6 +26,8 @@ - #include - #include "Exceptions.h" + #include + #include +#undef MSIZE // remove MSIZE definition from , included by boost 1.66.0 + - namespace dev + namespace solidity::evmasm { - namespace solidity + Index: head/lang/solidity/files/patch-libsolutil_JSON.cpp =================================================================== --- head/lang/solidity/files/patch-libsolutil_JSON.cpp (nonexistent) +++ head/lang/solidity/files/patch-libsolutil_JSON.cpp (revision 524469) @@ -0,0 +1,15 @@ +--- libsolutil/JSON.cpp.orig 2020-01-27 15:36:51 UTC ++++ libsolutil/JSON.cpp +@@ -31,10 +31,12 @@ + + using namespace std; + ++/* + static_assert( + (JSONCPP_VERSION_MAJOR == 1) && (JSONCPP_VERSION_MINOR == 9) && (JSONCPP_VERSION_PATCH == 2), + "Unexpected jsoncpp version: " JSONCPP_VERSION_STRING ". Expecting 1.9.2." + ); ++*/ + + namespace solidity::util + { Property changes on: head/lang/solidity/files/patch-libsolutil_JSON.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