<pre style='margin:0'>
Rainer Müller (raimue) pushed a commit to branch release-2.5
in repository macports-guide.

</pre>
<p><a href="https://github.com/macports/macports-guide/commit/c304163c1004b6f1de47da1964e655c10fd71897">https://github.com/macports/macports-guide/commit/c304163c1004b6f1de47da1964e655c10fd71897</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit c304163c1004b6f1de47da1964e655c10fd71897
</span>Author: Rainer Müller <raimue@macports.org>
AuthorDate: Wed Apr 11 22:43:01 2018 +0200

<span style='display:block; white-space:pre;color:#404040;'>    Split audience="" tags and keep only 2.5
</span>---
 guide/xml/installing.xml | 20 ++++----------------
 1 file changed, 4 insertions(+), 16 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/guide/xml/installing.xml b/guide/xml/installing.xml
</span><span style='display:block; white-space:pre;color:#808080;'>index adcf96a..15920ee 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/guide/xml/installing.xml
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/guide/xml/installing.xml
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -331,10 +331,9 @@
</span>                 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>.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                <phrase audience="2.5">Use <option>--without-startupitems</option> to automatically set
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                <option>startupitem_install no</option> in the new <filename>macports.conf</filename>, which is
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                required to avoid conflicts in <filename>/Library/LaunchAgents</filename> or
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                <filename>/Library/LaunchDaemons</filename>.</phrase>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                Use <option>--without-startupitems</option> to automatically set <option>startupitem_install no</option>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                in the new <filename>macports.conf</filename>, which is required to avoid conflicts in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                <filename>/Library/LaunchAgents</filename> or <filename>/Library/LaunchDaemons</filename>.
</span>             </para>
 
             <note>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -342,18 +341,7 @@
</span>                     present while installing a second instance.</para>
             </note>
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            <programlisting audience="2.4"><prompt>$</prompt> <userinput>export PATH=/bin:/sbin:/usr/bin:/usr/sbin</userinput>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-<!--                --><prompt>$</prompt> <userinput>MP_PREFIX=/opt/macports-test</userinput>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-<!--                --><prompt>$</prompt> <userinput>./configure --prefix=$MP_PREFIX --with-applications-dir=$MP_PREFIX/Applications</userinput>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-<!--                --><prompt>$</prompt> <userinput>make</userinput>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-<!--                --><prompt>$</prompt> <userinput>sudo make install</userinput></programlisting>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            <para audience="2.4">After installing the second instance you might need to add
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                <programlisting>startupitem_install no</programlisting>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                to <filename>$MP_PREFIX/etc/macports/macports.conf</filename> to avoid conflicts in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                <filename>/Library/LaunchAgents</filename>.</para>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            <programlisting audience="2.5"><prompt>$</prompt> <userinput>export PATH=/bin:/sbin:/usr/bin:/usr/sbin</userinput>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            <programlisting><prompt>$</prompt> <userinput>export PATH=/bin:/sbin:/usr/bin:/usr/sbin</userinput>
</span> <!--                --><prompt>$</prompt> <userinput>MP_PREFIX=/opt/macports-test</userinput>
 <!--                --><prompt>$</prompt> <userinput>./configure --prefix=$MP_PREFIX --with-applications-dir=$MP_PREFIX/Applications --without-startupitems</userinput>
 <!--                --><prompt>$</prompt> <userinput>make</userinput>
</pre><pre style='margin:0'>

</pre>