<pre style='margin:0'>
Kurt Hindenburg (kurthindenburg) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/6fd14fde820b248200c4270990856faff7557305">https://github.com/macports/macports-ports/commit/6fd14fde820b248200c4270990856faff7557305</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 6fd14fde820b248200c4270990856faff7557305
</span>Author: Kurt Hindenburg <khindenburg@macports.org>
AuthorDate: Fri Jun 4 17:14:45 2021 -0400
<span style='display:block; white-space:pre;color:#404040;'> flawfinder: update to 2.0.17; use python3.9; executable name change
</span>---
devel/flawfinder/Portfile | 21 +++++++++------------
devel/flawfinder/files/patch-remove_python2.diff | 13 -------------
2 files changed, 9 insertions(+), 25 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/flawfinder/Portfile b/devel/flawfinder/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index d838e35e169..1681ef024cf 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/flawfinder/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/flawfinder/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,7 +3,7 @@
</span> PortSystem 1.0
name flawfinder
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 2.0.15
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 2.0.17
</span> revision 0
categories devel
license GPL-2+
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22,26 +22,21 @@ platforms darwin
</span> supported_archs noarch
master_sites ${homepage}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 61b06c6974aadfa764527b4b0882f4a7ecc3f34b \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 0a65cf93b1d380669476e576abbb04ea0766a557ce2bf75d9e71f387fcd74406 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 253677
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 00127a5d809b1626b656cdbdb03afc94d56a936e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 c28c1fff7657131c8f016c3309d0caeb58d367d61a5c4b56a26ac8314772d407 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 259899
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-remove_python2.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set python_branch 3.8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set python_branch 3.9
</span> set python_version [string map {. ""} ${python_branch}]
depends_lib port:python${python_version}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|/usr/bin/env python|${prefix}/bin/python${python_branch}|" ${worksrcpath}/flawfinder
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> use_configure no
build.target
destroot {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 755 ${worksrcpath}/${name} ${destroot}${prefix}/bin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|#!/usr/bin/env python|#!${prefix}/bin/python${python_branch}|" ${worksrcpath}/${name}.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 755 ${worksrcpath}/${name}.py ${destroot}${prefix}/bin
</span> xinstall -m 644 ${worksrcpath}/${name}.1 \
${destroot}${prefix}/share/man/man1
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -50,3 +45,5 @@ depends_test-append port:py${python_version}-setuptools
</span> test.run yes
test.target check
test.env-append PYTHON3=${prefix}/bin/python${python_branch}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+notes "The executable name has changed to ${name}.py"
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/flawfinder/files/patch-remove_python2.diff b/devel/flawfinder/files/patch-remove_python2.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 6f4df69e831..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/flawfinder/files/patch-remove_python2.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,13 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- test/makefile 2019-09-24 21:33:31.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ test/makefile 2020-02-28 10:36:20.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -75,8 +75,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Usual check routine. Run all tests using *both* python2 and python3.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- check:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- @echo "Testing with $(PYTHON2)"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- @PYTHON="$(PYTHON2)" $(MAKE) test
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# @echo "Testing with $(PYTHON2)"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# @PYTHON="$(PYTHON2)" $(MAKE) test
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @echo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @echo "Testing with $(PYTHON3)"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @PYTHON="$(PYTHON3)" $(MAKE) test
</span></pre><pre style='margin:0'>
</pre>