svn commit: r208320 - in head: etc etc/periodic/weekly gnu/usr.bin share/man share/mk usr.bin usr.sbin

[Jung-uk Kim]

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