<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/80c2ad8da45a4ad1c6f75fbd8b408d0884ec56fd">https://github.com/macports/macports-ports/commit/80c2ad8da45a4ad1c6f75fbd8b408d0884ec56fd</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 80c2ad8da45 Revert "postfix: Whitespace and legibility improvements"
</span>80c2ad8da45 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 80c2ad8da45a4ad1c6f75fbd8b408d0884ec56fd
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Tue Nov 9 11:45:59 2021 +1100
<span style='display:block; white-space:pre;color:#404040;'> Revert "postfix: Whitespace and legibility improvements"
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> This reverts commit 620b9f3cbbdd6943508335af8af58800f517c8c6.
</span>---
mail/postfix/Portfile | 132 ++++++++++++++++++++++++--------------------------
1 file changed, 63 insertions(+), 69 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/mail/postfix/Portfile b/mail/postfix/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index b29942c6eb4..7bb309cce23 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/mail/postfix/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/mail/postfix/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,58 +1,52 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-PortSystem 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-name postfix
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-version 3.6.3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-categories mail
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-license {IBMPL-1 EPL-2}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers {jmr @jmroot} openmaintainer
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-description Fast and robust mail transfer agent
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortSystem 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+name postfix
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 3.6.3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+categories mail
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+license {IBMPL-1 EPL-2}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers {jmr @jmroot} openmaintainer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+description Fast and robust mail transfer agent
</span> long_description Postfix attempts to be fast, easy to administer, and \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- secure, while at the same time being \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sendmail-compatible enough to not upset existing \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- users. It also offers QMQP and VERP support to let \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Postfix act as delivery daemon for ezmlm-idx.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage http://www.postfix.org/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 d9f8def391c6a13947cde5c663d43f109c29a80a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 0f1241d456a0158e0c418abf62c52c2ff83f8f1dcf2fbdd4c40765b67789b1bc \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 4750833
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites https://archive.mgm51.com/mirrors/postfix-source/official/ \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- http://de.postfix.org/ftpmirror/official/ \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ftp://ftp.its.cz/MIRRORS/ftp.porcupine.org/mirrors/postfix-release/official/ \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ftp://ftp.cuhk.edu.hk/pub/packages/mail-server/postfix/official/ \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- http://mirror.postfix.jp/postfix-release/official/ \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- http://postfix.bbnx.net/source/official/ \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- http://cdn.postfix.johnriley.me/mirrors/postfix-release/official/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-sys_defs.h patch-mail_params.h patch-postfix-install \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-makedefs patch-postfix-script
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ secure, while at the same time being \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sendmail-compatible enough to not upset existing \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ users. It also offers QMQP and VERP support to let \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Postfix act as delivery daemon for ezmlm-idx.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage http://www.postfix.org/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+platforms darwin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 d9f8def391c6a13947cde5c663d43f109c29a80a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 0f1241d456a0158e0c418abf62c52c2ff83f8f1dcf2fbdd4c40765b67789b1bc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+master_sites https://archive.mgm51.com/mirrors/postfix-source/official/ \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ http://de.postfix.org/ftpmirror/official/ \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ftp://ftp.its.cz/MIRRORS/ftp.porcupine.org/mirrors/postfix-release/official/ \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ftp://ftp.cuhk.edu.hk/pub/packages/mail-server/postfix/official/ \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ http://mirror.postfix.jp/postfix-release/official/ \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ http://postfix.bbnx.net/source/official/ \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ http://cdn.postfix.johnriley.me/mirrors/postfix-release/official/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-sys_defs.h patch-mail_params.h patch-postfix-install \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-makedefs patch-postfix-script
</span>
post-patch {
reinplace -q "s|/etc/|${prefix}/etc/|g" \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- {*}[glob ${worksrcpath}/man/man1/*] \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {*}[glob ${worksrcpath}/man/man5/*] \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {*}[glob ${worksrcpath}/man/man8/*]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {*}[glob ${worksrcpath}/man/man1/*] \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {*}[glob ${worksrcpath}/man/man5/*] \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {*}[glob ${worksrcpath}/man/man8/*]
</span>
reinplace "s|__PREFIX|${prefix}|g" ${worksrcpath}/src/util/sys_defs.h \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/src/global/mail_params.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/src/global/mail_params.h
</span>
# Set main.cf default values
reinplace "s|#default_privs|default_privs|g" \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/conf/main.cf
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/conf/main.cf
</span> reinplace "s|/etc/postfix/network_table|${prefix}/etc/postfix/network_table|g" \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/conf/main.cf
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/conf/main.cf
</span> reinplace "s|/etc/postfix/relay_recipients|${prefix}/etc/postfix_relay_recipients|g" \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/conf/main.cf
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/conf/main.cf
</span> reinplace "s|/etc/postfix/header_checks|${prefix}/etc/postfix/header_checks|g" \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/conf/main.cf
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/conf/main.cf
</span> reinplace "s|PATH=/bin:/usr/bin|PATH=${prefix}/bin:/bin:/usr/bin|g" \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/conf/main.cf
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/conf/main.cf
</span> }
variant universal {}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -62,7 +56,7 @@ set AUXLIBS [list -L${prefix}/lib {*}[get_canonical_archflags ld]]
</span> set pf_mail_owner _postfix
set pf_setgid_group _postdrop
set config_files [list main.cf master.cf access aliases canonical generic \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- header_checks relocated transport virtual]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ header_checks relocated transport virtual]
</span>
# Beginning with Mac OS X 10.5, the user 'postfix' changed to '_postfix'
platform darwin 8 {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -77,32 +71,32 @@ configure {
</span>
build.target
<span style='display:block; white-space:pre;background:#ffe0e0;'>-startupitem.create yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-startupitem.start "${prefix}/sbin/${name} start"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-startupitem.stop "${prefix}/sbin/${name} stop"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-startupitem.pidfile auto ${prefix}/var/spool/postfix/pid/master.pid
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+startupitem.create yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+startupitem.start "${prefix}/sbin/${name} start"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+startupitem.stop "${prefix}/sbin/${name} stop"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+startupitem.pidfile auto ${prefix}/var/spool/postfix/pid/master.pid
</span>
destroot {
destroot.keepdirs ${destroot}${prefix}/var/spool/postfix/public \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${prefix}/var/spool/postfix/maildrop \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${prefix}/var/lib/postfix
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${prefix}/var/spool/postfix/maildrop \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${prefix}/var/lib/postfix
</span> system -W ${worksrcpath} "/bin/sh postfix-install -non-interactive \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- install_root=${destroot} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- config_directory=${prefix}/etc/postfix \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- queue_directory=${prefix}/var/spool/postfix \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- command_directory=${prefix}/sbin \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- daemon_directory=${prefix}/libexec/postfix \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- data_directory=${prefix}/var/lib/postfix \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sendmail_path=${prefix}/sbin/sendmail \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- newaliases_path=${prefix}/bin/newaliases \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mailq_path=${prefix}/bin/mailq \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- etc_directory=${prefix}/etc/postfix \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- share_directory=${prefix}/share/postfix \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- manpage_directory=${prefix}/share/man \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sample_directory=${prefix}/share/postfix/sample \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- readme_directory=${prefix}/share/postfix/readme \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mail_owner=${pf_mail_owner} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- setgid_group=${pf_setgid_group}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ install_root=${destroot} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ config_directory=${prefix}/etc/postfix \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ queue_directory=${prefix}/var/spool/postfix \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ command_directory=${prefix}/sbin \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ daemon_directory=${prefix}/libexec/postfix \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ data_directory=${prefix}/var/lib/postfix \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sendmail_path=${prefix}/sbin/sendmail \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ newaliases_path=${prefix}/bin/newaliases \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mailq_path=${prefix}/bin/mailq \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ etc_directory=${prefix}/etc/postfix \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ share_directory=${prefix}/share/postfix \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ manpage_directory=${prefix}/share/man \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sample_directory=${prefix}/share/postfix/sample \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ readme_directory=${prefix}/share/postfix/readme \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mail_owner=${pf_mail_owner} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ setgid_group=${pf_setgid_group}"
</span>
# add in future when shared libraries are enabled
#shlib_directory=${prefix}/lib/postfix
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -110,13 +104,13 @@ destroot {
</span> # This makes sure we don't overwrite user cf files.
foreach f $config_files {
move ${destroot}${prefix}/etc/postfix/${f} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${prefix}/etc/postfix/${f}.sample
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${prefix}/etc/postfix/${f}.sample
</span> }
if {[geteuid] == 0} {
system "chown -R ${pf_mail_owner} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- '${destroot}${prefix}/var/spool/postfix/public' \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- '${destroot}${prefix}/var/lib/postfix'"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ '${destroot}${prefix}/var/spool/postfix/public' \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ '${destroot}${prefix}/var/lib/postfix'"
</span> }
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -131,7 +125,7 @@ post-activate {
</span> foreach f $config_files {
if {![file exists ${prefix}/etc/postfix/${f}]} {
copy ${prefix}/etc/postfix/${f}.sample \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ${prefix}/etc/postfix/${f}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${prefix}/etc/postfix/${f}
</span> }
}
}
</pre><pre style='margin:0'>
</pre>