Index: head/net-p2p/namecoin/Makefile =================================================================== --- head/net-p2p/namecoin/Makefile (revision 479110) +++ head/net-p2p/namecoin/Makefile (revision 479111) @@ -1,119 +1,120 @@ # Created by: Chad J. Milios # $FreeBSD$ PORTNAME= namecoin -PORTVERSION= 0.13.2 +PORTVERSION= 0.16.2 +DISTVERSIONPREFIX= nc PORTEPOCH= 1 CATEGORIES= net-p2p dns MAINTAINER= milios@ccsys.com COMMENT?= Decentralized, open DNS and general purpose key/value store LICENSE= MIT LIB_DEPENDS= libboost_date_time.so:devel/boost-libs \ libevent.so:devel/libevent 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 LIB_DEPENDS+= libprotobuf.so:devel/protobuf TESTS_USES= qt:4 TESTS_USE= QT=testlib TESTS_PLIST_FILES= bin/test_namecoin-qt \ bin/test_namecoin .endif OPTIONS_DEFINE?= DBUS DEBUG HARDENING QRCODES TESTS UPNP WALLET ZMQ OPTIONS_DEFAULT?= DBUS HARDENING QRCODES UPNP WALLET OPTIONS_SUB= yes HARDENING_DESC= Attempt to harden binaries (PIE for ASLR, NX Stack) QRCODES_DESC= Display QR Codes TESTS_DESC= Build test binary and unit tests WALLET_DESC= Wallet Management Support ZMQ_DESC= Block and transaction broadcasting with ZeroMQ DBUS_CONFIGURE_WITH= qtdbus DBUS_USES= qt:4 DBUS_USE= QT=dbus DEBUG_CONFIGURE_ENABLE= debug DEBUG_INSTALL_TARGET_OFF= install-strip HARDENING_CONFIGURE_ENABLE= hardening TESTS_CONFIGURE_ENABLE= tests bench .if defined(SLAVE_PORT) && ${SLAVE_PORT} == "yes" TESTS_PLIST_FILES= bin/test_namecoin .endif TESTS_PLIST_FILES+= bin/bench_namecoin UPNP_CONFIGURE_WITH= miniupnpc UPNP_LIB_DEPENDS= libminiupnpc.so:net/miniupnpc UPNP_CPPFLAGS= -I${LOCALBASE}/include UPNP_LIBS= -L${LOCALBASE}/lib QRCODES_CONFIGURE_WITH= qrencode QRCODES_LIB_DEPENDS= libqrencode.so:graphics/libqrencode WALLET_CONFIGURE_ENABLE= wallet WALLET_CXXFLAGS= -I${BDB_INCLUDE_DIR} WALLET_LIBS= -L${BDB_LIB_DIR} WALLET_USES= bdb:48 ZMQ_CONFIGURE_ENABLE= zmq ZMQ_BUILD_DEPENDS= libzmq4>0:net/libzmq4 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" \ OBJCXX="${CXX}" OBJCXXFLAGS="${CXXFLAGS}" MAKE_ENV+= V=1 PLIST_FILES?= bin/namecoin-qt share/applications/namecoin-qt.desktop \ share/pixmaps/namecoin128.png .if defined(SLAVE_PORT) && ${SLAVE_PORT} == "no" post-install: ${REINPLACE_CMD} -e 's/bitcoin/namecoin/g;s/Bitcoin/Namecoin/g' \ ${WRKSRC}/contrib/debian/bitcoin-qt.desktop ${INSTALL} ${WRKSRC}/contrib/debian/bitcoin-qt.desktop \ ${STAGEDIR}${PREFIX}/share/applications/namecoin-qt.desktop ${LOCALBASE}/bin/svg2png -w128 -h128 ${WRKSRC_graphics}/svg/namecoin-logo.svg \ ${STAGEDIR}${PREFIX}/share/pixmaps/namecoin128.png .endif regression-test: build # To use this sucessfully, remove --without-daemon and --without-utils # from CONFIGURE_ARGS above. @cd ${WRKSRC} && ${GMAKE} check .include Index: head/net-p2p/namecoin/distinfo =================================================================== --- head/net-p2p/namecoin/distinfo (revision 479110) +++ head/net-p2p/namecoin/distinfo (revision 479111) @@ -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 Index: head/net-p2p/namecoin/files/patch-src_miner.h =================================================================== --- head/net-p2p/namecoin/files/patch-src_miner.h (revision 479110) +++ head/net-p2p/namecoin/files/patch-src_miner.h (nonexistent) @@ -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(); Property changes on: head/net-p2p/namecoin/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/namecoin/files/patch-src_txmempool.h =================================================================== --- head/net-p2p/namecoin/files/patch-src_txmempool.h (revision 479110) +++ head/net-p2p/namecoin/files/patch-src_txmempool.h (nonexistent) @@ -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(); Property changes on: head/net-p2p/namecoin/files/patch-src_txmempool.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/namecoin-daemon/Makefile =================================================================== --- head/net-p2p/namecoin-daemon/Makefile (revision 479110) +++ head/net-p2p/namecoin-daemon/Makefile (revision 479111) @@ -1,29 +1,30 @@ # $FreeBSD$ MASTERDIR= ${.CURDIR}/../namecoin PKGNAMESUFFIX= -daemon COMMENT= Decentralized, open DNS and more (Daemon) SLAVE_PORT= yes ONLY_FOR_ARCHS= amd64 i386 ia64 ONLY_FOR_ARCHS_REASON= does not support big-endian architectures CONFLICTS_INSTALL= namecoin-stable-[0-9]* namecoin-stable-daemon-[0-9]* namecoin-stable-utils-[0-9]* \ namecoin-beta-[0-9]* namecoin-beta-daemon-[0-9]* namecoin-beta-utils-[0-9]* OPTIONS_DEFINE= DEBUG HARDENING TESTS UPNP WALLET ZMQ OPTIONS_DEFAULT= HARDENING UPNP WALLET CONFIGURE_ARGS= --with-daemon \ --without-gui \ --without-libs \ --without-qrencode \ - --without-utils + --without-utils \ + --disable-man PLIST_FILES= bin/namecoind USE_RC_SUBR= namecoind .include "${MASTERDIR}/Makefile" Index: head/net-p2p/namecoin-utils/Makefile =================================================================== --- head/net-p2p/namecoin-utils/Makefile (revision 479110) +++ head/net-p2p/namecoin-utils/Makefile (revision 479111) @@ -1,28 +1,29 @@ # $FreeBSD$ MASTERDIR= ${.CURDIR}/../namecoin PKGNAMESUFFIX= -utils COMMENT= Decentralized, open DNS and more (CLI and Utilities) SLAVE_PORT= yes ONLY_FOR_ARCHS= amd64 i386 ia64 ONLY_FOR_ARCHS_REASON= does not support big-endian architectures CONFLICTS_INSTALL= namecoin-stable-[0-9]* namecoin-stable-daemon-[0-9]* namecoin-stable-utils-[0-9]* \ namecoin-beta-[0-9]* namecoin-beta-daemon-[0-9]* namecoin-beta-utils-[0-9]* OPTIONS_DEFINE= DEBUG HARDENING TESTS OPTIONS_DEFAULT= HARDENING TESTS CONFIGURE_ARGS= --without-daemon \ --without-gui \ --without-libs \ --without-qrencode \ --with-utils \ - --disable-wallet + --disable-wallet \ + --disable-man PLIST_FILES= bin/namecoin-cli bin/namecoin-tx .include "${MASTERDIR}/Makefile"