diff -urN qmail.orig/Makefile qmail/Makefile
--- qmail.orig/Makefile	2009-11-03 16:55:18.000000000 -0200
+++ qmail/Makefile	2009-11-03 17:54:15.000000000 -0200
@@ -7,7 +7,7 @@
 
 PORTNAME=	qmail
 PORTVERSION?=	${QMAIL_VERSION}
-PORTREVISION?=	7
+PORTREVISION?=	8
 CATEGORIES=	mail
 MASTER_SITES+=	${MASTER_SITE_QMAIL}
 DISTNAME=	${PORTNAME}-${QMAIL_VERSION}
@@ -168,7 +168,9 @@
 		LDAP_DEBUG	"possibility to log and debug imap/pop" off \
 		SMTPEXTFORK	"Allow qmail-smtpd fork external progs" off \
 		XF_QUITASAP	"Close SMTP session ASAP (SMTPEXTFORK)" off \
-		SENDERCHECK4	"LOOSE checks exclusively for RELAY clients" off
+		SENDERCHECK4	"LOOSE checks exclusively for RELAY clients" off \
+		ENHACELOGS	"Enhace qmail-smtpd logs (spamcontrol-like)" off \
+		GRTDELAY	"Add jms1's Greet Delay feature" off 
 
 LDAP_PARAMS=	ALTQUEUE BIGBROTHER BIGTODO BIND_8_COMPAT\
 		CLEARTEXTPASSWD DASH_EXT DATA_COMPRESS\
@@ -470,7 +472,7 @@
 . if defined(SLAVE_SPAMCONTROL)
 SMTPEXTFORK_PATCH=	smtpextfork-spamcontrol-2519.patch
 . else
-SMTPEXTFORK_PATCH=	smtpextfork-ldap-${LDAP_PATCH_DATE}_3.patch
+SMTPEXTFORK_PATCH=	smtpextfork-ldap-${LDAP_PATCH_DATE}_4.patch
 . endif
 
 MASTER_SITES+=	http://www6.freebsdbrasil.com.br/~eksffa/l/dev/qmail-smtpextfork/patches/:extfork \
@@ -487,6 +489,21 @@
 PATCHFILES+=	qmail-ldap-1.03_qmail-smtpd_SENDERCHECK4.patch:sendercheck4
 .endif
 
+.if defined(SLAVE_LDAP) && defined(WITH_GRTDELAY)
+PATCH_SITES+=	http://www6.freebsdbrasil.com.br/~eksffa/l/dev/qmail/:grtdelay \
+		${MASTER_SITE_LOCAL:S/$/:grtdelay/}
+PATCH_SITE_SUBDIR+=	garga/qmail/:grtdelay
+PATCHFILES+=	qmail-ldap-${LDAP_PATCH_DATE}-grtdelay.patch:grtdelay
+DOCFILES_WRKDIR_doc+=	README.GREETDELAY
+.endif
+
+.if defined(SLAVE_LDAP) && defined(WITH_ENHACELOG)
+PATCH_SITES+=	http://www6.freebsdbrasil.com.br/~eksffa/l/dev/qmail/:ldapenhacelog \
+	${MASTER_SITE_LOCAL:S/$/:ldapenhacelog/}
+PATCH_SITE_SUBDIR+=	garga/qmail/:ldapenhacelog
+PATCHFILES+=	enhacelogging-ldap-${LDAP_PATCH_DATE}_4.patch:ldapenhacelog
+.endif
+
 # Some default values, these can be modified by make command line
 .if defined(WITH_BIG_CONCURRENCY_PATCH) && !defined(BARRIER_BIG_CONCURRENCY_PATCH)
 WITH_BIG_CONCURRENCY_PATCH_CONCURRENCY_LIMIT?=	509
diff -urN qmail.orig/distinfo qmail/distinfo
--- qmail.orig/distinfo	2009-11-03 16:55:18.000000000 -0200
+++ qmail/distinfo	2009-11-03 17:44:44.000000000 -0200
@@ -1,108 +1,15 @@
 MD5 (qmail/qmail-1.03.tar.gz) = 622f65f982e380dbe86e6574f3abcb7c
 SHA256 (qmail/qmail-1.03.tar.gz) = 21ed6c562cbb55092a66197c35c8222b84115d1acab0854fdb1ad1f301626f88
 SIZE (qmail/qmail-1.03.tar.gz) = 220668
-MD5 (qmail/qmail-103.patch) = 9140ad2b03017145cd7963c84bb24f16
-SHA256 (qmail/qmail-103.patch) = 4cad53c7a6628a600c74c36bfee327db5052ca24c222d4013e4dfcd7f427653d
-SIZE (qmail/qmail-103.patch) = 2104
-MD5 (qmail/qmailqueue-patch) = 5a8d7a5863b0c56236af945dedd45754
-SHA256 (qmail/qmailqueue-patch) = 52e82aaa34e9f1308b063cc986a701f67e161662e9f789bb12af03a381530f94
-SIZE (qmail/qmailqueue-patch) = 2510
-MD5 (qmail/big-todo.103.patch) = 39b6f70f65056472ff97ab40c1dba7b4
-SHA256 (qmail/big-todo.103.patch) = afa0a249e3271badd442f0bdae39997d9fe536157d8a0d62b6706f3dfcd11a72
-SIZE (qmail/big-todo.103.patch) = 5546
-MD5 (qmail/big-concurrency.patch) = 2ff58c3570870a8ff9a1d9eb9aec05a6
-SHA256 (qmail/big-concurrency.patch) = 0322991955878e86af495f7317c3a4bd2e60640f9a6dd70ad501fff27242ac2f
-SIZE (qmail/big-concurrency.patch) = 9331
-MD5 (qmail/sendmail-flagf.patch) = 4e1f2d8315e7e2a5482798c9d19fac4d
-SHA256 (qmail/sendmail-flagf.patch) = 9b3951c22b98c0e5a6ebfa793f052d91dfe01d68a0ad8dc83b8e0bd60c01802e
-SIZE (qmail/sendmail-flagf.patch) = 863
-MD5 (qmail/patch-qmail-1.03-rfc2821.diff) = 1b85f233ab5b9d7ec1a8da1188bf10ef
-SHA256 (qmail/patch-qmail-1.03-rfc2821.diff) = c34b331e27882f0596529df14f0e9f24c4dff9f941d04e5df17cc158dddac426
-SIZE (qmail/patch-qmail-1.03-rfc2821.diff) = 2564
-MD5 (qmail/qmail-date-localtime.patch) = d566e8bd99b33efee0194e855b8d6995
-SHA256 (qmail/qmail-date-localtime.patch) = 852aee7577edf8814c2429f82740da2a7e0b0b23516e10c4f3f7e845a47be2d5
-SIZE (qmail/qmail-date-localtime.patch) = 2603
-MD5 (qmail/qmail-1.03-qmtpc.patch) = 122664c38338e5ec35fcac43f33d6927
-SHA256 (qmail/qmail-1.03-qmtpc.patch) = f704b6c0ca3515a4bb488d14f7c94910aba4daa87420db6cd5b7ea19f17f7449
-SIZE (qmail/qmail-1.03-qmtpc.patch) = 6197
-MD5 (qmail/outgoingip.patch) = 3c9277dcf5f9b4b6d3a270fb3abf7994
-SHA256 (qmail/outgoingip.patch) = c117f5c41033f062cdc782a16403fc19725e98d92e73ab193dfd24f48c0ca5ac
-SIZE (qmail/outgoingip.patch) = 6839
-MD5 (qmail/outgoingip.patch-spamcontrol-25) = 6265bfd682c0b4111745f1144c91e3c7
-SHA256 (qmail/outgoingip.patch-spamcontrol-25) = 17ef58193aad3ec834641a8e6c0b064965fa0f71ca432f52fe57ef1e48333ea3
-SIZE (qmail/outgoingip.patch-spamcontrol-25) = 6751
-MD5 (qmail/qmail-1.03-qmtpc_outgoingip_20090630.patch) = 120d5dd78bb227b963d828ee22f1ebe9
-SHA256 (qmail/qmail-1.03-qmtpc_outgoingip_20090630.patch) = a5b521d3f35aa0842ea3fe69f6e51fa3be5e9c0acfad8671de36fa62a5cb9539
-SIZE (qmail/qmail-1.03-qmtpc_outgoingip_20090630.patch) = 10364
-MD5 (qmail/qmail-maildir++.patch) = fd92b624ac1129a656eb1e567d1f0409
-SHA256 (qmail/qmail-maildir++.patch) = 79e3f1f8f95b58b6d17e5469f125d873fe212d0a5a6d19b538ad57176fbafb52
-SIZE (qmail/qmail-maildir++.patch) = 38088
-MD5 (qmail/qmail-block-executables.patch) = e425b420e5251b4882fc699f7822f7a0
-SHA256 (qmail/qmail-block-executables.patch) = 97512624eb02db51e10ab6d0dd834a8797a238d0e006bd1c6c94a183d291b456
-SIZE (qmail/qmail-block-executables.patch) = 5070
-MD5 (qmail/qmail-discard-double-bounces.patch) = 55d45bb8d2c3822a0e3544058aa5a3a3
-SHA256 (qmail/qmail-discard-double-bounces.patch) = 14489eefd9908f60af13fadd574d0e9bb936e5d1b706690ce52efef68529a8d8
-SIZE (qmail/qmail-discard-double-bounces.patch) = 1305
-MD5 (qmail/qmail-spf-rc5.patch) = 434bd84b87e2027cfa643673c498bd6f
-SHA256 (qmail/qmail-spf-rc5.patch) = 8ad251d779125e11422ae9bcbf619b0ba002c0893dd8c8fe55a34a8b5fc42640
-SIZE (qmail/qmail-spf-rc5.patch) = 63582
-MD5 (qmail/qmail-spf-rc5.patch-tls) = db126b4ac29ad83c1c219e5323cef452
-SHA256 (qmail/qmail-spf-rc5.patch-tls) = c884665ff0bc5a5272efe3e09aed71e648a79d0279bc708d5a9df25c5758804f
-SIZE (qmail/qmail-spf-rc5.patch-tls) = 63617
-MD5 (qmail/qmail-spf-rc5.patch-auth-tls) = 262e381adc967df0a8ab4f15f2f6fe8f
-SHA256 (qmail/qmail-spf-rc5.patch-auth-tls) = 16fe99894938c30ed1928a61dabf0a598ef7e08a766a76cf084fe658d6d50092
-SIZE (qmail/qmail-spf-rc5.patch-auth-tls) = 63752
-MD5 (qmail/qmail-ldap-1.03-20060201.patch.gz) = 55fa135415ee011f3f4234d7d52a3565
-SHA256 (qmail/qmail-ldap-1.03-20060201.patch.gz) = 92ba895df1957109ad856cc1d1554ece4d25d59017e77127dd52d76afd05525a
-SIZE (qmail/qmail-ldap-1.03-20060201.patch.gz) = 270788
-MD5 (qmail/qmail-mysql-1.1.15.patch) = c0298550475f928e82881e574e905313
-SHA256 (qmail/qmail-mysql-1.1.15.patch) = 3d2b6a08fb149d6c9fe6c8250e87edd6c4d4b2b0417f03adf5cf4202bbadc53f
-SIZE (qmail/qmail-mysql-1.1.15.patch) = 67602
-MD5 (qmail/spamcontrol-2525a_tgz.bin) = 9e413fd1b8a5059497a41affd9525229
-SHA256 (qmail/spamcontrol-2525a_tgz.bin) = 229282b04d8954d4a7e5de485de2b2ae2a14d2629bd0f08131b5c4ada095e193
-SIZE (qmail/spamcontrol-2525a_tgz.bin) = 145590
-MD5 (qmail/qmail-1.03-tls-20021228-renato.patch) = be15cd5eaff7aa3cd88aee962febadc6
-SHA256 (qmail/qmail-1.03-tls-20021228-renato.patch) = ab0de8f744241dcb7f5ee207fc7eab4f067bf42812deb85f9eb0050ac49e6e23
-SIZE (qmail/qmail-1.03-tls-20021228-renato.patch) = 42095
-MD5 (qmail/qmail-smtpd-auth-0.31.tar.gz) = 6b202f71a99fb41e9e32906017270ba0
-SHA256 (qmail/qmail-smtpd-auth-0.31.tar.gz) = 1b439fa7e128de13fa80b86883f61a39d17b87b7e8916b6a0eab065bbe49b938
-SIZE (qmail/qmail-smtpd-auth-0.31.tar.gz) = 8798
-MD5 (qmail/qmail-smtpd-auth-close3.patch) = 0ba66d73dcba1c68ed714b07e47abd3e
-SHA256 (qmail/qmail-smtpd-auth-close3.patch) = d933e871261d6740cebe5c21cad81146525cfe06a464e277979f61c1242b5ad4
-SIZE (qmail/qmail-smtpd-auth-close3.patch) = 520
-MD5 (qmail/tarpit.patch) = 49a2c0a445981deb09f3af73041d75f5
-SHA256 (qmail/tarpit.patch) = de94abbb71ef5d25e168725e435edd96ce3b14b7347440e0805dcb919b9d9604
-SIZE (qmail/tarpit.patch) = 3089
-MD5 (qmail/ext_todo-20030105.patch) = 99070bb55cac5ad61f8fb203422e651e
-SHA256 (qmail/ext_todo-20030105.patch) = d46d0225360c0477f93e2990637ebf912b2a86e494f424ef2952ee11ab533ac7
-SIZE (qmail/ext_todo-20030105.patch) = 33763
-MD5 (qmail/ext_todo-20030105_spf.patch) = 4d760732c92c01bd14d9957257ca4c1a
-SHA256 (qmail/ext_todo-20030105_spf.patch) = 544629c0003d01d27a5a45508e84332f247ed54ece57ff22c0c7c3a56ba086d6
-SIZE (qmail/ext_todo-20030105_spf.patch) = 33781
-MD5 (qmail/ext_todo-20030105_mysql.patch) = ecddff9ba6d725ec3be61843bc8007a7
-SHA256 (qmail/ext_todo-20030105_mysql.patch) = 3fc65b91faaaae147dbf6264f9381664819ef2f236532764309d174f29919ff1
-SIZE (qmail/ext_todo-20030105_mysql.patch) = 33797
-MD5 (qmail/qmail-spf-rc5.patch-spamcontrol-25) = b6d3a880a9a7868891ae3c52cf849eba
-SHA256 (qmail/qmail-spf-rc5.patch-spamcontrol-25) = a046366f28a9d768d83389a1a2e472bf4c8e64902dafac24aabb7ac4c1a3d605
-SIZE (qmail/qmail-spf-rc5.patch-spamcontrol-25) = 64220
-MD5 (qmail/auth.patch.diff) = 23e0509061cd5dda4a1abf9a7cb7596d
-SHA256 (qmail/auth.patch.diff) = 1d0f8e0ce139cd00b86f056bc31c1422d30b88cb8b125023d534cc3664f827b8
-SIZE (qmail/auth.patch.diff) = 4412
-MD5 (qmail/auth.patch.diff-tls) = 7e706dd124deb9a25cecd91fe652a90b
-SHA256 (qmail/auth.patch.diff-tls) = 467c5f68d5d332d2400f937c76311e5358b613923d64e68ae98d51d178c7de5e
-SIZE (qmail/auth.patch.diff-tls) = 2993
-MD5 (qmail/ext_todo-20030105+big-todo.103.patch) = 5878870ef85d6a83ba9465ce94d9cd42
-SHA256 (qmail/ext_todo-20030105+big-todo.103.patch) = 4e44ad403b21f5910b6af11295b82296bc8c0f18bc40dcfecfb95c11e5a296f7
-SIZE (qmail/ext_todo-20030105+big-todo.103.patch) = 2523
-MD5 (qmail/smtpextfork-ldap-20060201_3.patch) = 5dc5f9be5acf3ed87590172ee63a7f24
-SHA256 (qmail/smtpextfork-ldap-20060201_3.patch) = 5aa17d91430ecde3e89d7b842330c3e4860d2c8f2a5cd2e893837c26f6345be4
-SIZE (qmail/smtpextfork-ldap-20060201_3.patch) = 6832
-MD5 (qmail/smtpextfork-spamcontrol-2519.patch) = e5d7e5dc0039bff20a7c3fe6f55f9ca1
-SHA256 (qmail/smtpextfork-spamcontrol-2519.patch) = f45ecbb0949e4def25dc80b0b6c45d5e27df3afdb2ead1e5f0ac48d487af6bf2
-SIZE (qmail/smtpextfork-spamcontrol-2519.patch) = 7611
+MD5 (qmail/smtpextfork-ldap-20060201_4.patch) = bfa38f86d1ea648f0059f73dd91e8827
+SHA256 (qmail/smtpextfork-ldap-20060201_4.patch) = ff587d7169f404b4a0d0957f81a6849fd867defee5ac91a52ee958e58034b49f
+SIZE (qmail/smtpextfork-ldap-20060201_4.patch) = 6632
 MD5 (qmail/README.smtpextfork) = de136d073c3acf2f651f536e41054b0f
 SHA256 (qmail/README.smtpextfork) = baf23f1cc5676c67041cdaf7c8a0ce5b27365351a4ef52d235d6d021776bb72a
 SIZE (qmail/README.smtpextfork) = 7690
-MD5 (qmail/qmail-ldap-1.03_qmail-smtpd_SENDERCHECK4.patch) = 28395f5b6edfff7bb58974cd5b46717a
-SHA256 (qmail/qmail-ldap-1.03_qmail-smtpd_SENDERCHECK4.patch) = 7656aef1f30f3c6a684e319d2a309d162b2a559eb84b38d21a1e23e88c78995b
-SIZE (qmail/qmail-ldap-1.03_qmail-smtpd_SENDERCHECK4.patch) = 2182
+MD5 (qmail/qmail-ldap-1.03-20060201.patch.gz) = 55fa135415ee011f3f4234d7d52a3565
+SHA256 (qmail/qmail-ldap-1.03-20060201.patch.gz) = 92ba895df1957109ad856cc1d1554ece4d25d59017e77127dd52d76afd05525a
+SIZE (qmail/qmail-ldap-1.03-20060201.patch.gz) = 270788
+MD5 (qmail/qmail-ldap-20060201-grtdelay.patch) = 937605e19f022906af5621223e2b1d47
+SHA256 (qmail/qmail-ldap-20060201-grtdelay.patch) = db880469e3d1356252bc8d10251b88cf5cf75a69f18971ffa6e2b85db5a796bc
+SIZE (qmail/qmail-ldap-20060201-grtdelay.patch) = 6051