<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/9e95a15fcca68faa0b04a05441d757b7bb609e8c">https://github.com/macports/macports-ports/commit/9e95a15fcca68faa0b04a05441d757b7bb609e8c</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 9e95a15fcca68faa0b04a05441d757b7bb609e8c
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Thu Nov 28 04:55:23 2019 -0600
<span style='display:block; white-space:pre;color:#404040;'> Multiple ports: Expand env when setting another var
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> As of MacPorts 2.6.0, env is a proper list var, so it needs to be
</span><span style='display:block; white-space:pre;color:#404040;'> expanded when copying it to another list var.
</span>---
devel/inventor/Portfile | 2 +-
devel/protobuf3-java/Portfile | 2 +-
editors/vigor/Portfile | 2 +-
java/gnu-classpath-inetlib/Portfile | 2 +-
java/gnu-classpathx-activation/Portfile | 2 +-
java/gnu-classpathx-comm/Portfile | 2 +-
java/gnu-classpathx-javamail/Portfile | 2 +-
java/gnu-crypto/Portfile | 2 +-
lang/fpc/Portfile | 2 +-
lang/jikesrvm/Portfile | 2 +-
net/cvsup/Portfile | 2 +-
security/ctool/Portfile | 2 +-
12 files changed, 12 insertions(+), 12 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/inventor/Portfile b/devel/inventor/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index a41079b..915eacf 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/inventor/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/inventor/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -101,7 +101,7 @@ universal_variant no
</span> use_configure no
build.env DYLD_LIBRARY_PATH=${worksrcpath}/lib IVROOT=${destroot}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot.env ${build.env}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+destroot.env {*}${build.env}
</span>
post-destroot {
xinstall -m 755 -d ${destroot}${prefix}/share/${name}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/protobuf3-java/Portfile b/devel/protobuf3-java/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index ee1bb78..8205451 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/protobuf3-java/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/protobuf3-java/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -72,4 +72,4 @@ destroot {
</span> test.run yes
test.cmd mvn3
test.target test
<span style='display:block; white-space:pre;background:#ffe0e0;'>-test.env ${build.env}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+test.env {*}${build.env}
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/editors/vigor/Portfile b/editors/vigor/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 4982462..e637ff2 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/editors/vigor/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/editors/vigor/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -34,6 +34,6 @@ configure.args --enable-tknvi \
</span> --x-includes=${prefix}/include \
--x-libraries=${prefix}/lib
<span style='display:block; white-space:pre;background:#ffe0e0;'>-build.env ${configure.env}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env {*}${configure.env}
</span>
destroot.destdir prefix=${destroot}${prefix}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/java/gnu-classpath-inetlib/Portfile b/java/gnu-classpath-inetlib/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 79aa690..ea3592f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/java/gnu-classpath-inetlib/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/java/gnu-classpath-inetlib/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -26,7 +26,7 @@ configure.env JAVAC=${prefix}/bin/jikes \
</span> BOOTCLASSPATH=${prefix}/share/java/glibj.jar
configure.args --with-sasl=${prefix}/share/java/javax-security.jar
<span style='display:block; white-space:pre;background:#ffe0e0;'>-build.env ${configure.env}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env {*}${configure.env}
</span>
destroot {
xinstall -m 755 -d ${destroot}${prefix}/share/java
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/java/gnu-classpathx-activation/Portfile b/java/gnu-classpathx-activation/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 9cfda96..ea1fbfa 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/java/gnu-classpathx-activation/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/java/gnu-classpathx-activation/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -24,7 +24,7 @@ depends_build port:jikes
</span> configure.env JAVAC=${prefix}/bin/jikes \
BOOTCLASSPATH=${prefix}/share/java/glibj.jar
<span style='display:block; white-space:pre;background:#ffe0e0;'>-build.env ${configure.env}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env {*}${configure.env}
</span>
livecheck.type regex
livecheck.url https://ftp.gnu.org/gnu/classpathx/?C=M&O=D
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/java/gnu-classpathx-comm/Portfile b/java/gnu-classpathx-comm/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 44b330c..4c5b25c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/java/gnu-classpathx-comm/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/java/gnu-classpathx-comm/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -23,7 +23,7 @@ worksrcdir comm
</span> configure.env JAVAC=${prefix}/bin/jikes \
BOOTCLASSPATH=${prefix}/share/java/glibj.jar
<span style='display:block; white-space:pre;background:#ffe0e0;'>-build.env ${configure.env}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env {*}${configure.env}
</span>
destroot {
xinstall -m 755 -d ${destroot}${prefix}/share/java
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/java/gnu-classpathx-javamail/Portfile b/java/gnu-classpathx-javamail/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index f28fa51..e737073 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/java/gnu-classpathx-javamail/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/java/gnu-classpathx-javamail/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -28,4 +28,4 @@ configure.args --with-activation-jar=${prefix}/share/java/ \
</span> --with-inetlib-jar=${prefix}/share/java \
--disable-nntp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-build.env ${configure.env}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env {*}${configure.env}
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/java/gnu-crypto/Portfile b/java/gnu-crypto/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 26022ee..caae995 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/java/gnu-crypto/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/java/gnu-crypto/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,7 +25,7 @@ configure.args --infodir=${prefix}/share/info \
</span> --datadir=${prefix}/share/java \
--with-jce=yes
#JAVAC=${prefix}/bin/jikes \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-build.env ${configure.env}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env {*}${configure.env}
</span>
livecheck.type regex
livecheck.url https://gnupg.org/ftp/gcrypt/${name}/
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/fpc/Portfile b/lang/fpc/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 30bf86b..7930a57 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/fpc/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/fpc/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -146,7 +146,7 @@ if {${subport} eq "${name}"} {
</span> PREFIX=${destroot}${fpcbasepath}
build.target all
<span style='display:block; white-space:pre;background:#ffe0e0;'>- destroot.env ${build.env}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot.env {*}${build.env}
</span>
# build the compiler utilities msgdif and msg2inc
post-build {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/jikesrvm/Portfile b/lang/jikesrvm/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 57bc154..9d3ac90 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/jikesrvm/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/jikesrvm/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -43,7 +43,7 @@ configure.env CXX=${configure.cxx} \
</span> configure.cmd rvm/bin/jconfigure
configure.pre_args prototype
<span style='display:block; white-space:pre;background:#ffe0e0;'>-build.env ${configure.env}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env {*}${configure.env}
</span> build.cmd ./jbuild
build.dir ${workpath}/build
build.target
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/cvsup/Portfile b/net/cvsup/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index a456d21..16c67ad 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/cvsup/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/cvsup/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -31,7 +31,7 @@ build.args PREFIX=${prefix} M3=cm3 M3FLAGS=-DNOGUI
</span>
# Add ${prefix}/cm3/bin to our path
build.env PATH=$env(PATH):${prefix}/cm3/bin
<span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot.env ${build.env}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+destroot.env {*}${build.env}
</span> destroot.args PREFIX=${destroot}${prefix}/ M3=cm3 \
MANDIR=${destroot}${prefix}/share/man
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/security/ctool/Portfile b/security/ctool/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 904506b..750267e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/security/ctool/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/security/ctool/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -23,6 +23,6 @@ build.env CC=${configure.cc} \
</span> CFLAGS=${configure.cflags} \
CPPFLAGS=${configure.cppflags} \
LDFLAGS=${configure.ldflags}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot.env ${build.env}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+destroot.env {*}${build.env}
</span> post-configure { reinplace "s|/usr/local|${destroot}${prefix}|g" \
${worksrcpath}/Makefile }
</pre><pre style='margin:0'>
</pre>