5 files changed, 40 insertions, 6 deletions

diff --git a/net-p2p/bitcoin/Makefile b/net-p2p/bitcoin/Makefile
index cc81c7105ba1..1e70c46b0fde 100644
--- a/net-p2p/bitcoin/Makefile
+++ b/net-p2p/bitcoin/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	bitcoin
-PORTVERSION=	0.8.1
-PORTREVISION=	1
+PORTVERSION=	0.8.2
 CATEGORIES=	net-p2p finance
 
 MAINTAINER=	robbak@robbak.com
@@ -21,13 +20,14 @@ QRCODES_DESC=	Build with QR code display
 USE_GITHUB=	yes
 GH_ACCOUNT=	bitcoin
 GH_PROJECT=	bitcoin
-GH_COMMIT=	38f8657
+GH_COMMIT=	09e437b
 GH_TAGNAME=	v${PORTVERSION}
 
 USE_GMAKE=	yes
 USE_OPENSSL=	yes
 USE_BDB=	yes
 WANT_BDB_VER=	48
+MAKE_JOBS_SAFE=	yes
 
 CXXFLAGS+=	-I${LOCALBASE}/include -I${BDB_INCLUDE_DIR}
 CXXFLAGS+=	-L${LOCALBASE}/lib -L${BDB_LIB_DIR}
@@ -40,7 +40,7 @@ USE_QT4=	corelib gui qmake_build linguist uic moc rcc
 BINARY=		bitcoin-qt
 .else
 BINARY=		bitcoind
-ALL_TARGET=	${BINARY}
+ALL_TARGET=	${BINARY} test
 MAKE_ARGS+=	-C ${WRKSRC}/src
 .endif
 
diff --git a/net-p2p/bitcoin/distinfo b/net-p2p/bitcoin/distinfo
index 30080d885406..6f8ac4554af4 100644
--- a/net-p2p/bitcoin/distinfo
+++ b/net-p2p/bitcoin/distinfo
@@ -1,2 +1,2 @@
-SHA256 (bitcoin-0.8.1.tar.gz) = cd24be785f04872e8f74968a018b1d78afc0fd7689c3639cdaf340de000997b1
-SIZE (bitcoin-0.8.1.tar.gz) = 1965003
+SHA256 (bitcoin-0.8.2.tar.gz) = 708ca0fae80e75a670277aa484727750462130e15bfc422ee2512dd26a60ac2f
+SIZE (bitcoin-0.8.2.tar.gz) = 3181548
diff --git a/net-p2p/bitcoin/files/patch-bitcoin-qt_pro-Add_boost-crypto b/net-p2p/bitcoin/files/patch-bitcoin-qt_pro-Add_boost-crypto
new file mode 100644
index 000000000000..5816698547fe
--- /dev/null
+++ b/net-p2p/bitcoin/files/patch-bitcoin-qt_pro-Add_boost-crypto
@@ -0,0 +1,11 @@
+diff -ur ../bitcoin-bitcoin-18c9239.orig/bitcoin-qt.pro ./bitcoin-qt.pro
+--- ../bitcoin-bitcoin-18c9239.orig/bitcoin-qt.pro	2013-05-24 22:50:15.000000000 +1000
++++ ./bitcoin-qt.pro	2013-05-24 22:51:35.000000000 +1000
+@@ -402,7 +402,7 @@
+ LIBS += -lssl -lcrypto -ldb_cxx$$BDB_LIB_SUFFIX
+ # -lgdi32 has to happen after -lcrypto (see  #681)
+ win32:LIBS += -lws2_32 -lshlwapi -lmswsock -lole32 -loleaut32 -luuid -lgdi32
+-LIBS += -lboost_system$$BOOST_LIB_SUFFIX -lboost_filesystem$$BOOST_LIB_SUFFIX -lboost_program_options$$BOOST_LIB_SUFFIX -lboost_thread$$BOOST_THREAD_LIB_SUFFIX
++LIBS += -lboost_system$$BOOST_LIB_SUFFIX -lboost_filesystem$$BOOST_LIB_SUFFIX -lboost_program_options$$BOOST_LIB_SUFFIX -lboost_thread$$BOOST_THREAD_LIB_SUFFIX -lboost_chrono$$BOOST_LIB_SUFFIX
+ win32:LIBS += -lboost_chrono$$BOOST_LIB_SUFFIX
+ macx:LIBS += -lboost_chrono$$BOOST_LIB_SUFFIX
diff --git a/net-p2p/bitcoin/files/patch-init_cpp b/net-p2p/bitcoin/files/patch-init_cpp
new file mode 100644
index 000000000000..8bc42b140588
--- /dev/null
+++ b/net-p2p/bitcoin/files/patch-init_cpp
@@ -0,0 +1,12 @@
+diff -ur ../bitcoin-bitcoin-18c9239.orig/src/init.cpp ./src/init.cpp
+--- ../bitcoin-bitcoin-18c9239.orig/src/init.cpp	2013-05-24 22:50:15.000000000 +1000
++++ ./src/init.cpp	2013-05-24 22:53:20.000000000 +1000
+@@ -530,7 +530,7 @@
+     // Make sure enough file descriptors are available
+     int nBind = std::max((int)mapArgs.count("-bind"), 1);
+     nMaxConnections = GetArg("-maxconnections", 125);
+-    nMaxConnections = std::max(std::min(nMaxConnections, FD_SETSIZE - nBind - MIN_CORE_FILEDESCRIPTORS), 0);
++    nMaxConnections = std::max(std::min(nMaxConnections, (int)(FD_SETSIZE - nBind - MIN_CORE_FILEDESCRIPTORS)), 0);
+     int nFD = RaiseFileDescriptorLimit(nMaxConnections + MIN_CORE_FILEDESCRIPTORS);
+     if (nFD < MIN_CORE_FILEDESCRIPTORS)
+         return InitError(_("Not enough file descriptors available."));
diff --git a/net-p2p/bitcoin/files/patch-makefile_unix-Add_boost-crypto b/net-p2p/bitcoin/files/patch-makefile_unix-Add_boost-crypto
new file mode 100644
index 000000000000..fb6aca794a71
--- /dev/null
+++ b/net-p2p/bitcoin/files/patch-makefile_unix-Add_boost-crypto
@@ -0,0 +1,11 @@
+diff -ur ../bitcoin-bitcoin-18c9239.orig/src/makefile.unix ./src/makefile.unix
+--- ../bitcoin-bitcoin-18c9239.orig/src/makefile.unix	2013-05-24 22:50:15.000000000 +1000
++++ ./src/makefile.unix	2013-05-24 22:52:34.000000000 +1000
+@@ -38,6 +38,7 @@
+    -l boost_filesystem$(BOOST_LIB_SUFFIX) \
+    -l boost_program_options$(BOOST_LIB_SUFFIX) \
+    -l boost_thread$(BOOST_LIB_SUFFIX) \
++   -l boost_chrono$(BOOST_LIB_SUFFIX) \
+    -l db_cxx$(BDB_LIB_SUFFIX) \
+    -l ssl \
+    -l crypto