From owner-svn-src-head@FreeBSD.ORG  Fri Oct  8 17:42:10 2010
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 326CA1065698;
	Fri,  8 Oct 2010 17:42:10 +0000 (UTC)
	(envelope-from markm@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 242888FC1A;
	Fri,  8 Oct 2010 17:42:10 +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 o98HgAhv001606;
	Fri, 8 Oct 2010 17:42:10 GMT (envelope-from markm@svn.freebsd.org)
Received: (from markm@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o98HgAbO001604;
	Fri, 8 Oct 2010 17:42:10 GMT (envelope-from markm@svn.freebsd.org)
Message-Id: <201010081742.o98HgAbO001604@svn.freebsd.org>
From: Mark Murray <markm@FreeBSD.org>
Date: Fri, 8 Oct 2010 17:42:10 +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: r213585 - head/tools/build/mk
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 08 Oct 2010 17:42:10 -0000

Author: markm
Date: Fri Oct  8 17:42:09 2010
New Revision: 213585
URL: http://svn.freebsd.org/changeset/base/213585

Log:
  Don't blow away /bin/rmail symlink if we are keeping mailwrapper.
  Mailwrapper can provide a perfectly good rmail with other
  mailers.

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

Modified: head/tools/build/mk/OptionalObsoleteFiles.inc
==============================================================================
--- head/tools/build/mk/OptionalObsoleteFiles.inc	Fri Oct  8 16:33:25 2010	(r213584)
+++ head/tools/build/mk/OptionalObsoleteFiles.inc	Fri Oct  8 17:42:09 2010	(r213585)
@@ -2003,7 +2003,9 @@ OLD_FILES+=etc/periodic/daily/210.backup
 OLD_FILES+=etc/periodic/daily/440.status-mailq
 OLD_FILES+=etc/periodic/daily/460.status-mail-rejects
 OLD_FILES+=etc/periodic/daily/500.queuerun
+.if ${MK_MAILWRAPPER} == no
 OLD_FILES+=bin/rmail
+.endif
 OLD_FILES+=usr/bin/vacation
 OLD_FILES+=usr/include/libmilter/mfapi.h
 OLD_FILES+=usr/include/libmilter/mfdef.h