From nobody@FreeBSD.org  Sat Jul 30 09:43:54 2011
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 2FB8A1065675
	for <freebsd-gnats-submit@FreeBSD.org>; Sat, 30 Jul 2011 09:43:54 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22])
	by mx1.freebsd.org (Postfix) with ESMTP id 2062B8FC14
	for <freebsd-gnats-submit@FreeBSD.org>; Sat, 30 Jul 2011 09:43:54 +0000 (UTC)
Received: from red.freebsd.org (localhost [127.0.0.1])
	by red.freebsd.org (8.14.4/8.14.4) with ESMTP id p6U9hrlk046025
	for <freebsd-gnats-submit@FreeBSD.org>; Sat, 30 Jul 2011 09:43:53 GMT
	(envelope-from nobody@red.freebsd.org)
Received: (from nobody@localhost)
	by red.freebsd.org (8.14.4/8.14.4/Submit) id p6U9hrb7046019;
	Sat, 30 Jul 2011 09:43:53 GMT
	(envelope-from nobody)
Message-Id: <201107300943.p6U9hrb7046019@red.freebsd.org>
Date: Sat, 30 Jul 2011 09:43:53 GMT
From: Thomas Eberhardt <sneakywumpus@googlemail.com>
To: freebsd-gnats-submit@FreeBSD.org
Subject: lpd smm chapter unconditionally installed
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         159307
>Category:       docs
>Synopsis:       [patch] lpd smm chapter unconditionally installed
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-doc
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          doc-bug
>Submitter-Id:   current-users
>Arrival-Date:   Sat Jul 30 09:50:07 UTC 2011
>Closed-Date:    
>Last-Modified:  Sat Jul 30 12:04:49 UTC 2011
>Originator:     Thomas Eberhardt
>Release:        9.0-BETA1
>Organization:
>Environment:
FreeBSD clarence.lan 9.0-BETA1 FreeBSD 9.0-BETA1 #0 r224506M: Sat Jul 30 10:51:18 CEST 2011     thomas@clarence.lan:/usr/obj/usr/src/sys/CLARENCE  amd64
>Description:
/usr/share/doc/smm/07.lpd/paper.ascii.gz is built and installed even when WITHOUT_LPR is set
in /etc/src.conf. The file is included in tools/build/mk/OptionalObsoleteFiles.inc.

>How-To-Repeat:
 WITHOUT_LPR=YES in /etc/src.conf
 
 make buildworld
 ..
 make installworld
 ..
 make delete-old

 >>> Removing old files (only deletes safe to delete libs)
 remove /usr/share/doc/smm/07.lpd/paper.ascii.gz?
 
>Fix:


Patch attached with submission follows:

Index: share/doc/smm/Makefile
===================================================================
--- share/doc/smm/Makefile	(revision 224506)
+++ share/doc/smm/Makefile	(working copy)
@@ -18,12 +18,16 @@
 	04.quotas \
 	05.fastfs \
 	06.nfs \
-	07.lpd \
+	${_07.lpd} \
 	${_08.sendmailop} \
 	11.timedop \
 	12.timed \
 	18.net
 
+.if ${MK_LPR} != "no"
+_07.lpd=	07.lpd 
+.endif
+
 .if ${MK_SENDMAIL} != "no"
 _08.sendmailop=	08.sendmailop 
 .endif


>Release-Note:
>Audit-Trail:
>Unformatted:
