From e20178f31024b4071b03de0964e9df54d075af5d Mon Sep 17 00:00:00 2001
From: Alex Dupre <ale@FreeBSD.org>
Date: Fri, 18 Jan 2019 15:53:16 +0000
Subject: [PATCH] Update to 0.5.2 release.

---
 lang/solidity/Makefile                        | 16 +++++++++------
 lang/solidity/distinfo                        |  6 +++---
 .../files/patch-libevmasm_Assembly.cpp        | 20 -------------------
 3 files changed, 13 insertions(+), 29 deletions(-)
 delete mode 100644 lang/solidity/files/patch-libevmasm_Assembly.cpp

diff --git a/lang/solidity/Makefile b/lang/solidity/Makefile
index 6a664b7e46e1..7722cafb8620 100644
--- a/lang/solidity/Makefile
+++ b/lang/solidity/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	solidity
-PORTVERSION=	0.4.25
-PORTREVISION=	2
+PORTVERSION=	0.5.2
 CATEGORIES=	lang
 MASTER_SITES=	https://github.com/ethereum/solidity/releases/download/v${PORTVERSION}/
 DISTNAME=	${PORTNAME}_${PORTVERSION}
@@ -16,12 +15,17 @@ LICENSE=	GPLv3
 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
 
+OPTIONS_DEFINE=	Z3 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
+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"
diff --git a/lang/solidity/distinfo b/lang/solidity/distinfo
index fd07564d03ca..ea2dd0ebbec8 100644
--- a/lang/solidity/distinfo
+++ b/lang/solidity/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1539260201
-SHA256 (solidity_0.4.25.tar.gz) = 8172c126973eae1d9d6c7b5071910a9c7475ac64df3945f755cee66104add72d
-SIZE (solidity_0.4.25.tar.gz) = 1159514
+TIMESTAMP = 1547820080
+SHA256 (solidity_0.5.2.tar.gz) = 95dd71f2e2ca2064bfcdc4104455f6cacb315dc29a27d5f6a7f7ef8eb0ec2ee7
+SIZE (solidity_0.5.2.tar.gz) = 1371077
diff --git a/lang/solidity/files/patch-libevmasm_Assembly.cpp b/lang/solidity/files/patch-libevmasm_Assembly.cpp
deleted file mode 100644
index 74b1e40133a1..000000000000
--- a/lang/solidity/files/patch-libevmasm_Assembly.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
---- 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;