Author: jkim
Date: Tue May 25 20:32:30 2010
New Revision: 208550
URL: http://svn.freebsd.org/changeset/base/208550
Log:
MFC: r208320
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.
Note this patch implicitly fixes a documentation bug of src.conf(5), which
says WITHOUT_MAN may be used to not build manual pages while it was also
disabling some utilities for manual pages.
Modified:
stable/7/etc/Makefile
stable/7/etc/periodic/weekly/Makefile
stable/7/gnu/usr.bin/Makefile
stable/7/share/man/Makefile
stable/7/share/mk/bsd.own.mk
stable/7/usr.bin/Makefile
stable/7/usr.sbin/Makefile (contents, props changed)
Directory Properties:
stable/7/etc/ (props changed)
stable/7/gnu/usr.bin/ (props changed)
stable/7/gnu/usr.bin/cc/ (props changed)
stable/7/gnu/usr.bin/cpio/ (props changed)
stable/7/gnu/usr.bin/cvs/ (props changed)
stable/7/gnu/usr.bin/gdb/ (props changed)
stable/7/gnu/usr.bin/gdb/kgdb/ (props changed)
stable/7/gnu/usr.bin/grep/ (props changed)
stable/7/gnu/usr.bin/groff/ (props changed)
stable/7/gnu/usr.bin/groff/tmac/mdoc.local (props changed)
stable/7/gnu/usr.bin/man/ (props changed)
stable/7/gnu/usr.bin/sort/ (props changed)
stable/7/share/man/ (props changed)
stable/7/share/man/man1/ (props changed)
stable/7/share/man/man3/ (props changed)
stable/7/share/man/man4/ (props changed)
stable/7/share/man/man5/ (props changed)
stable/7/share/man/man7/ (props changed)
stable/7/share/man/man8/ (props changed)
stable/7/share/man/man9/ (props changed)
stable/7/share/mk/ (props changed)
stable/7/usr.bin/ (props changed)
stable/7/usr.bin/basename/ (props changed)
stable/7/usr.bin/bluetooth/rfcomm_sppd/ (props changed)
stable/7/usr.bin/calendar/ (props changed)
stable/7/usr.bin/catman/ (props changed)
stable/7/usr.bin/cksum/ (props changed)
stable/7/usr.bin/comm/ (props changed)
stable/7/usr.bin/cpuset/ (props changed)
stable/7/usr.bin/csup/ (props changed)
stable/7/usr.bin/dirname/ (props changed)
stable/7/usr.bin/du/ (props changed)
stable/7/usr.bin/fetch/ (props changed)
stable/7/usr.bin/file/ (props changed)
stable/7/usr.bin/find/ (props changed)
stable/7/usr.bin/finger/ (props changed)
stable/7/usr.bin/fstat/ (props changed)
stable/7/usr.bin/gcore/ (props changed)
stable/7/usr.bin/gprof/ (props changed)
stable/7/usr.bin/gzip/ (props changed)
stable/7/usr.bin/hexdump/ (props changed)
stable/7/usr.bin/id/ (props changed)
stable/7/usr.bin/indent/ (props changed)
stable/7/usr.bin/ipcrm/ (props changed)
stable/7/usr.bin/ipcs/ (props changed)
stable/7/usr.bin/jot/ (props changed)
stable/7/usr.bin/kdump/ (props changed)
stable/7/usr.bin/ktrace/ (props changed)
stable/7/usr.bin/ldd/ (props changed)
stable/7/usr.bin/less/ (props changed)
stable/7/usr.bin/locate/ (props changed)
stable/7/usr.bin/lockf/ (props changed)
stable/7/usr.bin/logger/ (props changed)
stable/7/usr.bin/make/ (props changed)
stable/7/usr.bin/ncal/ (props changed)
stable/7/usr.bin/netstat/ (props changed)
stable/7/usr.bin/newgrp/ (props changed)
stable/7/usr.bin/nsupdate/ (props changed)
stable/7/usr.bin/pkill/ (props changed)
stable/7/usr.bin/procstat/ (props changed)
stable/7/usr.bin/quota/ (props changed)
stable/7/usr.bin/rpcgen/ (props changed)
stable/7/usr.bin/sed/ (props changed)
stable/7/usr.bin/shar/ (props changed)
stable/7/usr.bin/sockstat/ (props changed)
stable/7/usr.bin/stat/ (props changed)
stable/7/usr.bin/su/ (props changed)
stable/7/usr.bin/systat/ (props changed)
stable/7/usr.bin/tail/ (props changed)
stable/7/usr.bin/tar/ (props changed)
stable/7/usr.bin/tftp/ (props changed)
stable/7/usr.bin/tip/ (props changed)
stable/7/usr.bin/top/ (props changed)
stable/7/usr.bin/truncate/ (props changed)
stable/7/usr.bin/truss/ (props changed)
stable/7/usr.bin/unifdef/ (props changed)
stable/7/usr.bin/units/ (props changed)
stable/7/usr.bin/vmstat/ (props changed)
stable/7/usr.bin/w/ (props changed)
stable/7/usr.bin/wc/ (props changed)
stable/7/usr.bin/whereis/ (props changed)
stable/7/usr.bin/whois/ (props changed)
stable/7/usr.bin/window/ (props changed)
stable/7/usr.bin/xargs/ (props changed)
stable/7/usr.bin/ypcat/ (props changed)
stable/7/usr.bin/ypmatch/ (props changed)
stable/7/usr.bin/ypwhich/ (props changed)
stable/7/usr.sbin/ (props changed)
stable/7/usr.sbin/acpi/ (props changed)
stable/7/usr.sbin/adduser/ (props changed)
stable/7/usr.sbin/arp/ (props changed)
stable/7/usr.sbin/bluetooth/ (props changed)
stable/7/usr.sbin/bluetooth/btpand/ (props changed)
stable/7/usr.sbin/bluetooth/hcsecd/ (props changed)
stable/7/usr.sbin/bluetooth/hcseriald/ (props changed)
stable/7/usr.sbin/bluetooth/rfcomm_pppd/ (props changed)
stable/7/usr.sbin/bluetooth/sdpd/ (props changed)
stable/7/usr.sbin/bsnmpd/modules/snmp_pf/ (props changed)
stable/7/usr.sbin/burncd/ (props changed)
stable/7/usr.sbin/cdcontrol/ (props changed)
stable/7/usr.sbin/chown/ (props changed)
stable/7/usr.sbin/chroot/ (props changed)
stable/7/usr.sbin/config/ (props changed)
stable/7/usr.sbin/cpucontrol/ (props changed)
stable/7/usr.sbin/crashinfo/ (props changed)
stable/7/usr.sbin/cron/ (props changed)
stable/7/usr.sbin/cron/cron/ (props changed)
stable/7/usr.sbin/crunch/ (props changed)
stable/7/usr.sbin/cxgbtool/ (props changed)
stable/7/usr.sbin/eeprom/ (props changed)
stable/7/usr.sbin/extattr/ (props changed)
stable/7/usr.sbin/faithd/ (props changed)
stable/7/usr.sbin/fdcontrol/ (props changed)
stable/7/usr.sbin/fdformat/ (props changed)
stable/7/usr.sbin/fdread/ (props changed)
stable/7/usr.sbin/fdwrite/ (props changed)
stable/7/usr.sbin/freebsd-update/ (props changed)
stable/7/usr.sbin/fwcontrol/ (props changed)
stable/7/usr.sbin/gstat/ (props changed)
stable/7/usr.sbin/iostat/ (props changed)
stable/7/usr.sbin/jail/ (props changed)
stable/7/usr.sbin/jexec/ (props changed)
stable/7/usr.sbin/jls/ (props changed)
stable/7/usr.sbin/lpr/ (props changed)
stable/7/usr.sbin/mailwrapper/ (props changed)
stable/7/usr.sbin/makefs/ (props changed)
stable/7/usr.sbin/makefs/ffs/ffs_bswap.c (props changed)
stable/7/usr.sbin/makefs/ffs/ffs_subr.c (props changed)
stable/7/usr.sbin/makefs/ffs/ufs_bswap.h (props changed)
stable/7/usr.sbin/makefs/getid.c (props changed)
stable/7/usr.sbin/mergemaster/ (props changed)
stable/7/usr.sbin/mfiutil/ (props changed)
stable/7/usr.sbin/mfiutil/mfiutil.8 (props changed)
stable/7/usr.sbin/mountd/ (props changed)
stable/7/usr.sbin/mptutil/ (props changed)
stable/7/usr.sbin/mtree/ (props changed)
stable/7/usr.sbin/ndiscvt/ (props changed)
stable/7/usr.sbin/newsyslog/ (props changed)
stable/7/usr.sbin/nscd/ (props changed)
stable/7/usr.sbin/ntp/ (props changed)
stable/7/usr.sbin/pciconf/ (props changed)
stable/7/usr.sbin/pkg_install/ (props changed)
stable/7/usr.sbin/pmcstat/ (props changed)
stable/7/usr.sbin/portsnap/ (props changed)
stable/7/usr.sbin/powerd/ (props changed)
stable/7/usr.sbin/ppp/ (props changed)
stable/7/usr.sbin/pstat/ (props changed)
stable/7/usr.sbin/pw/ (props changed)
stable/7/usr.sbin/pwd_mkdb/ (props changed)
stable/7/usr.sbin/rpc.lockd/ (props changed)
stable/7/usr.sbin/rpc.statd/ (props changed)
stable/7/usr.sbin/rpc.yppasswdd/ (props changed)
stable/7/usr.sbin/rtsold/ (props changed)
stable/7/usr.sbin/sade/ (props changed)
stable/7/usr.sbin/service/ (props changed)
stable/7/usr.sbin/setfib/ (props changed)
stable/7/usr.sbin/sysinstall/ (props changed)
stable/7/usr.sbin/syslogd/ (props changed)
stable/7/usr.sbin/traceroute/ (props changed)
stable/7/usr.sbin/traceroute6/ (props changed)
stable/7/usr.sbin/tzsetup/ (props changed)
stable/7/usr.sbin/wpa/wpa_supplicant/ (props changed)
stable/7/usr.sbin/ypserv/ (props changed)
stable/7/usr.sbin/zic/ (props changed)
Modified: stable/7/etc/Makefile
==============================================================================
--- stable/7/etc/Makefile Tue May 25 20:21:46 2010 (r208549)
+++ stable/7/etc/Makefile Tue May 25 20:32:30 2010 (r208550)
@@ -59,7 +59,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: stable/7/etc/periodic/weekly/Makefile
==============================================================================
--- stable/7/etc/periodic/weekly/Makefile Tue May 25 20:21:46 2010
(r208549)
+++ stable/7/etc/periodic/weekly/Makefile Tue May 25 20:32:30 2010
(r208550)
@@ -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: stable/7/gnu/usr.bin/Makefile
==============================================================================
--- stable/7/gnu/usr.bin/Makefile Tue May 25 20:21:46 2010
(r208549)
+++ stable/7/gnu/usr.bin/Makefile Tue May 25 20:32:30 2010
(r208550)
@@ -38,7 +38,7 @@ _cvs= cvs
_texinfo= texinfo
.endif
-.if ${MK_MAN} != "no"
+.if ${MK_MAN_UTILS} != "no"
_man= man
.endif
Modified: stable/7/share/man/Makefile
==============================================================================
--- stable/7/share/man/Makefile Tue May 25 20:21:46 2010 (r208549)
+++ stable/7/share/man/Makefile Tue May 25 20:32:30 2010 (r208550)
@@ -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: stable/7/share/mk/bsd.own.mk
==============================================================================
--- stable/7/share/mk/bsd.own.mk Tue May 25 20:21:46 2010
(r208549)
+++ stable/7/share/mk/bsd.own.mk Tue May 25 20:32:30 2010
(r208550)
@@ -520,7 +520,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: stable/7/usr.bin/Makefile
==============================================================================
--- stable/7/usr.bin/Makefile Tue May 25 20:21:46 2010 (r208549)
+++ stable/7/usr.bin/Makefile Tue May 25 20:32:30 2010 (r208550)
@@ -115,7 +115,7 @@ SUBDIR= alias \
m4 \
${_mail} \
${_make} \
- makewhatis \
+ ${_makewhatis} \
mesg \
minigzip \
mkdep \
@@ -245,7 +245,7 @@ _at= at
_atm= atm
.endif
-.if ${MK_MAN} != "no"
+.if ${MK_MAN_UTILS} != "no"
_catman= catman
.endif
@@ -293,6 +293,10 @@ _msgs= msgs
_make= make
.endif
+.if ${MK_MAN_UTILS} != "no"
+_makewhatis= makewhatis
+.endif
+
.if ${MK_NETCAT} != "no"
_nc= nc
.endif
Modified: stable/7/usr.sbin/Makefile
==============================================================================
--- stable/7/usr.sbin/Makefile Tue May 25 20:21:46 2010 (r208549)
+++ stable/7/usr.sbin/Makefile Tue May 25 20:32:30 2010 (r208550)
@@ -88,7 +88,7 @@ SUBDIR= ${_ac} \
mailwrapper \
makefs \
${_makemap} \
- manctl \
+ ${_manctl} \
memcontrol \
mergemaster \
mfiutil \
@@ -312,6 +312,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-unsubscr...@freebsd.org"
