<pre style='margin:0'>
Daniel J. Luke (danielluke) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/a6819520d192095e36f81efe3f3825ffe32bade6">https://github.com/macports/macports-ports/commit/a6819520d192095e36f81efe3f3825ffe32bade6</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 a6819520d19 clamav: ws cleanup, add tests variant
</span>a6819520d19 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit a6819520d192095e36f81efe3f3825ffe32bade6
</span>Author: Daniel J. Luke <dluke@macports.org>
AuthorDate: Wed Sep 22 08:20:06 2021 -0400
<span style='display:block; white-space:pre;color:#404040;'> clamav: ws cleanup, add tests variant
</span>---
sysutils/clamav/Portfile | 57 ++++++++++++++++++++++++------------------------
1 file changed, 29 insertions(+), 28 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/clamav/Portfile b/sysutils/clamav/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 5ac811a57f8..f358d614173 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/clamav/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/clamav/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,7 @@ PortGroup cmake 1.1
</span>
name clamav
version 0.104.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-categories sysutils
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+categories sysutils
</span> maintainers {geeklair.net:dluke @danielluke}
description clamav antivirus software
license {GPL-2 OpenSSLException}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -19,10 +19,10 @@ checksums rmd160 6cae80695cb2e2f5214ce6b999517e1f1f2a4305 \
</span> sha256 a079d64cd55d6184510adfe0f341b2f278f7fb1bcc080d28d374298160f19cb2 \
size 11896747
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+platforms darwin
</span>
# Disable tests to avoid extra dependencies
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args-append -D ENABLE_TESTS=OFF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append -DENABLE_TESTS=OFF
</span>
#Parallel build causes build failures as of 0.104.0
#use_parallel_build yes
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -31,9 +31,6 @@ depends_build port:cmake \
</span> port:pkgconfig \
bin:git:git
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#depends_test port:check \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# port:py39-pytest
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> depends_lib port:libiconv \
port:zlib \
port:bzip2 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -53,34 +50,38 @@ post-extract {
</span> # ./common/linux/cert_util_linux.c -> ./common/mac/cert_util_mac.m
# passes all tests. See: https://trac.macports.org/ticket/59168
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_msg "replacing mac security with linux security"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- delete ${worksrcpath}/common/mac/cert_util_mac.m
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- copy ${worksrcpath}/common/linux/cert_util_linux.c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/common/mac/cert_util_mac.m
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # remove two switchs not supported by the older gcc versions often used on these systems
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s/-Wno-logical-op-parentheses//g" ${worksrcpath}/libclamunrar/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s/-Wno-dangling-else//g" ${worksrcpath}/libclamunrar/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_msg "replacing mac security with linux security"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ delete ${worksrcpath}/common/mac/cert_util_mac.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ copy ${worksrcpath}/common/linux/cert_util_linux.c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/common/mac/cert_util_mac.m
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # remove two switchs not supported by the older gcc versions often used on these systems
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s/-Wno-logical-op-parentheses//g" ${worksrcpath}/libclamunrar/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s/-Wno-dangling-else//g" ${worksrcpath}/libclamunrar/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
platform darwin 8 {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append -D OPTIMIZE=OFF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append -DOPTIMIZE=OFF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
variant clamav_milter description {build with libmilter support} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:libmilter
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append -D ENABLE_MILTER=ON
</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;'>-#tests fail if this version of the port isn't installed
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#should fix it to look in build directory first (only)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# also, need to build withthout ENABLE_TESTS=OFF if we want to run tests
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# ... but don't want to force everyone to install check and python
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#test.run yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#test.cmd ctest
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#test.target --rerun-failed --output-on-failure
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:libmilter
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append -DENABLE_MILTER=ON
</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;'>+variant tests description {Enable running 'port test'} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_msg "Tests run using the installed version of this port."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_test port:check \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py39-pytest
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-delete -DENABLE_TESTS=OFF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ test.run yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ test.cmd ctest
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ test.target --rerun-failed --output-on-failure
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
livecheck.type regex
livecheck.url http://www.clamav.net/downloads
</pre><pre style='margin:0'>
</pre>