From nobody@FreeBSD.org  Tue Mar 30 16:01:52 2010
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 B8043106566C
	for <freebsd-gnats-submit@FreeBSD.org>; Tue, 30 Mar 2010 16:01:52 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21])
	by mx1.freebsd.org (Postfix) with ESMTP id A69E18FC08
	for <freebsd-gnats-submit@FreeBSD.org>; Tue, 30 Mar 2010 16:01:52 +0000 (UTC)
Received: from www.freebsd.org (localhost [127.0.0.1])
	by www.freebsd.org (8.14.3/8.14.3) with ESMTP id o2UG1qOS038437
	for <freebsd-gnats-submit@FreeBSD.org>; Tue, 30 Mar 2010 16:01:52 GMT
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.14.3/8.14.3/Submit) id o2UG1qdq038436;
	Tue, 30 Mar 2010 16:01:52 GMT
	(envelope-from nobody)
Message-Id: <201003301601.o2UG1qdq038436@www.freebsd.org>
Date: Tue, 30 Mar 2010 16:01:52 GMT
From: Alexander Sack <asack@niksun.com>
To: freebsd-gnats-submit@FreeBSD.org
Subject: Feature Request: Be able to build FreeBSD with man utilities but not with man pages
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         145212
>Category:       misc
>Synopsis:       [build] Feature Request: Be able to build FreeBSD with man utilities but not with man pages
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    jkim
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Tue Mar 30 16:10:08 UTC 2010
>Closed-Date:    Tue Jun 01 19:42:42 UTC 2010
>Last-Modified:  Tue Jun 01 19:42:42 UTC 2010
>Originator:     Alexander Sack
>Release:        7.2-amd64, CURRENT
>Organization:
Niksun
>Environment:
>Description:
Currently the WITHOUT_MAN option to the FreeBSD world build will stub out BOTH man binaries (gnu/usr.bin/man ad manpath, usr.bin/catman, etc.) as well as creation of the man pages.

I would like to build able to build FreeBSD with the man utilities but not the man pages since we want to conserve space BUT be able to read third-party or custom application generated man pages.

I propose a MK_MAN_UTILS option that allows the following:

WITHOUT_MAN=1 WITH_MAN_UTILS=1 make buildworld

Will build the entire world sans man pages but with binaries

WITHOUT_MAN=1 make buildworld

Will build the entire world without man pages OR man binaries (existing behavior)

WITHOUT_MAN_UTILS=1 make buildworld

Will build the entire world without man pages or man binaries (if you have no  binaries how are you going to read man pages!) - in other words:

WITH_MAN=1 && WITHOUT_MAN_UTILS=1 is illegal

Patches attached against CURRENT.

New file should also be included as well (I forgot it):

$ cat tools/build/options/WITHOUT_MAN_UTILS 
.\" $FreeBSD$
Set to not build any man related utilities such as man, manpath, and catman.

>How-To-Repeat:
Build FreeBSD using src.conf option WITHOUT_MAN=1 and no man utilities will be included in your runtime.
>Fix:


Patch attached with submission follows:

Index: etc/Makefile
===================================================================
RCS file: /home/ncvs/src/etc/Makefile,v
retrieving revision 1.381
diff -u -r1.381 Makefile
--- etc/Makefile	19 Mar 2010 15:53:02 -0000	1.381
+++ etc/Makefile	30 Mar 2010 14:38:03 -0000
@@ -64,7 +64,7 @@
 BIN1+=	${.CURDIR}/../usr.bin/mail/misc/mail.rc
 .endif
 
-.if ${MK_MAN} != "no"
+.if ${MK_MAN_UTILS} != "no"
 BIN1+=	${.CURDIR}/../gnu/usr.bin/man/manpath/manpath.config
 .endif
 
Index: gnu/usr.bin/Makefile
===================================================================
RCS file: /home/ncvs/src/gnu/usr.bin/Makefile,v
retrieving revision 1.102
diff -u -r1.102 Makefile
--- gnu/usr.bin/Makefile	26 Mar 2010 17:02:32 -0000	1.102
+++ gnu/usr.bin/Makefile	30 Mar 2010 14:38:04 -0000
@@ -39,7 +39,7 @@
 _texinfo=	texinfo
 .endif
 
-.if ${MK_MAN} != "no"
+.if ${MK_MAN_UTILS} != "no"
 _man=		man
 .endif
 
Index: share/mk/bsd.own.mk
===================================================================
RCS file: /home/ncvs/src/share/mk/bsd.own.mk,v
retrieving revision 1.83
diff -u -r1.83 bsd.own.mk
--- share/mk/bsd.own.mk	26 Mar 2010 17:02:32 -0000	1.83
+++ share/mk/bsd.own.mk	30 Mar 2010 14:38:15 -0000
@@ -524,7 +524,8 @@
 # MK_* options whose default value depends on another option.
 #
 .for vv in \
-    GSSAPI/KERBEROS
+    GSSAPI/KERBEROS \
+    MAN_UTILS/MAN 
 .if defined(WITH_${vv:H}) && defined(WITHOUT_${vv:H})
 .error WITH_${vv:H} and WITHOUT_${vv:H} can't both be set.
 .endif
Index: usr.bin/Makefile
===================================================================
RCS file: /home/ncvs/src/usr.bin/Makefile,v
retrieving revision 1.332
diff -u -r1.332 Makefile
--- usr.bin/Makefile	19 Feb 2010 23:54:12 -0000	1.332
+++ usr.bin/Makefile	30 Mar 2010 14:38:29 -0000
@@ -253,7 +253,7 @@
 _atm=		atm
 .endif
 
-.if ${MK_MAN} != "no"
+.if ${MK_MAN_UTILS} != "no"
 _catman=	catman
 .endif
 


>Release-Note:
>Audit-Trail:

From: Garrett Cooper <yanefbsd@gmail.com>
To: Alexander Sack <asack@niksun.com>
Cc: freebsd-gnats-submit@freebsd.org
Subject: Re: misc/145212: Feature Request: Be able to build FreeBSD with man 
	utilities but not with man pages
Date: Tue, 30 Mar 2010 10:28:44 -0700

 On Tue, Mar 30, 2010 at 9:01 AM, Alexander Sack <asack@niksun.com> wrote:
 >
 >>Number: =A0 =A0 =A0 =A0 145212
 >>Category: =A0 =A0 =A0 misc
 >>Synopsis: =A0 =A0 =A0 Feature Request: Be able to build FreeBSD with man =
 utilities but not with man pages
 >>Confidential: =A0 no
 >>Severity: =A0 =A0 =A0 non-critical
 >>Priority: =A0 =A0 =A0 low
 >>Responsible: =A0 =A0freebsd-bugs
 >>State: =A0 =A0 =A0 =A0 =A0open
 >>Quarter:
 >>Keywords:
 >>Date-Required:
 >>Class: =A0 =A0 =A0 =A0 =A0sw-bug
 >>Submitter-Id: =A0 current-users
 >>Arrival-Date: =A0 Tue Mar 30 16:10:08 UTC 2010
 >>Closed-Date:
 >>Last-Modified:
 >>Originator: =A0 =A0 Alexander Sack
 >>Release: =A0 =A0 =A0 =A07.2-amd64, CURRENT
 >>Organization:
 > Niksun
 
     Looks like a worthy patch, but I think you forgot one item:
     If MK_MAN_UTILS =3D=3D "no", then MK_MAN should also be "no".
 Thanks :),
 -Garrett

From: Alexander Sack <asack@niksun.com>
To: bug-followup@FreeBSD.org, asack@niksun.com
Cc:  
Subject: Re: misc/145212: Feature Request: Be able to build FreeBSD with man
 utilities but not with man pages
Date: Tue, 30 Mar 2010 13:41:34 -0400

 I'd like to mention also that manctl is not tuned by any of the MK_* 
 knobs so with the advent of MK_MAN_UTILS perhaps something like this 
 should also be part of the patch:
 
 Index: usr.sbin/Makefile
 ===================================================================
 RCS file: /home/ncvs/src/usr.sbin/Makefile,v
 retrieving revision 1.421
 diff -u -r1.421 Makefile
 --- usr.sbin/Makefile    4 Mar 2010 20:31:49 -0000    1.421
 +++ usr.sbin/Makefile    30 Mar 2010 17:30:27 -0000
 @@ -91,7 +91,7 @@
       mailwrapper \
       makefs \
       ${_makemap} \
 -    manctl \
 +    ${_manctl} \
       memcontrol \
       mergemaster \
       mfiutil \
 @@ -322,6 +322,10 @@
   _lpr=        lpr
   .endif
 
 +.if ${MK_MAN_UTILS} != "no"
 +_manctl=    manctl
 +.endif
 +
   .if ${MK_NETGRAPH} != "no"
   _flowctl=    flowctl
   _lmcconfig=    lmcconfig
 
 Another thing my patch DOES NOT address is the mtree hierarchy which I 
 am indifferent about.  I believe as its set up, we should leave the 
 mtree stuff alone (just not populate any man pages in them).
 
 Thanks!
 
 -aps

From: Alexander Sack <asack@niksun.com>
To: Garrett Cooper <yanefbsd@gmail.com>
Cc: freebsd-gnats-submit@freebsd.org
Subject: Re: misc/145212: Feature Request: Be able to build FreeBSD with man
 	utilities but not with man pages
Date: Tue, 30 Mar 2010 13:44:30 -0400

 On 3/30/10 1:28 PM, Garrett Cooper wrote:
 > On Tue, Mar 30, 2010 at 9:01 AM, Alexander Sack<asack@niksun.com>  wrote:
 >    
 >>      
 >>> Number:         145212
 >>> Category:       misc
 >>> Synopsis:       Feature Request: Be able to build FreeBSD with man utilities but not with man pages
 >>> Confidential:   no
 >>> Severity:       non-critical
 >>> Priority:       low
 >>> Responsible:    freebsd-bugs
 >>> State:          open
 >>> Quarter:
 >>> Keywords:
 >>> Date-Required:
 >>> Class:          sw-bug
 >>> Submitter-Id:   current-users
 >>> Arrival-Date:   Tue Mar 30 16:10:08 UTC 2010
 >>> Closed-Date:
 >>> Last-Modified:
 >>> Originator:     Alexander Sack
 >>> Release:        7.2-amd64, CURRENT
 >>> Organization:
 >>>        
 >> Niksun
 >>      
 >      Looks like a worthy patch, but I think you forgot one item:
 >      If MK_MAN_UTILS == "no", then MK_MAN should also be "no".
 > Thanks :),
 > -Garrett
 >
 >    
 Ah damn did I do that....damn it...its a small fix for that.
 
 I got a follow up Garrett to add manctl in the mix as well.
 
 -aps

From: Alexander Sack <asack@niksun.com>
To: Garrett Cooper <yanefbsd@gmail.com>
Cc: freebsd-gnats-submit@freebsd.org
Subject: Re: misc/145212: Feature Request: Be able to build FreeBSD with man
 	utilities but not with man pages
Date: Tue, 30 Mar 2010 17:28:47 -0400

 This is a multi-part message in MIME format.
 --------------070808080401000004060505
 Content-Type: text/plain; charset=ISO-8859-1; format=flowed
 Content-Transfer-Encoding: 7bit
 
 On 3/30/10 1:28 PM, Garrett Cooper wrote:
 > On Tue, Mar 30, 2010 at 9:01 AM, Alexander Sack<asack@niksun.com>  wrote:
 >    
 >>      
 >>> Number:         145212
 >>> Category:       misc
 >>> Synopsis:       Feature Request: Be able to build FreeBSD with man utilities but not with man pages
 >>> Confidential:   no
 >>> Severity:       non-critical
 >>> Priority:       low
 >>> Responsible:    freebsd-bugs
 >>> State:          open
 >>> Quarter:
 >>> Keywords:
 >>> Date-Required:
 >>> Class:          sw-bug
 >>> Submitter-Id:   current-users
 >>> Arrival-Date:   Tue Mar 30 16:10:08 UTC 2010
 >>> Closed-Date:
 >>> Last-Modified:
 >>> Originator:     Alexander Sack
 >>> Release:        7.2-amd64, CURRENT
 >>> Organization:
 >>>        
 >> Niksun
 >>      
 >      Looks like a worthy patch, but I think you forgot one item:
 >      If MK_MAN_UTILS == "no", then MK_MAN should also be "no".
 > Thanks :),
 > -Garrett
 >
 >    
 Garrett in an effort to achieve POLA, how about the patch attached 
 (against CURRENT).  The idea is that:
 
 MK_MAN="no"
 
 No man pages
 No man utiltiies
 
 Same behavior as before.
 
 But, now by default, MK_MAN="yes", which then allows you to achieve the 
 build granularity with MK_MAN_PAGES and MK_MAN_UTILS with the caveat 
 that if MK_MAN_UTILS="no" than you don't get any man pages since you 
 don't have the necessary tools to read them.
 
 I didn't update a weekly Makefile since I am not sure what its used 
 for.  Otherwise, this above knobs allow complete control over the man 
 stuff.  I hope I caught all of them (I just grep'ed the tree for MK_MAN 
 and made the appropriate change).
 
 Thanks!
 
 -aps
 
 --------------070808080401000004060505
 Content-Type: text/plain;
  name="mk_man_utils.txt"
 Content-Transfer-Encoding: 7bit
 Content-Disposition: attachment;
  filename="mk_man_utils.txt"
 
 Index: etc/Makefile
 ===================================================================
 RCS file: /home/ncvs/src/etc/Makefile,v
 retrieving revision 1.381
 diff -u -r1.381 Makefile
 --- etc/Makefile	19 Mar 2010 15:53:02 -0000	1.381
 +++ etc/Makefile	30 Mar 2010 21:19:51 -0000
 @@ -64,7 +64,7 @@
  BIN1+=	${.CURDIR}/../usr.bin/mail/misc/mail.rc
  .endif
  
 -.if ${MK_MAN} != "no"
 +.if ${MK_MAN_UTILS} != "no"
  BIN1+=	${.CURDIR}/../gnu/usr.bin/man/manpath/manpath.config
  .endif
  
 Index: gnu/usr.bin/Makefile
 ===================================================================
 RCS file: /home/ncvs/src/gnu/usr.bin/Makefile,v
 retrieving revision 1.102
 diff -u -r1.102 Makefile
 --- gnu/usr.bin/Makefile	26 Mar 2010 17:02:32 -0000	1.102
 +++ gnu/usr.bin/Makefile	30 Mar 2010 21:19:52 -0000
 @@ -39,7 +39,7 @@
  _texinfo=	texinfo
  .endif
  
 -.if ${MK_MAN} != "no"
 +.if ${MK_MAN_UTILS} != "no"
  _man=		man
  .endif
  
 Index: share/Makefile
 ===================================================================
 RCS file: /home/ncvs/src/share/Makefile,v
 retrieving revision 1.40
 diff -u -r1.40 Makefile
 --- share/Makefile	8 Oct 2008 13:20:02 -0000	1.40
 +++ share/Makefile	30 Mar 2010 21:20:01 -0000
 @@ -57,7 +57,7 @@
  _mk=		mk
  .endif
  
 -.if ${MK_MAN} != "no"
 +.if ${MK_MAN_PAGES} != "no"
  _man=		man
  .endif
  
 Index: share/mk/bsd.lib.mk
 ===================================================================
 RCS file: /home/ncvs/src/share/mk/bsd.lib.mk,v
 retrieving revision 1.187
 diff -u -r1.187 bsd.lib.mk
 --- share/mk/bsd.lib.mk	22 Jan 2010 14:05:48 -0000	1.187
 +++ share/mk/bsd.lib.mk	30 Mar 2010 21:20:03 -0000
 @@ -238,7 +238,7 @@
  
  all: ${_LIBS}
  
 -.if ${MK_MAN} != "no"
 +.if ${MK_MAN_PAGES} != "no"
  all: _manpages
  .endif
  
 @@ -315,7 +315,7 @@
  .include <bsd.incs.mk>
  .include <bsd.links.mk>
  
 -.if ${MK_MAN} != "no"
 +.if ${MK_MAN_PAGES} != "no"
  realinstall: _maninstall
  .ORDER: beforeinstall _maninstall
  .endif
 @@ -327,7 +327,7 @@
  	${LINT} ${LINTFLAGS} ${CFLAGS:M-[DIU]*} ${.ALLSRC}
  .endif
  
 -.if ${MK_MAN} != "no"
 +.if ${MK_MAN_PAGES} != "no"
  .include <bsd.man.mk>
  .endif
  
 Index: share/mk/bsd.own.mk
 ===================================================================
 RCS file: /home/ncvs/src/share/mk/bsd.own.mk,v
 retrieving revision 1.83
 diff -u -r1.83 bsd.own.mk
 --- share/mk/bsd.own.mk	26 Mar 2010 17:02:32 -0000	1.83
 +++ share/mk/bsd.own.mk	30 Mar 2010 21:20:03 -0000
 @@ -345,6 +345,8 @@
      MAILWRAPPER \
      MAKE \
      MAN \
 +    MAN_PAGES \
 +    MAN_UTILS \
      NCP \
      NDIS \
      NETCAT \
 @@ -462,6 +464,15 @@
  MK_NCP:=	no
  .endif
  
 +.if ${MK_MAN} == "no"
 +MK_MAN_PAGES:=	no
 +MK_MAN_UTILS:=	no
 +.endif
 +
 +.if ${MK_MAN_UTILS} == "no"
 +MK_MAN_PAGES:=	no
 +.endif
 +
  .if ${MK_MAIL} == "no"
  MK_MAILWRAPPER:= no
  MK_SENDMAIL:=	no
 Index: share/mk/bsd.prog.mk
 ===================================================================
 RCS file: /home/ncvs/src/share/mk/bsd.prog.mk,v
 retrieving revision 1.152
 diff -u -r1.152 bsd.prog.mk
 --- share/mk/bsd.prog.mk	18 Feb 2010 03:32:51 -0000	1.152
 +++ share/mk/bsd.prog.mk	30 Mar 2010 21:20:03 -0000
 @@ -94,7 +94,7 @@
  
  .endif
  
 -.if	${MK_MAN} != "no" && !defined(MAN) && \
 +.if	${MK_MAN_PAGES} != "no" && !defined(MAN) && \
  	!defined(MAN1) && !defined(MAN2) && !defined(MAN3) && \
  	!defined(MAN4) && !defined(MAN5) && !defined(MAN6) && \
  	!defined(MAN7) && !defined(MAN8) && !defined(MAN9) && \
 @@ -105,7 +105,7 @@
  .endif
  
  all: objwarn ${PROG} ${SCRIPTS}
 -.if ${MK_MAN} != "no"
 +.if ${MK_MAN_PAGES} != "no"
  all: _manpages
  .endif
  
 @@ -197,7 +197,7 @@
  .include <bsd.incs.mk>
  .include <bsd.links.mk>
  
 -.if ${MK_MAN} != "no"
 +.if ${MK_MAN_PAGES} != "no"
  realinstall: _maninstall
  .ORDER: beforeinstall _maninstall
  .endif
 @@ -211,7 +211,7 @@
  .endif
  .endif
  
 -.if ${MK_MAN} != "no"
 +.if ${MK_MAN_PAGES} != "no"
  .include <bsd.man.mk>
  .endif
  
 Index: usr.bin/Makefile
 ===================================================================
 RCS file: /home/ncvs/src/usr.bin/Makefile,v
 retrieving revision 1.332
 diff -u -r1.332 Makefile
 --- usr.bin/Makefile	19 Feb 2010 23:54:12 -0000	1.332
 +++ usr.bin/Makefile	30 Mar 2010 21:20:19 -0000
 @@ -253,7 +253,7 @@
  _atm=		atm
  .endif
  
 -.if ${MK_MAN} != "no"
 +.if ${MK_MAN_UTILS} != "no"
  _catman=	catman
  .endif
  
 Index: usr.sbin/Makefile
 ===================================================================
 RCS file: /home/ncvs/src/usr.sbin/Makefile,v
 retrieving revision 1.421
 diff -u -r1.421 Makefile
 --- usr.sbin/Makefile	4 Mar 2010 20:31:49 -0000	1.421
 +++ usr.sbin/Makefile	30 Mar 2010 21:20:21 -0000
 @@ -91,7 +91,7 @@
  	mailwrapper \
  	makefs \
  	${_makemap} \
 -	manctl \
 +	${_manctl} \
  	memcontrol \
  	mergemaster \
  	mfiutil \
 @@ -322,6 +322,10 @@
  _lpr=		lpr
  .endif
  
 +.if ${MK_MAN_UTILS} != "no"
 +_manctl=	manctl
 +.endif
 +
  .if ${MK_NETGRAPH} != "no"
  _flowctl=	flowctl
  _lmcconfig=	lmcconfig
 
 --------------070808080401000004060505
 Content-Type: text/plain; x-mac-type="0"; x-mac-creator="0";
  name="WITHOUT_MAN"
 Content-Transfer-Encoding: 7bit
 Content-Disposition: attachment;
  filename="WITHOUT_MAN"
 
 .\" $FreeBSD: src/tools/build/options/WITHOUT_MAN,v 1.1 2006/03/21 07:50:50 ru Exp $
 Set to not build any manual pages or manual related utilities.
 
 --------------070808080401000004060505
 Content-Type: text/plain; x-mac-type="0"; x-mac-creator="0";
  name="WITHOUT_MAN_PAGES"
 Content-Transfer-Encoding: 7bit
 Content-Disposition: attachment;
  filename="WITHOUT_MAN_PAGES"
 
 .\" $FreeBSD$
 Set to not build any manual pages.
 
 --------------070808080401000004060505
 Content-Type: text/plain; x-mac-type="0"; x-mac-creator="0";
  name="WITHOUT_MAN_UTILS"
 Content-Transfer-Encoding: 7bit
 Content-Disposition: attachment;
  filename="WITHOUT_MAN_UTILS"
 
 .\" $FreeBSD$
 Set to not build any manual related utilities.
 
 --------------070808080401000004060505--
Responsible-Changed-From-To: freebsd-bugs->jkim 
Responsible-Changed-By: jkim 
Responsible-Changed-When: Mon Apr 19 19:30:13 UTC 2010 
Responsible-Changed-Why:  
I'll take a look at it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=145212 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: misc/145212: commit references a PR
Date: Wed, 19 May 2010 23:56:38 +0000 (UTC)

 Author: jkim
 Date: Wed May 19 23:56:26 2010
 New Revision: 208320
 URL: http://svn.freebsd.org/changeset/base/208320
 
 Log:
   Add a new build option, MAN_UTILS.  This option lets you control building
   utilities and related support files for manual pages, which were previously
   controlled by MAN.  For POLA, the default depends on MAN, i.e., WITHOUT_MAN
   implies WITHOUT_MAN_UTILS and WITH_MAN implies WITH_MAN_UTILS.  This patch
   is slightly improved by me from:
   
   PR:		misc/145212
 
 Modified:
   head/etc/Makefile
   head/etc/periodic/weekly/Makefile
   head/gnu/usr.bin/Makefile
   head/share/man/Makefile
   head/share/mk/bsd.own.mk
   head/usr.bin/Makefile
   head/usr.sbin/Makefile
 
 Modified: head/etc/Makefile
 ==============================================================================
 --- head/etc/Makefile	Wed May 19 22:36:46 2010	(r208319)
 +++ head/etc/Makefile	Wed May 19 23:56:26 2010	(r208320)
 @@ -64,7 +64,7 @@ BIN1+=	hosts.lpd printcap
  BIN1+=	${.CURDIR}/../usr.bin/mail/misc/mail.rc
  .endif
  
 -.if ${MK_MAN} != "no"
 +.if ${MK_MAN_UTILS} != "no"
  BIN1+=	${.CURDIR}/../gnu/usr.bin/man/manpath/manpath.config
  .endif
  
 
 Modified: head/etc/periodic/weekly/Makefile
 ==============================================================================
 --- head/etc/periodic/weekly/Makefile	Wed May 19 22:36:46 2010	(r208319)
 +++ head/etc/periodic/weekly/Makefile	Wed May 19 23:56:26 2010	(r208320)
 @@ -11,7 +11,7 @@ FILES=	340.noid \
  FILES+=	310.locate
  .endif
  
 -.if ${MK_MAN} != "no"
 +.if ${MK_MAN_UTILS} != "no"
  FILES+=	320.whatis 330.catman
  .endif
  
 
 Modified: head/gnu/usr.bin/Makefile
 ==============================================================================
 --- head/gnu/usr.bin/Makefile	Wed May 19 22:36:46 2010	(r208319)
 +++ head/gnu/usr.bin/Makefile	Wed May 19 23:56:26 2010	(r208320)
 @@ -39,7 +39,7 @@ _grep=		grep
  _texinfo=	texinfo
  .endif
  
 -.if ${MK_MAN} != "no"
 +.if ${MK_MAN_UTILS} != "no"
  _man=		man
  .endif
  
 
 Modified: head/share/man/Makefile
 ==============================================================================
 --- head/share/man/Makefile	Wed May 19 22:36:46 2010	(r208319)
 +++ head/share/man/Makefile	Wed May 19 23:56:26 2010	(r208320)
 @@ -9,10 +9,12 @@ SUBDIR=	man1 man3 man4 man5 man6 man7 ma
  MAKEWHATIS?=	makewhatis
  
  makedb:
 +.if ${MK_MAN_UTILS} != "no"
  	${MAKEWHATIS} ${DESTDIR}${BINDIR}/man
  .if ${MK_OPENSSL} != "no"
  	${MAKEWHATIS} ${DESTDIR}${BINDIR}/openssl/man
  .endif
 +.endif
  
  .include "${.CURDIR}/../Makefile.inc"
  .include <bsd.subdir.mk>
 
 Modified: head/share/mk/bsd.own.mk
 ==============================================================================
 --- head/share/mk/bsd.own.mk	Wed May 19 22:36:46 2010	(r208319)
 +++ head/share/mk/bsd.own.mk	Wed May 19 23:56:26 2010	(r208320)
 @@ -524,7 +524,8 @@ MK_${var}_SUPPORT:= yes
  # MK_* options whose default value depends on another option.
  #
  .for vv in \
 -    GSSAPI/KERBEROS
 +    GSSAPI/KERBEROS \
 +    MAN_UTILS/MAN
  .if defined(WITH_${vv:H}) && defined(WITHOUT_${vv:H})
  .error WITH_${vv:H} and WITHOUT_${vv:H} can't both be set.
  .endif
 
 Modified: head/usr.bin/Makefile
 ==============================================================================
 --- head/usr.bin/Makefile	Wed May 19 22:36:46 2010	(r208319)
 +++ head/usr.bin/Makefile	Wed May 19 23:56:26 2010	(r208320)
 @@ -120,7 +120,7 @@ SUBDIR=	alias \
  	m4 \
  	${_mail} \
  	${_make} \
 -	makewhatis \
 +	${_makewhatis} \
  	mesg \
  	minigzip \
  	ministat \
 @@ -256,7 +256,7 @@ _at=		at
  _atm=		atm
  .endif
  
 -.if ${MK_MAN} != "no"
 +.if ${MK_MAN_UTILS} != "no"
  _catman=	catman
  .endif
  
 @@ -309,6 +309,10 @@ _msgs=		msgs
  _make=		make
  .endif
  
 +.if ${MK_MAN_UTILS} != "no"
 +_makewhatis=	makewhatis
 +.endif
 +
  .if ${MK_NETCAT} != "no"
  _nc=		nc
  .endif
 
 Modified: head/usr.sbin/Makefile
 ==============================================================================
 --- head/usr.sbin/Makefile	Wed May 19 22:36:46 2010	(r208319)
 +++ head/usr.sbin/Makefile	Wed May 19 23:56:26 2010	(r208320)
 @@ -90,7 +90,7 @@ SUBDIR=	${_ac} \
  	mailwrapper \
  	makefs \
  	${_makemap} \
 -	manctl \
 +	${_manctl} \
  	memcontrol \
  	mergemaster \
  	mfiutil \
 @@ -322,6 +322,10 @@ _nscd=		nscd
  _lpr=		lpr
  .endif
  
 +.if ${MK_MAN_UTILS} != "no"
 +_manctl=	manctl
 +.endif
 +
  .if ${MK_NETGRAPH} != "no"
  _flowctl=	flowctl
  _lmcconfig=	lmcconfig
 _______________________________________________
 svn-src-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-src-all
 To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"
 
State-Changed-From-To: open->patched 
State-Changed-By: jkim 
State-Changed-When: Thu May 20 00:22:02 UTC 2010 
State-Changed-Why:  
A slightly improved version was committed on head, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=145212 
State-Changed-From-To: patched->closed 
State-Changed-By: jkim 
State-Changed-When: Tue Jun 1 19:41:58 UTC 2010 
State-Changed-Why:  
MFC'ed to stable/8 and stable/7 already. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=145212 
>Unformatted:
