[108012] branches/release_2_2/base/doc
larryv at macports.org
larryv at macports.org
Wed Jul 10 12:22:33 PDT 2013
Revision: 108012
https://trac.macports.org/changeset/108012
Author: larryv at macports.org
Date: 2013-07-10 12:22:33 -0700 (Wed, 10 Jul 2013)
Log Message:
-----------
Merge r108011 from trunk:
archive_sites.conf, macports.conf.in: Adjust whitespace.
Revision Links:
--------------
https://trac.macports.org/changeset/108011
Modified Paths:
--------------
branches/release_2_2/base/doc/archive_sites.conf
branches/release_2_2/base/doc/macports.conf.in
Property Changed:
----------------
branches/release_2_2/base/doc/
Property changes on: branches/release_2_2/base/doc
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/gsoc08-privileges/base/doc:37343-46937
/branches/gsoc09-logging/base/doc:51231-60371
/branches/gsoc11-rev-upgrade/base/doc:78828-88375
/branches/universal-sanity/base/doc:51872-52323
/branches/variant-descs-14482/base/doc:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659
/trunk/base/doc:106800-108007
/users/perry/base-bugs_and_notes/doc:45682-46060
/users/perry/base-select/doc:44044-44692
+ /branches/gsoc08-privileges/base/doc:37343-46937
/branches/gsoc09-logging/base/doc:51231-60371
/branches/gsoc11-rev-upgrade/base/doc:78828-88375
/branches/universal-sanity/base/doc:51872-52323
/branches/variant-descs-14482/base/doc:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659
/trunk/base/doc:106800-108011
/users/perry/base-bugs_and_notes/doc:45682-46060
/users/perry/base-select/doc:44044-44692
Modified: branches/release_2_2/base/doc/archive_sites.conf
===================================================================
--- branches/release_2_2/base/doc/archive_sites.conf 2013-07-10 19:20:12 UTC (rev 108011)
+++ branches/release_2_2/base/doc/archive_sites.conf 2013-07-10 19:22:33 UTC (rev 108012)
@@ -33,12 +33,12 @@
# source is not used. Defaults to "[prefix]/Library/Frameworks".
# Example source:
-#name My Source
-#urls http://example.com/ ftp://ftp.example.com/packages/
-#type zip
-#prefix /opt/mysource
-#applications_dir /opt/mysource/Applications
+#name My Source
+#urls http://example.com/ ftp://ftp.example.com/packages/
+#type zip
+#prefix /opt/mysource
+#applications_dir /opt/mysource/Applications
# To disable the default archive source, uncomment the following dummy
# entry; it will shadow the one from the ports tree.
-#name macports_archives
+#name macports_archives
Modified: branches/release_2_2/base/doc/macports.conf.in
===================================================================
--- branches/release_2_2/base/doc/macports.conf.in 2013-07-10 19:20:12 UTC (rev 108011)
+++ branches/release_2_2/base/doc/macports.conf.in 2013-07-10 19:22:33 UTC (rev 108012)
@@ -8,7 +8,7 @@
prefix @prefix_expanded@
# User to run operations as when MacPorts drops privileges.
-#macportsuser @RUNUSR@
+#macportsuser @RUNUSR@
# Directory for MacPorts working data.
portdbpath @localstatedir_expanded@/macports
@@ -17,16 +17,16 @@
# (make(1), pkg-config(1), etc.). While installing ports, MacPorts uses
# this list for PATH. Changing this setting is intended for advanced
# users only and is unsupported.
-#binpath @prefix_expanded@/bin:@prefix_expanded@/sbin:/bin:/sbin:/usr/bin:/usr/sbin
+#binpath @prefix_expanded@/bin:@prefix_expanded@/sbin:/bin:/sbin:/usr/bin:/usr/sbin
# Directory containing Xcode Tools. By default, MacPorts determines this
# using xcode-select(1).
-#developer_dir @DEVELOPER_DIR@
+#developer_dir @DEVELOPER_DIR@
# Location of PackageMaker. Defaults to
# "${developer_dir}/Applications/Utilities/PackageMaker.app" with Xcode
# 4.2 and earlier and "/Applications/PackageMaker.app" with 4.3 and later.
-#packagemaker_path /Applications/PackageMaker.app
+#packagemaker_path /Applications/PackageMaker.app
# Directory for application bundles installed by ports.
applications_dir @MPAPPLICATIONSDIR@
@@ -46,17 +46,17 @@
# - always: Always build from source; never try fetching archives.
# - never: Never build from source; try fetching archives and abort if
# unavailable.
-#buildfromsource ifneeded
+#buildfromsource ifneeded
# Type of archive to use for port images. Supported types are cpgz,
# cpio, tar, tbz, tbz2, tgz, tlz, txz, xar, zip.
-#portarchivetype tbz2
+#portarchivetype tbz2
# CPU architecture to target. Supported values are "ppc", "ppc64",
# "i386", and "x86_64". Defaults to:
# - OS X 10.5 and earlier: "ppc" on PowerPC, otherwise "i386".
# - OS X 10.6 and later: "x86_64" on Intel 64, otherwise "i386".
-#build_arch i386
+#build_arch i386
# Space-delimited list of CPU architectures to target when building
# universal. Defaults to "i386 ppc" on OS X 10.5 and earlier and
@@ -66,66 +66,66 @@
# Use ccache, a compiler cache for C, C++, Objective-C, and
# Objective-C++. (See http://ccache.samba.org.) The "ccache" executable
# must exist in one of the directories in binpath.
-#configureccache no
+#configureccache no
# Directory for ccache's cached compiler output.
-#ccache_dir @localstatedir_expanded@/macports/build/.ccache
+#ccache_dir @localstatedir_expanded@/macports/build/.ccache
# Maximum size of files stored in ccache's cache. Append "G", "M", or
# "K" for gigabytes, megabytes, or kilobytes.
-#ccache_size 2G
+#ccache_size 2G
# Use distcc, a distributed compiler for C, C++, Objective-C, and
# Objective-C++. (See http://distcc.org.) The "distcc" executable must
# exist in one of the directories in binpath.
-#configuredistcc no
+#configuredistcc no
# Use pipes rather than temporary files for communication between the
# various stages of C, C++, Objective-C, and Objective-C++ compilation.
-#configurepipe yes
+#configurepipe yes
# Lowered scheduling priority to use for commands run during configure,
# build, and destroot. Accepted values are 0 (normal priority) through
# 20 (lowest priority).
-#buildnicevalue 0
+#buildnicevalue 0
# Number of simultaneous make(1) jobs to use when building ports. If set
# to 0, the number of jobs will be the lesser of:
# - number of automatically-detected CPU cores
# - gigabytes of physical memory + 1
-#buildmakejobs 0
+#buildmakejobs 0
# umask value to use when a port installs its files.
-#destroot_umask 022
+#destroot_umask 022
# Delete GNU Libtool .la files from new port installations. If set to
# "no", MacPorts keeps the files but purges them of dependency
# information to prevent overlinking. Defaults to "yes" on OS X 10.9 and
# later and "no" otherwise.
-#delete_la_files no
+#delete_la_files no
# Automatically execute "clean" after "install" of ports.
-#portautoclean yes
+#portautoclean yes
# Keep logs after successful installations.
-#keeplogs no
+#keeplogs no
# The rsync server for fetching MacPorts base during selfupdate. This
# setting is NOT used when downloading the ports tree; the sources for
# the ports tree are set in sources.conf. See
# https://trac.macports.org/wiki/Mirrors#MacPortsSource for a list of
# available servers.
-#rsync_server rsync.macports.org
+#rsync_server rsync.macports.org
# Location of MacPorts base sources on rsync_server. If this references
# a .tar file, a signed .rmd160 file must exist in the same directory
# and will be used to verify its integrity. See
# https://trac.macports.org/wiki/Mirrors#MacPortsSource to find the
# correct rsync_dir for a particular rsync_server.
-#rsync_dir release/tarballs/base.tar
+#rsync_dir release/tarballs/base.tar
# Options to pass to rsync when fetching MacPorts base and the ports tree.
-#rsync_options -rtzv --delete-after
+#rsync_options -rtzv --delete-after
# Type of generated StartupItems.
# - launchd: Create StartupItems for use with launchd.
@@ -134,7 +134,7 @@
# - default: Create StartupItems for launchd on OS X and for rc.d on
# other platforms.
# - none: Disable creation of StartupItems.
-#startupitem_type default
+#startupitem_type default
# Create system-level symlinks to generated StartupItems. If set to
# "no", symlinks will not be created; otherwise, symlinks will be placed
@@ -157,7 +157,7 @@
# unsupported. (Note that sudo(8) sanitizes its environment on OS X 10.5
# and later, so it may have to be configured to pass the desired
# variables to MacPorts.)
-#extra_env KEEP_THIS THIS_TOO
+#extra_env KEEP_THIS THIS_TOO
# Override proxy-related environment variables. By default, MacPorts
# takes proxy settings from the environment, from the proxy_* options
@@ -167,35 +167,35 @@
# for rsync proxies. Also note that sudo(8) sanitizes its environment on
# OS X 10.5 and later, so it may have to be configured to pass desired
# variables to MacPorts.)
-#proxy_override_env no
+#proxy_override_env no
# Proxies. These have no default values. The analogous environment
# variables are "http_proxy", "HTTPS_PROXY", "FTP_PROXY", and
# "RSYNC_PROXY".
-#proxy_http proxy1:12345
-#proxy_https proxy2:67890
-#proxy_ftp proxy3:02139
-#proxy_rsync proxy4:11377
+#proxy_http proxy1:12345
+#proxy_https proxy2:67890
+#proxy_ftp proxy3:02139
+#proxy_rsync proxy4:11377
# Comma-delimited list of hosts that MacPorts should not access through
# the HTTP, HTTPS, and FTP proxies. This does not apply to rsync, and it
# has no default value.
-#proxy_skip host1, host2, host3
+#proxy_skip host1, host2, host3
# Space-delimited lists of download hosts that MacPorts should not use
# and that MacPorts should prefer, respectively, overriding the usual
# ping time checks. These have no default values.
-#host_blacklist badhost1 badhost2
-#preferred_hosts preferredhost1 preferredhost2
+#host_blacklist badhost1 badhost2
+#preferred_hosts preferredhost1 preferredhost2
# Whether MacPorts should automatically run rev-upgrade after upgrading
# ports.
-#revupgrade_autorun yes
+#revupgrade_autorun yes
# Whether rev-upgrade should automatically rebuild ports with broken
# linking or merely report the breakage. Supported values are "report"
# and "rebuild".
-#revupgrade_mode rebuild
+#revupgrade_mode rebuild
# Space-delimited list of files and directories to delete after the
# unarchive stage and before creating a pkg. Paths are interpreted
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130710/018795be/attachment-0001.html>
More information about the macports-changes
mailing list