Ticket #3754: Portfile.diff

Portfile

@@ -2 +2 @@
 
 PortSystem      1.0
 name            postfix
-version         2.0.17
-revision        2
+version         2.2.3
 categories      mail
 maintainers     yeled@opendarwin.org
 description     Fast and robust mail transfer agent
@@ -14 +13 @@
                         Postfix act as delivery daemon for ezmlm-idx.
 homepage        http://www.postfix.org/
 platforms       darwin
-checksums       md5 482e3912e4e910bd62f1a2d74bfa3b77
+checksums       md5 f164b701c3e97b950d4cc64aff4de3c0
 master_sites    ftp://ftp.tau.ac.il/pub/unix/mail/postfix/official/ \
                 http://postfix.problemlos.ch/release/official/ \
                 ftp://ftp.matrix.com.br/pub/postfix/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/ \
                 ftp://ftp.doc.cs.univ-paris8.fr/mirrors/ftp.porcupine.org/postfix-release/official/
+
+depends_run     port:DarwinPortsStartup
+
 patchfiles      patch-access.5 patch-flush.8 patch-master.8 \
-                                patch-regexp_table.5 patch-sys_defs.h patch-canonical.5 \
+                patch-regexp_table.5 patch-sys_defs.h patch-canonical.5 \
                 patch-mail_params.h patch-pcre_table.5 patch-postdrop.1 \
                 patch-postqueue.1 patch-relocated.5 patch-transport.5 \
                 patch-cleanup.8 patch-main.cf patch-postfix-install \
@@ -30 +32 @@
                 patch-virtual.5
 
 build.env       CCARGS=-DNO_PCRE
-default_variants        +pcre
-variant pcre    {
-        depends_lib-append      lib:libpcre:pcre
-        build.env-delete        CCARGS=-DNO_PCRE
-}
-
-platform darwin 7 {
-  build.env-append CCARGS=-DBIND_8_COMPAT
-}
 
 configure {
         cd ${worksrcpath}
@@ -64 +57 @@
 
 build.target
 
-depends_run     path:/Library/StartupItems/DarwinPortsStartup:DarwinPortsStartup
-
 destroot {
         adduser postfix realname=Postfix\ Server
         addgroup postdrop
         cd ${worksrcpath}
-        file mkdir ${destroot}${prefix}/bin
+#       file mkdir ${destroot}${prefix}/bin
         file mkdir ${destroot}${prefix}/etc/postfix
-        file mkdir ${destroot}${prefix}/etc/rc.d
-        file mkdir ${destroot}${prefix}/libexec
-        file mkdir ${destroot}${prefix}/sbin
-        file mkdir ${destroot}${prefix}/share/man
+#       file mkdir ${destroot}${prefix}/libexec
+#       file mkdir ${destroot}${prefix}/sbin
+#       file mkdir ${destroot}${prefix}/share/man
         file mkdir ${destroot}${prefix}/share/postfix
-        xinstall -d -o postfix -g postdrop ${destroot}${prefix}/var/spool/postfix/public
-        xinstall -d -o postfix -g postdrop ${destroot}${prefix}/var/spool/postfix/maildrop
+        xinstall -d -m 755 ${destroot}${prefix}/etc/rc.d
+        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
         system "/bin/sh postfix-install -non-interactive \
                 install_root=${destroot} \
@@ -92 +83 @@
                 mailq_path=${prefix}/bin/mailq \
                 sample_directory=${prefix}/share/postfix/sample \
                 readme_directory=${prefix}/share/postfix/readme"
-        xinstall -m 755 -d ${destroot}${prefix}/etc/rc.d
         xinstall -m 755 -c ${portpath}/files/postfix.sh ${destroot}${prefix}/etc/rc.d
-        reinplace "s|__PREFIX|${prefix}|g" \
-                ${destroot}${prefix}/etc/rc.d/postfix.sh
+        reinplace "s|__PREFIX|${prefix}|g" ${destroot}${prefix}/etc/rc.d/postfix.sh
 }
 # This makes sure we don't overwrite user /etc files. This now breaks postfix
 # "just working" on fresh installs.
@@ -114 +103 @@
         ui_msg "To get postfix working, you need to copy sample configuration "
         ui_msg "files and to edit them (${prefix}/etc/postfix/*.sample)."
         ui_msg "You may also want to turn your system's MTA off."
+}
+
+
+platform darwin 7 {
+         build.env-append CCARGS=-DBIND_8_COMPAT
+}
+
+variant pcre    {
+        depends_lib-append      lib:libpcre:pcre
+        build.env-delete        CCARGS=-DNO_PCRE
 }