svn commit: r397248 - head/x11/xxkb

[Dmitry Marakasov]

Author: amdmi3
Date: Fri Sep 18 14:47:16 2015
New Revision: 397248
URL: https://svnweb.freebsd.org/changeset/ports/397248

Log:
  - Add missing USES=pkgconfig, fix build with LIBRSVG2
  - Switch to options helpers
  
  Approved by:	portmgr blanket

Modified:
  head/x11/xxkb/Makefile

Modified: head/x11/xxkb/Makefile
==============================================================================
--- head/x11/xxkb/Makefile	Fri Sep 18 14:46:56 2015	(r397247)
+++ head/x11/xxkb/Makefile	Fri Sep 18 14:47:16 2015	(r397248)
@@ -13,7 +13,7 @@ COMMENT=	XKB keyboard layout indicator a
 
 LICENSE=	ART10
 
-USES=		iconv imake
+USES=		iconv imake pkgconfig
 USE_XORG=	xpm
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
@@ -21,12 +21,8 @@ PORTDOCS=	README CHANGES.ru README.ru
 
 OPTIONS_DEFINE=	LIBRSVG2 DOCS
 
-.include <bsd.port.pre.mk>
-
-.if ${PORT_OPTIONS:MLIBRSVG2}
-LIB_DEPENDS+=	librsvg-2.so:${PORTSDIR}/graphics/librsvg2
-XMKMF_ARGS=	-DWITH_SVG_SUPPORT
-.endif
+LIBRSVG2_LIB_DEPENDS=	librsvg-2.so:${PORTSDIR}/graphics/librsvg2
+LIBRSVG2_VARS=		XMKMF_ARGS=-DWITH_SVG_SUPPORT
 
 post-build:
 # Convert Russian language docs from archaic KOI8-R to modern UTF-8
@@ -34,10 +30,8 @@ post-build:
 	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>