Update of /cvsroot/fink/scripts/installer/dmg/doc/packaging In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24327/scripts/installer/dmg/doc/packaging
Modified Files: packaging.ja.html packaging.zh.html Log Message: en 1.87 Index: packaging.ja.html =================================================================== RCS file: /cvsroot/fink/scripts/installer/dmg/doc/packaging/packaging.ja.html,v retrieving revision 1.33 retrieving revision 1.34 diff -u -d -r1.33 -r1.34 --- packaging.ja.html 23 Feb 2006 07:23:50 -0000 1.33 +++ packaging.ja.html 11 Apr 2006 23:57:58 -0000 1.34 @@ -306,7 +306,12 @@ ãã®å±éã¯<b>親</b>ã®ããã©ã«ãã«ãªãï¼ </p> - </td></tr></table> + </td></tr><tr valign="top"><td>%{PatchFile}</td><td> +<p> +<tt style="white-space: nowrap;">PatchFile</tt> ãã£ã¼ã«ãã§ç¤ºããããã¡ã¤ã«ã®ãã«ãã¹ï¼ +(fink-0.24.12 ã«ã¦å°å ¥) +</p> +</td></tr></table> <h2><a name="policy">3 ããã±ã¼ã¸åããªã·ã¼</a></h2> @@ -1872,9 +1877,9 @@ <p> <tt style="white-space: nowrap;">patch -p1 <<b>ããããã¡ã¤ã«</b></tt> ã¨ãã¦é©ç¨ããããããã®ãã¡ã¤ã«åï¼ ããã«ã¯ãã¡ã¤ã«åã®ã¿ãæå®ãã¾ãï¼ - é©åãªãã¹ã¯èªåçã«åç½®ããã¾ãï¼ + é©åãªãã¹ (<tt style="white-space: nowrap;">.info</tt>ã®ãããã£ã¬ã¯ããª) ã¯èªåçã«åç½®ããã¾ãï¼ ãã®ãã£ã¼ã«ãã§ã¯ãã¼ã»ã³ãå±éãè¡ãããã®ã§ï¼å ¸åçãªå¤ã¯åã« <tt style="white-space: nowrap;">%f.patch</tt> ã¾ã㯠<tt style="white-space: nowrap;">%n.patch</tt> ã¨ãªãã¾ãï¼ - PatchScript ãæå®ããã¦ããå ´åï¼ãããã¯ãã®å¾ã«å®è¡ããã¾ãï¼ + PatchScript ãæå®ããã¦ããå ´åï¼ãããã¯ãã®å¾ã«å¥ã®ã¹ãããã¨ãã¦å®è¡ããã¾ãï¼ </p> <p> %n 㯠%type_ ç³»ã§ç¤ºãããå¤ç¨®ãã¼ã¿å ¨ã¦ãå«ãæååã«å±éããããã¨ã«æ³¨æï¼ @@ -1883,15 +1888,42 @@ åå¤ç¨®åºæã®å¤æ´ç¹ã <tt style="white-space: nowrap;">PatchScript</tt> ã«è¨è¿°ããæ¹ãï¼ åå¤ç¨®æ¯ã«ããããã¡ã¤ã«ãä½ãããæéãå°ãªãã§ãããï¼ </p> - </td></tr><tr valign="top"><td>PatchScript</td><td> + </td></tr><tr valign="top"><td>PatchFile</td><td> +<p> +<tt style="white-space: nowrap;">Patch</tt> ãã£ã¼ã«ãã¨åãææ³ï¼ +ãã®ãã¡ã¤ã«ã¸ã®ãã«ãã¹ã¯ï¼ <tt style="white-space: nowrap;">%{PatchFile}</tt> ãã¼ã»ã³ãå±éã§å©ç¨ãããã¨ãã§ãã¾ãï¼ +<tt style="white-space: nowrap;">Patch</tt> ã¨ç°ãªãï¼ <tt style="white-space: nowrap;">PatchFile</tt> 㯠<tt style="white-space: nowrap;">PatchScript</tt> ã®ä¸é¨åã¨ãã¦é©ç¨ããã¾ãï¼ +Fink ã¯ï¼ãã®ã¢ã¤ã«ãåå¨ãï¼èªã¿åãå¯è½ã§ããï¼ãã§ãã¯ãµã ã <tt style="white-space: nowrap;">PatchFile-MD5</tt> ãã£ã¼ã«ãã¨é©åãã¦ãããã¨ã確èªãã¾ãï¼ +</p> +<p> +<tt style="white-space: nowrap;">Patch</tt> 㨠<tt style="white-space: nowrap;">PatchFile</tt> ãï¼ã²ã¨ã¤ã®ããã±ã¼ã¸è¨è¿°ä¸ã«åæã«ä½¿ããã¨ã¯ã§ãã¾ããï¼ +<tt style="white-space: nowrap;">PatchFile</tt> ã使ãããã±ã¼ã¸ã¯ï¼<tt style="white-space: nowrap;">BuildDepends: fink (>= 0.24.12)</tt> ã宣è¨ããªããã°ãªãã¾ããï¼ +ä»ã®çç±ãããã°ãããã大ãããã¼ã¸ã§ã³çªå·ã使ã£ã¦ããã¾ãã¾ããï¼ +</p> +</td></tr><tr valign="top"><td>PatchFile-MD5</td><td> +<p> +<tt style="white-space: nowrap;">PatchFile</tt> ãã£ã¼ã«ãã§ä¸ãããããã¡ã¤ã«ã® MD5 ãã§ãã¯ãµã ï¼ +<tt style="white-space: nowrap;">PatchFile</tt> ã使ç¨ããéã«ã¯å¿ é ï¼ +(fink-0.24.12 ã§å°å ¥) +</p> +</td></tr><tr valign="top"><td>PatchScript</td><td> <p> ããã段éã§å®è¡ãããã³ãã³ãã®ãªã¹ãï¼ ä¸è¨ã®ã¹ã¯ãªããã®æ³¨ææ¸ããåç §ãã¦ãã ããï¼ ããã«ã¯ï¼ããããå½ã¦ããï¼ã¾ãã¯ããã±ã¼ã¸ã«å¤æ´ãå ããã³ãã³ããæå®ãã¾ãï¼ ä¸è¨ã®<a href="#reference.scripts">ã¹ã¯ãªããã«é¢ãã注è¨</a>ããããã¦åç §ãã¦ãã ããï¼ ã³ãã³ãå®è¡åã«ï¼<a href="#format.percent">ãã¼ã»ã³ãå±é</a>ãè¡ããã¾ãï¼ - ããã©ã«ãå¤ã¯ããã¾ããï¼ - </p> +<tt style="white-space: nowrap;">PatchFile</tt> ãã£ã¼ã«ããåå¨ããå ´åï¼ +<tt style="white-space: nowrap;">PatchScript</tt> ã®æ¢å®å¤ã¯: +</p> +<pre> +patch -p1 < %{PatchFile} +</pre> +<p> +ã§ãï¼ +<tt style="white-space: nowrap;">PatchFile</tt> ããªãå ´åã®æ¢å®å¤ã¯ç©ºç½ã¨ãªãã¾ãï¼ +<tt style="white-space: nowrap;">PatchScript</tt> ãæ示çã«ç¨ããå ´åï¼ <tt style="white-space: nowrap;">PatchFile</tt> ãæ示ããªããã°ãªãã¾ããï¼ +</p> </td></tr></table> <p> <b>ã³ã³ãã¤ã«æ®µéé¢é£:</b> @@ -2453,6 +2485,9 @@ <p> æ°ããå°å ¥ãããæ¹ã®ç°¡æ½ãªããã±ã¼ã¸ãã¡ã¤ã«å½åè¦åãæ¡ç¨ãã¦ãããªãï¼ %f ã§ãªã %n ã使ããã¨ï¼ ããã2ã¤ã®ãã£ã¼ã«ãã¯äºãã«æä»çã§ã¯ãªãï¼ä¸¡æ¹æå®ãããã¨ãã§ãã¾ã (PatchScript, Patch ã®é ã«ä¸¡æ¹å®è¡ããã¾ã)ï¼ + ãããã¯ï¼<tt style="white-space: nowrap;">Patch</tt> ã®ä»£ããã«ï¼æ°ãã <tt style="white-space: nowrap;">PatchFile</tt> ãç¨ãï¼ + æ示çã¾ãã¯æ示çã« <tt style="white-space: nowrap;">PatchScript</tt> ãé©ç¨ãã¾ãï¼ + 詳細㯠<tt style="white-space: nowrap;">PatchFile</tt> ããã³ <tt style="white-space: nowrap;">PatchScript</tt> ã®èª¬æãåç §ï¼ </p> <p> ããããã¡ã¤ã«ã§ã¯ã¦ã¼ã¶ãã¤ã³ã¹ãã¼ã«ãã£ã¬ã¯ããªãé¸æã§ããããã«ããæ¹ãããã®ã§ï¼ @@ -2501,4 +2536,4 @@ 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.ja.xml,v 1.38 2006/02/23 07:22:43 babayoshihiko Exp $</i></p></body></html> +<p>Generated from <i>$Fink: packaging.ja.xml,v 1.39 2006/04/11 23:52:29 babayoshihiko Exp $</i></p></body></html> Index: packaging.zh.html =================================================================== RCS file: /cvsroot/fink/scripts/installer/dmg/doc/packaging/packaging.zh.html,v retrieving revision 1.33 retrieving revision 1.34 diff -u -d -r1.33 -r1.34 --- packaging.zh.html 23 Feb 2006 07:23:50 -0000 1.33 +++ packaging.zh.html 11 Apr 2006 23:57:58 -0000 1.34 @@ -265,6 +265,11 @@ default for <tt style="white-space: nowrap;">InstallScript</tt> in a <tt style="white-space: nowrap;">SplitOff</tt> package is blank. (Introduced in fink-0.20.6) </p> +</td></tr><tr valign="top"><td>%{PatchFile}</td><td> +<p> +The full path to the file given in the <tt style="white-space: nowrap;">PatchFile</tt> field. +(Introduced in fink-0.24.12) +</p> </td></tr></table> @@ -1547,21 +1552,56 @@ <tt style="white-space: nowrap;">/sw/lib/fink/update</tt>)ã </p> </td></tr><tr valign="top"><td>Patch</td><td> + <p> åºç¨äº <tt style="white-space: nowrap;">patch -p1 -<<b>patch-file</b></tt> å½ä»¤çè¡¥ä¸æ件çååãè¿åºè¯¥åªæ¯ä¸ä¸ªæ件åï¼æ£ç¡®çè·¯å¾ä¼è¢«èªå¨æ·»å ãå¨æ¬å段ä¸ä¼åºç¨ç¾åå·å±å¼ãæä»¥å ¸åç设置å¼åªæ¯ -<tt style="white-space: nowrap;">%f.patch</tt> æ <tt style="white-space: nowrap;">%n.patch</tt>ãè¡¥ä¸ä¼å¨ PatchScript èæ¬è¿è¡ä¹ååºç¨(å¦ææçè¯)ã +<<b>patch-file</b></tt> å½ä»¤çè¡¥ä¸æ件çååãè¿åºè¯¥åªæ¯ä¸ä¸ªæ件åï¼æ£ç¡®çè·¯å¾ä¼è¢«èªå¨æ·»å (the same directory where the <tt style="white-space: nowrap;">.info</tt> file + is located)ã å¨æ¬å段ä¸ä¼åºç¨ç¾åå·å±å¼ãæä»¥å ¸åç设置å¼åªæ¯ +<tt style="white-space: nowrap;">%f.patch</tt> æ <tt style="white-space: nowrap;">%n.patch</tt>ãè¡¥ä¸ä¼å¨ PatchScript èæ¬è¿è¡ä¹å in a separate step åºç¨(å¦ææçè¯)ã </p> + <p> è®°ä½ %n å æ¬ææ %type_ åç§æ°æ®ï¼æä»¥ä½ å¯è½éè¦å¨è¿éä½¿ç¨ %{ni} (ä¹è®¸éè¦å æ¬ä¸äºç¹å®ç %type_ å±å¼)ã ç»´æ¤ä¸ä¸ªåç¬çè¡¥ä¸æ件ï¼ç¶åå¨ <tt style="white-space: nowrap;">PatchScript</tt> å段ä¸ååºä¸åç§æå ³çä¿®æ¹ä¼æ¯å¯¹æ¯ä¸ªåç§ä½¿ç¨åç¬çè¡¥ä¸æ件容æäºã </p> +</td></tr><tr valign="top"><td>PatchFile</td><td> +<p> +The same syntax as the <tt style="white-space: nowrap;">Patch</tt> field. The full path to this +file is available using the <tt style="white-space: nowrap;">%{PatchFile}</tt> percent +expansion--do not use <tt style="white-space: nowrap;">%a</tt> to access this file. +Unlike <tt style="white-space: nowrap;">Patch</tt>, <tt style="white-space: nowrap;">PatchFile</tt> is applied as part +of <tt style="white-space: nowrap;">PatchScript</tt>. Fink checks that the listed file exists, +is readable, and that its checksum matches +the <tt style="white-space: nowrap;">PatchFile-MD5</tt> field. +</p> +<p> +You may not use both <tt style="white-space: nowrap;">Patch</tt> and <tt style="white-space: nowrap;">PatchFile</tt> in +the same package description. Any package that +uses <tt style="white-space: nowrap;">PatchFile</tt> must declare at least +<tt style="white-space: nowrap;">BuildDepends: fink (>= 0.24.12)</tt>. Giving a higher version +requirement is allowed if it is necessary for other reasons. +</p> +</td></tr><tr valign="top"><td>PatchFile-MD5</td><td> +<p> +The MD5 checksum of the file given in the <tt style="white-space: nowrap;">PatchFile</tt> +field. This field is required if <tt style="white-space: nowrap;">PatchFile</tt> is used. +(Introduced in fink-0.24.12) +</p> </td></tr><tr valign="top"><td>PatchScript</td><td> <p> å¨è¡¥ä¸é¶æ®µè¿è¡çä¸ç³»åå½ä»¤ãè¿æ¯å¯¹è½¯ä»¶å æè¡¥ä¸æä¿®æ¹è½¯ä»¶å çå°æ¹ã åé ä¸é¢å ³äº<a href="#reference.scripts">èæ¬ç注æäºé¡¹</a>ã å¨å½ä»¤è¿è¡ä¹åï¼ä¼è¿è¡<a href="#format.percent">ç¾åå·å±å¼</a>ã -å¨è¿é没æé»è®¤è¿è¡çå½ä»¤ã +If a <tt style="white-space: nowrap;">PatchFile</tt> field exists, the +default <tt style="white-space: nowrap;">PatchScript</tt> is: +</p> +<pre> +patch -p1 < %{PatchFile} +</pre> +<p> +If there is no <tt style="white-space: nowrap;">PatchFile</tt>, the default is blank. If you +have an explicit <tt style="white-space: nowrap;">PatchScript</tt>, you must apply +the <tt style="white-space: nowrap;">PatchFile</tt> explicitly. </p> </td></tr></table> <p><b>ç¼è¯é¶æ®µï¼</b></p> @@ -2048,7 +2088,16 @@ <pre>Patch: %f.patch</pre> <pre>PatchScript: patch -p1 <%a/%f.patch</pre> <p>å¦æä½ ä½¿ç¨æ¯è¾æ°çç®å软件å å½å约å®ï¼ä½¿ç¨ %n -æ¥ä»£æ¿ %fãè¿ä¸¤ä¸ªå段ä¸æ¯äºæ¥çï¼ä½ å¯ä»¥ä¸¤ä¸ªé½ä½¿ç¨ï¼å®ä»¬é½ä¼è¢«æ§è¡ãè¿ç§æ åµä¸ï¼PatchScript ä¼å¨åé¢è¢«æ§è¡ã</p> +æ¥ä»£æ¿ %fãè¿ä¸¤ä¸ªå段ä¸æ¯äºæ¥çï¼ä½ å¯ä»¥ä¸¤ä¸ªé½ä½¿ç¨ï¼å®ä»¬é½ä¼è¢«æ§è¡ãè¿ç§æ åµä¸ï¼PatchScript ä¼å¨åé¢è¢«æ§è¡ã + +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>å ä¸ºä½ å¯è½ä¼å¨è¡¥ä¸æ件ä¸å 许ç¨æ·éæ©å®è£ åç¼ï¼å»ºè®®å¨è¡¥ä¸æ件ä¸ä½¿ç¨ç±»ä¼¼ <tt style="white-space: nowrap;">@PREFIX@</tt> çåéæ¥ä»£æ¿ <tt style="white-space: nowrap;">/sw</tt>ï¼ç¶å使ç¨ï¼</p> <pre>PatchScript: sed 's|@PREFIX@|%p|g' <%a/%f.patch | patch -p1</pre> <p>è¡¥ä¸æ件åºè¯¥æ¯ unidiff æ ¼å¼ï¼èä¸ä¸è¬åºè¯¥éè¿ï¼</p> @@ -2081,4 +2130,4 @@ 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.zh.xml,v 1.26 2006/02/23 07:22:42 babayoshihiko Exp $</i></p></body></html> +<p>Generated from <i>$Fink: packaging.zh.xml,v 1.27 2006/04/11 23:52:29 babayoshihiko Exp $</i></p></body></html> ------------------------------------------------------- This SF.Net email is sponsored by xPML, a groundbreaking scripting language that extends applications into web and mobile media. Attend the live webcast and join the prime developer group breaking into this new coding territory! http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642 _______________________________________________ Fink-commits mailing list Fink-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/fink-commits