<!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>[122855] 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/122855">122855</a></dd>
<dt>Author</dt> <dd>cal@macports.org</dd>
<dt>Date</dt> <dd>2014-07-31 14:52:33 -0700 (Thu, 31 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>guide: start autoformatting, add modeline, conform to standard macports formatting, increase textwidth</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdocnewguidexmlguidexml">trunk/doc-new/guide/xml/guide.xml</a></li>
<li><a href="#trunkdocnewguidexmlinstallingxml">trunk/doc-new/guide/xml/installing.xml</a></li>
<li><a href="#trunkdocnewguidexmlintroxml">trunk/doc-new/guide/xml/intro.xml</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdocnewguidexmlguidexml"></a>
<div class="modfile"><h4>Modified: trunk/doc-new/guide/xml/guide.xml (122854 => 122855)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/doc-new/guide/xml/guide.xml 2014-07-31 21:24:25 UTC (rev 122854)
+++ trunk/doc-new/guide/xml/guide.xml 2014-07-31 21:52:33 UTC (rev 122855)
</span><span class="lines">@@ -1,55 +1,55 @@
</span><span class="cx"> <?xml version="1.0" encoding="UTF-8"?>
</span><del>-<!-- vim:ts=2:sts=2:sw=2:et
</del><ins>+<!-- -*- coding: utf-8; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:et:sw=4:ts=4:sts=4:tw=120
</ins><span class="cx"> -->
</span><span class="cx"> <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
</span><span class="cx"> "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
</span><span class="cx"> <book>
</span><del>- <title>
- <application>MacPorts</application> Guide
- </title>
- <bookinfo>
- <authorgroup>
- <author>
- <firstname>Mark</firstname>
- <surname>Duling</surname>
- </author>
- <author>
- <honorific>Dr</honorific>
- <firstname>Michael</firstname>
- <surname>Maibaum</surname>
- <othername role="mi">A</othername>
- </author>
- <author>
- <firstname>Will</firstname>
- <surname>Barton</surname>
- </author>
- </authorgroup>
</del><ins>+ <title>
+ <application>MacPorts</application> Guide
+ </title>
+ <bookinfo>
+ <authorgroup>
+ <author>
+ <firstname>Mark</firstname>
+ <surname>Duling</surname>
+ </author>
+ <author>
+ <honorific>Dr</honorific>
+ <firstname>Michael</firstname>
+ <surname>Maibaum</surname>
+ <othername role="mi">A</othername>
+ </author>
+ <author>
+ <firstname>Will</firstname>
+ <surname>Barton</surname>
+ </author>
+ </authorgroup>
</ins><span class="cx">
</span><del>- <copyright>
- <year>2007–2014</year>
- <holder>The MacPorts Project</holder>
- </copyright>
</del><ins>+ <copyright>
+ <year>2007–2014</year>
+ <holder>The MacPorts Project</holder>
+ </copyright>
</ins><span class="cx">
</span><del>- <copyright>
- <year>2002–2004</year>
- <holder>The OpenDarwin Project</holder>
- </copyright>
- </bookinfo>
</del><ins>+ <copyright>
+ <year>2002–2004</year>
+ <holder>The OpenDarwin Project</holder>
+ </copyright>
+ </bookinfo>
</ins><span class="cx">
</span><del>- <xi:include href="intro.xml"
- xmlns:xi="http://www.w3.org/2001/XInclude" />
- <xi:include href="installing.xml"
- xmlns:xi="http://www.w3.org/2001/XInclude" />
- <xi:include href="using.xml"
- xmlns:xi="http://www.w3.org/2001/XInclude" />
- <xi:include href="portfiledev.xml"
- xmlns:xi="http://www.w3.org/2001/XInclude" />
- <xi:include href="portfileref.xml"
- xmlns:xi="http://www.w3.org/2001/XInclude" />
- <xi:include href="internals.xml"
- xmlns:xi="http://www.w3.org/2001/XInclude" />
- <xi:include href="project.xml"
- xmlns:xi="http://www.w3.org/2001/XInclude" />
- <xi:include href="glossary.xml"
- xmlns:xi="http://www.w3.org/2001/XInclude" />
</del><ins>+ <xi:include href="intro.xml"
+ xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <xi:include href="installing.xml"
+ xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <xi:include href="using.xml"
+ xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <xi:include href="portfiledev.xml"
+ xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <xi:include href="portfileref.xml"
+ xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <xi:include href="internals.xml"
+ xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <xi:include href="project.xml"
+ xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <xi:include href="glossary.xml"
+ xmlns:xi="http://www.w3.org/2001/XInclude" />
</ins><span class="cx"> </book>
</span></span></pre></div>
<a id="trunkdocnewguidexmlinstallingxml"></a>
<div class="modfile"><h4>Modified: trunk/doc-new/guide/xml/installing.xml (122854 => 122855)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/doc-new/guide/xml/installing.xml 2014-07-31 21:24:25 UTC (rev 122854)
+++ trunk/doc-new/guide/xml/installing.xml 2014-07-31 21:52:33 UTC (rev 122855)
</span><span class="lines">@@ -1,607 +1,543 @@
</span><span class="cx"> <?xml version="1.0" encoding="UTF-8"?>
</span><ins>+<!-- -*- coding: utf-8; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:et:sw=4:ts=4:sts=4:tw=120
+-->
</ins><span class="cx"> <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
</span><span class="cx"> "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"[
</span><span class="cx"> <!ENTITY macports-version "2.3.1">
</span><span class="cx"> ]>
</span><span class="cx"> <chapter id="installing">
</span><del>- <title>Installing MacPorts</title>
</del><ins>+ <title>Installing MacPorts</title>
</ins><span class="cx">
</span><del>- <para>This chapter shows you how to install MacPorts and its prerequisites step-by-step. Note that the section about
- <link linkend="installing.xcode">installing Xcode</link> is OS X-specific. If you wish to install MacPorts on
- another platform, first make sure you have a working C compiler installed, skip ahead to <link
- linkend="installing.macports.source">installing MacPorts from source</link>, and continue to the end of the
- chapter.</para>
</del><ins>+ <para>This chapter shows you how to install MacPorts and its prerequisites step-by-step. Note that the section about
+ <link linkend="installing.xcode">installing Xcode</link> is OS X-specific. If you wish to install MacPorts on
+ another platform, first make sure you have a working C compiler installed, skip ahead to <link
+ linkend="installing.macports.source">installing MacPorts from source</link>, and continue to the end of the
+ chapter.</para>
</ins><span class="cx">
</span><del>- <section id="installing.xcode">
- <title>Install Xcode</title>
</del><ins>+ <section id="installing.xcode">
+ <title>Install Xcode</title>
</ins><span class="cx">
</span><del>- <para>
- <ulink url="https://developer.apple.com/xcode/">Xcode</ulink> is a package provided by Apple containing compilers,
- libraries and additional tools required to develop applications for OS X.
- </para>
</del><ins>+ <para><ulink url="https://developer.apple.com/xcode/">Xcode</ulink> is a package provided by Apple containing
+ compilers, libraries and additional tools required to develop applications for OS X.</para>
</ins><span class="cx">
</span><del>- <note>
- <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
- Update utility on OS versions prior to 10.6, and is updated via the Mac App Store starting with 10.7.</para>
- </note>
</del><ins>+ <note>
+ <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 Update utility on OS versions prior to 10.6, and is updated via the Mac App Store starting
+ with 10.7.</para>
+ </note>
</ins><span class="cx">
</span><del>- <para>Follow the instructions for your version of OS X:</para>
</del><ins>+ <para>Follow the instructions for your version of OS X:</para>
</ins><span class="cx">
</span><del>- <section id="installing.xcode.mavericks">
- <title>Install Xcode on OS X 10.9 or later</title>
</del><ins>+ <section id="installing.xcode.mavericks">
+ <title>Install Xcode on OS X 10.9 or later</title>
</ins><span class="cx">
</span><del>- <para>
- Download the latest version of Xcode <ulink url="https://developer.apple.com/downloads/index.action">from the
- Apple developer website</ulink> or get it <ulink url="http://itunes.apple.com/us/app/xcode/id497799835">using
- the Mac App Store</ulink>.
- </para>
- <para>
- Once you have Xcode installed, open a terminal, run <userinput>xcode-select --install</userinput>, and click the
- Install button to install the required command line developer tools. Don't worry if you see a message telling
- you the software cannot be installed because it is not currently available from the Software Update Server. This
- usually means you already have the latest version installed. You can also get the command line tools from <ulink
- url="https://developer.apple.com/downloads/index.action">the Apple developer website</ulink>.
- </para>
- </section>
</del><ins>+ <para>Download the latest version of Xcode <ulink
+ url="https://developer.apple.com/downloads/index.action">from the Apple developer website</ulink> or
+ get it <ulink url="http://itunes.apple.com/us/app/xcode/id497799835">using the Mac App
+ Store</ulink>.</para>
</ins><span class="cx">
</span><del>- <section id="installing.xcode.lion">
- <title>Install Xcode on OS X 10.7 Lion or OS X 10.8 Mountain Lion</title>
</del><ins>+ <para>Once you have Xcode installed, open a terminal, run <userinput>xcode-select --install</userinput>, and
+ click the Install button to install the required command line developer tools. Don't worry if you see
+ a message telling you the software cannot be installed because it is not currently available from the
+ Software Update Server. This usually means you already have the latest version installed. You can also
+ get the command line tools from <ulink url="https://developer.apple.com/downloads/index.action">the
+ Apple developer website</ulink>.</para>
+ </section>
</ins><span class="cx">
</span><del>- <para>
- Download the latest version of Xcode <ulink url="https://developer.apple.com/downloads/index.action">from the
- Apple developer website</ulink> or get it <ulink url="http://itunes.apple.com/us/app/xcode/id497799835">using
- the Mac App Store</ulink>.
- </para>
</del><ins>+ <section id="installing.xcode.lion">
+ <title>Install Xcode on OS X 10.7 Lion or OS X 10.8 Mountain Lion</title>
</ins><span class="cx">
</span><del>- <section id="installing.xcode.lion.43">
- <title>Xcode 4.3 and later</title>
- <para>
- Xcode 4.3 and later do not automatically install the command line tools, but MacPorts requires them. To
- install them, open the Xcode application, go to the Preferences window, to the Downloads section, and click
- the Install button next to Command Line Tools. Be sure to return to this window after every Xcode upgrade to
- ensure that the command line tools are also upgraded.
- </para>
- <para>
- If you wish to create Installer packages with <userinput>port pkg</userinput>, you will also need to install
- PackageMaker, which is in the <quote>Auxiliary Tools for Xcode</quote> package as of Xcode 4.3. The download
- page for this package can be opened via the Xcode -> Open Developer Tool -> More Developer Tools... menu item.
- After downloading and mounting the disk image, drag the PackageMaker application to your /Applications
- directory.
- </para>
- </section>
- </section>
</del><ins>+ <para>Download the latest version of Xcode <ulink
+ url="https://developer.apple.com/downloads/index.action">from the Apple developer website</ulink> or
+ get it <ulink url="http://itunes.apple.com/us/app/xcode/id497799835">using the Mac App
+ Store</ulink>.</para>
</ins><span class="cx">
</span><del>- <section id="installing.xcode.snowleopard">
- <title>Install Xcode on Mac OS X 10.6 Snow Leopard</title>
</del><ins>+ <section id="installing.xcode.lion.43">
+ <title>Xcode 4.3 and later</title>
</ins><span class="cx">
</span><del>- <para>
- If you are using Mac OS X 10.6, there are two branches of Xcode which could be considered to be the latest,
- 3.2.x and 4.x. Xcode 4 costs money, but Xcode 3 is still available free of charge. There are two options for
- downloading it:
- <orderedlist>
- <listitem>
- <para>
- Xcode 3.2 - smaller download, but you will need to run Software Update after installing to get the latest
- version. Note that Apple might at some point discontinue providing these updates via their update servers.
- </para>
- </listitem>
- <listitem>
- <para>
- Xcode 3.2.6 and iOS SDK 4.3 - includes the iOS SDK which is not needed for MacPorts.
- </para>
- </listitem>
- </orderedlist>
- Both are available from the <ulink url="https://developer.apple.com/downloads/index.action">Apple developer
- website</ulink>. You may also be able to install Xcode 3.2 from your Mac OS X 10.6 DVD and then run Software
- Update to get the latest version.
- </para>
</del><ins>+ <para>Xcode 4.3 and later do not automatically install the command line tools, but MacPorts requires
+ them. To install them, open the Xcode application, go to the Preferences window, to the Downloads
+ section, and click the Install button next to Command Line Tools. Be sure to return to this window
+ after every Xcode upgrade to ensure that the command line tools are also upgraded.</para>
</ins><span class="cx">
</span><del>- <para>
- Ensure that those of the following options that are available in the installer for your version of Xcode are
- selected:
- <itemizedlist>
- <listitem>
- <guibutton>UNIX Development</guibutton>
- </listitem>
- <listitem>
- <guibutton>System Tools</guibutton>
- </listitem>
- <listitem>
- <guibutton>X11 SDK</guibutton>
- </listitem>
- <listitem>
- <guibutton>Command Line Support</guibutton>
- </listitem>
- </itemizedlist>
- </para>
- </section>
</del><ins>+ <para>If you wish to create Installer packages with <userinput>port pkg</userinput>, you will also need
+ to install PackageMaker, which is in the <quote>Auxiliary Tools for Xcode</quote> package as of
+ Xcode 4.3. The download page for this package can be opened via the Xcode -> Open Developer Tool ->
+ More Developer Tools... menu item. After downloading and mounting the disk image, drag the
+ PackageMaker application to your /Applications directory.</para>
+ </section>
+ </section>
</ins><span class="cx">
</span><del>- <section id="installing.xcode.other">
- <title>Install Xcode on older releases of Mac OS X</title>
</del><ins>+ <section id="installing.xcode.snowleopard">
+ <title>Install Xcode on Mac OS X 10.6 Snow Leopard</title>
</ins><span class="cx">
</span><del>- <para>
- If you have an earlier release of Mac OS X, you may download the latest version of Xcode for OS X 10.5 (Xcode
- 3.0 and Xcode 3.1 Developer Tools) or 10.4 (Xcode 2.4.1 and Xcode 2.5 Developer Tools) from the <ulink
- url="https://developer.apple.com/downloads/index.action">Apple developer website</ulink>.
- </para>
</del><ins>+ <para>If you are using Mac OS X 10.6, there are two branches of Xcode which could be considered to be the
+ latest, 3.2.x and 4.x. Xcode 4 costs money, but Xcode 3 is still available free of charge. There are two
+ options for downloading it:
</ins><span class="cx">
</span><del>- <para>
- Ensure that those of the following options that are available in the installer for your version of Xcode are
- selected:
- <itemizedlist>
- <listitem>
- <guibutton>UNIX Development</guibutton>
- </listitem>
- <listitem>
- <guibutton>System Tools</guibutton>
- </listitem>
- <listitem>
- <guibutton>X11 SDK</guibutton>
- </listitem>
- <listitem>
- <guibutton>Command Line Support</guibutton>
- </listitem>
- </itemizedlist>
- </para>
- </section>
- </section>
</del><ins>+ <orderedlist>
+ <listitem>
+ <para>Xcode 3.2 - smaller download, but you will need to run Software Update after installing to
+ get the latest version. Note that Apple might at some point discontinue providing these
+ updates via their update servers.</para>
+ </listitem>
+ <listitem>
+ <para>Xcode 3.2.6 and iOS SDK 4.3 - includes the iOS SDK which is not needed for
+ MacPorts.</para>
+ </listitem>
+ </orderedlist>
</ins><span class="cx">
</span><del>- <section id="installing.macports">
- <title>Install MacPorts</title>
</del><ins>+ Both are available from the <ulink url="https://developer.apple.com/downloads/index.action">Apple
+ developer website</ulink>. You may also be able to install Xcode 3.2 from your Mac OS X 10.6 DVD and
+ then run Software Update to get the latest version.</para>
</ins><span class="cx">
</span><del>- <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>
</del><ins>+ <para>Ensure that those of the following options that are available in the installer for your version of
+ Xcode are selected:
</ins><span class="cx">
</span><del>- <note>
- <para>Though a distinction is made between pre-release and release
- versions of MacPorts base, the ports collection supports no such
- distinction or versioning. The <link
- linkend="using.port.selfupdate">selfupdate</link> command installs the
- latest port revisions from Subversion (at a slight delay), and updates
- MacPorts base to the latest released version.</para>
- </note>
</del><ins>+ <itemizedlist>
+ <listitem>
+ <guibutton>UNIX Development</guibutton>
+ </listitem>
+ <listitem>
+ <guibutton>System Tools</guibutton>
+ </listitem>
+ <listitem>
+ <guibutton>X11 SDK</guibutton>
+ </listitem>
+ <listitem>
+ <guibutton>Command Line Support</guibutton>
+ </listitem>
+ </itemizedlist>
+ </para>
+ </section>
</ins><span class="cx">
</span><del>- <section id="installing.macports.binary">
- <title>OS X Package Install</title>
</del><ins>+ <section id="installing.xcode.other">
+ <title>Install Xcode on older releases of Mac OS X</title>
</ins><span class="cx">
</span><del>- <para>The OS X package installer automatically installs MacPorts,
- <link linkend="installing.shell">sets the shell environment</link>, and
- runs a <link linkend="using.port.selfupdate">selfupdate</link> operation
- to update the ports tree and MacPorts base with the latest
- release.</para>
</del><ins>+ <para>If you have an earlier release of Mac OS X, you may download the latest version of Xcode for OS X 10.5
+ (Xcode 3.0 and Xcode 3.1 Developer Tools) or 10.4 (Xcode 2.4.1 and Xcode 2.5 Developer Tools) from the
+ <ulink url="https://developer.apple.com/downloads/index.action">Apple developer website</ulink>.</para>
</ins><span class="cx">
</span><del>- <orderedlist>
- <listitem>
- <para>Download the latest <filename>MacPorts-&macports-version;-<emphasis>...</emphasis>.pkg</filename>
- installer from the <ulink
- url="https://distfiles.macports.org/MacPorts/">MacPorts
- download directory</ulink>. Here are direct links for the latest versions of OS X:</para>
</del><ins>+ <para>Ensure that those of the following options that are available in the installer for your version of
+ Xcode are selected:
</ins><span class="cx">
</span><del>- <variablelist>
- <varlistentry>
- <term>
- OS X 10.9 Mavericks:
- </term>
- <listitem>
- <ulink url="https://distfiles.macports.org/MacPorts/MacPorts-&macports-version;-10.9-Mavericks.pkg">MacPorts-&macports-version;-10.9-Mavericks.pkg</ulink>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>
- OS X 10.8 Mountain Lion:
- </term>
- <listitem>
- <ulink url="https://distfiles.macports.org/MacPorts/MacPorts-&macports-version;-10.8-MountainLion.pkg">MacPorts-&macports-version;-10.8-MountainLion.pkg</ulink>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>
- OS X 10.7 Lion:
- </term>
- <listitem>
- <ulink url="https://distfiles.macports.org/MacPorts/MacPorts-&macports-version;-10.7-Lion.pkg">MacPorts-&macports-version;-10.7-Lion.pkg</ulink>
- </listitem>
- </varlistentry>
- </variablelist>
- </listitem>
</del><ins>+ <itemizedlist>
+ <listitem>
+ <guibutton>UNIX Development</guibutton>
+ </listitem>
+ <listitem>
+ <guibutton>System Tools</guibutton>
+ </listitem>
+ <listitem>
+ <guibutton>X11 SDK</guibutton>
+ </listitem>
+ <listitem>
+ <guibutton>Command Line Support</guibutton>
+ </listitem>
+ </itemizedlist>
+ </para>
+ </section>
+ </section>
</ins><span class="cx">
</span><del>- <listitem>
- <para>Double-click the downloaded package installer to perform the default <quote>easy</quote> install.</para>
- </listitem>
</del><ins>+ <section id="installing.macports">
+ <title>Install MacPorts</title>
</ins><span class="cx">
</span><del>- <listitem>
- <para>After this step you are done already, MacPorts is now
- installed and your shell environment was set up automatically
- by the installer. To confirm the installation is working as
- expected, now try using the <command>port</command> command in
- a <emphasis>new</emphasis> terminal window.</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><del>- <programlisting><prompt>%%</prompt> <userinput>port version</userinput></programlisting>
- <screen>Version: &macports-version;</screen>
</del><ins>+ <note>
+ <para>Though a distinction is made between pre-release and release versions of MacPorts base, the ports
+ collection supports no such distinction or versioning. The <link
+ linkend="using.port.selfupdate">selfupdate</link> command installs the latest port revisions from
+ Subversion (at a slight delay), and updates MacPorts base to the latest released version.</para>
+ </note>
</ins><span class="cx">
</span><del>- <para>In case of problems such as <quote>command not found</quote>,
- make sure that you opened a new terminal window, consult <xref
- linkend="installing.shell"/>. Otherwise, please skip the
- remainder of this chapter and continue with <xref linkend="using"/>
- in this guide.</para>
- </listitem>
- </orderedlist>
- </section>
</del><ins>+ <section id="installing.macports.binary">
+ <title>OS X Package Install</title>
</ins><span class="cx">
</span><del>- <section id="installing.macports.source">
- <title>Source Install</title>
</del><ins>+ <para>The OS X package installer automatically installs MacPorts, <link linkend="installing.shell">sets the
+ shell environment</link>, and runs a <link linkend="using.port.selfupdate">selfupdate</link>
+ operation to update the ports tree and MacPorts base with the latest release.</para>
</ins><span class="cx">
</span><del>- <para>If you installed MacPorts using the package installer, skip this
- section. To install MacPorts from the source code, follow the steps
- below.</para>
</del><ins>+ <orderedlist>
+ <listitem>
+ <para>Download the latest
+ <filename>MacPorts-&macports-version;-<emphasis>...</emphasis>.pkg</filename> installer from the
+ <ulink url="https://distfiles.macports.org/MacPorts/">MacPorts download directory</ulink>. Here
+ are direct links for the latest versions of OS X:</para>
</ins><span class="cx">
</span><del>- <orderedlist>
- <listitem>
- <para>Download and extract the <ulink url="https://distfiles.macports.org/MacPorts/MacPorts-&macports-version;.tar.bz2">
- MacPorts &macports-version; tarball</ulink>. Either do so using your browser and the Finder, or use the given commands
- in a terminal window.</para>
</del><ins>+ <variablelist>
+ <varlistentry>
+ <term>
+ OS X 10.9 Mavericks:
+ </term>
+ <listitem>
+ <ulink url="https://distfiles.macports.org/MacPorts/MacPorts-&macports-version;-10.9-Mavericks.pkg">MacPorts-&macports-version;-10.9-Mavericks.pkg</ulink>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>
+ OS X 10.8 Mountain Lion:
+ </term>
+ <listitem>
+ <ulink url="https://distfiles.macports.org/MacPorts/MacPorts-&macports-version;-10.8-MountainLion.pkg">MacPorts-&macports-version;-10.8-MountainLion.pkg</ulink>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>
+ OS X 10.7 Lion:
+ </term>
+ <listitem>
+ <ulink url="https://distfiles.macports.org/MacPorts/MacPorts-&macports-version;-10.7-Lion.pkg">MacPorts-&macports-version;-10.7-Lion.pkg</ulink>
+ </listitem>
+ </varlistentry>
+ </variablelist>
+ </listitem>
</ins><span class="cx">
</span><del>- <programlisting><prompt>%%</prompt> <userinput>curl -O https://distfiles.macports.org/MacPorts/MacPorts-&macports-version;.tar.bz2</userinput>
-<prompt>%%</prompt> <userinput>tar xf MacPorts-&macports-version;.tar.bz2</userinput></programlisting>
- </listitem>
</del><ins>+ <listitem>
+ <para>Double-click the downloaded package installer to perform the default <quote>easy</quote>
+ install.</para>
+ </listitem>
</ins><span class="cx">
</span><del>- <listitem>
- <para>Afterwards, perform the commands shown in the terminal window. If you wish
- to use a path other than <filename>/opt/local</filename>, follow
- the instructions for <link linkend="installing.macports.source.multiple">installing
- multiple copies of MacPorts</link> instead.</para>
</del><ins>+ <listitem>
+ <para>After this step you are done already, MacPorts is now installed and your shell environment was
+ set up automatically by the installer. To confirm the installation is working as expected, now
+ try using the <command>port</command> command in a <emphasis>new</emphasis> terminal
+ window.</para>
</ins><span class="cx">
</span><del>- <programlisting><prompt>%%</prompt> <userinput>cd MacPorts-&macports-version;/</userinput>
-<prompt>%%</prompt> <userinput>./configure</userinput>
-<prompt>%%</prompt> <userinput>make</userinput>
-<prompt>%%</prompt> <userinput>sudo make install</userinput></programlisting>
- </listitem>
</del><ins>+ <programlisting><prompt>$</prompt><userinput>port version</userinput></programlisting>
+ <screen>Version: &macports-version;</screen>
</ins><span class="cx">
</span><del>- <listitem>
- <para>Please continue with <xref linkend="installing.shell" /> to set up your shell environment.</para>
- </listitem>
- </orderedlist>
- </section>
</del><ins>+ <para>In case of problems such as <quote>command not found</quote>, make sure that you opened a new
+ terminal window or consult <xref linkend="installing.shell"/>. Otherwise, please skip the
+ remainder of this chapter and continue with <xref linkend="using"/> in this guide.</para>
+ </listitem>
+ </orderedlist>
+ </section>
</ins><span class="cx">
</span><del>- <section id="installing.macports.subversion">
- <title>Subversion Install</title>
</del><ins>+ <section id="installing.macports.source">
+ <title>Source Install</title>
</ins><span class="cx">
</span><del>- <para>If you installed MacPorts using the package installer, skip this
- section.</para>
</del><ins>+ <para>If you installed MacPorts using the package installer, skip this section. To install MacPorts from the
+ source code, follow the steps below.</para>
</ins><span class="cx">
</span><del>- <para>There are times when some may want to run MacPorts from a version
- newer than the current stable release. Maybe there's a new feature that
- you'd like to use, or it fixes an issue you've encountered, or you just
- like to be on the cutting edge. These steps explain how to run
- completely from trunk, using only Subversion to keep MacPorts up to
- date.</para>
</del><ins>+ <orderedlist>
+ <listitem>
+ <para>Download and extract the <ulink
+ url="https://distfiles.macports.org/MacPorts/MacPorts-&macports-version;.tar.bz2"> MacPorts
+ &macports-version; tarball</ulink>. Either do so using your browser and the Finder, or use
+ the given commands in a terminal window.</para>
</ins><span class="cx">
</span><del>- <orderedlist>
- <listitem>
- <para>Check out MacPorts source</para>
</del><ins>+ <programlisting><prompt>$</prompt> <userinput>curl -O https://distfiles.macports.org/MacPorts/MacPorts-&macports-version;.tar.bz2</userinput>
+<!-- --><prompt>$</prompt> <userinput>tar xf MacPorts-&macports-version;.tar.bz2</userinput></programlisting>
+ </listitem>
</ins><span class="cx">
</span><del>- <para>Pick a location to store a working copy of the MacPorts code.
- For this example, <filename>/opt/mports</filename> will be used, but
- you can put the source anywhere. This example will create
- <filename>/opt/mports/trunk</filename> containing everything needed
- for MacPorts.</para>
</del><ins>+ <listitem>
+ <para>Afterwards, perform the commands shown in the terminal window. If you wish to use a path other
+ than <filename>/opt/local</filename>, follow the instructions for <link
+ linkend="installing.macports.source.multiple">installing multiple copies of MacPorts</link>
+ instead.</para>
</ins><span class="cx">
</span><del>- <programlisting><prompt>%%</prompt> <userinput>mkdir -p /opt/mports</userinput>
-<prompt>%%</prompt> <userinput>cd /opt/mports</userinput>
-<prompt>%%</prompt> <userinput>svn checkout https://svn.macports.org/repository/macports/trunk</userinput></programlisting>
</del><ins>+ <programlisting><prompt>$</prompt> <userinput>cd MacPorts-&macports-version;/</userinput>
+<!-- --><prompt>$</prompt> <userinput>./configure</userinput>
+<!-- --><prompt>$</prompt> <userinput>make</userinput>
+<!-- --><prompt>$</prompt> <userinput>sudo make install</userinput></programlisting>
+ </listitem>
</ins><span class="cx">
</span><del>- <note>
- <para>
- You only really need the base subdirectory to run MacPorts, so you can avoid checking out the rest if you don't want to use a Subversion-based ports tree (see Step 3 below). To just get the base directory, append
</del><ins>+ <listitem>
+ <para>Please continue with <xref linkend="installing.shell" /> to set up your shell
+ environment.</para>
+ </listitem>
+ </orderedlist>
+ </section>
</ins><span class="cx">
</span><del>- <filename>/base</filename>
</del><ins>+ <section id="installing.macports.subversion">
+ <title>Subversion Install</title>
</ins><span class="cx">
</span><del>- to the end of the svn checkout command above. The resulting directory will then be
</del><ins>+ <para>If you installed MacPorts using the package installer, skip this section.</para>
</ins><span class="cx">
</span><del>- <filename>/opt/mports/base</filename>
</del><ins>+ <para>There are times when some may want to run MacPorts from a version newer than the current stable
+ release. Maybe there's a new feature that you'd like to use, or it fixes an issue you've encountered, or
+ you just like to be on the cutting edge. These steps explain how to run completely from trunk, using
+ only Subversion to keep MacPorts up to date.</para>
</ins><span class="cx">
</span><del>- </para>
- </note>
- </listitem>
</del><ins>+ <orderedlist>
+ <listitem>
+ <para>Check out MacPorts source</para>
</ins><span class="cx">
</span><del>- <listitem>
- <para>Build and Install MacPorts</para>
</del><ins>+ <para>Pick a location to store a working copy of the MacPorts code. For this example,
+ <filename>/opt/mports</filename> will be used, but you can put the source anywhere. This example
+ will create <filename>/opt/mports/trunk</filename> containing everything needed for
+ MacPorts.</para>
</ins><span class="cx">
</span><del>- <para>MacPorts uses autoconf and makefiles for installation. These
- commands will build and install MacPorts to
- <filename>/opt/local</filename>. You can add the
- <option>--prefix</option> option to <filename>./configure</filename>
- to relocate MacPorts to another directory if needed.</para>
</del><ins>+ <programlisting><prompt>$</prompt> <userinput>mkdir -p /opt/mports</userinput>
+<!-- --><prompt>$</prompt> <userinput>cd /opt/mports</userinput>
+<!-- --><prompt>$</prompt> <userinput>svn checkout https://svn.macports.org/repository/macports/trunk</userinput></programlisting>
</ins><span class="cx">
</span><del>- <programlisting><prompt>%%</prompt> <userinput>cd /opt/mports/trunk/base</userinput>
-<prompt>%%</prompt> <userinput>./configure --enable-readline</userinput>
-<prompt>%%</prompt> <userinput>make</userinput>
-<prompt>%%</prompt> <userinput>sudo make install</userinput>
-<prompt>%%</prompt> <userinput>make distclean</userinput></programlisting>
- </listitem>
</del><ins>+ <note>
+ <para>You only really need the base subdirectory to run MacPorts, so you can avoid checking out
+ the rest if you don't want to use a Subversion-based ports tree (see Step 3 below). To just
+ get the base directory, append <filename>/base</filename> to the end of the svn checkout
+ command above. The resulting directory will then be
+ <filename>/opt/mports/base</filename>.</para>
+ </note>
+ </listitem>
</ins><span class="cx">
</span><del>- <listitem>
- <para>(Optional) Configure MacPorts to use port information from
- Subversion</para>
</del><ins>+ <listitem>
+ <para>Build and Install MacPorts</para>
</ins><span class="cx">
</span><del>- <para>This step is useful if you want to do port development. Open
- <filename>/opt/local/etc/macports/sources.conf</filename> in a text
- editor. The last line which should look like this:</para>
</del><ins>+ <para>MacPorts uses autoconf and makefiles for installation. These commands will build and install
+ MacPorts to <filename>/opt/local</filename>. You can add the <option>--prefix</option> option to
+ <filename>./configure</filename> to relocate MacPorts to another directory if needed.</para>
</ins><span class="cx">
</span><del>- <programlisting>rsync://rsync.macports.org/release/tarballs/ports.tar [default]</programlisting>
</del><ins>+ <programlisting><prompt>$</prompt> <userinput>cd /opt/mports/trunk/base</userinput>
+<!-- --><prompt>$</prompt> <userinput>./configure --enable-readline</userinput>
+<!-- --><prompt>$</prompt> <userinput>make</userinput>
+<!-- --><prompt>$</prompt> <userinput>sudo make install</userinput>
+<!-- --><prompt>$</prompt> <userinput>make distclean</userinput></programlisting>
+ </listitem>
</ins><span class="cx">
</span><del>- <para>Change it to point to the working copy you checked out:</para>
</del><ins>+ <listitem>
+ <para>(Optional) Configure MacPorts to use port information from Subversion</para>
</ins><span class="cx">
</span><del>- <programlisting>file:///opt/mports/trunk/dports [default]</programlisting>
</del><ins>+ <para>This step is useful if you want to do port development. Open
+ <filename>/opt/local/etc/macports/sources.conf</filename> in a text editor. The last line which
+ should look like this:</para>
</ins><span class="cx">
</span><del>- <para>Now MacPorts will look for portfiles in the working
- copy.</para>
- </listitem>
</del><ins>+ <programlisting>rsync://rsync.macports.org/release/tarballs/ports.tar [default]</programlisting>
</ins><span class="cx">
</span><del>- <listitem>
- <para>Environment</para>
</del><ins>+ <para>Change it to point to the working copy you checked out:</para>
</ins><span class="cx">
</span><del>- <para>You should setup your PATH and other environment options
- according to <xref linkend="installing.shell" />.</para>
- </listitem>
- </orderedlist>
- </section>
</del><ins>+ <programlisting>file:///opt/mports/trunk/dports [default]</programlisting>
</ins><span class="cx">
</span><del>- <section id="installing.macports.source.multiple">
- <title>Install Multiple MacPorts Copies</title>
</del><ins>+ <para>Now MacPorts will look for portfiles in the working copy and use Subversion instead of rsync
+ to update your ports tree.</para>
+ </listitem>
</ins><span class="cx">
</span><del>- <para>Occasionally a MacPorts developer may wish to install more than
- one MacPorts instance on the same host. Only one copy of MacPorts may
- use the default prefix <filename>/opt/local</filename>, so
- for additional installations use the option
- <option>--prefix</option> as shown below. It's also recommended
- to change the applications dir using
- <option>--with-applications-dir</option> to avoid conflicts in
- <filename>/Applications/MacPorts</filename>.</para>
</del><ins>+ <listitem>
+ <para>Environment</para>
</ins><span class="cx">
</span><del>- <note>
- <para>The first command temporarily removes the standard MacPorts
- binary paths because they must not be present while installing a
- second instance.</para>
- </note>
</del><ins>+ <para>You should setup your PATH and other environment options according to <xref
+ linkend="installing.shell" />.</para>
+ </listitem>
+ </orderedlist>
+ </section>
</ins><span class="cx">
</span><del>- <programlisting><prompt>%%</prompt> <userinput>export PATH=/bin:/sbin:/usr/bin:/usr/sbin</userinput>
-<prompt>%%</prompt> <userinput>MP_PREFIX=/opt/macports-test</userinput>
-<prompt>%%</prompt> <userinput>./configure --prefix=$MP_PREFIX --with-applications-dir=$MP_PREFIX/Applications</userinput>
-<prompt>%%</prompt> <userinput>make</userinput>
-<prompt>%%</prompt> <userinput>sudo make install</userinput>
-</programlisting>
</del><ins>+ <section id="installing.macports.source.multiple">
+ <title>Install Multiple MacPorts Copies</title>
</ins><span class="cx">
</span><del>- <para>After installing the second instance you might need to add
- <programlisting>startupitem_install no</programlisting> to
- <filename>$MP_PREFIX/etc/macports/macports.conf</filename> to avoid
- conflicts in <filename>/Library/LaunchAgents</filename>.
- </para>
</del><ins>+ <para>Occasionally a MacPorts developer may wish to install more than one MacPorts instance on the same
+ host. Only one copy of MacPorts may use the default prefix <filename>/opt/local</filename>, so for
+ additional installations use the option <option>--prefix</option> as shown below. It's also recommended
+ to change the applications dir using <option>--with-applications-dir</option> to avoid conflicts in
+ <filename>/Applications/MacPorts</filename>.</para>
+
+ <note>
+ <para>The first command temporarily removes the standard MacPorts binary paths because they must not be
+ present while installing a second instance.</para>
+ </note>
+
+ <programlisting><prompt>$</prompt> <userinput>export PATH=/bin:/sbin:/usr/bin:/usr/sbin</userinput>
+<!-- --><prompt>$</prompt> <userinput>MP_PREFIX=/opt/macports-test</userinput>
+<!-- --><prompt>$</prompt> <userinput>./configure --prefix=$MP_PREFIX --with-applications-dir=$MP_PREFIX/Applications</userinput>
+<!-- --><prompt>$</prompt> <userinput>make</userinput>
+<!-- --><prompt>$</prompt> <userinput>sudo make install</userinput></programlisting>
+
+ <para>After installing the second instance you might need to add
+ <programlisting>startupitem_install no</programlisting>
+ to <filename>$MP_PREFIX/etc/macports/macports.conf</filename> to avoid conflicts in
+ <filename>/Library/LaunchAgents</filename>.</para>
+ </section>
</ins><span class="cx"> </section>
</span><del>- </section>
</del><span class="cx">
</span><del>- <section id="installing.macports.upgrade">
- <title>MacPorts Upgrade</title>
</del><ins>+ <section id="installing.macports.upgrade">
+ <title>MacPorts Upgrade</title>
</ins><span class="cx">
</span><del>- <para>MacPorts base upgrades are performed automatically (when a newer
- release is available) during a <link
- linkend="using.port.selfupdate">selfupdate</link> operation. To upgrade a
- copy of MacPorts that was installed from source to the newer release of
- the source code, simply repeat the <link
- linkend="installing.macports.source">source install</link> with the newer
- version of the MacPorts source code.</para>
- </section>
</del><ins>+ <para>MacPorts base upgrades are performed automatically (when a newer release is available) during a <link
+ linkend="using.port.selfupdate">selfupdate</link> operation. To upgrade a copy of MacPorts that was
+ installed from source to the newer release of the source code, simply repeat the <link
+ linkend="installing.macports.source">source install</link> with the newer version of the MacPorts source
+ code.</para>
+ </section>
</ins><span class="cx">
</span><del>- <section id="installing.macports.uninstalling">
- <title>Uninstall</title>
</del><ins>+ <section id="installing.macports.uninstalling">
+ <title>Uninstall</title>
</ins><span class="cx">
</span><del>- <para>Uninstalling MacPorts can be a drastic step, and depending on the
- issue you are experiencing, you may not need to do so. If you are unsure,
- ask on the
- <ulink url="http://lists.macosforge.org/mailman/listinfo/macports-users">macports-users</ulink>
- mailing list first.</para>
-
- <para>If you need to uninstall MacPorts, and your <command>port</command> command is
- functioning, first uninstall all the installed ports by running this
- command in the Terminal:</para>
- <programlisting><prompt>%%</prompt> <userinput>sudo port -fp uninstall installed</userinput></programlisting>
</del><ins>+ <para>Uninstalling MacPorts can be a drastic step, and depending on the issue you are experiencing, you may not
+ need to do so. If you are unsure, ask on the <ulink
+ url="http://lists.macosforge.org/mailman/listinfo/macports-users">macports-users</ulink> mailing list
+ first.</para>
</ins><span class="cx">
</span><del>- <para>All that will be left in your installation prefix now will be files
- that were not registered to any port. This includes configuration
- files, databases, any files which MacPorts
- renamed in order to allow a forced installation or upgrade, and the base
- MacPorts software itself. You may wish to save your configuration files
- (most are in <filename>${prefix}/etc</filename>), databases, or any other
- unique data by moving it aside.</para>
</del><ins>+ <para>If you need to uninstall MacPorts, and your <command>port</command> command is functioning, first
+ uninstall all the installed ports by running this command in the Terminal:</para>
</ins><span class="cx">
</span><del>- <para>To remove all remaining traces of MacPorts, run the following
- command in the Terminal. If you have changed <varname>prefix</varname>,
- <varname>applications_dir</varname> or <varname>frameworks_dir</varname>
- from their default values, then replace <filename>/opt/local</filename>
- with your <varname>prefix</varname>, replace <filename>/Applications/MacPorts</filename>
- with your <varname>applications_dir</varname>, and/or add your
- <varname>frameworks_dir</varname> to the list, respectively.</para>
- <programlisting><prompt>%%</prompt> <userinput>sudo rm -rf \
- /opt/local \
- /Applications/DarwinPorts \
- /Applications/MacPorts \
- /Library/LaunchDaemons/org.macports.* \
- /Library/Receipts/DarwinPorts*.pkg \
- /Library/Receipts/MacPorts*.pkg \
- /Library/StartupItems/DarwinPortsStartup \
- /Library/Tcl/darwinports1.0 \
- /Library/Tcl/macports1.0 \
- ~/.macports</userinput></programlisting>
-
- <para>If you use a shell other than bash (perhaps tcsh), you may need to
- adjust the above to fit your shell's syntax. Also note that depending on which
- version of MacPorts you have and which ports you have installed, not all of
- the above paths will exist on your system. This is OK.</para>
- </section>
</del><ins>+ <programlisting><prompt>$</prompt> <userinput>sudo port -fp uninstall installed</userinput></programlisting>
</ins><span class="cx">
</span><del>- <section id="installing.shell">
- <title>MacPorts and the Shell</title>
</del><ins>+ <para>All that will be left in your installation prefix now will be files that were not registered to any port.
+ This includes configuration files, databases, any files which MacPorts renamed in order to allow a forced
+ installation or upgrade, and the base MacPorts software itself. You may wish to save your configuration
+ files (most are in <filename>$prefix/etc</filename>), databases, or any other unique data by moving it
+ aside.</para>
</ins><span class="cx">
</span><del>- <para>MacPorts requires that some environment variables be set in the
- shell. When MacPorts is installed using the OS X package installer, a
- <quote>postflight</quote> script is run after installation that
- automatically adds or modifies a shell configuration file in your home directory,
- ensuring that it defines variables
- according to the rules described in the following section. Those <link
- linkend="installing.macports.source">installing MacPorts from source
- code</link> must modify their environment manually using the rules as a
- guide.</para>
</del><ins>+ <para>To remove all remaining traces of MacPorts, run the following command in the Terminal. If you have changed
+ <varname>prefix</varname>, <varname>applications_dir</varname> or <varname>frameworks_dir</varname> from
+ their default values, then replace <filename>/opt/local</filename> with your <varname>prefix</varname>,
+ replace <filename>/Applications/MacPorts</filename> with your <varname>applications_dir</varname>, and/or
+ add your <varname>frameworks_dir</varname> to the list, respectively.</para>
</ins><span class="cx">
</span><del>- <para>Depending on your shell and which configuration files already exist, the
- installer may use <filename>.profile</filename>, <filename>.bash_login</filename>,
- <filename>.bash_profile</filename>, <filename>.tcshrc</filename>, or
- <filename>.cshrc</filename>.</para>
</del><ins>+ <programlisting><prompt>$</prompt> <userinput>sudo rm -rf \
+ /opt/local \
+ /Applications/DarwinPorts \
+ /Applications/MacPorts \
+ /Library/LaunchDaemons/org.macports.* \
+ /Library/Receipts/DarwinPorts*.pkg \
+ /Library/Receipts/MacPorts*.pkg \
+ /Library/StartupItems/DarwinPortsStartup \
+ /Library/Tcl/darwinports1.0 \
+ /Library/Tcl/macports1.0 \
+ ~/.macports</userinput></programlisting>
</ins><span class="cx">
</span><del>- <section id="installing.shell.postflight">
- <title>The Postflight Script</title>
</del><ins>+ <para>If you use a shell other than bash (perhaps tcsh), you may need to adjust the above to fit your shell's
+ syntax. Also note that depending on which version of MacPorts you have and which ports you have installed,
+ not all of the above paths will exist on your system. This is OK.</para>
+ </section>
</ins><span class="cx">
</span><del>- <para>The postflight script automatically sets
- the <varname>PATH</varname>
- variable, and optionally the <varname>MANPATH</varname> and
- <varname>DISPLAY</varname> variables according to the rules described
- below. If a current shell configuration file exists at
- installation time it is renamed to <quote>mpsaved_$timestamp</quote>.
- Those <link linkend="installing.macports.source">installing MacPorts
- from source code</link> must modify their environment manually using the
- rules as a guide.</para>
</del><ins>+ <section id="installing.shell">
+ <title>MacPorts and the Shell</title>
</ins><span class="cx">
</span><del>- <itemizedlist>
- <listitem>
- <para>Required: <varname>PATH</varname> variable</para>
</del><ins>+ <para>MacPorts requires that some environment variables be set in the shell. When MacPorts is installed using
+ the OS X package installer, a <quote>postflight</quote> script is run after installation that automatically
+ adds or modifies a shell configuration file in your home directory, ensuring that it defines variables
+ according to the rules described in the following section. Those <link
+ linkend="installing.macports.source">installing MacPorts from source code</link> must modify their
+ environment manually using the rules as a guide.</para>
</ins><span class="cx">
</span><del>- <para>This variable is set by the postflight script to append the
- MacPorts executable paths to the default path as shown. The MacPorts
- paths are appended at the front of <varname>PATH</varname> so the
- MacPorts libraries will take precedence over vendor-supplied
- libraries for ported software at runtime.</para>
</del><ins>+ <para>Depending on your shell and which configuration files already exist, the installer may use
+ <filename>.profile</filename>, <filename>.bash_login</filename>, <filename>.bash_profile</filename>,
+ <filename>.tcshrc</filename>, or <filename>.cshrc</filename>.</para>
</ins><span class="cx">
</span><del>- <programlisting>export PATH=/opt/local/bin:/opt/local/sbin:$PATH</programlisting>
</del><ins>+ <section id="installing.shell.postflight">
+ <title>The Postflight Script</title>
</ins><span class="cx">
</span><del>- <note>
- <para>The user environment's $PATH is not in effect while ports
- are being installed, because the $PATH is scrubbed before ports
- are installed, and restored afterwards. To change the search path
- for locating system executables (rsync, tar, etc.) during port
- installation, see the <link
- linkend="internals.configuration-files.macports-conf">macports.conf</link>
- file variable <varname>binpath</varname>. But changing this
- variable is for advanced users only, and is not generally needed
- or recomended.</para>
- </note>
- </listitem>
</del><ins>+ <para>The postflight script automatically sets the <varname>PATH</varname> variable, and optionally the
+ <varname>MANPATH</varname> and <varname>DISPLAY</varname> variables according to the rules described
+ below. If a current shell configuration file exists at installation time it is renamed to
+ <quote>mpsaved_$timestamp</quote>. Those <link linkend="installing.macports.source">installing MacPorts
+ from source code</link> must modify their environment manually using the rules as a guide.</para>
</ins><span class="cx">
</span><del>- <listitem>
- <para>Optional: <varname>MANPATH</varname> variable</para>
</del><ins>+ <itemizedlist>
+ <listitem>
+ <para>Required: <varname>PATH</varname> variable</para>
</ins><span class="cx">
</span><del>- <para>Condition: If prior to MacPorts installation a
- <varname>MANPATH</varname> variable exists in a current
- <filename>.profile</filename> that contains neither the value
- <filename>${prefix}/share/man,</filename> nor any empty values, the
- postflight script sets the <varname>MANPATH</varname> variable as
- shown below. Otherwise, the <varname>MANPATH</varname> variable is
- omitted.</para>
</del><ins>+ <para>This variable is set by the postflight script to append the MacPorts executable paths to the
+ default path as shown. The MacPorts paths are appended at the front of <varname>PATH</varname>
+ so the MacPorts libraries will take precedence over vendor-supplied libraries for ported
+ software at runtime.</para>
</ins><span class="cx">
</span><del>- <programlisting>export MANPATH=/opt/local/share/man:$MANPATH</programlisting>
</del><ins>+ <programlisting>export PATH=/opt/local/bin:/opt/local/sbin:$PATH</programlisting>
</ins><span class="cx">
</span><del>- <para>Here are some examples of paths that contain empty
- values:</para>
</del><ins>+ <note>
+ <para>The user environment's $PATH is not in effect while ports are being installed, because the
+ $PATH is scrubbed before ports are installed, and restored afterwards. To change the search
+ path for locating system executables (rsync, tar, etc.) during port installation, see the
+ <link linkend="internals.configuration-files.macports-conf">macports.conf</link> file
+ variable <varname>binpath</varname>. But changing this variable is for advanced users only,
+ and is not generally needed or recomended.</para>
+ </note>
+ </listitem>
</ins><span class="cx">
</span><del>- <simplelist>
- <member>/usr/share/man:</member>
</del><ins>+ <listitem>
+ <para>Optional: <varname>MANPATH</varname> variable</para>
</ins><span class="cx">
</span><del>- <member>:/usr/share/man</member>
</del><ins>+ <para>Condition: If prior to MacPorts installation a <varname>MANPATH</varname> variable exists in
+ a current <filename>.profile</filename> that contains neither the value
+ <filename>${prefix}/share/man,</filename> nor any empty values, the postflight script sets the
+ <varname>MANPATH</varname> variable as shown below. Otherwise, the <varname>MANPATH</varname>
+ variable is omitted.</para>
</ins><span class="cx">
</span><del>- <member>/usr/share/man::/usr/X11R6/man</member>
- </simplelist>
- </listitem>
</del><ins>+ <programlisting>export MANPATH=/opt/local/share/man:$MANPATH</programlisting>
</ins><span class="cx">
</span><del>- <listitem>
- <para>Optional: <varname>DISPLAY</varname> variable</para>
</del><ins>+ <para>Here are some examples of paths that contain empty values:</para>
</ins><span class="cx">
</span><del>- <para>Condition: If installing on a Mac OS X version earlier than
- 10.5 (Leopard), and if a shell configuration file exists
- at time of MacPorts installation without a
- <varname>DISPLAY</varname> variable, the postflight script sets a
- <varname>DISPLAY</varname> variable as shown below. The
- <varname>DISPLAY</varname> variable is always omitted on Mac OS X
- 10.5 or higher.</para>
</del><ins>+ <simplelist>
+ <member>/usr/share/man:</member>
+ <member>:/usr/share/man</member>
+ <member>/usr/share/man::/usr/X11R6/man</member>
+ </simplelist>
+ </listitem>
</ins><span class="cx">
</span><del>- <programlisting>export DISPLAY=:0.0</programlisting>
- </listitem>
- </itemizedlist>
- </section>
</del><ins>+ <listitem>
+ <para>Optional: <varname>DISPLAY</varname> variable</para>
</ins><span class="cx">
</span><del>- <section id="installing.shell.verifyprofile">
- <title>Verify the configuration file</title>
</del><ins>+ <para>Condition: If installing on a Mac OS X version earlier than 10.5 (Leopard), and if a shell
+ configuration file exists at time of MacPorts installation without a <varname>DISPLAY</varname>
+ variable, the postflight script sets a <varname>DISPLAY</varname> variable as shown below. The
+ <varname>DISPLAY</varname> variable is always omitted on Mac OS X 10.5 or higher.</para>
</ins><span class="cx">
</span><del>- <para>To verify that the file containing the
- MacPorts variables is in effect, type <command>env</command> in the
- terminal to verify the current environment settings after the
- file has been created. Example output for the
- <command>env</command> command is shown below.</para>
</del><ins>+ <programlisting>export DISPLAY=:0.0</programlisting>
+ </listitem>
+ </itemizedlist>
+ </section>
</ins><span class="cx">
</span><del>- <note>
- <para>Changes to shell configuration files do not take effect
- until a new terminal session is opened.</para>
- </note>
</del><ins>+ <section id="installing.shell.verifyprofile">
+ <title>Verify the configuration file</title>
</ins><span class="cx">
</span><del>- <screen>MANPATH=
-TERM_PROGRAM=Apple_Terminal
-TERM=xterm-color
-SHELL=/bin/bash
-TERM_PROGRAM_VERSION=237
-USER=joebob
-__CF_USER_TEXT_ENCODING=0x1FC:0:0
-PATH=/opt/local/bin:/opt/local/sbin:/bin:/sbin:/usr/bin:/usr/sbin
-PWD=/Users/joebob
-EDITOR=/usr/bin/pico
-SHLVL=1
-HOME=/Users/joebob
-LOGNAME=joebob
-DISPLAY=:0.0
-SECURITYSESSIONID=b0cea0
-_=/usr/bin/env</screen>
- </section>
</del><ins>+ <para>To verify that the file containing the MacPorts variables is in effect, type <command>env</command> in
+ the terminal to verify the current environment settings after the file has been created. Example output
+ for the <command>env</command> command is shown below.</para>
</ins><span class="cx">
</span><del>- <section id="installing.shell.editorvar">
- <title>Optional Editor Variables</title>
</del><ins>+ <note>
+ <para>Changes to shell configuration files do not take effect until a new terminal session is
+ opened.</para>
+ </note>
</ins><span class="cx">
</span><del>- <para>You can set an environment variable in order to use your favorite
- text editor with edit option of port command.</para>
- <para>MacPorts will check <varname>MP_EDITOR</varname>,
- <varname>VISUAL</varname> and <varname>EDITOR</varname> in this order,
- allowing you to either use a default editor shared with other programs
- (<varname>VISUAL</varname> and <varname>EDITOR</varname>) or a Macports'
- specific one (<varname>MP_EDITOR</varname>).</para>
</del><ins>+ <screen>MANPATH=
+<!-- -->TERM_PROGRAM=Apple_Terminal
+<!-- -->TERM=xterm-color
+<!-- -->SHELL=/bin/bash
+<!-- -->TERM_PROGRAM_VERSION=237
+<!-- -->USER=joebob
+<!-- -->__CF_USER_TEXT_ENCODING=0x1FC:0:0
+<!-- -->PATH=/opt/local/bin:/opt/local/sbin:/bin:/sbin:/usr/bin:/usr/sbin
+<!-- -->PWD=/Users/joebob
+<!-- -->EDITOR=/usr/bin/pico
+<!-- -->SHLVL=1
+<!-- -->HOME=/Users/joebob
+<!-- -->LOGNAME=joebob
+<!-- -->DISPLAY=:0.0
+<!-- -->SECURITYSESSIONID=b0cea0
+<!-- -->_=/usr/bin/env</screen>
+ </section>
</ins><span class="cx">
</span><del>- <para>For example, to use the nano editor, add this line to your
- bash config:</para>
</del><ins>+ <section id="installing.shell.editorvar">
+ <title>Optional Editor Variables</title>
</ins><span class="cx">
</span><del>- <programlisting>export EDITOR=/usr/bin/nano</programlisting>
</del><ins>+ <para>You can set an environment variable in order to use your favorite text editor with edit option of port
+ command.</para> <para>MacPorts will check <varname>MP_EDITOR</varname>, <varname>VISUAL</varname> and
+ <varname>EDITOR</varname> in this order, allowing you to either use a default editor shared with other
+ programs (<varname>VISUAL</varname> and <varname>EDITOR</varname>) or a Macports' specific one
+ (<varname>MP_EDITOR</varname>).</para>
</ins><span class="cx">
</span><del>- <para>To use the user-friendly GUI editor <ulink
- url="http://www.barebones.com/products/textwrangler/">TextWrangler</ulink>
- (installation required), add this line:</para>
</del><ins>+ <para>For example, to use the nano editor, add this line to your bash config:</para>
</ins><span class="cx">
</span><del>- <programlisting>export EDITOR=/usr/bin/edit</programlisting>
-
- <para>To keep a command-line text editor as default while using a graphic editor with
- portfiles, add this: </para>
</del><ins>+ <programlisting>export EDITOR=/usr/bin/nano</programlisting>
</ins><span class="cx">
</span><del>- <programlisting>export EDITOR=/usr/bin/vi
-export MP_EDITOR=/usr/bin/edit</programlisting>
</del><ins>+ <para>To use the user-friendly GUI editor <ulink
+ url="http://www.barebones.com/products/textwrangler/">TextWrangler</ulink> (installation required),
+ add this line:</para>
+
+ <programlisting>export EDITOR=/usr/bin/edit</programlisting>
+
+ <para>To keep a command-line text editor as default while using a graphic editor with portfiles, add
+ this:</para>
+
+ <programlisting>export EDITOR=/usr/bin/vi
+<!-- -->export MP_EDITOR=/usr/bin/edit</programlisting>
+ </section>
</ins><span class="cx"> </section>
</span><del>- </section>
</del><span class="cx"> </chapter>
</span></span></pre></div>
<a id="trunkdocnewguidexmlintroxml"></a>
<div class="modfile"><h4>Modified: trunk/doc-new/guide/xml/intro.xml (122854 => 122855)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/doc-new/guide/xml/intro.xml 2014-07-31 21:24:25 UTC (rev 122854)
+++ trunk/doc-new/guide/xml/intro.xml 2014-07-31 21:52:33 UTC (rev 122855)
</span><span class="lines">@@ -1,85 +1,75 @@
</span><span class="cx"> <?xml version="1.0" encoding="UTF-8"?>
</span><ins>+<!-- -*- coding: utf-8; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:et:sw=4:ts=4:sts=4:tw=120
+-->
</ins><span class="cx"> <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
</span><span class="cx"> "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
</span><span class="cx"> <chapter id="introduction">
</span><del>- <title>Introduction</title>
</del><ins>+ <title>Introduction</title>
</ins><span class="cx">
</span><del>- <para>MacPorts is an easy to use system for compiling, installing, and
- managing open source software. MacPorts may be conceptually divided into two
- main parts: the infrastructure, known as MacPorts base, and the set of
- available ports. A MacPorts port is a set of specifications contained in
- a <link linkend="development.introduction">Portfile</link> that defines an
- application, its characteristics, and any files or special instructions
- required to install it. This allows you to use a single command to tell
- MacPorts to automatically download, compile, and install applications and
- libraries. But using MacPorts to manage your open source software provides
- several other significant advantages. For example, MacPorts:</para>
</del><ins>+ <para>MacPorts is an easy to use system for compiling, installing, and managing open source software. MacPorts may
+ be conceptually divided into two main parts: the infrastructure, known as MacPorts base, and the set of
+ available ports. A MacPorts port is a set of specifications contained in a <link
+ linkend="development.introduction">Portfile</link> that defines an application, its characteristics, and any
+ files or special instructions required to install it. This allows you to use a single command to tell MacPorts
+ to automatically download, compile, and install applications and libraries. But using MacPorts to manage your
+ open source software provides several other significant advantages. For example, MacPorts:</para>
</ins><span class="cx">
</span><del>- <itemizedlist>
- <listitem>
- <para>Installs automatically any required support software, known as
- <link linkend="reference.dependencies">dependencies</link>, for a given
- port.</para>
- </listitem>
</del><ins>+ <itemizedlist>
+ <listitem>
+ <para>Installs automatically any required support software, known as <link
+ linkend="reference.dependencies">dependencies</link>, for a given port.</para>
+ </listitem>
</ins><span class="cx">
</span><del>- <listitem>
- <para>Provides for uninstalls and upgrades for installed ports.</para>
- </listitem>
</del><ins>+ <listitem>
+ <para>Provides for uninstalls and upgrades for installed ports.</para>
+ </listitem>
</ins><span class="cx">
</span><del>- <listitem>
- <para>Confines ported software to a private <quote>sandbox</quote> that
- keeps it from intermingling with your operating system and its
- vendor-supplied software to prevent them from becoming corrupted.</para>
- </listitem>
</del><ins>+ <listitem>
+ <para>Confines ported software to a private <quote>sandbox</quote> that keeps it from intermingling with
+ your operating system and its vendor-supplied software to prevent them from becoming corrupted.</para>
+ </listitem>
</ins><span class="cx">
</span><del>- <listitem>
- <para>Allows you to create pre-compiled binary installers of ported
- applications to quickly install software on remote computers without
- compiling from source code.</para>
- </listitem>
- </itemizedlist>
</del><ins>+ <listitem>
+ <para>Allows you to create pre-compiled binary installers of ported applications to quickly install software
+ on remote computers without compiling from source code.</para>
+ </listitem>
+ </itemizedlist>
</ins><span class="cx">
</span><del>- <para>MacPorts is developed on OS X, though it is designed to be portable so
- it can work on other Unix-like systems, especially those descended from the
- Berkeley Software Distribution (BSD). In practice, installing ports only works
- on OS X. MacPorts base can be compiled on Linux (and possibly other
- POSIX-compatible systems) where it is mainly used to set up mirrors and
- generate portindices.</para>
</del><ins>+ <para>MacPorts is developed on OS X, though it is designed to be portable so it can work on other Unix-like systems,
+ especially those descended from the Berkeley Software Distribution (BSD). In practice, installing ports only
+ works on OS X. MacPorts base can be compiled on Linux (and possibly other POSIX-compatible systems) where it is
+ mainly used to set up mirrors and generate support files for installations on OS X.</para>
</ins><span class="cx">
</span><del>- <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>
</del><ins>+ <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>
</ins><span class="cx">
</span><del>- <itemizedlist>
- <listitem>
- <para>Terminal I/O and file text.</para>
</del><ins>+ <itemizedlist>
+ <listitem>
+ <para>Terminal I/O and file text.</para>
</ins><span class="cx">
</span><del>- <programlisting><prompt>%% </prompt><userinput>Commands to be typed into a terminal window.</userinput></programlisting>
</del><ins>+ <programlisting><prompt>$ </prompt><userinput>Commands to be typed into a terminal window.</userinput></programlisting>
+ <screen>Command output to a terminal window.</screen>
+ <programlisting>File text.</programlisting>
+ </listitem>
</ins><span class="cx">
</span><del>- <screen>Command output to a terminal window.</screen>
-
- <programlisting>File text.</programlisting>
- </listitem>
-
- <listitem>
- <para>Other special text types.</para>
-
- <itemizedlist>
</del><span class="cx"> <listitem>
</span><del>- <para>A hyperlink: <ulink
- url="http://en.wikipedia.org/wiki/Spontaneous_combustion">spontaneous
- combustion</ulink>.</para>
</del><ins>+ <para>Other special text types.</para>
+
+ <itemizedlist>
+ <listitem>
+ <para>A hyperlink: <ulink url="http://en.wikipedia.org/wiki/Spontaneous_combustion">spontaneous
+ combustion</ulink>.</para>
+ </listitem>
+ <listitem>
+ <para>A file: <filename>/var/log/system.log</filename>.</para>
+ </listitem>
+ <listitem>
+ <para>A command: <command>ifconfig</command>.</para>
+ </listitem>
+ <listitem>
+ <para>An option: port <option>install</option></para>
+ </listitem>
+ </itemizedlist>
</ins><span class="cx"> </listitem>
</span><del>- <listitem>
- <para>A file: <filename>/var/log/system.log</filename>.</para>
- </listitem>
- <listitem>
- <para>A command: <command>ifconfig</command>.</para>
- </listitem>
- <listitem>
- <para>An option: port <option>install</option></para>
- </listitem>
- </itemizedlist>
- </listitem>
- </itemizedlist>
</del><ins>+ </itemizedlist>
</ins><span class="cx"> </chapter>
</span></span></pre>
</div>
</div>
</body>
</html>