Better honor the following MK_ flags in etc/Makefile and etc/rc.d/Makefile:
- MK_AMD - MK_ATM - MK_AUDIT - MK_BOOT - MK_GSSAPI - MK_JAIL - MK_LPR - MK_SENDMAIL - MK_VI - MK_WIRELESS - MK_ZFS
This commit is contained in:
Enji Cooper
parent
53ffd84c4d
commit
e052c69ab2
@ -41,7 +41,6 @@ BIN1= crontab \
|
||||
rc.bsdextended \
|
||||
rc.firewall \
|
||||
rc.initdiskless \
|
||||
rc.sendmail \
|
||||
rc.shutdown \
|
||||
rc.subr \
|
||||
remote \
|
||||
@ -141,6 +140,10 @@ BIN1+= portsnap.conf
|
||||
BIN1+= pf.os
|
||||
.endif
|
||||
|
||||
.if ${MK_SENDMAIL} != "no"
|
||||
BIN1+= rc.sendmail
|
||||
.endif
|
||||
|
||||
.if ${MK_TCSH} != "no"
|
||||
BIN1+= csh.cshrc csh.login csh.logout
|
||||
.endif
|
||||
|
||||
@ -12,11 +12,6 @@ FILES= DAEMON \
|
||||
adjkerntz \
|
||||
amd \
|
||||
archdep \
|
||||
atm1 \
|
||||
atm2 \
|
||||
atm3 \
|
||||
auditd \
|
||||
auditdistd \
|
||||
bgfsck \
|
||||
${_bluetooth} \
|
||||
bridge \
|
||||
@ -39,11 +34,8 @@ FILES= DAEMON \
|
||||
gbde \
|
||||
geli \
|
||||
geli2 \
|
||||
gptboot \
|
||||
growfs \
|
||||
gssd \
|
||||
${_hcsecd} \
|
||||
hostapd \
|
||||
hostid \
|
||||
hostid_save \
|
||||
hostname \
|
||||
@ -54,10 +46,7 @@ FILES= DAEMON \
|
||||
ipfw \
|
||||
ipmon \
|
||||
ipnat \
|
||||
ipropd_master \
|
||||
ipropd_slave \
|
||||
ipsec \
|
||||
jail \
|
||||
${_kadmind} \
|
||||
${_kdc} \
|
||||
${_kfd} \
|
||||
@ -68,7 +57,6 @@ FILES= DAEMON \
|
||||
local \
|
||||
localpkg \
|
||||
lockd \
|
||||
lpd \
|
||||
mixer \
|
||||
motd \
|
||||
mountcritlocal \
|
||||
@ -92,8 +80,6 @@ FILES= DAEMON \
|
||||
nisdomain \
|
||||
${_nscd} \
|
||||
nsswitch \
|
||||
ntpd \
|
||||
ntpdate \
|
||||
${_opensm} \
|
||||
${_othermta} \
|
||||
pf \
|
||||
@ -120,7 +106,6 @@ FILES= DAEMON \
|
||||
savecore \
|
||||
sdpd \
|
||||
securelevel \
|
||||
sendmail \
|
||||
serial \
|
||||
sppp \
|
||||
${_sshd} \
|
||||
@ -138,27 +123,38 @@ FILES= DAEMON \
|
||||
${_unbound} \
|
||||
${_utx} \
|
||||
var \
|
||||
virecover \
|
||||
watchdogd \
|
||||
wpa_supplicant \
|
||||
ypbind \
|
||||
yppasswdd \
|
||||
ypserv \
|
||||
ypset \
|
||||
ypupdated \
|
||||
ypxfrd \
|
||||
zfs \
|
||||
zvol
|
||||
|
||||
.if ${MK_ACCT} != "no"
|
||||
FILES+= accounting
|
||||
.endif
|
||||
|
||||
.if ${MK_AMD} != "no"
|
||||
FILES+= amd
|
||||
.endif
|
||||
|
||||
.if ${MK_APM} != "no"
|
||||
FILES+= apm
|
||||
FILES+= apmd
|
||||
.endif
|
||||
|
||||
.if ${MK_ATM} != "no"
|
||||
FILES+= atm1
|
||||
FILES+= atm2
|
||||
FILES+= atm3
|
||||
.endif
|
||||
|
||||
.if ${MK_AUDIT} != "no"
|
||||
FILES+= auditd
|
||||
FILES+= auditdistd
|
||||
.endif
|
||||
|
||||
.if ${MK_AUTOFS} != "no"
|
||||
FILES+= automount
|
||||
FILES+= automountd
|
||||
@ -172,6 +168,10 @@ _hcsecd= hcsecd
|
||||
_ubthidhci= ubthidhci
|
||||
.endif
|
||||
|
||||
.if ${MK_BOOT} != "no"
|
||||
FILES+= gptboot
|
||||
.endif
|
||||
|
||||
.if ${MK_BOOTPARAMD} != "no"
|
||||
FILES+= bootparams
|
||||
.endif
|
||||
@ -188,6 +188,10 @@ _casperd= casperd
|
||||
FILES+= ftpd
|
||||
.endif
|
||||
|
||||
.if ${MK_GSSAPI} != "no"
|
||||
FILES+= gssd
|
||||
.endif
|
||||
|
||||
.if ${MK_HAST} != "no"
|
||||
FILES+= hastd
|
||||
.endif
|
||||
@ -201,16 +205,26 @@ FILES+= iscsictl
|
||||
FILES+= iscsid
|
||||
.endif
|
||||
|
||||
.if ${MK_JAIL} != "no"
|
||||
FILES+= jail
|
||||
.endif
|
||||
|
||||
.if ${MK_LEGACY_CONSOLE} != "no"
|
||||
FILES+= moused
|
||||
FILES+= syscons
|
||||
.endif
|
||||
|
||||
.if ${MK_LPR} != "no"
|
||||
FILES+= lpd
|
||||
.endif
|
||||
|
||||
.if ${MK_NS_CACHING} != "no"
|
||||
_nscd= nscd
|
||||
.endif
|
||||
|
||||
.if ${MK_KERBEROS} != "no"
|
||||
FILES+= ipropd_master
|
||||
FILES+= ipropd_slave
|
||||
_kadmind= kadmind
|
||||
_kdc= kdc
|
||||
_kfd= kfd
|
||||
@ -241,6 +255,10 @@ FILES+= ftp-proxy
|
||||
FILES+= rwho
|
||||
.endif
|
||||
|
||||
.if ${MK_SENDMAIL} != "no"
|
||||
FILES+= sendmail
|
||||
.endif
|
||||
|
||||
.if ${MK_TIMED} != "no"
|
||||
FILES+= timed
|
||||
.endif
|
||||
@ -253,6 +271,20 @@ _unbound= local_unbound
|
||||
_utx= utx
|
||||
.endif
|
||||
|
||||
.if ${MK_VI} != "no"
|
||||
FILES+= virecover
|
||||
.endif
|
||||
|
||||
.if ${MK_WIRELESS} != "no"
|
||||
FILES+= hostapd
|
||||
FILES+= wpa_supplicant
|
||||
.endif
|
||||
|
||||
.if ${MK_ZFS} != "no"
|
||||
FILES+= zfs
|
||||
FILES+= zvol
|
||||
.endif
|
||||
|
||||
FILESDIR= /etc/rc.d
|
||||
FILESMODE= ${BINMODE}
|
||||
|
||||
|
||||
@ -27,6 +27,7 @@ OLD_FILES+=usr/share/man/man8/iasl.8.gz
|
||||
|
||||
.if ${MK_AMD} == no
|
||||
OLD_FILES+=etc/amd.map
|
||||
OLD_FILES+=etc/rc.d/amd
|
||||
OLD_FILES+=usr/bin/pawd
|
||||
OLD_FILES+=usr/sbin/amd
|
||||
OLD_FILES+=usr/sbin/amq
|
||||
@ -77,6 +78,9 @@ OLD_FILES+=usr/share/man/man8/atrun.8.gz
|
||||
.endif
|
||||
|
||||
.if ${MK_ATM} == no
|
||||
OLD_FILES+=etc/rc.d/atm1
|
||||
OLD_FILES+=etc/rc.d/atm2
|
||||
OLD_FILES+=etc/rc.d/atm3
|
||||
OLD_FILES+=rescue/atmconfig
|
||||
OLD_FILES+=sbin/atmconfig
|
||||
OLD_FILES+=usr/bin/sscop
|
||||
@ -135,6 +139,8 @@ OLD_FILES+=usr/share/snmp/mibs/BEGEMOT-ATM.txt
|
||||
.endif
|
||||
|
||||
.if ${MK_AUDIT} == no
|
||||
OLD_FILES+=etc/rc.d/auditd
|
||||
OLD_FILES+=etc/rc.d/auditdistd
|
||||
OLD_FILES+=usr/sbin/audit
|
||||
OLD_FILES+=usr/sbin/auditd
|
||||
OLD_FILES+=usr/sbin/auditreduce
|
||||
@ -344,6 +350,7 @@ OLD_FILES+=boot/userboot.so
|
||||
OLD_FILES+=boot/version.4th
|
||||
OLD_FILES+=boot/zfsboot
|
||||
OLD_FILES+=boot/zfsloader
|
||||
OLD_FILES+=etc/rc.d/gptboot
|
||||
OLD_FILES+=usr/lib/kgzldr.o
|
||||
OLD_FILES+=usr/share/man/man5/loader.conf.5.gz
|
||||
OLD_FILES+=usr/share/man/man8/beastie.4th.8.gz
|
||||
@ -891,6 +898,8 @@ OLD_FILES+=boot/zfsloader
|
||||
OLD_FILES+=etc/devd/zfs.conf
|
||||
OLD_FILES+=etc/periodic/daily/404.status-zfs
|
||||
OLD_FILES+=etc/periodic/daily/800.scrub-zfs
|
||||
OLD_FILES+=etc/rc.d/zfs
|
||||
OLD_FILES+=etc/rc.d/zvol
|
||||
OLD_LIBS+=lib/libzfs.so.2
|
||||
OLD_LIBS+=lib/libzfs_core.so.2
|
||||
OLD_LIBS+=lib/libzpool.so.2
|
||||
@ -2355,6 +2364,7 @@ OLD_DIRS+=usr/share/tmac
|
||||
.endif
|
||||
|
||||
.if ${MK_GSSAPI} == no
|
||||
OLD_FILES+=etc/rc.d/gssd
|
||||
OLD_FILES+=usr/include/gssapi/gssapi.h
|
||||
OLD_DIRS+=usr/include/gssapi
|
||||
OLD_FILES+=usr/include/gssapi.h
|
||||
@ -2664,6 +2674,7 @@ OLD_FILES+=usr/share/man/man8/iscsid.8.gz
|
||||
.endif
|
||||
|
||||
.if ${MK_JAIL} == no
|
||||
OLD_FILES+=etc/rc.d/jail
|
||||
OLD_FILES+=usr/sbin/jail
|
||||
OLD_FILES+=usr/sbin/jexec
|
||||
OLD_FILES+=usr/sbin/jls
|
||||
@ -2673,6 +2684,8 @@ OLD_FILES+=usr/share/man/man8/jls.8.gz
|
||||
.endif
|
||||
|
||||
.if ${MK_KERBEROS} == no
|
||||
OLD_FILES+=etc/rc.d/ipropd_master
|
||||
OLD_FILES+=etc/rc.d/ipropd_slave
|
||||
OLD_FILES+=usr/bin/compile_et
|
||||
OLD_FILES+=usr/bin/hxtool
|
||||
OLD_FILES+=usr/bin/kadmin
|
||||
@ -3830,6 +3843,7 @@ OLD_FILES+=usr/share/man/man8/updatedb.8.gz
|
||||
.if ${MK_LPR} == no
|
||||
OLD_FILES+=etc/hosts.lpd
|
||||
OLD_FILES+=etc/printcap
|
||||
OLD_FILES+=etc/rc.d/lpd
|
||||
OLD_FILES+=usr/bin/lp
|
||||
OLD_FILES+=usr/bin/lpq
|
||||
OLD_FILES+=usr/bin/lpr
|
||||
@ -4596,6 +4610,8 @@ OLD_FILES+=etc/periodic/daily/150.clean-hoststat
|
||||
OLD_FILES+=etc/periodic/daily/440.status-mailq
|
||||
OLD_FILES+=etc/periodic/daily/460.status-mail-rejects
|
||||
OLD_FILES+=etc/periodic/daily/500.queuerun
|
||||
OLD_FILES+=etc/rc.sendmail
|
||||
OLD_FILES+=etc/rc.d/sendmail
|
||||
.if ${MK_MAILWRAPPER} == no
|
||||
OLD_FILES+=bin/rmail
|
||||
.endif
|
||||
@ -6065,6 +6081,7 @@ OLD_FILES+=usr/share/man/man8/utx.8.gz
|
||||
.endif
|
||||
|
||||
.if ${MK_VI} == no
|
||||
OLD_FILES+=etc/rc.d/virecover
|
||||
OLD_FILES+=usr/bin/ex
|
||||
OLD_FILES+=usr/bin/nex
|
||||
OLD_FILES+=usr/bin/nvi
|
||||
|
||||
Loading…
Reference in New Issue
Block a user