Ticket #15463: Portfile.diff

Portfile

@@ -3 +3 @@
 PortSystem  1.0
 
 name            postfix
-version         2.4.6
+version         2.5.2
 categories      mail
 maintainers     wms
 description     Fast and robust mail transfer agent
@@ -14 +14 @@
             Postfix act as delivery daemon for ezmlm-idx.
 homepage        http://www.postfix.org/
 platforms       darwin
-checksums       md5 303327f66c13ff9631734651ee184a88 \
-                sha1 226222707fd8d963d3173070cac96370c453ffa7
+checksums       md5 b0965aea4d548d9bd231af7143aa6942 \
+                sha1 6589c590b2e2a955bce5615bde1a86c37c572ce0
 master_sites    http://www.swissrave.ch/mirror/postfix-source/official/ \
     ftp://ftp.its.cz/MIRRORS/ftp.porcupine.org/mirrors/postfix-release/official/ \
     ftp://ftp.club-internet.fr/pub/mirrors/ftp.porcupine.org/postfix-release/official/
 
-patchfiles     patch-sys_defs.h patch-main.cf patch-mail_params.h patch-postfix-install
+patchfiles     patch-sys_defs.h patch-mail_params.h patch-postfix-install
 
 post-patch {
      eval reinplace "s|/etc/|${prefix}/etc/|g" \
@@ -29 +29 @@
           [glob ${worksrcpath}/man/man8/*]
 
      reinplace "s|__PREFIX|${prefix}|g" ${worksrcpath}/src/util/sys_defs.h
-     reinplace "s|__PREFIX|${prefix}|g" ${worksrcpath}/conf/main.cf
      reinplace "s|__PREFIX|${prefix}|g" ${worksrcpath}/src/global/mail_params.h
+
+     reinplace "s|#default_privs|default_privs|g" \
+          ${worksrcpath}/conf/main.cf
+     reinplace "s|/etc/postfix/network_table|${prefix}/etc/postfix/network_table|g" \
+          ${worksrcpath}/conf/main.cf
+     reinplace "s|/etc/postfix/relay_recipients|${prefix}/etc/postfix_relay_recipients|g" \
+          ${worksrcpath}/conf/main.cf
+     reinplace "s|/etc/postfix/header_checks|${prefix}/etc/postfix/header_checks|g" \
+          ${worksrcpath}/conf/main.cf
+     reinplace "s|/bin:/usr/bin|${prefix}/bin:/bin:/usr/bin|g" \
+          ${worksrcpath}/conf/main.cf
 }
 
 set CCARGS  -DNO_PCRE
 set AUXLIBS "-L${prefix}/lib -R${prefix}/lib -L${prefix}/lib"
+set pf_mail_owner "postfix"
+set pf_setgid_group "postdrop"
+
+# Beginning with Mac OS X 10.5, the user 'postfix' changed to '_postfix'
+platform darwin 9 {
+    global pf_mail_owner
+    global pf_setgid_group
+    set pf_mail_owner "_postfix"
+    set pf_setgid_group "_postdrop"
+}
 
 configure {
     system "make makefiles CCARGS=\"${CCARGS}\" AUXLIBS=\"${AUXLIBS}\""
@@ -47 +67 @@
 startupitem.stop        "${prefix}/sbin/${name} stop"
 
 destroot {
-    adduser postfix realname=Postfix\ Server
-    addgroup postdrop
-    file mkdir ${destroot}${prefix}/etc/postfix
-    file mkdir ${destroot}${prefix}/share/postfix
-    xinstall -d -o postfix -g postdrop -m \
-        710 ${destroot}${prefix}/var/spool/postfix/public
-    xinstall -d -o postfix -g postdrop -m 730 \
-        ${destroot}${prefix}/var/spool/postfix/maildrop
+#    adduser postfix realname=Postfix\ Server
+#    addgroup postdrop
+#    file mkdir ${destroot}${prefix}/etc/postfix
+#    file mkdir ${destroot}${prefix}/share/postfix
+#    xinstall -d -o postfix -g postdrop -m \
+#        710 ${destroot}${prefix}/var/spool/postfix/public
+#    xinstall -d -o postfix -g postdrop -m 730 \
+#        ${destroot}${prefix}/var/spool/postfix/maildrop
     destroot.keepdirs ${destroot}${prefix}/var/spool/postfix/public \
-        ${destroot}${prefix}/var/spool/postfix/maildrop
+        ${destroot}${prefix}/var/spool/postfix/maildrop \
+        ${destroot}${prefix}/var/lib/postfix
     system "cd ${worksrcpath} && /bin/sh postfix-install -non-interactive \
         install_root=${destroot} \
         config_directory=${prefix}/etc/postfix \
-        daemon_directory=${prefix}/libexec/postfix \
-        command_directory=${prefix}/sbin \
-        manpage_directory=${prefix}/share/man \
         queue_directory=${prefix}/var/spool/postfix \
+        command_directory=${prefix}/sbin \
+        daemon_directory=${prefix}/libexec/postfix \
+        data_directory=${prefix}/var/lib/postfix \
         sendmail_path=${prefix}/sbin/sendmail \
         newaliases_path=${prefix}/bin/newaliases \
         mailq_path=${prefix}/bin/mailq \
+        etc_directory=${prefix}/etc/postfix \
+        share_directory=${prefix}/share/postfix \
+        manpage_directory=${prefix}/share/man \
         sample_directory=${prefix}/share/postfix/sample \
-        readme_directory=${prefix}/share/postfix/readme"
-}
+        readme_directory=${prefix}/share/postfix/readme \
+        mail_owner=${pf_mail_owner} \
+        setgid_group=${pf_setgid_group}"
+
 # This makes sure we don't overwrite user /etc files. This now breaks postfix
 # "just working" on fresh installs.
 # YOU MUST MOVE THE SAMPLE FILES TO THE CORRECT NAMESPACE.
-# XXX unsure if this stilll an issue 07/07/05 yeled@
-post-destroot {
-    file rename ${destroot}${prefix}/etc/postfix/main.cf \
-        ${destroot}${prefix}/etc/postfix/main.cf.sample
-    file rename ${destroot}${prefix}/etc/postfix/master.cf \
-        ${destroot}${prefix}/etc/postfix/master.cf.sample
-    file rename ${destroot}${prefix}/etc/postfix/aliases \
-        ${destroot}${prefix}/etc/postfix/aliases.sample
+# XXX unsure if this still an issue 07/07/05 yeled@
+
+        file rename ${destroot}${prefix}/etc/postfix/main.cf \
+            ${destroot}${prefix}/etc/postfix/main.cf.sample
+        file rename ${destroot}${prefix}/etc/postfix/master.cf \
+            ${destroot}${prefix}/etc/postfix/master.cf.sample
+        file rename ${destroot}${prefix}/etc/postfix/aliases \
+            ${destroot}${prefix}/etc/postfix/aliases.sample
 }
 
 post-install {