From owner-svn-ports-head@FreeBSD.ORG  Tue Feb  5 23:26:49 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 1A826B40;
 Tue,  5 Feb 2013 23:26:49 +0000 (UTC)
 (envelope-from bdrewery@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 08376EBD;
 Tue,  5 Feb 2013 23:26:49 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r15NQmEN079945;
 Tue, 5 Feb 2013 23:26:48 GMT (envelope-from bdrewery@svn.freebsd.org)
Received: (from bdrewery@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r15NQmOS079944;
 Tue, 5 Feb 2013 23:26:48 GMT (envelope-from bdrewery@svn.freebsd.org)
Message-Id: <201302052326.r15NQmOS079944@svn.freebsd.org>
From: Bryan Drewery <bdrewery@FreeBSD.org>
Date: Tue, 5 Feb 2013 23:26:48 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r311739 - head/mail/qmail
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 05 Feb 2013 23:26:49 -0000

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@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}