Ticket #1446: postfix.2.diff

Portfile

@@ -2 +2 @@
 
 PortSystem      1.0
 name            postfix
-version         2.0.14
+version         2.0.17
 categories      mail
 maintainers     charlie@rubberduck.com  
 description     Fast and robust mail transfer agent
@@ -13 +13 @@
                         Postfix act as delivery daemon for ezmlm-idx.
 homepage        http://www.postfix.org/
 platforms       darwin
-checksums       md5 d0f1d1382958f3ce918d4d690be22229
+checksums       md5 482e3912e4e910bd62f1a2d74bfa3b77
 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/ \
@@ -21 +21 @@
                 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/
 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 \
@@ -35 +35 @@
         build.env-delete        CCARGS=-DNO_PCRE
 }
 
+platform darwin 7 {
+        patchfiles-append patch-src-dns-dns.h
+}
+
 configure {
         cd ${worksrcpath}
         reinplace "s|__PREFIX|${prefix}|g" src/util/sys_defs.h
@@ -72 +76 @@
         file mkdir ${destroot}${prefix}/sbin
         file mkdir ${destroot}${prefix}/man
         file mkdir ${destroot}${prefix}/share/postfix
-        system "install -d -g postdrop ${destroot}${prefix}/var/spool/postfix/public"
-        system "install -d -g postdrop ${destroot}${prefix}/var/spool/postfix/maildrop"
+        xinstall -d -o postfix -g postdrop ${destroot}${prefix}/var/spool/postfix/public
+        xinstall -d -o postfix -g postdrop ${destroot}${prefix}/var/spool/postfix/maildrop
+        # Add turd files to avoid these directories to be deleted.
+        system "touch ${destroot}${prefix}/var/spool/postfix/public/.turd"
+        system "chown postfix:postdrop ${destroot}${prefix}/var/spool/postfix/public/.turd"
+        system "touch ${destroot}${prefix}/var/spool/postfix/maildrop/.turd"
+        system "chown postfix:postdrop ${destroot}${prefix}/var/spool/postfix/maildrop/.turd"
         system "/bin/sh postfix-install -non-interactive \
                 install_root=${destroot} \
                 config_directory=${prefix}/etc/postfix \
@@ -86 +95 @@
                 mailq_path=${prefix}/bin/mailq \
                 sample_directory=${prefix}/share/postfix/sample \
                 readme_directory=${prefix}/share/postfix/readme"
-        system "install -o root -m 755 -d ${destroot}${prefix}/etc/rc.d"
-        system "install -o root -m 755 -c \
-                ${portpath}/files/postfix.sh ${destroot}${prefix}/etc/rc.d"
+        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
 }
@@ -102 +110 @@
                 ${destroot}${prefix}/etc/postfix/master.cf.sample
         file rename ${destroot}${prefix}/etc/postfix/aliases \
                 ${destroot}${prefix}/etc/postfix/aliases.sample
+}
+
+post-install {
+        # Tell the user about the renaming of the configuration files.
+        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."
 }

files/patch-sys_defs.h

@@ -1 @@
---- src/util/sys_defs.h Tue Jun 10 02:11:56 2003
-+++ src/util/sys_defs.h.new     Sat Jun 21 13:16:27 2003
-@@ -88,10 +88,10 @@
- #define HAS_FSYNC
- #define HAS_DB
- #define HAS_SA_LEN
--#define DEF_DB_TYPE    "hash"
--#define ALIAS_DB_MAP   "hash:/etc/aliases"
-+#define DEF_DB_TYPE    "netinfo"
-+#define ALIAS_DB_MAP   "netinfo:/aliases"
- #define GETTIMEOFDAY(t) gettimeofday(t,(struct timezone *) 0)
--#define ROOT_PATH      "/bin:/usr/bin:/sbin:/usr/sbin"
-+#define ROOT_PATH      "/bin:/usr/bin:/sbin:/usr/sbin:__PREFIX/bin:__PREFIX/sbin"
- #define USE_STATFS
+--- src/util/sys_defs.h.orig    Wed Nov  5 21:17:37 2003
++++ src/util/sys_defs.h Wed Jan 21 20:31:50 2004
+@@ -52,11 +52,11 @@
  #define STATFS_IN_SYS_MOUNT_H
  #define HAS_POSIX_REGEXP
-@@ -99,11 +99,11 @@
- #define PRINTFLIKE(x,y)
- #define SCANFLIKE(x,y)
- #define HAS_NETINFO
+ #define HAS_ST_GEN     /* struct stat contains inode generation number */
 -#define NATIVE_SENDMAIL_PATH "/usr/sbin/sendmail"
 -#define NATIVE_MAILQ_PATH "/usr/bin/mailq"
 -#define NATIVE_NEWALIAS_PATH "/usr/bin/newaliases"
@@ -30 +16 @@
 +#define NATIVE_DAEMON_DIR "__PREFIX/libexec/postfix"
  #endif
  
-  /*
+ #if defined(FREEBSD2) || defined(FREEBSD3) || defined(FREEBSD4)
+@@ -88,10 +88,10 @@
+ #define HAS_FSYNC
+ #define HAS_DB
+ #define HAS_SA_LEN
+-#define DEF_DB_TYPE    "hash"
+-#define ALIAS_DB_MAP   "hash:/etc/aliases"
++#define DEF_DB_TYPE    "netinfo"
++#define ALIAS_DB_MAP   "netinfo:/aliases"
+ #define GETTIMEOFDAY(t) gettimeofday(t,(struct timezone *) 0)
+-#define ROOT_PATH      "/bin:/usr/bin:/sbin:/usr/sbin"
++#define ROOT_PATH      "/bin:/usr/bin:/sbin:/usr/sbin:__PREFIX/bin:__PREFIX/sbin"
+ #define USE_STATFS
+ #define STATFS_IN_SYS_MOUNT_H
+ #define HAS_POSIX_REGEXP