[108047] branches/release_2_2/base/doc

[larryv at macports.org]

Revision: 108047
          https://trac.macports.org/changeset/108047
Author:   larryv at macports.org
Date:     2013-07-10 23:19:13 -0700 (Wed, 10 Jul 2013)
Log Message:
-----------
Merge base/doc/macports.conf.in from trunk, undoing prior merge r108009:

- r108041: macports.conf.in: Revert r108004:108005, removing mention of delete_la_files.

Revision Links:
--------------
    https://trac.macports.org/changeset/108009
    https://trac.macports.org/changeset/108041
    https://trac.macports.org/changeset/108004

Modified Paths:
--------------
    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-108011
/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-108046
/users/perry/base-bugs_and_notes/doc:45682-46060
/users/perry/base-select/doc:44044-44692

Modified: branches/release_2_2/base/doc/macports.conf.in
===================================================================
--- branches/release_2_2/base/doc/macports.conf.in	2013-07-11 06:06:33 UTC (rev 108046)
+++ branches/release_2_2/base/doc/macports.conf.in	2013-07-11 06:19:13 UTC (rev 108047)
@@ -98,12 +98,6 @@
 # umask value to use when a port installs its files.
 #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
-
 # Automatically execute "clean" after "install" of ports.
 #portautoclean       	yes
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130710/6b9740ff/attachment.html>