Attachment #174404 for bug #212402

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




# $FreeBSD$

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



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

X11_CONFIGURE_WITH=	gui
X11_CONFIGURE_ON=	--without-daemon

GNU_CONFIGURE=	yes
CONFIGURE_ENV=	CRYPTO_CFLAGS="-I${OPENSSLINC}" CRYPTO_LIBS="-L${OPENSSLLIB} -lcrypto" \
				SSL_CFLAGS="-I${OPENSSLINC}" SSL_LIBS="-L${OPENSSLLIB} -lssl"
CONFIGURE_ENV+=	OBJC="${CC}" OBJCFLAGS="${CFLAGS}" OBJCXX="${CXX}" OBJCXXFLAGS="${CXXFLAGS}"

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

Lines 1-2 Link Here

(-)distinfo (-2 / +3 lines)
1	SHA256 (zetacoin-zetacoin-v0.9.2.7_GH0.tar.gz) = e24bdcc9c576d6af268b790118e294f8ce1e18695a4234a58f84abb9856233f1	1	TIMESTAMP = 1466446290
2	SIZE (zetacoin-zetacoin-v0.9.2.7_GH0.tar.gz) = 4266219	2	SHA256 (zetacoin-zetacoin-v0.11.2.3_GH0.tar.gz) = 581195ee6616f47c12cbd2b76cf0d61e152bbe659a349b5010d6ad3a51da80f9
		3	SIZE (zetacoin-zetacoin-v0.11.2.3_GH0.tar.gz) = 5735186

Lines 1-27 Link Here

(-)files/patch-src_Makefile.include (-27 lines)
1	--- src/Makefile.include.orig 2014-12-12 22:22:31 UTC
2	+++ src/Makefile.include
3	@@ -40,18 +40,18 @@ $(LIBBITCOINQT):
4	ui_%.h: %.ui
5	@test -d $(abs_builddir)/$(@D) \|\| $(MKDIR_P) $(abs_builddir)/$(@D)
6	@test -f $(UIC) && QT_SELECT=$(QT_SELECT) $(UIC) -o $(abs_builddir)/$@ $(abs_srcdir)/$< \|\| echo error: could not build $(abs_builddir)/$@
7	- $(SED) -e '/^\\.*Created:/d' $(abs_builddir)/$@ > $(abs_builddir)/$@.n && mv $(abs_builddir)/$@{.n,}
8	- $(SED) -e '/^\\.*by:/d' $(abs_builddir)/$@ > $(abs_builddir)/$@.n && mv $(abs_builddir)/$@{.n,}
9	+ $(SED) -e '/^\\.*Created:/d' $(abs_builddir)/$@ > $(abs_builddir)/$@.n && mv $(abs_builddir)/$@.n $(abs_builddir)/$@
10	+ $(SED) -e '/^\\.*by:/d' $(abs_builddir)/$@ > $(abs_builddir)/$@.n && mv $(abs_builddir)/$@.n $(abs_builddir)/$@
11
12	%.moc: %.cpp
13	QT_SELECT=$(QT_SELECT) $(MOC) $(QT_INCLUDES) $(MOC_DEFS) -o $@ $<
14	- $(SED) -e '/^\\.*Created:/d' $@ > $@.n && mv $@{.n,}
15	- $(SED) -e '/^\\.*by:/d' $@ > $@.n && mv $@{.n,}
16	+ $(SED) -e '/^\\.*Created:/d' $@ > $@.n && mv $@.n $(abs_builddir)/$@
17	+ $(SED) -e '/^\\.*by:/d' $@ > $@.n && mv $@.n $(abs_builddir)/$@
18
19	moc_%.cpp: %.h
20	QT_SELECT=$(QT_SELECT) $(MOC) $(QT_INCLUDES) $(MOC_DEFS) -o $@ $<
21	- $(SED) -e '/^\\.*Created:/d' $@ > $@.n && mv $@{.n,}
22	- $(SED) -e '/^\\.*by:/d' $@ > $@.n && mv $@{.n,}
23	+ $(SED) -e '/^\\.*Created:/d' $@ > $@.n && mv $@.n $(abs_builddir)/$@
24	+ $(SED) -e '/^\\.*by:/d' $@ > $@.n && mv $@.n $(abs_builddir)/$@
25
26	%.qm: %.ts
27	@test -d $(abs_builddir)/$(@D) \|\| $(MKDIR_P) $(abs_builddir)/$(@D)




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;




--- src/qt/Makefile.am.orig	2014-12-12 22:22:31 UTC
+++ src/qt/Makefile.am
@@ -373,7 +373,7 @@ translate: bitcoinstrings.cpp $(QT_FORMS
 $(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

Return to bug 212402

Lines 2-8 Link Here

(-)Makefile (-3 / +4 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= zetacoin	4	PORTNAME= zetacoin
5	PORTVERSION= 0.9.2.7	5	PORTVERSION= 0.11.2.3
6	DISTVERSIONPREFIX= v	6	DISTVERSIONPREFIX= v
7	CATEGORIES= net-p2p finance	7	CATEGORIES= net-p2p finance
8		8
Lines 32-39 Link Here
32		32
33	UPNP_CONFIGURE_WITH= miniupnpc	33	UPNP_CONFIGURE_WITH= miniupnpc
34	UPNP_LIB_DEPENDS= libminiupnpc.so:net/miniupnpc	34	UPNP_LIB_DEPENDS= libminiupnpc.so:net/miniupnpc
35	UPNP_CPPFLAGS= -I${LOCALBASE}/include	35	UPNP_CPPFLAGS= -I${LOCALBASE}/include
36	UPNP_LIBS= -L${LOCALBASE}/lib	36	UPNP_LIBS= -L${LOCALBASE}/lib
37		37
38	X11_CONFIGURE_WITH= gui	38	X11_CONFIGURE_WITH= gui
39	X11_CONFIGURE_ON= --without-daemon	39	X11_CONFIGURE_ON= --without-daemon
Lines 61-66 Link Here
61	GNU_CONFIGURE= yes	61	GNU_CONFIGURE= yes
62	CONFIGURE_ENV= CRYPTO_CFLAGS="-I${OPENSSLINC}" CRYPTO_LIBS="-L${OPENSSLLIB} -lcrypto" \	62	CONFIGURE_ENV= CRYPTO_CFLAGS="-I${OPENSSLINC}" CRYPTO_LIBS="-L${OPENSSLLIB} -lcrypto" \
63	SSL_CFLAGS="-I${OPENSSLINC}" SSL_LIBS="-L${OPENSSLLIB} -lssl"	63	SSL_CFLAGS="-I${OPENSSLINC}" SSL_LIBS="-L${OPENSSLLIB} -lssl"
		64	CONFIGURE_ENV+= OBJC="${CC}" OBJCFLAGS="${CFLAGS}" OBJCXX="${CXX}" OBJCXXFLAGS="${CXXFLAGS}"
64		65
65	QT_BINARY= ${PORTNAME}-qt	66	QT_BINARY= ${PORTNAME}-qt
66	CLI_BINARY= ${PORTNAME}-cli	67	CLI_BINARY= ${PORTNAME}-cli

Lines 1-31 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;

Lines 1-12 Link Here

(-)files/patch-src_qt_Makefile.am (-12 lines)
1	--- src/qt/Makefile.am.orig 2014-12-12 22:22:31 UTC
2	+++ src/qt/Makefile.am
3	@@ -373,7 +373,7 @@ translate: bitcoinstrings.cpp $(QT_FORMS
4	$(QT_QRC_CPP): $(QT_QRC) $(QT_QM) $(QT_FORMS_H) $(RES_ICONS) $(RES_IMAGES) $(RES_MOVIES) $(PROTOBUF_H)
5	@cd $(abs_srcdir); test -f $(RCC) && QT_SELECT=$(QT_SELECT) $(RCC) -name bitcoin -o $(abs_builddir)/$@ $< \|\| \
6	echo error: could not build $@
7	- $(SED) -e '/^\\.*Created:/d' $@ > $@.n && mv $@{.n,}
8	- $(SED) -e '/^\\.*by:/d' $@ > $@.n && mv $@{.n,}
9	+ $(SED) -e '/^\\.*Created:/d' $@ > $@.n && mv $@.n $@
10	+ $(SED) -e '/^\\.*by:/d' $@ > $@.n && mv $@.n $@
11
12	CLEANFILES = $(BUILT_SOURCES) $(QT_QM) $(QT_FORMS_H) .gcda .gcno