<!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>[134587] 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/134587">134587</a></dd>
<dt>Author</dt> <dd>ionic@macports.org</dd>
<dt>Date</dt> <dd>2015-03-30 17:39:17 -0700 (Mon, 30 Mar 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>doc-new/guide/xml: indentation and whitespace fixes.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdocnewguidexmlinternalsxml">trunk/doc-new/guide/xml/internals.xml</a></li>
<li><a href="#trunkdocnewguidexmlmacportsconfxml">trunk/doc-new/guide/xml/macports.conf.xml</a></li>
<li><a href="#trunkdocnewguidexmlportfiledependenciesxml">trunk/doc-new/guide/xml/portfile-dependencies.xml</a></li>
<li><a href="#trunkdocnewguidexmlportfilekeywordsxml">trunk/doc-new/guide/xml/portfile-keywords.xml</a></li>
<li><a href="#trunkdocnewguidexmlportfilephasexml">trunk/doc-new/guide/xml/portfile-phase.xml</a></li>
<li><a href="#trunkdocnewguidexmlportfiledevxml">trunk/doc-new/guide/xml/portfiledev.xml</a></li>
<li><a href="#trunkdocnewguidexmlportgroupsxml">trunk/doc-new/guide/xml/portgroups.xml</a></li>
<li><a href="#trunkdocnewguidexmlprojectxml">trunk/doc-new/guide/xml/project.xml</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdocnewguidexmlinternalsxml"></a>
<div class="modfile"><h4>Modified: trunk/doc-new/guide/xml/internals.xml (134586 => 134587)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/doc-new/guide/xml/internals.xml 2015-03-31 00:39:07 UTC (rev 134586)
+++ trunk/doc-new/guide/xml/internals.xml 2015-03-31 00:39:17 UTC (rev 134587)
</span><span class="lines">@@ -649,5 +649,5 @@
</span><span class="cx"> </variablelist>
</span><span class="cx"> </section>
</span><span class="cx"> </section>
</span><del>-
</del><ins>+
</ins><span class="cx"> </chapter>
</span></span></pre></div>
<a id="trunkdocnewguidexmlmacportsconfxml"></a>
<div class="modfile"><h4>Modified: trunk/doc-new/guide/xml/macports.conf.xml (134586 => 134587)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/doc-new/guide/xml/macports.conf.xml 2015-03-31 00:39:07 UTC (rev 134586)
+++ trunk/doc-new/guide/xml/macports.conf.xml 2015-03-31 00:39:17 UTC (rev 134587)
</span><span class="lines">@@ -90,7 +90,7 @@
</span><span class="cx"> <para>Default: <option>sqlite</option></para>
</span><span class="cx"> </listitem>
</span><span class="cx"> </varlistentry>
</span><del>-
</del><ins>+
</ins><span class="cx"> <varlistentry>
</span><span class="cx"> <term>build_arch</term>
</span><span class="cx">
</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 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 class="lines">@@ -125,7 +125,7 @@
</span><span class="cx"> <filename>${prefix}/Library/Frameworks</filename></para>
</span><span class="cx"> </listitem>
</span><span class="cx"> </varlistentry>
</span><del>-
</del><ins>+
</ins><span class="cx"> <varlistentry>
</span><span class="cx"> <term>developer_dir</term>
</span><span class="cx">
</span><span class="lines">@@ -299,9 +299,9 @@
</span><span class="cx">
</span><span class="cx"> <listitem>
</span><span class="cx"> <para>Space separated list of download hosts that should not be used.</para>
</span><del>-
</del><ins>+
</ins><span class="cx"> <para>Default: none</para>
</span><del>-
</del><ins>+
</ins><span class="cx"> <note>
</span><span class="cx"> <para>This feature is especially useful if a host turns out to be consistently
</span><span class="cx"> slow and therefore should be excluded for MacPorts' actions.</para>
</span><span class="lines">@@ -314,7 +314,7 @@
</span><span class="cx">
</span><span class="cx"> <listitem>
</span><span class="cx"> <para>Space separated list of download hosts that should be used preferentially.</para>
</span><del>-
</del><ins>+
</ins><span class="cx"> <para>Default: none</para>
</span><span class="cx"> </listitem>
</span><span class="cx"> </varlistentry>
</span><span class="lines">@@ -325,7 +325,7 @@
</span><span class="cx"> <listitem>
</span><span class="cx"> <para>Controls whether the rev-upgrade action will be run automatically after
</span><span class="cx"> upgrading ports.</para>
</span><del>-
</del><ins>+
</ins><span class="cx"> <para>Default: yes</para>
</span><span class="cx"> </listitem>
</span><span class="cx"> </varlistentry>
</span><span class="lines">@@ -338,7 +338,7 @@
</span><span class="cx"> can rebuild ports to fix it. 'rebuild' means ports will automatically be rebuilt
</span><span class="cx"> when broken linking is detected in their files, while 'report' means broken
</span><span class="cx"> files will be scanned for and reported but the ports will not be rebuilt.</para>
</span><del>-
</del><ins>+
</ins><span class="cx"> <para>Default: rebuild</para>
</span><span class="cx"> </listitem>
</span><span class="cx"> </varlistentry>
</span></span></pre></div>
<a id="trunkdocnewguidexmlportfiledependenciesxml"></a>
<div class="modfile"><h4>Modified: trunk/doc-new/guide/xml/portfile-dependencies.xml (134586 => 134587)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/doc-new/guide/xml/portfile-dependencies.xml 2015-03-31 00:39:07 UTC (rev 134586)
+++ trunk/doc-new/guide/xml/portfile-dependencies.xml 2015-03-31 00:39:17 UTC (rev 134587)
</span><span class="lines">@@ -140,18 +140,18 @@
</span><span class="cx"> programs, <option>lib</option> for libraries, and <option>path</option>
</span><span class="cx"> for any installed file. File dependencies are specified in the form:
</span><span class="cx"> <replaceable>&lt;type&gt;</replaceable>:<replaceable>&lt;filespec&gt;</replaceable>:<replaceable>&lt;port&gt;</replaceable>.</para>
</span><del>-
</del><ins>+
</ins><span class="cx"> <para>For <option>bin</option> dependencies,
</span><span class="cx"> <replaceable>&lt;filespec&gt;</replaceable> is the name of a program in a
</span><span class="cx"> bin directory like <filename>${prefix}/bin</filename>, /usr/bin, /bin, and
</span><span class="cx"> the associated sbin directories.</para>
</span><del>-
</del><ins>+
</ins><span class="cx"> <para>For <option>lib</option> dependencies,
</span><span class="cx"> <replaceable>&lt;filespec&gt;</replaceable> is the name of a library
</span><span class="cx"> (but without its extension) in a lib directory like
</span><span class="cx"> <filename>${prefix}/lib</filename>, /usr/lib, /lib, some Framework
</span><span class="cx"> directories, and those found in environment variables like DYLD_LIBRARY_PATH.</para>
</span><del>-
</del><ins>+
</ins><span class="cx"> <para>For <option>path</option> dependencies,
</span><span class="cx"> <replaceable>&lt;filespec&gt;</replaceable> is the complete absolute path
</span><span class="cx"> to the file, or more usually, when the file is inside
</span></span></pre></div>
<a id="trunkdocnewguidexmlportfilekeywordsxml"></a>
<div class="modfile"><h4>Modified: trunk/doc-new/guide/xml/portfile-keywords.xml (134586 => 134587)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/doc-new/guide/xml/portfile-keywords.xml 2015-03-31 00:39:07 UTC (rev 134586)
+++ trunk/doc-new/guide/xml/portfile-keywords.xml 2015-03-31 00:39:17 UTC (rev 134587)
</span><span class="lines">@@ -226,14 +226,14 @@
</span><span class="cx"> sub-list.
</span><span class="cx"> </para>
</span><span class="cx">
</span><del>- <para>If the version number is a
- <quote>.0</quote> version, the <quote>.0</quote> should be
- omitted to make the version an integer. If the author gives the choice
- of using a given license or <quote>any later version</quote> of it,
- append a plus sign (+) to the version number. If the version
- specified in this case is also the earliest version,
- just leave out the version number entirely since it implies all
- versions.</para>
</del><ins>+ <para>If the version number is a
+ <quote>.0</quote> version, the <quote>.0</quote> should be
+ omitted to make the version an integer. If the author gives the choice
+ of using a given license or <quote>any later version</quote> of it,
+ append a plus sign (+) to the version number. If the version
+ specified in this case is also the earliest version,
+ just leave out the version number entirely since it implies all
+ versions.</para>
</ins><span class="cx">
</span><span class="cx"> <programlisting>license GPL-3</programlisting>
</span><span class="cx"> <programlisting>license {freetype GPL}</programlisting>
</span></span></pre></div>
<a id="trunkdocnewguidexmlportfilephasexml"></a>
<div class="modfile"><h4>Modified: trunk/doc-new/guide/xml/portfile-phase.xml (134586 => 134587)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/doc-new/guide/xml/portfile-phase.xml 2015-03-31 00:39:07 UTC (rev 134586)
+++ trunk/doc-new/guide/xml/portfile-phase.xml 2015-03-31 00:39:17 UTC (rev 134587)
</span><span class="lines">@@ -1088,7 +1088,7 @@
</span><span class="cx"> </itemizedlist>
</span><span class="cx"> </listitem>
</span><span class="cx"> </varlistentry>
</span><del>-
</del><ins>+
</ins><span class="cx"> <varlistentry>
</span><span class="cx"> <term>extract.suffix</term>
</span><span class="cx">
</span><span class="lines">@@ -2070,7 +2070,7 @@
</span><span class="cx"> <para>Default: <option>gcc-4.0</option> on Mac OS X 10.4 and
</span><span class="cx"> 10.5</para>
</span><span class="cx"> </listitem>
</span><del>-
</del><ins>+
</ins><span class="cx"> <listitem>
</span><span class="cx"> <para>Default: <option>gcc-4.2</option> with Xcode 3.2 on Mac OS X 10.6</para>
</span><span class="cx"> </listitem>
</span><span class="lines">@@ -2847,7 +2847,7 @@
</span><span class="cx"> </itemizedlist>
</span><span class="cx"> </listitem>
</span><span class="cx"> </varlistentry>
</span><del>-
</del><ins>+
</ins><span class="cx"> <varlistentry>
</span><span class="cx"> <term>build.jobs</term>
</span><span class="cx">
</span><span class="lines">@@ -2867,7 +2867,7 @@
</span><span class="cx"> </itemizedlist>
</span><span class="cx"> </listitem>
</span><span class="cx"> </varlistentry>
</span><del>-
</del><ins>+
</ins><span class="cx"> </variablelist>
</span><span class="cx"> </section>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkdocnewguidexmlportfiledevxml"></a>
<div class="modfile"><h4>Modified: trunk/doc-new/guide/xml/portfiledev.xml (134586 => 134587)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/doc-new/guide/xml/portfiledev.xml 2015-03-31 00:39:07 UTC (rev 134586)
+++ trunk/doc-new/guide/xml/portfiledev.xml 2015-03-31 00:39:17 UTC (rev 134587)
</span><span class="lines">@@ -681,7 +681,7 @@
</span><span class="cx"> +++ src/Makefile.in 2007-06-20 10:10:59.000000000 -0700
</span><span class="cx"> @@ -131,23 +131,23 @@
</span><span class="cx"> $(INSTALL_DATA)/gdata $(INSTALL_DATA)/perl
</span><del>-
</del><ins>+
</ins><span class="cx"> install-lib:
</span><span class="cx"> - -mkdir -p $(INSTALL_LIB)
</span><span class="cx"> + -mkdir -p $(DESTDIR)$(INSTALL_LIB)
</span><span class="lines">@@ -858,14 +858,14 @@
</span><span class="cx">
</span><span class="cx"> <programlisting>checksums rmd160 7bbfce4fecc2a8e1ca081169e70c1a298ab1b75a \
</span><span class="cx"> sha256 2829fcb7393bac85925090b286b1f9c3cd3fbbf8e7f35796ef4131322509aa53</programlisting>
</span><del>-
</del><ins>+
</ins><span class="cx"> <para>Should a key item such as a phase or variant require braces, the
</span><span class="cx"> opening brace should appear on the same line and the closing brace should
</span><span class="cx"> be on its own line. The block formed by the braces is indented for visual
</span><span class="cx"> clearance. Braces merely quoting strings, for example the description of
</span><span class="cx"> variants, are placed on the same line without line breaks.</para>
</span><span class="cx">
</span><del>- <programlisting>variant mysql5 description {Enable support for MySQL 5} {
</del><ins>+ <programlisting>variant mysql5 description {Enable support for MySQL 5} {
</ins><span class="cx"> depends_lib-append port:mysql5
</span><span class="cx"> configure.args-replace --without-mysql5 --with-mysql5
</span><span class="cx"> }</programlisting>
</span><span class="lines">@@ -916,22 +916,22 @@
</span><span class="cx"> <para>If there is the need to replace a port with another port or a
</span><span class="cx"> renaming is necessary for some reason, the port should be marked as
</span><span class="cx"> <code>replaced_by</code>.</para>
</span><del>-
</del><ins>+
</ins><span class="cx"> <para>As an illustration of a typical workflow the port
</span><span class="cx"> <quote>skrooge-devel</quote> shall be taken. This port had been used for
</span><span class="cx"> testing new versions of skrooge, but it turned out to have become
</span><span class="cx"> unnecessary due to the fact that skrooge's developers currently prefer a
</span><span class="cx"> distribution via port <quote>skrooge</quote> instead. </para>
</span><del>-
</del><ins>+
</ins><span class="cx"> <para>At the end of this section the use of the obsolete PortGroup is suggested
</span><span class="cx"> as an even shorter approach to the below described workflow.</para>
</span><span class="cx">
</span><span class="cx"> <section id="development.replaced_by">
</span><del>- <title>The long way</title>
</del><ins>+ <title>The long way</title>
</ins><span class="cx">
</span><del>- <para>Skrooge's original devel port file looked like this:</para>
</del><ins>+ <para>Skrooge's original devel port file looked like this:</para>
</ins><span class="cx">
</span><del>-<programlisting># -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; truncate-lines: t -*- vim:fenc=utf-8:et:sw=4:ts=4:sts=4
</del><ins>+ <programlisting># -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; truncate-lines: t -*- vim:fenc=utf-8:et:sw=4:ts=4:sts=4
</ins><span class="cx"> # $Id$
</span><span class="cx">
</span><span class="cx"> PortSystem 1.0
</span><span class="lines">@@ -969,58 +969,58 @@
</span><span class="cx"> port:kdebase4-runtime \
</span><span class="cx"> port:oxygen-icons</programlisting>
</span><span class="cx">
</span><del>- <para>The following steps have to be taken to ensure a smooth transition
- for a MacPorts user updating his local installation using
- <userinput>sudo port upgrade</userinput>:</para>
</del><ins>+ <para>The following steps have to be taken to ensure a smooth transition
+ for a MacPorts user updating his local installation using
+ <userinput>sudo port upgrade</userinput>:</para>
</ins><span class="cx">
</span><del>- <orderedlist>
- <listitem>
- <para> add the line <code>replaced_by foo</code> where foo is the
- port this one is replaced by; when a user upgrades this port,
- MacPorts will instead install the replacement port</para>
- <programlisting>replaced_by skrooge</programlisting>
- </listitem>
</del><ins>+ <orderedlist>
+ <listitem>
+ <para> add the line <code>replaced_by foo</code> where foo is the
+ port this one is replaced by; when a user upgrades this port,
+ MacPorts will instead install the replacement port</para>
+ <programlisting>replaced_by skrooge</programlisting>
+ </listitem>
</ins><span class="cx">
</span><del>- <listitem>
- <para> increase the version, revision, or epoch, so that users who
- have this port installed will get notice in <code>port
- outdated</code> that they should upgrade it and trigger the above
- process</para>
- <programlisting>revision 1</programlisting>
- </listitem>
</del><ins>+ <listitem>
+ <para> increase the version, revision, or epoch, so that users who
+ have this port installed will get notice in <code>port
+ outdated</code> that they should upgrade it and trigger the above
+ process</para>
+ <programlisting>revision 1</programlisting>
+ </listitem>
</ins><span class="cx">
</span><del>- <listitem>
- <para> clear distfiles (have a line reading only
- <code>distfiles</code>) so that no distfile is downloaded for this
- stub port</para>
- <programlisting>distfiles</programlisting>
- </listitem>
</del><ins>+ <listitem>
+ <para> clear distfiles (have a line reading only
+ <code>distfiles</code>) so that no distfile is downloaded for this
+ stub port</para>
+ <programlisting>distfiles</programlisting>
+ </listitem>
</ins><span class="cx">
</span><del>- <listitem>
- <para> delete master_sites since there aren't any distfiles to
- download</para>
- </listitem>
</del><ins>+ <listitem>
+ <para> delete master_sites since there aren't any distfiles to
+ download</para>
+ </listitem>
</ins><span class="cx">
</span><del>- <listitem>
- <para> disable livecheck</para>
- <programlisting>livecheck.type none</programlisting>
- </listitem>
</del><ins>+ <listitem>
+ <para> disable livecheck</para>
+ <programlisting>livecheck.type none</programlisting>
+ </listitem>
</ins><span class="cx">
</span><del>- <listitem>
- <para> add a pre-configure block with a <code>ui_error</code> and
- <code>return -code error</code> explaining to users who try to
- install this port that the port has been replaced</para>
- <programlisting>pre-configure {
</del><ins>+ <listitem>
+ <para> add a pre-configure block with a <code>ui_error</code> and
+ <code>return -code error</code> explaining to users who try to
+ install this port that the port has been replaced</para>
+ <programlisting>pre-configure {
</ins><span class="cx"> ui_error "Please do not install this port since it has been replaced by 'skrooge'."
</span><span class="cx"> return -code error
</span><span class="cx"> }</programlisting>
</span><del>- </listitem>
- </orderedlist>
</del><ins>+ </listitem>
+ </orderedlist>
</ins><span class="cx">
</span><del>- <para>With above modifications the port file eventually looks like
- this:</para>
</del><ins>+ <para>With above modifications the port file eventually looks like
+ this:</para>
</ins><span class="cx">
</span><del>-<programlisting># -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; truncate-lines: t -*- vim:fenc=utf-8:et:sw=4:ts=4:sts=4
</del><ins>+ <programlisting># -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; truncate-lines: t -*- vim:fenc=utf-8:et:sw=4:ts=4:sts=4
</ins><span class="cx"> # $Id$
</span><span class="cx">
</span><span class="cx"> PortSystem 1.0
</span><span class="lines">@@ -1053,10 +1053,10 @@
</span><span class="cx">
</span><span class="cx"> distfiles</programlisting>
</span><span class="cx">
</span><del>- <para>A user upgrading ports will experience the following for port
- <quote>skrooge-devel</quote>:</para>
- <programlisting><prompt>%%</prompt> <userinput>sudo port upgrade skrooge-devel</userinput></programlisting>
- <screen>---> skrooge-devel is replaced by skrooge
</del><ins>+ <para>A user upgrading ports will experience the following for port
+ <quote>skrooge-devel</quote>:</para>
+ <programlisting><prompt>%%</prompt> <userinput>sudo port upgrade skrooge-devel</userinput></programlisting>
+ <screen>---> skrooge-devel is replaced by skrooge
</ins><span class="cx"> ---> Computing dependencies for skrooge
</span><span class="cx"> ---> Fetching skrooge
</span><span class="cx"> ---> Verifying checksum(s) for skrooge
</span><span class="lines">@@ -1075,7 +1075,7 @@
</span><span class="cx"> # To start it run the following command:
</span><span class="cx"> # launchctl load /Library/LaunchAgents/org.freedesktop.dbus-session.plist
</span><span class="cx"> ##########################################################
</span><del>-
</del><ins>+
</ins><span class="cx"> ######################################################
</span><span class="cx"> # Programs will not start until you run the command
</span><span class="cx"> # 'sudo chown -R $USER ~/Library/Preferences/KDE'
</span><span class="lines">@@ -1083,11 +1083,11 @@
</span><span class="cx"> ######################################################
</span><span class="cx"> ---> Cleaning skrooge</screen>
</span><span class="cx">
</span><del>- <para>In case a user actually tries to install the obsolete port
- <quote>skrooge-devel</quote> it would be pointed out by an error message that
- this is impossible now:</para>
- <programlisting><prompt>%%</prompt> <userinput>sudo port install skrooge-devel</userinput></programlisting>
- <screen>---> Fetching skrooge-devel
</del><ins>+ <para>In case a user actually tries to install the obsolete port
+ <quote>skrooge-devel</quote> it would be pointed out by an error message that
+ this is impossible now:</para>
+ <programlisting><prompt>%%</prompt> <userinput>sudo port install skrooge-devel</userinput></programlisting>
+ <screen>---> Fetching skrooge-devel
</ins><span class="cx"> ---> Verifying checksum(s) for skrooge-devel
</span><span class="cx"> ---> Extracting skrooge-devel
</span><span class="cx"> ---> Configuring skrooge-devel
</span><span class="lines">@@ -1097,15 +1097,15 @@
</span><span class="cx"> Error: Status 1 encountered during processing.
</span><span class="cx"> To report a bug, see &lt;http://guide.macports.org/#project.tickets&gt;</screen>
</span><span class="cx">
</span><del>- </section>
</del><ins>+ </section>
</ins><span class="cx">
</span><del>- <section id="development.obsolete-portgroup">
- <title>The shortcut: PortGroup obsolete</title>
</del><ins>+ <section id="development.obsolete-portgroup">
+ <title>The shortcut: PortGroup obsolete</title>
</ins><span class="cx">
</span><del>- <para>Using the PortGroup obsolete makes the task described in the previous subsection
- much easier:</para>
</del><ins>+ <para>Using the PortGroup obsolete makes the task described in the previous subsection
+ much easier:</para>
</ins><span class="cx">
</span><del>- <programlisting>
</del><ins>+ <programlisting>
</ins><span class="cx"> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; truncate-lines: t -*- vim:fenc=utf-8:et:sw=4:ts=4:sts=4
</span><span class="cx"> # $Id$
</span><span class="cx"> PortSystem 1.0
</span><span class="lines">@@ -1116,70 +1116,69 @@
</span><span class="cx"> version 0.8.0-${svn.revision}
</span><span class="cx"> revision 2</programlisting>
</span><span class="cx">
</span><del>- <para>The PortGroup defines a number of reasonable defaults for a port that is only
- there to inform users that they should uninstall it and install something else
- instead. You might want to override some of the defaults though. For details have
- a look at the PortGroup's source code in
- <filename>${prefix}/var/macports/sources/rsync.macports.org/release/ports/_resources/port1.0/group/obsolete-1.0.tcl</filename>.</para>
</del><ins>+ <para>The PortGroup defines a number of reasonable defaults for a port that is only
+ there to inform users that they should uninstall it and install something else
+ instead. You might want to override some of the defaults though. For details have
+ a look at the PortGroup's source code in
+ <filename>${prefix}/var/macports/sources/rsync.macports.org/release/ports/_resources/port1.0/group/obsolete-1.0.tcl</filename>.</para>
</ins><span class="cx">
</span><del>- <note>
- <para>It is important to specify <varname>replaced_by</varname> BEFORE the
</del><ins>+ <note>
+ <para>It is important to specify <varname>replaced_by</varname> BEFORE the
</ins><span class="cx"> <varname>PortGroup</varname> line!</para>
</span><del>- </note>
</del><ins>+ </note>
</ins><span class="cx">
</span><del>- </section>
</del><ins>+ </section>
</ins><span class="cx">
</span><span class="cx"> </section>
</span><del>-
-
</del><ins>+
</ins><span class="cx"> <section id="development.practices.removing-port">
</span><span class="cx"> <title>Removing a port</title>
</span><span class="cx">
</span><span class="cx"> <para>If a port has to be removed from MacPorts one should consider
</span><del>- the hints concerning replacing it by some alternative port given
- <link linkend="development.practices.rename-replace-port">above</link>.
- It is recommended to wait one year before the port directory
- is actually removed from MacPorts' Subversion repository.
</del><ins>+ the hints concerning replacing it by some alternative port given
+ <link linkend="development.practices.rename-replace-port">above</link>.
+ It is recommended to wait one year before the port directory
+ is actually removed from MacPorts' Subversion repository.
</ins><span class="cx"> </para>
</span><span class="cx">
</span><span class="cx"> <para>If there is no replacement for a port, it can simply be deleted
</span><del>- immediately.</para>
-
- </section>
-
</del><ins>+ immediately.</para>
+
+ </section>
+
</ins><span class="cx"> </section>
</span><span class="cx">
</span><span class="cx"> <section id="development.buildbot">
</span><del>- <title>MacPorts' buildbot</title>
</del><ins>+ <title>MacPorts' buildbot</title>
</ins><span class="cx">
</span><del>- <para>The <ulink url="https://build.macports.org/">buildbot</ulink> is a port
</del><ins>+ <para>The <ulink url="https://build.macports.org/">buildbot</ulink> is a port
</ins><span class="cx"> build-service currently supporting building of all committed ports for Snow Leopard,
</span><span class="cx"> Lion, and Mountain Lion using the MacPorts AutoBuild
</span><span class="cx"> (<ulink url="http://svn.macports.org/repository/macports/contrib/mpab/">MPAB</ulink>)
</span><span class="cx"> scripts.</para>
</span><del>-
- <para>Every time a maintainer commits changes to MacPorts' central SVN repository
</del><ins>+
+ <para>Every time a maintainer commits changes to MacPorts' central SVN repository
</ins><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><span class="cx"> versions of the OS X operating system.</para>
</span><del>-
- <para>If a build error occurred for a port its maintainer will be informed via
</del><ins>+
+ <para>If a build error occurred for a port its maintainer will be informed via
</ins><span class="cx"> an email so that problems which did not surface on the maintainer's machine will
</span><span class="cx"> not go unnoticed.
</span><del>-
</del><ins>+
</ins><span class="cx"> Port maintainers will find the
</span><span class="cx"> <ulink url="https://build.macports.org/waterfall">waterfall</ulink>
</span><del>- and the
</del><ins>+ and the
</ins><span class="cx"> <ulink url="https://build.macports.org/builders">builders</ulink>
</span><span class="cx"> views most useful since they give information about the build status and offer
</span><span class="cx"> the possibility to build ones port(s) on specific builders.</para>
</span><del>-
- <para>Thus the buildbot helps to keep MacPorts consistent on various
</del><ins>+
+ <para>Thus the buildbot helps to keep MacPorts consistent on various
</ins><span class="cx"> OSX versions, i.e., a maintainer does not need access to these versions anymore in
</span><span class="cx"> order to assure that the port(s) maintained build without problems. Currently only
</span><span class="cx"> the default port variants will be built and kept.</para>
</span><span class="cx">
</span><span class="cx"> </section>
</span><del>-
</del><ins>+
</ins><span class="cx"> </chapter>
</span></span></pre></div>
<a id="trunkdocnewguidexmlportgroupsxml"></a>
<div class="modfile"><h4>Modified: trunk/doc-new/guide/xml/portgroups.xml (134586 => 134587)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/doc-new/guide/xml/portgroups.xml 2015-03-31 00:39:07 UTC (rev 134586)
+++ trunk/doc-new/guide/xml/portgroups.xml 2015-03-31 00:39:17 UTC (rev 134587)
</span><span class="lines">@@ -38,5 +38,5 @@
</span><span class="cx"> comments in the header of the portgroup file itself) should provide guidance on how each
</span><span class="cx"> portgroup is used. Prospective MacPorts developers are also encouraged to examine existing
</span><span class="cx"> portfiles that use these portgroups.</para>
</span><del>-
</del><ins>+
</ins><span class="cx"> </section>
</span></span></pre></div>
<a id="trunkdocnewguidexmlprojectxml"></a>
<div class="modfile"><h4>Modified: trunk/doc-new/guide/xml/project.xml (134586 => 134587)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/doc-new/guide/xml/project.xml 2015-03-31 00:39:07 UTC (rev 134586)
+++ trunk/doc-new/guide/xml/project.xml 2015-03-31 00:39:17 UTC (rev 134587)
</span><span class="lines">@@ -164,19 +164,19 @@
</span><span class="cx"> patches, created to enhance something that isn't failing its
</span><span class="cx"> intended purpose.</para>
</span><span class="cx"> </listitem>
</span><del>-
</del><ins>+
</ins><span class="cx"> <listitem>
</span><span class="cx"> <para><guimenu>update</guimenu> - Tickets, with or without
</span><span class="cx"> patches, involving updating a port to a newer upstream
</span><span class="cx"> version.</para>
</span><span class="cx"> </listitem>
</span><del>-
</del><ins>+
</ins><span class="cx"> <listitem>
</span><span class="cx"> <para><guimenu>submission</guimenu> - Tickets created to submit
</span><span class="cx"> Portfiles for software not currently available in MacPorts.
</span><span class="cx"> </para>
</span><span class="cx"> </listitem>
</span><del>-
</del><ins>+
</ins><span class="cx"> <listitem>
</span><span class="cx"> <para><guimenu>request</guimenu> - Tickets created to request
</span><span class="cx"> the creation of a new port.</para>
</span><span class="lines">@@ -280,7 +280,7 @@
</span><span class="cx"> development of the ticket. Multiple email addresses should be
</span><span class="cx"> separated with a comma and a space
</span><span class="cx"> (e.g., <literal>you@example.org, maintainer@macports.org</literal>).</para>
</span><del>-
</del><ins>+
</ins><span class="cx"> <para>When reporting port-related tickets, make sure you add the
</span><span class="cx"> port maintainers email address to the <guilabel>Cc:</guilabel> field
</span><span class="cx"> so they are notified of the ticket (unless you have commit access,
</span><span class="lines">@@ -289,12 +289,12 @@
</span><span class="cx"> <literal>port info --maintainers <replaceable>[port]</replaceable>
</span><span class="cx"> </literal></para>
</span><span class="cx"> </listitem>
</span><del>-
</del><ins>+
</ins><span class="cx"> <listitem>
</span><span class="cx"> <para><guilabel>Assign To:</guilabel> Only users with commit access
</span><span class="cx"> can edit this field. If this is not you, see the section on the
</span><span class="cx"> <guimenu>Cc</guimenu> field above.</para>
</span><del>-
</del><ins>+
</ins><span class="cx"> <para>For tickets on ports, enter
</span><span class="cx"> the email address of the port's maintainer (use <command>port info
</span><span class="cx"> &lt;portname&gt;</command> to find this). If multiple maintainers
</span><span class="lines">@@ -787,9 +787,9 @@
</span><span class="cx"> <para>In the Description field, refer to any unacknowledged ticket(s).</para>
</span><span class="cx"> </listitem>
</span><span class="cx">
</span><del>- <listitem>
- <para>In the Port field, indicate which port is abandoned.</para>
- </listitem>
</del><ins>+ <listitem>
+ <para>In the Port field, indicate which port is abandoned.</para>
+ </listitem>
</ins><span class="cx">
</span><span class="cx"> <listitem>
</span><span class="cx"> <para>The Port Abandoned ticket may be closed when the new
</span></span></pre>
</div>
</div>
</body>
</html>