Update of /cvsroot/fink/scripts/installer/dmg/doc/packaging In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv30479/scripts/installer/dmg/doc/packaging
Modified Files: packaging.en.html Log Message: Note about %a deprecation Index: packaging.en.html =================================================================== RCS file: /cvsroot/fink/scripts/installer/dmg/doc/packaging/packaging.en.html,v retrieving revision 1.95 retrieving revision 1.96 diff -u -d -r1.95 -r1.96 --- packaging.en.html 24 Feb 2009 21:00:17 -0000 1.95 +++ packaging.en.html 6 Apr 2009 02:22:10 -0000 1.96 @@ -1,7 +1,7 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> <html><head><meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <!-- -Generated from $Fink: packaging.en.xml,v 1.104 2009/02/24 20:58:12 dmrrsn Exp $ +Generated from $Fink: packaging.en.xml,v 1.106 2009/04/06 02:21:28 dmacks Exp $ --> <title>Fink Documentation - Creating Fink Packages</title></head><body> <table width="100%" cellspacing="0"> @@ -296,7 +296,7 @@ </p> </td></tr><tr valign="top"><td>%a</td><td> <p> -the path where the p<b>a</b>tches can be found +the path where the p<b>a</b>tches can be found. As of fink-0.29.0, this variable should not be used. Use <tt style="white-space: nowrap;">%{PatchFile}</tt> to access the <tt style="white-space: nowrap;">.patch</tt> file. Support for <tt style="white-space: nowrap;">%a</tt> will be removed in the future. </p> </td></tr><tr valign="top"><td>%b</td><td> <p> @@ -2258,6 +2258,7 @@ </p> </td></tr><tr valign="top"><td>Patch</td><td> <p> +<b>(Deprecated.)</b> The filename of a patch to be applied with <tt style="white-space: nowrap;">patch -p1 <<b>patch-file</b></tt>. This should be just a filename; the appropriate path (the same directory where the <tt style="white-space: nowrap;">.info</tt> file @@ -2960,24 +2961,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> -<pre>Patch: %f.patch</pre> -<pre>PatchScript: patch -p1 <%a/%f.patch</pre> -<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 <tt style="white-space: nowrap;">PatchFile</tt> instead of <tt style="white-space: nowrap;">Patch</tt> and apply -with an implicit or explicit <tt style="white-space: nowrap;">PatchScript</tt>--see the -descriptions of the <tt style="white-space: nowrap;">PatchFile</tt> -and <tt style="white-space: nowrap;">PatchScript</tt> 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> +<pre>PatchFile: %n.patch</pre> +<p>(For packages with variants, it may be better to use +<tt style="white-space: nowrap;">%{ni}.patch</tt> .) +You must also give the MD5 sum of the patchfile in the +<tt style="white-space: nowrap;">PatchFile-MD5</tt> field, and specify +<tt style="white-space: nowrap;">BuildDepends: fink (>= 0.24.12)</tt> (or a later version of fink). +</p> +<p>When a <tt style="white-space: nowrap;">PatchFile</tt> declaration is present, there is a +default <tt style="white-space: nowrap;">PatchScript</tt> equivalent to:</p> +<pre>PatchScript: patch -p1 < %{PatchFile}</pre> +<p>This will be overridden if you supply a <tt style="white-space: nowrap;">PatchScript</tt> +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 it is recommended that you have a variable such as <tt style="white-space: nowrap;">@PREFIX@</tt> instead of <tt style="white-space: nowrap;">/sw</tt> in the patch and then use:</p> -<pre>PatchScript: sed 's|@PREFIX@|%p|g' <%a/%f.patch | patch -p1</pre> +<pre>PatchScript: sed 's|@PREFIX@|%p|g' < %{PatchFile} | patch -p1</pre> <p>Patches should be in unidiff format and are normally generated by using:</p> <pre>diff -urN <originalsourcedir> <patchedsourcedir></pre> <p>If you have used emacs to edit files, you can add <tt style="white-space: nowrap;">-x'*~'</tt> to the diff command above in order to exclude automatically-generated backup files.</p> @@ -3005,9 +3007,9 @@ <hr><h2>Copyright Notice</h2><p>Copyright (c) 2001 Christoph Pfisterer, -Copyright (c) 2001-2008 The Fink Project. +Copyright (c) 2001-2009 The Fink Project. You may distribute this document in print for private purposes, provided the document and this copyright notice remain complete and unmodified. Any commercial reproduction and any online publication requires the explicit consent of the author.</p><hr> -<p>Generated from <i>$Fink: packaging.en.xml,v 1.104 2009/02/24 20:58:12 dmrrsn Exp $</i></p></body></html> +<p>Generated from <i>$Fink: packaging.en.xml,v 1.106 2009/04/06 02:21:28 dmacks Exp $</i></p></body></html> ------------------------------------------------------------------------------ _______________________________________________ Fink-commits mailing list Fink-commits@lists.sourceforge.net http://news.gmane.org/gmane.os.apple.fink.cvs