Index: head/net-p2p/zetacoin/Makefile =================================================================== --- head/net-p2p/zetacoin/Makefile (revision 421509) +++ head/net-p2p/zetacoin/Makefile (revision 421510) @@ -1,114 +1,116 @@ # Created by: Daniel Morante # $FreeBSD$ PORTNAME= zetacoin -PORTVERSION= 0.9.2.7 +PORTVERSION= 0.11.2.3 DISTVERSIONPREFIX= v CATEGORIES= net-p2p finance MAINTAINER= daniel@morante.net COMMENT= Peer-to-Peer crypto currency with quick transactions LICENSE= MIT LIB_DEPENDS= libboost_date_time.so:devel/boost-libs USES+= autoreconf compiler:c++0x gmake libtool pkgconfig:build ssl BROKEN_armv6= AtomicPointer not implemented USE_GITHUB= yes 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:net/miniupnpc -UPNP_CPPFLAGS= -I${LOCALBASE}/include -UPNP_LIBS= -L${LOCALBASE}/lib +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 X11_CONFIGURE_OFF= --with-daemon X11_BUILD_DEPENDS= protoc:devel/protobuf X11_LIB_DEPENDS= libprotobuf.so:devel/protobuf -X11_USE= qt4=corelib,network,gui,qmake_build,linguisttools_build \ +X11_USE= qt4=corelib,network,gui,qmake_build,linguisttools_build \ qt4=uic_build,moc_build,rcc_build,qtestlib_build -X11_USES= desktop-file-utils +X11_USES= desktop-file-utils -WALLET_CONFIGURE_ENABLE= wallet +WALLET_CONFIGURE_ENABLE=wallet WALLET_CXXFLAGS= -I${BDB_INCLUDE_DIR} WALLET_LIBS= -L${BDB_LIB_DIR} -WALLET_USES= bdb:48 +WALLET_USES= bdb:48 QRCODES_IMPLIES= X11 QRCODES_LIB_DEPENDS= libqrencode.so:graphics/libqrencode QRCODES_CONFIGURE_WITH= qrencode CLI_CONFIGURE_WITH= cli TEST_CONFIGURE_ENABLE= tests 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" + SSL_CFLAGS="-I${OPENSSLINC}" SSL_LIBS="-L${OPENSSLLIB} -lssl" \ + OBJC="${CC}" OBJCFLAGS="${CFLAGS}" OBJCXX="${CXX}" OBJCXXFLAGS="${CXXFLAGS}" -QT_BINARY= ${PORTNAME}-qt -CLI_BINARY= ${PORTNAME}-cli +QT_BINARY= ${PORTNAME}-qt +CLI_BINARY= ${PORTNAME}-cli DAEMON= ${PORTNAME}d PLIST_SUB+= EXECUTABLE_QT=bin/${QT_BINARY} \ - EXECUTABLE_CLI=bin/${CLI_BINARY} \ - EXECUTABLE_DAEMON=bin/${DAEMON} \ - PORTNAME=${PORTNAME} + EXECUTABLE_CLI=bin/${CLI_BINARY} \ + EXECUTABLE_DAEMON=bin/${DAEMON} \ + PORTNAME=${PORTNAME} .include .if ${PORT_OPTIONS:MX11} QT_NONSTANDARD= yes .endif # tests will currently fail .if ${PORT_OPTIONS:MTEST} BROKEN= automated testing fails .endif .if ! ${PORT_OPTIONS:MX11} USE_RC_SUBR= ${PORTNAME} SUB_LIST+= PORTNAME=${PORTNAME} SUB_FILES= pkg-message USERS= ${PORTNAME} GROUPS= ${PORTNAME} .endif post-patch: ${MKDIR} ${WRKSRC}/src/build-aux do-install: -.if ${PORT_OPTIONS:MCLI} + @${DO_NADA} + +do-install-CLI-on: ${INSTALL_PROGRAM} -s ${WRKSRC}/src/${CLI_BINARY} ${STAGEDIR}${PREFIX}/bin/${CLI_BINARY} -.endif -.if ${PORT_OPTIONS:MX11} +do-install-X11-on: ${INSTALL_PROGRAM} -s ${WRKSRC}/src/qt/${QT_BINARY} ${STAGEDIR}${PREFIX}/bin/${QT_BINARY} ${REINPLACE_CMD} -e 's,=/usr,=${PREFIX},' \ -e 's,bitcoin,zetacoin,g' \ -e 's,Bitcoin,Zetacoin,g' \ -e 's,128,,g' ${WRKSRC}/contrib/debian/bitcoin-qt.desktop ${INSTALL} ${WRKSRC}/contrib/debian/bitcoin-qt.desktop ${STAGEDIR}${PREFIX}/share/applications/${PORTNAME}-qt.desktop ${INSTALL} ${WRKSRC}/src/qt/res/icons/bitcoin.png ${STAGEDIR}${PREFIX}/share/pixmaps/${PORTNAME}.png -.else + +do-install-X11-off: ${INSTALL_PROGRAM} -s ${WRKSRC}/src/${DAEMON} ${STAGEDIR}${PREFIX}/bin/${DAEMON} ${INSTALL_DATA} ${FILESDIR}/${PORTNAME}.conf.sample ${STAGEDIR}${PREFIX}/etc/${PORTNAME}.conf.sample -.endif .include Index: head/net-p2p/zetacoin/distinfo =================================================================== --- head/net-p2p/zetacoin/distinfo (revision 421509) +++ head/net-p2p/zetacoin/distinfo (revision 421510) @@ -1,2 +1,3 @@ -SHA256 (zetacoin-zetacoin-v0.9.2.7_GH0.tar.gz) = e24bdcc9c576d6af268b790118e294f8ce1e18695a4234a58f84abb9856233f1 -SIZE (zetacoin-zetacoin-v0.9.2.7_GH0.tar.gz) = 4266219 +TIMESTAMP = 1466446290 +SHA256 (zetacoin-zetacoin-v0.11.2.3_GH0.tar.gz) = 581195ee6616f47c12cbd2b76cf0d61e152bbe659a349b5010d6ad3a51da80f9 +SIZE (zetacoin-zetacoin-v0.11.2.3_GH0.tar.gz) = 5735186 Index: head/net-p2p/zetacoin/files/patch-src_Makefile.include =================================================================== --- head/net-p2p/zetacoin/files/patch-src_Makefile.include (revision 421509) +++ head/net-p2p/zetacoin/files/patch-src_Makefile.include (nonexistent) @@ -1,27 +0,0 @@ ---- src/Makefile.include.orig 2014-12-12 22:22:31 UTC -+++ src/Makefile.include -@@ -40,18 +40,18 @@ $(LIBBITCOINQT): - ui_%.h: %.ui - @test -d $(abs_builddir)/$(@D) || $(MKDIR_P) $(abs_builddir)/$(@D) - @test -f $(UIC) && QT_SELECT=$(QT_SELECT) $(UIC) -o $(abs_builddir)/$@ $(abs_srcdir)/$< || echo error: could not build $(abs_builddir)/$@ -- $(SED) -e '/^\*\*.*Created:/d' $(abs_builddir)/$@ > $(abs_builddir)/$@.n && mv $(abs_builddir)/$@{.n,} -- $(SED) -e '/^\*\*.*by:/d' $(abs_builddir)/$@ > $(abs_builddir)/$@.n && mv $(abs_builddir)/$@{.n,} -+ $(SED) -e '/^\*\*.*Created:/d' $(abs_builddir)/$@ > $(abs_builddir)/$@.n && mv $(abs_builddir)/$@.n $(abs_builddir)/$@ -+ $(SED) -e '/^\*\*.*by:/d' $(abs_builddir)/$@ > $(abs_builddir)/$@.n && mv $(abs_builddir)/$@.n $(abs_builddir)/$@ - - %.moc: %.cpp - QT_SELECT=$(QT_SELECT) $(MOC) $(QT_INCLUDES) $(MOC_DEFS) -o $@ $< -- $(SED) -e '/^\*\*.*Created:/d' $@ > $@.n && mv $@{.n,} -- $(SED) -e '/^\*\*.*by:/d' $@ > $@.n && mv $@{.n,} -+ $(SED) -e '/^\*\*.*Created:/d' $@ > $@.n && mv $@.n $(abs_builddir)/$@ -+ $(SED) -e '/^\*\*.*by:/d' $@ > $@.n && mv $@.n $(abs_builddir)/$@ - - moc_%.cpp: %.h - QT_SELECT=$(QT_SELECT) $(MOC) $(QT_INCLUDES) $(MOC_DEFS) -o $@ $< -- $(SED) -e '/^\*\*.*Created:/d' $@ > $@.n && mv $@{.n,} -- $(SED) -e '/^\*\*.*by:/d' $@ > $@.n && mv $@{.n,} -+ $(SED) -e '/^\*\*.*Created:/d' $@ > $@.n && mv $@.n $(abs_builddir)/$@ -+ $(SED) -e '/^\*\*.*by:/d' $@ > $@.n && mv $@.n $(abs_builddir)/$@ - - %.qm: %.ts - @test -d $(abs_builddir)/$(@D) || $(MKDIR_P) $(abs_builddir)/$(@D) Property changes on: head/net-p2p/zetacoin/files/patch-src_Makefile.include ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net-p2p/zetacoin/files/patch-src_qt_Makefile.am =================================================================== --- head/net-p2p/zetacoin/files/patch-src_qt_Makefile.am (revision 421509) +++ head/net-p2p/zetacoin/files/patch-src_qt_Makefile.am (nonexistent) @@ -1,12 +0,0 @@ ---- 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 Property changes on: head/net-p2p/zetacoin/files/patch-src_qt_Makefile.am ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net-p2p/zetacoin/files/patch-src_net.cpp =================================================================== --- head/net-p2p/zetacoin/files/patch-src_net.cpp (revision 421509) +++ head/net-p2p/zetacoin/files/patch-src_net.cpp (nonexistent) @@ -1,31 +0,0 @@ -commit 9f3e48e5219a09b5ddfd6883d1f0498910eff4b6 -Author: Pavel Vasin -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; Property changes on: head/net-p2p/zetacoin/files/patch-src_net.cpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property