December 2007 - macports-changes - lists.macosforge.org

[31634] trunk/dports/python
by ram＠macports.org 01 Dec '07

01 Dec '07

Revision: 31634 http://trac.macosforge.org/projects/macports/changeset/31634 Author: ram(a)macports.org Date: 2007-11-30 18:19:34 -0800 (Fri, 30 Nov 2007) Log Message: ----------- py-matplotlib-basemap/py25-matplotlib-basemap: disable universal variant Modified Paths: -------------- trunk/dports/python/py-matplotlib-basemap/Portfile trunk/dports/python/py25-matplotlib-basemap/Portfile Modified: trunk/dports/python/py-matplotlib-basemap/Portfile =================================================================== --- trunk/dports/python/py-matplotlib-basemap/Portfile 2007-12-01 02:18:20 UTC (rev 31633) +++ trunk/dports/python/py-matplotlib-basemap/Portfile 2007-12-01 02:19:34 UTC (rev 31634) @@ -29,3 +29,5 @@ post-patch { reinplace s|@PREFIX@|${prefix}|g ${worksrcpath}/setup.py } + +universal_variant no Modified: trunk/dports/python/py25-matplotlib-basemap/Portfile =================================================================== --- trunk/dports/python/py25-matplotlib-basemap/Portfile 2007-12-01 02:18:20 UTC (rev 31633) +++ trunk/dports/python/py25-matplotlib-basemap/Portfile 2007-12-01 02:19:34 UTC (rev 31634) @@ -29,3 +29,5 @@ post-patch { reinplace s|@PREFIX@|${prefix}|g ${worksrcpath}/setup.py } + +universal_variant no

1 0

[31633] trunk/dports/python
by ram＠macports.org 01 Dec '07

01 Dec '07

Revision: 31633 http://trac.macosforge.org/projects/macports/changeset/31633 Author: ram(a)macports.org Date: 2007-11-30 18:18:20 -0800 (Fri, 30 Nov 2007) Log Message: ----------- py-gnupg/py25-gnupg: disable universal variant Modified Paths: -------------- trunk/dports/python/py-gnupg/Portfile trunk/dports/python/py25-gnupg/Portfile Modified: trunk/dports/python/py-gnupg/Portfile =================================================================== --- trunk/dports/python/py-gnupg/Portfile 2007-12-01 02:17:31 UTC (rev 31632) +++ trunk/dports/python/py-gnupg/Portfile 2007-12-01 02:18:20 UTC (rev 31633) @@ -39,3 +39,5 @@ xinstall -m 644 -W ${worksrcpath} COPYING ChangeLog NEWS README \ THANKS ${destroot}${prefix}/share/doc/${name} } + +universal_variant no Modified: trunk/dports/python/py25-gnupg/Portfile =================================================================== --- trunk/dports/python/py25-gnupg/Portfile 2007-12-01 02:17:31 UTC (rev 31632) +++ trunk/dports/python/py25-gnupg/Portfile 2007-12-01 02:18:20 UTC (rev 31633) @@ -38,3 +38,5 @@ xinstall -m 644 -W ${worksrcpath} COPYING ChangeLog NEWS README \ THANKS ${destroot}${prefix}/share/doc/${name} } + +universal_variant no

1 0

[31632] trunk/dports/python
by ram＠macports.org 01 Dec '07

01 Dec '07

Revision: 31632 http://trac.macosforge.org/projects/macports/changeset/31632 Author: ram(a)macports.org Date: 2007-11-30 18:17:31 -0800 (Fri, 30 Nov 2007) Log Message: ----------- py-boto/py25-boto: disable universal variant Modified Paths: -------------- trunk/dports/python/py-boto/Portfile trunk/dports/python/py25-boto/Portfile Modified: trunk/dports/python/py-boto/Portfile =================================================================== --- trunk/dports/python/py-boto/Portfile 2007-12-01 02:05:57 UTC (rev 31631) +++ trunk/dports/python/py-boto/Portfile 2007-12-01 02:17:31 UTC (rev 31632) @@ -25,3 +25,5 @@ delete ${destroot}${prefix}/bin/test.py delete ${destroot}${prefix}/lib/python2.4/site-packages/tests } + +universal_variant no Modified: trunk/dports/python/py25-boto/Portfile =================================================================== --- trunk/dports/python/py25-boto/Portfile 2007-12-01 02:05:57 UTC (rev 31631) +++ trunk/dports/python/py25-boto/Portfile 2007-12-01 02:17:31 UTC (rev 31632) @@ -26,3 +26,4 @@ delete ${destroot}${prefix}/lib/python2.5/site-packages/tests } +universal_variant no

1 0

[31631] trunk/www/index.php
by jmpp＠macports.org 01 Dec '07

01 Dec '07

Revision: 31631 http://trac.macosforge.org/projects/macports/changeset/31631 Author: jmpp(a)macports.org Date: 2007-11-30 18:05:57 -0800 (Fri, 30 Nov 2007) Log Message: ----------- Use caps for 'oficcial' in our main heading (but, thruth be told, this commit is mostly just testing the post-commit hook that will update our website files on the Mac OS Forge server after every commit we make to the sources). Modified Paths: -------------- trunk/www/index.php Modified: trunk/www/index.php =================================================================== --- trunk/www/index.php 2007-12-01 01:19:11 UTC (rev 31630) +++ trunk/www/index.php 2007-12-01 02:05:57 UTC (rev 31631) @@ -18,7 +18,7 @@ <div id="content"> - <h2 class="hdr">The MacPorts Project official Homepage</h2> + <h2 class="hdr">The MacPorts Project Official Homepage</h2> <p>The MacPorts Project is an open-source community initiative to design an easy-to-use system for compiling, installing, and upgrading either command-line, X11 or Aqua based open-source software on the <a href="http://www.apple.com/macosx/">

1 0

[31631] trunk/www/index.php
by jmpp＠macports.org 01 Dec '07

01 Dec '07

Revision: 31631 http://trac.macosforge.org/projects/macports/changeset/31631 Author: jmpp(a)macports.org Date: 2007-11-30 18:05:57 -0800 (Fri, 30 Nov 2007) Log Message: ----------- Use caps for 'oficcial' in our main heading (but, thruth be told, this commit is mostly just testing the post-commit hook that will update our website files on the Mac OS Forge server after every commit we make to the sources). Modified Paths: -------------- trunk/www/index.php Modified: trunk/www/index.php =================================================================== --- trunk/www/index.php 2007-12-01 01:19:11 UTC (rev 31630) +++ trunk/www/index.php 2007-12-01 02:05:57 UTC (rev 31631) @@ -18,7 +18,7 @@ <div id="content"> - <h2 class="hdr">The MacPorts Project official Homepage</h2> + <h2 class="hdr">The MacPorts Project Official Homepage</h2> <p>The MacPorts Project is an open-source community initiative to design an easy-to-use system for compiling, installing, and upgrading either command-line, X11 or Aqua based open-source software on the <a href="http://www.apple.com/macosx/">

1 0

[31630] trunk/www/index.php
by wsiegrist＠apple.com 01 Dec '07

01 Dec '07

Revision: 31630 http://trac.macosforge.org/projects/macports/changeset/31630 Author: wsiegrist(a)apple.com Date: 2007-11-30 17:19:11 -0800 (Fri, 30 Nov 2007) Log Message: ----------- removed temp mysql failure tweak Modified Paths: -------------- trunk/www/index.php Modified: trunk/www/index.php =================================================================== --- trunk/www/index.php 2007-12-01 01:09:33 UTC (rev 31629) +++ trunk/www/index.php 2007-12-01 01:19:11 UTC (rev 31630) @@ -6,7 +6,7 @@ include_once("$MPWEB/includes/common.inc"); print_header('The MacPorts Project -- Home', 'utf-8'); $portsdb_connect = mysql_connect($portsdb_host, $portsdb_user, $portsdb_passwd); - if ($portsdb_connect !== false) { + if ($portsdb_connect === false) { $port_count = 'a lot of'; $cat_count = 'many'; } else {

1 0

[31629] trunk/www
by wsiegrist＠apple.com 01 Dec '07

01 Dec '07

Revision: 31629 http://trac.macosforge.org/projects/macports/changeset/31629 Author: wsiegrist(a)apple.com Date: 2007-11-30 17:09:33 -0800 (Fri, 30 Nov 2007) Log Message: ----------- various initial tweaks to install on MacOSForge. Added graceful degradation when mysql is unavailable. Modified Paths: -------------- trunk/www/includes/common.inc trunk/www/includes/footer.inc trunk/www/index.php trunk/www/ports.php Modified: trunk/www/includes/common.inc =================================================================== --- trunk/www/includes/common.inc 2007-12-01 01:09:02 UTC (rev 31628) +++ trunk/www/includes/common.inc 2007-12-01 01:09:33 UTC (rev 31629) @@ -33,10 +33,9 @@ # Ports database connection parameters: $portsdb_host = 'localhost'; $portsdb_name = 'macports'; -$portsdb_user = 'www'; -$portsdb_passwd = ''; +$portsdb_user = 'macports'; +$portsdb_passwd = trim(file_get_contents('/opt/local/share/macports/resources/portmgr/script_data')); - ###################################################################### # Page header: @@ -99,7 +98,7 @@ # Obfuscate e-mail addresses: function obfuscate_email($email) { - $IMGDIR = dirname($_SERVER['SCRIPT_NAME']) . '/img'; + $IMGDIR = '/img'; return "<span class='email'>" . str_replace('@', "<img src='$IMGDIR/at.gif' alt='at' />", $email) . "</span>"; } @@ -113,3 +112,17 @@ include("$MPWEB/includes/footer.inc"); } + +###################################################################### + +function print_db_error() { + print " + <div id='content'> + <h2 class='hdr'>MacPorts Portfiles</h2> + <p>Our database is currently unavailable. We hope to have it back soon!</p> + </div> + "; + print_footer(); + die(); +} + Modified: trunk/www/includes/footer.inc =================================================================== --- trunk/www/includes/footer.inc 2007-12-01 01:09:02 UTC (rev 31628) +++ trunk/www/includes/footer.inc 2007-12-01 01:09:33 UTC (rev 31629) @@ -3,7 +3,7 @@ /* $Id$ */ /* Copyright (c) 2004, OpenDarwin. */ /* Copyright (c) 2004-2007, The MacPorts Project. */ - $IMGDIR = dirname($_SERVER['SCRIPT_NAME']) . '/img/'; + $IMGDIR = '/img/'; ?> Modified: trunk/www/index.php =================================================================== --- trunk/www/index.php 2007-12-01 01:09:02 UTC (rev 31628) +++ trunk/www/index.php 2007-12-01 01:09:33 UTC (rev 31629) @@ -5,7 +5,14 @@ $MPWEB = $_SERVER['DOCUMENT_ROOT'] . dirname($_SERVER['SCRIPT_NAME']); include_once("$MPWEB/includes/common.inc"); print_header('The MacPorts Project -- Home', 'utf-8'); - $portsdb_connect = mysql_pconnect($portsdb_host, $portsdb_user, $portsdb_passwd) or die("Can't connect to the MacPorts database!"); + $portsdb_connect = mysql_connect($portsdb_host, $portsdb_user, $portsdb_passwd); + if ($portsdb_connect !== false) { + $port_count = 'a lot of'; + $cat_count = 'many'; + } else { + $port_count = ports_count(); + $cat_count = categories_count(); + } ?> @@ -23,7 +30,7 @@ <p>We provide a single software tree that attempts to track the latest release of every software title (port) we distribute, without splitting them into “stable” Vs. “unstable” branches, targetting mainly the current Mac OS X release (10.5, A.K.A Leopard) and the immediately previous one (10.4, A.K.A. Tiger). There are currently <a href="ports.php"> - <b><?php print ports_count(); ?></b> ports</a> in our tree, distributed among <?php print categories_count(); ?> different + <b><?= $port_count ?></b> ports</a> in our tree, distributed among <?= $cat_count ?> different categories, and more are being added on a regular basis.</p> @@ -70,4 +77,5 @@ <?php print_footer(); + mysql_close($portsdb_connect); ?> Modified: trunk/www/ports.php =================================================================== --- trunk/www/ports.php 2007-12-01 01:09:02 UTC (rev 31628) +++ trunk/www/ports.php 2007-12-01 01:09:33 UTC (rev 31629) @@ -7,7 +7,8 @@ $MPWEB = $_SERVER['DOCUMENT_ROOT'] . dirname($_SERVER['SCRIPT_NAME']); include_once("$MPWEB/includes/common.inc"); print_header('The MacPorts Project -- Available Ports', 'utf-8'); - $portsdb_connect = mysql_pconnect($portsdb_host, $portsdb_user, $portsdb_passwd) or die("Can't connect to the MacPorts database!"); + $portsdb_connect = mysql_connect($portsdb_host, $portsdb_user, $portsdb_passwd) or print_db_error(); + $num_categories = categories_count(); $by = isset($_GET['by']) ? $_GET['by'] : ''; $substr = isset($_GET['substr']) ? $_GET['substr'] : ''; @@ -263,4 +264,5 @@ <?php print_footer(); + mysql_close($portsdb_connect); ?>

1 0

[31628] trunk/www/macports.css
by jmpp＠macports.org 01 Dec '07

01 Dec '07

Revision: 31628 http://trac.macosforge.org/projects/macports/changeset/31628 Author: jmpp(a)macports.org Date: 2007-11-30 17:09:02 -0800 (Fri, 30 Nov 2007) Log Message: ----------- Missed turning this rule into a class type for the warnings block. Modified Paths: -------------- trunk/www/macports.css Modified: trunk/www/macports.css =================================================================== --- trunk/www/macports.css 2007-12-01 01:00:32 UTC (rev 31627) +++ trunk/www/macports.css 2007-12-01 01:09:02 UTC (rev 31628) @@ -159,7 +159,7 @@ font-weight: bold; } -#warnings { +.warnings { background: #FCC; border: 2px solid #F66; padding: 6px;

1 0

[31627] trunk/www
by jmpp＠macports.org 01 Dec '07

01 Dec '07

Revision: 31627 http://trac.macosforge.org/projects/macports/changeset/31627 Author: jmpp(a)macports.org Date: 2007-11-30 17:00:32 -0800 (Fri, 30 Nov 2007) Log Message: ----------- Turn warning boxes into classes until I can figure out a smarter way of outputting the div delimiters in case there are no warnings to print (currently, if we're running from www.macports.org and we're not referred to it by our beloved leech, no warnings are printed but the divs still are -- since they're outside the if conditionals --, which gives us a resulting empty & meaningless pink box at the top of our pages). Modified Paths: -------------- trunk/www/includes/warnings.inc trunk/www/macports.css Modified: trunk/www/includes/warnings.inc =================================================================== --- trunk/www/includes/warnings.inc 2007-11-30 23:25:39 UTC (rev 31626) +++ trunk/www/includes/warnings.inc 2007-12-01 01:00:32 UTC (rev 31627) @@ -5,13 +5,13 @@ ?> -<div id="warnings"> - <?php # Warning against darwinports.com leech! if (isset($_SERVER['HTTP_REFERER']) && strpos($_SERVER['HTTP_REFERER'], 'darwinports.com') !== false) { ?> + <div class="warnings"> + <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 MacPorts Web Site</b>, nor is it a mirror of the <i>Official MacPorts Web @@ -20,6 +20,8 @@ <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 <i>The 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 } @@ -28,11 +30,13 @@ if (isset($_SERVER['HTTP_HOST']) && !preg_match('%(^|\.)macports\.org$%', $_SERVER['HTTP_HOST'])) { ?> + <div class="warnings"> + <p>Warning: This is a temporary installation of the new & re-designed website for The MacPorts Project. Official site is located at <a href="http://www.macports.org">http://www.macports.org</a> as always.</p> + + </div> <?php } ?> - -</div> Modified: trunk/www/macports.css =================================================================== --- trunk/www/macports.css 2007-11-30 23:25:39 UTC (rev 31626) +++ trunk/www/macports.css 2007-12-01 01:00:32 UTC (rev 31627) @@ -168,11 +168,11 @@ max-width: 670px; } -#warnings p { +.warnings p { margin: 1em 0 0 0; } -#warnings p:first-child { +.warnings p:first-child { margin: 0; }

1 0

[31626] branches/release_1_6/base/portmgr/jobs
by wsiegrist＠apple.com 01 Dec '07

01 Dec '07

Revision: 31626 http://trac.macosforge.org/projects/macports/changeset/31626 Author: wsiegrist(a)apple.com Date: 2007-11-30 15:25:39 -0800 (Fri, 30 Nov 2007) Log Message: ----------- Changed user for PortIndex2MySQL to "mysql" which is a more reasonable default. Created initial mpryncup plist. Modified Paths: -------------- branches/release_1_6/base/portmgr/jobs/org.macports.PortIndex2MySQL.plist branches/release_1_6/base/portmgr/jobs/org.macports.mprsyncup.plist Modified: branches/release_1_6/base/portmgr/jobs/org.macports.PortIndex2MySQL.plist =================================================================== --- branches/release_1_6/base/portmgr/jobs/org.macports.PortIndex2MySQL.plist 2007-11-30 21:14:51 UTC (rev 31625) +++ branches/release_1_6/base/portmgr/jobs/org.macports.PortIndex2MySQL.plist 2007-11-30 23:25:39 UTC (rev 31626) @@ -24,6 +24,6 @@ </dict> </array> <key>UserName</key> - <string>jmpp</string> + <string>mysql</string> </dict> </plist> Modified: branches/release_1_6/base/portmgr/jobs/org.macports.mprsyncup.plist =================================================================== --- branches/release_1_6/base/portmgr/jobs/org.macports.mprsyncup.plist 2007-11-30 21:14:51 UTC (rev 31625) +++ branches/release_1_6/base/portmgr/jobs/org.macports.mprsyncup.plist 2007-11-30 23:25:39 UTC (rev 31626) @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> +<plist version="1.0"> + <dict> + <key>Label</key> + <string>org.macports.mpryncup</string> + <key>ProgramArguments</key> + <array> + <string>/opt/local/share/macports/resources/portmgr/mprsyncup</string> + </array> + <key>StartCalendarInterval</key> + <array> + <dict> + <key>Minute</key> + <integer>00</integer> + </dict> + <dict> + <key>Minute</key> + <integer>30</integer> + </dict> + </array> + </dict> +</plist>

1 0