On Tue, 13 Aug 2013, David Coppa wrote:
> Hi Robert,
>
> You're doing a couple of ${SUBST_CMD} at pre-configure stage, but the
> paths are already "substituted": check
> patches/patch-webkit_plugins_npapi_plugin_list_posix_cc and
> patches/patch-build_linux_unbundle_replace_gyp_files_py...
>
> cheers!
> David
Ok for the diff below?
Index: Makefile
===================================================================
RCS file: /cvs/ports/www/chromium/Makefile,v
retrieving revision 1.147
diff -u -p -u -p -r1.147 Makefile
--- Makefile 8 Aug 2013 11:52:51 -0000 1.147
+++ Makefile 16 Aug 2013 10:19:49 -0000
@@ -124,9 +124,10 @@ GYP_DEFS+= -Dffmpeg_branding=Chrome \
-Dproprietary_codecs=1
.endif
+MODPY_ADJ_FILES=build/linux/unbundle/replace_gyp_files.py
+
pre-configure:
- ${SUBST_CMD} ${WRKSRC}/webkit/plugins/npapi/plugin_list_posix.cc \
- ${WRKSRC}/build/linux/unbundle/replace_gyp_files.py
+ ${SUBST_CMD} ${WRKSRC}/webkit/plugins/npapi/plugin_list_posix.cc
@ln -sf ${MODPY_BIN} ${WRKDIR}/bin/python
.for _arch in x64 ia32
@cp -pR
${WRKSRC}/third_party/ffmpeg/chromium/config/Chrome/linux/${_arch}/libavutil \
Index: patches/patch-build_linux_unbundle_replace_gyp_files_py
===================================================================
RCS file: patches/patch-build_linux_unbundle_replace_gyp_files_py
diff -N patches/patch-build_linux_unbundle_replace_gyp_files_py
--- patches/patch-build_linux_unbundle_replace_gyp_files_py 15 Jul 2013
14:59:30 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,9 +0,0 @@
-$OpenBSD: patch-build_linux_unbundle_replace_gyp_files_py,v 1.1 2013/07/15
14:59:30 robert Exp $
---- build/linux/unbundle/replace_gyp_files.py.orig.port Sat Jul 13
17:03:02 2013
-+++ build/linux/unbundle/replace_gyp_files.py Sun Jul 14 10:52:16 2013
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python2.7
- # Copyright 2013 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.
Index: patches/patch-webkit_plugins_npapi_plugin_list_posix_cc
===================================================================
RCS file:
/cvs/ports/www/chromium/patches/patch-webkit_plugins_npapi_plugin_list_posix_cc,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 patch-webkit_plugins_npapi_plugin_list_posix_cc
--- patches/patch-webkit_plugins_npapi_plugin_list_posix_cc 3 Apr 2013
08:19:10 -0000 1.4
+++ patches/patch-webkit_plugins_npapi_plugin_list_posix_cc 16 Aug 2013
10:19:51 -0000
@@ -6,7 +6,7 @@ $OpenBSD: patch-webkit_plugins_npapi_plu
// This varies across different browsers and versions, so check 'em all.
plugin_dirs->push_back(base::FilePath("/usr/lib/browser-plugins"));
- plugin_dirs->push_back(base::FilePath("/usr/lib/mozilla/plugins"));
-+ plugin_dirs->push_back(base::FilePath("/usr/local/lib/mozilla/plugins"));
++ plugin_dirs->push_back(base::FilePath("${LOCALBASE}/lib/mozilla/plugins"));
plugin_dirs->push_back(base::FilePath("/usr/lib/firefox/plugins"));
plugin_dirs->push_back(base::FilePath("/usr/lib/xulrunner-addons/plugins"));
