Skip to content
Permalink
Browse files

minivmac*: Don't use shellescape in MacPorts < 2.6.99

It's not available yet.
  • Loading branch information
ryandesign committed Jun 28, 2020
1 parent aabb1d5 commit a009bb7a667cc6e7cfbece00730fb47043d78d1e
Showing with 16 additions and 0 deletions.
  1. +8 −0 emulators/minivmac-devel/Portfile
  2. +8 −0 emulators/minivmac/Portfile
@@ -114,7 +114,11 @@ if {${my_subport} eq ${my_name}} {
build.dir ${workpath}/build

post-extract {
if {[vercmp [macports_version] 2.6.99] >= 0} {
system -W ${workpath} "unzip -q [shellescape ${distpath}/${my_icons_distfile}]"
} else {
system -W ${workpath} "unzip -q '${distpath}/${my_icons_distfile}'"
}
}

post-patch {
@@ -163,7 +167,11 @@ if {${my_subport} eq ${my_name}} {
set all_configure_args [concat ${configure.pre_args} ${configure.args} ${configure.post_args}]

# Run the configure script.
if {[vercmp [macports_version] 2.6.99] >= 0} {
system -W ${build.dir}/${my_variation_dir} "CC=[shellescape ${configure.cc}] CFLAGS=[shellescape ${configure.optflags}] [shellescape ${worksrcpath}/configure] ${all_configure_args}"
} else {
system -W ${build.dir}/${my_variation_dir} "CC='${configure.cc}' CFLAGS='${configure.optflags}' '${worksrcpath}/configure' ${all_configure_args}"
}

lappend my_variation_dirs [strsed ${my_variation_dir} {g/ /\\\\ /}]

@@ -112,7 +112,11 @@ if {${my_subport} eq ${my_name}} {
build.dir ${workpath}/build

post-extract {
if {[vercmp [macports_version] 2.6.99] >= 0} {
system -W ${workpath} "unzip -q [shellescape ${distpath}/${my_icons_distfile}]"
} else {
system -W ${workpath} "unzip -q '${distpath}/${my_icons_distfile}'"
}
}

post-patch {
@@ -160,7 +164,11 @@ if {${my_subport} eq ${my_name}} {
set all_configure_args [concat ${configure.pre_args} ${configure.args} ${configure.post_args}]

# Run the configure script.
if {[vercmp [macports_version] 2.6.99] >= 0} {
system -W ${build.dir}/${my_variation_dir} "CC=[shellescape ${configure.cc}] CFLAGS=[shellescape ${configure.optflags}] [shellescape ${worksrcpath}/configure] ${all_configure_args}"
} else {
system -W ${build.dir}/${my_variation_dir} "CC='${configure.cc}' CFLAGS='${configure.optflags}' '${worksrcpath}/configure' ${all_configure_args}"
}

lappend my_variation_dirs [strsed ${my_variation_dir} {g/ /\\\\ /}]

0 comments on commit a009bb7

Please sign in to comment.
You can’t perform that action at this time.