<!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>[134583] 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/134583">134583</a></dd>
<dt>Author</dt> <dd>ionic@macports.org</dd>
<dt>Date</dt> <dd>2015-03-30 17:38:47 -0700 (Mon, 30 Mar 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>doc-new/guide/xml: grammar fixes: the markup makes clear whether the given string is a command, an option, a file or a variable. Don't be redundant about it.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdocnewguidexmlinstallingxml">trunk/doc-new/guide/xml/installing.xml</a></li>
<li><a href="#trunkdocnewguidexmlinternalsxml">trunk/doc-new/guide/xml/internals.xml</a></li>
<li><a href="#trunkdocnewguidexmlportfiledevxml">trunk/doc-new/guide/xml/portfiledev.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 (134582 => 134583)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/doc-new/guide/xml/installing.xml 2015-03-31 00:38:40 UTC (rev 134582)
+++ trunk/doc-new/guide/xml/installing.xml 2015-03-31 00:38:47 UTC (rev 134583)
</span><span class="lines">@@ -207,7 +207,7 @@
</span><span class="cx"> <listitem>
</span><span class="cx"> <para>After this step you are done already, MacPorts is now installed and your shell environment was
</span><span class="cx"> set up automatically by the installer. To confirm the installation is working as expected, now
</span><del>- try using the <command>port</command> command in a <emphasis>new</emphasis> terminal
</del><ins>+ try using <command>port</command> in a <emphasis>new</emphasis> terminal
</ins><span class="cx"> window.</para>
</span><span class="cx">
</span><span class="cx"> <programlisting><prompt>$</prompt> <userinput>port version</userinput></programlisting>
</span><span class="lines">@@ -292,7 +292,7 @@
</span><span class="cx"> <para>Build and Install MacPorts</para>
</span><span class="cx">
</span><span class="cx"> <para>MacPorts uses autoconf and makefiles for installation. These commands will build and install
</span><del>- MacPorts to <filename>/opt/local</filename>. You can add the <option>--prefix</option> option to
</del><ins>+ MacPorts to <filename>/opt/local</filename>. You can add <option>--prefix</option> to
</ins><span class="cx"> <filename>./configure</filename> to relocate MacPorts to another directory if needed.</para>
</span><span class="cx">
</span><span class="cx"> <programlisting><prompt>$</prompt> <userinput>cd /opt/mports/trunk/base</userinput>
</span><span class="lines">@@ -373,7 +373,7 @@
</span><span class="cx"> url="http://lists.macosforge.org/mailman/listinfo/macports-users">macports-users</ulink> mailing list
</span><span class="cx"> first.</para>
</span><span class="cx">
</span><del>- <para>If you need to uninstall MacPorts, and your <command>port</command> command is functioning, first
</del><ins>+ <para>If you need to uninstall MacPorts, and <command>port</command> is functioning, first
</ins><span class="cx"> uninstall all the installed ports by running this command in the Terminal:</para>
</span><span class="cx">
</span><span class="cx"> <programlisting><prompt>$</prompt> <userinput>sudo port -fp uninstall installed</userinput></programlisting>
</span><span class="lines">@@ -489,7 +489,7 @@
</span><span class="cx">
</span><span class="cx"> <para>To verify that the file containing the MacPorts variables is in effect, type <command>env</command> in
</span><span class="cx"> the terminal to verify the current environment settings after the file has been created. Example output
</span><del>- for the <command>env</command> command is shown below.</para>
</del><ins>+ for <command>env</command> is shown below.</para>
</ins><span class="cx">
</span><span class="cx"> <note>
</span><span class="cx"> <para>Changes to shell configuration files do not take effect until a new terminal session is
</span></span></pre></div>
<a id="trunkdocnewguidexmlinternalsxml"></a>
<div class="modfile"><h4>Modified: trunk/doc-new/guide/xml/internals.xml (134582 => 134583)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/doc-new/guide/xml/internals.xml 2015-03-31 00:38:40 UTC (rev 134582)
+++ trunk/doc-new/guide/xml/internals.xml 2015-03-31 00:38:47 UTC (rev 134583)
</span><span class="lines">@@ -215,8 +215,8 @@
</span><span class="cx"> <listitem>
</span><span class="cx"> <para><code>mportinfo:</code> Given a port handle, this returns
</span><span class="cx"> the PortInfo array (as a flat list of array elements). This is a
</span><del>- little tricky and unstable and only used by the
- <command>portindex</command> command.</para>
</del><ins>+ little tricky and unstable and only used by
+ <command>portindex</command>.</para>
</ins><span class="cx"> </listitem>
</span><span class="cx">
</span><span class="cx"> <listitem>
</span><span class="lines">@@ -321,8 +321,8 @@
</span><span class="cx"> stored in a single file named <filename>registry.db</filename>, although
</span><span class="cx"> the additional directory <filename>portfiles</filename> is used
</span><span class="cx"> temporarily for extracting stored Portfiles from the registry.
</span><del>- Furthermore, access to the registry may be locked using the
- <filename>.registry.lock</filename> file with the
</del><ins>+ Furthermore, access to the registry may be locked using
+ <filename>.registry.lock</filename> with the
</ins><span class="cx"> <computeroutput>registry::exclusive_lock</computeroutput> and
</span><span class="cx"> <computeroutput>registry::exclusive_unlock</computeroutput> APIs.</para>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkdocnewguidexmlportfiledevxml"></a>
<div class="modfile"><h4>Modified: trunk/doc-new/guide/xml/portfiledev.xml (134582 => 134583)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/doc-new/guide/xml/portfiledev.xml 2015-03-31 00:38:40 UTC (rev 134582)
+++ trunk/doc-new/guide/xml/portfiledev.xml 2015-03-31 00:38:47 UTC (rev 134583)
</span><span class="lines">@@ -651,7 +651,7 @@
</span><span class="cx"> <programlisting><prompt>%%</prompt> <userinput>cd ~/Downloads/foo-1.34</userinput>
</span><span class="cx"> <prompt>%%</prompt> <userinput>diff -u src/Makefile.in.orig src/Makefile.in &gt; patch-src-Makefile.in.diff</userinput></programlisting>
</span><span class="cx">
</span><del>- <para>You should execute the <command>diff</command> command from
</del><ins>+ <para>You should execute <command>diff</command> from
</ins><span class="cx"> the top-level directory of the unpacked source code, because during
</span><span class="cx"> the patch phase MacPorts by default uses the patch argument
</span><span class="cx"> <option>-p0</option>, which does not strip prefixes with any leading
</span><span class="lines">@@ -675,8 +675,7 @@
</span><span class="cx"> <para>A patch file that is a <quote>unified</quote> diff file is the
</span><span class="cx"> easiest to interpret by humans and this type should always be used
</span><span class="cx"> for ports. See the example below where a patch adds
</span><del>- <varname>DESTDIR</varname> support to a
- <filename>Makefile.in</filename> file.</para>
</del><ins>+ <varname>DESTDIR</varname> support to <filename>Makefile.in</filename>.</para>
</ins><span class="cx">
</span><span class="cx"> <programlisting>--- src/Makefile.in.orig 2007-06-01 16:30:47.000000000 -0700
</span><span class="cx"> +++ src/Makefile.in 2007-06-20 10:10:59.000000000 -0700
</span><span class="lines">@@ -745,7 +744,7 @@
</span><span class="cx">
</span><span class="cx"> <orderedlist>
</span><span class="cx"> <listitem>
</span><del>- <para>Open the <filename>sources.conf</filename> file in a text
</del><ins>+ <para>Open <filename>sources.conf</filename> in a text
</ins><span class="cx"> editor. For example, to open it into TextEdit:</para>
</span><span class="cx">
</span><span class="cx"> <programlisting><prompt>%%</prompt> <userinput>open -e ${prefix}/etc/macports/sources.conf</userinput></programlisting>
</span><span class="lines">@@ -762,7 +761,7 @@
</span><span class="cx"> <note>
</span><span class="cx"> <para>The file URL should always appear before the rsync URL so that
</span><span class="cx"> local Portfiles can be tested that are duplicated in the MacPorts
</span><del>- tree, because the <command>port</command> command will always
</del><ins>+ tree, because <command>port</command> will always
</ins><span class="cx"> operate on the first Portfile it encounters.</para>
</span><span class="cx"> </note>
</span><span class="cx"> </listitem>
</span><span class="lines">@@ -794,8 +793,8 @@
</span><span class="cx"> </listitem>
</span><span class="cx">
</span><span class="cx"> <listitem>
</span><del>- <para>After you create or update your Portfile, use the MacPorts
- <command>portindex</command> command in the local repository's
</del><ins>+ <para>After you create or update your Portfile, use
+ <command>portindex</command> in the local repository's
</ins><span class="cx"> directory to create or update the index of the ports in your local
</span><span class="cx"> repository.</para>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkdocnewguidexmlusingxml"></a>
<div class="modfile"><h4>Modified: trunk/doc-new/guide/xml/using.xml (134582 => 134583)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/doc-new/guide/xml/using.xml 2015-03-31 00:38:40 UTC (rev 134582)
+++ trunk/doc-new/guide/xml/using.xml 2015-03-31 00:38:47 UTC (rev 134583)
</span><span class="lines">@@ -9,13 +9,13 @@
</span><span class="cx"> <chapter id="using">
</span><span class="cx"> <title>Using MacPorts</title>
</span><span class="cx">
</span><del>- <para>This chapter describes using the <command>port</command> command, port variants, common tasks and port
</del><ins>+ <para>This chapter describes using <command>port</command>, port variants, common tasks and port
</ins><span class="cx"> binaries.</para>
</span><span class="cx">
</span><span class="cx"> <section id="using.port">
</span><span class="cx"> <title>The port Command</title>
</span><span class="cx">
</span><del>- <para>The MacPorts <command>port</command> command is the main utility used to interact with MacPorts. It is
</del><ins>+ <para><command>port</command> is the main utility used to interact with MacPorts. It is
</ins><span class="cx"> used to update <filename>Portfile</filename>s and the MacPorts infrastructure, and install and manage
</span><span class="cx"> ports.</para>
</span><span class="cx">
</span><span class="lines">@@ -23,8 +23,7 @@
</span><span class="cx"> <title>port help</title>
</span><span class="cx">
</span><span class="cx"> <para>The <option>help</option> action shows some brief information about the specified action, or if no
</span><del>- action is specified, shows basic usage information for the <command>port</command> command in
- general.</para>
</del><ins>+ action is specified, shows basic usage information for <command>port</command> in general.</para>
</ins><span class="cx">
</span><span class="cx"> <programlisting><prompt>$</prompt> <userinput>port help selfupdate</userinput></programlisting>
</span><span class="cx">
</span><span class="lines">@@ -459,8 +458,8 @@
</span><span class="cx"> Any <option>[]</option> are derived from the <filename>Portfile</filename>.
</span><span class="cx"> While <option>()</option> are derived from the <filename>variants.conf</filename>.
</span><span class="cx"> See <xref
</span><del>- linkend="internals.configuration-files.variants-conf" /> for more information on the
- <filename>variants.conf</filename> file.</para>
</del><ins>+ linkend="internals.configuration-files.variants-conf" /> for more information on
+ <filename>variants.conf</filename>.</para>
</ins><span class="cx"> </section>
</span><span class="cx">
</span><span class="cx"> <section id="using.port.install">
</span><span class="lines">@@ -481,7 +480,7 @@
</span><span class="cx">
</span><span class="cx"> <programlisting><prompt>$ </prompt><userinput>sudo port -v install apache2</userinput></programlisting>
</span><span class="cx">
</span><del>- <para>All debug information is also kept in the <filename>main.log</filename> file for the port you
</del><ins>+ <para>All debug information is also kept in <filename>main.log</filename> for the port you
</ins><span class="cx"> installed. Its path will be printed automatically if the installation fails. You can manually get the
</span><span class="cx"> path using <command>port logfile <varname>&lt;portname&gt;</varname></command>. Note that logfiles will
</span><span class="cx"> automatically be deleted on successful installation.</para>
</span><span class="lines">@@ -781,7 +780,7 @@
</span><span class="cx"> yubico-pam @2.16_0 (active)
</span><span class="cx"> zlib @1.2.8_0 (active)</screen>
</span><span class="cx">
</span><del>- <para>Use the <option>-v</option> option to also display the platform and CPU architecture(s) for which the
</del><ins>+ <para>Use <option>-v</option> to also display the platform and CPU architecture(s) for which the
</ins><span class="cx"> ports were built, and any variants which were explicitly negated.</para>
</span><span class="cx">
</span><span class="cx"> <programlisting><prompt>$ </prompt><userinput>port -v installed libsdl</userinput></programlisting>
</span><span class="lines">@@ -847,8 +846,8 @@
</span><span class="cx">
</span><span class="cx"> <para>to go back to the old version.</para>
</span><span class="cx">
</span><del>- <para>If you do not want to keep the old versions around while upgrading, you can pass the
- <option>-u</option> option when upgrading:</para>
</del><ins>+ <para>If you do not want to keep the old versions around while upgrading, you can pass
+ <option>-u</option> when upgrading:</para>
</ins><span class="cx">
</span><span class="cx"> <programlisting><prompt>$ </prompt><userinput>sudo port -u upgrade outdated</userinput></programlisting>
</span><span class="cx">
</span><span class="lines">@@ -1020,8 +1019,8 @@
</span><span class="cx"> Any <option>[]</option> are derived from the <filename>Portfile</filename>.
</span><span class="cx"> While <option>()</option> are derived from the <filename>variants.conf</filename>.
</span><span class="cx"> See <xref
</span><del>- linkend="internals.configuration-files.variants-conf" /> for more information on the
- <filename>variants.conf</filename> file.</para>
</del><ins>+ linkend="internals.configuration-files.variants-conf" /> for more information on
+ <filename>variants.conf</filename>.</para>
</ins><span class="cx">
</span><span class="cx"> <section id="using.variants.invoking">
</span><span class="cx"> <title>Invoking Variants</title>
</span><span class="lines">@@ -1499,7 +1498,7 @@
</span><span class="cx"> <!-- -->DEBUG: Archive logrotate-3.8.6_2+gzip.darwin_13.x86_64.tbz2 packaged</screen>
</span><span class="cx">
</span><span class="cx"> <para>Binary archive files are placed in <filename>${prefix}/var/macports/software/</filename>. The archive
</span><del>- file type is set in the <filename>macports.conf</filename> file using the
</del><ins>+ file type is set in <filename>macports.conf</filename> using the
</ins><span class="cx"> <option>portarchivetype</option> key. The default format is <option>tbz2</option>; other options are:
</span><span class="cx"> <option>tar</option>, <option>tbz</option>, <option>tbz2</option>, <option>tgz</option>,
</span><span class="cx"> <option>tlz</option>, <option>txz</option>, <option>xar</option>, <option>zip</option>,
</span><span class="lines">@@ -1514,7 +1513,7 @@
</span><span class="cx"> to users without relying on MacPorts for installation. Binary installers created with MacPorts are
</span><span class="cx"> usually <option>.pkg</option> (OS X Installer Packages). MacPorts can also convert
</span><span class="cx"> a <option>.pkg</option> package into an OS X <option>.dmg</option> disk image. You can create binary
</span><del>- packages with the <command>port</command> command as shown in the following examples.</para>
</del><ins>+ packages using <command>port</command> as shown in the following examples.</para>
</ins><span class="cx">
</span><span class="cx"> <warning>
</span><span class="cx"> <para>If you want to create installer packages using MacPorts for redistribution, make sure you do not
</span></span></pre>
</div>
</div>
</body>
</html>