Ticket #13972: Portfile-qmail-spamcontrol.diff

Portfile

@@ -4 +4 @@
 
 name                            qmail-spamcontrol
 version                         2.4.18
-revision                        5
+revision                        6
 categories                      mail
 maintainers                     yahoo.com:compconsultant
 platforms                       darwin
@@ -17 +17 @@
 
 universal_variant               no
 
-variant relaymailfrom {}
-variant noreqbrackets {}
-variant noverp {}
-variant moreipme {}
-variant bigtodo {}
+variant relaymailfrom description {Relay based on sender email, not a good idea} {}
+variant noreqbrackets description {Do not require brackets in SMTP addresses} {}
+variant noverp description {Do not alow VERP addresses for recipients} {}
+variant moreipme description {Patch to account for certain NAT or load balance situations} {}
+variant bigtodo description {May make very large installations more efficient} {}
 
 homepage                        http://www.fehcom.de/qmail/spamcontrol.html
 
@@ -46 +46 @@
 worksrcdir              qmail-1.03
 
 patchfiles              patch-dns.c.diff \
-                        patch-strerr_sys.c.diff
+                        patch-strerr_sys.c.diff \
+                        patch-qmail-lspawn.c.diff \
+                        patch-qmail-rspawn.c.diff \
+                        patch-qmail.c.diff \
+                        patch-Makefile.diff
 
 configure.cflags        -O2 -include /usr/include/errno.h -c
 build.target            setup-patch
 destroot.cmd            ./install-destroot
 
+pre-fetch {
+        if {${os.platform} == "darwin" && ${os.major} == "6"} {
+                return -code error "${name} requires Mac OS X 10.3 or newer."
+        }
+}
+
 post-extract {
 
         # Merge Spamcontrol source with Qmail source
@@ -72 +82 @@
                 ${worksrcpath}/conf-qmail
 }
 
-post-patch {
+pre-patch {
                 # Apply Spamcontrol patches
                 foreach file [glob ${worksrcpath}/*.patch] {
-                        system "patch -p2 <${file}"
+                        system "patch -d ${worksrcpath} -p2 <${file}"
                 }
+}
 
-                # Append our commands for making a destroot installer
-                # This is because Spamcontrol and us needs to patch Makefile
-                system "cat ${filespath}/append-Makefile >>${worksrcpath}/Makefile"
+post-patch {
 
                 # Handle the variants, disable via source code define change
                 foreach file [glob ${worksrcpath}/*c] {
@@ -215 +224 @@
         xinstall -W ${worksrcpath} config-fast ${destroot}${prefix}/var/qmail/scripts/config-fast
 
         # Per Qmail install doc
-        xinstall ${destroot}${prefix}/var/qmail/boot/home ${destroot}${prefix}/var/qmail/rc
+        xinstall ${destroot}${prefix}/var/qmail/boot/home ${destroot}${prefix}/var/qmail/rc.sample
 }
 
 post-install {
@@ -237 +246 @@
 
 post-activate {
 
-        # Remove the turd files
+        # Remove the turd files, it is not know if they cause a problem but
+        # people have recommended not having them there.
         system "cd ${prefix}/var/qmail; find . -name .turd_${name} -delete"
-        system "rm ${destroot}${prefix}/var/log/qmail/smtpd/.turd_${name}"
-}
-
-platform darwin 6 {
-        return -code error "${name} requires Mac OS X 10.3 or newer."
 }
 
 livecheck.check                 regex
 livecheck.regex                 {Version\s+([0-9.]+)<}
-