From owner-svn-ports-branches@freebsd.org Sun Mar 27 01:44:26 2016 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id CB5A4ADF6A1; Sun, 27 Mar 2016 01:44:26 +0000 (UTC) (envelope-from junovitch@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 820CA11B3; Sun, 27 Mar 2016 01:44:26 +0000 (UTC) (envelope-from junovitch@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u2R1iPfl024742; Sun, 27 Mar 2016 01:44:25 GMT (envelope-from junovitch@FreeBSD.org) Received: (from junovitch@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u2R1iPnE024739; Sun, 27 Mar 2016 01:44:25 GMT (envelope-from junovitch@FreeBSD.org) Message-Id: <201603270144.u2R1iPnE024739@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: junovitch set sender to junovitch@FreeBSD.org using -f From: Jason Unovitch Date: Sun, 27 Mar 2016 01:44:25 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r411974 - branches/2016Q1/sysutils/py-salt X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 27 Mar 2016 01:44:26 -0000 Author: junovitch Date: Sun Mar 27 01:44:25 2016 New Revision: 411974 URL: https://svnweb.freebsd.org/changeset/ports/411974 Log: MFH: r409176 r411789 sysutils/py-salt: update 2015.8.5 -> 2015.8.8 Release notes: https://docs.saltstack.com/en/latest/topics/releases/2015.8.8.html PR: 207316 PR: 208244 Submitted by: Christer Edwards Approved by: ports-secteam (with hat) Security: CVE-2016-3176 Security: https://vuxml.FreeBSD.org/freebsd/6d25c306-f3bb-11e5-92ce-002590263bf5.html Modified: branches/2016Q1/sysutils/py-salt/Makefile branches/2016Q1/sysutils/py-salt/distinfo branches/2016Q1/sysutils/py-salt/pkg-plist Directory Properties: branches/2016Q1/ (props changed) Modified: branches/2016Q1/sysutils/py-salt/Makefile ============================================================================== --- branches/2016Q1/sysutils/py-salt/Makefile Sun Mar 27 01:42:42 2016 (r411973) +++ branches/2016Q1/sysutils/py-salt/Makefile Sun Mar 27 01:44:25 2016 (r411974) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= salt -PORTVERSION= 2015.8.5 +PORTVERSION= 2015.8.8 CATEGORIES= sysutils python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} Modified: branches/2016Q1/sysutils/py-salt/distinfo ============================================================================== --- branches/2016Q1/sysutils/py-salt/distinfo Sun Mar 27 01:42:42 2016 (r411973) +++ branches/2016Q1/sysutils/py-salt/distinfo Sun Mar 27 01:44:25 2016 (r411974) @@ -1,2 +1,2 @@ -SHA256 (salt-2015.8.5.tar.gz) = db395702f048ea384ccc440201c24d7044685977ae6a8588d0d0933246f0c673 -SIZE (salt-2015.8.5.tar.gz) = 6877624 +SHA256 (salt-2015.8.8.tar.gz) = b2ecce7bf562cfcd6586d66ade278f268bb89023f0fa0accaa55f90b8a668ef5 +SIZE (salt-2015.8.8.tar.gz) = 6982904 Modified: branches/2016Q1/sysutils/py-salt/pkg-plist ============================================================================== --- branches/2016Q1/sysutils/py-salt/pkg-plist Sun Mar 27 01:42:42 2016 (r411973) +++ branches/2016Q1/sysutils/py-salt/pkg-plist Sun Mar 27 01:44:25 2016 (r411974) @@ -805,6 +805,8 @@ %%PYTHON_SITELIBDIR%%/salt/modules/reg.pyc %%PYTHON_SITELIBDIR%%/salt/modules/rest_package.py %%PYTHON_SITELIBDIR%%/salt/modules/rest_package.pyc +%%PYTHON_SITELIBDIR%%/salt/modules/rest_sample_utils.py +%%PYTHON_SITELIBDIR%%/salt/modules/rest_sample_utils.pyc %%PYTHON_SITELIBDIR%%/salt/modules/rest_service.py %%PYTHON_SITELIBDIR%%/salt/modules/rest_service.pyc %%PYTHON_SITELIBDIR%%/salt/modules/ret.py From owner-svn-ports-branches@freebsd.org Tue Mar 29 13:57:50 2016 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id B4911AE009B; Tue, 29 Mar 2016 13:57:50 +0000 (UTC) (envelope-from wg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 81C181A7C; Tue, 29 Mar 2016 13:57:50 +0000 (UTC) (envelope-from wg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u2TDvnLa026318; Tue, 29 Mar 2016 13:57:49 GMT (envelope-from wg@FreeBSD.org) Received: (from wg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u2TDvnfr026317; Tue, 29 Mar 2016 13:57:49 GMT (envelope-from wg@FreeBSD.org) Message-Id: <201603291357.u2TDvnfr026317@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: wg set sender to wg@FreeBSD.org using -f From: William Grzybowski Date: Tue, 29 Mar 2016 13:57:49 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r412110 - branches/2016Q1/sysutils/hptcli X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 29 Mar 2016 13:57:50 -0000 Author: wg Date: Tue Mar 29 13:57:49 2016 New Revision: 412110 URL: https://svnweb.freebsd.org/changeset/ports/412110 Log: MFH: r411701 sysutils/hptcli: install using INSTALL_PROGRAM Approved by: portmgr (feld) Modified: branches/2016Q1/sysutils/hptcli/Makefile Directory Properties: branches/2016Q1/ (props changed) Modified: branches/2016Q1/sysutils/hptcli/Makefile ============================================================================== --- branches/2016Q1/sysutils/hptcli/Makefile Tue Mar 29 13:20:38 2016 (r412109) +++ branches/2016Q1/sysutils/hptcli/Makefile Tue Mar 29 13:57:49 2016 (r412110) @@ -3,6 +3,7 @@ PORTNAME= hptcli PORTVERSION= 3.6 +PORTREVISION= 1 CATEGORIES= sysutils MASTER_SITES= http://www.highpoint-tech.com/BIOS_Driver/HRM/FreeBSD/ DISTNAME= CLI-FreeBSD-3.6-1-120913 @@ -28,11 +29,11 @@ do-install: #@${MKDIR} ${STAGEDIR}${PREFIX} ${INSTALL_MAN} ${WRKSRC}/hptraidconf.1 ${STAGEDIR}${MAN1PREFIX}/man/man1 .if ${ARCH} == "i386" - ${INSTALL_DATA} ${WRKSRC}/hptraidconf-8.0 ${STAGEDIR}${PREFIX}/bin/hptraidconf - ${INSTALL_DATA} ${WRKSRC}/hptsvr-3.6/hptsvr-8.0 ${STAGEDIR}${PREFIX}/sbin/hptsvr + ${INSTALL_PROGRAM} ${WRKSRC}/hptraidconf-8.0 ${STAGEDIR}${PREFIX}/bin/hptraidconf + ${INSTALL_PROGRAM} ${WRKSRC}/hptsvr-3.6/hptsvr-8.0 ${STAGEDIR}${PREFIX}/sbin/hptsvr .else - ${INSTALL_DATA} ${WRKSRC}/hptraidconf-8.0.amd64 ${STAGEDIR}${PREFIX}/bin/hptraidconf - ${INSTALL_DATA} ${WRKSRC}/hptsvr-3.6/hptsvr-8.0.amd64 ${STAGEDIR}${PREFIX}/sbin/hptsvr + ${INSTALL_PROGRAM} ${WRKSRC}/hptraidconf-8.0.amd64 ${STAGEDIR}${PREFIX}/bin/hptraidconf + ${INSTALL_PROGRAM} ${WRKSRC}/hptsvr-3.6/hptsvr-8.0.amd64 ${STAGEDIR}${PREFIX}/sbin/hptsvr .endif .include From owner-svn-ports-branches@freebsd.org Tue Mar 29 16:05:49 2016 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 851E0AE2923; Tue, 29 Mar 2016 16:05:49 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 60E2D1D18; Tue, 29 Mar 2016 16:05:49 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u2TG5mmk066920; Tue, 29 Mar 2016 16:05:48 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u2TG5lYH066910; Tue, 29 Mar 2016 16:05:47 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201603291605.u2TG5lYH066910@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Tue, 29 Mar 2016 16:05:47 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r412123 - in branches/2016Q1: mail/thunderbird mail/thunderbird/files www/firefox www/firefox-esr www/firefox-esr/files www/firefox/files www/libxul www/libxul/files www/seamonkey www/s... X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 29 Mar 2016 16:05:49 -0000 Author: jbeich Date: Tue Mar 29 16:05:47 2016 New Revision: 412123 URL: https://svnweb.freebsd.org/changeset/ports/412123 Log: MFH: r411909 gecko: fix an unlikely race with environ(7) Approved by: ports-secteam (feld) Added: branches/2016Q1/mail/thunderbird/files/patch-bug1233275 - copied unchanged from r411909, head/mail/thunderbird/files/patch-bug1233275 branches/2016Q1/www/firefox-esr/files/patch-bug1233275 - copied unchanged from r411909, head/www/firefox-esr/files/patch-bug1233275 branches/2016Q1/www/firefox/files/patch-bug1233275 - copied unchanged from r411909, head/www/firefox/files/patch-bug1233275 branches/2016Q1/www/libxul/files/patch-bug1233275 - copied unchanged from r411909, head/www/libxul/files/patch-bug1233275 branches/2016Q1/www/seamonkey/files/patch-bug1233275 - copied unchanged from r411909, head/www/seamonkey/files/patch-bug1233275 Modified: branches/2016Q1/mail/thunderbird/Makefile branches/2016Q1/www/firefox-esr/Makefile branches/2016Q1/www/firefox/Makefile branches/2016Q1/www/libxul/Makefile branches/2016Q1/www/seamonkey/Makefile Directory Properties: branches/2016Q1/ (props changed) Modified: branches/2016Q1/mail/thunderbird/Makefile ============================================================================== --- branches/2016Q1/mail/thunderbird/Makefile Tue Mar 29 15:54:21 2016 (r412122) +++ branches/2016Q1/mail/thunderbird/Makefile Tue Mar 29 16:05:47 2016 (r412123) @@ -3,6 +3,7 @@ PORTNAME= thunderbird DISTVERSION= 38.7.0 +PORTREVISION= 1 CATEGORIES= mail news net-im ipv6 MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/source Copied: branches/2016Q1/mail/thunderbird/files/patch-bug1233275 (from r411909, head/mail/thunderbird/files/patch-bug1233275) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q1/mail/thunderbird/files/patch-bug1233275 Tue Mar 29 16:05:47 2016 (r412123, copy of r411909, head/mail/thunderbird/files/patch-bug1233275) @@ -0,0 +1,40 @@ +# Copy environment for IPC using NSPR to avoid race + +diff --git a/ipc/chromium/src/base/process_util_bsd.cc b/ipc/chromium/src/base/process_util_bsd.cc +--- mozilla/ipc/chromium/src/base/process_util_bsd.cc ++++ mozilla/ipc/chromium/src/base/process_util_bsd.cc +@@ -13,6 +13,7 @@ + + #include + ++#include "nspr.h" + #include "base/eintr_wrapper.h" + #include "base/file_util.h" + #include "base/logging.h" +@@ -48,7 +49,6 @@ + + #ifdef HAVE_POSIX_SPAWN + #include +-extern "C" char **environ __dso_public; + #endif + + namespace { +@@ -114,6 +114,7 @@ bool LaunchApp(const std::vector + ++#include "nspr.h" + #include "base/eintr_wrapper.h" + +-extern "C" char **environ __attribute__((__visibility__("default"))); +- + namespace base { + + void FreeEnvVarsArray(char* array[], int length) +@@ -66,6 +65,7 @@ bool LaunchApp(const std::vector + ++#include "nspr.h" + #include "base/eintr_wrapper.h" + #include "base/file_util.h" + #include "base/logging.h" +@@ -48,7 +49,6 @@ + + #ifdef HAVE_POSIX_SPAWN + #include +-extern "C" char **environ __dso_public; + #endif + + namespace { +@@ -114,6 +114,7 @@ bool LaunchApp(const std::vector(NULL)); -+ static_cast(NULL)); - thunks::SetGetAllocatorWasteSizeFunction(get_allocator_waste_size_function); - } - - void SetGetStatsFunction(thunks::GetStatsFunction get_stats_function) { - DCHECK_EQ(thunks::GetGetStatsFunction(), -- reinterpret_cast(NULL)); -+ static_cast(NULL)); - thunks::SetGetStatsFunction(get_stats_function); - } - - void SetReleaseFreeMemoryFunction( - thunks::ReleaseFreeMemoryFunction release_free_memory_function) { - DCHECK_EQ(thunks::GetReleaseFreeMemoryFunction(), -- reinterpret_cast(NULL)); -+ static_cast(NULL)); - thunks::SetReleaseFreeMemoryFunction(release_free_memory_function); - } - --- base/strings/safe_sprintf_unittest.cc 2015-04-15 00:18:48.000000000 +0200 +++ base/strings/safe_sprintf_unittest.cc 2015-04-18 22:08:45.000000000 +0200 @@ -729,12 +729,14 @@ @@ -77,24 +51,6 @@ } // Helper function to verify the most common test expectations. -@@ -240,7 +240,7 @@ - ThreadData::InitializeAndSetTrackingStatus(ThreadData::PROFILING_ACTIVE); - - scoped_ptr data(new DeathData()); -- ASSERT_NE(data, reinterpret_cast(NULL)); -+ ASSERT_NE(data, static_cast(NULL)); - EXPECT_EQ(data->run_duration_sum(), 0); - EXPECT_EQ(data->run_duration_max(), 0); - EXPECT_EQ(data->run_duration_sample(), 0); -@@ -279,7 +279,7 @@ - ThreadData::InitializeAndSetTrackingStatus(ThreadData::PROFILING_ACTIVE); - - scoped_ptr data(new DeathData()); -- ASSERT_NE(data, reinterpret_cast(NULL)); -+ ASSERT_NE(data, static_cast(NULL)); - - int32 run_ms = 42; - int32 queue_ms = 8; --- components/sync_sessions/synced_session_tracker.cc.orig 2016-01-21 13:04:41.772845558 +0100 +++ components/sync_sessions/synced_session_tracker.cc 2016-01-21 13:05:17.652842509 +0100 @@ -286,7 +286,7 @@ Copied: branches/2016Q1/www/chromium/files/patch-base__move.h (from r412135, head/www/chromium/files/patch-base__move.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q1/www/chromium/files/patch-base__move.h Wed Mar 30 09:09:00 2016 (r412162, copy of r412135, head/www/chromium/files/patch-base__move.h) @@ -0,0 +1,11 @@ +--- base/move.h.orig 2016-03-05 17:46:48.797428036 +0100 ++++ base/move.h 2016-03-05 17:47:02.108427026 +0100 +@@ -31,7 +31,7 @@ + // for more details. + // TODO(crbug.com/566182): Remove this macro and use DISALLOW_COPY_AND_ASSIGN + // everywhere instead. +-#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_MACOSX) ++#if (defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_MACOSX)) && !defined(OS_BSD) + #define DISALLOW_COPY_AND_ASSIGN_WITH_MOVE_FOR_BIND(type) \ + private: \ + type(const type&) = delete; \ Modified: branches/2016Q1/www/chromium/files/patch-base__posix__unix_domain_socket_linux_unittest.cc ============================================================================== --- branches/2016Q1/www/chromium/files/patch-base__posix__unix_domain_socket_linux_unittest.cc Wed Mar 30 09:02:32 2016 (r412161) +++ branches/2016Q1/www/chromium/files/patch-base__posix__unix_domain_socket_linux_unittest.cc Wed Mar 30 09:09:00 2016 (r412162) @@ -1,11 +1,13 @@ ---- base/posix/unix_domain_socket_linux_unittest.cc.orig 2014-10-10 08:54:09 UTC -+++ base/posix/unix_domain_socket_linux_unittest.cc -@@ -2,8 +2,13 @@ +--- base/posix/unix_domain_socket_linux_unittest.cc.orig 2016-03-02 22:40:17.347033545 +0100 ++++ base/posix/unix_domain_socket_linux_unittest.cc 2016-03-02 22:40:44.347072090 +0100 +@@ -2,10 +2,15 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "build/build_config.h" + + #include + #include #include #include +#if defined(OS_BSD) Modified: branches/2016Q1/www/chromium/files/patch-base__strings__safe_sprintf.cc ============================================================================== --- branches/2016Q1/www/chromium/files/patch-base__strings__safe_sprintf.cc Wed Mar 30 09:02:32 2016 (r412161) +++ branches/2016Q1/www/chromium/files/patch-base__strings__safe_sprintf.cc Wed Mar 30 09:09:00 2016 (r412162) @@ -1,26 +1,16 @@ ---- base/strings/safe_sprintf.cc.orig 2014-10-10 08:54:09 UTC -+++ base/strings/safe_sprintf.cc -@@ -107,15 +107,16 @@ - : buffer_(buffer), - size_(size - 1), // Account for trailing NUL byte +--- base/strings/safe_sprintf.cc.orig 2016-03-02 22:57:14.510959331 +0100 ++++ base/strings/safe_sprintf.cc 2016-03-02 23:00:42.911944805 +0100 +@@ -115,8 +115,11 @@ count_(0) { --// The following assertion does not build on Mac and Android. This is because --// static_assert only works with compile-time constants, but mac uses --// libstdc++4.2 and android uses stlport, which both don't mark --// numeric_limits::max() as constexp. Likewise, MSVS2013's standard library --// also doesn't mark max() as constexpr yet. cl.exe supports static_cast but --// doesn't really implement constexpr yet so it doesn't complain, but clang -+// The following assertion does not build on Mac and Android and older FreeBSD. -+// This is because static_assert only works with compile-time constants, but -+// mac and FreeBSD < 10 use libstdc++4.2 and android uses stlport, which both -+// don't mark numeric_limits::max() as constexp. Likewise, MSVS2013's standard -+// library also doesn't mark max() as constexpr yet. cl.exe supports static_cast -+// but doesn't really implement constexpr yet so it doesn't complain, but clang - // does. - #if __cplusplus >= 201103 && !defined(OS_ANDROID) && !defined(OS_MACOSX) && \ -- !defined(OS_IOS) && !(defined(__clang__) && defined(OS_WIN)) -+ !defined(OS_IOS) && !(defined(OS_FREEBSD) && __FreeBSD_version > 1000054) \ -+ && !(defined(__clang__) && defined(OS_WIN)) - COMPILE_ASSERT(kSSizeMaxConst == \ - static_cast(std::numeric_limits::max()), - kSSizeMax_is_the_max_value_of_an_ssize_t); + // MSVS2013's standard library doesn't mark max() as constexpr yet. cl.exe + // supports static_cast but doesn't really implement constexpr yet so it doesn't +-// complain, but clang does. +-#if __cplusplus >= 201103 && !(defined(__clang__) && defined(OS_WIN)) ++// complain, but clang does. Older FreeBSD (<10) use libstdc++4.2, which ++// doesn't mark numeric_limits::max() as constexp. ++#if __cplusplus >= 201103 && \ ++ !(defined(OS_FREEBSD) && __FreeBSD_version > 1000054) && \ ++ !(defined(__clang__) && defined(OS_WIN)) + static_assert(kSSizeMaxConst == + static_cast(std::numeric_limits::max()), + "kSSizeMaxConst should be the max value of an ssize_t"); Modified: branches/2016Q1/www/chromium/files/patch-base__sys_info_freebsd.cc ============================================================================== --- branches/2016Q1/www/chromium/files/patch-base__sys_info_freebsd.cc Wed Mar 30 09:02:32 2016 (r412161) +++ branches/2016Q1/www/chromium/files/patch-base__sys_info_freebsd.cc Wed Mar 30 09:09:00 2016 (r412162) @@ -1,35 +1,46 @@ ---- base/sys_info_freebsd.cc.orig 2015-07-15 16:29:55.000000000 -0400 -+++ base/sys_info_freebsd.cc 2015-07-21 20:50:15.595303000 -0400 -@@ -4,6 +4,7 @@ +--- base/sys_info_freebsd.cc.orig_orig 2016-03-20 18:19:10.466074029 +0100 ++++ base/sys_info_freebsd.cc 2016-03-20 18:22:51.449059006 +0100 +@@ -12,12 +12,34 @@ - #include "base/sys_info.h" + namespace base { -+#include - #include - - #include "base/logging.h" -@@ -23,6 +24,19 @@ - } - - // static -+int64 SysInfo::AmountOfAvailablePhysicalMemory() { -+ int available_pages, page_size; -+ size_t size = sizeof(available_pages); -+ sysctlbyname("vm.stats.vm.v_free_count", &available_pages, &size, NULL, 0); -+ sysctlbyname("vm.stats.vm.v_page_size", &page_size, &size, NULL, 0); -+ if (available_pages == -1 || page_size == -1) { ++int64_t SysInfo::AmountOfAvailablePhysicalMemory() { ++ int page_size, r = 0; ++ unsigned pgfree, pginact, pgcache; ++ size_t size = sizeof(page_size); ++ size_t szpg = sizeof(pgfree); ++ if(r == 0) ++ r = sysctlbyname("vm.stats.vm.v_page_size", &page_size, &size, NULL, 0); ++ if(r == 0) ++ r = sysctlbyname("vm.stats.vm.v_free_count", &pgfree, &szpg, NULL, 0); ++ if(r == 0) ++ r = sysctlbyname("vm.stats.vm.v_inactive_count", &pginact, &szpg, NULL, 0); ++ if(r == 0) ++ r = sysctlbyname("vm.stats.vm.v_cache_count", &pgcache, &szpg, NULL, 0); ++ if (r == -1) { + NOTREACHED(); + return 0; + } -+ return static_cast(available_pages) * page_size; ++ return static_cast((pgfree + pginact + pgcache) * page_size); +} + -+// static - uint64 SysInfo::MaxSharedMemorySize() { - size_t limit; - size_t size = sizeof(limit); -@@ -33,4 +47,25 @@ - return static_cast(limit); + int64_t SysInfo::AmountOfPhysicalMemory() { +- int pages, page_size; ++ int pages, page_size, r = 0; + size_t size = sizeof(pages); +- sysctlbyname("vm.stats.vm.v_page_count", &pages, &size, NULL, 0); +- sysctlbyname("vm.stats.vm.v_page_size", &page_size, &size, NULL, 0); +- if (pages == -1 || page_size == -1) { ++ if(r == 0) ++ r = sysctlbyname("vm.stats.vm.v_page_count", &pages, &size, NULL, 0); ++ if(r == 0) ++ r = sysctlbyname("vm.stats.vm.v_page_size", &page_size, &size, NULL, 0); ++ if (r == -1) { + NOTREACHED(); + return 0; + } +@@ -35,4 +57,25 @@ + return static_cast(limit); } +// static Modified: branches/2016Q1/www/chromium/files/patch-base__trace_event__process_memory_dump.cc ============================================================================== --- branches/2016Q1/www/chromium/files/patch-base__trace_event__process_memory_dump.cc Wed Mar 30 09:02:32 2016 (r412161) +++ branches/2016Q1/www/chromium/files/patch-base__trace_event__process_memory_dump.cc Wed Mar 30 09:09:00 2016 (r412162) @@ -1,11 +1,11 @@ ---- base/trace_event/process_memory_dump.cc.orig 2016-01-21 17:38:36.214712498 +0100 -+++ base/trace_event/process_memory_dump.cc 2016-01-21 17:38:51.814711855 +0100 +--- base/trace_event/process_memory_dump.cc.orig 2016-03-05 15:21:43.755196423 +0100 ++++ base/trace_event/process_memory_dump.cc 2016-03-05 15:22:37.112362644 +0100 @@ -66,7 +66,7 @@ int error_counter = 0; // HANDLE_EINTR tries for 100 times. So following the same pattern. do { -- result = mincore(chunk_start, chunk_size, vector_as_array(&vec)); -+ result = mincore(chunk_start, chunk_size, (char *) vector_as_array(&vec)); +- result = mincore(chunk_start, chunk_size, vec.data()); ++ result = mincore(chunk_start, chunk_size, (char *) vec.data()); } while (result == -1 && errno == EAGAIN && error_counter++ < 100); if (result) break; Modified: branches/2016Q1/www/chromium/files/patch-build__common.gypi ============================================================================== --- branches/2016Q1/www/chromium/files/patch-build__common.gypi Wed Mar 30 09:02:32 2016 (r412161) +++ branches/2016Q1/www/chromium/files/patch-build__common.gypi Wed Mar 30 09:09:00 2016 (r412162) @@ -31,13 +31,13 @@ 'use_dbus%': 1, }, { 'use_dbus%': 0, -@@ -997,7 +1003,7 @@ +@@ -1011,7 +1011,7 @@ }, { 'use_openmax_dl_fft%': 0, }], - ['OS=="win" or OS=="linux"', { + ['OS=="win" or OS=="linux" or OS=="freebsd"', { - 'enable_mdns%' : 1, + 'enable_mdns%' : 1, }], @@ -1263,6 +1269,10 @@ Copied: branches/2016Q1/www/chromium/files/patch-chrome__browser__download__download_query.cc (from r412135, head/www/chromium/files/patch-chrome__browser__download__download_query.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q1/www/chromium/files/patch-chrome__browser__download__download_query.cc Wed Mar 30 09:09:00 2016 (r412162, copy of r412135, head/www/chromium/files/patch-chrome__browser__download__download_query.cc) @@ -0,0 +1,14 @@ +--- chrome/browser/download/download_query.cc.orig 2016-03-05 21:04:25.551612729 +0100 ++++ chrome/browser/download/download_query.cc 2016-03-05 21:05:14.895785377 +0100 +@@ -31,7 +31,11 @@ + #include "components/url_formatter/url_formatter.h" + #include "content/public/browser/content_browser_client.h" + #include "content/public/browser/download_item.h" ++#if defined(OS_BSD) ++#include ++#else + #include "third_party/re2/src/re2/re2.h" ++#endif + #include "url/gurl.h" + + using content::DownloadDangerType; Copied: branches/2016Q1/www/chromium/files/patch-chrome__browser__extensions__activity_log__activity_log.cc (from r412135, head/www/chromium/files/patch-chrome__browser__extensions__activity_log__activity_log.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q1/www/chromium/files/patch-chrome__browser__extensions__activity_log__activity_log.cc Wed Mar 30 09:09:00 2016 (r412162, copy of r412135, head/www/chromium/files/patch-chrome__browser__extensions__activity_log__activity_log.cc) @@ -0,0 +1,14 @@ +--- chrome/browser/extensions/activity_log/activity_log.cc.orig 2016-03-05 21:02:01.319620815 +0100 ++++ chrome/browser/extensions/activity_log/activity_log.cc 2016-03-05 21:02:58.927616965 +0100 +@@ -39,7 +39,11 @@ + #include "extensions/browser/extensions_browser_client.h" + #include "extensions/common/extension.h" + #include "extensions/common/one_shot_event.h" ++#if defined(OS_BSD) ++#include ++#else + #include "third_party/re2/src/re2/re2.h" ++#endif + #include "url/gurl.h" + + namespace constants = activity_log_constants; Modified: branches/2016Q1/www/chromium/files/patch-chrome__browser__extensions__api__music_manager_private__device_id_linux.cc ============================================================================== --- branches/2016Q1/www/chromium/files/patch-chrome__browser__extensions__api__music_manager_private__device_id_linux.cc Wed Mar 30 09:02:32 2016 (r412161) +++ branches/2016Q1/www/chromium/files/patch-chrome__browser__extensions__api__music_manager_private__device_id_linux.cc Wed Mar 30 09:09:00 2016 (r412162) @@ -1,5 +1,5 @@ ---- chrome/browser/extensions/api/music_manager_private/device_id_linux.cc.orig 2014-10-10 08:54:10 UTC -+++ chrome/browser/extensions/api/music_manager_private/device_id_linux.cc +--- chrome/browser/extensions/api/music_manager_private/device_id_linux.cc.orig 2016-03-04 21:17:01.250966286 +0100 ++++ chrome/browser/extensions/api/music_manager_private/device_id_linux.cc 2016-03-04 21:17:09.082965156 +0100 @@ -4,6 +4,10 @@ #include "chrome/browser/extensions/api/music_manager_private/device_id.h" @@ -8,9 +8,9 @@ +#include +#include +#endif - #include // Must be included before ifaddrs.h. #include #include + #include @@ -102,11 +106,33 @@ const char* prefixes[], size_t prefixes_count) { Copied: branches/2016Q1/www/chromium/files/patch-chrome__browser__password_manager__chrome_password_manager_client.cc (from r412135, head/www/chromium/files/patch-chrome__browser__password_manager__chrome_password_manager_client.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q1/www/chromium/files/patch-chrome__browser__password_manager__chrome_password_manager_client.cc Wed Mar 30 09:09:00 2016 (r412162, copy of r412135, head/www/chromium/files/patch-chrome__browser__password_manager__chrome_password_manager_client.cc) @@ -0,0 +1,14 @@ +--- chrome/browser/password_manager/chrome_password_manager_client.cc.orig 2016-03-05 21:11:05.017583997 +0100 ++++ chrome/browser/password_manager/chrome_password_manager_client.cc 2016-03-05 21:11:24.785751124 +0100 +@@ -55,7 +55,11 @@ + #include "content/public/browser/web_contents.h" + #include "google_apis/gaia/gaia_urls.h" + #include "net/base/url_util.h" ++#if defined(OS_BSD) ++#include ++#else + #include "third_party/re2/src/re2/re2.h" ++#endif + + #if defined(OS_MACOSX) || BUILDFLAG(ANDROID_JAVA_UI) + #include "chrome/browser/password_manager/save_password_infobar_delegate.h" Copied: branches/2016Q1/www/chromium/files/patch-chrome__browser__search__local_files_ntp_source.cc (from r412135, head/www/chromium/files/patch-chrome__browser__search__local_files_ntp_source.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q1/www/chromium/files/patch-chrome__browser__search__local_files_ntp_source.cc Wed Mar 30 09:09:00 2016 (r412162, copy of r412135, head/www/chromium/files/patch-chrome__browser__search__local_files_ntp_source.cc) @@ -0,0 +1,16 @@ +--- chrome/browser/search/local_files_ntp_source.cc.orig 2016-03-05 21:06:47.216601080 +0100 ++++ chrome/browser/search/local_files_ntp_source.cc 2016-03-05 21:07:16.040598823 +0100 +@@ -19,8 +19,13 @@ + #include "chrome/common/url_constants.h" + #include "content/public/browser/browser_thread.h" + #include "content/public/browser/url_data_source.h" ++#if defined(OS_BSD) ++#include ++#include ++#else + #include "third_party/re2/src/re2/re2.h" + #include "third_party/re2/src/re2/stringpiece.h" ++#endif + + namespace { + Copied: branches/2016Q1/www/chromium/files/patch-chrome__browser__sync__chrome_sync_client.cc (from r412135, head/www/chromium/files/patch-chrome__browser__sync__chrome_sync_client.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q1/www/chromium/files/patch-chrome__browser__sync__chrome_sync_client.cc Wed Mar 30 09:09:00 2016 (r412162, copy of r412135, head/www/chromium/files/patch-chrome__browser__sync__chrome_sync_client.cc) @@ -0,0 +1,11 @@ +--- chrome/browser/sync/chrome_sync_client.cc.orig 2016-03-04 21:50:06.513829549 +0100 ++++ chrome/browser/sync/chrome_sync_client.cc 2016-03-04 21:50:19.352828601 +0100 +@@ -572,7 +572,7 @@ + } + #endif + +-#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_CHROMEOS) || defined(OS_BSD) + // Dictionary sync is enabled by default. + if (!disabled_types.Has(syncer::DICTIONARY)) { + sync_service->RegisterDataTypeController(new UIDataTypeController( Modified: branches/2016Q1/www/chromium/files/patch-chrome__browser__ui__view__tabs__tab_drag_controller.cc ============================================================================== --- branches/2016Q1/www/chromium/files/patch-chrome__browser__ui__view__tabs__tab_drag_controller.cc Wed Mar 30 09:02:32 2016 (r412161) +++ branches/2016Q1/www/chromium/files/patch-chrome__browser__ui__view__tabs__tab_drag_controller.cc Wed Mar 30 09:09:00 2016 (r412162) @@ -18,10 +18,10 @@ // EndMoveLoop is going to snap the window back to its original location. // Hide it so users don't see this. Hiding a window in Linux aura causes // it to lose capture so skip it. -@@ -1799,7 +1799,7 @@ - attached_tabstrip_->GetWidget()->GetNativeWindow(); - if (exclude_dragged_view && dragged_window) - exclude.insert(dragged_window); +@@ -1806,7 +1806,7 @@ + if (dragged_window) + exclude.insert(dragged_window); + } -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) // Exclude windows which are pending deletion via Browser::TabStripEmpty(). Copied: branches/2016Q1/www/chromium/files/patch-chrome__browser__ui__webui__extensions__extension_loader_handler.cc (from r412135, head/www/chromium/files/patch-chrome__browser__ui__webui__extensions__extension_loader_handler.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q1/www/chromium/files/patch-chrome__browser__ui__webui__extensions__extension_loader_handler.cc Wed Mar 30 09:09:00 2016 (r412162, copy of r412135, head/www/chromium/files/patch-chrome__browser__ui__webui__extensions__extension_loader_handler.cc) @@ -0,0 +1,14 @@ +--- chrome/browser/ui/webui/extensions/extension_loader_handler.cc.orig 2016-03-05 21:09:24.961590217 +0100 ++++ chrome/browser/ui/webui/extensions/extension_loader_handler.cc 2016-03-05 21:09:41.001588829 +0100 +@@ -25,7 +25,11 @@ + #include "extensions/common/constants.h" + #include "extensions/common/extension.h" + #include "extensions/common/manifest_constants.h" ++#if defined(OS_BSD) ++#include ++#else + #include "third_party/re2/src/re2/re2.h" ++#endif + #include "ui/base/l10n/l10n_util.h" + + namespace extensions { Copied: branches/2016Q1/www/chromium/files/patch-components__autofill__content__renderer__password_form_conversion_utils.cc (from r412135, head/www/chromium/files/patch-components__autofill__content__renderer__password_form_conversion_utils.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q1/www/chromium/files/patch-components__autofill__content__renderer__password_form_conversion_utils.cc Wed Mar 30 09:09:00 2016 (r412162, copy of r412135, head/www/chromium/files/patch-components__autofill__content__renderer__password_form_conversion_utils.cc) @@ -0,0 +1,14 @@ +--- components/autofill/content/renderer/password_form_conversion_utils.cc.orig 2016-03-05 21:26:25.526530088 +0100 ++++ components/autofill/content/renderer/password_form_conversion_utils.cc 2016-03-05 21:26:38.502521878 +0100 +@@ -26,7 +26,11 @@ + #include "third_party/WebKit/public/web/WebFormControlElement.h" + #include "third_party/WebKit/public/web/WebFrame.h" + #include "third_party/WebKit/public/web/WebInputElement.h" ++#if defined(OS_BSD) ++#include ++#else + #include "third_party/re2/src/re2/re2.h" ++#endif + + using blink::WebDocument; + using blink::WebFormControlElement; Copied: branches/2016Q1/www/chromium/files/patch-components__autofill__core__browser__form_structure.cc (from r412135, head/www/chromium/files/patch-components__autofill__core__browser__form_structure.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q1/www/chromium/files/patch-components__autofill__core__browser__form_structure.cc Wed Mar 30 09:09:00 2016 (r412162, copy of r412135, head/www/chromium/files/patch-components__autofill__core__browser__form_structure.cc) @@ -0,0 +1,14 @@ +--- components/autofill/core/browser/form_structure.cc.orig 2016-03-05 21:25:19.742524141 +0100 ++++ components/autofill/core/browser/form_structure.cc 2016-03-05 21:25:31.566523885 +0100 +@@ -35,7 +35,11 @@ + #include "components/rappor/rappor_service.h" + #include "components/rappor/rappor_utils.h" + #include "third_party/libxml/chromium/libxml_utils.h" ++#if defined(OS_BSD) ++#include ++#else + #include "third_party/re2/src/re2/re2.h" ++#endif + + namespace autofill { + namespace { Copied: branches/2016Q1/www/chromium/files/patch-components__dom_distiller__core__page_features.cc (from r412135, head/www/chromium/files/patch-components__dom_distiller__core__page_features.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q1/www/chromium/files/patch-components__dom_distiller__core__page_features.cc Wed Mar 30 09:09:00 2016 (r412162, copy of r412135, head/www/chromium/files/patch-components__dom_distiller__core__page_features.cc) @@ -0,0 +1,14 @@ +--- components/dom_distiller/core/page_features.cc.orig 2016-03-05 21:23:13.237533214 +0100 ++++ components/dom_distiller/core/page_features.cc 2016-03-05 21:23:28.813592348 +0100 +@@ -9,7 +9,11 @@ + #include + + #include "base/json/json_reader.h" ++#if defined(OS_BSD) ++#include ++#else + #include "third_party/re2/src/re2/re2.h" ++#endif + #include "url/gurl.h" + + namespace dom_distiller { Copied: branches/2016Q1/www/chromium/files/patch-components__drive__drive_api_util.cc (from r412135, head/www/chromium/files/patch-components__drive__drive_api_util.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q1/www/chromium/files/patch-components__drive__drive_api_util.cc Wed Mar 30 09:09:00 2016 (r412162, copy of r412135, head/www/chromium/files/patch-components__drive__drive_api_util.cc) @@ -0,0 +1,14 @@ +--- components/drive/drive_api_util.cc.orig 2016-03-05 21:22:18.245536848 +0100 ++++ components/drive/drive_api_util.cc 2016-03-05 21:22:28.781536000 +0100 +@@ -22,7 +22,11 @@ + #include "google_apis/drive/drive_api_parser.h" + #include "net/base/escape.h" + #include "net/base/net_errors.h" ++#if defined(OS_BSD) ++#include ++#else + #include "third_party/re2/src/re2/re2.h" ++#endif + #include "url/gurl.h" + + namespace drive { Copied: branches/2016Q1/www/chromium/files/patch-components__feedback__anonymizer_tool.cc (from r412135, head/www/chromium/files/patch-components__feedback__anonymizer_tool.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q1/www/chromium/files/patch-components__feedback__anonymizer_tool.cc Wed Mar 30 09:09:00 2016 (r412162, copy of r412135, head/www/chromium/files/patch-components__feedback__anonymizer_tool.cc) @@ -0,0 +1,14 @@ +--- components/feedback/anonymizer_tool.cc.orig 2016-03-05 21:12:40.810576880 +0100 ++++ components/feedback/anonymizer_tool.cc 2016-03-05 21:12:56.522575394 +0100 +@@ -9,7 +9,11 @@ + #include "base/strings/string_number_conversions.h" + #include "base/strings/string_util.h" + #include "base/strings/stringprintf.h" ++#if defined(OS_BSD) ++#include ++#else + #include "third_party/re2/src/re2/re2.h" ++#endif + + using re2::RE2; + Copied: branches/2016Q1/www/chromium/files/patch-components__flags_ui__flags_state.cc (from r412135, head/www/chromium/files/patch-components__flags_ui__flags_state.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q1/www/chromium/files/patch-components__flags_ui__flags_state.cc Wed Mar 30 09:09:00 2016 (r412162, copy of r412135, head/www/chromium/files/patch-components__flags_ui__flags_state.cc) @@ -0,0 +1,11 @@ +--- components/flags_ui/flags_state.cc.orig 2016-03-04 21:01:15.539156962 +0100 ++++ components/flags_ui/flags_state.cc 2016-03-04 21:00:48.239033063 +0100 +@@ -450,7 +450,7 @@ + return kOsWin; + #elif defined(OS_CHROMEOS) // Needs to be before the OS_LINUX check. + return kOsCrOS; +-#elif defined(OS_LINUX) || defined(OS_OPENBSD) ++#elif defined(OS_LINUX) || defined(OS_OPENBSD) || defined(OS_FREEBSD) + return kOsLinux; + #elif defined(OS_ANDROID) + return kOsAndroid; Copied: branches/2016Q1/www/chromium/files/patch-components__json_schema__json_schema_validator.cc (from r412135, head/www/chromium/files/patch-components__json_schema__json_schema_validator.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q1/www/chromium/files/patch-components__json_schema__json_schema_validator.cc Wed Mar 30 09:09:00 2016 (r412162, copy of r412135, head/www/chromium/files/patch-components__json_schema__json_schema_validator.cc) @@ -0,0 +1,14 @@ +--- components/json_schema/json_schema_validator.cc.orig 2016-03-05 17:55:58.871393896 +0100 ++++ components/json_schema/json_schema_validator.cc 2016-03-05 17:56:49.927387504 +0100 +@@ -20,7 +20,11 @@ + #include "base/strings/stringprintf.h" + #include "base/values.h" + #include "components/json_schema/json_schema_constants.h" ++#if defined(OS_BSD) ++#include ++#else + #include "third_party/re2/src/re2/re2.h" ++#endif + + namespace schema = json_schema_constants; + Copied: branches/2016Q1/www/chromium/files/patch-components__keyed_service__core__dependency_graph_unittest.cc (from r412135, head/www/chromium/files/patch-components__keyed_service__core__dependency_graph_unittest.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q1/www/chromium/files/patch-components__keyed_service__core__dependency_graph_unittest.cc Wed Mar 30 09:09:00 2016 (r412162, copy of r412135, head/www/chromium/files/patch-components__keyed_service__core__dependency_graph_unittest.cc) @@ -0,0 +1,14 @@ +--- components/keyed_service/core/dependency_graph_unittest.cc.orig 2016-03-05 21:17:52.372555224 +0100 ++++ components/keyed_service/core/dependency_graph_unittest.cc 2016-03-05 21:18:04.371555206 +0100 +@@ -9,7 +9,11 @@ + #include "components/keyed_service/core/dependency_graph.h" + #include "components/keyed_service/core/dependency_node.h" + #include "testing/gtest/include/gtest/gtest.h" ++#if defined(OS_BSD) ++#include ++#else + #include "third_party/re2/src/re2/re2.h" ++#endif + + namespace { + Copied: branches/2016Q1/www/chromium/files/patch-components__password_manager__core__browser__import__csv_reader.cc (from r412135, head/www/chromium/files/patch-components__password_manager__core__browser__import__csv_reader.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q1/www/chromium/files/patch-components__password_manager__core__browser__import__csv_reader.cc Wed Mar 30 09:09:00 2016 (r412162, copy of r412135, head/www/chromium/files/patch-components__password_manager__core__browser__import__csv_reader.cc) @@ -0,0 +1,14 @@ +--- components/password_manager/core/browser/import/csv_reader.cc.orig 2016-03-05 21:24:14.054528874 +0100 ++++ components/password_manager/core/browser/import/csv_reader.cc 2016-03-05 21:24:28.997912844 +0100 +@@ -9,7 +9,11 @@ + #include "base/logging.h" + #include "base/macros.h" + #include "base/strings/string_util.h" ++#if defined(OS_BSD) ++#include ++#else + #include "third_party/re2/src/re2/re2.h" ++#endif + + namespace { + Copied: branches/2016Q1/www/chromium/files/patch-components__plugins__renderer_plugin_placeholder.cc (from r412135, head/www/chromium/files/patch-components__plugins__renderer_plugin_placeholder.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q1/www/chromium/files/patch-components__plugins__renderer_plugin_placeholder.cc Wed Mar 30 09:09:00 2016 (r412162, copy of r412135, head/www/chromium/files/patch-components__plugins__renderer_plugin_placeholder.cc) @@ -0,0 +1,14 @@ +--- components/plugins/renderer/plugin_placeholder.cc.orig 2016-03-05 21:19:00.436550513 +0100 ++++ components/plugins/renderer/plugin_placeholder.cc 2016-03-05 21:20:14.436562091 +0100 +@@ -11,7 +11,11 @@ + #include "gin/object_template_builder.h" + #include "third_party/WebKit/public/web/WebElement.h" + #include "third_party/WebKit/public/web/WebPluginContainer.h" ++#if defined(OS_BSD) ++#include ++#else + #include "third_party/re2/src/re2/re2.h" ++#endif + + namespace plugins { + Copied: branches/2016Q1/www/chromium/files/patch-components__policy__core__common__schema.cc (from r412135, head/www/chromium/files/patch-components__policy__core__common__schema.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q1/www/chromium/files/patch-components__policy__core__common__schema.cc Wed Mar 30 09:09:00 2016 (r412162, copy of r412135, head/www/chromium/files/patch-components__policy__core__common__schema.cc) @@ -0,0 +1,14 @@ +--- components/policy/core/common/schema.cc.orig 2016-03-05 19:30:39.179235992 +0100 ++++ components/policy/core/common/schema.cc 2016-03-05 19:31:28.596994984 +0100 +@@ -21,7 +21,11 @@ + #include "components/json_schema/json_schema_constants.h" + #include "components/json_schema/json_schema_validator.h" + #include "components/policy/core/common/schema_internal.h" ++#if defined(OS_FREEBSD) ++#include ++#else + #include "third_party/re2/src/re2/re2.h" ++#endif + + namespace schema = json_schema_constants; + Modified: branches/2016Q1/www/chromium/files/patch-components__storage_monitor__storage_monitor_freebsd.cc ============================================================================== --- branches/2016Q1/www/chromium/files/patch-components__storage_monitor__storage_monitor_freebsd.cc Wed Mar 30 09:02:32 2016 (r412161) +++ branches/2016Q1/www/chromium/files/patch-components__storage_monitor__storage_monitor_freebsd.cc Wed Mar 30 09:09:00 2016 (r412162) @@ -1,6 +1,6 @@ --- components/storage_monitor/storage_monitor_freebsd.cc.orig 1970-01-01 01:00:00.000000000 +0100 +++ components/storage_monitor/storage_monitor_freebsd.cc 2015-04-19 19:38:05.000000000 +0200 -@@ -0,0 +1,102 @@ +@@ -0,0 +1,101 @@ +// Copyright 2014 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. @@ -13,7 +13,6 @@ + +#include + -+#include "base/basictypes.h" +#include "base/bind.h" +#include "base/metrics/histogram.h" +#include "base/process/kill.h" @@ -64,7 +63,7 @@ + if (!process.WaitForExitWithTimeout(base::TimeDelta::FromMilliseconds(3000), + &exit_code)) { + process.Terminate(-1, false); -+ base::EnsureProcessTerminated(process.Pass()); ++ base::EnsureProcessTerminated(std::move(process)); + return StorageMonitor::EJECT_FAILURE; + } + Modified: branches/2016Q1/www/chromium/files/patch-components__storage_monitor__storage_monitor_freebsd.h ============================================================================== --- branches/2016Q1/www/chromium/files/patch-components__storage_monitor__storage_monitor_freebsd.h Wed Mar 30 09:02:32 2016 (r412161) +++ branches/2016Q1/www/chromium/files/patch-components__storage_monitor__storage_monitor_freebsd.h Wed Mar 30 09:09:00 2016 (r412162) @@ -1,6 +1,6 @@ --- components/storage_monitor/storage_monitor_freebsd.h.orig 2015-01-24 17:14:44 UTC +++ components/storage_monitor/storage_monitor_freebsd.h -@@ -0,0 +1,47 @@ +@@ -0,0 +1,46 @@ +// Copyright 2014 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. @@ -17,7 +17,6 @@ +#include +#include + -+#include "base/basictypes.h" +#include "base/compiler_specific.h" +#include "base/files/file_path.h" +#include "base/files/file_path_watcher.h" Copied: branches/2016Q1/www/chromium/files/patch-components__url_matcher__regex_set_matcher.cc (from r412135, head/www/chromium/files/patch-components__url_matcher__regex_set_matcher.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q1/www/chromium/files/patch-components__url_matcher__regex_set_matcher.cc Wed Mar 30 09:09:00 2016 (r412162, copy of r412135, head/www/chromium/files/patch-components__url_matcher__regex_set_matcher.cc) @@ -0,0 +1,16 @@ +--- components/url_matcher/regex_set_matcher.cc.orig 2016-03-05 21:14:47.451567783 +0100 ++++ components/url_matcher/regex_set_matcher.cc 2016-03-05 21:15:45.419563760 +0100 +@@ -10,8 +10,13 @@ + #include "base/stl_util.h" + #include "base/strings/string_util.h" + #include "components/url_matcher/substring_set_matcher.h" ++#if defined(OS_BSD) ++#include ++#include ++#else + #include "third_party/re2/src/re2/filtered_re2.h" + #include "third_party/re2/src/re2/re2.h" ++#endif + + namespace url_matcher { + Copied: branches/2016Q1/www/chromium/files/patch-components__url_matcher__url_matcher_factory.cc (from r412135, head/www/chromium/files/patch-components__url_matcher__url_matcher_factory.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q1/www/chromium/files/patch-components__url_matcher__url_matcher_factory.cc Wed Mar 30 09:09:00 2016 (r412162, copy of r412135, head/www/chromium/files/patch-components__url_matcher__url_matcher_factory.cc) @@ -0,0 +1,14 @@ +--- components/url_matcher/url_matcher_factory.cc.orig 2016-03-05 21:16:31.699560757 +0100 ++++ components/url_matcher/url_matcher_factory.cc 2016-03-05 21:16:54.155559498 +0100 +@@ -15,7 +15,11 @@ + #include "base/values.h" + #include "components/url_matcher/url_matcher_constants.h" + #include "components/url_matcher/url_matcher_helpers.h" ++#if defined(OS_BSD) ++#include ++#else + #include "third_party/re2/src/re2/re2.h" ++#endif + + namespace url_matcher { + Copied: branches/2016Q1/www/chromium/files/patch-components__webcrypto__algorithms__test_helpers.cc (from r412135, head/www/chromium/files/patch-components__webcrypto__algorithms__test_helpers.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q1/www/chromium/files/patch-components__webcrypto__algorithms__test_helpers.cc Wed Mar 30 09:09:00 2016 (r412162, copy of r412135, head/www/chromium/files/patch-components__webcrypto__algorithms__test_helpers.cc) @@ -0,0 +1,14 @@ +--- components/webcrypto/algorithms/test_helpers.cc.orig 2016-03-05 21:20:58.677542744 +0100 ++++ components/webcrypto/algorithms/test_helpers.cc 2016-03-05 21:21:13.733542071 +0100 +@@ -26,7 +26,11 @@ + #include "components/webcrypto/status.h" + #include "third_party/WebKit/public/platform/WebCryptoAlgorithmParams.h" + #include "third_party/WebKit/public/platform/WebCryptoKeyAlgorithm.h" ++#if defined(OS_BSD) ++#include ++#else + #include "third_party/re2/src/re2/re2.h" ++#endif + + namespace webcrypto { + Modified: branches/2016Q1/www/chromium/files/patch-content__browser__browser_main_loop.cc ============================================================================== --- branches/2016Q1/www/chromium/files/patch-content__browser__browser_main_loop.cc Wed Mar 30 09:02:32 2016 (r412161) +++ branches/2016Q1/www/chromium/files/patch-content__browser__browser_main_loop.cc Wed Mar 30 09:09:00 2016 (r412162) @@ -18,15 +18,3 @@ // No thread should be created before this call, as SetupSandbox() // will end-up using fork(). SetupSandbox(parsed_command_line_); -@@ -808,9 +808,9 @@ - } - #endif - --#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) -+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD) - ZygoteHostImpl::GetInstance()->TearDownAfterLastChild(); --#endif // defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) -+#endif // defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD) - - // The device monitors are using |system_monitor_| as dependency, so delete - // them before |system_monitor_| goes away. Modified: branches/2016Q1/www/chromium/files/patch-content__browser__child_process_launcher.cc ============================================================================== --- branches/2016Q1/www/chromium/files/patch-content__browser__child_process_launcher.cc Wed Mar 30 09:02:32 2016 (r412161) +++ branches/2016Q1/www/chromium/files/patch-content__browser__child_process_launcher.cc Wed Mar 30 09:09:00 2016 (r412162) @@ -1,6 +1,6 @@ ---- content/browser/child_process_launcher.cc.orig 2015-09-01 16:10:42.000000000 -0400 -+++ content/browser/child_process_launcher.cc 2015-09-03 10:33:53.388547000 -0400 -@@ -114,7 +114,11 @@ +--- content/browser/child_process_launcher.cc.orig 2016-03-04 22:27:56.807672733 +0100 ++++ content/browser/child_process_launcher.cc 2016-03-04 22:34:35.624645928 +0100 +@@ -116,7 +116,11 @@ base::EnvironmentMap env = delegate->GetEnvironment(); base::ScopedFD ipcfd = delegate->TakeIpcFd(); #elif defined(OS_POSIX) && !defined(OS_ANDROID) @@ -12,7 +12,7 @@ base::EnvironmentMap env = delegate->GetEnvironment(); base::ScopedFD ipcfd = delegate->TakeIpcFd(); #endif -@@ -143,7 +147,7 @@ +@@ -145,7 +149,7 @@ #endif #endif @@ -21,7 +21,7 @@ std::map regions; GetContentClient()->browser()->GetAdditionalMappedFilesForChildProcess( *cmd_line, child_process_id, files_to_register.get() -@@ -176,7 +180,7 @@ +@@ -178,7 +182,7 @@ } } #endif // defined(V8_USE_EXTERNAL_STARTUP_DATA) @@ -30,7 +30,7 @@ #if defined(OS_ANDROID) files_to_register->Share( -@@ -196,21 +200,21 @@ +@@ -198,21 +202,21 @@ // We need to close the client end of the IPC channel to reliably detect // child termination. @@ -38,7 +38,7 @@ +#if !defined(OS_MACOSX) && !defined(OS_BSD) if (use_zygote) { base::ProcessHandle handle = ZygoteHostImpl::GetInstance()->ForkRequest( - cmd_line->argv(), files_to_register.Pass(), process_type); + cmd_line->argv(), std::move(files_to_register), process_type); process = base::Process(handle); } else // Fall through to the normal posix case below when we're not zygoting. @@ -55,7 +55,7 @@ if (process_type == switches::kRendererProcess) { const int sandbox_fd = RenderSandboxHostLinux::GetInstance()->GetRendererSocket(); -@@ -218,7 +222,7 @@ +@@ -220,7 +224,7 @@ sandbox_fd, GetSandboxFD())); } @@ -64,7 +64,7 @@ // Actually launch the app. base::LaunchOptions options; -@@ -294,13 +298,13 @@ +@@ -296,13 +300,13 @@ process.Terminate(RESULT_CODE_NORMAL_EXIT, false); // On POSIX, we must additionally reap the child. #if defined(OS_POSIX) @@ -76,11 +76,11 @@ ZygoteHostImpl::GetInstance()->EnsureProcessTerminated(process.Handle()); } else -#endif // !OS_MACOSX -+#endif // !OS_MACOSX && !OS_BSD - base::EnsureProcessTerminated(process.Pass()); ++#endif // !OS_MACOSX && !defined(OS_BSD) + base::EnsureProcessTerminated(std::move(process)); #endif // OS_POSIX #endif // defined(OS_ANDROID) -@@ -399,7 +403,7 @@ +@@ -398,7 +402,7 @@ void ChildProcessLauncher::UpdateTerminationStatus(bool known_dead) { DCHECK(CalledOnValidThread()); @@ -89,7 +89,7 @@ if (zygote_) { termination_status_ = ZygoteHostImpl::GetInstance()-> GetTerminationStatus(process_.Handle(), known_dead, &exit_code_); -@@ -407,7 +411,7 @@ +@@ -406,7 +410,7 @@ termination_status_ = base::GetKnownDeadTerminationStatus(process_.Handle(), &exit_code_); } else { @@ -98,9 +98,9 @@ if (known_dead) { termination_status_ = base::GetKnownDeadTerminationStatus(process_.Handle(), &exit_code_); -@@ -481,7 +485,7 @@ +@@ -469,7 +473,7 @@ starting_ = false; - process_ = process.Pass(); + process_ = std::move(process); -#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) +#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD) Modified: branches/2016Q1/www/chromium/files/patch-content__browser__gpu__gpu_data_manager_impl_private.cc ============================================================================== --- branches/2016Q1/www/chromium/files/patch-content__browser__gpu__gpu_data_manager_impl_private.cc Wed Mar 30 09:02:32 2016 (r412161) +++ branches/2016Q1/www/chromium/files/patch-content__browser__gpu__gpu_data_manager_impl_private.cc Wed Mar 30 09:09:00 2016 (r412162) @@ -1,10 +1,11 @@ ---- content/browser/gpu/gpu_data_manager_impl_private.cc.orig 2015-05-13 18:35:46.000000000 -0400 -+++ content/browser/gpu/gpu_data_manager_impl_private.cc 2015-05-20 11:59:04.537631000 -0400 -@@ -471,7 +471,9 @@ +--- content/browser/gpu/gpu_data_manager_impl_private.cc.orig 2016-03-04 22:36:56.082636647 +0100 ++++ content/browser/gpu/gpu_data_manager_impl_private.cc 2016-03-04 22:37:11.778635557 +0100 +@@ -483,8 +483,10 @@ gpu_info.gl_renderer = gl_renderer; gpu_info.gl_version = gl_version; +#if !defined(OS_FREEBSD) + gpu::IdentifyActiveGPU(&gpu_info); gpu::CollectDriverInfoGL(&gpu_info); +#endif Modified: branches/2016Q1/www/chromium/files/patch-content__browser__indexed_db__indexed_db_backing_store.cc ============================================================================== --- branches/2016Q1/www/chromium/files/patch-content__browser__indexed_db__indexed_db_backing_store.cc Wed Mar 30 09:02:32 2016 (r412161) +++ branches/2016Q1/www/chromium/files/patch-content__browser__indexed_db__indexed_db_backing_store.cc Wed Mar 30 09:09:00 2016 (r412162) @@ -1,9 +1,9 @@ ---- content/browser/indexed_db/indexed_db_backing_store.cc.orig 2014-10-10 09:15:31 UTC -+++ content/browser/indexed_db/indexed_db_backing_store.cc -@@ -2377,7 +2377,7 @@ +--- content/browser/indexed_db/indexed_db_backing_store.cc.orig 2016-03-04 22:40:11.786622515 +0100 ++++ content/browser/indexed_db/indexed_db_backing_store.cc 2016-03-04 22:40:23.035622110 +0100 +@@ -2455,7 +2455,7 @@ // The round-trip can be lossy; round to nearest millisecond. - int64 delta = (descriptor.last_modified() - - info.last_modified).InMilliseconds(); + int64_t delta = + (descriptor.last_modified() - info.last_modified).InMilliseconds(); - if (std::abs(delta) > 1) + if (std::labs(delta) > 1) return false; Modified: branches/2016Q1/www/chromium/files/patch-content__common__sandbox_linux__sandbox_debug_handling_linux.cc ============================================================================== --- branches/2016Q1/www/chromium/files/patch-content__common__sandbox_linux__sandbox_debug_handling_linux.cc Wed Mar 30 09:02:32 2016 (r412161) +++ branches/2016Q1/www/chromium/files/patch-content__common__sandbox_linux__sandbox_debug_handling_linux.cc Wed Mar 30 09:09:00 2016 (r412162) @@ -1,16 +1,16 @@ ---- content/common/sandbox_linux/sandbox_debug_handling_linux.cc.orig 2015-04-19 22:52:03.000000000 +0200 -+++ content/common/sandbox_linux/sandbox_debug_handling_linux.cc 2015-04-19 23:27:21.000000000 +0200 -@@ -6,7 +6,9 @@ - +--- content/common/sandbox_linux/sandbox_debug_handling_linux.cc.orig 2016-03-04 22:42:42.203612627 +0100 ++++ content/common/sandbox_linux/sandbox_debug_handling_linux.cc 2016-03-04 22:43:36.442729525 +0100 +@@ -7,7 +7,9 @@ #include #include + #include +#if 0 // no OS_FREEBSD here? #include +#endif #include #include "base/command_line.h" -@@ -68,12 +70,16 @@ +@@ -69,12 +71,16 @@ return true; } Copied: branches/2016Q1/www/chromium/files/patch-extensions__browser__api__declarative_webrequest__webrequest_action.cc (from r412135, head/www/chromium/files/patch-extensions__browser__api__declarative_webrequest__webrequest_action.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q1/www/chromium/files/patch-extensions__browser__api__declarative_webrequest__webrequest_action.cc Wed Mar 30 09:09:00 2016 (r412162, copy of r412135, head/www/chromium/files/patch-extensions__browser__api__declarative_webrequest__webrequest_action.cc) @@ -0,0 +1,14 @@ +--- extensions/browser/api/declarative_webrequest/webrequest_action.cc.orig 2016-03-05 21:30:23.744503770 +0100 ++++ extensions/browser/api/declarative_webrequest/webrequest_action.cc 2016-03-05 21:30:38.440502352 +0100 +@@ -28,7 +28,11 @@ + #include "net/base/registry_controlled_domains/registry_controlled_domain.h" + #include "net/http/http_util.h" + #include "net/url_request/url_request.h" ++#if defined(OS_BSD) ++#include ++#else + #include "third_party/re2/src/re2/re2.h" ++#endif + + using content::ResourceRequestInfo; + Modified: branches/2016Q1/www/chromium/files/patch-extensions__browser__api__serial__serial_api.cc ============================================================================== --- branches/2016Q1/www/chromium/files/patch-extensions__browser__api__serial__serial_api.cc Wed Mar 30 09:02:32 2016 (r412161) +++ branches/2016Q1/www/chromium/files/patch-extensions__browser__api__serial__serial_api.cc Wed Mar 30 09:09:00 2016 (r412162) @@ -1,16 +1,12 @@ ---- extensions/browser/api/serial/serial_api.cc.orig 2014-10-10 08:54:15 UTC -+++ extensions/browser/api/serial/serial_api.cc -@@ -85,11 +85,13 @@ - void SerialGetDevicesFunction::Work() { +--- extensions/browser/api/serial/serial_api.cc.orig 2016-03-04 22:52:57.757575528 +0100 ++++ extensions/browser/api/serial/serial_api.cc 2016-03-04 22:52:30.452574585 +0100 +@@ -87,7 +87,8 @@ DCHECK_CURRENTLY_ON(BrowserThread::FILE); -+#if !defined(OS_FREEBSD) //XXX(rene) quick hack + // TODO(moshayedi): crbug.com/549257. Add USB support for Aura on Android. +-#if !defined(OS_ANDROID) ++// XXX also, rene's quick hack on FreeBSD ++#if !defined(OS_ANDROID) && !defined(OS_FREEBSD) scoped_ptr enumerator = device::SerialDeviceEnumerator::Create(); mojo::Array devices = enumerator->GetDevices(); - results_ = serial::GetDevices::Results::Create( - devices.To > >()); -+#endif - } - - SerialConnectFunction::SerialConnectFunction() { Copied: branches/2016Q1/www/chromium/files/patch-extensions__browser__api__web_request__form_data_parser.cc (from r412135, head/www/chromium/files/patch-extensions__browser__api__web_request__form_data_parser.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q1/www/chromium/files/patch-extensions__browser__api__web_request__form_data_parser.cc Wed Mar 30 09:09:00 2016 (r412162, copy of r412135, head/www/chromium/files/patch-extensions__browser__api__web_request__form_data_parser.cc) @@ -0,0 +1,14 @@ +--- extensions/browser/api/web_request/form_data_parser.cc.orig 2016-03-05 21:31:37.080498500 +0100 ++++ extensions/browser/api/web_request/form_data_parser.cc 2016-03-05 21:31:50.448497605 +0100 +@@ -15,7 +15,11 @@ + #include "base/values.h" + #include "net/base/escape.h" + #include "net/url_request/url_request.h" ++#if defined(OS_BSD) ++#include ++#else + #include "third_party/re2/src/re2/re2.h" ++#endif + + using base::DictionaryValue; + using base::ListValue; Copied: branches/2016Q1/www/chromium/files/patch-extensions__common__image_util.cc (from r412135, head/www/chromium/files/patch-extensions__common__image_util.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q1/www/chromium/files/patch-extensions__common__image_util.cc Wed Mar 30 09:09:00 2016 (r412162, copy of r412135, head/www/chromium/files/patch-extensions__common__image_util.cc) @@ -0,0 +1,14 @@ +--- extensions/common/image_util.cc.orig 2016-03-05 21:28:20.783511398 +0100 ++++ extensions/common/image_util.cc 2016-03-05 21:28:33.615510847 +0100 +@@ -11,7 +11,11 @@ + #include "base/strings/string_number_conversions.h" + #include "base/strings/string_util.h" + #include "base/strings/stringprintf.h" ++#if defined(OS_BSD) ++#include ++#else + #include "third_party/re2/src/re2/re2.h" ++#endif + #include "third_party/skia/include/core/SkColor.h" + #include "ui/gfx/color_utils.h" + Copied: branches/2016Q1/www/chromium/files/patch-extensions__common__stack_frame.cc (from r412135, head/www/chromium/files/patch-extensions__common__stack_frame.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q1/www/chromium/files/patch-extensions__common__stack_frame.cc Wed Mar 30 09:09:00 2016 (r412162, copy of r412135, head/www/chromium/files/patch-extensions__common__stack_frame.cc) @@ -0,0 +1,14 @@ +--- extensions/common/stack_frame.cc.orig 2016-03-05 21:29:12.679508172 +0100 ++++ extensions/common/stack_frame.cc 2016-03-05 21:29:26.039507364 +0100 +@@ -7,7 +7,11 @@ + #include + + #include "base/strings/utf_string_conversions.h" ++#if defined(OS_BSD) ++#include ++#else + #include "third_party/re2/src/re2/re2.h" ++#endif + + namespace extensions { + Copied: branches/2016Q1/www/chromium/files/patch-gpu__command_buffer__service__program_manager.cc (from r412135, head/www/chromium/files/patch-gpu__command_buffer__service__program_manager.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q1/www/chromium/files/patch-gpu__command_buffer__service__program_manager.cc Wed Mar 30 09:09:00 2016 (r412162, copy of r412135, head/www/chromium/files/patch-gpu__command_buffer__service__program_manager.cc) @@ -0,0 +1,14 @@ +--- gpu/command_buffer/service/program_manager.cc.orig 2016-03-05 21:34:10.137487636 +0100 ++++ gpu/command_buffer/service/program_manager.cc 2016-03-05 21:35:00.089484564 +0100 +@@ -29,7 +29,11 @@ + #include "gpu/command_buffer/service/gpu_switches.h" + #include "gpu/command_buffer/service/program_cache.h" + #include "gpu/command_buffer/service/shader_manager.h" ++#if defined(OS_BSD) ++#include ++#else + #include "third_party/re2/src/re2/re2.h" ++#endif + #include "ui/gl/gl_version_info.h" + + using base::TimeDelta; Modified: branches/2016Q1/www/chromium/files/patch-gpu__config__gpu_control_list.cc ============================================================================== --- branches/2016Q1/www/chromium/files/patch-gpu__config__gpu_control_list.cc Wed Mar 30 09:02:32 2016 (r412161) +++ branches/2016Q1/www/chromium/files/patch-gpu__config__gpu_control_list.cc Wed Mar 30 09:09:00 2016 (r412162) @@ -1,15 +1,14 @@ ---- gpu/config/gpu_control_list.cc.orig 2014-10-10 08:54:15 UTC -+++ gpu/config/gpu_control_list.cc -@@ -1482,10 +1482,10 @@ *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-ports-branches@freebsd.org Thu Mar 31 18:39:30 2016 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5AF13AD6FE3; Thu, 31 Mar 2016 18:39:30 +0000 (UTC) (envelope-from olivierd@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 1A7C110DD; Thu, 31 Mar 2016 18:39:30 +0000 (UTC) (envelope-from olivierd@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u2VIdTID098735; Thu, 31 Mar 2016 18:39:29 GMT (envelope-from olivierd@FreeBSD.org) Received: (from olivierd@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u2VIdT8I098732; Thu, 31 Mar 2016 18:39:29 GMT (envelope-from olivierd@FreeBSD.org) Message-Id: <201603311839.u2VIdT8I098732@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: olivierd set sender to olivierd@FreeBSD.org using -f From: Olivier Duchateau Date: Thu, 31 Mar 2016 18:39:29 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r412283 - in branches/2016Q1/devel/mercurial: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 31 Mar 2016 18:39:30 -0000 Author: olivierd Date: Thu Mar 31 18:39:28 2016 New Revision: 412283 URL: https://svnweb.freebsd.org/changeset/ports/412283 Log: MFH: r405052 r407795 r408138 r410451 r412140 Update to 3.6.3 (regularly bugfix release) Changelog: https://www.mercurial-scm.org/wiki/WhatsNew#Mercurial_3.6.2_.282016-1-1.29 - Update to 3.7 - Remove unneeded patch (about unsafe SSL protocols) Changelog: https://www.mercurial-scm.org/wiki/WhatsNew#Mercurial_3.7_.282016-2-1.29 Update to 3.7.1 (out-of-cycle bugfix release) Changelog: https://www.mercurial-scm.org/wiki/WhatsNew#Mercurial_3.7.1_.282016-2-3.29 Update to 3.7.2 Changelog: https://www.mercurial-scm.org/wiki/WhatsNew#Mercurial_3.7.2_.282016-3-1.29 Update to 2.7.3 Changes: https://www.mercurial-scm.org/wiki/WhatsNew#Mercurial_3.7.3_.282016-3-29.29 Security: e1085b15-f609-11e5-a230-0014a5a57822 Approved by: ports-secteam (erwin@) Deleted: branches/2016Q1/devel/mercurial/files/patch-mercurial_sslutil.py Modified: branches/2016Q1/devel/mercurial/Makefile branches/2016Q1/devel/mercurial/distinfo branches/2016Q1/devel/mercurial/pkg-plist Directory Properties: branches/2016Q1/ (props changed) Modified: branches/2016Q1/devel/mercurial/Makefile ============================================================================== --- branches/2016Q1/devel/mercurial/Makefile Thu Mar 31 18:27:09 2016 (r412282) +++ branches/2016Q1/devel/mercurial/Makefile Thu Mar 31 18:39:28 2016 (r412283) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= mercurial -PORTVERSION= 3.6.2 +PORTVERSION= 3.7.3 CATEGORIES= devel python MASTER_SITES= http://mercurial.selenic.com/release/ Modified: branches/2016Q1/devel/mercurial/distinfo ============================================================================== --- branches/2016Q1/devel/mercurial/distinfo Thu Mar 31 18:27:09 2016 (r412282) +++ branches/2016Q1/devel/mercurial/distinfo Thu Mar 31 18:39:28 2016 (r412283) @@ -1,2 +1,2 @@ -SHA256 (mercurial-3.6.2.tar.gz) = 09c567049c3e30f791db0cf5937346c7ff3568deadf4eb1d4e2f7c80001cb3d6 -SIZE (mercurial-3.6.2.tar.gz) = 4518349 +SHA256 (mercurial-3.7.3.tar.gz) = c099c42d74e2d520b61dd372cd996b0fa7605c06617834fd7b13c79b9a9a5b30 +SIZE (mercurial-3.7.3.tar.gz) = 4636732 Modified: branches/2016Q1/devel/mercurial/pkg-plist ============================================================================== --- branches/2016Q1/devel/mercurial/pkg-plist Thu Mar 31 18:27:09 2016 (r412282) +++ branches/2016Q1/devel/mercurial/pkg-plist Thu Mar 31 18:39:28 2016 (r412283) @@ -14,6 +14,9 @@ bin/hg %%PYTHON_SITELIBDIR%%/hgext/censor.py %%PYTHON_SITELIBDIR%%/hgext/censor.pyc %%PYTHON_SITELIBDIR%%/hgext/censor.pyo +%%PYTHON_SITELIBDIR%%/hgext/chgserver.py +%%PYTHON_SITELIBDIR%%/hgext/chgserver.pyc +%%PYTHON_SITELIBDIR%%/hgext/chgserver.pyo %%PYTHON_SITELIBDIR%%/hgext/children.py %%PYTHON_SITELIBDIR%%/hgext/children.pyc %%PYTHON_SITELIBDIR%%/hgext/children.pyo @@ -152,9 +155,6 @@ bin/hg %%PYTHON_SITELIBDIR%%/hgext/patchbomb.py %%PYTHON_SITELIBDIR%%/hgext/patchbomb.pyc %%PYTHON_SITELIBDIR%%/hgext/patchbomb.pyo -%%PYTHON_SITELIBDIR%%/hgext/progress.py -%%PYTHON_SITELIBDIR%%/hgext/progress.pyc -%%PYTHON_SITELIBDIR%%/hgext/progress.pyo %%PYTHON_SITELIBDIR%%/hgext/purge.py %%PYTHON_SITELIBDIR%%/hgext/purge.pyc %%PYTHON_SITELIBDIR%%/hgext/purge.pyo @@ -323,6 +323,9 @@ bin/hg %%PYTHON_SITELIBDIR%%/mercurial/help/hgignore.5.txt %%PYTHON_SITELIBDIR%%/mercurial/help/hgrc.5.txt %%PYTHON_SITELIBDIR%%/mercurial/help/hgweb.txt +%%PYTHON_SITELIBDIR%%/mercurial/help/internals/bundles.txt +%%PYTHON_SITELIBDIR%%/mercurial/help/internals/changegroups.txt +%%PYTHON_SITELIBDIR%%/mercurial/help/internals/revlogs.txt %%PYTHON_SITELIBDIR%%/mercurial/help/merge-tools.txt %%PYTHON_SITELIBDIR%%/mercurial/help/multirevs.txt %%PYTHON_SITELIBDIR%%/mercurial/help/patterns.txt @@ -465,6 +468,27 @@ bin/hg %%PYTHON_SITELIBDIR%%/mercurial/progress.py %%PYTHON_SITELIBDIR%%/mercurial/progress.pyc %%PYTHON_SITELIBDIR%%/mercurial/progress.pyo +%%PYTHON_SITELIBDIR%%/mercurial/pure/__init__.py +%%PYTHON_SITELIBDIR%%/mercurial/pure/__init__.pyc +%%PYTHON_SITELIBDIR%%/mercurial/pure/__init__.pyo +%%PYTHON_SITELIBDIR%%/mercurial/pure/base85.py +%%PYTHON_SITELIBDIR%%/mercurial/pure/base85.pyc +%%PYTHON_SITELIBDIR%%/mercurial/pure/base85.pyo +%%PYTHON_SITELIBDIR%%/mercurial/pure/bdiff.py +%%PYTHON_SITELIBDIR%%/mercurial/pure/bdiff.pyc +%%PYTHON_SITELIBDIR%%/mercurial/pure/bdiff.pyo +%%PYTHON_SITELIBDIR%%/mercurial/pure/diffhelpers.py +%%PYTHON_SITELIBDIR%%/mercurial/pure/diffhelpers.pyc +%%PYTHON_SITELIBDIR%%/mercurial/pure/diffhelpers.pyo +%%PYTHON_SITELIBDIR%%/mercurial/pure/mpatch.py +%%PYTHON_SITELIBDIR%%/mercurial/pure/mpatch.pyc +%%PYTHON_SITELIBDIR%%/mercurial/pure/mpatch.pyo +%%PYTHON_SITELIBDIR%%/mercurial/pure/osutil.py +%%PYTHON_SITELIBDIR%%/mercurial/pure/osutil.pyc +%%PYTHON_SITELIBDIR%%/mercurial/pure/osutil.pyo +%%PYTHON_SITELIBDIR%%/mercurial/pure/parsers.py +%%PYTHON_SITELIBDIR%%/mercurial/pure/parsers.pyc +%%PYTHON_SITELIBDIR%%/mercurial/pure/parsers.pyo %%PYTHON_SITELIBDIR%%/mercurial/pushkey.py %%PYTHON_SITELIBDIR%%/mercurial/pushkey.pyc %%PYTHON_SITELIBDIR%%/mercurial/pushkey.pyo @@ -474,6 +498,9 @@ bin/hg %%PYTHON_SITELIBDIR%%/mercurial/py3kcompat.py %%PYTHON_SITELIBDIR%%/mercurial/py3kcompat.pyc %%PYTHON_SITELIBDIR%%/mercurial/py3kcompat.pyo +%%PYTHON_SITELIBDIR%%/mercurial/registrar.py +%%PYTHON_SITELIBDIR%%/mercurial/registrar.pyc +%%PYTHON_SITELIBDIR%%/mercurial/registrar.pyo %%PYTHON_SITELIBDIR%%/mercurial/repair.py %%PYTHON_SITELIBDIR%%/mercurial/repair.pyc %%PYTHON_SITELIBDIR%%/mercurial/repair.pyo From owner-svn-ports-branches@freebsd.org Sat Apr 2 09:13:41 2016 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 873F4B0056D; Sat, 2 Apr 2016 09:13:41 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 3E5931C3F; Sat, 2 Apr 2016 09:13:41 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u329Deoj021152; Sat, 2 Apr 2016 09:13:40 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u329Dew3021151; Sat, 2 Apr 2016 09:13:40 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201604020913.u329Dew3021151@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Sat, 2 Apr 2016 09:13:40 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r412397 - branches/2016Q2 X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 02 Apr 2016 09:13:41 -0000 Author: bapt Date: Sat Apr 2 09:13:40 2016 New Revision: 412397 URL: https://svnweb.freebsd.org/changeset/ports/412397 Log: Create branch for 2016Q2 Added: branches/2016Q2/ - copied from r412396, head/ From owner-svn-ports-branches@freebsd.org Sat Apr 2 12:52:10 2016 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 42EA4B00A73; Sat, 2 Apr 2016 12:52:10 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 10936117B; Sat, 2 Apr 2016 12:52:09 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u32Cq97f087097; Sat, 2 Apr 2016 12:52:09 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u32Cq9rZ087095; Sat, 2 Apr 2016 12:52:09 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201604021252.u32Cq9rZ087095@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Sat, 2 Apr 2016 12:52:09 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r412404 - branches/2016Q2/ports-mgmt/pkg X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 02 Apr 2016 12:52:10 -0000 Author: bapt Date: Sat Apr 2 12:52:08 2016 New Revision: 412404 URL: https://svnweb.freebsd.org/changeset/ports/412404 Log: MFH: r412403 Update to 1.7.1 This release fixes regressions: - detection of new version of pkg could fail - if the all process operation would have an inpact of less than 1MB on the FS then the action is proceed with out asking the user to acknowledge it Approved by: bapt (with portmgr hat) Modified: branches/2016Q2/ports-mgmt/pkg/Makefile branches/2016Q2/ports-mgmt/pkg/distinfo Directory Properties: branches/2016Q2/ (props changed) Modified: branches/2016Q2/ports-mgmt/pkg/Makefile ============================================================================== --- branches/2016Q2/ports-mgmt/pkg/Makefile Sat Apr 2 12:51:08 2016 (r412403) +++ branches/2016Q2/ports-mgmt/pkg/Makefile Sat Apr 2 12:52:08 2016 (r412404) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= pkg -DISTVERSION= 1.7.0 +DISTVERSION= 1.7.1 _PKG_VERSION= ${DISTVERSION} CATEGORIES= ports-mgmt MASTER_SITES= \ Modified: branches/2016Q2/ports-mgmt/pkg/distinfo ============================================================================== --- branches/2016Q2/ports-mgmt/pkg/distinfo Sat Apr 2 12:51:08 2016 (r412403) +++ branches/2016Q2/ports-mgmt/pkg/distinfo Sat Apr 2 12:52:08 2016 (r412404) @@ -1,2 +1,2 @@ -SHA256 (pkg-1.7.0.tar.xz) = 967394ebc08924b452f2efa0a1b993b81fa868ce70dbc0764280979c6e6942d8 -SIZE (pkg-1.7.0.tar.xz) = 1908468 +SHA256 (pkg-1.7.1.tar.xz) = c82f668ea6f25d253a5485ed28ba3b54e019a53decf5a1dc7736e45613f1202d +SIZE (pkg-1.7.1.tar.xz) = 1943816 From owner-svn-ports-branches@freebsd.org Sat Apr 2 16:18:09 2016 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1E3FAAEB963; Sat, 2 Apr 2016 16:18:09 +0000 (UTC) (envelope-from antoine@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 E2D78186F; Sat, 2 Apr 2016 16:18:08 +0000 (UTC) (envelope-from antoine@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u32GI8Ap048752; Sat, 2 Apr 2016 16:18:08 GMT (envelope-from antoine@FreeBSD.org) Received: (from antoine@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u32GI8ae048751; Sat, 2 Apr 2016 16:18:08 GMT (envelope-from antoine@FreeBSD.org) Message-Id: <201604021618.u32GI8ae048751@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: antoine set sender to antoine@FreeBSD.org using -f From: Antoine Brodin Date: Sat, 2 Apr 2016 16:18:08 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r412415 - branches/2016Q2/misc/teslams X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 02 Apr 2016 16:18:09 -0000 Author: antoine Date: Sat Apr 2 16:18:07 2016 New Revision: 412415 URL: https://svnweb.freebsd.org/changeset/ports/412415 Log: MFH: r412414 Mark BROKEN: tries to download from registry.npmjs.org during stage phase npm ERR! argv "/usr/local/bin/node" "/usr/local/bin/npm" "install" "/wrkdirs/usr/ports/misc/teslams/work/teslams-6f6dfa2" npm ERR! node v5.9.1 npm ERR! npm v2.14.7 npm ERR! code EAI_FAIL npm ERR! errno EAI_FAIL npm ERR! syscall getaddrinfo npm ERR! network getaddrinfo EAI_FAIL registry.npmjs.org:443 Reported by: pkg-fallout Modified: branches/2016Q2/misc/teslams/Makefile Directory Properties: branches/2016Q2/ (props changed) Modified: branches/2016Q2/misc/teslams/Makefile ============================================================================== --- branches/2016Q2/misc/teslams/Makefile Sat Apr 2 16:16:43 2016 (r412414) +++ branches/2016Q2/misc/teslams/Makefile Sat Apr 2 16:18:07 2016 (r412415) @@ -13,6 +13,8 @@ COMMENT= Node.js implementation of Tesla LICENSE= BSD2CLAUSE BSD3CLAUSE APACHE20 MIT ISCL LICENSE_COMB= multi +BROKEN= tries to download from registry.npmjs.org during stage phase + BUILD_DEPENDS= npm>=0:www/npm RUN_DEPENDS= npm>=0:www/npm From owner-svn-ports-branches@freebsd.org Sat Apr 2 19:03:12 2016 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 54FB0AEC8C6; Sat, 2 Apr 2016 19:03:12 +0000 (UTC) (envelope-from rakuco@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 250241305; Sat, 2 Apr 2016 19:03:12 +0000 (UTC) (envelope-from rakuco@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u32J3BFF001199; Sat, 2 Apr 2016 19:03:11 GMT (envelope-from rakuco@FreeBSD.org) Received: (from rakuco@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u32J3BtV001198; Sat, 2 Apr 2016 19:03:11 GMT (envelope-from rakuco@FreeBSD.org) Message-Id: <201604021903.u32J3BtV001198@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rakuco set sender to rakuco@FreeBSD.org using -f From: Raphael Kubo da Costa Date: Sat, 2 Apr 2016 19:03:11 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r412430 - branches/2016Q2/graphics/kipi-plugins-kde4 X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 02 Apr 2016 19:03:12 -0000 Author: rakuco Date: Sat Apr 2 19:03:11 2016 New Revision: 412430 URL: https://svnweb.freebsd.org/changeset/ports/412430 Log: MFH: r412429 Fix the dependencies for the DOCS and NLS options. The current code was a no-op because it was left out of the options helper conversion in r340628. Approved by: portmgr blanket approval Modified: branches/2016Q2/graphics/kipi-plugins-kde4/Makefile Directory Properties: branches/2016Q2/ (props changed) Modified: branches/2016Q2/graphics/kipi-plugins-kde4/Makefile ============================================================================== --- branches/2016Q2/graphics/kipi-plugins-kde4/Makefile Sat Apr 2 19:02:15 2016 (r412429) +++ branches/2016Q2/graphics/kipi-plugins-kde4/Makefile Sat Apr 2 19:03:11 2016 (r412430) @@ -2,6 +2,7 @@ PORTNAME= kipi-plugins PORTVERSION= ${DIGIKAM_VER} +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= graphics kde DISTFILES= # @@ -27,7 +28,7 @@ ${plugin:tu}_DESC= ${${plugin}_DESC} ${plugin:tu}_RUN_DEPENDS= kipi-plugin-${plugin}>=${DIGIKAM_VER}:graphics/kipi-plugin-${plugin} .endfor -NLS_DEP= digikam-l10n>=${DIGIKAM_VER}:graphics/digikam-kde4-l10n -DOCS_DEP= digikam-doc>=${DIGIKAM_VER}:graphics/digikam-kde4-doc +NLS_RUN_DEPENDS= digikam-kde4-l10n>=${DIGIKAM_VER}:graphics/digikam-kde4-l10n +DOCS_RUN_DEPENDS= digikam-kde4-doc>=${DIGIKAM_VER}:graphics/digikam-kde4-doc .include