[107099] branches/release_2_2/base/doc

larryv at macports.org larryv at macports.org
Mon Jun 17 21:43:14 PDT 2013 

Revision: 107099
          https://trac.macports.org/changeset/107099
Author:   larryv at macports.org
Date:     2013-06-17 21:43:14 -0700 (Mon, 17 Jun 2013)
Log Message:
-----------
Merge rewritten comments in configuration files.

Modified Paths:
--------------
    branches/release_2_2/base/doc/archive_sites.conf
    branches/release_2_2/base/doc/pubkeys.conf.in
    branches/release_2_2/base/doc/sources.conf
    branches/release_2_2/base/doc/variants.conf

Property Changed:
----------------
    branches/release_2_2/base/doc/


Property changes on: branches/release_2_2/base/doc
___________________________________________________________________
Added: 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-107097
/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-06-18 04:42:33 UTC (rev 107098)
+++ branches/release_2_2/base/doc/archive_sites.conf	2013-06-18 04:43:14 UTC (rev 107099)
@@ -1,27 +1,40 @@
-# Configuration for (binary) archive sources.
 # $Id$
 
-# Each entry is started by a name line. The only required values are name and
-# urls. Other fields are type, prefix, applications_dir and frameworks_dir,
-# which have the usual default values:
-#    type tbz2
-#    prefix /opt/local
-#    applications_dir /Applications/MacPorts
-#    frameworks_dir ${prefix}/Library/Frameworks
+# MacPorts configuration file for binary archive sources.
+
+# Each source entry consists of one or more fields.
 #
-# type can be any of: tgz, tar, tbz, tbz2, tlz, txz, xar, zip, cpgz, cpio
-# Note that some types require a corresponding tool to be installed, and
-# entries with an unsupported type will not be used.
+#   name: A name for the archive source. This field always starts a new
+#       entry. Required.
+#
+#   urls: A space- or tab-delimited list of the source's URLs. Defaults
+#       to an empty list.
+#
+#   type: The filetype of the archives; valid values are "cpgz", "cpio",
+#       "tar", "tbz", "tbz2", "tgz", "tlz", "txz", "xar", and "zip".
+#       MacPorts handles each archive type with an appropriate external
+#       executable; if it cannot find such an executable, or if the
+#       specified type is invalid, the source is not used. Defaults to
+#       "tbz2".
+#
+#   prefix: The prefix of the MacPorts installation used to create the
+#       source's archives. This must match the value of "prefix" set in
+#       macports.conf, or the source is not used. Defaults to
+#       "/opt/local".
+#
+#   applications_dir: The applications directory of the MacPorts
+#       installation used to create the source's archives. This must
+#       match the value of "applications_dir" set in macports.conf, or
+#       the source is not used. Defaults to "/Applications/MacPorts".
+#
+#   frameworks_dir: The frameworks directory of the MacPorts
+#       installation used to create the source's archives. This must
+#       match the value of "frameworks_dir" set in macports.conf, or the
+#       source is not used. Defaults to "[prefix]/Library/Frameworks".
 
-# Example:
-#name                mysource
-#urls                http://example.com/ ftp://ftp.example.org/
-#type                tbz2
+# Example source:
+#name                My Source
+#urls                http://example.com/ ftp://ftp.example.com/packages/
+#type                zip
 #prefix              /opt/mysource
 #applications_dir    /opt/mysource/Applications
-#frameworks_dir      /opt/mysource/Library/Frameworks
-
-# If you want to disable use of the archive sites listed in the ports tree,
-# you could do this:
-#name                macports_archives
-#urls

Modified: branches/release_2_2/base/doc/pubkeys.conf.in
===================================================================
--- branches/release_2_2/base/doc/pubkeys.conf.in	2013-06-18 04:42:33 UTC (rev 107098)
+++ branches/release_2_2/base/doc/pubkeys.conf.in	2013-06-18 04:43:14 UTC (rev 107099)
@@ -1,10 +1,15 @@
-# Downloaded archives will only be used if they can be verified by a public
-# key listed here. Use full paths, one per line.
+# $Id$
 
+# MacPorts system-wide public key configuration file.
+
+# Downloaded archives will only be used if they can be verified by one
+# of the public keys listed here. Use absolute paths, one per line.
+
 @prefix_expanded@/share/macports/macports-pubkey.pem
 
-# To distribute archives of your own, you need a key pair generated like so:
-# openssl genrsa -des3 -out privkey.pem 2048
-# openssl rsa -in privkey.pem -pubout -out pubkey.pem
-# Then sign the archives like this:
-# openssl dgst -ripemd160 -sign privkey.pem -out archive.tbz2.rmd160 archive.tbz2
+# To distribute archives of your own, generate a key pair:
+#   openssl genrsa -des3 -out privkey.pem 2048
+#   openssl rsa -in privkey.pem -pubout -out pubkey.pem
+#
+# And sign the archives:
+#   openssl dgst -ripemd160 -sign privkey.pem -out archive.tbz2.rmd160 archive.tbz2

Modified: branches/release_2_2/base/doc/sources.conf
===================================================================
--- branches/release_2_2/base/doc/sources.conf	2013-06-18 04:42:33 UTC (rev 107098)
+++ branches/release_2_2/base/doc/sources.conf	2013-06-18 04:43:14 UTC (rev 107099)
@@ -1,6 +1,9 @@
 # $Id$
 
 # MacPorts system-wide configuration file for ports tree sources.
+#
+# To change how MacPorts fetches base, see rsync_server and rsync_dir in
+# macports.conf.
 
 # To add a local source, add a "file://" entry.
 #

Modified: branches/release_2_2/base/doc/variants.conf
===================================================================
--- branches/release_2_2/base/doc/variants.conf	2013-06-18 04:42:33 UTC (rev 107098)
+++ branches/release_2_2/base/doc/variants.conf	2013-06-18 04:43:14 UTC (rev 107099)
@@ -1,9 +1,15 @@
-# To specify global variants to use for all port builds,
-# customize this file to list variant settings you want.
+# $Id$
+
+# MacPorts system-wide global variants configuration file.
+
+# Any variants listed here are applied to all port builds. As on the
+# command line, variants may be either enabled (+) or disabled (-), and
+# unsupported variants are simply ignored.
 #
-# Any variants specified here that are not supported by
-# a port will just be ignored. Multiple variants can be
-# specified per line, or one per line is also allowed.
+# Each line must be a space- or tab-delimited list of zero or more
+# variants.
 #
 # Example:
-# +ipv6 +no_x11
+#   -x11 +no_x11 +quartz
+#   +gcc48
+#   +universal
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130617/086a61ca/attachment.html>

More information about the macports-changes mailing list