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

Collapse All | Expand All

(-)net-p2p/Makefile (+1 lines)
Lines 7-12 Link Here
7
    SUBDIR += amule-devel
7
    SUBDIR += amule-devel
8
    SUBDIR += bitcoin
8
    SUBDIR += bitcoin
9
    SUBDIR += bitcoin-daemon
9
    SUBDIR += bitcoin-daemon
10
    SUBDIR += bitcoin-utils
10
    SUBDIR += bitflu
11
    SUBDIR += bitflu
11
    SUBDIR += bitmessage
12
    SUBDIR += bitmessage
12
    SUBDIR += bnbt
13
    SUBDIR += bnbt
(-)net-p2p/bitcoin/Makefile (-62 / +83 lines)
Lines 2-14 Link Here
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTNAME=	bitcoin
4
PORTNAME=	bitcoin
5
PORTVERSION=	0.9.2
5
PORTVERSION=	0.10.0
6
PORTREVISION=	3
7
CATEGORIES=	net-p2p finance
6
CATEGORIES=	net-p2p finance
8
MASTER_SITES=	http://vps.robbak.com/distfiles/ \
7
MASTER_SITES=	${MASTER_SITE_LOCAL} \
9
		${MASTER_SITE_LOCAL} \
10
		http://people.freebsd.org/~swills/ \
8
		http://people.freebsd.org/~swills/ \
11
		GH
9
		GH \
10
		http://vps.robbak.com/distfiles/
12
11
13
MAINTAINER=	robbak@robbak.com
12
MAINTAINER=	robbak@robbak.com
14
COMMENT=	Virtual Peer-to-Peer Currency Client
13
COMMENT=	Virtual Peer-to-Peer Currency Client
Lines 15-97 Link Here
15
14
16
LICENSE=	MIT
15
LICENSE=	MIT
17
16
18
BUILD_DEPENDS=	protoc:${PORTSDIR}/devel/protobuf \
19
				pkg-config:${PORTSDIR}/devel/pkgconf
20
LIB_DEPENDS=	libboost_date_time.so:${PORTSDIR}/devel/boost-libs
17
LIB_DEPENDS=	libboost_date_time.so:${PORTSDIR}/devel/boost-libs
21
18
22
OPTIONS_DEFINE=	GUI WALLET UPNP QRCODES
23
OPTIONS_DEFAULT=	GUI WALLET QRCODES
24
25
GUI_DESC=	Build and install the QT4 binary
26
WALLET_DESC=	Build with support to create and manage a wallet
27
UPNP_DESC=	Build with UPNP support
28
QRCODES_DESC=	Build with QR code display
29
30
AUTOMAKE_ARGS+=	--add-missing
31
USE_AUTOTOOLS=	aclocal autoheader automake autoconf
32
#ACLOCAL_ARGS=	-I ${LOCALBASE}/share/aclocal
33
CONFIGURE_ENV=	SSL_LIBS="-lssl" CRYPTO_LIBS="-lcrypto" SSL_CFLAGS="-I/usr/include" CRYPTO_CFLAGS="-I/usr/include"
34
35
USE_GITHUB=	yes
19
USE_GITHUB=	yes
36
GH_ACCOUNT=	bitcoin
20
GH_ACCOUNT=	bitcoin
37
GH_PROJECT=	bitcoin
21
GH_PROJECT=	bitcoin
38
GH_COMMIT=		30a7357
22
GH_COMMIT=	58810d2
39
GH_TAGNAME=	v${PORTVERSION}
23
GH_TAGNAME=	v${PORTVERSION}
40
24
41
USES=			gmake
25
GNU_CONFIGURE=	yes
26
USES=		gmake pkgconfig libtool autoreconf compiler:c++0x
27
USE_AUTOTOOLS=	aclocal autoheader automake autoconf libtoolize
42
USE_OPENSSL=	yes
28
USE_OPENSSL=	yes
43
USE_BDB=		yes
44
WANT_BDB_VER=	48
45
29
46
CXXFLAGS+=	-I${LOCALBASE}/include -I${BDB_INCLUDE_DIR}
30
AUTOMAKE_ARGS+=	--add-missing
47
CXXFLAGS+=	-L${LOCALBASE}/lib -L${BDB_LIB_DIR}
31
CONFIGURE_ARGS=	--disable-tests
32
CONFIGURE_ENV=	CRYPTO_CFLAGS="-I/usr/include" CRYPTO_LIBS="-lcrypto" \
33
		SSL_CFLAGS="-I/usr/include" SSL_LIBS="-lssl"
34
35
CPPFLAGS+=	-I${LOCALBASE}/include
48
CXXFLAGS+=	-Wno-invalid-offsetof
36
CXXFLAGS+=	-Wno-invalid-offsetof
37
LDFLAGS+=	-L${LOCALBASE}/lib
49
38
50
.include <bsd.port.options.mk>
39
OPTIONS_DEFINE=	DEBUG UPNP
51
40
52
CONFIGURE_ARGS+=--disable-tests
41
DEBUG_CONFIGURE_ENABLE=	debug
42
DEBUG_INSTALL_TARGET_OFF=	install-strip
53
43
54
.if ${PORT_OPTIONS:MGUI} && !defined(WITHOUT_X11)
44
UPNP_CONFIGURE_WITH=	miniupnpc
55
USE_QT4=	corelib gui qmake_build linguist uic moc rcc qtestlib_build
45
UPNP_LIB_DEPENDS=	libminiupnpc.so:${PORTSDIR}/net/miniupnpc
56
USES+=		desktop-file-utils
57
PLIST_FILES=	%%QT_BINDIR%%/bitcoin-qt %%QT_BINDIR%%/bitcoind %%QT_BINDIR%%/bitcoin-cli
58
PLIST_FILES+=	share/applications/bitcoin-qt.desktop share/pixmaps/bitcoin128.png
59
CONFIGURE_ARGS+=--with-gui
60
.else
61
PLIST_FILES=		bin/bitcoind bin/bitcoin-cli
62
CONFIGURE_ARGS+=--without-gui
63
.endif
64
46
65
.if ${PORT_OPTIONS:MQRCODES}
47
# Libconsensus libraries
66
LIB_DEPENDS+=	libqrencode.so:${PORTSDIR}/graphics/libqrencode
48
PLIST_FILES = include/bitcoinconsensus.h \
67
CONFIGURE_ARGS+=--with-qrencode
49
	lib/libbitcoinconsensus.a \
68
.else
50
	lib/libbitcoinconsensus.so \
69
CONFIGURE_ARGS+=--without-qrencode
51
	lib/libbitcoinconsensus.so.0 \
70
.endif
52
	lib/libbitcoinconsensus.so.0.0.0
53
USE_LDCONFIG=	yes
71
54
72
.if ${PORT_OPTIONS:MUPNP}
55
.if defined(BITCOIN_UTILS)
73
LIB_DEPENDS+=	libminiupnpc.so:${PORTSDIR}/net/miniupnpc
56
CONFIGURE_ARGS+=	--with-utils \
74
CONFIGURE_ARGS+=--with-miniupnpc
57
			--without-daemon \
75
.else
58
			--without-gui \
76
CONFIGURE_ARGS+=--without-miniupnpc
59
			--disable-wallet
77
.endif
78
60
79
.if ${PORT_OPTIONS:MWALLET}
61
PLIST_FILES+=	bin/bitcoin-cli bin/bitcoin-tx
80
CONFIGURE_ARGS+=--enable-wallet
81
.else
62
.else
82
CONFIGURE_ARGS+=--disable-wallet
63
OPTIONS_DEFINE+=	WALLET
83
.endif
84
64
85
.include <bsd.port.pre.mk>
65
WALLET_DESC=	Build with support to create and manage a wallet
86
66
87
post-patch:
67
OPTIONS_DEFAULT=	WALLET
88
	${MKDIR} ${WRKSRC}/src/build-aux
89
68
69
WALLET_CONFIGURE_ENABLE=	wallet
70
WALLET_CPPFLAGS=	-I${BDB_INCLUDE_DIR}
71
WALLET_USE=		BDB=48
72
WALLET_LDFLAGS=		-L${BDB_LIB_DIR}
73
74
CONFIGURE_ARGS+=	--without-utils
75
. if defined(BITCOIN_DAEMON)
76
CONFIGURE_ARGS+=	--with-daemon \
77
			--without-gui
78
79
PLIST_FILES+=	bin/bitcoind
80
. else
81
BUILD_DEPENDS+=	protoc:${PORTSDIR}/devel/protobuf
82
LIB_DEPENDS+=	libprotobuf.so:${PORTSDIR}/devel/protobuf
83
84
USES+=		desktop-file-utils
85
USE_QT4=	corelib network gui qmake_build moc_build uic_build \
86
		rcc_build linguist_build
87
PLIST_FILES+=	bin/bitcoin-qt share/applications/bitcoin-qt.desktop \
88
		share/pixmaps/bitcoin128.png
89
90
OPTIONS_DEFINE+=	DBUS QRCODES
91
92
QRCODES_DESC=	Build with QR code display
93
94
OPTIONS_DEFAULT+=	QRCODES
95
96
DBUS_CONFIGURE_WITH=	qtdbus
97
DBUS_USE=		QT4=dbus
98
99
QRCODES_CONFIGURE_WITH=	qrencode
100
QRCODES_LIB_DEPENDS=	libqrencode.so:${PORTSDIR}/graphics/libqrencode
101
102
CONFIGURE_ARGS+=	--with-gui \
103
			--without-daemon
104
90
post-install:
105
post-install:
91
.if ${PORT_OPTIONS:MGUI} && !defined(WITHOUT_X11)
106
	${REINPLACE_CMD} -e 's,=/usr,=${PREFIX},' \
92
	${REINPLACE_CMD} -e 's,=/usr,=${PREFIX},' ${WRKSRC}/contrib/debian/bitcoin-qt.desktop
107
		${WRKSRC}/contrib/debian/bitcoin-qt.desktop
93
	${INSTALL} ${WRKSRC}/contrib/debian/bitcoin-qt.desktop ${STAGEDIR}${PREFIX}/share/applications
108
	${INSTALL} ${WRKSRC}/contrib/debian/bitcoin-qt.desktop \
94
	${INSTALL} ${WRKSRC}/share/pixmaps/bitcoin128.png ${STAGEDIR}${PREFIX}/share/pixmaps/
109
		${STAGEDIR}${PREFIX}/share/applications
110
	${INSTALL} ${WRKSRC}/share/pixmaps/bitcoin128.png \
111
		${STAGEDIR}${PREFIX}/share/pixmaps/
112
. endif
95
.endif
113
.endif
96
114
97
.include <bsd.port.post.mk>
115
post-patch:
116
	${MKDIR} ${WRKSRC}/src/build-aux
117
118
.include <bsd.port.mk>
(-)net-p2p/bitcoin/distinfo (-2 / +2 lines)
Lines 1-2 Link Here
1
SHA256 (bitcoin-0.9.2.tar.gz) = bb54f72f53498883ea9c8bdb9ae340c45fea8d4530f12fbaf34225839c439915
1
SHA256 (bitcoin-0.10.0.tar.gz) = 8723a955fa0f86dc35d5e8bd37484b37fdb3a3977dad50947fa334ac80ee7df7
2
SIZE (bitcoin-0.9.2.tar.gz) = 5242752
2
SIZE (bitcoin-0.10.0.tar.gz) = 5018463
(-)net-p2p/bitcoin/files/patch-Makefile_include_editSedCommands.patch (-29 lines)
Lines 1-29 Link Here
1
diff --git a/src/Makefile.include b/src/Makefile.include
2
index 2fc6cd7..cdd16f5 100644
3
--- a/src/Makefile.include
4
+++ src/Makefile.include
5
@@ -40,18 +40,18 @@ $(LIBBITCOINQT):
6
 ui_%.h: %.ui
7
 	@test -d $(abs_builddir)/$(@D) || $(MKDIR_P) $(abs_builddir)/$(@D)
8
 	@test -f $(UIC) && QT_SELECT=$(QT_SELECT) $(UIC) -o $(abs_builddir)/$@ $(abs_srcdir)/$< || echo error: could not build $(abs_builddir)/$@
9
-	$(SED) -e '/^\*\*.*Created:/d' $(abs_builddir)/$@ > $(abs_builddir)/$@.n && mv $(abs_builddir)/$@{.n,}
10
-	$(SED) -e '/^\*\*.*by:/d' $(abs_builddir)/$@ > $(abs_builddir)/$@.n && mv $(abs_builddir)/$@{.n,}
11
+	$(SED) -e '/^\*\*.*Created:/d' $(abs_builddir)/$@ > $(abs_builddir)/$@.n && mv $(abs_builddir)/$@.n $(abs_builddir)/$@
12
+	$(SED) -e '/^\*\*.*by:/d' $(abs_builddir)/$@ > $(abs_builddir)/$@.n && mv $(abs_builddir)/$@.n $(abs_builddir)/$@
13
 
14
 %.moc: %.cpp
15
 	QT_SELECT=$(QT_SELECT) $(MOC) $(QT_INCLUDES) $(MOC_DEFS) -o $@ $<
16
-	$(SED) -e '/^\*\*.*Created:/d' $@ > $@.n && mv $@{.n,}
17
-	$(SED) -e '/^\*\*.*by:/d' $@ > $@.n && mv $@{.n,}
18
+	$(SED) -e '/^\*\*.*Created:/d' $@ > $@.n && mv $@.n $(abs_builddir)/$@
19
+	$(SED) -e '/^\*\*.*by:/d' $@ > $@.n && mv $@.n $(abs_builddir)/$@
20
 
21
 moc_%.cpp: %.h
22
 	QT_SELECT=$(QT_SELECT) $(MOC) $(QT_INCLUDES) $(MOC_DEFS) -o $@ $<
23
-	$(SED) -e '/^\*\*.*Created:/d' $@ > $@.n && mv $@{.n,}
24
-	$(SED) -e '/^\*\*.*by:/d' $@ > $@.n && mv $@{.n,}
25
+	$(SED) -e '/^\*\*.*Created:/d' $@ > $@.n && mv $@.n $(abs_builddir)/$@
26
+	$(SED) -e '/^\*\*.*by:/d' $@ > $@.n && mv $@.n $(abs_builddir)/$@
27
 
28
 %.qm: %.ts
29
 	@test -d $(abs_builddir)/$(@D) || $(MKDIR_P) $(abs_builddir)/$(@D)
(-)net-p2p/bitcoin/files/patch-memenv.cc_enable_limit_macros (+11 lines)
Line 0 Link Here
1
--- src/leveldb/helpers/memenv/memenv.cc.orig	2014-12-28 23:05:26.000000000 +1000
2
+++ src/leveldb/helpers/memenv/memenv.cc	2014-12-29 17:12:58.000000000 +1000
3
@@ -2,6 +2,8 @@
4
 // Use of this source code is governed by a BSD-style license that can be
5
 // found in the LICENSE file. See the AUTHORS file for names of contributors.
6
 
7
+#define __STDC_LIMIT_MACROS
8
+
9
 #include "helpers/memenv/memenv.h"
10
 
11
 #include "leveldb/env.h"
(-)net-p2p/bitcoin/files/patch-qt_makefile_am_editSedCommands.patch (-14 lines)
Lines 1-14 Link Here
1
diff --git a/src/qt/Makefile.am b/src/qt/Makefile.am
2
index 648971b..97b2ec4 100644
3
--- a/src/qt/Makefile.am
4
+++ src/qt/Makefile.am
5
@@ -373,7 +373,7 @@ translate: bitcoinstrings.cpp $(QT_FORMS_UI) $(QT_FORMS_UI) $(BITCOIN_QT_CPP) $(
6
 $(QT_QRC_CPP): $(QT_QRC) $(QT_QM) $(QT_FORMS_H) $(RES_ICONS) $(RES_IMAGES) $(RES_MOVIES) $(PROTOBUF_H)
7
 	@cd $(abs_srcdir); test -f $(RCC) && QT_SELECT=$(QT_SELECT) $(RCC) -name bitcoin -o $(abs_builddir)/$@ $< || \
8
 	  echo error: could not build $@
9
-	$(SED) -e '/^\*\*.*Created:/d' $@ > $@.n && mv $@{.n,}
10
-	$(SED) -e '/^\*\*.*by:/d' $@  > $@.n && mv $@{.n,}
11
+	$(SED) -e '/^\*\*.*Created:/d' $@ > $@.n && mv $@.n $@
12
+	$(SED) -e '/^\*\*.*by:/d' $@  > $@.n && mv $@.n $@
13
 
14
 CLEANFILES = $(BUILT_SOURCES) $(QT_QM) $(QT_FORMS_H) *.gcda *.gcno
(-)net-p2p/bitcoin-daemon/Makefile (-3 / +4 lines)
Lines 1-9 Link Here
1
# $FreeBSD$
1
# $FreeBSD$
2
2
3
PKGNAMESUFFIX=	-daemon
3
PKGNAMESUFFIX=	-daemon
4
COMMENT=	Virtual Peer-to-Peer Currency Client
4
5
MASTERDIR=	${.CURDIR}/../bitcoin
5
MASTERDIR=	${.CURDIR}/../bitcoin
6
DESCR=		${MASTERDIR}/pkg-descr
6
DESCR=		${MASTERDIR}/pkg-descr
7
SLAVE_PORT=	yes
7
8
OPTIONS_EXCLUDE=	GUI QRCODES
8
BITCOIN_DAEMON=	yes
9
9
.include "${MASTERDIR}/Makefile"
10
.include "${MASTERDIR}/Makefile"
(-)net-p2p/bitcoin-utils/Makefile (+10 lines)
Line 0 Link Here
1
# $FreeBSD$
2
3
PKGNAMESUFFIX=	-utils
4
5
MASTERDIR=	${.CURDIR}/../bitcoin
6
DESCR=		${MASTERDIR}/pkg-descr
7
8
BITCOIN_UTILS=	yes
9
10
.include "${MASTERDIR}/Makefile"

Return to bug 193424