[32695] trunk/www

jmpp at macports.org jmpp at macports.org
Fri Jan 11 08:14:30 PST 2008


Revision: 32695
          http://trac.macosforge.org/projects/macports/changeset/32695
Author:   jmpp at macports.org
Date:     2008-01-11 08:14:26 -0800 (Fri, 11 Jan 2008)

Log Message:
-----------

Don't be cheap about wording, use our full 'macports' name in variable naming for mp_version_*, clearer like this.
No functional changes.

Modified Paths:
--------------
    trunk/www/includes/common.inc
    trunk/www/index.php
    trunk/www/install.php

Modified: trunk/www/includes/common.inc
===================================================================
--- trunk/www/includes/common.inc	2008-01-11 15:46:17 UTC (rev 32694)
+++ trunk/www/includes/common.inc	2008-01-11 16:14:26 UTC (rev 32695)
@@ -9,8 +9,8 @@
 ######################################################################
 
 # MacPorts version variables:
-$mp_version_major = '1.6.0';
-$mp_version_latest = '1.6.0';
+$macports_version_major = '1.6.0';
+$macports_version_latest = '1.6.0';
 
 
 ######################################################################
@@ -18,13 +18,13 @@
 # Some useful URL abstractions:
 $trac_url = 'http://trac.macports.org/projects/macports/';
 $svn_url = 'http://svn.macports.org/repository/macports/';
-$downloads = $svn_url . 'downloads/MacPorts-' . $mp_version_major . '/';
-$leopard_dmg = $downloads . 'MacPorts-' . $mp_version_major . '-10.5-Leopard.dmg';
-$tiger_dmg = $downloads . 'MacPorts-' . $mp_version_major . '-10.4-Tiger.dmg';
-$panther_dmg = $downloads . 'MacPorts-' . $mp_version_major . '-10.3-Panther.dmg';
-$bz2_tarball = $downloads . 'MacPorts-' . $mp_version_major . '.tar.bz2';
-$gz_tarball = $downloads . 'MacPorts-' . $mp_version_major . '.tar.gz';
-$checksums = $downloads .  'MacPorts-' . $mp_version_major . '.chk.txt';
+$downloads = $svn_url . 'downloads/MacPorts-' . $macports_version_major . '/';
+$leopard_dmg = $downloads . 'MacPorts-' . $macports_version_major . '-10.5-Leopard.dmg';
+$tiger_dmg = $downloads . 'MacPorts-' . $macports_version_major . '-10.4-Tiger.dmg';
+$panther_dmg = $downloads . 'MacPorts-' . $macports_version_major . '-10.3-Panther.dmg';
+$bz2_tarball = $downloads . 'MacPorts-' . $macports_version_major . '.tar.bz2';
+$gz_tarball = $downloads . 'MacPorts-' . $macports_version_major . '.tar.gz';
+$checksums = $downloads .  'MacPorts-' . $macports_version_major . '.chk.txt';
 $guide_url = 'http://guide.macports.org/';
 
 
@@ -41,7 +41,7 @@
 
 # Page header:
 function print_header($title, $encoding) {
-    global $MPWEB, $mp_version_major, $trac_url, $svn_url, $downloads, $guide_url;
+    global $MPWEB, $macports_version_major, $trac_url, $svn_url, $downloads, $guide_url;
     
     header("Content-Type: application/xhtml+xml; charset=$encoding");
     include("$MPWEB/includes/header.inc");

Modified: trunk/www/index.php
===================================================================
--- trunk/www/index.php	2008-01-11 15:46:17 UTC (rev 32694)
+++ trunk/www/index.php	2008-01-11 16:14:26 UTC (rev 32695)
@@ -37,7 +37,7 @@
     A.K.A <a href="<?php print $guide_url; ?>"> The MacPorts Guide</a>, and our Trac <a href="<?php print $trac_url; ?>">Wiki
     server &amp; bug tracker</a>.</p>
             
-    <p><b>Latest MacPorts <a href="install.php">release</a>: <?php print $mp_version_latest; ?></b></p>
+    <p><b>Latest MacPorts <a href="install.php">release</a>: <?php print $macports_version_latest; ?></b></p>
 
     
     <h3 class="subhdr">Getting involved</h3>

Modified: trunk/www/install.php
===================================================================
--- trunk/www/install.php	2008-01-11 15:46:17 UTC (rev 32694)
+++ trunk/www/install.php	2008-01-11 16:14:26 UTC (rev 32695)
@@ -13,7 +13,7 @@
 
     <h2 class="hdr">Installing MacPorts</h2>
 
-    <p>MacPorts version <?php print $mp_version_major; ?> is available in various formats for download and installation:
+    <p>MacPorts version <?php print $macports_version_major; ?> is available in various formats for download and installation:
     </p>
 
     <ul>
@@ -92,18 +92,18 @@
 
     <ol>
         <li>&ldquo;<kbd>cd</kbd>&rdquo; into the directory where you downloaded the package and run &ldquo;<kbd>tar xjvf
-        <a href="<?php print $bz2_tarball; ?>">MacPorts-<?php print $mp_version_major; ?>.tar.bz2</a></kbd>&rdquo; or
-        &ldquo;<kbd>tar xzvf <a href="<?php print $gz_tarball; ?>">MacPorts-<?php print $mp_version_major; ?>.tar.gz</a></kbd>&rdquo;,
+        <a href="<?php print $bz2_tarball; ?>">MacPorts-<?php print $macports_version_major; ?>.tar.bz2</a></kbd>&rdquo; or
+        &ldquo;<kbd>tar xzvf <a href="<?php print $gz_tarball; ?>">MacPorts-<?php print $macports_version_major; ?>.tar.gz</a></kbd>&rdquo;,
         depending on whether you downloaded the bz2 tarball or the gz one, respectively.</li>
         <li>Build and install the recently unpacked sources:
             <ul>
-                <li><kbd>cd MacPorts-<?php print $mp_version_major; ?></kbd></li>
+                <li><kbd>cd MacPorts-<?php print $macports_version_major; ?></kbd></li>
                 <li><kbd>./configure &amp;&amp; make &amp;&amp; sudo make install</kbd></li>
             </ul>
             Optionally:
             <ul>
                 <li><kbd>cd ../</kbd></li>
-                <li><kbd>rm -rf MacPorts-<?php print $mp_version_major; ?>*</kbd></li>
+                <li><kbd>rm -rf MacPorts-<?php print $macports_version_major; ?>*</kbd></li>
             </ul>
             
         </li>
@@ -111,7 +111,7 @@
 
     <p>These steps need to be perfomed from an administrator account, for which &ldquo;<kbd>sudo</kbd>&rdquo; will ask the
     password upon installation. This procedure will install a pristine MacPorts system and, if the optional steps are taken,
-    remove the as of now unnecessary MacPorts-<?php print $mp_version_major; ?> source directory and corresponding tarball.</p>
+    remove the as of now unnecessary MacPorts-<?php print $macports_version_major; ?> source directory and corresponding tarball.</p>
 
     <p>To customize your installation you should read the output of &ldquo;<kbd>./configure --help | more</kbd>&rdquo; and
     pass the appropriate options for the settings you wish to tweak to the configuration script in the steps detailed above.</p>
@@ -160,9 +160,10 @@
     <h3 class="subhdr" id="selfupdate">Selfupdate</h3>
 
     <p>If you already have MacPorts installed and have no restrictions to use the rsync networking protocol (tcp port 873 by
-    default), the easiest way to upgrade to our latest available release, <b><?php print $mp_version_latest; ?></b>, is by using
-    the <kbd>selfupdate</kbd> target of the <kbd>port(1)</kbd> command. This will both update your ports tree (by performing
-    a <kbd>sync</kbd> operation) and rebuild your current installation if it's outdated, preserving your customizations if any.</p>
+    default), the easiest way to upgrade to our latest available release, <b><?php print $macports_version_latest; ?></b>, is
+    by using the <kbd>selfupdate</kbd> target of the <kbd>port(1)</kbd> command. This will both update your ports tree (by
+    performing a <kbd>sync</kbd> operation) and rebuild your current installation if it's outdated, preserving your customizations
+    if any.</p>
     
 
     <h3 class="subhdr" id="other">Other Platforms</h3>

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


More information about the macports-changes mailing list