From owner-svn-ports-all@FreeBSD.ORG Sat Oct 18 03:37:37 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 4F7687DD; Sat, 18 Oct 2014 03:37:37 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 3A5517ED; Sat, 18 Oct 2014 03:37:37 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s9I3bbuu063758; Sat, 18 Oct 2014 03:37:37 GMT (envelope-from swills@FreeBSD.org) Received: (from swills@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s9I3bZWF063752; Sat, 18 Oct 2014 03:37:35 GMT (envelope-from swills@FreeBSD.org) Message-Id: <201410180337.s9I3bZWF063752@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: swills set sender to swills@FreeBSD.org using -f From: Steve Wills Date: Sat, 18 Oct 2014 03:37:35 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r371091 - in head/net-p2p/dogecoin: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 18 Oct 2014 03:37:37 -0000 Author: swills Date: Sat Oct 18 03:37:35 2014 New Revision: 371091 URL: https://svnweb.freebsd.org/changeset/ports/371091 QAT: https://qat.redports.org/buildarchive/r371091/ Log: net-p2p/dogecoin: update to 1.8.0 Added: head/net-p2p/dogecoin/files/patch-src__Makefile.include (contents, props changed) head/net-p2p/dogecoin/files/patch-src__qt__Makefile.am (contents, props changed) Deleted: head/net-p2p/dogecoin/files/patch-makefile_unix-Add_boost-crypto head/net-p2p/dogecoin/files/patch-src-util.h Modified: head/net-p2p/dogecoin/Makefile head/net-p2p/dogecoin/distinfo head/net-p2p/dogecoin/files/patch-src__scrypt.cpp head/net-p2p/dogecoin/files/patch-src__scrypt.h Modified: head/net-p2p/dogecoin/Makefile ============================================================================== --- head/net-p2p/dogecoin/Makefile Sat Oct 18 01:19:41 2014 (r371090) +++ head/net-p2p/dogecoin/Makefile Sat Oct 18 03:37:35 2014 (r371091) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= dogecoin -PORTVERSION= 1.5.0 -PORTREVISION= 4 +PORTVERSION= 1.8.0 CATEGORIES= net-p2p finance MAINTAINER= swills@FreeBSD.org @@ -11,6 +10,8 @@ COMMENT= Virtual Peer-to-Peer Currency C LICENSE= MIT +BUILD_DEPENDS= protoc:${PORTSDIR}/devel/protobuf + LIB_DEPENDS= libboost_date_time.so:${PORTSDIR}/devel/boost-libs OPTIONS_DEFINE= GUI UPNP QRCODES @@ -22,83 +23,59 @@ QRCODES_DESC= Build with QR code display USE_GITHUB= yes GH_ACCOUNT= ${PORTNAME} -GH_COMMIT= be94b62 +GH_COMMIT= c4209a3 GH_TAGNAME= v${PORTVERSION} -USES= gmake compiler:c++11-lib +USES= gmake compiler:c++11-lib pkgconfig autoreconf +GNU_CONFIGURE= yes +CONFIGURE_ARGS+= --with-incompatible-bdb \ + SSL_CFLAGS="-I${OPENSSLINC} -L${OPENSSLLIB}" SSL_LIBS="-lssl" \ + CRYPTO_CFLAGS="-I${OPENSSLINC} -L${OPENSSLLIB}" CRYPTO_LIBS="-lcrypto" +CONFIGURE_ENV+= OBJC="${CC}" OBJCFLAGS="${CFLAGS}" OBJCXX="${CXX}" OBJCXXFLAGS="${CXXFLAGS}" USE_OPENSSL= yes USE_BDB= yes -WANT_BDB_VER= 48 +WANT_BDB_VER= 5 -CXXFLAGS+= -I${LOCALBASE}/include -I${BDB_INCLUDE_DIR} -CXXFLAGS+= -L${LOCALBASE}/lib -L${BDB_LIB_DIR} -CXXFLAGS+= -Wno-invalid-offsetof +CXXFLAGS+= -I${LOCALBASE}/include -I${BDB_INCLUDE_DIR} \ + -L${LOCALBASE}/lib -L${BDB_LIB_DIR} -.include +PLIST_FILES= bin/dogecoind bin/dogecoin-cli -.if ${OPSYS} == FreeBSD && ${OSVERSION} <= 1000000 -EXTRA_PATCHES+= ${FILESDIR}/extra-patch-src__leveldb__Makefile -.endif +.include -.if ${PORT_OPTIONS:MGUI} && !defined(WITHOUT_X11) -USE_QT4= corelib network gui qmake_build linguist_build uic_build moc_build rcc_build -BINARY= dogecoin-qt -.else -BINARY= dogecoind -ALL_TARGET= ${BINARY} test -MAKE_ARGS+= -C ${WRKSRC}/src +#.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000000 +#EXTRA_PATCHES+= ${FILESDIR}/extra-patch-src__leveldb__Makefile +#.endif + +GUI_CONFIGURE_ENABLE= gui +.if ${PORT_OPTIONS:MGUI} +USE_QT4= corelib network gui qmake_build linguist_build uic_build moc_build rcc_build dbus +PLIST_FILES+= share/applications/dogecoin-qt.desktop \ + share/pixmaps/dogecoin64.png \ + bin/dogecoin-qt .endif +QRCODES_CONFIGURE_ENABLE= qrencode .if ${PORT_OPTIONS:MQRCODES} LIB_DEPENDS+= libqrencode.so:${PORTSDIR}/graphics/libqrencode -QMAKE_USE_QRCODE=1 -.else -QMAKE_USE_QRCODE=0 .endif -PLIST_FILES= bin/${BINARY} - +UPNP_CONFIGURE_ENABLE= miniupnpc .if ${PORT_OPTIONS:MUPNP} LIB_DEPENDS+= libminiupnpc.so:${PORTSDIR}/net/miniupnpc -QMAKE_USE_UPNP= 1 -.else -QMAKE_USE_UPNP= - .endif SUB_FILES+= dogecoin-qt.desktop .include -.if ${PORT_OPTIONS:MGUI} && !defined(WITHOUT_X11) -PLIST_FILES+= share/applications/dogecoin-qt.desktop share/pixmaps/dogecoin64.png -.endif - -post-patch: -.if !${PORT_OPTIONS:MGUI} || defined(WITHOUT_X11) - @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 - -do-configure: -.if ${PORT_OPTIONS:MGUI} && !defined(WITHOUT_X11) - cd ${WRKSRC} && ${SETENV} ${QMAKE_ENV} \ - ${QMAKE} ${QMAKE_ARGS} USE_UPNP=${QMAKE_USE_UPNP} USE_QRCODE=${QMAKE_USE_QRCODE} \ - QMAKE_LRELEASE=${LRELEASE} INCLUDEPATH=${BDB_INCLUDE_DIR} \ - QMAKE_LIBDIR+=${BDB_LIB_DIR} dogecoin-qt.pro -.endif - do-install: - @${MKDIR} ${PREFIX}/bin -.if ${PORT_OPTIONS:MGUI} && !defined(WITHOUT_X11) - ${INSTALL_PROGRAM} ${WRKSRC}/${BINARY} ${STAGEDIR}${PREFIX}/bin/ + ${INSTALL_PROGRAM} ${WRKSRC}/src/dogecoind ${STAGEDIR}${PREFIX}/bin/ + ${INSTALL_PROGRAM} ${WRKSRC}/src/dogecoin-cli ${STAGEDIR}${PREFIX}/bin/ +.if ${PORT_OPTIONS:MGUI} + ${INSTALL_PROGRAM} ${WRKSRC}/src/qt/dogecoin-qt ${STAGEDIR}${PREFIX}/bin/ ${INSTALL} ${WRKDIR}/dogecoin-qt.desktop ${STAGEDIR}${PREFIX}/share/applications ${INSTALL} ${WRKSRC}/src/qt/res/icons/bitcoin.png ${STAGEDIR}${PREFIX}/share/pixmaps/dogecoin64.png -.else - ${INSTALL_PROGRAM} ${WRKSRC}/src/${BINARY} ${STAGEDIR}${PREFIX}/bin/ .endif .include Modified: head/net-p2p/dogecoin/distinfo ============================================================================== --- head/net-p2p/dogecoin/distinfo Sat Oct 18 01:19:41 2014 (r371090) +++ head/net-p2p/dogecoin/distinfo Sat Oct 18 03:37:35 2014 (r371091) @@ -1,2 +1,2 @@ -SHA256 (dogecoin-1.5.0.tar.gz) = 43832d6a147471b759599b4dd080b88ed4d39c119231129d1febd2f1e991cf06 -SIZE (dogecoin-1.5.0.tar.gz) = 3509184 +SHA256 (dogecoin-1.8.0.tar.gz) = 8eb2d30175cda6065f9dc8e2b6a937eb0e638119fec3966ed3ec0afa87743680 +SIZE (dogecoin-1.8.0.tar.gz) = 8049394 Added: head/net-p2p/dogecoin/files/patch-src__Makefile.include ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-p2p/dogecoin/files/patch-src__Makefile.include Sat Oct 18 03:37:35 2014 (r371091) @@ -0,0 +1,27 @@ +--- src/Makefile.include.orig 2014-10-13 01:51:55.000000000 +0000 ++++ src/Makefile.include 2014-10-13 01:53:22.000000000 +0000 +@@ -41,18 +41,18 @@ + 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 $@ ++ $(SED) -e '/^\*\*.*by:/d' $@ > $@.n && mv $@.n $@ + + 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 $@ ++ $(SED) -e '/^\*\*.*by:/d' $@ > $@.n && mv $@.n $@ + + %.qm: %.ts + @test -d $(abs_builddir)/$(@D) || $(MKDIR_P) $(abs_builddir)/$(@D) Added: head/net-p2p/dogecoin/files/patch-src__qt__Makefile.am ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-p2p/dogecoin/files/patch-src__qt__Makefile.am Sat Oct 18 03:37:35 2014 (r371091) @@ -0,0 +1,12 @@ +--- src/qt/Makefile.am.orig 2014-10-13 01:49:25.000000000 +0000 ++++ src/qt/Makefile.am 2014-10-13 01:50:00.000000000 +0000 +@@ -382,7 +382,7 @@ + $(QT_QRC_CPP): $(QT_QRC) $(QT_QM) $(QT_FORMS_H) $(RES_ICONS) $(RES_IMAGES) $(RES_MOVIES) $(RES_FONTS) $(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 Modified: head/net-p2p/dogecoin/files/patch-src__scrypt.cpp ============================================================================== --- head/net-p2p/dogecoin/files/patch-src__scrypt.cpp Sat Oct 18 01:19:41 2014 (r371090) +++ head/net-p2p/dogecoin/files/patch-src__scrypt.cpp Sat Oct 18 03:37:35 2014 (r371091) @@ -1,6 +1,6 @@ ---- ./src/scrypt.cpp.orig 2014-01-10 01:38:53.000000000 +0000 -+++ ./src/scrypt.cpp 2014-02-09 05:45:03.131006405 +0000 -@@ -33,6 +33,7 @@ +--- src/scrypt.cpp.orig 2014-08-24 15:09:34 UTC ++++ src/scrypt.cpp +@@ -35,6 +35,7 @@ #include #include #include @@ -8,7 +8,7 @@ #if defined(USE_SSE2) && !defined(USE_SSE2_ALWAYS) #ifdef _MSC_VER -@@ -44,22 +45,6 @@ +@@ -46,22 +47,6 @@ #endif #endif Modified: head/net-p2p/dogecoin/files/patch-src__scrypt.h ============================================================================== --- head/net-p2p/dogecoin/files/patch-src__scrypt.h Sat Oct 18 01:19:41 2014 (r371090) +++ head/net-p2p/dogecoin/files/patch-src__scrypt.h Sat Oct 18 03:37:35 2014 (r371091) @@ -1,6 +1,6 @@ ---- ./src/scrypt.h.orig 2014-01-10 01:38:53.000000000 +0000 -+++ ./src/scrypt.h 2014-02-09 05:45:03.133009188 +0000 -@@ -27,19 +27,4 @@ +--- src/scrypt.h.orig 2014-08-24 15:09:34 UTC ++++ src/scrypt.h +@@ -29,19 +29,4 @@ PBKDF2_SHA256(const uint8_t *passwd, size_t passwdlen, const uint8_t *salt, size_t saltlen, uint64_t c, uint8_t *buf, size_t dkLen);