Index: x11/xkeyboard-config/Makefile
===================================================================
--- x11/xkeyboard-config/Makefile
+++ x11/xkeyboard-config/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	xkeyboard-config
-PORTVERSION=	2.19
+PORTVERSION=	2.20
 CATEGORIES=	x11
 MASTER_SITES=	XORG/individual/${XORG_CAT}/${PORTNAME}
 
@@ -15,16 +15,12 @@
 XORG_CAT=	data
 
 NO_ARCH=	yes
-USES=		gmake pathfix perl5 tar:bzip2
+USES=		gmake localbase pathfix perl5
 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
Index: x11/xkeyboard-config/distinfo
===================================================================
--- x11/xkeyboard-config/distinfo
+++ x11/xkeyboard-config/distinfo
@@ -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 = 1486061144
+SHA256 (xorg/data/xkeyboard-config-2.20.tar.bz2) = d1bfc72553c4e3ef1cd6f13eec0488cf940498b612ab8a0b362e7090c94bc134
+SIZE (xorg/data/xkeyboard-config-2.20.tar.bz2) = 978275