From owner-svn-ports-all@FreeBSD.ORG Tue Oct 29 09:53:26 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 1E6A45C3; Tue, 29 Oct 2013 09:53:26 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 0BB162807; Tue, 29 Oct 2013 09:53:26 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9T9rPA7002101; Tue, 29 Oct 2013 09:53:25 GMT (envelope-from danfe@svn.freebsd.org) Received: (from danfe@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9T9rPfU002099; Tue, 29 Oct 2013 09:53:25 GMT (envelope-from danfe@svn.freebsd.org) Message-Id: <201310290953.r9T9rPfU002099@svn.freebsd.org> From: Alexey Dokuchaev Date: Tue, 29 Oct 2013 09:53:25 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r331937 - in head/x11/xkeyboard-config: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 29 Oct 2013 09:53:26 -0000 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 . 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@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 +#.include # !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 { [NoSymbol, NoSymbol, EuroSign] }; // "e" + key { [NoSymbol, NoSymbol, registered] }; // "r" + key { [NoSymbol, NoSymbol, trademark] }; // "t" +- key { [NoSymbol, NoSymbol, yen] }; // "y" ++ key { [NoSymbol, NoSymbol, U0463, U0462] }; ++ key { [NoSymbol, NoSymbol, U0475, U0474] }; ++ key { [NoSymbol, NoSymbol, U0456, U0406] }; ++ key { [NoSymbol, NoSymbol, U0473, U0472] }; + key { [NoSymbol, NoSymbol, acute, doubleacute] }; // "p" + key { [NoSymbol, NoSymbol, bracketleft, braceleft] }; // [ + key { [NoSymbol, NoSymbol, bracketright, braceright] }; // ]