From owner-freebsd-bugs@FreeBSD.ORG Tue Mar 30 21:30:11 2010 Return-Path: Delivered-To: freebsd-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 729C81065670 for ; Tue, 30 Mar 2010 21:30:11 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 60F168FC0C for ; Tue, 30 Mar 2010 21:30:11 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id o2ULUBJD070970 for ; Tue, 30 Mar 2010 21:30:11 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id o2ULUBmU070963; Tue, 30 Mar 2010 21:30:11 GMT (envelope-from gnats) Date: Tue, 30 Mar 2010 21:30:11 GMT Message-Id: <201003302130.o2ULUBmU070963@freefall.freebsd.org> To: freebsd-bugs@FreeBSD.org From: Alexander Sack Cc: Subject: Re: misc/145212: Feature Request: Be able to build FreeBSD with man utilities but not with man pages X-BeenThere: freebsd-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Alexander Sack List-Id: Bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 30 Mar 2010 21:30:11 -0000 The following reply was made to PR misc/145212; it has been noted by GNATS. From: Alexander Sack To: Garrett Cooper 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 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 .include -.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 .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 .include -.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 .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--