David R. Morrison
2009-03-15 22:40:00 UTC
Date: March 15, 2009 3:37:03 PM PDT
Subject: [cvs] web/xml/packaging packaging.en.xml,1.104,1.105
Update of /cvsroot/fink/web/xml/packaging
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv17020
packaging.en.xml
manual changes for deprecation of "Patch"
Index: packaging.en.xml
===================================================================
RCS file: /cvsroot/fink/web/xml/packaging/packaging.en.xml,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -d -r1.104 -r1.105
--- packaging.en.xml 24 Feb 2009 20:58:12 -0000 1.104
+++ packaging.en.xml 15 Mar 2009 22:37:01 -0000 1.105
@@ -2524,6 +2524,7 @@
<item><itemt>Patch</itemt>
<itemd>
<p>
+<em>(Deprecated.)</em>
The filename of a patch to be applied with <code>patch -p1
<<em>patch-file</em></code>. This should be just a filename; the
appropriate path (the same directory where the <code>.info</code> file
@@ -3333,24 +3334,25 @@
<p>If your package needs a patch to compile on Darwin (or to work with
fink), name the patch with the same name as the package description,
using the extension ".patch" instead of ".info" and put it in the same
-directory as the .info file. If you use the full package in the
-filename specify either one of these (they are equivalent):</p>
-<codeblock>Patch: %f.patch</codeblock>
-<codeblock>PatchScript: patch -p1 <%a/%f.patch</codeblock>
-<p>If you use the newer simple package filename convention, use %n
-insead of %f. These two fields are not mutually-exclusive - you can
-use both, and they will both be executed. In that case the
PatchScript
-is executed last. Alternately, you can use the
-newer <code>PatchFile</code> instead of <code>Patch</code> and apply
-with an implicit or explicit <code>PatchScript</code>--see the
-descriptions of the <code>PatchFile</code>
-and <code>PatchScript</code> fields for more information.</p>
-
-
-<p>Because you may need to have the users chosen prefix in the
patch file
+directory as the .info file.
+Specify the filename of the patchfile with a line such as:</p>
+<codeblock>PatchFile: %n.patch</codeblock>
+<p>(For packages with variants, it may be better to use
+<code>%{ni}.patch</code> .)
+You must also give the MD5 sum of the patchfile in the
+<code>PatchFile-MD5</code> field, and specify
of fink).
+</p>
+<p>When a <code>PatchFile</code> declaration is present, there is a
+default <code>PatchScript</code> equivalent to:</p>
+<codeblock>PatchScript: patch -p1 < %{PatchFile}</codeblock>
+<p>This will be overridden if you supply a <code>PatchScript</code>
+of your own (for example, to perform a substitution on the patch file
+before applying it).</p>
+<p>If you need to have the user's chosen prefix in the patch file
code>
instead of <code>/sw</code> in the patch and then use:</p>
patch -p1</codeblock>
patch -p1</codeblock>
<p>Patches should be in unidiff format and are normally generated by
<p>If you have used emacs to edit files, you can add <code>-x'*~'</
code> to the diff command above in order to exclude automatically-
generated backup files.</p>
------------------------------------------------------------------------------
Apps built with the Adobe(R) Flex(R) framework and Flex Builder(TM)
are
powering Web 2.0 with engaging, cross-platform capabilities. Quickly
and
easily build your RIAs with Flex Builder, the Eclipse(TM)based
development
software that enables intelligent coding and step-through debugging.
Download the free 60 day trial. http://p.sf.net/sfu/www-adobe-com
_______________________________________________
Fink-commits mailing list
http://news.gmane.org/gmane.os.apple.fink.cvs
Subject: [cvs] web/xml/packaging packaging.en.xml,1.104,1.105
Update of /cvsroot/fink/web/xml/packaging
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv17020
packaging.en.xml
manual changes for deprecation of "Patch"
Index: packaging.en.xml
===================================================================
RCS file: /cvsroot/fink/web/xml/packaging/packaging.en.xml,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -d -r1.104 -r1.105
--- packaging.en.xml 24 Feb 2009 20:58:12 -0000 1.104
+++ packaging.en.xml 15 Mar 2009 22:37:01 -0000 1.105
@@ -2524,6 +2524,7 @@
<item><itemt>Patch</itemt>
<itemd>
<p>
+<em>(Deprecated.)</em>
The filename of a patch to be applied with <code>patch -p1
<<em>patch-file</em></code>. This should be just a filename; the
appropriate path (the same directory where the <code>.info</code> file
@@ -3333,24 +3334,25 @@
<p>If your package needs a patch to compile on Darwin (or to work with
fink), name the patch with the same name as the package description,
using the extension ".patch" instead of ".info" and put it in the same
-directory as the .info file. If you use the full package in the
-filename specify either one of these (they are equivalent):</p>
-<codeblock>Patch: %f.patch</codeblock>
-<codeblock>PatchScript: patch -p1 <%a/%f.patch</codeblock>
-<p>If you use the newer simple package filename convention, use %n
-insead of %f. These two fields are not mutually-exclusive - you can
-use both, and they will both be executed. In that case the
PatchScript
-is executed last. Alternately, you can use the
-newer <code>PatchFile</code> instead of <code>Patch</code> and apply
-with an implicit or explicit <code>PatchScript</code>--see the
-descriptions of the <code>PatchFile</code>
-and <code>PatchScript</code> fields for more information.</p>
-
-
-<p>Because you may need to have the users chosen prefix in the
patch file
+directory as the .info file.
+Specify the filename of the patchfile with a line such as:</p>
+<codeblock>PatchFile: %n.patch</codeblock>
+<p>(For packages with variants, it may be better to use
+<code>%{ni}.patch</code> .)
+You must also give the MD5 sum of the patchfile in the
+<code>PatchFile-MD5</code> field, and specify
of fink).
+</p>
+<p>When a <code>PatchFile</code> declaration is present, there is a
+default <code>PatchScript</code> equivalent to:</p>
+<codeblock>PatchScript: patch -p1 < %{PatchFile}</codeblock>
+<p>This will be overridden if you supply a <code>PatchScript</code>
+of your own (for example, to perform a substitution on the patch file
+before applying it).</p>
+<p>If you need to have the user's chosen prefix in the patch file
code>
instead of <code>/sw</code> in the patch and then use:</p>
patch -p1</codeblock>
patch -p1</codeblock>
<p>Patches should be in unidiff format and are normally generated by
<p>If you have used emacs to edit files, you can add <code>-x'*~'</
code> to the diff command above in order to exclude automatically-
generated backup files.</p>
------------------------------------------------------------------------------
Apps built with the Adobe(R) Flex(R) framework and Flex Builder(TM)
are
powering Web 2.0 with engaging, cross-platform capabilities. Quickly
and
easily build your RIAs with Flex Builder, the Eclipse(TM)based
development
software that enables intelligent coding and step-through debugging.
Download the free 60 day trial. http://p.sf.net/sfu/www-adobe-com
_______________________________________________
Fink-commits mailing list
http://news.gmane.org/gmane.os.apple.fink.cvs