<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/8d43f946cd01ef76ebc4660139a7dcb02f27790e">https://github.com/macports/macports-ports/commit/8d43f946cd01ef76ebc4660139a7dcb02f27790e</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 8d43f946cd0 bladeRF: update to 20201114-3a411c87
</span>8d43f946cd0 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 8d43f946cd01ef76ebc4660139a7dcb02f27790e
</span>Author: Michael Dickens <michaelld@macports.org>
AuthorDate: Thu Jan 7 12:55:42 2021 -0500
<span style='display:block; white-space:pre;color:#404040;'> bladeRF: update to 20201114-3a411c87
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> + docs work, so provide that variant
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> + integrate +tecla into the main build
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> + move to CMake 1.1 PG & required changes for it
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> + various other tweaks and fixes
</span>---
science/bladeRF/Portfile | 88 +++++++++++-----------
.../files/patch-include_clock_gettime.c_shim.diff | 18 -----
2 files changed, 45 insertions(+), 61 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/bladeRF/Portfile b/science/bladeRF/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 66ada664828..1f96cd993e9 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/bladeRF/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/bladeRF/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +1,7 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
PortSystem 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup cmake 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup cmake 1.1
</span> PortGroup github 1.0
PortGroup legacysupport 1.0
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -10,8 +10,8 @@ legacysupport.newest_darwin_requires_legacy 10
</span>
compiler.cxx_standard 2011
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup Nuand bladeRF 1ccfa4b41caf357f26d1f47f85a48cafe4289c79
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-version 20200622-[string range ${github.version} 0 7]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup Nuand bladeRF 3a411c87c2416dc68030d5823d73ebf3f797a145
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 20201114-[string range ${github.version} 0 7]
</span> revision 0
# no-OS is a submodule, but because we're not cloning into a GIT
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -41,9 +41,9 @@ master_sites ${github.homepage}/tarball/${git.branch}:tagone \
</span> https://github.com/${no_OS_github_author}/${no_OS_github_project}/tarball/${no_OS_commit}:tagtwo
checksums ${bladeRF_distfile} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 1ac056e7286880814fd0f5d65893e63fc974c728 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 dd9fb4ad1c1da7192f768a0f3bc9b1d230db2d6ffcf3ecf984538c7f1ebf83f8 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 2219806 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 87921ae86b609745ceaaaddfcf00e6bef8004f7b \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 46ef36d735f772646d64e79b8542deba57d68cf5e620e13b981242d5536d62a0 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 2219985 \
</span> ${no_OS_distfile} \
rmd160 dbe43395fc0b22919ac7e6a5e2f355987e4dd2b7 \
sha256 53670c8f0a9feaa774d8c3067ba201b31c0197294bdd00a1795c72a0368aac40 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -91,60 +91,62 @@ long_description ${description} This port provides all the source code requir
</span> license MIT LGPL-2 GPL-2
platforms darwin
<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 path:lib/libusb-1.0.dylib:libusb
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:pkgconfig \
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# temporary patch to correctly build "test_config_file" on OSX
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# patchfiles-append patch-include_clock_gettime.c_shim.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:lib/libusb-1.0.dylib:libusb \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libedit \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:tecla
</span>
# temporary patch to fix CMake MATCHES "Clang"
patchfiles-append patch-clang-matches.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# do VPATH (out of source tree) build
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-cmake.out_of_source yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</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;'>+# remove top-level library and include paths, such that internal
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# libraries & headers are used instead of any already-installed ones.
</span>
configure.ldflags-delete -L${prefix}/lib
<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;'>-# override the default version info,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# per ticket #46197, to be MacPorts-specific
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args-append -DVERSION_INFO_OVERRIDE="MacPorts-${version}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# do not treat compiler warnings as errors
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args-append -DTREAT_WARNINGS_AS_ERRORS=OFF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# do not use 'pandoc' even if it is installed
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DVERSION_INFO_OVERRIDE="MacPorts-${version}" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DTREAT_WARNINGS_AS_ERRORS=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DENABLE_LIBTECLA=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DENABLE_LIBEDIT=ON
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args-append -DPANDOC_EXECUTABLE=NO
</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;'>-# default to building all variants
</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;'>-default_variants +tecla
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant docs description "Install BladeRF documentation" {}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant tecla description "Build with support for the tecla interactive command line" {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default_variants +docs
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:tecla
</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;'>- -DENABLE_LIBTECLA=ON
</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:#e0ffe0;'>+ port:pandoc
</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;'>+ -DPANDOC_EXECUTABLE=${prefix}/bin/pandoc \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DBUILD_DOCUMENTATION=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DBUILD_BLADERF_CLI_DOCUMENTATION=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DBUILD_BLADERF_CLI_INTERACTIVE_HELP=ON
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![variant_isset tecla]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DENABLE_LIBTECLA=OFF
</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:#e0ffe0;'>+ -DPANDOC_EXECUTABLE= \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DBUILD_DOCUMENTATION=NO \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DBUILD_BLADERF_CLI_DOCUMENTATION=NO \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DBUILD_BLADERF_CLI_INTERACTIVE_HELP=NO
</span>
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# documentation does not work as of 20140126
</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;'>- -DBUILD_DOCUMENTATION=OFF
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/bladeRF/files/patch-include_clock_gettime.c_shim.diff b/science/bladeRF/files/patch-include_clock_gettime.c_shim.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index a92abd6df51..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/bladeRF/files/patch-include_clock_gettime.c_shim.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,18 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- host/libraries/libbladeRF_test/test_config_file/CMakeLists.txt.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ host/libraries/libbladeRF_test/test_config_file/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -51,6 +51,15 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+if(BLADERF_OS_OSX)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (NOT HAVE_CLOCK_GETTIME)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ message(STATUS "Including clock_gettime.c shim for macOS")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ set(SRC ${SRC}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ${BLADERF_HOST_COMMON_SOURCE_DIR}/osx/clock_gettime.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- add_definitions(-DLIBBLADERF_SEARCH_PREFIX="${CMAKE_INSTALL_PREFIX}")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- add_definitions(-DLOGGING_ENABLED=1)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span></pre><pre style='margin:0'>
</pre>