<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[126039] trunk/doc-new/guide/xml/portfile-phase.xml</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/126039">126039</a></dd>
<dt>Author</dt> <dd>khindenburg@macports.org</dd>
<dt>Date</dt> <dd>2014-10-02 07:39:05 -0700 (Thu, 02 Oct 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>guide: sort fetch types alphabetically; add stub for bzr</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdocnewguidexmlportfilephasexml">trunk/doc-new/guide/xml/portfile-phase.xml</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdocnewguidexmlportfilephasexml"></a>
<div class="modfile"><h4>Modified: trunk/doc-new/guide/xml/portfile-phase.xml (126038 => 126039)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/doc-new/guide/xml/portfile-phase.xml 2014-10-02 13:51:28 UTC (rev 126038)
+++ trunk/doc-new/guide/xml/portfile-phase.xml 2014-10-02 14:39:05 UTC (rev 126039)
</span><span class="lines">@@ -525,10 +525,11 @@
</span><span class="cx">
</span><span class="cx"> <listitem>
</span><span class="cx"> <para>Change the fetch type. This is only necessary if a <link
</span><del>- linkend="reference.phases.fetch.cvs">CVS</link>, <link
- linkend="reference.phases.fetch.svn">svn</link>, <link
- linkend="reference.phases.fetch.git">git</link> or <link
- linkend="reference.phases.fetch.hg">hg</link> checkout is be used.
</del><ins>+ linkend="reference.phases.fetch.bzr">bzr</link>, <link
+ linkend="reference.phases.fetch.cvs">cvs</link>, <link
+ linkend="reference.phases.fetch.git">git</link>, <link
+ linkend="reference.phases.fetch.hg">hg</link>, or <link
+ linkend="reference.phases.fetch.svn">svn</link> checkout is be used.
</ins><span class="cx"> <option>standard</option> is used for a normal http or ftp fetch
</span><span class="cx"> using <varname>${distfiles}</varname> and is used as
</span><span class="cx"> default.</para>
</span><span class="lines">@@ -539,8 +540,9 @@
</span><span class="cx"> </listitem>
</span><span class="cx">
</span><span class="cx"> <listitem>
</span><del>- <para>Values: <option>standard</option> <option>cvs</option>
- <option>svn</option> <option>git</option></para>
</del><ins>+ <para>Values: <option>standard</option> <option>bzr</option>
+ <option>cvs</option> <option>git</option>
+ <option>hg</option> <option>svn</option></para>
</ins><span class="cx"> </listitem>
</span><span class="cx">
</span><span class="cx"> <listitem>
</span><span class="lines">@@ -637,6 +639,11 @@
</span><span class="cx"> </variablelist>
</span><span class="cx"> </section>
</span><span class="cx">
</span><ins>+ <section id="reference.phases.fetch.bzr">
+ <title>Fetch from BZR</title>
+
+ </section>
+
</ins><span class="cx"> <section id="reference.phases.fetch.cvs">
</span><span class="cx"> <title>Fetch from CVS</title>
</span><span class="cx">
</span><span class="lines">@@ -753,21 +760,22 @@
</span><span class="cx"> </variablelist>
</span><span class="cx"> </section>
</span><span class="cx">
</span><del>- <section id="reference.phases.fetch.svn">
- <title>Fetch from Subversion</title>
</del><span class="cx">
</span><del>- <para><ulink url="http://subversion.apache.org/">Subversion</ulink> may
- be used as an alternative method of fetching distribution files using
- the keywords in this section. However, fetching via Subversion may cause
- non-reproducible builds, so it is strongly discouraged.</para>
</del><ins>+ <section id="reference.phases.fetch.git">
+ <title>Fetch from Git</title>
</ins><span class="cx">
</span><del>- <para>The <option>svn</option> <link
</del><ins>+ <para><ulink url="http://git-scm.com/">Git</ulink> may be used as an
+ alternative method of fetching distribution files using the keywords in
+ this section. However, fetching via Git may cause non-reproducible
+ builds, so it is strongly discouraged.</para>
+
+ <para>The <option>git</option> <link
</ins><span class="cx"> linkend="reference.phases.fetch.advanced.fetch-type">fetch.type</link>
</span><del>- is used to fetch source code from an svn repository.</para>
</del><ins>+ is used to fetch source code from a git repository.</para>
</ins><span class="cx">
</span><span class="cx"> <variablelist>
</span><span class="cx"> <varlistentry>
</span><del>- <term>svn.url</term>
</del><ins>+ <term>git.url</term>
</ins><span class="cx">
</span><span class="cx"> <listitem>
</span><span class="cx"> <para>This specifies the url from which to fetch files.</para>
</span><span class="lines">@@ -780,21 +788,21 @@
</span><span class="cx"> <listitem>
</span><span class="cx"> <para>Examples:</para>
</span><span class="cx">
</span><del>- <programlisting>svn.url http://www.example.com/svn-repo/mydirectory</programlisting>
</del><ins>+ <programlisting>git.url git://git.kernel.org/pub/scm/git/git.git</programlisting>
</ins><span class="cx">
</span><del>- <programlisting>svn.url svn://svn.example.com/svn-repo/mydirectory</programlisting>
</del><ins>+ <programlisting>git.url http://www.kernel.org/pub/scm/git/git.git</programlisting>
</ins><span class="cx"> </listitem>
</span><span class="cx"> </itemizedlist>
</span><span class="cx"> </listitem>
</span><span class="cx"> </varlistentry>
</span><span class="cx">
</span><span class="cx"> <varlistentry>
</span><del>- <term>svn.revision</term>
</del><ins>+ <term>git.branch</term>
</ins><span class="cx">
</span><span class="cx"> <listitem>
</span><del>- <para>Optional tag for fetching with Subversion, this specifies
- the peg revision to checkout; it corresponds to the @REV syntax of
- the svn cli.</para>
</del><ins>+ <para>Optional tag for fetching with git, this specifies the tag
+ or other commit-ish that git should checkout. Note that any tag on
+ a branch besides HEAD should be prefixed by origin/.</para>
</ins><span class="cx">
</span><span class="cx"> <itemizedlist>
</span><span class="cx"> <listitem>
</span><span class="lines">@@ -804,54 +812,31 @@
</span><span class="cx"> <listitem>
</span><span class="cx"> <para>Example:</para>
</span><span class="cx">
</span><del>- <programlisting>svn.revision 37192</programlisting>
- </listitem>
- </itemizedlist>
- </listitem>
- </varlistentry>
</del><ins>+ <programlisting>git.branch 72bf1c8</programlisting>
</ins><span class="cx">
</span><del>- <varlistentry>
- <term>svn.method</term>
-
- <listitem>
- <para>Optional tag for fetching with Subversion, this specifies
- whether to check out the code into a working copy, or just export
- it without the working copy metadata. An export is preferable
- because it takes half the disk space, but some software expects
- to be built in a working copy (for example because it wants to
- record the revision number into itself somewhere).</para>
-
- <itemizedlist>
- <listitem>
- <para>Default: export</para>
</del><ins>+ <programlisting>git.branch origin/next</programlisting>
</ins><span class="cx"> </listitem>
</span><del>-
- <listitem>
- <para>Example:</para>
-
- <programlisting>svn.method checkout</programlisting>
- </listitem>
</del><span class="cx"> </itemizedlist>
</span><span class="cx"> </listitem>
</span><span class="cx"> </varlistentry>
</span><span class="cx"> </variablelist>
</span><span class="cx"> </section>
</span><span class="cx">
</span><del>- <section id="reference.phases.fetch.git">
- <title>Fetch from Git</title>
</del><ins>+ <section id="reference.phases.fetch.hg">
+ <title>Fetch from Mercurial</title>
</ins><span class="cx">
</span><del>- <para><ulink url="http://git-scm.com/">Git</ulink> may be used as an
- alternative method of fetching distribution files using the keywords in
- this section. However, fetching via Git may cause non-reproducible
- builds, so it is strongly discouraged.</para>
</del><ins>+ <para><ulink url="http://mercurial.selenic.com/">Mercurial</ulink> may be
+ used as an alternative method of fetching distribution files using the
+ keywords in this section. However, fetching via Mercurial may cause
+ non-reproducible builds, so it is strongly discouraged.</para>
</ins><span class="cx">
</span><del>- <para>The <option>git</option> <link
</del><ins>+ <para>The <option>hg</option> <link
</ins><span class="cx"> linkend="reference.phases.fetch.advanced.fetch-type">fetch.type</link>
</span><del>- is used to fetch source code from a git repository.</para>
</del><ins>+ is used to fetch source code from a Mercurial repository.</para>
</ins><span class="cx">
</span><span class="cx"> <variablelist>
</span><span class="cx"> <varlistentry>
</span><del>- <term>git.url</term>
</del><ins>+ <term>hg.url</term>
</ins><span class="cx">
</span><span class="cx"> <listitem>
</span><span class="cx"> <para>This specifies the url from which to fetch files.</para>
</span><span class="lines">@@ -864,33 +849,33 @@
</span><span class="cx"> <listitem>
</span><span class="cx"> <para>Examples:</para>
</span><span class="cx">
</span><del>- <programlisting>git.url git://git.kernel.org/pub/scm/git/git.git</programlisting>
</del><ins>+ <programlisting>hg.url http://www.kernel.org/hg/index.cgi/linux-2.6/</programlisting>
</ins><span class="cx">
</span><del>- <programlisting>git.url http://www.kernel.org/pub/scm/git/git.git</programlisting>
</del><ins>+ <programlisting>hg.url http://hg.intevation.org/mercurial</programlisting>
</ins><span class="cx"> </listitem>
</span><span class="cx"> </itemizedlist>
</span><span class="cx"> </listitem>
</span><span class="cx"> </varlistentry>
</span><span class="cx">
</span><span class="cx"> <varlistentry>
</span><del>- <term>git.branch</term>
</del><ins>+ <term>hg.tag</term>
</ins><span class="cx">
</span><span class="cx"> <listitem>
</span><del>- <para>Optional tag for fetching with git, this specifies the tag
- or other commit-ish that git should checkout. Note that any tag on
- a branch besides HEAD should be prefixed by origin/.</para>
</del><ins>+ <para>Optional tag which should be fetched. Can be a Mercurial tag
+ or a revision. To prevent non-reproducible builds use of tip as
+ revision is discouraged.</para>
</ins><span class="cx">
</span><span class="cx"> <itemizedlist>
</span><span class="cx"> <listitem>
</span><del>- <para>Default: none</para>
</del><ins>+ <para>Default: tip</para>
</ins><span class="cx"> </listitem>
</span><span class="cx">
</span><span class="cx"> <listitem>
</span><span class="cx"> <para>Example:</para>
</span><span class="cx">
</span><del>- <programlisting>git.branch 72bf1c8</programlisting>
</del><ins>+ <programlisting>hg.tag v1.3</programlisting>
</ins><span class="cx">
</span><del>- <programlisting>git.branch origin/next</programlisting>
</del><ins>+ <programlisting>hg.tag ceb884843737</programlisting>
</ins><span class="cx"> </listitem>
</span><span class="cx"> </itemizedlist>
</span><span class="cx"> </listitem>
</span><span class="lines">@@ -898,21 +883,21 @@
</span><span class="cx"> </variablelist>
</span><span class="cx"> </section>
</span><span class="cx">
</span><del>- <section id="reference.phases.fetch.hg">
- <title>Fetch from Mercurial</title>
</del><ins>+ <section id="reference.phases.fetch.svn">
+ <title>Fetch from Subversion</title>
</ins><span class="cx">
</span><del>- <para><ulink url="http://mercurial.selenic.com/">Mercurial</ulink> may be
- used as an alternative method of fetching distribution files using the
- keywords in this section. However, fetching via Mercurial may cause
</del><ins>+ <para><ulink url="http://subversion.apache.org/">Subversion</ulink> may
+ be used as an alternative method of fetching distribution files using
+ the keywords in this section. However, fetching via Subversion may cause
</ins><span class="cx"> non-reproducible builds, so it is strongly discouraged.</para>
</span><span class="cx">
</span><del>- <para>The <option>hg</option> <link
</del><ins>+ <para>The <option>svn</option> <link
</ins><span class="cx"> linkend="reference.phases.fetch.advanced.fetch-type">fetch.type</link>
</span><del>- is used to fetch source code from a Mercurial repository.</para>
</del><ins>+ is used to fetch source code from an svn repository.</para>
</ins><span class="cx">
</span><span class="cx"> <variablelist>
</span><span class="cx"> <varlistentry>
</span><del>- <term>hg.url</term>
</del><ins>+ <term>svn.url</term>
</ins><span class="cx">
</span><span class="cx"> <listitem>
</span><span class="cx"> <para>This specifies the url from which to fetch files.</para>
</span><span class="lines">@@ -925,34 +910,57 @@
</span><span class="cx"> <listitem>
</span><span class="cx"> <para>Examples:</para>
</span><span class="cx">
</span><del>- <programlisting>hg.url http://www.kernel.org/hg/index.cgi/linux-2.6/</programlisting>
</del><ins>+ <programlisting>svn.url http://www.example.com/svn-repo/mydirectory</programlisting>
</ins><span class="cx">
</span><del>- <programlisting>hg.url http://hg.intevation.org/mercurial</programlisting>
</del><ins>+ <programlisting>svn.url svn://svn.example.com/svn-repo/mydirectory</programlisting>
</ins><span class="cx"> </listitem>
</span><span class="cx"> </itemizedlist>
</span><span class="cx"> </listitem>
</span><span class="cx"> </varlistentry>
</span><span class="cx">
</span><span class="cx"> <varlistentry>
</span><del>- <term>hg.tag</term>
</del><ins>+ <term>svn.revision</term>
</ins><span class="cx">
</span><span class="cx"> <listitem>
</span><del>- <para>Optional tag which should be fetched. Can be a Mercurial tag
- or a revision. To prevent non-reproducible builds use of tip as
- revision is discouraged.</para>
</del><ins>+ <para>Optional tag for fetching with Subversion, this specifies
+ the peg revision to checkout; it corresponds to the @REV syntax of
+ the svn cli.</para>
</ins><span class="cx">
</span><span class="cx"> <itemizedlist>
</span><span class="cx"> <listitem>
</span><del>- <para>Default: tip</para>
</del><ins>+ <para>Default: none</para>
</ins><span class="cx"> </listitem>
</span><span class="cx">
</span><span class="cx"> <listitem>
</span><span class="cx"> <para>Example:</para>
</span><span class="cx">
</span><del>- <programlisting>hg.tag v1.3</programlisting>
</del><ins>+ <programlisting>svn.revision 37192</programlisting>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+ </varlistentry>
</ins><span class="cx">
</span><del>- <programlisting>hg.tag ceb884843737</programlisting>
</del><ins>+ <varlistentry>
+ <term>svn.method</term>
+
+ <listitem>
+ <para>Optional tag for fetching with Subversion, this specifies
+ whether to check out the code into a working copy, or just export
+ it without the working copy metadata. An export is preferable
+ because it takes half the disk space, but some software expects
+ to be built in a working copy (for example because it wants to
+ record the revision number into itself somewhere).</para>
+
+ <itemizedlist>
+ <listitem>
+ <para>Default: export</para>
</ins><span class="cx"> </listitem>
</span><ins>+
+ <listitem>
+ <para>Example:</para>
+
+ <programlisting>svn.method checkout</programlisting>
+ </listitem>
</ins><span class="cx"> </itemizedlist>
</span><span class="cx"> </listitem>
</span><span class="cx"> </varlistentry>
</span></span></pre>
</div>
</div>
</body>
</html>