Changeset 28303


Ignore:
Timestamp:
Aug 28, 2007, 1:00:46 AM (13 years ago)
Author:
jmpp@…
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.

Location:
trunk/www
Files:
1 added
4 deleted
10 edited
7 copied
6 moved

Legend:

Unmodified
Added
Removed
  • trunk/www/admin/add.php

    r28240 r28303  
    11  <?php
    22    $DOCUMENT_ROOT = $_SERVER['DOCUMENT_ROOT'];
    3     include_once("$DOCUMENT_ROOT/includes/common.inc");
    4     include_once("$DOCUMENT_ROOT/includes/functions.inc");
    5     print_header('DarwinPorts | Add news', 'iso-8859-1');
     3    include_once("$DOCUMENT_ROOT/macports/includes/common.inc");
     4    include_once("$DOCUMENT_ROOT/macports/includes/news.inc");
     5    print_header('MacPorts | Add news', 'utf-8');
    66  ?>
    77
  • trunk/www/admin/edit.php

    r28240 r28303  
    11  <?php
    22    $DOCUMENT_ROOT = $_SERVER['DOCUMENT_ROOT'];
    3     include_once("$DOCUMENT_ROOT/includes/common.inc");
    4     include_once("$DOCUMENT_ROOT/includes/functions.inc");
    5     print_header('DarwinPorts | Edit news', 'iso-8859-1');
     3    include_once("$DOCUMENT_ROOT/macports/includes/common.inc");
     4    include_once("$DOCUMENT_ROOT/macports/includes/news.inc");
     5    print_header('MacPorts | Edit news', 'utf-8');
    66  ?>
    77
  • trunk/www/admin/index.php

    r19376 r28303  
    11  <?php
    22    $DOCUMENT_ROOT = $_SERVER['DOCUMENT_ROOT'];
    3     include_once("$DOCUMENT_ROOT/includes/common.inc");
    4     include_once("$DOCUMENT_ROOT/includes/functions.inc");
    5     print_header('DarwinPorts Site Administration', 'iso-8859-1');
     3    include_once("$DOCUMENT_ROOT/macports/includes/common.inc");
     4    print_header('MacPorts Site Administration', 'utf-8');
    65  ?>
    76
     
    1312
    1413      <ul>
    15         <li><a href="/admin/headlines/add.php">Add headline</a></li>
    16         <li><a href="/admin/headlines/list.php">List all headlines</a></li>
    17         <li><a href="/admin/headlines/rss.php">Regenerate RSS feed</a></li>
     14        <li><a href="/macports/admin/add.php">Add headline</a></li>
     15        <li><a href="/macports/admin/list.php">List all headlines</a></li>
     16        <li><a href="/macports/admin/rss.php">Regenerate RSS feed</a></li>
    1817      </ul>
    1918
    2019      <p>If you need to edit an already-posted headline, find it in the <a
    21         href="/admin/headlines/list.php">list</a>, and choose edit.</p>
     20        href="/macports/admin/list.php">list</a>, and choose edit.</p>
    2221    </div>
    2322  </div>
  • trunk/www/admin/list.php

    r28240 r28303  
    11  <?php
    22    $DOCUMENT_ROOT = $_SERVER['DOCUMENT_ROOT'];
    3     include_once("$DOCUMENT_ROOT/includes/common.inc");
    4     include_once("$DOCUMENT_ROOT/includes/functions.inc");
    5     print_header('DarwinPorts | List all news', 'iso-8859-1');
     3    include_once("$DOCUMENT_ROOT/macports/includes/common.inc");
     4    include_once("$DOCUMENT_ROOT/macports/includes/news.inc");
     5    print_header('MacPorts | List all news', 'utf-8');
    66  ?>
    77
  • trunk/www/admin/rss.php

    r28240 r28303  
    11<?php
    22  $DOCUMENT_ROOT = $_SERVER['DOCUMENT_ROOT'];
    3   include_once("$DOCUMENT_ROOT/includes/functions.inc");
     3  include_once("$DOCUMENT_ROOT/macports/includes/news.inc");
    44  create_rss();
    55?>
  • trunk/www/archives.php

    r19376 r28303  
    11  <?php
    22    $DOCUMENT_ROOT = $_SERVER['DOCUMENT_ROOT'];
    3     include_once("$DOCUMENT_ROOT/includes/common.inc");
    4     include_once("$DOCUMENT_ROOT/includes/functions.inc");
    5     print_header('DarwinPorts Home', 'iso-8859-1');
     3    include_once("$DOCUMENT_ROOT/macports/includes/common.inc");
     4    include_once("$DOCUMENT_ROOT/macports/includes/news.inc");
     5    print_header('MacPorts Home', 'utf-8');
    66  ?>
    77
  • trunk/www/downloads.php

    r28240 r28303  
    11  <?php
    22    $DOCUMENT_ROOT = $_SERVER['DOCUMENT_ROOT'];
    3     include_once("$DOCUMENT_ROOT/includes/common.inc");
    4     include_once("$DOCUMENT_ROOT/includes/functions.inc");
    5     print_header('DarwinPorts Downloads', 'iso-8859-1');
     3    include_once("$DOCUMENT_ROOT/macports/includes/common.inc");
     4    print_header('MacPorts Downloads', 'utf-8');
    65  ?>
    76
     
    1716$rep=opendir($dir);
    1817while ($file = readdir($rep)) {
    19         if (   preg_match('/^(\..*)|(.*\.php)$/', $file)
     18        if (   preg_match('/^(\..*)|(.*\.php)|(.*\.css)|(.*\.html)$/', $file)
    2019                || is_dir($file)
    2120           ) {
     
    3433foreach ($files as $f => $t) {
    3534        echo "<tr>";
    36         echo "<td>".date("d-M-Y G:i", $t)."</td><td><a href=\"/downloads/$f\">$f</a></td>\n";
     35        echo "<td>".date("d-M-Y G:i", $t)."</td><td><a href=\"/macports/downloads/$f\">$f</a></td>\n";
    3736        echo "</tr>";
    3837}
  • trunk/www/emit_portfile.php

    r19376 r28303  
    22
    33$DOCUMENT_ROOT = $_SERVER['DOCUMENT_ROOT'];
    4 include_once("$DOCUMENT_ROOT/includes/email.inc");
     4include_once("$DOCUMENT_ROOT/macports/includes/email.inc");
    55
    66$portname = basename(dirname($_SERVER['PATH_INFO']));
  • trunk/www/getmp.php

    r28240 r28303  
    11  <?php
    22    $DOCUMENT_ROOT = $_SERVER['DOCUMENT_ROOT'];
    3     include_once("$DOCUMENT_ROOT/includes/common.inc");
    4     /* include_once("$DOCUMENT_ROOT/includes/functions.inc"); */
    5     print_header('Get DarwinPorts', 'iso-8859-1');
     3    include_once("$DOCUMENT_ROOT/macports/includes/common.inc");
     4    print_header('Get MacPorts', 'utf-8');
    65  ?>
    76
    87    <div id="content">
    9       <h2 class="hdr">Get DarwinPorts</h2>
     8      <h2 class="hdr">Get MacPorts</h2>
    109
    11          <p>DarwinPorts version <? print "$dp_version_dmg"; ?> is available in binary form as a
    12          dmg disk image <a href="/downloads/DarwinPorts-<? print "$dp_version_dmg"; ?>-10.4.dmg">for Tiger (Universal)</a>
    13          or <a href="/downloads/DarwinPorts-<? print "$dp_version_dmg"; ?>-10.3.dmg">Panther</a>,
    14          both containing a pkg installer, or version <? print "$dp_version"; ?> in source form as either a
    15          <a href="/downloads/DarwinPorts-<? print "$dp_version"; ?>.tar.bz2">tar.bz2</a> package
    16          or a <a href="/downloads/DarwinPorts-<? print "$dp_version"; ?>.tar.gz">tar.gz</a> one.
    17          Checksums for all these are contained <a href="/downloads/DarwinPorts-<? print "$dp_version"; ?>.chk.txt">here</a>.</p>
     10         <p>MacPorts version <? print "$mp_version_dmg"; ?> is available in binary form as a
     11         dmg disk image for <a href="/macports/downloads/MacPorts-<? print "$mp_version_dmg"; ?>-10.4.dmg">
     12         Tiger (Universal)</a> or <a href="/macports/downloads/MacPorts-<? print "$mp_version_dmg"; ?>-10.3.dmg">
     13         Panther</a>, both containing a pkg installer, or version <? print "$mp_version"; ?>
     14         in source form as either a <a href="/macports/downloads/MacPorts-<? print "$mp_version"; ?>.tar.bz2">tar.bz2</a>
     15         package or a <a href="/macports/downloads/MacPorts-<? print "$mp_version"; ?>.tar.gz">tar.gz</a> one.
     16         Checksums for all these are contained in the <a href="/macports/downloads/MacPorts-<? print "$mp_version_dmg"; ?>.chk.txt">
     17         checksums file</a>.</p>
    1818
    1919         <p>To get a files listing of all our available downloads checkout the
    20          <a href="/downloads/">downloads section</a></p>
     20         <a href="/macports/downloads.php">downloads section</a> of the site.</p>
    2121
    22       <p>Please note that in order to install and run DarwinPorts on Mac OS X you must
    23         have Apple's Xcode installed, found at the <a href="http://developer.apple.com/">Apple Developer site</a>
     22      <p>Please note that in order to install and run MacPorts on Mac OS X you must
     23        have Apple's Developer Tools package installed, found at the <a href="http://developer.apple.com/tools/xcode/">Apple Developer site</a>
    2424        or on your Mac OS X installation CDs/DVD.</p>
    2525
    26           <p>If you want to use DarwinPorts on a platform other than Mac OS X, please be
     26          <p>If you want to use MacPorts on a platform other than Mac OS X, please be
    2727          aware of the following requirements (we assume that you have basics such as
    2828          gcc):</p>
     
    3535        <h5 class="subhdr">Mac OS X Package (.pkg) Installer</h5>
    3636
    37         <p>The easiest way to install DarwinPorts on a Mac OS X system is by downloading
    38         the <a href="/downloads/DarwinPorts-<? print "$dp_version_dmg"; ?>-10.4.dmg">dmg for Tiger</a>
    39         or the <a href="/downloads/DarwinPorts-<? print "$dp_version_dmg"; ?>-10.3.dmg">one for Panther</a>
     37        <p>The easiest way to install MacPorts on a Mac OS X system is by downloading
     38        the <a href="/macports/downloads/MacPorts-<? print "$mp_version_dmg"; ?>-10.4.dmg">dmg for Tiger</a>
     39        or the <a href="/macports/downloads/MacPorts-<? print "$mp_version_dmg"; ?>-10.3.dmg">one for Panther</a>
    4040        and running Installer.app on the pkg contained therein by double clicking on them,
    4141        following the on-screen instructions until completion. This procedure will place a
    42         fully functional and default DarwinPorts installation on your host system,
     42        fully functional and default MacPorts installation on your host system,
    4343        ready for usage. If needed, your shell configuration files will be adapted by the installer
    44         to include the necessary settings to run DarwinPorts. You may need to open a new shell for
     44        to include the necessary settings to run MacPorts. You may need to open a new shell for
    4545        these changes to take effect.</p>
    4646
    4747        <p>Although not strictly necessary, it is still recommended that you synchronize your
    4848        recent installation with our rsync server to ensure you have the latest release
    49         available of the DarwinPorts infrastructure and of the &ldquo;Portfiles&rdquo; containing the instructions
     49        available of the MacPorts infrastructure and of the &ldquo;Portfiles&rdquo; containing the instructions
    5050        employed in the building and installation of ports. To accomplish this simply execute:</p>
    5151
     
    5353
    5454        <p>It is also recommended to run the above command on a regular basis to keep your
    55         installation always current. At this point you should be ready to enjoy DarwinPorts!</p>
     55        installation always current. At this point you should be ready to enjoy MacPorts!</p>
    5656
    5757        <h5 class="subhdr">Source Installation</h5>
     
    5959        <p>If on the other hand you decide to install from source, there are still a couple of
    6060        things you will need to do once you've downloaded the tarball before you can
    61         install a port with the DarwinPorts system, namely compiling and installing DarwinPorts itself.
     61        install a port with the MacPorts system, namely compiling and installing MacPorts itself.
    6262        &ldquo;<kbd>cd</kbd>&rdquo; into the directory where you downloaded the package
    63         and run &ldquo;<kbd>tar xjvf <a href="/downloads/DarwinPorts-<? print "$dp_version"; ?>.tar.bz2">DarwinPorts-<? print "$dp_version"; ?>.tar.bz2</a></kbd>&rdquo;
    64         or &ldquo;<kbd>tar xzvf <a href="/downloads/DarwinPorts-<? print "$dp_version"; ?>.tar.gz">DarwinPorts-<? print "$dp_version"; ?>.tar.gz</a></kbd>&rdquo;,
     63        and run &ldquo;<kbd>tar xjvf <a href="/macpports/downloads/MacPorts-<? print "$mp_version"; ?>.tar.bz2">
     64        MacPorts-<? print "$mp_version"; ?>.tar.bz2</a></kbd>&rdquo; or &ldquo;<kbd>tar xzvf
     65        <a href="/macports/downloads/MacPorts-<? print "$mp_version"; ?>.tar.gz">MacPorts-<? print "$mp_version"; ?>.tar.gz</a></kbd>&rdquo;,
    6566        depending on whether you downloaded the bz2 tarball or the gz one, respectively.
    66         This will unpack the DarwinPorts sources that you will proceed to build and install. To do
     67        This will unpack the MacPorts sources that you will proceed to build and install. To do
    6768        so, execute the following:</p>
    6869
    69       <pre>cd DarwinPorts-<? print "$dp_version"; ?>
     70      <pre>cd MacPorts-<? print "$mp_version"; ?>
    7071
    7172./configure &amp;&amp; make &amp;&amp; sudo make install</pre>
     
    7475
    7576<pre>cd ../
    76 rm -rf DarwinPorts-<? print "$dp_version"; ?>*</pre>
     77rm -rf MacPorts-<? print "$mp_version"; ?>*</pre>
    7778
    7879      <p>These steps need to be perfomed from an administrator account, for which &ldquo;<kbd>sudo</kbd>&rdquo;
    79       will ask the password upon installation. This procedure will install a pristine DarwinPorts
    80       system and, if the optional steps are taken, remove the as of now unnecessary DarwinPorts-<? print "$dp_version"; ?>
    81       directory and corresponding tarball. To customize your installation you should read the output
    82       of &ldquo;<kbd>./configure --help | more</kbd>&rdquo; and pass the appropriate options to the
    83       configuration script in the steps detailed above.</p>
     80      will ask the password upon installation. This procedure will install a pristine MacPorts
     81      system and, if the optional steps are taken, remove the as of now unnecessary MacPorts-<? print "$mp_version"; ?>
     82      source directory and corresponding tarball. To customize your installation you should read the output
     83      of &ldquo;<kbd>./configure --help | more</kbd>&rdquo; and pass the appropriate options for the settings you wish
     84      to tweak to the configuration script in the steps detailed above.</p>
    8485       
    8586        <p>You will need to adapt your shell's configuration files to find the binaries installed by
    86         DarwinPorts. Lastly, you need to synchronize your recent installation with OpenDarwin servers:</p>
     87        MacPorts. Lastly, you need to synchronize your recent installation with the MacPorts rsync server:</p>
    8788
    8889        <pre>sudo port -d selfupdate</pre>
    8990
    90         <p>Upon completion DarwinPorts will be ready to install ports. Again, it is recommended to run
     91        <p>Upon completion MacPorts will be ready to install ports. Again, it is recommended to run
    9192        the above command on a regular basis to keep your installation current.</p>
    9293
    93       <p>Alternatively, you can refer to the <tt>README_RELEASE1</tt>
    94         file contained in the <? print "$dp_version"; ?> release tarball for basic installation and usage
    95         instructions.</p>
    9694
    9795        <h5 class="subhdr">Help</h5>
    9896
    99       <p><a href="/help/">Help</a> is also available should you need it.</p>
     97      <p><a href="/macports/help.php">Help</a> is also available should you need it.</p>
    10098
    101         <h5 class="subhdr">CVS Sources</h5>
     99        <h5 class="subhdr">SVN Sources</h5>
    102100
    103101     <p>If you are developer or a user with a taste for the bleeding edge and wish for the latest changes
    104      and feature additions, you may acquire the DarwinPorts sources through CVS.</p>
     102     and feature additions, you may acquire the MacPorts sources through SVN.</p>
    105103
    106       <p>Use the following commands to check the project out of the OpenDarwin anonymous CVS
     104      <p>Use the following command to check the project out of the MacPorts anonymous subversion
    107105        repository:</p>
    108106
    109       <pre>cvs -d :pserver:anonymous@anoncvs.opendarwin.org:/Volumes/src/cvs/od login
    110 cvs -d :pserver:anonymous@anoncvs.opendarwin.org:/Volumes/src/cvs/od co -P darwinports</pre>
     107        <pre>svn co http://svn.macports.org/repository/macports/trunk</pre>
    111108
    112        <p>When the server asks you for a password, simply press
    113        <kbd>return</kbd> on your keyboard&mdash;the password is empty.</p>
     109        <p>If you do not want to bother with fetching from SVN, you can download
     110        a nightly updated <a href="/macports/downloads/macports-nightly-svn-snapshot.tar.gz">
     111        SVN-snapshot</a>. Once extracted, you can keep it up to date with the usual
     112        &ldquo;<kbd>svn update</kbd>&rdquo; commands.</p>
    114113
    115         <p>If you do not want to bother with fetching from CVS, you can download
    116         a nightly updated <a href="/downloads/darwinports-nightly-cvs-snapshot.tar.gz">
    117         CVS-snapshot</a>. Once extracted, you can keep it up to date with the usual
    118         &ldquo;<kbd>cvs update</kbd>&rdquo; commands.</p>
    119 
    120       <p>If you'd simply like to view the CVS repository without checking it
    121         out, you can do so via <a
    122         href="http://www.opendarwin.org/cgi-bin/cvsweb.cgi/proj/darwinports/">CVSweb</a>.</p>
     114      <p>If you'd simply like to view the SVN repository without checking it
     115        out, you can do so via the <a href="http://trac.macports.org/projects/macports/browser">
     116        Trac browser</a>.</p>
    123117
    124118    </div>
  • trunk/www/help.php

    r28240 r28303  
    11  <?php
    22    $DOCUMENT_ROOT = $_SERVER['DOCUMENT_ROOT'];
    3     include_once("$DOCUMENT_ROOT/includes/common.inc");
    4     /* include_once("$DOCUMENT_ROOT/includes/functions.inc"); */
    5     print_header('Get Help', 'iso-8859-1');
     3    include_once("$DOCUMENT_ROOT/macports/includes/common.inc");
     4    print_header('Get Help', 'utf-8');
    65  ?>
    76
     
    98                <h2 class="hdr">Get Help</h2>
    109
    11                 <p>If you get stuck while using DarwinPorts and have a problem you
    12                         can't figure out, we have a lot of resources to help you.</p>
     10                <p>If you get stuck while using MacPorts and have a problem you
     11                can't figure out, we have a lot of resources to help you.</p>
    1312         
    1413                <h5 class="subhdr">Documentation</h5>
    1514
    16                 <p>The <a href="/docs/">DarwinPorts Guide</a> has a section for DarwinPorts users,
    17                 <a href="http://www.darwinports.org/docs/pt01.html">Part 1: Using DarwinPorts</a>.</p>
     15                <p>The <a href="http://geeklair.net/new_macports_guide/">MacPorts Guide</a> has a section dedicated to MacPorts
     16                installation issues, <a href="http://geeklair.net/new_macports_guide/#installing">Chapter 2. Installing MacPorts</a>
     17                and another one for general usage, <a href="http://geeklair.net/new_macports_guide/#using">Chapter 3: Using MacPorts</a>.</p>
    1818
    19                 <p>The <a href="http://wiki.opendarwin.org/index.php/DarwinPorts:FAQ">DarwinPorts FAQ</a>
    20                 is now an ongoing, user driven effort part of our <a href="http://wiki.opendarwin.org/index.php/DarwinPorts">Wiki</a>,
    21                 where anyone with a <a href="http://wiki.opendarwin.org/index.php?title=Special:Userlogin&returnto=DarwinPorts">Wiki account</a>
    22                 and DarwinPorts knowledge can contribute with information to help others.</p>
     19                <p>The <a href="http://trac.macports.org/projects/macports/wiki/FAQ">MacPorts FAQ</a>
     20                is now an ongoing, user driven effort part of our <a href="http://trac.macports.org/projects/macports/wiki">Wiki</a>,
     21                where anyone with a <a href="http://www.macports.org/wp-register.php">Trac account</a>
     22                and MacPorts knowledge can contribute with information to help others.</p>
    2323
    24                 <p>All of our documentation is a work in progress, so if you spot
    25                         an error, or have a quesiton about some part of the document,
    26                         let us know!  This will help us </p>
     24                <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,
     25                let us know!  This will help us </p>
    2726       
    2827                <h5 class="subhdr">Mailing Lists</h5>
    2928
    30                 <p>The 
    31                         <a href="http://www.opendarwin.org/mailman/listinfo/darwinports">General DarwinPorts
    32                         mailing list</a> is open to all.  It is the best place to ask
    33                         questions about DarwinPorts, for new users, developers,
    34                         everyone alike!  It is also where all discussion about
    35                         DarwinPorts itself takes place.  Please note that due to spam problems,
    36                         the DarwinPorts mailing list requires posts from
    37                         non-subscribers to be approved.  It may be better to susbcribe.</p>
     29                <p>The <a href="http://lists.macosforge.org/mailman/listinfo/macports-users">General MacPorts mailing list</a> is open to all
     30                for supscription. It is the best place for existing and new users alike to ask questions about MacPorts and MacPorts
     31                installed software. Please note that due to spam problems the mailing list will reject posts from non-subscribers.</p>
    3832
    39                 <p>Although not strictly a requirement, you may check the
    40                         <a href="http://www.opendarwin.org/pipermail/darwinports/">list archives</a>
    41                         before posting a question. We try to be as helpful as possible, but
    42                         if it's a common question our answers may be fairly short.</p>
     33                <p>It is recommended to check the <a href="http://lists.macosforge.org/pipermail/macports-users/">list archive</a> before posting
     34                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,
     35                but if it's a common question our answers may be fairly short.</p>
    4336
    44                 <p>Otherwise, indexed archives of this list are easily browsable at
    45                         <a href="http://gmane.org/">Gmane.org</a> as well as through
    46                         <a href="nntp://news.gmane.org/">NNTP</a>.</p>
     37                <p>When posting a question to the mailing list, please included any information you think might be relevent to the problem,
     38                such as  operating system and version you're using, Mac OS X 10.4.10 for example, whether you have any other third party
     39                software installed, in <kbd>/usr/local</kbd> for instance, and any error messages that MacPorts might give you (use the
     40                <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
     41                help you once these are used).</p>
    4742
    48                 <p>When you post a question to the mailing list, please included
    49                         any information you think might be relevent to the problem,
    50                         such as what operating system and version you're using, Mac OS X
    51                         10.3.2 for example, whether you have any other third party
    52                         software installed, in /usr/local for instance, and any error
    53                         messages that DarwinPorts might give (use the -d and -v port(1)'s
    54                         flags to turn on debugging informations, it's a lot easier for
    55                         us to help you once these are used).</p>
     43                <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">
     44                development list</a> is where you should direct your posts to, as this is where all discussion about MacPorts itself takes place.
     45                <a href="http://lists.macosforge.org/pipermail/macports-dev/">Archives</a> for this mailing list are also available.</p>
    5646
    5747                <h5 class="subhdr">IRC</h5>
    5848
    59                 <p>For more real-time discussion, the #darwinports channel on the <a
    60                         href="http://freenode.net/">Freenode IRC network</a> is generally
    61                         where we hang out.</p>
    62        
    63                 <p>Though it is generally helpful, please keep in mind that no one is
    64                         obligated to help or even answer your question if you join the IRC
    65                         channel.  Do not take it personally, simply ask your question
    66                         on the <a href="http://www.opendarwin.org/mailman/listinfo/darwinports">mailing list</a>
    67                         instead.</p>
     49                <p>For more real-time discussion, the #MacPorts channel on the <a href="http://freenode.net/">Freenode IRC network</a> is generally
     50                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
     51                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">
     52                users</a> or <a href="http://lists.macosforge.org/mailman/listinfo/macports-dev">development</a> mailing lists instead.</p>
    6853
    6954        </div>
  • trunk/www/includes/common.inc

    r19376 r28303  
    66######################################################################
    77
    8 # print the current darwinports version
    9 $dp_version = "1.3.2";
    10 $dp_version_dmg = "1.3.1";
     8# print the current MacPorts version
     9$mp_version = "1.5.2";
     10$mp_version_dmg = "1.5.0";
    1111
    1212######################################################################
     
    2222    <title><?php echo("$title"); ?></title>
    2323    <meta http-equiv="Content-type" content="text/html; charset=<?php echo("$encoding"); ?>" />
    24     <meta name="author" content="Jim Mock (mij@opendarwin.org)" />
     24    <meta name="author" content="Jim Mock (mij@macports.org)" />
    2525    <meta name="copyright" content="2003, OpenDarwin" />
     26    <meta name="author" content="Juan Manuel Palacios (jmpp@macports.org)" />
     27    <meta name="copyright" content="2007, MacPorts Team" />
    2628    <meta name="robots" content="all" />
    27     <link rel="stylesheet" type="text/css" href="/dp.css" />
    28     <link rel="alternate" type="application/rss+xml" href="http://www.darwinports.org/dp_news.xml" />
     29    <link rel="stylesheet" type="text/css" href="/macports/mp.css" />
     30    <link rel="alternate" type="application/rss+xml" href="/macports/mp_news.xml" />
    2931  </head>
    3032
     
    3638
    3739<?php
    38   include("$DOCUMENT_ROOT/includes/header.inc");
     40  include("$DOCUMENT_ROOT/macports/includes/header.inc");
    3941}
    4042
     
    4547  global $DOCUMENT_ROOT;
    4648
    47   include("$DOCUMENT_ROOT/includes/footer.inc");
     49  include("$DOCUMENT_ROOT/macports/includes/footer.inc");
    4850
    4951  echo "  </body>\n";
     
    5153}
    5254
     55######################################################################
     56
     57# Print a total count of currently available ports:
     58function ports_count() {
     59         $result = mysql_query("SELECT count(*) FROM macports.portfiles");
     60         if ($result) {
     61           $row = mysql_fetch_array($result);
     62           $count = $row[0];
     63         } else {
     64           $count = 0;
     65         }
     66         return $count;
     67}
     68
    5369######################################################################
     70
     71# Warn against darwinports.com leach!
    5472function check_referer() {
    5573        global $_SERVER;
     
    5775?>
    5876        <div class="referer_box">
    59                 <h1>The Official DarwinPorts Web Site</h1>
     77                <h1>The Official MacPorts Web Site, home of the project previously known as DarwinPorts</h1>
    6078               
    61                 <p>You have arrived at the <b>Official DarwinPorts Web Site</b> from <i>darwinports.com</i>.</p>
     79                <p>You have arrived at the <b>Official MacPorts Web Site</b> from <i>darwinports.com</i>.</p>
    6280         
    63                 <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>
     81                <p><i>darwinports.com</i> <b>is not the official MacPorts Web Site</b>, nor is it a mirror of
     82                the <i>Official MacPorts Web Site</i>.  There is <b>no relationship</b> between the <i>MacPorts
     83                Project</i> and <i>darwinports.com</i>.</p>
    6484
    65                 <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>
     85                <p>The information you may have been presented with on <i>darwinports.com</i> may be incorrect
     86                or outdated and is not endorsed in any way by the <i>MacPorts Project</i>. For the most accurate
     87                information about MacPorts, please bookmark this site, <a href="http://www.macports.org">http://www.macports.org</a>.</p>
    6688        </div>
    6789
  • trunk/www/includes/email.inc

    r19376 r28303  
    66function obfuscate_email($email)
    77{
    8         return "<span class='email'>".str_replace('@', "<img src='/img/at.gif' alt='at' style='width: 1em; height: 1em;' border='0' />", $email)."</span>";
     8        return "<span class='email'>".str_replace('@', "<img src='/macports/img/at.gif' alt='at' style='width: 1em; height: 1em;' border='0' />", $email)."</span>";
    99}
    1010
  • trunk/www/includes/footer.inc

    r19376 r28303  
    1       <div id="footer">
    2                 <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>
    3         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>
    4       </div>
     1    <div id="footer">
     2        <span class="languages">English, <a href="/macports/fr/">Fran&ccedil;ais</a>, <a href="/macports/es/">Espa&ntilde;ol</a>,
     3            <a href="/macports/ru/">Russian</a>, <a href="/macports/it/">Italiano</a></span>
     4        Copyright &copy; 2002-<? print date("Y"); ?>, <a href="http://www.macports.org/">MacPorts</a>. All rights reserved. |
     5            <a href="/macports/mp_news.xml">RSS feed</a>
     6    </div>
  • trunk/www/includes/header.inc

    r19376 r28303  
    11      <div id="nav">
    22        <div id="logo">
    3           <a href="/" title="DarwinPorts"><img src="/img/dp.jpg"
    4             alt="DarwinPorts" /></a>
     3          <a href="/macports/" title="MacPorts"><img src="/macports/img/dp.jpg"
     4            alt="MacPorts" /></a>
    55        </div>
    66        <div id="l">
     
    88          <?php
    99            $PHP_SELF = $_SERVER['PHP_SELF'];
    10             $home = '/index.php';
    11             $getdp = '/getdp/index.php';
    12             $ports = '/ports/index.php';
    13             $help = '/help/index.php';
     10            $home = '/macports/index.php';
     11            $getdp = '/macports/getmp.php';
     12            $ports = '/macports/ports.php';
     13            $help = '/macports/help.php';
    1414
    1515            if($PHP_SELF == $home) {
    16               echo "<li class=\"selected\"><a href=\"/\" title=\"DarwinPorts Home\">DarwinPorts Home</a></li>\n";
     16              echo "<li class=\"selected\"><a href=\"/macports/index.php\" title=\"MacPorts Home\">MacPorts Home</a></li>\n";
    1717            }
    1818            else {
    19               echo "<li><a href=\"/\" title=\"DarwinPorts Home\">DarwinPorts Home</a></li>\n";
     19              echo "<li><a href=\"/macports/index.php\" title=\"MacPorts Home\">MacPorts Home</a></li>\n";
    2020            }
    21             if($PHP_SELF == $getdp) {
    22               echo "<li class=\"selected\"><a href=\"/getdp/\" title=\"Get DarwinPorts\">Get DarwinPorts</a></li>\n";
     21            if($PHP_SELF == $getmp) {
     22              echo "<li class=\"selected\"><a href=\"/macports/getmp.php\" title=\"Get MacPorts\">Get MacPorts</a></li>\n";
    2323            }
    2424            else {
    25               echo "<li><a href=\"/getdp/\" title=\"Get DarwinPorts\">Get DarwinPorts</a></li>\n";
     25              echo "<li><a href=\"/macports/getmp.php\" title=\"Get MacPorts\">Get MacPorts</a></li>\n";
    2626            }
    2727          ?>
    28             <li class="last"><a href="http://www.opendarwin.org/bugzilla/" title="Bugzilla">Bugzilla</a></li>
     28            <li class="last"><a href="http://trac.macports.org/" title="Bugzilla">Support & Development</a></li>
    2929          </ul>
    3030        </div>
    3131        <div id="r">
    3232          <ul>
    33             <li><a href="/docs/" title="Documentation">Documentation</a></li>
     33            <li><a href="/macports/docs/" title="Documentation">Documentation</a></li>
    3434            <?php
    3535              if($PHP_SELF == $ports) {
    36                 echo "<li class=\"selected\"><a href=\"/ports/\" title=\"Available Ports\">Available Ports</a></li>\n";
     36                echo "<li class=\"selected\"><a href=\"/macports/ports.php\" title=\"Available Ports\">Available Ports</a></li>\n";
    3737              }
    3838              else {
    39                 echo "<li><a href=\"/ports/\" title=\"Available Ports\">Available Ports</a></li>\n";
     39                echo "<li><a href=\"/macports/ports.php\" title=\"Available Ports\">Available Ports</a></li>\n";
    4040              }
    4141              if($PHP_SELF == $help) {
    42                 echo "<li class=\"sellast\"><a href=\"/help/\" title=\"Get Help\">Get Help</a></li>\n";
     42                echo "<li class=\"sellast\"><a href=\"/macports/help.php\" title=\"Get Help\">Get Help</a></li>\n";
    4343              }
    4444              else {
    45                 echo "<li class=\"last\"><a href=\"/help/\" title=\"Get Help\">Get Help</a></li>\n";
     45                echo "<li class=\"last\"><a href=\"/macports/help.php\" title=\"Get Help\">Get Help</a></li>\n";
    4646              }
    4747            ?>
  • trunk/www/includes/lang.inc

    r19376 r28303  
    1       <p id="lang">[ <a href="/">English</a>, <a
    2         href="/ja/">Japanese</a>, <a href="/fr/">Fran&ccedil;ais</a>, <a
    3         href="/es/">Espa&ntilde;ol</a> ]</p>
     1      <p id="lang">[ <a href="/macports/">English</a>, <a
     2        href="/macports/ja/">Japanese</a>, <a href="/macports/fr/">Fran&ccedil;ais</a>, <a
     3        href="/macports/es/">Espa&ntilde;ol</a> ]</p>
  • trunk/www/includes/news.inc

    r28240 r28303  
    99$DOCUMENT_ROOT = $_SERVER['DOCUMENT_ROOT'];
    1010$PHP_SELF = $_SERVER['PHP_SELF'];
    11 include_once("$DOCUMENT_ROOT/includes/db.inc");
     11/* include_once("$DOCUMENT_ROOT/macports/includes/db.inc"); */
    1212$connect = mysql_pconnect($host, $user, $pass) or die("Can't connect to db!");
    1313mysql_select_db($db);
     
    2727  }
    2828
    29   $open = fopen("$DOCUMENT_ROOT/dp_news.xml", "w+");
     29  $open = fopen("$DOCUMENT_ROOT/mp_news.xml", "w+");
    3030  $rssdate = substr_replace(date("Y-m-d\TH:i:sO", time()),':', -2, 0);
    3131
    32   $rss = "<?xml version=\"1.0\" encoding=\"iso-8859-1\"?>\n";
     32  $rss = "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n";
    3333  $rss .= "<rss version=\"2.0\"\n";
    3434  $rss .= "  xmlns:dc=\"http://purl.org/dc/elements/1.1/\"\n";
     
    3939
    4040  $rss .= "  <channel>\n";
    41   $rss .= "    <title>DarwinPorts Project News</title>\n";
    42   $rss .= "    <link>http://www.darwinports.org/</link>\n";
    43   $rss .= "    <description>DarwinPorts Project News</description>\n";
     41  $rss .= "    <title>MacPorts Project News</title>\n";
     42  $rss .= "    <link>http://www.macports.org/</link>\n";
     43  $rss .= "    <description>MacPorts Project News</description>\n";
    4444  $rss .= "    <dc:language>en-us</dc:language>\n";
    45   $rss .= "    <dc:creator>Jim Mock (mij@opendarwin.org)</dc:creator>\n";
    46   $rss .= "    <dc:rights>Copyright 2002-2003</dc:rights>\n";
     45  $rss .= "    <dc:creator>Jim Mock (mij@macports.org)</dc:creator>\n";
     46  $rss .= "    <dc:rights>Copyright 2002-2007</dc:rights>\n";
    4747  $rss .= "    <dc:date>$rssdate</dc:date>\n";
    48   $rss .= "    <admin:errorReportsTo rdf:resource=\"mailto:mij@opendarwin.org\" />\n";
     48  $rss .= "    <admin:errorReportsTo rdf:resource=\"mailto:mij@macports.org\" />\n";
    4949
    5050  if(mysql_num_rows($result) > 0) {
     
    5252      $rss .= "    <item>\n";
    5353      $rss .= "      <title>$row->title</title>\n";
    54       $rss .= "      <link>http://www.darwinports.org/archives.php?id=$row->id</link>\n";
     54      $rss .= "      <link>http://www.macports.org/archives.php?id=$row->id</link>\n";
    5555
    5656      $desc_query = "SELECT SUBSTRING_INDEX(news, ' ', 26) FROM headlines WHERE id=$row->id";
     
    6161
    6262      $rss .= "      <description><![CDATA[$description...</p>]]></description>\n";
    63       $rss .= "      <guid isPermaLink=\"true\">http://www.darwinports.org/archives.php?id=$row->id</guid>\n";
     63      $rss .= "      <guid isPermaLink=\"true\">http://www.macports.org/archives.php?id=$row->id</guid>\n";
    6464      $rss .= "      <content:encoded><![CDATA[$row->news]]></content:encoded>\n";
    6565      $rss .= "    </item>\n";
     
    156156        die("Error: $result.");
    157157      }
    158       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";
     158      echo "<p>The addition was successful.  You can either <a href=\"/macports/admin/list.php\">list all existing headlines,
     159      <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";
    159160      create_rss();
    160161    }
     
    219220        die("Error: $result.");
    220221      }
    221       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";
     222      echo "<p>The update was successful.  You can either <a href=\"/macports/admin/list.php\">list all existing headlines,
     223      <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";
    222224      create_rss();
    223225    }
     
    239241  global $connect;
    240242
    241   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";
     243  echo "<p>Below is a list of all existing news headlines.  They can be viewed, edited, or deleted from this interface.
     244  Alternatively, you can also <a href=\"/macports/admin/add.php\">add news</a>.</p>\n\n";
    242245
    243246  $query = "SELECT id, title, DATE_FORMAT(timestamp, '%e %b %Y, %l:%i %p') AS f_timestamp FROM headlines ORDER BY id DESC";
     
    248251  if(mysql_num_rows($result) > 0) {
    249252    while($row = mysql_fetch_object($result)) {
    250       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";
     253      echo "<p><a href=\"/macports/archives.php?id=$row->id\">$row->title</a><br />&nbsp&nbsp;$row->f_timestamp&nbsp;&nbsp;|&nbsp;&nbsp;
     254           <a href=\"/macports/admin/edit.php?id=$row->id\">edit</a></p>\n\n";
    251255    }
    252256  }
     
    270274  if(mysql_num_rows($result) > 0) {
    271275    while($row = mysql_fetch_object($result)) {
    272       echo "<p><a href=\"/archives.php?id=$row->id\">$row->title</a><br />&nbsp&nbsp;$row->f_timestamp</p>\n\n";
     276      echo "<p><a href=\"/macports/archives.php?id=$row->id\">$row->title</a><br />&nbsp&nbsp;$row->f_timestamp</p>\n\n";
    273277    }
    274278  }
  • trunk/www/index.php

    r19376 r28303  
    11  <?php
    22    $DOCUMENT_ROOT = $_SERVER['DOCUMENT_ROOT'];
    3     include_once("$DOCUMENT_ROOT/includes/common.inc");
    4     include_once("$DOCUMENT_ROOT/includes/functions.inc");
    5     include_once("$DOCUMENT_ROOT/includes/db.inc");
    6     print_header('DarwinPorts Home', 'iso-8859-1');
     3    include_once("$DOCUMENT_ROOT/macports/includes/common.inc");
     4    include_once("$DOCUMENT_ROOT/macports/includes/news.inc");
     5    print_header('MacPorts Home', 'utf-8');
    76  ?>
    87
    98    <div id="content">
    10       <h2 class="hdr">Introduction to DarwinPorts</h2>
     9      <h2 class="hdr">Introduction to MacPorts</h2>
    1110
    12       <p>The DarwinPorts Project's main goal is to provide an easy way to
    13         install various open-source software products on the Darwin OS
    14         family (<a href="http://www.opendarwin.org/">OpenDarwin</a>,
    15         <a href="http://www.apple.com/macosx/">Mac OS X</a> and
    16         <a href="http://developer.apple.com/darwin/projects/darwin/">Darwin</a>)</p>
    17 <?
    18                 $result = mysql_query("SELECT count(*) from darwinports.portfiles");
    19                 if ($result) {
    20                         $row = mysql_fetch_array($result);
    21                         $count = $row[0];
    22                 } else {
    23                         $count = 0;
    24                 }
    25 ?>
    26       <p>There are currently about <?= $count; ?> completed and usable
    27         <a href="/ports/">ports</a>, with more being added on a regular basis.
     11      <p>The MacPorts Project's main goal is to provide an easy way to
     12        install various open-source software products on the <a
     13        href="http://www.apple.com/macosx/">Mac OS X</a> operating system.</p>
     14
     15      <p>There are currently about <?= ports_count(); ?> completed and usable
     16        <a href="/macports/ports.php">ports</a>, with more being added on a regular basis.
    2817        You can track recently added ports by subscribing to the <a
    29         href="http://www.opendarwin.org/mailman/listinfo/cvs-darwinports-all">cvs-darwinports-all</a>
     18        href="http://lists.macosforge.org/mailman/listinfo/macports-changes">macports-changes</a>
    3019        mailing list.</p>
    3120       
    32       <p>For more information on obtaining and installing DarwinPorts,
    33         please see the <a href="/getdp/">Get DarwinPorts</a> section of the
    34         site.  Also be sure to check out the <a href="/docs/">documentation</a>,
     21      <p>For more information on obtaining and installing MacPorts,
     22        please see the <a href="/macports/getmp.php">Get MacPorts</a> section of this
     23        site.  Also be sure to check out the <a href="http://geeklair.net/new_macports_guide/">documentation</a>,
    3524        and if you have questions or run into problems, you can get help at our <a
    36         href="/help/">help section</a>. The <a href="http://wiki.opendarwin.org/index.php/DarwinPorts">DarwinPorts Wiki</a>
     25        href="/macports/help.php">help section</a>. The <a href="http://trac.macports.org/projects/macports/wiki">MacPorts Wiki</a>
    3726        is also a good resource for general and miscellaneous help, specially the
    38         ongoing <a href="http://wiki.opendarwin.org/index.php/DarwinPorts:FAQ">FAQ</a> effort.</p>
     27        ongoing <a href="http://trac.macports.org/projects/macports/wiki/FAQ">FAQ</a> effort.</p>
    3928
    40       <p>Bug reports, feature requests, and new ports should be submitted to
    41         <a href="http://www.opendarwin.org/bugzilla/">Bugzilla</a>. Please consult
    42     the <a href="docs/ch01s05.html#user_bugs">Bug report documentation</a>
    43     to improve the processing of your bug report(s).</p>
     29      <p>Bug reports, feature requests, and new ports should be submitted as
     30        <a href="http://trac.macports.org/projects/macports/newticket">new tickets</a> into our Trac system. Please consult
     31    the <a href="http://geeklair.net/new_macports_guide/#project.tickets"> documentation</a>
     32    to improve the processing of your ticket(s).</p>
    4433
    45     <p>For information on becoming an official member of the DarwinPorts project
    46     with write access to our CVS repository, please consult the <a href="/docs/ch16.html">relevant documentation</a>
     34    <p>For information on becoming an official member of the MacPorts project
     35    with write access to our subversion repository, please consult the
     36    <a href="http://geeklair.net/new_macports_guide/#project.membership">relevant documentation</a>
    4737    detailing our membership requirements and resulting duties &amp; benefits
    48     from holding an OpenDarwin account.</p>
     38    from holding a MacPorts account.</p>
    4939
    50     <p><b>Current DarwinPorts <a href="/getdp/">release</a>: <? print "$dp_version"; ?></b></p>
     40    <p><b>Current MacPorts <a href="/macports/getmp.php">release</a>: <? print "$mp_version"; ?></b></p>
    5141
    5242      <div id="news">
     
    5747        ?>
    5848
    59                 <p>You can also browse our <a href="archives.php">news archives</a>.</p>
     49                <p>You can also browse our <a href="/macports/archives.php">news archives</a>.</p>
    6050       
    6151      </div>
  • trunk/www/ports.php

    r19376 r28303  
    11<?php
    22        $DOCUMENT_ROOT = $_SERVER['DOCUMENT_ROOT'];
    3         include_once("$DOCUMENT_ROOT/includes/common.inc");
    4         include_once("$DOCUMENT_ROOT/includes/db.inc");
    5         include_once("$DOCUMENT_ROOT/includes/email.inc");
    6         print_header('Available Ports', 'iso-8859-1');
     3        include_once("$DOCUMENT_ROOT/macports/includes/common.inc");
     4        include_once("$DOCUMENT_ROOT/macports/includes/email.inc");
     5        print_header('Available Ports', 'utf-8');
    76        $by = isset($_GET['by']) ? $_GET['by'] : '';
    87        $substr = isset($_GET['substr']) ? $_GET['substr'] : '';
    98?>
    109        <center>
    11         <h1>DarwinPorts Portfiles</h1>
     10        <h1>MacPorts Portfiles</h1>
    1211        </center>
    1312
    1413        <p>
    15         This form allows you to search the current index of DarwinPorts software. <br />
     14        This form allows you to search the current index of MacPorts software. <br />
    1615        <i>Index last updated: </i>
    1716        <?php
    18                 $sql = "SELECT UNIX_TIMESTAMP(activity_time) FROM darwinports.log ORDER BY UNIX_TIMESTAMP(activity_time) DESC";
     17                $sql = "SELECT UNIX_TIMESTAMP(activity_time) FROM macports.log ORDER BY UNIX_TIMESTAMP(activity_time) DESC";
    1918                $result = mysql_query($sql);
    2019                if($result && $row = mysql_fetch_row($result)) {
     
    4241                <tr>
    4342<?php
    44                 $result = mysql_query("SELECT count(*) from darwinports.portfiles");
     43                $result = mysql_query("SELECT count(*) from macports.portfiles");
    4544                if ($result) {
    4645                        $row = mysql_fetch_array($result);
     
    5857                <tr><th colspan="4" align="left">View By Category:</th></tr>
    5958                <?php
    60                                 $query = "SELECT DISTINCT category FROM darwinports.categories ORDER BY category";
     59                                $query = "SELECT DISTINCT category FROM macports.categories ORDER BY category";
    6160                                $result = mysql_query($query);
    6261                                if($result) {
     
    7675                $fields = "name, path, version, description";
    7776                $query = "1";
    78                 $tables = "darwinports.portfiles p";
     77                $tables = "macports.portfiles p";
    7978                if ($by == "name") {
    8079                        $query .= " AND p.name LIKE '%" . mysql_real_escape_string($substr) . "%'";
     
    8786                }
    8887                if ($by == "cat") {
    89                         $tables .= ", darwinports.categories c";
     88                        $tables .= ", macports.categories c";
    9089                        $query .= " AND c.portfile=p.name AND c.category='" . mysql_real_escape_string($substr) . "'";
    9190                }
    9291                if ($by == "variant") {
    93                         $tables .= ", darwinports.variants v";
     92                        $tables .= ", macports.variants v";
    9493                        $query .= " AND v.portfile=p.name AND v.variant='" . mysql_real_escape_string($substr) . "'";
    9594                }
    9695                if ($by == "platform") {
    97                         $tables .= ", darwinports.platforms pl";
     96                        $tables .= ", macports.platforms pl";
    9897                        $query .= " AND pl.portfile=p.name AND pl.platform ='" . mysql_real_escape_string($substr) . "'";
    9998                }
    10099                if ($by == "maintainer") {
    101                         $tables .= ", darwinports.maintainers m";
     100                        $tables .= ", macports.maintainers m";
    102101                        $query .= " AND m.portfile=p.name AND m.maintainer LIKE '%" . mysql_real_escape_string($substr) . "%'";
    103102                }
     
    113112                        while( $row = mysql_fetch_assoc($result) ) {
    114113?>
    115         <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>
     114        <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>
    116115        <dd>
    117116        <?php echo htmlspecialchars($row['description']); ?><br />
    118117        <?php
    119118// MAINTAINERS
    120                                 $nquery = "SELECT maintainer FROM darwinports.maintainers WHERE portfile='" . mysql_real_escape_string($row['name']) . "' ORDER BY is_primary DESC, maintainer";
     119                                $nquery = "SELECT maintainer FROM macports.maintainers WHERE portfile='" . mysql_real_escape_string($row['name']) . "' ORDER BY is_primary DESC, maintainer";
    121120                                $nresult = mysql_query($nquery);
    122121                                if ($nresult) {
     
    135134
    136135// CATEGORIES
    137                                 $nquery = "SELECT category FROM darwinports.categories WHERE portfile='" . mysql_real_escape_string($row['name']) . "' ORDER BY is_primary DESC, category";
     136                                $nquery = "SELECT category FROM macports.categories WHERE portfile='" . mysql_real_escape_string($row['name']) . "' ORDER BY is_primary DESC, category";
    138137                                $nresult = mysql_query($nquery);
    139138                                if ($nresult) {
     
    154153
    155154// PLATFORMS
    156                                 $nquery = "SELECT platform FROM darwinports.platforms WHERE portfile='" . mysql_real_escape_string($row['name']) . "' ORDER BY platform";
     155                                $nquery = "SELECT platform FROM macports.platforms WHERE portfile='" . mysql_real_escape_string($row['name']) . "' ORDER BY platform";
    157156                                $nresult = mysql_query($nquery);
    158157                                if ($nresult && mysql_num_rows($nresult) > 0) {
     
    170169
    171170// DEPENDENCIES
    172                                 $nquery = "SELECT library FROM darwinports.dependencies WHERE portfile='" . mysql_real_escape_string($row['name']) . "' ORDER BY library";
     171                                $nquery = "SELECT library FROM macports.dependencies WHERE portfile='" . mysql_real_escape_string($row['name']) . "' ORDER BY library";
    173172                                $nresult = mysql_query($nquery);
    174173                                if ($nresult && mysql_num_rows($nresult) > 0) {
     
    187186/*
    188187// VARIANTS
    189                                 $nquery = "SELECT variant FROM darwinports.variants WHERE portfile='" . mysql_real_escape_string($row['name']) . "' ORDER BY variant";
     188                                $nquery = "SELECT variant FROM macports.variants WHERE portfile='" . mysql_real_escape_string($row['name']) . "' ORDER BY variant";
    190189                                $nresult = mysql_query($nquery);
    191190                                if ($nresult && mysql_num_rows($nresult) > 0) {
Note: See TracChangeset for help on using the changeset viewer.