Index: Makefile =================================================================== --- Makefile (revision 363959) +++ Makefile (working copy) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= zetacoin -PORTVERSION= 0.8.99.16 +PORTVERSION= 0.9.2.1 CATEGORIES= net-p2p finance MASTER_SITES= GH @@ -11,92 +11,100 @@ LICENSE= MIT +BUILD_DEPENDS= pkg-config:${PORTSDIR}/devel/pkgconf LIB_DEPENDS= libboost_date_time.so:${PORTSDIR}/devel/boost-libs -OPTIONS_DEFINE= X11 UPNP QRCODES -OPTIONS_DEFAULT= X11 QRCODES -UPNP_DESC= Build with UPNP support -QRCODES_DESC= Build with QR code display - USE_GITHUB= yes GH_ACCOUNT= ${PORTNAME} GH_PROJECT= ${PORTNAME} -GH_COMMIT= 9a52761 -GH_TAGNAME= 9a52761 +GH_COMMIT= 93a4ace +GH_TAGNAME= 93a4ace +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 + +X11_CONFIGURE_WITH= gui +X11_CONFIGURE_ON= --without-daemon +X11_CONFIGURE_OFF= --with-daemon +X11_BUILD_DEPENDS= protoc:${PORTSDIR}/devel/protobuf +X11_USE= qt4=corelib,gui,qmake_build,linguist,uic,moc,rcc,qtestlib_build +X11_USES= desktop-file-utils + +WALLET_CONFIGURE_ENABLE= wallet +WALLET_CXXFLAGS= -I${BDB_INCLUDE_DIR} -L${BDB_LIB_DIR} +WALLET_USE= bdb=yes + +QRCODES_LIB_DEPENDS= libqrencode.so:${PORTSDIR}/graphics/libqrencode +QRCODES_CONFIGURE_WITH= qrencode + +CLI_CONFIGURE_WITH= cli + +TEST_CONFIGURE_ENABLE= tests +TEST_ALL_TARGET= check + +AUTOMAKE_ARGS+= --add-missing +USE_AUTOTOOLS= aclocal autoheader automake autoconf +CONFIGURE_ENV= SSL_LIBS="-lssl" CRYPTO_LIBS="-lcrypto" SSL_CFLAGS="-I/usr/include" CRYPTO_CFLAGS="-I/usr/include" + USES= gmake USE_OPENSSL= yes -USE_BDB= yes WANT_BDB_VER= 48 -CXXFLAGS+= -I${LOCALBASE}/include -I${BDB_INCLUDE_DIR} -CXXFLAGS+= -L${LOCALBASE}/lib -L${BDB_LIB_DIR} +CXXFLAGS+= -I${LOCALBASE}/include +CXXFLAGS+= -L${LOCALBASE}/lib CXXFLAGS+= -Wno-invalid-offsetof +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} + .include -.if ${PORT_OPTIONS:MX11} -PLIST_SUB+= X11="" -.else +.if empty(PORT_OPTIONS:MX11) && !empty(PORT_OPTIONS:MQRCODES) +BROKEN= QRCODES requires X11 support. Run 'make config' again! +.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} -USE_RC_SUBR= ${PORTNAME} SUB_FILES= pkg-message -PLIST_SUB+= X11="@comment " USERS= ${PORTNAME} GROUPS= ${PORTNAME} .endif -.if ${PORT_OPTIONS:MX11} -USE_QT4= corelib gui qmake_build linguist uic moc rcc -BINARY= ${PORTNAME}-qt -PLIST_SUB+= HEADLESS="@comment " -.else -BINARY= ${PORTNAME}d -MAKE_ARGS+= -C ${WRKSRC}/src -PLIST_SUB+= HEADLESS="" -.endif - -.if ${PORT_OPTIONS:MQRCODES} -LIB_DEPENDS+= libqrencode.so:${PORTSDIR}/graphics/libqrencode -QMAKE_USE_QRCODE=1 -.else -QMAKE_USE_QRCODE=0 -.endif - -PLIST_SUB+= EXECUTABLE="bin/${BINARY}" \ - PORTNAME=${PORTNAME} - -.if ${PORT_OPTIONS:MUPNP} -LIB_DEPENDS+= libminiupnpc.so:${PORTSDIR}/net/miniupnpc -QMAKE_USE_UPNP= 1 -.else -QMAKE_USE_UPNP= - -.endif - .include post-patch: - @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|' ${WRKSRC}/src/makefile.unix -.if !${PORT_OPTIONS:MX11} - @cd ${WRKSRC}/src && ${CP} -p makefile.unix Makefile - @${REINPLACE_CMD} \ - -e 's|^USE_UPNP.*$$|USE_UPNP=${QMAKE_USE_UPNP}|' \ - -e 's|-l pthread|${PTHREAD_LIBS}|g' \ - -e 's:-l dl::' \ - ${WRKSRC}/src/Makefile -.endif + ${MKDIR} ${WRKSRC}/src/build-aux -do-configure: -.if ${PORT_OPTIONS:MX11} - cd ${WRKSRC} && ${SETENV} ${QMAKE_ENV} \ - ${QMAKE} ${QMAKE_ARGS} USE_UPNP=${QMAKE_USE_UPNP} USE_QRCODE=${QMAKE_USE_QRCODE} \ - QMAKE_LRELEASE=lrelease-qt4 PREFIX=${PREFIX} INCLUDEPATH=${BDB_INCLUDE_DIR} \ - QMAKE_LIBDIR+=${BDB_LIB_DIR} ${PORTNAME}-qt.pro +do-install: +.if ${PORT_OPTIONS:MCLI} + ${INSTALL_PROGRAM} -s ${WRKSRC}/src/${CLI_BINARY} ${STAGEDIR}${PREFIX}/bin/${CLI_BINARY} .endif -do-install: .if ${PORT_OPTIONS:MX11} - ${INSTALL_PROGRAM} -s ${WRKSRC}/${BINARY} ${STAGEDIR}${PREFIX}/bin/${BINARY} + ${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' \ @@ -103,13 +111,9 @@ -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 - ${INSTALL_PROGRAM} -s ${WRKSRC}/src/${BINARY} ${STAGEDIR}${PREFIX}/bin/${BINARY} - ${INSTALL} ${FILESDIR}/${PORTNAME}.conf.sample ${STAGEDIR}${PREFIX}/etc/${PORTNAME}.conf.sample - @if [ ! -f ${PREFIX}/etc/${PORTNAME}.conf ]; then \ - ${CP} -p ${FILESDIR}/${PORTNAME}.conf.sample ${STAGEDIR}${PREFIX}/etc/${PORTNAME}.conf; \ - fi + ${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: distinfo =================================================================== --- distinfo (revision 363959) +++ distinfo (working copy) @@ -1,2 +1,2 @@ -SHA256 (zetacoin-0.8.99.16.tar.gz) = e8e15cf23eb9498f9de61591755c2bd5673ee759ea82e6dd349397b72556d210 -SIZE (zetacoin-0.8.99.16.tar.gz) = 2186180 +SHA256 (zetacoin-0.9.2.1.tar.gz) = 424f4c803d13b88aa72d3a04c6eadba194bd9adccc6d519bcbe3e32c512879bc +SIZE (zetacoin-0.9.2.1.tar.gz) = 4265834 Index: files/patch-Makefile_include_editSedCommands.patch =================================================================== --- files/patch-Makefile_include_editSedCommands.patch (revision 0) +++ files/patch-Makefile_include_editSedCommands.patch (working copy) @@ -0,0 +1,29 @@ +diff --git a/src/Makefile.include b/src/Makefile.include +index 2fc6cd7..cdd16f5 100644 +--- a/src/Makefile.include ++++ 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: files/patch-Makefile_include_editSedCommands.patch ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: files/patch-qt_makefile_am_editSedCommands.patch =================================================================== --- files/patch-qt_makefile_am_editSedCommands.patch (revision 0) +++ files/patch-qt_makefile_am_editSedCommands.patch (working copy) @@ -0,0 +1,14 @@ +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 Property changes on: files/patch-qt_makefile_am_editSedCommands.patch ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: files/patch-src-makefile_unix =================================================================== --- files/patch-src-makefile_unix (revision 363959) +++ files/patch-src-makefile_unix (working copy) @@ -1,30 +0,0 @@ ---- src/makefile.unix.orig 2013-10-13 06:05:19.000000000 -0400 -+++ src/makefile.unix 2013-12-27 05:11:28.000000000 -0500 -@@ -15,6 +15,11 @@ - - DEFS=-DBOOST_SPIRIT_THREADSAFE -D_FILE_OFFSET_BITS=64 - -+BOOST_INCLUDE_PATH=%%PREFIX%%/include -+BDB_INCLUDE_PATH=%%PREFIX%%/include/db48 -+BOOST_LIB_PATH=%%PREFIX%%/lib -+BDB_LIB_PATH=%%PREFIX%%/lib/db48 -+ - DEFS += $(addprefix -I,$(CURDIR) $(CURDIR)/obj $(BOOST_INCLUDE_PATH) $(BDB_INCLUDE_PATH) $(OPENSSL_INCLUDE_PATH)) - LIBS = $(addprefix -L,$(BOOST_LIB_PATH) $(BDB_LIB_PATH) $(OPENSSL_LIB_PATH)) - -@@ -38,6 +43,7 @@ - -l boost_filesystem$(BOOST_LIB_SUFFIX) \ - -l boost_program_options$(BOOST_LIB_SUFFIX) \ - -l boost_thread$(BOOST_LIB_SUFFIX) \ -+ -l boost_chrono$(BOOST_LIB_SUFFIX) \ - -l db_cxx$(BDB_LIB_SUFFIX) \ - -l ssl \ - -l crypto -@@ -61,7 +67,6 @@ - LIBS+= \ - -Wl,-B$(LMODE2) \ - -l z \ -- -l dl \ - -l pthread - - Index: files/patch-src__leveldb__build_detect_platform =================================================================== --- files/patch-src__leveldb__build_detect_platform (revision 363959) +++ files/patch-src__leveldb__build_detect_platform (working copy) @@ -1,20 +0,0 @@ ---- src/leveldb/build_detect_platform.orig 2014-01-17 19:31:04.000000000 +0000 -+++ src/leveldb/build_detect_platform 2014-01-17 19:33:47.000000000 +0000 -@@ -170,7 +170,7 @@ - true - else - # If -std=c++0x works, use . Otherwise use port_posix.h. -- $CXX $CXXFLAGS -std=c++0x -x c++ - -o /dev/null 2>/dev/null < /dev/null 2>/dev/null < - int main() {} - EOF -@@ -182,7 +182,7 @@ - fi - - # Test whether tcmalloc is available -- $CXX $CXXFLAGS -x c++ - -o /dev/null -ltcmalloc 2>/dev/null < /dev/null 2>/dev/null <