[28303] trunk/www

source_changes at macosforge.org source_changes at macosforge.org
Mon Aug 27 18:00:47 PDT 2007


Revision: 28303
          http://trac.macosforge.org/projects/macports/changeset/28303
Author:   jmpp at macports.org
Date:     2007-08-27 18:00:46 -0700 (Mon, 27 Aug 2007)

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

Major but minor commit to the www svn space: reorder the sources a bit to have a cleaner
layout while bringing the content up to speed with current practices and reality, otherwise
sticking to the same website we had back in OpenDarwin days.

The one big thing about this commit, though, is that the old ports.php page is again operational,
as shown in my local server: http://apollo.homeunix.net/macports/ports.php. Woot!

Further discussion of what to do with these sources is needed, however, so I'm not gonna push to
host them anywhere for the time being until we have a clearer map of how we should move forward
wrt our web presence.

Modified Paths:
--------------
    trunk/www/admin/index.php
    trunk/www/archives.php
    trunk/www/emit_portfile.php
    trunk/www/includes/common.inc
    trunk/www/includes/email.inc
    trunk/www/includes/footer.inc
    trunk/www/includes/header.inc
    trunk/www/includes/lang.inc
    trunk/www/index.php
    trunk/www/ports.php

Added Paths:
-----------
    trunk/www/admin/add.php
    trunk/www/admin/edit.php
    trunk/www/admin/list.php
    trunk/www/admin/rss.php
    trunk/www/downloads.php
    trunk/www/getmp.php
    trunk/www/help.php
    trunk/www/includes/news.inc
    trunk/www/localized/
    trunk/www/localized/es/
    trunk/www/localized/fr/
    trunk/www/localized/it/
    trunk/www/localized/ru/
    trunk/www/mp.css

Removed Paths:
-------------
    trunk/www/admin/headlines/
    trunk/www/downloads/
    trunk/www/dp.css
    trunk/www/es/
    trunk/www/fr/
    trunk/www/getdp/
    trunk/www/help/
    trunk/www/includes/functions.inc
    trunk/www/it/
    trunk/www/ru/

Copied: trunk/www/admin/add.php (from rev 28240, trunk/www/admin/headlines/add.php)
===================================================================
--- trunk/www/admin/add.php	                        (rev 0)
+++ trunk/www/admin/add.php	2007-08-28 01:00:46 UTC (rev 28303)
@@ -0,0 +1,20 @@
+  <?php
+    $DOCUMENT_ROOT = $_SERVER['DOCUMENT_ROOT'];
+    include_once("$DOCUMENT_ROOT/macports/includes/common.inc");
+    include_once("$DOCUMENT_ROOT/macports/includes/news.inc");
+    print_header('MacPorts | Add news', 'utf-8');
+  ?>
+
+    <div id="content">
+      <h2 class="hdr">Add news</h2>
+
+      <?php
+	print_add_headline();
+      ?>
+
+      </div>
+    </div>
+
+<?php
+  print_footer();
+?>

Copied: trunk/www/admin/edit.php (from rev 28240, trunk/www/admin/headlines/edit.php)
===================================================================
--- trunk/www/admin/edit.php	                        (rev 0)
+++ trunk/www/admin/edit.php	2007-08-28 01:00:46 UTC (rev 28303)
@@ -0,0 +1,20 @@
+  <?php
+    $DOCUMENT_ROOT = $_SERVER['DOCUMENT_ROOT'];
+    include_once("$DOCUMENT_ROOT/macports/includes/common.inc");
+    include_once("$DOCUMENT_ROOT/macports/includes/news.inc");
+    print_header('MacPorts | Edit news', 'utf-8');
+  ?>
+
+    <div id="content">
+      <h2 class="hdr">Edit news</h2>
+
+      <?php
+	print_edit_headline($_GET['id']);
+      ?>
+
+      </div>
+    </div>
+
+<?php
+  print_footer();
+?>

Modified: trunk/www/admin/index.php
===================================================================
--- trunk/www/admin/index.php	2007-08-28 00:46:39 UTC (rev 28302)
+++ trunk/www/admin/index.php	2007-08-28 01:00:46 UTC (rev 28303)
@@ -1,8 +1,7 @@
   <?php
     $DOCUMENT_ROOT = $_SERVER['DOCUMENT_ROOT'];
-    include_once("$DOCUMENT_ROOT/includes/common.inc");
-    include_once("$DOCUMENT_ROOT/includes/functions.inc");
-    print_header('DarwinPorts Site Administration', 'iso-8859-1');
+    include_once("$DOCUMENT_ROOT/macports/includes/common.inc");
+    print_header('MacPorts Site Administration', 'utf-8');
   ?>
 
     <div id="content">
@@ -12,13 +11,13 @@
 	the site:</p>
 
       <ul>
-	<li><a href="/admin/headlines/add.php">Add headline</a></li>
-	<li><a href="/admin/headlines/list.php">List all headlines</a></li>
-	<li><a href="/admin/headlines/rss.php">Regenerate RSS feed</a></li>
+	<li><a href="/macports/admin/add.php">Add headline</a></li>
+	<li><a href="/macports/admin/list.php">List all headlines</a></li>
+	<li><a href="/macports/admin/rss.php">Regenerate RSS feed</a></li>
       </ul>
 
       <p>If you need to edit an already-posted headline, find it in the <a
-	href="/admin/headlines/list.php">list</a>, and choose edit.</p>
+	href="/macports/admin/list.php">list</a>, and choose edit.</p>
     </div>
   </div>
 

Copied: trunk/www/admin/list.php (from rev 28240, trunk/www/admin/headlines/list.php)
===================================================================
--- trunk/www/admin/list.php	                        (rev 0)
+++ trunk/www/admin/list.php	2007-08-28 01:00:46 UTC (rev 28303)
@@ -0,0 +1,20 @@
+  <?php
+    $DOCUMENT_ROOT = $_SERVER['DOCUMENT_ROOT'];
+    include_once("$DOCUMENT_ROOT/macports/includes/common.inc");
+    include_once("$DOCUMENT_ROOT/macports/includes/news.inc");
+    print_header('MacPorts | List all news', 'utf-8');
+  ?>
+
+    <div id="content">
+      <h2 class="hdr">List all news</h2>
+
+      <?php
+	print_all_headlines();
+      ?>
+
+      </div>
+    </div>
+
+<?php
+  print_footer();
+?>

Copied: trunk/www/admin/rss.php (from rev 28240, trunk/www/admin/headlines/rss.php)
===================================================================
--- trunk/www/admin/rss.php	                        (rev 0)
+++ trunk/www/admin/rss.php	2007-08-28 01:00:46 UTC (rev 28303)
@@ -0,0 +1,5 @@
+<?php
+  $DOCUMENT_ROOT = $_SERVER['DOCUMENT_ROOT'];
+  include_once("$DOCUMENT_ROOT/macports/includes/news.inc");
+  create_rss();
+?>

Modified: trunk/www/archives.php
===================================================================
--- trunk/www/archives.php	2007-08-28 00:46:39 UTC (rev 28302)
+++ trunk/www/archives.php	2007-08-28 01:00:46 UTC (rev 28303)
@@ -1,8 +1,8 @@
   <?php
     $DOCUMENT_ROOT = $_SERVER['DOCUMENT_ROOT'];
-    include_once("$DOCUMENT_ROOT/includes/common.inc");
-    include_once("$DOCUMENT_ROOT/includes/functions.inc");
-    print_header('DarwinPorts Home', 'iso-8859-1');
+    include_once("$DOCUMENT_ROOT/macports/includes/common.inc");
+    include_once("$DOCUMENT_ROOT/macports/includes/news.inc");
+    print_header('MacPorts Home', 'utf-8');
   ?>
 
     <div id="content">

Copied: trunk/www/downloads.php (from rev 28240, trunk/www/downloads/index.php)
===================================================================
--- trunk/www/downloads.php	                        (rev 0)
+++ trunk/www/downloads.php	2007-08-28 01:00:46 UTC (rev 28303)
@@ -0,0 +1,45 @@
+  <?php
+    $DOCUMENT_ROOT = $_SERVER['DOCUMENT_ROOT'];
+    include_once("$DOCUMENT_ROOT/macports/includes/common.inc");
+    print_header('MacPorts Downloads', 'utf-8');
+  ?>
+
+    <div id="content">
+	
+		<h2 class="hdr">Available Downloads</h2>
+		<table>
+<?php
+$dir=".";
+
+// Read files from the dirctory
+$files = array();
+$rep=opendir($dir);
+while ($file = readdir($rep)) {
+	if (   preg_match('/^(\..*)|(.*\.php)|(.*\.css)|(.*\.html)$/', $file)
+		|| is_dir($file)
+	   ) {
+		continue;
+	}
+	
+	// Add file to array, as key, with modtime as value
+	$files[$file] = filemtime($file);
+}
+closedir($rep);
+
+// Sort the array in reverse order by value (modtime)
+arsort($files);
+
+// Emit the files, with dates
+foreach ($files as $f => $t) {
+	echo "<tr>";
+	echo "<td>".date("d-M-Y G:i", $t)."</td><td><a href=\"/macports/downloads/$f\">$f</a></td>\n";
+	echo "</tr>";
+}
+?>
+		</table>
+    </div>
+  </div>
+
+<?php
+  print_footer();
+?>

Deleted: trunk/www/dp.css
===================================================================
--- trunk/www/dp.css	2007-08-28 00:46:39 UTC (rev 28302)
+++ trunk/www/dp.css	2007-08-28 01:00:46 UTC (rev 28303)
@@ -1,234 +0,0 @@
-/*
-  $Id$
-*/
-
-* {
-	font-family: Georgia, "New Century Schoolbook", "Times New Roman", Times, serif;
-}
-
-body {
-	background: #e3f1c7;
-	width: 720px;
-	margin: 15px auto 15px auto;
-	font-size: 12px;
-}
-
-a:link {
-	color: #669;
-	text-decoration: none;
-	font-weight: bold;
-	border-bottom: 1px dotted #c63;
-}
-
-a:visited {
-	color: #888;
-	text-decoration: none;
-	font-weight: bold;
-	border-bottom: 1px dotted #669;
-}
-
-a:hover {
-	color: #c63;
-	text-decoration: none;
-	font-weight: bold;
-	border-bottom: 1px dotted #369;
-}
-
-img, a img {
-	border: none;
-	text-decoration: none;
-}
-
-h1 {
-	font-size: 22px;
-}
-
-h2 {
-	font-size: 20px;
-}
-
-h3 {
-	font-size: 18px;
-}
-
-h4 {
-	font-size: 16px;
-}
-
-h5 {
-	font-size: 14px;
-}
-
-h6 {
-	font-size: 13px;
-}
-
-br {
-	clear: both;
-}
-
-p {
-	margin: 10px 0 1em 0;
-	line-height: 16px;
-}
-
-input, textarea {
-	font-family: Courier, "Courier New", monospace;
-}
-
-kbd {
-	color: #c63;
-	font-family: Courier, "Courier New", monospace;
-}
-
-pre {
-	color: #369;
-	font-family: Sans, "Sans serif";
-	font-size: 14px;
-	margin-left: 20px;
-}
-
-#nav {
-	height: 76px;
-	padding: 0;
-	font-size: 10px;
-}
-
-#logo {
-	background: #fff;
-	float: left;
-	display: inline;
-	width: 400px;
-	height: 75px;
-	border-top: 1px solid #bbb;
-	border-bottom: 1px solid #bbb;
-}
-
-#logo a {
-	border: none;
-}
-
-#nav #l {
-	width: 150px;
-	height: 75px;
-	float: left;
-	border: 1px solid #bbb;
-}
-
-#nav #r {
-	width: 150px;
-	height: 75px;
-	float: left;
-	border-top: 1px solid #bbb;
-	border-bottom: 1px solid #bbb;
-}
-
-#nav ul {
-	list-style-type: none;
-	margin: 0;
-	padding: 0;
-	text-align: center;
-}
-
-#nav li a {
-	background: #fff;
-	display: block;
-	text-decoration: none;
-	line-height: 20px;
-	padding: 2px;
-	border-bottom: 1px solid #bbb;
-}
-
-#nav li a:visited {
-	color: #999;
-	text-decoration: none;
-}
-
-#nav li a:hover {
-	background: #d8e6e7;
-	color: #888;
-}
-
-#nav li.last a {
-	border: none;
-	display: block;
-	line-height: 21px;
-}
-
-#nav li.selected a {
-	background: #f3f3f3;
-	color: #c63;
-}
-
-#nav li.sellast a {
-	background: #f3f3f3;
-	color: #c63;
-	border: none;
-	display: block;
-	line-height: 21px;
-}
-
-#main {
-	background: #fff;
-	width: 702px;
-	border-right: 1px solid #bbb;
-	border-left: 1px solid #bbb;
-	padding-bottom: 100px;
-}
-
-#content {
-	width: 80%; 
-	margin: 10px 0 0 0;
-	padding: 5px 20px;
-}
-
-#news {
-	margin: 10px 0 0 0;
-	padding: 5px 0 0 0;
-}
-
-#footer {
-	width: 692px;
-	background: #fff;
-	border: 1px solid #bbb;
-	font-size: 10px;
-	padding: 5px;
-	text-align: right;
-}
-
-.languages {
-	float: left;
-}
-
-.hdr {
-	color: #669;
-	margin: 0;
-	padding: 10px 0 0 0;
-	border-bottom: 1px solid #bbb;
-}
-
-.subhdr {
-	color: #879880;
-	margin: 5px 0 0 0;
-	padding: 0;
-}
-
-.date {
-	color: #999;
-	margin: 0 auto;
-	padding: 0;
-}
-
-.referer_box {
-	margin: auto;
-	margin-bottom: 1em;
-	width: 90%;
-	border: 1px solid #CC6633;
-	background-color: #D37F54;
-	color: black;
-	padding: 1em;
-}
-.referer_box a {
-	color: white;
-}
-

Modified: trunk/www/emit_portfile.php
===================================================================
--- trunk/www/emit_portfile.php	2007-08-28 00:46:39 UTC (rev 28302)
+++ trunk/www/emit_portfile.php	2007-08-28 01:00:46 UTC (rev 28303)
@@ -1,7 +1,7 @@
 <?php
 
 $DOCUMENT_ROOT = $_SERVER['DOCUMENT_ROOT'];
-include_once("$DOCUMENT_ROOT/includes/email.inc");
+include_once("$DOCUMENT_ROOT/macports/includes/email.inc");
 
 $portname = basename(dirname($_SERVER['PATH_INFO']));
 ?>

Copied: trunk/www/getmp.php (from rev 28240, trunk/www/getdp/index.php)
===================================================================
--- trunk/www/getmp.php	                        (rev 0)
+++ trunk/www/getmp.php	2007-08-28 01:00:46 UTC (rev 28303)
@@ -0,0 +1,123 @@
+  <?php
+    $DOCUMENT_ROOT = $_SERVER['DOCUMENT_ROOT'];
+    include_once("$DOCUMENT_ROOT/macports/includes/common.inc");
+    print_header('Get MacPorts', 'utf-8');
+  ?>
+
+    <div id="content">
+      <h2 class="hdr">Get MacPorts</h2>
+
+	 <p>MacPorts version <? print "$mp_version_dmg"; ?> is available in binary form as a
+	 dmg disk image for <a href="/macports/downloads/MacPorts-<? print "$mp_version_dmg"; ?>-10.4.dmg">
+         Tiger (Universal)</a> or <a href="/macports/downloads/MacPorts-<? print "$mp_version_dmg"; ?>-10.3.dmg">
+         Panther</a>, both containing a pkg installer, or version <? print "$mp_version"; ?>
+         in source form as either a <a href="/macports/downloads/MacPorts-<? print "$mp_version"; ?>.tar.bz2">tar.bz2</a>
+         package or a <a href="/macports/downloads/MacPorts-<? print "$mp_version"; ?>.tar.gz">tar.gz</a> one.
+	 Checksums for all these are contained in the <a href="/macports/downloads/MacPorts-<? 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">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 package installed, found at the <a href="http://developer.apple.com/tools/xcode/">Apple Developer site</a>
+	or on your Mac OS X installation CDs/DVD.</p>
+
+	  <p>If you want to use MacPorts on a platform other than Mac OS X, please be
+	  aware of the following requirements (we assume that you have basics such as
+	  gcc):</p>
+	  <ul>
+	  	<li>TCL (8.3 or 8.4)</li>
+		<li>curl</li>
+		<li>OpenSSL or libmd</li>
+	  </ul>
+
+	<h5 class="subhdr">Mac OS X Package (.pkg) Installer</h5>
+
+	<p>The easiest way to install MacPorts on a Mac OS X system is by downloading
+	the <a href="/macports/downloads/MacPorts-<? print "$mp_version_dmg"; ?>-10.4.dmg">dmg for Tiger</a>
+	or the <a href="/macports/downloads/MacPorts-<? 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>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>
+
+	<p>It is also recommended to run the above command on a regular basis to keep your
+	installation always current. At this point you should be ready to enjoy	MacPorts!</p>
+
+	<h5 class="subhdr">Source Installation</h5>
+
+	<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="/macpports/downloads/MacPorts-<? print "$mp_version"; ?>.tar.bz2">
+        MacPorts-<? print "$mp_version"; ?>.tar.bz2</a></kbd>&rdquo; or &ldquo;<kbd>tar xzvf
+        <a href="/macports/downloads/MacPorts-<? print "$mp_version"; ?>.tar.gz">MacPorts-<? 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>
+
+      <pre>cd MacPorts-<? print "$mp_version"; ?>
+
+./configure &amp;&amp; make &amp;&amp; sudo make install</pre>
+
+	<p>Optionally:</p>
+
+<pre>cd ../
+rm -rf MacPorts-<? print "$mp_version"; ?>*</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-<? 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 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. Lastly, you need to synchronize your recent installation with the MacPorts rsync server:</p>
+
+	<pre>sudo port -d selfupdate</pre>
+
+	<p>Upon completion MacPorts will be ready to install ports. Again, it is recommended to run
+	the above command on a regular basis to keep your installation current.</p>
+
+
+	<h5 class="subhdr">Help</h5>
+
+      <p><a href="/macports/help.php">Help</a> is also available should you need it.</p>
+
+	<h5 class="subhdr">SVN Sources</h5>
+
+     <p>If you are developer or a user with a taste for the bleeding edge and wish for the latest changes
+     and feature additions, you may acquire the MacPorts sources through SVN.</p>
+
+      <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>
+
+	<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, you can keep it up to date with the usual
+	&ldquo;<kbd>svn update</kbd>&rdquo; commands.</p>
+
+      <p>If you'd simply like to view the SVN repository without checking it
+	out, you can do so via the <a href="http://trac.macports.org/projects/macports/browser">
+        Trac browser</a>.</p>
+
+    </div>
+  </div>
+
+<?php
+  print_footer();
+?>

Copied: trunk/www/help.php (from rev 28240, trunk/www/help/index.php)
===================================================================
--- trunk/www/help.php	                        (rev 0)
+++ trunk/www/help.php	2007-08-28 01:00:46 UTC (rev 28303)
@@ -0,0 +1,59 @@
+  <?php
+    $DOCUMENT_ROOT = $_SERVER['DOCUMENT_ROOT'];
+    include_once("$DOCUMENT_ROOT/macports/includes/common.inc");
+    print_header('Get Help', 'utf-8');
+  ?>
+
+	<div id="content">
+		<h2 class="hdr">Get Help</h2>
+
+		<p>If you get stuck while using MacPorts and have a problem you 
+	        can't figure out, we have a lot of resources to help you.</p>
+	  
+		<h5 class="subhdr">Documentation</h5>
+
+		<p>The <a href="http://geeklair.net/new_macports_guide/">MacPorts Guide</a> has a section dedicated to MacPorts
+                installation issues, <a href="http://geeklair.net/new_macports_guide/#installing">Chapter 2. Installing MacPorts</a>
+                and another one for general usage, <a href="http://geeklair.net/new_macports_guide/#using">Chapter 3: Using MacPorts</a>.</p>
+
+		<p>The <a href="http://trac.macports.org/projects/macports/wiki/FAQ">MacPorts FAQ</a>
+		is now an ongoing, user driven effort part of our <a href="http://trac.macports.org/projects/macports/wiki">Wiki</a>,
+		where anyone with a <a href="http://www.macports.org/wp-register.php">Trac account</a>
+		and MacPorts knowledge can contribute with information to help others.</p>
+
+		<p>All of our documentation is a work in progress, so if you spot an error or have a quesiton about some part of the document, 
+                let us know!  This will help us </p>
+	
+		<h5 class="subhdr">Mailing Lists</h5>
+
+		<p>The <a href="http://lists.macosforge.org/mailman/listinfo/macports-users">General MacPorts mailing list</a> is open to all
+                for supscription. It is the best place for existing and new users alike to ask questions about MacPorts and MacPorts
+                installed software. Please note that due to spam problems the mailing list will reject posts from non-subscribers.</p>
+
+                <p>It is recommended to check the <a href="http://lists.macosforge.org/pipermail/macports-users/">list archive</a> before posting
+                a question, as some issues are aired fairly regularly and dealt with many times in a row. We try to be as helpful as possible,
+                but if it's a common question our answers may be fairly short.</p>
+
+		<p>When posting a question to the mailing list, please included	any information you think might be relevent to the problem, 
+		such as  operating system and version you're using, Mac OS X 10.4.10 for example, whether you have any other third party 
+		software installed, in <kbd>/usr/local</kbd> for instance, and any error messages that MacPorts might give you (use the
+                <kbd>-v</kbd> or <kbd>-d port(1)</kbd>'s flags to turn on verbose or debugging information, it's a lot easier for us to
+                help you once these are used).</p>
+
+                <p>If you are a developer and need help with any part of the MacPorts internals, the <a href="http://lists.macosforge.org/mailman/listinfo/macports-dev">
+                development list</a> is where you should direct your posts to, as this is where all discussion about MacPorts itself takes place.
+                <a href="http://lists.macosforge.org/pipermail/macports-dev/">Archives</a> for this mailing list are also available.</p>
+
+		<h5 class="subhdr">IRC</h5>
+
+		<p>For more real-time discussion, the #MacPorts channel on the <a href="http://freenode.net/">Freenode IRC network</a> is generally
+		where we hang out. Though it is generally helpful, please keep in mind that no one is obligated to help or even answer your question
+                if you join IRC. Do not take it personally, simply ask your question on the <a href="http://lists.macosforge.org/mailman/listinfo/macports-users">
+                users</a> or <a href="http://lists.macosforge.org/mailman/listinfo/macports-dev">development</a> mailing lists instead.</p>
+
+	</div>
+</div>
+
+<?php
+  print_footer();
+?>

Modified: trunk/www/includes/common.inc
===================================================================
--- trunk/www/includes/common.inc	2007-08-28 00:46:39 UTC (rev 28302)
+++ trunk/www/includes/common.inc	2007-08-28 01:00:46 UTC (rev 28303)
@@ -5,9 +5,9 @@
 
 ######################################################################
 
-# print the current darwinports version
-$dp_version = "1.3.2";
-$dp_version_dmg = "1.3.1";
+# print the current MacPorts version
+$mp_version = "1.5.2";
+$mp_version_dmg = "1.5.0";
 
 ######################################################################
 
@@ -21,11 +21,13 @@
   <head>
     <title><?php echo("$title"); ?></title>
     <meta http-equiv="Content-type" content="text/html; charset=<?php echo("$encoding"); ?>" />
-    <meta name="author" content="Jim Mock (mij at opendarwin.org)" />
+    <meta name="author" content="Jim Mock (mij at macports.org)" />
     <meta name="copyright" content="2003, OpenDarwin" />
+    <meta name="author" content="Juan Manuel Palacios (jmpp at macports.org)" />
+    <meta name="copyright" content="2007, MacPorts Team" />
     <meta name="robots" content="all" />
-    <link rel="stylesheet" type="text/css" href="/dp.css" />
-    <link rel="alternate" type="application/rss+xml" href="http://www.darwinports.org/dp_news.xml" />
+    <link rel="stylesheet" type="text/css" href="/macports/mp.css" />
+    <link rel="alternate" type="application/rss+xml" href="/macports/mp_news.xml" />
   </head>
 
   <body>
@@ -35,7 +37,7 @@
   <div id="main">
 
 <?php
-  include("$DOCUMENT_ROOT/includes/header.inc");
+  include("$DOCUMENT_ROOT/macports/includes/header.inc");
 }
 
 ###################################################################### 
@@ -44,25 +46,45 @@
 function print_footer() {
   global $DOCUMENT_ROOT;
 
-  include("$DOCUMENT_ROOT/includes/footer.inc");
+  include("$DOCUMENT_ROOT/macports/includes/footer.inc");
 
   echo "  </body>\n";
   echo "</html>\n";
 }
 
+######################################################################
+
+# Print a total count of currently available ports:
+function ports_count() {
+         $result = mysql_query("SELECT count(*) FROM macports.portfiles");
+         if ($result) {
+           $row = mysql_fetch_array($result);
+           $count = $row[0];
+         } else {
+           $count = 0;
+         }
+         return $count;
+}
+
 ###################################################################### 
+
+# Warn against darwinports.com leach!
 function check_referer() {
 	global $_SERVER;
 	if (preg_match("/darwinports.com/", $_SERVER['HTTP_REFERER'])) {
 ?>
 	<div class="referer_box">
-		<h1>The Official DarwinPorts Web Site</h1>
+		<h1>The Official MacPorts Web Site, home of the project previously known as DarwinPorts</h1>
 		
-		<p>You have arrived at the <b>Official DarwinPorts Web Site</b> from <i>darwinports.com</i>.</p>
+		<p>You have arrived at the <b>Official MacPorts Web Site</b> from <i>darwinports.com</i>.</p>
 	  
-		<p><i>darwinports.com</i> <b>is not the official DarwinPorts Web Site</b>, nor is it a mirror of the <i>Official DarwinPorts Web Site</i>.  There is <b>no relationship</b> between the <i>DarwinPorts Project</i> and <i>darwinports.com</i>.</p>
+		<p><i>darwinports.com</i> <b>is not the official MacPorts Web Site</b>, nor is it a mirror of
+                the <i>Official MacPorts Web Site</i>.  There is <b>no relationship</b> between the <i>MacPorts
+                Project</i> and <i>darwinports.com</i>.</p>
 
-		<p>The information you may have been presented with on <i>darwinports.com</i> may be incorrect or outdated and is not maintained by the <i>DarwinPorts Project</i>.  For the most accurate information about DarwinPorts, please bookmark this site, <a href="http://www.darwinports.org">http://www.darwinports.org</a>.</p>
+		<p>The information you may have been presented with on <i>darwinports.com</i> may be incorrect
+                or outdated and is not endorsed in any way by the <i>MacPorts Project</i>. For the most accurate
+                information about MacPorts, please bookmark this site, <a href="http://www.macports.org">http://www.macports.org</a>.</p>
 	</div>
 
 <?php

Modified: trunk/www/includes/email.inc
===================================================================
--- trunk/www/includes/email.inc	2007-08-28 00:46:39 UTC (rev 28302)
+++ trunk/www/includes/email.inc	2007-08-28 01:00:46 UTC (rev 28303)
@@ -5,7 +5,7 @@
 
 function obfuscate_email($email)
 {
-	return "<span class='email'>".str_replace('@', "<img src='/img/at.gif' alt='at' style='width: 1em; height: 1em;' border='0' />", $email)."</span>";
+	return "<span class='email'>".str_replace('@', "<img src='/macports/img/at.gif' alt='at' style='width: 1em; height: 1em;' border='0' />", $email)."</span>";
 }
 
-?>
\ No newline at end of file
+?>

Modified: trunk/www/includes/footer.inc
===================================================================
--- trunk/www/includes/footer.inc	2007-08-28 00:46:39 UTC (rev 28302)
+++ trunk/www/includes/footer.inc	2007-08-28 01:00:46 UTC (rev 28303)
@@ -1,4 +1,6 @@
-      <div id="footer">
-		<span class="languages">English, <a href="/fr/">Fran&ccedil;ais</a>, <a href="/es/">Espa&ntilde;ol</a>, <a href="/ru/">Russian</a>, <a href="/it/">Italiano</a></span>
-      	Copyright &copy; 2002-<? print date("Y"); ?>, <a href="http://www.darwinports.org/">DarwinPorts</a>.  All rights reserved. | <a href="http://www.darwinports.org/dp_news.xml">RSS feed</a>
-      </div>
+    <div id="footer">
+        <span class="languages">English, <a href="/macports/fr/">Fran&ccedil;ais</a>, <a href="/macports/es/">Espa&ntilde;ol</a>,
+            <a href="/macports/ru/">Russian</a>, <a href="/macports/it/">Italiano</a></span>
+        Copyright &copy; 2002-<? print date("Y"); ?>, <a href="http://www.macports.org/">MacPorts</a>. All rights reserved. | 
+            <a href="/macports/mp_news.xml">RSS feed</a>
+    </div>

Deleted: trunk/www/includes/functions.inc
===================================================================
--- trunk/www/includes/functions.inc	2007-08-28 00:46:39 UTC (rev 28302)
+++ trunk/www/includes/functions.inc	2007-08-28 01:00:46 UTC (rev 28303)
@@ -1,282 +0,0 @@
-<?php
-
-# $Id$
-# Copyright (c) 2003, OpenDarwin
-
-######################################################################
-
-# variables and includes
-$DOCUMENT_ROOT = $_SERVER['DOCUMENT_ROOT'];
-$PHP_SELF = $_SERVER['PHP_SELF'];
-include_once("$DOCUMENT_ROOT/includes/db.inc");
-$connect = mysql_pconnect($host, $user, $pass) or die("Can't connect to db!");
-mysql_select_db($db);
-
-
-
-######################################################################
-
-# create an RSS feed of the project news
-function create_rss() {
-  global $DOCUMENT_ROOT, $connect;
-
-  $query = "SELECT id, title, news FROM headlines ORDER BY id DESC LIMIT 10";
-  $result = mysql_query($query) or die("Error: $query.");
-  if(!$result) {
-    die("Error: $result.");
-  }
-
-  $open = fopen("$DOCUMENT_ROOT/dp_news.xml", "w+");
-  $rssdate = substr_replace(date("Y-m-d\TH:i:sO", time()),':', -2, 0);
-
-  $rss = "<?xml version=\"1.0\" encoding=\"iso-8859-1\"?>\n";
-  $rss .= "<rss version=\"2.0\"\n";
-  $rss .= "  xmlns:dc=\"http://purl.org/dc/elements/1.1/\"\n";
-  $rss .= "  xmlns:sy=\"http://purl.org/rss/1.0/modules/syndication/\"\n";
-  $rss .= "  xmlns:admin=\"http://webns.net/mvcb/\"\n";
-  $rss .= "  xmlns:rdf=\"http://www.w3.org/1999/02/22-rdf-syntax-ns#\"\n";
-  $rss .= "  xmlns:content=\"http://purl.org/rss/1.0/modules/content/\">\n\n";
-
-  $rss .= "  <channel>\n";
-  $rss .= "    <title>DarwinPorts Project News</title>\n";
-  $rss .= "    <link>http://www.darwinports.org/</link>\n";
-  $rss .= "    <description>DarwinPorts Project News</description>\n";
-  $rss .= "    <dc:language>en-us</dc:language>\n";
-  $rss .= "    <dc:creator>Jim Mock (mij at opendarwin.org)</dc:creator>\n";
-  $rss .= "    <dc:rights>Copyright 2002-2003</dc:rights>\n";
-  $rss .= "    <dc:date>$rssdate</dc:date>\n";
-  $rss .= "    <admin:errorReportsTo rdf:resource=\"mailto:mij at opendarwin.org\" />\n";
-
-  if(mysql_num_rows($result) > 0) {
-    while($row = mysql_fetch_object($result)) {
-      $rss .= "    <item>\n";
-      $rss .= "      <title>$row->title</title>\n";
-      $rss .= "      <link>http://www.darwinports.org/archives.php?id=$row->id</link>\n";
-
-      $desc_query = "SELECT SUBSTRING_INDEX(news, ' ', 26) FROM headlines WHERE id=$row->id";
-      $desc_result = mysql_query($desc_query);
-      $desc_row = mysql_fetch_row($desc_result);
-
-      $description = $desc_row[0];
-
-      $rss .= "      <description><![CDATA[$description...</p>]]></description>\n";
-      $rss .= "      <guid isPermaLink=\"true\">http://www.darwinports.org/archives.php?id=$row->id</guid>\n";
-      $rss .= "      <content:encoded><![CDATA[$row->news]]></content:encoded>\n";
-      $rss .= "    </item>\n";
-    }
-  }
-  $rss .= "  </channel>\n";
-  $rss .= "</rss>\n";
-
-  $write = fwrite($open, $rss);
-  $close = fclose($open);
-}
-
-######################################################################
-
-# print the project news
-function print_headlines() {
-  global $connect;
-
-  $query = "SELECT id, DATE_FORMAT(timestamp, '%e %b %Y, %l:%i %p') AS f_timestamp, title, news FROM headlines ORDER BY id DESC LIMIT 5";
-  $result = mysql_query($query) or die("Error: $query.");
-  if(!$result) {
-    die("Error: $result.");
-  }
-
-  if(mysql_num_rows($result) > 0) {
-    while($row = mysql_fetch_object($result)) {
-      echo "<h5 class=\"subhdr\">$row->title</h5>\n";
-      echo "<h6 class=\"date\">$row->f_timestamp</h6>\n";
-      echo "$row->news\n\n";
-    }
-  }
-  else {
-    echo "<p>No headlines are available at this time.</p>\n";
-  }
-}
-
-######################################################################
-
-# display a single headline
-function print_headline() {
-  global $connect;
-
-  $id = $_GET['id'];
-  $query = "SELECT id, DATE_FORMAT(timestamp, '%e %b %Y, %l:%i %p') AS f_timestamp, title, news FROM headlines WHERE id='$id'";
-  $result = mysql_query($query) or die("Error: $query.");
-  if(!$result) {
-    die("Error: $result.");
-  }
-
-  $row = mysql_fetch_object($result);
-  if($row) {
-    echo "<h5 class=\"subhdr\">$row->title</h5>\n";
-    echo "<h6 class=\"date\">$row->f_timestamp</h6>\n";
-    echo "$row->news\n\n";
-  }
-  else {
-    echo "<h2 class=\"hdr\">Error!</h2>\n";
-    echo "<p>The requested headline could not be found.  It is either not in the database, or an error has occurred.</p>\n";
-  }
-}
-
-######################################################################
-
-# print the form used to add project news
-function print_add_headline() {
-  global $PHP_SELF, $connect;
-
-  if(!$_POST['submit']) {
-    echo "<p>Use the form below to add project news.</p>\n\n";
-    echo "<form action=\"$PHP_SELF\" method=\"post\">\n";
-    echo "<p>Title:&nbsp;&nbsp;<input type=\"text\" name=\"title\" size=\"40\" /></p>\n";
-    echo "<p>News:</p>\n";
-    echo "<p><textarea name=\"news\" cols=\"70\" rows=\"20\"></textarea></p>\n";
-    echo "<p><input type=\"submit\" name=\"submit\" value=\"Submit\" /></p>\n";
-    echo "</form>\n\n";
-  }
-  else {
-    $title = $_POST['title'];
-    $news = $_POST['news'];
-    $errorList = array();
-    $count = 0;
-    if(!$title) {
-      $errorList[$count] = 'Invalid entry: Title';
-      $count++;
-    }
-    if(!$news) {
-      $errorList[$count] = 'Invalid entry: News';
-      $count++;
-    }
-    if(sizeof($errorList) == 0) {
-      $query = "INSERT INTO headlines (timestamp, title, news) VALUES (NOW(), '$title', '$news')";
-      $result = mysql_query($query) or die("Error: $query.");
-      if(!$result) {
-	die("Error: $result.");
-      }
-      echo "<p>The addition was successful.  You can either <a href=\"list.php\">list all existing headlines, <a href=\"add.php\">add another headline</a>, or <a href=\"/\">return to the DarwinPorts site</a>.</p>\n\n";
-      create_rss();
-    }
-    else {
-      echo "<p>The following errors have occurred:</p>\n\n";
-      echo "<ul>\n";
-      for($x=0; $x<sizeof($errorList); $x++) {
-	echo "<li>$errorList[$x]</li>\n";
-      }
-      echo "</ul>\n\n";
-    }
-  }
-}
-
-######################################################################
-
-# print the form used to edit project news
-function print_edit_headline($id) {
-  global $PHP_SELF, $connect;
-
-  if(!$_POST['submit']) {
-    $id = $_GET['id'];
-    $query = "SELECT title, news FROM headlines WHERE id='$id'";
-    $result = mysql_query($query) or die("Error: $query.");
-    if(!$result) {
-      die("Error: $result.");
-    }
-    if(mysql_num_rows($result) > 0) {
-      $row = mysql_fetch_object($result);
-      echo "<p>Use the form below to edit project news.</p>\n\n";
-      echo "<form action=\"$PHP_SELF?id=$id\" method=\"post\">\n";
-      echo "<p>Title:&nbsp;&nbsp;<input type=\"text\" name=\"title\" size=\"40\" value=\"$row->title\" /></p>\n";
-      echo "<p>News:</p>\n";
-      echo "<p><textarea name=\"news\" cols=\"70\" rows=\"20\">";
-      echo htmlentities($row->news);
-      echo "</textarea></p>\n";
-      echo "<p><input type=\"submit\" name=\"submit\" value=\"Edit\" /></p>\n";
-      echo "</form>\n\n";
-    }
-    else {
-      echo "<p>The requested news headline could not be found.  It is either not in the database, or an error has occurred.  Please try again.</p>\n\n";
-    }
-  }
-  else {
-    $title = $_POST['title'];
-    $news = $_POST['news'];
-    $errorList = array();
-    $count = 0;
-    if(!$title) {
-      $errorList[$count] = 'Invalid entry: Title';
-      $count++;
-    }
-    if(!$news) {
-      $errorList[$count] = 'Invalid entry: News';
-      $count++;
-    }
-    if(sizeof($errorList) == 0) {
-      $query = "UPDATE headlines SET title='$title', news='$news' WHERE id='$id'";
-      $result = mysql_query($query) or die("Error: $query.");
-
-      if(!$result) {
-	die("Error: $result.");
-      }
-      echo "<p>The update was successful.  You can either <a href=\"list.php\">list all existing headlines, <a href=\"add.php\">add another headline</a>, or <a href=\"/\">return to the DarwinPorts site</a>.</p>\n\n";
-      create_rss();
-    }
-    else {
-      echo "<p>The following errors have occurred:</p>\n\n";
-      echo "<ul>\n";
-      for($x=0; $x<sizeof($errorList); $x++) {
-	echo "<li>$errorList[$x]</li>\n";
-      }
-      echo "</ul>\n\n";
-    }
-  }
-}
-
-######################################################################
-
-# print a list of all existing headlines
-function print_all_headlines() {
-  global $connect;
-
-  echo "<p>Below is a list of all existing news headlines.  They can be viewed, edited, or deleted from this interface.  Alternatively, you can also <a href=\"add.php\">add news</a>.</p>\n\n";
-
-  $query = "SELECT id, title, DATE_FORMAT(timestamp, '%e %b %Y, %l:%i %p') AS f_timestamp FROM headlines ORDER BY id DESC";
-  $result = mysql_query($query) or die("Error: $query.");
-  if(!$result) {
-    die("Error: $result.");
-  }
-  if(mysql_num_rows($result) > 0) {
-    while($row = mysql_fetch_object($result)) {
-      echo "<p><a href=\"/archives.php?id=$row->id\">$row->title</a><br />&nbsp&nbsp;$row->f_timestamp&nbsp;&nbsp;|&nbsp;&nbsp;<a href=\"edit.php?id=$row->id\">edit</a></p>\n\n";
-    }
-  }
-  else {
-    echo "<p>No headlines are available.</p>\n\n";
-  }
-}
-
-######################################################################
-
-# print a list of all existing headlines without the admin foobage
-# (this is cheap and could be better)
-function print_all_headlines_nonadmin() {
-  global $connect;
-
-  $query = "SELECT id, title, DATE_FORMAT(timestamp, '%e %b %Y, %l:%i %p') AS f_timestamp FROM headlines ORDER BY id DESC";
-  $result = mysql_query($query) or die("Error: $query.");
-  if(!$result) {
-    die("Error: $result.");
-  }
-  if(mysql_num_rows($result) > 0) {
-    while($row = mysql_fetch_object($result)) {
-      echo "<p><a href=\"/archives.php?id=$row->id\">$row->title</a><br />&nbsp&nbsp;$row->f_timestamp</p>\n\n";
-    }
-  }
-  else {
-    echo "<p>No headlines are available.</p>\n\n";
-  }
-}
-
-######################################################################
-
-?>

Modified: trunk/www/includes/header.inc
===================================================================
--- trunk/www/includes/header.inc	2007-08-28 00:46:39 UTC (rev 28302)
+++ trunk/www/includes/header.inc	2007-08-28 01:00:46 UTC (rev 28303)
@@ -1,48 +1,48 @@
       <div id="nav">
 	<div id="logo">
-	  <a href="/" title="DarwinPorts"><img src="/img/dp.jpg"
-	    alt="DarwinPorts" /></a>
+	  <a href="/macports/" title="MacPorts"><img src="/macports/img/dp.jpg"
+	    alt="MacPorts" /></a>
 	</div>
 	<div id="l">
 	  <ul>
 	  <?php
 	    $PHP_SELF = $_SERVER['PHP_SELF'];
-	    $home = '/index.php';
-	    $getdp = '/getdp/index.php';
-	    $ports = '/ports/index.php';
-	    $help = '/help/index.php';
+	    $home = '/macports/index.php';
+	    $getdp = '/macports/getmp.php';
+	    $ports = '/macports/ports.php';
+	    $help = '/macports/help.php';
 
 	    if($PHP_SELF == $home) {
-	      echo "<li class=\"selected\"><a href=\"/\" title=\"DarwinPorts Home\">DarwinPorts Home</a></li>\n";
+	      echo "<li class=\"selected\"><a href=\"/macports/index.php\" title=\"MacPorts Home\">MacPorts Home</a></li>\n";
 	    }
 	    else {
-	      echo "<li><a href=\"/\" title=\"DarwinPorts Home\">DarwinPorts Home</a></li>\n";
+	      echo "<li><a href=\"/macports/index.php\" title=\"MacPorts Home\">MacPorts Home</a></li>\n";
 	    }
-	    if($PHP_SELF == $getdp) {
-	      echo "<li class=\"selected\"><a href=\"/getdp/\" title=\"Get DarwinPorts\">Get DarwinPorts</a></li>\n";
+	    if($PHP_SELF == $getmp) {
+	      echo "<li class=\"selected\"><a href=\"/macports/getmp.php\" title=\"Get MacPorts\">Get MacPorts</a></li>\n";
 	    }
 	    else {
-	      echo "<li><a href=\"/getdp/\" title=\"Get DarwinPorts\">Get DarwinPorts</a></li>\n";
+	      echo "<li><a href=\"/macports/getmp.php\" title=\"Get MacPorts\">Get MacPorts</a></li>\n";
 	    }
 	  ?>
-	    <li class="last"><a href="http://www.opendarwin.org/bugzilla/" title="Bugzilla">Bugzilla</a></li>
+	    <li class="last"><a href="http://trac.macports.org/" title="Bugzilla">Support & Development</a></li>
 	  </ul>
 	</div>
 	<div id="r">
 	  <ul>
-	    <li><a href="/docs/" title="Documentation">Documentation</a></li>
+	    <li><a href="/macports/docs/" title="Documentation">Documentation</a></li>
 	    <?php
 	      if($PHP_SELF == $ports) {
-		echo "<li class=\"selected\"><a href=\"/ports/\" title=\"Available Ports\">Available Ports</a></li>\n";
+		echo "<li class=\"selected\"><a href=\"/macports/ports.php\" title=\"Available Ports\">Available Ports</a></li>\n";
 	      }
 	      else {
-		echo "<li><a href=\"/ports/\" title=\"Available Ports\">Available Ports</a></li>\n";
+		echo "<li><a href=\"/macports/ports.php\" title=\"Available Ports\">Available Ports</a></li>\n";
 	      }
 	      if($PHP_SELF == $help) {
-		echo "<li class=\"sellast\"><a href=\"/help/\" title=\"Get Help\">Get Help</a></li>\n";
+		echo "<li class=\"sellast\"><a href=\"/macports/help.php\" title=\"Get Help\">Get Help</a></li>\n";
 	      }
 	      else {
-		echo "<li class=\"last\"><a href=\"/help/\" title=\"Get Help\">Get Help</a></li>\n";
+		echo "<li class=\"last\"><a href=\"/macports/help.php\" title=\"Get Help\">Get Help</a></li>\n";
 	      }
 	    ?>
 	  </ul>

Modified: trunk/www/includes/lang.inc
===================================================================
--- trunk/www/includes/lang.inc	2007-08-28 00:46:39 UTC (rev 28302)
+++ trunk/www/includes/lang.inc	2007-08-28 01:00:46 UTC (rev 28303)
@@ -1,3 +1,3 @@
-      <p id="lang">[ <a href="/">English</a>, <a
-	href="/ja/">Japanese</a>, <a href="/fr/">Fran&ccedil;ais</a>, <a
-	href="/es/">Espa&ntilde;ol</a> ]</p>
+      <p id="lang">[ <a href="/macports/">English</a>, <a
+	href="/macports/ja/">Japanese</a>, <a href="/macports/fr/">Fran&ccedil;ais</a>, <a
+	href="/macports/es/">Espa&ntilde;ol</a> ]</p>

Copied: trunk/www/includes/news.inc (from rev 28240, trunk/www/includes/functions.inc)
===================================================================
--- trunk/www/includes/news.inc	                        (rev 0)
+++ trunk/www/includes/news.inc	2007-08-28 01:00:46 UTC (rev 28303)
@@ -0,0 +1,286 @@
+<?php
+
+# $Id$
+# Copyright (c) 2003, OpenDarwin
+
+######################################################################
+
+# variables and includes
+$DOCUMENT_ROOT = $_SERVER['DOCUMENT_ROOT'];
+$PHP_SELF = $_SERVER['PHP_SELF'];
+/* include_once("$DOCUMENT_ROOT/macports/includes/db.inc"); */
+$connect = mysql_pconnect($host, $user, $pass) or die("Can't connect to db!");
+mysql_select_db($db);
+
+
+
+######################################################################
+
+# create an RSS feed of the project news
+function create_rss() {
+  global $DOCUMENT_ROOT, $connect;
+
+  $query = "SELECT id, title, news FROM headlines ORDER BY id DESC LIMIT 10";
+  $result = mysql_query($query) or die("Error: $query.");
+  if(!$result) {
+    die("Error: $result.");
+  }
+
+  $open = fopen("$DOCUMENT_ROOT/mp_news.xml", "w+");
+  $rssdate = substr_replace(date("Y-m-d\TH:i:sO", time()),':', -2, 0);
+
+  $rss = "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n";
+  $rss .= "<rss version=\"2.0\"\n";
+  $rss .= "  xmlns:dc=\"http://purl.org/dc/elements/1.1/\"\n";
+  $rss .= "  xmlns:sy=\"http://purl.org/rss/1.0/modules/syndication/\"\n";
+  $rss .= "  xmlns:admin=\"http://webns.net/mvcb/\"\n";
+  $rss .= "  xmlns:rdf=\"http://www.w3.org/1999/02/22-rdf-syntax-ns#\"\n";
+  $rss .= "  xmlns:content=\"http://purl.org/rss/1.0/modules/content/\">\n\n";
+
+  $rss .= "  <channel>\n";
+  $rss .= "    <title>MacPorts Project News</title>\n";
+  $rss .= "    <link>http://www.macports.org/</link>\n";
+  $rss .= "    <description>MacPorts Project News</description>\n";
+  $rss .= "    <dc:language>en-us</dc:language>\n";
+  $rss .= "    <dc:creator>Jim Mock (mij at macports.org)</dc:creator>\n";
+  $rss .= "    <dc:rights>Copyright 2002-2007</dc:rights>\n";
+  $rss .= "    <dc:date>$rssdate</dc:date>\n";
+  $rss .= "    <admin:errorReportsTo rdf:resource=\"mailto:mij at macports.org\" />\n";
+
+  if(mysql_num_rows($result) > 0) {
+    while($row = mysql_fetch_object($result)) {
+      $rss .= "    <item>\n";
+      $rss .= "      <title>$row->title</title>\n";
+      $rss .= "      <link>http://www.macports.org/archives.php?id=$row->id</link>\n";
+
+      $desc_query = "SELECT SUBSTRING_INDEX(news, ' ', 26) FROM headlines WHERE id=$row->id";
+      $desc_result = mysql_query($desc_query);
+      $desc_row = mysql_fetch_row($desc_result);
+
+      $description = $desc_row[0];
+
+      $rss .= "      <description><![CDATA[$description...</p>]]></description>\n";
+      $rss .= "      <guid isPermaLink=\"true\">http://www.macports.org/archives.php?id=$row->id</guid>\n";
+      $rss .= "      <content:encoded><![CDATA[$row->news]]></content:encoded>\n";
+      $rss .= "    </item>\n";
+    }
+  }
+  $rss .= "  </channel>\n";
+  $rss .= "</rss>\n";
+
+  $write = fwrite($open, $rss);
+  $close = fclose($open);
+}
+
+######################################################################
+
+# print the project news
+function print_headlines() {
+  global $connect;
+
+  $query = "SELECT id, DATE_FORMAT(timestamp, '%e %b %Y, %l:%i %p') AS f_timestamp, title, news FROM headlines ORDER BY id DESC LIMIT 5";
+  $result = mysql_query($query) or die("Error: $query.");
+  if(!$result) {
+    die("Error: $result.");
+  }
+
+  if(mysql_num_rows($result) > 0) {
+    while($row = mysql_fetch_object($result)) {
+      echo "<h5 class=\"subhdr\">$row->title</h5>\n";
+      echo "<h6 class=\"date\">$row->f_timestamp</h6>\n";
+      echo "$row->news\n\n";
+    }
+  }
+  else {
+    echo "<p>No headlines are available at this time.</p>\n";
+  }
+}
+
+######################################################################
+
+# display a single headline
+function print_headline() {
+  global $connect;
+
+  $id = $_GET['id'];
+  $query = "SELECT id, DATE_FORMAT(timestamp, '%e %b %Y, %l:%i %p') AS f_timestamp, title, news FROM headlines WHERE id='$id'";
+  $result = mysql_query($query) or die("Error: $query.");
+  if(!$result) {
+    die("Error: $result.");
+  }
+
+  $row = mysql_fetch_object($result);
+  if($row) {
+    echo "<h5 class=\"subhdr\">$row->title</h5>\n";
+    echo "<h6 class=\"date\">$row->f_timestamp</h6>\n";
+    echo "$row->news\n\n";
+  }
+  else {
+    echo "<h2 class=\"hdr\">Error!</h2>\n";
+    echo "<p>The requested headline could not be found.  It is either not in the database, or an error has occurred.</p>\n";
+  }
+}
+
+######################################################################
+
+# print the form used to add project news
+function print_add_headline() {
+  global $PHP_SELF, $connect;
+
+  if(!$_POST['submit']) {
+    echo "<p>Use the form below to add project news.</p>\n\n";
+    echo "<form action=\"$PHP_SELF\" method=\"post\">\n";
+    echo "<p>Title:&nbsp;&nbsp;<input type=\"text\" name=\"title\" size=\"40\" /></p>\n";
+    echo "<p>News:</p>\n";
+    echo "<p><textarea name=\"news\" cols=\"70\" rows=\"20\"></textarea></p>\n";
+    echo "<p><input type=\"submit\" name=\"submit\" value=\"Submit\" /></p>\n";
+    echo "</form>\n\n";
+  }
+  else {
+    $title = $_POST['title'];
+    $news = $_POST['news'];
+    $errorList = array();
+    $count = 0;
+    if(!$title) {
+      $errorList[$count] = 'Invalid entry: Title';
+      $count++;
+    }
+    if(!$news) {
+      $errorList[$count] = 'Invalid entry: News';
+      $count++;
+    }
+    if(sizeof($errorList) == 0) {
+      $query = "INSERT INTO headlines (timestamp, title, news) VALUES (NOW(), '$title', '$news')";
+      $result = mysql_query($query) or die("Error: $query.");
+      if(!$result) {
+	die("Error: $result.");
+      }
+      echo "<p>The addition was successful.  You can either <a href=\"/macports/admin/list.php\">list all existing headlines,
+      <a href=\"/macports/admin/add.php\">add another headline</a>, or <a href=\"/macports/index.php\">return to the MacPorts site</a>.</p>\n\n";
+      create_rss();
+    }
+    else {
+      echo "<p>The following errors have occurred:</p>\n\n";
+      echo "<ul>\n";
+      for($x=0; $x<sizeof($errorList); $x++) {
+	echo "<li>$errorList[$x]</li>\n";
+      }
+      echo "</ul>\n\n";
+    }
+  }
+}
+
+######################################################################
+
+# print the form used to edit project news
+function print_edit_headline($id) {
+  global $PHP_SELF, $connect;
+
+  if(!$_POST['submit']) {
+    $id = $_GET['id'];
+    $query = "SELECT title, news FROM headlines WHERE id='$id'";
+    $result = mysql_query($query) or die("Error: $query.");
+    if(!$result) {
+      die("Error: $result.");
+    }
+    if(mysql_num_rows($result) > 0) {
+      $row = mysql_fetch_object($result);
+      echo "<p>Use the form below to edit project news.</p>\n\n";
+      echo "<form action=\"$PHP_SELF?id=$id\" method=\"post\">\n";
+      echo "<p>Title:&nbsp;&nbsp;<input type=\"text\" name=\"title\" size=\"40\" value=\"$row->title\" /></p>\n";
+      echo "<p>News:</p>\n";
+      echo "<p><textarea name=\"news\" cols=\"70\" rows=\"20\">";
+      echo htmlentities($row->news);
+      echo "</textarea></p>\n";
+      echo "<p><input type=\"submit\" name=\"submit\" value=\"Edit\" /></p>\n";
+      echo "</form>\n\n";
+    }
+    else {
+      echo "<p>The requested news headline could not be found.  It is either not in the database, or an error has occurred.  Please try again.</p>\n\n";
+    }
+  }
+  else {
+    $title = $_POST['title'];
+    $news = $_POST['news'];
+    $errorList = array();
+    $count = 0;
+    if(!$title) {
+      $errorList[$count] = 'Invalid entry: Title';
+      $count++;
+    }
+    if(!$news) {
+      $errorList[$count] = 'Invalid entry: News';
+      $count++;
+    }
+    if(sizeof($errorList) == 0) {
+      $query = "UPDATE headlines SET title='$title', news='$news' WHERE id='$id'";
+      $result = mysql_query($query) or die("Error: $query.");
+
+      if(!$result) {
+	die("Error: $result.");
+      }
+      echo "<p>The update was successful.  You can either <a href=\"/macports/admin/list.php\">list all existing headlines,
+      <a href=\"/macports/admin/add.php\">add another headline</a>, or <a href=\"/macports/index.php\">return to the MacPorts site</a>.</p>\n\n";
+      create_rss();
+    }
+    else {
+      echo "<p>The following errors have occurred:</p>\n\n";
+      echo "<ul>\n";
+      for($x=0; $x<sizeof($errorList); $x++) {
+	echo "<li>$errorList[$x]</li>\n";
+      }
+      echo "</ul>\n\n";
+    }
+  }
+}
+
+######################################################################
+
+# print a list of all existing headlines
+function print_all_headlines() {
+  global $connect;
+
+  echo "<p>Below is a list of all existing news headlines.  They can be viewed, edited, or deleted from this interface.
+  Alternatively, you can also <a href=\"/macports/admin/add.php\">add news</a>.</p>\n\n";
+
+  $query = "SELECT id, title, DATE_FORMAT(timestamp, '%e %b %Y, %l:%i %p') AS f_timestamp FROM headlines ORDER BY id DESC";
+  $result = mysql_query($query) or die("Error: $query.");
+  if(!$result) {
+    die("Error: $result.");
+  }
+  if(mysql_num_rows($result) > 0) {
+    while($row = mysql_fetch_object($result)) {
+      echo "<p><a href=\"/macports/archives.php?id=$row->id\">$row->title</a><br />&nbsp&nbsp;$row->f_timestamp&nbsp;&nbsp;|&nbsp;&nbsp;
+           <a href=\"/macports/admin/edit.php?id=$row->id\">edit</a></p>\n\n";
+    }
+  }
+  else {
+    echo "<p>No headlines are available.</p>\n\n";
+  }
+}
+
+######################################################################
+
+# print a list of all existing headlines without the admin foobage
+# (this is cheap and could be better)
+function print_all_headlines_nonadmin() {
+  global $connect;
+
+  $query = "SELECT id, title, DATE_FORMAT(timestamp, '%e %b %Y, %l:%i %p') AS f_timestamp FROM headlines ORDER BY id DESC";
+  $result = mysql_query($query) or die("Error: $query.");
+  if(!$result) {
+    die("Error: $result.");
+  }
+  if(mysql_num_rows($result) > 0) {
+    while($row = mysql_fetch_object($result)) {
+      echo "<p><a href=\"/macports/archives.php?id=$row->id\">$row->title</a><br />&nbsp&nbsp;$row->f_timestamp</p>\n\n";
+    }
+  }
+  else {
+    echo "<p>No headlines are available.</p>\n\n";
+  }
+}
+
+######################################################################
+
+?>

Modified: trunk/www/index.php
===================================================================
--- trunk/www/index.php	2007-08-28 00:46:39 UTC (rev 28302)
+++ trunk/www/index.php	2007-08-28 01:00:46 UTC (rev 28303)
@@ -1,53 +1,43 @@
   <?php
     $DOCUMENT_ROOT = $_SERVER['DOCUMENT_ROOT'];
-    include_once("$DOCUMENT_ROOT/includes/common.inc");
-    include_once("$DOCUMENT_ROOT/includes/functions.inc");
-    include_once("$DOCUMENT_ROOT/includes/db.inc");
-    print_header('DarwinPorts Home', 'iso-8859-1');
+    include_once("$DOCUMENT_ROOT/macports/includes/common.inc");
+    include_once("$DOCUMENT_ROOT/macports/includes/news.inc");
+    print_header('MacPorts Home', 'utf-8');
   ?>
 
     <div id="content">
-      <h2 class="hdr">Introduction to DarwinPorts</h2>
+      <h2 class="hdr">Introduction to MacPorts</h2>
 
-      <p>The DarwinPorts Project's main goal is to provide an easy way to
-	install various open-source software products on the Darwin OS 
-	family (<a href="http://www.opendarwin.org/">OpenDarwin</a>,
-	<a href="http://www.apple.com/macosx/">Mac OS X</a> and
-	<a href="http://developer.apple.com/darwin/projects/darwin/">Darwin</a>)</p>
-<?
-                $result = mysql_query("SELECT count(*) from darwinports.portfiles");
-                if ($result) {
-                        $row = mysql_fetch_array($result);
-                        $count = $row[0];
-                } else {
-                        $count = 0;
-                }
-?>
-      <p>There are currently about <?= $count; ?> completed and usable
-	<a href="/ports/">ports</a>, with more being added on a regular basis.
+      <p>The MacPorts Project's main goal is to provide an easy way to
+	install various open-source software products on the <a
+        href="http://www.apple.com/macosx/">Mac OS X</a> operating system.</p>
+
+      <p>There are currently about <?= ports_count(); ?> completed and usable
+	<a href="/macports/ports.php">ports</a>, with more being added on a regular basis.
 	You can track recently added ports by subscribing to the <a
-	href="http://www.opendarwin.org/mailman/listinfo/cvs-darwinports-all">cvs-darwinports-all</a>
+	href="http://lists.macosforge.org/mailman/listinfo/macports-changes">macports-changes</a>
 	mailing list.</p>
 	
-      <p>For more information on obtaining and installing DarwinPorts,
-	please see the <a href="/getdp/">Get DarwinPorts</a> section of the
-	site.  Also be sure to check out the <a href="/docs/">documentation</a>,
+      <p>For more information on obtaining and installing MacPorts,
+	please see the <a href="/macports/getmp.php">Get MacPorts</a> section of this
+	site.  Also be sure to check out the <a href="http://geeklair.net/new_macports_guide/">documentation</a>,
 	and if you have questions or run into problems, you can get help at our <a
-	href="/help/">help section</a>. The <a href="http://wiki.opendarwin.org/index.php/DarwinPorts">DarwinPorts Wiki</a>
+	href="/macports/help.php">help section</a>. The <a href="http://trac.macports.org/projects/macports/wiki">MacPorts Wiki</a>
 	is also a good resource for general and miscellaneous help, specially the 
-	ongoing <a href="http://wiki.opendarwin.org/index.php/DarwinPorts:FAQ">FAQ</a> effort.</p>
+	ongoing <a href="http://trac.macports.org/projects/macports/wiki/FAQ">FAQ</a> effort.</p>
 
-      <p>Bug reports, feature requests, and new ports should be submitted to
-	<a href="http://www.opendarwin.org/bugzilla/">Bugzilla</a>. Please consult
-    the <a href="docs/ch01s05.html#user_bugs">Bug report documentation</a>
-    to improve the processing of your bug report(s).</p>
+      <p>Bug reports, feature requests, and new ports should be submitted as
+	<a href="http://trac.macports.org/projects/macports/newticket">new tickets</a> into our Trac system. Please consult
+    the <a href="http://geeklair.net/new_macports_guide/#project.tickets"> documentation</a>
+    to improve the processing of your ticket(s).</p>
 
-    <p>For information on becoming an official member of the DarwinPorts project
-    with write access to our CVS repository, please consult the <a href="/docs/ch16.html">relevant documentation</a>
+    <p>For information on becoming an official member of the MacPorts project
+    with write access to our subversion repository, please consult the
+    <a href="http://geeklair.net/new_macports_guide/#project.membership">relevant documentation</a>
     detailing our membership requirements and resulting duties &amp; benefits
-    from holding an OpenDarwin account.</p>
+    from holding a MacPorts account.</p>
 
-    <p><b>Current DarwinPorts <a href="/getdp/">release</a>: <? print "$dp_version"; ?></b></p>
+    <p><b>Current MacPorts <a href="/macports/getmp.php">release</a>: <? print "$mp_version"; ?></b></p>
 
       <div id="news">
 	<h2 class="hdr">Project News</h2>
@@ -56,7 +46,7 @@
 	  print_headlines();
 	?>
 
-		<p>You can also browse our <a href="archives.php">news archives</a>.</p>
+		<p>You can also browse our <a href="/macports/archives.php">news archives</a>.</p>
 	
       </div>
     </div>

Copied: trunk/www/localized/es (from rev 28240, trunk/www/es)

Copied: trunk/www/localized/fr (from rev 28240, trunk/www/fr)

Copied: trunk/www/localized/it (from rev 28240, trunk/www/it)

Copied: trunk/www/localized/ru (from rev 28240, trunk/www/ru)

Copied: trunk/www/mp.css (from rev 28240, trunk/www/dp.css)
===================================================================
--- trunk/www/mp.css	                        (rev 0)
+++ trunk/www/mp.css	2007-08-28 01:00:46 UTC (rev 28303)
@@ -0,0 +1,234 @@
+/*
+  $Id$
+*/
+
+* {
+	font-family: Georgia, "New Century Schoolbook", "Times New Roman", Times, serif;
+}
+
+body {
+	background: #e3f1c7;
+	width: 720px;
+	margin: 15px auto 15px auto;
+	font-size: 12px;
+}
+
+a:link {
+	color: #669;
+	text-decoration: none;
+	font-weight: bold;
+	border-bottom: 1px dotted #c63;
+}
+
+a:visited {
+	color: #888;
+	text-decoration: none;
+	font-weight: bold;
+	border-bottom: 1px dotted #669;
+}
+
+a:hover {
+	color: #c63;
+	text-decoration: none;
+	font-weight: bold;
+	border-bottom: 1px dotted #369;
+}
+
+img, a img {
+	border: none;
+	text-decoration: none;
+}
+
+h1 {
+	font-size: 22px;
+}
+
+h2 {
+	font-size: 20px;
+}
+
+h3 {
+	font-size: 18px;
+}
+
+h4 {
+	font-size: 16px;
+}
+
+h5 {
+	font-size: 14px;
+}
+
+h6 {
+	font-size: 13px;
+}
+
+br {
+	clear: both;
+}
+
+p {
+	margin: 10px 0 1em 0;
+	line-height: 16px;
+}
+
+input, textarea {
+	font-family: Courier, "Courier New", monospace;
+}
+
+kbd {
+	color: #c63;
+	font-family: Courier, "Courier New", monospace;
+}
+
+pre {
+	color: #369;
+	font-family: Sans, "Sans serif";
+	font-size: 14px;
+	margin-left: 20px;
+}
+
+#nav {
+	height: 76px;
+	padding: 0;
+	font-size: 10px;
+}
+
+#logo {
+	background: #fff;
+	float: left;
+	display: inline;
+	width: 400px;
+	height: 75px;
+	border-top: 1px solid #bbb;
+	border-bottom: 1px solid #bbb;
+}
+
+#logo a {
+	border: none;
+}
+
+#nav #l {
+	width: 150px;
+	height: 75px;
+	float: left;
+	border: 1px solid #bbb;
+}
+
+#nav #r {
+	width: 150px;
+	height: 75px;
+	float: left;
+	border-top: 1px solid #bbb;
+	border-bottom: 1px solid #bbb;
+}
+
+#nav ul {
+	list-style-type: none;
+	margin: 0;
+	padding: 0;
+	text-align: center;
+}
+
+#nav li a {
+	background: #fff;
+	display: block;
+	text-decoration: none;
+	line-height: 20px;
+	padding: 2px;
+	border-bottom: 1px solid #bbb;
+}
+
+#nav li a:visited {
+	color: #999;
+	text-decoration: none;
+}
+
+#nav li a:hover {
+	background: #d8e6e7;
+	color: #888;
+}
+
+#nav li.last a {
+	border: none;
+	display: block;
+	line-height: 21px;
+}
+
+#nav li.selected a {
+	background: #f3f3f3;
+	color: #c63;
+}
+
+#nav li.sellast a {
+	background: #f3f3f3;
+	color: #c63;
+	border: none;
+	display: block;
+	line-height: 21px;
+}
+
+#main {
+	background: #fff;
+	width: 702px;
+	border-right: 1px solid #bbb;
+	border-left: 1px solid #bbb;
+	padding-bottom: 100px;
+}
+
+#content {
+	width: 80%; 
+	margin: 10px 0 0 0;
+	padding: 5px 20px;
+}
+
+#news {
+	margin: 10px 0 0 0;
+	padding: 5px 0 0 0;
+}
+
+#footer {
+	width: 692px;
+	background: #fff;
+	border: 1px solid #bbb;
+	font-size: 10px;
+	padding: 5px;
+	text-align: right;
+}
+
+.languages {
+	float: left;
+}
+
+.hdr {
+	color: #669;
+	margin: 0;
+	padding: 10px 0 0 0;
+	border-bottom: 1px solid #bbb;
+}
+
+.subhdr {
+	color: #879880;
+	margin: 5px 0 0 0;
+	padding: 0;
+}
+
+.date {
+	color: #999;
+	margin: 0 auto;
+	padding: 0;
+}
+
+.referer_box {
+	margin: auto;
+	margin-bottom: 1em;
+	width: 90%;
+	border: 1px solid #CC6633;
+	background-color: #D37F54;
+	color: black;
+	padding: 1em;
+}
+.referer_box a {
+	color: white;
+}
+

Modified: trunk/www/ports.php
===================================================================
--- trunk/www/ports.php	2007-08-28 00:46:39 UTC (rev 28302)
+++ trunk/www/ports.php	2007-08-28 01:00:46 UTC (rev 28303)
@@ -1,21 +1,20 @@
 <?php
 	$DOCUMENT_ROOT = $_SERVER['DOCUMENT_ROOT'];
-	include_once("$DOCUMENT_ROOT/includes/common.inc");
-	include_once("$DOCUMENT_ROOT/includes/db.inc");
-	include_once("$DOCUMENT_ROOT/includes/email.inc");
-	print_header('Available Ports', 'iso-8859-1');
+	include_once("$DOCUMENT_ROOT/macports/includes/common.inc");
+	include_once("$DOCUMENT_ROOT/macports/includes/email.inc");
+	print_header('Available Ports', 'utf-8');
 	$by = isset($_GET['by']) ? $_GET['by'] : '';
 	$substr = isset($_GET['substr']) ? $_GET['substr'] : '';
 ?>
 	<center>
-	<h1>DarwinPorts Portfiles</h1>
+	<h1>MacPorts Portfiles</h1>
 	</center>
 
 	<p>
-	This form allows you to search the current index of DarwinPorts software. <br />
+	This form allows you to search the current index of MacPorts software. <br />
 	<i>Index last updated: </i>
 	<?php
-		$sql = "SELECT UNIX_TIMESTAMP(activity_time) FROM darwinports.log ORDER BY UNIX_TIMESTAMP(activity_time) DESC";
+		$sql = "SELECT UNIX_TIMESTAMP(activity_time) FROM macports.log ORDER BY UNIX_TIMESTAMP(activity_time) DESC";
 		$result = mysql_query($sql);
 		if($result && $row = mysql_fetch_row($result)) {
 				echo date("d-M-Y H:i:s", $row[0]);
@@ -41,7 +40,7 @@
 		<tr><td colspan="4"><hr size="1" noshade="noshade" /></td></tr>
 		<tr>
 <?php
-		$result = mysql_query("SELECT count(*) from darwinports.portfiles");
+		$result = mysql_query("SELECT count(*) from macports.portfiles");
 		if ($result) {
 			$row = mysql_fetch_array($result);
 			$count = $row[0];
@@ -57,7 +56,7 @@
 		<tr><td colspan="4"><hr size="1" noshade="noshade" /></td></tr>
 		<tr><th colspan="4" align="left">View By Category:</th></tr>
 		<?php
-				$query = "SELECT DISTINCT category FROM darwinports.categories ORDER BY category";
+				$query = "SELECT DISTINCT category FROM macports.categories ORDER BY category";
 				$result = mysql_query($query);
 				if($result) {
 					while( $row = mysql_fetch_assoc($result) ) {
@@ -75,7 +74,7 @@
 	if ($by && ($substr || $by == "all")) {
 		$fields = "name, path, version, description";
 		$query = "1";
-		$tables = "darwinports.portfiles p";
+		$tables = "macports.portfiles p";
 		if ($by == "name") {
 			$query .= " AND p.name LIKE '%" . mysql_real_escape_string($substr) . "%'";
 		}
@@ -86,19 +85,19 @@
 			$query .= " AND p.description LIKE '%" . mysql_real_escape_string($substr) . "%'";
 		}
 		if ($by == "cat") {
-			$tables .= ", darwinports.categories c";
+			$tables .= ", macports.categories c";
 			$query .= " AND c.portfile=p.name AND c.category='" . mysql_real_escape_string($substr) . "'";
 		}
 		if ($by == "variant") {
-			$tables .= ", darwinports.variants v";
+			$tables .= ", macports.variants v";
 			$query .= " AND v.portfile=p.name AND v.variant='" . mysql_real_escape_string($substr) . "'";
 		}
 		if ($by == "platform") {
-			$tables .= ", darwinports.platforms pl";
+			$tables .= ", macports.platforms pl";
 			$query .= " AND pl.portfile=p.name AND pl.platform ='" . mysql_real_escape_string($substr) . "'";
 		}
 		if ($by == "maintainer") {
-			$tables .= ", darwinports.maintainers m";
+			$tables .= ", macports.maintainers m";
 			$query .= " AND m.portfile=p.name AND m.maintainer LIKE '%" . mysql_real_escape_string($substr) . "%'";
 		}
 		$query = "SELECT DISTINCT $fields FROM $tables WHERE $query ORDER BY name";
@@ -112,12 +111,12 @@
 <?php
 			while( $row = mysql_fetch_assoc($result) ) {
 ?>
-	<dt><b><a href="http://www.darwinports.org/darwinports/dports/<?php echo $row['path']; ?>/Portfile"><?php echo htmlspecialchars($row['name']); ?></a></b> <?php echo htmlspecialchars($row['version']); ?></dt>
+	<dt><b><a href="http://trac.macports.org/projects/macports/browser/trunk/dports/<?php echo $row['path']; ?>/Portfile"><?php echo htmlspecialchars($row['name']); ?></a></b> <?php echo htmlspecialchars($row['version']); ?></dt>
 	<dd>
 	<?php echo htmlspecialchars($row['description']); ?><br />
 	<?php
 // MAINTAINERS
-				$nquery = "SELECT maintainer FROM darwinports.maintainers WHERE portfile='" . mysql_real_escape_string($row['name']) . "' ORDER BY is_primary DESC, maintainer";
+				$nquery = "SELECT maintainer FROM macports.maintainers WHERE portfile='" . mysql_real_escape_string($row['name']) . "' ORDER BY is_primary DESC, maintainer";
 				$nresult = mysql_query($nquery);
 				if ($nresult) {
 ?>
@@ -134,7 +133,7 @@
 				}
 
 // CATEGORIES
-				$nquery = "SELECT category FROM darwinports.categories WHERE portfile='" . mysql_real_escape_string($row['name']) . "' ORDER BY is_primary DESC, category";
+				$nquery = "SELECT category FROM macports.categories WHERE portfile='" . mysql_real_escape_string($row['name']) . "' ORDER BY is_primary DESC, category";
 				$nresult = mysql_query($nquery);
 				if ($nresult) {
 ?>
@@ -153,7 +152,7 @@
 				}
 
 // PLATFORMS
-				$nquery = "SELECT platform FROM darwinports.platforms WHERE portfile='" . mysql_real_escape_string($row['name']) . "' ORDER BY platform";
+				$nquery = "SELECT platform FROM macports.platforms WHERE portfile='" . mysql_real_escape_string($row['name']) . "' ORDER BY platform";
 				$nresult = mysql_query($nquery);
 				if ($nresult && mysql_num_rows($nresult) > 0) {
 ?>
@@ -169,7 +168,7 @@
 				}
 
 // DEPENDENCIES
-				$nquery = "SELECT library FROM darwinports.dependencies WHERE portfile='" . mysql_real_escape_string($row['name']) . "' ORDER BY library";
+				$nquery = "SELECT library FROM macports.dependencies WHERE portfile='" . mysql_real_escape_string($row['name']) . "' ORDER BY library";
 				$nresult = mysql_query($nquery);
 				if ($nresult && mysql_num_rows($nresult) > 0) {
 ?>
@@ -186,7 +185,7 @@
 				}
 /*
 // VARIANTS
-				$nquery = "SELECT variant FROM darwinports.variants WHERE portfile='" . mysql_real_escape_string($row['name']) . "' ORDER BY variant";
+				$nquery = "SELECT variant FROM macports.variants WHERE portfile='" . mysql_real_escape_string($row['name']) . "' ORDER BY variant";
 				$nresult = mysql_query($nquery);
 				if ($nresult && mysql_num_rows($nresult) > 0) {
 ?>

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


More information about the macports-changes mailing list