svn commit: r311739 - head/mail/qmail

[Bryan Drewery]

Author: bdrewery
Date: Tue Feb  5 23:26:48 2013
New Revision: 311739
URL: http://svnweb.freebsd.org/changeset/ports/311739

Log:
  - Remove indefinite article from COMMENT
  - Avoid directly including bsd.openssl.mk by including
    bsd.port.options.mk and using proper USE_OPENSSL

Modified:
  head/mail/qmail/Makefile

Modified: head/mail/qmail/Makefile
==============================================================================
--- head/mail/qmail/Makefile	Tue Feb  5 23:09:03 2013	(r311738)
+++ head/mail/qmail/Makefile	Tue Feb  5 23:26:48 2013	(r311739)
@@ -11,7 +11,7 @@ DISTFILES?=	${DISTNAME}${EXTRACT_SUFX}
 EXTRACT_ONLY?=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER?=	bdrewery at FreeBSD.org
-COMMENT?=	A secure, reliable, efficient, simple, and fast MTA
+COMMENT?=	Secure, reliable, efficient, simple, and fast MTA
 
 DIST_SUBDIR=	qmail
 
@@ -334,6 +334,12 @@ CONFIGURESCRIPTS=	config config-fast
 
 WANT_QMAIL=	yes
 
+.include <bsd.port.options.mk>
+
+.if defined(SLAVE_LDAP) && ${PORT_OPTIONS:MTLS}
+USE_OPENSSL=	yes
+.endif
+
 .include <bsd.port.pre.mk>
 
 .if ${PREFIX} != ${LOCALBASE}
@@ -359,11 +365,6 @@ CFLAGS+=	-DDEBUG
 
 .if defined(SLAVE_LDAP)
 
-. if ${PORT_OPTIONS:MTLS}
-# we can't use USE_OPENSSL=yes after including bsd.port.pre.mk
-.include "${PORTSDIR}/Mk/bsd.openssl.mk"
-. endif
-
 . for param in ${LDAP_PARAMS}
 .  if ${PORT_OPTIONS:M${param}}
 LDAPFLAGS+=	-D${param}