From owner-svn-ports-head@freebsd.org  Fri Sep 18 14:47:17 2015
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 693BC9CD5DD;
 Fri, 18 Sep 2015 14:47:17 +0000 (UTC)
 (envelope-from amdmi3@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 5A3BA12C7;
 Fri, 18 Sep 2015 14:47:17 +0000 (UTC)
 (envelope-from amdmi3@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.70])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t8IElHbg094497;
 Fri, 18 Sep 2015 14:47:17 GMT (envelope-from amdmi3@FreeBSD.org)
Received: (from amdmi3@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id t8IElHvP094496;
 Fri, 18 Sep 2015 14:47:17 GMT (envelope-from amdmi3@FreeBSD.org)
Message-Id: <201509181447.t8IElHvP094496@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to
 amdmi3@FreeBSD.org using -f
From: Dmitry Marakasov <amdmi3@FreeBSD.org>
Date: Fri, 18 Sep 2015 14:47:17 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r397248 - head/x11/xxkb
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 18 Sep 2015 14:47:17 -0000

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>