<!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>[143447] trunk/dports/mail/amavisd-new</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/143447">143447</a></dd>
<dt>Author</dt> <dd>devans@macports.org</dd>
<dt>Date</dt> <dd>2015-12-12 09:14:25 -0800 (Sat, 12 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>amavisd-new: patch hard coded path to amavisd.conf, fixup more shebangs, increment revision.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsmailamavisdnewPortfile">trunk/dports/mail/amavisd-new/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li>trunk/dports/mail/amavisd-new/files/</li>
<li><a href="#trunkdportsmailamavisdnewfilespatchetcpathdiff">trunk/dports/mail/amavisd-new/files/patch-etc-path.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsmailamavisdnewPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/mail/amavisd-new/Portfile (143446 => 143447)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/mail/amavisd-new/Portfile        2015-12-12 16:49:27 UTC (rev 143446)
+++ trunk/dports/mail/amavisd-new/Portfile        2015-12-12 17:14:25 UTC (rev 143447)
</span><span class="lines">@@ -6,7 +6,7 @@
</span><span class="cx">
</span><span class="cx"> name amavisd-new
</span><span class="cx"> version 2.10.1
</span><del>-revision 1
</del><ins>+revision 2
</ins><span class="cx"> categories mail
</span><span class="cx"> license GPL-2
</span><span class="cx"> maintainers pixilla openmaintainer
</span><span class="lines">@@ -58,9 +58,23 @@
</span><span class="cx"> port:clamav \
</span><span class="cx"> port:clamav-server
</span><span class="cx">
</span><ins>+patchfiles patch-etc-path.diff
+
</ins><span class="cx"> post-patch {
</span><ins>+ reinplace "s|@@PREFIX@@|${prefix}|" \
+ ${worksrcpath}/amavisd
</ins><span class="cx"> reinplace "s|#!/usr/bin/perl|#!${perl5.bin}|" \
</span><del>- ${worksrcpath}/amavisd
</del><ins>+ ${worksrcpath}/amavisd \
+ ${worksrcpath}/amavis-mc \
+ ${worksrcpath}/amavis-services \
+ ${worksrcpath}/amavisd-agent \
+ ${worksrcpath}/amavisd-nanny \
+ ${worksrcpath}/amavisd-release \
+ ${worksrcpath}/amavisd-signer \
+ ${worksrcpath}/amavisd-snmp-subagent \
+ ${worksrcpath}/amavisd-snmp-subagent-zmq \
+ ${worksrcpath}/amavisd-status \
+ ${worksrcpath}/amavisd-submit
</ins><span class="cx"> file copy ${worksrcpath}/amavisd.conf ${worksrcpath}/amavisd.conf.example
</span><span class="cx"> reinplace "s|\$daemon_user\ =\ 'vscan'|\$daemon_user\ =\ '${daemon_user}'|" \
</span><span class="cx"> ${worksrcpath}/amavisd.conf.example
</span></span></pre></div>
<a id="trunkdportsmailamavisdnewfilespatchetcpathdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/mail/amavisd-new/files/patch-etc-path.diff (0 => 143447)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/mail/amavisd-new/files/patch-etc-path.diff         (rev 0)
+++ trunk/dports/mail/amavisd-new/files/patch-etc-path.diff        2015-12-12 17:14:25 UTC (rev 143447)
</span><span class="lines">@@ -0,0 +1,20 @@
</span><ins>+--- amavisd.orig        2015-12-12 08:47:21.000000000 -0800
++++ amavisd        2015-12-12 08:59:37.000000000 -0800
+@@ -1091,7 +1091,7 @@
+ $file = 'file'; # path to the file(1) utility for classifying contents
+ $altermime = 'altermime'; # path to the altermime utility (optional)
+ @altermime_args_defang = qw(--verbose --removeall);
+- @altermime_args_disclaimer = qw(--disclaimer=/etc/altermime-disclaimer.txt);
++ @altermime_args_disclaimer = qw(--disclaimer=@@PREFIX@@/etc/amavisd/altermime-disclaimer.txt);
+ # @altermime_args_disclaimer =
+ # qw(--disclaimer=/etc/_OPTION_.txt --disclaimer-html=/etc/_OPTION_.html);
+ # @disclaimer_options_bysender_maps = ( 'altermime-disclaimer' );
+@@ -18579,7 +18579,7 @@
+
+ # default location of the config file if none specified
+ if (!@config_files) {
+- @config_files = ( '/etc/amavisd.conf' );
++ @config_files = ( '@@PREFIX@@/etc/amavisd/amavisd.conf' );
+ # # Debian/Ubuntu specific:
+ # @config_files = Amavis::Util::find_config_files('/usr/share/amavis/conf.d',
+ # '/etc/amavis/conf.d');
</ins></span></pre>
</div>
</div>
</body>
</html>