add new build knobs and jigger some existing controls to improve
control over the result of buildworld and installworld; this especially helps packaging systems such as nanobsd Reviewed by: various (posted to arch) MFC after: 1 month
This commit is contained in:
parent
89ba9c24ee
commit
9c3d2ffcdf
69
etc/Makefile
69
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 \
|
||||
|
@ -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>
|
||||
|
@ -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>
|
||||
|
@ -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>
|
||||
|
@ -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>
|
||||
|
@ -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 <bsd.subdir.mk>
|
||||
|
70
lib/Makefile
70
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 <bsd.subdir.mk>
|
||||
|
@ -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} \
|
||||
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 <bsd.subdir.mk>
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
5
tools/build/options/WITHOUT_ACCT
Normal file
5
tools/build/options/WITHOUT_ACCT
Normal file
@ -0,0 +1,5 @@
|
||||
.\" $FreeBSD$
|
||||
Set to not build process accounting tools such as
|
||||
.Xr ac 8
|
||||
and
|
||||
.Xr accton 8 .
|
4
tools/build/options/WITHOUT_AMD
Normal file
4
tools/build/options/WITHOUT_AMD
Normal file
@ -0,0 +1,4 @@
|
||||
.\" $FreeBSD$
|
||||
Set to not build
|
||||
.Xr amd 8 ,
|
||||
and related programs.
|
5
tools/build/options/WITHOUT_APM
Normal file
5
tools/build/options/WITHOUT_APM
Normal file
@ -0,0 +1,5 @@
|
||||
.\" $FreeBSD$
|
||||
Set to not build
|
||||
.Xr apm 8 ,
|
||||
.Xr apmd 8
|
||||
and related programs.
|
4
tools/build/options/WITHOUT_AT
Normal file
4
tools/build/options/WITHOUT_AT
Normal file
@ -0,0 +1,4 @@
|
||||
.\" $FreeBSD$
|
||||
Set to not build
|
||||
.Xr at 1
|
||||
and related utilities.
|
4
tools/build/options/WITHOUT_CTM
Normal file
4
tools/build/options/WITHOUT_CTM
Normal file
@ -0,0 +1,4 @@
|
||||
.\" $FreeBSD$
|
||||
Set to not build
|
||||
.Xr ctm 1
|
||||
and related utilities.
|
3
tools/build/options/WITHOUT_FREEBSD_UPDATE
Normal file
3
tools/build/options/WITHOUT_FREEBSD_UPDATE
Normal file
@ -0,0 +1,3 @@
|
||||
.\" $FreeBSD$
|
||||
Set to not build
|
||||
.Xr freebsd-update 8 .
|
2
tools/build/options/WITHOUT_IPFW
Normal file
2
tools/build/options/WITHOUT_IPFW
Normal file
@ -0,0 +1,2 @@
|
||||
.\" $FreeBSD$
|
||||
Set to not build IPFW tools.
|
3
tools/build/options/WITHOUT_JAIL
Normal file
3
tools/build/options/WITHOUT_JAIL
Normal file
@ -0,0 +1,3 @@
|
||||
.\" $FreeBSD$
|
||||
Set to not build tools for the support of jails; e.g.
|
||||
.Xr jail 8 .
|
5
tools/build/options/WITHOUT_LEGACY_CONSOLE
Normal file
5
tools/build/options/WITHOUT_LEGACY_CONSOLE
Normal file
@ -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 .
|
4
tools/build/options/WITHOUT_LOCATE
Normal file
4
tools/build/options/WITHOUT_LOCATE
Normal file
@ -0,0 +1,4 @@
|
||||
.\" $FreeBSD$
|
||||
Set to not build
|
||||
.Xr locate 1
|
||||
and related programs.
|
2
tools/build/options/WITHOUT_MAIL
Normal file
2
tools/build/options/WITHOUT_MAIL
Normal file
@ -0,0 +1,2 @@
|
||||
.\" $FreeBSD$
|
||||
Set to not build any mail support (MUA or MTA).
|
4
tools/build/options/WITHOUT_MAKE
Normal file
4
tools/build/options/WITHOUT_MAKE
Normal file
@ -0,0 +1,4 @@
|
||||
.\" $FreeBSD$
|
||||
Set to not install
|
||||
.Xr make 1
|
||||
and related support files.
|
3
tools/build/options/WITHOUT_NDIS
Normal file
3
tools/build/options/WITHOUT_NDIS
Normal file
@ -0,0 +1,3 @@
|
||||
.\" $FreeBSD$
|
||||
Set to not build programs and libraries
|
||||
related to NDIS emulation support.
|
3
tools/build/options/WITHOUT_NETGRAPH
Normal file
3
tools/build/options/WITHOUT_NETGRAPH
Normal file
@ -0,0 +1,3 @@
|
||||
.\" $FreeBSD$
|
||||
Set to not build applications to support
|
||||
.Xr netgraph 4 .
|
4
tools/build/options/WITHOUT_NTP
Normal file
4
tools/build/options/WITHOUT_NTP
Normal file
@ -0,0 +1,4 @@
|
||||
.\" $FreeBSD$
|
||||
Set to not build
|
||||
.Xr ntpd 8
|
||||
and related programs.
|
4
tools/build/options/WITHOUT_PKGTOOLS
Normal file
4
tools/build/options/WITHOUT_PKGTOOLS
Normal file
@ -0,0 +1,4 @@
|
||||
.\" $FreeBSD$
|
||||
Set to not build
|
||||
.Xr pkg_add 8
|
||||
and related programs.
|
4
tools/build/options/WITHOUT_PMC
Normal file
4
tools/build/options/WITHOUT_PMC
Normal file
@ -0,0 +1,4 @@
|
||||
.\" $FreeBSD$
|
||||
Set to not build
|
||||
.Xr pmccontrol 8
|
||||
and related programs.
|
4
tools/build/options/WITHOUT_PORTSNAP
Normal file
4
tools/build/options/WITHOUT_PORTSNAP
Normal file
@ -0,0 +1,4 @@
|
||||
.\" $FreeBSD$
|
||||
Set to not build or install
|
||||
.Xr portsnap 8
|
||||
and related files.
|
4
tools/build/options/WITHOUT_PPP
Normal file
4
tools/build/options/WITHOUT_PPP
Normal file
@ -0,0 +1,4 @@
|
||||
.\" $FreeBSD$
|
||||
Set to not build
|
||||
.Xr ppp 8
|
||||
and related programs.
|
4
tools/build/options/WITHOUT_QUOTAS
Normal file
4
tools/build/options/WITHOUT_QUOTAS
Normal file
@ -0,0 +1,4 @@
|
||||
.\" $FreeBSD$
|
||||
Set to not build
|
||||
.Xr quota 8
|
||||
and related programs.
|
4
tools/build/options/WITHOUT_ROUTED
Normal file
4
tools/build/options/WITHOUT_ROUTED
Normal file
@ -0,0 +1,4 @@
|
||||
.\" $FreeBSD$
|
||||
Set to not build
|
||||
.Xr routed 8
|
||||
utility.
|
4
tools/build/options/WITHOUT_SLIP
Normal file
4
tools/build/options/WITHOUT_SLIP
Normal file
@ -0,0 +1,4 @@
|
||||
.\" $FreeBSD$
|
||||
Set to not build
|
||||
.Xr sliplogin 8
|
||||
and related programs.
|
4
tools/build/options/WITHOUT_SYSINSTALL
Normal file
4
tools/build/options/WITHOUT_SYSINSTALL
Normal file
@ -0,0 +1,4 @@
|
||||
.\" $FreeBSD$
|
||||
Set to not build
|
||||
.Xr sysinstall 8
|
||||
and related programs.
|
4
tools/build/options/WITHOUT_TELNET
Normal file
4
tools/build/options/WITHOUT_TELNET
Normal file
@ -0,0 +1,4 @@
|
||||
.\" $FreeBSD$
|
||||
Set to not build
|
||||
.Xr telnet 8
|
||||
and related programs.
|
3
tools/build/options/WITHOUT_TEXTPROC
Normal file
3
tools/build/options/WITHOUT_TEXTPROC
Normal file
@ -0,0 +1,3 @@
|
||||
.\" $FreeBSD$
|
||||
Set to not build
|
||||
programs used for text processing.
|
5
tools/build/options/WITHOUT_WIRELESS
Normal file
5
tools/build/options/WITHOUT_WIRELESS
Normal file
@ -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 .
|
102
usr.bin/Makefile
102
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
|
||||
|
||||
|
@ -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
|
||||
|
@ -54,7 +54,9 @@ __FBSDID("$FreeBSD$");
|
||||
|
||||
#include <netinet/in.h>
|
||||
|
||||
#ifdef NETGRAPH
|
||||
#include <netgraph/ng_socket.h>
|
||||
#endif
|
||||
|
||||
#include <ctype.h>
|
||||
#include <err.h>
|
||||
@ -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);
|
||||
|
@ -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);
|
||||
|
||||
|
@ -4,12 +4,12 @@
|
||||
.include <bsd.own.mk>
|
||||
|
||||
# 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 <bsd.subdir.mk>
|
||||
|
Loading…
Reference in New Issue
Block a user