From owner-freebsd-stable@FreeBSD.ORG  Fri Aug 24 17:38:21 2012
Return-Path: <owner-freebsd-stable@FreeBSD.ORG>
Delivered-To: freebsd-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 02B1E1065686
	for <freebsd-stable@freebsd.org>; Fri, 24 Aug 2012 17:38:21 +0000 (UTC)
	(envelope-from jhb@freebsd.org)
Received: from bigwig.baldwin.cx (bigknife-pt.tunnel.tserv9.chi1.ipv6.he.net
	[IPv6:2001:470:1f10:75::2])
	by mx1.freebsd.org (Postfix) with ESMTP id CD3F58FC0A
	for <freebsd-stable@freebsd.org>; Fri, 24 Aug 2012 17:38:20 +0000 (UTC)
Received: from jhbbsd.localnet (unknown [209.249.190.124])
	by bigwig.baldwin.cx (Postfix) with ESMTPSA id 43C8DB941;
	Fri, 24 Aug 2012 13:38:20 -0400 (EDT)
From: John Baldwin <jhb@freebsd.org>
To: freebsd-stable@freebsd.org
Date: Fri, 24 Aug 2012 13:37:28 -0400
User-Agent: KMail/1.13.5 (FreeBSD/8.2-CBSD-20110714-p17; KDE/4.5.5; amd64; ; )
References: <OJEBKOFDEOADELCOBJCGEEIMEOAA.David.Boyd@insightbb.com>
In-Reply-To: <OJEBKOFDEOADELCOBJCGEEIMEOAA.David.Boyd@insightbb.com>
MIME-Version: 1.0
Content-Type: Text/Plain;
  charset="iso-8859-1"
Content-Transfer-Encoding: 7bit
Message-Id: <201208241337.28419.jhb@freebsd.org>
X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.2.7
	(bigwig.baldwin.cx); Fri, 24 Aug 2012 13:38:20 -0400 (EDT)
Cc: David Boyd <David.Boyd@insightbb.com>
Subject: Re: 9.1-RC1 make buildworld with WITHOUT_LPR NO_LPR not cleaning up
	properly
X-BeenThere: freebsd-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Production branch of FreeBSD source code <freebsd-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-stable>, 
	<mailto:freebsd-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-stable>
List-Post: <mailto:freebsd-stable@freebsd.org>
List-Help: <mailto:freebsd-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-stable>,
	<mailto:freebsd-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 24 Aug 2012 17:38:21 -0000

On Friday, August 24, 2012 12:47:45 pm David Boyd wrote:
> /etc/make.conf contains NO_LPR=YES
> 
> /etc/src.conf contains WITHOUT_LPR=YES
> 
> make buildworld consistently (9.0 through 9.1-RC1) leaves 
> 
> /usr/share/doc/smm/07.lpd/paper.ascii.gz
> 
> which is then deleted by make delete-old.
> 
> This behaviour was not apparent in 8.x.
> 
> I have systems available to test a fix.

Try this:

Index: share/doc/smm/Makefile
===================================================================
--- Makefile	(revision 239655)
+++ Makefile	(working copy)
@@ -18,7 +18,7 @@ SUBDIR=	title \
 	04.quotas \
 	05.fastfs \
 	06.nfs \
-	07.lpd \
+	${_07.lpd} \
 	${_08.sendmailop} \
 	11.timedop \
 	12.timed \
@@ -28,4 +28,8 @@ SUBDIR=	title \
 _08.sendmailop=	08.sendmailop 
 .endif
 
+.if ${MK_LPR} != "no"
+_07.lpd=	07.lpd
+.endif
+
 .include <bsd.subdir.mk>

-- 
John Baldwin