diff options
| author | Renato Botelho <garga@FreeBSD.org> | 2005-09-27 11:38:48 +0000 |
|---|---|---|
| committer | Renato Botelho <garga@FreeBSD.org> | 2005-09-27 11:38:48 +0000 |
| commit | 01510677a82bce329e08e89ec8c7a6527b3d63b9 (patch) | |
| tree | 1900759fb3f62ef58d1cd579b41b204093d9b9ca /mail | |
| parent | 36bf40616a1a695757c0252d438b16a076a691d6 (diff) | |
Notes
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/qmail/Makefile | 17 | ||||
| -rw-r--r-- | mail/qmail/distinfo | 2 |
2 files changed, 9 insertions, 10 deletions
diff --git a/mail/qmail/Makefile b/mail/qmail/Makefile index 05aa4ea2a239..2f5866e8e5d6 100644 --- a/mail/qmail/Makefile +++ b/mail/qmail/Makefile @@ -101,8 +101,8 @@ PATCHFILES+= qmail-1.03-tls-${TLS_PATCH_DATE}.patch:tls PATCH_DIST_STRIP+= -p1 .endif -PATCH_SITES+= ${MASTER_SITE_LOCAL:S/$/:dns,sendmail_flagf,rfc2821,ldap,mysql,smtp_auth_tls,tls,quota,blockexec,doublebounce,spf,localtime/} -PATCH_SITE_SUBDIR+= garga/qmail/:dns,sendmail_flagf,rfc2821,ldap,mysql,smtp_auth_tls,tls,quota,blockexec,doublebounce,spf,localtime +PATCH_SITES+= ${MASTER_SITE_LOCAL:S/$/:dns,sendmail_flagf,rfc2821,ldap,mysql,smtp_auth_tls,tls,quota,blockexec,doublebounce,spf,localtime,qmtpc_outgoingip/} +PATCH_SITE_SUBDIR+= garga/qmail/:dns,sendmail_flagf,rfc2821,ldap,mysql,smtp_auth_tls,tls,quota,blockexec,doublebounce,spf,localtime,qmtpc_outgoingip NO_PACKAGE= djb's packaging license does not allow non-standard \ qmail binary distributions @@ -346,11 +346,6 @@ PLIST_SUB+= EXTERNAL_TODO="@comment " .endif -.if (defined(WITH_OUTGOINGIP_PATCH) && !defined(BARRIER_OUTGOINGIP_PATCH)) &&\ - (defined(WITH_QMTPC_PATCH) && !defined(BARRIER_QMTPC_PATCH)) -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 @@ -405,10 +400,12 @@ PATCHFILES+= big-todo.103.patch .if defined(WITH_BIG_CONCURRENCY_PATCH) && !defined(BARRIER_BIG_CONCURRENCY_PATCH) PATCHFILES+= big-concurrency.patch .endif -.if defined(WITH_OUTGOINGIP_PATCH) && !defined(BARRIER_OUTGOINGIP_PATCH) +.if defined(WITH_OUTGOINGIP_PATCH) && !defined(BARRIER_OUTGOINGIP_PATCH) && \ + defined(WITH_QMTPC_PATCH) && !defined(BARRIER_QMTPC_PATCH) +PATCHFILES+= qmail-1.03-qmtpc_outgoingip.patch:qmtpc_outgoingip +.elif defined(WITH_OUTGOINGIP_PATCH) && !defined(BARRIER_OUTGOINGIP_PATCH) PATCHFILES+= outgoingip.patch -.endif -.if defined(WITH_QMTPC_PATCH) && !defined(BARRIER_QMTPC_PATCH) +.elif defined(WITH_QMTPC_PATCH) && !defined(BARRIER_QMTPC_PATCH) PATCHFILES+= qmail-1.03-qmtpc.patch .endif diff --git a/mail/qmail/distinfo b/mail/qmail/distinfo index 9a7b481625dd..498504a4b1e6 100644 --- a/mail/qmail/distinfo +++ b/mail/qmail/distinfo @@ -40,3 +40,5 @@ MD5 (qmail/qmail-spf-rc5.patch) = 434bd84b87e2027cfa643673c498bd6f SIZE (qmail/qmail-spf-rc5.patch) = 63582 MD5 (qmail/qmail-1.03-maxrcpt.freebsd_qmail-smtp+tls_port.patch) = 0b4fc2811bf1b358d6229c8ada08a8cf SIZE (qmail/qmail-1.03-maxrcpt.freebsd_qmail-smtp+tls_port.patch) = 1771 +MD5 (qmail/qmail-1.03-qmtpc_outgoingip.patch) = 4b2623cbd9e9a4f137f7b16f78a43975 +SIZE (qmail/qmail-1.03-qmtpc_outgoingip.patch) = 10357 |