<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/44941ce37d1723ce996b5131467232fd9d363e0b">https://github.com/macports/macports-ports/commit/44941ce37d1723ce996b5131467232fd9d363e0b</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 44941ce clamav: patch to fix build conflict with chmlib
</span>44941ce is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 44941ce37d1723ce996b5131467232fd9d363e0b
</span>Author: Daniel J. Luke <dluke@macports.org>
AuthorDate: Tue Dec 4 21:51:40 2018 -0500
<span style='display:block; white-space:pre;color:#404040;'> clamav: patch to fix build conflict with chmlib
</span>---
sysutils/clamav/Portfile | 3 +++
sysutils/clamav/files/patch-libclamav-Makefile.diff | 11 +++++++++++
2 files changed, 14 insertions(+)
<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 90c1299..ada78e9 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;'>@@ -35,6 +35,9 @@ use_parallel_build yes
</span> depends_lib port:libiconv port:zlib port:bzip2 port:ncurses path:lib/libssl.dylib:openssl \
port:pcre2 port:libxml2
<span style='display:block; white-space:pre;background:#e0ffe0;'>+#- hack to build even when chmlib is installed with its own lzx.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-libclamav-Makefile.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> test.run yes
test.target check
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/clamav/files/patch-libclamav-Makefile.diff b/sysutils/clamav/files/patch-libclamav-Makefile.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..3789856
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/clamav/files/patch-libclamav-Makefile.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- libclamav/Makefile.in.orig 2018-12-04 21:28:59.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ libclamav/Makefile.in 2018-12-04 21:30:40.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -718,7 +718,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ am__v_at_0 = @
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ am__v_at_1 =
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I$(top_builddir)/libclammspack
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I$(top_builddir)/libclammspack -I../libclammspack/mspack
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depcomp = $(SHELL) $(top_srcdir)/config/depcomp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ am__depfiles_maybe = depfiles
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ am__mv = mv -f
</span></pre><pre style='margin:0'>
</pre>