Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 10 Feb 2014 02:49:15 +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: r343576 - in head/net-p2p/litecoin: . files
Message-ID:  <201402100249.s1A2nFwu069895@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: swills
Date: Mon Feb 10 02:49:15 2014
New Revision: 343576
URL: http://svnweb.freebsd.org/changeset/ports/343576
QAT: https://qat.redports.org/buildarchive/r343576/

Log:
  - Update to 0.8.6.2
  - Improve USE_QT4
  - Fix build after boost update

Added:
  head/net-p2p/litecoin/files/patch-src__makefile.unix   (contents, props changed)
  head/net-p2p/litecoin/files/patch-src__scrypt.cpp   (contents, props changed)
  head/net-p2p/litecoin/files/patch-src__scrypt.h   (contents, props changed)
Deleted:
  head/net-p2p/litecoin/files/extra-patch-endian
  head/net-p2p/litecoin/files/patch-src-makefile.unix
Modified:
  head/net-p2p/litecoin/Makefile
  head/net-p2p/litecoin/distinfo
  head/net-p2p/litecoin/files/patch-bitcoin-qt.pro

Modified: head/net-p2p/litecoin/Makefile
==============================================================================
--- head/net-p2p/litecoin/Makefile	Mon Feb 10 02:08:46 2014	(r343575)
+++ head/net-p2p/litecoin/Makefile	Mon Feb 10 02:49:15 2014	(r343576)
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	litecoin
-PORTVERSION=	0.8.6.1
-PORTREVISION=	2
+PORTVERSION=	0.8.6.2
 CATEGORIES=	net-p2p finance
 MASTER_SITES=	LOCAL/swills \
 		GH
@@ -15,7 +14,7 @@ LIB_DEPENDS=	libboost_date_time.so:${POR
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	litecoin-project
-GH_COMMIT=	dab8fe6
+GH_COMMIT=	fa2cfea
 GH_TAGNAME=	v${PORTVERSION}
 
 USE_OPENSSL=	yes
@@ -44,7 +43,8 @@ QMAKE_USE_UPNP=	-
 .endif
 
 .if ${PORT_OPTIONS:MX11}
-USE_QT4=	qmake_build linguist uic moc rcc
+USE_QT4=	network gui qmake_build linguist_build uic_build moc_build rcc_build
+
 BINARY=		litecoin-qt
 .else
 BINARY=		litecoind
@@ -75,10 +75,6 @@ QMAKE_USE_DBUS=	0
 PLIST_FILES+=	share/applications/litecoin-qt.desktop share/pixmaps/litecoin64.png
 .endif
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000054
-EXTRA_PATCHES+=	${FILESDIR}/extra-patch-endian
-.endif
-
 do-configure:
 .if ${PORT_OPTIONS:MX11}
 	cd ${BUILD_WRKSRC} && \

Modified: head/net-p2p/litecoin/distinfo
==============================================================================
--- head/net-p2p/litecoin/distinfo	Mon Feb 10 02:08:46 2014	(r343575)
+++ head/net-p2p/litecoin/distinfo	Mon Feb 10 02:49:15 2014	(r343576)
@@ -1,2 +1,2 @@
-SHA256 (litecoin-0.8.6.1.tar.gz) = ff11a4d5bd0cf9ddac0b1644d0819ec3d6827e5052addcbc871d288286188019
-SIZE (litecoin-0.8.6.1.tar.gz) = 4807148
+SHA256 (litecoin-0.8.6.2.tar.gz) = 74aabe6e02e8adfadcb982f2cab542248c991ceb7e9ec84db9d99e6886761b9a
+SIZE (litecoin-0.8.6.2.tar.gz) = 4806869

Modified: head/net-p2p/litecoin/files/patch-bitcoin-qt.pro
==============================================================================
--- head/net-p2p/litecoin/files/patch-bitcoin-qt.pro	Mon Feb 10 02:08:46 2014	(r343575)
+++ head/net-p2p/litecoin/files/patch-bitcoin-qt.pro	Mon Feb 10 02:49:15 2014	(r343576)
@@ -1,6 +1,6 @@
---- bitcoin-qt.pro.orig	2013-07-21 17:42:52.047209171 +0000
-+++ bitcoin-qt.pro	2013-07-21 17:43:11.879205795 +0000
-@@ -414,7 +414,7 @@
+--- ./bitcoin-qt.pro.orig	2014-01-10 01:38:53.000000000 +0000
++++ ./bitcoin-qt.pro	2014-02-09 05:45:03.127008564 +0000
+@@ -431,7 +431,7 @@
  LIBS += -lssl -lcrypto -ldb_cxx$$BDB_LIB_SUFFIX
  # -lgdi32 has to happen after -lcrypto (see  #681)
  win32:LIBS += -lws2_32 -lshlwapi -lmswsock -lole32 -loleaut32 -luuid -lgdi32

Added: head/net-p2p/litecoin/files/patch-src__makefile.unix
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net-p2p/litecoin/files/patch-src__makefile.unix	Mon Feb 10 02:49:15 2014	(r343576)
@@ -0,0 +1,30 @@
+--- ./src/makefile.unix.orig	2014-01-10 01:38:53.000000000 +0000
++++ ./src/makefile.unix	2014-02-09 05:45:03.135007077 +0000
+@@ -15,6 +15,11 @@
+ 
+ DEFS=-DBOOST_SPIRIT_THREADSAFE -D_FILE_OFFSET_BITS=64
+ 
++BOOST_INCLUDE_PATH=/usr/local/include
++BDB_INCLUDE_PATH=/usr/local/include/db48
++BOOST_LIB_PATH=/usr/local/lib
++BDB_LIB_PATH=/usr/local/lib/db48
++
+ DEFS += $(addprefix -I,$(CURDIR) $(CURDIR)/obj $(BOOST_INCLUDE_PATH) $(BDB_INCLUDE_PATH) $(OPENSSL_INCLUDE_PATH))
+ LIBS = $(addprefix -L,$(BOOST_LIB_PATH) $(BDB_LIB_PATH) $(OPENSSL_LIB_PATH))
+ 
+@@ -38,6 +43,7 @@
+    -l boost_filesystem$(BOOST_LIB_SUFFIX) \
+    -l boost_program_options$(BOOST_LIB_SUFFIX) \
+    -l boost_thread$(BOOST_LIB_SUFFIX) \
++   -l boost_chrono$(BOOST_LIB_SUFFIX) \
+    -l db_cxx$(BDB_LIB_SUFFIX) \
+    -l ssl \
+    -l crypto
+@@ -61,7 +67,6 @@
+ LIBS+= \
+  -Wl,-B$(LMODE2) \
+    -l z \
+-   -l dl \
+    -l pthread
+ 
+ 

Added: head/net-p2p/litecoin/files/patch-src__scrypt.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net-p2p/litecoin/files/patch-src__scrypt.cpp	Mon Feb 10 02:49:15 2014	(r343576)
@@ -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/litecoin/files/patch-src__scrypt.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net-p2p/litecoin/files/patch-src__scrypt.h	Mon Feb 10 02:49:15 2014	(r343576)
@@ -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?201402100249.s1A2nFwu069895>