From owner-svn-ports-head@FreeBSD.ORG  Tue Jun 24 07:54:13 2014
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 4BA47296;
 Tue, 24 Jun 2014 07:54:13 +0000 (UTC)
Received: from svn.freebsd.org (svn.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 3925D2A75;
 Tue, 24 Jun 2014 07:54:13 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5O7sDcL064172;
 Tue, 24 Jun 2014 07:54:13 GMT (envelope-from danfe@svn.freebsd.org)
Received: (from danfe@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s5O7sD6v064171;
 Tue, 24 Jun 2014 07:54:13 GMT (envelope-from danfe@svn.freebsd.org)
Message-Id: <201406240754.s5O7sD6v064171@svn.freebsd.org>
From: Alexey Dokuchaev <danfe@FreeBSD.org>
Date: Tue, 24 Jun 2014 07:54:13 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r359055 - in head/x11/xkeyboard-config: . files
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.18
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://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: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 24 Jun 2014 07:54:13 -0000

Author: danfe
Date: Tue Jun 24 07:54:12 2014
New Revision: 359055
URL: http://svnweb.freebsd.org/changeset/ports/359055
QAT: https://qat.redports.org/buildarchive/r359055/

Log:
  - Reapply r331937 that got somehow lost back
  - Convert USE_BZIP2 to USES while here
  
  Pointy hat to:	zeising

Added:
  head/x11/xkeyboard-config/files/
     - copied from r331937, head/x11/xkeyboard-config/files/
Modified:
  head/x11/xkeyboard-config/Makefile

Modified: head/x11/xkeyboard-config/Makefile
==============================================================================
--- head/x11/xkeyboard-config/Makefile	Tue Jun 24 07:47:01 2014	(r359054)
+++ head/x11/xkeyboard-config/Makefile	Tue Jun 24 07:54:12 2014	(r359055)
@@ -3,19 +3,18 @@
 PORTNAME=	xkeyboard-config
 PORTVERSION=	2.11
 CATEGORIES=	x11
+MASTER_SITE_SUBDIR=	individual/${XORG_CAT}/${PORTNAME}
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X Keyboard Configuration Database
-MASTER_SITE_SUBDIR=	individual/${XORG_CAT}/${PORTNAME}
 
 LICENSE=	MIT
 
 BUILD_DEPENDS=	xkbcomp:${PORTSDIR}/x11/xkbcomp
 XORG_CAT=	data
 
-USE_BZIP2=	yes
+USES=		gmake pathfix perl5 tar:bzip2
 USE_GNOME=	intlhack libxslt:build
-USES=		gmake pathfix perl5
 USE_PERL5=	build
 GNU_CONFIGURE=	yes
 
@@ -24,6 +23,10 @@ CONFIGURE_ARGS=	--with-xkb-base=${PREFIX
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-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.