Multiple ports: Expand env when setting another var

As of MacPorts 2.6.0, env is a proper list var, so it needs to be expanded when copying it to another list var.
alterae · Nov 28, 2019 · 9e95a15 · 9e95a15
1 parent b61a508
commit 9e95a15
Show file tree

Hide file tree

Showing 12 changed files with 12 additions and 12 deletions.
diff --git a/devel/inventor/Portfile b/devel/inventor/Portfile
@@ -101,7 +101,7 @@ universal_variant	no
 use_configure	no
 build.env	DYLD_LIBRARY_PATH=${worksrcpath}/lib IVROOT=${destroot}
 
-destroot.env	${build.env}
+destroot.env	{*}${build.env}
 
 post-destroot {
 	      xinstall -m 755 -d ${destroot}${prefix}/share/${name}

diff --git a/devel/protobuf3-java/Portfile b/devel/protobuf3-java/Portfile
@@ -72,4 +72,4 @@ destroot {
 test.run    yes
 test.cmd    mvn3
 test.target test
-test.env    ${build.env}
+test.env    {*}${build.env}
diff --git a/editors/vigor/Portfile b/editors/vigor/Portfile
@@ -34,6 +34,6 @@ configure.args	--enable-tknvi \
 		--x-includes=${prefix}/include \
 		--x-libraries=${prefix}/lib
 
-build.env	${configure.env}
+build.env	{*}${configure.env}
 
 destroot.destdir	prefix=${destroot}${prefix}
diff --git a/java/gnu-classpath-inetlib/Portfile b/java/gnu-classpath-inetlib/Portfile
@@ -26,7 +26,7 @@ configure.env	JAVAC=${prefix}/bin/jikes \
 				BOOTCLASSPATH=${prefix}/share/java/glibj.jar
 configure.args	--with-sasl=${prefix}/share/java/javax-security.jar
 
-build.env       ${configure.env}
+build.env       {*}${configure.env}
 
 destroot {
 	xinstall -m 755 -d ${destroot}${prefix}/share/java

diff --git a/java/gnu-classpathx-activation/Portfile b/java/gnu-classpathx-activation/Portfile
@@ -24,7 +24,7 @@ depends_build	port:jikes
 configure.env	JAVAC=${prefix}/bin/jikes \
 				BOOTCLASSPATH=${prefix}/share/java/glibj.jar
 
-build.env		${configure.env}
+build.env		{*}${configure.env}
 
 livecheck.type	regex
 livecheck.url	https://ftp.gnu.org/gnu/classpathx/?C=M&O=D

diff --git a/java/gnu-classpathx-comm/Portfile b/java/gnu-classpathx-comm/Portfile
@@ -23,7 +23,7 @@ worksrcdir		comm
 configure.env	JAVAC=${prefix}/bin/jikes \
 				BOOTCLASSPATH=${prefix}/share/java/glibj.jar
 
-build.env		${configure.env}
+build.env		{*}${configure.env}
 
 destroot {
 	xinstall -m 755 -d ${destroot}${prefix}/share/java

diff --git a/java/gnu-classpathx-javamail/Portfile b/java/gnu-classpathx-javamail/Portfile
@@ -28,4 +28,4 @@ configure.args	--with-activation-jar=${prefix}/share/java/ \
 				--with-inetlib-jar=${prefix}/share/java \
 				--disable-nntp
 
-build.env		${configure.env}
+build.env		{*}${configure.env}
diff --git a/java/gnu-crypto/Portfile b/java/gnu-crypto/Portfile
@@ -25,7 +25,7 @@ configure.args	--infodir=${prefix}/share/info \
 				--datadir=${prefix}/share/java \
 				--with-jce=yes
 #JAVAC=${prefix}/bin/jikes \
-build.env       ${configure.env}
+build.env       {*}${configure.env}
 
 livecheck.type  regex
 livecheck.url   https://gnupg.org/ftp/gcrypt/${name}/

diff --git a/lang/fpc/Portfile b/lang/fpc/Portfile
@@ -146,7 +146,7 @@ if {${subport} eq "${name}"} {
                         PREFIX=${destroot}${fpcbasepath}
     build.target        all
 
-    destroot.env        ${build.env}
+    destroot.env        {*}${build.env}
 
     # build the compiler utilities msgdif and msg2inc
     post-build {

diff --git a/lang/jikesrvm/Portfile b/lang/jikesrvm/Portfile
@@ -43,7 +43,7 @@ configure.env	CXX=${configure.cxx} \
 configure.cmd	rvm/bin/jconfigure
 configure.pre_args	prototype
 
-build.env		${configure.env}
+build.env		{*}${configure.env}
 build.cmd		./jbuild
 build.dir		${workpath}/build
 build.target

diff --git a/net/cvsup/Portfile b/net/cvsup/Portfile
@@ -31,7 +31,7 @@ build.args      PREFIX=${prefix} M3=cm3 M3FLAGS=-DNOGUI
 
 # Add ${prefix}/cm3/bin to our path
 build.env       PATH=$env(PATH):${prefix}/cm3/bin
-destroot.env    ${build.env}
+destroot.env    {*}${build.env}
 destroot.args   PREFIX=${destroot}${prefix}/ M3=cm3 \
                 MANDIR=${destroot}${prefix}/share/man
 

diff --git a/security/ctool/Portfile b/security/ctool/Portfile
@@ -23,6 +23,6 @@ build.env		CC=${configure.cc} \
 			CFLAGS=${configure.cflags} \
 			CPPFLAGS=${configure.cppflags} \
 			LDFLAGS=${configure.ldflags}
-destroot.env		${build.env}
+destroot.env		{*}${build.env}
 post-configure		{ reinplace "s|/usr/local|${destroot}${prefix}|g" \
 				${worksrcpath}/Makefile }