svn commit: r492709 - head/mail/qmail

[Steve Wills]

Author: swills
Date: Mon Feb 11 18:36:20 2019
New Revision: 492709
URL: https://svnweb.freebsd.org/changeset/ports/492709

Log:
  mail/qmail: fix include
  
  PR:		235656
  Submitted by:	erdgeist at erdgeist.org (maintainer)

Modified:
  head/mail/qmail/Makefile   (contents, props changed)

Modified: head/mail/qmail/Makefile
==============================================================================
--- head/mail/qmail/Makefile	Mon Feb 11 18:33:35 2019	(r492708)
+++ head/mail/qmail/Makefile	Mon Feb 11 18:36:20 2019	(r492709)
@@ -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,10 +168,7 @@ PATCHFILES+=	netqmail-mysql-${MYSQL_PATCH_VERSION}.pat
 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
 PATCH_SITES+=	http://mirror.shatow.net/freebsd/qmail/:DEFAULT,dns,sendmail_flagf,rfc2821,ldap,mysql,tls,quota,blockexec,doublebounce,spf,spf_tls,localtime,qmtpc_outgoingip
@@ -386,6 +381,12 @@ TLS_USES=		ssl
 # Port will control all PREFIX handling.
 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)