[Midnightbsd-cvs] mports [18732] trunk/x11/xkeyboard-config: set noarch

Sat May 2 07:48:53 EDT 2015

Revision: 18732
          http://svnweb.midnightbsd.org/mports/?rev=18732
Author:   laffer1
Date:     2015-05-02 07:48:52 -0400 (Sat, 02 May 2015)
Log Message:
-----------
set noarch

Modified Paths:
--------------
    trunk/x11/xkeyboard-config/Makefile
    trunk/x11/xkeyboard-config/pkg-plist

Added Paths:
-----------
    trunk/x11/xkeyboard-config/files/
    trunk/x11/xkeyboard-config/files/etersoft-patch-symbols-typo

Modified: trunk/x11/xkeyboard-config/Makefile
===================================================================

--- trunk/x11/xkeyboard-config/Makefile	2015-05-02 11:44:57 UTC (rev 18731)
+++ trunk/x11/xkeyboard-config/Makefile	2015-05-02 11:48:52 UTC (rev 18732)
@@ -2,6 +2,7 @@
 
 PORTNAME=	xkeyboard-config
 PORTVERSION=	2.13
+PORTREVISION=	1
 CATEGORIES=	x11
 
 MAINTAINER=	ports at MidnightBSD.org
@@ -14,23 +15,27 @@
 BUILD_DEPENDS=	xkbcomp:${PORTSDIR}/x11/xkbcomp
 XORG_CAT=	data
 
+NO_ARCH=	yes
 USES=		gmake pathfix tar:bzip2
 USE_GNOME=	intlhack libxslt:build
 USE_PERL5_BUILD=yes
 GNU_CONFIGURE=	yes
-MAKE_JOBS_UNSAFE=yes
 INSTALL_TARGET=	install-strip
 
 CONFIGURE_ARGS=	--with-xkb-base=${PREFIX}/share/X11/xkb \
 		--with-xkb-rules-symlink=xorg
 CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
+LIBS+=		-L${LOCALBASE}/lib
 
+OPTIONS_DEFINE=	ETERSOFT
+ETERSOFT_DESC=	Add pre-1918 Russian letters to typographic layout
+ETERSOFT_EXTRA_PATCHES=	${FILESDIR}/etersoft-patch-symbols-typo
+
 .include <bsd.mport.options.mk>
 
 # !nls case doesn't work correctly, comment it out.
 #.if ${PORT_OPTIONS:MNLS}
-USES+=		gettext:build iconv
+USES+=		gettext-tools iconv
 PLIST_SUB+=	NLS=""
 #.else
 #CONFIGURE_ARGS+=--disable-nls

Added: trunk/x11/xkeyboard-config/files/etersoft-patch-symbols-typo
===================================================================
--- trunk/x11/xkeyboard-config/files/etersoft-patch-symbols-typo	                        (rev 0)
+++ trunk/x11/xkeyboard-config/files/etersoft-patch-symbols-typo	2015-05-02 11:48:52 UTC (rev 18732)
@@ -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] }; // ]


Property changes on: trunk/x11/xkeyboard-config/files/etersoft-patch-symbols-typo
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Modified: trunk/x11/xkeyboard-config/pkg-plist
===================================================================
--- trunk/x11/xkeyboard-config/pkg-plist	2015-05-02 11:44:57 UTC (rev 18731)
+++ trunk/x11/xkeyboard-config/pkg-plist	2015-05-02 11:48:52 UTC (rev 18732)
@@ -119,6 +119,7 @@
 share/X11/xkb/symbols/epo
 share/X11/xkb/symbols/es
 share/X11/xkb/symbols/et
+share/X11/xkb/symbols/eu
 share/X11/xkb/symbols/eurosign
 share/X11/xkb/symbols/fi
 share/X11/xkb/symbols/fo
@@ -318,36 +319,5 @@
 %%NLS%%share/locale/vi/LC_MESSAGES/xkeyboard-config.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/xkeyboard-config.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/xkeyboard-config.mo
-%%NLS%%@dirrmtry share/locale/rw/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/rw
-%%NLS%%@dirrmtry share/locale/ky/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/ky
-%%NLS%%@dirrmtry share/locale/crh/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/crh
- at exec mkdir -p /var/lib/xkb
- at dirrm share/X11/xkb/types
- at dirrm share/X11/xkb/symbols/xfree68_vndr
- at dirrm share/X11/xkb/symbols/sun_vndr
- at dirrm share/X11/xkb/symbols/sony_vndr
- at dirrm share/X11/xkb/symbols/sharp_vndr
- at dirrm share/X11/xkb/symbols/sgi_vndr
- at dirrm share/X11/xkb/symbols/nokia_vndr
- at dirrm share/X11/xkb/symbols/nec_vndr
- at dirrm share/X11/xkb/symbols/macintosh_vndr
- at dirrm share/X11/xkb/symbols/hp_vndr
- at dirrm share/X11/xkb/symbols/fujitsu_vndr
- at dirrm share/X11/xkb/symbols/digital_vndr
- at dirrm share/X11/xkb/symbols
- at dirrm share/X11/xkb/rules
- at dirrm share/X11/xkb/keycodes/sgi_vndr
- at dirrm share/X11/xkb/keycodes/digital_vndr
- at dirrm share/X11/xkb/keycodes
- at dirrm share/X11/xkb/geometry/sgi_vndr
- at dirrm share/X11/xkb/geometry/digital_vndr
- at dirrm share/X11/xkb/geometry
- at dirrm share/X11/xkb/compat
- at dirrm share/X11/xkb
- at dirrmtry share/X11
- at cwd /
- at dirrmtry var/lib/xkb
- at dirrmtry var/lib
+ at dir /var/lib/xkb
+ at dir /var/lib

