[patch] x11/xkeyboard-config: add a patch from Etersoft for typographic layout

[Alexey Dokuchaev]

Hi there,

I'd like to add the following extra patch to typo layout, courtesy of
Etersoft.  It removes Yen symbol (can be easily inserted via "Compose Y
=") and adds four letters of Russian orthography that were removed
after the reform of 1917-1918 (so called 'pre-Revolution orthography').

Original upstream bugzilla request:

	http://bugs.etersoft.ru/show_bug.cgi?id=5466

Description and layout (with picture, in Russian):

	http://kb.etersoft.ru/Типографская_раскладка_Etersoft

While here, I've taken liberty to move MASTER_SITE_SUBDIR to a more
appropriate position in the Makefile, and comment out currently useless
inclusion of <bsd.port.options.mk>.

./danfe
-------------- next part --------------
Index: Makefile
===================================================================
--- Makefile	(revision 331672)
+++ Makefile	(working copy)
@@ -4,10 +4,10 @@
 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 @@
 
 MAN7=		xkeyboard-config.7
 
+OPTIONS_DEFINE=	ETERSOFT
+ETERSOFT_DESC=	Apply patch from Etersoft for 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}
Index: files/etersoft-patch-symbols-typo
===================================================================
--- files/etersoft-patch-symbols-typo	(revision 0)
+++ files/etersoft-patch-symbols-typo	(working copy)
@@ -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 after the reform of 1917-1918.
+
+Original upstream bugzilla request:
+
+	http://bugs.etersoft.ru/show_bug.cgi?id=5466
+
+Description and layout (in Russian):
+
+	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] }; // ]