Index: branches/2020Q3/x11/xkeyboard-config/Makefile
===================================================================
--- branches/2020Q3/x11/xkeyboard-config/Makefile	(revision 542064)
+++ branches/2020Q3/x11/xkeyboard-config/Makefile	(revision 542065)
@@ -1,47 +1,43 @@
 # $FreeBSD$
 
 PORTNAME=	xkeyboard-config
 PORTVERSION=	2.29
+PORTREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	XORG/individual/data/${PORTNAME}
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X Keyboard Configuration Database
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	xkbcomp:x11/xkbcomp
 
 USES=		gmake gnome localbase pathfix perl5 python:3.5+,build \
 		shebangfix xorg-cat:data
 
 NO_ARCH=	yes
 USE_GNOME=	libxslt:build
 USE_PERL5=	build
 SHEBANG_FILES=	rules/merge.py \
 		rules/compat/map-variants.py
 
 CONFIGURE_ARGS=	--with-xkb-base=${PREFIX}/share/X11/xkb \
 		--with-xkb-rules-symlink=xorg
 
-OPTIONS_DEFINE=	ETERSOFT
+OPTIONS_DEFINE=	ETERSOFT NLS
 ETERSOFT_DESC=	Add pre-1918 Russian letters to typographic layout
+OPTIONS_SUB=	yes
+
+NLS_CONFIGURE_ENABLE=	nls
+NLS_USES=		gettext-tools iconv
 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-install:
 	@${MKDIR} ${STAGEDIR}/var/lib/xkb
 	@${LN} -sf /var/lib/xkb ${STAGEDIR}${PREFIX}/share/X11/xkb/compiled
 
 .include <bsd.port.mk>
Index: branches/2020Q3
===================================================================
--- branches/2020Q3	(revision 542064)
+++ branches/2020Q3	(revision 542065)

Property changes on: branches/2020Q3
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r542055