Index: www/chromium/Makefile =================================================================== --- www/chromium/Makefile (revision 449598) +++ www/chromium/Makefile (working copy) @@ -3,7 +3,7 @@ PORTNAME= chromium PORTVERSION= 60.0.3112.113 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES?= www MASTER_SITES= https://commondatastorage.googleapis.com/chromium-browser-official/ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} @@ -201,6 +201,9 @@ # Work around base r261801 .if ${OPSYS} == FreeBSD && ${OSVERSION} < 1100508 GN_ARGS+= extra_cxxflags="-D_LIBCPP_TRIVIAL_PAIR_COPY_CTOR=1" +EXTRA_PATCHES+= ${FILESDIR}/extra-patch-libc++-old +.else +EXTRA_PATCHES+= ${FILESDIR}/extra-patch-libc++-new .endif .if !defined(GN_ONLY) Index: www/chromium/files/extra-patch-libc++-new =================================================================== --- www/chromium/files/extra-patch-libc++-new (nonexistent) +++ www/chromium/files/extra-patch-libc++-new (working copy) @@ -0,0 +1,100 @@ +--- tools/gn/bootstrap/bootstrap.py.orig 2017-08-03 00:05:40.000000000 +0200 ++++ tools/gn/bootstrap/bootstrap.py 2017-08-09 23:59:54.024577000 +0200 +@@ -23,6 +23,7 @@ + import shutil + import subprocess + import sys ++import platform + import tempfile + + BOOTSTRAP_DIR = os.path.dirname(os.path.abspath(__file__)) +@@ -31,9 +32,10 @@ + + is_win = sys.platform.startswith('win') + is_linux = sys.platform.startswith('linux') ++is_bsd = platform.system().lower().endswith('bsd') + is_mac = sys.platform.startswith('darwin') + is_aix = sys.platform.startswith('aix') +-is_posix = is_linux or is_mac or is_aix ++is_posix = is_linux or is_mac or is_aix or is_bsd + + def check_call(cmd, **kwargs): + logging.debug('Running: %s', ' '.join(cmd)) +@@ -627,7 +629,7 @@ + 'cflags': cflags + ['-DHAVE_CONFIG_H'], + } + +- if is_linux or is_aix: ++ if is_linux or is_aix or is_bsd: + ldflags.extend(['-pthread']) + + static_libraries['xdg_user_dirs'] = { +@@ -642,16 +644,45 @@ + 'base/memory/shared_memory_tracker.cc', + 'base/nix/xdg_util.cc', + 'base/process/internal_linux.cc', +- 'base/process/memory_linux.cc', ++ #'base/process/memory_linux.cc', + 'base/process/process_handle_linux.cc', + 'base/process/process_info_linux.cc', +- 'base/process/process_iterator_linux.cc', +- 'base/process/process_linux.cc', +- 'base/process/process_metrics_linux.cc', ++ #'base/process/process_iterator_linux.cc', ++ #'base/process/process_linux.cc', ++ #'base/process/process_metrics_linux.cc', + 'base/strings/sys_string_conversions_posix.cc', +- 'base/sys_info_linux.cc', ++ #'base/sys_info_linux.cc', + 'base/threading/platform_thread_linux.cc', + ]) ++ if is_bsd: ++ libs.extend(['-lexecinfo', '-lkvm']) ++ ldflags.extend(['-pthread']) ++ ++ static_libraries['xdg_user_dirs'] = { ++ 'sources': [ ++ 'base/third_party/xdg_user_dirs/xdg_user_dir_lookup.cc', ++ ], ++ 'tool': 'cxx', ++ } ++ static_libraries['base']['sources'].extend([ ++ 'base/allocator/allocator_shim.cc', ++ 'base/allocator/allocator_shim_default_dispatch_to_glibc.cc', ++ 'base/process/process_handle_' + platform.system().lower() + '.cc', ++ 'base/process/process_iterator_' + platform.system().lower() + '.cc', ++ 'base/process/process_metrics_'+ platform.system().lower() + '.cc', ++ 'base/sys_info_' + platform.system().lower() + '.cc', ++ 'base/task_scheduler/environment_config.cc', ++ ]) ++ static_libraries['libevent']['include_dirs'].extend([ ++ os.path.join(SRC_ROOT, 'base', 'third_party', 'libevent', 'freebsd') ++ ]) ++ static_libraries['libevent']['sources'].extend([ ++ 'base/third_party/libevent/kqueue.c', ++ ]) ++ ++ # Suppressing warnings ++ cflags.extend(['-Wno-deprecated-register', '-Wno-parentheses-equality']) ++ + if is_linux: + static_libraries['base']['sources'].extend([ + 'base/allocator/allocator_shim.cc', +@@ -663,17 +694,6 @@ + ]) + static_libraries['libevent']['sources'].extend([ + 'base/third_party/libevent/epoll.c', +- ]) +- else: +- libs.extend(['-lrt']) +- static_libraries['base']['sources'].extend([ +- 'base/process/internal_aix.cc' +- ]) +- static_libraries['libevent']['include_dirs'].extend([ +- os.path.join(SRC_ROOT, 'base', 'third_party', 'libevent', 'aix') +- ]) +- static_libraries['libevent']['include_dirs'].extend([ +- os.path.join(SRC_ROOT, 'base', 'third_party', 'libevent', 'compat') + ]) + + if is_mac: Property changes on: www/chromium/files/extra-patch-libc++-new ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: www/chromium/files/extra-patch-libc++-old =================================================================== --- www/chromium/files/extra-patch-libc++-old (nonexistent) +++ www/chromium/files/extra-patch-libc++-old (working copy) @@ -0,0 +1,101 @@ +--- tools/gn/bootstrap/bootstrap.py.orig 2017-08-24 21:05:45.000000000 +0200 ++++ tools/gn/bootstrap/bootstrap.py 2017-09-11 04:04:14.686296000 +0200 +@@ -23,6 +23,7 @@ + import shutil + import subprocess + import sys ++import platform + import tempfile + + BOOTSTRAP_DIR = os.path.dirname(os.path.abspath(__file__)) +@@ -31,9 +32,10 @@ + + is_win = sys.platform.startswith('win') + is_linux = sys.platform.startswith('linux') ++is_bsd = platform.system().lower().endswith('bsd') + is_mac = sys.platform.startswith('darwin') + is_aix = sys.platform.startswith('aix') +-is_posix = is_linux or is_mac or is_aix ++is_posix = is_linux or is_mac or is_aix or is_bsd + + def check_call(cmd, **kwargs): + logging.debug('Running: %s', ' '.join(cmd)) +@@ -627,7 +629,7 @@ + 'cflags': cflags + ['-DHAVE_CONFIG_H'], + } + +- if is_linux or is_aix: ++ if is_linux or is_aix or is_bsd: + ldflags.extend(['-pthread']) + + static_libraries['xdg_user_dirs'] = { +@@ -642,16 +644,46 @@ + 'base/memory/shared_memory_tracker.cc', + 'base/nix/xdg_util.cc', + 'base/process/internal_linux.cc', +- 'base/process/memory_linux.cc', ++ #'base/process/memory_linux.cc', + 'base/process/process_handle_linux.cc', + 'base/process/process_info_linux.cc', +- 'base/process/process_iterator_linux.cc', +- 'base/process/process_linux.cc', +- 'base/process/process_metrics_linux.cc', ++ #'base/process/process_iterator_linux.cc', ++ #'base/process/process_linux.cc', ++ #'base/process/process_metrics_linux.cc', + 'base/strings/sys_string_conversions_posix.cc', +- 'base/sys_info_linux.cc', ++ #'base/sys_info_linux.cc', + 'base/threading/platform_thread_linux.cc', + ]) ++ if is_bsd: ++ libs.extend(['-lexecinfo', '-lkvm']) ++ ldflags.extend(['-pthread']) ++ ++ static_libraries['xdg_user_dirs'] = { ++ 'sources': [ ++ 'base/third_party/xdg_user_dirs/xdg_user_dir_lookup.cc', ++ ], ++ 'tool': 'cxx', ++ } ++ static_libraries['base']['sources'].extend([ ++ 'base/allocator/allocator_shim.cc', ++ 'base/allocator/allocator_shim_default_dispatch_to_glibc.cc', ++ 'base/process/process_handle_' + platform.system().lower() + '.cc', ++ 'base/process/process_iterator_' + platform.system().lower() + '.cc', ++ 'base/process/process_metrics_'+ platform.system().lower() + '.cc', ++ 'base/sys_info_' + platform.system().lower() + '.cc', ++ 'base/task_scheduler/environment_config.cc', ++ ]) ++ static_libraries['libevent']['include_dirs'].extend([ ++ os.path.join(SRC_ROOT, 'base', 'third_party', 'libevent', 'freebsd') ++ ]) ++ static_libraries['libevent']['sources'].extend([ ++ 'base/third_party/libevent/kqueue.c', ++ ]) ++ ++ # Suppressing warnings ++ cflags.extend(['-Wno-deprecated-register', '-Wno-parentheses-equality']) ++ cflags_cc.extend(['-D_LIBCPP_TRIVIAL_PAIR_COPY_CTOR=1']) ++ + if is_linux: + static_libraries['base']['sources'].extend([ + 'base/allocator/allocator_shim.cc', +@@ -663,17 +695,6 @@ + ]) + static_libraries['libevent']['sources'].extend([ + 'base/third_party/libevent/epoll.c', +- ]) +- else: +- libs.extend(['-lrt']) +- static_libraries['base']['sources'].extend([ +- 'base/process/internal_aix.cc' +- ]) +- static_libraries['libevent']['include_dirs'].extend([ +- os.path.join(SRC_ROOT, 'base', 'third_party', 'libevent', 'aix') +- ]) +- static_libraries['libevent']['include_dirs'].extend([ +- os.path.join(SRC_ROOT, 'base', 'third_party', 'libevent', 'compat') + ]) + + if is_mac: Property changes on: www/chromium/files/extra-patch-libc++-old ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: www/chromium/files/patch-base_task_scheduler_delayed_task_manager.cc =================================================================== --- www/chromium/files/patch-base_task_scheduler_delayed_task_manager.cc (revision 449598) +++ www/chromium/files/patch-base_task_scheduler_delayed_task_manager.cc (nonexistent) @@ -1,12 +0,0 @@ ---- base/task_scheduler/delayed_task_manager.cc.orig 2017-08-10 23:52:26.912451000 +0200 -+++ base/task_scheduler/delayed_task_manager.cc 2017-08-11 00:22:09.125479000 +0200 -@@ -70,9 +70,6 @@ - if (started_.IsSet()) { - AddDelayedTaskNow(std::move(task), delay, - std::move(post_task_now_callback)); -- } else { -- tasks_added_before_start_.push_back( -- {std::move(task), std::move(post_task_now_callback)}); - } - } - } Property changes on: www/chromium/files/patch-base_task_scheduler_delayed_task_manager.cc ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: www/chromium/files/patch-tools_gn_bootstrap_bootstrap.py =================================================================== --- www/chromium/files/patch-tools_gn_bootstrap_bootstrap.py (revision 449598) +++ www/chromium/files/patch-tools_gn_bootstrap_bootstrap.py (nonexistent) @@ -1,100 +0,0 @@ ---- tools/gn/bootstrap/bootstrap.py.orig 2017-08-03 00:05:40.000000000 +0200 -+++ tools/gn/bootstrap/bootstrap.py 2017-08-09 23:59:54.024577000 +0200 -@@ -23,6 +23,7 @@ - import shutil - import subprocess - import sys -+import platform - import tempfile - - BOOTSTRAP_DIR = os.path.dirname(os.path.abspath(__file__)) -@@ -31,9 +32,10 @@ - - is_win = sys.platform.startswith('win') - is_linux = sys.platform.startswith('linux') -+is_bsd = platform.system().lower().endswith('bsd') - is_mac = sys.platform.startswith('darwin') - is_aix = sys.platform.startswith('aix') --is_posix = is_linux or is_mac or is_aix -+is_posix = is_linux or is_mac or is_aix or is_bsd - - def check_call(cmd, **kwargs): - logging.debug('Running: %s', ' '.join(cmd)) -@@ -627,7 +629,7 @@ - 'cflags': cflags + ['-DHAVE_CONFIG_H'], - } - -- if is_linux or is_aix: -+ if is_linux or is_aix or is_bsd: - ldflags.extend(['-pthread']) - - static_libraries['xdg_user_dirs'] = { -@@ -642,16 +644,45 @@ - 'base/memory/shared_memory_tracker.cc', - 'base/nix/xdg_util.cc', - 'base/process/internal_linux.cc', -- 'base/process/memory_linux.cc', -+ #'base/process/memory_linux.cc', - 'base/process/process_handle_linux.cc', - 'base/process/process_info_linux.cc', -- 'base/process/process_iterator_linux.cc', -- 'base/process/process_linux.cc', -- 'base/process/process_metrics_linux.cc', -+ #'base/process/process_iterator_linux.cc', -+ #'base/process/process_linux.cc', -+ #'base/process/process_metrics_linux.cc', - 'base/strings/sys_string_conversions_posix.cc', -- 'base/sys_info_linux.cc', -+ #'base/sys_info_linux.cc', - 'base/threading/platform_thread_linux.cc', - ]) -+ if is_bsd: -+ libs.extend(['-lexecinfo', '-lkvm']) -+ ldflags.extend(['-pthread']) -+ -+ static_libraries['xdg_user_dirs'] = { -+ 'sources': [ -+ 'base/third_party/xdg_user_dirs/xdg_user_dir_lookup.cc', -+ ], -+ 'tool': 'cxx', -+ } -+ static_libraries['base']['sources'].extend([ -+ 'base/allocator/allocator_shim.cc', -+ 'base/allocator/allocator_shim_default_dispatch_to_glibc.cc', -+ 'base/process/process_handle_' + platform.system().lower() + '.cc', -+ 'base/process/process_iterator_' + platform.system().lower() + '.cc', -+ 'base/process/process_metrics_'+ platform.system().lower() + '.cc', -+ 'base/sys_info_' + platform.system().lower() + '.cc', -+ 'base/task_scheduler/environment_config.cc', -+ ]) -+ static_libraries['libevent']['include_dirs'].extend([ -+ os.path.join(SRC_ROOT, 'base', 'third_party', 'libevent', 'freebsd') -+ ]) -+ static_libraries['libevent']['sources'].extend([ -+ 'base/third_party/libevent/kqueue.c', -+ ]) -+ -+ # Suppressing warnings -+ cflags.extend(['-Wno-deprecated-register', '-Wno-parentheses-equality']) -+ - if is_linux: - static_libraries['base']['sources'].extend([ - 'base/allocator/allocator_shim.cc', -@@ -663,17 +694,6 @@ - ]) - static_libraries['libevent']['sources'].extend([ - 'base/third_party/libevent/epoll.c', -- ]) -- else: -- libs.extend(['-lrt']) -- static_libraries['base']['sources'].extend([ -- 'base/process/internal_aix.cc' -- ]) -- static_libraries['libevent']['include_dirs'].extend([ -- os.path.join(SRC_ROOT, 'base', 'third_party', 'libevent', 'aix') -- ]) -- static_libraries['libevent']['include_dirs'].extend([ -- os.path.join(SRC_ROOT, 'base', 'third_party', 'libevent', 'compat') - ]) - - if is_mac: Property changes on: www/chromium/files/patch-tools_gn_bootstrap_bootstrap.py ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property