diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile index b7747d8..2ab7fc7 100644 --- a/share/man/man4/Makefile +++ b/share/man/man4/Makefile @@ -414,7 +414,6 @@ MAN= aac.4 \ sym.4 \ syncache.4 \ syncer.4 \ - syscons.4 \ sysmouse.4 \ tap.4 \ targ.4 \ @@ -611,7 +610,6 @@ MLINKS+=ste.4 if_ste.4 MLINKS+=stf.4 if_stf.4 MLINKS+=stge.4 if_stge.4 MLINKS+=syncache.4 syncookies.4 -MLINKS+=syscons.4 sc.4 MLINKS+=tap.4 if_tap.4 MLINKS+=tdfx.4 tdfx_linux.4 MLINKS+=ti.4 if_ti.4 @@ -637,6 +635,11 @@ MLINKS+=xe.4 if_xe.4 MLINKS+=xl.4 if_xl.4 MLINKS+=zyd.4 if_zyd.4 +.if ${MK_SYSCONS} != "no" +MAN+= syscons.4 +MLINKS+=syscons.4 sc.4 +.endif + .if ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_CPUARCH} == "i386" _acpi_asus.4= acpi_asus.4 _acpi_dock.4= acpi_dock.4 diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index db8251c..91b3cbf 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -1943,7 +1943,7 @@ OLD_FILES+=usr/lib/libz_p.a .if ${MK_RCMDS} == no OLD_FILES+=bin/rcp -OLD_FILES+=etc/periodic/daily/140.clean-rwho +OLD_FILES+=etc/periodic/daily/140.clean-rwho OLD_FILES+=etc/periodic/daily/430.status-rwho OLD_FILES+=rescue/rcp OLD_FILES+=usr/bin/rlogin @@ -2226,9 +2226,196 @@ OLD_FILES+=usr/share/sendmail/cf/siteconfig/uucp.ucbvax.m4 #.endif #.if ${MK_SYSCONS} == no -# to be filled in +OLD_FILES+=share/man/man4/sc.4.gz +OLD_FILES+=share/man/man4/syscons.4.gz +OLD_FILES+=share/syscons/fonts/INDEX.fonts +OLD_FILES+=share/syscons/fonts/armscii8-8x14.fnt +OLD_FILES+=share/syscons/fonts/armscii8-8x16.fnt +OLD_FILES+=share/syscons/fonts/armscii8-8x8.fnt +OLD_FILES+=share/syscons/fonts/cp1251-8x14.fnt +OLD_FILES+=share/syscons/fonts/cp1251-8x16.fnt +OLD_FILES+=share/syscons/fonts/cp1251-8x8.fnt +OLD_FILES+=share/syscons/fonts/cp437-8x14.fnt +OLD_FILES+=share/syscons/fonts/cp437-8x16.fnt +OLD_FILES+=share/syscons/fonts/cp437-8x8.fnt +OLD_FILES+=share/syscons/fonts/cp437-thin-8x16.fnt +OLD_FILES+=share/syscons/fonts/cp437-thin-8x8.fnt +OLD_FILES+=share/syscons/fonts/cp850-8x14.fnt +OLD_FILES+=share/syscons/fonts/cp850-8x16.fnt +OLD_FILES+=share/syscons/fonts/cp850-8x8.fnt +OLD_FILES+=share/syscons/fonts/cp850-thin-8x16.fnt +OLD_FILES+=share/syscons/fonts/cp850-thin-8x8.fnt +OLD_FILES+=share/syscons/fonts/cp865-8x14.fnt +OLD_FILES+=share/syscons/fonts/cp865-8x16.fnt +OLD_FILES+=share/syscons/fonts/cp865-8x8.fnt +OLD_FILES+=share/syscons/fonts/cp865-thin-8x16.fnt +OLD_FILES+=share/syscons/fonts/cp865-thin-8x8.fnt +OLD_FILES+=share/syscons/fonts/cp866-8x14.fnt +OLD_FILES+=share/syscons/fonts/cp866-8x16.fnt +OLD_FILES+=share/syscons/fonts/cp866-8x8.fnt +OLD_FILES+=share/syscons/fonts/cp866b-8x16.fnt +OLD_FILES+=share/syscons/fonts/cp866c-8x16.fnt +OLD_FILES+=share/syscons/fonts/cp866u-8x14.fnt +OLD_FILES+=share/syscons/fonts/cp866u-8x16.fnt +OLD_FILES+=share/syscons/fonts/cp866u-8x8.fnt +OLD_FILES+=share/syscons/fonts/haik8-8x14.fnt +OLD_FILES+=share/syscons/fonts/haik8-8x16.fnt +OLD_FILES+=share/syscons/fonts/haik8-8x8.fnt +OLD_FILES+=share/syscons/fonts/iso-8x14.fnt +OLD_FILES+=share/syscons/fonts/iso-8x16.fnt +OLD_FILES+=share/syscons/fonts/iso-8x8.fnt +OLD_FILES+=share/syscons/fonts/iso-thin-8x16.fnt +OLD_FILES+=share/syscons/fonts/iso02-8x14.fnt +OLD_FILES+=share/syscons/fonts/iso02-8x16.fnt +OLD_FILES+=share/syscons/fonts/iso02-8x8.fnt +OLD_FILES+=share/syscons/fonts/iso04-8x14.fnt +OLD_FILES+=share/syscons/fonts/iso04-8x16.fnt +OLD_FILES+=share/syscons/fonts/iso04-8x8.fnt +OLD_FILES+=share/syscons/fonts/iso04-vga9-8x14.fnt +OLD_FILES+=share/syscons/fonts/iso04-vga9-8x16.fnt +OLD_FILES+=share/syscons/fonts/iso04-vga9-8x8.fnt +OLD_FILES+=share/syscons/fonts/iso04-vga9-wide-8x16.fnt +OLD_FILES+=share/syscons/fonts/iso04-wide-8x16.fnt +OLD_FILES+=share/syscons/fonts/iso05-8x14.fnt +OLD_FILES+=share/syscons/fonts/iso05-8x16.fnt +OLD_FILES+=share/syscons/fonts/iso05-8x8.fnt +OLD_FILES+=share/syscons/fonts/iso07-8x14.fnt +OLD_FILES+=share/syscons/fonts/iso07-8x16.fnt +OLD_FILES+=share/syscons/fonts/iso07-8x8.fnt +OLD_FILES+=share/syscons/fonts/iso08-8x14.fnt +OLD_FILES+=share/syscons/fonts/iso08-8x16.fnt +OLD_FILES+=share/syscons/fonts/iso08-8x8.fnt +OLD_FILES+=share/syscons/fonts/iso09-8x16.fnt +OLD_FILES+=share/syscons/fonts/iso15-8x14.fnt +OLD_FILES+=share/syscons/fonts/iso15-8x16.fnt +OLD_FILES+=share/syscons/fonts/iso15-8x8.fnt +OLD_FILES+=share/syscons/fonts/iso15-thin-8x16.fnt +OLD_FILES+=share/syscons/fonts/koi8-r-8x14.fnt +OLD_FILES+=share/syscons/fonts/koi8-r-8x16.fnt +OLD_FILES+=share/syscons/fonts/koi8-r-8x8.fnt +OLD_FILES+=share/syscons/fonts/koi8-rb-8x16.fnt +OLD_FILES+=share/syscons/fonts/koi8-rc-8x16.fnt +OLD_FILES+=share/syscons/fonts/koi8-u-8x14.fnt +OLD_FILES+=share/syscons/fonts/koi8-u-8x16.fnt +OLD_FILES+=share/syscons/fonts/koi8-u-8x8.fnt +OLD_FILES+=share/syscons/fonts/swiss-1131-8x16.fnt +OLD_FILES+=share/syscons/fonts/swiss-1251-8x16.fnt +OLD_FILES+=share/syscons/fonts/swiss-8x14.fnt +OLD_FILES+=share/syscons/fonts/swiss-8x16.fnt +OLD_FILES+=share/syscons/fonts/swiss-8x8.fnt +OLD_FILES+=share/syscons/keymaps/INDEX.keymaps +OLD_FILES+=share/syscons/keymaps/be.iso.acc.kbd +OLD_FILES+=share/syscons/keymaps/be.iso.kbd +OLD_FILES+=share/syscons/keymaps/bg.bds.ctrlcaps.kbd +OLD_FILES+=share/syscons/keymaps/bg.phonetic.ctrlcaps.kbd +OLD_FILES+=share/syscons/keymaps/br275.cp850.kbd +OLD_FILES+=share/syscons/keymaps/br275.iso.acc.kbd +OLD_FILES+=share/syscons/keymaps/br275.iso.kbd +OLD_FILES+=share/syscons/keymaps/by.cp1131.kbd +OLD_FILES+=share/syscons/keymaps/by.cp1251.kbd +OLD_FILES+=share/syscons/keymaps/by.iso5.kbd +OLD_FILES+=share/syscons/keymaps/ce.iso2.kbd +OLD_FILES+=share/syscons/keymaps/colemak.iso15.acc.kbd +OLD_FILES+=share/syscons/keymaps/cs.latin2.qwertz.kbd +OLD_FILES+=share/syscons/keymaps/cz.iso2.kbd +OLD_FILES+=share/syscons/keymaps/danish.cp865.kbd +OLD_FILES+=share/syscons/keymaps/danish.iso.acc.kbd +OLD_FILES+=share/syscons/keymaps/danish.iso.kbd +OLD_FILES+=share/syscons/keymaps/dutch.iso.acc.kbd +OLD_FILES+=share/syscons/keymaps/eee_nordic.kbd +OLD_FILES+=share/syscons/keymaps/el.iso07.kbd +OLD_FILES+=share/syscons/keymaps/estonian.cp850.kbd +OLD_FILES+=share/syscons/keymaps/estonian.iso.kbd +OLD_FILES+=share/syscons/keymaps/estonian.iso15.kbd +OLD_FILES+=share/syscons/keymaps/finnish.cp850.kbd +OLD_FILES+=share/syscons/keymaps/finnish.iso.kbd +OLD_FILES+=share/syscons/keymaps/fr.dvorak.acc.kbd +OLD_FILES+=share/syscons/keymaps/fr.dvorak.kbd +OLD_FILES+=share/syscons/keymaps/fr.iso.acc.kbd +OLD_FILES+=share/syscons/keymaps/fr.iso.kbd +OLD_FILES+=share/syscons/keymaps/fr.macbook.acc.kbd +OLD_FILES+=share/syscons/keymaps/fr_CA.iso.acc.kbd +OLD_FILES+=share/syscons/keymaps/german.cp850.kbd +OLD_FILES+=share/syscons/keymaps/german.iso.acc.kbd +OLD_FILES+=share/syscons/keymaps/german.iso.kbd +OLD_FILES+=share/syscons/keymaps/gr.elot.acc.kbd +OLD_FILES+=share/syscons/keymaps/gr.us101.acc.kbd +OLD_FILES+=share/syscons/keymaps/hr.iso.kbd +OLD_FILES+=share/syscons/keymaps/hu.iso2.101keys.kbd +OLD_FILES+=share/syscons/keymaps/hu.iso2.102keys.kbd +OLD_FILES+=share/syscons/keymaps/hy.armscii-8.kbd +OLD_FILES+=share/syscons/keymaps/icelandic.iso.acc.kbd +OLD_FILES+=share/syscons/keymaps/icelandic.iso.kbd +OLD_FILES+=share/syscons/keymaps/it.iso.kbd +OLD_FILES+=share/syscons/keymaps/iw.iso8.kbd +OLD_FILES+=share/syscons/keymaps/jp.106.kbd +OLD_FILES+=share/syscons/keymaps/jp.106x.kbd +OLD_FILES+=share/syscons/keymaps/jp.pc98.iso.kbd +OLD_FILES+=share/syscons/keymaps/jp.pc98.kbd +OLD_FILES+=share/syscons/keymaps/kk.pt154.io.kbd +OLD_FILES+=share/syscons/keymaps/kk.pt154.kst.kbd +OLD_FILES+=share/syscons/keymaps/latinamerican.iso.acc.kbd +OLD_FILES+=share/syscons/keymaps/latinamerican.kbd +OLD_FILES+=share/syscons/keymaps/lt.iso4.kbd +OLD_FILES+=share/syscons/keymaps/norwegian.dvorak.kbd +OLD_FILES+=share/syscons/keymaps/norwegian.iso.kbd +OLD_FILES+=share/syscons/keymaps/pl_PL.ISO8859-2.kbd +OLD_FILES+=share/syscons/keymaps/pl_PL.dvorak.kbd +OLD_FILES+=share/syscons/keymaps/pt.iso.acc.kbd +OLD_FILES+=share/syscons/keymaps/pt.iso.kbd +OLD_FILES+=share/syscons/keymaps/ru.cp866.kbd +OLD_FILES+=share/syscons/keymaps/ru.iso5.kbd +OLD_FILES+=share/syscons/keymaps/ru.koi8-r.kbd +OLD_FILES+=share/syscons/keymaps/ru.koi8-r.shift.kbd +OLD_FILES+=share/syscons/keymaps/ru.koi8-r.win.kbd +OLD_FILES+=share/syscons/keymaps/si.iso.kbd +OLD_FILES+=share/syscons/keymaps/sk.iso2.kbd +OLD_FILES+=share/syscons/keymaps/spanish.iso.acc.kbd +OLD_FILES+=share/syscons/keymaps/spanish.iso.kbd +OLD_FILES+=share/syscons/keymaps/spanish.iso15.acc.kbd +OLD_FILES+=share/syscons/keymaps/swedish.cp850.kbd +OLD_FILES+=share/syscons/keymaps/swedish.iso.kbd +OLD_FILES+=share/syscons/keymaps/swissfrench.cp850.kbd +OLD_FILES+=share/syscons/keymaps/swissfrench.iso.acc.kbd +OLD_FILES+=share/syscons/keymaps/swissfrench.iso.kbd +OLD_FILES+=share/syscons/keymaps/swissgerman.cp850.kbd +OLD_FILES+=share/syscons/keymaps/swissgerman.iso.acc.kbd +OLD_FILES+=share/syscons/keymaps/swissgerman.iso.kbd +OLD_FILES+=share/syscons/keymaps/swissgerman.macbook.acc.kbd +OLD_FILES+=share/syscons/keymaps/tr.iso9.q.kbd +OLD_FILES+=share/syscons/keymaps/ua.iso5.kbd +OLD_FILES+=share/syscons/keymaps/ua.koi8-u.kbd +OLD_FILES+=share/syscons/keymaps/ua.koi8-u.shift.alt.kbd +OLD_FILES+=share/syscons/keymaps/uk.cp850-ctrl.kbd +OLD_FILES+=share/syscons/keymaps/uk.cp850.kbd +OLD_FILES+=share/syscons/keymaps/uk.dvorak.kbd +OLD_FILES+=share/syscons/keymaps/uk.iso-ctrl.kbd +OLD_FILES+=share/syscons/keymaps/uk.iso.kbd +OLD_FILES+=share/syscons/keymaps/us.dvorak.kbd +OLD_FILES+=share/syscons/keymaps/us.dvorakl.kbd +OLD_FILES+=share/syscons/keymaps/us.dvorakr.kbd +OLD_FILES+=share/syscons/keymaps/us.dvorakx.kbd +OLD_FILES+=share/syscons/keymaps/us.emacs.kbd +OLD_FILES+=share/syscons/keymaps/us.iso.acc.kbd +OLD_FILES+=share/syscons/keymaps/us.iso.kbd +OLD_FILES+=share/syscons/keymaps/us.pc-ctrl.kbd +OLD_FILES+=share/syscons/keymaps/us.unix.kbd +OLD_FILES+=share/syscons/scrnmaps/armscii8-2haik8 +OLD_FILES+=share/syscons/scrnmaps/iso-8859-1_to_cp437 +OLD_FILES+=share/syscons/scrnmaps/iso-8859-4_for_vga9 +OLD_FILES+=share/syscons/scrnmaps/iso-8859-7_to_cp437 +OLD_FILES+=share/syscons/scrnmaps/koi8-r2cp866 +OLD_FILES+=share/syscons/scrnmaps/koi8-u2cp866u +OLD_FILES+=share/syscons/scrnmaps/us-ascii_to_cp437 #.endif +.if ${MK_SYSINSTALL} == no +OLD_FILES+=usr/sbin/sade +OLD_FILES+=usr/sbin/sysinstall +OLD_FILES+=usr/share/man/man8/sade.8.gz +OLD_FILES+=usr/share/man/man8/sysinstall.8.gz +.endif + .if ${MK_TCSH} == no OLD_FILES+=bin/csh OLD_FILES+=bin/tcsh diff --git a/tools/build/options/WITHOUT_SYSINSTALL b/tools/build/options/WITHOUT_SYSINSTALL index 60426e3..e268c2f 100644 --- a/tools/build/options/WITHOUT_SYSINSTALL +++ b/tools/build/options/WITHOUT_SYSINSTALL @@ -1,4 +1,5 @@ .\" $FreeBSD$ Set to not build -.Xr sysinstall 8 -and related programs. +.Xr sade 8 +and +.Xr sysinstall 8 . diff --git a/usr.sbin/Makefile b/usr.sbin/Makefile index f3e853e..2151868 100644 --- a/usr.sbin/Makefile +++ b/usr.sbin/Makefile @@ -250,7 +250,6 @@ SUBDIR+= ftp-proxy SUBDIR+= pkg_install .endif -# XXX MK_TOOLCHAIN? .if ${MK_PMC} != "no" SUBDIR+= pmcannotate SUBDIR+= pmccontrol @@ -283,7 +282,9 @@ SUBDIR+= praliases SUBDIR+= sendmail .endif +.if ${MK_SYSINSTALL} != "no" SUBDIR+= sysinstall +.endif .if ${MK_TOOLCHAIN} != "no" SUBDIR+= config