From owner-svn-src-all@FreeBSD.ORG  Wed Feb 10 00:01:35 2010
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id B89D410656C2;
	Wed, 10 Feb 2010 00:01:35 +0000 (UTC)
	(envelope-from delphij@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id A7B078FC1F;
	Wed, 10 Feb 2010 00:01:35 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o1A01ZWM021008;
	Wed, 10 Feb 2010 00:01:35 GMT (envelope-from delphij@svn.freebsd.org)
Received: (from delphij@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o1A01Z7P021006;
	Wed, 10 Feb 2010 00:01:35 GMT (envelope-from delphij@svn.freebsd.org)
Message-Id: <201002100001.o1A01Z7P021006@svn.freebsd.org>
From: Xin LI <delphij@FreeBSD.org>
Date: Wed, 10 Feb 2010 00:01:35 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r203733 - head/tools/build/mk
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 10 Feb 2010 00:01:35 -0000

Author: delphij
Date: Wed Feb 10 00:01:35 2010
New Revision: 203733
URL: http://svn.freebsd.org/changeset/base/203733

Log:
  Symbolic link to mailwrapper should only be removed if both MK_MAILWRAPPER
  and MK_SENDMAIL is "no".
  
  Reported by:	Rob Farmer <rfarmer at predatorlabs.net>

Modified:
  head/tools/build/mk/OptionalObsoleteFiles.inc

Modified: head/tools/build/mk/OptionalObsoleteFiles.inc
==============================================================================
--- head/tools/build/mk/OptionalObsoleteFiles.inc	Tue Feb  9 23:45:14 2010	(r203732)
+++ head/tools/build/mk/OptionalObsoleteFiles.inc	Wed Feb 10 00:01:35 2010	(r203733)
@@ -1559,7 +1559,9 @@ OLD_FILES+=usr/share/misc/mail.tildehelp
 
 .if ${MK_MAILWRAPPER} == no
 OLD_FILES+=etc/mail/mailer.conf
+.if ${MK_SENDMAIL} == no
 OLD_FILES+=usr/sbin/mailwrapper
+.endif
 OLD_FILES+=usr/share/man/man8/mailwrapper.8.gz
 .endif