Attachment #134423 for bug #179091

View | Details | Raw Unified | Return to bug 179091
Collapse All | Expand All




# Created by: Shaun Amott <shaun@FreeBSD.org>
# $FreeBSD: head/net-p2p/bitcoin/Makefile 312668 2013-02-20 20:27:32Z rm $

PORTNAME=	bitcoin
PORTVERSION=	0.8.2
PORTREVISION=	1
CATEGORIES=	net-p2p finance

MAINTAINER=	robbak@robbak.com

USE_GITHUB=	yes
GH_ACCOUNT=	bitcoin
GH_PROJECT=	bitcoin
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}

BINARY=		bitcoin-qt
.else
BINARY=		bitcoind
ALL_TARGET=	${BINARY} test
MAKE_ARGS+=	-C ${WRKSRC}/src
.endif


Lines 1-2 Link Here

(-)./distinfo (-2 / +2 lines)
1	SHA256 (bitcoin-0.8.1.tar.gz) = cd24be785f04872e8f74968a018b1d78afc0fd7689c3639cdaf340de000997b1	1	SHA256 (bitcoin-0.8.2.tar.gz) = 708ca0fae80e75a670277aa484727750462130e15bfc422ee2512dd26a60ac2f
2	SIZE (bitcoin-0.8.1.tar.gz) = 1965003	2	SIZE (bitcoin-0.8.2.tar.gz) = 3181548

Line 0 Link Here

(-)./files/patch-bitcoin-qt_pro-Add_boost-crypto (+11 lines)
	1	diff -ur ../bitcoin-bitcoin-18c9239.orig/bitcoin-qt.pro ./bitcoin-qt.pro
	2	--- ../bitcoin-bitcoin-18c9239.orig/bitcoin-qt.pro 2013-05-24 22:50:15.000000000 +1000
	3	+++ ./bitcoin-qt.pro 2013-05-24 22:51:35.000000000 +1000
	4	@@ -402,7 +402,7 @@
	5	LIBS += -lssl -lcrypto -ldb_cxx$$BDB_LIB_SUFFIX
	6	# -lgdi32 has to happen after -lcrypto (see #681)
	7	win32:LIBS += -lws2_32 -lshlwapi -lmswsock -lole32 -loleaut32 -luuid -lgdi32
	8	-LIBS += -lboost_system$$BOOST_LIB_SUFFIX -lboost_filesystem$$BOOST_LIB_SUFFIX -lboost_program_options$$BOOST_LIB_SUFFIX -lboost_thread$$BOOST_THREAD_LIB_SUFFIX
	9	+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
	10	win32:LIBS += -lboost_chrono$$BOOST_LIB_SUFFIX
	11	macx:LIBS += -lboost_chrono$$BOOST_LIB_SUFFIX




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."));

Line 0 Link Here

(-)./files/patch-makefile_unix-Add_boost-crypto (+11 lines)
	1	diff -ur ../bitcoin-bitcoin-18c9239.orig/src/makefile.unix ./src/makefile.unix
	2	--- ../bitcoin-bitcoin-18c9239.orig/src/makefile.unix 2013-05-24 22:50:15.000000000 +1000
	3	+++ ./src/makefile.unix 2013-05-24 22:52:34.000000000 +1000
	4	@@ -38,6 +38,7 @@
	5	-l boost_filesystem$(BOOST_LIB_SUFFIX) \
	6	-l boost_program_options$(BOOST_LIB_SUFFIX) \
	7	-l boost_thread$(BOOST_LIB_SUFFIX) \
	8	+ -l boost_chrono$(BOOST_LIB_SUFFIX) \
	9	-l db_cxx$(BDB_LIB_SUFFIX) \
	10	-l ssl \
	11	-l crypto

Return to bug 179091

Lines 1-9 Link Here

(-)./Makefile (-5 / +5 lines)
1	# Created by: Shaun Amott <shaun@FreeBSD.org>	1	# Created by: Shaun Amott <shaun@FreeBSD.org>
2	# $FreeBSD: net-p2p/bitcoin/Makefile 316400 2013-04-24 02:42:20Z swills $	2	# $FreeBSD: head/net-p2p/bitcoin/Makefile 312668 2013-02-20 20:27:32Z rm $
3		3
4	PORTNAME= bitcoin	4	PORTNAME= bitcoin
5	PORTVERSION= 0.8.1	5	PORTVERSION= 0.8.2
6	PORTREVISION= 1
7	CATEGORIES= net-p2p finance	6	CATEGORIES= net-p2p finance
8		7
9	MAINTAINER= robbak@robbak.com	8	MAINTAINER= robbak@robbak.com
Lines 21-33 Link Here
21	USE_GITHUB= yes	20	USE_GITHUB= yes
22	GH_ACCOUNT= bitcoin	21	GH_ACCOUNT= bitcoin
23	GH_PROJECT= bitcoin	22	GH_PROJECT= bitcoin
24	GH_COMMIT= 38f8657	23	GH_COMMIT= 09e437b
25	GH_TAGNAME= v${PORTVERSION}	24	GH_TAGNAME= v${PORTVERSION}
26		25
27	USE_GMAKE= yes	26	USE_GMAKE= yes
28	USE_OPENSSL= yes	27	USE_OPENSSL= yes
29	USE_BDB= yes	28	USE_BDB= yes
30	WANT_BDB_VER= 48	29	WANT_BDB_VER= 48
		30	MAKE_JOBS_SAFE= yes
31		31
32	CXXFLAGS+= -I${LOCALBASE}/include -I${BDB_INCLUDE_DIR}	32	CXXFLAGS+= -I${LOCALBASE}/include -I${BDB_INCLUDE_DIR}
33	CXXFLAGS+= -L${LOCALBASE}/lib -L${BDB_LIB_DIR}	33	CXXFLAGS+= -L${LOCALBASE}/lib -L${BDB_LIB_DIR}
Lines 40-46 Link Here
40	BINARY= bitcoin-qt	40	BINARY= bitcoin-qt
41	.else	41	.else
42	BINARY= bitcoind	42	BINARY= bitcoind
43	ALL_TARGET= ${BINARY}	43	ALL_TARGET= ${BINARY} test
44	MAKE_ARGS+= -C ${WRKSRC}/src	44	MAKE_ARGS+= -C ${WRKSRC}/src
45	.endif	45	.endif
46		46

Line 0 Link Here

(-)./files/patch-init_cpp (+12 lines)
	1	diff -ur ../bitcoin-bitcoin-18c9239.orig/src/init.cpp ./src/init.cpp
	2	--- ../bitcoin-bitcoin-18c9239.orig/src/init.cpp 2013-05-24 22:50:15.000000000 +1000
	3	+++ ./src/init.cpp 2013-05-24 22:53:20.000000000 +1000
	4	@@ -530,7 +530,7 @@
	5	// Make sure enough file descriptors are available
	6	int nBind = std::max((int)mapArgs.count("-bind"), 1);
	7	nMaxConnections = GetArg("-maxconnections", 125);
	8	- nMaxConnections = std::max(std::min(nMaxConnections, FD_SETSIZE - nBind - MIN_CORE_FILEDESCRIPTORS), 0);
	9	+ nMaxConnections = std::max(std::min(nMaxConnections, (int)(FD_SETSIZE - nBind - MIN_CORE_FILEDESCRIPTORS)), 0);
	10	int nFD = RaiseFileDescriptorLimit(nMaxConnections + MIN_CORE_FILEDESCRIPTORS);
	11	if (nFD < MIN_CORE_FILEDESCRIPTORS)
	12	return InitError(_("Not enough file descriptors available."));