<pre style='margin:0'>
Christopher Nielsen (mascguy) pushed a commit to branch master
in repository macports-guide.
</pre>
<p><a href="https://github.com/macports/macports-guide/commit/52b8941ebdb45ae0502336d446199f5734bc273d">https://github.com/macports/macports-guide/commit/52b8941ebdb45ae0502336d446199f5734bc273d</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 52b8941 guide: fix validation errors; formatting cleanup
</span>52b8941 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 52b8941ebdb45ae0502336d446199f5734bc273d
</span>Author: Christopher Nielsen <mascguy@github.com>
AuthorDate: Mon Dec 23 16:37:26 2024 -0500
<span style='display:block; white-space:pre;color:#404040;'> guide: fix validation errors; formatting cleanup
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://github.com/macports/macports-guide/pull/70
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes: https://trac.macports.org/ticket/71617
</span>---
guide/xml/portfile-subports.xml | 26 +++++++++++++-------------
guide/xml/portfiledev.xml | 12 ++++++++++--
2 files changed, 23 insertions(+), 15 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/guide/xml/portfile-subports.xml b/guide/xml/portfile-subports.xml
</span><span style='display:block; white-space:pre;color:#808080;'>index 74b3d64..f79001c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/guide/xml/portfile-subports.xml
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/guide/xml/portfile-subports.xml
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,13 +5,13 @@
</span> <title>Subports</title>
<para>The subport declaration causes MacPorts to define an additional port,
<span style='display:block; white-space:pre;background:#ffe0e0;'>- with the <literal>name</literal> given by the declaration. The keywords
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ with the <emphasis>name</emphasis> given by the declaration. The keywords
</span> for the subport are those in the global section of the Portfile, and those
<span style='display:block; white-space:pre;background:#ffe0e0;'>- in the brace-enclosed <literal>body</literal>.</para>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ in the brace-enclosed <emphasis>body</emphasis>.</para>
</span>
<variablelist>
<varlistentry>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- <term>subport <replaceable>name</replaceable> <replaceable>body</replaceable></term>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <term>subport name body</term>
</span>
<listitem>
<para>Example:</para>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -34,16 +34,16 @@ subport example-sub2 {
</span> configure.args-append --fff
}</programlisting>
</listitem>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <listitem>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <para>Because MacPorts treats each subport as a separate port declaration,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- each subport will have its own, independent phases: fetch, configure,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build, destroot, install, activate, etc. However, because the subports
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- share the global declaration part, all the subports will by default
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- share the same dist_subdir. This means that MacPorts only needs to fetch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- the distfiles once, and the remaining subports can reuse the
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- distfiles.</para>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- </listitem>
</span> </varlistentry>
</variablelist>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <note>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <para>Because MacPorts treats each subport as a separate port declaration,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ each subport will have its own, independent phases: fetch, configure,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build, destroot, install, activate, etc. However, because the subports
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ share the global declaration part, all the subports will by default
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ share the same dist_subdir. This means that MacPorts only needs to fetch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ the distfiles once, and the remaining subports can reuse the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ distfiles.</para>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ </note>
</span> </section>
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/guide/xml/portfiledev.xml b/guide/xml/portfiledev.xml
</span><span style='display:block; white-space:pre;color:#808080;'>index 7034489..ed2a2d7 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/guide/xml/portfiledev.xml
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/guide/xml/portfiledev.xml
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -565,6 +565,10 @@ subport example-sub2 {
</span> Portfile 1.0
name example
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# Note: For the parent port, 'subport' has the same value as 'name'.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Also, one cannot override the subport name; it's shown here merely
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# to illustrate what the value is set to, for the given context.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#subport example
</span>
depends_lib aaa
configure.args --bbb</programlisting>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -572,7 +576,9 @@ configure.args --bbb</programlisting>
</span> <programlisting>
Portfile 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-name example-sub1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+name example
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Value for 'subport' shown here for illustration purposes only; see note above.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#subport example-sub1
</span>
depends_lib aaa
depends_lib-append ccc
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -581,7 +587,9 @@ configure.args --ddd</programlisting>
</span> <programlisting>
Portfile 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-name example-sub2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+name example
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Value for 'subport' shown here for illustration purposes only; see note above.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#subport example-sub2
</span>
depends_lib aaa
depends_lib-append eee
</pre><pre style='margin:0'>
</pre>