[59581] trunk/base
jmr at macports.org
jmr at macports.org
Sat Oct 17 08:12:24 PDT 2009
Revision: 59581
http://trac.macports.org/changeset/59581
Author: jmr at macports.org
Date: 2009-10-17 08:12:19 -0700 (Sat, 17 Oct 2009)
Log Message:
-----------
comment out macports.conf options where possible to allow users to follow changing defaults, also set matching defaults in macports.tcl and macports.conf
Modified Paths:
--------------
trunk/base/doc/macports.conf.in
trunk/base/src/macports1.0/macports.tcl
Modified: trunk/base/doc/macports.conf.in
===================================================================
--- trunk/base/doc/macports.conf.in 2009-10-17 14:39:21 UTC (rev 59580)
+++ trunk/base/doc/macports.conf.in 2009-10-17 15:12:19 UTC (rev 59581)
@@ -12,10 +12,10 @@
# Type of storage to use for the port registry information, "flat" or "sqlite"
# NOTE: sqlite not yet supported.
-portdbformat flat
+#portdbformat flat
# Type of installation to do for ports, "direct" or "image". See macports.conf(5) and online documentation.
-portinstalltype image
+#portinstalltype image
# PATH settings that are used for external tools (configure, make, etc.) while installing ports. The default
# paths are given in the example; it need not be uncommented. Customizing binpath is intended for advanced users only.
@@ -37,10 +37,10 @@
variants_conf @MPCONFIGDIR_EXPANDED@/variants.conf
# Create and use binary archive packages for installation/reinstallation ease
-portarchivemode no
+#portarchivemode no
# Where to store/retrieve ports binary archive files
-portarchivepath @localstatedir_expanded@/macports/packages
+#portarchivepath @localstatedir_expanded@/macports/packages
# Type of binary archive packages to create when using archive mode
#
@@ -51,7 +51,7 @@
# first archive to match one of the specified types in order is used.
#
# Supported types: tgz (default), tar, tbz, tbz2, tlz, txz, xar, zip, cpgz, cpio
-portarchivetype tgz
+#portarchivetype tgz
# CPU architecture to compile for. Defaults to i386 or ppc on Mac OS X 10.5
# and earlier, depending on the CPU type detected at runtime. On Mac OS X 10.6
@@ -62,16 +62,16 @@
universal_archs @UNIVERSAL_ARCHS@
# Use ccache (C/C++ compiler cache) - see http://ccache.samba.org/
-configureccache no
+#configureccache no
# Use distcc (distributed compiler) - see http://distcc.samba.org/
-configuredistcc no
+#configuredistcc no
# Use pipes rather than intermediate files when compiling C/C++/etc
-configurepipe no
+#configurepipe no
# Lowered scheduling priority (0-20) to use for make when building ports
-buildnicevalue 0
+#buildnicevalue 0
# Number of simultaneous make jobs (commands) to use when building ports. This
# value may be set to 0 so the number of simultaneous make jobs will be set to
@@ -80,7 +80,7 @@
#buildmakejobs 0
# Set whether to automatically execute "clean" after "install" of ports
-portautoclean yes
+#portautoclean yes
# Rsync server to fetch MacPorts sources from. Note that this is only used
# for selfupdate. The source(s) for the ports tree are set in sources.conf.
@@ -88,13 +88,13 @@
# for the current list):
# rsync.macports.org - California, USA (master)
# trd.no.rsync.macports.org - Trondheim, Norway
-rsync_server rsync.macports.org
+#rsync_server rsync.macports.org
# Rsync directory from which to pull the base/ component (infrastructure) of MacPorts
-rsync_dir release/base/
+#rsync_dir release/base/
# Rsync options
-rsync_options -rtzv --delete-after
+#rsync_options -rtzv --delete-after
# Options for generated startup items
# startupitem_type may be "default", "systemstarter", "launchd", or "none";
@@ -103,7 +103,7 @@
# launchd, while older Mac OS X systems will default to systemstarter. If
# option "none" is chosen, port startupitems are ignored and no startupitems
# are installed.
-startupitem_type default
+#startupitem_type default
# Extra environment variables to keep. Any variables listed here are added
# to the list of variables that are not removed from the environment used
Modified: trunk/base/src/macports1.0/macports.tcl
===================================================================
--- trunk/base/src/macports1.0/macports.tcl 2009-10-17 14:39:21 UTC (rev 59580)
+++ trunk/base/src/macports1.0/macports.tcl 2009-10-17 15:12:19 UTC (rev 59581)
@@ -547,7 +547,7 @@
# Archive mode, whether to create/use binary archive packages
if {![info exists portarchivemode]} {
- set macports::portarchivemode "yes"
+ set macports::portarchivemode "no"
global macports::portarchivemode
}
@@ -572,7 +572,7 @@
# Archive type, what type of binary archive to use (CPIO, gzipped
# CPIO, XAR, etc.)
if {![info exists portarchivetype]} {
- set macports::portarchivetype "cpgz"
+ set macports::portarchivetype "tgz"
global macports::portarchivetype
}
# Convert archive type to a list for multi-archive support, colon or
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20091017/2e875a15/attachment.html>
More information about the macports-changes
mailing list