Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 25 Sep 2019 19:44:18 +0000 (UTC)
From:      Vasil Dimov <vd@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r512806 - in head/net-p2p/qtum: . files
Message-ID:  <201909251944.x8PJiICS042861@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: vd
Date: Wed Sep 25 19:44:18 2019
New Revision: 512806
URL: https://svnweb.freebsd.org/changeset/ports/512806

Log:
  net-p2p/qtum: Upgrade from 0.18.0 to 0.18.1

Added:
  head/net-p2p/qtum/files/patch-src_Makefile.am   (contents, props changed)
  head/net-p2p/qtum/files/patch-src_cpp-ethereum_ethash_lib_ethash_endianness.hpp   (contents, props changed)
  head/net-p2p/qtum/files/patch-src_cpp-ethereum_ethash_lib_ethash_keccak.c   (contents, props changed)
  head/net-p2p/qtum/files/patch-src_cpp-ethereum_libaleth-interpreter_VM.cpp   (contents, props changed)
  head/net-p2p/qtum/files/patch-src_cpp-ethereum_libdevcore_Common.cpp   (contents, props changed)
  head/net-p2p/qtum/files/patch-src_cpp-ethereum_libevm_LegacyVM.cpp   (contents, props changed)
Deleted:
  head/net-p2p/qtum/files/patch-src__cpp-ethereum__libethash__endian.h
  head/net-p2p/qtum/files/patch-src__cpp-ethereum__libethash__internal.c
Modified:
  head/net-p2p/qtum/Makefile
  head/net-p2p/qtum/distinfo

Modified: head/net-p2p/qtum/Makefile
==============================================================================
--- head/net-p2p/qtum/Makefile	Wed Sep 25 19:06:04 2019	(r512805)
+++ head/net-p2p/qtum/Makefile	Wed Sep 25 19:44:18 2019	(r512806)
@@ -2,9 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	qtum
-PORTVERSION=	0.18.0
+PORTVERSION=	0.18.1
 DISTVERSIONPREFIX=	mainnet-ignition-v
-PORTREVISION=	1
 CATEGORIES=	net-p2p finance
 
 MAINTAINER=	vd@FreeBSD.org
@@ -18,6 +17,7 @@ BUILD_DEPENDS=	libzmq4>0:net/libzmq4
 RUN_DEPENDS=	libzmq4>0:net/libzmq4
 LIB_DEPENDS=	libboost_date_time.so:devel/boost-libs \
 		libevent.so:devel/libevent \
+		libgmp.so:math/gmp \
 		libminiupnpc.so:net/miniupnpc \
 		libprotobuf.so:devel/protobuf \
 		libqrencode.so:graphics/libqrencode
@@ -25,8 +25,10 @@ LIB_DEPENDS=	libboost_date_time.so:devel/boost-libs \
 USES=		autoreconf bdb:5+ compiler:c++14-lang gmake libtool pkgconfig qt:5 ssl
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	BDB_CFLAGS="-I${BDB_INCLUDE_DIR}" \
-		BDB_LIBS="-L${BDB_LIB_DIR} -l${BDB_LIB_CXX_NAME}"
+CONFIGURE_ENV+=	BDB_CFLAGS="-I${BDB_INCLUDE_DIR}" \
+		BDB_LIBS="-L${BDB_LIB_DIR} -l${BDB_LIB_CXX_NAME}" \
+		CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
 # * Man pages have not been adjusted after cloning the Bitcoin code base.
 #   They are the old Bitcoin man pages, so do not install them.
 # * --with-incompatible-bdb is required in order to use bdb-5.
@@ -42,7 +44,9 @@ CONFIGURE_ARGS=	--disable-man \
 USE_QT=		buildtools core dbus gui linguisttools network testlib widgets
 USE_GITHUB=	yes
 GH_TUPLE=	qtumproject:qtum:${DISTVERSIONPREFIX}${PORTVERSION} \
-		qtumproject:cpp-eth-qtum:d6081ecc98e3c5f4701363:cppeth/src/cpp-ethereum
+		qtumproject:cpp-eth-qtum:ac506e6120fc05d3d823d4:cppeth1/src/cpp-ethereum \
+		chfast:ethash:67a3216a5494834f7c221df93b079dac4:cppeth2/src/cpp-ethereum/ethash \
+		ethereum:evmc:bf7064dca5cbbda4def8c2548d0d7a040:cppeth3/src/cpp-ethereum/evmc
 
 .include <bsd.port.pre.mk>
 

Modified: head/net-p2p/qtum/distinfo
==============================================================================
--- head/net-p2p/qtum/distinfo	Wed Sep 25 19:06:04 2019	(r512805)
+++ head/net-p2p/qtum/distinfo	Wed Sep 25 19:44:18 2019	(r512806)
@@ -1,5 +1,9 @@
-TIMESTAMP = 1566058704
-SHA256 (qtumproject-qtum-mainnet-ignition-v0.18.0_GH0.tar.gz) = 59c5746c55ef39cfe975ae9aaf6a51effa79ab5e3d6e702e14a57f75e33ccd95
-SIZE (qtumproject-qtum-mainnet-ignition-v0.18.0_GH0.tar.gz) = 12519993
-SHA256 (qtumproject-cpp-eth-qtum-d6081ecc98e3c5f4701363_GH0.tar.gz) = 62c858543510aaf656ce0a247e26fbce4a9b11d1fa424f40e9ff0fdc822b4b34
-SIZE (qtumproject-cpp-eth-qtum-d6081ecc98e3c5f4701363_GH0.tar.gz) = 1114149
+TIMESTAMP = 1569429507
+SHA256 (qtumproject-qtum-mainnet-ignition-v0.18.1_GH0.tar.gz) = bad156843b9dc7ae61ffba527067893b7192bb873841381f26547a318d3be638
+SIZE (qtumproject-qtum-mainnet-ignition-v0.18.1_GH0.tar.gz) = 12677556
+SHA256 (qtumproject-cpp-eth-qtum-ac506e6120fc05d3d823d4_GH0.tar.gz) = b632653140f334f775430cd3d09a2b04a526a5a89c9771d3754baa545ffa264e
+SIZE (qtumproject-cpp-eth-qtum-ac506e6120fc05d3d823d4_GH0.tar.gz) = 1036840
+SHA256 (chfast-ethash-67a3216a5494834f7c221df93b079dac4_GH0.tar.gz) = 6c3f996b488844d70f1d4a0234cee5f93e715a3debcb626bdb3778c241bc1860
+SIZE (chfast-ethash-67a3216a5494834f7c221df93b079dac4_GH0.tar.gz) = 95929
+SHA256 (ethereum-evmc-bf7064dca5cbbda4def8c2548d0d7a040_GH0.tar.gz) = 881c99b3093978f3b03811d318373eea04ce91092e1f8585eaa4bb82c41b81b3
+SIZE (ethereum-evmc-bf7064dca5cbbda4def8c2548d0d7a040_GH0.tar.gz) = 68126

Added: head/net-p2p/qtum/files/patch-src_Makefile.am
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net-p2p/qtum/files/patch-src_Makefile.am	Wed Sep 25 19:44:18 2019	(r512806)
@@ -0,0 +1,14 @@
+--- src/Makefile.am.orig	2019-09-18 14:02:05 UTC
++++ src/Makefile.am
+@@ -19,9 +19,8 @@ else
+ LIBUNIVALUE = $(UNIVALUE_LIBS)
+ endif
+ 
+-BITCOIN_INCLUDES=-I$(builddir) $(BDB_CPPFLAGS) $(BOOST_CPPFLAGS) $(LEVELDB_CPPFLAGS) $(CRYPTO_CFLAGS) $(SSL_CFLAGS) -I$(srcdir)/cpp-ethereum/utils
+-
+-BITCOIN_INCLUDES += -I$(srcdir)/secp256k1/include
++BITCOIN_INCLUDES= -I$(srcdir)/secp256k1/include
++BITCOIN_INCLUDES += -I$(builddir) $(BDB_CPPFLAGS) $(BOOST_CPPFLAGS) $(LEVELDB_CPPFLAGS) $(CRYPTO_CFLAGS) $(SSL_CFLAGS) -I$(srcdir)/cpp-ethereum/utils
+ BITCOIN_INCLUDES += -I$(srcdir)/libff/libff
+ BITCOIN_INCLUDES += -I$(srcdir)/libff
+ BITCOIN_INCLUDES += $(UNIVALUE_CFLAGS)

Added: head/net-p2p/qtum/files/patch-src_cpp-ethereum_ethash_lib_ethash_endianness.hpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net-p2p/qtum/files/patch-src_cpp-ethereum_ethash_lib_ethash_endianness.hpp	Wed Sep 25 19:44:18 2019	(r512806)
@@ -0,0 +1,11 @@
+--- src/cpp-ethereum/ethash/lib/ethash/endianness.hpp.orig	2018-12-14 16:19:59 UTC
++++ src/cpp-ethereum/ethash/lib/ethash/endianness.hpp
+@@ -24,7 +24,7 @@
+ #define __BIG_ENDIAN 4321
+ #define __BYTE_ORDER __LITTLE_ENDIAN
+ 
+-#elif __APPLE__
++#elif __APPLE__ || __FreeBSD__
+ 
+ #include <machine/endian.h>
+ 

Added: head/net-p2p/qtum/files/patch-src_cpp-ethereum_ethash_lib_ethash_keccak.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net-p2p/qtum/files/patch-src_cpp-ethereum_ethash_lib_ethash_keccak.c	Wed Sep 25 19:44:18 2019	(r512806)
@@ -0,0 +1,11 @@
+--- src/cpp-ethereum/ethash/lib/ethash/keccak.c.orig	2018-12-14 16:19:59 UTC
++++ src/cpp-ethereum/ethash/lib/ethash/keccak.c
+@@ -13,7 +13,7 @@
+ #define __LITTLE_ENDIAN 1234
+ #define __BIG_ENDIAN 4321
+ #define __BYTE_ORDER __LITTLE_ENDIAN
+-#elif __APPLE__
++#elif __APPLE__ || __FreeBSD__
+ #include <machine/endian.h>
+ #else
+ #include <endian.h>

Added: head/net-p2p/qtum/files/patch-src_cpp-ethereum_libaleth-interpreter_VM.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net-p2p/qtum/files/patch-src_cpp-ethereum_libaleth-interpreter_VM.cpp	Wed Sep 25 19:44:18 2019	(r512806)
@@ -0,0 +1,13 @@
+--- src/cpp-ethereum/libaleth-interpreter/VM.cpp.orig	2019-09-18 13:47:22 UTC
++++ src/cpp-ethereum/libaleth-interpreter/VM.cpp
+@@ -20,6 +20,10 @@
+ 
+ #include <aleth/buildinfo.h>
+ 
++#ifdef MSIZE
++#undef MSIZE
++#endif /* MSIZE */
++
+ namespace
+ {
+ void destroy(evmc_instance* _instance)

Added: head/net-p2p/qtum/files/patch-src_cpp-ethereum_libdevcore_Common.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net-p2p/qtum/files/patch-src_cpp-ethereum_libdevcore_Common.cpp	Wed Sep 25 19:44:18 2019	(r512806)
@@ -0,0 +1,10 @@
+--- src/cpp-ethereum/libdevcore/Common.cpp.orig	2019-09-18 13:47:22 UTC
++++ src/cpp-ethereum/libdevcore/Common.cpp
+@@ -24,6 +24,7 @@
+ #endif
+ 
+ #include <aleth/buildinfo.h>
++#include <clocale> /* std::setlocale */
+ 
+ using namespace std;
+ 

Added: head/net-p2p/qtum/files/patch-src_cpp-ethereum_libevm_LegacyVM.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net-p2p/qtum/files/patch-src_cpp-ethereum_libevm_LegacyVM.cpp	Wed Sep 25 19:44:18 2019	(r512806)
@@ -0,0 +1,13 @@
+--- src/cpp-ethereum/libevm/LegacyVM.cpp.orig	2019-09-18 13:47:22 UTC
++++ src/cpp-ethereum/libevm/LegacyVM.cpp
+@@ -17,6 +17,10 @@
+ 
+ #include "LegacyVM.h"
+ 
++#ifdef MSIZE
++#undef MSIZE
++#endif /* MSIZE */
++
+ using namespace std;
+ using namespace dev;
+ using namespace dev::eth;



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201909251944.x8PJiICS042861>