mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-24 00:45:52 +00:00
Code Issues Releases Activity

- Fix build after boost update

Browse Source 
- Improve USE_QT4 dependencies
This commit is contained in:
Steve Wills 2014-02-12 18:41:27 +00:00
parent f4ef5f7145
commit 0022fc1a19
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=343949
4 changed files with 58 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
net-p2p/dogecoin/Makefile
View File

@ -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

47
net-p2p/dogecoin/files/extra-patch-endian
View File

@ -1,47 +0,0 @@
--- src/scrypt.cpp.orig 2013-12-09 18:10:12.046606050 +0000
+++ src/scrypt.cpp 2013-12-09 18:10:25.898605023 +0000
@@ -34,22 +34,6 @@
#include <string.h>
#include <openssl/sha.h>
-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;
--- src/scrypt.h.orig 2013-12-09 15:26:17.343282984 +0000
+++ src/scrypt.h 2013-12-09 15:45:11.032205545 +0000
@@ -17,19 +17,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

33
net-p2p/dogecoin/files/patch-src__scrypt.cpp Normal file
View File

@ -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;

22
net-p2p/dogecoin/files/patch-src__scrypt.h Normal file
View File

@ -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