net-p2p/litecoin: update to 0.15.1

4 files changed, 23 insertions, 21 deletions

diff --git a/net-p2p/litecoin/Makefile b/net-p2p/litecoin/Makefile
index 352112841457..5f250f18a62c 100644
--- a/net-p2p/litecoin/Makefile
+++ b/net-p2p/litecoin/Makefile
@@ -2,14 +2,10 @@
 # $FreeBSD$
 
 PORTNAME=	litecoin
-PORTVERSION=	0.14.2
+PORTVERSION=	0.15.1
 DISTVERSIONPREFIX=	v
-PORTREVISION=	6
 CATEGORIES=	net-p2p finance
 
-PATCH_SITES=	https://github.com/bitcoin/bitcoin/commit/
-PATCHFILES=	1ec0c0a01c31.patch:-p1
-
 MAINTAINER=	swills@FreeBSD.org
 COMMENT?=	Virtual Peer-to-Peer Currency Client (QT)
 
@@ -22,8 +18,7 @@ NOT_FOR_ARCHS_REASON=	fails to configure: "Big Endian not supported"
 LIB_DEPENDS=	libboost_date_time.so:devel/boost-libs \
 		libevent.so:devel/libevent
 
-USES+=		autoreconf compiler:c++11-lib gmake libtool pkgconfig shebangfix ssl
-SHEBANG_FILES=	src/test/*.py
+USES+=		autoreconf compiler:c++11-lib gmake libtool pkgconfig ssl
 USE_GITHUB=	yes
 GNU_CONFIGURE=	yes
 
@@ -100,6 +95,11 @@ PLIST_FILES?=	bin/litecoin-qt man/man1/litecoin-qt.1.gz \
 
 .include <bsd.port.pre.mk>
 
+.if ${OSVERSION} < 1100000
+EXTRA_PATCHES=	${FILESDIR}/extra-patch-src_crypto_scrypt.cpp \
+		${FILESDIR}/extra-patch-src_crypto_scrypt.h
+.endif
+
 .if defined(SLAVE_PORT) && ${SLAVE_PORT} == "no"
 
 post-patch:
diff --git a/net-p2p/litecoin/distinfo b/net-p2p/litecoin/distinfo
index 57c620ba8fb8..219cbb43cb05 100644
--- a/net-p2p/litecoin/distinfo
+++ b/net-p2p/litecoin/distinfo
@@ -1,5 +1,3 @@
-TIMESTAMP = 1503300985
-SHA256 (litecoin-project-litecoin-v0.14.2_GH0.tar.gz) = 953fd6cee2da3ed63779b2dbce8a775e76d7a926be3de5b906d40f6641a2b4d5
-SIZE (litecoin-project-litecoin-v0.14.2_GH0.tar.gz) = 6205762
-SHA256 (1ec0c0a01c31.patch) = 01a2fe784d7c3d21d2cfd9dc460c059c7ae358e0f5e9e5e7782f10d259db3cd9
-SIZE (1ec0c0a01c31.patch) = 3535
+TIMESTAMP = 1527084876
+SHA256 (litecoin-project-litecoin-v0.15.1_GH0.tar.gz) = 570adae0d4a9567110967aba2ea5d90ce8c421313f453523c4fd23b9339c7d2b
+SIZE (litecoin-project-litecoin-v0.15.1_GH0.tar.gz) = 6672694
diff --git a/net-p2p/litecoin/files/patch-src_crypto_scrypt.cpp b/net-p2p/litecoin/files/extra-patch-src_crypto_scrypt.cpp
index cc8602b25fad..513d19e8b866 100644
--- a/net-p2p/litecoin/files/patch-src_crypto_scrypt.cpp
+++ b/net-p2p/litecoin/files/extra-patch-src_crypto_scrypt.cpp
@@ -1,5 +1,5 @@
---- src/crypto/scrypt.cpp.orig	2015-08-04 13:27:49 UTC
-+++ src/crypto/scrypt.cpp
+--- src/crypto/scrypt.cpp.orig	2018-02-26 19:37:55.000000000 -0500
++++ src/crypto/scrypt.cpp	2018-05-23 11:25:45.718849000 -0400
 @@ -32,6 +32,7 @@
  #include <stdlib.h>
  #include <stdint.h>
@@ -8,10 +8,12 @@
  #include <openssl/sha.h>
  
  #if defined(USE_SSE2) && !defined(USE_SSE2_ALWAYS)
-@@ -44,22 +45,6 @@
+@@ -42,24 +43,6 @@
+ // GCC Linux or i686-w64-mingw32
+ #include <cpuid.h>
  #endif
- #endif
- 
+-#endif
+-#ifndef __FreeBSD__
 -static inline uint32_t be32dec(const void *pp)
 -{
 -	const uint8_t *p = (uint8_t const *)pp;
@@ -28,6 +30,6 @@
 -	p[0] = (x >> 24) & 0xff;
 -}
 -
+ #endif
  typedef struct HMAC_SHA256Context {
  	SHA256_CTX ictx;
- 	SHA256_CTX octx;
diff --git a/net-p2p/litecoin/files/patch-src_crypto_scrypt.h b/net-p2p/litecoin/files/extra-patch-src_crypto_scrypt.h
index 0a87927825a4..80a204515069 100644
--- a/net-p2p/litecoin/files/patch-src_crypto_scrypt.h
+++ b/net-p2p/litecoin/files/extra-patch-src_crypto_scrypt.h
@@ -1,9 +1,10 @@
---- src/crypto/scrypt.h.orig	2015-06-15 08:51:30 UTC
-+++ src/crypto/scrypt.h
-@@ -27,19 +27,4 @@ void
+--- src/crypto/scrypt.h.orig	2018-05-23 11:31:01.662350000 -0400
++++ src/crypto/scrypt.h	2018-05-23 11:31:25.771775000 -0400
+@@ -28,21 +28,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);
  
+-#ifndef __FreeBSD__
 -static inline uint32_t le32dec(const void *pp)
 -{
 -        const uint8_t *p = (uint8_t const *)pp;
@@ -19,4 +20,5 @@
 -        p[2] = (x >> 16) & 0xff;
 -        p[3] = (x >> 24) & 0xff;
 -}
+-#endif
  #endif