aboutsummaryrefslogtreecommitdiff
path: root/mail/qmail
diff options
context:
space:
mode:
authorSteve Wills <swills@FreeBSD.org>2019-02-11 18:36:20 +0000
committerSteve Wills <swills@FreeBSD.org>2019-02-11 18:36:20 +0000
commit8821fa5d828278e357acb5139c803e0e7f0166c7 (patch)
treeaf9bce4fd4dc073e29113cb4630f6fc4835dae75 /mail/qmail
parent5f463f13ddd0120662954d07c3d3f883d9b5f3a2 (diff)
downloadports-8821fa5d828278e357acb5139c803e0e7f0166c7.tar.gz
ports-8821fa5d828278e357acb5139c803e0e7f0166c7.zip
mail/qmail: fix include
PR: 235656 Submitted by: erdgeist@erdgeist.org (maintainer)
Notes
Notes: svn path=/head/; revision=492709
Diffstat (limited to 'mail/qmail')
-rw-r--r--mail/qmail/Makefile13
1 files changed, 7 insertions, 6 deletions
diff --git a/mail/qmail/Makefile b/mail/qmail/Makefile
index 2ddf31d208f7..8d3bcce3c2e6 100644
--- a/mail/qmail/Makefile
+++ b/mail/qmail/Makefile
@@ -3,7 +3,7 @@
PORTNAME= ${QMAIL_PORTNAME}
PORTVERSION?= ${QMAIL_VERSION}
-PORTREVISION?= 3
+PORTREVISION?= 4
CATEGORIES= mail
MASTER_SITES+= QMAIL
DISTNAME= ${PORTNAME}-${QMAIL_VERSION}
@@ -134,8 +134,6 @@ BARRIER_DNS_CNAME= yes
PATCH_DIST_STRIP+= -p1
-.include <bsd.port.options.mk>
-
.if !defined(BARRIER_DNS_PATCH)
# Patch necessary to cope with non-RFC >512 dns entries
# Since AOL has been using those, the problem has skyrocketed from minor to
@@ -170,9 +168,6 @@ PATCHFILES+= netqmail-mysql-${MYSQL_PATCH_VERSION}.patch:mysql
PATCH_SITES+= http://inoa.net/qmail-tls/:tls
TLS_PATCH_NAME= ${QMAIL_PORTNAME}-${QMAIL_VERSION}-tls-${TLS_PATCH_DATE}.patch
PATCHFILES+= ${TLS_PATCH_NAME}:tls
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1200000
-EXTRA_PATCHES+= ${FILESDIR}/netqmail-1.06-tls-20160918-freebsd-12.patch
-.endif
.endif
PATCH_SITES+= LOCAL/bdrewery/qmail/:dns,sendmail_flagf,rfc2821,ldap,mysql,tls,quota,blockexec,doublebounce,spf,spf_tls,localtime,qmtpc_outgoingip
@@ -387,6 +382,12 @@ TLS_USES= ssl
NO_MTREE= yes
NO_PREFIX_RMDIR=yes
+.include <bsd.port.options.mk>
+
+.if defined(SLAVE_TLS) && ${OPSYS} == FreeBSD && ${OSVERSION} >= 1200000
+EXTRA_PATCHES+= ${FILESDIR}/netqmail-1.06-tls-20160918-freebsd-12.patch
+.endif
+
.if ${ARCH} == "amd64" && !defined(SLAVE_LDAP) \
&& !defined(SLAVE_SPAMCONTROL)
EXTRA_PATCHES+= ${FILESDIR}/extra-patch-amd64