Update of /cvsroot/fink/web/xml/packaging In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19434
Modified Files: packaging.ja.xml packaging.zh.xml Log Message: en 1.87 Index: packaging.zh.xml =================================================================== RCS file: /cvsroot/fink/web/xml/packaging/packaging.zh.xml,v retrieving revision 1.26 retrieving revision 1.27 diff -u -d -r1.26 -r1.27 --- packaging.zh.xml 23 Feb 2006 07:22:42 -0000 1.26 +++ packaging.zh.xml 11 Apr 2006 23:52:29 -0000 1.27 @@ -323,6 +323,14 @@ package is blank. (Introduced in fink-0.20.6) </p> </itemd></item> + +<item><itemt>%{PatchFile}</itemt> +<itemd> +<p> +The full path to the file given in the <code>PatchFile</code> field. +(Introduced in fink-0.24.12) +</p> +</itemd></item> <!-- end translation --> </itemtable> @@ -1797,24 +1805,65 @@ <item><itemt>Patch</itemt> <itemd> +<!-- start translation --> <p> åºç¨äº <code>patch -p1 -<<em>patch-file</em></code> å½ä»¤çè¡¥ä¸æ件çååãè¿åºè¯¥åªæ¯ä¸ä¸ªæ件åï¼æ£ç¡®çè·¯å¾ä¼è¢«èªå¨æ·»å ãå¨æ¬å段ä¸ä¼åºç¨ç¾åå·å±å¼ãæä»¥å ¸åç设置å¼åªæ¯ -<code>%f.patch</code> æ <code>%n.patch</code>ãè¡¥ä¸ä¼å¨ PatchScript èæ¬è¿è¡ä¹ååºç¨(å¦ææçè¯)ã +<<em>patch-file</em></code> å½ä»¤çè¡¥ä¸æ件çååãè¿åºè¯¥åªæ¯ä¸ä¸ªæ件åï¼æ£ç¡®çè·¯å¾ä¼è¢«èªå¨æ·»å (the same directory where the <code>.info</code> file + is located)ã å¨æ¬å段ä¸ä¼åºç¨ç¾åå·å±å¼ãæä»¥å ¸åç设置å¼åªæ¯ +<code>%f.patch</code> æ <code>%n.patch</code>ãè¡¥ä¸ä¼å¨ PatchScript èæ¬è¿è¡ä¹å in a separate step åºç¨(å¦ææçè¯)ã </p> +<!-- end translation --> <p> è®°ä½ %n å æ¬ææ %type_ åç§æ°æ®ï¼æä»¥ä½ å¯è½éè¦å¨è¿éä½¿ç¨ %{ni} (ä¹è®¸éè¦å æ¬ä¸äºç¹å®ç %type_ å±å¼)ã ç»´æ¤ä¸ä¸ªåç¬çè¡¥ä¸æ件ï¼ç¶åå¨ <code>PatchScript</code> å段ä¸ååºä¸åç§æå ³çä¿®æ¹ä¼æ¯å¯¹æ¯ä¸ªåç§ä½¿ç¨åç¬çè¡¥ä¸æ件容æäºã </p> </itemd></item> +<item><itemt>PatchFile</itemt> +<itemd> +<p> +The same syntax as the <code>Patch</code> field. The full path to this +file is available using the <code>%{PatchFile}</code> percent +expansion--do not use <code>%a</code> to access this file. +Unlike <code>Patch</code>, <code>PatchFile</code> is applied as part +of <code>PatchScript</code>. Fink checks that the listed file exists, +is readable, and that its checksum matches +the <code>PatchFile-MD5</code> field. +</p> +<p> +You may not use both <code>Patch</code> and <code>PatchFile</code> in +the same package description. Any package that +uses <code>PatchFile</code> must declare at least +<code>BuildDepends: fink (>= 0.24.12)</code>. Giving a higher version +requirement is allowed if it is necessary for other reasons. +</p> +</itemd></item> + +<item><itemt>PatchFile-MD5</itemt> +<itemd> +<p> +The MD5 checksum of the file given in the <code>PatchFile</code> +field. This field is required if <code>PatchFile</code> is used. +(Introduced in fink-0.24.12) +</p> +</itemd></item> + <item><itemt>PatchScript</itemt> <itemd> <p> å¨è¡¥ä¸é¶æ®µè¿è¡çä¸ç³»åå½ä»¤ãè¿æ¯å¯¹è½¯ä»¶å æè¡¥ä¸æä¿®æ¹è½¯ä»¶å çå°æ¹ã åé ä¸é¢å ³äº<xref chapter="reference" section="scripts">èæ¬ç注æäºé¡¹</xref>ã å¨å½ä»¤è¿è¡ä¹åï¼ä¼è¿è¡<xref chapter="format" section="percent">ç¾åå·å±å¼</xref>ã -å¨è¿é没æé»è®¤è¿è¡çå½ä»¤ã +If a <code>PatchFile</code> field exists, the +default <code>PatchScript</code> is: +</p> +<codeblock> +patch -p1 < %{PatchFile} +</codeblock> +<p> +If there is no <code>PatchFile</code>, the default is blank. If you +have an explicit <code>PatchScript</code>, you must apply +the <code>PatchFile</code> explicitly. </p> </itemd></item> @@ -2394,7 +2443,16 @@ <codeblock>Patch: %f.patch</codeblock> <codeblock>PatchScript: patch -p1 <%a/%f.patch</codeblock> <p>å¦æä½ ä½¿ç¨æ¯è¾æ°çç®å软件å å½å约å®ï¼ä½¿ç¨ %n -æ¥ä»£æ¿ %fãè¿ä¸¤ä¸ªå段ä¸æ¯äºæ¥çï¼ä½ å¯ä»¥ä¸¤ä¸ªé½ä½¿ç¨ï¼å®ä»¬é½ä¼è¢«æ§è¡ãè¿ç§æ åµä¸ï¼PatchScript ä¼å¨åé¢è¢«æ§è¡ã</p> +æ¥ä»£æ¿ %fãè¿ä¸¤ä¸ªå段ä¸æ¯äºæ¥çï¼ä½ å¯ä»¥ä¸¤ä¸ªé½ä½¿ç¨ï¼å®ä»¬é½ä¼è¢«æ§è¡ãè¿ç§æ åµä¸ï¼PatchScript ä¼å¨åé¢è¢«æ§è¡ã +<!-- start translation --> +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. +<!-- end translation --> +</p> + <p>å ä¸ºä½ å¯è½ä¼å¨è¡¥ä¸æ件ä¸å 许ç¨æ·éæ©å®è£ åç¼ï¼å»ºè®®å¨è¡¥ä¸æ件ä¸ä½¿ç¨ç±»ä¼¼ <code>@PREFIX@</code> çåéæ¥ä»£æ¿ <code>/sw</code>ï¼ç¶å使ç¨ï¼</p> <codeblock>PatchScript: sed 's|@PREFIX@|%p|g' <%a/%f.patch | patch -p1</codeblock> <p>è¡¥ä¸æ件åºè¯¥æ¯ unidiff æ ¼å¼ï¼èä¸ä¸è¬åºè¯¥éè¿ï¼</p> Index: packaging.ja.xml =================================================================== RCS file: /cvsroot/fink/web/xml/packaging/packaging.ja.xml,v retrieving revision 1.38 retrieving revision 1.39 diff -u -d -r1.38 -r1.39 --- packaging.ja.xml 23 Feb 2006 07:22:43 -0000 1.38 +++ packaging.ja.xml 11 Apr 2006 23:52:29 -0000 1.39 @@ -386,6 +386,13 @@ </p> </itemd> </item> +<item><itemt>%{PatchFile}</itemt> +<itemd> +<p> +<code>PatchFile</code> ãã£ã¼ã«ãã§ç¤ºããããã¡ã¤ã«ã®ãã«ãã¹ï¼ +(fink-0.24.12 ã«ã¦å°å ¥) +</p> +</itemd></item> </itemtable> </section> </chapter> @@ -2189,9 +2196,9 @@ <p> <code>patch -p1 <<em>ããããã¡ã¤ã«</em></code> ã¨ãã¦é©ç¨ããããããã®ãã¡ã¤ã«åï¼ ããã«ã¯ãã¡ã¤ã«åã®ã¿ãæå®ãã¾ãï¼ - é©åãªãã¹ã¯èªåçã«åç½®ããã¾ãï¼ + é©åãªãã¹ (<code>.info</code>ã®ãããã£ã¬ã¯ããª) ã¯èªåçã«åç½®ããã¾ãï¼ ãã®ãã£ã¼ã«ãã§ã¯ãã¼ã»ã³ãå±éãè¡ãããã®ã§ï¼å ¸åçãªå¤ã¯åã« <code>%f.patch</code> ã¾ã㯠<code>%n.patch</code> ã¨ãªãã¾ãï¼ - PatchScript ãæå®ããã¦ããå ´åï¼ãããã¯ãã®å¾ã«å®è¡ããã¾ãï¼ + PatchScript ãæå®ããã¦ããå ´åï¼ãããã¯ãã®å¾ã«å¥ã®ã¹ãããã¨ãã¦å®è¡ããã¾ãï¼ </p> <p> %n 㯠%type_ ç³»ã§ç¤ºãããå¤ç¨®ãã¼ã¿å ¨ã¦ãå«ãæååã«å±éããããã¨ã«æ³¨æï¼ @@ -2202,6 +2209,30 @@ </p> </itemd> </item> +<!-- start translation --> +<item><itemt>PatchFile</itemt> +<itemd> +<p> +<code>Patch</code> ãã£ã¼ã«ãã¨åãææ³ï¼ +ãã®ãã¡ã¤ã«ã¸ã®ãã«ãã¹ã¯ï¼ <code>%{PatchFile}</code> ãã¼ã»ã³ãå±éã§å©ç¨ãããã¨ãã§ãã¾ãï¼ +<code>Patch</code> ã¨ç°ãªãï¼ <code>PatchFile</code> 㯠<code>PatchScript</code> ã®ä¸é¨åã¨ãã¦é©ç¨ããã¾ãï¼ +Fink ã¯ï¼ãã®ã¢ã¤ã«ãåå¨ãï¼èªã¿åãå¯è½ã§ããï¼ãã§ãã¯ãµã ã <code>PatchFile-MD5</code> ãã£ã¼ã«ãã¨é©åãã¦ãããã¨ã確èªãã¾ãï¼ +</p> +<p> +<code>Patch</code> 㨠<code>PatchFile</code> ãï¼ã²ã¨ã¤ã®ããã±ã¼ã¸è¨è¿°ä¸ã«åæã«ä½¿ããã¨ã¯ã§ãã¾ããï¼ +<code>PatchFile</code> ã使ãããã±ã¼ã¸ã¯ï¼<code>BuildDepends: fink (>= 0.24.12)</code> ã宣è¨ããªããã°ãªãã¾ããï¼ +ä»ã®çç±ãããã°ãããã大ãããã¼ã¸ã§ã³çªå·ã使ã£ã¦ããã¾ãã¾ããï¼ +</p> +</itemd></item> +<item><itemt>PatchFile-MD5</itemt> +<itemd> +<p> +<code>PatchFile</code> ãã£ã¼ã«ãã§ä¸ãããããã¡ã¤ã«ã® MD5 ãã§ãã¯ãµã ï¼ +<code>PatchFile</code> ã使ç¨ããéã«ã¯å¿ é ï¼ +(fink-0.24.12 ã§å°å ¥) +</p> +</itemd></item> +<!-- end translation --> <item> <itemt>PatchScript</itemt> <itemd> @@ -2211,8 +2242,17 @@ ããã«ã¯ï¼ããããå½ã¦ããï¼ã¾ãã¯ããã±ã¼ã¸ã«å¤æ´ãå ããã³ãã³ããæå®ãã¾ãï¼ ä¸è¨ã®<xref chapter="reference" section="scripts">ã¹ã¯ãªããã«é¢ãã注è¨</xref>ããããã¦åç §ãã¦ãã ããï¼ ã³ãã³ãå®è¡åã«ï¼<xref chapter="format" section="percent">ãã¼ã»ã³ãå±é</xref>ãè¡ããã¾ãï¼ - ããã©ã«ãå¤ã¯ããã¾ããï¼ - </p> +<code>PatchFile</code> ãã£ã¼ã«ããåå¨ããå ´åï¼ +<code>PatchScript</code> ã®æ¢å®å¤ã¯: +</p> +<codeblock> +patch -p1 < %{PatchFile} +</codeblock> +<p> +ã§ãï¼ +<code>PatchFile</code> ããªãå ´åã®æ¢å®å¤ã¯ç©ºç½ã¨ãªãã¾ãï¼ +<code>PatchScript</code> ãæ示çã«ç¨ããå ´åï¼ <code>PatchFile</code> ãæ示ããªããã°ãªãã¾ããï¼ +</p> </itemd> </item> </itemtable> @@ -2885,6 +2925,9 @@ <p> æ°ããå°å ¥ãããæ¹ã®ç°¡æ½ãªããã±ã¼ã¸ãã¡ã¤ã«å½åè¦åãæ¡ç¨ãã¦ãããªãï¼ %f ã§ãªã %n ã使ããã¨ï¼ ããã2ã¤ã®ãã£ã¼ã«ãã¯äºãã«æä»çã§ã¯ãªãï¼ä¸¡æ¹æå®ãããã¨ãã§ãã¾ã (PatchScript, Patch ã®é ã«ä¸¡æ¹å®è¡ããã¾ã)ï¼ + ãããã¯ï¼<code>Patch</code> ã®ä»£ããã«ï¼æ°ãã <code>PatchFile</code> ãç¨ãï¼ + æ示çã¾ãã¯æ示çã« <code>PatchScript</code> ãé©ç¨ãã¾ãï¼ + 詳細㯠<code>PatchFile</code> ããã³ <code>PatchScript</code> ã®èª¬æãåç §ï¼ </p> <p> ããããã¡ã¤ã«ã§ã¯ã¦ã¼ã¶ãã¤ã³ã¹ãã¼ã«ãã£ã¬ã¯ããªãé¸æã§ããããã«ããæ¹ãããã®ã§ï¼ ------------------------------------------------------- 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