- update to 0.8.0

- remove patched, applied upstream

changelog:
http://sourceforge.net/projects/bitcoin/files/Bitcoin/bitcoin-0.8.0/

PR:     176284
Submitted by:	Robert Backahus <robbak@mynetfone.com.au> (maintainer, other email)

4 files changed, 5 insertions, 36 deletions

diff --git a/net-p2p/bitcoin/Makefile b/net-p2p/bitcoin/Makefile
index 4c17359e757e..6c05b22be2d7 100644
--- a/net-p2p/bitcoin/Makefile
+++ b/net-p2p/bitcoin/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	bitcoin
-PORTVERSION=	0.7.1
-PORTREVISION=	1
+PORTVERSION=	0.8.0
 CATEGORIES=	net-p2p finance
 
 MAINTAINER=	robbak@robbak.com
@@ -14,14 +13,14 @@ LIB_DEPENDS=	boost_date_time:${PORTSDIR}/devel/boost-libs
 OPTIONS_DEFINE=	GUI UPNP QRCODES
 OPTIONS_DEFAULT=	GUI QRCODES
 
-GUI_DESC=	Build as a QT3 GUI
+GUI_DESC=	Build as a QT4 GUI
 UPNP_DESC=	Build with UPNP support
 QRCODES_DESC=	Build with QR code display
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	bitcoin
 GH_PROJECT=	bitcoin
-GH_COMMIT=	d082365
+GH_COMMIT=	f4d5f06
 GH_TAGNAME=	v${PORTVERSION}
 
 USE_GMAKE=	yes
@@ -36,7 +35,6 @@ CXXFLAGS+=	-Wno-invalid-offsetof
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MGUI} && !defined(WITHOUT_X11)
-USE_QT_VER=	4
 USE_QT4=	corelib gui qmake_build linguist uic moc rcc
 BINARY=		bitcoin-qt
 .else
@@ -64,9 +62,6 @@ QMAKE_USE_UPNP=	-
 .include <bsd.port.pre.mk>
 
 post-patch:
-	@${CP} ${WRKSRC}/src/protocol.h ${WRKSRC}/src/protocol.h.orig
-	@${AWK} 'BEGIN { f = 0 } { if ( $$0 ~ /^#include/ && f == 0 ) { f = 1; print "#include <sys/socket.h>"; print "#include <netinet/in.h>" }; print }' \
-		${WRKSRC}/src/protocol.h.orig > ${WRKSRC}/src/protocol.h
 .if !${PORT_OPTIONS:MGUI} || defined(WITHOUT_X11)
 	@cd ${WRKSRC}/src && ${CP} -p makefile.unix Makefile
 	@${REINPLACE_CMD} \
diff --git a/net-p2p/bitcoin/distinfo b/net-p2p/bitcoin/distinfo
index 0ff7a1e4145e..376744a06a1f 100644
--- a/net-p2p/bitcoin/distinfo
+++ b/net-p2p/bitcoin/distinfo
@@ -1,2 +1,2 @@
-SHA256 (bitcoin-0.7.1.tar.gz) = eb1c4bb59a6a6557e59dec5d90ab7c45b660898f535fafaeaed051aeb347b94d
-SIZE (bitcoin-0.7.1.tar.gz) = 1623510
+SHA256 (bitcoin-0.8.0.tar.gz) = 436044ecad90a40c4b8b4186816ac9d2e3b99baf5252532ea35215d9d4ce065e
+SIZE (bitcoin-0.8.0.tar.gz) = 1965169
diff --git a/net-p2p/bitcoin/files/patch-qtipcserver-cpp b/net-p2p/bitcoin/files/patch-qtipcserver-cpp
deleted file mode 100644
index 3da8e9b209e5..000000000000
--- a/net-p2p/bitcoin/files/patch-qtipcserver-cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -ur bitcoin-bitcoin-a76c22e.orig/src/qt/qtipcserver.cpp bitcoin-bitcoin-a76c22e/src/qt/qtipcserver.cpp
---- bitcoin-bitcoin-a76c22e.orig/src/qt/qtipcserver.cpp	2012-09-19 22:13:23.000000000 +1000
-+++ src/qt/qtipcserver.cpp	2012-09-19 22:17:52.000000000 +1000
-@@ -32,6 +32,12 @@
- void ipcScanRelay(int argc, char *argv[]) { }
- void ipcInit(int argc, char *argv[]) { }
- 
-+#elif defined __FreeBSD__
-+// URI handling not implemented on BSD either
-+
-+void ipcScanRelay(int argc, char *argv[]) { }
-+void ipcInit(int argc, char *argv[]) { }
-+
- #else
- 
- static void ipcThread2(void* pArg);
diff --git a/net-p2p/bitcoin/files/patch-transactiondesc.cpp b/net-p2p/bitcoin/files/patch-transactiondesc.cpp
deleted file mode 100644
index b493196ce027..000000000000
--- a/net-p2p/bitcoin/files/patch-transactiondesc.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/qt/transactiondesc.cpp.orig	2012-09-13 04:07:22.000000000 +1000
-+++ src/qt/transactiondesc.cpp	2012-09-19 18:44:39.000000000 +1000
-@@ -8,6 +8,7 @@
- #include "db.h"
- #include "ui_interface.h"
- #include "base58.h"
-+#include "walletdb.h"
- 
- QString TransactionDesc::FormatTxStatus(const CWalletTx& wtx)
- {