Attachment #165698 for bug #206329

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




# $FreeBSD$

PORTNAME=	zetacoin
PORTVERSION=	0.9.2.7
DISTVERSIONPREFIX=	v
CATEGORIES=	net-p2p finance

MAINTAINER=	daniel@morante.net


LICENSE=	MIT

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

USES+=		autoreconf compiler:c++0x gmake libtool pkgconfig:build

BROKEN_armv6=	AtomicPointer not implemented

USE_GITHUB=	yes
GH_TAGNAME=	22ddb9b

OPTIONS_DEFINE=	X11 UPNP WALLET CLI TEST
OPTIONS_SUB=	yes


WALLET_DESC=	Build wallet or P2P server node only
QRCODES_DESC=	Enable QR code display when building graphical interface
CLI_DESC=		Build command line RPC client

OPTIONS_DEFAULT=	X11 WALLET QRCODES
OPTIONS_GROUP=		X11
OPTIONS_GROUP_X11=	QRCODES

UPNP_CONFIGURE_WITH=	miniupnpc
UPNP_LIB_DEPENDS=		libminiupnpc.so:${PORTSDIR}/net/miniupnpc
UPNP_CPPFLAGS=          -I${LOCALBASE}/include
UPNP_LIBS=              -L${LOCALBASE}/lib

X11_CONFIGURE_WITH=	gui
X11_CONFIGURE_ON=	--without-daemon
X11_CONFIGURE_OFF=	--with-daemon
X11_BUILD_DEPENDS=	protoc:${PORTSDIR}/devel/protobuf
X11_LIB_DEPENDS=	libprotobuf.so:${PORTSDIR}/devel/protobuf
X11_USE=	qt4=corelib,network,gui,qmake_build,linguisttools_build \
			qt4=uic_build,moc_build,rcc_build,qtestlib_build
X11_USES=	desktop-file-utils

WALLET_CONFIGURE_ENABLE=	wallet
WALLET_CXXFLAGS=	-I${BDB_INCLUDE_DIR}
WALLET_LIBS=		-L${BDB_LIB_DIR}
WALLET_USE=	bdb=48

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


TEST_ALL_TARGET=	check

GNU_CONFIGURE=	yes
CONFIGURE_ENV=	CRYPTO_CFLAGS="-I${OPENSSLINC}" CRYPTO_LIBS="-L${OPENSSLLIB} -lcrypto" \
				SSL_CFLAGS="-I${OPENSSLINC}" SSL_LIBS="-L${OPENSSLLIB} -lssl"
USES=		autoreconf gmake
USE_OPENSSL=	yes
WANT_BDB_VER=	48

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

QT_BINARY=		${PORTNAME}-qt
CLI_BINARY=		${PORTNAME}-cli
DAEMON=		${PORTNAME}d


.include <bsd.port.options.mk>

.if ${PORT_OPTIONS:MX11}
QT_NONSTANDARD=	yes
.endif

# tests will currently fail

Lines 1-2 Link Here

(-)distinfo (-2 / +2 lines)
1	SHA256 (zetacoin-zetacoin-0.9.2.4-22ddb9b_GH0.tar.gz) = daa9138be4d893ec10bdc429928d4fa6c2f935c0489fdd855cc1e4aaaf65a6f8	1	SHA256 (zetacoin-zetacoin-v0.9.2.7_GH0.tar.gz) = e24bdcc9c576d6af268b790118e294f8ce1e18695a4234a58f84abb9856233f1
2	SIZE (zetacoin-zetacoin-0.9.2.4-22ddb9b_GH0.tar.gz) = 4265754	2	SIZE (zetacoin-zetacoin-v0.9.2.7_GH0.tar.gz) = 4266219




commit 9f3e48e5219a09b5ddfd6883d1f0498910eff4b6
Author: Pavel Vasin <pavel@vasin.nl>
Date:   Sun, 23 Aug 2015 23:53:49 +0300

    add support for miniupnpc api version 14

    The value of new arg ttl is set to 2 as it's recommended default.
---
 src/net.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/net.cpp b/src/net.cpp
index fb5726a..4c6331f 100644
--- src/net.cpp.orig	2015-07-10 17:23:55 UTC
+++ src/net.cpp
@@ -1120,10 +1120,14 @@ void ThreadMapPort()
 #ifndef UPNPDISCOVER_SUCCESS
     /* miniupnpc 1.5 */
     devlist = upnpDiscover(2000, multicastif, minissdpdpath, 0);
-#else
+#elif MINIUPNPC_API_VERSION < 14
     /* miniupnpc 1.6 */
     int error = 0;
     devlist = upnpDiscover(2000, multicastif, minissdpdpath, 0, 0, &error);
+#else
+    /* miniupnpc 1.9.20150730 */
+    int error = 0;
+    devlist = upnpDiscover(2000, multicastif, minissdpdpath, 0, 0, 2, &error);
 #endif
 
     struct UPNPUrls urls;

Lines 27-32 Link Here

(-)files/zetacoin.in (-1 / +15 lines)
27	name=%%PORTNAME%%	27	name=%%PORTNAME%%
28	rcvar=%%PORTNAME%%_enable	28	rcvar=%%PORTNAME%%_enable
29		29
		30	load_rc_config $name
		31
30	: ${%%PORTNAME%%_enable:=NO}	32	: ${%%PORTNAME%%_enable:=NO}
31	: ${%%PORTNAME%%_config=%%PREFIX%%/etc/%%PORTNAME%%.conf}	33	: ${%%PORTNAME%%_config=%%PREFIX%%/etc/%%PORTNAME%%.conf}
32	: ${%%PORTNAME%%_datadir=/var/db/%%PORTNAME%%}	34	: ${%%PORTNAME%%_datadir=/var/db/%%PORTNAME%%}
Lines 40-45 Link Here
40	stop_cmd=%%PORTNAME%%_stop	42	stop_cmd=%%PORTNAME%%_stop
41	command_args="-conf=${%%PORTNAME%%_config} -datadir=${%%PORTNAME%%_datadir} -noupnp -daemon -pid=${pidfile}"	43	command_args="-conf=${%%PORTNAME%%_config} -datadir=${%%PORTNAME%%_datadir} -noupnp -daemon -pid=${pidfile}"
42	start_precmd="${name}_prestart"	44	start_precmd="${name}_prestart"
		45	reindex_cmd=%%PORTNAME%%_reindex
		46	extra_commands="reindex"
43		47
44	%%PORTNAME%%_create_datadir()	48	%%PORTNAME%%_create_datadir()
45	{	49	{
Lines 72-76 Link Here
72	wait_for_pids ${rc_pid}	76	wait_for_pids ${rc_pid}
73	}	77	}
74		78
75	load_rc_config $name	79	%%PORTNAME%%_reindex()
		80	{
		81	if [ -z "$rc_fast" -a -n "$rc_pid" ]; then
		82	%%PORTNAME%%_stop
		83	fi
		84
		85	echo "Reindexing ${name} blockchain."
		86	command_args="${command_args} -reindex"
		87	eval ${command} ${command_args}
		88	}
		89
76	run_rc_command "$1"	90	run_rc_command "$1"

Return to bug 206329

Lines 2-8 Link Here

(-)Makefile (-19 / +19 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= zetacoin	4	PORTNAME= zetacoin
5	PORTVERSION= 0.9.2.4	5	PORTVERSION= 0.9.2.7
		6	DISTVERSIONPREFIX= v
6	CATEGORIES= net-p2p finance	7	CATEGORIES= net-p2p finance
7		8
8	MAINTAINER= daniel@morante.net	9	MAINTAINER= daniel@morante.net
Lines 10-22 Link Here
10		11
11	LICENSE= MIT	12	LICENSE= MIT
12		13
13	BUILD_DEPENDS= pkg-config:${PORTSDIR}/devel/pkgconf
14	LIB_DEPENDS= libboost_date_time.so:${PORTSDIR}/devel/boost-libs	14	LIB_DEPENDS= libboost_date_time.so:${PORTSDIR}/devel/boost-libs
15		15
		16	USES+= autoreconf compiler:c++0x gmake libtool pkgconfig:build
		17
16	BROKEN_armv6= AtomicPointer not implemented	18	BROKEN_armv6= AtomicPointer not implemented
17		19
18	USE_GITHUB= yes	20	USE_GITHUB= yes
19	GH_TAGNAME= 22ddb9b
20		21
21	OPTIONS_DEFINE= X11 UPNP WALLET CLI TEST	22	OPTIONS_DEFINE= X11 UPNP WALLET CLI TEST
22	OPTIONS_SUB= yes	23	OPTIONS_SUB= yes
Lines 23-49 Link Here
23		24
24	WALLET_DESC= Build wallet or P2P server node only	25	WALLET_DESC= Build wallet or P2P server node only
25	QRCODES_DESC= Enable QR code display when building graphical interface	26	QRCODES_DESC= Enable QR code display when building graphical interface
26	CLI_DESC= Build command line RPC client	27	CLI_DESC= Build command line RPC client
27		28
28	OPTIONS_DEFAULT= X11 WALLET QRCODES	29	OPTIONS_DEFAULT= X11 WALLET QRCODES
29	OPTIONS_GROUP= X11	30	OPTIONS_GROUP= X11
30	OPTIONS_GROUP_X11= QRCODES	31	OPTIONS_GROUP_X11= QRCODES
31		32
32	UPNP_CONFIGURE_WITH= miniupnpc	33	UPNP_CONFIGURE_WITH= miniupnpc
33	UPNP_LIB_DEPENDS= libminiupnpc.so:${PORTSDIR}/net/miniupnpc	34	UPNP_LIB_DEPENDS= libminiupnpc.so:${PORTSDIR}/net/miniupnpc
		35	UPNP_CPPFLAGS= -I${LOCALBASE}/include
		36	UPNP_LIBS= -L${LOCALBASE}/lib
34		37
35	X11_CONFIGURE_WITH= gui	38	X11_CONFIGURE_WITH= gui
36	X11_CONFIGURE_ON= --without-daemon	39	X11_CONFIGURE_ON= --without-daemon
37	X11_CONFIGURE_OFF= --with-daemon	40	X11_CONFIGURE_OFF= --with-daemon
38	X11_BUILD_DEPENDS= protoc:${PORTSDIR}/devel/protobuf	41	X11_BUILD_DEPENDS= protoc:${PORTSDIR}/devel/protobuf
		42	X11_LIB_DEPENDS= libprotobuf.so:${PORTSDIR}/devel/protobuf
39	X11_USE= qt4=corelib,network,gui,qmake_build,linguisttools_build \	43	X11_USE= qt4=corelib,network,gui,qmake_build,linguisttools_build \
40	qt4=uic_build,moc_build,rcc_build,qtestlib_build	44	qt4=uic_build,moc_build,rcc_build,qtestlib_build
41	X11_USES= desktop-file-utils	45	X11_USES= desktop-file-utils
42		46
43	WALLET_CONFIGURE_ENABLE= wallet	47	WALLET_CONFIGURE_ENABLE= wallet
44	WALLET_CXXFLAGS= -I${BDB_INCLUDE_DIR} -L${BDB_LIB_DIR}	48	WALLET_CXXFLAGS= -I${BDB_INCLUDE_DIR}
45	WALLET_USE= bdb=yes	49	WALLET_LIBS= -L${BDB_LIB_DIR}
		50	WALLET_USE= bdb=48
46		51
		52	QRCODES_IMPLIES= X11
47	QRCODES_LIB_DEPENDS= libqrencode.so:${PORTSDIR}/graphics/libqrencode	53	QRCODES_LIB_DEPENDS= libqrencode.so:${PORTSDIR}/graphics/libqrencode
48	QRCODES_CONFIGURE_WITH= qrencode	54	QRCODES_CONFIGURE_WITH= qrencode
49		55
Lines 53-68 Link Here
53	TEST_ALL_TARGET= check	59	TEST_ALL_TARGET= check
54		60
55	GNU_CONFIGURE= yes	61	GNU_CONFIGURE= yes
56	CONFIGURE_ENV= SSL_LIBS="-lssl" CRYPTO_LIBS="-lcrypto" SSL_CFLAGS="-I/usr/include" CRYPTO_CFLAGS="-I/usr/include"	62	CONFIGURE_ENV= CRYPTO_CFLAGS="-I${OPENSSLINC}" CRYPTO_LIBS="-L${OPENSSLLIB} -lcrypto" \
57		63	SSL_CFLAGS="-I${OPENSSLINC}" SSL_LIBS="-L${OPENSSLLIB} -lssl"
58	USES= autoreconf gmake
59	USE_OPENSSL= yes	64	USE_OPENSSL= yes
60	WANT_BDB_VER= 48
61		65
62	CXXFLAGS+= -I${LOCALBASE}/include
63	CXXFLAGS+= -L${LOCALBASE}/lib
64	CXXFLAGS+= -Wno-invalid-offsetof
65
66	QT_BINARY= ${PORTNAME}-qt	66	QT_BINARY= ${PORTNAME}-qt
67	CLI_BINARY= ${PORTNAME}-cli	67	CLI_BINARY= ${PORTNAME}-cli
68	DAEMON= ${PORTNAME}d	68	DAEMON= ${PORTNAME}d
Lines 74-81 Link Here
74		74
75	.include <bsd.port.options.mk>	75	.include <bsd.port.options.mk>
76		76
77	.if empty(PORT_OPTIONS:MX11) && !empty(PORT_OPTIONS:MQRCODES)	77	.if ${PORT_OPTIONS:MX11}
78	BROKEN= QRCODES requires X11 support. Run 'make config' again!	78	QT_NONSTANDARD= yes
79	.endif	79	.endif
80		80
81	# tests will currently fail	81	# tests will currently fail

Line 0 Link Here

(-)files/patch-src_net.cpp (+31 lines)
	1	commit 9f3e48e5219a09b5ddfd6883d1f0498910eff4b6
	2	Author: Pavel Vasin <pavel@vasin.nl>
	3	Date: Sun, 23 Aug 2015 23:53:49 +0300
	4
	5	add support for miniupnpc api version 14
	6
	7	The value of new arg ttl is set to 2 as it's recommended default.
	8	---
	9	src/net.cpp \| 6 +++++-
	10	1 file changed, 5 insertions(+), 1 deletion(-)
	11
	12	diff --git a/src/net.cpp b/src/net.cpp
	13	index fb5726a..4c6331f 100644
	14	--- src/net.cpp.orig 2015-07-10 17:23:55 UTC
	15	+++ src/net.cpp
	16	@@ -1120,10 +1120,14 @@ void ThreadMapPort()
	17	#ifndef UPNPDISCOVER_SUCCESS
	18	/* miniupnpc 1.5 */
	19	devlist = upnpDiscover(2000, multicastif, minissdpdpath, 0);
	20	-#else
	21	+#elif MINIUPNPC_API_VERSION < 14
	22	/* miniupnpc 1.6 */
	23	int error = 0;
	24	devlist = upnpDiscover(2000, multicastif, minissdpdpath, 0, 0, &error);
	25	+#else
	26	+ /* miniupnpc 1.9.20150730 */
	27	+ int error = 0;
	28	+ devlist = upnpDiscover(2000, multicastif, minissdpdpath, 0, 0, 2, &error);
	29	#endif
	30
	31	struct UPNPUrls urls;