summaryrefslogtreecommitdiff
path: root/databases
diff options
context:
space:
mode:
authorVeniamin Gvozdikov <vg@FreeBSD.org>2014-05-02 09:40:06 +0000
committerVeniamin Gvozdikov <vg@FreeBSD.org>2014-05-02 09:40:06 +0000
commite339f8a95601da1f675c6691f61aee682e3b1c4e (patch)
tree372f87cb157675de81fc56486764642b8af75d25 /databases
parent- Update to 1.0.7 (diff)
Update to 1.4.8.
Changelog: https://github.com/basho/riak/blob/1.4/RELEASE-NOTES.md PR: ports/188692 Submitted by: myself Approved by: maintainer (timeout)
Notes
Notes: svn path=/head/; revision=352779
Diffstat (limited to 'databases')
-rw-r--r--databases/riak/Makefile2
-rw-r--r--databases/riak/distinfo4
-rw-r--r--databases/riak/files/patch-deps-eleveldb-c_src-leveldb-build_detect_platform6
-rw-r--r--databases/riak/files/patch-deps-eleveldb-c_src-leveldb-db-version_set.cc30
4 files changed, 21 insertions, 21 deletions
diff --git a/databases/riak/Makefile b/databases/riak/Makefile
index 9a5a3e5aea0d..5c0d9cf34498 100644
--- a/databases/riak/Makefile
+++ b/databases/riak/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= riak
-PORTVERSION= 1.4.2
+PORTVERSION= 1.4.8
CATEGORIES= databases
MASTER_SITES= http://s3.amazonaws.com/downloads.basho.com/riak/${PORTVERSION:R}/${PORTVERSION}/ \
http://downloads.basho.com.s3.amazonaws.com/riak/${PORTVERSION:R}/${PORTVERSION}/
diff --git a/databases/riak/distinfo b/databases/riak/distinfo
index 6936ba982b16..502914829ac4 100644
--- a/databases/riak/distinfo
+++ b/databases/riak/distinfo
@@ -1,2 +1,2 @@
-SHA256 (riak-1.4.2.tar.gz) = 6a1fdcfc1f3f0357eeb377ead6638db4187379e3b40121cef16b517e03c6fd11
-SIZE (riak-1.4.2.tar.gz) = 13738074
+SHA256 (riak-1.4.8.tar.gz) = 69159cefeef48f5ad3ebec02ea4856f7c739e158758405e69c2d001d2d7958d1
+SIZE (riak-1.4.8.tar.gz) = 13799400
diff --git a/databases/riak/files/patch-deps-eleveldb-c_src-leveldb-build_detect_platform b/databases/riak/files/patch-deps-eleveldb-c_src-leveldb-build_detect_platform
index 942d55f2f1e4..a68984f81012 100644
--- a/databases/riak/files/patch-deps-eleveldb-c_src-leveldb-build_detect_platform
+++ b/databases/riak/files/patch-deps-eleveldb-c_src-leveldb-build_detect_platform
@@ -1,7 +1,5 @@
-Don't remove /dev/null on 8.x (see kern/139014)
--bdrewery 09/27/2013
---- deps/eleveldb/c_src/leveldb/build_detect_platform.orig 2013-09-27 06:53:42.527133646 -0500
-+++ deps/eleveldb/c_src/leveldb/build_detect_platform 2013-09-27 06:54:01.360134865 -0500
+--- deps/eleveldb/c_src/leveldb/build_detect_platform.orig 2014-04-02 12:41:11.174611987 +0000
++++ deps/eleveldb/c_src/leveldb/build_detect_platform 2014-04-02 12:42:31.766605994 +0000
@@ -134,7 +134,7 @@
true
else
diff --git a/databases/riak/files/patch-deps-eleveldb-c_src-leveldb-db-version_set.cc b/databases/riak/files/patch-deps-eleveldb-c_src-leveldb-db-version_set.cc
index 8714bc5bda6e..3c19c4c2cbee 100644
--- a/databases/riak/files/patch-deps-eleveldb-c_src-leveldb-db-version_set.cc
+++ b/databases/riak/files/patch-deps-eleveldb-c_src-leveldb-db-version_set.cc
@@ -1,5 +1,5 @@
---- deps/eleveldb/c_src/leveldb/db/version_set.cc.orig 2013-08-29 23:03:04.000000000 +0200
-+++ deps/eleveldb/c_src/leveldb/db/version_set.cc 2013-09-22 14:38:08.000000000 +0200
+--- deps/eleveldb/c_src/leveldb/db/version_set.cc.orig 2014-04-02 12:26:08.746672588 +0000
++++ deps/eleveldb/c_src/leveldb/db/version_set.cc 2014-04-02 12:37:06.719627543 +0000
@@ -2,10 +2,12 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. See the AUTHORS file for names of contributors.
@@ -17,18 +17,20 @@
// WARNING: m_OverlappedFiles flags need to match config::kNumOverlapFiles ... until unified
{
-- {10485760, 262144000, 57671680, 209715200, 0, 300000000, true},
-- {10485760, 82914560, 57671680, 419430400, 0, 209715200, true},
-- {10485760, 104371840, 57671680, 1006632960, 200000000, 314572800, false},
-- {10485760, 125829120, 57671680, 4094304000, 3355443200, 419430400, false},
-- {10485760, 147286400, 57671680, 41943040000, 33554432000, 524288000, false},
-- {10485760, 188743680, 57671680, 419430400000, 335544320000, 629145600, false},
-- {10485760, 220200960, 57671680, 4194304000000, 3355443200000, 734003200, false}
+- {10485760, 262144000, 57671680, 209715200, 0, 300000000, true},
+- {10485760, 82914560, 57671680, 419430400, 0, 209715200, true},
+- {10485760, 314572800, 57671680, 1006632960, 200000000, 314572800, false},
+- {10485760, 419430400, 57671680, 4094304000ULL, 3355443200ULL, 419430400, false},
+- {10485760, 524288000, 57671680, 41943040000ULL, 33554432000ULL, 524288000, false},
+- {10485760, 629145600, 57671680, 419430400000ULL, 335544320000ULL, 629145600, false},
+- {10485760, 734003200, 57671680, 4194304000000ULL, 3355443200000ULL, 734003200, false}
+ {UINT64_C(10485760), UINT64_C(262144000), INT64_C(57671680), UINT64_C( 209715200), UINT64_C( 0), UINT64_C(300000000), true},
+ {UINT64_C(10485760), UINT64_C( 82914560), INT64_C(57671680), UINT64_C( 419430400), UINT64_C( 0), UINT64_C(209715200), true},
-+ {UINT64_C(10485760), UINT64_C(104371840), INT64_C(57671680), UINT64_C( 1006632960), UINT64_C( 200000000), UINT64_C(314572800), false},
-+ {UINT64_C(10485760), UINT64_C(125829120), INT64_C(57671680), UINT64_C( 4094304000), UINT64_C( 3355443200), UINT64_C(419430400), false},
-+ {UINT64_C(10485760), UINT64_C(147286400), INT64_C(57671680), UINT64_C( 41943040000), UINT64_C( 33554432000), UINT64_C(524288000), false},
-+ {UINT64_C(10485760), UINT64_C(188743680), INT64_C(57671680), UINT64_C( 419430400000), UINT64_C( 335544320000), UINT64_C(629145600), false},
-+ {UINT64_C(10485760), UINT64_C(220200960), INT64_C(57671680), UINT64_C(4194304000000), UINT64_C(3355443200000), UINT64_C(734003200), false}
++ {UINT64_C(10485760), UINT64_C(314572800), INT64_C(57671680), UINT64_C( 1006632960), UINT64_C( 200000000), UINT64_C(314572800), false},
++ {UINT64_C(10485760), UINT64_C(419430400), INT64_C(57671680), UINT64_C( 4094304000), UINT64_C( 3355443200), UINT64_C(419430400), false},
++ {UINT64_C(10485760), UINT64_C(524288000), INT64_C(57671680), UINT64_C( 41943040000), UINT64_C( 33554432000), UINT64_C(524288000), false},
++ {UINT64_C(10485760), UINT64_C(629145600), INT64_C(57671680), UINT64_C( 419430400000), UINT64_C( 335544320000), UINT64_C(629145600), false},
++ {UINT64_C(10485760), UINT64_C(734003200), INT64_C(57671680), UINT64_C(4194304000000), UINT64_C(3355443200000), UINT64_C(734003200), false}
};
+
+ /// ULL above needed to compile on OSX 10.7.3