<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[120904] trunk/doc-new/guide/xml</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/120904">120904</a></dd>
<dt>Author</dt> <dd>cal@macports.org</dd>
<dt>Date</dt> <dd>2014-06-11 04:31:09 -0700 (Wed, 11 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>guide: s/Mac OS X/OS X/ unless explicitly referring to older versions</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdocnewguidexmlinstallingxml">trunk/doc-new/guide/xml/installing.xml</a></li>
<li><a href="#trunkdocnewguidexmlmacportsconfxml">trunk/doc-new/guide/xml/macports.conf.xml</a></li>
<li><a href="#trunkdocnewguidexmlportfilekeywordsxml">trunk/doc-new/guide/xml/portfile-keywords.xml</a></li>
<li><a href="#trunkdocnewguidexmlportfilestartupitemxml">trunk/doc-new/guide/xml/portfile-startupitem.xml</a></li>
<li><a href="#trunkdocnewguidexmlportfilevariantsxml">trunk/doc-new/guide/xml/portfile-variants.xml</a></li>
<li><a href="#trunkdocnewguidexmlportfiledevxml">trunk/doc-new/guide/xml/portfiledev.xml</a></li>
<li><a href="#trunkdocnewguidexmlportgroupxcodexml">trunk/doc-new/guide/xml/portgroup-xcode.xml</a></li>
<li><a href="#trunkdocnewguidexmlusingxml">trunk/doc-new/guide/xml/using.xml</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdocnewguidexmlinstallingxml"></a>
<div class="modfile"><h4>Modified: trunk/doc-new/guide/xml/installing.xml (120903 => 120904)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/doc-new/guide/xml/installing.xml 2014-06-11 11:26:31 UTC (rev 120903)
+++ trunk/doc-new/guide/xml/installing.xml 2014-06-11 11:31:09 UTC (rev 120904)
</span><span class="lines">@@ -7,7 +7,7 @@
</span><span class="cx"> <title>Installing MacPorts</title>
</span><span class="cx">
</span><span class="cx"> <para>This chapter shows you how to install MacPorts and its prerequisites step-by-step. Note that the section about
</span><del>- <link linkend="installing.xcode">installing Xcode</link> is Mac OS X-specific. If you wish to install MacPorts on
</del><ins>+ <link linkend="installing.xcode">installing Xcode</link> is OS X-specific. If you wish to install MacPorts on
</ins><span class="cx"> another platform, first make sure you have a working C compiler installed, skip ahead to <link
</span><span class="cx"> linkend="installing.macports.source">installing MacPorts from source</link>, and continue to the end of the
</span><span class="cx"> chapter.</para>
</span><span class="lines">@@ -17,16 +17,16 @@
</span><span class="cx">
</span><span class="cx"> <para>
</span><span class="cx"> <ulink url="https://developer.apple.com/xcode/">Xcode</ulink> is a package provided by Apple containing compilers,
</span><del>- libraries and additional tools required to develop applications for Mac OS X.
</del><ins>+ libraries and additional tools required to develop applications for OS X.
</ins><span class="cx"> </para>
</span><span class="cx">
</span><span class="cx"> <note>
</span><del>- <para>Always make sure to install the latest available version of Xcode for your Mac OS X release; using outdated
- versions of Xcode may cause port install failures. Also note that Xcode is not updated via Mac OS X's Software
</del><ins>+ <para>Always make sure to install the latest available version of Xcode for your OS X release; using outdated
+ versions of Xcode may cause port install failures. Also note that Xcode is not updated via OS X's Software
</ins><span class="cx"> Update utility on OS versions prior to 10.6, and is updated via the Mac App Store starting with 10.7.</para>
</span><span class="cx"> </note>
</span><span class="cx">
</span><del>- <para>Follow the instructions for your version of Mac OS X:</para>
</del><ins>+ <para>Follow the instructions for your version of OS X:</para>
</ins><span class="cx">
</span><span class="cx"> <section id="installing.xcode.mavericks">
</span><span class="cx"> <title>Install Xcode on OS X 10.9 or later</title>
</span><span class="lines">@@ -150,14 +150,14 @@
</span><span class="cx"> <section id="installing.macports">
</span><span class="cx"> <title>Install MacPorts</title>
</span><span class="cx">
</span><del>- <para>If you are using Mac OS X, you should install MacPorts using the Mac
- OS X package installer unless you do not wish to install it to
- <filename>/opt/local/</filename>, the default MacPorts location, or if you
- wish to install a pre-release version of MacPorts base. However, if you
- wish to <link linkend="installing.macports.source.multiple">install
- multiple copies of MacPorts</link> or install MacPorts on another OS
- platform, you must <link linkend="installing.macports.source">install
- MacPorts from the source code</link>.</para>
</del><ins>+ <para>If you are using OS X, you should install MacPorts using the OS
+ X package installer unless you do not wish to install it to
+ <filename>/opt/local/</filename>, the default MacPorts location, or if you
+ wish to install a pre-release version of MacPorts base. However, if you
+ wish to <link linkend="installing.macports.source.multiple">install
+ multiple copies of MacPorts</link> or install MacPorts on another OS
+ platform, you must <link linkend="installing.macports.source">install
+ MacPorts from the source code</link>.</para>
</ins><span class="cx">
</span><span class="cx"> <note>
</span><span class="cx"> <para>Though a distinction is made between pre-release and release
</span><span class="lines">@@ -169,9 +169,9 @@
</span><span class="cx"> </note>
</span><span class="cx">
</span><span class="cx"> <section id="installing.macports.binary">
</span><del>- <title>Mac OS X Package Install</title>
</del><ins>+ <title>OS X Package Install</title>
</ins><span class="cx">
</span><del>- <para>The Mac OS X package installer automatically installs MacPorts,
</del><ins>+ <para>The OS X package installer automatically installs MacPorts,
</ins><span class="cx"> <link linkend="installing.shell">sets the shell environment</link>, and
</span><span class="cx"> runs a <link linkend="using.port.selfupdate">selfupdate</link> operation
</span><span class="cx"> to update the ports tree and MacPorts base with the latest
</span><span class="lines">@@ -444,7 +444,7 @@
</span><span class="cx"> <title>MacPorts and the Shell</title>
</span><span class="cx">
</span><span class="cx"> <para>MacPorts requires that some environment variables be set in the
</span><del>- shell. When MacPorts is installed using the Mac OS X package installer, a
</del><ins>+ shell. When MacPorts is installed using the OS X package installer, a
</ins><span class="cx"> <quote>postflight</quote> script is run after installation that
</span><span class="cx"> automatically adds or modifies a shell configuration file in your home directory,
</span><span class="cx"> ensuring that it defines variables
</span></span></pre></div>
<a id="trunkdocnewguidexmlmacportsconfxml"></a>
<div class="modfile"><h4>Modified: trunk/doc-new/guide/xml/macports.conf.xml (120903 => 120904)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/doc-new/guide/xml/macports.conf.xml 2014-06-11 11:26:31 UTC (rev 120903)
+++ trunk/doc-new/guide/xml/macports.conf.xml 2014-06-11 11:31:09 UTC (rev 120904)
</span><span class="lines">@@ -108,8 +108,8 @@
</span><span class="cx"> <term>applications_dir</term>
</span><span class="cx">
</span><span class="cx"> <listitem>
</span><del>- <para>Directory to install MacPorts that install Mac OS X .app
- bundles.</para>
</del><ins>+ <para>Directory to install MacPorts that install OS X .app
+ bundles.</para>
</ins><span class="cx">
</span><span class="cx"> <para>Default: <filename>/Applications/MacPorts</filename></para>
</span><span class="cx"> </listitem>
</span></span></pre></div>
<a id="trunkdocnewguidexmlportfilekeywordsxml"></a>
<div class="modfile"><h4>Modified: trunk/doc-new/guide/xml/portfile-keywords.xml (120903 => 120904)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/doc-new/guide/xml/portfile-keywords.xml 2014-06-11 11:26:31 UTC (rev 120903)
+++ trunk/doc-new/guide/xml/portfile-keywords.xml 2014-06-11 11:31:09 UTC (rev 120904)
</span><span class="lines">@@ -198,7 +198,7 @@
</span><span class="cx">
</span><span class="cx"> <listitem>
</span><span class="cx"> <para>The CPU architectures for which this port can be built. Archs currently
</span><del>- supported by Mac OS X are: i386, ppc, ppc64, x86_64. If this option is not
</del><ins>+ supported by OS X are: i386, ppc, ppc64, x86_64. If this option is not
</ins><span class="cx"> set, it is assumed that the port can build for all archs. If a port does not
</span><span class="cx"> install any architecture-specific files, use the special value
</span><span class="cx"> <option>noarch</option>.</para>
</span></span></pre></div>
<a id="trunkdocnewguidexmlportfilestartupitemxml"></a>
<div class="modfile"><h4>Modified: trunk/doc-new/guide/xml/portfile-startupitem.xml (120903 => 120904)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/doc-new/guide/xml/portfile-startupitem.xml 2014-06-11 11:26:31 UTC (rev 120903)
+++ trunk/doc-new/guide/xml/portfile-startupitem.xml 2014-06-11 11:31:09 UTC (rev 120904)
</span><span class="lines">@@ -7,12 +7,12 @@
</span><span class="cx"> <para>A StartupItem is a MacPorts facility to run <quote>daemons,</quote> a Unix term for
</span><span class="cx"> programs that run continuously in the background, rather than under the
</span><span class="cx"> direct control of a user; for example, mail servers, network listeners, etc.
</span><del>- Ports that use StartupItem keywords create Mac OS X scripts for <ulink
</del><ins>+ Ports that use StartupItem keywords create OS X scripts for <ulink
</ins><span class="cx"> url="http://developer.apple.com/macosx/launchd.html">launchd</ulink>, which
</span><span class="cx"> is the Apple facility introduced with Mac OS X 10.4 to replace xinetd for
</span><span class="cx"> starting and managing daemons. To support <command>launchd</command>, a
</span><span class="cx"> program named <command>daemondo</command> is provided by MacPorts base that
</span><del>- serves as an adapter between Mac OS X's <command>launchd</command> and
</del><ins>+ serves as an adapter between OS X's <command>launchd</command> and
</ins><span class="cx"> daemons (<quote>executable</quote> StartupItems) or traditional Unix startup
</span><span class="cx"> scripts that start daemons (<quote>script</quote> StartupItems).</para>
</span><span class="cx">
</span><span class="lines">@@ -467,4 +467,4 @@
</span><span class="cx">
</span><span class="cx"> [... trimmed ...]</programlisting>
</span><span class="cx"> </section>
</span><del>-</section>
</del><span class="cx">\ No newline at end of file
</span><ins>+</section>
</ins></span></pre></div>
<a id="trunkdocnewguidexmlportfilevariantsxml"></a>
<div class="modfile"><h4>Modified: trunk/doc-new/guide/xml/portfile-variants.xml (120903 => 120904)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/doc-new/guide/xml/portfile-variants.xml 2014-06-11 11:26:31 UTC (rev 120903)
+++ trunk/doc-new/guide/xml/portfile-variants.xml 2014-06-11 11:31:09 UTC (rev 120904)
</span><span class="lines">@@ -100,7 +100,7 @@
</span><span class="cx"> <term>universal_variant</term>
</span><span class="cx">
</span><span class="cx"> <listitem>
</span><del>- <para>When using MacPorts on Mac OS X, a universal variant is
</del><ins>+ <para>When using MacPorts on OS X, a universal variant is
</ins><span class="cx"> defined by default to configure ports with universal flags. The
</span><span class="cx"> variant can be overridden if the default code does not work (see the
</span><span class="cx"> <link linkend="reference.phases.configure.universal">Configure
</span><span class="lines">@@ -169,7 +169,7 @@
</span><span class="cx"> <para><literal>platform darwin
</span><span class="cx"> <replaceable>version</replaceable></literal> can be used to handle
</span><span class="cx"> different tasks depending on the version of Darwin, the core
</span><del>- operating system underlying Mac OS X.
</del><ins>+ operating system underlying OS X.
</ins><span class="cx"> <replaceable>version</replaceable> is the major version of Darwin,
</span><span class="cx"> and can be <literal>8</literal> for Mac OS X 10.4 Tiger,
</span><span class="cx"> <literal>9</literal> for 10.5 Leopard, <literal>10</literal> for
</span></span></pre></div>
<a id="trunkdocnewguidexmlportfiledevxml"></a>
<div class="modfile"><h4>Modified: trunk/doc-new/guide/xml/portfiledev.xml (120903 => 120904)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/doc-new/guide/xml/portfiledev.xml 2014-06-11 11:26:31 UTC (rev 120903)
+++ trunk/doc-new/guide/xml/portfiledev.xml 2014-06-11 11:31:09 UTC (rev 120904)
</span><span class="lines">@@ -1104,7 +1104,7 @@
</span><span class="cx"> the buildbot will check whether a rebuild of the corresponding port(s) would
</span><span class="cx"> be necessary. If the port(s) in question are distributable their binary
</span><span class="cx"> archives will be kept for subsequent distribution for the three most current
</span><del>- versions of the Mac OS X operating system.</para>
</del><ins>+ versions of the OS X operating system.</para>
</ins><span class="cx">
</span><span class="cx"> <para>If a build error occurred for a port its maintainer will be informed via
</span><span class="cx"> an email so that problems which did not surface on the maintainer's machine will
</span></span></pre></div>
<a id="trunkdocnewguidexmlportgroupxcodexml"></a>
<div class="modfile"><h4>Modified: trunk/doc-new/guide/xml/portgroup-xcode.xml (120903 => 120904)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/doc-new/guide/xml/portgroup-xcode.xml 2014-06-11 11:26:31 UTC (rev 120903)
+++ trunk/doc-new/guide/xml/portgroup-xcode.xml 2014-06-11 11:31:09 UTC (rev 120904)
</span><span class="lines">@@ -11,7 +11,7 @@
</span><span class="cx">
</span><span class="cx"> <para>Using <code>PortGroup xcode</code> is a way to make your port able to
</span><span class="cx"> tolerate Xcode version updates because the PortGroup is tested against all
</span><del>- supported Mac OS X and Xcode versions.</para>
</del><ins>+ supported OS X and Xcode versions.</para>
</ins><span class="cx">
</span><span class="cx"> <section id="reference.portgroup.xcode.keywords">
</span><span class="cx"> <title>xcode PortGroup Specific Keywords</title>
</span></span></pre></div>
<a id="trunkdocnewguidexmlusingxml"></a>
<div class="modfile"><h4>Modified: trunk/doc-new/guide/xml/using.xml (120903 => 120904)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/doc-new/guide/xml/using.xml 2014-06-11 11:26:31 UTC (rev 120903)
+++ trunk/doc-new/guide/xml/using.xml 2014-06-11 11:31:09 UTC (rev 120904)
</span><span class="lines">@@ -97,14 +97,14 @@
</span><span class="cx"> <para>The <option>sync</option> action performs a subset of
</span><span class="cx"> <option>selfupdate</option> actions. It synchronizes the ports tree, as
</span><span class="cx"> does <option>selfupdate</option>, but it does not check for upgrades to
</span><del>- MacPorts base. On Mac OS X, unless there is a special reason not to do
</del><ins>+ MacPorts base. On OS X, unless there is a special reason not to do
</ins><span class="cx"> so, you should run <link
</span><span class="cx"> linkend="using.port.selfupdate">selfupdate</link>.</para>
</span><span class="cx">
</span><span class="cx"> <note>
</span><del>- <para>For platforms other than Mac OS X, <option>sync</option> is the
</del><ins>+ <para>For platforms other than OS X, <option>sync</option> is the
</ins><span class="cx"> only way to get port updates because <option>selfupdate</option> is
</span><del>- supported only on Mac OS X.</para>
</del><ins>+ supported only on OS X.</para>
</ins><span class="cx"> </note>
</span><span class="cx"> </section>
</span><span class="cx">
</span><span class="lines">@@ -766,15 +766,15 @@
</span><span class="cx">
</span><span class="cx"> <para>Binary packages are standalone binary installers that are
</span><span class="cx"> precompiled; they do not require MacPorts on the target system. Binary
</span><del>- files created with MacPorts may be either .pkg (Mac OS X Installer
</del><ins>+ files created with MacPorts may be either .pkg (OS X Installer
</ins><span class="cx"> Packages), or .rpm (RPM Package Manager) format. MacPorts may also
</span><del>- process a .pkg package into a Mac OS X .dmg disk image file. You may
</del><ins>+ process a .pkg package into a OS X .dmg disk image file. You may
</ins><span class="cx"> create binary packages with the <command>port</command> command as shown
</span><span class="cx"> in these examples.</para>
</span><span class="cx">
</span><span class="cx"> <programlisting><prompt>%%</prompt> <userinput>sudo port pkg pstree</userinput></programlisting>
</span><span class="cx">
</span><del>- <para>You may create a Mac OS X .dmg disk image file as shown.</para>
</del><ins>+ <para>You may create a OS X .dmg disk image file as shown.</para>
</ins><span class="cx">
</span><span class="cx"> <programlisting><prompt>%%</prompt> <userinput>sudo port dmg pstree</userinput></programlisting>
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>