Date: Wed, 12 Feb 2014 18:41:27 +0000 (UTC) From: Steve Wills <swills@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r343949 - in head/net-p2p/dogecoin: . files Message-ID: <201402121841.s1CIfRtB027759@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: swills Date: Wed Feb 12 18:41:27 2014 New Revision: 343949 URL: http://svnweb.freebsd.org/changeset/ports/343949 QAT: https://qat.redports.org/buildarchive/r343949/ Log: - Fix build after boost update - Improve USE_QT4 dependencies Added: head/net-p2p/dogecoin/files/patch-src__scrypt.cpp (contents, props changed) head/net-p2p/dogecoin/files/patch-src__scrypt.h (contents, props changed) Deleted: head/net-p2p/dogecoin/files/extra-patch-endian Modified: head/net-p2p/dogecoin/Makefile Modified: head/net-p2p/dogecoin/Makefile ============================================================================== --- head/net-p2p/dogecoin/Makefile Wed Feb 12 18:08:19 2014 (r343948) +++ head/net-p2p/dogecoin/Makefile Wed Feb 12 18:41:27 2014 (r343949) @@ -3,7 +3,7 @@ PORTNAME= dogecoin PORTVERSION= 1.5.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net-p2p finance MAINTAINER= swills@FreeBSD.org @@ -36,14 +36,12 @@ CXXFLAGS+= -Wno-invalid-offsetof .include <bsd.port.options.mk> -.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000000 -EXTRA_PATCHES+= ${FILESDIR}/extra-patch-endian -.else +.if ${OPSYS} == FreeBSD && ${OSVERSION} <= 1000000 EXTRA_PATCHES+= ${FILESDIR}/extra-patch-src__leveldb__Makefile .endif .if ${PORT_OPTIONS:MGUI} && !defined(WITHOUT_X11) -USE_QT4= corelib gui qmake_build linguist uic moc rcc +USE_QT4= corelib network gui qmake_build linguist_build uic_build moc_build rcc_build BINARY= dogecoin-qt .else BINARY= dogecoind Added: head/net-p2p/dogecoin/files/patch-src__scrypt.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-p2p/dogecoin/files/patch-src__scrypt.cpp Wed Feb 12 18:41:27 2014 (r343949) @@ -0,0 +1,33 @@ +--- ./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 @@ + #include <stdint.h> + #include <string.h> + #include <openssl/sha.h> ++#include <boost/lexical_cast.hpp> + + #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__scrypt.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-p2p/dogecoin/files/patch-src__scrypt.h Wed Feb 12 18:41:27 2014 (r343949) @@ -0,0 +1,22 @@ +--- ./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 @@ + 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201402121841.s1CIfRtB027759>