<pre style='margin:0'>
Rainer Müller (raimue) pushed a commit to branch master
in repository macports-base.
</pre>
<p><a href="https://github.com/macports/macports-base/commit/a74c159d4321cfda67b9756cc641a02884e086c4">https://github.com/macports/macports-base/commit/a74c159d4321cfda67b9756cc641a02884e086c4</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new a74c159 Add depends_patch to handle the patch dependencies of ports
</span>a74c159 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit a74c159d4321cfda67b9756cc641a02884e086c4
</span>Author: Kurt Hindenburg <kurt.hindenburg@gmail.com>
AuthorDate: Wed Mar 21 19:51:28 2018 -0400
<span style='display:block; white-space:pre;color:#404040;'> Add depends_patch to handle the patch dependencies of ports
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> This can be used to handle xz patches in the below trac ticket (which
</span><span style='display:block; white-space:pre;color:#404040;'> requires another patch to base).
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> See https://trac.macports.org/ticket/52445
</span>---
src/macports1.0/macports.tcl | 14 +++++++-------
src/port/port.tcl | 21 ++++++++++++++++-----
src/port/portindex.tcl | 3 ++-
src/port1.0/portdepends.tcl | 5 +++--
src/port1.0/portlint.tcl | 8 ++++++--
src/port1.0/portutil.tcl | 10 +++++-----
6 files changed, 39 insertions(+), 22 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/macports1.0/macports.tcl b/src/macports1.0/macports.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 503ab6e..340da57 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/macports1.0/macports.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/macports1.0/macports.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3558,12 +3558,12 @@ proc macports::_deptypes_for_target {target workername} {
</span> switch -- $target {
fetch -
checksum {return depends_fetch}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- extract -
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch {return "depends_fetch depends_extract"}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extract {return "depends_fetch depends_extract"}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch {return "depends_fetch depends_extract depends_patch"}
</span> configure -
<span style='display:block; white-space:pre;background:#ffe0e0;'>- build {return "depends_fetch depends_extract depends_build depends_lib"}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- test {return "depends_fetch depends_extract depends_build depends_lib depends_run depends_test"}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- destroot {return "depends_fetch depends_extract depends_build depends_lib depends_run"}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build {return "depends_fetch depends_extract depends_patch depends_build depends_lib"}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ test {return "depends_fetch depends_extract depends_patch depends_build depends_lib depends_run depends_test"}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot {return "depends_fetch depends_extract depends_patch depends_build depends_lib depends_run"}
</span> dmg -
pkg -
mdmg -
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3572,7 +3572,7 @@ proc macports::_deptypes_for_target {target workername} {
</span> (![global_option_isset ports_source_only] && [$workername eval {_archive_available}])} {
return "depends_lib depends_run"
} else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return "depends_fetch depends_extract depends_build depends_lib depends_run"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return "depends_fetch depends_extract depends_patch depends_build depends_lib depends_run"
</span> }
}
install -
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3583,7 +3583,7 @@ proc macports::_deptypes_for_target {target workername} {
</span> || (![global_option_isset ports_source_only] && [$workername eval {_archive_available}])} {
return "depends_lib depends_run"
} else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return "depends_fetch depends_extract depends_build depends_lib depends_run"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return "depends_fetch depends_extract depends_patch depends_build depends_lib depends_run"
</span> }
}
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/port/port.tcl b/src/port/port.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index c348bc5..b7651c6 100755
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/port/port.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/port/port.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -100,7 +100,7 @@ These pseudo-portnames expand to the set of ports named.
</span>
Pseudo-portnames starting with variants:, variant:, description:, depends:,
depends_lib:, depends_run:, depends_build:, depends_fetch:, depends_extract:,
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_test:,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_patch:, depends_test:,
</span> portdir:, homepage:, epoch:, platforms:, platform:, name:, long_description:,
maintainers:, maintainer:, categories:, category:, version:, revision:, and
license: each select a set of ports based on a regex search of metadata
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -996,7 +996,7 @@ proc get_rdepends_ports {portname} {
</span> if {![info exists ::portDependenciesArray]} {
# make an associative array of all the port names and their (reverse) dependencies
# much faster to build this once than to call mportsearch thousands of times
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set deptypes {depends_fetch depends_extract depends_build depends_lib depends_run depends_test}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set deptypes {depends_fetch depends_extract depends_patch depends_build depends_lib depends_run depends_test}
</span> foreach {pname pinfolist} [mportlistall] {
array unset pinfo
array set pinfo $pinfolist
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1353,6 +1353,7 @@ proc element { resname } {
</span> ^(depends_run):(.*) -
^(depends_extract):(.*) -
^(depends_fetch):(.*) -
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ ^(depends_patch):(.*) -
</span> ^(depends_test):(.*) -
^(replaced_by):(.*) -
^(revision):(.*) -
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1381,6 +1382,7 @@ proc element { resname } {
</span> add_multiple_ports reslist [get_matching_ports $pat no regexp "depends_run"]
add_multiple_ports reslist [get_matching_ports $pat no regexp "depends_extract"]
add_multiple_ports reslist [get_matching_ports $pat no regexp "depends_fetch"]
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ add_multiple_ports reslist [get_matching_ports $pat no regexp "depends_patch"]
</span> add_multiple_ports reslist [get_matching_ports $pat no regexp "depends_test"]
set el 1
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2049,6 +2051,7 @@ proc action_info { action portlist opts } {
</span> categories {", " ", " ","}
depends_fetch {", " ", " ","}
depends_extract {", " ", " ","}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_patch {", " ", " ","}
</span> depends_build {", " ", " ","}
depends_lib {", " ", " ","}
depends_run {", " ", " ","}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2067,6 +2070,7 @@ proc action_info { action portlist opts } {
</span> variants Variants
depends_fetch "Fetch Dependencies"
depends_extract "Extract Dependencies"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_patch "Patch Dependencies"
</span> depends_build "Build Dependencies"
depends_run "Runtime Dependencies"
depends_lib "Library Dependencies"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2091,6 +2095,7 @@ proc action_info { action portlist opts } {
</span> variants 22
depends_fetch 22
depends_extract 22
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_patch 22
</span> depends_build 22
depends_run 22
depends_lib 22
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2111,6 +2116,7 @@ proc action_info { action portlist opts } {
</span> array unset options ports_info_depends
set options(ports_info_depends_fetch) yes
set options(ports_info_depends_extract) yes
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ set options(ports_info_depends_patch) yes
</span> set options(ports_info_depends_build) yes
set options(ports_info_depends_lib) yes
set options(ports_info_depends_run) yes
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2165,7 +2171,9 @@ proc action_info { action portlist opts } {
</span> ports_info_skip_line
ports_info_long_description ports_info_homepage
ports_info_skip_line ports_info_depends_fetch
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ports_info_depends_extract ports_info_depends_build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ports_info_depends_extract
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ports_info_depends_patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ports_info_depends_build
</span> ports_info_depends_lib ports_info_depends_run
ports_info_depends_test
ports_info_conflicts
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3088,7 +3096,7 @@ proc action_deps { action portlist opts } {
</span> set deplist {}
set deps_output {}
set ndeps 0
<span style='display:block; white-space:pre;background:#ffe0e0;'>- array set labeldict {depends_fetch Fetch depends_extract Extract depends_build Build depends_lib Library depends_run Runtime depends_test Test}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ array set labeldict {depends_fetch Fetch depends_extract Extract depends_patch Patch depends_build Build depends_lib Library depends_run Runtime depends_test Test}
</span> # get list of direct deps
foreach type $deptypes {
if {[info exists portinfo($type)]} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3729,6 +3737,7 @@ proc action_search { action portlist opts } {
</span> array unset options ports_search_depends
set options(ports_search_depends_fetch) yes
set options(ports_search_depends_extract) yes
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ set options(ports_search_depends_patch) yes
</span> set options(ports_search_depends_build) yes
set options(ports_search_depends_lib) yes
set options(ports_search_depends_run) yes
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4435,6 +4444,7 @@ proc action_needs_portlist { action } {
</span> array set cmd_opts_array {
edit {{editor 1}}
info {category categories conflicts depends_fetch depends_extract
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_patch
</span> depends_build depends_lib depends_run depends_test
depends description epoch fullname heading homepage index license
line long_description
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4445,7 +4455,8 @@ array set cmd_opts_array {
</span> rdeps {index no-build full}
rdependents {full}
search {case-sensitive category categories depends_fetch
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_extract depends_build depends_lib depends_run depends_test
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_extract depends_patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build depends_lib depends_run depends_test
</span> depends description epoch exact glob homepage line
long_description maintainer maintainers name platform
platforms portdir regex revision variant variants version}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/port/portindex.tcl b/src/port/portindex.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index e8d446d..dc7610a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/port/portindex.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/port/portindex.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -266,7 +266,8 @@ if {[file isfile $outpath] && [file isfile ${outpath}.quick]} {
</span> set tempportindex [mktemp "/tmp/mports.portindex.XXXXXXXX"]
set fd [open $tempportindex w]
set save_prefix ${macports::prefix}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-foreach key {categories depends_fetch depends_extract depends_build \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+foreach key {categories depends_fetch depends_extract depends_patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build \
</span> depends_lib depends_run depends_test description epoch homepage \
long_description maintainers name platforms revision variants \
version portdir replaced_by license installs_libs conflicts} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/port1.0/portdepends.tcl b/src/port1.0/portdepends.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 7d15a56..82dc09d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/port1.0/portdepends.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/port1.0/portdepends.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -37,12 +37,13 @@ namespace eval portdepends {
</span> }
# define options
<span style='display:block; white-space:pre;background:#ffe0e0;'>-options depends_fetch depends_extract depends_build depends_run depends_lib depends_test depends
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+options depends_fetch depends_extract depends_patch depends_build depends_run depends_lib depends_test depends
</span> # Export options via PortInfo
<span style='display:block; white-space:pre;background:#ffe0e0;'>-options_export depends_fetch depends_extract depends_build depends_lib depends_run depends_test
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+options_export depends_fetch depends_extract depends_patch depends_build depends_lib depends_run depends_test
</span>
option_proc depends_fetch portdepends::validate_depends_options
option_proc depends_extract portdepends::validate_depends_options
<span style='display:block; white-space:pre;background:#e0ffe0;'>+option_proc depends_patch portdepends::validate_depends_options
</span> option_proc depends_build portdepends::validate_depends_options
option_proc depends_run portdepends::validate_depends_options
option_proc depends_lib portdepends::validate_depends_options
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/port1.0/portlint.tcl b/src/port1.0/portlint.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index c86db41..32b2841 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/port1.0/portlint.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/port1.0/portlint.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -343,7 +343,8 @@ proc portlint::lint_main {args} {
</span> global os.platform os.arch os.version version revision epoch \
description long_description platforms categories all_variants \
maintainers license homepage master_sites checksums patchfiles \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_fetch depends_extract depends_lib depends_build depends_run \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_fetch depends_extract depends_patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib depends_build depends_run \
</span> depends_test distfiles fetch.type lint_portsystem lint_platforms \
lint_required lint_optional replaced_by conflicts
set portarch [get_canonical_archs]
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -493,6 +494,9 @@ proc portlint::lint_main {args} {
</span> if {[info exists depends_extract]} {
lappend all_depends {*}$depends_extract
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[info exists depends_patch]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend all_depends {*}$depends_patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> if {[info exists depends_lib]} {
lappend all_depends {*}$depends_lib
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -520,7 +524,7 @@ proc portlint::lint_main {args} {
</span> }
# Check for multiple dependencies
<span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach deptype {depends_extract depends_lib depends_build depends_run depends_test} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach deptype {depends_extract depends_patch depends_lib depends_build depends_run depends_test} {
</span> if {[info exists $deptype]} {
array set depwarned {}
foreach depspec [set $deptype] {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/port1.0/portutil.tcl b/src/port1.0/portutil.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index e6d0696..f8b035b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/port1.0/portutil.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/port1.0/portutil.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1405,18 +1405,18 @@ proc target_run {ditem} {
</span> switch $target {
fetch -
checksum { set deptypes "depends_fetch" }
<span style='display:block; white-space:pre;background:#ffe0e0;'>- extract -
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch { set deptypes "depends_fetch depends_extract" }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extract { set deptypes "depends_fetch depends_extract" }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch { set deptypes "depends_fetch depends_extract depends_patch" }
</span> configure -
<span style='display:block; white-space:pre;background:#ffe0e0;'>- build { set deptypes "depends_fetch depends_extract depends_lib depends_build" }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- test { set deptypes "depends_fetch depends_extract depends_lib depends_build depends_run depends_test" }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build { set deptypes "depends_fetch depends_extract depends_patch depends_lib depends_build" }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ test { set deptypes "depends_fetch depends_extract depends_patch depends_lib depends_build depends_run depends_test" }
</span> destroot -
dmg -
pkg -
portpkg -
mpkg -
mdmg -
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "" { set deptypes "depends_fetch depends_extract depends_lib depends_build depends_run" }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "" { set deptypes "depends_fetch depends_extract depends_patch depends_lib depends_build depends_run" }
</span>
# install may be run given an archive, which means
# depends_fetch, _extract, _build dependencies have
</pre><pre style='margin:0'>
</pre>