svn commit: r359055 - in head/x11/xkeyboard-config: . files

[Alexey Dokuchaev]

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 at 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.