svn commit: r331937 - in head/x11/xkeyboard-config: . files
Alexey Dokuchaev
danfe at FreeBSD.org
Tue Oct 29 09:53:26 UTC 2013
Author: danfe
Date: Tue Oct 29 09:53:25 2013
New Revision: 331937
URL: http://svnweb.freebsd.org/changeset/ports/331937
Log:
Add an optional patch from Etersoft that brings pre-1918 Russian letters to
typographic layout (commonly installed under `share/X11/xkb/symbols/typo').
Option was named ETERSOFT instead of e.g. PRE1918 as their intention was to
maintain several Russian-specific features, not just pre-reform orthography
support. Yes, this also means one day option description should be changed.
While here, move MASTER_SITE_SUBDIR to a more appropriate place in Makefile
and comment out currently unused .include <bsd.port.options.mk>.
Approved by: silence on -x11@
Added:
head/x11/xkeyboard-config/files/
head/x11/xkeyboard-config/files/etersoft-patch-symbols-typo (contents, props changed)
Modified:
head/x11/xkeyboard-config/Makefile
Modified: head/x11/xkeyboard-config/Makefile
==============================================================================
--- head/x11/xkeyboard-config/Makefile Tue Oct 29 09:01:39 2013 (r331936)
+++ head/x11/xkeyboard-config/Makefile Tue Oct 29 09:53:25 2013 (r331937)
@@ -4,10 +4,10 @@ PORTNAME= xkeyboard-config
PORTVERSION= 2.9
PORTREVISION= 1
CATEGORIES= x11
+MASTER_SITE_SUBDIR= individual/${XORG_CAT}/${PORTNAME}
MAINTAINER= x11 at FreeBSD.org
COMMENT= X Keyboard Configuration Database
-MASTER_SITE_SUBDIR= individual/${XORG_CAT}/${PORTNAME}
LICENSE= MIT
@@ -28,8 +28,12 @@ LDFLAGS+= -L${LOCALBASE}/lib
MAN7= xkeyboard-config.7
+OPTIONS_DEFINE= ETERSOFT
+ETERSOFT_DESC= Add pre-1918 Russian letters to typographic layout
+ETERSOFT_EXTRA_PATCHES= ${FILESDIR}/etersoft-patch-symbols-typo
+
NO_STAGE= yes
-.include <bsd.port.options.mk>
+#.include <bsd.port.options.mk>
# !nls case doesn't work correctly, comment it out.
#.if ${PORT_OPTIONS:MNLS}
Added: head/x11/xkeyboard-config/files/etersoft-patch-symbols-typo
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/x11/xkeyboard-config/files/etersoft-patch-symbols-typo Tue Oct 29 09:53:25 2013 (r331937)
@@ -0,0 +1,26 @@
+Etersoft version of typographic keyboard layout. It removes Yen symbol `¥'
+(can be easily inserted via "Compose Y =") and adds four letters of Russian
+orthography that were removed during the reform of 1917-1918.
+
+Original upstream bugzilla request:
+
+ http://bugs.etersoft.ru/show_bug.cgi?id=5466
+
+Description (in Russian) and the picture of keyboard layout:
+
+ http://kb.etersoft.ru/Типографская_раскладка_Etersoft
+
+--- symbols/typo.orig
++++ symbols/typo
+@@ -29,7 +29,10 @@
+ key <AD03> { [NoSymbol, NoSymbol, EuroSign] }; // "e"
+ key <AD04> { [NoSymbol, NoSymbol, registered] }; // "r"
+ key <AD05> { [NoSymbol, NoSymbol, trademark] }; // "t"
+- key <AD06> { [NoSymbol, NoSymbol, yen] }; // "y"
++ key <AD06> { [NoSymbol, NoSymbol, U0463, U0462] };
++ key <AD07> { [NoSymbol, NoSymbol, U0475, U0474] };
++ key <AD08> { [NoSymbol, NoSymbol, U0456, U0406] };
++ key <AD09> { [NoSymbol, NoSymbol, U0473, U0472] };
+ key <AD10> { [NoSymbol, NoSymbol, acute, doubleacute] }; // "p"
+ key <AD11> { [NoSymbol, NoSymbol, bracketleft, braceleft] }; // [
+ key <AD12> { [NoSymbol, NoSymbol, bracketright, braceright] }; // ]
More information about the svn-ports-all
mailing list