From owner-svn-src-all@FreeBSD.ORG  Thu Jan 14 23:27:23 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 9020E106568B;
	Thu, 14 Jan 2010 23:27:23 +0000 (UTC)
	(envelope-from jilles@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 7F6308FC19;
	Thu, 14 Jan 2010 23:27:23 +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 o0ENRNrB078615;
	Thu, 14 Jan 2010 23:27:23 GMT (envelope-from jilles@svn.freebsd.org)
Received: (from jilles@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o0ENRNF8078613;
	Thu, 14 Jan 2010 23:27:23 GMT (envelope-from jilles@svn.freebsd.org)
Message-Id: <201001142327.o0ENRNF8078613@svn.freebsd.org>
From: Jilles Tjoelker <jilles@FreeBSD.org>
Date: Thu, 14 Jan 2010 23:27:23 +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: r202324 - head
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: Thu, 14 Jan 2010 23:27:23 -0000

Author: jilles
Date: Thu Jan 14 23:27:23 2010
New Revision: 202324
URL: http://svn.freebsd.org/changeset/base/202324

Log:
  In 'make delete-old', use 'exec' to redirect an fd persistently.
  
  That is, write 'exec 3<&0' instead of '3<&0'. Due to an sh(1) bug fixed in
  r199953, the latter also persisted, provided that fd 3 was not open before.
  With newer sh or fd 3 open, it would not delete orphaned catpages.
  
  MFC after:	2 weeks

Modified:
  head/Makefile.inc1

Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1	Thu Jan 14 22:37:06 2010	(r202323)
+++ head/Makefile.inc1	Thu Jan 14 23:27:23 2010	(r202324)
@@ -1266,7 +1266,7 @@ delete-old-files:
 		fi; \
 	done
 # Remove catpages without corresponding manpages.
-	@3<&0; \
+	@exec 3<&0; \
 	find ${DESTDIR}/usr/share/man/cat* ! -type d | \
 	sed -ep -e's:${DESTDIR}/usr/share/man/cat:${DESTDIR}/usr/share/man/man:' | \
 	while read catpage; do \