Attachment #141761 for bug #188655

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




# Created by: Shaun Amott <shaun@FreeBSD.org>
# $FreeBSD: net-p2p/bitcoin/Makefile 328082 2013-09-24 01:48:57Z swills $

PORTNAME=	bitcoin
PORTVERSION=	0.9.1
PORTREVISION=	1
CATEGORIES=	net-p2p finance
MASTER_SITES=	${MASTER_SITE_LOCAL} \
		http://people.freebsd.org/~swills/ \

MAINTAINER=	robbak@robbak.com
COMMENT=	Virtual Peer-to-Peer Currency Client

LICENSE=	MIT

BUILD_DEPENDS=	protoc:${PORTSDIR}/devel/protobuf \
				pkg-config:${PORTSDIR}/devel/pkgconf
LIB_DEPENDS=	libboost_date_time.so:${PORTSDIR}/devel/boost-libs

OPTIONS_DEFINE=	GUI WALLET UPNP QRCODES
OPTIONS_DEFAULT=	GUI WALLET QRCODES

GUI_DESC=	Build and install the QT4 binary
WALLET_DESC=	Build the binaries with support to create and manage a wallet.
UPNP_DESC=	Build with UPNP support
QRCODES_DESC=	Build with QR code display

AUTOMAKE_ARGS+=	--add-missing
USE_AUTOTOOLS=	aclocal autoheader automake autoconf
#ACLOCAL_ARGS=	-I ${LOCALBASE}/share/aclocal
CONFIGURE_ENV=	SSL_LIBS="-lssl" CRYPTO_LIBS="-lcrypto" SSL_CFLAGS="-I/usr/include" CRYPTO_CFLAGS="-I/usr/include"

USE_GITHUB=	yes
GH_ACCOUNT=	bitcoin
GH_PROJECT=	bitcoin
GH_COMMIT=	66a2ae9
GH_TAGNAME=	v${PORTVERSION}

USES=			gmake
USE_OPENSSL=	yes
USE_BDB=		yes
WANT_BDB_VER=	48

CXXFLAGS+=	-I${LOCALBASE}/include -I${BDB_INCLUDE_DIR}
CXXFLAGS+=	-L${LOCALBASE}/lib -L${BDB_LIB_DIR}
CXXFLAGS+=	-Wno-invalid-offsetof

NO_STAGE=	yes
.include <bsd.port.options.mk>

CONFIGURE_ARGS+=--disable-tests

.if ${PORT_OPTIONS:MGUI} && !defined(WITHOUT_X11)
USE_QT4=	corelib gui qmake_build linguist uic moc rcc qtestlib_build
USES+=		desktop-file-utils
PLIST_FILES=	%%QT_BINDIR%%/bitcoin-qt %%QT_BINDIR%%/bitcoind %%QT_BINDIR%%/bitcoin-cli
PLIST_FILES+=	share/applications/bitcoin-qt.desktop share/pixmaps/bitcoin128.png
CONFIGURE_ARGS+=--with-gui
.else
PLIST_FILES=		bin/bitcoind bin/bitcoin-cli
CONFIGURE_ARGS+=--without-gui
MAKE_ARGS+=	-C ${WRKSRC}/src
.endif

.if ${PORT_OPTIONS:MQRCODES}
LIB_DEPENDS+=	libqrencode.so:${PORTSDIR}/graphics/libqrencode
CONFIGURE_ARGS+=--with-qrencode
.else
CONFIGURE_ARGS+=--without-qrencode
.endif

PLIST_FILES=	bin/${BINARY}

.if ${PORT_OPTIONS:MUPNP}
LIB_DEPENDS+=	libminiupnpc.so:${PORTSDIR}/net/miniupnpc
CONFIGURE_ARGS+=--with-miniupnpc
.else
CONFIGURE_ARGS+=--without-miniupnpc
.endif

.if ${PORT_OPTIONS:MWALLET}
CONFIGURE_ARGS+=--enable-wallet
.else
CONFIGURE_ARGS+=--disable-wallet
.endif

.include <bsd.port.pre.mk>

post-patch:
	${MKDIR} ${WRKSRC}/src/build-aux
	@cd ${WRKSRC}/src && ${CP} -p makefile.unix Makefile
	@${REINPLACE_CMD} \
		-e 's|^USE_UPNP.*$$|USE_UPNP=${QMAKE_USE_UPNP}|' \
		-e 's|-l pthread|${PTHREAD_LIBS}|g' \
		-e 's:-l dl::' \
		${WRKSRC}/src/Makefile
.endif

do-configure:
.if ${PORT_OPTIONS:MGUI} && !defined(WITHOUT_X11)
	cd ${WRKSRC} && ${SETENV} ${QMAKE_ENV} \
		${QMAKE} ${QMAKE_ARGS} USE_UPNP=${QMAKE_USE_UPNP} USE_QRCODE=${QMAKE_USE_QRCODE} \
		QMAKE_LRELEASE=${LRELEASE} INCLUDEPATH=${BDB_INCLUDE_DIR} \
		QMAKE_LIBDIR+=${BDB_LIB_DIR} bitcoin-qt.pro
.endif

post-install:
	@${MKDIR} ${PREFIX}/bin
.if ${PORT_OPTIONS:MGUI} && !defined(WITHOUT_X11)
	${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

.include <bsd.port.post.mk>

Lines 1-2 Link Here

(-)./distinfo (-2 / +2 lines)
1	SHA256 (bitcoin-0.8.6.tar.gz) = 0703ce3fce77b63bce11388790176f5626b521b7403d72db1ed452c692fdc55d	1	SHA256 (bitcoin-0.9.1.tar.gz) = aad8a764c0dbfa716437a6a61ac5bf33ba9d210652d3c08b1eb460e3eb76a08a
2	SIZE (bitcoin-0.8.6.tar.gz) = 3194755	2	SIZE (bitcoin-0.9.1.tar.gz) = 4022647

Lines 1-11 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




--- src/compat.h.orig	2014-03-31 19:12:15.000000000 +1000
+++ src/compat.h	2014-03-31 19:12:39.000000000 +1000
@@ -30,6 +30,7 @@
 #else
 #include <sys/types.h>
 #include <arpa/inet.h>
+#include <sys/socket.h>
 #include <ifaddrs.h>
 #include <limits.h>
 #include <net/if.h>
@@ -37,7 +38,6 @@
 #include <netinet/in.h>
 #include <sys/fcntl.h>
 #include <sys/mman.h>
-#include <sys/socket.h>
 #include <unistd.h>
 #endif
 

Lines 1-11 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




--- ./src/serialize.h.orig	2013-09-24 01:50:35.661706153 +0000
+++ ./src/serialize.h	2013-09-24 01:50:52.913703572 +0000
@@ -895,19 +895,6 @@
     iterator insert(iterator it, const char& x=char()) { return vch.insert(it, x); }
     void insert(iterator it, size_type n, const char& x) { vch.insert(it, n, x); }
 
-    void insert(iterator it, const_iterator first, const_iterator last)
-    {
-        assert(last - first >= 0);
-        if (it == vch.begin() + nReadPos && (unsigned int)(last - first) <= nReadPos)
-        {
-            // special case for inserting at the front when there's room
-            nReadPos -= (last - first);
-            memcpy(&vch[nReadPos], &first[0], last - first);
-        }
-        else
-            vch.insert(it, first, last);
-    }
-
     void insert(iterator it, std::vector<char>::const_iterator first, std::vector<char>::const_iterator last)
     {
         assert(last - first >= 0);

Return to bug 188655

Lines 1-9 Link Here

(-)./Makefile (-42 / +42 lines)
1	# Created by: Shaun Amott <shaun@FreeBSD.org>	1	# Created by: Shaun Amott <shaun@FreeBSD.org>
2	# $FreeBSD: head/net-p2p/bitcoin/Makefile 343214 2014-02-07 11:44:08Z bapt $	2	# $FreeBSD: net-p2p/bitcoin/Makefile 328082 2013-09-24 01:48:57Z swills $
3		3
4	PORTNAME= bitcoin	4	PORTNAME= bitcoin
5	PORTVERSION= 0.8.6	5	PORTVERSION= 0.9.1
6	PORTREVISION= 1
7	CATEGORIES= net-p2p finance	6	CATEGORIES= net-p2p finance
8	MASTER_SITES= ${MASTER_SITE_LOCAL} \	7	MASTER_SITES= ${MASTER_SITE_LOCAL} \
9	http://people.freebsd.org/~swills/ \	8	http://people.freebsd.org/~swills/ \
Lines 12-95 Link Here
12	MAINTAINER= robbak@robbak.com	11	MAINTAINER= robbak@robbak.com
13	COMMENT= Virtual Peer-to-Peer Currency Client	12	COMMENT= Virtual Peer-to-Peer Currency Client
14		13
		14	LICENSE= MIT
		15
		16	BUILD_DEPENDS= protoc:${PORTSDIR}/devel/protobuf \
		17	pkg-config:${PORTSDIR}/devel/pkgconf
15	LIB_DEPENDS= libboost_date_time.so:${PORTSDIR}/devel/boost-libs	18	LIB_DEPENDS= libboost_date_time.so:${PORTSDIR}/devel/boost-libs
16		19
17	OPTIONS_DEFINE= GUI UPNP QRCODES	20	OPTIONS_DEFINE= GUI WALLET UPNP QRCODES
18	OPTIONS_DEFAULT= GUI QRCODES	21	OPTIONS_DEFAULT= GUI WALLET QRCODES
19		22
20	GUI_DESC= Build as a QT4 GUI	23	GUI_DESC= Build and install the QT4 binary
		24	WALLET_DESC= Build the binaries with support to create and manage a wallet.
21	UPNP_DESC= Build with UPNP support	25	UPNP_DESC= Build with UPNP support
22	QRCODES_DESC= Build with QR code display	26	QRCODES_DESC= Build with QR code display
23		27
		28	AUTOMAKE_ARGS+= --add-missing
		29	USE_AUTOTOOLS= aclocal autoheader automake autoconf
		30	#ACLOCAL_ARGS= -I ${LOCALBASE}/share/aclocal
		31	CONFIGURE_ENV= SSL_LIBS="-lssl" CRYPTO_LIBS="-lcrypto" SSL_CFLAGS="-I/usr/include" CRYPTO_CFLAGS="-I/usr/include"
		32
24	USE_GITHUB= yes	33	USE_GITHUB= yes
25	GH_ACCOUNT= bitcoin	34	GH_ACCOUNT= bitcoin
26	GH_PROJECT= bitcoin	35	GH_PROJECT= bitcoin
27	GH_COMMIT= 15e2837	36	GH_COMMIT= 66a2ae9
28	GH_TAGNAME= v${PORTVERSION}	37	GH_TAGNAME= v${PORTVERSION}
29		38
30	USES= gmake	39	USES= gmake
31	USE_OPENSSL= yes	40	USE_OPENSSL= yes
32	USE_BDB= yes	41	USE_BDB= yes
33	WANT_BDB_VER= 48	42	WANT_BDB_VER= 48
34		43
35	CXXFLAGS+= -I${LOCALBASE}/include -I${BDB_INCLUDE_DIR}	44	CXXFLAGS+= -I${LOCALBASE}/include -I${BDB_INCLUDE_DIR}
36	CXXFLAGS+= -L${LOCALBASE}/lib -L${BDB_LIB_DIR}	45	CXXFLAGS+= -L${LOCALBASE}/lib -L${BDB_LIB_DIR}
37	CXXFLAGS+= -Wno-invalid-offsetof	46	CXXFLAGS+= -Wno-invalid-offsetof
38		47
39	NO_STAGE= yes
40	.include <bsd.port.options.mk>	48	.include <bsd.port.options.mk>
41		49
		50	CONFIGURE_ARGS+=--disable-tests
		51
42	.if ${PORT_OPTIONS:MGUI} && !defined(WITHOUT_X11)	52	.if ${PORT_OPTIONS:MGUI} && !defined(WITHOUT_X11)
43	USE_QT4= corelib gui qmake_build linguist uic moc rcc	53	USE_QT4= corelib gui qmake_build linguist uic moc rcc qtestlib_build
44	BINARY= bitcoin-qt	54	USES+= desktop-file-utils
		55	PLIST_FILES= %%QT_BINDIR%%/bitcoin-qt %%QT_BINDIR%%/bitcoind %%QT_BINDIR%%/bitcoin-cli
		56	PLIST_FILES+= share/applications/bitcoin-qt.desktop share/pixmaps/bitcoin128.png
		57	CONFIGURE_ARGS+=--with-gui
45	.else	58	.else
46	BINARY= bitcoind	59	PLIST_FILES= bin/bitcoind bin/bitcoin-cli
47	ALL_TARGET= ${BINARY} test	60	CONFIGURE_ARGS+=--without-gui
48	MAKE_ARGS+= -C ${WRKSRC}/src
49	.endif	61	.endif
50		62
51	.if ${PORT_OPTIONS:MQRCODES}	63	.if ${PORT_OPTIONS:MQRCODES}
52	LIB_DEPENDS+= libqrencode.so:${PORTSDIR}/graphics/libqrencode	64	LIB_DEPENDS+= libqrencode.so:${PORTSDIR}/graphics/libqrencode
53	QMAKE_USE_QRCODE=1	65	CONFIGURE_ARGS+=--with-qrencode
54	.else	66	.else
55	QMAKE_USE_QRCODE=0	67	CONFIGURE_ARGS+=--without-qrencode
56	.endif	68	.endif
57		69
58	PLIST_FILES= bin/${BINARY}
59
60	.if ${PORT_OPTIONS:MUPNP}	70	.if ${PORT_OPTIONS:MUPNP}
61	LIB_DEPENDS+= libminiupnpc.so:${PORTSDIR}/net/miniupnpc	71	LIB_DEPENDS+= libminiupnpc.so:${PORTSDIR}/net/miniupnpc
62	QMAKE_USE_UPNP= 1	72	CONFIGURE_ARGS+=--with-miniupnpc
		73	.else
		74	CONFIGURE_ARGS+=--without-miniupnpc
		75	.endif
		76
		77	.if ${PORT_OPTIONS:MWALLET}
		78	CONFIGURE_ARGS+=--enable-wallet
63	.else	79	.else
64	QMAKE_USE_UPNP= -	80	CONFIGURE_ARGS+=--disable-wallet
65	.endif	81	.endif
66		82
67	.include <bsd.port.pre.mk>	83	.include <bsd.port.pre.mk>
68		84
69	post-patch:	85	post-patch:
70	.if !${PORT_OPTIONS:MGUI} \|\| defined(WITHOUT_X11)	86	${MKDIR} ${WRKSRC}/src/build-aux
71	@cd ${WRKSRC}/src && ${CP} -p makefile.unix Makefile
72	@${REINPLACE_CMD} \
73	-e 's\|^USE_UPNP.*$$\|USE_UPNP=${QMAKE_USE_UPNP}\|' \
74	-e 's\|-l pthread\|${PTHREAD_LIBS}\|g' \
75	-e 's:-l dl::' \
76	${WRKSRC}/src/Makefile
77	.endif
78
79	do-configure:
80	.if ${PORT_OPTIONS:MGUI} && !defined(WITHOUT_X11)
81	cd ${WRKSRC} && ${SETENV} ${QMAKE_ENV} \
82	${QMAKE} ${QMAKE_ARGS} USE_UPNP=${QMAKE_USE_UPNP} USE_QRCODE=${QMAKE_USE_QRCODE} \
83	QMAKE_LRELEASE=${LRELEASE} INCLUDEPATH=${BDB_INCLUDE_DIR} \
84	QMAKE_LIBDIR+=${BDB_LIB_DIR} bitcoin-qt.pro
85	.endif
86		87
87	do-install:	88	post-install:
88	@${MKDIR} ${PREFIX}/bin
89	.if ${PORT_OPTIONS:MGUI} && !defined(WITHOUT_X11)	89	.if ${PORT_OPTIONS:MGUI} && !defined(WITHOUT_X11)
90	${INSTALL_PROGRAM} ${WRKSRC}/${BINARY} ${PREFIX}/bin/	90	${REINPLACE_CMD} -e 's,=/usr,=${PREFIX},' ${WRKSRC}/contrib/debian/bitcoin-qt.desktop
91	.else	91	${INSTALL} ${WRKSRC}/contrib/debian/bitcoin-qt.desktop ${STAGEDIR}${PREFIX}/share/applications
92	${INSTALL_PROGRAM} ${WRKSRC}/src/${BINARY} ${PREFIX}/bin/	92	${INSTALL} ${WRKSRC}/share/pixmaps/bitcoin128.png ${STAGEDIR}${PREFIX}/share/pixmaps/
93	.endif	93	.endif
94		94
95	.include <bsd.port.post.mk>	95	.include <bsd.port.post.mk>

Line 0 Link Here

(-)./files/patch-compat-h.patch (+18 lines)
	1	--- src/compat.h.orig 2014-03-31 19:12:15.000000000 +1000
	2	+++ src/compat.h 2014-03-31 19:12:39.000000000 +1000
	3	@@ -30,6 +30,7 @@
	4	#else
	5	#include <sys/types.h>
	6	#include <arpa/inet.h>
	7	+#include <sys/socket.h>
	8	#include <ifaddrs.h>
	9	#include <limits.h>
	10	#include <net/if.h>
	11	@@ -37,7 +38,6 @@
	12	#include <netinet/in.h>
	13	#include <sys/fcntl.h>
	14	#include <sys/mman.h>
	15	-#include <sys/socket.h>
	16	#include <unistd.h>
	17	#endif
	18

Lines 1-22 Link Here

(-)./files/patch-src__serialize.h (-22 lines)
1	--- ./src/serialize.h.orig 2013-09-24 01:50:35.661706153 +0000
2	+++ ./src/serialize.h 2013-09-24 01:50:52.913703572 +0000
3	@@ -895,19 +895,6 @@
4	iterator insert(iterator it, const char& x=char()) { return vch.insert(it, x); }
5	void insert(iterator it, size_type n, const char& x) { vch.insert(it, n, x); }
6
7	- void insert(iterator it, const_iterator first, const_iterator last)
8	- {
9	- assert(last - first >= 0);
10	- if (it == vch.begin() + nReadPos && (unsigned int)(last - first) <= nReadPos)
11	- {
12	- // special case for inserting at the front when there's room
13	- nReadPos -= (last - first);
14	- memcpy(&vch[nReadPos], &first[0], last - first);
15	- }
16	- else
17	- vch.insert(it, first, last);
18	- }
19	-
20	void insert(iterator it, std::vector<char>::const_iterator first, std::vector<char>::const_iterator last)
21	{
22	assert(last - first >= 0);