Date: Sat, 10 Jan 2009 00:36:57 +0000 (UTC) From: Sam Leffler <sam@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r186990 - in projects/vap7: etc etc/periodic/daily etc/periodic/monthly etc/periodic/security etc/periodic/weekly gnu gnu/usr.bin lib sbin share tools/build tools/build/options usr.bin ... Message-ID: <200901100036.n0A0avLt073829@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: sam Date: Sat Jan 10 00:36:57 2009 New Revision: 186990 URL: http://svn.freebsd.org/changeset/base/186990 Log: merge nanobsd build infrastructure changes from head Added: projects/vap7/tools/build/options/WITHOUT_ACCT - copied unchanged from r183242, head/tools/build/options/WITHOUT_ACCT projects/vap7/tools/build/options/WITHOUT_AMD - copied unchanged from r183242, head/tools/build/options/WITHOUT_AMD projects/vap7/tools/build/options/WITHOUT_APM - copied unchanged from r183242, head/tools/build/options/WITHOUT_APM projects/vap7/tools/build/options/WITHOUT_AT - copied unchanged from r183242, head/tools/build/options/WITHOUT_AT projects/vap7/tools/build/options/WITHOUT_CTM - copied unchanged from r183242, head/tools/build/options/WITHOUT_CTM projects/vap7/tools/build/options/WITHOUT_FREEBSD_UPDATE - copied unchanged from r183242, head/tools/build/options/WITHOUT_FREEBSD_UPDATE projects/vap7/tools/build/options/WITHOUT_IPFW - copied unchanged from r183242, head/tools/build/options/WITHOUT_IPFW projects/vap7/tools/build/options/WITHOUT_JAIL - copied unchanged from r183242, head/tools/build/options/WITHOUT_JAIL projects/vap7/tools/build/options/WITHOUT_LEGACY_CONSOLE - copied unchanged from r183242, head/tools/build/options/WITHOUT_LEGACY_CONSOLE projects/vap7/tools/build/options/WITHOUT_LOCATE - copied unchanged from r183242, head/tools/build/options/WITHOUT_LOCATE projects/vap7/tools/build/options/WITHOUT_MAIL - copied unchanged from r183242, head/tools/build/options/WITHOUT_MAIL projects/vap7/tools/build/options/WITHOUT_MAKE - copied unchanged from r183242, head/tools/build/options/WITHOUT_MAKE projects/vap7/tools/build/options/WITHOUT_NDIS - copied unchanged from r183242, head/tools/build/options/WITHOUT_NDIS projects/vap7/tools/build/options/WITHOUT_NETGRAPH - copied unchanged from r183242, head/tools/build/options/WITHOUT_NETGRAPH projects/vap7/tools/build/options/WITHOUT_NTP - copied unchanged from r183242, head/tools/build/options/WITHOUT_NTP projects/vap7/tools/build/options/WITHOUT_PKGTOOLS - copied unchanged from r183242, head/tools/build/options/WITHOUT_PKGTOOLS projects/vap7/tools/build/options/WITHOUT_PMC - copied unchanged from r183242, head/tools/build/options/WITHOUT_PMC projects/vap7/tools/build/options/WITHOUT_PORTSNAP - copied unchanged from r183242, head/tools/build/options/WITHOUT_PORTSNAP projects/vap7/tools/build/options/WITHOUT_PPP - copied unchanged from r183242, head/tools/build/options/WITHOUT_PPP projects/vap7/tools/build/options/WITHOUT_QUOTAS - copied unchanged from r183242, head/tools/build/options/WITHOUT_QUOTAS projects/vap7/tools/build/options/WITHOUT_ROUTED - copied unchanged from r183242, head/tools/build/options/WITHOUT_ROUTED projects/vap7/tools/build/options/WITHOUT_SLIP - copied unchanged from r183242, head/tools/build/options/WITHOUT_SLIP projects/vap7/tools/build/options/WITHOUT_SYSINSTALL - copied unchanged from r183242, head/tools/build/options/WITHOUT_SYSINSTALL projects/vap7/tools/build/options/WITHOUT_TELNET - copied unchanged from r183242, head/tools/build/options/WITHOUT_TELNET projects/vap7/tools/build/options/WITHOUT_TEXTPROC - copied unchanged from r183242, head/tools/build/options/WITHOUT_TEXTPROC projects/vap7/tools/build/options/WITHOUT_WIRELESS - copied unchanged from r183242, head/tools/build/options/WITHOUT_WIRELESS Modified: projects/vap7/etc/ (props changed) projects/vap7/etc/Makefile projects/vap7/etc/periodic/daily/Makefile projects/vap7/etc/periodic/monthly/Makefile projects/vap7/etc/periodic/security/Makefile projects/vap7/etc/periodic/weekly/Makefile projects/vap7/gnu/ (props changed) projects/vap7/gnu/usr.bin/Makefile projects/vap7/lib/ (props changed) projects/vap7/lib/Makefile projects/vap7/sbin/ (props changed) projects/vap7/sbin/Makefile projects/vap7/share/ (props changed) projects/vap7/share/Makefile projects/vap7/tools/build/ (props changed) projects/vap7/usr.bin/ (props changed) projects/vap7/usr.bin/Makefile projects/vap7/usr.bin/netstat/ (props changed) projects/vap7/usr.bin/netstat/Makefile projects/vap7/usr.bin/netstat/main.c projects/vap7/usr.bin/netstat/netstat.h projects/vap7/usr.sbin/ (props changed) projects/vap7/usr.sbin/Makefile Modified: projects/vap7/etc/Makefile ============================================================================== --- projects/vap7/etc/Makefile Sat Jan 10 00:33:24 2009 (r186989) +++ projects/vap7/etc/Makefile Sat Jan 10 00:36:57 2009 (r186990) @@ -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 regdomain.xml 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 + rc.subr remote rpc services shells \ + 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 + .if ${MK_WIRELESS} != "no" BIN1+= regdomain.xml .endif @@ -113,10 +152,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 @@ -161,18 +205,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 \ @@ -180,6 +231,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: projects/vap7/etc/periodic/daily/Makefile ============================================================================== --- projects/vap7/etc/periodic/daily/Makefile Sat Jan 10 00:33:24 2009 (r186989) +++ projects/vap7/etc/periodic/daily/Makefile Sat Jan 10 00:36:57 2009 (r186990) @@ -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: projects/vap7/etc/periodic/monthly/Makefile ============================================================================== --- projects/vap7/etc/periodic/monthly/Makefile Sat Jan 10 00:33:24 2009 (r186989) +++ projects/vap7/etc/periodic/monthly/Makefile Sat Jan 10 00:36:57 2009 (r186990) @@ -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: projects/vap7/etc/periodic/security/Makefile ============================================================================== --- projects/vap7/etc/periodic/security/Makefile Sat Jan 10 00:33:24 2009 (r186989) +++ projects/vap7/etc/periodic/security/Makefile Sat Jan 10 00:36:57 2009 (r186990) @@ -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: projects/vap7/etc/periodic/weekly/Makefile ============================================================================== --- projects/vap7/etc/periodic/weekly/Makefile Sat Jan 10 00:33:24 2009 (r186989) +++ projects/vap7/etc/periodic/weekly/Makefile Sat Jan 10 00:36:57 2009 (r186990) @@ -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: projects/vap7/gnu/usr.bin/Makefile ============================================================================== --- projects/vap7/gnu/usr.bin/Makefile Sat Jan 10 00:33:24 2009 (r186989) +++ projects/vap7/gnu/usr.bin/Makefile Sat Jan 10 00:36:57 2009 (r186990) @@ -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: projects/vap7/lib/Makefile ============================================================================== --- projects/vap7/lib/Makefile Sat Jan 10 00:33:24 2009 (r186989) +++ projects/vap7/lib/Makefile Sat Jan 10 00:36:57 2009 (r186990) @@ -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} ${_libusb20} ${_libvgl} libwrap liby libz \ ${_bind} @@ -48,6 +48,8 @@ _csu=csu/${MACHINE_ARCH} _csu=csu .endif +# NB: keep these sorted by MK_* knobs + .if ${MK_ATM} != "no" _libngatm= libngatm .endif @@ -61,6 +63,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 @@ -69,6 +79,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 @@ -81,17 +107,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 @@ -103,25 +118,28 @@ _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 +_libusb20= libusb20 .endif -.if ${MK_USB} != "no" -_libusbhid= libusbhid -_libusb20= libusb20 +.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: projects/vap7/sbin/Makefile ============================================================================== --- projects/vap7/sbin/Makefile Sat Jan 10 00:33:24 2009 (r186989) +++ projects/vap7/sbin/Makefile Sat Jan 10 00:36:57 2009 (r186990) @@ -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: projects/vap7/share/Makefile ============================================================================== --- projects/vap7/share/Makefile Sat Jan 10 00:33:24 2009 (r186989) +++ projects/vap7/share/Makefile Sat Jan 10 00:36:57 2009 (r186990) @@ -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 Copied: projects/vap7/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) +++ projects/vap7/tools/build/options/WITHOUT_ACCT Sat Jan 10 00:36:57 2009 (r186990, 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: projects/vap7/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) +++ projects/vap7/tools/build/options/WITHOUT_AMD Sat Jan 10 00:36:57 2009 (r186990, 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: projects/vap7/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) +++ projects/vap7/tools/build/options/WITHOUT_APM Sat Jan 10 00:36:57 2009 (r186990, 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: projects/vap7/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) +++ projects/vap7/tools/build/options/WITHOUT_AT Sat Jan 10 00:36:57 2009 (r186990, 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: projects/vap7/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) +++ projects/vap7/tools/build/options/WITHOUT_CTM Sat Jan 10 00:36:57 2009 (r186990, 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: projects/vap7/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) +++ projects/vap7/tools/build/options/WITHOUT_FREEBSD_UPDATE Sat Jan 10 00:36:57 2009 (r186990, copy of r183242, head/tools/build/options/WITHOUT_FREEBSD_UPDATE) @@ -0,0 +1,3 @@ +.\" $FreeBSD$ +Set to not build +.Xr freebsd-update 8 . Copied: projects/vap7/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) +++ projects/vap7/tools/build/options/WITHOUT_IPFW Sat Jan 10 00:36:57 2009 (r186990, copy of r183242, head/tools/build/options/WITHOUT_IPFW) @@ -0,0 +1,2 @@ +.\" $FreeBSD$ +Set to not build IPFW tools. Copied: projects/vap7/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) +++ projects/vap7/tools/build/options/WITHOUT_JAIL Sat Jan 10 00:36:57 2009 (r186990, 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: projects/vap7/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) +++ projects/vap7/tools/build/options/WITHOUT_LEGACY_CONSOLE Sat Jan 10 00:36:57 2009 (r186990, 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: projects/vap7/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) +++ projects/vap7/tools/build/options/WITHOUT_LOCATE Sat Jan 10 00:36:57 2009 (r186990, 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: projects/vap7/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) +++ projects/vap7/tools/build/options/WITHOUT_MAIL Sat Jan 10 00:36:57 2009 (r186990, 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: projects/vap7/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) +++ projects/vap7/tools/build/options/WITHOUT_MAKE Sat Jan 10 00:36:57 2009 (r186990, 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: projects/vap7/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) +++ projects/vap7/tools/build/options/WITHOUT_NDIS Sat Jan 10 00:36:57 2009 (r186990, 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: projects/vap7/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) +++ projects/vap7/tools/build/options/WITHOUT_NETGRAPH Sat Jan 10 00:36:57 2009 (r186990, 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: projects/vap7/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) +++ projects/vap7/tools/build/options/WITHOUT_NTP Sat Jan 10 00:36:57 2009 (r186990, 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: projects/vap7/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) +++ projects/vap7/tools/build/options/WITHOUT_PKGTOOLS Sat Jan 10 00:36:57 2009 (r186990, 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: projects/vap7/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) +++ projects/vap7/tools/build/options/WITHOUT_PMC Sat Jan 10 00:36:57 2009 (r186990, 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: projects/vap7/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) +++ projects/vap7/tools/build/options/WITHOUT_PORTSNAP Sat Jan 10 00:36:57 2009 (r186990, 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: projects/vap7/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) +++ projects/vap7/tools/build/options/WITHOUT_PPP Sat Jan 10 00:36:57 2009 (r186990, 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: projects/vap7/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) +++ projects/vap7/tools/build/options/WITHOUT_QUOTAS Sat Jan 10 00:36:57 2009 (r186990, 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: projects/vap7/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) +++ projects/vap7/tools/build/options/WITHOUT_ROUTED Sat Jan 10 00:36:57 2009 (r186990, copy of r183242, head/tools/build/options/WITHOUT_ROUTED) @@ -0,0 +1,4 @@ +.\" $FreeBSD$ +Set to not build +.Xr routed 8 +utility. Copied: projects/vap7/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) +++ projects/vap7/tools/build/options/WITHOUT_SLIP Sat Jan 10 00:36:57 2009 (r186990, 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: projects/vap7/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) +++ projects/vap7/tools/build/options/WITHOUT_SYSINSTALL Sat Jan 10 00:36:57 2009 (r186990, 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: projects/vap7/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) +++ projects/vap7/tools/build/options/WITHOUT_TELNET Sat Jan 10 00:36:57 2009 (r186990, 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: projects/vap7/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) +++ projects/vap7/tools/build/options/WITHOUT_TEXTPROC Sat Jan 10 00:36:57 2009 (r186990, copy of r183242, head/tools/build/options/WITHOUT_TEXTPROC) @@ -0,0 +1,3 @@ +.\" $FreeBSD$ +Set to not build +programs used for text processing. Copied: projects/vap7/tools/build/options/WITHOUT_WIRELESS (from r183242, head/tools/build/options/WITHOUT_WIRELESS) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/vap7/tools/build/options/WITHOUT_WIRELESS Sat Jan 10 00:36:57 2009 (r186990, copy of r183242, head/tools/build/options/WITHOUT_WIRELESS) @@ -0,0 +1,5 @@ +.\" $FreeBSD$ +Set to not build programs used for 802.11 wireless networks; especially +.Xr wpa_supplicant 8 +and +.Xr hostapd 8 . Modified: projects/vap7/usr.bin/Makefile ============================================================================== --- projects/vap7/usr.bin/Makefile Sat Jan 10 00:33:24 2009 (r186989) +++ projects/vap7/usr.bin/Makefile Sat Jan 10 00:36:57 2009 (r186990) @@ -12,12 +12,12 @@ SUBDIR= alias \ apply \ asa \ - at \ + ${_at} \ ${_atm} \ awk \ banner \ basename \ - biff \ + ${_biff} \ ${_bluetooth} \ brandelf \ bsdiff \ @@ -29,23 +29,23 @@ SUBDIR= alias \ cap_mkdb \ ${_catman} \ chat \ - checknr \ + ${_checknr} \ ${_chkey} \ chpass \ cksum \ cmp \ col \ - colcrt \ + ${_colcrt} \ colldef \ colrm \ column \ comm \ - compile_et \ + ${_compile_et} \ compress \ cpuset \ csplit \ ${_csup} \ - ctags \ + ${_ctags} \ cut \ ${_dig} \ dirname \ @@ -59,12 +59,12 @@ SUBDIR= alias \ false \ fetch \ file \ - file2c \ + ${_file2c} \ find \ finger \ - fmt \ + ${_fmt} \ fold \ - from \ + ${_from} \ fstat \ fsync \ ftp \ @@ -80,7 +80,7 @@ SUBDIR= alias \ hexdump \ ${_host} \ id \ - indent \ + ${_indent} \ ipcrm \ ipcs \ join \ @@ -102,7 +102,7 @@ SUBDIR= alias \ ${_lex} \ limits \ locale \ - locate \ + ${_locate} \ lock \ lockf \ logger \ @@ -113,18 +113,18 @@ SUBDIR= alias \ lorder \ lsvfs \ m4 \ - mail \ - make \ + ${_mail} \ + ${_make} \ makewhatis \ mesg \ minigzip \ mkdep \ mkfifo \ mklocale \ - mkstr \ + ${_mkstr} \ mktemp \ mkuzip \ - msgs \ + ${_msgs} \ mt \ ${_nc} \ ncal \ @@ -151,19 +151,19 @@ SUBDIR= alias \ printenv \ printf \ procstat \ - quota \ + ${_quota} \ renice \ rev \ ${_rlogin} \ - rpcgen \ + ${_rpcgen} \ rpcinfo \ rs \ ${_rsh} \ rup \ - ruptime \ + ${_ruptime} \ rusers \ rwall \ - rwho \ + ${_rwho} \ script \ sed \ shar \ @@ -180,7 +180,7 @@ SUBDIR= alias \ tar \ tcopy \ tee \ - telnet \ + ${_telnet} \ tftp \ time \ tip \ @@ -194,10 +194,10 @@ SUBDIR= alias \ tset \ tsort \ tty \ - ul \ + ${_ul} \ uname \ unexpand \ - unifdef \ + ${_unifdef} \ uniq \ units \ unvis \ @@ -207,7 +207,7 @@ SUBDIR= alias \ uudecode \ uuencode \ ${_vacation} \ - vgrind \ + ${_vgrind} \ vi \ vis \ vmstat \ @@ -224,7 +224,7 @@ SUBDIR= alias \ xargs \ xinstall \ ${_xlint} \ - xstr \ + ${_xstr} \ ${_yacc} \ yes \ ${_ypcat} \ @@ -235,6 +235,12 @@ SUBDIR= alias \ _truss= truss .endif +# NB: keep these sorted by MK_* knobs + +.if ${MK_AT} != "no" +_at= at +.endif + .if ${MK_ATM} != "no" _atm= atm .endif @@ -258,6 +264,10 @@ _bluetooth= bluetooth _calendar= calendar .endif +.if ${MK_HESIOD} != "no" +_hesinfo= hesinfo +.endif + *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200901100036.n0A0avLt073829>