Index: head/net-p2p/bitcoin/Makefile =================================================================== --- head/net-p2p/bitcoin/Makefile (revision 399269) +++ head/net-p2p/bitcoin/Makefile (revision 399270) @@ -1,105 +1,106 @@ # Created by: Shaun Amott # $FreeBSD$ PORTNAME= bitcoin PORTVERSION= 0.11.0 DISTVERSIONPREFIX= v +PORTREVISION?= 1 CATEGORIES= net-p2p finance MAINTAINER= robbak@robbak.com COMMENT?= Virtual Peer-to-Peer Currency Client (QT) LICENSE= MIT LIB_DEPENDS= libboost_date_time.so:${PORTSDIR}/devel/boost-libs USES= autoreconf compiler:c++0x gmake libtool pkgconfig shebangfix SHEBANG_FILES= src/test/*.py USE_GITHUB= yes USE_OPENSSL= yes GNU_CONFIGURE= yes SLAVE_PORT?= no .if defined(SLAVE_PORT) && ${SLAVE_PORT} == "no" USES+= desktop-file-utils USE_QT4= corelib gui moc_build linguisttools_build network qmake_build \ rcc_build uic_build BUILD_DEPENDS+= protoc:${PORTSDIR}/devel/protobuf LIB_DEPENDS+= libprotobuf.so:${PORTSDIR}/devel/protobuf TESTS_USE= QT4=testlib TESTS_PLIST_FILES= %%QT_BINDIR%%/test_bitcoin-qt \ bin/test_bitcoin .endif OPTIONS_DEFINE?= DBUS DEBUG HARDENING QRCODES TESTS UPNP WALLET OPTIONS_DEFAULT?= HARDENING QRCODES 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 DBUS_CONFIGURE_WITH= qtdbus DBUS_USE= QT4=dbus DEBUG_CONFIGURE_ENABLE= debug DEBUG_INSTALL_TARGET_OFF= install-strip HARDENING_CONFIGURE_ENABLE= hardening TESTS_CONFIGURE_ENABLE= tests .if defined(SLAVE_PORT) && ${SLAVE_PORT} == "yes" TESTS_PLIST_FILES= bin/test_bitcoin .endif UPNP_CONFIGURE_WITH= miniupnpc UPNP_LIB_DEPENDS= libminiupnpc.so:${PORTSDIR}/net/miniupnpc UPNP_CPPFLAGS= -I${LOCALBASE}/include UPNP_LIBS= -L${LOCALBASE}/lib QRCODES_CONFIGURE_WITH= qrencode QRCODES_LIB_DEPENDS= libqrencode.so:${PORTSDIR}/graphics/libqrencode WALLET_CONFIGURE_ENABLE= wallet WALLET_CXXFLAGS= -I${BDB_INCLUDE_DIR} WALLET_LIBS= -L${BDB_LIB_DIR} WALLET_USE= BDB=48 GH_ACCOUNT= bitcoin CONFIGURE_ARGS?= --without-libs \ --disable-reduce-exports \ --with-gui \ --without-daemon \ --without-utils CONFIGURE_ENV= CRYPTO_CFLAGS="-I${OPENSSLINC}" CRYPTO_LIBS="-L${OPENSSLLIB} -lcrypto" \ SSL_CFLAGS="-I${OPENSSLINC}" SSL_LIBS="-L${OPENSSLLIB} -lssl" MAKE_ENV+= V=1 PLIST_FILES?= bin/bitcoin-qt share/applications/bitcoin-qt.desktop \ share/pixmaps/bitcoin128.png .if defined(SLAVE_PORT) && ${SLAVE_PORT} == "no" post-install: ${REINPLACE_CMD} -e 's,=/usr,=${PREFIX},' \ ${WRKSRC}/contrib/debian/bitcoin-qt.desktop ${INSTALL} ${WRKSRC}/contrib/debian/bitcoin-qt.desktop \ ${STAGEDIR}${PREFIX}/share/applications ${INSTALL} ${WRKSRC}/share/pixmaps/bitcoin128.png \ ${STAGEDIR}${PREFIX}/share/pixmaps/ .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/bitcoin/files/patch-src_net.cpp =================================================================== --- head/net-p2p/bitcoin/files/patch-src_net.cpp (nonexistent) +++ head/net-p2p/bitcoin/files/patch-src_net.cpp (revision 399270) @@ -0,0 +1,31 @@ +commit 9f3e48e5219a09b5ddfd6883d1f0498910eff4b6 +Author: Pavel Vasin +Date: Sun, 23 Aug 2015 23:53:49 +0300 + + add support for miniupnpc api version 14 + + The value of new arg ttl is set to 2 as it's recommended default. +--- + src/net.cpp | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/src/net.cpp b/src/net.cpp +index fb5726a..4c6331f 100644 +--- src/net.cpp.orig 2015-07-10 17:23:55 UTC ++++ src/net.cpp +@@ -1120,10 +1120,14 @@ void ThreadMapPort() + #ifndef UPNPDISCOVER_SUCCESS + /* miniupnpc 1.5 */ + devlist = upnpDiscover(2000, multicastif, minissdpdpath, 0); +-#else ++#elif MINIUPNPC_API_VERSION < 14 + /* miniupnpc 1.6 */ + int error = 0; + devlist = upnpDiscover(2000, multicastif, minissdpdpath, 0, 0, &error); ++#else ++ /* miniupnpc 1.9.20150730 */ ++ int error = 0; ++ devlist = upnpDiscover(2000, multicastif, minissdpdpath, 0, 0, 2, &error); + #endif + + struct UPNPUrls urls; Property changes on: head/net-p2p/bitcoin/files/patch-src_net.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/net-p2p/bitcoin-utils/Makefile =================================================================== --- head/net-p2p/bitcoin-utils/Makefile (revision 399269) +++ head/net-p2p/bitcoin-utils/Makefile (revision 399270) @@ -1,25 +1,26 @@ # $FreeBSD$ MASTERDIR= ${.CURDIR}/../bitcoin +PORTREVISION= 0 PKGNAMESUFFIX= -utils COMMENT= Virtual Peer-to-Peer Currency (CLI and Utilities) SLAVE_PORT= yes OPTIONS_DEFINE= DEBUG HARDENING TESTS OPTIONS_DEFAULT= HARDENING TESTS ONLY_FOR_ARCHS= amd64 i386 ia64 ONLY_FOR_ARCHS_REASON= does not support big-endian architectures CONFIGURE_ARGS= --without-daemon \ --without-gui \ --without-libs \ --without-qrencode \ --with-utils \ --disable-wallet \ --disable-reduce-exports PLIST_FILES= bin/bitcoin-cli bin/bitcoin-tx .include "${MASTERDIR}/Makefile"