<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/9a91b4c213d4fefa6356c71c0b8d60218c1268a6">https://github.com/macports/macports-ports/commit/9a91b4c213d4fefa6356c71c0b8d60218c1268a6</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 9a91b4c volk: update release to 2.2.1
</span>9a91b4c is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 9a91b4c213d4fefa6356c71c0b8d60218c1268a6
</span>Author: Michael Dickens <michaelld@macports.org>
AuthorDate: Wed Mar 25 11:56:48 2020 -0400
<span style='display:block; white-space:pre;color:#404040;'> volk: update release to 2.2.1
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> deprecate devel port in favor of release, since releases are happening regularly again
</span>---
science/volk/Portfile | 280 ++++++++++++++++++++++++--------------------------
1 file changed, 136 insertions(+), 144 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 f4c2c17..cd358bf 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;'>@@ -16,13 +16,24 @@ description Vector-Optimized Library of Kernels
</span> long_description VOLK is the Vector-Optimized Library of Kernels, a library that contains kernels of hand-written single-instruction multiple data (SIMD) code for different mathematical operations, providing portable SIMD code that is optimized for a variety of platforms.
license GPL-3
platforms darwin
<span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage https://libvolk.org/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+subport volk-devel {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # releases happen here often enough to not require this port
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ replaced_by volk
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup obsolete 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # final version of the devel, with +1 rev bump
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 20200216-1ec627c1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
if {${name} eq ${subport}} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- github.setup gnuradio volk 2.1.0 v
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 8050edc7d8a0c7633d9dd7523b36ea6d62130c5f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 0934d9f3a0f4b4375826dc291720d52b464da3203f52ff47595a80d731902ce0 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 274868
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup gnuradio volk 2.2.1 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 e1f7dc8baee968301e2daeb86908c3e74c976745 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 9ddcf892e5e2d6544e51d70ea9f4749e0777c0ae24171e81ae3cce07210a099d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 330734
</span> revision 0
# bump the epoch because I moved the version from 20150707 to 1.0.1
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -31,198 +42,179 @@ if {${name} eq ${subport}} {
</span> provides the release version, which is typically updated every month or so.
conflicts volk-devel
<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;'>-subport volk-devel {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- github.setup gnuradio volk 001e60a7f33cdc5430892201af88a332b67f5872
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- version 20200108-[string range ${github.version} 0 7]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 34802f54d390c4f11910cdf0244bf20ef8e023fb \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 4bb75391fa5ec37e1b12967c3f8dfb2dc905a318a8237f98fb9e867c1c57715a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 274863
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- conflicts volk
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- long_description ${long_description} ${subport} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-provides the Volk GIT maint or master branch, depending on which is more advanced, and is typically updated every few days to week.
</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;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# fix naming of *Clang compiler to just "Clang" for internal use
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-fix-clang.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patch.pre_args -p1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# override githib PortGroup homepage setting
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # fix naming of *Clang compiler to just "Clang" for internal use
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-fix-clang.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch.pre_args -p1
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage http://libvolk.org/
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build-append port:pkgconfig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib-append port:boost
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append port:pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:boost
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Volk doesn't understand build type "MacPorts"; use release unless +debug is set
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Volk doesn't understand build type "MacPorts"; use release unless +debug is set
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[variant_isset debug]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cmake.build_type Debug
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cmake.build_type Release
</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;'>-# remove use of CPATH, as it is not needed
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[variant_isset debug]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cmake.build_type Debug
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cmake.build_type Release
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-compiler.cpath
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # remove use of CPATH, as it is not needed
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# remove top-level library path, such that internal libraries are used
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# instead of any already-installed ones.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ compiler.cpath
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.ldflags-delete -L${prefix}/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # remove top-level library path, such that internal libraries are used
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # instead of any already-installed ones.
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# remove top-level include path, such that internal headers are used
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# instead of any already-installed ones.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.ldflags-delete -L${prefix}/lib
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.cppflags-delete -I${prefix}/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # remove top-level include path, such that internal headers are used
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # instead of any already-installed ones.
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# specify the Python dependencies; these are checked for at configure,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# then used for building, but not at runtime.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.cppflags-delete -I${prefix}/include
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set pythons_suffixes {27 35 36 37 38}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # specify the Python dependencies; these are checked for at configure,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # then used for building, but not at runtime.
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set pythons_ports {}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-foreach s ${pythons_suffixes} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lappend pythons_ports python${s}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set pythons_suffixes {35 36 37 38}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-proc python_dir {} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- global pythons_suffixes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set pythons_ports {}
</span> foreach s ${pythons_suffixes} {
<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 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)"]/lib/${p}/site-packages]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend pythons_ports python${s}
</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;'>+ proc python_dir {} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ global pythons_suffixes
</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 p python[string index ${s} 0].[string index ${s} 1]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return [file normalize [exec ${p} -c "import sys; print(sys.prefix)"]/lib/${p}/site-packages]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ error "Python support not enabled."
</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;'>-foreach s ${pythons_suffixes} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set p python${s}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set v [string index ${s} 0].[string index ${s} 1]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set i [lsearch -exact ${pythons_ports} ${p}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set c [lreplace ${pythons_ports} ${i} ${i}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- variant ${p} description "Build Volk using Python ${v}" conflicts {*}${c} "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach s ${pythons_suffixes} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set p 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 i [lsearch -exact ${pythons_ports} ${p}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set c [lreplace ${pythons_ports} ${i} ${i}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant ${p} description "Build Volk using Python ${v}" conflicts {*}${c} "
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # required Python
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # required Python
</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:#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:#ffe0e0;'>- depends_build-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${s}-six \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${s}-mako
</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${s}-six \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${s}-mako
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # specify the Python version to use
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # specify the Python version to use
</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=${frameworks_dir}/Python.framework/Versions/${v}/bin/python${v} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DVOLK_PYTHON_DIR=${frameworks_dir}/Python.framework/Versions/${v}/lib/python${v}/site-packages
</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 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DPYTHON_EXECUTABLE=${frameworks_dir}/Python.framework/Versions/${v}/bin/python${v} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DVOLK_PYTHON_DIR=${frameworks_dir}/Python.framework/Versions/${v}/lib/python${v}/site-packages
</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:#ffe0e0;'>-if {![variant_isset debug]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set selected_python python37
</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 selected_python python${s}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![variant_isset debug]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set selected_python python37
</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 selected_python python${s}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants +${selected_python}
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>- default_variants +${selected_python}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# override default version string to be MacPorts-specific
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# git / "devel" only for now
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # override default version string to be MacPorts-specific
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # git / "devel" only for now
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set VOLK_VERSION_INFO "git-[string range ${github.version} 0 7](${version})"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set VOLK_VERSION_INFO "git-[string range ${github.version} 0 7](${version})"
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DVOLK_GIT_COUNT="MacPorts" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DVOLK_GIT_HASH="${VOLK_VERSION_INFO}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DVOLK_GIT_COUNT="MacPorts" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DVOLK_GIT_HASH="${VOLK_VERSION_INFO}"
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# install CMake files into this directory
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # install CMake files into this directory
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DCMAKE_MODULES_DIR=${prefix}/share/cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DCMAKE_MODULES_DIR=${prefix}/share/cmake
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-default_variants +docs +orc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants +docs +orc
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant docs description "Install Volk documentation" {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant docs description "Install Volk documentation" {
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_build-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:doxygen
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:doxygen
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DDOXYGEN_EXECUTABLE=${prefix}/bin/doxygen
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DDOXYGEN_EXECUTABLE=${prefix}/bin/doxygen
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![variant_isset docs]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![variant_isset docs]} {
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DDOXYGEN_EXECUTABLE=
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DDOXYGEN_EXECUTABLE=
</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;'>-variant orc description "Install Volk with support for ORC" {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant orc description "Install Volk with support for ORC" {
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:orc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:orc
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DORCC_EXECUTABLE=${prefix}/bin/orcc \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DORC_INCLUDE_DIR=${prefix}/include/orc-0.4 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DORC_LIBRARY_DIR=${prefix}/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DORCC_EXECUTABLE=${prefix}/bin/orcc \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DORC_INCLUDE_DIR=${prefix}/include/orc-0.4 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DORC_LIBRARY_DIR=${prefix}/lib
</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;'>-if {![variant_isset orc]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![variant_isset orc]} {
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DORCC_EXECUTABLE= \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DORC_INCLUDE_DIR= \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DORC_LIBRARY_DIR=
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DORCC_EXECUTABLE= \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DORC_INCLUDE_DIR= \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DORC_LIBRARY_DIR=
</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;'>-pre-extract {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pre-extract {
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # tell the user to force deactivate gnuradio-(devel,next) if one
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # is active and version is before Volk was split off (20150329 for
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # devel and next). gnuradio 3.7.6.2+ provides this split, too (as
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # of 2015-04-12).
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # tell the user to force deactivate gnuradio-(devel,next) if one
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # is active and version is before Volk was split off (20150329 for
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # devel and next). gnuradio 3.7.6.2+ provides this split, too (as
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # of 2015-04-12).
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set not_found [catch {set installed [lindex [registry_active gnuradio-devel] 0]}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${not_found}} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set not_found [catch {set installed [lindex [registry_active gnuradio-next] 0]}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${not_found}} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set not_found [catch {set installed [lindex [registry_active gnuradio] 0]}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (!${not_found}) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set not_found [catch {set installed [lindex [registry_active gnuradio-devel] 0]}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${not_found}} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set not_found [catch {set installed [lindex [registry_active gnuradio-next] 0]}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${not_found}} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set not_found [catch {set installed [lindex [registry_active gnuradio] 0]}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!${not_found}) {
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set _portname [lindex ${installed} 0]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set _version [lindex ${installed} 1]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set _portname [lindex ${installed} 0]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set _version [lindex ${installed} 1]
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${_portname} eq "gnuradio"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set _vcmp [vercmp ${_version} 3.7.6.2]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set _vcmp [vercmp ${_version} 20150329]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${_portname} eq "gnuradio"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set _vcmp [vercmp ${_version} 3.7.6.2]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set _vcmp [vercmp ${_version} 20150329]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${_vcmp} < 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${_vcmp} < 0} {
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_msg "\nVolk is currently installed by the port '${_portname}'."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_msg "Use the command"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_msg " sudo port -f deactivate ${_portname}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_msg "to deactivate the port owning volk, then proceed with"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_msg " sudo port upgrade ${_portname}\n"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return -code error "Port Needs Deactivation"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_msg "\nVolk is currently installed by the port '${_portname}'."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_msg "Use the command"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_msg " sudo port -f deactivate ${_portname}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_msg "to deactivate the port owning volk, then proceed with"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_msg " sudo port upgrade ${_portname}\n"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return -code error "Port Needs Deactivation"
</span>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
}
}
</pre><pre style='margin:0'>
</pre>