From owner-svn-ports-head@freebsd.org Sat Oct 7 02:39:08 2017 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5B6A5E29FBE; Sat, 7 Oct 2017 02:39:08 +0000 (UTC) (envelope-from ehaupt@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 3569B7E041; Sat, 7 Oct 2017 02:39:08 +0000 (UTC) (envelope-from ehaupt@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v972d74H003393; Sat, 7 Oct 2017 02:39:07 GMT (envelope-from ehaupt@FreeBSD.org) Received: (from ehaupt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v972d6Rg003386; Sat, 7 Oct 2017 02:39:06 GMT (envelope-from ehaupt@FreeBSD.org) Message-Id: <201710070239.v972d6Rg003386@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ehaupt set sender to ehaupt@FreeBSD.org using -f From: Emanuel Haupt Date: Sat, 7 Oct 2017 02:39:06 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r451424 - in head/net-p2p/dogecoin: . files X-SVN-Group: ports-head X-SVN-Commit-Author: ehaupt X-SVN-Commit-Paths: in head/net-p2p/dogecoin: . files X-SVN-Commit-Revision: 451424 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 07 Oct 2017 02:39:08 -0000 Author: ehaupt Date: Sat Oct 7 02:39:06 2017 New Revision: 451424 URL: https://svnweb.freebsd.org/changeset/ports/451424 Log: - Update to 1.10.0 - Use a more descriptive comment inspired by a repology.org comparison - Take maintainership - Remove extra newline from pkg-descr - Make better use of options helper - Update GUI option to use qt5 framework instead of qt4 - Provide an option to build with additional cli utils Approved by: swills (maintainer) Added: head/net-p2p/dogecoin/files/patch-configure.ac (contents, props changed) head/net-p2p/dogecoin/files/patch-src_crypto_scrypt.cpp (contents, props changed) head/net-p2p/dogecoin/files/patch-src_crypto_scrypt.h (contents, props changed) head/net-p2p/dogecoin/pkg-plist (contents, props changed) Deleted: head/net-p2p/dogecoin/files/extra-patch-src__leveldb__Makefile head/net-p2p/dogecoin/files/patch-src__Makefile.include head/net-p2p/dogecoin/files/patch-src__qt__Makefile.am 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/distinfo head/net-p2p/dogecoin/pkg-descr Modified: head/net-p2p/dogecoin/Makefile ============================================================================== --- head/net-p2p/dogecoin/Makefile Sat Oct 7 01:24:16 2017 (r451423) +++ head/net-p2p/dogecoin/Makefile Sat Oct 7 02:39:06 2017 (r451424) @@ -2,78 +2,66 @@ # $FreeBSD$ PORTNAME= dogecoin -PORTVERSION= 1.8.2 +PORTVERSION= 1.10.0 DISTVERSIONPREFIX= v -PORTREVISION= 9 CATEGORIES= net-p2p finance -MAINTAINER= swills@FreeBSD.org -COMMENT= Virtual Peer-to-Peer Currency Client +MAINTAINER= ehaupt@FreeBSD.org +COMMENT= P2P crypto currency client favored by shiba inus worldwide LICENSE= MIT -BUILD_DEPENDS= protoc:devel/protobuf -LIB_DEPENDS= libboost_date_time.so:devel/boost-libs - NOT_FOR_ARCHS= powerpc powerpc64 sparc64 NOT_FOR_ARCHS_REASON= fails to configure: "Big Endian not supported" -OPTIONS_DEFINE= GUI UPNP QRCODES -OPTIONS_DEFAULT= GUI QRCODES +LIB_DEPENDS= libboost_system.so:devel/boost-libs \ + libprotobuf.so:devel/protobuf -GUI_DESC= Build as a QT4 GUI -UPNP_DESC= Build with UPNP support -QRCODES_DESC= Build with QR code display - +USES= autoreconf bdb compiler:gcc-c++11-lib gmake libtool \ + localbase:ldconfig pkgconfig ssl USE_GITHUB= yes - -USES= bdb:5 gmake compiler:c++11-lib pkgconfig autoreconf ssl +USE_LDCONFIG= yes 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}" +OPTIONS_SUB= yes -CXXFLAGS+= -I${LOCALBASE}/include -I${BDB_INCLUDE_DIR} \ - -L${LOCALBASE}/lib -L${BDB_LIB_DIR} +OPTIONS_DEFINE= GUI UPNP UTILS QRCODES +OPTIONS_DEFAULT=GUI UPNP UTILS QRCODES -PLIST_FILES= bin/dogecoind bin/dogecoin-cli +GUI_DESC= Build as a QT5 GUI +UPNP_DESC= Build with UPNP support +UTILS_DESC= Build with additional cli utils +QRCODES_DESC= Build with QR code display -.include +CONFIGURE_ARGS+= --with-incompatible-bdb --disable-tests -#.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000000 -#EXTRA_PATCHES+= ${FILESDIR}/extra-patch-src__leveldb__Makefile -#.endif +GUI_CONFIGURE_ARGS= --with-gui=qt5 +GUI_CONFIGURE_OFF= --with-gui=no +GUI_USE= QT5=buildtools,core,dbus,gui,linguist_build,network,printsupport,testlib,widgets +GUI_USES= desktop-file-utils -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_WITH= qrencode +QRCODES_LIB_DEPENDS= libqrencode.so:graphics/libqrencode -QRCODES_CONFIGURE_ENABLE= qrencode -.if ${PORT_OPTIONS:MQRCODES} -LIB_DEPENDS+= libqrencode.so:graphics/libqrencode -.endif +UPNP_CONFIGURE_WITH= miniupnpc +UPNP_LIB_DEPENDS= libminiupnpc.so:net/miniupnpc -UPNP_CONFIGURE_ENABLE= miniupnpc -.if ${PORT_OPTIONS:MUPNP} -LIB_DEPENDS+= libminiupnpc.so:net/miniupnpc -.endif +UTILS_CONFIGURE_WITH= utils -SUB_FILES+= dogecoin-qt.desktop +CONFIGURE_ENV= SSL_CFLAGS="-I${OPENSSLINC} -L${OPENSSLLIB}" SSL_LIBS="-lssl" \ + CRYPTO_CFLAGS="-I${OPENSSLINC} -L${OPENSSLLIB}" CRYPTO_LIBS="-lcrypto" -.include +CXXFLAGS+= -I${BDB_INCLUDE_DIR} +LDFLAGS+= -L${BDB_LIB_DIR} -do-install: - ${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 -.endif +SUB_FILES= dogecoin-qt.desktop -.include +post-install: + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libbitcoinconsensus.so.0.0.0 + +post-install-GUI-on: + ${INSTALL} ${WRKDIR}/dogecoin-qt.desktop \ + ${STAGEDIR}${PREFIX}/share/applications + ${INSTALL} ${WRKSRC}/src/qt/res/icons/bitcoin.png \ + ${STAGEDIR}${PREFIX}/share/pixmaps/dogecoin64.png + +.include Modified: head/net-p2p/dogecoin/distinfo ============================================================================== --- head/net-p2p/dogecoin/distinfo Sat Oct 7 01:24:16 2017 (r451423) +++ head/net-p2p/dogecoin/distinfo Sat Oct 7 02:39:06 2017 (r451424) @@ -1,2 +1,3 @@ -SHA256 (dogecoin-dogecoin-v1.8.2_GH0.tar.gz) = 87060dfe6d9770f8af17c447120cb6a059bbd84687dfd6a1f0787c9d75d75d9e -SIZE (dogecoin-dogecoin-v1.8.2_GH0.tar.gz) = 8280103 +TIMESTAMP = 1507273829 +SHA256 (dogecoin-dogecoin-v1.10.0_GH0.tar.gz) = e392f4142819fdab313ba921af53fdbd2cf6ee8965d237d0cb5cda8a52c97084 +SIZE (dogecoin-dogecoin-v1.10.0_GH0.tar.gz) = 6537709 Added: head/net-p2p/dogecoin/files/patch-configure.ac ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-p2p/dogecoin/files/patch-configure.ac Sat Oct 7 02:39:06 2017 (r451424) @@ -0,0 +1,13 @@ +--- configure.ac.orig 2015-10-31 14:49:41 UTC ++++ configure.ac +@@ -417,8 +417,8 @@ if test x$use_hardening != xno; then + + if test x$TARGET_OS != xwindows; then + # All windows code is PIC, forcing it on just adds useless compile warnings +- AX_CHECK_COMPILE_FLAG([-fPIE],[HARDENED_CXXFLAGS="$HARDENED_CXXFLAGS -fPIE"]) +- AX_CHECK_LINK_FLAG([[-pie]], [HARDENED_LDFLAGS="$HARDENED_LDFLAGS -pie"]) ++ AX_CHECK_COMPILE_FLAG([-fPIC],[HARDENED_CXXFLAGS="$HARDENED_CXXFLAGS -fPIC"]) ++ AX_CHECK_LINK_FLAG([[-pic]], [HARDENED_LDFLAGS="$HARDENED_LDFLAGS -pic"]) + fi + + case $host in Added: head/net-p2p/dogecoin/files/patch-src_crypto_scrypt.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-p2p/dogecoin/files/patch-src_crypto_scrypt.cpp Sat Oct 7 02:39:06 2017 (r451424) @@ -0,0 +1,33 @@ +--- src/crypto/scrypt.cpp.orig 2015-10-31 14:49:41 UTC ++++ src/crypto/scrypt.cpp +@@ -33,6 +33,7 @@ + #include + #include + #include ++#include + + #if defined(USE_SSE2) && !defined(USE_SSE2_ALWAYS) + #ifdef _MSC_VER +@@ -44,22 +45,6 @@ + #endif + #endif + +-static inline uint32_t be32dec(const void *pp) +-{ +- const uint8_t *p = (uint8_t const *)pp; +- return ((uint32_t)(p[3]) + ((uint32_t)(p[2]) << 8) + +- ((uint32_t)(p[1]) << 16) + ((uint32_t)(p[0]) << 24)); +-} +- +-static inline void be32enc(void *pp, uint32_t x) +-{ +- uint8_t *p = (uint8_t *)pp; +- p[3] = x & 0xff; +- p[2] = (x >> 8) & 0xff; +- p[1] = (x >> 16) & 0xff; +- p[0] = (x >> 24) & 0xff; +-} +- + typedef struct HMAC_SHA256Context { + SHA256_CTX ictx; + SHA256_CTX octx; Added: head/net-p2p/dogecoin/files/patch-src_crypto_scrypt.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-p2p/dogecoin/files/patch-src_crypto_scrypt.h Sat Oct 7 02:39:06 2017 (r451424) @@ -0,0 +1,22 @@ +--- src/crypto/scrypt.h.orig 2015-10-31 14:49:41 UTC ++++ src/crypto/scrypt.h +@@ -27,19 +27,4 @@ void + 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); + +-static inline uint32_t le32dec(const void *pp) +-{ +- const uint8_t *p = (uint8_t const *)pp; +- return ((uint32_t)(p[0]) + ((uint32_t)(p[1]) << 8) + +- ((uint32_t)(p[2]) << 16) + ((uint32_t)(p[3]) << 24)); +-} +- +-static inline void le32enc(void *pp, uint32_t x) +-{ +- uint8_t *p = (uint8_t *)pp; +- p[0] = x & 0xff; +- p[1] = (x >> 8) & 0xff; +- p[2] = (x >> 16) & 0xff; +- p[3] = (x >> 24) & 0xff; +-} + #endif Modified: head/net-p2p/dogecoin/pkg-descr ============================================================================== --- head/net-p2p/dogecoin/pkg-descr Sat Oct 7 01:24:16 2017 (r451423) +++ head/net-p2p/dogecoin/pkg-descr Sat Oct 7 02:39:06 2017 (r451424) @@ -1,5 +1,4 @@ Dogecoin is an open source peer-to-peer cryptocurrency, favored by Shiba Inus worldwide. - WWW: http://dogecoin.com/ Added: head/net-p2p/dogecoin/pkg-plist ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-p2p/dogecoin/pkg-plist Sat Oct 7 02:39:06 2017 (r451424) @@ -0,0 +1,12 @@ +%%UTILS%%bin/dogecoin-cli +%%GUI%%bin/dogecoin-qt +%%UTILS%%bin/dogecoin-tx +bin/dogecoind +include/bitcoinconsensus.h +lib/libbitcoinconsensus.a +lib/libbitcoinconsensus.so +lib/libbitcoinconsensus.so.0 +lib/libbitcoinconsensus.so.0.0.0 +libdata/pkgconfig/libbitcoinconsensus.pc +%%GUI%%share/applications/dogecoin-qt.desktop +%%GUI%%share/pixmaps/dogecoin64.png