<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/0a65b6fda04da6b88e6b87e884f051d33ea89a20">https://github.com/macports/macports-ports/commit/0a65b6fda04da6b88e6b87e884f051d33ea89a20</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 0a65b6f limesuite: update -devel
</span>0a65b6f is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 0a65b6fda04da6b88e6b87e884f051d33ea89a20
</span>Author: Davide Gerhard <rainbow@irh.it>
AuthorDate: Thu Apr 4 13:28:27 2019 +0200
<span style='display:block; white-space:pre;color:#404040;'> limesuite: update -devel
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Sent upstream the patch that download the images during cmake.
</span><span style='display:block; white-space:pre;color:#404040;'> -devel has already that patch; with next release
</span><span style='display:block; white-space:pre;color:#404040;'> patch-fix-images-download-regex.diff can be removed.
</span>---
science/limesuite/Portfile | 26 +++++++++-------------
.../files/patch-fix-images-download-regex.diff | 12 ++++++----
2 files changed, 19 insertions(+), 19 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/limesuite/Portfile b/science/limesuite/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index bd90ae4..e0e34b1 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/limesuite/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/limesuite/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20,11 +20,11 @@ homepage https://myriadrf.org/projects/lime-suite/
</span> subport limesuite-devel {}
if {[string first "-devel" $subport] > 0} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- github.setup myriadrf LimeSuite 43df46bc2237369ee4ec105620e5aa26df9dbb49
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- version 20190403
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 16da59a360b027ec5c7d5e748d198c2613fbb5d7 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 ed589f4033f431110464f96f7d95d4af6471d773d8c09098cbbf50109a3bc0ac \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 5348374
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup myriadrf LimeSuite aa1aacdc316aa14ee39a50ff7e24840f16259d0b
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 20190404
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 5ca2b4ba5491bdd47f200c10cd637400f9fcd621 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 14e3bebd7df6d28df6b769ce60897c4b30fef68bbb075f5840a745ff4137bafd \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 5348349
</span> revision 0
name limesuite-devel
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -38,11 +38,16 @@ if {[string first "-devel" $subport] > 0} {
</span> checksums rmd160 6286e1ec881b5944d9913f802cba2b8236908917 \
sha256 bf0ca8225e9eacf44cee7383504e699eb9be5cc47293fb9c08baaf8d5e3163c9 \
size 5347689
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 4
</span>
conflicts limesuite-devel
configure.args-append -DLIME_SUITE_EXTVER=release
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # the REGEX used to determine image files to download is too broad;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # make it more restrictive so-as to get just image files.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # REMOVE with next release version
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-fix-images-download-regex.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> }
depends_build-append \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -88,12 +93,3 @@ default_variants +wxgui +soapy
</span> patchfiles-append patch-src_CMakeLists.txt.diff
patch.pre_args -p1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# the REGEX used to determine image files to download is too broad;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# make it more restrictive so-as to get just image files.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-fix-images-download-regex.diff
</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;'>- # remove images that won't get used on OSX
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file delete {*}[glob ${destroot}${prefix}/share/LimeSuite/images/*/*.dll]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file delete {*}[glob ${destroot}${prefix}/share/LimeSuite/images/*/*windows*]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/limesuite/files/patch-fix-images-download-regex.diff b/science/limesuite/files/patch-fix-images-download-regex.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index db4114a..3e378b4 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/limesuite/files/patch-fix-images-download-regex.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/limesuite/files/patch-fix-images-download-regex.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,13 +1,17 @@
</span> diff --git a/cmake/DownloadImages.cmake b/cmake/DownloadImages.cmake
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index 46c390c..f43f3f9 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 46c390c..1a98c06 100644
</span> --- a/cmake/DownloadImages.cmake
+++ b/cmake/DownloadImages.cmake
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -15,7 +15,7 @@ message(STATUS "######################################################")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(SOURCE_URL "http://downloads.myriadrf.org/project/limesuite/${VERSION_MAJOR}.${VERSION_MINOR}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -12,10 +12,10 @@ message(STATUS "## DOWNLOAD_IMAGES=${DOWNLOAD_IMAGES} specified; syncing images.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ message(STATUS "######################################################")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #download support constants
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-set(SOURCE_URL "http://downloads.myriadrf.org/project/limesuite/${VERSION_MAJOR}.${VERSION_MINOR}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++set(SOURCE_URL "https://downloads.myriadrf.org/project/limesuite/${VERSION_MAJOR}.${VERSION_MINOR}")
</span> set(TEMP_DEST "${CMAKE_CURRENT_BINARY_DIR}/images/${VERSION_MAJOR}.${VERSION_MINOR}")
set(INSTALL_DEST "share/LimeSuite/images/${VERSION_MAJOR}.${VERSION_MINOR}")
-set(HREF_MATCHER "href=\\\"([\\._A-Za-z_0-9-]+)\\\"")
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+set(HREF_MATCHER "href=\\\"/project/limesuite/${VERSION_MAJOR}.${VERSION_MINOR}/([\\._A-Za-z_0-9-]+)\\\"")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++set(HREF_MATCHER "href=\\\"/project/limesuite/${VERSION_MAJOR}.${VERSION_MINOR}/([\\._A-Za-z_0-9-]+(.rpd|.rbf|.img))\\\"")
</span>
#conditional download when file is missing
function(DOWNLOAD_URL url file)
</pre><pre style='margin:0'>
</pre>