From owner-svn-ports-head@FreeBSD.ORG  Sat May  2 00:50:29 2015
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 400F3779;
 Sat,  2 May 2015 00:50:29 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 1596F1381;
 Sat,  2 May 2015 00:50:29 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t420oSUO091234;
 Sat, 2 May 2015 00:50:28 GMT (envelope-from sunpoet@FreeBSD.org)
Received: (from sunpoet@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t420oSQ2091231;
 Sat, 2 May 2015 00:50:28 GMT (envelope-from sunpoet@FreeBSD.org)
Message-Id: <201505020050.t420oSQ2091231@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: sunpoet set sender to
 sunpoet@FreeBSD.org using -f
From: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
Date: Sat, 2 May 2015 00:50:28 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r385160 - head/databases/rocksdb/files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 02 May 2015 00:50:29 -0000

Author: sunpoet
Date: Sat May  2 00:50:27 2015
New Revision: 385160
URL: https://svnweb.freebsd.org/changeset/ports/385160

Log:
  - Fix build on i386
  - Regenerate patch file with makepatch:
  
  MFH:		2015Q2

Added:
  head/databases/rocksdb/files/patch-util-logging.cc   (contents, props changed)
Modified:
  head/databases/rocksdb/files/patch-util-thread_local.cc

Added: head/databases/rocksdb/files/patch-util-logging.cc
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/databases/rocksdb/files/patch-util-logging.cc	Sat May  2 00:50:27 2015	(r385160)
@@ -0,0 +1,15 @@
+--- util/logging.cc.orig	2015-03-25 21:40:41 UTC
++++ util/logging.cc
+@@ -35,10 +35,10 @@ int AppendHumanMicros(uint64_t micros, c
+   } else if (micros < 10000000) {
+     return snprintf(output, len, "%.3lf ms",
+                     static_cast<double>(micros) / 1000);
+-  } else if (micros < 1000000l * 60) {
++  } else if (micros < 1000000LL * 60) {
+     return snprintf(output, len, "%.3lf sec",
+                     static_cast<double>(micros) / 1000000);
+-  } else if (micros < 1000000l * 60 * 60) {
++  } else if (micros < 1000000LL * 60 * 60) {
+     return snprintf(output, len, "%02" PRIu64 ":%05.3f M:S",
+         micros / 1000000 / 60,
+         static_cast<double>(micros % 60000000) / 1000000);

Modified: head/databases/rocksdb/files/patch-util-thread_local.cc
==============================================================================
--- head/databases/rocksdb/files/patch-util-thread_local.cc	Sat May  2 00:22:17 2015	(r385159)
+++ head/databases/rocksdb/files/patch-util-thread_local.cc	Sat May  2 00:50:27 2015	(r385160)
@@ -1,5 +1,5 @@
---- util/thread_local.cc.orig	2015-02-10 05:49:22.000000000 +0800
-+++ util/thread_local.cc	2015-02-21 15:54:52.950817216 +0800
+--- util/thread_local.cc.orig	2015-03-25 21:40:41 UTC
++++ util/thread_local.cc
 @@ -7,6 +7,8 @@
  // 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.