From 0e9183c770a1882df2d19b3e8db2577864f1792b Mon Sep 17 00:00:00 2001 From: Rene Ladan Date: Thu, 6 Sep 2018 18:06:51 +0000 Subject: [PATCH] Update net-p2p/namecoin* ports to version 0.16.2 PR: 231167 Submitted by: maintainer --- net-p2p/namecoin-daemon/Makefile | 3 +- net-p2p/namecoin-utils/Makefile | 3 +- net-p2p/namecoin/Makefile | 13 +++--- net-p2p/namecoin/distinfo | 6 +-- net-p2p/namecoin/files/patch-src_miner.h | 20 --------- net-p2p/namecoin/files/patch-src_txmempool.h | 47 -------------------- 6 files changed, 14 insertions(+), 78 deletions(-) delete mode 100644 net-p2p/namecoin/files/patch-src_miner.h delete mode 100644 net-p2p/namecoin/files/patch-src_txmempool.h diff --git a/net-p2p/namecoin-daemon/Makefile b/net-p2p/namecoin-daemon/Makefile index f79bb5e968d5..0d2c19ab7589 100644 --- a/net-p2p/namecoin-daemon/Makefile +++ b/net-p2p/namecoin-daemon/Makefile @@ -20,7 +20,8 @@ CONFIGURE_ARGS= --with-daemon \ --without-gui \ --without-libs \ --without-qrencode \ - --without-utils + --without-utils \ + --disable-man PLIST_FILES= bin/namecoind diff --git a/net-p2p/namecoin-utils/Makefile b/net-p2p/namecoin-utils/Makefile index 41f35214c3e5..287d781381c8 100644 --- a/net-p2p/namecoin-utils/Makefile +++ b/net-p2p/namecoin-utils/Makefile @@ -21,7 +21,8 @@ CONFIGURE_ARGS= --without-daemon \ --without-libs \ --without-qrencode \ --with-utils \ - --disable-wallet + --disable-wallet \ + --disable-man PLIST_FILES= bin/namecoin-cli bin/namecoin-tx diff --git a/net-p2p/namecoin/Makefile b/net-p2p/namecoin/Makefile index 8a328cead214..b58632d75cd2 100644 --- a/net-p2p/namecoin/Makefile +++ b/net-p2p/namecoin/Makefile @@ -2,7 +2,8 @@ # $FreeBSD$ PORTNAME= namecoin -PORTVERSION= 0.13.2 +PORTVERSION= 0.16.2 +DISTVERSIONPREFIX= nc PORTEPOCH= 1 CATEGORIES= net-p2p dns @@ -17,21 +18,20 @@ LIB_DEPENDS= libboost_date_time.so:devel/boost-libs \ CONFLICTS_INSTALL= namecoin-beta-[0-9]* namecoin-beta-daemon-[0-9]* namecoin-beta-utils-[0-9]* \ namecoin-stable-[0-9]* namecoin-stable-daemon-[0-9]* namecoin-stable-utils-[0-9]* -USES= autoreconf compiler:c++11-lib gmake libtool pkgconfig shebangfix ssl -SHEBANG_FILES= src/test/*.py +USES= autoreconf compiler:c++11-lib gmake libtool pkgconfig ssl GNU_CONFIGURE= yes USE_GITHUB= yes GH_ACCOUNT= indolering:graphics GH_PROJECT= namecoin-core namecoin-graphics:graphics -GH_TAGNAME= ab08f76 a13a73b:graphics +GH_TAGNAME= a13a73b:graphics SLAVE_PORT?= no .if defined(SLAVE_PORT) && ${SLAVE_PORT} == "no" USES+= desktop-file-utils qt:4 USE_QT= corelib gui moc_build linguisttools_build network qmake_build \ - rcc_build uic_build + rcc_build uic_build xml BUILD_DEPENDS+= protoc:devel/protobuf \ svg2png:graphics/svg2png @@ -88,7 +88,8 @@ ZMQ_RUN_DEPENDS= libzmq4>0:net/libzmq4 CONFIGURE_ARGS?= --without-libs \ --with-gui=qt4 \ --without-daemon \ - --without-utils + --without-utils \ + --disable-man CONFIGURE_ENV= CRYPTO_CFLAGS="-I${OPENSSLINC}" CRYPTO_LIBS="-L${OPENSSLLIB} -lcrypto" \ SSL_CFLAGS="-I${OPENSSLINC}" SSL_LIBS="-L${OPENSSLLIB} -lssl" \ diff --git a/net-p2p/namecoin/distinfo b/net-p2p/namecoin/distinfo index 734bb1e56bbd..ca85f45fc17f 100644 --- a/net-p2p/namecoin/distinfo +++ b/net-p2p/namecoin/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1500647782 -SHA256 (namecoin-namecoin-core-0.13.2-ab08f76_GH0.tar.gz) = 27ee9f0fca2f9d98bfc298848ad2b899a895c0c7c8e63caca2ee317c927cd178 -SIZE (namecoin-namecoin-core-0.13.2-ab08f76_GH0.tar.gz) = 5917889 +TIMESTAMP = 1536120223 +SHA256 (namecoin-namecoin-core-nc0.16.2_GH0.tar.gz) = 2dec11332ce3284dfe3d9a6291eb770e1c27fcdb707f13b542494db527aa8d99 +SIZE (namecoin-namecoin-core-nc0.16.2_GH0.tar.gz) = 5510735 SHA256 (indolering-namecoin-graphics-a13a73b_GH0.tar.gz) = 82f308a3527d96a202099feb96a754d036bbdaa875156ad002ba2747d75000c7 SIZE (indolering-namecoin-graphics-a13a73b_GH0.tar.gz) = 7364908 diff --git a/net-p2p/namecoin/files/patch-src_miner.h b/net-p2p/namecoin/files/patch-src_miner.h deleted file mode 100644 index aa7c24b5ec17..000000000000 --- a/net-p2p/namecoin/files/patch-src_miner.h +++ /dev/null @@ -1,20 +0,0 @@ ---- src/miner.h.orig 2017-02-05 10:17:27 UTC -+++ src/miner.h -@@ -73,7 +73,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 - { - double f1 = (double)a.nModFeesWithAncestors * b.nSizeWithAncestors; - double f2 = (double)b.nModFeesWithAncestors * a.nSizeWithAncestors; -@@ -88,7 +88,7 @@ struct CompareModifiedEntry { - // This is sufficient to sort an ancestor package in an order that is valid - // to appear in a block. - struct CompareTxIterByAncestorCount { -- bool operator()(const CTxMemPool::txiter &a, const CTxMemPool::txiter &b) -+ bool operator()(const CTxMemPool::txiter &a, const CTxMemPool::txiter &b) const - { - if (a->GetCountWithAncestors() != b->GetCountWithAncestors()) - return a->GetCountWithAncestors() < b->GetCountWithAncestors(); diff --git a/net-p2p/namecoin/files/patch-src_txmempool.h b/net-p2p/namecoin/files/patch-src_txmempool.h deleted file mode 100644 index ffa1e51d5c47..000000000000 --- a/net-p2p/namecoin/files/patch-src_txmempool.h +++ /dev/null @@ -1,47 +0,0 @@ ---- src/txmempool.h.orig 2017-02-05 10:17:27 UTC -+++ src/txmempool.h -@@ -255,7 +255,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); -@@ -277,7 +277,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(); -@@ -292,7 +292,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(); -@@ -306,7 +306,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(); - } -@@ -315,7 +315,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();