diff -up console-setup-1.143/Makefile.orig console-setup-1.143/Makefile --- console-setup-1.143/Makefile.orig 2016-05-24 09:43:13.424382839 +0200 +++ console-setup-1.143/Makefile 2016-05-24 09:45:10.350994606 +0200 @@ -14,7 +14,7 @@ prefix := /usr/local # etcdir must be either /etc or etcdir := $(prefix)/etc bootprefix := $(patsubst %/usr,%/,$(prefix:%/=%)) -mandir := $(prefix)/share/man +mandir = $(prefix)/usr/share/man acmfiles := $(wildcard $./acm/*.acm) @@ -26,8 +26,8 @@ build-common: gzipped-acmfiles .PHONY: install-common install-common: build-common - install -d $(bootprefix)/bin/ - install setupcon $(bootprefix)/bin/ + install -d $(bootprefix)/usr/bin/ + install setupcon $(bootprefix)/usr/bin/ install -d $(etcdir)/default install -m 644 config/keyboard $(etcdir)/default/ install -m 644 config/console-setup $(etcdir)/default/ @@ -39,10 +39,10 @@ install-common: build-common .PHONY: install-common-linux install-common-linux: build-linux - install -d $(prefix)/share/consolefonts/ - install -m 644 Fonts/*.psf.gz $(prefix)/share/consolefonts/ - install -d $(prefix)/share/consoletrans - install -m 644 acm/*.acm.gz $(prefix)/share/consoletrans/ + install -d $(prefix)/usr/share/consolefonts/ + install -m 644 Fonts/*.psf.gz $(prefix)/usr/share/consolefonts/ + install -d $(prefix)/usr/share/consoletrans + install -m 644 acm/*.acm.gz $(prefix)/usr/share/consoletrans/ install -d $(etcdir)/console-setup install -m 644 Keyboard/compose.*.inc $(etcdir)/console-setup/ install -m 644 Keyboard/remap.inc $(etcdir)/console-setup/ @@ -67,8 +67,8 @@ install-ckbcomp: mkdir -p $(etcdir)/console-setup \ && cp -r Keyboard/ckb/ $(etcdir)/console-setup/ckb; \ fi - install -d $(prefix)/bin/ - install -m 755 Keyboard/ckbcomp $(prefix)/bin/ + install -d $(prefix)/usr/bin/ + install -m 755 Keyboard/ckbcomp $(prefix)/usr/bin/ install -d $(mandir)/man1/ install -m 644 man/ckbcomp.1 $(mandir)/man1/ diff -up console-setup-1.143/man/ckbcomp.1.orig console-setup-1.143/man/ckbcomp.1 --- console-setup-1.143/man/ckbcomp.1.orig 2011-04-06 03:01:33.000000000 +0200 +++ console-setup-1.143/man/ckbcomp.1 2016-05-24 09:47:15.360674275 +0200 @@ -46,7 +46,7 @@ Print a usage message and exit. .BI -charmap\ charmap The encoding to use for the output keymap. There should be an character mapping table defining this encoding in -.IR /usr/local/share/consoletrans . +.IR /usr/share/consoletrans . Definitions of the following charmaps are provided: .nh .BR ARMSCII-8 , @@ -86,8 +86,9 @@ for files included by the keymap descrip multiple times. If a file can not be found in any of the specified directories, it will be searched also in some other standard locations, such as -.IR /usr/local/etc/console-setup/ckb , -.IR /usr/local/share/X11/xkb +.IR /etc/console-setup/ckb , +.IR /usr/local/share/X11/xkb , +.IR /usr/share/X11/xkb and .IR /etc/X11/xkb @@ -167,9 +168,9 @@ Specifies the layout variant used to cho Adds an option used to choose component names. .SH FILES -.I /usr/local/share/consoletrans +.I /usr/share/consoletrans .br -.I /usr/local/etc/console-setup/ckb +.I /etc/console-setup/ckb .br .I /usr/share/X11/xkb .br diff -up console-setup-1.143/man/console-setup.5.orig console-setup-1.143/man/console-setup.5 --- console-setup-1.143/man/console-setup.5.orig 2016-05-19 05:01:09.000000000 +0200 +++ console-setup-1.143/man/console-setup.5 2016-05-24 09:47:15.361674281 +0200 @@ -403,16 +403,16 @@ Completely covered by the following font The standard location of the .B console-setup configuration file is -.IR /usr/local/etc/default/console-setup . +.IR /etc/default/console-setup . The keyboard configuration is in -.IR /usr/local/etc/default/keyboard . +.IR /etc/default/keyboard . Fonts that can be used with the variable .B FONT are usually installed in -.IR /usr/share/consolefonts/ " or " /usr/share/syscons/fonts/ . +.IR /usr/share/consolefonts/ " or " /lib/kbd/consolefonts/ . Translation maps that can be used with the variable CONSOLE_MAP are usually installed in -.IR /usr/share/consoletrans/ " or " /usr/share/syscons/scrnmaps/ . +.IR /usr/share/consoletrans/ " or " /lib/kbd/consoletrans/ . .SH NOTES The aim of the Terminus font is to reduce the eyes-fatigue when one diff -up console-setup-1.143/man/keyboard.5.orig console-setup-1.143/man/keyboard.5 --- console-setup-1.143/man/keyboard.5.orig 2016-03-03 05:01:16.000000000 +0100 +++ console-setup-1.143/man/keyboard.5 2016-05-24 09:47:15.361674281 +0200 @@ -154,12 +154,12 @@ on FreeBSD. The standard location of the .B keyboard file is -.IR /usr/local/etc/default/keyboard . +.IR /etc/default/keyboard . Description of all available keyboard models, layouts, variants and options is available in -.IR /usr/local/share/X11/xkb/rules/xorg.lst . +.IR /usr/share/X11/xkb/rules/xorg.lst . In most cases, in -.IR /usr/share/keymaps/ " or " /usr/share/syscons/keymaps/ +.IR /lib/kbd/keymaps/ you will find several keymaps that can be used with the variable .BR KMAP . diff -up console-setup-1.143/man/setupcon.1.orig console-setup-1.143/man/setupcon.1 --- console-setup-1.143/man/setupcon.1.orig 2016-03-03 05:01:16.000000000 +0100 +++ console-setup-1.143/man/setupcon.1 2016-05-24 09:47:15.361674281 +0200 @@ -22,11 +22,11 @@ the console. Most of the time you invok without arguments. The keyboard configuration is specified in .I ~/.keyboard or -.IR /usr/local/etc/default/keyboard . +.IR /etc/default/keyboard . The font configuration is specified in .I ~/.console-setup or -.IR /usr/local/etc/default/console-setup . +.IR /etc/default/console-setup . Consult .BR keyboard (5) and @@ -162,13 +162,13 @@ Display usage information. .br .I ~/.keyboard .br -.I /usr/local/etc/default/console-setup +.I /etc/default/console-setup .br -.I /usr/local/etc/default/keyboard +.I /etc/default/keyboard .br -.I /usr/local/etc/default/console-setup.VARIANT +.I /etc/default/console-setup.VARIANT .br -.I /usr/local/etc/default/keyboard.VARIANT +.I /etc/default/keyboard.VARIANT .br .I /etc/console-setup/
