Index: head/x11/xkeyboard-config/Makefile
===================================================================
--- head/x11/xkeyboard-config/Makefile	(revision 433523)
+++ head/x11/xkeyboard-config/Makefile	(revision 433524)
@@ -1,52 +1,52 @@
 # $FreeBSD$
 
 PORTNAME=	xkeyboard-config
-PORTVERSION=	2.19
+PORTVERSION=	2.20
 CATEGORIES=	x11
 MASTER_SITES=	XORG/individual/${XORG_CAT}/${PORTNAME}
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X Keyboard Configuration Database
 
 LICENSE=	MIT
 
 BUILD_DEPENDS=	xkbcomp:x11/xkbcomp
 
 XORG_CAT=	data
 
 NO_ARCH=	yes
 USES=		gmake pathfix perl5 tar:bzip2
 USE_GNOME=	intlhack libxslt:build
 USE_PERL5=	build
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
 
 CONFIGURE_ARGS=	--with-xkb-base=${PREFIX}/share/X11/xkb \
 		--with-xkb-rules-symlink=xorg
 CPPFLAGS+=	-I${LOCALBASE}/include
 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.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: head/x11/xkeyboard-config/distinfo
===================================================================
--- head/x11/xkeyboard-config/distinfo	(revision 433523)
+++ head/x11/xkeyboard-config/distinfo	(revision 433524)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1478373260
-SHA256 (xorg/data/xkeyboard-config-2.19.tar.bz2) = 83dfd186b9eb9ced69e01d8d8e2f15b6a79b2e30124874ef086f2d3048f45827
-SIZE (xorg/data/xkeyboard-config-2.19.tar.bz2) = 985697
+TIMESTAMP = 1486415943
+SHA256 (xorg/data/xkeyboard-config-2.20.tar.bz2) = d1bfc72553c4e3ef1cd6f13eec0488cf940498b612ab8a0b362e7090c94bc134
+SIZE (xorg/data/xkeyboard-config-2.20.tar.bz2) = 978275
Index: head/x11/xkeyboard-config/pkg-descr
===================================================================
--- head/x11/xkeyboard-config/pkg-descr	(revision 433523)
+++ head/x11/xkeyboard-config/pkg-descr	(revision 433524)
@@ -1,7 +1,7 @@
 The non-arch keyboard configuration database for X Window.
 The goal is to provide the consistent, well-structured,
 frequently released open source of X keyboard configuration
 data for X Window System implementations (free, open source
 and commercial). The project is targetted to XKB-based systems.
 
-WWW: http://www.freedesktop.org/wiki/Software/xlibs
+WWW: https://freedesktop.org/wiki/Software/XKeyboardConfig/