aboutsummaryrefslogtreecommitdiff
path: root/mail/qmail
diff options
context:
space:
mode:
authorRenato Botelho <garga@FreeBSD.org>2005-08-29 10:15:18 +0000
committerRenato Botelho <garga@FreeBSD.org>2005-08-29 10:15:18 +0000
commita56d6fef21252634cdd32476f88a3e2985df5be1 (patch)
treeb6b388a941aa7d0096d2c127b73e535fec978d80 /mail/qmail
parent727d1370e3d65575ff5b282af1807b47abd74829 (diff)
Notes
Diffstat (limited to 'mail/qmail')
-rw-r--r--mail/qmail/Makefile21
-rw-r--r--mail/qmail/distinfo2
2 files changed, 19 insertions, 4 deletions
diff --git a/mail/qmail/Makefile b/mail/qmail/Makefile
index 3cfd675fdb6c..b1fc903ed17e 100644
--- a/mail/qmail/Makefile
+++ b/mail/qmail/Makefile
@@ -37,10 +37,15 @@ BARRIER_LOCALTIME_PATCH= yes
.endif
.if defined(SLAVE_LDAP) || \
- defined(SLAVE_SMTP_AUTH_TLS) || \
defined(SLAVE_SPAMCONTROL) || \
defined(SLAVE_TLS)
BARRIER_OUTGOINGIP_PATCH= yes
+.endif
+
+.if defined(SLAVE_LDAP) || \
+ defined(SLAVE_SMTP_AUTH_TLS) || \
+ defined(SLAVE_SPAMCONTROL) || \
+ defined(SLAVE_TLS)
BARRIER_RFC2821_PATCH= yes
.endif
@@ -84,9 +89,6 @@ PATCH_DIST_STRIP+= -p1
.elif defined(SLAVE_MYSQL)
PATCH_SITES+= http://iain.cx/unix/qmail/download/:mysql
PATCHFILES+= qmail-mysql-${MYSQL_PATCH_VERSION}.patch:mysql
-.elif defined(SLAVE_SMTP_AUTH_TLS)
-PATCH_SITES+= http://www.galle.com.br/~garga/qmail/:smtp_auth_tls
-PATCHFILES+= qmail-1.03-starttls-smtp-auth.patch:smtp_auth_tls
.elif defined(SLAVE_TLS)
PATCH_SITES+= http://inoa.net/qmail-tls/:tls
PATCHFILES+= qmail-1.03-tls-${TLS_PATCH_DATE}.patch:tls
@@ -340,6 +342,17 @@ PLIST_SUB+= EXTERNAL_TODO="@comment "
BROKEN= "OUTGOINGIP and QMTPC conflicts! Please, make your choice"
.endif
+.if defined(SLAVE_SMTP_AUTH_TLS)
+PATCH_SITES+= http://www.galle.com.br/~garga/qmail/:smtp_auth_tls
+
+.if defined(WITH_OUTGOINGIP_PATCH) && !defined(BARRIER_OUTGOINGIP_PATCH)
+PATCHFILES+= qmail-1.03-starttls-smtp-auth_outgoingip.patch:smtp_auth_tls
+.else
+PATCHFILES+= qmail-1.03-starttls-smtp-auth.patch:smtp_auth_tls
+.endif
+
+.endif
+
.if defined(WITH_MAILDIRQUOTA_PATCH) && !defined(BARRIER_MAILDIRQUOTA_PATCH)
PATCH_SITES+= http://www.alexdupre.com/qmail/:quota
PATCHFILES+= qmail-maildir++.patch:quota
diff --git a/mail/qmail/distinfo b/mail/qmail/distinfo
index 23909865df5a..0924e80b9b36 100644
--- a/mail/qmail/distinfo
+++ b/mail/qmail/distinfo
@@ -4,6 +4,8 @@ MD5 (qmail/qmail-103.patch) = 9140ad2b03017145cd7963c84bb24f16
SIZE (qmail/qmail-103.patch) = 2104
MD5 (qmail/qmail-1.03-starttls-smtp-auth.patch) = f42d6f2e58b7031ceb491820e85ddd16
SIZE (qmail/qmail-1.03-starttls-smtp-auth.patch) = 41786
+MD5 (qmail/qmail-1.03-starttls-smtp-auth_outgoingip.patch) = 24f0665e22ad68c8034e26f631803f1f
+SIZE (qmail/qmail-1.03-starttls-smtp-auth_outgoingip.patch) = 41910
MD5 (qmail/qmail-ldap-1.03-20050401a.patch.gz) = 077254d5034ee966ab5dd111f05ebbf1
SIZE (qmail/qmail-ldap-1.03-20050401a.patch.gz) = 267930
MD5 (qmail/qmail-mysql-1.1.11.patch) = 3cb291ae92fd1cbab5f5ff9c6e84f2b6