[25516] branches/dp2mp-move/base

[source_changes at macosforge.org]

Revision: 25516
          http://trac.macosforge.org/projects/macports/changeset/25516
Author:   jmpp at macports.org
Date:     2007-05-23 13:50:04 -0700 (Wed, 23 May 2007)

Log Message:
-----------
Small dp to mp corrections to various files.

Modified Paths:
--------------
    branches/dp2mp-move/base/ReleaseProcess
    branches/dp2mp-move/base/doc/portgroup.7
    branches/dp2mp-move/base/portmgr/dmg/postflight
    branches/dp2mp-move/base/src/port/port.tcl

Modified: branches/dp2mp-move/base/ReleaseProcess
===================================================================
--- branches/dp2mp-move/base/ReleaseProcess	2007-05-23 20:49:03 UTC (rev 25515)
+++ branches/dp2mp-move/base/ReleaseProcess	2007-05-23 20:50:04 UTC (rev 25516)
@@ -48,7 +48,7 @@
 In preparation for a release, several things should be completed within the code:
 
 * Update the file base/ChangeLog in both trunk and the relase branch to reflect the appropriate changes.
-* Update the file base/config/dp_version with the target release number. Note that this is a floating point number that corresponds to the release number; it should correspond roughly to the release number where possible. Release 1.4.1, for instance, would be represented by the floating point number 1.41. The version number in dp_version is displayed by the port command as the version of MacPorts, and is used by the selfupdate command to determine whether a newer version of code is available. This number should be different between trunk and a release branch and the former should be updated as needed to differentiate it from the latter.
+* Update the file base/config/mp_version with the target release number. Note that this is a floating point number that corresponds to the release number; it should correspond roughly to the release number where possible. Release 1.4.1, for instance, would be represented by the floating point number 1.41. The version number in mp_version is displayed by the port command as the version of MacPorts, and is used by the selfupdate command to determine whether a newer version of code is available. This number should be different between trunk and a release branch and the former should be updated as needed to differentiate it from the latter.
 * Make sure that these, and any other changes or bug fixes are made on and/or merged between the release branch and trunk as needded. For instance, if you've made changes to ChangeLog only on the release branch, those changes should be merged back into trunk as well.
 
 

Modified: branches/dp2mp-move/base/doc/portgroup.7
===================================================================
--- branches/dp2mp-move/base/doc/portgroup.7	2007-05-23 20:49:03 UTC (rev 25515)
+++ branches/dp2mp-move/base/doc/portgroup.7	2007-05-23 20:50:04 UTC (rev 25516)
@@ -271,7 +271,7 @@
 .Em no
 .It Ic configure.args
 .Sy Default:
-.Em CC=gcc-dp-4.1
+.Em CC=gcc-mp-4.1
 .br
 .It Ic build.type
 .Sy Default:

Modified: branches/dp2mp-move/base/portmgr/dmg/postflight
===================================================================
--- branches/dp2mp-move/base/portmgr/dmg/postflight	2007-05-23 20:49:03 UTC (rev 25515)
+++ branches/dp2mp-move/base/portmgr/dmg/postflight	2007-05-23 20:50:04 UTC (rev 25516)
@@ -34,7 +34,7 @@
 
 BINPATH=/opt/local/bin
 SBINPATH=/opt/local/sbin
-TMP=`/usr/bin/mktemp /tmp/dp.$$`
+TMP=`/usr/bin/mktemp /tmp/mp.$$`
 $SHELL -l <<EOF > $TMP
     /usr/bin/printenv PATH
     exit

Modified: branches/dp2mp-move/base/src/port/port.tcl
===================================================================
--- branches/dp2mp-move/base/src/port/port.tcl	2007-05-23 20:49:03 UTC (rev 25515)
+++ branches/dp2mp-move/base/src/port/port.tcl	2007-05-23 20:50:04 UTC (rev 25516)
@@ -1936,7 +1936,7 @@
 						}
 					}
 					
-					# Restore internal dp environment
+					# Restore internal MacPorts environment
 					array unset env *; array set env [array get env_save]
 				}
 				

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