[126039] trunk/doc-new/guide/xml/portfile-phase.xml

khindenburg at macports.org khindenburg at macports.org
Thu Oct 2 07:39:05 PDT 2014


Revision: 126039
          https://trac.macports.org/changeset/126039
Author:   khindenburg at macports.org
Date:     2014-10-02 07:39:05 -0700 (Thu, 02 Oct 2014)
Log Message:
-----------
guide: sort fetch types alphabetically; add stub for bzr

Modified Paths:
--------------
    trunk/doc-new/guide/xml/portfile-phase.xml

Modified: trunk/doc-new/guide/xml/portfile-phase.xml
===================================================================
--- 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)
@@ -525,10 +525,11 @@
 
           <listitem>
             <para>Change the fetch type. This is only necessary if a <link
-            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.
+            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.
             <option>standard</option> is used for a normal http or ftp fetch
             using <varname>${distfiles}</varname> and is used as
             default.</para>
@@ -539,8 +540,9 @@
               </listitem>
 
               <listitem>
-                <para>Values: <option>standard</option> <option>cvs</option>
-                <option>svn</option> <option>git</option></para>
+                <para>Values: <option>standard</option> <option>bzr</option>
+                <option>cvs</option> <option>git</option>
+                <option>hg</option> <option>svn</option></para>
               </listitem>
 
               <listitem>
@@ -637,6 +639,11 @@
       </variablelist>
     </section>
 
+    <section id="reference.phases.fetch.bzr">
+      <title>Fetch from BZR</title>
+
+    </section>
+
     <section id="reference.phases.fetch.cvs">
       <title>Fetch from CVS</title>
 
@@ -753,21 +760,22 @@
       </variablelist>
     </section>
 
-    <section id="reference.phases.fetch.svn">
-      <title>Fetch from Subversion</title>
 
-      <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>
+    <section id="reference.phases.fetch.git">
+      <title>Fetch from Git</title>
 
-      <para>The <option>svn</option> <link
+      <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
       linkend="reference.phases.fetch.advanced.fetch-type">fetch.type</link>
-      is used to fetch source code from an svn repository.</para>
+      is used to fetch source code from a git repository.</para>
 
       <variablelist>
         <varlistentry>
-          <term>svn.url</term>
+          <term>git.url</term>
 
           <listitem>
             <para>This specifies the url from which to fetch files.</para>
@@ -780,21 +788,21 @@
               <listitem>
                 <para>Examples:</para>
 
-                <programlisting>svn.url             http://www.example.com/svn-repo/mydirectory</programlisting>
+                <programlisting>git.url             git://git.kernel.org/pub/scm/git/git.git</programlisting>
 
-                <programlisting>svn.url             svn://svn.example.com/svn-repo/mydirectory</programlisting>
+                <programlisting>git.url             http://www.kernel.org/pub/scm/git/git.git</programlisting>
               </listitem>
             </itemizedlist>
           </listitem>
         </varlistentry>
 
         <varlistentry>
-          <term>svn.revision</term>
+          <term>git.branch</term>
 
           <listitem>
-            <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>
+            <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>
 
             <itemizedlist>
               <listitem>
@@ -804,54 +812,31 @@
               <listitem>
                 <para>Example:</para>
 
-                <programlisting>svn.revision        37192</programlisting>
-              </listitem>
-            </itemizedlist>
-          </listitem>
-        </varlistentry>
+                <programlisting>git.branch             72bf1c8</programlisting>
 
-        <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>
+                <programlisting>git.branch             origin/next</programlisting>
               </listitem>
-
-              <listitem>
-                <para>Example:</para>
-
-                <programlisting>svn.method          checkout</programlisting>
-              </listitem>
             </itemizedlist>
           </listitem>
         </varlistentry>
       </variablelist>
     </section>
 
-    <section id="reference.phases.fetch.git">
-      <title>Fetch from Git</title>
+    <section id="reference.phases.fetch.hg">
+      <title>Fetch from Mercurial</title>
 
-      <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><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>
 
-      <para>The <option>git</option> <link
+      <para>The <option>hg</option> <link
       linkend="reference.phases.fetch.advanced.fetch-type">fetch.type</link>
-      is used to fetch source code from a git repository.</para>
+      is used to fetch source code from a Mercurial repository.</para>
 
       <variablelist>
         <varlistentry>
-          <term>git.url</term>
+          <term>hg.url</term>
 
           <listitem>
             <para>This specifies the url from which to fetch files.</para>
@@ -864,33 +849,33 @@
               <listitem>
                 <para>Examples:</para>
 
-                <programlisting>git.url             git://git.kernel.org/pub/scm/git/git.git</programlisting>
+                <programlisting>hg.url              http://www.kernel.org/hg/index.cgi/linux-2.6/</programlisting>
 
-                <programlisting>git.url             http://www.kernel.org/pub/scm/git/git.git</programlisting>
+                <programlisting>hg.url              http://hg.intevation.org/mercurial</programlisting>
               </listitem>
             </itemizedlist>
           </listitem>
         </varlistentry>
 
         <varlistentry>
-          <term>git.branch</term>
+          <term>hg.tag</term>
 
           <listitem>
-            <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>
+            <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>
 
             <itemizedlist>
               <listitem>
-                <para>Default: none</para>
+                <para>Default: tip</para>
               </listitem>
 
               <listitem>
                 <para>Example:</para>
 
-                <programlisting>git.branch             72bf1c8</programlisting>
+                <programlisting>hg.tag              v1.3</programlisting>
 
-                <programlisting>git.branch             origin/next</programlisting>
+                <programlisting>hg.tag              ceb884843737</programlisting>
               </listitem>
             </itemizedlist>
           </listitem>
@@ -898,21 +883,21 @@
       </variablelist>
     </section>
 
-    <section id="reference.phases.fetch.hg">
-      <title>Fetch from Mercurial</title>
+    <section id="reference.phases.fetch.svn">
+      <title>Fetch from Subversion</title>
 
-      <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
+      <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>
 
-      <para>The <option>hg</option> <link
+      <para>The <option>svn</option> <link
       linkend="reference.phases.fetch.advanced.fetch-type">fetch.type</link>
-      is used to fetch source code from a Mercurial repository.</para>
+      is used to fetch source code from an svn repository.</para>
 
       <variablelist>
         <varlistentry>
-          <term>hg.url</term>
+          <term>svn.url</term>
 
           <listitem>
             <para>This specifies the url from which to fetch files.</para>
@@ -925,34 +910,57 @@
               <listitem>
                 <para>Examples:</para>
 
-                <programlisting>hg.url              http://www.kernel.org/hg/index.cgi/linux-2.6/</programlisting>
+                <programlisting>svn.url             http://www.example.com/svn-repo/mydirectory</programlisting>
 
-                <programlisting>hg.url              http://hg.intevation.org/mercurial</programlisting>
+                <programlisting>svn.url             svn://svn.example.com/svn-repo/mydirectory</programlisting>
               </listitem>
             </itemizedlist>
           </listitem>
         </varlistentry>
 
         <varlistentry>
-          <term>hg.tag</term>
+          <term>svn.revision</term>
 
           <listitem>
-            <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>
+            <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>
 
             <itemizedlist>
               <listitem>
-                <para>Default: tip</para>
+                <para>Default: none</para>
               </listitem>
 
               <listitem>
                 <para>Example:</para>
 
-                <programlisting>hg.tag              v1.3</programlisting>
+                <programlisting>svn.revision        37192</programlisting>
+              </listitem>
+            </itemizedlist>
+          </listitem>
+        </varlistentry>
 
-                <programlisting>hg.tag              ceb884843737</programlisting>
+        <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>
               </listitem>
+
+              <listitem>
+                <para>Example:</para>
+
+                <programlisting>svn.method          checkout</programlisting>
+              </listitem>
             </itemizedlist>
           </listitem>
         </varlistentry>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20141002/50fb9c4f/attachment-0001.html>


More information about the macports-changes mailing list