<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/d41a0388cfdf7e6dbf3353d89939eaff876945ec">https://github.com/macports/macports-ports/commit/d41a0388cfdf7e6dbf3353d89939eaff876945ec</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 d41a038 Remove eval [subst {...}] antipattern from ports
</span>d41a038 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit d41a0388cfdf7e6dbf3353d89939eaff876945ec
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Thu Nov 30 10:44:24 2017 +1100
<span style='display:block; white-space:pre;color:#404040;'> Remove eval [subst {...}] antipattern from ports
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Disabling substitution by using braces but then adding an extra interpreter
</span><span style='display:block; white-space:pre;color:#404040;'> pass to get it back is pointless and inefficient.
</span>---
databases/postgis/Portfile | 32 ++++++++--------
databases/psqlODBC/Portfile | 10 ++---
devel/boost/Portfile | 29 +++++++--------
devel/gdb/Portfile | 12 +++---
devel/gmp/Portfile | 9 ++---
gis/gdal/Portfile | 12 +++---
gis/qgis/Portfile | 12 +++---
graphics/hugin-app/Portfile | 34 ++++++++---------
graphics/vtk5/Portfile | 46 +++++++++++------------
math/OpenBLAS/Portfile | 8 ++--
math/octave-database/Portfile | 40 +++++++++-----------
math/octave/Portfile | 11 +++---
math/shogun/Portfile | 45 +++++++++++-----------
net/zabbix2/Portfile | 40 ++++++++------------
net/zabbix3/Portfile | 32 ++++++----------
php/phpsh/Portfile | 14 +++----
science/alps/Portfile | 24 ++++++------
science/flann/Portfile | 18 ++++-----
science/htcondor/Portfile | 23 +++++-------
science/ompl/Portfile | 86 +++++++++++++++++++++----------------------
science/pybombs/Portfile | 32 ++++++----------
science/spot/Portfile | 18 ++++-----
textproc/tesseract/Portfile | 38 +++++++++----------
www/ZendFramework2/Portfile | 8 ++--
www/phpmyadmin/Portfile | 16 ++++----
www/roundcubemail/Portfile | 16 ++++----
www/squirrelmail/Portfile | 14 +++----
www/wordpress/Portfile | 16 ++++----
28 files changed, 308 insertions(+), 387 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/postgis/Portfile b/databases/postgis/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 706cc73..6593331 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/postgis/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/postgis/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -70,26 +70,24 @@ foreach s ${pgsql_suffixes} {
</span> set v [string index ${s} 0].[string index ${s} 1]
set i [lsearch -exact ${pgsql_ports} ${p}]
set c [lreplace ${pgsql_ports} ${i} ${i}]
<span style='display:block; white-space:pre;background:#ffe0e0;'>- eval [subst {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- variant ${p} description "Build with PostgreSQL ${v}" conflicts ${c} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set args {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PGSQL_DOCDIR=${prefix}/share/doc/${p}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PGSQL_MANDIR=${prefix}/share/man
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PGSQL_SHAREDIR=${prefix}/share/${p}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace -E "/doc .*install\\\$/s|\\\$| \[join \${args}\]|" ${worksrcpath}/GNUmakefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant ${p} description "Build with PostgreSQL ${v}" conflicts {*}${c} "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set args {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PGSQL_DOCDIR=${prefix}/share/doc/${p}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PGSQL_MANDIR=${prefix}/share/man
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PGSQL_SHAREDIR=${prefix}/share/${p}
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:${p}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --libdir=${prefix}/lib/${p} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-pgconfig=${prefix}/lib/${p}/bin/pg_config
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build.args-append PGSQL_DOCDIR=${prefix}/share/doc/${p} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PGSQL_MANDIR=${prefix}/share/man
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -E \"/doc .*install\\\$/s|\\\$| \[join \${args}\]|\" ${worksrcpath}/GNUmakefile
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>- }]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:${p}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --libdir=${prefix}/lib/${p} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-pgconfig=${prefix}/lib/${p}/bin/pg_config
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.args-append PGSQL_DOCDIR=${prefix}/share/doc/${p} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PGSQL_MANDIR=${prefix}/share/man
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "
</span> }
proc has_pgsql_variant {} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/psqlODBC/Portfile b/databases/psqlODBC/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index fd060a8..59b8334 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/psqlODBC/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/psqlODBC/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -51,13 +51,11 @@ foreach s ${pgsql_suffixes} {
</span> set v [string index ${s} 0].[string index ${s} 1]
set i [lsearch -exact ${pgsql_ports} ${p}]
set c [lreplace ${pgsql_ports} ${i} ${i}]
<span style='display:block; white-space:pre;background:#ffe0e0;'>- eval [subst {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- variant ${p} description "Build with PostgreSQL ${v}" conflicts ${c} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:${p}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant ${p} description "Build with PostgreSQL ${v}" conflicts {*}${c} "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:${p}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --with-libpq=${prefix}/lib/${p}/bin/pg_config
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --with-libpq=${prefix}/lib/${p}/bin/pg_config
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "
</span> }
proc has_pgsql_variant {} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/boost/Portfile b/devel/boost/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 7ef910a..af36b80 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/boost/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/boost/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -193,27 +193,24 @@ foreach s ${pythons_suffixes} {
</span> set i [lsearch -exact ${pythons_ports} ${p}]
set c [lreplace ${pythons_ports} ${i} ${i}]
if { ${s} > 30 } { set bppatch "patch-boost-python3.diff" } else { set bppatch "" }
<span style='display:block; white-space:pre;background:#ffe0e0;'>- eval [subst {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- variant ${p} description "Build Boost.Python for Python ${v}" conflicts ${c} debug {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant ${p} description "Build Boost.Python for Python ${v}" conflicts {*}${c} debug "
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # There is a conflict with python and debug support, so we should really change the 'variant' line above
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # to end with "conflicts ${c} debug" above. However, we leave it enabled for those who want to try it.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # The issue has been reported to both the MacPorts team and the boost team, as per:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # <http://trac.macports.org/ticket/23667> and <https://svn.boost.org/trac/boost/ticket/4461>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # There is a conflict with python and debug support, so we should really change the 'variant' line above
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # to end with 'conflicts ${c} debug' above. However, we leave it enabled for those who want to try it.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # The issue has been reported to both the MacPorts team and the boost team, as per:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # <http://trac.macports.org/ticket/23667> and <https://svn.boost.org/trac/boost/ticket/4461>
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:${p}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-delete --without-libraries=python
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --with-python=${prefix}/bin/python${v} --with-python-root=${prefix}/bin/python${v}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:${p}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-delete --without-libraries=python
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --with-python=${prefix}/bin/python${v} --with-python-root=${prefix}/bin/python${v}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append ${bppatch} patch-tools-build-src-tools-python.jam.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-tools-build-src-tools-python-2.jam.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace s|@FRAMEWORKS_DIR@|${frameworks_dir}| ${worksrcpath}/tools/build/src/tools/python.jam
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append ${bppatch} patch-tools-build-src-tools-python.jam.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-tools-build-src-tools-python-2.jam.diff
</span>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace s|@FRAMEWORKS_DIR@|${frameworks_dir}| ${worksrcpath}/tools/build/src/tools/python.jam
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>- }]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "
</span> }
if {![variant_isset debug]} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/gdb/Portfile b/devel/gdb/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index a2ac27b..1df9b98 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/gdb/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/gdb/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -85,13 +85,11 @@ foreach s ${pythons_suffixes} {
</span> set v [string index ${s} 0].[string index ${s} 1]
set i [lsearch -exact ${pythons_ports} ${p}]
set c [lreplace ${pythons_ports} ${i} ${i}]
<span style='display:block; white-space:pre;background:#ffe0e0;'>- eval [subst {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- variant ${p} description "Build GDB with Python ${v} Scripting" conflicts ${c} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:${p}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --with-python=${prefix}/bin/python${v}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-python-config.py.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant ${p} description "Build GDB with Python ${v} Scripting" conflicts {*}${c} "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:${p}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --with-python=${prefix}/bin/python${v}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-python-config.py.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "
</span> }
variant multiarch description {Support all target architectures} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/gmp/Portfile b/devel/gmp/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index ce8948d..ff4bb99 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/gmp/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/gmp/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -106,12 +106,9 @@ foreach processor ${processors} {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # use eval to ensure a list of conflicts works properly
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- eval [subst {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- variant ${processor} conflicts ${conflicts_list} description {do not let ${name} determine CPU type; build for ${processor}} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --host=${processor}-apple-${os.platform}${os.version}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant ${processor} description "do not let ${name} determine CPU type; build for ${processor}" conflicts {*}${conflicts_list} "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --host=${processor}-apple-${os.platform}${os.version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "
</span> }
# if any of the processor variants are active, CPU is not auto-detected
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/gdal/Portfile b/gis/gdal/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index c73c743..d3c319d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gis/gdal/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gis/gdal/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -274,13 +274,11 @@ foreach s ${postgresql_suffixes} {
</span> set v [string index ${s} 0].[string index ${s} 1]
set i [lsearch -exact ${portsgresql_variants} ${p}]
set c [lreplace ${portsgresql_variants} ${i} ${i}]
<span style='display:block; white-space:pre;background:#ffe0e0;'>- eval [subst {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- variant ${p} description "Enable PostgreSQL ${v} support" conflicts ${c} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:${p}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-delete --without-pg
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --with-pg=${prefix}/lib/postgresql${s}/bin/pg_config
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant ${p} description "Enable PostgreSQL ${v} support" conflicts {*}${c} "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:${p}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-delete --without-pg
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --with-pg=${prefix}/lib/postgresql${s}/bin/pg_config
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "
</span> }
variant mysql5 description {Enable MySQL 5 support} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/qgis/Portfile b/gis/qgis/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 43fd3eb..00d23cf 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gis/qgis/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gis/qgis/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -183,13 +183,11 @@ foreach s ${postgresql_suffixes} {
</span> set v [string index ${s} 0].[string index ${s} 1]
set i [lsearch -exact ${portsgresql_variants} ${p}]
set c [lreplace ${portsgresql_variants} ${i} ${i}]
<span style='display:block; white-space:pre;background:#ffe0e0;'>- eval [subst {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- variant ${p} description "Enable PostgreSQL ${v} support" conflicts ${c} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:${p}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "-DPOSTGRES_CONFIG=${prefix}/lib/${p}/bin/pg_config"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant ${p} description "Enable PostgreSQL ${v} support" conflicts {*}${c} "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:${p}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ \"-DPOSTGRES_CONFIG=${prefix}/lib/${p}/bin/pg_config\"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "
</span> }
# postgresql default
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/hugin-app/Portfile b/graphics/hugin-app/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 19cbded..b366df9 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/hugin-app/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/hugin-app/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -116,24 +116,22 @@ foreach s ${pythons_suffixes} {
</span> set i [lsearch -exact ${pythons_ports} ${p}]
set c [lreplace ${pythons_ports} ${i} ${i}]
set python_prefix ${frameworks_dir}/Python.framework/Versions/${v}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- eval [subst {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- variant ${p} description "Build Python Scripting Interface with Python ${v}" conflicts ${c} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:${p} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:swig-python
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.python ${python_prefix}/bin/python${v}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DPYTHON_EXECUTABLE=${python_prefix}/bin/python${v} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DPYTHON_INCLUDE_DIR=${python_prefix}/Headers \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DPYTHON_LIBRARY=${python_prefix}/Python
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-replace \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DBUILD_HSI=OFF \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DBUILD_HSI=ON
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant ${p} description "Build Python Scripting Interface with Python ${v}" conflicts {*}${c} "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:${p} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:swig-python
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.python ${python_prefix}/bin/python${v}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DPYTHON_EXECUTABLE=${python_prefix}/bin/python${v} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DPYTHON_INCLUDE_DIR=${python_prefix}/Headers \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DPYTHON_LIBRARY=${python_prefix}/Python
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DBUILD_HSI=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DBUILD_HSI=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "
</span> if {[variant_isset python${s}]} {
set any_python 1
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/vtk5/Portfile b/graphics/vtk5/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index caf9b920..63ef7cf 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/vtk5/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/vtk5/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -151,31 +151,29 @@ foreach s ${pythons_suffixes} {
</span> set v [string index ${s} 0].[string index ${s} 1]
set i [lsearch -exact ${pythons_ports} ${p}]
set c [lreplace ${pythons_ports} ${i} ${i}]
<span style='display:block; white-space:pre;background:#ffe0e0;'>- eval [subst {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- variant ${p} description "Build Python ${v} wrappers" conflicts ${c} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:${p}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-delete \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DVTK_WRAP_PYTHON:BOOL=OFF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DPYTHON_DEBUG_LIBRARY:FILEPATH=${prefix}/lib/libpython${v}.dylib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DPYTHON_EXECUTABLE:FILEPATH=${prefix}/bin/python${v} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DPYTHON_INCLUDE_PATH:FILEPATH=${frameworks_dir}/Python.framework/Versions/${v}/Headers \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DPYTHON_LIBRARY:FILEPATH=${prefix}/lib/libpython${v}.dylib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DVTK_WRAP_PYTHON:BOOL=ON \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DVTK_INSTALL_NO_PYTHON:BOOL=ON
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- post-configure {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system -W ${worksrcpath}/Wrapping/Python/CMakeFiles/vtkpython.dir "echo `cat link.txt` -L../../bin > link.txt"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system -W ${worksrcpath}/Wrapping/Python/CMakeFiles/vtkPythonCore.dir "echo `cat link.txt` -L../../bin > link.txt"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- post-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file mkdir ${destroot}${prefix}/lib/python${v}/site-packages
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system "cd ${worksrcpath}/Wrapping/Python && ${prefix}/bin/python${v} setup.py install --prefix=${frameworks_dir}/Python.framework/Versions/${v} --root=${destroot}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant ${p} description "Build Python ${v} wrappers" conflicts {*}${c} "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:${p}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-delete \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DVTK_WRAP_PYTHON:BOOL=OFF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DPYTHON_DEBUG_LIBRARY:FILEPATH=${prefix}/lib/libpython${v}.dylib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DPYTHON_EXECUTABLE:FILEPATH=${prefix}/bin/python${v} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DPYTHON_INCLUDE_PATH:FILEPATH=${frameworks_dir}/Python.framework/Versions/${v}/Headers \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DPYTHON_LIBRARY:FILEPATH=${prefix}/lib/libpython${v}.dylib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DVTK_WRAP_PYTHON:BOOL=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DVTK_INSTALL_NO_PYTHON:BOOL=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-configure {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system -W ${worksrcpath}/Wrapping/Python/CMakeFiles/vtkpython.dir \"echo `cat link.txt` -L../../bin > link.txt\"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system -W ${worksrcpath}/Wrapping/Python/CMakeFiles/vtkPythonCore.dir \"echo `cat link.txt` -L../../bin > link.txt\"
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>- }]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file mkdir ${destroot}${prefix}/lib/python${v}/site-packages
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system -W ${worksrcpath}/Wrapping/Python \"${prefix}/bin/python${v} setup.py install --prefix=${frameworks_dir}/Python.framework/Versions/${v} --root=${destroot}\"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "
</span> }
if {[variant_isset qt4_mac]} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/OpenBLAS/Portfile b/math/OpenBLAS/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 02a23c5..2fb139d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/OpenBLAS/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/OpenBLAS/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -70,11 +70,9 @@ foreach this_gcc_version_no_dot ${GCC_VERSIONS_NO_DOT} {
</span> } else {
set this_description "Use gcc${this_gcc_version_no_dot} for the compiler suite"
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- eval [subst {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- variant gcc${this_gcc_version_no_dot} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- conflicts ${this_conflicts} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- description ${this_description} {}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant gcc${this_gcc_version_no_dot} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conflicts {*}${this_conflicts} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ description ${this_description} {}
</span> }
# set default +gcc* variant: default to +gcc6 if not other +gcc*
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/octave-database/Portfile b/math/octave-database/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 83916bc..5241bba 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/octave-database/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/octave-database/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -36,32 +36,28 @@ foreach s ${postgresql_suffixes} {
</span> set v [join [split ${s} ""] "."]
set i [lsearch -exact ${postgresql_ports} ${p}]
set c [lreplace ${postgresql_ports} ${i} ${i}]
<span style='display:block; white-space:pre;background:#ffe0e0;'>- eval [subst {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- variant ${p} description "Build ${name} using postgresql ${v}" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- conflicts ${c} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant ${p} description "Build ${name} using postgresql ${v}" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conflicts {*}${c} "
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:postgresql${s}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.env \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PATH=${prefix}/lib/postgresql${s}/bin:$env(PATH)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.ldflags-append -L${prefix}/lib/postgresql${s}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:postgresql${s}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.env \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PATH=${prefix}/lib/postgresql${s}/bin:$env(PATH)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.ldflags-append -L${prefix}/lib/postgresql${s}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-eval [subst {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # postgresql is required; default to ${default_postgresql_suffix}.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# postgresql is required; default to ${default_postgresql_suffix}.
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${postgresql_variants}} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default_variants +postgresql${default_postgresql_suffix}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if ${postgresql_variants} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants +postgresql${default_postgresql_suffix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Make sure -postgresql${default_postgresql_suffix}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # was not specified alone
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Make sure -postgresql${default_postgresql_suffix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# was not specified alone
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${postgresql_variants}} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_error "${name} requires a postgresql to be selected; you cannot use -postgresql${default_postgresql_suffix} as a variant alone."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return -code error "Invalid variant selection"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if ${postgresql_variants} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_error "${name} requires a postgresql to be selected; you cannot use -postgresql${default_postgresql_suffix} as a variant alone."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return -code error "Invalid variant selection"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/octave/Portfile b/math/octave/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index c9f3017..a43d4e8 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/octave/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/octave/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -561,12 +561,11 @@ if {${cxx_stdlib} ne "libstdc++"} {
</span> }
}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-eval [subst {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- variant graphicsmagick description {use GraphicsMagick for image I/O} conflicts ${magickConflict} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:GraphicsMagick
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-replace --without-magick --with-magick=GraphicsMagick
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant graphicsmagick description {use GraphicsMagick for image I/O} conflicts {*}${magickConflict} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:GraphicsMagick
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace --without-magick --with-magick=GraphicsMagick
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span> if {${magickDefault}} {
default_variants-append +graphicsmagick
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/shogun/Portfile b/math/shogun/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 8c04683..b8da34e5 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/shogun/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/shogun/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -85,36 +85,33 @@ foreach s ${pythons_suffixes} {
</span> lappend pythons_ports python${s}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-proc python_prefix {} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- global prefix pythons_suffixes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach s ${pythons_suffixes} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[variant_isset python${s}]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set p ${prefix}/bin/python[string index ${s} 0].[string index ${s} 1]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return [file normalize [exec ${p} -c "import sys; print(sys.prefix)"]]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- error "Python support not enabled."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> foreach s ${pythons_suffixes} {
set p python${s}
set v [string index ${s} 0].[string index ${s} 1]
set i [lsearch -exact ${pythons_ports} ${p}]
set c [lreplace ${pythons_ports} ${i} ${i}]
<span style='display:block; white-space:pre;background:#ffe0e0;'>- eval [subst {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- variant ${p} description "Use Python ${v} for python bindings" conflicts ${c} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:${p} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${s}-numpy \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:swig-python
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set py_prefix \[python_prefix\]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --python=${prefix}/bin/python${v} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --pydir=\${py_prefix}/lib/python${v}/site-packages \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --includes=\${py_prefix}/include/python${v}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|^PYTHON=python$|PYTHON=${prefix}/bin/python${v}|g" ${worksrcpath}/configure
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant ${p} description "Use Python ${v} for python bindings" conflicts {*}${c} "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:${p} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${s}-numpy \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:swig-python
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --python=${prefix}/bin/python${v}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace \"s|^PYTHON=python$|PYTHON=${prefix}/bin/python${v}|g\" ${worksrcpath}/configure
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>- }]
</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;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+pre-configure {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach s ${pythons_suffixes} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[variant_isset python${s}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set v [string index ${s} 0].[string index ${s} 1]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set py_prefix [file normalize [exec ${prefix}/bin/python${v} -c "import sys; print(sys.prefix)"]]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --pydir=${py_prefix}/lib/python${v}/site-packages \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --includes=${py_prefix}/include/python${v}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ break
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
variant perl description {Build the Perl API} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/zabbix2/Portfile b/net/zabbix2/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 08103a5..32b0f49 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/zabbix2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/zabbix2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -70,16 +70,14 @@ if { ${name} ne ${subport} } {
</span> port:apache2
foreach php {php56 php70 php71} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- eval [subst {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- variant ${php} description "Use ${php}" {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_run-append port:${php} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:${php}-apache2handler \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:${php}-gd \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:${php}-gettext \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:${php}-mbstring \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:${php}-sockets
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant ${php} description "Use ${php}" "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_run-append port:${php} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:${php}-apache2handler \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:${php}-gd \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:${php}-gettext \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:${php}-mbstring \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:${php}-sockets
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "
</span> }
if {![variant_isset php56] &&
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -130,20 +128,16 @@ if { ${name} ne ${subport} } {
</span> }
set DBLIST_KEYS [lsort [array names DBLIST]]
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> foreach dbitem $DBLIST_KEYS {
set this_key [lsearch -exact $DBLIST_KEYS $dbitem]
set conf_list [lreplace $DBLIST_KEYS $this_key $this_key]
set prms $DBLIST($dbitem)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set variant_line {variant $dbitem description \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "Use [lindex ${prms} 0] for server database" }
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach over ${conf_list} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- append variant_line " conflicts ${over}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant $dbitem description \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "Use [lindex ${prms} 0] for server database" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conflicts {*}${conf_list} "
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- append variant_line { "
</span> set ::ZDB [lindex ${prms} 1]
set ::MYSQL_MODE [string equal [lindex ${prms} 3] mysql]
depends_lib-append port:[lindex ${prms} 1]
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -163,9 +157,7 @@ if { ${name} ne ${subport} } {
</span> depends_run-append \
port:[lindex ${prms} 1]-server
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- " }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- eval $variant_line
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "
</span> }
if {![variant_isset mysql51] &&
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -234,11 +226,11 @@ post-destroot {
</span> xinstall -d -m 755 -d ${destroot}${prefix}/share/zabbix/data
xinstall -d -m 755 -d ${destroot}${prefix}/share/zabbix/schema
<span style='display:block; white-space:pre;background:#ffe0e0;'>- eval xinstall -m 755 ${worksrcpath}/database/mysql/data.sql \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 755 ${worksrcpath}/database/mysql/data.sql \
</span> ${destroot}${prefix}/share/zabbix/data
<span style='display:block; white-space:pre;background:#ffe0e0;'>- eval xinstall -m 755 ${worksrcpath}/database/mysql/images.sql \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 755 ${worksrcpath}/database/mysql/images.sql \
</span> ${destroot}${prefix}/share/zabbix/data
<span style='display:block; white-space:pre;background:#ffe0e0;'>- eval xinstall -m 755 ${worksrcpath}/database/mysql/schema.sql \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 755 ${worksrcpath}/database/mysql/schema.sql \
</span> ${destroot}${prefix}/share/zabbix/schema
file copy ${worksrcpath}/upgrades \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/zabbix3/Portfile b/net/zabbix3/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index f2a96e8..fc62a53 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/zabbix3/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/zabbix3/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -95,16 +95,14 @@ if { ${name} ne ${subport} } {
</span> startupitem.logfile ${prefix}/var/log/zabbix/zabbix_agentd.launch
foreach php {php56 php70 php71} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- eval [subst {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- variant ${php} description "Use ${php}" {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_run-append port:${php} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:${php}-apache2handler \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:${php}-gd \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:${php}-gettext \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:${php}-mbstring \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:${php}-sockets
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant ${php} description "Use ${php}" "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_run-append port:${php} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:${php}-apache2handler \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:${php}-gd \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:${php}-gettext \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:${php}-mbstring \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:${php}-sockets
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "
</span> }
if {![variant_isset php56] && ![variant_isset php70]
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -148,14 +146,10 @@ if { ${name} ne ${subport} } {
</span> set conf_list [lreplace $DBLIST_KEYS $this_key $this_key]
set prms $DBLIST($dbitem)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set variant_line {variant $dbitem description \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "Use [lindex ${prms} 0] for server database" }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach over ${conf_list} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- append variant_line " conflicts ${over}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant $dbitem description \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "Use [lindex ${prms} 0] for server database" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conflicts {*}${conf_list} "
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- append variant_line { "
</span> set ::ZDB [lindex ${prms} 1]
set ::DBFILES [lindex ${prms} 3]
set ::MYSQL_MODE [string equal [lindex ${prms} 3] mysql]
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -182,9 +176,7 @@ if { ${name} ne ${subport} } {
</span> depends_run-append \
port:[lindex ${prms} 1]-server
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- " }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- eval $variant_line
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "
</span> }
if {![variant_isset mysql5] &&
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/php/phpsh/Portfile b/php/phpsh/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 57506be..93b3a11 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/php/phpsh/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/php/phpsh/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -44,21 +44,19 @@ set variant_check {}
</span> foreach php ${php_ports} {
set i [lsearch -exact ${php_ports} ${php}]
set c [lreplace ${php_ports} ${i} ${i}]
<span style='display:block; white-space:pre;background:#ffe0e0;'>- eval [subst {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- variant ${php} conflicts ${c} description "Use ${php}" {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:${php}-pcntl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant ${php} conflicts {*}${c} description "Use ${php}" "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:${php}-pcntl
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace s|@@PHP_EXECUTABLE@@|${prefix}/bin/${php}| src/__init__.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace s|@@PHP_EXECUTABLE@@|${prefix}/bin/${php}| src/__init__.py
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>- }]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "
</span> if {${php} ne [lindex ${php_ports} end]} {
lappend variant_check "!\[variant_isset ${php}\]"
}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-eval "if {[join ${variant_check} {&&}]} {default_variants +[lindex ${php_ports} end]}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if [join ${variant_check} {&&}] {default_variants +[lindex ${php_ports} end]}
</span>
# archived project no longer supported or updated by Facebook
livecheck.type none
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/alps/Portfile b/science/alps/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 181fabe..82eac42 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/alps/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/alps/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -115,20 +115,18 @@ foreach s ${pythons_suffixes} {
</span> set v [string index ${s} 0].[string index ${s} 1]
set i [lsearch -exact ${pythons_ports} ${p}]
set c [lreplace ${pythons_ports} ${i} ${i}]
<span style='display:block; white-space:pre;background:#ffe0e0;'>- eval [subst {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- variant ${p} description "Build ALPS for Python ${v}" conflicts ${c} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:${p} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${s}-numpy \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${s}-matplotlib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${s}-scipy
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-config-FindPython.cmake.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|@PYTHON@|python[regsub {(.)(.+)} ${s} {\1.\2}]|g" ${worksrcpath}/alps/config/FindPython.cmake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant ${p} description "Build ALPS for Python ${v}" conflicts {*}${c} "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:${p} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${s}-numpy \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${s}-matplotlib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${s}-scipy
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-config-FindPython.cmake.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace \"s|@PYTHON@|python[regsub {(.)(.+)} ${s} {\1.\2}]|g\" ${worksrcpath}/alps/config/FindPython.cmake
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>- }]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "
</span> }
set selected_version python27
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/flann/Portfile b/science/flann/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 30db7fd..74360f2 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/flann/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/flann/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -54,15 +54,13 @@ foreach s ${pythons_suffixes} {
</span> set v [string index ${s} 0].[string index ${s} 1]
set i [lsearch -exact ${pythons_ports} ${p}]
set c [lreplace ${pythons_ports} ${i} ${i}]
<span style='display:block; white-space:pre;background:#ffe0e0;'>- eval [subst {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- variant ${p} description "Use Python ${v} for python bindings" conflicts ${c} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:${p}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append -DPYTHON_EXECUTABLE=${prefix}/bin/python${v}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|@@PREFIX@@|${destroot}${prefix}|g" ${patch.dir}/src/python/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set pylibdir \[python_dir\]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|@@PYTHON_LIB@@|${destroot}\${pylibdir}|g" ${patch.dir}/src/python/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant ${p} description "Use Python ${v} for python bindings" conflicts {*}${c} "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:${p}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append -DPYTHON_EXECUTABLE=${prefix}/bin/python${v}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace \"s|@@PREFIX@@|${destroot}${prefix}|g\" ${patch.dir}/src/python/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set pylibdir \[python_dir\]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace \"s|@@PYTHON_LIB@@|${destroot}\${pylibdir}|g\" ${patch.dir}/src/python/CMakeLists.txt
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>- }]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "
</span> }
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/htcondor/Portfile b/science/htcondor/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index b48e5e3..8587e64 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/htcondor/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/htcondor/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -61,21 +61,18 @@ foreach s ${pythons_suffixes} {
</span> set i [lsearch -exact ${pythons_ports} ${p}]
set c [lreplace ${pythons_ports} ${i} ${i}]
set d ${frameworks_dir}/Python.framework/Versions/${v}/lib/python${v}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- eval [subst {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- variant ${p} description "Enable Python interface for Python ${v}" conflicts ${c} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant ${p} description "Enable Python interface for Python ${v}" conflicts {*}${c} "
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:${p}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- require_active_variants boost ${p}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append -DC_PYTHONARCHLIB:PATH="${d}/site-packages" -DPYTHON_LIBRARY:PATH="${frameworks_dir}/Python.framework/Versions/${v}/lib/libpython${v}.dylib"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-replace -DWITH_PYTHON_BINDINGS:BOOL="0" -DWITH_PYTHON_BINDINGS:BOOL="1"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|@prefix@|${prefix}|g" ${worksrcpath}/src/condor_utils/condor_config.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|@c_pythonarchlib@|${d}/site-packages|g" ${worksrcpath}/build/cmake/CondorPackageConfig.cmake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:${p}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ require_active_variants boost ${p}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append -DC_PYTHONARCHLIB:PATH=\"${d}/site-packages\" -DPYTHON_LIBRARY:PATH=\"${frameworks_dir}/Python.framework/Versions/${v}/lib/libpython${v}.dylib\"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace -DWITH_PYTHON_BINDINGS:BOOL=\"0\" -DWITH_PYTHON_BINDINGS:BOOL=\"1\"
</span>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace \"s|@prefix@|${prefix}|g\" ${worksrcpath}/src/condor_utils/condor_config.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace \"s|@c_pythonarchlib@|${d}/site-packages|g\" ${worksrcpath}/build/cmake/CondorPackageConfig.cmake
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>- }]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "
</span> }
variant kerberos description {enable Kerberos5 support} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -128,7 +125,7 @@ destroot.keepdirs ${destroot}${prefix}/etc/condor/config.d \
</span> # ${prefix}/share/doc/${name}.
post-destroot {
# Move manpages into place.
<span style='display:block; white-space:pre;background:#ffe0e0;'>- eval xinstall [glob ${worksrcpath}/doc/man/man1/*] \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall {*}[glob ${worksrcpath}/doc/man/man1/*] \
</span> ${destroot}${prefix}/share/man/man1
# Remove SysV-init and Fedora-style service scripts.
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/ompl/Portfile b/science/ompl/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 58ba2ce..0343c90 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/ompl/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/ompl/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -84,55 +84,53 @@ foreach s ${pythons_suffixes} {
</span> set v [string index ${s} 0].[string index ${s} 1]
set i [lsearch -exact ${pythons_ports} ${p}]
set c [lreplace ${pythons_ports} ${i} ${i}]
<span style='display:block; white-space:pre;background:#ffe0e0;'>- eval [subst {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- variant ${p} description "Use Python ${v} for python bindings" conflicts ${c} debug {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_build-append port:py${s}-pyplusplus
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:${p}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append -DPYTHON_EXEC=${prefix}/bin/python${v}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant ${p} description "Use Python ${v} for python bindings" conflicts {*}${c} debug "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append port:py${s}-pyplusplus
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:${p}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append -DPYTHON_EXEC=${prefix}/bin/python${v}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # the python bindings rely on Boost.Python, so make sure it is installed.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- require_active_variants boost ${p}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # the python bindings rely on Boost.Python, so make sure it is installed.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ require_active_variants boost ${p}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # use PyPy to generate Python bindings, which is *much* faster than CPython
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ${v} eq "2.7" } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_build-append port:pypy
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_build-append port:pypy3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # use PyPy to generate Python bindings, which is *much* faster than CPython
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ${v} eq \"2.7\" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append port:pypy
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append port:pypy3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { [variant_isset app] } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch.pre_args -p0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${s}-pyqt5 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${s}-opengl \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${s}-flask \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${s}-celery \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${s}-redis
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace \"s|#!/usr/bin/env python|#!${prefix}/bin/python${v}|g\" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${prefix}/bin/ompl_app \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${prefix}/bin/ompl_benchmark_statistics.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace \"s|broker=rabbitmq|broker=redis|g\" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${prefix}/share/ompl/ompl.conf
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace \"s|python ./omplweb.py|${prefix}/bin/python${v} ./omplweb.py|g\" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${prefix}/share/ompl/webapp/omplweb.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # extra copy of libs not needed in site_packages and causes problems with rpaths
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set site_packages \[python_dir\]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ delete ${destroot}\${site_packages}/ompl/util/libompl.dylib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}\${site_packages}/ompl/app/libompl_app.dylib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}\${site_packages}/ompl/app/libompl_app_base.dylib
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if { [variant_isset app] } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch.pre_args -p0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${s}-pyqt5 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${s}-opengl \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${s}-flask \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${s}-celery \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${s}-redis
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- post-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|#!/usr/bin/env python|#!${prefix}/bin/python${v}|g" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${prefix}/bin/ompl_app \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${prefix}/bin/ompl_benchmark_statistics.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|broker=rabbitmq|broker=redis|g" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${prefix}/share/ompl/ompl.conf
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|python ./omplweb.py|${prefix}/bin/python${v} ./omplweb.py|g" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${prefix}/share/ompl/webapp/omplweb.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # extra copy of libs not needed in site_packages and causes problems with rpaths
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set site_packages \[python_dir\]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- delete ${destroot}\${site_packages}/ompl/util/libompl.dylib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}\${site_packages}/ompl/app/libompl_app.dylib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}\${site_packages}/ompl/app/libompl_app_base.dylib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch.pre_args -p1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- post-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|#!/usr/bin/env python|#!${prefix}/bin/python${v}|g" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${prefix}/bin/ompl_benchmark_statistics.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # extra copy of libs not needed in site_packages and causes problems with rpaths
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set site_packages \[python_dir\]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- delete ${destroot}\${site_packages}/ompl/util/libompl.dylib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch.pre_args -p1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace \"s|#!/usr/bin/env python|#!${prefix}/bin/python${v}|g\" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${prefix}/bin/ompl_benchmark_statistics.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # extra copy of libs not needed in site_packages and causes problems with rpaths
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set site_packages \[python_dir\]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ delete ${destroot}\${site_packages}/ompl/util/libompl.dylib
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- }]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "
</span> }
# enable one python variant so that the python bindings can be compiled
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/pybombs/Portfile b/science/pybombs/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index c532ade..6937a3c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/pybombs/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/pybombs/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -7,8 +7,6 @@ PortGroup github 1.0
</span> name pybombs
set pythons_suffixes {27 34 35 36}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-python.versions ${pythons_suffixes}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-python.default_version 27
</span>
categories science python
license GPL-3
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -57,25 +55,19 @@ if {${subport} eq ${name}} {
</span> # declare +python* variants
foreach this_py_version_no_dot ${pythons_suffixes} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set ndx [lsearch -exact ${this_py_version_no_dot} ${this_py_version_no_dot}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set this_conflicts [lreplace ${this_py_version_no_dot} ${ndx} ${ndx}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set ndx [lsearch -exact ${pythons_suffixes} ${this_py_version_no_dot}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set this_conflicts [lreplace ${pythons_suffixes} ${ndx} ${ndx}]
</span> set this_description "Use python${this_py_version_no_dot}"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- eval [subst {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- variant python${this_py_version_no_dot} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- conflicts ${this_conflicts} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- description ${this_description} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- python.versions ${this_py_version_no_dot}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- python.version ${this_py_version_no_dot}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-delete \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:python[option python.default_version]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:python${this_py_version_no_dot} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${this_py_version_no_dot}-future \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${this_py_version_no_dot}-requests \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${this_py_version_no_dot}-six \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${this_py_version_no_dot}-ruamel-yaml
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant python${this_py_version_no_dot} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conflicts {*}${this_conflicts} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ description ${this_description} "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ python.default_version ${this_py_version_no_dot}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${this_py_version_no_dot}-future \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${this_py_version_no_dot}-requests \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${this_py_version_no_dot}-six \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${this_py_version_no_dot}-ruamel-yaml
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "
</span> }
# set default, if no variants selected
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/spot/Portfile b/science/spot/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 7263acc..9678d2c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/spot/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/spot/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -48,17 +48,15 @@ foreach s ${pythons_suffixes} {
</span> set i [lsearch -exact ${pythons_ports} ${p}]
set c [lreplace ${pythons_ports} ${i} ${i}]
set packagepath ${destroot}${prefix}/Library/Frameworks/Python.framework/Versions/${v}/lib/python${v}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- eval [subst {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- variant ${p} description "Use Python ${v} for python bindings" conflicts ${c} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:${p}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.env-append PYTHON=${prefix}/bin/python${v}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-delete --disable-python
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- post-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file mkdir ${destroot}${prefix}/Library/Frameworks/Python.framework/Versions/${v}/lib/python${v}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- move ${destroot}${prefix}/lib/python${v}/site-packages ${packagepath}/site-packages
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant ${p} description "Use Python ${v} for python bindings" conflicts {*}${c} "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:${p}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.env-append PYTHON=${prefix}/bin/python${v}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-delete --disable-python
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file mkdir ${destroot}${prefix}/Library/Frameworks/Python.framework/Versions/${v}/lib/python${v}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ move ${destroot}${prefix}/lib/python${v}/site-packages ${packagepath}/site-packages
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>- }]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "
</span> }
# enable one python variant so that the python bindings can be compiled
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/textproc/tesseract/Portfile b/textproc/tesseract/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 7672b4f..51b3c28 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/textproc/tesseract/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/textproc/tesseract/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -443,34 +443,32 @@ set langs {
</span> }
foreach {lang_code lang_version lang_name lang_checksums} ${langs} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- eval [subst {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- subport ${name}-[strsed ${lang_code} {g/_/-/}] {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- version ${lang_version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ subport ${name}-[strsed ${lang_code} {g/_/-/}] "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version ${lang_version}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- description ${lang_name} language data for the Tesseract OCR engine
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ description ${lang_name} language data for the Tesseract OCR engine
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- long_description ${lang_name} language data for the Tesseract OCR engine
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ long_description ${lang_name} language data for the Tesseract OCR engine
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- supported_archs noarch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ supported_archs noarch
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- master_sites https://github.com/tesseract-ocr/tessdata/raw/3.04.00/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- distfiles ${lang_code}.traineddata
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ master_sites https://github.com/tesseract-ocr/tessdata/raw/3.04.00/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ distfiles ${lang_code}.traineddata
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums [string trim ${lang_checksums}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums [string trim ${lang_checksums}]
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- extract.mkdir no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extract.cmd cp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extract.pre_args ""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extract.post_args "."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extract.mkdir no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extract.cmd cp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extract.pre_args
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extract.post_args .
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- use_configure no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ use_configure no
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- build {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build {}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file mkdir ${destroot}${prefix}/share/tessdata/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- copy ${workpath}/${lang_code}.traineddata ${destroot}${prefix}/share/tessdata/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file mkdir ${destroot}${prefix}/share/tessdata/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ copy ${workpath}/${lang_code}.traineddata ${destroot}${prefix}/share/tessdata/
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>- }]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "
</span> }
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/ZendFramework2/Portfile b/www/ZendFramework2/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 0319055..21eb07f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/www/ZendFramework2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/www/ZendFramework2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -45,11 +45,9 @@ subport ZendFramework1 {
</span> }
foreach php {php53 php54 php55 php56} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- eval [subst {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- variant ${php} conflicts manual_extensions description "Use ${php}" {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_run port:${php}-calendar port:${php}-curl port:${php}-dba port:${php}-exif port:${php}-ftp port:${php}-gd port:${php}-gettext port:${php}-gmp port:${php}-iconv port:${php}-imap port:${php}-mbstring port:${php}-mcrypt port:${php}-memcache port:${php}-mssql port:${php}-mysql port:${php}-odbc port:${php}-openssl port:${php}-pcntl port:${php}-posix port:${php}-postgresql port:${php}-soap port:${php}-sockets port:${php}-SPL_Types port:${php}-sqlite port:${php}-tidy port:${ [...]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant ${php} conflicts manual_extensions description "Use ${php}" "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_run port:${php}-calendar port:${php}-curl port:${php}-dba port:${php}-exif port:${php}-ftp port:${php}-gd port:${php}-gettext port:${php}-gmp port:${php}-iconv port:${php}-imap port:${php}-mbstring port:${php}-mcrypt port:${php}-memcache port:${php}-mssql port:${php}-mysql port:${php}-odbc port:${php}-openssl port:${php}-pcntl port:${php}-posix port:${php}-postgresql port:${php}-soap port:${php}-sockets port:${php}-SPL_Types port:${php}-sqlite port:${php}-tidy port:${php} [...]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "
</span> }
if {![variant_isset php53] && ![variant_isset php54] && ![variant_isset php55] && ![variant_isset php56] && ![variant_isset manual_extensions]} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/phpmyadmin/Portfile b/www/phpmyadmin/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index e052c86..eecbc0d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/www/phpmyadmin/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/www/phpmyadmin/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -32,15 +32,13 @@ checksums rmd160 e5fe47c06aa856276fabf8d862740da9354a9102 \
</span> # The php variants deliberately do not conflict
foreach php {php55 php56 php70 php71} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- eval [subst {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- variant ${php} description "Use ${php}" {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_run-append port:${php}-gd \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:${php}-mbstring \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:${php}-mcrypt \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:${php}-mysql \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:${php}-zip
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant ${php} description "Use ${php}" "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_run-append port:${php}-gd \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:${php}-mbstring \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:${php}-mcrypt \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:${php}-mysql \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:${php}-zip
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "
</span> }
if {![variant_isset php55] && ![variant_isset php56] && ![variant_isset php70] && ![variant_isset php71]} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/roundcubemail/Portfile b/www/roundcubemail/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index c8ae044..31c62a8 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/www/roundcubemail/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/www/roundcubemail/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -23,15 +23,13 @@ platforms darwin freebsd
</span> # The php variants deliberately do not conflict
foreach php {php54 php55 php56} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- eval [subst {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- variant ${php} description "Use ${php}" {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_run-append port:${php}-mbstring \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:${php}-mysql \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:${php}-sockets
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Also needs dependency on ${php}-web pending resolution of:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # https://trac.macports.org/ticket/45008
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant ${php} description "Use ${php}" "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_run-append port:${php}-mbstring \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:${php}-mysql \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:${php}-sockets
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Also needs dependency on ${php}-web pending resolution of:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # https://trac.macports.org/ticket/45008
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "
</span> }
if {![variant_isset php54] && ![variant_isset php55] && ![variant_isset php56]} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/squirrelmail/Portfile b/www/squirrelmail/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 15f6333..6193a8c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/www/squirrelmail/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/www/squirrelmail/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -23,14 +23,12 @@ homepage http://squirrelmail.org
</span> platforms darwin freebsd
supported_archs noarch
foreach php {php55 php56 php70 php71} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- eval [subst {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- variant ${php} description "Use ${php}" {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_run \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:${php}-gettext \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:${php}-mbstring \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:${php}-pspell
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant ${php} description "Use ${php}" "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_run \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:${php}-gettext \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:${php}-mbstring \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:${php}-pspell
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "
</span> }
if {![variant_isset php55] && ![variant_isset php56] && ![variant_isset php70]} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/wordpress/Portfile b/www/wordpress/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 7489dab..7aecb31 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/www/wordpress/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/www/wordpress/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -24,15 +24,13 @@ worksrcdir ${name}
</span>
# The php variants deliberately do not conflict
foreach php {php55 php56 php70 php71} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- eval [subst {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- variant ${php} description "Use ${php}" {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_run-append port:${php}-gd \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:${php}-mbstring \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:${php}-mcrypt \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:${php}-mysql \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:${php}-zip
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant ${php} description "Use ${php}" "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_run-append port:${php}-gd \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:${php}-mbstring \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:${php}-mcrypt \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:${php}-mysql \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:${php}-zip
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "
</span> }
if {![variant_isset php55] && ![variant_isset php56] && ![variant_isset php70]} {
</pre><pre style='margin:0'>
</pre>