View | Details | Raw Unified | Return to bug 172839 | Differences between
and this patch

Collapse All | Expand All

(-)Makefile (-20 / +21 lines)
Lines 6-12 Link Here
6
#
6
#
7
7
8
PORTNAME=	bitcoin
8
PORTNAME=	bitcoin
9
PORTVERSION=	0.7.0
9
PORTVERSION=	0.7.1
10
CATEGORIES=	net-p2p finance
10
CATEGORIES=	net-p2p finance
11
11
12
MAINTAINER=	robbak@robbak.com
12
MAINTAINER=	robbak@robbak.com
Lines 14-33 Link Here
14
14
15
LIB_DEPENDS=	boost_date_time:${PORTSDIR}/devel/boost-libs
15
LIB_DEPENDS=	boost_date_time:${PORTSDIR}/devel/boost-libs
16
16
17
OPTIONS=	GUI  "Build with QT3 GUI" on	\
17
OPTIONS_DEFINE=	GUI UPNP QRCODES
18
		UPNP "Build with UPNP support"  off \
18
OPTIONS_DEFAULT=	GUI QRCODES
19
		QRCODES "Build with QR code display" on
20
19
21
USE_GITHUB=     yes
20
GUI_DESC=	Build as a QT3 GUI
22
GH_ACCOUNT=     bitcoin
21
UPNP_DESC=	Build with UPNP support
22
QRCODES_DESC=	Build with QR code display
23
24
USE_GITHUB=	yes
25
GH_ACCOUNT=	bitcoin
23
GH_PROJECT=	bitcoin
26
GH_PROJECT=	bitcoin
24
GH_COMMIT=      a76c22e
27
GH_COMMIT=	d082365
25
GH_TAGNAME=	v${PORTVERSION}
28
GH_TAGNAME=	v${PORTVERSION}
26
29
27
USE_GMAKE=	yes
30
USE_GMAKE=	yes
28
USE_OPENSSL=	yes
31
USE_OPENSSL=	yes
29
USE_BDB=	yes
32
USE_BDB=	yes
30
WANT_BDB_VER=	47
33
WANT_BDB_VER=	48
31
34
32
CXXFLAGS+=	-I${LOCALBASE}/include -I${BDB_INCLUDE_DIR}
35
CXXFLAGS+=	-I${LOCALBASE}/include -I${BDB_INCLUDE_DIR}
33
CXXFLAGS+=	-L${LOCALBASE}/lib -L${BDB_LIB_DIR}
36
CXXFLAGS+=	-L${LOCALBASE}/lib -L${BDB_LIB_DIR}
Lines 35-51 Link Here
35
38
36
.include <bsd.port.options.mk>
39
.include <bsd.port.options.mk>
37
40
38
.if defined(WITH_GUI) && !defined(WITHOUT_X11)
41
.if ${PORT_OPTIONS:MGUI} && !defined(WITHOUT_X11)
39
USE_QT_VER=	4
42
USE_QT_VER=	4
40
USE_QT4=	corelib gui qmake_build linguist uic moc rcc
43
USE_QT4=	corelib gui qmake_build linguist uic moc rcc
41
BINARY=		bitcoin-qt
44
BINARY=		bitcoin-qt test_bitcoin
42
.else
45
.else
43
BINARY=		bitcoind
46
BINARY=		bitcoind test_bitcoin
44
ALL_TARGET=	${BINARY}
47
ALL_TARGET=	${BINARY}
45
MAKE_ARGS+=	-C ${WRKSRC}/src
48
MAKE_ARGS+=	-C ${WRKSRC}/src
46
.endif
49
.endif
47
50
48
.if defined(WITH_QRCODES)
51
.if ${PORT_OPTIONS:MQRCODES}
49
LIB_DEPENDS+=	qrencode:${PORTSDIR}/graphics/libqrencode
52
LIB_DEPENDS+=	qrencode:${PORTSDIR}/graphics/libqrencode
50
QMAKE_USE_QRCODE=1
53
QMAKE_USE_QRCODE=1
51
.else
54
.else
Lines 54-60 Link Here
54
57
55
PLIST_FILES=	bin/${BINARY}
58
PLIST_FILES=	bin/${BINARY}
56
59
57
.if defined(WITH_UPNP)
60
.if ${PORT_OPTIONS:MUPNP}
58
LIB_DEPENDS+=	miniupnpc:${PORTSDIR}/net/miniupnpc
61
LIB_DEPENDS+=	miniupnpc:${PORTSDIR}/net/miniupnpc
59
QMAKE_USE_UPNP=	1
62
QMAKE_USE_UPNP=	1
60
.else
63
.else
Lines 67-85 Link Here
67
	@${CP} ${WRKSRC}/src/protocol.h ${WRKSRC}/src/protocol.h.orig
70
	@${CP} ${WRKSRC}/src/protocol.h ${WRKSRC}/src/protocol.h.orig
68
	@${AWK} 'BEGIN { f = 0 } { if ( $$0 ~ /^#include/ && f == 0 ) { f = 1; print "#include <sys/socket.h>"; print "#include <netinet/in.h>" }; print }' \
71
	@${AWK} 'BEGIN { f = 0 } { if ( $$0 ~ /^#include/ && f == 0 ) { f = 1; print "#include <sys/socket.h>"; print "#include <netinet/in.h>" }; print }' \
69
		${WRKSRC}/src/protocol.h.orig > ${WRKSRC}/src/protocol.h
72
		${WRKSRC}/src/protocol.h.orig > ${WRKSRC}/src/protocol.h
70
73
.if !${PORT_OPTIONS:MGUI} || defined(WITHOUT_X11)
71
	@cd ${WRKSRC}/src && ${CP} -p makefile.unix Makefile
74
	@cd ${WRKSRC}/src && ${CP} -p makefile.unix Makefile
72
	@${REINPLACE_CMD} \
75
	@${REINPLACE_CMD} \
73
		-e 's|wx-config|${WX_CONFIG}|g' \
76
		-e 's|^USE_UPNP.*$$|USE_UPNP=${QMAKE_USE_UPNP}|' \
74
		-e 's|^CXXFLAGS=.*$$|CXXFLAGS += $$(DEFS)|' \
75
		-e 's|^USE_UPNP.*$$||' \
76
		-e 's|-l pthread|${PTHREAD_LIBS}|g' \
77
		-e 's|-l pthread|${PTHREAD_LIBS}|g' \
77
		-e 's:-O3::' -e 's:-\(march=[A-Za-z0-9]*\)::g' \
78
		-e 's:-l dl::' \
78
		-e 's:-l dl::' \
79
		${WRKSRC}/src/Makefile
79
		${WRKSRC}/src/Makefile
80
.endif
80
81
81
do-configure:
82
do-configure:
82
.if defined(WITH_GUI) && !defined(WITHOUT_X11)
83
.if ${PORT_OPTIONS:MGUI} && !defined(WITHOUT_X11)
83
	cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \
84
	cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \
84
		${QMAKE} USE_UPNP=${QMAKE_USE_UPNP} USE_QRCODE=${QMAKE_USE_QRCODE} \
85
		${QMAKE} USE_UPNP=${QMAKE_USE_UPNP} USE_QRCODE=${QMAKE_USE_QRCODE} \
85
		QMAKE_LRELEASE=lrelease-qt4 PREFIX=${PREFIX} INCLUDEPATH=${BDB_INCLUDE_DIR} \
86
		QMAKE_LRELEASE=lrelease-qt4 PREFIX=${PREFIX} INCLUDEPATH=${BDB_INCLUDE_DIR} \
Lines 88-94 Link Here
88
89
89
do-install:
90
do-install:
90
	@${MKDIR} ${PREFIX}/bin
91
	@${MKDIR} ${PREFIX}/bin
91
.if defined(WITH_GUI) && !defined(WITHOUT_X11)
92
.if ${PORT_OPTIONS:MGUI} && !defined(WITHOUT_X11)
92
	${INSTALL_PROGRAM} ${WRKSRC}/${BINARY} ${PREFIX}/bin/
93
	${INSTALL_PROGRAM} ${WRKSRC}/${BINARY} ${PREFIX}/bin/
93
.else
94
.else
94
	${INSTALL_PROGRAM} ${WRKSRC}/src/${BINARY} ${PREFIX}/bin/
95
	${INSTALL_PROGRAM} ${WRKSRC}/src/${BINARY} ${PREFIX}/bin/
(-)distinfo (-2 / +2 lines)
Lines 1-2 Link Here
1
SHA256 (bitcoin-0.7.0.tar.gz) = d0b5ca34c61e8fbd6dca53f2730fa3d8e3df1f7bb40d5e42f8ea4cd3bf32a221
1
SHA256 (bitcoin-0.7.1.tar.gz) = eb1c4bb59a6a6557e59dec5d90ab7c45b660898f535fafaeaed051aeb347b94d
2
SIZE (bitcoin-0.7.0.tar.gz) = 1603153
2
SIZE (bitcoin-0.7.1.tar.gz) = 1623510

Return to bug 172839