[28994] trunk/www

source_changes at macosforge.org source_changes at macosforge.org
Wed Sep 12 15:33:45 PDT 2007


Revision: 28994
          http://trac.macosforge.org/projects/macports/changeset/28994
Author:   jmpp at macports.org
Date:     2007-09-12 15:33:44 -0700 (Wed, 12 Sep 2007)

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

 * Rework the $mp_version* variables into $mp_version_major & $mp_version_latest, use them appropriately;
 * Abstract commonly used links in includes/common.inc and use them throughout all the files, but mainly in getmp.php;
 * Point the help section referenced in getmp.php to our trac portal;

NOTE: "Help" section and "SVN sources" in getmp.php still need to be rewritten.

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

Modified: trunk/www/getmp.php
===================================================================
--- trunk/www/getmp.php	2007-09-12 22:14:51 UTC (rev 28993)
+++ trunk/www/getmp.php	2007-09-12 22:33:44 UTC (rev 28994)
@@ -6,16 +6,16 @@
 ?>
 
 <div id="content">
+
     <h2 class="hdr">Get MacPorts</h2>
-    <p>MacPorts version <?php print "$mp_version_dmg"; ?> is available in binary form as a dmg disk image for <a
-    href="/macports/downloads/MacPorts-<?php print "$mp_version_dmg"; ?>-10.4.dmg">Tiger (Universal)</a> or <a
-    href="/macports/downloads/MacPorts-<?php print "$mp_version_dmg"; ?>-10.3.dmg">Panther</a>, both containing
-    a pkg installer, or version <?php print "$mp_version"; ?> in source form as either a <a href="/macports/downloads/MacPorts-<?php
-    print "$mp_version"; ?>.tar.bz2">tar.bz2</a> package or a <a href="/macports/downloads/MacPorts-<?php print
-    "$mp_version"; ?>.tar.gz">tar.gz</a> one. Checksums for all these are contained in the <a href="/macports/downloads/MacPorts-<?php
-    print "$mp_version_dmg"; ?>.chk.txt">checksums file</a>.</p>
 
-    <p>To get a files listing of all our available downloads checkout the <a href="/macports/downloads.php">
+    <p>MacPorts version <?php print "$mp_version_major"; ?> is available in binary form as a dmg disk image for <a
+    href="<?php print $tiger_dmg; ?>"> Tiger (Universal)</a> or <a href="<?php print $panther_dmg; ?>"> Panther</a>,
+    both containing a pkg installer, or in source form as either a <a href="<?php print $bz2_tarball ?>">tar.bz2</a>
+    package or a <a href="<?php print $gz_tarball; ?>">tar.gz</a> one. Checksums for all these are contained in the
+    <a href="<?php print $checksums; ?>">checksums file</a>.</p>
+
+    <p>To get a files listing of all our available downloads checkout the <a href="<?php print $downloads; ?>">
     downloads section</a> of the site.</p>
 
     <p>Please note that in order to install and run MacPorts on Mac OS X you must have Apple's Developer Tools
@@ -35,19 +35,16 @@
 
     <h3 class="subhdr">Mac OS X Package (.pkg) Installer</h3>
 
-    <p>The easiest way to install MacPorts on a Mac OS X system is by downloading the
-    <a href="/macports/downloads/MacPorts-<?php print "$mp_version_dmg"; ?>-10.4.dmg"> dmg for Tiger</a>or the
-    <a href="/macports/downloads/MacPorts-<?php print "$mp_version_dmg"; ?>-10.3.dmg"> one for Panther</a>and
-    running Installer.app on the pkg contained therein by double clicking on them, following the on-screen
-    instructions until completion. This procedure will place a fully functional and default MacPorts
-    installation on your host system, ready for usage. If needed, your shell configuration files will be
-    adapted by the installer to include the necessary settings to run MacPorts. You may need to open a new
-    shell for these changes to take effect.</p>
+    <p>The easiest way to install MacPorts on a Mac OS X system is by downloading the <a href="<?php print $tiger_dmg;
+    ?>">dmg for Tiger</a> or the <a href="<?php print $panther_dmg; ?>"> one for Panther</a> and running Installer.app
+    on the pkg contained therein by double clicking on them, following the on-screen instructions until completion. This
+    procedure will place a fully functional and default MacPorts installation on your host system, ready for usage. If
+    needed, your shell configuration files will be adapted by the installer to include the necessary settings to run
+    MacPorts. You may need to open a new shell for these changes to take effect.</p>
 
-    <p>Although not strictly necessary, it is still recommended that you synchronize your recent installation
-    with our rsync server to ensure you have the latest release available of the MacPorts infrastructure and
-    of the &ldquo;Portfiles&rdquo; containing the instructions employed in the building and installation of
-    ports. To accomplish this simply execute:</p>
+    <p>Although not strictly necessary, it is still recommended that you synchronize your recent installation with our
+    rsync server to ensure you have the latest release available of the MacPorts infrastructure and of the &ldquo;Portfiles&rdquo;
+    containing the instructions employed in the building and installation of ports. To accomplish this simply execute:</p>
 
     <pre>sudo port -d selfupdate</pre>
 
@@ -59,26 +56,25 @@
     <p>If on the other hand you decide to install from source, there are still a couple of things you will need to
     do once you've downloaded the tarball before you can install a port with the MacPorts system, namely compiling
     and installing MacPorts itself. &ldquo;<kbd>cd</kbd>&rdquo; into the directory where you downloaded the package
-    and run &ldquo;<kbd>tar xjvf <a href="/macports/downloads/MacPorts-<?php print "$mp_version"; ?>.tar.bz2">MacPorts-<?php
-    print "$mp_version"; ?>.tar.bz2</a></kbd>&rdquo; or &ldquo;<kbd>tar xzvf <a href="/macports/downloads/MacPorts-<?php
-    print "$mp_version"; ?>.tar.gz">MacPorts-<?php print "$mp_version"; ?>.tar.gz</a></kbd>&rdquo;, depending on
-    whether you downloaded the bz2 tarball or the gz one, respectively. This will unpack the MacPorts sources that
-    you will proceed to build and install. To do so, execute the following:</p>
+    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;, depending on whether you downloaded the bz2 tarball or the gz one, respectively.
+    This will unpack the MacPorts sources that you will proceed to build and install. To do so, execute the following:</p>
 
-<pre>cd MacPorts-<?php print "$mp_version"; ?>
+<pre>cd MacPorts-<?php print $mp_version_major; ?>
 
 ./configure &amp;&amp; make &amp;&amp; sudo make install</pre>
 
     <p>Optionally:</p>
 
 <pre>cd ../
-rm -rf MacPorts-<?php print "$mp_version"; ?>*</pre>
+rm -rf MacPorts-<?php print $mp_version_major; ?>*</pre>
 
     <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"; ?> source
-    directory and corresponding tarball. 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
+    optional steps are taken, remove the as of now unnecessary MacPorts-<?php print "$mp_version_major"; ?> source
+    directory and corresponding tarball. 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>
 	
     <p>You will need to adapt your shell's configuration files to find the binaries installed by MacPorts.
@@ -91,7 +87,7 @@
 
     <h3 class="subhdr">Help</h3>
 
-    <p><a href="/macports/help.php">Help</a> is also available should you need it.</p>
+    <p>Help is also available through our <a href="<?php print $trac_url; ?>">Trac portal</a> should you need it.</p>
 
     <h3 class="subhdr">SVN Sources</h3>
 
@@ -100,7 +96,7 @@
 
     <p>Use the following command to check the project out of the MacPorts anonymous subversion repository:</p>
 
-<pre>svn co http://svn.macports.org/repository/macports/trunk</pre>
+<pre>svn co <?php print $svn_url . '/trunk'; ?></pre>
 
     <p>If you do not want to bother with fetching from SVN, you can download a nightly updated
     <a href="/macports/downloads/macports-nightly-svn-snapshot.tar.gz"> SVN-snapshot</a>. Once extracted,

Modified: trunk/www/includes/common.inc
===================================================================
--- trunk/www/includes/common.inc	2007-09-12 22:14:51 UTC (rev 28993)
+++ trunk/www/includes/common.inc	2007-09-12 22:33:44 UTC (rev 28994)
@@ -16,12 +16,26 @@
 
 ######################################################################
 
-# print the current MacPorts version
-$mp_version = "1.5.2";
-$mp_version_major = "1.5.0";
+# print the current MacPorts version:
+$mp_version_major = '1.5.0';
+$mp_version_latest = '1.5.2';
 
+
 ######################################################################
 
+# 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;
+$tiger_dmg = $downloads . '/MacPorts-' . $mp_version_major .'-10.4.dmg';
+$panther_dmg = $downloads . '/MacPorts-' . $mp_version_major .'-10.3.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';
+
+
+######################################################################
+
 # print the page header
 function print_header($title, $encoding) {
     global $MPWEB;

Modified: trunk/www/includes/header.inc
===================================================================
--- trunk/www/includes/header.inc	2007-09-12 22:14:51 UTC (rev 28993)
+++ trunk/www/includes/header.inc	2007-09-12 22:33:44 UTC (rev 28994)
@@ -1,6 +1,6 @@
 <?php
 /* $Id$ */
-global $mp_version_major;
+global $mp_version_major, $trac_url;
 ?>
 
 <h1>
@@ -28,7 +28,7 @@
                     'Get MacPorts' => 'getmp.php',
                     'Available Ports' => 'ports.php',
                     'Documentation' => 'http://geeklair.net/new_macports_guide',
-                    'Support &amp; Development' => 'http://trac.macports.org/',
+                    'Support &amp; Development' => "$trac_url"
                 );
 
                 foreach ($pages as $title => $url) {

Modified: trunk/www/index.php
===================================================================
--- trunk/www/index.php	2007-09-12 22:14:51 UTC (rev 28993)
+++ trunk/www/index.php	2007-09-12 22:33:44 UTC (rev 28994)
@@ -47,7 +47,7 @@
         duties &amp; benefits from holding a MacPorts account.
       </p>
       <p>
-        <b>Current MacPorts <a href="/macports/getmp.php">release</a>: <?php print "$mp_version"; ?></b>
+        <b>Current MacPorts <a href="/macports/getmp.php">release</a>: <?php print "$mp_version_latest"; ?></b>
       </p>
       <div id="news">
         <h2 class="hdr">Project News</h2>

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


More information about the macports-changes mailing list