[57256] branches/release_1_8

[jmr at macports.org]

Revision: 57256
          http://trac.macports.org/changeset/57256
Author:   jmr at macports.org
Date:     2009-09-08 02:27:04 -0700 (Tue, 08 Sep 2009)
Log Message:
-----------
merge r57255 from trunk:
 macports.conf.5: add build_arch, remove Jaguar-specific info, fix spelling

Revision Links:
--------------
    http://trac.macports.org/changeset/57255

Modified Paths:
--------------
    branches/release_1_8/base/doc/macports.conf.5

Property Changed:
----------------
    branches/release_1_8/
    branches/release_1_8/base/


Property changes on: branches/release_1_8
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk:55268,55279,55281,55285,55317,55385,55417,55591,55594,55679,55767,55793,56147,56435,56448,57026
   + /trunk:55268,55279,55281,55285,55317,55385,55417,55591,55594,55679,55767,55793,56147,56435,56448,57026,57255


Property changes on: branches/release_1_8/base
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/gsoc08-privileges/base:37343-46937
/branches/universal-sanity/base:51872-52323
/branches/variant-descs-14482/base:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659
/trunk/base:55268,55279,55281,55285,55317,55385,55417,55591,55594,55679,55767,55793,55825,56147,56435,56448,56666,56889,57026,57048,57055,57131
/users/perry/base-bugs_and_notes:45682-46060
/users/perry/base-select:44044-44692
   + /branches/gsoc08-privileges/base:37343-46937
/branches/universal-sanity/base:51872-52323
/branches/variant-descs-14482/base:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659
/trunk/base:55268,55279,55281,55285,55317,55385,55417,55591,55594,55679,55767,55793,55825,56147,56435,56448,56666,56889,57026,57048,57055,57131,57255
/users/perry/base-bugs_and_notes:45682-46060
/users/perry/base-select:44044-44692

Modified: branches/release_1_8/base/doc/macports.conf.5
===================================================================
--- branches/release_1_8/base/doc/macports.conf.5	2009-09-08 09:24:50 UTC (rev 57255)
+++ branches/release_1_8/base/doc/macports.conf.5	2009-09-08 09:27:04 UTC (rev 57256)
@@ -62,14 +62,14 @@
 .Ic Default:
 ${prefix}/var/macports
 .It Va portdbformat
-Storage type to use for the MacPorts registry. Currently the only supportted format is "flat".
+Storage type to use for the MacPorts registry. Currently the only supported format is "flat".
 .br
 .Ic Default:
 flat
 .It Va portinstalltype
 Sets the mode in which ports are installed by MacPorts. Supported values are 'direct' or 'image'.
 The 'direct' mode is often used on systems that do not support 'image' due to limitations in their
-installed version of TCL. In 'direct' mode ports are installed directly into '${prefix}' and only
+installed version of Tcl. In 'direct' mode ports are installed directly into '${prefix}' and only
 one flavor of a port can be installed at any given time. In 'image' mode multiple flavors of a port
 (i.e., different versions and/or any possible combination of its variants) can be installed concurrently
 into '${portdbpath}/software/${portname}' and only one can be "activated" onto '${prefix}' via soft or
@@ -77,11 +77,6 @@
 .br
 .Ic Default:
 image
-.\" I think Paul wrote code to suppot image on Jaguar, so the following comment may no longer be needed.
-.\" is this the case?
-.Pp
-NOTE. Mac OS X 10.2 and Darwin 6.x users should switch to 'direct' mode to have MacPorts working properly
-on their systems.
 .It Va applications_dir
 Directory containing Applications installed from ports.
 .br
@@ -96,7 +91,7 @@
 Location of the sources file. This file enables rsync synchronization of the default ports tree with the
 MacPorts rsync server (through the "sync" target of the
 .Nm port
-commnand) and any other local tree(s) you might have.
+command) and any other local tree(s) you might have.
 .br
 .Ic Default:
 ${prefix}/etc/macports/sources.conf
@@ -156,13 +151,23 @@
 .br
 .Ic Default:
 yes
+.It Va build_arch
+The machine architecture to try to build for in normal use
+.br
+Regular architectures include: ppc, i386, ppc64, x86_64
+.br
+.Ic Default (10.6):
+x86_64 or i386 depending on hardware
+.br
+.Ic Default (10.5 and earlier):
+i386 or ppc depending on hardware
 .It Va universal_archs
 The machine architectures to use for +universal variant
 (multiple architecture entries should be space separated)
 .br
 Regular architectures include: ppc, i386, ppc64, x86_64
 .br
-.Ic Default:
+.Ic Default (10.6):
 x86_64 i386
 .br
 .Ic Default (10.5 and earlier):
@@ -183,7 +188,7 @@
 Default rsync server to connect to when running "selfupdate" through the
 .Nm port
 command to update your entire MacPorts
-installation (spanning both the MacPorts infrastucture and the ports tree).
+installation (spanning both the MacPorts infrastructure and the ports tree).
 .br
 .Ic Default:
 rsync.macports.org
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090908/02705b6c/attachment.html>