<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch master
in repository macports-guide.
</pre>
<p><a href="https://github.com/macports/macports-guide/commit/67e5cddd9c4a0db39bcc12f96e78c222af98bb78">https://github.com/macports/macports-guide/commit/67e5cddd9c4a0db39bcc12f96e78c222af98bb78</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 67e5cdd Correct patchfile naming advice
</span>67e5cdd is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 67e5cddd9c4a0db39bcc12f96e78c222af98bb78
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Thu Aug 18 01:48:38 2022 +1000
<span style='display:block; white-space:pre;color:#404040;'> Correct patchfile naming advice
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> The only convention we really want to enforce is that patch filenames
</span><span style='display:block; white-space:pre;color:#404040;'> end in one of .diff or .patch.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://trac.macports.org/ticket/59695
</span>---
guide/xml/portfile-phase.xml | 4 ++--
guide/xml/portfiledev.xml | 11 ++++++-----
2 files changed, 8 insertions(+), 7 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/guide/xml/portfile-phase.xml b/guide/xml/portfile-phase.xml
</span><span style='display:block; white-space:pre;color:#808080;'>index 67553aa..8e32a89 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/guide/xml/portfile-phase.xml
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/guide/xml/portfile-phase.xml
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1501,11 +1501,11 @@ extract.post_args "| gnutar -x"</programlisting>
</span> <listitem>
<para>Example:</para>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- <programlisting>patchfiles patch-destdir-variable-fix.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <programlisting>patchfiles destdir-variable-fix.diff \
</span> patch-source.c.diff</programlisting>
<programlisting>patchfiles-append patch-configure.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-delete patch-destdir-variable-fix.diff</programlisting>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-delete destdir-variable-fix.diff</programlisting>
</span> </listitem>
</itemizedlist>
</listitem>
<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 15bcd1c..ee56ba6 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;'>@@ -598,10 +598,11 @@ variant sqlite description {Build sqlite support} {
</span> <para>Generally speaking, you should create one patch file for each
logical change that needs to be applied. Patchfile filenames should
uniquely distinguish the file and generally be of the form
<span style='display:block; white-space:pre;background:#ffe0e0;'>- <filename>patch-</filename><replaceable><identifier></replaceable><filename>.diff</filename>,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <replaceable><identifier></replaceable><filename>.diff</filename>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ or <replaceable><identifier></replaceable><filename>.patch</filename>,
</span> where the <replaceable>identifier</replaceable> is a reference to the
problem or bug it is supposed to solve. An example filename would be
<span style='display:block; white-space:pre;background:#ffe0e0;'>- <filename>patch-</filename><replaceable>destdir-variable-fix</replaceable><filename>.diff</filename>.</para>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <replaceable>destdir-variable-fix</replaceable><filename>.diff</filename>.</para>
</span>
<para>To create a patch to modify a single file, follow the steps
below.</para>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -627,7 +628,7 @@ variant sqlite description {Build sqlite support} {
</span> to create a <quote>unified</quote> diff patch file.</para>
<programlisting><prompt>%%</prompt> <userinput>cd ~/Downloads/foo-1.34</userinput>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-<prompt>%%</prompt> <userinput>diff -u src/Makefile.in.orig src/Makefile.in > patch-destdir-variable-fix.diff</userinput></programlisting>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+<prompt>%%</prompt> <userinput>diff -u src/Makefile.in.orig src/Makefile.in > destdir-variable-fix.diff</userinput></programlisting>
</span>
<para>You should execute <command>diff</command> from
the top-level directory of the unpacked source code, because during
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -670,7 +671,7 @@ variant sqlite description {Build sqlite support} {
</span>
<listitem>
<para>Place the patch
<span style='display:block; white-space:pre;background:#ffe0e0;'>- <filename>patch-destdir-variable-fix.diff</filename> in the directory
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <filename>destdir-variable-fix.diff</filename> in the directory
</span> <filename>${portpath}/files</filename> and use it in a port using
the <code>patchfiles</code> keyword. <varname>${portpath}</varname>
may be in a local Portfile repository during development, or
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -678,7 +679,7 @@ variant sqlite description {Build sqlite support} {
</span> <varname>${portpath}</varname> in the global MacPorts
repository.</para>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- <programlisting>patchfiles patch-destdir-variable-fix.diff</programlisting>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <programlisting>patchfiles destdir-variable-fix.diff</programlisting>
</span> </listitem>
</orderedlist>
</section>
</pre><pre style='margin:0'>
</pre>