Attachment #153500 for bug #198024

Lines 7-12 Link Here

(-)Makefile (+1 lines)
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




# $FreeBSD$

PORTNAME=	bitcoin
PORTVERSION=	0.10.0
PORTREVISION=	3
CATEGORIES=	net-p2p finance
MASTER_SITES=	http://vps.robbak.com/distfiles/ \
		${MASTER_SITE_LOCAL} \
		http://people.freebsd.org/~swills/ \
		GH

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

LICENSE=	MIT

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

USES=		autoreconf compiler:c++0x gmake libtool pkgconfig
USE_GITHUB=	yes
USE_OPENSSL=	yes
GNU_CONFIGURE=	yes

.if defined(SLAVE_PORT) && ${SLAVE_PORT} == "no"
USES+=		desktop-file-utils
USE_QT4=	corelib network gui qmake_build moc_build uic_build \
		rcc_build linguist_build
.endif

OPTIONS_DEFINE?=	DBUS DEBUG QRCODES UPNP WALLET
OPTIONS_DEFAULT?=	QRCODES WALLET
#ACLOCAL_ARGS=	-I ${LOCALBASE}/share/aclocal
CONFIGURE_ENV=	SSL_LIBS="-lssl" CRYPTO_LIBS="-lcrypto" SSL_CFLAGS="-I/usr/include" CRYPTO_CFLAGS="-I/usr/include"

QRCODES_DESC=	Display QR Codes
WALLET_DESC=	Wallet Management Support

DBUS_CONFIGURE_WITH=	qtdbus
DBUS_USE=		QT4=dbus

DEBUG_CONFIGURE_ENABLE=		debug
DEBUG_INSTALL_TARGET_OFF=	install-strip

UPNP_CONFIGURE_WITH=	miniupnpc
UPNP_LIB_DEPENDS=	libminiupnpc.so:${PORTSDIR}/net/miniupnpc

QRCODES_CONFIGURE_WITH=	qrencode
QRCODES_LIB_DEPENDS=	libqrencode.so:${PORTSDIR}/graphics/libqrencode

WALLET_CONFIGURE_ENABLE=	wallet
WALLET_CPPFLAGS=		-I${BDB_INCLUDE_DIR}
WALLET_LDFLAGS=			-L${BDB_LIB_DIR}
WALLET_USE=			BDB=48

GH_ACCOUNT=	bitcoin
GH_COMMIT=	58810d2
GH_COMMIT=		30a7357
GH_TAGNAME=	v${PORTVERSION}

CONFIGURE_ARGS?=	--with-gui \
			--without-daemon \
			--without-utils \
			--disable-libs \
			--disable-tests

CONFIGURE_ENV=	CRYPTO_CFLAGS="-I/usr/include" CRYPTO_LIBS="-lcrypto" \
		SSL_CFLAGS="-I/usr/include" SSL_LIBS="-lssl"

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

PLIST_FILES?=	bin/bitcoin-qt share/applications/bitcoin-qt.desktop \
		share/pixmaps/bitcoin128.png

.if defined(SLAVE_PORT) && ${SLAVE_PORT} == "no"

post-install:
	${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/
PLIST_FILES=		bin/bitcoind bin/bitcoin-cli
CONFIGURE_ARGS+=--without-gui
.endif

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

.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

.include <bsd.port.mk>
.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

(-)bitcoin/distinfo (-2 / +2 lines)
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

Lines 1-29 Link Here

(-)bitcoin/files/patch-Makefile_include_editSedCommands.patch (-29 lines)
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)

Line 0 Link Here

(-)bitcoin/files/patch-memenv.cc_enable_limit_macros (+11 lines)
	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"




diff --git a/src/qt/Makefile.am b/src/qt/Makefile.am
index 648971b..97b2ec4 100644
--- a/src/qt/Makefile.am
+++ src/qt/Makefile.am
@@ -373,7 +373,7 @@ translate: bitcoinstrings.cpp $(QT_FORMS_UI) $(QT_FORMS_UI) $(BITCOIN_QT_CPP) $(
 $(QT_QRC_CPP): $(QT_QRC) $(QT_QM) $(QT_FORMS_H) $(RES_ICONS) $(RES_IMAGES) $(RES_MOVIES) $(PROTOBUF_H)
 	@cd $(abs_srcdir); test -f $(RCC) && QT_SELECT=$(QT_SELECT) $(RCC) -name bitcoin -o $(abs_builddir)/$@ $< || \
 	  echo error: could not build $@
-	$(SED) -e '/^\*\*.*Created:/d' $@ > $@.n && mv $@{.n,}
-	$(SED) -e '/^\*\*.*by:/d' $@  > $@.n && mv $@{.n,}
+	$(SED) -e '/^\*\*.*Created:/d' $@ > $@.n && mv $@.n $@
+	$(SED) -e '/^\*\*.*by:/d' $@  > $@.n && mv $@.n $@
 
 CLEANFILES = $(BUILT_SOURCES) $(QT_QM) $(QT_FORMS_H) *.gcda *.gcno




# $FreeBSD$

PKGNAMESUFFIX=	-daemon

MASTERDIR=	${.CURDIR}/../bitcoin

OPTIONS_DEFINE=	DEBUG UPNP WALLET

CONFIGURE_ARGS=		--with-daemon \
			--without-gui \
			--without-libs \
			--without-utils \
			--disable-tests

PLIST_FILES=	bin/bitcoind

.include "${MASTERDIR}/Makefile"




# $FreeBSD$

PKGNAMESUFFIX=	-utils
MASTERDIR=	${.CURDIR}/../bitcoin

OPTIONS_DEFINE=	DEBUG

CONFIGURE_ARGS=	--with-utils \
		--without-daemon \
		--without-gui \
		--with-gui=no \
		--without-libs \
                --without-qrencode \
		--disable-tests \
		--disable-wallet

PLIST_FILES=	bin/bitcoin-cli bin/bitcoin-tx

.include "${MASTERDIR}/Makefile"

Return to bug 198024

Lines 2-97 Link Here

(-)bitcoin/Makefile (-69 / +58 lines)
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/ \
9	${MASTER_SITE_LOCAL} \
10	http://people.freebsd.org/~swills/ \
11	GH
12		7
13	MAINTAINER= robbak@robbak.com	8	MAINTAINER= robbak@robbak.com
14	COMMENT= Virtual Peer-to-Peer Currency Client	9	COMMENT= Virtual Peer-to-Peer Currency Client (QT)
15		10
16	LICENSE= MIT	11	LICENSE= MIT
17		12
18	BUILD_DEPENDS= protoc:${PORTSDIR}/devel/protobuf \	13	BUILD_DEPENDS= protoc:${PORTSDIR}/devel/protobuf
19	pkg-config:${PORTSDIR}/devel/pkgconf	14	LIB_DEPENDS= libboost_date_time.so:${PORTSDIR}/devel/boost-libs \
20	LIB_DEPENDS= libboost_date_time.so:${PORTSDIR}/devel/boost-libs	15	libprotobuf.so:${PORTSDIR}/devel/protobuf
21		16
22	OPTIONS_DEFINE= GUI WALLET UPNP QRCODES	17	USES= autoreconf compiler:c++0x gmake libtool pkgconfig
23	OPTIONS_DEFAULT= GUI WALLET QRCODES	18	USE_GITHUB= yes
		19	USE_OPENSSL= yes
		20	GNU_CONFIGURE= yes
24		21
25	GUI_DESC= Build and install the QT4 binary	22	.if defined(SLAVE_PORT) && ${SLAVE_PORT} == "no"
26	WALLET_DESC= Build with support to create and manage a wallet	23	USES+= desktop-file-utils
27	UPNP_DESC= Build with UPNP support	24	USE_QT4= corelib network gui qmake_build moc_build uic_build \
28	QRCODES_DESC= Build with QR code display	25	rcc_build linguist_build
		26	.endif
29		27
30	AUTOMAKE_ARGS+= --add-missing	28	OPTIONS_DEFINE?= DBUS DEBUG QRCODES UPNP WALLET
31	USE_AUTOTOOLS= aclocal autoheader automake autoconf	29	OPTIONS_DEFAULT?= QRCODES WALLET
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		30
35	USE_GITHUB= yes	31	QRCODES_DESC= Display QR Codes
		32	WALLET_DESC= Wallet Management Support
		33
		34	DBUS_CONFIGURE_WITH= qtdbus
		35	DBUS_USE= QT4=dbus
		36
		37	DEBUG_CONFIGURE_ENABLE= debug
		38	DEBUG_INSTALL_TARGET_OFF= install-strip
		39
		40	UPNP_CONFIGURE_WITH= miniupnpc
		41	UPNP_LIB_DEPENDS= libminiupnpc.so:${PORTSDIR}/net/miniupnpc
		42
		43	QRCODES_CONFIGURE_WITH= qrencode
		44	QRCODES_LIB_DEPENDS= libqrencode.so:${PORTSDIR}/graphics/libqrencode
		45
		46	WALLET_CONFIGURE_ENABLE= wallet
		47	WALLET_CPPFLAGS= -I${BDB_INCLUDE_DIR}
		48	WALLET_LDFLAGS= -L${BDB_LIB_DIR}
		49	WALLET_USE= BDB=48
		50
36	GH_ACCOUNT= bitcoin	51	GH_ACCOUNT= bitcoin
37	GH_PROJECT= bitcoin	52	GH_COMMIT= 58810d2
38	GH_COMMIT= 30a7357
39	GH_TAGNAME= v${PORTVERSION}	53	GH_TAGNAME= v${PORTVERSION}
40		54
41	USES= gmake	55	CONFIGURE_ARGS?= --with-gui \
42	USE_OPENSSL= yes	56	--without-daemon \
43	USE_BDB= yes	57	--without-utils \
44	WANT_BDB_VER= 48	58	--disable-libs \
		59	--disable-tests
45		60
46	CXXFLAGS+= -I${LOCALBASE}/include -I${BDB_INCLUDE_DIR}	61	CONFIGURE_ENV= CRYPTO_CFLAGS="-I/usr/include" CRYPTO_LIBS="-lcrypto" \
47	CXXFLAGS+= -L${LOCALBASE}/lib -L${BDB_LIB_DIR}	62	SSL_CFLAGS="-I/usr/include" SSL_LIBS="-lssl"
		63
		64	CPPFLAGS+= -I${LOCALBASE}/include
48	CXXFLAGS+= -Wno-invalid-offsetof	65	CXXFLAGS+= -Wno-invalid-offsetof
		66	LDFLAGS+= -L${LOCALBASE}/lib
49		67
50	.include <bsd.port.options.mk>	68	PLIST_FILES?= bin/bitcoin-qt share/applications/bitcoin-qt.desktop \
		69	share/pixmaps/bitcoin128.png
51		70
52	CONFIGURE_ARGS+=--disable-tests	71	.if defined(SLAVE_PORT) && ${SLAVE_PORT} == "no"
53		72
54	.if ${PORT_OPTIONS:MGUI} && !defined(WITHOUT_X11)	73	post-install:
55	USE_QT4= corelib gui qmake_build linguist uic moc rcc qtestlib_build	74	${REINPLACE_CMD} -e 's,=/usr,=${PREFIX},' \
56	USES+= desktop-file-utils	75	${WRKSRC}/contrib/debian/bitcoin-qt.desktop
57	PLIST_FILES= %%QT_BINDIR%%/bitcoin-qt %%QT_BINDIR%%/bitcoind %%QT_BINDIR%%/bitcoin-cli	76	${INSTALL} ${WRKSRC}/contrib/debian/bitcoin-qt.desktop \
58	PLIST_FILES+= share/applications/bitcoin-qt.desktop share/pixmaps/bitcoin128.png	77	${STAGEDIR}${PREFIX}/share/applications
59	CONFIGURE_ARGS+=--with-gui	78	${INSTALL} ${WRKSRC}/share/pixmaps/bitcoin128.png \
60	.else	79	${STAGEDIR}${PREFIX}/share/pixmaps/
61	PLIST_FILES= bin/bitcoind bin/bitcoin-cli
62	CONFIGURE_ARGS+=--without-gui
63	.endif
64		80
65	.if ${PORT_OPTIONS:MQRCODES}
66	LIB_DEPENDS+= libqrencode.so:${PORTSDIR}/graphics/libqrencode
67	CONFIGURE_ARGS+=--with-qrencode
68	.else
69	CONFIGURE_ARGS+=--without-qrencode
70	.endif	81	.endif
71		82
72	.if ${PORT_OPTIONS:MUPNP}
73	LIB_DEPENDS+= libminiupnpc.so:${PORTSDIR}/net/miniupnpc
74	CONFIGURE_ARGS+=--with-miniupnpc
75	.else
76	CONFIGURE_ARGS+=--without-miniupnpc
77	.endif
78
79	.if ${PORT_OPTIONS:MWALLET}
80	CONFIGURE_ARGS+=--enable-wallet
81	.else
82	CONFIGURE_ARGS+=--disable-wallet
83	.endif
84
85	.include <bsd.port.pre.mk>
86
87	post-patch:	83	post-patch:
88	${MKDIR} ${WRKSRC}/src/build-aux	84	${MKDIR} ${WRKSRC}/src/build-aux
89		85
90	post-install:	86	.include <bsd.port.mk>
91	.if ${PORT_OPTIONS:MGUI} && !defined(WITHOUT_X11)
92	${REINPLACE_CMD} -e 's,=/usr,=${PREFIX},' ${WRKSRC}/contrib/debian/bitcoin-qt.desktop
93	${INSTALL} ${WRKSRC}/contrib/debian/bitcoin-qt.desktop ${STAGEDIR}${PREFIX}/share/applications
94	${INSTALL} ${WRKSRC}/share/pixmaps/bitcoin128.png ${STAGEDIR}${PREFIX}/share/pixmaps/
95	.endif
96
97	.include <bsd.port.post.mk>

Lines 1-14 Link Here

(-)bitcoin/files/patch-qt_makefile_am_editSedCommands.patch (-14 lines)
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

Lines 1-9 Link Here

(-)bitcoin-daemon/Makefile (-4 / +12 lines)
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
7	SLAVE_PORT= yes	7	OPTIONS_DEFINE= DEBUG UPNP WALLET
8	OPTIONS_EXCLUDE= GUI QRCODES	8
		9	CONFIGURE_ARGS= --with-daemon \
		10	--without-gui \
		11	--without-libs \
		12	--without-utils \
		13	--disable-tests
		14
		15	PLIST_FILES= bin/bitcoind
		16
9	.include "${MASTERDIR}/Makefile"	17	.include "${MASTERDIR}/Makefile"

Line 0 Link Here

(-)bitcoin-utils/Makefile (+19 lines)
	1	# $FreeBSD$
	2
	3	PKGNAMESUFFIX= -utils
	4	MASTERDIR= ${.CURDIR}/../bitcoin
	5
	6	OPTIONS_DEFINE= DEBUG
	7
	8	CONFIGURE_ARGS= --with-utils \
	9	--without-daemon \
	10	--without-gui \
	11	--with-gui=no \
	12	--without-libs \
	13	--without-qrencode \
	14	--disable-tests \
	15	--disable-wallet
	16
	17	PLIST_FILES= bin/bitcoin-cli bin/bitcoin-tx
	18
	19	.include "${MASTERDIR}/Makefile"