x11/xkeyboard-config: Add NLS option

Add NLS option to x11/xkeyboard-config.  This was broken in the past, but is
fixed now.

PR:		243070 (based on)
Submitted by:	Andrew Romanenko
MFH:		2020Q3
Event:		Julu 2020 bugathon

x11/xkeyboard-config/Makefile

@@ -2,6 +2,7 @@
 
 PORTNAME=	xkeyboard-config
 PORTVERSION=	2.29
+PORTREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	XORG/individual/data/${PORTNAME}
 
@@ -25,21 +26,16 @@ SHEBANG_FILES=	rules/merge.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