<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-guide.
</pre>
<p><a href="https://github.com/macports/macports-guide/commit/0d2311dc7fc06f8cb50a118b0319cf36b1924255">https://github.com/macports/macports-guide/commit/0d2311dc7fc06f8cb50a118b0319cf36b1924255</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 0d2311dc7fc06f8cb50a118b0319cf36b1924255
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Mon Mar 12 11:36:35 2018 -0500
<span style='display:block; white-space:pre;color:#404040;'> Change "OS X" to "macOS"
</span>---
guide/xml/internals-hier.xml | 4 ++--
guide/xml/intro.xml | 6 +++---
guide/xml/portfile-dependencies.xml | 2 +-
guide/xml/portfile-keywords.xml | 2 +-
guide/xml/portfile-variables.xml | 2 +-
guide/xml/portfile-variants.xml | 4 ++--
guide/xml/portgroup-xcode.xml | 2 +-
guide/xml/using.xml | 10 +++++-----
8 files changed, 16 insertions(+), 16 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/guide/xml/internals-hier.xml b/guide/xml/internals-hier.xml
</span><span style='display:block; white-space:pre;color:#808080;'>index d52b579..2cca4d9 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/guide/xml/internals-hier.xml
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/guide/xml/internals-hier.xml
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -90,7 +90,7 @@
</span> <term><filename>Library/Frameworks/</filename></term>
<listitem>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- <para>Native Mac OS X Library Frameworks</para>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <para>Native macOS frameworks.</para>
</span> </listitem>
</varlistentry>
</variablelist>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -331,7 +331,7 @@
</span> <term><filename>/Applications/MacPorts/</filename></term>
<listitem>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- <para>Native Mac OS X applications.</para>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <para>Native macOS applications.</para>
</span> </listitem>
</varlistentry>
</variablelist>
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/guide/xml/intro.xml b/guide/xml/intro.xml
</span><span style='display:block; white-space:pre;color:#808080;'>index 36a3839..85e945b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/guide/xml/intro.xml
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/guide/xml/intro.xml
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -35,10 +35,10 @@
</span> </listitem>
</itemizedlist>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- <para>MacPorts is developed on OS X, though it is designed to be portable so it can work on other Unix-like systems,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <para>MacPorts is developed on macOS, though it is designed to be portable so it can work on other Unix-like systems,
</span> especially those descended from the Berkeley Software Distribution (BSD). In practice, installing ports only
<span style='display:block; white-space:pre;background:#ffe0e0;'>- works on OS X. MacPorts base can be compiled on Linux (and possibly other POSIX-compatible systems) where it is
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mainly used to set up mirrors and generate support files for installations on OS X.</para>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ works on macOS. MacPorts base can be compiled on Linux (and possibly other POSIX-compatible systems) where it is
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mainly used to set up mirrors and generate support files for installations on macOS.</para>
</span>
<para>The following notational conventions are used in the MacPorts Guide to distinguish between terminal
input/output, file text, and other special text types.</para>
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/guide/xml/portfile-dependencies.xml b/guide/xml/portfile-dependencies.xml
</span><span style='display:block; white-space:pre;color:#808080;'>index 641f13c..8f39a22 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/guide/xml/portfile-dependencies.xml
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/guide/xml/portfile-dependencies.xml
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -137,7 +137,7 @@
</span> preferred for special reasons, or when it is possible for more than one
port to satisfy a dependency, then file dependencies may be used. An
example of the former is with ubiquitous utilities like awk, grep, make or
<span style='display:block; white-space:pre;background:#ffe0e0;'>- sed, where OS X's versions are often sufficient; an example of the latter
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sed, where the versions in macOS are often sufficient; an example of the latter
</span> is with <quote>-devel</quote> ports—these ports provide a different
version of the same files (though only one can be activated at a
time).</para>
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/guide/xml/portfile-keywords.xml b/guide/xml/portfile-keywords.xml
</span><span style='display:block; white-space:pre;color:#808080;'>index 9154732..77559a4 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/guide/xml/portfile-keywords.xml
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/guide/xml/portfile-keywords.xml
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -216,7 +216,7 @@
</span>
<listitem>
<para>The CPU architectures for which this port can be built. Archs currently
<span style='display:block; white-space:pre;background:#ffe0e0;'>- supported by OS X are: i386, ppc, ppc64, x86_64. If this option is not
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ supported by macOS are: i386, ppc, ppc64, x86_64. If this option is not
</span> set, it is assumed that the port can build for all archs. If a port does not
install any architecture-specific files, use the special value
<option>noarch</option>.</para>
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/guide/xml/portfile-variables.xml b/guide/xml/portfile-variables.xml
</span><span style='display:block; white-space:pre;color:#808080;'>index 4579c9f..838b808 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/guide/xml/portfile-variables.xml
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/guide/xml/portfile-variables.xml
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -132,7 +132,7 @@
</span>
<listitem>
<para>The underlying operating system platform (e.g.,
<span style='display:block; white-space:pre;background:#ffe0e0;'>- <quote>darwin</quote> on OS X, <quote>freebsd</quote>,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <quote>darwin</quote> on macOS, <quote>freebsd</quote>,
</span> etc.).</para>
</listitem>
</varlistentry>
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/guide/xml/portfile-variants.xml b/guide/xml/portfile-variants.xml
</span><span style='display:block; white-space:pre;color:#808080;'>index b1bdc56..76d868a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/guide/xml/portfile-variants.xml
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/guide/xml/portfile-variants.xml
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -100,7 +100,7 @@
</span> <term>universal_variant</term>
<listitem>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- <para>When using MacPorts on OS X, a universal variant is
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <para>When using MacPorts on macOS, a universal variant is
</span> defined by default to configure ports with universal flags. The
variant can be overridden if the default code does not work (see the
<link linkend="reference.phases.configure.universal">Configure
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -169,7 +169,7 @@
</span> <para><literal>platform darwin
<replaceable>version</replaceable></literal> can be used to handle
different tasks depending on the version of Darwin, the core
<span style='display:block; white-space:pre;background:#ffe0e0;'>- operating system underlying OS X.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ operating system underlying macOS.
</span> <replaceable>version</replaceable> is the major version of Darwin,
and can be <literal>17</literal> for macOS High Sierra v10.13,
<literal>16</literal> for macOS Sierra v10.12, <literal>15</literal>
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/guide/xml/portgroup-xcode.xml b/guide/xml/portgroup-xcode.xml
</span><span style='display:block; white-space:pre;color:#808080;'>index 5f3b57b..de329a9 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/guide/xml/portgroup-xcode.xml
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/guide/xml/portgroup-xcode.xml
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -11,7 +11,7 @@
</span>
<para>Using <code>PortGroup xcode</code> is a way to make your port able to
tolerate Xcode version updates because the PortGroup is tested against all
<span style='display:block; white-space:pre;background:#ffe0e0;'>- supported OS X and Xcode versions.</para>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ supported macOS and Xcode versions.</para>
</span>
<section xml:id="reference.portgroup.xcode.keywords">
<title>xcode PortGroup Specific Keywords</title>
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/guide/xml/using.xml b/guide/xml/using.xml
</span><span style='display:block; white-space:pre;color:#808080;'>index 09ba53e..91db66d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/guide/xml/using.xml
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/guide/xml/using.xml
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -96,7 +96,7 @@ Upgrade MacPorts itself and run the sync target
</span> <title>port sync</title>
<para>The <option>sync</option> action performs a subset of <option>selfupdate</option>. It synchronizes the
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ports tree, as does <option>selfupdate</option>, but it does not check for MacPorts upgrades. On OS X,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ports tree, as does <option>selfupdate</option>, but it does not check for MacPorts upgrades. On macOS,
</span> unless there is a special reason not to do so, run <link
linkend="using.port.selfupdate">selfupdate</link> instead.</para>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1524,8 +1524,8 @@ apache2 has the variants:
</span> <para>Binary packages are standalone binary installers that are precompiled; they do not require MacPorts on
the target system. As such, they are helpful in generating disk images or installers to be redistributed
to users without relying on MacPorts for installation. Binary installers created with MacPorts are
<span style='display:block; white-space:pre;background:#ffe0e0;'>- usually <option>.pkg</option> (OS X Installer Packages). MacPorts can also convert
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- a <option>.pkg</option> package into an OS X <option>.dmg</option> disk image. You can create binary
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ usually <option>.pkg</option> (macOS Installer packages). MacPorts can also convert
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ a <option>.pkg</option> package into a macOS <option>.dmg</option> disk image. You can create binary
</span> packages using <command>port</command> as shown in the following examples.</para>
<warning>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1539,10 +1539,10 @@ apache2 has the variants:
</span> <option>logrotate</option>. Then use this custom MacPorts installation to build your package.</para>
</warning>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- <para>Create an OS X <option>.pkg</option> installer for the <option>pstree</option> port:</para>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <para>Create a macOS <option>.pkg</option> installer for the <option>pstree</option> port:</para>
</span> <programlisting><prompt>$ </prompt><userinput>sudo port pkg pstree</userinput></programlisting>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- <para>You may also create an OS X <option>.dmg</option> disk image file instead:</para>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <para>You may also create a macOS <option>.dmg</option> disk image file instead:</para>
</span> <programlisting><prompt>$ </prompt><userinput>sudo port dmg pstree</userinput></programlisting>
<para>In most cases you probably want to package a port and all its library and runtime dependencies in
</pre><pre style='margin:0'>
</pre>