<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/58369e469425fafca368aacb307b9234f6bc9022">https://github.com/macports/macports-ports/commit/58369e469425fafca368aacb307b9234f6bc9022</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 58369e4 Update 'default' quoting in portgroups
</span>58369e4 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 58369e469425fafca368aacb307b9234f6bc9022
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Tue Sep 11 21:21:14 2018 +1000
<span style='display:block; white-space:pre;color:#404040;'> Update 'default' quoting in portgroups
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Adapt to changes in base master, while maintaining compatibility with
</span><span style='display:block; white-space:pre;color:#404040;'> the current release. Also adjust quoting for consistency: braces where
</span><span style='display:block; white-space:pre;color:#404040;'> deferred evaluation is desired, otherwise quotes where the value
</span><span style='display:block; white-space:pre;color:#404040;'> contains spaces, or no quoting if it is a single word literal.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes: https://trac.macports.org/ticket/57118
</span>---
_resources/port1.0/group/apache2-1.0.tcl | 96 +++++++++++++++--------------
_resources/port1.0/group/bitbucket-1.0.tcl | 4 +-
_resources/port1.0/group/cargo-1.0.tcl | 6 +-
_resources/port1.0/group/cmake-1.0.tcl | 6 +-
_resources/port1.0/group/cmake-1.1.tcl | 16 +++--
_resources/port1.0/group/crossgcc-1.0.tcl | 6 +-
_resources/port1.0/group/github-1.0.tcl | 4 +-
_resources/port1.0/group/gnustep-1.0.tcl | 4 +-
_resources/port1.0/group/muniversal-1.0.tcl | 8 +--
_resources/port1.0/group/octave-1.0.tcl | 6 +-
_resources/port1.0/group/python-1.0.tcl | 12 +++-
_resources/port1.0/group/qmake5-1.0.tcl | 6 +-
_resources/port1.0/group/qt5-1.0.tcl | 8 ++-
_resources/port1.0/group/ruby-1.0.tcl | 2 +-
_resources/port1.0/group/waf-1.0.tcl | 2 +-
15 files changed, 110 insertions(+), 76 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 1bc9636..82dae38 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;'>@@ -4,108 +4,112 @@
</span> # values to be used in eg configuration files
#
options apache2.prefix
<span style='display:block; white-space:pre;background:#ffe0e0;'>-default apache2.prefix {"${prefix}"}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default apache2.prefix {${prefix}}
</span> options apache2.exec_prefix
<span style='display:block; white-space:pre;background:#ffe0e0;'>-default apache2.exec_prefix {"${apache2.prefix}"}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default apache2.exec_prefix {${apache2.prefix}}
</span> options apache2.name
<span style='display:block; white-space:pre;background:#ffe0e0;'>-default apache2.name {"${name}"}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default apache2.name {${name}}
</span> options apache2.exec_name
<span style='display:block; white-space:pre;background:#ffe0e0;'>-default apache2.exec_name {"httpd"}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default apache2.exec_name httpd
</span> options apache2.bindir
<span style='display:block; white-space:pre;background:#ffe0e0;'>-default apache2.bindir {"${apache2.exec_prefix}/bin"}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default apache2.bindir {${apache2.exec_prefix}/bin}
</span> options apache2.sbindir
<span style='display:block; white-space:pre;background:#ffe0e0;'>-default apache2.sbindir {"${apache2.exec_prefix}/sbin"}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default apache2.sbindir {${apache2.exec_prefix}/sbin}
</span> options apache2.libdir
<span style='display:block; white-space:pre;background:#ffe0e0;'>-default apache2.libdir {"${apache2.exec_prefix}/lib/${apache2.name}"}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default apache2.libdir {${apache2.exec_prefix}/lib/${apache2.name}}
</span> options apache2.libexecdir
<span style='display:block; white-space:pre;background:#ffe0e0;'>-default apache2.libexecdir {"${apache2.libdir}/modules"}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default apache2.libexecdir {${apache2.libdir}/modules}
</span> options apache2.mandir
<span style='display:block; white-space:pre;background:#ffe0e0;'>-default apache2.mandir {"${apache2.prefix}/share/${apache2.name}/man"}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default apache2.mandir {${apache2.prefix}/share/${apache2.name}/man}
</span> options apache2.docdir
<span style='display:block; white-space:pre;background:#ffe0e0;'>-default apache2.docdir {"${apache2.prefix}/share/doc/${apache2.name}"}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default apache2.docdir {${apache2.prefix}/share/doc/${apache2.name}}
</span> options apache2.sysconfdir
<span style='display:block; white-space:pre;background:#ffe0e0;'>-default apache2.sysconfdir {"${apache2.prefix}/etc/${apache2.name}"}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default apache2.sysconfdir {${apache2.prefix}/etc/${apache2.name}}
</span> options apache2.datadir
<span style='display:block; white-space:pre;background:#ffe0e0;'>-default apache2.datadir {"${apache2.prefix}/www/${apache2.name}"}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default apache2.datadir {${apache2.prefix}/www/${apache2.name}}
</span> options apache2.installbuilddir
<span style='display:block; white-space:pre;background:#ffe0e0;'>-default apache2.installbuilddir {"${apache2.datadir}/build"}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default apache2.installbuilddir {${apache2.datadir}/build}
</span> options apache2.errordir
<span style='display:block; white-space:pre;background:#ffe0e0;'>-default apache2.errordir {"${apache2.datadir}/error"}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default apache2.errordir {${apache2.datadir}/error}
</span> options apache2.iconsdir
<span style='display:block; white-space:pre;background:#ffe0e0;'>-default apache2.iconsdir {"${apache2.datadir}/icons"}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default apache2.iconsdir {${apache2.datadir}/icons}
</span> options apache2.htdocsdir
<span style='display:block; white-space:pre;background:#ffe0e0;'>-default apache2.htdocsdir {"${apache2.datadir}/html"}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default apache2.htdocsdir {${apache2.datadir}/html}
</span> options apache2.manualdir
<span style='display:block; white-space:pre;background:#ffe0e0;'>-default apache2.manualdir {"${apache2.datadir}/manual"}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default apache2.manualdir {${apache2.datadir}/manual}
</span> options apache2.cgidir
<span style='display:block; white-space:pre;background:#ffe0e0;'>-default apache2.cgidir {"${apache2.datadir}/cgi-bin"}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default apache2.cgidir {${apache2.datadir}/cgi-bin}
</span> options apache2.includedir
<span style='display:block; white-space:pre;background:#ffe0e0;'>-default apache2.includedir {"${apache2.prefix}/include/${apache2.name}"}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default apache2.includedir {${apache2.prefix}/include/${apache2.name}}
</span> options apache2.localstatedir
<span style='display:block; white-space:pre;background:#ffe0e0;'>-default apache2.localstatedir {"${apache2.prefix}/var"}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default apache2.localstatedir {${apache2.prefix}/var}
</span> options apache2.runtimedir
<span style='display:block; white-space:pre;background:#ffe0e0;'>-default apache2.runtimedir {"${apache2.localstatedir}/run/${apache2.name}"}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default apache2.runtimedir {${apache2.localstatedir}/run/${apache2.name}}
</span> options apache2.logfiledir
<span style='display:block; white-space:pre;background:#ffe0e0;'>-default apache2.logfiledir {"${apache2.localstatedir}/log/${apache2.name}"}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default apache2.logfiledir {${apache2.localstatedir}/log/${apache2.name}}
</span> options apache2.proxycachedir
<span style='display:block; white-space:pre;background:#ffe0e0;'>-default apache2.proxycachedir {"${apache2.localstatedir}/tmp/${apache2.name}"}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default apache2.proxycachedir {${apache2.localstatedir}/tmp/${apache2.name}}
</span>
options apache2.user
<span style='display:block; white-space:pre;background:#ffe0e0;'>-default apache2.user {"_www"}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default apache2.user _www
</span> options apache2.group
<span style='display:block; white-space:pre;background:#ffe0e0;'>-default apache2.group {"_www"}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default apache2.group _www
</span>
# General settings
options apache2.listen_ports
<span style='display:block; white-space:pre;background:#ffe0e0;'>-default apache2.listen_ports {{80 443}}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp [macports_version] 2.5.3] <= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default apache2.listen_ports {"80 443"}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default apache2.listen_ports "80 443"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span> options apache2.contact
<span style='display:block; white-space:pre;background:#ffe0e0;'>-default apache2.contact {"ops@example.com"}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default apache2.contact ops@example.com
</span> options apache2.timeout
<span style='display:block; white-space:pre;background:#ffe0e0;'>-default apache2.timeout {300}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default apache2.timeout 300
</span> options apache2.keepalive
<span style='display:block; white-space:pre;background:#ffe0e0;'>-default apache2.keepalive {"On"}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default apache2.keepalive On
</span> options apache2.keepaliverequests
<span style='display:block; white-space:pre;background:#ffe0e0;'>-default apache2.keepaliverequests {100}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default apache2.keepaliverequests 100
</span> options apache2.keepalivetimeout
<span style='display:block; white-space:pre;background:#ffe0e0;'>-default apache2.keepalivetimeout {5}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default apache2.keepalivetimeout 5
</span>
# Security
options apache2.servertokens
<span style='display:block; white-space:pre;background:#ffe0e0;'>-default apache2.servertokens {"Prod"}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default apache2.servertokens Prod
</span> options apache2.serversignature
<span style='display:block; white-space:pre;background:#ffe0e0;'>-default apache2.serversignature {"On"}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default apache2.serversignature On
</span> options apache2.traceenable
<span style='display:block; white-space:pre;background:#ffe0e0;'>-default apache2.traceenable {"On"}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default apache2.traceenable On
</span>
# mod_auth_openids
options apache2.allowed_openids
<span style='display:block; white-space:pre;background:#ffe0e0;'>-default apache2.allowed_openids {""}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default apache2.allowed_openids {}
</span>
# Prefork Attributes
options apache2.prefork.startservers
<span style='display:block; white-space:pre;background:#ffe0e0;'>-default apache2.prefork.startservers {16}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default apache2.prefork.startservers 16
</span> options apache2.prefork.minspareservers
<span style='display:block; white-space:pre;background:#ffe0e0;'>-default apache2.prefork.minspareservers {16}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default apache2.prefork.minspareservers 16
</span> options apache2.prefork.maxspareservers
<span style='display:block; white-space:pre;background:#ffe0e0;'>-default apache2.prefork.maxspareservers {32}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default apache2.prefork.maxspareservers 32
</span> options apache2.prefork.serverlimit
<span style='display:block; white-space:pre;background:#ffe0e0;'>-default apache2.prefork.serverlimit {400}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default apache2.prefork.serverlimit 400
</span> options apache2.prefork.maxclients
<span style='display:block; white-space:pre;background:#ffe0e0;'>-default apache2.prefork.maxclients {400}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default apache2.prefork.maxclients 400
</span> options apache2.prefork.threadsperchild
<span style='display:block; white-space:pre;background:#ffe0e0;'>-default apache2.prefork.threadsperchild {10000}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default apache2.prefork.threadsperchild 10000
</span>
# Worker Attributes
options apache2.worker.startservers
<span style='display:block; white-space:pre;background:#ffe0e0;'>-default apache2.worker.startservers {4}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default apache2.worker.startservers 4
</span> options apache2.worker.maxclients
<span style='display:block; white-space:pre;background:#ffe0e0;'>-default apache2.worker.maxclients {1024}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default apache2.worker.maxclients 1024
</span> options apache2.worker.minsparethreads
<span style='display:block; white-space:pre;background:#ffe0e0;'>-default apache2.worker.minsparethreads {64}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default apache2.worker.minsparethreads 64
</span> options apache2.worker.maxsparethreads
<span style='display:block; white-space:pre;background:#ffe0e0;'>-default apache2.worker.maxsparethreads {192}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default apache2.worker.maxsparethreads 192
</span> options apache2.worker.threadsperchild
<span style='display:block; white-space:pre;background:#ffe0e0;'>-default apache2.worker.threadsperchild {64}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default apache2.worker.threadsperchild 64
</span>
# Default modules to enable via include_recipe
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/bitbucket-1.0.tcl b/_resources/port1.0/group/bitbucket-1.0.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 9c8dc69..7f92618 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/bitbucket-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/bitbucket-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -15,7 +15,7 @@ default bitbucket.homepage {https://bitbucket.org/${bitbucket.author}/${bitbucke
</span>
# Later code assumes that bitbucket.master_sites is a simple string, not a list.
default bitbucket.master_sites {${bitbucket.homepage}/get}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-default bitbucket.tarball_from {tags}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default bitbucket.tarball_from tags
</span>
default master_sites {${bitbucket.master_sites}}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -28,7 +28,7 @@ proc handle_tarball_from {option action args} {
</span> if {[string equal ${action} "set"] && ${args} eq "downloads"} {
bitbucket.tarball_from ${args}
bitbucket.master_sites https://bitbucket.org/${bitbucket.author}/${bitbucket.project}/downloads
<span style='display:block; white-space:pre;background:#ffe0e0;'>- default livecheck.url ${bitbucket.master_sites}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default livecheck.url {${bitbucket.master_sites}}
</span> default distname {${bitbucket.project}-${bitbucket.version}}
}
}
<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 fd92992..dde36fe 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,7 +19,11 @@ PortGroup cargo_fetch 1.0
</span> use_configure no
default universal_variant yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-default build.cmd {"${cargo.bin} build"}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp [macports_version] 2.5.3] <= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default build.cmd {"${cargo.bin} build"}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default build.cmd {${cargo.bin} build}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</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/cmake-1.0.tcl b/_resources/port1.0/group/cmake-1.0.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 22345d5..4c77253 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/cmake-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/cmake-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -7,7 +7,7 @@ options cmake.build_dir cmake.install_prefix cmake.out_of_source
</span>
default cmake.build_dir {${workpath}/build}
default cmake.install_prefix {${prefix}}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-default cmake.out_of_source {no}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default cmake.out_of_source no
</span>
# standard place to install extra CMake modules
set cmake_share_module_dir ${prefix}/share/cmake/Modules
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -164,8 +164,8 @@ variant debug description "Enable debug binaries" {
</span>
default build.dir {${configure.dir}}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-default build.post_args {VERBOSE=ON}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default build.post_args VERBOSE=ON
</span>
# Generated Unix Makefiles contain a "fast" install target that begins
# installing immediately instead of checking build dependencies again.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-default destroot.target {install/fast}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default destroot.target install/fast
</span><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 e7e0e4d..9da442d 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;'>@@ -23,7 +23,7 @@ options cmake.build_dir \
</span> ## Explanation of and default values for the options defined above ##
# out-of-source builds are the default
<span style='display:block; white-space:pre;background:#ffe0e0;'>-default cmake.out_of_source {yes}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default cmake.out_of_source yes
</span>
# cmake.build_dir defines where the build will take place
default cmake.build_dir {${workpath}/build}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -33,13 +33,13 @@ default cmake.source_dir {${worksrcpath}}
</span> # set CMAKE_OSX_ARCHITECTURES when necessary.
# This can be deactivated when (non-Apple) compilers are used
# that don't support the corresponding -arch options.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-default cmake.set_osx_architectures {yes}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default cmake.set_osx_architectures yes
</span>
# cmake.build_type defines the type of build; it defaults to "MacPorts"
# which means only the compiler options set through configure.c*flags and configure.optflags
# are used, plus those set in the port's CMake files. Alternative pre-defined types are
# Release, Debug, RelWithDebInfo and MinSizeRel; "None" should work like "MacPorts".
<span style='display:block; white-space:pre;background:#ffe0e0;'>-default cmake.build_type {MacPorts}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default cmake.build_type MacPorts
</span>
# cmake-based ports may want to modify the install prefix
default cmake.install_prefix {${prefix}}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -72,13 +72,17 @@ 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;'>-default cmake.generator {"CodeBlocks - Unix Makefiles"}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp [macports_version] 2.5.3] <= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default cmake.generator {"CodeBlocks - Unix Makefiles"}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default cmake.generator "CodeBlocks - Unix Makefiles"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</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
# we install" you normally get with `make install`. That check should be
# redundant in normal destroot steps, because we just completed the build step.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-default destroot.target {install/fast}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default destroot.target install/fast
</span>
## ############################################################### ##
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -187,7 +191,7 @@ proc cmake::handle_generator {option action args} {
</span>
default configure.dir {[cmake::build_dir]}
default build.dir {${configure.dir}}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-default build.post_args {VERBOSE=ON}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default build.post_args VERBOSE=ON
</span>
# cache the configure.ccache variable (it will be overridden in the pre-configure step)
set cmake::ccache_cache ${configure.ccache}
<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 6789c94..397668b 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,7 +18,11 @@
</span> options crossgcc.target \
crossgcc.languages
<span style='display:block; white-space:pre;background:#ffe0e0;'>-default crossgcc.languages {{c c++}}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp [macports_version] 2.5.3] <= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default crossgcc.languages {"c c++"}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default crossgcc.languages "c c++"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</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 5324573..491db16 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;'>@@ -23,7 +23,7 @@ default github.master_sites {${github.homepage}/tarball/${git.branch}}
</span> default master_sites {${github.master_sites}}
options github.tarball_from
<span style='display:block; white-space:pre;background:#ffe0e0;'>-default github.tarball_from {tags}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default github.tarball_from tags
</span> option_proc github.tarball_from handle_tarball_from
proc handle_tarball_from {option action args} {
global github.author github.project github.master_sites git.branch github.homepage
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -48,7 +48,7 @@ proc handle_tarball_from {option action args} {
</span> }
options github.livecheck.branch
<span style='display:block; white-space:pre;background:#ffe0e0;'>-default github.livecheck.branch {master}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default github.livecheck.branch master
</span>
options github.livecheck.regex
default github.livecheck.regex {{([^"]+)}}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/gnustep-1.0.tcl b/_resources/port1.0/group/gnustep-1.0.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index ebd9cc5..a0314e1 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/gnustep-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/gnustep-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -161,8 +161,8 @@ platform darwin 9 {
</span>
options system_library
options local_library
<span style='display:block; white-space:pre;background:#ffe0e0;'>-default system_library [set_system_library]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-default local_library [set_local_library]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default system_library {[set_system_library]}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default local_library {[set_local_library]}
</span>
#
# Default values for this group :
<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 37427e5..a3ad3d4 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;'>@@ -24,10 +24,10 @@
</span>
options universal_archs_supported merger_must_run_binaries merger_no_3_archs merger_arch_flag merger_arch_compiler
default universal_archs_supported {${universal_archs}}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-default merger_must_run_binaries {no}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-default merger_no_3_archs {no}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-default merger_arch_flag {yes}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-default merger_arch_compiler {no}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default merger_must_run_binaries no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default merger_no_3_archs no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default merger_arch_flag yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default merger_arch_compiler no
</span>
proc muniversal_arch_flag_supported {args} {
global configure.compiler
<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 0a8410c..345715e 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;'>@@ -58,7 +58,11 @@ proc octave.set_module {opt action args} {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-default categories {math science}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp [macports_version] 2.5.3] <= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default categories {"math science"}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default categories "math science"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</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/python-1.0.tcl b/_resources/port1.0/group/python-1.0.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index b5f933d..e9b3b3f 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;'>@@ -229,9 +229,15 @@ default python.pkgd {[python_get_defaults pkgd]}
</span> default python.libdir {${python.prefix}/lib/python${python.branch}}
default python.include {[python_get_defaults include]}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-default build.cmd {"${python.bin} setup.py [python_get_defaults setup_args]"}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-default destroot.cmd {"${python.bin} setup.py [python_get_defaults setup_args]"}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-default destroot.destdir {"--prefix=[python_get_defaults setup_prefix] --root=${destroot}"}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp [macports_version] 2.5.3] <= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default build.cmd {"${python.bin} setup.py [python_get_defaults setup_args]"}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default destroot.cmd {"${python.bin} setup.py [python_get_defaults setup_args]"}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default destroot.destdir {"--prefix=[python_get_defaults setup_prefix] --root=${destroot}"}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default build.cmd {${python.bin} setup.py [python_get_defaults setup_args]}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default destroot.cmd {${python.bin} setup.py [python_get_defaults setup_args]}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default destroot.destdir {--prefix=[python_get_defaults setup_prefix] --root=${destroot}}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
proc python_get_defaults {var} {
global python.version python.branch prefix python.prefix
<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 de0fcb8..78446ca 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,7 +15,11 @@ 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;'>-default qt5.spec_cmd {"-spec "}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp [macports_version] 2.5.3] <= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default qt5.spec_cmd {"-spec "}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default qt5.spec_cmd "-spec "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</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 dcc4d6f..061652c 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;'>@@ -593,11 +593,15 @@ compiler.blacklist-append *gcc*
</span>
if {[vercmp ${qt5.version} 5.10]>=0} {
# see https://bugreports.qt.io/browse/QTBUG-58401
<span style='display:block; white-space:pre;background:#ffe0e0;'>- default supported_archs {"x86_64"}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default supported_archs x86_64
</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;'>- default supported_archs {"i386 x86_64"}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp [macports_version] 2.5.3] <= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default supported_archs {"i386 x86_64"}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default supported_archs "i386 x86_64"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
if {[vercmp ${qt5.version} 5.9]>=0} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/ruby-1.0.tcl b/_resources/port1.0/group/ruby-1.0.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index d17773d..8b8723d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/ruby-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/ruby-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -115,7 +115,7 @@ set ruby.prog_suffix ""
</span> options ruby.config_rubyprog_name
default ruby.config_rubyprog_name --rubyprog
<span style='display:block; white-space:pre;background:#ffe0e0;'>-default ruby.branch ${ruby.default_branch}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default ruby.branch {${ruby.default_branch}}
</span>
options ruby.link_binaries ruby.link_binaries_suffix
default ruby.link_binaries yes
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/waf-1.0.tcl b/_resources/port1.0/group/waf-1.0.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index d4f59ed..f68521a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/waf-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/waf-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +1,7 @@
</span> # -*- 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
options waf.python
<span style='display:block; white-space:pre;background:#ffe0e0;'>-default waf.python ${prefix}/bin/python2.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default waf.python {${prefix}/bin/python2.7}
</span>
depends_build-append port:python27
</pre><pre style='margin:0'>
</pre>