[101264] branches/release_2_1

Mon Jan 7 05:57:09 PST 2013

Revision: 101264
          https://trac.macports.org/changeset/101264
Author:   jmr at macports.org
Date:     2013-01-07 05:57:09 -0800 (Mon, 07 Jan 2013)
Log Message:
-----------
merge r99275 from trunk:

base/doc/macports.conf.5:
 * Add startupitem_install, proxy_override_env, proxy_http, proxy_https, proxy_ftp proxy_rsync, proxy_skip, host_blacklist and preferred_hosts to man.
base/doc/macports.conf.in:
 * Add host_blacklist and preferred_hosts.

Revision Links:
--------------
    https://trac.macports.org/changeset/99275

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

Property Changed:
----------------
    branches/release_2_1/
    branches/release_2_1/base/


Property changes on: branches/release_2_1
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk:91825,91829,91834,92072,92342,92404,92546,92730,92785,92881,92903,92976,93062,93153,93197,93250,93258-93259,93261,93268,93274,93303,93339,93511-93512,93816,93962,95382,95438-95439,95480,95552,95616,95620,95873,96262,96535,97264,97367,97999,98190,98313
   + /trunk:91825,91829,91834,92072,92342,92404,92546,92730,92785,92881,92903,92976,93062,93153,93197,93250,93258-93259,93261,93268,93274,93303,93339,93511-93512,93816,93962,95382,95438-95439,95480,95552,95616,95620,95873,96262,96535,97264,97367,97999,98190,98313,99275


Property changes on: branches/release_2_1/base
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/gsoc08-privileges/base:37343-46937
/branches/gsoc09-logging/base:51231-60371
/branches/gsoc11-rev-upgrade/base:78828-88375
/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:91825,91829,91834,92072,92342,92404,92546,92730,92785,92881,92903,92976,93062,93129,93153,93197,93250,93256,93258-93259,93261,93268,93274,93303,93339,93511-93512,93816,93962,95382,95438-95439,95480,95552,95616,95620,95873,96136-96137,96262,96399-96401,96535,96538-96539,97264,97367,97868-97869,97999,98190,98313,100129,100217-100220
/users/perry/base-bugs_and_notes:45682-46060
/users/perry/base-select:44044-44692
   + /branches/gsoc08-privileges/base:37343-46937
/branches/gsoc09-logging/base:51231-60371
/branches/gsoc11-rev-upgrade/base:78828-88375
/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:91825,91829,91834,92072,92342,92404,92546,92730,92785,92881,92903,92976,93062,93129,93153,93197,93250,93256,93258-93259,93261,93268,93274,93303,93339,93511-93512,93816,93962,95382,95438-95439,95480,95552,95616,95620,95873,96136-96137,96262,96399-96401,96535,96538-96539,97264,97367,97868-97869,97999,98190,98313,99275,100129,100217-100220
/users/perry/base-bugs_and_notes:45682-46060
/users/perry/base-select:44044-44692

Modified: branches/release_2_1/base/doc/macports.conf.5
===================================================================

--- branches/release_2_1/base/doc/macports.conf.5	2013-01-07 13:54:16 UTC (rev 101263)
+++ branches/release_2_1/base/doc/macports.conf.5	2013-01-07 13:57:09 UTC (rev 101264)
@@ -187,6 +187,14 @@
 .br
 .Ic Default:
 default
+.It Va startupitem_install
+Option to install symlinks into /Library/LaunchAgents or
+/Library/LaunchDaemons; startupitem_install may be empty, "yes" or "no";
+if the option is NOT "no" then a symlink for the startupitem will be
+created in the appropriate system directory.
+.br
+.Ic Default:
+yes
 .It Va destroot_umask
 Umask value to use during the destrooting of a port.
 .br
@@ -220,6 +228,55 @@
 .It Va extra_env
 List of extra environment variables MacPorts should keep in the user's environment when sanitizing it.
 Changing this is unsupported.
+.It Va proxy_override_env
+Proxy support. Precedence is: env, macports.conf, System Preferences.
+That is, if it's set in the environment, that will be used instead of
+anything here or in System Preferences. Setting proxy_override_env to
+yes will cause any proxies set here (or in System Preferences if set
+there but not here) to override what's in the environment. Note that
+System Preferences doesn't have an rsync proxy definition. Also note, on
+10.5, sudo will clear many environment variables including those for
+proxy support. Equivalent environment variables: http_proxy,
+HTTPS_PROXY, FTP_PROXY, RSYNC_PROXY, NO_PROXY
+.br
+.Ic Default:
+yes
+.It Va proxy_http
+HTTP proxy
+.br
+.Ic Default:
+none
+.It Va proxy_https
+HTTPS proxy
+.br
+.Ic Default:
+none
+.It Va proxy_ftp
+FTP proxy
+.br
+.Ic Default:
+none
+.It Va proxy_rsync
+rsync proxy
+.br
+.Ic Default:
+none
+.It Va proxy_skip
+Hosts not to go through the proxy (comma-separated, applies to HTTP,
+HTTPS and FTP, but not rsync):
+.br
+.Ic Default:
+none
+.It Va host_blacklist
+Space separated list of download hosts that should not be used.
+.br
+.Ic Default:
+none
+.It Va preferred_hosts
+Space separated list of download hosts that should be used preferentially.
+.br
+.Ic Default:
+none
 .It Va revupgrade_autorun
 Controls whether the rev-upgrade action will be run automatically after
 upgrading ports.

Modified: branches/release_2_1/base/doc/macports.conf.in
===================================================================
--- branches/release_2_1/base/doc/macports.conf.in	2013-01-07 13:54:16 UTC (rev 101263)
+++ branches/release_2_1/base/doc/macports.conf.in	2013-01-07 13:57:09 UTC (rev 101264)
@@ -153,6 +153,13 @@
 # and FTP, but not rsync):
 #proxy_skip            internal1, internal2, internal3
 
+# Options 'host_blacklist' and 'preferred_hosts', used for indicating
+# space separated lists of download hosts that should not be used or
+# should be used preferentially, respectively. These override the usual
+# ping time check.
+#host_blacklist     badhost1.org badhost2.org
+#preferred_hosts    preferredhost1.org preferredhost2.org
+
 # Set whether to automatically run rev-upgrade after upgrading ports
 #revupgrade_autorun yes
 # Option controlling action taken by rev-upgrade, which checks for broken
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130107/9051de4e/attachment.html>
