svn commit: r187106 - in stable/7: etc etc/periodic/daily
etc/periodic/monthly etc/periodic/security
etc/periodic/weekly gnu gnu/usr.bin lib libexec sbin share
share/mk tools/build tools/build/opti...
Sam Leffler
sam at FreeBSD.org
Mon Jan 12 09:19:20 PST 2009
Author: sam
Date: Mon Jan 12 17:19:17 2009
New Revision: 187106
URL: http://svn.freebsd.org/changeset/base/187106
Log:
sync build infrastructure changes with HEAD
Reviewed by: imp
Added:
stable/7/tools/build/options/WITHOUT_ACCT
- copied unchanged from r183242, head/tools/build/options/WITHOUT_ACCT
stable/7/tools/build/options/WITHOUT_AMD
- copied unchanged from r183242, head/tools/build/options/WITHOUT_AMD
stable/7/tools/build/options/WITHOUT_APM
- copied unchanged from r183242, head/tools/build/options/WITHOUT_APM
stable/7/tools/build/options/WITHOUT_AT
- copied unchanged from r183242, head/tools/build/options/WITHOUT_AT
stable/7/tools/build/options/WITHOUT_CTM
- copied unchanged from r183242, head/tools/build/options/WITHOUT_CTM
stable/7/tools/build/options/WITHOUT_FREEBSD_UPDATE
- copied unchanged from r183242, head/tools/build/options/WITHOUT_FREEBSD_UPDATE
stable/7/tools/build/options/WITHOUT_IPFW
- copied unchanged from r183242, head/tools/build/options/WITHOUT_IPFW
stable/7/tools/build/options/WITHOUT_JAIL
- copied unchanged from r183242, head/tools/build/options/WITHOUT_JAIL
stable/7/tools/build/options/WITHOUT_LEGACY_CONSOLE
- copied unchanged from r183242, head/tools/build/options/WITHOUT_LEGACY_CONSOLE
stable/7/tools/build/options/WITHOUT_LOCATE
- copied unchanged from r183242, head/tools/build/options/WITHOUT_LOCATE
stable/7/tools/build/options/WITHOUT_MAIL
- copied unchanged from r183242, head/tools/build/options/WITHOUT_MAIL
stable/7/tools/build/options/WITHOUT_MAKE
- copied unchanged from r183242, head/tools/build/options/WITHOUT_MAKE
stable/7/tools/build/options/WITHOUT_NDIS
- copied unchanged from r183242, head/tools/build/options/WITHOUT_NDIS
stable/7/tools/build/options/WITHOUT_NETGRAPH
- copied unchanged from r183242, head/tools/build/options/WITHOUT_NETGRAPH
stable/7/tools/build/options/WITHOUT_NTP
- copied unchanged from r183242, head/tools/build/options/WITHOUT_NTP
stable/7/tools/build/options/WITHOUT_PKGTOOLS
- copied unchanged from r183242, head/tools/build/options/WITHOUT_PKGTOOLS
stable/7/tools/build/options/WITHOUT_PMC
- copied unchanged from r183242, head/tools/build/options/WITHOUT_PMC
stable/7/tools/build/options/WITHOUT_PORTSNAP
- copied unchanged from r183242, head/tools/build/options/WITHOUT_PORTSNAP
stable/7/tools/build/options/WITHOUT_PPP
- copied unchanged from r183242, head/tools/build/options/WITHOUT_PPP
stable/7/tools/build/options/WITHOUT_QUOTAS
- copied unchanged from r183242, head/tools/build/options/WITHOUT_QUOTAS
stable/7/tools/build/options/WITHOUT_ROUTED
- copied unchanged from r183242, head/tools/build/options/WITHOUT_ROUTED
stable/7/tools/build/options/WITHOUT_SLIP
- copied unchanged from r183242, head/tools/build/options/WITHOUT_SLIP
stable/7/tools/build/options/WITHOUT_SYSINSTALL
- copied unchanged from r183242, head/tools/build/options/WITHOUT_SYSINSTALL
stable/7/tools/build/options/WITHOUT_TELNET
- copied unchanged from r183242, head/tools/build/options/WITHOUT_TELNET
stable/7/tools/build/options/WITHOUT_TEXTPROC
- copied unchanged from r183242, head/tools/build/options/WITHOUT_TEXTPROC
stable/7/tools/build/options/WITHOUT_WIRELESS
- copied unchanged from r183242, head/tools/build/options/WITHOUT_WIRELESS
Modified:
stable/7/etc/ (props changed)
stable/7/etc/Makefile
stable/7/etc/periodic/daily/Makefile
stable/7/etc/periodic/monthly/Makefile
stable/7/etc/periodic/security/Makefile
stable/7/etc/periodic/weekly/Makefile
stable/7/gnu/ (props changed)
stable/7/gnu/usr.bin/Makefile
stable/7/lib/ (props changed)
stable/7/lib/Makefile
stable/7/libexec/ (props changed)
stable/7/libexec/Makefile
stable/7/sbin/ (props changed)
stable/7/sbin/Makefile
stable/7/share/ (props changed)
stable/7/share/Makefile
stable/7/share/mk/ (props changed)
stable/7/share/mk/bsd.own.mk
stable/7/tools/build/ (props changed)
stable/7/usr.bin/ (props changed)
stable/7/usr.bin/Makefile
stable/7/usr.sbin/ (props changed)
stable/7/usr.sbin/Makefile
Modified: stable/7/etc/Makefile
==============================================================================
--- stable/7/etc/Makefile Mon Jan 12 17:18:58 2009 (r187105)
+++ stable/7/etc/Makefile Mon Jan 12 17:19:17 2009 (r187106)
@@ -7,22 +7,19 @@
SUBDIR= sendmail
.endif
-BIN1= amd.map apmd.conf auth.conf \
- crontab csh.cshrc csh.login csh.logout devd.conf devfs.conf \
- ddb.conf dhclient.conf disktab fbtab freebsd-update.conf \
+BIN1= auth.conf \
+ crontab devd.conf devfs.conf \
+ ddb.conf dhclient.conf disktab fbtab \
ftpusers gettytab group \
- hosts hosts.allow hosts.equiv hosts.lpd \
+ hosts hosts.allow hosts.equiv \
inetd.conf libalias.conf login.access login.conf mac.conf motd \
netconfig network.subr networks newsyslog.conf nsswitch.conf \
- portsnap.conf pf.os phones profile protocols \
+ phones profile protocols \
rc rc.bsdextended rc.firewall rc.firewall6 rc.initdiskless \
rc.sendmail rc.shutdown \
rc.subr remote rpc services shells \
- snmpd.config sysctl.conf syslog.conf \
- etc.${MACHINE_ARCH}/ttys \
- ${.CURDIR}/../gnu/usr.bin/man/manpath/manpath.config \
- ${.CURDIR}/../usr.bin/mail/misc/mail.rc \
- ${.CURDIR}/../usr.bin/locate/locate/locate.rc
+ sysctl.conf syslog.conf \
+ etc.${MACHINE_ARCH}/ttys
OPENBSMDIR= ${.CURDIR}/../contrib/openbsm
BSM_ETC_OPEN_FILES= ${OPENBSMDIR}/etc/audit_class \
@@ -32,12 +29,38 @@ BSM_ETC_RESTRICTED_FILES= ${OPENBSMDIR}/
BSM_ETC_EXEC_FILES= ${OPENBSMDIR}/etc/audit_warn
BSM_ETC_DIR= ${DESTDIR}/etc/security
+# NB: keep these sorted by MK_* knobs
+
+.if ${MK_AMD} != "no"
+BIN1+= amd.map
+.endif
+
+.if ${MK_APM} != "no"
+BIN1+= apmd.conf
+.endif
+
+.if ${MK_BSNMP} != "no"
+BIN1+= snmpd.config
+.endif
+
+.if ${MK_FREEBSD_UPDATE} != "no"
+BIN1+= freebsd-update.conf
+.endif
+
+.if ${MK_LOCATE} != "no"
+BIN1+= ${.CURDIR}/../usr.bin/locate/locate/locate.rc
+.endif
+
.if ${MK_LPR} != "no"
-BIN1+= printcap
+BIN1+= hosts.lpd printcap
.endif
-.if ${MK_NS_CACHING} != "no"
-BIN1+= nscd.conf
+.if ${MK_MAIL} != "no"
+BIN1+= ${.CURDIR}/../usr.bin/mail/misc/mail.rc
+.endif
+
+.if ${MK_MAN} != "no"
+BIN1+= ${.CURDIR}/../gnu/usr.bin/man/manpath/manpath.config
.endif
.if ${MK_OPENSSH} != "no"
@@ -49,6 +72,22 @@ SSH= ${.CURDIR}/../crypto/openssh/ssh_co
SSL= ${.CURDIR}/../crypto/openssl/apps/openssl.cnf
.endif
+.if ${MK_NS_CACHING} != "no"
+BIN1+= nscd.conf
+.endif
+
+.if ${MK_PORTSNAP} != "no"
+BIN1+= portsnap.conf
+.endif
+
+.if ${MK_PF} != "no"
+BIN1+= pf.os
+.endif
+
+.if ${MK_TCSH} != "no"
+BIN1+= csh.cshrc csh.login csh.logout
+.endif
+
# -rwxr-xr-x root:wheel, for the new cron root:wheel
BIN2= netstart pccard_ether rc.suspend rc.resume
@@ -109,10 +148,15 @@ distribution:
${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 755 \
${BIN2} ${DESTDIR}/etc; \
${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 600 \
- master.passwd nsmb.conf opieaccess ${DESTDIR}/etc; \
- pwd_mkdb ${PWD_MKDB_ENDIAN} -i -p -d ${DESTDIR}/etc \
- ${DESTDIR}/etc/master.passwd
+ master.passwd nsmb.conf opieaccess ${DESTDIR}/etc;
+.if ${MK_TCSH} == "no"
+ sed -i "" -e 's;/bin/csh;/bin/sh;' ${DESTDIR}/etc/master.passwd
+.endif
+ pwd_mkdb ${PWD_MKDB_ENDIAN} -i -p -d ${DESTDIR}/etc \
+ ${DESTDIR}/etc/master.passwd
+.if ${MK_BLUETOOTH} != "no"
${_+_}cd ${.CURDIR}/bluetooth; ${MAKE} install
+.endif
${_+_}cd ${.CURDIR}/defaults; ${MAKE} install
${_+_}cd ${.CURDIR}/gss; ${MAKE} install
${_+_}cd ${.CURDIR}/periodic; ${MAKE} install
@@ -157,18 +201,25 @@ distribution:
.endif
cd ${.CURDIR}/root; \
${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \
+ dot.profile ${DESTDIR}/root/.profile; \
+ rm -f ${DESTDIR}/.profile; \
+ ln ${DESTDIR}/root/.profile ${DESTDIR}/.profile
+.if ${MK_TCSH} != "no"
+ cd ${.CURDIR}/root; \
+ ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \
dot.cshrc ${DESTDIR}/root/.cshrc; \
${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \
dot.login ${DESTDIR}/root/.login; \
- ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \
- dot.profile ${DESTDIR}/root/.profile; \
- rm -f ${DESTDIR}/.cshrc ${DESTDIR}/.profile; \
- ln ${DESTDIR}/root/.cshrc ${DESTDIR}/.cshrc; \
- ln ${DESTDIR}/root/.profile ${DESTDIR}/.profile
+ rm -f ${DESTDIR}/.cshrc; \
+ ln ${DESTDIR}/root/.cshrc ${DESTDIR}/.cshrc
+.endif
cd ${.CURDIR}/mtree; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 \
${MTREE} ${DESTDIR}/etc/mtree
+.if ${MK_PPP} != "no"
cd ${.CURDIR}/ppp; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 600 \
${PPPCNF} ${DESTDIR}/etc/ppp
+.endif
+.if ${MK_MAIL} != "no"
cd ${.CURDIR}/mail; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \
${ETCMAIL} ${DESTDIR}/etc/mail
@if [ -d ${DESTDIR}/etc/mail -a -f ${DESTDIR}/etc/mail/aliases -a \
@@ -176,6 +227,7 @@ distribution:
set -x; \
ln -s mail/aliases ${DESTDIR}/etc/aliases; \
fi
+.endif
${INSTALL} -o ${BINOWN} -g operator -m 664 /dev/null \
${DESTDIR}/etc/dumpdates
${INSTALL} -o nobody -g ${BINGRP} -m 644 /dev/null \
Modified: stable/7/etc/periodic/daily/Makefile
==============================================================================
--- stable/7/etc/periodic/daily/Makefile Mon Jan 12 17:18:58 2009 (r187105)
+++ stable/7/etc/periodic/daily/Makefile Mon Jan 12 17:19:17 2009 (r187106)
@@ -1,15 +1,11 @@
# $FreeBSD$
+.include <bsd.own.mk>
+
FILES= 100.clean-disks \
110.clean-tmps \
120.clean-preserve \
- 130.clean-msgs \
- 140.clean-rwho \
- 150.clean-hoststat \
200.backup-passwd \
- 210.backup-aliases \
- 300.calendar \
- 310.accounting \
330.news \
400.status-disks \
404.status-zfs \
@@ -19,13 +15,42 @@ FILES= 100.clean-disks \
408.status-gstripe \
409.status-gconcat \
420.status-network \
- 430.status-rwho \
- 440.status-mailq \
450.status-security \
- 460.status-mail-rejects \
- 470.status-named \
- 480.status-ntpd \
- 500.queuerun \
999.local
+# NB: keep these sorted by MK_* knobs
+
+.if ${MK_ACCT} != "no"
+FILES+= 310.accounting
+.endif
+
+.if ${MK_BIND_NAMED} != "no"
+FILES+= 470.status-named
+.endif
+
+.if ${MK_CALENDAR} != "no"
+FILES+= 300.calendar
+.endif
+
+.if ${MK_MAIL} != "no"
+FILES+= 130.clean-msgs
+.endif
+
+.if ${MK_NTP} != "no"
+FILES+= 480.status-ntpd
+.endif
+
+.if ${MK_RCMDS} != "no"
+FILES+= 140.clean-rwho \
+ 430.status-rwho
+.endif
+
+.if ${MK_SENDMAIL} != "no"
+FILES+= 150.clean-hoststat \
+ 210.backup-aliases \
+ 440.status-mailq \
+ 460.status-mail-rejects \
+ 500.queuerun
+.endif
+
.include <bsd.prog.mk>
Modified: stable/7/etc/periodic/monthly/Makefile
==============================================================================
--- stable/7/etc/periodic/monthly/Makefile Mon Jan 12 17:18:58 2009 (r187105)
+++ stable/7/etc/periodic/monthly/Makefile Mon Jan 12 17:19:17 2009 (r187106)
@@ -1,6 +1,13 @@
# $FreeBSD$
-FILES= 200.accounting \
- 999.local
+.include <bsd.own.mk>
+
+FILES= 999.local
+
+# NB: keep these sorted by MK_* knobs
+
+.if ${MK_ACCT} != "no"
+FILES+= 200.accounting
+.endif
.include <bsd.prog.mk>
Modified: stable/7/etc/periodic/security/Makefile
==============================================================================
--- stable/7/etc/periodic/security/Makefile Mon Jan 12 17:18:58 2009 (r187105)
+++ stable/7/etc/periodic/security/Makefile Mon Jan 12 17:19:17 2009 (r187106)
@@ -1,17 +1,30 @@
# $FreeBSD$
+.include <bsd.own.mk>
+
FILES= 100.chksetuid \
200.chkmounts \
300.chkuid0 \
400.passwdless \
410.logincheck \
- 500.ipfwdenied \
- 510.ipfdenied \
- 520.pfdenied \
- 550.ipfwlimit \
700.kernelmsg \
800.loginfail \
900.tcpwrap \
security.functions
+# NB: keep these sorted by MK_* knobs
+
+.if ${MK_IPFILTER} != "no"
+FILES+= 510.ipfdenied
+.endif
+
+.if ${MK_IPFW} != "no"
+FILES+= 500.ipfwdenied \
+ 550.ipfwlimit
+.endif
+
+.if ${MK_PF} != "no"
+FILES+= 520.pfdenied
+.endif
+
.include <bsd.prog.mk>
Modified: stable/7/etc/periodic/weekly/Makefile
==============================================================================
--- stable/7/etc/periodic/weekly/Makefile Mon Jan 12 17:18:58 2009 (r187105)
+++ stable/7/etc/periodic/weekly/Makefile Mon Jan 12 17:19:17 2009 (r187106)
@@ -1,10 +1,22 @@
# $FreeBSD$
-FILES= 310.locate \
- 320.whatis \
- 330.catman \
- 340.noid \
- 400.status-pkg \
+.include <bsd.own.mk>
+
+FILES= 340.noid \
999.local
+# NB: keep these sorted by MK_* knobs
+
+.if ${MK_LOCATE} != "no"
+FILES+= 310.locate
+.endif
+
+.if ${MK_MAN} != "no"
+FILES+= 320.whatis 330.catman
+.endif
+
+.if ${MK_PKGTOOLS} != "no"
+FLES+= 400.status-pkg
+.endif
+
.include <bsd.prog.mk>
Modified: stable/7/gnu/usr.bin/Makefile
==============================================================================
--- stable/7/gnu/usr.bin/Makefile Mon Jan 12 17:18:58 2009 (r187105)
+++ stable/7/gnu/usr.bin/Makefile Mon Jan 12 17:19:17 2009 (r187106)
@@ -34,12 +34,16 @@ _groff= groff
_cvs= cvs
.endif
+.if ${MK_INFO} != "no"
+_texinfo= texinfo
+.endif
+
.if ${MK_MAN} != "no"
_man= man
.endif
-.if ${MK_INFO} != "no"
-_texinfo= texinfo
+.if ${MK_RCS} != "no"
+_rcs= rcs
.endif
.if ${MK_TOOLCHAIN} != "no"
@@ -49,8 +53,5 @@ _cc= cc
_gdb= gdb
.endif
.endif
-.if ${MK_RCS} != "no"
-_rcs= rcs
-.endif
.include <bsd.subdir.mk>
Modified: stable/7/lib/Makefile
==============================================================================
--- stable/7/lib/Makefile Mon Jan 12 17:18:58 2009 (r187105)
+++ stable/7/lib/Makefile Mon Jan 12 17:19:17 2009 (r187106)
@@ -26,17 +26,17 @@
# Otherwise, the SUBDIR list should be in alphabetical order.
SUBDIR= ${_csu} libc libbsm libcom_err libcrypt libelf libkvm msun libmd \
- ncurses libnetgraph libradius librpcsvc libsbuf libtacplus libutil \
- ${_libypclnt} libalias libarchive ${_libatm} \
- libbegemot ${_libbluetooth} libbsnmp libbz2 \
+ ncurses ${_libnetgraph} libradius librpcsvc libsbuf \
+ libtacplus libutil ${_libypclnt} libalias libarchive ${_libatm} \
+ libbegemot ${_libbluetooth} ${_libbsnmp} libbz2 \
libcalendar libcam libcompat libdevinfo libdevstat libdisk \
libdwarf libedit libexpat libfetch libftpio libgeom ${_libgpib} \
${_libgssapi} libipsec \
${_libipx} libkiconv libmagic libmemstat ${_libmilter} ${_libmp} \
${_libncp} ${_libngatm} libopie libpam libpcap \
- libpmc libproc ${_libkse} librt ${_libsdp} ${_libsm} ${_libsmb} \
+ ${_libpmc} libproc ${_libkse} librt ${_libsdp} ${_libsm} ${_libsmb} \
${_libsmdb} \
- ${_libsmutil} libstand libtelnet ${_libthr} libthread_db libufs \
+ ${_libsmutil} libstand ${_libtelnet} ${_libthr} libthread_db libufs \
libugidfw ${_libusbhid} ${_libvgl} libwrap liby libz ${_bind}
.if exists(${.CURDIR}/csu/${MACHINE_ARCH}-elf)
@@ -47,6 +47,8 @@ _csu=csu/${MACHINE_ARCH}
_csu=csu
.endif
+# NB: keep these sorted by MK_* knobs
+
.if ${MK_ATM} != "no"
_libngatm= libngatm
.endif
@@ -60,6 +62,14 @@ _libbluetooth= libbluetooth
_libsdp= libsdp
.endif
+.if ${MK_BSNMP} != "no"
+_libbsnmp= libbsnmp
+.endif
+
+.if ${MK_GPIB} != "no"
+_libgpib= libgpib
+.endif
+
.if ${MK_GSSAPI} != "no"
_libgssapi= libgssapi
.endif
@@ -68,6 +78,22 @@ _libgssapi= libgssapi
_libipx= libipx
.endif
+.if ${MK_LIBKSE} != "no"
+_libkse= libkse
+.endif
+
+.if ${MK_LIBTHR} != "no"
+_libthr= libthr
+.endif
+
+.if ${MK_NETGRAPH} != "no"
+_libnetgraph= libnetgraph
+.endif
+
+.if ${MK_NIS} != "no"
+_libypclnt= libypclnt
+.endif
+
.if ${MACHINE_ARCH} == "i386"
.if ${MK_NCP} != "no"
_libncp= libncp
@@ -80,17 +106,6 @@ _libvgl= libvgl
_libsmb= libsmb
.endif
-.if ${MK_SENDMAIL} != "no"
-_libmilter= libmilter
-_libsm= libsm
-_libsmdb= libsmdb
-_libsmutil= libsmutil
-.endif
-
-.if ${MK_OPENSSL} != "no"
-_libmp= libmp
-.endif
-
.if ${MACHINE_ARCH} == "amd64"
.if ${MK_NCP} != "no"
_libncp= libncp
@@ -102,24 +117,27 @@ _libsmb= libsmb
_libsmb= libsmb
.endif
-.if ${MK_LIBKSE} != "no"
-_libkse= libkse
+.if ${MK_OPENSSL} != "no"
+_libmp= libmp
.endif
-.if ${MK_LIBTHR} != "no"
-_libthr= libthr
+.if ${MK_PMC} != "no"
+_libpmc= libpmc
.endif
-.if ${MK_USB} != "no"
-_libusbhid= libusbhid
+.if ${MK_SENDMAIL} != "no"
+_libmilter= libmilter
+_libsm= libsm
+_libsmdb= libsmdb
+_libsmutil= libsmutil
.endif
-.if ${MK_NIS} != "no"
-_libypclnt= libypclnt
+.if ${MK_TELNET} != "no"
+_libtelnet= libtelnet
.endif
-.if ${MK_GPIB} != "no"
-_libgpib= libgpib
+.if ${MK_USB} != "no"
+_libusbhid= libusbhid
.endif
.include <bsd.subdir.mk>
Modified: stable/7/libexec/Makefile
==============================================================================
--- stable/7/libexec/Makefile Mon Jan 12 17:18:58 2009 (r187105)
+++ stable/7/libexec/Makefile Mon Jan 12 17:19:17 2009 (r187106)
@@ -3,9 +3,9 @@
.include <bsd.own.mk>
-SUBDIR= atrun \
+SUBDIR= ${_atrun} \
bootpd \
- comsat \
+ ${_comsat} \
fingerd \
ftpd \
getty \
@@ -13,7 +13,7 @@ SUBDIR= atrun \
${_mail.local} \
makekey \
${_mknetid} \
- pppoed \
+ ${_pppoed} \
pt_chown \
rbootd \
revnetgroup \
@@ -29,16 +29,28 @@ SUBDIR= atrun \
${_smrsh} \
talkd \
tcpd \
- telnetd \
+ ${_telnetd} \
tftpd \
${_tftp-proxy} \
${_ypxfr}
+.if ${MK_AT} != "no"
+_atrun= atrun
+.endif
+
+.if ${MK_MAIL} != "no"
+_comsat= comsat
+.endif
+
.if ${MK_NIS} != "no"
_mknetid= mknetid
_ypxfr= ypxfr
.endif
+.if ${MK_NETGRAPH} != "no"
+_pppoed= pppoed
+.endif
+
.if ${MK_PF} != "no"
_tftp-proxy= tftp-proxy
.endif
@@ -54,7 +66,11 @@ _rshd= rshd
.if ${MK_SENDMAIL} != "no"
_mail.local= mail.local
-_smrsh= smrsh
+_smrsh= smrsh
+.endif
+
+.if ${MK_TELNET} != "no"
+_telnetd= telnetd
.endif
.include <bsd.subdir.mk>
Modified: stable/7/sbin/Makefile
==============================================================================
--- stable/7/sbin/Makefile Mon Jan 12 17:18:58 2009 (r187105)
+++ stable/7/sbin/Makefile Mon Jan 12 17:19:17 2009 (r187106)
@@ -41,7 +41,7 @@ SUBDIR= adjkerntz \
ifconfig \
init \
${_ipf} \
- ipfw \
+ ${_ipfw} \
iscontrol \
kldconfig \
kldload \
@@ -62,7 +62,7 @@ SUBDIR= adjkerntz \
mount_nullfs \
mount_udf \
mount_unionfs \
- natd \
+ ${_natd} \
newfs \
newfs_msdos \
nfsiod \
@@ -71,13 +71,13 @@ SUBDIR= adjkerntz \
${_pflogd} \
ping \
${_ping6} \
- quotacheck \
+ ${_quotacheck} \
rcorder \
reboot \
recoverdisk \
restore \
route \
- routed \
+ ${_routed} \
${_rtsol} \
savecore \
${_sconfig} \
@@ -85,7 +85,7 @@ SUBDIR= adjkerntz \
shutdown \
slattach \
spppcontrol \
- startslip \
+ ${_startslip} \
sunlabel \
swapon \
sysctl \
@@ -104,6 +104,11 @@ _devd= devd
_ipf= ipf
.endif
+.if ${MK_IPFW} != "no"
+_ipfw= ipfw
+_natd= natd
+.endif
+
.if ${MK_PF} != "no"
_pfctl= pfctl
_pflogd= pflogd
@@ -114,6 +119,18 @@ _ping6= ping6
_rtsol= rtsol
.endif
+.if ${MK_QUOTAS} != "no"
+_quotacheck= quotacheck
+.endif
+
+.if ${MK_ROUTED} != "no"
+_routed= routed
+.endif
+
+.if ${MK_SLIP} != "no"
+_startslip= startslip
+.endif
+
.if ${MACHINE_ARCH} == "i386"
.if ${MACHINE} == "i386"
_fdisk= fdisk
Modified: stable/7/share/Makefile
==============================================================================
--- stable/7/share/Makefile Mon Jan 12 17:18:58 2009 (r187105)
+++ stable/7/share/Makefile Mon Jan 12 17:19:17 2009 (r187106)
@@ -13,51 +13,57 @@ SUBDIR= ${_colldef} \
${_man} \
${_me} \
misc \
- mk \
+ ${_mk} \
${_mklocale} \
${_monetdef} \
${_msgdef} \
${_numericdef} \
${_sendmail} \
skel \
- snmp \
+ ${_snmp} \
${_syscons} \
tabset \
termcap \
${_timedef} \
${_zoneinfo}
-.if ${MK_LOCALES} != "no"
-_colldef = colldef
-_mklocale = mklocale
-_monetdef = monetdef
-_msgdef = msgdef
-_numericdef = numericdef
-_timedef = timedef
+# NB: keep these sorted by MK_* knobs
+
+.if ${MK_BSNMP} != "no"
+_snmp= snmp
.endif
-.if ${MK_SYSCONS} != "no"
-_syscons= syscons
+.if ${MK_DICT} != "no"
+_dict= dict
.endif
-.if ${MK_MAN} != "no"
-_man= man
+.if ${MK_EXAMPLES} != "no"
+_examples= examples
.endif
.if ${MK_GROFF} != "no"
_me= me
.endif
-.if ${MK_EXAMPLES} != "no"
-_examples= examples
-.endif
-
.if ${MK_I4B} != "no"
_isdn= isdn
.endif
-.if ${MK_DICT} != "no"
-_dict= dict
+.if ${MK_LOCALES} != "no"
+_colldef = colldef
+_mklocale = mklocale
+_monetdef = monetdef
+_msgdef = msgdef
+_numericdef = numericdef
+_timedef = timedef
+.endif
+
+.if ${MK_MAKE} != "no"
+_mk= mk
+.endif
+
+.if ${MK_MAN} != "no"
+_man= man
.endif
.if ${MK_SENDMAIL} != "no"
@@ -68,6 +74,10 @@ _sendmail= sendmail
_doc= doc
.endif
+.if ${MK_SYSCONS} != "no"
+_syscons= syscons
+.endif
+
.if ${MK_ZONEINFO} != "no"
_zoneinfo= zoneinfo
.endif
Modified: stable/7/share/mk/bsd.own.mk
==============================================================================
--- stable/7/share/mk/bsd.own.mk Mon Jan 12 17:18:58 2009 (r187105)
+++ stable/7/share/mk/bsd.own.mk Mon Jan 12 17:19:17 2009 (r187106)
@@ -285,8 +285,12 @@ WITH_IDEA=
# MK_* options which default to "yes".
#
.for var in \
+ ACCT \
ACPI \
+ AMD \
+ APM \
ASSERT_DEBUG \
+ AT \
ATM \
AUDIT \
AUTHPF \
@@ -299,18 +303,22 @@ WITH_IDEA=
BIND_UTILS \
BLUETOOTH \
BOOT \
+ BSNMP \
BZIP2 \
CALENDAR \
CDDL \
CPP \
CRYPT \
+ CTM \
CVS \
CXX \
DICT \
DYNAMICROOT \
EXAMPLES \
+ FLOPPY \
FORTH \
FP_LIBC \
+ FREEBSD_UPDATE \
GAMES \
GCOV \
GDB \
@@ -323,41 +331,61 @@ WITH_IDEA=
INFO \
INSTALLLIB \
IPFILTER \
+ IPFW \
IPX \
+ JAIL \
KERBEROS \
KVM \
+ LEGACY_CONSOLE \
LIB32 \
LIBPTHREAD \
LIBKSE \
LIBTHR \
LOCALES \
+ LOCATE \
LPR \
+ MAIL \
MAILWRAPPER \
+ MAKE \
MAN \
NCP \
+ NDIS \
NETCAT \
+ NETGRAPH \
NIS \
NLS \
NLS_CATALOGS \
NS_CACHING \
+ NTP \
OBJC \
OPENSSH \
OPENSSL \
PAM \
PF \
+ PKGTOOLS \
+ PMC \
+ PORTSNAP \
+ PPP \
PROFILE \
+ QUOTAS \
RCMDS \
RCS \
RESCUE \
+ ROUTED \
SENDMAIL \
SETUID_LOGIN \
SHAREDOCS \
+ SLIP \
SSP \
+ SYSINSTALL \
SYMVER \
SYSCONS \
TCSH \
+ TELNET \
+ TEXTPROC \
TOOLCHAIN \
USB \
+ WIRELESS \
WPA_SUPPLICANT_EAPOL \
ZONEINFO \
ZFS
@@ -435,6 +463,11 @@ MK_KERBEROS:= no
MK_NCP:= no
.endif
+.if ${MK_MAIL} == "no"
+MK_MAILWRAPPER:= no
+MK_SENDMAIL:= no
+.endif
+
.if ${MK_OPENSSL} == "no"
MK_OPENSSH:= no
MK_KERBEROS:= no
@@ -444,6 +477,10 @@ MK_KERBEROS:= no
MK_AUTHPF:= no
.endif
+.if ${MK_TEXTPROC} == "no"
+MK_GROFF:= no
+.endif
+
.if ${MK_TOOLCHAIN} == "no"
MK_GDB:= no
.endif
@@ -463,7 +500,9 @@ MK_GDB:= no
IPX \
KERBEROS \
KVM \
- PAM
+ NETGRAPH \
+ PAM \
+ WIRELESS
.if defined(WITH_${var}_SUPPORT) && defined(WITHOUT_${var}_SUPPORT)
.error WITH_${var}_SUPPORT and WITHOUT_${var}_SUPPORT can't both be set.
.endif
Copied: stable/7/tools/build/options/WITHOUT_ACCT (from r183242, head/tools/build/options/WITHOUT_ACCT)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ stable/7/tools/build/options/WITHOUT_ACCT Mon Jan 12 17:19:17 2009 (r187106, copy of r183242, head/tools/build/options/WITHOUT_ACCT)
@@ -0,0 +1,5 @@
+.\" $FreeBSD$
+Set to not build process accounting tools such as
+.Xr ac 8
+and
+.Xr accton 8 .
Copied: stable/7/tools/build/options/WITHOUT_AMD (from r183242, head/tools/build/options/WITHOUT_AMD)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ stable/7/tools/build/options/WITHOUT_AMD Mon Jan 12 17:19:17 2009 (r187106, copy of r183242, head/tools/build/options/WITHOUT_AMD)
@@ -0,0 +1,4 @@
+.\" $FreeBSD$
+Set to not build
+.Xr amd 8 ,
+and related programs.
Copied: stable/7/tools/build/options/WITHOUT_APM (from r183242, head/tools/build/options/WITHOUT_APM)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ stable/7/tools/build/options/WITHOUT_APM Mon Jan 12 17:19:17 2009 (r187106, copy of r183242, head/tools/build/options/WITHOUT_APM)
@@ -0,0 +1,5 @@
+.\" $FreeBSD$
+Set to not build
+.Xr apm 8 ,
+.Xr apmd 8
+and related programs.
Copied: stable/7/tools/build/options/WITHOUT_AT (from r183242, head/tools/build/options/WITHOUT_AT)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ stable/7/tools/build/options/WITHOUT_AT Mon Jan 12 17:19:17 2009 (r187106, copy of r183242, head/tools/build/options/WITHOUT_AT)
@@ -0,0 +1,4 @@
+.\" $FreeBSD$
+Set to not build
+.Xr at 1
+and related utilities.
Copied: stable/7/tools/build/options/WITHOUT_CTM (from r183242, head/tools/build/options/WITHOUT_CTM)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ stable/7/tools/build/options/WITHOUT_CTM Mon Jan 12 17:19:17 2009 (r187106, copy of r183242, head/tools/build/options/WITHOUT_CTM)
@@ -0,0 +1,4 @@
+.\" $FreeBSD$
+Set to not build
+.Xr ctm 1
+and related utilities.
Copied: stable/7/tools/build/options/WITHOUT_FREEBSD_UPDATE (from r183242, head/tools/build/options/WITHOUT_FREEBSD_UPDATE)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ stable/7/tools/build/options/WITHOUT_FREEBSD_UPDATE Mon Jan 12 17:19:17 2009 (r187106, copy of r183242, head/tools/build/options/WITHOUT_FREEBSD_UPDATE)
@@ -0,0 +1,3 @@
+.\" $FreeBSD$
+Set to not build
+.Xr freebsd-update 8 .
Copied: stable/7/tools/build/options/WITHOUT_IPFW (from r183242, head/tools/build/options/WITHOUT_IPFW)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ stable/7/tools/build/options/WITHOUT_IPFW Mon Jan 12 17:19:17 2009 (r187106, copy of r183242, head/tools/build/options/WITHOUT_IPFW)
@@ -0,0 +1,2 @@
+.\" $FreeBSD$
+Set to not build IPFW tools.
Copied: stable/7/tools/build/options/WITHOUT_JAIL (from r183242, head/tools/build/options/WITHOUT_JAIL)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ stable/7/tools/build/options/WITHOUT_JAIL Mon Jan 12 17:19:17 2009 (r187106, copy of r183242, head/tools/build/options/WITHOUT_JAIL)
@@ -0,0 +1,3 @@
+.\" $FreeBSD$
+Set to not build tools for the support of jails; e.g.
+.Xr jail 8 .
Copied: stable/7/tools/build/options/WITHOUT_LEGACY_CONSOLE (from r183242, head/tools/build/options/WITHOUT_LEGACY_CONSOLE)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ stable/7/tools/build/options/WITHOUT_LEGACY_CONSOLE Mon Jan 12 17:19:17 2009 (r187106, copy of r183242, head/tools/build/options/WITHOUT_LEGACY_CONSOLE)
@@ -0,0 +1,5 @@
+.\" $FreeBSD$
+Set to not build programs that support a legacy PC console; e.g.
+.Xr kbdcontrol 8
+and
+.Xr vidcontrol 8 .
Copied: stable/7/tools/build/options/WITHOUT_LOCATE (from r183242, head/tools/build/options/WITHOUT_LOCATE)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ stable/7/tools/build/options/WITHOUT_LOCATE Mon Jan 12 17:19:17 2009 (r187106, copy of r183242, head/tools/build/options/WITHOUT_LOCATE)
@@ -0,0 +1,4 @@
+.\" $FreeBSD$
+Set to not build
+.Xr locate 1
+and related programs.
Copied: stable/7/tools/build/options/WITHOUT_MAIL (from r183242, head/tools/build/options/WITHOUT_MAIL)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ stable/7/tools/build/options/WITHOUT_MAIL Mon Jan 12 17:19:17 2009 (r187106, copy of r183242, head/tools/build/options/WITHOUT_MAIL)
@@ -0,0 +1,2 @@
+.\" $FreeBSD$
+Set to not build any mail support (MUA or MTA).
Copied: stable/7/tools/build/options/WITHOUT_MAKE (from r183242, head/tools/build/options/WITHOUT_MAKE)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ stable/7/tools/build/options/WITHOUT_MAKE Mon Jan 12 17:19:17 2009 (r187106, copy of r183242, head/tools/build/options/WITHOUT_MAKE)
@@ -0,0 +1,4 @@
+.\" $FreeBSD$
+Set to not install
+.Xr make 1
+and related support files.
Copied: stable/7/tools/build/options/WITHOUT_NDIS (from r183242, head/tools/build/options/WITHOUT_NDIS)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ stable/7/tools/build/options/WITHOUT_NDIS Mon Jan 12 17:19:17 2009 (r187106, copy of r183242, head/tools/build/options/WITHOUT_NDIS)
@@ -0,0 +1,3 @@
+.\" $FreeBSD$
+Set to not build programs and libraries
+related to NDIS emulation support.
Copied: stable/7/tools/build/options/WITHOUT_NETGRAPH (from r183242, head/tools/build/options/WITHOUT_NETGRAPH)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ stable/7/tools/build/options/WITHOUT_NETGRAPH Mon Jan 12 17:19:17 2009 (r187106, copy of r183242, head/tools/build/options/WITHOUT_NETGRAPH)
@@ -0,0 +1,3 @@
+.\" $FreeBSD$
+Set to not build applications to support
+.Xr netgraph 4 .
Copied: stable/7/tools/build/options/WITHOUT_NTP (from r183242, head/tools/build/options/WITHOUT_NTP)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ stable/7/tools/build/options/WITHOUT_NTP Mon Jan 12 17:19:17 2009 (r187106, copy of r183242, head/tools/build/options/WITHOUT_NTP)
@@ -0,0 +1,4 @@
+.\" $FreeBSD$
+Set to not build
+.Xr ntpd 8
+and related programs.
Copied: stable/7/tools/build/options/WITHOUT_PKGTOOLS (from r183242, head/tools/build/options/WITHOUT_PKGTOOLS)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ stable/7/tools/build/options/WITHOUT_PKGTOOLS Mon Jan 12 17:19:17 2009 (r187106, copy of r183242, head/tools/build/options/WITHOUT_PKGTOOLS)
@@ -0,0 +1,4 @@
+.\" $FreeBSD$
+Set to not build
+.Xr pkg_add 8
+and related programs.
Copied: stable/7/tools/build/options/WITHOUT_PMC (from r183242, head/tools/build/options/WITHOUT_PMC)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ stable/7/tools/build/options/WITHOUT_PMC Mon Jan 12 17:19:17 2009 (r187106, copy of r183242, head/tools/build/options/WITHOUT_PMC)
@@ -0,0 +1,4 @@
+.\" $FreeBSD$
+Set to not build
+.Xr pmccontrol 8
+and related programs.
Copied: stable/7/tools/build/options/WITHOUT_PORTSNAP (from r183242, head/tools/build/options/WITHOUT_PORTSNAP)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ stable/7/tools/build/options/WITHOUT_PORTSNAP Mon Jan 12 17:19:17 2009 (r187106, copy of r183242, head/tools/build/options/WITHOUT_PORTSNAP)
@@ -0,0 +1,4 @@
+.\" $FreeBSD$
+Set to not build or install
+.Xr portsnap 8
+and related files.
Copied: stable/7/tools/build/options/WITHOUT_PPP (from r183242, head/tools/build/options/WITHOUT_PPP)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ stable/7/tools/build/options/WITHOUT_PPP Mon Jan 12 17:19:17 2009 (r187106, copy of r183242, head/tools/build/options/WITHOUT_PPP)
@@ -0,0 +1,4 @@
+.\" $FreeBSD$
+Set to not build
+.Xr ppp 8
+and related programs.
Copied: stable/7/tools/build/options/WITHOUT_QUOTAS (from r183242, head/tools/build/options/WITHOUT_QUOTAS)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ stable/7/tools/build/options/WITHOUT_QUOTAS Mon Jan 12 17:19:17 2009 (r187106, copy of r183242, head/tools/build/options/WITHOUT_QUOTAS)
@@ -0,0 +1,4 @@
+.\" $FreeBSD$
+Set to not build
+.Xr quota 8
+and related programs.
Copied: stable/7/tools/build/options/WITHOUT_ROUTED (from r183242, head/tools/build/options/WITHOUT_ROUTED)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ stable/7/tools/build/options/WITHOUT_ROUTED Mon Jan 12 17:19:17 2009 (r187106, copy of r183242, head/tools/build/options/WITHOUT_ROUTED)
@@ -0,0 +1,4 @@
+.\" $FreeBSD$
+Set to not build
+.Xr routed 8
+utility.
Copied: stable/7/tools/build/options/WITHOUT_SLIP (from r183242, head/tools/build/options/WITHOUT_SLIP)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ stable/7/tools/build/options/WITHOUT_SLIP Mon Jan 12 17:19:17 2009 (r187106, copy of r183242, head/tools/build/options/WITHOUT_SLIP)
@@ -0,0 +1,4 @@
+.\" $FreeBSD$
+Set to not build
+.Xr sliplogin 8
+and related programs.
Copied: stable/7/tools/build/options/WITHOUT_SYSINSTALL (from r183242, head/tools/build/options/WITHOUT_SYSINSTALL)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ stable/7/tools/build/options/WITHOUT_SYSINSTALL Mon Jan 12 17:19:17 2009 (r187106, copy of r183242, head/tools/build/options/WITHOUT_SYSINSTALL)
@@ -0,0 +1,4 @@
+.\" $FreeBSD$
+Set to not build
+.Xr sysinstall 8
+and related programs.
Copied: stable/7/tools/build/options/WITHOUT_TELNET (from r183242, head/tools/build/options/WITHOUT_TELNET)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ stable/7/tools/build/options/WITHOUT_TELNET Mon Jan 12 17:19:17 2009 (r187106, copy of r183242, head/tools/build/options/WITHOUT_TELNET)
@@ -0,0 +1,4 @@
+.\" $FreeBSD$
+Set to not build
+.Xr telnet 8
+and related programs.
Copied: stable/7/tools/build/options/WITHOUT_TEXTPROC (from r183242, head/tools/build/options/WITHOUT_TEXTPROC)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ stable/7/tools/build/options/WITHOUT_TEXTPROC Mon Jan 12 17:19:17 2009 (r187106, copy of r183242, head/tools/build/options/WITHOUT_TEXTPROC)
@@ -0,0 +1,3 @@
+.\" $FreeBSD$
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-src-stable-7
mailing list