[143447] trunk/dports/mail/amavisd-new

[devans at macports.org]

Revision: 143447
          https://trac.macports.org/changeset/143447
Author:   devans at macports.org
Date:     2015-12-12 09:14:25 -0800 (Sat, 12 Dec 2015)
Log Message:
-----------
amavisd-new: patch hard coded path to amavisd.conf, fixup more shebangs, increment revision.

Modified Paths:
--------------
    trunk/dports/mail/amavisd-new/Portfile

Added Paths:
-----------
    trunk/dports/mail/amavisd-new/files/
    trunk/dports/mail/amavisd-new/files/patch-etc-path.diff

Modified: trunk/dports/mail/amavisd-new/Portfile
===================================================================
--- 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)
@@ -6,7 +6,7 @@
 
 name                amavisd-new
 version             2.10.1
-revision            1
+revision            2
 categories          mail
 license             GPL-2
 maintainers         pixilla openmaintainer
@@ -58,9 +58,23 @@
                     port:clamav \
                     port:clamav-server
 
+patchfiles          patch-etc-path.diff
+
 post-patch {
+    reinplace "s|@@PREFIX@@|${prefix}|" \
+              ${worksrcpath}/amavisd
     reinplace "s|#!/usr/bin/perl|#!${perl5.bin}|" \
-              ${worksrcpath}/amavisd
+              ${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
     file copy ${worksrcpath}/amavisd.conf ${worksrcpath}/amavisd.conf.example
     reinplace "s|\$daemon_user\  =\ 'vscan'|\$daemon_user\  =\ '${daemon_user}'|" \
               ${worksrcpath}/amavisd.conf.example

Added: trunk/dports/mail/amavisd-new/files/patch-etc-path.diff
===================================================================
--- 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)
@@ -0,0 +1,20 @@
+--- 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');
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20151212/df235c23/attachment.html>