February 2013 - macports-changes - lists.macosforge.org

[102492] trunk/dports/devel
by sean＠macports.org 04 Feb '13

04 Feb '13

Revision: 102492 https://trac.macports.org/changeset/102492 Author: sean(a)macports.org Date: 2013-02-04 09:11:51 -0800 (Mon, 04 Feb 2013) Log Message: ----------- fmscripts: add new port that allows using filemerge with vcs tools Added Paths: ----------- trunk/dports/devel/fmscripts/ trunk/dports/devel/fmscripts/Portfile Added: trunk/dports/devel/fmscripts/Portfile =================================================================== --- trunk/dports/devel/fmscripts/Portfile (rev 0) +++ trunk/dports/devel/fmscripts/Portfile 2013-02-04 17:11:51 UTC (rev 102492) @@ -0,0 +1,35 @@ +# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4 +# $Id$ + +PortSystem 1.0 + +name fmscripts +version 20120813 +categories devel +maintainers sean openmaintainer +platforms darwin +license public-domain +supported_archs noarch + +description Wrapper Scripts for FileMerge +long_description \ + Apple's Developer Tools for Mac OS X include FileMerge, a graphical \ + tool to compare and merge files. FileMerge can be much handier to use, unfortunately, \ + it doesn't integrate with Subversion straightforwardly. It can be opened from the \ + command line with the opendiff command, but its interface differs from that of diff \ + and diff3. It returns immediately (i.e. it forks and does not block) and it expects \ + different arguments. + +homepage http://www.defraine.net/~brunod/fmdiff/ +master_sites ${homepage} + +checksums rmd160 9d01d081146b7448d890338f3874515864cec0b9 \ + sha256 7312654040acc29787c15fb2b6d53abe0a397fb9faec6bf43398d25bb31f38ee + +use_configure no +destroot.destdir DESTDIR=${destroot}${prefix}/bin + +build {} + +livecheck.type regex +livecheck.regex ${name}-(\[0-9\]+)${extract.suffix}

1 0

[102491] trunk/dports/textproc
by sean＠macports.org 04 Feb '13

04 Feb '13

Revision: 102491 https://trac.macports.org/changeset/102491 Author: sean(a)macports.org Date: 2013-02-04 09:11:45 -0800 (Mon, 04 Feb 2013) Log Message: ----------- cwdiff: add new port that colorizes the wdiff command Added Paths: ----------- trunk/dports/textproc/cwdiff/ trunk/dports/textproc/cwdiff/Portfile Added: trunk/dports/textproc/cwdiff/Portfile =================================================================== --- trunk/dports/textproc/cwdiff/Portfile (rev 0) +++ trunk/dports/textproc/cwdiff/Portfile 2013-02-04 17:11:45 UTC (rev 102491) @@ -0,0 +1,42 @@ +# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4 +# $Id$ + +PortSystem 1.0 + +name cwdiff +version 0.2.3 +categories textproc +platforms darwin +maintainers sean openmaintainer +license GPL-2+ +supported_archs noarch + +description A script that wraps wdiff to support directories and colorize the output + +long_description ${description} + +homepage http://code.google.com/p/cj-overlay/source/browse/${name}?repo=evergreens +master_sites http://evergreens.cj-overlay.googlecode.com/hg + +depends_lib port:wdiff + +checksums rmd160 dbaa5c8459aa7c36ccb851f2464fcc713af82df2 \ + sha256 131c5a7930ad9cf3e0c7eec04829bd455d4eeed082727185c9c6cd86242c8802 + +# this block seems a bit obtuse but is needed because we are downloading the script +# directly (which is not compressed) +distfiles ${name} +use_configure no + +extract { + file copy ${distpath}/${distfiles} ${workpath} +} + +build {} + +destroot { + xinstall -m 755 ${workpath}/${distfiles} ${destroot}${prefix}/bin/ +} + +livecheck.type regex +livecheck.regex "#version (\[0-9.\]+)"

1 0

[102490] trunk/dports/_resources/port1.0/group/bitbucket-1.0.tcl
by sean＠macports.org 04 Feb '13

04 Feb '13

Revision: 102490 https://trac.macports.org/changeset/102490 Author: sean(a)macports.org Date: 2013-02-04 09:11:40 -0800 (Mon, 04 Feb 2013) Log Message: ----------- bitbucket-1.0.tcl: add new port group based on github-1.0 Added Paths: ----------- trunk/dports/_resources/port1.0/group/bitbucket-1.0.tcl Added: trunk/dports/_resources/port1.0/group/bitbucket-1.0.tcl =================================================================== --- trunk/dports/_resources/port1.0/group/bitbucket-1.0.tcl (rev 0) +++ trunk/dports/_resources/port1.0/group/bitbucket-1.0.tcl 2013-02-04 17:11:40 UTC (rev 102490) @@ -0,0 +1,104 @@ +# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4 +# $Id$ +# +# Copyright (c) 2012 The MacPorts Project +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions are +# met: +# +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# 3. Neither the name of The MacPorts Project nor the names of its +# contributors may be used to endorse or promote products derived from +# this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# +# +# This PortGroup sets up default behaviors for projects hosted at bitbucket. +# +# Usage: +# +# PortGroup bitbucket 1.0 +# bitbucket.setup author project version [tag_prefix] + +options bitbucket.author bitbucket.project bitbucket.version bitbucket.tag_prefix bitbucket.livecheck_type +options bitbucket.homepage bitbucket.master_sites bitbucket.tarball_from + +default bitbucket.homepage {https://bitbucket.org/${bitbucket.author}/${bitbucket.project}} +default bitbucket.master_sites {${bitbucket.homepage}/get} +default bitbucket.tarball_from {tags} +default bitbucket.livecheck_type "" + +default master_sites {${bitbucket.master_sites}} + +option_proc bitbucket.tarball_from handle_tarball_from + +proc handle_tarball_from {option action args} { + global bitbucket.author bitbucket.project bitbucket.master_sites + + # keeping the default at tags like many portfiles already do + # the port writer can set bitbucket.tarball_from to "downloads" and have the URI path accordingly changed + if {[string equal ${action} "set"] && $args == "downloads"} { + bitbucket.tarball_from ${args} + bitbucket.master_sites https://bitbucket.org/${bitbucket.author}/${bitbucket.project}/downloads + } +} + +proc bitbucket.setup {bb_author bb_project bb_version {bb_tag_prefix ""}} { + global bitbucket.author bitbucket.project bitbucket.version bitbucket.tag_prefix bitbucket.homepage bitbucket.master_sites extract.suffix bitbucket.livecheck_type + + bitbucket.author ${bb_author} + bitbucket.project ${bb_project} + bitbucket.version ${bb_version} + bitbucket.tag_prefix ${bb_tag_prefix} + + name ${bitbucket.project} + version ${bitbucket.version} + homepage ${bitbucket.homepage} + hg.url ${bitbucket.homepage} + hg.tag [join ${bitbucket.tag_prefix}]${bitbucket.version} + distname ${bitbucket.version} + fetch.ignore_sslcert yes + + post-extract { + if {![file exists ${worksrcpath}] && "standard" == ${fetch.type} && \ + ${master_sites} == ${bitbucket.master_sites} && [llength ${distfiles}] > 0} { + move [glob ${workpath}/*] ${worksrcpath} + } + } + + if {[join ${bitbucket.tag_prefix}] == "" && [regexp "^\[0-9a-f\]{9,}\$" ${bitbucket.version}]} { + bitbucket.livecheck_type "commits" + } else { + bitbucket.livecheck_type "tags" + } + + if {[string equal ${bitbucket.livecheck_type} "commits"]} { + livecheck.type regexm + livecheck.url ${bitbucket.homepage}/atom + livecheck.version ${bitbucket.version} + livecheck.regex <id>changeset:(\[0-9a-f\]{[string length ${bitbucket.version}]})\[0-9a-f\]*</id> + } else { + livecheck.type regex + livecheck.version ${bitbucket.version} + livecheck.url ${bitbucket.homepage}/downloads + livecheck.regex get/[join ${bitbucket.tag_prefix}](\[0-9\.\]+)${extract.suffix} + } +} +

1 0

[102489] trunk/dports/_resources/port1.0/group/github-1.0.tcl
by sean＠macports.org 04 Feb '13

04 Feb '13

Revision: 102489 https://trac.macports.org/changeset/102489 Author: sean(a)macports.org Date: 2013-02-04 09:11:36 -0800 (Mon, 04 Feb 2013) Log Message: ----------- github-1.0.tcl: automatically livecheck the rss feed if the version is a committish Modified Paths: -------------- trunk/dports/_resources/port1.0/group/github-1.0.tcl Modified: trunk/dports/_resources/port1.0/group/github-1.0.tcl =================================================================== --- trunk/dports/_resources/port1.0/group/github-1.0.tcl 2013-02-04 16:24:12 UTC (rev 102488) +++ trunk/dports/_resources/port1.0/group/github-1.0.tcl 2013-02-04 17:11:36 UTC (rev 102489) @@ -37,12 +37,13 @@ # PortGroup github 1.0 # github.setup author project version [tag_prefix] -options github.author github.project github.version github.tag_prefix +options github.author github.project github.version github.tag_prefix github.livecheck_type options github.homepage github.raw github.master_sites github.tarball_from default github.homepage {https://github.com/${github.author}/${github.project}} default github.raw {https://raw.github.com/${github.author}/${github.project}} default github.master_sites {${github.homepage}/tarball/[join ${github.tag_prefix} ""]${github.version}} +default github.livecheck_type "" default master_sites {${github.master_sites}} @@ -62,7 +63,7 @@ } proc github.setup {gh_author gh_project gh_version {gh_tag_prefix ""}} { - global extract.suffix github.author github.project github.version github.tag_prefix github.homepage github.master_sites + global extract.suffix github.author github.project github.version github.tag_prefix github.homepage github.master_sites github.livecheck_type github.author ${gh_author} github.project ${gh_project} @@ -84,8 +85,21 @@ } } - livecheck.type regex - livecheck.version ${github.version} - livecheck.url ${github.homepage}/tags - livecheck.regex archive/[join ${github.tag_prefix} ""](\[^"\]+)${extract.suffix}" + if {[join ${github.tag_prefix}] == "" && [regexp "^\[0-9a-f\]{9,}\$" ${github.version}]} { + github.livecheck_type "commits" + } else { + github.livecheck_type "tags" + } + + if {[string equal ${github.livecheck_type} "commits"]} { + livecheck.type regexm + livecheck.url ${github.homepage}/commits/master.atom + livecheck.version ${github.version} + livecheck.regex <id>tag:github.com,2008:Grit::Commit/(\[0-9a-f\]{[string length ${github.version}]})\[0-9a-f\]*</id> + } else { + livecheck.type regex + livecheck.version ${github.version} + livecheck.url ${github.homepage}/tags + livecheck.regex archive/[join ${github.tag_prefix} ""](\[^"\]+)${extract.suffix} + } }

1 0

[102488] trunk/dports/php/pear-Image_Canvas/Portfile
by jmr＠macports.org 04 Feb '13

04 Feb '13

Revision: 102488 https://trac.macports.org/changeset/102488 Author: jmr(a)macports.org Date: 2013-02-04 08:24:12 -0800 (Mon, 04 Feb 2013) Log Message: ----------- pear-Image_Canvas: license Modified Paths: -------------- trunk/dports/php/pear-Image_Canvas/Portfile Modified: trunk/dports/php/pear-Image_Canvas/Portfile =================================================================== --- trunk/dports/php/pear-Image_Canvas/Portfile 2013-02-04 16:21:46 UTC (rev 102487) +++ trunk/dports/php/pear-Image_Canvas/Portfile 2013-02-04 16:24:12 UTC (rev 102488) @@ -6,6 +6,7 @@ pear.setup Image_Canvas 0.3.4 pear.php.net categories-append net www +license LGPL-2.1+ PHP-2.02 platforms darwin maintainers pixilla openmaintainer

1 0

[102487] trunk/dports/php/pear-Image_Color2/Portfile
by jmr＠macports.org 04 Feb '13

04 Feb '13

Revision: 102487 https://trac.macports.org/changeset/102487 Author: jmr(a)macports.org Date: 2013-02-04 08:21:46 -0800 (Mon, 04 Feb 2013) Log Message: ----------- pear-Image_Color2: license Modified Paths: -------------- trunk/dports/php/pear-Image_Color2/Portfile Modified: trunk/dports/php/pear-Image_Color2/Portfile =================================================================== --- trunk/dports/php/pear-Image_Color2/Portfile 2013-02-04 16:05:55 UTC (rev 102486) +++ trunk/dports/php/pear-Image_Color2/Portfile 2013-02-04 16:21:46 UTC (rev 102487) @@ -6,6 +6,7 @@ pear.setup Image_Color2 0.1.5 pear.php.net categories-append net www +license LGPL-2.1 platforms darwin maintainers pixilla openmaintainer

1 0

[102486] trunk/dports/php/pear-Image_JpegMarkerReader/Portfile
by jmr＠macports.org 04 Feb '13

04 Feb '13

Revision: 102486 https://trac.macports.org/changeset/102486 Author: jmr(a)macports.org Date: 2013-02-04 08:05:55 -0800 (Mon, 04 Feb 2013) Log Message: ----------- pear-Image_JpegMarkerReader: license Modified Paths: -------------- trunk/dports/php/pear-Image_JpegMarkerReader/Portfile Modified: trunk/dports/php/pear-Image_JpegMarkerReader/Portfile =================================================================== --- trunk/dports/php/pear-Image_JpegMarkerReader/Portfile 2013-02-04 16:02:38 UTC (rev 102485) +++ trunk/dports/php/pear-Image_JpegMarkerReader/Portfile 2013-02-04 16:05:55 UTC (rev 102486) @@ -6,6 +6,7 @@ pear.setup Image_JpegMarkerReader 0.5.0 pear.php.net categories-append net www +license MIT platforms darwin maintainers pixilla openmaintainer

1 0

[102485] trunk/dports/devel
by raimue＠macports.org 04 Feb '13

04 Feb '13

Revision: 102485 https://trac.macports.org/changeset/102485 Author: raimue(a)macports.org Date: 2013-02-04 08:02:38 -0800 (Mon, 04 Feb 2013) Log Message: ----------- devel/valgrind, devel/valgrind-devel: Switch to +mpich from +mpich2, #37785 Modified Paths: -------------- trunk/dports/devel/valgrind/Portfile trunk/dports/devel/valgrind-devel/Portfile Modified: trunk/dports/devel/valgrind/Portfile =================================================================== --- trunk/dports/devel/valgrind/Portfile 2013-02-04 15:44:35 UTC (rev 102484) +++ trunk/dports/devel/valgrind/Portfile 2013-02-04 16:02:38 UTC (rev 102485) @@ -5,6 +5,7 @@ name valgrind conflicts valgrind-devel version 3.8.1 +revision 1 categories devel platforms darwin supported_archs i386 x86_64 @@ -69,8 +70,9 @@ } } -variant mpich2 description {Use mpich2 for MPI support} conflicts universal { - depends_lib-append port:mpich2 +variant mpich2 requires mpich description {Compatibility variant, renamed to +mpich} {} +variant mpich description {Use mpich for MPI support} conflicts universal { + depends_lib-append path:bin/mpicc:mpich configure.args-delete --without-mpicc configure.args-append --with-mpicc=${prefix}/bin/mpicc } Modified: trunk/dports/devel/valgrind-devel/Portfile =================================================================== --- trunk/dports/devel/valgrind-devel/Portfile 2013-02-04 15:44:35 UTC (rev 102484) +++ trunk/dports/devel/valgrind-devel/Portfile 2013-02-04 16:02:38 UTC (rev 102485) @@ -7,6 +7,7 @@ svn.revision 13189 set vex_revision 2601 version 3.9.0-r${svn.revision} +revision 1 categories devel platforms darwin supported_archs i386 x86_64 @@ -62,8 +63,9 @@ } } -variant mpich2 description {Use mpich2 for MPI support} conflicts universal { - depends_lib-append port:mpich2 +variant mpich2 requires mpich description {Compatibility variant, renamed to +mpich} {} +variant mpich description {Use mpich for MPI support} conflicts universal { + depends_lib-append path:bin/mpicc:mpich configure.args-delete --without-mpicc configure.args-append --with-mpicc=${prefix}/bin/mpicc }

1 0

[102484] trunk/base/src/macports1.0/macports.tcl
by raimue＠macports.org 04 Feb '13

04 Feb '13

Revision: 102484 https://trac.macports.org/changeset/102484 Author: raimue(a)macports.org Date: 2013-02-04 07:44:35 -0800 (Mon, 04 Feb 2013) Log Message: ----------- macports1.0: Add new wrapper for registry::list_depends to be used by recursive_collect_deps in port1.0/portutil.tcl Modified Paths: -------------- trunk/base/src/macports1.0/macports.tcl Modified: trunk/base/src/macports1.0/macports.tcl =================================================================== --- trunk/base/src/macports1.0/macports.tcl 2013-02-04 15:43:08 UTC (rev 102483) +++ trunk/base/src/macports1.0/macports.tcl 2013-02-04 15:44:35 UTC (rev 102484) @@ -1291,6 +1291,7 @@ $workername alias registry_active registry::active $workername alias registry_file_registered registry::file_registered $workername alias registry_port_registered registry::port_registered + $workername alias registry_list_depends registry::list_depends # deferred options processing. $workername alias getoption macports::getoption

1 0

[102483] trunk/base/src/port1.0/portutil.tcl
by raimue＠macports.org 04 Feb '13

04 Feb '13

Revision: 102483 https://trac.macports.org/changeset/102483 Author: raimue(a)macports.org Date: 2013-02-04 07:43:08 -0800 (Mon, 04 Feb 2013) Log Message: ----------- port1.0/portutil.tcl: Rewrite recursive_collect_deps for tracemode to use dependency information from the registry instead of Portfiles from the tree. Previously the information was extracted from Portfiles in the tree using the default variant set. This was the wrong information in many cases when ports were installed with a different set of variants or the Portfile in the tree was updated with new dependencies. Modified Paths: -------------- trunk/base/src/port1.0/portutil.tcl Modified: trunk/base/src/port1.0/portutil.tcl =================================================================== --- trunk/base/src/port1.0/portutil.tcl 2013-02-04 13:48:24 UTC (rev 102482) +++ trunk/base/src/port1.0/portutil.tcl 2013-02-04 15:43:08 UTC (rev 102483) @@ -1424,20 +1424,25 @@ } } - # Dependencies are in the form verb:[param:]port - set depsPorts {} + # Recursively collect all dependencies from registry for tracing + set deplist {} foreach depspec $depends { - # grab the portname portion of the depspec - set dep_portname [lindex [split $depspec :] end] - lappend depsPorts $dep_portname - } + # Resolve dependencies to actual ports + set name [_get_dep_port $depspec] - set portlist $depsPorts - foreach depName $depsPorts { - set portlist [recursive_collect_deps $depName $deptypes $portlist] + # If portname is empty, the dependency is already satisfied by other means, + # for example a bin: dependency on a file not installed by MacPorts + if {$name != ""} { + if {[lsearch -exact $deplist $name] == -1} { + lappend deplist $name + set deplist [recursive_collect_deps $name $deplist] + } + } } - if {[llength $deptypes] > 0} {tracelib setdeps $portlist} + ui_debug "Tracemode will respect recursively collected port dependencies: [lsort $deplist]" + + if {[llength $deptypes] > 0} {tracelib setdeps $deplist} } if {$result == 0} { @@ -1537,40 +1542,23 @@ } # recursive dependency search for portname -proc recursive_collect_deps {portname deptypes {depsfound {}}} \ +proc recursive_collect_deps {portname {depsfound {}}} \ { - set res [mport_lookup $portname] - if {[llength $res] < 2} \ - { - # Even if this port cannot be found in the index, - # it is still listed as dependency - if {[lsearch -exact $depsfound $portname] == -1} { - lappend depsfound $portname - } - return $depsfound - } + # Get the active port from the registry + # There can be only one port active at a time, so take the first result only + set regentry [lindex [registry_active $portname] 0] + # Get port dependencies from the registry + set deplist [registry_list_depends [lindex $regentry 0] [lindex $regentry 1] [lindex $regentry 2] [lindex $regentry 3]] - set depends {} - - array set portinfo [lindex $res 1] - foreach deptype $deptypes \ - { - if {[info exists portinfo($deptype)] && $portinfo($deptype) != ""} \ - { - set depends [concat $depends $portinfo($deptype)] + foreach item $deplist { + set name [lindex $item 0] + if {[lsearch -exact $depsfound $name] == -1} { + lappend depsfound $name + set depsfound [recursive_collect_deps $name $depsfound] } } - set portdeps $depsfound - foreach depspec $depends \ - { - set portname [lindex [split $depspec :] end] - if {[lsearch -exact $portdeps $portname] == -1} { - lappend portdeps $portname - set portdeps [recursive_collect_deps $portname $deptypes $portdeps] - } - } - return $portdeps + return $depsfound }

1 0