<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/a215c8c86a89232bc51183405160343364cc7015">https://github.com/macports/macports-ports/commit/a215c8c86a89232bc51183405160343364cc7015</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 a215c8c portgroups: remove compat code for old base
</span>a215c8c is described below
<span style='display:block; white-space:pre;color:#808000;'>commit a215c8c86a89232bc51183405160343364cc7015
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Sat Oct 5 22:35:10 2019 +1000
<span style='display:block; white-space:pre;color:#404040;'> portgroups: remove compat code for old base
</span>---
_resources/port1.0/group/apache2-1.0.tcl | 6 +---
_resources/port1.0/group/cargo-1.0.tcl | 6 +---
_resources/port1.0/group/cargo_fetch-1.0.tcl | 9 -----
_resources/port1.0/group/cmake-1.1.tcl | 6 +---
_resources/port1.0/group/crossgcc-1.0.tcl | 6 +---
_resources/port1.0/group/github-1.0.tcl | 6 +---
_resources/port1.0/group/golang-1.0.tcl | 24 +++----------
_resources/port1.0/group/muniversal-1.0.tcl | 7 +---
_resources/port1.0/group/octave-1.0.tcl | 10 +-----
_resources/port1.0/group/pear-1.0.tcl | 27 --------------
_resources/port1.0/group/perl5-1.0.tcl | 12 ++-----
_resources/port1.0/group/python-1.0.tcl | 54 ----------------------------
_resources/port1.0/group/qmake5-1.0.tcl | 6 +---
_resources/port1.0/group/qt5-1.0.tcl | 6 +---
14 files changed, 15 insertions(+), 170 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/apache2-1.0.tcl b/_resources/port1.0/group/apache2-1.0.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 82dae38..bbbf259 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/apache2-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/apache2-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -57,11 +57,7 @@ default apache2.group _www
</span>
# General settings
options apache2.listen_ports
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[vercmp [macports_version] 2.5.3] <= 0} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default apache2.listen_ports {"80 443"}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default apache2.listen_ports "80 443"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default apache2.listen_ports "80 443"
</span> options apache2.contact
default apache2.contact ops@example.com
options apache2.timeout
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/cargo-1.0.tcl b/_resources/port1.0/group/cargo-1.0.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index c385b0a..d2346f4 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/cargo-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/cargo-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -19,11 +19,7 @@ PortGroup cargo_fetch 1.0
</span> use_configure no
default universal_variant yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[vercmp [macports_version] 2.5.3] <= 0} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default build.cmd {"${cargo.bin} build"}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default build.cmd {${cargo.bin} build}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default build.cmd {${cargo.bin} build}
</span> build.target
build.pre_args --release --frozen -v -j${build.jobs}
build.args
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/cargo_fetch-1.0.tcl b/_resources/port1.0/group/cargo_fetch-1.0.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 4022fb1..9d24dc5 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/cargo_fetch-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/cargo_fetch-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -238,11 +238,7 @@ foreach stage {build destroot} {
</span> }
foreach stage {configure build destroot} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[vercmp [macports_version] 2.5.99] >= 0} {
</span> ${stage}.env-append "RUSTFLAGS=-C linker=${configure.cc}"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${stage}.env-append RUSTFLAGS="-C linker=${configure.cc}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span> }
# do not force all Portfiles to switch from ${stage}.env to ${stage}.env-append
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -256,13 +252,8 @@ proc cargo.environments {} {
</span> }
foreach stage {configure build destroot} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[vercmp [macports_version] 2.5.99] >= 0} {
</span> ${stage}.env-delete "RUSTFLAGS=-C linker=${configure.cc}"
${stage}.env-append "RUSTFLAGS=-C linker=${configure.cc}"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${stage}.env-delete RUSTFLAGS="-C linker=${configure.cc}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${stage}.env-append RUSTFLAGS="-C linker=${configure.cc}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span> }
# CARGO_BUILD_TARGET does not work correctly
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/cmake-1.1.tcl b/_resources/port1.0/group/cmake-1.1.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index d9618c1..d04b1dd 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/cmake-1.1.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/cmake-1.1.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -72,11 +72,7 @@ default cmake.module_path {}
</span> # cmake.generator_blacklist <generator-pattern>
# (patterns are case-insensitive, e.g. "*ninja*")
#
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[vercmp [macports_version] 2.5.3] <= 0} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default cmake.generator {"CodeBlocks - Unix Makefiles"}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default cmake.generator "CodeBlocks - Unix Makefiles"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default cmake.generator "CodeBlocks - Unix Makefiles"
</span> default cmake.generator_blacklist {}
# CMake generates Unix Makefiles that contain a special "fast" install target
# which skips the whole "let's see if there's anything left to (re)build before
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/crossgcc-1.0.tcl b/_resources/port1.0/group/crossgcc-1.0.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index dc314ae..62f5dbd 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/crossgcc-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/crossgcc-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -18,11 +18,7 @@
</span> options crossgcc.target \
crossgcc.languages
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[vercmp [macports_version] 2.5.3] <= 0} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default crossgcc.languages {"c c++"}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default crossgcc.languages "c c++"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default crossgcc.languages "c c++"
</span>
array set crossgcc.versions_info {
7.1.0 {bzip2 {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/github-1.0.tcl b/_resources/port1.0/group/github-1.0.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 72b26c0..f6f6cb3 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/github-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/github-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -57,11 +57,7 @@ options github.livecheck.branch
</span> default github.livecheck.branch master
options github.livecheck.regex
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[vercmp [macports_version] 2.5.3] <= 0} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default github.livecheck.regex {{([^"]+)}}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default github.livecheck.regex {(\[^"]+)}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default github.livecheck.regex {(\[^"]+)}
</span>
proc github.setup {gh_author gh_project gh_version {gh_tag_prefix ""} {gh_tag_suffix ""}} {
global extract.suffix github.author github.project github.version github.tag_prefix github.tag_suffix
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/golang-1.0.tcl b/_resources/port1.0/group/golang-1.0.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 154954e..fddc586 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/golang-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/golang-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -139,31 +139,15 @@ default depends_build port:go
</span> set gopath ${workpath}/gopath
default worksrcdir {${gopath}/src/${go.package}}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[vercmp [macports_version] 2.5.3] <= 0} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default build.cmd {"${go.bin} build"}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default build.cmd {${go.bin} build}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default build.cmd {${go.bin} build}
</span> default build.args ""
default build.target ""
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[vercmp [macports_version] 2.5.3] <= 0} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default build.env {"GOPATH=${gopath} GOARCH=${goarch} GOOS=${goos} CC=${configure.cc}"}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default build.env {GOPATH=${gopath} GOARCH=${goarch} GOOS=${goos} CC=${configure.cc}}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default build.env {GOPATH=${gopath} GOARCH=${goarch} GOOS=${goos} CC=${configure.cc}}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[vercmp [macports_version] 2.5.3] <= 0} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default test.cmd {"${go.bin} test"}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default test.cmd {${go.bin} test}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default test.cmd {${go.bin} test}
</span> default test.args ""
default test.target ""
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[vercmp [macports_version] 2.5.3] <= 0} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default test.env {"GOPATH=${gopath} GOARCH=${goarch} GOOS=${goos} CC=${configure.cc}"}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default test.env {GOPATH=${gopath} GOARCH=${goarch} GOOS=${goos} CC=${configure.cc}}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default test.env {GOPATH=${gopath} GOARCH=${goarch} GOOS=${goos} CC=${configure.cc}}
</span>
# go.vendors name1 ver1 name2 ver2...
# When a Gopkg.lock, glide.lock, etc. is present use go2port to generate values
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/muniversal-1.0.tcl b/_resources/port1.0/group/muniversal-1.0.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index cbad38a..768a206 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/muniversal-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/muniversal-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -78,12 +78,7 @@ proc merger_target_provides {ditem args} {
</span> }
return 0
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[info commands macports_version] ne ""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- && [vercmp 2.3.99 [macports_version]] <= 0} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- makeuserproc user$proc_name [lindex $args 0]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- makeuserproc user$proc_name $args
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ makeuserproc user$proc_name [lindex $args 0]
</span> }
foreach target $args {
set ident [ditem_key $ditem name]
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/octave-1.0.tcl b/_resources/port1.0/group/octave-1.0.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 85d13eb..5f514ed 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/octave-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/octave-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -39,11 +39,7 @@ proc universal_setup {args} {
</span> } else {
ui_debug "adding universal variant via PortGroup muniversal"
uplevel "PortGroup muniversal 1.0"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[vercmp [macports_version] 2.5.3] <= 0} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- uplevel "default universal_archs_supported {\"i386 x86_64\"}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span> uplevel "default universal_archs_supported {i386 x86_64}"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span> }
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -62,11 +58,7 @@ proc octave.set_module {opt action args} {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[vercmp [macports_version] 2.5.3] <= 0} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default categories {"math science"}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default categories "math science"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default categories "math science"
</span> default master_sites {sourceforge:octave}
default distname {${octave.module}-${version}}
default worksrcdir {${octave.module}}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/pear-1.0.tcl b/_resources/port1.0/group/pear-1.0.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 4e46eb0..88cee37 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/pear-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/pear-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -14,21 +14,6 @@
</span>
# Args placed before the php or pear commands.
options pear.env
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[vercmp [macports_version] 2.5.3] <= 0} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-default pear.env {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "TZ=UTC \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- HOME=${pear.installer} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PHP_PEAR_INSTALL_DIR=${pear.installer}/pear \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PHP_PEAR_BIN_DIR=${pear.installer}/bin \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PHP_PEAR_PHP_BIN=${pear.cmd-php} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PHP_PEAR_CFG_DIR=${pear.installer}/pear/cfg \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PHP_PEAR_DOC_DIR=${pear.installer}/pear/docs \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PHP_PEAR_DATA_DIR=${pear.installer}/pear/data \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PHP_PEAR_WWW_DIR=${pear.installer}/pear/www \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PHP_PEAR_TEST_DIR=${pear.installer}/pear/tests \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PHP_PEAR_SYSCONF_DIR=${pear.installer}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span> default pear.env {
TZ=UTC \
HOME=${pear.installer} \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -42,21 +27,13 @@ default pear.env {
</span> PHP_PEAR_TEST_DIR=${pear.installer}/pear/tests \
PHP_PEAR_SYSCONF_DIR=${pear.installer}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span>
# Args placed after php or pear commands.
options pear.configure.pre_args
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[vercmp [macports_version] 2.5.3] <= 0} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-default pear.configure.pre_args {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "-c ${pear.installer}/pear.conf \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -C ${pear.installer}/pear.conf"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span> default pear.configure.pre_args {
-c ${pear.installer}/pear.conf \
-C ${pear.installer}/pear.conf
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span>
# Where we instruct pear to install our package.
options pear.destroot
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -100,11 +77,7 @@ options pear.package
</span>
# Package file.
options pear.packagefile
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[vercmp [macports_version] 2.5.3] <= 0} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-default pear.packagefile {"${distpath}/[lindex $distfiles 0]"}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span> default pear.packagefile {${distpath}/[lindex $distfiles 0]}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span>
proc pear.setup {package_name package_version {package_channel "pear.php.net"}} {
global name extract.suffix version
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/perl5-1.0.tcl b/_resources/port1.0/group/perl5-1.0.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index f32c63a..1bf9f00 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/perl5-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/perl5-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -185,11 +185,7 @@ proc perl5.setup {module vers {cpandir ""}} {
</span> configure.cmd ${perl5.bin}
configure.env PERL_AUTOINSTALL=--skipdeps
configure.pre_args Makefile.PL
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[vercmp [macports_version] 2.5.3] <= 0} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default configure.args {"INSTALLDIRS=vendor CC=\"${configure.cc}\" LD=\"${configure.cc}\""}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default configure.args {INSTALLDIRS=vendor CC=\"${configure.cc}\" LD=\"${configure.cc}\"}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default configure.args {INSTALLDIRS=vendor CC=\"${configure.cc}\" LD=\"${configure.cc}\"}
</span>
# CCFLAGS can be passed in to "configure" but it's not necessarily inherited.
# LDFLAGS can't be passed in (or if it can, it's not easy to figure out how).
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -252,11 +248,7 @@ proc perl5.use_module_build {} {
</span> depends_lib-append port:p${perl5.major}-module-build
configure.pre_args Build.PL
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[vercmp [macports_version] 2.5.3] <= 0} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default configure.args {"--installdirs=vendor --config cc=\"${configure.cc}\" --config ld=\"${configure.cc}\""}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default configure.args {--installdirs=vendor --config cc=\"${configure.cc}\" --config ld=\"${configure.cc}\"}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default configure.args {--installdirs=vendor --config cc=\"${configure.cc}\" --config ld=\"${configure.cc}\"}
</span>
build.cmd ${perl5.bin}
build.pre_args Build
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/python-1.0.tcl b/_resources/port1.0/group/python-1.0.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index a8b1454..d1a0495 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/python-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/python-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -124,26 +124,15 @@ proc python_set_versions {option action args} {
</span> set pyobjcflags ""
if {${python.add_archflags}} {
if {[variant_exists universal] && [variant_isset universal]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[vercmp [macports_version] 2.5.99] >= 0} {
</span> build.env-append LDFLAGS=${configure.universal_ldflags}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build.env-append LDFLAGS="${configure.universal_ldflags}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span> set pycflags ${configure.universal_cflags}
set pycxxflags ${configure.universal_cxxflags}
set pyobjcflags ${configure.universal_cflags}
} else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[vercmp [macports_version] 2.5.99] >= 0} {
</span> build.env-append FFLAGS=${configure.f77_archflags} \
F90FLAGS=${configure.f90_archflags} \
FCFLAGS=${configure.fc_archflags} \
LDFLAGS=${configure.ld_archflags}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build.env-append FFLAGS="${configure.f77_archflags}" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- F90FLAGS="${configure.f90_archflags}" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- FCFLAGS="${configure.fc_archflags}" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LDFLAGS="${configure.ld_archflags}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span> set pycflags ${configure.cc_archflags}
set pycxxflags ${configure.cxx_archflags}
set pyobjcflags ${configure.objc_archflags}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -164,34 +153,18 @@ proc python_set_versions {option action args} {
</span> }
}
if {$pycflags ne ""} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[vercmp [macports_version] 2.5.99] >= 0} {
</span> build.env-append CFLAGS=$pycflags
<span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build.env-append CFLAGS="$pycflags"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span> }
if {$pycxxflags ne ""} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[vercmp [macports_version] 2.5.99] >= 0} {
</span> build.env-append CXXFLAGS=$pycxxflags
<span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build.env-append CXXFLAGS="$pycxxflags"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span> }
if {$pyobjcflags ne ""} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[vercmp [macports_version] 2.5.99] >= 0} {
</span> build.env-append OBJCFLAGS=$pyobjcflags
<span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build.env-append OBJCFLAGS="$pyobjcflags"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span> }
if {${python.set_compiler}} {
foreach var {cc objc cxx fc f77 f90} {
if {[set configure.${var}] ne ""} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[vercmp [macports_version] 2.5.99] >= 0} {
</span> build.env-append [string toupper $var]=[set configure.${var}]
<span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build.env-append [string toupper $var]="[set configure.${var}]"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span> }
}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -202,26 +175,15 @@ proc python_set_versions {option action args} {
</span> set pyobjcflags ""
if {${python.add_archflags} && ${python.consistent_destroot}} {
if {[variant_exists universal] && [variant_isset universal]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[vercmp [macports_version] 2.5.99] >= 0} {
</span> destroot.env-append LDFLAGS=${configure.universal_ldflags}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- destroot.env-append LDFLAGS="${configure.universal_ldflags}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span> set pycflags ${configure.universal_cflags}
set pycxxflags ${configure.universal_cxxflags}
set pyobjcflags ${configure.universal_cflags}
} else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[vercmp [macports_version] 2.5.99] >= 0} {
</span> destroot.env-append FFLAGS=${configure.f77_archflags} \
F90FLAGS=${configure.f90_archflags} \
FCFLAGS=${configure.fc_archflags} \
LDFLAGS=${configure.ld_archflags}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- destroot.env-append FFLAGS="${configure.f77_archflags}" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- F90FLAGS="${configure.f90_archflags}" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- FCFLAGS="${configure.fc_archflags}" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LDFLAGS="${configure.ld_archflags}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span> set pycflags ${configure.cc_archflags}
set pycxxflags ${configure.cxx_archflags}
set pyobjcflags ${configure.objc_archflags}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -242,34 +204,18 @@ proc python_set_versions {option action args} {
</span> }
}
if {$pycflags ne ""} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[vercmp [macports_version] 2.5.99] >= 0} {
</span> destroot.env-append CFLAGS=$pycflags
<span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- destroot.env-append CFLAGS="$pycflags"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span> }
if {$pycxxflags ne ""} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[vercmp [macports_version] 2.5.99] >= 0} {
</span> destroot.env-append CXXFLAGS=$pycxxflags
<span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- destroot.env-append CXXFLAGS="$pycxxflags"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span> }
if {$pyobjcflags ne ""} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[vercmp [macports_version] 2.5.99] >= 0} {
</span> destroot.env-append OBJCFLAGS=$pyobjcflags
<span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- destroot.env-append OBJCFLAGS="$pyobjcflags"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span> }
if {${python.set_compiler} && ${python.consistent_destroot}} {
foreach var {cc objc cxx fc f77 f90} {
if {[set configure.${var}] ne ""} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[vercmp [macports_version] 2.5.99] >= 0} {
</span> destroot.env-append [string toupper $var]=[set configure.${var}]
<span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- destroot.env-append [string toupper $var]="[set configure.${var}]"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span> }
}
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/qmake5-1.0.tcl b/_resources/port1.0/group/qmake5-1.0.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 0e30697..8fb8e51 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/qmake5-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/qmake5-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -15,11 +15,7 @@ default qt5.top_level {${configure.dir}}
</span> default qt5.cxxflags {}
default qt5.ldflags {}
default qt5.frameworkpaths {}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[vercmp [macports_version] 2.5.3] <= 0} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default qt5.spec_cmd {"-spec "}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default qt5.spec_cmd "-spec "
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default qt5.spec_cmd "-spec "
</span>
# with the -r option, the examples do not install correctly (no source code)
# the install_sources target is not created in the Makefile(s)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/qt5-1.0.tcl b/_resources/port1.0/group/qt5-1.0.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 557f474..b375f7f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/qt5-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/qt5-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -616,11 +616,7 @@ if {[vercmp ${qt5.version} 5.10]>=0} {
</span> } else {
# no PPC support in Qt 5
# see http://lists.qt-project.org/pipermail/interest/2012-December/005038.html
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[vercmp [macports_version] 2.5.3] <= 0} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default supported_archs {"i386 x86_64"}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default supported_archs "i386 x86_64"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default supported_archs "i386 x86_64"
</span> }
if {[vercmp ${qt5.version} 5.9]>=0} {
</pre><pre style='margin:0'>
</pre>