Index: branches/2018Q4/x11/xkeyboard-config/Makefile
===================================================================
--- branches/2018Q4/x11/xkeyboard-config/Makefile	(revision 483609)
+++ branches/2018Q4/x11/xkeyboard-config/Makefile	(revision 483610)
@@ -1,49 +1,50 @@
 # $FreeBSD$
 
 PORTNAME=	xkeyboard-config
 PORTVERSION=	2.24
+PORTREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	XORG/individual/${XORG_CAT}/${PORTNAME}
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X Keyboard Configuration Database
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	xkbcomp:x11/xkbcomp
 
 XORG_CAT=	data
 
 NO_ARCH=	yes
 USES=		gmake localbase pathfix perl5
 USE_GNOME=	intlhack libxslt:build
 USE_PERL5=	build
 
 CONFIGURE_ARGS=	--with-xkb-base=${PREFIX}/share/X11/xkb \
 		--with-xkb-rules-symlink=xorg
 
 OPTIONS_DEFINE=	ETERSOFT
 ETERSOFT_DESC=	Add pre-1918 Russian letters to typographic layout
 ETERSOFT_EXTRA_PATCHES=	${FILESDIR}/etersoft-patch-symbols-typo
 
 .include <bsd.port.options.mk>
 
 # !nls case doesn't work correctly, comment it out.
 #.if ${PORT_OPTIONS:MNLS}
 USES+=		gettext-tools iconv
 PLIST_SUB+=	NLS=""
 #.else
 #CONFIGURE_ARGS+=--disable-nls
 #PLIST_SUB+=	NLS="@comment "
 #.endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/bin/bash|/bin/sh|g' -e 's|==|=|g' \
 		${WRKSRC}/rules/merge.sh
 
 post-install:
 	@${MKDIR} ${STAGEDIR}/var/lib/xkb
 	@${LN} -sf /var/lib/xkb ${STAGEDIR}${PREFIX}/share/X11/xkb/compiled
 
 .include <bsd.port.mk>
Index: branches/2018Q4/x11/xkeyboard-config/files/patch-symbols_am
===================================================================
--- branches/2018Q4/x11/xkeyboard-config/files/patch-symbols_am	(nonexistent)
+++ branches/2018Q4/x11/xkeyboard-config/files/patch-symbols_am	(revision 483610)
@@ -0,0 +1,13 @@
+--- symbols/am.orig	2018-10-30 21:22:31 UTC
++++ symbols/am
+@@ -80,8 +80,8 @@ xkb_symbols "phonetic" {
+     key <AE06> {	[ Armenian_vyun,  	Armenian_VYUN 	]	};
+     key <AE07> {	[ Armenian_ligature_ew,	0x100058f 	]	};
+     key <AE08> {	[ Armenian_ra,    	Armenian_RA   	]	};
+-    key <AE09> {	[ Armenian_cha,   	rmenian_CHA  	]	};
+-    key <AE10> {	[ Armenian_tche,  	rmenian_TCHE 	]	};
++    key <AE09> {	[ Armenian_cha,   	Armenian_CHA  	]	};
++    key <AE10> {	[ Armenian_tche,  	Armenian_TCHE 	]	};
+     key <AE11> {	[ Armenian_hyphen,  	0x1002015 	]       };
+     key <AE12> {	[ Armenian_zhe,   	Armenian_ZHE  	]	};
+ 

Property changes on: branches/2018Q4/x11/xkeyboard-config/files/patch-symbols_am
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
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
Index: branches/2018Q4
===================================================================
--- branches/2018Q4	(revision 483609)
+++ branches/2018Q4	(revision 483610)

Property changes on: branches/2018Q4
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r483538