diff options
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/qmail/Makefile | 71 | ||||
| -rw-r--r-- | mail/qmail/distinfo | 3 | ||||
| -rw-r--r-- | mail/qmail/pkg-plist | 1 |
3 files changed, 14 insertions, 61 deletions
diff --git a/mail/qmail/Makefile b/mail/qmail/Makefile index 08c892460da7..a5a6171e442a 100644 --- a/mail/qmail/Makefile +++ b/mail/qmail/Makefile @@ -21,36 +21,12 @@ DIST_SUBDIR= qmail CONFLICTS= qmail-vida-[0-9]* -.if defined(SLAVE_LDAP) -BARRIER_BIG_CONCURRENCY_PATCH= yes -BARRIER_DNS_PATCH= yes -.endif - -.if defined(SLAVE_LDAP) || \ - defined(SLAVE_SPAMCONTROL) -BARRIER_QMTPC_PATCH= yes -BARRIER_DISCBOUNCES_PATCH= yes -BARRIER_SENDMAIL_F_PATCH= yes -BARRIER_BIG_TODO_PATCH= yes -.endif - .if defined(SLAVE_LDAP) || \ defined(SLAVE_MYSQL) BARRIER_MAILDIRQUOTA_PATCH= yes .endif .if defined(SLAVE_LDAP) || \ - defined(SLAVE_TLS) || \ - ( \ - !defined(SLAVE_LDAP) && \ - !defined(SLAVE_MYSQL) && \ - !defined(SLAVE_SPAMCONTROL) && \ - !defined(SLAVE_TLS) \ - ) -BARRIER_DK_PATCH= yes -.endif - -.if defined(SLAVE_LDAP) || \ defined(SLAVE_SPAMCONTROL) || \ defined(SLAVE_MYSQL) BARRIER_BLOCKEXEC_PATCH= yes @@ -59,6 +35,19 @@ BARRIER_SMTP_AUTH_PATCH= yes BARRIER_SPF_PATCH= yes .endif +.if defined(SLAVE_LDAP) +BARRIER_BIG_CONCURRENCY_PATCH= yes +BARRIER_DNS_PATCH= yes +.endif + +.if defined(SLAVE_LDAP) || \ + defined(SLAVE_SPAMCONTROL) +BARRIER_QMTPC_PATCH= yes +BARRIER_DISCBOUNCES_PATCH= yes +BARRIER_SENDMAIL_F_PATCH= yes +BARRIER_BIG_TODO_PATCH= yes +.endif + .if defined(SLAVE_LDAP) || \ defined(SLAVE_SPAMCONTROL) || \ defined(SLAVE_TLS) @@ -151,9 +140,6 @@ OPTIONS+= SPF_PATCH "Implement SPF checker" off .if !defined(BARRIER_TARPIT_PATCH) OPTIONS+= TARPIT_PATCH "Implement TARPIT functions" off .endif -.if !defined(BARRIER_DK_PATCH) -OPTIONS+= DK_PATCH "Implement DomainKeys" off -.endif .if defined(SLAVE_TLS) OPTIONS+= TLS_DEBUG "enable additional debug information" off .elif defined(SLAVE_LDAP) @@ -306,16 +292,6 @@ NO_MTREE= yes .include <bsd.port.pre.mk> -.if defined(WITH_DK_PATCH) && !defined(BARRIER_DK_PATCH) -ALL_TARGET+= qmail-dk.8 -MAN8+= qmail-dk.8 -CFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib -PLIST_SUB+= DK="" -.else -PLIST_SUB+= DK="@comment " -.endif - .if defined(SLAVE_TLS) CFLAGS+= -I${OPENSSLBASE}/include -L${OPENSSLBASE}/lib -DTLS . if defined(WITH_TLS_DEBUG) @@ -389,17 +365,10 @@ PATCHFILES+= qmail-spf-rc5.patch:spf ||(defined(WITH_BIG_TODO_PATCH) && !defined(BARRIER_BIG_TODO_PATCH)) \ ||(defined(WITH_BIG_CONCURRENCY_PATCH)&& !defined(BARRIER_BIG_CONCURRENCY_PATCH)) \ ||(defined(WITH_OUTGOINGIP_PATCH) && !defined(BARRIER_OUTGOINGIP_PATCH)) \ - ||(defined(WITH_QMTPC_PATCH) && !defined(BARRIER_QMTPC_PATCH)) \ - ||(defined(WITH_DK_PATCH) && !defined(BARRIER_DK_PATCH)) + ||(defined(WITH_QMTPC_PATCH) && !defined(BARRIER_QMTPC_PATCH)) PATCH_SITES+= ${MASTER_SITE_QMAIL} .endif -.if !defined(SLAVE_LDAP) && !defined(SLAVE_MYSQL) && !defined(SLAVE_SPAMCONTROL) && \ - (!defined(WITH_QMAILQUEUE_PATCH) || defined(BARRIER_QMAILQUEUE_PATCH)) && \ - (defined(WITH_DK_PATCH) && !defined(BARRIER_DK_PATCH)) -BROKEN= DomainKeys patch depends QMAILQUEUE -.endif - .if defined(WITH_QMAILQUEUE_PATCH) && !defined(BARRIER_QMAILQUEUE_PATCH) PATCHFILES+= qmailqueue-patch .endif @@ -417,10 +386,6 @@ PATCHFILES+= outgoingip.patch .elif defined(WITH_QMTPC_PATCH) && !defined(BARRIER_QMTPC_PATCH) PATCHFILES+= qmail-1.03-qmtpc.patch .endif -.if defined(WITH_DK_PATCH) && !defined(BARRIER_DK_PATCH) -PATCHFILES+= qmail-1.03-dk-0.54.patch -LIB_DEPENDS+= domainkeys.3:${PORTSDIR}/mail/libdomainkeys -.endif .if defined(WITH_LOCALTIME_PATCH) && !defined(BARRIER_LOCALTIME_PATCH) PATCH_SITES+= http://www.alib.jp/files/:localtime @@ -509,14 +474,6 @@ post-extract: .endif post-patch: -.if defined(WITH_DK_PATCH) - @${REINPLACE_CMD} -e 's,"../domainkeys.h",<domainkeys.h>,' \ - ${WRKSRC}/qmail-dk.c - @${REINPLACE_CMD} -e 's,../libdomainkeys.a,${LOCALBASE}/lib/libdomainkeys.a,g' \ - ${WRKSRC}/Makefile - @${REINPLACE_CMD} -E 's|( *c\(auto.*")qmail-smtpd(".*)$$|\1qmail-smtpd\2\1qmail-dk\2|' \ - ${WRKSRC}/hier.c -.endif .if defined(WITH_SMTP_AUTH_PATCH) @${CP} ${SMTP_AUTH_DIR}/base64.[ch] ${WRKSRC} . if defined(SLAVE_TLS) diff --git a/mail/qmail/distinfo b/mail/qmail/distinfo index 76226901b46e..4b57308c24ee 100644 --- a/mail/qmail/distinfo +++ b/mail/qmail/distinfo @@ -70,6 +70,3 @@ 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/qmail-1.03-dk-0.54.patch) = fe44c716d367a79f0fb0642a11520655 -SHA256 (qmail/qmail-1.03-dk-0.54.patch) = d87699535241f9c9b9ea248b7fe4b496e7dc084ce337d50fbc649209bbc93700 -SIZE (qmail/qmail-1.03-dk-0.54.patch) = 14058 diff --git a/mail/qmail/pkg-plist b/mail/qmail/pkg-plist index 3b7fa833cc6a..bd82b52d1593 100644 --- a/mail/qmail/pkg-plist +++ b/mail/qmail/pkg-plist @@ -27,7 +27,6 @@ bin/qbiff %%SPAMCONTROL%%bin/qmail-badmimetypes %%LDAP%%bin/qmail-cdb bin/qmail-clean -%%DK%%bin/qmail-dk %%LDAP%%bin/qmail-forward bin/qmail-getpw %%LDAP%%bin/qmail-group |