diff --git a/etc/Makefile b/etc/Makefile index 29e72aa52ebe..859ceed4574b 100644 --- a/etc/Makefile +++ b/etc/Makefile @@ -7,22 +7,19 @@ SUBDIR= sendmail .endif -BIN1= amd.map apmd.conf auth.conf \ +BIN1= auth.conf \ crontab csh.cshrc csh.login csh.logout devd.conf devfs.conf \ - ddb.conf dhclient.conf disktab fbtab freebsd-update.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}/etc/audit_control \ BSM_ETC_EXEC_FILES= ${OPENBSMDIR}/etc/audit_warn BSM_ETC_DIR= ${DESTDIR}/etc/security -.if ${MK_LPR} != "no" -BIN1+= printcap +# NB: keep these sorted by MK_* knobs + +.if ${MK_AMD} != "no" +BIN1+= amd.map .endif -.if ${MK_NS_CACHING} != "no" -BIN1+= nscd.conf +.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+= hosts.lpd printcap +.endif + +.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,18 @@ SSH= ${.CURDIR}/../crypto/openssh/ssh_config \ 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 + # -rwxr-xr-x root:wheel, for the new cron root:wheel BIN2= netstart pccard_ether rc.suspend rc.resume @@ -112,7 +147,9 @@ distribution: master.passwd nsmb.conf opieaccess ${DESTDIR}/etc; \ 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 @@ -164,8 +201,11 @@ distribution: ln ${DESTDIR}/root/.profile ${DESTDIR}/.profile 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 \ @@ -173,6 +213,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 \ diff --git a/etc/periodic/daily/Makefile b/etc/periodic/daily/Makefile index 5e25f90ee3a3..80583a1182bc 100644 --- a/etc/periodic/daily/Makefile +++ b/etc/periodic/daily/Makefile @@ -1,15 +1,11 @@ # $FreeBSD$ +.include + 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 diff --git a/etc/periodic/monthly/Makefile b/etc/periodic/monthly/Makefile index c21323058fd2..1e71afdcf10d 100644 --- a/etc/periodic/monthly/Makefile +++ b/etc/periodic/monthly/Makefile @@ -1,6 +1,13 @@ # $FreeBSD$ -FILES= 200.accounting \ - 999.local +.include + +FILES= 999.local + +# NB: keep these sorted by MK_* knobs + +.if ${MK_ACCT} != "no" +FILES+= 200.accounting +.endif .include diff --git a/etc/periodic/security/Makefile b/etc/periodic/security/Makefile index c7a9b2bcbac7..e1d6dfd5b4ad 100644 --- a/etc/periodic/security/Makefile +++ b/etc/periodic/security/Makefile @@ -1,17 +1,30 @@ # $FreeBSD$ +.include + 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 diff --git a/etc/periodic/weekly/Makefile b/etc/periodic/weekly/Makefile index bc97fa9822fa..463520f302d1 100644 --- a/etc/periodic/weekly/Makefile +++ b/etc/periodic/weekly/Makefile @@ -1,10 +1,22 @@ # $FreeBSD$ -FILES= 310.locate \ - 320.whatis \ - 330.catman \ - 340.noid \ - 400.status-pkg \ +.include + +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 diff --git a/gnu/usr.bin/Makefile b/gnu/usr.bin/Makefile index 041ed19391b3..82792df3bf98 100644 --- a/gnu/usr.bin/Makefile +++ b/gnu/usr.bin/Makefile @@ -46,12 +46,16 @@ _cvs= cvs _grep= grep .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" @@ -61,8 +65,5 @@ _cc= cc _gdb= gdb .endif .endif -.if ${MK_RCS} != "no" -_rcs= rcs -.endif .include diff --git a/lib/Makefile b/lib/Makefile index fd1ea0b3bddd..1b5ba44f8a8a 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -27,17 +27,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} ${_librpcsec_gss} libipsec \ ${_libipx} libkiconv libmagic libmemstat ${_libmilter} ${_libmp} \ ${_libncp} ${_libngatm} libopie libpam libpcap \ - libpmc libproc librt ${_libsdp} ${_libsm} ${_libsmb} \ + ${_libpmc} libproc 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) @@ -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 _librpcsec_gss= librpcsec_gss @@ -70,6 +80,18 @@ _librpcsec_gss= librpcsec_gss _libipx= libipx .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 @@ -82,17 +104,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 @@ -104,20 +115,27 @@ _libsmb= libsmb _libsmb= libsmb .endif -.if ${MK_LIBTHR} != "no" -_libthr= libthr +.if ${MK_OPENSSL} != "no" +_libmp= libmp +.endif + +.if ${MK_PMC} != "no" +_libpmc= libpmc +.endif + +.if ${MK_SENDMAIL} != "no" +_libmilter= libmilter +_libsm= libsm +_libsmdb= libsmdb +_libsmutil= libsmutil +.endif + +.if ${MK_TELNET} != "no" +_libtelnet= libtelnet .endif .if ${MK_USB} != "no" _libusbhid= libusbhid .endif -.if ${MK_NIS} != "no" -_libypclnt= libypclnt -.endif - -.if ${MK_GPIB} != "no" -_libgpib= libgpib -.endif - .include diff --git a/libexec/Makefile b/libexec/Makefile index c6c2ab3456c1..04fc38b349f1 100644 --- a/libexec/Makefile +++ b/libexec/Makefile @@ -3,9 +3,9 @@ .include -SUBDIR= atrun \ +SUBDIR= ${_atrun} \ bootpd \ - comsat \ + ${_comsat} \ fingerd \ ftpd \ getty \ @@ -13,7 +13,7 @@ SUBDIR= atrun \ ${_mail.local} \ makekey \ ${_mknetid} \ - pppoed \ + ${_pppoed} \ rbootd \ revnetgroup \ ${_rlogind} \ @@ -28,16 +28,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 @@ -53,7 +65,11 @@ _rshd= rshd .if ${MK_SENDMAIL} != "no" _mail.local= mail.local -_smrsh= smrsh +_smrsh= smrsh +.endif + +.if ${MK_TELNET} != "no" +_telnetd= telnetd .endif .include diff --git a/sbin/Makefile b/sbin/Makefile index 1af63c06ad62..0b6bc0286d73 100644 --- a/sbin/Makefile +++ b/sbin/Makefile @@ -40,7 +40,7 @@ SUBDIR= adjkerntz \ ifconfig \ init \ ${_ipf} \ - ipfw \ + ${_ipfw} \ iscontrol \ kldconfig \ kldload \ @@ -61,7 +61,7 @@ SUBDIR= adjkerntz \ mount_nullfs \ mount_udf \ mount_unionfs \ - natd \ + ${_natd} \ newfs \ newfs_msdos \ nfsiod \ @@ -70,13 +70,13 @@ SUBDIR= adjkerntz \ ${_pflogd} \ ping \ ${_ping6} \ - quotacheck \ + ${_quotacheck} \ rcorder \ reboot \ recoverdisk \ restore \ route \ - routed \ + ${_routed} \ ${_rtsol} \ savecore \ ${_sconfig} \ @@ -84,7 +84,7 @@ SUBDIR= adjkerntz \ shutdown \ slattach \ spppcontrol \ - startslip \ + ${_startslip} \ ${_sunlabel} \ swapon \ sysctl \ @@ -103,6 +103,11 @@ _devd= devd _ipf= ipf .endif +.if ${MK_IPFW} != "no" +_ipfw= ipfw +_natd= natd +.endif + .if ${MK_PF} != "no" _pfctl= pfctl _pflogd= pflogd @@ -117,6 +122,18 @@ _rtsol= rtsol _bsdlabel= bsdlabel .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 diff --git a/share/Makefile b/share/Makefile index 5143ea8f9735..4a5f0c4a240b 100644 --- a/share/Makefile +++ b/share/Makefile @@ -12,20 +12,38 @@ SUBDIR= ${_colldef} \ ${_man} \ ${_me} \ misc \ - mk \ + ${_mk} \ ${_mklocale} \ ${_monetdef} \ ${_msgdef} \ ${_numericdef} \ ${_sendmail} \ skel \ - snmp \ + ${_snmp} \ ${_syscons} \ tabset \ termcap \ ${_timedef} \ ${_zoneinfo} +# NB: keep these sorted by MK_* knobs + +.if ${MK_BSNMP} != "no" +_snmp= snmp +.endif + +.if ${MK_DICT} != "no" +_dict= dict +.endif + +.if ${MK_EXAMPLES} != "no" +_examples= examples +.endif + +.if ${MK_GROFF} != "no" +_me= me +.endif + .if ${MK_LOCALES} != "no" _colldef = colldef _mklocale = mklocale @@ -35,26 +53,14 @@ _numericdef = numericdef _timedef = timedef .endif -.if ${MK_SYSCONS} != "no" -_syscons= syscons +.if ${MK_MAKE} != "no" +_mk= mk .endif .if ${MK_MAN} != "no" _man= man .endif -.if ${MK_GROFF} != "no" -_me= me -.endif - -.if ${MK_EXAMPLES} != "no" -_examples= examples -.endif - -.if ${MK_DICT} != "no" -_dict= dict -.endif - .if ${MK_SENDMAIL} != "no" _sendmail= sendmail .endif @@ -63,6 +69,10 @@ _sendmail= sendmail _doc= doc .endif +.if ${MK_SYSCONS} != "no" +_syscons= syscons +.endif + .if ${MK_ZONEINFO} != "no" _zoneinfo= zoneinfo .endif diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk index 6249084c76f4..5910a1322383 100644 --- a/share/mk/bsd.own.mk +++ b/share/mk/bsd.own.mk @@ -282,8 +282,12 @@ WITH_IDEA= # MK_* options which default to "yes". # .for var in \ + ACCT \ ACPI \ + AMD \ + APM \ ASSERT_DEBUG \ + AT \ ATM \ AUDIT \ AUTHPF \ @@ -297,18 +301,22 @@ WITH_IDEA= BLUETOOTH \ BOOT \ BSD_CPIO \ + BSNMP \ BZIP2 \ CALENDAR \ CDDL \ CPP \ CRYPT \ + CTM \ CVS \ CXX \ DICT \ DYNAMICROOT \ EXAMPLES \ + FLOPPY \ FORTH \ FP_LIBC \ + FREEBSD_UPDATE \ GAMES \ GCOV \ GDB \ @@ -321,40 +329,60 @@ WITH_IDEA= INFO \ INSTALLLIB \ IPFILTER \ + IPFW \ IPX \ + JAIL \ KERBEROS \ KVM \ + LEGACY_CONSOLE \ LIB32 \ LIBPTHREAD \ 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 \ ZFS \ ZONEINFO @@ -432,6 +460,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 @@ -441,6 +474,10 @@ MK_KERBEROS:= no MK_AUTHPF:= no .endif +.if ${MK_TEXTPROC} == "no" +MK_GROFF:= no +.endif + .if ${MK_TOOLCHAIN} == "no" MK_GDB:= no .endif @@ -460,7 +497,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 diff --git a/tools/build/options/WITHOUT_ACCT b/tools/build/options/WITHOUT_ACCT new file mode 100644 index 000000000000..537ee96b6269 --- /dev/null +++ b/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 . diff --git a/tools/build/options/WITHOUT_AMD b/tools/build/options/WITHOUT_AMD new file mode 100644 index 000000000000..473d03e890a0 --- /dev/null +++ b/tools/build/options/WITHOUT_AMD @@ -0,0 +1,4 @@ +.\" $FreeBSD$ +Set to not build +.Xr amd 8 , +and related programs. diff --git a/tools/build/options/WITHOUT_APM b/tools/build/options/WITHOUT_APM new file mode 100644 index 000000000000..6ed47d073756 --- /dev/null +++ b/tools/build/options/WITHOUT_APM @@ -0,0 +1,5 @@ +.\" $FreeBSD$ +Set to not build +.Xr apm 8 , +.Xr apmd 8 +and related programs. diff --git a/tools/build/options/WITHOUT_AT b/tools/build/options/WITHOUT_AT new file mode 100644 index 000000000000..45e552fcc9b1 --- /dev/null +++ b/tools/build/options/WITHOUT_AT @@ -0,0 +1,4 @@ +.\" $FreeBSD$ +Set to not build +.Xr at 1 +and related utilities. diff --git a/tools/build/options/WITHOUT_CTM b/tools/build/options/WITHOUT_CTM new file mode 100644 index 000000000000..e436d9133968 --- /dev/null +++ b/tools/build/options/WITHOUT_CTM @@ -0,0 +1,4 @@ +.\" $FreeBSD$ +Set to not build +.Xr ctm 1 +and related utilities. diff --git a/tools/build/options/WITHOUT_FREEBSD_UPDATE b/tools/build/options/WITHOUT_FREEBSD_UPDATE new file mode 100644 index 000000000000..72157543f27a --- /dev/null +++ b/tools/build/options/WITHOUT_FREEBSD_UPDATE @@ -0,0 +1,3 @@ +.\" $FreeBSD$ +Set to not build +.Xr freebsd-update 8 . diff --git a/tools/build/options/WITHOUT_IPFW b/tools/build/options/WITHOUT_IPFW new file mode 100644 index 000000000000..b6a06b23dfdb --- /dev/null +++ b/tools/build/options/WITHOUT_IPFW @@ -0,0 +1,2 @@ +.\" $FreeBSD$ +Set to not build IPFW tools. diff --git a/tools/build/options/WITHOUT_JAIL b/tools/build/options/WITHOUT_JAIL new file mode 100644 index 000000000000..27774e892ac0 --- /dev/null +++ b/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 . diff --git a/tools/build/options/WITHOUT_LEGACY_CONSOLE b/tools/build/options/WITHOUT_LEGACY_CONSOLE new file mode 100644 index 000000000000..85e8604fd3ec --- /dev/null +++ b/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 . diff --git a/tools/build/options/WITHOUT_LOCATE b/tools/build/options/WITHOUT_LOCATE new file mode 100644 index 000000000000..4acba8a5d28f --- /dev/null +++ b/tools/build/options/WITHOUT_LOCATE @@ -0,0 +1,4 @@ +.\" $FreeBSD$ +Set to not build +.Xr locate 1 +and related programs. diff --git a/tools/build/options/WITHOUT_MAIL b/tools/build/options/WITHOUT_MAIL new file mode 100644 index 000000000000..4d3a69d35568 --- /dev/null +++ b/tools/build/options/WITHOUT_MAIL @@ -0,0 +1,2 @@ +.\" $FreeBSD$ +Set to not build any mail support (MUA or MTA). diff --git a/tools/build/options/WITHOUT_MAKE b/tools/build/options/WITHOUT_MAKE new file mode 100644 index 000000000000..f4c11553d371 --- /dev/null +++ b/tools/build/options/WITHOUT_MAKE @@ -0,0 +1,4 @@ +.\" $FreeBSD$ +Set to not install +.Xr make 1 +and related support files. diff --git a/tools/build/options/WITHOUT_NDIS b/tools/build/options/WITHOUT_NDIS new file mode 100644 index 000000000000..f7bcdae04fce --- /dev/null +++ b/tools/build/options/WITHOUT_NDIS @@ -0,0 +1,3 @@ +.\" $FreeBSD$ +Set to not build programs and libraries +related to NDIS emulation support. diff --git a/tools/build/options/WITHOUT_NETGRAPH b/tools/build/options/WITHOUT_NETGRAPH new file mode 100644 index 000000000000..6ec804434d04 --- /dev/null +++ b/tools/build/options/WITHOUT_NETGRAPH @@ -0,0 +1,3 @@ +.\" $FreeBSD$ +Set to not build applications to support +.Xr netgraph 4 . diff --git a/tools/build/options/WITHOUT_NTP b/tools/build/options/WITHOUT_NTP new file mode 100644 index 000000000000..12ae1bed98a6 --- /dev/null +++ b/tools/build/options/WITHOUT_NTP @@ -0,0 +1,4 @@ +.\" $FreeBSD$ +Set to not build +.Xr ntpd 8 +and related programs. diff --git a/tools/build/options/WITHOUT_PKGTOOLS b/tools/build/options/WITHOUT_PKGTOOLS new file mode 100644 index 000000000000..a1c7c56964c2 --- /dev/null +++ b/tools/build/options/WITHOUT_PKGTOOLS @@ -0,0 +1,4 @@ +.\" $FreeBSD$ +Set to not build +.Xr pkg_add 8 +and related programs. diff --git a/tools/build/options/WITHOUT_PMC b/tools/build/options/WITHOUT_PMC new file mode 100644 index 000000000000..1aa501694998 --- /dev/null +++ b/tools/build/options/WITHOUT_PMC @@ -0,0 +1,4 @@ +.\" $FreeBSD$ +Set to not build +.Xr pmccontrol 8 +and related programs. diff --git a/tools/build/options/WITHOUT_PORTSNAP b/tools/build/options/WITHOUT_PORTSNAP new file mode 100644 index 000000000000..ce9c4703498a --- /dev/null +++ b/tools/build/options/WITHOUT_PORTSNAP @@ -0,0 +1,4 @@ +.\" $FreeBSD$ +Set to not build or install +.Xr portsnap 8 +and related files. diff --git a/tools/build/options/WITHOUT_PPP b/tools/build/options/WITHOUT_PPP new file mode 100644 index 000000000000..166d1a7fe0c3 --- /dev/null +++ b/tools/build/options/WITHOUT_PPP @@ -0,0 +1,4 @@ +.\" $FreeBSD$ +Set to not build +.Xr ppp 8 +and related programs. diff --git a/tools/build/options/WITHOUT_QUOTAS b/tools/build/options/WITHOUT_QUOTAS new file mode 100644 index 000000000000..9b2d4589db79 --- /dev/null +++ b/tools/build/options/WITHOUT_QUOTAS @@ -0,0 +1,4 @@ +.\" $FreeBSD$ +Set to not build +.Xr quota 8 +and related programs. diff --git a/tools/build/options/WITHOUT_ROUTED b/tools/build/options/WITHOUT_ROUTED new file mode 100644 index 000000000000..323e55c5b071 --- /dev/null +++ b/tools/build/options/WITHOUT_ROUTED @@ -0,0 +1,4 @@ +.\" $FreeBSD$ +Set to not build +.Xr routed 8 +utility. diff --git a/tools/build/options/WITHOUT_SLIP b/tools/build/options/WITHOUT_SLIP new file mode 100644 index 000000000000..a0f4cb2b6ebf --- /dev/null +++ b/tools/build/options/WITHOUT_SLIP @@ -0,0 +1,4 @@ +.\" $FreeBSD$ +Set to not build +.Xr sliplogin 8 +and related programs. diff --git a/tools/build/options/WITHOUT_SYSINSTALL b/tools/build/options/WITHOUT_SYSINSTALL new file mode 100644 index 000000000000..60426e379ae9 --- /dev/null +++ b/tools/build/options/WITHOUT_SYSINSTALL @@ -0,0 +1,4 @@ +.\" $FreeBSD$ +Set to not build +.Xr sysinstall 8 +and related programs. diff --git a/tools/build/options/WITHOUT_TELNET b/tools/build/options/WITHOUT_TELNET new file mode 100644 index 000000000000..353cc3143e38 --- /dev/null +++ b/tools/build/options/WITHOUT_TELNET @@ -0,0 +1,4 @@ +.\" $FreeBSD$ +Set to not build +.Xr telnet 8 +and related programs. diff --git a/tools/build/options/WITHOUT_TEXTPROC b/tools/build/options/WITHOUT_TEXTPROC new file mode 100644 index 000000000000..2f3e9722edfa --- /dev/null +++ b/tools/build/options/WITHOUT_TEXTPROC @@ -0,0 +1,3 @@ +.\" $FreeBSD$ +Set to not build +programs used for text processing. diff --git a/tools/build/options/WITHOUT_WIRELESS b/tools/build/options/WITHOUT_WIRELESS new file mode 100644 index 000000000000..5f0d4a86194f --- /dev/null +++ b/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 . diff --git a/usr.bin/Makefile b/usr.bin/Makefile index 7e947e963839..2abc3d4c4d3a 100644 --- a/usr.bin/Makefile +++ b/usr.bin/Makefile @@ -13,12 +13,12 @@ SUBDIR= alias \ apply \ ${_ar} \ asa \ - at \ + ${_at} \ ${_atm} \ awk \ banner \ basename \ - biff \ + ${_biff} \ ${_bluetooth} \ brandelf \ bsdiff \ @@ -30,24 +30,24 @@ SUBDIR= alias \ cap_mkdb \ ${_catman} \ chat \ - checknr \ + ${_checknr} \ ${_chkey} \ chpass \ cksum \ cmp \ col \ - colcrt \ + ${_colcrt} \ colldef \ colrm \ column \ comm \ - compile_et \ + ${_compile_et} \ compress \ ${_cpio} \ cpuset \ csplit \ ${_csup} \ - ctags \ + ${_ctags} \ cut \ ${_dig} \ dirname \ @@ -61,12 +61,12 @@ SUBDIR= alias \ false \ fetch \ file \ - file2c \ + ${_file2c} \ find \ finger \ - fmt \ + ${_fmt} \ fold \ - from \ + ${_from} \ fstat \ fsync \ ftp \ @@ -82,7 +82,7 @@ SUBDIR= alias \ hexdump \ ${_host} \ id \ - indent \ + ${_indent} \ ipcrm \ ipcs \ join \ @@ -104,7 +104,7 @@ SUBDIR= alias \ ${_lex} \ limits \ locale \ - locate \ + ${_locate} \ lock \ lockf \ logger \ @@ -115,8 +115,8 @@ SUBDIR= alias \ lorder \ lsvfs \ m4 \ - mail \ - make \ + ${_mail} \ + ${_make} \ makewhatis \ mesg \ minigzip \ @@ -124,10 +124,10 @@ SUBDIR= alias \ mkdep \ mkfifo \ mklocale \ - mkstr \ + ${_mkstr} \ mktemp \ mkuzip \ - msgs \ + ${_msgs} \ mt \ ${_nc} \ ncal \ @@ -153,19 +153,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 \ @@ -182,7 +182,7 @@ SUBDIR= alias \ tar \ tcopy \ tee \ - telnet \ + ${_telnet} \ tftp \ time \ tip \ @@ -196,10 +196,10 @@ SUBDIR= alias \ tset \ tsort \ tty \ - ul \ + ${_ul} \ uname \ unexpand \ - unifdef \ + ${_unifdef} \ uniq \ units \ unvis \ @@ -209,7 +209,7 @@ SUBDIR= alias \ uudecode \ uuencode \ ${_vacation} \ - vgrind \ + ${_vgrind} \ vi \ vis \ vmstat \ @@ -226,7 +226,7 @@ SUBDIR= alias \ xargs \ xinstall \ ${_xlint} \ - xstr \ + ${_xstr} \ ${_yacc} \ yes \ ${_ypcat} \ @@ -237,6 +237,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 @@ -264,6 +270,10 @@ _cpio= cpio _calendar= calendar .endif +.if ${MK_HESIOD} != "no" +_hesinfo= hesinfo +.endif + .if ${MK_OPENSSL} != "no" _chkey= chkey _newkey= newkey @@ -272,8 +282,21 @@ _csup= csup .endif .endif -.if ${MK_HESIOD} != "no" -_hesinfo= hesinfo +.if ${MK_LOCATE} != "no" +_locate= locate +.endif + +# XXX msgs? +.if ${MK_MAIL} != "no" +_biff= biff +_fmt= fmt +_from= from +_mail= mail +_msgs= msgs +.endif + +.if ${MK_MAKE} != "no" +_make= make .endif .if ${MK_NETCAT} != "no" @@ -286,22 +309,47 @@ _ypmatch= ypmatch _ypwhich= ypwhich .endif +.if ${MK_QUOTAS} != "no" +_quota= quota +.endif + .if ${MK_RCMDS} != "no" _rlogin= rlogin _rsh= rsh +_ruptime= ruptime +_rwho= rwho .endif .if ${MK_SENDMAIL} != "no" _vacation= vacation .endif +.if ${MK_TELNET} != "no" +_telnet= telnet +.endif + +.if ${MK_TEXTPROC} != "no" +_checknr= checknr +_colcrt= colcrt +_ul= ul +.endif + .if ${MK_TOOLCHAIN} != "no" -_ar= ar _c89= c89 _c99= c99 +_compile_et= compile_et +_ctags= ctags +_file2c= file2c _gprof= gprof +_indent= indent _lex= lex +_mkstr= mkstr +_rpcgen= rpcgen +_unifdef= unifdef _xlint= xlint +_xstr= xstr +# XXX maybe under textproc? +_vgrind= vgrind _yacc= yacc .endif diff --git a/usr.bin/netstat/Makefile b/usr.bin/netstat/Makefile index c7815567a57c..bb73c6703262 100644 --- a/usr.bin/netstat/Makefile +++ b/usr.bin/netstat/Makefile @@ -5,7 +5,7 @@ PROG= netstat SRCS= if.c inet.c main.c mbuf.c mcast.c mroute.c route.c \ - unix.c atalk.c netgraph.c mroute6.c ipsec.c bpf.c pfkey.c sctp.c + unix.c atalk.c mroute6.c ipsec.c bpf.c pfkey.c sctp.c WARNS?= 3 CFLAGS+=-fno-strict-aliasing @@ -20,8 +20,15 @@ CFLAGS+=-DINET6 BINGRP= kmem BINMODE=2555 -DPADD= ${LIBKVM} ${LIBMEMSTAT} ${LIBNETGRAPH} ${LIBUTIL} -LDADD= -lkvm -lmemstat -lnetgraph -lutil +DPADD= ${LIBKVM} ${LIBMEMSTAT} ${LIBUTIL} +LDADD= -lkvm -lmemstat -lutil + +.if ${MK_NETGRAPH_SUPPORT} != "no" +SRCS+= netgraph.c +DPADD+= ${LIBNETGRAPH} +LDADD+= -lnetgraph +CFLAGS+=-DNETGRAPH +.endif .if ${MK_IPX_SUPPORT} != "no" SRCS+= ipx.c diff --git a/usr.bin/netstat/main.c b/usr.bin/netstat/main.c index 3b130b271c07..1f2f0e141969 100644 --- a/usr.bin/netstat/main.c +++ b/usr.bin/netstat/main.c @@ -54,7 +54,9 @@ __FBSDID("$FreeBSD$"); #include +#ifdef NETGRAPH #include +#endif #include #include @@ -272,7 +274,7 @@ struct protox atalkprotox[] = { { -1, -1, 0, NULL, NULL, NULL, NULL, 0, 0 } }; - +#ifdef NETGRAPH struct protox netgraphprotox[] = { { N_NGSOCKS, -1, 1, netgraphprotopr, NULL, NULL, "ctrl", 0, 0 }, @@ -281,7 +283,7 @@ struct protox netgraphprotox[] = { { -1, -1, 0, NULL, NULL, NULL, NULL, 0, 0 } }; - +#endif #ifdef IPX struct protox ipxprotox[] = { { N_IPX, N_IPXSTAT, 1, ipxprotopr, @@ -384,9 +386,11 @@ main(int argc, char *argv[]) af = AF_UNIX; else if (strcmp(optarg, "atalk") == 0) af = AF_APPLETALK; +#ifdef NETGRAPH else if (strcmp(optarg, "ng") == 0 || strcmp(optarg, "netgraph") == 0) af = AF_NETGRAPH; +#endif else if (strcmp(optarg, "link") == 0) af = AF_LINK; else { @@ -584,9 +588,11 @@ main(int argc, char *argv[]) if (af == AF_APPLETALK || af == AF_UNSPEC) for (tp = atalkprotox; tp->pr_name; tp++) printproto(tp, tp->pr_name); +#ifdef NETGRAPH if (af == AF_NETGRAPH || af == AF_UNSPEC) for (tp = netgraphprotox; tp->pr_name; tp++) printproto(tp, tp->pr_name); +#endif /* NETGRAPH */ if ((af == AF_UNIX || af == AF_UNSPEC) && !Lflag && !sflag) unixpr(nl[N_UNP_COUNT].n_value, nl[N_UNP_GENCNT].n_value, nl[N_UNP_DHEAD].n_value, nl[N_UNP_SHEAD].n_value); diff --git a/usr.bin/netstat/netstat.h b/usr.bin/netstat/netstat.h index 0b7f439fb6a5..3812e6333f24 100644 --- a/usr.bin/netstat/netstat.h +++ b/usr.bin/netstat/netstat.h @@ -145,7 +145,9 @@ void nserr_stats(u_long, const char *, int, int); void atalkprotopr(u_long, const char *, int, int); void ddp_stats(u_long, const char *, int, int); +#ifdef NETGRAPH void netgraphprotopr(u_long, const char *, int, int); +#endif void unixpr(u_long, u_long, u_long, u_long); diff --git a/usr.sbin/Makefile b/usr.sbin/Makefile index 011d9bed9f98..ffce4bac6065 100644 --- a/usr.sbin/Makefile +++ b/usr.sbin/Makefile @@ -4,12 +4,12 @@ .include # XXX MISSING: mkproto -SUBDIR= ac \ - accton \ +SUBDIR= ${_ac} \ + ${_accton} \ ${_acpi} \ adduser \ - amd \ - ancontrol \ + ${_amd} \ + ${_ancontrol} \ ${_apm} \ ${_apmd} \ arp \ @@ -23,7 +23,7 @@ SUBDIR= ac \ ${_boot0cfg} \ ${_boot98cfg} \ bootparamd \ - bsnmpd \ + ${_bsnmpd} \ ${_btxld} \ burncd \ cdcontrol \ @@ -32,12 +32,12 @@ SUBDIR= ac \ chroot \ ckdist \ clear_locks \ - config \ + ${_config} \ ${_cpucontrol} \ crashinfo \ cron \ - crunch \ - ctm \ + ${_crunch} \ + ${_ctm} \ daemon \ dconschat \ devinfo \ @@ -46,18 +46,18 @@ SUBDIR= ac \ ${_dnssec-keygen} \ ${_dnssec-signzone} \ ${_editmap} \ - edquota \ + ${_edquota} \ ${_eeprom} \ extattr \ extattrctl \ ${_faithd} \ - fdcontrol \ - fdformat \ - fdread \ - fdwrite \ + ${_fdcontrol} \ + ${_fdformat} \ + ${_fdread} \ + ${_fdwrite} \ fifolog \ - flowctl \ - freebsd-update \ + ${_flowctl} \ + ${_freebsd-update} \ ${_ftp-proxy} \ fwcontrol \ getfmac \ @@ -67,19 +67,19 @@ SUBDIR= ac \ inetd \ iostat \ ${_ip6addrctl} \ - ipfwpcap \ + ${_ipfwpcap} \ ${_IPXrouted} \ - jail \ - jexec \ - jls \ - kbdcontrol \ - kbdmap \ + ${_jail} \ + ${_jexec} \ + ${_jls} \ + ${_kbdcontrol} \ + ${_kbdmap} \ ${_keyserv} \ ${_kgmon} \ ${_kgzip} \ kldxref \ lastlogin \ - lmcconfig \ + ${_lmcconfig} \ ${_lpr} \ ${_lptcontrol} \ ${_mailstats} \ @@ -95,7 +95,7 @@ SUBDIR= ac \ ${_mount_nwfs} \ mount_portalfs \ ${_mount_smbfs} \ - moused \ + ${_moused} \ ${_mptable} \ mtest \ mtree \ @@ -107,26 +107,26 @@ SUBDIR= ac \ ${_ndp} \ newsyslog \ nfsd \ - ngctl \ - nghook \ + ${_ngctl} \ + ${_nghook} \ nologin \ ${_nscd} \ - ntp \ + ${_ntp} \ ${_nvram} \ ${_ofwdump} \ pccard \ pciconf \ periodic \ - pkg_install \ - pmccontrol \ - pmcstat \ + ${_pkg_install} \ + ${_pmccontrol} \ + ${_pmcstat} \ ${_pnpinfo} \ - portsnap \ + ${_portsnap} \ powerd \ - ppp \ + ${_ppp} \ ${_pppctl} \ - pppd \ - pppstats \ + ${_pppd} \ + ${_pppstats} \ ${_praliases} \ ${_praudit} \ procctl \ @@ -134,10 +134,10 @@ SUBDIR= ac \ pw \ pwd_mkdb \ quot \ - quotaon \ + ${_quotaon} \ rarpd \ - raycontrol \ - repquota \ + ${_raycontrol} \ + ${_repquota} \ ${_rip6query} \ rmt \ ${_rndc} \ @@ -154,16 +154,16 @@ SUBDIR= ac \ ${_rtadvd} \ rtprio \ ${_rtsold} \ - rwhod \ - sa \ + ${_rwhod} \ + ${_sa} \ ${_sade} \ ${_sendmail} \ setfib \ setfmac \ setpmac \ ${_sicontrol} \ - sliplogin \ - slstat \ + ${_sliplogin} \ + ${_slstat} \ smbmsg \ snapinfo \ ${_spkrtest} \ @@ -181,13 +181,13 @@ SUBDIR= ac \ tzsetup \ ugidfw \ ${_usbdevs} \ - vidcontrol \ + ${_vidcontrol} \ vipw \ watch \ watchdogd \ - wlandebug \ + ${_wlandebug} \ ${_wlconfig} \ - wpa \ + ${_wpa} \ ${_ypbind} \ ${_yp_mkdb} \ ${_yppoll} \ @@ -197,8 +197,16 @@ SUBDIR= ac \ zic \ ${_zzz} -.if ${MACHINE_ARCH} != "arm" && ${MACHINE_ARCH} != "mips" -_sysinstall= sysinstall +# NB: keep these sorted by MK_* knobs + +.if ${MK_ACCT} != "no" +_ac= ac +_accton= accton +_sa= sa +.endif + +.if ${MK_AMD} != "no" +_amd= amd .endif .if ${MK_AUDIT} != "no" @@ -208,6 +216,10 @@ _auditreduce= auditreduce _praudit= praudit .endif +.if ${MK_AUTHPF} != "no" +_authpf= authpf +.endif + .if ${MK_BIND_DNSSEC} != "no" && ${MK_OPENSSL} != "no" _dnssec-keygen= dnssec-keygen _dnssec-signzone= dnssec-signzone @@ -225,12 +237,23 @@ _rndc-confgen= rndc-confgen _bluetooth= bluetooth .endif -.if ${MK_OPENSSL} != "no" -_keyserv= keyserv +.if ${MK_BSNMP} != "no" +_bsnmpd= bsnmpd .endif -.if ${MK_PF} != "no" -_ftp-proxy= ftp-proxy +.if ${MK_CTM} != "no" +_ctm= ctm +.endif + +.if ${MK_FLOPPY} != "no" +_fdcontrol= fdcontrol +_fdformat= fdformat +_fdread= fdread +_fdwrite= fdwrite +.endif + +.if ${MK_FREEBSD_UPDATE} != "no" +_freebsd-update= freebsd-update .endif .if ${MK_INET6} != "no" @@ -246,10 +269,49 @@ _rtsold= rtsold _traceroute6= traceroute6 .endif +.if ${MK_IPFW} != "no" +_ipfwpcap= ipfwpcap +.endif + .if ${MK_IPX} != "no" _IPXrouted= IPXrouted .endif +.if ${MK_JAIL} != "no" +_jail= jail +_jexect= jexec +_jls= jls +.endif + +# XXX MK_SYSCONS +# XXX is moused w/ usb useful? +.if ${MK_LEGACY_CONSOLE} != "no" +_kbdcontrol= kbdcontrol +_kbdmap= kbdmap +_moused= moused +_vidcontrol= vidcontrol +.endif + +.if ${MK_LIBTHR} != "no" || ${MK_LIBKSE} != "no" +.if ${MK_PPP} != "no" +_pppctl= pppctl +.endif +.if ${MK_NS_CACHING} != "no" +_nscd= nscd +.endif +.endif + +.if ${MK_LPR} != "no" +_lpr= lpr +.endif + +.if ${MK_NETGRAPH} != "no" +_flowctl= flowctl +_lmcconfig= lmcconfig +_ngctl= ngctl +_nghook= nghook +.endif + .if ${MK_NIS} != "no" _rpc.yppasswdd= rpc.yppasswdd _rpc.ypupdated= rpc.ypupdated @@ -262,22 +324,47 @@ _ypserv= ypserv _ypset= ypset .endif -.if ${MK_AUTHPF} != "no" -_authpf= authpf +.if ${MK_NTP} != "no" +_ntp= ntp .endif -.if ${MK_LIBTHR} != "no" -_pppctl= pppctl +.if ${MK_OPENSSL} != "no" +_keyserv= keyserv .endif -.if ${MK_LPR} != "no" -_lpr= lpr +.if ${MK_PF} != "no" +_ftp-proxy= ftp-proxy .endif -.if ${MK_NS_CACHING} != "no" -.if ${MK_LIBTHR} != "no" -_nscd= nscd +.if ${MK_PKGTOOLS} != "no" +_pkg_install= pkg_install .endif + +# XXX MK_TOOLCHAIN? +.if ${MK_PMC} != "no" +_pmccontrol= pmccontrol +_pmcstat= pmcstat +.endif + +.if ${MK_PORTSNAP} != "no" +_portsnap= portsnap +.endif + +.if ${MK_PPP} != "no" +_ppp = ppp +#_pppctl handled below +_pppd = pppd +_pppstats = pppstats +.endif + +.if ${MK_QUOTAS} != "no" +_edquota= edquota +_quotaon= quotaon +_repquota= repquota +.endif + +.if ${MK_RCMDS} != "no" +_rwhod= rwhod .endif .if ${MK_SENDMAIL} != "no" @@ -288,19 +375,47 @@ _praliases= praliases _sendmail= sendmail .endif +.if ${MK_SLIP} != "no" +_sliplogin = sliplogin +_slstats = slstats +.endif + +.if ${MK_SYSINSTALL} != "no" +_sade= sade +.if ${MACHINE_ARCH} != "arm" && ${MACHINE_ARCH} != "mips" +_sysinstall= sysinstall +.endif +.endif + +.if ${MK_TOOLCHAIN} != "no" +_config= config +_crunch= crunch +.endif + .if ${MK_USB} != "no" _usbdevs= usbdevs .endif +.if ${MK_WIRELESS} != "no" +_ancontrol= ancontrol +_raycontrol= raycontrol +_wlandebug= wlandebug +_wpa= wpa +.endif + .if ${MACHINE_ARCH} == "arm" _kgmon= kgmon .endif .if ${MACHINE_ARCH} == "i386" +.if ${MK_APM} != "no" _apm= apm _apmd= apmd +.endif _asf= asf +.if ${MK_TOOLCHAIN} != "no" _btxld= btxld +.endif _cpucontrol= cpucontrol _kgmon= kgmon _kgzip= kgzip @@ -310,9 +425,10 @@ _mount_nwfs= mount_nwfs .endif _mount_smbfs= mount_smbfs _mptable= mptable +.if ${MK_NDIS} != "no" _ndiscvt= ndiscvt +.endif _pnpinfo= pnpinfo -_sade= sade _sicontrol= sicontrol _spkrtest= spkrtest _zzz= zzz @@ -321,7 +437,9 @@ _zzz= zzz _acpi= acpi .endif _boot0cfg= boot0cfg +.if ${MK_WIRELESS} != "no" _wlconfig= wlconfig +.endif .elif ${MACHINE} == "pc98" _boot98cfg= boot98cfg .endif @@ -336,7 +454,9 @@ _acpi= acpi .endif _asf= asf _boot0cfg= boot0cfg +.if ${MK_TOOLCHAIN} != "no" _btxld= btxld +.endif _cpucontrol= cpucontrol _kgmon= kgmon _lptcontrol= lptcontrol @@ -345,8 +465,9 @@ _mount_nwfs= mount_nwfs .endif _mount_smbfs= mount_smbfs _mptable= mptable +.if ${MK_NDIS} != "no" _ndiscvt= ndiscvt -_sade= sade +.endif _sicontrol= sicontrol _spkrtest= spkrtest _zzz= zzz @@ -370,7 +491,6 @@ _ofwdump= ofwdump .if ${MACHINE_ARCH} == "sparc64" _eeprom= eeprom _ofwdump= ofwdump -_sade= sade .endif .include