<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[128386] trunk/dports/sysutils/clamav</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/128386">128386</a></dd>
<dt>Author</dt> <dd>dluke@macports.org</dd>
<dt>Date</dt> <dd>2014-11-20 07:34:27 -0800 (Thu, 20 Nov 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>clamav: fix build for 0.98.5 when 0.98.4 is installed</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportssysutilsclamavPortfile">trunk/dports/sysutils/clamav/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportssysutilsclamavfilesclamav_build_patchdiff">trunk/dports/sysutils/clamav/files/clamav_build_patch.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportssysutilsclamavPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/sysutils/clamav/Portfile (128385 => 128386)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/sysutils/clamav/Portfile 2014-11-20 15:33:57 UTC (rev 128385)
+++ trunk/dports/sysutils/clamav/Portfile 2014-11-20 15:34:27 UTC (rev 128386)
</span><span class="lines">@@ -1,7 +1,6 @@
</span><span class="cx"> # $Id$
</span><span class="cx">
</span><span class="cx"> PortSystem 1.0
</span><del>-PortGroup conflicts_build 1.0
</del><span class="cx"> PortGroup muniversal 1.0
</span><span class="cx">
</span><span class="cx"> name clamav
</span><span class="lines">@@ -23,17 +22,19 @@
</span><span class="cx">
</span><span class="cx"> platforms darwin
</span><span class="cx">
</span><del>-#0.98.5 can't build with 0.98.4 installed see #45935
-#wishing for trace mode...
-conflicts_build ${name}
-
</del><span class="cx"> configure.args --mandir=${prefix}/share/man \
</span><span class="cx"> --with-zlib=${prefix} \
</span><span class="cx"> --with-openssl=${prefix} \
</span><span class="cx"> --disable-silent-rules
</span><span class="cx">
</span><del>-patchfiles yosemite-patch-configure.diff
</del><ins>+#- yosemite-patch is the yosemite libtool bug
+#- https://bugzilla.clamav.net/show_bug.cgi?id=11188
</ins><span class="cx">
</span><ins>+#- clamav_build_patch lets 0.98.5 build when 0.98.4 is installed
+#- https://bugzilla.clamav.net/show_bug.cgi?id=11194
+
+patchfiles yosemite-patch-configure.diff clamav_build_patch.diff
+
</ins><span class="cx"> use_parallel_build yes
</span><span class="cx">
</span><span class="cx"> depends_lib port:libiconv port:zlib port:bzip2 port:ncurses port:openssl
</span></span></pre></div>
<a id="trunkdportssysutilsclamavfilesclamav_build_patchdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/sysutils/clamav/files/clamav_build_patch.diff (0 => 128386)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/sysutils/clamav/files/clamav_build_patch.diff (rev 0)
+++ trunk/dports/sysutils/clamav/files/clamav_build_patch.diff 2014-11-20 15:34:27 UTC (rev 128386)
</span><span class="lines">@@ -0,0 +1,43 @@
</span><ins>+--- freshclam/Makefile.am.orig 2014-11-20 10:11:52.000000000 -0500
++++ freshclam/Makefile.am 2014-11-20 10:12:21.000000000 -0500
+@@ -51,7 +51,7 @@
+
+ AM_CFLAGS=@WERR_CFLAGS@
+ DEFS = @DEFS@ -DCL_NOTHREADS
+-AM_CPPFLAGS = @SSL_CPPFLAGS@ -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav @FRESHCLAM_CPPFLAGS@ @JSON_CPPFLAGS@
++AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav @SSL_CPPFLAGS@ @FRESHCLAM_CPPFLAGS@ @JSON_CPPFLAGS@
+ LIBS = @SSL_LDFLAGS@ @SSL_LIBS@ $(top_builddir)/libclamav/libclamav.la @FRESHCLAM_LIBS@ @THREAD_LIBS@
+
+ AM_INSTALLCHECK_STD_OPTIONS_EXEMPT=freshclam$(EXEEXT)
+--- freshclam/Makefile.in.orig 2014-11-20 10:11:56.000000000 -0500
++++ freshclam/Makefile.in 2014-11-20 10:12:38.000000000 -0500
+@@ -472,7 +472,7 @@
+ mirman.h
+
+ AM_CFLAGS = @WERR_CFLAGS@
+-AM_CPPFLAGS = @SSL_CPPFLAGS@ -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav @FRESHCLAM_CPPFLAGS@ @JSON_CPPFLAGS@
++AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav @SSL_CPPFLAGS@ @FRESHCLAM_CPPFLAGS@ @JSON_CPPFLAGS@
+ AM_INSTALLCHECK_STD_OPTIONS_EXEMPT = freshclam$(EXEEXT)
+ CLEANFILES = *.gcda *.gcno
+ all: all-am
+--- sigtool/Makefile.am.orig 2014-11-20 10:26:02.000000000 -0500
++++ sigtool/Makefile.am 2014-11-20 10:26:32.000000000 -0500
+@@ -37,6 +37,6 @@
+
+ AM_CFLAGS=@WERR_CFLAGS@
+ DEFS = @DEFS@ -DCL_NOTHREADS
+-AM_CPPFLAGS = @SSL_CPPFLAGS@ @JSON_CPPFLAGS@ -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav @SIGTOOL_CPPFLAGS@
++AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav @SSL_CPPFLAGS@ @JSON_CPPFLAGS@ @SIGTOOL_CPPFLAGS@
+ LIBS = @SSL_LDFLAGS@ @SSL_LIBS@ $(top_builddir)/libclamav/libclamav.la @FRESHCLAM_LIBS@ @THREAD_LIBS@
+ CLEANFILES=*.gcda *.gcno
+--- sigtool/Makefile.in.orig 2014-11-20 10:25:56.000000000 -0500
++++ sigtool/Makefile.in 2014-11-20 10:26:42.000000000 -0500
+@@ -456,7 +456,7 @@
+ sigtool.c
+
+ AM_CFLAGS = @WERR_CFLAGS@
+-AM_CPPFLAGS = @SSL_CPPFLAGS@ @JSON_CPPFLAGS@ -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav @SIGTOOL_CPPFLAGS@
++AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav @SSL_CPPFLAGS@ @JSON_CPPFLAGS@ @SIGTOOL_CPPFLAGS@
+ CLEANFILES = *.gcda *.gcno
+ all: all-am
+
</ins></span></pre>
</div>
</div>
</body>
</html>