Index: head/x11/xxkb/Makefile
===================================================================
--- head/x11/xxkb/Makefile	(revision 397247)
+++ head/x11/xxkb/Makefile	(revision 397248)
@@ -1,43 +1,37 @@
 # Created by: Alexander Matey <matey@cis.ohio-state.edu>
 # $FreeBSD$
 
 PORTNAME=	xxkb
 PORTVERSION=	1.11
 PORTREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	SF
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 
 MAINTAINER=	alexander.pohoyda@gmx.net
 COMMENT=	XKB keyboard layout indicator and switcher
 
 LICENSE=	ART10
 
-USES=		iconv imake
+USES=		iconv imake pkgconfig
 USE_XORG=	xpm
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
 PORTDOCS=	README CHANGES.ru README.ru
 
 OPTIONS_DEFINE=	LIBRSVG2 DOCS
 
-.include <bsd.port.pre.mk>
+LIBRSVG2_LIB_DEPENDS=	librsvg-2.so:${PORTSDIR}/graphics/librsvg2
+LIBRSVG2_VARS=		XMKMF_ARGS=-DWITH_SVG_SUPPORT
 
-.if ${PORT_OPTIONS:MLIBRSVG2}
-LIB_DEPENDS+=	librsvg-2.so:${PORTSDIR}/graphics/librsvg2
-XMKMF_ARGS=	-DWITH_SVG_SUPPORT
-.endif
-
 post-build:
 # Convert Russian language docs from archaic KOI8-R to modern UTF-8
 .for f in CHANGES README
 	iconv -f koi8-r -t utf-8 ${WRKSRC}/${f}.koi8 > ${WRKSRC}/${f}.ru
 .endfor
 
-post-install:
-.if ${PORT_OPTIONS:MDOCS}
+post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
-.endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>