From owner-svn-ports-all@FreeBSD.ORG  Mon Aug  4 09:49:46 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 698D9193
 for <svn-ports-all@freebsd.org>; Mon,  4 Aug 2014 09:49:46 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 400622F6F
 for <svn-ports-all@freebsd.org>; Mon,  4 Aug 2014 09:49:46 +0000 (UTC)
Received: from pi (uid 1338) (envelope-from pi@FreeBSD.org) id 5412
 by svn.freebsd.org (DragonFly Mail Agent v0.9+);
 Mon, 04 Aug 2014 09:49:46 +0000
From: Kurt Jaeger <pi@FreeBSD.org>
Date: Mon, 4 Aug 2014 09:49:46 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r363985 - head/mail/heirloom-mailx
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Message-Id: <53df573a.5412.189f342a@svn.freebsd.org>
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 04 Aug 2014 09:49:46 -0000

Author: pi
Date: Mon Aug  4 09:49:45 2014
New Revision: 363985
URL: http://svnweb.freebsd.org/changeset/ports/363985
QAT: https://qat.redports.org/buildarchive/r363985/

Log:
  mail/heirloom-mailx: add option to use sendmail from ports, and take ownership
  
  PR:		190134
  Submitted by:	Jamie Landeg-Jones <jamie@dyslexicfish.net>

Modified:
  head/mail/heirloom-mailx/Makefile

Modified: head/mail/heirloom-mailx/Makefile
==============================================================================
--- head/mail/heirloom-mailx/Makefile	Mon Aug  4 09:43:03 2014	(r363984)
+++ head/mail/heirloom-mailx/Makefile	Mon Aug  4 09:49:45 2014	(r363985)
@@ -3,15 +3,16 @@
 
 PORTNAME=	mailx
 PORTVERSION=	12.4
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	mail ipv6
 MASTER_SITES=	SF/heirloom/heirloom-${PORTNAME}/${PORTVERSION}
 PKGNAMEPREFIX=	heirloom-
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	jamie@dyslexicfish.net
 COMMENT=	BSD mail utility with MIME, IMAP, POP3, SMTP, and S/MIME extensions
 
-OPTIONS_DEFINE=	IPV6 DOCS
+OPTIONS_DEFINE=		IPV6 DOCS SENDMAIL_PORT
+SENDMAIL_PORT_DESC=	Use sendmail from ports instead of base
 
 CONFLICTS=	mailx-[0-9]*
 
@@ -20,7 +21,6 @@ USES=		iconv tar:bzip2
 USE_OPENSSL=	yes
 MAKE_ARGS=	PREFIX="${PREFIX}" \
 		SYSCONFDIR="${PREFIX}/etc" \
-		SENDMAIL="/usr/sbin/sendmail" \
 		CPPFLAGS="${CPPFLAGS}" \
 		LDFLAGS="${LDFLAGS}"
 
@@ -35,6 +35,13 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 MAKE_ARGS+=	IPv6="-DHAVE_IPv6_FUNCS"
 .endif
 
+.if ${PORT_OPTIONS:MSENDMAIL_PORT}
+MAKE_ARGS+=	SENDMAIL="${LOCALBASE}/sbin/sendmail"
+RUN_DEPENDS=	${LOCALBASE}/sbin/sendmail:${PORTSDIR}/mail/sendmail
+.else
+MAKE_ARGS+=	SENDMAIL="/usr/sbin/sendmail"
+.endif
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${MAN1PREFIX}/man/man1