Attachment #141798 for bug #188692

View | Details | Raw Unified | Return to bug 188692
Collapse All | Expand All

Lines 1-7 Link Here

(-)riak/Makefile (-1 / +1 lines)
1	# $FreeBSD: head/databases/riak/Makefile 351357 2014-04-15 17:45:54Z swills $	1	# $FreeBSD: head/databases/riak/Makefile 351357 2014-04-15 17:45:54Z swills $
2		2
3	PORTNAME= riak	3	PORTNAME= riak
4	PORTVERSION= 1.4.2	4	PORTVERSION= 1.4.8
5	CATEGORIES= databases	5	CATEGORIES= databases
6	MASTER_SITES= http://s3.amazonaws.com/downloads.basho.com/riak/${PORTVERSION:R}/${PORTVERSION}/ \	6	MASTER_SITES= http://s3.amazonaws.com/downloads.basho.com/riak/${PORTVERSION:R}/${PORTVERSION}/ \
7	http://downloads.basho.com.s3.amazonaws.com/riak/${PORTVERSION:R}/${PORTVERSION}/	7	http://downloads.basho.com.s3.amazonaws.com/riak/${PORTVERSION:R}/${PORTVERSION}/

Lines 1-2 Link Here

(-)riak/distinfo (-2 / +2 lines)
1	SHA256 (riak-1.4.2.tar.gz) = 6a1fdcfc1f3f0357eeb377ead6638db4187379e3b40121cef16b517e03c6fd11	1	SHA256 (riak-1.4.8.tar.gz) = 69159cefeef48f5ad3ebec02ea4856f7c739e158758405e69c2d001d2d7958d1
2	SIZE (riak-1.4.2.tar.gz) = 13738074	2	SIZE (riak-1.4.8.tar.gz) = 13799400

Lines 1-7 Link Here

(-)riak/files/patch-deps-eleveldb-c_src-leveldb-build_detect_platform (-4 / +2 lines)
1	Don't remove /dev/null on 8.x (see kern/139014)	1	--- deps/eleveldb/c_src/leveldb/build_detect_platform.orig 2014-04-02 12:41:11.174611987 +0000
2	-bdrewery 09/27/2013	2	+++ deps/eleveldb/c_src/leveldb/build_detect_platform 2014-04-02 12:42:31.766605994 +0000
3	--- deps/eleveldb/c_src/leveldb/build_detect_platform.orig 2013-09-27 06:53:42.527133646 -0500
4	+++ deps/eleveldb/c_src/leveldb/build_detect_platform 2013-09-27 06:54:01.360134865 -0500
5	@@ -134,7 +134,7 @@	3	@@ -134,7 +134,7 @@
6	true	4	true
7	else	5	else

Return to bug 188692

Lines 1-5 Link Here

(-)riak/files/patch-deps-eleveldb-c_src-leveldb-db-version_set.cc (-14 / +16 lines)
1	--- deps/eleveldb/c_src/leveldb/db/version_set.cc.orig 2013-08-29 23:03:04.000000000 +0200	1	--- deps/eleveldb/c_src/leveldb/db/version_set.cc.orig 2014-04-02 12:26:08.746672588 +0000
2	+++ deps/eleveldb/c_src/leveldb/db/version_set.cc 2013-09-22 14:38:08.000000000 +0200	2	+++ deps/eleveldb/c_src/leveldb/db/version_set.cc 2014-04-02 12:37:06.719627543 +0000
3	@@ -2,10 +2,12 @@	3	@@ -2,10 +2,12 @@
4	// Use of this source code is governed by a BSD-style license that can be	4	// Use of this source code is governed by a BSD-style license that can be
5	// found in the LICENSE file. See the AUTHORS file for names of contributors.	5	// found in the LICENSE file. See the AUTHORS file for names of contributors.
Lines 17-34 Link Here
17		17
18	// WARNING: m_OverlappedFiles flags need to match config::kNumOverlapFiles ... until unified	18	// WARNING: m_OverlappedFiles flags need to match config::kNumOverlapFiles ... until unified
19	{	19	{
20	- {10485760, 262144000, 57671680, 209715200, 0, 300000000, true},	20	- {10485760, 262144000, 57671680, 209715200, 0, 300000000, true},
21	- {10485760, 82914560, 57671680, 419430400, 0, 209715200, true},	21	- {10485760, 82914560, 57671680, 419430400, 0, 209715200, true},
22	- {10485760, 104371840, 57671680, 1006632960, 200000000, 314572800, false},	22	- {10485760, 314572800, 57671680, 1006632960, 200000000, 314572800, false},
23	- {10485760, 125829120, 57671680, 4094304000, 3355443200, 419430400, false},	23	- {10485760, 419430400, 57671680, 4094304000ULL, 3355443200ULL, 419430400, false},
24	- {10485760, 147286400, 57671680, 41943040000, 33554432000, 524288000, false},	24	- {10485760, 524288000, 57671680, 41943040000ULL, 33554432000ULL, 524288000, false},
25	- {10485760, 188743680, 57671680, 419430400000, 335544320000, 629145600, false},	25	- {10485760, 629145600, 57671680, 419430400000ULL, 335544320000ULL, 629145600, false},
26	- {10485760, 220200960, 57671680, 4194304000000, 3355443200000, 734003200, false}	26	- {10485760, 734003200, 57671680, 4194304000000ULL, 3355443200000ULL, 734003200, false}
27	+ {UINT64_C(10485760), UINT64_C(262144000), INT64_C(57671680), UINT64_C( 209715200), UINT64_C( 0), UINT64_C(300000000), true},	27	+ {UINT64_C(10485760), UINT64_C(262144000), INT64_C(57671680), UINT64_C( 209715200), UINT64_C( 0), UINT64_C(300000000), true},
28	+ {UINT64_C(10485760), UINT64_C( 82914560), INT64_C(57671680), UINT64_C( 419430400), UINT64_C( 0), UINT64_C(209715200), true},	28	+ {UINT64_C(10485760), UINT64_C( 82914560), INT64_C(57671680), UINT64_C( 419430400), UINT64_C( 0), UINT64_C(209715200), true},
29	+ {UINT64_C(10485760), UINT64_C(104371840), INT64_C(57671680), UINT64_C( 1006632960), UINT64_C( 200000000), UINT64_C(314572800), false},	29	+ {UINT64_C(10485760), UINT64_C(314572800), INT64_C(57671680), UINT64_C( 1006632960), UINT64_C( 200000000), UINT64_C(314572800), false},
30	+ {UINT64_C(10485760), UINT64_C(125829120), INT64_C(57671680), UINT64_C( 4094304000), UINT64_C( 3355443200), UINT64_C(419430400), false},	30	+ {UINT64_C(10485760), UINT64_C(419430400), INT64_C(57671680), UINT64_C( 4094304000), UINT64_C( 3355443200), UINT64_C(419430400), false},
31	+ {UINT64_C(10485760), UINT64_C(147286400), INT64_C(57671680), UINT64_C( 41943040000), UINT64_C( 33554432000), UINT64_C(524288000), false},	31	+ {UINT64_C(10485760), UINT64_C(524288000), INT64_C(57671680), UINT64_C( 41943040000), UINT64_C( 33554432000), UINT64_C(524288000), false},
32	+ {UINT64_C(10485760), UINT64_C(188743680), INT64_C(57671680), UINT64_C( 419430400000), UINT64_C( 335544320000), UINT64_C(629145600), false},	32	+ {UINT64_C(10485760), UINT64_C(629145600), INT64_C(57671680), UINT64_C( 419430400000), UINT64_C( 335544320000), UINT64_C(629145600), false},
33	+ {UINT64_C(10485760), UINT64_C(220200960), INT64_C(57671680), UINT64_C(4194304000000), UINT64_C(3355443200000), UINT64_C(734003200), false}	33	+ {UINT64_C(10485760), UINT64_C(734003200), INT64_C(57671680), UINT64_C(4194304000000), UINT64_C(3355443200000), UINT64_C(734003200), false}
34	};	34	};
		35
		36	/// ULL above needed to compile on OSX 10.7.3