[NaCl SDK] Remove references to naclports bundle

CQ_EXTRA_TRYBOTS=tryserver.chromium.linux:linux_nacl_sdk;tryserver.chromium.mac:mac_nacl_sdk;tryserver.chromium.win:win_nacl_sdk

Review URL: https://codereview.chromium.org/1531683006

Cr-Commit-Position: refs/heads/master@{#366028}

20 files changed, 51 insertions, 77 deletions

diff --git a/native_client_sdk/doc_generated/cds2014/python.html b/native_client_sdk/doc_generated/cds2014/python.html
index a26bd35..59f80a5 100644
--- a/native_client_sdk/doc_generated/cds2014/python.html
+++ b/native_client_sdk/doc_generated/cds2014/python.html
@@ -221,7 +221,7 @@ and our Python port.</p>
 <p>The same approach to deploying Python apps can be used for the other
 interpreted languages that have been ported to PNaCl.</p>
 <p>Check out the range of interpreters, libraries, and tools
-<a class="reference external" href="https://code.google.com/p/naclports/wiki/PortList">already ported to PNaCl and ready to be integrated with your Web App</a>.</p>
+<a class="reference external" href="https://chromium.googlesource.com/webports/+/master/docs/port_list.md">already ported to PNaCl and ready to be integrated with your Web App</a>.</p>
 <p>While our in-browser environment is rapidly evolving
 to become a complete development solution,
 for the broadest range of development options, check out the
diff --git a/native_client_sdk/doc_generated/devguide/devcycle/building.html b/native_client_sdk/doc_generated/devguide/devcycle/building.html
index 12f540f..0868816 100644
--- a/native_client_sdk/doc_generated/devguide/devcycle/building.html
+++ b/native_client_sdk/doc_generated/devguide/devcycle/building.html
@@ -481,9 +481,9 @@ newlib toolchain are in <code>toolchain/win_x86_newlib/x86_64-nacl/lib64</code>.
 <li>ARM toolchain: <code>toolchain/&lt;platform&gt;_arm_&lt;c_library&gt;/arm-nacl/include</code></li>
 </ul>
 <p>Many other libraries have been ported for use with Native Client; for more
-information, see the <a class="reference external" href="http://code.google.com/p/naclports/">naclports</a>
+information, see the <a class="reference external" href="https://chromium.googlesource.com/webports">webports</a>
 project. If you port an open-source library for your own use, we recommend
-adding it to naclports.</p>
+adding it to webports.</p>
 <p>Besides the standard libraries, the SDK includes Pepper libraries.
 The PNaCl Pepper libraries are located in the the
 <code>nacl_sdk/pepper_&lt;version&gt;/lib/pnacl/&lt;Release or Debug&gt;</code> directory.
@@ -524,7 +524,7 @@ how to use ppapi_simple, <code>see examples/tutorial/using_ppapi_simple</code>.<
 <li>Since the Native Client toolchains use their own library and header search
 paths, the tools won&#8217;t find third-party libraries you use in your
 non-Native-Client development. If you want to use a specific third-party
-library for Native Client development, look for it in <a class="reference external" href="http://code.google.com/p/naclports/">naclports</a>, or port the library yourself.</li>
+library for Native Client development, look for it in <a class="reference external" href="https://chromium.googlesource.com/webports">webports</a>, or port the library yourself.</li>
 <li>The order in which you list libraries in your build commands is important,
 since the linker searches and processes libraries in the order in which they
 are specified. See the <code>\*_LDFLAGS</code> variables in the Makefiles of the SDK
diff --git a/native_client_sdk/doc_generated/devguide/devcycle/dynamic-loading.html b/native_client_sdk/doc_generated/devguide/devcycle/dynamic-loading.html
index 0c525b1..5ee1f1a 100644
--- a/native_client_sdk/doc_generated/devguide/devcycle/dynamic-loading.html
+++ b/native_client_sdk/doc_generated/devguide/devcycle/dynamic-loading.html
@@ -316,8 +316,9 @@ the list of shared library dependencies using tools such as <code>objdump_</code
 executable code modules that the application directly depends on, including
 modules from the application itself (<code>.nexe</code> and <code>.so</code> files), modules from
 the Native Client SDK (e.g., <code>libppapi_cpp.so</code>), and perhaps also modules from
-<a class="reference external" href="http://code.google.com/p/naclports/">naclports</a> or from <a class="reference external" href="../../community/middleware">middleware systems</a> that the application uses. You must provide all
-of those modules as part of the application deployment process.</p>
+<a class="reference external" href="https://chromium.googlesource.com/webports">webports</a> or from <a class="reference external" href="../../community/middleware">middleware
+systems</a> that the application uses. You must
+provide all of those modules as part of the application deployment process.</p>
 <p>As explained in <a class="reference internal" href="/native-client/devguide/distributing.html"><em>Distributing Your Application</em></a>, there
 are two basic ways to deploy a <a class="reference external" href="/apps">Chrome app</a>:</p>
 <ul class="small-gap">
diff --git a/native_client_sdk/doc_generated/devguide/tutorial/tutorial-part1.html b/native_client_sdk/doc_generated/devguide/tutorial/tutorial-part1.html
index 4892aeb..83e692c 100644
--- a/native_client_sdk/doc_generated/devguide/tutorial/tutorial-part1.html
+++ b/native_client_sdk/doc_generated/devguide/tutorial/tutorial-part1.html
@@ -230,10 +230,10 @@ directory) to learn additional techniques for writing Native Client
 applications and using the Pepper APIs.</li>
 <li>See the <a class="reference internal" href="/native-client/devguide/devcycle/building.html"><em>Building</em></a>, <a class="reference internal" href="/native-client/devguide/devcycle/running.html"><em>Running</em></a>, and <a class="reference internal" href="/native-client/devguide/devcycle/debugging.html"><em>Debugging pages</em></a> for information about how to build, run, and
 debug Native Client applications.</li>
-<li>Check the <a class="reference external" href="http://code.google.com/p/naclports/">naclports</a> project to see
-what libraries have been ported for use with Native Client. If you port an
-open-source library for your own use, we recommend adding it to naclports
-(see <a class="reference external" href="http://code.google.com/p/naclports/wiki/HowTo_Checkin">How to check code into naclports</a>).</li>
+<li>Check the <a class="reference external" href="https://chromium.googlesource.com/webports">webports</a> project to
+see what libraries have been ported for use with Native Client. If you port an
+open-source library for your own use, we recommend adding it to webports
+(see <a class="reference external" href="https://chromium.googlesource.com/webports/+/master/CONTRIBUTING.md">How to check code into webports</a>).</li>
 </ul>
 </section>
 
diff --git a/native_client_sdk/doc_generated/faq.html b/native_client_sdk/doc_generated/faq.html
index 8b05b15..8c158e2 100644
--- a/native_client_sdk/doc_generated/faq.html
+++ b/native_client_sdk/doc_generated/faq.html
@@ -243,7 +243,7 @@ it&#8217;s platform-independent, and we&#8217;d like it to stay that way.</p>
 <p>Right now only C and C++ are supported directly by the toolchain in the SDK. C#
 and other languages in the .NET family are supported via the <a class="reference external" href="https://github.com/elijahtaylor/mono">Mono port</a> for
 Native Client. Moreover, there are several ongoing projects to support
-additional language runtimes (e.g. <a class="reference external" href="https://code.google.com/p/naclports/source/browse#svn%2Ftrunk%2Fsrc%2Fexamples%2Ftools">naclports supports Lua, Python and Ruby</a>)
+additional language runtimes (e.g. <a class="reference external" href="https://chromium.googlesource.com/webports">webports includes Lua, Python and Ruby</a>)
 as well as to compile more languages to LLVM&#8217;s intermediate representation
 (e.g. support <a class="reference external" href="http://halide-lang.org/">Halide</a>, Haskell with <a class="reference external" href="http://www.haskell.org/ghc/docs/latest/html/users_guide/code-generators.html">GHC</a> or support Fortran with <a class="reference external" href="https://flang-gsoc.blogspot.ie/2013/09/end-of-gsoc-report.html">flang</a>), or
 transpile languages to C/C++ (source-to-source compilation). Even JavaScript is
@@ -391,8 +391,8 @@ Native Client provides an <code>mmap()</code> system call that behaves much like
 the standard UNIX <code>mmap()</code> system call.</p>
 <h3 id="is-my-favorite-third-party-library-available-for-native-client">Is my favorite third-party library available for Native Client?</h3>
 <p>Google has ported several third-party libraries to Native Client; such libraries
-are available in the <a class="reference external" href="https://code.google.com/p/naclports">naclports</a> project. We encourage you to contribute
-libraries to naclports, and/or to host your own ported libraries, and to let the
+are available in the <a class="reference external" href="https://chromium.googlesource.com/webports">webports</a> project. We encourage you to contribute
+libraries to webports, and/or to host your own ported libraries, and to let the
 team know about it on <a class="reference external" href="https://groups.google.com/group/native-client-discuss">native-client-discuss</a> when you do. You can also read
 through <a class="reference internal" href="/native-client/reference/ideas.html"><em>contributor ideas</em></a> to find ideas of new projects
 to port.</p>
diff --git a/native_client_sdk/doc_generated/reference/ideas.html b/native_client_sdk/doc_generated/reference/ideas.html
index 2050481..2c30c64 100644
--- a/native_client_sdk/doc_generated/reference/ideas.html
+++ b/native_client_sdk/doc_generated/reference/ideas.html
@@ -93,13 +93,13 @@ tested, and used in a demo application.</li>
 </ul>
 <h4 id="open-source-porting">Open Source Porting</h4>
 <ul class="small-gap">
-<li><strong>Project:</strong> Port substantial open source projects to work in naclports.</li>
-<li><strong>Brief explanation:</strong> naclports contains a large collection of open source
+<li><strong>Project:</strong> Port substantial open source projects to work in webports.</li>
+<li><strong>Brief explanation:</strong> webports contains a large collection of open source
 projects that properly compile and run on the PNaCl platform. This project
-involves adding new useful projects to naclports, and upstreaming any patches
+involves adding new useful projects to webports, and upstreaming any patches
 to the original project: running on PNaCl effective involves porting to a new
 architecture and operating system. Project ideas include: Gimp, Inkscape, Gtk.</li>
-<li><strong>Expected results:</strong> New open source projects are usable from naclports.</li>
+<li><strong>Expected results:</strong> New open source projects are usable from webports.</li>
 <li><strong>Knowledge Prerequisite:</strong> C/C++.</li>
 <li><strong>Mentor:</strong> Brad Nelson.</li>
 </ul>
diff --git a/native_client_sdk/doc_generated/reference/pnacl-c-cpp-language-support.html b/native_client_sdk/doc_generated/reference/pnacl-c-cpp-language-support.html
index 3b76173..6d9a8e0 100644
--- a/native_client_sdk/doc_generated/reference/pnacl-c-cpp-language-support.html
+++ b/native_client_sdk/doc_generated/reference/pnacl-c-cpp-language-support.html
@@ -163,7 +163,7 @@ replaced with calls to <code>abort()</code>. The usual <code>-fno-exceptions</co
 supported, though the default is <code>-fexceptions</code>. PNaCl will support full
 zero-cost exception handling in the future.</p>
 <aside>
-When using <a class="reference external" href="https://code.google.com/p/naclports">naclports</a> or other prebuilt static libraries, you don&#8217;t
+When using <a class="reference external" href="https://chromium.googlesource.com/webports">webports</a> or other prebuilt static libraries, you don&#8217;t
 need to recompile because the exception handling support is
 implemented at link time (when all the static libraries are put
 together with your application).
diff --git a/native_client_sdk/src/README.naclports b/native_client_sdk/src/README.naclports
deleted file mode 100644
index ed6fa76..0000000
--- a/native_client_sdk/src/README.naclports
+++ /dev/null
@@ -1,14 +0,0 @@
-NaCl Ports
-==========
-
-This folder contains headers and pre-built libraries for several
-of the more commonly used open source third-party libraries.
-
-These libraries were built from the naclports project.  For access
-to the full sources, or to rebuild or modify these libraries please
-follow the instructions on naclports:
-
-  https://code.google.com/p/naclports/
-
-Please note that each of libraries libraries is licensed under its
-own specific license.   See NOTICE for full list of license terms.
diff --git a/native_client_sdk/src/build_tools/build_paths.py b/native_client_sdk/src/build_tools/build_paths.py
index 7b4ccce..dcb3fcd 100644
--- a/native_client_sdk/src/build_tools/build_paths.py
+++ b/native_client_sdk/src/build_tools/build_paths.py
@@ -17,7 +17,6 @@ OUT_DIR = os.path.join(SRC_DIR, 'out')
 BUILD_ARCHIVE_DIR = os.path.join(OUT_DIR, 'nacl_sdk_build')
 EXTRACT_ARCHIVE_DIR = os.path.join(OUT_DIR, 'nacl_sdk_extract')
 PPAPI_DIR = os.path.join(SRC_DIR, 'ppapi')
-NACLPORTS_DIR = os.path.join(OUT_DIR, 'naclports')
 GONACL_APPENGINE_DIR = os.path.join(SDK_SRC_DIR, 'gonacl_appengine')
 GONACL_APPENGINE_SRC_DIR = os.path.join(GONACL_APPENGINE_DIR, 'src')
 
diff --git a/native_client_sdk/src/build_tools/build_sdk.py b/native_client_sdk/src/build_tools/build_sdk.py
index 71568f3..4eb701e 100755
--- a/native_client_sdk/src/build_tools/build_sdk.py
+++ b/native_client_sdk/src/build_tools/build_sdk.py
@@ -40,7 +40,7 @@ import parse_dsc
 import verify_filelist
 
 from build_paths import SCRIPT_DIR, SDK_SRC_DIR, SRC_DIR, NACL_DIR, OUT_DIR
-from build_paths import NACLPORTS_DIR, GSTORE, GONACL_APPENGINE_SRC_DIR
+from build_paths import GSTORE, GONACL_APPENGINE_SRC_DIR
 
 # Add SDK make tools scripts to the python path.
 sys.path.append(os.path.join(SDK_SRC_DIR, 'tools'))
@@ -56,9 +56,6 @@ NACL_TOOLCHAINTARS_DIR = os.path.join(NACL_TOOLCHAIN_DIR, '.tars')
 CYGTAR = os.path.join(BUILD_DIR, 'cygtar.py')
 PKGVER = os.path.join(BUILD_DIR, 'package_version', 'package_version.py')
 
-NACLPORTS_URL = 'https://chromium.googlesource.com/external/naclports.git'
-NACLPORTS_REV = '65c71c1524a74ff8415573e5e5ef7c59ce4ac437'
-
 GYPBUILD_DIR = 'gypbuild'
 
 options = None
diff --git a/native_client_sdk/src/doc/cds2014/python.rst b/native_client_sdk/src/doc/cds2014/python.rst
index be988da..5617034 100644
--- a/native_client_sdk/src/doc/cds2014/python.rst
+++ b/native_client_sdk/src/doc/cds2014/python.rst
@@ -101,7 +101,7 @@ interpreted languages that have been ported to PNaCl.
 
 Check out the range of interpreters, libraries, and tools
 `already ported to PNaCl and ready to be integrated with your Web App
-<https://code.google.com/p/naclports/wiki/PortList>`_.
+<https://chromium.googlesource.com/webports/+/master/docs/port_list.md>`_.
 
 While our in-browser environment is rapidly evolving
 to become a complete development solution,
diff --git a/native_client_sdk/src/doc/devguide/devcycle/building.rst b/native_client_sdk/src/doc/devguide/devcycle/building.rst
index ea18759..e96158b 100644
--- a/native_client_sdk/src/doc/devguide/devcycle/building.rst
+++ b/native_client_sdk/src/doc/devguide/devcycle/building.rst
@@ -581,9 +581,9 @@ The header files are in:
 * ARM toolchain: ``toolchain/<platform>_arm_<c_library>/arm-nacl/include``
 
 Many other libraries have been ported for use with Native Client; for more
-information, see the `naclports <http://code.google.com/p/naclports/>`_
+information, see the `webports <https://chromium.googlesource.com/webports>`_
 project. If you port an open-source library for your own use, we recommend
-adding it to naclports.
+adding it to webports.
 
 Besides the standard libraries, the SDK includes Pepper libraries.
 The PNaCl Pepper libraries are located in the the
@@ -633,8 +633,8 @@ libppapi_simple.a
   * Since the Native Client toolchains use their own library and header search
     paths, the tools won't find third-party libraries you use in your
     non-Native-Client development. If you want to use a specific third-party
-    library for Native Client development, look for it in `naclports
-    <http://code.google.com/p/naclports/>`_, or port the library yourself.
+    library for Native Client development, look for it in `webports
+    <https://chromium.googlesource.com/webports>`_, or port the library yourself.
   * The order in which you list libraries in your build commands is important,
     since the linker searches and processes libraries in the order in which they
     are specified. See the ``\*_LDFLAGS`` variables in the Makefiles of the SDK
diff --git a/native_client_sdk/src/doc/devguide/devcycle/dynamic-loading.rst b/native_client_sdk/src/doc/devguide/devcycle/dynamic-loading.rst
index 211aaef..3958d8a 100644
--- a/native_client_sdk/src/doc/devguide/devcycle/dynamic-loading.rst
+++ b/native_client_sdk/src/doc/devguide/devcycle/dynamic-loading.rst
@@ -310,9 +310,9 @@ As described above, an application's manifest file must explicitly list all the
 executable code modules that the application directly depends on, including
 modules from the application itself (``.nexe`` and ``.so`` files), modules from
 the Native Client SDK (e.g., ``libppapi_cpp.so``), and perhaps also modules from
-`naclports <http://code.google.com/p/naclports/>`_ or from `middleware systems
-<../../community/middleware>`_ that the application uses. You must provide all
-of those modules as part of the application deployment process.
+`webports <https://chromium.googlesource.com/webports>`_ or from `middleware 
+systems <../../community/middleware>`_ that the application uses. You must
+provide all of those modules as part of the application deployment process.
 
 As explained in :doc:`Distributing Your Application <../distributing>`, there
 are two basic ways to deploy a `Chrome app </apps>`_:
diff --git a/native_client_sdk/src/doc/devguide/tutorial/tutorial-part1.rst b/native_client_sdk/src/doc/devguide/tutorial/tutorial-part1.rst
index 0937893..8332bd9 100644
--- a/native_client_sdk/src/doc/devguide/tutorial/tutorial-part1.rst
+++ b/native_client_sdk/src/doc/devguide/tutorial/tutorial-part1.rst
@@ -292,8 +292,8 @@ Next steps
   </devguide/devcycle/running>`, and :doc:`Debugging pages
   </devguide/devcycle/debugging>` for information about how to build, run, and
   debug Native Client applications.
-* Check the `naclports <http://code.google.com/p/naclports/>`_ project to see
-  what libraries have been ported for use with Native Client. If you port an
-  open-source library for your own use, we recommend adding it to naclports
-  (see `How to check code into naclports
-  <http://code.google.com/p/naclports/wiki/HowTo_Checkin>`_).
+* Check the `webports <https://chromium.googlesource.com/webports>`_ project to
+  see what libraries have been ported for use with Native Client. If you port an
+  open-source library for your own use, we recommend adding it to webports
+  (see `How to check code into webports
+  <https://chromium.googlesource.com/webports/+/master/CONTRIBUTING.md>`_).
diff --git a/native_client_sdk/src/doc/faq.rst b/native_client_sdk/src/doc/faq.rst
index 5108f5e..eb98708 100644
--- a/native_client_sdk/src/doc/faq.rst
+++ b/native_client_sdk/src/doc/faq.rst
@@ -235,7 +235,7 @@ Do I have to use C or C++? I'd really like to use another language.
 Right now only C and C++ are supported directly by the toolchain in the SDK. C#
 and other languages in the .NET family are supported via the `Mono port`_ for
 Native Client. Moreover, there are several ongoing projects to support
-additional language runtimes (e.g. `naclports supports Lua, Python and Ruby`_)
+additional language runtimes (e.g. `webports includes Lua, Python and Ruby`_)
 as well as to compile more languages to LLVM's intermediate representation
 (e.g. support Halide_, Haskell with GHC_ or support Fortran with flang_), or
 transpile languages to C/C++ (source-to-source compilation). Even JavaScript is
@@ -454,8 +454,8 @@ Is my favorite third-party library available for Native Client?
 ---------------------------------------------------------------
 
 Google has ported several third-party libraries to Native Client; such libraries
-are available in the naclports_ project. We encourage you to contribute
-libraries to naclports, and/or to host your own ported libraries, and to let the
+are available in the webports_ project. We encourage you to contribute
+libraries to webports, and/or to host your own ported libraries, and to let the
 team know about it on native-client-discuss_ when you do. You can also read
 through :doc:`contributor ideas <reference/ideas>` to find ideas of new projects
 to port.
@@ -587,7 +587,7 @@ Here are ways to resolve some common problems that can prevent loading:
 .. _experimental development environment which runs within NaCl: https://www.youtube.com/watch?v=OzNuzBDEWzk&list=PLOU2XLYxmsIIwGK7v7jg3gQvIAWJzdat_
 .. _introduction to GCC: https://www.google.com/search?q=gcc+introduction
 .. _Mono port: https://github.com/elijahtaylor/mono
-.. _naclports supports Lua, Python and Ruby: https://code.google.com/p/naclports/source/browse#svn%2Ftrunk%2Fsrc%2Fexamples%2Ftools
+.. _webports includes Lua, Python and Ruby: https://chromium.googlesource.com/webports
 .. _Halide: http://halide-lang.org/
 .. _GHC: http://www.haskell.org/ghc/docs/latest/html/users_guide/code-generators.html
 .. _flang: https://flang-gsoc.blogspot.ie/2013/09/end-of-gsoc-report.html
@@ -600,5 +600,5 @@ Here are ways to resolve some common problems that can prevent loading:
 .. _GLES2 file: https://code.google.com/p/chromium/codesearch#chromium/src/ppapi/lib/gl/gles2/gles2.c
 .. _Google Chrome privacy policy: https://www.google.com/chrome/intl/en/privacy.html
 .. _Google Chrome Terms of Service: https://www.google.com/chrome/intl/en/eula_text.html
-.. _naclports: https://code.google.com/p/naclports
+.. _webports: https://chromium.googlesource.com/webports
 .. _CORS: http://en.wikipedia.org/wiki/Cross-origin_resource_sharing
diff --git a/native_client_sdk/src/doc/reference/ideas.rst b/native_client_sdk/src/doc/reference/ideas.rst
index 48f8e64..635e988 100644
--- a/native_client_sdk/src/doc/reference/ideas.rst
+++ b/native_client_sdk/src/doc/reference/ideas.rst
@@ -87,13 +87,13 @@ New Filesystems
 Open Source Porting
 ^^^^^^^^^^^^^^^^^^^
 
-* **Project:** Port substantial open source projects to work in naclports.
-* **Brief explanation:** naclports contains a large collection of open source
+* **Project:** Port substantial open source projects to work in webports.
+* **Brief explanation:** webports contains a large collection of open source
   projects that properly compile and run on the PNaCl platform. This project
-  involves adding new useful projects to naclports, and upstreaming any patches
+  involves adding new useful projects to webports, and upstreaming any patches
   to the original project: running on PNaCl effective involves porting to a new
   architecture and operating system. Project ideas include: Gimp, Inkscape, Gtk.
-* **Expected results:** New open source projects are usable from naclports.
+* **Expected results:** New open source projects are usable from webports.
 * **Knowledge Prerequisite:** C/C++.
 * **Mentor:** Brad Nelson.
 
diff --git a/native_client_sdk/src/doc/reference/pnacl-c-cpp-language-support.rst b/native_client_sdk/src/doc/reference/pnacl-c-cpp-language-support.rst
index 1a87dff..d92ac17 100644
--- a/native_client_sdk/src/doc/reference/pnacl-c-cpp-language-support.rst
+++ b/native_client_sdk/src/doc/reference/pnacl-c-cpp-language-support.rst
@@ -183,12 +183,12 @@ replaced with calls to ``abort()``. The usual ``-fno-exceptions`` flag is also
 supported, though the default is ``-fexceptions``. PNaCl will support full
 zero-cost exception handling in the future.
 
-.. note:: When using naclports_ or other prebuilt static libraries, you don't
+.. note:: When using webports_ or other prebuilt static libraries, you don't
           need to recompile because the exception handling support is
           implemented at link time (when all the static libraries are put
           together with your application).
 
-.. _naclports: https://code.google.com/p/naclports
+.. _webports: https://chromium.googlesource.com/webports
 
 NaCl supports full zero-cost C++ exception handling.
 
diff --git a/native_client_sdk/src/gonacl_appengine/static/lua/index.html b/native_client_sdk/src/gonacl_appengine/static/lua/index.html
index e77b0e5..88fd4e7 100644
--- a/native_client_sdk/src/gonacl_appengine/static/lua/index.html
+++ b/native_client_sdk/src/gonacl_appengine/static/lua/index.html
@@ -34,8 +34,8 @@
         </p>
         <p class="note">
           Note: the C++ source code of this demo is available in <a
-          href="https://code.google.com/p/naclports/source/browse/trunk/src/examples/tools/lua_ppapi/README.nacl"
-          target="_blank">naclports</a>.  The terminal interface is
+          href="https://chromium.googlesource.com/webports/+/master/ports/lua/README.nacl"
+          target="_blank">webports</a>.  The terminal interface is
           rendered in HTML/CSS using the
           <a href="https://github.com/libapps-mirror/libapps" target="_blank">hterm</a> library.
         </p>
diff --git a/native_client_sdk/src/tools/create_nmf.py b/native_client_sdk/src/tools/create_nmf.py
index c1fe50c..7139444 100755
--- a/native_client_sdk/src/tools/create_nmf.py
+++ b/native_client_sdk/src/tools/create_nmf.py
@@ -507,10 +507,10 @@ def FindObjdumpExecutable():
 
 
 def GetDefaultLibPath(config):
-  """Derive default library path to use when searching for shared
-  objects.  This currently include the toolchain library folders
-  as well as the top level SDK lib folder and the naclports lib
-  folder.  We include both 32-bit and 64-bit library paths.
+  """Derive default library path.
+
+  This path is used when searching for shared objects.  This currently includes
+  the toolchain library folders and the top level SDK lib folder.
   """
   sdk_root = GetSDKRoot()
 
@@ -520,7 +520,7 @@ def GetDefaultLibPath(config):
     'toolchain/%s_x86_glibc/x86_64-nacl/lib' % osname,
     'toolchain/%s_x86_glibc/x86_64-nacl/lib32' % osname,
     'toolchain/%s_arm_glibc/arm-nacl/lib' % osname,
-    # naclports installed libraries
+    # user installed libraries (used by webports)
     'toolchain/%s_x86_glibc/x86_64-nacl/usr/lib' % osname,
     'toolchain/%s_x86_glibc/i686-nacl/usr/lib' % osname,
     'toolchain/%s_arm_glibc/arm-nacl/usr/lib' % osname,
@@ -528,10 +528,6 @@ def GetDefaultLibPath(config):
     'lib/glibc_x86_32/%s' % config,
     'lib/glibc_x86_64/%s' % config,
     'lib/glibc_arm/%s' % config,
-    # naclports bundle libraries
-    'ports/lib/glibc_x86_32/%s' % config,
-    'ports/lib/glibc_x86_64/%s' % config,
-    'ports/lib/glibc_arm/%s' % config,
   ]
 
   # In some cases (e.g. ASAN, TSAN, STANDALONE) the name of the configuration
diff --git a/native_client_sdk/src/tools/tests/create_nmf_test.py b/native_client_sdk/src/tools/tests/create_nmf_test.py
index 85dc020..a212cd5 100755
--- a/native_client_sdk/src/tools/tests/create_nmf_test.py
+++ b/native_client_sdk/src/tools/tests/create_nmf_test.py
@@ -96,11 +96,6 @@ class TestDefaultLibpath(unittest.TestCase):
     self.assertIn(path_fallback, paths)
     self.assertGreater(paths.index(path_fallback), paths.index(path_base))
 
-  def testIncludesNaClPorts(self):
-    paths = create_nmf.GetDefaultLibPath('Debug')
-    self.assertTrue(any(os.path.join('ports', 'lib') in p for p in paths),
-                    'naclports libpath missing: %s' % str(paths))
-
 
 class TestNmfUtils(unittest.TestCase):
   """Tests for the main NmfUtils class in create_nmf."""