June 2008 - macports-changes - lists.macosforge.org

[37322] trunk/dports/textproc/libxml2/Portfile
by ryandesign＠macports.org 03 Jun '08

03 Jun '08

Revision: 37322 http://trac.macosforge.org/projects/macports/changeset/37322 Author: ryandesign(a)macports.org Date: 2008-06-02 20:37:33 -0700 (Mon, 02 Jun 2008) Log Message: ----------- libxml2: fix parallel build; closes #15295; maintainer timeout Modified Paths: -------------- trunk/dports/textproc/libxml2/Portfile Modified: trunk/dports/textproc/libxml2/Portfile =================================================================== --- trunk/dports/textproc/libxml2/Portfile 2008-06-03 03:19:42 UTC (rev 37321) +++ trunk/dports/textproc/libxml2/Portfile 2008-06-03 03:37:33 UTC (rev 37322) @@ -39,6 +39,12 @@ use_parallel_build yes +pre-destroot { + # Work around parallel build issue with MacPorts 1.6.0. + # Remove when MacPorts 1.7.0 is released. + xinstall -d ${destroot}${prefix}/include/libxml2/libxml +} + test.run yes test.target check

1 0

[37321] trunk/dports/databases/db3/Portfile
by ryandesign＠macports.org 03 Jun '08

03 Jun '08

Revision: 37321 http://trac.macosforge.org/projects/macports/changeset/37321 Author: ryandesign(a)macports.org Date: 2008-06-02 20:19:42 -0700 (Mon, 02 Jun 2008) Log Message: ----------- db3: enable parallel build; closes #15328 (maintainer timeout) Modified Paths: -------------- trunk/dports/databases/db3/Portfile Modified: trunk/dports/databases/db3/Portfile =================================================================== --- trunk/dports/databases/db3/Portfile 2008-06-03 03:17:49 UTC (rev 37320) +++ trunk/dports/databases/db3/Portfile 2008-06-03 03:19:42 UTC (rev 37321) @@ -9,6 +9,7 @@ description The Berkeley DB package, revision 3 homepage http://www.sleepycat.com/update/ platforms darwin freebsd +use_parallel_build yes master_sites http://download.oracle.com/berkeley-db/ distname db-${version} checksums md5 b6ae24fa55713f17a9ac3219d987722c

1 0

[37320] trunk/dports/www/apache2/Portfile
by ryandesign＠macports.org 03 Jun '08

03 Jun '08

Revision: 37320 http://trac.macosforge.org/projects/macports/changeset/37320 Author: ryandesign(a)macports.org Date: 2008-06-02 20:17:49 -0700 (Mon, 02 Jun 2008) Log Message: ----------- apache2: enable parallel build; #15329; maintainer timeout Modified Paths: -------------- trunk/dports/www/apache2/Portfile Modified: trunk/dports/www/apache2/Portfile =================================================================== --- trunk/dports/www/apache2/Portfile 2008-06-03 01:44:33 UTC (rev 37319) +++ trunk/dports/www/apache2/Portfile 2008-06-03 03:17:49 UTC (rev 37320) @@ -20,6 +20,7 @@ master_sites apache:httpd distname httpd-${version} use_bzip2 yes +use_parallel_build yes checksums md5 76d2598a4797163d07cd50e5304aa7cd \ sha1 5074904435d3d942ce2dc96c44b07294b8eaca77 \

1 0

[37319] trunk/dports/devel/gc-utils
by ram＠macports.org 03 Jun '08

03 Jun '08

Revision: 37319 http://trac.macosforge.org/projects/macports/changeset/37319 Author: ram(a)macports.org Date: 2008-06-02 18:44:33 -0700 (Mon, 02 Jun 2008) Log Message: ----------- devel/gc-utils: update to 0.2.2 Modified Paths: -------------- trunk/dports/devel/gc-utils/Portfile Removed Paths: ------------- trunk/dports/devel/gc-utils/files/ Modified: trunk/dports/devel/gc-utils/Portfile =================================================================== --- trunk/dports/devel/gc-utils/Portfile 2008-06-03 00:31:21 UTC (rev 37318) +++ trunk/dports/devel/gc-utils/Portfile 2008-06-03 01:44:33 UTC (rev 37319) @@ -3,7 +3,7 @@ PortSystem 1.0 name gc-utils -version 0.2.0 +version 0.2.2 categories devel platforms darwin maintainers ram openmaintainer @@ -16,18 +16,15 @@ homepage http://gcutils.sourceforge.net/ master_sites sourceforge:gcutils -distname ${name}_${version} +distname ${name}_v${version} -checksums md5 1a0c74efe50576d8edd62ef8049ea339 \ - sha1 0fa82e7e88a758c3bdd8ca8a8c443ba4d1fa1d8f \ - rmd160 5abd85eef3afcc7efd64a2e01ae0b53f8efa698f +checksums md5 bcd2bee2a3aaff8b543be3a6a6c6f19e \ + sha1 92bf6efc6a868158a12a753b54123392ebd1096a \ + rmd160 4243717df78fbb1018fb23054ba6a577db1f603f depends_lib port:git-core \ port:cvsps \ - port:coreutils -patchfiles patch-ginstall.diff - worksrcdir ${name} use_configure no

1 0

[37318] trunk/dports/databases
by ryandesign＠macports.org 03 Jun '08

03 Jun '08

Revision: 37318 http://trac.macosforge.org/projects/macports/changeset/37318 Author: ryandesign(a)macports.org Date: 2008-06-02 17:31:21 -0700 (Mon, 02 Jun 2008) Log Message: ----------- mysql3, mysql4: enable parallel build Modified Paths: -------------- trunk/dports/databases/mysql3/Portfile trunk/dports/databases/mysql4/Portfile Modified: trunk/dports/databases/mysql3/Portfile =================================================================== --- trunk/dports/databases/mysql3/Portfile 2008-06-03 00:25:03 UTC (rev 37317) +++ trunk/dports/databases/mysql3/Portfile 2008-06-03 00:31:21 UTC (rev 37318) @@ -8,6 +8,7 @@ description Multithreaded SQL database server homepage http://www.mysql.com/ platforms darwin +use_parallel_build yes long_description MySQL is an open-source, multi-threaded SQL database \ with a command syntax very similar to mSQL. Modified: trunk/dports/databases/mysql4/Portfile =================================================================== --- trunk/dports/databases/mysql4/Portfile 2008-06-03 00:25:03 UTC (rev 37317) +++ trunk/dports/databases/mysql4/Portfile 2008-06-03 00:31:21 UTC (rev 37318) @@ -10,6 +10,7 @@ with a command syntax very similar to mSQL. homepage http://www.mysql.com/ platforms darwin +use_parallel_build yes set sitedir Downloads/MySQL-4.1/ master_sites http://www.mirrorservice.org/sites/ftp.mysql.com/${sitedir} \

1 0

[37317] trunk/dports/graphics/graphviz-devel/Portfile
by ryandesign＠macports.org 03 Jun '08

03 Jun '08

Revision: 37317 http://trac.macosforge.org/projects/macports/changeset/37317 Author: ryandesign(a)macports.org Date: 2008-06-02 17:25:03 -0700 (Mon, 02 Jun 2008) Log Message: ----------- graphviz-devel: update to 2.19.20080602.0445 Modified Paths: -------------- trunk/dports/graphics/graphviz-devel/Portfile Modified: trunk/dports/graphics/graphviz-devel/Portfile =================================================================== --- trunk/dports/graphics/graphviz-devel/Portfile 2008-06-02 23:37:43 UTC (rev 37316) +++ trunk/dports/graphics/graphviz-devel/Portfile 2008-06-03 00:25:03 UTC (rev 37317) @@ -4,7 +4,7 @@ name graphviz-devel set my_name graphviz -version 2.19.20080528.0445 +version 2.19.20080602.0445 categories graphics maintainers ryandesign homepage http://www.graphviz.org/ @@ -35,9 +35,9 @@ checksums \ ${distname}${extract.suffix} \ - md5 b943722a0c72fe63c3166700e9134130 \ - sha1 444b3c441ac39b4ae290ea0d541e305a1ec6803e \ - rmd160 49fe1ad5df3428a7d15391626ec2df408118e5da + md5 c0c211b5346aee2fbdfa9c0c6fbc1973 \ + sha1 ddc8fbe5a9ce250f2e9bab2284cbc5e8d46943f4 \ + rmd160 a2ebe10de03b5d7e4f7c10db98526a59b7ba5ad1 platform darwin 6 { pre-fetch {

1 0

[37316] trunk/base/src
by raimue＠macports.org 02 Jun '08

02 Jun '08

Revision: 37316 http://trac.macosforge.org/projects/macports/changeset/37316 Author: raimue(a)macports.org Date: 2008-06-02 16:37:43 -0700 (Mon, 02 Jun 2008) Log Message: ----------- port/port.tcl, macports1.0/macports.tcl: Use current terminal size instead of a hardcoded width. This uses the COLUMNS environment variable which therefore should be preserved by the env cleanup in macports.tcl. See #15488. Modified Paths: -------------- trunk/base/src/macports1.0/macports.tcl trunk/base/src/port/port.tcl Modified: trunk/base/src/macports1.0/macports.tcl =================================================================== --- trunk/base/src/macports1.0/macports.tcl 2008-06-02 22:45:18 UTC (rev 37315) +++ trunk/base/src/macports1.0/macports.tcl 2008-06-02 23:37:43 UTC (rev 37316) @@ -658,6 +658,7 @@ PATCH_SITE_LOCAL PATH PORTSRC RSYNC_PROXY TMP TMPDIR USER GROUP http_proxy HTTPS_PROXY FTP_PROXY ALL_PROXY NO_PROXY + COLUMNS LINES } if {[info exists extra_env]} { set keepenvkeys [concat ${keepenvkeys} ${extra_env}] Modified: trunk/base/src/port/port.tcl =================================================================== --- trunk/base/src/port/port.tcl 2008-06-02 22:45:18 UTC (rev 37315) +++ trunk/base/src/port/port.tcl 2008-06-02 23:37:43 UTC (rev 37316) @@ -397,15 +397,39 @@ } ## +# Makes sure we get the current terminal size +proc set_term_size {} { + global env + + if {![info exists env(COLUMNS)] || ![info exists env(LINES)]} { + if {![catch {exec stty size} err]} { + regexp {(\d+) (\d+)} $err -> rows cols + set env(COLUMNS) $cols + set env(LINES) $rows + } else { + puts stderr "Warning: Unable to get terminal size, using 80x24!" + set cols 80 + set rows 24 + } + } +} + +## # Wraps a multi-line string at specified textwidth # # @see wrapline # # @param string input string -# @param maxlen text width (indent length not counted) +# @param maxlen text width (0 defaults to current terminal width) # @param indent prepend to every line # @return wrapped string proc wrap {string maxlen {indent ""} {indentfirstline 1}} { + global env + + if {$maxlen == 0} { + set maxlen $env(COLUMNS) + } + set splitstring {} foreach line [split $string "\n"] { lappend splitstring [wrapline $line $maxlen $indent $indentfirstline] @@ -419,10 +443,16 @@ # @see wrap # # @param line input line -# @param maxlen text width (indent length not counted) +# @param maxlen text width (0 defaults to current terminal width) # @param indent prepend to every line # @return wrapped string proc wrapline {line maxlen {indent ""} {indentfirstline 1}} { + global env + + if {$maxlen == 0} { + set maxlen $env(COLUMNS) + } + set string [split $line " "] if {$indentfirstline == 0} { set newline "" @@ -1183,7 +1213,7 @@ set ret "Usage: " set len [string length $action] - append ret [wrap "$action$cmds$args" 80 [string repeat " " [expr 8 + $len]] 0] + append ret [wrap "$action$cmds$args" 0 [string repeat " " [expr 8 + $len]] 0] append ret "\n" return $ret @@ -1410,14 +1440,14 @@ set joiner ", " } puts -nonewline "Variants: " - puts [wrap $vars 80 [string repeat " " 13] 0] + puts [wrap $vars 0 [string repeat " " 13] 0] } puts "" if {[info exists portinfo(long_description)]} { - puts [wrap [join $portinfo(long_description)] 80] + puts [wrap [join $portinfo(long_description)] 0] } else { if {[info exists portinfo(description)]} { - puts [wrap [join $portinfo(description)] 80] + puts [wrap [join $portinfo(description)] 0] } } if {[info exists portinfo(homepage)]} { @@ -2100,7 +2130,7 @@ puts -nonewline " ([join $portinfo(categories) ", "])" } puts "" - puts [wrap [join $portinfo(description)] 80 [string repeat " " 4]] + puts [wrap [join $portinfo(description)] 0 [string repeat " " 4]] } } @@ -3050,6 +3080,10 @@ # Global options private to this script array set private_options {} +# Make sure we get the size of the terminal +# We do this here to save it in the boot_env, in case we determined it manually +set_term_size + # Save off a copy of the environment before mportinit monkeys with it global env boot_env array set boot_env [array get env]

1 0

[37315] trunk/base/ChangeLog
by raimue＠macports.org 02 Jun '08

02 Jun '08

Revision: 37315 http://trac.macosforge.org/projects/macports/changeset/37315 Author: raimue(a)macports.org Date: 2008-06-02 15:45:18 -0700 (Mon, 02 Jun 2008) Log Message: ----------- Update the ChangeLog Modified Paths: -------------- trunk/base/ChangeLog Modified: trunk/base/ChangeLog =================================================================== --- trunk/base/ChangeLog 2008-06-02 22:10:22 UTC (rev 37314) +++ trunk/base/ChangeLog 2008-06-02 22:45:18 UTC (rev 37315) @@ -5,6 +5,11 @@ Unreleased: + - More helpful strings for 'port help' (needs more work #15467, raimue) + + - Command line options are checked if the command accepts it before + running (raimue) + - We now have a mirror of (almost) all distfiles at distfiles.macports.org, and it is automatically appended to master_sites (#15456, jmr in r37217)

1 0

[37314] trunk/base/src/port/port.tcl
by raimue＠macports.org 02 Jun '08

02 Jun '08

Revision: 37314 http://trac.macosforge.org/projects/macports/changeset/37314 Author: raimue(a)macports.org Date: 2008-06-02 15:10:22 -0700 (Mon, 02 Jun 2008) Log Message: ----------- port/port.tcl: Make port mirror --new available again. Modified Paths: -------------- trunk/base/src/port/port.tcl Modified: trunk/base/src/port/port.tcl =================================================================== --- trunk/base/src/port/port.tcl 2008-06-02 21:16:18 UTC (rev 37313) +++ trunk/base/src/port/port.tcl 2008-06-02 22:10:22 UTC (rev 37314) @@ -2577,6 +2577,7 @@ uninstall {{follow-dependents 0}} variants {{index 0}} clean {{all 0} {archive 0} {dist 0} {work 0}} + mirror {{new 0}} } ##

1 0

[37313] trunk/dports/perl/p5-svn-mirror/Portfile
by dluke＠macports.org 02 Jun '08

02 Jun '08

Revision: 37313 http://trac.macosforge.org/projects/macports/changeset/37313 Author: dluke(a)macports.org Date: 2008-06-02 14:16:18 -0700 (Mon, 02 Jun 2008) Log Message: ----------- Version bump, p5-svn-mirror to 0.74 Modified Paths: -------------- trunk/dports/perl/p5-svn-mirror/Portfile Modified: trunk/dports/perl/p5-svn-mirror/Portfile =================================================================== --- trunk/dports/perl/p5-svn-mirror/Portfile 2008-06-02 21:09:45 UTC (rev 37312) +++ trunk/dports/perl/p5-svn-mirror/Portfile 2008-06-02 21:16:18 UTC (rev 37313) @@ -3,12 +3,15 @@ PortSystem 1.0 PortGroup perl5 1.0 -perl5.setup SVN-Mirror 0.73 +perl5.setup SVN-Mirror 0.74 maintainers dluke(a)geeklair.net description This is a Perl extension for mirroring a remote repository to a local subversion one. long_description ${description} -checksums md5 170e067de85916f8d0b6a508194fbba3 +checksums md5 d6bab6c4a1ce3e01e7e5222da5e1f1e1 \ + sha1 81784651495ad88a777cdcde8cf1ff8ed089d024 \ + rmd160 f24186e4ec51f94dfc5f9a8278b295e4bcc83c7a + platforms darwin master_sites http://cpan.perl.org/authors/id/C/CL/CLKAO/ homepage http://search.cpan.org/~clkao/

1 0