[36879] trunk/doc-new/guide/xml/portfile-phase.xml
markd at macports.org
markd at macports.org
Fri May 16 21:08:51 PDT 2008
Revision: 36879
http://trac.macosforge.org/projects/macports/changeset/36879
Author: markd at macports.org
Date: 2008-05-16 21:08:50 -0700 (Fri, 16 May 2008)
Log Message:
-----------
Improve some descriptions in the intro.
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 2008-05-17 03:51:40 UTC (rev 36878)
+++ trunk/doc-new/guide/xml/portfile-phase.xml 2008-05-17 04:08:50 UTC (rev 36879)
@@ -7,11 +7,12 @@
<section id="reference.phases.introduction">
<title>Introduction</title>
- <para>A MacPorts port has ten distinct phases. The MacPorts base is set to
- perform default steps for applications that use the standard
+ <para>The MacPorts port installation process has a number of distinct
+ phases that are described in detail in this section. The default scripts
+ coded into MacPorts base performs the standard
<command>configure</command>, <command>make</command>, and <command>make
- install</command> steps, but for applications that do not conform to this
- behavior, installation phases may be declared in a Portfile to <link
+ install</command> steps. For applications that do not conform to this
+ standard, installation phases may be declared in a Portfile to <link
linkend="development.examples.augment">augment</link> or <link
linkend="development.examples.override">override</link> the default
behavior as described in the <link linkend="development">Portfile
@@ -307,8 +308,8 @@
<para>For ports that must fetch multiple download files from
different locations, you must label the files with tags and
- match the tags in a distfiles statement. The format is
- <literal>mirror:subdirectory:tag</literal>.</para>
+ match the tags to a <literal>distfiles</literal> keyword. The
+ format is <literal>mirror:subdirectory:tag</literal>.</para>
<para>In the example below, file_one.tar.gz is fetched from
sourceforge mirrors in subdirectory <varname>${name}</varname>;
@@ -497,8 +498,8 @@
<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>, or
- <link linkend="reference.phases.fetch.git">git</link> checkout is be
+ linkend="reference.phases.fetch.svn">svn</link>, or <link
+ linkend="reference.phases.fetch.git">git</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>
@@ -781,14 +782,14 @@
</varlistentry>
</variablelist>
</section>
-
+
<section id="reference.phases.fetch.git">
<title>Fetch from Git</title>
- <para><ulink url="http://git.or.cz/">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://git.or.cz/">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>You have to set <link
linkend="reference.phases.fetch.advanced.fetch-type"><varname>fetch.type</varname></link>
@@ -822,8 +823,8 @@
<listitem>
<para>Optional tag for fetching with git, this specifies a branch
- (or other commit-ish) that git should checkout.
- Note that any branch besides HEAD should be prefixed by origin/.</para>
+ (or other commit-ish) that git should checkout. Note that any
+ branch besides HEAD should be prefixed by origin/.</para>
<itemizedlist>
<listitem>
@@ -834,6 +835,7 @@
<para>Example:</para>
<programlisting>git.branch 72bf1c8</programlisting>
+
<programlisting>git.branch origin/next</programlisting>
</listitem>
</itemizedlist>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20080516/19b5b86a/attachment.htm
More information about the macports-changes
mailing list