svn commit: r275147 - in projects/building-blocks: etc/rc.d share/man/man4 tools/build/mk
Garrett Cooper
ngie at FreeBSD.org
Wed Nov 26 22:41:52 UTC 2014
Author: ngie
Date: Wed Nov 26 22:41:51 2014
New Revision: 275147
URL: https://svnweb.freebsd.org/changeset/base/275147
Log:
- Fill in MK_LEGACY_CONSOLE == no and SYSCONS == no
- Don't install syscons(4)
- Don't install the moused or syscons rc.d scripts if MK_LEGACY_CONSOLE == no
Modified:
projects/building-blocks/etc/rc.d/Makefile
projects/building-blocks/share/man/man4/Makefile
projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc
Modified: projects/building-blocks/etc/rc.d/Makefile
==============================================================================
--- projects/building-blocks/etc/rc.d/Makefile Wed Nov 26 22:27:31 2014 (r275146)
+++ projects/building-blocks/etc/rc.d/Makefile Wed Nov 26 22:41:51 2014 (r275147)
@@ -80,7 +80,6 @@ FILES= DAEMON \
mdconfig \
mdconfig2 \
mountd \
- moused \
mroute6d \
mrouted \
msgs \
@@ -134,7 +133,6 @@ FILES= DAEMON \
stf \
swap \
swaplate \
- syscons \
sysctl \
syslogd \
tmp \
@@ -200,6 +198,11 @@ FILES+= iscsictl
FILES+= iscsid
.endif
+.if ${MK_LEGACY_CONSOLE} != "no"
+FILES+= moused
+FILES+= syscons
+.endif
+
.if ${MK_NS_CACHING} != "no"
_nscd= nscd
.endif
Modified: projects/building-blocks/share/man/man4/Makefile
==============================================================================
--- projects/building-blocks/share/man/man4/Makefile Wed Nov 26 22:27:31 2014 (r275146)
+++ projects/building-blocks/share/man/man4/Makefile Wed Nov 26 22:41:51 2014 (r275147)
@@ -481,7 +481,6 @@ MAN= aac.4 \
sym.4 \
syncache.4 \
syncer.4 \
- syscons.4 \
sysmouse.4 \
tap.4 \
targ.4 \
@@ -819,6 +818,10 @@ _pflog.4= pflog.4
_pfsync.4= pfsync.4
.endif
+.if ${MK_SYSCONS} != "no"
+MAN+= syscons.4
+.endif
+
.if ${MK_USB} != "no"
MAN+= \
u3g.4 \
Modified: projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc
==============================================================================
--- projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc Wed Nov 26 22:27:31 2014 (r275146)
+++ projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc Wed Nov 26 22:41:51 2014 (r275147)
@@ -3328,6 +3328,23 @@ OLD_FILES+=usr/bin/host
OLD_FILES+=usr/share/man/man1/host.1.gz
.endif
+.if ${MK_LEGACY_CONSOLE} == no
+OLD_FILES+=etc/rc.d/moused
+OLD_FILES+=etc/rc.d/syscons
+OLD_FILES+=usr/sbin/kbdcontrol
+OLD_FILES+=usr/sbin/kbdmap
+OLD_FILES+=usr/sbin/moused
+OLD_FILES+=usr/sbin/vidcontrol
+OLD_FILES+=usr/sbin/vidfont
+OLD_FILES+=usr/share/man/man1/kbdcontrol.1.gz
+OLD_FILES+=usr/share/man/man1/kbdmap.1.gz
+OLD_FILES+=usr/share/man/man1/vidcontrol.1.gz
+OLD_FILES+=usr/share/man/man1/vidfont.1.gz
+OLD_FILES+=usr/share/man/man5/kbdmap.5.gz
+OLD_FILES+=usr/share/man/man5/keymap.5.gz
+OLD_FILES+=usr/share/man/man8/moused.8.g
+.endif
+
#.if ${MK_LIB32} == no
# to be filled in
#.endif
@@ -4295,9 +4312,195 @@ OLD_FILES+=usr/share/doc/pjdfstest/READM
OLD_DIRS+=usr/share/doc/pjdfstest
.endif
-#.if ${MK_SYSCONS} == no
-# to be filled in
-#.endif
+.if ${MK_SYSCONS} == no
+OLD_FILES+=usr/share/man/man4/syscons.4.gz
+OLD_FILES+=usr/share/syscons/fonts/INDEX.fonts
+OLD_FILES+=usr/share/syscons/fonts/armscii8-8x14.fnt
+OLD_FILES+=usr/share/syscons/fonts/armscii8-8x16.fnt
+OLD_FILES+=usr/share/syscons/fonts/armscii8-8x8.fnt
+OLD_FILES+=usr/share/syscons/fonts/cp1251-8x14.fnt
+OLD_FILES+=usr/share/syscons/fonts/cp1251-8x16.fnt
+OLD_FILES+=usr/share/syscons/fonts/cp1251-8x8.fnt
+OLD_FILES+=usr/share/syscons/fonts/cp437-8x14.fnt
+OLD_FILES+=usr/share/syscons/fonts/cp437-8x16.fnt
+OLD_FILES+=usr/share/syscons/fonts/cp437-8x8.fnt
+OLD_FILES+=usr/share/syscons/fonts/cp437-thin-8x16.fnt
+OLD_FILES+=usr/share/syscons/fonts/cp437-thin-8x8.fnt
+OLD_FILES+=usr/share/syscons/fonts/cp850-8x14.fnt
+OLD_FILES+=usr/share/syscons/fonts/cp850-8x16.fnt
+OLD_FILES+=usr/share/syscons/fonts/cp850-8x8.fnt
+OLD_FILES+=usr/share/syscons/fonts/cp850-thin-8x16.fnt
+OLD_FILES+=usr/share/syscons/fonts/cp850-thin-8x8.fnt
+OLD_FILES+=usr/share/syscons/fonts/cp865-8x14.fnt
+OLD_FILES+=usr/share/syscons/fonts/cp865-8x16.fnt
+OLD_FILES+=usr/share/syscons/fonts/cp865-8x8.fnt
+OLD_FILES+=usr/share/syscons/fonts/cp865-thin-8x16.fnt
+OLD_FILES+=usr/share/syscons/fonts/cp865-thin-8x8.fnt
+OLD_FILES+=usr/share/syscons/fonts/cp866-8x14.fnt
+OLD_FILES+=usr/share/syscons/fonts/cp866-8x16.fnt
+OLD_FILES+=usr/share/syscons/fonts/cp866-8x8.fnt
+OLD_FILES+=usr/share/syscons/fonts/cp866b-8x16.fnt
+OLD_FILES+=usr/share/syscons/fonts/cp866c-8x16.fnt
+OLD_FILES+=usr/share/syscons/fonts/cp866u-8x14.fnt
+OLD_FILES+=usr/share/syscons/fonts/cp866u-8x16.fnt
+OLD_FILES+=usr/share/syscons/fonts/cp866u-8x8.fnt
+OLD_FILES+=usr/share/syscons/fonts/haik8-8x14.fnt
+OLD_FILES+=usr/share/syscons/fonts/haik8-8x16.fnt
+OLD_FILES+=usr/share/syscons/fonts/haik8-8x8.fnt
+OLD_FILES+=usr/share/syscons/fonts/iso-8x14.fnt
+OLD_FILES+=usr/share/syscons/fonts/iso-8x16.fnt
+OLD_FILES+=usr/share/syscons/fonts/iso-8x8.fnt
+OLD_FILES+=usr/share/syscons/fonts/iso-thin-8x16.fnt
+OLD_FILES+=usr/share/syscons/fonts/iso02-8x14.fnt
+OLD_FILES+=usr/share/syscons/fonts/iso02-8x16.fnt
+OLD_FILES+=usr/share/syscons/fonts/iso02-8x8.fnt
+OLD_FILES+=usr/share/syscons/fonts/iso04-8x14.fnt
+OLD_FILES+=usr/share/syscons/fonts/iso04-8x16.fnt
+OLD_FILES+=usr/share/syscons/fonts/iso04-8x8.fnt
+OLD_FILES+=usr/share/syscons/fonts/iso04-vga9-8x14.fnt
+OLD_FILES+=usr/share/syscons/fonts/iso04-vga9-8x16.fnt
+OLD_FILES+=usr/share/syscons/fonts/iso04-vga9-8x8.fnt
+OLD_FILES+=usr/share/syscons/fonts/iso04-vga9-wide-8x16.fnt
+OLD_FILES+=usr/share/syscons/fonts/iso04-wide-8x16.fnt
+OLD_FILES+=usr/share/syscons/fonts/iso05-8x14.fnt
+OLD_FILES+=usr/share/syscons/fonts/iso05-8x16.fnt
+OLD_FILES+=usr/share/syscons/fonts/iso05-8x8.fnt
+OLD_FILES+=usr/share/syscons/fonts/iso07-8x14.fnt
+OLD_FILES+=usr/share/syscons/fonts/iso07-8x16.fnt
+OLD_FILES+=usr/share/syscons/fonts/iso07-8x8.fnt
+OLD_FILES+=usr/share/syscons/fonts/iso08-8x14.fnt
+OLD_FILES+=usr/share/syscons/fonts/iso08-8x16.fnt
+OLD_FILES+=usr/share/syscons/fonts/iso08-8x8.fnt
+OLD_FILES+=usr/share/syscons/fonts/iso09-8x16.fnt
+OLD_FILES+=usr/share/syscons/fonts/iso15-8x14.fnt
+OLD_FILES+=usr/share/syscons/fonts/iso15-8x16.fnt
+OLD_FILES+=usr/share/syscons/fonts/iso15-8x8.fnt
+OLD_FILES+=usr/share/syscons/fonts/iso15-thin-8x16.fnt
+OLD_FILES+=usr/share/syscons/fonts/koi8-r-8x14.fnt
+OLD_FILES+=usr/share/syscons/fonts/koi8-r-8x16.fnt
+OLD_FILES+=usr/share/syscons/fonts/koi8-r-8x8.fnt
+OLD_FILES+=usr/share/syscons/fonts/koi8-rb-8x16.fnt
+OLD_FILES+=usr/share/syscons/fonts/koi8-rc-8x16.fnt
+OLD_FILES+=usr/share/syscons/fonts/koi8-u-8x14.fnt
+OLD_FILES+=usr/share/syscons/fonts/koi8-u-8x16.fnt
+OLD_FILES+=usr/share/syscons/fonts/koi8-u-8x8.fnt
+OLD_FILES+=usr/share/syscons/fonts/swiss-1131-8x16.fnt
+OLD_FILES+=usr/share/syscons/fonts/swiss-1251-8x16.fnt
+OLD_FILES+=usr/share/syscons/fonts/swiss-8x14.fnt
+OLD_FILES+=usr/share/syscons/fonts/swiss-8x16.fnt
+OLD_FILES+=usr/share/syscons/fonts/swiss-8x8.fnt
+OLD_FILES+=usr/share/syscons/keymaps/INDEX.keymaps
+OLD_FILES+=usr/share/syscons/keymaps/be.iso.acc.kbd
+OLD_FILES+=usr/share/syscons/keymaps/be.iso.kbd
+OLD_FILES+=usr/share/syscons/keymaps/bg.bds.ctrlcaps.kbd
+OLD_FILES+=usr/share/syscons/keymaps/bg.phonetic.ctrlcaps.kbd
+OLD_FILES+=usr/share/syscons/keymaps/br275.cp850.kbd
+OLD_FILES+=usr/share/syscons/keymaps/br275.iso.acc.kbd
+OLD_FILES+=usr/share/syscons/keymaps/br275.iso.kbd
+OLD_FILES+=usr/share/syscons/keymaps/by.cp1131.kbd
+OLD_FILES+=usr/share/syscons/keymaps/by.cp1251.kbd
+OLD_FILES+=usr/share/syscons/keymaps/by.iso5.kbd
+OLD_FILES+=usr/share/syscons/keymaps/ce.iso2.kbd
+OLD_FILES+=usr/share/syscons/keymaps/colemak.iso15.acc.kbd
+OLD_FILES+=usr/share/syscons/keymaps/cs.latin2.qwertz.kbd
+OLD_FILES+=usr/share/syscons/keymaps/cz.iso2.kbd
+OLD_FILES+=usr/share/syscons/keymaps/danish.cp865.kbd
+OLD_FILES+=usr/share/syscons/keymaps/danish.iso.acc.kbd
+OLD_FILES+=usr/share/syscons/keymaps/danish.iso.kbd
+OLD_FILES+=usr/share/syscons/keymaps/danish.iso.macbook.kbd
+OLD_FILES+=usr/share/syscons/keymaps/dutch.iso.acc.kbd
+OLD_FILES+=usr/share/syscons/keymaps/eee_nordic.kbd
+OLD_FILES+=usr/share/syscons/keymaps/el.iso07.kbd
+OLD_FILES+=usr/share/syscons/keymaps/estonian.cp850.kbd
+OLD_FILES+=usr/share/syscons/keymaps/estonian.iso.kbd
+OLD_FILES+=usr/share/syscons/keymaps/estonian.iso15.kbd
+OLD_FILES+=usr/share/syscons/keymaps/finnish.cp850.kbd
+OLD_FILES+=usr/share/syscons/keymaps/finnish.iso.kbd
+OLD_FILES+=usr/share/syscons/keymaps/fr.dvorak.acc.kbd
+OLD_FILES+=usr/share/syscons/keymaps/fr.dvorak.kbd
+OLD_FILES+=usr/share/syscons/keymaps/fr.iso.acc.kbd
+OLD_FILES+=usr/share/syscons/keymaps/fr.iso.kbd
+OLD_FILES+=usr/share/syscons/keymaps/fr.macbook.acc.kbd
+OLD_FILES+=usr/share/syscons/keymaps/fr_CA.iso.acc.kbd
+OLD_FILES+=usr/share/syscons/keymaps/german.cp850.kbd
+OLD_FILES+=usr/share/syscons/keymaps/german.iso.acc.kbd
+OLD_FILES+=usr/share/syscons/keymaps/german.iso.kbd
+OLD_FILES+=usr/share/syscons/keymaps/gr.elot.acc.kbd
+OLD_FILES+=usr/share/syscons/keymaps/gr.us101.acc.kbd
+OLD_FILES+=usr/share/syscons/keymaps/hr.iso.kbd
+OLD_FILES+=usr/share/syscons/keymaps/hu.iso2.101keys.kbd
+OLD_FILES+=usr/share/syscons/keymaps/hu.iso2.102keys.kbd
+OLD_FILES+=usr/share/syscons/keymaps/hy.armscii-8.kbd
+OLD_FILES+=usr/share/syscons/keymaps/icelandic.iso.acc.kbd
+OLD_FILES+=usr/share/syscons/keymaps/icelandic.iso.kbd
+OLD_FILES+=usr/share/syscons/keymaps/it.iso.kbd
+OLD_FILES+=usr/share/syscons/keymaps/iw.iso8.kbd
+OLD_FILES+=usr/share/syscons/keymaps/jp.106.kbd
+OLD_FILES+=usr/share/syscons/keymaps/jp.106x.kbd
+OLD_FILES+=usr/share/syscons/keymaps/jp.pc98.iso.kbd
+OLD_FILES+=usr/share/syscons/keymaps/jp.pc98.kbd
+OLD_FILES+=usr/share/syscons/keymaps/kk.pt154.io.kbd
+OLD_FILES+=usr/share/syscons/keymaps/kk.pt154.kst.kbd
+OLD_FILES+=usr/share/syscons/keymaps/latinamerican.iso.acc.kbd
+OLD_FILES+=usr/share/syscons/keymaps/latinamerican.kbd
+OLD_FILES+=usr/share/syscons/keymaps/lt.iso4.kbd
+OLD_FILES+=usr/share/syscons/keymaps/norwegian.dvorak.kbd
+OLD_FILES+=usr/share/syscons/keymaps/norwegian.iso.kbd
+OLD_FILES+=usr/share/syscons/keymaps/pl_PL.ISO8859-2.kbd
+OLD_FILES+=usr/share/syscons/keymaps/pl_PL.dvorak.kbd
+OLD_FILES+=usr/share/syscons/keymaps/pt.iso.acc.kbd
+OLD_FILES+=usr/share/syscons/keymaps/pt.iso.kbd
+OLD_FILES+=usr/share/syscons/keymaps/ru.cp866.kbd
+OLD_FILES+=usr/share/syscons/keymaps/ru.iso5.kbd
+OLD_FILES+=usr/share/syscons/keymaps/ru.koi8-r.kbd
+OLD_FILES+=usr/share/syscons/keymaps/ru.koi8-r.shift.kbd
+OLD_FILES+=usr/share/syscons/keymaps/ru.koi8-r.win.kbd
+OLD_FILES+=usr/share/syscons/keymaps/si.iso.kbd
+OLD_FILES+=usr/share/syscons/keymaps/sk.iso2.kbd
+OLD_FILES+=usr/share/syscons/keymaps/spanish.dvorak.kbd
+OLD_FILES+=usr/share/syscons/keymaps/spanish.iso.acc.kbd
+OLD_FILES+=usr/share/syscons/keymaps/spanish.iso.kbd
+OLD_FILES+=usr/share/syscons/keymaps/spanish.iso15.acc.kbd
+OLD_FILES+=usr/share/syscons/keymaps/swedish.cp850.kbd
+OLD_FILES+=usr/share/syscons/keymaps/swedish.iso.kbd
+OLD_FILES+=usr/share/syscons/keymaps/swissfrench.cp850.kbd
+OLD_FILES+=usr/share/syscons/keymaps/swissfrench.iso.acc.kbd
+OLD_FILES+=usr/share/syscons/keymaps/swissfrench.iso.kbd
+OLD_FILES+=usr/share/syscons/keymaps/swissgerman.cp850.kbd
+OLD_FILES+=usr/share/syscons/keymaps/swissgerman.iso.acc.kbd
+OLD_FILES+=usr/share/syscons/keymaps/swissgerman.iso.kbd
+OLD_FILES+=usr/share/syscons/keymaps/swissgerman.macbook.acc.kbd
+OLD_FILES+=usr/share/syscons/keymaps/tr.iso9.q.kbd
+OLD_FILES+=usr/share/syscons/keymaps/ua.iso5.kbd
+OLD_FILES+=usr/share/syscons/keymaps/ua.koi8-u.kbd
+OLD_FILES+=usr/share/syscons/keymaps/ua.koi8-u.shift.alt.kbd
+OLD_FILES+=usr/share/syscons/keymaps/uk.cp850-ctrl.kbd
+OLD_FILES+=usr/share/syscons/keymaps/uk.cp850.kbd
+OLD_FILES+=usr/share/syscons/keymaps/uk.dvorak.kbd
+OLD_FILES+=usr/share/syscons/keymaps/uk.iso-ctrl.kbd
+OLD_FILES+=usr/share/syscons/keymaps/uk.iso.kbd
+OLD_FILES+=usr/share/syscons/keymaps/us.dvorak.kbd
+OLD_FILES+=usr/share/syscons/keymaps/us.dvorakl.kbd
+OLD_FILES+=usr/share/syscons/keymaps/us.dvorakp.kbd
+OLD_FILES+=usr/share/syscons/keymaps/us.dvorakr.kbd
+OLD_FILES+=usr/share/syscons/keymaps/us.dvorakx.kbd
+OLD_FILES+=usr/share/syscons/keymaps/us.emacs.kbd
+OLD_FILES+=usr/share/syscons/keymaps/us.iso.acc.kbd
+OLD_FILES+=usr/share/syscons/keymaps/us.iso.kbd
+OLD_FILES+=usr/share/syscons/keymaps/us.pc-ctrl.kbd
+OLD_FILES+=usr/share/syscons/keymaps/us.unix.kbd
+OLD_FILES+=usr/share/syscons/scrnmaps/armscii8-2haik8.scm
+OLD_FILES+=usr/share/syscons/scrnmaps/iso-8859-1_to_cp437.scm
+OLD_FILES+=usr/share/syscons/scrnmaps/iso-8859-4_for_vga9.scm
+OLD_FILES+=usr/share/syscons/scrnmaps/iso-8859-7_to_cp437.scm
+OLD_FILES+=usr/share/syscons/scrnmaps/koi8-r2cp866.scm
+OLD_FILES+=usr/share/syscons/scrnmaps/koi8-u2cp866u.scm
+OLD_FILES+=usr/share/syscons/scrnmaps/us-ascii_to_cp437.scm
+OLD_DIRS+=usr/share/syscons/fonts
+OLD_DIRS+=usr/share/syscons/keymaps
+OLD_DIRS+=usr/share/syscons/scrnmaps
+OLD_DIRS+=usr/share/syscons
+.endif
.if ${MK_TALK} == no
OLD_FILES+=usr/bin/talk
More information about the svn-src-projects
mailing list