[32088] branches/release_1_6/base

[jmpp at macports.org]

Revision: 32088
          http://trac.macosforge.org/projects/macports/changeset/32088
Author:   jmpp at macports.org
Date:     2007-12-16 10:40:47 -0800 (Sun, 16 Dec 2007)

Log Message:
-----------
Merged revisions 31971-32060 via svnmerge from 
http://svn.macports.org/repository/macports/trunk/base

........
  r31971 | jmpp at macports.org | 2007-12-12 20:44:45 -0400 (Wed, 12 Dec 2007) | 1 line
  
  Update ChangeLog and NEWS file with latest additions to base since r31640, when the NEWS file was created, my last checkpoint.
........
  r31990 | jmpp at macports.org | 2007-12-13 03:19:31 -0400 (Thu, 13 Dec 2007) | 4 lines
  
  
  Add entries in both ChangeLog and NEWS about the new postflight script. Thanks to Boey Maun Suang for the addition to the guide!
........
  r32060 | jmpp at macports.org | 2007-12-14 17:04:29 -0400 (Fri, 14 Dec 2007) | 1 line
  
  Whitespace fixes, add modeline.
........

Modified Paths:
--------------
    branches/release_1_6/base/ChangeLog
    branches/release_1_6/base/NEWS
    branches/release_1_6/base/src/macports1.0/macports_autoconf.tcl.in

Property Changed:
----------------
    branches/release_1_6/base/


Property changes on: branches/release_1_6/base
___________________________________________________________________
Name: svnmerge-integrated
   - /trunk/base:1-31490,31493-31494,31497-31499,31501-31519,31521-31599,31601-31770,31772-31906,31909-31945,31947-31950
   + /trunk/base:1-31490,31493-31494,31497-31499,31501-31519,31521-31599,31601-31770,31772-31906,31909-31945,31947-31950,31971-32060

Modified: branches/release_1_6/base/ChangeLog
===================================================================
--- branches/release_1_6/base/ChangeLog	2007-12-16 18:02:59 UTC (rev 32087)
+++ branches/release_1_6/base/ChangeLog	2007-12-16 18:40:47 UTC (rev 32088)
@@ -6,11 +6,22 @@
 
 Unreleased:
 
-    - 
+    - Add 'merge' function for merging multiple (single arch) destroots into one (universal)
+      destroot (mww in r31954).
 
 
 Release 1.6.0 (pending):
 
+    - Revamped the postflight script that is run by Installer.app with our pkg installer to gracefully
+      handle the addition of PATH, MANPATH and DISPLAY environment variables separately, if needed.
+      Read http://guide.macports.org/#installing.binary.postflight.details for more information
+      (jmpp in many commits directly on the release_1_6 branch).
+
+    - Remove LD_PREBIND & LD_PREBIND_ALLOW_OVERLAP variables from MacPorts' environment to prevent
+      prebinding of binaries, which can be harmful on Tiger and above (#13436, mww in r31786).
+
+    - Add 'gcc-4.2' option to the configure.compiler Portfile command (mww in r31891). 
+
     - Flush port(1) output channel after issuing prompt, when readline is not
       available, to ensure prompt is displayed at proper time. (jberry r31338).
       

Modified: branches/release_1_6/base/NEWS
===================================================================
--- branches/release_1_6/base/NEWS	2007-12-16 18:02:59 UTC (rev 32087)
+++ branches/release_1_6/base/NEWS	2007-12-16 18:40:47 UTC (rev 32088)
@@ -18,7 +18,12 @@
 *) Disabled readline support in interactive mode of the port(1) command by deafult;
 *) Fixed a bug by which the "variants" target of the port(1) command would spit out an error backtrace to the terminal when no match
     was found for the requested port;
+*) Revamped the "postflight" script that takes care of setting a MacPorts-compatible shell environment after installation from our
+    "pkg" is complete; it now gracefully handles the addition of PATH, MANPATH and DISPLAY environment variables separately and only
+    if strictly needed, properly backing up appropriate shell configuration files before proceeding to modify them
+    (http://guide.macports.org/#installing.binary.postflight.details for more information);
 
+
 # Individual port-building related improvements:
 
 *) Eugene Pimenov's GSoC2007 work on improving "trace mode" for the building of ports in clean environments,
@@ -31,6 +36,8 @@
 *) Added a 'macosx_deployment_target' option to the main 'macports.conf' file for ports that benefit form this Mac OS X specific flag;
 *) Added a 'configurepipe' option to the main 'macports.conf' file for using pipes rather than intermediate files when compiling C/C++
     based ports;
+*) Removed LD_PREBIND & LD_PREBIND_ALLOW_OVERLAP variables from MacPorts' environment to prevent prebinding of binaries, which can be harmful
+    on Tiger and above;
 
 
 # Packaging related improvements:

Modified: branches/release_1_6/base/src/macports1.0/macports_autoconf.tcl.in
===================================================================
--- branches/release_1_6/base/src/macports1.0/macports_autoconf.tcl.in	2007-12-16 18:02:59 UTC (rev 32087)
+++ branches/release_1_6/base/src/macports1.0/macports_autoconf.tcl.in	2007-12-16 18:40:47 UTC (rev 32088)
@@ -1,3 +1,4 @@
+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:filetype=tcl:et:sw=4:ts=4:sts=4
 # macports-autoconf.tcl.in
 # $Id$
 #
@@ -31,9 +32,9 @@
 package provide macports 1.0
 
 namespace eval macports::autoconf {
-	variable macports_conf_path "@MPCONFIGDIR_EXPANDED@"
-        variable macports_user_dir "~/.macports"
-        variable svn_path "@SVN@"
-	variable rsync_path "@RSYNC@"
-        variable open_path "@OPEN@"
+    variable macports_conf_path "@MPCONFIGDIR_EXPANDED@"
+    variable macports_user_dir "~/.macports"
+    variable svn_path "@SVN@"
+    variable rsync_path "@RSYNC@"
+    variable open_path "@OPEN@"
 }

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20071216/d9e390f7/attachment.html