<!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>[132889] trunk/dports/mail/postfix</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/132889">132889</a></dd>
<dt>Author</dt> <dd>jmr@macports.org</dd>
<dt>Date</dt> <dd>2015-02-11 21:58:37 -0800 (Wed, 11 Feb 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>postfix: update to 3.0.0</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsmailpostfixPortfile">trunk/dports/mail/postfix/Portfile</a></li>
<li><a href="#trunkdportsmailpostfixfilespatchmail_paramsh">trunk/dports/mail/postfix/files/patch-mail_params.h</a></li>
<li><a href="#trunkdportsmailpostfixfilespatchmakedefs">trunk/dports/mail/postfix/files/patch-makedefs</a></li>
<li><a href="#trunkdportsmailpostfixfilespatchsys_defsh">trunk/dports/mail/postfix/files/patch-sys_defs.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportsmailpostfixfilespatchpostfixscript">trunk/dports/mail/postfix/files/patch-postfix-script</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsmailpostfixPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/mail/postfix/Portfile (132888 => 132889)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/mail/postfix/Portfile 2015-02-12 04:13:54 UTC (rev 132888)
+++ trunk/dports/mail/postfix/Portfile 2015-02-12 05:58:37 UTC (rev 132889)
</span><span class="lines">@@ -3,7 +3,7 @@
</span><span class="cx"> PortSystem 1.0
</span><span class="cx">
</span><span class="cx"> name postfix
</span><del>-version 2.11.3
</del><ins>+version 3.0.0
</ins><span class="cx"> categories mail
</span><span class="cx"> license IBMPL-1
</span><span class="cx"> maintainers jmr openmaintainer
</span><span class="lines">@@ -15,8 +15,8 @@
</span><span class="cx"> Postfix act as delivery daemon for ezmlm-idx.
</span><span class="cx"> homepage http://www.postfix.org/
</span><span class="cx"> platforms darwin
</span><del>-checksums rmd160 9d1f44fc3c772a04a2ecce579c5b8d1feffd6e14 \
- sha256 04e5146e6e56261baae9f63c590348a4b12ce22d3d46260e26e97233f40802c3
</del><ins>+checksums rmd160 6fdfd66f3e6c5029dd4d1c14f40ec86308266ba8 \
+ sha256 c2f2f10aa3e6b7090ba979e9c515e42b3140c5c1c17a33d58787569df7ae0955
</ins><span class="cx">
</span><span class="cx"> master_sites http://archive.mgm51.com/mirrors/postfix-source/official/ \
</span><span class="cx"> http://de.postfix.org/ftpmirror/official/ \
</span><span class="lines">@@ -27,20 +27,18 @@
</span><span class="cx"> http://cdn.postfix.johnriley.me/mirrors/postfix-release/official/
</span><span class="cx">
</span><span class="cx"> patchfiles patch-sys_defs.h patch-mail_params.h patch-postfix-install \
</span><del>- patch-makedefs
</del><ins>+ patch-makedefs patch-postfix-script
</ins><span class="cx">
</span><span class="cx"> post-patch {
</span><del>- eval reinplace "s|/etc/|${prefix}/etc/|g" \
- [glob ${worksrcpath}/man/man1/*] \
- [glob ${worksrcpath}/man/man5/*] \
- [glob ${worksrcpath}/man/man8/*]
</del><ins>+ reinplace "s|/etc/|${prefix}/etc/|g" \
+ {*}[glob ${worksrcpath}/man/man1/*] \
+ {*}[glob ${worksrcpath}/man/man5/*] \
+ {*}[glob ${worksrcpath}/man/man8/*]
</ins><span class="cx">
</span><span class="cx"> reinplace "s|__PREFIX|${prefix}|g" ${worksrcpath}/src/util/sys_defs.h \
</span><del>- ${worksrcpath}/src/global/mail_params.h
</del><ins>+ ${worksrcpath}/src/global/mail_params.h \
+ ${worksrcpath}/makedefs
</ins><span class="cx">
</span><del>- reinplace "s|ls |/bin/ls |g" \
- ${worksrcpath}/conf/postfix-script
-
</del><span class="cx"> # Set main.cf default values
</span><span class="cx"> reinplace "s|#default_privs|default_privs|g" \
</span><span class="cx"> ${worksrcpath}/conf/main.cf
</span><span class="lines">@@ -54,8 +52,8 @@
</span><span class="cx"> ${worksrcpath}/conf/main.cf
</span><span class="cx"> }
</span><span class="cx">
</span><del>-set CCARGS [list -DNO_PCRE]
-set AUXLIBS [list "-L${prefix}/lib"]
</del><ins>+set CCARGS [list -DNO_EAI -DNO_PCRE]
+set AUXLIBS [list -L${prefix}/lib]
</ins><span class="cx"> if {[variant_isset universal]} {
</span><span class="cx"> set CCARGS [concat ${CCARGS} ${configure.universal_cflags}]
</span><span class="cx"> set AUXLIBS [concat ${AUXLIBS} ${configure.universal_ldflags}]
</span><span class="lines">@@ -63,23 +61,19 @@
</span><span class="cx"> set CCARGS [concat ${CCARGS} ${configure.cc_archflags}]
</span><span class="cx"> set AUXLIBS [concat ${AUXLIBS} ${configure.ld_archflags}]
</span><span class="cx"> }
</span><del>-set pf_mail_owner "_postfix"
-set pf_setgid_group "_postdrop"
</del><ins>+set pf_mail_owner _postfix
+set pf_setgid_group _postdrop
</ins><span class="cx"> set config_files [list main.cf master.cf access aliases canonical generic \
</span><span class="cx"> header_checks relocated transport virtual]
</span><span class="cx">
</span><span class="cx"> # Beginning with Mac OS X 10.5, the user 'postfix' changed to '_postfix'
</span><span class="cx"> platform darwin 8 {
</span><del>- set pf_mail_owner "postfix"
- set pf_setgid_group "postdrop"
</del><ins>+ set pf_mail_owner postfix
+ set pf_setgid_group postdrop
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-if {${os.major} >= 10 && ${os.platform} eq "darwin"} {
- lappend AUXLIBS -lresolv
-}
-
</del><span class="cx"> configure {
</span><del>- system "cd ${worksrcpath} && ${build.cmd} makefiles CC='${configure.cc}' \
</del><ins>+ system -W ${worksrcpath} "${build.cmd} makefiles CC='${configure.cc}' \
</ins><span class="cx"> OPT='${configure.optflags}' CCARGS='${CCARGS}' AUXLIBS='${AUXLIBS}'"
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -93,7 +87,7 @@
</span><span class="cx"> destroot.keepdirs ${destroot}${prefix}/var/spool/postfix/public \
</span><span class="cx"> ${destroot}${prefix}/var/spool/postfix/maildrop \
</span><span class="cx"> ${destroot}${prefix}/var/lib/postfix
</span><del>- system "cd ${worksrcpath} && /bin/sh postfix-install -non-interactive \
</del><ins>+ system -W ${worksrcpath} "/bin/sh postfix-install -non-interactive \
</ins><span class="cx"> install_root=${destroot} \
</span><span class="cx"> config_directory=${prefix}/etc/postfix \
</span><span class="cx"> queue_directory=${prefix}/var/spool/postfix \
</span><span class="lines">@@ -105,6 +99,7 @@
</span><span class="cx"> mailq_path=${prefix}/bin/mailq \
</span><span class="cx"> etc_directory=${prefix}/etc/postfix \
</span><span class="cx"> share_directory=${prefix}/share/postfix \
</span><ins>+ shlib_directory=${prefix}/lib/postfix \
</ins><span class="cx"> manpage_directory=${prefix}/share/man \
</span><span class="cx"> sample_directory=${prefix}/share/postfix/sample \
</span><span class="cx"> readme_directory=${prefix}/share/postfix/readme \
</span><span class="lines">@@ -149,102 +144,108 @@
</span><span class="cx"> sudo launchctl unload -w /System/Library/LaunchDaemons/org.postfix.master.plist
</span><span class="cx"> "
</span><span class="cx">
</span><ins>+variant dovecot_sasl description "add Dovecot SASL support" {
+ lappend CCARGS -DUSE_SASL_AUTH -DDEF_SERVER_SASL_TYPE="dovecot"
+}
+
+variant ldap description "add ldap support via openldap" {
+ depends_lib-append port:openldap
+ lappend CCARGS -DHAS_LDAP
+ lappend AUXLIBS -lldap -llber
+}
+
</ins><span class="cx"> variant pcre description "add pcre support" {
</span><span class="cx"> set CCARGS [ldelete ${CCARGS} -DNO_PCRE]
</span><del>- lappend CCARGS -DHAS_PCRE "-I${prefix}/include"
- lappend AUXLIBS "-L${prefix}/lib" -lpcre
</del><ins>+ lappend CCARGS -DHAS_PCRE -I${prefix}/include
+ lappend AUXLIBS -lpcre
</ins><span class="cx"> depends_lib-append port:pcre
</span><span class="cx"> }
</span><span class="cx">
</span><del>-variant tls description "add tls support via openssl" {
- depends_lib-append port:openssl
- lappend CCARGS -DUSE_TLS -DHAS_SSL "-I${prefix}/include"
- lappend AUXLIBS -lssl -lcrypto
-}
-
</del><span class="cx"> variant sasl description "add sasl support via cyrus-sasl2" {
</span><span class="cx"> depends_lib-append port:cyrus-sasl2
</span><del>- lappend CCARGS -DUSE_CYRUS_SASL -DUSE_SASL_AUTH "-I${prefix}/include/sasl"
</del><ins>+ lappend CCARGS -DUSE_CYRUS_SASL -DUSE_SASL_AUTH -I${prefix}/include/sasl
</ins><span class="cx"> lappend AUXLIBS -lsasl2
</span><span class="cx"> }
</span><span class="cx">
</span><del>-variant ldap description "add ldap support via openldap" {
- depends_lib-append port:openldap
- lappend CCARGS -DHAS_LDAP
- lappend AUXLIBS -lldap -llber
</del><ins>+variant smtputf8 description "add support for UTF-8 email addresses and headers (EAI) via icu" {
+ depends_lib-append port:icu
+ set CCARGS [ldelete ${CCARGS} -DNO_EAI]
+ lappend CCARGS -I${prefix}/include
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+variant tls description "add tls support via openssl" {
+ depends_lib-append port:openssl
+ lappend CCARGS -DUSE_TLS -DHAS_SSL -I${prefix}/include
+ lappend AUXLIBS -lssl -lcrypto
+}
+
</ins><span class="cx"> # Keep the mysql5 variant until the mysql5 port is replaced_by mysql51 port.
</span><span class="cx"> variant mysql5 conflicts mysql51 mysql55 mysql56 mariadb percona description "add MySQL support via mysql5" {
</span><span class="cx"> depends_lib-append path:bin/mysql_config5:mysql5
</span><del>- lappend CCARGS -DHAS_MYSQL "-I${prefix}/include/mysql5/mysql"
- lappend AUXLIBS "-L${prefix}/lib/mysql5/mysql" -lmysqlclient -lz -lm
</del><ins>+ lappend CCARGS -DHAS_MYSQL -I${prefix}/include/mysql5/mysql
+ lappend AUXLIBS -L${prefix}/lib/mysql5/mysql -lmysqlclient -lz -lm
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> variant mysql51 conflicts mysql5 mysql55 mysql56 mariadb percona description "add MySQL support via mysql51" {
</span><span class="cx"> depends_lib-append port:mysql51
</span><del>- lappend CCARGS -DHAS_MYSQL "-I${prefix}/include/mysql51/mysql"
- lappend AUXLIBS "-L${prefix}/lib/mysql51/mysql" -lmysqlclient -lz -lm
</del><ins>+ lappend CCARGS -DHAS_MYSQL -I${prefix}/include/mysql51/mysql
+ lappend AUXLIBS -L${prefix}/lib/mysql51/mysql -lmysqlclient -lz -lm
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> variant mysql55 conflicts mysql5 mysql51 mysql56 mariadb percona description "add MySQL support via mysql55" {
</span><span class="cx"> depends_lib-append port:mysql55
</span><del>- lappend CCARGS -DHAS_MYSQL "-I${prefix}/include/mysql55/mysql"
- lappend AUXLIBS "-L${prefix}/lib/mysql55/mysql" -lmysqlclient -lz -lm
</del><ins>+ lappend CCARGS -DHAS_MYSQL -I${prefix}/include/mysql55/mysql
+ lappend AUXLIBS -L${prefix}/lib/mysql55/mysql -lmysqlclient -lz -lm
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> variant mysql56 conflicts mysql5 mysql51 mysql55 mariadb percona description "add MySQL support via mysql56" {
</span><span class="cx"> depends_lib-append port:mysql56
</span><del>- lappend CCARGS -DHAS_MYSQL "-I${prefix}/include/mysql56/mysql"
- lappend AUXLIBS "-L${prefix}/lib/mysql56/mysql" -lmysqlclient -lz -lm
</del><ins>+ lappend CCARGS -DHAS_MYSQL -I${prefix}/include/mysql56/mysql
+ lappend AUXLIBS -L${prefix}/lib/mysql56/mysql -lmysqlclient -lz -lm
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> variant mariadb conflicts mysql5 mysql51 mysql55 mysql56 percona description "add MySQL support via mariadb" {
</span><span class="cx"> depends_lib-append port:mariadb
</span><del>- lappend CCARGS -DHAS_MYSQL "-I${prefix}/include/mariadb/mysql"
- lappend AUXLIBS "-L${prefix}/lib/mariadb/mysql" -lmysqlclient -lz -lm
</del><ins>+ lappend CCARGS -DHAS_MYSQL -I${prefix}/include/mariadb/mysql
+ lappend AUXLIBS -L${prefix}/lib/mariadb/mysql -lmysqlclient -lz -lm
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> variant percona conflicts mysql5 mysql51 mysql55 mysql56 mariadb description "add MySQL support via percona" {
</span><span class="cx"> depends_lib-append port:percona
</span><del>- lappend CCARGS -DHAS_MYSQL "-I${prefix}/include/percona/mysql"
- lappend AUXLIBS "-L${prefix}/lib/percona/mysql" -lmysqlclient -lz -lm
</del><ins>+ lappend CCARGS -DHAS_MYSQL -I${prefix}/include/percona/mysql
+ lappend AUXLIBS -L${prefix}/lib/percona/mysql -lmysqlclient -lz -lm
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> variant postgresql83 conflicts postgresql84 postgresql90 postgresql91 postgresql92 description "add postgresql support via postgresql83" {
</span><span class="cx"> depends_lib-append port:postgresql83
</span><del>- lappend CCARGS -DHAS_PGSQL "-I${prefix}/include/postgresql83"
- lappend AUXLIBS "-L${prefix}/lib/postgresql83" -lpq
</del><ins>+ lappend CCARGS -DHAS_PGSQL -I${prefix}/include/postgresql83
+ lappend AUXLIBS -L${prefix}/lib/postgresql83 -lpq
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> variant postgresql84 conflicts postgresql83 postgresql90 postgresql91 postgresql92 description "add postgresql support via postgresql84" {
</span><span class="cx"> depends_lib-append port:postgresql84
</span><del>- lappend CCARGS -DHAS_PGSQL "-I${prefix}/include/postgresql84"
- lappend AUXLIBS "-L${prefix}/lib/postgresql84" -lpq
</del><ins>+ lappend CCARGS -DHAS_PGSQL -I${prefix}/include/postgresql84
+ lappend AUXLIBS -L${prefix}/lib/postgresql84 -lpq
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> variant postgresql90 conflicts postgresql83 postgresql84 postgresql91 postgresql92 description "add postgresql support via postgresql90" {
</span><span class="cx"> depends_lib-append port:postgresql90
</span><del>- lappend CCARGS -DHAS_PGSQL "-I${prefix}/include/postgresql90"
- lappend AUXLIBS "-L${prefix}/lib/postgresql90" -lpq
</del><ins>+ lappend CCARGS -DHAS_PGSQL -I${prefix}/include/postgresql90
+ lappend AUXLIBS -L${prefix}/lib/postgresql90 -lpq
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> variant postgresql91 conflicts postgresql83 postgresql84 postgresql90 postgresql92 description "add postgresql support via postgresql91" {
</span><span class="cx"> depends_lib-append port:postgresql91
</span><del>- lappend CCARGS -DHAS_PGSQL "-I${prefix}/include/postgresql91"
- lappend AUXLIBS "-L${prefix}/lib/postgresql91" -lpq
</del><ins>+ lappend CCARGS -DHAS_PGSQL -I${prefix}/include/postgresql91
+ lappend AUXLIBS -L${prefix}/lib/postgresql91 -lpq
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> variant postgresql92 conflicts postgresql83 postgresql84 postgresql90 postgresql91 description "add postgresql support via postgresql92" {
</span><span class="cx"> depends_lib-append port:postgresql92
</span><del>- lappend CCARGS -DHAS_PGSQL "-I${prefix}/include/postgresql92"
- lappend AUXLIBS "-L${prefix}/lib/postgresql92" -lpq
</del><ins>+ lappend CCARGS -DHAS_PGSQL -I${prefix}/include/postgresql92
+ lappend AUXLIBS -L${prefix}/lib/postgresql92 -lpq
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-variant dovecot_sasl description "add Dovecot SASL support" {
- lappend CCARGS -DUSE_SASL_AUTH -DDEF_SERVER_SASL_TYPE="dovecot"
-}
-
</del><span class="cx"> livecheck.type regex
</span><span class="cx"> livecheck.url ftp://ftp.porcupine.org/mirrors/postfix-release/official/
</span><span class="cx"> livecheck.regex ${name}-(\[0-9.\]+)${extract.suffix}
</span></span></pre></div>
<a id="trunkdportsmailpostfixfilespatchmail_paramsh"></a>
<div class="modfile"><h4>Modified: trunk/dports/mail/postfix/files/patch-mail_params.h (132888 => 132889)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/mail/postfix/files/patch-mail_params.h 2015-02-12 04:13:54 UTC (rev 132888)
+++ trunk/dports/mail/postfix/files/patch-mail_params.h 2015-02-12 05:58:37 UTC (rev 132889)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><del>---- src/global/mail_params.h 2013-09-05 12:24:12.000000000 -0700
-+++ src/global/mail_params.h.new 2013-09-05 12:22:41.000000000 -0700
-@@ -241,7 +241,7 @@
</del><ins>+--- src/global/mail_params.h.orig 2015-01-18 11:06:00.000000000 +1100
++++ src/global/mail_params.h 2015-02-12 15:50:26.000000000 +1100
+@@ -269,7 +269,7 @@ extern int var_smtp_mxsess_limit;
</ins><span class="cx"> */
</span><span class="cx"> #define VAR_QUEUE_DIR "queue_directory"
</span><span class="cx"> #ifndef DEF_QUEUE_DIR
</span><span class="lines">@@ -9,7 +9,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> extern char *var_queue_dir;
</span><span class="cx">
</span><del>-@@ -250,13 +250,13 @@
</del><ins>+@@ -278,13 +278,13 @@ extern char *var_queue_dir;
</ins><span class="cx"> */
</span><span class="cx"> #define VAR_DAEMON_DIR "daemon_directory"
</span><span class="cx"> #ifndef DEF_DAEMON_DIR
</span><span class="lines">@@ -25,8 +25,17 @@
</span><span class="cx"> #endif
</span><span class="cx"> extern char *var_command_dir;
</span><span class="cx">
</span><del>-@@ -288,7 +288,7 @@
</del><ins>+@@ -302,7 +302,7 @@ extern char *var_pid_dir;
</ins><span class="cx"> */
</span><ins>+ #define VAR_DATA_DIR "data_directory"
+ #ifndef DEF_DATA_DIR
+-#define DEF_DATA_DIR "/var/lib/postfix"
++#define DEF_DATA_DIR "__PREFIX/var/lib/postfix"
+ #endif
+ extern char *var_data_dir;
+
+@@ -316,7 +316,7 @@ extern time_t var_starttime;
+ */
</ins><span class="cx"> #define VAR_CONFIG_DIR "config_directory"
</span><span class="cx"> #ifndef DEF_CONFIG_DIR
</span><span class="cx"> -#define DEF_CONFIG_DIR "/etc/postfix"
</span><span class="lines">@@ -34,7 +43,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> extern char *var_config_dir;
</span><span class="cx">
</span><del>-@@ -2489,22 +2489,22 @@
</del><ins>+@@ -2589,22 +2589,22 @@ extern int var_fault_inj_code;
</ins><span class="cx"> */
</span><span class="cx"> #define VAR_SENDMAIL_PATH "sendmail_path"
</span><span class="cx"> #ifndef DEF_SENDMAIL_PATH
</span><span class="lines">@@ -61,3 +70,12 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #define VAR_SAMPLE_DIR "sample_directory"
</span><ins>+@@ -3881,7 +3881,7 @@ extern char *var_smtpd_dns_re_filter;
+ */
+ #define VAR_SHLIB_DIR "shlib_directory"
+ #ifndef DEF_SHLIB_DIR
+-#define DEF_SHLIB_DIR "/usr/lib/postfix"
++#define DEF_SHLIB_DIR "__PREFIX/lib/postfix"
+ #endif
+ extern char *var_shlib_dir;
+
</ins></span></pre></div>
<a id="trunkdportsmailpostfixfilespatchmakedefs"></a>
<div class="modfile"><h4>Modified: trunk/dports/mail/postfix/files/patch-makedefs (132888 => 132889)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/mail/postfix/files/patch-makedefs 2015-02-12 04:13:54 UTC (rev 132888)
+++ trunk/dports/mail/postfix/files/patch-makedefs 2015-02-12 05:58:37 UTC (rev 132889)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><del>---- makedefs.orig 2014-01-06 04:18:56.000000000 +1100
-+++ makedefs 2014-01-17 15:34:50.000000000 +1100
-@@ -474,8 +474,7 @@
</del><ins>+--- makedefs.orig 2015-02-09 06:25:15.000000000 +1100
++++ makedefs 2015-02-12 16:37:09.000000000 +1100
+@@ -619,8 +619,7 @@
</ins><span class="cx"> # Darwin > 1.3 uses awk and flat_namespace
</span><span class="cx"> case $RELEASE in
</span><span class="cx"> 1.[0-3]) AWK=gawk;;
</span><span class="lines">@@ -10,3 +10,29 @@
</span><span class="cx"> esac
</span><span class="cx"> # Darwin 7 adds IPv6 support, BIND_8_COMPAT, NO_NETINFO
</span><span class="cx"> case $RELEASE in
</span><ins>+@@ -636,9 +635,9 @@
+ ?.*) CCARGS="$CCARGS -DRESOLVE_H_NEEDS_NAMESER8_COMPAT_H";;
+ *) CCARGS="$CCARGS -DRESOLVE_H_NEEDS_ARPA_NAMESER_COMPAT_H";;
+ esac
+- # Darwin 11.x (MacOS X 10.7.x), maybe earlier, needs libresolv.
++ # Darwin 10.x (Mac OS X 10.6.x) and later needs libresolv.
+ case $RELEASE in
+- ?.*|10.*) ;;
++ ?.*) ;;
+ *) SYSLIBS="$SYSLIBS -lresolv";;
+ esac
+ # kqueue and/or poll are broken in MacOS X 10.5 (Darwin 9).
+@@ -753,10 +752,10 @@
+ &error) != 14);
+ }
+ EOF
+- ${CC-gcc} -o makedefs.test makedefs.test.c -I/usr/local/include \
+- -L/usr/local/lib -licuuc >/dev/null 2>&1
++ ${CC-gcc} -o makedefs.test makedefs.test.c -I__PREFIX/include \
++ -L__PREFIX/lib -licuuc >/dev/null 2>&1
+ if ./makedefs.test 2>/dev/null ; then
+- SYSLIBS="$SYSLIBS -L/usr/local/lib -licuuc"
++ SYSLIBS="$SYSLIBS -L__PREFIX/lib -licuuc"
+ else
+ CCARGS="$CCARGS -DNO_EAI"
+ fi
</ins></span></pre></div>
<a id="trunkdportsmailpostfixfilespatchpostfixscript"></a>
<div class="addfile"><h4>Added: trunk/dports/mail/postfix/files/patch-postfix-script (0 => 132889)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/mail/postfix/files/patch-postfix-script (rev 0)
+++ trunk/dports/mail/postfix/files/patch-postfix-script 2015-02-12 05:58:37 UTC (rev 132889)
</span><span class="lines">@@ -0,0 +1,11 @@
</span><ins>+--- conf/postfix-script.orig 2014-06-28 00:05:15.000000000 +1000
++++ conf/postfix-script 2015-02-12 15:38:30.000000000 +1100
+@@ -288,7 +288,7 @@
+
+ # Check Postfix mail_owner-owned directory tree owner.
+
+- find `ls -d $queue_directory/* | \
++ find `/bin/ls -d $queue_directory/* | \
+ egrep '/(saved|incoming|active|defer|deferred|bounce|hold|trace|corrupt|public|private|flush)$'` \
+ ! \( -type p -o -type s \) ! -user $mail_owner \
+ -exec $WARN not owned by $mail_owner: {} \;
</ins></span></pre></div>
<a id="trunkdportsmailpostfixfilespatchsys_defsh"></a>
<div class="modfile"><h4>Modified: trunk/dports/mail/postfix/files/patch-sys_defs.h (132888 => 132889)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/mail/postfix/files/patch-sys_defs.h 2015-02-12 04:13:54 UTC (rev 132888)
+++ trunk/dports/mail/postfix/files/patch-sys_defs.h 2015-02-12 05:58:37 UTC (rev 132889)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><del>---- src/util/sys_defs.h.orig 2013-09-30 06:51:55.000000000 +1000
-+++ src/util/sys_defs.h 2014-01-17 15:24:37.000000000 +1100
-@@ -228,9 +228,9 @@
</del><ins>+--- src/util/sys_defs.h.orig 2014-12-26 09:33:02.000000000 +1100
++++ src/util/sys_defs.h 2015-02-12 15:40:02.000000000 +1100
+@@ -230,9 +230,9 @@
</ins><span class="cx"> #define HAS_DB
</span><span class="cx"> #define HAS_SA_LEN
</span><span class="cx"> #define NATIVE_DB_TYPE "hash"
</span><span class="lines">@@ -12,8 +12,8 @@
</span><span class="cx"> #define USE_STATFS
</span><span class="cx"> #define STATFS_IN_SYS_MOUNT_H
</span><span class="cx"> #define HAS_POSIX_REGEXP
</span><del>-@@ -245,11 +245,11 @@
- # define HAVE_GETIFADDRS
</del><ins>+@@ -244,11 +244,11 @@
+ #define HAVE_GETIFADDRS
</ins><span class="cx"> #endif
</span><span class="cx"> #define HAS_FUTIMES /* XXX Guessing */
</span><span class="cx"> -#define NATIVE_SENDMAIL_PATH "/usr/sbin/sendmail"
</span></span></pre>
</div>
</div>
</body>
</html>