<pre style='margin:0'>
Michael Dickens (michaelld) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/f6cfc0a399c64c16c5264b95fa4d38c1fdb9990c">https://github.com/macports/macports-ports/commit/f6cfc0a399c64c16c5264b95fa4d38c1fdb9990c</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit f6cfc0a399c64c16c5264b95fa4d38c1fdb9990c
</span>Author: Michael Dickens <michaelld@macports.org>
AuthorDate: Tue Jan 24 13:31:22 2017 -0500
<span style='display:block; white-space:pre;color:#404040;'> volk:
</span><span style='display:block; white-space:pre;color:#404040;'> + remove unnecessary 'dist_subdir';
</span><span style='display:block; white-space:pre;color:#404040;'> + update devel to fbcd0a6a (20170123);
</span><span style='display:block; white-space:pre;color:#404040;'> + add +pythonXY variants for devel only.
</span>---
science/volk/Portfile | 88 ++++++++++++++++++++++++++++++++++++++++-----------
1 file changed, 70 insertions(+), 18 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/volk/Portfile b/science/volk/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index bf1faec..909fa54 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/volk/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/volk/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -13,9 +13,6 @@ long_description VOLK is the Vector-Optimized Library of Kernels, a library t
</span> license GPL-3
platforms darwin
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# common directory for storing downloaded tarballs
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-dist_subdir volk
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> if {${name} eq ${subport}} {
github.setup gnuradio volk 1.3 v
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -33,22 +30,16 @@ provides the release version, which is typically updated every month or so.
</span>
subport volk-devel {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- github.setup gnuradio volk e495168306f9d3840c313922c83e3e0667af2e05
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- version 20161224
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup gnuradio volk fbcd0a6aa99c5482aa5b41907bc037075d5de86e
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 20170123
</span> checksums \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 f357aafc9e90f5f35125d57d55490353b9c07190 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 9fb535dcc10d5bd1d76a71d99d4a209377d9ff1054941e3ba734901c1ea2c467
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 6999fb884f69011453da355521fbac51caab99ab \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 00fbfcc59081569f1dcf3e5ec96adb326aeec2c7460c15c4140a14f60af0ce19
</span>
conflicts volk
long_description ${long_description} ${subport} \
provides the Volk GIT maint or master branch, depending on which is more advanced, and is typically updated every few days to week.
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # add dependencies for devel only until the next release
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_build-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py27-six \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py27-mako
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> }
# override githib PortGroup homepage setting
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -76,9 +67,70 @@ configure.ldflags-delete -L${prefix}/lib
</span> # specify the Python dependencies; these are checked for at configure,
# then used for building, but not at runtime.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:python27 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py27-cheetah
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${subport} eq ${name}} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # release must use Python 2.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set PythonVersionNoDot "27"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # select Python to use; default to 2.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant python27 conflicts python34 python35 python36 description {Build using Python 2.7} {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant python34 conflicts python27 python35 python36 description {Build using Python 3.4} {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant python35 conflicts python27 python34 python36 description {Build using Python 3.5} {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant python36 conflicts python27 python34 python35 description {Build using Python 3.6} {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![variant_isset python27] &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ![variant_isset python34] &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ![variant_isset python35] &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ![variant_isset python36]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants +python27
</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;'>+ if {![variant_isset python27] &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ![variant_isset python34] &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ![variant_isset python35] &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ![variant_isset python36]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_error "\n\nYou must select one of the variants +python27 , +python34 , +python35, or +python36 .\n"
</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;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set PythonVersionNoDot ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[variant_isset python27]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set PythonVersionNoDot "27"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } elseif {[variant_isset python34]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set PythonVersionNoDot "34"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } elseif {[variant_isset python35]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set PythonVersionNoDot "35"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set PythonVersionNoDot "36"
</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;'>+set PythonVersionWithDot [join [split ${PythonVersionNoDot} ""] "."]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# required Python
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:python${PythonVersionNoDot}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# dependencies currently depend on port
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${subport} eq ${name}} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # dependencies for release only
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${PythonVersionNoDot}-cheetah
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # add dependencies for devel only
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${PythonVersionNoDot}-six \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${PythonVersionNoDot}-mako
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
# override default version string to be MacPorts-specific
# git / "devel" only for now
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -97,8 +149,8 @@ configure.args-append \
</span> # specify the Python version to use
configure.args-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DPYTHON_EXECUTABLE=${prefix}/Library/Frameworks/Python.framework/Versions/2.7/bin/python2.7 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DVOLK_PYTHON_DIR=${frameworks_dir}/Python.framework/Versions/2.7/lib/python2.7/site-packages
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DPYTHON_EXECUTABLE=${prefix}/Library/Frameworks/Python.framework/Versions/${PythonVersionWithDot}/bin/python${PythonVersionWithDot} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DVOLK_PYTHON_DIR=${frameworks_dir}/Python.framework/Versions/${PythonVersionWithDot}/lib/python${PythonVersionWithDot}/site-packages
</span>
default_variants +docs +orc
</pre><pre style='margin:0'>
</pre>