Index: head/net-p2p/qtum/Makefile =================================================================== --- head/net-p2p/qtum/Makefile (revision 461014) +++ head/net-p2p/qtum/Makefile (revision 461015) @@ -1,62 +1,59 @@ # Created by: Vasil Dimov # $FreeBSD$ PORTNAME= qtum -PORTVERSION= 0.14.13 +PORTVERSION= 0.14.14 DISTVERSIONPREFIX= mainnet-ignition-v CATEGORIES= net-p2p finance MAINTAINER= vd@FreeBSD.org COMMENT= PoS cryptocurrency that can execute smart contract as part of an UTXO LICENSE= GPLv3 BROKEN_i386= does not compile: invalid operand for instruction ... ASJ(jnz, 0, b) ... "jnz" 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 \ libminiupnpc.so:net/miniupnpc \ libprotobuf.so:devel/protobuf \ libqrencode.so:graphics/libqrencode GNU_CONFIGURE= yes CONFIGURE_ENV= BDB_CFLAGS="-I${BDB_INCLUDE_DIR}" \ BDB_LIBS="-L${BDB_LIB_DIR} -l${BDB_LIB_CXX_NAME}" # * 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. # * Do not install unneeded include/bitcoinconsensus.h and # lib/libbitcoinconsensus.* (--without-libs) CONFIGURE_ARGS= --disable-man \ --with-gui=qt5 \ --with-incompatible-bdb \ --with-miniupnpc=${LOCALBASE} \ --with-qrencode \ --without-libs USES= autoreconf bdb:5 compiler:c++11-lib gmake libtool pkgconfig ssl USE_QT5= buildtools core dbus gui linguisttools network testlib widgets USE_GITHUB= yes -GH_ACCOUNT= qtumproject -GH_PROJECT= qtum -# Add extra account:project:tag:meaninglessgroupname/sub/dir via GH_TUPLE -# for the one git submodule used by Qtum. -GH_TUPLE= qtumproject:cpp-eth-qtum:488ccdc7cef0a0b4fa54c8:cppeth/src/cpp-ethereum +GH_TUPLE= qtumproject:qtum:${DISTVERSIONPREFIX}${PORTVERSION} \ + qtumproject:cpp-eth-qtum:488ccdc7cef0a0b4fa54c8:cppeth/src/cpp-ethereum .include # The ./configure script tries to use pkg-config to derive the SSL CFLAGS and # libraries, but pkg-config requires libssl.pc which is only installed by the # ports' security/openssl and not present in the base system. So if we are to # use the base's SSL, then we trick ./configure to not use pkg-config by # setting some related environment variables. .if ${SSL_DEFAULT} == base CONFIGURE_ENV+= CRYPTO_CFLAGS="-I${OPENSSLINC}" \ CRYPTO_LIBS="-L${OPENSSLLIB} -lcrypto" \ SSL_CFLAGS="-I${OPENSSLINC}" \ SSL_LIBS="-L${OPENSSLLIB} -lssl" .endif .include Index: head/net-p2p/qtum/distinfo =================================================================== --- head/net-p2p/qtum/distinfo (revision 461014) +++ head/net-p2p/qtum/distinfo (revision 461015) @@ -1,5 +1,5 @@ -TIMESTAMP = 1516443928 -SHA256 (qtumproject-qtum-mainnet-ignition-v0.14.13_GH0.tar.gz) = 30cbd2ff31208e9f76558b8bef820ecdc7bc2d3d87768e6d8fb1014aab233a7c -SIZE (qtumproject-qtum-mainnet-ignition-v0.14.13_GH0.tar.gz) = 12711274 +TIMESTAMP = 1517834793 +SHA256 (qtumproject-qtum-mainnet-ignition-v0.14.14_GH0.tar.gz) = 45a0ee545a9c9b4c623b926f3c59113968e40dbb3113da9b6369afdec7146e3b +SIZE (qtumproject-qtum-mainnet-ignition-v0.14.14_GH0.tar.gz) = 12869242 SHA256 (qtumproject-cpp-eth-qtum-488ccdc7cef0a0b4fa54c8_GH0.tar.gz) = 7e4325f959104ab781892d5078d33b53de2d4efddf7effe67a9d837d56872ff2 SIZE (qtumproject-cpp-eth-qtum-488ccdc7cef0a0b4fa54c8_GH0.tar.gz) = 1113806 Index: head/net-p2p/qtum/files/patch-src_miner.h =================================================================== --- head/net-p2p/qtum/files/patch-src_miner.h (revision 461014) +++ head/net-p2p/qtum/files/patch-src_miner.h (nonexistent) @@ -1,11 +0,0 @@ ---- src/miner.h.orig 2018-01-21 15:27:53 UTC -+++ src/miner.h -@@ -99,7 +99,7 @@ struct modifiedentry_iter { - // except operating on CTxMemPoolModifiedEntry. - // TODO: refactor to avoid duplication of this logic. - struct CompareModifiedEntry { -- bool operator()(const CTxMemPoolModifiedEntry &a, const CTxMemPoolModifiedEntry &b) -+ bool operator()(const CTxMemPoolModifiedEntry &a, const CTxMemPoolModifiedEntry &b) const - { - bool fAHasCreateOrCall = a.iter->GetTx().HasCreateOrCall(); - bool fBHasCreateOrCall = b.iter->GetTx().HasCreateOrCall(); Property changes on: head/net-p2p/qtum/files/patch-src_miner.h ___________________________________________________________________ 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/net-p2p/qtum/files/patch-src_txmempool.h =================================================================== --- head/net-p2p/qtum/files/patch-src_txmempool.h (revision 461014) +++ head/net-p2p/qtum/files/patch-src_txmempool.h (nonexistent) @@ -1,65 +0,0 @@ ---- src/txmempool.h.orig 2018-01-21 15:28:11 UTC -+++ src/txmempool.h -@@ -231,7 +231,7 @@ struct mempoolentry_txid - class CompareTxMemPoolEntryByDescendantScore - { - public: -- bool operator()(const CTxMemPoolEntry& a, const CTxMemPoolEntry& b) -+ bool operator()(const CTxMemPoolEntry& a, const CTxMemPoolEntry& b) const - { - bool fUseADescendants = UseDescendantScore(a); - bool fUseBDescendants = UseDescendantScore(b); -@@ -253,7 +253,7 @@ public: - } - - // Calculate which score to use for an entry (avoiding division). -- bool UseDescendantScore(const CTxMemPoolEntry &a) -+ bool UseDescendantScore(const CTxMemPoolEntry &a) const - { - double f1 = (double)a.GetModifiedFee() * a.GetSizeWithDescendants(); - double f2 = (double)a.GetModFeesWithDescendants() * a.GetTxSize(); -@@ -268,7 +268,7 @@ public: - class CompareTxMemPoolEntryByScore - { - public: -- bool operator()(const CTxMemPoolEntry& a, const CTxMemPoolEntry& b) -+ bool operator()(const CTxMemPoolEntry& a, const CTxMemPoolEntry& b) const - { - double f1 = (double)a.GetModifiedFee() * b.GetTxSize(); - double f2 = (double)b.GetModifiedFee() * a.GetTxSize(); -@@ -282,7 +282,7 @@ public: - class CompareTxMemPoolEntryByEntryTime - { - public: -- bool operator()(const CTxMemPoolEntry& a, const CTxMemPoolEntry& b) -+ bool operator()(const CTxMemPoolEntry& a, const CTxMemPoolEntry& b) const - { - return a.GetTime() < b.GetTime(); - } -@@ -291,7 +291,7 @@ public: - class CompareTxMemPoolEntryByAncestorFee - { - public: -- bool operator()(const CTxMemPoolEntry& a, const CTxMemPoolEntry& b) -+ bool operator()(const CTxMemPoolEntry& a, const CTxMemPoolEntry& b) const - { - double aFees = a.GetModFeesWithAncestors(); - double aSize = a.GetSizeWithAncestors(); -@@ -314,7 +314,7 @@ public: - class CompareTxMemPoolEntryByAncestorFeeOrGasPrice - { - public: -- bool operator()(const CTxMemPoolEntry& a, const CTxMemPoolEntry& b) -+ bool operator()(const CTxMemPoolEntry& a, const CTxMemPoolEntry& b) const - { - bool fAHasCreateOrCall = a.GetTx().HasCreateOrCall(); - bool fBHasCreateOrCall = b.GetTx().HasCreateOrCall(); -@@ -801,7 +801,7 @@ typedef std::pair