<pre style='margin:0'>
Michael Dickens (michaelld) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/617fc70f166b5fde0e9ca1ae47c5173cb85c5316">https://github.com/macports/macports-ports/commit/617fc70f166b5fde0e9ca1ae47c5173cb85c5316</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 617fc70 swig-php: add variants for php7X and make 7.1 the default.
</span>617fc70 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 617fc70f166b5fde0e9ca1ae47c5173cb85c5316
</span>Author: Michael Dickens <michaelld@macports.org>
AuthorDate: Thu Feb 15 09:23:11 2018 -0500
<span style='display:block; white-space:pre;color:#404040;'> swig-php: add variants for php7X and make 7.1 the default.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/54986
</span>---
devel/swig/Portfile | 85 ++++++++++++++++++++++++++++++++++++++---------------
1 file changed, 61 insertions(+), 24 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/swig/Portfile b/devel/swig/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 2199175..14d04bb 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/swig/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/swig/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,6 +4,7 @@ PortSystem 1.0
</span>
name swig
version 3.0.12
<span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> checksums rmd160 41877e9de3ff598731ef36161f77fa66dec3c301 \
sha256 7cf9f447ae7ed1c51722efc45e7f14418d15d7a1e143ac9f09a668999f4fc94d
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -43,6 +44,8 @@ build.target
</span> test.run yes
test.target check
<span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append --without-php5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> array set bindings {
chicken {port:chicken chicken}
clisp {port:clisp clisp}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -56,7 +59,7 @@ array set bindings {
</span> ocaml {port:ocaml ocaml}
octave {path:bin/octave:octave octave}
perl {path:bin/perl:perl5 perl5=${prefix}/bin/perl}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- php {port:php55 "php=${prefix}/bin/php55"}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ php {port:php71 "php=${prefix}/bin/php71"}
</span> pike {port:pike pike}
python {port:python_select python}
r {port:R r}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -87,42 +90,76 @@ foreach lang [lsort [array names bindings]] {
</span>
subport swig-php {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # patch to fix finding of "php-configXY"
</span> patchfiles-append patch-configure.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>- variant php52 conflicts php53 php54 php55 php56 description {build using PHP 5.2} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-delete port:php55
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant php52 conflicts php53 php54 php55 php56 php70 php71 php72 description {build using PHP 5.2} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-delete port:php71
</span> depends_lib-append port:php52
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-delete --with-php=${prefix}/bin/php55
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --with-php=${prefix}/bin/php52
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-delete --with-php=${prefix}/bin/php71
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-delete --without-php5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --with-php5=${prefix}/bin/php52 --without-php
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>- variant php53 conflicts php52 php54 php55 php56 description {build using PHP 5.3} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-delete port:php55
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant php53 conflicts php52 php54 php55 php56 php70 php71 php72 description {build using PHP 5.3} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-delete port:php71
</span> depends_lib-append port:php53
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-delete --with-php=${prefix}/bin/php55
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --with-php=${prefix}/bin/php53
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-delete --with-php=${prefix}/bin/php71
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-delete --without-php5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --with-php5=${prefix}/bin/php53 --without-php
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>- variant php54 conflicts php52 php53 php55 php56 description {build using PHP 5.4} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-delete port:php55
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant php54 conflicts php52 php53 php55 php56php70 php71 php72 description {build using PHP 5.4} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-delete port:php71
</span> depends_lib-append port:php54
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-delete --with-php=${prefix}/bin/php55
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --with-php=${prefix}/bin/php54
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-delete --with-php=${prefix}/bin/php71
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-delete --without-php5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --with-php5=${prefix}/bin/php54 --without-php
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant php55 conflicts php52 php53 php54 php56 php70 php71 php72 description {build using PHP 5.5} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-delete port:php71
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:php55
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-delete --with-php=${prefix}/bin/php71
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-delete --without-php5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --with-php5=${prefix}/bin/php55 --without-php
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>- variant php55 conflicts php52 php53 php54 php56 description {build using PHP 5.5} {}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- variant php56 conflicts php52 php53 php54 php55 description {build using PHP 5.6} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-delete port:php55
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant php56 conflicts php52 php53 php54 php55 php70 php71 php72 description {build using PHP 5.6} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-delete port:php71
</span> depends_lib-append port:php56
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-delete --with-php=${prefix}/bin/php55
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --with-php=${prefix}/bin/php56
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-delete --with-php=${prefix}/bin/php71
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-delete --without-php5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --with-php5=${prefix}/bin/php56 --without-php
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant php70 conflicts php52 php53 php54 php55 php56 php71 php72 description {build using PHP 7.0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-delete port:php71
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:php70
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-delete --with-php=${prefix}/bin/php71
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --with-php=${prefix}/bin/php70
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant php71 conflicts php52 php53 php54 php55 php56 php70 php72 description {build using PHP 7.1} {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant php72 conflicts php52 php53 php54 php55 php56 php70 php71 description {build using PHP 7.2} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-delete port:php71
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:php72
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-delete --with-php=${prefix}/bin/php71
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --with-php=${prefix}/bin/php72
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {![variant_isset php52] && ![variant_isset php53] && ![variant_isset php54] &&
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ![variant_isset php55] && ![variant_isset php56]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default_variants +php55
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![variant_isset php52] && ![variant_isset php53] &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ![variant_isset php54] && ![variant_isset php55] &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ![variant_isset php56] && ![variant_isset php70] &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ![variant_isset php71] && ![variant_isset php72]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants +php71
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {![variant_isset php52] && ![variant_isset php53] && ![variant_isset php54] &&
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ![variant_isset php55] && ![variant_isset php56]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_error "\n\nA +php5X variant must be selected; the variant '-php55' cannot be used alone.\n"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![variant_isset php52] && ![variant_isset php53] &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ![variant_isset php54] && ![variant_isset php55] &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ![variant_isset php56] && ![variant_isset php70] &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ![variant_isset php71] && ![variant_isset php72]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_error "\n\nA +phpXY variant must be selected; the variant '-php71' cannot be used alone.\n"
</span> return -code error "Invalid variant selection"
}
}
</pre><pre style='margin:0'>
</pre>